From james.hilliard1 at gmail.com Tue Feb 1 01:33:07 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 31 Jan 2022 18:33:07 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-aiohttp-session: bump to version 2.11.0 Message-ID: <20220201013307.1956972-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-aiohttp-session/python-aiohttp-session.hash | 4 ++-- package/python-aiohttp-session/python-aiohttp-session.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aiohttp-session/python-aiohttp-session.hash b/package/python-aiohttp-session/python-aiohttp-session.hash index 3842f0c7af..8b44318307 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 d57d463a9db13b681f7924b38aa77f64 aiohttp-session-2.10.0.tar.gz -sha256 2af19af9f435937baacbb6420f887b21e5021bb34be146c2702c58e6ebf6b76b aiohttp-session-2.10.0.tar.gz +md5 797273eb5f0ef9e95fa92c6a933cf4ad aiohttp-session-2.11.0.tar.gz +sha256 0fdf39600f6a05c4943ef6c7b099071ca9854413111a26761626244be5015dc4 aiohttp-session-2.11.0.tar.gz # Locally computed sha256 checksums sha256 7bc5dd2f229a6b922befb1427fd4ad2c0b255f12c1b1869370ba77520dc22bc7 LICENSE diff --git a/package/python-aiohttp-session/python-aiohttp-session.mk b/package/python-aiohttp-session/python-aiohttp-session.mk index a28b1ae143..3d59b75e3d 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.10.0 +PYTHON_AIOHTTP_SESSION_VERSION = 2.11.0 PYTHON_AIOHTTP_SESSION_SOURCE = aiohttp-session-$(PYTHON_AIOHTTP_SESSION_VERSION).tar.gz -PYTHON_AIOHTTP_SESSION_SITE = https://files.pythonhosted.org/packages/d6/3f/ab6288e8bbf4a9ae63ea0d3d5711bccc3a6dad1cb85a420c14fdeabc209e +PYTHON_AIOHTTP_SESSION_SITE = https://files.pythonhosted.org/packages/3b/a7/0b97b9a2e3a553a86a6703f86b0e9b1afb2b262849700e8f80015c0f643f PYTHON_AIOHTTP_SESSION_SETUP_TYPE = setuptools PYTHON_AIOHTTP_SESSION_LICENSE = Apache-2.0 PYTHON_AIOHTTP_SESSION_LICENSE_FILES = LICENSE -- 2.25.1 From thomas.petazzoni at bootlin.com Tue Feb 1 07:08:02 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 01 Feb 2022 07:08:02 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-31 Message-ID: <20220201070808.2B96240971@smtp2.osuosl.org> Hello, Autobuild statistics for 2022-01-31 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 67 | 6 | 0 | 73 | 2021.11.x | 24 | 1 | 0 | 25 | master | 85 | 42 | 0 | 127 | Classification of failures by reason for master ----------------------------------------------- rygel-0.40.2 | 4 unknown | 4 bat-0.18.3 | 3 cryptsetup-2.4.2 | 3 libuhttpd-3.14.1 | 3 wavemon-0.9.4 | 3 bluez5_utils-5.63 | 2 cairo-1.16.0 | 1 cryptopp-8.6.0 | 1 frr-8.1 | 1 fstrcmp-0.7.D001 | 1 gocryptfs-2.2.1 | 1 google-breakpad-7515ab13768... | 1 guile-3.0.7 | 1 host-delve-1.8.0 | 1 iproute2-5.16.0 | 1 libblockdev-2.25 | 1 mesa3d-21.3.4 | 1 mongrel2-1.13.0 | 1 neon-0.32.2 | 1 perl-5.34.0 | 1 pulseview-0.4.2 | 1 qt5webkit-5.212.0-alpha4 | 1 rtorrent-0.9.8 | 1 ruby-3.1.0 | 1 waffle-1.6.1 | 1 xvisor-0.3.1 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | bat-0.18.3 | NOK | http://autobuild.buildroot.net/results/f854a4e5038ca27d8497fb7129b5cc64a9f7ff1d | arm | bat-0.18.3 | NOK | http://autobuild.buildroot.net/results/2eb975dc561c1a6997e86017dc2455c4555ff742 | arm | bat-0.18.3 | NOK | http://autobuild.buildroot.net/results/f56b3ab091705dc99bc3b8fa042bc367cbd02a3a | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/e639f16dfd687cdd3bd25d40d28796ab1ca0af9e | mips64el | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/5c75ad724df3ff726559acee0da31f777ef6bc68 | arm | cairo-1.16.0 | NOK | http://autobuild.buildroot.net/results/8e2b273272626c41df503c96628a9c2e34404f46 | powerpc | cryptopp-8.6.0 | NOK | http://autobuild.buildroot.net/results/252a6f6a0bb7e5c0efe7338ad2e4c211530267e7 | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/6ed262b36b4061d0fdc95fa5a6f73fdf5fef91fe | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/48abcc403e7e3e934aba7fbc5f278f28c8c0560c | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/b15a6532b028421c9a92a3c427f4cbe339d95275 | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/ef743c15d7711aae025f60bd9405c740739acd76 | arm | fstrcmp-0.7.D001 | NOK | http://autobuild.buildroot.net/results/986a5df3957de948de4439e2050a875a5c4e9f93 | x86_64 | gocryptfs-2.2.1 | NOK | http://autobuild.buildroot.net/results/034faafa66329a5055fc1a0ed4d14358b8b40d63 | mipsel | google-breakpad-7515ab13768... | NOK | http://autobuild.buildroot.net/results/ad17e586242942b732ae59aa0a19f7bdf2957088 | sparc64 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/c8a62deff1b490c5147d956d64fb9ba1283479fe | ORPH arm | host-delve-1.8.0 | NOK | http://autobuild.buildroot.net/results/08bf879f7ab25ac7ff6b535112c8b889bec4fcfb | i586 | iproute2-5.16.0 | NOK | http://autobuild.buildroot.net/results/455840288bbe13ed585b0e2dc7b20a294dd1eee1 | powerpc64le | libblockdev-2.25 | NOK | http://autobuild.buildroot.net/results/2fd1b4001b64004be49dd91329945ab108e1a90c | ORPH m68k | libuhttpd-3.14.1 | NOK | http://autobuild.buildroot.net/results/8bb865ebca04f2ba0b2761d421fa1d98404b0ef2 | arm | libuhttpd-3.14.1 | NOK | http://autobuild.buildroot.net/results/8d2a79dacf9ac423f7ece51b8c23f3683238312b | m68k | libuhttpd-3.14.1 | NOK | http://autobuild.buildroot.net/results/5d42251597d66b929677199a044115380dac42c7 | x86_64 | mesa3d-21.3.4 | NOK | http://autobuild.buildroot.net/results/05b2ebd2f1abcf909ffe06f14aebef1dabfef582 | arm | mongrel2-1.13.0 | NOK | http://autobuild.buildroot.net/results/356f99489bc629b9cb864cf9f6299e70ce943fed | arm | neon-0.32.2 | NOK | http://autobuild.buildroot.net/results/da995ef26001357e51a5907de9c6111b9ff89bdf | ORPH arm | perl-5.34.0 | NOK | http://autobuild.buildroot.net/results/2622d5f0405c387be414132bd71d4f84406d5af3 | riscv32 | pulseview-0.4.2 | NOK | http://autobuild.buildroot.net/results/80427fc30d77ac5919b8c01d41afd805293e0fea | aarch64 | qt5webkit-5.212.0-alpha4 | NOK | http://autobuild.buildroot.net/results/d5fa35cfdad09aaaaa88b537d79d8446d10872fe | arm | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/69a68f11887523b1f8516d02e85e76f64f6c363e | ORPH riscv64 | ruby-3.1.0 | NOK | http://autobuild.buildroot.net/results/95a0cd885f644ca877d8266610a89e003864b71c | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/1b79cfa0a439fe9ebfab24ff141e6d667853c1ac | arc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/846c8a79b7d5bb9e4b23fe7521884d2f1b9eff4a | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/70efd9ab53c60e4c44b354ec34f9a27bf73e71e5 | s390x | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/4e2e9dde0b18a5958ee2bcb8d72c0f9e76f85492 | mipsel | unknown | NOK | http://autobuild.buildroot.net/results/2ce862a946d5a9ccbfe0b82957ec522092c1ddf4 | arc | unknown | NOK | http://autobuild.buildroot.net/results/b621449701ccef80348cbd045028ba4a91073c80 | m68k | unknown | NOK | http://autobuild.buildroot.net/results/e71af53b01e242798127263524dbd935a297f9f6 | mipsel | unknown | NOK | http://autobuild.buildroot.net/results/05d43f7bbfdb66fa2eb278108e0b5589781a0047 | arm | waffle-1.6.1 | NOK | http://autobuild.buildroot.net/results/b401476e5e1382ed872cfc77e8b0c34718bdf1f0 | aarch64 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/cebe8c50629d9d40f24bbee5bfb13044f68b7c25 | mips64el | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/191f564994c82360a94e96a2a5e172e137a65eaa | s390x | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/5c42c34e9449496cfd6bc1264cb792c3bfb2d68c | arm | xvisor-0.3.1 | NOK | http://autobuild.buildroot.net/results/eb794bb28d67d43a10030c0d057726dac1926dc3 | Classification of failures by reason for 2021.02.x -------------------------------------------------- azure-iot-sdk-c-LTS_07_2020... | 1 host-sentry-cli-1.57.0 | 1 libtheora-1.1.1 | 1 monkey-f54856ce250c4e257354... | 1 ndisc6-1.0.4 | 1 rocksdb-6.13.3 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- riscv32 | azure-iot-sdk-c-LTS_07_2020... | NOK | http://autobuild.buildroot.net/results/5f8db0b92087f694513fe6597ae10aac92e77e6c | powerpc | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/a8f611e5e3f3d3c5c85a9f910afc02e6041e1b93 | or1k | libtheora-1.1.1 | NOK | http://autobuild.buildroot.net/results/acb1729465fe728b7c91852afda4edb808f8ea91 | ORPH powerpc | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/1bd449648c1510f564a7f5f519e670fc222c6e19 | arm | ndisc6-1.0.4 | NOK | http://autobuild.buildroot.net/results/2b6a0d09d14b483754343990222dab8d6a896386 | ORPH m68k | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/41754f87d67b5747b5e1096ea3222b0a3512faeb | Classification of failures by reason for 2021.11.x -------------------------------------------------- zeromq-4.3.4 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/4cd4f5f4d90c244872d844ea2aeb90f6b3fe28e3 | Gitlab CI results for 2022-01-31 ================================ Detail of runtime-test failures for master ------------------------------------------ runtime-test | link to the job | orph? --------------------------+---------------------------------------------------------------+------ TestIso9660Grub2Hybrid | https://gitlab.com/buildroot.org/buildroot/-/jobs/2033214851 | ORPH TestLuajitRings | https://gitlab.com/buildroot.org/buildroot/-/jobs/2033215112 | ORPH TestLuajitTurbolua | https://gitlab.com/buildroot.org/buildroot/-/jobs/2033215128 | ORPH TestLxc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2033215000 | ORPH TestPerlGDGraph | https://gitlab.com/buildroot.org/buildroot/-/jobs/2033215014 | ORPH TestPythonPy2Pynacl | https://gitlab.com/buildroot.org/buildroot/-/jobs/2033215088 | ORPH TestPythonPy2Pyyaml | https://gitlab.com/buildroot.org/buildroot/-/jobs/2033215093 | ORPH TestPythonPy3Constantly | https://gitlab.com/buildroot.org/buildroot/-/jobs/2033215060 | ORPH ...honPy3FlaskExpectsJson | https://gitlab.com/buildroot.org/buildroot/-/jobs/2033215068 | ORPH TestPythonPy3Pyyaml | https://gitlab.com/buildroot.org/buildroot/-/jobs/2033215094 | ORPH TestRust | https://gitlab.com/buildroot.org/buildroot/-/jobs/2033215113 | ORPH TestRustBin | https://gitlab.com/buildroot.org/buildroot/-/jobs/2033215115 | ORPH -- http://autobuild.buildroot.net From heiko.thiery at gmail.com Tue Feb 1 07:22:53 2022 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Tue, 1 Feb 2022 08:22:53 +0100 Subject: [Buildroot] [PATCH v5] configs/kontron_bl_imx8mm_defconfig: new defconfig In-Reply-To: <3ea22a9d-938a-5086-66c6-a8f5510c8573@grinn-global.com> References: <20220131153022.351662-1-heiko.thiery@gmail.com> <12be81a6-7f2e-35b8-4f44-d8a20fce74f1@benettiengineering.com> <86bf975a-1599-005a-5ebc-a149cc973da4@benettiengineering.com> <3ea22a9d-938a-5086-66c6-a8f5510c8573@grinn-global.com> Message-ID: Hi, Am Mo., 31. Jan. 2022 um 18:45 Uhr schrieb Bartosz Bilas : > > Hello, > > On 31.01.2022 18:11, Giulio Benetti wrote: > > On 31/01/22 17:42, Michael Nazzareno Trimarchi wrote: > > [SNIP] > >>>>> 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. For organizing "real" projects I also prefer to use the "savedefconfig" way. But here to have a new defconfig in mainline buildroot I prefer a clean minimal defconfig. But I think that's just a matter of taste. -- Heiko From geomatsi at gmail.com Tue Feb 1 08:53:15 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Tue, 1 Feb 2022 11:53:15 +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: Hi Yegor, > 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. Thanks ! I reproduced the problem using your wpa_supplicant config snippet. Looking into Makefile of wpa_supplicant: - CONFIG_MESH for some reason needs SAE, so it enables CONFIG_SAE - CONFIG_SAE enables only HMAC_SHA256_KDF, which is apparently not enough It turns out that at least HMAC_SHA384_KDF is required for successful build. Here is a minimal patch for wpa_supplicant that fixes build for your snippet: diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile index cb66defac..c8e53a3c9 100644 --- a/wpa_supplicant/Makefile +++ b/wpa_supplicant/Makefile @@ -246,6 +246,7 @@ endif ifdef CONFIG_MESH NEED_80211_COMMON=y NEED_AES_SIV=y +NEED_HMAC_SHA384_KDF=y CONFIG_SAE=y CONFIG_AP=y CFLAGS += -DCONFIG_MESH In fact, it looks like wpa_supplicant build would fail for any configuration when we enable SAE without DPP. However in Buildroot we enable all WPA3 support at once which includes OWE/SAE/DPP. Meanwhile DPP enables all the NEED_HMAC_SHA***_KDF options. Regards, Sergey From patrickdepinguin at gmail.com Tue Feb 1 08:55:20 2022 From: patrickdepinguin at gmail.com (Thomas De Schampheleire) Date: Tue, 1 Feb 2022 09:55:20 +0100 Subject: [Buildroot] [PATCHv2 1/2] utils/size-stats-compare: clarify meaning of variables in print_result In-Reply-To: <527fd8d5-6c7e-aa10-06ba-e634ba3c600d@mind.be> References: <20210303150451.7963-1-patrickdepinguin@gmail.com> <527fd8d5-6c7e-aa10-06ba-e634ba3c600d@mind.be> Message-ID: El lun, 31 ene 2022 a las 21:38, Arnout Vandecappelle () escribi?: > > > > 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... No worries, thanks in any case! /Thomas From michael at amarulasolutions.com Tue Feb 1 09:13:42 2022 From: michael at amarulasolutions.com (Michael Trimarchi) Date: Tue, 1 Feb 2022 10:13:42 +0100 Subject: [Buildroot] [PATCH] boot/uboot: add support for bundling TEE in BIN format into U-Boot Message-ID: <20220201091342.143010-1-michael@amarulasolutions.com> Some U-Boot platforms (e.g. nxp) can bundle OPTEE's tee.bin into the U-Boot image using binman. This patch brings the necessary changes to enable this feature. Signed-off-by: Michael Trimarchi --- boot/uboot/Config.in | 12 ++++++++++++ boot/uboot/uboot.mk | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index c630fc6552..117bbd3faf 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -237,6 +237,18 @@ config BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE U-Boot. This option makes sure optee-os gets built prior to U-Boot, and that the TEE variable pointing to OPTEE's tee.elf, is passed during the Buildroot build. +choice + prompt "U-Boot OPTEE BL32 format" + default BR2_TARGET_UBOOT_NEEDS_OPTEE_BIN + depends on BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE + +config BR2_TARGET_UBOOT_NEEDS_OPTEE_BIN + bool "tee.bin" + +config BR2_TARGET_UBOOT_NEEDS_OPTEE_ELF + bool "tee.elf" + +endchoice config BR2_TARGET_UBOOT_NEEDS_OPENSBI bool "U-Boot needs OpenSBI" diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 574fc7089a..210fa219ed 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -177,7 +177,19 @@ endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE),y) UBOOT_DEPENDENCIES += optee-os +ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPTEE_ELF),y) UBOOT_MAKE_OPTS += TEE=$(BINARIES_DIR)/tee.elf +define UBOOT_COPY_TEE_FIRMWARE + cp $(BINARIES_DIR)/tee.elf $(@D)/ +endef +UBOOT_PRE_BUILD_HOOKS += UBOOT_COPY_TEE_FIRMWARE +else +UBOOT_MAKE_OPTS += BL32=$(BINARIES_DIR)/tee.bin +define UBOOT_COPY_TEE_FIRMWARE + cp $(BINARIES_DIR)/tee-raw.bin $(@D)/tee.bin +endef +UBOOT_PRE_BUILD_HOOKS += UBOOT_COPY_TEE_FIRMWARE +endif endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSBI),y) -- 2.25.1 From yegorslists at googlemail.com Tue Feb 1 10:25:50 2022 From: yegorslists at googlemail.com (Yegor Yefremov) Date: Tue, 1 Feb 2022 11:25:50 +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: Hi Sergey, On Tue, Feb 1, 2022 at 9:53 AM Sergey Matyukevich wrote: > > Hi Yegor, > > > 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. > > Thanks ! I reproduced the problem using your wpa_supplicant config snippet. > Looking into Makefile of wpa_supplicant: > - CONFIG_MESH for some reason needs SAE, so it enables CONFIG_SAE > - CONFIG_SAE enables only HMAC_SHA256_KDF, which is apparently not enough > > It turns out that at least HMAC_SHA384_KDF is required for successful build. > Here is a minimal patch for wpa_supplicant that fixes build for your snippet: > > diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile > index cb66defac..c8e53a3c9 100644 > --- a/wpa_supplicant/Makefile > +++ b/wpa_supplicant/Makefile > @@ -246,6 +246,7 @@ endif > ifdef CONFIG_MESH > NEED_80211_COMMON=y > NEED_AES_SIV=y > +NEED_HMAC_SHA384_KDF=y > CONFIG_SAE=y > CONFIG_AP=y > CFLAGS += -DCONFIG_MESH > > > In fact, it looks like wpa_supplicant build would fail for any configuration > when we enable SAE without DPP. However in Buildroot we enable all WPA3 > support at once which includes OWE/SAE/DPP. Meanwhile DPP enables all > the NEED_HMAC_SHA***_KDF options. Would you then add this patch to the version bump? I'll keep an eye on what happens with the official solution on the hostap mailing list. Regards, Yegor From geomatsi at gmail.com Tue Feb 1 10:46:15 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Tue, 1 Feb 2022 13:46:15 +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: > Hi Sergey, > > On Tue, Feb 1, 2022 at 9:53 AM Sergey Matyukevich wrote: > > > > Hi Yegor, > > > > > 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. > > > > Thanks ! I reproduced the problem using your wpa_supplicant config snippet. > > Looking into Makefile of wpa_supplicant: > > - CONFIG_MESH for some reason needs SAE, so it enables CONFIG_SAE > > - CONFIG_SAE enables only HMAC_SHA256_KDF, which is apparently not enough > > > > It turns out that at least HMAC_SHA384_KDF is required for successful build. > > Here is a minimal patch for wpa_supplicant that fixes build for your snippet: > > > > diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile > > index cb66defac..c8e53a3c9 100644 > > --- a/wpa_supplicant/Makefile > > +++ b/wpa_supplicant/Makefile > > @@ -246,6 +246,7 @@ endif > > ifdef CONFIG_MESH > > NEED_80211_COMMON=y > > NEED_AES_SIV=y > > +NEED_HMAC_SHA384_KDF=y > > CONFIG_SAE=y > > CONFIG_AP=y > > CFLAGS += -DCONFIG_MESH > > > > > > In fact, it looks like wpa_supplicant build would fail for any configuration > > when we enable SAE without DPP. However in Buildroot we enable all WPA3 > > support at once which includes OWE/SAE/DPP. Meanwhile DPP enables all > > the NEED_HMAC_SHA***_KDF options. > > Would you then add this patch to the version bump? I'll keep an eye on > what happens with the official solution on the hostap mailing list. I will send it separately on top of version update patches. Regards, Sergey From yann.morin at orange.com Tue Feb 1 13:49:44 2022 From: yann.morin at orange.com (yann.morin at orange.com) Date: Tue, 1 Feb 2022 14:49:44 +0100 Subject: [Buildroot] [PATCH] package/doc-asciidoc: fix build for out-of-tree documents Message-ID: <11822_1643723386_61F93A7A_11822_315_1_f2cd4a063f756aa49d3dc715be368bd3738e5f1d.1643723384.git.yann.morin@orange.com> From: "Yann E. MORIN" The doc-asciidoc infra allows document to define sources and resources, and those can only be local (there is no download support for documents). The currently documented way to specify those is to use the $(pkgdir) macro to point to the document sources and resources when they are along the .mk. However, this works only for sources and not for resources. Indeed, sources are used to generate Makefile dependency rules, so $(pkgdir) is expanded and evaluated during the call to $(doc-asciidoc), while resources are expanded and evaluated when the rules are executed, which always happen after all the parsing has be done, at which point $(pkgdir) expands to the last Makefile that was parsed, which is always Buildroot's own manual. This went unnoticed so far because Buildroot's manual is 1) the last to be parsed, and 2) not using $(pkgdir) anyway. Additionally, $(pkgdir) is mostly an internal macro, that is, as this change demonstrates, difficult to use, and thus should not be used, in packages or in documents. We fix that by introducing $(FOO_DOCDIR), similar to $(FOO_PKGDIR), which points to the document directory. We choose not to name the variable FOO_PKGDIR, because it semantically is not a package. As a consequence, the last argument to the doc-asciidoc macro is now superfluous, so it is removed, which causes a little bit of churn in the main macro. As a further consequence, the third argument in the inner macro is no longer needed either, so it too is removed, which causes a bit more churn yet in the inner macro. Signed-off-by: Yann E. MORIN Cc: Frederic GARDES --- docs/manual/adding-packages-asciidoc.txt | 17 ++++- package/doc-asciidoc.mk | 90 ++++++++++++------------ 2 files changed, 59 insertions(+), 48 deletions(-) diff --git a/docs/manual/adding-packages-asciidoc.txt b/docs/manual/adding-packages-asciidoc.txt index f9688b36c7..0bfe99d22e 100644 --- a/docs/manual/adding-packages-asciidoc.txt +++ b/docs/manual/adding-packages-asciidoc.txt @@ -39,7 +39,7 @@ Here is an example to render a simple AsciiDoc document. 04: # 05: ################################################################################ 06: -07: FOO_SOURCES = $(sort $(wildcard $(pkgdir)/*)) +07: FOO_SOURCES = $(sort $(wildcard $(FOO_DOCDIR)/*)) 08: $(eval $(call asciidoc-document)) ---- @@ -85,6 +85,17 @@ various steps: * +FOO_CHECK_DEPENDENCIES__HOOKS+, to run additional tests for the specified format ++ (see the list of rendered formats, above). +Buildroot sets the following variable that can be used in the definitions +above: + +* +$(FOO_DOCDIR)+, similar to +$(FOO_PKGDIR)+, contains the path to the + directory containing +foo.mk+. It can be used to refer to the document + sources, and can be used in the hooks, especially the post-rsync hook + if parts of the documentation needs to be generated. + +* +$(@D)+, as for traditional packages, contains the path to the directory + where the document will be copied and built. + Here is a complete example that uses all variables and all hooks: ---- @@ -94,8 +105,8 @@ Here is a complete example that uses all variables and all hooks: 04: # 05: ################################################################################ 06: -07: FOO_SOURCES = $(sort $(wildcard $(pkgdir)/*)) -08: FOO_RESOURCES = $(sort $(wildcard $(pkgdir)/ressources)) +07: FOO_SOURCES = $(sort $(wildcard $(FOO_DOCDIR)/*)) +08: FOO_RESOURCES = $(sort $(wildcard $(FOO_DOCDIR)/ressources)) 09: 10: define FOO_GEN_EXTRA_DOC 11: /path/to/generate-script --outdir=$(@D) diff --git a/package/doc-asciidoc.mk b/package/doc-asciidoc.mk index be92496c2e..2bd761edfb 100644 --- a/package/doc-asciidoc.mk +++ b/package/doc-asciidoc.mk @@ -42,12 +42,11 @@ BR_ASCIIDOC_CONF = docs/conf/asciidoc.conf # argument 1 is the name of the document and the top-level asciidoc file must # have the same name # argument 2 is the uppercase name of the document -# argument 3 is the directory containing the document -# argument 4 is the type of document to generate (-f argument of a2x) -# argument 5 is the document type as used in the make target -# argument 6 is the output file extension for the document type -# argument 7 is the human text for the document type -# argument 8 (optional) are extra arguments for a2x +# argument 3 is the type of document to generate (-f argument of a2x) +# argument 4 is the document type as used in the make target +# argument 5 is the output file extension for the document type +# argument 6 is the human text for the document type +# argument 7 (optional) are extra arguments for a2x # # The variable _SOURCES defines the dependencies. # @@ -55,55 +54,55 @@ BR_ASCIIDOC_CONF = docs/conf/asciidoc.conf # all variable references except the arguments must be $$-quoted. ################################################################################ define ASCIIDOC_INNER -$(1): $(1)-$(5) -.PHONY: $(1)-$(5) -$(1)-$(5): $$(O)/docs/$(1)/$(1).$(6) +$(1): $(1)-$(4) +.PHONY: $(1)-$(4) +$(1)-$(4): $$(O)/docs/$(1)/$(1).$(5) -asciidoc-check-dependencies-$(5): -.PHONY: $(1)-check-dependencies-$(5) +asciidoc-check-dependencies-$(4): +.PHONY: $(1)-check-dependencies-$(4) # Single line, because splitting a foreach is not easy... -$(1)-check-dependencies-$(5): asciidoc-check-dependencies-$(5) - $$(Q)$$(foreach hook,$$($(2)_CHECK_DEPENDENCIES_$$(call UPPERCASE,$(5))_HOOKS),$$(call $$(hook))$$(sep)) +$(1)-check-dependencies-$(4): asciidoc-check-dependencies-$(4) + $$(Q)$$(foreach hook,$$($(2)_CHECK_DEPENDENCIES_$$(call UPPERCASE,$(4))_HOOKS),$$(call $$(hook))$$(sep)) # Include Buildroot's AsciiDoc configuration first: # - generic configuration, # - then output-specific configuration ifneq ($$(wildcard $$(BR_ASCIIDOC_CONF)),) -$(2)_$(4)_ASCIIDOC_OPTS += -f $$(BR_ASCIIDOC_CONF) +$(2)_$(3)_ASCIIDOC_OPTS += -f $$(BR_ASCIIDOC_CONF) endif -BR_$(4)_ASCIIDOC_CONF = docs/conf/asciidoc-$(4).conf -ifneq ($$(wildcard $$(BR_$(4)_ASCIIDOC_CONF)),) -$(2)_$(4)_ASCIIDOC_OPTS += -f $$(BR_$(4)_ASCIIDOC_CONF) +BR_$(3)_ASCIIDOC_CONF = docs/conf/asciidoc-$(3).conf +ifneq ($$(wildcard $$(BR_$(3)_ASCIIDOC_CONF)),) +$(2)_$(3)_ASCIIDOC_OPTS += -f $$(BR_$(3)_ASCIIDOC_CONF) endif # Then include the document's AsciiDoc configuration: # - generic configuration, # - then output-specific configuration ifneq ($$(wildcard $$($(2)_ASCIIDOC_CONF)),) -$(2)_$(4)_ASCIIDOC_OPTS += -f $$($(2)_ASCIIDOC_CONF) +$(2)_$(3)_ASCIIDOC_OPTS += -f $$($(2)_ASCIIDOC_CONF) endif -$(2)_$(4)_ASCIIDOC_CONF = $(3)/asciidoc-$(4).conf -ifneq ($$(wildcard $$($(2)_$(4)_ASCIIDOC_CONF)),) -$(2)_$(4)_ASCIIDOC_OPTS += -f $$($(2)_$(4)_ASCIIDOC_CONF) +$(2)_$(3)_ASCIIDOC_CONF = $$($(2)_DOCDIR)/asciidoc-$(3).conf +ifneq ($$(wildcard $$($(2)_$(3)_ASCIIDOC_CONF)),) +$(2)_$(3)_ASCIIDOC_OPTS += -f $$($(2)_$(3)_ASCIIDOC_CONF) endif # Handle a2x warning about --destination-dir option only applicable to HTML # based outputs. So: # - use the --destination-dir option if possible (html and split-html), # - otherwise copy the generated document to the output directory -$(2)_$(4)_A2X_OPTS = -ifneq ($$(filter $(5),html split-html),) -$(2)_$(4)_A2X_OPTS += --destination-dir="$$(@D)" +$(2)_$(3)_A2X_OPTS = +ifneq ($$(filter $(4),html split-html),) +$(2)_$(3)_A2X_OPTS += --destination-dir="$$(@D)" else -define $(2)_$(4)_INSTALL_CMDS - $$(Q)cp -f $$(BUILD_DIR)/docs/$(1)/$(1).$(6) $$(@D) +define $(2)_$(3)_INSTALL_CMDS + $$(Q)cp -f $$(BUILD_DIR)/docs/$(1)/$(1).$(5) $$(@D) endef endif -$$(O)/docs/$(1)/$(1).$(6): export TZ=UTC +$$(O)/docs/$(1)/$(1).$(5): export TZ=UTC -ifeq ($(6)-$$(GENDOC_XSLTPROC_IS_BROKEN),pdf-y) -$$(O)/docs/$(1)/$(1).$(6): +ifeq ($(5)-$$(GENDOC_XSLTPROC_IS_BROKEN),pdf-y) +$$(O)/docs/$(1)/$(1).$(5): $$(warning PDF generation is disabled because of a bug in \ xsltproc. To be able to generate a PDF, you should \ build xsltproc from the libxslt sources >=1.1.29 and pass it \ @@ -112,20 +111,20 @@ $$(O)/docs/$(1)/$(1).$(6): else # -r $(@D) is there for documents that use external filters; those filters # generate code at the same location it finds the document's source files. -$$(O)/docs/$(1)/$(1).$(6): $$($(2)_SOURCES) \ +$$(O)/docs/$(1)/$(1).$(5): $$($(2)_SOURCES) \ $(1)-check-dependencies \ - $(1)-check-dependencies-$(5) \ + $(1)-check-dependencies-$(4) \ $(1)-prepare-sources - $$(Q)$$(call MESSAGE,"Generating $(7) $(1)...") + $$(Q)$$(call MESSAGE,"Generating $(6) $(1)...") $$(Q)mkdir -p $$(@D) - $$(Q)a2x $(8) -f $(4) -d book -L \ + $$(Q)a2x $(7) -f $(3) -d book -L \ $$(foreach r,$$($(2)_RESOURCES) $$(@D), \ --resource="$$(abspath $$(r))") \ - $$($(2)_$(4)_A2X_OPTS) \ - --asciidoc-opts="$$($(2)_$(4)_ASCIIDOC_OPTS)" \ + $$($(2)_$(3)_A2X_OPTS) \ + --asciidoc-opts="$$($(2)_$(3)_ASCIIDOC_OPTS)" \ $$(BUILD_DIR)/docs/$(1)/$(1).txt # install the generated document - $$($(2)_$(4)_INSTALL_CMDS) + $$($(2)_$(3)_INSTALL_CMDS) endif endef @@ -135,13 +134,14 @@ endef # argument 1 is the lowercase name of the document; the document's main file # must have the same name, with the .txt extension # argument 2 is the uppercase name of the document -# argument 3 is the directory containing the document's sources # # The variable _SOURCES defines the dependencies. # The variable _RESOURCES defines where the document's # resources, such as images, are located; must be an absolute path. ################################################################################ define ASCIIDOC +$(2)_DOCDIR = $(pkgdir) + # Single line, because splitting a foreach is not easy... .PHONY: $(1)-check-dependencies $(1)-check-dependencies: asciidoc-check-dependencies $$($(2)_DEPENDENCIES) @@ -153,29 +153,29 @@ $(1)-check-dependencies: asciidoc-check-dependencies $$($(2)_DEPENDENCIES) $$(BUILD_DIR)/docs/$(1)/.stamp_doc_rsynced: $$(Q)$$(call MESSAGE,"Preparing the $(1) sources...") $$(Q)mkdir -p $$(@D) - $$(Q)rsync -a $(3) $$(@D) + $$(Q)rsync -a $$($(2)_DOCDIR) $$(@D) $$(Q)$$(foreach hook,$$($(2)_POST_RSYNC_HOOKS),$$(call $$(hook))$$(sep)) .PHONY: $(1)-prepare-sources $(1)-prepare-sources: $$(BUILD_DIR)/docs/$(1)/.stamp_doc_rsynced -$(2)_ASCIIDOC_CONF = $(3)/asciidoc.conf +$(2)_ASCIIDOC_CONF = $$($(2)_DOCDIR)/asciidoc.conf -$(call ASCIIDOC_INNER,$(1),$(2),$(3),xhtml,html,html,HTML,\ +$(call ASCIIDOC_INNER,$(1),$(2),xhtml,html,html,HTML,\ --xsltproc-opts "--stringparam toc.section.depth 1") -$(call ASCIIDOC_INNER,$(1),$(2),$(3),chunked,split-html,chunked,split HTML,\ +$(call ASCIIDOC_INNER,$(1),$(2),chunked,split-html,chunked,split HTML,\ --xsltproc-opts "--stringparam toc.section.depth 1") # dblatex needs to pass the '--maxvars ...' option to xsltproc to prevent it # from reaching the template recursion limit when processing the (long) target # package table and bailing out. -$(call ASCIIDOC_INNER,$(1),$(2),$(3),pdf,pdf,pdf,PDF,\ +$(call ASCIIDOC_INNER,$(1),$(2),pdf,pdf,pdf,PDF,\ --dblatex-opts "-P latex.output.revhistory=0 -x '--maxvars 100000'") -$(call ASCIIDOC_INNER,$(1),$(2),$(3),text,text,text,text) +$(call ASCIIDOC_INNER,$(1),$(2),text,text,text,text) -$(call ASCIIDOC_INNER,$(1),$(2),$(3),epub,epub,epub,ePUB) +$(call ASCIIDOC_INNER,$(1),$(2),epub,epub,epub,ePUB) clean: $(1)-clean $(1)-clean: @@ -187,4 +187,4 @@ endef # asciidoc-document -- the target generator macro for asciidoc documents ################################################################################ -asciidoc-document = $(call ASCIIDOC,$(pkgname),$(call UPPERCASE,$(pkgname)),$(pkgdir)) +asciidoc-document = $(call ASCIIDOC,$(pkgname),$(call UPPERCASE,$(pkgname))) -- 2.25.1 _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From yann.morin at orange.com Tue Feb 1 14:00:06 2022 From: yann.morin at orange.com (yann.morin at orange.com) Date: Tue, 1 Feb 2022 15:00:06 +0100 Subject: [Buildroot] [PATCH] package/glibc: allow runing on kernel older than used for the headers Message-ID: <12945_1643724020_61F93CE8_12945_430_1_dfe1b340bf9e8e2c47987f28f8fd40cca7d16b3b.1643724006.git.yann.morin@orange.com> From: "Yann E. MORIN" Currently, we configure glibc to not add compatibility support for kernel older than the one used for the headers. This is on the expectation that the system will never run on a kernel that is older than the one used for the headers and, when Buildroot builds the kernel, on another, older kernel. However, in some situations, it is possible to build for a generic system, where the kernel may be a different version. This can be the case, for example, when Building an image that is to be used in a container that can run on a range of machines each with different kernel versions. In such a case, it is interesting to build glibc in a way as to take better advantage of the newer kernels, and thus using newer kernel headers, while still allowing running onn older kernels, and thus carrying more compatibility code. We add an option to glibc to be allow the user to provide the oldest kernel version they expect to use, and use that if specified; if not specified (the default), use the version of the kernel headers as was done previously. Signed-off-by: Yann E. MORIN Cc: Frederic GARDES --- package/glibc/Config.in | 12 ++++++++++++ package/glibc/glibc.mk | 5 ++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package/glibc/Config.in b/package/glibc/Config.in index 5ecd058145..01da045ce7 100644 --- a/package/glibc/Config.in +++ b/package/glibc/Config.in @@ -10,6 +10,18 @@ config BR2_PACKAGE_GLIBC help https://www.gnu.org/software/libc/ +config BR2_PACKAGE_GLIBC_KERNEL_COMPAT + string "Oldest kernel version supported" + help + If you plan on running on various kernel versions, enter the + oldest version you expect to run on here. + + Note that the older the version, the more backward compatibility + code is added, and the slower the code may get. + + Leave it empty (the default) to use the same version as used for + the kernel headers. + config BR2_PACKAGE_GLIBC_UTILS bool "Install glibc utilities" help diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index 5c26b0e6df..43015417c2 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -98,6 +98,9 @@ endif GLIBC_MAKE = $(BR2_MAKE) GLIBC_CONF_ENV += ac_cv_prog_MAKE="$(BR2_MAKE)" +GLIBC_KERNEL_VERSION = $(or $(call qstrip,$(BR2_PACKAGE_GLIBC_KERNEL_COMPAT)), \ + $(call qstrip,$(BR2_TOOLCHAIN_HEADERS_AT_LEAST))) + # Even though we use the autotools-package infrastructure, we have to # override the default configure commands for several reasons: # @@ -128,7 +131,7 @@ define GLIBC_CONFIGURE_CMDS --disable-profile \ --disable-werror \ --without-gd \ - --enable-kernel=$(call qstrip,$(BR2_TOOLCHAIN_HEADERS_AT_LEAST)) \ + --enable-kernel=$(GLIBC_KERNEL_VERSION) \ --with-headers=$(STAGING_DIR)/usr/include) $(GLIBC_ADD_MISSING_STUB_H) endef -- 2.25.1 _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From Alexey.Brodkin at synopsys.com Tue Feb 1 14:23:44 2022 From: Alexey.Brodkin at synopsys.com (Alexey Brodkin) Date: Tue, 1 Feb 2022 14:23:44 +0000 Subject: [Buildroot] [PATCH] package/glibc: allow runing on kernel older than used for the headers In-Reply-To: <12945_1643724020_61F93CE8_12945_430_1_dfe1b340bf9e8e2c47987f28f8fd40cca7d16b3b.1643724006.git.yann.morin@orange.com> References: <12945_1643724020_61F93CE8_12945_430_1_dfe1b340bf9e8e2c47987f28f8fd40cca7d16b3b.1643724006.git.yann.morin@orange.com> Message-ID: Hi Yann, > Currently, we configure glibc to not add compatibility support for > kernel older than the one used for the headers. This is on the > expectation that the system will never run on a kernel that is older > than the one used for the headers and, when Buildroot builds the kernel, > on another, older kernel. > > However, in some situations, it is possible to build for a generic > system, where the kernel may be a different version. This can be the > case, for example, when Building an image that is to be used in a > container that can run on a range of machines each with different kernel > versions. In such a case, it is interesting to build glibc in a way as > to take better advantage of the newer kernels, and thus using newer > kernel headers, while still allowing running onn older kernels, and thus > carrying more compatibility code. > > We add an option to glibc to be allow the user to provide the oldest > kernel version they expect to use, and use that if specified; if not > specified (the default), use the version of the kernel headers as was > done previously. That's a very welcome one as it bites us all the time we try to run more recent rootfs with some older kernels. > Signed-off-by: Yann E. MORIN > Cc: Frederic GARDES > +config BR2_PACKAGE_GLIBC_KERNEL_COMPAT > + string "Oldest kernel version supported" > + help > + If you plan on running on various kernel versions, enter the > + oldest version you expect to run on here. > + > + Note that the older the version, the more backward compatibility > + code is added, and the slower the code may get. > + > + Leave it empty (the default) to use the same version as used for > + the kernel headers. I'd say there's the third option and frankly I like this one the most - default oldest version assumed by the glibc itself. The beauty of it is it's really the oldest version of the kernel which is supported by a given glibc version for a particular architecture. > config BR2_PACKAGE_GLIBC_UTILS > bool "Install glibc utilities" > help > diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk > index 5c26b0e6df..43015417c2 100644 > --- a/package/glibc/glibc.mk > +++ b/package/glibc/glibc.mk > @@ -98,6 +98,9 @@ endif > GLIBC_MAKE = $(BR2_MAKE) > GLIBC_CONF_ENV += ac_cv_prog_MAKE="$(BR2_MAKE)" > > +GLIBC_KERNEL_VERSION = $(or $(call qstrip,$(BR2_PACKAGE_GLIBC_KERNEL_COMPAT)), \ > + $(call qstrip,$(BR2_TOOLCHAIN_HEADERS_AT_LEAST))) > + > # Even though we use the autotools-package infrastructure, we have to > # override the default configure commands for several reasons: > # > @@ -128,7 +131,7 @@ define GLIBC_CONFIGURE_CMDS > --disable-profile \ > --disable-werror \ > --without-gd \ > - --enable-kernel=$(call qstrip,$(BR2_TOOLCHAIN_HEADERS_AT_LEAST)) \ > + --enable-kernel=$(GLIBC_KERNEL_VERSION) \ See [1] and how "arch_minimum_kernel" is used in [2]. I.e. for that third option to work we need to skip setup of "--enable-kernel" completely. [1] https://sourceware.org/git/?p=glibc.git;a=blob;f=configure;h=8e5bee775a651fcbaaa96ede8039ae1f049e296e;hb=HEAD#l3529 [2] https://sourceware.org/git/?p=glibc.git;a=blob;f=sysdeps/unix/sysv/linux/configure.ac;h=197b7e66c8fe6eb0a1136c992478b9a2272713e7;hb=HEAD#l30 -Alexey From yann.morin at orange.com Tue Feb 1 15:09:48 2022 From: yann.morin at orange.com (yann.morin at orange.com) Date: Tue, 1 Feb 2022 16:09:48 +0100 Subject: [Buildroot] [PATCH] package/glibc: allow runing on kernel older than used for the headers In-Reply-To: References: <12945_1643724020_61F93CE8_12945_430_1_dfe1b340bf9e8e2c47987f28f8fd40cca7d16b3b.1643724006.git.yann.morin@orange.com> Message-ID: <22491_1643728190_61F94D3E_22491_62_1_20220201150948.GB3216@tl-lnx-nyma7486> Alexey, All, On 2022-02-01 14:23 +0000, Alexey Brodkin spake thusly: [--SNIP--] > > +config BR2_PACKAGE_GLIBC_KERNEL_COMPAT > > + string "Oldest kernel version supported" > > + help > > + If you plan on running on various kernel versions, enter the > > + oldest version you expect to run on here. > > + > > + Note that the older the version, the more backward compatibility > > + code is added, and the slower the code may get. > > + > > + Leave it empty (the default) to use the same version as used for > > + the kernel headers. > I'd say there's the third option and frankly I like this one the most - default > oldest version assumed by the glibc itself. The beauty of it is it's really the > oldest version of the kernel which is supported by a given glibc version for > a particular architecture. I also considered that, but I believe that a user should explicitly request the oldest kernel they want to support (yes, they'd have to do their homework to see what that version can be for their architecture). Letting the system decide on itself is prone to providing some surprises... However, letting the user provide an explicit version is also prone to surprises, because if that version is too old, glibc resets it to the oldest it actually supports, and just merely emits a warning message, which does not prevent the build to succeed (it still fails at runtime in the usual way then)... So, in either case, meh... So, we'd have to differentiate between the three cases: - use same as headers (should be the default to keep current behaviour) - use oldest supported by glibc - use explcitly specified version So, two options there: - recognise a magical value in BR2_PACKAGE_GLIBC_KERNEL_COMPAT, like 'oldest' (bikeshed, go) to mean the oldest glibc can support, empty to mean "same as headers", or an actual value. - add a boolean "Specify oldest kernel supported", and hide BR2_PACKAGE_GLIBC_KERNEL_COMPAT behind that boolean; then if the boolean is not set, use same as headers (as today); if it is set, then use BR2_PACKAGE_GLIBC_KERNEL_COMPAT is set, or let glibc decide if not set. Thoughts? Needless to say, I don't have much sympathy for the first option, magical values are bad... But I am not too fond of the second option either, but I can't see a better way to provide for the three different cases... > [1] https://sourceware.org/git/?p=glibc.git;a=blob;f=configure;h=8e5bee775a651fcbaaa96ede8039ae1f049e296e;hb=HEAD#l3529 > [2] https://sourceware.org/git/?p=glibc.git;a=blob;f=sysdeps/unix/sysv/linux/configure.ac;h=197b7e66c8fe6eb0a1136c992478b9a2272713e7;hb=HEAD#l30 Yeah, I already had a look at those for various archs. Thanks! Regards, Yann E. MORIN. -- ____________ .-----------------.--------------------: _ :------------------. | Yann E. MORIN | Real-Time Embedded | __/ ) | /"\ ASCII RIBBON | | +33 534.541.179 | Software Designer | _/ - /' | \ / CAMPAIGN | | +33 638.411.245 '--------------------: (_ `--, | X AGAINST | | yann.morin (at) orange.com |_=" ,--' | / \ HTML MAIL | '--------------------------------------:______/_____:------------------' _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From julien.boibessot at armadeus.com Tue Feb 1 17:06:47 2022 From: julien.boibessot at armadeus.com (julien.boibessot at armadeus.com) Date: Tue, 1 Feb 2022 18:06:47 +0100 Subject: [Buildroot] [PATCH] package/ltris: bump version to 1.2.3 Message-ID: <20220201170647.109298-1-julien.boibessot@armadeus.com> From: Julien BOIBESSOT 0001-fix-build-with-gcc-4.8.patch was integrated mainline and cross-compilation slightly changed. --- .../ltris/0001-fix-build-with-gcc-4.8.patch | 20 ------------------- package/ltris/ltris.hash | 4 ++-- package/ltris/ltris.mk | 4 ++-- 3 files changed, 4 insertions(+), 24 deletions(-) delete mode 100644 package/ltris/0001-fix-build-with-gcc-4.8.patch diff --git a/package/ltris/0001-fix-build-with-gcc-4.8.patch b/package/ltris/0001-fix-build-with-gcc-4.8.patch deleted file mode 100644 index d6bbf6a946..0000000000 --- a/package/ltris/0001-fix-build-with-gcc-4.8.patch +++ /dev/null @@ -1,20 +0,0 @@ -Fix build with gcc 4.8 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://sourceforge.net/p/lgames/patches/28] -Index: ltris/src/bowl.c -=================================================================== ---- ltris/src/bowl.c (r?vision 421) -+++ ltris/src/bowl.c (copie de travail) -@@ -828,9 +828,10 @@ - */ - void bowl_init_block_masks() - { -+ int i; - int masksize = sizeof(block_masks[0].mask); // same for all - -- for (int i = 0; i < 7; i++) { -+ for (i = 0; i < 7; i++) { - block_masks[i].rx = 2; - block_masks[i].ry = 2; - memset(block_masks[i].mask, 0, masksize ); diff --git a/package/ltris/ltris.hash b/package/ltris/ltris.hash index f696e3af17..20f34342ff 100644 --- a/package/ltris/ltris.hash +++ b/package/ltris/ltris.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 a7bc6c5fc6539b88505077a1b4580edc9b179ce0a6b829c58fbd9416cf456195 ltris-1.2.tar.gz -sha256 67f82e045cf7acfef853ea0f426575a8359161a0a325e19f02b529a87c4b6c34 COPYING +sha256 0ec4ad053e066a296529e923c2f626fa0a19c094c5ae03e44359f9c9e50955a8 ltris-1.2.3.tar.gz +sha256 67f82e045cf7acfef853ea0f426575a8359161a0a325e19f02b529a87c4b6c34 COPYING diff --git a/package/ltris/ltris.mk b/package/ltris/ltris.mk index 9b59613417..6e37bdbd19 100644 --- a/package/ltris/ltris.mk +++ b/package/ltris/ltris.mk @@ -5,7 +5,7 @@ ################################################################################ LTRIS_SITE = http://downloads.sourceforge.net/lgames/ltris -LTRIS_VERSION = 1.2 +LTRIS_VERSION = 1.2.3 LTRIS_LICENSE = GPL-2.0+ LTRIS_LICENSE_FILES = COPYING @@ -13,7 +13,7 @@ LTRIS_DEPENDENCIES = sdl $(TARGET_NLS_DEPENDENCIES) LTRIS_LIBS = $(TARGET_NLS_LIBS) LTRIS_CONF_ENV = \ - SDL_CONFIG="$(STAGING_DIR)/usr/bin/sdl-config" \ + PATH="$(PATH):$(STAGING_DIR)/usr/bin" \ LIBS="$(LTRIS_LIBS)" ifeq ($(BR2_PACKAGE_LTRIS_AUDIO),y) -- 2.25.1 From yann.morin.1998 at free.fr Tue Feb 1 17:14:41 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 1 Feb 2022 18:14:41 +0100 Subject: [Buildroot] [PATCH] boot/uboot: add support for bundling TEE in BIN format into U-Boot In-Reply-To: <20220201091342.143010-1-michael@amarulasolutions.com> References: <20220201091342.143010-1-michael@amarulasolutions.com> Message-ID: <20220201171441.GV457876@scaer> Michael, All, On 2022-02-01 10:13 +0100, Michael Trimarchi spake thusly: > Some U-Boot platforms (e.g. nxp) can bundle OPTEE's tee.bin > into the U-Boot image using binman. This patch brings the necessary changes to > enable this feature. > > Signed-off-by: Michael Trimarchi > --- > boot/uboot/Config.in | 12 ++++++++++++ > boot/uboot/uboot.mk | 12 ++++++++++++ > 2 files changed, 24 insertions(+) > > diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in > index c630fc6552..117bbd3faf 100644 > --- a/boot/uboot/Config.in > +++ b/boot/uboot/Config.in > @@ -237,6 +237,18 @@ config BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE > U-Boot. This option makes sure optee-os gets built prior to > U-Boot, and that the TEE variable pointing to OPTEE's > tee.elf, is passed during the Buildroot build. Missing empty line here. > +choice > + prompt "U-Boot OPTEE BL32 format" > + default BR2_TARGET_UBOOT_NEEDS_OPTEE_BIN > + depends on BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE > + > +config BR2_TARGET_UBOOT_NEEDS_OPTEE_BIN > + bool "tee.bin" > + > +config BR2_TARGET_UBOOT_NEEDS_OPTEE_ELF > + bool "tee.elf" > + > +endchoice > > config BR2_TARGET_UBOOT_NEEDS_OPENSBI > bool "U-Boot needs OpenSBI" > diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk > index 574fc7089a..210fa219ed 100644 > --- a/boot/uboot/uboot.mk > +++ b/boot/uboot/uboot.mk > @@ -177,7 +177,19 @@ endif > > ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE),y) > UBOOT_DEPENDENCIES += optee-os > +ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPTEE_ELF),y) > UBOOT_MAKE_OPTS += TEE=$(BINARIES_DIR)/tee.elf > +define UBOOT_COPY_TEE_FIRMWARE > + cp $(BINARIES_DIR)/tee.elf $(@D)/ Why do you need to copy it, when TEE is pointing to the original in $(BINARIESD_DIR), just above, and that has worked well so far? > +endef > +UBOOT_PRE_BUILD_HOOKS += UBOOT_COPY_TEE_FIRMWARE > +else > +UBOOT_MAKE_OPTS += BL32=$(BINARIES_DIR)/tee.bin > +define UBOOT_COPY_TEE_FIRMWARE > + cp $(BINARIES_DIR)/tee-raw.bin $(@D)/tee.bin Ditto: why do you need to copy it, when TEE, just above, also points to the original in $(BINARIES_DIR) ? Regards, Yann E. MORIN. > +endef > +UBOOT_PRE_BUILD_HOOKS += UBOOT_COPY_TEE_FIRMWARE > +endif > endif > > ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSBI),y) > -- > 2.25.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 giulio.benetti at benettiengineering.com Tue Feb 1 17:19:10 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 1 Feb 2022 18:19:10 +0100 Subject: [Buildroot] [PATCH] package/cryptsetup: disable package if we build for Microblaze Message-ID: <20220201171910.32728-1-giulio.benetti@benettiengineering.com> cryptsetup has the same build failure found for libfuse. For libfuse I've patched meson that now correctly checks if symver is available: https://github.com/libfuse/libfuse/pull/620/commits/3aba09a5c56e017746c5c1652dbc845f4db7374a But in cryptsetup the check is done in a header file while building, so I can't use the same approach and that would take not few work to move the check to Autotools, so I've opened an issue on cryptsetup's gitlab: https://gitlab.com/cryptsetup/cryptsetup/-/issues/709 asking if they can manage it the way I've done for libfuse. So let's disable cryptsetup if we're building on Microblaze for the moment and when the issue will be fixed upstream, I will bump the version and re-enable building for Microblaze. Fixes: http://autobuild.buildroot.net/results/86b/86b6b13e6be8375875caebcd91de91fef83f72e8/ Signed-off-by: Giulio Benetti --- package/cryptsetup/Config.in | 1 + package/libblockdev/Config.in | 1 + package/luksmeta/Config.in | 1 + package/systemd/Config.in | 1 + package/udisks/Config.in | 1 + 5 files changed, 5 insertions(+) diff --git a/package/cryptsetup/Config.in b/package/cryptsetup/Config.in index f36883ea47..2f3dd8d2b2 100644 --- a/package/cryptsetup/Config.in +++ b/package/cryptsetup/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_CRYPTSETUP bool "cryptsetup" depends on BR2_TOOLCHAIN_HAS_THREADS # lvm2 + depends on !BR2_microblaze # wrong symver detection depends on BR2_USE_MMU # lvm2, libargon2 depends on !BR2_STATIC_LIBS # lvm2, libargon2 depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c diff --git a/package/libblockdev/Config.in b/package/libblockdev/Config.in index 4389fd794c..38fe2331cf 100644 --- a/package/libblockdev/Config.in +++ b/package/libblockdev/Config.in @@ -23,6 +23,7 @@ comment "plugins" config BR2_PACKAGE_LIBBLOCKDEV_CRYPTO bool "crypto" depends on BR2_TOOLCHAIN_HAS_SYNC_4 # cryptsetup -> json-c + depends on !BR2_microblaze # cryptsetup select BR2_PACKAGE_CRYPTSETUP config BR2_PACKAGE_LIBBLOCKDEV_FS diff --git a/package/luksmeta/Config.in b/package/luksmeta/Config.in index ddc9b6f3bf..88a10bc9da 100644 --- a/package/luksmeta/Config.in +++ b/package/luksmeta/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_LUKSMETA bool "luksmeta" depends on BR2_TOOLCHAIN_HAS_THREADS # cryptsetup -> lvm2 + depends on !BR2_microblaze # cryptsetup depends on BR2_USE_MMU # cryptsetup -> lvm2 depends on !BR2_STATIC_LIBS # cryptsetup -> lvm2 depends on BR2_TOOLCHAIN_HAS_SYNC_4 # cryptsetup -> json-c diff --git a/package/systemd/Config.in b/package/systemd/Config.in index cc0736561e..d1e692f826 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -228,6 +228,7 @@ config BR2_PACKAGE_SYSTEMD_HIBERNATE config BR2_PACKAGE_SYSTEMD_HOMED bool "enable home daemon" depends on BR2_TOOLCHAIN_HAS_THREADS # cryptsetup -> lvm2 + depends on !BR2_microblaze # cryptsetup depends on BR2_USE_MMU # cryptsetup -> lvm2 depends on !BR2_STATIC_LIBS # cryptsetup -> lvm2 depends on BR2_TOOLCHAIN_HAS_SYNC_4 # cryptsetup -> json-c diff --git a/package/udisks/Config.in b/package/udisks/Config.in index 82f11ae7de..8a48d85924 100644 --- a/package/udisks/Config.in +++ b/package/udisks/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_UDISKS depends on BR2_TOOLCHAIN_HAS_THREADS # polkit depends on BR2_USE_WCHAR # dbus-glib -> glib2 depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libblockdev -> cryptsetup -> json-c + depends on !BR2_microblaze # cryptsetup depends on !BR2_STATIC_LIBS # polkit -> duktape select BR2_PACKAGE_DBUS select BR2_PACKAGE_DBUS_GLIB -- 2.25.1 From yegorslists at googlemail.com Tue Feb 1 17:22:00 2022 From: yegorslists at googlemail.com (Yegor Yefremov) Date: Tue, 1 Feb 2022 18:22:00 +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: 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 Reviewed-by: Yegor Yefremov > --- > ...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 yegorslists at googlemail.com Tue Feb 1 17:22:35 2022 From: yegorslists at googlemail.com (Yegor Yefremov) Date: Tue, 1 Feb 2022 18:22:35 +0100 Subject: [Buildroot] [PATCH 2/2] package/hostapd: bump version to 2.10 In-Reply-To: <20220131194818.2084092-2-geomatsi@gmail.com> References: <20220131194818.2084092-1-geomatsi@gmail.com> <20220131194818.2084092-2-geomatsi@gmail.com> Message-ID: On Mon, Jan 31, 2022 at 8:48 PM Sergey Matyukevich wrote: > > 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 Reviewed-by: Yegor Yefremov > --- > ...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 giulio.benetti at benettiengineering.com Tue Feb 1 17:33:51 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 1 Feb 2022 18:33:51 +0100 Subject: [Buildroot] [PATCH 1/2] package/cryptsetup: bump version to 2.4.3 Message-ID: <20220201173352.160244-1-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- package/cryptsetup/cryptsetup.hash | 2 +- package/cryptsetup/cryptsetup.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cryptsetup/cryptsetup.hash b/package/cryptsetup/cryptsetup.hash index b3bb859bdc..dce2686d31 100644 --- a/package/cryptsetup/cryptsetup.hash +++ b/package/cryptsetup/cryptsetup.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.4/sha256sums.asc -sha256 170cc2326a9daeeeb578579176bd10d4a60ee5c4fc5bc69018ce67dafc540b9c cryptsetup-2.4.2.tar.xz +sha256 fc0df945188172264ec5bf1d0bda08264fadc8a3f856d47eba91f31fe354b507 cryptsetup-2.4.3.tar.xz sha256 45670cce8b6a0ddd66c8016cd8ccef6cd71f35717cbacc7f1e895b3855207b33 COPYING sha256 8c33cc37871654ec7ed87e6fbb896c8cf33ef5ef05b1611a5aed857596ffafa5 COPYING.LGPL diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index 9cfd647ac6..2e06047c56 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -5,7 +5,7 @@ ################################################################################ CRYPTSETUP_VERSION_MAJOR = 2.4 -CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).2 +CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).3 CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR) CRYPTSETUP_DEPENDENCIES = \ -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Feb 1 17:33:52 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 1 Feb 2022 18:33:52 +0100 Subject: [Buildroot] [PATCH 2/2] DEVELOPERS: add Giulio Benetti to cryptsetup package In-Reply-To: <20220201173352.160244-1-giulio.benetti@benettiengineering.com> References: <20220201173352.160244-1-giulio.benetti@benettiengineering.com> Message-ID: <20220201173352.160244-2-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 38724726d4..5255b096b0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1097,6 +1097,7 @@ F: configs/asus_tinker_rk3288_defconfig F: configs/olimex_a* F: package/at/ F: package/binutils/ +F: package/cryptsetup/ F: package/erlang-jiffy/ F: package/gcc/ F: package/harfbuzz/ -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Feb 1 17:37:59 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 1 Feb 2022 18:37:59 +0100 Subject: [Buildroot] [PATCH 2/2] DEVELOPERS: add Giulio Benetti to cryptsetup package In-Reply-To: <20220201173633.GC21736@darwin.bork.org> References: <20220201173352.160244-1-giulio.benetti@benettiengineering.com> <20220201173352.160244-2-giulio.benetti@benettiengineering.com> <20220201173633.GC21736@darwin.bork.org> Message-ID: <9c345e33-0f39-c52b-55e1-46c7cf096e2f@benettiengineering.com> Hi Martin, On 01/02/22 18:36, Martin Hicks wrote: > On Tue, Feb 01, 2022 at 06:33:52PM +0100, Giulio Benetti wrote: >> Signed-off-by: Giulio Benetti > > Signed-off-by: Martin Hicks > > I could be removed as a Cryptsetup maintainer. I no longer have a vested interest > in using cryptsetup in a buildroot firmware. That's ok, I send a patch for this and I ask you to give a Acked-by: Best regards -- Giulio Benetti Benetti Engineering sas > Thanks, > mh > >> --- >> DEVELOPERS | 1 + >> 1 file changed, 1 insertion(+) >> >> diff --git a/DEVELOPERS b/DEVELOPERS >> index 38724726d4..5255b096b0 100644 >> --- a/DEVELOPERS >> +++ b/DEVELOPERS >> @@ -1097,6 +1097,7 @@ F: configs/asus_tinker_rk3288_defconfig >> F: configs/olimex_a* >> F: package/at/ >> F: package/binutils/ >> +F: package/cryptsetup/ >> F: package/erlang-jiffy/ >> F: package/gcc/ >> F: package/harfbuzz/ >> -- >> 2.25.1 >> > From giulio.benetti at benettiengineering.com Tue Feb 1 17:41:18 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 1 Feb 2022 18:41:18 +0100 Subject: [Buildroot] [PATCH] DEVELOPERS: remove Martin Hicks from file Message-ID: <20220201174118.277366-1-giulio.benetti@benettiengineering.com> Martin Hicks asked to not maintain cryptsetup anymore: https://lists.buildroot.org/pipermail/buildroot/2022-February/635413.html Also he doesn't mantain any other package, so let's remove him from this file. Signed-off-by: Giulio Benetti --- DEVELOPERS | 3 --- 1 file changed, 3 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 5255b096b0..555723867e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1847,9 +1847,6 @@ F: package/rpi-firmware/ F: package/tzdata/ F: package/zic/ -N: Martin Hicks -F: package/cryptsetup/ - N: Martin Kepplinger F: package/tslib/ F: package/x11r7/xdriver_xf86-input-tslib/ -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Feb 1 17:42:02 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 1 Feb 2022 18:42:02 +0100 Subject: [Buildroot] [PATCH] DEVELOPERS: remove Martin Hicks from file Message-ID: <20220201174202.286878-1-giulio.benetti@benettiengineering.com> Martin Hicks asked to not maintain cryptsetup anymore: https://lists.buildroot.org/pipermail/buildroot/2022-February/635413.html Also he doesn't mantain any other package, so let's remove him from this file. Signed-off-by: Giulio Benetti --- DEVELOPERS | 3 --- 1 file changed, 3 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 5255b096b0..555723867e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1847,9 +1847,6 @@ F: package/rpi-firmware/ F: package/tzdata/ F: package/zic/ -N: Martin Hicks -F: package/cryptsetup/ - N: Martin Kepplinger F: package/tslib/ F: package/x11r7/xdriver_xf86-input-tslib/ -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Feb 1 17:42:45 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 1 Feb 2022 18:42:45 +0100 Subject: [Buildroot] [PATCH] DEVELOPERS: remove Martin Hicks from file In-Reply-To: <20220201174118.277366-1-giulio.benetti@benettiengineering.com> References: <20220201174118.277366-1-giulio.benetti@benettiengineering.com> Message-ID: <69b69000-f7ff-cd04-2c1e-301a8d0d9dc3@benettiengineering.com> I've resent with Martin in Cc to give a Acked-by, sorry for the noise -- Giulio Benetti Benetti Engineering sas On 01/02/22 18:41, Giulio Benetti wrote: > Martin Hicks asked to not maintain cryptsetup anymore: > https://lists.buildroot.org/pipermail/buildroot/2022-February/635413.html > > Also he doesn't mantain any other package, so let's remove him from this > file. > > Signed-off-by: Giulio Benetti > --- > DEVELOPERS | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/DEVELOPERS b/DEVELOPERS > index 5255b096b0..555723867e 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1847,9 +1847,6 @@ F: package/rpi-firmware/ > F: package/tzdata/ > F: package/zic/ > > -N: Martin Hicks > -F: package/cryptsetup/ > - > N: Martin Kepplinger > F: package/tslib/ > F: package/x11r7/xdriver_xf86-input-tslib/ From michael at amarulasolutions.com Tue Feb 1 17:57:30 2022 From: michael at amarulasolutions.com (Michael Nazzareno Trimarchi) Date: Tue, 1 Feb 2022 18:57:30 +0100 Subject: [Buildroot] [PATCH] boot/uboot: add support for bundling TEE in BIN format into U-Boot In-Reply-To: <20220201171441.GV457876@scaer> References: <20220201091342.143010-1-michael@amarulasolutions.com> <20220201171441.GV457876@scaer> Message-ID: Hi On Tue, Feb 1, 2022 at 6:14 PM Yann E. MORIN wrote: > > Michael, All, > > On 2022-02-01 10:13 +0100, Michael Trimarchi spake thusly: > > Some U-Boot platforms (e.g. nxp) can bundle OPTEE's tee.bin > > into the U-Boot image using binman. This patch brings the necessary changes to > > enable this feature. > > > > Signed-off-by: Michael Trimarchi > > --- > > boot/uboot/Config.in | 12 ++++++++++++ > > boot/uboot/uboot.mk | 12 ++++++++++++ > > 2 files changed, 24 insertions(+) > > > > diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in > > index c630fc6552..117bbd3faf 100644 > > --- a/boot/uboot/Config.in > > +++ b/boot/uboot/Config.in > > @@ -237,6 +237,18 @@ config BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE > > U-Boot. This option makes sure optee-os gets built prior to > > U-Boot, and that the TEE variable pointing to OPTEE's > > tee.elf, is passed during the Buildroot build. > > Missing empty line here. > ok > > +choice > > + prompt "U-Boot OPTEE BL32 format" > > + default BR2_TARGET_UBOOT_NEEDS_OPTEE_BIN > > + depends on BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE > > + > > +config BR2_TARGET_UBOOT_NEEDS_OPTEE_BIN > > + bool "tee.bin" > > + > > +config BR2_TARGET_UBOOT_NEEDS_OPTEE_ELF > > + bool "tee.elf" > > + > > +endchoice > > > > config BR2_TARGET_UBOOT_NEEDS_OPENSBI > > bool "U-Boot needs OpenSBI" > > diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk > > index 574fc7089a..210fa219ed 100644 > > --- a/boot/uboot/uboot.mk > > +++ b/boot/uboot/uboot.mk > > @@ -177,7 +177,19 @@ endif > > > > ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE),y) > > UBOOT_DEPENDENCIES += optee-os > > +ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPTEE_ELF),y) > > UBOOT_MAKE_OPTS += TEE=$(BINARIES_DIR)/tee.elf > > +define UBOOT_COPY_TEE_FIRMWARE > > + cp $(BINARIES_DIR)/tee.elf $(@D)/ > > Why do you need to copy it, when TEE is pointing to the original in > $(BINARIESD_DIR), just above, and that has worked well so far? > The copy are needed to binman to include it > > +endef > > +UBOOT_PRE_BUILD_HOOKS += UBOOT_COPY_TEE_FIRMWARE > > +else > > +UBOOT_MAKE_OPTS += BL32=$(BINARIES_DIR)/tee.bin > > +define UBOOT_COPY_TEE_FIRMWARE > > + cp $(BINARIES_DIR)/tee-raw.bin $(@D)/tee.bin > > Ditto: why do you need to copy it, when TEE, just above, also points to > the original in $(BINARIES_DIR) ? Same as above Michael > > Regards, > Yann E. MORIN. > > > +endef > > +UBOOT_PRE_BUILD_HOOKS += UBOOT_COPY_TEE_FIRMWARE > > +endif > > endif > > > > ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSBI),y) > > -- > > 2.25.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. | > '------------------------------^-------^------------------^--------------------' -- 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 Tue Feb 1 18:00:53 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 1 Feb 2022 19:00:53 +0100 Subject: [Buildroot] [PATCH 1/2] board/orangepi/orangepi-zero-plus2: fix build after genimage update In-Reply-To: <20220131212456.3176156-1-geomatsi@gmail.com> References: <20220131212456.3176156-1-geomatsi@gmail.com> Message-ID: Hi Sergey, On 31/01/22 22:24, Sergey Matyukevich wrote: > 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. Here we need a: Fixes: url where you point the failure Best regards -- Giulio Benetti Benetti Engineering sas > 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 > } From giulio.benetti at benettiengineering.com Tue Feb 1 18:06:02 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 1 Feb 2022 19:06:02 +0100 Subject: [Buildroot] [PATCH 2/2] configs/orangepi_zero_plus2: BSP update In-Reply-To: <20220131212456.3176156-2-geomatsi@gmail.com> References: <20220131212456.3176156-1-geomatsi@gmail.com> <20220131212456.3176156-2-geomatsi@gmail.com> Message-ID: Hi Sergey, On 31/01/22 22:24, Sergey Matyukevich wrote: > 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. Same as previous patch we need a: Fixes: url where you point the failure There is the latest gitlab pipeline here, especially this board build failure: https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478371 But this was for previous patch, sorry, so please point this ^^^ URL there. And here probably you've found the bug by yourself, correct? Best regards -- Giulio Benetti Benetti Engineering sas > 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 -- Giulio Benetti Benetti Engineering sas From geomatsi at gmail.com Tue Feb 1 18:11:27 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Tue, 1 Feb 2022 21:11:27 +0300 Subject: [Buildroot] [PATCH 1/2] board/orangepi/orangepi-zero-plus2: fix build after genimage update In-Reply-To: References: <20220131212456.3176156-1-geomatsi@gmail.com> Message-ID: > Hi Sergey, > > On 31/01/22 22:24, Sergey Matyukevich wrote: > > 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. > > Here we need a: > Fixes: > url where you point the failure You are right. But I don't have a CI report for this. I noticed the problem when building images locally. Regards, Sergey From giulio.benetti at benettiengineering.com Tue Feb 1 18:18:51 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 1 Feb 2022 19:18:51 +0100 Subject: [Buildroot] [PATCH 1/2] board/orangepi/orangepi-zero-plus2: fix build after genimage update In-Reply-To: References: <20220131212456.3176156-1-geomatsi@gmail.com> Message-ID: <260964d9-46f6-cb5d-8779-9559f0a2d0a8@benettiengineering.com> On 01/02/22 19:11, Sergey Matyukevich wrote: >> Hi Sergey, >> >> On 31/01/22 22:24, Sergey Matyukevich wrote: >>> 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. >> >> Here we need a: >> Fixes: >> url where you point the failure > > You are right. But I don't have a CI report for this. I noticed the problem when > building images locally. Check here for this patch: https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478371 for the other you've found it locally. -- Giulio Benetti Benetti Engineering sas From festevam at gmail.com Tue Feb 1 18:25:48 2022 From: festevam at gmail.com (Fabio Estevam) Date: Tue, 1 Feb 2022 15:25:48 -0300 Subject: [Buildroot] kmscube: GLES3/gl3.h: No such file or directory Message-ID: Hi Rob, We are getting the following kmscube build error in Buildroot: ../cube-shadertoy.c:37:10: fatal error: GLES3/gl3.h: No such file or directory 37 | #include Complete log: http://autobuild.buildroot.net/results/7f559e89a96273fc019056eae13104e14161a484/build-end.log In OpenEmbedded the following patch is used: http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-graphics/kmscube/kmscube/0001-texturator-Use-correct-GL-extension-header.patch?h=master What would be the appropriate fix for this issue? Thanks, Fabio Estevam From giulio.benetti at benettiengineering.com Tue Feb 1 18:33:25 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 1 Feb 2022 19:33:25 +0100 Subject: [Buildroot] [PATCH 0/6] Fix gitlab CI build failure due to missing HOST_ dependencies Message-ID: <20220201183331.4009320-1-giulio.benetti@benettiengineering.com> This patchset fixes the gitlab build failure due to HOST_ dependencies(uboot/linux). Giulio Benetti (6): configs/bananapi_m2_ultra_defconfig: u-boot needs host python3 and host openssl configs/beaglev_defconfig: linux needs host openssl configs/microchip_sama5d2_icp_mmc_defconfig: linux needs host openssl configs/microchip_sama5d2_icp_mmc_dev_defconfig: linux needs host openssl configs/microchip_sama7g5ek_mmc_defconfig: add missing BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15 configs/microchip_sama7g5ek_mmc_dev_defconfig: add missing BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15 configs/bananapi_m2_ultra_defconfig | 2 ++ configs/beaglev_defconfig | 1 + configs/microchip_sama5d2_icp_mmc_defconfig | 1 + configs/microchip_sama5d2_icp_mmc_dev_defconfig | 1 + configs/microchip_sama7g5ek_mmc_defconfig | 1 + configs/microchip_sama7g5ek_mmc_dev_defconfig | 1 + 6 files changed, 7 insertions(+) -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Feb 1 18:33:28 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 1 Feb 2022 19:33:28 +0100 Subject: [Buildroot] [PATCH 3/6] configs/microchip_sama5d2_icp_mmc_defconfig: linux needs host openssl In-Reply-To: <20220201183331.4009320-1-giulio.benetti@benettiengineering.com> References: <20220201183331.4009320-1-giulio.benetti@benettiengineering.com> Message-ID: <20220201183331.4009320-4-giulio.benetti@benettiengineering.com> Fixes: https://gitlab.com/ymorin/buildroot/-/jobs/2035821094 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..27ea4970f1 100644 --- a/configs/microchip_sama5d2_icp_mmc_defconfig +++ b/configs/microchip_sama5d2_icp_mmc_defconfig @@ -12,6 +12,7 @@ BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,li BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d2_icp" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Feb 1 18:33:26 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 1 Feb 2022 19:33:26 +0100 Subject: [Buildroot] [PATCH 1/6] configs/bananapi_m2_ultra_defconfig: u-boot needs host python3 and host openssl In-Reply-To: <20220201183331.4009320-1-giulio.benetti@benettiengineering.com> References: <20220201183331.4009320-1-giulio.benetti@benettiengineering.com> Message-ID: <20220201183331.4009320-2-giulio.benetti@benettiengineering.com> Fixes: https://gitlab.com/ymorin/buildroot/-/jobs/2035820967 Signed-off-by: Giulio Benetti --- configs/bananapi_m2_ultra_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/bananapi_m2_ultra_defconfig b/configs/bananapi_m2_ultra_defconfig index 67ecec424c..2ec0e60e8d 100644 --- a/configs/bananapi_m2_ultra_defconfig +++ b/configs/bananapi_m2_ultra_defconfig @@ -19,7 +19,9 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="bananapi_m2_berry" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" BR2_PACKAGE_HOST_DOSFSTOOLS=y -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Feb 1 18:33:29 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 1 Feb 2022 19:33:29 +0100 Subject: [Buildroot] [PATCH 4/6] configs/microchip_sama5d2_icp_mmc_dev_defconfig: linux needs host openssl In-Reply-To: <20220201183331.4009320-1-giulio.benetti@benettiengineering.com> References: <20220201183331.4009320-1-giulio.benetti@benettiengineering.com> Message-ID: <20220201183331.4009320-5-giulio.benetti@benettiengineering.com> Fixes: https://gitlab.com/ymorin/buildroot/-/jobs/2035821096 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..27d1d3409d 100644 --- a/configs/microchip_sama5d2_icp_mmc_dev_defconfig +++ b/configs/microchip_sama5d2_icp_mmc_dev_defconfig @@ -16,6 +16,7 @@ BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,li BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d2_icp" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_LINUX_TOOLS_IIO=y BR2_PACKAGE_BZIP2=y BR2_PACKAGE_XZ=y -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Feb 1 18:33:27 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 1 Feb 2022 19:33:27 +0100 Subject: [Buildroot] [PATCH 2/6] configs/beaglev_defconfig: linux needs host openssl In-Reply-To: <20220201183331.4009320-1-giulio.benetti@benettiengineering.com> References: <20220201183331.4009320-1-giulio.benetti@benettiengineering.com> Message-ID: <20220201183331.4009320-3-giulio.benetti@benettiengineering.com> Fixes: https://gitlab.com/ymorin/buildroot/-/jobs/2035820979 Signed-off-by: Giulio Benetti --- configs/beaglev_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/beaglev_defconfig b/configs/beaglev_defconfig index 70459bf3e8..79af8c2ece 100644 --- a/configs/beaglev_defconfig +++ b/configs/beaglev_defconfig @@ -16,6 +16,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="starlight" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="starfive/jh7100-beaglev-starlight" 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_TAR is not set -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Feb 1 18:33:30 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 1 Feb 2022 19:33:30 +0100 Subject: [Buildroot] [PATCH 5/6] configs/microchip_sama7g5ek_mmc_defconfig: add missing BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15 In-Reply-To: <20220201183331.4009320-1-giulio.benetti@benettiengineering.com> References: <20220201183331.4009320-1-giulio.benetti@benettiengineering.com> Message-ID: <20220201183331.4009320-6-giulio.benetti@benettiengineering.com> Fixes: https://gitlab.com/ymorin/buildroot/-/jobs/2035821098 Signed-off-by: Giulio Benetti --- configs/microchip_sama7g5ek_mmc_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/microchip_sama7g5ek_mmc_defconfig b/configs/microchip_sama7g5ek_mmc_defconfig index b1cd193829..2d4b720342 100644 --- a/configs/microchip_sama7g5ek_mmc_defconfig +++ b/configs/microchip_sama7g5ek_mmc_defconfig @@ -1,6 +1,7 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/microchip/sama7g5ek/genimage.cfg" BR2_LINUX_KERNEL=y -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Feb 1 18:33:31 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 1 Feb 2022 19:33:31 +0100 Subject: [Buildroot] [PATCH 6/6] configs/microchip_sama7g5ek_mmc_dev_defconfig: add missing BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15 In-Reply-To: <20220201183331.4009320-1-giulio.benetti@benettiengineering.com> References: <20220201183331.4009320-1-giulio.benetti@benettiengineering.com> Message-ID: <20220201183331.4009320-7-giulio.benetti@benettiengineering.com> Fixes: https://gitlab.com/ymorin/buildroot/-/jobs/2035821100 Signed-off-by: Giulio Benetti --- configs/microchip_sama7g5ek_mmc_dev_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/microchip_sama7g5ek_mmc_dev_defconfig b/configs/microchip_sama7g5ek_mmc_dev_defconfig index 3253bce401..383865c2b6 100644 --- a/configs/microchip_sama7g5ek_mmc_dev_defconfig +++ b/configs/microchip_sama7g5ek_mmc_dev_defconfig @@ -1,6 +1,7 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_TOOLCHAIN_BUILDROOT_WCHAR=y BR2_PTHREAD_DEBUG=y BR2_TOOLCHAIN_BUILDROOT_CXX=y -- 2.25.1 From yann.morin.1998 at free.fr Tue Feb 1 19:01:26 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 1 Feb 2022 20:01:26 +0100 Subject: [Buildroot] [PATCH] boot/uboot: add support for bundling TEE in BIN format into U-Boot In-Reply-To: References: <20220201091342.143010-1-michael@amarulasolutions.com> <20220201171441.GV457876@scaer> Message-ID: <20220201190126.GW457876@scaer> Michael, All, On 2022-02-01 18:57 +0100, Michael Nazzareno Trimarchi spake thusly: > On Tue, Feb 1, 2022 at 6:14 PM Yann E. MORIN wrote: > > On 2022-02-01 10:13 +0100, Michael Trimarchi spake thusly: > > > Some U-Boot platforms (e.g. nxp) can bundle OPTEE's tee.bin > > > into the U-Boot image using binman. This patch brings the necessary changes to > > > enable this feature. Also, comit log not nicely formatted: it should be wrapped at ~72 chars on every lines. > > > Signed-off-by: Michael Trimarchi > > > --- [--SNIP--] > > > ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE),y) > > > UBOOT_DEPENDENCIES += optee-os > > > +ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPTEE_ELF),y) > > > UBOOT_MAKE_OPTS += TEE=$(BINARIES_DIR)/tee.elf ,^^^^^^^^^^^^^^^^^^^^^^^^^^^ Note this for later ----/ > > > +define UBOOT_COPY_TEE_FIRMWARE > > > + cp $(BINARIES_DIR)/tee.elf $(@D)/ > > Why do you need to copy it, when TEE is pointing to the original in > > $(BINARIESD_DIR), just above, and that has worked well so far? > The copy are needed to binman to include it As far as I understand it, BR2_TARGET_UBOOT_NEEDS_OPTEE_ELF is supposed to behave like the code we had so far, and so far we did not have the copy, and that seems that it worked OK without the copy. Now you are adding the copy: why was it not needed before, and why is it needed now? And if binman needs it in the source tree, then why do we point the TEE variable to the original location in BINARIES_DIR, as I highlighted above? > > > +endef > > > +UBOOT_PRE_BUILD_HOOKS += UBOOT_COPY_TEE_FIRMWARE > > > +else > > > +UBOOT_MAKE_OPTS += BL32=$(BINARIES_DIR)/tee.bin > > > +define UBOOT_COPY_TEE_FIRMWARE > > > + cp $(BINARIES_DIR)/tee-raw.bin $(@D)/tee.bin > > Ditto: why do you need to copy it, when TEE, just above, also points to > > the original in $(BINARIES_DIR) ? > Same as above Ditto. 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 michael at amarulasolutions.com Tue Feb 1 19:12:48 2022 From: michael at amarulasolutions.com (Michael Nazzareno Trimarchi) Date: Tue, 1 Feb 2022 20:12:48 +0100 Subject: [Buildroot] [PATCH] boot/uboot: add support for bundling TEE in BIN format into U-Boot In-Reply-To: <20220201190126.GW457876@scaer> References: <20220201091342.143010-1-michael@amarulasolutions.com> <20220201171441.GV457876@scaer> <20220201190126.GW457876@scaer> Message-ID: Hi Yann On Tue, Feb 1, 2022 at 8:01 PM Yann E. MORIN wrote: > > Michael, All, > > On 2022-02-01 18:57 +0100, Michael Nazzareno Trimarchi spake thusly: > > On Tue, Feb 1, 2022 at 6:14 PM Yann E. MORIN wrote: > > > On 2022-02-01 10:13 +0100, Michael Trimarchi spake thusly: > > > > Some U-Boot platforms (e.g. nxp) can bundle OPTEE's tee.bin > > > > into the U-Boot image using binman. This patch brings the necessary changes to > > > > enable this feature. > > Also, comit log not nicely formatted: it should be wrapped at ~72 chars > on every lines. > > > > > Signed-off-by: Michael Trimarchi > > > > --- > [--SNIP--] > > > > ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE),y) > > > > UBOOT_DEPENDENCIES += optee-os > > > > +ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPTEE_ELF),y) > > > > UBOOT_MAKE_OPTS += TEE=$(BINARIES_DIR)/tee.elf > ,^^^^^^^^^^^^^^^^^^^^^^^^^^^ > Note this for later ----/ > > > > > +define UBOOT_COPY_TEE_FIRMWARE > > > > + cp $(BINARIES_DIR)/tee.elf $(@D)/ > > > Why do you need to copy it, when TEE is pointing to the original in > > > $(BINARIESD_DIR), just above, and that has worked well so far? > > The copy are needed to binman to include it > > As far as I understand it, BR2_TARGET_UBOOT_NEEDS_OPTEE_ELF is supposed > to behave like the code we had so far, and so far we did not have the > copy, and that seems that it worked OK without the copy. > > Now you are adding the copy: why was it not needed before, and why is it > needed now? > > And if binman needs it in the source tree, then why do we point the TEE > variable to the original location in BINARIES_DIR, as I highlighted > above? binman takes this and put an image on each part. We already copy atf. Now nxp I need to copy tee-raw.bin in tee.bin fit { description = "Configuration to load ATF before U-Boot"; fit,external-offset = ; fit,fdt-list = "of-list"; #address-cells = <1>; images { uboot { arch = "arm64"; compression = "none"; description = "U-Boot (64-bit)"; load = ; type = "standalone"; uboot_blob { filename = "u-boot-nodtb.bin"; type = "blob-ext"; }; }; atf { arch = "arm64"; compression = "none"; description = "ARM Trusted Firmware"; entry = <0x960000>; load = <0x960000>; type = "firmware"; atf_blob { filename = "bl31.bin"; type = "blob-ext"; }; }; tee { arch = "arm64"; compression = "none"; description = "OP-TEE Trusted OS (bl32)"; load = <0x5f800000>; entry = <0x5f800000>; type = "firmware"; tee_blob { filename = "tee.bin"; type = "blob-ext"; }; }; binman_fip: fip { arch = "arm64"; compression = "none"; description = "Trusted Firmware FIP"; load = <0x40310000>; type = "firmware"; }; @fdt-SEQ { compression = "none"; description = "NAME"; type = "flat_dt"; uboot_fdt_blob { filename = "u-boot.dtb"; type = "blob-ext"; }; }; }; The above work working for rockchip so as we copy atf, I need to copy tee Michael > > > > > +endef > > > > +UBOOT_PRE_BUILD_HOOKS += UBOOT_COPY_TEE_FIRMWARE > > > > +else > > > > +UBOOT_MAKE_OPTS += BL32=$(BINARIES_DIR)/tee.bin > > > > +define UBOOT_COPY_TEE_FIRMWARE > > > > + cp $(BINARIES_DIR)/tee-raw.bin $(@D)/tee.bin > > > Ditto: why do you need to copy it, when TEE, just above, also points to > > > the original in $(BINARIES_DIR) ? > > Same as above > > Ditto. > > 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. | > '------------------------------^-------^------------------^--------------------' -- 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 michael at amarulasolutions.com Tue Feb 1 19:47:41 2022 From: michael at amarulasolutions.com (Michael Nazzareno Trimarchi) Date: Tue, 1 Feb 2022 20:47:41 +0100 Subject: [Buildroot] [PATCH] boot/uboot: add support for bundling TEE in BIN format into U-Boot In-Reply-To: References: <20220201091342.143010-1-michael@amarulasolutions.com> <20220201171441.GV457876@scaer> <20220201190126.GW457876@scaer> Message-ID: Hi Yann On Tue, Feb 1, 2022 at 8:12 PM Michael Nazzareno Trimarchi wrote: > > Hi Yann > > > On Tue, Feb 1, 2022 at 8:01 PM Yann E. MORIN wrote: > > > > Michael, All, > > > > On 2022-02-01 18:57 +0100, Michael Nazzareno Trimarchi spake thusly: > > > On Tue, Feb 1, 2022 at 6:14 PM Yann E. MORIN wrote: > > > > On 2022-02-01 10:13 +0100, Michael Trimarchi spake thusly: > > > > > Some U-Boot platforms (e.g. nxp) can bundle OPTEE's tee.bin > > > > > into the U-Boot image using binman. This patch brings the necessary changes to > > > > > enable this feature. > > > > Also, comit log not nicely formatted: it should be wrapped at ~72 chars > > on every lines. > > > > > > > Signed-off-by: Michael Trimarchi > > > > > --- > > [--SNIP--] > > > > > ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE),y) > > > > > UBOOT_DEPENDENCIES += optee-os > > > > > +ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPTEE_ELF),y) > > > > > UBOOT_MAKE_OPTS += TEE=$(BINARIES_DIR)/tee.elf > > ,^^^^^^^^^^^^^^^^^^^^^^^^^^^ > > Note this for later ----/ > > > > > > > +define UBOOT_COPY_TEE_FIRMWARE > > > > > + cp $(BINARIES_DIR)/tee.elf $(@D)/ > > > > Why do you need to copy it, when TEE is pointing to the original in > > > > $(BINARIESD_DIR), just above, and that has worked well so far? > > > The copy are needed to binman to include it > > > > As far as I understand it, BR2_TARGET_UBOOT_NEEDS_OPTEE_ELF is supposed > > to behave like the code we had so far, and so far we did not have the > > copy, and that seems that it worked OK without the copy. > > > > Now you are adding the copy: why was it not needed before, and why is it > > needed now? > > > > And if binman needs it in the source tree, then why do we point the TEE > > variable to the original location in BINARIES_DIR, as I highlighted > > above? > > binman takes this and put an image on each part. We already copy atf. > Now nxp I need to copy tee-raw.bin in tee.bin > > fit { > description = "Configuration to load ATF before U-Boot"; > fit,external-offset = ; > fit,fdt-list = "of-list"; > #address-cells = <1>; > > images { > uboot { > arch = "arm64"; > compression = "none"; > description = "U-Boot (64-bit)"; > load = ; > type = "standalone"; > > uboot_blob { > filename = "u-boot-nodtb.bin"; > type = "blob-ext"; > }; > }; > > atf { > arch = "arm64"; > compression = "none"; > description = "ARM Trusted Firmware"; > entry = <0x960000>; > load = <0x960000>; > type = "firmware"; > > atf_blob { > filename = "bl31.bin"; > type = "blob-ext"; > }; > }; > > tee { > arch = "arm64"; > compression = "none"; > description = "OP-TEE Trusted > OS (bl32)"; > load = <0x5f800000>; > entry = <0x5f800000>; > type = "firmware"; > > tee_blob { > filename = "tee.bin"; > type = "blob-ext"; > }; > }; > > binman_fip: fip { > arch = "arm64"; > compression = "none"; > description = "Trusted Firmware FIP"; > load = <0x40310000>; > type = "firmware"; > }; > > @fdt-SEQ { > compression = "none"; > description = "NAME"; > type = "flat_dt"; > > uboot_fdt_blob { > filename = "u-boot.dtb"; > type = "blob-ext"; > }; > }; > }; > > The above work working for rockchip so as we copy atf, I need to copy tee > For your better understand this is my config change for the board I sent yesterday 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_BL32_OPTEE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_TARGETS="BL32_BASE=0x5f800000 BL32_SIZE=0x800000" BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30a60000" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_DEBUG=y +BR2_TARGET_OPTEE_OS=y +BR2_TARGET_OPTEE_OS_PLATFORM="imx-mx8mnevk" +BR2_TARGET_OPTEE_OS_ADDITIONAL_VARIABLES="CFG_UART_BASE=UART4_BASE CFG_DDR_SIZE=0x20000000 CFG_TZDRAM_SIZE=0x600000 CFG_SHMEM_SIZE=0x200000 CFG_TEE_CORE_NB_CORE=1" +BR2_TARGET_OPTEE_OS_CORE_IMAGES="tee.bin tee-*_v2.bin tee-raw.bin" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y @@ -36,6 +47,7 @@ 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_OPTEE_TEE=y BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" I have sent a patch upstream for atf in order to calculate better reserved area. Michael > Michael > > > > > > > > +endef > > > > > +UBOOT_PRE_BUILD_HOOKS += UBOOT_COPY_TEE_FIRMWARE > > > > > +else > > > > > +UBOOT_MAKE_OPTS += BL32=$(BINARIES_DIR)/tee.bin > > > > > +define UBOOT_COPY_TEE_FIRMWARE > > > > > + cp $(BINARIES_DIR)/tee-raw.bin $(@D)/tee.bin > > > > Ditto: why do you need to copy it, when TEE, just above, also points to > > > > the original in $(BINARIES_DIR) ? > > > Same as above > > > > Ditto. > > > > 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. | > > '------------------------------^-------^------------------^--------------------' > > > > -- > 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 -- 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 michael at amarulasolutions.com Tue Feb 1 20:04:04 2022 From: michael at amarulasolutions.com (Michael Nazzareno Trimarchi) Date: Tue, 1 Feb 2022 21:04:04 +0100 Subject: [Buildroot] [PATCH 3/6] configs/microchip_sama5d2_icp_mmc_defconfig: linux needs host openssl In-Reply-To: <20220201183331.4009320-4-giulio.benetti@benettiengineering.com> References: <20220201183331.4009320-1-giulio.benetti@benettiengineering.com> <20220201183331.4009320-4-giulio.benetti@benettiengineering.com> Message-ID: Hi Giulio On Tue, Feb 1, 2022 at 7:34 PM Giulio Benetti wrote: > > Fixes: > https://gitlab.com/ymorin/buildroot/-/jobs/2035821094 > > 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..27ea4970f1 100644 > --- a/configs/microchip_sama5d2_icp_mmc_defconfig > +++ b/configs/microchip_sama5d2_icp_mmc_defconfig > @@ -12,6 +12,7 @@ BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,li > BR2_LINUX_KERNEL_DEFCONFIG="sama5" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d2_icp" > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y I can see that my submission help on those patches Reviewed-by: Michael Trimarchi Michael > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > -- > 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 Alexey.Brodkin at synopsys.com Tue Feb 1 20:02:18 2022 From: Alexey.Brodkin at synopsys.com (Alexey Brodkin) Date: Tue, 1 Feb 2022 20:02:18 +0000 Subject: [Buildroot] [PATCH] package/glibc: allow runing on kernel older than used for the headers In-Reply-To: <22491_1643728190_61F94D3E_22491_62_1_20220201150948.GB3216@tl-lnx-nyma7486> References: <12945_1643724020_61F93CE8_12945_430_1_dfe1b340bf9e8e2c47987f28f8fd40cca7d16b3b.1643724006.git.yann.morin@orange.com> <22491_1643728190_61F94D3E_22491_62_1_20220201150948.GB3216@tl-lnx-nyma7486> Message-ID: Hi Yann, > > > +config BR2_PACKAGE_GLIBC_KERNEL_COMPAT > > > + string "Oldest kernel version supported" > > > + help > > > + If you plan on running on various kernel versions, enter the > > > + oldest version you expect to run on here. > > > + > > > + Note that the older the version, the more backward compatibility > > > + code is added, and the slower the code may get. > > > + > > > + Leave it empty (the default) to use the same version as used for > > > + the kernel headers. > > I'd say there's the third option and frankly I like this one the most - default > > oldest version assumed by the glibc itself. The beauty of it is it's really the > > oldest version of the kernel which is supported by a given glibc version for > > a particular architecture. > > I also considered that, but I believe that a user should explicitly > request the oldest kernel they want to support (yes, they'd have to do > their homework to see what that version can be for their architecture). Yup, let's provide our user with enough rope ;) > Letting the system decide on itself is prone to providing some > surprises... However, letting the user provide an explicit version is > also prone to surprises, because if that version is too old, glibc > resets it to the oldest it actually supports, and just merely emits a > warning message, which does not prevent the build to succeed (it still > fails at runtime in the usual way then)... > > So, in either case, meh... Agree. > So, we'd have to differentiate between the three cases: > - use same as headers (should be the default to keep current > behaviour) > - use oldest supported by glibc > - use explcitly specified version > > So, two options there: > > - recognise a magical value in BR2_PACKAGE_GLIBC_KERNEL_COMPAT, like > 'oldest' (bikeshed, go) to mean the oldest glibc can support, empty > to mean "same as headers", or an actual value. This option looks a bit more clean to me as we don't introduce yet another hidden option (as in the one below). Though I would think not that many people is really worried by the toolchain internals, so maybe you introduce something, it quickly gets discussed and merged? :) Alternatively we may explicitly set per-arch minimal version in their corresponding "arch/Config.in.xxx" so at least this is more visible as not each and every user is willing to dig into glibc's internals. Thinking out loud further along the lines above, maybe even in the same way explicitly set kernel version that matches used headers (if we automatically extract that info from some existing Buildroot variable)? Ir it's really something insane? > - add a boolean "Specify oldest kernel supported", and hide > BR2_PACKAGE_GLIBC_KERNEL_COMPAT behind that boolean; then if the > boolean is not set, use same as headers (as today); if it is set, > then use BR2_PACKAGE_GLIBC_KERNEL_COMPAT is set, or let glibc decide > if not set. > -Alexey From giulio.benetti at benettiengineering.com Tue Feb 1 20:18:14 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 1 Feb 2022 21:18:14 +0100 Subject: [Buildroot] [PATCH 3/6] configs/microchip_sama5d2_icp_mmc_defconfig: linux needs host openssl In-Reply-To: References: Message-ID: <93CEDCC7-8859-4CBD-B21F-C07DA101A204@benettiengineering.com> Hi Michael, > Il giorno 1 feb 2022, alle ore 21:04, Michael Nazzareno Trimarchi ha scritto: > > ?Hi Giulio > >> On Tue, Feb 1, 2022 at 7:34 PM Giulio Benetti >> wrote: >> >> Fixes: >> https://gitlab.com/ymorin/buildroot/-/jobs/2035821094 >> >> 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..27ea4970f1 100644 >> --- a/configs/microchip_sama5d2_icp_mmc_defconfig >> +++ b/configs/microchip_sama5d2_icp_mmc_defconfig >> @@ -12,6 +12,7 @@ BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,li >> BR2_LINUX_KERNEL_DEFCONFIG="sama5" >> BR2_LINUX_KERNEL_DTS_SUPPORT=y >> BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d2_icp" >> +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > > I can see that my submission help on those patches Keep submitting! And thank you for the review :-) It would be great if you send the Reviewed-by to all patches of this patchset. Giulio > > Reviewed-by: Michael Trimarchi > > Michael > >> BR2_TARGET_ROOTFS_EXT2=y >> BR2_TARGET_ROOTFS_EXT2_4=y >> BR2_TARGET_ROOTFS_EXT2_SIZE="120M" >> -- >> 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 arnout at mind.be Tue Feb 1 20:42:17 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 1 Feb 2022 21:42:17 +0100 Subject: [Buildroot] [PATCH] package/glibc: allow runing on kernel older than used for the headers In-Reply-To: <22491_1643728190_61F94D3E_22491_62_1_20220201150948.GB3216@tl-lnx-nyma7486> References: <12945_1643724020_61F93CE8_12945_430_1_dfe1b340bf9e8e2c47987f28f8fd40cca7d16b3b.1643724006.git.yann.morin@orange.com> <22491_1643728190_61F94D3E_22491_62_1_20220201150948.GB3216@tl-lnx-nyma7486> Message-ID: <46ea7193-ea68-c8b6-9b43-d5b17bb8144f@mind.be> On 01/02/2022 16:09, yann.morin at orange.com wrote: > Alexey, All, > > On 2022-02-01 14:23 +0000, Alexey Brodkin spake thusly: > [--SNIP--] >>> +config BR2_PACKAGE_GLIBC_KERNEL_COMPAT >>> + string "Oldest kernel version supported" >>> + help >>> + If you plan on running on various kernel versions, enter the >>> + oldest version you expect to run on here. >>> + >>> + Note that the older the version, the more backward compatibility >>> + code is added, and the slower the code may get. >>> + >>> + Leave it empty (the default) to use the same version as used for >>> + the kernel headers. >> I'd say there's the third option and frankly I like this one the most - default >> oldest version assumed by the glibc itself. The beauty of it is it's really the >> oldest version of the kernel which is supported by a given glibc version for >> a particular architecture. > > I also considered that, but I believe that a user should explicitly > request the oldest kernel they want to support (yes, they'd have to do > their homework to see what that version can be for their architecture). I'm doubting if the added value of this is sufficient to warrant the complexity. I could be swayed if it would give a build-time error if we know that it's not going to run on such an old kernel. But as mentioned below, there's just a warning. In addition, if you build a userspace with recent headers, this is going to allow packages that depend on TOOLCHAIN_HEADERS_AT_LEAST_... Which may cause runtime failures when running those packages on an older kernel. So the whole concept of allowing older kernels is already a bit shaky. So I think that a simple boolean config (still called BR2_PACKAGE_GLIBC_KERNEL_COMPAT) would be sufficient. Doesn't solve the TOOLCHAIN_HEADERS_AT_LEAST problem, but at least init will be running (well, except if it's systemd and you try to run on 3.4...) For context, this is the commit that originally introduced --enable-kernel: commit fd5bcd0eda8fb21f639c34a09b212e6f9b066a04 Author: Sam bobroff Date: Thu Jan 28 04:51:23 2016 package/glibc: set --enable-kernel to match kernel Glibc is currently configured without any "--enable-kernel" option. This causes it to use the oldest possible kernel API, slowing it down and preventing it from using any kernel features from later versions. Since we are likely building a kernel and matching glibc together, backwards compatability is probably unnecessary so this patch unconditionally configures glibc with --enable-kernel set to BR2_TOOLCHAIN_HEADERS_AT_LEAST. It's true that the slowdown will probably be smaller if you only have a partial fallback, but is that really going to be significant? You can convince me with numbers :-) Regards, Arnout > Letting the system decide on itself is prone to providing some > surprises... However, letting the user provide an explicit version is > also prone to surprises, because if that version is too old, glibc > resets it to the oldest it actually supports, and just merely emits a > warning message, which does not prevent the build to succeed (it still > fails at runtime in the usual way then)... > > So, in either case, meh... > > So, we'd have to differentiate between the three cases: > - use same as headers (should be the default to keep current > behaviour) > - use oldest supported by glibc > - use explcitly specified version > > So, two options there: > > - recognise a magical value in BR2_PACKAGE_GLIBC_KERNEL_COMPAT, like > 'oldest' (bikeshed, go) to mean the oldest glibc can support, empty > to mean "same as headers", or an actual value. > > - add a boolean "Specify oldest kernel supported", and hide > BR2_PACKAGE_GLIBC_KERNEL_COMPAT behind that boolean; then if the > boolean is not set, use same as headers (as today); if it is set, > then use BR2_PACKAGE_GLIBC_KERNEL_COMPAT is set, or let glibc decide > if not set. > > Thoughts? > > Needless to say, I don't have much sympathy for the first option, > magical values are bad... But I am not too fond of the second option > either, but I can't see a better way to provide for the three different > cases... > >> [1] https://sourceware.org/git/?p=glibc.git;a=blob;f=configure;h=8e5bee775a651fcbaaa96ede8039ae1f049e296e;hb=HEAD#l3529 >> [2] https://sourceware.org/git/?p=glibc.git;a=blob;f=sysdeps/unix/sysv/linux/configure.ac;h=197b7e66c8fe6eb0a1136c992478b9a2272713e7;hb=HEAD#l30 > > Yeah, I already had a look at those for various archs. > > Thanks! > > Regards, > Yann E. MORIN. > From andre at ignavus.net Tue Feb 1 20:43:45 2022 From: andre at ignavus.net (Andre Renaud) Date: Wed, 2 Feb 2022 09:43:45 +1300 Subject: [Buildroot] [PATCH] package/libglfw: bump to 3.3.6 and enable Wayland/libGLES support Message-ID: <8B42D9C7-D86C-4A08-B552-3523E7D0C50D@ignavus.net> Signed-off-by: Andre Renaud --- package/libglfw/Config.in | 19 ++++++++++--------- package/libglfw/libglfw.hash | 2 +- package/libglfw/libglfw.mk | 16 ++++++++++++++-- 3 files changed, 25 insertions(+), 12 deletions(-) diff --git a/package/libglfw/Config.in b/package/libglfw/Config.in index 06f4376453..9705fef432 100644 --- a/package/libglfw/Config.in +++ b/package/libglfw/Config.in @@ -1,17 +1,18 @@ config BR2_PACKAGE_LIBGLFW bool "libglfw" - depends on BR2_PACKAGE_XORG7 - depends on BR2_PACKAGE_HAS_LIBGL - select BR2_PACKAGE_XLIB_LIBXCURSOR - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_XLIB_LIBXI - select BR2_PACKAGE_XLIB_LIBXINERAMA - select BR2_PACKAGE_XLIB_LIBXRANDR + depends on BR2_PACKAGE_XORG7 || BR2_PACKAGE_WAYLAND + depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES + select BR2_PACKAGE_XLIB_LIBXCURSOR if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBXI if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBXINERAMA if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_XORG7 help GLFW is an Open Source, multi-platform library for creating windows with OpenGL contexts and receiving input and events. http://www.glfw.org -comment "libglfw depends on X.org and needs an OpenGL backend" - depends on !BR2_PACKAGE_XORG7 || !BR2_PACKAGE_HAS_LIBGL +comment "libglfw depends on X.org/Wayland and needs an OpenGL/GLES backend" + depends on !(BR2_PACKAGE_XORG7 || BR2_PACKAGE_WAYLAND) + depends on !(BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES) diff --git a/package/libglfw/libglfw.hash b/package/libglfw/libglfw.hash index c21a595bbc..5bffc55d26 100644 --- a/package/libglfw/libglfw.hash +++ b/package/libglfw/libglfw.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 98768e12e615fbe9f3386f5bbfeb91b5a3b45a8c4c77159cef06b1f6ff749537 libglfw-3.3.2.tar.gz +sha256 ed07b90e334dcd39903e6288d90fa1ae0cf2d2119fec516cf743a0a404527c02 libglfw-3.3.6.tar.gz sha256 149704059b5d0bf551637e50042dd4de9c2cae921021f6636298911e3a5f9462 LICENSE.md diff --git a/package/libglfw/libglfw.mk b/package/libglfw/libglfw.mk index 63d2a88bf8..7daf61af0e 100644 --- a/package/libglfw/libglfw.mk +++ b/package/libglfw/libglfw.mk @@ -4,11 +4,19 @@ # ################################################################################ -LIBGLFW_VERSION = 3.3.2 +LIBGLFW_VERSION = 3.3.6 LIBGLFW_SITE = $(call github,glfw,glfw,$(LIBGLFW_VERSION)) LIBGLFW_INSTALL_STAGING = YES -LIBGLFW_DEPENDENCIES = libgl xlib_libXcursor xlib_libXext \ +ifeq ($(BR2_PACKAGE_XORG7),y) +LIBGLFW_DEPENDENCIES = xlib_libXcursor xlib_libXext \ xlib_libXi xlib_libXinerama xlib_libXrandr +endif +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) +LIBGLFW_DEPENDENCIES += libgl +endif +ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) +LIBGLFW_DEPENDENCIES += libgles +endif LIBGLFW_LICENSE = Zlib LIBGLFW_LICENSE_FILES = LICENSE.md @@ -17,6 +25,10 @@ LIBGLFW_CONF_OPTS += \ -DGLFW_BUILD_TESTS=OFF \ -DGLFW_BUILD_DOCS=OFF +ifeq ($(BR2_PACKAGE_WAYLAND),y) +LIBGLFW_CONF_OPTS += -DGLFW_USE_WAYLAND=1 +endif + ifeq ($(BR2_PACKAGE_XLIB_LIBXXF86VM),y) LIBGLFW_DEPENDENCIES += xlib_libXxf86vm endif -- 2.32.0 From arnout at mind.be Tue Feb 1 20:51:05 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 1 Feb 2022 21:51:05 +0100 Subject: [Buildroot] [PATCH v5] configs/kontron_bl_imx8mm_defconfig: new defconfig In-Reply-To: <3ea22a9d-938a-5086-66c6-a8f5510c8573@grinn-global.com> References: <20220131153022.351662-1-heiko.thiery@gmail.com> <12be81a6-7f2e-35b8-4f44-d8a20fce74f1@benettiengineering.com> <86bf975a-1599-005a-5ebc-a149cc973da4@benettiengineering.com> <3ea22a9d-938a-5086-66c6-a8f5510c8573@grinn-global.com> Message-ID: <17628e7b-51cc-a075-196d-e45720089a12@mind.be> On 31/01/2022 18:45, Bartosz Bilas wrote: > Hello, > > On 31.01.2022 18:11, Giulio Benetti wrote: >> On 31/01/22 17:42, Michael Nazzareno Trimarchi wrote: >> >> [SNIP] Thank you for the snip. My arm was getting tired of scrolling through all the quoting :-) [snip some more] >>>>>>> +# 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. The in-tree defconfigs should *not* be generated with "make savedefconfig": we want to explicitly set some options even if they're at their default value. The reason is that on master, the defaults can be updated. The typical example is the kernel headers version (cfr. [1]). But also arch options can change default (a few years ago this happened for ARM floating point), and others as well. We're not very good in making sure that options are properly set. For sure, however: - global sync via savedefconfig is *not* what we want; - a defconfig with comments makes it easier to be sure that options are set explicitly. Regards, Arnout [1] https://patchwork.ozlabs.org/project/buildroot/patch/20220201183331.4009320-6-giulio.benetti at benettiengineering.com/ From arnout at mind.be Tue Feb 1 20:52:35 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 1 Feb 2022 21:52:35 +0100 Subject: [Buildroot] [git commit] utils/size-stats-compare: fix flake8 error Message-ID: <20220201204545.4099C81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f1768855e73c1c41eed0cad94ec4a5f90c8535bb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master utils/size-stats-compare:80:15: E225 missing whitespace around operator Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- utils/size-stats-compare | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/size-stats-compare b/utils/size-stats-compare index 2ccbe7d191..fc6dd70623 100755 --- a/utils/size-stats-compare +++ b/utils/size-stats-compare @@ -77,7 +77,7 @@ def print_results(result, threshold): # 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) + maxpkgname = max(len(pkgname) for filename, pkgname in result) for entry in sorted(list_result, key=lambda entry: entry[1][1]): data = dict( From aduskett at gmail.com Tue Feb 1 21:05:15 2022 From: aduskett at gmail.com (Adam Duskett) Date: Tue, 1 Feb 2022 13:05:15 -0800 Subject: [Buildroot] [PATCH v7 1/1] package/qt5: bump packages to latest kde submodule versions In-Reply-To: <20220131225622.90226-1-james.hilliard1@gmail.com> References: <20220131225622.90226-1-james.hilliard1@gmail.com> Message-ID: All: I have tested this patch series in a Ubuntu 20.04 Docker container with every option selected using test-pkg. There were no errors reported. This patch series is ready for prime-time! Great job James and thanks for the wonderful work! Reviewed-by: Adam Duskett Tested-by: Adam Duskett On Mon, Jan 31, 2022 at 2:57 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 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 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From arnout at mind.be Tue Feb 1 21:43:56 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 1 Feb 2022 22:43:56 +0100 Subject: [Buildroot] [PATCH 1/1] package/hiawatha: fix build with gcc 4.8 In-Reply-To: <20220114175614.963475-1-fontaine.fabrice@gmail.com> References: <20220114175614.963475-1-fontaine.fabrice@gmail.com> Message-ID: <05ec3e99-2839-b04f-6ff2-82cd693a1bf3@mind.be> On 14/01/2022 18:56, Fabrice Fontaine wrote: > 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 Applied to master, thanks. Regards, Arnout > --- > 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 \ From arnout at mind.be Tue Feb 1 21:44:36 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 1 Feb 2022 22:44:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/php-apcu: fix build without __sync_*_4 intrinsics In-Reply-To: <20220115111622.1910388-1-fontaine.fabrice@gmail.com> References: <20220115111622.1910388-1-fontaine.fabrice@gmail.com> Message-ID: <8892c3ac-c187-2ac4-9355-9c79b6a84194@mind.be> On 15/01/2022 12:16, Fabrice Fontaine wrote: > 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 Applied to master, thanks. Regards, Arnout > --- > 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)) From arnout at mind.be Tue Feb 1 21:46:20 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 1 Feb 2022 22:46:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/mtd: fix build with libexecinfo In-Reply-To: <20220115150610.2084070-1-fontaine.fabrice@gmail.com> References: <20220115150610.2084070-1-fontaine.fabrice@gmail.com> Message-ID: On 15/01/2022 16:06, 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-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 Applied to master, thanks. Regards, Arnout > --- > 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 From arnout at mind.be Tue Feb 1 21:46:43 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 1 Feb 2022 22:46:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/liburing: fix static build In-Reply-To: <20220116220724.3460985-1-fontaine.fabrice@gmail.com> References: <20220116220724.3460985-1-fontaine.fabrice@gmail.com> Message-ID: <8ce4268a-b0fc-ef1d-f660-aa684140db49@mind.be> On 16/01/2022 23:07, Fabrice Fontaine wrote: > 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 Applied to master, thanks. Regards, Arnout > --- > 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)) From arnout at mind.be Tue Feb 1 21:53:18 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 1 Feb 2022 22:53:18 +0100 Subject: [Buildroot] [PATCH] package/efl: fix build failure with eeze disabled In-Reply-To: <20220124100920.3005564-1-giulio.benetti@benettiengineering.com> References: <20220124100920.3005564-1-giulio.benetti@benettiengineering.com> Message-ID: <168006d0-d098-07e2-7203-489d7573a3ec@mind.be> On 24/01/2022 11:09, Giulio Benetti wrote: > 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 There are two other patches that somehow deal with this issue [1][2] in addition to this one [3]. Could someone choose between the and mark the rest as Superseded in patchwork? Regards, Arnout [1] https://patchwork.ozlabs.org/project/buildroot/patch/20211230221904.3064022-1-fontaine.fabrice at gmail.com/ [2] https://patchwork.ozlabs.org/project/buildroot/patch/20220129224651.1282263-4-romain.naour at gmail.com/ [3] https://patchwork.ozlabs.org/project/buildroot/patch/20220124100920.3005564-1-giulio.benetti at benettiengineering.com/ > > 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) From arnout at mind.be Tue Feb 1 21:54:22 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 1 Feb 2022 22:54:22 +0100 Subject: [Buildroot] [PATCH] package/uclibc: update to 1.0.40 In-Reply-To: References: Message-ID: <1af59aa3-4881-be25-e092-b09931bd20d3@mind.be> On 25/01/2022 01:15, Waldemar Brodkorb wrote: > Signed-off-by: Waldemar Brodkorb Applied to master, thanks. Regards, Arnout > --- > 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+ From arnout at mind.be Tue Feb 1 21:54:54 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 1 Feb 2022 22:54:54 +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: On 25/01/2022 22:08, Fabrice Fontaine wrote: > 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 Applied to master, thanks. Regards, Arnout > --- > 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 From arnout at mind.be Tue Feb 1 22:00:06 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 1 Feb 2022 23:00:06 +0100 Subject: [Buildroot] [PATCH v2] package/util-linux: bump version to 2.37.3 (fixes CVE-2021-3996, CVE-2021-3995) In-Reply-To: <20220125221533.17535-1-ps.report@gmx.net> References: <20220125221533.17535-1-ps.report@gmx.net> Message-ID: On 25/01/2022 23:15, Peter Seiderer wrote: > - add 'touch' workaround for missing disk-utils/raw.8 file ([1], [2]) in > util-linux-2.37.4 release download package 2.37.3 I assume. > > 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 2.37.3 as well. I moved this hunk to the beginning of the file, to increase the chance that it is noticed on next bump (which hopefully makes it unneeded). > +# 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 I moved this to a post-patch instead of pre-build hook. Applied to master, thanks. Regards, Arnout > + > # Install PAM configuration files > ifeq ($(BR2_PACKAGE_UTIL_LINUX_SU)$(BR2_PACKAGE_LINUX_PAM),yy) > define UTIL_LINUX_INSTALL_PAMFILES From arnout at mind.be Tue Feb 1 22:00:23 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 1 Feb 2022 23:00:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/tesseract-ocr: override neon check In-Reply-To: <20220125223454.444515-1-fontaine.fabrice@gmail.com> References: <20220125223454.444515-1-fontaine.fabrice@gmail.com> Message-ID: On 25/01/2022 23:34, Fabrice Fontaine wrote: > 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 Applied to master, thanks. Regards, Arnout > --- > 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 From arnout at mind.be Tue Feb 1 22:01:56 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 1 Feb 2022 23:01:56 +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: <0e736882-10dd-ce89-4430-25cef83d9c2f@mind.be> On 26/01/2022 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 Applied to master, thanks. Regards, Arnout > --- > ...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 arnout at mind.be Tue Feb 1 22:03:43 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 1 Feb 2022 23:03:43 +0100 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: <3d918cc7-c716-e867-f393-9418d08e7efb@mind.be> On 26/01/2022 20:34, 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 Applied to master, thanks. Regards, Arnout > --- > 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 > + From fontaine.fabrice at gmail.com Tue Feb 1 22:01:51 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 1 Feb 2022 23:01:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/libusb: bump to version 1.0.25 Message-ID: <20220201220151.350153-1-fontaine.fabrice@gmail.com> Drop patch (already in version) https://github.com/libusb/libusb/blob/v1.0.25/ChangeLog Signed-off-by: Fabrice Fontaine --- ...parsing-of-descriptors-for-multi-con.patch | 62 ------------------- package/libusb/libusb.hash | 2 +- package/libusb/libusb.mk | 2 +- 3 files changed, 2 insertions(+), 64 deletions(-) delete mode 100644 package/libusb/0001-linux_usbfs-Fix-parsing-of-descriptors-for-multi-con.patch diff --git a/package/libusb/0001-linux_usbfs-Fix-parsing-of-descriptors-for-multi-con.patch b/package/libusb/0001-linux_usbfs-Fix-parsing-of-descriptors-for-multi-con.patch deleted file mode 100644 index 55e6a1494e..0000000000 --- a/package/libusb/0001-linux_usbfs-Fix-parsing-of-descriptors-for-multi-con.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 623e2a995d156e115c91f56a3ec691bdc333df8b Mon Sep 17 00:00:00 2001 -From: Chris Dickens -Date: Sun, 13 Dec 2020 15:49:19 -0800 -Subject: [PATCH] linux_usbfs: Fix parsing of descriptors for - multi-configuration devices - -Commit e2be556bd2 ("linux_usbfs: Parse config descriptors during device -initialization") introduced a regression for devices with multiple -configurations. The logic that verifies the reported length of the -configuration descriptors failed to count the length of the -configuration descriptor itself and would truncate the actual length by -9 bytes, leading to a parsing error for subsequent descriptors. - -Closes #825 - -Signed-off-by: Chris Dickens -(cherry picked from commit f6d2cb561402c3b6d3627c0eb89e009b503d9067) -Signed-off-by: John Keeping ---- - libusb/os/linux_usbfs.c | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - -diff --git a/libusb/os/linux_usbfs.c b/libusb/os/linux_usbfs.c -index fb2ed53..4d2dc8d 100644 ---- a/libusb/os/linux_usbfs.c -+++ b/libusb/os/linux_usbfs.c -@@ -641,7 +641,12 @@ static int seek_to_next_config(struct libusb_context *ctx, - uint8_t *buffer, size_t len) - { - struct usbi_descriptor_header *header; -- int offset = 0; -+ int offset; -+ -+ /* Start seeking past the config descriptor */ -+ offset = LIBUSB_DT_CONFIG_SIZE; -+ buffer += LIBUSB_DT_CONFIG_SIZE; -+ len -= LIBUSB_DT_CONFIG_SIZE; - - while (len > 0) { - if (len < 2) { -@@ -718,7 +723,7 @@ static int parse_config_descriptors(struct libusb_device *dev) - } - - if (priv->sysfs_dir) { -- /* -+ /* - * In sysfs wTotalLength is ignored, instead the kernel returns a - * config descriptor with verified bLength fields, with descriptors - * with an invalid bLength removed. -@@ -727,8 +732,7 @@ static int parse_config_descriptors(struct libusb_device *dev) - int offset; - - if (num_configs > 1 && idx < num_configs - 1) { -- offset = seek_to_next_config(ctx, buffer + LIBUSB_DT_CONFIG_SIZE, -- remaining - LIBUSB_DT_CONFIG_SIZE); -+ offset = seek_to_next_config(ctx, buffer, remaining); - if (offset < 0) - return offset; - sysfs_config_len = (uint16_t)offset; --- -2.30.1 - diff --git a/package/libusb/libusb.hash b/package/libusb/libusb.hash index 6169a186a5..a18935fe03 100644 --- a/package/libusb/libusb.hash +++ b/package/libusb/libusb.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 7efd2685f7b327326dcfb85cee426d9b871fd70e22caa15bb68d595ce2a2b12a libusb-1.0.24.tar.bz2 +sha256 8a28ef197a797ebac2702f095e81975e2b02b2eeff2774fa909c78a74ef50849 libusb-1.0.25.tar.bz2 sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk index 28efcadefc..1e82cb9a85 100644 --- a/package/libusb/libusb.mk +++ b/package/libusb/libusb.mk @@ -5,7 +5,7 @@ ################################################################################ LIBUSB_VERSION_MAJOR = 1.0 -LIBUSB_VERSION = $(LIBUSB_VERSION_MAJOR).24 +LIBUSB_VERSION = $(LIBUSB_VERSION_MAJOR).25 LIBUSB_SOURCE = libusb-$(LIBUSB_VERSION).tar.bz2 LIBUSB_SITE = https://github.com/libusb/libusb/releases/download/v$(LIBUSB_VERSION) LIBUSB_LICENSE = LGPL-2.1+ -- 2.34.1 From arnout at mind.be Tue Feb 1 22:04:02 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 1 Feb 2022 23:04:02 +0100 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: <9a932f1f-83b7-c10e-5e5f-4e0f13306340@mind.be> On 26/01/2022 22:00, Fabrice Fontaine wrote: > 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 Applied to master, thanks. Regards, Arnout > --- > 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 From arnout at mind.be Tue Feb 1 22:04:35 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 1 Feb 2022 23:04:35 +0100 Subject: [Buildroot] [PATCH v2, 1/2] package/xvisor: drop ARM32 without virtualization support In-Reply-To: <20220126225159.1567622-1-fontaine.fabrice@gmail.com> References: <20220126225159.1567622-1-fontaine.fabrice@gmail.com> Message-ID: On 26/01/2022 23:51, 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"! > > 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 Both applied ot master, thanks. Regards, Arnout > --- > 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 From arnout at mind.be Tue Feb 1 22:04:52 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 1 Feb 2022 23:04:52 +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: <8e7905ab-b882-a363-8fd3-d5e8c2d7b00b@mind.be> On 01/02/2022 00:00, Fabrice Fontaine wrote: > 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 Applied to master, thanks. Regards, Arnout > --- > ...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" > + From arnout at mind.be Tue Feb 1 21:58:16 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 1 Feb 2022 22:58:16 +0100 Subject: [Buildroot] [git commit] package/util-linux: bump version to 2.37.3 (fixes CVE-2021-3996, CVE-2021-3995) Message-ID: <20220201215822.190B782858@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b292f1d41a8734b6cdcbcf2ae726b51f9e1338a9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - add 'touch' workaround for missing disk-utils/raw.8 file ([1], [2]) in util-linux-2.37.3 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 [Arnout: put fix in POST_PATCH instead of PRE_COMPILE hook] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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..e59ef7dadc 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) @@ -35,6 +35,13 @@ UTIL_LINUX_CONF_OPTS += \ UTIL_LINUX_LINK_LIBS = $(TARGET_NLS_LIBS) +# workaround missing disk-utils/raw.8 file in util-linux-2.37.3 +# release download package +define UTIL_LINUX_FIX_DISK_UTILS_COMPILE + touch $(@D)/disk-utils/raw.8 +endef +UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE + HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf # We also don't want the host-python dependency From arnout at mind.be Tue Feb 1 21:23:48 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 1 Feb 2022 22:23:48 +0100 Subject: [Buildroot] [git commit] package/php-apcu: fix build without __sync_*_4 intrinsics Message-ID: <20220201215821.DC2CC82858@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=67126ef063a9a502bddb016be89e40bcaefc74c2 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 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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)) From arnout at mind.be Tue Feb 1 21:23:45 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 1 Feb 2022 22:23:45 +0100 Subject: [Buildroot] [git commit] package/hiawatha: fix build with gcc 4.8 Message-ID: <20220201215821.D29E982817@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=65f4f119f2db06230bd1c83d2907a08fb23685db branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 \ From arnout at mind.be Tue Feb 1 21:53:35 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 1 Feb 2022 22:53:35 +0100 Subject: [Buildroot] [git commit] package/netopeer2: disable tests Message-ID: <20220201215822.0F8DC82817@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=20ddb8369478c311212420e4a2a0cbffe859f8f2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 From arnout at mind.be Tue Feb 1 21:58:55 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 1 Feb 2022 22:58:55 +0100 Subject: [Buildroot] [git commit] package/binutils: add upstream patch for v2.37 fixing linking of thin archives Message-ID: <20220201215822.36DB282858@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=40f7b0bb6b91400b9e1fc60f410c9cdcbd1998ab branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...he-file-descriptor-if-there-is-no-archive.patch | 236 +++++++++++++++++++++ 1 file changed, 236 insertions(+) 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 + From arnout at mind.be Tue Feb 1 21:58:55 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 1 Feb 2022 22:58:55 +0100 Subject: [Buildroot] [git commit] package/iproute2: fix musl build Message-ID: <20220201215822.5C8B882817@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6dac320f73e37b88b8e2b063e41bae53aae466a3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Reviewed-by: Petr Vorel Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../0001-lib-fix-ax25-h-include-for-musl.patch | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) 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" + From arnout at mind.be Tue Feb 1 21:58:55 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 1 Feb 2022 22:58:55 +0100 Subject: [Buildroot] [git commit] package/umtprd: bump to version 1.6.2 Message-ID: <20220201215822.40CF582817@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=145a401b3b2d94e39e76b7ffea154971711aa6f3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Acked-by: Paul Cercueil Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 From arnout at mind.be Tue Feb 1 21:23:53 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 1 Feb 2022 22:23:53 +0100 Subject: [Buildroot] [git commit] package/liburing: fix static build Message-ID: <20220201215821.F0AD282817@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d3e453e96401e0df74b385e296373bd29ddd6c4c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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)) From arnout at mind.be Tue Feb 1 21:58:55 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 1 Feb 2022 22:58:55 +0100 Subject: [Buildroot] [git commit] configs/orangepi_zero_defconfig: refactoring, bump Linux and U-Boot versions Message-ID: <20220201215822.2CA5A82817@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2a084afe2a36d0dc29480afa62e57bbfe9c30e48 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../{linux-extras.config => linux-extras.fragment} | 0 configs/orangepi_zero_defconfig | 32 +++++++++++++++------- 2 files changed, 22 insertions(+), 10 deletions(-) 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 arnout at mind.be Tue Feb 1 21:58:55 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 1 Feb 2022 22:58:55 +0100 Subject: [Buildroot] [git commit] package/xvisor: drop ARM32 without virtualization support Message-ID: <20220201215822.49AFF82858@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3c7099f3abe7fd58b1642bebca5ca6c9e5d68de7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 From arnout at mind.be Tue Feb 1 21:58:55 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 1 Feb 2022 22:58:55 +0100 Subject: [Buildroot] [git commit] package/tesseract-ocr: override neon check Message-ID: <20220201215822.233938285F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=789e84b5dacbb39a34fe0ea873f044690a0944a2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 From arnout at mind.be Tue Feb 1 21:23:50 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 1 Feb 2022 22:23:50 +0100 Subject: [Buildroot] [git commit] package/mtd: fix build with libexecinfo Message-ID: <20220201215821.E60D38285F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c97e139924c28f98dae13b3c0ef2f5c1f75e1d70 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-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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 From arnout at mind.be Tue Feb 1 21:58:55 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 1 Feb 2022 22:58:55 +0100 Subject: [Buildroot] [git commit] package/xvisor: add riscv support Message-ID: <20220201215822.529B18285F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=750aa61300ca6434426916e83cf0ce18f729b668 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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) From arnout at mind.be Tue Feb 1 21:53:35 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 1 Feb 2022 22:53:35 +0100 Subject: [Buildroot] [git commit] package/uclibc: update to 1.0.40 Message-ID: <20220201215822.0576082858@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f458646bd0b86884cea0a26a0ad5c733477a6634 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Waldemar Brodkorb Reviewed-by: Petr Vorel Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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+ From fontaine.fabrice at gmail.com Tue Feb 1 22:04:29 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 1 Feb 2022 23:04:29 +0100 Subject: [Buildroot] [PATCH] package/efl: fix build failure with eeze disabled In-Reply-To: References: <168006d0-d098-07e2-7203-489d7573a3ec@mind.be> Message-ID: Hi, Le mar. 1 f?vr. 2022 ? 23:02, Giulio Benetti a ?crit : > > Hi Arnout, > > > Il giorno 1 feb 2022, alle ore 22:53, Arnout Vandecappelle ha scritto: > > > > ? > > > >> On 24/01/2022 11:09, Giulio Benetti wrote: > >> 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 > > > > There are two other patches that somehow deal with this issue [1][2] in addition to this one [3]. > > > > Could someone choose between the and mark the rest as Superseded in patchwork? > > Fabrice commented on mine that mine was better. > Then the Romain one came out few days ago and I can tell his one is better. > > So I would go for the Romain patch. > > I set mine as superseded and Fabrice can do the before. I also set mine as superseded. > > Best regards > Giulio > > > > > > > Regards, > > Arnout > > > > [1] https://patchwork.ozlabs.org/project/buildroot/patch/20211230221904.3064022-1-fontaine.fabrice at gmail.com/ > > [2] https://patchwork.ozlabs.org/project/buildroot/patch/20220129224651.1282263-4-romain.naour at gmail.com/ > > [3] https://patchwork.ozlabs.org/project/buildroot/patch/20220124100920.3005564-1-giulio.benetti at benettiengineering.com/ > > > > > >> 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) > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > Best Regards, Fabrice From fontaine.fabrice at gmail.com Tue Feb 1 22:06:26 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 1 Feb 2022 23:06:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/libgpg-error: add or1k support Message-ID: <20220201220626.350423-1-fontaine.fabrice@gmail.com> or1k is supported since version 1.18 and https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=commit;h=c143fa81462584ad39ea780908266bce3fb9a49e Signed-off-by: Fabrice Fontaine --- package/libgpg-error/Config.in | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/package/libgpg-error/Config.in b/package/libgpg-error/Config.in index 44e9d67aaf..03157dd9fe 100644 --- a/package/libgpg-error/Config.in +++ b/package/libgpg-error/Config.in @@ -2,14 +2,19 @@ config BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS bool # see src/syscfg/ default y if \ - BR2_aarch64 || BR2_aarch64_eb || BR2_arm || \ - BR2_armeb || BR2_i386 || BR2_mips || \ - BR2_mipsel || BR2_mips64 || BR2_mips64el || \ - BR2_m68k || BR2_nios2 || BR2_powerpc || \ - BR2_powerpc64 || BR2_powerpc64le || BR2_RISCV_64 || \ - BR2_RISCV_32 || BR2_s390x || BR2_sh4 || \ - BR2_sh4eb || BR2_sh4a || BR2_sh4aeb || \ - BR2_sparc || BR2_sparc64 || BR2_x86_64 + BR2_aarch64 || BR2_aarch64_eb || \ + BR2_arm || BR2_armeb || \ + BR2_i386 || BR2_mips || \ + BR2_mipsel || BR2_mips64 || \ + BR2_mips64el || BR2_m68k || \ + BR2_nios2 || BR2_or1k || \ + BR2_powerpc || BR2_powerpc64 || \ + BR2_powerpc64le || BR2_RISCV_64 || \ + BR2_RISCV_32 || BR2_s390x || \ + BR2_sh4 || BR2_sh4eb || \ + BR2_sh4a || BR2_sh4aeb || \ + BR2_sparc || BR2_sparc64 || \ + BR2_x86_64 config BR2_PACKAGE_LIBGPG_ERROR bool "libgpg-error" @@ -36,6 +41,8 @@ config BR2_PACKAGE_LIBGPG_ERROR_SYSCFG if BR2_m68k default "nios2-unknown-linux-gnu" \ if BR2_nios2 + default "or1k-unknown-linux-gnu" \ + if BR2_or1k default "powerpc-unknown-linux-gnu" \ if BR2_powerpc default "powerpc64-unknown-linux-gnu" \ -- 2.34.1 From giulio.benetti at benettiengineering.com Tue Feb 1 22:02:04 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 1 Feb 2022 23:02:04 +0100 Subject: [Buildroot] [PATCH] package/efl: fix build failure with eeze disabled In-Reply-To: <168006d0-d098-07e2-7203-489d7573a3ec@mind.be> References: <168006d0-d098-07e2-7203-489d7573a3ec@mind.be> Message-ID: Hi Arnout, > Il giorno 1 feb 2022, alle ore 22:53, Arnout Vandecappelle ha scritto: > > ? > >> On 24/01/2022 11:09, Giulio Benetti wrote: >> 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 > > There are two other patches that somehow deal with this issue [1][2] in addition to this one [3]. > > Could someone choose between the and mark the rest as Superseded in patchwork? Fabrice commented on mine that mine was better. Then the Romain one came out few days ago and I can tell his one is better. So I would go for the Romain patch. I set mine as superseded and Fabrice can do the before. Best regards Giulio > > > Regards, > Arnout > > [1] https://patchwork.ozlabs.org/project/buildroot/patch/20211230221904.3064022-1-fontaine.fabrice at gmail.com/ > [2] https://patchwork.ozlabs.org/project/buildroot/patch/20220129224651.1282263-4-romain.naour at gmail.com/ > [3] https://patchwork.ozlabs.org/project/buildroot/patch/20220124100920.3005564-1-giulio.benetti at benettiengineering.com/ > > >> 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) > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From giulio.benetti at benettiengineering.com Tue Feb 1 22:12:33 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 1 Feb 2022 23:12:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/libgpg-error: add or1k support In-Reply-To: <20220201220626.350423-1-fontaine.fabrice@gmail.com> References: <20220201220626.350423-1-fontaine.fabrice@gmail.com> Message-ID: <5C805706-7722-4179-A3F0-EB6F7FA592DB@benettiengineering.com> Hi Fabrice, > Il giorno 1 feb 2022, alle ore 23:08, Fabrice Fontaine ha scritto: > > ?or1k is supported since version 1.18 and > https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=commit;h=c143fa81462584ad39ea780908266bce3fb9a49e > > Signed-off-by: Fabrice Fontaine The or1k revenge :-) Reviewed-by: Giulio Benetti Best regards Giulio > --- > package/libgpg-error/Config.in | 23 +++++++++++++++-------- > 1 file changed, 15 insertions(+), 8 deletions(-) > > diff --git a/package/libgpg-error/Config.in b/package/libgpg-error/Config.in > index 44e9d67aaf..03157dd9fe 100644 > --- a/package/libgpg-error/Config.in > +++ b/package/libgpg-error/Config.in > @@ -2,14 +2,19 @@ config BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS > bool > # see src/syscfg/ > default y if \ > - BR2_aarch64 || BR2_aarch64_eb || BR2_arm || \ > - BR2_armeb || BR2_i386 || BR2_mips || \ > - BR2_mipsel || BR2_mips64 || BR2_mips64el || \ > - BR2_m68k || BR2_nios2 || BR2_powerpc || \ > - BR2_powerpc64 || BR2_powerpc64le || BR2_RISCV_64 || \ > - BR2_RISCV_32 || BR2_s390x || BR2_sh4 || \ > - BR2_sh4eb || BR2_sh4a || BR2_sh4aeb || \ > - BR2_sparc || BR2_sparc64 || BR2_x86_64 > + BR2_aarch64 || BR2_aarch64_eb || \ > + BR2_arm || BR2_armeb || \ > + BR2_i386 || BR2_mips || \ > + BR2_mipsel || BR2_mips64 || \ > + BR2_mips64el || BR2_m68k || \ > + BR2_nios2 || BR2_or1k || \ > + BR2_powerpc || BR2_powerpc64 || \ > + BR2_powerpc64le || BR2_RISCV_64 || \ > + BR2_RISCV_32 || BR2_s390x || \ > + BR2_sh4 || BR2_sh4eb || \ > + BR2_sh4a || BR2_sh4aeb || \ > + BR2_sparc || BR2_sparc64 || \ > + BR2_x86_64 > > config BR2_PACKAGE_LIBGPG_ERROR > bool "libgpg-error" > @@ -36,6 +41,8 @@ config BR2_PACKAGE_LIBGPG_ERROR_SYSCFG > if BR2_m68k > default "nios2-unknown-linux-gnu" \ > if BR2_nios2 > + default "or1k-unknown-linux-gnu" \ > + if BR2_or1k > default "powerpc-unknown-linux-gnu" \ > if BR2_powerpc > default "powerpc64-unknown-linux-gnu" \ > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From peter at korsgaard.com Tue Feb 1 22:13:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 01 Feb 2022 23:13:46 +0100 Subject: [Buildroot] [PATCH] package/prosody: security bump to 0.11.13 In-Reply-To: <20220131144734.1199549-1-francois.perrad@gadz.org> (Francois Perrad's message of "Mon, 31 Jan 2022 15:47:34 +0100") References: <20220131144734.1199549-1-francois.perrad@gadz.org> Message-ID: <871r0m2q1x.fsf@dell.be.48ers.dk> >>>>> "Francois" == Francois Perrad writes: > see https://prosody.im/doc/release/0.11.13 > Signed-off-by: Francois Perrad Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 1 22:14:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 01 Feb 2022 23:14:36 +0100 Subject: [Buildroot] [PATCH] package/expat: security bump to 2.4.4 In-Reply-To: <20220131145825.1206899-1-francois.perrad@gadz.org> (Francois Perrad's message of "Mon, 31 Jan 2022 15:58:25 +0100") References: <20220131145825.1206899-1-francois.perrad@gadz.org> Message-ID: <87wnie1bg3.fsf@dell.be.48ers.dk> >>>>> "Francois" == Francois Perrad writes: > fix CVE-2022-23852, CVE-2022-23990 > Signed-off-by: Francois Perrad Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 1 22:14:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 1 Feb 2022 23:14:05 +0100 Subject: [Buildroot] [git commit] package/expat: security bump to 2.4.4 Message-ID: <20220201220756.64CCE82858@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ab71ac15ddd7ed6a8ca83cbc23ea0b0cbb343f0f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master fix CVE-2022-23852, CVE-2022-23990 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- 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 0853c3c76d..3129801668 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 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 From peter at korsgaard.com Tue Feb 1 22:12:52 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 1 Feb 2022 23:12:52 +0100 Subject: [Buildroot] [git commit] package/prosody: security bump to 0.11.13 Message-ID: <20220201220756.5C41882803@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=800e53cf7e3ec71c3830e8a125b0a5546786d44f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master see https://prosody.im/doc/release/0.11.13 Signed-off-by: Francois Perrad 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 b6fa6532a5..3a3a363a4b 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 d697c85568..62ba073b9e 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 From peter at korsgaard.com Tue Feb 1 22:17:12 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 01 Feb 2022 23:17:12 +0100 Subject: [Buildroot] [PATCH] package/at: bump version to 3.2.4 In-Reply-To: <20220131123441.3645526-1-giulio.benetti@benettiengineering.com> (Giulio Benetti's message of "Mon, 31 Jan 2022 13:34:41 +0100") References: <20220131123441.3645526-1-giulio.benetti@benettiengineering.com> Message-ID: <87sft21bbr.fsf@dell.be.48ers.dk> >>>>> "Giulio" == Giulio Benetti writes: > All local patches except on have been upstreamed, so let's remove them and > rename/rebase the remaining one. > Signed-off-by: Giulio Benetti > +++ 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 What does this do? > +++ 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 Is autoreconf still needed? -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 1 22:17:52 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 01 Feb 2022 23:17:52 +0100 Subject: [Buildroot] [PATCH] package/python3: bump version to 3.10.2 In-Reply-To: <20220131110027.29013-1-peter@korsgaard.com> (Peter Korsgaard's message of "Mon, 31 Jan 2022 12:00:27 +0100") References: <20220131110027.29013-1-peter@korsgaard.com> Message-ID: <87o83q1ban.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Refresh 0032-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch now > that the MULTIARCH logic got updated by: > https://github.com/python/cpython/commit/7e951f356ec76a5a5fdb851d71df5d120014bf3f > Update license hash after a change of copyright years: > https://github.com/python/cpython/commit/35955e4adec4dd09127af93f9413d46889a3c475 > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 1 22:17:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 1 Feb 2022 23:17:36 +0100 Subject: [Buildroot] [git commit] package/python3: bump version to 3.10.2 Message-ID: <20220201221102.D990182814@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=519a50decd7ee051ca5b900bed8abc7d99105d02 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Refresh 0032-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch now that the MULTIARCH logic got updated by: https://github.com/python/cpython/commit/7e951f356ec76a5a5fdb851d71df5d120014bf3f Update license hash after a change of copyright years: https://github.com/python/cpython/commit/35955e4adec4dd09127af93f9413d46889a3c475 Signed-off-by: Peter Korsgaard --- ...c-fixup-CC-print-multiarch-output-for-mus.patch | 29 ++++++++++++---------- package/python3/python3.hash | 8 +++--- package/python3/python3.mk | 2 +- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/package/python3/0032-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch b/package/python3/0032-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch index 7fe2516e98..eff010fa22 100644 --- a/package/python3/0032-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 d009b0142f77881dd75ff760fec728dbc8581a03 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 @@ -24,25 +24,28 @@ workaround, rewrite the --print-multiarch output to match older GCC versions to keep the configure script happy. Signed-off-by: Peter Korsgaard +[Peter: updated for 3.10.2] --- - configure.ac | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) + configure.ac | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 615c16aced..241298e6cf 100644 +index 913051c276..aba03f3779 100644 --- a/configure.ac +++ b/configure.ac -@@ -873,7 +873,9 @@ fi - rm -f conftest.c conftest.out - - if test x$PLATFORM_TRIPLET != xdarwin; then -- MULTIARCH=$($CC --print-multiarch 2>/dev/null) +@@ -876,7 +876,11 @@ AC_MSG_CHECKING([for multiarch]) + AS_CASE([$ac_sys_system], + [Darwin*], [MULTIARCH=""], + [FreeBSD*], [MULTIARCH=""], +- [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_SUBST([MULTIARCH]) + AC_MSG_RESULT([$MULTIARCH]) -- -2.25.1 +2.20.1 diff --git a/package/python3/python3.hash b/package/python3/python3.hash index fa4b334877..97f4653490 100644 --- a/package/python3/python3.hash +++ b/package/python3/python3.hash @@ -1,5 +1,5 @@ -# From https://www.python.org/downloads/release/python-3101/ -md5 789210934745a65247a3ebf5da9adb64 Python-3.10.1.tar.xz +# From https://www.python.org/downloads/release/python-3102/ +md5 14e8c22458ed7779a1957b26cde01db9 Python-3.10.2.tar.xz # Locally computed -sha256 a7f1265b6e1a5de1ec5c3ec7019ab53413469934758311e9d240c46e5ae6e177 Python-3.10.1.tar.xz -sha256 d0285b61e1a8e420c7deb95836738a5d4a0d26463138b17601f5971212684c4b LICENSE +sha256 17de3ac7da9f2519aa9d64378c603a73a0e9ad58dffa8812e45160c086de64c7 Python-3.10.2.tar.xz +sha256 f03e17cd594c2085f66a454e695c7ebe5b4d3c0eff534f4f194abc2fd164621b LICENSE diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 6d629ae96e..f9afcd5097 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -5,7 +5,7 @@ ################################################################################ PYTHON3_VERSION_MAJOR = 3.10 -PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).1 +PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).2 PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz PYTHON3_SITE = https://python.org/ftp/python/$(PYTHON3_VERSION) PYTHON3_LICENSE = Python-2.0, others From giulio.benetti at benettiengineering.com Tue Feb 1 22:23:58 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 1 Feb 2022 23:23:58 +0100 Subject: [Buildroot] [PATCH] package/at: bump version to 3.2.4 In-Reply-To: <87sft21bbr.fsf@dell.be.48ers.dk> References: <20220131123441.3645526-1-giulio.benetti@benettiengineering.com> <87sft21bbr.fsf@dell.be.48ers.dk> Message-ID: <3b46e3fd-6fa1-eac5-bd28-f726f23a921c@benettiengineering.com> Hi Peter, On 01/02/22 23:17, Peter Korsgaard wrote: >>>>>> "Giulio" == Giulio Benetti writes: > > > All local patches except on have been upstreamed, so let's remove them and > > rename/rebase the remaining one. > > > Signed-off-by: Giulio Benetti > > +++ 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 > > What does this do? oops, that remained as part of the old patch so I need to drop it > > +++ 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 > > Is autoreconf still needed? > I'm checking right now -- Giulio Benetti Benetti Engineering sas From aperez at igalia.com Tue Feb 1 22:27:42 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Wed, 2 Feb 2022 00:27:42 +0200 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: <20220202002742.GB1241348@momiji> Hi, On Wed, 26 Jan 2022 20:34:31 +0100 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 Amusingly I ran into this a couple of days ago and almost simultaneously sent a patch to include the fixes in the WebKit SDK we use for development [1] =) > Signed-off-by: Peter Seiderer Reviewed-by: Adrian Perez de Castro Cheers, ?Adri?n --- [1] https://bugs.webkit.org/show_bug.cgi?id=235975 -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: From fontaine.fabrice at gmail.com Tue Feb 1 22:27:45 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 1 Feb 2022 23:27:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/safeclib: bump to version 3.7.1 Message-ID: <20220201222745.411463-1-fontaine.fabrice@gmail.com> Drop patch (already in version) and so autoreconf https://github.com/rurban/safeclib/blob/v3.7.1/ChangeLog Signed-off-by: Fabrice Fontaine --- ...gure.ac-add-disable-hardening-option.patch | 63 ------------------- package/safeclib/safeclib.hash | 4 +- package/safeclib/safeclib.mk | 6 +- 3 files changed, 4 insertions(+), 69 deletions(-) delete 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 deleted file mode 100644 index e851fce993..0000000000 --- a/package/safeclib/0001-configure.ac-add-disable-hardening-option.patch +++ /dev/null @@ -1,63 +0,0 @@ -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.hash b/package/safeclib/safeclib.hash index af732f93fd..bca5d86261 100644 --- a/package/safeclib/safeclib.hash +++ b/package/safeclib/safeclib.hash @@ -1,5 +1,5 @@ -# From https://github.com/rurban/safeclib/releases/tag/v02092020 -sha256 d374bdcbfcdc4c9a76abed3707667372ca212fd87a369e7bcaaa54e716d27c0a libsafec-02092020.tar.xz +# From https://github.com/rurban/safeclib/releases/tag/v3.7.1 +sha256 71d3ec970f930bd980f2a41127228eeedfc53749e4c6b203329adc4ff7df32a7 safeclib-3.7.1.tar.xz # Hash for license file sha256 c33e77efd5781e3d59a2bb648c82d2a615035ef0d24cf58880380e3af906510b COPYING diff --git a/package/safeclib/safeclib.mk b/package/safeclib/safeclib.mk index 29ffea7f2e..91b3e26c68 100644 --- a/package/safeclib/safeclib.mk +++ b/package/safeclib/safeclib.mk @@ -4,15 +4,13 @@ # ################################################################################ -SAFECLIB_VERSION = 02092020 +SAFECLIB_VERSION = 3.7.1 SAFECLIB_SITE = \ https://github.com/rurban/safeclib/releases/download/v$(SAFECLIB_VERSION) -SAFECLIB_SOURCE = libsafec-$(SAFECLIB_VERSION).tar.xz +SAFECLIB_SOURCE = safeclib-$(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 -- 2.34.1 From giulio.benetti at benettiengineering.com Tue Feb 1 22:32:04 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 1 Feb 2022 23:32:04 +0100 Subject: [Buildroot] [PATCH v2] package/at: bump version to 3.2.4 In-Reply-To: <3b46e3fd-6fa1-eac5-bd28-f726f23a921c@benettiengineering.com> References: <3b46e3fd-6fa1-eac5-bd28-f726f23a921c@benettiengineering.com> Message-ID: <20220201223204.3796621-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 --- V1->V2: suggested by Peter * removed useless lines from local patch * remove AT_AUTORECONF = y since it's not needed anymore --- ...ake-install-for-non-root-don-t-stri.patch} | 9 +- ...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 | 3 +- 6 files changed, 7 insertions(+), 200 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} (96%) 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 96% 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..91e9738358 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 77b28c32ebfed0eb130a0acdb2acb7206f2b9530 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,17 @@ 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(-) diff --git a/Makefile.in b/Makefile.in -index a7197f2..0b35a67 100644 +index 4ae194f..af82e4c 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -99,43 +99,42 @@ atrun: atrun.in +@@ -102,43 +102,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..26c44f5287 100644 --- a/package/at/at.mk +++ b/package/at/at.mk @@ -4,10 +4,9 @@ # ################################################################################ -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 AT_DEPENDENCIES = $(if $(BR2_PACKAGE_FLEX),flex) host-bison host-flex AT_LICENSE = GPL-2.0+, GPL-3.0+, ISC AT_LICENSE_FILES = Copyright COPYING -- 2.25.1 From ps.report at gmx.net Tue Feb 1 22:32:47 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 1 Feb 2022 23:32:47 +0100 Subject: [Buildroot] [PATCH v1] package/libcamera: fix uclibc/musl compile with libexecinfo enabled In-Reply-To: <20220131230730.22235-1-ps.report@gmx.net> References: <20220131230730.22235-1-ps.report@gmx.net> Message-ID: <20220201233247.28ac615b@gmx.net> On Tue, 1 Feb 2022 00:07:30 +0100, Peter Seiderer wrote: > - 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 Should be: LIBCAMERA_LDFLAGS = $(TARGET_LDFLAGS) -lexecinfo Updated patch will follow... Regards, Peter > +endif > + > $(eval $(meson-package)) From fontaine.fabrice at gmail.com Tue Feb 1 22:33:49 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 1 Feb 2022 23:33:49 +0100 Subject: [Buildroot] [PATCH 1/1] package/lcms2: bump to version 2.13 Message-ID: <20220201223349.424073-1-fontaine.fabrice@gmail.com> https://littlecms.com/blog/2022/01/28/lcms2-2.13 Signed-off-by: Fabrice Fontaine --- package/lcms2/lcms2.hash | 6 +++--- package/lcms2/lcms2.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/lcms2/lcms2.hash b/package/lcms2/lcms2.hash index 8477610ff0..d3ae1d934f 100644 --- a/package/lcms2/lcms2.hash +++ b/package/lcms2/lcms2.hash @@ -1,5 +1,5 @@ -# From https://sourceforge.net/projects/lcms/files/lcms/2.12 -sha1 3d0c0276fcd3930b80c424512ec0b1ed54ec1497 lcms2-2.12.tar.gz +# From https://sourceforge.net/projects/lcms/files/lcms/2.13 +sha1 1676097fb18fce83c9c876d56828c83a6ad829dd lcms2-2.13.tar.gz # Locally computed: -sha256 18663985e864100455ac3e507625c438c3710354d85e5cbb7cd4043e11fe10f5 lcms2-2.12.tar.gz +sha256 0c67a5cc144029cfa34647a52809ec399aae488db4258a6a66fba318474a070f lcms2-2.13.tar.gz sha256 46d4e05af3bce75332a12d01f19bcce7e32b6bac544be28a64043d0231291e31 COPYING diff --git a/package/lcms2/lcms2.mk b/package/lcms2/lcms2.mk index 49ddccd82b..5a253d044b 100644 --- a/package/lcms2/lcms2.mk +++ b/package/lcms2/lcms2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LCMS2_VERSION = 2.12 +LCMS2_VERSION = 2.13 LCMS2_SITE = http://downloads.sourceforge.net/project/lcms/lcms/$(LCMS2_VERSION) LCMS2_LICENSE = MIT LCMS2_LICENSE_FILES = COPYING -- 2.34.1 From ps.report at gmx.net Tue Feb 1 22:53:33 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 1 Feb 2022 23:53:33 +0100 Subject: [Buildroot] [PATCH v3 2/2] package/pkg-meson: improve generation of cross-compilation file In-Reply-To: <44572e0d-1989-106f-65fa-4b784427e15b@mind.be> References: <20211203215438.213437-1-nolange79@gmail.com> <20211203215438.213437-2-nolange79@gmail.com> <44572e0d-1989-106f-65fa-4b784427e15b@mind.be> Message-ID: <20220201235333.7e621c61@gmx.net> Hello Arnout, *, On Tue, 1 Feb 2022 00:00:58 +0100, Arnout Vandecappelle wrote: > 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. In my early version of the patch ([1]) it was PKG_TARGET_CFLAGS, PKG_TARGET_LDFLAGS, PKG_TARGET_CXXFLAGS, in the later version adopted by Yann ([2]) it became PKG_TARGET_CFLAGS, PKG_TARGET_CFLAGS, PKG_TARGET_CFLAGS (cut & paste mistake?) > > I'm not sure what to do about it. Fix it ;-)...and I believe the usage of the provided cross-compilation.conf.in template is a seldom used feature...and the few (if any?) experts using it know how to sed (or hand edit) it with the right values... Regards, Peter [1] http://patchwork.ozlabs.org/project/buildroot/patch/20190423205302.14382-1-ps.report at gmx.net/ [2] http://lists.busybox.net/pipermail/buildroot/2019-June/253129.html > > > > > $(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' > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From giulio.benetti at benettiengineering.com Tue Feb 1 23:02:17 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 2 Feb 2022 00:02:17 +0100 Subject: [Buildroot] [PATCH 5/6] configs/microchip_sama7g5ek_mmc_defconfig: add missing BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15 In-Reply-To: <20220201183331.4009320-6-giulio.benetti@benettiengineering.com> References: <20220201183331.4009320-1-giulio.benetti@benettiengineering.com> <20220201183331.4009320-6-giulio.benetti@benettiengineering.com> Message-ID: This and next patch miss host openssl linux dependency. I re-send V2. Sorry for the noise. Best regards -- Giulio Benetti Benetti Engineering sas On 01/02/22 19:33, Giulio Benetti wrote: > Fixes: > https://gitlab.com/ymorin/buildroot/-/jobs/2035821098 > > Signed-off-by: Giulio Benetti > --- > configs/microchip_sama7g5ek_mmc_defconfig | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/configs/microchip_sama7g5ek_mmc_defconfig b/configs/microchip_sama7g5ek_mmc_defconfig > index b1cd193829..2d4b720342 100644 > --- a/configs/microchip_sama7g5ek_mmc_defconfig > +++ b/configs/microchip_sama7g5ek_mmc_defconfig > @@ -1,6 +1,7 @@ > BR2_arm=y > BR2_cortex_a7=y > BR2_ARM_FPU_NEON_VFPV4=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/microchip/sama7g5ek/genimage.cfg" > BR2_LINUX_KERNEL=y From giulio.benetti at benettiengineering.com Tue Feb 1 23:04:08 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 2 Feb 2022 00:04:08 +0100 Subject: [Buildroot] [PATCH v2 0/6] Fix gitlab CI build failure due to missing HOST_ dependencies Message-ID: <20220201230414.4144930-1-giulio.benetti@benettiengineering.com> This patchset fixes the gitlab build failure due to HOST_ dependencies(uboot/linux). V1->V2: * add missing host openssl for linux on microchip_sama7g5ek_mmc_defconfig/_dev_defconfig Giulio Benetti (6): configs/bananapi_m2_ultra_defconfig: u-boot needs host python3 and host openssl configs/beaglev_defconfig: linux needs host openssl configs/microchip_sama5d2_icp_mmc_defconfig: linux needs host openssl configs/microchip_sama5d2_icp_mmc_dev_defconfig: linux needs host openssl configs/microchip_sama7g5ek_mmc_defconfig: add missing BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15 and host openssl for linux configs/microchip_sama7g5ek_mmc_dev_defconfig: add missing BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15 and host openssl for linux configs/bananapi_m2_ultra_defconfig | 2 ++ configs/beaglev_defconfig | 1 + configs/microchip_sama5d2_icp_mmc_defconfig | 1 + configs/microchip_sama5d2_icp_mmc_dev_defconfig | 1 + configs/microchip_sama7g5ek_mmc_defconfig | 2 ++ configs/microchip_sama7g5ek_mmc_dev_defconfig | 2 ++ 6 files changed, 9 insertions(+) -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Feb 1 23:04:12 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 2 Feb 2022 00:04:12 +0100 Subject: [Buildroot] [PATCH v2 4/6] configs/microchip_sama5d2_icp_mmc_dev_defconfig: linux needs host openssl In-Reply-To: <20220201230414.4144930-1-giulio.benetti@benettiengineering.com> References: <20220201230414.4144930-1-giulio.benetti@benettiengineering.com> Message-ID: <20220201230414.4144930-5-giulio.benetti@benettiengineering.com> Fixes: https://gitlab.com/ymorin/buildroot/-/jobs/2035821096 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..27d1d3409d 100644 --- a/configs/microchip_sama5d2_icp_mmc_dev_defconfig +++ b/configs/microchip_sama5d2_icp_mmc_dev_defconfig @@ -16,6 +16,7 @@ BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,li BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d2_icp" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_LINUX_TOOLS_IIO=y BR2_PACKAGE_BZIP2=y BR2_PACKAGE_XZ=y -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Feb 1 23:04:09 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 2 Feb 2022 00:04:09 +0100 Subject: [Buildroot] [PATCH v2 1/6] configs/bananapi_m2_ultra_defconfig: u-boot needs host python3 and host openssl In-Reply-To: <20220201230414.4144930-1-giulio.benetti@benettiengineering.com> References: <20220201230414.4144930-1-giulio.benetti@benettiengineering.com> Message-ID: <20220201230414.4144930-2-giulio.benetti@benettiengineering.com> Fixes: https://gitlab.com/ymorin/buildroot/-/jobs/2035820967 Signed-off-by: Giulio Benetti --- configs/bananapi_m2_ultra_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/bananapi_m2_ultra_defconfig b/configs/bananapi_m2_ultra_defconfig index 67ecec424c..2ec0e60e8d 100644 --- a/configs/bananapi_m2_ultra_defconfig +++ b/configs/bananapi_m2_ultra_defconfig @@ -19,7 +19,9 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="bananapi_m2_berry" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" BR2_PACKAGE_HOST_DOSFSTOOLS=y -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Feb 1 23:04:10 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 2 Feb 2022 00:04:10 +0100 Subject: [Buildroot] [PATCH v2 2/6] configs/beaglev_defconfig: linux needs host openssl In-Reply-To: <20220201230414.4144930-1-giulio.benetti@benettiengineering.com> References: <20220201230414.4144930-1-giulio.benetti@benettiengineering.com> Message-ID: <20220201230414.4144930-3-giulio.benetti@benettiengineering.com> Fixes: https://gitlab.com/ymorin/buildroot/-/jobs/2035820979 Signed-off-by: Giulio Benetti --- configs/beaglev_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/beaglev_defconfig b/configs/beaglev_defconfig index 70459bf3e8..79af8c2ece 100644 --- a/configs/beaglev_defconfig +++ b/configs/beaglev_defconfig @@ -16,6 +16,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="starlight" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="starfive/jh7100-beaglev-starlight" 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_TAR is not set -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Feb 1 23:04:13 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 2 Feb 2022 00:04:13 +0100 Subject: [Buildroot] [PATCH v2 5/6] configs/microchip_sama7g5ek_mmc_defconfig: add missing BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15 and host openssl for linux In-Reply-To: <20220201230414.4144930-1-giulio.benetti@benettiengineering.com> References: <20220201230414.4144930-1-giulio.benetti@benettiengineering.com> Message-ID: <20220201230414.4144930-6-giulio.benetti@benettiengineering.com> Fixes: https://gitlab.com/ymorin/buildroot/-/jobs/2035821098 Signed-off-by: Giulio Benetti --- V1->V2: * add host openssl linux --- configs/microchip_sama7g5ek_mmc_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/microchip_sama7g5ek_mmc_defconfig b/configs/microchip_sama7g5ek_mmc_defconfig index b1cd193829..df48c0880b 100644 --- a/configs/microchip_sama7g5ek_mmc_defconfig +++ b/configs/microchip_sama7g5ek_mmc_defconfig @@ -1,12 +1,14 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/microchip/sama7g5ek/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_DEFCONFIG="sama7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama7g5ek" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Feb 1 23:04:14 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 2 Feb 2022 00:04:14 +0100 Subject: [Buildroot] [PATCH v2 6/6] configs/microchip_sama7g5ek_mmc_dev_defconfig: add missing BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15 and host openssl for linux In-Reply-To: <20220201230414.4144930-1-giulio.benetti@benettiengineering.com> References: <20220201230414.4144930-1-giulio.benetti@benettiengineering.com> Message-ID: <20220201230414.4144930-7-giulio.benetti@benettiengineering.com> Fixes: https://gitlab.com/ymorin/buildroot/-/jobs/2035821100 Signed-off-by: Giulio Benetti --- V1->V2: * add host openssl linux --- configs/microchip_sama7g5ek_mmc_dev_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/microchip_sama7g5ek_mmc_dev_defconfig b/configs/microchip_sama7g5ek_mmc_dev_defconfig index 3253bce401..d34192b66d 100644 --- a/configs/microchip_sama7g5ek_mmc_dev_defconfig +++ b/configs/microchip_sama7g5ek_mmc_dev_defconfig @@ -1,6 +1,7 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_TOOLCHAIN_BUILDROOT_WCHAR=y BR2_PTHREAD_DEBUG=y BR2_TOOLCHAIN_BUILDROOT_CXX=y @@ -11,6 +12,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_DEFCONFIG="sama7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama7g5ek" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_LINUX_TOOLS_IIO=y BR2_PACKAGE_BZIP2=y BR2_PACKAGE_XZ=y -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Feb 1 23:04:11 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 2 Feb 2022 00:04:11 +0100 Subject: [Buildroot] [PATCH v2 3/6] configs/microchip_sama5d2_icp_mmc_defconfig: linux needs host openssl In-Reply-To: <20220201230414.4144930-1-giulio.benetti@benettiengineering.com> References: <20220201230414.4144930-1-giulio.benetti@benettiengineering.com> Message-ID: <20220201230414.4144930-4-giulio.benetti@benettiengineering.com> Fixes: https://gitlab.com/ymorin/buildroot/-/jobs/2035821094 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..27ea4970f1 100644 --- a/configs/microchip_sama5d2_icp_mmc_defconfig +++ b/configs/microchip_sama5d2_icp_mmc_defconfig @@ -12,6 +12,7 @@ BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,li BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d2_icp" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Feb 1 23:06:43 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 2 Feb 2022 00:06:43 +0100 Subject: [Buildroot] [PATCH v2 3/6] configs/microchip_sama5d2_icp_mmc_defconfig: linux needs host openssl In-Reply-To: <20220201230414.4144930-4-giulio.benetti@benettiengineering.com> References: <20220201230414.4144930-1-giulio.benetti@benettiengineering.com> <20220201230414.4144930-4-giulio.benetti@benettiengineering.com> Message-ID: <037b8bb1-8191-2410-ca36-272597898584@benettiengineering.com> On 02/02/22 00:04, Giulio Benetti wrote: > Fixes: > https://gitlab.com/ymorin/buildroot/-/jobs/2035821094 > > Signed-off-by: Giulio Benetti I've left back this: Reviewed-by: Michael Trimarchi Best regards -- Giulio Benetti Benetti Engineering sas > --- > 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..27ea4970f1 100644 > --- a/configs/microchip_sama5d2_icp_mmc_defconfig > +++ b/configs/microchip_sama5d2_icp_mmc_defconfig > @@ -12,6 +12,7 @@ BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,li > BR2_LINUX_KERNEL_DEFCONFIG="sama5" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d2_icp" > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > BR2_TARGET_ROOTFS_EXT2_SIZE="120M" From fontaine.fabrice at gmail.com Tue Feb 1 23:08:45 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 2 Feb 2022 00:08:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/libblockdev: fix build with libglib2 >= 2.69 Message-ID: <20220201230845.888962-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump of libglib2 to version 2.70 in commit 079923d5fabf4f887bb140808cb16067ca08b19b: 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)) { | ^~ Fixes: - http://autobuild.buildroot.org/results/8f9ca895cb07014804130a7ccbcb758b1d519470 Signed-off-by: Fabrice Fontaine --- ...ec-Fix-deprecated-glib-function-call.patch | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 package/libblockdev/0002-exec-Fix-deprecated-glib-function-call.patch diff --git a/package/libblockdev/0002-exec-Fix-deprecated-glib-function-call.patch b/package/libblockdev/0002-exec-Fix-deprecated-glib-function-call.patch new file mode 100644 index 0000000000..2c370a133f --- /dev/null +++ b/package/libblockdev/0002-exec-Fix-deprecated-glib-function-call.patch @@ -0,0 +1,32 @@ +From aad927a81fd9067865dc391c5bbff12ac51a0002 Mon Sep 17 00:00:00 2001 +From: Manuel Wassermann +Date: Thu, 1 Jul 2021 04:45:49 +0200 +Subject: [PATCH] exec: Fix deprecated glib function call Glib will rename + "g_spawn_check_exit_status()" to "g_spawn_check_wait_status()" in version + 2.69. + +[Retrieved from: +https://github.com/storaged-project/libblockdev/commit/aad927a81fd9067865dc391c5bbff12ac51a0002] +Signed-off-by: Fabrice Fontaine +--- + src/utils/exec.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/src/utils/exec.c b/src/utils/exec.c +index 317fb5525..8faeb289c 100644 +--- a/src/utils/exec.c ++++ b/src/utils/exec.c +@@ -236,7 +236,12 @@ gboolean bd_utils_exec_and_report_status_error (const gchar **argv, const BDExtr + /* g_spawn_sync set the status in the same way waitpid() does, we need + to get the process exit code manually (this is similar to calling + WEXITSTATUS but also sets the error for terminated processes */ +- if (!g_spawn_check_exit_status (exit_status, error)) { ++ ++ #if !GLIB_CHECK_VERSION(2, 69, 0) ++ #define g_spawn_check_wait_status(x,y) (g_spawn_check_exit_status (x,y)) ++ #endif ++ ++ if (!g_spawn_check_wait_status (exit_status, error)) { + if (g_error_matches (*error, G_SPAWN_ERROR, G_SPAWN_ERROR_FAILED)) { + /* process was terminated abnormally (e.g. using a signal) */ + g_free (stdout_data); -- 2.34.1 From giulio.benetti at benettiengineering.com Tue Feb 1 23:22:02 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 2 Feb 2022 00:22:02 +0100 Subject: [Buildroot] [URGENT 0/1] This patch is needed for host-util-linux Message-ID: <20220201232203.333403-1-giulio.benetti@benettiengineering.com> host-util-linux is very used, so please apply this asap, otherwise a lot of builds will fail. Giulio Benetti (1): package/util-linux: fix host build failure package/util-linux/util-linux.mk | 1 + 1 file changed, 1 insertion(+) -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Feb 1 23:22:03 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 2 Feb 2022 00:22:03 +0100 Subject: [Buildroot] [URGENT 1/1] package/util-linux: fix host build failure In-Reply-To: <20220201232203.333403-1-giulio.benetti@benettiengineering.com> References: <20220201232203.333403-1-giulio.benetti@benettiengineering.com> Message-ID: <20220201232203.333403-2-giulio.benetti@benettiengineering.com> The UTIL_LINUX_FIX_DISK_UTILS_COMPILE workaround is needed for host building too. So let's add it to HOST_UTIL_LINUX_POST_PATCH_HOOKS. host-util-linux is used a lot, so this patch fixes a lot of future builds. Signed-off-by: Giulio Benetti --- package/util-linux/util-linux.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index e59ef7dadc..5a4ff64d01 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -41,6 +41,7 @@ define UTIL_LINUX_FIX_DISK_UTILS_COMPILE touch $(@D)/disk-utils/raw.8 endef UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE +HOST_UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Feb 1 23:25:00 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 2 Feb 2022 00:25:00 +0100 Subject: [Buildroot] [URGENT 1/1] package/util-linux: fix host build failure In-Reply-To: <20220201232203.333403-2-giulio.benetti@benettiengineering.com> References: <20220201232203.333403-1-giulio.benetti@benettiengineering.com> <20220201232203.333403-2-giulio.benetti@benettiengineering.com> Message-ID: On 02/02/22 00:22, Giulio Benetti wrote: > The UTIL_LINUX_FIX_DISK_UTILS_COMPILE workaround is needed for host > building too. So let's add it to HOST_UTIL_LINUX_POST_PATCH_HOOKS. > host-util-linux is used a lot, so this patch fixes a lot of future > builds. I was too fast... Fixes: http://autobuild.buildroot.net/results/b8c/b8cb40efc036a01802c914544cd4fc29dfd67af6// and others that are coming out. Best regards! -- Giulio Benetti Benetti Engineering sas > Signed-off-by: Giulio Benetti > --- > package/util-linux/util-linux.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk > index e59ef7dadc..5a4ff64d01 100644 > --- a/package/util-linux/util-linux.mk > +++ b/package/util-linux/util-linux.mk > @@ -41,6 +41,7 @@ define UTIL_LINUX_FIX_DISK_UTILS_COMPILE > touch $(@D)/disk-utils/raw.8 > endef > UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE > +HOST_UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE > > HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf > From james.hilliard1 at gmail.com Wed Feb 2 03:06:56 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 1 Feb 2022 20:06:56 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-aioconsole: bump to version 0.4.0 Message-ID: <20220202030656.2175796-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 26a3778756..39ce16f8b2 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 f8b67330e631cfc45a9b2560a6e0fa98 aioconsole-0.3.3.tar.gz -sha256 47df42d9f8cc3995bbe032dd5f01d32cc5b06639e9078bb9b4e3c55b237f5e32 aioconsole-0.3.3.tar.gz +md5 56a1e6542ea3627bdbc67f24abcaa341 aioconsole-0.4.0.tar.gz +sha256 a30ad5276b85dd20a48d235111d0bd26c6bedf7b56d605ffc10ae27124b4b0b4 aioconsole-0.4.0.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 f06d91a550..44857054d4 100644 --- a/package/python-aioconsole/python-aioconsole.mk +++ b/package/python-aioconsole/python-aioconsole.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOCONSOLE_VERSION = 0.3.3 +PYTHON_AIOCONSOLE_VERSION = 0.4.0 PYTHON_AIOCONSOLE_SOURCE = aioconsole-$(PYTHON_AIOCONSOLE_VERSION).tar.gz -PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/dd/f6/bbc451ba96c1e1da6aa253f254b181ceb03272b475b27b481b57865d7d7f +PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/f2/7a/7628ec23f140ffca532c7f630e179503727b755849b5eab15576bbf7d3df 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 Wed Feb 2 03:11:30 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 1 Feb 2022 20:11:30 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-autobahn: bump to version 22.1.1 Message-ID: <20220202031130.2178288-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-autobahn/python-autobahn.hash | 4 ++-- package/python-autobahn/python-autobahn.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-autobahn/python-autobahn.hash b/package/python-autobahn/python-autobahn.hash index 0bbb9112d0..7b963df635 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 1ccd46d938d8b9fed435e9781e54e887 autobahn-21.11.1.tar.gz -sha256 bd6f46315419ca0a5be4109f737410208ad5f19718f67ca6a4a674cc66ca9b18 autobahn-21.11.1.tar.gz +md5 9b0ae4ff164232c952ba01ab3516188e autobahn-22.1.1.tar.gz +sha256 17e1b58b6ae1a63ca7d926b1d71bb9e4fd6b9ac9a1a2277d8ee40e0b61f54746 autobahn-22.1.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 db9e5083d1..df43e9cdf2 100644 --- a/package/python-autobahn/python-autobahn.mk +++ b/package/python-autobahn/python-autobahn.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AUTOBAHN_VERSION = 21.11.1 +PYTHON_AUTOBAHN_VERSION = 22.1.1 PYTHON_AUTOBAHN_SOURCE = autobahn-$(PYTHON_AUTOBAHN_VERSION).tar.gz -PYTHON_AUTOBAHN_SITE = https://files.pythonhosted.org/packages/f1/d3/23fdf1ab0104b1b65d2f7884e923f0526750a59f96334d752afc79cf44ed +PYTHON_AUTOBAHN_SITE = https://files.pythonhosted.org/packages/0e/2a/0b627ad4adf70437b5753462958b3ba5c6802d7664eb4a680e46423659ba PYTHON_AUTOBAHN_LICENSE = MIT PYTHON_AUTOBAHN_LICENSE_FILES = LICENSE PYTHON_AUTOBAHN_CPE_ID_VENDOR = crossbar -- 2.25.1 From james.hilliard1 at gmail.com Wed Feb 2 03:17:09 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 1 Feb 2022 20:17:09 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-cbor2: bump to version 5.4.2.post1 Message-ID: <20220202031709.2181778-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 9910e632a2..8858fc72d3 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 b3a6085ee1a9e11ddec305f7a7bc5956 cbor2-5.4.2.tar.gz -sha256 e283e70b55a049ff364cc5e648fde587e4d9b0e87e4b2664c69e639135e6b3b8 cbor2-5.4.2.tar.gz +md5 a9518fd435d9eafd91063b3bf10d5c5b cbor2-5.4.2.post1.tar.gz +sha256 9cf21d59604b9529d7877c8e0342a2ebaae1a07fe8ff5683dc75fec15847c797 cbor2-5.4.2.post1.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 4cc09a219f..dd007217d1 100644 --- a/package/python-cbor2/python-cbor2.mk +++ b/package/python-cbor2/python-cbor2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CBOR2_VERSION = 5.4.2 +PYTHON_CBOR2_VERSION = 5.4.2.post1 PYTHON_CBOR2_SOURCE = cbor2-$(PYTHON_CBOR2_VERSION).tar.gz -PYTHON_CBOR2_SITE = https://files.pythonhosted.org/packages/d4/ca/b96be94f694155ce58823c38cf8fd1aa620bdc91e2c801713cdb4167b6aa +PYTHON_CBOR2_SITE = https://files.pythonhosted.org/packages/49/74/2b9f9b76e2831f54d70e177a4e602e72cb86441632d1bcc15be1f04a73f6 PYTHON_CBOR2_SETUP_TYPE = setuptools PYTHON_CBOR2_LICENSE = MIT PYTHON_CBOR2_LICENSE_FILES = LICENSE.txt -- 2.25.1 From joel at jms.id.au Wed Feb 2 03:17:45 2022 From: joel at jms.id.au (Joel Stanley) Date: Wed, 2 Feb 2022 13:47:45 +1030 Subject: [Buildroot] [PATCH] board: x86_64: Enable and mount debugfs Message-ID: <20220202031745.448551-1-joel@jms.id.au> Add DEBUG_FS to the kernel options, and modify fstab so it is automatically mounted at boot. This is useful when testing. Signed-off-by: Joel Stanley --- board/qemu/x86_64/linux.config | 1 + board/qemu/x86_64/post-build.sh | 3 +++ 2 files changed, 4 insertions(+) diff --git a/board/qemu/x86_64/linux.config b/board/qemu/x86_64/linux.config index e1d2ce01b004..2ed5c4194560 100644 --- a/board/qemu/x86_64/linux.config +++ b/board/qemu/x86_64/linux.config @@ -50,4 +50,5 @@ CONFIG_EXT4_FS=y CONFIG_AUTOFS4_FS=y CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y +CONFIG_DEBUG_FS=y CONFIG_UNWINDER_FRAME_POINTER=y diff --git a/board/qemu/x86_64/post-build.sh b/board/qemu/x86_64/post-build.sh index bf83a002c2fc..0b27ab2c8074 100755 --- a/board/qemu/x86_64/post-build.sh +++ b/board/qemu/x86_64/post-build.sh @@ -9,3 +9,6 @@ if [ -e ${TARGET_DIR}/etc/inittab ]; then sed -i '/GENERIC_SERIAL/a\ tty1::respawn:/sbin/getty -L tty1 0 vt100 # QEMU graphical window' ${TARGET_DIR}/etc/inittab fi + +# Mount debugfs on boot +echo "debugfs /sys/kernel/debug debugfs defaults 0 0" >> ${TARGET_DIR}/etc/fstab -- 2.34.1 From james.hilliard1 at gmail.com Wed Feb 2 03:20:25 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 1 Feb 2022 20:20:25 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-charset-normalizer: bump to version 2.0.11 Message-ID: <20220202032025.2182903-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 eb3b67598b..3c6e58a616 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 eaed8aaf95d7e3bc2daefcd8d0f03458 charset-normalizer-2.0.10.tar.gz -sha256 876d180e9d7432c5d1dfd4c5d26b72f099d503e8fcc0feb7532c9289be60fcbd charset-normalizer-2.0.10.tar.gz +md5 2abe3754fef25c99799a518cb83a81ae charset-normalizer-2.0.11.tar.gz +sha256 98398a9d69ee80548c762ba991a4728bfc3836768ed226b3945908d1a688371c charset-normalizer-2.0.11.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 33f2e132de..0a96a6b078 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.10 +PYTHON_CHARSET_NORMALIZER_VERSION = 2.0.11 PYTHON_CHARSET_NORMALIZER_SOURCE = charset-normalizer-$(PYTHON_CHARSET_NORMALIZER_VERSION).tar.gz -PYTHON_CHARSET_NORMALIZER_SITE = https://files.pythonhosted.org/packages/48/44/76b179e0d1afe6e6a91fd5661c284f60238987f3b42b676d141d01cd5b97 +PYTHON_CHARSET_NORMALIZER_SITE = https://files.pythonhosted.org/packages/e8/e8/b6cfd28fb430b2ec9923ad0147025bf8bbdf304b1eb3039b69f1ce44ed6e 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 Wed Feb 2 03:31:44 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 1 Feb 2022 20:31:44 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-cssutils: bump to version 2.3.0 Message-ID: <20220202033144.2187501-1-james.hilliard1@gmail.com> Drop python2 support. Add new host-python-setuptools-scm dependency. Signed-off-by: James Hilliard --- package/python-cssutils/Config.in | 4 ++-- package/python-cssutils/python-cssutils.hash | 6 +++--- package/python-cssutils/python-cssutils.mk | 5 +++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/package/python-cssutils/Config.in b/package/python-cssutils/Config.in index 74de742c31..141561901c 100644 --- a/package/python-cssutils/Config.in +++ b/package/python-cssutils/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_PYTHON_CSSUTILS bool "python-cssutils" - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime help A CSS Cascading Style Sheets library for Python. diff --git a/package/python-cssutils/python-cssutils.hash b/package/python-cssutils/python-cssutils.hash index 393daffb8b..e22dde6e56 100644 --- a/package/python-cssutils/python-cssutils.hash +++ b/package/python-cssutils/python-cssutils.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/cssutils/json -md5 dc66d96c2d78f1687f59ac412fe9d318 cssutils-1.0.2.tar.gz -sha256 a2fcf06467553038e98fea9cfe36af2bf14063eb147a70958cfcaa8f5786acaf cssutils-1.0.2.tar.gz +md5 71955999f595e4b0eb5a218d614652ca cssutils-2.3.0.tar.gz +sha256 b2d3b16047caae82e5c590036935bafa1b621cf45c2f38885af4be4838f0fd00 cssutils-2.3.0.tar.gz # Locally computed sha256 checksums -sha256 03c570a068086ee577dcd795519ea93462b2ed2fcb6dcc4dfce56a71a2fd6e5a COPYING.LESSER +sha256 03c570a068086ee577dcd795519ea93462b2ed2fcb6dcc4dfce56a71a2fd6e5a COPYING.LESSER diff --git a/package/python-cssutils/python-cssutils.mk b/package/python-cssutils/python-cssutils.mk index 513c3a87de..09c2ca44d6 100644 --- a/package/python-cssutils/python-cssutils.mk +++ b/package/python-cssutils/python-cssutils.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_CSSUTILS_VERSION = 1.0.2 +PYTHON_CSSUTILS_VERSION = 2.3.0 PYTHON_CSSUTILS_SOURCE = cssutils-$(PYTHON_CSSUTILS_VERSION).tar.gz -PYTHON_CSSUTILS_SITE = https://files.pythonhosted.org/packages/5c/0b/c5f29d29c037e97043770b5e7c740b6252993e4b57f029b3cd03c78ddfec +PYTHON_CSSUTILS_SITE = https://files.pythonhosted.org/packages/f5/c6/878abb7df855938a067b762a688da3fcdfea4e41c2399feaf80369b61ed7 PYTHON_CSSUTILS_LICENSE = LGPL-3.0+ PYTHON_CSSUTILS_LICENSE_FILES = COPYING.LESSER PYTHON_CSSUTILS_SETUP_TYPE = setuptools +PYTHON_CSSUTILS_DEPENDENCIES = host-python-setuptools-scm $(eval $(python-package)) -- 2.25.1 From james.hilliard1 at gmail.com Wed Feb 2 03:40:36 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 1 Feb 2022 20:40:36 -0700 Subject: [Buildroot] [PATCH 1/1] package/python{3}-cython: bump to version 0.29.27 Message-ID: <20220202034036.2188757-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 b07f171c25..9c5f1225cf 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 971c9708dd5269180868fc0af986084c Cython-0.29.26.tar.gz -sha256 af377d543a762867da11fcf6e558f7a4a535ff8693f30cce123fab10c00fa312 Cython-0.29.26.tar.gz +md5 2b2ba86abcf823985935d37f5e43b19a Cython-0.29.27.tar.gz +sha256 c6a442504db906dfc13a480e96850cced994ecdc076bcf492c43515b78f70da2 Cython-0.29.27.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 cf41086dea..89708cb9a8 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.26 +PYTHON_CYTHON_VERSION = 0.29.27 PYTHON_CYTHON_SOURCE = Cython-$(PYTHON_CYTHON_VERSION).tar.gz -PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/bc/fa/8604d92ef753e0036d807f1b3179813ab2fa283e3b19c926e11673c8205b +PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/eb/46/80dd9e5ad67ebc766ff3229901bde4a7bc82907efe93cd7007c4df458dd5 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 da159cedc8..56d88b5bf7 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.26 +PYTHON3_CYTHON_VERSION = 0.29.27 PYTHON3_CYTHON_SOURCE = Cython-$(PYTHON3_CYTHON_VERSION).tar.gz -PYTHON3_CYTHON_SITE = https://files.pythonhosted.org/packages/bc/fa/8604d92ef753e0036d807f1b3179813ab2fa283e3b19c926e11673c8205b +PYTHON3_CYTHON_SITE = https://files.pythonhosted.org/packages/eb/46/80dd9e5ad67ebc766ff3229901bde4a7bc82907efe93cd7007c4df458dd5 PYTHON3_CYTHON_SETUP_TYPE = setuptools PYTHON3_CYTHON_LICENSE = Apache-2.0 PYTHON3_CYTHON_LICENSE_FILES = COPYING.txt LICENSE.txt -- 2.25.1 From james.hilliard1 at gmail.com Wed Feb 2 03:47:55 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 1 Feb 2022 20:47:55 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-fonttools: bump to version 4.29.1 Message-ID: <20220202034755.2191344-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 1f9b546c23..df0bdf980d 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 4a894b3cd108432f7636849b4026b771 fonttools-4.28.5.zip -sha256 545c05d0f7903a863c2020e07b8f0a57517f2c40d940bded77076397872d14ca fonttools-4.28.5.zip +md5 7fc490291991da874911fed1e743362d fonttools-4.29.1.zip +sha256 2b18a172120e32128a80efee04cff487d5d140fe7d817deb648b2eee023a40e4 fonttools-4.29.1.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 c5c605161b..d5c4cdf8e5 100644 --- a/package/python-fonttools/python-fonttools.mk +++ b/package/python-fonttools/python-fonttools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FONTTOOLS_VERSION = 4.28.5 +PYTHON_FONTTOOLS_VERSION = 4.29.1 PYTHON_FONTTOOLS_SOURCE = fonttools-$(PYTHON_FONTTOOLS_VERSION).zip -PYTHON_FONTTOOLS_SITE = https://files.pythonhosted.org/packages/ce/1b/d4cd86f4e6cbd54a3c4f807015b116299bcd6d6587ea0645d88ba9d932bb +PYTHON_FONTTOOLS_SITE = https://files.pythonhosted.org/packages/2d/4c/49ba863863502bb9fea19d8bd04a527da336b4a2698c8a0c7129e9cc2716 PYTHON_FONTTOOLS_SETUP_TYPE = setuptools PYTHON_FONTTOOLS_LICENSE = MIT PYTHON_FONTTOOLS_LICENSE_FILES = LICENSE -- 2.25.1 From james.hilliard1 at gmail.com Wed Feb 2 03:58:47 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 1 Feb 2022 20:58:47 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-janus: bump to version 1.0.0 Message-ID: <20220202035847.2194218-1-james.hilliard1@gmail.com> Add new python-typing-extensions runtime dependency. Signed-off-by: James Hilliard --- package/python-janus/Config.in | 1 + package/python-janus/python-janus.hash | 4 ++-- package/python-janus/python-janus.mk | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/python-janus/Config.in b/package/python-janus/Config.in index a1ba0463f9..38e4b7217f 100644 --- a/package/python-janus/Config.in +++ b/package/python-janus/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_JANUS bool "python-janus" depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime help Mixed sync-async queue to interoperate between asyncio tasks and classic threads. diff --git a/package/python-janus/python-janus.hash b/package/python-janus/python-janus.hash index 7d914389d2..7f7ce35caa 100644 --- a/package/python-janus/python-janus.hash +++ b/package/python-janus/python-janus.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/janus/json -md5 dad6a03e7664cb800ce45ef8bcf12439 janus-0.6.1.tar.gz -sha256 4712e0ef75711fe5947c2db855bc96221a9a03641b52e5ae8e25c2b705dd1d0c janus-0.6.1.tar.gz +md5 2d8c0b884c14f18fc5223858eb16461e janus-1.0.0.tar.gz +sha256 df976f2cdcfb034b147a2d51edfc34ff6bfb12d4e2643d3ad0e10de058cb1612 janus-1.0.0.tar.gz # Locally computed sha256 checksums sha256 8b177cccb6ddec12a9fc97bd49e7e2bbcd92464625624bd8bdbfad799ae606e9 LICENSE diff --git a/package/python-janus/python-janus.mk b/package/python-janus/python-janus.mk index 2b08733c18..43df87870d 100644 --- a/package/python-janus/python-janus.mk +++ b/package/python-janus/python-janus.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_JANUS_VERSION = 0.6.1 +PYTHON_JANUS_VERSION = 1.0.0 PYTHON_JANUS_SOURCE = janus-$(PYTHON_JANUS_VERSION).tar.gz -PYTHON_JANUS_SITE = https://files.pythonhosted.org/packages/7c/1b/8769c2dca84dd8ca92e48b14750c7106ff4313df4fee651dbc3cd9e345a9 +PYTHON_JANUS_SITE = https://files.pythonhosted.org/packages/b8/a8/facab7275d7d3d2032f375843fe46fad1cfa604a108b5a238638d4615bdc PYTHON_JANUS_SETUP_TYPE = setuptools PYTHON_JANUS_LICENSE = Apache-2.0 PYTHON_JANUS_LICENSE_FILES = LICENSE -- 2.25.1 From james.hilliard1 at gmail.com Wed Feb 2 04:06:19 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 1 Feb 2022 21:06:19 -0700 Subject: [Buildroot] [PATCH 1/1] package/python{3}-pycryptodomex: bump to version 3.14.0 Message-ID: <20220202040619.2197495-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-pycryptodomex/python-pycryptodomex.hash | 4 ++-- package/python-pycryptodomex/python-pycryptodomex.mk | 4 ++-- package/python3-pycryptodomex/python3-pycryptodomex.mk | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-pycryptodomex/python-pycryptodomex.hash b/package/python-pycryptodomex/python-pycryptodomex.hash index 9512f185a8..920cec2518 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 dcf0d13044c700410bdce31a5afdf6d0 pycryptodomex-3.13.0.tar.gz -sha256 63443230247837dd03c5d4028cae5cb2e6793a9ae110e321798bee48a04ff3e9 pycryptodomex-3.13.0.tar.gz +md5 18f571832bbfbf0f4516ccef009f2dfb pycryptodomex-3.14.0.tar.gz +sha256 2d8bda8f949b79b78b293706aa7fc1e5c171c62661252bfdd5d12c70acd03282 pycryptodomex-3.14.0.tar.gz # Locally computed sha256 checksums sha256 4e04660d77c1c64e89d79537919fb8240fa21484a7e3db29f358b2c7f84ea073 LICENSE.rst sha256 8e563c767164faa0831a333b57d23d4311cf566eb1b15d93250f4606be4eb549 Doc/LEGAL/COPYRIGHT.pycrypto diff --git a/package/python-pycryptodomex/python-pycryptodomex.mk b/package/python-pycryptodomex/python-pycryptodomex.mk index 92780327a1..7821052b43 100644 --- a/package/python-pycryptodomex/python-pycryptodomex.mk +++ b/package/python-pycryptodomex/python-pycryptodomex.mk @@ -5,9 +5,9 @@ ################################################################################ # Please keep in sync with package/python3-pycryptodomex/python3-pycryptodomex.mk -PYTHON_PYCRYPTODOMEX_VERSION = 3.13.0 +PYTHON_PYCRYPTODOMEX_VERSION = 3.14.0 PYTHON_PYCRYPTODOMEX_SOURCE = pycryptodomex-$(PYTHON_PYCRYPTODOMEX_VERSION).tar.gz -PYTHON_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/7a/21/f399ba8dfd6e40eee444151af3237af22788b8b16077c75ec0419125f619 +PYTHON_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/a6/b3/a5e59cd3ad65d4dc470a3a63381d0495885cf1ac7659c83c6bc9e9e79df6 PYTHON_PYCRYPTODOMEX_SETUP_TYPE = setuptools PYTHON_PYCRYPTODOMEX_LICENSE = \ BSD-2-Clause, \ diff --git a/package/python3-pycryptodomex/python3-pycryptodomex.mk b/package/python3-pycryptodomex/python3-pycryptodomex.mk index 06a46cdf63..35469df85a 100644 --- a/package/python3-pycryptodomex/python3-pycryptodomex.mk +++ b/package/python3-pycryptodomex/python3-pycryptodomex.mk @@ -5,9 +5,9 @@ ################################################################################ # Please keep in sync with package/python-pycryptodomex/python-pycryptodomex.mk -PYTHON3_PYCRYPTODOMEX_VERSION = 3.13.0 +PYTHON3_PYCRYPTODOMEX_VERSION = 3.14.0 PYTHON3_PYCRYPTODOMEX_SOURCE = pycryptodomex-$(PYTHON3_PYCRYPTODOMEX_VERSION).tar.gz -PYTHON3_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/7a/21/f399ba8dfd6e40eee444151af3237af22788b8b16077c75ec0419125f619 +PYTHON3_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/a6/b3/a5e59cd3ad65d4dc470a3a63381d0495885cf1ac7659c83c6bc9e9e79df6 PYTHON3_PYCRYPTODOMEX_SETUP_TYPE = setuptools PYTHON3_PYCRYPTODOMEX_LICENSE = \ BSD-2-Clause, \ -- 2.25.1 From james.hilliard1 at gmail.com Wed Feb 2 04:11:15 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 1 Feb 2022 21:11:15 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-pyparsing: bump to version 3.0.7 Message-ID: <20220202041115.2198598-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 a21baf46e5..1e56e878a1 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 2f5fad6c8e99ac2562ab08ad9e45b195 pyparsing-3.0.6.tar.gz -sha256 d9bdec0013ef1eb5a84ab39a3b3868911598afa494f5faa038647101504e2b81 pyparsing-3.0.6.tar.gz +md5 9d38774991175444e21a3dfa865876cc pyparsing-3.0.7.tar.gz +sha256 18ee9022775d270c55187733956460083db60b37d0d0fb357445f3094eed3eea pyparsing-3.0.7.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 b6ab353a6d..e33541bdb7 100644 --- a/package/python-pyparsing/python-pyparsing.mk +++ b/package/python-pyparsing/python-pyparsing.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYPARSING_VERSION = 3.0.6 +PYTHON_PYPARSING_VERSION = 3.0.7 PYTHON_PYPARSING_SOURCE = pyparsing-$(PYTHON_PYPARSING_VERSION).tar.gz -PYTHON_PYPARSING_SITE = https://files.pythonhosted.org/packages/ab/61/1a1613e3dcca483a7aa9d446cb4614e6425eb853b90db131c305bd9674cb +PYTHON_PYPARSING_SITE = https://files.pythonhosted.org/packages/d6/60/9bed18f43275b34198eb9720d4c1238c68b3755620d20df0afd89424d32b PYTHON_PYPARSING_LICENSE = MIT PYTHON_PYPARSING_LICENSE_FILES = LICENSE PYTHON_PYPARSING_SETUP_TYPE = setuptools -- 2.25.1 From james.hilliard1 at gmail.com Wed Feb 2 04:20:24 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 1 Feb 2022 21:20:24 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-setuptools-scm: bump to version 6.4.2 Message-ID: <20220202042024.2202751-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-setuptools-scm/python-setuptools-scm.hash | 4 ++-- package/python-setuptools-scm/python-setuptools-scm.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-setuptools-scm/python-setuptools-scm.hash b/package/python-setuptools-scm/python-setuptools-scm.hash index 22b9afd2c2..934c505442 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 32918d8ac566360c21411e0b3556c695 setuptools_scm-6.3.2.tar.gz -sha256 a49aa8081eeb3514eb9728fa5040f2eaa962d6c6f4ec9c32f6c1fba88f88a0f2 setuptools_scm-6.3.2.tar.gz +md5 b4e02bf8e62ed49142ea7b42a68671d7 setuptools_scm-6.4.2.tar.gz +sha256 6833ac65c6ed9711a4d5d2266f8024cfa07c533a0e55f4c12f6eff280a5a9e30 setuptools_scm-6.4.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 b2990a56cb..8c5229e1a6 100644 --- a/package/python-setuptools-scm/python-setuptools-scm.mk +++ b/package/python-setuptools-scm/python-setuptools-scm.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SETUPTOOLS_SCM_VERSION = 6.3.2 +PYTHON_SETUPTOOLS_SCM_VERSION = 6.4.2 PYTHON_SETUPTOOLS_SCM_SOURCE = setuptools_scm-$(PYTHON_SETUPTOOLS_SCM_VERSION).tar.gz -PYTHON_SETUPTOOLS_SCM_SITE = https://files.pythonhosted.org/packages/4b/0d/ecb9595fae02467edba5023eb8a23c688d2b438a6a8d1a9e2b8649faf23d +PYTHON_SETUPTOOLS_SCM_SITE = https://files.pythonhosted.org/packages/4a/18/477d3d9eb2f88230ff2a41de9d8ffa3554b706352787d289f57f76bfba0b PYTHON_SETUPTOOLS_SCM_LICENSE = MIT PYTHON_SETUPTOOLS_SCM_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_SCM_SETUP_TYPE = setuptools -- 2.25.1 From james.hilliard1 at gmail.com Wed Feb 2 04:38:30 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 1 Feb 2022 21:38:30 -0700 Subject: [Buildroot] [PATCH 1/1] package/python3-setuptools: bump to version 60.6.0 Message-ID: <20220202043830.2211307-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-setuptools/59.8.0/python-setuptools.hash | 4 ---- .../{59.8.0 => 60.6.0}/0001-add-executable.patch | 0 package/python-setuptools/60.6.0/python-setuptools.hash | 4 ++++ package/python-setuptools/python-setuptools.mk | 4 ++-- package/python3-setuptools/0001-add-executable.patch | 2 +- package/python3-setuptools/python3-setuptools.hash | 2 +- package/python3-setuptools/python3-setuptools.mk | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 package/python-setuptools/59.8.0/python-setuptools.hash rename package/python-setuptools/{59.8.0 => 60.6.0}/0001-add-executable.patch (100%) create mode 100644 package/python-setuptools/60.6.0/python-setuptools.hash diff --git a/package/python-setuptools/59.8.0/python-setuptools.hash b/package/python-setuptools/59.8.0/python-setuptools.hash deleted file mode 100644 index 285919639d..0000000000 --- a/package/python-setuptools/59.8.0/python-setuptools.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From https://pypi.org/pypi/setuptools/json -md5 675f2089d970bf0bbfc3f49c80e4c7c3 setuptools-59.8.0.tar.gz -sha256 09980778aa734c3037a47997f28d6db5ab18bdf2af0e49f719bfc53967fd2e82 setuptools-59.8.0.tar.gz -sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE diff --git a/package/python-setuptools/59.8.0/0001-add-executable.patch b/package/python-setuptools/60.6.0/0001-add-executable.patch similarity index 100% rename from package/python-setuptools/59.8.0/0001-add-executable.patch rename to package/python-setuptools/60.6.0/0001-add-executable.patch diff --git a/package/python-setuptools/60.6.0/python-setuptools.hash b/package/python-setuptools/60.6.0/python-setuptools.hash new file mode 100644 index 0000000000..734cb4d580 --- /dev/null +++ b/package/python-setuptools/60.6.0/python-setuptools.hash @@ -0,0 +1,4 @@ +# From https://pypi.org/pypi/setuptools/json +md5 392e91d7e244998c586c88da2cf881d3 setuptools-60.6.0.tar.gz +sha256 eb83b1012ae6bf436901c2a2cee35d45b7260f31fd4b65fd1e50a9f99c11d7f8 setuptools-60.6.0.tar.gz +sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk index d83336b909..15912d96f5 100644 --- a/package/python-setuptools/python-setuptools.mk +++ b/package/python-setuptools/python-setuptools.mk @@ -9,9 +9,9 @@ ifeq ($(BR2_PACKAGE_PYTHON3),y) # Please keep in sync with # package/python3-setuptools/python3-setuptools.mk -PYTHON_SETUPTOOLS_VERSION = 59.8.0 +PYTHON_SETUPTOOLS_VERSION = 60.6.0 PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON3_SETUPTOOLS_VERSION).tar.gz -PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/ef/75/2bc7bef4d668f9caa9c6ed3f3187989922765403198243040d08d2a52725 +PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/8f/89/9fec81ec84737c925a1ee992af2c6c7153aec4051c26afeadd6b822354d2 else # Python PYTHON_SETUPTOOLS_VERSION = 44.0.0 PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).zip diff --git a/package/python3-setuptools/0001-add-executable.patch b/package/python3-setuptools/0001-add-executable.patch index 6fc7595a8d..9d608239bc 120000 --- a/package/python3-setuptools/0001-add-executable.patch +++ b/package/python3-setuptools/0001-add-executable.patch @@ -1 +1 @@ -../python-setuptools/59.8.0/0001-add-executable.patch \ No newline at end of file +../python-setuptools/60.6.0/0001-add-executable.patch \ No newline at end of file diff --git a/package/python3-setuptools/python3-setuptools.hash b/package/python3-setuptools/python3-setuptools.hash index 91d8bc0887..9fb96015aa 120000 --- a/package/python3-setuptools/python3-setuptools.hash +++ b/package/python3-setuptools/python3-setuptools.hash @@ -1 +1 @@ -../python-setuptools/59.8.0/python-setuptools.hash \ No newline at end of file +../python-setuptools/60.6.0/python-setuptools.hash \ No newline at end of file diff --git a/package/python3-setuptools/python3-setuptools.mk b/package/python3-setuptools/python3-setuptools.mk index f4dae2d15d..55a01dba01 100644 --- a/package/python3-setuptools/python3-setuptools.mk +++ b/package/python3-setuptools/python3-setuptools.mk @@ -6,9 +6,9 @@ # Please keep in sync with # package/python-setuptools/python-setuptools.mk -PYTHON3_SETUPTOOLS_VERSION = 59.8.0 +PYTHON3_SETUPTOOLS_VERSION = 60.6.0 PYTHON3_SETUPTOOLS_SOURCE = setuptools-$(PYTHON3_SETUPTOOLS_VERSION).tar.gz -PYTHON3_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/ef/75/2bc7bef4d668f9caa9c6ed3f3187989922765403198243040d08d2a52725 +PYTHON3_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/8f/89/9fec81ec84737c925a1ee992af2c6c7153aec4051c26afeadd6b822354d2 PYTHON3_SETUPTOOLS_LICENSE = MIT PYTHON3_SETUPTOOLS_LICENSE_FILES = LICENSE PYTHON3_SETUPTOOLS_CPE_ID_VENDOR = python -- 2.25.1 From thomas.petazzoni at bootlin.com Wed Feb 2 07:02:24 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 02 Feb 2022 07:02:24 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-02-01 Message-ID: <20220202070229.B33E540424@smtp2.osuosl.org> Hello, Autobuild statistics for 2022-02-01 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 66 | 9 | 0 | 75 | 2021.11.x | 17 | 0 | 0 | 17 | master | 114 | 42 | 0 | 156 | Classification of failures by reason for master ----------------------------------------------- rygel-0.40.2 | 6 iproute2-5.16.0 | 4 guile-3.0.7 | 3 bat-0.18.3 | 2 frr-8.1 | 2 mongodb-4.2.18 | 2 mongrel2-1.13.0 | 2 pulseview-0.4.2 | 2 tesseract-ocr-5.0.1 | 2 bluez5_utils-5.63 | 1 boinc-7.18.1 | 1 efl-1.26.1 | 1 google-breakpad-7515ab13768... | 1 host-util-linux-2.37.3 | 1 libblockdev-2.25 | 1 libuhttpd-3.14.1 | 1 nodejs-14.18.3 | 1 opencv4-4.5.5 | 1 qt5base-5.15.2 | 1 resiprocate-1.12.0 | 1 rtorrent-0.9.8 | 1 sg3_utils-1.47 | 1 suricata-6.0.4 | 1 unknown | 1 vlc-3.0.16 | 1 xml-security-c-2.0.4 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | bat-0.18.3 | NOK | http://autobuild.buildroot.net/results/4e5d09720e1041b661abbab300d136c10c5a8d7d | i586 | bat-0.18.3 | NOK | http://autobuild.buildroot.net/results/b28ea9e9bb361171c74ae2a0139d318a5127d987 | mips | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/f28fe58f4a61e472eb9d927e1ac5c3ce91bcedf9 | arm | boinc-7.18.1 | NOK | http://autobuild.buildroot.net/results/8e6e3563274622821105046328c66f3e10c76192 | arm | efl-1.26.1 | NOK | http://autobuild.buildroot.net/results/bd077e01708f1e389dc95ce3d95e75e3f89ecf1f | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/baeefc4afec26fc6fc1c0ea4e0664fd014519643 | microblazeel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/da6473439f4cbfa89b5b391fd704044e59ff970a | mipsel | google-breakpad-7515ab13768... | NOK | http://autobuild.buildroot.net/results/22ea26b16268cbc6e213a1a8e384e97bd20ab822 | powerpc64le | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/6b5721c2ac7b4bef05e2f1c0d09312c2c1a941ef | ORPH riscv32 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/a6a68c18fb895fabc86fe80b5f2826785de2c167 | ORPH powerpc64le | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/a8d2d6ae17a05355c92df1081e4326f75efb41e9 | ORPH arm | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/f397fc286a0d4b11b09dee3a850b64b1fe8f437f | ORPH riscv64 | iproute2-5.16.0 | NOK | http://autobuild.buildroot.net/results/57657fda6740cc804f4409f31089dc7c40f74a4e | x86_64 | iproute2-5.16.0 | NOK | http://autobuild.buildroot.net/results/f99bb3722ea34b5bc6e2b813df87e4de472769f6 | arm | iproute2-5.16.0 | NOK | http://autobuild.buildroot.net/results/a7f294c6904cc081be8d015ed392260f77a0c188 | riscv64 | iproute2-5.16.0 | NOK | http://autobuild.buildroot.net/results/9394abc10a7e836710ddae6562eafd72bfb8263e | aarch64 | libblockdev-2.25 | NOK | http://autobuild.buildroot.net/results/8f9ca895cb07014804130a7ccbcb758b1d519470 | ORPH m68k | libuhttpd-3.14.1 | NOK | http://autobuild.buildroot.net/results/491b279f6029aec7fa7b9d82304def42e883177b | arm | mongodb-4.2.18 | NOK | http://autobuild.buildroot.net/results/d4b0a6f91954c307b7660612497ad90db72f4b69 | arm | mongodb-4.2.18 | NOK | http://autobuild.buildroot.net/results/3461e9c2bfe6dfe2c041d4c551a51a653bd03c06 | arm | mongrel2-1.13.0 | NOK | http://autobuild.buildroot.net/results/04aa95fc8d4edcfbbbfc5bd5d5bf93a7119a9f0b | mips | mongrel2-1.13.0 | NOK | http://autobuild.buildroot.net/results/9627c426d98fdc582f35b13996b1892f098bcad2 | mipsel | nodejs-14.18.3 | NOK | http://autobuild.buildroot.net/results/8996cc747d90b5d7d15c93c09ba3ae3981f34af6 | powerpc | opencv4-4.5.5 | NOK | http://autobuild.buildroot.net/results/90787c5d8a492df662f8c7b2ee5df95184309cf6 | xtensa | pulseview-0.4.2 | NOK | http://autobuild.buildroot.net/results/18d39de9f2df7114eb992ea57efa58547d7247fe | aarch64 | pulseview-0.4.2 | NOK | http://autobuild.buildroot.net/results/47fe7f2c5dee593b19461e830b4fd76517a7c0eb | riscv64 | qt5base-5.15.2 | NOK | http://autobuild.buildroot.net/results/a4aaf0971377a20f6f4893d482fbe14ad06d8e76 | arm | resiprocate-1.12.0 | NOK | http://autobuild.buildroot.net/results/ed249c8a59a12bbfff470370867d517c6bdc2933 | ORPH i586 | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/158e32c11f8b06670973abc7b9603f2f4f77beb4 | ORPH mips64el | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/b1fa6aec6bad3d087239e29a8b864921718f5b6f | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/2261838c4bebad936329e90fc829f5b029cf1b39 | powerpc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/650e064bd0f5661f5bf85ae147930c5f8ca60451 | riscv64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/2379f2da589b44edfac9816648e2a3d7916491af | powerpc64le | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/12f0cea0a844e8774a05e31c0ce8b3bb2efd9484 | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/d40e5f87411e208669dedb64d93bd96d4273fc6b | m68k | sg3_utils-1.47 | NOK | http://autobuild.buildroot.net/results/5038411b9e8907ee88048d6010ec75c8f53c4ae9 | arm | suricata-6.0.4 | NOK | http://autobuild.buildroot.net/results/f707c5e3119379e41913f207708fc61178d437b2 | arm | tesseract-ocr-5.0.1 | NOK | http://autobuild.buildroot.net/results/83218b7d248ca294be80fa6b7c0cfb542c9b326e | arm | tesseract-ocr-5.0.1 | NOK | http://autobuild.buildroot.net/results/bfae8b8897353147370535a46c8d7b43a469da35 | arm | unknown | NOK | http://autobuild.buildroot.net/results/c8478dc96499b276236cbf7de35d8f44239d6bda | sh4 | vlc-3.0.16 | NOK | http://autobuild.buildroot.net/results/4eb47ace0d96063e94d58636e331f0a507fb6136 | arm | xml-security-c-2.0.4 | NOK | http://autobuild.buildroot.net/results/549cde069a1492dc87435a4af155e51d3c998b0d | Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 3 glib-networking-2.66.0 | 1 host-go-1.16.13 | 1 monkey-f54856ce250c4e257354... | 1 ndisc6-1.0.4 | 1 openldap-2.4.59 | 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/3e2b499e602b0ad5e7d3ff0f8fb33b857863d562 | ORPH mips64el | host-go-1.16.13 | NOK | http://autobuild.buildroot.net/results/8a5ab390afef75ee7c7c88f03161174928948adf | m68k | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/8fb5e47e890ae0a2b83a51662a50af73323ccb7f | x86_64 | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/52b828d3aa3ee5aa747f76a476457c81ce0ab526 | arm | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/7308662ee2faf740de09342279ef66efec2f0960 | microblazeel | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/0f78f13a13c8b77b6abc0735abb2a83557c8ef86 | arm | ndisc6-1.0.4 | NOK | http://autobuild.buildroot.net/results/ab457340d8cc12cced36300b770ce3c33d34d944 | ORPH riscv32 | openldap-2.4.59 | NOK | http://autobuild.buildroot.net/results/980c56bdc7678f10ea1ae1c0acf88fa9ed573e1d | nios2 | unknown | NOK | http://autobuild.buildroot.net/results/1b41a2394519e63f1fc6629a7771611426864247 | -- http://autobuild.buildroot.net From asafka7 at gmail.com Wed Feb 2 07:33:38 2022 From: asafka7 at gmail.com (Asaf Kahlon) Date: Wed, 2 Feb 2022 09:33:38 +0200 Subject: [Buildroot] [PATCH 1/1] package/{libuv, uvw}: bump to versions 1.43.0, 2.11.0_libuv_v1.43 Message-ID: <20220202073338.106855-1-asafka7@gmail.com> Signed-off-by: Asaf Kahlon --- package/libuv/libuv.hash | 2 +- package/libuv/libuv.mk | 2 +- package/uvw/uvw.hash | 2 +- package/uvw/uvw.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libuv/libuv.hash b/package/libuv/libuv.hash index 172ef1f168..1874aa344c 100644 --- a/package/libuv/libuv.hash +++ b/package/libuv/libuv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 371e5419708f6aaeb8656671f89400b92a9bba6443369af1bb70bcd6e4b3c764 libuv-1.42.0.tar.gz +sha256 9e27825a55279de69a7c43e42d509fd1337c9bece2547c761e91a1592e91cc4d libuv-1.43.0.tar.gz sha256 6d20216ae022fbeed23916f48508fd807ece3d8464992330643b0e64e5c0c24b LICENSE diff --git a/package/libuv/libuv.mk b/package/libuv/libuv.mk index 9fe775951d..ed51fc92f9 100644 --- a/package/libuv/libuv.mk +++ b/package/libuv/libuv.mk @@ -6,7 +6,7 @@ # When bumping libuv, check if a new version of uvw is available # and bump it too. -LIBUV_VERSION = 1.42.0 +LIBUV_VERSION = 1.43.0 LIBUV_SITE = $(call github,libuv,libuv,v$(LIBUV_VERSION)) LIBUV_DEPENDENCIES = host-pkgconf LIBUV_INSTALL_STAGING = YES diff --git a/package/uvw/uvw.hash b/package/uvw/uvw.hash index 5f7521c8b3..564c0980f3 100644 --- a/package/uvw/uvw.hash +++ b/package/uvw/uvw.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 30b0ba97a94d5e652490c6b1b32c95e608263f21cf3bc606308d09b3e3a114bf uvw-2.10.0_libuv_v1.42.tar.gz +sha256 3af4efa2842299490ec764f2148f85f4426dfb4f8d8aa436cc2d049db2b7b514 uvw-2.11.0_libuv_v1.43.tar.gz sha256 5de32af2469480cf3261c9781962e0887366666ba8ee1f4a32c386c77fc50c88 LICENSE diff --git a/package/uvw/uvw.mk b/package/uvw/uvw.mk index 9c15d536cb..161c40849d 100644 --- a/package/uvw/uvw.mk +++ b/package/uvw/uvw.mk @@ -4,7 +4,7 @@ # ################################################################################ -UVW_VERSION = 2.10.0_libuv_v1.42 +UVW_VERSION = 2.11.0_libuv_v1.43 UVW_SITE = $(call github,skypjack,uvw,v$(UVW_VERSION)) UVW_INSTALL_STAGING = YES UVW_INSTALL_TARGET = NO -- 2.32.0 From arnout at mind.be Wed Feb 2 07:41:34 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 2 Feb 2022 08:41:34 +0100 Subject: [Buildroot] [URGENT 1/1] package/util-linux: fix host build failure In-Reply-To: <20220201232203.333403-2-giulio.benetti@benettiengineering.com> References: <20220201232203.333403-1-giulio.benetti@benettiengineering.com> <20220201232203.333403-2-giulio.benetti@benettiengineering.com> Message-ID: On 02/02/2022 00:22, Giulio Benetti wrote: > The UTIL_LINUX_FIX_DISK_UTILS_COMPILE workaround is needed for host > building too. So let's add it to HOST_UTIL_LINUX_POST_PATCH_HOOKS. > host-util-linux is used a lot, so this patch fixes a lot of future > builds. Darn, I tested that, both with and without BR2_PACKAGE_HOST_UTIL_LINUX set. I don't understand what went wrong in my test... Anyway, applied to master, thanks. Regards, Arnout > > Signed-off-by: Giulio Benetti > --- > package/util-linux/util-linux.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk > index e59ef7dadc..5a4ff64d01 100644 > --- a/package/util-linux/util-linux.mk > +++ b/package/util-linux/util-linux.mk > @@ -41,6 +41,7 @@ define UTIL_LINUX_FIX_DISK_UTILS_COMPILE > touch $(@D)/disk-utils/raw.8 > endef > UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE > +HOST_UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE > > HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf > From fontaine.fabrice at gmail.com Wed Feb 2 07:52:28 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 2 Feb 2022 08:52:28 +0100 Subject: [Buildroot] [PATCH 1/1] package/domoticz: bump to version 2022.01 Message-ID: <20220202075228.1187021-1-fontaine.fabrice@gmail.com> https://github.com/domoticz/domoticz/blob/2022.1/History.txt Signed-off-by: Fabrice Fontaine --- package/domoticz/domoticz.hash | 2 +- package/domoticz/domoticz.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/domoticz/domoticz.hash b/package/domoticz/domoticz.hash index dcd5bead1e..18bf57b7e0 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 b7faf959c4f1dbfec3b0c17ab495f29b3d1437bc2251579c5252be82247e7ff9 domoticz-2022.1-br1.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 License.txt diff --git a/package/domoticz/domoticz.mk b/package/domoticz/domoticz.mk index f142791830..5edc10e8d8 100644 --- a/package/domoticz/domoticz.mk +++ b/package/domoticz/domoticz.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOMOTICZ_VERSION = 2021.1 +DOMOTICZ_VERSION = 2022.1 DOMOTICZ_SITE = https://github.com/domoticz/domoticz DOMOTICZ_SITE_METHOD = git DOMOTICZ_GIT_SUBMODULES = YES -- 2.34.1 From fontaine.fabrice at gmail.com Wed Feb 2 07:56:51 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 2 Feb 2022 08:56:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/jasper: disable programs Message-ID: <20220202075651.1205886-1-fontaine.fabrice@gmail.com> Disable demo programs through JAS_ENABLE_PROGRAMS option which is available and enabled by default since version 2.0.14 and https://github.com/jasper-software/jasper/commit/e02518ce7161cd37ded64af78ac520e0424a9b12 As a side-effect, this will avoid the following build failure raised since bump to version 2.0.33 in commit f791221c8616bfa6d338ce6c287353395cc2c61a: [ 96%] Linking C executable imginfo /home/buildroot/autobuild/instance-3/output-1/per-package/jasper/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-uclibc/10.3.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: attempted static link of dynamic object `/home/buildroot/autobuild/instance-3/output-1/per-package/jasper/host/x86_64-buildroot-linux-uclibc/sysroot/lib/libc.so.1' Fixes: - http://autobuild.buildroot.org/results/b106fdf32ffa9e0ef1254e0a29fdcdc821020e08 Signed-off-by: Fabrice Fontaine --- package/jasper/jasper.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/jasper/jasper.mk b/package/jasper/jasper.mk index 05168db763..6b6bbcd6e6 100644 --- a/package/jasper/jasper.mk +++ b/package/jasper/jasper.mk @@ -11,7 +11,9 @@ JASPER_LICENSE = JasPer-2.0 JASPER_LICENSE_FILES = LICENSE JASPER_CPE_ID_VENDOR = jasper_project JASPER_SUPPORTS_IN_SOURCE_BUILD = NO -JASPER_CONF_OPTS = -DJAS_ENABLE_DOC=OFF +JASPER_CONF_OPTS = \ + -DJAS_ENABLE_DOC=OFF \ + -DJAS_ENABLE_PROGRAMS=OFF ifeq ($(BR2_STATIC_LIBS),y) JASPER_CONF_OPTS += -DJAS_ENABLE_SHARED=OFF -- 2.34.1 From peter at korsgaard.com Wed Feb 2 10:10:11 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 02 Feb 2022 11:10:11 +0100 Subject: [Buildroot] [PATCH 1/1] package/expat: security bump to version 2.4.4 In-Reply-To: <20220131225230.178602-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 31 Jan 2022 23:52:30 +0100") References: <20220131225230.178602-1-fontaine.fabrice@gmail.com> Message-ID: <87k0ed1svw.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > 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 Sorry, I applied the other patch for the same before noticing this (even though your commit message is a lot nicer). -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 2 10:17:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 02 Feb 2022 11:17:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-aioconsole: bump to version 0.4.0 In-Reply-To: <20220202030656.2175796-1-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 1 Feb 2022 20:06:56 -0700") References: <20220202030656.2175796-1-james.hilliard1@gmail.com> Message-ID: <87fsp11skg.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 2 10:17:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 02 Feb 2022 11:17:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-autobahn: bump to version 22.1.1 In-Reply-To: <20220202031130.2178288-1-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 1 Feb 2022 20:11:30 -0700") References: <20220202031130.2178288-1-james.hilliard1@gmail.com> Message-ID: <87bkzp1sk3.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 2 10:17:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 02 Feb 2022 11:17:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-cbor2: bump to version 5.4.2.post1 In-Reply-To: <20220202031709.2181778-1-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 1 Feb 2022 20:17:09 -0700") References: <20220202031709.2181778-1-james.hilliard1@gmail.com> Message-ID: <877dad1sjo.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 2 10:17:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 02 Feb 2022 11:17:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-charset-normalizer: bump to version 2.0.11 In-Reply-To: <20220202032025.2182903-1-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 1 Feb 2022 20:20:25 -0700") References: <20220202032025.2182903-1-james.hilliard1@gmail.com> Message-ID: <8735l11sjd.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 2 10:18:25 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 02 Feb 2022 11:18:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-cssutils: bump to version 2.3.0 In-Reply-To: <20220202033144.2187501-1-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 1 Feb 2022 20:31:44 -0700") References: <20220202033144.2187501-1-james.hilliard1@gmail.com> Message-ID: <87y22tzi4u.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Drop python2 support. > Add new host-python-setuptools-scm dependency. > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 2 10:18:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 02 Feb 2022 11:18:55 +0100 Subject: [Buildroot] [PATCH 1/1] package/python{3}-cython: bump to version 0.29.27 In-Reply-To: <20220202034036.2188757-1-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 1 Feb 2022 20:40:36 -0700") References: <20220202034036.2188757-1-james.hilliard1@gmail.com> Message-ID: <87r18lzi40.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 2 10:19:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 02 Feb 2022 11:19:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-fonttools: bump to version 4.29.1 In-Reply-To: <20220202034755.2191344-1-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 1 Feb 2022 20:47:55 -0700") References: <20220202034755.2191344-1-james.hilliard1@gmail.com> Message-ID: <87mtj9zi3o.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 2 10:19:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 02 Feb 2022 11:19:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-janus: bump to version 1.0.0 In-Reply-To: <20220202035847.2194218-1-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 1 Feb 2022 20:58:47 -0700") References: <20220202035847.2194218-1-james.hilliard1@gmail.com> Message-ID: <87iltxzi2l.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Add new python-typing-extensions runtime dependency. > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 2 10:20:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 02 Feb 2022 11:20:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pyparsing: bump to version 3.0.7 In-Reply-To: <20220202041115.2198598-1-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 1 Feb 2022 21:11:15 -0700") References: <20220202041115.2198598-1-james.hilliard1@gmail.com> Message-ID: <87ee4lzi22.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 2 10:20:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 02 Feb 2022 11:20:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-setuptools-scm: bump to version 6.4.2 In-Reply-To: <20220202042024.2202751-1-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 1 Feb 2022 21:20:24 -0700") References: <20220202042024.2202751-1-james.hilliard1@gmail.com> Message-ID: <87a6f9zi1q.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 2 10:21:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 02 Feb 2022 11:21:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/python3-setuptools: bump to version 60.6.0 In-Reply-To: <20220202043830.2211307-1-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 1 Feb 2022 21:38:30 -0700") References: <20220202043830.2211307-1-james.hilliard1@gmail.com> Message-ID: <875ypxzi0b.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 2 10:21:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 02 Feb 2022 11:21:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/jasper: disable programs In-Reply-To: <20220202075651.1205886-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 2 Feb 2022 08:56:51 +0100") References: <20220202075651.1205886-1-fontaine.fabrice@gmail.com> Message-ID: <871r0lzhzo.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Disable demo programs through JAS_ENABLE_PROGRAMS option which is > available and enabled by default since version 2.0.14 and > https://github.com/jasper-software/jasper/commit/e02518ce7161cd37ded64af78ac520e0424a9b12 > As a side-effect, this will avoid the following build failure raised > since bump to version 2.0.33 in commit > f791221c8616bfa6d338ce6c287353395cc2c61a: > [ 96%] Linking C executable imginfo > /home/buildroot/autobuild/instance-3/output-1/per-package/jasper/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-uclibc/10.3.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: > attempted static link of dynamic object > `/home/buildroot/autobuild/instance-3/output-1/per-package/jasper/host/x86_64-buildroot-linux-uclibc/sysroot/lib/libc.so.1' > Fixes: > - http://autobuild.buildroot.org/results/b106fdf32ffa9e0ef1254e0a29fdcdc821020e08 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 2 10:17:29 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 2 Feb 2022 11:17:29 +0100 Subject: [Buildroot] [git commit] package/python-cbor2: bump to version 5.4.2.post1 Message-ID: <20220202101446.87C8D829FC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=731787ae42b4e6fa5a683b0c3239b90f8f0c578a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- 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 9910e632a2..8858fc72d3 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 b3a6085ee1a9e11ddec305f7a7bc5956 cbor2-5.4.2.tar.gz -sha256 e283e70b55a049ff364cc5e648fde587e4d9b0e87e4b2664c69e639135e6b3b8 cbor2-5.4.2.tar.gz +md5 a9518fd435d9eafd91063b3bf10d5c5b cbor2-5.4.2.post1.tar.gz +sha256 9cf21d59604b9529d7877c8e0342a2ebaae1a07fe8ff5683dc75fec15847c797 cbor2-5.4.2.post1.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 4cc09a219f..dd007217d1 100644 --- a/package/python-cbor2/python-cbor2.mk +++ b/package/python-cbor2/python-cbor2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CBOR2_VERSION = 5.4.2 +PYTHON_CBOR2_VERSION = 5.4.2.post1 PYTHON_CBOR2_SOURCE = cbor2-$(PYTHON_CBOR2_VERSION).tar.gz -PYTHON_CBOR2_SITE = https://files.pythonhosted.org/packages/d4/ca/b96be94f694155ce58823c38cf8fd1aa620bdc91e2c801713cdb4167b6aa +PYTHON_CBOR2_SITE = https://files.pythonhosted.org/packages/49/74/2b9f9b76e2831f54d70e177a4e602e72cb86441632d1bcc15be1f04a73f6 PYTHON_CBOR2_SETUP_TYPE = setuptools PYTHON_CBOR2_LICENSE = MIT PYTHON_CBOR2_LICENSE_FILES = LICENSE.txt From peter at korsgaard.com Wed Feb 2 10:17:12 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 2 Feb 2022 11:17:12 +0100 Subject: [Buildroot] [git commit] package/python-autobahn: bump to version 22.1.1 Message-ID: <20220202101446.7EF94829F9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=96eb628bb4f4e14086c90254178db1979f33bad5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-autobahn/python-autobahn.hash | 4 ++-- package/python-autobahn/python-autobahn.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-autobahn/python-autobahn.hash b/package/python-autobahn/python-autobahn.hash index 0bbb9112d0..7b963df635 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 1ccd46d938d8b9fed435e9781e54e887 autobahn-21.11.1.tar.gz -sha256 bd6f46315419ca0a5be4109f737410208ad5f19718f67ca6a4a674cc66ca9b18 autobahn-21.11.1.tar.gz +md5 9b0ae4ff164232c952ba01ab3516188e autobahn-22.1.1.tar.gz +sha256 17e1b58b6ae1a63ca7d926b1d71bb9e4fd6b9ac9a1a2277d8ee40e0b61f54746 autobahn-22.1.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 db9e5083d1..df43e9cdf2 100644 --- a/package/python-autobahn/python-autobahn.mk +++ b/package/python-autobahn/python-autobahn.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AUTOBAHN_VERSION = 21.11.1 +PYTHON_AUTOBAHN_VERSION = 22.1.1 PYTHON_AUTOBAHN_SOURCE = autobahn-$(PYTHON_AUTOBAHN_VERSION).tar.gz -PYTHON_AUTOBAHN_SITE = https://files.pythonhosted.org/packages/f1/d3/23fdf1ab0104b1b65d2f7884e923f0526750a59f96334d752afc79cf44ed +PYTHON_AUTOBAHN_SITE = https://files.pythonhosted.org/packages/0e/2a/0b627ad4adf70437b5753462958b3ba5c6802d7664eb4a680e46423659ba PYTHON_AUTOBAHN_LICENSE = MIT PYTHON_AUTOBAHN_LICENSE_FILES = LICENSE PYTHON_AUTOBAHN_CPE_ID_VENDOR = crossbar From peter at korsgaard.com Wed Feb 2 10:20:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 2 Feb 2022 11:20:01 +0100 Subject: [Buildroot] [git commit] package/python-pyparsing: bump to version 3.0.7 Message-ID: <20220202101446.BCAED829F9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=02358c962c43b90f272aedd77a43033643056557 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- 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 a21baf46e5..1e56e878a1 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 2f5fad6c8e99ac2562ab08ad9e45b195 pyparsing-3.0.6.tar.gz -sha256 d9bdec0013ef1eb5a84ab39a3b3868911598afa494f5faa038647101504e2b81 pyparsing-3.0.6.tar.gz +md5 9d38774991175444e21a3dfa865876cc pyparsing-3.0.7.tar.gz +sha256 18ee9022775d270c55187733956460083db60b37d0d0fb357445f3094eed3eea pyparsing-3.0.7.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 b6ab353a6d..e33541bdb7 100644 --- a/package/python-pyparsing/python-pyparsing.mk +++ b/package/python-pyparsing/python-pyparsing.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYPARSING_VERSION = 3.0.6 +PYTHON_PYPARSING_VERSION = 3.0.7 PYTHON_PYPARSING_SOURCE = pyparsing-$(PYTHON_PYPARSING_VERSION).tar.gz -PYTHON_PYPARSING_SITE = https://files.pythonhosted.org/packages/ab/61/1a1613e3dcca483a7aa9d446cb4614e6425eb853b90db131c305bd9674cb +PYTHON_PYPARSING_SITE = https://files.pythonhosted.org/packages/d6/60/9bed18f43275b34198eb9720d4c1238c68b3755620d20df0afd89424d32b PYTHON_PYPARSING_LICENSE = MIT PYTHON_PYPARSING_LICENSE_FILES = LICENSE PYTHON_PYPARSING_SETUP_TYPE = setuptools From peter at korsgaard.com Wed Feb 2 10:17:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 2 Feb 2022 11:17:40 +0100 Subject: [Buildroot] [git commit] package/python-charset-normalizer: bump to version 2.0.11 Message-ID: <20220202101446.90A52822ED@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ea80e29647dafea9aa2312838a13527be28d3fc1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- 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 eb3b67598b..3c6e58a616 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 eaed8aaf95d7e3bc2daefcd8d0f03458 charset-normalizer-2.0.10.tar.gz -sha256 876d180e9d7432c5d1dfd4c5d26b72f099d503e8fcc0feb7532c9289be60fcbd charset-normalizer-2.0.10.tar.gz +md5 2abe3754fef25c99799a518cb83a81ae charset-normalizer-2.0.11.tar.gz +sha256 98398a9d69ee80548c762ba991a4728bfc3836768ed226b3945908d1a688371c charset-normalizer-2.0.11.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 33f2e132de..0a96a6b078 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.10 +PYTHON_CHARSET_NORMALIZER_VERSION = 2.0.11 PYTHON_CHARSET_NORMALIZER_SOURCE = charset-normalizer-$(PYTHON_CHARSET_NORMALIZER_VERSION).tar.gz -PYTHON_CHARSET_NORMALIZER_SITE = https://files.pythonhosted.org/packages/48/44/76b179e0d1afe6e6a91fd5661c284f60238987f3b42b676d141d01cd5b97 +PYTHON_CHARSET_NORMALIZER_SITE = https://files.pythonhosted.org/packages/e8/e8/b6cfd28fb430b2ec9923ad0147025bf8bbdf304b1eb3039b69f1ce44ed6e PYTHON_CHARSET_NORMALIZER_SETUP_TYPE = setuptools PYTHON_CHARSET_NORMALIZER_LICENSE = MIT PYTHON_CHARSET_NORMALIZER_LICENSE_FILES = LICENSE From peter at korsgaard.com Wed Feb 2 10:20:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 2 Feb 2022 11:20:27 +0100 Subject: [Buildroot] [git commit] package/python3-setuptools: bump to version 60.6.0 Message-ID: <20220202101446.CF473829F9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=43c8afef8ddd5ce590076c0932c78c4953279c68 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-setuptools/59.8.0/python-setuptools.hash | 4 ---- .../python-setuptools/{59.8.0 => 60.6.0}/0001-add-executable.patch | 0 package/python-setuptools/60.6.0/python-setuptools.hash | 4 ++++ package/python-setuptools/python-setuptools.mk | 4 ++-- package/python3-setuptools/0001-add-executable.patch | 2 +- package/python3-setuptools/python3-setuptools.hash | 2 +- package/python3-setuptools/python3-setuptools.mk | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package/python-setuptools/59.8.0/python-setuptools.hash b/package/python-setuptools/59.8.0/python-setuptools.hash deleted file mode 100644 index 285919639d..0000000000 --- a/package/python-setuptools/59.8.0/python-setuptools.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From https://pypi.org/pypi/setuptools/json -md5 675f2089d970bf0bbfc3f49c80e4c7c3 setuptools-59.8.0.tar.gz -sha256 09980778aa734c3037a47997f28d6db5ab18bdf2af0e49f719bfc53967fd2e82 setuptools-59.8.0.tar.gz -sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE diff --git a/package/python-setuptools/59.8.0/0001-add-executable.patch b/package/python-setuptools/60.6.0/0001-add-executable.patch similarity index 100% rename from package/python-setuptools/59.8.0/0001-add-executable.patch rename to package/python-setuptools/60.6.0/0001-add-executable.patch diff --git a/package/python-setuptools/60.6.0/python-setuptools.hash b/package/python-setuptools/60.6.0/python-setuptools.hash new file mode 100644 index 0000000000..734cb4d580 --- /dev/null +++ b/package/python-setuptools/60.6.0/python-setuptools.hash @@ -0,0 +1,4 @@ +# From https://pypi.org/pypi/setuptools/json +md5 392e91d7e244998c586c88da2cf881d3 setuptools-60.6.0.tar.gz +sha256 eb83b1012ae6bf436901c2a2cee35d45b7260f31fd4b65fd1e50a9f99c11d7f8 setuptools-60.6.0.tar.gz +sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk index d83336b909..15912d96f5 100644 --- a/package/python-setuptools/python-setuptools.mk +++ b/package/python-setuptools/python-setuptools.mk @@ -9,9 +9,9 @@ ifeq ($(BR2_PACKAGE_PYTHON3),y) # Please keep in sync with # package/python3-setuptools/python3-setuptools.mk -PYTHON_SETUPTOOLS_VERSION = 59.8.0 +PYTHON_SETUPTOOLS_VERSION = 60.6.0 PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON3_SETUPTOOLS_VERSION).tar.gz -PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/ef/75/2bc7bef4d668f9caa9c6ed3f3187989922765403198243040d08d2a52725 +PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/8f/89/9fec81ec84737c925a1ee992af2c6c7153aec4051c26afeadd6b822354d2 else # Python PYTHON_SETUPTOOLS_VERSION = 44.0.0 PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).zip diff --git a/package/python3-setuptools/0001-add-executable.patch b/package/python3-setuptools/0001-add-executable.patch index 6fc7595a8d..9d608239bc 120000 --- a/package/python3-setuptools/0001-add-executable.patch +++ b/package/python3-setuptools/0001-add-executable.patch @@ -1 +1 @@ -../python-setuptools/59.8.0/0001-add-executable.patch \ No newline at end of file +../python-setuptools/60.6.0/0001-add-executable.patch \ No newline at end of file diff --git a/package/python3-setuptools/python3-setuptools.hash b/package/python3-setuptools/python3-setuptools.hash index 91d8bc0887..9fb96015aa 120000 --- a/package/python3-setuptools/python3-setuptools.hash +++ b/package/python3-setuptools/python3-setuptools.hash @@ -1 +1 @@ -../python-setuptools/59.8.0/python-setuptools.hash \ No newline at end of file +../python-setuptools/60.6.0/python-setuptools.hash \ No newline at end of file diff --git a/package/python3-setuptools/python3-setuptools.mk b/package/python3-setuptools/python3-setuptools.mk index f4dae2d15d..55a01dba01 100644 --- a/package/python3-setuptools/python3-setuptools.mk +++ b/package/python3-setuptools/python3-setuptools.mk @@ -6,9 +6,9 @@ # Please keep in sync with # package/python-setuptools/python-setuptools.mk -PYTHON3_SETUPTOOLS_VERSION = 59.8.0 +PYTHON3_SETUPTOOLS_VERSION = 60.6.0 PYTHON3_SETUPTOOLS_SOURCE = setuptools-$(PYTHON3_SETUPTOOLS_VERSION).tar.gz -PYTHON3_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/ef/75/2bc7bef4d668f9caa9c6ed3f3187989922765403198243040d08d2a52725 +PYTHON3_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/8f/89/9fec81ec84737c925a1ee992af2c6c7153aec4051c26afeadd6b822354d2 PYTHON3_SETUPTOOLS_LICENSE = MIT PYTHON3_SETUPTOOLS_LICENSE_FILES = LICENSE PYTHON3_SETUPTOOLS_CPE_ID_VENDOR = python From peter at korsgaard.com Wed Feb 2 10:19:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 2 Feb 2022 11:19:04 +0100 Subject: [Buildroot] [git commit] package/python-fonttools: bump to version 4.29.1 Message-ID: <20220202101446.AC32A822ED@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ecee383549b66787cb857f02a89717e004b951bb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- 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 1f9b546c23..df0bdf980d 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 4a894b3cd108432f7636849b4026b771 fonttools-4.28.5.zip -sha256 545c05d0f7903a863c2020e07b8f0a57517f2c40d940bded77076397872d14ca fonttools-4.28.5.zip +md5 7fc490291991da874911fed1e743362d fonttools-4.29.1.zip +sha256 2b18a172120e32128a80efee04cff487d5d140fe7d817deb648b2eee023a40e4 fonttools-4.29.1.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 c5c605161b..d5c4cdf8e5 100644 --- a/package/python-fonttools/python-fonttools.mk +++ b/package/python-fonttools/python-fonttools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FONTTOOLS_VERSION = 4.28.5 +PYTHON_FONTTOOLS_VERSION = 4.29.1 PYTHON_FONTTOOLS_SOURCE = fonttools-$(PYTHON_FONTTOOLS_VERSION).zip -PYTHON_FONTTOOLS_SITE = https://files.pythonhosted.org/packages/ce/1b/d4cd86f4e6cbd54a3c4f807015b116299bcd6d6587ea0645d88ba9d932bb +PYTHON_FONTTOOLS_SITE = https://files.pythonhosted.org/packages/2d/4c/49ba863863502bb9fea19d8bd04a527da336b4a2698c8a0c7129e9cc2716 PYTHON_FONTTOOLS_SETUP_TYPE = setuptools PYTHON_FONTTOOLS_LICENSE = MIT PYTHON_FONTTOOLS_LICENSE_FILES = LICENSE From peter at korsgaard.com Wed Feb 2 10:17:57 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 2 Feb 2022 11:17:57 +0100 Subject: [Buildroot] [git commit] package/python-cssutils: bump to version 2.3.0 Message-ID: <20220202101446.9AFDE829F9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=414fa848445eaede01264ad9d8374585b18a95c0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop python2 support. Add new host-python-setuptools-scm dependency. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-cssutils/Config.in | 4 ++-- package/python-cssutils/python-cssutils.hash | 6 +++--- package/python-cssutils/python-cssutils.mk | 5 +++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/package/python-cssutils/Config.in b/package/python-cssutils/Config.in index 74de742c31..141561901c 100644 --- a/package/python-cssutils/Config.in +++ b/package/python-cssutils/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_PYTHON_CSSUTILS bool "python-cssutils" - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime help A CSS Cascading Style Sheets library for Python. diff --git a/package/python-cssutils/python-cssutils.hash b/package/python-cssutils/python-cssutils.hash index 393daffb8b..e22dde6e56 100644 --- a/package/python-cssutils/python-cssutils.hash +++ b/package/python-cssutils/python-cssutils.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/cssutils/json -md5 dc66d96c2d78f1687f59ac412fe9d318 cssutils-1.0.2.tar.gz -sha256 a2fcf06467553038e98fea9cfe36af2bf14063eb147a70958cfcaa8f5786acaf cssutils-1.0.2.tar.gz +md5 71955999f595e4b0eb5a218d614652ca cssutils-2.3.0.tar.gz +sha256 b2d3b16047caae82e5c590036935bafa1b621cf45c2f38885af4be4838f0fd00 cssutils-2.3.0.tar.gz # Locally computed sha256 checksums -sha256 03c570a068086ee577dcd795519ea93462b2ed2fcb6dcc4dfce56a71a2fd6e5a COPYING.LESSER +sha256 03c570a068086ee577dcd795519ea93462b2ed2fcb6dcc4dfce56a71a2fd6e5a COPYING.LESSER diff --git a/package/python-cssutils/python-cssutils.mk b/package/python-cssutils/python-cssutils.mk index 513c3a87de..09c2ca44d6 100644 --- a/package/python-cssutils/python-cssutils.mk +++ b/package/python-cssutils/python-cssutils.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_CSSUTILS_VERSION = 1.0.2 +PYTHON_CSSUTILS_VERSION = 2.3.0 PYTHON_CSSUTILS_SOURCE = cssutils-$(PYTHON_CSSUTILS_VERSION).tar.gz -PYTHON_CSSUTILS_SITE = https://files.pythonhosted.org/packages/5c/0b/c5f29d29c037e97043770b5e7c740b6252993e4b57f029b3cd03c78ddfec +PYTHON_CSSUTILS_SITE = https://files.pythonhosted.org/packages/f5/c6/878abb7df855938a067b762a688da3fcdfea4e41c2399feaf80369b61ed7 PYTHON_CSSUTILS_LICENSE = LGPL-3.0+ PYTHON_CSSUTILS_LICENSE_FILES = COPYING.LESSER PYTHON_CSSUTILS_SETUP_TYPE = setuptools +PYTHON_CSSUTILS_DEPENDENCIES = host-python-setuptools-scm $(eval $(python-package)) From peter at korsgaard.com Wed Feb 2 10:21:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 2 Feb 2022 11:21:22 +0100 Subject: [Buildroot] [git commit] package/jasper: disable programs Message-ID: <20220202101446.DA398829FC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3558a98df611ec7c9b4735326e97e17bfde2b9b9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Disable demo programs through JAS_ENABLE_PROGRAMS option which is available and enabled by default since version 2.0.14 and https://github.com/jasper-software/jasper/commit/e02518ce7161cd37ded64af78ac520e0424a9b12 As a side-effect, this will avoid the following build failure raised since bump to version 2.0.33 in commit f791221c8616bfa6d338ce6c287353395cc2c61a: [ 96%] Linking C executable imginfo /home/buildroot/autobuild/instance-3/output-1/per-package/jasper/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-uclibc/10.3.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: attempted static link of dynamic object `/home/buildroot/autobuild/instance-3/output-1/per-package/jasper/host/x86_64-buildroot-linux-uclibc/sysroot/lib/libc.so.1' Fixes: - http://autobuild.buildroot.org/results/b106fdf32ffa9e0ef1254e0a29fdcdc821020e08 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/jasper/jasper.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/jasper/jasper.mk b/package/jasper/jasper.mk index 05168db763..6b6bbcd6e6 100644 --- a/package/jasper/jasper.mk +++ b/package/jasper/jasper.mk @@ -11,7 +11,9 @@ JASPER_LICENSE = JasPer-2.0 JASPER_LICENSE_FILES = LICENSE JASPER_CPE_ID_VENDOR = jasper_project JASPER_SUPPORTS_IN_SOURCE_BUILD = NO -JASPER_CONF_OPTS = -DJAS_ENABLE_DOC=OFF +JASPER_CONF_OPTS = \ + -DJAS_ENABLE_DOC=OFF \ + -DJAS_ENABLE_PROGRAMS=OFF ifeq ($(BR2_STATIC_LIBS),y) JASPER_CONF_OPTS += -DJAS_ENABLE_SHARED=OFF From peter at korsgaard.com Wed Feb 2 10:19:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 2 Feb 2022 11:19:42 +0100 Subject: [Buildroot] [git commit] package/python-janus: bump to version 1.0.0 Message-ID: <20220202101446.B4872829F9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b32b8785df57b3efda67f3b0390574fd65698693 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add new python-typing-extensions runtime dependency. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-janus/Config.in | 1 + package/python-janus/python-janus.hash | 4 ++-- package/python-janus/python-janus.mk | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/python-janus/Config.in b/package/python-janus/Config.in index a1ba0463f9..38e4b7217f 100644 --- a/package/python-janus/Config.in +++ b/package/python-janus/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_JANUS bool "python-janus" depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime help Mixed sync-async queue to interoperate between asyncio tasks and classic threads. diff --git a/package/python-janus/python-janus.hash b/package/python-janus/python-janus.hash index 7d914389d2..7f7ce35caa 100644 --- a/package/python-janus/python-janus.hash +++ b/package/python-janus/python-janus.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/janus/json -md5 dad6a03e7664cb800ce45ef8bcf12439 janus-0.6.1.tar.gz -sha256 4712e0ef75711fe5947c2db855bc96221a9a03641b52e5ae8e25c2b705dd1d0c janus-0.6.1.tar.gz +md5 2d8c0b884c14f18fc5223858eb16461e janus-1.0.0.tar.gz +sha256 df976f2cdcfb034b147a2d51edfc34ff6bfb12d4e2643d3ad0e10de058cb1612 janus-1.0.0.tar.gz # Locally computed sha256 checksums sha256 8b177cccb6ddec12a9fc97bd49e7e2bbcd92464625624bd8bdbfad799ae606e9 LICENSE diff --git a/package/python-janus/python-janus.mk b/package/python-janus/python-janus.mk index 2b08733c18..43df87870d 100644 --- a/package/python-janus/python-janus.mk +++ b/package/python-janus/python-janus.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_JANUS_VERSION = 0.6.1 +PYTHON_JANUS_VERSION = 1.0.0 PYTHON_JANUS_SOURCE = janus-$(PYTHON_JANUS_VERSION).tar.gz -PYTHON_JANUS_SITE = https://files.pythonhosted.org/packages/7c/1b/8769c2dca84dd8ca92e48b14750c7106ff4313df4fee651dbc3cd9e345a9 +PYTHON_JANUS_SITE = https://files.pythonhosted.org/packages/b8/a8/facab7275d7d3d2032f375843fe46fad1cfa604a108b5a238638d4615bdc PYTHON_JANUS_SETUP_TYPE = setuptools PYTHON_JANUS_LICENSE = Apache-2.0 PYTHON_JANUS_LICENSE_FILES = LICENSE From peter at korsgaard.com Wed Feb 2 10:18:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 2 Feb 2022 11:18:45 +0100 Subject: [Buildroot] [git commit] package/python{3}-cython: bump to version 0.29.27 Message-ID: <20220202101446.A3F02822ED@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3fae4cddea023b008b59f99986f8aaef9d1cb562 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- 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 b07f171c25..9c5f1225cf 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 971c9708dd5269180868fc0af986084c Cython-0.29.26.tar.gz -sha256 af377d543a762867da11fcf6e558f7a4a535ff8693f30cce123fab10c00fa312 Cython-0.29.26.tar.gz +md5 2b2ba86abcf823985935d37f5e43b19a Cython-0.29.27.tar.gz +sha256 c6a442504db906dfc13a480e96850cced994ecdc076bcf492c43515b78f70da2 Cython-0.29.27.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 cf41086dea..89708cb9a8 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.26 +PYTHON_CYTHON_VERSION = 0.29.27 PYTHON_CYTHON_SOURCE = Cython-$(PYTHON_CYTHON_VERSION).tar.gz -PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/bc/fa/8604d92ef753e0036d807f1b3179813ab2fa283e3b19c926e11673c8205b +PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/eb/46/80dd9e5ad67ebc766ff3229901bde4a7bc82907efe93cd7007c4df458dd5 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 da159cedc8..56d88b5bf7 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.26 +PYTHON3_CYTHON_VERSION = 0.29.27 PYTHON3_CYTHON_SOURCE = Cython-$(PYTHON3_CYTHON_VERSION).tar.gz -PYTHON3_CYTHON_SITE = https://files.pythonhosted.org/packages/bc/fa/8604d92ef753e0036d807f1b3179813ab2fa283e3b19c926e11673c8205b +PYTHON3_CYTHON_SITE = https://files.pythonhosted.org/packages/eb/46/80dd9e5ad67ebc766ff3229901bde4a7bc82907efe93cd7007c4df458dd5 PYTHON3_CYTHON_SETUP_TYPE = setuptools PYTHON3_CYTHON_LICENSE = Apache-2.0 PYTHON3_CYTHON_LICENSE_FILES = COPYING.txt LICENSE.txt From peter at korsgaard.com Wed Feb 2 10:10:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 2 Feb 2022 11:10:56 +0100 Subject: [Buildroot] [git commit] package/python-aioconsole: bump to version 0.4.0 Message-ID: <20220202101446.75CE1822ED@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b706d6a21c2d54213a05e9787036e04075a9c012 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- 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 26a3778756..39ce16f8b2 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 f8b67330e631cfc45a9b2560a6e0fa98 aioconsole-0.3.3.tar.gz -sha256 47df42d9f8cc3995bbe032dd5f01d32cc5b06639e9078bb9b4e3c55b237f5e32 aioconsole-0.3.3.tar.gz +md5 56a1e6542ea3627bdbc67f24abcaa341 aioconsole-0.4.0.tar.gz +sha256 a30ad5276b85dd20a48d235111d0bd26c6bedf7b56d605ffc10ae27124b4b0b4 aioconsole-0.4.0.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 f06d91a550..44857054d4 100644 --- a/package/python-aioconsole/python-aioconsole.mk +++ b/package/python-aioconsole/python-aioconsole.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOCONSOLE_VERSION = 0.3.3 +PYTHON_AIOCONSOLE_VERSION = 0.4.0 PYTHON_AIOCONSOLE_SOURCE = aioconsole-$(PYTHON_AIOCONSOLE_VERSION).tar.gz -PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/dd/f6/bbc451ba96c1e1da6aa253f254b181ceb03272b475b27b481b57865d7d7f +PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/f2/7a/7628ec23f140ffca532c7f630e179503727b755849b5eab15576bbf7d3df PYTHON_AIOCONSOLE_SETUP_TYPE = setuptools PYTHON_AIOCONSOLE_LICENSE = GPL-3.0 PYTHON_AIOCONSOLE_LICENSE_FILES = LICENSE From peter at korsgaard.com Wed Feb 2 10:20:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 2 Feb 2022 11:20:15 +0100 Subject: [Buildroot] [git commit] package/python-setuptools-scm: bump to version 6.4.2 Message-ID: <20220202101446.C639F822ED@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7995738abf772109d3df2a55eb9ab114d43f1c99 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-setuptools-scm/python-setuptools-scm.hash | 4 ++-- package/python-setuptools-scm/python-setuptools-scm.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-setuptools-scm/python-setuptools-scm.hash b/package/python-setuptools-scm/python-setuptools-scm.hash index 22b9afd2c2..934c505442 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 32918d8ac566360c21411e0b3556c695 setuptools_scm-6.3.2.tar.gz -sha256 a49aa8081eeb3514eb9728fa5040f2eaa962d6c6f4ec9c32f6c1fba88f88a0f2 setuptools_scm-6.3.2.tar.gz +md5 b4e02bf8e62ed49142ea7b42a68671d7 setuptools_scm-6.4.2.tar.gz +sha256 6833ac65c6ed9711a4d5d2266f8024cfa07c533a0e55f4c12f6eff280a5a9e30 setuptools_scm-6.4.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 b2990a56cb..8c5229e1a6 100644 --- a/package/python-setuptools-scm/python-setuptools-scm.mk +++ b/package/python-setuptools-scm/python-setuptools-scm.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SETUPTOOLS_SCM_VERSION = 6.3.2 +PYTHON_SETUPTOOLS_SCM_VERSION = 6.4.2 PYTHON_SETUPTOOLS_SCM_SOURCE = setuptools_scm-$(PYTHON_SETUPTOOLS_SCM_VERSION).tar.gz -PYTHON_SETUPTOOLS_SCM_SITE = https://files.pythonhosted.org/packages/4b/0d/ecb9595fae02467edba5023eb8a23c688d2b438a6a8d1a9e2b8649faf23d +PYTHON_SETUPTOOLS_SCM_SITE = https://files.pythonhosted.org/packages/4a/18/477d3d9eb2f88230ff2a41de9d8ffa3554b706352787d289f57f76bfba0b PYTHON_SETUPTOOLS_SCM_LICENSE = MIT PYTHON_SETUPTOOLS_SCM_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_SCM_SETUP_TYPE = setuptools From thomas.devoogdt at gmail.com Wed Feb 2 11:25:28 2022 From: thomas.devoogdt at gmail.com (Thomas Devoogdt) Date: Wed, 2 Feb 2022 12:25:28 +0100 Subject: [Buildroot] [PATCH] pacakge/glib-networking: bump to version 2.70.0 Message-ID: <20220202112528.7778-1-thomas.devoogdt@barco.com> From: Thomas Devoogdt PKCS#11 is required if gnutls is used: https://gitlab.gnome.org/GNOME/glib-networking/-/commit/9b3d30e40f306f0e36e2a396d3b6df1edeea9f21 Older compilers require c_std=gnu99: https://gitlab.gnome.org/GNOME/glib-networking/-/commit/b192086b9936602a40a14d00a6883b339b9d7955 Signed-off-by: Thomas Devoogdt --- .../0001-meson-change-std-to-gnu99.patch | 30 +++++++++++++++++++ package/glib-networking/Config.in | 1 + package/glib-networking/glib-networking.hash | 4 +-- package/glib-networking/glib-networking.mk | 2 +- 4 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 package/glib-networking/0001-meson-change-std-to-gnu99.patch diff --git a/package/glib-networking/0001-meson-change-std-to-gnu99.patch b/package/glib-networking/0001-meson-change-std-to-gnu99.patch new file mode 100644 index 0000000000..9f266bc2c8 --- /dev/null +++ b/package/glib-networking/0001-meson-change-std-to-gnu99.patch @@ -0,0 +1,30 @@ +From cdfa726bae1d82b7bd3735475fc2b2c6a31c1d2f Mon Sep 17 00:00:00 2001 +From: Ignacio Casal Quinteiro +Date: Fri, 12 Nov 2021 11:51:33 +0100 +Subject: [PATCH] meson: change std to gnu99 + +This is the same as glib and should fix issues with old +compilers + +(cherry picked from commit b192086b9936602a40a14d00a6883b339b9d7955) +Signed-off-by: Thomas Devoogdt +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index b018ca7b..130a2bf0 100644 +--- a/meson.build ++++ b/meson.build +@@ -3,7 +3,7 @@ project( + version: '2.70.0', + license: 'LGPL2.1+', + meson_version: '>= 0.50.0', +- default_options: ['c_std=c99'] ++ default_options: ['c_std=gnu99'] + ) + + prefix = get_option('prefix') +-- +2.17.1 + diff --git a/package/glib-networking/Config.in b/package/glib-networking/Config.in index 22331255f7..38cded5e6b 100644 --- a/package/glib-networking/Config.in +++ b/package/glib-networking/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_GLIB_NETWORKING depends on !BR2_STATIC_LIBS select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_GNUTLS + select BR2_PACKAGE_P11_KIT if BR2_PACKAGE_GNUTLS help Network-related GIO modules for glib. diff --git a/package/glib-networking/glib-networking.hash b/package/glib-networking/glib-networking.hash index 976a19f25e..6a53b436b0 100644 --- a/package/glib-networking/glib-networking.hash +++ b/package/glib-networking/glib-networking.hash @@ -1,3 +1,3 @@ -# From http://ftp.gnome.org/pub/gnome/sources/glib-networking/2.66/glib-networking-2.66.0.sha256sum -sha256 c5d7be2437fdd196eebfb70c4517b96d3ba7ec13bd496318b8f02dea383e0099 glib-networking-2.66.0.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/glib-networking/2.70/glib-networking-2.70.0.sha256sum +sha256 66b408e7afa86c582fe38963db56133869ab4b57d34e48ec56aba621940d6f35 glib-networking-2.70.0.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/glib-networking/glib-networking.mk b/package/glib-networking/glib-networking.mk index 65630c7fed..53280700bc 100644 --- a/package/glib-networking/glib-networking.mk +++ b/package/glib-networking/glib-networking.mk @@ -4,7 +4,7 @@ # ################################################################################ -GLIB_NETWORKING_VERSION_MAJOR = 2.66 +GLIB_NETWORKING_VERSION_MAJOR = 2.70 GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_VERSION_MAJOR).0 GLIB_NETWORKING_SITE = http://ftp.gnome.org/pub/gnome/sources/glib-networking/$(GLIB_NETWORKING_VERSION_MAJOR) GLIB_NETWORKING_SOURCE = glib-networking-$(GLIB_NETWORKING_VERSION).tar.xz -- 2.17.1 From aperez at igalia.com Wed Feb 2 11:32:22 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Wed, 2 Feb 2022 13:32:22 +0200 Subject: [Buildroot] [PATCH] pacakge/glib-networking: bump to version 2.70.0 In-Reply-To: <20220202112528.7778-1-thomas.devoogdt@barco.com> References: <20220202112528.7778-1-thomas.devoogdt@barco.com> Message-ID: <20220202133222.GB1296849@momiji> On Wed, 02 Feb 2022 12:25:28 +0100 Thomas Devoogdt wrote: > From: Thomas Devoogdt > > PKCS#11 is required if gnutls is used: > https://gitlab.gnome.org/GNOME/glib-networking/-/commit/9b3d30e40f306f0e36e2a396d3b6df1edeea9f21 > > Older compilers require c_std=gnu99: > https://gitlab.gnome.org/GNOME/glib-networking/-/commit/b192086b9936602a40a14d00a6883b339b9d7955 > > Signed-off-by: Thomas Devoogdt Reviewed-by: Adrian Perez de Castro > --- > .../0001-meson-change-std-to-gnu99.patch | 30 +++++++++++++++++++ > package/glib-networking/Config.in | 1 + > package/glib-networking/glib-networking.hash | 4 +-- > package/glib-networking/glib-networking.mk | 2 +- > 4 files changed, 34 insertions(+), 3 deletions(-) > create mode 100644 package/glib-networking/0001-meson-change-std-to-gnu99.patch > > diff --git a/package/glib-networking/0001-meson-change-std-to-gnu99.patch b/package/glib-networking/0001-meson-change-std-to-gnu99.patch > new file mode 100644 > index 0000000000..9f266bc2c8 > --- /dev/null > +++ b/package/glib-networking/0001-meson-change-std-to-gnu99.patch > @@ -0,0 +1,30 @@ > +From cdfa726bae1d82b7bd3735475fc2b2c6a31c1d2f Mon Sep 17 00:00:00 2001 > +From: Ignacio Casal Quinteiro > +Date: Fri, 12 Nov 2021 11:51:33 +0100 > +Subject: [PATCH] meson: change std to gnu99 > + > +This is the same as glib and should fix issues with old > +compilers > + > +(cherry picked from commit b192086b9936602a40a14d00a6883b339b9d7955) > +Signed-off-by: Thomas Devoogdt > +--- > + meson.build | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/meson.build b/meson.build > +index b018ca7b..130a2bf0 100644 > +--- a/meson.build > ++++ b/meson.build > +@@ -3,7 +3,7 @@ project( > + version: '2.70.0', > + license: 'LGPL2.1+', > + meson_version: '>= 0.50.0', > +- default_options: ['c_std=c99'] > ++ default_options: ['c_std=gnu99'] > + ) > + > + prefix = get_option('prefix') > +-- > +2.17.1 > + > diff --git a/package/glib-networking/Config.in b/package/glib-networking/Config.in > index 22331255f7..38cded5e6b 100644 > --- a/package/glib-networking/Config.in > +++ b/package/glib-networking/Config.in > @@ -6,6 +6,7 @@ config BR2_PACKAGE_GLIB_NETWORKING > depends on !BR2_STATIC_LIBS > select BR2_PACKAGE_LIBGLIB2 > select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_GNUTLS > + select BR2_PACKAGE_P11_KIT if BR2_PACKAGE_GNUTLS > help > Network-related GIO modules for glib. > > diff --git a/package/glib-networking/glib-networking.hash b/package/glib-networking/glib-networking.hash > index 976a19f25e..6a53b436b0 100644 > --- a/package/glib-networking/glib-networking.hash > +++ b/package/glib-networking/glib-networking.hash > @@ -1,3 +1,3 @@ > -# From http://ftp.gnome.org/pub/gnome/sources/glib-networking/2.66/glib-networking-2.66.0.sha256sum > -sha256 c5d7be2437fdd196eebfb70c4517b96d3ba7ec13bd496318b8f02dea383e0099 glib-networking-2.66.0.tar.xz > +# From http://ftp.gnome.org/pub/gnome/sources/glib-networking/2.70/glib-networking-2.70.0.sha256sum > +sha256 66b408e7afa86c582fe38963db56133869ab4b57d34e48ec56aba621940d6f35 glib-networking-2.70.0.tar.xz > sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING > diff --git a/package/glib-networking/glib-networking.mk b/package/glib-networking/glib-networking.mk > index 65630c7fed..53280700bc 100644 > --- a/package/glib-networking/glib-networking.mk > +++ b/package/glib-networking/glib-networking.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -GLIB_NETWORKING_VERSION_MAJOR = 2.66 > +GLIB_NETWORKING_VERSION_MAJOR = 2.70 > GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_VERSION_MAJOR).0 > GLIB_NETWORKING_SITE = http://ftp.gnome.org/pub/gnome/sources/glib-networking/$(GLIB_NETWORKING_VERSION_MAJOR) > GLIB_NETWORKING_SOURCE = glib-networking-$(GLIB_NETWORKING_VERSION).tar.xz > -- > 2.17.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot Cheers, ?Adri?n -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: From giulio.benetti at benettiengineering.com Wed Feb 2 12:49:27 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 2 Feb 2022 13:49:27 +0100 Subject: [Buildroot] [PATCH] package/cryptsetup: disable package if we build for Microblaze In-Reply-To: <20220201171910.32728-1-giulio.benetti@benettiengineering.com> References: <20220201171910.32728-1-giulio.benetti@benettiengineering.com> Message-ID: <9DF432CD-1007-4C7A-87A6-1DAAC90BE738@benettiengineering.com> Hi All, please drop this patch since upstream is very reactive and they?re working for fixing. I?ll send a patch soon for fixing instead than disabling. Best regards Giulio Benetti > Il giorno 1 feb 2022, alle ore 18:19, Giulio Benetti ha scritto: > > ?cryptsetup has the same build failure found for libfuse. For libfuse I've > patched meson that now correctly checks if symver is available: > https://github.com/libfuse/libfuse/pull/620/commits/3aba09a5c56e017746c5c1652dbc845f4db7374a > But in cryptsetup the check is done in a header file while building, so I > can't use the same approach and that would take not few work to move the > check to Autotools, so I've opened an issue on cryptsetup's gitlab: > https://gitlab.com/cryptsetup/cryptsetup/-/issues/709 > asking if they can manage it the way I've done for libfuse. > > So let's disable cryptsetup if we're building on Microblaze for the moment > and when the issue will be fixed upstream, I will bump the version and > re-enable building for Microblaze. > > Fixes: > http://autobuild.buildroot.net/results/86b/86b6b13e6be8375875caebcd91de91fef83f72e8/ > > Signed-off-by: Giulio Benetti > --- > package/cryptsetup/Config.in | 1 + > package/libblockdev/Config.in | 1 + > package/luksmeta/Config.in | 1 + > package/systemd/Config.in | 1 + > package/udisks/Config.in | 1 + > 5 files changed, 5 insertions(+) > > diff --git a/package/cryptsetup/Config.in b/package/cryptsetup/Config.in > index f36883ea47..2f3dd8d2b2 100644 > --- a/package/cryptsetup/Config.in > +++ b/package/cryptsetup/Config.in > @@ -1,6 +1,7 @@ > config BR2_PACKAGE_CRYPTSETUP > bool "cryptsetup" > depends on BR2_TOOLCHAIN_HAS_THREADS # lvm2 > + depends on !BR2_microblaze # wrong symver detection > depends on BR2_USE_MMU # lvm2, libargon2 > depends on !BR2_STATIC_LIBS # lvm2, libargon2 > depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c > diff --git a/package/libblockdev/Config.in b/package/libblockdev/Config.in > index 4389fd794c..38fe2331cf 100644 > --- a/package/libblockdev/Config.in > +++ b/package/libblockdev/Config.in > @@ -23,6 +23,7 @@ comment "plugins" > config BR2_PACKAGE_LIBBLOCKDEV_CRYPTO > bool "crypto" > depends on BR2_TOOLCHAIN_HAS_SYNC_4 # cryptsetup -> json-c > + depends on !BR2_microblaze # cryptsetup > select BR2_PACKAGE_CRYPTSETUP > > config BR2_PACKAGE_LIBBLOCKDEV_FS > diff --git a/package/luksmeta/Config.in b/package/luksmeta/Config.in > index ddc9b6f3bf..88a10bc9da 100644 > --- a/package/luksmeta/Config.in > +++ b/package/luksmeta/Config.in > @@ -1,6 +1,7 @@ > config BR2_PACKAGE_LUKSMETA > bool "luksmeta" > depends on BR2_TOOLCHAIN_HAS_THREADS # cryptsetup -> lvm2 > + depends on !BR2_microblaze # cryptsetup > depends on BR2_USE_MMU # cryptsetup -> lvm2 > depends on !BR2_STATIC_LIBS # cryptsetup -> lvm2 > depends on BR2_TOOLCHAIN_HAS_SYNC_4 # cryptsetup -> json-c > diff --git a/package/systemd/Config.in b/package/systemd/Config.in > index cc0736561e..d1e692f826 100644 > --- a/package/systemd/Config.in > +++ b/package/systemd/Config.in > @@ -228,6 +228,7 @@ config BR2_PACKAGE_SYSTEMD_HIBERNATE > config BR2_PACKAGE_SYSTEMD_HOMED > bool "enable home daemon" > depends on BR2_TOOLCHAIN_HAS_THREADS # cryptsetup -> lvm2 > + depends on !BR2_microblaze # cryptsetup > depends on BR2_USE_MMU # cryptsetup -> lvm2 > depends on !BR2_STATIC_LIBS # cryptsetup -> lvm2 > depends on BR2_TOOLCHAIN_HAS_SYNC_4 # cryptsetup -> json-c > diff --git a/package/udisks/Config.in b/package/udisks/Config.in > index 82f11ae7de..8a48d85924 100644 > --- a/package/udisks/Config.in > +++ b/package/udisks/Config.in > @@ -6,6 +6,7 @@ config BR2_PACKAGE_UDISKS > depends on BR2_TOOLCHAIN_HAS_THREADS # polkit > depends on BR2_USE_WCHAR # dbus-glib -> glib2 > depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libblockdev -> cryptsetup -> json-c > + depends on !BR2_microblaze # cryptsetup > depends on !BR2_STATIC_LIBS # polkit -> duktape > select BR2_PACKAGE_DBUS > select BR2_PACKAGE_DBUS_GLIB > -- > 2.25.1 > From arnout at mind.be Wed Feb 2 12:53:50 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 2 Feb 2022 13:53:50 +0100 Subject: [Buildroot] [git commit] package/util-linux: fix host build failure Message-ID: <20220202124656.810F982156@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d895bd973b35fde10d3dd7db530d9e4782926497 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The UTIL_LINUX_FIX_DISK_UTILS_COMPILE workaround is needed for host building too. So let's add it to HOST_UTIL_LINUX_POST_PATCH_HOOKS. host-util-linux is used a lot, so this patch fixes a lot of future builds. Fixes: http://autobuild.buildroot.net/results/b8c/b8cb40efc036a01802c914544cd4fc29dfd67af6// Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/util-linux/util-linux.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index e59ef7dadc..5a4ff64d01 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -41,6 +41,7 @@ define UTIL_LINUX_FIX_DISK_UTILS_COMPILE touch $(@D)/disk-utils/raw.8 endef UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE +HOST_UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf From yann.morin at orange.com Wed Feb 2 13:48:38 2022 From: yann.morin at orange.com (yann.morin at orange.com) Date: Wed, 2 Feb 2022 14:48:38 +0100 Subject: [Buildroot] [PATCHv2] package/glibc: allow runing on kernels older than used for the headers Message-ID: <19291_1643809720_61FA8BB8_19291_487_24_41ca9ce22939ce2ed0c41973db7d612542850824.1643809712.git.yann.morin@orange.com> From: "Yann E. MORIN" Currently, we configure glibc to not add compatibility support for kernels older than the one used for the headers. This is on the expectation that the system will never run on a kernel that is older than the one used for the headers or, when Buildroot builds the kernel, on another, older kernel. However, in some situations, it is possible to build for a generic system, where the kernel may be a different version. This can be the case, for example, when Building an image that is to be used in a container that can run on a range of machines each with different kernel versions. In such a case, it is interesting to build glibc in a way as to take better advantage of the newer kernels, and thus using newer kernel headers, while still allowing running on older kernels, and thus carrying more compatibility code. We add an option to glibc to allow the user to enable compatibility shims. To simplify the case, when that option is enabled, we just let glibc enable as old compatibility shims as supported by the current architecture. The code size increase is very small. For an ARM Cortex-A7, with gcc-10.3.0, the delta is as follows (other files installed by glibc had no size delta; sizes in bytes): file | no compat | compat | delta ----------------------+-----------+-----------+------- ld-linux-armhf.so.3 | 200216 | 200284 | + 68 libc.so.6 | 1814496 | 1823120 | +8624 ------+------- Total | +8692 No runtime overhead has been measured; the overhead is most probably in the measurement noise. Indeed, the compatibility shims are very lightweight. For example, there are 9 arch-generic shims: renameat2(), execveat(), mlock2(), statx(), faccessat2(), close_range(), time64-related syscall shenanigans, a waitid() feature, and a futex operation (LOCK_PI2) and then each arch may define a few others. i386 has less than 20 (mostly related to socket options, and one for the ordering of the clone() arguments), while ARM seems to have only two (mlock2() and a configurable futex feature). Note: however, as Arnout pointed out, some programs may still actually fail to run even with such compatibility shim, if they really expect the shimed syscalls to really exist and have no fallback (and/or no proper error-handling). Still, in the vast majority of cases, those compatibility shims are enough to have a system running. Signed-off-by: Yann E. MORIN Cc: Alexey Brodkin Cc: Arnout Vandecappelle --- Changes v1 -> v2: - don't let user provide a version, enable all compat shims (Arnout, Alexey) - add size measurements and explanations about no runtime overhead measurements (Arnout) --- package/glibc/Config.in | 12 ++++++++++++ package/glibc/glibc.mk | 8 ++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/package/glibc/Config.in b/package/glibc/Config.in index 5ecd058145..8e9ddac7d9 100644 --- a/package/glibc/Config.in +++ b/package/glibc/Config.in @@ -10,6 +10,18 @@ config BR2_PACKAGE_GLIBC help https://www.gnu.org/software/libc/ +config BR2_PACKAGE_GLIBC_KERNEL_COMPAT + bool "Enable compatibiltiy shims to run on older kernels" + help + Say 'y' here if you plan on running your system on a kernel + older than the version used for the toolchain headers. + + Enabling those compatibility shims may generate a slightly + bigger and slightly slower glibc library. + + The oldest supported kernel version depends on the + architecture. + config BR2_PACKAGE_GLIBC_UTILS bool "Install glibc utilities" help diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index 5c26b0e6df..9ea9f27a2f 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -98,6 +98,10 @@ endif GLIBC_MAKE = $(BR2_MAKE) GLIBC_CONF_ENV += ac_cv_prog_MAKE="$(BR2_MAKE)" +ifeq ($(BR2_PACKAGE_GLIBC_KERNEL_COMPAT),) +GLIBC_CONF_OPTS += --enable-kernel=$(call qstrip,$(BR2_TOOLCHAIN_HEADERS_AT_LEAST)) +endif + # Even though we use the autotools-package infrastructure, we have to # override the default configure commands for several reasons: # @@ -128,8 +132,8 @@ define GLIBC_CONFIGURE_CMDS --disable-profile \ --disable-werror \ --without-gd \ - --enable-kernel=$(call qstrip,$(BR2_TOOLCHAIN_HEADERS_AT_LEAST)) \ - --with-headers=$(STAGING_DIR)/usr/include) + --with-headers=$(STAGING_DIR)/usr/include \ + $(GLIBC_CONF_OPTS)) $(GLIBC_ADD_MISSING_STUB_H) endef -- 2.25.1 _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From giulio.benetti at benettiengineering.com Wed Feb 2 15:58:21 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 2 Feb 2022 16:58:21 +0100 Subject: [Buildroot] [PATCH] configs/microchip_sam9x60ek_mmc_dev_defconfig: expand rootfs size to 120M Message-ID: <20220202155821.4038299-1-giulio.benetti@benettiengineering.com> Default 60M for rootfs are not enough and generate a build failure, so let's expand rootfs size to 120M. Fixes: https://gitlab.com/ymorin/buildroot/-/jobs/2035821088 Signed-off-by: Giulio Benetti --- configs/microchip_sam9x60ek_mmc_dev_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/microchip_sam9x60ek_mmc_dev_defconfig b/configs/microchip_sam9x60ek_mmc_dev_defconfig index da1bd33dd3..00ccd784b5 100644 --- a/configs/microchip_sam9x60ek_mmc_dev_defconfig +++ b/configs/microchip_sam9x60ek_mmc_dev_defconfig @@ -7,6 +7,7 @@ BR2_TARGET_GENERIC_HOSTNAME="sam9x60ek" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/microchip/sam9x60ek_mmc/genimage.cfg" +BR2_TARGET_ROOTFS_EXT2_SIZE=120M BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,linux4microchip-2021.10)/linux-linux4microchip-2021.10.tar.gz" -- 2.25.1 From neal.frager at xilinx.com Wed Feb 2 16:55:55 2022 From: neal.frager at xilinx.com (Neal Frager) Date: Wed, 2 Feb 2022 09:55:55 -0700 Subject: [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2 Message-ID: <20220202165555.3497977-1-nealf@xilinx.com> Signed-off-by: Neal Frager --- board/zynqmp/genimage.cfg | 1 + ...-fix-Remove-GGC-ignore-Warray-bounds.patch | 68 ------- ...64-zynqmp-zcu106-fix-SPL-MMC-booting.patch | 52 ------ ...2-arm64-zynqmp-Enable-booting-to-ATF.patch | 114 ------------ ...ept-an-absolute-path-for-PMUFW_INIT_.patch | 68 ------- ...ynqmp-pass-the-PS-init-file-as-a-kco.patch | 175 ------------------ configs/zynqmp_zcu102_defconfig | 35 ++++ configs/zynqmp_zcu106_defconfig | 15 +- 8 files changed, 44 insertions(+), 484 deletions(-) delete mode 100644 board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch delete mode 100644 board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch delete mode 100644 board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch delete mode 100644 board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch delete mode 100644 board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch create mode 100644 configs/zynqmp_zcu102_defconfig diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg index ed202f4550..557364e124 100644 --- a/board/zynqmp/genimage.cfg +++ b/board/zynqmp/genimage.cfg @@ -3,6 +3,7 @@ image boot.vfat { files = { "boot.bin", "u-boot.bin", + "u-boot.itb", "atf-uboot.ub", "system.dtb", "Image" diff --git a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch b/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch deleted file mode 100644 index 0c1a9ba2a4..0000000000 --- a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch +++ /dev/null @@ -1,68 +0,0 @@ -From da003e6ada7d0217fe99dc7c649a731f8ebd3c34 Mon Sep 17 00:00:00 2001 -From: Deepika Bhavnani -Date: Thu, 15 Aug 2019 00:56:46 +0300 -Subject: [PATCH] Coverity fix: Remove GGC ignore -Warray-bounds - -GCC diagnostics were added to ignore array boundaries, instead -of ignoring GCC warning current code will check for array boundaries -and perform and array update only for valid elements. - -Resolves: `CID 246574` `CID 246710` `CID 246651` - -Signed-off-by: Deepika Bhavnani -Change-Id: I7530ecf7a1707351c6ee87e90cc3d33574088f57 - -Backported from: 41af05154abe136938bcfb5f26c969933784bbef -[Adapted to apply on 1.5] - ---- - lib/psci/psci_common.c | 20 ++++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) - -diff --git a/lib/psci/psci_common.c b/lib/psci/psci_common.c -index 2220a745cd6e..6282d992a2f0 100644 ---- a/lib/psci/psci_common.c -+++ b/lib/psci/psci_common.c -@@ -188,21 +188,17 @@ static unsigned int get_power_on_target_pwrlvl(void) - /****************************************************************************** - * Helper function to update the requested local power state array. This array - * does not store the requested state for the CPU power level. Hence an -- * assertion is added to prevent us from accessing the wrong index. -+ * assertion is added to prevent us from accessing the CPU power level. - *****************************************************************************/ - static void psci_set_req_local_pwr_state(unsigned int pwrlvl, - unsigned int cpu_idx, - plat_local_state_t req_pwr_state) - { -- /* -- * This should never happen, we have this here to avoid -- * "array subscript is above array bounds" errors in GCC. -- */ - assert(pwrlvl > PSCI_CPU_PWR_LVL); --#pragma GCC diagnostic push --#pragma GCC diagnostic ignored "-Warray-bounds" -- psci_req_local_pwr_states[pwrlvl - 1][cpu_idx] = req_pwr_state; --#pragma GCC diagnostic pop -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && -+ (cpu_idx < PLATFORM_CORE_COUNT)) { -+ psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx] = req_pwr_state; -+ } - } - - /****************************************************************************** -@@ -228,7 +224,11 @@ static plat_local_state_t *psci_get_req_local_pwr_states(unsigned int pwrlvl, - { - assert(pwrlvl > PSCI_CPU_PWR_LVL); - -- return &psci_req_local_pwr_states[pwrlvl - 1][cpu_idx]; -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && -+ (cpu_idx < PLATFORM_CORE_COUNT)) { -+ return &psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx]; -+ } else -+ return NULL; - } - - /* --- -2.34.0 - diff --git a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch b/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch deleted file mode 100644 index 4d85e1bb12..0000000000 --- a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch +++ /dev/null @@ -1,52 +0,0 @@ -From e5d72ed8339eb05285448aad3c89d21e4d18fd29 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Mon, 26 Feb 2018 09:40:34 +0100 -Subject: [PATCH] arm64: zynqmp: zcu106: fix SPL MMC booting - -The U-Boot SPL generated with the current zcu106 defconfig cannot boot -from MMC: - - [...] - U-Boot SPL 2018.01 (Feb 21 2018 - 17:47:14) - EL Level: EL3 - Trying to boot from MMC1 - sdhci_transfer_data: Error detected in status(0x408020)! - spl_load_image_fat_os: error reading image u-boot.bin, err - -2 - spl_load_image_fat: error reading image u-boot.img, err - -6 - SPL: failed to boot from all boot devices - ### ERROR ### Please RESET the board ### - -Fix by lowering the rpll value. The new value for the RPLL_CTRL -register comes from the current psu_init_gpl.c from the HDF file at -https://github.com/xilinx/hdf-examples/tree/01ad8ea5fd1989abf4ea5a072d019a16cb2bc546/zcu106-zynqmp -(generated by Vivado v2017.4). - -RPLL and sdio1_ref clocks before and after this change: - - - Old values: RPLL 1.36 GHz, sdio1_ref 272 MHz - - New values: RPLL 1.16 GHz, sdio1_ref 233 MHz - -Signed-off-by: Luca Ceresoli -Cc: Michal Simek -Upstream-status: accepted upstream in a different form ---- - - board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -index 4d18abe000ca..e6fa477e53e7 100644 ---- a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -+++ b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -@@ -10,7 +10,7 @@ - static unsigned long psu_pll_init_data(void) - { - psu_mask_write(0xFF5E0034, 0xFE7FEDEFU, 0x7E4E2C62U); -- psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00013C00U); -+ psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00014600U); - psu_mask_write(0xFF5E0030, 0x00000008U, 0x00000008U); - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000001U); - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000000U); --- -2.7.4 - diff --git a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch b/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch deleted file mode 100644 index 487fff6812..0000000000 --- a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 5e3cac50cc981e01d9072241035a8d4162560c71 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Mon, 12 Mar 2018 17:18:38 +0100 -Subject: [PATCH] arm64: zynqmp: Enable booting to ATF - -U-Boot is now able to boot to ARM Trusted Firmware (ATF). The boot -flow is SPL(EL3) loads ATF and full u-boot and jump to ATF(EL3) which -pass control to full u-boot(EL2). This has been tested on zcu106, so -enable it in this defconfig. - -To generate an image that triggers this booting flow, you need to pass -'-O arm-trusted-firmware' to mkimage. - -Signed-off-by: Luca Ceresoli -Signed-off-by: Michal Simek -Backported from upstream: http://git.denx.de/?p=u-boot.git;a=commit;h=5e3cac50cc981e01d9072241035a8d4162560c71 ---- - - configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 + - configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 + - configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 + - configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 + - configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 1 + - configs/xilinx_zynqmp_zcu102_revA_defconfig | 1 + - configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 + - 7 files changed, 7 insertions(+) - -diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig -index c5bfa2b12638..488c72258b0e 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig -index f86dce403a42..5d501eec0edd 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig -@@ -20,6 +20,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig -index 6e947cf56827..6f7eaebd7676 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig -@@ -16,6 +16,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_CMD_MEMTEST=y - CONFIG_SYS_ALT_MEMTEST=y -diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig -index 1c934858c61c..7a3806cba4b5 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig -@@ -17,6 +17,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_CMD_MEMTEST=y - CONFIG_SYS_ALT_MEMTEST=y -diff --git a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig -index e13c7c56f310..e4408f182ca0 100644 ---- a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig -+++ b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig b/configs/xilinx_zynqmp_zcu102_revA_defconfig -index 5b2cd495ee85..b52f6789fd4b 100644 ---- a/configs/xilinx_zynqmp_zcu102_revA_defconfig -+++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig -index e6530fbfe7ff..80592554f682 100644 ---- a/configs/xilinx_zynqmp_zcu102_revB_defconfig -+++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y --- -2.7.4 - diff --git a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch b/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch deleted file mode 100644 index 95ab7b3b75..0000000000 --- a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch +++ /dev/null @@ -1,68 +0,0 @@ -From c7df098a71e05dc81cee818747759e8060b59626 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Mon, 4 Jun 2018 12:21:01 +0200 -Subject: [PATCH] arm64: zynqmp: accept an absolute path for PMUFW_INIT_FILE - -The value of PMUFW_INIT_FILE is prefixed with "$(srctree)/", thus -forcing it to be a relative path inside the U-Boot source tree. Since -the PMUFW is a binary file generated outside of U-Boot, the PMUFW -binary must be copied inside the U-Boot source tree before the -build. - -This generates a few problems: - - * if the source tree is shared among different out-of-tree builds, - they will pollute (and potentially corrupt) each other - * the source tree cannot be read-only - * any buildsystem must add a command to copy the PMUFW binary - * putting an externally-generated binary in the source tree is ugly - as hell - -Avoid these problems by accepting an absolute path for -PMUFW_INIT_FILE. This would be as simple as removing the "$(srctree)/" -prefix, but in order to keep backward compatibility we rather use the -shell and readlink to get the absolute path even when starting from a -relative path. - -Since 'readlink -f' produces an empty string if the file does not -exist, we also add a check to ensure the file configured in -PMUFW_INIT_FILE exists. Otherwise the build would exit successfully, -but produce a boot.bin without PMUFW as if PMUFW_INIT_FILE were empty. - -Tested in the 12 possible combinations of: - - PMUFW_INIT_FILE empty, relative, absolute, non-existing - - building in-tree, in subdir, in other directory - -Signed-off-by: Luca Ceresoli -Cc: Michal Simek -Cc: Simon Glass -Cc: Emmanuel Vadot -Signed-off-by: Michal Simek -Backported from upstream: https://git.denx.de/?p=u-boot.git;a=commit;h=c7df098a71e05dc81cee818747759e8060b59626 ---- - scripts/Makefile.spl | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl -index ef018b5b4056..252f13826d4c 100644 ---- a/scripts/Makefile.spl -+++ b/scripts/Makefile.spl -@@ -167,8 +167,14 @@ ifdef CONFIG_ARCH_ZYNQ - MKIMAGEFLAGS_boot.bin = -T zynqimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) - endif - ifdef CONFIG_ARCH_ZYNQMP -+ifneq ($(CONFIG_PMUFW_INIT_FILE),"") -+spl/boot.bin: zynqmp-check-pmufw -+zynqmp-check-pmufw: FORCE -+ ( cd $(srctree) && test -r $(CONFIG_PMUFW_INIT_FILE) ) \ -+ || ( echo "Cannot read $(CONFIG_PMUFW_INIT_FILE)" && false ) -+endif - MKIMAGEFLAGS_boot.bin = -T zynqmpimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) \ -- -n $(srctree)/$(CONFIG_PMUFW_INIT_FILE) -+ -n "$(shell cd $(srctree); readlink -f $(CONFIG_PMUFW_INIT_FILE))" - endif - - spl/boot.bin: $(obj)/u-boot-spl.bin FORCE --- -2.7.4 - diff --git a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch b/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch deleted file mode 100644 index b32e162780..0000000000 --- a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch +++ /dev/null @@ -1,175 +0,0 @@ -From 4c9d54ab5a41d65000c8d249b6fb1b76056f1812 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Wed, 20 Jun 2018 12:11:50 +0200 -Subject: [PATCH] arm/arm64: zynq/zynqmp: pass the PS init file as a kconfig - variable - -U-Boot needs to link ps7_init_gpl.c on Zynq or psu_init_gpl.c on -ZynqMP (PS init for short). The current logic to locate this file for -both platforms is: - - 1. if a board-specific file exists in - board/xilinx/zynq[mp]/$(CONFIG_DEFAULT_DEVICE_TREE)/ps?_init_gpl.c - then use it - 2. otherwise use board/xilinx/zynq/ps?_init_gpl.c - -In the latter case the file does not exist in the U-Boot sources and -must be copied in the source tree from the outside before starting the -build. This is typical when it is generated from Xilinx tools while -developing a custom hardware. However making sure that a -board-specific file is _not_ found (and used) requires some trickery -such as removing or overwriting all PS init files (e.g.: the current -meta-xilinx yocto layer [0]). - -This generates a few problems: - - * if the source tree is shared among different out-of-tree builds, - they will pollute (and potentially corrupt) each other - * the source tree cannot be read-only - * any buildsystem must add a command to copy the PS init file binary - * overwriting or deleting files in the source tree is ugly as hell - -Simplify usage by allowing to pass the path to the desired PS init -file in kconfig variable XILINX_PS_INIT_FILE. It can be an absolute -path or relative to $(srctree). If the variable is set, the -user-specified file will always be used without being copied -around. If the the variable is left empty, for backward compatibility -fall back to the old behaviour. - -Since the issue is the same for Zynq and ZynqMP, add one kconfig -variable in a common place and use it for both. - -Also use the new kconfig help text to document all the ways to give -U-Boot the PS init file. - -Build-tested with all combinations of: - - platform: zynq or zynqmp - - PS init file: from XILINX_PS_INIT_FILE (absolute, relative path, - non-existing), in-tree board-specific, in board/xilinx/zynq[mp]/ - - building in-tree, in subdir, in other directory - -[0] https://github.com/Xilinx/meta-xilinx/blob/b2f74cc7fe5c4881589d5e440a17cb51fc66a7ab/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init.inc#L9 - -Signed-off-by: Luca Ceresoli -Cc: Albert Aribaud -Cc: Michal Simek -Cc: Nathan Rossi -Backported from upstream: https://git.denx.de/?p=u-boot.git;a=commit;h=6da4f67ad09cd8b311d77b2b04e557b7ef65b56c ---- - arch/arm/Kconfig | 1 + - board/xilinx/Kconfig | 41 +++++++++++++++++++++++++++++++++++++++++ - board/xilinx/zynq/Makefile | 10 +++++++++- - board/xilinx/zynqmp/Makefile | 10 +++++++++- - 4 files changed, 60 insertions(+), 2 deletions(-) - create mode 100644 board/xilinx/Kconfig - -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 22234cde2ab6..e04979d0ef7e 100644 ---- a/arch/arm/Kconfig -+++ b/arch/arm/Kconfig -@@ -1293,4 +1293,5 @@ source "board/technologic/ts4600/Kconfig" - source "board/vscom/baltos/Kconfig" - source "board/woodburn/Kconfig" - source "board/work-microwave/work_92105/Kconfig" -+source "board/xilinx/Kconfig" - source "board/zipitz2/Kconfig" - - source "arch/arm/Kconfig.debug" -diff --git a/board/xilinx/Kconfig b/board/xilinx/Kconfig -new file mode 100644 -index 000000000000..aa3fa061edef ---- /dev/null -+++ b/board/xilinx/Kconfig -@@ -0,0 +1,41 @@ -+# Copyright (c) 2018, Luca Ceresoli -+# -+# SPDX-License-Identifier: GPL-2.0 -+ -+if ARCH_ZYNQ || ARCH_ZYNQMP -+ -+config XILINX_PS_INIT_FILE -+ string "Zynq/ZynqMP PS init file(s) location" -+ help -+ On Zynq and ZynqMP U-Boot SPL (or U-Boot proper if -+ ZYNQMP_PSU_INIT_ENABLED is set) is responsible for some -+ basic initializations, such as enabling peripherals and -+ configuring pinmuxes. The PS init file (called -+ psu_init_gpl.c on ZynqMP, ps7_init_gpl.c for Zynq-7000) -+ contains the code for such initializations. -+ -+ U-Boot contains PS init files for some boards, but each of -+ them describes only one specific configuration. Users of a -+ different board, or needing a different configuration, can -+ generate custom files using the Xilinx development tools. -+ -+ There are three ways to give a PS init file to U-Boot: -+ -+ 1. Set this variable to the path, either relative to the -+ source tree or absolute, where the psu_init_gpl.c or -+ ps7_init_gpl.c file is located. U-Boot will build this -+ file. -+ -+ 2. If you leave an empty string here, U-Boot will use -+ board/xilinx/zynq/$(CONFIG_DEFAULT_DEVICE_TREE)/ps7_init_gpl.c -+ for Zynq-7000, or -+ board/xilinx/zynqmp/$(CONFIG_DEFAULT_DEVICE_TREE)/psu_init_gpl.c -+ for ZynqMP. -+ -+ 3. If the above file does not exist, U-Boot will use -+ board/xilinx/zynq/ps7_init_gpl.c for Zynq-7000, or -+ board/xilinx/zynqmp/psu_init_gpl.c for ZynqMP. This file -+ is not provided by U-Boot, you have to copy it there -+ before the build. -+ -+endif -diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile -index 5a76a26720cd..03ad5f0532ee 100644 ---- a/board/xilinx/zynq/Makefile -+++ b/board/xilinx/zynq/Makefile -@@ -5,10 +5,18 @@ - - obj-y := board.o - --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE)) -+init-objs := ps_init_gpl.o -+spl/board/xilinx/zynq/ps_init_gpl.o board/xilinx/zynq/ps_init_gpl.o: $(PS_INIT_FILE) -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ -+endif - -+ifeq ($(init-objs),) -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/ps7_init_gpl.c),\ - $(hw-platform-y)/ps7_init_gpl.o) -+endif - - ifeq ($(init-objs),) - ifneq ($(wildcard $(srctree)/$(src)/ps7_init_gpl.c),) -diff --git a/board/xilinx/zynqmp/Makefile b/board/xilinx/zynqmp/Makefile -index 05ccd25dcef3..960b81fc5853 100644 ---- a/board/xilinx/zynqmp/Makefile -+++ b/board/xilinx/zynqmp/Makefile -@@ -5,10 +5,18 @@ - - obj-y := zynqmp.o - --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE)) -+init-objs := ps_init_gpl.o -+spl/board/xilinx/zynqmp/ps_init_gpl.o board/xilinx/zynqmp/ps_init_gpl.o: $(PS_INIT_FILE) -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ -+endif - -+ifeq ($(init-objs),) -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/psu_init_gpl.c),\ - $(hw-platform-y)/psu_init_gpl.o) -+endif - - ifeq ($(init-objs),) - ifneq ($(wildcard $(srctree)/$(src)/psu_init_gpl.c),) --- -2.7.4 - diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig new file mode 100644 index 0000000000..336f5c2dbe --- /dev/null +++ b/configs/zynqmp_zcu102_defconfig @@ -0,0 +1,35 @@ +BR2_aarch64=y +BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2" +BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.4_2021.2" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" +BR2_TARGET_UBOOT_ZYNQMP=y +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/master/bin/pmufw-v2021.2.bin" +BR2_TARGET_UBOOT_FORMAT_ITB=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index bee7c1daf7..3a6947e1e8 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -1,11 +1,11 @@ BR2_aarch64=y BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" @@ -14,21 +14,22 @@ BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.4_2021.2" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/53fdb7b6c92860ceb0ec5fd14deee302f4a84269/bin/pmufw-zcu106-default-v2017.4.bin" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/master/bin/pmufw-v2021.2.bin" +BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -- 2.17.1 From Alexey.Brodkin at synopsys.com Wed Feb 2 17:00:00 2022 From: Alexey.Brodkin at synopsys.com (Alexey Brodkin) Date: Wed, 2 Feb 2022 17:00:00 +0000 Subject: [Buildroot] [PATCHv2] package/glibc: allow runing on kernels older than used for the headers In-Reply-To: <19291_1643809720_61FA8BB8_19291_487_24_41ca9ce22939ce2ed0c41973db7d612542850824.1643809712.git.yann.morin@orange.com> References: <19291_1643809720_61FA8BB8_19291_487_24_41ca9ce22939ce2ed0c41973db7d612542850824.1643809712.git.yann.morin@orange.com> Message-ID: Hi Yann, > We add an option to glibc to allow the user to enable compatibility > shims. To simplify the case, when that option is enabled, we just let > glibc enable as old compatibility shims as supported by the current > architecture. Looks reasonable to me. I mean to not have all the flexibility proposed initially, instead adding an option to fall back to something much older compared to used headers. If more options are needed later, we'll get to know it at some point ;) And thanks for doing that, as I meant to do something similar a while ago, but never posted my local changes. -Alexey From giulio.benetti at benettiengineering.com Wed Feb 2 17:10:34 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 2 Feb 2022 18:10:34 +0100 Subject: [Buildroot] [PATCH] configs/pcengines_apu2_defconfig: linux needs host libelf Message-ID: <20220202171035.1740791-1-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- configs/pcengines_apu2_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/pcengines_apu2_defconfig b/configs/pcengines_apu2_defconfig index 0792c93c19..a85808554c 100644 --- a/configs/pcengines_apu2_defconfig +++ b/configs/pcengines_apu2_defconfig @@ -8,6 +8,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION=y 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" +BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y # Default hostname and TTY BR2_TARGET_GENERIC_HOSTNAME="apu2" -- 2.25.1 From giulio.benetti at benettiengineering.com Wed Feb 2 17:10:35 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 2 Feb 2022 18:10:35 +0100 Subject: [Buildroot] [PATCH] configs/roc_pc_rk3399_defconfig: expand rootfs size to 120M In-Reply-To: <20220202171035.1740791-1-giulio.benetti@benettiengineering.com> References: <20220202171035.1740791-1-giulio.benetti@benettiengineering.com> Message-ID: <20220202171035.1740791-2-giulio.benetti@benettiengineering.com> Default 60M for rootfs are not enough and generate a build failure, so let's expand rootfs size to 120M. Signed-off-by: Giulio Benetti --- configs/roc_pc_rk3399_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/roc_pc_rk3399_defconfig b/configs/roc_pc_rk3399_defconfig index dfbc5e4f47..ae7cf19a80 100644 --- a/configs/roc_pc_rk3399_defconfig +++ b/configs/roc_pc_rk3399_defconfig @@ -45,7 +45,7 @@ BR2_TARGET_GENERIC_HOSTNAME="roc-rk3399-pc" BR2_TARGET_GENERIC_ISSUE="Welcome to ROC-RK3399-PC!" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="64M" +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -- 2.25.1 From fontaine.fabrice at gmail.com Wed Feb 2 17:33:06 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 2 Feb 2022 18:33:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/sconeserver: fix build with icu and libxml2 Message-ID: <20220202173306.42559-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since addition of icu support in libxml2 through commit 49d7c85421e87d9d762be9352805cb47a2f0bbeb: In file included from /home/peko/autobuild/instance-1/output-1/host/mips64el-buildroot-linux-gnu/sysroot/usr/include/unicode/ptypes.h:52:0, from /home/peko/autobuild/instance-1/output-1/host/mips64el-buildroot-linux-gnu/sysroot/usr/include/unicode/umachine.h:46, from /home/peko/autobuild/instance-1/output-1/host/mips64el-buildroot-linux-gnu/sysroot/usr/include/unicode/utypes.h:38, from /home/peko/autobuild/instance-1/output-1/host/mips64el-buildroot-linux-gnu/sysroot/usr/include/unicode/ucnv_err.h:88, from /home/peko/autobuild/instance-1/output-1/host/mips64el-buildroot-linux-gnu/sysroot/usr/include/unicode/ucnv.h:51, from /home/peko/autobuild/instance-1/output-1/host/mips64el-buildroot-linux-gnu/sysroot/usr/bin/../../usr/include/libxml2/libxml/encoding.h:31, from /home/peko/autobuild/instance-1/output-1/host/mips64el-buildroot-linux-gnu/sysroot/usr/bin/../../usr/include/libxml2/libxml/parser.h:812, from conftest.cpp:61: /home/peko/autobuild/instance-1/output-1/host/mips64el-buildroot-linux-gnu/sysroot/usr/include/unicode/localpointer.h:224:41: error: 'noexcept' does not name a type LocalPointer(LocalPointer &&src) U_NOEXCEPT : LocalPointerBase(src.ptr) { ^ /home/peko/autobuild/instance-1/output-1/host/mips64el-buildroot-linux-gnu/sysroot/usr/include/unicode/localpointer.h:224:41: note: C++11 'noexcept' only available with -std=c++11 or -std=gnu++11 Fixes: - http://autobuild.buildroot.org/results/be043792e6e5501631517881b10096291a654364 Signed-off-by: Fabrice Fontaine --- package/sconeserver/sconeserver.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/sconeserver/sconeserver.mk b/package/sconeserver/sconeserver.mk index 17407c29f5..2b28f8015c 100644 --- a/package/sconeserver/sconeserver.mk +++ b/package/sconeserver/sconeserver.mk @@ -29,6 +29,8 @@ SCONESERVER_CONF_OPTS += \ ifeq ($(BR2_PACKAGE_LIBXML2),y) SCONESERVER_CONF_OPTS += \ --with-xml2-config="$(STAGING_DIR)/usr/bin/xml2-config" +# Needed to fix build failure when icu is enabled in libxml2 +SCONESERVER_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" endif ifeq ($(BR2_PACKAGE_OPENSSL),y) -- 2.34.1 From festevam at gmail.com Wed Feb 2 17:49:48 2022 From: festevam at gmail.com (Fabio Estevam) Date: Wed, 2 Feb 2022 14:49:48 -0300 Subject: [Buildroot] [PATCH] configs/warp7: bump Kernel and U-Boot version Message-ID: <20220202174948.1919945-1-festevam@gmail.com> Bump U-Boot to 2022.01 and kernel to version 5.16.5. Signed-off-by: Fabio Estevam --- configs/warp7_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig index 5fca9f6cfc..04dfc94f7d 100644 --- a/configs/warp7_defconfig +++ b/configs/warp7_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 5.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +# Linux headers same as kernel, a 5.16 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -15,7 +15,7 @@ BR2_ROOTFS_OVERLAY="board/warp7/rootfs_overlay" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.14" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16.5" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7s-warp" @@ -25,7 +25,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="warp7" 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_FORMAT_DTB_IMX=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y -- 2.25.1 From petr.vorel at gmail.com Wed Feb 2 18:25:13 2022 From: petr.vorel at gmail.com (Petr Vorel) Date: Wed, 2 Feb 2022 19:25:13 +0100 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: Hi, gentle ping for a review. Kind regards, Petr > 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" From james.hilliard1 at gmail.com Wed Feb 2 19:39:20 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 2 Feb 2022 12:39:20 -0700 Subject: [Buildroot] [PATCH 1/1] package:{clang, lld, llvm}: bump to version 11.1.0 In-Reply-To: <731c2ec5-e693-f2d4-5f48-0eaf376c57d1@smile.fr> References: <20220131015937.4113728-1-james.hilliard1@gmail.com> <20220131104553.715b97ce@windsurf> <731c2ec5-e693-f2d4-5f48-0eaf376c57d1@smile.fr> Message-ID: On Mon, Jan 31, 2022 at 4:36 AM Romain Naour wrote: > > Hello James, Thomas, All, > > Le 31/01/2022 ? 10:45, Thomas Petazzoni via buildroot a ?crit : > > On Sun, 30 Jan 2022 18:59:37 -0700 > > James Hilliard wrote: > > > >> This appears to be the latest version that has a working lld build. > >> > >> Version 12.0.0 and newer have broken lld stand-alone builds: > >> https://bugs.llvm.org/show_bug.cgi?id=49228 > >> > >> Signed-off-by: James Hilliard > > > > Is this really enough? I remember seeing patches a long time ago doing > > bumps on LLVM/Clang and that was much more involved, which I think > > explains why we're still at version 9.x. > > > > Romain, any comments on this? > > Adding Matt in Cc: > > IIRC, there is an issue with libclc package which is part of the llvm project. > > Due to the gap between the two version, all CMake options must be reviewed (long > and boring task I agree). Oh, I guess there was already a series here with more changes: https://patchwork.ozlabs.org/project/buildroot/list/?series=233431&submitter=&state=*&q=&archive=both&delegate= > > Best regards, > Romain > > > > > Thomas > From james.hilliard1 at gmail.com Wed Feb 2 20:34:11 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 2 Feb 2022 13:34:11 -0700 Subject: [Buildroot] [PATCH 1/1] package/python3-setuptools: bump to version 60.7.0 Message-ID: <20220202203411.150459-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-setuptools/60.6.0/python-setuptools.hash | 4 ---- .../{60.6.0 => 60.7.0}/0001-add-executable.patch | 0 package/python-setuptools/60.7.0/python-setuptools.hash | 4 ++++ package/python-setuptools/python-setuptools.mk | 4 ++-- package/python3-setuptools/0001-add-executable.patch | 2 +- package/python3-setuptools/python3-setuptools.hash | 2 +- package/python3-setuptools/python3-setuptools.mk | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 package/python-setuptools/60.6.0/python-setuptools.hash rename package/python-setuptools/{60.6.0 => 60.7.0}/0001-add-executable.patch (100%) create mode 100644 package/python-setuptools/60.7.0/python-setuptools.hash diff --git a/package/python-setuptools/60.6.0/python-setuptools.hash b/package/python-setuptools/60.6.0/python-setuptools.hash deleted file mode 100644 index 734cb4d580..0000000000 --- a/package/python-setuptools/60.6.0/python-setuptools.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From https://pypi.org/pypi/setuptools/json -md5 392e91d7e244998c586c88da2cf881d3 setuptools-60.6.0.tar.gz -sha256 eb83b1012ae6bf436901c2a2cee35d45b7260f31fd4b65fd1e50a9f99c11d7f8 setuptools-60.6.0.tar.gz -sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE diff --git a/package/python-setuptools/60.6.0/0001-add-executable.patch b/package/python-setuptools/60.7.0/0001-add-executable.patch similarity index 100% rename from package/python-setuptools/60.6.0/0001-add-executable.patch rename to package/python-setuptools/60.7.0/0001-add-executable.patch diff --git a/package/python-setuptools/60.7.0/python-setuptools.hash b/package/python-setuptools/60.7.0/python-setuptools.hash new file mode 100644 index 0000000000..8df7155d4c --- /dev/null +++ b/package/python-setuptools/60.7.0/python-setuptools.hash @@ -0,0 +1,4 @@ +# From https://pypi.org/pypi/setuptools/json +md5 082637e8fbc2e1fd9c637665d8fcccd8 setuptools-60.7.0.tar.gz +sha256 b83cf328a4f6a987c95610e76b29a30778db05174eef71f771776c48f8f25d1b setuptools-60.7.0.tar.gz +sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk index 15912d96f5..8bca852fe2 100644 --- a/package/python-setuptools/python-setuptools.mk +++ b/package/python-setuptools/python-setuptools.mk @@ -9,9 +9,9 @@ ifeq ($(BR2_PACKAGE_PYTHON3),y) # Please keep in sync with # package/python3-setuptools/python3-setuptools.mk -PYTHON_SETUPTOOLS_VERSION = 60.6.0 +PYTHON_SETUPTOOLS_VERSION = 60.7.0 PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON3_SETUPTOOLS_VERSION).tar.gz -PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/8f/89/9fec81ec84737c925a1ee992af2c6c7153aec4051c26afeadd6b822354d2 +PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/29/dd/48d662bb93e5e51e72265ef612f869947d4ae4126328d7156824cd50d440 else # Python PYTHON_SETUPTOOLS_VERSION = 44.0.0 PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).zip diff --git a/package/python3-setuptools/0001-add-executable.patch b/package/python3-setuptools/0001-add-executable.patch index 9d608239bc..46b5935d33 120000 --- a/package/python3-setuptools/0001-add-executable.patch +++ b/package/python3-setuptools/0001-add-executable.patch @@ -1 +1 @@ -../python-setuptools/60.6.0/0001-add-executable.patch \ No newline at end of file +../python-setuptools/60.7.0/0001-add-executable.patch \ No newline at end of file diff --git a/package/python3-setuptools/python3-setuptools.hash b/package/python3-setuptools/python3-setuptools.hash index 9fb96015aa..2c9d3614d5 120000 --- a/package/python3-setuptools/python3-setuptools.hash +++ b/package/python3-setuptools/python3-setuptools.hash @@ -1 +1 @@ -../python-setuptools/60.6.0/python-setuptools.hash \ No newline at end of file +../python-setuptools/60.7.0/python-setuptools.hash \ No newline at end of file diff --git a/package/python3-setuptools/python3-setuptools.mk b/package/python3-setuptools/python3-setuptools.mk index 55a01dba01..d5aaa01918 100644 --- a/package/python3-setuptools/python3-setuptools.mk +++ b/package/python3-setuptools/python3-setuptools.mk @@ -6,9 +6,9 @@ # Please keep in sync with # package/python-setuptools/python-setuptools.mk -PYTHON3_SETUPTOOLS_VERSION = 60.6.0 +PYTHON3_SETUPTOOLS_VERSION = 60.7.0 PYTHON3_SETUPTOOLS_SOURCE = setuptools-$(PYTHON3_SETUPTOOLS_VERSION).tar.gz -PYTHON3_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/8f/89/9fec81ec84737c925a1ee992af2c6c7153aec4051c26afeadd6b822354d2 +PYTHON3_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/29/dd/48d662bb93e5e51e72265ef612f869947d4ae4126328d7156824cd50d440 PYTHON3_SETUPTOOLS_LICENSE = MIT PYTHON3_SETUPTOOLS_LICENSE_FILES = LICENSE PYTHON3_SETUPTOOLS_CPE_ID_VENDOR = python -- 2.25.1 From giulio.benetti at benettiengineering.com Wed Feb 2 20:37:25 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 2 Feb 2022 21:37:25 +0100 Subject: [Buildroot] [PATCH] package/cryptsetup: fix build failure with Microblaze Message-ID: <20220202203725.2115889-1-giulio.benetti@benettiengineering.com> Add local patch pending upstream[1] to fix the build failure after my suggestion[2] to imitate what I've done with libfuse[3]. [1]: https://gitlab.com/cryptsetup/cryptsetup/-/merge_requests/275?commit_id=5f71b3d63181aa88a68f7f71eab8801f2d8d2cde [2]: https://gitlab.com/cryptsetup/cryptsetup/-/issues/709 [3]: https://github.com/libfuse/libfuse/pull/620/commits/3aba09a5c56e017746c5c1652dbc845f4db7374a Fixes: http://autobuild.buildroot.net/results/bad/bad4d01fde3191e4d481a8e9dae18df3b1a94537/ Signed-off-by: Giulio Benetti --- ...d-check-program-for-symver-attribute.patch | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 package/cryptsetup/0001-Add-check-program-for-symver-attribute.patch diff --git a/package/cryptsetup/0001-Add-check-program-for-symver-attribute.patch b/package/cryptsetup/0001-Add-check-program-for-symver-attribute.patch new file mode 100644 index 0000000000..04f59a2050 --- /dev/null +++ b/package/cryptsetup/0001-Add-check-program-for-symver-attribute.patch @@ -0,0 +1,56 @@ +From 7c6ec620de3f99d4212f4a54aa576df1b97020ab Mon Sep 17 00:00:00 2001 +From: Ondrej Kozina +Date: Wed, 2 Feb 2022 11:34:57 +0100 +Subject: [PATCH] Add check program for symver attribute. + +Fixes: #709. +Signed-off-by: Giulio Benetti +--- + configure.ac | 11 +++++++++++ + lib/libcryptsetup_symver.h | 8 +++----- + 2 files changed, 14 insertions(+), 5 deletions(-) + +diff --git a/configure.ac b/configure.ac +index a0e5990d..b052f8cf 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -554,6 +554,17 @@ if test "x$enable_static_cryptsetup" = "xyes"; then + PKG_CONFIG=$saved_PKG_CONFIG + fi + ++dnl Check compiler support for symver function attribute ++saved_CFLAGS=$CFLAGS ++CFLAGS="-O0 -Werror" ++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ++ void _test_sym(void); ++ __attribute__((__symver__("sym at VERSION_4.2"))) void _test_sym(void) {} ++]], ++[[ _test_sym() ]] ++)],[ AC_DEFINE([HAVE_ATTRIBUTE_SYMVER], 1, [Define to 1 to use __attribute__((symver))])]) ++CFLAGS=$saved_CFLAGS ++ + AC_MSG_CHECKING([for systemd tmpfiles config directory]) + PKG_CHECK_VAR([systemd_tmpfilesdir], [systemd], [tmpfilesdir], [], [systemd_tmpfilesdir=no]) + AC_MSG_RESULT([$systemd_tmpfilesdir]) +diff --git a/lib/libcryptsetup_symver.h b/lib/libcryptsetup_symver.h +index 2a804b6a..3558310d 100644 +--- a/lib/libcryptsetup_symver.h ++++ b/lib/libcryptsetup_symver.h +@@ -67,11 +67,9 @@ + * under CRYPT_SYMBOL_EXPORT_OLD(int, crypt_func_X, ...) macro + */ + +-#ifdef __has_attribute +-# if __has_attribute(symver) +-# define _CRYPT_SYMVER(_local_sym, _public_sym, _ver_str, _maj, _min) \ +- __attribute__((__symver__(#_public_sym _ver_str #_maj "." #_min))) +-# endif ++#if HAVE_ATTRIBUTE_SYMVER ++# define _CRYPT_SYMVER(_local_sym, _public_sym, _ver_str, _maj, _min) \ ++ __attribute__((__symver__(#_public_sym _ver_str #_maj "." #_min))) + #endif + + #if !defined(_CRYPT_SYMVER) && defined(__GNUC__) +-- +2.25.1 + -- 2.25.1 From ps.report at gmx.net Wed Feb 2 20:37:46 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 2 Feb 2022 21:37:46 +0100 Subject: [Buildroot] [PATCH v2] package/util-linux: bump version to 2.37.3 (fixes CVE-2021-3996, CVE-2021-3995) In-Reply-To: References: <20220125221533.17535-1-ps.report@gmx.net> Message-ID: <20220202213746.779fee61@gmx.net> Hello Arnout, On Tue, 1 Feb 2022 23:00:06 +0100, Arnout Vandecappelle wrote: > On 25/01/2022 23:15, Peter Seiderer wrote: > > - add 'touch' workaround for missing disk-utils/raw.8 file ([1], [2]) in > > util-linux-2.37.4 release download package > > 2.37.3 I assume. Yes... > > > > > For details see [1]. > > > > [1] https://www.spinics.net/lists/util-linux-ng/msg17037.html This reference should be [3] and the links for [1] and [2] are missing: [1] https://github.com/util-linux/util-linux/issues/1579 [2] https://github.com/util-linux/util-linux/issues/1577 > > > > 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 > > 2.37.3 as well. Yes... > > I moved this hunk to the beginning of the file, to increase the chance that it > is noticed on next bump (which hopefully makes it unneeded). > > > +# 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 > > I moved this to a post-patch instead of pre-build hook. > > > Applied to master, thanks. Thanks for cleaning up my mess... Regards, Peter > > Regards, > Arnout > > > + > > # Install PAM configuration files > > ifeq ($(BR2_PACKAGE_UTIL_LINUX_SU)$(BR2_PACKAGE_LINUX_PAM),yy) > > define UTIL_LINUX_INSTALL_PAMFILES > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From ps.report at gmx.net Wed Feb 2 20:42:10 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 2 Feb 2022 21:42:10 +0100 Subject: [Buildroot] [URGENT 1/1] package/util-linux: fix host build failure In-Reply-To: References: <20220201232203.333403-1-giulio.benetti@benettiengineering.com> <20220201232203.333403-2-giulio.benetti@benettiengineering.com> Message-ID: <20220202214210.0a2483e6@gmx.net> Hello Arnout, Giulio, On Wed, 2 Feb 2022 08:41:34 +0100, Arnout Vandecappelle wrote: > On 02/02/2022 00:22, Giulio Benetti wrote: > > The UTIL_LINUX_FIX_DISK_UTILS_COMPILE workaround is needed for host > > building too. So let's add it to HOST_UTIL_LINUX_POST_PATCH_HOOKS. > > host-util-linux is used a lot, so this patch fixes a lot of future > > builds. > > Darn, I tested that, both with and without BR2_PACKAGE_HOST_UTIL_LINUX set. I > don't understand what went wrong in my test... The raw support depends on the available toolchain headers, see e.g. package/util-linux/Config.in: config BR2_PACKAGE_UTIL_LINUX_RAW bool "raw" depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_14 help Build a linux raw character device Or according to [1] '--disable-raw' for the host build should do the trick too... Regards, Peter [1] https://github.com/util-linux/util-linux/issues/1577 > > Anyway, applied to master, thanks. > > Regards, > Arnout > > > > > > Signed-off-by: Giulio Benetti > > --- > > package/util-linux/util-linux.mk | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk > > index e59ef7dadc..5a4ff64d01 100644 > > --- a/package/util-linux/util-linux.mk > > +++ b/package/util-linux/util-linux.mk > > @@ -41,6 +41,7 @@ define UTIL_LINUX_FIX_DISK_UTILS_COMPILE > > touch $(@D)/disk-utils/raw.8 > > endef > > UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE > > +HOST_UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE > > > > HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf > > From giulio.benetti at benettiengineering.com Wed Feb 2 21:09:22 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 2 Feb 2022 22:09:22 +0100 Subject: [Buildroot] [URGENT 1/1] package/util-linux: fix host build failure In-Reply-To: <20220202214210.0a2483e6@gmx.net> References: <20220201232203.333403-1-giulio.benetti@benettiengineering.com> <20220201232203.333403-2-giulio.benetti@benettiengineering.com> <20220202214210.0a2483e6@gmx.net> Message-ID: <48ab9669-d467-a394-12a2-fd229f6229f0@benettiengineering.com> Hi Peter, On 02/02/22 21:42, Peter Seiderer wrote: > Hello Arnout, Giulio, > > On Wed, 2 Feb 2022 08:41:34 +0100, Arnout Vandecappelle wrote: > >> On 02/02/2022 00:22, Giulio Benetti wrote: >>> The UTIL_LINUX_FIX_DISK_UTILS_COMPILE workaround is needed for host >>> building too. So let's add it to HOST_UTIL_LINUX_POST_PATCH_HOOKS. >>> host-util-linux is used a lot, so this patch fixes a lot of future >>> builds. >> >> Darn, I tested that, both with and without BR2_PACKAGE_HOST_UTIL_LINUX set. I >> don't understand what went wrong in my test... > > The raw support depends on the available toolchain headers, see e.g. > package/util-linux/Config.in: > > config BR2_PACKAGE_UTIL_LINUX_RAW > bool "raw" > depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_14 > help > Build a linux raw character device > > Or according to [1] '--disable-raw' for the host build should do > the trick too... I was in hurry to produce the patch last night, so I went for the fastest way. Can you give a try with --disable-raw and eventually submit the patch? That would save some time while building. Also because host-util-linux is used a lot Thank you! Best regards -- Giulio Benetti Benetti Engineering sas > Regards, > Peter > > [1] https://github.com/util-linux/util-linux/issues/1577 > >> >> Anyway, applied to master, thanks. >> >> Regards, >> Arnout >> >> >>> >>> Signed-off-by: Giulio Benetti >>> --- >>> package/util-linux/util-linux.mk | 1 + >>> 1 file changed, 1 insertion(+) >>> >>> diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk >>> index e59ef7dadc..5a4ff64d01 100644 >>> --- a/package/util-linux/util-linux.mk >>> +++ b/package/util-linux/util-linux.mk >>> @@ -41,6 +41,7 @@ define UTIL_LINUX_FIX_DISK_UTILS_COMPILE >>> touch $(@D)/disk-utils/raw.8 >>> endef >>> UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE >>> +HOST_UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE >>> >>> HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf >>> > From ps.report at gmx.net Wed Feb 2 21:40:46 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 2 Feb 2022 22:40:46 +0100 Subject: [Buildroot] [URGENT 1/1] package/util-linux: fix host build failure In-Reply-To: <48ab9669-d467-a394-12a2-fd229f6229f0@benettiengineering.com> References: <20220201232203.333403-1-giulio.benetti@benettiengineering.com> <20220201232203.333403-2-giulio.benetti@benettiengineering.com> <20220202214210.0a2483e6@gmx.net> <48ab9669-d467-a394-12a2-fd229f6229f0@benettiengineering.com> Message-ID: <20220202224046.1ccef19a@gmx.net> Hello Giulio, On Wed, 2 Feb 2022 22:09:22 +0100, Giulio Benetti wrote: > Hi Peter, > > On 02/02/22 21:42, Peter Seiderer wrote: > > Hello Arnout, Giulio, > > > > On Wed, 2 Feb 2022 08:41:34 +0100, Arnout Vandecappelle wrote: > > > >> On 02/02/2022 00:22, Giulio Benetti wrote: > >>> The UTIL_LINUX_FIX_DISK_UTILS_COMPILE workaround is needed for host > >>> building too. So let's add it to HOST_UTIL_LINUX_POST_PATCH_HOOKS. > >>> host-util-linux is used a lot, so this patch fixes a lot of future > >>> builds. > >> > >> Darn, I tested that, both with and without BR2_PACKAGE_HOST_UTIL_LINUX set. I > >> don't understand what went wrong in my test... > > > > The raw support depends on the available toolchain headers, see e.g. > > package/util-linux/Config.in: > > > > config BR2_PACKAGE_UTIL_LINUX_RAW > > bool "raw" > > depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_14 > > help > > Build a linux raw character device > > > > Or according to [1] '--disable-raw' for the host build should do > > the trick too... > > I was in hurry to produce the patch last night, so I went for the > fastest way. Can you give a try with --disable-raw and eventually submit Thanks for taking care! > the patch? That would save some time while building. Also because > host-util-linux is used a lot Sorry, could not reproduce the host-build failure on my system, seems the toolchain is too up-to-date (openSUSE Tumbleweed - gcc-11.2.1) ;-) But can provide an RFC patch for testing... Regards, Peter > > Thank you! > Best regards From giulio.benetti at benettiengineering.com Wed Feb 2 21:43:57 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 2 Feb 2022 22:43:57 +0100 Subject: [Buildroot] [PATCH] board/intel/galileo: fix build failure with host gcc 10 Message-ID: <20220202214357.2640301-1-giulio.benetti@benettiengineering.com> Building galileo_defconfig throws error: ``` /usr/bin/ld: arch/x86/tools/relocs_64.o:(.bss+0x0): multiple definition of `per_cpu_load_addr'; arch/x86/tools/relocs_32.o:(.bss+0x0): first defined here ``` To fix this let's add an upstreamed patch[1] and add BR2_GLOBAL_PATCH_DIR to galileo_defconfig to point to where patch is. [1]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=eeeda4cd06e828b331b15741a204ff9f5874d28d.patch Fixes: https://gitlab.com/ymorin/buildroot/-/jobs/2035821039 Signed-off-by: Giulio Benetti --- ...relocs-Make-per_cpu_load_addr-static.patch | 39 +++++++++++++++++++ configs/galileo_defconfig | 1 + 2 files changed, 40 insertions(+) create mode 100644 board/intel/galileo/patches/linux/0001-x86-relocs-Make-per_cpu_load_addr-static.patch diff --git a/board/intel/galileo/patches/linux/0001-x86-relocs-Make-per_cpu_load_addr-static.patch b/board/intel/galileo/patches/linux/0001-x86-relocs-Make-per_cpu_load_addr-static.patch new file mode 100644 index 0000000000..1d206cc6d1 --- /dev/null +++ b/board/intel/galileo/patches/linux/0001-x86-relocs-Make-per_cpu_load_addr-static.patch @@ -0,0 +1,39 @@ +From eeeda4cd06e828b331b15741a204ff9f5874d28d Mon Sep 17 00:00:00 2001 +From: Ben Hutchings +Date: Wed, 24 Sep 2014 13:30:12 +0100 +Subject: [PATCH] x86/relocs: Make per_cpu_load_addr static + +per_cpu_load_addr is only used for 64-bit relocations, but is +declared in both configurations of relocs.c - with different +types. This has undefined behaviour in general. GNU ld is +documented to use the larger size in this case, but other tools +may differ and some warn about this. + +References: https://bugs.debian.org/748577 +Reported-by: Michael Tautschnig +Signed-off-by: Ben Hutchings +Cc: 748577 at bugs.debian.org +Cc: Linus Torvalds +Link: http://lkml.kernel.org/r/1411561812.3659.23.camel at decadent.org.uk +Signed-off-by: Ingo Molnar +Signed-off-by: Giulio Benetti +--- + arch/x86/tools/relocs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c +index bbb1d2259ecf..a5efb21d5228 100644 +--- a/arch/x86/tools/relocs.c ++++ b/arch/x86/tools/relocs.c +@@ -695,7 +695,7 @@ static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel, + * + */ + static int per_cpu_shndx = -1; +-Elf_Addr per_cpu_load_addr; ++static Elf_Addr per_cpu_load_addr; + + static void percpu_init(void) + { +-- +2.25.1 + diff --git a/configs/galileo_defconfig b/configs/galileo_defconfig index 03ca23f414..a8fd0a6dcc 100644 --- a/configs/galileo_defconfig +++ b/configs/galileo_defconfig @@ -1,4 +1,5 @@ BR2_x86_x1000=y +BR2_GLOBAL_PATCH_DIR=board/intel/galileo/patches # Needed for TARGET_GRUB2 BR2_TOOLCHAIN_BUILDROOT_WCHAR=y # Linux headers same as kernel, a 3.14 series -- 2.25.1 From giulio.benetti at benettiengineering.com Wed Feb 2 21:54:18 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 2 Feb 2022 22:54:18 +0100 Subject: [Buildroot] [URGENT 1/1] package/util-linux: fix host build failure In-Reply-To: <20220202224046.1ccef19a@gmx.net> References: <20220201232203.333403-1-giulio.benetti@benettiengineering.com> <20220201232203.333403-2-giulio.benetti@benettiengineering.com> <20220202214210.0a2483e6@gmx.net> <48ab9669-d467-a394-12a2-fd229f6229f0@benettiengineering.com> <20220202224046.1ccef19a@gmx.net> Message-ID: <412baee3-b818-521a-99bf-ee868d3e1be2@benettiengineering.com> On 02/02/22 22:40, Peter Seiderer wrote: > Hello Giulio, > > On Wed, 2 Feb 2022 22:09:22 +0100, Giulio Benetti wrote: > >> Hi Peter, >> >> On 02/02/22 21:42, Peter Seiderer wrote: >>> Hello Arnout, Giulio, >>> >>> On Wed, 2 Feb 2022 08:41:34 +0100, Arnout Vandecappelle wrote: >>> >>>> On 02/02/2022 00:22, Giulio Benetti wrote: >>>>> The UTIL_LINUX_FIX_DISK_UTILS_COMPILE workaround is needed for host >>>>> building too. So let's add it to HOST_UTIL_LINUX_POST_PATCH_HOOKS. >>>>> host-util-linux is used a lot, so this patch fixes a lot of future >>>>> builds. >>>> >>>> Darn, I tested that, both with and without BR2_PACKAGE_HOST_UTIL_LINUX set. I >>>> don't understand what went wrong in my test... >>> >>> The raw support depends on the available toolchain headers, see e.g. >>> package/util-linux/Config.in: >>> >>> config BR2_PACKAGE_UTIL_LINUX_RAW >>> bool "raw" >>> depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_14 >>> help >>> Build a linux raw character device >>> >>> Or according to [1] '--disable-raw' for the host build should do >>> the trick too... >> >> I was in hurry to produce the patch last night, so I went for the >> fastest way. Can you give a try with --disable-raw and eventually submit > > Thanks for taking care! > >> the patch? That would save some time while building. Also because >> host-util-linux is used a lot > > Sorry, could not reproduce the host-build failure on my system, seems the > toolchain is too up-to-date (openSUSE Tumbleweed - gcc-11.2.1) ;-) > > But can provide an RFC patch for testing... I give a go on my pc and if it works I add Suggested-by: Peter Seiderer Are you on IRC? If yes my nick is benettig you can ping me there :-) Best regards -- Giulio Benetti Benetti Engineering sas From giulio.benetti at benettiengineering.com Wed Feb 2 22:05:38 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 2 Feb 2022 23:05:38 +0100 Subject: [Buildroot] [PATCH] package/util-linux: improve host build failure fix In-Reply-To: <412baee3-b818-521a-99bf-ee868d3e1be2@benettiengineering.com> References: <412baee3-b818-521a-99bf-ee868d3e1be2@benettiengineering.com> Message-ID: <20220202220538.2858380-1-giulio.benetti@benettiengineering.com> As suggested by Peter Seiderer package util-linux doesn't need raw support when built for host, so let's remove: HOST_UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE in favor of: HOST_UTIL_LINUX_CONF_OPTS += --disable-raw This is a better approach than my commit: https://git.buildroot.net/buildroot/commit/?id=d895bd973b35fde10d3dd7db530d9e4782926497 Suggested-by: Peter Seiderer Signed-off-by: Giulio Benetti --- package/util-linux/util-linux.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 5a4ff64d01..f3297257cf 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -41,7 +41,6 @@ define UTIL_LINUX_FIX_DISK_UTILS_COMPILE touch $(@D)/disk-utils/raw.8 endef UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE -HOST_UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf @@ -49,7 +48,8 @@ HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf HOST_UTIL_LINUX_CONF_OPTS = \ --without-systemd \ --with-systemdsystemunitdir=no \ - --without-python + --without-python \ + --disable-raw ifneq ($(BR2_PACKAGE_UTIL_LINUX_BINARIES)$(BR2_PACKAGE_UTIL_LINUX_CRAMFS)$(BR2_PACKAGE_UTIL_LINUX_FSCK)$(BR2_PACKAGE_UTIL_LINUX_LOSETUP),) UTIL_LINUX_SELINUX_MODULES = fstools -- 2.25.1 From giulio.benetti at benettiengineering.com Wed Feb 2 22:10:59 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 2 Feb 2022 23:10:59 +0100 Subject: [Buildroot] [URGENT 1/1] package/util-linux: fix host build failure In-Reply-To: <20220202224046.1ccef19a@gmx.net> References: <20220201232203.333403-1-giulio.benetti@benettiengineering.com> <20220201232203.333403-2-giulio.benetti@benettiengineering.com> <20220202214210.0a2483e6@gmx.net> <48ab9669-d467-a394-12a2-fd229f6229f0@benettiengineering.com> <20220202224046.1ccef19a@gmx.net> Message-ID: <7f7bc01d-adb2-9ee9-e54c-0ef6736c83a0@benettiengineering.com> Hi Peter, On 02/02/22 22:40, Peter Seiderer wrote: > Hello Giulio, > > On Wed, 2 Feb 2022 22:09:22 +0100, Giulio Benetti wrote: > >> Hi Peter, >> >> On 02/02/22 21:42, Peter Seiderer wrote: >>> Hello Arnout, Giulio, >>> >>> On Wed, 2 Feb 2022 08:41:34 +0100, Arnout Vandecappelle wrote: >>> >>>> On 02/02/2022 00:22, Giulio Benetti wrote: >>>>> The UTIL_LINUX_FIX_DISK_UTILS_COMPILE workaround is needed for host >>>>> building too. So let's add it to HOST_UTIL_LINUX_POST_PATCH_HOOKS. >>>>> host-util-linux is used a lot, so this patch fixes a lot of future >>>>> builds. >>>> >>>> Darn, I tested that, both with and without BR2_PACKAGE_HOST_UTIL_LINUX set. I >>>> don't understand what went wrong in my test... >>> >>> The raw support depends on the available toolchain headers, see e.g. >>> package/util-linux/Config.in: >>> >>> config BR2_PACKAGE_UTIL_LINUX_RAW >>> bool "raw" >>> depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_14 >>> help >>> Build a linux raw character device >>> >>> Or according to [1] '--disable-raw' for the host build should do >>> the trick too... >> >> I was in hurry to produce the patch last night, so I went for the >> fastest way. Can you give a try with --disable-raw and eventually submit > > Thanks for taking care! I've just sent a patch like you've suggested: https://patchwork.ozlabs.org/project/buildroot/patch/20220202220538.2858380-1-giulio.benetti at benettiengineering.com/ >> the patch? That would save some time while building. Also because >> host-util-linux is used a lot > > Sorry, could not reproduce the host-build failure on my system, seems the > toolchain is too up-to-date (openSUSE Tumbleweed - gcc-11.2.1) ;-) For this situation you can use this docker: docker pull registry.gitlab.com/buildroot.org/buildroot/base:20220105.2314 There gcc is version 10.2.1 and it's the official one used for build-testing buildroot defconfigs. You can find it also in buildroot/.gitlab-ci.yml Can you give a go with that docker by reproducing the failure and then applying the latest patch? That way you can give a Reviewed-by: or also a Tested-by: you Thank you! Kind regards -- Giulio Benetti Benetti Engineering sas From giulio.benetti at benettiengineering.com Wed Feb 2 22:22:28 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 2 Feb 2022 23:22:28 +0100 Subject: [Buildroot] csky_gx6605s build failure Message-ID: Hi Guo, I'm dealing with gitlab-ci failures, including csky_gx6605s_defconfig. What is missing is basically the toolchain. Buildroot can't build a tooclahin for C-Sky at the moment(we should wait until gcc 12 if it will keep ck610 variant). So my idea would be to add an external toolchain your company could provide with a stable URL to make this defconfig to build successfully instead of dropping it. And once gcc 12 is released and added to Buildroot we can drop the external toolchain and use the Buildroot's one. What do you think? Best regards -- Giulio Benetti Benetti Engineering sas From luca at lucaceresoli.net Wed Feb 2 22:28:42 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Wed, 2 Feb 2022 23:28:42 +0100 Subject: [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2 In-Reply-To: <20220202165555.3497977-1-nealf@xilinx.com> References: <20220202165555.3497977-1-nealf@xilinx.com> Message-ID: Hi Neal, thank you for your effort and for sending a patch in the format that is the most convenient for other people to review your code. Your work seems generally in a good shape. I have several remarks, see below, but nothing really problematic. On 02/02/22 17:55, Neal Frager wrote: > Signed-off-by: Neal Frager Maybe you can add more details before the Signed-off-by line, suah as "Also add a defconfig for ZCU102", "remove U-Boot and ATF patches not upstream"... First issue: this defconfig does not build on my PC: $ git clean -xdf && make zynqmp_zcu106_defconfig && verynice make package/pkg-generic.mk:266: *** BR2_GLOBAL_PATCH_DIR contains nonexistent directory board/zynqmp/patches/. Stop. $ As you removed all patches (which is sooo gooood!) you now have to remove the BR2_GLOBAL_PATCH_DIR. > --- > board/zynqmp/genimage.cfg | 1 + > ...-fix-Remove-GGC-ignore-Warray-bounds.patch | 68 ------- > ...64-zynqmp-zcu106-fix-SPL-MMC-booting.patch | 52 ------ > ...2-arm64-zynqmp-Enable-booting-to-ATF.patch | 114 ------------ > ...ept-an-absolute-path-for-PMUFW_INIT_.patch | 68 ------- > ...ynqmp-pass-the-PS-init-file-as-a-kco.patch | 175 ------------------ > configs/zynqmp_zcu102_defconfig | 35 ++++ > configs/zynqmp_zcu106_defconfig | 15 +- > 8 files changed, 44 insertions(+), 484 deletions(-) > delete mode 100644 board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch > delete mode 100644 board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch > delete mode 100644 board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch > delete mode 100644 board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch > delete mode 100644 board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch > create mode 100644 configs/zynqmp_zcu102_defconfig > > diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg > index ed202f4550..557364e124 100644 > --- a/board/zynqmp/genimage.cfg > +++ b/board/zynqmp/genimage.cfg > @@ -3,6 +3,7 @@ image boot.vfat { > files = { > "boot.bin", > "u-boot.bin", > + "u-boot.itb", Is u-boot.bin still needed, when we have the .itb? > diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig > index bee7c1daf7..3a6947e1e8 100644 > --- a/configs/zynqmp_zcu106_defconfig > +++ b/configs/zynqmp_zcu106_defconfig > @@ -1,11 +1,11 @@ > BR2_aarch64=y > BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_GIT=y > BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" > -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" > @@ -14,21 +14,22 @@ BR2_TARGET_ROOTFS_EXT2_4=y > # BR2_TARGET_ROOTFS_TAR is not set > BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.4_2021.2" As far as I remember (but I ask the core developers to confirm or deny), from the Buildroot perspective upstream versions are generally preferred even when they lack some non-fundamental features (e.g.: some drivers are missing) that are in vendor forks. Is there a reason for switching ATF to the Xilinx fork? In this case explain it in the commit message, otherwise stay on the upstream repo, upgrading to the latest [working] release. A similar question applies to kernel and U-Boot: is it possible to switch to upstream releases? > BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" > -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7" > -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA" > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" The "_virt" suffix looks strange to the uninitiated. IIRC it is the main, unified defconfig for all Xilinx kernels. Please add a line in the commit message so it is clear for everybody's benefit. > BR2_TARGET_UBOOT_NEEDS_DTC=y > BR2_TARGET_UBOOT_SPL=y > BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" > BR2_TARGET_UBOOT_ZYNQMP=y > -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/53fdb7b6c92860ceb0ec5fd14deee302f4a84269/bin/pmufw-zcu106-default-v2017.4.bin" > +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/master/bin/pmufw-v2021.2.bin" Please point to a tag, not a branch, or the file could be modified in the future, resulting in a non-reproducible build. Use: https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/v2021.2/bin/pmufw-v2021.2.bin Ouch, now the build I had started ended with a new error: >>> arm-trusted-firmware xlnx_rebase_v2.4_2021.2 Building ... AR .../build/zynqmp/release/lib/libc.a LD .../build/zynqmp/release/bl31/bl31.elf .../aarch64-buildroot-linux-uclibc-ld: .../build/zynqmp/release/bl31/bl31.elf section `coherent_ram' will not fit in region `RAM' .../aarch64-buildroot-linux-uclibc-ld: BL31 image has exceeded its limit. .../aarch64-buildroot-linux-uclibc-ld: region `RAM' overflowed by 1 byte I have run my build on Ubuntu 18.04 with your patch applied on current master. I assume you have built and run it successfully. Any idea on why it fails on a different host? -- Luca From giulio.benetti at benettiengineering.com Wed Feb 2 22:33:24 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 2 Feb 2022 23:33:24 +0100 Subject: [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2 In-Reply-To: <20220202165555.3497977-1-nealf@xilinx.com> References: <20220202165555.3497977-1-nealf@xilinx.com> Message-ID: <59b73223-73b3-1b9e-b8ec-0cedb0c605ef@benettiengineering.com> Hi Neal, nice to see you've made it with git send-email :-), Here I would improve commit log by stating that you're dropping all local patches because they are now upstreamed On 02/02/22 17:55, Neal Frager wrote: > Signed-off-by: Neal Frager > --- > board/zynqmp/genimage.cfg | 1 + > ...-fix-Remove-GGC-ignore-Warray-bounds.patch | 68 ------- > ...64-zynqmp-zcu106-fix-SPL-MMC-booting.patch | 52 ------ > ...2-arm64-zynqmp-Enable-booting-to-ATF.patch | 114 ------------ > ...ept-an-absolute-path-for-PMUFW_INIT_.patch | 68 ------- > ...ynqmp-pass-the-PS-init-file-as-a-kco.patch | 175 ------------------ > configs/zynqmp_zcu102_defconfig | 35 ++++ This ^^^ file is added, so it deserves a second patch after this one, basically this becomes a patchset of 2 patches > configs/zynqmp_zcu106_defconfig | 15 +- > 8 files changed, 44 insertions(+), 484 deletions(-) > delete mode 100644 board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch > delete mode 100644 board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch > delete mode 100644 board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch > delete mode 100644 board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch > delete mode 100644 board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch > create mode 100644 configs/zynqmp_zcu102_defconfig > > diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg > index ed202f4550..557364e124 100644 > --- a/board/zynqmp/genimage.cfg > +++ b/board/zynqmp/genimage.cfg > @@ -3,6 +3,7 @@ image boot.vfat { > files = { > "boot.bin", > "u-boot.bin", > + "u-boot.itb", Can you please justify this adding ^^^ in commit log? > "atf-uboot.ub", > "system.dtb", > "Image" > diff --git a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch b/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch > deleted file mode 100644 > index 0c1a9ba2a4..0000000000 > --- a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch > +++ /dev/null > @@ -1,68 +0,0 @@ > -From da003e6ada7d0217fe99dc7c649a731f8ebd3c34 Mon Sep 17 00:00:00 2001 > -From: Deepika Bhavnani > -Date: Thu, 15 Aug 2019 00:56:46 +0300 > -Subject: [PATCH] Coverity fix: Remove GGC ignore -Warray-bounds > - > -GCC diagnostics were added to ignore array boundaries, instead > -of ignoring GCC warning current code will check for array boundaries > -and perform and array update only for valid elements. > - > -Resolves: `CID 246574` `CID 246710` `CID 246651` > - > -Signed-off-by: Deepika Bhavnani > -Change-Id: I7530ecf7a1707351c6ee87e90cc3d33574088f57 > - > -Backported from: 41af05154abe136938bcfb5f26c969933784bbef > -[Adapted to apply on 1.5] > - > ---- > - lib/psci/psci_common.c | 20 ++++++++++---------- > - 1 file changed, 10 insertions(+), 10 deletions(-) > - > -diff --git a/lib/psci/psci_common.c b/lib/psci/psci_common.c > -index 2220a745cd6e..6282d992a2f0 100644 > ---- a/lib/psci/psci_common.c > -+++ b/lib/psci/psci_common.c > -@@ -188,21 +188,17 @@ static unsigned int get_power_on_target_pwrlvl(void) > - /****************************************************************************** > - * Helper function to update the requested local power state array. This array > - * does not store the requested state for the CPU power level. Hence an > -- * assertion is added to prevent us from accessing the wrong index. > -+ * assertion is added to prevent us from accessing the CPU power level. > - *****************************************************************************/ > - static void psci_set_req_local_pwr_state(unsigned int pwrlvl, > - unsigned int cpu_idx, > - plat_local_state_t req_pwr_state) > - { > -- /* > -- * This should never happen, we have this here to avoid > -- * "array subscript is above array bounds" errors in GCC. > -- */ > - assert(pwrlvl > PSCI_CPU_PWR_LVL); > --#pragma GCC diagnostic push > --#pragma GCC diagnostic ignored "-Warray-bounds" > -- psci_req_local_pwr_states[pwrlvl - 1][cpu_idx] = req_pwr_state; > --#pragma GCC diagnostic pop > -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && > -+ (cpu_idx < PLATFORM_CORE_COUNT)) { > -+ psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx] = req_pwr_state; > -+ } > - } > - > - /****************************************************************************** > -@@ -228,7 +224,11 @@ static plat_local_state_t *psci_get_req_local_pwr_states(unsigned int pwrlvl, > - { > - assert(pwrlvl > PSCI_CPU_PWR_LVL); > - > -- return &psci_req_local_pwr_states[pwrlvl - 1][cpu_idx]; > -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && > -+ (cpu_idx < PLATFORM_CORE_COUNT)) { > -+ return &psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx]; > -+ } else > -+ return NULL; > - } > - > - /* > --- > -2.34.0 > - > diff --git a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch b/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch > deleted file mode 100644 > index 4d85e1bb12..0000000000 > --- a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch > +++ /dev/null > @@ -1,52 +0,0 @@ > -From e5d72ed8339eb05285448aad3c89d21e4d18fd29 Mon Sep 17 00:00:00 2001 > -From: Luca Ceresoli > -Date: Mon, 26 Feb 2018 09:40:34 +0100 > -Subject: [PATCH] arm64: zynqmp: zcu106: fix SPL MMC booting > - > -The U-Boot SPL generated with the current zcu106 defconfig cannot boot > -from MMC: > - > - [...] > - U-Boot SPL 2018.01 (Feb 21 2018 - 17:47:14) > - EL Level: EL3 > - Trying to boot from MMC1 > - sdhci_transfer_data: Error detected in status(0x408020)! > - spl_load_image_fat_os: error reading image u-boot.bin, err - -2 > - spl_load_image_fat: error reading image u-boot.img, err - -6 > - SPL: failed to boot from all boot devices > - ### ERROR ### Please RESET the board ### > - > -Fix by lowering the rpll value. The new value for the RPLL_CTRL > -register comes from the current psu_init_gpl.c from the HDF file at > -https://github.com/xilinx/hdf-examples/tree/01ad8ea5fd1989abf4ea5a072d019a16cb2bc546/zcu106-zynqmp > -(generated by Vivado v2017.4). > - > -RPLL and sdio1_ref clocks before and after this change: > - > - - Old values: RPLL 1.36 GHz, sdio1_ref 272 MHz > - - New values: RPLL 1.16 GHz, sdio1_ref 233 MHz > - > -Signed-off-by: Luca Ceresoli > -Cc: Michal Simek > -Upstream-status: accepted upstream in a different form > ---- > - > - board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c > -index 4d18abe000ca..e6fa477e53e7 100644 > ---- a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c > -+++ b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c > -@@ -10,7 +10,7 @@ > - static unsigned long psu_pll_init_data(void) > - { > - psu_mask_write(0xFF5E0034, 0xFE7FEDEFU, 0x7E4E2C62U); > -- psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00013C00U); > -+ psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00014600U); > - psu_mask_write(0xFF5E0030, 0x00000008U, 0x00000008U); > - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000001U); > - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000000U); > --- > -2.7.4 > - > diff --git a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch b/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch > deleted file mode 100644 > index 487fff6812..0000000000 > --- a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch > +++ /dev/null > @@ -1,114 +0,0 @@ > -From 5e3cac50cc981e01d9072241035a8d4162560c71 Mon Sep 17 00:00:00 2001 > -From: Luca Ceresoli > -Date: Mon, 12 Mar 2018 17:18:38 +0100 > -Subject: [PATCH] arm64: zynqmp: Enable booting to ATF > - > -U-Boot is now able to boot to ARM Trusted Firmware (ATF). The boot > -flow is SPL(EL3) loads ATF and full u-boot and jump to ATF(EL3) which > -pass control to full u-boot(EL2). This has been tested on zcu106, so > -enable it in this defconfig. > - > -To generate an image that triggers this booting flow, you need to pass > -'-O arm-trusted-firmware' to mkimage. > - > -Signed-off-by: Luca Ceresoli > -Signed-off-by: Michal Simek > -Backported from upstream: http://git.denx.de/?p=u-boot.git;a=commit;h=5e3cac50cc981e01d9072241035a8d4162560c71 > ---- > - > - configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 + > - configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 + > - configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 + > - configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 + > - configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 1 + > - configs/xilinx_zynqmp_zcu102_revA_defconfig | 1 + > - configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 + > - 7 files changed, 7 insertions(+) > - > -diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig > -index c5bfa2b12638..488c72258b0e 100644 > ---- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig > -+++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig > -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_FASTBOOT=y > - CONFIG_FASTBOOT_FLASH=y > -diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig > -index f86dce403a42..5d501eec0edd 100644 > ---- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig > -+++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig > -@@ -20,6 +20,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_FASTBOOT=y > - CONFIG_FASTBOOT_FLASH=y > -diff --git a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig > -index 6e947cf56827..6f7eaebd7676 100644 > ---- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig > -+++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig > -@@ -16,6 +16,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_CMD_MEMTEST=y > - CONFIG_SYS_ALT_MEMTEST=y > -diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig > -index 1c934858c61c..7a3806cba4b5 100644 > ---- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig > -+++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig > -@@ -17,6 +17,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_CMD_MEMTEST=y > - CONFIG_SYS_ALT_MEMTEST=y > -diff --git a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig > -index e13c7c56f310..e4408f182ca0 100644 > ---- a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig > -+++ b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig > -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_FASTBOOT=y > - CONFIG_FASTBOOT_FLASH=y > -diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig b/configs/xilinx_zynqmp_zcu102_revA_defconfig > -index 5b2cd495ee85..b52f6789fd4b 100644 > ---- a/configs/xilinx_zynqmp_zcu102_revA_defconfig > -+++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig > -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_FASTBOOT=y > - CONFIG_FASTBOOT_FLASH=y > -diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig > -index e6530fbfe7ff..80592554f682 100644 > ---- a/configs/xilinx_zynqmp_zcu102_revB_defconfig > -+++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig > -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_FASTBOOT=y > - CONFIG_FASTBOOT_FLASH=y > --- > -2.7.4 > - > diff --git a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch b/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch > deleted file mode 100644 > index 95ab7b3b75..0000000000 > --- a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch > +++ /dev/null > @@ -1,68 +0,0 @@ > -From c7df098a71e05dc81cee818747759e8060b59626 Mon Sep 17 00:00:00 2001 > -From: Luca Ceresoli > -Date: Mon, 4 Jun 2018 12:21:01 +0200 > -Subject: [PATCH] arm64: zynqmp: accept an absolute path for PMUFW_INIT_FILE > - > -The value of PMUFW_INIT_FILE is prefixed with "$(srctree)/", thus > -forcing it to be a relative path inside the U-Boot source tree. Since > -the PMUFW is a binary file generated outside of U-Boot, the PMUFW > -binary must be copied inside the U-Boot source tree before the > -build. > - > -This generates a few problems: > - > - * if the source tree is shared among different out-of-tree builds, > - they will pollute (and potentially corrupt) each other > - * the source tree cannot be read-only > - * any buildsystem must add a command to copy the PMUFW binary > - * putting an externally-generated binary in the source tree is ugly > - as hell > - > -Avoid these problems by accepting an absolute path for > -PMUFW_INIT_FILE. This would be as simple as removing the "$(srctree)/" > -prefix, but in order to keep backward compatibility we rather use the > -shell and readlink to get the absolute path even when starting from a > -relative path. > - > -Since 'readlink -f' produces an empty string if the file does not > -exist, we also add a check to ensure the file configured in > -PMUFW_INIT_FILE exists. Otherwise the build would exit successfully, > -but produce a boot.bin without PMUFW as if PMUFW_INIT_FILE were empty. > - > -Tested in the 12 possible combinations of: > - - PMUFW_INIT_FILE empty, relative, absolute, non-existing > - - building in-tree, in subdir, in other directory > - > -Signed-off-by: Luca Ceresoli > -Cc: Michal Simek > -Cc: Simon Glass > -Cc: Emmanuel Vadot > -Signed-off-by: Michal Simek > -Backported from upstream: https://git.denx.de/?p=u-boot.git;a=commit;h=c7df098a71e05dc81cee818747759e8060b59626 > ---- > - scripts/Makefile.spl | 8 +++++++- > - 1 file changed, 7 insertions(+), 1 deletion(-) > - > -diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl > -index ef018b5b4056..252f13826d4c 100644 > ---- a/scripts/Makefile.spl > -+++ b/scripts/Makefile.spl > -@@ -167,8 +167,14 @@ ifdef CONFIG_ARCH_ZYNQ > - MKIMAGEFLAGS_boot.bin = -T zynqimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) > - endif > - ifdef CONFIG_ARCH_ZYNQMP > -+ifneq ($(CONFIG_PMUFW_INIT_FILE),"") > -+spl/boot.bin: zynqmp-check-pmufw > -+zynqmp-check-pmufw: FORCE > -+ ( cd $(srctree) && test -r $(CONFIG_PMUFW_INIT_FILE) ) \ > -+ || ( echo "Cannot read $(CONFIG_PMUFW_INIT_FILE)" && false ) > -+endif > - MKIMAGEFLAGS_boot.bin = -T zynqmpimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) \ > -- -n $(srctree)/$(CONFIG_PMUFW_INIT_FILE) > -+ -n "$(shell cd $(srctree); readlink -f $(CONFIG_PMUFW_INIT_FILE))" > - endif > - > - spl/boot.bin: $(obj)/u-boot-spl.bin FORCE > --- > -2.7.4 > - > diff --git a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch b/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch > deleted file mode 100644 > index b32e162780..0000000000 > --- a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch > +++ /dev/null > @@ -1,175 +0,0 @@ > -From 4c9d54ab5a41d65000c8d249b6fb1b76056f1812 Mon Sep 17 00:00:00 2001 > -From: Luca Ceresoli > -Date: Wed, 20 Jun 2018 12:11:50 +0200 > -Subject: [PATCH] arm/arm64: zynq/zynqmp: pass the PS init file as a kconfig > - variable > - > -U-Boot needs to link ps7_init_gpl.c on Zynq or psu_init_gpl.c on > -ZynqMP (PS init for short). The current logic to locate this file for > -both platforms is: > - > - 1. if a board-specific file exists in > - board/xilinx/zynq[mp]/$(CONFIG_DEFAULT_DEVICE_TREE)/ps?_init_gpl.c > - then use it > - 2. otherwise use board/xilinx/zynq/ps?_init_gpl.c > - > -In the latter case the file does not exist in the U-Boot sources and > -must be copied in the source tree from the outside before starting the > -build. This is typical when it is generated from Xilinx tools while > -developing a custom hardware. However making sure that a > -board-specific file is _not_ found (and used) requires some trickery > -such as removing or overwriting all PS init files (e.g.: the current > -meta-xilinx yocto layer [0]). > - > -This generates a few problems: > - > - * if the source tree is shared among different out-of-tree builds, > - they will pollute (and potentially corrupt) each other > - * the source tree cannot be read-only > - * any buildsystem must add a command to copy the PS init file binary > - * overwriting or deleting files in the source tree is ugly as hell > - > -Simplify usage by allowing to pass the path to the desired PS init > -file in kconfig variable XILINX_PS_INIT_FILE. It can be an absolute > -path or relative to $(srctree). If the variable is set, the > -user-specified file will always be used without being copied > -around. If the the variable is left empty, for backward compatibility > -fall back to the old behaviour. > - > -Since the issue is the same for Zynq and ZynqMP, add one kconfig > -variable in a common place and use it for both. > - > -Also use the new kconfig help text to document all the ways to give > -U-Boot the PS init file. > - > -Build-tested with all combinations of: > - - platform: zynq or zynqmp > - - PS init file: from XILINX_PS_INIT_FILE (absolute, relative path, > - non-existing), in-tree board-specific, in board/xilinx/zynq[mp]/ > - - building in-tree, in subdir, in other directory > - > -[0] https://github.com/Xilinx/meta-xilinx/blob/b2f74cc7fe5c4881589d5e440a17cb51fc66a7ab/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init.inc#L9 > - > -Signed-off-by: Luca Ceresoli > -Cc: Albert Aribaud > -Cc: Michal Simek > -Cc: Nathan Rossi > -Backported from upstream: https://git.denx.de/?p=u-boot.git;a=commit;h=6da4f67ad09cd8b311d77b2b04e557b7ef65b56c > ---- > - arch/arm/Kconfig | 1 + > - board/xilinx/Kconfig | 41 +++++++++++++++++++++++++++++++++++++++++ > - board/xilinx/zynq/Makefile | 10 +++++++++- > - board/xilinx/zynqmp/Makefile | 10 +++++++++- > - 4 files changed, 60 insertions(+), 2 deletions(-) > - create mode 100644 board/xilinx/Kconfig > - > -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig > -index 22234cde2ab6..e04979d0ef7e 100644 > ---- a/arch/arm/Kconfig > -+++ b/arch/arm/Kconfig > -@@ -1293,4 +1293,5 @@ source "board/technologic/ts4600/Kconfig" > - source "board/vscom/baltos/Kconfig" > - source "board/woodburn/Kconfig" > - source "board/work-microwave/work_92105/Kconfig" > -+source "board/xilinx/Kconfig" > - source "board/zipitz2/Kconfig" > - > - source "arch/arm/Kconfig.debug" > -diff --git a/board/xilinx/Kconfig b/board/xilinx/Kconfig > -new file mode 100644 > -index 000000000000..aa3fa061edef > ---- /dev/null > -+++ b/board/xilinx/Kconfig > -@@ -0,0 +1,41 @@ > -+# Copyright (c) 2018, Luca Ceresoli > -+# > -+# SPDX-License-Identifier: GPL-2.0 > -+ > -+if ARCH_ZYNQ || ARCH_ZYNQMP > -+ > -+config XILINX_PS_INIT_FILE > -+ string "Zynq/ZynqMP PS init file(s) location" > -+ help > -+ On Zynq and ZynqMP U-Boot SPL (or U-Boot proper if > -+ ZYNQMP_PSU_INIT_ENABLED is set) is responsible for some > -+ basic initializations, such as enabling peripherals and > -+ configuring pinmuxes. The PS init file (called > -+ psu_init_gpl.c on ZynqMP, ps7_init_gpl.c for Zynq-7000) > -+ contains the code for such initializations. > -+ > -+ U-Boot contains PS init files for some boards, but each of > -+ them describes only one specific configuration. Users of a > -+ different board, or needing a different configuration, can > -+ generate custom files using the Xilinx development tools. > -+ > -+ There are three ways to give a PS init file to U-Boot: > -+ > -+ 1. Set this variable to the path, either relative to the > -+ source tree or absolute, where the psu_init_gpl.c or > -+ ps7_init_gpl.c file is located. U-Boot will build this > -+ file. > -+ > -+ 2. If you leave an empty string here, U-Boot will use > -+ board/xilinx/zynq/$(CONFIG_DEFAULT_DEVICE_TREE)/ps7_init_gpl.c > -+ for Zynq-7000, or > -+ board/xilinx/zynqmp/$(CONFIG_DEFAULT_DEVICE_TREE)/psu_init_gpl.c > -+ for ZynqMP. > -+ > -+ 3. If the above file does not exist, U-Boot will use > -+ board/xilinx/zynq/ps7_init_gpl.c for Zynq-7000, or > -+ board/xilinx/zynqmp/psu_init_gpl.c for ZynqMP. This file > -+ is not provided by U-Boot, you have to copy it there > -+ before the build. > -+ > -+endif > -diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile > -index 5a76a26720cd..03ad5f0532ee 100644 > ---- a/board/xilinx/zynq/Makefile > -+++ b/board/xilinx/zynq/Makefile > -@@ -5,10 +5,18 @@ > - > - obj-y := board.o > - > --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) > -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") > -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE)) > -+init-objs := ps_init_gpl.o > -+spl/board/xilinx/zynq/ps_init_gpl.o board/xilinx/zynq/ps_init_gpl.o: $(PS_INIT_FILE) > -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ > -+endif > - > -+ifeq ($(init-objs),) > -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) > - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/ps7_init_gpl.c),\ > - $(hw-platform-y)/ps7_init_gpl.o) > -+endif > - > - ifeq ($(init-objs),) > - ifneq ($(wildcard $(srctree)/$(src)/ps7_init_gpl.c),) > -diff --git a/board/xilinx/zynqmp/Makefile b/board/xilinx/zynqmp/Makefile > -index 05ccd25dcef3..960b81fc5853 100644 > ---- a/board/xilinx/zynqmp/Makefile > -+++ b/board/xilinx/zynqmp/Makefile > -@@ -5,10 +5,18 @@ > - > - obj-y := zynqmp.o > - > --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) > -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") > -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE)) > -+init-objs := ps_init_gpl.o > -+spl/board/xilinx/zynqmp/ps_init_gpl.o board/xilinx/zynqmp/ps_init_gpl.o: $(PS_INIT_FILE) > -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ > -+endif > - > -+ifeq ($(init-objs),) > -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) > - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/psu_init_gpl.c),\ > - $(hw-platform-y)/psu_init_gpl.o) > -+endif > - > - ifeq ($(init-objs),) > - ifneq ($(wildcard $(srctree)/$(src)/psu_init_gpl.c),) > --- > -2.7.4 > - > diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig > new file mode 100644 > index 0000000000..336f5c2dbe > --- /dev/null > +++ b/configs/zynqmp_zcu102_defconfig > @@ -0,0 +1,35 @@ > +BR2_aarch64=y > +BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_GIT=y > +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2" > +BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +# BR2_TARGET_ROOTFS_TAR is not set > +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.4_2021.2" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_SPL=y > +BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" > +BR2_TARGET_UBOOT_ZYNQMP=y > +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/master/bin/pmufw-v2021.2.bin" > +BR2_TARGET_UBOOT_FORMAT_ITB=y > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_MTOOLS=y As pointed above this ^^^ file must be in a separate patch and it deserves also a maintainer. So please you or maybe Luca could add an entry to DEVELOPERS for this board > diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig > index bee7c1daf7..3a6947e1e8 100644 > --- a/configs/zynqmp_zcu106_defconfig > +++ b/configs/zynqmp_zcu106_defconfig > @@ -1,11 +1,11 @@ > BR2_aarch64=y > BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" Since all patches are gone, this ^^^ is not needed anymore > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_GIT=y > BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" > -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" > @@ -14,21 +14,22 @@ BR2_TARGET_ROOTFS_EXT2_4=y > # BR2_TARGET_ROOTFS_TAR is not set > BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.4_2021.2" It's worth mention in commit log that you're switching from ARM to Xilinx ATF > BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" > -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7" > -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA" > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" > BR2_TARGET_UBOOT_NEEDS_DTC=y > BR2_TARGET_UBOOT_SPL=y > BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" > BR2_TARGET_UBOOT_ZYNQMP=y > -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/53fdb7b6c92860ceb0ec5fd14deee302f4a84269/bin/pmufw-zcu106-default-v2017.4.bin" > +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/master/bin/pmufw-v2021.2.bin" > +BR2_TARGET_UBOOT_FORMAT_ITB=y Here ^^^ I see that probably you're switching from .bin to .itb so better mention it in commit log > BR2_PACKAGE_HOST_DOSFSTOOLS=y > BR2_PACKAGE_HOST_GENIMAGE=y > BR2_PACKAGE_HOST_MTOOLS=y Thank you! Best regards -- Giulio Benetti Benetti Engineering sas From james.hilliard1 at gmail.com Wed Feb 2 23:50:20 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 2 Feb 2022 16:50:20 -0700 Subject: [Buildroot] [PATCH 1/1] package/pkg-python: set _PYTHON_PROJECT_BASE Message-ID: <20220202235020.782745-1-james.hilliard1@gmail.com> This variable is supposed to be set when cross compiling and is now required by setuptools to be set correctly after the latest version bump. Fixes: http://autobuild.buildroot.net/results/2e8/2e8093e68d04e8cbb20b095068b24c8bbe5f69ad http://autobuild.buildroot.net/results/9e3/9e3cfddb651a59d7f2d04bc88e6fff2a06e9b465 Signed-off-by: James Hilliard --- package/pkg-python.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 22ea77352c..00bdb9150a 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -33,6 +33,7 @@ PKG_PYTHON_DISTUTILS_ENV = \ LDSHARED="$(TARGET_CROSS)gcc -shared" \ PYTHONPATH="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_PATH),$(PYTHON_PATH))" \ PYTHONNOUSERSITE=1 \ + _PYTHON_PROJECT_BASE="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_DIR),$(PYTHON_DIR))" \ _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ _python_sysroot=$(STAGING_DIR) \ _python_prefix=/usr \ @@ -60,6 +61,7 @@ HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \ # Target setuptools-based packages PKG_PYTHON_SETUPTOOLS_ENV = \ + _PYTHON_PROJECT_BASE="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_DIR),$(PYTHON_DIR))" \ _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ PATH=$(BR_PATH) \ $(TARGET_CONFIGURE_OPTS) \ -- 2.25.1 From ca0 at protonmail.ch Thu Feb 3 02:01:50 2022 From: ca0 at protonmail.ch (ca0) Date: Thu, 03 Feb 2022 02:01:50 +0000 Subject: [Buildroot] package libldns Message-ID: <5_xofMlQqIrdAjpopLNCIYCGiqsc2UoXvUQG4GIV5Bd0dY31bw-gZ_0eoD0ix_iW-BI3-5O_RbQESkV3ybUN1zFSLY2r3PAr3ZOfxYOFmrU=@protonmail.ch> Building this package with orangepi_zero_defconfig results in an useless user system because both thee files are blown away ./output/target/usr/lib/ld-musl-armhf.so.1 ./output/host/arm-buildroot-linux-musleabihf/sysroot/usr/lib/ld-musl-armhf.so.1 Is the ldconfig hackery needed for embedded systems and is it supported when cross compiling? From nealf at xilinx.com Thu Feb 3 06:20:52 2022 From: nealf at xilinx.com (Neal Frager) Date: Thu, 3 Feb 2022 06:20:52 +0000 Subject: [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2 In-Reply-To: References: <20220202165555.3497977-1-nealf@xilinx.com> Message-ID: Hi Luca, Thank you for your positive feedback. Below you can find my thoughts. Neal Frager Embedded Processor Specialist Xilinx neal.frager at xilinx.com Mobile: +33.6.48.11.37.36 www.linkedin.com/in/neal-frager-0397463 -----Original Message----- From: Luca Ceresoli Sent: Wednesday 2 February 2022 23:29 To: Neal Frager ; buildroot at buildroot.org Cc: Neal Frager Subject: Re: [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2 CAUTION: This message has originated from an External Source. Please use proper judgment and caution when opening attachments, clicking links, or responding to this email. Hi Neal, thank you for your effort and for sending a patch in the format that is the most convenient for other people to review your code. Your work seems generally in a good shape. I have several remarks, see below, but nothing really problematic. On 02/02/22 17:55, Neal Frager wrote: > Signed-off-by: Neal Frager Maybe you can add more details before the Signed-off-by line, suah as "Also add a defconfig for ZCU102", "remove U-Boot and ATF patches not upstream"... [Neal] Could you share the proper git commands for adding comments to a patch? I would be happy to add more comments, but I am a bit new to git, and I do not know what commands I need to use. First issue: this defconfig does not build on my PC: $ git clean -xdf && make zynqmp_zcu106_defconfig && verynice make package/pkg-generic.mk:266: *** BR2_GLOBAL_PATCH_DIR contains nonexistent directory board/zynqmp/patches/. Stop. $ As you removed all patches (which is sooo gooood!) you now have to remove the BR2_GLOBAL_PATCH_DIR. [Neal] I have not seen this error on my side, but to fix it, I will just remove the BR2_GLOBAL_PATCH_DIR from the defconfigs. > --- > board/zynqmp/genimage.cfg | 1 + > ...-fix-Remove-GGC-ignore-Warray-bounds.patch | 68 ------- > ...64-zynqmp-zcu106-fix-SPL-MMC-booting.patch | 52 ------ > ...2-arm64-zynqmp-Enable-booting-to-ATF.patch | 114 ------------ > ...ept-an-absolute-path-for-PMUFW_INIT_.patch | 68 ------- > ...ynqmp-pass-the-PS-init-file-as-a-kco.patch | 175 ------------------ > configs/zynqmp_zcu102_defconfig | 35 ++++ > configs/zynqmp_zcu106_defconfig | 15 +- > 8 files changed, 44 insertions(+), 484 deletions(-) delete mode > 100644 > board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC > -ignore-Warray-bounds.patch delete mode 100644 > board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-bootin > g.patch delete mode 100644 > board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.pat > ch delete mode 100644 > board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-f > or-PMUFW_INIT_.patch delete mode 100644 > board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init > -file-as-a-kco.patch create mode 100644 > configs/zynqmp_zcu102_defconfig > > diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg > index ed202f4550..557364e124 100644 > --- a/board/zynqmp/genimage.cfg > +++ b/board/zynqmp/genimage.cfg > @@ -3,6 +3,7 @@ image boot.vfat { > files = { > "boot.bin", > "u-boot.bin", > + "u-boot.itb", Is u-boot.bin still needed, when we have the .itb? [Neal] u-boot.bin is no longer needed. I can remove it. > diff --git a/configs/zynqmp_zcu106_defconfig > b/configs/zynqmp_zcu106_defconfig index bee7c1daf7..3a6947e1e8 100644 > --- a/configs/zynqmp_zcu106_defconfig > +++ b/configs/zynqmp_zcu106_defconfig > @@ -1,11 +1,11 @@ > BR2_aarch64=y > BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_GIT=y > BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" > -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" > @@ -14,21 +14,22 @@ BR2_TARGET_ROOTFS_EXT2_4=y # > BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.4_2021.2" As far as I remember (but I ask the core developers to confirm or deny), from the Buildroot perspective upstream versions are generally preferred even when they lack some non-fundamental features (e.g.: some drivers are missing) that are in vendor forks. Is there a reason for switching ATF to the Xilinx fork? In this case explain it in the commit message, otherwise stay on the upstream repo, upgrading to the latest [working] release. A similar question applies to kernel and U-Boot: is it possible to switch to upstream releases? [Neal] I was trying to match the Xilinx tested software release 2021.2 with these patches. The mainline Linux kernel is still missing quite a bit of the Xilinx drivers, so if a developer uses all mainline locations, there will be things that do not work properly. The ATF should probably be ok, as it is almost identical to the Xilinx fork, but since I was already using the Xilinx fork for the Linux kernel and U-Boot, I thought it would be better to use the Xilinx tested fork for everything to remain consistent. > BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" > -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7" > -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA" > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" The "_virt" suffix looks strange to the uninitiated. IIRC it is the main, unified defconfig for all Xilinx kernels. Please add a line in the commit message so it is clear for everybody's benefit. [Neal] Yes, I will add a comment on this when I learn the proper git command for adding comments. > BR2_TARGET_UBOOT_NEEDS_DTC=y > BR2_TARGET_UBOOT_SPL=y > BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" > BR2_TARGET_UBOOT_ZYNQMP=y > -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/53fdb7b6c92860ceb0ec5fd14deee302f4a84269/bin/pmufw-zcu106-default-v2017.4.bin" > +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/master/bin/pmufw-v2021.2.bin" Please point to a tag, not a branch, or the file could be modified in the future, resulting in a non-reproducible build. Use: https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/v2021.2/bin/pmufw-v2021.2.bin [Neal] Good catch. I will update this in the defconfigs. Ouch, now the build I had started ended with a new error: >>> arm-trusted-firmware xlnx_rebase_v2.4_2021.2 Building ... AR .../build/zynqmp/release/lib/libc.a LD .../build/zynqmp/release/bl31/bl31.elf .../aarch64-buildroot-linux-uclibc-ld: .../build/zynqmp/release/bl31/bl31.elf section `coherent_ram' will not fit in region `RAM' .../aarch64-buildroot-linux-uclibc-ld: BL31 image has exceeded its limit. .../aarch64-buildroot-linux-uclibc-ld: region `RAM' overflowed by 1 byte I have run my build on Ubuntu 18.04 with your patch applied on current master. I assume you have built and run it successfully. Any idea on why it fails on a different host? [Neal] I have seen the ATF build error as well. There seems to be an issue with the default buildroot aarch64-buildroot-linux-uclibc compiler when building the ATF. I fixed the issue on my side by going into the output/build/arm-trusted-firmware-xlnx_rebase_v2.4_2021.2 and running the build with the aarch-none-elf compiler using the build command below. Basically, changing nothing but the compiler. Do you have any thoughts about how to fix this? make CROSS_COMPILE=aarch64-none-elf- PLAT=zynqmp RESET_TO_BL31=1 -- Luca From nealf at xilinx.com Thu Feb 3 06:24:26 2022 From: nealf at xilinx.com (Neal Frager) Date: Thu, 3 Feb 2022 06:24:26 +0000 Subject: [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2 In-Reply-To: <59b73223-73b3-1b9e-b8ec-0cedb0c605ef@benettiengineering.com> References: <20220202165555.3497977-1-nealf@xilinx.com> <59b73223-73b3-1b9e-b8ec-0cedb0c605ef@benettiengineering.com> Message-ID: Hi Giulio, Thank you very much for your feedback. I would be happy to split the zynqmp_zcu102_defconfig off into a second patch. No problem. As for adding comments to the log, could you share the proper git commands for doing this? I would be happy to do it, but I am a bit new to git and I did not know the proper command to use for adding log comments. Best regards, Neal Frager Xilinx -----Original Message----- From: Giulio Benetti Sent: Wednesday 2 February 2022 23:33 To: Neal Frager ; buildroot at buildroot.org Cc: luca at lucaceresoli.net; Neal Frager Subject: Re: [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2 CAUTION: This message has originated from an External Source. Please use proper judgment and caution when opening attachments, clicking links, or responding to this email. Hi Neal, nice to see you've made it with git send-email :-), Here I would improve commit log by stating that you're dropping all local patches because they are now upstreamed On 02/02/22 17:55, Neal Frager wrote: > Signed-off-by: Neal Frager > --- > board/zynqmp/genimage.cfg | 1 + > ...-fix-Remove-GGC-ignore-Warray-bounds.patch | 68 ------- > ...64-zynqmp-zcu106-fix-SPL-MMC-booting.patch | 52 ------ > ...2-arm64-zynqmp-Enable-booting-to-ATF.patch | 114 ------------ > ...ept-an-absolute-path-for-PMUFW_INIT_.patch | 68 ------- > ...ynqmp-pass-the-PS-init-file-as-a-kco.patch | 175 ------------------ > configs/zynqmp_zcu102_defconfig | 35 ++++ This ^^^ file is added, so it deserves a second patch after this one, basically this becomes a patchset of 2 patches > configs/zynqmp_zcu106_defconfig | 15 +- > 8 files changed, 44 insertions(+), 484 deletions(-) > delete mode 100644 board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch > delete mode 100644 board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch > delete mode 100644 board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch > delete mode 100644 board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch > delete mode 100644 board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch > create mode 100644 configs/zynqmp_zcu102_defconfig > > diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg > index ed202f4550..557364e124 100644 > --- a/board/zynqmp/genimage.cfg > +++ b/board/zynqmp/genimage.cfg > @@ -3,6 +3,7 @@ image boot.vfat { > files = { > "boot.bin", > "u-boot.bin", > + "u-boot.itb", Can you please justify this adding ^^^ in commit log? > "atf-uboot.ub", > "system.dtb", > "Image" > diff --git > a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-G > GC-ignore-Warray-bounds.patch > b/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-G > GC-ignore-Warray-bounds.patch > deleted file mode 100644 > index 0c1a9ba2a4..0000000000 > --- > a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-G > GC-ignore-Warray-bounds.patch > +++ /dev/null > @@ -1,68 +0,0 @@ > -From da003e6ada7d0217fe99dc7c649a731f8ebd3c34 Mon Sep 17 00:00:00 > 2001 > -From: Deepika Bhavnani > -Date: Thu, 15 Aug 2019 00:56:46 +0300 > -Subject: [PATCH] Coverity fix: Remove GGC ignore -Warray-bounds > - > -GCC diagnostics were added to ignore array boundaries, instead -of > ignoring GCC warning current code will check for array boundaries -and > perform and array update only for valid elements. > - > -Resolves: `CID 246574` `CID 246710` `CID 246651` > - > -Signed-off-by: Deepika Bhavnani > -Change-Id: I7530ecf7a1707351c6ee87e90cc3d33574088f57 > - > -Backported from: 41af05154abe136938bcfb5f26c969933784bbef > -[Adapted to apply on 1.5] > - > ---- > - lib/psci/psci_common.c | 20 ++++++++++---------- > - 1 file changed, 10 insertions(+), 10 deletions(-) > - > -diff --git a/lib/psci/psci_common.c b/lib/psci/psci_common.c -index > 2220a745cd6e..6282d992a2f0 100644 > ---- a/lib/psci/psci_common.c > -+++ b/lib/psci/psci_common.c > -@@ -188,21 +188,17 @@ static unsigned int > get_power_on_target_pwrlvl(void) > - > /********************************************************************* > ********* > - * Helper function to update the requested local power state array. > This array > - * does not store the requested state for the CPU power level. Hence > an > -- * assertion is added to prevent us from accessing the wrong index. > -+ * assertion is added to prevent us from accessing the CPU power level. > - > ********************************************************************** > *******/ > - static void psci_set_req_local_pwr_state(unsigned int pwrlvl, > - unsigned int cpu_idx, > - plat_local_state_t req_pwr_state) > - { > -- /* > -- * This should never happen, we have this here to avoid > -- * "array subscript is above array bounds" errors in GCC. > -- */ > - assert(pwrlvl > PSCI_CPU_PWR_LVL); > --#pragma GCC diagnostic push > --#pragma GCC diagnostic ignored "-Warray-bounds" > -- psci_req_local_pwr_states[pwrlvl - 1][cpu_idx] = req_pwr_state; > --#pragma GCC diagnostic pop > -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && > -+ (cpu_idx < PLATFORM_CORE_COUNT)) { > -+ psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx] = req_pwr_state; > -+ } > - } > - > - > /********************************************************************* > ********* -@@ -228,7 +224,11 @@ static plat_local_state_t > *psci_get_req_local_pwr_states(unsigned int pwrlvl, > - { > - assert(pwrlvl > PSCI_CPU_PWR_LVL); > - > -- return &psci_req_local_pwr_states[pwrlvl - 1][cpu_idx]; > -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && > -+ (cpu_idx < PLATFORM_CORE_COUNT)) { > -+ return &psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx]; > -+ } else > -+ return NULL; > - } > - > - /* > --- > -2.34.0 > - > diff --git > a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-boot > ing.patch > b/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-boot > ing.patch > deleted file mode 100644 > index 4d85e1bb12..0000000000 > --- > a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-boot > ing.patch > +++ /dev/null > @@ -1,52 +0,0 @@ > -From e5d72ed8339eb05285448aad3c89d21e4d18fd29 Mon Sep 17 00:00:00 > 2001 > -From: Luca Ceresoli > -Date: Mon, 26 Feb 2018 09:40:34 +0100 > -Subject: [PATCH] arm64: zynqmp: zcu106: fix SPL MMC booting > - > -The U-Boot SPL generated with the current zcu106 defconfig cannot > boot -from MMC: > - > - [...] > - U-Boot SPL 2018.01 (Feb 21 2018 - 17:47:14) > - EL Level: EL3 > - Trying to boot from MMC1 > - sdhci_transfer_data: Error detected in status(0x408020)! > - spl_load_image_fat_os: error reading image u-boot.bin, err - -2 > - spl_load_image_fat: error reading image u-boot.img, err - -6 > - SPL: failed to boot from all boot devices > - ### ERROR ### Please RESET the board ### > - > -Fix by lowering the rpll value. The new value for the RPLL_CTRL > -register comes from the current psu_init_gpl.c from the HDF file at > -https://github.com/xilinx/hdf-examples/tree/01ad8ea5fd1989abf4ea5a072 > d019a16cb2bc546/zcu106-zynqmp > -(generated by Vivado v2017.4). > - > -RPLL and sdio1_ref clocks before and after this change: > - > - - Old values: RPLL 1.36 GHz, sdio1_ref 272 MHz > - - New values: RPLL 1.16 GHz, sdio1_ref 233 MHz > - > -Signed-off-by: Luca Ceresoli > -Cc: Michal Simek > -Upstream-status: accepted upstream in a different form > ---- > - > - board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c > b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c > -index 4d18abe000ca..e6fa477e53e7 100644 > ---- a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c > -+++ b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c > -@@ -10,7 +10,7 @@ > - static unsigned long psu_pll_init_data(void) > - { > - psu_mask_write(0xFF5E0034, 0xFE7FEDEFU, 0x7E4E2C62U); > -- psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00013C00U); > -+ psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00014600U); > - psu_mask_write(0xFF5E0030, 0x00000008U, 0x00000008U); > - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000001U); > - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000000U); > --- > -2.7.4 > - > diff --git > a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.p > atch > b/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.p > atch > deleted file mode 100644 > index 487fff6812..0000000000 > --- > a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.p > atch > +++ /dev/null > @@ -1,114 +0,0 @@ > -From 5e3cac50cc981e01d9072241035a8d4162560c71 Mon Sep 17 00:00:00 > 2001 > -From: Luca Ceresoli > -Date: Mon, 12 Mar 2018 17:18:38 +0100 > -Subject: [PATCH] arm64: zynqmp: Enable booting to ATF > - > -U-Boot is now able to boot to ARM Trusted Firmware (ATF). The boot > -flow is SPL(EL3) loads ATF and full u-boot and jump to ATF(EL3) which > -pass control to full u-boot(EL2). This has been tested on zcu106, so > -enable it in this defconfig. > - > -To generate an image that triggers this booting flow, you need to > pass -'-O arm-trusted-firmware' to mkimage. > - > -Signed-off-by: Luca Ceresoli > -Signed-off-by: Michal Simek -Backported > from upstream: > http://git.denx.de/?p=u-boot.git;a=commit;h=5e3cac50cc981e01d907224103 > 5a8d4162560c71 > ---- > - > - configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 + > - configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 + > - configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 + > - configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 + > - configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 1 + > - configs/xilinx_zynqmp_zcu102_revA_defconfig | 1 + > - configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 + > - 7 files changed, 7 insertions(+) > - > -diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig > b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig > -index c5bfa2b12638..488c72258b0e 100644 > ---- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig > -+++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig > -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_FASTBOOT=y > - CONFIG_FASTBOOT_FLASH=y > -diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig > b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig > -index f86dce403a42..5d501eec0edd 100644 > ---- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig > -+++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig > -@@ -20,6 +20,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_FASTBOOT=y > - CONFIG_FASTBOOT_FLASH=y > -diff --git a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig > b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig > -index 6e947cf56827..6f7eaebd7676 100644 > ---- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig > -+++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig > -@@ -16,6 +16,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_CMD_MEMTEST=y > - CONFIG_SYS_ALT_MEMTEST=y > -diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig > b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig > -index 1c934858c61c..7a3806cba4b5 100644 > ---- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig > -+++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig > -@@ -17,6 +17,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_CMD_MEMTEST=y > - CONFIG_SYS_ALT_MEMTEST=y > -diff --git a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig > b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig > -index e13c7c56f310..e4408f182ca0 100644 > ---- a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig > -+++ b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig > -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_FASTBOOT=y > - CONFIG_FASTBOOT_FLASH=y > -diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig > b/configs/xilinx_zynqmp_zcu102_revA_defconfig > -index 5b2cd495ee85..b52f6789fd4b 100644 > ---- a/configs/xilinx_zynqmp_zcu102_revA_defconfig > -+++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig > -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_FASTBOOT=y > - CONFIG_FASTBOOT_FLASH=y > -diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig > b/configs/xilinx_zynqmp_zcu102_revB_defconfig > -index e6530fbfe7ff..80592554f682 100644 > ---- a/configs/xilinx_zynqmp_zcu102_revB_defconfig > -+++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig > -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_FASTBOOT=y > - CONFIG_FASTBOOT_FLASH=y > --- > -2.7.4 > - > diff --git > a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path > -for-PMUFW_INIT_.patch > b/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path > -for-PMUFW_INIT_.patch > deleted file mode 100644 > index 95ab7b3b75..0000000000 > --- > a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path > -for-PMUFW_INIT_.patch > +++ /dev/null > @@ -1,68 +0,0 @@ > -From c7df098a71e05dc81cee818747759e8060b59626 Mon Sep 17 00:00:00 > 2001 > -From: Luca Ceresoli > -Date: Mon, 4 Jun 2018 12:21:01 +0200 > -Subject: [PATCH] arm64: zynqmp: accept an absolute path for > PMUFW_INIT_FILE > - > -The value of PMUFW_INIT_FILE is prefixed with "$(srctree)/", thus > -forcing it to be a relative path inside the U-Boot source tree. Since > -the PMUFW is a binary file generated outside of U-Boot, the PMUFW > -binary must be copied inside the U-Boot source tree before the > -build. > - > -This generates a few problems: > - > - * if the source tree is shared among different out-of-tree builds, > - they will pollute (and potentially corrupt) each other > - * the source tree cannot be read-only > - * any buildsystem must add a command to copy the PMUFW binary > - * putting an externally-generated binary in the source tree is ugly > - as hell > - > -Avoid these problems by accepting an absolute path for > -PMUFW_INIT_FILE. This would be as simple as removing the "$(srctree)/" > -prefix, but in order to keep backward compatibility we rather use the > -shell and readlink to get the absolute path even when starting from a > -relative path. > - > -Since 'readlink -f' produces an empty string if the file does not > -exist, we also add a check to ensure the file configured in > -PMUFW_INIT_FILE exists. Otherwise the build would exit successfully, > -but produce a boot.bin without PMUFW as if PMUFW_INIT_FILE were empty. > - > -Tested in the 12 possible combinations of: > - - PMUFW_INIT_FILE empty, relative, absolute, non-existing > - - building in-tree, in subdir, in other directory > - > -Signed-off-by: Luca Ceresoli > -Cc: Michal Simek > -Cc: Simon Glass > -Cc: Emmanuel Vadot > -Signed-off-by: Michal Simek -Backported > from upstream: > https://git.denx.de/?p=u-boot.git;a=commit;h=c7df098a71e05dc81cee81874 > 7759e8060b59626 > ---- > - scripts/Makefile.spl | 8 +++++++- > - 1 file changed, 7 insertions(+), 1 deletion(-) > - > -diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl -index > ef018b5b4056..252f13826d4c 100644 > ---- a/scripts/Makefile.spl > -+++ b/scripts/Makefile.spl > -@@ -167,8 +167,14 @@ ifdef CONFIG_ARCH_ZYNQ > - MKIMAGEFLAGS_boot.bin = -T zynqimage -R > $(srctree)/$(CONFIG_BOOT_INIT_FILE) > - endif > - ifdef CONFIG_ARCH_ZYNQMP > -+ifneq ($(CONFIG_PMUFW_INIT_FILE),"") > -+spl/boot.bin: zynqmp-check-pmufw > -+zynqmp-check-pmufw: FORCE > -+ ( cd $(srctree) && test -r $(CONFIG_PMUFW_INIT_FILE) ) \ > -+ || ( echo "Cannot read $(CONFIG_PMUFW_INIT_FILE)" && > -+false ) endif > - MKIMAGEFLAGS_boot.bin = -T zynqmpimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) \ > -- -n $(srctree)/$(CONFIG_PMUFW_INIT_FILE) > -+ -n "$(shell cd $(srctree); readlink -f $(CONFIG_PMUFW_INIT_FILE))" > - endif > - > - spl/boot.bin: $(obj)/u-boot-spl.bin FORCE > --- > -2.7.4 > - > diff --git > a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-in > it-file-as-a-kco.patch > b/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-in > it-file-as-a-kco.patch > deleted file mode 100644 > index b32e162780..0000000000 > --- > a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-in > it-file-as-a-kco.patch > +++ /dev/null > @@ -1,175 +0,0 @@ > -From 4c9d54ab5a41d65000c8d249b6fb1b76056f1812 Mon Sep 17 00:00:00 > 2001 > -From: Luca Ceresoli > -Date: Wed, 20 Jun 2018 12:11:50 +0200 > -Subject: [PATCH] arm/arm64: zynq/zynqmp: pass the PS init file as a > kconfig > - variable > - > -U-Boot needs to link ps7_init_gpl.c on Zynq or psu_init_gpl.c on > -ZynqMP (PS init for short). The current logic to locate this file for > -both platforms is: > - > - 1. if a board-specific file exists in > - board/xilinx/zynq[mp]/$(CONFIG_DEFAULT_DEVICE_TREE)/ps?_init_gpl.c > - then use it > - 2. otherwise use board/xilinx/zynq/ps?_init_gpl.c > - > -In the latter case the file does not exist in the U-Boot sources and > -must be copied in the source tree from the outside before starting > the -build. This is typical when it is generated from Xilinx tools > while -developing a custom hardware. However making sure that a > -board-specific file is _not_ found (and used) requires some trickery > -such as removing or overwriting all PS init files (e.g.: the current > -meta-xilinx yocto layer [0]). > - > -This generates a few problems: > - > - * if the source tree is shared among different out-of-tree builds, > - they will pollute (and potentially corrupt) each other > - * the source tree cannot be read-only > - * any buildsystem must add a command to copy the PS init file binary > - * overwriting or deleting files in the source tree is ugly as hell > - > -Simplify usage by allowing to pass the path to the desired PS init > -file in kconfig variable XILINX_PS_INIT_FILE. It can be an absolute > -path or relative to $(srctree). If the variable is set, the > -user-specified file will always be used without being copied -around. > If the the variable is left empty, for backward compatibility -fall > back to the old behaviour. > - > -Since the issue is the same for Zynq and ZynqMP, add one kconfig > -variable in a common place and use it for both. > - > -Also use the new kconfig help text to document all the ways to give > -U-Boot the PS init file. > - > -Build-tested with all combinations of: > - - platform: zynq or zynqmp > - - PS init file: from XILINX_PS_INIT_FILE (absolute, relative path, > - non-existing), in-tree board-specific, in board/xilinx/zynq[mp]/ > - - building in-tree, in subdir, in other directory > - > -[0] > https://github.com/Xilinx/meta-xilinx/blob/b2f74cc7fe5c4881589d5e440a1 > 7cb51fc66a7ab/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init. > inc#L9 > - > -Signed-off-by: Luca Ceresoli > -Cc: Albert Aribaud > -Cc: Michal Simek > -Cc: Nathan Rossi -Backported from upstream: > https://git.denx.de/?p=u-boot.git;a=commit;h=6da4f67ad09cd8b311d77b2b0 > 4e557b7ef65b56c > ---- > - arch/arm/Kconfig | 1 + > - board/xilinx/Kconfig | 41 +++++++++++++++++++++++++++++++++++++++++ > - board/xilinx/zynq/Makefile | 10 +++++++++- > - board/xilinx/zynqmp/Makefile | 10 +++++++++- > - 4 files changed, 60 insertions(+), 2 deletions(-) > - create mode 100644 board/xilinx/Kconfig > - > -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index > 22234cde2ab6..e04979d0ef7e 100644 > ---- a/arch/arm/Kconfig > -+++ b/arch/arm/Kconfig > -@@ -1293,4 +1293,5 @@ source "board/technologic/ts4600/Kconfig" > - source "board/vscom/baltos/Kconfig" > - source "board/woodburn/Kconfig" > - source "board/work-microwave/work_92105/Kconfig" > -+source "board/xilinx/Kconfig" > - source "board/zipitz2/Kconfig" > - > - source "arch/arm/Kconfig.debug" > -diff --git a/board/xilinx/Kconfig b/board/xilinx/Kconfig -new file > mode 100644 -index 000000000000..aa3fa061edef > ---- /dev/null > -+++ b/board/xilinx/Kconfig > -@@ -0,0 +1,41 @@ > -+# Copyright (c) 2018, Luca Ceresoli # # > -+SPDX-License-Identifier: GPL-2.0 > -+ > -+if ARCH_ZYNQ || ARCH_ZYNQMP > -+ > -+config XILINX_PS_INIT_FILE > -+ string "Zynq/ZynqMP PS init file(s) location" > -+ help > -+ On Zynq and ZynqMP U-Boot SPL (or U-Boot proper if > -+ ZYNQMP_PSU_INIT_ENABLED is set) is responsible for some > -+ basic initializations, such as enabling peripherals and > -+ configuring pinmuxes. The PS init file (called > -+ psu_init_gpl.c on ZynqMP, ps7_init_gpl.c for Zynq-7000) > -+ contains the code for such initializations. > -+ > -+ U-Boot contains PS init files for some boards, but each of > -+ them describes only one specific configuration. Users of a > -+ different board, or needing a different configuration, can > -+ generate custom files using the Xilinx development tools. > -+ > -+ There are three ways to give a PS init file to U-Boot: > -+ > -+ 1. Set this variable to the path, either relative to the > -+ source tree or absolute, where the psu_init_gpl.c or > -+ ps7_init_gpl.c file is located. U-Boot will build this > -+ file. > -+ > -+ 2. If you leave an empty string here, U-Boot will use > -+ board/xilinx/zynq/$(CONFIG_DEFAULT_DEVICE_TREE)/ps7_init_gpl.c > -+ for Zynq-7000, or > -+ board/xilinx/zynqmp/$(CONFIG_DEFAULT_DEVICE_TREE)/psu_init_gpl.c > -+ for ZynqMP. > -+ > -+ 3. If the above file does not exist, U-Boot will use > -+ board/xilinx/zynq/ps7_init_gpl.c for Zynq-7000, or > -+ board/xilinx/zynqmp/psu_init_gpl.c for ZynqMP. This file > -+ is not provided by U-Boot, you have to copy it there > -+ before the build. > -+ > -+endif > -diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile > -index 5a76a26720cd..03ad5f0532ee 100644 > ---- a/board/xilinx/zynq/Makefile > -+++ b/board/xilinx/zynq/Makefile > -@@ -5,10 +5,18 @@ > - > - obj-y := board.o > - > --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) > -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") > -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f > -+$(CONFIG_XILINX_PS_INIT_FILE)) init-objs := ps_init_gpl.o > -+spl/board/xilinx/zynq/ps_init_gpl.o board/xilinx/zynq/ps_init_gpl.o: $(PS_INIT_FILE) > -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ endif > - > -+ifeq ($(init-objs),) > -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) > - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/ps7_init_gpl.c),\ > - $(hw-platform-y)/ps7_init_gpl.o) > -+endif > - > - ifeq ($(init-objs),) > - ifneq ($(wildcard $(srctree)/$(src)/ps7_init_gpl.c),) > -diff --git a/board/xilinx/zynqmp/Makefile > b/board/xilinx/zynqmp/Makefile -index 05ccd25dcef3..960b81fc5853 > 100644 > ---- a/board/xilinx/zynqmp/Makefile > -+++ b/board/xilinx/zynqmp/Makefile > -@@ -5,10 +5,18 @@ > - > - obj-y := zynqmp.o > - > --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) > -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") > -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f > -+$(CONFIG_XILINX_PS_INIT_FILE)) init-objs := ps_init_gpl.o > -+spl/board/xilinx/zynqmp/ps_init_gpl.o board/xilinx/zynqmp/ps_init_gpl.o: $(PS_INIT_FILE) > -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ endif > - > -+ifeq ($(init-objs),) > -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) > - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/psu_init_gpl.c),\ > - $(hw-platform-y)/psu_init_gpl.o) > -+endif > - > - ifeq ($(init-objs),) > - ifneq ($(wildcard $(srctree)/$(src)/psu_init_gpl.c),) > --- > -2.7.4 > - > diff --git a/configs/zynqmp_zcu102_defconfig > b/configs/zynqmp_zcu102_defconfig new file mode 100644 index > 0000000000..336f5c2dbe > --- /dev/null > +++ b/configs/zynqmp_zcu102_defconfig > @@ -0,0 +1,35 @@ > +BR2_aarch64=y > +BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_GIT=y > +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2" > +BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +# BR2_TARGET_ROOTFS_TAR is not set > +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.4_2021.2" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_SPL=y > +BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" > +BR2_TARGET_UBOOT_ZYNQMP=y > +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/master/bin/pmufw-v2021.2.bin" > +BR2_TARGET_UBOOT_FORMAT_ITB=y > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_MTOOLS=y As pointed above this ^^^ file must be in a separate patch and it deserves also a maintainer. So please you or maybe Luca could add an entry to DEVELOPERS for this board > diff --git a/configs/zynqmp_zcu106_defconfig > b/configs/zynqmp_zcu106_defconfig index bee7c1daf7..3a6947e1e8 100644 > --- a/configs/zynqmp_zcu106_defconfig > +++ b/configs/zynqmp_zcu106_defconfig > @@ -1,11 +1,11 @@ > BR2_aarch64=y > BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" Since all patches are gone, this ^^^ is not needed anymore > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_GIT=y > BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" > -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" > @@ -14,21 +14,22 @@ BR2_TARGET_ROOTFS_EXT2_4=y > # BR2_TARGET_ROOTFS_TAR is not set > BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.4_2021.2" It's worth mention in commit log that you're switching from ARM to Xilinx ATF > BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" > -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7" > -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA" > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" > BR2_TARGET_UBOOT_NEEDS_DTC=y > BR2_TARGET_UBOOT_SPL=y > BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" > BR2_TARGET_UBOOT_ZYNQMP=y > -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/53fdb7b6c92860ceb0ec5fd14deee302f4a84269/bin/pmufw-zcu106-default-v2017.4.bin" > +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/master/bin/pmufw-v2021.2.bin" > +BR2_TARGET_UBOOT_FORMAT_ITB=y Here ^^^ I see that probably you're switching from .bin to .itb so better mention it in commit log > BR2_PACKAGE_HOST_DOSFSTOOLS=y > BR2_PACKAGE_HOST_GENIMAGE=y > BR2_PACKAGE_HOST_MTOOLS=y Thank you! Best regards -- Giulio Benetti Benetti Engineering sas From thomas.petazzoni at bootlin.com Thu Feb 3 07:05:51 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 03 Feb 2022 07:05:51 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-02-02 Message-ID: <20220203070556.DD3D941570@smtp4.osuosl.org> Hello, Autobuild statistics for 2022-02-02 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 76 | 12 | 0 | 88 | 2021.11.x | 27 | 4 | 0 | 31 | master | 66 | 93 | 0 | 159 | Classification of failures by reason for master ----------------------------------------------- host-util-linux-2.37.3 | 62 host-libselinux-3.3 | 6 unknown | 4 python-aiohttp-3.8.1 | 2 rtorrent-0.9.8 | 2 rygel-0.40.2 | 2 adwaita-icon-theme-3.37.2 | 1 bluez5_utils-5.63 | 1 boinc-7.18.1 | 1 cryptsetup-2.4.2 | 1 frr-8.1 | 1 host-python-docutils-0.15.2 | 1 jasper-2.0.33 | 1 libglvnd-1.3.2 | 1 libselinux-3.3 | 1 mesa3d-21.3.4 | 1 mp4v2-5.0.1 | 1 python-argon2-cffi-21.1.0 | 1 python-brotli-1.0.9 | 1 sconeserver-6b932d7d8dbb700... | 1 xvisor-0.3.1 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- m68k | adwaita-icon-theme-3.37.2 | NOK | http://autobuild.buildroot.net/results/0e00059b09b4445eaaec1030997883187c6a80d6 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/c39c0e9b5411bc586173b47324b052efb110fe3f | arm | boinc-7.18.1 | NOK | http://autobuild.buildroot.net/results/5816378705c3276e97dc8c030b3b0f9a3e391aa9 | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/bad4d01fde3191e4d481a8e9dae18df3b1a94537 | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/885f01b447ed4de75dbbc4491f0c6bdd3997700e | aarch64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/84bc42a947cc2c68c9d601e98cc8954c88e33b11 | s390x | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/29fd227a36b6493fdfede4d224daa193ec77ffaa | mips64el | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/b23eee490b9be140e019933112f1f7612578bca0 | sparc64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/37f11633d96729f0d8020ddbc13b9acf0120c0a1 | mips64el | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/9362ea8a085c97ce3c9a37c5a00b42e0644989b2 | powerpc64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/23d2e80704debd4d624c63661dcc20c0c1c488d5 | sparc64 | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/02dd94c09dabdbdd8b47673393577a7fd3af3aeb | m68k | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/cbdf02d6d44c1c0ea9b99fe9a53dc451c02c6d45 | ORPH powerpc | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/35fc4e922d7d5ba5e85dbd376d9a0b954271f59e | ORPH arc | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/5f43ab24b9b49b020fffbb59489abed55c07f5c2 | ORPH mips64el | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/7a4309bc894be152a85d8b25bab17ffd993617bb | ORPH sparc | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/2227d8aef44fc3b082c8e93ef3eef94087f7d2ac | ORPH arc | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/23fe38ff0be9d4d25f512bab033d9ddae8fd4354 | ORPH sparc | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/38eb5ef2ab6ce6161487a660b8756858f29f31e7 | ORPH arm | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/13b74ff23b18e0b01a7cee57b9584d3880611dc0 | ORPH mipsel | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/38325617007308c109020f75679994e14b0015a6 | ORPH arm | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/bc6aa6156d2f48c14681e260e61b97d339bce76d | ORPH aarch64 | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/3923bba9148638414a0d180a9e1feb17e0171f64 | ORPH arm | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/aadb130fc7ad7c5e5df0700d48f32d2a5a944452 | ORPH m68k | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/130cf2ceb980a86cca86ff6a7a945203e486a9dd | ORPH arm | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/eaf9a3a4f8c226084e6e21501a2d3e13d0e742b8 | ORPH i686 | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/6cc15972eb4cb6d771597bf98e176775b253dfa5 | ORPH arm | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/3708db3d397332a939a8276d957f0fb51f0360fb | ORPH mips64el | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/d4bd6fcb37d566bdba7dd9c2b46fe6b007259652 | ORPH m68k | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/3bf0471e2fc79a495385f9202171e2c8ae4ace5d | ORPH mips | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/ec01e80449ecafe015c9b693ba3a7c2b2917786a | ORPH powerpc64 | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/cbdf8ef931a63b7a5375778c4927f6ca28bb999d | ORPH aarch64 | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/7bdd64e7c031a4bc4a51569bdacd0f12000d19ea | ORPH x86_64 | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/5282e9846785d8e03dce2c05f0e678b8d9cb610c | ORPH arm | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/4649d72ab7093b60239e8210d3329587148c129e | ORPH m68k | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/7216879730b1a4d27bb3640e3e4b95d7d06f80ff | ORPH mipsel | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/ec98d23f5f0f60154519a919a30a86a820a18ea9 | ORPH arm | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/15cdd73c29306891c365fb35e580043191fe54e3 | ORPH arm | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/c101c4033a456cd23c724db7ee178dd771cdf3b4 | ORPH arc | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/d617bb3e5aec233712f53dc78476119f5454cbd7 | ORPH mipsel | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/7bde5bf714b4a5007ea2b06124f514bfbc41301d | ORPH powerpc64le | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/1ec43c2e9fd529dd99f8fa8a1d160c9b5a5fa736 | ORPH m68k | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/5589845b14a47c29918e2bdc93ccfb74d0b7c73d | ORPH xtensa | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/739399b1bd664a13e1a4b81fdace8f45be95f096 | ORPH mipsel | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/e498da3b10b2c4f24c74f7a14a7941ed2b451ec6 | ORPH powerpc | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/c85cd1634e940bb242d72092fe68d2d05a33f03a | ORPH arc | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/28d792f74d0ce34c5f751a0ba1b6edb40d92f1aa | ORPH aarch64 | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/23afe9f1f13b7693cca24e3e86f9d04fd095a50f | ORPH x86_64 | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/4dd133b0cf5d2d29321bc38a875e909544fc114f | ORPH arc | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/5ed83936207623190ed65f61996c4917b6d5cdeb | ORPH powerpc | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/af8bbe1c2019066aa8baf7790f35887b9c4c1ef7 | ORPH arc | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/0d20979df14c7fd0307c6bc78d0c6e977191e9ae | ORPH arm | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/47780646faf8cbd1cb1b1b7560cdda23134ac24f | ORPH arc | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/187548fadcc66e8cdbc24a3ef2c45ee6a8a853e5 | ORPH arm | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/52dac30516ca65522c424115573e7ddb9361d8f9 | ORPH mipsel | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/8b9e5776768ecd77c0798534aa7517d5e230f53a | ORPH mips64el | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/c03a703745152fff6690087871e22370dc55c669 | ORPH powerpc64 | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/07f6daaa46538fcd938537949078c3a1f0ae6929 | ORPH s390x | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/dd4d28bf5a8a618d992b4cae9423af4947b46fd0 | ORPH m68k | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/719a846c965cf09b9a97abaf4a877698d791cffb | ORPH arm | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/8dbb4e0cf367f6f72c07c57c66535a560b4e036e | ORPH arm | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/e52f4dccae02f7264c2bfefbf8f5e7d83dee04af | ORPH sparc | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/55e1809c78ad46c8bdcf042b39a858022e65d636 | ORPH x86_64 | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/b8cb40efc036a01802c914544cd4fc29dfd67af6 | ORPH arm | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/ba1369703e3c5b2d730bafcb5faea90b0ba27dd5 | ORPH riscv64 | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/cb06fb63ed8700af2d3c737a5e8e8a11d988b3f5 | ORPH riscv64 | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/f0c87123ce569e46941339359c1a624a99c562f0 | ORPH powerpc | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/a047476142dc27681d5eb9ec60a1f6ed10531457 | ORPH x86_64 | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/2eb54d77d883d1ab31b9f61ef4e2411c9cee6d75 | ORPH mips | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/de8dd3f7c1f3e5b91af3d664edc042646812794e | ORPH i686 | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/29f273a14b2d3d44fb74fefc987cf271601e65bd | ORPH nios2 | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/26a59e826ec291b35f9d8a4aaca11b127146be8e | ORPH i686 | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/97891a7bfd78c8c87294617ce4a7d1f3d2fc6731 | ORPH arm | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/0f4e11ec2046c29acdb1e4c9bb93ee2291dca9b8 | ORPH x86_64 | jasper-2.0.33 | NOK | http://autobuild.buildroot.net/results/b106fdf32ffa9e0ef1254e0a29fdcdc821020e08 | arm | libglvnd-1.3.2 | NOK | http://autobuild.buildroot.net/results/6ff0b80de4a09bdd34d3f627e94a4fca9d9c3514 | ORPH arc | libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/1395f1b29bcbe30fa47524736899917892cb6bf6 | x86_64 | mesa3d-21.3.4 | NOK | http://autobuild.buildroot.net/results/51866218f9ba7aa7ee3c1acf10aeb31c9d70a266 | mips64el | mp4v2-5.0.1 | NOK | http://autobuild.buildroot.net/results/8dfdf0888cf1d2904b610bfb4c8e2d75562b51c6 | ORPH i686 | python-aiohttp-3.8.1 | NOK | http://autobuild.buildroot.net/results/2e8093e68d04e8cbb20b095068b24c8bbe5f69ad | mips64el | python-aiohttp-3.8.1 | NOK | http://autobuild.buildroot.net/results/6a0d2e3db7c573cd0ca98d953185f71f9ec044fd | or1k | python-argon2-cffi-21.1.0 | NOK | http://autobuild.buildroot.net/results/3207bb214dcb0c8bb96e3994af9875a2c4e8cb2c | mipsel | python-brotli-1.0.9 | NOK | http://autobuild.buildroot.net/results/9e3cfddb651a59d7f2d04bc88e6fff2a06e9b465 | arc | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/2a563299c8668d06ec4a1684c06512520819923e | ORPH x86_64 | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/e614db8f94eaf6fabe45856ecd75af3f54d8361d | ORPH xtensa | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/2b2ce3bc565f1a5ea14f1a3eb2890670f1fda9a6 | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/a60073e472d2130fadd25384306385215a09bcf0 | mips64el | sconeserver-6b932d7d8dbb700... | NOK | http://autobuild.buildroot.net/results/be043792e6e5501631517881b10096291a654364 | powerpc64 | unknown | NOK | http://autobuild.buildroot.net/results/9cb6aeb34e238e141515d9c27b5dfaa462fb9ffa | powerpc64 | unknown | NOK | http://autobuild.buildroot.net/results/d7b8fb91f92c361bc0e38166bcb49ca58a58dbbe | m68k | unknown | NOK | http://autobuild.buildroot.net/results/aec2eeaf29dc71adc955461d0391ef3125349217 | arm | unknown | NOK | http://autobuild.buildroot.net/results/22bc42bba9ac87e72934e8c29fcd69c60cbca77c | arm | xvisor-0.3.1 | NOK | http://autobuild.buildroot.net/results/94cc1d71bbaecbda41c7ab325fb4ada30dc4cf0a | Classification of failures by reason for 2021.02.x -------------------------------------------------- unknown | 4 host-sentry-cli-1.57.0 | 3 monkey-f54856ce250c4e257354... | 2 ndisc6-1.0.4 | 2 zeromq-4.3.4 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/0aefceff16d609fbc6fceb02612355907de1b771 | powerpc | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/52f6ae114ab020c1d83d03f168e42b18fc1e6bd5 | arm | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/5173137747b60eefc8429e06d75efe52632b0fbe | mips64el | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/0d678fbfa74a2385d7a231ed6e6890793a700483 | microblazeel | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/ae9b9cc180d35261d14b31650c5aac4f7e1eb0e8 | arm | ndisc6-1.0.4 | NOK | http://autobuild.buildroot.net/results/ce203db04bf0a1b3933f5ce563a155120d7fe5f0 | ORPH arm | ndisc6-1.0.4 | NOK | http://autobuild.buildroot.net/results/d3e71c97cd62495accc667e97d17261f3d79e479 | ORPH arm | unknown | NOK | http://autobuild.buildroot.net/results/35273145d382bc4ed39222a76b3b366a1363069a | mips64el | unknown | NOK | http://autobuild.buildroot.net/results/9f4f4db18063cc0b7e21e92d948c7c73f9653909 | x86_64 | unknown | NOK | http://autobuild.buildroot.net/results/fc76a4fd44cc45c234df25b9dfee7998be0b3268 | i686 | unknown | NOK | http://autobuild.buildroot.net/results/44d85bb4341d1a5060f10a3b4677e0b5eb857ff7 | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/d5e70c6c8fb8b80d48c4cccaa9eb15eeb9c087fb | Classification of failures by reason for 2021.11.x -------------------------------------------------- unknown | 2 wavemon-0.9.4 | 2 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arc | unknown | NOK | http://autobuild.buildroot.net/results/b1e0884d5c54196d626cb25d42cd9b84b8f3e432 | mipsel | unknown | NOK | http://autobuild.buildroot.net/results/325f3be7398e5fc2a0e47c7c29be0a160638bbbd | x86_64 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/e75a5dfe638a282ca86514d5398e1451847e1d61 | mips64el | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/d7bfd6d04038bd4ef8c806d8f540f7c6c36a2531 | -- http://autobuild.buildroot.net From yann.morin at orange.com Thu Feb 3 08:11:33 2022 From: yann.morin at orange.com (yann.morin at orange.com) Date: Thu, 3 Feb 2022 09:11:33 +0100 Subject: [Buildroot] [PATCHv2] package/glibc: allow runing on kernels older than used for the headers In-Reply-To: References: <19291_1643809720_61FA8BB8_19291_487_24_41ca9ce22939ce2ed0c41973db7d612542850824.1643809712.git.yann.morin@orange.com> Message-ID: <2371_1643875895_61FB8E37_2371_137_1_20220203081133.GA3479@tl-lnx-nyma7486> Alexey, All, On 2022-02-02 17:00 +0000, Alexey Brodkin spake thusly: > > We add an option to glibc to allow the user to enable compatibility > > shims. To simplify the case, when that option is enabled, we just let > > glibc enable as old compatibility shims as supported by the current > > architecture. > Looks reasonable to me. I mean to not have all the flexibility proposed > initially, instead adding an option to fall back to something much > older compared to used headers. > > If more options are needed later, we'll get to know it at some point ;) > > And thanks for doing that, as I meant to do something similar a while ago, > but never posted my local changes. Will that be followed up by a reviewed-by or maybe a tested-by tag? ;-) Thanks for the feedback, by the way. ? Regards, Yann E. MORIN. -- ____________ .-----------------.--------------------: _ :------------------. | Yann E. MORIN | Real-Time Embedded | __/ ) | /"\ ASCII RIBBON | | +33 534.541.179 | Software Designer | _/ - /' | \ / CAMPAIGN | | +33 638.411.245 '--------------------: (_ `--, | X AGAINST | | yann.morin (at) orange.com |_=" ,--' | / \ HTML MAIL | '--------------------------------------:______/_____:------------------' _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From luca at lucaceresoli.net Thu Feb 3 08:14:33 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Thu, 3 Feb 2022 09:14:33 +0100 Subject: [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2 In-Reply-To: References: <20220202165555.3497977-1-nealf@xilinx.com> Message-ID: <57bd27fd-09c8-9441-8429-bb4983287c6c@lucaceresoli.net> Hi Neal, On 03/02/22 07:20, Neal Frager wrote: > Hi Luca, > > Thank you for your positive feedback. Below you can find my thoughts. > > Neal Frager > Embedded Processor Specialist > Xilinx > > neal.frager at xilinx.com > Mobile: +33.6.48.11.37.36 > www.linkedin.com/in/neal-frager-0397463 > > -----Original Message----- > From: Luca Ceresoli > Sent: Wednesday 2 February 2022 23:29 > To: Neal Frager ; buildroot at buildroot.org > Cc: Neal Frager > Subject: Re: [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2 > > CAUTION: This message has originated from an External Source. Please use proper judgment and caution when opening attachments, clicking links, or responding to this email. > > > Hi Neal, > > thank you for your effort and for sending a patch in the format that is the most convenient for other people to review your code. > > Your work seems generally in a good shape. I have several remarks, see below, but nothing really problematic. > > On 02/02/22 17:55, Neal Frager wrote: >> Signed-off-by: Neal Frager > > Maybe you can add more details before the Signed-off-by line, suah as "Also add a defconfig for ZCU102", "remove U-Boot and ATF patches not upstream"... > > [Neal] Could you share the proper git commands for adding comments to a patch? I would be happy to add more comments, but I am a bit new to git, and I do not know what commands I need to use. The command 'git commit' opens an editor where you can write a commit message with all the details you wish. And if you have already done your commit and want to modify the comment, use 'git commit --amend'. A suggested reading is ProGit, the official git book: https://git-scm.com/book/en/v2/Git-Basics-Recording-Changes-to-the-Repository A few suggestions on how to write a good commit message: https://cbea.ms/git-commit/ > First issue: this defconfig does not build on my PC: > > $ git clean -xdf && make zynqmp_zcu106_defconfig && verynice make > package/pkg-generic.mk:266: *** BR2_GLOBAL_PATCH_DIR contains nonexistent directory board/zynqmp/patches/. Stop. > $ > > As you removed all patches (which is sooo gooood!) you now have to remove the BR2_GLOBAL_PATCH_DIR. > > [Neal] I have not seen this error on my side, but to fix it, I will just remove the BR2_GLOBAL_PATCH_DIR from the defconfigs. > >> --- >> board/zynqmp/genimage.cfg | 1 + >> ...-fix-Remove-GGC-ignore-Warray-bounds.patch | 68 ------- >> ...64-zynqmp-zcu106-fix-SPL-MMC-booting.patch | 52 ------ >> ...2-arm64-zynqmp-Enable-booting-to-ATF.patch | 114 ------------ >> ...ept-an-absolute-path-for-PMUFW_INIT_.patch | 68 ------- >> ...ynqmp-pass-the-PS-init-file-as-a-kco.patch | 175 ------------------ >> configs/zynqmp_zcu102_defconfig | 35 ++++ >> configs/zynqmp_zcu106_defconfig | 15 +- >> 8 files changed, 44 insertions(+), 484 deletions(-) delete mode >> 100644 >> board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC >> -ignore-Warray-bounds.patch delete mode 100644 >> board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-bootin >> g.patch delete mode 100644 >> board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.pat >> ch delete mode 100644 >> board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-f >> or-PMUFW_INIT_.patch delete mode 100644 >> board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init >> -file-as-a-kco.patch create mode 100644 >> configs/zynqmp_zcu102_defconfig >> >> diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg >> index ed202f4550..557364e124 100644 >> --- a/board/zynqmp/genimage.cfg >> +++ b/board/zynqmp/genimage.cfg >> @@ -3,6 +3,7 @@ image boot.vfat { >> files = { >> "boot.bin", >> "u-boot.bin", >> + "u-boot.itb", > > Is u-boot.bin still needed, when we have the .itb? > > [Neal] u-boot.bin is no longer needed. I can remove it. > >> diff --git a/configs/zynqmp_zcu106_defconfig >> b/configs/zynqmp_zcu106_defconfig index bee7c1daf7..3a6947e1e8 100644 >> --- a/configs/zynqmp_zcu106_defconfig >> +++ b/configs/zynqmp_zcu106_defconfig >> @@ -1,11 +1,11 @@ >> BR2_aarch64=y >> BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" >> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y >> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y >> BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" >> BR2_LINUX_KERNEL=y >> BR2_LINUX_KERNEL_CUSTOM_GIT=y >> BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" >> -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" >> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2" >> BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" >> BR2_LINUX_KERNEL_DTS_SUPPORT=y >> BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" >> @@ -14,21 +14,22 @@ BR2_TARGET_ROOTFS_EXT2_4=y # >> BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y >> BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y >> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" >> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5" >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.4_2021.2" > > As far as I remember (but I ask the core developers to confirm or deny), from the Buildroot perspective upstream versions are generally preferred even when they lack some non-fundamental features (e.g.: some drivers are missing) that are in vendor forks. > > Is there a reason for switching ATF to the Xilinx fork? In this case explain it in the commit message, otherwise stay on the upstream repo, upgrading to the latest [working] release. > > A similar question applies to kernel and U-Boot: is it possible to switch to upstream releases? > > [Neal] I was trying to match the Xilinx tested software release 2021.2 with these patches. The mainline Linux kernel is still missing quite a bit of the Xilinx drivers, so if a developer uses all mainline locations, there will be things that do not work properly. The ATF should probably be ok, as it is almost identical to the Xilinx fork, but since I was already using the Xilinx fork for the Linux kernel and U-Boot, I thought it would be better to use the Xilinx tested fork for everything to remain consistent. I can understand that mainline Linux has significantly fewer drivers than the Xilinx fork. However I have good hope that current mainline U-Boot is enough to boot properly, at least it's worth giving it a try and, should it fail, explain what's the problem that forces to stay on a fork. About ATF I would just stay on mainline. I would be surprised if an old mainline version worked and not a recent one. > Ouch, now the build I had started ended with a new error: > >>>> arm-trusted-firmware xlnx_rebase_v2.4_2021.2 Building > ... > AR .../build/zynqmp/release/lib/libc.a > LD .../build/zynqmp/release/bl31/bl31.elf > .../aarch64-buildroot-linux-uclibc-ld: > .../build/zynqmp/release/bl31/bl31.elf section `coherent_ram' will not fit in region `RAM' > .../aarch64-buildroot-linux-uclibc-ld: BL31 image has exceeded its limit. > .../aarch64-buildroot-linux-uclibc-ld: region `RAM' overflowed by 1 byte > > I have run my build on Ubuntu 18.04 with your patch applied on current master. > > I assume you have built and run it successfully. Any idea on why it fails on a different host? > > [Neal] I have seen the ATF build error as well. There seems to be an issue with the default buildroot aarch64-buildroot-linux-uclibc compiler when building the ATF. I fixed the issue on my side by going into the output/build/arm-trusted-firmware-xlnx_rebase_v2.4_2021.2 and running the build with the aarch-none-elf compiler using the build command below. Basically, changing nothing but the compiler. Do you have any thoughts about how to fix this? > > make CROSS_COMPILE=aarch64-none-elf- PLAT=zynqmp RESET_TO_BL31=1 I'm afraid a defconfig that requires manual steps to build is a no-go, so we really need a solution. I don't know a proper solution, but first why don't you try mainline ATF? Should it build (and run) it'd be a double win! :) Otherwise you could try another toolchain, such as one prebuilt on https://toolchains.bootlin.com/ . -- Luca From yegorslists at googlemail.com Thu Feb 3 09:08:48 2022 From: yegorslists at googlemail.com (yegorslists at googlemail.com) Date: Thu, 3 Feb 2022 10:08:48 +0100 Subject: [Buildroot] [PATCH] package/python-docutils: bump to version 0.18.1 Message-ID: <20220203090848.22869-1-yegorslists@googlemail.com> From: Yegor Yefremov Remove the obsolete patch as docutils is now a setuptools package. The package also includes code licensed under BSD-3-Clause licence. COPYING.txt has the following changes: * copyright year * more exceptions from the Public Domain added * BSD-3-Clause license added Fixes: http://autobuild.buildroot.net/results/02dd94c09dabdbdd8b47673393577a7fd3af3aeb Signed-off-by: Yegor Yefremov --- .../0001-Update-setup.py.patch | 64 ------------------- package/python-docutils/python-docutils.hash | 6 +- package/python-docutils/python-docutils.mk | 8 +-- 3 files changed, 7 insertions(+), 71 deletions(-) delete mode 100644 package/python-docutils/0001-Update-setup.py.patch diff --git a/package/python-docutils/0001-Update-setup.py.patch b/package/python-docutils/0001-Update-setup.py.patch deleted file mode 100644 index 3fb34a9763..0000000000 --- a/package/python-docutils/0001-Update-setup.py.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 583e59ccf72a02c2a6f0399f29f622c7f2f4a932 Mon Sep 17 00:00:00 2001 -From: milde -Date: Sun, 1 Sep 2019 19:39:36 +0000 -Subject: [PATCH] Update setup.py - -Python 3.4 no longer supported, -more languages supported (and Lithuanian accepted by PyPi). - -git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk at 8383 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 - -[Asaf: adjust upstream patch to 0.15.2] -Signed-off-by: Asaf Kahlon ---- - setup.py | 14 +++++++++++++- - 1 file changed, 13 insertions(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index f801ea2..5c1ebfd 100755 ---- a/setup.py -+++ b/setup.py -@@ -7,6 +7,10 @@ import os - import glob - try: - import setuptools -+except ImportError: -+ print('Warning: Could not load package `setuptools`.') -+ print('Actions requiring `setuptools` instead of `distutils` will fail') -+try: - from distutils.core import setup, Command - from distutils.command.build import build - from distutils.command.build_py import build_py -@@ -123,7 +127,7 @@ what-you-see-is-what-you-get plaintext markup syntax.""", # wrap at col 60 - 'maintainer_email': 'docutils-develop at lists.sourceforge.net', - 'license': 'public domain, Python, 2-Clause BSD, GPL 3 (see COPYING.txt)', - 'platforms': 'OS-independent', -- 'python_requires': '>=2.6, !=3.0.*, !=3.1.*, !=3.2.*', -+ 'python_requires': '>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*', - 'package_dir': {'docutils': 'docutils', - 'docutils.tools': 'tools'}, - 'packages': ['docutils', -@@ -213,14 +219,20 @@ classifiers = [ - 'Natural Language :: Chinese (Simplified)', - 'Natural Language :: Chinese (Traditional)', - 'Natural Language :: Czech', -+ 'Natural Language :: Danish', - 'Natural Language :: Dutch', - 'Natural Language :: Esperanto', - 'Natural Language :: Finnish', - 'Natural Language :: French', - 'Natural Language :: Galician', - 'Natural Language :: German', -+ 'Natural Language :: Hebrew', - 'Natural Language :: Italian', - 'Natural Language :: Japanese', -+ 'Natural Language :: Korean', -+ 'Natural Language :: Latvian', -+ 'Natural Language :: Lithuanian', -+ 'Natural Language :: Persian', - 'Natural Language :: Polish', - 'Natural Language :: Portuguese (Brazilian)', - 'Natural Language :: Russian', --- -2.20.1 -k diff --git a/package/python-docutils/python-docutils.hash b/package/python-docutils/python-docutils.hash index ccccca1064..9f6bb53bdb 100644 --- a/package/python-docutils/python-docutils.hash +++ b/package/python-docutils/python-docutils.hash @@ -1,4 +1,4 @@ # md5 from https://pypi.python.org/pypi/docutils/json, sha256 locally computed -md5 e26a308d8000b0bed7416a633217c676 docutils-0.15.2.tar.gz -sha256 a2aeea129088da402665e92e0b25b04b073c04b2dce4ab65caaa38b7ce2e1a99 docutils-0.15.2.tar.gz -sha256 efa0c85aa99ea5b4781240031b0d02af54d7b5554c87ad2b2bea9ba490f6663f COPYING.txt +md5 ca5827e2432fd58f4c8d74a6591135de docutils-0.18.1.tar.gz +sha256 679987caf361a7539d76e584cbeddc311e3aee937877c87346f31debc63e9d06 docutils-0.18.1.tar.gz +sha256 f20172170ef9aeebbf53adf5d8f7d309f7dc6068e9a3a1b52ea772305686739d COPYING.txt diff --git a/package/python-docutils/python-docutils.mk b/package/python-docutils/python-docutils.mk index 9a42d3e5dc..3872b54906 100644 --- a/package/python-docutils/python-docutils.mk +++ b/package/python-docutils/python-docutils.mk @@ -4,12 +4,12 @@ # ################################################################################ -PYTHON_DOCUTILS_VERSION = 0.15.2 +PYTHON_DOCUTILS_VERSION = 0.18.1 PYTHON_DOCUTILS_SOURCE = docutils-$(PYTHON_DOCUTILS_VERSION).tar.gz -PYTHON_DOCUTILS_SITE = https://files.pythonhosted.org/packages/93/22/953e071b589b0b1fee420ab06a0d15e5aa0c7470eb9966d60393ce58ad61 -PYTHON_DOCUTILS_LICENSE = Public Domain, BSD-2-Clause, GPL-3.0 (emacs mode), other +PYTHON_DOCUTILS_SITE = https://files.pythonhosted.org/packages/57/b1/b880503681ea1b64df05106fc7e3c4e3801736cf63deffc6fa7fc5404cf5 +PYTHON_DOCUTILS_LICENSE = Public Domain, BSD-2-Clause, BSD-3-Clause, GPL-3.0 (emacs mode), other PYTHON_DOCUTILS_LICENSE_FILES = COPYING.txt -PYTHON_DOCUTILS_SETUP_TYPE = distutils +PYTHON_DOCUTILS_SETUP_TYPE = setuptools $(eval $(python-package)) $(eval $(host-python-package)) -- 2.17.0 From br015 at umbiko.net Thu Feb 3 09:47:46 2022 From: br015 at umbiko.net (Andreas Ziegler) Date: Thu, 3 Feb 2022 10:47:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/mpd: ignore CVE-2020-746[56] intended for FreeBSD PPP daemon Message-ID: <20220203094746.22715-1-br015@umbiko.net> cpe:2.3:a:mpd_project:mpd:*:*:*:*:*:*:*:* is not a valid CPE identifier for mpd (musicpd.org); this string refers to MPD /FreeBSD PPP daemon (sourceforge.net/projects/mpd) Since mpd does not have entries in the CVE database, put these two CVE identifiers on the mpd ignore list: https://nvd.nist.gov/vuln/detail/CVE-2020-7465 https://nvd.nist.gov/vuln/detail/CVE-2020-7466 Signed-off-by: Andreas Ziegler --- package/mpd/mpd.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index 6f01b29c6d..a55e4adde2 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -11,6 +11,8 @@ 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 +# these refer to the FreeBSD PPP daemon +MPD_IGNORE_CVES = CVE-2020-7465 CVE-2020-7466 MPD_SELINUX_MODULES = mpd MPD_CONF_OPTS = \ -Daudiofile=disabled \ -- 2.33.1 From nealf at xilinx.com Thu Feb 3 10:07:50 2022 From: nealf at xilinx.com (Neal Frager) Date: Thu, 3 Feb 2022 10:07:50 +0000 Subject: [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2 In-Reply-To: <57bd27fd-09c8-9441-8429-bb4983287c6c@lucaceresoli.net> References: <20220202165555.3497977-1-nealf@xilinx.com> <57bd27fd-09c8-9441-8429-bb4983287c6c@lucaceresoli.net> Message-ID: Hi Luca, Thank you for your feedback. As for the ATF, yes, the mainline version should work, and since it does not have the same build issue with the buildroot compiler, I will move the patch back to the mainline ATF version. Unfortunately, U-Boot is another story. The mainline U-Boot will boot just fine with an SD card. However, I know that the Xilinx U-Boot QSPI driver is not yet in mainline. Since QSPI is a very popular boot flash medium, I cannot in good conscience recommend using the mainline U-Boot until QSPI is well supported for Xilinx devices. Xilinx is working hard to get all of our U-Boot and Linux kernel drivers in mainline, but we are not yet there. I would be happy to update the zcu_10x_defconfigs to using the mainline U-Boot and Linux kernels when the level of necessary support is better. Best regards, Neal Frager Embedded Processor Specialist Xilinx neal.frager at xilinx.com -----Original Message----- From: Luca Ceresoli Sent: Thursday 3 February 2022 09:15 To: Neal Frager ; buildroot at buildroot.org Subject: Re: [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2 CAUTION: This message has originated from an External Source. Please use proper judgment and caution when opening attachments, clicking links, or responding to this email. Hi Neal, On 03/02/22 07:20, Neal Frager wrote: > Hi Luca, > > Thank you for your positive feedback. Below you can find my thoughts. > > Neal Frager > Embedded Processor Specialist > Xilinx > > neal.frager at xilinx.com > Mobile: +33.6.48.11.37.36 > www.linkedin.com/in/neal-frager-0397463 > > -----Original Message----- > From: Luca Ceresoli > Sent: Wednesday 2 February 2022 23:29 > To: Neal Frager ; buildroot at buildroot.org > Cc: Neal Frager > Subject: Re: [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux > to Xilinx 2021.2 > > CAUTION: This message has originated from an External Source. Please use proper judgment and caution when opening attachments, clicking links, or responding to this email. > > > Hi Neal, > > thank you for your effort and for sending a patch in the format that is the most convenient for other people to review your code. > > Your work seems generally in a good shape. I have several remarks, see below, but nothing really problematic. > > On 02/02/22 17:55, Neal Frager wrote: >> Signed-off-by: Neal Frager > > Maybe you can add more details before the Signed-off-by line, suah as "Also add a defconfig for ZCU102", "remove U-Boot and ATF patches not upstream"... > > [Neal] Could you share the proper git commands for adding comments to a patch? I would be happy to add more comments, but I am a bit new to git, and I do not know what commands I need to use. The command 'git commit' opens an editor where you can write a commit message with all the details you wish. And if you have already done your commit and want to modify the comment, use 'git commit --amend'. A suggested reading is ProGit, the official git book: https://git-scm.com/book/en/v2/Git-Basics-Recording-Changes-to-the-Repository A few suggestions on how to write a good commit message: https://cbea.ms/git-commit/ > First issue: this defconfig does not build on my PC: > > $ git clean -xdf && make zynqmp_zcu106_defconfig && verynice make > package/pkg-generic.mk:266: *** BR2_GLOBAL_PATCH_DIR contains nonexistent directory board/zynqmp/patches/. Stop. > $ > > As you removed all patches (which is sooo gooood!) you now have to remove the BR2_GLOBAL_PATCH_DIR. > > [Neal] I have not seen this error on my side, but to fix it, I will just remove the BR2_GLOBAL_PATCH_DIR from the defconfigs. > >> --- >> board/zynqmp/genimage.cfg | 1 + >> ...-fix-Remove-GGC-ignore-Warray-bounds.patch | 68 ------- >> ...64-zynqmp-zcu106-fix-SPL-MMC-booting.patch | 52 ------ >> ...2-arm64-zynqmp-Enable-booting-to-ATF.patch | 114 ------------ >> ...ept-an-absolute-path-for-PMUFW_INIT_.patch | 68 ------- >> ...ynqmp-pass-the-PS-init-file-as-a-kco.patch | 175 ------------------ >> configs/zynqmp_zcu102_defconfig | 35 ++++ >> configs/zynqmp_zcu106_defconfig | 15 +- >> 8 files changed, 44 insertions(+), 484 deletions(-) delete mode >> 100644 >> board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GG >> C -ignore-Warray-bounds.patch delete mode 100644 >> board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booti >> n >> g.patch delete mode 100644 >> board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.pa >> t >> ch delete mode 100644 >> board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path- >> f or-PMUFW_INIT_.patch delete mode 100644 >> board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-ini >> t -file-as-a-kco.patch create mode 100644 >> configs/zynqmp_zcu102_defconfig >> >> diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg >> index ed202f4550..557364e124 100644 >> --- a/board/zynqmp/genimage.cfg >> +++ b/board/zynqmp/genimage.cfg >> @@ -3,6 +3,7 @@ image boot.vfat { >> files = { >> "boot.bin", >> "u-boot.bin", >> + "u-boot.itb", > > Is u-boot.bin still needed, when we have the .itb? > > [Neal] u-boot.bin is no longer needed. I can remove it. > >> diff --git a/configs/zynqmp_zcu106_defconfig >> b/configs/zynqmp_zcu106_defconfig index bee7c1daf7..3a6947e1e8 100644 >> --- a/configs/zynqmp_zcu106_defconfig >> +++ b/configs/zynqmp_zcu106_defconfig >> @@ -1,11 +1,11 @@ >> BR2_aarch64=y >> BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" >> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y >> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y >> BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" >> BR2_LINUX_KERNEL=y >> BR2_LINUX_KERNEL_CUSTOM_GIT=y >> BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" >> -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" >> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2" >> BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" >> BR2_LINUX_KERNEL_DTS_SUPPORT=y >> BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" >> @@ -14,21 +14,22 @@ BR2_TARGET_ROOTFS_EXT2_4=y # >> BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y >> BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y >> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" >> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5" >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.4_2021.2" > > As far as I remember (but I ask the core developers to confirm or deny), from the Buildroot perspective upstream versions are generally preferred even when they lack some non-fundamental features (e.g.: some drivers are missing) that are in vendor forks. > > Is there a reason for switching ATF to the Xilinx fork? In this case explain it in the commit message, otherwise stay on the upstream repo, upgrading to the latest [working] release. > > A similar question applies to kernel and U-Boot: is it possible to switch to upstream releases? > > [Neal] I was trying to match the Xilinx tested software release 2021.2 with these patches. The mainline Linux kernel is still missing quite a bit of the Xilinx drivers, so if a developer uses all mainline locations, there will be things that do not work properly. The ATF should probably be ok, as it is almost identical to the Xilinx fork, but since I was already using the Xilinx fork for the Linux kernel and U-Boot, I thought it would be better to use the Xilinx tested fork for everything to remain consistent. I can understand that mainline Linux has significantly fewer drivers than the Xilinx fork. However I have good hope that current mainline U-Boot is enough to boot properly, at least it's worth giving it a try and, should it fail, explain what's the problem that forces to stay on a fork. About ATF I would just stay on mainline. I would be surprised if an old mainline version worked and not a recent one. > Ouch, now the build I had started ended with a new error: > >>>> arm-trusted-firmware xlnx_rebase_v2.4_2021.2 Building > ... > AR .../build/zynqmp/release/lib/libc.a > LD .../build/zynqmp/release/bl31/bl31.elf > .../aarch64-buildroot-linux-uclibc-ld: > .../build/zynqmp/release/bl31/bl31.elf section `coherent_ram' will not fit in region `RAM' > .../aarch64-buildroot-linux-uclibc-ld: BL31 image has exceeded its limit. > .../aarch64-buildroot-linux-uclibc-ld: region `RAM' overflowed by 1 > byte > > I have run my build on Ubuntu 18.04 with your patch applied on current master. > > I assume you have built and run it successfully. Any idea on why it fails on a different host? > > [Neal] I have seen the ATF build error as well. There seems to be an issue with the default buildroot aarch64-buildroot-linux-uclibc compiler when building the ATF. I fixed the issue on my side by going into the output/build/arm-trusted-firmware-xlnx_rebase_v2.4_2021.2 and running the build with the aarch-none-elf compiler using the build command below. Basically, changing nothing but the compiler. Do you have any thoughts about how to fix this? > > make CROSS_COMPILE=aarch64-none-elf- PLAT=zynqmp RESET_TO_BL31=1 I'm afraid a defconfig that requires manual steps to build is a no-go, so we really need a solution. I don't know a proper solution, but first why don't you try mainline ATF? Should it build (and run) it'd be a double win! :) Otherwise you could try another toolchain, such as one prebuilt on https://toolchains.bootlin.com/ . -- Luca From luca at lucaceresoli.net Thu Feb 3 11:04:26 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Thu, 3 Feb 2022 12:04:26 +0100 Subject: [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2 In-Reply-To: References: <20220202165555.3497977-1-nealf@xilinx.com> <57bd27fd-09c8-9441-8429-bb4983287c6c@lucaceresoli.net> Message-ID: <5b3dfa87-e879-e4d4-2797-7801bcf24435@lucaceresoli.net> Hi Neal, On 03/02/22 11:07, Neal Frager wrote: > Hi Luca, > > Thank you for your feedback. > > As for the ATF, yes, the mainline version should work, and since it does not have the same build issue with the buildroot compiler, I will move the patch back to the mainline ATF version. > > Unfortunately, U-Boot is another story. The mainline U-Boot will boot just fine with an SD card. However, I know that the Xilinx U-Boot QSPI driver is not yet in mainline. Since QSPI is a very popular boot flash medium, I cannot in good conscience recommend using the mainline U-Boot until QSPI is well supported for Xilinx devices. OK, so you have a good reason to stay on the Xilinx fork. Just mention this in your commit message. Hint: the above paragraph is a good draft to start from. > Xilinx is working hard to get all of our U-Boot and Linux kernel drivers in mainline, but we are not yet there. I would be happy to update the zcu_10x_defconfigs to using the mainline U-Boot and Linux kernels when the level of necessary support is better. Sounds like a good plan! -- Luca From peter at korsgaard.com Thu Feb 3 11:05:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 03 Feb 2022 12:05:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/libblockdev: fix build with libglib2 >= 2.69 In-Reply-To: <20220201230845.888962-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 2 Feb 2022 00:08:45 +0100") References: <20220201230845.888962-1-fontaine.fabrice@gmail.com> Message-ID: <87sft0xlax.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure raised since bump of libglib2 to version > 2.70 in commit 079923d5fabf4f887bb140808cb16067ca08b19b: > 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)) { > | ^~ > Fixes: > - http://autobuild.buildroot.org/results/8f9ca895cb07014804130a7ccbcb758b1d519470 > Signed-off-by: Fabrice Fontaine Committed, thanks. Any specific reason to not just bump to the 2.26 version? -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 3 11:04:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 3 Feb 2022 12:04:31 +0100 Subject: [Buildroot] [git commit] package/libblockdev: fix build with libglib2 >= 2.69 Message-ID: <20220203105812.ECE258275E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=72b4229cfce065d877168bf368081378d6c80a6e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since bump of libglib2 to version 2.70 in commit 079923d5fabf4f887bb140808cb16067ca08b19b: 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)) { | ^~ Fixes: - http://autobuild.buildroot.org/results/8f9ca895cb07014804130a7ccbcb758b1d519470 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...02-exec-Fix-deprecated-glib-function-call.patch | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/package/libblockdev/0002-exec-Fix-deprecated-glib-function-call.patch b/package/libblockdev/0002-exec-Fix-deprecated-glib-function-call.patch new file mode 100644 index 0000000000..2c370a133f --- /dev/null +++ b/package/libblockdev/0002-exec-Fix-deprecated-glib-function-call.patch @@ -0,0 +1,32 @@ +From aad927a81fd9067865dc391c5bbff12ac51a0002 Mon Sep 17 00:00:00 2001 +From: Manuel Wassermann +Date: Thu, 1 Jul 2021 04:45:49 +0200 +Subject: [PATCH] exec: Fix deprecated glib function call Glib will rename + "g_spawn_check_exit_status()" to "g_spawn_check_wait_status()" in version + 2.69. + +[Retrieved from: +https://github.com/storaged-project/libblockdev/commit/aad927a81fd9067865dc391c5bbff12ac51a0002] +Signed-off-by: Fabrice Fontaine +--- + src/utils/exec.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/src/utils/exec.c b/src/utils/exec.c +index 317fb5525..8faeb289c 100644 +--- a/src/utils/exec.c ++++ b/src/utils/exec.c +@@ -236,7 +236,12 @@ gboolean bd_utils_exec_and_report_status_error (const gchar **argv, const BDExtr + /* g_spawn_sync set the status in the same way waitpid() does, we need + to get the process exit code manually (this is similar to calling + WEXITSTATUS but also sets the error for terminated processes */ +- if (!g_spawn_check_exit_status (exit_status, error)) { ++ ++ #if !GLIB_CHECK_VERSION(2, 69, 0) ++ #define g_spawn_check_wait_status(x,y) (g_spawn_check_exit_status (x,y)) ++ #endif ++ ++ if (!g_spawn_check_wait_status (exit_status, error)) { + if (g_error_matches (*error, G_SPAWN_ERROR, G_SPAWN_ERROR_FAILED)) { + /* process was terminated abnormally (e.g. using a signal) */ + g_free (stdout_data); From giulio.benetti at benettiengineering.com Thu Feb 3 12:01:32 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 3 Feb 2022 13:01:32 +0100 Subject: [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2 In-Reply-To: References: <20220202165555.3497977-1-nealf@xilinx.com> <59b73223-73b3-1b9e-b8ec-0cedb0c605ef@benettiengineering.com> Message-ID: Hi Neal, On 03/02/22 07:24, Neal Frager wrote: > Hi Giulio, > > Thank you very much for your feedback. You're welcome. Please don't top-post, answer inline as you see all around the Mailing List. Also, I don't know if you've read my entire answer. Usually until you don't see "Best regards" and the name of the one who answer, the answer-mail is not finished yet, so simply scroll down until you finish the e-mail. So please check also the rest of my previous e-mail. > I would be happy to split the zynqmp_zcu102_defconfig off into a second patch. No problem. Fine > As for adding comments to the log, could you share the proper git commands for doing this? I would be happy to do it, but I am a bit new to git and I did not know the proper command to use for adding log comments. Luca already pointed you a lot of very useful links. Another tool I like to create patches for me is "git gui" and also "gitk" to scroll the commits in a non-console way. Most of all "git gui" is helpful to me to choose a single line to stage or revert. Best regards --- Giulio Benetti Benetti Engineering sas > Best regards, > > Neal Frager > Xilinx > > -----Original Message----- > From: Giulio Benetti > Sent: Wednesday 2 February 2022 23:33 > To: Neal Frager ; buildroot at buildroot.org > Cc: luca at lucaceresoli.net; Neal Frager > Subject: Re: [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2 > > CAUTION: This message has originated from an External Source. Please use proper judgment and caution when opening attachments, clicking links, or responding to this email. > > > Hi Neal, > > nice to see you've made it with git send-email :-), > > Here I would improve commit log by stating that you're dropping all local patches because they are now upstreamed > > On 02/02/22 17:55, Neal Frager wrote: >> Signed-off-by: Neal Frager >> --- >> board/zynqmp/genimage.cfg | 1 + >> ...-fix-Remove-GGC-ignore-Warray-bounds.patch | 68 ------- >> ...64-zynqmp-zcu106-fix-SPL-MMC-booting.patch | 52 ------ >> ...2-arm64-zynqmp-Enable-booting-to-ATF.patch | 114 ------------ >> ...ept-an-absolute-path-for-PMUFW_INIT_.patch | 68 ------- >> ...ynqmp-pass-the-PS-init-file-as-a-kco.patch | 175 ------------------ >> configs/zynqmp_zcu102_defconfig | 35 ++++ > > This ^^^ file is added, so it deserves a second patch after this one, basically this becomes a patchset of 2 patches > >> configs/zynqmp_zcu106_defconfig | 15 +- >> 8 files changed, 44 insertions(+), 484 deletions(-) >> delete mode 100644 board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch >> delete mode 100644 board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch >> delete mode 100644 board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch >> delete mode 100644 board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch >> delete mode 100644 board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch >> create mode 100644 configs/zynqmp_zcu102_defconfig >> >> diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg >> index ed202f4550..557364e124 100644 >> --- a/board/zynqmp/genimage.cfg >> +++ b/board/zynqmp/genimage.cfg >> @@ -3,6 +3,7 @@ image boot.vfat { >> files = { >> "boot.bin", >> "u-boot.bin", >> + "u-boot.itb", > > Can you please justify this adding ^^^ in commit log? > >> "atf-uboot.ub", >> "system.dtb", >> "Image" >> diff --git >> a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-G >> GC-ignore-Warray-bounds.patch >> b/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-G >> GC-ignore-Warray-bounds.patch >> deleted file mode 100644 >> index 0c1a9ba2a4..0000000000 >> --- >> a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-G >> GC-ignore-Warray-bounds.patch >> +++ /dev/null >> @@ -1,68 +0,0 @@ >> -From da003e6ada7d0217fe99dc7c649a731f8ebd3c34 Mon Sep 17 00:00:00 >> 2001 >> -From: Deepika Bhavnani >> -Date: Thu, 15 Aug 2019 00:56:46 +0300 >> -Subject: [PATCH] Coverity fix: Remove GGC ignore -Warray-bounds >> - >> -GCC diagnostics were added to ignore array boundaries, instead -of >> ignoring GCC warning current code will check for array boundaries -and >> perform and array update only for valid elements. >> - >> -Resolves: `CID 246574` `CID 246710` `CID 246651` >> - >> -Signed-off-by: Deepika Bhavnani >> -Change-Id: I7530ecf7a1707351c6ee87e90cc3d33574088f57 >> - >> -Backported from: 41af05154abe136938bcfb5f26c969933784bbef >> -[Adapted to apply on 1.5] >> - >> ---- >> - lib/psci/psci_common.c | 20 ++++++++++---------- >> - 1 file changed, 10 insertions(+), 10 deletions(-) >> - >> -diff --git a/lib/psci/psci_common.c b/lib/psci/psci_common.c -index >> 2220a745cd6e..6282d992a2f0 100644 >> ---- a/lib/psci/psci_common.c >> -+++ b/lib/psci/psci_common.c >> -@@ -188,21 +188,17 @@ static unsigned int >> get_power_on_target_pwrlvl(void) >> - >> /********************************************************************* >> ********* >> - * Helper function to update the requested local power state array. >> This array >> - * does not store the requested state for the CPU power level. Hence >> an >> -- * assertion is added to prevent us from accessing the wrong index. >> -+ * assertion is added to prevent us from accessing the CPU power level. >> - >> ********************************************************************** >> *******/ >> - static void psci_set_req_local_pwr_state(unsigned int pwrlvl, >> - unsigned int cpu_idx, >> - plat_local_state_t req_pwr_state) >> - { >> -- /* >> -- * This should never happen, we have this here to avoid >> -- * "array subscript is above array bounds" errors in GCC. >> -- */ >> - assert(pwrlvl > PSCI_CPU_PWR_LVL); >> --#pragma GCC diagnostic push >> --#pragma GCC diagnostic ignored "-Warray-bounds" >> -- psci_req_local_pwr_states[pwrlvl - 1][cpu_idx] = req_pwr_state; >> --#pragma GCC diagnostic pop >> -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && >> -+ (cpu_idx < PLATFORM_CORE_COUNT)) { >> -+ psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx] = req_pwr_state; >> -+ } >> - } >> - >> - >> /********************************************************************* >> ********* -@@ -228,7 +224,11 @@ static plat_local_state_t >> *psci_get_req_local_pwr_states(unsigned int pwrlvl, >> - { >> - assert(pwrlvl > PSCI_CPU_PWR_LVL); >> - >> -- return &psci_req_local_pwr_states[pwrlvl - 1][cpu_idx]; >> -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && >> -+ (cpu_idx < PLATFORM_CORE_COUNT)) { >> -+ return &psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx]; >> -+ } else >> -+ return NULL; >> - } >> - >> - /* >> --- >> -2.34.0 >> - >> diff --git >> a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-boot >> ing.patch >> b/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-boot >> ing.patch >> deleted file mode 100644 >> index 4d85e1bb12..0000000000 >> --- >> a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-boot >> ing.patch >> +++ /dev/null >> @@ -1,52 +0,0 @@ >> -From e5d72ed8339eb05285448aad3c89d21e4d18fd29 Mon Sep 17 00:00:00 >> 2001 >> -From: Luca Ceresoli >> -Date: Mon, 26 Feb 2018 09:40:34 +0100 >> -Subject: [PATCH] arm64: zynqmp: zcu106: fix SPL MMC booting >> - >> -The U-Boot SPL generated with the current zcu106 defconfig cannot >> boot -from MMC: >> - >> - [...] >> - U-Boot SPL 2018.01 (Feb 21 2018 - 17:47:14) >> - EL Level: EL3 >> - Trying to boot from MMC1 >> - sdhci_transfer_data: Error detected in status(0x408020)! >> - spl_load_image_fat_os: error reading image u-boot.bin, err - -2 >> - spl_load_image_fat: error reading image u-boot.img, err - -6 >> - SPL: failed to boot from all boot devices >> - ### ERROR ### Please RESET the board ### >> - >> -Fix by lowering the rpll value. The new value for the RPLL_CTRL >> -register comes from the current psu_init_gpl.c from the HDF file at >> -https://github.com/xilinx/hdf-examples/tree/01ad8ea5fd1989abf4ea5a072 >> d019a16cb2bc546/zcu106-zynqmp >> -(generated by Vivado v2017.4). >> - >> -RPLL and sdio1_ref clocks before and after this change: >> - >> - - Old values: RPLL 1.36 GHz, sdio1_ref 272 MHz >> - - New values: RPLL 1.16 GHz, sdio1_ref 233 MHz >> - >> -Signed-off-by: Luca Ceresoli >> -Cc: Michal Simek >> -Upstream-status: accepted upstream in a different form >> ---- >> - >> - board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c | 2 +- >> - 1 file changed, 1 insertion(+), 1 deletion(-) >> - >> -diff --git a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c >> b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c >> -index 4d18abe000ca..e6fa477e53e7 100644 >> ---- a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c >> -+++ b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c >> -@@ -10,7 +10,7 @@ >> - static unsigned long psu_pll_init_data(void) >> - { >> - psu_mask_write(0xFF5E0034, 0xFE7FEDEFU, 0x7E4E2C62U); >> -- psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00013C00U); >> -+ psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00014600U); >> - psu_mask_write(0xFF5E0030, 0x00000008U, 0x00000008U); >> - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000001U); >> - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000000U); >> --- >> -2.7.4 >> - >> diff --git >> a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.p >> atch >> b/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.p >> atch >> deleted file mode 100644 >> index 487fff6812..0000000000 >> --- >> a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.p >> atch >> +++ /dev/null >> @@ -1,114 +0,0 @@ >> -From 5e3cac50cc981e01d9072241035a8d4162560c71 Mon Sep 17 00:00:00 >> 2001 >> -From: Luca Ceresoli >> -Date: Mon, 12 Mar 2018 17:18:38 +0100 >> -Subject: [PATCH] arm64: zynqmp: Enable booting to ATF >> - >> -U-Boot is now able to boot to ARM Trusted Firmware (ATF). The boot >> -flow is SPL(EL3) loads ATF and full u-boot and jump to ATF(EL3) which >> -pass control to full u-boot(EL2). This has been tested on zcu106, so >> -enable it in this defconfig. >> - >> -To generate an image that triggers this booting flow, you need to >> pass -'-O arm-trusted-firmware' to mkimage. >> - >> -Signed-off-by: Luca Ceresoli >> -Signed-off-by: Michal Simek -Backported >> from upstream: >> http://git.denx.de/?p=u-boot.git;a=commit;h=5e3cac50cc981e01d907224103 >> 5a8d4162560c71 >> ---- >> - >> - configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 + >> - configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 + >> - configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 + >> - configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 + >> - configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 1 + >> - configs/xilinx_zynqmp_zcu102_revA_defconfig | 1 + >> - configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 + >> - 7 files changed, 7 insertions(+) >> - >> -diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig >> b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig >> -index c5bfa2b12638..488c72258b0e 100644 >> ---- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig >> -+++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig >> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >> - CONFIG_SPL_OS_BOOT=y >> - CONFIG_SPL_RAM_SUPPORT=y >> - CONFIG_SPL_RAM_DEVICE=y >> -+CONFIG_SPL_ATF=y >> - CONFIG_SYS_PROMPT="ZynqMP> " >> - CONFIG_FASTBOOT=y >> - CONFIG_FASTBOOT_FLASH=y >> -diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig >> b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig >> -index f86dce403a42..5d501eec0edd 100644 >> ---- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig >> -+++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig >> -@@ -20,6 +20,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >> - CONFIG_SPL_OS_BOOT=y >> - CONFIG_SPL_RAM_SUPPORT=y >> - CONFIG_SPL_RAM_DEVICE=y >> -+CONFIG_SPL_ATF=y >> - CONFIG_SYS_PROMPT="ZynqMP> " >> - CONFIG_FASTBOOT=y >> - CONFIG_FASTBOOT_FLASH=y >> -diff --git a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig >> b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig >> -index 6e947cf56827..6f7eaebd7676 100644 >> ---- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig >> -+++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig >> -@@ -16,6 +16,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >> - CONFIG_SPL_OS_BOOT=y >> - CONFIG_SPL_RAM_SUPPORT=y >> - CONFIG_SPL_RAM_DEVICE=y >> -+CONFIG_SPL_ATF=y >> - CONFIG_SYS_PROMPT="ZynqMP> " >> - CONFIG_CMD_MEMTEST=y >> - CONFIG_SYS_ALT_MEMTEST=y >> -diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig >> b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig >> -index 1c934858c61c..7a3806cba4b5 100644 >> ---- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig >> -+++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig >> -@@ -17,6 +17,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >> - CONFIG_SPL_OS_BOOT=y >> - CONFIG_SPL_RAM_SUPPORT=y >> - CONFIG_SPL_RAM_DEVICE=y >> -+CONFIG_SPL_ATF=y >> - CONFIG_SYS_PROMPT="ZynqMP> " >> - CONFIG_CMD_MEMTEST=y >> - CONFIG_SYS_ALT_MEMTEST=y >> -diff --git a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig >> b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig >> -index e13c7c56f310..e4408f182ca0 100644 >> ---- a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig >> -+++ b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig >> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >> - CONFIG_SPL_OS_BOOT=y >> - CONFIG_SPL_RAM_SUPPORT=y >> - CONFIG_SPL_RAM_DEVICE=y >> -+CONFIG_SPL_ATF=y >> - CONFIG_SYS_PROMPT="ZynqMP> " >> - CONFIG_FASTBOOT=y >> - CONFIG_FASTBOOT_FLASH=y >> -diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig >> b/configs/xilinx_zynqmp_zcu102_revA_defconfig >> -index 5b2cd495ee85..b52f6789fd4b 100644 >> ---- a/configs/xilinx_zynqmp_zcu102_revA_defconfig >> -+++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig >> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >> - CONFIG_SPL_OS_BOOT=y >> - CONFIG_SPL_RAM_SUPPORT=y >> - CONFIG_SPL_RAM_DEVICE=y >> -+CONFIG_SPL_ATF=y >> - CONFIG_SYS_PROMPT="ZynqMP> " >> - CONFIG_FASTBOOT=y >> - CONFIG_FASTBOOT_FLASH=y >> -diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig >> b/configs/xilinx_zynqmp_zcu102_revB_defconfig >> -index e6530fbfe7ff..80592554f682 100644 >> ---- a/configs/xilinx_zynqmp_zcu102_revB_defconfig >> -+++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig >> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >> - CONFIG_SPL_OS_BOOT=y >> - CONFIG_SPL_RAM_SUPPORT=y >> - CONFIG_SPL_RAM_DEVICE=y >> -+CONFIG_SPL_ATF=y >> - CONFIG_SYS_PROMPT="ZynqMP> " >> - CONFIG_FASTBOOT=y >> - CONFIG_FASTBOOT_FLASH=y >> --- >> -2.7.4 >> - >> diff --git >> a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path >> -for-PMUFW_INIT_.patch >> b/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path >> -for-PMUFW_INIT_.patch >> deleted file mode 100644 >> index 95ab7b3b75..0000000000 >> --- >> a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path >> -for-PMUFW_INIT_.patch >> +++ /dev/null >> @@ -1,68 +0,0 @@ >> -From c7df098a71e05dc81cee818747759e8060b59626 Mon Sep 17 00:00:00 >> 2001 >> -From: Luca Ceresoli >> -Date: Mon, 4 Jun 2018 12:21:01 +0200 >> -Subject: [PATCH] arm64: zynqmp: accept an absolute path for >> PMUFW_INIT_FILE >> - >> -The value of PMUFW_INIT_FILE is prefixed with "$(srctree)/", thus >> -forcing it to be a relative path inside the U-Boot source tree. Since >> -the PMUFW is a binary file generated outside of U-Boot, the PMUFW >> -binary must be copied inside the U-Boot source tree before the >> -build. >> - >> -This generates a few problems: >> - >> - * if the source tree is shared among different out-of-tree builds, >> - they will pollute (and potentially corrupt) each other >> - * the source tree cannot be read-only >> - * any buildsystem must add a command to copy the PMUFW binary >> - * putting an externally-generated binary in the source tree is ugly >> - as hell >> - >> -Avoid these problems by accepting an absolute path for >> -PMUFW_INIT_FILE. This would be as simple as removing the "$(srctree)/" >> -prefix, but in order to keep backward compatibility we rather use the >> -shell and readlink to get the absolute path even when starting from a >> -relative path. >> - >> -Since 'readlink -f' produces an empty string if the file does not >> -exist, we also add a check to ensure the file configured in >> -PMUFW_INIT_FILE exists. Otherwise the build would exit successfully, >> -but produce a boot.bin without PMUFW as if PMUFW_INIT_FILE were empty. >> - >> -Tested in the 12 possible combinations of: >> - - PMUFW_INIT_FILE empty, relative, absolute, non-existing >> - - building in-tree, in subdir, in other directory >> - >> -Signed-off-by: Luca Ceresoli >> -Cc: Michal Simek >> -Cc: Simon Glass >> -Cc: Emmanuel Vadot >> -Signed-off-by: Michal Simek -Backported >> from upstream: >> https://git.denx.de/?p=u-boot.git;a=commit;h=c7df098a71e05dc81cee81874 >> 7759e8060b59626 >> ---- >> - scripts/Makefile.spl | 8 +++++++- >> - 1 file changed, 7 insertions(+), 1 deletion(-) >> - >> -diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl -index >> ef018b5b4056..252f13826d4c 100644 >> ---- a/scripts/Makefile.spl >> -+++ b/scripts/Makefile.spl >> -@@ -167,8 +167,14 @@ ifdef CONFIG_ARCH_ZYNQ >> - MKIMAGEFLAGS_boot.bin = -T zynqimage -R >> $(srctree)/$(CONFIG_BOOT_INIT_FILE) >> - endif >> - ifdef CONFIG_ARCH_ZYNQMP >> -+ifneq ($(CONFIG_PMUFW_INIT_FILE),"") >> -+spl/boot.bin: zynqmp-check-pmufw >> -+zynqmp-check-pmufw: FORCE >> -+ ( cd $(srctree) && test -r $(CONFIG_PMUFW_INIT_FILE) ) \ >> -+ || ( echo "Cannot read $(CONFIG_PMUFW_INIT_FILE)" && >> -+false ) endif >> - MKIMAGEFLAGS_boot.bin = -T zynqmpimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) \ >> -- -n $(srctree)/$(CONFIG_PMUFW_INIT_FILE) >> -+ -n "$(shell cd $(srctree); readlink -f $(CONFIG_PMUFW_INIT_FILE))" >> - endif >> - >> - spl/boot.bin: $(obj)/u-boot-spl.bin FORCE >> --- >> -2.7.4 >> - >> diff --git >> a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-in >> it-file-as-a-kco.patch >> b/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-in >> it-file-as-a-kco.patch >> deleted file mode 100644 >> index b32e162780..0000000000 >> --- >> a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-in >> it-file-as-a-kco.patch >> +++ /dev/null >> @@ -1,175 +0,0 @@ >> -From 4c9d54ab5a41d65000c8d249b6fb1b76056f1812 Mon Sep 17 00:00:00 >> 2001 >> -From: Luca Ceresoli >> -Date: Wed, 20 Jun 2018 12:11:50 +0200 >> -Subject: [PATCH] arm/arm64: zynq/zynqmp: pass the PS init file as a >> kconfig >> - variable >> - >> -U-Boot needs to link ps7_init_gpl.c on Zynq or psu_init_gpl.c on >> -ZynqMP (PS init for short). The current logic to locate this file for >> -both platforms is: >> - >> - 1. if a board-specific file exists in >> - board/xilinx/zynq[mp]/$(CONFIG_DEFAULT_DEVICE_TREE)/ps?_init_gpl.c >> - then use it >> - 2. otherwise use board/xilinx/zynq/ps?_init_gpl.c >> - >> -In the latter case the file does not exist in the U-Boot sources and >> -must be copied in the source tree from the outside before starting >> the -build. This is typical when it is generated from Xilinx tools >> while -developing a custom hardware. However making sure that a >> -board-specific file is _not_ found (and used) requires some trickery >> -such as removing or overwriting all PS init files (e.g.: the current >> -meta-xilinx yocto layer [0]). >> - >> -This generates a few problems: >> - >> - * if the source tree is shared among different out-of-tree builds, >> - they will pollute (and potentially corrupt) each other >> - * the source tree cannot be read-only >> - * any buildsystem must add a command to copy the PS init file binary >> - * overwriting or deleting files in the source tree is ugly as hell >> - >> -Simplify usage by allowing to pass the path to the desired PS init >> -file in kconfig variable XILINX_PS_INIT_FILE. It can be an absolute >> -path or relative to $(srctree). If the variable is set, the >> -user-specified file will always be used without being copied -around. >> If the the variable is left empty, for backward compatibility -fall >> back to the old behaviour. >> - >> -Since the issue is the same for Zynq and ZynqMP, add one kconfig >> -variable in a common place and use it for both. >> - >> -Also use the new kconfig help text to document all the ways to give >> -U-Boot the PS init file. >> - >> -Build-tested with all combinations of: >> - - platform: zynq or zynqmp >> - - PS init file: from XILINX_PS_INIT_FILE (absolute, relative path, >> - non-existing), in-tree board-specific, in board/xilinx/zynq[mp]/ >> - - building in-tree, in subdir, in other directory >> - >> -[0] >> https://github.com/Xilinx/meta-xilinx/blob/b2f74cc7fe5c4881589d5e440a1 >> 7cb51fc66a7ab/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init. >> inc#L9 >> - >> -Signed-off-by: Luca Ceresoli >> -Cc: Albert Aribaud >> -Cc: Michal Simek >> -Cc: Nathan Rossi -Backported from upstream: >> https://git.denx.de/?p=u-boot.git;a=commit;h=6da4f67ad09cd8b311d77b2b0 >> 4e557b7ef65b56c >> ---- >> - arch/arm/Kconfig | 1 + >> - board/xilinx/Kconfig | 41 +++++++++++++++++++++++++++++++++++++++++ >> - board/xilinx/zynq/Makefile | 10 +++++++++- >> - board/xilinx/zynqmp/Makefile | 10 +++++++++- >> - 4 files changed, 60 insertions(+), 2 deletions(-) >> - create mode 100644 board/xilinx/Kconfig >> - >> -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index >> 22234cde2ab6..e04979d0ef7e 100644 >> ---- a/arch/arm/Kconfig >> -+++ b/arch/arm/Kconfig >> -@@ -1293,4 +1293,5 @@ source "board/technologic/ts4600/Kconfig" >> - source "board/vscom/baltos/Kconfig" >> - source "board/woodburn/Kconfig" >> - source "board/work-microwave/work_92105/Kconfig" >> -+source "board/xilinx/Kconfig" >> - source "board/zipitz2/Kconfig" >> - >> - source "arch/arm/Kconfig.debug" >> -diff --git a/board/xilinx/Kconfig b/board/xilinx/Kconfig -new file >> mode 100644 -index 000000000000..aa3fa061edef >> ---- /dev/null >> -+++ b/board/xilinx/Kconfig >> -@@ -0,0 +1,41 @@ >> -+# Copyright (c) 2018, Luca Ceresoli # # >> -+SPDX-License-Identifier: GPL-2.0 >> -+ >> -+if ARCH_ZYNQ || ARCH_ZYNQMP >> -+ >> -+config XILINX_PS_INIT_FILE >> -+ string "Zynq/ZynqMP PS init file(s) location" >> -+ help >> -+ On Zynq and ZynqMP U-Boot SPL (or U-Boot proper if >> -+ ZYNQMP_PSU_INIT_ENABLED is set) is responsible for some >> -+ basic initializations, such as enabling peripherals and >> -+ configuring pinmuxes. The PS init file (called >> -+ psu_init_gpl.c on ZynqMP, ps7_init_gpl.c for Zynq-7000) >> -+ contains the code for such initializations. >> -+ >> -+ U-Boot contains PS init files for some boards, but each of >> -+ them describes only one specific configuration. Users of a >> -+ different board, or needing a different configuration, can >> -+ generate custom files using the Xilinx development tools. >> -+ >> -+ There are three ways to give a PS init file to U-Boot: >> -+ >> -+ 1. Set this variable to the path, either relative to the >> -+ source tree or absolute, where the psu_init_gpl.c or >> -+ ps7_init_gpl.c file is located. U-Boot will build this >> -+ file. >> -+ >> -+ 2. If you leave an empty string here, U-Boot will use >> -+ board/xilinx/zynq/$(CONFIG_DEFAULT_DEVICE_TREE)/ps7_init_gpl.c >> -+ for Zynq-7000, or >> -+ board/xilinx/zynqmp/$(CONFIG_DEFAULT_DEVICE_TREE)/psu_init_gpl.c >> -+ for ZynqMP. >> -+ >> -+ 3. If the above file does not exist, U-Boot will use >> -+ board/xilinx/zynq/ps7_init_gpl.c for Zynq-7000, or >> -+ board/xilinx/zynqmp/psu_init_gpl.c for ZynqMP. This file >> -+ is not provided by U-Boot, you have to copy it there >> -+ before the build. >> -+ >> -+endif >> -diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile >> -index 5a76a26720cd..03ad5f0532ee 100644 >> ---- a/board/xilinx/zynq/Makefile >> -+++ b/board/xilinx/zynq/Makefile >> -@@ -5,10 +5,18 @@ >> - >> - obj-y := board.o >> - >> --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) >> -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") >> -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f >> -+$(CONFIG_XILINX_PS_INIT_FILE)) init-objs := ps_init_gpl.o >> -+spl/board/xilinx/zynq/ps_init_gpl.o board/xilinx/zynq/ps_init_gpl.o: $(PS_INIT_FILE) >> -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ endif >> - >> -+ifeq ($(init-objs),) >> -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) >> - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/ps7_init_gpl.c),\ >> - $(hw-platform-y)/ps7_init_gpl.o) >> -+endif >> - >> - ifeq ($(init-objs),) >> - ifneq ($(wildcard $(srctree)/$(src)/ps7_init_gpl.c),) >> -diff --git a/board/xilinx/zynqmp/Makefile >> b/board/xilinx/zynqmp/Makefile -index 05ccd25dcef3..960b81fc5853 >> 100644 >> ---- a/board/xilinx/zynqmp/Makefile >> -+++ b/board/xilinx/zynqmp/Makefile >> -@@ -5,10 +5,18 @@ >> - >> - obj-y := zynqmp.o >> - >> --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) >> -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") >> -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f >> -+$(CONFIG_XILINX_PS_INIT_FILE)) init-objs := ps_init_gpl.o >> -+spl/board/xilinx/zynqmp/ps_init_gpl.o board/xilinx/zynqmp/ps_init_gpl.o: $(PS_INIT_FILE) >> -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ endif >> - >> -+ifeq ($(init-objs),) >> -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) >> - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/psu_init_gpl.c),\ >> - $(hw-platform-y)/psu_init_gpl.o) >> -+endif >> - >> - ifeq ($(init-objs),) >> - ifneq ($(wildcard $(srctree)/$(src)/psu_init_gpl.c),) >> --- >> -2.7.4 >> - >> diff --git a/configs/zynqmp_zcu102_defconfig >> b/configs/zynqmp_zcu102_defconfig new file mode 100644 index >> 0000000000..336f5c2dbe >> --- /dev/null >> +++ b/configs/zynqmp_zcu102_defconfig >> @@ -0,0 +1,35 @@ >> +BR2_aarch64=y >> +BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" >> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y >> +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" >> +BR2_LINUX_KERNEL=y >> +BR2_LINUX_KERNEL_CUSTOM_GIT=y >> +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" >> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2" >> +BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" >> +BR2_LINUX_KERNEL_DTS_SUPPORT=y >> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" >> +BR2_TARGET_ROOTFS_EXT2=y >> +BR2_TARGET_ROOTFS_EXT2_4=y >> +# BR2_TARGET_ROOTFS_TAR is not set >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.4_2021.2" >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" >> +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2" >> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" >> +BR2_TARGET_UBOOT_NEEDS_DTC=y >> +BR2_TARGET_UBOOT_SPL=y >> +BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" >> +BR2_TARGET_UBOOT_ZYNQMP=y >> +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/master/bin/pmufw-v2021.2.bin" >> +BR2_TARGET_UBOOT_FORMAT_ITB=y >> +BR2_PACKAGE_HOST_DOSFSTOOLS=y >> +BR2_PACKAGE_HOST_GENIMAGE=y >> +BR2_PACKAGE_HOST_MTOOLS=y > > As pointed above this ^^^ file must be in a separate patch and it deserves also a maintainer. So please you or maybe Luca could add an entry to DEVELOPERS for this board > >> diff --git a/configs/zynqmp_zcu106_defconfig >> b/configs/zynqmp_zcu106_defconfig index bee7c1daf7..3a6947e1e8 100644 >> --- a/configs/zynqmp_zcu106_defconfig >> +++ b/configs/zynqmp_zcu106_defconfig >> @@ -1,11 +1,11 @@ >> BR2_aarch64=y >> BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" > > Since all patches are gone, this ^^^ is not needed anymore > >> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y >> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y >> BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" >> BR2_LINUX_KERNEL=y >> BR2_LINUX_KERNEL_CUSTOM_GIT=y >> BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" >> -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" >> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2" >> BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" >> BR2_LINUX_KERNEL_DTS_SUPPORT=y >> BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" >> @@ -14,21 +14,22 @@ BR2_TARGET_ROOTFS_EXT2_4=y >> # BR2_TARGET_ROOTFS_TAR is not set >> BR2_TARGET_ARM_TRUSTED_FIRMWARE=y >> BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y >> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" >> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5" >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.4_2021.2" > > It's worth mention in commit log that you're switching from ARM to Xilinx ATF > >> BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" >> BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" >> -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7" >> -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA" >> +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2" >> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" >> BR2_TARGET_UBOOT_NEEDS_DTC=y >> BR2_TARGET_UBOOT_SPL=y >> BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" >> BR2_TARGET_UBOOT_ZYNQMP=y >> -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/53fdb7b6c92860ceb0ec5fd14deee302f4a84269/bin/pmufw-zcu106-default-v2017.4.bin" >> +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/master/bin/pmufw-v2021.2.bin" >> +BR2_TARGET_UBOOT_FORMAT_ITB=y > > Here ^^^ I see that probably you're switching from .bin to .itb so better mention it in commit log > >> BR2_PACKAGE_HOST_DOSFSTOOLS=y >> BR2_PACKAGE_HOST_GENIMAGE=y >> BR2_PACKAGE_HOST_MTOOLS=y > > Thank you! > > Best regards > -- > Giulio Benetti > Benetti Engineering sas -- From neal.frager at xilinx.com Thu Feb 3 13:44:01 2022 From: neal.frager at xilinx.com (Neal Frager) Date: Thu, 3 Feb 2022 06:44:01 -0700 Subject: [Buildroot] [PATCH 1/2] configs/zynqmp_zcu106: Bump ATF/U-Boot/Linux to Xilinx 2021.2 Message-ID: <20220203134402.1647985-1-neal.frager@xilinx.com> bump ATF to v2.4 bump U-Boot to Xilinx 2021.2 (2021.01): important drivers not in mainline bump Linux to Xilinx 2021.2 (5.10): important drivers not in mainline deleted board/zynqmp/patches directory: already in mainline modified board/zynqmp/genimage.cfg: U-Boot 2021.01 uses u-boot.itb format bump configs/zynqmp_zcu106_defconfig to Xilinx 2021.2 Signed-off-by: Neal Frager --- board/zynqmp/genimage.cfg | 2 +- ...-fix-Remove-GGC-ignore-Warray-bounds.patch | 68 ------- ...64-zynqmp-zcu106-fix-SPL-MMC-booting.patch | 52 ------ ...2-arm64-zynqmp-Enable-booting-to-ATF.patch | 114 ------------ ...ept-an-absolute-path-for-PMUFW_INIT_.patch | 68 ------- ...ynqmp-pass-the-PS-init-file-as-a-kco.patch | 175 ------------------ board/zynqmp/readme.txt | 10 +- configs/zynqmp_zcu106_defconfig | 14 +- 8 files changed, 13 insertions(+), 490 deletions(-) delete mode 100644 board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch delete mode 100644 board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch delete mode 100644 board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch delete mode 100644 board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch delete mode 100644 board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg index ed202f4550..58dc6d785d 100644 --- a/board/zynqmp/genimage.cfg +++ b/board/zynqmp/genimage.cfg @@ -2,7 +2,7 @@ image boot.vfat { vfat { files = { "boot.bin", - "u-boot.bin", + "u-boot.itb", "atf-uboot.ub", "system.dtb", "Image" diff --git a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch b/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch deleted file mode 100644 index 0c1a9ba2a4..0000000000 --- a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch +++ /dev/null @@ -1,68 +0,0 @@ -From da003e6ada7d0217fe99dc7c649a731f8ebd3c34 Mon Sep 17 00:00:00 2001 -From: Deepika Bhavnani -Date: Thu, 15 Aug 2019 00:56:46 +0300 -Subject: [PATCH] Coverity fix: Remove GGC ignore -Warray-bounds - -GCC diagnostics were added to ignore array boundaries, instead -of ignoring GCC warning current code will check for array boundaries -and perform and array update only for valid elements. - -Resolves: `CID 246574` `CID 246710` `CID 246651` - -Signed-off-by: Deepika Bhavnani -Change-Id: I7530ecf7a1707351c6ee87e90cc3d33574088f57 - -Backported from: 41af05154abe136938bcfb5f26c969933784bbef -[Adapted to apply on 1.5] - ---- - lib/psci/psci_common.c | 20 ++++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) - -diff --git a/lib/psci/psci_common.c b/lib/psci/psci_common.c -index 2220a745cd6e..6282d992a2f0 100644 ---- a/lib/psci/psci_common.c -+++ b/lib/psci/psci_common.c -@@ -188,21 +188,17 @@ static unsigned int get_power_on_target_pwrlvl(void) - /****************************************************************************** - * Helper function to update the requested local power state array. This array - * does not store the requested state for the CPU power level. Hence an -- * assertion is added to prevent us from accessing the wrong index. -+ * assertion is added to prevent us from accessing the CPU power level. - *****************************************************************************/ - static void psci_set_req_local_pwr_state(unsigned int pwrlvl, - unsigned int cpu_idx, - plat_local_state_t req_pwr_state) - { -- /* -- * This should never happen, we have this here to avoid -- * "array subscript is above array bounds" errors in GCC. -- */ - assert(pwrlvl > PSCI_CPU_PWR_LVL); --#pragma GCC diagnostic push --#pragma GCC diagnostic ignored "-Warray-bounds" -- psci_req_local_pwr_states[pwrlvl - 1][cpu_idx] = req_pwr_state; --#pragma GCC diagnostic pop -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && -+ (cpu_idx < PLATFORM_CORE_COUNT)) { -+ psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx] = req_pwr_state; -+ } - } - - /****************************************************************************** -@@ -228,7 +224,11 @@ static plat_local_state_t *psci_get_req_local_pwr_states(unsigned int pwrlvl, - { - assert(pwrlvl > PSCI_CPU_PWR_LVL); - -- return &psci_req_local_pwr_states[pwrlvl - 1][cpu_idx]; -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && -+ (cpu_idx < PLATFORM_CORE_COUNT)) { -+ return &psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx]; -+ } else -+ return NULL; - } - - /* --- -2.34.0 - diff --git a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch b/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch deleted file mode 100644 index 4d85e1bb12..0000000000 --- a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch +++ /dev/null @@ -1,52 +0,0 @@ -From e5d72ed8339eb05285448aad3c89d21e4d18fd29 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Mon, 26 Feb 2018 09:40:34 +0100 -Subject: [PATCH] arm64: zynqmp: zcu106: fix SPL MMC booting - -The U-Boot SPL generated with the current zcu106 defconfig cannot boot -from MMC: - - [...] - U-Boot SPL 2018.01 (Feb 21 2018 - 17:47:14) - EL Level: EL3 - Trying to boot from MMC1 - sdhci_transfer_data: Error detected in status(0x408020)! - spl_load_image_fat_os: error reading image u-boot.bin, err - -2 - spl_load_image_fat: error reading image u-boot.img, err - -6 - SPL: failed to boot from all boot devices - ### ERROR ### Please RESET the board ### - -Fix by lowering the rpll value. The new value for the RPLL_CTRL -register comes from the current psu_init_gpl.c from the HDF file at -https://github.com/xilinx/hdf-examples/tree/01ad8ea5fd1989abf4ea5a072d019a16cb2bc546/zcu106-zynqmp -(generated by Vivado v2017.4). - -RPLL and sdio1_ref clocks before and after this change: - - - Old values: RPLL 1.36 GHz, sdio1_ref 272 MHz - - New values: RPLL 1.16 GHz, sdio1_ref 233 MHz - -Signed-off-by: Luca Ceresoli -Cc: Michal Simek -Upstream-status: accepted upstream in a different form ---- - - board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -index 4d18abe000ca..e6fa477e53e7 100644 ---- a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -+++ b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -@@ -10,7 +10,7 @@ - static unsigned long psu_pll_init_data(void) - { - psu_mask_write(0xFF5E0034, 0xFE7FEDEFU, 0x7E4E2C62U); -- psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00013C00U); -+ psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00014600U); - psu_mask_write(0xFF5E0030, 0x00000008U, 0x00000008U); - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000001U); - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000000U); --- -2.7.4 - diff --git a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch b/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch deleted file mode 100644 index 487fff6812..0000000000 --- a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 5e3cac50cc981e01d9072241035a8d4162560c71 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Mon, 12 Mar 2018 17:18:38 +0100 -Subject: [PATCH] arm64: zynqmp: Enable booting to ATF - -U-Boot is now able to boot to ARM Trusted Firmware (ATF). The boot -flow is SPL(EL3) loads ATF and full u-boot and jump to ATF(EL3) which -pass control to full u-boot(EL2). This has been tested on zcu106, so -enable it in this defconfig. - -To generate an image that triggers this booting flow, you need to pass -'-O arm-trusted-firmware' to mkimage. - -Signed-off-by: Luca Ceresoli -Signed-off-by: Michal Simek -Backported from upstream: http://git.denx.de/?p=u-boot.git;a=commit;h=5e3cac50cc981e01d9072241035a8d4162560c71 ---- - - configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 + - configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 + - configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 + - configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 + - configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 1 + - configs/xilinx_zynqmp_zcu102_revA_defconfig | 1 + - configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 + - 7 files changed, 7 insertions(+) - -diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig -index c5bfa2b12638..488c72258b0e 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig -index f86dce403a42..5d501eec0edd 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig -@@ -20,6 +20,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig -index 6e947cf56827..6f7eaebd7676 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig -@@ -16,6 +16,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_CMD_MEMTEST=y - CONFIG_SYS_ALT_MEMTEST=y -diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig -index 1c934858c61c..7a3806cba4b5 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig -@@ -17,6 +17,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_CMD_MEMTEST=y - CONFIG_SYS_ALT_MEMTEST=y -diff --git a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig -index e13c7c56f310..e4408f182ca0 100644 ---- a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig -+++ b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig b/configs/xilinx_zynqmp_zcu102_revA_defconfig -index 5b2cd495ee85..b52f6789fd4b 100644 ---- a/configs/xilinx_zynqmp_zcu102_revA_defconfig -+++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig -index e6530fbfe7ff..80592554f682 100644 ---- a/configs/xilinx_zynqmp_zcu102_revB_defconfig -+++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y --- -2.7.4 - diff --git a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch b/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch deleted file mode 100644 index 95ab7b3b75..0000000000 --- a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch +++ /dev/null @@ -1,68 +0,0 @@ -From c7df098a71e05dc81cee818747759e8060b59626 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Mon, 4 Jun 2018 12:21:01 +0200 -Subject: [PATCH] arm64: zynqmp: accept an absolute path for PMUFW_INIT_FILE - -The value of PMUFW_INIT_FILE is prefixed with "$(srctree)/", thus -forcing it to be a relative path inside the U-Boot source tree. Since -the PMUFW is a binary file generated outside of U-Boot, the PMUFW -binary must be copied inside the U-Boot source tree before the -build. - -This generates a few problems: - - * if the source tree is shared among different out-of-tree builds, - they will pollute (and potentially corrupt) each other - * the source tree cannot be read-only - * any buildsystem must add a command to copy the PMUFW binary - * putting an externally-generated binary in the source tree is ugly - as hell - -Avoid these problems by accepting an absolute path for -PMUFW_INIT_FILE. This would be as simple as removing the "$(srctree)/" -prefix, but in order to keep backward compatibility we rather use the -shell and readlink to get the absolute path even when starting from a -relative path. - -Since 'readlink -f' produces an empty string if the file does not -exist, we also add a check to ensure the file configured in -PMUFW_INIT_FILE exists. Otherwise the build would exit successfully, -but produce a boot.bin without PMUFW as if PMUFW_INIT_FILE were empty. - -Tested in the 12 possible combinations of: - - PMUFW_INIT_FILE empty, relative, absolute, non-existing - - building in-tree, in subdir, in other directory - -Signed-off-by: Luca Ceresoli -Cc: Michal Simek -Cc: Simon Glass -Cc: Emmanuel Vadot -Signed-off-by: Michal Simek -Backported from upstream: https://git.denx.de/?p=u-boot.git;a=commit;h=c7df098a71e05dc81cee818747759e8060b59626 ---- - scripts/Makefile.spl | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl -index ef018b5b4056..252f13826d4c 100644 ---- a/scripts/Makefile.spl -+++ b/scripts/Makefile.spl -@@ -167,8 +167,14 @@ ifdef CONFIG_ARCH_ZYNQ - MKIMAGEFLAGS_boot.bin = -T zynqimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) - endif - ifdef CONFIG_ARCH_ZYNQMP -+ifneq ($(CONFIG_PMUFW_INIT_FILE),"") -+spl/boot.bin: zynqmp-check-pmufw -+zynqmp-check-pmufw: FORCE -+ ( cd $(srctree) && test -r $(CONFIG_PMUFW_INIT_FILE) ) \ -+ || ( echo "Cannot read $(CONFIG_PMUFW_INIT_FILE)" && false ) -+endif - MKIMAGEFLAGS_boot.bin = -T zynqmpimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) \ -- -n $(srctree)/$(CONFIG_PMUFW_INIT_FILE) -+ -n "$(shell cd $(srctree); readlink -f $(CONFIG_PMUFW_INIT_FILE))" - endif - - spl/boot.bin: $(obj)/u-boot-spl.bin FORCE --- -2.7.4 - diff --git a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch b/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch deleted file mode 100644 index b32e162780..0000000000 --- a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch +++ /dev/null @@ -1,175 +0,0 @@ -From 4c9d54ab5a41d65000c8d249b6fb1b76056f1812 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Wed, 20 Jun 2018 12:11:50 +0200 -Subject: [PATCH] arm/arm64: zynq/zynqmp: pass the PS init file as a kconfig - variable - -U-Boot needs to link ps7_init_gpl.c on Zynq or psu_init_gpl.c on -ZynqMP (PS init for short). The current logic to locate this file for -both platforms is: - - 1. if a board-specific file exists in - board/xilinx/zynq[mp]/$(CONFIG_DEFAULT_DEVICE_TREE)/ps?_init_gpl.c - then use it - 2. otherwise use board/xilinx/zynq/ps?_init_gpl.c - -In the latter case the file does not exist in the U-Boot sources and -must be copied in the source tree from the outside before starting the -build. This is typical when it is generated from Xilinx tools while -developing a custom hardware. However making sure that a -board-specific file is _not_ found (and used) requires some trickery -such as removing or overwriting all PS init files (e.g.: the current -meta-xilinx yocto layer [0]). - -This generates a few problems: - - * if the source tree is shared among different out-of-tree builds, - they will pollute (and potentially corrupt) each other - * the source tree cannot be read-only - * any buildsystem must add a command to copy the PS init file binary - * overwriting or deleting files in the source tree is ugly as hell - -Simplify usage by allowing to pass the path to the desired PS init -file in kconfig variable XILINX_PS_INIT_FILE. It can be an absolute -path or relative to $(srctree). If the variable is set, the -user-specified file will always be used without being copied -around. If the the variable is left empty, for backward compatibility -fall back to the old behaviour. - -Since the issue is the same for Zynq and ZynqMP, add one kconfig -variable in a common place and use it for both. - -Also use the new kconfig help text to document all the ways to give -U-Boot the PS init file. - -Build-tested with all combinations of: - - platform: zynq or zynqmp - - PS init file: from XILINX_PS_INIT_FILE (absolute, relative path, - non-existing), in-tree board-specific, in board/xilinx/zynq[mp]/ - - building in-tree, in subdir, in other directory - -[0] https://github.com/Xilinx/meta-xilinx/blob/b2f74cc7fe5c4881589d5e440a17cb51fc66a7ab/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init.inc#L9 - -Signed-off-by: Luca Ceresoli -Cc: Albert Aribaud -Cc: Michal Simek -Cc: Nathan Rossi -Backported from upstream: https://git.denx.de/?p=u-boot.git;a=commit;h=6da4f67ad09cd8b311d77b2b04e557b7ef65b56c ---- - arch/arm/Kconfig | 1 + - board/xilinx/Kconfig | 41 +++++++++++++++++++++++++++++++++++++++++ - board/xilinx/zynq/Makefile | 10 +++++++++- - board/xilinx/zynqmp/Makefile | 10 +++++++++- - 4 files changed, 60 insertions(+), 2 deletions(-) - create mode 100644 board/xilinx/Kconfig - -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 22234cde2ab6..e04979d0ef7e 100644 ---- a/arch/arm/Kconfig -+++ b/arch/arm/Kconfig -@@ -1293,4 +1293,5 @@ source "board/technologic/ts4600/Kconfig" - source "board/vscom/baltos/Kconfig" - source "board/woodburn/Kconfig" - source "board/work-microwave/work_92105/Kconfig" -+source "board/xilinx/Kconfig" - source "board/zipitz2/Kconfig" - - source "arch/arm/Kconfig.debug" -diff --git a/board/xilinx/Kconfig b/board/xilinx/Kconfig -new file mode 100644 -index 000000000000..aa3fa061edef ---- /dev/null -+++ b/board/xilinx/Kconfig -@@ -0,0 +1,41 @@ -+# Copyright (c) 2018, Luca Ceresoli -+# -+# SPDX-License-Identifier: GPL-2.0 -+ -+if ARCH_ZYNQ || ARCH_ZYNQMP -+ -+config XILINX_PS_INIT_FILE -+ string "Zynq/ZynqMP PS init file(s) location" -+ help -+ On Zynq and ZynqMP U-Boot SPL (or U-Boot proper if -+ ZYNQMP_PSU_INIT_ENABLED is set) is responsible for some -+ basic initializations, such as enabling peripherals and -+ configuring pinmuxes. The PS init file (called -+ psu_init_gpl.c on ZynqMP, ps7_init_gpl.c for Zynq-7000) -+ contains the code for such initializations. -+ -+ U-Boot contains PS init files for some boards, but each of -+ them describes only one specific configuration. Users of a -+ different board, or needing a different configuration, can -+ generate custom files using the Xilinx development tools. -+ -+ There are three ways to give a PS init file to U-Boot: -+ -+ 1. Set this variable to the path, either relative to the -+ source tree or absolute, where the psu_init_gpl.c or -+ ps7_init_gpl.c file is located. U-Boot will build this -+ file. -+ -+ 2. If you leave an empty string here, U-Boot will use -+ board/xilinx/zynq/$(CONFIG_DEFAULT_DEVICE_TREE)/ps7_init_gpl.c -+ for Zynq-7000, or -+ board/xilinx/zynqmp/$(CONFIG_DEFAULT_DEVICE_TREE)/psu_init_gpl.c -+ for ZynqMP. -+ -+ 3. If the above file does not exist, U-Boot will use -+ board/xilinx/zynq/ps7_init_gpl.c for Zynq-7000, or -+ board/xilinx/zynqmp/psu_init_gpl.c for ZynqMP. This file -+ is not provided by U-Boot, you have to copy it there -+ before the build. -+ -+endif -diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile -index 5a76a26720cd..03ad5f0532ee 100644 ---- a/board/xilinx/zynq/Makefile -+++ b/board/xilinx/zynq/Makefile -@@ -5,10 +5,18 @@ - - obj-y := board.o - --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE)) -+init-objs := ps_init_gpl.o -+spl/board/xilinx/zynq/ps_init_gpl.o board/xilinx/zynq/ps_init_gpl.o: $(PS_INIT_FILE) -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ -+endif - -+ifeq ($(init-objs),) -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/ps7_init_gpl.c),\ - $(hw-platform-y)/ps7_init_gpl.o) -+endif - - ifeq ($(init-objs),) - ifneq ($(wildcard $(srctree)/$(src)/ps7_init_gpl.c),) -diff --git a/board/xilinx/zynqmp/Makefile b/board/xilinx/zynqmp/Makefile -index 05ccd25dcef3..960b81fc5853 100644 ---- a/board/xilinx/zynqmp/Makefile -+++ b/board/xilinx/zynqmp/Makefile -@@ -5,10 +5,18 @@ - - obj-y := zynqmp.o - --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE)) -+init-objs := ps_init_gpl.o -+spl/board/xilinx/zynqmp/ps_init_gpl.o board/xilinx/zynqmp/ps_init_gpl.o: $(PS_INIT_FILE) -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ -+endif - -+ifeq ($(init-objs),) -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/psu_init_gpl.c),\ - $(hw-platform-y)/psu_init_gpl.o) -+endif - - ifeq ($(init-objs),) - ifneq ($(wildcard $(srctree)/$(src)/psu_init_gpl.c),) --- -2.7.4 - diff --git a/board/zynqmp/readme.txt b/board/zynqmp/readme.txt index da37f4ccc9..9755f182ae 100644 --- a/board/zynqmp/readme.txt +++ b/board/zynqmp/readme.txt @@ -1,10 +1,10 @@ ******************************** -Xilinx ZCU106 board - ZynqMP SoC +Xilinx ZCU102 / ZCU106 boards - ZynqMP SoC ******************************** -This document describes the Buildroot support for the ZCU106 board by -Xilinx, based on the Zynq UltraScale+ MPSoC (aka ZynqMP). It has been -tested with the EK-U1-ZCU106-ES2 pre-production board. +This document describes the Buildroot support for the ZCU102 and ZCU106 +boards by Xilinx, based on the Zynq UltraScale+ MPSoC (aka ZynqMP). +It has been tested with the ZCU102 and ZCU106 production boards. How to build it =============== @@ -32,7 +32,7 @@ After building, you should get a tree like this: +-- rootfs.ext4 -> rootfs.ext2 +-- sdcard.img +-- system.dtb -> zynqmp-zcu106-revA.dtb - +-- u-boot.bin + +-- u-boot.itb `-- zynqmp-zcu106-revA.dtb How to write the SD card diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index bee7c1daf7..34b3d89ffb 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -1,11 +1,10 @@ BR2_aarch64=y -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" @@ -15,20 +14,21 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v2.4" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/53fdb7b6c92860ceb0ec5fd14deee302f4a84269/bin/pmufw-zcu106-default-v2017.4.bin" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/2021.2/bin/pmufw-v2021.2.bin" +BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -- 2.17.1 From neal.frager at xilinx.com Thu Feb 3 13:44:02 2022 From: neal.frager at xilinx.com (Neal Frager) Date: Thu, 3 Feb 2022 06:44:02 -0700 Subject: [Buildroot] [PATCH 2/2] Add configs/zynqmp_zcu102_defconfig In-Reply-To: <20220203134402.1647985-1-neal.frager@xilinx.com> References: <20220203134402.1647985-1-neal.frager@xilinx.com> Message-ID: <20220203134402.1647985-2-neal.frager@xilinx.com> Signed-off-by: Neal Frager --- configs/zynqmp_zcu102_defconfig | 34 +++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 configs/zynqmp_zcu102_defconfig diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig new file mode 100644 index 0000000000..5f98e72aaf --- /dev/null +++ b/configs/zynqmp_zcu102_defconfig @@ -0,0 +1,34 @@ +BR2_aarch64=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2" +BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v2.4" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" +BR2_TARGET_UBOOT_ZYNQMP=y +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/2021.2/bin/pmufw-v2021.2.bin" +BR2_TARGET_UBOOT_FORMAT_ITB=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y -- 2.17.1 From nealf at xilinx.com Thu Feb 3 13:57:01 2022 From: nealf at xilinx.com (Neal Frager) Date: Thu, 3 Feb 2022 13:57:01 +0000 Subject: [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2 In-Reply-To: References: <20220202165555.3497977-1-nealf@xilinx.com> <59b73223-73b3-1b9e-b8ec-0cedb0c605ef@benettiengineering.com> Message-ID: Hi Giulio, > Hi Neal, > On 03/02/22 07:24, Neal Frager wrote: > Hi Giulio, > > Thank you very much for your feedback. > You're welcome. > Please don't top-post, answer inline as you see all around the Mailing List. > Also, I don't know if you've read my entire answer. Usually until you don't see "Best regards" and the name of the one who answer, the answer-mail is not finished yet, so simply scroll down until you finish the e-mail. > So please check also the rest of my previous e-mail. I hope this method of inline answer works. I have submitted a new set of patches based on the feedback from you and Luca. Could you please have a look and let me know what you think? > I would be happy to split the zynqmp_zcu102_defconfig off into a second patch. No problem. > Fine > As for adding comments to the log, could you share the proper git commands for doing this? I would be happy to do it, but I am a bit new to git and I did not know the proper command to use for adding log comments. > Luca already pointed you a lot of very useful links. > Another tool I like to create patches for me is "git gui" and also "gitk" to scroll the commits in a non-console way. > Most of all "git gui" is helpful to me to choose a single line to stage or revert. > Best regards --- > Giulio Benetti > Benetti Engineering sas > Best regards, > > Neal Frager > Xilinx > Best regards, Neal Frager Xilinx > -----Original Message----- > From: Giulio Benetti > Sent: Wednesday 2 February 2022 23:33 > To: Neal Frager ; buildroot at buildroot.org > Cc: luca at lucaceresoli.net; Neal Frager > Subject: Re: [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump > ATF/U-Boot/Linux to Xilinx 2021.2 > > CAUTION: This message has originated from an External Source. Please use proper judgment and caution when opening attachments, clicking links, or responding to this email. > > > Hi Neal, > > nice to see you've made it with git send-email :-), > > Here I would improve commit log by stating that you're dropping all > local patches because they are now upstreamed > > On 02/02/22 17:55, Neal Frager wrote: >> Signed-off-by: Neal Frager >> --- >> board/zynqmp/genimage.cfg | 1 + >> ...-fix-Remove-GGC-ignore-Warray-bounds.patch | 68 ------- >> ...64-zynqmp-zcu106-fix-SPL-MMC-booting.patch | 52 ------ >> ...2-arm64-zynqmp-Enable-booting-to-ATF.patch | 114 ------------ >> ...ept-an-absolute-path-for-PMUFW_INIT_.patch | 68 ------- >> ...ynqmp-pass-the-PS-init-file-as-a-kco.patch | 175 ------------------ >> configs/zynqmp_zcu102_defconfig | 35 ++++ > > This ^^^ file is added, so it deserves a second patch after this one, > basically this becomes a patchset of 2 patches > >> configs/zynqmp_zcu106_defconfig | 15 +- >> 8 files changed, 44 insertions(+), 484 deletions(-) >> delete mode 100644 board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch >> delete mode 100644 board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch >> delete mode 100644 board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch >> delete mode 100644 board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch >> delete mode 100644 board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch >> create mode 100644 configs/zynqmp_zcu102_defconfig >> >> diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg >> index ed202f4550..557364e124 100644 >> --- a/board/zynqmp/genimage.cfg >> +++ b/board/zynqmp/genimage.cfg >> @@ -3,6 +3,7 @@ image boot.vfat { >> files = { >> "boot.bin", >> "u-boot.bin", >> + "u-boot.itb", > > Can you please justify this adding ^^^ in commit log? > >> "atf-uboot.ub", >> "system.dtb", >> "Image" >> diff --git >> a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove- >> G >> GC-ignore-Warray-bounds.patch >> b/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove- >> G >> GC-ignore-Warray-bounds.patch >> deleted file mode 100644 >> index 0c1a9ba2a4..0000000000 >> --- >> a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove- >> G >> GC-ignore-Warray-bounds.patch >> +++ /dev/null >> @@ -1,68 +0,0 @@ >> -From da003e6ada7d0217fe99dc7c649a731f8ebd3c34 Mon Sep 17 00:00:00 >> 2001 >> -From: Deepika Bhavnani >> -Date: Thu, 15 Aug 2019 00:56:46 +0300 >> -Subject: [PATCH] Coverity fix: Remove GGC ignore -Warray-bounds >> - >> -GCC diagnostics were added to ignore array boundaries, instead -of >> ignoring GCC warning current code will check for array boundaries >> -and perform and array update only for valid elements. >> - >> -Resolves: `CID 246574` `CID 246710` `CID 246651` >> - >> -Signed-off-by: Deepika Bhavnani >> -Change-Id: I7530ecf7a1707351c6ee87e90cc3d33574088f57 >> - >> -Backported from: 41af05154abe136938bcfb5f26c969933784bbef >> -[Adapted to apply on 1.5] >> - >> ---- >> - lib/psci/psci_common.c | 20 ++++++++++---------- >> - 1 file changed, 10 insertions(+), 10 deletions(-) >> - >> -diff --git a/lib/psci/psci_common.c b/lib/psci/psci_common.c -index >> 2220a745cd6e..6282d992a2f0 100644 >> ---- a/lib/psci/psci_common.c >> -+++ b/lib/psci/psci_common.c >> -@@ -188,21 +188,17 @@ static unsigned int >> get_power_on_target_pwrlvl(void) >> - >> /******************************************************************** >> * >> ********* >> - * Helper function to update the requested local power state array. >> This array >> - * does not store the requested state for the CPU power level. >> Hence an >> -- * assertion is added to prevent us from accessing the wrong index. >> -+ * assertion is added to prevent us from accessing the CPU power level. >> - >> ********************************************************************* >> * >> *******/ >> - static void psci_set_req_local_pwr_state(unsigned int pwrlvl, >> - unsigned int cpu_idx, >> - plat_local_state_t req_pwr_state) >> - { >> -- /* >> -- * This should never happen, we have this here to avoid >> -- * "array subscript is above array bounds" errors in GCC. >> -- */ >> - assert(pwrlvl > PSCI_CPU_PWR_LVL); >> --#pragma GCC diagnostic push >> --#pragma GCC diagnostic ignored "-Warray-bounds" >> -- psci_req_local_pwr_states[pwrlvl - 1][cpu_idx] = req_pwr_state; >> --#pragma GCC diagnostic pop >> -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && >> -+ (cpu_idx < PLATFORM_CORE_COUNT)) { >> -+ psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx] = req_pwr_state; >> -+ } >> - } >> - >> - >> /******************************************************************** >> * >> ********* -@@ -228,7 +224,11 @@ static plat_local_state_t >> *psci_get_req_local_pwr_states(unsigned int pwrlvl, >> - { >> - assert(pwrlvl > PSCI_CPU_PWR_LVL); >> - >> -- return &psci_req_local_pwr_states[pwrlvl - 1][cpu_idx]; >> -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && >> -+ (cpu_idx < PLATFORM_CORE_COUNT)) { >> -+ return &psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx]; >> -+ } else >> -+ return NULL; >> - } >> - >> - /* >> --- >> -2.34.0 >> - >> diff --git >> a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-boo >> t >> ing.patch >> b/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-boo >> t >> ing.patch >> deleted file mode 100644 >> index 4d85e1bb12..0000000000 >> --- >> a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-boo >> t >> ing.patch >> +++ /dev/null >> @@ -1,52 +0,0 @@ >> -From e5d72ed8339eb05285448aad3c89d21e4d18fd29 Mon Sep 17 00:00:00 >> 2001 >> -From: Luca Ceresoli >> -Date: Mon, 26 Feb 2018 09:40:34 +0100 >> -Subject: [PATCH] arm64: zynqmp: zcu106: fix SPL MMC booting >> - >> -The U-Boot SPL generated with the current zcu106 defconfig cannot >> boot -from MMC: >> - >> - [...] >> - U-Boot SPL 2018.01 (Feb 21 2018 - 17:47:14) >> - EL Level: EL3 >> - Trying to boot from MMC1 >> - sdhci_transfer_data: Error detected in status(0x408020)! >> - spl_load_image_fat_os: error reading image u-boot.bin, err - -2 >> - spl_load_image_fat: error reading image u-boot.img, err - -6 >> - SPL: failed to boot from all boot devices >> - ### ERROR ### Please RESET the board ### >> - >> -Fix by lowering the rpll value. The new value for the RPLL_CTRL >> -register comes from the current psu_init_gpl.c from the HDF file at >> -https://github.com/xilinx/hdf-examples/tree/01ad8ea5fd1989abf4ea5a07 >> 2 >> d019a16cb2bc546/zcu106-zynqmp >> -(generated by Vivado v2017.4). >> - >> -RPLL and sdio1_ref clocks before and after this change: >> - >> - - Old values: RPLL 1.36 GHz, sdio1_ref 272 MHz >> - - New values: RPLL 1.16 GHz, sdio1_ref 233 MHz >> - >> -Signed-off-by: Luca Ceresoli >> -Cc: Michal Simek >> -Upstream-status: accepted upstream in a different form >> ---- >> - >> - board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c | 2 +- >> - 1 file changed, 1 insertion(+), 1 deletion(-) >> - >> -diff --git a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c >> b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c >> -index 4d18abe000ca..e6fa477e53e7 100644 >> ---- a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c >> -+++ b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c >> -@@ -10,7 +10,7 @@ >> - static unsigned long psu_pll_init_data(void) >> - { >> - psu_mask_write(0xFF5E0034, 0xFE7FEDEFU, 0x7E4E2C62U); >> -- psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00013C00U); >> -+ psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00014600U); >> - psu_mask_write(0xFF5E0030, 0x00000008U, 0x00000008U); >> - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000001U); >> - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000000U); >> --- >> -2.7.4 >> - >> diff --git >> a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF. >> p >> atch >> b/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF. >> p >> atch >> deleted file mode 100644 >> index 487fff6812..0000000000 >> --- >> a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF. >> p >> atch >> +++ /dev/null >> @@ -1,114 +0,0 @@ >> -From 5e3cac50cc981e01d9072241035a8d4162560c71 Mon Sep 17 00:00:00 >> 2001 >> -From: Luca Ceresoli >> -Date: Mon, 12 Mar 2018 17:18:38 +0100 >> -Subject: [PATCH] arm64: zynqmp: Enable booting to ATF >> - >> -U-Boot is now able to boot to ARM Trusted Firmware (ATF). The boot >> -flow is SPL(EL3) loads ATF and full u-boot and jump to ATF(EL3) >> which -pass control to full u-boot(EL2). This has been tested on >> zcu106, so -enable it in this defconfig. >> - >> -To generate an image that triggers this booting flow, you need to >> pass -'-O arm-trusted-firmware' to mkimage. >> - >> -Signed-off-by: Luca Ceresoli >> -Signed-off-by: Michal Simek -Backported >> from upstream: >> http://git.denx.de/?p=u-boot.git;a=commit;h=5e3cac50cc981e01d90722410 >> 3 >> 5a8d4162560c71 >> ---- >> - >> - configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 + >> - configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 + >> - configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 + >> - configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 + >> - configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 1 + >> - configs/xilinx_zynqmp_zcu102_revA_defconfig | 1 + >> - configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 + >> - 7 files changed, 7 insertions(+) >> - >> -diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig >> b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig >> -index c5bfa2b12638..488c72258b0e 100644 >> ---- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig >> -+++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig >> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >> - CONFIG_SPL_OS_BOOT=y >> - CONFIG_SPL_RAM_SUPPORT=y >> - CONFIG_SPL_RAM_DEVICE=y >> -+CONFIG_SPL_ATF=y >> - CONFIG_SYS_PROMPT="ZynqMP> " >> - CONFIG_FASTBOOT=y >> - CONFIG_FASTBOOT_FLASH=y >> -diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig >> b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig >> -index f86dce403a42..5d501eec0edd 100644 >> ---- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig >> -+++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig >> -@@ -20,6 +20,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >> - CONFIG_SPL_OS_BOOT=y >> - CONFIG_SPL_RAM_SUPPORT=y >> - CONFIG_SPL_RAM_DEVICE=y >> -+CONFIG_SPL_ATF=y >> - CONFIG_SYS_PROMPT="ZynqMP> " >> - CONFIG_FASTBOOT=y >> - CONFIG_FASTBOOT_FLASH=y >> -diff --git a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig >> b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig >> -index 6e947cf56827..6f7eaebd7676 100644 >> ---- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig >> -+++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig >> -@@ -16,6 +16,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >> - CONFIG_SPL_OS_BOOT=y >> - CONFIG_SPL_RAM_SUPPORT=y >> - CONFIG_SPL_RAM_DEVICE=y >> -+CONFIG_SPL_ATF=y >> - CONFIG_SYS_PROMPT="ZynqMP> " >> - CONFIG_CMD_MEMTEST=y >> - CONFIG_SYS_ALT_MEMTEST=y >> -diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig >> b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig >> -index 1c934858c61c..7a3806cba4b5 100644 >> ---- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig >> -+++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig >> -@@ -17,6 +17,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >> - CONFIG_SPL_OS_BOOT=y >> - CONFIG_SPL_RAM_SUPPORT=y >> - CONFIG_SPL_RAM_DEVICE=y >> -+CONFIG_SPL_ATF=y >> - CONFIG_SYS_PROMPT="ZynqMP> " >> - CONFIG_CMD_MEMTEST=y >> - CONFIG_SYS_ALT_MEMTEST=y >> -diff --git a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig >> b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig >> -index e13c7c56f310..e4408f182ca0 100644 >> ---- a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig >> -+++ b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig >> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >> - CONFIG_SPL_OS_BOOT=y >> - CONFIG_SPL_RAM_SUPPORT=y >> - CONFIG_SPL_RAM_DEVICE=y >> -+CONFIG_SPL_ATF=y >> - CONFIG_SYS_PROMPT="ZynqMP> " >> - CONFIG_FASTBOOT=y >> - CONFIG_FASTBOOT_FLASH=y >> -diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig >> b/configs/xilinx_zynqmp_zcu102_revA_defconfig >> -index 5b2cd495ee85..b52f6789fd4b 100644 >> ---- a/configs/xilinx_zynqmp_zcu102_revA_defconfig >> -+++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig >> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >> - CONFIG_SPL_OS_BOOT=y >> - CONFIG_SPL_RAM_SUPPORT=y >> - CONFIG_SPL_RAM_DEVICE=y >> -+CONFIG_SPL_ATF=y >> - CONFIG_SYS_PROMPT="ZynqMP> " >> - CONFIG_FASTBOOT=y >> - CONFIG_FASTBOOT_FLASH=y >> -diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig >> b/configs/xilinx_zynqmp_zcu102_revB_defconfig >> -index e6530fbfe7ff..80592554f682 100644 >> ---- a/configs/xilinx_zynqmp_zcu102_revB_defconfig >> -+++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig >> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >> - CONFIG_SPL_OS_BOOT=y >> - CONFIG_SPL_RAM_SUPPORT=y >> - CONFIG_SPL_RAM_DEVICE=y >> -+CONFIG_SPL_ATF=y >> - CONFIG_SYS_PROMPT="ZynqMP> " >> - CONFIG_FASTBOOT=y >> - CONFIG_FASTBOOT_FLASH=y >> --- >> -2.7.4 >> - >> diff --git >> a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-pat >> h >> -for-PMUFW_INIT_.patch >> b/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-pat >> h >> -for-PMUFW_INIT_.patch >> deleted file mode 100644 >> index 95ab7b3b75..0000000000 >> --- >> a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-pat >> h >> -for-PMUFW_INIT_.patch >> +++ /dev/null >> @@ -1,68 +0,0 @@ >> -From c7df098a71e05dc81cee818747759e8060b59626 Mon Sep 17 00:00:00 >> 2001 >> -From: Luca Ceresoli >> -Date: Mon, 4 Jun 2018 12:21:01 +0200 >> -Subject: [PATCH] arm64: zynqmp: accept an absolute path for >> PMUFW_INIT_FILE >> - >> -The value of PMUFW_INIT_FILE is prefixed with "$(srctree)/", thus >> -forcing it to be a relative path inside the U-Boot source tree. >> Since -the PMUFW is a binary file generated outside of U-Boot, the >> PMUFW -binary must be copied inside the U-Boot source tree before the >> -build. >> - >> -This generates a few problems: >> - >> - * if the source tree is shared among different out-of-tree builds, >> - they will pollute (and potentially corrupt) each other >> - * the source tree cannot be read-only >> - * any buildsystem must add a command to copy the PMUFW binary >> - * putting an externally-generated binary in the source tree is ugly >> - as hell >> - >> -Avoid these problems by accepting an absolute path for >> -PMUFW_INIT_FILE. This would be as simple as removing the "$(srctree)/" >> -prefix, but in order to keep backward compatibility we rather use >> the -shell and readlink to get the absolute path even when starting >> from a -relative path. >> - >> -Since 'readlink -f' produces an empty string if the file does not >> -exist, we also add a check to ensure the file configured in >> -PMUFW_INIT_FILE exists. Otherwise the build would exit successfully, >> -but produce a boot.bin without PMUFW as if PMUFW_INIT_FILE were empty. >> - >> -Tested in the 12 possible combinations of: >> - - PMUFW_INIT_FILE empty, relative, absolute, non-existing >> - - building in-tree, in subdir, in other directory >> - >> -Signed-off-by: Luca Ceresoli >> -Cc: Michal Simek >> -Cc: Simon Glass >> -Cc: Emmanuel Vadot >> -Signed-off-by: Michal Simek -Backported >> from upstream: >> https://git.denx.de/?p=u-boot.git;a=commit;h=c7df098a71e05dc81cee8187 >> 4 >> 7759e8060b59626 >> ---- >> - scripts/Makefile.spl | 8 +++++++- >> - 1 file changed, 7 insertions(+), 1 deletion(-) >> - >> -diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl -index >> ef018b5b4056..252f13826d4c 100644 >> ---- a/scripts/Makefile.spl >> -+++ b/scripts/Makefile.spl >> -@@ -167,8 +167,14 @@ ifdef CONFIG_ARCH_ZYNQ >> - MKIMAGEFLAGS_boot.bin = -T zynqimage -R >> $(srctree)/$(CONFIG_BOOT_INIT_FILE) >> - endif >> - ifdef CONFIG_ARCH_ZYNQMP >> -+ifneq ($(CONFIG_PMUFW_INIT_FILE),"") >> -+spl/boot.bin: zynqmp-check-pmufw >> -+zynqmp-check-pmufw: FORCE >> -+ ( cd $(srctree) && test -r $(CONFIG_PMUFW_INIT_FILE) ) \ >> -+ || ( echo "Cannot read $(CONFIG_PMUFW_INIT_FILE)" && >> -+false ) endif >> - MKIMAGEFLAGS_boot.bin = -T zynqmpimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) \ >> -- -n $(srctree)/$(CONFIG_PMUFW_INIT_FILE) >> -+ -n "$(shell cd $(srctree); readlink -f $(CONFIG_PMUFW_INIT_FILE))" >> - endif >> - >> - spl/boot.bin: $(obj)/u-boot-spl.bin FORCE >> --- >> -2.7.4 >> - >> diff --git >> a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-i >> n >> it-file-as-a-kco.patch >> b/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-i >> n >> it-file-as-a-kco.patch >> deleted file mode 100644 >> index b32e162780..0000000000 >> --- >> a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-i >> n >> it-file-as-a-kco.patch >> +++ /dev/null >> @@ -1,175 +0,0 @@ >> -From 4c9d54ab5a41d65000c8d249b6fb1b76056f1812 Mon Sep 17 00:00:00 >> 2001 >> -From: Luca Ceresoli >> -Date: Wed, 20 Jun 2018 12:11:50 +0200 >> -Subject: [PATCH] arm/arm64: zynq/zynqmp: pass the PS init file as a >> kconfig >> - variable >> - >> -U-Boot needs to link ps7_init_gpl.c on Zynq or psu_init_gpl.c on >> -ZynqMP (PS init for short). The current logic to locate this file >> for -both platforms is: >> - >> - 1. if a board-specific file exists in >> - board/xilinx/zynq[mp]/$(CONFIG_DEFAULT_DEVICE_TREE)/ps?_init_gpl.c >> - then use it >> - 2. otherwise use board/xilinx/zynq/ps?_init_gpl.c >> - >> -In the latter case the file does not exist in the U-Boot sources and >> -must be copied in the source tree from the outside before starting >> the -build. This is typical when it is generated from Xilinx tools >> while -developing a custom hardware. However making sure that a >> -board-specific file is _not_ found (and used) requires some trickery >> -such as removing or overwriting all PS init files (e.g.: the current >> -meta-xilinx yocto layer [0]). >> - >> -This generates a few problems: >> - >> - * if the source tree is shared among different out-of-tree builds, >> - they will pollute (and potentially corrupt) each other >> - * the source tree cannot be read-only >> - * any buildsystem must add a command to copy the PS init file >> binary >> - * overwriting or deleting files in the source tree is ugly as hell >> - >> -Simplify usage by allowing to pass the path to the desired PS init >> -file in kconfig variable XILINX_PS_INIT_FILE. It can be an absolute >> -path or relative to $(srctree). If the variable is set, the >> -user-specified file will always be used without being copied -around. >> If the the variable is left empty, for backward compatibility -fall >> back to the old behaviour. >> - >> -Since the issue is the same for Zynq and ZynqMP, add one kconfig >> -variable in a common place and use it for both. >> - >> -Also use the new kconfig help text to document all the ways to give >> -U-Boot the PS init file. >> - >> -Build-tested with all combinations of: >> - - platform: zynq or zynqmp >> - - PS init file: from XILINX_PS_INIT_FILE (absolute, relative path, >> - non-existing), in-tree board-specific, in board/xilinx/zynq[mp]/ >> - - building in-tree, in subdir, in other directory >> - >> -[0] >> https://github.com/Xilinx/meta-xilinx/blob/b2f74cc7fe5c4881589d5e440a >> 1 >> 7cb51fc66a7ab/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init. >> inc#L9 >> - >> -Signed-off-by: Luca Ceresoli >> -Cc: Albert Aribaud >> -Cc: Michal Simek >> -Cc: Nathan Rossi -Backported from upstream: >> https://git.denx.de/?p=u-boot.git;a=commit;h=6da4f67ad09cd8b311d77b2b >> 0 >> 4e557b7ef65b56c >> ---- >> - arch/arm/Kconfig | 1 + >> - board/xilinx/Kconfig | 41 +++++++++++++++++++++++++++++++++++++++++ >> - board/xilinx/zynq/Makefile | 10 +++++++++- >> - board/xilinx/zynqmp/Makefile | 10 +++++++++- >> - 4 files changed, 60 insertions(+), 2 deletions(-) >> - create mode 100644 board/xilinx/Kconfig >> - >> -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index >> 22234cde2ab6..e04979d0ef7e 100644 >> ---- a/arch/arm/Kconfig >> -+++ b/arch/arm/Kconfig >> -@@ -1293,4 +1293,5 @@ source "board/technologic/ts4600/Kconfig" >> - source "board/vscom/baltos/Kconfig" >> - source "board/woodburn/Kconfig" >> - source "board/work-microwave/work_92105/Kconfig" >> -+source "board/xilinx/Kconfig" >> - source "board/zipitz2/Kconfig" >> - >> - source "arch/arm/Kconfig.debug" >> -diff --git a/board/xilinx/Kconfig b/board/xilinx/Kconfig -new file >> mode 100644 -index 000000000000..aa3fa061edef >> ---- /dev/null >> -+++ b/board/xilinx/Kconfig >> -@@ -0,0 +1,41 @@ >> -+# Copyright (c) 2018, Luca Ceresoli # # >> -+SPDX-License-Identifier: GPL-2.0 >> -+ >> -+if ARCH_ZYNQ || ARCH_ZYNQMP >> -+ >> -+config XILINX_PS_INIT_FILE >> -+ string "Zynq/ZynqMP PS init file(s) location" >> -+ help >> -+ On Zynq and ZynqMP U-Boot SPL (or U-Boot proper if >> -+ ZYNQMP_PSU_INIT_ENABLED is set) is responsible for some >> -+ basic initializations, such as enabling peripherals and >> -+ configuring pinmuxes. The PS init file (called >> -+ psu_init_gpl.c on ZynqMP, ps7_init_gpl.c for Zynq-7000) >> -+ contains the code for such initializations. >> -+ >> -+ U-Boot contains PS init files for some boards, but each of >> -+ them describes only one specific configuration. Users of a >> -+ different board, or needing a different configuration, can >> -+ generate custom files using the Xilinx development tools. >> -+ >> -+ There are three ways to give a PS init file to U-Boot: >> -+ >> -+ 1. Set this variable to the path, either relative to the >> -+ source tree or absolute, where the psu_init_gpl.c or >> -+ ps7_init_gpl.c file is located. U-Boot will build this >> -+ file. >> -+ >> -+ 2. If you leave an empty string here, U-Boot will use >> -+ board/xilinx/zynq/$(CONFIG_DEFAULT_DEVICE_TREE)/ps7_init_gpl.c >> -+ for Zynq-7000, or >> -+ board/xilinx/zynqmp/$(CONFIG_DEFAULT_DEVICE_TREE)/psu_init_gpl.c >> -+ for ZynqMP. >> -+ >> -+ 3. If the above file does not exist, U-Boot will use >> -+ board/xilinx/zynq/ps7_init_gpl.c for Zynq-7000, or >> -+ board/xilinx/zynqmp/psu_init_gpl.c for ZynqMP. This file >> -+ is not provided by U-Boot, you have to copy it there >> -+ before the build. >> -+ >> -+endif >> -diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile >> -index 5a76a26720cd..03ad5f0532ee 100644 >> ---- a/board/xilinx/zynq/Makefile >> -+++ b/board/xilinx/zynq/Makefile >> -@@ -5,10 +5,18 @@ >> - >> - obj-y := board.o >> - >> --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) >> -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") >> -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f >> -+$(CONFIG_XILINX_PS_INIT_FILE)) init-objs := ps_init_gpl.o >> -+spl/board/xilinx/zynq/ps_init_gpl.o board/xilinx/zynq/ps_init_gpl.o: $(PS_INIT_FILE) >> -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ endif >> - >> -+ifeq ($(init-objs),) >> -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) >> - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/ps7_init_gpl.c),\ >> - $(hw-platform-y)/ps7_init_gpl.o) >> -+endif >> - >> - ifeq ($(init-objs),) >> - ifneq ($(wildcard $(srctree)/$(src)/ps7_init_gpl.c),) >> -diff --git a/board/xilinx/zynqmp/Makefile >> b/board/xilinx/zynqmp/Makefile -index 05ccd25dcef3..960b81fc5853 >> 100644 >> ---- a/board/xilinx/zynqmp/Makefile >> -+++ b/board/xilinx/zynqmp/Makefile >> -@@ -5,10 +5,18 @@ >> - >> - obj-y := zynqmp.o >> - >> --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) >> -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") >> -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f >> -+$(CONFIG_XILINX_PS_INIT_FILE)) init-objs := ps_init_gpl.o >> -+spl/board/xilinx/zynqmp/ps_init_gpl.o board/xilinx/zynqmp/ps_init_gpl.o: $(PS_INIT_FILE) >> -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ endif >> - >> -+ifeq ($(init-objs),) >> -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) >> - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/psu_init_gpl.c),\ >> - $(hw-platform-y)/psu_init_gpl.o) >> -+endif >> - >> - ifeq ($(init-objs),) >> - ifneq ($(wildcard $(srctree)/$(src)/psu_init_gpl.c),) >> --- >> -2.7.4 >> - >> diff --git a/configs/zynqmp_zcu102_defconfig >> b/configs/zynqmp_zcu102_defconfig new file mode 100644 index >> 0000000000..336f5c2dbe >> --- /dev/null >> +++ b/configs/zynqmp_zcu102_defconfig >> @@ -0,0 +1,35 @@ >> +BR2_aarch64=y >> +BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" >> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y >> +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" >> +BR2_LINUX_KERNEL=y >> +BR2_LINUX_KERNEL_CUSTOM_GIT=y >> +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" >> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2" >> +BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" >> +BR2_LINUX_KERNEL_DTS_SUPPORT=y >> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" >> +BR2_TARGET_ROOTFS_EXT2=y >> +BR2_TARGET_ROOTFS_EXT2_4=y >> +# BR2_TARGET_ROOTFS_TAR is not set >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.4_2021.2" >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" >> +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2" >> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" >> +BR2_TARGET_UBOOT_NEEDS_DTC=y >> +BR2_TARGET_UBOOT_SPL=y >> +BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" >> +BR2_TARGET_UBOOT_ZYNQMP=y >> +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/master/bin/pmufw-v2021.2.bin" >> +BR2_TARGET_UBOOT_FORMAT_ITB=y >> +BR2_PACKAGE_HOST_DOSFSTOOLS=y >> +BR2_PACKAGE_HOST_GENIMAGE=y >> +BR2_PACKAGE_HOST_MTOOLS=y > > As pointed above this ^^^ file must be in a separate patch and it > deserves also a maintainer. So please you or maybe Luca could add an > entry to DEVELOPERS for this board > >> diff --git a/configs/zynqmp_zcu106_defconfig >> b/configs/zynqmp_zcu106_defconfig index bee7c1daf7..3a6947e1e8 100644 >> --- a/configs/zynqmp_zcu106_defconfig >> +++ b/configs/zynqmp_zcu106_defconfig >> @@ -1,11 +1,11 @@ >> BR2_aarch64=y >> BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" > > Since all patches are gone, this ^^^ is not needed anymore > >> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y >> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y >> BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" >> BR2_LINUX_KERNEL=y >> BR2_LINUX_KERNEL_CUSTOM_GIT=y >> BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" >> -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" >> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2" >> BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" >> BR2_LINUX_KERNEL_DTS_SUPPORT=y >> BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" >> @@ -14,21 +14,22 @@ BR2_TARGET_ROOTFS_EXT2_4=y >> # BR2_TARGET_ROOTFS_TAR is not set >> BR2_TARGET_ARM_TRUSTED_FIRMWARE=y >> BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y >> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" >> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5" >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.4_2021.2" > > It's worth mention in commit log that you're switching from ARM to > Xilinx ATF > >> BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" >> BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" >> -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7" >> -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA" >> +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2" >> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" >> BR2_TARGET_UBOOT_NEEDS_DTC=y >> BR2_TARGET_UBOOT_SPL=y >> BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" >> BR2_TARGET_UBOOT_ZYNQMP=y >> -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/53fdb7b6c92860ceb0ec5fd14deee302f4a84269/bin/pmufw-zcu106-default-v2017.4.bin" >> +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/master/bin/pmufw-v2021.2.bin" >> +BR2_TARGET_UBOOT_FORMAT_ITB=y > > Here ^^^ I see that probably you're switching from .bin to .itb so > better mention it in commit log > >> BR2_PACKAGE_HOST_DOSFSTOOLS=y >> BR2_PACKAGE_HOST_GENIMAGE=y >> BR2_PACKAGE_HOST_MTOOLS=y > > Thank you! > > Best regards > -- > Giulio Benetti > Benetti Engineering sas -- From giulio.benetti at benettiengineering.com Thu Feb 3 14:05:35 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 3 Feb 2022 15:05:35 +0100 Subject: [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2 In-Reply-To: References: Message-ID: Hi Neal, > Il giorno 3 feb 2022, alle ore 14:57, Neal Frager ha scritto: > > ?Hi Giulio, > >> Hi Neal, > >> On 03/02/22 07:24, Neal Frager wrote: >> Hi Giulio, >> >> Thank you very much for your feedback. > >> You're welcome. > >> Please don't top-post, answer inline as you see all around the Mailing List. > >> Also, I don't know if you've read my entire answer. Usually until you don't see "Best regards" and the name of the one who answer, the answer-mail is not finished yet, so simply scroll down until you finish the e-mail. > >> So please check also the rest of my previous e-mail. > > I hope this method of inline answer works. Yes it does work. Only remember to set your client using plain-text only. I?m on mobile now so probably my answer and yours will be in html. But we need plain-text, please check your email client and set plain-text by default. > I have submitted a new set of patches based on the feedback from you and Luca. Could you please have a look and let me know what you think? Sure, I?m going to tonight :-) Also Luca I think will since he?s the maintainer of zynq stuff. Also we?ve sent you the review almost at the same time yesterday :-) Best regards ?- Giulio Benetti Benetti Engineering sas > >> I would be happy to split the zynqmp_zcu102_defconfig off into a second patch. No problem. > >> Fine > >> As for adding comments to the log, could you share the proper git commands for doing this? I would be happy to do it, but I am a bit new to git and I did not know the proper command to use for adding log comments. > >> Luca already pointed you a lot of very useful links. > >> Another tool I like to create patches for me is "git gui" and also "gitk" to scroll the commits in a non-console way. > >> Most of all "git gui" is helpful to me to choose a single line to stage or revert. > >> Best regards > --- >> Giulio Benetti >> Benetti Engineering sas > >> Best regards, >> >> Neal Frager >> Xilinx >> > > Best regards, > Neal Frager > Xilinx > >> -----Original Message----- >> From: Giulio Benetti >> Sent: Wednesday 2 February 2022 23:33 >> To: Neal Frager ; buildroot at buildroot.org >> Cc: luca at lucaceresoli.net; Neal Frager >> Subject: Re: [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump >> ATF/U-Boot/Linux to Xilinx 2021.2 >> >> CAUTION: This message has originated from an External Source. Please use proper judgment and caution when opening attachments, clicking links, or responding to this email. >> >> >> Hi Neal, >> >> nice to see you've made it with git send-email :-), >> >> Here I would improve commit log by stating that you're dropping all >> local patches because they are now upstreamed >> >>> On 02/02/22 17:55, Neal Frager wrote: >>> Signed-off-by: Neal Frager >>> --- >>> board/zynqmp/genimage.cfg | 1 + >>> ...-fix-Remove-GGC-ignore-Warray-bounds.patch | 68 ------- >>> ...64-zynqmp-zcu106-fix-SPL-MMC-booting.patch | 52 ------ >>> ...2-arm64-zynqmp-Enable-booting-to-ATF.patch | 114 ------------ >>> ...ept-an-absolute-path-for-PMUFW_INIT_.patch | 68 ------- >>> ...ynqmp-pass-the-PS-init-file-as-a-kco.patch | 175 ------------------ >>> configs/zynqmp_zcu102_defconfig | 35 ++++ >> >> This ^^^ file is added, so it deserves a second patch after this one, >> basically this becomes a patchset of 2 patches >> >>> configs/zynqmp_zcu106_defconfig | 15 +- >>> 8 files changed, 44 insertions(+), 484 deletions(-) >>> delete mode 100644 board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch >>> delete mode 100644 board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch >>> delete mode 100644 board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch >>> delete mode 100644 board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch >>> delete mode 100644 board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch >>> create mode 100644 configs/zynqmp_zcu102_defconfig >>> >>> diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg >>> index ed202f4550..557364e124 100644 >>> --- a/board/zynqmp/genimage.cfg >>> +++ b/board/zynqmp/genimage.cfg >>> @@ -3,6 +3,7 @@ image boot.vfat { >>> files = { >>> "boot.bin", >>> "u-boot.bin", >>> + "u-boot.itb", >> >> Can you please justify this adding ^^^ in commit log? >> >>> "atf-uboot.ub", >>> "system.dtb", >>> "Image" >>> diff --git >>> a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove- >>> G >>> GC-ignore-Warray-bounds.patch >>> b/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove- >>> G >>> GC-ignore-Warray-bounds.patch >>> deleted file mode 100644 >>> index 0c1a9ba2a4..0000000000 >>> --- >>> a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove- >>> G >>> GC-ignore-Warray-bounds.patch >>> +++ /dev/null >>> @@ -1,68 +0,0 @@ >>> -From da003e6ada7d0217fe99dc7c649a731f8ebd3c34 Mon Sep 17 00:00:00 >>> 2001 >>> -From: Deepika Bhavnani >>> -Date: Thu, 15 Aug 2019 00:56:46 +0300 >>> -Subject: [PATCH] Coverity fix: Remove GGC ignore -Warray-bounds >>> - >>> -GCC diagnostics were added to ignore array boundaries, instead -of >>> ignoring GCC warning current code will check for array boundaries >>> -and perform and array update only for valid elements. >>> - >>> -Resolves: `CID 246574` `CID 246710` `CID 246651` >>> - >>> -Signed-off-by: Deepika Bhavnani >>> -Change-Id: I7530ecf7a1707351c6ee87e90cc3d33574088f57 >>> - >>> -Backported from: 41af05154abe136938bcfb5f26c969933784bbef >>> -[Adapted to apply on 1.5] >>> - >>> ---- >>> - lib/psci/psci_common.c | 20 ++++++++++---------- >>> - 1 file changed, 10 insertions(+), 10 deletions(-) >>> - >>> -diff --git a/lib/psci/psci_common.c b/lib/psci/psci_common.c -index >>> 2220a745cd6e..6282d992a2f0 100644 >>> ---- a/lib/psci/psci_common.c >>> -+++ b/lib/psci/psci_common.c >>> -@@ -188,21 +188,17 @@ static unsigned int >>> get_power_on_target_pwrlvl(void) >>> - >>> /******************************************************************** >>> * >>> ********* >>> - * Helper function to update the requested local power state array. >>> This array >>> - * does not store the requested state for the CPU power level. >>> Hence an >>> -- * assertion is added to prevent us from accessing the wrong index. >>> -+ * assertion is added to prevent us from accessing the CPU power level. >>> - >>> ********************************************************************* >>> * >>> *******/ >>> - static void psci_set_req_local_pwr_state(unsigned int pwrlvl, >>> - unsigned int cpu_idx, >>> - plat_local_state_t req_pwr_state) >>> - { >>> -- /* >>> -- * This should never happen, we have this here to avoid >>> -- * "array subscript is above array bounds" errors in GCC. >>> -- */ >>> - assert(pwrlvl > PSCI_CPU_PWR_LVL); >>> --#pragma GCC diagnostic push >>> --#pragma GCC diagnostic ignored "-Warray-bounds" >>> -- psci_req_local_pwr_states[pwrlvl - 1][cpu_idx] = req_pwr_state; >>> --#pragma GCC diagnostic pop >>> -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && >>> -+ (cpu_idx < PLATFORM_CORE_COUNT)) { >>> -+ psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx] = req_pwr_state; >>> -+ } >>> - } >>> - >>> - >>> /******************************************************************** >>> * >>> ********* -@@ -228,7 +224,11 @@ static plat_local_state_t >>> *psci_get_req_local_pwr_states(unsigned int pwrlvl, >>> - { >>> - assert(pwrlvl > PSCI_CPU_PWR_LVL); >>> - >>> -- return &psci_req_local_pwr_states[pwrlvl - 1][cpu_idx]; >>> -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && >>> -+ (cpu_idx < PLATFORM_CORE_COUNT)) { >>> -+ return &psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx]; >>> -+ } else >>> -+ return NULL; >>> - } >>> - >>> - /* >>> --- >>> -2.34.0 >>> - >>> diff --git >>> a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-boo >>> t >>> ing.patch >>> b/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-boo >>> t >>> ing.patch >>> deleted file mode 100644 >>> index 4d85e1bb12..0000000000 >>> --- >>> a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-boo >>> t >>> ing.patch >>> +++ /dev/null >>> @@ -1,52 +0,0 @@ >>> -From e5d72ed8339eb05285448aad3c89d21e4d18fd29 Mon Sep 17 00:00:00 >>> 2001 >>> -From: Luca Ceresoli >>> -Date: Mon, 26 Feb 2018 09:40:34 +0100 >>> -Subject: [PATCH] arm64: zynqmp: zcu106: fix SPL MMC booting >>> - >>> -The U-Boot SPL generated with the current zcu106 defconfig cannot >>> boot -from MMC: >>> - >>> - [...] >>> - U-Boot SPL 2018.01 (Feb 21 2018 - 17:47:14) >>> - EL Level: EL3 >>> - Trying to boot from MMC1 >>> - sdhci_transfer_data: Error detected in status(0x408020)! >>> - spl_load_image_fat_os: error reading image u-boot.bin, err - -2 >>> - spl_load_image_fat: error reading image u-boot.img, err - -6 >>> - SPL: failed to boot from all boot devices >>> - ### ERROR ### Please RESET the board ### >>> - >>> -Fix by lowering the rpll value. The new value for the RPLL_CTRL >>> -register comes from the current psu_init_gpl.c from the HDF file at >>> -https://github.com/xilinx/hdf-examples/tree/01ad8ea5fd1989abf4ea5a07 >>> 2 >>> d019a16cb2bc546/zcu106-zynqmp >>> -(generated by Vivado v2017.4). >>> - >>> -RPLL and sdio1_ref clocks before and after this change: >>> - >>> - - Old values: RPLL 1.36 GHz, sdio1_ref 272 MHz >>> - - New values: RPLL 1.16 GHz, sdio1_ref 233 MHz >>> - >>> -Signed-off-by: Luca Ceresoli >>> -Cc: Michal Simek >>> -Upstream-status: accepted upstream in a different form >>> ---- >>> - >>> - board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c | 2 +- >>> - 1 file changed, 1 insertion(+), 1 deletion(-) >>> - >>> -diff --git a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c >>> b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c >>> -index 4d18abe000ca..e6fa477e53e7 100644 >>> ---- a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c >>> -+++ b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c >>> -@@ -10,7 +10,7 @@ >>> - static unsigned long psu_pll_init_data(void) >>> - { >>> - psu_mask_write(0xFF5E0034, 0xFE7FEDEFU, 0x7E4E2C62U); >>> -- psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00013C00U); >>> -+ psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00014600U); >>> - psu_mask_write(0xFF5E0030, 0x00000008U, 0x00000008U); >>> - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000001U); >>> - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000000U); >>> --- >>> -2.7.4 >>> - >>> diff --git >>> a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF. >>> p >>> atch >>> b/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF. >>> p >>> atch >>> deleted file mode 100644 >>> index 487fff6812..0000000000 >>> --- >>> a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF. >>> p >>> atch >>> +++ /dev/null >>> @@ -1,114 +0,0 @@ >>> -From 5e3cac50cc981e01d9072241035a8d4162560c71 Mon Sep 17 00:00:00 >>> 2001 >>> -From: Luca Ceresoli >>> -Date: Mon, 12 Mar 2018 17:18:38 +0100 >>> -Subject: [PATCH] arm64: zynqmp: Enable booting to ATF >>> - >>> -U-Boot is now able to boot to ARM Trusted Firmware (ATF). The boot >>> -flow is SPL(EL3) loads ATF and full u-boot and jump to ATF(EL3) >>> which -pass control to full u-boot(EL2). This has been tested on >>> zcu106, so -enable it in this defconfig. >>> - >>> -To generate an image that triggers this booting flow, you need to >>> pass -'-O arm-trusted-firmware' to mkimage. >>> - >>> -Signed-off-by: Luca Ceresoli >>> -Signed-off-by: Michal Simek -Backported >>> from upstream: >>> http://git.denx.de/?p=u-boot.git;a=commit;h=5e3cac50cc981e01d90722410 >>> 3 >>> 5a8d4162560c71 >>> ---- >>> - >>> - configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 + >>> - configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 + >>> - configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 + >>> - configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 + >>> - configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 1 + >>> - configs/xilinx_zynqmp_zcu102_revA_defconfig | 1 + >>> - configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 + >>> - 7 files changed, 7 insertions(+) >>> - >>> -diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig >>> b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig >>> -index c5bfa2b12638..488c72258b0e 100644 >>> ---- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig >>> -+++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig >>> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >>> - CONFIG_SPL_OS_BOOT=y >>> - CONFIG_SPL_RAM_SUPPORT=y >>> - CONFIG_SPL_RAM_DEVICE=y >>> -+CONFIG_SPL_ATF=y >>> - CONFIG_SYS_PROMPT="ZynqMP> " >>> - CONFIG_FASTBOOT=y >>> - CONFIG_FASTBOOT_FLASH=y >>> -diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig >>> b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig >>> -index f86dce403a42..5d501eec0edd 100644 >>> ---- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig >>> -+++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig >>> -@@ -20,6 +20,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >>> - CONFIG_SPL_OS_BOOT=y >>> - CONFIG_SPL_RAM_SUPPORT=y >>> - CONFIG_SPL_RAM_DEVICE=y >>> -+CONFIG_SPL_ATF=y >>> - CONFIG_SYS_PROMPT="ZynqMP> " >>> - CONFIG_FASTBOOT=y >>> - CONFIG_FASTBOOT_FLASH=y >>> -diff --git a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig >>> b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig >>> -index 6e947cf56827..6f7eaebd7676 100644 >>> ---- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig >>> -+++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig >>> -@@ -16,6 +16,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >>> - CONFIG_SPL_OS_BOOT=y >>> - CONFIG_SPL_RAM_SUPPORT=y >>> - CONFIG_SPL_RAM_DEVICE=y >>> -+CONFIG_SPL_ATF=y >>> - CONFIG_SYS_PROMPT="ZynqMP> " >>> - CONFIG_CMD_MEMTEST=y >>> - CONFIG_SYS_ALT_MEMTEST=y >>> -diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig >>> b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig >>> -index 1c934858c61c..7a3806cba4b5 100644 >>> ---- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig >>> -+++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig >>> -@@ -17,6 +17,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >>> - CONFIG_SPL_OS_BOOT=y >>> - CONFIG_SPL_RAM_SUPPORT=y >>> - CONFIG_SPL_RAM_DEVICE=y >>> -+CONFIG_SPL_ATF=y >>> - CONFIG_SYS_PROMPT="ZynqMP> " >>> - CONFIG_CMD_MEMTEST=y >>> - CONFIG_SYS_ALT_MEMTEST=y >>> -diff --git a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig >>> b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig >>> -index e13c7c56f310..e4408f182ca0 100644 >>> ---- a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig >>> -+++ b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig >>> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >>> - CONFIG_SPL_OS_BOOT=y >>> - CONFIG_SPL_RAM_SUPPORT=y >>> - CONFIG_SPL_RAM_DEVICE=y >>> -+CONFIG_SPL_ATF=y >>> - CONFIG_SYS_PROMPT="ZynqMP> " >>> - CONFIG_FASTBOOT=y >>> - CONFIG_FASTBOOT_FLASH=y >>> -diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig >>> b/configs/xilinx_zynqmp_zcu102_revA_defconfig >>> -index 5b2cd495ee85..b52f6789fd4b 100644 >>> ---- a/configs/xilinx_zynqmp_zcu102_revA_defconfig >>> -+++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig >>> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >>> - CONFIG_SPL_OS_BOOT=y >>> - CONFIG_SPL_RAM_SUPPORT=y >>> - CONFIG_SPL_RAM_DEVICE=y >>> -+CONFIG_SPL_ATF=y >>> - CONFIG_SYS_PROMPT="ZynqMP> " >>> - CONFIG_FASTBOOT=y >>> - CONFIG_FASTBOOT_FLASH=y >>> -diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig >>> b/configs/xilinx_zynqmp_zcu102_revB_defconfig >>> -index e6530fbfe7ff..80592554f682 100644 >>> ---- a/configs/xilinx_zynqmp_zcu102_revB_defconfig >>> -+++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig >>> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >>> - CONFIG_SPL_OS_BOOT=y >>> - CONFIG_SPL_RAM_SUPPORT=y >>> - CONFIG_SPL_RAM_DEVICE=y >>> -+CONFIG_SPL_ATF=y >>> - CONFIG_SYS_PROMPT="ZynqMP> " >>> - CONFIG_FASTBOOT=y >>> - CONFIG_FASTBOOT_FLASH=y >>> --- >>> -2.7.4 >>> - >>> diff --git >>> a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-pat >>> h >>> -for-PMUFW_INIT_.patch >>> b/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-pat >>> h >>> -for-PMUFW_INIT_.patch >>> deleted file mode 100644 >>> index 95ab7b3b75..0000000000 >>> --- >>> a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-pat >>> h >>> -for-PMUFW_INIT_.patch >>> +++ /dev/null >>> @@ -1,68 +0,0 @@ >>> -From c7df098a71e05dc81cee818747759e8060b59626 Mon Sep 17 00:00:00 >>> 2001 >>> -From: Luca Ceresoli >>> -Date: Mon, 4 Jun 2018 12:21:01 +0200 >>> -Subject: [PATCH] arm64: zynqmp: accept an absolute path for >>> PMUFW_INIT_FILE >>> - >>> -The value of PMUFW_INIT_FILE is prefixed with "$(srctree)/", thus >>> -forcing it to be a relative path inside the U-Boot source tree. >>> Since -the PMUFW is a binary file generated outside of U-Boot, the >>> PMUFW -binary must be copied inside the U-Boot source tree before the >>> -build. >>> - >>> -This generates a few problems: >>> - >>> - * if the source tree is shared among different out-of-tree builds, >>> - they will pollute (and potentially corrupt) each other >>> - * the source tree cannot be read-only >>> - * any buildsystem must add a command to copy the PMUFW binary >>> - * putting an externally-generated binary in the source tree is ugly >>> - as hell >>> - >>> -Avoid these problems by accepting an absolute path for >>> -PMUFW_INIT_FILE. This would be as simple as removing the "$(srctree)/" >>> -prefix, but in order to keep backward compatibility we rather use >>> the -shell and readlink to get the absolute path even when starting >>> from a -relative path. >>> - >>> -Since 'readlink -f' produces an empty string if the file does not >>> -exist, we also add a check to ensure the file configured in >>> -PMUFW_INIT_FILE exists. Otherwise the build would exit successfully, >>> -but produce a boot.bin without PMUFW as if PMUFW_INIT_FILE were empty. >>> - >>> -Tested in the 12 possible combinations of: >>> - - PMUFW_INIT_FILE empty, relative, absolute, non-existing >>> - - building in-tree, in subdir, in other directory >>> - >>> -Signed-off-by: Luca Ceresoli >>> -Cc: Michal Simek >>> -Cc: Simon Glass >>> -Cc: Emmanuel Vadot >>> -Signed-off-by: Michal Simek -Backported >>> from upstream: >>> https://git.denx.de/?p=u-boot.git;a=commit;h=c7df098a71e05dc81cee8187 >>> 4 >>> 7759e8060b59626 >>> ---- >>> - scripts/Makefile.spl | 8 +++++++- >>> - 1 file changed, 7 insertions(+), 1 deletion(-) >>> - >>> -diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl -index >>> ef018b5b4056..252f13826d4c 100644 >>> ---- a/scripts/Makefile.spl >>> -+++ b/scripts/Makefile.spl >>> -@@ -167,8 +167,14 @@ ifdef CONFIG_ARCH_ZYNQ >>> - MKIMAGEFLAGS_boot.bin = -T zynqimage -R >>> $(srctree)/$(CONFIG_BOOT_INIT_FILE) >>> - endif >>> - ifdef CONFIG_ARCH_ZYNQMP >>> -+ifneq ($(CONFIG_PMUFW_INIT_FILE),"") >>> -+spl/boot.bin: zynqmp-check-pmufw >>> -+zynqmp-check-pmufw: FORCE >>> -+ ( cd $(srctree) && test -r $(CONFIG_PMUFW_INIT_FILE) ) \ >>> -+ || ( echo "Cannot read $(CONFIG_PMUFW_INIT_FILE)" && >>> -+false ) endif >>> - MKIMAGEFLAGS_boot.bin = -T zynqmpimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) \ >>> -- -n $(srctree)/$(CONFIG_PMUFW_INIT_FILE) >>> -+ -n "$(shell cd $(srctree); readlink -f $(CONFIG_PMUFW_INIT_FILE))" >>> - endif >>> - >>> - spl/boot.bin: $(obj)/u-boot-spl.bin FORCE >>> --- >>> -2.7.4 >>> - >>> diff --git >>> a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-i >>> n >>> it-file-as-a-kco.patch >>> b/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-i >>> n >>> it-file-as-a-kco.patch >>> deleted file mode 100644 >>> index b32e162780..0000000000 >>> --- >>> a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-i >>> n >>> it-file-as-a-kco.patch >>> +++ /dev/null >>> @@ -1,175 +0,0 @@ >>> -From 4c9d54ab5a41d65000c8d249b6fb1b76056f1812 Mon Sep 17 00:00:00 >>> 2001 >>> -From: Luca Ceresoli >>> -Date: Wed, 20 Jun 2018 12:11:50 +0200 >>> -Subject: [PATCH] arm/arm64: zynq/zynqmp: pass the PS init file as a >>> kconfig >>> - variable >>> - >>> -U-Boot needs to link ps7_init_gpl.c on Zynq or psu_init_gpl.c on >>> -ZynqMP (PS init for short). The current logic to locate this file >>> for -both platforms is: >>> - >>> - 1. if a board-specific file exists in >>> - board/xilinx/zynq[mp]/$(CONFIG_DEFAULT_DEVICE_TREE)/ps?_init_gpl.c >>> - then use it >>> - 2. otherwise use board/xilinx/zynq/ps?_init_gpl.c >>> - >>> -In the latter case the file does not exist in the U-Boot sources and >>> -must be copied in the source tree from the outside before starting >>> the -build. This is typical when it is generated from Xilinx tools >>> while -developing a custom hardware. However making sure that a >>> -board-specific file is _not_ found (and used) requires some trickery >>> -such as removing or overwriting all PS init files (e.g.: the current >>> -meta-xilinx yocto layer [0]). >>> - >>> -This generates a few problems: >>> - >>> - * if the source tree is shared among different out-of-tree builds, >>> - they will pollute (and potentially corrupt) each other >>> - * the source tree cannot be read-only >>> - * any buildsystem must add a command to copy the PS init file >>> binary >>> - * overwriting or deleting files in the source tree is ugly as hell >>> - >>> -Simplify usage by allowing to pass the path to the desired PS init >>> -file in kconfig variable XILINX_PS_INIT_FILE. It can be an absolute >>> -path or relative to $(srctree). If the variable is set, the >>> -user-specified file will always be used without being copied -around. >>> If the the variable is left empty, for backward compatibility -fall >>> back to the old behaviour. >>> - >>> -Since the issue is the same for Zynq and ZynqMP, add one kconfig >>> -variable in a common place and use it for both. >>> - >>> -Also use the new kconfig help text to document all the ways to give >>> -U-Boot the PS init file. >>> - >>> -Build-tested with all combinations of: >>> - - platform: zynq or zynqmp >>> - - PS init file: from XILINX_PS_INIT_FILE (absolute, relative path, >>> - non-existing), in-tree board-specific, in board/xilinx/zynq[mp]/ >>> - - building in-tree, in subdir, in other directory >>> - >>> -[0] >>> https://github.com/Xilinx/meta-xilinx/blob/b2f74cc7fe5c4881589d5e440a >>> 1 >>> 7cb51fc66a7ab/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init. >>> inc#L9 >>> - >>> -Signed-off-by: Luca Ceresoli >>> -Cc: Albert Aribaud >>> -Cc: Michal Simek >>> -Cc: Nathan Rossi -Backported from upstream: >>> https://git.denx.de/?p=u-boot.git;a=commit;h=6da4f67ad09cd8b311d77b2b >>> 0 >>> 4e557b7ef65b56c >>> ---- >>> - arch/arm/Kconfig | 1 + >>> - board/xilinx/Kconfig | 41 +++++++++++++++++++++++++++++++++++++++++ >>> - board/xilinx/zynq/Makefile | 10 +++++++++- >>> - board/xilinx/zynqmp/Makefile | 10 +++++++++- >>> - 4 files changed, 60 insertions(+), 2 deletions(-) >>> - create mode 100644 board/xilinx/Kconfig >>> - >>> -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index >>> 22234cde2ab6..e04979d0ef7e 100644 >>> ---- a/arch/arm/Kconfig >>> -+++ b/arch/arm/Kconfig >>> -@@ -1293,4 +1293,5 @@ source "board/technologic/ts4600/Kconfig" >>> - source "board/vscom/baltos/Kconfig" >>> - source "board/woodburn/Kconfig" >>> - source "board/work-microwave/work_92105/Kconfig" >>> -+source "board/xilinx/Kconfig" >>> - source "board/zipitz2/Kconfig" >>> - >>> - source "arch/arm/Kconfig.debug" >>> -diff --git a/board/xilinx/Kconfig b/board/xilinx/Kconfig -new file >>> mode 100644 -index 000000000000..aa3fa061edef >>> ---- /dev/null >>> -+++ b/board/xilinx/Kconfig >>> -@@ -0,0 +1,41 @@ >>> -+# Copyright (c) 2018, Luca Ceresoli # # >>> -+SPDX-License-Identifier: GPL-2.0 >>> -+ >>> -+if ARCH_ZYNQ || ARCH_ZYNQMP >>> -+ >>> -+config XILINX_PS_INIT_FILE >>> -+ string "Zynq/ZynqMP PS init file(s) location" >>> -+ help >>> -+ On Zynq and ZynqMP U-Boot SPL (or U-Boot proper if >>> -+ ZYNQMP_PSU_INIT_ENABLED is set) is responsible for some >>> -+ basic initializations, such as enabling peripherals and >>> -+ configuring pinmuxes. The PS init file (called >>> -+ psu_init_gpl.c on ZynqMP, ps7_init_gpl.c for Zynq-7000) >>> -+ contains the code for such initializations. >>> -+ >>> -+ U-Boot contains PS init files for some boards, but each of >>> -+ them describes only one specific configuration. Users of a >>> -+ different board, or needing a different configuration, can >>> -+ generate custom files using the Xilinx development tools. >>> -+ >>> -+ There are three ways to give a PS init file to U-Boot: >>> -+ >>> -+ 1. Set this variable to the path, either relative to the >>> -+ source tree or absolute, where the psu_init_gpl.c or >>> -+ ps7_init_gpl.c file is located. U-Boot will build this >>> -+ file. >>> -+ >>> -+ 2. If you leave an empty string here, U-Boot will use >>> -+ board/xilinx/zynq/$(CONFIG_DEFAULT_DEVICE_TREE)/ps7_init_gpl.c >>> -+ for Zynq-7000, or >>> -+ board/xilinx/zynqmp/$(CONFIG_DEFAULT_DEVICE_TREE)/psu_init_gpl.c >>> -+ for ZynqMP. >>> -+ >>> -+ 3. If the above file does not exist, U-Boot will use >>> -+ board/xilinx/zynq/ps7_init_gpl.c for Zynq-7000, or >>> -+ board/xilinx/zynqmp/psu_init_gpl.c for ZynqMP. This file >>> -+ is not provided by U-Boot, you have to copy it there >>> -+ before the build. >>> -+ >>> -+endif >>> -diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile >>> -index 5a76a26720cd..03ad5f0532ee 100644 >>> ---- a/board/xilinx/zynq/Makefile >>> -+++ b/board/xilinx/zynq/Makefile >>> -@@ -5,10 +5,18 @@ >>> - >>> - obj-y := board.o >>> - >>> --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) >>> -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") >>> -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f >>> -+$(CONFIG_XILINX_PS_INIT_FILE)) init-objs := ps_init_gpl.o >>> -+spl/board/xilinx/zynq/ps_init_gpl.o board/xilinx/zynq/ps_init_gpl.o: $(PS_INIT_FILE) >>> -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ endif >>> - >>> -+ifeq ($(init-objs),) >>> -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) >>> - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/ps7_init_gpl.c),\ >>> - $(hw-platform-y)/ps7_init_gpl.o) >>> -+endif >>> - >>> - ifeq ($(init-objs),) >>> - ifneq ($(wildcard $(srctree)/$(src)/ps7_init_gpl.c),) >>> -diff --git a/board/xilinx/zynqmp/Makefile >>> b/board/xilinx/zynqmp/Makefile -index 05ccd25dcef3..960b81fc5853 >>> 100644 >>> ---- a/board/xilinx/zynqmp/Makefile >>> -+++ b/board/xilinx/zynqmp/Makefile >>> -@@ -5,10 +5,18 @@ >>> - >>> - obj-y := zynqmp.o >>> - >>> --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) >>> -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") >>> -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f >>> -+$(CONFIG_XILINX_PS_INIT_FILE)) init-objs := ps_init_gpl.o >>> -+spl/board/xilinx/zynqmp/ps_init_gpl.o board/xilinx/zynqmp/ps_init_gpl.o: $(PS_INIT_FILE) >>> -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ endif >>> - >>> -+ifeq ($(init-objs),) >>> -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) >>> - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/psu_init_gpl.c),\ >>> - $(hw-platform-y)/psu_init_gpl.o) >>> -+endif >>> - >>> - ifeq ($(init-objs),) >>> - ifneq ($(wildcard $(srctree)/$(src)/psu_init_gpl.c),) >>> --- >>> -2.7.4 >>> - >>> diff --git a/configs/zynqmp_zcu102_defconfig >>> b/configs/zynqmp_zcu102_defconfig new file mode 100644 index >>> 0000000000..336f5c2dbe >>> --- /dev/null >>> +++ b/configs/zynqmp_zcu102_defconfig >>> @@ -0,0 +1,35 @@ >>> +BR2_aarch64=y >>> +BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" >>> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y >>> +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" >>> +BR2_LINUX_KERNEL=y >>> +BR2_LINUX_KERNEL_CUSTOM_GIT=y >>> +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" >>> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2" >>> +BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" >>> +BR2_LINUX_KERNEL_DTS_SUPPORT=y >>> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" >>> +BR2_TARGET_ROOTFS_EXT2=y >>> +BR2_TARGET_ROOTFS_EXT2_4=y >>> +# BR2_TARGET_ROOTFS_TAR is not set >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.4_2021.2" >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" >>> +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2" >>> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" >>> +BR2_TARGET_UBOOT_NEEDS_DTC=y >>> +BR2_TARGET_UBOOT_SPL=y >>> +BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" >>> +BR2_TARGET_UBOOT_ZYNQMP=y >>> +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/master/bin/pmufw-v2021.2.bin" >>> +BR2_TARGET_UBOOT_FORMAT_ITB=y >>> +BR2_PACKAGE_HOST_DOSFSTOOLS=y >>> +BR2_PACKAGE_HOST_GENIMAGE=y >>> +BR2_PACKAGE_HOST_MTOOLS=y >> >> As pointed above this ^^^ file must be in a separate patch and it >> deserves also a maintainer. So please you or maybe Luca could add an >> entry to DEVELOPERS for this board >> >>> diff --git a/configs/zynqmp_zcu106_defconfig >>> b/configs/zynqmp_zcu106_defconfig index bee7c1daf7..3a6947e1e8 100644 >>> --- a/configs/zynqmp_zcu106_defconfig >>> +++ b/configs/zynqmp_zcu106_defconfig >>> @@ -1,11 +1,11 @@ >>> BR2_aarch64=y >>> BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" >> >> Since all patches are gone, this ^^^ is not needed anymore >> >>> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y >>> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y >>> BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" >>> BR2_LINUX_KERNEL=y >>> BR2_LINUX_KERNEL_CUSTOM_GIT=y >>> BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" >>> -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" >>> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2" >>> BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" >>> BR2_LINUX_KERNEL_DTS_SUPPORT=y >>> BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" >>> @@ -14,21 +14,22 @@ BR2_TARGET_ROOTFS_EXT2_4=y >>> # BR2_TARGET_ROOTFS_TAR is not set >>> BR2_TARGET_ARM_TRUSTED_FIRMWARE=y >>> BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y >>> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" >>> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5" >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.4_2021.2" >> >> It's worth mention in commit log that you're switching from ARM to >> Xilinx ATF >> >>> BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" >>> BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" >>> -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7" >>> -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA" >>> +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2" >>> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" >>> BR2_TARGET_UBOOT_NEEDS_DTC=y >>> BR2_TARGET_UBOOT_SPL=y >>> BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" >>> BR2_TARGET_UBOOT_ZYNQMP=y >>> -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/53fdb7b6c92860ceb0ec5fd14deee302f4a84269/bin/pmufw-zcu106-default-v2017.4.bin" >>> +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/master/bin/pmufw-v2021.2.bin" >>> +BR2_TARGET_UBOOT_FORMAT_ITB=y >> >> Here ^^^ I see that probably you're switching from .bin to .itb so >> better mention it in commit log >> >>> BR2_PACKAGE_HOST_DOSFSTOOLS=y >>> BR2_PACKAGE_HOST_GENIMAGE=y >>> BR2_PACKAGE_HOST_MTOOLS=y >> >> Thank you! >> >> Best regards >> -- >> Giulio Benetti >> Benetti Engineering sas > > -- > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > From nealf at xilinx.com Thu Feb 3 14:09:44 2022 From: nealf at xilinx.com (Neal Frager) Date: Thu, 3 Feb 2022 14:09:44 +0000 Subject: [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2 In-Reply-To: References: Message-ID: Hi Giulio, > Hi Neal, > Il giorno 3 feb 2022, alle ore 14:57, Neal Frager ha scritto: > > ?Hi Giulio, > >> Hi Neal, > >> On 03/02/22 07:24, Neal Frager wrote: >> Hi Giulio, >> >> Thank you very much for your feedback. > >> You're welcome. > >> Please don't top-post, answer inline as you see all around the Mailing List. > >> Also, I don't know if you've read my entire answer. Usually until you don't see "Best regards" and the name of the one who answer, the answer-mail is not finished yet, so simply scroll down until you finish the e-mail. > >> So please check also the rest of my previous e-mail. > > I hope this method of inline answer works. > Yes it does work. Only remember to set your client using plain-text only. I?m on mobile now so probably my answer and yours will be in html. > But we need plain-text, please check your email client and set plain-text by default. As far as I can tell, my replies are already in plain-text by default. Let me know if you catch a message where that is not the case. > I have submitted a new set of patches based on the feedback from you and Luca. Could you please have a look and let me know what you think? > Sure, I?m going to tonight :-) > Also Luca I think will since he?s the maintainer of zynq stuff. > Also we?ve sent you the review almost at the same time yesterday :-) > Best regards > ? - > Giulio Benetti > Benetti Engineering sas I look forward to your feedback. Best regards, Neal Frager > >> I would be happy to split the zynqmp_zcu102_defconfig off into a second patch. No problem. > >> Fine > >> As for adding comments to the log, could you share the proper git commands for doing this? I would be happy to do it, but I am a bit new to git and I did not know the proper command to use for adding log comments. > >> Luca already pointed you a lot of very useful links. > >> Another tool I like to create patches for me is "git gui" and also "gitk" to scroll the commits in a non-console way. > >> Most of all "git gui" is helpful to me to choose a single line to stage or revert. > >> Best regards > --- >> Giulio Benetti >> Benetti Engineering sas > >> Best regards, >> >> Neal Frager >> Xilinx >> > > Best regards, > Neal Frager > Xilinx > >> -----Original Message----- >> From: Giulio Benetti >> Sent: Wednesday 2 February 2022 23:33 >> To: Neal Frager ; buildroot at buildroot.org >> Cc: luca at lucaceresoli.net; Neal Frager >> Subject: Re: [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump >> ATF/U-Boot/Linux to Xilinx 2021.2 >> >> CAUTION: This message has originated from an External Source. Please use proper judgment and caution when opening attachments, clicking links, or responding to this email. >> >> >> Hi Neal, >> >> nice to see you've made it with git send-email :-), >> >> Here I would improve commit log by stating that you're dropping all >> local patches because they are now upstreamed >> >>> On 02/02/22 17:55, Neal Frager wrote: >>> Signed-off-by: Neal Frager >>> --- >>> board/zynqmp/genimage.cfg | 1 + >>> ...-fix-Remove-GGC-ignore-Warray-bounds.patch | 68 ------- >>> ...64-zynqmp-zcu106-fix-SPL-MMC-booting.patch | 52 ------ >>> ...2-arm64-zynqmp-Enable-booting-to-ATF.patch | 114 ------------ >>> ...ept-an-absolute-path-for-PMUFW_INIT_.patch | 68 ------- >>> ...ynqmp-pass-the-PS-init-file-as-a-kco.patch | 175 ------------------ >>> configs/zynqmp_zcu102_defconfig | 35 ++++ >> >> This ^^^ file is added, so it deserves a second patch after this one, >> basically this becomes a patchset of 2 patches >> >>> configs/zynqmp_zcu106_defconfig | 15 +- >>> 8 files changed, 44 insertions(+), 484 deletions(-) >>> delete mode 100644 board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch >>> delete mode 100644 board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch >>> delete mode 100644 board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch >>> delete mode 100644 board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch >>> delete mode 100644 board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch >>> create mode 100644 configs/zynqmp_zcu102_defconfig >>> >>> diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg >>> index ed202f4550..557364e124 100644 >>> --- a/board/zynqmp/genimage.cfg >>> +++ b/board/zynqmp/genimage.cfg >>> @@ -3,6 +3,7 @@ image boot.vfat { >>> files = { >>> "boot.bin", >>> "u-boot.bin", >>> + "u-boot.itb", >> >> Can you please justify this adding ^^^ in commit log? >> >>> "atf-uboot.ub", >>> "system.dtb", >>> "Image" >>> diff --git >>> a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove >>> - >>> G >>> GC-ignore-Warray-bounds.patch >>> b/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove >>> - >>> G >>> GC-ignore-Warray-bounds.patch >>> deleted file mode 100644 >>> index 0c1a9ba2a4..0000000000 >>> --- >>> a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove >>> - >>> G >>> GC-ignore-Warray-bounds.patch >>> +++ /dev/null >>> @@ -1,68 +0,0 @@ >>> -From da003e6ada7d0217fe99dc7c649a731f8ebd3c34 Mon Sep 17 00:00:00 >>> 2001 >>> -From: Deepika Bhavnani >>> -Date: Thu, 15 Aug 2019 00:56:46 +0300 >>> -Subject: [PATCH] Coverity fix: Remove GGC ignore -Warray-bounds >>> - >>> -GCC diagnostics were added to ignore array boundaries, instead -of >>> ignoring GCC warning current code will check for array boundaries >>> -and perform and array update only for valid elements. >>> - >>> -Resolves: `CID 246574` `CID 246710` `CID 246651` >>> - >>> -Signed-off-by: Deepika Bhavnani >>> -Change-Id: I7530ecf7a1707351c6ee87e90cc3d33574088f57 >>> - >>> -Backported from: 41af05154abe136938bcfb5f26c969933784bbef >>> -[Adapted to apply on 1.5] >>> - >>> ---- >>> - lib/psci/psci_common.c | 20 ++++++++++---------- >>> - 1 file changed, 10 insertions(+), 10 deletions(-) >>> - >>> -diff --git a/lib/psci/psci_common.c b/lib/psci/psci_common.c -index >>> 2220a745cd6e..6282d992a2f0 100644 >>> ---- a/lib/psci/psci_common.c >>> -+++ b/lib/psci/psci_common.c >>> -@@ -188,21 +188,17 @@ static unsigned int >>> get_power_on_target_pwrlvl(void) >>> - >>> /******************************************************************* >>> * >>> * >>> ********* >>> - * Helper function to update the requested local power state array. >>> This array >>> - * does not store the requested state for the CPU power level. >>> Hence an >>> -- * assertion is added to prevent us from accessing the wrong index. >>> -+ * assertion is added to prevent us from accessing the CPU power level. >>> - >>> ******************************************************************** >>> * >>> * >>> *******/ >>> - static void psci_set_req_local_pwr_state(unsigned int pwrlvl, >>> - unsigned int cpu_idx, >>> - plat_local_state_t req_pwr_state) >>> - { >>> -- /* >>> -- * This should never happen, we have this here to avoid >>> -- * "array subscript is above array bounds" errors in GCC. >>> -- */ >>> - assert(pwrlvl > PSCI_CPU_PWR_LVL); >>> --#pragma GCC diagnostic push >>> --#pragma GCC diagnostic ignored "-Warray-bounds" >>> -- psci_req_local_pwr_states[pwrlvl - 1][cpu_idx] = req_pwr_state; >>> --#pragma GCC diagnostic pop >>> -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && >>> -+ (cpu_idx < PLATFORM_CORE_COUNT)) { >>> -+ psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx] = req_pwr_state; >>> -+ } >>> - } >>> - >>> - >>> /******************************************************************* >>> * >>> * >>> ********* -@@ -228,7 +224,11 @@ static plat_local_state_t >>> *psci_get_req_local_pwr_states(unsigned int pwrlvl, >>> - { >>> - assert(pwrlvl > PSCI_CPU_PWR_LVL); >>> - >>> -- return &psci_req_local_pwr_states[pwrlvl - 1][cpu_idx]; >>> -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && >>> -+ (cpu_idx < PLATFORM_CORE_COUNT)) { >>> -+ return &psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx]; >>> -+ } else >>> -+ return NULL; >>> - } >>> - >>> - /* >>> --- >>> -2.34.0 >>> - >>> diff --git >>> a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-bo >>> o >>> t >>> ing.patch >>> b/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-bo >>> o >>> t >>> ing.patch >>> deleted file mode 100644 >>> index 4d85e1bb12..0000000000 >>> --- >>> a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-bo >>> o >>> t >>> ing.patch >>> +++ /dev/null >>> @@ -1,52 +0,0 @@ >>> -From e5d72ed8339eb05285448aad3c89d21e4d18fd29 Mon Sep 17 00:00:00 >>> 2001 >>> -From: Luca Ceresoli >>> -Date: Mon, 26 Feb 2018 09:40:34 +0100 >>> -Subject: [PATCH] arm64: zynqmp: zcu106: fix SPL MMC booting >>> - >>> -The U-Boot SPL generated with the current zcu106 defconfig cannot >>> boot -from MMC: >>> - >>> - [...] >>> - U-Boot SPL 2018.01 (Feb 21 2018 - 17:47:14) >>> - EL Level: EL3 >>> - Trying to boot from MMC1 >>> - sdhci_transfer_data: Error detected in status(0x408020)! >>> - spl_load_image_fat_os: error reading image u-boot.bin, err - -2 >>> - spl_load_image_fat: error reading image u-boot.img, err - -6 >>> - SPL: failed to boot from all boot devices >>> - ### ERROR ### Please RESET the board ### >>> - >>> -Fix by lowering the rpll value. The new value for the RPLL_CTRL >>> -register comes from the current psu_init_gpl.c from the HDF file at >>> -https://github.com/xilinx/hdf-examples/tree/01ad8ea5fd1989abf4ea5a0 >>> 7 >>> 2 >>> d019a16cb2bc546/zcu106-zynqmp >>> -(generated by Vivado v2017.4). >>> - >>> -RPLL and sdio1_ref clocks before and after this change: >>> - >>> - - Old values: RPLL 1.36 GHz, sdio1_ref 272 MHz >>> - - New values: RPLL 1.16 GHz, sdio1_ref 233 MHz >>> - >>> -Signed-off-by: Luca Ceresoli >>> -Cc: Michal Simek >>> -Upstream-status: accepted upstream in a different form >>> ---- >>> - >>> - board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c | 2 +- >>> - 1 file changed, 1 insertion(+), 1 deletion(-) >>> - >>> -diff --git a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c >>> b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c >>> -index 4d18abe000ca..e6fa477e53e7 100644 >>> ---- a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c >>> -+++ b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c >>> -@@ -10,7 +10,7 @@ >>> - static unsigned long psu_pll_init_data(void) >>> - { >>> - psu_mask_write(0xFF5E0034, 0xFE7FEDEFU, 0x7E4E2C62U); >>> -- psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00013C00U); >>> -+ psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00014600U); >>> - psu_mask_write(0xFF5E0030, 0x00000008U, 0x00000008U); >>> - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000001U); >>> - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000000U); >>> --- >>> -2.7.4 >>> - >>> diff --git >>> a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF. >>> p >>> atch >>> b/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF. >>> p >>> atch >>> deleted file mode 100644 >>> index 487fff6812..0000000000 >>> --- >>> a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF. >>> p >>> atch >>> +++ /dev/null >>> @@ -1,114 +0,0 @@ >>> -From 5e3cac50cc981e01d9072241035a8d4162560c71 Mon Sep 17 00:00:00 >>> 2001 >>> -From: Luca Ceresoli >>> -Date: Mon, 12 Mar 2018 17:18:38 +0100 >>> -Subject: [PATCH] arm64: zynqmp: Enable booting to ATF >>> - >>> -U-Boot is now able to boot to ARM Trusted Firmware (ATF). The boot >>> -flow is SPL(EL3) loads ATF and full u-boot and jump to ATF(EL3) >>> which -pass control to full u-boot(EL2). This has been tested on >>> zcu106, so -enable it in this defconfig. >>> - >>> -To generate an image that triggers this booting flow, you need to >>> pass -'-O arm-trusted-firmware' to mkimage. >>> - >>> -Signed-off-by: Luca Ceresoli >>> -Signed-off-by: Michal Simek -Backported >>> from upstream: >>> http://git.denx.de/?p=u-boot.git;a=commit;h=5e3cac50cc981e01d9072241 >>> 0 >>> 3 >>> 5a8d4162560c71 >>> ---- >>> - >>> - configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 + >>> - configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 + >>> - configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 + >>> - configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 + >>> - configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 1 + >>> - configs/xilinx_zynqmp_zcu102_revA_defconfig | 1 + >>> - configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 + >>> - 7 files changed, 7 insertions(+) >>> - >>> -diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig >>> b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig >>> -index c5bfa2b12638..488c72258b0e 100644 >>> ---- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig >>> -+++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig >>> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >>> - CONFIG_SPL_OS_BOOT=y >>> - CONFIG_SPL_RAM_SUPPORT=y >>> - CONFIG_SPL_RAM_DEVICE=y >>> -+CONFIG_SPL_ATF=y >>> - CONFIG_SYS_PROMPT="ZynqMP> " >>> - CONFIG_FASTBOOT=y >>> - CONFIG_FASTBOOT_FLASH=y >>> -diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig >>> b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig >>> -index f86dce403a42..5d501eec0edd 100644 >>> ---- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig >>> -+++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig >>> -@@ -20,6 +20,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >>> - CONFIG_SPL_OS_BOOT=y >>> - CONFIG_SPL_RAM_SUPPORT=y >>> - CONFIG_SPL_RAM_DEVICE=y >>> -+CONFIG_SPL_ATF=y >>> - CONFIG_SYS_PROMPT="ZynqMP> " >>> - CONFIG_FASTBOOT=y >>> - CONFIG_FASTBOOT_FLASH=y >>> -diff --git a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig >>> b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig >>> -index 6e947cf56827..6f7eaebd7676 100644 >>> ---- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig >>> -+++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig >>> -@@ -16,6 +16,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >>> - CONFIG_SPL_OS_BOOT=y >>> - CONFIG_SPL_RAM_SUPPORT=y >>> - CONFIG_SPL_RAM_DEVICE=y >>> -+CONFIG_SPL_ATF=y >>> - CONFIG_SYS_PROMPT="ZynqMP> " >>> - CONFIG_CMD_MEMTEST=y >>> - CONFIG_SYS_ALT_MEMTEST=y >>> -diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig >>> b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig >>> -index 1c934858c61c..7a3806cba4b5 100644 >>> ---- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig >>> -+++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig >>> -@@ -17,6 +17,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >>> - CONFIG_SPL_OS_BOOT=y >>> - CONFIG_SPL_RAM_SUPPORT=y >>> - CONFIG_SPL_RAM_DEVICE=y >>> -+CONFIG_SPL_ATF=y >>> - CONFIG_SYS_PROMPT="ZynqMP> " >>> - CONFIG_CMD_MEMTEST=y >>> - CONFIG_SYS_ALT_MEMTEST=y >>> -diff --git a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig >>> b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig >>> -index e13c7c56f310..e4408f182ca0 100644 >>> ---- a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig >>> -+++ b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig >>> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >>> - CONFIG_SPL_OS_BOOT=y >>> - CONFIG_SPL_RAM_SUPPORT=y >>> - CONFIG_SPL_RAM_DEVICE=y >>> -+CONFIG_SPL_ATF=y >>> - CONFIG_SYS_PROMPT="ZynqMP> " >>> - CONFIG_FASTBOOT=y >>> - CONFIG_FASTBOOT_FLASH=y >>> -diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig >>> b/configs/xilinx_zynqmp_zcu102_revA_defconfig >>> -index 5b2cd495ee85..b52f6789fd4b 100644 >>> ---- a/configs/xilinx_zynqmp_zcu102_revA_defconfig >>> -+++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig >>> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >>> - CONFIG_SPL_OS_BOOT=y >>> - CONFIG_SPL_RAM_SUPPORT=y >>> - CONFIG_SPL_RAM_DEVICE=y >>> -+CONFIG_SPL_ATF=y >>> - CONFIG_SYS_PROMPT="ZynqMP> " >>> - CONFIG_FASTBOOT=y >>> - CONFIG_FASTBOOT_FLASH=y >>> -diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig >>> b/configs/xilinx_zynqmp_zcu102_revB_defconfig >>> -index e6530fbfe7ff..80592554f682 100644 >>> ---- a/configs/xilinx_zynqmp_zcu102_revB_defconfig >>> -+++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig >>> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >>> - CONFIG_SPL_OS_BOOT=y >>> - CONFIG_SPL_RAM_SUPPORT=y >>> - CONFIG_SPL_RAM_DEVICE=y >>> -+CONFIG_SPL_ATF=y >>> - CONFIG_SYS_PROMPT="ZynqMP> " >>> - CONFIG_FASTBOOT=y >>> - CONFIG_FASTBOOT_FLASH=y >>> --- >>> -2.7.4 >>> - >>> diff --git >>> a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-pa >>> t >>> h >>> -for-PMUFW_INIT_.patch >>> b/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-pa >>> t >>> h >>> -for-PMUFW_INIT_.patch >>> deleted file mode 100644 >>> index 95ab7b3b75..0000000000 >>> --- >>> a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-pa >>> t >>> h >>> -for-PMUFW_INIT_.patch >>> +++ /dev/null >>> @@ -1,68 +0,0 @@ >>> -From c7df098a71e05dc81cee818747759e8060b59626 Mon Sep 17 00:00:00 >>> 2001 >>> -From: Luca Ceresoli >>> -Date: Mon, 4 Jun 2018 12:21:01 +0200 >>> -Subject: [PATCH] arm64: zynqmp: accept an absolute path for >>> PMUFW_INIT_FILE >>> - >>> -The value of PMUFW_INIT_FILE is prefixed with "$(srctree)/", thus >>> -forcing it to be a relative path inside the U-Boot source tree. >>> Since -the PMUFW is a binary file generated outside of U-Boot, the >>> PMUFW -binary must be copied inside the U-Boot source tree before >>> the -build. >>> - >>> -This generates a few problems: >>> - >>> - * if the source tree is shared among different out-of-tree builds, >>> - they will pollute (and potentially corrupt) each other >>> - * the source tree cannot be read-only >>> - * any buildsystem must add a command to copy the PMUFW binary >>> - * putting an externally-generated binary in the source tree is ugly >>> - as hell >>> - >>> -Avoid these problems by accepting an absolute path for >>> -PMUFW_INIT_FILE. This would be as simple as removing the "$(srctree)/" >>> -prefix, but in order to keep backward compatibility we rather use >>> the -shell and readlink to get the absolute path even when starting >>> from a -relative path. >>> - >>> -Since 'readlink -f' produces an empty string if the file does not >>> -exist, we also add a check to ensure the file configured in >>> -PMUFW_INIT_FILE exists. Otherwise the build would exit >>> successfully, -but produce a boot.bin without PMUFW as if PMUFW_INIT_FILE were empty. >>> - >>> -Tested in the 12 possible combinations of: >>> - - PMUFW_INIT_FILE empty, relative, absolute, non-existing >>> - - building in-tree, in subdir, in other directory >>> - >>> -Signed-off-by: Luca Ceresoli >>> -Cc: Michal Simek >>> -Cc: Simon Glass >>> -Cc: Emmanuel Vadot >>> -Signed-off-by: Michal Simek -Backported >>> from upstream: >>> https://git.denx.de/?p=u-boot.git;a=commit;h=c7df098a71e05dc81cee818 >>> 7 >>> 4 >>> 7759e8060b59626 >>> ---- >>> - scripts/Makefile.spl | 8 +++++++- >>> - 1 file changed, 7 insertions(+), 1 deletion(-) >>> - >>> -diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl -index >>> ef018b5b4056..252f13826d4c 100644 >>> ---- a/scripts/Makefile.spl >>> -+++ b/scripts/Makefile.spl >>> -@@ -167,8 +167,14 @@ ifdef CONFIG_ARCH_ZYNQ >>> - MKIMAGEFLAGS_boot.bin = -T zynqimage -R >>> $(srctree)/$(CONFIG_BOOT_INIT_FILE) >>> - endif >>> - ifdef CONFIG_ARCH_ZYNQMP >>> -+ifneq ($(CONFIG_PMUFW_INIT_FILE),"") >>> -+spl/boot.bin: zynqmp-check-pmufw >>> -+zynqmp-check-pmufw: FORCE >>> -+ ( cd $(srctree) && test -r $(CONFIG_PMUFW_INIT_FILE) ) \ >>> -+ || ( echo "Cannot read $(CONFIG_PMUFW_INIT_FILE)" && >>> -+false ) endif >>> - MKIMAGEFLAGS_boot.bin = -T zynqmpimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) \ >>> -- -n $(srctree)/$(CONFIG_PMUFW_INIT_FILE) >>> -+ -n "$(shell cd $(srctree); readlink -f $(CONFIG_PMUFW_INIT_FILE))" >>> - endif >>> - >>> - spl/boot.bin: $(obj)/u-boot-spl.bin FORCE >>> --- >>> -2.7.4 >>> - >>> diff --git >>> a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS- >>> i >>> n >>> it-file-as-a-kco.patch >>> b/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS- >>> i >>> n >>> it-file-as-a-kco.patch >>> deleted file mode 100644 >>> index b32e162780..0000000000 >>> --- >>> a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS- >>> i >>> n >>> it-file-as-a-kco.patch >>> +++ /dev/null >>> @@ -1,175 +0,0 @@ >>> -From 4c9d54ab5a41d65000c8d249b6fb1b76056f1812 Mon Sep 17 00:00:00 >>> 2001 >>> -From: Luca Ceresoli >>> -Date: Wed, 20 Jun 2018 12:11:50 +0200 >>> -Subject: [PATCH] arm/arm64: zynq/zynqmp: pass the PS init file as a >>> kconfig >>> - variable >>> - >>> -U-Boot needs to link ps7_init_gpl.c on Zynq or psu_init_gpl.c on >>> -ZynqMP (PS init for short). The current logic to locate this file >>> for -both platforms is: >>> - >>> - 1. if a board-specific file exists in >>> - board/xilinx/zynq[mp]/$(CONFIG_DEFAULT_DEVICE_TREE)/ps?_init_gpl.c >>> - then use it >>> - 2. otherwise use board/xilinx/zynq/ps?_init_gpl.c >>> - >>> -In the latter case the file does not exist in the U-Boot sources >>> and -must be copied in the source tree from the outside before >>> starting the -build. This is typical when it is generated from >>> Xilinx tools while -developing a custom hardware. However making >>> sure that a -board-specific file is _not_ found (and used) requires >>> some trickery -such as removing or overwriting all PS init files >>> (e.g.: the current -meta-xilinx yocto layer [0]). >>> - >>> -This generates a few problems: >>> - >>> - * if the source tree is shared among different out-of-tree builds, >>> - they will pollute (and potentially corrupt) each other >>> - * the source tree cannot be read-only >>> - * any buildsystem must add a command to copy the PS init file >>> binary >>> - * overwriting or deleting files in the source tree is ugly as hell >>> - >>> -Simplify usage by allowing to pass the path to the desired PS init >>> -file in kconfig variable XILINX_PS_INIT_FILE. It can be an absolute >>> -path or relative to $(srctree). If the variable is set, the >>> -user-specified file will always be used without being copied -around. >>> If the the variable is left empty, for backward compatibility -fall >>> back to the old behaviour. >>> - >>> -Since the issue is the same for Zynq and ZynqMP, add one kconfig >>> -variable in a common place and use it for both. >>> - >>> -Also use the new kconfig help text to document all the ways to give >>> -U-Boot the PS init file. >>> - >>> -Build-tested with all combinations of: >>> - - platform: zynq or zynqmp >>> - - PS init file: from XILINX_PS_INIT_FILE (absolute, relative path, >>> - non-existing), in-tree board-specific, in board/xilinx/zynq[mp]/ >>> - - building in-tree, in subdir, in other directory >>> - >>> -[0] >>> https://github.com/Xilinx/meta-xilinx/blob/b2f74cc7fe5c4881589d5e440 >>> a >>> 1 >>> 7cb51fc66a7ab/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init. >>> inc#L9 >>> - >>> -Signed-off-by: Luca Ceresoli >>> -Cc: Albert Aribaud >>> -Cc: Michal Simek >>> -Cc: Nathan Rossi -Backported from upstream: >>> https://git.denx.de/?p=u-boot.git;a=commit;h=6da4f67ad09cd8b311d77b2 >>> b >>> 0 >>> 4e557b7ef65b56c >>> ---- >>> - arch/arm/Kconfig | 1 + >>> - board/xilinx/Kconfig | 41 +++++++++++++++++++++++++++++++++++++++++ >>> - board/xilinx/zynq/Makefile | 10 +++++++++- >>> - board/xilinx/zynqmp/Makefile | 10 +++++++++- >>> - 4 files changed, 60 insertions(+), 2 deletions(-) >>> - create mode 100644 board/xilinx/Kconfig >>> - >>> -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index >>> 22234cde2ab6..e04979d0ef7e 100644 >>> ---- a/arch/arm/Kconfig >>> -+++ b/arch/arm/Kconfig >>> -@@ -1293,4 +1293,5 @@ source "board/technologic/ts4600/Kconfig" >>> - source "board/vscom/baltos/Kconfig" >>> - source "board/woodburn/Kconfig" >>> - source "board/work-microwave/work_92105/Kconfig" >>> -+source "board/xilinx/Kconfig" >>> - source "board/zipitz2/Kconfig" >>> - >>> - source "arch/arm/Kconfig.debug" >>> -diff --git a/board/xilinx/Kconfig b/board/xilinx/Kconfig -new file >>> mode 100644 -index 000000000000..aa3fa061edef >>> ---- /dev/null >>> -+++ b/board/xilinx/Kconfig >>> -@@ -0,0 +1,41 @@ >>> -+# Copyright (c) 2018, Luca Ceresoli # # >>> -+SPDX-License-Identifier: GPL-2.0 >>> -+ >>> -+if ARCH_ZYNQ || ARCH_ZYNQMP >>> -+ >>> -+config XILINX_PS_INIT_FILE >>> -+ string "Zynq/ZynqMP PS init file(s) location" >>> -+ help >>> -+ On Zynq and ZynqMP U-Boot SPL (or U-Boot proper if >>> -+ ZYNQMP_PSU_INIT_ENABLED is set) is responsible for some >>> -+ basic initializations, such as enabling peripherals and >>> -+ configuring pinmuxes. The PS init file (called >>> -+ psu_init_gpl.c on ZynqMP, ps7_init_gpl.c for Zynq-7000) >>> -+ contains the code for such initializations. >>> -+ >>> -+ U-Boot contains PS init files for some boards, but each of >>> -+ them describes only one specific configuration. Users of a >>> -+ different board, or needing a different configuration, can >>> -+ generate custom files using the Xilinx development tools. >>> -+ >>> -+ There are three ways to give a PS init file to U-Boot: >>> -+ >>> -+ 1. Set this variable to the path, either relative to the >>> -+ source tree or absolute, where the psu_init_gpl.c or >>> -+ ps7_init_gpl.c file is located. U-Boot will build this >>> -+ file. >>> -+ >>> -+ 2. If you leave an empty string here, U-Boot will use >>> -+ board/xilinx/zynq/$(CONFIG_DEFAULT_DEVICE_TREE)/ps7_init_gpl.c >>> -+ for Zynq-7000, or >>> -+ board/xilinx/zynqmp/$(CONFIG_DEFAULT_DEVICE_TREE)/psu_init_gpl.c >>> -+ for ZynqMP. >>> -+ >>> -+ 3. If the above file does not exist, U-Boot will use >>> -+ board/xilinx/zynq/ps7_init_gpl.c for Zynq-7000, or >>> -+ board/xilinx/zynqmp/psu_init_gpl.c for ZynqMP. This file >>> -+ is not provided by U-Boot, you have to copy it there >>> -+ before the build. >>> -+ >>> -+endif >>> -diff --git a/board/xilinx/zynq/Makefile >>> b/board/xilinx/zynq/Makefile -index 5a76a26720cd..03ad5f0532ee >>> 100644 >>> ---- a/board/xilinx/zynq/Makefile >>> -+++ b/board/xilinx/zynq/Makefile >>> -@@ -5,10 +5,18 @@ >>> - >>> - obj-y := board.o >>> - >>> --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) >>> -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") >>> -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f >>> -+$(CONFIG_XILINX_PS_INIT_FILE)) init-objs := ps_init_gpl.o >>> -+spl/board/xilinx/zynq/ps_init_gpl.o board/xilinx/zynq/ps_init_gpl.o: $(PS_INIT_FILE) >>> -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ endif >>> - >>> -+ifeq ($(init-objs),) >>> -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) >>> - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/ps7_init_gpl.c),\ >>> - $(hw-platform-y)/ps7_init_gpl.o) >>> -+endif >>> - >>> - ifeq ($(init-objs),) >>> - ifneq ($(wildcard $(srctree)/$(src)/ps7_init_gpl.c),) >>> -diff --git a/board/xilinx/zynqmp/Makefile >>> b/board/xilinx/zynqmp/Makefile -index 05ccd25dcef3..960b81fc5853 >>> 100644 >>> ---- a/board/xilinx/zynqmp/Makefile >>> -+++ b/board/xilinx/zynqmp/Makefile >>> -@@ -5,10 +5,18 @@ >>> - >>> - obj-y := zynqmp.o >>> - >>> --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) >>> -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") >>> -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f >>> -+$(CONFIG_XILINX_PS_INIT_FILE)) init-objs := ps_init_gpl.o >>> -+spl/board/xilinx/zynqmp/ps_init_gpl.o board/xilinx/zynqmp/ps_init_gpl.o: $(PS_INIT_FILE) >>> -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ endif >>> - >>> -+ifeq ($(init-objs),) >>> -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) >>> - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/psu_init_gpl.c),\ >>> - $(hw-platform-y)/psu_init_gpl.o) >>> -+endif >>> - >>> - ifeq ($(init-objs),) >>> - ifneq ($(wildcard $(srctree)/$(src)/psu_init_gpl.c),) >>> --- >>> -2.7.4 >>> - >>> diff --git a/configs/zynqmp_zcu102_defconfig >>> b/configs/zynqmp_zcu102_defconfig new file mode 100644 index >>> 0000000000..336f5c2dbe >>> --- /dev/null >>> +++ b/configs/zynqmp_zcu102_defconfig >>> @@ -0,0 +1,35 @@ >>> +BR2_aarch64=y >>> +BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" >>> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y >>> +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" >>> +BR2_LINUX_KERNEL=y >>> +BR2_LINUX_KERNEL_CUSTOM_GIT=y >>> +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" >>> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2" >>> +BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" >>> +BR2_LINUX_KERNEL_DTS_SUPPORT=y >>> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" >>> +BR2_TARGET_ROOTFS_EXT2=y >>> +BR2_TARGET_ROOTFS_EXT2_4=y >>> +# BR2_TARGET_ROOTFS_TAR is not set >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.4_2021.2" >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" >>> +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2" >>> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" >>> +BR2_TARGET_UBOOT_NEEDS_DTC=y >>> +BR2_TARGET_UBOOT_SPL=y >>> +BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" >>> +BR2_TARGET_UBOOT_ZYNQMP=y >>> +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/master/bin/pmufw-v2021.2.bin" >>> +BR2_TARGET_UBOOT_FORMAT_ITB=y >>> +BR2_PACKAGE_HOST_DOSFSTOOLS=y >>> +BR2_PACKAGE_HOST_GENIMAGE=y >>> +BR2_PACKAGE_HOST_MTOOLS=y >> >> As pointed above this ^^^ file must be in a separate patch and it >> deserves also a maintainer. So please you or maybe Luca could add an >> entry to DEVELOPERS for this board >> >>> diff --git a/configs/zynqmp_zcu106_defconfig >>> b/configs/zynqmp_zcu106_defconfig index bee7c1daf7..3a6947e1e8 >>> 100644 >>> --- a/configs/zynqmp_zcu106_defconfig >>> +++ b/configs/zynqmp_zcu106_defconfig >>> @@ -1,11 +1,11 @@ >>> BR2_aarch64=y >>> BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" >> >> Since all patches are gone, this ^^^ is not needed anymore >> >>> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y >>> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y >>> BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" >>> BR2_LINUX_KERNEL=y >>> BR2_LINUX_KERNEL_CUSTOM_GIT=y >>> BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" >>> -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" >>> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2" >>> BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" >>> BR2_LINUX_KERNEL_DTS_SUPPORT=y >>> BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" >>> @@ -14,21 +14,22 @@ BR2_TARGET_ROOTFS_EXT2_4=y >>> # BR2_TARGET_ROOTFS_TAR is not set >>> BR2_TARGET_ARM_TRUSTED_FIRMWARE=y >>> BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y >>> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" >>> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5" >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.4_2021.2" >> >> It's worth mention in commit log that you're switching from ARM to >> Xilinx ATF >> >>> BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" >>> BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" >>> -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7" >>> -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA" >>> +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2" >>> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" >>> BR2_TARGET_UBOOT_NEEDS_DTC=y >>> BR2_TARGET_UBOOT_SPL=y >>> BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" >>> BR2_TARGET_UBOOT_ZYNQMP=y >>> -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/53fdb7b6c92860ceb0ec5fd14deee302f4a84269/bin/pmufw-zcu106-default-v2017.4.bin" >>> +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/master/bin/pmufw-v2021.2.bin" >>> +BR2_TARGET_UBOOT_FORMAT_ITB=y >> >> Here ^^^ I see that probably you're switching from .bin to .itb so >> better mention it in commit log >> >>> BR2_PACKAGE_HOST_DOSFSTOOLS=y >>> BR2_PACKAGE_HOST_GENIMAGE=y >>> BR2_PACKAGE_HOST_MTOOLS=y >> >> Thank you! >> >> Best regards >> -- >> Giulio Benetti >> Benetti Engineering sas > > -- > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > From giulio.benetti at benettiengineering.com Thu Feb 3 14:25:17 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 3 Feb 2022 15:25:17 +0100 Subject: [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2 In-Reply-To: References: Message-ID: <1422bf74-c342-fe70-5c2b-43d526118590@benettiengineering.com> On 03/02/22 15:09, Neal Frager wrote: [ SNIP ] >> Yes it does work. Only remember to set your client using plain-text only. I?m on mobile now so probably my answer and yours will be in html. >> But we need plain-text, please check your email client and set plain-text by default. > > As far as I can tell, my replies are already in plain-text by default. Let me know if you catch a message where that is not the case. > Ah sorry, I was on mobile, I've checked on PC now and you're sending in plain-text mode. Best regards -- Giulio Benetti Benetti Engineering sas From Alexey.Brodkin at synopsys.com Thu Feb 3 15:45:41 2022 From: Alexey.Brodkin at synopsys.com (Alexey Brodkin) Date: Thu, 3 Feb 2022 15:45:41 +0000 Subject: [Buildroot] [PATCHv2] package/glibc: allow runing on kernels older than used for the headers In-Reply-To: <2371_1643875895_61FB8E37_2371_137_1_20220203081133.GA3479@tl-lnx-nyma7486> References: <19291_1643809720_61FA8BB8_19291_487_24_41ca9ce22939ce2ed0c41973db7d612542850824.1643809712.git.yann.morin@orange.com> <2371_1643875895_61FB8E37_2371_137_1_20220203081133.GA3479@tl-lnx-nyma7486> Message-ID: Hi Yann, > On 2022-02-02 17:00 +0000, Alexey Brodkin spake thusly: > > > We add an option to glibc to allow the user to enable compatibility > > > shims. To simplify the case, when that option is enabled, we just let > > > glibc enable as old compatibility shims as supported by the current > > > architecture. > > Looks reasonable to me. I mean to not have all the flexibility proposed > > initially, instead adding an option to fall back to something much > > older compared to used headers. > > > > If more options are needed later, we'll get to know it at some point ;) > > > > And thanks for doing that, as I meant to do something similar a while ago, > > but never posted my local changes. > > Will that be followed up by a reviewed-by or maybe a tested-by tag? ;-) Indeed the following config ----------------------->8--------------------- BR2_arcle=y BR2_archs38=y BR2_TOOLCHAIN_BUILDROOT_GLIBC=y BR2_KERNEL_HEADERS_5_15=y BR2_BINUTILS_VERSION_2_37_X=y BR2_GCC_VERSION_11_X=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.176" BR2_LINUX_KERNEL_DEFCONFIG="haps_hs" BR2_LINUX_KERNEL_VMLINUX=y BR2_TARGET_ROOTFS_INITRAMFS=y ----------------------->8--------------------- fails to boot with: ----------------------->8--------------------- Run /init as init process FATAL: kernel too old Kernel panic - not syncing: Attempted to kill init! exitcode=0x00007f00 ---[ end Kernel panic - not syncing: Attempted to kill init! exitcode=0x00007f00 ]--- ----------------------->8--------------------- But if we add newly introduced "BR2_PACKAGE_GLIBC_KERNEL_COMPAT=y" all boots well. With that... Tested-by: Alexey Brodkin > Thanks for the feedback, by the way. That's my pleasure! -Alexey From david.heng at smile.fr Thu Feb 3 15:59:51 2022 From: david.heng at smile.fr (David HENG) Date: Thu, 3 Feb 2022 16:59:51 +0100 Subject: [Buildroot] [PATCH 1/1] configs/qemu_*: bump kernel version to 5.15.18 Message-ID: <20220203155951.1277343-1-david.heng@smile.fr> See runtimes test here : https://gitlab.com/davidheng.pw/buildroot/-/pipelines/460019580 Signed-off-by: David HENG --- It seems that qemu_s390x_defconfig made a timeout on Gitlab shared-runner at the end but work after a restarting. https://gitlab.com/davidheng.pw/buildroot/-/jobs/2044971657 --- configs/qemu_aarch64_sbsa_defconfig | 2 +- configs/qemu_aarch64_virt_defconfig | 2 +- configs/qemu_arm_versatile_defconfig | 2 +- configs/qemu_arm_versatile_nommu_defconfig | 2 +- configs/qemu_arm_vexpress_defconfig | 2 +- configs/qemu_arm_vexpress_tz_defconfig | 2 +- configs/qemu_m68k_mcf5208_defconfig | 2 +- configs/qemu_m68k_q800_defconfig | 2 +- configs/qemu_microblazebe_mmu_defconfig | 2 +- configs/qemu_microblazeel_mmu_defconfig | 2 +- configs/qemu_mips32r2_malta_defconfig | 2 +- configs/qemu_mips32r2el_malta_defconfig | 2 +- configs/qemu_mips32r6_malta_defconfig | 2 +- configs/qemu_mips32r6el_malta_defconfig | 2 +- configs/qemu_mips64_malta_defconfig | 2 +- configs/qemu_mips64el_malta_defconfig | 2 +- configs/qemu_mips64r6_malta_defconfig | 2 +- configs/qemu_mips64r6el_malta_defconfig | 2 +- configs/qemu_nios2_10m50_defconfig | 2 +- configs/qemu_or1k_defconfig | 2 +- configs/qemu_ppc64_e5500_defconfig | 2 +- configs/qemu_ppc64_pseries_defconfig | 2 +- configs/qemu_ppc64le_powernv8_defconfig | 2 +- configs/qemu_ppc64le_pseries_defconfig | 2 +- configs/qemu_ppc_bamboo_defconfig | 2 +- configs/qemu_ppc_e500mc_defconfig | 2 +- configs/qemu_ppc_g3beige_defconfig | 2 +- configs/qemu_ppc_mac99_defconfig | 2 +- configs/qemu_ppc_mpc8544ds_defconfig | 2 +- configs/qemu_riscv32_virt_defconfig | 2 +- configs/qemu_riscv64_virt_defconfig | 2 +- configs/qemu_s390x_defconfig | 2 +- configs/qemu_sh4_r2d_defconfig | 2 +- configs/qemu_sh4eb_r2d_defconfig | 2 +- configs/qemu_sparc64_sun4u_defconfig | 2 +- configs/qemu_sparc_ss10_defconfig | 2 +- configs/qemu_x86_64_defconfig | 2 +- configs/qemu_x86_defconfig | 2 +- configs/qemu_xtensa_lx60_defconfig | 2 +- configs/qemu_xtensa_lx60_nommu_defconfig | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) diff --git a/configs/qemu_aarch64_sbsa_defconfig b/configs/qemu_aarch64_sbsa_defconfig index e7d3bd03ca..2d6134e78c 100644 --- a/configs/qemu_aarch64_sbsa_defconfig +++ b/configs/qemu_aarch64_sbsa_defconfig @@ -25,7 +25,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.18" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_aarch64_virt_defconfig b/configs/qemu_aarch64_virt_defconfig index 9fbf293311..03df0ad9e2 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.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig index 5e399d17de..4f43273a82 100644 --- a/configs/qemu_arm_versatile_defconfig +++ b/configs/qemu_arm_versatile_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.18" BR2_LINUX_KERNEL_DEFCONFIG="versatile" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-versatile/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/configs/qemu_arm_versatile_nommu_defconfig b/configs/qemu_arm_versatile_nommu_defconfig index 1357742703..0c49d1b67d 100644 --- a/configs/qemu_arm_versatile_nommu_defconfig +++ b/configs/qemu_arm_versatile_nommu_defconfig @@ -31,7 +31,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.18" BR2_LINUX_KERNEL_DEFCONFIG="versatile" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-versatile/linux-nommu.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/configs/qemu_arm_vexpress_defconfig b/configs/qemu_arm_vexpress_defconfig index dafcc37bc0..2c813456f4 100644 --- a/configs/qemu_arm_vexpress_defconfig +++ b/configs/qemu_arm_vexpress_defconfig @@ -25,7 +25,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.18" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" diff --git a/configs/qemu_arm_vexpress_tz_defconfig b/configs/qemu_arm_vexpress_tz_defconfig index 327762277b..def11721ae 100644 --- a/configs/qemu_arm_vexpress_tz_defconfig +++ b/configs/qemu_arm_vexpress_tz_defconfig @@ -22,7 +22,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.18" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-vexpress-tz/linux.fragment" diff --git a/configs/qemu_m68k_mcf5208_defconfig b/configs/qemu_m68k_mcf5208_defconfig index 1dcd8272c3..0490b9e29e 100644 --- a/configs/qemu_m68k_mcf5208_defconfig +++ b/configs/qemu_m68k_mcf5208_defconfig @@ -19,7 +19,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-mcf5208/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_m68k_q800_defconfig b/configs/qemu_m68k_q800_defconfig index 7bf8b4061f..30d8982db3 100644 --- a/configs/qemu_m68k_q800_defconfig +++ b/configs/qemu_m68k_q800_defconfig @@ -19,7 +19,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-q800/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_microblazebe_mmu_defconfig b/configs/qemu_microblazebe_mmu_defconfig index 0508f92c36..7bd2ae53b8 100644 --- a/configs/qemu_microblazebe_mmu_defconfig +++ b/configs/qemu_microblazebe_mmu_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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux.config" BR2_LINUX_KERNEL_LINUX_BIN=y diff --git a/configs/qemu_microblazeel_mmu_defconfig b/configs/qemu_microblazeel_mmu_defconfig index 10811e284e..cd8c5a3cb2 100644 --- a/configs/qemu_microblazeel_mmu_defconfig +++ b/configs/qemu_microblazeel_mmu_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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux.config" BR2_LINUX_KERNEL_LINUX_BIN=y diff --git a/configs/qemu_mips32r2_malta_defconfig b/configs/qemu_mips32r2_malta_defconfig index c08ca862c5..49d84c308b 100644 --- a/configs/qemu_mips32r2_malta_defconfig +++ b/configs/qemu_mips32r2_malta_defconfig @@ -19,7 +19,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips32r2el_malta_defconfig b/configs/qemu_mips32r2el_malta_defconfig index 0bb16b9320..5363018c47 100644 --- a/configs/qemu_mips32r2el_malta_defconfig +++ b/configs/qemu_mips32r2el_malta_defconfig @@ -19,7 +19,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips32r6_malta_defconfig b/configs/qemu_mips32r6_malta_defconfig index f7b218c62a..f77feb9b6d 100644 --- a/configs/qemu_mips32r6_malta_defconfig +++ b/configs/qemu_mips32r6_malta_defconfig @@ -19,7 +19,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips32r6el_malta_defconfig b/configs/qemu_mips32r6el_malta_defconfig index d0f118ff90..575034441a 100644 --- a/configs/qemu_mips32r6el_malta_defconfig +++ b/configs/qemu_mips32r6el_malta_defconfig @@ -19,7 +19,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips64_malta_defconfig b/configs/qemu_mips64_malta_defconfig index fe03b911c5..e9438fda1e 100644 --- a/configs/qemu_mips64_malta_defconfig +++ b/configs/qemu_mips64_malta_defconfig @@ -19,7 +19,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips64el_malta_defconfig b/configs/qemu_mips64el_malta_defconfig index c6d428226c..4b1c8e22af 100644 --- a/configs/qemu_mips64el_malta_defconfig +++ b/configs/qemu_mips64el_malta_defconfig @@ -19,7 +19,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips64r6_malta_defconfig b/configs/qemu_mips64r6_malta_defconfig index 9cf651a4ba..87ef7902af 100644 --- a/configs/qemu_mips64r6_malta_defconfig +++ b/configs/qemu_mips64r6_malta_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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips64r6el_malta_defconfig b/configs/qemu_mips64r6el_malta_defconfig index 0d02a5b4df..5774207f65 100644 --- a/configs/qemu_mips64r6el_malta_defconfig +++ b/configs/qemu_mips64r6el_malta_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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_nios2_10m50_defconfig b/configs/qemu_nios2_10m50_defconfig index 44afb928e3..4b9c53e8de 100644 --- a/configs/qemu_nios2_10m50_defconfig +++ b/configs/qemu_nios2_10m50_defconfig @@ -1,7 +1,7 @@ BR2_nios2=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" BR2_LINUX_KERNEL_DEFCONFIG="10m50" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/nios2-10m50/linux.fragment" BR2_TARGET_ROOTFS_INITRAMFS=y diff --git a/configs/qemu_or1k_defconfig b/configs/qemu_or1k_defconfig index 9d55cb3420..b3d9d79156 100644 --- a/configs/qemu_or1k_defconfig +++ b/configs/qemu_or1k_defconfig @@ -15,7 +15,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/or1k/linux.config" diff --git a/configs/qemu_ppc64_e5500_defconfig b/configs/qemu_ppc64_e5500_defconfig index 09aac50252..072240c99c 100644 --- a/configs/qemu_ppc64_e5500_defconfig +++ b/configs/qemu_ppc64_e5500_defconfig @@ -16,7 +16,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.18" BR2_LINUX_KERNEL_DEFCONFIG="corenet64_smp" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc64-e5500/linux.fragment" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_ppc64_pseries_defconfig b/configs/qemu_ppc64_pseries_defconfig index 1a20e2ee0e..ad523ec2ef 100644 --- a/configs/qemu_ppc64_pseries_defconfig +++ b/configs/qemu_ppc64_pseries_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.18" BR2_LINUX_KERNEL_DEFCONFIG="pseries" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc64le_powernv8_defconfig b/configs/qemu_ppc64le_powernv8_defconfig index d8ea6655fc..a784695ddf 100644 --- a/configs/qemu_ppc64le_powernv8_defconfig +++ b/configs/qemu_ppc64le_powernv8_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.18" BR2_LINUX_KERNEL_DEFCONFIG="powernv" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc64le_pseries_defconfig b/configs/qemu_ppc64le_pseries_defconfig index 46f62b8313..f10b0fdf40 100644 --- a/configs/qemu_ppc64le_pseries_defconfig +++ b/configs/qemu_ppc64le_pseries_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.18" BR2_LINUX_KERNEL_DEFCONFIG="pseries_le" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_bamboo_defconfig b/configs/qemu_ppc_bamboo_defconfig index d6abbeb452..6129c4a663 100644 --- a/configs/qemu_ppc_bamboo_defconfig +++ b/configs/qemu_ppc_bamboo_defconfig @@ -19,7 +19,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.18" BR2_LINUX_KERNEL_DEFCONFIG="44x/bamboo" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-bamboo/linux.fragment" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_e500mc_defconfig b/configs/qemu_ppc_e500mc_defconfig index 232bc1f70c..1853e538bb 100644 --- a/configs/qemu_ppc_e500mc_defconfig +++ b/configs/qemu_ppc_e500mc_defconfig @@ -16,7 +16,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.18" BR2_LINUX_KERNEL_DEFCONFIG="corenet32_smp" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-e500mc/linux.fragment" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_ppc_g3beige_defconfig b/configs/qemu_ppc_g3beige_defconfig index 824fe648ab..9bbebede1b 100644 --- a/configs/qemu_ppc_g3beige_defconfig +++ b/configs/qemu_ppc_g3beige_defconfig @@ -19,7 +19,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-g3beige/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_mac99_defconfig b/configs/qemu_ppc_mac99_defconfig index ddeb99465a..e9629ff233 100644 --- a/configs/qemu_ppc_mac99_defconfig +++ b/configs/qemu_ppc_mac99_defconfig @@ -11,7 +11,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.18" BR2_LINUX_KERNEL_DEFCONFIG="pmac32" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-mac99/linux.fragment" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_mpc8544ds_defconfig b/configs/qemu_ppc_mpc8544ds_defconfig index 1a72d81ed5..2b51573da9 100644 --- a/configs/qemu_ppc_mpc8544ds_defconfig +++ b/configs/qemu_ppc_mpc8544ds_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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-mpc8544ds/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_riscv32_virt_defconfig b/configs/qemu_riscv32_virt_defconfig index e2753cfcfd..dff87ef342 100644 --- a/configs/qemu_riscv32_virt_defconfig +++ b/configs/qemu_riscv32_virt_defconfig @@ -19,7 +19,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.18" BR2_LINUX_KERNEL_DEFCONFIG="rv32" BR2_LINUX_KERNEL_IMAGE=y diff --git a/configs/qemu_riscv64_virt_defconfig b/configs/qemu_riscv64_virt_defconfig index 07f20776f0..d67d070185 100644 --- a/configs/qemu_riscv64_virt_defconfig +++ b/configs/qemu_riscv64_virt_defconfig @@ -19,7 +19,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.18" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_IMAGE=y diff --git a/configs/qemu_s390x_defconfig b/configs/qemu_s390x_defconfig index 86ac1fd024..346df04ada 100644 --- a/configs/qemu_s390x_defconfig +++ b/configs/qemu_s390x_defconfig @@ -17,7 +17,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.18" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_sh4_r2d_defconfig b/configs/qemu_sh4_r2d_defconfig index c8177e6096..0f12b7dfe9 100644 --- a/configs/qemu_sh4_r2d_defconfig +++ b/configs/qemu_sh4_r2d_defconfig @@ -20,7 +20,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Linux 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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux.config" BR2_LINUX_KERNEL_ZIMAGE=y diff --git a/configs/qemu_sh4eb_r2d_defconfig b/configs/qemu_sh4eb_r2d_defconfig index f334569779..d5ee371e79 100644 --- a/configs/qemu_sh4eb_r2d_defconfig +++ b/configs/qemu_sh4eb_r2d_defconfig @@ -19,7 +19,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Linux 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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4eb-r2d/linux.config" BR2_LINUX_KERNEL_ZIMAGE=y diff --git a/configs/qemu_sparc64_sun4u_defconfig b/configs/qemu_sparc64_sun4u_defconfig index 941439d338..485b497e71 100644 --- a/configs/qemu_sparc64_sun4u_defconfig +++ b/configs/qemu_sparc64_sun4u_defconfig @@ -19,7 +19,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Linux 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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc64-sun4u/linux.config" diff --git a/configs/qemu_sparc_ss10_defconfig b/configs/qemu_sparc_ss10_defconfig index 62d3acb16b..2ba04c0864 100644 --- a/configs/qemu_sparc_ss10_defconfig +++ b/configs/qemu_sparc_ss10_defconfig @@ -19,7 +19,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Linux 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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc-ss10/linux.config" diff --git a/configs/qemu_x86_64_defconfig b/configs/qemu_x86_64_defconfig index 1bca76df44..cc505a8540 100644 --- a/configs/qemu_x86_64_defconfig +++ b/configs/qemu_x86_64_defconfig @@ -21,7 +21,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux.config" BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig index 54cf8e9794..34b7e2d292 100644 --- a/configs/qemu_x86_defconfig +++ b/configs/qemu_x86_defconfig @@ -22,7 +22,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux.config" diff --git a/configs/qemu_xtensa_lx60_defconfig b/configs/qemu_xtensa_lx60_defconfig index 1db3fd3ce4..cb78106091 100644 --- a/configs/qemu_xtensa_lx60_defconfig +++ b/configs/qemu_xtensa_lx60_defconfig @@ -21,7 +21,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y diff --git a/configs/qemu_xtensa_lx60_nommu_defconfig b/configs/qemu_xtensa_lx60_nommu_defconfig index d4c07b574c..c4473fb32a 100644 --- a/configs/qemu_xtensa_lx60_nommu_defconfig +++ b/configs/qemu_xtensa_lx60_nommu_defconfig @@ -25,7 +25,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux-nommu.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y -- 2.25.1 From fontaine.fabrice at gmail.com Thu Feb 3 17:17:15 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 3 Feb 2022 18:17:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/libblockdev: bump to version 2.26 Message-ID: <20220203171715.658568-1-fontaine.fabrice@gmail.com> - Add upstream link to first patch - Drop second patch (already in version) https://github.com/storaged-project/libblockdev/blob/2.26-1/NEWS.rst Signed-off-by: Fabrice Fontaine --- ...-replacement-function-for-strerror_l.patch | 2 ++ ...ec-Fix-deprecated-glib-function-call.patch | 32 ------------------- package/libblockdev/libblockdev.hash | 2 +- package/libblockdev/libblockdev.mk | 2 +- 4 files changed, 4 insertions(+), 34 deletions(-) delete mode 100644 package/libblockdev/0002-exec-Fix-deprecated-glib-function-call.patch diff --git a/package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch b/package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch index 018e4c4489..d5c9b2dfdb 100644 --- a/package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch +++ b/package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch @@ -8,6 +8,8 @@ so let's provide a simple replacement function that falls back on strerror(). Signed-off-by: Thomas Petazzoni +[Upstream status: +https://github.com/storaged-project/libblockdev/pull/701] --- configure.ac | 2 ++ src/plugins/crypto.c | 7 +++++++ diff --git a/package/libblockdev/0002-exec-Fix-deprecated-glib-function-call.patch b/package/libblockdev/0002-exec-Fix-deprecated-glib-function-call.patch deleted file mode 100644 index 2c370a133f..0000000000 --- a/package/libblockdev/0002-exec-Fix-deprecated-glib-function-call.patch +++ /dev/null @@ -1,32 +0,0 @@ -From aad927a81fd9067865dc391c5bbff12ac51a0002 Mon Sep 17 00:00:00 2001 -From: Manuel Wassermann -Date: Thu, 1 Jul 2021 04:45:49 +0200 -Subject: [PATCH] exec: Fix deprecated glib function call Glib will rename - "g_spawn_check_exit_status()" to "g_spawn_check_wait_status()" in version - 2.69. - -[Retrieved from: -https://github.com/storaged-project/libblockdev/commit/aad927a81fd9067865dc391c5bbff12ac51a0002] -Signed-off-by: Fabrice Fontaine ---- - src/utils/exec.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/src/utils/exec.c b/src/utils/exec.c -index 317fb5525..8faeb289c 100644 ---- a/src/utils/exec.c -+++ b/src/utils/exec.c -@@ -236,7 +236,12 @@ gboolean bd_utils_exec_and_report_status_error (const gchar **argv, const BDExtr - /* g_spawn_sync set the status in the same way waitpid() does, we need - to get the process exit code manually (this is similar to calling - WEXITSTATUS but also sets the error for terminated processes */ -- if (!g_spawn_check_exit_status (exit_status, error)) { -+ -+ #if !GLIB_CHECK_VERSION(2, 69, 0) -+ #define g_spawn_check_wait_status(x,y) (g_spawn_check_exit_status (x,y)) -+ #endif -+ -+ if (!g_spawn_check_wait_status (exit_status, error)) { - if (g_error_matches (*error, G_SPAWN_ERROR, G_SPAWN_ERROR_FAILED)) { - /* process was terminated abnormally (e.g. using a signal) */ - g_free (stdout_data); diff --git a/package/libblockdev/libblockdev.hash b/package/libblockdev/libblockdev.hash index 101b99f1a8..53a3b0737f 100644 --- a/package/libblockdev/libblockdev.hash +++ b/package/libblockdev/libblockdev.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 555aa42a2db39649ad83253bdc902ab5bd63d39c123e0c8055c4de7fe7571668 libblockdev-2.25.tar.gz +sha256 c4c0e10b35ac632bda8ce6d200b5601184984dec387fe59185921eb42432e069 libblockdev-2.26.tar.gz sha256 97bdc721d875501b6243a456333fdfdb1ab64d31c4da2554de845caf4674b946 LICENSE diff --git a/package/libblockdev/libblockdev.mk b/package/libblockdev/libblockdev.mk index 39ae9230d9..36b74966fb 100644 --- a/package/libblockdev/libblockdev.mk +++ b/package/libblockdev/libblockdev.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBBLOCKDEV_VERSION = 2.25 +LIBBLOCKDEV_VERSION = 2.26 LIBBLOCKDEV_SITE = https://github.com/storaged-project/libblockdev/releases/download/$(LIBBLOCKDEV_VERSION)-1 LIBBLOCKDEV_LICENSE = LGPL-2.1 LIBBLOCKDEV_LICENSE_FILES = LICENSE -- 2.34.1 From james.hilliard1 at gmail.com Thu Feb 3 18:25:08 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 3 Feb 2022 11:25:08 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-docutils: bump to version 0.18.1 Message-ID: <20220203182508.3046615-1-james.hilliard1@gmail.com> License hash changed due to Python-2.0 license addition. Change GPL-3.0 license to correct GPL-3.0+ variant. Switch from distutils to setuptools. Fixes: http://autobuild.buildroot.net/results/f24/f24e332688cb1118c8d28343f424d0ce1c78f7a8 Signed-off-by: James Hilliard --- .../0001-Update-setup.py.patch | 64 ------------------- package/python-docutils/python-docutils.hash | 9 +-- package/python-docutils/python-docutils.mk | 8 +-- 3 files changed, 9 insertions(+), 72 deletions(-) delete mode 100644 package/python-docutils/0001-Update-setup.py.patch diff --git a/package/python-docutils/0001-Update-setup.py.patch b/package/python-docutils/0001-Update-setup.py.patch deleted file mode 100644 index 3fb34a9763..0000000000 --- a/package/python-docutils/0001-Update-setup.py.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 583e59ccf72a02c2a6f0399f29f622c7f2f4a932 Mon Sep 17 00:00:00 2001 -From: milde -Date: Sun, 1 Sep 2019 19:39:36 +0000 -Subject: [PATCH] Update setup.py - -Python 3.4 no longer supported, -more languages supported (and Lithuanian accepted by PyPi). - -git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk at 8383 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 - -[Asaf: adjust upstream patch to 0.15.2] -Signed-off-by: Asaf Kahlon ---- - setup.py | 14 +++++++++++++- - 1 file changed, 13 insertions(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index f801ea2..5c1ebfd 100755 ---- a/setup.py -+++ b/setup.py -@@ -7,6 +7,10 @@ import os - import glob - try: - import setuptools -+except ImportError: -+ print('Warning: Could not load package `setuptools`.') -+ print('Actions requiring `setuptools` instead of `distutils` will fail') -+try: - from distutils.core import setup, Command - from distutils.command.build import build - from distutils.command.build_py import build_py -@@ -123,7 +127,7 @@ what-you-see-is-what-you-get plaintext markup syntax.""", # wrap at col 60 - 'maintainer_email': 'docutils-develop at lists.sourceforge.net', - 'license': 'public domain, Python, 2-Clause BSD, GPL 3 (see COPYING.txt)', - 'platforms': 'OS-independent', -- 'python_requires': '>=2.6, !=3.0.*, !=3.1.*, !=3.2.*', -+ 'python_requires': '>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*', - 'package_dir': {'docutils': 'docutils', - 'docutils.tools': 'tools'}, - 'packages': ['docutils', -@@ -213,14 +219,20 @@ classifiers = [ - 'Natural Language :: Chinese (Simplified)', - 'Natural Language :: Chinese (Traditional)', - 'Natural Language :: Czech', -+ 'Natural Language :: Danish', - 'Natural Language :: Dutch', - 'Natural Language :: Esperanto', - 'Natural Language :: Finnish', - 'Natural Language :: French', - 'Natural Language :: Galician', - 'Natural Language :: German', -+ 'Natural Language :: Hebrew', - 'Natural Language :: Italian', - 'Natural Language :: Japanese', -+ 'Natural Language :: Korean', -+ 'Natural Language :: Latvian', -+ 'Natural Language :: Lithuanian', -+ 'Natural Language :: Persian', - 'Natural Language :: Polish', - 'Natural Language :: Portuguese (Brazilian)', - 'Natural Language :: Russian', --- -2.20.1 -k diff --git a/package/python-docutils/python-docutils.hash b/package/python-docutils/python-docutils.hash index ccccca1064..05984b77a3 100644 --- a/package/python-docutils/python-docutils.hash +++ b/package/python-docutils/python-docutils.hash @@ -1,4 +1,5 @@ -# md5 from https://pypi.python.org/pypi/docutils/json, sha256 locally computed -md5 e26a308d8000b0bed7416a633217c676 docutils-0.15.2.tar.gz -sha256 a2aeea129088da402665e92e0b25b04b073c04b2dce4ab65caaa38b7ce2e1a99 docutils-0.15.2.tar.gz -sha256 efa0c85aa99ea5b4781240031b0d02af54d7b5554c87ad2b2bea9ba490f6663f COPYING.txt +# md5, sha256 from https://pypi.org/pypi/docutils/json +md5 ca5827e2432fd58f4c8d74a6591135de docutils-0.18.1.tar.gz +sha256 679987caf361a7539d76e584cbeddc311e3aee937877c87346f31debc63e9d06 docutils-0.18.1.tar.gz +# Locally computed sha256 checksums +sha256 f20172170ef9aeebbf53adf5d8f7d309f7dc6068e9a3a1b52ea772305686739d COPYING.txt diff --git a/package/python-docutils/python-docutils.mk b/package/python-docutils/python-docutils.mk index 9a42d3e5dc..52c4613996 100644 --- a/package/python-docutils/python-docutils.mk +++ b/package/python-docutils/python-docutils.mk @@ -4,12 +4,12 @@ # ################################################################################ -PYTHON_DOCUTILS_VERSION = 0.15.2 +PYTHON_DOCUTILS_VERSION = 0.18.1 PYTHON_DOCUTILS_SOURCE = docutils-$(PYTHON_DOCUTILS_VERSION).tar.gz -PYTHON_DOCUTILS_SITE = https://files.pythonhosted.org/packages/93/22/953e071b589b0b1fee420ab06a0d15e5aa0c7470eb9966d60393ce58ad61 -PYTHON_DOCUTILS_LICENSE = Public Domain, BSD-2-Clause, GPL-3.0 (emacs mode), other +PYTHON_DOCUTILS_SITE = https://files.pythonhosted.org/packages/57/b1/b880503681ea1b64df05106fc7e3c4e3801736cf63deffc6fa7fc5404cf5 +PYTHON_DOCUTILS_LICENSE = Public Domain, Python-2.0, BSD-2-Clause, GPL-3.0+ (emacs mode) PYTHON_DOCUTILS_LICENSE_FILES = COPYING.txt -PYTHON_DOCUTILS_SETUP_TYPE = distutils +PYTHON_DOCUTILS_SETUP_TYPE = setuptools $(eval $(python-package)) $(eval $(host-python-package)) -- 2.25.1 From arnout at mind.be Thu Feb 3 18:45:08 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 3 Feb 2022 19:45:08 +0100 Subject: [Buildroot] package libldns In-Reply-To: <5_xofMlQqIrdAjpopLNCIYCGiqsc2UoXvUQG4GIV5Bd0dY31bw-gZ_0eoD0ix_iW-BI3-5O_RbQESkV3ybUN1zFSLY2r3PAr3ZOfxYOFmrU=@protonmail.ch> References: <5_xofMlQqIrdAjpopLNCIYCGiqsc2UoXvUQG4GIV5Bd0dY31bw-gZ_0eoD0ix_iW-BI3-5O_RbQESkV3ybUN1zFSLY2r3PAr3ZOfxYOFmrU=@protonmail.ch> Message-ID: Hi ca0, On 03/02/2022 03:01, ca0 via buildroot wrote: > Building this package with orangepi_zero_defconfig results in an useless user system because both thee files are blown away What is "this package"? The subject mentions libidns, but there's no libidns package in buildroot. What do you mean with "blown away"? > ./output/target/usr/lib/ld-musl-armhf.so.1 This file belongs to the musl standard C library, but orangepi_zero_defconfig builds a uClibc standard C library, so it shouldn't even be there. You can check which libraries are needed for an executable or shared library with "readelf -d output/target/...". All the libraries mentioned there should exist in output/target/lib or output/target/usr/lib. If not, it is indeed broken. If you want more help, you will need to provide a whole lot more details. Regards, Arnout > ./output/host/arm-buildroot-linux-musleabihf/sysroot/usr/lib/ld-musl-armhf.so.1 > > Is the ldconfig hackery needed for embedded systems and is it supported when cross compiling? > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From james.hilliard1 at gmail.com Thu Feb 3 18:47:18 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 3 Feb 2022 11:47:18 -0700 Subject: [Buildroot] [PATCH 1/1] package/bat: bump to version 0.19.0 Message-ID: <20220203184718.3173767-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/bat/bat.hash | 2 +- package/bat/bat.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/bat/bat.hash b/package/bat/bat.hash index aa6c8d743d..f4d3e32c34 100644 --- a/package/bat/bat.hash +++ b/package/bat/bat.hash @@ -1,4 +1,4 @@ # Locally generated -sha256 9c345788eb916777a60e7ff32031f1c92edc5565031e0c057bce860982768744 bat-0.18.3.tar.gz +sha256 7940641baaa61cd3bcd1c3db4804d179609d6ccd955868928a129bf3f853e0b2 bat-0.19.0.tar.gz sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE-APACHE sha256 64de710b6309a7db5e44ad0af382300c7fb6f6d116d8ae32f0164e05db033068 LICENSE-MIT diff --git a/package/bat/bat.mk b/package/bat/bat.mk index 9b619af172..dc29a85429 100644 --- a/package/bat/bat.mk +++ b/package/bat/bat.mk @@ -4,7 +4,7 @@ # ################################################################################ -BAT_VERSION = 0.18.3 +BAT_VERSION = 0.19.0 BAT_SITE = $(call github,sharkdp,bat,v$(BAT_VERSION)) BAT_LICENSE = Apache-2.0 or MIT BAT_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT -- 2.25.1 From arnout at mind.be Thu Feb 3 18:49:18 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 3 Feb 2022 19:49:18 +0100 Subject: [Buildroot] package libldns In-Reply-To: References: <5_xofMlQqIrdAjpopLNCIYCGiqsc2UoXvUQG4GIV5Bd0dY31bw-gZ_0eoD0ix_iW-BI3-5O_RbQESkV3ybUN1zFSLY2r3PAr3ZOfxYOFmrU=@protonmail.ch> Message-ID: <6c85206c-139f-474d-7ca5-5f21fd606d96@mind.be> On 03/02/2022 19:45, Arnout Vandecappelle wrote: > ?Hi ca0, > > On 03/02/2022 03:01, ca0 via buildroot wrote: >> Building this package with orangepi_zero_defconfig results in an useless user >> system because both thee files are blown away > > ?What is "this package"? The subject mentions libidns, but there's no libidns > package in buildroot. ?Apparently I misread, it's libldns which does indeed exist. ?I did a build of it and it looks OK... ?Regards, ?Arnout > > ?What do you mean with "blown away"? > >> ./output/target/usr/lib/ld-musl-armhf.so.1 > > ?This file belongs to the musl standard C library, but orangepi_zero_defconfig > builds a uClibc standard C library, so it shouldn't even be there. > > ?You can check which libraries are needed for an executable or shared library > with "readelf -d output/target/...". All the libraries mentioned there should > exist in output/target/lib or output/target/usr/lib. If not, it is indeed broken. > > > ?If you want more help, you will need to provide a whole lot more details. > > ?Regards, > ?Arnout > > >> ./output/host/arm-buildroot-linux-musleabihf/sysroot/usr/lib/ld-musl-armhf.so.1 >> > >> Is the ldconfig hackery needed for embedded systems and is it supported when >> cross compiling? >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot From bernd.kuhls at t-online.de Thu Feb 3 19:04:31 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Thu, 3 Feb 2022 20:04:31 +0100 Subject: [Buildroot] [PATCH 1/2] package/kodi-pvr-hts: bump version to 19.0.6-Matrix Message-ID: <20220203190432.1637478-1-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/kodi-pvr-hts/kodi-pvr-hts.hash | 2 +- package/kodi-pvr-hts/kodi-pvr-hts.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-hts/kodi-pvr-hts.hash b/package/kodi-pvr-hts/kodi-pvr-hts.hash index 135b0088c4..40cd8fd62f 100644 --- a/package/kodi-pvr-hts/kodi-pvr-hts.hash +++ b/package/kodi-pvr-hts/kodi-pvr-hts.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 25799d0d043df7819c767adc89d081cbd6eb61d29135befbc621719274a1c074 kodi-pvr-hts-19.0.4-Matrix.tar.gz +sha256 990e5fd0757d48b86675aa124b77629e7fb2de6b27dcfd6f6ccc7ce181d04aeb kodi-pvr-hts-19.0.6-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-hts/kodi-pvr-hts.mk b/package/kodi-pvr-hts/kodi-pvr-hts.mk index 6c9e5a715f..caa90b7af6 100644 --- a/package/kodi-pvr-hts/kodi-pvr-hts.mk +++ b/package/kodi-pvr-hts/kodi-pvr-hts.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_HTS_VERSION = 19.0.4-Matrix +KODI_PVR_HTS_VERSION = 19.0.6-Matrix KODI_PVR_HTS_SITE = $(call github,kodi-pvr,pvr.hts,$(KODI_PVR_HTS_VERSION)) KODI_PVR_HTS_LICENSE = GPL-2.0+ KODI_PVR_HTS_LICENSE_FILES = LICENSE.md -- 2.30.2 From bernd.kuhls at t-online.de Thu Feb 3 19:04:32 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Thu, 3 Feb 2022 20:04:32 +0100 Subject: [Buildroot] [PATCH 2/2] package/kodi-pvr-iptvsimple: bump version to 19.1.0-Matrix In-Reply-To: <20220203190432.1637478-1-bernd.kuhls@t-online.de> References: <20220203190432.1637478-1-bernd.kuhls@t-online.de> Message-ID: <20220203190432.1637478-2-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash | 2 +- package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash index bd3d44d908..6ace3a5859 100644 --- a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash +++ b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 3df76fb7f03f2fd64c75526d5bf89b0f2300f70bf825794fa27bd6fbdd706fb2 kodi-pvr-iptvsimple-19.0.3-Matrix.tar.gz +sha256 c92736b3f3c96fe36d7b20b329c82b47180260e3ed40fc456ef709572fad5fb0 kodi-pvr-iptvsimple-19.1.0-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk index 5f5025cd80..eedb0fb817 100644 --- a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk +++ b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_IPTVSIMPLE_VERSION = 19.0.3-Matrix +KODI_PVR_IPTVSIMPLE_VERSION = 19.1.0-Matrix KODI_PVR_IPTVSIMPLE_SITE = $(call github,kodi-pvr,pvr.iptvsimple,$(KODI_PVR_IPTVSIMPLE_VERSION)) KODI_PVR_IPTVSIMPLE_LICENSE = GPL-2.0+ KODI_PVR_IPTVSIMPLE_LICENSE_FILES = LICENSE.md -- 2.30.2 From arnout at mind.be Thu Feb 3 19:35:56 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 3 Feb 2022 20:35:56 +0100 Subject: [Buildroot] [PATCH v7 1/1] package/qt5: bump packages to latest kde submodule versions In-Reply-To: <20220131225622.90226-1-james.hilliard1@gmail.com> References: <20220131225622.90226-1-james.hilliard1@gmail.com> Message-ID: On 31/01/2022 23:56, 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 It took me some reading of the patch and of the upstream repositories to understand that there are actually no release tarballs or tags, and the the 5.15.8 is something we just pull out of our hat to be compatible with qt5webengine. So I updated the commit message to (hopefully) better explain that. > > 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. Instead of creating a separate package for it (which BTW you forgot to add to DEVELOPERS), I changed this to use the git download method and _GIT_SUBMODULES = YES. I checked that it extracts to exactly the same thing. > > 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. I don't really understand why this was needed rather than calling syncqt explicitly, but OK. Applied to master, thanks. Regards, Arnout > > 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 [snip] From arnout at mind.be Thu Feb 3 19:27:27 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 3 Feb 2022 20:27:27 +0100 Subject: [Buildroot] [git commit] package/qt5: bump packages to latest kde submodule versions Message-ID: <20220203192858.6E46582628@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5770a645a3a49a3f0f02972131a4ff5283b4c11e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This points all qt5 packages to the latest kde submodule versions available at https://invent.kde.org/qt/qt/qt5/-/tree/kde/5.15 There is no 5.15.8 release of the kde-maintained modules, no release tarballs and no tags. Instead, there's just a rolling maintenance branch. We take a snapshot of that branch and call it 5.15.8, to match the latest qt5webengine release. We need to remove some patches applied upstream already. qt5location has mapboxgl as a submodule, which is not included in the gitlab-generated tarball. Therefore, use the git download method with submodules enabled. 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. Instead of calling syncqt.pl, update the MODULE_VERSION in .qmake.conf to 5.15.8 and 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 Reviewed-by: Adam Duskett Tested-by: Adam Duskett Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/pkg-qmake.mk | 4 +- package/qt5/qt5.mk | 4 +- package/qt5/qt53d/qt53d.hash | 4 +- package/qt5/qt53d/qt53d.mk | 7 +- ...0006-Fix-build-with-GCC-11-include-limits.patch | 53 ------- ...-for-avoiding-huge-number-of-tiny-dashes.patch} | 0 .../qt5/qt5base/0007-Build-fixes-for-GCC-11.patch | 61 -------- .../qt5base/0008-Add-missing-limits-include.patch | 32 ---- .../qt5/qt5base/0009-Fix-build-on-riscv32.patch | 45 ------ ...ssing-intensive-painting-of-high-number-o.patch | 163 --------------------- ...x-for-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 +- package/qt5/qt5connectivity/qt5connectivity.hash | 4 +- package/qt5/qt5connectivity/qt5connectivity.mk | 7 +- ...revent_p-needs-c-limits-inlcude-fixes-gcc.patch | 45 ------ package/qt5/qt5declarative/qt5declarative.hash | 4 +- package/qt5/qt5declarative/qt5declarative.mk | 7 +- .../qt5graphicaleffects/qt5graphicaleffects.hash | 4 +- .../qt5/qt5graphicaleffects/qt5graphicaleffects.mk | 7 +- package/qt5/qt5imageformats/qt5imageformats.hash | 4 +- package/qt5/qt5imageformats/qt5imageformats.mk | 7 +- package/qt5/qt5knx/qt5knx.mk | 2 +- package/qt5/qt5location/Config.in | 1 + package/qt5/qt5location/qt5location.hash | 4 +- package/qt5/qt5location/qt5location.mk | 8 +- 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 +- package/qt5/qt5quickcontrols/qt5quickcontrols.hash | 4 +- package/qt5/qt5quickcontrols/qt5quickcontrols.mk | 7 +- .../qt5/qt5quickcontrols2/qt5quickcontrols2.hash | 4 +- package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk | 7 +- package/qt5/qt5quicktimeline/qt5quicktimeline.hash | 4 +- package/qt5/qt5quicktimeline/qt5quicktimeline.mk | 7 +- package/qt5/qt5remoteobjects/qt5remoteobjects.hash | 4 +- package/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 +- .../qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash | 4 +- .../qt5/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 +- ...romium-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 +- package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 4 +- package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 7 +- 73 files changed, 261 insertions(+), 649 deletions(-) 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/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/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..17da2bb9ad 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 11cf8320598821c97f853635c529451503917895f11e664dfdd0b63bf48c8a46 qt5location-861e372b6ad81570d4f496e42fb25a6699b72f2f-br1.tar.gz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5location/qt5location.mk b/package/qt5/qt5location/qt5location.mk index ea741d0df6..b1d19d7811 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 +QT5LOCATION_SITE_METHOD = git +QT5LOCATION_GIT_SUBMODULES = YES 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 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 From ps.report at gmx.net Thu Feb 3 20:23:27 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 3 Feb 2022 21:23:27 +0100 Subject: [Buildroot] [PATCH] package/util-linux: improve host build failure fix In-Reply-To: <20220202220538.2858380-1-giulio.benetti@benettiengineering.com> References: <412baee3-b818-521a-99bf-ee868d3e1be2@benettiengineering.com> <20220202220538.2858380-1-giulio.benetti@benettiengineering.com> Message-ID: <20220203212328.264bc948@gmx.net> Hello Giulio, On Wed, 2 Feb 2022 23:05:38 +0100, Giulio Benetti wrote: > As suggested by Peter Seiderer package util-linux doesn't need raw support > when built for host, so let's remove: > HOST_UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE > in favor of: > HOST_UTIL_LINUX_CONF_OPTS += --disable-raw > This is a better approach than my commit: > https://git.buildroot.net/buildroot/commit/?id=d895bd973b35fde10d3dd7db530d9e4782926497 > > Suggested-by: Peter Seiderer > Signed-off-by: Giulio Benetti Tested with registry.gitlab.com/buildroot.org/buildroot/base:20220105.2314: - reverted 'package/util-linux: fix host build failure' (d895bd973b35fde10d3dd7db530d9e4782926497) --> build fails with: No rule to make target 'disk-utils/raw.8' - build with 'package/util-linux: fix host build failure' (d895bd973b35fde10d3dd7db530d9e4782926497) --> build o.k. - build with this additional patch --> build o.k. Tested-by: Peter Seiderer > --- > package/util-linux/util-linux.mk | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk > index 5a4ff64d01..f3297257cf 100644 > --- a/package/util-linux/util-linux.mk > +++ b/package/util-linux/util-linux.mk > @@ -41,7 +41,6 @@ define UTIL_LINUX_FIX_DISK_UTILS_COMPILE > touch $(@D)/disk-utils/raw.8 > endef > UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE > -HOST_UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE > > HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf > The line above reads: # We also don't want the host-python dependency > @@ -49,7 +48,8 @@ HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf > HOST_UTIL_LINUX_CONF_OPTS = \ > --without-systemd \ > --with-systemdsystemunitdir=no \ > - --without-python > + --without-python \ > + --disable-raw So I would move the 'disable-raw' down to line 196ff (or below to an extra 'HOST_UTIL_LINUX_CONF_OPTS +=' section with comment why... With this change you can add my: Reviewed-by: Peter Seiderer Regards, Peter > > ifneq ($(BR2_PACKAGE_UTIL_LINUX_BINARIES)$(BR2_PACKAGE_UTIL_LINUX_CRAMFS)$(BR2_PACKAGE_UTIL_LINUX_FSCK)$(BR2_PACKAGE_UTIL_LINUX_LOSETUP),) > UTIL_LINUX_SELINUX_MODULES = fstools From arnout at mind.be Thu Feb 3 20:37:49 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 3 Feb 2022 21:37:49 +0100 Subject: [Buildroot] [PATCH v1] package/mesa3d: fix glvnd option handling In-Reply-To: <20220113212605.13343-1-ps.report@gmx.net> References: <20220113212605.13343-1-ps.report@gmx.net> Message-ID: <14d0cf8a-c3bd-55d8-c18d-6488d266d69e@mind.be> On 13/01/2022 22:26, Peter Seiderer wrote: > - 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),) Hard to read, but I don't know a better way to do it :-( Applied to master, thanks. Regards, Arnout > 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)) From arnout at mind.be Thu Feb 3 20:38:09 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 3 Feb 2022 21:38:09 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/gensio: add avahi optional dependency In-Reply-To: <20220113232903.318853-1-fontaine.fabrice@gmail.com> References: <20220113232903.318853-1-fontaine.fabrice@gmail.com> Message-ID: <2b31f3d9-12bb-dc7a-61ba-9e6981985cc0@mind.be> On 14/01/2022 00:29, 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 Applied to master, thanks. Regards, Arnout > --- > 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 \ From yann.morin.1998 at free.fr Thu Feb 3 20:37:46 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 3 Feb 2022 21:37:46 +0100 Subject: [Buildroot] [git commit] package/pkg-python: set _PYTHON_PROJECT_BASE Message-ID: <20220203203125.2CCB882A25@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7c1bb5c2bfdc9d726c41a66b30b7aa8e759c6596 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This variable is supposed to be set when cross compiling and is now required by setuptools to be set correctly after the latest version bump. Not much reference for that variable, exept for: https://github.com/python/cpython/blob/v3.10.2/Lib/sysconfig.py#L157-L159 Fixes: http://autobuild.buildroot.net/results/2e8/2e8093e68d04e8cbb20b095068b24c8bbe5f69ad http://autobuild.buildroot.net/results/9e3/9e3cfddb651a59d7f2d04bc88e6fff2a06e9b465 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/pkg-python.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 22ea77352c..00bdb9150a 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -33,6 +33,7 @@ PKG_PYTHON_DISTUTILS_ENV = \ LDSHARED="$(TARGET_CROSS)gcc -shared" \ PYTHONPATH="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_PATH),$(PYTHON_PATH))" \ PYTHONNOUSERSITE=1 \ + _PYTHON_PROJECT_BASE="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_DIR),$(PYTHON_DIR))" \ _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ _python_sysroot=$(STAGING_DIR) \ _python_prefix=/usr \ @@ -60,6 +61,7 @@ HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \ # Target setuptools-based packages PKG_PYTHON_SETUPTOOLS_ENV = \ + _PYTHON_PROJECT_BASE="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_DIR),$(PYTHON_DIR))" \ _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ PATH=$(BR_PATH) \ $(TARGET_CONFIGURE_OPTS) \ From yann.morin.1998 at free.fr Thu Feb 3 20:39:14 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 3 Feb 2022 21:39:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/pkg-python: set _PYTHON_PROJECT_BASE In-Reply-To: <20220202235020.782745-1-james.hilliard1@gmail.com> References: <20220202235020.782745-1-james.hilliard1@gmail.com> Message-ID: <20220203203914.GX457876@scaer> James, All, On 2022-02-02 16:50 -0700, James Hilliard spake thusly: > This variable is supposed to be set when cross compiling and is > now required by setuptools to be set correctly after the latest > version bump. > > Fixes: > http://autobuild.buildroot.net/results/2e8/2e8093e68d04e8cbb20b095068b24c8bbe5f69ad > http://autobuild.buildroot.net/results/9e3/9e3cfddb651a59d7f2d04bc88e6fff2a06e9b465 > > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/pkg-python.mk | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/package/pkg-python.mk b/package/pkg-python.mk > index 22ea77352c..00bdb9150a 100644 > --- a/package/pkg-python.mk > +++ b/package/pkg-python.mk > @@ -33,6 +33,7 @@ PKG_PYTHON_DISTUTILS_ENV = \ > LDSHARED="$(TARGET_CROSS)gcc -shared" \ > PYTHONPATH="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_PATH),$(PYTHON_PATH))" \ > PYTHONNOUSERSITE=1 \ > + _PYTHON_PROJECT_BASE="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_DIR),$(PYTHON_DIR))" \ > _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ > _python_sysroot=$(STAGING_DIR) \ > _python_prefix=/usr \ > @@ -60,6 +61,7 @@ HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \ > > # Target setuptools-based packages > PKG_PYTHON_SETUPTOOLS_ENV = \ > + _PYTHON_PROJECT_BASE="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_DIR),$(PYTHON_DIR))" \ > _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ > PATH=$(BR_PATH) \ > $(TARGET_CONFIGURE_OPTS) \ > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From arnout at mind.be Thu Feb 3 20:39:53 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 3 Feb 2022 21:39:53 +0100 Subject: [Buildroot] [PATCH 1/1] package/kf5/kf5-extra-cmake-modules: do not build documentation In-Reply-To: <20220113233758.110264-1-aperez@igalia.com> References: <20220113233758.110264-1-aperez@igalia.com> Message-ID: <56d88177-6e09-dba3-6b27-2119cd55db52@mind.be> On 14/01/2022 00:37, Adrian Perez de Castro wrote: > 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 Applied to master, thanks. (AFAICS the v2 was in fact identical) Regards, Arnout > --- > .../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)) From arnout at mind.be Thu Feb 3 20:41:12 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 3 Feb 2022 21:41:12 +0100 Subject: [Buildroot] [PATCH 2/2] package/rtl8723bu: fix firmware install path In-Reply-To: <20220114050734.497034-2-doug@schmorgal.com> References: <20220114050734.497034-1-doug@schmorgal.com> <20220114050734.497034-2-doug@schmorgal.com> Message-ID: <49ef11ab-7227-6a71-13d2-58da7d05aff2@mind.be> On 14/01/2022 06:07, Doug Brown via buildroot wrote: > 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 Applied to master, thanks. I also double-checked that this was indeed wrong from the very first version that was added to Buildroot. @Peter this is for stable. Regards, Arnout > --- > 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)) From arnout at mind.be Thu Feb 3 20:41:33 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 3 Feb 2022 21:41:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/libglvnd: needs threads In-Reply-To: <20220114074309.356873-1-fontaine.fabrice@gmail.com> References: <20220114074309.356873-1-fontaine.fabrice@gmail.com> Message-ID: On 14/01/2022 08:43, Fabrice Fontaine wrote: > 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 Applied to master, thanks. Regards, Arnout > --- > 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 From arnout at mind.be Thu Feb 3 20:42:02 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 3 Feb 2022 21:42:02 +0100 Subject: [Buildroot] [PATCH] package/poppler: fix build failure due to gcc bug 68485 In-Reply-To: <20220114084506.776644-1-giulio.benetti@benettiengineering.com> References: <20220114084506.776644-1-giulio.benetti@benettiengineering.com> Message-ID: <79c74b43-e0c3-e25e-c64a-3ea36bc7cf85@mind.be> On 14/01/2022 09:45, Giulio Benetti wrote: > 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 Applied to master, thanks. Regards, Arnout > --- > 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)) From arnout at mind.be Thu Feb 3 20:43:13 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 3 Feb 2022 21:43:13 +0100 Subject: [Buildroot] [PATCH] linux: clarify BR2_LINUX_KERNEL_CUSTOM_DTS_PATH description In-Reply-To: <20220114093049.2380117-1-michael.opdenacker@bootlin.com> References: <20220114093049.2380117-1-michael.opdenacker@bootlin.com> Message-ID: On 14/01/2022 10:30, Michael Opdenacker wrote: > 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. I rewrapped this at 72 columns, and added "... and dts files are compiled from here" to clarify that the dtsi are just copied. Applied to master, thanks. Regards, Arnout > > config BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME > bool "Keep the directory name of the Device Tree" From arnout at mind.be Thu Feb 3 20:43:46 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 3 Feb 2022 21:43:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/ghostscript: bump to version 9.55.0 In-Reply-To: <20220115143900.2033727-1-fontaine.fabrice@gmail.com> References: <20220115143900.2033727-1-fontaine.fabrice@gmail.com> Message-ID: On 15/01/2022 15:39, Fabrice Fontaine wrote: > - 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 Applied to master, thanks. Regards, Arnout > --- > ...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 -- make_null(op - i); > -+ 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); > -+ } > -+ else { > -+ check_ostack(O_STACK_PAD - stack_depth_adjust); > -+ push(O_STACK_PAD - stack_depth_adjust); > -+ for (i=0;i -+ make_null(op - i); > -+ } > - } > - } > - > --- > -2.25.1 > - > 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 > deleted file mode 100644 > index 72e07df0ac..0000000000 > --- a/package/ghostscript/0004-Bug-703902-Fix-op-stack-management-in-sampled_data_continue.patch > +++ /dev/null > @@ -1,68 +0,0 @@ > -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 - make_null(op - i); > - } > --- > -2.25.1 > - > diff --git a/package/ghostscript/ghostscript.hash b/package/ghostscript/ghostscript.hash > index f6cedc6198..95305a5e06 100644 > --- a/package/ghostscript/ghostscript.hash > +++ b/package/ghostscript/ghostscript.hash > @@ -1,5 +1,5 @@ > -# From https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9533/SHA512SUMS > -sha512 c142ef9d83896aa8fd18c8e412220fe8f4950614be00d327d27ab051fe85e16524bf2ee00f46c2aca7a352ce47bc3acf2c4de0f7bbea7e4c55474b8af6cdc0a6 ghostscript-9.53.3.tar.gz > +# From https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9550/SHA512SUMS > +sha512 3646b7981dced443559ba97c74c08463139e86a5479661e4dcd217c51e3f8e766da9cf4d7889a98ba3c079a17e9e5b452cc765b633e0720deab2337e77efdd09 ghostscript-9.55.0.tar.gz > > # Hash for license file: > -sha256 6f852249f975287b3efd43a5883875e47fa9f3125e2f1b18b5c09517ac30ecf2 LICENSE > +sha256 8ce064f423b7c24a011b6ebf9431b8bf9861a5255e47c84bfb23fc526d030a8b LICENSE > diff --git a/package/ghostscript/ghostscript.mk b/package/ghostscript/ghostscript.mk > index 9e13f29fe9..24a0c489a8 100644 > --- a/package/ghostscript/ghostscript.mk > +++ b/package/ghostscript/ghostscript.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -GHOSTSCRIPT_VERSION = 9.53.3 > +GHOSTSCRIPT_VERSION = 9.55.0 > GHOSTSCRIPT_SITE = https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs$(subst .,,$(GHOSTSCRIPT_VERSION)) > GHOSTSCRIPT_LICENSE = AGPL-3.0 > GHOSTSCRIPT_LICENSE_FILES = LICENSE > @@ -21,15 +21,6 @@ GHOSTSCRIPT_DEPENDENCIES = \ > libpng \ > tiff > > -# 0002-Bug-704342-Include-device-specifier-strings-in-acces.patch > -GHOSTSCRIPT_IGNORE_CVES += CVE-2021-3781 > - > -# 0003-oss-fuzz-30715-Check-stack-limits-after-function-evaluation.patch > -GHOSTSCRIPT_IGNORE_CVES += CVE-2021-45944 > - > -# 0004-Bug-703902-Fix-op-stack-management-in-sampled_data_continue.patch > -GHOSTSCRIPT_IGNORE_CVES += CVE-2021-45949 > - > # Ghostscript includes (old) copies of several libraries, delete them. > # Inspired by linuxfromscratch: > # http://www.linuxfromscratch.org/blfs/view/svn/pst/gs.html > @@ -52,6 +43,7 @@ GHOSTSCRIPT_CONF_OPTS = \ > --enable-freetype \ > --disable-gtk \ > --without-libpaper \ > + --without-pdf \ > --with-system-libtiff > > ifeq ($(BR2_PACKAGE_JBIG2DEC),y) From arnout at mind.be Thu Feb 3 20:44:01 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 3 Feb 2022 21:44:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/mpdecimal: bump to version 2.5.1 In-Reply-To: <20220115162142.2300207-1-fontaine.fabrice@gmail.com> References: <20220115162142.2300207-1-fontaine.fabrice@gmail.com> Message-ID: <42d558bf-d2a9-f581-3a15-f8dc89150b47@mind.be> On 15/01/2022 17:21, Fabrice Fontaine wrote: > Drop patch (already in version) and so autoreconf > > https://www.bytereef.org/mpdecimal/changelog.html > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...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 From arnout at mind.be Thu Feb 3 20:44:42 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 3 Feb 2022 21:44:42 +0100 Subject: [Buildroot] [git commit] package/mesa3d: fix glvnd option handling Message-ID: <20220203203800.4F992825B5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ac5ab240f1c5fd2c920f9d048c20827c9e56f303 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/mesa3d/mesa3d.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 6907d8c94f..c572f9b1aa 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)) From arnout at mind.be Thu Feb 3 20:44:43 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 3 Feb 2022 21:44:43 +0100 Subject: [Buildroot] [git commit] package/kf5/kf5-extra-cmake-modules: do not build documentation Message-ID: <20220203203800.629D982B5D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b341f0c91f658484f90c5addd553c579b8d210c1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/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)) From arnout at mind.be Thu Feb 3 20:44:43 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 3 Feb 2022 21:44:43 +0100 Subject: [Buildroot] [git commit] package/rtl8723bu: bump to version 19b4bdc05483a1e79a4f955a80f8f72cdd5dedc3 Message-ID: <20220203203800.6CB3E82AE4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=89211450c68df76f3b850c651733c86fb02b40d6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This version fixes a bug that prevents the user from switching from one access point to another. Signed-off-by: Doug Brown Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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) From arnout at mind.be Thu Feb 3 20:44:42 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 3 Feb 2022 21:44:42 +0100 Subject: [Buildroot] [git commit] package/gensio: add avahi optional dependency Message-ID: <20220203203800.58B1E7FFA5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f0a1d47f6fe6bda3b18b3fcfca37757b37695dbb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 \ From arnout at mind.be Thu Feb 3 20:44:43 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 3 Feb 2022 21:44:43 +0100 Subject: [Buildroot] [git commit] package/poppler: fix build failure due to gcc bug 68485 Message-ID: <20220203203800.8CB0882B5D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=de1a3737879eef4a9dd283269a896e50a1badabf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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)) From arnout at mind.be Thu Feb 3 20:44:43 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 3 Feb 2022 21:44:43 +0100 Subject: [Buildroot] [git commit] linux: clarify BR2_LINUX_KERNEL_CUSTOM_DTS_PATH description Message-ID: <20220203203800.94DC382AE4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8ef413b59a870b6a593eb9f1a71caef30c1848c3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- linux/Config.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 582f37ba7c..13d99bd09d 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 the .dts files will + be compiled from there. config BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME bool "Keep the directory name of the Device Tree" From arnout at mind.be Thu Feb 3 20:44:43 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 3 Feb 2022 21:44:43 +0100 Subject: [Buildroot] [git commit] package/libglvnd: needs threads Message-ID: <20220203203800.83DBE7FFA5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2a7b360b5f8ed86001bb349d937100e9e46584b0 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: 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 From arnout at mind.be Thu Feb 3 20:44:43 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 3 Feb 2022 21:44:43 +0100 Subject: [Buildroot] [git commit] package/mpdecimal: bump to version 2.5.1 Message-ID: <20220203203800.A772E825B5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=995c093d6a3e8042110d6a8d96fdc7ad65a557c4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patch (already in version) and so autoreconf https://www.bytereef.org/mpdecimal/changelog.html Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...-support-for-enable-disable-shared-static.patch | 147 --------------------- package/mpdecimal/mpdecimal.hash | 2 +- package/mpdecimal/mpdecimal.mk | 3 +- 3 files changed, 2 insertions(+), 150 deletions(-) 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 From arnout at mind.be Thu Feb 3 20:44:43 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 3 Feb 2022 21:44:43 +0100 Subject: [Buildroot] [git commit] package/ghostscript: bump to version 9.55.0 Message-ID: <20220203203800.9EA61825B5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7a4944569ce83b0b7b0cabd6e8aa184b8cb72a22 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...-704405-Fix-typo-in-non-forked-lcms2-code.patch | 28 +++ ...01-bug-702985-drop-use-of-FT_CALLBACK_DEF.patch | 55 ----- ...Include-device-specifier-strings-in-acces.patch | 234 --------------------- ...ck-stack-limits-after-function-evaluation.patch | 52 ----- ...stack-management-in-sampled_data_continue.patch | 68 ------ package/ghostscript/ghostscript.hash | 6 +- package/ghostscript/ghostscript.mk | 12 +- 7 files changed, 33 insertions(+), 422 deletions(-) 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 commit: https://git.buildroot.net/buildroot/commit/?id=657d9731cf52dd7e9a2564ba68ce19e675c1eaee branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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. It was like that since the very first version that was added to Buildroot. Signed-off-by: Doug Brown Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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)) From james.hilliard1 at gmail.com Thu Feb 3 20:46:53 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 3 Feb 2022 13:46:53 -0700 Subject: [Buildroot] [PATCH v7 1/1] package/qt5: bump packages to latest kde submodule versions In-Reply-To: References: <20220131225622.90226-1-james.hilliard1@gmail.com> Message-ID: On Thu, Feb 3, 2022 at 12:35 PM Arnout Vandecappelle wrote: > > > > On 31/01/2022 23:56, 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 > > It took me some reading of the patch and of the upstream repositories to > understand that there are actually no release tarballs or tags, and the the > 5.15.8 is something we just pull out of our hat to be compatible with > qt5webengine. So I updated the commit message to (hopefully) better explain that. Yeah, upstream def makes this a bit annoying. > > > > > 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. > > Instead of creating a separate package for it (which BTW you forgot to add to > DEVELOPERS), I changed this to use the git download method and _GIT_SUBMODULES = > YES. I checked that it extracts to exactly the same thing. Yeah, I had done it this way mostly for consistency with the qt5webengine WIP update as for that we kinda need to patch multiple deps that have upstream patches that apply easier against the deps directly. > > > > > 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. > > I don't really understand why this was needed rather than calling syncqt > explicitly, but OK. Some packages like qt5base don't work with calling syncqt explicitly as they have different logic needed. > > Applied to master, thanks. > > Regards, > Arnout > > > > > 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 > > [snip] From yann.morin.1998 at free.fr Thu Feb 3 20:56:17 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 3 Feb 2022 21:56:17 +0100 Subject: [Buildroot] [git commit] package/gdb: backport fix for gdbserver 11.1 on aarch64 Message-ID: <20220203204945.F13E7825B5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4353c716466fb8860dea265985829e9fae58e016 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 [yann.morin.1998 at free.fr: add SoB in patch, provided live on IRC] Signed-off-by: Yann E. MORIN --- .../gdb/11.1/0010-gdbserver-aarch64-support.patch | 320 +++++++++++++++++++++ 1 file changed, 320 insertions(+) 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..3718b1b6fd --- /dev/null +++ b/package/gdb/11.1/0010-gdbserver-aarch64-support.patch @@ -0,0 +1,320 @@ +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. + +Backported from: eb79b2318066cafb75ffdce310e3bbd44f7c79e3 +Signed-off-by: Joachim Wiberg +--- + 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 yann.morin.1998 at free.fr Thu Feb 3 20:58:38 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 3 Feb 2022 21:58:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/gdb: backport fix for gdbserver 11.1 on aarch64 In-Reply-To: <20220128084244.2258811-1-troglobit@gmail.com> References: <20220128084244.2258811-1-troglobit@gmail.com> Message-ID: <20220203205838.GY457876@scaer> Joachim, All, On 2022-01-28 09:42 +0100, Joachim Wiberg spake thusly: > 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. You forgot to add your SoB here, so I added what you provided on IRC: Backported from: eb79b2318066cafb75ffdce310e3bbd44f7c79e3 Signed-off-by: Joachim Wiberg Applied to master, thanks. Regards, Yann E. MORIN. > +--- > + 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 > + > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From ca0 at protonmail.ch Thu Feb 3 21:37:39 2022 From: ca0 at protonmail.ch (ca0) Date: Thu, 03 Feb 2022 21:37:39 +0000 Subject: [Buildroot] package libldns In-Reply-To: <6c85206c-139f-474d-7ca5-5f21fd606d96@mind.be> References: <5_xofMlQqIrdAjpopLNCIYCGiqsc2UoXvUQG4GIV5Bd0dY31bw-gZ_0eoD0ix_iW-BI3-5O_RbQESkV3ybUN1zFSLY2r3PAr3ZOfxYOFmrU=@protonmail.ch> <6c85206c-139f-474d-7ca5-5f21fd606d96@mind.be> Message-ID: Naah - builds only for Intel. Do an arm build and you'll find that the m4/libtool.m4 runs a whole lot of ldconfig commands that show some error codes and the worst part is that the libc files mentioned are "blown away" (see https://dictionary.tn/whats-another-word-for-blown-away/) like taken our behind the shed and have a few bullets put in them - ie. deleted. Do you know what a pain it is not having the build fail there and then, because you have to debug a non working init, check the kernel and then find that your user space has been crippled by some Nazi collaborators (my bad, I'll stick to EU Nazi references from now on). Are you saying that this package works for ARM? Sent with ProtonMail Secure Email. ------- Original Message ------- On Thursday, February 3rd, 2022 at 6:49 PM, Arnout Vandecappelle wrote: > On 03/02/2022 19:45, Arnout Vandecappelle wrote: > > > Hi ca0, > > > > On 03/02/2022 03:01, ca0 via buildroot wrote: > > > > > Building this package with orangepi_zero_defconfig results in an useless user > > > > > > system because both thee files are blown away > > > > What is "this package"? The subject mentions libidns, but there's no libidns > > > > package in buildroot. > > Apparently I misread, it's libldns which does indeed exist. > > I did a build of it and it looks OK... > > Regards, > > Arnout > > > What do you mean with "blown away"? > > > > > ./output/target/usr/lib/ld-musl-armhf.so.1 > > > > This file belongs to the musl standard C library, but orangepi_zero_defconfig > > > > builds a uClibc standard C library, so it shouldn't even be there. > > > > You can check which libraries are needed for an executable or shared library > > > > with "readelf -d output/target/...". All the libraries mentioned there should > > > > exist in output/target/lib or output/target/usr/lib. If not, it is indeed broken. > > > > If you want more help, you will need to provide a whole lot more details. > > > > Regards, > > > > Arnout > > > > > ./output/host/arm-buildroot-linux-musleabihf/sysroot/usr/lib/ld-musl-armhf.so.1 > > > > > > Is the ldconfig hackery needed for embedded systems and is it supported when > > > > > > cross compiling? > > > > > > buildroot mailing list > > > > > > buildroot at buildroot.org > > > > > > https://lists.buildroot.org/mailman/listinfo/buildroot From fontaine.fabrice at gmail.com Thu Feb 3 22:05:04 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 3 Feb 2022 23:05:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/ddrescue: bump to version 1.26 Message-ID: <20220203220504.667447-1-fontaine.fabrice@gmail.com> https://lists.gnu.org/archive/html/info-gnu/2022-01/msg00013.html Signed-off-by: Fabrice Fontaine --- package/ddrescue/ddrescue.hash | 4 ++-- package/ddrescue/ddrescue.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ddrescue/ddrescue.hash b/package/ddrescue/ddrescue.hash index 6877b7008d..f7c82b086b 100644 --- a/package/ddrescue/ddrescue.hash +++ b/package/ddrescue/ddrescue.hash @@ -1,4 +1,4 @@ -# From https://lists.gnu.org/archive/html/info-gnu/2020-03/msg00002.html -sha256 ce538ebd26a09f45da67d3ad3f7431932428231ceec7a2d255f716fa231a1063 ddrescue-1.25.tar.lz +# From https://lists.gnu.org/archive/html/info-gnu/2022-01/msg00013.html +sha256 e513cd3a90d9810dfdd91197d40aa40f6df01597bfb5ecfdfb205de1127c551f ddrescue-1.26.tar.lz # Locally computed sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef COPYING diff --git a/package/ddrescue/ddrescue.mk b/package/ddrescue/ddrescue.mk index f113681fa1..6d16d8701f 100644 --- a/package/ddrescue/ddrescue.mk +++ b/package/ddrescue/ddrescue.mk @@ -4,7 +4,7 @@ # ################################################################################ -DDRESCUE_VERSION = 1.25 +DDRESCUE_VERSION = 1.26 DDRESCUE_SOURCE = ddrescue-$(DDRESCUE_VERSION).tar.lz DDRESCUE_SITE = http://download.savannah.gnu.org/releases/ddrescue DDRESCUE_LICENSE = GPL-2.0+ -- 2.34.1 From fontaine.fabrice at gmail.com Thu Feb 3 22:26:39 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 3 Feb 2022 23:26:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/dt-utils: use snapshot tarball Message-ID: <20220203222639.725822-1-fontaine.fabrice@gmail.com> Use snapshot tarball so DT_UTILS_VERSION will match what is returned by https://release-monitoring.org Signed-off-by: Fabrice Fontaine --- package/dt-utils/dt-utils.hash | 2 +- package/dt-utils/dt-utils.mk | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/dt-utils/dt-utils.hash b/package/dt-utils/dt-utils.hash index 74819158bb..9fca594db5 100644 --- a/package/dt-utils/dt-utils.hash +++ b/package/dt-utils/dt-utils.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8b29d3a8799170afdb1b077e655528bf4e6afe0c789107b1eec8fff9d4482771 dt-utils-v2021.03.0-br1.tar.gz +sha256 63cf47c70911bb3605bafac38a5a7e19eb753ac1c90de2abceaf2fdefd71be6d dt-utils-2021.03.0.tar.xz sha256 a45932c79317d15116eadbf1c9c6fc59117ec3c4621db3a876066defa723963b COPYING diff --git a/package/dt-utils/dt-utils.mk b/package/dt-utils/dt-utils.mk index bc7fd90631..d264e2cdc9 100644 --- a/package/dt-utils/dt-utils.mk +++ b/package/dt-utils/dt-utils.mk @@ -4,9 +4,9 @@ # ################################################################################ -DT_UTILS_VERSION = v2021.03.0 -DT_UTILS_SITE = https://git.pengutronix.de/git/tools/dt-utils -DT_UTILS_SITE_METHOD = git +DT_UTILS_VERSION = 2021.03.0 +DT_UTILS_SOURCE = dt-utils-$(DT_UTILS_VERSION).tar.xz +DT_UTILS_SITE = https://git.pengutronix.de/cgit/tools/dt-utils/snapshot DT_UTILS_LICENSE = GPL-2.0 DT_UTILS_LICENSE_FILES = COPYING DT_UTILS_DEPENDENCIES = udev -- 2.34.1 From giulio.benetti at benettiengineering.com Thu Feb 3 22:29:47 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 3 Feb 2022 23:29:47 +0100 Subject: [Buildroot] [PATCH] package/util-linux: improve host build failure fix In-Reply-To: <20220203212328.264bc948@gmx.net> References: <412baee3-b818-521a-99bf-ee868d3e1be2@benettiengineering.com> <20220202220538.2858380-1-giulio.benetti@benettiengineering.com> <20220203212328.264bc948@gmx.net> Message-ID: <08bae7c4-b9cc-ebb9-c53e-5a3d0b5d044f@benettiengineering.com> Hi Peter, On 03/02/22 21:23, Peter Seiderer wrote: > Hello Giulio, > > On Wed, 2 Feb 2022 23:05:38 +0100, Giulio Benetti wrote: > >> As suggested by Peter Seiderer package util-linux doesn't need raw support >> when built for host, so let's remove: >> HOST_UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE >> in favor of: >> HOST_UTIL_LINUX_CONF_OPTS += --disable-raw >> This is a better approach than my commit: >> https://git.buildroot.net/buildroot/commit/?id=d895bd973b35fde10d3dd7db530d9e4782926497 >> >> Suggested-by: Peter Seiderer >> Signed-off-by: Giulio Benetti > > Tested with registry.gitlab.com/buildroot.org/buildroot/base:20220105.2314: > > - reverted 'package/util-linux: fix host build failure' (d895bd973b35fde10d3dd7db530d9e4782926497) > --> build fails with: No rule to make target 'disk-utils/raw.8' > > - build with 'package/util-linux: fix host build failure' (d895bd973b35fde10d3dd7db530d9e4782926497) > --> build o.k. > > - build with this additional patch > --> build o.k. > > Tested-by: Peter Seiderer > > >> --- >> package/util-linux/util-linux.mk | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk >> index 5a4ff64d01..f3297257cf 100644 >> --- a/package/util-linux/util-linux.mk >> +++ b/package/util-linux/util-linux.mk >> @@ -41,7 +41,6 @@ define UTIL_LINUX_FIX_DISK_UTILS_COMPILE >> touch $(@D)/disk-utils/raw.8 >> endef >> UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE >> -HOST_UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE >> >> HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf >> > > The line above reads: > > # We also don't want the host-python dependency Oh, you're totally right >> @@ -49,7 +48,8 @@ HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf >> HOST_UTIL_LINUX_CONF_OPTS = \ >> --without-systemd \ >> --with-systemdsystemunitdir=no \ >> - --without-python >> + --without-python \ >> + --disable-raw > > So I would move the 'disable-raw' down to line 196ff (or below to an > extra 'HOST_UTIL_LINUX_CONF_OPTS +=' section with comment why... Yes > With this change you can add my: > > Reviewed-by: Peter Seiderer > > Regards, > Peter > >> >> ifneq ($(BR2_PACKAGE_UTIL_LINUX_BINARIES)$(BR2_PACKAGE_UTIL_LINUX_CRAMFS)$(BR2_PACKAGE_UTIL_LINUX_FSCK)$(BR2_PACKAGE_UTIL_LINUX_LOSETUP),) >> UTIL_LINUX_SELINUX_MODULES = fstools > Thank you! Going to reply with V2. Best regards -- Giulio Benetti Benetti Engineering sas From giulio.benetti at benettiengineering.com Thu Feb 3 22:31:24 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 3 Feb 2022 23:31:24 +0100 Subject: [Buildroot] [PATCH v2] package/util-linux: improve host build failure fix In-Reply-To: <20220203212328.264bc948@gmx.net> References: <20220203212328.264bc948@gmx.net> Message-ID: <20220203223124.3017611-1-giulio.benetti@benettiengineering.com> As suggested by Peter Seiderer package util-linux doesn't need raw support when built for host, so let's remove: HOST_UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE in favor of: HOST_UTIL_LINUX_CONF_OPTS += --disable-raw This is a better approach than my commit: https://git.buildroot.net/buildroot/commit/?id=d895bd973b35fde10d3dd7db530d9e4782926497 Suggested-by: Peter Seiderer Tested-by: Peter Seiderer Reviewed-by: Peter Seiderer Signed-off-by: Giulio Benetti --- V1->V2: * move --disable-raw to a dedicated HOST_UTIL_LINUX_CONF_OPTS as suggested by Peter Seiderer. This avoid ambiguity since previously it was under the comment "# We also don't want the host-python dependency". --- package/util-linux/util-linux.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 5a4ff64d01..40fd518a58 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -41,7 +41,6 @@ define UTIL_LINUX_FIX_DISK_UTILS_COMPILE touch $(@D)/disk-utils/raw.8 endef UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE -HOST_UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf @@ -202,6 +201,11 @@ HOST_UTIL_LINUX_CONF_OPTS += \ --without-ncursesw \ --without-tinfo +# Disable raw command since starting from version 2.37 needs a +# work-around to build but in the end we don't need at all. +HOST_UTIL_LINUX_CONF_OPTS += \ + --disable-raw + ifeq ($(BR2_PACKAGE_HOST_UTIL_LINUX),y) HOST_UTIL_LINUX_CONF_OPTS += --disable-makeinstall-chown # disable commands that have ncurses dependency, as well as -- 2.25.1 From fontaine.fabrice at gmail.com Thu Feb 3 22:36:15 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 3 Feb 2022 23:36:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/trace-cmd: use snapshot tarball Message-ID: <20220203223615.729285-1-fontaine.fabrice@gmail.com> Use snapshot tarball so TRACE_CMD_VERSION will match what is returned by https://release-monitoring.org Signed-off-by: Fabrice Fontaine --- package/trace-cmd/trace-cmd.hash | 2 +- package/trace-cmd/trace-cmd.mk | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/trace-cmd/trace-cmd.hash b/package/trace-cmd/trace-cmd.hash index 1f34a0da60..00cecc7828 100644 --- a/package/trace-cmd/trace-cmd.hash +++ b/package/trace-cmd/trace-cmd.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 9401a43bda4837dfde5e64e0dbe5d3918bf50eb86b4d23fa89713b0f2defcbc1 trace-cmd-trace-cmd-v2.9.6-br1.tar.gz +sha256 45924a763376a700221f64b4034f87263e4038ec88b120a0abfb5743d051d068 trace-cmd-v2.9.6.tar.gz sha256 b1d04b850c1c7471b0f0896f6c6f0fcfc9f07e2dd183a5f5826af269fe9e88fb COPYING sha256 70f297763149e72306919c924e164f83041d5e512868d4c8c1826c171b3e49f9 COPYING.LIB sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 LICENSES/GPL-2.0 diff --git a/package/trace-cmd/trace-cmd.mk b/package/trace-cmd/trace-cmd.mk index a592b1f027..d9ed417f20 100644 --- a/package/trace-cmd/trace-cmd.mk +++ b/package/trace-cmd/trace-cmd.mk @@ -4,9 +4,10 @@ # ################################################################################ -TRACE_CMD_VERSION = trace-cmd-v2.9.6 -TRACE_CMD_SITE = https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git -TRACE_CMD_SITE_METHOD = git +TRACE_CMD_VERSION = 2.9.6 +TRACE_CMD_SOURCE = trace-cmd-v$(TRACE_CMD_VERSION).tar.gz +TRACE_CMD_SITE = \ + https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot TRACE_CMD_LICENSE = GPL-2.0, LGPL-2.1 TRACE_CMD_LICENSE_FILES = COPYING COPYING.LIB LICENSES/GPL-2.0 LICENSES/LGPL-2.1 -- 2.34.1 From fontaine.fabrice at gmail.com Thu Feb 3 22:47:09 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 3 Feb 2022 23:47:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/speexdsp: use snapshot tarball Message-ID: <20220203224709.736830-1-fontaine.fabrice@gmail.com> Use snapshot tarball so SPEEXDSP_VERSION will match what is returned by https://release-monitoring.org Signed-off-by: Fabrice Fontaine --- package/speexdsp/speexdsp.hash | 2 +- package/speexdsp/speexdsp.mk | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/speexdsp/speexdsp.hash b/package/speexdsp/speexdsp.hash index fd9870dc58..82e054d4d4 100644 --- a/package/speexdsp/speexdsp.hash +++ b/package/speexdsp/speexdsp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c92c7e428cb5ca11b4e6f13118ff288332f330b6fefc93cb39bf7b43b13cb1f7 speexdsp-SpeexDSP-1.2.0-br1.tar.gz +sha256 0fe0e31be215f820bed0f9c913c673997773fce3a03a4555658e7b73a54eed7b speexdsp-SpeexDSP-1.2.0.tar.bz2 sha256 671bb5d8fd3c6b05a2e831d90f978ac27965c92bd8ea6d16b3df76e3440c0e9f COPYING diff --git a/package/speexdsp/speexdsp.mk b/package/speexdsp/speexdsp.mk index 35c06dd833..8e886b2b21 100644 --- a/package/speexdsp/speexdsp.mk +++ b/package/speexdsp/speexdsp.mk @@ -4,9 +4,9 @@ # ################################################################################ -SPEEXDSP_VERSION = SpeexDSP-1.2.0 -SPEEXDSP_SITE = https://gitlab.xiph.org/xiph/speexdsp.git -SPEEXDSP_SITE_METHOD = git +SPEEXDSP_VERSION = 1.2.0 +SPEEXDSP_SOURCE = speexdsp-SpeexDSP-$(SPEEXDSP_VERSION).tar.bz2 +SPEEXDSP_SITE = https://gitlab.xiph.org/xiph/speexdsp/-/archive/SpeexDSP-$(SPEEXDSP_VERSION) SPEEXDSP_LICENSE = BSD-3-Clause SPEEXDSP_LICENSE_FILES = COPYING SPEEXDSP_INSTALL_STAGING = YES -- 2.34.1 From giulio.benetti at benettiengineering.com Thu Feb 3 22:59:52 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 3 Feb 2022 23:59:52 +0100 Subject: [Buildroot] [PATCH 0/5] Fix genimage build failure on Gitlab-CI Message-ID: <20220203225957.3039320-1-giulio.benetti@benettiengineering.com> Giulio Benetti (5): board/friendlyarm/nanopc-t4:use partition-type-uuid for genimage-15 board/friendlyarm/nanopi-m4:use partition-type-uuid for genimage-15 board/pine64/rockpro64:use partition-type-uuid for genimage-15 board/radxa/rockpi-4:use partition-type-uuid for genimage-15 board/radxa/rockpi-n10:use partition-type-uuid for genimage-15 board/friendlyarm/nanopc-t4/genimage.cfg | 4 ++-- board/friendlyarm/nanopi-m4/genimage.cfg | 4 ++-- board/pine64/rockpro64/genimage.cfg | 4 ++-- board/radxa/rockpi-4/genimage.cfg | 4 ++-- board/radxa/rockpi-n10/genimage.cfg | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) -- 2.25.1 From giulio.benetti at benettiengineering.com Thu Feb 3 22:59:53 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 3 Feb 2022 23:59:53 +0100 Subject: [Buildroot] [PATCH 1/5] board/friendlyarm/nanopc-t4:use partition-type-uuid for genimage-15 In-Reply-To: <20220203225957.3039320-1-giulio.benetti@benettiengineering.com> References: <20220203225957.3039320-1-giulio.benetti@benettiengineering.com> Message-ID: <20220203225957.3039320-2-giulio.benetti@benettiengineering.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 So let's use for EFI System partition: 'partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b' and for Root partition (64-bit ARM/AArch64): 'partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae' Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/1929717055 FTR, the magic UUID are from: https://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs Signed-off-by: Giulio Benetti --- board/friendlyarm/nanopc-t4/genimage.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/friendlyarm/nanopc-t4/genimage.cfg b/board/friendlyarm/nanopc-t4/genimage.cfg index d63c293ab4..98dc2f3892 100644 --- a/board/friendlyarm/nanopc-t4/genimage.cfg +++ b/board/friendlyarm/nanopc-t4/genimage.cfg @@ -26,14 +26,14 @@ image sdcard.img { } partition boot { - partition-type = 0xC + partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b bootable = "true" image = "boot.vfat" offset = 16M } partition rootfs { - partition-type = 0x83 + partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae image = "rootfs.ext4" } } -- 2.25.1 From giulio.benetti at benettiengineering.com Thu Feb 3 22:59:54 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 3 Feb 2022 23:59:54 +0100 Subject: [Buildroot] [PATCH 2/5] board/friendlyarm/nanopi-m4:use partition-type-uuid for genimage-15 In-Reply-To: <20220203225957.3039320-1-giulio.benetti@benettiengineering.com> References: <20220203225957.3039320-1-giulio.benetti@benettiengineering.com> Message-ID: <20220203225957.3039320-3-giulio.benetti@benettiengineering.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 So let's use for EFI System partition: 'partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b' and for Root partition (64-bit ARM/AArch64): 'partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae' Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/1929717059 FTR, the magic UUID are from: https://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs Signed-off-by: Giulio Benetti --- board/friendlyarm/nanopi-m4/genimage.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/friendlyarm/nanopi-m4/genimage.cfg b/board/friendlyarm/nanopi-m4/genimage.cfg index 35d056ae6e..8d0e6ad13b 100644 --- a/board/friendlyarm/nanopi-m4/genimage.cfg +++ b/board/friendlyarm/nanopi-m4/genimage.cfg @@ -26,14 +26,14 @@ image sdcard.img { } partition boot { - partition-type = 0xC + partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b bootable = "true" image = "boot.vfat" offset = 16M } partition rootfs { - partition-type = 0x83 + partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae image = "rootfs.ext4" } } -- 2.25.1 From giulio.benetti at benettiengineering.com Thu Feb 3 22:59:56 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 3 Feb 2022 23:59:56 +0100 Subject: [Buildroot] [PATCH 4/5] board/radxa/rockpi-4:use partition-type-uuid for genimage-15 In-Reply-To: <20220203225957.3039320-1-giulio.benetti@benettiengineering.com> References: <20220203225957.3039320-1-giulio.benetti@benettiengineering.com> Message-ID: <20220203225957.3039320-5-giulio.benetti@benettiengineering.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 So let's use for EFI System partition: 'partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b' and for Root partition (64-bit ARM/AArch64): 'partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae' Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/1929717240 FTR, the magic UUID are from: https://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs Signed-off-by: Giulio Benetti --- board/radxa/rockpi-4/genimage.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/radxa/rockpi-4/genimage.cfg b/board/radxa/rockpi-4/genimage.cfg index a5100af420..68cc4d61a8 100644 --- a/board/radxa/rockpi-4/genimage.cfg +++ b/board/radxa/rockpi-4/genimage.cfg @@ -26,14 +26,14 @@ image sdcard.img { } partition boot { - partition-type = 0xC + partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b bootable = "true" image = "boot.vfat" offset = 16M } partition rootfs { - partition-type = 0x83 + partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae image = "rootfs.ext4" } } -- 2.25.1 From giulio.benetti at benettiengineering.com Thu Feb 3 22:59:55 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 3 Feb 2022 23:59:55 +0100 Subject: [Buildroot] [PATCH 3/5] board/pine64/rockpro64:use partition-type-uuid for genimage-15 In-Reply-To: <20220203225957.3039320-1-giulio.benetti@benettiengineering.com> References: <20220203225957.3039320-1-giulio.benetti@benettiengineering.com> Message-ID: <20220203225957.3039320-4-giulio.benetti@benettiengineering.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 So let's use for EFI System partition: 'partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b' and for Root partition (64-bit ARM/AArch64): 'partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae' Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/1929717243 FTR, the magic UUID are from: https://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs Signed-off-by: Giulio Benetti --- board/pine64/rockpro64/genimage.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/pine64/rockpro64/genimage.cfg b/board/pine64/rockpro64/genimage.cfg index 14dd0e1d18..d3926f2df6 100644 --- a/board/pine64/rockpro64/genimage.cfg +++ b/board/pine64/rockpro64/genimage.cfg @@ -26,14 +26,14 @@ image sdcard.img { } partition boot { - partition-type = 0xC + partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b bootable = "true" image = "boot.vfat" offset = 16M } partition rootfs { - partition-type = 0x83 + partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae image = "rootfs.ext4" } } -- 2.25.1 From giulio.benetti at benettiengineering.com Thu Feb 3 22:59:57 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 3 Feb 2022 23:59:57 +0100 Subject: [Buildroot] [PATCH 5/5] board/radxa/rockpi-n10:use partition-type-uuid for genimage-15 In-Reply-To: <20220203225957.3039320-1-giulio.benetti@benettiengineering.com> References: <20220203225957.3039320-1-giulio.benetti@benettiengineering.com> Message-ID: <20220203225957.3039320-6-giulio.benetti@benettiengineering.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 So let's use for EFI System partition: 'partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b' and for Root partition (64-bit ARM/AArch64): 'partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae' Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/1929717241 FTR, the magic UUID are from: https://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs Signed-off-by: Giulio Benetti --- board/radxa/rockpi-n10/genimage.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/radxa/rockpi-n10/genimage.cfg b/board/radxa/rockpi-n10/genimage.cfg index 652e75db11..7f4b639bbc 100644 --- a/board/radxa/rockpi-n10/genimage.cfg +++ b/board/radxa/rockpi-n10/genimage.cfg @@ -26,14 +26,14 @@ image sdcard.img { } partition boot { - partition-type = 0xC + partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b bootable = "true" image = "boot.vfat" offset = 16M } partition rootfs { - partition-type = 0x83 + partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae image = "rootfs.ext4" } } -- 2.25.1 From fontaine.fabrice at gmail.com Thu Feb 3 23:14:32 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 4 Feb 2022 00:14:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/netcat-openbsd: bump to version 1.218 Message-ID: <20220203231432.748145-1-fontaine.fabrice@gmail.com> - Use official tarball so NETCAT_OPENBSD_VERSION will match what is returned by https://release-monitoring.org - Use netcat.c as the license file Signed-off-by: Fabrice Fontaine --- package/netcat-openbsd/netcat-openbsd.hash | 9 ++++++--- package/netcat-openbsd/netcat-openbsd.mk | 9 +++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/package/netcat-openbsd/netcat-openbsd.hash b/package/netcat-openbsd/netcat-openbsd.hash index b70cae8860..e55dea53e7 100644 --- a/package/netcat-openbsd/netcat-openbsd.hash +++ b/package/netcat-openbsd/netcat-openbsd.hash @@ -1,3 +1,6 @@ -# Locally calculated -sha256 55e578f652cbf6ffc95f75ea3e2645ab335fab63649568bd7cdb0a6331ca87de netcat-openbsd-debian_1.195-2-br1.tar.gz -sha256 e2e86d58c38f044a49f51e45515747585db58a2305419c73323eaad88fcaef5c debian/copyright +# From http://snapshot.debian.org/archive/debian/20211206T030211Z/pool/main/n/netcat-openbsd/netcat-openbsd_1.218-3.dsc +sha256 a28a5d39abaf481747b1e78b4b50e96d0cdab0ffef289cba156dc11941c64857 netcat-openbsd_1.218.orig.tar.gz +sha256 19229ebc825d12cd805843228c498cc881dcef127a9d680fcfbd8cb2da966161 netcat-openbsd_1.218-3.debian.tar.xz + +# Hash for license file +sha256 acfd1d822ee2e8e0b196c7a369383d0cb9bc131b56c3c95976a32498728fe1e3 netcat.c diff --git a/package/netcat-openbsd/netcat-openbsd.mk b/package/netcat-openbsd/netcat-openbsd.mk index a2333531c0..311f8aa819 100644 --- a/package/netcat-openbsd/netcat-openbsd.mk +++ b/package/netcat-openbsd/netcat-openbsd.mk @@ -4,11 +4,12 @@ # ################################################################################ -NETCAT_OPENBSD_VERSION = debian/1.195-2 -NETCAT_OPENBSD_SITE = https://salsa.debian.org/debian/netcat-openbsd.git -NETCAT_OPENBSD_SITE_METHOD = git +NETCAT_OPENBSD_VERSION = 1.218 +NETCAT_OPENBSD_SOURCE = netcat-openbsd_$(NETCAT_OPENBSD_VERSION).orig.tar.gz +NETCAT_OPENBSD_PATCH = netcat-openbsd_$(NETCAT_OPENBSD_VERSION)-3.debian.tar.xz +NETCAT_OPENBSD_SITE = http://snapshot.debian.org/archive/debian/20211206T030211Z/pool/main/n/netcat-openbsd NETCAT_OPENBSD_LICENSE = BSD-3-Clause -NETCAT_OPENBSD_LICENSE_FILES = debian/copyright +NETCAT_OPENBSD_LICENSE_FILES = netcat.c NETCAT_OPENBSD_DEPENDENCIES = host-pkgconf libbsd define NETCAT_OPENBSD_APPLY_DEBIAN_PATCHES -- 2.34.1 From ps.report at gmx.net Thu Feb 3 23:23:21 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 4 Feb 2022 00:23:21 +0100 Subject: [Buildroot] [PATCH v2] package/libcamera: fix uclibc/musl compile with libexecinfo enabled Message-ID: <20220203232321.26733-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 --- Changes v1 -> v2: - preserver original TARGET_LDFLAGS while setting LIBCAMERA_LDFLAGS --- package/libcamera/libcamera.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/libcamera/libcamera.mk b/package/libcamera/libcamera.mk index 524cf07e03..534d8d2637 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 = $(TARGET_LDFLAGS) -lexecinfo +endif + $(eval $(meson-package)) -- 2.34.1 From ps.report at gmx.net Thu Feb 3 23:24:10 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 4 Feb 2022 00:24:10 +0100 Subject: [Buildroot] [PATCH v1] package/mtools: bump version to 4.0.37 Message-ID: <20220203232410.26906-1-ps.report@gmx.net> For details see [1]. [1] https://lists.gnu.org/archive/html/info-gnu/2022-01/msg00006.html Signed-off-by: Peter Seiderer --- 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 c37d4df456..5d1bca486f 100644 --- a/package/mtools/mtools.hash +++ b/package/mtools/mtools.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 78ac74b2d1cae77bb2da29461a13ed862ff6b7c1289d5bf80fdb09e039c2c48f mtools-4.0.36.tar.lz +sha256 f4dd1fb4b4d72f344f7efcfb05219de3882c6c6fce678d75e7cfb29ca162c7ca mtools-4.0.37.tar.lz # Locally calculated sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/mtools/mtools.mk b/package/mtools/mtools.mk index 4908c3fa2f..f73fd5d231 100644 --- a/package/mtools/mtools.mk +++ b/package/mtools/mtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -MTOOLS_VERSION = 4.0.36 +MTOOLS_VERSION = 4.0.37 MTOOLS_SOURCE = mtools-$(MTOOLS_VERSION).tar.lz MTOOLS_SITE = $(BR2_GNU_MIRROR)/mtools MTOOLS_LICENSE = GPL-3.0+ -- 2.34.1 From giulio.benetti at benettiengineering.com Thu Feb 3 23:40:29 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 4 Feb 2022 00:40:29 +0100 Subject: [Buildroot] [PATCH v3] configs/friendlyarm_nanopi_r2s: new defconfig In-Reply-To: <20220130101150.20605-1-gilles.talis@gmail.com> References: <20220130101150.20605-1-gilles.talis@gmail.com> Message-ID: Hi Giles, On 30/01/22 11:11, 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 > --- > 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 This ^^^ will fail due to latest genimage version. You can't specify partition-type anymore but you have to specify: partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae That means "Root partition (64-bit ARM/AArch64)", check this out: https://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs > + 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 On aarch64 this ^^^ became useless so you can drop it > +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 Have you tested this defconfig with Gitlab-CI docker? registry.gitlab.com/buildroot.org/buildroot/base:20220105.2314 It helps to check if any possible host tool is missing. Can you give a go with it? Thank you! Best regards -- Giulio Benetti Benetti Engineering sas From giulio.benetti at benettiengineering.com Thu Feb 3 23:43:03 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 4 Feb 2022 00:43:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/trace-cmd: use snapshot tarball In-Reply-To: <20220203223615.729285-1-fontaine.fabrice@gmail.com> References: <20220203223615.729285-1-fontaine.fabrice@gmail.com> Message-ID: <34acab3f-35d5-8130-34a6-dc528eda09b5@benettiengineering.com> Hi Fabrice, On 03/02/22 23:36, Fabrice Fontaine wrote: > Use snapshot tarball so TRACE_CMD_VERSION will match what is returned by > https://release-monitoring.org > > Signed-off-by: Fabrice Fontaine Thank you! Reviewed-by: Giulio Benetti Best regards -- Giulio Benetti Benetti Engineering sas > --- > package/trace-cmd/trace-cmd.hash | 2 +- > package/trace-cmd/trace-cmd.mk | 7 ++++--- > 2 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/package/trace-cmd/trace-cmd.hash b/package/trace-cmd/trace-cmd.hash > index 1f34a0da60..00cecc7828 100644 > --- a/package/trace-cmd/trace-cmd.hash > +++ b/package/trace-cmd/trace-cmd.hash > @@ -1,5 +1,5 @@ > # Locally computed > -sha256 9401a43bda4837dfde5e64e0dbe5d3918bf50eb86b4d23fa89713b0f2defcbc1 trace-cmd-trace-cmd-v2.9.6-br1.tar.gz > +sha256 45924a763376a700221f64b4034f87263e4038ec88b120a0abfb5743d051d068 trace-cmd-v2.9.6.tar.gz > sha256 b1d04b850c1c7471b0f0896f6c6f0fcfc9f07e2dd183a5f5826af269fe9e88fb COPYING > sha256 70f297763149e72306919c924e164f83041d5e512868d4c8c1826c171b3e49f9 COPYING.LIB > sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 LICENSES/GPL-2.0 > diff --git a/package/trace-cmd/trace-cmd.mk b/package/trace-cmd/trace-cmd.mk > index a592b1f027..d9ed417f20 100644 > --- a/package/trace-cmd/trace-cmd.mk > +++ b/package/trace-cmd/trace-cmd.mk > @@ -4,9 +4,10 @@ > # > ################################################################################ > > -TRACE_CMD_VERSION = trace-cmd-v2.9.6 > -TRACE_CMD_SITE = https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git > -TRACE_CMD_SITE_METHOD = git > +TRACE_CMD_VERSION = 2.9.6 > +TRACE_CMD_SOURCE = trace-cmd-v$(TRACE_CMD_VERSION).tar.gz > +TRACE_CMD_SITE = \ > + https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot > TRACE_CMD_LICENSE = GPL-2.0, LGPL-2.1 > TRACE_CMD_LICENSE_FILES = COPYING COPYING.LIB LICENSES/GPL-2.0 LICENSES/LGPL-2.1 > From giulio.benetti at benettiengineering.com Thu Feb 3 23:54:38 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 4 Feb 2022 00:54:38 +0100 Subject: [Buildroot] [PATCH] manual: board support: add instructions to test defconfig in the official docker Message-ID: <20220203235438.610277-1-giulio.benetti@benettiengineering.com> Often new boards have not been tested with official docker so let's add instructions to do it. Signed-off-by: Giulio Benetti --- docs/manual/adding-board-support.txt | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/docs/manual/adding-board-support.txt b/docs/manual/adding-board-support.txt index 33ed709535..f5fb3af371 100644 --- a/docs/manual/adding-board-support.txt +++ b/docs/manual/adding-board-support.txt @@ -46,3 +46,25 @@ create a directory +board/+ and a subdirectory +board//+. You can then store your patches and configurations in these directories, and reference them from the main Buildroot configuration. Refer to xref:customize[] for more details. + +Before submitting patches for new boards it would be better to test it +by building it using .gitlab-ci.yml specified docker. For example at the +time of this writing the docker is: +$CI_REGISTRY/buildroot.org/buildroot/base:20220105.2314 +so: +Pull the docker: +-------------------- + $ docker pull registry.gitlab.com/buildroot.org/buildroot/base:20220105.2314 +-------------------- +Run the docker: +-------------------- + $ sudo docker run -it registry.gitlab.com/buildroot.org/buildroot/base:20220105.2314 /bin/bash +-------------------- +Inside the docker hint: +-------------------- + $ git clone git://git.busybox.net/buildroot + $ cd buildroot + $ make +_defconfig+ + $ make +-------------------- +Wait until build finishes and eventually add host dependencies. -- 2.25.1 From giulio.benetti at benettiengineering.com Fri Feb 4 00:06:57 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 4 Feb 2022 01:06:57 +0100 Subject: [Buildroot] [PATCH] board/radxa/rockpi-n8:use partition-type-uuid for genimage-15 Message-ID: <20220204000657.747245-1-giulio.benetti@benettiengineering.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 So let's use for EFI System partition: 'partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b' and for Root partition (32-bit ARM): 'partition-type-uuid = 69DAD710-2CE4-4E3C-B16C-21A1D49ABED3' Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/1929717242 FTR, the magic UUID are from: https://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs Signed-off-by: Giulio Benetti --- board/radxa/rockpi-n8/genimage.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/radxa/rockpi-n8/genimage.cfg b/board/radxa/rockpi-n8/genimage.cfg index 2e064d48c0..909a646499 100644 --- a/board/radxa/rockpi-n8/genimage.cfg +++ b/board/radxa/rockpi-n8/genimage.cfg @@ -26,14 +26,14 @@ image sdcard.img { } partition boot { - partition-type = 0xC + partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b bootable = "true" image = "boot.vfat" offset = 16M } partition rootfs { - partition-type = 0x83 + partition-type-uuid = 69dad710-2ce4-4e3c-b16c-21a1d49abed3 image = "rootfs.ext4" } } -- 2.25.1 From giulio.benetti at benettiengineering.com Fri Feb 4 00:31:46 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 4 Feb 2022 01:31:46 +0100 Subject: [Buildroot] [PATCH v3] configs/friendlyarm_nanopi_r2s: new defconfig In-Reply-To: References: <20220130101150.20605-1-gilles.talis@gmail.com> Message-ID: <2ad7cffb-cff9-0945-fa09-de39307d480c@benettiengineering.com> Hi Gilles, On 04/02/22 00:40, Giulio Benetti wrote: > Hi Giles, > > On 30/01/22 11:11, 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 >> --- >> 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 > > This ^^^ will fail due to latest genimage version. You can't specify > partition-type anymore but you have to specify: > partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae > > That means "Root partition (64-bit ARM/AArch64)", check this out: > https://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs This is not true since you're not using "gpt" partition table. So you leave: partition-type = 0x83 Sorry for the noise! Best regards -- Giulio Benetti Benetti Engineering sas >> + 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 > > On aarch64 this ^^^ became useless so you can drop it > >> +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 > > Have you tested this defconfig with Gitlab-CI docker? > registry.gitlab.com/buildroot.org/buildroot/base:20220105.2314 > > It helps to check if any possible host tool is missing. > > Can you give a go with it? > > Thank you! > > Best regards From giulio.benetti at benettiengineering.com Fri Feb 4 00:56:10 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 4 Feb 2022 01:56:10 +0100 Subject: [Buildroot] [PATCH] board/pc: fix build failure due to new genimage 15 Message-ID: <20220204005610.897894-1-giulio.benetti@benettiengineering.com> Actually genimage fails to create final image with: ``` ERROR: hdimage(disk.img): partition [MBR] (offset 0x1b8, size 0x48) overlaps previous partition boot (offset 0x0, size 0x200) ERROR: hdimage(disk.img): bootloaders, etc. that overlap with the partition table must declare the overlapping area as a hole. ``` This is because genimage 15 is less permissive than before, so let's add holes = {"(440; 512)"} to leave room to MBR. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/1865935249 Signed-off-by: Giulio Benetti --- board/pc/genimage-bios.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/board/pc/genimage-bios.cfg b/board/pc/genimage-bios.cfg index 26d12d9ab3..54026f6527 100644 --- a/board/pc/genimage-bios.cfg +++ b/board/pc/genimage-bios.cfg @@ -7,6 +7,7 @@ image disk.img { image = "boot.img" offset = 0 size = 512 + holes = {"(440; 512)"} } partition grub { -- 2.25.1 From giulio.benetti at benettiengineering.com Fri Feb 4 01:03:48 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 4 Feb 2022 02:03:48 +0100 Subject: [Buildroot] qt5webengine build failure on gitlab-CI Message-ID: <1662cf67-b9ef-33be-c5c4-5d5e786f944a@benettiengineering.com> Hi Peter and James, I can fix this build failure[1] due to qt5webengine, you're the experts here, can you take a look please? You have to build using official docker as I've described in this patch for the manual: https://patchwork.ozlabs.org/project/buildroot/patch/20220203235438.610277-1-giulio.benetti at benettiengineering.com/ I've tried this patch: https://patchwork.ozlabs.org/project/buildroot/patch/20220117114358.3814200-1-james.hilliard1 at gmail.com/ but it didn't help :-/ Thanks in advance! [1]: https://gitlab.com/buildroot.org/buildroot/-/jobs/1929717230 Best regards -- Giulio Benetti Benetti Engineering sas From giulio.benetti at benettiengineering.com Fri Feb 4 01:40:22 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 4 Feb 2022 02:40:22 +0100 Subject: [Buildroot] [PATCH 2/2] Add configs/zynqmp_zcu102_defconfig In-Reply-To: <20220203134402.1647985-2-neal.frager@xilinx.com> References: <20220203134402.1647985-1-neal.frager@xilinx.com> <20220203134402.1647985-2-neal.frager@xilinx.com> Message-ID: <80d97a22-5159-3111-75a3-9286e4776385@benettiengineering.com> Hi Neal, can you please improve commit log doing a presentation of what is zynqmp_zcu102? Is this for thi boards https://www.xilinx.com/products/boards-and-kits/ek-u1-zcu102-g.html ? If yes please describe its features and point the url at the end of commit log. On 03/02/22 14:44, Neal Frager wrote: > Signed-off-by: Neal Frager > --- > configs/zynqmp_zcu102_defconfig | 34 +++++++++++++++++++++++++++++++++ > 1 file changed, 34 insertions(+) > create mode 100644 configs/zynqmp_zcu102_defconfig > > diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig > new file mode 100644 > index 0000000000..5f98e72aaf > --- /dev/null > +++ b/configs/zynqmp_zcu102_defconfig > @@ -0,0 +1,34 @@ > +BR2_aarch64=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_GIT=y > +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2" > +BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" Here you need also: BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +# BR2_TARGET_ROOTFS_TAR is not set > +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v2.4" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_SPL=y > +BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" > +BR2_TARGET_UBOOT_ZYNQMP=y > +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/2021.2/bin/pmufw-v2021.2.bin" This ^^^ URL is unreachable and I've found this as substitution: https://github.com/lucaceresoli/zynqmp-pmufw-binaries/blob/v2021.2/bin/pmufw-v2021.2.bin Luca, is that the correct one? I've switched to v2021.2 tag and copied the link. > +BR2_TARGET_UBOOT_FORMAT_ITB=y > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_MTOOLS=y I've built with gitlab-CI, check this patch for the manual to reproduce: https://patchwork.ozlabs.org/project/buildroot/patch/20220203235438.610277-1-giulio.benetti at benettiengineering.com/ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y came out using the docker. Can anyone test it on real hardware? Luca maybe? For the rest it built correctly. Thank you! Best regards -- Giulio Benetti Benetti Engineering sas From giulio.benetti at benettiengineering.com Fri Feb 4 01:41:19 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 4 Feb 2022 02:41:19 +0100 Subject: [Buildroot] [PATCH 1/2] configs/zynqmp_zcu106: Bump ATF/U-Boot/Linux to Xilinx 2021.2 In-Reply-To: <20220203134402.1647985-1-neal.frager@xilinx.com> References: <20220203134402.1647985-1-neal.frager@xilinx.com> Message-ID: Hi Neal, On 03/02/22 14:44, Neal Frager wrote: > bump ATF to v2.4 > bump U-Boot to Xilinx 2021.2 (2021.01): important drivers not in mainline > bump Linux to Xilinx 2021.2 (5.10): important drivers not in mainline > deleted board/zynqmp/patches directory: already in mainline > modified board/zynqmp/genimage.cfg: U-Boot 2021.01 uses u-boot.itb format > bump configs/zynqmp_zcu106_defconfig to Xilinx 2021.2 Can you please improve the commit log like: ``` This patch: - bumps ATF to v2.4 - bumps U-Boot to Xilinx 2021.2 (2021.01): important drivers not in mainline - bumps Linux to Xilinx 2021.2 (5.10): important drivers not in mainline - deletes board/zynqmp/patches directory: already in mainline - modifies board/zynqmp/genimage.cfg: U-Boot 2021.01 uses u-boot.itb format - bumps configs/zynqmp_zcu106_defconfig to Xilinx 2021.2 ``` > Signed-off-by: Neal Frager > --- > board/zynqmp/genimage.cfg | 2 +- > ...-fix-Remove-GGC-ignore-Warray-bounds.patch | 68 ------- > ...64-zynqmp-zcu106-fix-SPL-MMC-booting.patch | 52 ------ > ...2-arm64-zynqmp-Enable-booting-to-ATF.patch | 114 ------------ > ...ept-an-absolute-path-for-PMUFW_INIT_.patch | 68 ------- > ...ynqmp-pass-the-PS-init-file-as-a-kco.patch | 175 ------------------ > board/zynqmp/readme.txt | 10 +- > configs/zynqmp_zcu106_defconfig | 14 +- > 8 files changed, 13 insertions(+), 490 deletions(-) > delete mode 100644 board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch > delete mode 100644 board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch > delete mode 100644 board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch > delete mode 100644 board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch > delete mode 100644 board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch > > diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg > index ed202f4550..58dc6d785d 100644 > --- a/board/zynqmp/genimage.cfg > +++ b/board/zynqmp/genimage.cfg > @@ -2,7 +2,7 @@ image boot.vfat { > vfat { > files = { > "boot.bin", > - "u-boot.bin", > + "u-boot.itb", > "atf-uboot.ub", > "system.dtb", > "Image" > diff --git a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch b/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch > deleted file mode 100644 > index 0c1a9ba2a4..0000000000 > --- a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch > +++ /dev/null > @@ -1,68 +0,0 @@ > -From da003e6ada7d0217fe99dc7c649a731f8ebd3c34 Mon Sep 17 00:00:00 2001 > -From: Deepika Bhavnani > -Date: Thu, 15 Aug 2019 00:56:46 +0300 > -Subject: [PATCH] Coverity fix: Remove GGC ignore -Warray-bounds > - > -GCC diagnostics were added to ignore array boundaries, instead > -of ignoring GCC warning current code will check for array boundaries > -and perform and array update only for valid elements. > - > -Resolves: `CID 246574` `CID 246710` `CID 246651` > - > -Signed-off-by: Deepika Bhavnani > -Change-Id: I7530ecf7a1707351c6ee87e90cc3d33574088f57 > - > -Backported from: 41af05154abe136938bcfb5f26c969933784bbef > -[Adapted to apply on 1.5] > - > ---- > - lib/psci/psci_common.c | 20 ++++++++++---------- > - 1 file changed, 10 insertions(+), 10 deletions(-) > - > -diff --git a/lib/psci/psci_common.c b/lib/psci/psci_common.c > -index 2220a745cd6e..6282d992a2f0 100644 > ---- a/lib/psci/psci_common.c > -+++ b/lib/psci/psci_common.c > -@@ -188,21 +188,17 @@ static unsigned int get_power_on_target_pwrlvl(void) > - /****************************************************************************** > - * Helper function to update the requested local power state array. This array > - * does not store the requested state for the CPU power level. Hence an > -- * assertion is added to prevent us from accessing the wrong index. > -+ * assertion is added to prevent us from accessing the CPU power level. > - *****************************************************************************/ > - static void psci_set_req_local_pwr_state(unsigned int pwrlvl, > - unsigned int cpu_idx, > - plat_local_state_t req_pwr_state) > - { > -- /* > -- * This should never happen, we have this here to avoid > -- * "array subscript is above array bounds" errors in GCC. > -- */ > - assert(pwrlvl > PSCI_CPU_PWR_LVL); > --#pragma GCC diagnostic push > --#pragma GCC diagnostic ignored "-Warray-bounds" > -- psci_req_local_pwr_states[pwrlvl - 1][cpu_idx] = req_pwr_state; > --#pragma GCC diagnostic pop > -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && > -+ (cpu_idx < PLATFORM_CORE_COUNT)) { > -+ psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx] = req_pwr_state; > -+ } > - } > - > - /****************************************************************************** > -@@ -228,7 +224,11 @@ static plat_local_state_t *psci_get_req_local_pwr_states(unsigned int pwrlvl, > - { > - assert(pwrlvl > PSCI_CPU_PWR_LVL); > - > -- return &psci_req_local_pwr_states[pwrlvl - 1][cpu_idx]; > -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && > -+ (cpu_idx < PLATFORM_CORE_COUNT)) { > -+ return &psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx]; > -+ } else > -+ return NULL; > - } > - > - /* > --- > -2.34.0 > - > diff --git a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch b/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch > deleted file mode 100644 > index 4d85e1bb12..0000000000 > --- a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch > +++ /dev/null > @@ -1,52 +0,0 @@ > -From e5d72ed8339eb05285448aad3c89d21e4d18fd29 Mon Sep 17 00:00:00 2001 > -From: Luca Ceresoli > -Date: Mon, 26 Feb 2018 09:40:34 +0100 > -Subject: [PATCH] arm64: zynqmp: zcu106: fix SPL MMC booting > - > -The U-Boot SPL generated with the current zcu106 defconfig cannot boot > -from MMC: > - > - [...] > - U-Boot SPL 2018.01 (Feb 21 2018 - 17:47:14) > - EL Level: EL3 > - Trying to boot from MMC1 > - sdhci_transfer_data: Error detected in status(0x408020)! > - spl_load_image_fat_os: error reading image u-boot.bin, err - -2 > - spl_load_image_fat: error reading image u-boot.img, err - -6 > - SPL: failed to boot from all boot devices > - ### ERROR ### Please RESET the board ### > - > -Fix by lowering the rpll value. The new value for the RPLL_CTRL > -register comes from the current psu_init_gpl.c from the HDF file at > -https://github.com/xilinx/hdf-examples/tree/01ad8ea5fd1989abf4ea5a072d019a16cb2bc546/zcu106-zynqmp > -(generated by Vivado v2017.4). > - > -RPLL and sdio1_ref clocks before and after this change: > - > - - Old values: RPLL 1.36 GHz, sdio1_ref 272 MHz > - - New values: RPLL 1.16 GHz, sdio1_ref 233 MHz > - > -Signed-off-by: Luca Ceresoli > -Cc: Michal Simek > -Upstream-status: accepted upstream in a different form > ---- > - > - board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c > -index 4d18abe000ca..e6fa477e53e7 100644 > ---- a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c > -+++ b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c > -@@ -10,7 +10,7 @@ > - static unsigned long psu_pll_init_data(void) > - { > - psu_mask_write(0xFF5E0034, 0xFE7FEDEFU, 0x7E4E2C62U); > -- psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00013C00U); > -+ psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00014600U); > - psu_mask_write(0xFF5E0030, 0x00000008U, 0x00000008U); > - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000001U); > - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000000U); > --- > -2.7.4 > - > diff --git a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch b/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch > deleted file mode 100644 > index 487fff6812..0000000000 > --- a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch > +++ /dev/null > @@ -1,114 +0,0 @@ > -From 5e3cac50cc981e01d9072241035a8d4162560c71 Mon Sep 17 00:00:00 2001 > -From: Luca Ceresoli > -Date: Mon, 12 Mar 2018 17:18:38 +0100 > -Subject: [PATCH] arm64: zynqmp: Enable booting to ATF > - > -U-Boot is now able to boot to ARM Trusted Firmware (ATF). The boot > -flow is SPL(EL3) loads ATF and full u-boot and jump to ATF(EL3) which > -pass control to full u-boot(EL2). This has been tested on zcu106, so > -enable it in this defconfig. > - > -To generate an image that triggers this booting flow, you need to pass > -'-O arm-trusted-firmware' to mkimage. > - > -Signed-off-by: Luca Ceresoli > -Signed-off-by: Michal Simek > -Backported from upstream: http://git.denx.de/?p=u-boot.git;a=commit;h=5e3cac50cc981e01d9072241035a8d4162560c71 > ---- > - > - configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 + > - configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 + > - configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 + > - configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 + > - configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 1 + > - configs/xilinx_zynqmp_zcu102_revA_defconfig | 1 + > - configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 + > - 7 files changed, 7 insertions(+) > - > -diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig > -index c5bfa2b12638..488c72258b0e 100644 > ---- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig > -+++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig > -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_FASTBOOT=y > - CONFIG_FASTBOOT_FLASH=y > -diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig > -index f86dce403a42..5d501eec0edd 100644 > ---- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig > -+++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig > -@@ -20,6 +20,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_FASTBOOT=y > - CONFIG_FASTBOOT_FLASH=y > -diff --git a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig > -index 6e947cf56827..6f7eaebd7676 100644 > ---- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig > -+++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig > -@@ -16,6 +16,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_CMD_MEMTEST=y > - CONFIG_SYS_ALT_MEMTEST=y > -diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig > -index 1c934858c61c..7a3806cba4b5 100644 > ---- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig > -+++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig > -@@ -17,6 +17,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_CMD_MEMTEST=y > - CONFIG_SYS_ALT_MEMTEST=y > -diff --git a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig > -index e13c7c56f310..e4408f182ca0 100644 > ---- a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig > -+++ b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig > -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_FASTBOOT=y > - CONFIG_FASTBOOT_FLASH=y > -diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig b/configs/xilinx_zynqmp_zcu102_revA_defconfig > -index 5b2cd495ee85..b52f6789fd4b 100644 > ---- a/configs/xilinx_zynqmp_zcu102_revA_defconfig > -+++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig > -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_FASTBOOT=y > - CONFIG_FASTBOOT_FLASH=y > -diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig > -index e6530fbfe7ff..80592554f682 100644 > ---- a/configs/xilinx_zynqmp_zcu102_revB_defconfig > -+++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig > -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_FASTBOOT=y > - CONFIG_FASTBOOT_FLASH=y > --- > -2.7.4 > - > diff --git a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch b/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch > deleted file mode 100644 > index 95ab7b3b75..0000000000 > --- a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch > +++ /dev/null > @@ -1,68 +0,0 @@ > -From c7df098a71e05dc81cee818747759e8060b59626 Mon Sep 17 00:00:00 2001 > -From: Luca Ceresoli > -Date: Mon, 4 Jun 2018 12:21:01 +0200 > -Subject: [PATCH] arm64: zynqmp: accept an absolute path for PMUFW_INIT_FILE > - > -The value of PMUFW_INIT_FILE is prefixed with "$(srctree)/", thus > -forcing it to be a relative path inside the U-Boot source tree. Since > -the PMUFW is a binary file generated outside of U-Boot, the PMUFW > -binary must be copied inside the U-Boot source tree before the > -build. > - > -This generates a few problems: > - > - * if the source tree is shared among different out-of-tree builds, > - they will pollute (and potentially corrupt) each other > - * the source tree cannot be read-only > - * any buildsystem must add a command to copy the PMUFW binary > - * putting an externally-generated binary in the source tree is ugly > - as hell > - > -Avoid these problems by accepting an absolute path for > -PMUFW_INIT_FILE. This would be as simple as removing the "$(srctree)/" > -prefix, but in order to keep backward compatibility we rather use the > -shell and readlink to get the absolute path even when starting from a > -relative path. > - > -Since 'readlink -f' produces an empty string if the file does not > -exist, we also add a check to ensure the file configured in > -PMUFW_INIT_FILE exists. Otherwise the build would exit successfully, > -but produce a boot.bin without PMUFW as if PMUFW_INIT_FILE were empty. > - > -Tested in the 12 possible combinations of: > - - PMUFW_INIT_FILE empty, relative, absolute, non-existing > - - building in-tree, in subdir, in other directory > - > -Signed-off-by: Luca Ceresoli > -Cc: Michal Simek > -Cc: Simon Glass > -Cc: Emmanuel Vadot > -Signed-off-by: Michal Simek > -Backported from upstream: https://git.denx.de/?p=u-boot.git;a=commit;h=c7df098a71e05dc81cee818747759e8060b59626 > ---- > - scripts/Makefile.spl | 8 +++++++- > - 1 file changed, 7 insertions(+), 1 deletion(-) > - > -diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl > -index ef018b5b4056..252f13826d4c 100644 > ---- a/scripts/Makefile.spl > -+++ b/scripts/Makefile.spl > -@@ -167,8 +167,14 @@ ifdef CONFIG_ARCH_ZYNQ > - MKIMAGEFLAGS_boot.bin = -T zynqimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) > - endif > - ifdef CONFIG_ARCH_ZYNQMP > -+ifneq ($(CONFIG_PMUFW_INIT_FILE),"") > -+spl/boot.bin: zynqmp-check-pmufw > -+zynqmp-check-pmufw: FORCE > -+ ( cd $(srctree) && test -r $(CONFIG_PMUFW_INIT_FILE) ) \ > -+ || ( echo "Cannot read $(CONFIG_PMUFW_INIT_FILE)" && false ) > -+endif > - MKIMAGEFLAGS_boot.bin = -T zynqmpimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) \ > -- -n $(srctree)/$(CONFIG_PMUFW_INIT_FILE) > -+ -n "$(shell cd $(srctree); readlink -f $(CONFIG_PMUFW_INIT_FILE))" > - endif > - > - spl/boot.bin: $(obj)/u-boot-spl.bin FORCE > --- > -2.7.4 > - > diff --git a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch b/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch > deleted file mode 100644 > index b32e162780..0000000000 > --- a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch > +++ /dev/null > @@ -1,175 +0,0 @@ > -From 4c9d54ab5a41d65000c8d249b6fb1b76056f1812 Mon Sep 17 00:00:00 2001 > -From: Luca Ceresoli > -Date: Wed, 20 Jun 2018 12:11:50 +0200 > -Subject: [PATCH] arm/arm64: zynq/zynqmp: pass the PS init file as a kconfig > - variable > - > -U-Boot needs to link ps7_init_gpl.c on Zynq or psu_init_gpl.c on > -ZynqMP (PS init for short). The current logic to locate this file for > -both platforms is: > - > - 1. if a board-specific file exists in > - board/xilinx/zynq[mp]/$(CONFIG_DEFAULT_DEVICE_TREE)/ps?_init_gpl.c > - then use it > - 2. otherwise use board/xilinx/zynq/ps?_init_gpl.c > - > -In the latter case the file does not exist in the U-Boot sources and > -must be copied in the source tree from the outside before starting the > -build. This is typical when it is generated from Xilinx tools while > -developing a custom hardware. However making sure that a > -board-specific file is _not_ found (and used) requires some trickery > -such as removing or overwriting all PS init files (e.g.: the current > -meta-xilinx yocto layer [0]). > - > -This generates a few problems: > - > - * if the source tree is shared among different out-of-tree builds, > - they will pollute (and potentially corrupt) each other > - * the source tree cannot be read-only > - * any buildsystem must add a command to copy the PS init file binary > - * overwriting or deleting files in the source tree is ugly as hell > - > -Simplify usage by allowing to pass the path to the desired PS init > -file in kconfig variable XILINX_PS_INIT_FILE. It can be an absolute > -path or relative to $(srctree). If the variable is set, the > -user-specified file will always be used without being copied > -around. If the the variable is left empty, for backward compatibility > -fall back to the old behaviour. > - > -Since the issue is the same for Zynq and ZynqMP, add one kconfig > -variable in a common place and use it for both. > - > -Also use the new kconfig help text to document all the ways to give > -U-Boot the PS init file. > - > -Build-tested with all combinations of: > - - platform: zynq or zynqmp > - - PS init file: from XILINX_PS_INIT_FILE (absolute, relative path, > - non-existing), in-tree board-specific, in board/xilinx/zynq[mp]/ > - - building in-tree, in subdir, in other directory > - > -[0] https://github.com/Xilinx/meta-xilinx/blob/b2f74cc7fe5c4881589d5e440a17cb51fc66a7ab/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init.inc#L9 > - > -Signed-off-by: Luca Ceresoli > -Cc: Albert Aribaud > -Cc: Michal Simek > -Cc: Nathan Rossi > -Backported from upstream: https://git.denx.de/?p=u-boot.git;a=commit;h=6da4f67ad09cd8b311d77b2b04e557b7ef65b56c > ---- > - arch/arm/Kconfig | 1 + > - board/xilinx/Kconfig | 41 +++++++++++++++++++++++++++++++++++++++++ > - board/xilinx/zynq/Makefile | 10 +++++++++- > - board/xilinx/zynqmp/Makefile | 10 +++++++++- > - 4 files changed, 60 insertions(+), 2 deletions(-) > - create mode 100644 board/xilinx/Kconfig > - > -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig > -index 22234cde2ab6..e04979d0ef7e 100644 > ---- a/arch/arm/Kconfig > -+++ b/arch/arm/Kconfig > -@@ -1293,4 +1293,5 @@ source "board/technologic/ts4600/Kconfig" > - source "board/vscom/baltos/Kconfig" > - source "board/woodburn/Kconfig" > - source "board/work-microwave/work_92105/Kconfig" > -+source "board/xilinx/Kconfig" > - source "board/zipitz2/Kconfig" > - > - source "arch/arm/Kconfig.debug" > -diff --git a/board/xilinx/Kconfig b/board/xilinx/Kconfig > -new file mode 100644 > -index 000000000000..aa3fa061edef > ---- /dev/null > -+++ b/board/xilinx/Kconfig > -@@ -0,0 +1,41 @@ > -+# Copyright (c) 2018, Luca Ceresoli > -+# > -+# SPDX-License-Identifier: GPL-2.0 > -+ > -+if ARCH_ZYNQ || ARCH_ZYNQMP > -+ > -+config XILINX_PS_INIT_FILE > -+ string "Zynq/ZynqMP PS init file(s) location" > -+ help > -+ On Zynq and ZynqMP U-Boot SPL (or U-Boot proper if > -+ ZYNQMP_PSU_INIT_ENABLED is set) is responsible for some > -+ basic initializations, such as enabling peripherals and > -+ configuring pinmuxes. The PS init file (called > -+ psu_init_gpl.c on ZynqMP, ps7_init_gpl.c for Zynq-7000) > -+ contains the code for such initializations. > -+ > -+ U-Boot contains PS init files for some boards, but each of > -+ them describes only one specific configuration. Users of a > -+ different board, or needing a different configuration, can > -+ generate custom files using the Xilinx development tools. > -+ > -+ There are three ways to give a PS init file to U-Boot: > -+ > -+ 1. Set this variable to the path, either relative to the > -+ source tree or absolute, where the psu_init_gpl.c or > -+ ps7_init_gpl.c file is located. U-Boot will build this > -+ file. > -+ > -+ 2. If you leave an empty string here, U-Boot will use > -+ board/xilinx/zynq/$(CONFIG_DEFAULT_DEVICE_TREE)/ps7_init_gpl.c > -+ for Zynq-7000, or > -+ board/xilinx/zynqmp/$(CONFIG_DEFAULT_DEVICE_TREE)/psu_init_gpl.c > -+ for ZynqMP. > -+ > -+ 3. If the above file does not exist, U-Boot will use > -+ board/xilinx/zynq/ps7_init_gpl.c for Zynq-7000, or > -+ board/xilinx/zynqmp/psu_init_gpl.c for ZynqMP. This file > -+ is not provided by U-Boot, you have to copy it there > -+ before the build. > -+ > -+endif > -diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile > -index 5a76a26720cd..03ad5f0532ee 100644 > ---- a/board/xilinx/zynq/Makefile > -+++ b/board/xilinx/zynq/Makefile > -@@ -5,10 +5,18 @@ > - > - obj-y := board.o > - > --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) > -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") > -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE)) > -+init-objs := ps_init_gpl.o > -+spl/board/xilinx/zynq/ps_init_gpl.o board/xilinx/zynq/ps_init_gpl.o: $(PS_INIT_FILE) > -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ > -+endif > - > -+ifeq ($(init-objs),) > -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) > - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/ps7_init_gpl.c),\ > - $(hw-platform-y)/ps7_init_gpl.o) > -+endif > - > - ifeq ($(init-objs),) > - ifneq ($(wildcard $(srctree)/$(src)/ps7_init_gpl.c),) > -diff --git a/board/xilinx/zynqmp/Makefile b/board/xilinx/zynqmp/Makefile > -index 05ccd25dcef3..960b81fc5853 100644 > ---- a/board/xilinx/zynqmp/Makefile > -+++ b/board/xilinx/zynqmp/Makefile > -@@ -5,10 +5,18 @@ > - > - obj-y := zynqmp.o > - > --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) > -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") > -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE)) > -+init-objs := ps_init_gpl.o > -+spl/board/xilinx/zynqmp/ps_init_gpl.o board/xilinx/zynqmp/ps_init_gpl.o: $(PS_INIT_FILE) > -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ > -+endif > - > -+ifeq ($(init-objs),) > -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) > - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/psu_init_gpl.c),\ > - $(hw-platform-y)/psu_init_gpl.o) > -+endif > - > - ifeq ($(init-objs),) > - ifneq ($(wildcard $(srctree)/$(src)/psu_init_gpl.c),) > --- > -2.7.4 > - > diff --git a/board/zynqmp/readme.txt b/board/zynqmp/readme.txt > index da37f4ccc9..9755f182ae 100644 > --- a/board/zynqmp/readme.txt > +++ b/board/zynqmp/readme.txt > @@ -1,10 +1,10 @@ > ******************************** > -Xilinx ZCU106 board - ZynqMP SoC > +Xilinx ZCU102 / ZCU106 boards - ZynqMP SoC > ******************************** > > -This document describes the Buildroot support for the ZCU106 board by > -Xilinx, based on the Zynq UltraScale+ MPSoC (aka ZynqMP). It has been > -tested with the EK-U1-ZCU106-ES2 pre-production board. > +This document describes the Buildroot support for the ZCU102 and ZCU106 > +boards by Xilinx, based on the Zynq UltraScale+ MPSoC (aka ZynqMP). > +It has been tested with the ZCU102 and ZCU106 production boards. > > How to build it > =============== > @@ -32,7 +32,7 @@ After building, you should get a tree like this: > +-- rootfs.ext4 -> rootfs.ext2 > +-- sdcard.img > +-- system.dtb -> zynqmp-zcu106-revA.dtb > - +-- u-boot.bin > + +-- u-boot.itb > `-- zynqmp-zcu106-revA.dtb > > How to write the SD card > diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig > index bee7c1daf7..34b3d89ffb 100644 > --- a/configs/zynqmp_zcu106_defconfig > +++ b/configs/zynqmp_zcu106_defconfig > @@ -1,11 +1,10 @@ > BR2_aarch64=y > -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_GIT=y > BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" > -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" Here you need also: BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > @@ -15,20 +14,21 @@ BR2_TARGET_ROOTFS_EXT2_4=y > BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y > BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v2.4" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" > -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7" > -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA" > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" > BR2_TARGET_UBOOT_NEEDS_DTC=y > BR2_TARGET_UBOOT_SPL=y > BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" > BR2_TARGET_UBOOT_ZYNQMP=y > -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/53fdb7b6c92860ceb0ec5fd14deee302f4a84269/bin/pmufw-zcu106-default-v2017.4.bin" > +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/2021.2/bin/pmufw-v2021.2.bin" This ^^^ URL is unreachable and I've found this as substitution: https://github.com/lucaceresoli/zynqmp-pmufw-binaries/blob/v2021.2/bin/pmufw-v2021.2.bin Luca, is that the correct one? I've switched to v2021.2 tag and copied the link. > +BR2_TARGET_UBOOT_FORMAT_ITB=y > BR2_PACKAGE_HOST_DOSFSTOOLS=y > BR2_PACKAGE_HOST_GENIMAGE=y > BR2_PACKAGE_HOST_MTOOLS=y I've built with gitlab-CI, check this patch for the manual to reproduce: https://patchwork.ozlabs.org/project/buildroot/patch/20220203235438.610277-1-giulio.benetti at benettiengineering.com/ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y came out using the docker. Can also anyone test it on real hardware? Luca maybe? For the rest it built correctly. Thank you! Best regards -- Giulio Benetti Benetti Engineering sas From thomas.petazzoni at bootlin.com Fri Feb 4 06:57:13 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 04 Feb 2022 06:57:13 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-02-03 Message-ID: <20220204065718.DE184401FB@smtp2.osuosl.org> Hello, Autobuild statistics for 2022-02-03 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 58 | 6 | 0 | 64 | 2021.11.x | 22 | 1 | 0 | 23 | master | 66 | 55 | 0 | 121 | Classification of failures by reason for master ----------------------------------------------- host-libselinux-3.3 | 10 python-aiohttp-3.8.1 | 8 i2c-tools-4.3 | 7 libselinux-3.3 | 5 guile-3.0.7 | 3 host-python-docutils-0.15.2 | 2 python-argon2-cffi-bindings... | 2 rygel-0.40.2 | 2 apcupsd-3.14.14 | 1 bat-0.18.3 | 1 bluez5_utils-5.63 | 1 libblockdev-2.25 | 1 libglvnd-1.3.2 | 1 mongrel2-1.13.0 | 1 opencv4-4.5.5 | 1 perl-5.34.0 | 1 pulseview-0.4.2 | 1 python-augeas-1.1.0 | 1 python-brotli-1.0.9 | 1 python-bsdiff4-1.2.1 | 1 python-cchardet-2.1.7 | 1 python-docutils-0.15.2 | 1 python-pydantic-1.8.2 | 1 util-linux-2.37.3 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sparc | apcupsd-3.14.14 | NOK | http://autobuild.buildroot.net/results/0543be638c356109539f574137439577c8aa834b | arm | bat-0.18.3 | NOK | http://autobuild.buildroot.net/results/a1bf3226bc95574bd7c7d5aa4014e86b103f3343 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/cc2b5c51742119458011c396474b61da6a601630 | riscv32 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/c1df00e611fe41d9d55b326dee84036a74f40f05 | ORPH sparc64 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/41ffaedf8d52332fda2b6f8a6cec227858dfeb07 | ORPH arm | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/7ffb21d95eb91040ca0f243969aaa90e42655bae | ORPH arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/710590c1e7e0ca062c6f684c288fcd92918aa2ec | aarch64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/63e8ef18976295566b7677de7fbf58e6f1182d50 | sparc64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/99c24216636cff241ee8248ff38adf5d48c97bb6 | mips64el | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/59a95285ad56a1dfc944412eb43af8b75e27cee8 | mipsel | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/39dd8b703bf14c5014764dd70b907dd29737065c | riscv32 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/50397f9a1f637f0f8fe53e691798de7d2a49469e | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/49003a72bc4c52160122ae3e80f6cbd66a17a144 | aarch64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/ee5eb3bf2525968fd957f02b6013abcb5138f3af | aarch64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/5c54193986933fccab3858781beb635a6a970945 | sparc64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/09589fdcc4994155d2138c52075c7a05fe2bdabc | powerpc | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/f24e332688cb1118c8d28343f424d0ce1c78f7a8 | m68k | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/0e28933572a037d94af7df7499935b93adec70aa | or1k | i2c-tools-4.3 | NOK | http://autobuild.buildroot.net/results/4de907565a65693a6252c504510b541d8f2af496 | mips64el | i2c-tools-4.3 | NOK | http://autobuild.buildroot.net/results/40cff94b5c912067b131a3f68452d29417c1f9da | arc | i2c-tools-4.3 | NOK | http://autobuild.buildroot.net/results/ec5838614ee2efcdc94615e7ada3581be40b1a87 | arc | i2c-tools-4.3 | NOK | http://autobuild.buildroot.net/results/aeba166da336ad0e60cb28f27d4468e1ceecddad | nios2 | i2c-tools-4.3 | NOK | http://autobuild.buildroot.net/results/b9794e514abcc5c1b1711aa09bd5e5d5469dcacb | riscv64 | i2c-tools-4.3 | NOK | http://autobuild.buildroot.net/results/c7c6c7a45d556fd7fe1909c7312dbc94de2509d9 | m68k | i2c-tools-4.3 | NOK | http://autobuild.buildroot.net/results/a6501743e68406e0969eca510c5c978c9a299b01 | riscv64 | libblockdev-2.25 | NOK | http://autobuild.buildroot.net/results/e4b12c5abb38c0c35d76c12af676c94cb74bdc06 | ORPH arm | libglvnd-1.3.2 | NOK | http://autobuild.buildroot.net/results/28283b5c035ab7860e274ac9eeed8c65d5541618 | ORPH powerpc | libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/1192a9b95367dafaecb96d11bdfbe2661db30a08 | mips | libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/4e8c9f388dec36a7737a235f9aa9dc01734bff5e | mipsel | libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/c87d018e16f186e4afe50fec12aa767a08ef7bb9 | powerpc64 | libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/a2f8b6ed6348a76b8597edc2ed181bfdfd990fdc | m68k | libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/4ec36f0b91630377ca8c057de1ea5ec151c0d05e | mips64el | mongrel2-1.13.0 | NOK | http://autobuild.buildroot.net/results/8fcf9e650e7ba15c6ae8c4b08d52a89c87117574 | powerpc | opencv4-4.5.5 | NOK | http://autobuild.buildroot.net/results/1aabbec245cb7a8d144190c803bccec52a0277eb | powerpc | perl-5.34.0 | NOK | http://autobuild.buildroot.net/results/edb8ef198a5755802c6c32408833096b59d0bbbd | aarch64 | pulseview-0.4.2 | NOK | http://autobuild.buildroot.net/results/78364c6f7950fea1a765c3d5654fca62116aa15e | arc | python-aiohttp-3.8.1 | NOK | http://autobuild.buildroot.net/results/8f6edf4f6ecd2fd1f1dc16312ba70bf85c774d9c | nios2 | python-aiohttp-3.8.1 | NOK | http://autobuild.buildroot.net/results/bf03a028b650e5a166a816936eaa994c37776646 | powerpc64 | python-aiohttp-3.8.1 | NOK | http://autobuild.buildroot.net/results/d85b00cf7847486950b1faddfe2ca78aa759be72 | arc | python-aiohttp-3.8.1 | NOK | http://autobuild.buildroot.net/results/982259958e7dcfffbecf2d184d383f9b4f7a6f14 | sh4 | python-aiohttp-3.8.1 | NOK | http://autobuild.buildroot.net/results/ee1b2a45d704a3e46ac5da8ddff3261af46b666f | arm | python-aiohttp-3.8.1 | NOK | http://autobuild.buildroot.net/results/a9d4292b755deebecc17117385492262caf9e456 | powerpc | python-aiohttp-3.8.1 | NOK | http://autobuild.buildroot.net/results/edb212f98d3d3bace75bad814288f84220d00aa7 | arm | python-aiohttp-3.8.1 | NOK | http://autobuild.buildroot.net/results/c8fca3c380befb6e55c65a2942c7dc65522c94a9 | arm | python-argon2-cffi-bindings... | NOK | http://autobuild.buildroot.net/results/83b2551452a04a701e013dfad5cbd901c569d032 | arm | python-argon2-cffi-bindings... | NOK | http://autobuild.buildroot.net/results/2b270c75d07ae4a9985bd4b8ee9b3bb3d865d9df | xtensa | python-augeas-1.1.0 | NOK | http://autobuild.buildroot.net/results/82847ea138cbd6901755c96da884e5fa5b034c83 | i686 | python-brotli-1.0.9 | NOK | http://autobuild.buildroot.net/results/9eec4ac69e651d85b6a63c32ba0b65d24301a885 | i586 | python-bsdiff4-1.2.1 | NOK | http://autobuild.buildroot.net/results/f5cc863dc47328e501961a7451d296dbcd7470bb | mipsel | python-cchardet-2.1.7 | NOK | http://autobuild.buildroot.net/results/83df94d1e1dd67e5394bcffa26653841582de772 | s390x | python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/11d901c18f1941cccb7195e9bd1f9c04ee9ec2fd | sparc64 | python-pydantic-1.8.2 | NOK | http://autobuild.buildroot.net/results/b51f5ceea663d39ee26256a60239192eabc9dddb | powerpc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/83ca6359def05e543f91f129f6c446d611e27df3 | sh4 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/9d3c41a4e4ba43e25226fb2293543de505189d23 | arc | util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/dcc94d8ee57e2d7c26b5202ce858350fe7593b9d | ORPH Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 3 ndisc6-1.0.4 | 1 unknown | 1 zeromq-4.3.4 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- powerpc | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/73066150cb054431ff115060f1699d4b8b180241 | microblazeel | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/4ca648754fbf09b3cc87ca951639821e3b0bf738 | sparc64 | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/5e6da7fdf89ba18b48e6b8e31a4e1750594cebfb | arm | ndisc6-1.0.4 | NOK | http://autobuild.buildroot.net/results/2c4832b524333579598eb9ec79995ca61878621c | ORPH arm | unknown | NOK | http://autobuild.buildroot.net/results/02cadf1bfe3eb779f26d37104569d02e504bb60f | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/a070424be878048f4ccc958906f58fa5ab1995a5 | Classification of failures by reason for 2021.11.x -------------------------------------------------- unknown | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- nios2 | unknown | NOK | http://autobuild.buildroot.net/results/2589adecb9bfa3dd4f5aed4ca40f1f4ee5ed463d | -- http://autobuild.buildroot.net From nealf at xilinx.com Fri Feb 4 07:09:18 2022 From: nealf at xilinx.com (Neal Frager) Date: Fri, 4 Feb 2022 07:09:18 +0000 Subject: [Buildroot] [PATCH 2/2] Add configs/zynqmp_zcu102_defconfig In-Reply-To: <80d97a22-5159-3111-75a3-9286e4776385@benettiengineering.com> References: <20220203134402.1647985-1-neal.frager@xilinx.com> <20220203134402.1647985-2-neal.frager@xilinx.com> <80d97a22-5159-3111-75a3-9286e4776385@benettiengineering.com> Message-ID: Hi Giulio, > Hi Neal, > can you please improve commit log doing a presentation of what is zynqmp_zcu102? > Is this for thi boards > https://www.xilinx.com/products/boards-and-kits/ek-u1-zcu102-g.html ? > If yes please describe its features and point the url at the end of commit log. Yes, no problem. I will add the url that describes the board to the commit log. On 03/02/22 14:44, Neal Frager wrote: > Signed-off-by: Neal Frager > --- > configs/zynqmp_zcu102_defconfig | 34 +++++++++++++++++++++++++++++++++ > 1 file changed, 34 insertions(+) > create mode 100644 configs/zynqmp_zcu102_defconfig > > diff --git a/configs/zynqmp_zcu102_defconfig > b/configs/zynqmp_zcu102_defconfig new file mode 100644 index > 0000000000..5f98e72aaf > --- /dev/null > +++ b/configs/zynqmp_zcu102_defconfig > @@ -0,0 +1,34 @@ > +BR2_aarch64=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_GIT=y > +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2" > +BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" > Here you need also: > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y Thanks for making me aware of this. I will add it to both defconfigs. > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +# BR2_TARGET_ROOTFS_TAR is not set > +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v2.4" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_SPL=y > +BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" > +BR2_TARGET_UBOOT_ZYNQMP=y > +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/2021.2/bin/pmufw-v2021.2.bin" > This ^^^ URL is unreachable and I've found this as substitution: > https://github.com/lucaceresoli/zynqmp-pmufw-binaries/blob/v2021.2/bin/pmufw-v2021.2.bin > Luca, is that the correct one? I've switched to v2021.2 tag and copied the link. Sorry about this one. I was balancing a couple too many versions of my defconfig files and this typo slipped through the cracks. I have corrected it in both defconfigs for the next version of the patch. > +BR2_TARGET_UBOOT_FORMAT_ITB=y > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_MTOOLS=y > I've built with gitlab-CI, check this patch for the manual to reproduce: > https://patchwork.ozlabs.org/project/buildroot/patch/20220203235438.610277-1-giulio.benetti at benettiengineering.com/ > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y came out using the docker. > Can anyone test it on real hardware? Luca maybe? Regarding the board test, there is one thing still missing. U-Boot 2021.01 uses distro boot, so for U-Boot to properly boot the Linux kernel and rootfs, a boot.scr file needs to be in the boot partition of the SD card. I have been getting it to work by manually adding this file to the SD card image after the build. But a better way would be that this file is already included with the genimage.cfg. How does buildroot typically handle U-Boot boot.scr files? I would be happy to add this to the automated build process, but I do not wish to re-invent the wheel. > For the rest it built correctly. > Thank you! > Best regards > -- > Giulio Benetti > Benetti Engineering sas Thank you for your thorough review and feedback. Best regards, Neal Frager neal.frager at xilinx.com Xilinx From ps.report at gmx.net Fri Feb 4 07:51:00 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 4 Feb 2022 08:51:00 +0100 Subject: [Buildroot] qt5webengine build failure on gitlab-CI In-Reply-To: <1662cf67-b9ef-33be-c5c4-5d5e786f944a@benettiengineering.com> References: <1662cf67-b9ef-33be-c5c4-5d5e786f944a@benettiengineering.com> Message-ID: <20220204085100.77deaeb8@gmx.net> Hello Giulio, On Fri, 4 Feb 2022 02:03:48 +0100, Giulio Benetti wrote: > Hi Peter and James, > > I can fix this build failure[1] due to qt5webengine, you're the experts > here, can you take a look please? > > You have to build using official docker as I've described in this patch > for the manual: > https://patchwork.ozlabs.org/project/buildroot/patch/20220203235438.610277-1-giulio.benetti at benettiengineering.com/ > > I've tried this patch: > https://patchwork.ozlabs.org/project/buildroot/patch/20220117114358.3814200-1-james.hilliard1 at gmail.com/ > but it didn't help :-/ See [2], [3] and [4].... Regards, Peter [2] http://lists.busybox.net/pipermail/buildroot/2020-December/601542.html [3] http://lists.busybox.net/pipermail/buildroot/2021-January/301496.html [4] http://lists.busybox.net/pipermail/buildroot/2022-January/633204.html > > Thanks in advance! > > [1]: https://gitlab.com/buildroot.org/buildroot/-/jobs/1929717230 > > Best regards From james.hilliard1 at gmail.com Fri Feb 4 08:52:41 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 4 Feb 2022 01:52:41 -0700 Subject: [Buildroot] qt5webengine build failure on gitlab-CI In-Reply-To: <1662cf67-b9ef-33be-c5c4-5d5e786f944a@benettiengineering.com> References: <1662cf67-b9ef-33be-c5c4-5d5e786f944a@benettiengineering.com> Message-ID: On Thu, Feb 3, 2022 at 6:03 PM Giulio Benetti wrote: > > Hi Peter and James, > > I can fix this build failure[1] due to qt5webengine, you're the experts > here, can you take a look please? > > You have to build using official docker as I've described in this patch > for the manual: > https://patchwork.ozlabs.org/project/buildroot/patch/20220203235438.610277-1-giulio.benetti at benettiengineering.com/ > > I've tried this patch: > https://patchwork.ozlabs.org/project/buildroot/patch/20220117114358.3814200-1-james.hilliard1 at gmail.com/ > but it didn't help :-/ I've got a WIP branch that should hopefully fix this and a bunch of related issues, cleaning it up at the moment: https://github.com/buildroot/buildroot/compare/master...jameshilliard:qt5webengine-kde > > Thanks in advance! > > [1]: https://gitlab.com/buildroot.org/buildroot/-/jobs/1929717230 > > Best regards > -- > Giulio Benetti > Benetti Engineering sas From giulio.benetti at benettiengineering.com Fri Feb 4 10:13:54 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 4 Feb 2022 11:13:54 +0100 Subject: [Buildroot] [PATCH 2/2] Add configs/zynqmp_zcu102_defconfig In-Reply-To: References: <20220203134402.1647985-1-neal.frager@xilinx.com> <20220203134402.1647985-2-neal.frager@xilinx.com> <80d97a22-5159-3111-75a3-9286e4776385@benettiengineering.com> Message-ID: <2b671b31-5f2e-e3f1-b365-e5f2be2ca4fc@benettiengineering.com> Hi Neal, On 04/02/22 08:09, Neal Frager wrote: > Hi Giulio, > >> Hi Neal, > >> can you please improve commit log doing a presentation of what is zynqmp_zcu102? > >> Is this for thi boards >> https://www.xilinx.com/products/boards-and-kits/ek-u1-zcu102-g.html ? > >> If yes please describe its features and point the url at the end of commit log. > > Yes, no problem. I will add the url that describes the board to the commit log. > > On 03/02/22 14:44, Neal Frager wrote: >> Signed-off-by: Neal Frager >> --- >> configs/zynqmp_zcu102_defconfig | 34 +++++++++++++++++++++++++++++++++ >> 1 file changed, 34 insertions(+) >> create mode 100644 configs/zynqmp_zcu102_defconfig >> >> diff --git a/configs/zynqmp_zcu102_defconfig >> b/configs/zynqmp_zcu102_defconfig new file mode 100644 index >> 0000000000..5f98e72aaf >> --- /dev/null >> +++ b/configs/zynqmp_zcu102_defconfig >> @@ -0,0 +1,34 @@ >> +BR2_aarch64=y >> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y >> +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" >> +BR2_LINUX_KERNEL=y >> +BR2_LINUX_KERNEL_CUSTOM_GIT=y >> +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" >> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2" >> +BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" >> +BR2_LINUX_KERNEL_DTS_SUPPORT=y >> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" > >> Here you need also: >> BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > > Thanks for making me aware of this. I will add it to both defconfigs. > >> +BR2_TARGET_ROOTFS_EXT2=y >> +BR2_TARGET_ROOTFS_EXT2_4=y >> +# BR2_TARGET_ROOTFS_TAR is not set >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v2.4" >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" >> +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2" >> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" >> +BR2_TARGET_UBOOT_NEEDS_DTC=y >> +BR2_TARGET_UBOOT_SPL=y >> +BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" >> +BR2_TARGET_UBOOT_ZYNQMP=y >> +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/2021.2/bin/pmufw-v2021.2.bin" > >> This ^^^ URL is unreachable and I've found this as substitution: >> https://github.com/lucaceresoli/zynqmp-pmufw-binaries/blob/v2021.2/bin/pmufw-v2021.2.bin > >> Luca, is that the correct one? I've switched to v2021.2 tag and copied the link. > > Sorry about this one. I was balancing a couple too many versions of my defconfig files and this typo slipped through the cracks. I have corrected it in both defconfigs for the next version of the patch. > >> +BR2_TARGET_UBOOT_FORMAT_ITB=y >> +BR2_PACKAGE_HOST_DOSFSTOOLS=y >> +BR2_PACKAGE_HOST_GENIMAGE=y >> +BR2_PACKAGE_HOST_MTOOLS=y > >> I've built with gitlab-CI, check this patch for the manual to reproduce: >> https://patchwork.ozlabs.org/project/buildroot/patch/20220203235438.610277-1-giulio.benetti at benettiengineering.com/ > >> BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y came out using the docker. > >> Can anyone test it on real hardware? Luca maybe? > > Regarding the board test, there is one thing still missing. U-Boot 2021.01 uses distro boot, so for U-Boot to properly boot the Linux kernel and rootfs, a boot.scr file needs to be in the boot partition of the SD card. I have been getting it to work by manually adding this file to the SD card image after the build. But a better way would be that this file is already included with the genimage.cfg. How does buildroot typically handle U-Boot boot.scr files? I would be happy to add this to the automated build process, but I do not wish to re-invent the wheel. Lately a lot of extlinux.conf has been used instead of boot.scr, so you could go for something like this: https://git.buildroot.net/buildroot/tree/board/stmicroelectronics/stm32mp157c-dk2/overlay/boot/extlinux/extlinux.conf and point to it in board defconfig. Best regards -- Giulio Benetti Benetti Engineering sas From a.marud at post.pl Fri Feb 4 10:22:11 2022 From: a.marud at post.pl (Arek Marud) Date: Fri, 4 Feb 2022 11:22:11 +0100 Subject: [Buildroot] I have a problem adding new package In-Reply-To: <20220130234800.14da56ca@windsurf> References: <20220130234800.14da56ca@windsurf> Message-ID: Helo Thomas, Thank you for your answer. I had a problem with libonvif compilation. Compiler complaing about unsafe include path (details pasted below). I was able to compile project ONLY when --includedir parameter was set, without it - compiler complains about include path. https://gist.github.com/arekmd/11e9621ae3fc476cf37e80150d15b177 I pasted build log without LIBONVIF_CONF_OPTS line. myname buildroot$> make libonvif-build WARNING: no hash file for v1.1.1.tar.gz >>> libonvif 1.1.1 Extracting gzip -d -c /home/myname/workbench/resources/development/myproj/buildroot/buildroot/ dl/libonvif/v1.1.1.tar.gz | tar --strip-components=1 -C /home/myname/workbench/res ources/development/myproj/buildroot/buildroot/output/build/libonvif-1.1.1 -xf - >>> libonvif 1.1.1 Patching >>> libonvif 1.1.1 Updating config.sub and config.guess for file in config.guess config.sub; do for i in $(find /home/myname/workbench/res ources/development/myproj/buildroot/buildroot/output/build/libonvif-1.1.1 -name $ file); do cp support/gnuconfig/$file $i; done; done >>> libonvif 1.1.1 Patching libtool patching file /home/myname/workbench/resources/development/myproj/buildroot/buildro ot/output/build/libonvif-1.1.1/ltmain.sh Hunk #1 succeeded at 2694 (offset 7 lines). Hunk #2 succeeded at 4284 (offset 7 lines). Hunk #3 succeeded at 6579 (offset 25 lines). Hunk #4 succeeded at 6589 (offset 25 lines). Hunk #5 succeeded at 6882 (offset 25 lines). Hunk #6 succeeded at 7174 (offset 25 lines). Hunk #7 succeeded at 8140 (offset 28 lines). Hunk #8 succeeded at 10769 (offset 59 lines). >>> libonvif 1.1.1 Configuring (cd /home/myname/workbench/resources/development/myproj/buildroot/buildroot/output/ build/libonvif-1.1.1/ && rm -rf config.cache && PATH="/home/myname/workbench/resou rces/development/myproj/buildroot/buildroot/output/host/bin:/home/myname/workbench/ resources/development/myproj/buildroot/buildroot/output/host/sbin:/home/myname/.loc al/bin:/home/myname/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/bin:/var/lib/fl atpak/exports/bin:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl" AR ="/home/myname/workbench/resources/development/myproj/buildroot/buildroot/output/ho st/bin/aarch64-myproj-linux-gnu-ar" AS="/home/myname/workbench/resources/developmen t/myproj/buildroot/buildroot/output/host/bin/aarch64-myproj-linux-gnu-as" LD="/hom e/myname/workbench/resources/development/myproj/buildroot/buildroot/output/host/bin /aarch64-myproj-linux-gnu-ld" NM="/home/myname/workbench/resources/development/auvi c/buildroot/buildroot/output/host/bin/aarch64-myproj-linux-gnu-nm" CC="/home/myname /workbench/resources/development/myproj/buildroot/buildroot/output/host/bin/aarch 64-myproj-linux-gnu-gcc" GCC="/home/myname/workbench/resources/development/myproj/bu ildroot/buildroot/output/host/bin/aarch64-myproj-linux-gnu-gcc" CPP="/home/myname/w orkbench/resources/development/myproj/buildroot/buildroot/output/host/bin/aarch64 -myproj-linux-gnu-cpp" CXX="/home/myname/workbench/resources/development/myproj/buil droot/buildroot/output/host/bin/aarch64-myproj-linux-gnu-g++" FC="/home/myname/work bench/resources/development/myproj/buildroot/buildroot/output/host/bin/aarch64-Au vic-linux-gnu-gfortran" F77="/home/myname/workbench/resources/development/myproj/bu ildroot/buildroot/output/host/bin/aarch64-myproj-linux-gnu-gfortran" RANLIB="/hom e/myname/workbench/resources/development/myproj/buildroot/buildroot/output/host/bin /aarch64-myproj-linux-gnu-ranlib" READELF="/home/myname/workbench/resources/develop ment/myproj/buildroot/buildroot/output/host/bin/aarch64-myproj-linux-gnu-readelf" STRIP="/home/myname/workbench/resources/development/myproj/buildroot/buildroot/outp ut/host/bin/aarch64-myproj-linux-gnu-strip" OBJCOPY="/home/myname/workbench/resourc es/development/myproj/buildroot/buildroot/output/host/bin/aarch64-myproj-linux-gnu -objcopy" OBJDUMP="/home/myname/workbench/resources/development/myproj/buildroot/bu ildroot/output/host/bin/aarch64-myproj-linux-gnu-objdump" AR_FOR_BUILD="/usr/bin/ ar" AS_FOR_BUILD="/usr/bin/as" CC_FOR_BUILD="/usr/bin/gcc" GCC_FOR_BUILD="/usr/b in/gcc" CXX_FOR_BUILD="/usr/bin/g++" LD_FOR_BUILD="/usr/bin/ld" CPPFLAGS_FOR_BUI LD="-I/home/myname/workbench/resources/development/myproj/buildroot/buildroot/outpu t/host/include" CFLAGS_FOR_BUILD="-O2 -I/home/myname/workbench/resources/developme nt/myproj/buildroot/buildroot/output/host/include" CXXFLAGS_FOR_BUILD="-O2 -I/hom e/myname/workbench/resources/development/myproj/buildroot/buildroot/output/host/inc lude" LDFLAGS_FOR_BUILD="-L/home/myname/workbench/resources/development/myproj/buil droot/buildroot/output/host/lib -Wl,-rpath,/home/myname/workbench/resources/develo pment/myproj/buildroot/buildroot/output/host/lib" FCFLAGS_FOR_BUILD="" DEFAULT_AS SEMBLER="/home/myname/workbench/resources/development/myproj/buildroot/buildroot/ou tput/host/bin/aarch64-myproj-linux-gnu-as" DEFAULT_LINKER="/home/myname/workbench/r esources/development/myproj/buildroot/buildroot/output/host/bin/aarch64-myproj-lin ux-gnu-ld" CPPFLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BI TS=64" CFLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 " CXXFLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BI TS=64 -Os -g0 " LDFLAGS="" FCFLAGS=" -Os -g0" FFLAGS=" -Os -g0" PKG_CONFIG="/ho me/myname/workbench/resources/development/myproj/buildroot/buildroot/output/host/bi n/pkg-config" STAGING_DIR="/home/myname/workbench/resources/development/myproj/buil droot/buildroot/output/host/aarch64-myproj-linux-gnu/sysroot" INTLTOOL_PERL=/usr/ bin/perl ac_cv_lbl_unaligned_fail=yes ac_cv_func_mmap_fixed_mapped=yes ac_cv_fun c_memcmp_working=yes ac_cv_have_decl_malloc=yes gl_cv_func_malloc_0_nonnull=yes ac_cv_func_malloc_0_nonnull=yes ac_cv_func_calloc_0_nonnull=yes ac_cv_func_reall oc_0_nonnull=yes lt_cv_sys_lib_search_path_spec="" ac_cv_c_bigendian=no CONFIG _SITE=/dev/null ./configure --target=aarch64-myproj-linux-gnu --host=aarch64-Auvi c-linux-gnu --build=x86_64-pc-linux-gnu --prefix=/usr --exec-prefix=/usr --sysco nfdir=/etc --localstatedir=/var --program-prefix="" --disable-gtk-doc --disable- gtk-doc-html --disable-doc --disable-docs --disable-documentation --with-xmlto=n o --with-fop=no --disable-dependency-tracking --enable-ipv6 --disable-nls --disa ble-static --enable-shared ) configure: WARNING: unrecognized options: --disable-gtk-doc, --disable-gtk-doc-h tml, --disable-doc, --disable-docs, --disable-documentation, --with-xmlto, --wit h-fop, --enable-ipv6, --disable-nls checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for aarch64-myproj-linux-gnu-strip... /home/myname/workbench/resources/dev elopment/myproj/buildroot/buildroot/output/host/bin/aarch64-myproj-linux-gnu-strip checking for a thread-safe mkdir -p... /usr/bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking for style of include used by make... GNU checking for aarch64-myproj-linux-gnu-gcc... /home/myname/workbench/resources/devel opment/myproj/buildroot/buildroot/output/host/bin/aarch64-myproj-linux-gnu-gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... yes checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether /home/myname/workbench/resources/development/myproj/buildroot/buil droot/output/host/bin/aarch64-myproj-linux-gnu-gcc accepts -g... yes checking for /home/myname/workbench/resources/development/myproj/buildroot/buildroo t/output/host/bin/aarch64-myproj-linux-gnu-gcc option to accept ISO C89... none n eeded checking whether /home/myname/workbench/resources/development/myproj/buildroot/buil droot/output/host/bin/aarch64-myproj-linux-gnu-gcc understands -c and -o together ... yes checking dependency style of /home/myname/workbench/resources/development/myproj/bu ildroot/buildroot/output/host/bin/aarch64-myproj-linux-gnu-gcc... none checking for aarch64-myproj-linux-gnu-ar... /home/myname/workbench/resources/develo pment/myproj/buildroot/buildroot/output/host/bin/aarch64-myproj-linux-gnu-ar checking the archiver (/home/myname/workbench/resources/development/myproj/buildroo t/buildroot/output/host/bin/aarch64-myproj-linux-gnu-ar) interface... ar checking build system type... x86_64-pc-linux-gnu checking host system type... aarch64-myproj-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /usr/bin/sed checking for grep that handles long lines and -e... /usr/bin/grep checking for egrep... /usr/bin/grep -E checking for fgrep... /usr/bin/grep -F checking for ld used by /home/myname/workbench/resources/development/myproj/buildro ot/buildroot/output/host/bin/aarch64-myproj-linux-gnu-gcc... /home/myname/workbench /resources/development/myproj/buildroot/buildroot/output/host/bin/aarch64-myproj-l inux-gnu-ld checking if the linker (/home/myname/workbench/resources/development/myproj/buildro ot/buildroot/output/host/bin/aarch64-myproj-linux-gnu-ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /home/myname/workbench/reso urces/development/myproj/buildroot/buildroot/output/host/bin/aarch64-myproj-linux- gnu-nm checking the name lister (/home/myname/workbench/resources/development/myproj/build root/buildroot/output/host/bin/aarch64-myproj-linux-gnu-nm) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking how to convert x86_64-pc-linux-gnu file names to aarch64-myproj-linux-gn u format... func_convert_file_noop checking how to convert x86_64-pc-linux-gnu file names to toolchain format... fu nc_convert_file_noop checking for /home/myname/workbench/resources/development/myproj/buildroot/buildroo t/output/host/bin/aarch64-myproj-linux-gnu-ld option to reload object files... -r checking for aarch64-myproj-linux-gnu-objdump... /home/myname/workbench/resources/d evelopment/myproj/buildroot/buildroot/output/host/bin/aarch64-myproj-linux-gnu-obj dump checking how to recognize dependent libraries... pass_all checking for aarch64-myproj-linux-gnu-dlltool... no checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for aarch64-myproj-linux-gnu-ar... (cached) /home/myname/workbench/resourc es/development/myproj/buildroot/buildroot/output/host/bin/aarch64-myproj-linux-gnu -ar checking for archiver @FILE support... @ checking for aarch64-myproj-linux-gnu-strip... (cached) /home/myname/workbench/reso urces/development/myproj/buildroot/buildroot/output/host/bin/aarch64-myproj-linux- gnu-strip checking for aarch64-myproj-linux-gnu-ranlib... /home/myname/workbench/resources/de velopment/myproj/buildroot/buildroot/output/host/bin/aarch64-myproj-linux-gnu-ranl ib checking command to parse /home/myname/workbench/resources/development/myproj/build root/buildroot/output/host/bin/aarch64-myproj-linux-gnu-nm output from /home/myname /workbench/resources/development/myproj/buildroot/buildroot/output/host/bin/aarch 64-myproj-linux-gnu-gcc object... ok checking for sysroot... no checking for a working dd... /usr/bin/dd checking how to truncate binary pipes... /usr/bin/dd bs=4096 count=1 checking for aarch64-myproj-linux-gnu-mt... no checking for mt... no checking if : is a manifest tool... no checking how to run the C preprocessor... /home/myname/workbench/resources/develop ment/myproj/buildroot/buildroot/output/host/bin/aarch64-myproj-linux-gnu-cpp checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if /home/myname/workbench/resources/development/myproj/buildroot/buildroot /output/host/bin/aarch64-myproj-linux-gnu-gcc supports -fno-rtti -fno-exceptions. .. no checking for /home/myname/workbench/resources/development/myproj/buildroot/buildroo t/output/host/bin/aarch64-myproj-linux-gnu-gcc option to produce PIC... -fPIC -DP IC checking if /home/myname/workbench/resources/development/myproj/buildroot/buildroot /output/host/bin/aarch64-myproj-linux-gnu-gcc PIC flag -fPIC -DPIC works... yes checking if /home/myname/workbench/resources/development/myproj/buildroot/buildroot /output/host/bin/aarch64-myproj-linux-gnu-gcc static flag -static works... yes checking if /home/myname/workbench/resources/development/myproj/buildroot/buildroot /output/host/bin/aarch64-myproj-linux-gnu-gcc supports -c -o file.o... yes checking if /home/myname/workbench/resources/development/myproj/buildroot/buildroot /output/host/bin/aarch64-myproj-linux-gnu-gcc supports -c -o file.o... (cached) y es checking whether the /home/myname/workbench/resources/development/myproj/buildroot/ buildroot/output/host/bin/aarch64-myproj-linux-gnu-gcc linker (/home/myname/workben ch/resources/development/myproj/buildroot/buildroot/output/host/bin/aarch64-myproj -linux-gnu-ld) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... no host is aarch64-myproj-linux-gnu checking for aarch64-myproj-linux-gnu-gcc... (cached) /home/myname/workbench/resour ces/development/myproj/buildroot/buildroot/output/host/bin/aarch64-myproj-linux-gn u-gcc checking whether we are using the GNU C compiler... (cached) yes checking whether /home/myname/workbench/resources/development/myproj/buildroot/buil droot/output/host/bin/aarch64-myproj-linux-gnu-gcc accepts -g... (cached) yes checking for /home/myname/workbench/resources/development/myproj/buildroot/buildroo t/output/host/bin/aarch64-myproj-linux-gnu-gcc option to accept ISO C89... (cache d) none needed checking whether /home/myname/workbench/resources/development/myproj/buildroot/buil droot/output/host/bin/aarch64-myproj-linux-gnu-gcc understands -c and -o together ... (cached) yes checking dependency style of /home/myname/workbench/resources/development/myproj/bu ildroot/buildroot/output/host/bin/aarch64-myproj-linux-gnu-gcc... (cached) none checking pkg-config is at least version 0.9.0... yes checking for LIBXML2... yes checking arpa/inet.h usability... yes checking arpa/inet.h presence... yes checking for arpa/inet.h... yes checking fcntl.h usability... yes checking fcntl.h presence... yes checking for fcntl.h... yes checking float.h usability... yes checking float.h presence... yes checking for float.h... yes checking for inttypes.h... (cached) yes checking limits.h usability... yes checking limits.h presence... yes checking for limits.h... yes checking locale.h usability... yes checking locale.h presence... yes checking for locale.h... yes checking for memory.h... (cached) yes checking netdb.h usability... yes checking netdb.h presence... yes checking for netdb.h... yes checking netinet/in.h usability... yes checking netinet/in.h presence... yes checking for netinet/in.h... yes checking for stdint.h... (cached) yes checking for stdlib.h... (cached) yes checking for string.h... (cached) yes checking for strings.h... (cached) yes checking sys/ioctl.h usability... yes checking sys/ioctl.h presence... yes checking for sys/ioctl.h... yes checking sys/socket.h usability... yes checking sys/socket.h presence... yes checking for sys/socket.h... yes checking sys/time.h usability... yes checking sys/time.h presence... yes checking for sys/time.h... yes checking sys/timeb.h usability... yes checking sys/timeb.h presence... yes checking for sys/timeb.h... yes checking for unistd.h... (cached) yes checking for stdbool.h that conforms to C99... yes checking for _Bool... yes checking for size_t... yes checking whether time.h and sys/time.h may both be included... yes checking for sys/time.h... (cached) yes checking for unistd.h... (cached) yes checking for alarm... yes checking for working mktime... no checking whether strerror_r is declared... yes checking for strerror_r... yes checking whether strerror_r returns char *... no checking for working strtod... no checking for pow... no checking for pow in -lm... yes checking for ftime... yes checking for gethostbyname... yes checking for gettimeofday... yes checking for localtime_r... yes checking for memset... yes checking for select... yes checking for socket... yes checking for strchr... yes checking for strdup... yes checking for strerror... yes checking for strstr... yes checking for strtod... (cached) no checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating Makefile config.status: creating build/Makefile config.status: creating build/libonvif.pc config.status: creating config.h config.status: executing depfiles commands config.status: executing libtool commands configure: WARNING: unrecognized options: --disable-gtk-doc, --disable-gtk-doc-h tml, --disable-doc, --disable-docs, --disable-documentation, --with-xmlto, --wit h-fop, --enable-ipv6, --disable-nls >>> libonvif 1.1.1 Building PATH="/home/myname/workbench/resources/development/myproj/buildroot/buildroot/outpu t/host/bin:/home/myname/workbench/resources/development/myproj/buildroot/buildroot/ output/host/sbin:/home/myname/.local/bin:/home/myname/.local/bin:/usr/local/sbin:/us r/local/bin:/usr/bin:/var/lib/flatpak/exports/bin:/usr/bin/site_perl:/usr/bin/ve ndor_perl:/usr/bin/core_perl" /usr/bin/make -j5 -C /home/myname/workbench/resour ces/development/myproj/buildroot/buildroot/output/build/libonvif-1.1.1/ make[1]: Entering directory '/home/myname/workbench/resources/development/myproj/bu ildroot/buildroot/output/build/libonvif-1.1.1' /usr/bin/make all-recursive make[2]: Entering directory '/home/myname/workbench/resources/development/myproj/bu ildroot/buildroot/output/build/libonvif-1.1.1' Making all in build make[3]: Entering directory '/home/myname/workbench/resources/development/myproj/bu ildroot/buildroot/output/build/libonvif-1.1.1/build' /bin/sh ../libtool --tag=CC --mode=compile /home/myname/workbench/resources/dev elopment/myproj/buildroot/buildroot/output/host/bin/aarch64-myproj-linux-gnu-gcc - DHAVE_CONFIG_H -I. -I.. -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFS ET_BITS=64 -I/usr/include -I/usr/include/libxml2 -I../source -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -c -o onvif.lo `test -f '../source/onvif.c' || echo './'`../source/onvif.c /bin/sh ../libtool --tag=CC --mode=compile /home/myname/workbench/resources/dev elopment/myproj/buildroot/buildroot/output/host/bin/aarch64-myproj-linux-gnu-gcc - DHAVE_CONFIG_H -I. -I.. -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFS ET_BITS=64 -I/usr/include -I/usr/include/libxml2 -I../source -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -c -o sha1.lo `test -f ' ../source/sha1.c' || echo './'`../source/sha1.c /bin/sh ../libtool --tag=CC --mode=compile /home/myname/workbench/resources/dev elopment/myproj/buildroot/buildroot/output/host/bin/aarch64-myproj-linux-gnu-gcc - DHAVE_CONFIG_H -I. -I.. -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFS ET_BITS=64 -I/usr/include -I/usr/include/libxml2 -I../source -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -c -o cencode.lo `test - f '../source/cencode.c' || echo './'`../source/cencode.c libtool: compile: /home/myname/workbench/resources/development/myproj/buildroot/bu ildroot/output/host/bin/aarch64-myproj-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I.. -D_ LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include -I/ usr/include/libxml2 -I../source -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FIL E_OFFSET_BITS=64 -Os -g0 -c ../source/onvif.c -fPIC -DPIC -o .libs/onvif.o aarch64-myproj-linux-gnu-gcc: ERROR: unsafe header/library path used in cross-com pilation: '-I/usr/include' make[3]: *** [Makefile:459: onvif.lo] Error 1 make[3]: *** Waiting for unfinished jobs.... libtool: compile: /home/myname/workbench/resources/development/myproj/buildroot/bu ildroot/output/host/bin/aarch64-myproj-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I.. -D_ LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include -I/ usr/include/libxml2 -I../source -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FIL E_OFFSET_BITS=64 -Os -g0 -c ../source/cencode.c -fPIC -DPIC -o .libs/cencode.o aarch64-myproj-linux-gnu-gcc: ERROR: unsafe header/library path used in cross-com pilation: '-I/usr/include' make[3]: *** [Makefile:473: cencode.lo] Error 1 libtool: compile: /home/myname/workbench/resources/development/myproj/buildroot/bu ildroot/output/host/bin/aarch64-myproj-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I.. -D_ LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include -I/ usr/include/libxml2 -I../source -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FIL E_OFFSET_BITS=64 -Os -g0 -c ../source/sha1.c -fPIC -DPIC -o .libs/sha1.o aarch64-myproj-linux-gnu-gcc: ERROR: unsafe header/library path used in cross-com pilation: '-I/usr/include' make[3]: *** [Makefile:466: sha1.lo] Error 1 make[3]: Leaving directory '/home/myname/workbench/resources/development/myproj/bui ldroot/buildroot/output/build/libonvif-1.1.1/build' make[2]: *** [Makefile:454: all-recursive] Error 1 make[2]: Leaving directory '/home/myname/workbench/resources/development/myproj/bui ldroot/buildroot/output/build/libonvif-1.1.1' make[1]: *** [Makefile:365: all] Error 2 make[1]: Leaving directory '/home/myname/workbench/resources/development/myproj/bui ldroot/buildroot/output/build/libonvif-1.1.1' make: *** [package/pkg-generic.mk:295: /home/myname/workbench/resources/developmen t/myproj/buildroot/buildroot/output/build/libonvif-1.1.1/.stamp_built] Error 2 myname buildroot$> Dnia Sun, Jan 30, 2022 at 11:48:00PM +0100, Thomas Petazzoni napisa?(a): > Hello Arek, > > On Sun, 30 Jan 2022 23:09:50 +0100 > Arek Marud wrote: > > > I'm trying to add new package to Buildroot. I follow Buildroot tutorial > > for autotools package. But I got an error message, and i have no idea > > what is the problem. > > > > https://gist.github.com/arekmd/c33a3a487ec73d8847c3c115f8fa3299 > > libonvif: installs files in /home/myname/workbench/resources/development/myproj/buildroot/buildroot/output/host/aarch64-myproj-linux-gnu/sysroot//home/myname/workbench/resources/development/myproj/buildroot/buildroot/output > > Look at this path: it contains two times > /home/myname/workbench/resources/development/myproj/buildroot/buildroot/output, > and that's clearly bogus, and that's why Buildroot complains. > > > ################################################################################ > > # > > # libonvif > > ################################################################################ > > LIBONVIF_VERSION = 1.1.1 > > LIBONVIF_SOURCE = v$(LIBONVIF_VERSION).tar.gz > > LIBONVIF_SITE = https://github.com/sr99622/libonvif/archive/refs/tags > > LIBONVIF_INSTALL_STAGING = YES > > LIBONVIF_INSTALL_TARGET = YES > > LIBONVIF_CONF_OPTS = --with-libxml2 --includedir="$(STAGING_DIR)/usr/include/libxml2" > > This includedir is wrong, and is perhaps the reason for the failure. > includedir is the location where libonvif will install its headers, not > where the libxml2 headers will be found. And setting > $(STAGING_DIR)/usr/include/libxml2 for includedir is incorrect, because > then at install time we pass DESTDIR=$(TARGET_DIR) (for target > installation) or DESTDIR=$(STAGING_DIR) (for staging installation). > > This means that the libonvif headers will get installed in: > > $(TARGET_DIR)/$(STAGING_DIR)/usr/include/libxml2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ this is the value you passed to includedir > > and > > $(STAGING_DIR)/$(STAGING_DIR)/usr/include/libxml2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ this is the value you passed to includedir > > Hope this helps, > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com From giulio.benetti at benettiengineering.com Fri Feb 4 10:24:35 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 4 Feb 2022 11:24:35 +0100 Subject: [Buildroot] qt5webengine build failure on gitlab-CI In-Reply-To: <20220204085100.77deaeb8@gmx.net> References: <1662cf67-b9ef-33be-c5c4-5d5e786f944a@benettiengineering.com> <20220204085100.77deaeb8@gmx.net> Message-ID: <92e2c20f-86dd-812b-e13f-5479146e640b@benettiengineering.com> Hi Peter, On 04/02/22 08:51, Peter Seiderer wrote: > Hello Giulio, > > On Fri, 4 Feb 2022 02:03:48 +0100, Giulio Benetti wrote: > >> Hi Peter and James, >> >> I can fix this build failure[1] due to qt5webengine, you're the experts >> here, can you take a look please? >> >> You have to build using official docker as I've described in this patch >> for the manual: >> https://patchwork.ozlabs.org/project/buildroot/patch/20220203235438.610277-1-giulio.benetti at benettiengineering.com/ >> >> I've tried this patch: >> https://patchwork.ozlabs.org/project/buildroot/patch/20220117114358.3814200-1-james.hilliard1 at gmail.com/ >> but it didn't help :-/ > > See [2], [3] and [4].... Thank you for pointing, this patch: https://patchwork.ozlabs.org/project/buildroot/patch/20201221203952.22168-3-ps.report at gmx.net/ seems to be what we need at the moment IMHO. It can also be backported. Best regards -- Giulio Benetti Benetti Engineering sas > Regards, > Peter > > [2] http://lists.busybox.net/pipermail/buildroot/2020-December/601542.html > [3] http://lists.busybox.net/pipermail/buildroot/2021-January/301496.html > [4] http://lists.busybox.net/pipermail/buildroot/2022-January/633204.html > >> >> Thanks in advance! >> >> [1]: https://gitlab.com/buildroot.org/buildroot/-/jobs/1929717230 >> >> Best regards > From giulio.benetti at benettiengineering.com Fri Feb 4 10:27:32 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 4 Feb 2022 11:27:32 +0100 Subject: [Buildroot] qt5webengine build failure on gitlab-CI In-Reply-To: References: <1662cf67-b9ef-33be-c5c4-5d5e786f944a@benettiengineering.com> Message-ID: Hi James, On 04/02/22 09:52, James Hilliard wrote: > On Thu, Feb 3, 2022 at 6:03 PM Giulio Benetti > wrote: >> >> Hi Peter and James, >> >> I can fix this build failure[1] due to qt5webengine, you're the experts >> here, can you take a look please? >> >> You have to build using official docker as I've described in this patch >> for the manual: >> https://patchwork.ozlabs.org/project/buildroot/patch/20220203235438.610277-1-giulio.benetti at benettiengineering.com/ >> >> I've tried this patch: >> https://patchwork.ozlabs.org/project/buildroot/patch/20220117114358.3814200-1-james.hilliard1 at gmail.com/ >> but it didn't help :-/ > > I've got a WIP branch that should hopefully fix this and a bunch of > related issues, > cleaning it up at the moment: > https://github.com/buildroot/buildroot/compare/master...jameshilliard:qt5webengine-kde This is a good improvement, but I need something to fix the actual problem and that can be eventually backported, so this: https://patchwork.ozlabs.org/project/buildroot/patch/20201221203952.22168-3-ps.report at gmx.net/ fits more our needs for the moment. Thank you! Best regards -- Giulio Benetti Benetti Engineering sas >> >> Thanks in advance! >> >> [1]: https://gitlab.com/buildroot.org/buildroot/-/jobs/1929717230 >> >> Best regards >> -- >> Giulio Benetti >> Benetti Engineering sas > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From giulio.benetti at benettiengineering.com Fri Feb 4 10:40:49 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 4 Feb 2022 11:40:49 +0100 Subject: [Buildroot] [PATCH 1/2 v2] boot/uboot: fix build with host-gcc 10+ In-Reply-To: <79dd83642a7b1964ed69d74c4b0f93eada940a4e.1643665029.git.yann.morin.1998@free.fr> References: <79dd83642a7b1964ed69d74c4b0f93eada940a4e.1643665029.git.yann.morin.1998@free.fr> Message-ID: <76c64971-4c4a-41a3-89d7-f1e837961d6e@benettiengineering.com> Hi Yann, On 31/01/22 22:38, Yann E. MORIN wrote: > 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) I've extensively tested this patch while fixing Gitlab-CI build failures and here there is the actual situation: https://paste.debian.net/1229530/ I've built successfully circa 20-25 cases where the problem didn't arise and also a couple where the problem arised. So: Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti Thank you! Best regards -- Giulio Benetti Benetti Engineering sas > > --- > 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) From giulio.benetti at benettiengineering.com Fri Feb 4 10:41:09 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 4 Feb 2022 11:41:09 +0100 Subject: [Buildroot] [PATCH 2/2 v2] linux: fix build with host-gcc 10+ In-Reply-To: References: Message-ID: <4fc954ba-48d7-388f-39e4-56f83db14297@benettiengineering.com> Hi Yann, On 31/01/22 22:38, 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. > > 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) I've extensively tested this patch while fixing Gitlab-CI build failures and here there is the actual situation: https://paste.debian.net/1229530/ I've built successfully circa 20-25 cases where the problem didn't arise and also a couple where the problem arised. So: Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti Thank you! Best regards -- Giulio Benetti Benetti Engineering sas > --- > 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 -- Giulio Benetti Benetti Engineering sas From bugzilla at busybox.net Fri Feb 4 11:03:18 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Fri, 04 Feb 2022 11:03:18 +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 --- Comment #3 from oliver.kasten at trsystems.de --- I have the same issue. It seems that qemu used in v8-qemu-wrapper.in caused this issue. Build nodejs for aarch64 on x86_64 works fine, but building for x86_64 on x86_64 failed. I entered a bug request for qemu (https://gitlab.com/qemu-project/qemu/-/issues/857). -- You are receiving this mail because: You are on the CC list for the bug. From giulio.benetti at benettiengineering.com Fri Feb 4 11:21:39 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 4 Feb 2022 12:21:39 +0100 Subject: [Buildroot] qt5webengine build failure on gitlab-CI In-Reply-To: References: <1662cf67-b9ef-33be-c5c4-5d5e786f944a@benettiengineering.com> Message-ID: <67349e3c-373f-905a-840a-55c4b8143906@benettiengineering.com> On 04/02/22 11:27, Giulio Benetti wrote: > Hi James, > > On 04/02/22 09:52, James Hilliard wrote: >> On Thu, Feb 3, 2022 at 6:03 PM Giulio Benetti >> wrote: >>> >>> Hi Peter and James, >>> >>> I can fix this build failure[1] due to qt5webengine, you're the experts >>> here, can you take a look please? >>> >>> You have to build using official docker as I've described in this patch >>> for the manual: >>> https://patchwork.ozlabs.org/project/buildroot/patch/20220203235438.610277-1-giulio.benetti at benettiengineering.com/ >>> >>> I've tried this patch: >>> https://patchwork.ozlabs.org/project/buildroot/patch/20220117114358.3814200-1-james.hilliard1 at gmail.com/ >>> but it didn't help :-/ >> >> I've got a WIP branch that should hopefully fix this and a bunch of >> related issues, >> cleaning it up at the moment: >> https://github.com/buildroot/buildroot/compare/master...jameshilliard:qt5webengine-kde > > This is a good improvement, but I need something to fix the actual > problem and that can be eventually backported, so this: > https://patchwork.ozlabs.org/project/buildroot/patch/20201221203952.22168-3-ps.report at gmx.net/ > fits more our needs for the moment. I was wrong, I haven't pulled the master branch so I was still building 5.15.2 and no 5.15.8 Look forward for having your patch to test then. Thank you! Best regards -- Giulio Benetti Benetti Engineering sas From ps.report at gmx.net Fri Feb 4 15:37:15 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 4 Feb 2022 16:37:15 +0100 Subject: [Buildroot] [PATCH v1] package/findutils: bump version to 4.9.0 Message-ID: <20220204153715.15481-1-ps.report@gmx.net> For details see [1]. [1] https://lists.gnu.org/archive/html/info-gnu/2022-02/msg00003.html Signed-off-by: Peter Seiderer --- package/findutils/findutils.hash | 2 +- package/findutils/findutils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/findutils/findutils.hash b/package/findutils/findutils.hash index 26dbe59181..0284c0e7b2 100644 --- a/package/findutils/findutils.hash +++ b/package/findutils/findutils.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 57127b7e97d91282c6ace556378d5455a9509898297e46e10443016ea1387164 findutils-4.8.0.tar.xz +sha256 a2bfb8c09d436770edc59f50fa483e785b161a3b7b9d547573cb08065fd462fe findutils-4.9.0.tar.xz # Hash for license file sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING diff --git a/package/findutils/findutils.mk b/package/findutils/findutils.mk index 3237e5502a..9731a35047 100644 --- a/package/findutils/findutils.mk +++ b/package/findutils/findutils.mk @@ -4,7 +4,7 @@ # ################################################################################ -FINDUTILS_VERSION = 4.8.0 +FINDUTILS_VERSION = 4.9.0 FINDUTILS_SOURCE = findutils-$(FINDUTILS_VERSION).tar.xz FINDUTILS_SITE = $(BR2_GNU_MIRROR)/findutils FINDUTILS_LICENSE = GPL-3.0+ -- 2.34.1 From ps.report at gmx.net Fri Feb 4 15:46:20 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 4 Feb 2022 16:46:20 +0100 Subject: [Buildroot] [PATCH v1 01/12] package/gstreamer1: bump version to 1.18.6 In-Reply-To: <20220204154631.17814-1-ps.report@gmx.net> References: <20220204154631.17814-1-ps.report@gmx.net> Message-ID: <20220204154631.17814-2-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gstreamer1/gstreamer1.hash | 4 ++-- package/gstreamer1/gstreamer1/gstreamer1.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gstreamer1/gstreamer1.hash b/package/gstreamer1/gstreamer1/gstreamer1.hash index c6282454ca..1202bf2c50 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.hash +++ b/package/gstreamer1/gstreamer1/gstreamer1.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.18.5.tar.xz.sha256sum -sha256 55862232a63459bbf56abebde3085ca9aec211b478e891dacea4d6df8cafe80a gstreamer-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.18.6.tar.xz.sha256sum +sha256 4ec816010dd4d3a93cf470ad0a6f25315f52b204eb1d71dfa70ab8a1c3bd06e6 gstreamer-1.18.6.tar.xz sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk index 1aab035e05..27745f3bf9 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_VERSION = 1.18.5 +GSTREAMER1_VERSION = 1.18.6 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer GSTREAMER1_INSTALL_STAGING = YES -- 2.34.1 From ps.report at gmx.net Fri Feb 4 15:46:19 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 4 Feb 2022 16:46:19 +0100 Subject: [Buildroot] [PATCH v1 00/12] package/gstreamer1/*: bump version to 1.18.6 Message-ID: <20220204154631.17814-1-ps.report@gmx.net> For details see [1] and [2]. [1] https://lists.freedesktop.org/archives/gstreamer-devel/2022-February/079533.html [2] https://gstreamer.freedesktop.org/releases/1.18/#1.18.6 Peter Seiderer (12): package/gstreamer1: bump version to 1.18.6 package/gst1-plugins-base: bump version to 1.18.6 package/gst1-plugins-good: bump version to 1.18.6 package/gst1-plugins-bad: bump version to 1.18.6 package/gst1-plugins-ugly: bump version to 1.18.6 package/gst1-devtools: bump version to 1.18.6 package/gst1-libav: bump version to 1.18.6 package/gst1-vaapi: bump version to 1.18.6 package/gst1-rtsp-server: bump version to 1.18.6 package/gstreamer1-editing-services: bump version to 1.18.6 package/gst-omx: bump version to 1.18.6 package/gst1-python: bump version to 1.18.6 package/gstreamer1/gst-omx/gst-omx.hash | 4 +- package/gstreamer1/gst-omx/gst-omx.mk | 2 +- .../gst1-devtools/gst1-devtools.hash | 4 +- .../gstreamer1/gst1-devtools/gst1-devtools.mk | 2 +- package/gstreamer1/gst1-libav/gst1-libav.hash | 4 +- package/gstreamer1/gst1-libav/gst1-libav.mk | 2 +- .../gst1-plugins-bad/gst1-plugins-bad.hash | 4 +- .../gst1-plugins-bad/gst1-plugins-bad.mk | 2 +- ...eo-gstvideoaggregator.c-fix-build-wi.patch | 45 ------------------- .../gst1-plugins-base/gst1-plugins-base.hash | 4 +- .../gst1-plugins-base/gst1-plugins-base.mk | 2 +- .../gst1-plugins-good/gst1-plugins-good.hash | 4 +- .../gst1-plugins-good/gst1-plugins-good.mk | 2 +- .../gst1-plugins-ugly/gst1-plugins-ugly.hash | 4 +- .../gst1-plugins-ugly/gst1-plugins-ugly.mk | 2 +- .../gstreamer1/gst1-python/gst1-python.hash | 4 +- package/gstreamer1/gst1-python/gst1-python.mk | 2 +- .../gst1-rtsp-server/gst1-rtsp-server.hash | 4 +- .../gst1-rtsp-server/gst1-rtsp-server.mk | 2 +- package/gstreamer1/gst1-vaapi/gst1-vaapi.hash | 4 +- package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 2 +- .../gstreamer1-editing-services.hash | 4 +- .../gstreamer1-editing-services.mk | 2 +- package/gstreamer1/gstreamer1/gstreamer1.hash | 4 +- package/gstreamer1/gstreamer1/gstreamer1.mk | 2 +- 25 files changed, 36 insertions(+), 81 deletions(-) delete mode 100644 package/gstreamer1/gst1-plugins-base/0001-gst-libs-gst-video-gstvideoaggregator.c-fix-build-wi.patch -- 2.34.1 From ps.report at gmx.net Fri Feb 4 15:46:21 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 4 Feb 2022 16:46:21 +0100 Subject: [Buildroot] [PATCH v1 02/12] package/gst1-plugins-base: bump version to 1.18.6 In-Reply-To: <20220204154631.17814-1-ps.report@gmx.net> References: <20220204154631.17814-1-ps.report@gmx.net> Message-ID: <20220204154631.17814-3-ps.report@gmx.net> - removed 0001-gst-libs-gst-video-gstvideoaggregator.c-fix-build-wi.patch (upstream accepted [1], [2]) [1] https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/974 [2] https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/commit/d86cf6314f8f178c59600f55321ce73d4ca95d97.patch Signed-off-by: Peter Seiderer --- ...eo-gstvideoaggregator.c-fix-build-wi.patch | 45 ------------------- .../gst1-plugins-base/gst1-plugins-base.hash | 4 +- .../gst1-plugins-base/gst1-plugins-base.mk | 2 +- 3 files changed, 3 insertions(+), 48 deletions(-) delete mode 100644 package/gstreamer1/gst1-plugins-base/0001-gst-libs-gst-video-gstvideoaggregator.c-fix-build-wi.patch diff --git a/package/gstreamer1/gst1-plugins-base/0001-gst-libs-gst-video-gstvideoaggregator.c-fix-build-wi.patch b/package/gstreamer1/gst1-plugins-base/0001-gst-libs-gst-video-gstvideoaggregator.c-fix-build-wi.patch deleted file mode 100644 index 87cd6493f5..0000000000 --- a/package/gstreamer1/gst1-plugins-base/0001-gst-libs-gst-video-gstvideoaggregator.c-fix-build-wi.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 012ca1bcd234ee02f576dd58b1f09baba18b89b0 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 14 Dec 2020 07:42:55 +0100 -Subject: [PATCH] gst-libs/gst/video/gstvideoaggregator.c: fix build with gcc - 4.8 - -Fix the following build failure with gcc 4.8 which has been added with -https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/commit/d268c193ad39fb970351ed62898be806ebd0a71e: - -../gst-libs/gst/video/gstvideoaggregator.c: In function 'gst_video_aggregator_init': -../gst-libs/gst/video/gstvideoaggregator.c:2762:3: error: 'for' loop initial declarations are only allowed in C99 mode - for (gint i = 0; i < gst_caps_get_size (src_template); i++) { - ^ - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/974] ---- - gst-libs/gst/video/gstvideoaggregator.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/gst-libs/gst/video/gstvideoaggregator.c b/gst-libs/gst/video/gstvideoaggregator.c -index 2e3d813be..04dad6563 100644 ---- a/gst-libs/gst/video/gstvideoaggregator.c -+++ b/gst-libs/gst/video/gstvideoaggregator.c -@@ -2786,6 +2786,7 @@ gst_video_aggregator_init (GstVideoAggregator * vagg, - { - GstCaps *src_template; - GstPadTemplate *pad_template; -+ gint i; - - vagg->priv = gst_video_aggregator_get_instance_private (vagg); - vagg->priv->current_caps = NULL; -@@ -2800,7 +2801,7 @@ gst_video_aggregator_init (GstVideoAggregator * vagg, - pad_template = - gst_element_class_get_pad_template (GST_ELEMENT_CLASS (klass), "src"); - src_template = gst_pad_template_get_caps (pad_template); -- for (gint i = 0; i < gst_caps_get_size (src_template); i++) { -+ for (i = 0; i < gst_caps_get_size (src_template); i++) { - const GValue *v = - gst_structure_get_value (gst_caps_get_structure (src_template, i), - "format"); --- -2.29.2 - diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash index 200ba0fe5d..081dc6f213 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.18.5.tar.xz.sha256sum -sha256 960b7af4585700db0fdd5b843554e11e2564fed9e061f591fae88a7be6446fa3 gst-plugins-base-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.18.6.tar.xz.sha256sum +sha256 56a9ff2fe9e6603b9e658cf6897d412a173d2180829fe01e92568549c6bd0f5b gst-plugins-base-1.18.6.tar.xz sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk index 76757fd6a8..c99eeb6c59 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BASE_VERSION = 1.18.5 +GST1_PLUGINS_BASE_VERSION = 1.18.6 GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz GST1_PLUGINS_BASE_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-base GST1_PLUGINS_BASE_INSTALL_STAGING = YES -- 2.34.1 From ps.report at gmx.net Fri Feb 4 15:46:22 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 4 Feb 2022 16:46:22 +0100 Subject: [Buildroot] [PATCH v1 03/12] package/gst1-plugins-good: bump version to 1.18.6 In-Reply-To: <20220204154631.17814-1-ps.report@gmx.net> References: <20220204154631.17814-1-ps.report@gmx.net> Message-ID: <20220204154631.17814-4-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash | 4 ++-- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash index ea9f43bfd2..e342bd133e 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.5.tar.xz.sha256sum -sha256 3aaeeea7765fbf8801acce4a503a9b05f73f04e8a35352e9d00232cfd555796b gst-plugins-good-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.6.tar.xz.sha256sum +sha256 26723ac01fcb360ade1f41d168c7c322d8af4ceb7e55c8c12ed2690d06a76eed gst-plugins-good-1.18.6.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk index 44da3c3c30..e0ca29c5fd 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_GOOD_VERSION = 1.18.5 +GST1_PLUGINS_GOOD_VERSION = 1.18.6 GST1_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST1_PLUGINS_GOOD_VERSION).tar.xz GST1_PLUGINS_GOOD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-good GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING -- 2.34.1 From ps.report at gmx.net Fri Feb 4 15:46:26 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 4 Feb 2022 16:46:26 +0100 Subject: [Buildroot] [PATCH v1 07/12] package/gst1-libav: bump version to 1.18.6 In-Reply-To: <20220204154631.17814-1-ps.report@gmx.net> References: <20220204154631.17814-1-ps.report@gmx.net> Message-ID: <20220204154631.17814-8-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-libav/gst1-libav.hash | 4 ++-- package/gstreamer1/gst1-libav/gst1-libav.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-libav/gst1-libav.hash b/package/gstreamer1/gst1-libav/gst1-libav.hash index 040a6e33f3..5fb39a0b3e 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.hash +++ b/package/gstreamer1/gst1-libav/gst1-libav.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.18.5.tar.xz.sha256sum -sha256 822e008a910e9dd13aedbdd8dc63fedef4040c0ee2e927bab3112e9de693a548 gst-libav-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.18.6.tar.xz.sha256sum +sha256 e4e50dcd5a29441ae34de60d2221057e8064ed824bb6ca4dc0fd9ee88fbe9b81 gst-libav-1.18.6.tar.xz sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gst1-libav/gst1-libav.mk b/package/gstreamer1/gst1-libav/gst1-libav.mk index 01ec4d2c98..55c6e06e0e 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.mk +++ b/package/gstreamer1/gst1-libav/gst1-libav.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_LIBAV_VERSION = 1.18.5 +GST1_LIBAV_VERSION = 1.18.6 GST1_LIBAV_SOURCE = gst-libav-$(GST1_LIBAV_VERSION).tar.xz GST1_LIBAV_SITE = https://gstreamer.freedesktop.org/src/gst-libav GST1_LIBAV_LICENSE = LGPL-2.0+ -- 2.34.1 From ps.report at gmx.net Fri Feb 4 15:46:28 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 4 Feb 2022 16:46:28 +0100 Subject: [Buildroot] [PATCH v1 09/12] package/gst1-rtsp-server: bump version to 1.18.6 In-Reply-To: <20220204154631.17814-1-ps.report@gmx.net> References: <20220204154631.17814-1-ps.report@gmx.net> Message-ID: <20220204154631.17814-10-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash | 4 ++-- package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash index 627a451d04..fadef41351 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash @@ -1,4 +1,4 @@ -# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.18.5.tar.xz.sha256sum -sha256 04d63bf48816c6f41c73f6de0f912a7cef0aab39c44162a7bcece1923dfc9d1f gst-rtsp-server-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.18.6.tar.xz.sha256sum +sha256 826f32afbcf94b823541efcac4a0dacdb62f6145ef58f363095749f440262be9 gst-rtsp-server-1.18.6.tar.xz sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING.LIB diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk index 37942423a5..55403754f3 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_RTSP_SERVER_VERSION = 1.18.5 +GST1_RTSP_SERVER_VERSION = 1.18.6 GST1_RTSP_SERVER_SOURCE = gst-rtsp-server-$(GST1_RTSP_SERVER_VERSION).tar.xz GST1_RTSP_SERVER_SITE = http://gstreamer.freedesktop.org/src/gst-rtsp-server GST1_RTSP_SERVER_LICENSE = LGPL-2.0+ -- 2.34.1 From ps.report at gmx.net Fri Feb 4 15:46:27 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 4 Feb 2022 16:46:27 +0100 Subject: [Buildroot] [PATCH v1 08/12] package/gst1-vaapi: bump version to 1.18.6 In-Reply-To: <20220204154631.17814-1-ps.report@gmx.net> References: <20220204154631.17814-1-ps.report@gmx.net> Message-ID: <20220204154631.17814-9-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-vaapi/gst1-vaapi.hash | 4 ++-- package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash index b0c19fc600..7e22774c11 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.18.5.tar.xz.sha256sum -sha256 4a460fb95559f41444eb24864ad2d9e37922b6eea941510310319fc3e0ba727b gstreamer-vaapi-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.18.6.tar.xz.sha256sum +sha256 ab6270f1e5e4546fbe6f5ea246d86ca3d196282eb863d46e6cdcc96f867449e0 gstreamer-vaapi-1.18.6.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk index 9810b12cf7..6af851602f 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_VAAPI_VERSION = 1.18.5 +GST1_VAAPI_VERSION = 1.18.6 GST1_VAAPI_SITE = https://gstreamer.freedesktop.org/src/gstreamer-vaapi GST1_VAAPI_SOURCE = gstreamer-vaapi-$(GST1_VAAPI_VERSION).tar.xz GST1_VAAPI_LICENSE = LGPL-2.1+ -- 2.34.1 From ps.report at gmx.net Fri Feb 4 15:46:31 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 4 Feb 2022 16:46:31 +0100 Subject: [Buildroot] [PATCH v1 12/12] package/gst1-python: bump version to 1.18.6 In-Reply-To: <20220204154631.17814-1-ps.report@gmx.net> References: <20220204154631.17814-1-ps.report@gmx.net> Message-ID: <20220204154631.17814-13-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-python/gst1-python.hash | 4 ++-- package/gstreamer1/gst1-python/gst1-python.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-python/gst1-python.hash b/package/gstreamer1/gst1-python/gst1-python.hash index 2035c81fea..a760e53e7d 100644 --- a/package/gstreamer1/gst1-python/gst1-python.hash +++ b/package/gstreamer1/gst1-python/gst1-python.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.18.5.tar.xz.sha256sum -sha256 533685871305959d6db89507f3b3aa6c765c2f2b0dacdc32c5a6543e72e5bc52 gst-python-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.18.6.tar.xz.sha256sum +sha256 bdc0ea22fbd7335ad9decc151561aacc53c51206a9735b81eac700ce5b0bbd4a gst-python-1.18.6.tar.xz sha256 ea3ad127610e5ded2210b3a86a46314f2b3b28e438eccffdae19a4d6fbcdb0c2 COPYING diff --git a/package/gstreamer1/gst1-python/gst1-python.mk b/package/gstreamer1/gst1-python/gst1-python.mk index 614cb22396..7faab752cd 100644 --- a/package/gstreamer1/gst1-python/gst1-python.mk +++ b/package/gstreamer1/gst1-python/gst1-python.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PYTHON_VERSION = 1.18.5 +GST1_PYTHON_VERSION = 1.18.6 GST1_PYTHON_SOURCE = gst-python-$(GST1_PYTHON_VERSION).tar.xz GST1_PYTHON_SITE = https://gstreamer.freedesktop.org/src/gst-python GST1_PYTHON_INSTALL_STAGING = YES -- 2.34.1 From ps.report at gmx.net Fri Feb 4 15:46:29 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 4 Feb 2022 16:46:29 +0100 Subject: [Buildroot] [PATCH v1 10/12] package/gstreamer1-editing-services: bump version to 1.18.6 In-Reply-To: <20220204154631.17814-1-ps.report@gmx.net> References: <20220204154631.17814-1-ps.report@gmx.net> Message-ID: <20220204154631.17814-11-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- .../gstreamer1-editing-services.hash | 4 ++-- .../gstreamer1-editing-services.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash index daaf729c70..e29dc112ce 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash @@ -1,5 +1,5 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.18.5.tar.xz.sha256sum -sha256 8af4a8394d051f3e18280686db49a6efaccc95c0c59a17f0f564e32000590df5 gst-editing-services-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.18.6.tar.xz.sha256sum +sha256 fe10d14ef896aa21038317f6f81e1158ccc6caaed9b0d5a29ae5bdd63074582c gst-editing-services-1.18.6.tar.xz # Hashes for license files: sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk index d3de79c5f6..a3722cbbca 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_EDITING_SERVICES_VERSION = 1.18.5 +GSTREAMER1_EDITING_SERVICES_VERSION = 1.18.6 GSTREAMER1_EDITING_SERVICES_SOURCE = gst-editing-services-$(GSTREAMER1_EDITING_SERVICES_VERSION).tar.xz GSTREAMER1_EDITING_SERVICES_SITE = https://gstreamer.freedesktop.org/src/gstreamer-editing-services GSTREAMER1_EDITING_SERVICES_LICENSE = LGPL-2.0+ -- 2.34.1 From ps.report at gmx.net Fri Feb 4 15:46:24 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 4 Feb 2022 16:46:24 +0100 Subject: [Buildroot] [PATCH v1 05/12] package/gst1-plugins-ugly: bump version to 1.18.6 In-Reply-To: <20220204154631.17814-1-ps.report@gmx.net> References: <20220204154631.17814-1-ps.report@gmx.net> Message-ID: <20220204154631.17814-6-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash | 4 ++-- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash index 93945cdecd..26fd0fd9ac 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.18.5.tar.xz.sha256sum -sha256 df32803e98f8a9979373fa2ca7e05e62f977b1097576d3a80619d9f5c69f66d9 gst-plugins-ugly-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.18.6.tar.xz.sha256sum +sha256 4969c409cb6a88317d2108b8577108e18623b2333d7b587ae3f39459c70e3a7f gst-plugins-ugly-1.18.6.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk index a25110264e..7f483deb81 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_UGLY_VERSION = 1.18.5 +GST1_PLUGINS_UGLY_VERSION = 1.18.6 GST1_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST1_PLUGINS_UGLY_VERSION).tar.xz GST1_PLUGINS_UGLY_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-ugly GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING -- 2.34.1 From ps.report at gmx.net Fri Feb 4 15:46:25 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 4 Feb 2022 16:46:25 +0100 Subject: [Buildroot] [PATCH v1 06/12] package/gst1-devtools: bump version to 1.18.6 In-Reply-To: <20220204154631.17814-1-ps.report@gmx.net> References: <20220204154631.17814-1-ps.report@gmx.net> Message-ID: <20220204154631.17814-7-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-devtools/gst1-devtools.hash | 4 ++-- package/gstreamer1/gst1-devtools/gst1-devtools.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.hash b/package/gstreamer1/gst1-devtools/gst1-devtools.hash index c19254c195..011385e757 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.hash +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.18.5.tar.xz.sha256sum -sha256 fecffc86447daf5c2a06843c757a991d745caa2069446a0d746e99b13f7cb079 gst-devtools-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.18.6.tar.xz.sha256sum +sha256 3725622c740a635452e54b79d065f963ab7706ca2403de6c43072ae7610a0de4 gst-devtools-1.18.6.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 validate/COPYING diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.mk b/package/gstreamer1/gst1-devtools/gst1-devtools.mk index 1c25823953..66b509ae2c 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.mk +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_DEVTOOLS_VERSION = 1.18.5 +GST1_DEVTOOLS_VERSION = 1.18.6 GST1_DEVTOOLS_SOURCE = gst-devtools-$(GST1_DEVTOOLS_VERSION).tar.xz GST1_DEVTOOLS_SITE = https://gstreamer.freedesktop.org/src/gst-devtools GST1_DEVTOOLS_LICENSE = LGPL-2.1+ -- 2.34.1 From ps.report at gmx.net Fri Feb 4 15:46:30 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 4 Feb 2022 16:46:30 +0100 Subject: [Buildroot] [PATCH v1 11/12] package/gst-omx: bump version to 1.18.6 In-Reply-To: <20220204154631.17814-1-ps.report@gmx.net> References: <20220204154631.17814-1-ps.report@gmx.net> Message-ID: <20220204154631.17814-12-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gst-omx/gst-omx.hash | 4 ++-- package/gstreamer1/gst-omx/gst-omx.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst-omx/gst-omx.hash b/package/gstreamer1/gst-omx/gst-omx.hash index 9040393506..47f7cb5893 100644 --- a/package/gstreamer1/gst-omx/gst-omx.hash +++ b/package/gstreamer1/gst-omx/gst-omx.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.18.5.tar.xz.sha256sum -sha256 2cd457c1e8deb1a9b39608048fb36a44f6c9a864a6b6115b1453a32e7be93b42 gst-omx-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.18.6.tar.xz.sha256sum +sha256 b5281c938e959fd2418e989cfb6065fdd9fe5f6f87ee86236c9427166e708163 gst-omx-1.18.6.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst-omx/gst-omx.mk b/package/gstreamer1/gst-omx/gst-omx.mk index f7be1d59ef..dc65509244 100644 --- a/package/gstreamer1/gst-omx/gst-omx.mk +++ b/package/gstreamer1/gst-omx/gst-omx.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST_OMX_VERSION = 1.18.5 +GST_OMX_VERSION = 1.18.6 GST_OMX_SOURCE = gst-omx-$(GST_OMX_VERSION).tar.xz GST_OMX_SITE = https://gstreamer.freedesktop.org/src/gst-omx -- 2.34.1 From ps.report at gmx.net Fri Feb 4 15:46:23 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 4 Feb 2022 16:46:23 +0100 Subject: [Buildroot] [PATCH v1 04/12] package/gst1-plugins-bad: bump version to 1.18.6 In-Reply-To: <20220204154631.17814-1-ps.report@gmx.net> References: <20220204154631.17814-1-ps.report@gmx.net> Message-ID: <20220204154631.17814-5-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash | 4 ++-- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash index cbb2729dab..d31a78981e 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.5.tar.xz.sha256sum -sha256 a164923b94f0d08578a6fcaeaac6e0c05da788a46903a1086870e9ca45ad678e gst-plugins-bad-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.6.tar.xz.sha256sum +sha256 0b1b50ac6311f0c510248b6cd64d6d3c94369344828baa602db85ded5bc70ec9 gst-plugins-bad-1.18.6.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index ac00fd59e1..d02ca1ba74 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BAD_VERSION = 1.18.5 +GST1_PLUGINS_BAD_VERSION = 1.18.6 GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz GST1_PLUGINS_BAD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-bad GST1_PLUGINS_BAD_INSTALL_STAGING = YES -- 2.34.1 From bernd.kuhls at t-online.de Fri Feb 4 16:45:28 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Fri, 4 Feb 2022 17:45:28 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi-pvr-mythtv: bump version to 19.0.7-Matrix Message-ID: <20220204164528.80593-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 cb10d24a4f..15596333f5 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 8e63e85e055ec1e2d727506c939c4f53f6aef8b714f5c18f73c58102355f2e14 kodi-pvr-mythtv-19.0.6-Matrix.tar.gz +sha256 ccb97573c308c99adccdedf8328133c02d48c11620b602a906cf25107602dba5 kodi-pvr-mythtv-19.0.7-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 351fbc4eae..3040f87e14 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.6-Matrix +KODI_PVR_MYTHTV_VERSION = 19.0.7-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 dan at thejacksons.uk Fri Feb 4 16:55:21 2022 From: dan at thejacksons.uk (Dan Jackson) Date: Fri, 4 Feb 2022 16:55:21 +0000 Subject: [Buildroot] Getting Buildroot-created binaries to work with the Intel (TI) Puma 5 ARM-based CPU? Message-ID: Hello everyone, I am new to Buildroot, so I hope you will forgive me if I make any obvious mistakes or omissions in my email. I hope this mailing list is the correct place to post my query, normally I would ask on forums or in Github issues, but Buildroot seems not to have a forum and its Github explicitly says not to post queries in the issues there. I have been experimenting with an old router, which uses an Intel Puma 5 ARM-based CPU (it's my understanding that Intel bought this design from Texas Instruments). At the moment I am not looking to replace the whole operating system, initially I would just like to build some binaries (such as dropbear for example) to make the exploration process easier. The original software on the device was built with an ancient version of Buildroot - a config file can be seen in the /etc folder - and many of the options specified no longer exist in current Buildroot versions or relate to proprietary software components for which source code is not available. There are two other Puma 5 toolchains I have come across on the Internet, and both of these are also based on old Buildroot versions, but also patch these with a number of things, such as compiler command line switches and options file tweaks. Unfortunately, the older Buildroot versions do not seem to function properly on modern Linux installations. So, I was wondering what would need to be done to enable creation of Puma 5 compatible binaries using the current stable version of Buildroot? Links to the two toolchains I mentioned: https://github.com/bmaia/cross-utils/tree/master/armeb/puma5_toolchain (uses Buildroot 2009.02) https://sourceforge.net/projects/dg3270.arris/files/DG3270_9.1.103FB/ (uses Buildroot 2013.08.1) Thanks, Dan Jackson. From james.hilliard1 at gmail.com Fri Feb 4 17:12:13 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 4 Feb 2022 10:12:13 -0700 Subject: [Buildroot] qt5webengine build failure on gitlab-CI In-Reply-To: <67349e3c-373f-905a-840a-55c4b8143906@benettiengineering.com> References: <1662cf67-b9ef-33be-c5c4-5d5e786f944a@benettiengineering.com> <67349e3c-373f-905a-840a-55c4b8143906@benettiengineering.com> Message-ID: On Fri, Feb 4, 2022 at 4:21 AM Giulio Benetti wrote: > > On 04/02/22 11:27, Giulio Benetti wrote: > > Hi James, > > > > On 04/02/22 09:52, James Hilliard wrote: > >> On Thu, Feb 3, 2022 at 6:03 PM Giulio Benetti > >> wrote: > >>> > >>> Hi Peter and James, > >>> > >>> I can fix this build failure[1] due to qt5webengine, you're the experts > >>> here, can you take a look please? > >>> > >>> You have to build using official docker as I've described in this patch > >>> for the manual: > >>> https://patchwork.ozlabs.org/project/buildroot/patch/20220203235438.610277-1-giulio.benetti at benettiengineering.com/ > >>> > >>> I've tried this patch: > >>> https://patchwork.ozlabs.org/project/buildroot/patch/20220117114358.3814200-1-james.hilliard1 at gmail.com/ > >>> but it didn't help :-/ > >> > >> I've got a WIP branch that should hopefully fix this and a bunch of > >> related issues, > >> cleaning it up at the moment: > >> https://github.com/buildroot/buildroot/compare/master...jameshilliard:qt5webengine-kde > > > > This is a good improvement, but I need something to fix the actual > > problem and that can be eventually backported, so this: > > https://patchwork.ozlabs.org/project/buildroot/patch/20201221203952.22168-3-ps.report at gmx.net/ > > fits more our needs for the moment. > > I was wrong, I haven't pulled the master branch so I was still building > 5.15.2 and no 5.15.8 The master branch still uses 5.15.2. > > Look forward for having your patch to test then. > > Thank you! > Best regards > -- > Giulio Benetti > Benetti Engineering sas From peter at korsgaard.com Fri Feb 4 17:47:11 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 4 Feb 2022 18:47:11 +0100 Subject: [Buildroot] [PATCH] package/{glibc, localedef}: security bump for additional post-2.34.x fixes Message-ID: <20220204174712.1109-1-peter@korsgaard.com> Fixes the following security issues: CVE-2022-23219: Passing an overlong file name to the clnt_create legacy function could result in a stack-based buffer overflow when using the "unix" protocol. Reported by Martin Sebor. CVE-2022-23218: Passing an overlong file name to the svcunix_create legacy function could result in a stack-based buffer overflow. CVE-2021-3998: Passing a path longer than PATH_MAX to the realpath function could result in a memory leak and potential access of uninitialized memory. Reported by Qualys. CVE-2021-3999: Passing a buffer of size exactly 1 byte to the getcwd function may result in an off-by-one buffer underflow and overflow when the current working directory is longer than PATH_MAX and also corresponds to the / directory through an unprivileged mount namespace. Reported by Qualys. Signed-off-by: Peter Korsgaard --- ...1-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch | 0 .../glibc.hash | 2 +- package/glibc/glibc.mk | 2 +- .../0001-HACK-only-build-and-install-localedef.patch | 0 ...02-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch | 0 .../localedef.hash | 2 +- package/localedef/localedef.mk | 2 +- 7 files changed, 4 insertions(+), 4 deletions(-) rename package/glibc/{2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4 => 2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c}/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch (100%) rename package/glibc/{2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4 => 2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c}/glibc.hash (70%) rename package/localedef/{2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4 => 2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c}/0001-HACK-only-build-and-install-localedef.patch (100%) rename package/localedef/{2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4 => 2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c}/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch (100%) rename package/localedef/{2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4 => 2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c}/localedef.hash (70%) 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-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch similarity index 100% rename from package/glibc/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch rename to package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch diff --git a/package/glibc/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/glibc.hash b/package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/glibc.hash similarity index 70% rename from package/glibc/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/glibc.hash rename to package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/glibc.hash index 595de95a58..dfd939020f 100644 --- a/package/glibc/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/glibc.hash +++ b/package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/glibc.hash @@ -1,5 +1,5 @@ # Locally calculated (fetched from Github) -sha256 1c7ed0f69ed268bd66f9754d0cb8fb65e0dafc1f9a1048ea50d1e96d60399686 glibc-2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4.tar.gz +sha256 3c299a21468a80356b848ca341f45551616c4928a6c871e6d45cee942e8b0f24 glibc-2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c.tar.gz # Hashes for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index 5c26b0e6df..9b591aa2a3 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -7,7 +7,7 @@ # Generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- # When updating the version, please also update localedef -GLIBC_VERSION = 2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4 +GLIBC_VERSION = 2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c # Upstream doesn't officially provide an https download link. # There is one (https://sourceware.org/git/glibc.git) but it's not reliable, # sometimes the connection times out. So use an unofficial github mirror. diff --git a/package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0001-HACK-only-build-and-install-localedef.patch b/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-HACK-only-build-and-install-localedef.patch similarity index 100% rename from package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0001-HACK-only-build-and-install-localedef.patch rename to package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-HACK-only-build-and-install-localedef.patch diff --git a/package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch b/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch similarity index 100% rename from package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch rename to package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch diff --git a/package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/localedef.hash b/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/localedef.hash similarity index 70% rename from package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/localedef.hash rename to package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/localedef.hash index 595de95a58..dfd939020f 100644 --- a/package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/localedef.hash +++ b/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/localedef.hash @@ -1,5 +1,5 @@ # Locally calculated (fetched from Github) -sha256 1c7ed0f69ed268bd66f9754d0cb8fb65e0dafc1f9a1048ea50d1e96d60399686 glibc-2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4.tar.gz +sha256 3c299a21468a80356b848ca341f45551616c4928a6c871e6d45cee942e8b0f24 glibc-2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c.tar.gz # Hashes for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/localedef/localedef.mk b/package/localedef/localedef.mk index 87d921cffe..f8f0b42984 100644 --- a/package/localedef/localedef.mk +++ b/package/localedef/localedef.mk @@ -7,7 +7,7 @@ # Use the same VERSION and SITE as target glibc # As in glibc.mk, generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- -LOCALEDEF_VERSION = 2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4 +LOCALEDEF_VERSION = 2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION).tar.gz LOCALEDEF_SITE = $(call github,bminor,glibc,$(LOCALEDEF_VERSION)) HOST_LOCALEDEF_DL_SUBDIR = glibc -- 2.20.1 From giulio.benetti at benettiengineering.com Fri Feb 4 18:55:08 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 4 Feb 2022 19:55:08 +0100 Subject: [Buildroot] qt5webengine build failure on gitlab-CI In-Reply-To: References: <1662cf67-b9ef-33be-c5c4-5d5e786f944a@benettiengineering.com> <67349e3c-373f-905a-840a-55c4b8143906@benettiengineering.com> Message-ID: On 04/02/22 18:12, James Hilliard wrote: [SNIP] >> I was wrong, I haven't pulled the master branch so I was still building >> 5.15.2 and no 5.15.8 > > The master branch still uses 5.15.2. Yes, I've mixed things up. qt5 uses 5.15.8 but qt5webengine still uses 5.15.2 Best regards -- Giulio Benetti Benetti Engineering sas From aduskett at gmail.com Fri Feb 4 19:32:15 2022 From: aduskett at gmail.com (Adam Duskett) Date: Fri, 4 Feb 2022 11:32:15 -0800 Subject: [Buildroot] [PATCH 1/1] package/python-django: bump to version 4.0.2 Message-ID: <20220204193215.167521-1-aduskett@gmail.com> Tested with: support/testing/run-tests tests.package.test_python_django.TestPythonPy3Django Signed-off-by: Adam Duskett --- 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 89bc5ffb19..f78df56c5f 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 6c4a53d2ccb464bc3dd772c6f2f07df9 Django-3.2.11.tar.gz -sha256 69c94abe5d6b1b088bf475e09b7b74403f943e34da107e798465d2045da27e75 Django-3.2.11.tar.gz +md5 a86339c0e87241597afa8744704d9965 Django-4.0.2.tar.gz +sha256 110fb58fb12eca59e072ad59fc42d771cd642dd7a2f2416582aa9da7a8ef954a Django-4.0.2.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-django/python-django.mk b/package/python-django/python-django.mk index 25a645823b..652ca477ce 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 3.2.11 +PYTHON_DJANGO_VERSION = 4.0.2 PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz # The official Django site has an unpractical URL -PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/20/86/e4348aac45bc83fc8e9dda2cfd81004b007c65b68c1499a4233acabdaa3b +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/61/84/676c840e8f1188a6c836e3224b97aa8be4c2e6857c690d6c564eb23a4975 PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE -- 2.34.1 From aduskett at gmail.com Fri Feb 4 20:56:33 2022 From: aduskett at gmail.com (Adam Duskett) Date: Fri, 4 Feb 2022 12:56:33 -0800 Subject: [Buildroot] [PATCH v4 2/3] package/dracut: new host package In-Reply-To: <20220110124644.1388438-2-thierry.bultel@linatsea.fr> References: <20220110124644.1388438-1-thierry.bultel@linatsea.fr> <20220110124644.1388438-2-thierry.bultel@linatsea.fr> Message-ID: Hello! Thank you for the patch series! Hopefully I can help a bit. First things first: - dracut.hash is missing. - Please run ./utils/check-package package/dracut/* and fix any warnings Your Dracut package does not depend on systemd, which results in the error: dracut: FAILED: output/host/lib/dracut/dracut-install -r output/build/buildroot-fs/cpio/target -D output/build/buildroot-fs/cpio/tmp/dracut.Sm7N5J/initramfs -a -l udevadm cat uname blkid dracut: Cannot find [systemd-]udevd binary! I do have a dracut package you may find useful here: https://gitlab.com/aduskett/buildroot/-/tree/dracut/external/package/dracut Thanks! Adam On Mon, Jan 10, 2022 at 4:57 AM Thierry Bultel wrote: > > 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 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From aduskett at gmail.com Fri Feb 4 21:00:21 2022 From: aduskett at gmail.com (Adam Duskett) Date: Fri, 4 Feb 2022 13:00:21 -0800 Subject: [Buildroot] [PATCH v4 2/3] package/dracut: new host package In-Reply-To: References: <20220110124644.1388438-1-thierry.bultel@linatsea.fr> <20220110124644.1388438-2-thierry.bultel@linatsea.fr> Message-ID: One other thing: I do not believe cross-ldd is needed. My package uses the existing host-prelink-cross package. On Fri, Feb 4, 2022 at 12:56 PM Adam Duskett wrote: > > Hello! Thank you for the patch series! Hopefully I can help a bit. > > First things first: > - dracut.hash is missing. > - Please run ./utils/check-package package/dracut/* and fix any warnings > > Your Dracut package does not depend on systemd, which results in the error: > > dracut: FAILED: output/host/lib/dracut/dracut-install -r > output/build/buildroot-fs/cpio/target -D > output/build/buildroot-fs/cpio/tmp/dracut.Sm7N5J/initramfs -a -l > udevadm cat uname blkid > dracut: Cannot find [systemd-]udevd binary! > > I do have a dracut package you may find useful here: > https://gitlab.com/aduskett/buildroot/-/tree/dracut/external/package/dracut > > Thanks! > Adam > > On Mon, Jan 10, 2022 at 4:57 AM Thierry Bultel > wrote: > > > > 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 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot From thierry.bultel at linatsea.fr Fri Feb 4 21:48:59 2022 From: thierry.bultel at linatsea.fr (Thierry Bultel) Date: Fri, 4 Feb 2022 22:48:59 +0100 Subject: [Buildroot] [PATCH v4 2/3] package/dracut: new host package In-Reply-To: References: <20220110124644.1388438-1-thierry.bultel@linatsea.fr> <20220110124644.1388438-2-thierry.bultel@linatsea.fr> Message-ID: <6c7e0795-0402-16c4-6d8c-7c2eb4b98529@linatsea.fr> Hi Adam, thanks for the comments, mine follow below ... Le 04/02/2022 ? 21:56, Adam Duskett a ?crit?: > Hello! Thank you for the patch series! Hopefully I can help a bit. > > First things first: > - dracut.hash is missing. Sure. I will had it. > - Please run ./utils/check-package package/dracut/* and fix any warnings I am pretty sure I had done in at least once. Will recheck, thanks; > > Your Dracut package does not depend on systemd, which results in the error: > > dracut: FAILED: output/host/lib/dracut/dracut-install -r > output/build/buildroot-fs/cpio/target -D > output/build/buildroot-fs/cpio/tmp/dracut.Sm7N5J/initramfs -a -l > udevadm cat uname blkid > dracut: Cannot find [systemd-]udevd binary! I do no agree. Despite of the fact that dracut was indeed thought to use systemd, it is absolutely possible to use it without. That is what the provided configuration file in my cpio patch does (support/testing/conf/dracut.conf). I personally use with busybox init. About host-prelink-cross, I have to check that it works in the configurations I have. Thanks, Thierry > > I do have a dracut package you may find useful here: > https://gitlab.com/aduskett/buildroot/-/tree/dracut/external/package/dracut > > Thanks! > Adam > > On Mon, Jan 10, 2022 at 4:57 AM Thierry Bultel > wrote: >> 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 >> >> _______________________________________________ >> 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 -- 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 peter at korsgaard.com Fri Feb 4 21:54:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 04 Feb 2022 22:54:42 +0100 Subject: [Buildroot] [PATCH 1/2] package/kodi-pvr-hts: bump version to 19.0.6-Matrix In-Reply-To: <20220203190432.1637478-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Thu, 3 Feb 2022 20:04:31 +0100") References: <20220203190432.1637478-1-bernd.kuhls@t-online.de> Message-ID: <87mtj6xpp9.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 4 21:54:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 04 Feb 2022 22:54:47 +0100 Subject: [Buildroot] [PATCH 2/2] package/kodi-pvr-iptvsimple: bump version to 19.1.0-Matrix In-Reply-To: <20220203190432.1637478-2-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Thu, 3 Feb 2022 20:04:32 +0100") References: <20220203190432.1637478-1-bernd.kuhls@t-online.de> <20220203190432.1637478-2-bernd.kuhls@t-online.de> Message-ID: <87iltuxpp4.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 4 21:55:13 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 04 Feb 2022 22:55:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/ddrescue: bump to version 1.26 In-Reply-To: <20220203220504.667447-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 3 Feb 2022 23:05:04 +0100") References: <20220203220504.667447-1-fontaine.fabrice@gmail.com> Message-ID: <87ee4ixpoe.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://lists.gnu.org/archive/html/info-gnu/2022-01/msg00013.html > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 4 21:55:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 4 Feb 2022 22:55:01 +0100 Subject: [Buildroot] [git commit] package/ddrescue: bump to version 1.26 Message-ID: <20220204214813.4294D82B2E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ed81b96cc549eeb0951e84303106699f728e089c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://lists.gnu.org/archive/html/info-gnu/2022-01/msg00013.html Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/ddrescue/ddrescue.hash | 4 ++-- package/ddrescue/ddrescue.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ddrescue/ddrescue.hash b/package/ddrescue/ddrescue.hash index 6877b7008d..f7c82b086b 100644 --- a/package/ddrescue/ddrescue.hash +++ b/package/ddrescue/ddrescue.hash @@ -1,4 +1,4 @@ -# From https://lists.gnu.org/archive/html/info-gnu/2020-03/msg00002.html -sha256 ce538ebd26a09f45da67d3ad3f7431932428231ceec7a2d255f716fa231a1063 ddrescue-1.25.tar.lz +# From https://lists.gnu.org/archive/html/info-gnu/2022-01/msg00013.html +sha256 e513cd3a90d9810dfdd91197d40aa40f6df01597bfb5ecfdfb205de1127c551f ddrescue-1.26.tar.lz # Locally computed sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef COPYING diff --git a/package/ddrescue/ddrescue.mk b/package/ddrescue/ddrescue.mk index f113681fa1..6d16d8701f 100644 --- a/package/ddrescue/ddrescue.mk +++ b/package/ddrescue/ddrescue.mk @@ -4,7 +4,7 @@ # ################################################################################ -DDRESCUE_VERSION = 1.25 +DDRESCUE_VERSION = 1.26 DDRESCUE_SOURCE = ddrescue-$(DDRESCUE_VERSION).tar.lz DDRESCUE_SITE = http://download.savannah.gnu.org/releases/ddrescue DDRESCUE_LICENSE = GPL-2.0+ From peter at korsgaard.com Fri Feb 4 21:54:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 4 Feb 2022 22:54:09 +0100 Subject: [Buildroot] [git commit] package/kodi-pvr-hts: bump version to 19.0.6-Matrix Message-ID: <20220204214813.3243A81D75@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b8720e7048ade3a9409dbac1588854ba23d5f24f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/kodi-pvr-hts/kodi-pvr-hts.hash | 2 +- package/kodi-pvr-hts/kodi-pvr-hts.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-hts/kodi-pvr-hts.hash b/package/kodi-pvr-hts/kodi-pvr-hts.hash index 135b0088c4..40cd8fd62f 100644 --- a/package/kodi-pvr-hts/kodi-pvr-hts.hash +++ b/package/kodi-pvr-hts/kodi-pvr-hts.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 25799d0d043df7819c767adc89d081cbd6eb61d29135befbc621719274a1c074 kodi-pvr-hts-19.0.4-Matrix.tar.gz +sha256 990e5fd0757d48b86675aa124b77629e7fb2de6b27dcfd6f6ccc7ce181d04aeb kodi-pvr-hts-19.0.6-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-hts/kodi-pvr-hts.mk b/package/kodi-pvr-hts/kodi-pvr-hts.mk index 6c9e5a715f..caa90b7af6 100644 --- a/package/kodi-pvr-hts/kodi-pvr-hts.mk +++ b/package/kodi-pvr-hts/kodi-pvr-hts.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_HTS_VERSION = 19.0.4-Matrix +KODI_PVR_HTS_VERSION = 19.0.6-Matrix KODI_PVR_HTS_SITE = $(call github,kodi-pvr,pvr.hts,$(KODI_PVR_HTS_VERSION)) KODI_PVR_HTS_LICENSE = GPL-2.0+ KODI_PVR_HTS_LICENSE_FILES = LICENSE.md From peter at korsgaard.com Fri Feb 4 21:54:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 4 Feb 2022 22:54:19 +0100 Subject: [Buildroot] [git commit] package/kodi-pvr-iptvsimple: bump version to 19.1.0-Matrix Message-ID: <20220204214813.3A0CB81999@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=125ec43bf0ca74fbca5c96e6f436dabf945dd529 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash | 2 +- package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash index bd3d44d908..6ace3a5859 100644 --- a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash +++ b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 3df76fb7f03f2fd64c75526d5bf89b0f2300f70bf825794fa27bd6fbdd706fb2 kodi-pvr-iptvsimple-19.0.3-Matrix.tar.gz +sha256 c92736b3f3c96fe36d7b20b329c82b47180260e3ed40fc456ef709572fad5fb0 kodi-pvr-iptvsimple-19.1.0-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk index 5f5025cd80..eedb0fb817 100644 --- a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk +++ b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_IPTVSIMPLE_VERSION = 19.0.3-Matrix +KODI_PVR_IPTVSIMPLE_VERSION = 19.1.0-Matrix KODI_PVR_IPTVSIMPLE_SITE = $(call github,kodi-pvr,pvr.iptvsimple,$(KODI_PVR_IPTVSIMPLE_VERSION)) KODI_PVR_IPTVSIMPLE_LICENSE = GPL-2.0+ KODI_PVR_IPTVSIMPLE_LICENSE_FILES = LICENSE.md From peter at korsgaard.com Fri Feb 4 22:04:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 04 Feb 2022 23:04:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/libblockdev: bump to version 2.26 In-Reply-To: <20220203171715.658568-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 3 Feb 2022 18:17:15 +0100") References: <20220203171715.658568-1-fontaine.fabrice@gmail.com> Message-ID: <87a6f6xp89.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - Add upstream link to first patch > - Drop second patch (already in version) > https://github.com/storaged-project/libblockdev/blob/2.26-1/NEWS.rst > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 4 22:05:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 04 Feb 2022 23:05:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/bat: bump to version 0.19.0 In-Reply-To: <20220203184718.3173767-1-james.hilliard1@gmail.com> (James Hilliard's message of "Thu, 3 Feb 2022 11:47:18 -0700") References: <20220203184718.3173767-1-james.hilliard1@gmail.com> Message-ID: <875ypuxp7m.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 Feb 4 22:05:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 4 Feb 2022 23:05:04 +0100 Subject: [Buildroot] [git commit] package/bat: bump to version 0.19.0 Message-ID: <20220204215815.BE32E819CD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b4ddaeb080ec00891ec415d373236582d28e9c17 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/bat/bat.hash | 2 +- package/bat/bat.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/bat/bat.hash b/package/bat/bat.hash index aa6c8d743d..f4d3e32c34 100644 --- a/package/bat/bat.hash +++ b/package/bat/bat.hash @@ -1,4 +1,4 @@ # Locally generated -sha256 9c345788eb916777a60e7ff32031f1c92edc5565031e0c057bce860982768744 bat-0.18.3.tar.gz +sha256 7940641baaa61cd3bcd1c3db4804d179609d6ccd955868928a129bf3f853e0b2 bat-0.19.0.tar.gz sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE-APACHE sha256 64de710b6309a7db5e44ad0af382300c7fb6f6d116d8ae32f0164e05db033068 LICENSE-MIT diff --git a/package/bat/bat.mk b/package/bat/bat.mk index 9b619af172..dc29a85429 100644 --- a/package/bat/bat.mk +++ b/package/bat/bat.mk @@ -4,7 +4,7 @@ # ################################################################################ -BAT_VERSION = 0.18.3 +BAT_VERSION = 0.19.0 BAT_SITE = $(call github,sharkdp,bat,v$(BAT_VERSION)) BAT_LICENSE = Apache-2.0 or MIT BAT_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT From peter at korsgaard.com Fri Feb 4 22:04:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 4 Feb 2022 23:04:49 +0100 Subject: [Buildroot] [git commit] package/libblockdev: bump to version 2.26 Message-ID: <20220204215815.B38058184C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f54f61eb3a8c09e46137712796c2b93f4760a6d4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Add upstream link to first patch - Drop second patch (already in version) https://github.com/storaged-project/libblockdev/blob/2.26-1/NEWS.rst Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...ovide-replacement-function-for-strerror_l.patch | 2 ++ ...02-exec-Fix-deprecated-glib-function-call.patch | 32 ---------------------- package/libblockdev/libblockdev.hash | 2 +- package/libblockdev/libblockdev.mk | 2 +- 4 files changed, 4 insertions(+), 34 deletions(-) diff --git a/package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch b/package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch index 018e4c4489..d5c9b2dfdb 100644 --- a/package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch +++ b/package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch @@ -8,6 +8,8 @@ so let's provide a simple replacement function that falls back on strerror(). Signed-off-by: Thomas Petazzoni +[Upstream status: +https://github.com/storaged-project/libblockdev/pull/701] --- configure.ac | 2 ++ src/plugins/crypto.c | 7 +++++++ diff --git a/package/libblockdev/0002-exec-Fix-deprecated-glib-function-call.patch b/package/libblockdev/0002-exec-Fix-deprecated-glib-function-call.patch deleted file mode 100644 index 2c370a133f..0000000000 --- a/package/libblockdev/0002-exec-Fix-deprecated-glib-function-call.patch +++ /dev/null @@ -1,32 +0,0 @@ -From aad927a81fd9067865dc391c5bbff12ac51a0002 Mon Sep 17 00:00:00 2001 -From: Manuel Wassermann -Date: Thu, 1 Jul 2021 04:45:49 +0200 -Subject: [PATCH] exec: Fix deprecated glib function call Glib will rename - "g_spawn_check_exit_status()" to "g_spawn_check_wait_status()" in version - 2.69. - -[Retrieved from: -https://github.com/storaged-project/libblockdev/commit/aad927a81fd9067865dc391c5bbff12ac51a0002] -Signed-off-by: Fabrice Fontaine ---- - src/utils/exec.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/src/utils/exec.c b/src/utils/exec.c -index 317fb5525..8faeb289c 100644 ---- a/src/utils/exec.c -+++ b/src/utils/exec.c -@@ -236,7 +236,12 @@ gboolean bd_utils_exec_and_report_status_error (const gchar **argv, const BDExtr - /* g_spawn_sync set the status in the same way waitpid() does, we need - to get the process exit code manually (this is similar to calling - WEXITSTATUS but also sets the error for terminated processes */ -- if (!g_spawn_check_exit_status (exit_status, error)) { -+ -+ #if !GLIB_CHECK_VERSION(2, 69, 0) -+ #define g_spawn_check_wait_status(x,y) (g_spawn_check_exit_status (x,y)) -+ #endif -+ -+ if (!g_spawn_check_wait_status (exit_status, error)) { - if (g_error_matches (*error, G_SPAWN_ERROR, G_SPAWN_ERROR_FAILED)) { - /* process was terminated abnormally (e.g. using a signal) */ - g_free (stdout_data); diff --git a/package/libblockdev/libblockdev.hash b/package/libblockdev/libblockdev.hash index 101b99f1a8..53a3b0737f 100644 --- a/package/libblockdev/libblockdev.hash +++ b/package/libblockdev/libblockdev.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 555aa42a2db39649ad83253bdc902ab5bd63d39c123e0c8055c4de7fe7571668 libblockdev-2.25.tar.gz +sha256 c4c0e10b35ac632bda8ce6d200b5601184984dec387fe59185921eb42432e069 libblockdev-2.26.tar.gz sha256 97bdc721d875501b6243a456333fdfdb1ab64d31c4da2554de845caf4674b946 LICENSE diff --git a/package/libblockdev/libblockdev.mk b/package/libblockdev/libblockdev.mk index 39ae9230d9..36b74966fb 100644 --- a/package/libblockdev/libblockdev.mk +++ b/package/libblockdev/libblockdev.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBBLOCKDEV_VERSION = 2.25 +LIBBLOCKDEV_VERSION = 2.26 LIBBLOCKDEV_SITE = https://github.com/storaged-project/libblockdev/releases/download/$(LIBBLOCKDEV_VERSION)-1 LIBBLOCKDEV_LICENSE = LGPL-2.1 LIBBLOCKDEV_LICENSE_FILES = LICENSE From peter at korsgaard.com Fri Feb 4 22:16:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 04 Feb 2022 23:16:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/samba4: bump version to 4.15.4 In-Reply-To: <20220128095040.2706666-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Fri, 28 Jan 2022 10:50:40 +0100") References: <20220128095040.2706666-1-bernd.kuhls@t-online.de> Message-ID: <871r0ixopm.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Release notes: https://www.samba.org/samba/history/samba-4.15.4.html > Signed-off-by: Bernd Kuhls Committed, thanks. I see 4.15.5 is out with security fixes, care to send a patch for that? -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 4 22:15:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 4 Feb 2022 23:15:19 +0100 Subject: [Buildroot] [git commit] package/samba4: bump version to 4.15.4 Message-ID: <20220204220858.21DAE81EB3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6939ed917173c5b595f491478410a2ed1caf9342 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://www.samba.org/samba/history/samba-4.15.4.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/samba4/samba4.hash | 4 ++-- package/samba4/samba4.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 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 From peter at korsgaard.com Fri Feb 4 22:24:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 04 Feb 2022 23:24:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/{mesa3d, mesa3d-headers}: bump version to 21.3.5 In-Reply-To: <20220128095249.2707373-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Fri, 28 Jan 2022 10:52:49 +0100") References: <20220128095249.2707373-1-bernd.kuhls@t-online.de> Message-ID: <87wniaw9qw.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Release notes: > https://lists.freedesktop.org/archives/mesa-announce/2022-January/000660.html > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 4 22:24:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 04 Feb 2022 23:24:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/php: bump version to 8.0.15 In-Reply-To: <20220128094827.2705597-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Fri, 28 Jan 2022 10:48:27 +0100") References: <20220128094827.2705597-1-bernd.kuhls@t-online.de> Message-ID: <87sfsyw9qq.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Changelog: https://www.php.net/ChangeLog-8.php#8.0.15 > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 4 22:24:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 4 Feb 2022 23:24:33 +0100 Subject: [Buildroot] [git commit] package/php: bump version to 8.0.15 Message-ID: <20220204221759.9EE5582195@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b784733f9cfd661f013dde1b0aa5347e825a4187 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog: https://www.php.net/ChangeLog-8.php#8.0.15 Signed-off-by: Bernd Kuhls 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 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 From peter at korsgaard.com Fri Feb 4 22:24:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 4 Feb 2022 23:24:26 +0100 Subject: [Buildroot] [git commit] package/{mesa3d, mesa3d-headers}: bump version to 21.3.5 Message-ID: <20220204221759.94E8381E3B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bd6f38c254d83e12c67a987e6941aea632552417 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://lists.freedesktop.org/archives/mesa-announce/2022-January/000660.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/mesa3d.hash | 6 +++--- package/mesa3d/mesa3d.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 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 c572f9b1aa..5f080ff5fc 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 From thomas.petazzoni at bootlin.com Sat Feb 5 07:06:34 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 05 Feb 2022 07:06:34 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-02-04 Message-ID: <20220205070641.26F7960E8F@smtp3.osuosl.org> Hello, Autobuild statistics for 2022-02-04 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 60 | 4 | 0 | 64 | 2021.11.x | 28 | 0 | 0 | 28 | master | 78 | 61 | 0 | 139 | Classification of failures by reason for master ----------------------------------------------- host-libselinux-3.3 | 16 host-python-docutils-0.15.2 | 12 unknown | 5 frr-8.1 | 4 python-docutils-0.15.2 | 3 rygel-0.40.2 | 3 bluez5_utils-5.63 | 2 host-delve-1.8.0 | 2 pulseview-0.4.2 | 2 bat-0.18.3 | 1 belle-sip-4.4.8 | 1 bird-2.0.8 | 1 boinc-7.18.1 | 1 guile-3.0.7 | 1 host-go-1.17.6 | 1 libuhttpd-3.14.1 | 1 Makefile:747: target-finalize | 1 mongrel2-1.13.0 | 1 nodejs-14.18.3 | 1 qt-webkit-kiosk-a7720e50f2b... | 1 systemd-250.3 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | bat-0.18.3 | NOK | http://autobuild.buildroot.net/results/edee65777efc5f9e0285dfaf1569f092a7731bce | nios2 | belle-sip-4.4.8 | NOK | http://autobuild.buildroot.net/results/846597f3573d3b0d52e80627a9577d14b9348547 | mips64el | bird-2.0.8 | NOK | http://autobuild.buildroot.net/results/993d48876c27a75b4e837806b69b1beba3761c3d | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/f64741f288ab4d4374f810b36d97cfc571fde7e5 | mips64el | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/613a8a856b02c1e318eb5db12134977c568d0d33 | riscv32 | boinc-7.18.1 | NOK | http://autobuild.buildroot.net/results/05bdd820059b624b8d2785cd0b5b3971b0880a0b | mips64el | frr-8.1 | NOK | http://autobuild.buildroot.net/results/e14997abce0b4213437c75ede798b6923788841c | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/93384959e54badf0903321437027aa06f6f8f98c | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/130094ebd3c27f9f123a21b811e73cb82ac4251e | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/ee65ae857c77fdfa844f74e335360c1f360cdff6 | powerpc64le | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/bff3bbc344b7754fddd094c1e8add5a2da471c42 | ORPH arm | host-delve-1.8.0 | NOK | http://autobuild.buildroot.net/results/4195b05c5e9ea473b4135fdf9c0c17d27f56f9fd | arm | host-delve-1.8.0 | NOK | http://autobuild.buildroot.net/results/bd8833a7620dd5f4a9940775164ed80135020cf9 | mips64el | host-go-1.17.6 | NOK | http://autobuild.buildroot.net/results/cdf4a4f52cc5fb1fb94f90c6bb0a1976bca7b08f | i686 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/00e256601de59a5c85c6891d30f8bff3c7fa6c2d | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/ea124618a7119c8b24b843af172510b699a94f8b | mips64el | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/b10007d12cdabfeb8e92fc7806ca5a0e5568ae39 | xtensa | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/264fe0206435732a85e0a30b08b097b625ff6b2e | riscv64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/cb3edaf67991656a9fb35aa308530ea44a8f0795 | aarch64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/5a4a50960709377281fbd5f254d161916c829ca5 | xtensa | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/4742378bed443ecd1bfd8a9196d2717d29f4f906 | arc | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/251879431ca5bbab21c45028ac7790e0b48319d8 | mips | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/79939f13c49a8833229676fc0903b32ea372656b | or1k | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/f168ddc689cb33e1619cd960523b2533d7ab3b51 | microblazeel | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/62a4eb5d23f937f2cf71971368e29eab36fae68f | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/1b6d876b89f457d0bb7d728b96da20d9a86c1d39 | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/0a36fa928be782abd4e543ead05cc6b8fed7c005 | powerpc | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/8ed457867e09d8c6db7aab19a52316018cc14fff | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/8a73a7f55674098cce3cf096d1e37688fcd20c89 | arc | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/49ea55a0df49a87a347235fba3de7fbc69a043af | i586 | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/4d3fc7a18a5f1dd46bacfd01bbd1bb8a22d8fb43 | powerpc64le | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/99e09d316db083a973b9b3d3e3e44115d4bf59cc | sparc | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/e35cf9faae2907d64a6f5db0f551d51bad7c4346 | sparc64 | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/24c76da1089cf7ac56386f2df96f03f9da31d2b5 | arc | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/de45ed9b51eaaccb2ebc4c79ba2cc3a83718a538 | arm | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/8467a55460877672de41dd06f481df13c58eb5df | arm | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/b90f74e0a8bb6990fc2d5bfb7a05d4c648cf27e3 | arm | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/bbca433bf6f81fb06b6424c00989246506ae45db | arm | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/e3d1f17f64e39b49a20335fae432f84d1bd346ae | arc | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/3a1adaac277c1b2ac095df5e399d1750669f1dd9 | riscv32 | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/de0334544c45f48a0e6b11c4c9d2c3c63b4648fd | xtensa | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/86b6c094822cff44fed68bfdda9ceceff38383fd | m68k | libuhttpd-3.14.1 | NOK | http://autobuild.buildroot.net/results/c57f1d0f805cb815c53900ddfeb783fd75bde756 | powerpc | Makefile:747: target-finalize | NOK | http://autobuild.buildroot.net/results/dfb3aa2e3c9dc23ca5768ac785fec5e3c2d54935 | arm | mongrel2-1.13.0 | NOK | http://autobuild.buildroot.net/results/da9ddfbe279610fe2e1cccc35b0455b3181da175 | x86_64 | nodejs-14.18.3 | NOK | http://autobuild.buildroot.net/results/eaa66466ae693dcf867cacf1f899040d66809bad | or1k | pulseview-0.4.2 | NOK | http://autobuild.buildroot.net/results/a63bf10c5b30c0c92aae1fc6263f5c02585a8752 | powerpc | pulseview-0.4.2 | NOK | http://autobuild.buildroot.net/results/9f8483696edf62408777cbcb97844648e9a47ac4 | aarch64 | python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/026671f502c6e9f46f248b0273c4d3588e6125ac | nios2 | python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/7eb6c1238a96c875001fa0cc819afd690a4b5b9c | arm | python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/2ec65e34110c57e78fbb3a88f49c75667f9f74ad | x86_64 | qt-webkit-kiosk-a7720e50f2b... | NOK | http://autobuild.buildroot.net/results/5209a3bd1ab3840893eba69607191c6661657541 | riscv64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/f06bfc96d4af6f8360fa226d648723ee1a831045 | arc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/17840fd71062732d6026c04d7572f454c266560b | mips64el | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/2ac082f5ce2a614643cdbf493837165801b5ca9e | nios2 | systemd-250.3 | NOK | http://autobuild.buildroot.net/results/5fc884e11e46ab165ea21c8e8f2901516d79ff80 | arm | unknown | NOK | http://autobuild.buildroot.net/results/48d537a2ed7786c0456f0455c2de05ccfa80ece4 | microblazeel | unknown | NOK | http://autobuild.buildroot.net/results/4e7ed7bf8ac4d4f37b677b9a805f50de836a44a1 | microblazeel | unknown | NOK | http://autobuild.buildroot.net/results/d809a0a49a1c7cbd7d534773b905c1733f2f4ca1 | arc | unknown | NOK | http://autobuild.buildroot.net/results/d540ecff2196ed700d31f97bddc681487a0809f3 | arm | unknown | NOK | http://autobuild.buildroot.net/results/1587fda56c5a697b9a3c0be6c20579baeba77df9 | Classification of failures by reason for 2021.02.x -------------------------------------------------- rocksdb-6.13.3 | 2 azure-iot-sdk-c-LTS_07_2020... | 1 host-sentry-cli-1.57.0 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- riscv32 | azure-iot-sdk-c-LTS_07_2020... | NOK | http://autobuild.buildroot.net/results/61c5b24e27b8242a5a2136537825a7d8e79e27d4 | powerpc | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/3e8786a301adb36375e4a96481ba1468b074d464 | powerpc | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/d26aa08fabe9a6e254ff8ef1f6ebdb71432f23a7 | arm | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/8e21dfdc2c436c4eb4367025c6e31a04acf3560d | Gitlab CI results for 2022-02-04 ================================ Detail of defconfig failures for master --------------------------------------- defconfig | link to the job | orph? ----------------------------------+---------------------------------------------------------------+------ amarula_a64_relic | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012177 | arcturus_ucls1012a | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012180 | arcturus_ucp1020 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012181 | arm_juno | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012183 | armadeus_apf27 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012184 | at91sam9260eknf | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012189 | at91sam9g20dfc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012190 | at91sam9g45m10ek | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012191 | at91sam9rlek | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012192 | at91sam9x5ek | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012193 | at91sam9x5ek_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012195 | at91sam9x5ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012196 | at91sam9x5ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012198 | atmel_sama5d27_som1_ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012199 | atmel_sama5d2_xplained_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012201 | atmel_sama5d2_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012203 | atmel_sama5d3_xplained | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012204 | atmel_sama5d3_xplained_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012205 | atmel_sama5d3_xplained_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012206 | atmel_sama5d3_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012207 | atmel_sama5d3xek | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012208 | atmel_sama5d4_xplained | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012209 | atmel_sama5d4_xplained_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012211 | atmel_sama5d4_xplained_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012212 | atmel_sama5d4_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012213 | avenger96 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012214 | bananapi_m1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012215 | bananapi_m1_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012216 | bananapi_m2_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012217 | bananapi_m2_ultra | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012218 | bananapi_m64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012220 | bananapro | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012221 | beagleboardx15 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012222 | beaglebone_qt5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012224 | beaglev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012226 | beelink_gs1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012227 | chromebook_snow | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012229 | csky_gx6605s | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012231 | engicam_imx6qdl_icore | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012233 | engicam_imx6qdl_icore_qt5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012234 | engicam_imx6qdl_icore_rqs | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012235 | engicam_imx6ul_geam | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012236 | engicam_imx6ul_isiot | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012237 | freescale_imx8mmevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012248 | freescale_imx8mnevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012249 | freescale_imx8mpevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012250 | freescale_p1025twr | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012254 | freescale_t1040d4rdb | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012256 | freescale_t2080_qds_rdb | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012258 | friendlyarm_nanopc_t4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012259 | friendlyarm_nanopi_a64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012260 | friendlyarm_nanopi_m1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012261 | ORPH friendlyarm_nanopi_m1_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012262 | ORPH friendlyarm_nanopi_m4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012263 | friendlyarm_nanopi_neo | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012266 | friendlyarm_nanopi_neo2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012264 | friendlyarm_nanopi_neo4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012265 | friendlyarm_nanopi_neo_plus2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012267 | friendlyarm_nanopi_r1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012269 | galileo | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012270 | imx23evk | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012276 | imx8mmpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012287 | imx8mpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012288 | lego_ev3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012295 | licheepi_zero | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012296 | microchip_sam9x60ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012300 | microchip_sam9x60ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012301 | microchip_sama5d27_wlsom1_ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012302 | ...hip_sama5d27_wlsom1_ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012303 | microchip_sama5d2_icp_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012305 | microchip_sama5d2_icp_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012307 | microchip_sama7g5ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012308 | microchip_sama7g5ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012310 | mx25pdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012318 | odroidxu4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012335 | olimex_imx233_olinuxino | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012349 | orangepi_lite2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012356 | orangepi_one_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012361 | orangepi_pc2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012362 | orangepi_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012366 | ORPH orangepi_prime | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012368 | orangepi_rk3399 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012371 | orangepi_win | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012373 | orangepi_zero_plus2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012377 | pc_x86_64_bios | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012381 | pcengines_apu2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012386 | pine64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012390 | pine64_sopine | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012391 | raspberrypi3_qt5we | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012474 | riotboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012484 | roc_pc_rk3399 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012487 | rock_pi_4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012489 | rock_pi_n10 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012491 | rock_pi_n8 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012492 | rockpro64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012494 | s6lx9_microboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012498 | snps_aarch64_vdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012502 | snps_arc700_axs101 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012503 | snps_archs38_axs103 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012504 | snps_archs38_hsdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012509 | socrates_cyclone5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012513 | solidrun_clearfog | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012517 | toradex_apalis_imx6 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012538 | ts4900 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012540 | ts7680 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012543 | warpboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012551 | zynq_microzed | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012552 | zynq_qmtech | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012553 | zynq_zc706 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012554 | zynq_zed | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012556 | zynqmp_zcu106 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012558 | -- http://autobuild.buildroot.net From kuzminov.sergey81 at gmail.com Sat Feb 5 07:28:01 2022 From: kuzminov.sergey81 at gmail.com (Sergey Kuzminov) Date: Sat, 5 Feb 2022 10:28:01 +0300 Subject: [Buildroot] [PATCH] configs/orangepi_zero_defconfig: switch to extlinux Message-ID: <20220205072801.13567-1-kuzminov.sergey81@gmail.com> Changes: - Exclude FAT partition, he is no longer needed for U-Boot. - Switch the rootfs partition from MBR to GPT for partition-uuid to work. - Switch to extlinux, this is convenient for debugging. - Create common scenarios for multiple boards to create an SD image: board/orangepi/common. Signed-off-by: Sergey Kuzminov --- board/orangepi/common/extlinux.conf | 5 ++++ board/orangepi/common/genimage.cfg | 23 +++++++++++++++ board/orangepi/common/post-build.sh | 34 +++++++++++++++++++++ board/orangepi/orangepi-zero/boot.cmd | 9 ------ board/orangepi/orangepi-zero/genimage.cfg | 36 ----------------------- configs/orangepi_zero_defconfig | 11 ++++--- 6 files changed, 67 insertions(+), 51 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 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..fa0d988991 --- /dev/null +++ b/board/orangepi/common/genimage.cfg @@ -0,0 +1,23 @@ +image sdcard.img { + partition u-boot { + in-partition-table = false + image = "u-boot-sunxi-with-spl.bin" + offset = 8K + size = 1000K # 1MB - 8KB(offset) - 16KB(GPT) + } + + hdimage { + partition-table-type = gpt + gpt-location = 1008K # 1MB - 16KB(GPT) + gpt-no-backup = true + # After writing the image to the SD card, + # backup GPT data structures at the end of the disk: + # gdisk /dev/mmcblk0 then press the buttons: x, e, w, y + } + + 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/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 5aaa1566c5..96f0c3f600 100644 --- a/configs/orangepi_zero_defconfig +++ b/configs/orangepi_zero_defconfig @@ -20,10 +20,13 @@ 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_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y # Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="63M" +BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y # BR2_TARGET_ROOTFS_TAR is not set # Bootloader @@ -39,16 +42,12 @@ 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 # 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" # Wireless driver and firmware BR2_PACKAGE_XR819_XRADIO=y -- 2.34.1 From bernd.kuhls at t-online.de Sat Feb 5 09:09:43 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 5 Feb 2022 10:09:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/tor: bump version to 0.4.6.10 Message-ID: <20220205090943.4012391-1-bernd.kuhls@t-online.de> Release notes: https://gitlab.torproject.org/tpo/core/tor/-/raw/release-0.4.6/ReleaseNotes Signed-off-by: Bernd Kuhls --- 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 63d47d7fa6..16e01c80a9 100644 --- a/package/tor/tor.hash +++ b/package/tor/tor.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c7e93380988ce20b82aa19c06cdb2f10302b72cfebec7c15b5b96bcfc94ca9a9 tor-0.4.6.9.tar.gz +sha256 94ccd60e04e558f33be73032bc84ea241660f92f58cfb88789bda6893739e31c tor-0.4.6.10.tar.gz sha256 47b54ed17e8fdcab3c44729a1789a09b208f9a63a845a7e50def9df729eebad0 LICENSE diff --git a/package/tor/tor.mk b/package/tor/tor.mk index fc1db6da6b..d16b3541eb 100644 --- a/package/tor/tor.mk +++ b/package/tor/tor.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOR_VERSION = 0.4.6.9 +TOR_VERSION = 0.4.6.10 TOR_SITE = https://dist.torproject.org TOR_LICENSE = BSD-3-Clause TOR_LICENSE_FILES = LICENSE -- 2.30.2 From bernd.kuhls at t-online.de Sat Feb 5 09:13:04 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 5 Feb 2022 10:13:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/dovecot-pigeonhole: bump version to 0.5.18 Message-ID: <20220205091304.4096595-1-bernd.kuhls@t-online.de> Release notes: https://github.com/dovecot/pigeonhole/blob/release-0.5.18/NEWS Signed-off-by: Bernd Kuhls --- package/dovecot-pigeonhole/dovecot-pigeonhole.hash | 2 +- package/dovecot-pigeonhole/dovecot-pigeonhole.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dovecot-pigeonhole/dovecot-pigeonhole.hash b/package/dovecot-pigeonhole/dovecot-pigeonhole.hash index b244563935..f3a5890151 100644 --- a/package/dovecot-pigeonhole/dovecot-pigeonhole.hash +++ b/package/dovecot-pigeonhole/dovecot-pigeonhole.hash @@ -1,3 +1,3 @@ # Locally computed after checking signature -sha256 3cc4a3de6d7e27bd99ac59b99faa161287f78167272699a22591798ffcf84512 dovecot-2.3-pigeonhole-0.5.17.1.tar.gz +sha256 a6d828f8d6f2decba5105343ece5c7a65245bd94e46a8ae4432a6d97543108a5 dovecot-2.3-pigeonhole-0.5.18.tar.gz sha256 fc9e9522216f2a9a28b31300e3c73c1df56acc27dfae951bf516e7995366b51a COPYING diff --git a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk index 95e9059392..dd533977f4 100644 --- a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk +++ b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOVECOT_PIGEONHOLE_VERSION = 0.5.17.1 +DOVECOT_PIGEONHOLE_VERSION = 0.5.18 DOVECOT_PIGEONHOLE_SOURCE = dovecot-2.3-pigeonhole-$(DOVECOT_PIGEONHOLE_VERSION).tar.gz DOVECOT_PIGEONHOLE_SITE = https://pigeonhole.dovecot.org/releases/2.3 DOVECOT_PIGEONHOLE_LICENSE = LGPL-2.1 -- 2.30.2 From bernd.kuhls at t-online.de Sat Feb 5 09:19:13 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 5 Feb 2022 10:19:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/intel-gmmlib: bump version to 22.0.2 Message-ID: <20220205091913.4135654-1-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/intel-gmmlib/intel-gmmlib.hash | 2 +- package/intel-gmmlib/intel-gmmlib.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-gmmlib/intel-gmmlib.hash b/package/intel-gmmlib/intel-gmmlib.hash index 8780eb9229..71a153e0a3 100644 --- a/package/intel-gmmlib/intel-gmmlib.hash +++ b/package/intel-gmmlib/intel-gmmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 341eb3fa478e427e5a6f03d4cbc97bc2b02c52728dcf06c4794661d34b7c6e5c intel-gmmlib-22.0.1.tar.gz +sha256 7cc044dc0979269abe825054ba6cc1b67169dc7a7f4192898e2dd04142a633fa intel-gmmlib-22.0.2.tar.gz sha256 8b7446825df3f8b0268307e272aa6aaaf78351c83161d860d02c913c22666c48 LICENSE.md diff --git a/package/intel-gmmlib/intel-gmmlib.mk b/package/intel-gmmlib/intel-gmmlib.mk index c45a7669b1..235f71341c 100644 --- a/package/intel-gmmlib/intel-gmmlib.mk +++ b/package/intel-gmmlib/intel-gmmlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_GMMLIB_VERSION = 22.0.1 +INTEL_GMMLIB_VERSION = 22.0.2 INTEL_GMMLIB_SITE = https://github.com/intel/gmmlib/archive INTEL_GMMLIB_LICENSE = MIT INTEL_GMMLIB_LICENSE_FILES = LICENSE.md -- 2.30.2 From bernd.kuhls at t-online.de Sat Feb 5 09:26:20 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 5 Feb 2022 10:26:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/libldns: remove --disable-dane-verify configure option Message-ID: <20220205092620.4162598-1-bernd.kuhls@t-online.de> Not needed anymore after openssl was bumped to 1.1.x, snippet from libldns configure: checking for SSL_get0_dane... yes Signed-off-by: Bernd Kuhls --- package/libldns/libldns.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/libldns/libldns.mk b/package/libldns/libldns.mk index 7deca978da..c934e19136 100644 --- a/package/libldns/libldns.mk +++ b/package/libldns/libldns.mk @@ -13,11 +13,9 @@ LIBLDNS_CPE_ID_VENDOR = nlnetlabs LIBLDNS_CPE_ID_PRODUCT = ldns LIBLDNS_INSTALL_STAGING = YES LIBLDNS_DEPENDENCIES = openssl -# --disable-dane-verify can be removed after openssl bump to 1.1.x LIBLDNS_CONF_OPTS = \ --with-ssl=$(STAGING_DIR)/usr \ --enable-dane \ - --disable-dane-verify \ --enable-ecdsa \ --enable-gost \ --enable-sha2 \ -- 2.30.2 From romain.naour at gmail.com Sat Feb 5 10:51:23 2022 From: romain.naour at gmail.com (Romain Naour) Date: Sat, 5 Feb 2022 11:51:23 +0100 Subject: [Buildroot] [PATCH] package/{glibc, localedef}: security bump for additional post-2.34.x fixes In-Reply-To: <20220204174712.1109-1-peter@korsgaard.com> References: <20220204174712.1109-1-peter@korsgaard.com> Message-ID: <5de97254-e4b3-308e-c05f-26e394e2c668@gmail.com> Hi Peter, Le 04/02/2022 ? 18:47, Peter Korsgaard a ?crit?: > Fixes the following security issues: > > CVE-2022-23219: Passing an overlong file name to the clnt_create > legacy function could result in a stack-based buffer overflow when > using the "unix" protocol. Reported by Martin Sebor. > > CVE-2022-23218: Passing an overlong file name to the svcunix_create > legacy function could result in a stack-based buffer overflow. > > CVE-2021-3998: Passing a path longer than PATH_MAX to the realpath > function could result in a memory leak and potential access of > uninitialized memory. Reported by Qualys. > > CVE-2021-3999: Passing a buffer of size exactly 1 byte to the getcwd > function may result in an off-by-one buffer underflow and overflow > when the current working directory is longer than PATH_MAX and also > corresponds to the / directory through an unprivileged mount > namespace. Reported by Qualys. > > Signed-off-by: Peter Korsgaard Reviewed-by: Romain Naour Best regards, Romain > --- > ...1-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch | 0 > .../glibc.hash | 2 +- > package/glibc/glibc.mk | 2 +- > .../0001-HACK-only-build-and-install-localedef.patch | 0 > ...02-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch | 0 > .../localedef.hash | 2 +- > package/localedef/localedef.mk | 2 +- > 7 files changed, 4 insertions(+), 4 deletions(-) > rename package/glibc/{2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4 => 2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c}/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch (100%) > rename package/glibc/{2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4 => 2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c}/glibc.hash (70%) > rename package/localedef/{2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4 => 2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c}/0001-HACK-only-build-and-install-localedef.patch (100%) > rename package/localedef/{2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4 => 2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c}/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch (100%) > rename package/localedef/{2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4 => 2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c}/localedef.hash (70%) > > 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-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch > similarity index 100% > rename from package/glibc/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch > rename to package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch > diff --git a/package/glibc/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/glibc.hash b/package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/glibc.hash > similarity index 70% > rename from package/glibc/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/glibc.hash > rename to package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/glibc.hash > index 595de95a58..dfd939020f 100644 > --- a/package/glibc/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/glibc.hash > +++ b/package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/glibc.hash > @@ -1,5 +1,5 @@ > # Locally calculated (fetched from Github) > -sha256 1c7ed0f69ed268bd66f9754d0cb8fb65e0dafc1f9a1048ea50d1e96d60399686 glibc-2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4.tar.gz > +sha256 3c299a21468a80356b848ca341f45551616c4928a6c871e6d45cee942e8b0f24 glibc-2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c.tar.gz > > # Hashes for license files > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk > index 5c26b0e6df..9b591aa2a3 100644 > --- a/package/glibc/glibc.mk > +++ b/package/glibc/glibc.mk > @@ -7,7 +7,7 @@ > # Generate version string using: > # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- > # When updating the version, please also update localedef > -GLIBC_VERSION = 2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4 > +GLIBC_VERSION = 2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c > # Upstream doesn't officially provide an https download link. > # There is one (https://sourceware.org/git/glibc.git) but it's not reliable, > # sometimes the connection times out. So use an unofficial github mirror. > diff --git a/package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0001-HACK-only-build-and-install-localedef.patch b/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-HACK-only-build-and-install-localedef.patch > similarity index 100% > rename from package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0001-HACK-only-build-and-install-localedef.patch > rename to package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-HACK-only-build-and-install-localedef.patch > diff --git a/package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch b/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch > similarity index 100% > rename from package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch > rename to package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch > diff --git a/package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/localedef.hash b/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/localedef.hash > similarity index 70% > rename from package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/localedef.hash > rename to package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/localedef.hash > index 595de95a58..dfd939020f 100644 > --- a/package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/localedef.hash > +++ b/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/localedef.hash > @@ -1,5 +1,5 @@ > # Locally calculated (fetched from Github) > -sha256 1c7ed0f69ed268bd66f9754d0cb8fb65e0dafc1f9a1048ea50d1e96d60399686 glibc-2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4.tar.gz > +sha256 3c299a21468a80356b848ca341f45551616c4928a6c871e6d45cee942e8b0f24 glibc-2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c.tar.gz > > # Hashes for license files > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > diff --git a/package/localedef/localedef.mk b/package/localedef/localedef.mk > index 87d921cffe..f8f0b42984 100644 > --- a/package/localedef/localedef.mk > +++ b/package/localedef/localedef.mk > @@ -7,7 +7,7 @@ > # Use the same VERSION and SITE as target glibc > # As in glibc.mk, generate version string using: > # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- > -LOCALEDEF_VERSION = 2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4 > +LOCALEDEF_VERSION = 2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c > LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION).tar.gz > LOCALEDEF_SITE = $(call github,bminor,glibc,$(LOCALEDEF_VERSION)) > HOST_LOCALEDEF_DL_SUBDIR = glibc From peter at korsgaard.com Sat Feb 5 11:27:11 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 12:27:11 +0100 Subject: [Buildroot] [PATCH] package/ltris: bump version to 1.2.3 In-Reply-To: <20220201170647.109298-1-julien.boibessot@armadeus.com> (julien boibessot's message of "Tue, 1 Feb 2022 18:06:47 +0100") References: <20220201170647.109298-1-julien.boibessot@armadeus.com> Message-ID: <87o83lwo34.fsf@dell.be.48ers.dk> >>>>> "julien" == julien boibessot writes: > From: Julien BOIBESSOT > 0001-fix-build-with-gcc-4.8.patch was integrated mainline and cross-compilation > slightly changed. > --- > .../ltris/0001-fix-build-with-gcc-4.8.patch | 20 ------------------- > package/ltris/ltris.hash | 4 ++-- > package/ltris/ltris.mk | 4 ++-- > 3 files changed, 4 insertions(+), 24 deletions(-) > delete mode 100644 package/ltris/0001-fix-build-with-gcc-4.8.patch > diff --git a/package/ltris/0001-fix-build-with-gcc-4.8.patch b/package/ltris/0001-fix-build-with-gcc-4.8.patch > deleted file mode 100644 > index d6bbf6a946..0000000000 > --- a/package/ltris/0001-fix-build-with-gcc-4.8.patch > +++ /dev/null > @@ -1,20 +0,0 @@ > -Fix build with gcc 4.8 > - > -Signed-off-by: Fabrice Fontaine > -[Upstream status: https://sourceforge.net/p/lgames/patches/28] > -Index: ltris/src/bowl.c > -=================================================================== > ---- ltris/src/bowl.c (r?vision 421) > -+++ ltris/src/bowl.c (copie de travail) > -@@ -828,9 +828,10 @@ > - */ > - void bowl_init_block_masks() > - { > -+ int i; > - int masksize = sizeof(block_masks[0].mask); // same for all > - > -- for (int i = 0; i < 7; i++) { > -+ for (i = 0; i < 7; i++) { > - block_masks[i].rx = 2; > - block_masks[i].ry = 2; > - memset(block_masks[i].mask, 0, masksize ); > diff --git a/package/ltris/ltris.hash b/package/ltris/ltris.hash > index f696e3af17..20f34342ff 100644 > --- a/package/ltris/ltris.hash > +++ b/package/ltris/ltris.hash > @@ -1,3 +1,3 @@ > # Locally computed: > -sha256 a7bc6c5fc6539b88505077a1b4580edc9b179ce0a6b829c58fbd9416cf456195 ltris-1.2.tar.gz > -sha256 67f82e045cf7acfef853ea0f426575a8359161a0a325e19f02b529a87c4b6c34 COPYING > +sha256 0ec4ad053e066a296529e923c2f626fa0a19c094c5ae03e44359f9c9e50955a8 ltris-1.2.3.tar.gz > +sha256 67f82e045cf7acfef853ea0f426575a8359161a0a325e19f02b529a87c4b6c34 COPYING NIT: The style used (as checked by check-package) is two spaces after sha256, not a tab. > diff --git a/package/ltris/ltris.mk b/package/ltris/ltris.mk > index 9b59613417..6e37bdbd19 100644 > --- a/package/ltris/ltris.mk > +++ b/package/ltris/ltris.mk > @@ -5,7 +5,7 @@ > ################################################################################ > LTRIS_SITE = http://downloads.sourceforge.net/lgames/ltris > -LTRIS_VERSION = 1.2 > +LTRIS_VERSION = 1.2.3 > LTRIS_LICENSE = GPL-2.0+ > LTRIS_LICENSE_FILES = COPYING > @@ -13,7 +13,7 @@ LTRIS_DEPENDENCIES = sdl $(TARGET_NLS_DEPENDENCIES) > LTRIS_LIBS = $(TARGET_NLS_LIBS) > LTRIS_CONF_ENV = \ > - SDL_CONFIG="$(STAGING_DIR)/usr/bin/sdl-config" \ > + PATH="$(PATH):$(STAGING_DIR)/usr/bin" \ That's no good. This would mean that the wrong sdl-config would get picked up if the build machine has sdl-config. Looking at the configure script, I see it has a --with-sdl-exec-prefix, so we could pass --with-sdl-exec-prefix=$(STAGING_DIR)/usr, which goes fine all the way until the configure script throws away all the sdl detection and does: CFLAGS="$CFLAGS $(sdl-config --cflags)" LIBS="$LIBS $(sdl-config --libs)" This is even done after prepending /usr/bin to the PATH, so we cannot even do like in nodejs and put sdl-config in a dedicated directory and stick it in the front of the path :/ I guess they should just do: CFLAGS="$CFLAGS $SDL_CFLAGS" LIBS="$LIBS SDL_LIBS" Care to send a patch upstream for that and send an updated patch to us? In the mean time I have marked the patch as changes requested. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 11:42:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 12:42:00 +0100 Subject: [Buildroot] [git commit] package/libusb: bump to version 1.0.25 Message-ID: <20220205113500.DA2518269F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=aad609936fc83acfe1eac6ffc86d29ac35dcf54e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patch (already in version) https://github.com/libusb/libusb/blob/v1.0.25/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...-Fix-parsing-of-descriptors-for-multi-con.patch | 62 ---------------------- package/libusb/libusb.hash | 2 +- package/libusb/libusb.mk | 2 +- 3 files changed, 2 insertions(+), 64 deletions(-) diff --git a/package/libusb/0001-linux_usbfs-Fix-parsing-of-descriptors-for-multi-con.patch b/package/libusb/0001-linux_usbfs-Fix-parsing-of-descriptors-for-multi-con.patch deleted file mode 100644 index 55e6a1494e..0000000000 --- a/package/libusb/0001-linux_usbfs-Fix-parsing-of-descriptors-for-multi-con.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 623e2a995d156e115c91f56a3ec691bdc333df8b Mon Sep 17 00:00:00 2001 -From: Chris Dickens -Date: Sun, 13 Dec 2020 15:49:19 -0800 -Subject: [PATCH] linux_usbfs: Fix parsing of descriptors for - multi-configuration devices - -Commit e2be556bd2 ("linux_usbfs: Parse config descriptors during device -initialization") introduced a regression for devices with multiple -configurations. The logic that verifies the reported length of the -configuration descriptors failed to count the length of the -configuration descriptor itself and would truncate the actual length by -9 bytes, leading to a parsing error for subsequent descriptors. - -Closes #825 - -Signed-off-by: Chris Dickens -(cherry picked from commit f6d2cb561402c3b6d3627c0eb89e009b503d9067) -Signed-off-by: John Keeping ---- - libusb/os/linux_usbfs.c | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - -diff --git a/libusb/os/linux_usbfs.c b/libusb/os/linux_usbfs.c -index fb2ed53..4d2dc8d 100644 ---- a/libusb/os/linux_usbfs.c -+++ b/libusb/os/linux_usbfs.c -@@ -641,7 +641,12 @@ static int seek_to_next_config(struct libusb_context *ctx, - uint8_t *buffer, size_t len) - { - struct usbi_descriptor_header *header; -- int offset = 0; -+ int offset; -+ -+ /* Start seeking past the config descriptor */ -+ offset = LIBUSB_DT_CONFIG_SIZE; -+ buffer += LIBUSB_DT_CONFIG_SIZE; -+ len -= LIBUSB_DT_CONFIG_SIZE; - - while (len > 0) { - if (len < 2) { -@@ -718,7 +723,7 @@ static int parse_config_descriptors(struct libusb_device *dev) - } - - if (priv->sysfs_dir) { -- /* -+ /* - * In sysfs wTotalLength is ignored, instead the kernel returns a - * config descriptor with verified bLength fields, with descriptors - * with an invalid bLength removed. -@@ -727,8 +732,7 @@ static int parse_config_descriptors(struct libusb_device *dev) - int offset; - - if (num_configs > 1 && idx < num_configs - 1) { -- offset = seek_to_next_config(ctx, buffer + LIBUSB_DT_CONFIG_SIZE, -- remaining - LIBUSB_DT_CONFIG_SIZE); -+ offset = seek_to_next_config(ctx, buffer, remaining); - if (offset < 0) - return offset; - sysfs_config_len = (uint16_t)offset; --- -2.30.1 - diff --git a/package/libusb/libusb.hash b/package/libusb/libusb.hash index 6169a186a5..a18935fe03 100644 --- a/package/libusb/libusb.hash +++ b/package/libusb/libusb.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 7efd2685f7b327326dcfb85cee426d9b871fd70e22caa15bb68d595ce2a2b12a libusb-1.0.24.tar.bz2 +sha256 8a28ef197a797ebac2702f095e81975e2b02b2eeff2774fa909c78a74ef50849 libusb-1.0.25.tar.bz2 sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk index 28efcadefc..1e82cb9a85 100644 --- a/package/libusb/libusb.mk +++ b/package/libusb/libusb.mk @@ -5,7 +5,7 @@ ################################################################################ LIBUSB_VERSION_MAJOR = 1.0 -LIBUSB_VERSION = $(LIBUSB_VERSION_MAJOR).24 +LIBUSB_VERSION = $(LIBUSB_VERSION_MAJOR).25 LIBUSB_SOURCE = libusb-$(LIBUSB_VERSION).tar.bz2 LIBUSB_SITE = https://github.com/libusb/libusb/releases/download/v$(LIBUSB_VERSION) LIBUSB_LICENSE = LGPL-2.1+ From peter at korsgaard.com Sat Feb 5 11:42:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 12:42:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/libusb: bump to version 1.0.25 In-Reply-To: <20220201220151.350153-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 1 Feb 2022 23:01:51 +0100") References: <20220201220151.350153-1-fontaine.fabrice@gmail.com> Message-ID: <87k0e9wndr.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Drop patch (already in version) > https://github.com/libusb/libusb/blob/v1.0.25/ChangeLog > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 11:43:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 12:43:30 +0100 Subject: [Buildroot] [PATCH] configs/warp7: bump Kernel and U-Boot version In-Reply-To: <20220202174948.1919945-1-festevam@gmail.com> (Fabio Estevam's message of "Wed, 2 Feb 2022 14:49:48 -0300") References: <20220202174948.1919945-1-festevam@gmail.com> Message-ID: <87fsoxwnbx.fsf@dell.be.48ers.dk> >>>>> "Fabio" == Fabio Estevam writes: > Bump U-Boot to 2022.01 and kernel to version 5.16.5. > Signed-off-by: Fabio Estevam Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 11:44:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 12:44:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/python3-setuptools: bump to version 60.7.0 In-Reply-To: <20220202203411.150459-1-james.hilliard1@gmail.com> (James Hilliard's message of "Wed, 2 Feb 2022 13:34:11 -0700") References: <20220202203411.150459-1-james.hilliard1@gmail.com> Message-ID: <87bkzlwna5.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 11:43:18 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 12:43:18 +0100 Subject: [Buildroot] [git commit] configs/warp7: bump Kernel and U-Boot version Message-ID: <20220205113732.B6AEA826AB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e9fc598a4d0fd8f9172ee589d628474e7ba1c3ea branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Bump U-Boot to 2022.01 and kernel to version 5.16.5. Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- configs/warp7_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig index 5fca9f6cfc..04dfc94f7d 100644 --- a/configs/warp7_defconfig +++ b/configs/warp7_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 5.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +# Linux headers same as kernel, a 5.16 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -15,7 +15,7 @@ BR2_ROOTFS_OVERLAY="board/warp7/rootfs_overlay" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.14" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16.5" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7s-warp" @@ -25,7 +25,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="warp7" 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_FORMAT_DTB_IMX=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y From peter at korsgaard.com Sat Feb 5 11:44:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 12:44:03 +0100 Subject: [Buildroot] [git commit] package/python3-setuptools: bump to version 60.7.0 Message-ID: <20220205113732.BFD89819CD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=89cf28a8f30cfeb05bfce326019bec8344a7a115 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-setuptools/60.6.0/python-setuptools.hash | 4 ---- .../python-setuptools/{60.6.0 => 60.7.0}/0001-add-executable.patch | 0 package/python-setuptools/60.7.0/python-setuptools.hash | 4 ++++ package/python-setuptools/python-setuptools.mk | 4 ++-- package/python3-setuptools/0001-add-executable.patch | 2 +- package/python3-setuptools/python3-setuptools.hash | 2 +- package/python3-setuptools/python3-setuptools.mk | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package/python-setuptools/60.6.0/python-setuptools.hash b/package/python-setuptools/60.6.0/python-setuptools.hash deleted file mode 100644 index 734cb4d580..0000000000 --- a/package/python-setuptools/60.6.0/python-setuptools.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From https://pypi.org/pypi/setuptools/json -md5 392e91d7e244998c586c88da2cf881d3 setuptools-60.6.0.tar.gz -sha256 eb83b1012ae6bf436901c2a2cee35d45b7260f31fd4b65fd1e50a9f99c11d7f8 setuptools-60.6.0.tar.gz -sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE diff --git a/package/python-setuptools/60.6.0/0001-add-executable.patch b/package/python-setuptools/60.7.0/0001-add-executable.patch similarity index 100% rename from package/python-setuptools/60.6.0/0001-add-executable.patch rename to package/python-setuptools/60.7.0/0001-add-executable.patch diff --git a/package/python-setuptools/60.7.0/python-setuptools.hash b/package/python-setuptools/60.7.0/python-setuptools.hash new file mode 100644 index 0000000000..8df7155d4c --- /dev/null +++ b/package/python-setuptools/60.7.0/python-setuptools.hash @@ -0,0 +1,4 @@ +# From https://pypi.org/pypi/setuptools/json +md5 082637e8fbc2e1fd9c637665d8fcccd8 setuptools-60.7.0.tar.gz +sha256 b83cf328a4f6a987c95610e76b29a30778db05174eef71f771776c48f8f25d1b setuptools-60.7.0.tar.gz +sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk index 15912d96f5..8bca852fe2 100644 --- a/package/python-setuptools/python-setuptools.mk +++ b/package/python-setuptools/python-setuptools.mk @@ -9,9 +9,9 @@ ifeq ($(BR2_PACKAGE_PYTHON3),y) # Please keep in sync with # package/python3-setuptools/python3-setuptools.mk -PYTHON_SETUPTOOLS_VERSION = 60.6.0 +PYTHON_SETUPTOOLS_VERSION = 60.7.0 PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON3_SETUPTOOLS_VERSION).tar.gz -PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/8f/89/9fec81ec84737c925a1ee992af2c6c7153aec4051c26afeadd6b822354d2 +PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/29/dd/48d662bb93e5e51e72265ef612f869947d4ae4126328d7156824cd50d440 else # Python PYTHON_SETUPTOOLS_VERSION = 44.0.0 PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).zip diff --git a/package/python3-setuptools/0001-add-executable.patch b/package/python3-setuptools/0001-add-executable.patch index 9d608239bc..46b5935d33 120000 --- a/package/python3-setuptools/0001-add-executable.patch +++ b/package/python3-setuptools/0001-add-executable.patch @@ -1 +1 @@ -../python-setuptools/60.6.0/0001-add-executable.patch \ No newline at end of file +../python-setuptools/60.7.0/0001-add-executable.patch \ No newline at end of file diff --git a/package/python3-setuptools/python3-setuptools.hash b/package/python3-setuptools/python3-setuptools.hash index 9fb96015aa..2c9d3614d5 120000 --- a/package/python3-setuptools/python3-setuptools.hash +++ b/package/python3-setuptools/python3-setuptools.hash @@ -1 +1 @@ -../python-setuptools/60.6.0/python-setuptools.hash \ No newline at end of file +../python-setuptools/60.7.0/python-setuptools.hash \ No newline at end of file diff --git a/package/python3-setuptools/python3-setuptools.mk b/package/python3-setuptools/python3-setuptools.mk index 55a01dba01..d5aaa01918 100644 --- a/package/python3-setuptools/python3-setuptools.mk +++ b/package/python3-setuptools/python3-setuptools.mk @@ -6,9 +6,9 @@ # Please keep in sync with # package/python-setuptools/python-setuptools.mk -PYTHON3_SETUPTOOLS_VERSION = 60.6.0 +PYTHON3_SETUPTOOLS_VERSION = 60.7.0 PYTHON3_SETUPTOOLS_SOURCE = setuptools-$(PYTHON3_SETUPTOOLS_VERSION).tar.gz -PYTHON3_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/8f/89/9fec81ec84737c925a1ee992af2c6c7153aec4051c26afeadd6b822354d2 +PYTHON3_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/29/dd/48d662bb93e5e51e72265ef612f869947d4ae4126328d7156824cd50d440 PYTHON3_SETUPTOOLS_LICENSE = MIT PYTHON3_SETUPTOOLS_LICENSE_FILES = LICENSE PYTHON3_SETUPTOOLS_CPE_ID_VENDOR = python From peter at korsgaard.com Sat Feb 5 12:48:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 13:48:44 +0100 Subject: [Buildroot] package libldns In-Reply-To: (ca's message of "Thu, 03 Feb 2022 21:37:39 +0000") References: <5_xofMlQqIrdAjpopLNCIYCGiqsc2UoXvUQG4GIV5Bd0dY31bw-gZ_0eoD0ix_iW-BI3-5O_RbQESkV3ybUN1zFSLY2r3PAr3ZOfxYOFmrU=@protonmail.ch> <6c85206c-139f-474d-7ca5-5f21fd606d96@mind.be> Message-ID: <877da9wkb7.fsf@dell.be.48ers.dk> >>>>> "ca0" == ca0 via buildroot writes: > Naah - builds only for Intel. Do an arm build and you'll find that the > m4/libtool.m4 runs a whole lot of ldconfig commands that show some > error codes and the worst part is that the libc files mentioned are > "blown away" (see > https://dictionary.tn/whats-another-word-for-blown-away/) like taken > our behind the shed and have a few bullets put in them - > ie. deleted. Do you know what a pain it is not having the build fail > there and then, because you have to debug a non working init, check > the kernel and then find that your user space has been crippled by > some Nazi collaborators (my bad, I'll stick to EU Nazi references from > now on). > Are you saying that this package works for ARM? It builds here on armv7/musl without issues on git master: cat defconfig BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_VFP=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_MUSL_STABLE=y BR2_PACKAGE_LIBLDNS=y # BR2_TARGET_ROOTFS_TAR is not set tree target/lib target/usr/lib target/lib ??? ld-musl-armhf.so.1 -> ../lib/libc.so ??? libatomic.so.1 -> libatomic.so.1.2.0 ??? libatomic.so.1.2.0 ??? libc.so ??? libgcc_s.so.1 target/usr/lib ??? libcrypto.so -> libcrypto.so.1.1 ??? libcrypto.so.1.1 ??? libgfortran.so.5 -> libgfortran.so.5.0.0 ??? libgfortran.so.5.0.0 ??? libldns.so -> libldns.so.3.2.0 ??? libldns.so.3 -> libldns.so.3.2.0 ??? libldns.so.3.2.0 ??? libssl.so -> libssl.so.1.1 ??? libssl.so.1.1 ??? libstdc++.so.6 -> libstdc++.so.6.0.28 ??? libstdc++.so.6.0.28 ??? libstdc++.so.6.0.28-gdb.py ??? libz.so -> libz.so.1.2.11 ??? libz.so.1 -> libz.so.1.2.11 ??? libz.so.1.2.11 ??? os-release -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 12:51:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 13:51:17 +0100 Subject: [Buildroot] [PATCH] package/{glibc, localedef}: security bump for additional post-2.34.x fixes In-Reply-To: <5de97254-e4b3-308e-c05f-26e394e2c668@gmail.com> (Romain Naour's message of "Sat, 5 Feb 2022 11:51:23 +0100") References: <20220204174712.1109-1-peter@korsgaard.com> <5de97254-e4b3-308e-c05f-26e394e2c668@gmail.com> Message-ID: <87zgn5v5mi.fsf@dell.be.48ers.dk> >>>>> "Romain" == Romain Naour writes: > Hi Peter, > Le 04/02/2022 ? 18:47, Peter Korsgaard a ?crit?: >> Fixes the following security issues: >> >> CVE-2022-23219: Passing an overlong file name to the clnt_create >> legacy function could result in a stack-based buffer overflow when >> using the "unix" protocol. Reported by Martin Sebor. >> >> CVE-2022-23218: Passing an overlong file name to the svcunix_create >> legacy function could result in a stack-based buffer overflow. >> >> CVE-2021-3998: Passing a path longer than PATH_MAX to the realpath >> function could result in a memory leak and potential access of >> uninitialized memory. Reported by Qualys. >> >> CVE-2021-3999: Passing a buffer of size exactly 1 byte to the getcwd >> function may result in an off-by-one buffer underflow and overflow >> when the current working directory is longer than PATH_MAX and also >> corresponds to the / directory through an unprivileged mount >> namespace. Reported by Qualys. >> >> Signed-off-by: Peter Korsgaard > Reviewed-by: Romain Naour Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 12:51:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 13:51:09 +0100 Subject: [Buildroot] [git commit] package/{glibc, localedef}: security bump for additional post-2.34.x fixes Message-ID: <20220205124414.D529182293@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1983d2e6a30fb6ca1d81f47798467bb0ac4401e6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes the following security issues: CVE-2022-23219: Passing an overlong file name to the clnt_create legacy function could result in a stack-based buffer overflow when using the "unix" protocol. Reported by Martin Sebor. CVE-2022-23218: Passing an overlong file name to the svcunix_create legacy function could result in a stack-based buffer overflow. CVE-2021-3998: Passing a path longer than PATH_MAX to the realpath function could result in a memory leak and potential access of uninitialized memory. Reported by Qualys. CVE-2021-3999: Passing a buffer of size exactly 1 byte to the getcwd function may result in an off-by-one buffer underflow and overflow when the current working directory is longer than PATH_MAX and also corresponds to the / directory through an unprivileged mount namespace. Reported by Qualys. Signed-off-by: Peter Korsgaard Reviewed-by: Romain Naour Signed-off-by: Peter Korsgaard --- .../0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch | 0 .../glibc.hash | 2 +- package/glibc/glibc.mk | 2 +- .../0001-HACK-only-build-and-install-localedef.patch | 0 .../0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch | 0 .../localedef.hash | 2 +- package/localedef/localedef.mk | 2 +- 7 files changed, 4 insertions(+), 4 deletions(-) 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-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch similarity index 100% rename from package/glibc/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch rename to package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch diff --git a/package/glibc/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/glibc.hash b/package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/glibc.hash similarity index 70% rename from package/glibc/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/glibc.hash rename to package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/glibc.hash index 595de95a58..dfd939020f 100644 --- a/package/glibc/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/glibc.hash +++ b/package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/glibc.hash @@ -1,5 +1,5 @@ # Locally calculated (fetched from Github) -sha256 1c7ed0f69ed268bd66f9754d0cb8fb65e0dafc1f9a1048ea50d1e96d60399686 glibc-2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4.tar.gz +sha256 3c299a21468a80356b848ca341f45551616c4928a6c871e6d45cee942e8b0f24 glibc-2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c.tar.gz # Hashes for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index 5c26b0e6df..9b591aa2a3 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -7,7 +7,7 @@ # Generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- # When updating the version, please also update localedef -GLIBC_VERSION = 2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4 +GLIBC_VERSION = 2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c # Upstream doesn't officially provide an https download link. # There is one (https://sourceware.org/git/glibc.git) but it's not reliable, # sometimes the connection times out. So use an unofficial github mirror. diff --git a/package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0001-HACK-only-build-and-install-localedef.patch b/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-HACK-only-build-and-install-localedef.patch similarity index 100% rename from package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0001-HACK-only-build-and-install-localedef.patch rename to package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-HACK-only-build-and-install-localedef.patch diff --git a/package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch b/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch similarity index 100% rename from package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch rename to package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch diff --git a/package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/localedef.hash b/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/localedef.hash similarity index 70% rename from package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/localedef.hash rename to package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/localedef.hash index 595de95a58..dfd939020f 100644 --- a/package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/localedef.hash +++ b/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/localedef.hash @@ -1,5 +1,5 @@ # Locally calculated (fetched from Github) -sha256 1c7ed0f69ed268bd66f9754d0cb8fb65e0dafc1f9a1048ea50d1e96d60399686 glibc-2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4.tar.gz +sha256 3c299a21468a80356b848ca341f45551616c4928a6c871e6d45cee942e8b0f24 glibc-2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c.tar.gz # Hashes for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/localedef/localedef.mk b/package/localedef/localedef.mk index 87d921cffe..f8f0b42984 100644 --- a/package/localedef/localedef.mk +++ b/package/localedef/localedef.mk @@ -7,7 +7,7 @@ # Use the same VERSION and SITE as target glibc # As in glibc.mk, generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- -LOCALEDEF_VERSION = 2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4 +LOCALEDEF_VERSION = 2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION).tar.gz LOCALEDEF_SITE = $(call github,bminor,glibc,$(LOCALEDEF_VERSION)) HOST_LOCALEDEF_DL_SUBDIR = glibc From peter at korsgaard.com Sat Feb 5 12:52:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 13:52:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/tor: bump version to 0.4.6.10 In-Reply-To: <20220205090943.4012391-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sat, 5 Feb 2022 10:09:43 +0100") References: <20220205090943.4012391-1-bernd.kuhls@t-online.de> Message-ID: <87v8xtv5kc.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Release notes: > https://gitlab.torproject.org/tpo/core/tor/-/raw/release-0.4.6/ReleaseNotes > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 12:53:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 13:53:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/libldns: remove --disable-dane-verify configure option In-Reply-To: <20220205092620.4162598-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sat, 5 Feb 2022 10:26:20 +0100") References: <20220205092620.4162598-1-bernd.kuhls@t-online.de> Message-ID: <87r18hv5jd.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Not needed anymore after openssl was bumped to 1.1.x, snippet from > libldns configure: > checking for SSL_get0_dane... yes Also if libressl is used? -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 12:55:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 13:55:08 +0100 Subject: [Buildroot] [PATCH v1] package/findutils: bump version to 4.9.0 In-Reply-To: <20220204153715.15481-1-ps.report@gmx.net> (Peter Seiderer's message of "Fri, 4 Feb 2022 16:37:15 +0100") References: <20220204153715.15481-1-ps.report@gmx.net> Message-ID: <87mtj5v5g3.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > For details see [1]. > [1] https://lists.gnu.org/archive/html/info-gnu/2022-02/msg00003.html > Signed-off-by: Peter Seiderer Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 12:52:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 13:52:03 +0100 Subject: [Buildroot] [git commit] package/tor: bump version to 0.4.6.10 Message-ID: <20220205124809.1F2FB82650@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b3058f39b86993996d17c8f38f0bfd83d654b5a7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://gitlab.torproject.org/tpo/core/tor/-/raw/release-0.4.6/ReleaseNotes Signed-off-by: Bernd Kuhls 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 63d47d7fa6..16e01c80a9 100644 --- a/package/tor/tor.hash +++ b/package/tor/tor.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c7e93380988ce20b82aa19c06cdb2f10302b72cfebec7c15b5b96bcfc94ca9a9 tor-0.4.6.9.tar.gz +sha256 94ccd60e04e558f33be73032bc84ea241660f92f58cfb88789bda6893739e31c tor-0.4.6.10.tar.gz sha256 47b54ed17e8fdcab3c44729a1789a09b208f9a63a845a7e50def9df729eebad0 LICENSE diff --git a/package/tor/tor.mk b/package/tor/tor.mk index fc1db6da6b..d16b3541eb 100644 --- a/package/tor/tor.mk +++ b/package/tor/tor.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOR_VERSION = 0.4.6.9 +TOR_VERSION = 0.4.6.10 TOR_SITE = https://dist.torproject.org TOR_LICENSE = BSD-3-Clause TOR_LICENSE_FILES = LICENSE From peter at korsgaard.com Sat Feb 5 12:55:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 13:55:04 +0100 Subject: [Buildroot] [git commit] package/findutils: bump version to 4.9.0 Message-ID: <20220205124809.28D9282803@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ad2a752d7b2e6b880d7ad8c2a785092dc2b47e6b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For details see [1]. [1] https://lists.gnu.org/archive/html/info-gnu/2022-02/msg00003.html Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/findutils/findutils.hash | 2 +- package/findutils/findutils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/findutils/findutils.hash b/package/findutils/findutils.hash index 26dbe59181..0284c0e7b2 100644 --- a/package/findutils/findutils.hash +++ b/package/findutils/findutils.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 57127b7e97d91282c6ace556378d5455a9509898297e46e10443016ea1387164 findutils-4.8.0.tar.xz +sha256 a2bfb8c09d436770edc59f50fa483e785b161a3b7b9d547573cb08065fd462fe findutils-4.9.0.tar.xz # Hash for license file sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING diff --git a/package/findutils/findutils.mk b/package/findutils/findutils.mk index 3237e5502a..9731a35047 100644 --- a/package/findutils/findutils.mk +++ b/package/findutils/findutils.mk @@ -4,7 +4,7 @@ # ################################################################################ -FINDUTILS_VERSION = 4.8.0 +FINDUTILS_VERSION = 4.9.0 FINDUTILS_SOURCE = findutils-$(FINDUTILS_VERSION).tar.xz FINDUTILS_SITE = $(BR2_GNU_MIRROR)/findutils FINDUTILS_LICENSE = GPL-3.0+ From peter at korsgaard.com Sat Feb 5 12:55:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 13:55:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi-pvr-mythtv: bump version to 19.0.7-Matrix In-Reply-To: <20220204164528.80593-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Fri, 4 Feb 2022 17:45:28 +0100") References: <20220204164528.80593-1-bernd.kuhls@t-online.de> Message-ID: <87ilttv5f0.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 Feb 5 12:55:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 13:55:44 +0100 Subject: [Buildroot] [git commit] package/kodi-pvr-mythtv: bump version to 19.0.7-Matrix Message-ID: <20220205124839.1D78982650@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e830f40635b30de6dfd7c91ce785ef8b48e2a6b4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- 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 cb10d24a4f..15596333f5 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 8e63e85e055ec1e2d727506c939c4f53f6aef8b714f5c18f73c58102355f2e14 kodi-pvr-mythtv-19.0.6-Matrix.tar.gz +sha256 ccb97573c308c99adccdedf8328133c02d48c11620b602a906cf25107602dba5 kodi-pvr-mythtv-19.0.7-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 351fbc4eae..3040f87e14 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.6-Matrix +KODI_PVR_MYTHTV_VERSION = 19.0.7-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 peter at korsgaard.com Sat Feb 5 13:58:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 14:58:40 +0100 Subject: [Buildroot] [PATCH v1] package/mtools: bump version to 4.0.37 In-Reply-To: <20220203232410.26906-1-ps.report@gmx.net> (Peter Seiderer's message of "Fri, 4 Feb 2022 00:24:10 +0100") References: <20220203232410.26906-1-ps.report@gmx.net> Message-ID: <87ee4hv2i7.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > For details see [1]. > [1] https://lists.gnu.org/archive/html/info-gnu/2022-01/msg00006.html > Signed-off-by: Peter Seiderer Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 13:59:29 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 14:59:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-django: bump to version 4.0.2 In-Reply-To: <20220204193215.167521-1-aduskett@gmail.com> (Adam Duskett's message of "Fri, 4 Feb 2022 11:32:15 -0800") References: <20220204193215.167521-1-aduskett@gmail.com> Message-ID: <87a6f5v2gu.fsf@dell.be.48ers.dk> >>>>> "Adam" == Adam Duskett writes: > Tested with: > support/testing/run-tests tests.package.test_python_django.TestPythonPy3Django > Signed-off-by: Adam Duskett Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 13:51:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 14:51:30 +0100 Subject: [Buildroot] [PATCH] package/xen: security bump to version 4.14.4 Message-ID: <20220205135132.3007-1-peter@korsgaard.com> Includes a number of bugfixes and the security fixes up to xsa-395: https://xenproject.org/downloads/xen-project-archives/xen-project-4-14-series/xen-project-4-14-4/ Drop the now upstream xsa38* patches. Signed-off-by: Peter Korsgaard --- package/xen/xen.hash | 11 +---------- package/xen/xen.mk | 19 +------------------ 2 files changed, 2 insertions(+), 28 deletions(-) diff --git a/package/xen/xen.hash b/package/xen/xen.hash index 10a778053a..a81d05e3f7 100644 --- a/package/xen/xen.hash +++ b/package/xen/xen.hash @@ -1,12 +1,3 @@ # Locally computed -sha256 a3dad76a772393a1875e8f44a6059a95fea4bde40f97b800966969ac6f3a498d xen-4.14.3.tar.gz +sha256 e76d56dfcdabf5d80aa06819f44472de49526a518dbb483eb08e7ff9aec2c669 xen-4.14.4.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 cfc166dc4c..03341d4275 100644 --- a/package/xen/xen.mk +++ b/package/xen/xen.mk @@ -4,30 +4,13 @@ # ################################################################################ -XEN_VERSION = 4.14.3 +XEN_VERSION = 4.14.4 XEN_SITE = https://downloads.xenproject.org/release/xen/$(XEN_VERSION) XEN_LICENSE = GPL-2.0 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) -- 2.20.1 From fontaine.fabrice at gmail.com Sat Feb 5 13:58:06 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 5 Feb 2022 14:58:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/cryptopp: disable altivec if needed Message-ID: <20220205135806.312865-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since commit bf4cf9de833e2d571d98d1ca935ea08a3468e463: blake2s_simd.cpp:715:8: error: 'uint32x4_p' does not name a type; did you mean 'uint32_t'? 715 | inline uint32x4_p VecLoad32(const T* p) | ^~~~~~~~~~ | uint32_t Fixes: - http://autobuild.buildroot.org/results/9e9f8559b12b8e2cf99cfab435fa7dd5796bbcd5 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 4353e35e0a..87d6fba237 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_POWERPC_CPU_HAS_ALTIVEC),y) +CRYPTOPP_CXXFLAGS += -DCRYPTOPP_DISABLE_ALTIVEC +endif + ifneq ($(BR2_ARM_CPU_HAS_NEON),y) CRYPTOPP_CXXFLAGS += -DCRYPTOPP_DISABLE_ARM_NEON endif -- 2.34.1 From peter at korsgaard.com Sat Feb 5 13:59:52 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 14:59:52 +0100 Subject: [Buildroot] [git commit] package/dovecot-pigeonhole: bump version to 0.5.18 Message-ID: <20220205135422.74AE182815@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6ec46f5608c204c8b84afff64c2804bfaef8956e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://github.com/dovecot/pigeonhole/blob/release-0.5.18/NEWS Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/dovecot-pigeonhole/dovecot-pigeonhole.hash | 2 +- package/dovecot-pigeonhole/dovecot-pigeonhole.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dovecot-pigeonhole/dovecot-pigeonhole.hash b/package/dovecot-pigeonhole/dovecot-pigeonhole.hash index b244563935..f3a5890151 100644 --- a/package/dovecot-pigeonhole/dovecot-pigeonhole.hash +++ b/package/dovecot-pigeonhole/dovecot-pigeonhole.hash @@ -1,3 +1,3 @@ # Locally computed after checking signature -sha256 3cc4a3de6d7e27bd99ac59b99faa161287f78167272699a22591798ffcf84512 dovecot-2.3-pigeonhole-0.5.17.1.tar.gz +sha256 a6d828f8d6f2decba5105343ece5c7a65245bd94e46a8ae4432a6d97543108a5 dovecot-2.3-pigeonhole-0.5.18.tar.gz sha256 fc9e9522216f2a9a28b31300e3c73c1df56acc27dfae951bf516e7995366b51a COPYING diff --git a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk index 95e9059392..dd533977f4 100644 --- a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk +++ b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOVECOT_PIGEONHOLE_VERSION = 0.5.17.1 +DOVECOT_PIGEONHOLE_VERSION = 0.5.18 DOVECOT_PIGEONHOLE_SOURCE = dovecot-2.3-pigeonhole-$(DOVECOT_PIGEONHOLE_VERSION).tar.gz DOVECOT_PIGEONHOLE_SITE = https://pigeonhole.dovecot.org/releases/2.3 DOVECOT_PIGEONHOLE_LICENSE = LGPL-2.1 From peter at korsgaard.com Sat Feb 5 13:58:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 14:58:38 +0100 Subject: [Buildroot] [git commit] package/mtools: bump version to 4.0.37 Message-ID: <20220205135422.62770817C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e26b261ab5f67fe93414f364d62a7cc8eb75934c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For details see [1]. [1] https://lists.gnu.org/archive/html/info-gnu/2022-01/msg00006.html Signed-off-by: Peter Seiderer 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 c37d4df456..5d1bca486f 100644 --- a/package/mtools/mtools.hash +++ b/package/mtools/mtools.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 78ac74b2d1cae77bb2da29461a13ed862ff6b7c1289d5bf80fdb09e039c2c48f mtools-4.0.36.tar.lz +sha256 f4dd1fb4b4d72f344f7efcfb05219de3882c6c6fce678d75e7cfb29ca162c7ca mtools-4.0.37.tar.lz # Locally calculated sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/mtools/mtools.mk b/package/mtools/mtools.mk index 4908c3fa2f..f73fd5d231 100644 --- a/package/mtools/mtools.mk +++ b/package/mtools/mtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -MTOOLS_VERSION = 4.0.36 +MTOOLS_VERSION = 4.0.37 MTOOLS_SOURCE = mtools-$(MTOOLS_VERSION).tar.lz MTOOLS_SITE = $(BR2_GNU_MIRROR)/mtools MTOOLS_LICENSE = GPL-3.0+ From peter at korsgaard.com Sat Feb 5 13:59:11 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 14:59:11 +0100 Subject: [Buildroot] [git commit] package/python-django: bump to version 4.0.2 Message-ID: <20220205135422.6B43A82810@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c60848387baa3da4c4635c83282995cce6aab363 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Tested with: support/testing/run-tests tests.package.test_python_django.TestPythonPy3Django Signed-off-by: Adam Duskett 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 89bc5ffb19..f78df56c5f 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 6c4a53d2ccb464bc3dd772c6f2f07df9 Django-3.2.11.tar.gz -sha256 69c94abe5d6b1b088bf475e09b7b74403f943e34da107e798465d2045da27e75 Django-3.2.11.tar.gz +md5 a86339c0e87241597afa8744704d9965 Django-4.0.2.tar.gz +sha256 110fb58fb12eca59e072ad59fc42d771cd642dd7a2f2416582aa9da7a8ef954a Django-4.0.2.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-django/python-django.mk b/package/python-django/python-django.mk index 25a645823b..652ca477ce 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 3.2.11 +PYTHON_DJANGO_VERSION = 4.0.2 PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz # The official Django site has an unpractical URL -PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/20/86/e4348aac45bc83fc8e9dda2cfd81004b007c65b68c1499a4233acabdaa3b +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/61/84/676c840e8f1188a6c836e3224b97aa8be4c2e6857c690d6c564eb23a4975 PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE From peter at korsgaard.com Sat Feb 5 14:01:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 15:01:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/dovecot-pigeonhole: bump version to 0.5.18 In-Reply-To: <20220205091304.4096595-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sat, 5 Feb 2022 10:13:04 +0100") References: <20220205091304.4096595-1-bernd.kuhls@t-online.de> Message-ID: <875yptv2dd.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Release notes: > https://github.com/dovecot/pigeonhole/blob/release-0.5.18/NEWS > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 14:01:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 15:01:46 +0100 Subject: [Buildroot] [git commit] package/intel-gmmlib: bump version to 22.0.2 Message-ID: <20220205135436.7EBC082745@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9a60a0ff349c40349831d61c7c3e5190bf1db0d6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/intel-gmmlib/intel-gmmlib.hash | 2 +- package/intel-gmmlib/intel-gmmlib.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-gmmlib/intel-gmmlib.hash b/package/intel-gmmlib/intel-gmmlib.hash index 8780eb9229..71a153e0a3 100644 --- a/package/intel-gmmlib/intel-gmmlib.hash +++ b/package/intel-gmmlib/intel-gmmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 341eb3fa478e427e5a6f03d4cbc97bc2b02c52728dcf06c4794661d34b7c6e5c intel-gmmlib-22.0.1.tar.gz +sha256 7cc044dc0979269abe825054ba6cc1b67169dc7a7f4192898e2dd04142a633fa intel-gmmlib-22.0.2.tar.gz sha256 8b7446825df3f8b0268307e272aa6aaaf78351c83161d860d02c913c22666c48 LICENSE.md diff --git a/package/intel-gmmlib/intel-gmmlib.mk b/package/intel-gmmlib/intel-gmmlib.mk index c45a7669b1..235f71341c 100644 --- a/package/intel-gmmlib/intel-gmmlib.mk +++ b/package/intel-gmmlib/intel-gmmlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_GMMLIB_VERSION = 22.0.1 +INTEL_GMMLIB_VERSION = 22.0.2 INTEL_GMMLIB_SITE = https://github.com/intel/gmmlib/archive INTEL_GMMLIB_LICENSE = MIT INTEL_GMMLIB_LICENSE_FILES = LICENSE.md From peter at korsgaard.com Sat Feb 5 14:01:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 15:01:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/intel-gmmlib: bump version to 22.0.2 In-Reply-To: <20220205091913.4135654-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sat, 5 Feb 2022 10:19:13 +0100") References: <20220205091913.4135654-1-bernd.kuhls@t-online.de> Message-ID: <871r0hv2cx.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From arnout at mind.be Sat Feb 5 14:10:41 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 5 Feb 2022 15:10:41 +0100 Subject: [Buildroot] [PATCH] board/pc: fix build failure due to new genimage 15 In-Reply-To: <20220204005610.897894-1-giulio.benetti@benettiengineering.com> References: <20220204005610.897894-1-giulio.benetti@benettiengineering.com> Message-ID: <98670320-83fa-c6e9-9bc4-aa30d9deb6ff@mind.be> Hi Giulio, On 04/02/2022 01:56, Giulio Benetti wrote: > Actually genimage fails to create final image with: > ``` > ERROR: hdimage(disk.img): partition [MBR] (offset 0x1b8, size 0x48) overlaps previous partition boot (offset 0x0, size 0x200) > ERROR: hdimage(disk.img): bootloaders, etc. that overlap with the partition table must declare the overlapping area as a hole. > ``` > > This is because genimage 15 is less permissive than before, so let's add > holes = {"(440; 512)"} to leave room to MBR. > > Fixes: > https://gitlab.com/buildroot.org/buildroot/-/jobs/1865935249 > > Signed-off-by: Giulio Benetti > --- > board/pc/genimage-bios.cfg | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/board/pc/genimage-bios.cfg b/board/pc/genimage-bios.cfg > index 26d12d9ab3..54026f6527 100644 > --- a/board/pc/genimage-bios.cfg > +++ b/board/pc/genimage-bios.cfg > @@ -7,6 +7,7 @@ image disk.img { > image = "boot.img" > offset = 0 > size = 512 > + holes = {"(440; 512)"} Have you tested this change on an actual board (i.e. a PC :-)? Regards, Arnout > } > > partition grub { From fontaine.fabrice at gmail.com Sat Feb 5 14:11:32 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 5 Feb 2022 15:11:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/libgeotiff: bump to version 1.7.0 Message-ID: <20220205141132.419654-1-fontaine.fabrice@gmail.com> https://github.com/OSGeo/libgeotiff/releases/tag/1.7.0 Signed-off-by: Fabrice Fontaine --- package/libgeotiff/libgeotiff.hash | 2 +- package/libgeotiff/libgeotiff.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libgeotiff/libgeotiff.hash b/package/libgeotiff/libgeotiff.hash index 51adcc2843..ec9fccb492 100644 --- a/package/libgeotiff/libgeotiff.hash +++ b/package/libgeotiff/libgeotiff.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 9311017e5284cffb86f2c7b7a9df1fb5ebcdc61c30468fb2e6bca36e4272ebca libgeotiff-1.6.0.tar.gz +sha256 fc304d8839ca5947cfbeb63adb9d1aa47acef38fc6d6689e622926e672a99a7e libgeotiff-1.7.0.tar.gz sha256 6a22340b8293c50a34ce8e95589489bd3ec65bcb8b93e61cbda3daaafe498375 LICENSE diff --git a/package/libgeotiff/libgeotiff.mk b/package/libgeotiff/libgeotiff.mk index c6fb61b4a2..c49528565d 100644 --- a/package/libgeotiff/libgeotiff.mk +++ b/package/libgeotiff/libgeotiff.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGEOTIFF_VERSION = 1.6.0 +LIBGEOTIFF_VERSION = 1.7.0 LIBGEOTIFF_SITE = http://download.osgeo.org/geotiff/libgeotiff LIBGEOTIFF_LICENSE = X11-style, public domain LIBGEOTIFF_LICENSE_FILES = LICENSE -- 2.34.1 From fontaine.fabrice at gmail.com Sat Feb 5 14:14:48 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 5 Feb 2022 15:14:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/tiff: fix CVE-2022-22844 Message-ID: <20220205141448.420553-1-fontaine.fabrice@gmail.com> LibTIFF 4.3.0 has an out-of-bounds read in _TIFFmemcpy in tif_unix.c in certain situations involving a custom tag and 0x0200 as the second word of the DE field. Signed-off-by: Fabrice Fontaine --- ...lobal-buffer-overflow-for-ASCII-tags.patch | 43 +++++++++++++++++++ package/tiff/tiff.mk | 4 ++ 2 files changed, 47 insertions(+) create mode 100644 package/tiff/0001-tiffset-fix-global-buffer-overflow-for-ASCII-tags.patch diff --git a/package/tiff/0001-tiffset-fix-global-buffer-overflow-for-ASCII-tags.patch b/package/tiff/0001-tiffset-fix-global-buffer-overflow-for-ASCII-tags.patch new file mode 100644 index 0000000000..ba1487782e --- /dev/null +++ b/package/tiff/0001-tiffset-fix-global-buffer-overflow-for-ASCII-tags.patch @@ -0,0 +1,43 @@ +From 03047a26952a82daaa0792957ce211e0aa51bc64 Mon Sep 17 00:00:00 2001 +From: 4ugustus +Date: Tue, 25 Jan 2022 16:25:28 +0000 +Subject: [PATCH] tiffset: fix global-buffer-overflow for ASCII tags where + count is required (fixes #355) + +[Retrieved from: +https://gitlab.com/libtiff/libtiff/-/commit/03047a26952a82daaa0792957ce211e0aa51bc64] +Signed-off-by: Fabrice Fontaine +--- + tools/tiffset.c | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) + +diff --git a/tools/tiffset.c b/tools/tiffset.c +index 8c9e23c5..e7a88c09 100644 +--- a/tools/tiffset.c ++++ b/tools/tiffset.c +@@ -146,9 +146,19 @@ main(int argc, char* argv[]) + + arg_index++; + if (TIFFFieldDataType(fip) == TIFF_ASCII) { +- if (TIFFSetField(tiff, TIFFFieldTag(fip), argv[arg_index]) != 1) +- fprintf( stderr, "Failed to set %s=%s\n", +- TIFFFieldName(fip), argv[arg_index] ); ++ if(TIFFFieldPassCount( fip )) { ++ size_t len; ++ len = strlen(argv[arg_index]) + 1; ++ if (len > UINT16_MAX || TIFFSetField(tiff, TIFFFieldTag(fip), ++ (uint16_t)len, argv[arg_index]) != 1) ++ fprintf( stderr, "Failed to set %s=%s\n", ++ TIFFFieldName(fip), argv[arg_index] ); ++ } else { ++ if (TIFFSetField(tiff, TIFFFieldTag(fip), ++ argv[arg_index]) != 1) ++ fprintf( stderr, "Failed to set %s=%s\n", ++ TIFFFieldName(fip), argv[arg_index] ); ++ } + } else if (TIFFFieldWriteCount(fip) > 0 + || TIFFFieldWriteCount(fip) == TIFF_VARIABLE) { + int ret = 1; +-- +GitLab + diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index f6c6de12c5..f80ab7ac55 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -11,6 +11,10 @@ TIFF_LICENSE_FILES = COPYRIGHT TIFF_CPE_ID_VENDOR = libtiff TIFF_CPE_ID_PRODUCT = libtiff TIFF_INSTALL_STAGING = YES + +# 0001-tiffset-fix-global-buffer-overflow-for-ASCII-tags.patch +TIFF_IGNORE_CVES += CVE-2022-22844 + TIFF_CONF_OPTS = \ --disable-cxx \ --without-x -- 2.34.1 From fontaine.fabrice at gmail.com Sat Feb 5 14:30:43 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 5 Feb 2022 15:30:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/cryptopp: needs C++ Message-ID: <20220205143043.427517-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since commit bf4cf9de833e2d571d98d1ca935ea08a3468e463: no -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O2 -g0 -D_FORTIFY_SOURCE=1 -fPIC -DCRYPTOPP_DISABLE_ARM_NEON -c cryptlib.cpp make[1]: no: Command not found Fixes: - http://autobuild.buildroot.org/results/fa90b416a219a512a482e7dc63e2d72b184307c7 Signed-off-by: Fabrice Fontaine --- package/cryptopp/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/cryptopp/Config.in b/package/cryptopp/Config.in index feb945db2f..1648a73f9d 100644 --- a/package/cryptopp/Config.in +++ b/package/cryptopp/Config.in @@ -1,9 +1,11 @@ config BR2_PACKAGE_CRYPTOPP bool "cryptopp" + depends on BR2_INSTALL_LIBSTDCPP 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, wchar" - depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR +comment "cryptopp needs a toolchain w/ C++, dynamic library, wchar" + depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ + !BR2_USE_WCHAR -- 2.34.1 From peter at korsgaard.com Sat Feb 5 14:43:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 15:43:04 +0100 Subject: [Buildroot] [PATCH] package/rauc: d-bus support is optional Message-ID: <20220205144306.29481-1-peter@korsgaard.com> As pointed out by Jan L?bbe, D-Bus support is optional: > You can build without D-Bus (./configure --disable-service). So drop it from the required dependencies and add a RAUC_DBUS sub option like it is done for network/json. Signed-off-by: Peter Korsgaard --- package/rauc/Config.in | 8 +++++++- package/rauc/rauc.mk | 9 ++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/package/rauc/Config.in b/package/rauc/Config.in index 676ff42b51..b4f7b81948 100644 --- a/package/rauc/Config.in +++ b/package/rauc/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_RAUC depends on BR2_USE_WCHAR # glib2 select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_DBUS select BR2_PACKAGE_SQUASHFS # run-time dependency select BR2_PACKAGE_UBOOT_TOOLS if BR2_TARGET_UBOOT # run-time dependency select BR2_PACKAGE_UBOOT_TOOLS_FWPRINTENV if BR2_TARGET_UBOOT @@ -19,6 +18,13 @@ config BR2_PACKAGE_RAUC if BR2_PACKAGE_RAUC +config BR2_PACKAGE_RAUC_DBUS + bool "dbus support" + select BR2_PACKAGE_DBUS + help + This option enables support for controlling rauc through + D-Bus. + config BR2_PACKAGE_RAUC_NETWORK bool "network support" select BR2_PACKAGE_LIBCURL diff --git a/package/rauc/rauc.mk b/package/rauc/rauc.mk index 4fb3ddde3e..99efc16c2f 100644 --- a/package/rauc/rauc.mk +++ b/package/rauc/rauc.mk @@ -10,7 +10,14 @@ RAUC_SOURCE = rauc-$(RAUC_VERSION).tar.xz RAUC_LICENSE = LGPL-2.1 RAUC_LICENSE_FILES = COPYING RAUC_CPE_ID_VENDOR = pengutronix -RAUC_DEPENDENCIES = host-pkgconf openssl libglib2 dbus +RAUC_DEPENDENCIES = host-pkgconf openssl libglib2 + +ifeq ($(BR2_PACKAGE_RAUC_DBUS),y) +RAUC_CONF_OPTS += --enable-service +RAUC_DEPENDENCIES += dbus +else +RAUC_CONF_OPTS += --disable-service +endif ifeq ($(BR2_PACKAGE_RAUC_NETWORK),y) RAUC_CONF_OPTS += --enable-network -- 2.20.1 From fontaine.fabrice at gmail.com Sat Feb 5 14:50:39 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 5 Feb 2022 15:50:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/mpdecimal: fix build without threads Message-ID: <20220205145039.439160-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump to version 2.5.1 in commit 995c093d6a3e8042110d6a8d96fdc7ad65a557c4: /home/peko/autobuild/instance-0/output-1/per-package/mpdecimal/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: cannot find -lpthread Fixes: - http://autobuild.buildroot.org/results/b20c090f2ac5ea6d1c761820763037b87bde137a Signed-off-by: Fabrice Fontaine --- package/mpdecimal/mpdecimal.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/mpdecimal/mpdecimal.mk b/package/mpdecimal/mpdecimal.mk index 25c12c08b1..aa322df340 100644 --- a/package/mpdecimal/mpdecimal.mk +++ b/package/mpdecimal/mpdecimal.mk @@ -11,6 +11,9 @@ MPDECIMAL_LICENSE = BSD-2-Clause MPDECIMAL_LICENSE_FILES = LICENSE.txt MPDECIMAL_CONF_OPTS = LD="$(TARGET_CC)" +# threads are only needed for tests +MPDECIMAL_MAKE_OPTS = MPD_PTHREAD= + # On i386, by default, mpdecimal tries to uses which is not # available in musl/uclibc. So in this case, we tell mpdecimal to use # the generic 32 bits code, which is anyway the one used on ARM, -- 2.34.1 From peter at korsgaard.com Sat Feb 5 14:56:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 15:56:28 +0100 Subject: [Buildroot] [PATCH v1 00/12] package/gstreamer1/*: bump version to 1.18.6 In-Reply-To: <20220204154631.17814-1-ps.report@gmx.net> (Peter Seiderer's message of "Fri, 4 Feb 2022 16:46:19 +0100") References: <20220204154631.17814-1-ps.report@gmx.net> Message-ID: <87wni9tl9f.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > For details see [1] and [2]. > [1] https://lists.freedesktop.org/archives/gstreamer-devel/2022-February/079533.html > [2] https://gstreamer.freedesktop.org/releases/1.18/#1.18.6 > Peter Seiderer (12): > package/gstreamer1: bump version to 1.18.6 > package/gst1-plugins-base: bump version to 1.18.6 > package/gst1-plugins-good: bump version to 1.18.6 > package/gst1-plugins-bad: bump version to 1.18.6 > package/gst1-plugins-ugly: bump version to 1.18.6 > package/gst1-devtools: bump version to 1.18.6 > package/gst1-libav: bump version to 1.18.6 > package/gst1-vaapi: bump version to 1.18.6 > package/gst1-rtsp-server: bump version to 1.18.6 > package/gstreamer1-editing-services: bump version to 1.18.6 > package/gst-omx: bump version to 1.18.6 > package/gst1-python: bump version to 1.18.6 Committed series, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 14:53:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 15:53:44 +0100 Subject: [Buildroot] [git commit] package/gst1-plugins-good: bump version to 1.18.6 Message-ID: <20220205144955.6D1CC82967@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8741ac0e502bacad8c81c9b02e116d9ce00fee03 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash | 4 ++-- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash index ea9f43bfd2..e342bd133e 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.5.tar.xz.sha256sum -sha256 3aaeeea7765fbf8801acce4a503a9b05f73f04e8a35352e9d00232cfd555796b gst-plugins-good-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.6.tar.xz.sha256sum +sha256 26723ac01fcb360ade1f41d168c7c322d8af4ceb7e55c8c12ed2690d06a76eed gst-plugins-good-1.18.6.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk index 44da3c3c30..e0ca29c5fd 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_GOOD_VERSION = 1.18.5 +GST1_PLUGINS_GOOD_VERSION = 1.18.6 GST1_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST1_PLUGINS_GOOD_VERSION).tar.xz GST1_PLUGINS_GOOD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-good GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING From peter at korsgaard.com Sat Feb 5 14:53:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 15:53:22 +0100 Subject: [Buildroot] [git commit] package/gstreamer1: bump version to 1.18.6 Message-ID: <20220205144955.5A2E282901@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=58be19b0280e803ebe710c591cd4780cdd037a5e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/gstreamer1/gstreamer1/gstreamer1.hash | 4 ++-- package/gstreamer1/gstreamer1/gstreamer1.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gstreamer1/gstreamer1.hash b/package/gstreamer1/gstreamer1/gstreamer1.hash index c6282454ca..1202bf2c50 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.hash +++ b/package/gstreamer1/gstreamer1/gstreamer1.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.18.5.tar.xz.sha256sum -sha256 55862232a63459bbf56abebde3085ca9aec211b478e891dacea4d6df8cafe80a gstreamer-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.18.6.tar.xz.sha256sum +sha256 4ec816010dd4d3a93cf470ad0a6f25315f52b204eb1d71dfa70ab8a1c3bd06e6 gstreamer-1.18.6.tar.xz sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk index 1aab035e05..27745f3bf9 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_VERSION = 1.18.5 +GSTREAMER1_VERSION = 1.18.6 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer GSTREAMER1_INSTALL_STAGING = YES From peter at korsgaard.com Sat Feb 5 14:54:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 15:54:26 +0100 Subject: [Buildroot] [git commit] package/gst1-plugins-ugly: bump version to 1.18.6 Message-ID: <20220205144955.807B88295E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4d02d512f380a51097026ab33241aa466c33ee07 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash | 4 ++-- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash index 93945cdecd..26fd0fd9ac 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.18.5.tar.xz.sha256sum -sha256 df32803e98f8a9979373fa2ca7e05e62f977b1097576d3a80619d9f5c69f66d9 gst-plugins-ugly-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.18.6.tar.xz.sha256sum +sha256 4969c409cb6a88317d2108b8577108e18623b2333d7b587ae3f39459c70e3a7f gst-plugins-ugly-1.18.6.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk index a25110264e..7f483deb81 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_UGLY_VERSION = 1.18.5 +GST1_PLUGINS_UGLY_VERSION = 1.18.6 GST1_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST1_PLUGINS_UGLY_VERSION).tar.xz GST1_PLUGINS_UGLY_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-ugly GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING From peter at korsgaard.com Sat Feb 5 14:53:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 15:53:33 +0100 Subject: [Buildroot] [git commit] package/gst1-plugins-base: bump version to 1.18.6 Message-ID: <20220205144955.642418295E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ecdc76a39c89d37a90c2b87ecf62db09de710beb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - removed 0001-gst-libs-gst-video-gstvideoaggregator.c-fix-build-wi.patch (upstream accepted [1], [2]) [1] https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/974 [2] https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/commit/d86cf6314f8f178c59600f55321ce73d4ca95d97.patch Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- ...t-video-gstvideoaggregator.c-fix-build-wi.patch | 45 ---------------------- .../gst1-plugins-base/gst1-plugins-base.hash | 4 +- .../gst1-plugins-base/gst1-plugins-base.mk | 2 +- 3 files changed, 3 insertions(+), 48 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-base/0001-gst-libs-gst-video-gstvideoaggregator.c-fix-build-wi.patch b/package/gstreamer1/gst1-plugins-base/0001-gst-libs-gst-video-gstvideoaggregator.c-fix-build-wi.patch deleted file mode 100644 index 87cd6493f5..0000000000 --- a/package/gstreamer1/gst1-plugins-base/0001-gst-libs-gst-video-gstvideoaggregator.c-fix-build-wi.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 012ca1bcd234ee02f576dd58b1f09baba18b89b0 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 14 Dec 2020 07:42:55 +0100 -Subject: [PATCH] gst-libs/gst/video/gstvideoaggregator.c: fix build with gcc - 4.8 - -Fix the following build failure with gcc 4.8 which has been added with -https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/commit/d268c193ad39fb970351ed62898be806ebd0a71e: - -../gst-libs/gst/video/gstvideoaggregator.c: In function 'gst_video_aggregator_init': -../gst-libs/gst/video/gstvideoaggregator.c:2762:3: error: 'for' loop initial declarations are only allowed in C99 mode - for (gint i = 0; i < gst_caps_get_size (src_template); i++) { - ^ - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/974] ---- - gst-libs/gst/video/gstvideoaggregator.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/gst-libs/gst/video/gstvideoaggregator.c b/gst-libs/gst/video/gstvideoaggregator.c -index 2e3d813be..04dad6563 100644 ---- a/gst-libs/gst/video/gstvideoaggregator.c -+++ b/gst-libs/gst/video/gstvideoaggregator.c -@@ -2786,6 +2786,7 @@ gst_video_aggregator_init (GstVideoAggregator * vagg, - { - GstCaps *src_template; - GstPadTemplate *pad_template; -+ gint i; - - vagg->priv = gst_video_aggregator_get_instance_private (vagg); - vagg->priv->current_caps = NULL; -@@ -2800,7 +2801,7 @@ gst_video_aggregator_init (GstVideoAggregator * vagg, - pad_template = - gst_element_class_get_pad_template (GST_ELEMENT_CLASS (klass), "src"); - src_template = gst_pad_template_get_caps (pad_template); -- for (gint i = 0; i < gst_caps_get_size (src_template); i++) { -+ for (i = 0; i < gst_caps_get_size (src_template); i++) { - const GValue *v = - gst_structure_get_value (gst_caps_get_structure (src_template, i), - "format"); --- -2.29.2 - diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash index 200ba0fe5d..081dc6f213 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.18.5.tar.xz.sha256sum -sha256 960b7af4585700db0fdd5b843554e11e2564fed9e061f591fae88a7be6446fa3 gst-plugins-base-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.18.6.tar.xz.sha256sum +sha256 56a9ff2fe9e6603b9e658cf6897d412a173d2180829fe01e92568549c6bd0f5b gst-plugins-base-1.18.6.tar.xz sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk index 76757fd6a8..c99eeb6c59 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BASE_VERSION = 1.18.5 +GST1_PLUGINS_BASE_VERSION = 1.18.6 GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz GST1_PLUGINS_BASE_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-base GST1_PLUGINS_BASE_INSTALL_STAGING = YES From peter at korsgaard.com Sat Feb 5 14:54:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 15:54:37 +0100 Subject: [Buildroot] [git commit] package/gst1-devtools: bump version to 1.18.6 Message-ID: <20220205144955.8979D82967@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=efd9eac4d7579808caa23ee52a0d9661c8f987be branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-devtools/gst1-devtools.hash | 4 ++-- package/gstreamer1/gst1-devtools/gst1-devtools.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.hash b/package/gstreamer1/gst1-devtools/gst1-devtools.hash index c19254c195..011385e757 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.hash +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.18.5.tar.xz.sha256sum -sha256 fecffc86447daf5c2a06843c757a991d745caa2069446a0d746e99b13f7cb079 gst-devtools-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.18.6.tar.xz.sha256sum +sha256 3725622c740a635452e54b79d065f963ab7706ca2403de6c43072ae7610a0de4 gst-devtools-1.18.6.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 validate/COPYING diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.mk b/package/gstreamer1/gst1-devtools/gst1-devtools.mk index 1c25823953..66b509ae2c 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.mk +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_DEVTOOLS_VERSION = 1.18.5 +GST1_DEVTOOLS_VERSION = 1.18.6 GST1_DEVTOOLS_SOURCE = gst-devtools-$(GST1_DEVTOOLS_VERSION).tar.xz GST1_DEVTOOLS_SITE = https://gstreamer.freedesktop.org/src/gst-devtools GST1_DEVTOOLS_LICENSE = LGPL-2.1+ From peter at korsgaard.com Sat Feb 5 14:55:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 15:55:34 +0100 Subject: [Buildroot] [git commit] package/gst-omx: bump version to 1.18.6 Message-ID: <20220205144955.B1F258295E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ce4bc450007910aa673d0f8356e99c421d20af89 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst-omx/gst-omx.hash | 4 ++-- package/gstreamer1/gst-omx/gst-omx.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst-omx/gst-omx.hash b/package/gstreamer1/gst-omx/gst-omx.hash index 9040393506..47f7cb5893 100644 --- a/package/gstreamer1/gst-omx/gst-omx.hash +++ b/package/gstreamer1/gst-omx/gst-omx.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.18.5.tar.xz.sha256sum -sha256 2cd457c1e8deb1a9b39608048fb36a44f6c9a864a6b6115b1453a32e7be93b42 gst-omx-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.18.6.tar.xz.sha256sum +sha256 b5281c938e959fd2418e989cfb6065fdd9fe5f6f87ee86236c9427166e708163 gst-omx-1.18.6.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst-omx/gst-omx.mk b/package/gstreamer1/gst-omx/gst-omx.mk index f7be1d59ef..dc65509244 100644 --- a/package/gstreamer1/gst-omx/gst-omx.mk +++ b/package/gstreamer1/gst-omx/gst-omx.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST_OMX_VERSION = 1.18.5 +GST_OMX_VERSION = 1.18.6 GST_OMX_SOURCE = gst-omx-$(GST_OMX_VERSION).tar.xz GST_OMX_SITE = https://gstreamer.freedesktop.org/src/gst-omx From peter at korsgaard.com Sat Feb 5 14:54:59 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 15:54:59 +0100 Subject: [Buildroot] [git commit] package/gst1-libav: bump version to 1.18.6 Message-ID: <20220205144955.919D382901@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8de78f3da0cdbc139b876bdeb34079302ce02934 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-libav/gst1-libav.hash | 4 ++-- package/gstreamer1/gst1-libav/gst1-libav.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-libav/gst1-libav.hash b/package/gstreamer1/gst1-libav/gst1-libav.hash index 040a6e33f3..5fb39a0b3e 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.hash +++ b/package/gstreamer1/gst1-libav/gst1-libav.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.18.5.tar.xz.sha256sum -sha256 822e008a910e9dd13aedbdd8dc63fedef4040c0ee2e927bab3112e9de693a548 gst-libav-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.18.6.tar.xz.sha256sum +sha256 e4e50dcd5a29441ae34de60d2221057e8064ed824bb6ca4dc0fd9ee88fbe9b81 gst-libav-1.18.6.tar.xz sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gst1-libav/gst1-libav.mk b/package/gstreamer1/gst1-libav/gst1-libav.mk index 01ec4d2c98..55c6e06e0e 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.mk +++ b/package/gstreamer1/gst1-libav/gst1-libav.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_LIBAV_VERSION = 1.18.5 +GST1_LIBAV_VERSION = 1.18.6 GST1_LIBAV_SOURCE = gst-libav-$(GST1_LIBAV_VERSION).tar.xz GST1_LIBAV_SITE = https://gstreamer.freedesktop.org/src/gst-libav GST1_LIBAV_LICENSE = LGPL-2.0+ From peter at korsgaard.com Sat Feb 5 14:55:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 15:55:09 +0100 Subject: [Buildroot] [git commit] package/gst1-vaapi: bump version to 1.18.6 Message-ID: <20220205144955.9A0F68295E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=aef9027773543fede0cbfa3405f5919e38671dbf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-vaapi/gst1-vaapi.hash | 4 ++-- package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash index b0c19fc600..7e22774c11 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.18.5.tar.xz.sha256sum -sha256 4a460fb95559f41444eb24864ad2d9e37922b6eea941510310319fc3e0ba727b gstreamer-vaapi-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.18.6.tar.xz.sha256sum +sha256 ab6270f1e5e4546fbe6f5ea246d86ca3d196282eb863d46e6cdcc96f867449e0 gstreamer-vaapi-1.18.6.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk index 9810b12cf7..6af851602f 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_VAAPI_VERSION = 1.18.5 +GST1_VAAPI_VERSION = 1.18.6 GST1_VAAPI_SITE = https://gstreamer.freedesktop.org/src/gstreamer-vaapi GST1_VAAPI_SOURCE = gstreamer-vaapi-$(GST1_VAAPI_VERSION).tar.xz GST1_VAAPI_LICENSE = LGPL-2.1+ From peter at korsgaard.com Sat Feb 5 14:55:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 15:55:27 +0100 Subject: [Buildroot] [git commit] package/gstreamer1-editing-services: bump version to 1.18.6 Message-ID: <20220205144955.AA22482901@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=aa87c2e1689b920052ee4a802e24ca342d8f9651 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- .../gstreamer1-editing-services/gstreamer1-editing-services.hash | 4 ++-- .../gstreamer1-editing-services/gstreamer1-editing-services.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash index daaf729c70..e29dc112ce 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash @@ -1,5 +1,5 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.18.5.tar.xz.sha256sum -sha256 8af4a8394d051f3e18280686db49a6efaccc95c0c59a17f0f564e32000590df5 gst-editing-services-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.18.6.tar.xz.sha256sum +sha256 fe10d14ef896aa21038317f6f81e1158ccc6caaed9b0d5a29ae5bdd63074582c gst-editing-services-1.18.6.tar.xz # Hashes for license files: sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk index d3de79c5f6..a3722cbbca 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_EDITING_SERVICES_VERSION = 1.18.5 +GSTREAMER1_EDITING_SERVICES_VERSION = 1.18.6 GSTREAMER1_EDITING_SERVICES_SOURCE = gst-editing-services-$(GSTREAMER1_EDITING_SERVICES_VERSION).tar.xz GSTREAMER1_EDITING_SERVICES_SITE = https://gstreamer.freedesktop.org/src/gstreamer-editing-services GSTREAMER1_EDITING_SERVICES_LICENSE = LGPL-2.0+ From peter at korsgaard.com Sat Feb 5 14:55:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 15:55:19 +0100 Subject: [Buildroot] [git commit] package/gst1-rtsp-server: bump version to 1.18.6 Message-ID: <20220205144955.A1CF582967@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=56c0d7b8867228bb44e76f4bf296e27202d10f13 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash | 4 ++-- package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash index 627a451d04..fadef41351 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash @@ -1,4 +1,4 @@ -# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.18.5.tar.xz.sha256sum -sha256 04d63bf48816c6f41c73f6de0f912a7cef0aab39c44162a7bcece1923dfc9d1f gst-rtsp-server-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.18.6.tar.xz.sha256sum +sha256 826f32afbcf94b823541efcac4a0dacdb62f6145ef58f363095749f440262be9 gst-rtsp-server-1.18.6.tar.xz sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING.LIB diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk index 37942423a5..55403754f3 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_RTSP_SERVER_VERSION = 1.18.5 +GST1_RTSP_SERVER_VERSION = 1.18.6 GST1_RTSP_SERVER_SOURCE = gst-rtsp-server-$(GST1_RTSP_SERVER_VERSION).tar.xz GST1_RTSP_SERVER_SITE = http://gstreamer.freedesktop.org/src/gst-rtsp-server GST1_RTSP_SERVER_LICENSE = LGPL-2.0+ From peter at korsgaard.com Sat Feb 5 14:55:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 15:55:44 +0100 Subject: [Buildroot] [git commit] package/gst1-python: bump version to 1.18.6 Message-ID: <20220205144955.B9B6E82967@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dc66c5901cbc912941f26275aac0f4b3fe6cf596 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-python/gst1-python.hash | 4 ++-- package/gstreamer1/gst1-python/gst1-python.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-python/gst1-python.hash b/package/gstreamer1/gst1-python/gst1-python.hash index 2035c81fea..a760e53e7d 100644 --- a/package/gstreamer1/gst1-python/gst1-python.hash +++ b/package/gstreamer1/gst1-python/gst1-python.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.18.5.tar.xz.sha256sum -sha256 533685871305959d6db89507f3b3aa6c765c2f2b0dacdc32c5a6543e72e5bc52 gst-python-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.18.6.tar.xz.sha256sum +sha256 bdc0ea22fbd7335ad9decc151561aacc53c51206a9735b81eac700ce5b0bbd4a gst-python-1.18.6.tar.xz sha256 ea3ad127610e5ded2210b3a86a46314f2b3b28e438eccffdae19a4d6fbcdb0c2 COPYING diff --git a/package/gstreamer1/gst1-python/gst1-python.mk b/package/gstreamer1/gst1-python/gst1-python.mk index 614cb22396..7faab752cd 100644 --- a/package/gstreamer1/gst1-python/gst1-python.mk +++ b/package/gstreamer1/gst1-python/gst1-python.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PYTHON_VERSION = 1.18.5 +GST1_PYTHON_VERSION = 1.18.6 GST1_PYTHON_SOURCE = gst-python-$(GST1_PYTHON_VERSION).tar.xz GST1_PYTHON_SITE = https://gstreamer.freedesktop.org/src/gst-python GST1_PYTHON_INSTALL_STAGING = YES From peter at korsgaard.com Sat Feb 5 14:54:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 15:54:05 +0100 Subject: [Buildroot] [git commit] package/gst1-plugins-bad: bump version to 1.18.6 Message-ID: <20220205144955.76ACC82901@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ed2f427fd240f539e833919c6ef832c58eb86959 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash | 4 ++-- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash index cbb2729dab..d31a78981e 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.5.tar.xz.sha256sum -sha256 a164923b94f0d08578a6fcaeaac6e0c05da788a46903a1086870e9ca45ad678e gst-plugins-bad-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.6.tar.xz.sha256sum +sha256 0b1b50ac6311f0c510248b6cd64d6d3c94369344828baa602db85ded5bc70ec9 gst-plugins-bad-1.18.6.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index ac00fd59e1..d02ca1ba74 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BAD_VERSION = 1.18.5 +GST1_PLUGINS_BAD_VERSION = 1.18.6 GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz GST1_PLUGINS_BAD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-bad GST1_PLUGINS_BAD_INSTALL_STAGING = YES From fontaine.fabrice at gmail.com Sat Feb 5 14:57:16 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 5 Feb 2022 15:57:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/vim: security bump to version 8.2.4301 Message-ID: <20220205145716.459582-1-fontaine.fabrice@gmail.com> Fix CVE-2022-0393: Out-of-bounds Read in GitHub repository vim/vim prior to 8.2. 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 49056b31cd..36a5842157 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 8770c6308a6c0b0f8b93a4d7202451d195b4efad17787c0306f0be60947732c4 vim-8.2.4224.tar.gz +sha256 8770c6308a6c0b0f8b93a4d7202451d195b4efad17787c0306f0be60947732c4 vim-8.2.4301.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index 74ab1ec584..98a5f153a8 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 8.2.4224 +VIM_VERSION = 8.2.4301 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 Sat Feb 5 14:59:30 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 5 Feb 2022 15:59:30 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/vim: security bump to version 8.2.4301 Message-ID: <20220205145930.460304-1-fontaine.fabrice@gmail.com> Fix CVE-2022-0393: Out-of-bounds Read in GitHub repository vim/vim prior to 8.2. Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2: - Fix tarball hash 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 49056b31cd..fa3ca53cc8 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 8770c6308a6c0b0f8b93a4d7202451d195b4efad17787c0306f0be60947732c4 vim-8.2.4224.tar.gz +sha256 b40b4e341de6b65cdeacd4c816dea8fe5e3b385ee5e17af73fc69c00bd7c440b vim-8.2.4301.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index 74ab1ec584..98a5f153a8 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 8.2.4224 +VIM_VERSION = 8.2.4301 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 Sat Feb 5 15:09:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 16:09:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/bullet: bump to version 3.21 In-Reply-To: <20220126211220.1550407-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 26 Jan 2022 22:12:20 +0100") References: <20220126211220.1550407-1-fontaine.fabrice@gmail.com> Message-ID: <87sfsxtkng.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - Drop patch (already in version) > - Update indentation in hash file (two spaces) > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 15:11:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 16:11:53 +0100 Subject: [Buildroot] [PATCH 1/1] package/meson: bump to version 0.61.1 In-Reply-To: <20220127162100.2629696-1-james.hilliard1@gmail.com> (James Hilliard's message of "Thu, 27 Jan 2022 09:21:00 -0700") References: <20220127162100.2629696-1-james.hilliard1@gmail.com> Message-ID: <87o83ltkjq.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Drop patch that is now upstream. > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 15:13:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 16:13:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/libgeos: bump version to 3.10.2 In-Reply-To: <20220128050013.277864-1-fido_max@inbox.ru> (Maxim Kochetkov's message of "Fri, 28 Jan 2022 08:00:13 +0300") References: <20220128050013.277864-1-fido_max@inbox.ru> Message-ID: <87k0e9tkgu.fsf@dell.be.48ers.dk> >>>>> "Maxim" == Maxim Kochetkov writes: > Changelog: https://github.com/libgeos/geos/blob/3.10.2/NEWS > Signed-off-by: Maxim Kochetkov Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 15:13:52 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 16:13:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/libosmium: bump version to 2.17.3 In-Reply-To: <20220128051332.459202-1-fido_max@inbox.ru> (Maxim Kochetkov's message of "Fri, 28 Jan 2022 08:13:32 +0300") References: <20220128051332.459202-1-fido_max@inbox.ru> Message-ID: <87fsoxtkgf.fsf@dell.be.48ers.dk> >>>>> "Maxim" == Maxim Kochetkov writes: > Release-notes: https://github.com/osmcode/libosmium/releases/tag/v2.17.3 > Signed-off-by: Maxim Kochetkov Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 15:14:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 16:14:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/osm2pgsql: bump version 1.5.2 In-Reply-To: <20220128055910.798614-1-fido_max@inbox.ru> (Maxim Kochetkov via buildroot's message of "Fri, 28 Jan 2022 08:59:10 +0300") References: <20220128055910.798614-1-fido_max@inbox.ru> Message-ID: <87bkzltkfy.fsf@dell.be.48ers.dk> >>>>> "Maxim" == Maxim Kochetkov via buildroot writes: > Release-notes: https://github.com/openstreetmap/osm2pgsql/releases/tag/1.5.2 > Signed-off-by: Maxim Kochetkov Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 15:14:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 16:14:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/keepalived: bump to version 2.2.7 In-Reply-To: <20220128212005.2899314-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 28 Jan 2022 22:20:05 +0100") References: <20220128212005.2899314-1-fontaine.fabrice@gmail.com> Message-ID: <877da9tkf4.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > 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 Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 15:13:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 16:13:34 +0100 Subject: [Buildroot] [git commit] package/libgeos: bump version to 3.10.2 Message-ID: <20220205151113.AC55382981@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=df013c4de64815c283fefadcee05cf63bc339182 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog: https://github.com/libgeos/geos/blob/3.10.2/NEWS Signed-off-by: Maxim Kochetkov Signed-off-by: Peter Korsgaard --- 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 From peter at korsgaard.com Sat Feb 5 15:09:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 16:09:08 +0100 Subject: [Buildroot] [git commit] package/bullet: bump to version 3.21 Message-ID: <20220205151113.994B68295E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7ddbcb76aaa4e88dfe7aef5072aafd95107b7161 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Drop patch (already in version) - Update indentation in hash file (two spaces) Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...ras-VHACD-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(-) 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 From peter at korsgaard.com Sat Feb 5 15:14:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 16:14:03 +0100 Subject: [Buildroot] [git commit] package/osm2pgsql: bump version 1.5.2 Message-ID: <20220205151113.BE38782967@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=714498eb296ff3615c7a1ce92d999d27da97bfb2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release-notes: https://github.com/openstreetmap/osm2pgsql/releases/tag/1.5.2 Signed-off-by: Maxim Kochetkov Signed-off-by: Peter Korsgaard --- 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 From peter at korsgaard.com Sat Feb 5 15:11:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 16:11:42 +0100 Subject: [Buildroot] [git commit] package/meson: bump to version 0.61.1 Message-ID: <20220205151113.A3B4882967@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c2151a3f222854a711f40dc074be2bc9a63630a1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patch that is now upstream. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- ...me-fix-typo-in-vapigen-option-metadatadir.patch | 33 ---------------------- package/meson/meson.hash | 4 +-- package/meson/meson.mk | 2 +- 3 files changed, 3 insertions(+), 36 deletions(-) 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 6c0d1ab08e..ad15e3f91e 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 From peter at korsgaard.com Sat Feb 5 15:13:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 16:13:49 +0100 Subject: [Buildroot] [git commit] package/libosmium: bump version to 2.17.3 Message-ID: <20220205151113.B62428295E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=119f2213068be11905fd769f2caa83212511cc8f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release-notes: https://github.com/osmcode/libosmium/releases/tag/v2.17.3 Signed-off-by: Maxim Kochetkov Signed-off-by: Peter Korsgaard --- 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 From peter at korsgaard.com Sat Feb 5 15:14:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 16:14:35 +0100 Subject: [Buildroot] [git commit] package/keepalived: bump to version 2.2.7 Message-ID: <20220205151113.C6CEC82981@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=79f631000fe6846e72f44810452bb764c228ad44 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Signed-off-by: Peter Korsgaard --- .../0001-core-Fix-compiling-on-RHEL-9.patch | 34 ------------------ ...02-dbus-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(-) 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 From peter at korsgaard.com Sat Feb 5 15:29:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 16:29:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/openlayers: bump to version 6.12.0 In-Reply-To: <20220131094156.166729-1-thomas.claveirole@green-communications.fr> (Thomas Claveirole's message of "Mon, 31 Jan 2022 10:41:56 +0100") References: <20220131094156.166729-1-thomas.claveirole@green-communications.fr> Message-ID: <8735kxtjqr.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Claveirole writes: > Signed-off-by: Thomas Claveirole Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 15:31:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 16:31:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/libgpg-error: add or1k support In-Reply-To: <20220201220626.350423-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 1 Feb 2022 23:06:26 +0100") References: <20220201220626.350423-1-fontaine.fabrice@gmail.com> Message-ID: <87y22ps535.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > or1k is supported since version 1.18 and > https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=commit;h=c143fa81462584ad39ea780908266bce3fb9a49e > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 15:31:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 16:31:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/safeclib: bump to version 3.7.1 In-Reply-To: <20220201222745.411463-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 1 Feb 2022 23:27:45 +0100") References: <20220201222745.411463-1-fontaine.fabrice@gmail.com> Message-ID: <87tudds52j.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Drop patch (already in version) and so autoreconf > https://github.com/rurban/safeclib/blob/v3.7.1/ChangeLog > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 15:32:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 16:32:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/lcms2: bump to version 2.13 In-Reply-To: <20220201223349.424073-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 1 Feb 2022 23:33:49 +0100") References: <20220201223349.424073-1-fontaine.fabrice@gmail.com> Message-ID: <87pmo1s51k.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://littlecms.com/blog/2022/01/28/lcms2-2.13 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 15:28:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 16:28:44 +0100 Subject: [Buildroot] [git commit] package/openlayers: bump to version 6.12.0 Message-ID: <20220205152506.E61C28295E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a9c94d126f5579a68f85584a6ebe1dd20130b39f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Thomas Claveirole Signed-off-by: Peter Korsgaard --- 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 b72d5fcde8..2d6c2fb9d3 100644 --- a/package/openlayers/openlayers.hash +++ b/package/openlayers/openlayers.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 8c4751915808a5a84adcd760fff453429a95993cadf77003ac94eae127240c1a v6.11.0-dist.zip +sha256 aeb8107a23a99d79efb6031c7cf901307b63571c39fd744f771d4a707e06a14f v6.12.0-dist.zip diff --git a/package/openlayers/openlayers.mk b/package/openlayers/openlayers.mk index 1f8b485018..7532bb7f68 100644 --- a/package/openlayers/openlayers.mk +++ b/package/openlayers/openlayers.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENLAYERS_VERSION = 6.11.0 +OPENLAYERS_VERSION = 6.12.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 peter at korsgaard.com Sat Feb 5 15:30:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 16:30:02 +0100 Subject: [Buildroot] [git commit] package/libgpg-error: add or1k support Message-ID: <20220205152506.EECE182967@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d0e519ad3d459e8e38c77216b3d30a4ec383a991 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master or1k is supported since version 1.18 and https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=commit;h=c143fa81462584ad39ea780908266bce3fb9a49e Signed-off-by: Fabrice Fontaine Reviewed-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- package/libgpg-error/Config.in | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/package/libgpg-error/Config.in b/package/libgpg-error/Config.in index 44e9d67aaf..03157dd9fe 100644 --- a/package/libgpg-error/Config.in +++ b/package/libgpg-error/Config.in @@ -2,14 +2,19 @@ config BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS bool # see src/syscfg/ default y if \ - BR2_aarch64 || BR2_aarch64_eb || BR2_arm || \ - BR2_armeb || BR2_i386 || BR2_mips || \ - BR2_mipsel || BR2_mips64 || BR2_mips64el || \ - BR2_m68k || BR2_nios2 || BR2_powerpc || \ - BR2_powerpc64 || BR2_powerpc64le || BR2_RISCV_64 || \ - BR2_RISCV_32 || BR2_s390x || BR2_sh4 || \ - BR2_sh4eb || BR2_sh4a || BR2_sh4aeb || \ - BR2_sparc || BR2_sparc64 || BR2_x86_64 + BR2_aarch64 || BR2_aarch64_eb || \ + BR2_arm || BR2_armeb || \ + BR2_i386 || BR2_mips || \ + BR2_mipsel || BR2_mips64 || \ + BR2_mips64el || BR2_m68k || \ + BR2_nios2 || BR2_or1k || \ + BR2_powerpc || BR2_powerpc64 || \ + BR2_powerpc64le || BR2_RISCV_64 || \ + BR2_RISCV_32 || BR2_s390x || \ + BR2_sh4 || BR2_sh4eb || \ + BR2_sh4a || BR2_sh4aeb || \ + BR2_sparc || BR2_sparc64 || \ + BR2_x86_64 config BR2_PACKAGE_LIBGPG_ERROR bool "libgpg-error" @@ -36,6 +41,8 @@ config BR2_PACKAGE_LIBGPG_ERROR_SYSCFG if BR2_m68k default "nios2-unknown-linux-gnu" \ if BR2_nios2 + default "or1k-unknown-linux-gnu" \ + if BR2_or1k default "powerpc-unknown-linux-gnu" \ if BR2_powerpc default "powerpc64-unknown-linux-gnu" \ From peter at korsgaard.com Sat Feb 5 15:31:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 16:31:51 +0100 Subject: [Buildroot] [git commit] package/lcms2: bump to version 2.13 Message-ID: <20220205152507.0DCD48295E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1e48e5bf0c67295e219a2d7d58213d0a71a5863d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://littlecms.com/blog/2022/01/28/lcms2-2.13 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/lcms2/lcms2.hash | 6 +++--- package/lcms2/lcms2.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/lcms2/lcms2.hash b/package/lcms2/lcms2.hash index 8477610ff0..d3ae1d934f 100644 --- a/package/lcms2/lcms2.hash +++ b/package/lcms2/lcms2.hash @@ -1,5 +1,5 @@ -# From https://sourceforge.net/projects/lcms/files/lcms/2.12 -sha1 3d0c0276fcd3930b80c424512ec0b1ed54ec1497 lcms2-2.12.tar.gz +# From https://sourceforge.net/projects/lcms/files/lcms/2.13 +sha1 1676097fb18fce83c9c876d56828c83a6ad829dd lcms2-2.13.tar.gz # Locally computed: -sha256 18663985e864100455ac3e507625c438c3710354d85e5cbb7cd4043e11fe10f5 lcms2-2.12.tar.gz +sha256 0c67a5cc144029cfa34647a52809ec399aae488db4258a6a66fba318474a070f lcms2-2.13.tar.gz sha256 46d4e05af3bce75332a12d01f19bcce7e32b6bac544be28a64043d0231291e31 COPYING diff --git a/package/lcms2/lcms2.mk b/package/lcms2/lcms2.mk index 49ddccd82b..5a253d044b 100644 --- a/package/lcms2/lcms2.mk +++ b/package/lcms2/lcms2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LCMS2_VERSION = 2.12 +LCMS2_VERSION = 2.13 LCMS2_SITE = http://downloads.sourceforge.net/project/lcms/lcms/$(LCMS2_VERSION) LCMS2_LICENSE = MIT LCMS2_LICENSE_FILES = COPYING From peter at korsgaard.com Sat Feb 5 15:31:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 16:31:20 +0100 Subject: [Buildroot] [git commit] package/safeclib: bump to version 3.7.1 Message-ID: <20220205152507.041DC82981@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cc27267ae41bf44276c63b1e86042c4fae4adf50 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patch (already in version) and so autoreconf https://github.com/rurban/safeclib/blob/v3.7.1/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...configure.ac-add-disable-hardening-option.patch | 63 ---------------------- package/safeclib/safeclib.hash | 4 +- package/safeclib/safeclib.mk | 6 +-- 3 files changed, 4 insertions(+), 69 deletions(-) diff --git a/package/safeclib/0001-configure.ac-add-disable-hardening-option.patch b/package/safeclib/0001-configure.ac-add-disable-hardening-option.patch deleted file mode 100644 index e851fce993..0000000000 --- a/package/safeclib/0001-configure.ac-add-disable-hardening-option.patch +++ /dev/null @@ -1,63 +0,0 @@ -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.hash b/package/safeclib/safeclib.hash index af732f93fd..bca5d86261 100644 --- a/package/safeclib/safeclib.hash +++ b/package/safeclib/safeclib.hash @@ -1,5 +1,5 @@ -# From https://github.com/rurban/safeclib/releases/tag/v02092020 -sha256 d374bdcbfcdc4c9a76abed3707667372ca212fd87a369e7bcaaa54e716d27c0a libsafec-02092020.tar.xz +# From https://github.com/rurban/safeclib/releases/tag/v3.7.1 +sha256 71d3ec970f930bd980f2a41127228eeedfc53749e4c6b203329adc4ff7df32a7 safeclib-3.7.1.tar.xz # Hash for license file sha256 c33e77efd5781e3d59a2bb648c82d2a615035ef0d24cf58880380e3af906510b COPYING diff --git a/package/safeclib/safeclib.mk b/package/safeclib/safeclib.mk index 29ffea7f2e..91b3e26c68 100644 --- a/package/safeclib/safeclib.mk +++ b/package/safeclib/safeclib.mk @@ -4,15 +4,13 @@ # ################################################################################ -SAFECLIB_VERSION = 02092020 +SAFECLIB_VERSION = 3.7.1 SAFECLIB_SITE = \ https://github.com/rurban/safeclib/releases/download/v$(SAFECLIB_VERSION) -SAFECLIB_SOURCE = libsafec-$(SAFECLIB_VERSION).tar.xz +SAFECLIB_SOURCE = safeclib-$(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 From peter at korsgaard.com Sat Feb 5 15:33:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 16:33:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/domoticz: bump to version 2022.01 In-Reply-To: <20220202075228.1187021-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 2 Feb 2022 08:52:28 +0100") References: <20220202075228.1187021-1-fontaine.fabrice@gmail.com> Message-ID: <87leyps500.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://github.com/domoticz/domoticz/blob/2022.1/History.txt > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 15:32:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 16:32:56 +0100 Subject: [Buildroot] [git commit] package/domoticz: bump to version 2022.01 Message-ID: <20220205152654.4BBF78295E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=adca60540f4fd271dda48b9a121986492700e73a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/domoticz/domoticz/blob/2022.1/History.txt Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/domoticz/domoticz.hash | 2 +- package/domoticz/domoticz.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/domoticz/domoticz.hash b/package/domoticz/domoticz.hash index dcd5bead1e..18bf57b7e0 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 b7faf959c4f1dbfec3b0c17ab495f29b3d1437bc2251579c5252be82247e7ff9 domoticz-2022.1-br1.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 License.txt diff --git a/package/domoticz/domoticz.mk b/package/domoticz/domoticz.mk index f142791830..5edc10e8d8 100644 --- a/package/domoticz/domoticz.mk +++ b/package/domoticz/domoticz.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOMOTICZ_VERSION = 2021.1 +DOMOTICZ_VERSION = 2022.1 DOMOTICZ_SITE = https://github.com/domoticz/domoticz DOMOTICZ_SITE_METHOD = git DOMOTICZ_GIT_SUBMODULES = YES From giulio.benetti at benettiengineering.com Sat Feb 5 15:36:29 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 5 Feb 2022 16:36:29 +0100 Subject: [Buildroot] [PATCH] board/pc: fix build failure due to new genimage 15 In-Reply-To: <98670320-83fa-c6e9-9bc4-aa30d9deb6ff@mind.be> References: <98670320-83fa-c6e9-9bc4-aa30d9deb6ff@mind.be> Message-ID: <34C01EB2-BB12-4DE4-BC53-0141B5DF491D@benettiengineering.com> Hi Arnout, > Il giorno 5 feb 2022, alle ore 15:11, Arnout Vandecappelle ha scritto: > > ? Hi Giulio, > >> On 04/02/2022 01:56, Giulio Benetti wrote: >> Actually genimage fails to create final image with: >> ``` >> ERROR: hdimage(disk.img): partition [MBR] (offset 0x1b8, size 0x48) overlaps previous partition boot (offset 0x0, size 0x200) >> ERROR: hdimage(disk.img): bootloaders, etc. that overlap with the partition table must declare the overlapping area as a hole. >> ``` >> This is because genimage 15 is less permissive than before, so let's add >> holes = {"(440; 512)"} to leave room to MBR. >> Fixes: >> https://gitlab.com/buildroot.org/buildroot/-/jobs/1865935249 >> Signed-off-by: Giulio Benetti >> --- >> board/pc/genimage-bios.cfg | 1 + >> 1 file changed, 1 insertion(+) >> diff --git a/board/pc/genimage-bios.cfg b/board/pc/genimage-bios.cfg >> index 26d12d9ab3..54026f6527 100644 >> --- a/board/pc/genimage-bios.cfg >> +++ b/board/pc/genimage-bios.cfg >> @@ -7,6 +7,7 @@ image disk.img { >> image = "boot.img" >> offset = 0 >> size = 512 >> + holes = {"(440; 512)"} > > Have you tested this change on an actual board (i.e. a PC :-)? I?ve tested it with qemu and it boots the kernel correctly(that is in rootfs), only thing is that it can?t mount the rootfs and I don?t understand why. I wanted to ask about this but I?ve got lost among all the other patches :-) Could someone double check if it mounts? Best regards Giulio > > Regards, > Arnout > >> } >> partition grub { > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From peter.macleod.thompson at gmail.com Sat Feb 5 16:05:11 2022 From: peter.macleod.thompson at gmail.com (Peter Thompson) Date: Sat, 5 Feb 2022 09:05:11 -0700 Subject: [Buildroot] [PATCH 1/1] bump version to 2.0.18 Message-ID: <20220205160511.4602-1-peter.macleod.thompson@gmail.com> From: PeterThompson Signed-off-by: PeterThompson --- package/sdl2_ttf/sdl2_ttf.hash | 4 ++-- package/sdl2_ttf/sdl2_ttf.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sdl2_ttf/sdl2_ttf.hash b/package/sdl2_ttf/sdl2_ttf.hash index 16459e4a59..a490b002b6 100644 --- a/package/sdl2_ttf/sdl2_ttf.hash +++ b/package/sdl2_ttf/sdl2_ttf.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a9eceb1ad88c1f1545cd7bd28e7cbc0b2c14191d40238f531a15b01b1b22cd33 SDL2_ttf-2.0.15.tar.gz -sha256 f6370809c9f644760920d9945c5be07aed17664975f2e4741013d4d9a2ec696f COPYING.txt +sha256 7234eb8883514e019e7747c703e4a774575b18d435c22a4a29d068cb768a2251 SDL2_ttf-2.0.18.tar.gz +sha256 e211dfe7e2c36e64048be886fe3f2bbba8732ce4dd77b596a355d3abbec775a4 COPYING.txt diff --git a/package/sdl2_ttf/sdl2_ttf.mk b/package/sdl2_ttf/sdl2_ttf.mk index 326cb99366..1fe7c0a075 100644 --- a/package/sdl2_ttf/sdl2_ttf.mk +++ b/package/sdl2_ttf/sdl2_ttf.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_TTF_VERSION = 2.0.15 +SDL2_TTF_VERSION = 2.0.18 SDL2_TTF_SOURCE = SDL2_ttf-$(SDL2_TTF_VERSION).tar.gz SDL2_TTF_SITE = http://www.libsdl.org/projects/SDL_ttf/release SDL2_TTF_LICENSE = Zlib -- 2.20.1 From yegorslists at googlemail.com Sat Feb 5 16:48:26 2022 From: yegorslists at googlemail.com (Yegor Yefremov) Date: Sat, 5 Feb 2022 17:48:26 +0100 Subject: [Buildroot] [PATCH 1/1] bump version to 2.0.18 In-Reply-To: <20220205160511.4602-1-peter.macleod.thompson@gmail.com> References: <20220205160511.4602-1-peter.macleod.thompson@gmail.com> Message-ID: Hi Peter, On Sat, Feb 5, 2022 at 5:05 PM Peter Thompson wrote: > > From: PeterThompson > > Signed-off-by: PeterThompson > --- > package/sdl2_ttf/sdl2_ttf.hash | 4 ++-- > package/sdl2_ttf/sdl2_ttf.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/sdl2_ttf/sdl2_ttf.hash b/package/sdl2_ttf/sdl2_ttf.hash > index 16459e4a59..a490b002b6 100644 > --- a/package/sdl2_ttf/sdl2_ttf.hash > +++ b/package/sdl2_ttf/sdl2_ttf.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 a9eceb1ad88c1f1545cd7bd28e7cbc0b2c14191d40238f531a15b01b1b22cd33 SDL2_ttf-2.0.15.tar.gz > -sha256 f6370809c9f644760920d9945c5be07aed17664975f2e4741013d4d9a2ec696f COPYING.txt > +sha256 7234eb8883514e019e7747c703e4a774575b18d435c22a4a29d068cb768a2251 SDL2_ttf-2.0.18.tar.gz > +sha256 e211dfe7e2c36e64048be886fe3f2bbba8732ce4dd77b596a355d3abbec775a4 COPYING.txt > diff --git a/package/sdl2_ttf/sdl2_ttf.mk b/package/sdl2_ttf/sdl2_ttf.mk > index 326cb99366..1fe7c0a075 100644 > --- a/package/sdl2_ttf/sdl2_ttf.mk > +++ b/package/sdl2_ttf/sdl2_ttf.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -SDL2_TTF_VERSION = 2.0.15 > +SDL2_TTF_VERSION = 2.0.18 > SDL2_TTF_SOURCE = SDL2_ttf-$(SDL2_TTF_VERSION).tar.gz > SDL2_TTF_SITE = http://www.libsdl.org/projects/SDL_ttf/release > SDL2_TTF_LICENSE = Zlib Package name is missing from the patch subject. Regards, Yegor From peter at korsgaard.com Sat Feb 5 17:21:25 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 18:21:25 +0100 Subject: [Buildroot] [PATCH] pacakge/glib-networking: bump to version 2.70.0 In-Reply-To: <20220202112528.7778-1-thomas.devoogdt@barco.com> (Thomas Devoogdt's message of "Wed, 2 Feb 2022 12:25:28 +0100") References: <20220202112528.7778-1-thomas.devoogdt@barco.com> Message-ID: <87h79drzze.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Devoogdt writes: > From: Thomas Devoogdt > PKCS#11 is required if gnutls is used: > https://gitlab.gnome.org/GNOME/glib-networking/-/commit/9b3d30e40f306f0e36e2a396d3b6df1edeea9f21 > Older compilers require c_std=gnu99: > https://gitlab.gnome.org/GNOME/glib-networking/-/commit/b192086b9936602a40a14d00a6883b339b9d7955 > Signed-off-by: Thomas Devoogdt Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 17:21:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 18:21:35 +0100 Subject: [Buildroot] [git commit] package/glib-networking: bump to version 2.70.0 Message-ID: <20220205171500.6E78782211@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=53fa10f4c91598d49c37b30ddce84daaf7d50216 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master PKCS#11 is required if gnutls is used: https://gitlab.gnome.org/GNOME/glib-networking/-/commit/9b3d30e40f306f0e36e2a396d3b6df1edeea9f21 Add an upstream patch to fix compilation with older compilers: https://gitlab.gnome.org/GNOME/glib-networking/-/commit/b192086b9936602a40a14d00a6883b339b9d7955 Signed-off-by: Thomas Devoogdt Reviewed-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard --- .../0001-meson-change-std-to-gnu99.patch | 30 ++++++++++++++++++++++ package/glib-networking/Config.in | 1 + package/glib-networking/glib-networking.hash | 4 +-- package/glib-networking/glib-networking.mk | 2 +- 4 files changed, 34 insertions(+), 3 deletions(-) diff --git a/package/glib-networking/0001-meson-change-std-to-gnu99.patch b/package/glib-networking/0001-meson-change-std-to-gnu99.patch new file mode 100644 index 0000000000..9f266bc2c8 --- /dev/null +++ b/package/glib-networking/0001-meson-change-std-to-gnu99.patch @@ -0,0 +1,30 @@ +From cdfa726bae1d82b7bd3735475fc2b2c6a31c1d2f Mon Sep 17 00:00:00 2001 +From: Ignacio Casal Quinteiro +Date: Fri, 12 Nov 2021 11:51:33 +0100 +Subject: [PATCH] meson: change std to gnu99 + +This is the same as glib and should fix issues with old +compilers + +(cherry picked from commit b192086b9936602a40a14d00a6883b339b9d7955) +Signed-off-by: Thomas Devoogdt +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index b018ca7b..130a2bf0 100644 +--- a/meson.build ++++ b/meson.build +@@ -3,7 +3,7 @@ project( + version: '2.70.0', + license: 'LGPL2.1+', + meson_version: '>= 0.50.0', +- default_options: ['c_std=c99'] ++ default_options: ['c_std=gnu99'] + ) + + prefix = get_option('prefix') +-- +2.17.1 + diff --git a/package/glib-networking/Config.in b/package/glib-networking/Config.in index 22331255f7..38cded5e6b 100644 --- a/package/glib-networking/Config.in +++ b/package/glib-networking/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_GLIB_NETWORKING depends on !BR2_STATIC_LIBS select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_GNUTLS + select BR2_PACKAGE_P11_KIT if BR2_PACKAGE_GNUTLS help Network-related GIO modules for glib. diff --git a/package/glib-networking/glib-networking.hash b/package/glib-networking/glib-networking.hash index 976a19f25e..6a53b436b0 100644 --- a/package/glib-networking/glib-networking.hash +++ b/package/glib-networking/glib-networking.hash @@ -1,3 +1,3 @@ -# From http://ftp.gnome.org/pub/gnome/sources/glib-networking/2.66/glib-networking-2.66.0.sha256sum -sha256 c5d7be2437fdd196eebfb70c4517b96d3ba7ec13bd496318b8f02dea383e0099 glib-networking-2.66.0.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/glib-networking/2.70/glib-networking-2.70.0.sha256sum +sha256 66b408e7afa86c582fe38963db56133869ab4b57d34e48ec56aba621940d6f35 glib-networking-2.70.0.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/glib-networking/glib-networking.mk b/package/glib-networking/glib-networking.mk index 65630c7fed..53280700bc 100644 --- a/package/glib-networking/glib-networking.mk +++ b/package/glib-networking/glib-networking.mk @@ -4,7 +4,7 @@ # ################################################################################ -GLIB_NETWORKING_VERSION_MAJOR = 2.66 +GLIB_NETWORKING_VERSION_MAJOR = 2.70 GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_VERSION_MAJOR).0 GLIB_NETWORKING_SITE = http://ftp.gnome.org/pub/gnome/sources/glib-networking/$(GLIB_NETWORKING_VERSION_MAJOR) GLIB_NETWORKING_SOURCE = glib-networking-$(GLIB_NETWORKING_VERSION).tar.xz From peter at korsgaard.com Sat Feb 5 17:24:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 18:24:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/libgeotiff: bump to version 1.7.0 In-Reply-To: <20220205141132.419654-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 5 Feb 2022 15:11:32 +0100") References: <20220205141132.419654-1-fontaine.fabrice@gmail.com> Message-ID: <87czk1rzux.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://github.com/OSGeo/libgeotiff/releases/tag/1.7.0 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 17:24:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 18:24:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/tiff: fix CVE-2022-22844 In-Reply-To: <20220205141448.420553-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 5 Feb 2022 15:14:48 +0100") References: <20220205141448.420553-1-fontaine.fabrice@gmail.com> Message-ID: <878ruprzu8.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > LibTIFF 4.3.0 has an out-of-bounds read in _TIFFmemcpy in tif_unix.c in > certain situations involving a custom tag and 0x0200 as the second word > of the DE field. > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From giulio.benetti at benettiengineering.com Sat Feb 5 17:26:21 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 5 Feb 2022 18:26:21 +0100 Subject: [Buildroot] [PATCH] configs/orangepi_zero_defconfig: switch to extlinux In-Reply-To: <20220205072801.13567-1-kuzminov.sergey81@gmail.com> References: <20220205072801.13567-1-kuzminov.sergey81@gmail.com> Message-ID: <6e5f8adf-30a2-797e-f01b-4536ebc916ab@benettiengineering.com> Hi Sergey, On 05/02/22 08:28, Sergey Kuzminov wrote: > Changes: > - Exclude FAT partition, he is no longer needed for U-Boot. typo s/he/it > - Switch the rootfs partition from MBR to GPT for partition-uuid to work. > - Switch to extlinux, this is convenient for debugging. > - Create common scenarios for multiple boards to create an SD image: board/orangepi/common. > > Signed-off-by: Sergey Kuzminov > --- > board/orangepi/common/extlinux.conf | 5 ++++ > board/orangepi/common/genimage.cfg | 23 +++++++++++++++ > board/orangepi/common/post-build.sh | 34 +++++++++++++++++++++ > board/orangepi/orangepi-zero/boot.cmd | 9 ------ > board/orangepi/orangepi-zero/genimage.cfg | 36 ----------------------- > configs/orangepi_zero_defconfig | 11 ++++--- > 6 files changed, 67 insertions(+), 51 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 > 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 Here ^^^ you've left a commented line, I guess the correct one is the second one, right? Or anyway you can only keep one. > diff --git a/board/orangepi/common/genimage.cfg b/board/orangepi/common/genimage.cfg > new file mode 100644 > index 0000000000..fa0d988991 > --- /dev/null > +++ b/board/orangepi/common/genimage.cfg > @@ -0,0 +1,23 @@ > +image sdcard.img { > + partition u-boot { > + in-partition-table = false > + image = "u-boot-sunxi-with-spl.bin" > + offset = 8K > + size = 1000K # 1MB - 8KB(offset) - 16KB(GPT) > + } > + > + hdimage { > + partition-table-type = gpt > + gpt-location = 1008K # 1MB - 16KB(GPT) > + gpt-no-backup = true > + # After writing the image to the SD card, > + # backup GPT data structures at the end of the disk: > + # gdisk /dev/mmcblk0 then press the buttons: x, e, w, y > + } > + > + 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/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 5aaa1566c5..96f0c3f600 100644 > --- a/configs/orangepi_zero_defconfig > +++ b/configs/orangepi_zero_defconfig > @@ -20,10 +20,13 @@ 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_NEEDS_HOST_OPENSSL=y > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > > # Filesystem > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="63M" > +BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y It's worth mentioning this change ^^^ in commit log > # BR2_TARGET_ROOTFS_TAR is not set > > # Bootloader > @@ -39,16 +42,12 @@ 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 > > # 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" > > # Wireless driver and firmware > BR2_PACKAGE_XR819_XRADIO=y I've built it successfully locally so: Tested-by: Giulio Benetti and with the corrected commit log you can send V2 with ^^^ and also: Reviewed-by: Giulio Benetti Best regards -- Giulio Benetti Benetti Engineering sas From peter at korsgaard.com Sat Feb 5 17:28:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 18:28:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/cryptopp: needs C++ In-Reply-To: <20220205143043.427517-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 5 Feb 2022 15:30:43 +0100") References: <20220205143043.427517-1-fontaine.fabrice@gmail.com> Message-ID: <874k5drzoc.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure raised since commit > bf4cf9de833e2d571d98d1ca935ea08a3468e463: > no -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O2 -g0 -D_FORTIFY_SOURCE=1 -fPIC -DCRYPTOPP_DISABLE_ARM_NEON -c cryptlib.cpp > make[1]: no: Command not found > Fixes: > - http://autobuild.buildroot.org/results/fa90b416a219a512a482e7dc63e2d72b184307c7 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 17:28:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 18:28:30 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/vim: security bump to version 8.2.4301 In-Reply-To: <20220205145930.460304-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 5 Feb 2022 15:59:30 +0100") References: <20220205145930.460304-1-fontaine.fabrice@gmail.com> Message-ID: <87zgn5ql35.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2022-0393: Out-of-bounds Read in GitHub repository vim/vim prior > to 8.2. > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2: > - Fix tarball hash Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 17:23:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 18:23:22 +0100 Subject: [Buildroot] [git commit] package/libgeotiff: bump to version 1.7.0 Message-ID: <20220205172122.67374827A2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9229054bd54e49d868a5403401d407605297bfb6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/OSGeo/libgeotiff/releases/tag/1.7.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libgeotiff/libgeotiff.hash | 2 +- package/libgeotiff/libgeotiff.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libgeotiff/libgeotiff.hash b/package/libgeotiff/libgeotiff.hash index 51adcc2843..ec9fccb492 100644 --- a/package/libgeotiff/libgeotiff.hash +++ b/package/libgeotiff/libgeotiff.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 9311017e5284cffb86f2c7b7a9df1fb5ebcdc61c30468fb2e6bca36e4272ebca libgeotiff-1.6.0.tar.gz +sha256 fc304d8839ca5947cfbeb63adb9d1aa47acef38fc6d6689e622926e672a99a7e libgeotiff-1.7.0.tar.gz sha256 6a22340b8293c50a34ce8e95589489bd3ec65bcb8b93e61cbda3daaafe498375 LICENSE diff --git a/package/libgeotiff/libgeotiff.mk b/package/libgeotiff/libgeotiff.mk index c6fb61b4a2..c49528565d 100644 --- a/package/libgeotiff/libgeotiff.mk +++ b/package/libgeotiff/libgeotiff.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGEOTIFF_VERSION = 1.6.0 +LIBGEOTIFF_VERSION = 1.7.0 LIBGEOTIFF_SITE = http://download.osgeo.org/geotiff/libgeotiff LIBGEOTIFF_LICENSE = X11-style, public domain LIBGEOTIFF_LICENSE_FILES = LICENSE From peter at korsgaard.com Sat Feb 5 17:28:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 18:28:20 +0100 Subject: [Buildroot] [git commit] package/vim: security bump to version 8.2.4301 Message-ID: <20220205172122.81771827A2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=18a19c985f3363510d8ae317e66d53680475db26 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2022-0393: Out-of-bounds Read in GitHub repository vim/vim prior to 8.2. Signed-off-by: Fabrice Fontaine 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 49056b31cd..fa3ca53cc8 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 8770c6308a6c0b0f8b93a4d7202451d195b4efad17787c0306f0be60947732c4 vim-8.2.4224.tar.gz +sha256 b40b4e341de6b65cdeacd4c816dea8fe5e3b385ee5e17af73fc69c00bd7c440b vim-8.2.4301.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index 74ab1ec584..98a5f153a8 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 8.2.4224 +VIM_VERSION = 8.2.4301 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src From peter at korsgaard.com Sat Feb 5 17:24:14 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 18:24:14 +0100 Subject: [Buildroot] [git commit] package/tiff: fix CVE-2022-22844 Message-ID: <20220205172122.6F60A82A80@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7ec5f99b3a00a1ec4dd6677a0ee6418267ffba25 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master LibTIFF 4.3.0 has an out-of-bounds read in _TIFFmemcpy in tif_unix.c in certain situations involving a custom tag and 0x0200 as the second word of the DE field. Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...fix-global-buffer-overflow-for-ASCII-tags.patch | 43 ++++++++++++++++++++++ package/tiff/tiff.mk | 4 ++ 2 files changed, 47 insertions(+) diff --git a/package/tiff/0001-tiffset-fix-global-buffer-overflow-for-ASCII-tags.patch b/package/tiff/0001-tiffset-fix-global-buffer-overflow-for-ASCII-tags.patch new file mode 100644 index 0000000000..ba1487782e --- /dev/null +++ b/package/tiff/0001-tiffset-fix-global-buffer-overflow-for-ASCII-tags.patch @@ -0,0 +1,43 @@ +From 03047a26952a82daaa0792957ce211e0aa51bc64 Mon Sep 17 00:00:00 2001 +From: 4ugustus +Date: Tue, 25 Jan 2022 16:25:28 +0000 +Subject: [PATCH] tiffset: fix global-buffer-overflow for ASCII tags where + count is required (fixes #355) + +[Retrieved from: +https://gitlab.com/libtiff/libtiff/-/commit/03047a26952a82daaa0792957ce211e0aa51bc64] +Signed-off-by: Fabrice Fontaine +--- + tools/tiffset.c | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) + +diff --git a/tools/tiffset.c b/tools/tiffset.c +index 8c9e23c5..e7a88c09 100644 +--- a/tools/tiffset.c ++++ b/tools/tiffset.c +@@ -146,9 +146,19 @@ main(int argc, char* argv[]) + + arg_index++; + if (TIFFFieldDataType(fip) == TIFF_ASCII) { +- if (TIFFSetField(tiff, TIFFFieldTag(fip), argv[arg_index]) != 1) +- fprintf( stderr, "Failed to set %s=%s\n", +- TIFFFieldName(fip), argv[arg_index] ); ++ if(TIFFFieldPassCount( fip )) { ++ size_t len; ++ len = strlen(argv[arg_index]) + 1; ++ if (len > UINT16_MAX || TIFFSetField(tiff, TIFFFieldTag(fip), ++ (uint16_t)len, argv[arg_index]) != 1) ++ fprintf( stderr, "Failed to set %s=%s\n", ++ TIFFFieldName(fip), argv[arg_index] ); ++ } else { ++ if (TIFFSetField(tiff, TIFFFieldTag(fip), ++ argv[arg_index]) != 1) ++ fprintf( stderr, "Failed to set %s=%s\n", ++ TIFFFieldName(fip), argv[arg_index] ); ++ } + } else if (TIFFFieldWriteCount(fip) > 0 + || TIFFFieldWriteCount(fip) == TIFF_VARIABLE) { + int ret = 1; +-- +GitLab + diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index f6c6de12c5..f80ab7ac55 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -11,6 +11,10 @@ TIFF_LICENSE_FILES = COPYRIGHT TIFF_CPE_ID_VENDOR = libtiff TIFF_CPE_ID_PRODUCT = libtiff TIFF_INSTALL_STAGING = YES + +# 0001-tiffset-fix-global-buffer-overflow-for-ASCII-tags.patch +TIFF_IGNORE_CVES += CVE-2022-22844 + TIFF_CONF_OPTS = \ --disable-cxx \ --without-x From peter at korsgaard.com Sat Feb 5 17:26:59 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 18:26:59 +0100 Subject: [Buildroot] [git commit] package/cryptopp: needs C++ Message-ID: <20220205172122.7813682A81@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=403892137cbf134f729834b98ede008760b8c4f0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since commit bf4cf9de833e2d571d98d1ca935ea08a3468e463: no -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O2 -g0 -D_FORTIFY_SOURCE=1 -fPIC -DCRYPTOPP_DISABLE_ARM_NEON -c cryptlib.cpp make[1]: no: Command not found Fixes: - http://autobuild.buildroot.org/results/fa90b416a219a512a482e7dc63e2d72b184307c7 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/cryptopp/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/cryptopp/Config.in b/package/cryptopp/Config.in index feb945db2f..1648a73f9d 100644 --- a/package/cryptopp/Config.in +++ b/package/cryptopp/Config.in @@ -1,9 +1,11 @@ config BR2_PACKAGE_CRYPTOPP bool "cryptopp" + depends on BR2_INSTALL_LIBSTDCPP 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, wchar" - depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR +comment "cryptopp needs a toolchain w/ C++, dynamic library, wchar" + depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ + !BR2_USE_WCHAR From giulio.benetti at benettiengineering.com Sat Feb 5 17:40:11 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 5 Feb 2022 18:40:11 +0100 Subject: [Buildroot] [PATCH] board/pc: fix build failure due to new genimage 15 In-Reply-To: <34C01EB2-BB12-4DE4-BC53-0141B5DF491D@benettiengineering.com> References: <98670320-83fa-c6e9-9bc4-aa30d9deb6ff@mind.be> <34C01EB2-BB12-4DE4-BC53-0141B5DF491D@benettiengineering.com> Message-ID: Hi again Arnout, On 05/02/22 16:36, Giulio Benetti wrote: > Hi Arnout, > >> Il giorno 5 feb 2022, alle ore 15:11, Arnout Vandecappelle ha scritto: >> >> ? Hi Giulio, >> >>> On 04/02/2022 01:56, Giulio Benetti wrote: >>> Actually genimage fails to create final image with: >>> ``` >>> ERROR: hdimage(disk.img): partition [MBR] (offset 0x1b8, size 0x48) overlaps previous partition boot (offset 0x0, size 0x200) >>> ERROR: hdimage(disk.img): bootloaders, etc. that overlap with the partition table must declare the overlapping area as a hole. >>> ``` >>> This is because genimage 15 is less permissive than before, so let's add >>> holes = {"(440; 512)"} to leave room to MBR. >>> Fixes: >>> https://gitlab.com/buildroot.org/buildroot/-/jobs/1865935249 >>> Signed-off-by: Giulio Benetti >>> --- >>> board/pc/genimage-bios.cfg | 1 + >>> 1 file changed, 1 insertion(+) >>> diff --git a/board/pc/genimage-bios.cfg b/board/pc/genimage-bios.cfg >>> index 26d12d9ab3..54026f6527 100644 >>> --- a/board/pc/genimage-bios.cfg >>> +++ b/board/pc/genimage-bios.cfg >>> @@ -7,6 +7,7 @@ image disk.img { >>> image = "boot.img" >>> offset = 0 >>> size = 512 >>> + holes = {"(440; 512)"} >> >> Have you tested this change on an actual board (i.e. a PC :-)? > > I?ve tested it with qemu and it boots the kernel correctly(that is in rootfs), only thing is that it can?t mount the rootfs and I don?t understand why. > I wanted to ask about this but I?ve got lost among all the other patches :-) I've compared the 2 disk.img files, one generated with genimage 14 without "holes..." and the other generated with genimage 15 and they are the same. The problem here is not that it can't mount using qemu, but it doesn't show the shell. Here is the qemu command: qemu-system-x86_64 -M pc -drive file=images/disk.img,if=virtio,format=raw -net nic,model=virtio -net user and this is the output: https://imgur.com/a/ffZBlJR So it seems like a busybox/init system issue with tty1. I'm digging. Best regards -- Giulio Benetti Benetti Engineering sas > Could someone double check if it mounts? > > Best regards > Giulio > >> >> Regards, >> Arnout >> >>> } >>> partition grub { >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From bernd.kuhls at t-online.de Sat Feb 5 17:40:46 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 5 Feb 2022 18:40:46 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/libldns: enable dane-verify for OpenSSL Message-ID: <20220205174046.1850152-1-bernd.kuhls@t-online.de> Since the bump of libopenssl to 1.1.x support for offline DANE verification can be enabled. Signed-off-by: Bernd Kuhls --- v2: enable only for libopenssl, libressl does not support SSL_get0_dane (Peter) package/libldns/libldns.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/package/libldns/libldns.mk b/package/libldns/libldns.mk index 7deca978da..86e7c0eafc 100644 --- a/package/libldns/libldns.mk +++ b/package/libldns/libldns.mk @@ -13,11 +13,9 @@ LIBLDNS_CPE_ID_VENDOR = nlnetlabs LIBLDNS_CPE_ID_PRODUCT = ldns LIBLDNS_INSTALL_STAGING = YES LIBLDNS_DEPENDENCIES = openssl -# --disable-dane-verify can be removed after openssl bump to 1.1.x LIBLDNS_CONF_OPTS = \ --with-ssl=$(STAGING_DIR)/usr \ --enable-dane \ - --disable-dane-verify \ --enable-ecdsa \ --enable-gost \ --enable-sha2 \ @@ -26,6 +24,12 @@ LIBLDNS_CONF_OPTS = \ --without-pyldns \ --without-pyldnsx +ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) +LIBLDNS_CONF_OPTS += --enable-dane-verify +else +LIBLDNS_CONF_OPTS += --disable-dane-verify +endif + ifeq ($(BR2_STATIC_LIBS),y) LIBLDNS_DEPENDENCIES += host-pkgconf # missing -lz breaks configure, add it using pkgconf -- 2.30.2 From bernd.kuhls at t-online.de Sat Feb 5 18:08:16 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 5 Feb 2022 19:08:16 +0100 Subject: [Buildroot] [PATCH 2/3] package/dht: new package In-Reply-To: <20220205180817.2103343-1-bernd.kuhls@t-online.de> References: <20220205180817.2103343-1-bernd.kuhls@t-online.de> Message-ID: <20220205180817.2103343-2-bernd.kuhls@t-online.de> Needed for upcoming version bump of transmission. Signed-off-by: Bernd Kuhls --- Build test using this defconfig BR2_PACKAGE_DHT=y was successful: 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]: 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]: OK br-arm-full-nothread [29/45]: OK br-arm-full-static [30/45]: OK br-i386-pentium4-full [31/45]: OK br-i386-pentium-mmx-musl [32/45]: OK br-mips64-n64-full [33/45]: OK br-mips64r6-el-hf-glibc [34/45]: OK br-powerpc-603e-basic-cpp [35/45]: OK br-powerpc64-power7-glibc [36/45]: OK linaro-aarch64-be [37/45]: OK linaro-aarch64 [38/45]: OK linaro-arm [39/45]: OK sourcery-arm-armv4t [40/45]: OK sourcery-arm [41/45]: OK sourcery-arm-thumb2 [42/45]: OK sourcery-mips64 [43/45]: OK sourcery-mips [44/45]: OK sourcery-nios2 [45/45]: OK 45 builds, 0 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed DEVELOPERS | 1 + package/Config.in | 1 + package/dht/0001-cmake.patch | 67 ++++++++++++++++++++++++++++++++++++ package/dht/Config.in | 6 ++++ package/dht/dht.hash | 3 ++ package/dht/dht.mk | 13 +++++++ 6 files changed, 91 insertions(+) create mode 100644 package/dht/0001-cmake.patch create mode 100644 package/dht/Config.in create mode 100644 package/dht/dht.hash create mode 100644 package/dht/dht.mk diff --git a/DEVELOPERS b/DEVELOPERS index 70021ef823..c4084c5545 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -325,6 +325,7 @@ F: package/bluez-tools/ F: package/boinc/ F: package/clamav/ F: package/dav1d/ +F: package/dht/ F: package/dovecot/ F: package/dovecot-pigeonhole/ F: package/dtv-scan-tables/ diff --git a/package/Config.in b/package/Config.in index 52a8ff8fe3..990ee19665 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1798,6 +1798,7 @@ menu "Networking" source "package/daq/Config.in" source "package/daq3/Config.in" source "package/davici/Config.in" + source "package/dht/Config.in" source "package/enet/Config.in" source "package/filemq/Config.in" source "package/flickcurl/Config.in" diff --git a/package/dht/0001-cmake.patch b/package/dht/0001-cmake.patch new file mode 100644 index 0000000000..bbac639044 --- /dev/null +++ b/package/dht/0001-cmake.patch @@ -0,0 +1,67 @@ +From 25e12bb39eea3d433602de6390796fec8a8f3620 Mon Sep 17 00:00:00 2001 +From: Mike Gelfand +Date: Sun, 1 Jan 2017 16:23:21 +0300 +Subject: [PATCH] Remove Makefile, add Makefile.am and CMakeLists.txt + +Downloaded from transmission repo: +https://github.com/transmission/dht/commit/25e12bb39eea3d433602de6390796fec8a8f3620 + +Upstream status: rejected (https://github.com/jech/dht/pull/19) + +Signed-off-by: Bernd Kuhls +--- + CMakeLists.txt | 9 +++++++++ + Makefile | 9 --------- + Makefile.am | 11 +++++++++++ + 3 files changed, 20 insertions(+), 9 deletions(-) + create mode 100644 CMakeLists.txt + delete mode 100644 Makefile + create mode 100644 Makefile.am + +diff --git a/CMakeLists.txt b/CMakeLists.txt +new file mode 100644 +index 0000000..6d4aa99 +--- /dev/null ++++ b/CMakeLists.txt +@@ -0,0 +1,9 @@ ++cmake_minimum_required(VERSION 2.8) ++project(dht C) ++ ++add_library(${PROJECT_NAME} STATIC ++ dht.c ++) ++ ++install(TARGETS ${PROJECT_NAME} DESTINATION lib) ++install(FILES dht.h DESTINATION include/dht) +diff --git a/Makefile b/Makefile +deleted file mode 100644 +index e012945..0000000 +--- a/Makefile ++++ /dev/null +@@ -1,9 +0,0 @@ +-CFLAGS = -g -Wall +-LDLIBS = -lcrypt +- +-dht-example: dht-example.o dht.o +- +-all: dht-example +- +-clean: +- -rm -f dht-example dht-example.o dht-example.id dht.o *~ core +diff --git a/Makefile.am b/Makefile.am +new file mode 100644 +index 0000000..2dba648 +--- /dev/null ++++ b/Makefile.am +@@ -0,0 +1,11 @@ ++AM_CFLAGS = @PTHREAD_CFLAGS@ ++ ++noinst_LIBRARIES = libdht.a ++libdht_a_SOURCES = dht.c ++libdht_a_DEPENDENCIES = $(builddir)/include/dht ++noinst_HEADERS = dht.h ++EXTRA_DIST = CHANGES CMakeLists.txt dht-example.c LICENCE README ++ ++$(builddir)/include/dht: ++ $(MKDIR_P) $(builddir)/include ++ (cd $(builddir)/include && $(LN_S) $(abs_srcdir) dht) diff --git a/package/dht/Config.in b/package/dht/Config.in new file mode 100644 index 0000000000..7660295c8d --- /dev/null +++ b/package/dht/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_DHT + bool "dht" + help + BitTorrent DHT library + + https://www.irif.fr/~jch/software/bittorrent diff --git a/package/dht/dht.hash b/package/dht/dht.hash new file mode 100644 index 0000000000..0f5d5c1758 --- /dev/null +++ b/package/dht/dht.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 3873d54b786cf74090672ed6f786b82510ae375d5a8d8f4d99314e358d898baa dht-0.26.tar.gz +sha256 06ce07293caf8c8ddfaf47797ad1fb18d1c040a8375231d8f8a6105cef51a8e6 LICENCE diff --git a/package/dht/dht.mk b/package/dht/dht.mk new file mode 100644 index 0000000000..0fa4ed9e6a --- /dev/null +++ b/package/dht/dht.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# dht +# +################################################################################ + +DHT_VERSION = 0.26 +DHT_SITE = $(call github,jech,dht,dht-$(DHT_VERSION)) +DHT_LICENSE = MIT +DHT_LICENSE_FILES = LICENCE +DHT_INSTALL_STAGING = YES + +$(eval $(cmake-package)) -- 2.30.2 From bernd.kuhls at t-online.de Sat Feb 5 18:08:15 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 5 Feb 2022 19:08:15 +0100 Subject: [Buildroot] [PATCH 1/3] package/libdeflate: new package Message-ID: <20220205180817.2103343-1-bernd.kuhls@t-online.de> Needed for upcoming version bump of transmission: https://github.com/transmission/transmission/commit/d8d765c59551b97ffb10bedb6f66133a54954a0e Signed-off-by: Bernd Kuhls --- Build test using this defconfig BR2_PACKAGE_LIBDEFLATE=y was successful: 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]: 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]: OK br-arm-full-nothread [29/45]: OK br-arm-full-static [30/45]: OK br-i386-pentium4-full [31/45]: OK br-i386-pentium-mmx-musl [32/45]: OK br-mips64-n64-full [33/45]: OK br-mips64r6-el-hf-glibc [34/45]: OK br-powerpc-603e-basic-cpp [35/45]: OK br-powerpc64-power7-glibc [36/45]: OK linaro-aarch64-be [37/45]: OK linaro-aarch64 [38/45]: OK linaro-arm [39/45]: OK sourcery-arm-armv4t [40/45]: OK sourcery-arm [41/45]: OK sourcery-arm-thumb2 [42/45]: OK sourcery-mips64 [43/45]: OK sourcery-mips [44/45]: OK sourcery-nios2 [45/45]: OK 45 builds, 0 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed DEVELOPERS | 1 + package/Config.in | 1 + .../0001-fix-crc32-build-on-arm.patch | 49 +++++++++++++++++++ package/libdeflate/Config.in | 7 +++ package/libdeflate/libdeflate.hash | 3 ++ package/libdeflate/libdeflate.mk | 34 +++++++++++++ 6 files changed, 95 insertions(+) create mode 100644 package/libdeflate/0001-fix-crc32-build-on-arm.patch create mode 100644 package/libdeflate/Config.in create mode 100644 package/libdeflate/libdeflate.hash create mode 100644 package/libdeflate/libdeflate.mk diff --git a/DEVELOPERS b/DEVELOPERS index a1ec9a091e..70021ef823 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -364,6 +364,7 @@ F: package/libcec/ F: package/libcodec2/ F: package/libcrossguid/ F: package/libdcadec/ +F: package/libdeflate/ F: package/libdrm/ F: package/libdvbcsa/ F: package/libdvdcss/ diff --git a/package/Config.in b/package/Config.in index 5e6fed6dec..52a8ff8fe3 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1393,6 +1393,7 @@ endmenu menu "Compression and decompression" source "package/libarchive/Config.in" + source "package/libdeflate/Config.in" source "package/libmspack/Config.in" source "package/libsquish/Config.in" source "package/libzip/Config.in" diff --git a/package/libdeflate/0001-fix-crc32-build-on-arm.patch b/package/libdeflate/0001-fix-crc32-build-on-arm.patch new file mode 100644 index 0000000000..1ea3d6d564 --- /dev/null +++ b/package/libdeflate/0001-fix-crc32-build-on-arm.patch @@ -0,0 +1,49 @@ +From ce096af0f9f9c76ba98408daeee45c4f456be602 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sat, 5 Feb 2022 14:32:18 +0100 +Subject: [PATCH] fix crc32 build on arm + +Fixes build error + +/tmp/ccAwbDTP.s: Assembler messages: +/tmp/ccAwbDTP.s:140: Error: selected processor does not support `crc32b r0,r0,r3' in ARM mode +/tmp/ccAwbDTP.s:146: Error: selected processor does not support `crc32w r3,r0,r3' in ARM mode +/tmp/ccAwbDTP.s:148: Error: selected processor does not support `crc32w r3,r3,r4' in ARM mode +/tmp/ccAwbDTP.s:150: Error: selected processor does not support `crc32w r3,r3,r4' in ARM mode +/tmp/ccAwbDTP.s:152: Error: selected processor does not support `crc32w r3,r3,r0' in ARM mode +/tmp/ccAwbDTP.s:154: Error: selected processor does not support `crc32w r3,r3,r4' in ARM mode +/tmp/ccAwbDTP.s:156: Error: selected processor does not support `crc32w r3,r3,r0' in ARM mode +/tmp/ccAwbDTP.s:158: Error: selected processor does not support `crc32w r3,r3,r4' in ARM mode +/tmp/ccAwbDTP.s:159: Error: selected processor does not support `crc32w r0,r3,r0' in ARM mode +/tmp/ccAwbDTP.s:165: Error: selected processor does not support `crc32w lr,r0,lr' in ARM mode +/tmp/ccAwbDTP.s:166: Error: selected processor does not support `crc32w r0,lr,r4' in ARM mode +/tmp/ccAwbDTP.s:170: Error: selected processor does not support `crc32b r0,r0,r3' in ARM mode +/tmp/ccAwbDTP.s:177: Error: selected processor does not support `crc32b r0,r0,r3' in ARM mode + +Patch sent upstream as RFC: +https://github.com/ebiggers/libdeflate/pull/163 + +Signed-off-by: Bernd Kuhls +--- + common/compiler_gcc.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/common/compiler_gcc.h b/common/compiler_gcc.h +index 2a45b05..ea16c2d 100644 +--- a/common/compiler_gcc.h ++++ b/common/compiler_gcc.h +@@ -128,9 +128,9 @@ + * they work as expected. (Well, not quite. There's still a bug, but we + * have to work around it later when including arm_acle.h.) + */ +-# if GCC_PREREQ(10, 1) || \ ++# if ((GCC_PREREQ(10, 1) || \ + (GCC_PREREQ(9, 3) && !GCC_PREREQ(10, 0)) || \ +- (GCC_PREREQ(8, 4) && !GCC_PREREQ(9, 0)) || \ ++ (GCC_PREREQ(8, 4) && !GCC_PREREQ(9, 0))) && defined(__aarch64__)) || \ + (defined(__clang__) && __has_builtin(__builtin_arm_crc32b)) + # define COMPILER_SUPPORTS_CRC32_TARGET_INTRINSICS 1 + # endif +-- +2.30.2 + diff --git a/package/libdeflate/Config.in b/package/libdeflate/Config.in new file mode 100644 index 0000000000..d2fb0d6c55 --- /dev/null +++ b/package/libdeflate/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_LIBDEFLATE + bool "libdeflate" + help + Libdeflate is a heavily optimized library for DEFLATE/zlib/ + gzip compression and decompression + + https://github.com/ebiggers/libdeflate diff --git a/package/libdeflate/libdeflate.hash b/package/libdeflate/libdeflate.hash new file mode 100644 index 0000000000..ef480ab270 --- /dev/null +++ b/package/libdeflate/libdeflate.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 a537ab6125c226b874c02b166488b326aece954930260dbf682d88fc339137e3 libdeflate-1.9.tar.gz +sha256 5d246dd2537307b80fed9ba5fdddf5d0fe7a8f023393a071182b9daed56b40fe COPYING diff --git a/package/libdeflate/libdeflate.mk b/package/libdeflate/libdeflate.mk new file mode 100644 index 0000000000..2453804989 --- /dev/null +++ b/package/libdeflate/libdeflate.mk @@ -0,0 +1,34 @@ +################################################################################ +# +# libdeflate +# +################################################################################ + +LIBDEFLATE_VERSION = 1.9 +LIBDEFLATE_SITE = $(call github,ebiggers,libdeflate,v$(LIBDEFLATE_VERSION)) +LIBDEFLATE_LICENSE = MIT +LIBDEFLATE_LICENSE_FILES = COPYING +LIBDEFLATE_INSTALL_STAGING = YES + +ifeq ($(BR2_STATIC_LIBS),y) +LIBDEFLATE_MAKE_OPTS += DISABLE_SHARED=yes +endif + +define LIBDEFLATE_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \ + $(LIBDEFLATE_MAKE_OPTS) +endef + +define LIBDEFLATE_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \ + $(LIBDEFLATE_MAKE_OPTS) \ + DESTDIR="$(STAGING_DIR)" PREFIX=/usr install +endef + +define LIBDEFLATE_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \ + $(LIBDEFLATE_MAKE_OPTS) \ + DESTDIR="$(TARGET_DIR)" PREFIX=/usr install +endef + +$(eval $(generic-package)) -- 2.30.2 From bernd.kuhls at t-online.de Sat Feb 5 18:08:17 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 5 Feb 2022 19:08:17 +0100 Subject: [Buildroot] [PATCH 3/3] package/libutp: new package In-Reply-To: <20220205180817.2103343-1-bernd.kuhls@t-online.de> References: <20220205180817.2103343-1-bernd.kuhls@t-online.de> Message-ID: <20220205180817.2103343-3-bernd.kuhls@t-online.de> Needed for upcoming version bump of transmission. Signed-off-by: Bernd Kuhls --- Build test using this defconfig BR2_PACKAGE_LIBUTP=y was successful: 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]: OK br-arm-full-static [30/45]: OK br-i386-pentium4-full [31/45]: OK br-i386-pentium-mmx-musl [32/45]: OK br-mips64-n64-full [33/45]: OK br-mips64r6-el-hf-glibc [34/45]: OK br-powerpc-603e-basic-cpp [35/45]: OK br-powerpc64-power7-glibc [36/45]: OK linaro-aarch64-be [37/45]: OK linaro-aarch64 [38/45]: OK linaro-arm [39/45]: OK sourcery-arm-armv4t [40/45]: OK sourcery-arm [41/45]: OK sourcery-arm-thumb2 [42/45]: OK sourcery-mips64 [43/45]: OK sourcery-mips [44/45]: OK sourcery-nios2 [45/45]: OK 45 builds, 2 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed DEVELOPERS | 1 + package/Config.in | 1 + package/libutp/Config.in | 10 ++++++++++ package/libutp/libutp.hash | 3 +++ package/libutp/libutp.mk | 13 +++++++++++++ 5 files changed, 28 insertions(+) create mode 100644 package/libutp/Config.in create mode 100644 package/libutp/libutp.hash create mode 100644 package/libutp/libutp.mk diff --git a/DEVELOPERS b/DEVELOPERS index c4084c5545..c1e486a175 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -398,6 +398,7 @@ F: package/libsoundtouch/ F: package/libsquish/ F: package/libudfread/ F: package/liburiparser/ +F: package/libutp/ F: package/libva/ F: package/libva-intel-driver/ F: package/libva-utils/ diff --git a/package/Config.in b/package/Config.in index 990ee19665..03fd6c04dd 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1881,6 +1881,7 @@ menu "Networking" source "package/libupnp/Config.in" source "package/libupnpp/Config.in" source "package/liburiparser/Config.in" + source "package/libutp/Config.in" source "package/libuwsc/Config.in" source "package/libvncserver/Config.in" source "package/libwebsock/Config.in" diff --git a/package/libutp/Config.in b/package/libutp/Config.in new file mode 100644 index 0000000000..6382913103 --- /dev/null +++ b/package/libutp/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_LIBUTP + bool "libutp" + depends on BR2_INSTALL_LIBSTDCPP + help + uTorrent Transport Protocol library + + https://github.com/bittorrent/libutp + +comment "libutp support needs a toolchain with C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/libutp/libutp.hash b/package/libutp/libutp.hash new file mode 100644 index 0000000000..38d46b0ae5 --- /dev/null +++ b/package/libutp/libutp.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 c515e6f9add47d3d202389e8a62feb765f0ae41d6398cc238e44028be520774e libutp-fda9f4b3db97ccb243fcbed2ce280eb4135d705b.tar.gz +sha256 4441418beb8e352b6e2aa09083b4c51a86814a49878dbb1a81936b466cd5badd LICENSE diff --git a/package/libutp/libutp.mk b/package/libutp/libutp.mk new file mode 100644 index 0000000000..c926c290d2 --- /dev/null +++ b/package/libutp/libutp.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# libutp +# +################################################################################ + +LIBUTP_VERSION = fda9f4b3db97ccb243fcbed2ce280eb4135d705b +LIBUTP_SITE = $(call github,transmission,libutp,$(LIBUTP_VERSION)) +LIBUTP_LICENSE = MIT +LIBUTP_LICENSE_FILES = LICENSE +LIBUTP_INSTALL_STAGING = YES + +$(eval $(cmake-package)) -- 2.30.2 From peter.macleod.thompson at gmail.com Sat Feb 5 18:12:58 2022 From: peter.macleod.thompson at gmail.com (Peter Thompson) Date: Sat, 5 Feb 2022 11:12:58 -0700 Subject: [Buildroot] [PATCH 1/1] bump version to 2.0.18 Message-ID: <20220205181259.5831-1-peter.macleod.thompson@gmail.com> From: PeterThompson Signed-off-by: PeterThompson --- package/sdl2_ttf/sdl2_ttf.hash | 4 ++-- package/sdl2_ttf/sdl2_ttf.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sdl2_ttf/sdl2_ttf.hash b/package/sdl2_ttf/sdl2_ttf.hash index 16459e4a59..a490b002b6 100644 --- a/package/sdl2_ttf/sdl2_ttf.hash +++ b/package/sdl2_ttf/sdl2_ttf.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a9eceb1ad88c1f1545cd7bd28e7cbc0b2c14191d40238f531a15b01b1b22cd33 SDL2_ttf-2.0.15.tar.gz -sha256 f6370809c9f644760920d9945c5be07aed17664975f2e4741013d4d9a2ec696f COPYING.txt +sha256 7234eb8883514e019e7747c703e4a774575b18d435c22a4a29d068cb768a2251 SDL2_ttf-2.0.18.tar.gz +sha256 e211dfe7e2c36e64048be886fe3f2bbba8732ce4dd77b596a355d3abbec775a4 COPYING.txt diff --git a/package/sdl2_ttf/sdl2_ttf.mk b/package/sdl2_ttf/sdl2_ttf.mk index 326cb99366..1fe7c0a075 100644 --- a/package/sdl2_ttf/sdl2_ttf.mk +++ b/package/sdl2_ttf/sdl2_ttf.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_TTF_VERSION = 2.0.15 +SDL2_TTF_VERSION = 2.0.18 SDL2_TTF_SOURCE = SDL2_ttf-$(SDL2_TTF_VERSION).tar.gz SDL2_TTF_SITE = http://www.libsdl.org/projects/SDL_ttf/release SDL2_TTF_LICENSE = Zlib -- 2.20.1 From bernd.kuhls at t-online.de Sat Feb 5 18:15:36 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 5 Feb 2022 19:15:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi-pvr-stalker: bump version to 19.0.2-Matrix Message-ID: <20220205181536.2110535-1-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 90e74d451a..2eae79d371 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 84a92c298ddda8d72072aafe2a62c5c6b48b60b3b85408ce7ca4f96e42965541 kodi-pvr-stalker-19.0.1-Matrix.tar.gz +sha256 ca472c4f43f77d7badca3fbe174f5877e6b3ff63407da09f690d8146ec737b59 kodi-pvr-stalker-19.0.2-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 a0d5f4356d..efa293a40d 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.1-Matrix +KODI_PVR_STALKER_VERSION = 19.0.2-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 kuzminov.sergey81 at gmail.com Sat Feb 5 18:21:44 2022 From: kuzminov.sergey81 at gmail.com (Sergey Kuzminov) Date: Sat, 5 Feb 2022 21:21:44 +0300 Subject: [Buildroot] [PATCH] configs/orangepi_zero_defconfig: switch to extlinux In-Reply-To: <6e5f8adf-30a2-797e-f01b-4536ebc916ab@benettiengineering.com> References: <20220205072801.13567-1-kuzminov.sergey81@gmail.com> <6e5f8adf-30a2-797e-f01b-4536ebc916ab@benettiengineering.com> Message-ID: <57596c27-7f00-da71-38b4-93c337e79dd0@gmail.com> Hi, Giulio, 05.02.2022 20:26, Giulio Benetti: > Hi Sergey, > > On 05/02/22 08:28, Sergey Kuzminov wrote: >> Changes: >> - Exclude FAT partition, he is no longer needed for U-Boot. > > typo s/he/it ok > >> - Switch the rootfs partition from MBR to GPT for partition-uuid to work. >> - Switch to extlinux, this is convenient for debugging. >> - Create common scenarios for multiple boards to create an SD image: >> board/orangepi/common. >> >> Signed-off-by: Sergey Kuzminov >> --- >> ? board/orangepi/common/extlinux.conf?????? |? 5 ++++ >> ? board/orangepi/common/genimage.cfg??????? | 23 +++++++++++++++ >> ? board/orangepi/common/post-build.sh?????? | 34 +++++++++++++++++++++ >> ? board/orangepi/orangepi-zero/boot.cmd???? |? 9 ------ >> ? board/orangepi/orangepi-zero/genimage.cfg | 36 ----------------------- >> ? configs/orangepi_zero_defconfig?????????? | 11 ++++--- >> ? 6 files changed, 67 insertions(+), 51 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 >> ? 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 > > Here ^^^ you've left a commented line, I guess the correct one is the > second one, right? Or anyway you can only keep one. The first line is for debugging, the second is for work. > >> diff --git a/board/orangepi/common/genimage.cfg >> b/board/orangepi/common/genimage.cfg >> new file mode 100644 >> index 0000000000..fa0d988991 >> --- /dev/null >> +++ b/board/orangepi/common/genimage.cfg >> @@ -0,0 +1,23 @@ >> +image sdcard.img { >> +??? partition u-boot { >> +??????? in-partition-table = false >> +??????? image = "u-boot-sunxi-with-spl.bin" >> +??????? offset = 8K >> +??????? size = 1000K # 1MB - 8KB(offset) - 16KB(GPT) >> +??? } >> + >> +??? hdimage { >> +??????? partition-table-type = gpt >> +??????? gpt-location = 1008K # 1MB - 16KB(GPT) >> +??????? gpt-no-backup = true >> +??????? # After writing the image to the SD card, >> +??????? # backup GPT data structures at the end of the disk: >> +??????? # gdisk /dev/mmcblk0 then press the buttons: x, e, w, y >> +??? } >> + >> +??? 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/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 5aaa1566c5..96f0c3f600 100644 >> --- a/configs/orangepi_zero_defconfig >> +++ b/configs/orangepi_zero_defconfig >> @@ -20,10 +20,13 @@ 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_NEEDS_HOST_OPENSSL=y >> +BR2_LINUX_KERNEL_INSTALL_TARGET=y >> ? # Filesystem >> ? BR2_TARGET_ROOTFS_EXT2=y >> ? BR2_TARGET_ROOTFS_EXT2_4=y >> +BR2_TARGET_ROOTFS_EXT2_SIZE="63M" >> +BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y > > It's worth mentioning this change ^^^ in commit log ok > >> ? # BR2_TARGET_ROOTFS_TAR is not set >> ? # Bootloader >> @@ -39,16 +42,12 @@ 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 >> ? # 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" >> ? # Wireless driver and firmware >> ? BR2_PACKAGE_XR819_XRADIO=y > > I've built it successfully locally so: > Tested-by: Giulio Benetti > and with the corrected commit log you can send V2 with ^^^ and also: > Reviewed-by: Giulio Benetti > > Best regards Thank you. From giulio.benetti at benettiengineering.com Sat Feb 5 19:38:05 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 5 Feb 2022 20:38:05 +0100 Subject: [Buildroot] [PATCH] configs/orangepi_zero_defconfig: switch to extlinux In-Reply-To: <57596c27-7f00-da71-38b4-93c337e79dd0@gmail.com> References: <57596c27-7f00-da71-38b4-93c337e79dd0@gmail.com> Message-ID: <33C48754-6B54-40CD-9127-9118C1DE24F1@benettiengineering.com> Hi Sergey, > Il giorno 5 feb 2022, alle ore 19:22, Sergey Kuzminov ha scritto: > > ?Hi, Giulio, > > 05.02.2022 20:26, Giulio Benetti: >> Hi Sergey, >>> On 05/02/22 08:28, Sergey Kuzminov wrote: >>> Changes: >>> - Exclude FAT partition, he is no longer needed for U-Boot. >> typo s/he/it > > ok > >>> - Switch the rootfs partition from MBR to GPT for partition-uuid to work. >>> - Switch to extlinux, this is convenient for debugging. >>> - Create common scenarios for multiple boards to create an SD image: board/orangepi/common. >>> >>> Signed-off-by: Sergey Kuzminov >>> --- >>> board/orangepi/common/extlinux.conf | 5 ++++ >>> board/orangepi/common/genimage.cfg | 23 +++++++++++++++ >>> board/orangepi/common/post-build.sh | 34 +++++++++++++++++++++ >>> board/orangepi/orangepi-zero/boot.cmd | 9 ------ >>> board/orangepi/orangepi-zero/genimage.cfg | 36 ----------------------- >>> configs/orangepi_zero_defconfig | 11 ++++--- >>> 6 files changed, 67 insertions(+), 51 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 >>> 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 >> Here ^^^ you've left a commented line, I guess the correct one is the second one, right? Or anyway you can only keep one. > > The first line is for debugging, the second is for work. I understand, but you have to keep only one, so the second one and drop the first, otherwise I don?t think it will be accepted. Thank you! Best regards Giulio Benetti > >>> diff --git a/board/orangepi/common/genimage.cfg b/board/orangepi/common/genimage.cfg >>> new file mode 100644 >>> index 0000000000..fa0d988991 >>> --- /dev/null >>> +++ b/board/orangepi/common/genimage.cfg >>> @@ -0,0 +1,23 @@ >>> +image sdcard.img { >>> + partition u-boot { >>> + in-partition-table = false >>> + image = "u-boot-sunxi-with-spl.bin" >>> + offset = 8K >>> + size = 1000K # 1MB - 8KB(offset) - 16KB(GPT) >>> + } >>> + >>> + hdimage { >>> + partition-table-type = gpt >>> + gpt-location = 1008K # 1MB - 16KB(GPT) >>> + gpt-no-backup = true >>> + # After writing the image to the SD card, >>> + # backup GPT data structures at the end of the disk: >>> + # gdisk /dev/mmcblk0 then press the buttons: x, e, w, y >>> + } >>> + >>> + 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/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 5aaa1566c5..96f0c3f600 100644 >>> --- a/configs/orangepi_zero_defconfig >>> +++ b/configs/orangepi_zero_defconfig >>> @@ -20,10 +20,13 @@ 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_NEEDS_HOST_OPENSSL=y >>> +BR2_LINUX_KERNEL_INSTALL_TARGET=y >>> # Filesystem >>> BR2_TARGET_ROOTFS_EXT2=y >>> BR2_TARGET_ROOTFS_EXT2_4=y >>> +BR2_TARGET_ROOTFS_EXT2_SIZE="63M" >>> +BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y >> It's worth mentioning this change ^^^ in commit log > > ok > >>> # BR2_TARGET_ROOTFS_TAR is not set >>> # Bootloader >>> @@ -39,16 +42,12 @@ 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 >>> # 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" >>> # Wireless driver and firmware >>> BR2_PACKAGE_XR819_XRADIO=y >> I've built it successfully locally so: >> Tested-by: Giulio Benetti >> and with the corrected commit log you can send V2 with ^^^ and also: >> Reviewed-by: Giulio Benetti >> Best regards > > Thank you. > From giulio.benetti at benettiengineering.com Sat Feb 5 19:40:03 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 5 Feb 2022 20:40:03 +0100 Subject: [Buildroot] [PATCH 1/1] bump version to 2.0.18 In-Reply-To: <20220205181259.5831-1-peter.macleod.thompson@gmail.com> References: <20220205181259.5831-1-peter.macleod.thompson@gmail.com> Message-ID: Hi Peter, on subject it?s missing: package/sdl2_ttf: bump version to 2.0.18 Best regards Giulio > Il giorno 5 feb 2022, alle ore 19:13, Peter Thompson ha scritto: > > ?From: PeterThompson > > Signed-off-by: PeterThompson > --- > package/sdl2_ttf/sdl2_ttf.hash | 4 ++-- > package/sdl2_ttf/sdl2_ttf.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/sdl2_ttf/sdl2_ttf.hash b/package/sdl2_ttf/sdl2_ttf.hash > index 16459e4a59..a490b002b6 100644 > --- a/package/sdl2_ttf/sdl2_ttf.hash > +++ b/package/sdl2_ttf/sdl2_ttf.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 a9eceb1ad88c1f1545cd7bd28e7cbc0b2c14191d40238f531a15b01b1b22cd33 SDL2_ttf-2.0.15.tar.gz > -sha256 f6370809c9f644760920d9945c5be07aed17664975f2e4741013d4d9a2ec696f COPYING.txt > +sha256 7234eb8883514e019e7747c703e4a774575b18d435c22a4a29d068cb768a2251 SDL2_ttf-2.0.18.tar.gz > +sha256 e211dfe7e2c36e64048be886fe3f2bbba8732ce4dd77b596a355d3abbec775a4 COPYING.txt > diff --git a/package/sdl2_ttf/sdl2_ttf.mk b/package/sdl2_ttf/sdl2_ttf.mk > index 326cb99366..1fe7c0a075 100644 > --- a/package/sdl2_ttf/sdl2_ttf.mk > +++ b/package/sdl2_ttf/sdl2_ttf.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -SDL2_TTF_VERSION = 2.0.15 > +SDL2_TTF_VERSION = 2.0.18 > SDL2_TTF_SOURCE = SDL2_ttf-$(SDL2_TTF_VERSION).tar.gz > SDL2_TTF_SITE = http://www.libsdl.org/projects/SDL_ttf/release > SDL2_TTF_LICENSE = Zlib > -- > 2.20.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From james.hilliard1 at gmail.com Sat Feb 5 20:18:30 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 5 Feb 2022 13:18:30 -0700 Subject: [Buildroot] [PATCH v6 1/8] package/webp: enable host build Message-ID: <20220205201837.3324085-1-james.hilliard1@gmail.com> This will be needed by qt5webengine. Signed-off-by: James Hilliard --- package/webp/webp.mk | 5 +++++ 1 file changed, 5 insertions(+) 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 james.hilliard1 at gmail.com Sat Feb 5 20:18:32 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 5 Feb 2022 13:18:32 -0700 Subject: [Buildroot] [PATCH v6 3/8] package/icu: don't disable renaming for host build In-Reply-To: <20220205201837.3324085-1-james.hilliard1@gmail.com> References: <20220205201837.3324085-1-james.hilliard1@gmail.com> Message-ID: <20220205201837.3324085-3-james.hilliard1@gmail.com> Using a different renaming option for the icu host build can cause issues for packages such as qt5webengine which expect target and host packages to be built with the same options. Signed-off-by: James Hilliard --- package/icu/icu.mk | 3 +-- package/nodejs/nodejs.mk | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/icu/icu.mk b/package/icu/icu.mk index 7e0c96e43a..ebbb1968fc 100644 --- a/package/icu/icu.mk +++ b/package/icu/icu.mk @@ -45,8 +45,7 @@ HOST_ICU_CONF_OPTS = \ --disable-tests \ --disable-extras \ --disable-icuio \ - --disable-layout \ - --disable-renaming + --disable-layout ICU_SUBDIR = source HOST_ICU_SUBDIR = source diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 727af6dc50..2e41c11dbd 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -94,7 +94,7 @@ NODEJS_HOST_TOOLS_V8 = \ NODEJS_HOST_TOOLS_NODE = mkcodecache NODEJS_HOST_TOOLS = $(NODEJS_HOST_TOOLS_V8) $(NODEJS_HOST_TOOLS_NODE) -HOST_NODEJS_CXXFLAGS = $(HOST_CXXFLAGS) -DU_DISABLE_RENAMING=1 +HOST_NODEJS_CXXFLAGS = $(HOST_CXXFLAGS) define HOST_NODEJS_BUILD_CMDS $(HOST_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python3 \ -- 2.25.1 From james.hilliard1 at gmail.com Sat Feb 5 20:18:31 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 5 Feb 2022 13:18:31 -0700 Subject: [Buildroot] [PATCH v6 2/8] package/re2: switch to generic-package make build In-Reply-To: <20220205201837.3324085-1-james.hilliard1@gmail.com> References: <20220205201837.3324085-1-james.hilliard1@gmail.com> Message-ID: <20220205201837.3324085-2-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. This will be needed by qt5webengine. 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 Sat Feb 5 20:18:33 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 5 Feb 2022 13:18:33 -0700 Subject: [Buildroot] [PATCH v6 4/8] package/qt5/qt5base: enable ccache via configure option In-Reply-To: <20220205201837.3324085-1-james.hilliard1@gmail.com> References: <20220205201837.3324085-1-james.hilliard1@gmail.com> Message-ID: <20220205201837.3324085-4-james.hilliard1@gmail.com> This should be cleaner than editing mkspecs/common/g++-base.conf. Signed-off-by: James Hilliard --- package/qt5/qt5base/qt5base.mk | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index d8a0bf1d16..4b7a2a937d 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -289,10 +289,9 @@ endef endif # This allows to use ccache when available -define QT5BASE_CONFIGURE_HOSTCC - $(SED) 's,^QMAKE_CC\s*=.*,QMAKE_CC = $(HOSTCC),' $(@D)/mkspecs/common/g++-base.conf - $(SED) 's,^QMAKE_CXX\s*=.*,QMAKE_CXX = $(HOSTCXX),' $(@D)/mkspecs/common/g++-base.conf -endef +ifeq ($(BR2_CCACHE),y) +QT5BASE_CONFIGURE_OPTS += -ccache +endif # Must be last so can override all options set by Buildroot QT5BASE_CONFIGURE_OPTS += $(call qstrip,$(BR2_PACKAGE_QT5BASE_CUSTOM_CONF_OPTS)) -- 2.25.1 From james.hilliard1 at gmail.com Sat Feb 5 20:18:34 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 5 Feb 2022 13:18:34 -0700 Subject: [Buildroot] [PATCH v6 5/8] package/qt5/qt5webengine-chromium-catapult: new package In-Reply-To: <20220205201837.3324085-1-james.hilliard1@gmail.com> References: <20220205201837.3324085-1-james.hilliard1@gmail.com> Message-ID: <20220205201837.3324085-5-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 Sat Feb 5 20:18:36 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 5 Feb 2022 13:18:36 -0700 Subject: [Buildroot] [PATCH v6 7/8] package/qt5/qt5base: disable broken qmake sysrootify In-Reply-To: <20220205201837.3324085-1-james.hilliard1@gmail.com> References: <20220205201837.3324085-1-james.hilliard1@gmail.com> Message-ID: <20220205201837.3324085-7-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. Improves pkg-config target/host separation. Signed-off-by: James Hilliard --- Changes v5 -> v6: - rebase/rework with qt5webengine bump 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/qt5/qt5base/qt.conf.in | 21 ++++++++++++++++++--- package/qt5/qt5base/qt5base.mk | 5 ++++- 2 files changed, 22 insertions(+), 4 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 4b7a2a937d..ea41c8fd72 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -315,12 +315,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)" \ @@ -329,6 +332,6 @@ define QT5BASE_CONFIGURE_CMDS ) endef -QT5BASE_POST_INSTALL_STAGING_HOOKS += QT5_INSTALL_QT_CONF +QT5BASE_PRE_INSTALL_STAGING_HOOKS += QT5_INSTALL_QT_CONF $(eval $(qmake-package)) -- 2.25.1 From james.hilliard1 at gmail.com Sat Feb 5 20:18:37 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 5 Feb 2022 13:18:37 -0700 Subject: [Buildroot] [PATCH v6 8/8] package/qt5/qt5webengine: bump to version 5.15.8 In-Reply-To: <20220205201837.3324085-1-james.hilliard1@gmail.com> References: <20220205201837.3324085-1-james.hilliard1@gmail.com> Message-ID: <20220205201837.3324085-8-james.hilliard1@gmail.com> We need to use the separate package for the chromium submodule so that which has python3 support patches. We also need to apply a patch to qt5webengine to allow building with python3. Drop a patch which is now upstream. 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. Switch libraries to system libraries instead of bundled when possible. Migrate unsupported WEBENGINE_CONFIG to new config flag option. Override feature detection using config override flags to ensure we get the expected features enabled/disabled as autodetection logic may otherwise disable features without throwing build errors. Signed-off-by: James Hilliard --- Changes v5 -> v6: - switch to python3 - fix up config flags and rebase Changes v3 -> v4: - linker fixes Changes v2 -> v3: - add kconfig entries --- package/qt5/qt5.mk | 1 - .../0002-Add-python3-build-support.patch | 168 +++ ...m-breakpad-fix-build-with-glibc-2.34.patch | 76 -- package/qt5/qt5webengine/Config.in | 13 + .../qt5/qt5webengine/host-python-wrapper.in | 3 + package/qt5/qt5webengine/qt5webengine.hash | 1001 +---------------- package/qt5/qt5webengine/qt5webengine.mk | 157 ++- 7 files changed, 322 insertions(+), 1097 deletions(-) create mode 100644 package/qt5/qt5webengine/0002-Add-python3-build-support.patch delete mode 100644 package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch create mode 100644 package/qt5/qt5webengine/host-python-wrapper.in diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk index 656e3067dc..0706c3548d 100644 --- a/package/qt5/qt5.mk +++ b/package/qt5/qt5.mk @@ -6,7 +6,6 @@ QT5_VERSION_MAJOR = 5.15 QT5_VERSION = $(QT5_VERSION_MAJOR).8 -QT5_SOURCE_TARBALL_PREFIX = everywhere-src QT5_SITE = https://invent.kde.org/qt/qt include $(sort $(wildcard package/qt5/*/*.mk)) diff --git a/package/qt5/qt5webengine/0002-Add-python3-build-support.patch b/package/qt5/qt5webengine/0002-Add-python3-build-support.patch new file mode 100644 index 0000000000..18fc1c1de0 --- /dev/null +++ b/package/qt5/qt5webengine/0002-Add-python3-build-support.patch @@ -0,0 +1,168 @@ +From 1e299a6c9eeb08555208b76623e453d8ab96b6e3 Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Fri, 4 Feb 2022 16:16:35 -0700 +Subject: [PATCH] Add python3 build support + +Adapted from: +https://github.com/archlinux/svntogit-packages/blob/6edf5f1aaea952d046aff89a2e0175258fe77361/trunk/qt5-webengine-python3.patch + +Signed-off-by: James Hilliard +--- + configure.pri | 13 ++++++------- + mkspecs/features/functions.prf | 6 +++--- + src/buildtools/config/support.pri | 10 +++++----- + src/buildtools/configure.json | 18 +++++++++--------- + 4 files changed, 23 insertions(+), 24 deletions(-) + +diff --git a/configure.pri b/configure.pri +index e072961f..6fec7b20 100644 +--- a/configure.pri ++++ b/configure.pri +@@ -13,8 +13,7 @@ defineTest(isPythonVersionSupported) { + python_version = $$split(python_version, ',') + python_major_version = $$first(python_version) + greaterThan(python_major_version, 2) { +- qtLog("Python version 3 is not supported by Chromium.") +- return(false) ++ return(true) + } + python_minor_version = $$member(python_version, 1) + python_patch_version = $$member(python_version, 2) +@@ -52,10 +51,10 @@ defineTest(qtConfReport_jumboBuild) { + qtConfReportPadded($${1}, $$mergeLimit) + } + +-defineTest(qtConfTest_detectPython2) { +- python = $$qtConfFindInPath("python2$$EXE_SUFFIX") ++defineTest(qtConfTest_detectPython) { ++ python = $$qtConfFindInPath("python$$EXE_SUFFIX") + isEmpty(python) { +- qtLog("'python2$$EXE_SUFFIX' not found in PATH. Checking for 'python$$EXE_SUFFIX'.") ++ qtLog("'python$$EXE_SUFFIX' not found in PATH. Checking for 'python$$EXE_SUFFIX'.") + python = $$qtConfFindInPath("python$$EXE_SUFFIX") + } + isEmpty(python) { +@@ -63,11 +62,11 @@ defineTest(qtConfTest_detectPython2) { + return(false) + } + !isPythonVersionSupported($$python) { +- qtLog("A suitable Python 2 executable could not be located.") ++ qtLog("A suitable Python executable could not be located.") + return(false) + } + +- # Make tests.python2.location available in configure.json. ++ # Make tests.python.location available in configure.json. + $${1}.location = $$clean_path($$python) + export($${1}.location) + $${1}.cache += location +diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf +index 2750d707..9fda13d0 100644 +--- a/mkspecs/features/functions.prf ++++ b/mkspecs/features/functions.prf +@@ -39,11 +39,11 @@ defineReplace(which) { + + # Returns the unquoted path to the python executable. + defineReplace(pythonPath) { +- isEmpty(QMAKE_PYTHON2) { ++ isEmpty(QMAKE_PYTHON) { + # Fallback for building QtWebEngine with Qt < 5.8 +- QMAKE_PYTHON2 = python ++ QMAKE_PYTHON = python + } +- return($$QMAKE_PYTHON2) ++ return($$QMAKE_PYTHON) + } + + # Returns the python executable for use with shell / make targets. +diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri +index e7f869a1..1bf2c5d7 100644 +--- a/src/buildtools/config/support.pri ++++ b/src/buildtools/config/support.pri +@@ -21,7 +21,7 @@ defineReplace(qtwebengine_checkWebEngineCoreError) { + !qtwebengine_checkForGperf(QtWebEngine):return(false) + !qtwebengine_checkForBison(QtWebEngine):return(false) + !qtwebengine_checkForFlex(QtWebEngine):return(false) +- !qtwebengine_checkForPython2(QtWebEngine):return(false) ++ !qtwebengine_checkForPython(QtWebEngine):return(false) + !qtwebengine_checkForNodejs(QtWebEngine):return(false) + !qtwebengine_checkForSanitizer(QtWebEngine):return(false) + linux:!qtwebengine_checkForPkgCfg(QtWebEngine):return(false) +@@ -51,7 +51,7 @@ defineReplace(qtwebengine_checkPdfError) { + !qtwebengine_checkForGperf(QtPdf):return(false) + !qtwebengine_checkForBison(QtPdf):return(false) + !qtwebengine_checkForFlex(QtPdf):return(false) +- !qtwebengine_checkForPython2(QtPdf):return(false) ++ !qtwebengine_checkForPython(QtPdf):return(false) + !qtwebengine_checkForSanitizer(QtPdf):return(false) + linux:!qtwebengine_checkForPkgCfg(QtPdf):return(false) + linux:!qtwebengine_checkForHostPkgCfg(QtPdf):return(false) +@@ -143,10 +143,10 @@ defineTest(qtwebengine_checkForFlex) { + return(true) + } + +-defineTest(qtwebengine_checkForPython2) { ++defineTest(qtwebengine_checkForPython) { + module = $$1 +- !qtConfig(webengine-python2) { +- qtwebengine_skipBuild("Python version 2 (2.7.5 or later) is required to build $${module}.") ++ !qtConfig(webengine-python) { ++ qtwebengine_skipBuild("Python is required to build $${module}.") + return(false) + } + return(true) +diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json +index 88d1790c..032aa665 100644 +--- a/src/buildtools/configure.json ++++ b/src/buildtools/configure.json +@@ -295,9 +295,9 @@ + "label": "system ninja", + "type": "detectNinja" + }, +- "webengine-python2": { +- "label": "python2", +- "type": "detectPython2", ++ "webengine-python": { ++ "label": "python", ++ "type": "detectPython", + "log": "location" + }, + "webengine-winversion": { +@@ -374,7 +374,7 @@ + && features.webengine-gperf + && features.webengine-bison + && features.webengine-flex +- && features.webengine-python2 ++ && features.webengine-python + && features.webengine-nodejs + && (!config.sanitizer || features.webengine-sanitizer) + && (!config.linux || features.pkg-config) +@@ -400,7 +400,7 @@ + && features.webengine-gperf + && features.webengine-bison + && features.webengine-flex +- && features.webengine-python2 ++ && features.webengine-python + && (!config.sanitizer || features.webengine-sanitizer) + && (!config.linux || features.pkg-config) + && (!config.linux || features.webengine-host-pkg-config) +@@ -423,12 +423,12 @@ + "autoDetect": "features.private_tests", + "output": [ "privateFeature" ] + }, +- "webengine-python2": { +- "label": "python2", +- "condition": "tests.webengine-python2", ++ "webengine-python": { ++ "label": "python", ++ "condition": "tests.webengine-python", + "output": [ + "privateFeature", +- { "type": "varAssign", "name": "QMAKE_PYTHON2", "value": "tests.webengine-python2.location" } ++ { "type": "varAssign", "name": "QMAKE_PYTHON", "value": "tests.webengine-python.location" } + ] + }, + "webengine-gperf": { +-- +2.25.1 + 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 deleted file mode 100644 index 44a6424c7d..0000000000 --- a/package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch +++ /dev/null @@ -1,76 +0,0 @@ -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/Config.in b/package/qt5/qt5webengine/Config.in index 5d537cdf84..b5ba8c4649 100644 --- a/package/qt5/qt5webengine/Config.in +++ b/package/qt5/qt5webengine/Config.in @@ -32,24 +32,35 @@ 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). # 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_LCMS2 + 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_MINIZIP select BR2_PACKAGE_OPUS + select BR2_PACKAGE_RE2 + select BR2_PACKAGE_SNAPPY 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 @@ -57,9 +68,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/host-python-wrapper.in b/package/qt5/qt5webengine/host-python-wrapper.in new file mode 100644 index 0000000000..3400be1d06 --- /dev/null +++ b/package/qt5/qt5webengine/host-python-wrapper.in @@ -0,0 +1,3 @@ +#!/bin/sh +LD_LIBRARY_PATH="@HOST_DIR@/lib" \ +exec @HOST_DIR@/bin/python "$@" 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 cebd6d0fe2..68eb2e8a1c 100644 --- a/package/qt5/qt5webengine/qt5webengine.mk +++ b/package/qt5/qt5webengine/qt5webengine.mk @@ -4,42 +4,147 @@ # ################################################################################ -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 \ - host-pkgconf host-python +QT5WEBENGINE_VERSION = $(QT5_VERSION) +QT5WEBENGINE_SITE = $(QT5_SITE)/qtwebengine/-/archive/v$(QT5WEBENGINE_VERSION)-lts +QT5WEBENGINE_SOURCE = qtwebengine-v$(QT5WEBENGINE_VERSION)-lts.tar.bz2 +QT5WEBENGINE_DEPENDENCIES = qt5declarative qt5webchannel +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 + +# command line argument separator +QT5WEBENGINE_CONF_OPTS = -- 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 += \ + xlib_libXcomposite \ + xlib_libXcursor \ + xlib_libXi \ + xlib_libxkbfile \ + xlib_libXrandr \ + xlib_libXScrnSaver \ + xlib_libXtst +QT5WEBENGINE_CONF_OPTS += \ + -feature-webengine-ozone \ + -feature-webengine-system-libdrm \ + -feature-webengine-system-x11 \ + -feature-webengine-system-xkbfile \ + -feature-webengine-system-xcomposite \ + -feature-webengine-system-xcursor \ + -feature-webengine-system-xi \ + -feature-webengine-system-xproto-gl \ + -feature-webengine-system-xtst +else +QT5WEBENGINE_CONF_OPTS += \ + -no-feature-webengine-ozone \ + -no-feature-webengine-system-libdrm \ + -no-feature-webengine-system-x11 \ + -no-feature-webengine-system-xkbfile \ + -no-feature-webengine-system-xcomposite \ + -no-feature-webengine-system-xcursor \ + -no-feature-webengine-system-xi \ + -no-feature-webengine-system-xproto-gl \ + -no-feature-webengine-system-xtst endif -QT5WEBENGINE_DEPENDENCIES += host-libpng host-libnss libnss +QT5WEBENGINE_DEPENDENCIES += \ + host-bison \ + host-flex \ + host-freetype \ + host-gperf \ + host-harfbuzz \ + host-icu \ + host-ninja \ + host-nodejs \ + host-pkgconf \ + host-libjpeg \ + host-libnss \ + host-libpng \ + host-python3 \ + host-webp \ + host-zlib \ + ffmpeg \ + freetype \ + jpeg \ + lcms2 \ + libevent \ + libnss \ + libvpx \ + libxml2 \ + libxslt \ + re2 \ + snappy \ + webp -QT5WEBENGINE_CONF_OPTS += WEBENGINE_CONFIG+=use_system_ffmpeg +QT5WEBENGINE_CONF_OPTS += \ + -webengine-embedded-build \ + -webengine-ffmpeg \ + -webengine-icu \ + -webengine-opus \ + -webengine-webchannel \ + -webengine-webp \ + -feature-build-qtwebengine-core \ + -feature-webengine-core-support \ + -feature-webengine-system-dbus \ + -feature-webengine-system-fontconfig \ + -feature-webengine-system-freetype \ + -feature-webengine-system-glib \ + -feature-webengine-system-glibc \ + -feature-webengine-system-harfbuzz \ + -feature-webengine-system-jpeg \ + -feature-webengine-system-khr \ + -feature-webengine-system-lcms2 \ + -feature-webengine-system-libevent \ + -feature-webengine-system-libvpx \ + -feature-webengine-system-libxml2 \ + -feature-webengine-system-ninja \ + -feature-webengine-system-nss \ + -feature-webengine-system-png \ + -feature-webengine-system-re2 \ + -feature-webengine-system-snappy \ + -feature-webengine-system-zlib + +QT5WEBENGINE_CONF_OPTS += \ + -no-webengine-geolocation \ + -no-webengine-kerberos \ + -no-webengine-pepper-plugins \ + -no-webengine-printing-and-pdf \ + -no-webengine-spellchecker \ + -no-webengine-webrtc \ + -no-webengine-webrtc-pipewire \ + -no-feature-webengine-developer-build \ + -no-feature-webengine-full-debug-info \ + -no-feature-webengine-native-spellchecker \ + -no-feature-webengine-noexecstack \ + -no-feature-webengine-system-minizip \ + -no-feature-webengine-system-gn ifeq ($(BR2_PACKAGE_QT5WEBENGINE_PROPRIETARY_CODECS),y) -QT5WEBENGINE_CONF_OPTS += WEBENGINE_CONFIG+=use_proprietary_codecs +QT5WEBENGINE_CONF_OPTS += -webengine-proprietary-codecs +else +QT5WEBENGINE_CONF_OPTS += -no-webengine-proprietary-codecs endif ifeq ($(BR2_PACKAGE_QT5WEBENGINE_ALSA),y) QT5WEBENGINE_DEPENDENCIES += alsa-lib +QT5WEBENGINE_CONF_OPTS += -webengine-alsa else -QT5WEBENGINE_CONF_OPTS += QT_CONFIG-=alsa +QT5WEBENGINE_CONF_OPTS += -no-webengine-alsa +endif + +ifeq ($(BR2_PACKAGE_PULSEAUDIO),y) +QT5WEBENGINE_DEPENDENCIES += pulseaudio +QT5WEBENGINE_CONF_OPTS += -webengine-pulseaudio +else +QT5WEBENGINE_CONF_OPTS += -no-webengine-pulseaudio endif # QtWebengine's build system uses python, but only supports python2. We work @@ -47,21 +152,31 @@ endif # symlink. QT5WEBENGINE_ENV = \ PATH=$(@D)/host-bin:$(BR_PATH) \ - PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig -define QT5WEBENGINE_PYTHON2_SYMLINK + PKG_CONFIG_SYSROOT_DIR="/" +define QT5WEBENGINE_CREATE_HOST_PYTHON_WRAPPER mkdir -p $(@D)/host-bin - ln -sf $(HOST_DIR)/bin/python2 $(@D)/host-bin/python + sed s%@HOST_DIR@%$(HOST_DIR)%g $(QT5WEBENGINE_PKGDIR)/host-python-wrapper.in > $(@D)/host-bin/python + chmod +x $(@D)/host-bin/python endef -QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_PYTHON2_SYMLINK +QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_CREATE_HOST_PYTHON_WRAPPER 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 + mkdir -p $(@D)/host-bin 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 Sat Feb 5 20:23:49 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 5 Feb 2022 21:23:49 +0100 Subject: [Buildroot] [PATCH v6 4/8] package/qt5/qt5base: enable ccache via configure option In-Reply-To: <20220205201837.3324085-4-james.hilliard1@gmail.com> References: <20220205201837.3324085-1-james.hilliard1@gmail.com> <20220205201837.3324085-4-james.hilliard1@gmail.com> Message-ID: <20220205212349.17db6aa4@windsurf> On Sat, 5 Feb 2022 13:18:33 -0700 James Hilliard wrote: > # This allows to use ccache when available > -define QT5BASE_CONFIGURE_HOSTCC > - $(SED) 's,^QMAKE_CC\s*=.*,QMAKE_CC = $(HOSTCC),' $(@D)/mkspecs/common/g++-base.conf > - $(SED) 's,^QMAKE_CXX\s*=.*,QMAKE_CXX = $(HOSTCXX),' $(@D)/mkspecs/common/g++-base.conf > -endef This this variable is dropped, then surely the place it was used should also be modified? > +ifeq ($(BR2_CCACHE),y) > +QT5BASE_CONFIGURE_OPTS += -ccache > +endif Are we sure this is going to use Buildroot's ccache and not the system ccache? Indeed, $(HOSTCC) and $(HOSTCXX) are defined as: CCACHE = $(HOST_DIR)/bin/ccache HOSTCC = $(CCACHE) $(HOSTCC_NOCCACHE) HOSTCXX = $(CCACHE) $(HOSTCXX_NOCCACHE) so we know that it's the Buildroot ccache that will be used. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From james.hilliard1 at gmail.com Sat Feb 5 20:18:35 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 5 Feb 2022 13:18:35 -0700 Subject: [Buildroot] [PATCH v6 6/8] package/qt5/qt5webengine-chromium: new package In-Reply-To: <20220205201837.3324085-1-james.hilliard1@gmail.com> References: <20220205201837.3324085-1-james.hilliard1@gmail.com> Message-ID: <20220205201837.3324085-6-james.hilliard1@gmail.com> 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. Signed-off-by: James Hilliard --- package/qt5/Config.in | 1 + .../0001-Add-python3-build-support.patch | 1858 +++++++++++++++++ .../0002-Don-t-rebase-sysroot-path.patch | 32 + package/qt5/qt5webengine-chromium/Config.in | 5 + .../qt5webengine-chromium/chromium-latest.inc | 1257 +++++++++++ .../qt5webengine-chromium.hash | 1256 +++++++++++ .../qt5webengine-chromium.mk | 23 + 7 files changed, 4432 insertions(+) create mode 100644 package/qt5/qt5webengine-chromium/0001-Add-python3-build-support.patch create mode 100644 package/qt5/qt5webengine-chromium/0002-Don-t-rebase-sysroot-path.patch 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 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/qt5webengine-chromium/0001-Add-python3-build-support.patch b/package/qt5/qt5webengine-chromium/0001-Add-python3-build-support.patch new file mode 100644 index 0000000000..cc9726418e --- /dev/null +++ b/package/qt5/qt5webengine-chromium/0001-Add-python3-build-support.patch @@ -0,0 +1,1858 @@ +From bf94b834e9beb4e7bc25dbc4c61f5e2db39e7cdc Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Fri, 4 Feb 2022 15:43:35 -0700 +Subject: [PATCH] Add python3 build support + +Adapted from: +https://github.com/archlinux/svntogit-packages/blob/6edf5f1aaea952d046aff89a2e0175258fe77361/trunk/qt5-webengine-chromium-python3.patch + +Signed-off-by: James Hilliard +--- + .../protobufs/binary_proto_generator.py | 8 +- + .../tracing/generate_trace_viewer_grd.py | 2 +- + chromium/mojo/public/tools/bindings/BUILD.gn | 2 + + .../tools/bindings/gen_data_files_list.py | 8 +- + .../generators/mojom_java_generator.py | 4 + + .../tools/mojom/mojom/generate/generator.py | 14 ++-- + .../tools/mojom/mojom/generate/module.py | 3 +- + .../mojom/mojom/generate/template_expander.py | 12 +-- + .../scripts/bind_gen/blink_v8_bridge.py | 6 +- + .../scripts/bind_gen/callback_interface.py | 2 +- + .../bindings/scripts/bind_gen/code_node.py | 10 +-- + .../bindings/scripts/bind_gen/codegen_expr.py | 15 ++-- + .../scripts/bind_gen/codegen_format.py | 2 +- + .../scripts/bind_gen/codegen_utils.py | 2 +- + .../bindings/scripts/bind_gen/dictionary.py | 2 +- + .../bindings/scripts/bind_gen/interface.py | 82 +++++++++++-------- + .../scripts/bind_gen/mako_renderer.py | 2 +- + .../bindings/scripts/bind_gen/style_format.py | 9 +- + .../bindings/scripts/bind_gen/task_queue.py | 5 +- + .../bindings/scripts/code_generator.py | 10 +++ + .../scripts/generate_origin_trial_features.py | 4 +- + .../bindings/scripts/idl_definitions.py | 8 +- + .../renderer/bindings/scripts/idl_reader.py | 4 +- + .../renderer/bindings/scripts/idl_types.py | 2 +- + .../renderer/bindings/scripts/utilities.py | 28 +++---- + .../renderer/bindings/scripts/v8_interface.py | 9 +- + .../renderer/bindings/scripts/v8_methods.py | 4 + + .../renderer/bindings/scripts/v8_utilities.py | 2 +- + .../scripts/web_idl/callback_interface.py | 12 +-- + .../bindings/scripts/web_idl/database.py | 2 +- + .../bindings/scripts/web_idl/exposure.py | 5 +- + .../bindings/scripts/web_idl/function_like.py | 28 +++---- + .../bindings/scripts/web_idl/idl_compiler.py | 21 ++--- + .../bindings/scripts/web_idl/interface.py | 45 +++++----- + .../bindings/scripts/web_idl/ir_builder.py | 29 ++++--- + .../bindings/scripts/web_idl/make_copy.py | 7 ++ + .../bindings/scripts/web_idl/namespace.py | 12 +-- + .../bindings/templates/dictionary_v8.cc.tmpl | 8 +- + .../scripts/core/css/make_style_shorthands.py | 23 +++--- + .../properties/make_css_property_instances.py | 4 +- + .../blink/renderer/build/scripts/gperf.py | 2 +- + .../blink/renderer/build/scripts/in_file.py | 2 +- + .../renderer/build/scripts/in_generator.py | 5 ++ + .../build/scripts/make_runtime_features.py | 2 +- + .../scripts/templates/element_factory.cc.tmpl | 4 +- + .../templates/element_type_helpers.cc.tmpl | 4 +- + .../templates/element_type_helpers.h.tmpl | 2 +- + .../build/scripts/templates/macros.tmpl | 4 +- + .../templates/make_qualified_names.h.tmpl | 4 +- + .../dawn/generator/generator_lib.py | 4 + + .../devtools-frontend/src/BUILD.gn | 2 + + .../scripts/build/build_inspector_overlay.py | 3 +- + .../build/build_release_applications.py | 9 +- + .../scripts/build/generate_devtools_grd.py | 4 +- + .../src/scripts/build/modular_build.py | 6 +- + chromium/third_party/jinja2/tests.py | 2 +- + chromium/tools/metrics/ukm/gen_builders.py | 5 +- + .../ui/ozone/generate_constructor_list.py | 13 ++- + .../ui/ozone/generate_ozone_platform_list.py | 26 ++++-- + 59 files changed, 331 insertions(+), 229 deletions(-) + +diff --git a/chromium/components/resources/protobufs/binary_proto_generator.py b/chromium/components/resources/protobufs/binary_proto_generator.py +index 7422ead9697..16365515f26 100755 +--- a/chromium/components/resources/protobufs/binary_proto_generator.py ++++ b/chromium/components/resources/protobufs/binary_proto_generator.py +@@ -7,7 +7,7 @@ + Converts a given ASCII proto into a binary resource. + + """ +- ++from __future__ import print_function + import abc + import imp + import optparse +@@ -196,12 +196,12 @@ class BinaryProtoGenerator: + self._ImportProtoModules(opts.path) + + if not self.VerifyArgs(opts): +- print "Wrong arguments" ++ print("Wrong arguments") + return 1 + + try: + self._GenerateBinaryProtos(opts) + except Exception as e: +- print "ERROR: Failed to render binary version of %s:\n %s\n%s" % ( +- opts.infile, str(e), traceback.format_exc()) ++ print("ERROR: Failed to render binary version of %s:\n %s\n%s" % ++ (opts.infile, str(e), traceback.format_exc())) + return 1 +diff --git a/chromium/content/browser/tracing/generate_trace_viewer_grd.py b/chromium/content/browser/tracing/generate_trace_viewer_grd.py +index 037f9497dc2..be393d21f90 100755 +--- a/chromium/content/browser/tracing/generate_trace_viewer_grd.py ++++ b/chromium/content/browser/tracing/generate_trace_viewer_grd.py +@@ -74,7 +74,7 @@ def main(argv): + for filename in parsed_args.source_files: + add_file_to_grd(doc, os.path.basename(filename)) + +- with open(parsed_args.output_filename, 'w') as output_file: ++ with open(parsed_args.output_filename, 'wb') as output_file: + output_file.write(doc.toxml(encoding='UTF-8')) + + +diff --git a/chromium/mojo/public/tools/bindings/BUILD.gn b/chromium/mojo/public/tools/bindings/BUILD.gn +index fc04b5dd0b1..708958e438b 100644 +--- a/chromium/mojo/public/tools/bindings/BUILD.gn ++++ b/chromium/mojo/public/tools/bindings/BUILD.gn +@@ -2,9 +2,11 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import("//build/config/python.gni") + import("//mojo/public/tools/bindings/mojom.gni") + import("//third_party/jinja2/jinja2.gni") + ++# TODO(crbug.com/1194274): Investigate nondeterminism in Py3 builds. + action("precompile_templates") { + sources = mojom_generator_sources + sources += [ +diff --git a/chromium/mojo/public/tools/bindings/gen_data_files_list.py b/chromium/mojo/public/tools/bindings/gen_data_files_list.py +index 79c9e50efce..8b78d092418 100644 +--- a/chromium/mojo/public/tools/bindings/gen_data_files_list.py ++++ b/chromium/mojo/public/tools/bindings/gen_data_files_list.py +@@ -18,7 +18,6 @@ import os + import re + import sys + +-from cStringIO import StringIO + from optparse import OptionParser + + sys.path.insert( +@@ -41,12 +40,9 @@ def main(): + pattern = re.compile(options.pattern) + files = [f for f in os.listdir(options.directory) if pattern.match(f)] + +- stream = StringIO() +- for f in files: +- print(f, file=stream) ++ contents = '\n'.join(f for f in files) + '\n' ++ WriteFile(contents, options.output) + +- WriteFile(stream.getvalue(), options.output) +- stream.close() + + if __name__ == '__main__': + sys.exit(main()) +diff --git a/chromium/mojo/public/tools/bindings/generators/mojom_java_generator.py b/chromium/mojo/public/tools/bindings/generators/mojom_java_generator.py +index 96b2fdfae0c..00b9dccd00c 100644 +--- a/chromium/mojo/public/tools/bindings/generators/mojom_java_generator.py ++++ b/chromium/mojo/public/tools/bindings/generators/mojom_java_generator.py +@@ -25,6 +25,10 @@ sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir, + 'build', 'android', 'gyp')) + from util import build_utils + ++# TODO(crbug.com/1174969): Remove this once Python2 is obsoleted. ++if sys.version_info.major != 2: ++ basestring = str ++ long = int + + GENERATOR_PREFIX = 'java' + +diff --git a/chromium/mojo/public/tools/mojom/mojom/generate/generator.py b/chromium/mojo/public/tools/mojom/mojom/generate/generator.py +index de62260a5c9..4a1c73fcf82 100644 +--- a/chromium/mojo/public/tools/mojom/mojom/generate/generator.py ++++ b/chromium/mojo/public/tools/mojom/mojom/generate/generator.py +@@ -136,9 +136,14 @@ class Stylizer(object): + + def WriteFile(contents, full_path): + # If |contents| is same with the file content, we skip updating. ++ if not isinstance(contents, bytes): ++ data = contents.encode('utf8') ++ else: ++ data = contents ++ + if os.path.isfile(full_path): + with open(full_path, 'rb') as destination_file: +- if destination_file.read() == contents: ++ if destination_file.read() == data: + return + + # Make sure the containing directory exists. +@@ -146,11 +151,8 @@ def WriteFile(contents, full_path): + fileutil.EnsureDirectoryExists(full_dir) + + # Dump the data to disk. +- with open(full_path, "wb") as f: +- if not isinstance(contents, bytes): +- f.write(contents.encode('utf-8')) +- else: +- f.write(contents) ++ with open(full_path, 'wb') as f: ++ f.write(data) + + + def AddComputedData(module): +diff --git a/chromium/mojo/public/tools/mojom/mojom/generate/module.py b/chromium/mojo/public/tools/mojom/mojom/generate/module.py +index ebbc9b322ea..3d026429bbc 100644 +--- a/chromium/mojo/public/tools/mojom/mojom/generate/module.py ++++ b/chromium/mojo/public/tools/mojom/mojom/generate/module.py +@@ -398,7 +398,8 @@ class Field(object): + + + class StructField(Field): +- pass ++ def __hash__(self): ++ return super(Field, self).__hash__() + + + class UnionField(Field): +diff --git a/chromium/mojo/public/tools/mojom/mojom/generate/template_expander.py b/chromium/mojo/public/tools/mojom/mojom/generate/template_expander.py +index 7a300560246..8d9e26fb7f6 100644 +--- a/chromium/mojo/public/tools/mojom/mojom/generate/template_expander.py ++++ b/chromium/mojo/public/tools/mojom/mojom/generate/template_expander.py +@@ -75,9 +75,9 @@ def PrecompileTemplates(generator_modules, output_dir): + os.path.dirname(module.__file__), generator.GetTemplatePrefix()) + ])) + jinja_env.filters.update(generator.GetFilters()) +- jinja_env.compile_templates( +- os.path.join(output_dir, "%s.zip" % generator.GetTemplatePrefix()), +- extensions=["tmpl"], +- zip="stored", +- py_compile=True, +- ignore_errors=False) ++ jinja_env.compile_templates(os.path.join( ++ output_dir, "%s.zip" % generator.GetTemplatePrefix()), ++ extensions=["tmpl"], ++ zip="stored", ++ py_compile=sys.version_info.major < 3, ++ ignore_errors=False) +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/blink_v8_bridge.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/blink_v8_bridge.py +index 3225ecca6e4..fc078d31b55 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/blink_v8_bridge.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/blink_v8_bridge.py +@@ -344,7 +344,7 @@ def make_default_value_expr(idl_type, default_value): + """ + assert default_value.is_type_compatible_with(idl_type) + +- class DefaultValueExpr: ++ class DefaultValueExpr(object): + _ALLOWED_SYMBOLS_IN_DEPS = ("isolate") + + def __init__(self, initializer_expr, initializer_deps, +@@ -502,7 +502,7 @@ def make_v8_to_blink_value(blink_var_name, + assert isinstance(blink_var_name, str) + assert isinstance(v8_value_expr, str) + assert isinstance(idl_type, web_idl.IdlType) +- assert (argument_index is None or isinstance(argument_index, (int, long))) ++ assert (argument_index is None or isinstance(argument_index, int)) + assert (default_value is None + or isinstance(default_value, web_idl.LiteralConstant)) + +@@ -622,7 +622,7 @@ def make_v8_to_blink_value_variadic(blink_var_name, v8_array, + """ + assert isinstance(blink_var_name, str) + assert isinstance(v8_array, str) +- assert isinstance(v8_array_start_index, (int, long)) ++ assert isinstance(v8_array_start_index, int) + assert isinstance(idl_type, web_idl.IdlType) + + pattern = ("auto&& ${{{_1}}} = " +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/callback_interface.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/callback_interface.py +index 4a6df513068..8b51f23a409 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/callback_interface.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/callback_interface.py +@@ -177,7 +177,7 @@ def generate_callback_interface(callback_interface_identifier): + prop_install_mode=PropInstallMode.UNCONDITIONAL, + trampoline_var_name=None, + attribute_entries=[], +- constant_entries=filter(is_unconditional, constant_entries), ++ constant_entries=list(filter(is_unconditional, constant_entries)), + exposed_construct_entries=[], + operation_entries=[]) + (install_interface_template_decl, install_interface_template_def, +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/code_node.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/code_node.py +index 52972fefe20..e5ae9d9629e 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/code_node.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/code_node.py +@@ -503,13 +503,13 @@ class CompositeNode(CodeNode): + gensym_kwargs = {} + template_vars = {} + for arg in args: +- assert isinstance(arg, (CodeNode, int, long, str)) ++ assert isinstance(arg, (CodeNode, int, str)) + gensym = CodeNode.gensym() + gensym_args.append("${{{}}}".format(gensym)) + template_vars[gensym] = arg + for key, value in kwargs.items(): +- assert isinstance(key, (int, long, str)) +- assert isinstance(value, (CodeNode, int, long, str)) ++ assert isinstance(key, (int, str)) ++ assert isinstance(value, (CodeNode, int, str)) + gensym = CodeNode.gensym() + gensym_kwargs[key] = "${{{}}}".format(gensym) + template_vars[gensym] = value +@@ -602,7 +602,7 @@ class ListNode(CodeNode): + def insert(self, index, node): + if node is None: + return +- assert isinstance(index, (int, long)) ++ assert isinstance(index, int) + assert isinstance(node, CodeNode) + assert node.outer is None and node.prev is None + +@@ -721,7 +721,7 @@ class SymbolScopeNode(SequenceNode): + if not scope_chains: + return counts + +- self_index = iter(scope_chains).next().index(self) ++ self_index = next(iter(scope_chains)).index(self) + scope_chains = map( + lambda scope_chain: scope_chain[self_index + 1:], scope_chains) + scope_to_likeliness = {} +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_expr.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_expr.py +index a229a6c71c9..5fa288dabf2 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_expr.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_expr.py +@@ -109,7 +109,7 @@ def expr_and(terms): + + if any(term.is_always_false for term in terms): + return _Expr(False) +- terms = filter(lambda x: not x.is_always_true, terms) ++ terms = list(filter(lambda x: not x.is_always_true, terms)) + if not terms: + return _Expr(True) + if len(terms) == 1: +@@ -124,7 +124,7 @@ def expr_or(terms): + + if any(term.is_always_true for term in terms): + return _Expr(True) +- terms = filter(lambda x: not x.is_always_false, terms) ++ terms = list(filter(lambda x: not x.is_always_false, terms)) + if not terms: + return _Expr(False) + if len(terms) == 1: +@@ -222,7 +222,7 @@ def expr_from_exposure(exposure, + elif exposure.only_in_secure_contexts is False: + secure_context_term = _Expr(True) + else: +- terms = map(ref_enabled, exposure.only_in_secure_contexts) ++ terms = list(map(ref_enabled, exposure.only_in_secure_contexts)) + secure_context_term = expr_or( + [_Expr("${is_in_secure_context}"), + expr_not(expr_and(terms))]) +@@ -275,10 +275,11 @@ def expr_from_exposure(exposure, + + # [ContextEnabled] + if exposure.context_enabled_features: +- terms = map( +- lambda feature: _Expr( +- "${{context_feature_settings}}->is{}Enabled()".format( +- feature)), exposure.context_enabled_features) ++ terms = list( ++ map( ++ lambda feature: _Expr( ++ "${{context_feature_settings}}->is{}Enabled()".format( ++ feature)), exposure.context_enabled_features)) + context_enabled_terms.append( + expr_and([_Expr("${context_feature_settings}"), + expr_or(terms)])) +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_format.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_format.py +index 87d26eec3ca..f3e9d38247e 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_format.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_format.py +@@ -23,7 +23,7 @@ class _TemplateFormatter(string.Formatter): + self._template_formatter_indexing_count_ = 0 + + def get_value(self, key, args, kwargs): +- if isinstance(key, (int, long)): ++ if isinstance(key, int): + return args[key] + assert isinstance(key, str) + if not key: +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_utils.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_utils.py +index 2bcc4fed49a..e72282aa696 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_utils.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_utils.py +@@ -116,4 +116,4 @@ def write_code_node_to_file(code_node, filepath): + # stderr=format_result.error_message)) + # + # web_idl.file_io.write_to_file_if_changed(filepath, format_result.contents) +- web_idl.file_io.write_to_file_if_changed(filepath, rendered_text) ++ web_idl.file_io.write_to_file_if_changed(filepath, rendered_text.encode('utf-8')) +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/dictionary.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/dictionary.py +index b39f0100410..4d68202296b 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/dictionary.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/dictionary.py +@@ -993,7 +993,7 @@ def make_dict_trace_func(cg_context): + _2 = _blink_member_name(member).value_var + return TextNode(_format(pattern, _1=_1, _2=_2)) + +- body.extend(map(make_trace_member_node, own_members)) ++ body.extend(list(map(make_trace_member_node, own_members))) + body.append(TextNode("BaseClass::Trace(visitor);")) + + return func_decl, func_def +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py +index 10ff30656ad..bfdf7128aac 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py +@@ -582,7 +582,7 @@ def _make_blink_api_call(code_node, + overriding_args=None): + assert isinstance(code_node, SymbolScopeNode) + assert isinstance(cg_context, CodeGenContext) +- assert num_of_args is None or isinstance(num_of_args, (int, long)) ++ assert num_of_args is None or isinstance(num_of_args, int) + assert (overriding_args is None + or (isinstance(overriding_args, (list, tuple)) + and all(isinstance(arg, str) for arg in overriding_args))) +@@ -1196,8 +1196,10 @@ def make_overload_dispatcher(cg_context): + did_use_break = did_use_break or can_fail + + conditional = expr_or( +- map(lambda item: expr_from_exposure(item.function_like.exposure), +- items)) ++ list( ++ map( ++ lambda item: expr_from_exposure(item.function_like.exposure ++ ), items))) + if not conditional.is_always_true: + node = CxxUnlikelyIfNode(cond=conditional, body=node) + +@@ -4642,7 +4644,7 @@ class _PropEntryConstructorGroup(_PropEntryBase): + def __init__(self, is_context_dependent, exposure_conditional, world, + constructor_group, ctor_callback_name, ctor_func_length): + assert isinstance(ctor_callback_name, str) +- assert isinstance(ctor_func_length, (int, long)) ++ assert isinstance(ctor_func_length, int) + + _PropEntryBase.__init__(self, is_context_dependent, + exposure_conditional, world, constructor_group) +@@ -4670,7 +4672,7 @@ class _PropEntryOperationGroup(_PropEntryBase): + op_func_length, + no_alloc_direct_callback_name=None): + assert isinstance(op_callback_name, str) +- assert isinstance(op_func_length, (int, long)) ++ assert isinstance(op_func_length, int) + + _PropEntryBase.__init__(self, is_context_dependent, + exposure_conditional, world, operation_group) +@@ -5175,9 +5177,9 @@ def make_install_interface_template(cg_context, function_name, class_name, api_c + ]) + + if class_like.identifier == "CSSStyleDeclaration": +- css_properties = filter( +- lambda attr: "CSSProperty" in attr.extended_attributes, +- class_like.attributes) ++ css_properties = list( ++ filter(lambda attr: "CSSProperty" in attr.extended_attributes, ++ class_like.attributes)) + if css_properties: + prop_name_list = "".join( + map(lambda attr: "\"{}\", ".format(attr.identifier), +@@ -5567,8 +5569,8 @@ ${instance_object} = ${v8_context}->Global()->GetPrototype().As();\ + "V8DOMConfiguration::InstallConstants(${isolate}, " + "${interface_template}, ${prototype_template}, " + "kConstantCallbackTable, base::size(kConstantCallbackTable));") +- constant_callback_entries = filter(lambda entry: entry.const_callback_name, +- constant_entries) ++ constant_callback_entries = list(filter(lambda entry: entry.const_callback_name, ++ constant_entries)) + install_properties(table_name, constant_callback_entries, + _make_constant_callback_registration_table, + installer_call_text) +@@ -5584,8 +5586,8 @@ ${instance_object} = ${v8_context}->Global()->GetPrototype().As();\ + "V8DOMConfiguration::InstallConstants(${isolate}, " + "${interface_template}, ${prototype_template}, " + "kConstantValueTable, base::size(kConstantValueTable));") +- constant_value_entries = filter( +- lambda entry: not entry.const_callback_name, constant_entries) ++ constant_value_entries = list(filter( ++ lambda entry: not entry.const_callback_name, constant_entries)) + install_properties(table_name, constant_value_entries, + _make_constant_value_registration_table, + installer_call_text) +@@ -6336,8 +6338,8 @@ def make_v8_context_snapshot_api(cg_context, component, attribute_entries, + assert isinstance(component, web_idl.Component) + + derived_interfaces = cg_context.interface.deriveds +- derived_names = map(lambda interface: interface.identifier, +- derived_interfaces) ++ derived_names = list( ++ map(lambda interface: interface.identifier, derived_interfaces)) + derived_names.append(cg_context.interface.identifier) + if not ("Window" in derived_names or "HTMLDocument" in derived_names): + return None, None +@@ -6411,9 +6413,11 @@ def _make_v8_context_snapshot_get_reference_table_function( + collect_callbacks(named_properties_object_callback_defs) + collect_callbacks(cross_origin_property_callback_defs) + +- entry_nodes = map( +- lambda name: TextNode("reinterpret_cast({}),".format(name)), +- filter(None, callback_names)) ++ entry_nodes = list( ++ map( ++ lambda name: TextNode("reinterpret_cast({}),".format(name ++ )), ++ filter(None, callback_names))) + table_node = ListNode([ + TextNode("using namespace ${class_name}Callbacks;"), + TextNode("static const intptr_t kReferenceTable[] = {"), +@@ -6451,10 +6455,11 @@ def _make_v8_context_snapshot_install_props_per_context_function( + class_name=None, + prop_install_mode=PropInstallMode.V8_CONTEXT_SNAPSHOT, + trampoline_var_name=None, +- attribute_entries=filter(selector, attribute_entries), +- constant_entries=filter(selector, constant_entries), +- exposed_construct_entries=filter(selector, exposed_construct_entries), +- operation_entries=filter(selector, operation_entries)) ++ attribute_entries=list(filter(selector, attribute_entries)), ++ constant_entries=list(filter(selector, constant_entries)), ++ exposed_construct_entries=list( ++ filter(selector, exposed_construct_entries)), ++ operation_entries=list(filter(selector, operation_entries))) + + return func_decl, func_def + +@@ -6810,11 +6815,11 @@ def generate_interface(interface_identifier): + class_name=impl_class_name, + prop_install_mode=PropInstallMode.UNCONDITIONAL, + trampoline_var_name=tp_install_unconditional_props, +- attribute_entries=filter(is_unconditional, attribute_entries), +- constant_entries=filter(is_unconditional, constant_entries), +- exposed_construct_entries=filter(is_unconditional, +- exposed_construct_entries), +- operation_entries=filter(is_unconditional, operation_entries)) ++ attribute_entries=list(filter(is_unconditional, attribute_entries)), ++ constant_entries=list(filter(is_unconditional, constant_entries)), ++ exposed_construct_entries=list( ++ filter(is_unconditional, exposed_construct_entries)), ++ operation_entries=list(filter(is_unconditional, operation_entries))) + (install_context_independent_props_decl, + install_context_independent_props_def, + install_context_independent_props_trampoline) = make_install_properties( +@@ -6823,11 +6828,14 @@ def generate_interface(interface_identifier): + class_name=impl_class_name, + prop_install_mode=PropInstallMode.CONTEXT_INDEPENDENT, + trampoline_var_name=tp_install_context_independent_props, +- attribute_entries=filter(is_context_independent, attribute_entries), +- constant_entries=filter(is_context_independent, constant_entries), +- exposed_construct_entries=filter(is_context_independent, +- exposed_construct_entries), +- operation_entries=filter(is_context_independent, operation_entries)) ++ attribute_entries=list( ++ filter(is_context_independent, attribute_entries)), ++ constant_entries=list(filter(is_context_independent, ++ constant_entries)), ++ exposed_construct_entries=list( ++ filter(is_context_independent, exposed_construct_entries)), ++ operation_entries=list( ++ filter(is_context_independent, operation_entries))) + (install_context_dependent_props_decl, install_context_dependent_props_def, + install_context_dependent_props_trampoline) = make_install_properties( + cg_context, +@@ -6835,11 +6843,13 @@ def generate_interface(interface_identifier): + class_name=impl_class_name, + prop_install_mode=PropInstallMode.CONTEXT_DEPENDENT, + trampoline_var_name=tp_install_context_dependent_props, +- attribute_entries=filter(is_context_dependent, attribute_entries), +- constant_entries=filter(is_context_dependent, constant_entries), +- exposed_construct_entries=filter(is_context_dependent, +- exposed_construct_entries), +- operation_entries=filter(is_context_dependent, operation_entries)) ++ attribute_entries=list(filter(is_context_dependent, ++ attribute_entries)), ++ constant_entries=list(filter(is_context_dependent, constant_entries)), ++ exposed_construct_entries=list( ++ filter(is_context_dependent, exposed_construct_entries)), ++ operation_entries=list(filter(is_context_dependent, ++ operation_entries))) + (install_interface_template_decl, install_interface_template_def, + install_interface_template_trampoline) = make_install_interface_template( + cg_context, +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/mako_renderer.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/mako_renderer.py +index b4c70553863..f3a2fcd772d 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/mako_renderer.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/mako_renderer.py +@@ -105,7 +105,7 @@ class MakoRenderer(object): + on_error = self._caller_stack_on_error + if (len(current) <= len(on_error) + and all(current[i] == on_error[i] +- for i in xrange(len(current)))): ++ for i in range(len(current)))): + pass # Error happened in a deeper caller. + else: + self._caller_stack_on_error = list(self._caller_stack) +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py +index dc3493cc394..017d3d47bb3 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py +@@ -70,8 +70,13 @@ def gn_format(contents, filename=None): + + + def _invoke_format_command(command_line, filename, contents): +- proc = subprocess.Popen( +- command_line, stdin=subprocess.PIPE, stdout=subprocess.PIPE) ++ kwargs = {} ++ if sys.version_info.major != 2: ++ kwargs['encoding'] = 'utf-8' ++ proc = subprocess.Popen(command_line, ++ stdin=subprocess.PIPE, ++ stdout=subprocess.PIPE, ++ **kwargs) + stdout_output, stderr_output = proc.communicate(input=contents) + exit_code = proc.wait() + +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/task_queue.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/task_queue.py +index 0d8f4c0f303..e666a9b668e 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/task_queue.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/task_queue.py +@@ -2,6 +2,7 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import functools + import multiprocessing + + from .package_initializer import package_initializer +@@ -76,7 +77,7 @@ class TaskQueue(object): + if not report_progress: + return + +- done_count = reduce( ++ done_count = functools.reduce( + lambda count, worker_task: count + bool(worker_task.ready()), + self._worker_tasks, 0) + report_progress(len(self._worker_tasks), done_count) +@@ -85,4 +86,4 @@ class TaskQueue(object): + def _task_queue_run_tasks(tasks): + for task in tasks: + func, args, kwargs = task +- apply(func, args, kwargs) ++ func(*args, **kwargs) +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/code_generator.py b/chromium/third_party/blink/renderer/bindings/scripts/code_generator.py +index e8280be7213..e49e6eb965e 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/code_generator.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/code_generator.py +@@ -13,6 +13,7 @@ import re + import sys + + from idl_types import set_ancestors, IdlType ++from itertools import groupby + from v8_globals import includes + from v8_interface import constant_filters + from v8_types import set_component_dirs +@@ -43,6 +44,7 @@ TEMPLATES_DIR = os.path.normpath( + # after path[0] == invoking script dir + sys.path.insert(1, THIRD_PARTY_DIR) + import jinja2 ++from jinja2.filters import make_attrgetter, environmentfilter + + + def generate_indented_conditional(code, conditional): +@@ -88,6 +90,13 @@ def runtime_enabled_if(code, name): + return generate_indented_conditional(code, function) + + ++ at environmentfilter ++def do_stringify_key_group_by(environment, value, attribute): ++ expr = make_attrgetter(environment, attribute) ++ key = lambda item: '' if expr(item) is None else str(expr(item)) ++ return groupby(sorted(value, key=key), expr) ++ ++ + def initialize_jinja_env(cache_dir): + jinja_env = jinja2.Environment( + loader=jinja2.FileSystemLoader(TEMPLATES_DIR), +@@ -117,6 +126,7 @@ def initialize_jinja_env(cache_dir): + }) + jinja_env.filters.update(constant_filters()) + jinja_env.filters.update(method_filters()) ++ jinja_env.filters["stringifykeygroupby"] = do_stringify_key_group_by + return jinja_env + + +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/generate_origin_trial_features.py b/chromium/third_party/blink/renderer/bindings/scripts/generate_origin_trial_features.py +index 130004eae83..04c0fabcef2 100755 +--- a/chromium/third_party/blink/renderer/bindings/scripts/generate_origin_trial_features.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/generate_origin_trial_features.py +@@ -80,7 +80,7 @@ def read_idl_file(reader, idl_filename): + assert len(interfaces) == 1, ( + "Expected one interface in file %r, found %d" % + (idl_filename, len(interfaces))) +- return (interfaces.values()[0], includes) ++ return (list(interfaces.values())[0], includes) + + + def interface_is_global(interface): +@@ -281,7 +281,7 @@ def main(): + + info_provider = create_component_info_provider( + os.path.normpath(options.info_dir), options.target_component) +- idl_filenames = map(str.strip, open(options.idl_files_list)) ++ idl_filenames = list(map(str.strip, open(options.idl_files_list))) + + generate_origin_trial_features(info_provider, options, idl_filenames) + return 0 +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/idl_definitions.py b/chromium/third_party/blink/renderer/bindings/scripts/idl_definitions.py +index 14e6e9d3f87..b027818aef2 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/idl_definitions.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/idl_definitions.py +@@ -394,7 +394,8 @@ class IdlInterface(object): + else: + raise ValueError('Unrecognized node class: %s' % child_class) + +- if len(filter(None, [self.iterable, self.maplike, self.setlike])) > 1: ++ if len(list(filter(None, ++ [self.iterable, self.maplike, self.setlike]))) > 1: + raise ValueError( + 'Interface can only have one of iterable<>, maplike<> and setlike<>.' + ) +@@ -512,6 +513,9 @@ class IdlAttribute(TypedObject): + def accept(self, visitor): + visitor.visit_attribute(self) + ++ def __lt__(self, other): ++ return self.name < other.name ++ + + ################################################################################ + # Constants +@@ -852,7 +856,7 @@ class IdlIncludes(object): + ################################################################################ + + +-class Exposure: ++class Exposure(object): + """An Exposure holds one Exposed or RuntimeEnabled condition. + Each exposure has two properties: exposed and runtime_enabled. + Exposure(e, r) corresponds to [Exposed(e r)]. Exposure(e) corresponds to +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/idl_reader.py b/chromium/third_party/blink/renderer/bindings/scripts/idl_reader.py +index 8d72865a6ca..b80eebdcd61 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/idl_reader.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/idl_reader.py +@@ -55,8 +55,8 @@ def validate_blink_idl_definitions(idl_filename, idl_file_basename, + definitions. There is no filename convention in this case. + - Otherwise, an IDL file is invalid. + """ +- targets = ( +- definitions.interfaces.values() + definitions.dictionaries.values()) ++ targets = (list(definitions.interfaces.values()) + ++ list(definitions.dictionaries.values())) + number_of_targets = len(targets) + if number_of_targets > 1: + raise Exception( +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/idl_types.py b/chromium/third_party/blink/renderer/bindings/scripts/idl_types.py +index cd4f0c3513b..ab95e9c0b08 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/idl_types.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/idl_types.py +@@ -349,7 +349,7 @@ class IdlUnionType(IdlTypeBase): + return True + + def single_matching_member_type(self, predicate): +- matching_types = filter(predicate, self.flattened_member_types) ++ matching_types = list(filter(predicate, self.flattened_member_types)) + if len(matching_types) > 1: + raise ValueError('%s is ambiguous.' % self.name) + return matching_types[0] if matching_types else None +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/utilities.py b/chromium/third_party/blink/renderer/bindings/scripts/utilities.py +index e1677ee7bd6..3c5006f064f 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/utilities.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/utilities.py +@@ -196,8 +196,9 @@ class ComponentInfoProviderModules(ComponentInfoProvider): + + @property + def callback_functions(self): +- return dict(self._component_info_core['callback_functions'].items() + +- self._component_info_modules['callback_functions'].items()) ++ return dict( ++ list(self._component_info_core['callback_functions'].items()) + ++ list(self._component_info_modules['callback_functions'].items())) + + @property + def specifier_for_export(self): +@@ -209,8 +210,8 @@ class ComponentInfoProviderModules(ComponentInfoProvider): + + + def load_interfaces_info_overall_pickle(info_dir): +- with open(os.path.join(info_dir, +- 'interfaces_info.pickle')) as interface_info_file: ++ with open(os.path.join(info_dir, 'interfaces_info.pickle'), ++ mode='rb') as interface_info_file: + return pickle.load(interface_info_file) + + +@@ -236,23 +237,20 @@ def merge_dict_recursively(target, diff): + + def create_component_info_provider_core(info_dir): + interfaces_info = load_interfaces_info_overall_pickle(info_dir) +- with open( +- os.path.join(info_dir, 'core', +- 'component_info_core.pickle')) as component_info_file: ++ with open(os.path.join(info_dir, 'core', 'component_info_core.pickle'), ++ mode='rb') as component_info_file: + component_info = pickle.load(component_info_file) + return ComponentInfoProviderCore(interfaces_info, component_info) + + + def create_component_info_provider_modules(info_dir): + interfaces_info = load_interfaces_info_overall_pickle(info_dir) +- with open( +- os.path.join(info_dir, 'core', +- 'component_info_core.pickle')) as component_info_file: ++ with open(os.path.join(info_dir, 'core', 'component_info_core.pickle'), ++ mode='rb') as component_info_file: + component_info_core = pickle.load(component_info_file) +- with open( +- os.path.join( +- info_dir, 'modules', +- 'component_info_modules.pickle')) as component_info_file: ++ with open(os.path.join(info_dir, 'modules', ++ 'component_info_modules.pickle'), ++ mode='rb') as component_info_file: + component_info_modules = pickle.load(component_info_file) + return ComponentInfoProviderModules(interfaces_info, component_info_core, + component_info_modules) +@@ -356,7 +354,7 @@ def write_pickle_file(pickle_filename, data): + pickle_filename = abs(pickle_filename) + # If |data| is same with the file content, we skip updating. + if os.path.isfile(pickle_filename): +- with open(pickle_filename) as pickle_file: ++ with open(pickle_filename, 'rb') as pickle_file: + try: + if pickle.load(pickle_file) == data: + return +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/v8_interface.py b/chromium/third_party/blink/renderer/bindings/scripts/v8_interface.py +index a43260414db..a85b03abe75 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/v8_interface.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/v8_interface.py +@@ -189,7 +189,7 @@ def context_enabled_features(attributes): + return sorted([ + member for member in members + if member.get(KEY) and not member.get('exposed_test') +- ]) ++ ], key=lambda item: item['name']) + + def member_filter_by_name(members, name): + return [member for member in members if member[KEY] == name] +@@ -612,7 +612,8 @@ def interface_context(interface, interfaces, component_info): + sorted( + origin_trial_features(interface, context['constants'], + context['attributes'], context['methods']) + +- context_enabled_features(context['attributes'])), ++ context_enabled_features(context['attributes']), ++ key=lambda item: item['name']), + }) + if context['optional_features']: + includes.add('platform/bindings/v8_per_context_data.h') +@@ -1356,9 +1357,9 @@ def resolution_tests_methods(effective_overloads): + + # Extract argument and IDL type to simplify accessing these in each loop. + arguments = [method['arguments'][index] for method in methods] +- arguments_methods = zip(arguments, methods) ++ arguments_methods = list(zip(arguments, methods)) + idl_types = [argument['idl_type_object'] for argument in arguments] +- idl_types_methods = zip(idl_types, methods) ++ idl_types_methods = list(zip(idl_types, methods)) + + # We can?t do a single loop through all methods or simply sort them, because + # a method may be listed in multiple steps of the resolution algorithm, and +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/v8_methods.py b/chromium/third_party/blink/renderer/bindings/scripts/v8_methods.py +index 5f1f89a3def..6ee8a407798 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/v8_methods.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/v8_methods.py +@@ -46,6 +46,10 @@ import v8_types + import v8_utilities + from v8_utilities import (has_extended_attribute_value, is_unforgeable) + ++# TODO: Remove this once Python2 is obsoleted. ++if sys.version_info.major != 2: ++ basestring = str ++ + + def method_is_visible(method, interface_is_partial): + if 'overloads' in method: +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/v8_utilities.py b/chromium/third_party/blink/renderer/bindings/scripts/v8_utilities.py +index 2ecd6923320..fcfc48371b1 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/v8_utilities.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/v8_utilities.py +@@ -271,7 +271,7 @@ EXPOSED_WORKERS = set([ + ]) + + +-class ExposureSet: ++class ExposureSet(object): + """An ExposureSet is a collection of Exposure instructions.""" + + def __init__(self, exposures=None): +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/callback_interface.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/callback_interface.py +index 13fb7c7068d..b73b7710687 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/callback_interface.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/callback_interface.py +@@ -91,11 +91,13 @@ class CallbackInterface(UserDefinedType, WithExtendedAttributes, + for operation_ir in ir.operations + ]) + self._operation_groups = tuple([ +- OperationGroup( +- operation_group_ir, +- filter(lambda x: x.identifier == operation_group_ir.identifier, +- self._operations), +- owner=self) for operation_group_ir in ir.operation_groups ++ OperationGroup(operation_group_ir, ++ list( ++ filter( ++ lambda x: x.identifier == operation_group_ir ++ .identifier, self._operations)), ++ owner=self) ++ for operation_group_ir in ir.operation_groups + ]) + + @property +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/database.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/database.py +index c92cf48eb2a..f5d59129449 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/database.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/database.py +@@ -156,4 +156,4 @@ class Database(object): + return self._view_by_kind(Database._Kind.UNION) + + def _view_by_kind(self, kind): +- return self._impl.find_by_kind(kind).values() ++ return list(self._impl.find_by_kind(kind).values()) +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/exposure.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/exposure.py +index abaeef39c30..e36cf7439ae 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/exposure.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/exposure.py +@@ -8,8 +8,11 @@ from .runtime_enabled_features import RuntimeEnabledFeatures + class _Feature(str): + """Represents a runtime-enabled feature.""" + ++ def __new__(cls, value): ++ return str.__new__(cls, value) ++ + def __init__(self, value): +- str.__init__(self, value) ++ str.__init__(self) + self._is_context_dependent = ( + RuntimeEnabledFeatures.is_context_dependent(self)) + +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/function_like.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/function_like.py +index 648c70d803d..1712f19c672 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/function_like.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/function_like.py +@@ -71,8 +71,9 @@ class FunctionLike(WithIdentifier): + def num_of_required_arguments(self): + """Returns the number of required arguments.""" + return len( +- filter(lambda arg: not (arg.is_optional or arg.is_variadic), +- self.arguments)) ++ list( ++ filter(lambda arg: not (arg.is_optional or arg.is_variadic), ++ self.arguments))) + + + class OverloadGroup(WithIdentifier): +@@ -171,8 +172,7 @@ class OverloadGroup(WithIdentifier): + Returns the effective overload set. + https://heycam.github.io/webidl/#compute-the-effective-overload-set + """ +- assert argument_count is None or isinstance(argument_count, +- (int, long)) ++ assert argument_count is None or isinstance(argument_count, int) + + N = argument_count + S = [] +@@ -188,21 +188,21 @@ class OverloadGroup(WithIdentifier): + + S.append( + OverloadGroup.EffectiveOverloadItem( +- X, map(lambda arg: arg.idl_type, X.arguments), +- map(lambda arg: arg.optionality, X.arguments))) ++ X, list(map(lambda arg: arg.idl_type, X.arguments)), ++ list(map(lambda arg: arg.optionality, X.arguments)))) + + if X.is_variadic: +- for i in xrange(n, max(maxarg, N)): +- t = map(lambda arg: arg.idl_type, X.arguments) +- o = map(lambda arg: arg.optionality, X.arguments) +- for _ in xrange(n, i + 1): ++ for i in range(n, max(maxarg, N)): ++ t = list(map(lambda arg: arg.idl_type, X.arguments)) ++ o = list(map(lambda arg: arg.optionality, X.arguments)) ++ for _ in range(n, i + 1): + t.append(X.arguments[-1].idl_type) + o.append(X.arguments[-1].optionality) + S.append(OverloadGroup.EffectiveOverloadItem(X, t, o)) + +- t = map(lambda arg: arg.idl_type, X.arguments) +- o = map(lambda arg: arg.optionality, X.arguments) +- for i in xrange(n - 1, -1, -1): ++ t = list(map(lambda arg: arg.idl_type, X.arguments)) ++ o = list(map(lambda arg: arg.optionality, X.arguments)) ++ for i in range(n - 1, -1, -1): + if X.arguments[i].optionality == IdlType.Optionality.REQUIRED: + break + S.append(OverloadGroup.EffectiveOverloadItem(X, t[:i], o[:i])) +@@ -222,7 +222,7 @@ class OverloadGroup(WithIdentifier): + for item in items) + assert len(items) > 1 + +- for index in xrange(len(items[0].type_list)): ++ for index in range(len(items[0].type_list)): + # Assume that the given items are valid, and we only need to test + # the two types. + if OverloadGroup.are_distinguishable_types( +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/idl_compiler.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/idl_compiler.py +index c5ee2bd8a3d..58315072480 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/idl_compiler.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/idl_compiler.py +@@ -149,8 +149,8 @@ class IdlCompiler(object): + for old_ir in old_irs: + new_ir = make_copy(old_ir) + self._ir_map.add(new_ir) +- new_ir.attributes = filter(not_disabled, new_ir.attributes) +- new_ir.operations = filter(not_disabled, new_ir.operations) ++ new_ir.attributes = list(filter(not_disabled, new_ir.attributes)) ++ new_ir.operations = list(filter(not_disabled, new_ir.operations)) + + def _record_defined_in_partial_and_mixin(self): + old_irs = self._ir_map.irs_of_kinds( +@@ -231,7 +231,7 @@ class IdlCompiler(object): + only_to_members_of_partial_or_mixin=False) + propagate_to_exposure(propagate) + +- map(process_member_like, ir.iter_all_members()) ++ list(map(process_member_like, ir.iter_all_members())) + + def process_member_like(ir): + propagate = functools.partial(propagate_extattr, ir=ir) +@@ -257,7 +257,7 @@ class IdlCompiler(object): + + self._ir_map.move_to_new_phase() + +- map(process_interface_like, old_irs) ++ list(map(process_interface_like, old_irs)) + + def _determine_blink_headers(self): + irs = self._ir_map.irs_of_kinds( +@@ -422,9 +422,9 @@ class IdlCompiler(object): + assert not new_interface.deriveds + derived_set = identifier_to_derived_set.get( + new_interface.identifier, set()) +- new_interface.deriveds = map( +- lambda id_: self._ref_to_idl_def_factory.create(id_), +- sorted(derived_set)) ++ new_interface.deriveds = list( ++ map(lambda id_: self._ref_to_idl_def_factory.create(id_), ++ sorted(derived_set))) + + def _supplement_missing_html_constructor_operation(self): + # Temporary mitigation of misuse of [HTMLConstructor] +@@ -553,7 +553,8 @@ class IdlCompiler(object): + self._ir_map.add(new_ir) + + for group in new_ir.iter_all_overload_groups(): +- exposures = map(lambda overload: overload.exposure, group) ++ exposures = list(map(lambda overload: overload.exposure, ++ group)) + + # [Exposed] + if any(not exposure.global_names_and_features +@@ -653,8 +654,8 @@ class IdlCompiler(object): + constructs = set() + for global_name in global_names: + constructs.update(exposed_map.get(global_name, [])) +- new_ir.exposed_constructs = map( +- self._ref_to_idl_def_factory.create, sorted(constructs)) ++ new_ir.exposed_constructs = list( ++ map(self._ref_to_idl_def_factory.create, sorted(constructs))) + + assert not new_ir.legacy_window_aliases + if new_ir.identifier != 'Window': +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/interface.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/interface.py +index 65d24e529d1..067ef2eb0b2 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/interface.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/interface.py +@@ -180,8 +180,9 @@ class Interface(UserDefinedType, WithExtendedAttributes, WithCodeGeneratorInfo, + self._constructor_groups = tuple([ + ConstructorGroup( + group_ir, +- filter(lambda x: x.identifier == group_ir.identifier, +- self._constructors), ++ list( ++ filter(lambda x: x.identifier == group_ir.identifier, ++ self._constructors)), + owner=self) for group_ir in ir.constructor_groups + ]) + assert len(self._constructor_groups) <= 1 +@@ -192,8 +193,9 @@ class Interface(UserDefinedType, WithExtendedAttributes, WithCodeGeneratorInfo, + self._named_constructor_groups = tuple([ + ConstructorGroup( + group_ir, +- filter(lambda x: x.identifier == group_ir.identifier, +- self._named_constructors), ++ list( ++ filter(lambda x: x.identifier == group_ir.identifier, ++ self._named_constructors)), + owner=self) for group_ir in ir.named_constructor_groups + ]) + self._operations = tuple([ +@@ -203,22 +205,23 @@ class Interface(UserDefinedType, WithExtendedAttributes, WithCodeGeneratorInfo, + self._operation_groups = tuple([ + OperationGroup( + group_ir, +- filter(lambda x: x.identifier == group_ir.identifier, +- self._operations), ++ list( ++ filter(lambda x: x.identifier == group_ir.identifier, ++ self._operations)), + owner=self) for group_ir in ir.operation_groups + ]) + self._exposed_constructs = tuple(ir.exposed_constructs) + self._legacy_window_aliases = tuple(ir.legacy_window_aliases) + self._indexed_and_named_properties = None +- indexed_and_named_property_operations = filter( +- lambda x: x.is_indexed_or_named_property_operation, +- self._operations) ++ indexed_and_named_property_operations = list( ++ filter(lambda x: x.is_indexed_or_named_property_operation, ++ self._operations)) + if indexed_and_named_property_operations: + self._indexed_and_named_properties = IndexedAndNamedProperties( + indexed_and_named_property_operations, owner=self) + self._stringifier = None +- stringifier_operation_irs = filter(lambda x: x.is_stringifier, +- ir.operations) ++ stringifier_operation_irs = list( ++ filter(lambda x: x.is_stringifier, ir.operations)) + if stringifier_operation_irs: + assert len(stringifier_operation_irs) == 1 + op_ir = make_copy(stringifier_operation_irs[0]) +@@ -231,8 +234,9 @@ class Interface(UserDefinedType, WithExtendedAttributes, WithCodeGeneratorInfo, + attribute = None + if operation.stringifier_attribute: + attr_id = operation.stringifier_attribute +- attributes = filter(lambda x: x.identifier == attr_id, +- self._attributes) ++ attributes = list( ++ filter(lambda x: x.identifier == attr_id, ++ self._attributes)) + assert len(attributes) == 1 + attribute = attributes[0] + self._stringifier = Stringifier(operation, attribute, owner=self) +@@ -578,8 +582,9 @@ class Iterable(WithDebugInfo): + self._operation_groups = tuple([ + OperationGroup( + group_ir, +- filter(lambda x: x.identifier == group_ir.identifier, +- self._operations), ++ list( ++ filter(lambda x: x.identifier == group_ir.identifier, ++ self._operations)), + owner=owner) for group_ir in ir.operation_groups + ]) + +@@ -666,8 +671,9 @@ class Maplike(WithDebugInfo): + self._operation_groups = tuple([ + OperationGroup( + group_ir, +- filter(lambda x: x.identifier == group_ir.identifier, +- self._operations), ++ list( ++ filter(lambda x: x.identifier == group_ir.identifier, ++ self._operations)), + owner=owner) for group_ir in ir.operation_groups + ]) + +@@ -755,8 +761,9 @@ class Setlike(WithDebugInfo): + self._operation_groups = tuple([ + OperationGroup( + group_ir, +- filter(lambda x: x.identifier == group_ir.identifier, +- self._operations), ++ list( ++ filter(lambda x: x.identifier == group_ir.identifier, ++ self._operations)), + owner=owner) for group_ir in ir.operation_groups + ]) + +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/ir_builder.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/ir_builder.py +index e9aeff4ab82..d80554d603e 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/ir_builder.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/ir_builder.py +@@ -2,6 +2,8 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import sys ++ + from .argument import Argument + from .ast_group import AstGroup + from .attribute import Attribute +@@ -30,6 +32,11 @@ from .operation import Operation + from .typedef import Typedef + + ++# TODO: Remove this once Python2 is obsoleted. ++if sys.version_info.major != 2: ++ long = int ++ ++ + def load_and_register_idl_definitions(filepaths, register_ir, + create_ref_to_idl_def, idl_type_factory): + """ +@@ -160,7 +167,7 @@ class _IRBuilder(object): + child_nodes = list(node.GetChildren()) + extended_attributes = self._take_extended_attributes(child_nodes) + +- members = map(self._build_interface_member, child_nodes) ++ members = list(map(self._build_interface_member, child_nodes)) + attributes = [] + constants = [] + operations = [] +@@ -302,7 +309,7 @@ class _IRBuilder(object): + child_nodes = list(node.GetChildren()) + inherited = self._take_inheritance(child_nodes) + extended_attributes = self._take_extended_attributes(child_nodes) +- own_members = map(self._build_dictionary_member, child_nodes) ++ own_members = list(map(self._build_dictionary_member, child_nodes)) + + return Dictionary.IR( + identifier=Identifier(node.GetName()), +@@ -336,7 +343,7 @@ class _IRBuilder(object): + + child_nodes = list(node.GetChildren()) + extended_attributes = self._take_extended_attributes(child_nodes) +- members = map(self._build_interface_member, child_nodes) ++ members = list(map(self._build_interface_member, child_nodes)) + constants = [] + operations = [] + for member in members: +@@ -456,8 +463,8 @@ class _IRBuilder(object): + assert len(child_nodes) == 1 + child = child_nodes[0] + if child.GetClass() == 'Arguments': +- arguments = map(build_extattr_argument, +- child.GetChildren()) ++ arguments = list( ++ map(build_extattr_argument, child.GetChildren())) + elif child.GetClass() == 'Call': + assert len(child.GetChildren()) == 1 + grand_child = child.GetChildren()[0] +@@ -486,7 +493,9 @@ class _IRBuilder(object): + + assert node.GetClass() == 'ExtAttributes' + return ExtendedAttributes( +- filter(None, map(build_extended_attribute, node.GetChildren()))) ++ list( ++ filter(None, map(build_extended_attribute, ++ node.GetChildren())))) + + def _build_inheritance(self, node): + assert node.GetClass() == 'Inherit' +@@ -506,7 +515,7 @@ class _IRBuilder(object): + + def _build_iterable(self, node): + assert node.GetClass() == 'Iterable' +- types = map(self._build_type, node.GetChildren()) ++ types = list(map(self._build_type, node.GetChildren())) + assert len(types) == 1 or len(types) == 2 + if len(types) == 1: # value iterator + key_type, value_type = (None, types[0]) +@@ -584,7 +593,7 @@ class _IRBuilder(object): + def _build_maplike(self, node, interface_identifier): + assert node.GetClass() == 'Maplike' + assert isinstance(interface_identifier, Identifier) +- types = map(self._build_type, node.GetChildren()) ++ types = list(map(self._build_type, node.GetChildren())) + assert len(types) == 2 + key_type, value_type = types + is_readonly = bool(node.GetProperty('READONLY')) +@@ -676,7 +685,7 @@ class _IRBuilder(object): + def _build_setlike(self, node, interface_identifier): + assert node.GetClass() == 'Setlike' + assert isinstance(interface_identifier, Identifier) +- types = map(self._build_type, node.GetChildren()) ++ types = list(map(self._build_type, node.GetChildren())) + assert len(types) == 1 + value_type = types[0] + is_readonly = bool(node.GetProperty('READONLY')) +@@ -838,7 +847,7 @@ class _IRBuilder(object): + + def build_union_type(node, extended_attributes): + return self._idl_type_factory.union_type( +- member_types=map(self._build_type, node.GetChildren()), ++ member_types=list(map(self._build_type, node.GetChildren())), + is_optional=is_optional, + extended_attributes=extended_attributes, + debug_info=self._build_debug_info(node)) +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/make_copy.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/make_copy.py +index a7a2b11f3f0..2f6b61300ff 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/make_copy.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/make_copy.py +@@ -3,6 +3,13 @@ + # found in the LICENSE file. + + ++import sys ++ ++# TODO: Remove this once Python2 is obsoleted. ++if sys.version_info.major != 2: ++ long = int ++ basestring = str ++ + def make_copy(obj, memo=None): + """ + Creates a copy of the given object, which should be an IR or part of IR. +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/namespace.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/namespace.py +index eeabef97cbe..bd7e98907f3 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/namespace.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/namespace.py +@@ -107,11 +107,13 @@ class Namespace(UserDefinedType, WithExtendedAttributes, WithCodeGeneratorInfo, + for operation_ir in ir.operations + ]) + self._operation_groups = tuple([ +- OperationGroup( +- operation_group_ir, +- filter(lambda x: x.identifier == operation_group_ir.identifier, +- self._operations), +- owner=self) for operation_group_ir in ir.operation_groups ++ OperationGroup(operation_group_ir, ++ list( ++ filter( ++ lambda x: x.identifier == operation_group_ir ++ .identifier, self._operations)), ++ owner=self) ++ for operation_group_ir in ir.operation_groups + ]) + + @property +diff --git a/chromium/third_party/blink/renderer/bindings/templates/dictionary_v8.cc.tmpl b/chromium/third_party/blink/renderer/bindings/templates/dictionary_v8.cc.tmpl +index 0add9c45a38..dc910f6d227 100644 +--- a/chromium/third_party/blink/renderer/bindings/templates/dictionary_v8.cc.tmpl ++++ b/chromium/third_party/blink/renderer/bindings/templates/dictionary_v8.cc.tmpl +@@ -59,9 +59,9 @@ void {{v8_class}}::ToImpl(v8::Isolate* isolate, v8::Local v8_value, { + DCHECK(executionContext); + {% endif %}{# has_origin_trial_members #} + {% endif %}{# members #} +- {% for origin_trial_test, origin_trial_member_list in members | groupby('origin_trial_feature_name') %} ++ {% for origin_trial_test, origin_trial_member_list in members | stringifykeygroupby('origin_trial_feature_name') %} + {% filter origin_trial_enabled(origin_trial_test, "executionContext") %} +- {% for feature_name, member_list in origin_trial_member_list | groupby('runtime_enabled_feature_name') %} ++ {% for feature_name, member_list in origin_trial_member_list | stringifykeygroupby('runtime_enabled_feature_name') %} + {% filter runtime_enabled(feature_name) %} + {% for member in member_list %} + v8::Local {{member.v8_value}}; +@@ -147,9 +147,9 @@ bool toV8{{cpp_class}}(const {{cpp_class}}* impl, v8::Local dictiona + DCHECK(executionContext); + {% endif %}{# has_origin_trial_members #} + {% endif %}{# members #} +- {% for origin_trial_test, origin_trial_member_list in members | groupby('origin_trial_feature_name') %} ++ {% for origin_trial_test, origin_trial_member_list in members | stringifykeygroupby('origin_trial_feature_name') %} + {% filter origin_trial_enabled(origin_trial_test, "executionContext") %} +- {% for feature_name, member_list in origin_trial_member_list | groupby('runtime_enabled_feature_name') %} ++ {% for feature_name, member_list in origin_trial_member_list | stringifykeygroupby('runtime_enabled_feature_name') %} + {% filter runtime_enabled(feature_name) %} + {% for member in member_list %} + v8::Local {{member.v8_value}}; +diff --git a/chromium/third_party/blink/renderer/build/scripts/core/css/make_style_shorthands.py b/chromium/third_party/blink/renderer/build/scripts/core/css/make_style_shorthands.py +index 1799cd5a153..5f43ffabc26 100755 +--- a/chromium/third_party/blink/renderer/build/scripts/core/css/make_style_shorthands.py ++++ b/chromium/third_party/blink/renderer/build/scripts/core/css/make_style_shorthands.py +@@ -71,7 +71,7 @@ class Expansion(object): + def enabled_longhands(self): + include = lambda longhand: not longhand[ + 'runtime_flag'] or self.is_enabled(longhand['runtime_flag']) +- return filter(include, self._longhands) ++ return list(filter(include, self._longhands)) + + @property + def index(self): +@@ -87,8 +87,9 @@ class Expansion(object): + + def create_expansions(longhands): + flags = collect_runtime_flags(longhands) +- expansions = map(lambda mask: Expansion(longhands, flags, mask), +- range(1 << len(flags))) ++ expansions = list( ++ map(lambda mask: Expansion(longhands, flags, mask), ++ range(1 << len(flags)))) + assert len(expansions) > 0 + # We generate 2^N expansions for N flags, so enforce some limit. + assert len(flags) <= 4, 'Too many runtime flags for a single shorthand' +@@ -114,14 +115,14 @@ class StylePropertyShorthandWriter(json5_generator.Writer): + + self._longhand_dictionary = defaultdict(list) + for property_ in json5_properties.shorthands: +- property_['longhand_enum_keys'] = map(enum_key_for_css_property, +- property_['longhands']) +- property_['longhand_property_ids'] = map(id_for_css_property, +- property_['longhands']) +- +- longhands = map( +- lambda name: json5_properties.properties_by_name[name], +- property_['longhands']) ++ property_['longhand_enum_keys'] = list( ++ map(enum_key_for_css_property, property_['longhands'])) ++ property_['longhand_property_ids'] = list( ++ map(id_for_css_property, property_['longhands'])) ++ ++ longhands = list( ++ map(lambda name: json5_properties.properties_by_name[name], ++ property_['longhands'])) + property_['expansions'] = create_expansions(longhands) + for longhand_enum_key in property_['longhand_enum_keys']: + self._longhand_dictionary[longhand_enum_key].append(property_) +diff --git a/chromium/third_party/blink/renderer/build/scripts/core/css/properties/make_css_property_instances.py b/chromium/third_party/blink/renderer/build/scripts/core/css/properties/make_css_property_instances.py +index 75030ac577e..f72aadee17d 100755 +--- a/chromium/third_party/blink/renderer/build/scripts/core/css/properties/make_css_property_instances.py ++++ b/chromium/third_party/blink/renderer/build/scripts/core/css/properties/make_css_property_instances.py +@@ -42,8 +42,8 @@ class CSSPropertyInstancesWriter(json5_generator.Writer): + aliases = self._css_properties.aliases + + # Lists of PropertyClassData. +- self._property_classes_by_id = map(self.get_class, properties) +- self._alias_classes_by_id = map(self.get_class, aliases) ++ self._property_classes_by_id = list(map(self.get_class, properties)) ++ self._alias_classes_by_id = list(map(self.get_class, aliases)) + + # Sort by enum value. + self._property_classes_by_id.sort(key=lambda t: t.enum_value) +diff --git a/chromium/third_party/blink/renderer/build/scripts/gperf.py b/chromium/third_party/blink/renderer/build/scripts/gperf.py +index 5ee49056be4..db72660d471 100644 +--- a/chromium/third_party/blink/renderer/build/scripts/gperf.py ++++ b/chromium/third_party/blink/renderer/build/scripts/gperf.py +@@ -95,7 +95,7 @@ def main(): + + open(args.output_file, 'wb').write( + generate_gperf(gperf_path, +- open(infile).read(), gperf_args)) ++ open(infile).read(), gperf_args).encode('utf-8')) + + + if __name__ == '__main__': +diff --git a/chromium/third_party/blink/renderer/build/scripts/in_file.py b/chromium/third_party/blink/renderer/build/scripts/in_file.py +index 28adc050f1e..58113483e57 100644 +--- a/chromium/third_party/blink/renderer/build/scripts/in_file.py ++++ b/chromium/third_party/blink/renderer/build/scripts/in_file.py +@@ -66,7 +66,7 @@ class InFile(object): + self._defaults = defaults + self._valid_values = copy.deepcopy( + valid_values if valid_values else {}) +- self._parse(map(str.strip, lines)) ++ self._parse(list(map(str.strip, lines))) + + @classmethod + def load_from_files(self, file_paths, defaults, valid_values, +diff --git a/chromium/third_party/blink/renderer/build/scripts/in_generator.py b/chromium/third_party/blink/renderer/build/scripts/in_generator.py +index e46740a2e85..ab1981ad1e3 100644 +--- a/chromium/third_party/blink/renderer/build/scripts/in_generator.py ++++ b/chromium/third_party/blink/renderer/build/scripts/in_generator.py +@@ -32,10 +32,15 @@ import os + import os.path + import shlex + import shutil ++import sys + import optparse + + from in_file import InFile + ++# TODO: Remove this once Python2 is obsoleted. ++if sys.version_info.major != 2: ++ basestring = str ++ + + ######################################################### + # This is now deprecated - use json5_generator.py instead +diff --git a/chromium/third_party/blink/renderer/build/scripts/make_runtime_features.py b/chromium/third_party/blink/renderer/build/scripts/make_runtime_features.py +index cafe8d94a8e..6925a4fa580 100755 +--- a/chromium/third_party/blink/renderer/build/scripts/make_runtime_features.py ++++ b/chromium/third_party/blink/renderer/build/scripts/make_runtime_features.py +@@ -138,7 +138,7 @@ class RuntimeFeatureWriter(BaseRuntimeFeatureWriter): + except Exception: + # If trouble unpickling, overwrite + pass +- with open(os.path.abspath(file_name), 'w') as pickle_file: ++ with open(os.path.abspath(file_name), 'wb') as pickle_file: + pickle.dump(features_map, pickle_file) + + def _template_inputs(self): +diff --git a/chromium/third_party/blink/renderer/build/scripts/templates/element_factory.cc.tmpl b/chromium/third_party/blink/renderer/build/scripts/templates/element_factory.cc.tmpl +index dc3f44c5b10..3eefcf9f0ee 100644 +--- a/chromium/third_party/blink/renderer/build/scripts/templates/element_factory.cc.tmpl ++++ b/chromium/third_party/blink/renderer/build/scripts/templates/element_factory.cc.tmpl +@@ -26,7 +26,7 @@ using {{namespace}}FunctionMap = HashMapGetExecutionContext())) { +diff --git a/chromium/third_party/blink/renderer/build/scripts/templates/element_type_helpers.h.tmpl b/chromium/third_party/blink/renderer/build/scripts/templates/element_type_helpers.h.tmpl +index 1b5297d52dc..edecc81d9d4 100644 +--- a/chromium/third_party/blink/renderer/build/scripts/templates/element_type_helpers.h.tmpl ++++ b/chromium/third_party/blink/renderer/build/scripts/templates/element_type_helpers.h.tmpl +@@ -15,7 +15,7 @@ namespace blink { + class Document; + + // Type checking. +-{% for tag in tags|sort if not tag.multipleTagNames and not tag.noTypeHelpers %} ++{% for tag in tags|sort(attribute='name') if not tag.multipleTagNames and not tag.noTypeHelpers %} + class {{tag.interface}}; + template <> + inline bool IsElementOfType(const Node& node) { +diff --git a/chromium/third_party/blink/renderer/build/scripts/templates/macros.tmpl b/chromium/third_party/blink/renderer/build/scripts/templates/macros.tmpl +index 0244433af2e..dcdbb02a56c 100644 +--- a/chromium/third_party/blink/renderer/build/scripts/templates/macros.tmpl ++++ b/chromium/third_party/blink/renderer/build/scripts/templates/macros.tmpl +@@ -25,7 +25,7 @@ + + + {% macro trie_leaf(index, object, return_macro, lowercase_data) %} +-{% set name, value = object.items()[0] %} ++{% set name, value = (object.items()|list)[0] %} + {% if name|length %} + if ( + {%- for c in name -%} +@@ -45,7 +45,7 @@ return {{ return_macro(value) }}; + + + {% macro trie_switch(trie, index, return_macro, lowercase_data) %} +-{% if trie|length == 1 and trie.values()[0] is string %} ++{% if trie|length == 1 and (trie.values()|list)[0] is string %} + {{ trie_leaf(index, trie, return_macro, lowercase_data) -}} + {% else %} + {% if lowercase_data %} +diff --git a/chromium/third_party/blink/renderer/build/scripts/templates/make_qualified_names.h.tmpl b/chromium/third_party/blink/renderer/build/scripts/templates/make_qualified_names.h.tmpl +index cb05c6c4315..bd5566b03e7 100644 +--- a/chromium/third_party/blink/renderer/build/scripts/templates/make_qualified_names.h.tmpl ++++ b/chromium/third_party/blink/renderer/build/scripts/templates/make_qualified_names.h.tmpl +@@ -24,12 +24,12 @@ namespace {{cpp_namespace}} { + {{symbol_export}}extern const WTF::AtomicString& {{namespace_prefix}}NamespaceURI; + + // Tags +-{% for tag in tags|sort %} ++{% for tag in tags|sort(attribute='name') %} + {{symbol_export}}extern const blink::{{namespace}}QualifiedName& {{tag|symbol}}Tag; + {% endfor %} + + // Attributes +-{% for attr in attrs|sort %} ++{% for attr in attrs|sort(attribute='name') %} + {{symbol_export}}extern const blink::QualifiedName& {{attr|symbol}}Attr; + {% endfor %} + +diff --git a/chromium/third_party/dawn/generator/generator_lib.py b/chromium/third_party/dawn/generator/generator_lib.py +index 5e3734d7833..e3d46bd194f 100644 +--- a/chromium/third_party/dawn/generator/generator_lib.py ++++ b/chromium/third_party/dawn/generator/generator_lib.py +@@ -201,6 +201,10 @@ def _compute_python_dependencies(root_dir=None): + + paths = set() + for path in module_paths: ++ # Builtin/namespaced modules may return None for the file path. ++ if not path: ++ continue ++ + path = os.path.abspath(path) + + if not path.startswith(root_dir): +diff --git a/chromium/third_party/devtools-frontend/src/BUILD.gn b/chromium/third_party/devtools-frontend/src/BUILD.gn +index cd488e88b60..ea1dc3d9a79 100644 +--- a/chromium/third_party/devtools-frontend/src/BUILD.gn ++++ b/chromium/third_party/devtools-frontend/src/BUILD.gn +@@ -2,6 +2,8 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import("//build/config/python.gni") ++ + import("//third_party/blink/public/public_features.gni") + import("./all_devtools_files.gni") + import("./all_devtools_modules.gni") +diff --git a/chromium/third_party/devtools-frontend/src/scripts/build/build_inspector_overlay.py b/chromium/third_party/devtools-frontend/src/scripts/build/build_inspector_overlay.py +index d6666e8b74f..0f7a661e632 100644 +--- a/chromium/third_party/devtools-frontend/src/scripts/build/build_inspector_overlay.py ++++ b/chromium/third_party/devtools-frontend/src/scripts/build/build_inspector_overlay.py +@@ -45,7 +45,8 @@ def rollup(input_path, output_path, filename, max_size, rollup_plugin): + ['--format', 'iife', '-n', 'InspectorOverlay'] + ['--input', target] + + ['--plugin', rollup_plugin], + stdout=subprocess.PIPE, +- stderr=subprocess.PIPE) ++ stderr=subprocess.PIPE, ++ text=True) + out, error = rollup_process.communicate() + if not out: + raise Exception("rollup failed: " + error) +diff --git a/chromium/third_party/devtools-frontend/src/scripts/build/build_release_applications.py b/chromium/third_party/devtools-frontend/src/scripts/build/build_release_applications.py +index fa8e73d34af..7d0b84b2171 100644 +--- a/chromium/third_party/devtools-frontend/src/scripts/build/build_release_applications.py ++++ b/chromium/third_party/devtools-frontend/src/scripts/build/build_release_applications.py +@@ -10,7 +10,7 @@ Builds applications in release mode: + and?the?application?loader?into?a?single?script. + """ + +-from cStringIO import StringIO ++from io import StringIO + from os import path + from os.path import join + import copy +@@ -145,8 +145,7 @@ class ReleaseBuilder(object): + resource_content = read_file(path.join(self.application_dir, resource_name)) + if not (resource_name.endswith('.html') + or resource_name.endswith('md')): +- resource_content += resource_source_url(resource_name).encode( +- 'utf-8') ++ resource_content += resource_source_url(resource_name) + resource_content = resource_content.replace('\\', '\\\\') + resource_content = resource_content.replace('\n', '\\n') + resource_content = resource_content.replace('"', '\\"') +@@ -173,7 +172,9 @@ class ReleaseBuilder(object): + def _concatenate_application_script(self, output): + output.write('Root.allDescriptors.push(...%s);' % self._release_module_descriptors()) + if self.descriptors.extends: +- output.write('Root.applicationDescriptor.modules.push(...%s);' % json.dumps(self.descriptors.application.values())) ++ output.write( ++ 'Root.applicationDescriptor.modules.push(...%s);' % ++ json.dumps(list(self.descriptors.application.values()))) + else: + output.write('Root.applicationDescriptor = %s;' % self.descriptors.application_json()) + +diff --git a/chromium/third_party/devtools-frontend/src/scripts/build/generate_devtools_grd.py b/chromium/third_party/devtools-frontend/src/scripts/build/generate_devtools_grd.py +index be510c48d76..c6a59c90298 100644 +--- a/chromium/third_party/devtools-frontend/src/scripts/build/generate_devtools_grd.py ++++ b/chromium/third_party/devtools-frontend/src/scripts/build/generate_devtools_grd.py +@@ -123,7 +123,7 @@ def main(argv): + + try: + os.makedirs(path.join(output_directory, 'Images')) +- except OSError, e: ++ except OSError as e: + if e.errno != errno.EEXIST: + raise e + +@@ -147,7 +147,7 @@ def main(argv): + shutil.copy(path.join(dirname, filename), path.join(output_directory, 'Images')) + add_file_to_grd(doc, path.join('Images', filename)) + +- with open(parsed_args.output_filename, 'w') as output_file: ++ with open(parsed_args.output_filename, 'wb') as output_file: + output_file.write(doc.toxml(encoding='UTF-8')) + + +diff --git a/chromium/third_party/devtools-frontend/src/scripts/build/modular_build.py b/chromium/third_party/devtools-frontend/src/scripts/build/modular_build.py +index 0ba695d3810..bb1da2f9f8d 100644 +--- a/chromium/third_party/devtools-frontend/src/scripts/build/modular_build.py ++++ b/chromium/third_party/devtools-frontend/src/scripts/build/modular_build.py +@@ -7,6 +7,8 @@ + Utilities for the modular DevTools build. + """ + ++from __future__ import print_function ++ + import collections + from os import path + import os +@@ -40,7 +42,7 @@ def load_and_parse_json(filename): + try: + return json.loads(read_file(filename)) + except: +- print 'ERROR: Failed to parse %s' % filename ++ print('ERROR: Failed to parse %s' % filename) + raise + + class Descriptors: +@@ -57,7 +59,7 @@ class Descriptors: + + def application_json(self): + result = dict() +- result['modules'] = self.application.values() ++ result['modules'] = list(self.application.values()) + return json.dumps(result) + + def all_compiled_files(self): +diff --git a/chromium/third_party/jinja2/tests.py b/chromium/third_party/jinja2/tests.py +index 0adc3d4dbcb..b14f85ff148 100644 +--- a/chromium/third_party/jinja2/tests.py ++++ b/chromium/third_party/jinja2/tests.py +@@ -10,7 +10,7 @@ + """ + import operator + import re +-from collections import Mapping ++from collections.abc import Mapping + from jinja2.runtime import Undefined + from jinja2._compat import text_type, string_types, integer_types + import decimal +diff --git a/chromium/tools/metrics/ukm/gen_builders.py b/chromium/tools/metrics/ukm/gen_builders.py +index f9f61d90a56..44e46fae8cc 100755 +--- a/chromium/tools/metrics/ukm/gen_builders.py ++++ b/chromium/tools/metrics/ukm/gen_builders.py +@@ -48,9 +48,10 @@ def ReadFilteredData(path): + data = ukm_model.UKM_XML_TYPE.Parse(ukm_file.read()) + event_tag = ukm_model._EVENT_TYPE.tag + metric_tag = ukm_model._METRIC_TYPE.tag +- data[event_tag] = filter(ukm_model.IsNotObsolete, data[event_tag]) ++ data[event_tag] = list(filter(ukm_model.IsNotObsolete, data[event_tag])) + for event in data[event_tag]: +- event[metric_tag] = filter(ukm_model.IsNotObsolete, event[metric_tag]) ++ event[metric_tag] = list( ++ filter(ukm_model.IsNotObsolete, event[metric_tag])) + return data + + +diff --git a/chromium/ui/ozone/generate_constructor_list.py b/chromium/ui/ozone/generate_constructor_list.py +index 8d800636c97..04fa18e93df 100755 +--- a/chromium/ui/ozone/generate_constructor_list.py ++++ b/chromium/ui/ozone/generate_constructor_list.py +@@ -45,12 +45,15 @@ Example Output: ./ui/ozone/generate_constructor_list.py \ + } // namespace ui + """ + ++try: ++ from StringIO import StringIO # for Python 2 ++except ImportError: ++ from io import StringIO # for Python 3 + import optparse + import os + import collections + import re + import sys +-import string + + + def GetTypedefName(typename): +@@ -68,7 +71,7 @@ def GetConstructorName(typename, platform): + This is just "Create" + typename + platform. + """ + +- return 'Create' + typename + string.capitalize(platform) ++ return 'Create' + typename + platform.capitalize() + + + def GenerateConstructorList(out, namespace, export, typenames, platforms, +@@ -163,12 +166,14 @@ def main(argv): + sys.exit(1) + + # Write to standard output or file specified by --output_cc. +- out_cc = sys.stdout ++ out_cc = getattr(sys.stdout, 'buffer', sys.stdout) + if options.output_cc: + out_cc = open(options.output_cc, 'wb') + +- GenerateConstructorList(out_cc, options.namespace, options.export, ++ out_cc_str = StringIO() ++ GenerateConstructorList(out_cc_str, options.namespace, options.export, + typenames, platforms, includes, usings) ++ out_cc.write(out_cc_str.getvalue().encode('utf-8')) + + if options.output_cc: + out_cc.close() +diff --git a/chromium/ui/ozone/generate_ozone_platform_list.py b/chromium/ui/ozone/generate_ozone_platform_list.py +index d47c398259b..2702b68b9bd 100755 +--- a/chromium/ui/ozone/generate_ozone_platform_list.py ++++ b/chromium/ui/ozone/generate_ozone_platform_list.py +@@ -49,12 +49,15 @@ Example Output: ./generate_ozone_platform_list.py --default wayland dri wayland + + """ + ++try: ++ from StringIO import StringIO # for Python 2 ++except ImportError: ++ from io import StringIO # for Python 3 + import optparse + import os + import collections + import re + import sys +-import string + + + def GetConstantName(name): +@@ -63,7 +66,7 @@ def GetConstantName(name): + We just capitalize the platform name and prepend "CreateOzonePlatform". + """ + +- return 'kPlatform' + string.capitalize(name) ++ return 'kPlatform' + name.capitalize() + + + def GeneratePlatformListText(out, platforms): +@@ -149,9 +152,9 @@ def main(argv): + platforms.insert(0, options.default) + + # Write to standard output or file specified by --output_{cc,h}. +- out_cc = sys.stdout +- out_h = sys.stdout +- out_txt = sys.stdout ++ out_cc = getattr(sys.stdout, 'buffer', sys.stdout) ++ out_h = getattr(sys.stdout, 'buffer', sys.stdout) ++ out_txt = getattr(sys.stdout, 'buffer', sys.stdout) + if options.output_cc: + out_cc = open(options.output_cc, 'wb') + if options.output_h: +@@ -159,9 +162,16 @@ def main(argv): + if options.output_txt: + out_txt = open(options.output_txt, 'wb') + +- GeneratePlatformListText(out_txt, platforms) +- GeneratePlatformListHeader(out_h, platforms) +- GeneratePlatformListSource(out_cc, platforms) ++ out_txt_str = StringIO() ++ out_h_str = StringIO() ++ out_cc_str = StringIO() ++ ++ GeneratePlatformListText(out_txt_str, platforms) ++ out_txt.write(out_txt_str.getvalue().encode('utf-8')) ++ GeneratePlatformListHeader(out_h_str, platforms) ++ out_h.write(out_h_str.getvalue().encode('utf-8')) ++ GeneratePlatformListSource(out_cc_str, platforms) ++ out_cc.write(out_cc_str.getvalue().encode('utf-8')) + + if options.output_cc: + out_cc.close() +-- +2.25.1 + diff --git a/package/qt5/qt5webengine-chromium/0002-Don-t-rebase-sysroot-path.patch b/package/qt5/qt5webengine-chromium/0002-Don-t-rebase-sysroot-path.patch new file mode 100644 index 0000000000..c39f008a3d --- /dev/null +++ b/package/qt5/qt5webengine-chromium/0002-Don-t-rebase-sysroot-path.patch @@ -0,0 +1,32 @@ +From bfc520671693587a0b81842018326da35aa97f80 Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Thu, 3 Feb 2022 20:41:08 -0700 +Subject: [PATCH] Don't rebase sysroot path + +Just use the actual sysroot as rebase_path will generate an invalid +sysroot path. + +Fixes: +/home/buildroot/buildroot/output/per-package/qt5webengine/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-buildroot-linux-gnu/10.3.0/../../../../aarch64-buildroot-linux-gnu/bin/ld: cannot find crti.o: No such file or directory + +Signed-off-by: James Hilliard +--- + chromium/build/config/posix/BUILD.gn | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chromium/build/config/posix/BUILD.gn b/chromium/build/config/posix/BUILD.gn +index e61554c5656..dc957225869 100644 +--- a/chromium/build/config/posix/BUILD.gn ++++ b/chromium/build/config/posix/BUILD.gn +@@ -27,7 +27,7 @@ config("runtime_library") { + + if (!is_apple && sysroot != "") { + # Pass the sysroot to all C compiler variants, the assembler, and linker. +- sysroot_flags = [ "--sysroot=" + rebase_path(sysroot, root_build_dir) ] ++ sysroot_flags = [ "--sysroot=" + sysroot ] + if (is_linux || is_chromeos) { + # This is here so that all files get recompiled after a sysroot roll and + # when turning the sysroot on or off. (defines are passed via the command +-- +2.25.1 + 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)) -- 2.25.1 From james.hilliard1 at gmail.com Sat Feb 5 20:40:27 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 5 Feb 2022 13:40:27 -0700 Subject: [Buildroot] [PATCH v6 4/8] package/qt5/qt5base: enable ccache via configure option In-Reply-To: <20220205212349.17db6aa4@windsurf> References: <20220205201837.3324085-1-james.hilliard1@gmail.com> <20220205201837.3324085-4-james.hilliard1@gmail.com> <20220205212349.17db6aa4@windsurf> Message-ID: On Sat, Feb 5, 2022 at 1:23 PM Thomas Petazzoni wrote: > > On Sat, 5 Feb 2022 13:18:33 -0700 > James Hilliard wrote: > > > # This allows to use ccache when available > > -define QT5BASE_CONFIGURE_HOSTCC > > - $(SED) 's,^QMAKE_CC\s*=.*,QMAKE_CC = $(HOSTCC),' $(@D)/mkspecs/common/g++-base.conf > > - $(SED) 's,^QMAKE_CXX\s*=.*,QMAKE_CXX = $(HOSTCXX),' $(@D)/mkspecs/common/g++-base.conf > > -endef > > This this variable is dropped, then surely the place it was used should also be modified? Oh, forgot to remove it from there. > > > +ifeq ($(BR2_CCACHE),y) > > +QT5BASE_CONFIGURE_OPTS += -ccache > > +endif > > Are we sure this is going to use Buildroot's ccache and not the system > ccache? Looks to be detecting it properly at least(my system also has a system ccache): Checking for ccache... Searching for file ccache. Found at /home/buildroot/buildroot/output/per-package/qt5base/host/bin/ccache. test config.qtbase.tests.ccache succeeded > > Indeed, $(HOSTCC) and $(HOSTCXX) are defined as: > > CCACHE = $(HOST_DIR)/bin/ccache > HOSTCC = $(CCACHE) $(HOSTCC_NOCCACHE) > HOSTCXX = $(CCACHE) $(HOSTCXX_NOCCACHE) > > so we know that it's the Buildroot ccache that will be used. The gn build system in qt5webengine has some special ccache conditional handling that doesn't get properly enabled with this method as it enables based on the qt5base ccache flag instead AFAIU. > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com From arnout at mind.be Sat Feb 5 21:18:06 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 5 Feb 2022 22:18:06 +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: On 11/01/2022 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 > 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 Applied to master, with an extension of the help text as suggested by Luca and pointing to the URL provided by James. Thanks! Regards, Arnout > --- > 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)) From arnout at mind.be Sat Feb 5 21:16:41 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 5 Feb 2022 22:16:41 +0100 Subject: [Buildroot] [git commit] package/zynq-boot-bin: drop legacy package Message-ID: <20220205211057.D792F82650@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f22bff4a79faee5e4501e0f7653c09e6dcf5387e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 python3-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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- Config.in.legacy | 13 +++++++++++++ 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, 13 insertions(+), 47 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 62717463df..34d8c71cc8 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,19 @@ 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. Should you still have an older U-Boot that needs + this, a python3 version of the zynq-boot-bin.py script can be + downloaded from the URL below and called from a post-build + script. + + https://gist.githubusercontent.com/jameshilliard/e09235dfc6f96c11418a134e6ebf7890/raw/135b7480c405ae8a77a9db615e495f9a9f2d3242/zynq-boot-bin.py + config BR2_PACKAGE_RPI_BT_FIRMWARE bool "rpi-bt-firmware package was renamed" depends on BR2_arm || BR2_aarch64 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)) From kuzminov.sergey81 at gmail.com Sat Feb 5 21:55:58 2022 From: kuzminov.sergey81 at gmail.com (Sergey Kuzminov) Date: Sun, 6 Feb 2022 00:55:58 +0300 Subject: [Buildroot] [PATCH v2] configs/orangepi_zero_defconfig: switch to extlinux Message-ID: <20220205215558.30751-1-kuzminov.sergey81@gmail.com> Changes: v1: - Exclude FAT partition, it is no longer needed for U-Boot. - Switch the rootfs partition from MBR to GPT for partition-uuid to work. - Switch to extlinux, this is convenient for debugging. - Create common scenarios for multiple boards to create an SD image: board/orangepi/common. v2: - Fix typo in first line of changes (s/he/it). - Add BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y. - Exclude one boot option from extlinux.conf. Signed-off-by: Sergey Kuzminov --- board/orangepi/common/extlinux.conf | 4 +++ board/orangepi/common/genimage.cfg | 23 +++++++++++++++ board/orangepi/common/post-build.sh | 34 +++++++++++++++++++++ board/orangepi/orangepi-zero/boot.cmd | 9 ------ board/orangepi/orangepi-zero/genimage.cfg | 36 ----------------------- configs/orangepi_zero_defconfig | 11 ++++--- 6 files changed, 66 insertions(+), 51 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 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..12f496b1fa --- /dev/null +++ b/board/orangepi/common/extlinux.conf @@ -0,0 +1,4 @@ +LABEL default + kernel /boot/%LINUXIMAGE% + devicetreedir /boot + 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..fa0d988991 --- /dev/null +++ b/board/orangepi/common/genimage.cfg @@ -0,0 +1,23 @@ +image sdcard.img { + partition u-boot { + in-partition-table = false + image = "u-boot-sunxi-with-spl.bin" + offset = 8K + size = 1000K # 1MB - 8KB(offset) - 16KB(GPT) + } + + hdimage { + partition-table-type = gpt + gpt-location = 1008K # 1MB - 16KB(GPT) + gpt-no-backup = true + # After writing the image to the SD card, + # backup GPT data structures at the end of the disk: + # gdisk /dev/mmcblk0 then press the buttons: x, e, w, y + } + + 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/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 5aaa1566c5..96f0c3f600 100644 --- a/configs/orangepi_zero_defconfig +++ b/configs/orangepi_zero_defconfig @@ -20,10 +20,13 @@ 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_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y # Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="63M" +BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y # BR2_TARGET_ROOTFS_TAR is not set # Bootloader @@ -39,16 +42,12 @@ 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 # 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" # Wireless driver and firmware BR2_PACKAGE_XR819_XRADIO=y -- 2.34.1 From arnout at mind.be Sat Feb 5 22:09:31 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 5 Feb 2022 23:09:31 +0100 Subject: [Buildroot] [git commit] support/scripts/mkusers: allow option for system uid/gid Message-ID: <20220205220301.E60E882952@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=41ea61d59c3e0261673be978bcfc779c8188e43f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Some software decides based on uid/gid whether a user is a system or normal (human) user, with different 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 user range. All identifiers used up to now should have been from the system range, so -1 is now interpreted as a system user/group. Note that after this commit, all the UIDs and GIDs that are created automatically (with -1) will change. That means if there is peristent data on an existing system that was created by such an automatic user, it will suddenly belong to a different user. However, this could already happen before: if a USERS line is added to a package, then other UIDs may change as well. Add system/user ranges as variables, and the argument for user/system uid variable as well. Thus some magic constants could be removed, some further occurences of -1 were replaced with equivalent logic. For consistency, the existing MIN/MAX_UID/GID variables are renamed to FIRST/LAST_USER_UID/GID. Update the documentation with the new automatic ranges. [1] - https://systemd.io/UIDS-GIDS/ [2] - https://www.freedesktop.org/software/systemd/man/journald.conf.html Signed-off-by: Norbert Lange [Arnout: use -1 for system users; refactor the changes a bit] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- docs/manual/makeusers-syntax.txt | 11 ++++-- support/scripts/mkusers | 84 ++++++++++++++++++++++++++-------------- 2 files changed, 63 insertions(+), 32 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 d00ba33823..4fc06f8fdf 100755 --- a/support/scripts/mkusers +++ b/support/scripts/mkusers @@ -4,10 +4,19 @@ myname="${0##*/}" #---------------------------------------------------------------------------- # Configurable items -MIN_UID=1000 -MAX_UID=1999 -MIN_GID=1000 -MAX_GID=1999 +FIRST_USER_UID=1000 +LAST_USER_UID=1999 +FIRST_USER_GID=1000 +LAST_USER_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=-1 +AUTO_USER_ID=-2 + # 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" \ @@ -194,20 +203,22 @@ check_user_validity() { # then simply report its current GID. Otherwise, generate the lowest GID # that is: # - not 0 -# - comprised in [MIN_GID..MAX_GID] +# - comprised in [$2..$3] # - not already used by a group generate_gid() { local group="${1}" + local mingid="${2}" + local maxgid="${3}" 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,10 @@ add_one_group() { local members # Generate a new GID if needed - if [ ${gid} -eq -1 ]; then - gid="$( generate_gid "${group}" )" + if [ ${gid} -eq ${AUTO_USER_ID} ]; then + gid="$( generate_gid "${group}" $FIRST_USER_GID $LAST_USER_GID )" + elif [ ${gid} -eq ${AUTO_SYSTEM_ID} ]; then + gid="$( generate_gid "${group}" $FIRST_SYSTEM_GID $LAST_SYSTEM_GID )" fi members=$(get_members "$group") @@ -243,20 +256,23 @@ add_one_group() { # then simply report its current UID. Otherwise, generate the lowest UID # that is: # - not 0 -# - comprised in [MIN_UID..MAX_UID] +# - comprised in [$2..$3] # - not already used by a user generate_uid() { local username="${1}" + local minuid="${2}" + local maxuid="${3}" + 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 +323,10 @@ 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} -eq ${AUTO_USER_ID} ]; then + uid="$( generate_uid "${username}" $FIRST_USER_GID $LAST_USER_GID )" + elif [ ${uid} -eq ${AUTO_SYSTEM_ID} ]; then + uid="$( generate_uid "${username}" $FIRST_SYSTEM_GID $LAST_SYSTEM_GID )" fi # Remove any previous instance of this user @@ -369,14 +387,15 @@ add_one_user() { main() { local username uid group gid passwd home shell groups comment local line + local auto_id local -a ENTRIES # Some sanity checks - if [ ${MIN_UID} -le 0 ]; then - fail "MIN_UID must be >0 (currently %d)\n" ${MIN_UID} + if [ ${FIRST_USER_UID} -le 0 ]; then + fail "FIRST_USER_UID must be >0 (currently %d)\n" ${FIRST_USER_UID} fi - if [ ${MIN_GID} -le 0 ]; then - fail "MIN_GID must be >0 (currently %d)\n" ${MIN_GID} + if [ ${FIRST_USER_GID} -le 0 ]; then + fail "FIRST_USER_GID must be >0 (currently %d)\n" ${FIRST_USER_GID} fi # Read in all the file in memory, exclude empty lines and comments @@ -384,8 +403,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,18 +418,27 @@ 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 # Then, create all the additional groups # If any additional group is already a main group, we should use - # the gid of that main group; otherwise, we can use any gid + # the gid of that main group; otherwise, we can use any gid - a + # system gid if the uid is a system user (<= LAST_SYSTEM_UID), + # otherwise a user gid. for line in "${ENTRIES[@]}"; do read username uid group gid passwd home shell groups comment <<<"${line}" if [ "${groups}" != "-" ]; then + if [ ${uid} -le 0 ]; then + auto_id=${uid} + elif [ ${uid} -le ${LAST_SYSTEM_UID} ]; then + auto_id=${AUTO_SYSTEM_ID} + else + auto_id=${AUTO_USER_ID} + fi for g in ${groups//,/ }; do - add_one_group "${g}" -1 + add_one_group "${g}" ${auto_id} done fi done @@ -433,7 +461,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 Sat Feb 5 22:13:05 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 5 Feb 2022 23:13:05 +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: <9ff36776-8e54-e835-21de-5b7466efb7fb@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]). > > 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 I applied both to master, after squashing and making the modifications I mentioned in my previous review. In addition... > --- > 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 For consistency wiht LAST_SYSTEM_UID, I renamed this one to LAST_USER_UID (and same for the other 3 of course). Regards, Arnout > 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 From arnout at mind.be Sat Feb 5 22:14:15 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 5 Feb 2022 23:14: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: <1cc78242-026c-6c70-04b6-4c76a15fe6d7@mind.be> On 14/01/2022 11:12, Norbert Lange wrote: > 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} I changed this to decide on user or system ID based on the uid: if [ ${uid} -le 0 ]; then auto_id=${uid} elif [ ${uid} -le ${LAST_SYSTEM_UID} ]; then auto_id=${AUTO_SYSTEM_ID} else auto_id=${AUTO_USER_ID} fi for g in ${groups//,/ }; do add_one_group "${g}" ${auto_id} done It seems to work well. Regards, Arnout > done > fi > done From giulio.benetti at benettiengineering.com Sat Feb 5 22:18:06 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 5 Feb 2022 23:18:06 +0100 Subject: [Buildroot] [PATCH v2] configs/orangepi_zero_defconfig: switch to extlinux In-Reply-To: <20220205215558.30751-1-kuzminov.sergey81@gmail.com> References: <20220205215558.30751-1-kuzminov.sergey81@gmail.com> Message-ID: <033373DF-6707-4295-8A12-D4ABE072608F@benettiengineering.com> Hi Sergey, below I give you a better example of commit log, and the dealing with V1->V2 series. > Il giorno 5 feb 2022, alle ore 22:56, Sergey Kuzminov ha scritto: > > ?Changes: > v1: Please Remove this line ^^^ > - Exclude FAT partition, it is no longer needed for U-Boot. > - Switch the rootfs partition from MBR to GPT for partition-uuid to work. > - Switch to extlinux, this is convenient for debugging. > - Create common scenarios for multiple boards to create an SD image: board/orangepi/common. > > v2: Remove this ^^^ line > - Fix typo in first line of changes (s/he/it). This too ^^^ > - Add BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y. Here we need an explanation of the reason why, what this implies. > - Exclude one boot option from extlinux.conf. This ^^^ too > > Signed-off-by: Sergey Kuzminov ?- V1->V2: * improved commit log * removed commented line in extlinux.conf * removed one boot option from extlinux.conf > --- So as you can see, commit log doesn?t mention the patch version, while after the 3 dashes you can write in general whatever you want because it won?t be part of commit log and it?s usually used to report V1->V2 version etc. > board/orangepi/common/extlinux.conf | 4 +++ > board/orangepi/common/genimage.cfg | 23 +++++++++++++++ > board/orangepi/common/post-build.sh | 34 +++++++++++++++++++++ > board/orangepi/orangepi-zero/boot.cmd | 9 ------ > board/orangepi/orangepi-zero/genimage.cfg | 36 ----------------------- > configs/orangepi_zero_defconfig | 11 ++++--- > 6 files changed, 66 insertions(+), 51 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 > 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..12f496b1fa > --- /dev/null > +++ b/board/orangepi/common/extlinux.conf > @@ -0,0 +1,4 @@ > +LABEL default > + kernel /boot/%LINUXIMAGE% > + devicetreedir /boot > + 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..fa0d988991 > --- /dev/null > +++ b/board/orangepi/common/genimage.cfg > @@ -0,0 +1,23 @@ > +image sdcard.img { > + partition u-boot { > + in-partition-table = false > + image = "u-boot-sunxi-with-spl.bin" > + offset = 8K > + size = 1000K # 1MB - 8KB(offset) - 16KB(GPT) > + } > + > + hdimage { > + partition-table-type = gpt > + gpt-location = 1008K # 1MB - 16KB(GPT) > + gpt-no-backup = true > + # After writing the image to the SD card, > + # backup GPT data structures at the end of the disk: > + # gdisk /dev/mmcblk0 then press the buttons: x, e, w, y Why don?t you make this part ^^^ automatic with a script or you simply use genimage itself? What it?s expected as board defconfig is something that you burn a sdcard with the sdcard.img file and that?s it. So here you need to make it automatic. So we wait for V3 with the commit log form you read above and requested changes. Thank you! Best regards ?- Giulio Benetti Benetti Engineering sas > + } > + > + 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/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 5aaa1566c5..96f0c3f600 100644 > --- a/configs/orangepi_zero_defconfig > +++ b/configs/orangepi_zero_defconfig > @@ -20,10 +20,13 @@ 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_NEEDS_HOST_OPENSSL=y > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > > # Filesystem > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="63M" > +BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y > # BR2_TARGET_ROOTFS_TAR is not set > > # Bootloader > @@ -39,16 +42,12 @@ 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 > > # 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" > > # Wireless driver and firmware > BR2_PACKAGE_XR819_XRADIO=y > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From arnout at mind.be Sat Feb 5 22:23:31 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 5 Feb 2022 23:23:31 +0100 Subject: [Buildroot] [PATCH] docs/manuali/makeusers-syntax.txt: add caveat for upgrading Message-ID: <20220205222331.3432353-1-arnout@mind.be> With the change of the range of UIDs that is generated from the automatic ID (-1), it became apparent that there is a potential problem with these automatic IDs when upgrading: they may have changed, which means that persistent files that exist outside of the rootfs suddenly have a different owner. Add a caveat section to the manual, as well as an explanation of how to work around the problem. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- docs/manual/makeusers-syntax.txt | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/docs/manual/makeusers-syntax.txt b/docs/manual/makeusers-syntax.txt index 3d1013f447..cebc6240ae 100644 --- a/docs/manual/makeusers-syntax.txt +++ b/docs/manual/makeusers-syntax.txt @@ -90,3 +90,17 @@ This will create this user: - +shell+ is: +/bin/sh+ - +test+ is not a member of any additional +groups+ - +comment+ is: +Test user+ + + +=== Caveat when updating Buildroot + +When updating buildroot or when packages are added or removed to/from +the configuration, it is possible that the automatic UIDs and GIDs are +changed. This can be a problem if persistent files were created with +that user or group: after upgrade, they will suddenly have a different +owner. + +Therefore, it is advisable to perpetuate the automatic IDs. This can be +done either by adding a users table with the generated IDs. It is only +needed to do this for UIDs that actually create persistent files, e.g. +database. -- 2.34.1 From arnout at mind.be Sat Feb 5 22:47:47 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 5 Feb 2022 23:47:47 +0100 Subject: [Buildroot] [PATCH 1/2] package/lua: bump to version 5.4.4 In-Reply-To: <20220126145503.1032630-1-francois.perrad@gadz.org> References: <20220126145503.1032630-1-francois.perrad@gadz.org> Message-ID: On 26/01/2022 15:55, Francois Perrad wrote: > Signed-off-by: Francois Perrad Both applied to master. However, Franc?ois, when the license hash changes, please explain in the commit message why it changed. Regards, Arnout > --- > 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 From arnout at mind.be Sat Feb 5 22:48:06 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 5 Feb 2022 23:48:06 +0100 Subject: [Buildroot] [PATCH] package/fmt: bump to version 8.1.1 In-Reply-To: <20220124074307.91368-1-buildroot@heine.tech> References: <20220124074307.91368-1-buildroot@heine.tech> Message-ID: <81b25800-0327-773c-86f5-a9f53af2914c@mind.be> On 24/01/2022 08:42, Michael Nosthoff via buildroot wrote: > Signed-off-by: Michael Nosthoff Applied to master, thanks. Regards, Arnout > --- > 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 From arnout at mind.be Sat Feb 5 22:48:44 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 5 Feb 2022 23:48:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/runc: bump to version 1.1.0 In-Reply-To: <20220124080013.83231-1-christian@paral.in> References: <20220124080013.83231-1-christian@paral.in> Message-ID: On 24/01/2022 09:00, Christian Stewart via buildroot wrote: > Added LGPL-2.1 license specifier: libseccomp is statically-linked. Is there also a license file for that? > https://github.com/opencontainers/runc/releases/tag/v1.1.0 > > Signed-off-by: Christian Stewart Applied to master, thanks. Regards, Arnout > --- > 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 > From arnout at mind.be Sat Feb 5 22:50:02 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 5 Feb 2022 23:50:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/sdl2: bump version to 2.0.20 In-Reply-To: <20220124080107.4094-1-mf@go-sys.de> References: <20220124080107.4094-1-mf@go-sys.de> Message-ID: On 24/01/2022 09:01, Michael Fischer wrote: > 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 When the license hash changes, please explain in the commit message why it changed. I added: Copyright year updated in LICENSE.txt. Applied to master, thanks. Regards, Arnout > 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 From arnout at mind.be Sat Feb 5 22:50:23 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 5 Feb 2022 23:50:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/network-manager: bump to version 1.34.0 In-Reply-To: <20220124092612.4019025-1-james.hilliard1@gmail.com> References: <20220124092612.4019025-1-james.hilliard1@gmail.com> Message-ID: On 24/01/2022 10:26, James Hilliard wrote: > CONTRIBUTING.md hash changed due to various style updates and > additions. > > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > 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 From arnout at mind.be Sat Feb 5 22:50:57 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 5 Feb 2022 23:50:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/libnpupnp: bump to version 4.2.1 In-Reply-To: <20220124223806.2720164-1-fontaine.fabrice@gmail.com> References: <20220124223806.2720164-1-fontaine.fabrice@gmail.com> Message-ID: On 24/01/2022 23:38, Fabrice Fontaine wrote: > Signed-off-by: Fabrice Fontaine Just in time for 2022.02 :-) Applied to master, thanks. Regards, Arnout > --- > 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 From arnout at mind.be Sat Feb 5 22:51:15 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 5 Feb 2022 23:51:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-dataproperty: bump to version 0.54.2 In-Reply-To: <20220125212039.300631-1-fontaine.fabrice@gmail.com> References: <20220125212039.300631-1-fontaine.fabrice@gmail.com> Message-ID: <527e0e50-1daa-5683-b587-053b503b1202@mind.be> On 25/01/2022 22:20, Fabrice Fontaine wrote: > 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 Applied to master, thanks. Regards, Arnout > --- > 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 From arnout at mind.be Sat Feb 5 22:52:31 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 5 Feb 2022 23:52:31 +0100 Subject: [Buildroot] [PATCH 1/2] package/python-sqliteschema: drop python-six dependency In-Reply-To: <20220125213242.301404-1-fontaine.fabrice@gmail.com> References: <20220125213242.301404-1-fontaine.fabrice@gmail.com> Message-ID: On 25/01/2022 22:32, Fabrice Fontaine wrote: > 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 Both applied to master, thanks. Peter, this one is for 2021.11. Regards, Arnout > --- > 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 From arnout at mind.be Sat Feb 5 22:54:09 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 5 Feb 2022 23:54:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/boost: enable context/coroutine for arm variants In-Reply-To: <20220126082505.10253-1-pieter.degendt@gmail.com> References: <20220126082505.10253-1-pieter.degendt@gmail.com> Message-ID: On 26/01/2022 09:25, Pieter De Gendt wrote: > Add boost context support for aarch64/aarch64_be and select AAPCS > as ABI for all arm variants. I've added an explanation _why_ the change to AAPCS (because ucontext only works with AAPCS ABI). > > 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 There's a comment just above this that refers to an outdated URL. I've updated that as well. Applied to master, thanks. Regards, Arnout > 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 From arnout at mind.be Sat Feb 5 22:54:35 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 5 Feb 2022 23:54:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/lighttpd: add pgsql support In-Reply-To: <20220126211749.1550932-1-fontaine.fabrice@gmail.com> References: <20220126211749.1550932-1-fontaine.fabrice@gmail.com> Message-ID: On 26/01/2022 22:17, Fabrice Fontaine wrote: > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > 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 From arnout at mind.be Sat Feb 5 22:34:40 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 5 Feb 2022 23:34:40 +0100 Subject: [Buildroot] [git commit] package/python-sqliteschema: drop python-six dependency Message-ID: <20220205224746.ADA9E82AA2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=66192c66b9421b95f6cc45a46264c0193a873c58 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 From arnout at mind.be Sat Feb 5 22:30:23 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 5 Feb 2022 23:30:23 +0100 Subject: [Buildroot] [git commit] package/runc: bump to version 1.1.0 Message-ID: <20220205224746.82A4282AA7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=25457ba3458b932507424a9a55298282128059c8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 From arnout at mind.be Sat Feb 5 22:34:41 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 5 Feb 2022 23:34:41 +0100 Subject: [Buildroot] [git commit] package/python-sqliteschema: bump to version 1.2.1 Message-ID: <20220205224746.B5FAB82AA7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5eff46a6c97203e7874edc931c4180f606f08275 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/thombashi/sqliteschema/releases/tag/v1.2.1 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 From arnout at mind.be Sat Feb 5 22:34:40 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 5 Feb 2022 23:34:40 +0100 Subject: [Buildroot] [git commit] package/libnpupnp: bump to version 4.2.1 Message-ID: <20220205224746.9CDB282AA7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b5654af1bae4c56af914d2d948cbe2dd1ae4de88 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 From arnout at mind.be Sat Feb 5 22:45:19 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 5 Feb 2022 23:45:19 +0100 Subject: [Buildroot] [git commit] package/lua: bump to version 5.4.4 Message-ID: <20220205224746.C6A7482AA2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4f9a5659023c66fc166de28fd39a6c97a9490667 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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(-) diff --git a/package/lua/5.4.3/lua.hash b/package/lua/5.4.3/lua.hash deleted file mode 100644 index be3604837f..0000000000 --- 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 7b9d6d76f3..68316e108f 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 0000000000..b55b17f258 --- /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 844e165df0..09e7b34f7d 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 From arnout at mind.be Sat Feb 5 22:45:19 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 5 Feb 2022 23:45:19 +0100 Subject: [Buildroot] [git commit] package/lua: use Lua 5.4 as default Message-ID: <20220205224746.CF6E282AA7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d32e062f1cc709893ed5893ebae736a54c36eef9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master lua-sdl2 is not available on Lua 5.4, so update its test to use Lua 5.3 instead. Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 5d4cee5d5b..309dd6eec2 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 573ae01005..9703dffbd4 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 22c4087f5d..b9aad15f45 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 From arnout at mind.be Sat Feb 5 22:41:47 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 5 Feb 2022 23:41:47 +0100 Subject: [Buildroot] [git commit] package/boost: enable context/coroutine for arm variants Message-ID: <20220205224746.BE1AC82AE5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1c667a11400e51618a4b38d288816cbb3ee7478f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add boost context support for aarch64/aarch64_be. Context support for ARM is only available in the AAPCS ABI, so switch to AAPCS ABI for all ARM variants. While we're at it, update the URL about the context architecture support to the one corresponding to the current version of boost. Signed-off-by: Pieter De Gendt [Arnout: update URL, extend commit message] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/boost/Config.in | 3 ++- package/boost/boost.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/boost/Config.in b/package/boost/Config.in index 1c405a36c3..2c458bf88a 100644 --- a/package/boost/Config.in +++ b/package/boost/Config.in @@ -68,12 +68,13 @@ config BR2_PACKAGE_BOOST_CONTAINER Standard library containers and extensions. # see -# http://www.boost.org/doc/libs/1_59_0/libs/context/doc/html/context/architectures.html +# http://www.boost.org/doc/libs/1_78_0/libs/context/doc/html/context/architectures.html # for the list of supported architectures. Sparc pretends to be # supported, but it doesn't build. 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 From arnout at mind.be Sat Feb 5 22:34:26 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 5 Feb 2022 23:34:26 +0100 Subject: [Buildroot] [git commit] package/sdl2: bump version to 2.0.20 Message-ID: <20220205224746.8BEAD82AE5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ee572c54488a2929833b17778d1e4de2892f5d4b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Copyright year updated in LICENSE.txt. Signed-off-by: Michael Fischer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 From arnout at mind.be Sat Feb 5 22:46:12 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 5 Feb 2022 23:46:12 +0100 Subject: [Buildroot] [git commit] package/python-pyopenssl: bump to version 21.0.0 Message-ID: <20220205224746.D74C582AA7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a1acae45658989922d799f0b668444217ef01e7a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update indentation in hash file (two spaces) https://github.com/pyca/pyopenssl/blob/21.0.0/CHANGELOG.rst Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 From arnout at mind.be Sat Feb 5 22:30:20 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 5 Feb 2022 23:30:20 +0100 Subject: [Buildroot] [git commit] package/fmt: bump to version 8.1.1 Message-ID: <20220205224746.78CFE82AA2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ec7fd50d08690a383fec40748ac9b78c3f764316 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Michael Nosthoff Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 From arnout at mind.be Sat Feb 5 22:46:12 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 5 Feb 2022 23:46:12 +0100 Subject: [Buildroot] [git commit] package/lighttpd: add pgsql support Message-ID: <20220205224746.DF05782AE5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b429dce6f8e2ee162b79fe2a3ebb1bd179f462e3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 f46e1a9a66..b9f64a3bc3 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -80,6 +80,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 f8ed7c6f7c..49ab8587f7 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -23,7 +23,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 \ @@ -95,6 +94,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 From arnout at mind.be Sat Feb 5 22:34:40 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 5 Feb 2022 23:34:40 +0100 Subject: [Buildroot] [git commit] package/python-dataproperty: bump to version 0.54.2 Message-ID: <20220205224746.A545A82AE5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bf7c819f1ea0dd699d886dba1b7db177acc90b1a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 From arnout at mind.be Sat Feb 5 22:34:40 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 5 Feb 2022 23:34:40 +0100 Subject: [Buildroot] [git commit] package/network-manager: bump to version 1.34.0 Message-ID: <20220205224746.94A2582AA2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bd7179d1394a002934f6c4d3ce3d1952cc3fe445 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master CONTRIBUTING.md hash changed due to various style updates and additions. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 From arnout at mind.be Sat Feb 5 22:58:57 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 5 Feb 2022 23:58:57 +0100 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: On 27/01/2022 00:56, 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). Since it apparently wasn't clear enough (cfr. Baruch's comment), I've tried to explain a bit better. Hopefully it indeed is better :-) Applied to master, thanks. Regards, Arnout > > 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/ \ From arnout at mind.be Sat Feb 5 22:55:53 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 5 Feb 2022 23:55:53 +0100 Subject: [Buildroot] [git commit] package/ltp-testsuite: bump version to 20220121 Message-ID: <20220205225146.DC88782A80@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=85af8e22c62dc9e378f27c59dc388c8d7394a91f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master LTP now builds metadata directory for the host. It supports cross-compilation, we just need to pass HOST_CFLAGS and HOST_LDFLAGS in addition to the target flags. They have to be passed to make, adding them to configure does not work. Without this, on some architectures the -mlongcalls and -mauto-litpools get passed to the host compile, but they're not valid there. 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch | 45 ++++++---------- .../0002-lib-fix-MemAvailable-parsing.patch | 36 ------------- .../0003-lapi-rtnetlink.h-Fix-include-guards.patch | 37 ------------- ...ate-if_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(-) 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/ \ From arnout at mind.be Sat Feb 5 22:59:47 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 5 Feb 2022 23:59:47 +0100 Subject: [Buildroot] [git commit] package/ltp-testsuite: update spacing in hash file Message-ID: <20220205225308.F03B482A80@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3b0d174166dbc68a3c688da63eb9684390981895 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master sha1 was using just 1 space. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/ltp-testsuite/ltp-testsuite.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ltp-testsuite/ltp-testsuite.hash b/package/ltp-testsuite/ltp-testsuite.hash index bd648cbfdd..53429fd59f 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/20220121/ltp-full-20220121.tar.xz.sha1 -sha1 211935e901afea1010ec4f70369b782fbee93ed4 ltp-full-20220121.tar.xz +sha1 211935e901afea1010ec4f70369b782fbee93ed4 ltp-full-20220121.tar.xz # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 ad002520616fac52362229ea0f1bb9d304fc03ff0096ccb5b1820cee9fc8413a ltp-full-20220121.tar.xz From james.hilliard1 at gmail.com Sat Feb 5 23:03:01 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 5 Feb 2022 16:03:01 -0700 Subject: [Buildroot] [PATCH 1/2] package/wayland-protocols: bump to version 1.25 Message-ID: <20220205230302.3837382-1-james.hilliard1@gmail.com> Drop patch that is now upstream. Signed-off-by: James Hilliard --- ...and-scanner-is-only-needed-for-tests.patch | 42 ------------------- .../wayland-protocols/wayland-protocols.hash | 8 ++-- .../wayland-protocols/wayland-protocols.mk | 2 +- 3 files changed, 5 insertions(+), 47 deletions(-) delete mode 100644 package/wayland-protocols/0001-meson.build-wayland-scanner-is-only-needed-for-tests.patch diff --git a/package/wayland-protocols/0001-meson.build-wayland-scanner-is-only-needed-for-tests.patch b/package/wayland-protocols/0001-meson.build-wayland-scanner-is-only-needed-for-tests.patch deleted file mode 100644 index ff3ec5719c..0000000000 --- a/package/wayland-protocols/0001-meson.build-wayland-scanner-is-only-needed-for-tests.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 80e97bd00bf6263845aa98b411507baba28be67e Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 19 Sep 2021 11:01:00 +0200 -Subject: [PATCH] meson.build: wayland-scanner is only needed for tests - -wayland-scanner is only needed for tests so don't require it if tests -are disabled - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://gitlab.freedesktop.org/wayland/wayland-protocols/-/commit/80e97bd00bf6263845aa98b411507baba28be67e] ---- - meson.build | 2 -- - tests/meson.build | 1 + - 2 files changed, 1 insertion(+), 2 deletions(-) - -diff --git a/meson.build b/meson.build -index 94b49e7..15dbc37 100644 ---- a/meson.build -+++ b/meson.build -@@ -8,8 +8,6 @@ wayland_protocols_version = meson.project_version() - - fs = import('fs') - --dep_scanner = dependency('wayland-scanner', native: true) -- - stable_protocols = [ - 'presentation-time', - 'viewporter', -diff --git a/tests/meson.build b/tests/meson.build -index 66337e7..74824ae 100644 ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -1,4 +1,5 @@ - prog_scan_sh = find_program('scan.sh') -+dep_scanner = dependency('wayland-scanner', native: true) - prog_scanner = find_program(dep_scanner.get_pkgconfig_variable('wayland_scanner')) - - libwayland = [ --- -GitLab - diff --git a/package/wayland-protocols/wayland-protocols.hash b/package/wayland-protocols/wayland-protocols.hash index b76bafb437..1262f0f9d7 100644 --- a/package/wayland-protocols/wayland-protocols.hash +++ b/package/wayland-protocols/wayland-protocols.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2021-September/041979.html -md5 31a6c469718db37d2688109e548506e4 wayland-protocols-1.23.tar.xz -sha1 8c4ebdce35953b1e2af458c139a432a308af6f50 wayland-protocols-1.23.tar.xz -sha256 6c0af1915f96f615927a6270d025bd973ff1c58e521e4ca1fc9abfc914633f76 wayland-protocols-1.23.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2022-January/042102.html +md5 0c192bf32de09ec30de4a82d1c65329c wayland-protocols-1.25.tar.xz +sha1 275298332d124e40e345aa82bc8f48ef8cad3480 wayland-protocols-1.25.tar.xz +sha256 f1ff0f7199d0a0da337217dd8c99979967808dc37731a1e759e822b75b571460 wayland-protocols-1.25.tar.xz sha256 f1a2b233e8a9a71c40f4aa885be08a0842ac85bb8588703c1dd7e6e6502e3124 COPYING diff --git a/package/wayland-protocols/wayland-protocols.mk b/package/wayland-protocols/wayland-protocols.mk index 41ab1e1c99..746d82e308 100644 --- a/package/wayland-protocols/wayland-protocols.mk +++ b/package/wayland-protocols/wayland-protocols.mk @@ -4,7 +4,7 @@ # ################################################################################ -WAYLAND_PROTOCOLS_VERSION = 1.23 +WAYLAND_PROTOCOLS_VERSION = 1.25 WAYLAND_PROTOCOLS_SITE = https://wayland.freedesktop.org/releases WAYLAND_PROTOCOLS_SOURCE = wayland-protocols-$(WAYLAND_PROTOCOLS_VERSION).tar.xz WAYLAND_PROTOCOLS_LICENSE = MIT -- 2.25.1 From james.hilliard1 at gmail.com Sat Feb 5 23:03:02 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 5 Feb 2022 16:03:02 -0700 Subject: [Buildroot] [PATCH 2/2] package/weston: bump to version 10.0.0 In-Reply-To: <20220205230302.3837382-1-james.hilliard1@gmail.com> References: <20220205230302.3837382-1-james.hilliard1@gmail.com> Message-ID: <20220205230302.3837382-2-james.hilliard1@gmail.com> Drop patches that are now upstream. Jpeg dependency is now optional. Add new backend compositor options. Add comment indicating fbdev is deprecated(not yet removed). Enable tools to match existing default(all enabled). Signed-off-by: James Hilliard --- ...ntl.h-for-open-O_RDWR-O_CLOEXEC-and-.patch | 48 --- ...libweston-backend-drm-might-need-EGL.patch | 47 --- ...003-pipewire-add-support-for-0.3-API.patch | 391 ------------------ ...4-pipewire-fix-null-deref-in-0-3-API.patch | 28 -- package/weston/Config.in | 34 +- package/weston/weston.hash | 10 +- package/weston/weston.mk | 35 +- 7 files changed, 58 insertions(+), 535 deletions(-) delete mode 100644 package/weston/0001-tests-include-fcntl.h-for-open-O_RDWR-O_CLOEXEC-and-.patch delete mode 100644 package/weston/0002-libweston-backend-drm-might-need-EGL.patch delete mode 100644 package/weston/0003-pipewire-add-support-for-0.3-API.patch delete mode 100644 package/weston/0004-pipewire-fix-null-deref-in-0-3-API.patch diff --git a/package/weston/0001-tests-include-fcntl.h-for-open-O_RDWR-O_CLOEXEC-and-.patch b/package/weston/0001-tests-include-fcntl.h-for-open-O_RDWR-O_CLOEXEC-and-.patch deleted file mode 100644 index 2eb6bd838c..0000000000 --- a/package/weston/0001-tests-include-fcntl.h-for-open-O_RDWR-O_CLOEXEC-and-.patch +++ /dev/null @@ -1,48 +0,0 @@ -From b10c0e843dcb8148bbe869bb15261955b94ac98c Mon Sep 17 00:00:00 2001 -From: Denys Dmytriyenko -Date: Tue, 8 Sep 2020 19:37:42 -0400 -Subject: [PATCH] tests: include fcntl.h for open(), O_RDWR, O_CLOEXEC and - O_CREAT - -musl libc (unlike glibc) requires explicitly incuding fcntl.h to define open(), -O_RDWR, O_CLOEXEC and O_CREAT. Otherwise the build fails with the errors: - -| ../weston-9.0.0/tests/weston-test-fixture-compositor.c: In function 'wait_for_lock': -| ../weston-9.0.0/tests/weston-test-fixture-compositor.c:135:7: warning: implicit declaration of function 'open'; did you mean 'popen'? [-Wimplicit-function-declaration] -| 135 | fd = open(lock_path, O_RDWR | O_CLOEXEC | O_CREAT, 00700); -| | ^~~~ -| | popen -| ../weston-9.0.0/tests/weston-test-fixture-compositor.c:135:23: error: 'O_RDWR' undeclared (first use in this function) -| 135 | fd = open(lock_path, O_RDWR | O_CLOEXEC | O_CREAT, 00700); -| | ^~~~~~ -| ../weston-9.0.0/tests/weston-test-fixture-compositor.c:135:23: note: each undeclared identifier is reported only once for each function it appears in -| ../weston-9.0.0/tests/weston-test-fixture-compositor.c:135:32: error: 'O_CLOEXEC' undeclared (first use in this function) -| 135 | fd = open(lock_path, O_RDWR | O_CLOEXEC | O_CREAT, 00700); -| | ^~~~~~~~~ -| ../weston-9.0.0/tests/weston-test-fixture-compositor.c:135:44: error: 'O_CREAT' undeclared (first use in this function) -| 135 | fd = open(lock_path, O_RDWR | O_CLOEXEC | O_CREAT, 00700); -| | ^~~~~~~ - -Signed-off-by: Denys Dmytriyenko -Signed-off-by: James Hilliard -[james.hilliard1 at gmail.com: backport from upstream commit -b10c0e843dcb8148bbe869bb15261955b94ac98c] ---- - tests/weston-test-fixture-compositor.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tests/weston-test-fixture-compositor.c b/tests/weston-test-fixture-compositor.c -index 1c32959c..c1eb26c4 100644 ---- a/tests/weston-test-fixture-compositor.c -+++ b/tests/weston-test-fixture-compositor.c -@@ -35,6 +35,7 @@ - #include - #include - #include -+#include - - #include "shared/helpers.h" - #include "weston-test-fixture-compositor.h" --- -2.25.1 - diff --git a/package/weston/0002-libweston-backend-drm-might-need-EGL.patch b/package/weston/0002-libweston-backend-drm-might-need-EGL.patch deleted file mode 100644 index f504e1145b..0000000000 --- a/package/weston/0002-libweston-backend-drm-might-need-EGL.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 4b93b71067949cc5efabb9b3d59278a3f362b11c Mon Sep 17 00:00:00 2001 -From: Heiko Thiery -Date: Wed, 21 Oct 2020 13:33:25 +0200 -Subject: [PATCH] libweston/backend/drm: might need EGL - -gbm-drm.c includes gl-renderer.h. When EGL is enabled, that in turns -includes egl.h. As such, dependencies for drm should include EGL if -it is available. - -This condition is modelled after a similar one in libweston/meson.build - -Reported-by: Gary Bisson -Reported-by: Heiko Thiery -Signed-off-by: Yann E. MORIN -Cc: Refik Tuzakli -Cc: Thomas Petazzoni -Signed-off-by: Heiko Thiery ---- -This patch should be a proper fix for the issue discribed in the patch from -Gary [1]. - -Since the MR on weston upstream [2] is not merged now I add this patch -to have working weston with imx in buildroot. - -[1] https://patchwork.ozlabs.org/project/buildroot/patch/20200402130842.918696-3-gary.bisson at boundarydevices.com/ -[2] https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/508 ---- - libweston/backend-drm/meson.build | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/libweston/backend-drm/meson.build b/libweston/backend-drm/meson.build -index 484c2702..e3e5b976 100644 ---- a/libweston/backend-drm/meson.build -+++ b/libweston/backend-drm/meson.build -@@ -53,6 +53,9 @@ if get_option('renderer-gl') - config_h.set('HAVE_GBM_FD_IMPORT', '1') - endif - deps_drm += dep_gbm -+ if dep_egl.found() -+ deps_drm += dep_egl -+ endif - srcs_drm += 'drm-gbm.c' - config_h.set('BUILD_DRM_GBM', '1') - endif --- -2.20.1 - diff --git a/package/weston/0003-pipewire-add-support-for-0.3-API.patch b/package/weston/0003-pipewire-add-support-for-0.3-API.patch deleted file mode 100644 index b486b3de5c..0000000000 --- a/package/weston/0003-pipewire-add-support-for-0.3-API.patch +++ /dev/null @@ -1,391 +0,0 @@ -From cc08737e3fd174ec3c4c208ea4f2a3a6a9e8af3e Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Mon, 6 Jul 2020 00:58:02 -0600 -Subject: [PATCH] pipewire: add support for 0.3 API - -Fixes: #369 - -Signed-off-by: James Hilliard -[james.hilliard1 at gmail.com: backport from upstream commit -80b585f8d2a31e780b4de41fbd187a742bea7e1a] ---- - .gitlab-ci.yml | 2 +- - .gitlab-ci/debian-install.sh | 16 ++++- - pipewire/meson.build | 28 ++++++--- - pipewire/pipewire-plugin.c | 118 ++++++++++++++++++++++++++++++++++- - 4 files changed, 151 insertions(+), 13 deletions(-) - -diff --git a/pipewire/meson.build b/pipewire/meson.build -index 3d3374b8..e30a0b62 100644 ---- a/pipewire/meson.build -+++ b/pipewire/meson.build -@@ -5,17 +5,25 @@ if get_option('pipewire') - error('Attempting to build the pipewire plugin without the required DRM backend. ' + user_hint) - endif - -- depnames = [ -- 'libpipewire-0.2', 'libspa-0.1' -- ] - deps_pipewire = [ dep_libweston_private ] -- foreach depname : depnames -- dep = dependency(depname, required: false) -- if not dep.found() -- error('Pipewire plugin requires @0@ which was not found. '.format(depname) + user_hint) -- endif -- deps_pipewire += dep -- endforeach -+ -+ dep_libpipewire = dependency('libpipewire-0.3', required: false) -+ if not dep_libpipewire.found() -+ dep_libpipewire = dependency('libpipewire-0.2', required: false) -+ endif -+ if not dep_libpipewire.found() -+ error('Pipewire plugin requires libpipewire which was not found. ' + user_hint) -+ endif -+ deps_pipewire += dep_libpipewire -+ -+ dep_libspa = dependency('libspa-0.2', required: false) -+ if not dep_libspa.found() -+ dep_libspa = dependency('libspa-0.1', required: false) -+ endif -+ if not dep_libspa.found() -+ error('Pipewire plugin requires libspa which was not found. ' + user_hint) -+ endif -+ deps_pipewire += dep_libspa - - plugin_pipewire = shared_library( - 'pipewire-plugin', -diff --git a/pipewire/pipewire-plugin.c b/pipewire/pipewire-plugin.c -index 6f892574..ce70ea63 100644 ---- a/pipewire/pipewire-plugin.c -+++ b/pipewire/pipewire-plugin.c -@@ -34,20 +34,27 @@ - #include - #include - -+#include -+ - #include - #include - #include - --#include -+#if PW_CHECK_VERSION(0, 2, 90) -+#include -+#include -+#endif - - #define PROP_RANGE(min, max) 2, (min), (max) - -+#if !PW_CHECK_VERSION(0, 2, 90) - struct type { - struct spa_type_media_type media_type; - struct spa_type_media_subtype media_subtype; - struct spa_type_format_video format_video; - struct spa_type_video_format video_format; - }; -+#endif - - struct weston_pipewire { - struct weston_compositor *compositor; -@@ -60,12 +67,19 @@ struct weston_pipewire { - struct pw_loop *loop; - struct wl_event_source *loop_source; - -+#if PW_CHECK_VERSION(0, 2, 90) -+ struct pw_context *context; -+#endif - struct pw_core *core; - struct pw_type *t; -+#if PW_CHECK_VERSION(0, 2, 90) -+ struct spa_hook core_listener; -+#else - struct type type; - - struct pw_remote *remote; - struct spa_hook remote_listener; -+#endif - }; - - struct pipewire_output { -@@ -100,6 +114,7 @@ struct pipewire_frame_data { - struct wl_event_source *fence_sync_event_source; - }; - -+#if !PW_CHECK_VERSION(0, 2, 90) - static inline void init_type(struct type *type, struct spa_type_map *map) - { - spa_type_media_type_map(map, &type->media_type); -@@ -107,6 +122,7 @@ static inline void init_type(struct type *type, struct spa_type_map *map) - spa_type_format_video_map(map, &type->format_video); - spa_type_video_format_map(map, &type->video_format); - } -+#endif - - static void - pipewire_debug_impl(struct weston_pipewire *pipewire, -@@ -141,6 +157,7 @@ pipewire_debug_impl(struct weston_pipewire *pipewire, - free(logstr); - } - -+#if !PW_CHECK_VERSION(0, 2, 90) - static void - pipewire_debug(struct weston_pipewire *pipewire, const char *fmt, ...) - { -@@ -150,6 +167,7 @@ pipewire_debug(struct weston_pipewire *pipewire, const char *fmt, ...) - pipewire_debug_impl(pipewire, NULL, fmt, ap); - va_end(ap); - } -+#endif - - static void - pipewire_output_debug(struct pipewire_output *output, const char *fmt, ...) -@@ -185,7 +203,9 @@ pipewire_output_handle_frame(struct pipewire_output *output, int fd, - const struct weston_drm_virtual_output_api *api = - output->pipewire->virtual_output_api; - size_t size = output->output->height * stride; -+#if !PW_CHECK_VERSION(0, 2, 90) - struct pw_type *t = output->pipewire->t; -+#endif - struct pw_buffer *buffer; - struct spa_buffer *spa_buffer; - struct spa_meta_header *h; -@@ -203,7 +223,12 @@ pipewire_output_handle_frame(struct pipewire_output *output, int fd, - - spa_buffer = buffer->buffer; - -+#if PW_CHECK_VERSION(0, 2, 90) -+ if ((h = spa_buffer_find_meta_data(spa_buffer, SPA_META_Header, -+ sizeof(struct spa_meta_header)))) { -+#else - if ((h = spa_buffer_find_meta(spa_buffer, t->meta.Header))) { -+#endif - h->pts = -1; - h->flags = 0; - h->seq = output->seq++; -@@ -375,18 +400,40 @@ pipewire_set_dpms(struct weston_output *base_output, enum dpms_enum level) - static int - pipewire_output_connect(struct pipewire_output *output) - { -+#if !PW_CHECK_VERSION(0, 2, 90) - struct weston_pipewire *pipewire = output->pipewire; - struct type *type = &pipewire->type; -+#endif - uint8_t buffer[1024]; - struct spa_pod_builder builder = - SPA_POD_BUILDER_INIT(buffer, sizeof(buffer)); - const struct spa_pod *params[1]; -+#if !PW_CHECK_VERSION(0, 2, 90) - struct pw_type *t = pipewire->t; -+#endif - int frame_rate = output->output->current_mode->refresh / 1000; - int width = output->output->width; - int height = output->output->height; - int ret; - -+#if PW_CHECK_VERSION(0, 2, 90) -+ params[0] = spa_pod_builder_add_object(&builder, -+ SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat, -+ SPA_FORMAT_mediaType, SPA_POD_Id(SPA_MEDIA_TYPE_video), -+ SPA_FORMAT_mediaSubtype, SPA_POD_Id(SPA_MEDIA_SUBTYPE_raw), -+ SPA_FORMAT_VIDEO_format, SPA_POD_Id(SPA_VIDEO_FORMAT_BGRx), -+ SPA_FORMAT_VIDEO_size, SPA_POD_Rectangle(&SPA_RECTANGLE(width, height)), -+ SPA_FORMAT_VIDEO_framerate, SPA_POD_Fraction(&SPA_FRACTION (0, 1)), -+ SPA_FORMAT_VIDEO_maxFramerate, -+ SPA_POD_CHOICE_RANGE_Fraction(&SPA_FRACTION(frame_rate, 1), -+ &SPA_FRACTION(1, 1), -+ &SPA_FRACTION(frame_rate, 1))); -+ -+ ret = pw_stream_connect(output->stream, PW_DIRECTION_OUTPUT, SPA_ID_INVALID, -+ (PW_STREAM_FLAG_DRIVER | -+ PW_STREAM_FLAG_MAP_BUFFERS), -+ params, 1); -+#else - params[0] = spa_pod_builder_object(&builder, - t->param.idEnumFormat, t->spa_format, - "I", type->media_type.video, -@@ -406,6 +453,7 @@ pipewire_output_connect(struct pipewire_output *output) - (PW_STREAM_FLAG_DRIVER | - PW_STREAM_FLAG_MAP_BUFFERS), - params, 1); -+#endif - if (ret != 0) { - weston_log("Failed to connect pipewire stream: %s", - spa_strerror(ret)); -@@ -482,26 +530,42 @@ pipewire_output_stream_state_changed(void *data, enum pw_stream_state old, - } - - static void -+#if PW_CHECK_VERSION(0, 2, 90) -+pipewire_output_stream_param_changed(void *data, uint32_t id, const struct spa_pod *format) -+#else - pipewire_output_stream_format_changed(void *data, const struct spa_pod *format) -+#endif - { - struct pipewire_output *output = data; -+#if !PW_CHECK_VERSION(0, 2, 90) - struct weston_pipewire *pipewire = output->pipewire; -+#endif - uint8_t buffer[1024]; - struct spa_pod_builder builder = - SPA_POD_BUILDER_INIT(buffer, sizeof(buffer)); - const struct spa_pod *params[2]; -+#if !PW_CHECK_VERSION(0, 2, 90) - struct pw_type *t = pipewire->t; -+#endif - int32_t width, height, stride, size; - const int bpp = 4; - - if (!format) { - pipewire_output_debug(output, "format = None"); -+#if PW_CHECK_VERSION(0, 2, 90) -+ pw_stream_update_params(output->stream, NULL, 0); -+#else - pw_stream_finish_format(output->stream, 0, NULL, 0); -+#endif - return; - } - -+#if PW_CHECK_VERSION(0, 2, 90) -+ spa_format_video_raw_parse(format, &output->video_format); -+#else - spa_format_video_raw_parse(format, &output->video_format, - &pipewire->type.format_video); -+#endif - - width = output->video_format.size.width; - height = output->video_format.size.height; -@@ -510,6 +574,21 @@ pipewire_output_stream_format_changed(void *data, const struct spa_pod *format) - - pipewire_output_debug(output, "format = %dx%d", width, height); - -+#if PW_CHECK_VERSION(0, 2, 90) -+ params[0] = spa_pod_builder_add_object(&builder, -+ SPA_TYPE_OBJECT_ParamBuffers, SPA_PARAM_Buffers, -+ SPA_PARAM_BUFFERS_size, SPA_POD_Int(size), -+ SPA_PARAM_BUFFERS_stride, SPA_POD_Int(stride), -+ SPA_PARAM_BUFFERS_buffers, SPA_POD_CHOICE_RANGE_Int(4, 2, 8), -+ SPA_PARAM_BUFFERS_align, SPA_POD_Int(16)); -+ -+ params[1] = spa_pod_builder_add_object(&builder, -+ SPA_TYPE_OBJECT_ParamMeta, SPA_PARAM_Meta, -+ SPA_PARAM_META_type, SPA_POD_Id(SPA_META_Header), -+ SPA_PARAM_META_size, SPA_POD_Int(sizeof(struct spa_meta_header))); -+ -+ pw_stream_update_params(output->stream, params, 2); -+#else - params[0] = spa_pod_builder_object(&builder, - t->param.idBuffers, t->param_buffers.Buffers, - ":", t->param_buffers.size, -@@ -527,12 +606,17 @@ pipewire_output_stream_format_changed(void *data, const struct spa_pod *format) - ":", t->param_meta.size, "i", sizeof(struct spa_meta_header)); - - pw_stream_finish_format(output->stream, 0, params, 2); -+#endif - } - - static const struct pw_stream_events stream_events = { - PW_VERSION_STREAM_EVENTS, - .state_changed = pipewire_output_stream_state_changed, -+#if PW_CHECK_VERSION(0, 2, 90) -+ .param_changed = pipewire_output_stream_param_changed, -+#else - .format_changed = pipewire_output_stream_format_changed, -+#endif - }; - - static struct weston_output * -@@ -560,7 +644,11 @@ pipewire_output_create(struct weston_compositor *c, char *name) - if (!head) - goto err; - -+#if PW_CHECK_VERSION(0, 2, 90) -+ output->stream = pw_stream_new(pipewire->core, name, NULL); -+#else - output->stream = pw_stream_new(pipewire->remote, name, NULL); -+#endif - if (!output->stream) { - weston_log("Cannot initialize pipewire stream\n"); - goto err; -@@ -704,6 +792,14 @@ weston_pipewire_loop_handler(int fd, uint32_t mask, void *data) - return 0; - } - -+#if PW_CHECK_VERSION(0, 2, 90) -+static void -+weston_pipewire_error(void *data, uint32_t id, int seq, int res, -+ const char *error) -+{ -+ weston_log("pipewire remote error: %s\n", error); -+} -+#else - static void - weston_pipewire_state_changed(void *data, enum pw_remote_state old, - enum pw_remote_state state, const char *error) -@@ -725,12 +821,20 @@ weston_pipewire_state_changed(void *data, enum pw_remote_state old, - break; - } - } -+#endif - - -+#if PW_CHECK_VERSION(0, 2, 90) -+static const struct pw_core_events core_events = { -+ PW_VERSION_CORE_EVENTS, -+ .error = weston_pipewire_error, -+}; -+#else - static const struct pw_remote_events remote_events = { - PW_VERSION_REMOTE_EVENTS, - .state_changed = weston_pipewire_state_changed, - }; -+#endif - - static int - weston_pipewire_init(struct weston_pipewire *pipewire) -@@ -745,10 +849,19 @@ weston_pipewire_init(struct weston_pipewire *pipewire) - - pw_loop_enter(pipewire->loop); - -+#if PW_CHECK_VERSION(0, 2, 90) -+ pipewire->context = pw_context_new(pipewire->loop, NULL, 0); -+#else - pipewire->core = pw_core_new(pipewire->loop, NULL); - pipewire->t = pw_core_get_type(pipewire->core); - init_type(&pipewire->type, pipewire->t->map); -+#endif - -+#if PW_CHECK_VERSION(0, 2, 90) -+ pw_core_add_listener(pipewire->core, -+ &pipewire->core_listener, -+ &core_events, pipewire); -+#else - pipewire->remote = pw_remote_new(pipewire->core, NULL, 0); - pw_remote_add_listener(pipewire->remote, - &pipewire->remote_listener, -@@ -777,6 +890,7 @@ weston_pipewire_init(struct weston_pipewire *pipewire) - goto err; - } - } -+#endif - - loop = wl_display_get_event_loop(pipewire->compositor->wl_display); - pipewire->loop_source = -@@ -786,12 +900,14 @@ weston_pipewire_init(struct weston_pipewire *pipewire) - pipewire); - - return 0; -+#if !PW_CHECK_VERSION(0, 2, 90) - err: - if (pipewire->remote) - pw_remote_destroy(pipewire->remote); - pw_loop_leave(pipewire->loop); - pw_loop_destroy(pipewire->loop); - return -1; -+#endif - } - - static const struct weston_pipewire_api pipewire_api = { --- -2.25.1 - diff --git a/package/weston/0004-pipewire-fix-null-deref-in-0-3-API.patch b/package/weston/0004-pipewire-fix-null-deref-in-0-3-API.patch deleted file mode 100644 index f65348e166..0000000000 --- a/package/weston/0004-pipewire-fix-null-deref-in-0-3-API.patch +++ /dev/null @@ -1,28 +0,0 @@ -From a67393c353e0f25b142910a817be5a7754d436c3 Mon Sep 17 00:00:00 2001 -From: Ambareesh Balaji -Date: Sat, 5 Dec 2020 20:49:55 -0500 -Subject: [PATCH] pipewire: fix null deref in 0.3 API - -Signed-off-by: Ambareesh Balaji -[Retrieved from: -https://gitlab.freedesktop.org/wayland/weston/-/commit/a67393c353e0f25b142910a817be5a7754d436c3] -Signed-off-by: Fabrice Fontaine ---- - pipewire/pipewire-plugin.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/pipewire/pipewire-plugin.c b/pipewire/pipewire-plugin.c -index ca5cbfec1..55705acfc 100644 ---- a/pipewire/pipewire-plugin.c -+++ b/pipewire/pipewire-plugin.c -@@ -856,6 +856,7 @@ weston_pipewire_init(struct weston_pipewire *pipewire) - - #if PW_CHECK_VERSION(0, 2, 90) - pipewire->context = pw_context_new(pipewire->loop, NULL, 0); -+ pipewire->core = pw_context_connect(pipewire->context, NULL, 0); - #else - pipewire->core = pw_core_new(pipewire->loop, NULL); - pipewire->t = pw_core_get_type(pipewire->core); --- -GitLab - diff --git a/package/weston/Config.in b/package/weston/Config.in index 8f3dbc7931..d45e50baaa 100644 --- a/package/weston/Config.in +++ b/package/weston/Config.in @@ -35,7 +35,7 @@ choice prompt "default compositor" config BR2_PACKAGE_WESTON_DEFAULT_FBDEV - bool "fbdev" + bool "fbdev (deprecated)" select BR2_PACKAGE_WESTON_FBDEV config BR2_PACKAGE_WESTON_DEFAULT_DRM @@ -46,21 +46,31 @@ config BR2_PACKAGE_WESTON_DEFAULT_DRM comment "drm backend needs mesa3d w/ EGL driver" depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL && !BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL +config BR2_PACKAGE_WESTON_DEFAULT_HEADLESS + bool "headless" + select BR2_PACKAGE_WESTON_HEADLESS + +config BR2_PACKAGE_WESTON_DEFAULT_WAYLAND + bool "wayland (nested)" + select BR2_PACKAGE_WESTON_WAYLAND + config BR2_PACKAGE_WESTON_DEFAULT_X11 - bool "X11" + bool "X11 (nested)" depends on BR2_PACKAGE_XORG7 select BR2_PACKAGE_WESTON_X11 -comment "X11 backend needs X.org" +comment "X11 (nested) backend needs X.org" depends on !BR2_PACKAGE_XORG7 endchoice config BR2_PACKAGE_WESTON_DEFAULT_COMPOSITOR string - default "fbdev" if BR2_PACKAGE_WESTON_DEFAULT_FBDEV - default "drm" if BR2_PACKAGE_WESTON_DEFAULT_DRM - default "x11" if BR2_PACKAGE_WESTON_DEFAULT_X11 + default "fbdev" if BR2_PACKAGE_WESTON_DEFAULT_FBDEV + default "drm" if BR2_PACKAGE_WESTON_DEFAULT_DRM + default "headless" if BR2_PACKAGE_WESTON_DEFAULT_HEADLESS + default "wayland" if BR2_PACKAGE_WESTON_DEFAULT_WAYLAND + default "x11" if BR2_PACKAGE_WESTON_DEFAULT_X11 config BR2_PACKAGE_WESTON_DRM bool "DRM compositor" @@ -71,7 +81,7 @@ comment "DRM compositor needs an OpenGL EGL backend provided by mesa3d" depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL && !BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL config BR2_PACKAGE_WESTON_FBDEV - bool "fbdev compositor" + bool "fbdev compositor (deprecated)" # FreeRDP needs threads and !static, already the case for weston config BR2_PACKAGE_WESTON_RDP @@ -99,13 +109,19 @@ comment "RDP compositor needs a toolchain w/ wchar, C++" depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP +config BR2_PACKAGE_WESTON_HEADLESS + bool "headless (testing) compositor" + +config BR2_PACKAGE_WESTON_WAYLAND + bool "Wayland (nested) compositor" + config BR2_PACKAGE_WESTON_X11 - bool "X11 compositor" + bool "X11 (nested) compositor" depends on BR2_PACKAGE_XORG7 select BR2_PACKAGE_LIBXCB select BR2_PACKAGE_XLIB_LIBX11 -comment "X11 compositor needs X.org enabled" +comment "X11 (nested) compositor needs X.org enabled" depends on !BR2_PACKAGE_XORG7 config BR2_PACKAGE_WESTON_XWAYLAND diff --git a/package/weston/weston.hash b/package/weston/weston.hash index 5a6b38686a..b78a7c7550 100644 --- a/package/weston/weston.hash +++ b/package/weston/weston.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2020-September/041595.html -md5 b406da0fe9139fd39653238fde22a6cf weston-9.0.0.tar.xz -sha1 90b9540a0bd6d6f7a465817f1c696d4d393183c9 weston-9.0.0.tar.xz -sha256 5cf5d6ce192e0eb15c1fc861a436bf21b5bb3b91dbdabbdebe83e1f83aa098fe weston-9.0.0.tar.xz -sha512 ccc263f8279b7b23e5c593b4a8a023de2c3dc178b1b8d6593599171770bcfe97608de9fcb77aa1cab39255451d289d323e51c317dae190c7641282e085b84f90 weston-9.0.0.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2022-February/042103.html +md5 bc4abe2ee6904a4890a0c641c6257f91 weston-10.0.0.tar.xz +sha1 b1a51e3bb7ee1d75bbf728c8071771e07fc97fdd weston-10.0.0.tar.xz +sha256 5c23964112b90238bed39e5dd1e41cd71a79398813cdc3bbb15a9fdc94e547ae weston-10.0.0.tar.xz +sha512 77e05530751e4f743eebf015ab5b78a1fcc66b774713b5e296cfffc488be84e459f811c85ac4280b7b63eebf4ff5c958dd7306376ab343e6b80feae16c8c35a4 weston-10.0.0.tar.xz sha256 fdb65868f65d0fbdb05c2d3b779e10ce9969fa0c4b9262ba4f260e87086ab860 COPYING diff --git a/package/weston/weston.mk b/package/weston/weston.mk index 6dd5439291..a0a18d9358 100644 --- a/package/weston/weston.mk +++ b/package/weston/weston.mk @@ -4,7 +4,7 @@ # ################################################################################ -WESTON_VERSION = 9.0.0 +WESTON_VERSION = 10.0.0 WESTON_SITE = https://wayland.freedesktop.org/releases WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz WESTON_LICENSE = MIT @@ -12,12 +12,14 @@ WESTON_LICENSE_FILES = COPYING WESTON_CPE_ID_VENDOR = wayland WESTON_DEPENDENCIES = host-pkgconf wayland wayland-protocols \ - libxkbcommon pixman libpng jpeg udev cairo libinput libdrm + libxkbcommon pixman libpng udev cairo libinput libdrm WESTON_CONF_OPTS = \ -Dbackend-headless=false \ -Dcolor-management-colord=false \ - -Dremoting=false + -Ddoc=false \ + -Dremoting=false \ + -Dtools=calibrator,debug,info,terminal,touch-calibrator # Uses VIDIOC_EXPBUF, only available from 3.8+ ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_8),y) @@ -33,6 +35,13 @@ else WESTON_CONF_OPTS += -Dlauncher-logind=false endif +ifeq ($(BR2_PACKAGE_JPEG),y) +WESTON_CONF_OPTS += -Dimage-jpeg=true +WESTON_DEPENDENCIES += jpeg +else +WESTON_CONF_OPTS += -Dimage-jpeg=false +endif + ifeq ($(BR2_PACKAGE_WEBP),y) WESTON_CONF_OPTS += -Dimage-webp=true WESTON_DEPENDENCIES += webp @@ -48,10 +57,10 @@ endef define WESTON_USERS - - weston-launch -1 - - - - Weston launcher group endef -WESTON_CONF_OPTS += -Dweston-launch=true +WESTON_CONF_OPTS += -Ddeprecated-weston-launch=true WESTON_DEPENDENCIES += linux-pam else -WESTON_CONF_OPTS += -Dweston-launch=false +WESTON_CONF_OPTS += -Ddeprecated-weston-launch=false endif ifeq ($(BR2_PACKAGE_HAS_LIBEGL_WAYLAND)$(BR2_PACKAGE_HAS_LIBGLES),yy) @@ -77,9 +86,9 @@ WESTON_CONF_OPTS += -Dbackend-rdp=false endif ifeq ($(BR2_PACKAGE_WESTON_FBDEV),y) -WESTON_CONF_OPTS += -Dbackend-fbdev=true +WESTON_CONF_OPTS += -Ddeprecated-backend-fbdev=true else -WESTON_CONF_OPTS += -Dbackend-fbdev=false +WESTON_CONF_OPTS += -Ddeprecated-backend-fbdev=false endif ifeq ($(BR2_PACKAGE_WESTON_DRM),y) @@ -88,6 +97,18 @@ else WESTON_CONF_OPTS += -Dbackend-drm=false endif +ifeq ($(BR2_PACKAGE_WESTON_HEADLESS),y) +WESTON_CONF_OPTS += -Dbackend-headless=true +else +WESTON_CONF_OPTS += -Dbackend-headless=false +endif + +ifeq ($(BR2_PACKAGE_WESTON_WAYLAND),y) +WESTON_CONF_OPTS += -Dbackend-wayland=true +else +WESTON_CONF_OPTS += -Dbackend-wayland=false +endif + ifeq ($(BR2_PACKAGE_WESTON_X11),y) WESTON_CONF_OPTS += -Dbackend-x11=true WESTON_DEPENDENCIES += libxcb xlib_libX11 -- 2.25.1 From kuzminov.sergey81 at gmail.com Sat Feb 5 23:04:22 2022 From: kuzminov.sergey81 at gmail.com (Sergey Kuzminov) Date: Sun, 6 Feb 2022 02:04:22 +0300 Subject: [Buildroot] [PATCH v2] configs/orangepi_zero_defconfig: switch to extlinux In-Reply-To: <033373DF-6707-4295-8A12-D4ABE072608F@benettiengineering.com> References: <20220205215558.30751-1-kuzminov.sergey81@gmail.com> <033373DF-6707-4295-8A12-D4ABE072608F@benettiengineering.com> Message-ID: <4b114bca-d4ee-9ff9-931c-bd7501eb2e32@gmail.com> Hi Giulio, 06.02.2022 01:18, Giulio Benetti: > Hi Sergey, > > below I give you a better example of commit log, > and the dealing with V1->V2 series. > >> Il giorno 5 feb 2022, alle ore 22:56, Sergey Kuzminov ha scritto: >> >> ?Changes: >> v1: > > Please Remove this line ^^^ > >> - Exclude FAT partition, it is no longer needed for U-Boot. >> - Switch the rootfs partition from MBR to GPT for partition-uuid to work. >> - Switch to extlinux, this is convenient for debugging. >> - Create common scenarios for multiple boards to create an SD image: board/orangepi/common. >> >> v2: > Remove this ^^^ line >> - Fix typo in first line of changes (s/he/it). > This too ^^^ >> - Add BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y. > Here we need an explanation of the reason why, what this implies. >> - Exclude one boot option from extlinux.conf. > This ^^^ too >> >> Signed-off-by: Sergey Kuzminov > ?- > V1->V2: > * improved commit log > * removed commented line in extlinux.conf > * removed one boot option from extlinux.conf >> --- > > So as you can see, commit log doesn?t mention the patch version, while after the 3 dashes you > can write in general whatever you want because it won?t be part of commit log and it?s usually used > to report V1->V2 version etc. Changes: * Exclude FAT partition, it is no longer needed for U-Boot. * Switch the rootfs partition from MBR to GPT for partition-uuid to work. * Switch to extlinux, this is convenient for debugging. * Create common scenarios for multiple boards to create an SD image: board/orangepi/common. * Add BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y, remount root filesystem read-write during boot. --- V1->V2: * improved commit log * removed commented line in extlinux.conf * removed one boot option from extlinux.conf V2->V3: * improved commit log That's right? >> +++ b/board/orangepi/common/genimage.cfg >> @@ -0,0 +1,23 @@ >> +image sdcard.img { >> + partition u-boot { >> + in-partition-table = false >> + image = "u-boot-sunxi-with-spl.bin" >> + offset = 8K >> + size = 1000K # 1MB - 8KB(offset) - 16KB(GPT) >> + } >> + >> + hdimage { >> + partition-table-type = gpt >> + gpt-location = 1008K # 1MB - 16KB(GPT) >> + gpt-no-backup = true >> + # After writing the image to the SD card, >> + # backup GPT data structures at the end of the disk: >> + # gdisk /dev/mmcblk0 then press the buttons: x, e, w, y > > Why don?t you make this part ^^^ automatic with a script or you simply use genimage itself? > > What it?s expected as board defconfig is something that you burn a sdcard with the sdcard.img file and that?s it. So here you need to make it automatic. > > So we wait for V3 with the commit log form you read above and requested changes. The problem is that it is not possible to create an sdcard.img image with the correct GPT structure. The second copy of the GPT must be at the end of the disk, and the size of sdcard.img will not match the SD card. Will work and so, with one copy of GPT. But the disk utilities may issue a warning about the absence of a second copy of the GPT. You can correct the situation only after writing sdcard.img to the SD card, or during the first loading of the board in a separate script. This is out of scope for this patch. From giulio.benetti at benettiengineering.com Sat Feb 5 23:13:56 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 00:13:56 +0100 Subject: [Buildroot] [PATCH v2] configs/orangepi_zero_defconfig: switch to extlinux In-Reply-To: <4b114bca-d4ee-9ff9-931c-bd7501eb2e32@gmail.com> References: <20220205215558.30751-1-kuzminov.sergey81@gmail.com> <033373DF-6707-4295-8A12-D4ABE072608F@benettiengineering.com> <4b114bca-d4ee-9ff9-931c-bd7501eb2e32@gmail.com> Message-ID: Hi Sergey, On 06/02/22 00:04, Sergey Kuzminov wrote: > Hi Giulio, > > 06.02.2022 01:18, Giulio Benetti: >> Hi Sergey, >> >> below I give you a better example of commit log, >> and the dealing with V1->V2 series. >> >>> Il giorno 5 feb 2022, alle ore 22:56, Sergey Kuzminov ha scritto: >>> >>> ?Changes: >>> v1: >> >> Please Remove this line ^^^ >> >>> - Exclude FAT partition, it is no longer needed for U-Boot. >>> - Switch the rootfs partition from MBR to GPT for partition-uuid to work. >>> - Switch to extlinux, this is convenient for debugging. >>> - Create common scenarios for multiple boards to create an SD image: board/orangepi/common. >>> >>> v2: >> Remove this ^^^ line >>> - Fix typo in first line of changes (s/he/it). >> This too ^^^ >>> - Add BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y. >> Here we need an explanation of the reason why, what this implies. >>> - Exclude one boot option from extlinux.conf. >> This ^^^ too >>> >>> Signed-off-by: Sergey Kuzminov >> ?- >> V1->V2: >> * improved commit log >> * removed commented line in extlinux.conf >> * removed one boot option from extlinux.conf >>> --- >> >> So as you can see, commit log doesn?t mention the patch version, while after the 3 dashes you >> can write in general whatever you want because it won?t be part of commit log and it?s usually used >> to report V1->V2 version etc. > > Changes: > * Exclude FAT partition, it is no longer needed for U-Boot. > * Switch the rootfs partition from MBR to GPT for partition-uuid to work. > * Switch to extlinux, this is convenient for debugging. > * Create common scenarios for multiple boards to create an SD image: > board/orangepi/common. > * Add BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y, remount root filesystem > read-write during boot. > > --- > V1->V2: > * improved commit log > * removed commented line in extlinux.conf > * removed one boot option from extlinux.conf > > V2->V3: > * improved commit log > > That's right? Yes, this works for me now > >>> +++ b/board/orangepi/common/genimage.cfg >>> @@ -0,0 +1,23 @@ >>> +image sdcard.img { >>> + partition u-boot { >>> + in-partition-table = false >>> + image = "u-boot-sunxi-with-spl.bin" >>> + offset = 8K >>> + size = 1000K # 1MB - 8KB(offset) - 16KB(GPT) >>> + } >>> + >>> + hdimage { >>> + partition-table-type = gpt >>> + gpt-location = 1008K # 1MB - 16KB(GPT) >>> + gpt-no-backup = true >>> + # After writing the image to the SD card, >>> + # backup GPT data structures at the end of the disk: >>> + # gdisk /dev/mmcblk0 then press the buttons: x, e, w, y >> >> Why don?t you make this part ^^^ automatic with a script or you simply use genimage itself? >> >> What it?s expected as board defconfig is something that you burn a sdcard with the sdcard.img file and that?s it. So here you need to make it automatic. >> >> So we wait for V3 with the commit log form you read above and requested changes. > > The problem is that it is not possible to create an sdcard.img image > with the correct GPT structure. The second copy of the GPT must be at > the end of the disk, and the size of sdcard.img will not match the SD > card. Will work and so, with one copy of GPT. But the disk utilities may > issue a warning about the absence of a second copy of the GPT. You can > correct the situation only after writing sdcard.img to the SD card, or > during the first loading of the board in a separate script. This is out > of scope for this patch. Ok, so please remove those 3 commented lines since I think the board actually works without those additional commands, correct? Otherwise, it this doesn't work on target without gdisk commands, you need to add a post-image.sh script to launch those commands. Thank you! Best regards -- Giulio Benetti Benetti Engineering sas From kuzminov.sergey81 at gmail.com Sat Feb 5 23:17:06 2022 From: kuzminov.sergey81 at gmail.com (Sergey Kuzminov) Date: Sun, 6 Feb 2022 02:17:06 +0300 Subject: [Buildroot] [PATCH v2] configs/orangepi_zero_defconfig: switch to extlinux In-Reply-To: References: <20220205215558.30751-1-kuzminov.sergey81@gmail.com> <033373DF-6707-4295-8A12-D4ABE072608F@benettiengineering.com> <4b114bca-d4ee-9ff9-931c-bd7501eb2e32@gmail.com> Message-ID: <54d39db2-d11d-ffc6-1966-c721b26d1a5c@gmail.com> 06.02.2022 02:13, Giulio Benetti ?????: > Hi Sergey, > > On 06/02/22 00:04, Sergey Kuzminov wrote: >> Hi Giulio, >> >> 06.02.2022 01:18, Giulio Benetti: >>> Hi Sergey, >>> >>> below I give you a better example of commit log, >>> and the dealing with V1->V2 series. >>> >>>> Il giorno 5 feb 2022, alle ore 22:56, Sergey Kuzminov >>>> ha scritto: >>>> >>>> ?Changes: >>>> v1: >>> >>> Please Remove this line ^^^ >>> >>>> - Exclude FAT partition, it is no longer needed for U-Boot. >>>> - Switch the rootfs partition from MBR to GPT for partition-uuid to >>>> work. >>>> - Switch to extlinux, this is convenient for debugging. >>>> - Create common scenarios for multiple boards to create an SD image: >>>> board/orangepi/common. >>>> >>>> v2: >>> Remove this ^^^ line >>>> - Fix typo in first line of changes (s/he/it). >>> This too ^^^ >>>> - Add BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y. >>> Here we need an explanation of the reason why, what this implies. >>>> - Exclude one boot option from extlinux.conf. >>> This ^^^ too >>>> >>>> Signed-off-by: Sergey Kuzminov >>> ?- >>> V1->V2: >>> * improved commit log >>> * removed commented line in extlinux.conf >>> * removed one boot option from extlinux.conf >>>> --- >>> >>> So as you can see, commit log doesn?t mention the patch version, >>> while after the 3 dashes you >>> can write in general whatever you want because it won?t be part of >>> commit log and it?s usually used >>> to report V1->V2 version etc. >> >> Changes: >> * Exclude FAT partition, it is no longer needed for U-Boot. >> * Switch the rootfs partition from MBR to GPT for partition-uuid to work. >> * Switch to extlinux, this is convenient for debugging. >> * Create common scenarios for multiple boards to create an SD image: >> board/orangepi/common. >> * Add BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y, remount root filesystem >> read-write during boot. >> >> --- >> V1->V2: >> * improved commit log >> * removed commented line in extlinux.conf >> * removed one boot option from extlinux.conf >> >> V2->V3: >> * improved commit log >> >> That's right? > > Yes, this works for me now > >> >>>> +++ b/board/orangepi/common/genimage.cfg >>>> @@ -0,0 +1,23 @@ >>>> +image sdcard.img { >>>> +??? partition u-boot { >>>> +??????? in-partition-table = false >>>> +??????? image = "u-boot-sunxi-with-spl.bin" >>>> +??????? offset = 8K >>>> +??????? size = 1000K # 1MB - 8KB(offset) - 16KB(GPT) >>>> +??? } >>>> + >>>> +??? hdimage { >>>> +??????? partition-table-type = gpt >>>> +??????? gpt-location = 1008K # 1MB - 16KB(GPT) >>>> +??????? gpt-no-backup = true >>>> +??????? # After writing the image to the SD card, >>>> +??????? # backup GPT data structures at the end of the disk: >>>> +??????? # gdisk /dev/mmcblk0 then press the buttons: x, e, w, y >>> >>> Why don?t you make this part ^^^ automatic with a script or you >>> simply use genimage itself? >>> >>> What it?s expected as board defconfig is something that you burn a >>> sdcard with the sdcard.img file and that?s it. So here you need to >>> make it automatic. >>> >>> So we wait for V3 with the commit log form you read above and >>> requested changes. >> >> The problem is that it is not possible to create an sdcard.img image >> with the correct GPT structure. The second copy of the GPT must be at >> the end of the disk, and the size of sdcard.img will not match the SD >> card. Will work and so, with one copy of GPT. But the disk utilities may >> issue a warning about the absence of a second copy of the GPT. You can >> correct the situation only after writing sdcard.img to the SD card, or >> during the first loading of the board in a separate script. This is out >> of scope for this patch. > > Ok, so please remove those 3 commented lines since I think the board > actually works without those additional commands, correct? Yes. > > Otherwise, it this doesn't work on target without gdisk commands, you > need to add a post-image.sh script to launch those commands. > > Thank you! > Best regards From giulio.benetti at benettiengineering.com Sat Feb 5 23:28:01 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 00:28:01 +0100 Subject: [Buildroot] [PATCH v2] configs/orangepi_zero_defconfig: switch to extlinux In-Reply-To: <54d39db2-d11d-ffc6-1966-c721b26d1a5c@gmail.com> References: <54d39db2-d11d-ffc6-1966-c721b26d1a5c@gmail.com> Message-ID: Hi Sergey, > Il giorno 6 feb 2022, alle ore 00:17, Sergey Kuzminov ha scritto: > > ?06.02.2022 02:13, Giulio Benetti ?????: >> Hi Sergey, >>> On 06/02/22 00:04, Sergey Kuzminov wrote: >>> Hi Giulio, >>> >>> 06.02.2022 01:18, Giulio Benetti: >>>> Hi Sergey, >>>> >>>> below I give you a better example of commit log, >>>> and the dealing with V1->V2 series. >>>> >>>>> Il giorno 5 feb 2022, alle ore 22:56, Sergey Kuzminov ha scritto: >>>>> >>>>> ?Changes: >>>>> v1: >>>> >>>> Please Remove this line ^^^ >>>> >>>>> - Exclude FAT partition, it is no longer needed for U-Boot. >>>>> - Switch the rootfs partition from MBR to GPT for partition-uuid to work. >>>>> - Switch to extlinux, this is convenient for debugging. >>>>> - Create common scenarios for multiple boards to create an SD image: board/orangepi/common. >>>>> >>>>> v2: >>>> Remove this ^^^ line >>>>> - Fix typo in first line of changes (s/he/it). >>>> This too ^^^ >>>>> - Add BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y. >>>> Here we need an explanation of the reason why, what this implies. >>>>> - Exclude one boot option from extlinux.conf. >>>> This ^^^ too >>>>> >>>>> Signed-off-by: Sergey Kuzminov >>>> ?- >>>> V1->V2: >>>> * improved commit log >>>> * removed commented line in extlinux.conf >>>> * removed one boot option from extlinux.conf >>>>> --- >>>> >>>> So as you can see, commit log doesn?t mention the patch version, while after the 3 dashes you >>>> can write in general whatever you want because it won?t be part of commit log and it?s usually used >>>> to report V1->V2 version etc. >>> >>> Changes: >>> * Exclude FAT partition, it is no longer needed for U-Boot. >>> * Switch the rootfs partition from MBR to GPT for partition-uuid to work. >>> * Switch to extlinux, this is convenient for debugging. >>> * Create common scenarios for multiple boards to create an SD image: >>> board/orangepi/common. >>> * Add BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y, remount root filesystem >>> read-write during boot. >>> >>> --- >>> V1->V2: >>> * improved commit log >>> * removed commented line in extlinux.conf >>> * removed one boot option from extlinux.conf >>> >>> V2->V3: >>> * improved commit log >>> >>> That's right? >> Yes, this works for me now >>> >>>>> +++ b/board/orangepi/common/genimage.cfg >>>>> @@ -0,0 +1,23 @@ >>>>> +image sdcard.img { >>>>> + partition u-boot { >>>>> + in-partition-table = false >>>>> + image = "u-boot-sunxi-with-spl.bin" >>>>> + offset = 8K >>>>> + size = 1000K # 1MB - 8KB(offset) - 16KB(GPT) >>>>> + } >>>>> + >>>>> + hdimage { >>>>> + partition-table-type = gpt >>>>> + gpt-location = 1008K # 1MB - 16KB(GPT) >>>>> + gpt-no-backup = true >>>>> + # After writing the image to the SD card, >>>>> + # backup GPT data structures at the end of the disk: >>>>> + # gdisk /dev/mmcblk0 then press the buttons: x, e, w, y >>>> >>>> Why don?t you make this part ^^^ automatic with a script or you simply use genimage itself? >>>> >>>> What it?s expected as board defconfig is something that you burn a sdcard with the sdcard.img file and that?s it. So here you need to make it automatic. >>>> >>>> So we wait for V3 with the commit log form you read above and requested changes. >>> >>> The problem is that it is not possible to create an sdcard.img image >>> with the correct GPT structure. The second copy of the GPT must be at >>> the end of the disk, and the size of sdcard.img will not match the SD >>> card. Will work and so, with one copy of GPT. But the disk utilities may >>> issue a warning about the absence of a second copy of the GPT. You can >>> correct the situation only after writing sdcard.img to the SD card, or >>> during the first loading of the board in a separate script. This is out >>> of scope for this patch. >> Ok, so please remove those 3 commented lines since I think the board actually works without those additional commands, correct? > > Yes. Perfect, so you can send the V3 patch. Please remember to keep my Reviewed-by and Tested-by after your SoB that I?ve given you on V1 patch. You can follow patchwork here: https://patchwork.ozlabs.org/project/buildroot/list/ You should also subscribe to patchwork and mark your V1 and V2 patches as superseded. Thank you Giulio > >> Otherwise, it this doesn't work on target without gdisk commands, you need to add a post-image.sh script to launch those commands. >> Thank you! >> Best regards > -------------- next part -------------- An HTML attachment was scrubbed... URL: From kuzminov.sergey81 at gmail.com Sat Feb 5 23:29:18 2022 From: kuzminov.sergey81 at gmail.com (Sergey Kuzminov) Date: Sun, 6 Feb 2022 02:29:18 +0300 Subject: [Buildroot] [PATCH v3] configs/orangepi_zero_defconfig: switch to extlinux Message-ID: <20220205232918.27091-1-kuzminov.sergey81@gmail.com> Changes: * Exclude FAT partition, it is no longer needed for U-Boot. * Switch the rootfs partition from MBR to GPT for partition-uuid to work. * Switch to extlinux, this is convenient for debugging. * Create common scenarios for multiple boards to create an SD image: board/orangepi/common. * Add BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y, remount root filesystem read-write during boot. --- V1->V2: * improved commit log * removed commented line in extlinux.conf * removed one boot option from extlinux.conf V2->V3: * improved commit log * removed comment from board/orangepi/common/genimage.cfg Signed-off-by: Sergey Kuzminov --- board/orangepi/common/extlinux.conf | 4 +++ board/orangepi/common/genimage.cfg | 20 +++++++++++++ board/orangepi/common/post-build.sh | 34 +++++++++++++++++++++ board/orangepi/orangepi-zero/boot.cmd | 9 ------ board/orangepi/orangepi-zero/genimage.cfg | 36 ----------------------- configs/orangepi_zero_defconfig | 11 ++++--- 6 files changed, 63 insertions(+), 51 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 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..12f496b1fa --- /dev/null +++ b/board/orangepi/common/extlinux.conf @@ -0,0 +1,4 @@ +LABEL default + kernel /boot/%LINUXIMAGE% + devicetreedir /boot + 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..a61c4a039f --- /dev/null +++ b/board/orangepi/common/genimage.cfg @@ -0,0 +1,20 @@ +image sdcard.img { + partition u-boot { + in-partition-table = false + image = "u-boot-sunxi-with-spl.bin" + offset = 8K + size = 1000K # 1MB - 8KB(offset) - 16KB(GPT) + } + + hdimage { + partition-table-type = gpt + gpt-location = 1008K # 1MB - 16KB(GPT) + gpt-no-backup = true + } + + 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/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 5aaa1566c5..96f0c3f600 100644 --- a/configs/orangepi_zero_defconfig +++ b/configs/orangepi_zero_defconfig @@ -20,10 +20,13 @@ 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_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y # Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="63M" +BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y # BR2_TARGET_ROOTFS_TAR is not set # Bootloader @@ -39,16 +42,12 @@ 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 # 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" # Wireless driver and firmware BR2_PACKAGE_XR819_XRADIO=y -- 2.34.1 From giulio.benetti at benettiengineering.com Sat Feb 5 23:34:19 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 00:34:19 +0100 Subject: [Buildroot] [PATCH v3] configs/orangepi_zero_defconfig: switch to extlinux In-Reply-To: <20220205232918.27091-1-kuzminov.sergey81@gmail.com> References: <20220205232918.27091-1-kuzminov.sergey81@gmail.com> Message-ID: <583B80CF-6F5A-4E96-BAF6-FC019E12868E@benettiengineering.com> > Il giorno 6 feb 2022, alle ore 00:29, Sergey Kuzminov ha scritto: > > ?Changes: > * Exclude FAT partition, it is no longer needed for U-Boot. > * Switch the rootfs partition from MBR to GPT for partition-uuid to work. > * Switch to extlinux, this is convenient for debugging. > * Create common scenarios for multiple boards to create an SD image: board/orangepi/common. > * Add BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y, remount root filesystem read-write during boot. Your SoB goes here along my Reviewed-by and Tested-by(one per line) I?ve given you on V1. > --- > V1->V2: > * improved commit log > * removed commented line in extlinux.conf > * removed one boot option from extlinux.conf > > V2->V3: > * improved commit log > * removed comment from board/orangepi/common/genimage.cfg > > Signed-off-by: Sergey Kuzminov And here you remove your SoB ^^^ Please send a V4 pointing you?ve fixed your Signed-off-by position and we?re done :-) Giulio > --- > board/orangepi/common/extlinux.conf | 4 +++ > board/orangepi/common/genimage.cfg | 20 +++++++++++++ > board/orangepi/common/post-build.sh | 34 +++++++++++++++++++++ > board/orangepi/orangepi-zero/boot.cmd | 9 ------ > board/orangepi/orangepi-zero/genimage.cfg | 36 ----------------------- > configs/orangepi_zero_defconfig | 11 ++++--- > 6 files changed, 63 insertions(+), 51 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 > 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..12f496b1fa > --- /dev/null > +++ b/board/orangepi/common/extlinux.conf > @@ -0,0 +1,4 @@ > +LABEL default > + kernel /boot/%LINUXIMAGE% > + devicetreedir /boot > + 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..a61c4a039f > --- /dev/null > +++ b/board/orangepi/common/genimage.cfg > @@ -0,0 +1,20 @@ > +image sdcard.img { > + partition u-boot { > + in-partition-table = false > + image = "u-boot-sunxi-with-spl.bin" > + offset = 8K > + size = 1000K # 1MB - 8KB(offset) - 16KB(GPT) > + } > + > + hdimage { > + partition-table-type = gpt > + gpt-location = 1008K # 1MB - 16KB(GPT) > + gpt-no-backup = true > + } > + > + 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/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 5aaa1566c5..96f0c3f600 100644 > --- a/configs/orangepi_zero_defconfig > +++ b/configs/orangepi_zero_defconfig > @@ -20,10 +20,13 @@ 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_NEEDS_HOST_OPENSSL=y > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > > # Filesystem > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="63M" > +BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y > # BR2_TARGET_ROOTFS_TAR is not set > > # Bootloader > @@ -39,16 +42,12 @@ 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 > > # 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" > > # Wireless driver and firmware > BR2_PACKAGE_XR819_XRADIO=y > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From kuzminov.sergey81 at gmail.com Sat Feb 5 23:50:40 2022 From: kuzminov.sergey81 at gmail.com (Sergey Kuzminov) Date: Sun, 6 Feb 2022 02:50:40 +0300 Subject: [Buildroot] [PATCH v3] configs/orangepi_zero_defconfig: switch to extlinux In-Reply-To: <583B80CF-6F5A-4E96-BAF6-FC019E12868E@benettiengineering.com> References: <20220205232918.27091-1-kuzminov.sergey81@gmail.com> <583B80CF-6F5A-4E96-BAF6-FC019E12868E@benettiengineering.com> Message-ID: <7d81f185-699c-9fc4-f392-07b332ce8184@gmail.com> 06.02.2022 02:34, Giulio Benetti: >> Il giorno 6 feb 2022, alle ore 00:29, Sergey Kuzminov ha scritto: >> >> ?Changes: >> * Exclude FAT partition, it is no longer needed for U-Boot. >> * Switch the rootfs partition from MBR to GPT for partition-uuid to work. >> * Switch to extlinux, this is convenient for debugging. >> * Create common scenarios for multiple boards to create an SD image: board/orangepi/common. >> * Add BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y, remount root filesystem read-write during boot. > Your SoB goes here along my Reviewed-by and Tested-by(one per line) I?ve given you on V1. > >> --- >> V1->V2: >> * improved commit log >> * removed commented line in extlinux.conf >> * removed one boot option from extlinux.conf >> >> V2->V3: >> * improved commit log >> * removed comment from board/orangepi/common/genimage.cfg >> >> Signed-off-by: Sergey Kuzminov > And here you remove your SoB ^^^ > > Please send a V4 pointing you?ve fixed your Signed-off-by position and we?re done:-) I don't understand how to do what you are asking. From daniil.stas at posteo.net Sun Feb 6 00:07:11 2022 From: daniil.stas at posteo.net (Daniil Stas) Date: Sun, 6 Feb 2022 00:07:11 +0000 Subject: [Buildroot] [BUG] boot/arm-trusted-firmware: Stack protection setting doesn't work Message-ID: <20220206020711.3dc6e42e@ux550ve> The bug was introduced in commit ccac9a5bbb ("boot/arm-trusted-firmware: don't force ENABLE_STACK_PROTECTOR"). In this commit the ENABLE_STACK_PROTECTOR option was moved from make arguments to the environment. But this value gets overwritten in make_helpers/defaults.mk (and platform specific makefiles) before it gets handled in the lib/stack_protector/stack_protector.mk. So setting it via environment doesn't work. You can check it, for example, if you compile TF-A for stm32mp157a_dk1 platform, and then check if bl32/stack_protector.o file is built. It gets built only with commit ccac9a5bbb being reverted. From james.hilliard1 at gmail.com Sun Feb 6 00:37:46 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 5 Feb 2022 17:37:46 -0700 Subject: [Buildroot] [PATCH 1/1] package/pipewire: bump to version 0.3.45 Message-ID: <20220206003746.1772081-1-james.hilliard1@gmail.com> Drop patch that is now upstream. Set new x11 and libcanberra meson config options. Signed-off-by: James Hilliard --- ...eson.build-add-atomic_dep-dependency.patch | 40 ------------------- package/pipewire/pipewire.hash | 2 +- package/pipewire/pipewire.mk | 10 ++++- 3 files changed, 10 insertions(+), 42 deletions(-) delete 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 deleted file mode 100644 index b91adbe7e4..0000000000 --- a/package/pipewire/0001-spa-meson.build-add-atomic_dep-dependency.patch +++ /dev/null @@ -1,40 +0,0 @@ -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 - diff --git a/package/pipewire/pipewire.hash b/package/pipewire/pipewire.hash index 8464a56338..a9d59663ae 100644 --- a/package/pipewire/pipewire.hash +++ b/package/pipewire/pipewire.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 2e91f228ffb93494f2423956b930014de20e15639a03f3df4fca4ebf4bc51fc0 pipewire-0.3.43.tar.bz2 +sha256 76291373f7ab271664df5b6a22b678ad57e485e25c73ee9c78e049a67b7886d2 pipewire-0.3.45.tar.bz2 sha256 8909c319a7e27dbb33a15b9035f89ab3b7b2f6a12f8bcddc755206a8db1ada44 COPYING sha256 be4be5d77424833edf31f53fc1f1cecb6996b9e2d747d9e6fb8f878362ebc92b LICENSE diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index b05ce2bcc2..fc521c86ac 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -4,7 +4,7 @@ # ################################################################################ -PIPEWIRE_VERSION = 0.3.43 +PIPEWIRE_VERSION = 0.3.45 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) @@ -29,6 +29,7 @@ PIPEWIRE_CONF_OPTS += \ -Dvideotestsrc=enabled \ -Dvolume=enabled \ -Dsession-managers=[] \ + -Dlibcanberra=disabled \ -Dlv2=disabled ifeq ($(BR2_PACKAGE_DBUS),y) @@ -128,6 +129,13 @@ else PIPEWIRE_CONF_OPTS += -Dlibcamera=disabled endif +ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y) +PIPEWIRE_CONF_OPTS += -Dx11=enabled +PIPEWIRE_DEPENDENCIES += xlib_libX11 +else +PIPEWIRE_CONF_OPTS += -Dx11=disabled +endif + ifeq ($(BR2_PACKAGE_LIBUSB),y) PIPEWIRE_CONF_OPTS += -Dlibusb=enabled PIPEWIRE_DEPENDENCIES += libusb -- 2.25.1 From peter.macleod.thompson at gmail.com Sun Feb 6 05:53:30 2022 From: peter.macleod.thompson at gmail.com (Peter Thompson) Date: Sat, 5 Feb 2022 22:53:30 -0700 Subject: [Buildroot] [PATCH 1/1] package/sdl2_ttf: bump version to 2.0.18 Message-ID: <20220206055330.11218-1-peter.macleod.thompson@gmail.com> From: PeterThompson Signed-off-by: PeterThompson --- package/sdl2_ttf/sdl2_ttf.hash | 4 ++-- package/sdl2_ttf/sdl2_ttf.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sdl2_ttf/sdl2_ttf.hash b/package/sdl2_ttf/sdl2_ttf.hash index 16459e4a59..a490b002b6 100644 --- a/package/sdl2_ttf/sdl2_ttf.hash +++ b/package/sdl2_ttf/sdl2_ttf.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a9eceb1ad88c1f1545cd7bd28e7cbc0b2c14191d40238f531a15b01b1b22cd33 SDL2_ttf-2.0.15.tar.gz -sha256 f6370809c9f644760920d9945c5be07aed17664975f2e4741013d4d9a2ec696f COPYING.txt +sha256 7234eb8883514e019e7747c703e4a774575b18d435c22a4a29d068cb768a2251 SDL2_ttf-2.0.18.tar.gz +sha256 e211dfe7e2c36e64048be886fe3f2bbba8732ce4dd77b596a355d3abbec775a4 COPYING.txt diff --git a/package/sdl2_ttf/sdl2_ttf.mk b/package/sdl2_ttf/sdl2_ttf.mk index 326cb99366..1fe7c0a075 100644 --- a/package/sdl2_ttf/sdl2_ttf.mk +++ b/package/sdl2_ttf/sdl2_ttf.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_TTF_VERSION = 2.0.15 +SDL2_TTF_VERSION = 2.0.18 SDL2_TTF_SOURCE = SDL2_ttf-$(SDL2_TTF_VERSION).tar.gz SDL2_TTF_SITE = http://www.libsdl.org/projects/SDL_ttf/release SDL2_TTF_LICENSE = Zlib -- 2.20.1 From thomas.petazzoni at bootlin.com Sun Feb 6 07:08:59 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 06 Feb 2022 07:08:59 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-02-05 Message-ID: <20220206070904.9AE508141C@smtp1.osuosl.org> Hello, Autobuild statistics for 2022-02-05 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 52 | 7 | 0 | 59 | 2021.11.x | 23 | 3 | 0 | 26 | master | 64 | 54 | 0 | 118 | Classification of failures by reason for master ----------------------------------------------- host-libselinux-3.3 | 13 host-python-docutils-0.15.2 | 10 rygel-0.40.2 | 6 bluez5_utils-5.63 | 5 cryptopp-8.6.0 | 2 tovid-87c676f4aadb7303d2cd9... | 2 wavemon-0.9.4 | 2 bat-0.19.0 | 1 bird-2.0.8 | 1 cryptsetup-2.4.2 | 1 docker-proxy-55685ba49593e6... | 1 guile-3.0.7 | 1 kf5-kcoreaddons-5.47.0 | 1 mp4v2-5.0.1 | 1 mpdecimal-2.5.1 | 1 mpv-0.33.1 | 1 python-docutils-0.15.2 | 1 rtorrent-0.9.8 | 1 sconeserver-6b932d7d8dbb700... | 1 systemd-250.3 | 1 target-finalize | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | bat-0.19.0 | NOK | http://autobuild.buildroot.net/results/f6b8f966295c6bdb8753a601b7936d4a37a81abd | mips64el | bird-2.0.8 | NOK | http://autobuild.buildroot.net/results/4c756fb8c36a64c11d559a6eedd71561fb15e8d4 | mips64el | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/6482f4195aa546d0d160eb20b0fa91247cd2bc33 | mips | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/c24807c247a682889fa28df5342c348a0ac4285d | mips64el | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/dd267013faaca1d5ebb6cdfdbc7d4527725006de | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/b745566790bad48b3d6930cc93fdd5d7b8680999 | mips64el | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/ac7ba633fe96d72c848acf1f43544ba6f897055b | powerpc | cryptopp-8.6.0 | NOK | http://autobuild.buildroot.net/results/e33b13e7a769febf28152a09a20295ec80b44164 | powerpc | cryptopp-8.6.0 | NOK | http://autobuild.buildroot.net/results/9e9f8559b12b8e2cf99cfab435fa7dd5796bbcd5 | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/5b6a522000e7b6081bbaa595dd300ce4c47a2852 | x86_64 | docker-proxy-55685ba49593e6... | NOK | http://autobuild.buildroot.net/results/59c103c6b552bcb6d5d8722502f044e9c938bad8 | arm | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/97ed6412047af3b3b881cf217210062bf4e4366e | ORPH arc | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/90f2e99833e50b73d1f883bd2a4dcd62b0e16491 | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/361410a6f843a7e198829b059eb9b9099852536e | mips64el | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/0a3dc4bf48ad842df4bcb4b8a1a7aa7425db0463 | mips64el | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/9491e9e270441a8e9f118cdb165121a375e53e15 | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/9074cbfcc6ef54f32bea1eb8232c6e50f2d48081 | aarch64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/8202804e3779908e6107c8750135869f6ad93c8f | microblazeel | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/66b78774776aff2af09aec477915eeeaac289189 | powerpc | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/eea09d68e1de44b887099fa4c27df7b8dcf190bc | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/0a49e46d2d29f051d0eca588643f90bd1c439b20 | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/7a0b385a9363f6b0dd4ab4ad561ec0b7e681eba6 | i686 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/702e64ae020e6ee10d4dcf45e23f9f6d082be3ba | riscv32 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/3731dffcc22cb96df8804901a9d94531b9b42dcc | powerpc | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/effd0f57649ef8753a46f889025819765801050e | i686 | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/eac4ceede674914506bf6a38b4ab528e3b66c70f | nios2 | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/3eee0fd5468c4e064cca1b493fdd9ae85161cae6 | x86_64 | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/81f772a48394d0eff2d9589b182f02f3f1af58dd | arm | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/8cff150298dff135c8d073516b02c627a167506a | aarch64 | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/4cad8e1c54584edc9b28548c797136d239fd00a4 | or1k | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/3aaa1bf531d73c9901643d6b4c42d30e57f3c6ed | sparc64 | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/c5917cba0c56be8827161e4473b8246f80994673 | microblazeel | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/f96d24d704fe38959ee2065869cab27d22519d71 | sh4 | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/d248faf5e10396f71becdcbfc57b07d6be14cf7e | mips64el | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/080a9a9cd896456ed2a6b15fcfc0f61ceb1fc6cf | arm | kf5-kcoreaddons-5.47.0 | NOK | http://autobuild.buildroot.net/results/694a2322d9161b55f5db66d1ace57d836360ed84 | arm | mp4v2-5.0.1 | NOK | http://autobuild.buildroot.net/results/178f1266396d44c6659a67d8e68cb99e36d544ea | ORPH arm | mpdecimal-2.5.1 | NOK | http://autobuild.buildroot.net/results/b20c090f2ac5ea6d1c761820763037b87bde137a | arc | mpv-0.33.1 | NOK | http://autobuild.buildroot.net/results/b46b864c63962466ce14a0906d4e54bfd8703281 | riscv64 | python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/75cabbb22f702fea9d9b75a4ab45eb389cf56ad1 | arc | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/522fd76e0edf575d6546dfa7665fa8647dfcf1df | ORPH arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/a33a91e44d35219fe256b1c43ef20898ba3a7584 | nios2 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/f3d2b17272e642ce657836289d44094a9dc3fb92 | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/e7c578e473ff1bd36fadfe25076ae44c8ed89663 | powerpc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/6eca1e0f81621c4f91225bdf19c726a9f2ada37d | aarch64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/7564c5d1210b2997262362d53a568328191230dc | riscv64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/f1b6faefb5499c4c63c05d17fcf556da1c8eb86a | mips | sconeserver-6b932d7d8dbb700... | NOK | http://autobuild.buildroot.net/results/2ec3114b6db6fb15cda365e1e4a332fd664818bb | nios2 | systemd-250.3 | NOK | http://autobuild.buildroot.net/results/c067a59b41b22703e402fc700ce6884ae32b576e | sparc | target-finalize | NOK | http://autobuild.buildroot.net/results/70b02e5c7e4f71e5e7d898dc84b759a2bae3ecdd | mipsel | tovid-87c676f4aadb7303d2cd9... | NOK | http://autobuild.buildroot.net/results/003bf2c1ed85851e68f4d81017582f559e342949 | s390x | tovid-87c676f4aadb7303d2cd9... | NOK | http://autobuild.buildroot.net/results/817aa1585cc59a29019ea1a8541d581b8d97ad2e | riscv32 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/0b5c2ba1b5ed76983c5b0ef121daa965c9362b48 | arm | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/c149383bc0b1e6c0022958213bc2752f34e21c4e | Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 2 monkey-f54856ce250c4e257354... | 1 openal-1.20.1 | 1 rocksdb-6.13.3 | 1 ruby-2.7.5 | 1 tvheadend-febcf9818d7c37fec... | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- nios2 | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/cad988f300e150bee71c7fece3827cf2f57523bb | m68k | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/4c12678290af91cc3401b8f8fc8e4c931171a7a5 | powerpc64le | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/dc0a1c6ac4df77a4d87e24618c7118c9b2f561be | or1k | openal-1.20.1 | NOK | http://autobuild.buildroot.net/results/2965a328ab73760e17793542d003defeb3e40b07 | m68k | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/c760fc779ff55a1a373e16ce45f5d9d591cda8a6 | aarch64 | ruby-2.7.5 | NOK | http://autobuild.buildroot.net/results/32aa592c2e596278abe858959885f68e0c776097 | riscv32 | tvheadend-febcf9818d7c37fec... | NOK | http://autobuild.buildroot.net/results/ff61b8d86d325552176abff2e7e70b938b29d2c5 | Classification of failures by reason for 2021.11.x -------------------------------------------------- python-pybind-2.6.1 | 1 suricata-6.0.4 | 1 wavemon-0.9.4 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- riscv64 | python-pybind-2.6.1 | NOK | http://autobuild.buildroot.net/results/9e19cd111d352440960b304eaadf0db14d02802b | arm | suricata-6.0.4 | NOK | http://autobuild.buildroot.net/results/cbef9bfc76b6b7ea890fffac2c663aa9adfa5ca9 | x86_64 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/a6bc18d284014275446683d84a62ba6ae8aaf667 | -- http://autobuild.buildroot.net From giulio.benetti at benettiengineering.com Sun Feb 6 07:13:55 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 08:13:55 +0100 Subject: [Buildroot] [PATCH v3] configs/orangepi_zero_defconfig: switch to extlinux In-Reply-To: <7d81f185-699c-9fc4-f392-07b332ce8184@gmail.com> References: <7d81f185-699c-9fc4-f392-07b332ce8184@gmail.com> Message-ID: <02663281-0879-462D-8A89-F922E86018A7@benettiengineering.com> Hi Sergey, > Il giorno 6 feb 2022, alle ore 00:50, Sergey Kuzminov ha scritto: > > ?06.02.2022 02:34, Giulio Benetti: >>>> Il giorno 6 feb 2022, alle ore 00:29, Sergey Kuzminov ha scritto: >>> >>> ?Changes: >>> * Exclude FAT partition, it is no longer needed for U-Boot. >>> * Switch the rootfs partition from MBR to GPT for partition-uuid to work. >>> * Switch to extlinux, this is convenient for debugging. >>> * Create common scenarios for multiple boards to create an SD image: board/orangepi/common. >>> * Add BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y, remount root filesystem read-write during boot. Move your Signed-off-by here(before the 3 dashes) and that?s all. This is because everything between the two sets of 3 dashes won?t be part of the commit. So we need your SoB here. >> Your SoB goes here along my Reviewed-by and Tested-by(one per line) I?ve given you on V1. >>> --- While here until next 3 dashes won?t be part of the commit log, but we need it for Mailing list to track the changes. >>> V1->V2: >>> * improved commit log >>> * removed commented line in extlinux.conf >>> * removed one boot option from extlinux.conf >>> >>> V2->V3: >>> * improved commit log >>> * removed comment from board/orangepi/common/genimage.cfg >>> >>> Signed-off-by: Sergey Kuzminov So if you keep your SoB here ^^^ won?t be part of the commit and that?s not what we want. >> And here you remove your SoB ^^^ >> Please send a V4 pointing you?ve fixed your Signed-off-by position and we?re done:-) > > I don't understand how to do what you are asking. All clear now? Kind regards Giulio > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From kuzminov.sergey81 at gmail.com Sun Feb 6 07:35:12 2022 From: kuzminov.sergey81 at gmail.com (Sergey Kuzminov) Date: Sun, 6 Feb 2022 10:35:12 +0300 Subject: [Buildroot] [PATCH v3] configs/orangepi_zero_defconfig: switch to extlinux In-Reply-To: <02663281-0879-462D-8A89-F922E86018A7@benettiengineering.com> References: <7d81f185-699c-9fc4-f392-07b332ce8184@gmail.com> <02663281-0879-462D-8A89-F922E86018A7@benettiengineering.com> Message-ID: <0177b527-6098-91f9-2c78-e7f898c537f0@gmail.com> Hi Giulio, 06.02.2022 10:13, Giulio Benetti: > Hi Sergey, > >> Il giorno 6 feb 2022, alle ore 00:50, Sergey Kuzminov ha scritto: >> >> ?06.02.2022 02:34, Giulio Benetti: >>>>> Il giorno 6 feb 2022, alle ore 00:29, Sergey Kuzminov ha scritto: >>>> >>>> ?Changes: >>>> * Exclude FAT partition, it is no longer needed for U-Boot. >>>> * Switch the rootfs partition from MBR to GPT for partition-uuid to work. >>>> * Switch to extlinux, this is convenient for debugging. >>>> * Create common scenarios for multiple boards to create an SD image: board/orangepi/common. >>>> * Add BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y, remount root filesystem read-write during boot. > > Move your Signed-off-by here(before the 3 dashes) and that?s all. > This is because everything between the two sets of 3 dashes won?t be part of the commit. > So we need your SoB here. > >>> Your SoB goes here along my Reviewed-by and Tested-by(one per line) I?ve given you on V1. >>>> --- > While here until next 3 dashes won?t be part of the commit log, but we need it for Mailing list to track the changes. >>>> V1->V2: >>>> * improved commit log >>>> * removed commented line in extlinux.conf >>>> * removed one boot option from extlinux.conf >>>> >>>> V2->V3: >>>> * improved commit log >>>> * removed comment from board/orangepi/common/genimage.cfg >>>> >>>> Signed-off-by: Sergey Kuzminov > > So if you keep your SoB here ^^^ won?t be part of the commit and that?s not what we want. > >>> And here you remove your SoB ^^^ >>> Please send a V4 pointing you?ve fixed your Signed-off-by position and we?re done:-) >> >> I don't understand how to do what you are asking. > > All clear now? > > Kind regards > Giulio > >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > Now I understand. Thank you. From fontaine.fabrice at gmail.com Sun Feb 6 07:38:05 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 6 Feb 2022 08:38:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/lighttpd: add mysql support Message-ID: <20220206073805.832602-1-fontaine.fabrice@gmail.com> lighttpd only supports mariadb Signed-off-by: Fabrice Fontaine --- package/lighttpd/Config.in | 9 +++++++++ package/lighttpd/lighttpd.mk | 8 +++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index b9f64a3bc3..aa18c13171 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -61,6 +61,15 @@ config BR2_PACKAGE_LIGHTTPD_MAXMINDDB help Enable MaxMind GeoIP2 support. Needed to support mod_maxminddb +config BR2_PACKAGE_LIGHTTPD_MYSQL + bool "mysql support" + depends on BR2_PACKAGE_MARIADB + help + Enable mysql support for lighttpd mod_vhostdb_mysql. + +comment "mysql support needs mariadb" + depends on !BR2_PACKAGE_MARIADB + 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 49ab8587f7..595c59cb37 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -19,7 +19,6 @@ LIGHTTPD_CONF_OPTS = \ -Dwith_libev=false \ -Dwith_libunwind=false \ -Dwith_mbedtls=false \ - -Dwith_mysql=false \ -Dwith_nettle=false \ -Dwith_nss=false \ -Dwith_pcre=false \ @@ -73,6 +72,13 @@ else LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=false endif +ifeq ($(BR2_PACKAGE_LIGHTTPD_MYSQL),y) +LIGHTTPD_DEPENDENCIES += mysql +LIGHTTPD_CONF_OPTS += -Dwith_mysql=true +else +LIGHTTPD_CONF_OPTS += -Dwith_mysql=false +endif + ifeq ($(BR2_PACKAGE_LIGHTTPD_OPENSSL),y) LIGHTTPD_DEPENDENCIES += openssl LIGHTTPD_CONF_OPTS += -Dwith_openssl=true -- 2.34.1 From kuzminov.sergey81 at gmail.com Sun Feb 6 07:48:53 2022 From: kuzminov.sergey81 at gmail.com (Sergey Kuzminov) Date: Sun, 6 Feb 2022 10:48:53 +0300 Subject: [Buildroot] [PATCH v4] configs/orangepi_zero_defconfig: switch to extlinux Message-ID: <20220206074853.25887-1-kuzminov.sergey81@gmail.com> Changes: * Exclude FAT partition, it is no longer needed for U-Boot. * Switch the rootfs partition from MBR to GPT for partition-uuid to work. * Switch to extlinux, this is convenient for debugging. * Create common scenarios for multiple boards to create an SD image: board/orangepi/common. * Add BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y, remount root filesystem read-write during boot. Signed-off-by: Sergey Kuzminov --- V1->V2: * improved commit log * removed commented line in extlinux.conf * removed one boot option from extlinux.conf V2->V3: * improved commit log * removed comment from board/orangepi/common/genimage.cfg V3->V4: * fixed Signed-off-by position --- board/orangepi/common/extlinux.conf | 4 +++ board/orangepi/common/genimage.cfg | 20 +++++++++++++ board/orangepi/common/post-build.sh | 34 +++++++++++++++++++++ board/orangepi/orangepi-zero/boot.cmd | 9 ------ board/orangepi/orangepi-zero/genimage.cfg | 36 ----------------------- configs/orangepi_zero_defconfig | 11 ++++--- 6 files changed, 63 insertions(+), 51 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 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..12f496b1fa --- /dev/null +++ b/board/orangepi/common/extlinux.conf @@ -0,0 +1,4 @@ +LABEL default + kernel /boot/%LINUXIMAGE% + devicetreedir /boot + 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..a61c4a039f --- /dev/null +++ b/board/orangepi/common/genimage.cfg @@ -0,0 +1,20 @@ +image sdcard.img { + partition u-boot { + in-partition-table = false + image = "u-boot-sunxi-with-spl.bin" + offset = 8K + size = 1000K # 1MB - 8KB(offset) - 16KB(GPT) + } + + hdimage { + partition-table-type = gpt + gpt-location = 1008K # 1MB - 16KB(GPT) + gpt-no-backup = true + } + + 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/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 5aaa1566c5..96f0c3f600 100644 --- a/configs/orangepi_zero_defconfig +++ b/configs/orangepi_zero_defconfig @@ -20,10 +20,13 @@ 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_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y # Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="63M" +BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y # BR2_TARGET_ROOTFS_TAR is not set # Bootloader @@ -39,16 +42,12 @@ 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 # 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" # Wireless driver and firmware BR2_PACKAGE_XR819_XRADIO=y -- 2.34.1 From giulio.benetti at benettiengineering.com Sun Feb 6 08:04:24 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 09:04:24 +0100 Subject: [Buildroot] [PATCH v4] configs/orangepi_zero_defconfig: switch to extlinux In-Reply-To: <20220206074853.25887-1-kuzminov.sergey81@gmail.com> References: <20220206074853.25887-1-kuzminov.sergey81@gmail.com> Message-ID: Hi Sergey, On 06/02/22 08:48, Sergey Kuzminov wrote: > Changes: > * Exclude FAT partition, it is no longer needed for U-Boot. > * Switch the rootfs partition from MBR to GPT for partition-uuid to work. > * Switch to extlinux, this is convenient for debugging. > * Create common scenarios for multiple boards to create an SD image: board/orangepi/common. > * Add BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y, remount root filesystem read-write during boot. > > Signed-off-by: Sergey Kuzminov Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti [Only built successfully] Best regards -- Giulio Benetti Benetti Engineering sas > --- > V1->V2: > * improved commit log > * removed commented line in extlinux.conf > * removed one boot option from extlinux.conf > > V2->V3: > * improved commit log > * removed comment from board/orangepi/common/genimage.cfg > > V3->V4: > * fixed Signed-off-by position > --- > board/orangepi/common/extlinux.conf | 4 +++ > board/orangepi/common/genimage.cfg | 20 +++++++++++++ > board/orangepi/common/post-build.sh | 34 +++++++++++++++++++++ > board/orangepi/orangepi-zero/boot.cmd | 9 ------ > board/orangepi/orangepi-zero/genimage.cfg | 36 ----------------------- > configs/orangepi_zero_defconfig | 11 ++++--- > 6 files changed, 63 insertions(+), 51 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 > 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..12f496b1fa > --- /dev/null > +++ b/board/orangepi/common/extlinux.conf > @@ -0,0 +1,4 @@ > +LABEL default > + kernel /boot/%LINUXIMAGE% > + devicetreedir /boot > + 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..a61c4a039f > --- /dev/null > +++ b/board/orangepi/common/genimage.cfg > @@ -0,0 +1,20 @@ > +image sdcard.img { > + partition u-boot { > + in-partition-table = false > + image = "u-boot-sunxi-with-spl.bin" > + offset = 8K > + size = 1000K # 1MB - 8KB(offset) - 16KB(GPT) > + } > + > + hdimage { > + partition-table-type = gpt > + gpt-location = 1008K # 1MB - 16KB(GPT) > + gpt-no-backup = true > + } > + > + 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/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 5aaa1566c5..96f0c3f600 100644 > --- a/configs/orangepi_zero_defconfig > +++ b/configs/orangepi_zero_defconfig > @@ -20,10 +20,13 @@ 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_NEEDS_HOST_OPENSSL=y > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > > # Filesystem > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="63M" > +BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y > # BR2_TARGET_ROOTFS_TAR is not set > > # Bootloader > @@ -39,16 +42,12 @@ 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 > > # 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" > > # Wireless driver and firmware > BR2_PACKAGE_XR819_XRADIO=y From paguilar at paguilar.org Sun Feb 6 08:43:34 2022 From: paguilar at paguilar.org (Pedro Aguilar) Date: Sun, 6 Feb 2022 09:43:34 +0100 Subject: [Buildroot] [PATCH v1 1/1] package/guile: Guile 3.0.7 requires libiconv. Message-ID: <20220206084334.1900252-1-paguilar@paguilar.org> This fixes the error reported in the daily results. Signed-off-by: Pedro Aguilar --- package/guile/Config.in | 1 + package/guile/guile.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/guile/Config.in b/package/guile/Config.in index b1182a4cee..2367a3ed3d 100644 --- a/package/guile/Config.in +++ b/package/guile/Config.in @@ -9,6 +9,7 @@ config BR2_PACKAGE_GUILE select BR2_PACKAGE_LIBFFI select BR2_PACKAGE_GMP select BR2_PACKAGE_BDWGC + select BR2_PACKAGE_LIBICONV help Guile is an interpreter and compiler for the Scheme programming language, a clean and elegant dialect of Lisp. diff --git a/package/guile/guile.mk b/package/guile/guile.mk index 0f245fca76..0f26443023 100644 --- a/package/guile/guile.mk +++ b/package/guile/guile.mk @@ -15,7 +15,7 @@ GUILE_LICENSE = LGPL-3.0+ GUILE_LICENSE_FILES = LICENSE COPYING COPYING.LESSER GUILE_CPE_ID_VENDOR = gnu -GUILE_DEPENDENCIES = host-guile libunistring libffi gmp bdwgc host-pkgconf +GUILE_DEPENDENCIES = host-guile libunistring libffi gmp bdwgc host-pkgconf libiconv HOST_GUILE_DEPENDENCIES = host-libunistring host-libffi host-gmp host-bdwgc host-flex host-pkgconf host-gettext # The HAVE_GC* CFLAGS specify that we will use internal callbacks -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 6 08:48:17 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 09:48:17 +0100 Subject: [Buildroot] [PATCH v1 1/1] package/guile: Guile 3.0.7 requires libiconv. In-Reply-To: <20220206084334.1900252-1-paguilar@paguilar.org> References: <20220206084334.1900252-1-paguilar@paguilar.org> Message-ID: <15b995c3-8d86-55f5-2b0e-d17e3f1d6978@benettiengineering.com> Hi Pedro, On 06/02/22 09:43, Pedro Aguilar wrote: > This fixes the error reported in the daily results. Please add to commit log: ``` Fixes: http://autobuild.buildroot.net/results/0ad/0add99a8cbb143d912d48ef4670e09a6710bb8b1/ ``` Thank you Best regards -- Giulio Benetti Benetti Engineering sas > Signed-off-by: Pedro Aguilar > --- > package/guile/Config.in | 1 + > package/guile/guile.mk | 2 +- > 2 files changed, 2 insertions(+), 1 deletion(-) > > diff --git a/package/guile/Config.in b/package/guile/Config.in > index b1182a4cee..2367a3ed3d 100644 > --- a/package/guile/Config.in > +++ b/package/guile/Config.in > @@ -9,6 +9,7 @@ config BR2_PACKAGE_GUILE > select BR2_PACKAGE_LIBFFI > select BR2_PACKAGE_GMP > select BR2_PACKAGE_BDWGC > + select BR2_PACKAGE_LIBICONV > help > Guile is an interpreter and compiler for the Scheme > programming language, a clean and elegant dialect of Lisp. > diff --git a/package/guile/guile.mk b/package/guile/guile.mk > index 0f245fca76..0f26443023 100644 > --- a/package/guile/guile.mk > +++ b/package/guile/guile.mk > @@ -15,7 +15,7 @@ GUILE_LICENSE = LGPL-3.0+ > GUILE_LICENSE_FILES = LICENSE COPYING COPYING.LESSER > GUILE_CPE_ID_VENDOR = gnu > > -GUILE_DEPENDENCIES = host-guile libunistring libffi gmp bdwgc host-pkgconf > +GUILE_DEPENDENCIES = host-guile libunistring libffi gmp bdwgc host-pkgconf libiconv > HOST_GUILE_DEPENDENCIES = host-libunistring host-libffi host-gmp host-bdwgc host-flex host-pkgconf host-gettext > > # The HAVE_GC* CFLAGS specify that we will use internal callbacks From giulio.benetti at benettiengineering.com Sun Feb 6 08:54:44 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 09:54:44 +0100 Subject: [Buildroot] [PATCH v1 1/1] package/guile: Guile 3.0.7 requires libiconv. In-Reply-To: <20220206084334.1900252-1-paguilar@paguilar.org> References: <20220206084334.1900252-1-paguilar@paguilar.org> Message-ID: <3942047e-e69e-d079-3ca5-55409fdda839@benettiengineering.com> Too fast... On 06/02/22 09:43, Pedro Aguilar wrote: > This fixes the error reported in the daily results. > > Signed-off-by: Pedro Aguilar > --- > package/guile/Config.in | 1 + > package/guile/guile.mk | 2 +- > 2 files changed, 2 insertions(+), 1 deletion(-) > > diff --git a/package/guile/Config.in b/package/guile/Config.in > index b1182a4cee..2367a3ed3d 100644 > --- a/package/guile/Config.in > +++ b/package/guile/Config.in > @@ -9,6 +9,7 @@ config BR2_PACKAGE_GUILE > select BR2_PACKAGE_LIBFFI > select BR2_PACKAGE_GMP > select BR2_PACKAGE_BDWGC > + select BR2_PACKAGE_LIBICONV > help > Guile is an interpreter and compiler for the Scheme > programming language, a clean and elegant dialect of Lisp. > diff --git a/package/guile/guile.mk b/package/guile/guile.mk > index 0f245fca76..0f26443023 100644 > --- a/package/guile/guile.mk > +++ b/package/guile/guile.mk > @@ -15,7 +15,7 @@ GUILE_LICENSE = LGPL-3.0+ > GUILE_LICENSE_FILES = LICENSE COPYING COPYING.LESSER > GUILE_CPE_ID_VENDOR = gnu > > -GUILE_DEPENDENCIES = host-guile libunistring libffi gmp bdwgc host-pkgconf > +GUILE_DEPENDENCIES = host-guile libunistring libffi gmp bdwgc host-pkgconf libiconv Here ^^^ please keep alphabetical order, so libiconv goes before libunistring and doing so can you please move host-pkgconf after host-guile? Thank you! -- Giulio Benetti Benetti Engineering sas > HOST_GUILE_DEPENDENCIES = host-libunistring host-libffi host-gmp host-bdwgc host-flex host-pkgconf host-gettext > > # The HAVE_GC* CFLAGS specify that we will use internal callbacks From thomas.devoogdt at gmail.com Sun Feb 6 09:04:26 2022 From: thomas.devoogdt at gmail.com (Thomas Devoogdt) Date: Sun, 6 Feb 2022 10:04:26 +0100 Subject: [Buildroot] [PATCH] package/bluez5_utils: fix build with libglib2 >= 2.69 Message-ID: <20220206090426.15583-1-thomas.devoogdt@gmail.com> Fix the following build failure raised since bump of libglib2 to version 2.70 in commit 079923d: profiles/battery/battery.c:162:2: warning: 'g_memdup' is deprecated (declared at /home/buildroot/autobuild/instance-0/output-1/host/bin/../arm-buildroot-linux-gnueabi/sysroot/usr/include/glib-2.0/glib/gstrfuncs.h:257): Use 'g_memdup2' instead [-Wdeprecated-declarations] batt->initial_value = g_memdup(value, length); Fixes: - http://autobuild.buildroot.org/results/6b8/6b8870d12e0804d6154230a7322c49416c1dc0e2/build-end.log Sources: - https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=710220f861b100856711a0a4d4a852874228a57a - https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=9f09e69ecb077082301dafb745856e1f3731aaa7 - https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=cfab569484b18407fc117bb96634525cc76ea1f5 Signed-off-by: Thomas Devoogdt --- ...-tools-mesh-cfgtest-include-limits.h.patch | 6 +- ...til-Rename-btd_malloc-to-util_malloc.patch | 67 + .../0003-shared-util-Add-util_memdup.patch | 57 + ...ace-use-of-g_memdup-with-util_memdup.patch | 1411 +++++++++++++++++ 4 files changed, 1538 insertions(+), 3 deletions(-) create mode 100644 package/bluez5_utils/0002-shared-util-Rename-btd_malloc-to-util_malloc.patch create mode 100644 package/bluez5_utils/0003-shared-util-Add-util_memdup.patch create mode 100644 package/bluez5_utils/0004-build-Replace-use-of-g_memdup-with-util_memdup.patch diff --git a/package/bluez5_utils/0001-tools-mesh-cfgtest-include-limits.h.patch b/package/bluez5_utils/0001-tools-mesh-cfgtest-include-limits.h.patch index 7f1197357f..57f363a7fd 100644 --- a/package/bluez5_utils/0001-tools-mesh-cfgtest-include-limits.h.patch +++ b/package/bluez5_utils/0001-tools-mesh-cfgtest-include-limits.h.patch @@ -1,7 +1,7 @@ -From 5158827fded7cb4daf550a5956aff0c74f6c38fc Mon Sep 17 00:00:00 2001 +From 1cf621cae3844f31bdac85298f4ae736be5488f6 Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Thu, 22 Jul 2021 21:36:13 +0200 -Subject: [PATCH] tools/mesh-cfgtest: include limits.h +Subject: [PATCH 1/4] tools/mesh-cfgtest: include limits.h mesh-cfgtest.c uses PATH_MAX so it should include limits.h. @@ -29,5 +29,5 @@ index fa0474faa..116ab7f16 100644 #include #include -- -2.32.0 +2.17.1 diff --git a/package/bluez5_utils/0002-shared-util-Rename-btd_malloc-to-util_malloc.patch b/package/bluez5_utils/0002-shared-util-Rename-btd_malloc-to-util_malloc.patch new file mode 100644 index 0000000000..ac5d4a6c3f --- /dev/null +++ b/package/bluez5_utils/0002-shared-util-Rename-btd_malloc-to-util_malloc.patch @@ -0,0 +1,67 @@ +From f3263fed28bf510a1225661fe2b5f598300c11cd Mon Sep 17 00:00:00 2001 +From: Luiz Augusto von Dentz +Date: Wed, 5 Jan 2022 15:53:35 -0800 +Subject: [PATCH 2/4] shared/util: Rename btd_malloc to util_malloc + +util functions are not limited to daemon only which is normally the case +when using btd prefix. + +(cherry picked from commit 710220f861b100856711a0a4d4a852874228a57a) +Signed-off-by: Thomas Devoogdt +--- + profiles/audio/avdtp.c | 2 +- + src/shared/util.c | 2 +- + src/shared/util.h | 4 ++-- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/profiles/audio/avdtp.c b/profiles/audio/avdtp.c +index d3dfbf96d..f2b461330 100644 +--- a/profiles/audio/avdtp.c ++++ b/profiles/audio/avdtp.c +@@ -1333,7 +1333,7 @@ static GSList *caps_to_list(uint8_t *data, size_t size, + break; + } + +- cpy = btd_malloc(sizeof(*cpy) + cap->length); ++ cpy = util_malloc(sizeof(*cpy) + cap->length); + memcpy(cpy, cap, sizeof(*cap) + cap->length); + + size -= sizeof(*cap) + cap->length; +diff --git a/src/shared/util.c b/src/shared/util.c +index 81b20d86f..93110047b 100644 +--- a/src/shared/util.c ++++ b/src/shared/util.c +@@ -25,7 +25,7 @@ + + #include "src/shared/util.h" + +-void *btd_malloc(size_t size) ++void *util_malloc(size_t size) + { + if (__builtin_expect(!!size, 1)) { + void *ptr; +diff --git a/src/shared/util.h b/src/shared/util.h +index ac70117ca..11d09979d 100644 +--- a/src/shared/util.h ++++ b/src/shared/util.h +@@ -75,7 +75,7 @@ do { \ + size_t __n = (size_t) (count); \ + size_t __s = sizeof(type); \ + void *__p; \ +- __p = btd_malloc(__n * __s); \ ++ __p = util_malloc(__n * __s); \ + memset(__p, 0, __n * __s); \ + __p; \ + })) +@@ -86,7 +86,7 @@ do { \ + char *strdelimit(char *str, char *del, char c); + int strsuffix(const char *str, const char *suffix); + +-void *btd_malloc(size_t size); ++void *util_malloc(size_t size); + + typedef void (*util_debug_func_t)(const char *str, void *user_data); + +-- +2.17.1 + diff --git a/package/bluez5_utils/0003-shared-util-Add-util_memdup.patch b/package/bluez5_utils/0003-shared-util-Add-util_memdup.patch new file mode 100644 index 0000000000..ff39d19f3e --- /dev/null +++ b/package/bluez5_utils/0003-shared-util-Add-util_memdup.patch @@ -0,0 +1,57 @@ +From 28f1c140374d1ecda65e3d59cca72352c3a07774 Mon Sep 17 00:00:00 2001 +From: Luiz Augusto von Dentz +Date: Thu, 6 Jan 2022 11:45:12 -0800 +Subject: [PATCH 3/4] shared/util: Add util_memdup + +This adds util_memdup which is intended to replace g_memdup since +replacing that with g_memdup2 requires bumping the glib version. + +(cherry picked from commit 9f09e69ecb077082301dafb745856e1f3731aaa7) +Signed-off-by: Thomas Devoogdt +--- + src/shared/util.c | 16 ++++++++++++++++ + src/shared/util.h | 1 + + 2 files changed, 17 insertions(+) + +diff --git a/src/shared/util.c b/src/shared/util.c +index 93110047b..6e1c83057 100644 +--- a/src/shared/util.c ++++ b/src/shared/util.c +@@ -41,6 +41,22 @@ void *util_malloc(size_t size) + return NULL; + } + ++void *util_memdup(const void *src, size_t size) ++{ ++ void *cpy; ++ ++ if (!src || !size) ++ return NULL; ++ ++ cpy = util_malloc(size); ++ if (!cpy) ++ return NULL; ++ ++ memcpy(cpy, src, size); ++ ++ return cpy; ++} ++ + void util_debug_va(util_debug_func_t function, void *user_data, + const char *format, va_list va) + { +diff --git a/src/shared/util.h b/src/shared/util.h +index 11d09979d..8ef6132c4 100644 +--- a/src/shared/util.h ++++ b/src/shared/util.h +@@ -87,6 +87,7 @@ char *strdelimit(char *str, char *del, char c); + int strsuffix(const char *str, const char *suffix); + + void *util_malloc(size_t size); ++void *util_memdup(const void *src, size_t size); + + typedef void (*util_debug_func_t)(const char *str, void *user_data); + +-- +2.17.1 + diff --git a/package/bluez5_utils/0004-build-Replace-use-of-g_memdup-with-util_memdup.patch b/package/bluez5_utils/0004-build-Replace-use-of-g_memdup-with-util_memdup.patch new file mode 100644 index 0000000000..9c4c3e9e01 --- /dev/null +++ b/package/bluez5_utils/0004-build-Replace-use-of-g_memdup-with-util_memdup.patch @@ -0,0 +1,1411 @@ +From 7eb74180cf6fd6cebc61bb719d458cbf5d7f4ca7 Mon Sep 17 00:00:00 2001 +From: Luiz Augusto von Dentz +Date: Thu, 6 Jan 2022 12:50:33 -0800 +Subject: [PATCH 4/4] build: Replace use of g_memdup with util_memdup +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This replaces the uses of g_memdup with util_memdup since the former has +been deprecated: + + warning: ?g_memdup? is deprecated: Use 'g_memdup2' instead + [-Wdeprecated-declarations] + +g_memdup2 requires bumping glib version which would likely have its +own problems thus why util_memdup was introduced. + +(cherry picked from commit cfab569484b18407fc117bb96634525cc76ea1f5) +Signed-off-by: Thomas Devoogdt +--- + Makefile.am | 10 ++--- + Makefile.obexd | 1 + + Makefile.tools | 11 ++++-- + android/a2dp.c | 9 +++-- + android/avctp.c | 5 ++- + android/avrcp-lib.c | 2 +- + android/gatt.c | 5 ++- + android/hidhost.c | 3 +- + android/tester-main.c | 77 +++++++++++++++++++++----------------- + attrib/gatt.c | 12 +++--- + client/gatt.c | 2 +- + gobex/gobex-header.c | 7 ++-- + gobex/gobex-packet.c | 5 ++- + obexd/src/obex.c | 5 ++- + plugins/neard.c | 9 +++-- + plugins/policy.c | 7 ++-- + profiles/audio/avctp.c | 9 +++-- + profiles/audio/avrcp.c | 10 ++--- + profiles/battery/bas.c | 4 +- + profiles/battery/battery.c | 4 +- + profiles/deviceinfo/dis.c | 4 +- + profiles/input/hog-lib.c | 12 +++--- + profiles/scanparam/scpp.c | 4 +- + src/eir.c | 8 ++-- + tools/gatt-service.c | 15 ++++---- + tools/mesh-gatt/gatt.c | 5 ++- + unit/test-avctp.c | 4 +- + unit/test-avdtp.c | 6 +-- + unit/test-avrcp.c | 10 ++--- + unit/test-gatt.c | 4 +- + unit/test-hfp.c | 11 +++--- + unit/test-hog.c | 26 ++++++------- + unit/test-sdp.c | 10 +++-- + unit/test-uhid.c | 2 +- + 34 files changed, 172 insertions(+), 146 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 308f13c50..9b5e140b8 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -508,23 +508,23 @@ unit_tests += unit/test-gobex-header unit/test-gobex-packet unit/test-gobex \ + + unit_test_gobex_SOURCES = $(gobex_sources) unit/util.c unit/util.h \ + unit/test-gobex.c +-unit_test_gobex_LDADD = $(GLIB_LIBS) ++unit_test_gobex_LDADD = src/libshared-glib.la $(GLIB_LIBS) + + unit_test_gobex_packet_SOURCES = $(gobex_sources) unit/util.c unit/util.h \ + unit/test-gobex-packet.c +-unit_test_gobex_packet_LDADD = $(GLIB_LIBS) ++unit_test_gobex_packet_LDADD = src/libshared-glib.la $(GLIB_LIBS) + + unit_test_gobex_header_SOURCES = $(gobex_sources) unit/util.c unit/util.h \ + unit/test-gobex-header.c +-unit_test_gobex_header_LDADD = $(GLIB_LIBS) ++unit_test_gobex_header_LDADD = src/libshared-glib.la $(GLIB_LIBS) + + unit_test_gobex_transfer_SOURCES = $(gobex_sources) unit/util.c unit/util.h \ + unit/test-gobex-transfer.c +-unit_test_gobex_transfer_LDADD = $(GLIB_LIBS) ++unit_test_gobex_transfer_LDADD = src/libshared-glib.la $(GLIB_LIBS) + + unit_test_gobex_apparam_SOURCES = $(gobex_sources) unit/util.c unit/util.h \ + unit/test-gobex-apparam.c +-unit_test_gobex_apparam_LDADD = $(GLIB_LIBS) ++unit_test_gobex_apparam_LDADD = src/libshared-glib.la $(GLIB_LIBS) + endif + + unit_tests += unit/test-lib +diff --git a/Makefile.obexd b/Makefile.obexd +index 37a133455..5d1a4ff65 100644 +--- a/Makefile.obexd ++++ b/Makefile.obexd +@@ -82,6 +82,7 @@ obexd_src_obexd_SOURCES = $(btio_sources) $(gobex_sources) \ + obexd/src/map_ap.h + obexd_src_obexd_LDADD = lib/libbluetooth-internal.la \ + gdbus/libgdbus-internal.la \ ++ src/libshared-glib.la \ + $(ICAL_LIBS) $(DBUS_LIBS) $(LIBEBOOK_LIBS) \ + $(LIBEDATASERVER_LIBS) $(GLIB_LIBS) -ldl + +diff --git a/Makefile.tools b/Makefile.tools +index c7bdff83f..35b0021ea 100644 +--- a/Makefile.tools ++++ b/Makefile.tools +@@ -302,7 +302,8 @@ tools_mpris_proxy_SOURCES = tools/mpris-proxy.c + tools_mpris_proxy_LDADD = gdbus/libgdbus-internal.la $(GLIB_LIBS) $(DBUS_LIBS) + + tools_gatt_service_SOURCES = tools/gatt-service.c +-tools_gatt_service_LDADD = $(GLIB_LIBS) $(DBUS_LIBS) gdbus/libgdbus-internal.la ++tools_gatt_service_LDADD = gdbus/libgdbus-internal.la \ ++ src/libshared-mainloop.la $(GLIB_LIBS) $(DBUS_LIBS) + + profiles_iap_iapd_SOURCES = profiles/iap/main.c + profiles_iap_iapd_LDADD = gdbus/libgdbus-internal.la $(GLIB_LIBS) $(DBUS_LIBS) +@@ -448,11 +449,12 @@ noinst_PROGRAMS += tools/btmgmt tools/obex-client-tool tools/obex-server-tool \ + tools_obex_client_tool_SOURCES = $(gobex_sources) $(btio_sources) \ + tools/obex-client-tool.c + tools_obex_client_tool_LDADD = lib/libbluetooth-internal.la \ +- $(GLIB_LIBS) -lreadline ++ src/libshared-glib.la $(GLIB_LIBS) -lreadline + + tools_obex_server_tool_SOURCES = $(gobex_sources) $(btio_sources) \ + tools/obex-server-tool.c +-tools_obex_server_tool_LDADD = lib/libbluetooth-internal.la $(GLIB_LIBS) ++tools_obex_server_tool_LDADD = lib/libbluetooth-internal.la \ ++ src/libshared-glib.la $(GLIB_LIBS) + + tools_bluetooth_player_SOURCES = tools/bluetooth-player.c + tools_bluetooth_player_LDADD = gdbus/libgdbus-internal.la \ +@@ -461,7 +463,8 @@ tools_bluetooth_player_LDADD = gdbus/libgdbus-internal.la \ + + tools_obexctl_SOURCES = tools/obexctl.c + tools_obexctl_LDADD = gdbus/libgdbus-internal.la src/libshared-glib.la \ +- $(GLIB_LIBS) $(DBUS_LIBS) -lreadline ++ src/libshared-glib.la $(GLIB_LIBS) $(DBUS_LIBS) \ ++ -lreadline + + tools_btmgmt_SOURCES = tools/btmgmt.c src/uuid-helper.c client/display.c + tools_btmgmt_LDADD = lib/libbluetooth-internal.la src/libshared-mainloop.la \ +diff --git a/android/a2dp.c b/android/a2dp.c +index 029107cf5..ee607a32d 100644 +--- a/android/a2dp.c ++++ b/android/a2dp.c +@@ -26,6 +26,7 @@ + #include "lib/sdp_lib.h" + #include "profiles/audio/a2dp-codecs.h" + #include "src/shared/queue.h" ++#include "src/shared/util.h" + #include "src/log.h" + #include "hal-msg.h" + #include "ipc-common.h" +@@ -428,7 +429,7 @@ static struct a2dp_preset *sbc_select_range(void *caps, uint8_t caps_len, + + p = g_new0(struct a2dp_preset, 1); + p->len = conf_len; +- p->data = g_memdup(conf, p->len); ++ p->data = util_memdup(conf, p->len); + + return p; + } +@@ -448,7 +449,7 @@ static struct a2dp_preset *aac_select_range(void *caps, uint8_t caps_len, + + p = g_new0(struct a2dp_preset, 1); + p->len = conf_len; +- p->data = g_memdup(conf, p->len); ++ p->data = util_memdup(conf, p->len); + + return p; + } +@@ -1036,7 +1037,7 @@ static gboolean sep_setconf_ind(struct avdtp *session, + + preset = g_new0(struct a2dp_preset, 1); + preset->len = cap->length - sizeof(*codec); +- preset->data = g_memdup(codec->data, preset->len); ++ preset->data = util_memdup(codec->data, preset->len); + + if (check_config(endpoint, preset) < 0) { + preset_free(preset); +@@ -1365,7 +1366,7 @@ static GSList *parse_presets(const struct audio_preset *p, uint8_t count, + + preset = g_new0(struct a2dp_preset, 1); + preset->len = p->len; +- preset->data = g_memdup(p->data, preset->len); ++ preset->data = util_memdup(p->data, preset->len); + l = g_slist_append(l, preset); + + len -= preset->len; +diff --git a/android/avctp.c b/android/avctp.c +index 14ebbc391..37b4cec4f 100644 +--- a/android/avctp.c ++++ b/android/avctp.c +@@ -31,6 +31,7 @@ + #include + + #include "lib/sdp.h" ++#include "src/shared/util.h" + #include "src/log.h" + #include "avctp.h" + +@@ -1177,7 +1178,7 @@ static int avctp_send_req(struct avctp *session, uint8_t code, uint8_t subunit, + + for (i = 0; i < iov_cnt; i++) { + pdu[i].iov_len = iov[i].iov_len; +- pdu[i].iov_base = g_memdup(iov[i].iov_base, iov[i].iov_len); ++ pdu[i].iov_base = util_memdup(iov[i].iov_base, iov[i].iov_len); + } + + req = g_new0(struct avctp_control_req, 1); +@@ -1218,7 +1219,7 @@ int avctp_send_browsing_req(struct avctp *session, + + for (i = 0; i < iov_cnt; i++) { + pdu[i].iov_len = iov[i].iov_len; +- pdu[i].iov_base = g_memdup(iov[i].iov_base, iov[i].iov_len); ++ pdu[i].iov_base = util_memdup(iov[i].iov_base, iov[i].iov_len); + } + + req = g_new0(struct avctp_browsing_req, 1); +diff --git a/android/avrcp-lib.c b/android/avrcp-lib.c +index 2007d09d2..b342692cb 100644 +--- a/android/avrcp-lib.c ++++ b/android/avrcp-lib.c +@@ -2620,7 +2620,7 @@ static char *parse_folder_list(uint8_t *params, uint16_t params_len, + return NULL; + } + +- folders[count] = g_memdup(¶ms[i], len); ++ folders[count] = util_memdup(¶ms[i], len); + i += len; + } + +diff --git a/android/gatt.c b/android/gatt.c +index a8a0c488b..e8ba5aabb 100644 +--- a/android/gatt.c ++++ b/android/gatt.c +@@ -1338,7 +1338,8 @@ static void discover_primary_cb(uint8_t status, GSList *services, + } + + bt_uuid_to_uuid128(&uuid, &u128); +- new_uuid = g_memdup(&u128.value.u128, sizeof(u128.value.u128)); ++ new_uuid = util_memdup(&u128.value.u128, ++ sizeof(u128.value.u128)); + + uuids = g_slist_prepend(uuids, new_uuid); + } +@@ -6633,7 +6634,7 @@ static uint8_t write_prep_request(const uint8_t *cmd, uint16_t cmd_len, + + queue_push_tail(dev->pending_requests, data); + +- data->value = g_memdup(value, vlen); ++ data->value = util_memdup(value, vlen); + data->length = vlen; + + if (!gatt_db_attribute_write(attrib, offset, value, vlen, cmd[0], +diff --git a/android/hidhost.c b/android/hidhost.c +index 016382e17..b4e5c527f 100644 +--- a/android/hidhost.c ++++ b/android/hidhost.c +@@ -689,7 +689,8 @@ static void hid_sdp_search_cb(sdp_list_t *recs, int err, gpointer data) + goto fail; + + dev->rd_size = data->unitSize; +- dev->rd_data = g_memdup(data->val.str, data->unitSize); ++ dev->rd_data = util_memdup(data->val.str, ++ data->unitSize); + } + } + +diff --git a/android/tester-main.c b/android/tester-main.c +index ff5ecdf83..317c1de06 100644 +--- a/android/tester-main.c ++++ b/android/tester-main.c +@@ -1253,7 +1253,8 @@ static bt_property_t *copy_properties(int num_properties, + for (i = 0; i < num_properties; i++) { + props[i].type = properties[i].type; + props[i].len = properties[i].len; +- props[i].val = g_memdup(properties[i].val, properties[i].len); ++ props[i].val = util_memdup(properties[i].val, ++ properties[i].len); + } + + return props; +@@ -1268,7 +1269,8 @@ static bt_property_t *repack_properties(int num_properties, + for (i = 0; i < num_properties; i++) { + props[i].type = properties[i]->type; + props[i].len = properties[i]->len; +- props[i].val = g_memdup(properties[i]->val, properties[i]->len); ++ props[i].val = util_memdup(properties[i]->val, ++ properties[i]->len); + } + + return props; +@@ -1281,7 +1283,7 @@ static bt_property_t *create_property(bt_property_type_t type, void *val, + + prop->type = type; + prop->len = len; +- prop->val = g_memdup(val, len); ++ prop->val = util_memdup(val, len); + + return prop; + } +@@ -1615,7 +1617,7 @@ static void gattc_search_result_cb(int conn_id, btgatt_srvc_id_t *srvc_id) + + step->callback = CB_GATTC_SEARCH_RESULT; + step->callback_result.conn_id = conn_id; +- step->callback_result.service = g_memdup(srvc_id, sizeof(*srvc_id)); ++ step->callback_result.service = util_memdup(srvc_id, sizeof(*srvc_id)); + + schedule_callback_verification(step); + } +@@ -1639,8 +1641,8 @@ static void gattc_get_characteristic_cb(int conn_id, int status, + step->callback = CB_GATTC_GET_CHARACTERISTIC; + step->callback_result.status = status; + step->callback_result.conn_id = conn_id; +- step->callback_result.service = g_memdup(srvc_id, sizeof(*srvc_id)); +- step->callback_result.characteristic = g_memdup(char_id, ++ step->callback_result.service = util_memdup(srvc_id, sizeof(*srvc_id)); ++ step->callback_result.characteristic = util_memdup(char_id, + sizeof(*char_id)); + step->callback_result.char_prop = char_prop; + +@@ -1656,10 +1658,10 @@ static void gattc_get_descriptor_cb(int conn_id, int status, + step->callback = CB_GATTC_GET_DESCRIPTOR; + step->callback_result.status = status; + step->callback_result.conn_id = conn_id; +- step->callback_result.service = g_memdup(srvc_id, sizeof(*srvc_id)); +- step->callback_result.characteristic = g_memdup(char_id, ++ step->callback_result.service = util_memdup(srvc_id, sizeof(*srvc_id)); ++ step->callback_result.characteristic = util_memdup(char_id, + sizeof(*char_id)); +- step->callback_result.descriptor = g_memdup(descr_id, ++ step->callback_result.descriptor = util_memdup(descr_id, + sizeof(*descr_id)); + + schedule_callback_verification(step); +@@ -1673,8 +1675,8 @@ static void gattc_get_included_service_cb(int conn_id, int status, + step->callback = CB_GATTC_GET_INCLUDED_SERVICE; + step->callback_result.status = status; + step->callback_result.conn_id = conn_id; +- step->callback_result.service = g_memdup(srvc_id, sizeof(*srvc_id)); +- step->callback_result.included = g_memdup(incl_srvc_id, ++ step->callback_result.service = util_memdup(srvc_id, sizeof(*srvc_id)); ++ step->callback_result.included = util_memdup(incl_srvc_id, + sizeof(*srvc_id)); + + schedule_callback_verification(step); +@@ -1688,7 +1690,8 @@ static void gattc_read_characteristic_cb(int conn_id, int status, + step->callback = CB_GATTC_READ_CHARACTERISTIC; + step->callback_result.status = status; + step->callback_result.conn_id = conn_id; +- step->callback_result.read_params = g_memdup(p_data, sizeof(*p_data)); ++ step->callback_result.read_params = util_memdup(p_data, ++ sizeof(*p_data)); + + schedule_callback_verification(step); + } +@@ -1701,7 +1704,8 @@ static void gattc_read_descriptor_cb(int conn_id, int status, + step->callback = CB_GATTC_READ_DESCRIPTOR; + step->callback_result.status = status; + step->callback_result.conn_id = conn_id; +- step->callback_result.read_params = g_memdup(p_data, sizeof(*p_data)); ++ step->callback_result.read_params = util_memdup(p_data, ++ sizeof(*p_data)); + + schedule_callback_verification(step); + } +@@ -1714,7 +1718,8 @@ static void gattc_write_characteristic_cb(int conn_id, int status, + step->callback = CB_GATTC_WRITE_CHARACTERISTIC; + step->callback_result.status = status; + step->callback_result.conn_id = conn_id; +- step->callback_result.write_params = g_memdup(p_data, sizeof(*p_data)); ++ step->callback_result.write_params = util_memdup(p_data, ++ sizeof(*p_data)); + + schedule_callback_verification(step); + } +@@ -1727,7 +1732,8 @@ static void gattc_write_descriptor_cb(int conn_id, int status, + step->callback = CB_GATTC_WRITE_DESCRIPTOR; + step->callback_result.status = status; + step->callback_result.conn_id = conn_id; +- step->callback_result.write_params = g_memdup(p_data, sizeof(*p_data)); ++ step->callback_result.write_params = util_memdup(p_data, ++ sizeof(*p_data)); + + schedule_callback_verification(step); + } +@@ -1742,8 +1748,8 @@ static void gattc_register_for_notification_cb(int conn_id, int registered, + step->callback = CB_GATTC_REGISTER_FOR_NOTIFICATION; + step->callback_result.status = status; + step->callback_result.conn_id = conn_id; +- step->callback_result.service = g_memdup(srvc_id, sizeof(*srvc_id)); +- step->callback_result.characteristic = g_memdup(char_id, ++ step->callback_result.service = util_memdup(srvc_id, sizeof(*srvc_id)); ++ step->callback_result.characteristic = util_memdup(char_id, + sizeof(*char_id)); + step->callback_result.notification_registered = registered; + +@@ -1756,7 +1762,8 @@ static void gattc_notif_cb(int conn_id, btgatt_notify_params_t *p_data) + + step->callback = CB_GATTC_NOTIFY; + step->callback_result.conn_id = conn_id; +- step->callback_result.notify_params = g_memdup(p_data, sizeof(*p_data)); ++ step->callback_result.notify_params = util_memdup(p_data, ++ sizeof(*p_data)); + + schedule_callback_verification(step); + } +@@ -1827,8 +1834,8 @@ static void gatts_service_added_cb(int status, int server_if, + + step->callback_result.status = status; + step->callback_result.gatt_app_id = server_if; +- step->callback_result.service = g_memdup(srvc_id, sizeof(*srvc_id)); +- step->callback_result.srvc_handle = g_memdup(&srvc_handle, ++ step->callback_result.service = util_memdup(srvc_id, sizeof(*srvc_id)); ++ step->callback_result.srvc_handle = util_memdup(&srvc_handle, + sizeof(srvc_handle)); + + schedule_callback_verification(step); +@@ -1844,9 +1851,9 @@ static void gatts_included_service_added_cb(int status, int server_if, + + step->callback_result.status = status; + step->callback_result.gatt_app_id = server_if; +- step->callback_result.srvc_handle = g_memdup(&srvc_handle, ++ step->callback_result.srvc_handle = util_memdup(&srvc_handle, + sizeof(srvc_handle)); +- step->callback_result.inc_srvc_handle = g_memdup(&inc_srvc_handle, ++ step->callback_result.inc_srvc_handle = util_memdup(&inc_srvc_handle, + sizeof(inc_srvc_handle)); + + schedule_callback_verification(step); +@@ -1863,10 +1870,10 @@ static void gatts_characteristic_added_cb(int status, int server_if, + + step->callback_result.status = status; + step->callback_result.gatt_app_id = server_if; +- step->callback_result.srvc_handle = g_memdup(&srvc_handle, ++ step->callback_result.srvc_handle = util_memdup(&srvc_handle, + sizeof(srvc_handle)); +- step->callback_result.uuid = g_memdup(uuid, sizeof(*uuid)); +- step->callback_result.char_handle = g_memdup(&char_handle, ++ step->callback_result.uuid = util_memdup(uuid, sizeof(*uuid)); ++ step->callback_result.char_handle = util_memdup(&char_handle, + sizeof(char_handle)); + + schedule_callback_verification(step); +@@ -1883,10 +1890,10 @@ static void gatts_descriptor_added_cb(int status, int server_if, + + step->callback_result.status = status; + step->callback_result.gatt_app_id = server_if; +- step->callback_result.srvc_handle = g_memdup(&srvc_handle, ++ step->callback_result.srvc_handle = util_memdup(&srvc_handle, + sizeof(srvc_handle)); +- step->callback_result.uuid = g_memdup(uuid, sizeof(*uuid)); +- step->callback_result.desc_handle = g_memdup(&desc_handle, ++ step->callback_result.uuid = util_memdup(uuid, sizeof(*uuid)); ++ step->callback_result.desc_handle = util_memdup(&desc_handle, + sizeof(desc_handle)); + + schedule_callback_verification(step); +@@ -1900,7 +1907,7 @@ static void gatts_service_started_cb(int status, int server_if, int srvc_handle) + + step->callback_result.status = status; + step->callback_result.gatt_app_id = server_if; +- step->callback_result.srvc_handle = g_memdup(&srvc_handle, ++ step->callback_result.srvc_handle = util_memdup(&srvc_handle, + sizeof(srvc_handle)); + + schedule_callback_verification(step); +@@ -1914,7 +1921,7 @@ static void gatts_service_stopped_cb(int status, int server_if, int srvc_handle) + + step->callback_result.status = status; + step->callback_result.gatt_app_id = server_if; +- step->callback_result.srvc_handle = g_memdup(&srvc_handle, ++ step->callback_result.srvc_handle = util_memdup(&srvc_handle, + sizeof(srvc_handle)); + + schedule_callback_verification(step); +@@ -1928,7 +1935,7 @@ static void gatts_service_deleted_cb(int status, int server_if, int srvc_handle) + + step->callback_result.status = status; + step->callback_result.gatt_app_id = server_if; +- step->callback_result.srvc_handle = g_memdup(&srvc_handle, ++ step->callback_result.srvc_handle = util_memdup(&srvc_handle, + sizeof(srvc_handle)); + + schedule_callback_verification(step); +@@ -1945,7 +1952,7 @@ static void gatts_request_read_cb(int conn_id, int trans_id, bt_bdaddr_t *bda, + + step->callback_result.conn_id = conn_id; + step->callback_result.trans_id = trans_id; +- step->callback_result.attr_handle = g_memdup(&attr_handle, ++ step->callback_result.attr_handle = util_memdup(&attr_handle, + sizeof(attr_handle)); + step->callback_result.offset = offset; + step->callback_result.is_long = is_long; +@@ -1974,13 +1981,13 @@ static void gatts_request_write_cb(int conn_id, int trans_id, bt_bdaddr_t *bda, + + step->callback_result.conn_id = conn_id; + step->callback_result.trans_id = trans_id; +- step->callback_result.attr_handle = g_memdup(&attr_handle, ++ step->callback_result.attr_handle = util_memdup(&attr_handle, + sizeof(attr_handle)); + step->callback_result.offset = offset; + step->callback_result.length = length; + step->callback_result.need_rsp = need_rsp; + step->callback_result.is_prep = is_prep; +- step->callback_result.value = g_memdup(&value, length); ++ step->callback_result.value = util_memdup(&value, length); + + /* Utilize property verification mechanism for bdaddr */ + props[0] = create_property(BT_PROPERTY_BDADDR, bda, sizeof(*bda)); +@@ -2169,7 +2176,7 @@ static btmce_mas_instance_t *copy_mas_instances(int num_instances, + inst[i].id = instances[i].id; + inst[i].scn = instances[i].scn; + inst[i].msg_types = instances[i].msg_types; +- inst[i].p_name = g_memdup(instances[i].p_name, ++ inst[i].p_name = util_memdup(instances[i].p_name, + strlen(instances[i].p_name)); + } + +diff --git a/attrib/gatt.c b/attrib/gatt.c +index 46b2ca381..b496dd1eb 100644 +--- a/attrib/gatt.c ++++ b/attrib/gatt.c +@@ -135,7 +135,7 @@ static void discover_char_unref(void *data) + + g_slist_free_full(dc->characteristics, g_free); + g_attrib_unref(dc->attrib); +- g_free(dc->uuid); ++ free(dc->uuid); + g_free(dc); + } + +@@ -157,7 +157,7 @@ static void discover_desc_unref(void *data) + + g_slist_free_full(dd->descriptors, g_free); + g_attrib_unref(dd->attrib); +- g_free(dd->uuid); ++ free(dd->uuid); + g_free(dd); + } + +@@ -696,7 +696,7 @@ guint gatt_discover_char(GAttrib *attrib, uint16_t start, uint16_t end, + dc->user_data = user_data; + dc->end = end; + dc->start = start; +- dc->uuid = g_memdup(uuid, sizeof(bt_uuid_t)); ++ dc->uuid = util_memdup(uuid, sizeof(bt_uuid_t)); + + dc->id = g_attrib_send(attrib, 0, buf, plen, char_discovered_cb, + discover_char_ref(dc), discover_char_unref); +@@ -905,7 +905,7 @@ static void prepare_write_cb(guint8 status, const guint8 *rpdu, guint16 rlen, + if (long_write->offset == long_write->vlen) { + execute_write(long_write->attrib, ATT_WRITE_ALL_PREP_WRITES, + long_write->func, long_write->user_data); +- g_free(long_write->value); ++ free(long_write->value); + g_free(long_write); + + return; +@@ -964,7 +964,7 @@ guint gatt_write_char(GAttrib *attrib, uint16_t handle, const uint8_t *value, + long_write->func = func; + long_write->user_data = user_data; + long_write->handle = handle; +- long_write->value = g_memdup(value, vlen); ++ long_write->value = util_memdup(value, vlen); + long_write->vlen = vlen; + + return prepare_write(long_write); +@@ -1130,7 +1130,7 @@ guint gatt_discover_desc(GAttrib *attrib, uint16_t start, uint16_t end, + dd->user_data = user_data; + dd->start = start; + dd->end = end; +- dd->uuid = g_memdup(uuid, sizeof(bt_uuid_t)); ++ dd->uuid = util_memdup(uuid, sizeof(bt_uuid_t)); + + dd->id = g_attrib_send(attrib, 0, buf, plen, desc_discovered_cb, + discover_desc_ref(dd), discover_desc_unref); +diff --git a/client/gatt.c b/client/gatt.c +index 11f70dc4f..13872c794 100644 +--- a/client/gatt.c ++++ b/client/gatt.c +@@ -811,7 +811,7 @@ static uint8_t *str2bytearray(char *arg, size_t *val_len) + + *val_len = i; + +- return g_memdup(value, i); ++ return util_memdup(value, i); + } + + void gatt_write_attribute(GDBusProxy *proxy, int argc, char *argv[]) +diff --git a/gobex/gobex-header.c b/gobex/gobex-header.c +index 011d33d1a..002ba8861 100644 +--- a/gobex/gobex-header.c ++++ b/gobex/gobex-header.c +@@ -15,6 +15,7 @@ + + #include "gobex-header.h" + #include "gobex-debug.h" ++#include "src/shared/util.h" + + /* Header types */ + #define G_OBEX_HDR_ENC_UNICODE (0 << 6) +@@ -222,7 +223,7 @@ GObexHeader *g_obex_header_decode(const void *data, gsize len, + + switch (data_policy) { + case G_OBEX_DATA_COPY: +- header->v.data = g_memdup(ptr, header->vlen); ++ header->v.data = util_memdup(ptr, header->vlen); + break; + case G_OBEX_DATA_REF: + header->extdata = TRUE; +@@ -282,7 +283,7 @@ void g_obex_header_free(GObexHeader *header) + break; + case G_OBEX_HDR_ENC_BYTES: + if (!header->extdata) +- g_free(header->v.data); ++ free(header->v.data); + break; + case G_OBEX_HDR_ENC_UINT8: + case G_OBEX_HDR_ENC_UINT32: +@@ -410,7 +411,7 @@ GObexHeader *g_obex_header_new_bytes(guint8 id, const void *data, gsize len) + header->id = id; + header->vlen = len; + header->hlen = len + 3; +- header->v.data = g_memdup(data, len); ++ header->v.data = util_memdup(data, len); + + return header; + } +diff --git a/gobex/gobex-packet.c b/gobex/gobex-packet.c +index 11937a5a5..8ae78b0f6 100644 +--- a/gobex/gobex-packet.c ++++ b/gobex/gobex-packet.c +@@ -17,6 +17,7 @@ + #include "gobex-defs.h" + #include "gobex-packet.h" + #include "gobex-debug.h" ++#include "src/shared/util.h" + + #define FINAL_BIT 0x80 + +@@ -201,7 +202,7 @@ gboolean g_obex_packet_set_data(GObexPacket *pkt, const void *data, gsize len, + + switch (data_policy) { + case G_OBEX_DATA_COPY: +- pkt->data.buf = g_memdup(data, len); ++ pkt->data.buf = util_memdup(data, len); + break; + case G_OBEX_DATA_REF: + pkt->data.buf_ref = data; +@@ -259,7 +260,7 @@ void g_obex_packet_free(GObexPacket *pkt) + switch (pkt->data_policy) { + case G_OBEX_DATA_INHERIT: + case G_OBEX_DATA_COPY: +- g_free(pkt->data.buf); ++ free(pkt->data.buf); + break; + case G_OBEX_DATA_REF: + break; +diff --git a/obexd/src/obex.c b/obexd/src/obex.c +index 9f992ec18..3a68fd66c 100644 +--- a/obexd/src/obex.c ++++ b/obexd/src/obex.c +@@ -40,6 +40,7 @@ + #include "mimetype.h" + #include "service.h" + #include "transport.h" ++#include "src/shared/util.h" + + typedef struct { + uint8_t version; +@@ -145,7 +146,7 @@ static void os_reset_session(struct obex_session *os) + os->path = NULL; + } + if (os->apparam) { +- g_free(os->apparam); ++ free(os->apparam); + os->apparam = NULL; + os->apparam_len = 0; + } +@@ -594,7 +595,7 @@ static void parse_apparam(struct obex_session *os, GObexPacket *req) + if (!g_obex_header_get_bytes(hdr, &apparam, &len)) + return; + +- os->apparam = g_memdup(apparam, len); ++ os->apparam = util_memdup(apparam, len); + os->apparam_len = len; + DBG("APPARAM"); + } +diff --git a/plugins/neard.c b/plugins/neard.c +index e07b51106..a75527148 100644 +--- a/plugins/neard.c ++++ b/plugins/neard.c +@@ -30,6 +30,7 @@ + #include "src/eir.h" + #include "src/agent.h" + #include "src/btd.h" ++#include "src/shared/util.h" + + #define NEARD_NAME "org.neard" + #define NEARD_PATH "/" +@@ -71,7 +72,7 @@ static void free_oob_params(struct oob_params *params) + g_free(params->name); + g_free(params->hash); + g_free(params->randomizer); +- g_free(params->pin); ++ free(params->pin); + } + + static DBusMessage *error_reply(DBusMessage *msg, int error) +@@ -407,10 +408,10 @@ static int process_nokia_long (void *data, size_t size, uint8_t marker, + remote->name = g_strndup((char *)n->name, n->name_len); + + if (marker == 0x01) { +- remote->pin = g_memdup(n->authentication, 4); ++ remote->pin = util_memdup(n->authentication, 4); + remote->pin_len = 4; + } else if (marker == 0x02) { +- remote->pin = g_memdup(n->authentication, 16); ++ remote->pin = util_memdup(n->authentication, 16); + remote->pin_len = 16; + } + +@@ -439,7 +440,7 @@ static int process_nokia_short (void *data, size_t size, + if (n->name_len > 0) + remote->name = g_strndup((char *)n->name, n->name_len); + +- remote->pin = g_memdup(n->authentication, 4); ++ remote->pin = util_memdup(n->authentication, 4); + remote->pin_len = 4; + + return 0; +diff --git a/plugins/policy.c b/plugins/policy.c +index 051db82e1..48f5db7d3 100644 +--- a/plugins/policy.c ++++ b/plugins/policy.c +@@ -32,6 +32,7 @@ + #include "src/profile.h" + #include "src/btd.h" + #include "src/shared/timeout.h" ++#include "src/shared/util.h" + + #define CONTROL_CONNECT_TIMEOUT 2 + #define SOURCE_RETRY_TIMEOUT 2 +@@ -855,7 +856,7 @@ static int policy_init(void) + reconnect_attempts = default_attempts; + reconnect_intervals_len = sizeof(default_intervals) / + sizeof(*reconnect_intervals); +- reconnect_intervals = g_memdup(default_intervals, ++ reconnect_intervals = util_memdup(default_intervals, + sizeof(default_intervals)); + goto done; + } +@@ -886,7 +887,7 @@ static int policy_init(void) + g_clear_error(&gerr); + reconnect_intervals_len = sizeof(default_intervals) / + sizeof(*reconnect_intervals); +- reconnect_intervals = g_memdup(default_intervals, ++ reconnect_intervals = util_memdup(default_intervals, + sizeof(default_intervals)); + } + +@@ -919,7 +920,7 @@ static void policy_exit(void) + if (reconnect_uuids) + g_strfreev(reconnect_uuids); + +- g_free(reconnect_intervals); ++ free(reconnect_intervals); + + g_slist_free_full(reconnects, reconnect_destroy); + +diff --git a/profiles/audio/avctp.c b/profiles/audio/avctp.c +index 64d1a8504..6f64f162b 100644 +--- a/profiles/audio/avctp.c ++++ b/profiles/audio/avctp.c +@@ -40,6 +40,7 @@ + #include "src/log.h" + #include "src/error.h" + #include "src/shared/timeout.h" ++#include "src/shared/util.h" + + #include "avctp.h" + #include "avrcp.h" +@@ -760,7 +761,7 @@ static void control_req_destroy(void *data) + NULL, 0, req->user_data); + + done: +- g_free(req->operands); ++ free(req->operands); + g_free(req); + } + +@@ -776,7 +777,7 @@ static void browsing_req_destroy(void *data) + req->func(session, NULL, 0, req->user_data); + + done: +- g_free(req->operands); ++ free(req->operands); + g_free(req); + } + +@@ -1727,7 +1728,7 @@ static int avctp_send_req(struct avctp *session, uint8_t code, + req->subunit = subunit; + req->op = opcode; + req->func = func; +- req->operands = g_memdup(operands, operand_count); ++ req->operands = util_memdup(operands, operand_count); + req->operand_count = operand_count; + req->user_data = user_data; + +@@ -1765,7 +1766,7 @@ int avctp_send_browsing_req(struct avctp *session, + + req = g_new0(struct avctp_browsing_req, 1); + req->func = func; +- req->operands = g_memdup(operands, operand_count); ++ req->operands = util_memdup(operands, operand_count); + req->operand_count = operand_count; + req->user_data = user_data; + +diff --git a/profiles/audio/avrcp.c b/profiles/audio/avrcp.c +index 7c280203c..d4e19ffc0 100644 +--- a/profiles/audio/avrcp.c ++++ b/profiles/audio/avrcp.c +@@ -1298,7 +1298,7 @@ static uint8_t avrcp_handle_get_current_player_value(struct avrcp *session, + * Save a copy of requested settings because we can override them + * while responding + */ +- settings = g_memdup(&pdu->params[1], pdu->params[0]); ++ settings = util_memdup(&pdu->params[1], pdu->params[0]); + len = 0; + + /* +@@ -1323,7 +1323,7 @@ static uint8_t avrcp_handle_get_current_player_value(struct avrcp *session, + pdu->params[++len] = val; + } + +- g_free(settings); ++ free(settings); + + if (len) { + pdu->params[0] = len / 2; +@@ -2801,7 +2801,7 @@ static gboolean avrcp_set_browsed_player_rsp(struct avctp *conn, + break; + } + +- folders[count] = g_memdup(&pdu->params[i], len); ++ folders[count] = util_memdup(&pdu->params[i], len); + i += len; + } + +@@ -2888,7 +2888,7 @@ static void avrcp_player_parse_features(struct avrcp_player *player, + { + struct media_player *mp = player->user_data; + +- player->features = g_memdup(features, 16); ++ player->features = util_memdup(features, 16); + + if (features[7] & 0x08) { + media_player_set_browsable(mp, true); +@@ -3622,7 +3622,7 @@ static void player_destroy(gpointer data) + g_slist_free(player->sessions); + g_free(player->path); + g_free(player->change_path); +- g_free(player->features); ++ free(player->features); + g_free(player); + } + +diff --git a/profiles/battery/bas.c b/profiles/battery/bas.c +index 3c6173b61..16ff22e19 100644 +--- a/profiles/battery/bas.c ++++ b/profiles/battery/bas.c +@@ -62,7 +62,7 @@ static void bas_free(struct bt_bas *bas) + { + bt_bas_detach(bas); + +- g_free(bas->primary); ++ free(bas->primary); + queue_destroy(bas->gatt_op, (void *) destroy_gatt_req); + free(bas); + } +@@ -75,7 +75,7 @@ struct bt_bas *bt_bas_new(void *primary) + bas->gatt_op = queue_new(); + + if (primary) +- bas->primary = g_memdup(primary, sizeof(*bas->primary)); ++ bas->primary = util_memdup(primary, sizeof(*bas->primary)); + + return bt_bas_ref(bas); + } +diff --git a/profiles/battery/battery.c b/profiles/battery/battery.c +index 176d127f6..02d024d92 100644 +--- a/profiles/battery/battery.c ++++ b/profiles/battery/battery.c +@@ -66,7 +66,7 @@ static void batt_free(struct batt *batt) + gatt_db_unref(batt->db); + bt_gatt_client_unref(batt->client); + btd_device_unref(batt->device); +- g_free (batt->initial_value); ++ free(batt->initial_value); + if (batt->battery) + btd_battery_unregister(batt->battery); + g_free(batt); +@@ -159,7 +159,7 @@ static void read_initial_battery_level_cb(bool success, + if (!length) + return; + +- batt->initial_value = g_memdup(value, length); ++ batt->initial_value = util_memdup(value, length); + + /* request notify */ + batt->batt_level_cb_id = +diff --git a/profiles/deviceinfo/dis.c b/profiles/deviceinfo/dis.c +index 87fa63306..f660179ed 100644 +--- a/profiles/deviceinfo/dis.c ++++ b/profiles/deviceinfo/dis.c +@@ -72,7 +72,7 @@ static void dis_free(struct bt_dis *dis) + { + bt_dis_detach(dis); + +- g_free(dis->primary); ++ free(dis->primary); + queue_destroy(dis->gatt_op, (void *) destroy_gatt_req); + g_free(dis); + } +@@ -143,7 +143,7 @@ struct bt_dis *bt_dis_new_primary(void *primary) + dis->gatt_op = queue_new(); + + if (primary) +- dis->primary = g_memdup(primary, sizeof(*dis->primary)); ++ dis->primary = util_memdup(primary, sizeof(*dis->primary)); + + return bt_dis_ref(dis); + } +diff --git a/profiles/input/hog-lib.c b/profiles/input/hog-lib.c +index 3bbe42370..d37caa1f1 100644 +--- a/profiles/input/hog-lib.c ++++ b/profiles/input/hog-lib.c +@@ -527,9 +527,9 @@ static void report_read_cb(guint8 status, const guint8 *pdu, guint16 len, + } + + if (report->value) +- g_free(report->value); ++ free(report->value); + +- report->value = g_memdup(pdu, len); ++ report->value = util_memdup(pdu, len); + report->len = len; + } + +@@ -1217,7 +1217,7 @@ static void report_free(void *data) + { + struct report *report = data; + +- g_free(report->value); ++ free(report->value); + g_free(report); + } + +@@ -1241,7 +1241,7 @@ static void hog_free(void *data) + bt_uhid_unref(hog->uhid); + g_slist_free_full(hog->reports, report_free); + g_free(hog->name); +- g_free(hog->primary); ++ free(hog->primary); + queue_destroy(hog->gatt_op, (void *) destroy_gatt_req); + if (hog->gatt_db) + gatt_db_unref(hog->gatt_db); +@@ -1609,7 +1609,7 @@ static void hog_attach_hog(struct bt_hog *hog, struct gatt_primary *primary) + struct bt_hog *instance; + + if (!hog->primary) { +- hog->primary = g_memdup(primary, sizeof(*primary)); ++ hog->primary = util_memdup(primary, sizeof(*primary)); + discover_char(hog, hog->attrib, primary->range.start, + primary->range.end, NULL, + char_discovered_cb, hog); +@@ -1623,7 +1623,7 @@ static void hog_attach_hog(struct bt_hog *hog, struct gatt_primary *primary) + if (!instance) + return; + +- instance->primary = g_memdup(primary, sizeof(*primary)); ++ instance->primary = util_memdup(primary, sizeof(*primary)); + find_included(instance, hog->attrib, primary->range.start, + primary->range.end, find_included_cb, instance); + +diff --git a/profiles/scanparam/scpp.c b/profiles/scanparam/scpp.c +index da38a6aaa..4be8b26cc 100644 +--- a/profiles/scanparam/scpp.c ++++ b/profiles/scanparam/scpp.c +@@ -91,7 +91,7 @@ static void scpp_free(struct bt_scpp *scan) + { + bt_scpp_detach(scan); + +- g_free(scan->primary); ++ free(scan->primary); + queue_destroy(scan->gatt_op, NULL); /* cleared in bt_scpp_detach */ + g_free(scan); + } +@@ -110,7 +110,7 @@ struct bt_scpp *bt_scpp_new(void *primary) + scan->gatt_op = queue_new(); + + if (primary) +- scan->primary = g_memdup(primary, sizeof(*scan->primary)); ++ scan->primary = util_memdup(primary, sizeof(*scan->primary)); + + return bt_scpp_ref(scan); + } +diff --git a/src/eir.c b/src/eir.c +index 0f5d14fcd..2f9ee036f 100644 +--- a/src/eir.c ++++ b/src/eir.c +@@ -53,9 +53,9 @@ void eir_data_free(struct eir_data *eir) + eir->services = NULL; + g_free(eir->name); + eir->name = NULL; +- g_free(eir->hash); ++ free(eir->hash); + eir->hash = NULL; +- g_free(eir->randomizer); ++ free(eir->randomizer); + eir->randomizer = NULL; + g_slist_free_full(eir->msd_list, g_free); + eir->msd_list = NULL; +@@ -323,13 +323,13 @@ void eir_parse(struct eir_data *eir, const uint8_t *eir_data, uint8_t eir_len) + case EIR_SSP_HASH: + if (data_len < 16) + break; +- eir->hash = g_memdup(data, 16); ++ eir->hash = util_memdup(data, 16); + break; + + case EIR_SSP_RANDOMIZER: + if (data_len < 16) + break; +- eir->randomizer = g_memdup(data, 16); ++ eir->randomizer = util_memdup(data, 16); + break; + + case EIR_DEVICE_ID: +diff --git a/tools/gatt-service.c b/tools/gatt-service.c +index 631c4f249..ed6b06f1e 100644 +--- a/tools/gatt-service.c ++++ b/tools/gatt-service.c +@@ -26,6 +26,7 @@ + #include "gdbus/gdbus.h" + + #include "src/error.h" ++#include "src/shared/util.h" + + #define GATT_MGR_IFACE "org.bluez.GattManager1" + #define GATT_SERVICE_IFACE "org.bluez.GattService1" +@@ -126,8 +127,8 @@ static gboolean desc_get_value(const GDBusPropertyTable *property, + + static void desc_write(struct descriptor *desc, const uint8_t *value, int len) + { +- g_free(desc->value); +- desc->value = g_memdup(value, len); ++ free(desc->value); ++ desc->value = util_memdup(value, len); + desc->vlen = len; + + g_dbus_emit_property_changed(connection, desc->path, +@@ -264,8 +265,8 @@ static gboolean chr_get_props(const GDBusPropertyTable *property, + + static void chr_write(struct characteristic *chr, const uint8_t *value, int len) + { +- g_free(chr->value); +- chr->value = g_memdup(value, len); ++ free(chr->value); ++ chr->value = util_memdup(value, len); + chr->vlen = len; + + g_dbus_emit_property_changed(connection, chr->path, GATT_CHR_IFACE, +@@ -388,7 +389,7 @@ static void chr_iface_destroy(gpointer user_data) + + g_free(chr->uuid); + g_free(chr->service); +- g_free(chr->value); ++ free(chr->value); + g_free(chr->path); + g_free(chr); + } +@@ -398,7 +399,7 @@ static void desc_iface_destroy(gpointer user_data) + struct descriptor *desc = user_data; + + g_free(desc->uuid); +- g_free(desc->value); ++ free(desc->value); + g_free(desc->path); + g_free(desc); + } +@@ -592,7 +593,7 @@ static gboolean register_characteristic(const char *chr_uuid, + + chr = g_new0(struct characteristic, 1); + chr->uuid = g_strdup(chr_uuid); +- chr->value = g_memdup(value, vlen); ++ chr->value = util_memdup(value, vlen); + chr->vlen = vlen; + chr->props = props; + chr->service = g_strdup(service_path); +diff --git a/tools/mesh-gatt/gatt.c b/tools/mesh-gatt/gatt.c +index c8a8123fb..ab9743cd1 100644 +--- a/tools/mesh-gatt/gatt.c ++++ b/tools/mesh-gatt/gatt.c +@@ -24,6 +24,7 @@ + + #include "src/shared/io.h" + #include "src/shared/shell.h" ++#include "src/shared/util.h" + #include "gdbus/gdbus.h" + #include "lib/bluetooth.h" + #include "lib/uuid.h" +@@ -86,7 +87,7 @@ static void write_data_free(void *user_data) + { + struct write_data *data = user_data; + +- g_free(data->gatt_data); ++ free(data->gatt_data); + free(data); + } + +@@ -338,7 +339,7 @@ bool mesh_gatt_write(GDBusProxy *proxy, uint8_t *buf, uint16_t len, + /* TODO: should keep in queue in case we need to cancel write? */ + + data->gatt_len = len; +- data->gatt_data = g_memdup(buf, len); ++ data->gatt_data = util_memdup(buf, len); + data->gatt_data[0] &= GATT_TYPE_MASK; + data->iov.iov_base = data->gatt_data; + data->iov.iov_len = len; +diff --git a/unit/test-avctp.c b/unit/test-avctp.c +index fa7db59c8..25fd3abc2 100644 +--- a/unit/test-avctp.c ++++ b/unit/test-avctp.c +@@ -53,7 +53,7 @@ struct context { + #define raw_pdu(args...) \ + { \ + .valid = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +@@ -64,7 +64,7 @@ struct context { + }; \ + static struct test_data data; \ + data.test_name = g_strdup(name); \ +- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ ++ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ + tester_add(name, &data, NULL, function, NULL); \ + } while (0) + +diff --git a/unit/test-avdtp.c b/unit/test-avdtp.c +index 4e8a68c6b..2e49def43 100644 +--- a/unit/test-avdtp.c ++++ b/unit/test-avdtp.c +@@ -48,7 +48,7 @@ struct test_data { + #define raw_pdu(args...) \ + { \ + .valid = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +@@ -56,7 +56,7 @@ struct test_data { + { \ + .valid = true, \ + .fragmented = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +@@ -67,7 +67,7 @@ struct test_data { + }; \ + static struct test_data data; \ + data.test_name = g_strdup(name); \ +- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ ++ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ + tester_add(name, &data, NULL, function, NULL); \ + } while (0) + +diff --git a/unit/test-avrcp.c b/unit/test-avrcp.c +index 34a70377d..b637a8a1b 100644 +--- a/unit/test-avrcp.c ++++ b/unit/test-avrcp.c +@@ -61,7 +61,7 @@ struct context { + #define raw_pdu(args...) \ + { \ + .valid = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +@@ -69,7 +69,7 @@ struct context { + { \ + .valid = true, \ + .browse = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +@@ -77,7 +77,7 @@ struct context { + { \ + .valid = true, \ + .fragmented = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +@@ -85,7 +85,7 @@ struct context { + { \ + .valid = true, \ + .continuing = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +@@ -96,7 +96,7 @@ struct context { + }; \ + static struct test_data data; \ + data.test_name = g_strdup(name); \ +- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ ++ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ + tester_add(name, &data, NULL, function, NULL); \ + } while (0) + +diff --git a/unit/test-gatt.c b/unit/test-gatt.c +index 6a47268e6..f92d860c4 100644 +--- a/unit/test-gatt.c ++++ b/unit/test-gatt.c +@@ -73,7 +73,7 @@ struct context { + #define raw_pdu(args...) \ + { \ + .valid = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +@@ -94,7 +94,7 @@ struct context { + data.uuid = bt_uuid; \ + data.step = test_step; \ + data.source_db = db; \ +- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ ++ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ + tester_add(name, &data, NULL, function, NULL); \ + } while (0) + +diff --git a/unit/test-hfp.c b/unit/test-hfp.c +index f504724d7..b4af99d53 100644 +--- a/unit/test-hfp.c ++++ b/unit/test-hfp.c +@@ -17,6 +17,7 @@ + #include + #include "src/shared/hfp.h" + #include "src/shared/tester.h" ++#include "src/shared/util.h" + + struct context { + guint watch_id; +@@ -50,7 +51,7 @@ struct test_data { + #define raw_pdu(args...) \ + { \ + .valid = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +@@ -62,7 +63,7 @@ struct test_data { + #define type_pdu(cmd_type, args...) \ + { \ + .valid = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + .type = cmd_type, \ + } +@@ -70,7 +71,7 @@ struct test_data { + #define frg_pdu(args...) \ + { \ + .valid = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + .fragmented = true, \ + } +@@ -82,7 +83,7 @@ struct test_data { + }; \ + static struct test_data data; \ + data.test_name = g_strdup(name); \ +- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ ++ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ + data.result_func = result_function; \ + tester_add(name, &data, NULL, function, NULL); \ + data.test_handler = test_handler; \ +@@ -96,7 +97,7 @@ struct test_data { + }; \ + static struct test_data data; \ + data.test_name = g_strdup(name); \ +- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ ++ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ + data.hf_result_func = result_func; \ + data.response_func = response_function; \ + tester_add(name, &data, NULL, function, NULL); \ +diff --git a/unit/test-hog.c b/unit/test-hog.c +index 116a5cb07..067497de4 100644 +--- a/unit/test-hog.c ++++ b/unit/test-hog.c +@@ -59,24 +59,24 @@ struct context { + #define raw_pdu(args...) \ + { \ + .valid = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +-#define false_pdu() \ +-{ \ +- .valid = false, \ ++#define false_pdu() \ ++{ \ ++ .valid = false, \ + } + +-#define define_test(name, function, args...) \ +- do { \ +- const struct test_pdu pdus[] = { \ +- args, { } \ +- }; \ +- static struct test_data data; \ +- data.test_name = g_strdup(name); \ +- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ +- tester_add(name, &data, NULL, function, NULL); \ ++#define define_test(name, function, args...) \ ++ do { \ ++ const struct test_pdu pdus[] = { \ ++ args, { } \ ++ }; \ ++ static struct test_data data; \ ++ data.test_name = g_strdup(name); \ ++ data.pdu_list = util_memdup(pdus, sizeof(pdus));\ ++ tester_add(name, &data, NULL, function, NULL); \ + } while (0) + + static gboolean context_quit(gpointer user_data) +diff --git a/unit/test-sdp.c b/unit/test-sdp.c +index 8f95fcb71..5c04a71eb 100644 +--- a/unit/test-sdp.c ++++ b/unit/test-sdp.c +@@ -47,14 +47,16 @@ struct test_data { + #define raw_pdu(args...) \ + { \ + .valid = true, \ +- .raw_data = g_memdup(raw_data(args), sizeof(raw_data(args))), \ ++ .raw_data = util_memdup(raw_data(args), \ ++ sizeof(raw_data(args))), \ + .raw_size = sizeof(raw_data(args)), \ + } + + #define raw_pdu_cont(cont, args...) \ + { \ + .valid = true, \ +- .raw_data = g_memdup(raw_data(args), sizeof(raw_data(args))), \ ++ .raw_data = util_memdup(raw_data(args), \ ++ sizeof(raw_data(args))), \ + .raw_size = sizeof(raw_data(args)), \ + .cont_len = cont, \ + } +@@ -66,7 +68,7 @@ struct test_data { + }; \ + static struct test_data data; \ + data.mtu = _mtu; \ +- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ ++ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ + tester_add(name, &data, NULL, test_sdp, NULL); \ + } while (0) + +@@ -92,7 +94,7 @@ struct test_data_de { + #define define_test_de_attr(name, input, exp) \ + do { \ + static struct test_data_de data; \ +- data.input_data = g_memdup(input, sizeof(input)); \ ++ data.input_data = util_memdup(input, sizeof(input)); \ + data.input_size = sizeof(input); \ + data.expected = exp; \ + tester_add("/sdp/DE/ATTR/" name, &data, NULL, \ +diff --git a/unit/test-uhid.c b/unit/test-uhid.c +index 001d39a3d..8a8eef855 100644 +--- a/unit/test-uhid.c ++++ b/unit/test-uhid.c +@@ -61,7 +61,7 @@ struct context { + }; \ + static struct test_data data; \ + data.test_name = g_strdup(name); \ +- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ ++ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ + tester_add(name, &data, NULL, function, NULL); \ + } while (0) + +-- +2.17.1 + -- 2.17.1 From giulio.benetti at benettiengineering.com Sun Feb 6 09:08:09 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 10:08:09 +0100 Subject: [Buildroot] [PATCH] toolchain: update gcc bug 99410 Message-ID: <20220206090809.1532589-1-giulio.benetti@benettiengineering.com> Gcc bug 99410 reappeared in gcc 10.x while building belle-sip, but it's fixed on gcc 11.x, so let's update bug conditions. Fixes: http://autobuild.buildroot.net/results/846597f3573d3b0d52e80627a9577d14b9348547/ Signed-off-by: Giulio Benetti --- toolchain/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/toolchain/Config.in b/toolchain/Config.in index ccdf62503d..aed8f393a3 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -185,11 +185,11 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_93847 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=99410 # Error: branch offset out of range on Nios II. This bug # no longer exists in gcc 8.x but reappeared on gcc 9.x and has been -# fixed on gcc 10.x. +# fixed on gcc 11.x. config BR2_TOOLCHAIN_HAS_GCC_BUG_99140 bool default y if !BR2_TOOLCHAIN_GCC_AT_LEAST_8 - default y if BR2_TOOLCHAIN_GCC_AT_LEAST_9 && !BR2_TOOLCHAIN_GCC_AT_LEAST_10 + default y if BR2_TOOLCHAIN_GCC_AT_LEAST_10 && !BR2_TOOLCHAIN_GCC_AT_LEAST_11 depends on BR2_nios2 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101737 -- 2.25.1 From paguilar at paguilar.org Sun Feb 6 09:20:48 2022 From: paguilar at paguilar.org (Pedro Aguilar) Date: Sun, 6 Feb 2022 10:20:48 +0100 Subject: [Buildroot] [PATCH v1] DEVELOPERS: Add packages guile and bdwgc to Pedro Aguilar Message-ID: <20220206092048.1901703-1-paguilar@paguilar.org> Signed-off-by: Pedro Aguilar --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index a1ec9a091e..97d264afef 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2199,6 +2199,8 @@ F: package/umtprd/ N: Pedro Aguilar F: package/libunistring/ +F: package/guile/ +F: package/bdwgc/ N: Peter Korsgaard F: board/arrow/avenger96/ -- 2.25.1 From thomas.devoogdt at gmail.com Sun Feb 6 09:23:57 2022 From: thomas.devoogdt at gmail.com (Thomas Devoogdt) Date: Sun, 6 Feb 2022 10:23:57 +0100 Subject: [Buildroot] [PATCH] package/bluez5_utils: fix build with libglib2 >= 2.69 Message-ID: <20220206092357.19286-1-thomas.devoogdt@gmail.com> Fix the following build failure raised since bump of libglib2 to version 2.70 in commit 079923d: profiles/battery/battery.c:162:2: warning: 'g_memdup' is deprecated (declared at /home/buildroot/autobuild/instance-0/output-1/host/bin/../arm-buildroot-linux-gnueabi/sysroot/usr/include/glib-2.0/glib/gstrfuncs.h:257): Use 'g_memdup2' instead [-Wdeprecated-declarations] batt->initial_value = g_memdup(value, length); Fixes: - http://autobuild.buildroot.org/results/6b8/6b8870d12e0804d6154230a7322c49416c1dc0e2/build-end.log Sources: - https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=710220f861b100856711a0a4d4a852874228a57a - https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=9f09e69ecb077082301dafb745856e1f3731aaa7 - https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=cfab569484b18407fc117bb96634525cc76ea1f5 Signed-off-by: Thomas Devoogdt --- [update] removed patch numbers & remve change to 0001-tools-mesh-cfgtest-include-limits.h ...til-Rename-btd_malloc-to-util_malloc.patch | 67 + .../0003-shared-util-Add-util_memdup.patch | 57 + ...ace-use-of-g_memdup-with-util_memdup.patch | 1411 +++++++++++++++++ 3 files changed, 1535 insertions(+) create mode 100644 package/bluez5_utils/0002-shared-util-Rename-btd_malloc-to-util_malloc.patch create mode 100644 package/bluez5_utils/0003-shared-util-Add-util_memdup.patch create mode 100644 package/bluez5_utils/0004-build-Replace-use-of-g_memdup-with-util_memdup.patch diff --git a/package/bluez5_utils/0002-shared-util-Rename-btd_malloc-to-util_malloc.patch b/package/bluez5_utils/0002-shared-util-Rename-btd_malloc-to-util_malloc.patch new file mode 100644 index 0000000000..f8d74528d8 --- /dev/null +++ b/package/bluez5_utils/0002-shared-util-Rename-btd_malloc-to-util_malloc.patch @@ -0,0 +1,67 @@ +From f3263fed28bf510a1225661fe2b5f598300c11cd Mon Sep 17 00:00:00 2001 +From: Luiz Augusto von Dentz +Date: Wed, 5 Jan 2022 15:53:35 -0800 +Subject: [PATCH] shared/util: Rename btd_malloc to util_malloc + +util functions are not limited to daemon only which is normally the case +when using btd prefix. + +(cherry picked from commit 710220f861b100856711a0a4d4a852874228a57a) +Signed-off-by: Thomas Devoogdt +--- + profiles/audio/avdtp.c | 2 +- + src/shared/util.c | 2 +- + src/shared/util.h | 4 ++-- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/profiles/audio/avdtp.c b/profiles/audio/avdtp.c +index d3dfbf96d..f2b461330 100644 +--- a/profiles/audio/avdtp.c ++++ b/profiles/audio/avdtp.c +@@ -1333,7 +1333,7 @@ static GSList *caps_to_list(uint8_t *data, size_t size, + break; + } + +- cpy = btd_malloc(sizeof(*cpy) + cap->length); ++ cpy = util_malloc(sizeof(*cpy) + cap->length); + memcpy(cpy, cap, sizeof(*cap) + cap->length); + + size -= sizeof(*cap) + cap->length; +diff --git a/src/shared/util.c b/src/shared/util.c +index 81b20d86f..93110047b 100644 +--- a/src/shared/util.c ++++ b/src/shared/util.c +@@ -25,7 +25,7 @@ + + #include "src/shared/util.h" + +-void *btd_malloc(size_t size) ++void *util_malloc(size_t size) + { + if (__builtin_expect(!!size, 1)) { + void *ptr; +diff --git a/src/shared/util.h b/src/shared/util.h +index ac70117ca..11d09979d 100644 +--- a/src/shared/util.h ++++ b/src/shared/util.h +@@ -75,7 +75,7 @@ do { \ + size_t __n = (size_t) (count); \ + size_t __s = sizeof(type); \ + void *__p; \ +- __p = btd_malloc(__n * __s); \ ++ __p = util_malloc(__n * __s); \ + memset(__p, 0, __n * __s); \ + __p; \ + })) +@@ -86,7 +86,7 @@ do { \ + char *strdelimit(char *str, char *del, char c); + int strsuffix(const char *str, const char *suffix); + +-void *btd_malloc(size_t size); ++void *util_malloc(size_t size); + + typedef void (*util_debug_func_t)(const char *str, void *user_data); + +-- +2.17.1 + diff --git a/package/bluez5_utils/0003-shared-util-Add-util_memdup.patch b/package/bluez5_utils/0003-shared-util-Add-util_memdup.patch new file mode 100644 index 0000000000..d5c31a2614 --- /dev/null +++ b/package/bluez5_utils/0003-shared-util-Add-util_memdup.patch @@ -0,0 +1,57 @@ +From 28f1c140374d1ecda65e3d59cca72352c3a07774 Mon Sep 17 00:00:00 2001 +From: Luiz Augusto von Dentz +Date: Thu, 6 Jan 2022 11:45:12 -0800 +Subject: [PATCH] shared/util: Add util_memdup + +This adds util_memdup which is intended to replace g_memdup since +replacing that with g_memdup2 requires bumping the glib version. + +(cherry picked from commit 9f09e69ecb077082301dafb745856e1f3731aaa7) +Signed-off-by: Thomas Devoogdt +--- + src/shared/util.c | 16 ++++++++++++++++ + src/shared/util.h | 1 + + 2 files changed, 17 insertions(+) + +diff --git a/src/shared/util.c b/src/shared/util.c +index 93110047b..6e1c83057 100644 +--- a/src/shared/util.c ++++ b/src/shared/util.c +@@ -41,6 +41,22 @@ void *util_malloc(size_t size) + return NULL; + } + ++void *util_memdup(const void *src, size_t size) ++{ ++ void *cpy; ++ ++ if (!src || !size) ++ return NULL; ++ ++ cpy = util_malloc(size); ++ if (!cpy) ++ return NULL; ++ ++ memcpy(cpy, src, size); ++ ++ return cpy; ++} ++ + void util_debug_va(util_debug_func_t function, void *user_data, + const char *format, va_list va) + { +diff --git a/src/shared/util.h b/src/shared/util.h +index 11d09979d..8ef6132c4 100644 +--- a/src/shared/util.h ++++ b/src/shared/util.h +@@ -87,6 +87,7 @@ char *strdelimit(char *str, char *del, char c); + int strsuffix(const char *str, const char *suffix); + + void *util_malloc(size_t size); ++void *util_memdup(const void *src, size_t size); + + typedef void (*util_debug_func_t)(const char *str, void *user_data); + +-- +2.17.1 + diff --git a/package/bluez5_utils/0004-build-Replace-use-of-g_memdup-with-util_memdup.patch b/package/bluez5_utils/0004-build-Replace-use-of-g_memdup-with-util_memdup.patch new file mode 100644 index 0000000000..9e1047c957 --- /dev/null +++ b/package/bluez5_utils/0004-build-Replace-use-of-g_memdup-with-util_memdup.patch @@ -0,0 +1,1411 @@ +From 7eb74180cf6fd6cebc61bb719d458cbf5d7f4ca7 Mon Sep 17 00:00:00 2001 +From: Luiz Augusto von Dentz +Date: Thu, 6 Jan 2022 12:50:33 -0800 +Subject: [PATCH] build: Replace use of g_memdup with util_memdup +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This replaces the uses of g_memdup with util_memdup since the former has +been deprecated: + + warning: ?g_memdup? is deprecated: Use 'g_memdup2' instead + [-Wdeprecated-declarations] + +g_memdup2 requires bumping glib version which would likely have its +own problems thus why util_memdup was introduced. + +(cherry picked from commit cfab569484b18407fc117bb96634525cc76ea1f5) +Signed-off-by: Thomas Devoogdt +--- + Makefile.am | 10 ++--- + Makefile.obexd | 1 + + Makefile.tools | 11 ++++-- + android/a2dp.c | 9 +++-- + android/avctp.c | 5 ++- + android/avrcp-lib.c | 2 +- + android/gatt.c | 5 ++- + android/hidhost.c | 3 +- + android/tester-main.c | 77 +++++++++++++++++++++----------------- + attrib/gatt.c | 12 +++--- + client/gatt.c | 2 +- + gobex/gobex-header.c | 7 ++-- + gobex/gobex-packet.c | 5 ++- + obexd/src/obex.c | 5 ++- + plugins/neard.c | 9 +++-- + plugins/policy.c | 7 ++-- + profiles/audio/avctp.c | 9 +++-- + profiles/audio/avrcp.c | 10 ++--- + profiles/battery/bas.c | 4 +- + profiles/battery/battery.c | 4 +- + profiles/deviceinfo/dis.c | 4 +- + profiles/input/hog-lib.c | 12 +++--- + profiles/scanparam/scpp.c | 4 +- + src/eir.c | 8 ++-- + tools/gatt-service.c | 15 ++++---- + tools/mesh-gatt/gatt.c | 5 ++- + unit/test-avctp.c | 4 +- + unit/test-avdtp.c | 6 +-- + unit/test-avrcp.c | 10 ++--- + unit/test-gatt.c | 4 +- + unit/test-hfp.c | 11 +++--- + unit/test-hog.c | 26 ++++++------- + unit/test-sdp.c | 10 +++-- + unit/test-uhid.c | 2 +- + 34 files changed, 172 insertions(+), 146 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 308f13c50..9b5e140b8 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -508,23 +508,23 @@ unit_tests += unit/test-gobex-header unit/test-gobex-packet unit/test-gobex \ + + unit_test_gobex_SOURCES = $(gobex_sources) unit/util.c unit/util.h \ + unit/test-gobex.c +-unit_test_gobex_LDADD = $(GLIB_LIBS) ++unit_test_gobex_LDADD = src/libshared-glib.la $(GLIB_LIBS) + + unit_test_gobex_packet_SOURCES = $(gobex_sources) unit/util.c unit/util.h \ + unit/test-gobex-packet.c +-unit_test_gobex_packet_LDADD = $(GLIB_LIBS) ++unit_test_gobex_packet_LDADD = src/libshared-glib.la $(GLIB_LIBS) + + unit_test_gobex_header_SOURCES = $(gobex_sources) unit/util.c unit/util.h \ + unit/test-gobex-header.c +-unit_test_gobex_header_LDADD = $(GLIB_LIBS) ++unit_test_gobex_header_LDADD = src/libshared-glib.la $(GLIB_LIBS) + + unit_test_gobex_transfer_SOURCES = $(gobex_sources) unit/util.c unit/util.h \ + unit/test-gobex-transfer.c +-unit_test_gobex_transfer_LDADD = $(GLIB_LIBS) ++unit_test_gobex_transfer_LDADD = src/libshared-glib.la $(GLIB_LIBS) + + unit_test_gobex_apparam_SOURCES = $(gobex_sources) unit/util.c unit/util.h \ + unit/test-gobex-apparam.c +-unit_test_gobex_apparam_LDADD = $(GLIB_LIBS) ++unit_test_gobex_apparam_LDADD = src/libshared-glib.la $(GLIB_LIBS) + endif + + unit_tests += unit/test-lib +diff --git a/Makefile.obexd b/Makefile.obexd +index 37a133455..5d1a4ff65 100644 +--- a/Makefile.obexd ++++ b/Makefile.obexd +@@ -82,6 +82,7 @@ obexd_src_obexd_SOURCES = $(btio_sources) $(gobex_sources) \ + obexd/src/map_ap.h + obexd_src_obexd_LDADD = lib/libbluetooth-internal.la \ + gdbus/libgdbus-internal.la \ ++ src/libshared-glib.la \ + $(ICAL_LIBS) $(DBUS_LIBS) $(LIBEBOOK_LIBS) \ + $(LIBEDATASERVER_LIBS) $(GLIB_LIBS) -ldl + +diff --git a/Makefile.tools b/Makefile.tools +index c7bdff83f..35b0021ea 100644 +--- a/Makefile.tools ++++ b/Makefile.tools +@@ -302,7 +302,8 @@ tools_mpris_proxy_SOURCES = tools/mpris-proxy.c + tools_mpris_proxy_LDADD = gdbus/libgdbus-internal.la $(GLIB_LIBS) $(DBUS_LIBS) + + tools_gatt_service_SOURCES = tools/gatt-service.c +-tools_gatt_service_LDADD = $(GLIB_LIBS) $(DBUS_LIBS) gdbus/libgdbus-internal.la ++tools_gatt_service_LDADD = gdbus/libgdbus-internal.la \ ++ src/libshared-mainloop.la $(GLIB_LIBS) $(DBUS_LIBS) + + profiles_iap_iapd_SOURCES = profiles/iap/main.c + profiles_iap_iapd_LDADD = gdbus/libgdbus-internal.la $(GLIB_LIBS) $(DBUS_LIBS) +@@ -448,11 +449,12 @@ noinst_PROGRAMS += tools/btmgmt tools/obex-client-tool tools/obex-server-tool \ + tools_obex_client_tool_SOURCES = $(gobex_sources) $(btio_sources) \ + tools/obex-client-tool.c + tools_obex_client_tool_LDADD = lib/libbluetooth-internal.la \ +- $(GLIB_LIBS) -lreadline ++ src/libshared-glib.la $(GLIB_LIBS) -lreadline + + tools_obex_server_tool_SOURCES = $(gobex_sources) $(btio_sources) \ + tools/obex-server-tool.c +-tools_obex_server_tool_LDADD = lib/libbluetooth-internal.la $(GLIB_LIBS) ++tools_obex_server_tool_LDADD = lib/libbluetooth-internal.la \ ++ src/libshared-glib.la $(GLIB_LIBS) + + tools_bluetooth_player_SOURCES = tools/bluetooth-player.c + tools_bluetooth_player_LDADD = gdbus/libgdbus-internal.la \ +@@ -461,7 +463,8 @@ tools_bluetooth_player_LDADD = gdbus/libgdbus-internal.la \ + + tools_obexctl_SOURCES = tools/obexctl.c + tools_obexctl_LDADD = gdbus/libgdbus-internal.la src/libshared-glib.la \ +- $(GLIB_LIBS) $(DBUS_LIBS) -lreadline ++ src/libshared-glib.la $(GLIB_LIBS) $(DBUS_LIBS) \ ++ -lreadline + + tools_btmgmt_SOURCES = tools/btmgmt.c src/uuid-helper.c client/display.c + tools_btmgmt_LDADD = lib/libbluetooth-internal.la src/libshared-mainloop.la \ +diff --git a/android/a2dp.c b/android/a2dp.c +index 029107cf5..ee607a32d 100644 +--- a/android/a2dp.c ++++ b/android/a2dp.c +@@ -26,6 +26,7 @@ + #include "lib/sdp_lib.h" + #include "profiles/audio/a2dp-codecs.h" + #include "src/shared/queue.h" ++#include "src/shared/util.h" + #include "src/log.h" + #include "hal-msg.h" + #include "ipc-common.h" +@@ -428,7 +429,7 @@ static struct a2dp_preset *sbc_select_range(void *caps, uint8_t caps_len, + + p = g_new0(struct a2dp_preset, 1); + p->len = conf_len; +- p->data = g_memdup(conf, p->len); ++ p->data = util_memdup(conf, p->len); + + return p; + } +@@ -448,7 +449,7 @@ static struct a2dp_preset *aac_select_range(void *caps, uint8_t caps_len, + + p = g_new0(struct a2dp_preset, 1); + p->len = conf_len; +- p->data = g_memdup(conf, p->len); ++ p->data = util_memdup(conf, p->len); + + return p; + } +@@ -1036,7 +1037,7 @@ static gboolean sep_setconf_ind(struct avdtp *session, + + preset = g_new0(struct a2dp_preset, 1); + preset->len = cap->length - sizeof(*codec); +- preset->data = g_memdup(codec->data, preset->len); ++ preset->data = util_memdup(codec->data, preset->len); + + if (check_config(endpoint, preset) < 0) { + preset_free(preset); +@@ -1365,7 +1366,7 @@ static GSList *parse_presets(const struct audio_preset *p, uint8_t count, + + preset = g_new0(struct a2dp_preset, 1); + preset->len = p->len; +- preset->data = g_memdup(p->data, preset->len); ++ preset->data = util_memdup(p->data, preset->len); + l = g_slist_append(l, preset); + + len -= preset->len; +diff --git a/android/avctp.c b/android/avctp.c +index 14ebbc391..37b4cec4f 100644 +--- a/android/avctp.c ++++ b/android/avctp.c +@@ -31,6 +31,7 @@ + #include + + #include "lib/sdp.h" ++#include "src/shared/util.h" + #include "src/log.h" + #include "avctp.h" + +@@ -1177,7 +1178,7 @@ static int avctp_send_req(struct avctp *session, uint8_t code, uint8_t subunit, + + for (i = 0; i < iov_cnt; i++) { + pdu[i].iov_len = iov[i].iov_len; +- pdu[i].iov_base = g_memdup(iov[i].iov_base, iov[i].iov_len); ++ pdu[i].iov_base = util_memdup(iov[i].iov_base, iov[i].iov_len); + } + + req = g_new0(struct avctp_control_req, 1); +@@ -1218,7 +1219,7 @@ int avctp_send_browsing_req(struct avctp *session, + + for (i = 0; i < iov_cnt; i++) { + pdu[i].iov_len = iov[i].iov_len; +- pdu[i].iov_base = g_memdup(iov[i].iov_base, iov[i].iov_len); ++ pdu[i].iov_base = util_memdup(iov[i].iov_base, iov[i].iov_len); + } + + req = g_new0(struct avctp_browsing_req, 1); +diff --git a/android/avrcp-lib.c b/android/avrcp-lib.c +index 2007d09d2..b342692cb 100644 +--- a/android/avrcp-lib.c ++++ b/android/avrcp-lib.c +@@ -2620,7 +2620,7 @@ static char *parse_folder_list(uint8_t *params, uint16_t params_len, + return NULL; + } + +- folders[count] = g_memdup(¶ms[i], len); ++ folders[count] = util_memdup(¶ms[i], len); + i += len; + } + +diff --git a/android/gatt.c b/android/gatt.c +index a8a0c488b..e8ba5aabb 100644 +--- a/android/gatt.c ++++ b/android/gatt.c +@@ -1338,7 +1338,8 @@ static void discover_primary_cb(uint8_t status, GSList *services, + } + + bt_uuid_to_uuid128(&uuid, &u128); +- new_uuid = g_memdup(&u128.value.u128, sizeof(u128.value.u128)); ++ new_uuid = util_memdup(&u128.value.u128, ++ sizeof(u128.value.u128)); + + uuids = g_slist_prepend(uuids, new_uuid); + } +@@ -6633,7 +6634,7 @@ static uint8_t write_prep_request(const uint8_t *cmd, uint16_t cmd_len, + + queue_push_tail(dev->pending_requests, data); + +- data->value = g_memdup(value, vlen); ++ data->value = util_memdup(value, vlen); + data->length = vlen; + + if (!gatt_db_attribute_write(attrib, offset, value, vlen, cmd[0], +diff --git a/android/hidhost.c b/android/hidhost.c +index 016382e17..b4e5c527f 100644 +--- a/android/hidhost.c ++++ b/android/hidhost.c +@@ -689,7 +689,8 @@ static void hid_sdp_search_cb(sdp_list_t *recs, int err, gpointer data) + goto fail; + + dev->rd_size = data->unitSize; +- dev->rd_data = g_memdup(data->val.str, data->unitSize); ++ dev->rd_data = util_memdup(data->val.str, ++ data->unitSize); + } + } + +diff --git a/android/tester-main.c b/android/tester-main.c +index ff5ecdf83..317c1de06 100644 +--- a/android/tester-main.c ++++ b/android/tester-main.c +@@ -1253,7 +1253,8 @@ static bt_property_t *copy_properties(int num_properties, + for (i = 0; i < num_properties; i++) { + props[i].type = properties[i].type; + props[i].len = properties[i].len; +- props[i].val = g_memdup(properties[i].val, properties[i].len); ++ props[i].val = util_memdup(properties[i].val, ++ properties[i].len); + } + + return props; +@@ -1268,7 +1269,8 @@ static bt_property_t *repack_properties(int num_properties, + for (i = 0; i < num_properties; i++) { + props[i].type = properties[i]->type; + props[i].len = properties[i]->len; +- props[i].val = g_memdup(properties[i]->val, properties[i]->len); ++ props[i].val = util_memdup(properties[i]->val, ++ properties[i]->len); + } + + return props; +@@ -1281,7 +1283,7 @@ static bt_property_t *create_property(bt_property_type_t type, void *val, + + prop->type = type; + prop->len = len; +- prop->val = g_memdup(val, len); ++ prop->val = util_memdup(val, len); + + return prop; + } +@@ -1615,7 +1617,7 @@ static void gattc_search_result_cb(int conn_id, btgatt_srvc_id_t *srvc_id) + + step->callback = CB_GATTC_SEARCH_RESULT; + step->callback_result.conn_id = conn_id; +- step->callback_result.service = g_memdup(srvc_id, sizeof(*srvc_id)); ++ step->callback_result.service = util_memdup(srvc_id, sizeof(*srvc_id)); + + schedule_callback_verification(step); + } +@@ -1639,8 +1641,8 @@ static void gattc_get_characteristic_cb(int conn_id, int status, + step->callback = CB_GATTC_GET_CHARACTERISTIC; + step->callback_result.status = status; + step->callback_result.conn_id = conn_id; +- step->callback_result.service = g_memdup(srvc_id, sizeof(*srvc_id)); +- step->callback_result.characteristic = g_memdup(char_id, ++ step->callback_result.service = util_memdup(srvc_id, sizeof(*srvc_id)); ++ step->callback_result.characteristic = util_memdup(char_id, + sizeof(*char_id)); + step->callback_result.char_prop = char_prop; + +@@ -1656,10 +1658,10 @@ static void gattc_get_descriptor_cb(int conn_id, int status, + step->callback = CB_GATTC_GET_DESCRIPTOR; + step->callback_result.status = status; + step->callback_result.conn_id = conn_id; +- step->callback_result.service = g_memdup(srvc_id, sizeof(*srvc_id)); +- step->callback_result.characteristic = g_memdup(char_id, ++ step->callback_result.service = util_memdup(srvc_id, sizeof(*srvc_id)); ++ step->callback_result.characteristic = util_memdup(char_id, + sizeof(*char_id)); +- step->callback_result.descriptor = g_memdup(descr_id, ++ step->callback_result.descriptor = util_memdup(descr_id, + sizeof(*descr_id)); + + schedule_callback_verification(step); +@@ -1673,8 +1675,8 @@ static void gattc_get_included_service_cb(int conn_id, int status, + step->callback = CB_GATTC_GET_INCLUDED_SERVICE; + step->callback_result.status = status; + step->callback_result.conn_id = conn_id; +- step->callback_result.service = g_memdup(srvc_id, sizeof(*srvc_id)); +- step->callback_result.included = g_memdup(incl_srvc_id, ++ step->callback_result.service = util_memdup(srvc_id, sizeof(*srvc_id)); ++ step->callback_result.included = util_memdup(incl_srvc_id, + sizeof(*srvc_id)); + + schedule_callback_verification(step); +@@ -1688,7 +1690,8 @@ static void gattc_read_characteristic_cb(int conn_id, int status, + step->callback = CB_GATTC_READ_CHARACTERISTIC; + step->callback_result.status = status; + step->callback_result.conn_id = conn_id; +- step->callback_result.read_params = g_memdup(p_data, sizeof(*p_data)); ++ step->callback_result.read_params = util_memdup(p_data, ++ sizeof(*p_data)); + + schedule_callback_verification(step); + } +@@ -1701,7 +1704,8 @@ static void gattc_read_descriptor_cb(int conn_id, int status, + step->callback = CB_GATTC_READ_DESCRIPTOR; + step->callback_result.status = status; + step->callback_result.conn_id = conn_id; +- step->callback_result.read_params = g_memdup(p_data, sizeof(*p_data)); ++ step->callback_result.read_params = util_memdup(p_data, ++ sizeof(*p_data)); + + schedule_callback_verification(step); + } +@@ -1714,7 +1718,8 @@ static void gattc_write_characteristic_cb(int conn_id, int status, + step->callback = CB_GATTC_WRITE_CHARACTERISTIC; + step->callback_result.status = status; + step->callback_result.conn_id = conn_id; +- step->callback_result.write_params = g_memdup(p_data, sizeof(*p_data)); ++ step->callback_result.write_params = util_memdup(p_data, ++ sizeof(*p_data)); + + schedule_callback_verification(step); + } +@@ -1727,7 +1732,8 @@ static void gattc_write_descriptor_cb(int conn_id, int status, + step->callback = CB_GATTC_WRITE_DESCRIPTOR; + step->callback_result.status = status; + step->callback_result.conn_id = conn_id; +- step->callback_result.write_params = g_memdup(p_data, sizeof(*p_data)); ++ step->callback_result.write_params = util_memdup(p_data, ++ sizeof(*p_data)); + + schedule_callback_verification(step); + } +@@ -1742,8 +1748,8 @@ static void gattc_register_for_notification_cb(int conn_id, int registered, + step->callback = CB_GATTC_REGISTER_FOR_NOTIFICATION; + step->callback_result.status = status; + step->callback_result.conn_id = conn_id; +- step->callback_result.service = g_memdup(srvc_id, sizeof(*srvc_id)); +- step->callback_result.characteristic = g_memdup(char_id, ++ step->callback_result.service = util_memdup(srvc_id, sizeof(*srvc_id)); ++ step->callback_result.characteristic = util_memdup(char_id, + sizeof(*char_id)); + step->callback_result.notification_registered = registered; + +@@ -1756,7 +1762,8 @@ static void gattc_notif_cb(int conn_id, btgatt_notify_params_t *p_data) + + step->callback = CB_GATTC_NOTIFY; + step->callback_result.conn_id = conn_id; +- step->callback_result.notify_params = g_memdup(p_data, sizeof(*p_data)); ++ step->callback_result.notify_params = util_memdup(p_data, ++ sizeof(*p_data)); + + schedule_callback_verification(step); + } +@@ -1827,8 +1834,8 @@ static void gatts_service_added_cb(int status, int server_if, + + step->callback_result.status = status; + step->callback_result.gatt_app_id = server_if; +- step->callback_result.service = g_memdup(srvc_id, sizeof(*srvc_id)); +- step->callback_result.srvc_handle = g_memdup(&srvc_handle, ++ step->callback_result.service = util_memdup(srvc_id, sizeof(*srvc_id)); ++ step->callback_result.srvc_handle = util_memdup(&srvc_handle, + sizeof(srvc_handle)); + + schedule_callback_verification(step); +@@ -1844,9 +1851,9 @@ static void gatts_included_service_added_cb(int status, int server_if, + + step->callback_result.status = status; + step->callback_result.gatt_app_id = server_if; +- step->callback_result.srvc_handle = g_memdup(&srvc_handle, ++ step->callback_result.srvc_handle = util_memdup(&srvc_handle, + sizeof(srvc_handle)); +- step->callback_result.inc_srvc_handle = g_memdup(&inc_srvc_handle, ++ step->callback_result.inc_srvc_handle = util_memdup(&inc_srvc_handle, + sizeof(inc_srvc_handle)); + + schedule_callback_verification(step); +@@ -1863,10 +1870,10 @@ static void gatts_characteristic_added_cb(int status, int server_if, + + step->callback_result.status = status; + step->callback_result.gatt_app_id = server_if; +- step->callback_result.srvc_handle = g_memdup(&srvc_handle, ++ step->callback_result.srvc_handle = util_memdup(&srvc_handle, + sizeof(srvc_handle)); +- step->callback_result.uuid = g_memdup(uuid, sizeof(*uuid)); +- step->callback_result.char_handle = g_memdup(&char_handle, ++ step->callback_result.uuid = util_memdup(uuid, sizeof(*uuid)); ++ step->callback_result.char_handle = util_memdup(&char_handle, + sizeof(char_handle)); + + schedule_callback_verification(step); +@@ -1883,10 +1890,10 @@ static void gatts_descriptor_added_cb(int status, int server_if, + + step->callback_result.status = status; + step->callback_result.gatt_app_id = server_if; +- step->callback_result.srvc_handle = g_memdup(&srvc_handle, ++ step->callback_result.srvc_handle = util_memdup(&srvc_handle, + sizeof(srvc_handle)); +- step->callback_result.uuid = g_memdup(uuid, sizeof(*uuid)); +- step->callback_result.desc_handle = g_memdup(&desc_handle, ++ step->callback_result.uuid = util_memdup(uuid, sizeof(*uuid)); ++ step->callback_result.desc_handle = util_memdup(&desc_handle, + sizeof(desc_handle)); + + schedule_callback_verification(step); +@@ -1900,7 +1907,7 @@ static void gatts_service_started_cb(int status, int server_if, int srvc_handle) + + step->callback_result.status = status; + step->callback_result.gatt_app_id = server_if; +- step->callback_result.srvc_handle = g_memdup(&srvc_handle, ++ step->callback_result.srvc_handle = util_memdup(&srvc_handle, + sizeof(srvc_handle)); + + schedule_callback_verification(step); +@@ -1914,7 +1921,7 @@ static void gatts_service_stopped_cb(int status, int server_if, int srvc_handle) + + step->callback_result.status = status; + step->callback_result.gatt_app_id = server_if; +- step->callback_result.srvc_handle = g_memdup(&srvc_handle, ++ step->callback_result.srvc_handle = util_memdup(&srvc_handle, + sizeof(srvc_handle)); + + schedule_callback_verification(step); +@@ -1928,7 +1935,7 @@ static void gatts_service_deleted_cb(int status, int server_if, int srvc_handle) + + step->callback_result.status = status; + step->callback_result.gatt_app_id = server_if; +- step->callback_result.srvc_handle = g_memdup(&srvc_handle, ++ step->callback_result.srvc_handle = util_memdup(&srvc_handle, + sizeof(srvc_handle)); + + schedule_callback_verification(step); +@@ -1945,7 +1952,7 @@ static void gatts_request_read_cb(int conn_id, int trans_id, bt_bdaddr_t *bda, + + step->callback_result.conn_id = conn_id; + step->callback_result.trans_id = trans_id; +- step->callback_result.attr_handle = g_memdup(&attr_handle, ++ step->callback_result.attr_handle = util_memdup(&attr_handle, + sizeof(attr_handle)); + step->callback_result.offset = offset; + step->callback_result.is_long = is_long; +@@ -1974,13 +1981,13 @@ static void gatts_request_write_cb(int conn_id, int trans_id, bt_bdaddr_t *bda, + + step->callback_result.conn_id = conn_id; + step->callback_result.trans_id = trans_id; +- step->callback_result.attr_handle = g_memdup(&attr_handle, ++ step->callback_result.attr_handle = util_memdup(&attr_handle, + sizeof(attr_handle)); + step->callback_result.offset = offset; + step->callback_result.length = length; + step->callback_result.need_rsp = need_rsp; + step->callback_result.is_prep = is_prep; +- step->callback_result.value = g_memdup(&value, length); ++ step->callback_result.value = util_memdup(&value, length); + + /* Utilize property verification mechanism for bdaddr */ + props[0] = create_property(BT_PROPERTY_BDADDR, bda, sizeof(*bda)); +@@ -2169,7 +2176,7 @@ static btmce_mas_instance_t *copy_mas_instances(int num_instances, + inst[i].id = instances[i].id; + inst[i].scn = instances[i].scn; + inst[i].msg_types = instances[i].msg_types; +- inst[i].p_name = g_memdup(instances[i].p_name, ++ inst[i].p_name = util_memdup(instances[i].p_name, + strlen(instances[i].p_name)); + } + +diff --git a/attrib/gatt.c b/attrib/gatt.c +index 46b2ca381..b496dd1eb 100644 +--- a/attrib/gatt.c ++++ b/attrib/gatt.c +@@ -135,7 +135,7 @@ static void discover_char_unref(void *data) + + g_slist_free_full(dc->characteristics, g_free); + g_attrib_unref(dc->attrib); +- g_free(dc->uuid); ++ free(dc->uuid); + g_free(dc); + } + +@@ -157,7 +157,7 @@ static void discover_desc_unref(void *data) + + g_slist_free_full(dd->descriptors, g_free); + g_attrib_unref(dd->attrib); +- g_free(dd->uuid); ++ free(dd->uuid); + g_free(dd); + } + +@@ -696,7 +696,7 @@ guint gatt_discover_char(GAttrib *attrib, uint16_t start, uint16_t end, + dc->user_data = user_data; + dc->end = end; + dc->start = start; +- dc->uuid = g_memdup(uuid, sizeof(bt_uuid_t)); ++ dc->uuid = util_memdup(uuid, sizeof(bt_uuid_t)); + + dc->id = g_attrib_send(attrib, 0, buf, plen, char_discovered_cb, + discover_char_ref(dc), discover_char_unref); +@@ -905,7 +905,7 @@ static void prepare_write_cb(guint8 status, const guint8 *rpdu, guint16 rlen, + if (long_write->offset == long_write->vlen) { + execute_write(long_write->attrib, ATT_WRITE_ALL_PREP_WRITES, + long_write->func, long_write->user_data); +- g_free(long_write->value); ++ free(long_write->value); + g_free(long_write); + + return; +@@ -964,7 +964,7 @@ guint gatt_write_char(GAttrib *attrib, uint16_t handle, const uint8_t *value, + long_write->func = func; + long_write->user_data = user_data; + long_write->handle = handle; +- long_write->value = g_memdup(value, vlen); ++ long_write->value = util_memdup(value, vlen); + long_write->vlen = vlen; + + return prepare_write(long_write); +@@ -1130,7 +1130,7 @@ guint gatt_discover_desc(GAttrib *attrib, uint16_t start, uint16_t end, + dd->user_data = user_data; + dd->start = start; + dd->end = end; +- dd->uuid = g_memdup(uuid, sizeof(bt_uuid_t)); ++ dd->uuid = util_memdup(uuid, sizeof(bt_uuid_t)); + + dd->id = g_attrib_send(attrib, 0, buf, plen, desc_discovered_cb, + discover_desc_ref(dd), discover_desc_unref); +diff --git a/client/gatt.c b/client/gatt.c +index 11f70dc4f..13872c794 100644 +--- a/client/gatt.c ++++ b/client/gatt.c +@@ -811,7 +811,7 @@ static uint8_t *str2bytearray(char *arg, size_t *val_len) + + *val_len = i; + +- return g_memdup(value, i); ++ return util_memdup(value, i); + } + + void gatt_write_attribute(GDBusProxy *proxy, int argc, char *argv[]) +diff --git a/gobex/gobex-header.c b/gobex/gobex-header.c +index 011d33d1a..002ba8861 100644 +--- a/gobex/gobex-header.c ++++ b/gobex/gobex-header.c +@@ -15,6 +15,7 @@ + + #include "gobex-header.h" + #include "gobex-debug.h" ++#include "src/shared/util.h" + + /* Header types */ + #define G_OBEX_HDR_ENC_UNICODE (0 << 6) +@@ -222,7 +223,7 @@ GObexHeader *g_obex_header_decode(const void *data, gsize len, + + switch (data_policy) { + case G_OBEX_DATA_COPY: +- header->v.data = g_memdup(ptr, header->vlen); ++ header->v.data = util_memdup(ptr, header->vlen); + break; + case G_OBEX_DATA_REF: + header->extdata = TRUE; +@@ -282,7 +283,7 @@ void g_obex_header_free(GObexHeader *header) + break; + case G_OBEX_HDR_ENC_BYTES: + if (!header->extdata) +- g_free(header->v.data); ++ free(header->v.data); + break; + case G_OBEX_HDR_ENC_UINT8: + case G_OBEX_HDR_ENC_UINT32: +@@ -410,7 +411,7 @@ GObexHeader *g_obex_header_new_bytes(guint8 id, const void *data, gsize len) + header->id = id; + header->vlen = len; + header->hlen = len + 3; +- header->v.data = g_memdup(data, len); ++ header->v.data = util_memdup(data, len); + + return header; + } +diff --git a/gobex/gobex-packet.c b/gobex/gobex-packet.c +index 11937a5a5..8ae78b0f6 100644 +--- a/gobex/gobex-packet.c ++++ b/gobex/gobex-packet.c +@@ -17,6 +17,7 @@ + #include "gobex-defs.h" + #include "gobex-packet.h" + #include "gobex-debug.h" ++#include "src/shared/util.h" + + #define FINAL_BIT 0x80 + +@@ -201,7 +202,7 @@ gboolean g_obex_packet_set_data(GObexPacket *pkt, const void *data, gsize len, + + switch (data_policy) { + case G_OBEX_DATA_COPY: +- pkt->data.buf = g_memdup(data, len); ++ pkt->data.buf = util_memdup(data, len); + break; + case G_OBEX_DATA_REF: + pkt->data.buf_ref = data; +@@ -259,7 +260,7 @@ void g_obex_packet_free(GObexPacket *pkt) + switch (pkt->data_policy) { + case G_OBEX_DATA_INHERIT: + case G_OBEX_DATA_COPY: +- g_free(pkt->data.buf); ++ free(pkt->data.buf); + break; + case G_OBEX_DATA_REF: + break; +diff --git a/obexd/src/obex.c b/obexd/src/obex.c +index 9f992ec18..3a68fd66c 100644 +--- a/obexd/src/obex.c ++++ b/obexd/src/obex.c +@@ -40,6 +40,7 @@ + #include "mimetype.h" + #include "service.h" + #include "transport.h" ++#include "src/shared/util.h" + + typedef struct { + uint8_t version; +@@ -145,7 +146,7 @@ static void os_reset_session(struct obex_session *os) + os->path = NULL; + } + if (os->apparam) { +- g_free(os->apparam); ++ free(os->apparam); + os->apparam = NULL; + os->apparam_len = 0; + } +@@ -594,7 +595,7 @@ static void parse_apparam(struct obex_session *os, GObexPacket *req) + if (!g_obex_header_get_bytes(hdr, &apparam, &len)) + return; + +- os->apparam = g_memdup(apparam, len); ++ os->apparam = util_memdup(apparam, len); + os->apparam_len = len; + DBG("APPARAM"); + } +diff --git a/plugins/neard.c b/plugins/neard.c +index e07b51106..a75527148 100644 +--- a/plugins/neard.c ++++ b/plugins/neard.c +@@ -30,6 +30,7 @@ + #include "src/eir.h" + #include "src/agent.h" + #include "src/btd.h" ++#include "src/shared/util.h" + + #define NEARD_NAME "org.neard" + #define NEARD_PATH "/" +@@ -71,7 +72,7 @@ static void free_oob_params(struct oob_params *params) + g_free(params->name); + g_free(params->hash); + g_free(params->randomizer); +- g_free(params->pin); ++ free(params->pin); + } + + static DBusMessage *error_reply(DBusMessage *msg, int error) +@@ -407,10 +408,10 @@ static int process_nokia_long (void *data, size_t size, uint8_t marker, + remote->name = g_strndup((char *)n->name, n->name_len); + + if (marker == 0x01) { +- remote->pin = g_memdup(n->authentication, 4); ++ remote->pin = util_memdup(n->authentication, 4); + remote->pin_len = 4; + } else if (marker == 0x02) { +- remote->pin = g_memdup(n->authentication, 16); ++ remote->pin = util_memdup(n->authentication, 16); + remote->pin_len = 16; + } + +@@ -439,7 +440,7 @@ static int process_nokia_short (void *data, size_t size, + if (n->name_len > 0) + remote->name = g_strndup((char *)n->name, n->name_len); + +- remote->pin = g_memdup(n->authentication, 4); ++ remote->pin = util_memdup(n->authentication, 4); + remote->pin_len = 4; + + return 0; +diff --git a/plugins/policy.c b/plugins/policy.c +index 051db82e1..48f5db7d3 100644 +--- a/plugins/policy.c ++++ b/plugins/policy.c +@@ -32,6 +32,7 @@ + #include "src/profile.h" + #include "src/btd.h" + #include "src/shared/timeout.h" ++#include "src/shared/util.h" + + #define CONTROL_CONNECT_TIMEOUT 2 + #define SOURCE_RETRY_TIMEOUT 2 +@@ -855,7 +856,7 @@ static int policy_init(void) + reconnect_attempts = default_attempts; + reconnect_intervals_len = sizeof(default_intervals) / + sizeof(*reconnect_intervals); +- reconnect_intervals = g_memdup(default_intervals, ++ reconnect_intervals = util_memdup(default_intervals, + sizeof(default_intervals)); + goto done; + } +@@ -886,7 +887,7 @@ static int policy_init(void) + g_clear_error(&gerr); + reconnect_intervals_len = sizeof(default_intervals) / + sizeof(*reconnect_intervals); +- reconnect_intervals = g_memdup(default_intervals, ++ reconnect_intervals = util_memdup(default_intervals, + sizeof(default_intervals)); + } + +@@ -919,7 +920,7 @@ static void policy_exit(void) + if (reconnect_uuids) + g_strfreev(reconnect_uuids); + +- g_free(reconnect_intervals); ++ free(reconnect_intervals); + + g_slist_free_full(reconnects, reconnect_destroy); + +diff --git a/profiles/audio/avctp.c b/profiles/audio/avctp.c +index 64d1a8504..6f64f162b 100644 +--- a/profiles/audio/avctp.c ++++ b/profiles/audio/avctp.c +@@ -40,6 +40,7 @@ + #include "src/log.h" + #include "src/error.h" + #include "src/shared/timeout.h" ++#include "src/shared/util.h" + + #include "avctp.h" + #include "avrcp.h" +@@ -760,7 +761,7 @@ static void control_req_destroy(void *data) + NULL, 0, req->user_data); + + done: +- g_free(req->operands); ++ free(req->operands); + g_free(req); + } + +@@ -776,7 +777,7 @@ static void browsing_req_destroy(void *data) + req->func(session, NULL, 0, req->user_data); + + done: +- g_free(req->operands); ++ free(req->operands); + g_free(req); + } + +@@ -1727,7 +1728,7 @@ static int avctp_send_req(struct avctp *session, uint8_t code, + req->subunit = subunit; + req->op = opcode; + req->func = func; +- req->operands = g_memdup(operands, operand_count); ++ req->operands = util_memdup(operands, operand_count); + req->operand_count = operand_count; + req->user_data = user_data; + +@@ -1765,7 +1766,7 @@ int avctp_send_browsing_req(struct avctp *session, + + req = g_new0(struct avctp_browsing_req, 1); + req->func = func; +- req->operands = g_memdup(operands, operand_count); ++ req->operands = util_memdup(operands, operand_count); + req->operand_count = operand_count; + req->user_data = user_data; + +diff --git a/profiles/audio/avrcp.c b/profiles/audio/avrcp.c +index 7c280203c..d4e19ffc0 100644 +--- a/profiles/audio/avrcp.c ++++ b/profiles/audio/avrcp.c +@@ -1298,7 +1298,7 @@ static uint8_t avrcp_handle_get_current_player_value(struct avrcp *session, + * Save a copy of requested settings because we can override them + * while responding + */ +- settings = g_memdup(&pdu->params[1], pdu->params[0]); ++ settings = util_memdup(&pdu->params[1], pdu->params[0]); + len = 0; + + /* +@@ -1323,7 +1323,7 @@ static uint8_t avrcp_handle_get_current_player_value(struct avrcp *session, + pdu->params[++len] = val; + } + +- g_free(settings); ++ free(settings); + + if (len) { + pdu->params[0] = len / 2; +@@ -2801,7 +2801,7 @@ static gboolean avrcp_set_browsed_player_rsp(struct avctp *conn, + break; + } + +- folders[count] = g_memdup(&pdu->params[i], len); ++ folders[count] = util_memdup(&pdu->params[i], len); + i += len; + } + +@@ -2888,7 +2888,7 @@ static void avrcp_player_parse_features(struct avrcp_player *player, + { + struct media_player *mp = player->user_data; + +- player->features = g_memdup(features, 16); ++ player->features = util_memdup(features, 16); + + if (features[7] & 0x08) { + media_player_set_browsable(mp, true); +@@ -3622,7 +3622,7 @@ static void player_destroy(gpointer data) + g_slist_free(player->sessions); + g_free(player->path); + g_free(player->change_path); +- g_free(player->features); ++ free(player->features); + g_free(player); + } + +diff --git a/profiles/battery/bas.c b/profiles/battery/bas.c +index 3c6173b61..16ff22e19 100644 +--- a/profiles/battery/bas.c ++++ b/profiles/battery/bas.c +@@ -62,7 +62,7 @@ static void bas_free(struct bt_bas *bas) + { + bt_bas_detach(bas); + +- g_free(bas->primary); ++ free(bas->primary); + queue_destroy(bas->gatt_op, (void *) destroy_gatt_req); + free(bas); + } +@@ -75,7 +75,7 @@ struct bt_bas *bt_bas_new(void *primary) + bas->gatt_op = queue_new(); + + if (primary) +- bas->primary = g_memdup(primary, sizeof(*bas->primary)); ++ bas->primary = util_memdup(primary, sizeof(*bas->primary)); + + return bt_bas_ref(bas); + } +diff --git a/profiles/battery/battery.c b/profiles/battery/battery.c +index 176d127f6..02d024d92 100644 +--- a/profiles/battery/battery.c ++++ b/profiles/battery/battery.c +@@ -66,7 +66,7 @@ static void batt_free(struct batt *batt) + gatt_db_unref(batt->db); + bt_gatt_client_unref(batt->client); + btd_device_unref(batt->device); +- g_free (batt->initial_value); ++ free(batt->initial_value); + if (batt->battery) + btd_battery_unregister(batt->battery); + g_free(batt); +@@ -159,7 +159,7 @@ static void read_initial_battery_level_cb(bool success, + if (!length) + return; + +- batt->initial_value = g_memdup(value, length); ++ batt->initial_value = util_memdup(value, length); + + /* request notify */ + batt->batt_level_cb_id = +diff --git a/profiles/deviceinfo/dis.c b/profiles/deviceinfo/dis.c +index 87fa63306..f660179ed 100644 +--- a/profiles/deviceinfo/dis.c ++++ b/profiles/deviceinfo/dis.c +@@ -72,7 +72,7 @@ static void dis_free(struct bt_dis *dis) + { + bt_dis_detach(dis); + +- g_free(dis->primary); ++ free(dis->primary); + queue_destroy(dis->gatt_op, (void *) destroy_gatt_req); + g_free(dis); + } +@@ -143,7 +143,7 @@ struct bt_dis *bt_dis_new_primary(void *primary) + dis->gatt_op = queue_new(); + + if (primary) +- dis->primary = g_memdup(primary, sizeof(*dis->primary)); ++ dis->primary = util_memdup(primary, sizeof(*dis->primary)); + + return bt_dis_ref(dis); + } +diff --git a/profiles/input/hog-lib.c b/profiles/input/hog-lib.c +index 3bbe42370..d37caa1f1 100644 +--- a/profiles/input/hog-lib.c ++++ b/profiles/input/hog-lib.c +@@ -527,9 +527,9 @@ static void report_read_cb(guint8 status, const guint8 *pdu, guint16 len, + } + + if (report->value) +- g_free(report->value); ++ free(report->value); + +- report->value = g_memdup(pdu, len); ++ report->value = util_memdup(pdu, len); + report->len = len; + } + +@@ -1217,7 +1217,7 @@ static void report_free(void *data) + { + struct report *report = data; + +- g_free(report->value); ++ free(report->value); + g_free(report); + } + +@@ -1241,7 +1241,7 @@ static void hog_free(void *data) + bt_uhid_unref(hog->uhid); + g_slist_free_full(hog->reports, report_free); + g_free(hog->name); +- g_free(hog->primary); ++ free(hog->primary); + queue_destroy(hog->gatt_op, (void *) destroy_gatt_req); + if (hog->gatt_db) + gatt_db_unref(hog->gatt_db); +@@ -1609,7 +1609,7 @@ static void hog_attach_hog(struct bt_hog *hog, struct gatt_primary *primary) + struct bt_hog *instance; + + if (!hog->primary) { +- hog->primary = g_memdup(primary, sizeof(*primary)); ++ hog->primary = util_memdup(primary, sizeof(*primary)); + discover_char(hog, hog->attrib, primary->range.start, + primary->range.end, NULL, + char_discovered_cb, hog); +@@ -1623,7 +1623,7 @@ static void hog_attach_hog(struct bt_hog *hog, struct gatt_primary *primary) + if (!instance) + return; + +- instance->primary = g_memdup(primary, sizeof(*primary)); ++ instance->primary = util_memdup(primary, sizeof(*primary)); + find_included(instance, hog->attrib, primary->range.start, + primary->range.end, find_included_cb, instance); + +diff --git a/profiles/scanparam/scpp.c b/profiles/scanparam/scpp.c +index da38a6aaa..4be8b26cc 100644 +--- a/profiles/scanparam/scpp.c ++++ b/profiles/scanparam/scpp.c +@@ -91,7 +91,7 @@ static void scpp_free(struct bt_scpp *scan) + { + bt_scpp_detach(scan); + +- g_free(scan->primary); ++ free(scan->primary); + queue_destroy(scan->gatt_op, NULL); /* cleared in bt_scpp_detach */ + g_free(scan); + } +@@ -110,7 +110,7 @@ struct bt_scpp *bt_scpp_new(void *primary) + scan->gatt_op = queue_new(); + + if (primary) +- scan->primary = g_memdup(primary, sizeof(*scan->primary)); ++ scan->primary = util_memdup(primary, sizeof(*scan->primary)); + + return bt_scpp_ref(scan); + } +diff --git a/src/eir.c b/src/eir.c +index 0f5d14fcd..2f9ee036f 100644 +--- a/src/eir.c ++++ b/src/eir.c +@@ -53,9 +53,9 @@ void eir_data_free(struct eir_data *eir) + eir->services = NULL; + g_free(eir->name); + eir->name = NULL; +- g_free(eir->hash); ++ free(eir->hash); + eir->hash = NULL; +- g_free(eir->randomizer); ++ free(eir->randomizer); + eir->randomizer = NULL; + g_slist_free_full(eir->msd_list, g_free); + eir->msd_list = NULL; +@@ -323,13 +323,13 @@ void eir_parse(struct eir_data *eir, const uint8_t *eir_data, uint8_t eir_len) + case EIR_SSP_HASH: + if (data_len < 16) + break; +- eir->hash = g_memdup(data, 16); ++ eir->hash = util_memdup(data, 16); + break; + + case EIR_SSP_RANDOMIZER: + if (data_len < 16) + break; +- eir->randomizer = g_memdup(data, 16); ++ eir->randomizer = util_memdup(data, 16); + break; + + case EIR_DEVICE_ID: +diff --git a/tools/gatt-service.c b/tools/gatt-service.c +index 631c4f249..ed6b06f1e 100644 +--- a/tools/gatt-service.c ++++ b/tools/gatt-service.c +@@ -26,6 +26,7 @@ + #include "gdbus/gdbus.h" + + #include "src/error.h" ++#include "src/shared/util.h" + + #define GATT_MGR_IFACE "org.bluez.GattManager1" + #define GATT_SERVICE_IFACE "org.bluez.GattService1" +@@ -126,8 +127,8 @@ static gboolean desc_get_value(const GDBusPropertyTable *property, + + static void desc_write(struct descriptor *desc, const uint8_t *value, int len) + { +- g_free(desc->value); +- desc->value = g_memdup(value, len); ++ free(desc->value); ++ desc->value = util_memdup(value, len); + desc->vlen = len; + + g_dbus_emit_property_changed(connection, desc->path, +@@ -264,8 +265,8 @@ static gboolean chr_get_props(const GDBusPropertyTable *property, + + static void chr_write(struct characteristic *chr, const uint8_t *value, int len) + { +- g_free(chr->value); +- chr->value = g_memdup(value, len); ++ free(chr->value); ++ chr->value = util_memdup(value, len); + chr->vlen = len; + + g_dbus_emit_property_changed(connection, chr->path, GATT_CHR_IFACE, +@@ -388,7 +389,7 @@ static void chr_iface_destroy(gpointer user_data) + + g_free(chr->uuid); + g_free(chr->service); +- g_free(chr->value); ++ free(chr->value); + g_free(chr->path); + g_free(chr); + } +@@ -398,7 +399,7 @@ static void desc_iface_destroy(gpointer user_data) + struct descriptor *desc = user_data; + + g_free(desc->uuid); +- g_free(desc->value); ++ free(desc->value); + g_free(desc->path); + g_free(desc); + } +@@ -592,7 +593,7 @@ static gboolean register_characteristic(const char *chr_uuid, + + chr = g_new0(struct characteristic, 1); + chr->uuid = g_strdup(chr_uuid); +- chr->value = g_memdup(value, vlen); ++ chr->value = util_memdup(value, vlen); + chr->vlen = vlen; + chr->props = props; + chr->service = g_strdup(service_path); +diff --git a/tools/mesh-gatt/gatt.c b/tools/mesh-gatt/gatt.c +index c8a8123fb..ab9743cd1 100644 +--- a/tools/mesh-gatt/gatt.c ++++ b/tools/mesh-gatt/gatt.c +@@ -24,6 +24,7 @@ + + #include "src/shared/io.h" + #include "src/shared/shell.h" ++#include "src/shared/util.h" + #include "gdbus/gdbus.h" + #include "lib/bluetooth.h" + #include "lib/uuid.h" +@@ -86,7 +87,7 @@ static void write_data_free(void *user_data) + { + struct write_data *data = user_data; + +- g_free(data->gatt_data); ++ free(data->gatt_data); + free(data); + } + +@@ -338,7 +339,7 @@ bool mesh_gatt_write(GDBusProxy *proxy, uint8_t *buf, uint16_t len, + /* TODO: should keep in queue in case we need to cancel write? */ + + data->gatt_len = len; +- data->gatt_data = g_memdup(buf, len); ++ data->gatt_data = util_memdup(buf, len); + data->gatt_data[0] &= GATT_TYPE_MASK; + data->iov.iov_base = data->gatt_data; + data->iov.iov_len = len; +diff --git a/unit/test-avctp.c b/unit/test-avctp.c +index fa7db59c8..25fd3abc2 100644 +--- a/unit/test-avctp.c ++++ b/unit/test-avctp.c +@@ -53,7 +53,7 @@ struct context { + #define raw_pdu(args...) \ + { \ + .valid = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +@@ -64,7 +64,7 @@ struct context { + }; \ + static struct test_data data; \ + data.test_name = g_strdup(name); \ +- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ ++ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ + tester_add(name, &data, NULL, function, NULL); \ + } while (0) + +diff --git a/unit/test-avdtp.c b/unit/test-avdtp.c +index 4e8a68c6b..2e49def43 100644 +--- a/unit/test-avdtp.c ++++ b/unit/test-avdtp.c +@@ -48,7 +48,7 @@ struct test_data { + #define raw_pdu(args...) \ + { \ + .valid = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +@@ -56,7 +56,7 @@ struct test_data { + { \ + .valid = true, \ + .fragmented = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +@@ -67,7 +67,7 @@ struct test_data { + }; \ + static struct test_data data; \ + data.test_name = g_strdup(name); \ +- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ ++ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ + tester_add(name, &data, NULL, function, NULL); \ + } while (0) + +diff --git a/unit/test-avrcp.c b/unit/test-avrcp.c +index 34a70377d..b637a8a1b 100644 +--- a/unit/test-avrcp.c ++++ b/unit/test-avrcp.c +@@ -61,7 +61,7 @@ struct context { + #define raw_pdu(args...) \ + { \ + .valid = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +@@ -69,7 +69,7 @@ struct context { + { \ + .valid = true, \ + .browse = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +@@ -77,7 +77,7 @@ struct context { + { \ + .valid = true, \ + .fragmented = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +@@ -85,7 +85,7 @@ struct context { + { \ + .valid = true, \ + .continuing = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +@@ -96,7 +96,7 @@ struct context { + }; \ + static struct test_data data; \ + data.test_name = g_strdup(name); \ +- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ ++ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ + tester_add(name, &data, NULL, function, NULL); \ + } while (0) + +diff --git a/unit/test-gatt.c b/unit/test-gatt.c +index 6a47268e6..f92d860c4 100644 +--- a/unit/test-gatt.c ++++ b/unit/test-gatt.c +@@ -73,7 +73,7 @@ struct context { + #define raw_pdu(args...) \ + { \ + .valid = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +@@ -94,7 +94,7 @@ struct context { + data.uuid = bt_uuid; \ + data.step = test_step; \ + data.source_db = db; \ +- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ ++ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ + tester_add(name, &data, NULL, function, NULL); \ + } while (0) + +diff --git a/unit/test-hfp.c b/unit/test-hfp.c +index f504724d7..b4af99d53 100644 +--- a/unit/test-hfp.c ++++ b/unit/test-hfp.c +@@ -17,6 +17,7 @@ + #include + #include "src/shared/hfp.h" + #include "src/shared/tester.h" ++#include "src/shared/util.h" + + struct context { + guint watch_id; +@@ -50,7 +51,7 @@ struct test_data { + #define raw_pdu(args...) \ + { \ + .valid = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +@@ -62,7 +63,7 @@ struct test_data { + #define type_pdu(cmd_type, args...) \ + { \ + .valid = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + .type = cmd_type, \ + } +@@ -70,7 +71,7 @@ struct test_data { + #define frg_pdu(args...) \ + { \ + .valid = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + .fragmented = true, \ + } +@@ -82,7 +83,7 @@ struct test_data { + }; \ + static struct test_data data; \ + data.test_name = g_strdup(name); \ +- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ ++ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ + data.result_func = result_function; \ + tester_add(name, &data, NULL, function, NULL); \ + data.test_handler = test_handler; \ +@@ -96,7 +97,7 @@ struct test_data { + }; \ + static struct test_data data; \ + data.test_name = g_strdup(name); \ +- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ ++ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ + data.hf_result_func = result_func; \ + data.response_func = response_function; \ + tester_add(name, &data, NULL, function, NULL); \ +diff --git a/unit/test-hog.c b/unit/test-hog.c +index 116a5cb07..067497de4 100644 +--- a/unit/test-hog.c ++++ b/unit/test-hog.c +@@ -59,24 +59,24 @@ struct context { + #define raw_pdu(args...) \ + { \ + .valid = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +-#define false_pdu() \ +-{ \ +- .valid = false, \ ++#define false_pdu() \ ++{ \ ++ .valid = false, \ + } + +-#define define_test(name, function, args...) \ +- do { \ +- const struct test_pdu pdus[] = { \ +- args, { } \ +- }; \ +- static struct test_data data; \ +- data.test_name = g_strdup(name); \ +- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ +- tester_add(name, &data, NULL, function, NULL); \ ++#define define_test(name, function, args...) \ ++ do { \ ++ const struct test_pdu pdus[] = { \ ++ args, { } \ ++ }; \ ++ static struct test_data data; \ ++ data.test_name = g_strdup(name); \ ++ data.pdu_list = util_memdup(pdus, sizeof(pdus));\ ++ tester_add(name, &data, NULL, function, NULL); \ + } while (0) + + static gboolean context_quit(gpointer user_data) +diff --git a/unit/test-sdp.c b/unit/test-sdp.c +index 8f95fcb71..5c04a71eb 100644 +--- a/unit/test-sdp.c ++++ b/unit/test-sdp.c +@@ -47,14 +47,16 @@ struct test_data { + #define raw_pdu(args...) \ + { \ + .valid = true, \ +- .raw_data = g_memdup(raw_data(args), sizeof(raw_data(args))), \ ++ .raw_data = util_memdup(raw_data(args), \ ++ sizeof(raw_data(args))), \ + .raw_size = sizeof(raw_data(args)), \ + } + + #define raw_pdu_cont(cont, args...) \ + { \ + .valid = true, \ +- .raw_data = g_memdup(raw_data(args), sizeof(raw_data(args))), \ ++ .raw_data = util_memdup(raw_data(args), \ ++ sizeof(raw_data(args))), \ + .raw_size = sizeof(raw_data(args)), \ + .cont_len = cont, \ + } +@@ -66,7 +68,7 @@ struct test_data { + }; \ + static struct test_data data; \ + data.mtu = _mtu; \ +- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ ++ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ + tester_add(name, &data, NULL, test_sdp, NULL); \ + } while (0) + +@@ -92,7 +94,7 @@ struct test_data_de { + #define define_test_de_attr(name, input, exp) \ + do { \ + static struct test_data_de data; \ +- data.input_data = g_memdup(input, sizeof(input)); \ ++ data.input_data = util_memdup(input, sizeof(input)); \ + data.input_size = sizeof(input); \ + data.expected = exp; \ + tester_add("/sdp/DE/ATTR/" name, &data, NULL, \ +diff --git a/unit/test-uhid.c b/unit/test-uhid.c +index 001d39a3d..8a8eef855 100644 +--- a/unit/test-uhid.c ++++ b/unit/test-uhid.c +@@ -61,7 +61,7 @@ struct context { + }; \ + static struct test_data data; \ + data.test_name = g_strdup(name); \ +- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ ++ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ + tester_add(name, &data, NULL, function, NULL); \ + } while (0) + +-- +2.17.1 + -- 2.17.1 From thomas.petazzoni at bootlin.com Sun Feb 6 09:25:37 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 10:25:37 +0100 Subject: [Buildroot] [git commit] package/xen: security bump to version 4.14.4 Message-ID: <20220206091833.3287E82B51@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7d3845f10ccc0810243036439b955cd9f49d3da4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Includes a number of bugfixes and the security fixes up to xsa-395: https://xenproject.org/downloads/xen-project-archives/xen-project-4-14-series/xen-project-4-14-4/ Drop the now upstream xsa38* patches. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- package/xen/xen.hash | 11 +---------- package/xen/xen.mk | 19 +------------------ 2 files changed, 2 insertions(+), 28 deletions(-) diff --git a/package/xen/xen.hash b/package/xen/xen.hash index 10a778053a..a81d05e3f7 100644 --- a/package/xen/xen.hash +++ b/package/xen/xen.hash @@ -1,12 +1,3 @@ # Locally computed -sha256 a3dad76a772393a1875e8f44a6059a95fea4bde40f97b800966969ac6f3a498d xen-4.14.3.tar.gz +sha256 e76d56dfcdabf5d80aa06819f44472de49526a518dbb483eb08e7ff9aec2c669 xen-4.14.4.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 cfc166dc4c..03341d4275 100644 --- a/package/xen/xen.mk +++ b/package/xen/xen.mk @@ -4,30 +4,13 @@ # ################################################################################ -XEN_VERSION = 4.14.3 +XEN_VERSION = 4.14.4 XEN_SITE = https://downloads.xenproject.org/release/xen/$(XEN_VERSION) XEN_LICENSE = GPL-2.0 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 thomas.petazzoni at bootlin.com Sun Feb 6 09:26:07 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 10:26:07 +0100 Subject: [Buildroot] [PATCH] package/xen: security bump to version 4.14.4 In-Reply-To: <20220205135132.3007-1-peter@korsgaard.com> References: <20220205135132.3007-1-peter@korsgaard.com> Message-ID: <20220206102607.737fa77b@windsurf> On Sat, 5 Feb 2022 14:51:30 +0100 Peter Korsgaard wrote: > Includes a number of bugfixes and the security fixes up to xsa-395: > https://xenproject.org/downloads/xen-project-archives/xen-project-4-14-series/xen-project-4-14-4/ > > Drop the now upstream xsa38* patches. > > Signed-off-by: Peter Korsgaard > --- > package/xen/xen.hash | 11 +---------- > package/xen/xen.mk | 19 +------------------ > 2 files changed, 2 insertions(+), 28 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 6 09:30:40 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 10:30:40 +0100 Subject: [Buildroot] [PATCH v1 1/1] package/guile: Guile 3.0.7 requires libiconv. In-Reply-To: <20220206084334.1900252-1-paguilar@paguilar.org> References: <20220206084334.1900252-1-paguilar@paguilar.org> Message-ID: <20220206103040.1704ef40@windsurf> On Sun, 6 Feb 2022 09:43:34 +0100 Pedro Aguilar wrote: > This fixes the error reported in the daily results. > > Signed-off-by: Pedro Aguilar libiconv is normally needed only on toolchains that don't have BR2_ENABLE_LOCALE. But the build failure of guile happens with glibc toolchains, so it doesn't make much sense. Are you sure that your analysis of the problem is correct? Could you provide some more details? Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 6 09:31:40 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 10:31:40 +0100 Subject: [Buildroot] [git commit] board/pine64/rockpro64: use partition-type-uuid in genimage.cfg Message-ID: <20220206092448.2FB6282B9A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2466a542813228099fdfce9488199dc6e39d78b9 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 So let's use for EFI System partition: 'partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b' and for Root partition (64-bit ARM/AArch64): 'partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae' Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/1929717243 FTR, the magic UUID are from: https://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- board/pine64/rockpro64/genimage.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/pine64/rockpro64/genimage.cfg b/board/pine64/rockpro64/genimage.cfg index 14dd0e1d18..d3926f2df6 100644 --- a/board/pine64/rockpro64/genimage.cfg +++ b/board/pine64/rockpro64/genimage.cfg @@ -26,14 +26,14 @@ image sdcard.img { } partition boot { - partition-type = 0xC + partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b bootable = "true" image = "boot.vfat" offset = 16M } partition rootfs { - partition-type = 0x83 + partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae image = "rootfs.ext4" } } From thomas.petazzoni at bootlin.com Sun Feb 6 09:31:25 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 10:31:25 +0100 Subject: [Buildroot] [git commit] board/friendlyarm/nanopc-t4: use partition-type-uuid in genimage.cfg Message-ID: <20220206092448.1D002822F1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7a9a74fc823d14ec8b7bbfea9b1e4535e408c95c 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 So let's use for EFI System partition: 'partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b' and for Root partition (64-bit ARM/AArch64): 'partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae' Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/1929717055 FTR, the magic UUID are from: https://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- board/friendlyarm/nanopc-t4/genimage.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/friendlyarm/nanopc-t4/genimage.cfg b/board/friendlyarm/nanopc-t4/genimage.cfg index d63c293ab4..98dc2f3892 100644 --- a/board/friendlyarm/nanopc-t4/genimage.cfg +++ b/board/friendlyarm/nanopc-t4/genimage.cfg @@ -26,14 +26,14 @@ image sdcard.img { } partition boot { - partition-type = 0xC + partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b bootable = "true" image = "boot.vfat" offset = 16M } partition rootfs { - partition-type = 0x83 + partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae image = "rootfs.ext4" } } From thomas.petazzoni at bootlin.com Sun Feb 6 09:31:34 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 10:31:34 +0100 Subject: [Buildroot] [git commit] board/friendlyarm/nanopi-m4: use partition-type-uuid in genimage.cfg Message-ID: <20220206092448.28A0882B8E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bd29ee0e8ef59361824ef4ae7957208915d80c65 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 So let's use for EFI System partition: 'partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b' and for Root partition (64-bit ARM/AArch64): 'partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae' Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/1929717059 FTR, the magic UUID are from: https://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- board/friendlyarm/nanopi-m4/genimage.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/friendlyarm/nanopi-m4/genimage.cfg b/board/friendlyarm/nanopi-m4/genimage.cfg index 35d056ae6e..8d0e6ad13b 100644 --- a/board/friendlyarm/nanopi-m4/genimage.cfg +++ b/board/friendlyarm/nanopi-m4/genimage.cfg @@ -26,14 +26,14 @@ image sdcard.img { } partition boot { - partition-type = 0xC + partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b bootable = "true" image = "boot.vfat" offset = 16M } partition rootfs { - partition-type = 0x83 + partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae image = "rootfs.ext4" } } From thomas.petazzoni at bootlin.com Sun Feb 6 09:31:53 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 10:31:53 +0100 Subject: [Buildroot] [git commit] board/radxa/rockpi-n10: use partition-type-uuid in genimage.cfg Message-ID: <20220206092448.414B582B8E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=93532fb711f537f77a2cfe0a23e085444c5747b5 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 So let's use for EFI System partition: 'partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b' and for Root partition (64-bit ARM/AArch64): 'partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae' Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/1929717241 FTR, the magic UUID are from: https://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- board/radxa/rockpi-n10/genimage.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/radxa/rockpi-n10/genimage.cfg b/board/radxa/rockpi-n10/genimage.cfg index 652e75db11..7f4b639bbc 100644 --- a/board/radxa/rockpi-n10/genimage.cfg +++ b/board/radxa/rockpi-n10/genimage.cfg @@ -26,14 +26,14 @@ image sdcard.img { } partition boot { - partition-type = 0xC + partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b bootable = "true" image = "boot.vfat" offset = 16M } partition rootfs { - partition-type = 0x83 + partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae image = "rootfs.ext4" } } From thomas.petazzoni at bootlin.com Sun Feb 6 09:31:46 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 10:31:46 +0100 Subject: [Buildroot] [git commit] board/radxa/rockpi-4: use partition-type-uuid in genimage.cfg Message-ID: <20220206092448.38B96822F1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c71c93aa76e803043a5c7cdd0315897540e0a647 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 So let's use for EFI System partition: 'partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b' and for Root partition (64-bit ARM/AArch64): 'partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae' Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/1929717240 FTR, the magic UUID are from: https://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- board/radxa/rockpi-4/genimage.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/radxa/rockpi-4/genimage.cfg b/board/radxa/rockpi-4/genimage.cfg index a5100af420..68cc4d61a8 100644 --- a/board/radxa/rockpi-4/genimage.cfg +++ b/board/radxa/rockpi-4/genimage.cfg @@ -26,14 +26,14 @@ image sdcard.img { } partition boot { - partition-type = 0xC + partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b bootable = "true" image = "boot.vfat" offset = 16M } partition rootfs { - partition-type = 0x83 + partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae image = "rootfs.ext4" } } From thomas.petazzoni at bootlin.com Sun Feb 6 09:32:16 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 10:32:16 +0100 Subject: [Buildroot] [PATCH 0/5] Fix genimage build failure on Gitlab-CI In-Reply-To: <20220203225957.3039320-1-giulio.benetti@benettiengineering.com> References: <20220203225957.3039320-1-giulio.benetti@benettiengineering.com> Message-ID: <20220206103216.6d89c19e@windsurf> On Thu, 3 Feb 2022 23:59:52 +0100 Giulio Benetti wrote: > Giulio Benetti (5): > board/friendlyarm/nanopc-t4:use partition-type-uuid for genimage-15 > board/friendlyarm/nanopi-m4:use partition-type-uuid for genimage-15 > board/pine64/rockpro64:use partition-type-uuid for genimage-15 > board/radxa/rockpi-4:use partition-type-uuid for genimage-15 > board/radxa/rockpi-n10:use partition-type-uuid for genimage-15 Series applied, thanks -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From peter at korsgaard.com Sun Feb 6 09:45:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 10:45:02 +0100 Subject: [Buildroot] [PATCH 1/2] package/avahi: drop unneeded am_cv_path_PYTHON Message-ID: <20220206094504.11415-1-peter@korsgaard.com> It is not used by the configure script and refer to PYTHON_TARGET_BINARY which was dropped back in 2010 by commit e3418f69cf (python: convert to autotargets, bump to 2.7.1, many improvements), so drop it. Signed-off-by: Peter Korsgaard --- package/avahi/avahi.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk index 13e2106014..04c4164af6 100644 --- a/package/avahi/avahi.mk +++ b/package/avahi/avahi.mk @@ -107,7 +107,6 @@ endif ifeq ($(BR2_PACKAGE_PYTHON),y) AVAHI_CONF_ENV += \ am_cv_pathless_PYTHON=python \ - am_cv_path_PYTHON=$(PYTHON_TARGET_BINARY) \ am_cv_python_version=$(PYTHON_VERSION) \ am_cv_python_platform=linux2 \ am_cv_python_pythondir=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \ -- 2.20.1 From peter at korsgaard.com Sun Feb 6 09:45:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 10:45:03 +0100 Subject: [Buildroot] [PATCH 2/2] package/avahi: add pygobject support, move to python3 In-Reply-To: <20220206094504.11415-1-peter@korsgaard.com> References: <20220206094504.11415-1-peter@korsgaard.com> Message-ID: <20220206094504.11415-2-peter@korsgaard.com> The python support in avahi needs pygobjet to do anything: Building avahi-python: no (You need python, pygobject and python-dbus!) So add optional support for it. Python-gobject is only available for python3, so change the python logic to use python 3. Signed-off-by: Peter Korsgaard --- package/avahi/avahi.mk | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk index 04c4164af6..1992669a92 100644 --- a/package/avahi/avahi.mk +++ b/package/avahi/avahi.mk @@ -40,7 +40,6 @@ AVAHI_CONF_OPTS = \ --disable-gtk \ --disable-gtk3 \ --disable-gdbm \ - --disable-pygobject \ --disable-mono \ --disable-monodoc \ --disable-stack-protector \ @@ -104,16 +103,16 @@ else AVAHI_CONF_OPTS += --disable-glib --disable-gobject endif -ifeq ($(BR2_PACKAGE_PYTHON),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) AVAHI_CONF_ENV += \ - am_cv_pathless_PYTHON=python \ - am_cv_python_version=$(PYTHON_VERSION) \ - am_cv_python_platform=linux2 \ - am_cv_python_pythondir=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \ - am_cv_python_pyexecdir=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \ + am_cv_pathless_PYTHON=python3 \ + am_cv_python_version=$(PYTHON3_VERSION) \ + am_cv_python_platform=linux5 \ + am_cv_python_pythondir=/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + am_cv_python_pyexecdir=/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ py_cv_mod_socket_=yes -AVAHI_DEPENDENCIES += python +AVAHI_DEPENDENCIES += python3 AVAHI_CONF_OPTS += --enable-python else AVAHI_CONF_OPTS += --disable-python @@ -127,6 +126,13 @@ else AVAHI_CONF_OPTS += --disable-python-dbus endif +ifeq ($(BR2_PACKAGE_PYTHON_GOBJECT),y) +AVAHI_CONF_OPTS += --enable-pygobject +AVAHI_DEPENDENCIES += python-gobject +else +AVAHI_CONF_OPTS += --disable-pygobject +endif + AVAHI_CONF_ENV += CFLAGS="$(AVAHI_CFLAGS)" AVAHI_MAKE_OPTS += LIBS=$(TARGET_NLS_LIBS) -- 2.20.1 From giulio.benetti at benettiengineering.com Sun Feb 6 09:54:03 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 10:54:03 +0100 Subject: [Buildroot] [PATCH] docs/manual: fix "+size = +" latex formatting Message-ID: <20220206095403.1563814-1-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- docs/manual/writing-rules.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/manual/writing-rules.txt b/docs/manual/writing-rules.txt index 3eec095d0e..06f87556ed 100644 --- a/docs/manual/writing-rules.txt +++ b/docs/manual/writing-rules.txt @@ -184,7 +184,7 @@ image sdimage.img { * Every node(+section+, +partition+, +file+, +subnode+) must have an open curly bracket on the same line of the node's name, while the closing one must be on a newline and after it a newline must be added except for the - last one node. Same goes for its option, for example option +size = +. + last one node. Same goes for its option, for example option +size+ +=+. * Every +option+(i.e. +image+, +offset+, +size+) must have the +=+ assignment one space from it and one space from the value specified. -- 2.25.1 From fontaine.fabrice at gmail.com Sun Feb 6 09:53:59 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 6 Feb 2022 10:53:59 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/rygel: gobject-introspection is mandatory Message-ID: <20220206095359.854435-1-fontaine.fabrice@gmail.com> vapi (and gobject-introspection) is mandatory since bump to version 0.40.2 in commit 6acdbb81c8d6cdd3ecb476ae24e72fd4547011c3: valac -C --pkg posix --pkg libxml-2.0 --pkg gmodule-2.0 --pkg gio-2.0 --pkg gssdp-1.2 --pkg gee-0.8 --pkg gupnp-1.2 --target-glib ' 2.56' --pkg glib-2.0 --color=always --directory src/librygel-core/librygel-core-2.6.so.2.0.4.p --basedir ../src/librygel-core --library rygel-core-2.6 --header src/librygel-core/rygel-core.h --vapi ../rygel-core-2.6.vapi --gir ../Rygel-2.6.gir ../src/librygel-core/rygel-build-config.vapi ../src/librygel-core/rygel-connection-manager.vala ../src/librygel-core/rygel-basic-management.vala ../src/librygel-core/rygel-basic-management-test.vala ../src/librygel-core/rygel-basic-management-test-ping.vala ../src/librygel-core/rygel-basic-management-test-nslookup.vala ../src/librygel-core/rygel-basic-management-test-traceroute.vala ../src/librygel-core/rygel-description-file.vala ../src/librygel-core/rygel-dlna-profile.vala ../src/librygel-core/rygel-energy-management.vala ../src/librygel-core/rygel-root-device.vala ../src/librygel-core/rygel-root-device-factory.vala ../src/librygel-core/rygel-dbus-interface.vala ../src/librygel-core/rygel-log-handler.vala ../src/librygel-core/rygel-meta-config.vala ../src/librygel-core/rygel-plugin-loader.vala ../src/librygel-core/rygel-recursive-module-loader.vala ../src/librygel-core/rygel-plugin.vala ../src/librygel-core/rygel-resource-info.vala ../src/librygel-core/rygel-media-device.vala ../src/librygel-core/rygel-configuration.vala ../src/librygel-core/rygel-base-configuration.vala ../src/librygel-core/rygel-cmdline-config.vala ../src/librygel-core/rygel-environment-config.vala ../src/librygel-core/rygel-user-config.vala ../src/librygel-core/rygel-state-machine.vala ../src/librygel-core/rygel-v1-hacks.vala ../src/librygel-core/rygel-icon-info.vala ../src/librygel-core/rygel-xml-utils.vala ../src/librygel-core/rygel-plugin-information.vala error: Package `gssdp-1.2' not found in specified Vala API directories or GObject-Introspection GIR directories error: Package `gupnp-1.2' not found in specified Vala API directories or GObject-Introspection GIR directories Depends on BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES instead of selecting it to avoid the following recursive dependency: package/gstreamer1/gstreamer1/Config.in:5:error: recursive dependency detected! package/gstreamer1/gstreamer1/Config.in:5: symbol BR2_PACKAGE_GSTREAMER1 is selected by BR2_PACKAGE_RYGEL_MEDIA_ENGINE_GSTREAMER1 package/rygel/Config.in:46: symbol BR2_PACKAGE_RYGEL_MEDIA_ENGINE_GSTREAMER1 is part of choice package/rygel/Config.in:39: choice contains symbol package/rygel/Config.in:39: choice contains symbol BR2_PACKAGE_RYGEL package/rygel/Config.in:1: symbol BR2_PACKAGE_RYGEL depends on BR2_PACKAGE_PYTHON3 package/python3/Config.in:5: symbol BR2_PACKAGE_PYTHON3 is selected by BR2_PACKAGE_JACK2_DBUS package/jack2/Config.in:35: symbol BR2_PACKAGE_JACK2_DBUS depends on BR2_PACKAGE_JACK2 package/jack2/Config.in:1: symbol BR2_PACKAGE_JACK2 is selected by BR2_PACKAGE_FLUIDSYNTH_JACK2 package/fluidsynth/Config.in:37: symbol BR2_PACKAGE_FLUIDSYNTH_JACK2 depends on BR2_PACKAGE_FLUIDSYNTH package/fluidsynth/Config.in:1: symbol BR2_PACKAGE_FLUIDSYNTH is selected by BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FLUIDSYNTH package/gstreamer1/gst1-plugins-bad/Config.in:425: symbol BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FLUIDSYNTH depends on BR2_PACKAGE_GSTREAMER1 Fixes: - http://autobuild.buildroot.org/results/027ce84895fab6fb251dd37cd5cfb7169287a2de Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2: - Depends on BR2_PACKAGE_{PYTHON3,GSTREAMER1_EDITING_SERVICES} package/rygel/Config.in | 23 +++++++++++++++++------ package/rygel/rygel.mk | 9 ++------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/package/rygel/Config.in b/package/rygel/Config.in index df48918833..30e8430537 100644 --- a/package/rygel/Config.in +++ b/package/rygel/Config.in @@ -2,8 +2,14 @@ config BR2_PACKAGE_RYGEL bool "rygel" depends on BR2_USE_WCHAR # gupnp-av depends on BR2_TOOLCHAIN_HAS_THREADS # gupnp-av - depends on BR2_USE_MMU # gupnp-av + depends on BR2_USE_MMU # gupnp-av, gobject-introspection + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS # gobject-introspection + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # gobject-introspection + depends on BR2_HOST_GCC_AT_LEAST_8 # gobject-introspection -> host-qemu + depends on BR2_TOOLCHAIN_USES_GLIBC # gobject-introspection + depends on BR2_PACKAGE_PYTHON3 # gobject-introspection select BR2_PACKAGE_GDK_PIXBUF + select BR2_PACKAGE_GOBJECT_INTROSPECTION select BR2_PACKAGE_GUPNP_AV select BR2_PACKAGE_GUPNP_DLNA select BR2_PACKAGE_LIBGEE @@ -39,14 +45,19 @@ config BR2_PACKAGE_RYGEL_MEDIA_ENGINE_SIMPLE config BR2_PACKAGE_RYGEL_MEDIA_ENGINE_GSTREAMER1 bool "gstreamer1" - select BR2_PACKAGE_GSTREAMER1 - select BR2_PACKAGE_GST1_PLUGINS_BASE - select BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES + depends on BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES + +comment "gstreamer1 needs gst1-editing-services" + depends on !BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES endchoice -comment "rygel needs a toolchain w/ wchar, threads" +comment "rygel needs a glibc toolchain w/ wchar, threads, gcc >= 4.9, host gcc >= 8" depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_USES_GLIBC || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_HOST_GCC_AT_LEAST_8 endif # BR2_PACKAGE_RYGEL diff --git a/package/rygel/rygel.mk b/package/rygel/rygel.mk index c541cdc0ed..bfcd5df3c6 100644 --- a/package/rygel/rygel.mk +++ b/package/rygel/rygel.mk @@ -12,6 +12,7 @@ RYGEL_LICENSE = LGPL-2.1+, CC-BY-SA-3.0 (logo) RYGEL_LICENSE_FILES = COPYING COPYING.logo RYGEL_DEPENDENCIES = \ gdk-pixbuf \ + gobject-introspection \ gupnp-av \ gupnp-dlna \ libgee \ @@ -24,16 +25,10 @@ RYGEL_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) RYGEL_CONF_OPTS += \ -Dapi-docs=false \ -Dexamples=false \ + -Dintrospection=enabled \ -Dtests=false RYGEL_PLUGINS = external,lms,mpris,ruih -ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) -RYGEL_CONF_OPTS += -Dintrospection=enabled -RYGEL_DEPENDENCIES += gobject-introspection -else -RYGEL_CONF_OPTS += -Dintrospection=disabled -endif - ifeq ($(BR2_PACKAGE_RYGEL_MEDIA_ENGINE_GSTREAMER1),y) RYGEL_CONF_OPTS += \ -Dengines=gstreamer \ -- 2.34.1 From guillaume.bressaix at gmail.com Sun Feb 6 10:11:34 2022 From: guillaume.bressaix at gmail.com (Guillaume W. Bres) Date: Sun, 6 Feb 2022 11:11:34 +0100 Subject: [Buildroot] [PATCH] package/mbw: new package Message-ID: <20220206101134.30291-1-guillaume.bressaix@gmail.com> Signed-off-by: Guillaume W. Bres --- DEVELOPERS | 1 + package/Config.in | 1 + package/mbw/Config.in | 7 +++++++ package/mbw/mbw.hash | 3 +++ package/mbw/mbw.mk | 20 ++++++++++++++++++++ 5 files changed, 32 insertions(+) create mode 100644 package/mbw/Config.in create mode 100644 package/mbw/mbw.hash create mode 100644 package/mbw/mbw.mk diff --git a/DEVELOPERS b/DEVELOPERS index a1ec9a091e..acc87aa007 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1148,6 +1148,7 @@ N: Guillaume William Brs F: package/libnids/ F: package/libxcrypt/ F: package/liquid-dsp/ +F: package/mbw/ F: package/pixiewps/ F: package/python-pybind/ F: package/reaver/ diff --git a/package/Config.in b/package/Config.in index e4ca195beb..8445173633 100644 --- a/package/Config.in +++ b/package/Config.in @@ -118,6 +118,7 @@ menu "Debugging, profiling and benchmark" source "package/lttng-babeltrace/Config.in" source "package/lttng-modules/Config.in" source "package/lttng-tools/Config.in" + source "package/mbw/Config.in" source "package/mcelog/Config.in" source "package/memstat/Config.in" source "package/netperf/Config.in" diff --git a/package/mbw/Config.in b/package/mbw/Config.in new file mode 100644 index 0000000000..7bafa35359 --- /dev/null +++ b/package/mbw/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_MBW + bool "mbw" + help + MBW is a memory bandwidth benchmarking tool. + MBW determines the "copy" memory bandwidth available + to userspace programs. + https://github.com/raas/mbw diff --git a/package/mbw/mbw.hash b/package/mbw/mbw.hash new file mode 100644 index 0000000000..966b3c9dae --- /dev/null +++ b/package/mbw/mbw.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 9f7365c752f4dfe0d7d46c599ff1e4b412179be764b0d712269d7ee61e0cf718 mbw-1.4.tar.gz +sha256 43a285e18a2158494b099645e1ea3514452c085927b34856d39c1f6917c7d04d mbw.spec diff --git a/package/mbw/mbw.mk b/package/mbw/mbw.mk new file mode 100644 index 0000000000..fb599d0bfd --- /dev/null +++ b/package/mbw/mbw.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# mbw +# +################################################################################ + +MBW_VERSION = 1.4 +MBW_SITE = $(call github,raas,mbw,v$(MBW_VERSION)) +MBW_LICENSE = LGPL-2.1 +MBW_LICENSE_FILES = mbw.spec + +define MBW_BUILD_CMDS + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) +endef + +define MBW_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/mbw $(TARGET_DIR)/usr/sbin +endef + +$(eval $(generic-package)) -- 2.20.1 From fontaine.fabrice at gmail.com Sun Feb 6 10:14:33 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 6 Feb 2022 11:14:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/libopenh264: bump to version 2.2.0 Message-ID: <20220206101433.862930-1-fontaine.fabrice@gmail.com> Drop patches (already in version) https://github.com/cisco/openh264/releases/tag/v2.2.0 Signed-off-by: Fabrice Fontaine --- .../0001-Add-USE_STACK_PROTECTOR-option.patch | 100 ------------------ package/libopenh264/0002-fix-mips-build.patch | 73 ------------- ...n-inc-asmdefs_mmi.h-fix-mips32-build.patch | 89 ---------------- package/libopenh264/libopenh264.hash | 2 +- package/libopenh264/libopenh264.mk | 2 +- 5 files changed, 2 insertions(+), 264 deletions(-) delete mode 100644 package/libopenh264/0001-Add-USE_STACK_PROTECTOR-option.patch delete mode 100644 package/libopenh264/0002-fix-mips-build.patch delete mode 100644 package/libopenh264/0003-codec-common-inc-asmdefs_mmi.h-fix-mips32-build.patch diff --git a/package/libopenh264/0001-Add-USE_STACK_PROTECTOR-option.patch b/package/libopenh264/0001-Add-USE_STACK_PROTECTOR-option.patch deleted file mode 100644 index 3758cd668b..0000000000 --- a/package/libopenh264/0001-Add-USE_STACK_PROTECTOR-option.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 1e7435751c055723b7103dd1d5bb68530e1a2678 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 8 Oct 2019 20:18:18 +0200 -Subject: [PATCH] Add USE_STACK_PROTECTOR option - --fstack-protector-all is not supported on all linux toolchains so add an -option to disable it (and enable it by default to keep current behavior) - -Fixes: - - http://autobuild.buildroot.org/results/377818cf8c1f2632cabdccb32bf4e7f06c0fdbbd - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/cisco/openh264/pull/3175] ---- - Makefile | 1 + - build/platform-android.mk | 5 ++++- - build/platform-bsd.mk | 5 ++++- - build/platform-darwin.mk | 5 ++++- - build/platform-linux.mk | 5 ++++- - 5 files changed, 17 insertions(+), 4 deletions(-) - -diff --git a/Makefile b/Makefile -index 74ff029d..c2061f6a 100644 ---- a/Makefile -+++ b/Makefile -@@ -34,6 +34,7 @@ GTEST_VER=release-1.8.1 - CCASFLAGS=$(CFLAGS) - STATIC_LDFLAGS=-lstdc++ - STRIP ?= strip -+USE_STACK_PROTECTOR = Yes - - SHAREDLIB_MAJORVERSION=5 - FULL_VERSION := 2.0.0 -diff --git a/build/platform-android.mk b/build/platform-android.mk -index 6f6ce347..06534301 100644 ---- a/build/platform-android.mk -+++ b/build/platform-android.mk -@@ -44,7 +44,10 @@ SYSROOT = $(NDKROOT)/platforms/android-$(NDKLEVEL)/arch-$(ARCH) - CXX = $(TOOLCHAINPREFIX)g++ - CC = $(TOOLCHAINPREFIX)gcc - AR = $(TOOLCHAINPREFIX)ar --CFLAGS += -DANDROID_NDK -fpic --sysroot=$(SYSROOT) -MMD -MP -fstack-protector-all -+CFLAGS += -DANDROID_NDK -fpic --sysroot=$(SYSROOT) -MMD -MP -+ifeq ($(USE_STACK_PROTECTOR), Yes) -+CFLAGS +=-fstack-protector-all -+endif - CFLAGS += -isystem $(NDKROOT)/sysroot/usr/include -isystem $(NDKROOT)/sysroot/usr/include/$(TOOLCHAIN_NAME) -D__ANDROID_API__=$(NDKLEVEL) - CXXFLAGS += -fno-rtti -fno-exceptions - LDFLAGS += --sysroot=$(SYSROOT) -diff --git a/build/platform-bsd.mk b/build/platform-bsd.mk -index e60d2cc0..2e0bf2cc 100644 ---- a/build/platform-bsd.mk -+++ b/build/platform-bsd.mk -@@ -3,7 +3,10 @@ SHAREDLIBSUFFIX = so - SHAREDLIBSUFFIXFULLVER=$(SHAREDLIBSUFFIX).$(FULL_VERSION) - SHAREDLIBSUFFIXMAJORVER=$(SHAREDLIBSUFFIX).$(SHAREDLIB_MAJORVERSION) - SHLDFLAGS = -Wl,-soname,$(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXMAJORVER) --CFLAGS += -fPIC -fstack-protector-all -+CFLAGS += -fPIC -+ifeq ($(USE_STACK_PROTECTOR), Yes) -+CFLAGS += -fstack-protector-all -+endif - LDFLAGS += -lpthread - STATIC_LDFLAGS += -lpthread -lm - ifeq ($(ASM_ARCH), x86) -diff --git a/build/platform-darwin.mk b/build/platform-darwin.mk -index 6c7b2443..718c8e2f 100644 ---- a/build/platform-darwin.mk -+++ b/build/platform-darwin.mk -@@ -10,7 +10,10 @@ SHLDFLAGS = -dynamiclib -twolevel_namespace -undefined dynamic_lookup \ - $(SHAREDLIB_DIR)/$(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXMAJORVER) - SHARED = -dynamiclib - SHARED += -current_version $(CURRENT_VERSION) -compatibility_version $(COMPATIBILITY_VERSION) --CFLAGS += -Wall -fPIC -MMD -MP -fstack-protector-all -+CFLAGS += -Wall -fPIC -MMD -MP -+ifeq ($(USE_STACK_PROTECTOR), Yes) -+CFLAGS += -fstack-protector-all -+endif - ifeq ($(ASM_ARCH), x86) - ASMFLAGS += -DPREFIX - ifeq ($(ARCH), x86_64) -diff --git a/build/platform-linux.mk b/build/platform-linux.mk -index 44fe2424..b5c006b2 100644 ---- a/build/platform-linux.mk -+++ b/build/platform-linux.mk -@@ -3,7 +3,10 @@ SHAREDLIBSUFFIX = so - SHAREDLIBSUFFIXFULLVER=$(SHAREDLIBSUFFIX).$(FULL_VERSION) - SHAREDLIBSUFFIXMAJORVER=$(SHAREDLIBSUFFIX).$(SHAREDLIB_MAJORVERSION) - SHLDFLAGS = -Wl,-soname,$(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXMAJORVER) --CFLAGS += -Wall -fno-strict-aliasing -fPIC -MMD -MP -fstack-protector-all -+CFLAGS += -Wall -fno-strict-aliasing -fPIC -MMD -MP -+ifeq ($(USE_STACK_PROTECTOR), Yes) -+CFLAGS += -fstack-protector-all -+endif - LDFLAGS += -lpthread - STATIC_LDFLAGS += -lpthread -lm - AR_OPTS = crD $@ --- -2.23.0 - diff --git a/package/libopenh264/0002-fix-mips-build.patch b/package/libopenh264/0002-fix-mips-build.patch deleted file mode 100644 index c4927d567b..0000000000 --- a/package/libopenh264/0002-fix-mips-build.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 9d5981eecde2133b9d6099eb99f96b1c29c3e520 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Mon, 13 Apr 2020 12:03:01 +0200 -Subject: [PATCH] fix mips build - -In total three PR were sent upstream to fix mips builds: -https://github.com/cisco/openh264/pull/3185 -https://github.com/cisco/openh264/pull/3217 -https://github.com/cisco/openh264/pull/3225 - -Buildroot used the first version -https://git.buildroot.net/buildroot/commit/package/libopenh264?id=e8d0df569e1844f7ba28918a53ee38027b325b8f -downloaded from https://github.com/cisco/openh264/pull/3185 - -During discussion the gcc option '-march=loongson3a' was changed to -'-Wa,-mloongson-mmi,-mloongson-ext': -https://github.com/cisco/openh264/pull/3185#discussion_r337818960 - -This causes build errors with gcc version 8.3.0 (Buildroot 2020.02) - -tmp/cctgEQaw.s:662: Error: opcode not supported on this processor: loongson3a (mips64r2) `bc .L22' -/tmp/cctgEQaw.s:1679: Error: opcode not supported on this processor: loongson3a (mips64r2) `bc .L27' -/tmp/cctgEQaw.s:2218: Error: opcode not supported on this processor: loongson3a (mips64r2) `jrc $31' - -This patch partly reverts the change to fix mips build. - -$ /home/bernd/buildroot/br5/output/host/bin/mips64el-linux-gcc -v - -Using built-in specs. -COLLECT_GCC=/home/bernd/buildroot/br5/output/host/opt/ext-toolchain/bin/mips64el-linux-gcc.br_real -COLLECT_LTO_WRAPPER=/home/bernd/buildroot/br5/output/host/opt/ext-toolchain/bin/../libexec/gcc/mips64el-buildroot-linux-gnu/8.3.0/lto-wrapper -Target: mips64el-buildroot-linux-gnu -Configured with: ./configure --prefix=/opt/br-mips64r6-n64-el-hf-2020.02 --sysconfdir=/opt/br-mips64r6-n64-el-hf-2020.02/etc --enable-static --target=mips64el-buildroot-linux-gnu --with-sysroot=/opt/br-mips64r6-n64-el-hf-2020.02/mips64el-buildroot-linux-gnu/sysroot --enable-__cxa_atexit --with-gnu-ld --disable-libssp --disable-multilib --disable-decimal-float --with-gmp=/opt/br-mips64r6-n64-el-hf-2020.02 --with-mpc=/opt/br-mips64r6-n64-el-hf-2020.02 --with-mpfr=/opt/br-mips64r6-n64-el-hf-2020.02 --with-pkgversion='Buildroot 2020.02' --with-bugurl=http://bugs.buildroot.net/ --disable-libquadmath --enable-tls --enable-threads --without-isl --without-cloog --with-arch=mips64r6 --with-abi=64 --with-nan=2008 --enable-languages=c,c++ --with-build-time-tools=/opt/br-mips64r6-n64-el-hf-2020.02/mips64el-buildroot-linux-gnu/bin --enable-shared --disable-libgomp -Thread model: posix -gcc version 8.3.0 (Buildroot 2020.02) - -Patch sent upstream: https://github.com/cisco/openh264/pull/3267 - -Signed-off-by: Bernd Kuhls ---- - build/arch.mk | 2 +- - build/mips-simd-check.sh | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/build/arch.mk b/build/arch.mk -index 1bf318ab..c6570ed4 100644 ---- a/build/arch.mk -+++ b/build/arch.mk -@@ -41,7 +41,7 @@ ASMFLAGS += -I$(SRC_PATH)codec/common/mips/ - ifeq ($(ENABLE_MMI), Yes) - ENABLE_MMI = $(shell $(SRC_PATH)build/mips-simd-check.sh $(CC) mmi) - ifeq ($(ENABLE_MMI), Yes) --CFLAGS += -DHAVE_MMI -Wa,-mloongson-mmi,-mloongson-ext -+CFLAGS += -DHAVE_MMI -march=loongson3a - endif - endif - #msa -diff --git a/build/mips-simd-check.sh b/build/mips-simd-check.sh -index 5efffbef..d0d72f9e 100755 ---- a/build/mips-simd-check.sh -+++ b/build/mips-simd-check.sh -@@ -15,7 +15,7 @@ TMPO=$(mktemp tmp.XXXXXX.o) - if [ $2 == "mmi" ] - then - echo "void main(void){ __asm__ volatile(\"punpcklhw \$f0, \$f0, \$f0\"); }" > $TMPC -- $1 -Wa,-mloongson-mmi $TMPC -o $TMPO &> /dev/null -+ $1 -march=loongson3a $TMPC -o $TMPO &> /dev/null - if test -s $TMPO - then - echo "Yes" --- -2.25.0 - diff --git a/package/libopenh264/0003-codec-common-inc-asmdefs_mmi.h-fix-mips32-build.patch b/package/libopenh264/0003-codec-common-inc-asmdefs_mmi.h-fix-mips32-build.patch deleted file mode 100644 index e11b1d13ef..0000000000 --- a/package/libopenh264/0003-codec-common-inc-asmdefs_mmi.h-fix-mips32-build.patch +++ /dev/null @@ -1,89 +0,0 @@ -From c505f81e336088b6729a5407a03459f488353288 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 24 May 2021 22:54:01 +0200 -Subject: [PATCH] codec/common/inc/asmdefs_mmi.h: fix mips32 build - -Fix the following build failure on mips32 which is raised since version -2.0.0 and -https://github.com/cisco/openh264/commit/b13e5bceb18ebb93d0313b46aab4af6f480ca933: - -codec/common/mips/copy_mb_mmi.c: In function 'WelsCopy16x16_mmi': -./codec/common/inc/asmdefs_mmi.h:293:21: error: '_ABI64' undeclared (first use in this function) - 293 | if (_MIPS_SIM == _ABI64) \ - | ^~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/cba3e9d0fd061cc3a92cb732bcdc2c7b66dbf6cb - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/cisco/openh264/pull/3384] ---- - codec/common/inc/asmdefs_mmi.h | 17 +++++++++++------ - 1 file changed, 11 insertions(+), 6 deletions(-) - -diff --git a/codec/common/inc/asmdefs_mmi.h b/codec/common/inc/asmdefs_mmi.h -index 69a7ae39..5d1aed93 100644 ---- a/codec/common/inc/asmdefs_mmi.h -+++ b/codec/common/inc/asmdefs_mmi.h -@@ -288,9 +288,9 @@ - /** - * backup register - */ -+#if defined(_ABI64) && _MIPS_SIM == _ABI64 - #define BACKUP_REG \ - double __attribute__((aligned(16))) __back_temp[8]; \ -- if (_MIPS_SIM == _ABI64) \ - __asm__ volatile ( \ - "gssqc1 $f25, $f24, 0x00(%[temp]) \n\t" \ - "gssqc1 $f27, $f26, 0x10(%[temp]) \n\t" \ -@@ -299,8 +299,10 @@ - : \ - : [temp]"r"(__back_temp) \ - : "memory" \ -- ); \ -- else \ -+ ); -+#else -+#define BACKUP_REG \ -+ double __attribute__((aligned(16))) __back_temp[8]; \ - __asm__ volatile ( \ - "gssqc1 $f22, $f20, 0x00(%[temp]) \n\t" \ - "gssqc1 $f26, $f24, 0x10(%[temp]) \n\t" \ -@@ -309,12 +311,13 @@ - : [temp]"r"(__back_temp) \ - : "memory" \ - ); -+#endif - - /** - * recover register - */ -+#if defined(_ABI64) && _MIPS_SIM == _ABI64 - #define RECOVER_REG \ -- if (_MIPS_SIM == _ABI64) \ - __asm__ volatile ( \ - "gslqc1 $f25, $f24, 0x00(%[temp]) \n\t" \ - "gslqc1 $f27, $f26, 0x10(%[temp]) \n\t" \ -@@ -323,8 +326,9 @@ - : \ - : [temp]"r"(__back_temp) \ - : "memory" \ -- ); \ -- else \ -+ ); -+#else -+#define RECOVER_REG \ - __asm__ volatile ( \ - "gslqc1 $f22, $f20, 0x00(%[temp]) \n\t" \ - "gslqc1 $f26, $f24, 0x10(%[temp]) \n\t" \ -@@ -333,6 +337,7 @@ - : [temp]"r"(__back_temp) \ - : "memory" \ - ); -+#endif - - # define OK 1 - # define NOTOK 0 --- -2.30.2 - diff --git a/package/libopenh264/libopenh264.hash b/package/libopenh264/libopenh264.hash index 0689ab961f..712425a024 100644 --- a/package/libopenh264/libopenh264.hash +++ b/package/libopenh264/libopenh264.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 af173e90fce65f80722fa894e1af0d6b07572292e76de7b65273df4c0a8be678 libopenh264-2.1.1.tar.gz +sha256 e4e5c8ba48e64ba6ce61e8b6e2b76b2d870c74c270147649082feabb40f25905 libopenh264-2.2.0.tar.gz sha256 dd5c1c9668512530fa5a96e4c29ac4033d70a7eeb0eed7a42fddb6dd794ebdbb LICENSE diff --git a/package/libopenh264/libopenh264.mk b/package/libopenh264/libopenh264.mk index 0c17579979..ea41f72661 100644 --- a/package/libopenh264/libopenh264.mk +++ b/package/libopenh264/libopenh264.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENH264_VERSION = 2.1.1 +LIBOPENH264_VERSION = 2.2.0 LIBOPENH264_SITE = $(call github,cisco,openh264,v$(LIBOPENH264_VERSION)) LIBOPENH264_LICENSE = BSD-2-Clause LIBOPENH264_LICENSE_FILES = LICENSE -- 2.34.1 From thomas.petazzoni at bootlin.com Sun Feb 6 10:20:15 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 11:20:15 +0100 Subject: [Buildroot] [git commit] package/trace-cmd: use snapshot tarball Message-ID: <20220206101337.A1485825B9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=48f6ff227984612ddf0fb27222b59e50a11d20c9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Use snapshot tarball so TRACE_CMD_VERSION will match what is returned by https://release-monitoring.org Signed-off-by: Fabrice Fontaine Reviewed-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/trace-cmd/trace-cmd.hash | 2 +- package/trace-cmd/trace-cmd.mk | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/trace-cmd/trace-cmd.hash b/package/trace-cmd/trace-cmd.hash index 1f34a0da60..00cecc7828 100644 --- a/package/trace-cmd/trace-cmd.hash +++ b/package/trace-cmd/trace-cmd.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 9401a43bda4837dfde5e64e0dbe5d3918bf50eb86b4d23fa89713b0f2defcbc1 trace-cmd-trace-cmd-v2.9.6-br1.tar.gz +sha256 45924a763376a700221f64b4034f87263e4038ec88b120a0abfb5743d051d068 trace-cmd-v2.9.6.tar.gz sha256 b1d04b850c1c7471b0f0896f6c6f0fcfc9f07e2dd183a5f5826af269fe9e88fb COPYING sha256 70f297763149e72306919c924e164f83041d5e512868d4c8c1826c171b3e49f9 COPYING.LIB sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 LICENSES/GPL-2.0 diff --git a/package/trace-cmd/trace-cmd.mk b/package/trace-cmd/trace-cmd.mk index a592b1f027..d9ed417f20 100644 --- a/package/trace-cmd/trace-cmd.mk +++ b/package/trace-cmd/trace-cmd.mk @@ -4,9 +4,10 @@ # ################################################################################ -TRACE_CMD_VERSION = trace-cmd-v2.9.6 -TRACE_CMD_SITE = https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git -TRACE_CMD_SITE_METHOD = git +TRACE_CMD_VERSION = 2.9.6 +TRACE_CMD_SOURCE = trace-cmd-v$(TRACE_CMD_VERSION).tar.gz +TRACE_CMD_SITE = \ + https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot TRACE_CMD_LICENSE = GPL-2.0, LGPL-2.1 TRACE_CMD_LICENSE_FILES = COPYING COPYING.LIB LICENSES/GPL-2.0 LICENSES/LGPL-2.1 From thomas.petazzoni at bootlin.com Sun Feb 6 10:21:38 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 11:21:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/trace-cmd: use snapshot tarball In-Reply-To: <20220203223615.729285-1-fontaine.fabrice@gmail.com> References: <20220203223615.729285-1-fontaine.fabrice@gmail.com> Message-ID: <20220206112138.77563a44@windsurf> On Thu, 3 Feb 2022 23:36:15 +0100 Fabrice Fontaine wrote: > Use snapshot tarball so TRACE_CMD_VERSION will match what is returned by > https://release-monitoring.org > > Signed-off-by: Fabrice Fontaine > --- > package/trace-cmd/trace-cmd.hash | 2 +- > package/trace-cmd/trace-cmd.mk | 7 ++++--- > 2 files changed, 5 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 6 10:21:10 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 11:21:10 +0100 Subject: [Buildroot] [git commit] package/speexdsp: use snapshot tarball Message-ID: <20220206101631.ACBEC8267F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=550ab032881e1aacde344c575f1fce586d9ce243 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Use snapshot tarball so SPEEXDSP_VERSION will match what is returned by https://release-monitoring.org Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/speexdsp/speexdsp.hash | 2 +- package/speexdsp/speexdsp.mk | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/speexdsp/speexdsp.hash b/package/speexdsp/speexdsp.hash index fd9870dc58..82e054d4d4 100644 --- a/package/speexdsp/speexdsp.hash +++ b/package/speexdsp/speexdsp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c92c7e428cb5ca11b4e6f13118ff288332f330b6fefc93cb39bf7b43b13cb1f7 speexdsp-SpeexDSP-1.2.0-br1.tar.gz +sha256 0fe0e31be215f820bed0f9c913c673997773fce3a03a4555658e7b73a54eed7b speexdsp-SpeexDSP-1.2.0.tar.bz2 sha256 671bb5d8fd3c6b05a2e831d90f978ac27965c92bd8ea6d16b3df76e3440c0e9f COPYING diff --git a/package/speexdsp/speexdsp.mk b/package/speexdsp/speexdsp.mk index 35c06dd833..8e886b2b21 100644 --- a/package/speexdsp/speexdsp.mk +++ b/package/speexdsp/speexdsp.mk @@ -4,9 +4,9 @@ # ################################################################################ -SPEEXDSP_VERSION = SpeexDSP-1.2.0 -SPEEXDSP_SITE = https://gitlab.xiph.org/xiph/speexdsp.git -SPEEXDSP_SITE_METHOD = git +SPEEXDSP_VERSION = 1.2.0 +SPEEXDSP_SOURCE = speexdsp-SpeexDSP-$(SPEEXDSP_VERSION).tar.bz2 +SPEEXDSP_SITE = https://gitlab.xiph.org/xiph/speexdsp/-/archive/SpeexDSP-$(SPEEXDSP_VERSION) SPEEXDSP_LICENSE = BSD-3-Clause SPEEXDSP_LICENSE_FILES = COPYING SPEEXDSP_INSTALL_STAGING = YES From thomas.petazzoni at bootlin.com Sun Feb 6 10:24:05 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 11:24:05 +0100 Subject: [Buildroot] [git commit] package/netcat-openbsd: bump to version 1.218 Message-ID: <20220206101652.9A5648267F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3d24fb7e7b013e6cbbac91abe7c45ca9ed788756 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Use official tarball so NETCAT_OPENBSD_VERSION will match what is returned by https://release-monitoring.org - Use netcat.c as the license file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/netcat-openbsd/netcat-openbsd.hash | 9 ++++++--- package/netcat-openbsd/netcat-openbsd.mk | 9 +++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/package/netcat-openbsd/netcat-openbsd.hash b/package/netcat-openbsd/netcat-openbsd.hash index b70cae8860..e55dea53e7 100644 --- a/package/netcat-openbsd/netcat-openbsd.hash +++ b/package/netcat-openbsd/netcat-openbsd.hash @@ -1,3 +1,6 @@ -# Locally calculated -sha256 55e578f652cbf6ffc95f75ea3e2645ab335fab63649568bd7cdb0a6331ca87de netcat-openbsd-debian_1.195-2-br1.tar.gz -sha256 e2e86d58c38f044a49f51e45515747585db58a2305419c73323eaad88fcaef5c debian/copyright +# From http://snapshot.debian.org/archive/debian/20211206T030211Z/pool/main/n/netcat-openbsd/netcat-openbsd_1.218-3.dsc +sha256 a28a5d39abaf481747b1e78b4b50e96d0cdab0ffef289cba156dc11941c64857 netcat-openbsd_1.218.orig.tar.gz +sha256 19229ebc825d12cd805843228c498cc881dcef127a9d680fcfbd8cb2da966161 netcat-openbsd_1.218-3.debian.tar.xz + +# Hash for license file +sha256 acfd1d822ee2e8e0b196c7a369383d0cb9bc131b56c3c95976a32498728fe1e3 netcat.c diff --git a/package/netcat-openbsd/netcat-openbsd.mk b/package/netcat-openbsd/netcat-openbsd.mk index a2333531c0..311f8aa819 100644 --- a/package/netcat-openbsd/netcat-openbsd.mk +++ b/package/netcat-openbsd/netcat-openbsd.mk @@ -4,11 +4,12 @@ # ################################################################################ -NETCAT_OPENBSD_VERSION = debian/1.195-2 -NETCAT_OPENBSD_SITE = https://salsa.debian.org/debian/netcat-openbsd.git -NETCAT_OPENBSD_SITE_METHOD = git +NETCAT_OPENBSD_VERSION = 1.218 +NETCAT_OPENBSD_SOURCE = netcat-openbsd_$(NETCAT_OPENBSD_VERSION).orig.tar.gz +NETCAT_OPENBSD_PATCH = netcat-openbsd_$(NETCAT_OPENBSD_VERSION)-3.debian.tar.xz +NETCAT_OPENBSD_SITE = http://snapshot.debian.org/archive/debian/20211206T030211Z/pool/main/n/netcat-openbsd NETCAT_OPENBSD_LICENSE = BSD-3-Clause -NETCAT_OPENBSD_LICENSE_FILES = debian/copyright +NETCAT_OPENBSD_LICENSE_FILES = netcat.c NETCAT_OPENBSD_DEPENDENCIES = host-pkgconf libbsd define NETCAT_OPENBSD_APPLY_DEBIAN_PATCHES From thomas.petazzoni at bootlin.com Sun Feb 6 10:24:13 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 11:24:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/netcat-openbsd: bump to version 1.218 In-Reply-To: <20220203231432.748145-1-fontaine.fabrice@gmail.com> References: <20220203231432.748145-1-fontaine.fabrice@gmail.com> Message-ID: <20220206112413.628ee1b1@windsurf> On Fri, 4 Feb 2022 00:14:32 +0100 Fabrice Fontaine wrote: > - Use official tarball so NETCAT_OPENBSD_VERSION will match what is > returned by https://release-monitoring.org > - Use netcat.c as the license file > > Signed-off-by: Fabrice Fontaine > --- > package/netcat-openbsd/netcat-openbsd.hash | 9 ++++++--- > package/netcat-openbsd/netcat-openbsd.mk | 9 +++++---- > 2 files changed, 11 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 Sun Feb 6 10:24:43 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 11:24:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/speexdsp: use snapshot tarball In-Reply-To: <20220203224709.736830-1-fontaine.fabrice@gmail.com> References: <20220203224709.736830-1-fontaine.fabrice@gmail.com> Message-ID: <20220206112443.3c6d0b93@windsurf> On Thu, 3 Feb 2022 23:47:09 +0100 Fabrice Fontaine wrote: > Use snapshot tarball so SPEEXDSP_VERSION will match what is returned by > https://release-monitoring.org > > Signed-off-by: Fabrice Fontaine > --- > package/speexdsp/speexdsp.hash | 2 +- > package/speexdsp/speexdsp.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 thomas.petazzoni at bootlin.com Sun Feb 6 10:26:04 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 11:26:04 +0100 Subject: [Buildroot] [git commit] package/libcamera: fix uclibc/musl compile with libexecinfo enabled Message-ID: <20220206101852.01D3A8267F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0ca3b660f4d75f1746508fc7cdee74daa14250a1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - 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 Signed-off-by: Thomas Petazzoni --- package/libcamera/libcamera.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/libcamera/libcamera.mk b/package/libcamera/libcamera.mk index 524cf07e03..534d8d2637 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 = $(TARGET_LDFLAGS) -lexecinfo +endif + $(eval $(meson-package)) From thomas.petazzoni at bootlin.com Sun Feb 6 10:26:13 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 11:26:13 +0100 Subject: [Buildroot] [PATCH v2] package/libcamera: fix uclibc/musl compile with libexecinfo enabled In-Reply-To: <20220203232321.26733-1-ps.report@gmx.net> References: <20220203232321.26733-1-ps.report@gmx.net> Message-ID: <20220206112613.2df5a08b@windsurf> On Fri, 4 Feb 2022 00:23:21 +0100 Peter Seiderer wrote: > - 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 > --- > Changes v1 -> v2: > - preserver original TARGET_LDFLAGS while setting LIBCAMERA_LDFLAGS > --- > package/libcamera/libcamera.mk | 5 +++++ > 1 file changed, 5 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 6 10:27:27 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 11:27:27 +0100 Subject: [Buildroot] [git commit] package/libuhttpd: needs MMU Message-ID: <20220206102014.745438276A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6647ee8ee6e35a17f9154ece4903b09fb5a3014c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Signed-off-by: Thomas Petazzoni --- 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 From thomas.petazzoni at bootlin.com Sun Feb 6 10:27:35 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 11:27:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/libuhttpd: needs MMU In-Reply-To: <20220131220841.127708-1-fontaine.fabrice@gmail.com> References: <20220131220841.127708-1-fontaine.fabrice@gmail.com> Message-ID: <20220206112735.1ed394dc@windsurf> On Mon, 31 Jan 2022 23:08:41 +0100 Fabrice Fontaine wrote: > 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(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From peter at korsgaard.com Sun Feb 6 10:29:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 11:29:55 +0100 Subject: [Buildroot] [PATCH] package/gnuradio: simplify pyver logic Message-ID: <20220206102956.15291-1-peter@korsgaard.com> Gnuradio only works with python3 since commit 786c783f3796 (package/python-numpy: bump to version 1.18.2), so the python2/3 logic for _PYVER can be dropped. Signed-off-by: Peter Korsgaard --- package/gnuradio/gnuradio.mk | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index 658357398d..417a51e067 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -11,13 +11,6 @@ GNURADIO_LICENSE_FILES = COPYING GNURADIO_SUPPORTS_IN_SOURCE_BUILD = NO -# needed to determine site-packages path -ifeq ($(BR2_PACKAGE_PYTHON),y) -GNURADIO_PYVER = $(PYTHON_VERSION_MAJOR) -else ifeq ($(BR2_PACKAGE_PYTHON3),y) -GNURADIO_PYVER = $(PYTHON3_VERSION_MAJOR) -endif - # host-python-mako and host-python-six are needed for volk to compile GNURADIO_DEPENDENCIES = \ host-python3 \ @@ -125,7 +118,7 @@ GNURADIO_CONF_OPTS += -DENABLE_PYTHON=ON # mandatory to install python modules in site-packages and to use # correct path for python libraries GNURADIO_CONF_OPTS += -DGR_PYTHON_RELATIVE=ON \ - -DGR_PYTHON_DIR=lib/python$(GNURADIO_PYVER)/site-packages + -DGR_PYTHON_DIR=lib/python$(PYTHON3_VERSION_MAJOR)/site-packages else GNURADIO_CONF_OPTS += -DENABLE_PYTHON=OFF endif -- 2.20.1 From giulio.benetti at benettiengineering.com Sun Feb 6 10:37:33 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 11:37:33 +0100 Subject: [Buildroot] [PATCH] package/systemd: don't treat ld warnings as errors Message-ID: <20220206103733.1580146-1-giulio.benetti@benettiengineering.com> Nios2 ld emits warnings like: ' /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/nios2-linux-gnu/7.3.1/../../../../nios2-linux-gnu/bin/ld: FDE encoding in /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/nios2-linux-gnu/7.3.1/libgcc.a(_umoddi3.o)(.eh_frame) prevents .eh_frame_hdr table being created. ' Since '-Wl,--fatal-warnings' is passed by default, build fails, so don't treat warnings as errors by appending "-Wl,--no-fatal-warnings" to SYSTEMD_LDFLAGS the same way I've done for Microblaze in commit: https://git.buildroot.net/buildroot/commit/?id=cc53d5357d84ff9b78d76e45ce216061df8a37c1 Fixes: http://autobuild.buildroot.net/results/5fc884e11e46ab165ea21c8e8f2901516d79ff80/ Signed-off-by: Giulio Benetti --- package/systemd/systemd.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 5626b54e8e..0f7da5cb28 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -90,6 +90,11 @@ SYSTEMD_CONF_OPTS += \ -Dumount-path=/usr/bin/umount \ -Dutmp=false +ifeq ($(BR2_nios),y) +# Nios2 ld emits warnings, make warnings not to be treated as errors +SYSTEMD_LDFLAGS = $(TARGET_LDFLAGS) -Wl,--no-fatal-warnings +endif + ifeq ($(BR2_PACKAGE_ACL),y) SYSTEMD_DEPENDENCIES += acl SYSTEMD_CONF_OPTS += -Dacl=true -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 6 10:39:09 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 11:39:09 +0100 Subject: [Buildroot] [PATCH] package/systemd: don't treat ld warnings as errors In-Reply-To: <20220206103733.1580146-1-giulio.benetti@benettiengineering.com> References: <20220206103733.1580146-1-giulio.benetti@benettiengineering.com> Message-ID: <4271dc4d-6096-4f9a-11d3-125f1cd5ea2d@benettiengineering.com> On 06/02/22 11:37, Giulio Benetti wrote: > Nios2 ld emits warnings like: > ' > /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/nios2-linux-gnu/7.3.1/../../../../nios2-linux-gnu/bin/ld: FDE encoding in /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/nios2-linux-gnu/7.3.1/libgcc.a(_umoddi3.o)(.eh_frame) prevents .eh_frame_hdr table being created. > ' > Since '-Wl,--fatal-warnings' is passed by default, build fails, so don't > treat warnings as errors by appending "-Wl,--no-fatal-warnings" to > SYSTEMD_LDFLAGS the same way I've done for Microblaze in commit: > https://git.buildroot.net/buildroot/commit/?id=cc53d5357d84ff9b78d76e45ce216061df8a37c1 > > Fixes: > http://autobuild.buildroot.net/results/5fc884e11e46ab165ea21c8e8f2901516d79ff80/ > > Signed-off-by: Giulio Benetti > --- > package/systemd/systemd.mk | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > index 5626b54e8e..0f7da5cb28 100644 > --- a/package/systemd/systemd.mk > +++ b/package/systemd/systemd.mk > @@ -90,6 +90,11 @@ SYSTEMD_CONF_OPTS += \ > -Dumount-path=/usr/bin/umount \ > -Dutmp=false > > +ifeq ($(BR2_nios),y) s/BR2_nios/BR2_nios2, I send a V2, please reject this patch Sorry for the noise -- Giulio Benetti Benetti Engineering sas > +# Nios2 ld emits warnings, make warnings not to be treated as errors > +SYSTEMD_LDFLAGS = $(TARGET_LDFLAGS) -Wl,--no-fatal-warnings > +endif > + > ifeq ($(BR2_PACKAGE_ACL),y) > SYSTEMD_DEPENDENCIES += acl > SYSTEMD_CONF_OPTS += -Dacl=true From giulio.benetti at benettiengineering.com Sun Feb 6 10:41:20 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 11:41:20 +0100 Subject: [Buildroot] [PATCH v2] package/systemd: don't treat ld warnings as errors Message-ID: <20220206104120.1580819-1-giulio.benetti@benettiengineering.com> Nios2 ld emits warnings like: ' /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/nios2-linux-gnu/7.3.1/../../../../nios2-linux-gnu/bin/ld: FDE encoding in /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/nios2-linux-gnu/7.3.1/libgcc.a(_umoddi3.o)(.eh_frame) prevents .eh_frame_hdr table being created. ' Since '-Wl,--fatal-warnings' is passed by default, build fails, so don't treat warnings as errors by appending "-Wl,--no-fatal-warnings" to SYSTEMD_LDFLAGS the same way I've done for Microblaze in commit: https://git.buildroot.net/buildroot/commit/?id=cc53d5357d84ff9b78d76e45ce216061df8a37c1 Fixes: http://autobuild.buildroot.net/results/5fc884e11e46ab165ea21c8e8f2901516d79ff80/ Signed-off-by: Giulio Benetti --- V1->V2: * renamed BR2_nios to BR2_nios2 --- package/systemd/systemd.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 5626b54e8e..b07fac27d4 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -90,6 +90,11 @@ SYSTEMD_CONF_OPTS += \ -Dumount-path=/usr/bin/umount \ -Dutmp=false +ifeq ($(BR2_nios2),y) +# Nios2 ld emits warnings, make warnings not to be treated as errors +SYSTEMD_LDFLAGS = $(TARGET_LDFLAGS) -Wl,--no-fatal-warnings +endif + ifeq ($(BR2_PACKAGE_ACL),y) SYSTEMD_DEPENDENCIES += acl SYSTEMD_CONF_OPTS += -Dacl=true -- 2.25.1 From thomas.petazzoni at bootlin.com Sun Feb 6 10:40:17 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 11:40:17 +0100 Subject: [Buildroot] [git commit] package/cgilua: add CGILUA_CPE_ID_VENDOR Message-ID: <20220206103431.DA8FA82BBB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=755116460b8de88cb833ab4bf37649a7fb26728d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Signed-off-by: Thomas Petazzoni --- 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)) From thomas.petazzoni at bootlin.com Sun Feb 6 10:42:22 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 11:42:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/cgilua: add CGILUA_CPE_ID_VENDOR In-Reply-To: <20220131220240.127249-1-fontaine.fabrice@gmail.com> References: <20220131220240.127249-1-fontaine.fabrice@gmail.com> Message-ID: <20220206114222.5205b420@windsurf> On Mon, 31 Jan 2022 23:02:40 +0100 Fabrice Fontaine wrote: > 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(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 6 10:46:36 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 11:46:36 +0100 Subject: [Buildroot] [git commit] configs/orangepi_zero_plus2: update Linux/U-Boot versions Message-ID: <20220206103935.0500782BBB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3934db55727af394d09c5b9808d1ccde77f1dce6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Signed-off-by: Thomas Petazzoni --- 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 From thomas.petazzoni at bootlin.com Sun Feb 6 10:46:07 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 11:46:07 +0100 Subject: [Buildroot] [git commit] board/orangepi/orangepi-zero-plus2: fix build after genimage update Message-ID: <20220206103934.F242A82B9A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0f72e01e055f79e84e876dd01c03f29abdbd531b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478371 Signed-off-by: Sergey Matyukevich Signed-off-by: Thomas Petazzoni --- 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 } From thomas.petazzoni at bootlin.com Sun Feb 6 10:47:47 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 11:47:47 +0100 Subject: [Buildroot] [PATCH 1/2] board/orangepi/orangepi-zero-plus2: fix build after genimage update In-Reply-To: <20220131212456.3176156-1-geomatsi@gmail.com> References: <20220131212456.3176156-1-geomatsi@gmail.com> Message-ID: <20220206114747.4b02f9d7@windsurf> On Tue, 1 Feb 2022 00:24:55 +0300 Sergey Matyukevich wrote: > 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(-) Both applied, thanks! In the commit log of the first patch, I've added a reference to the Gitlab CI failure that the patch is fixing, as suggested by Giulio. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 6 10:50:06 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 11:50:06 +0100 Subject: [Buildroot] [PATCH v2 5/6] configs/microchip_sama7g5ek_mmc_defconfig: add missing BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15 and host openssl for linux In-Reply-To: <20220201230414.4144930-6-giulio.benetti@benettiengineering.com> References: <20220201230414.4144930-1-giulio.benetti@benettiengineering.com> <20220201230414.4144930-6-giulio.benetti@benettiengineering.com> Message-ID: <20220206115006.4619d1fc@windsurf> On Wed, 2 Feb 2022 00:04:13 +0100 Giulio Benetti wrote: > Fixes: > https://gitlab.com/ymorin/buildroot/-/jobs/2035821098 > > Signed-off-by: Giulio Benetti > --- > V1->V2: > * add host openssl linux > --- > configs/microchip_sama7g5ek_mmc_defconfig | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/configs/microchip_sama7g5ek_mmc_defconfig b/configs/microchip_sama7g5ek_mmc_defconfig > index b1cd193829..df48c0880b 100644 > --- a/configs/microchip_sama7g5ek_mmc_defconfig > +++ b/configs/microchip_sama7g5ek_mmc_defconfig > @@ -1,12 +1,14 @@ > BR2_arm=y > BR2_cortex_a7=y > BR2_ARM_FPU_NEON_VFPV4=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y This will continue to break: the big problem in this defconfig is that the kernel version is not defined as a fixed version. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 6 10:50:41 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 11:50:41 +0100 Subject: [Buildroot] [PATCH v2 6/6] configs/microchip_sama7g5ek_mmc_dev_defconfig: add missing BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15 and host openssl for linux In-Reply-To: <20220201230414.4144930-7-giulio.benetti@benettiengineering.com> References: <20220201230414.4144930-1-giulio.benetti@benettiengineering.com> <20220201230414.4144930-7-giulio.benetti@benettiengineering.com> Message-ID: <20220206115041.58101a3a@windsurf> On Wed, 2 Feb 2022 00:04:14 +0100 Giulio Benetti wrote: > Fixes: > https://gitlab.com/ymorin/buildroot/-/jobs/2035821100 > > Signed-off-by: Giulio Benetti > --- > V1->V2: > * add host openssl linux > --- > configs/microchip_sama7g5ek_mmc_dev_defconfig | 2 ++ > 1 file changed, 2 insertions(+) Same problem as PATCH 5/6: the kernel version should be defined as a fixed version. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 6 10:51:20 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 11:51:20 +0100 Subject: [Buildroot] [git commit] configs/beaglev: linux needs host openssl Message-ID: <20220206104417.8A4D282BBB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a8c0a1c6a0a771eab65f27fc4ed3f76c43334ef8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: https://gitlab.com/ymorin/buildroot/-/jobs/2035820979 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- configs/beaglev_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/beaglev_defconfig b/configs/beaglev_defconfig index 70459bf3e8..79af8c2ece 100644 --- a/configs/beaglev_defconfig +++ b/configs/beaglev_defconfig @@ -16,6 +16,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="starlight" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="starfive/jh7100-beaglev-starlight" 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_TAR is not set From thomas.petazzoni at bootlin.com Sun Feb 6 10:51:25 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 11:51:25 +0100 Subject: [Buildroot] [git commit] configs/microchip_sama5d2_icp_mmc_dev: linux needs host openssl Message-ID: <20220206104417.9A5B582B9A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e3375bfdb2ee26d30019bee66e6d4f21fe8801de branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: https://gitlab.com/ymorin/buildroot/-/jobs/2035821096 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- 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..27d1d3409d 100644 --- a/configs/microchip_sama5d2_icp_mmc_dev_defconfig +++ b/configs/microchip_sama5d2_icp_mmc_dev_defconfig @@ -16,6 +16,7 @@ BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,li BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d2_icp" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_LINUX_TOOLS_IIO=y BR2_PACKAGE_BZIP2=y BR2_PACKAGE_XZ=y From thomas.petazzoni at bootlin.com Sun Feb 6 10:51:22 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 11:51:22 +0100 Subject: [Buildroot] [git commit] configs/microchip_sama5d2_icp_mmc: linux needs host openssl Message-ID: <20220206104417.91F0782BBF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2a35673c80cc64eed9e06b0fe4cb579ae70abcfd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: https://gitlab.com/ymorin/buildroot/-/jobs/2035821094 Signed-off-by: Giulio Benetti Reviewed-by: Michael Trimarchi Signed-off-by: Thomas Petazzoni --- 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..27ea4970f1 100644 --- a/configs/microchip_sama5d2_icp_mmc_defconfig +++ b/configs/microchip_sama5d2_icp_mmc_defconfig @@ -12,6 +12,7 @@ BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,li BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d2_icp" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" From thomas.petazzoni at bootlin.com Sun Feb 6 10:51:17 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 11:51:17 +0100 Subject: [Buildroot] [git commit] configs/bananapi_m2_ultra: u-boot needs host python3 and host openssl Message-ID: <20220206104417.81ED182B9A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=490438f437b2a603204aa6ae9cbf3875c262f976 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: https://gitlab.com/ymorin/buildroot/-/jobs/2035820967 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- configs/bananapi_m2_ultra_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/bananapi_m2_ultra_defconfig b/configs/bananapi_m2_ultra_defconfig index 67ecec424c..2ec0e60e8d 100644 --- a/configs/bananapi_m2_ultra_defconfig +++ b/configs/bananapi_m2_ultra_defconfig @@ -19,7 +19,9 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="bananapi_m2_berry" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" BR2_PACKAGE_HOST_DOSFSTOOLS=y From thomas.petazzoni at bootlin.com Sun Feb 6 10:51:56 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 11:51:56 +0100 Subject: [Buildroot] [PATCH v2 0/6] Fix gitlab CI build failure due to missing HOST_ dependencies In-Reply-To: <20220201230414.4144930-1-giulio.benetti@benettiengineering.com> References: <20220201230414.4144930-1-giulio.benetti@benettiengineering.com> Message-ID: <20220206115156.6042cc1b@windsurf> On Wed, 2 Feb 2022 00:04:08 +0100 Giulio Benetti wrote: > configs/bananapi_m2_ultra_defconfig: u-boot needs host python3 and > host openssl > configs/beaglev_defconfig: linux needs host openssl > configs/microchip_sama5d2_icp_mmc_defconfig: linux needs host openssl > configs/microchip_sama5d2_icp_mmc_dev_defconfig: linux needs host > openssl These four are applied. > configs/microchip_sama7g5ek_mmc_defconfig: add missing > BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15 and host openssl for > linux > configs/microchip_sama7g5ek_mmc_dev_defconfig: add missing > BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15 and host openssl for > linux These two have issues, marked 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 Sun Feb 6 10:52:58 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 11:52:58 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: add guile and bdwgc packages to Pedro Aguilar Message-ID: <20220206104547.A013182984@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=437543c7d907943a159870a4b04efa88e36cc460 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Pedro Aguilar Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index a1ec9a091e..c52cb35b60 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2198,6 +2198,8 @@ F: package/lightning/ F: package/umtprd/ N: Pedro Aguilar +F: package/bdwgc/ +F: package/guile/ F: package/libunistring/ N: Peter Korsgaard From thomas.petazzoni at bootlin.com Sun Feb 6 10:54:09 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 11:54:09 +0100 Subject: [Buildroot] [PATCH v1] DEVELOPERS: Add packages guile and bdwgc to Pedro Aguilar In-Reply-To: <20220206092048.1901703-1-paguilar@paguilar.org> References: <20220206092048.1901703-1-paguilar@paguilar.org> Message-ID: <20220206115409.1f1174ee@windsurf> On Sun, 6 Feb 2022 10:20:48 +0100 Pedro Aguilar wrote: > Signed-off-by: Pedro Aguilar > --- > DEVELOPERS | 2 ++ > 1 file changed, 2 insertions(+) Applied to master after fixing the patch to sort package entries alphabetically. Thanks a lot for volunteering to look after those packages! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From arnout at mind.be Sun Feb 6 10:55:16 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 6 Feb 2022 11:55:16 +0100 Subject: [Buildroot] [PATCHv2] package/glibc: allow runing on kernels older than used for the headers In-Reply-To: <19291_1643809720_61FA8BB8_19291_487_24_41ca9ce22939ce2ed0c41973db7d612542850824.1643809712.git.yann.morin@orange.com> References: <19291_1643809720_61FA8BB8_19291_487_24_41ca9ce22939ce2ed0c41973db7d612542850824.1643809712.git.yann.morin@orange.com> Message-ID: <5f1e37b9-7346-2031-60bf-fa96d9a6e72d@mind.be> On 02/02/2022 14:48, yann.morin at orange.com wrote: > From: "Yann E. MORIN" > > Currently, we configure glibc to not add compatibility support for > kernels older than the one used for the headers. This is on the > expectation that the system will never run on a kernel that is older > than the one used for the headers or, when Buildroot builds the kernel, > on another, older kernel. > > However, in some situations, it is possible to build for a generic > system, where the kernel may be a different version. This can be the > case, for example, when Building an image that is to be used in a > container that can run on a range of machines each with different kernel > versions. In such a case, it is interesting to build glibc in a way as > to take better advantage of the newer kernels, and thus using newer > kernel headers, while still allowing running on older kernels, and thus > carrying more compatibility code. > > We add an option to glibc to allow the user to enable compatibility > shims. To simplify the case, when that option is enabled, we just let > glibc enable as old compatibility shims as supported by the current > architecture. > > The code size increase is very small. For an ARM Cortex-A7, with > gcc-10.3.0, the delta is as follows (other files installed by glibc had > no size delta; sizes in bytes): > file | no compat | compat | delta > ----------------------+-----------+-----------+------- > ld-linux-armhf.so.3 | 200216 | 200284 | + 68 > libc.so.6 | 1814496 | 1823120 | +8624 > ------+------- > Total | +8692 > > No runtime overhead has been measured; the overhead is most probably > in the measurement noise. Indeed, the compatibility shims are very > lightweight. For example, there are 9 arch-generic shims: > renameat2(), execveat(), mlock2(), statx(), faccessat2(), > close_range(), time64-related syscall shenanigans, a waitid() > feature, and a futex operation (LOCK_PI2) > and then each arch may define a few others. i386 has less than 20 > (mostly related to socket options, and one for the ordering of the > clone() arguments), while ARM seems to have only two (mlock2() and a > configurable futex feature). > > Note: however, as Arnout pointed out, some programs may still actually > fail to run even with such compatibility shim, if they really expect the > shimed syscalls to really exist and have no fallback (and/or no proper > error-handling). Still, in the vast majority of cases, those > compatibility shims are enough to have a system running. > > Signed-off-by: Yann E. MORIN > Cc: Alexey Brodkin > Cc: Arnout Vandecappelle Applied to master, thanks. Regards, Arnout > > --- > Changes v1 -> v2: > - don't let user provide a version, enable all compat shims (Arnout, > Alexey) > - add size measurements and explanations about no runtime overhead > measurements (Arnout) > --- > package/glibc/Config.in | 12 ++++++++++++ > package/glibc/glibc.mk | 8 ++++++-- > 2 files changed, 18 insertions(+), 2 deletions(-) > > diff --git a/package/glibc/Config.in b/package/glibc/Config.in > index 5ecd058145..8e9ddac7d9 100644 > --- a/package/glibc/Config.in > +++ b/package/glibc/Config.in > @@ -10,6 +10,18 @@ config BR2_PACKAGE_GLIBC > help > https://www.gnu.org/software/libc/ > > +config BR2_PACKAGE_GLIBC_KERNEL_COMPAT > + bool "Enable compatibiltiy shims to run on older kernels" > + help > + Say 'y' here if you plan on running your system on a kernel > + older than the version used for the toolchain headers. > + > + Enabling those compatibility shims may generate a slightly > + bigger and slightly slower glibc library. > + > + The oldest supported kernel version depends on the > + architecture. > + > config BR2_PACKAGE_GLIBC_UTILS > bool "Install glibc utilities" > help > diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk > index 5c26b0e6df..9ea9f27a2f 100644 > --- a/package/glibc/glibc.mk > +++ b/package/glibc/glibc.mk > @@ -98,6 +98,10 @@ endif > GLIBC_MAKE = $(BR2_MAKE) > GLIBC_CONF_ENV += ac_cv_prog_MAKE="$(BR2_MAKE)" > > +ifeq ($(BR2_PACKAGE_GLIBC_KERNEL_COMPAT),) > +GLIBC_CONF_OPTS += --enable-kernel=$(call qstrip,$(BR2_TOOLCHAIN_HEADERS_AT_LEAST)) > +endif > + > # Even though we use the autotools-package infrastructure, we have to > # override the default configure commands for several reasons: > # > @@ -128,8 +132,8 @@ define GLIBC_CONFIGURE_CMDS > --disable-profile \ > --disable-werror \ > --without-gd \ > - --enable-kernel=$(call qstrip,$(BR2_TOOLCHAIN_HEADERS_AT_LEAST)) \ > - --with-headers=$(STAGING_DIR)/usr/include) > + --with-headers=$(STAGING_DIR)/usr/include \ > + $(GLIBC_CONF_OPTS)) > $(GLIBC_ADD_MISSING_STUB_H) > endef > From arnout at mind.be Sun Feb 6 10:55:31 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 6 Feb 2022 11:55:31 +0100 Subject: [Buildroot] [git commit] package/glibc: allow runing on kernels older than used for the headers Message-ID: <20220206104826.7668281DF5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=525ffc2bb17fa11fc128124d2d3a92d8698eaab8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Currently, we configure glibc to not add compatibility support for kernels older than the one used for the headers. This is on the expectation that the system will never run on a kernel that is older than the one used for the headers or, when Buildroot builds the kernel, on another, older kernel. However, in some situations, it is possible to build for a generic system, where the kernel may be a different version. This can be the case, for example, when Building an image that is to be used in a container that can run on a range of machines each with different kernel versions. In such a case, it is interesting to build glibc in a way as to take better advantage of the newer kernels, and thus using newer kernel headers, while still allowing running on older kernels, and thus carrying more compatibility code. We add an option to glibc to allow the user to enable compatibility shims. To simplify the case, when that option is enabled, we just let glibc enable as old compatibility shims as supported by the current architecture. The code size increase is very small. For an ARM Cortex-A7, with gcc-10.3.0, the delta is as follows (other files installed by glibc had no size delta; sizes in bytes): file | no compat | compat | delta ----------------------+-----------+-----------+------- ld-linux-armhf.so.3 | 200216 | 200284 | + 68 libc.so.6 | 1814496 | 1823120 | +8624 ------+------- Total | +8692 No runtime overhead has been measured; the overhead is most probably in the measurement noise. Indeed, the compatibility shims are very lightweight. For example, there are 9 arch-generic shims: renameat2(), execveat(), mlock2(), statx(), faccessat2(), close_range(), time64-related syscall shenanigans, a waitid() feature, and a futex operation (LOCK_PI2) and then each arch may define a few others. i386 has less than 20 (mostly related to socket options, and one for the ordering of the clone() arguments), while ARM seems to have only two (mlock2() and a configurable futex feature). Note: however, as Arnout pointed out, some programs may still actually fail to run even with such compatibility shim, if they really expect the shimed syscalls to really exist and have no fallback (and/or no proper error-handling). Still, in the vast majority of cases, those compatibility shims are enough to have a system running. Signed-off-by: Yann E. MORIN Cc: Alexey Brodkin Cc: Arnout Vandecappelle Tested-by: Alexey Brodkin Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/glibc/Config.in | 12 ++++++++++++ package/glibc/glibc.mk | 8 ++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/package/glibc/Config.in b/package/glibc/Config.in index 5ecd058145..8e9ddac7d9 100644 --- a/package/glibc/Config.in +++ b/package/glibc/Config.in @@ -10,6 +10,18 @@ config BR2_PACKAGE_GLIBC help https://www.gnu.org/software/libc/ +config BR2_PACKAGE_GLIBC_KERNEL_COMPAT + bool "Enable compatibiltiy shims to run on older kernels" + help + Say 'y' here if you plan on running your system on a kernel + older than the version used for the toolchain headers. + + Enabling those compatibility shims may generate a slightly + bigger and slightly slower glibc library. + + The oldest supported kernel version depends on the + architecture. + config BR2_PACKAGE_GLIBC_UTILS bool "Install glibc utilities" help diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index 9b591aa2a3..2702994c6b 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -98,6 +98,10 @@ endif GLIBC_MAKE = $(BR2_MAKE) GLIBC_CONF_ENV += ac_cv_prog_MAKE="$(BR2_MAKE)" +ifeq ($(BR2_PACKAGE_GLIBC_KERNEL_COMPAT),) +GLIBC_CONF_OPTS += --enable-kernel=$(call qstrip,$(BR2_TOOLCHAIN_HEADERS_AT_LEAST)) +endif + # Even though we use the autotools-package infrastructure, we have to # override the default configure commands for several reasons: # @@ -128,8 +132,8 @@ define GLIBC_CONFIGURE_CMDS --disable-profile \ --disable-werror \ --without-gd \ - --enable-kernel=$(call qstrip,$(BR2_TOOLCHAIN_HEADERS_AT_LEAST)) \ - --with-headers=$(STAGING_DIR)/usr/include) + --with-headers=$(STAGING_DIR)/usr/include \ + $(GLIBC_CONF_OPTS)) $(GLIBC_ADD_MISSING_STUB_H) endef From thomas.petazzoni at bootlin.com Sun Feb 6 10:58:14 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 11:58:14 +0100 Subject: [Buildroot] [PATCH] toolchain: update gcc bug 99410 In-Reply-To: <20220206090809.1532589-1-giulio.benetti@benettiengineering.com> References: <20220206090809.1532589-1-giulio.benetti@benettiengineering.com> Message-ID: <20220206115814.3fe54f1e@windsurf> On Sun, 6 Feb 2022 10:08:09 +0100 Giulio Benetti wrote: > Gcc bug 99410 reappeared in gcc 10.x while building belle-sip, but it's > fixed on gcc 11.x, so let's update bug conditions. > > Fixes: > http://autobuild.buildroot.net/results/846597f3573d3b0d52e80627a9577d14b9348547/ > > Signed-off-by: Giulio Benetti > --- > toolchain/Config.in | 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 Feb 6 10:58:38 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 11:58:38 +0100 Subject: [Buildroot] [git commit] toolchain: update gcc bug 99410 Message-ID: <20220206105128.7BA0581DF5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=88f79aead8fa750bc0e93ef8798751a4b463e9d9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Gcc bug 99410 reappeared in gcc 10.x while building belle-sip, but it's fixed on gcc 11.x, so let's update bug conditions. Fixes: http://autobuild.buildroot.net/results/846597f3573d3b0d52e80627a9577d14b9348547/ Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- toolchain/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/toolchain/Config.in b/toolchain/Config.in index adc93ab725..53d2046379 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -185,11 +185,11 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_93847 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=99410 # Error: branch offset out of range on Nios II. This bug # no longer exists in gcc 8.x but reappeared on gcc 9.x and has been -# fixed on gcc 10.x. +# fixed on gcc 11.x. config BR2_TOOLCHAIN_HAS_GCC_BUG_99140 bool default y if !BR2_TOOLCHAIN_GCC_AT_LEAST_8 - default y if BR2_TOOLCHAIN_GCC_AT_LEAST_9 && !BR2_TOOLCHAIN_GCC_AT_LEAST_10 + default y if BR2_TOOLCHAIN_GCC_AT_LEAST_10 && !BR2_TOOLCHAIN_GCC_AT_LEAST_11 depends on BR2_nios2 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101737 From arnout at mind.be Sun Feb 6 11:05:42 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 6 Feb 2022 12:05:42 +0100 Subject: [Buildroot] [PATCH 2/2] package/avahi: add pygobject support, move to python3 In-Reply-To: <20220206094504.11415-2-peter@korsgaard.com> References: <20220206094504.11415-1-peter@korsgaard.com> <20220206094504.11415-2-peter@korsgaard.com> Message-ID: <89d065e4-5745-8b6a-4aed-d03b26c112f2@mind.be> On 06/02/2022 10:45, Peter Korsgaard wrote: > The python support in avahi needs pygobjet to do anything: > > Building avahi-python: no (You need python, pygobject and python-dbus!) So, doesn't that mean that... > > So add optional support for it. Python-gobject is only available for > python3, so change the python logic to use python 3. > > Signed-off-by: Peter Korsgaard > --- > package/avahi/avahi.mk | 22 ++++++++++++++-------- > 1 file changed, 14 insertions(+), 8 deletions(-) > > diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk > index 04c4164af6..1992669a92 100644 > --- a/package/avahi/avahi.mk > +++ b/package/avahi/avahi.mk > @@ -40,7 +40,6 @@ AVAHI_CONF_OPTS = \ > --disable-gtk \ > --disable-gtk3 \ > --disable-gdbm \ > - --disable-pygobject \ > --disable-mono \ > --disable-monodoc \ > --disable-stack-protector \ > @@ -104,16 +103,16 @@ else > AVAHI_CONF_OPTS += --disable-glib --disable-gobject > endif > > -ifeq ($(BR2_PACKAGE_PYTHON),y) > +ifeq ($(BR2_PACKAGE_PYTHON3),y) ... this condition should be ifeq ($(BR2_PACKAGE_PYTHON_GOBJECT)$(BR2_PACKAGE_PYTHON_DBUS_NEXT),yy) (python3 is implied by python-gobject). If what I'm saying is true, then actually I'd go a bit further than that and add select BR2_PACKAGE_PYTHON_DBUS_NEXT if BR2_PACKAGE_PYTHON_GOBJECT to Config.in. Automatically selecting python-gobject would go a little too far since it depends on gobject-introspection and we really don't want to enable that beast unless it's really needed... Regards, Arnout > AVAHI_CONF_ENV += \ > - am_cv_pathless_PYTHON=python \ > - am_cv_python_version=$(PYTHON_VERSION) \ > - am_cv_python_platform=linux2 \ > - am_cv_python_pythondir=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \ > - am_cv_python_pyexecdir=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \ > + am_cv_pathless_PYTHON=python3 \ > + am_cv_python_version=$(PYTHON3_VERSION) \ > + am_cv_python_platform=linux5 \ > + am_cv_python_pythondir=/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > + am_cv_python_pyexecdir=/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > py_cv_mod_socket_=yes > > -AVAHI_DEPENDENCIES += python > +AVAHI_DEPENDENCIES += python3 > AVAHI_CONF_OPTS += --enable-python > else > AVAHI_CONF_OPTS += --disable-python > @@ -127,6 +126,13 @@ else > AVAHI_CONF_OPTS += --disable-python-dbus > endif > > +ifeq ($(BR2_PACKAGE_PYTHON_GOBJECT),y) > +AVAHI_CONF_OPTS += --enable-pygobject > +AVAHI_DEPENDENCIES += python-gobject > +else > +AVAHI_CONF_OPTS += --disable-pygobject > +endif > + > AVAHI_CONF_ENV += CFLAGS="$(AVAHI_CFLAGS)" > > AVAHI_MAKE_OPTS += LIBS=$(TARGET_NLS_LIBS) From arnout at mind.be Sun Feb 6 11:07:38 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 6 Feb 2022 12:07:38 +0100 Subject: [Buildroot] [PATCH 2/2] package/avahi: add pygobject support, move to python3 In-Reply-To: <89d065e4-5745-8b6a-4aed-d03b26c112f2@mind.be> References: <20220206094504.11415-1-peter@korsgaard.com> <20220206094504.11415-2-peter@korsgaard.com> <89d065e4-5745-8b6a-4aed-d03b26c112f2@mind.be> Message-ID: On 06/02/2022 12:05, Arnout Vandecappelle wrote: > > > On 06/02/2022 10:45, Peter Korsgaard wrote: >> The python support in avahi needs pygobjet to do anything: >> >> Building avahi-python:????????????? no?? (You need python, pygobject and >> python-dbus!) > > ?So, doesn't that mean that... > >> >> So add optional support for it.? Python-gobject is only available for >> python3, so change the python logic to use python 3. >> >> Signed-off-by: Peter Korsgaard >> --- >> ? package/avahi/avahi.mk | 22 ++++++++++++++-------- >> ? 1 file changed, 14 insertions(+), 8 deletions(-) >> >> diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk >> index 04c4164af6..1992669a92 100644 >> --- a/package/avahi/avahi.mk >> +++ b/package/avahi/avahi.mk >> @@ -40,7 +40,6 @@ AVAHI_CONF_OPTS = \ >> ????? --disable-gtk \ >> ????? --disable-gtk3 \ >> ????? --disable-gdbm \ >> -??? --disable-pygobject \ >> ????? --disable-mono \ >> ????? --disable-monodoc \ >> ????? --disable-stack-protector \ >> @@ -104,16 +103,16 @@ else >> ? AVAHI_CONF_OPTS += --disable-glib --disable-gobject >> ? endif >> ? -ifeq ($(BR2_PACKAGE_PYTHON),y) >> +ifeq ($(BR2_PACKAGE_PYTHON3),y) > > ... this condition should be > > ifeq ($(BR2_PACKAGE_PYTHON_GOBJECT)$(BR2_PACKAGE_PYTHON_DBUS_NEXT),yy) > > (python3 is implied by python-gobject). > > ?If what I'm saying is true, then actually I'd go a bit further than that and add > > ????select BR2_PACKAGE_PYTHON_DBUS_NEXT if BR2_PACKAGE_PYTHON_GOBJECT ?Actually, we could make it ??? select BR2_PACKAGE_PYTHON_GOBJECT if BR2_PACKAGE_PYTHON3 && BR2_PACKAGE_GOBJECT_INTROSPECTION ??? select BR2_PACKAGE_PYTHON_DBUS_NEXT if BR2_PACKAGE_PYTHON3 && BR2_PACKAGE_GOBJECT_INTROSPECTION (with probably some comment to explain why the weird dependencies) ?Regards, ?Arnout > > to Config.in. Automatically selecting python-gobject would go a little too far > since it depends on gobject-introspection and we really don't want to enable > that beast unless it's really needed... > > ?Regards, > ?Arnout > >> ? AVAHI_CONF_ENV += \ >> -??? am_cv_pathless_PYTHON=python \ >> -??? am_cv_python_version=$(PYTHON_VERSION) \ >> -??? am_cv_python_platform=linux2 \ >> - am_cv_python_pythondir=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \ >> - am_cv_python_pyexecdir=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \ >> +??? am_cv_pathless_PYTHON=python3 \ >> +??? am_cv_python_version=$(PYTHON3_VERSION) \ >> +??? am_cv_python_platform=linux5 \ >> + am_cv_python_pythondir=/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ >> + am_cv_python_pyexecdir=/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ >> ????? py_cv_mod_socket_=yes >> ? -AVAHI_DEPENDENCIES += python >> +AVAHI_DEPENDENCIES += python3 >> ? AVAHI_CONF_OPTS += --enable-python >> ? else >> ? AVAHI_CONF_OPTS += --disable-python >> @@ -127,6 +126,13 @@ else >> ? AVAHI_CONF_OPTS += --disable-python-dbus >> ? endif >> ? +ifeq ($(BR2_PACKAGE_PYTHON_GOBJECT),y) >> +AVAHI_CONF_OPTS += --enable-pygobject >> +AVAHI_DEPENDENCIES += python-gobject >> +else >> +AVAHI_CONF_OPTS += --disable-pygobject >> +endif >> + >> ? AVAHI_CONF_ENV += CFLAGS="$(AVAHI_CFLAGS)" >> ? ? AVAHI_MAKE_OPTS += LIBS=$(TARGET_NLS_LIBS) From arnout at mind.be Sun Feb 6 11:14:06 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 6 Feb 2022 12:14:06 +0100 Subject: [Buildroot] [PATCH] toolchain: update gcc bug 99410 In-Reply-To: <20220206090809.1532589-1-giulio.benetti@benettiengineering.com> References: <20220206090809.1532589-1-giulio.benetti@benettiengineering.com> Message-ID: On 06/02/2022 10:08, Giulio Benetti wrote: > Gcc bug 99410 reappeared in gcc 10.x while building belle-sip, but it's > fixed on gcc 11.x, so let's update bug conditions. > > Fixes: > http://autobuild.buildroot.net/results/846597f3573d3b0d52e80627a9577d14b9348547/ > > Signed-off-by: Giulio Benetti > --- > toolchain/Config.in | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/toolchain/Config.in b/toolchain/Config.in > index ccdf62503d..aed8f393a3 100644 > --- a/toolchain/Config.in > +++ b/toolchain/Config.in > @@ -185,11 +185,11 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_93847 > # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=99410 > # Error: branch offset out of range on Nios II. This bug > # no longer exists in gcc 8.x but reappeared on gcc 9.x and has been If this statement is true... > -# fixed on gcc 10.x. > +# fixed on gcc 11.x. > config BR2_TOOLCHAIN_HAS_GCC_BUG_99140 > bool > default y if !BR2_TOOLCHAIN_GCC_AT_LEAST_8 > - default y if BR2_TOOLCHAIN_GCC_AT_LEAST_9 && !BR2_TOOLCHAIN_GCC_AT_LEAST_10 > + default y if BR2_TOOLCHAIN_GCC_AT_LEAST_10 && !BR2_TOOLCHAIN_GCC_AT_LEAST_11 ... then this should be default y if BR2_TOOLCHAIN_GCC_AT_LEAST_9 && !BR2_TOOLCHAIN_GCC_AT_LEAST_11 We don't have a nios2 GCC9 toolchain in the autobuilders so we'll never notice, of course. Regards, Arnout > depends on BR2_nios2 > > # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101737 From peter at korsgaard.com Sun Feb 6 11:17:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 06 Feb 2022 12:17:08 +0100 Subject: [Buildroot] [PATCH 2/2] package/avahi: add pygobject support, move to python3 In-Reply-To: <89d065e4-5745-8b6a-4aed-d03b26c112f2@mind.be> (Arnout Vandecappelle's message of "Sun, 6 Feb 2022 12:05:42 +0100") References: <20220206094504.11415-1-peter@korsgaard.com> <20220206094504.11415-2-peter@korsgaard.com> <89d065e4-5745-8b6a-4aed-d03b26c112f2@mind.be> Message-ID: <87pmo0qm6j.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle writes: > On 06/02/2022 10:45, Peter Korsgaard wrote: >> The python support in avahi needs pygobjet to do anything: >> >> Building avahi-python: no (You need python, pygobject and python-dbus!) > So, doesn't that mean that... >> -ifeq ($(BR2_PACKAGE_PYTHON),y) >> +ifeq ($(BR2_PACKAGE_PYTHON3),y) > ... this condition should be > ifeq ($(BR2_PACKAGE_PYTHON_GOBJECT)$(BR2_PACKAGE_PYTHON_DBUS_NEXT),yy) > (python3 is implied by python-gobject). Well, it could - But there is no harm in passing --enable-python without dbus/gobject, it will just not do anything. Notice that it is dbus-python, not python-dbus-next. -- Bye, Peter Korsgaard From giulio.benetti at benettiengineering.com Sun Feb 6 11:26:18 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 12:26:18 +0100 Subject: [Buildroot] [PATCH v3 0/2] Fix gitlab CI build failure due to missing HOST_ dependencies In-Reply-To: <20220206115156.6042cc1b@windsurf> References: <20220206115156.6042cc1b@windsurf> Message-ID: <20220206112620.1637342-1-giulio.benetti@benettiengineering.com> This patchset fixes the gitlab build failure due to HOST_ dependencies(uboot/linux). V1->V2: * add missing host openssl for linux on microchip_sama7g5ek_mmc_defconfig/_dev_defconfig V2->V3: * add specific custom linux version as suggested by Thomas Giulio Benetti (2): configs/microchip_sama7g5ek_mmc_defconfig: set custom linux version to 5.15.21 and add host openssl for linux configs/microchip_sama7g5ek_mmc_dev_defconfig: set custom linux version to 5.15.21 and add host openssl for linux configs/microchip_sama7g5ek_mmc_defconfig | 4 ++++ configs/microchip_sama7g5ek_mmc_dev_defconfig | 4 ++++ 2 files changed, 8 insertions(+) -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 6 11:26:19 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 12:26:19 +0100 Subject: [Buildroot] [PATCH v3 1/2] configs/microchip_sama7g5ek_mmc_defconfig: set custom linux version to 5.15.21 and add host openssl for linux In-Reply-To: <20220206112620.1637342-1-giulio.benetti@benettiengineering.com> References: <20220206115156.6042cc1b@windsurf> <20220206112620.1637342-1-giulio.benetti@benettiengineering.com> Message-ID: <20220206112620.1637342-2-giulio.benetti@benettiengineering.com> Fixes: https://gitlab.com/ymorin/buildroot/-/jobs/2035821098 Signed-off-by: Giulio Benetti --- V1->V2: * add host openssl linux V2->V3: * set custom linux version as suggested by Thomas --- configs/microchip_sama7g5ek_mmc_defconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configs/microchip_sama7g5ek_mmc_defconfig b/configs/microchip_sama7g5ek_mmc_defconfig index b1cd193829..7ab81d1dd0 100644 --- a/configs/microchip_sama7g5ek_mmc_defconfig +++ b/configs/microchip_sama7g5ek_mmc_defconfig @@ -1,12 +1,16 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/microchip/sama7g5ek/genimage.cfg" BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.21" BR2_LINUX_KERNEL_DEFCONFIG="sama7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama7g5ek" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 6 11:26:20 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 12:26:20 +0100 Subject: [Buildroot] [PATCH v3 2/2] configs/microchip_sama7g5ek_mmc_dev_defconfig: set custom linux version to 5.15.21 and add host openssl for linux In-Reply-To: <20220206112620.1637342-1-giulio.benetti@benettiengineering.com> References: <20220206115156.6042cc1b@windsurf> <20220206112620.1637342-1-giulio.benetti@benettiengineering.com> Message-ID: <20220206112620.1637342-3-giulio.benetti@benettiengineering.com> Fixes: https://gitlab.com/ymorin/buildroot/-/jobs/2035821100 Signed-off-by: Giulio Benetti --- V1->V2: * add host openssl linux V2->V3: * set custom linux version as suggested by Thomas --- configs/microchip_sama7g5ek_mmc_dev_defconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configs/microchip_sama7g5ek_mmc_dev_defconfig b/configs/microchip_sama7g5ek_mmc_dev_defconfig index 3253bce401..c11ea2f518 100644 --- a/configs/microchip_sama7g5ek_mmc_dev_defconfig +++ b/configs/microchip_sama7g5ek_mmc_dev_defconfig @@ -1,6 +1,7 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_TOOLCHAIN_BUILDROOT_WCHAR=y BR2_PTHREAD_DEBUG=y BR2_TOOLCHAIN_BUILDROOT_CXX=y @@ -8,9 +9,12 @@ BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/microchip/sama7g5ek/genimage.cfg" BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.21" BR2_LINUX_KERNEL_DEFCONFIG="sama7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama7g5ek" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_LINUX_TOOLS_IIO=y BR2_PACKAGE_BZIP2=y BR2_PACKAGE_XZ=y -- 2.25.1 From arnout at mind.be Sun Feb 6 11:31:57 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 6 Feb 2022 12:31:57 +0100 Subject: [Buildroot] I have a problem adding new package In-Reply-To: References: <20220130234800.14da56ca@windsurf> Message-ID: Hi Arek, Please don't top-post, but reply inline like I do below. On 04/02/2022 11:22, Arek Marud wrote: > Helo Thomas, > > Thank you for your answer. > I had a problem with libonvif compilation. Compiler complaing about > unsafe include path (details pasted below). > > I was able to compile project ONLY when --includedir parameter was set, > without it - compiler complains about include path. > > https://gist.github.com/arekmd/11e9621ae3fc476cf37e80150d15b177 > > I pasted build log without LIBONVIF_CONF_OPTS line. > > > myname buildroot$> make libonvif-build > WARNING: no hash file for v1.1.1.tar.gz >>>> libonvif 1.1.1 Extracting [snip] > make[3]: Entering directory '/home/myname/workbench/resources/development/myproj/bu > ildroot/buildroot/output/build/libonvif-1.1.1/build' > /bin/sh ../libtool --tag=CC --mode=compile /home/myname/workbench/resources/dev > elopment/myproj/buildroot/buildroot/output/host/bin/aarch64-myproj-linux-gnu-gcc - > DHAVE_CONFIG_H -I. -I.. -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFS > ET_BITS=64 -I/usr/include -I/usr/include/libxml2 -I../source -D_LARGEFILE_SOURCE ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ This is what is wrong. It is caused by the following lines in build/Makefile.am [1] AM_CFLAGS = -I$(INCLUDE) -I$(INCLUDE)/libxml2 -I../source ... INCLUDE = @includedir@ LIB = @libdir@ That is just simply wrong. The proper fix is to patch the project and - Remove the -I stuff from AM_CFLAGS, instead just set AM_CFLAGS = -I../source - Remove the INCLUDE and LIB assignments - Do proper discovery of libxml2 in configure.ac - Add the libxml2 include and lib directories to CFLAGS and LIBS either in configure.ac or in build/Makefile.am But it seems that this project is pretty dead, so the easier approach is to just add LIBONVIF_MAKE_OPTS = \ INCLUDE=$(STAGING_DIR)/usr/include \ LIBS=$(STAGING_DIR)/usr/lib Regards, Arnout [1] https://github.com/sr99622/libonvif/blob/76961fb9f3ece462724a4a6c09b4bd7cc051b759/build/Makefile.am#L7 From giulio.benetti at benettiengineering.com Sun Feb 6 11:33:02 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 12:33:02 +0100 Subject: [Buildroot] [PATCH] toolchain: update gcc bug 99410 In-Reply-To: References: <20220206090809.1532589-1-giulio.benetti@benettiengineering.com> Message-ID: <578d1d13-7b6c-6c99-098c-a831800fd492@benettiengineering.com> Hi Arnout, On 06/02/22 12:14, Arnout Vandecappelle wrote: > > > On 06/02/2022 10:08, Giulio Benetti wrote: >> Gcc bug 99410 reappeared in gcc 10.x while building belle-sip, but it's >> fixed on gcc 11.x, so let's update bug conditions. >> >> Fixes: >> http://autobuild.buildroot.net/results/846597f3573d3b0d52e80627a9577d14b9348547/ >> >> Signed-off-by: Giulio Benetti >> --- >> toolchain/Config.in | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/toolchain/Config.in b/toolchain/Config.in >> index ccdf62503d..aed8f393a3 100644 >> --- a/toolchain/Config.in >> +++ b/toolchain/Config.in >> @@ -185,11 +185,11 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_93847 >> # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=99410 >> # Error: branch offset out of range on Nios II. This bug >> # no longer exists in gcc 8.x but reappeared on gcc 9.x and has been > > If this statement is true... > >> -# fixed on gcc 10.x. >> +# fixed on gcc 11.x. >> config BR2_TOOLCHAIN_HAS_GCC_BUG_99140 >> bool >> default y if !BR2_TOOLCHAIN_GCC_AT_LEAST_8 >> - default y if BR2_TOOLCHAIN_GCC_AT_LEAST_9 && !BR2_TOOLCHAIN_GCC_AT_LEAST_10 >> + default y if BR2_TOOLCHAIN_GCC_AT_LEAST_10 && !BR2_TOOLCHAIN_GCC_AT_LEAST_11 > > ... then this should be > > default y if BR2_TOOLCHAIN_GCC_AT_LEAST_9 && !BR2_TOOLCHAIN_GCC_AT_LEAST_11 but it's all negative options, so I thought I needed AT_LEAST_10 to cover gcc 10.x as having the bug. But it's not needed. So I only need to modify from !BR2_TOOLCHAIN_GCC_AT_LEAST_10 to !BR2_TOOLCHAIN_GCC_AT_LEAST_11 and that's it. So I send a V2 for this. > We don't have a nios2 GCC9 toolchain in the autobuilders so we'll never > notice, of course. I've tested it locally with buildroot built toolchain. Thank you! Best regards -- Giulio Benetti Benetti Engineering sas > Regards, > Arnout > >> depends on BR2_nios2 >> >> # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101737 > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From giulio.benetti at benettiengineering.com Sun Feb 6 11:34:12 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 12:34:12 +0100 Subject: [Buildroot] [PATCH] toolchain: update gcc bug 99410 In-Reply-To: <578d1d13-7b6c-6c99-098c-a831800fd492@benettiengineering.com> References: <20220206090809.1532589-1-giulio.benetti@benettiengineering.com> <578d1d13-7b6c-6c99-098c-a831800fd492@benettiengineering.com> Message-ID: <2fec6210-3811-197d-45a7-1ece869f49e0@benettiengineering.com> On 06/02/22 12:33, Giulio Benetti wrote: > Hi Arnout, > > On 06/02/22 12:14, Arnout Vandecappelle wrote: >> >> >> On 06/02/2022 10:08, Giulio Benetti wrote: >>> Gcc bug 99410 reappeared in gcc 10.x while building belle-sip, but it's >>> fixed on gcc 11.x, so let's update bug conditions. >>> >>> Fixes: >>> http://autobuild.buildroot.net/results/846597f3573d3b0d52e80627a9577d14b9348547/ >>> >>> Signed-off-by: Giulio Benetti >>> --- >>> toolchain/Config.in | 4 ++-- >>> 1 file changed, 2 insertions(+), 2 deletions(-) >>> >>> diff --git a/toolchain/Config.in b/toolchain/Config.in >>> index ccdf62503d..aed8f393a3 100644 >>> --- a/toolchain/Config.in >>> +++ b/toolchain/Config.in >>> @@ -185,11 +185,11 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_93847 >>> # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=99410 >>> # Error: branch offset out of range on Nios II. This bug >>> # no longer exists in gcc 8.x but reappeared on gcc 9.x and has been >> >> If this statement is true... >> >>> -# fixed on gcc 10.x. >>> +# fixed on gcc 11.x. >>> config BR2_TOOLCHAIN_HAS_GCC_BUG_99140 >>> bool >>> default y if !BR2_TOOLCHAIN_GCC_AT_LEAST_8 >>> - default y if BR2_TOOLCHAIN_GCC_AT_LEAST_9 && !BR2_TOOLCHAIN_GCC_AT_LEAST_10 >>> + default y if BR2_TOOLCHAIN_GCC_AT_LEAST_10 && !BR2_TOOLCHAIN_GCC_AT_LEAST_11 >> >> ... then this should be >> >> default y if BR2_TOOLCHAIN_GCC_AT_LEAST_9 && !BR2_TOOLCHAIN_GCC_AT_LEAST_11 > > but it's all negative options, so I thought I needed AT_LEAST_10 to > cover gcc 10.x as having the bug. But it's not needed. So I only need to > modify from !BR2_TOOLCHAIN_GCC_AT_LEAST_10 to > !BR2_TOOLCHAIN_GCC_AT_LEAST_11 and that's it. > > So I send a V2 for this. Not V2, I need a new one to fix it since it's already been applied. I send it now >> We don't have a nios2 GCC9 toolchain in the autobuilders so we'll never >> notice, of course. > > I've tested it locally with buildroot built toolchain. > > Thank you! > > Best regards -- Giulio Benetti Benetti Engineering sas From arnout at mind.be Sun Feb 6 11:49:36 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 6 Feb 2022 12:49:36 +0100 Subject: [Buildroot] Getting Buildroot-created binaries to work with the Intel (TI) Puma 5 ARM-based CPU? In-Reply-To: References: Message-ID: <53fa9f43-8aa2-4820-70e9-365e22b3408c@mind.be> On 04/02/2022 17:55, Dan Jackson wrote: > Hello everyone, > > I am new to Buildroot, so I hope you will forgive me if I make any obvious mistakes or omissions in my email. > > I hope this mailing list is the correct place to post my query, normally I would ask on forums or in Github issues, but Buildroot seems not to have a forum and its Github explicitly says not to post queries in the issues there. > > I have been experimenting with an old router, which uses an Intel Puma 5 ARM-based CPU (it's my understanding that Intel bought this design from Texas Instruments). ... And last year they sold that division to MaxLinear, so it's no longer Intel, actually :-) > At the moment I am not looking to replace the whole operating system, initially I would just like to build some binaries (such as dropbear for example) to make the exploration process easier. This may not work out so well, it's often easier to just build an entire system. The kernel can be tricky though (since it's probably not running an upstream kernel, and it may be hard to find the vendor kernel). But building a complete userspace is definitely a feasible option. Though it may be tricky to be able to boot that userspace and still go back in case it fails. What could work is to build a chroot environment to do some experiments. > The original software on the device was built with an ancient version of Buildroot - a config file can be seen in the /etc folder - and many of the options specified no longer exist in current Buildroot versions or relate to proprietary software components for which source code is not available. It's way more likely that it's actually built with OpenWrt (they sometimes call their build system "buildroot" even though there's not much of a relation between the two projects). Not that that will help you much, because the considerations are still the same. Theoretically, you can demand from whoever gave/sold you the device to give you the sources for both the kernel and for OpenWrt or Buildroot. In practice, that is probably going to be a bit tricky to achieve. Still, it may help to point a request to the router vendor. Luckily... > There are two other Puma 5 toolchains I have come across on the Internet, and both of these are also based on old Buildroot versions, but also patch these with a number of things, such as compiler command line switches and options file tweaks. It's very unlikely that you need any particular options to build userspace - you may need them to build a userspace that is compatible with what is already installed on the system, but not to build a complete userspace. The only issue then is to find out which architecture options you need to enable. > > Unfortunately, the older Buildroot versions do not seem to function properly on modern Linux installations. > > So, I was wondering what would need to be done to enable creation of Puma 5 compatible binaries using the current stable version of Buildroot? > > Links to the two toolchains I mentioned: > https://github.com/bmaia/cross-utils/tree/master/armeb/puma5_toolchain (uses Buildroot 2009.02) This one uses BR2_armeb=y BR2_arm1176jz_s=y BR2_ARM_EABI=y It's not clear if there's an FPU, so use soft float. That should be enough to build a toolchain and userspace with current Buildroot. Regards, Arnout > https://sourceforge.net/projects/dg3270.arris/files/DG3270_9.1.103FB/ (uses Buildroot 2013.08.1) > > Thanks, > Dan Jackson. > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From leo at yuriev.ru Sun Feb 6 12:13:35 2022 From: leo at yuriev.ru (=?UTF-8?q?=D0=9B=D0=B5=D0=BE=D0=BD=D0=B8=D0=B4=20=D0=AE=D1=80=D1=8C=D0=B5=D0=B2=20=28Leonid=20Yuriev=29?=) Date: Sun, 6 Feb 2022 15:13:35 +0300 Subject: [Buildroot] [PATCH] package/libmdbx: bump version to 0.11.4 Message-ID: <20220206121337.1491403-1-leo@yuriev.ru> This is stable bugfix release of libmdbx. So it is reasonable to backport this patch to all applicable releases/branches of buildroot. Please refer to the ChangeLog for more historical information and actual TODOs. https://github.com/erthink/libmdbx/blob/master/ChangeLog.md Release notes: https://github.com/erthink/libmdbx/releases/tag/v0.11.4 Signed-off-by: ?????? ????? (Leonid Yuriev) --- package/libmdbx/libmdbx.hash | 2 +- package/libmdbx/libmdbx.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libmdbx/libmdbx.hash b/package/libmdbx/libmdbx.hash index c8b50f9ac3..2483d14dd1 100644 --- a/package/libmdbx/libmdbx.hash +++ b/package/libmdbx/libmdbx.hash @@ -1,5 +1,5 @@ # Hashes from: https://github.com/erthink/libmdbx/releases/ -sha256 f954ba8c9768914a92c2b46aac0d66bec674dbb4d7b0f01e362ea2921746ddaa libmdbx-amalgamated-0.11.1.tar.gz +sha256 884de528f5c2abab2187b7c4c84b769d2551e1a748cbfdf0ae4c0f5c9f8dbd27 libmdbx-amalgamated-0.11.4.tar.gz # Locally calculated sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE diff --git a/package/libmdbx/libmdbx.mk b/package/libmdbx/libmdbx.mk index 02d00b1a5a..1aff8fbb4d 100644 --- a/package/libmdbx/libmdbx.mk +++ b/package/libmdbx/libmdbx.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMDBX_VERSION = 0.11.1 +LIBMDBX_VERSION = 0.11.4 LIBMDBX_SOURCE = libmdbx-amalgamated-$(LIBMDBX_VERSION).tar.gz LIBMDBX_SITE = https://github.com/erthink/libmdbx/releases/download/v$(LIBMDBX_VERSION) LIBMDBX_SUPPORTS_IN_SOURCE_BUILD = NO -- 2.35.1 From peter at korsgaard.com Sun Feb 6 12:16:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 13:16:51 +0100 Subject: [Buildroot] [PATCH] package/libpwquality: support python bindings with python3 Message-ID: <20220206121652.30854-1-peter@korsgaard.com> The python bindings support python3 as well, so enable it if python3 is enabled. Signed-off-by: Peter Korsgaard --- package/libpwquality/libpwquality.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libpwquality/libpwquality.mk b/package/libpwquality/libpwquality.mk index 7c0c5df38e..54a03be453 100644 --- a/package/libpwquality/libpwquality.mk +++ b/package/libpwquality/libpwquality.mk @@ -12,9 +12,9 @@ LIBPWQUALITY_INSTALL_STAGING = YES LIBPWQUALITY_DEPENDENCIES = cracklib LIBPWQUALITY_LICENSE_FILES = COPYING -ifeq ($(BR2_PACKAGE_PYTHON),y) +ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) LIBPWQUALITY_CONF_OPTS += --enable-python-bindings -LIBPWQUALITY_DEPENDENCIES += python +LIBPWQUALITY_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON3),python3,python) LIBPWQUALITY_MAKE_ENV += $(PKG_PYTHON_DISTUTILS_ENV) else LIBPWQUALITY_CONF_OPTS += --disable-python-bindings -- 2.20.1 From thomas.petazzoni at bootlin.com Sun Feb 6 12:16:56 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 13:16:56 +0100 Subject: [Buildroot] [PATCH v3 1/2] configs/microchip_sama7g5ek_mmc_defconfig: set custom linux version to 5.15.21 and add host openssl for linux In-Reply-To: <20220206112620.1637342-2-giulio.benetti@benettiengineering.com> References: <20220206115156.6042cc1b@windsurf> <20220206112620.1637342-1-giulio.benetti@benettiengineering.com> <20220206112620.1637342-2-giulio.benetti@benettiengineering.com> Message-ID: <20220206131656.16e2c8a6@windsurf> On Sun, 6 Feb 2022 12:26:19 +0100 Giulio Benetti wrote: > Fixes: > https://gitlab.com/ymorin/buildroot/-/jobs/2035821098 > > Signed-off-by: Giulio Benetti Did you actually test on HW that 5.15.21 was working? Shouldn't this be done by the original submitter of the defconfig. Eugen, Ludovic? Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From petr.vorel at gmail.com Sun Feb 6 12:30:50 2022 From: petr.vorel at gmail.com (Petr Vorel) Date: Sun, 6 Feb 2022 13:30:50 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/ltp-testsuite: bump version to 20220121 In-Reply-To: References: <20220126235652.25712-1-petr.vorel@gmail.com> Message-ID: Hi Arnout, > On 27/01/2022 00:56, 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). > Since it apparently wasn't clear enough (cfr. Baruch's comment), I've tried > to explain a bit better. Hopefully it indeed is better :-) Thanks a lot! Kind regards, Petr > Applied to master, thanks. > Regards, > Arnout From peter at korsgaard.com Sun Feb 6 13:17:57 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 14:17:57 +0100 Subject: [Buildroot] [PATCH] package/nfs-utils: nfsiostat used python3, not python2 Message-ID: <20220206131758.28001-1-peter@korsgaard.com> nfsiostat is a python3 script, so keep it if python3 is enabled and not python2: head -n 1 target/usr/sbin/nfsiostat #!/usr/bin/python3 Signed-off-by: Peter Korsgaard --- package/nfs-utils/nfs-utils.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk index 6a3a801359..44653e2707 100644 --- a/package/nfs-utils/nfs-utils.mk +++ b/package/nfs-utils/nfs-utils.mk @@ -114,7 +114,7 @@ define NFS_UTILS_REMOVE_NFSIOSTAT endef # nfsiostat is interpreted python, so remove it unless it's in the target -NFS_UTILS_POST_INSTALL_TARGET_HOOKS += $(if $(BR2_PACKAGE_PYTHON),,NFS_UTILS_REMOVE_NFSIOSTAT) +NFS_UTILS_POST_INSTALL_TARGET_HOOKS += $(if $(BR2_PACKAGE_PYTHON3),,NFS_UTILS_REMOVE_NFSIOSTAT) define HOST_NFS_UTILS_BUILD_CMDS $(MAKE) -C $(@D)/tools/rpcgen -- 2.20.1 From peter at korsgaard.com Sun Feb 6 13:32:41 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 06 Feb 2022 14:32:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/sdl2_ttf: bump version to 2.0.18 In-Reply-To: <20220206055330.11218-1-peter.macleod.thompson@gmail.com> (Peter Thompson's message of "Sat, 5 Feb 2022 22:53:30 -0700") References: <20220206055330.11218-1-peter.macleod.thompson@gmail.com> Message-ID: <87k0e8xgqu.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Thompson writes: > From: PeterThompson > Signed-off-by: PeterThompson NIT: You have a space missing before Thompson. You updated the hash of the license file but didn't explain why. Committed with that fixed, thanks. > --- > package/sdl2_ttf/sdl2_ttf.hash | 4 ++-- > package/sdl2_ttf/sdl2_ttf.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > diff --git a/package/sdl2_ttf/sdl2_ttf.hash b/package/sdl2_ttf/sdl2_ttf.hash > index 16459e4a59..a490b002b6 100644 > --- a/package/sdl2_ttf/sdl2_ttf.hash > +++ b/package/sdl2_ttf/sdl2_ttf.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 a9eceb1ad88c1f1545cd7bd28e7cbc0b2c14191d40238f531a15b01b1b22cd33 SDL2_ttf-2.0.15.tar.gz > -sha256 f6370809c9f644760920d9945c5be07aed17664975f2e4741013d4d9a2ec696f COPYING.txt > +sha256 7234eb8883514e019e7747c703e4a774575b18d435c22a4a29d068cb768a2251 SDL2_ttf-2.0.18.tar.gz > +sha256 e211dfe7e2c36e64048be886fe3f2bbba8732ce4dd77b596a355d3abbec775a4 COPYING.txt > diff --git a/package/sdl2_ttf/sdl2_ttf.mk b/package/sdl2_ttf/sdl2_ttf.mk > index 326cb99366..1fe7c0a075 100644 > --- a/package/sdl2_ttf/sdl2_ttf.mk > +++ b/package/sdl2_ttf/sdl2_ttf.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > -SDL2_TTF_VERSION = 2.0.15 > +SDL2_TTF_VERSION = 2.0.18 > SDL2_TTF_SOURCE = SDL2_ttf-$(SDL2_TTF_VERSION).tar.gz > SDL2_TTF_SITE = http://www.libsdl.org/projects/SDL_ttf/release > SDL2_TTF_LICENSE = Zlib > -- > 2.20.1 > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 6 13:30:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 14:30:38 +0100 Subject: [Buildroot] [git commit] package/sdl2_ttf: bump version to 2.0.18 Message-ID: <20220206132613.4355D82582@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f4da031a77f200515bcc5b2e0fe665a7b4f2a780 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update the license hash because of a change in copyright year: - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga Signed-off-by: Peter Thompson Signed-off-by: Peter Korsgaard --- package/sdl2_ttf/sdl2_ttf.hash | 4 ++-- package/sdl2_ttf/sdl2_ttf.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sdl2_ttf/sdl2_ttf.hash b/package/sdl2_ttf/sdl2_ttf.hash index 16459e4a59..a490b002b6 100644 --- a/package/sdl2_ttf/sdl2_ttf.hash +++ b/package/sdl2_ttf/sdl2_ttf.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a9eceb1ad88c1f1545cd7bd28e7cbc0b2c14191d40238f531a15b01b1b22cd33 SDL2_ttf-2.0.15.tar.gz -sha256 f6370809c9f644760920d9945c5be07aed17664975f2e4741013d4d9a2ec696f COPYING.txt +sha256 7234eb8883514e019e7747c703e4a774575b18d435c22a4a29d068cb768a2251 SDL2_ttf-2.0.18.tar.gz +sha256 e211dfe7e2c36e64048be886fe3f2bbba8732ce4dd77b596a355d3abbec775a4 COPYING.txt diff --git a/package/sdl2_ttf/sdl2_ttf.mk b/package/sdl2_ttf/sdl2_ttf.mk index 326cb99366..1fe7c0a075 100644 --- a/package/sdl2_ttf/sdl2_ttf.mk +++ b/package/sdl2_ttf/sdl2_ttf.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_TTF_VERSION = 2.0.15 +SDL2_TTF_VERSION = 2.0.18 SDL2_TTF_SOURCE = SDL2_ttf-$(SDL2_TTF_VERSION).tar.gz SDL2_TTF_SITE = http://www.libsdl.org/projects/SDL_ttf/release SDL2_TTF_LICENSE = Zlib From peter at korsgaard.com Sun Feb 6 13:35:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 06 Feb 2022 14:35:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/pipewire: bump to version 0.3.45 In-Reply-To: <20220206003746.1772081-1-james.hilliard1@gmail.com> (James Hilliard's message of "Sat, 5 Feb 2022 17:37:46 -0700") References: <20220206003746.1772081-1-james.hilliard1@gmail.com> Message-ID: <87fsowxgmu.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Drop patch that is now upstream. > Set new x11 and libcanberra meson config options. > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 6 13:33:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 14:33:58 +0100 Subject: [Buildroot] [git commit] package/pipewire: bump to version 0.3.45 Message-ID: <20220206132801.092ED81970@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e6a2903946b9083ec764e7e4619abb93951f3c4f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patch that is now upstream. Set new x11 and libcanberra meson config options. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- ...spa-meson.build-add-atomic_dep-dependency.patch | 40 ---------------------- package/pipewire/pipewire.hash | 2 +- package/pipewire/pipewire.mk | 10 +++++- 3 files changed, 10 insertions(+), 42 deletions(-) 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 deleted file mode 100644 index b91adbe7e4..0000000000 --- a/package/pipewire/0001-spa-meson.build-add-atomic_dep-dependency.patch +++ /dev/null @@ -1,40 +0,0 @@ -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 - diff --git a/package/pipewire/pipewire.hash b/package/pipewire/pipewire.hash index 8464a56338..a9d59663ae 100644 --- a/package/pipewire/pipewire.hash +++ b/package/pipewire/pipewire.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 2e91f228ffb93494f2423956b930014de20e15639a03f3df4fca4ebf4bc51fc0 pipewire-0.3.43.tar.bz2 +sha256 76291373f7ab271664df5b6a22b678ad57e485e25c73ee9c78e049a67b7886d2 pipewire-0.3.45.tar.bz2 sha256 8909c319a7e27dbb33a15b9035f89ab3b7b2f6a12f8bcddc755206a8db1ada44 COPYING sha256 be4be5d77424833edf31f53fc1f1cecb6996b9e2d747d9e6fb8f878362ebc92b LICENSE diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index b05ce2bcc2..fc521c86ac 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -4,7 +4,7 @@ # ################################################################################ -PIPEWIRE_VERSION = 0.3.43 +PIPEWIRE_VERSION = 0.3.45 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) @@ -29,6 +29,7 @@ PIPEWIRE_CONF_OPTS += \ -Dvideotestsrc=enabled \ -Dvolume=enabled \ -Dsession-managers=[] \ + -Dlibcanberra=disabled \ -Dlv2=disabled ifeq ($(BR2_PACKAGE_DBUS),y) @@ -128,6 +129,13 @@ else PIPEWIRE_CONF_OPTS += -Dlibcamera=disabled endif +ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y) +PIPEWIRE_CONF_OPTS += -Dx11=enabled +PIPEWIRE_DEPENDENCIES += xlib_libX11 +else +PIPEWIRE_CONF_OPTS += -Dx11=disabled +endif + ifeq ($(BR2_PACKAGE_LIBUSB),y) PIPEWIRE_CONF_OPTS += -Dlibusb=enabled PIPEWIRE_DEPENDENCIES += libusb From peter at korsgaard.com Sun Feb 6 13:38:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 06 Feb 2022 14:38:28 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi-pvr-stalker: bump version to 19.0.2-Matrix In-Reply-To: <20220205181536.2110535-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sat, 5 Feb 2022 19:15:36 +0100") References: <20220205181536.2110535-1-bernd.kuhls@t-online.de> Message-ID: <87bkzkxgh7.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 6 13:37:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 14:37:55 +0100 Subject: [Buildroot] [git commit] package/kodi-pvr-stalker: bump version to 19.0.2-Matrix Message-ID: <20220206133117.9307482BC7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fa1114224d357c221c87d4f2f90c050ff83e08b4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- 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 90e74d451a..2eae79d371 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 84a92c298ddda8d72072aafe2a62c5c6b48b60b3b85408ce7ca4f96e42965541 kodi-pvr-stalker-19.0.1-Matrix.tar.gz +sha256 ca472c4f43f77d7badca3fbe174f5877e6b3ff63407da09f690d8146ec737b59 kodi-pvr-stalker-19.0.2-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 a0d5f4356d..efa293a40d 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.1-Matrix +KODI_PVR_STALKER_VERSION = 19.0.2-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 peter at korsgaard.com Sun Feb 6 13:47:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 06 Feb 2022 14:47:08 +0100 Subject: [Buildroot] [PATCH v2] package/at: bump version to 3.2.4 In-Reply-To: <20220201223204.3796621-1-giulio.benetti@benettiengineering.com> (Giulio Benetti's message of "Tue, 1 Feb 2022 23:32:04 +0100") References: <3b46e3fd-6fa1-eac5-bd28-f726f23a921c@benettiengineering.com> <20220201223204.3796621-1-giulio.benetti@benettiengineering.com> Message-ID: <877da8xg2r.fsf@dell.be.48ers.dk> >>>>> "Giulio" == Giulio Benetti writes: > All local patches except on have been upstreamed, so let's remove them and > rename/rebase the remaining one. > Signed-off-by: Giulio Benetti > --- > V1-> V2: suggested by Peter > * removed useless lines from local patch > * remove AT_AUTORECONF = y since it's not needed anymore Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 6 13:44:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 14:44:33 +0100 Subject: [Buildroot] [git commit] package/at: bump version to 3.2.4 Message-ID: <20220206134000.88C6282931@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=edd57e0db8d5adbce36692400889373e67f6f7a6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master All local patches except on have been upstreamed, so let's remove them and rename/rebase the remaining one. Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- ...fix-make-install-for-non-root-don-t-stri.patch} | 9 +- ...0001-Makefile.in-replace-IROOT-by-DESTDIR.patch | 113 --------------------- ...fix-getloadavg.c-compilation-revert-to-3..patch | 39 ------- .../0004-Makefile-fix-parallel-build-failure.patch | 41 -------- package/at/at.hash | 2 +- package/at/at.mk | 3 +- 6 files changed, 7 insertions(+), 200 deletions(-) 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 96% 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..91e9738358 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 77b28c32ebfed0eb130a0acdb2acb7206f2b9530 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,17 @@ 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(-) diff --git a/Makefile.in b/Makefile.in -index a7197f2..0b35a67 100644 +index 4ae194f..af82e4c 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -99,43 +99,42 @@ atrun: atrun.in +@@ -102,43 +102,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..26c44f5287 100644 --- a/package/at/at.mk +++ b/package/at/at.mk @@ -4,10 +4,9 @@ # ################################################################################ -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 AT_DEPENDENCIES = $(if $(BR2_PACKAGE_FLEX),flex) host-bison host-flex AT_LICENSE = GPL-2.0+, GPL-3.0+, ISC AT_LICENSE_FILES = Copyright COPYING From peter at korsgaard.com Sun Feb 6 13:54:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 06 Feb 2022 14:54:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/libopenh264: bump to version 2.2.0 In-Reply-To: <20220206101433.862930-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 6 Feb 2022 11:14:33 +0100") References: <20220206101433.862930-1-fontaine.fabrice@gmail.com> Message-ID: <8735kwxfr8.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Drop patches (already in version) > https://github.com/cisco/openh264/releases/tag/v2.2.0 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 6 13:54:57 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 06 Feb 2022 14:54:57 +0100 Subject: [Buildroot] [PATCH] package/libmdbx: bump version to 0.11.4 In-Reply-To: <20220206121337.1491403-1-leo@yuriev.ru> (=?utf-8?B?ItCb0LU=?= =?utf-8?B?0L7QvdC40LQg0K7RgNGM0LXQsg==?= (Leonid Yuriev)"'s message of "Sun, 6 Feb 2022 15:13:35 +0300") References: <20220206121337.1491403-1-leo@yuriev.ru> Message-ID: <87y22ow15a.fsf@dell.be.48ers.dk> >>>>> "??????" == ?????? ????? (Leonid Yuriev) writes: > This is stable bugfix release of libmdbx. So it is reasonable to backport > this patch to all applicable releases/branches of buildroot. > Please refer to the ChangeLog for more historical information and actual TODOs. > https://github.com/erthink/libmdbx/blob/master/ChangeLog.md > Release notes: https://github.com/erthink/libmdbx/releases/tag/v0.11.4 > Signed-off-by: ?????? ????? (Leonid Yuriev) Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 6 13:53:59 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 14:53:59 +0100 Subject: [Buildroot] [git commit] package/libmdbx: bump version to 0.11.4 Message-ID: <20220206134759.5975182BCD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e0d3799b5554e6479404a255861e512cacfd88af branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This is stable bugfix release of libmdbx. So it is reasonable to backport this patch to all applicable releases/branches of buildroot. Please refer to the ChangeLog for more historical information and actual TODOs. https://github.com/erthink/libmdbx/blob/master/ChangeLog.md Release notes: https://github.com/erthink/libmdbx/releases/tag/v0.11.4 Signed-off-by: ???????????? ?????????? (Leonid Yuriev) Signed-off-by: Peter Korsgaard --- package/libmdbx/libmdbx.hash | 2 +- package/libmdbx/libmdbx.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libmdbx/libmdbx.hash b/package/libmdbx/libmdbx.hash index c8b50f9ac3..2483d14dd1 100644 --- a/package/libmdbx/libmdbx.hash +++ b/package/libmdbx/libmdbx.hash @@ -1,5 +1,5 @@ # Hashes from: https://github.com/erthink/libmdbx/releases/ -sha256 f954ba8c9768914a92c2b46aac0d66bec674dbb4d7b0f01e362ea2921746ddaa libmdbx-amalgamated-0.11.1.tar.gz +sha256 884de528f5c2abab2187b7c4c84b769d2551e1a748cbfdf0ae4c0f5c9f8dbd27 libmdbx-amalgamated-0.11.4.tar.gz # Locally calculated sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE diff --git a/package/libmdbx/libmdbx.mk b/package/libmdbx/libmdbx.mk index 02d00b1a5a..1aff8fbb4d 100644 --- a/package/libmdbx/libmdbx.mk +++ b/package/libmdbx/libmdbx.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMDBX_VERSION = 0.11.1 +LIBMDBX_VERSION = 0.11.4 LIBMDBX_SOURCE = libmdbx-amalgamated-$(LIBMDBX_VERSION).tar.gz LIBMDBX_SITE = https://github.com/erthink/libmdbx/releases/download/v$(LIBMDBX_VERSION) LIBMDBX_SUPPORTS_IN_SOURCE_BUILD = NO From peter at korsgaard.com Sun Feb 6 13:53:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 14:53:49 +0100 Subject: [Buildroot] [git commit] package/libopenh264: bump to version 2.2.0 Message-ID: <20220206134759.5168982BC7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=76b5cb700410878e52f9366428402b8b6b4fcf86 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patches (already in version) https://github.com/cisco/openh264/releases/tag/v2.2.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .../0001-Add-USE_STACK_PROTECTOR-option.patch | 100 --------------------- package/libopenh264/0002-fix-mips-build.patch | 73 --------------- ...common-inc-asmdefs_mmi.h-fix-mips32-build.patch | 89 ------------------ package/libopenh264/libopenh264.hash | 2 +- package/libopenh264/libopenh264.mk | 2 +- 5 files changed, 2 insertions(+), 264 deletions(-) diff --git a/package/libopenh264/0001-Add-USE_STACK_PROTECTOR-option.patch b/package/libopenh264/0001-Add-USE_STACK_PROTECTOR-option.patch deleted file mode 100644 index 3758cd668b..0000000000 --- a/package/libopenh264/0001-Add-USE_STACK_PROTECTOR-option.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 1e7435751c055723b7103dd1d5bb68530e1a2678 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 8 Oct 2019 20:18:18 +0200 -Subject: [PATCH] Add USE_STACK_PROTECTOR option - --fstack-protector-all is not supported on all linux toolchains so add an -option to disable it (and enable it by default to keep current behavior) - -Fixes: - - http://autobuild.buildroot.org/results/377818cf8c1f2632cabdccb32bf4e7f06c0fdbbd - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/cisco/openh264/pull/3175] ---- - Makefile | 1 + - build/platform-android.mk | 5 ++++- - build/platform-bsd.mk | 5 ++++- - build/platform-darwin.mk | 5 ++++- - build/platform-linux.mk | 5 ++++- - 5 files changed, 17 insertions(+), 4 deletions(-) - -diff --git a/Makefile b/Makefile -index 74ff029d..c2061f6a 100644 ---- a/Makefile -+++ b/Makefile -@@ -34,6 +34,7 @@ GTEST_VER=release-1.8.1 - CCASFLAGS=$(CFLAGS) - STATIC_LDFLAGS=-lstdc++ - STRIP ?= strip -+USE_STACK_PROTECTOR = Yes - - SHAREDLIB_MAJORVERSION=5 - FULL_VERSION := 2.0.0 -diff --git a/build/platform-android.mk b/build/platform-android.mk -index 6f6ce347..06534301 100644 ---- a/build/platform-android.mk -+++ b/build/platform-android.mk -@@ -44,7 +44,10 @@ SYSROOT = $(NDKROOT)/platforms/android-$(NDKLEVEL)/arch-$(ARCH) - CXX = $(TOOLCHAINPREFIX)g++ - CC = $(TOOLCHAINPREFIX)gcc - AR = $(TOOLCHAINPREFIX)ar --CFLAGS += -DANDROID_NDK -fpic --sysroot=$(SYSROOT) -MMD -MP -fstack-protector-all -+CFLAGS += -DANDROID_NDK -fpic --sysroot=$(SYSROOT) -MMD -MP -+ifeq ($(USE_STACK_PROTECTOR), Yes) -+CFLAGS +=-fstack-protector-all -+endif - CFLAGS += -isystem $(NDKROOT)/sysroot/usr/include -isystem $(NDKROOT)/sysroot/usr/include/$(TOOLCHAIN_NAME) -D__ANDROID_API__=$(NDKLEVEL) - CXXFLAGS += -fno-rtti -fno-exceptions - LDFLAGS += --sysroot=$(SYSROOT) -diff --git a/build/platform-bsd.mk b/build/platform-bsd.mk -index e60d2cc0..2e0bf2cc 100644 ---- a/build/platform-bsd.mk -+++ b/build/platform-bsd.mk -@@ -3,7 +3,10 @@ SHAREDLIBSUFFIX = so - SHAREDLIBSUFFIXFULLVER=$(SHAREDLIBSUFFIX).$(FULL_VERSION) - SHAREDLIBSUFFIXMAJORVER=$(SHAREDLIBSUFFIX).$(SHAREDLIB_MAJORVERSION) - SHLDFLAGS = -Wl,-soname,$(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXMAJORVER) --CFLAGS += -fPIC -fstack-protector-all -+CFLAGS += -fPIC -+ifeq ($(USE_STACK_PROTECTOR), Yes) -+CFLAGS += -fstack-protector-all -+endif - LDFLAGS += -lpthread - STATIC_LDFLAGS += -lpthread -lm - ifeq ($(ASM_ARCH), x86) -diff --git a/build/platform-darwin.mk b/build/platform-darwin.mk -index 6c7b2443..718c8e2f 100644 ---- a/build/platform-darwin.mk -+++ b/build/platform-darwin.mk -@@ -10,7 +10,10 @@ SHLDFLAGS = -dynamiclib -twolevel_namespace -undefined dynamic_lookup \ - $(SHAREDLIB_DIR)/$(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXMAJORVER) - SHARED = -dynamiclib - SHARED += -current_version $(CURRENT_VERSION) -compatibility_version $(COMPATIBILITY_VERSION) --CFLAGS += -Wall -fPIC -MMD -MP -fstack-protector-all -+CFLAGS += -Wall -fPIC -MMD -MP -+ifeq ($(USE_STACK_PROTECTOR), Yes) -+CFLAGS += -fstack-protector-all -+endif - ifeq ($(ASM_ARCH), x86) - ASMFLAGS += -DPREFIX - ifeq ($(ARCH), x86_64) -diff --git a/build/platform-linux.mk b/build/platform-linux.mk -index 44fe2424..b5c006b2 100644 ---- a/build/platform-linux.mk -+++ b/build/platform-linux.mk -@@ -3,7 +3,10 @@ SHAREDLIBSUFFIX = so - SHAREDLIBSUFFIXFULLVER=$(SHAREDLIBSUFFIX).$(FULL_VERSION) - SHAREDLIBSUFFIXMAJORVER=$(SHAREDLIBSUFFIX).$(SHAREDLIB_MAJORVERSION) - SHLDFLAGS = -Wl,-soname,$(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXMAJORVER) --CFLAGS += -Wall -fno-strict-aliasing -fPIC -MMD -MP -fstack-protector-all -+CFLAGS += -Wall -fno-strict-aliasing -fPIC -MMD -MP -+ifeq ($(USE_STACK_PROTECTOR), Yes) -+CFLAGS += -fstack-protector-all -+endif - LDFLAGS += -lpthread - STATIC_LDFLAGS += -lpthread -lm - AR_OPTS = crD $@ --- -2.23.0 - diff --git a/package/libopenh264/0002-fix-mips-build.patch b/package/libopenh264/0002-fix-mips-build.patch deleted file mode 100644 index c4927d567b..0000000000 --- a/package/libopenh264/0002-fix-mips-build.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 9d5981eecde2133b9d6099eb99f96b1c29c3e520 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Mon, 13 Apr 2020 12:03:01 +0200 -Subject: [PATCH] fix mips build - -In total three PR were sent upstream to fix mips builds: -https://github.com/cisco/openh264/pull/3185 -https://github.com/cisco/openh264/pull/3217 -https://github.com/cisco/openh264/pull/3225 - -Buildroot used the first version -https://git.buildroot.net/buildroot/commit/package/libopenh264?id=e8d0df569e1844f7ba28918a53ee38027b325b8f -downloaded from https://github.com/cisco/openh264/pull/3185 - -During discussion the gcc option '-march=loongson3a' was changed to -'-Wa,-mloongson-mmi,-mloongson-ext': -https://github.com/cisco/openh264/pull/3185#discussion_r337818960 - -This causes build errors with gcc version 8.3.0 (Buildroot 2020.02) - -tmp/cctgEQaw.s:662: Error: opcode not supported on this processor: loongson3a (mips64r2) `bc .L22' -/tmp/cctgEQaw.s:1679: Error: opcode not supported on this processor: loongson3a (mips64r2) `bc .L27' -/tmp/cctgEQaw.s:2218: Error: opcode not supported on this processor: loongson3a (mips64r2) `jrc $31' - -This patch partly reverts the change to fix mips build. - -$ /home/bernd/buildroot/br5/output/host/bin/mips64el-linux-gcc -v - -Using built-in specs. -COLLECT_GCC=/home/bernd/buildroot/br5/output/host/opt/ext-toolchain/bin/mips64el-linux-gcc.br_real -COLLECT_LTO_WRAPPER=/home/bernd/buildroot/br5/output/host/opt/ext-toolchain/bin/../libexec/gcc/mips64el-buildroot-linux-gnu/8.3.0/lto-wrapper -Target: mips64el-buildroot-linux-gnu -Configured with: ./configure --prefix=/opt/br-mips64r6-n64-el-hf-2020.02 --sysconfdir=/opt/br-mips64r6-n64-el-hf-2020.02/etc --enable-static --target=mips64el-buildroot-linux-gnu --with-sysroot=/opt/br-mips64r6-n64-el-hf-2020.02/mips64el-buildroot-linux-gnu/sysroot --enable-__cxa_atexit --with-gnu-ld --disable-libssp --disable-multilib --disable-decimal-float --with-gmp=/opt/br-mips64r6-n64-el-hf-2020.02 --with-mpc=/opt/br-mips64r6-n64-el-hf-2020.02 --with-mpfr=/opt/br-mips64r6-n64-el-hf-2020.02 --with-pkgversion='Buildroot 2020.02' --with-bugurl=http://bugs.buildroot.net/ --disable-libquadmath --enable-tls --enable-threads --without-isl --without-cloog --with-arch=mips64r6 --with-abi=64 --with-nan=2008 --enable-languages=c,c++ --with-build-time-tools=/opt/br-mips64r6-n64-el-hf-2020.02/mips64el-buildroot-linux-gnu/bin --enable-shared --disable-libgomp -Thread model: posix -gcc version 8.3.0 (Buildroot 2020.02) - -Patch sent upstream: https://github.com/cisco/openh264/pull/3267 - -Signed-off-by: Bernd Kuhls ---- - build/arch.mk | 2 +- - build/mips-simd-check.sh | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/build/arch.mk b/build/arch.mk -index 1bf318ab..c6570ed4 100644 ---- a/build/arch.mk -+++ b/build/arch.mk -@@ -41,7 +41,7 @@ ASMFLAGS += -I$(SRC_PATH)codec/common/mips/ - ifeq ($(ENABLE_MMI), Yes) - ENABLE_MMI = $(shell $(SRC_PATH)build/mips-simd-check.sh $(CC) mmi) - ifeq ($(ENABLE_MMI), Yes) --CFLAGS += -DHAVE_MMI -Wa,-mloongson-mmi,-mloongson-ext -+CFLAGS += -DHAVE_MMI -march=loongson3a - endif - endif - #msa -diff --git a/build/mips-simd-check.sh b/build/mips-simd-check.sh -index 5efffbef..d0d72f9e 100755 ---- a/build/mips-simd-check.sh -+++ b/build/mips-simd-check.sh -@@ -15,7 +15,7 @@ TMPO=$(mktemp tmp.XXXXXX.o) - if [ $2 == "mmi" ] - then - echo "void main(void){ __asm__ volatile(\"punpcklhw \$f0, \$f0, \$f0\"); }" > $TMPC -- $1 -Wa,-mloongson-mmi $TMPC -o $TMPO &> /dev/null -+ $1 -march=loongson3a $TMPC -o $TMPO &> /dev/null - if test -s $TMPO - then - echo "Yes" --- -2.25.0 - diff --git a/package/libopenh264/0003-codec-common-inc-asmdefs_mmi.h-fix-mips32-build.patch b/package/libopenh264/0003-codec-common-inc-asmdefs_mmi.h-fix-mips32-build.patch deleted file mode 100644 index e11b1d13ef..0000000000 --- a/package/libopenh264/0003-codec-common-inc-asmdefs_mmi.h-fix-mips32-build.patch +++ /dev/null @@ -1,89 +0,0 @@ -From c505f81e336088b6729a5407a03459f488353288 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 24 May 2021 22:54:01 +0200 -Subject: [PATCH] codec/common/inc/asmdefs_mmi.h: fix mips32 build - -Fix the following build failure on mips32 which is raised since version -2.0.0 and -https://github.com/cisco/openh264/commit/b13e5bceb18ebb93d0313b46aab4af6f480ca933: - -codec/common/mips/copy_mb_mmi.c: In function 'WelsCopy16x16_mmi': -./codec/common/inc/asmdefs_mmi.h:293:21: error: '_ABI64' undeclared (first use in this function) - 293 | if (_MIPS_SIM == _ABI64) \ - | ^~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/cba3e9d0fd061cc3a92cb732bcdc2c7b66dbf6cb - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/cisco/openh264/pull/3384] ---- - codec/common/inc/asmdefs_mmi.h | 17 +++++++++++------ - 1 file changed, 11 insertions(+), 6 deletions(-) - -diff --git a/codec/common/inc/asmdefs_mmi.h b/codec/common/inc/asmdefs_mmi.h -index 69a7ae39..5d1aed93 100644 ---- a/codec/common/inc/asmdefs_mmi.h -+++ b/codec/common/inc/asmdefs_mmi.h -@@ -288,9 +288,9 @@ - /** - * backup register - */ -+#if defined(_ABI64) && _MIPS_SIM == _ABI64 - #define BACKUP_REG \ - double __attribute__((aligned(16))) __back_temp[8]; \ -- if (_MIPS_SIM == _ABI64) \ - __asm__ volatile ( \ - "gssqc1 $f25, $f24, 0x00(%[temp]) \n\t" \ - "gssqc1 $f27, $f26, 0x10(%[temp]) \n\t" \ -@@ -299,8 +299,10 @@ - : \ - : [temp]"r"(__back_temp) \ - : "memory" \ -- ); \ -- else \ -+ ); -+#else -+#define BACKUP_REG \ -+ double __attribute__((aligned(16))) __back_temp[8]; \ - __asm__ volatile ( \ - "gssqc1 $f22, $f20, 0x00(%[temp]) \n\t" \ - "gssqc1 $f26, $f24, 0x10(%[temp]) \n\t" \ -@@ -309,12 +311,13 @@ - : [temp]"r"(__back_temp) \ - : "memory" \ - ); -+#endif - - /** - * recover register - */ -+#if defined(_ABI64) && _MIPS_SIM == _ABI64 - #define RECOVER_REG \ -- if (_MIPS_SIM == _ABI64) \ - __asm__ volatile ( \ - "gslqc1 $f25, $f24, 0x00(%[temp]) \n\t" \ - "gslqc1 $f27, $f26, 0x10(%[temp]) \n\t" \ -@@ -323,8 +326,9 @@ - : \ - : [temp]"r"(__back_temp) \ - : "memory" \ -- ); \ -- else \ -+ ); -+#else -+#define RECOVER_REG \ - __asm__ volatile ( \ - "gslqc1 $f22, $f20, 0x00(%[temp]) \n\t" \ - "gslqc1 $f26, $f24, 0x10(%[temp]) \n\t" \ -@@ -333,6 +337,7 @@ - : [temp]"r"(__back_temp) \ - : "memory" \ - ); -+#endif - - # define OK 1 - # define NOTOK 0 --- -2.30.2 - diff --git a/package/libopenh264/libopenh264.hash b/package/libopenh264/libopenh264.hash index 0689ab961f..712425a024 100644 --- a/package/libopenh264/libopenh264.hash +++ b/package/libopenh264/libopenh264.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 af173e90fce65f80722fa894e1af0d6b07572292e76de7b65273df4c0a8be678 libopenh264-2.1.1.tar.gz +sha256 e4e5c8ba48e64ba6ce61e8b6e2b76b2d870c74c270147649082feabb40f25905 libopenh264-2.2.0.tar.gz sha256 dd5c1c9668512530fa5a96e4c29ac4033d70a7eeb0eed7a42fddb6dd794ebdbb LICENSE diff --git a/package/libopenh264/libopenh264.mk b/package/libopenh264/libopenh264.mk index 0c17579979..ea41f72661 100644 --- a/package/libopenh264/libopenh264.mk +++ b/package/libopenh264/libopenh264.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENH264_VERSION = 2.1.1 +LIBOPENH264_VERSION = 2.2.0 LIBOPENH264_SITE = $(call github,cisco,openh264,v$(LIBOPENH264_VERSION)) LIBOPENH264_LICENSE = BSD-2-Clause LIBOPENH264_LICENSE_FILES = LICENSE From dan at thejacksons.uk Sun Feb 6 13:55:29 2022 From: dan at thejacksons.uk (Dan Jackson) Date: Sun, 6 Feb 2022 13:55:29 +0000 Subject: [Buildroot] Getting Buildroot-created binaries to work with the Intel (TI) Puma 5 ARM-based CPU? In-Reply-To: <53fa9f43-8aa2-4820-70e9-365e22b3408c@mind.be> References: <53fa9f43-8aa2-4820-70e9-365e22b3408c@mind.be> Message-ID: > -----Original Message----- > From: Arnout Vandecappelle > Sent: 06 February 2022 11:50 > To: Dan Jackson ; buildroot at buildroot.org > Subject: Re: [Buildroot] Getting Buildroot-created binaries to work with the > Intel (TI) Puma 5 ARM-based CPU? > [...snip...] > > > > Links to the two toolchains I mentioned: > > https://github.com/bmaia/cross- > utils/tree/master/armeb/puma5_toolchain (uses Buildroot 2009.02) > > This one uses > > BR2_armeb=y > BR2_arm1176jz_s=y > BR2_ARM_EABI=y > > It's not clear if there's an FPU, so use soft float. From /proc/cpuinfo on the target device I can see: Features : swp half thumb fastmult edsp java It's my understanding this line would include "vfp" if there was an FPU, so I don't believe there is one. > > That should be enough to build a toolchain and userspace with current > Buildroot. I tried creating a fresh Buildroot using the current stable version 2021.11 and only the above options. I then tried transferring the files from the generated rootfs.tar to a directory /var/tmp/test on the device (the reason for this is that / is a read-only file system, so /bin, /lib, /usr are not writable, but /var is a read-write file system). I then attempted to execute it in the following manner (accounting for the fact that Buildroot builds dynamically linked executables by default): /var/tmp/test/lib/ld-uClibc-1.0.39.so --library-path /var/tmp/test/lib /var/tmp/test/bin/busybox (this method was suggested in the section LD_LIBRARY_PATH on this page: https://tldp.org/HOWTO/Program-Library-HOWTO/shared-libraries.html) However this did not work and in fact produced a "Segmentation fault" error. Have I made some kind of obvious error or mistake? Thanks, Dan Jackson. From peter at korsgaard.com Sun Feb 6 13:58:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 06 Feb 2022 14:58:27 +0100 Subject: [Buildroot] [PATCH] package/nfs-utils: nfsiostat used python3, not python2 In-Reply-To: <20220206131758.28001-1-peter@korsgaard.com> (Peter Korsgaard's message of "Sun, 6 Feb 2022 14:17:57 +0100") References: <20220206131758.28001-1-peter@korsgaard.com> Message-ID: <87tudcw0zg.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: s/used/uses/ in the subject naturally. > nfsiostat is a python3 script, so keep it if python3 is enabled and not > python2: > head -n 1 target/usr/sbin/nfsiostat > #!/usr/bin/python3 > Signed-off-by: Peter Korsgaard > --- > package/nfs-utils/nfs-utils.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk > index 6a3a801359..44653e2707 100644 > --- a/package/nfs-utils/nfs-utils.mk > +++ b/package/nfs-utils/nfs-utils.mk > @@ -114,7 +114,7 @@ define NFS_UTILS_REMOVE_NFSIOSTAT > endef > # nfsiostat is interpreted python, so remove it unless it's in the target > -NFS_UTILS_POST_INSTALL_TARGET_HOOKS += $(if $(BR2_PACKAGE_PYTHON),,NFS_UTILS_REMOVE_NFSIOSTAT) > +NFS_UTILS_POST_INSTALL_TARGET_HOOKS += $(if $(BR2_PACKAGE_PYTHON3),,NFS_UTILS_REMOVE_NFSIOSTAT) > define HOST_NFS_UTILS_BUILD_CMDS > $(MAKE) -C $(@D)/tools/rpcgen > -- > 2.20.1 -- Bye, Peter Korsgaard From arnout at mind.be Sun Feb 6 13:59:36 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 6 Feb 2022 14:59:36 +0100 Subject: [Buildroot] [PATCH v2 1/4] utils/checkpackagelib: add unit tests In-Reply-To: <20220123160847.2653086-1-ricardo.martincoski@gmail.com> References: <20220123160847.2653086-1-ricardo.martincoski@gmail.com> Message-ID: <08b436a2-8d45-a93e-cecd-9b9b5b632fc9@mind.be> On 23/01/2022 17:08, Ricardo Martincoski wrote: > 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. I've been thinking of ways to simplify this (e.g. the filename is *usually* the same for a given set of tests, and the expected lines *usually* start with 'filename:'), but nothing really simple fell out, and progress is better than perfection. Therefore, series applied to master (and the new docker image pushed to the registry). Regards, Arnout > > 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] From arnout at mind.be Sun Feb 6 14:00:44 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 6 Feb 2022 15:00:44 +0100 Subject: [Buildroot] [PATCH v2 4/4] utils/docker-run: new script In-Reply-To: <20220123160847.2653086-4-ricardo.martincoski@gmail.com> References: <20220123160847.2653086-1-ricardo.martincoski@gmail.com> <20220123160847.2653086-4-ricardo.martincoski@gmail.com> Message-ID: <5f160478-5d3f-0541-7d54-0bc80772e636@mind.be> On 23/01/2022 17:08, Ricardo Martincoski wrote: > 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}" $* This should be "$@" instead of $*, right? There was another shellcheck error as well, for which I added an exception. And I also added an exec to the last line. Regards, Arnout From fontaine.fabrice at gmail.com Sun Feb 6 14:04:59 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 6 Feb 2022 15:04:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/gerbera: fix build with fmt > 8.0 Message-ID: <20220206140459.1622884-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump of fmt to version 8.1.1 in commit ec7fd50d08690a383fec40748ac9b78c3f764316: /home/peko/autobuild/instance-0/output-1/host/mips64el-buildroot-linux-uclibc/sysroot/usr/include/fmt/core.h:1728:7: error: static assertion failed: Cannot format an argument. To make type T formattable provide a formatter specialization: https://fmt.dev/latest/api.html#udt formattable, ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/009db44f83c3b02025c910ce4f190bd709c5ab49 Signed-off-by: Fabrice Fontaine --- package/gerbera/0001-Fix-for-fmt-8-0.patch | 44 ++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 package/gerbera/0001-Fix-for-fmt-8-0.patch diff --git a/package/gerbera/0001-Fix-for-fmt-8-0.patch b/package/gerbera/0001-Fix-for-fmt-8-0.patch new file mode 100644 index 0000000000..c4419209a5 --- /dev/null +++ b/package/gerbera/0001-Fix-for-fmt-8-0.patch @@ -0,0 +1,44 @@ +From 82d84ac5e62c23e717198fc7b2ef190ff95e70d1 Mon Sep 17 00:00:00 2001 +From: kyak +Date: Wed, 12 Jan 2022 19:41:37 +0300 +Subject: [PATCH] Fix for fmt > 8.0 + +[Retrieved from: +https://github.com/gerbera/gerbera/commit/82d84ac5e62c23e717198fc7b2ef190ff95e70d1] +Signed-off-by: Fabrice Fontaine +--- + src/util/logger.h | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/src/util/logger.h b/src/util/logger.h +index 58696e52f..ba64afa79 100644 +--- a/src/util/logger.h ++++ b/src/util/logger.h +@@ -32,7 +32,9 @@ + #ifndef __LOGGER_H__ + #define __LOGGER_H__ + ++#include + #include ++#include + + #define log_debug SPDLOG_DEBUG + #define log_info SPDLOG_INFO +@@ -40,4 +42,17 @@ + #define log_error SPDLOG_ERROR + #define log_js SPDLOG_INFO + ++#if FMT_VERSION >= 80100 ++template ++struct fmt::formatter, char>> ++ : formatter> { ++ template ++ auto format(const T& value, FormatContext& ctx) -> decltype(ctx.out()) ++ { ++ return fmt::formatter>::format( ++ static_cast>(value), ctx); ++ } ++}; ++#endif ++ + #endif // __LOGGER_H__ -- 2.34.1 From peter at korsgaard.com Sun Feb 6 14:15:13 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 06 Feb 2022 15:15:13 +0100 Subject: [Buildroot] [PATCH] package/bluez5_utils: fix build with libglib2 >= 2.69 In-Reply-To: <20220206092357.19286-1-thomas.devoogdt@gmail.com> (Thomas Devoogdt's message of "Sun, 6 Feb 2022 10:23:57 +0100") References: <20220206092357.19286-1-thomas.devoogdt@gmail.com> Message-ID: <87pmo0w07i.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Devoogdt writes: > Fix the following build failure raised since bump of libglib2 to version > 2.70 in commit 079923d: > profiles/battery/battery.c:162:2: warning: 'g_memdup' is deprecated (declared at /home/buildroot/autobuild/instance-0/output-1/host/bin/../arm-buildroot-linux-gnueabi/sysroot/usr/include/glib-2.0/glib/gstrfuncs.h:257): Use 'g_memdup2' instead [-Wdeprecated-declarations] > batt-> initial_value = g_memdup(value, length); > Fixes: > - http://autobuild.buildroot.org/results/6b8/6b8870d12e0804d6154230a7322c49416c1dc0e2/build-end.log > Sources: > - https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=710220f861b100856711a0a4d4a852874228a57a > - https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=9f09e69ecb077082301dafb745856e1f3731aaa7 > - https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=cfab569484b18407fc117bb96634525cc76ea1f5 > Signed-off-by: Thomas Devoogdt > --- > [update] removed patch numbers & remve change to 0001-tools-mesh-cfgtest-include-limits.h Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 6 14:10:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 15:10:51 +0100 Subject: [Buildroot] [git commit] package/bluez5_utils: fix build with libglib2 >= 2.69 Message-ID: <20220206141008.55A0082ACC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=572d08ee4a731b203b2d3aaf720a48f622609371 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since bump of libglib2 to version 2.70 in commit 079923d: profiles/battery/battery.c:162:2: warning: 'g_memdup' is deprecated (declared at /home/buildroot/autobuild/instance-0/output-1/host/bin/../arm-buildroot-linux-gnueabi/sysroot/usr/include/glib-2.0/glib/gstrfuncs.h:257): Use 'g_memdup2' instead [-Wdeprecated-declarations] batt->initial_value = g_memdup(value, length); Fixes: - http://autobuild.buildroot.org/results/6b8/6b8870d12e0804d6154230a7322c49416c1dc0e2/build-end.log Sources: - https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=710220f861b100856711a0a4d4a852874228a57a - https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=9f09e69ecb077082301dafb745856e1f3731aaa7 - https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=cfab569484b18407fc117bb96634525cc76ea1f5 Signed-off-by: Thomas Devoogdt Signed-off-by: Peter Korsgaard --- ...red-util-Rename-btd_malloc-to-util_malloc.patch | 67 + .../0003-shared-util-Add-util_memdup.patch | 57 + ...-Replace-use-of-g_memdup-with-util_memdup.patch | 1411 ++++++++++++++++++++ 3 files changed, 1535 insertions(+) diff --git a/package/bluez5_utils/0002-shared-util-Rename-btd_malloc-to-util_malloc.patch b/package/bluez5_utils/0002-shared-util-Rename-btd_malloc-to-util_malloc.patch new file mode 100644 index 0000000000..f8d74528d8 --- /dev/null +++ b/package/bluez5_utils/0002-shared-util-Rename-btd_malloc-to-util_malloc.patch @@ -0,0 +1,67 @@ +From f3263fed28bf510a1225661fe2b5f598300c11cd Mon Sep 17 00:00:00 2001 +From: Luiz Augusto von Dentz +Date: Wed, 5 Jan 2022 15:53:35 -0800 +Subject: [PATCH] shared/util: Rename btd_malloc to util_malloc + +util functions are not limited to daemon only which is normally the case +when using btd prefix. + +(cherry picked from commit 710220f861b100856711a0a4d4a852874228a57a) +Signed-off-by: Thomas Devoogdt +--- + profiles/audio/avdtp.c | 2 +- + src/shared/util.c | 2 +- + src/shared/util.h | 4 ++-- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/profiles/audio/avdtp.c b/profiles/audio/avdtp.c +index d3dfbf96d..f2b461330 100644 +--- a/profiles/audio/avdtp.c ++++ b/profiles/audio/avdtp.c +@@ -1333,7 +1333,7 @@ static GSList *caps_to_list(uint8_t *data, size_t size, + break; + } + +- cpy = btd_malloc(sizeof(*cpy) + cap->length); ++ cpy = util_malloc(sizeof(*cpy) + cap->length); + memcpy(cpy, cap, sizeof(*cap) + cap->length); + + size -= sizeof(*cap) + cap->length; +diff --git a/src/shared/util.c b/src/shared/util.c +index 81b20d86f..93110047b 100644 +--- a/src/shared/util.c ++++ b/src/shared/util.c +@@ -25,7 +25,7 @@ + + #include "src/shared/util.h" + +-void *btd_malloc(size_t size) ++void *util_malloc(size_t size) + { + if (__builtin_expect(!!size, 1)) { + void *ptr; +diff --git a/src/shared/util.h b/src/shared/util.h +index ac70117ca..11d09979d 100644 +--- a/src/shared/util.h ++++ b/src/shared/util.h +@@ -75,7 +75,7 @@ do { \ + size_t __n = (size_t) (count); \ + size_t __s = sizeof(type); \ + void *__p; \ +- __p = btd_malloc(__n * __s); \ ++ __p = util_malloc(__n * __s); \ + memset(__p, 0, __n * __s); \ + __p; \ + })) +@@ -86,7 +86,7 @@ do { \ + char *strdelimit(char *str, char *del, char c); + int strsuffix(const char *str, const char *suffix); + +-void *btd_malloc(size_t size); ++void *util_malloc(size_t size); + + typedef void (*util_debug_func_t)(const char *str, void *user_data); + +-- +2.17.1 + diff --git a/package/bluez5_utils/0003-shared-util-Add-util_memdup.patch b/package/bluez5_utils/0003-shared-util-Add-util_memdup.patch new file mode 100644 index 0000000000..d5c31a2614 --- /dev/null +++ b/package/bluez5_utils/0003-shared-util-Add-util_memdup.patch @@ -0,0 +1,57 @@ +From 28f1c140374d1ecda65e3d59cca72352c3a07774 Mon Sep 17 00:00:00 2001 +From: Luiz Augusto von Dentz +Date: Thu, 6 Jan 2022 11:45:12 -0800 +Subject: [PATCH] shared/util: Add util_memdup + +This adds util_memdup which is intended to replace g_memdup since +replacing that with g_memdup2 requires bumping the glib version. + +(cherry picked from commit 9f09e69ecb077082301dafb745856e1f3731aaa7) +Signed-off-by: Thomas Devoogdt +--- + src/shared/util.c | 16 ++++++++++++++++ + src/shared/util.h | 1 + + 2 files changed, 17 insertions(+) + +diff --git a/src/shared/util.c b/src/shared/util.c +index 93110047b..6e1c83057 100644 +--- a/src/shared/util.c ++++ b/src/shared/util.c +@@ -41,6 +41,22 @@ void *util_malloc(size_t size) + return NULL; + } + ++void *util_memdup(const void *src, size_t size) ++{ ++ void *cpy; ++ ++ if (!src || !size) ++ return NULL; ++ ++ cpy = util_malloc(size); ++ if (!cpy) ++ return NULL; ++ ++ memcpy(cpy, src, size); ++ ++ return cpy; ++} ++ + void util_debug_va(util_debug_func_t function, void *user_data, + const char *format, va_list va) + { +diff --git a/src/shared/util.h b/src/shared/util.h +index 11d09979d..8ef6132c4 100644 +--- a/src/shared/util.h ++++ b/src/shared/util.h +@@ -87,6 +87,7 @@ char *strdelimit(char *str, char *del, char c); + int strsuffix(const char *str, const char *suffix); + + void *util_malloc(size_t size); ++void *util_memdup(const void *src, size_t size); + + typedef void (*util_debug_func_t)(const char *str, void *user_data); + +-- +2.17.1 + diff --git a/package/bluez5_utils/0004-build-Replace-use-of-g_memdup-with-util_memdup.patch b/package/bluez5_utils/0004-build-Replace-use-of-g_memdup-with-util_memdup.patch new file mode 100644 index 0000000000..9e1047c957 --- /dev/null +++ b/package/bluez5_utils/0004-build-Replace-use-of-g_memdup-with-util_memdup.patch @@ -0,0 +1,1411 @@ +From 7eb74180cf6fd6cebc61bb719d458cbf5d7f4ca7 Mon Sep 17 00:00:00 2001 +From: Luiz Augusto von Dentz +Date: Thu, 6 Jan 2022 12:50:33 -0800 +Subject: [PATCH] build: Replace use of g_memdup with util_memdup +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This replaces the uses of g_memdup with util_memdup since the former has +been deprecated: + + warning: ???g_memdup??? is deprecated: Use 'g_memdup2' instead + [-Wdeprecated-declarations] + +g_memdup2 requires bumping glib version which would likely have its +own problems thus why util_memdup was introduced. + +(cherry picked from commit cfab569484b18407fc117bb96634525cc76ea1f5) +Signed-off-by: Thomas Devoogdt +--- + Makefile.am | 10 ++--- + Makefile.obexd | 1 + + Makefile.tools | 11 ++++-- + android/a2dp.c | 9 +++-- + android/avctp.c | 5 ++- + android/avrcp-lib.c | 2 +- + android/gatt.c | 5 ++- + android/hidhost.c | 3 +- + android/tester-main.c | 77 +++++++++++++++++++++----------------- + attrib/gatt.c | 12 +++--- + client/gatt.c | 2 +- + gobex/gobex-header.c | 7 ++-- + gobex/gobex-packet.c | 5 ++- + obexd/src/obex.c | 5 ++- + plugins/neard.c | 9 +++-- + plugins/policy.c | 7 ++-- + profiles/audio/avctp.c | 9 +++-- + profiles/audio/avrcp.c | 10 ++--- + profiles/battery/bas.c | 4 +- + profiles/battery/battery.c | 4 +- + profiles/deviceinfo/dis.c | 4 +- + profiles/input/hog-lib.c | 12 +++--- + profiles/scanparam/scpp.c | 4 +- + src/eir.c | 8 ++-- + tools/gatt-service.c | 15 ++++---- + tools/mesh-gatt/gatt.c | 5 ++- + unit/test-avctp.c | 4 +- + unit/test-avdtp.c | 6 +-- + unit/test-avrcp.c | 10 ++--- + unit/test-gatt.c | 4 +- + unit/test-hfp.c | 11 +++--- + unit/test-hog.c | 26 ++++++------- + unit/test-sdp.c | 10 +++-- + unit/test-uhid.c | 2 +- + 34 files changed, 172 insertions(+), 146 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 308f13c50..9b5e140b8 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -508,23 +508,23 @@ unit_tests += unit/test-gobex-header unit/test-gobex-packet unit/test-gobex \ + + unit_test_gobex_SOURCES = $(gobex_sources) unit/util.c unit/util.h \ + unit/test-gobex.c +-unit_test_gobex_LDADD = $(GLIB_LIBS) ++unit_test_gobex_LDADD = src/libshared-glib.la $(GLIB_LIBS) + + unit_test_gobex_packet_SOURCES = $(gobex_sources) unit/util.c unit/util.h \ + unit/test-gobex-packet.c +-unit_test_gobex_packet_LDADD = $(GLIB_LIBS) ++unit_test_gobex_packet_LDADD = src/libshared-glib.la $(GLIB_LIBS) + + unit_test_gobex_header_SOURCES = $(gobex_sources) unit/util.c unit/util.h \ + unit/test-gobex-header.c +-unit_test_gobex_header_LDADD = $(GLIB_LIBS) ++unit_test_gobex_header_LDADD = src/libshared-glib.la $(GLIB_LIBS) + + unit_test_gobex_transfer_SOURCES = $(gobex_sources) unit/util.c unit/util.h \ + unit/test-gobex-transfer.c +-unit_test_gobex_transfer_LDADD = $(GLIB_LIBS) ++unit_test_gobex_transfer_LDADD = src/libshared-glib.la $(GLIB_LIBS) + + unit_test_gobex_apparam_SOURCES = $(gobex_sources) unit/util.c unit/util.h \ + unit/test-gobex-apparam.c +-unit_test_gobex_apparam_LDADD = $(GLIB_LIBS) ++unit_test_gobex_apparam_LDADD = src/libshared-glib.la $(GLIB_LIBS) + endif + + unit_tests += unit/test-lib +diff --git a/Makefile.obexd b/Makefile.obexd +index 37a133455..5d1a4ff65 100644 +--- a/Makefile.obexd ++++ b/Makefile.obexd +@@ -82,6 +82,7 @@ obexd_src_obexd_SOURCES = $(btio_sources) $(gobex_sources) \ + obexd/src/map_ap.h + obexd_src_obexd_LDADD = lib/libbluetooth-internal.la \ + gdbus/libgdbus-internal.la \ ++ src/libshared-glib.la \ + $(ICAL_LIBS) $(DBUS_LIBS) $(LIBEBOOK_LIBS) \ + $(LIBEDATASERVER_LIBS) $(GLIB_LIBS) -ldl + +diff --git a/Makefile.tools b/Makefile.tools +index c7bdff83f..35b0021ea 100644 +--- a/Makefile.tools ++++ b/Makefile.tools +@@ -302,7 +302,8 @@ tools_mpris_proxy_SOURCES = tools/mpris-proxy.c + tools_mpris_proxy_LDADD = gdbus/libgdbus-internal.la $(GLIB_LIBS) $(DBUS_LIBS) + + tools_gatt_service_SOURCES = tools/gatt-service.c +-tools_gatt_service_LDADD = $(GLIB_LIBS) $(DBUS_LIBS) gdbus/libgdbus-internal.la ++tools_gatt_service_LDADD = gdbus/libgdbus-internal.la \ ++ src/libshared-mainloop.la $(GLIB_LIBS) $(DBUS_LIBS) + + profiles_iap_iapd_SOURCES = profiles/iap/main.c + profiles_iap_iapd_LDADD = gdbus/libgdbus-internal.la $(GLIB_LIBS) $(DBUS_LIBS) +@@ -448,11 +449,12 @@ noinst_PROGRAMS += tools/btmgmt tools/obex-client-tool tools/obex-server-tool \ + tools_obex_client_tool_SOURCES = $(gobex_sources) $(btio_sources) \ + tools/obex-client-tool.c + tools_obex_client_tool_LDADD = lib/libbluetooth-internal.la \ +- $(GLIB_LIBS) -lreadline ++ src/libshared-glib.la $(GLIB_LIBS) -lreadline + + tools_obex_server_tool_SOURCES = $(gobex_sources) $(btio_sources) \ + tools/obex-server-tool.c +-tools_obex_server_tool_LDADD = lib/libbluetooth-internal.la $(GLIB_LIBS) ++tools_obex_server_tool_LDADD = lib/libbluetooth-internal.la \ ++ src/libshared-glib.la $(GLIB_LIBS) + + tools_bluetooth_player_SOURCES = tools/bluetooth-player.c + tools_bluetooth_player_LDADD = gdbus/libgdbus-internal.la \ +@@ -461,7 +463,8 @@ tools_bluetooth_player_LDADD = gdbus/libgdbus-internal.la \ + + tools_obexctl_SOURCES = tools/obexctl.c + tools_obexctl_LDADD = gdbus/libgdbus-internal.la src/libshared-glib.la \ +- $(GLIB_LIBS) $(DBUS_LIBS) -lreadline ++ src/libshared-glib.la $(GLIB_LIBS) $(DBUS_LIBS) \ ++ -lreadline + + tools_btmgmt_SOURCES = tools/btmgmt.c src/uuid-helper.c client/display.c + tools_btmgmt_LDADD = lib/libbluetooth-internal.la src/libshared-mainloop.la \ +diff --git a/android/a2dp.c b/android/a2dp.c +index 029107cf5..ee607a32d 100644 +--- a/android/a2dp.c ++++ b/android/a2dp.c +@@ -26,6 +26,7 @@ + #include "lib/sdp_lib.h" + #include "profiles/audio/a2dp-codecs.h" + #include "src/shared/queue.h" ++#include "src/shared/util.h" + #include "src/log.h" + #include "hal-msg.h" + #include "ipc-common.h" +@@ -428,7 +429,7 @@ static struct a2dp_preset *sbc_select_range(void *caps, uint8_t caps_len, + + p = g_new0(struct a2dp_preset, 1); + p->len = conf_len; +- p->data = g_memdup(conf, p->len); ++ p->data = util_memdup(conf, p->len); + + return p; + } +@@ -448,7 +449,7 @@ static struct a2dp_preset *aac_select_range(void *caps, uint8_t caps_len, + + p = g_new0(struct a2dp_preset, 1); + p->len = conf_len; +- p->data = g_memdup(conf, p->len); ++ p->data = util_memdup(conf, p->len); + + return p; + } +@@ -1036,7 +1037,7 @@ static gboolean sep_setconf_ind(struct avdtp *session, + + preset = g_new0(struct a2dp_preset, 1); + preset->len = cap->length - sizeof(*codec); +- preset->data = g_memdup(codec->data, preset->len); ++ preset->data = util_memdup(codec->data, preset->len); + + if (check_config(endpoint, preset) < 0) { + preset_free(preset); +@@ -1365,7 +1366,7 @@ static GSList *parse_presets(const struct audio_preset *p, uint8_t count, + + preset = g_new0(struct a2dp_preset, 1); + preset->len = p->len; +- preset->data = g_memdup(p->data, preset->len); ++ preset->data = util_memdup(p->data, preset->len); + l = g_slist_append(l, preset); + + len -= preset->len; +diff --git a/android/avctp.c b/android/avctp.c +index 14ebbc391..37b4cec4f 100644 +--- a/android/avctp.c ++++ b/android/avctp.c +@@ -31,6 +31,7 @@ + #include + + #include "lib/sdp.h" ++#include "src/shared/util.h" + #include "src/log.h" + #include "avctp.h" + +@@ -1177,7 +1178,7 @@ static int avctp_send_req(struct avctp *session, uint8_t code, uint8_t subunit, + + for (i = 0; i < iov_cnt; i++) { + pdu[i].iov_len = iov[i].iov_len; +- pdu[i].iov_base = g_memdup(iov[i].iov_base, iov[i].iov_len); ++ pdu[i].iov_base = util_memdup(iov[i].iov_base, iov[i].iov_len); + } + + req = g_new0(struct avctp_control_req, 1); +@@ -1218,7 +1219,7 @@ int avctp_send_browsing_req(struct avctp *session, + + for (i = 0; i < iov_cnt; i++) { + pdu[i].iov_len = iov[i].iov_len; +- pdu[i].iov_base = g_memdup(iov[i].iov_base, iov[i].iov_len); ++ pdu[i].iov_base = util_memdup(iov[i].iov_base, iov[i].iov_len); + } + + req = g_new0(struct avctp_browsing_req, 1); +diff --git a/android/avrcp-lib.c b/android/avrcp-lib.c +index 2007d09d2..b342692cb 100644 +--- a/android/avrcp-lib.c ++++ b/android/avrcp-lib.c +@@ -2620,7 +2620,7 @@ static char *parse_folder_list(uint8_t *params, uint16_t params_len, + return NULL; + } + +- folders[count] = g_memdup(¶ms[i], len); ++ folders[count] = util_memdup(¶ms[i], len); + i += len; + } + +diff --git a/android/gatt.c b/android/gatt.c +index a8a0c488b..e8ba5aabb 100644 +--- a/android/gatt.c ++++ b/android/gatt.c +@@ -1338,7 +1338,8 @@ static void discover_primary_cb(uint8_t status, GSList *services, + } + + bt_uuid_to_uuid128(&uuid, &u128); +- new_uuid = g_memdup(&u128.value.u128, sizeof(u128.value.u128)); ++ new_uuid = util_memdup(&u128.value.u128, ++ sizeof(u128.value.u128)); + + uuids = g_slist_prepend(uuids, new_uuid); + } +@@ -6633,7 +6634,7 @@ static uint8_t write_prep_request(const uint8_t *cmd, uint16_t cmd_len, + + queue_push_tail(dev->pending_requests, data); + +- data->value = g_memdup(value, vlen); ++ data->value = util_memdup(value, vlen); + data->length = vlen; + + if (!gatt_db_attribute_write(attrib, offset, value, vlen, cmd[0], +diff --git a/android/hidhost.c b/android/hidhost.c +index 016382e17..b4e5c527f 100644 +--- a/android/hidhost.c ++++ b/android/hidhost.c +@@ -689,7 +689,8 @@ static void hid_sdp_search_cb(sdp_list_t *recs, int err, gpointer data) + goto fail; + + dev->rd_size = data->unitSize; +- dev->rd_data = g_memdup(data->val.str, data->unitSize); ++ dev->rd_data = util_memdup(data->val.str, ++ data->unitSize); + } + } + +diff --git a/android/tester-main.c b/android/tester-main.c +index ff5ecdf83..317c1de06 100644 +--- a/android/tester-main.c ++++ b/android/tester-main.c +@@ -1253,7 +1253,8 @@ static bt_property_t *copy_properties(int num_properties, + for (i = 0; i < num_properties; i++) { + props[i].type = properties[i].type; + props[i].len = properties[i].len; +- props[i].val = g_memdup(properties[i].val, properties[i].len); ++ props[i].val = util_memdup(properties[i].val, ++ properties[i].len); + } + + return props; +@@ -1268,7 +1269,8 @@ static bt_property_t *repack_properties(int num_properties, + for (i = 0; i < num_properties; i++) { + props[i].type = properties[i]->type; + props[i].len = properties[i]->len; +- props[i].val = g_memdup(properties[i]->val, properties[i]->len); ++ props[i].val = util_memdup(properties[i]->val, ++ properties[i]->len); + } + + return props; +@@ -1281,7 +1283,7 @@ static bt_property_t *create_property(bt_property_type_t type, void *val, + + prop->type = type; + prop->len = len; +- prop->val = g_memdup(val, len); ++ prop->val = util_memdup(val, len); + + return prop; + } +@@ -1615,7 +1617,7 @@ static void gattc_search_result_cb(int conn_id, btgatt_srvc_id_t *srvc_id) + + step->callback = CB_GATTC_SEARCH_RESULT; + step->callback_result.conn_id = conn_id; +- step->callback_result.service = g_memdup(srvc_id, sizeof(*srvc_id)); ++ step->callback_result.service = util_memdup(srvc_id, sizeof(*srvc_id)); + + schedule_callback_verification(step); + } +@@ -1639,8 +1641,8 @@ static void gattc_get_characteristic_cb(int conn_id, int status, + step->callback = CB_GATTC_GET_CHARACTERISTIC; + step->callback_result.status = status; + step->callback_result.conn_id = conn_id; +- step->callback_result.service = g_memdup(srvc_id, sizeof(*srvc_id)); +- step->callback_result.characteristic = g_memdup(char_id, ++ step->callback_result.service = util_memdup(srvc_id, sizeof(*srvc_id)); ++ step->callback_result.characteristic = util_memdup(char_id, + sizeof(*char_id)); + step->callback_result.char_prop = char_prop; + +@@ -1656,10 +1658,10 @@ static void gattc_get_descriptor_cb(int conn_id, int status, + step->callback = CB_GATTC_GET_DESCRIPTOR; + step->callback_result.status = status; + step->callback_result.conn_id = conn_id; +- step->callback_result.service = g_memdup(srvc_id, sizeof(*srvc_id)); +- step->callback_result.characteristic = g_memdup(char_id, ++ step->callback_result.service = util_memdup(srvc_id, sizeof(*srvc_id)); ++ step->callback_result.characteristic = util_memdup(char_id, + sizeof(*char_id)); +- step->callback_result.descriptor = g_memdup(descr_id, ++ step->callback_result.descriptor = util_memdup(descr_id, + sizeof(*descr_id)); + + schedule_callback_verification(step); +@@ -1673,8 +1675,8 @@ static void gattc_get_included_service_cb(int conn_id, int status, + step->callback = CB_GATTC_GET_INCLUDED_SERVICE; + step->callback_result.status = status; + step->callback_result.conn_id = conn_id; +- step->callback_result.service = g_memdup(srvc_id, sizeof(*srvc_id)); +- step->callback_result.included = g_memdup(incl_srvc_id, ++ step->callback_result.service = util_memdup(srvc_id, sizeof(*srvc_id)); ++ step->callback_result.included = util_memdup(incl_srvc_id, + sizeof(*srvc_id)); + + schedule_callback_verification(step); +@@ -1688,7 +1690,8 @@ static void gattc_read_characteristic_cb(int conn_id, int status, + step->callback = CB_GATTC_READ_CHARACTERISTIC; + step->callback_result.status = status; + step->callback_result.conn_id = conn_id; +- step->callback_result.read_params = g_memdup(p_data, sizeof(*p_data)); ++ step->callback_result.read_params = util_memdup(p_data, ++ sizeof(*p_data)); + + schedule_callback_verification(step); + } +@@ -1701,7 +1704,8 @@ static void gattc_read_descriptor_cb(int conn_id, int status, + step->callback = CB_GATTC_READ_DESCRIPTOR; + step->callback_result.status = status; + step->callback_result.conn_id = conn_id; +- step->callback_result.read_params = g_memdup(p_data, sizeof(*p_data)); ++ step->callback_result.read_params = util_memdup(p_data, ++ sizeof(*p_data)); + + schedule_callback_verification(step); + } +@@ -1714,7 +1718,8 @@ static void gattc_write_characteristic_cb(int conn_id, int status, + step->callback = CB_GATTC_WRITE_CHARACTERISTIC; + step->callback_result.status = status; + step->callback_result.conn_id = conn_id; +- step->callback_result.write_params = g_memdup(p_data, sizeof(*p_data)); ++ step->callback_result.write_params = util_memdup(p_data, ++ sizeof(*p_data)); + + schedule_callback_verification(step); + } +@@ -1727,7 +1732,8 @@ static void gattc_write_descriptor_cb(int conn_id, int status, + step->callback = CB_GATTC_WRITE_DESCRIPTOR; + step->callback_result.status = status; + step->callback_result.conn_id = conn_id; +- step->callback_result.write_params = g_memdup(p_data, sizeof(*p_data)); ++ step->callback_result.write_params = util_memdup(p_data, ++ sizeof(*p_data)); + + schedule_callback_verification(step); + } +@@ -1742,8 +1748,8 @@ static void gattc_register_for_notification_cb(int conn_id, int registered, + step->callback = CB_GATTC_REGISTER_FOR_NOTIFICATION; + step->callback_result.status = status; + step->callback_result.conn_id = conn_id; +- step->callback_result.service = g_memdup(srvc_id, sizeof(*srvc_id)); +- step->callback_result.characteristic = g_memdup(char_id, ++ step->callback_result.service = util_memdup(srvc_id, sizeof(*srvc_id)); ++ step->callback_result.characteristic = util_memdup(char_id, + sizeof(*char_id)); + step->callback_result.notification_registered = registered; + +@@ -1756,7 +1762,8 @@ static void gattc_notif_cb(int conn_id, btgatt_notify_params_t *p_data) + + step->callback = CB_GATTC_NOTIFY; + step->callback_result.conn_id = conn_id; +- step->callback_result.notify_params = g_memdup(p_data, sizeof(*p_data)); ++ step->callback_result.notify_params = util_memdup(p_data, ++ sizeof(*p_data)); + + schedule_callback_verification(step); + } +@@ -1827,8 +1834,8 @@ static void gatts_service_added_cb(int status, int server_if, + + step->callback_result.status = status; + step->callback_result.gatt_app_id = server_if; +- step->callback_result.service = g_memdup(srvc_id, sizeof(*srvc_id)); +- step->callback_result.srvc_handle = g_memdup(&srvc_handle, ++ step->callback_result.service = util_memdup(srvc_id, sizeof(*srvc_id)); ++ step->callback_result.srvc_handle = util_memdup(&srvc_handle, + sizeof(srvc_handle)); + + schedule_callback_verification(step); +@@ -1844,9 +1851,9 @@ static void gatts_included_service_added_cb(int status, int server_if, + + step->callback_result.status = status; + step->callback_result.gatt_app_id = server_if; +- step->callback_result.srvc_handle = g_memdup(&srvc_handle, ++ step->callback_result.srvc_handle = util_memdup(&srvc_handle, + sizeof(srvc_handle)); +- step->callback_result.inc_srvc_handle = g_memdup(&inc_srvc_handle, ++ step->callback_result.inc_srvc_handle = util_memdup(&inc_srvc_handle, + sizeof(inc_srvc_handle)); + + schedule_callback_verification(step); +@@ -1863,10 +1870,10 @@ static void gatts_characteristic_added_cb(int status, int server_if, + + step->callback_result.status = status; + step->callback_result.gatt_app_id = server_if; +- step->callback_result.srvc_handle = g_memdup(&srvc_handle, ++ step->callback_result.srvc_handle = util_memdup(&srvc_handle, + sizeof(srvc_handle)); +- step->callback_result.uuid = g_memdup(uuid, sizeof(*uuid)); +- step->callback_result.char_handle = g_memdup(&char_handle, ++ step->callback_result.uuid = util_memdup(uuid, sizeof(*uuid)); ++ step->callback_result.char_handle = util_memdup(&char_handle, + sizeof(char_handle)); + + schedule_callback_verification(step); +@@ -1883,10 +1890,10 @@ static void gatts_descriptor_added_cb(int status, int server_if, + + step->callback_result.status = status; + step->callback_result.gatt_app_id = server_if; +- step->callback_result.srvc_handle = g_memdup(&srvc_handle, ++ step->callback_result.srvc_handle = util_memdup(&srvc_handle, + sizeof(srvc_handle)); +- step->callback_result.uuid = g_memdup(uuid, sizeof(*uuid)); +- step->callback_result.desc_handle = g_memdup(&desc_handle, ++ step->callback_result.uuid = util_memdup(uuid, sizeof(*uuid)); ++ step->callback_result.desc_handle = util_memdup(&desc_handle, + sizeof(desc_handle)); + + schedule_callback_verification(step); +@@ -1900,7 +1907,7 @@ static void gatts_service_started_cb(int status, int server_if, int srvc_handle) + + step->callback_result.status = status; + step->callback_result.gatt_app_id = server_if; +- step->callback_result.srvc_handle = g_memdup(&srvc_handle, ++ step->callback_result.srvc_handle = util_memdup(&srvc_handle, + sizeof(srvc_handle)); + + schedule_callback_verification(step); +@@ -1914,7 +1921,7 @@ static void gatts_service_stopped_cb(int status, int server_if, int srvc_handle) + + step->callback_result.status = status; + step->callback_result.gatt_app_id = server_if; +- step->callback_result.srvc_handle = g_memdup(&srvc_handle, ++ step->callback_result.srvc_handle = util_memdup(&srvc_handle, + sizeof(srvc_handle)); + + schedule_callback_verification(step); +@@ -1928,7 +1935,7 @@ static void gatts_service_deleted_cb(int status, int server_if, int srvc_handle) + + step->callback_result.status = status; + step->callback_result.gatt_app_id = server_if; +- step->callback_result.srvc_handle = g_memdup(&srvc_handle, ++ step->callback_result.srvc_handle = util_memdup(&srvc_handle, + sizeof(srvc_handle)); + + schedule_callback_verification(step); +@@ -1945,7 +1952,7 @@ static void gatts_request_read_cb(int conn_id, int trans_id, bt_bdaddr_t *bda, + + step->callback_result.conn_id = conn_id; + step->callback_result.trans_id = trans_id; +- step->callback_result.attr_handle = g_memdup(&attr_handle, ++ step->callback_result.attr_handle = util_memdup(&attr_handle, + sizeof(attr_handle)); + step->callback_result.offset = offset; + step->callback_result.is_long = is_long; +@@ -1974,13 +1981,13 @@ static void gatts_request_write_cb(int conn_id, int trans_id, bt_bdaddr_t *bda, + + step->callback_result.conn_id = conn_id; + step->callback_result.trans_id = trans_id; +- step->callback_result.attr_handle = g_memdup(&attr_handle, ++ step->callback_result.attr_handle = util_memdup(&attr_handle, + sizeof(attr_handle)); + step->callback_result.offset = offset; + step->callback_result.length = length; + step->callback_result.need_rsp = need_rsp; + step->callback_result.is_prep = is_prep; +- step->callback_result.value = g_memdup(&value, length); ++ step->callback_result.value = util_memdup(&value, length); + + /* Utilize property verification mechanism for bdaddr */ + props[0] = create_property(BT_PROPERTY_BDADDR, bda, sizeof(*bda)); +@@ -2169,7 +2176,7 @@ static btmce_mas_instance_t *copy_mas_instances(int num_instances, + inst[i].id = instances[i].id; + inst[i].scn = instances[i].scn; + inst[i].msg_types = instances[i].msg_types; +- inst[i].p_name = g_memdup(instances[i].p_name, ++ inst[i].p_name = util_memdup(instances[i].p_name, + strlen(instances[i].p_name)); + } + +diff --git a/attrib/gatt.c b/attrib/gatt.c +index 46b2ca381..b496dd1eb 100644 +--- a/attrib/gatt.c ++++ b/attrib/gatt.c +@@ -135,7 +135,7 @@ static void discover_char_unref(void *data) + + g_slist_free_full(dc->characteristics, g_free); + g_attrib_unref(dc->attrib); +- g_free(dc->uuid); ++ free(dc->uuid); + g_free(dc); + } + +@@ -157,7 +157,7 @@ static void discover_desc_unref(void *data) + + g_slist_free_full(dd->descriptors, g_free); + g_attrib_unref(dd->attrib); +- g_free(dd->uuid); ++ free(dd->uuid); + g_free(dd); + } + +@@ -696,7 +696,7 @@ guint gatt_discover_char(GAttrib *attrib, uint16_t start, uint16_t end, + dc->user_data = user_data; + dc->end = end; + dc->start = start; +- dc->uuid = g_memdup(uuid, sizeof(bt_uuid_t)); ++ dc->uuid = util_memdup(uuid, sizeof(bt_uuid_t)); + + dc->id = g_attrib_send(attrib, 0, buf, plen, char_discovered_cb, + discover_char_ref(dc), discover_char_unref); +@@ -905,7 +905,7 @@ static void prepare_write_cb(guint8 status, const guint8 *rpdu, guint16 rlen, + if (long_write->offset == long_write->vlen) { + execute_write(long_write->attrib, ATT_WRITE_ALL_PREP_WRITES, + long_write->func, long_write->user_data); +- g_free(long_write->value); ++ free(long_write->value); + g_free(long_write); + + return; +@@ -964,7 +964,7 @@ guint gatt_write_char(GAttrib *attrib, uint16_t handle, const uint8_t *value, + long_write->func = func; + long_write->user_data = user_data; + long_write->handle = handle; +- long_write->value = g_memdup(value, vlen); ++ long_write->value = util_memdup(value, vlen); + long_write->vlen = vlen; + + return prepare_write(long_write); +@@ -1130,7 +1130,7 @@ guint gatt_discover_desc(GAttrib *attrib, uint16_t start, uint16_t end, + dd->user_data = user_data; + dd->start = start; + dd->end = end; +- dd->uuid = g_memdup(uuid, sizeof(bt_uuid_t)); ++ dd->uuid = util_memdup(uuid, sizeof(bt_uuid_t)); + + dd->id = g_attrib_send(attrib, 0, buf, plen, desc_discovered_cb, + discover_desc_ref(dd), discover_desc_unref); +diff --git a/client/gatt.c b/client/gatt.c +index 11f70dc4f..13872c794 100644 +--- a/client/gatt.c ++++ b/client/gatt.c +@@ -811,7 +811,7 @@ static uint8_t *str2bytearray(char *arg, size_t *val_len) + + *val_len = i; + +- return g_memdup(value, i); ++ return util_memdup(value, i); + } + + void gatt_write_attribute(GDBusProxy *proxy, int argc, char *argv[]) +diff --git a/gobex/gobex-header.c b/gobex/gobex-header.c +index 011d33d1a..002ba8861 100644 +--- a/gobex/gobex-header.c ++++ b/gobex/gobex-header.c +@@ -15,6 +15,7 @@ + + #include "gobex-header.h" + #include "gobex-debug.h" ++#include "src/shared/util.h" + + /* Header types */ + #define G_OBEX_HDR_ENC_UNICODE (0 << 6) +@@ -222,7 +223,7 @@ GObexHeader *g_obex_header_decode(const void *data, gsize len, + + switch (data_policy) { + case G_OBEX_DATA_COPY: +- header->v.data = g_memdup(ptr, header->vlen); ++ header->v.data = util_memdup(ptr, header->vlen); + break; + case G_OBEX_DATA_REF: + header->extdata = TRUE; +@@ -282,7 +283,7 @@ void g_obex_header_free(GObexHeader *header) + break; + case G_OBEX_HDR_ENC_BYTES: + if (!header->extdata) +- g_free(header->v.data); ++ free(header->v.data); + break; + case G_OBEX_HDR_ENC_UINT8: + case G_OBEX_HDR_ENC_UINT32: +@@ -410,7 +411,7 @@ GObexHeader *g_obex_header_new_bytes(guint8 id, const void *data, gsize len) + header->id = id; + header->vlen = len; + header->hlen = len + 3; +- header->v.data = g_memdup(data, len); ++ header->v.data = util_memdup(data, len); + + return header; + } +diff --git a/gobex/gobex-packet.c b/gobex/gobex-packet.c +index 11937a5a5..8ae78b0f6 100644 +--- a/gobex/gobex-packet.c ++++ b/gobex/gobex-packet.c +@@ -17,6 +17,7 @@ + #include "gobex-defs.h" + #include "gobex-packet.h" + #include "gobex-debug.h" ++#include "src/shared/util.h" + + #define FINAL_BIT 0x80 + +@@ -201,7 +202,7 @@ gboolean g_obex_packet_set_data(GObexPacket *pkt, const void *data, gsize len, + + switch (data_policy) { + case G_OBEX_DATA_COPY: +- pkt->data.buf = g_memdup(data, len); ++ pkt->data.buf = util_memdup(data, len); + break; + case G_OBEX_DATA_REF: + pkt->data.buf_ref = data; +@@ -259,7 +260,7 @@ void g_obex_packet_free(GObexPacket *pkt) + switch (pkt->data_policy) { + case G_OBEX_DATA_INHERIT: + case G_OBEX_DATA_COPY: +- g_free(pkt->data.buf); ++ free(pkt->data.buf); + break; + case G_OBEX_DATA_REF: + break; +diff --git a/obexd/src/obex.c b/obexd/src/obex.c +index 9f992ec18..3a68fd66c 100644 +--- a/obexd/src/obex.c ++++ b/obexd/src/obex.c +@@ -40,6 +40,7 @@ + #include "mimetype.h" + #include "service.h" + #include "transport.h" ++#include "src/shared/util.h" + + typedef struct { + uint8_t version; +@@ -145,7 +146,7 @@ static void os_reset_session(struct obex_session *os) + os->path = NULL; + } + if (os->apparam) { +- g_free(os->apparam); ++ free(os->apparam); + os->apparam = NULL; + os->apparam_len = 0; + } +@@ -594,7 +595,7 @@ static void parse_apparam(struct obex_session *os, GObexPacket *req) + if (!g_obex_header_get_bytes(hdr, &apparam, &len)) + return; + +- os->apparam = g_memdup(apparam, len); ++ os->apparam = util_memdup(apparam, len); + os->apparam_len = len; + DBG("APPARAM"); + } +diff --git a/plugins/neard.c b/plugins/neard.c +index e07b51106..a75527148 100644 +--- a/plugins/neard.c ++++ b/plugins/neard.c +@@ -30,6 +30,7 @@ + #include "src/eir.h" + #include "src/agent.h" + #include "src/btd.h" ++#include "src/shared/util.h" + + #define NEARD_NAME "org.neard" + #define NEARD_PATH "/" +@@ -71,7 +72,7 @@ static void free_oob_params(struct oob_params *params) + g_free(params->name); + g_free(params->hash); + g_free(params->randomizer); +- g_free(params->pin); ++ free(params->pin); + } + + static DBusMessage *error_reply(DBusMessage *msg, int error) +@@ -407,10 +408,10 @@ static int process_nokia_long (void *data, size_t size, uint8_t marker, + remote->name = g_strndup((char *)n->name, n->name_len); + + if (marker == 0x01) { +- remote->pin = g_memdup(n->authentication, 4); ++ remote->pin = util_memdup(n->authentication, 4); + remote->pin_len = 4; + } else if (marker == 0x02) { +- remote->pin = g_memdup(n->authentication, 16); ++ remote->pin = util_memdup(n->authentication, 16); + remote->pin_len = 16; + } + +@@ -439,7 +440,7 @@ static int process_nokia_short (void *data, size_t size, + if (n->name_len > 0) + remote->name = g_strndup((char *)n->name, n->name_len); + +- remote->pin = g_memdup(n->authentication, 4); ++ remote->pin = util_memdup(n->authentication, 4); + remote->pin_len = 4; + + return 0; +diff --git a/plugins/policy.c b/plugins/policy.c +index 051db82e1..48f5db7d3 100644 +--- a/plugins/policy.c ++++ b/plugins/policy.c +@@ -32,6 +32,7 @@ + #include "src/profile.h" + #include "src/btd.h" + #include "src/shared/timeout.h" ++#include "src/shared/util.h" + + #define CONTROL_CONNECT_TIMEOUT 2 + #define SOURCE_RETRY_TIMEOUT 2 +@@ -855,7 +856,7 @@ static int policy_init(void) + reconnect_attempts = default_attempts; + reconnect_intervals_len = sizeof(default_intervals) / + sizeof(*reconnect_intervals); +- reconnect_intervals = g_memdup(default_intervals, ++ reconnect_intervals = util_memdup(default_intervals, + sizeof(default_intervals)); + goto done; + } +@@ -886,7 +887,7 @@ static int policy_init(void) + g_clear_error(&gerr); + reconnect_intervals_len = sizeof(default_intervals) / + sizeof(*reconnect_intervals); +- reconnect_intervals = g_memdup(default_intervals, ++ reconnect_intervals = util_memdup(default_intervals, + sizeof(default_intervals)); + } + +@@ -919,7 +920,7 @@ static void policy_exit(void) + if (reconnect_uuids) + g_strfreev(reconnect_uuids); + +- g_free(reconnect_intervals); ++ free(reconnect_intervals); + + g_slist_free_full(reconnects, reconnect_destroy); + +diff --git a/profiles/audio/avctp.c b/profiles/audio/avctp.c +index 64d1a8504..6f64f162b 100644 +--- a/profiles/audio/avctp.c ++++ b/profiles/audio/avctp.c +@@ -40,6 +40,7 @@ + #include "src/log.h" + #include "src/error.h" + #include "src/shared/timeout.h" ++#include "src/shared/util.h" + + #include "avctp.h" + #include "avrcp.h" +@@ -760,7 +761,7 @@ static void control_req_destroy(void *data) + NULL, 0, req->user_data); + + done: +- g_free(req->operands); ++ free(req->operands); + g_free(req); + } + +@@ -776,7 +777,7 @@ static void browsing_req_destroy(void *data) + req->func(session, NULL, 0, req->user_data); + + done: +- g_free(req->operands); ++ free(req->operands); + g_free(req); + } + +@@ -1727,7 +1728,7 @@ static int avctp_send_req(struct avctp *session, uint8_t code, + req->subunit = subunit; + req->op = opcode; + req->func = func; +- req->operands = g_memdup(operands, operand_count); ++ req->operands = util_memdup(operands, operand_count); + req->operand_count = operand_count; + req->user_data = user_data; + +@@ -1765,7 +1766,7 @@ int avctp_send_browsing_req(struct avctp *session, + + req = g_new0(struct avctp_browsing_req, 1); + req->func = func; +- req->operands = g_memdup(operands, operand_count); ++ req->operands = util_memdup(operands, operand_count); + req->operand_count = operand_count; + req->user_data = user_data; + +diff --git a/profiles/audio/avrcp.c b/profiles/audio/avrcp.c +index 7c280203c..d4e19ffc0 100644 +--- a/profiles/audio/avrcp.c ++++ b/profiles/audio/avrcp.c +@@ -1298,7 +1298,7 @@ static uint8_t avrcp_handle_get_current_player_value(struct avrcp *session, + * Save a copy of requested settings because we can override them + * while responding + */ +- settings = g_memdup(&pdu->params[1], pdu->params[0]); ++ settings = util_memdup(&pdu->params[1], pdu->params[0]); + len = 0; + + /* +@@ -1323,7 +1323,7 @@ static uint8_t avrcp_handle_get_current_player_value(struct avrcp *session, + pdu->params[++len] = val; + } + +- g_free(settings); ++ free(settings); + + if (len) { + pdu->params[0] = len / 2; +@@ -2801,7 +2801,7 @@ static gboolean avrcp_set_browsed_player_rsp(struct avctp *conn, + break; + } + +- folders[count] = g_memdup(&pdu->params[i], len); ++ folders[count] = util_memdup(&pdu->params[i], len); + i += len; + } + +@@ -2888,7 +2888,7 @@ static void avrcp_player_parse_features(struct avrcp_player *player, + { + struct media_player *mp = player->user_data; + +- player->features = g_memdup(features, 16); ++ player->features = util_memdup(features, 16); + + if (features[7] & 0x08) { + media_player_set_browsable(mp, true); +@@ -3622,7 +3622,7 @@ static void player_destroy(gpointer data) + g_slist_free(player->sessions); + g_free(player->path); + g_free(player->change_path); +- g_free(player->features); ++ free(player->features); + g_free(player); + } + +diff --git a/profiles/battery/bas.c b/profiles/battery/bas.c +index 3c6173b61..16ff22e19 100644 +--- a/profiles/battery/bas.c ++++ b/profiles/battery/bas.c +@@ -62,7 +62,7 @@ static void bas_free(struct bt_bas *bas) + { + bt_bas_detach(bas); + +- g_free(bas->primary); ++ free(bas->primary); + queue_destroy(bas->gatt_op, (void *) destroy_gatt_req); + free(bas); + } +@@ -75,7 +75,7 @@ struct bt_bas *bt_bas_new(void *primary) + bas->gatt_op = queue_new(); + + if (primary) +- bas->primary = g_memdup(primary, sizeof(*bas->primary)); ++ bas->primary = util_memdup(primary, sizeof(*bas->primary)); + + return bt_bas_ref(bas); + } +diff --git a/profiles/battery/battery.c b/profiles/battery/battery.c +index 176d127f6..02d024d92 100644 +--- a/profiles/battery/battery.c ++++ b/profiles/battery/battery.c +@@ -66,7 +66,7 @@ static void batt_free(struct batt *batt) + gatt_db_unref(batt->db); + bt_gatt_client_unref(batt->client); + btd_device_unref(batt->device); +- g_free (batt->initial_value); ++ free(batt->initial_value); + if (batt->battery) + btd_battery_unregister(batt->battery); + g_free(batt); +@@ -159,7 +159,7 @@ static void read_initial_battery_level_cb(bool success, + if (!length) + return; + +- batt->initial_value = g_memdup(value, length); ++ batt->initial_value = util_memdup(value, length); + + /* request notify */ + batt->batt_level_cb_id = +diff --git a/profiles/deviceinfo/dis.c b/profiles/deviceinfo/dis.c +index 87fa63306..f660179ed 100644 +--- a/profiles/deviceinfo/dis.c ++++ b/profiles/deviceinfo/dis.c +@@ -72,7 +72,7 @@ static void dis_free(struct bt_dis *dis) + { + bt_dis_detach(dis); + +- g_free(dis->primary); ++ free(dis->primary); + queue_destroy(dis->gatt_op, (void *) destroy_gatt_req); + g_free(dis); + } +@@ -143,7 +143,7 @@ struct bt_dis *bt_dis_new_primary(void *primary) + dis->gatt_op = queue_new(); + + if (primary) +- dis->primary = g_memdup(primary, sizeof(*dis->primary)); ++ dis->primary = util_memdup(primary, sizeof(*dis->primary)); + + return bt_dis_ref(dis); + } +diff --git a/profiles/input/hog-lib.c b/profiles/input/hog-lib.c +index 3bbe42370..d37caa1f1 100644 +--- a/profiles/input/hog-lib.c ++++ b/profiles/input/hog-lib.c +@@ -527,9 +527,9 @@ static void report_read_cb(guint8 status, const guint8 *pdu, guint16 len, + } + + if (report->value) +- g_free(report->value); ++ free(report->value); + +- report->value = g_memdup(pdu, len); ++ report->value = util_memdup(pdu, len); + report->len = len; + } + +@@ -1217,7 +1217,7 @@ static void report_free(void *data) + { + struct report *report = data; + +- g_free(report->value); ++ free(report->value); + g_free(report); + } + +@@ -1241,7 +1241,7 @@ static void hog_free(void *data) + bt_uhid_unref(hog->uhid); + g_slist_free_full(hog->reports, report_free); + g_free(hog->name); +- g_free(hog->primary); ++ free(hog->primary); + queue_destroy(hog->gatt_op, (void *) destroy_gatt_req); + if (hog->gatt_db) + gatt_db_unref(hog->gatt_db); +@@ -1609,7 +1609,7 @@ static void hog_attach_hog(struct bt_hog *hog, struct gatt_primary *primary) + struct bt_hog *instance; + + if (!hog->primary) { +- hog->primary = g_memdup(primary, sizeof(*primary)); ++ hog->primary = util_memdup(primary, sizeof(*primary)); + discover_char(hog, hog->attrib, primary->range.start, + primary->range.end, NULL, + char_discovered_cb, hog); +@@ -1623,7 +1623,7 @@ static void hog_attach_hog(struct bt_hog *hog, struct gatt_primary *primary) + if (!instance) + return; + +- instance->primary = g_memdup(primary, sizeof(*primary)); ++ instance->primary = util_memdup(primary, sizeof(*primary)); + find_included(instance, hog->attrib, primary->range.start, + primary->range.end, find_included_cb, instance); + +diff --git a/profiles/scanparam/scpp.c b/profiles/scanparam/scpp.c +index da38a6aaa..4be8b26cc 100644 +--- a/profiles/scanparam/scpp.c ++++ b/profiles/scanparam/scpp.c +@@ -91,7 +91,7 @@ static void scpp_free(struct bt_scpp *scan) + { + bt_scpp_detach(scan); + +- g_free(scan->primary); ++ free(scan->primary); + queue_destroy(scan->gatt_op, NULL); /* cleared in bt_scpp_detach */ + g_free(scan); + } +@@ -110,7 +110,7 @@ struct bt_scpp *bt_scpp_new(void *primary) + scan->gatt_op = queue_new(); + + if (primary) +- scan->primary = g_memdup(primary, sizeof(*scan->primary)); ++ scan->primary = util_memdup(primary, sizeof(*scan->primary)); + + return bt_scpp_ref(scan); + } +diff --git a/src/eir.c b/src/eir.c +index 0f5d14fcd..2f9ee036f 100644 +--- a/src/eir.c ++++ b/src/eir.c +@@ -53,9 +53,9 @@ void eir_data_free(struct eir_data *eir) + eir->services = NULL; + g_free(eir->name); + eir->name = NULL; +- g_free(eir->hash); ++ free(eir->hash); + eir->hash = NULL; +- g_free(eir->randomizer); ++ free(eir->randomizer); + eir->randomizer = NULL; + g_slist_free_full(eir->msd_list, g_free); + eir->msd_list = NULL; +@@ -323,13 +323,13 @@ void eir_parse(struct eir_data *eir, const uint8_t *eir_data, uint8_t eir_len) + case EIR_SSP_HASH: + if (data_len < 16) + break; +- eir->hash = g_memdup(data, 16); ++ eir->hash = util_memdup(data, 16); + break; + + case EIR_SSP_RANDOMIZER: + if (data_len < 16) + break; +- eir->randomizer = g_memdup(data, 16); ++ eir->randomizer = util_memdup(data, 16); + break; + + case EIR_DEVICE_ID: +diff --git a/tools/gatt-service.c b/tools/gatt-service.c +index 631c4f249..ed6b06f1e 100644 +--- a/tools/gatt-service.c ++++ b/tools/gatt-service.c +@@ -26,6 +26,7 @@ + #include "gdbus/gdbus.h" + + #include "src/error.h" ++#include "src/shared/util.h" + + #define GATT_MGR_IFACE "org.bluez.GattManager1" + #define GATT_SERVICE_IFACE "org.bluez.GattService1" +@@ -126,8 +127,8 @@ static gboolean desc_get_value(const GDBusPropertyTable *property, + + static void desc_write(struct descriptor *desc, const uint8_t *value, int len) + { +- g_free(desc->value); +- desc->value = g_memdup(value, len); ++ free(desc->value); ++ desc->value = util_memdup(value, len); + desc->vlen = len; + + g_dbus_emit_property_changed(connection, desc->path, +@@ -264,8 +265,8 @@ static gboolean chr_get_props(const GDBusPropertyTable *property, + + static void chr_write(struct characteristic *chr, const uint8_t *value, int len) + { +- g_free(chr->value); +- chr->value = g_memdup(value, len); ++ free(chr->value); ++ chr->value = util_memdup(value, len); + chr->vlen = len; + + g_dbus_emit_property_changed(connection, chr->path, GATT_CHR_IFACE, +@@ -388,7 +389,7 @@ static void chr_iface_destroy(gpointer user_data) + + g_free(chr->uuid); + g_free(chr->service); +- g_free(chr->value); ++ free(chr->value); + g_free(chr->path); + g_free(chr); + } +@@ -398,7 +399,7 @@ static void desc_iface_destroy(gpointer user_data) + struct descriptor *desc = user_data; + + g_free(desc->uuid); +- g_free(desc->value); ++ free(desc->value); + g_free(desc->path); + g_free(desc); + } +@@ -592,7 +593,7 @@ static gboolean register_characteristic(const char *chr_uuid, + + chr = g_new0(struct characteristic, 1); + chr->uuid = g_strdup(chr_uuid); +- chr->value = g_memdup(value, vlen); ++ chr->value = util_memdup(value, vlen); + chr->vlen = vlen; + chr->props = props; + chr->service = g_strdup(service_path); +diff --git a/tools/mesh-gatt/gatt.c b/tools/mesh-gatt/gatt.c +index c8a8123fb..ab9743cd1 100644 +--- a/tools/mesh-gatt/gatt.c ++++ b/tools/mesh-gatt/gatt.c +@@ -24,6 +24,7 @@ + + #include "src/shared/io.h" + #include "src/shared/shell.h" ++#include "src/shared/util.h" + #include "gdbus/gdbus.h" + #include "lib/bluetooth.h" + #include "lib/uuid.h" +@@ -86,7 +87,7 @@ static void write_data_free(void *user_data) + { + struct write_data *data = user_data; + +- g_free(data->gatt_data); ++ free(data->gatt_data); + free(data); + } + +@@ -338,7 +339,7 @@ bool mesh_gatt_write(GDBusProxy *proxy, uint8_t *buf, uint16_t len, + /* TODO: should keep in queue in case we need to cancel write? */ + + data->gatt_len = len; +- data->gatt_data = g_memdup(buf, len); ++ data->gatt_data = util_memdup(buf, len); + data->gatt_data[0] &= GATT_TYPE_MASK; + data->iov.iov_base = data->gatt_data; + data->iov.iov_len = len; +diff --git a/unit/test-avctp.c b/unit/test-avctp.c +index fa7db59c8..25fd3abc2 100644 +--- a/unit/test-avctp.c ++++ b/unit/test-avctp.c +@@ -53,7 +53,7 @@ struct context { + #define raw_pdu(args...) \ + { \ + .valid = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +@@ -64,7 +64,7 @@ struct context { + }; \ + static struct test_data data; \ + data.test_name = g_strdup(name); \ +- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ ++ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ + tester_add(name, &data, NULL, function, NULL); \ + } while (0) + +diff --git a/unit/test-avdtp.c b/unit/test-avdtp.c +index 4e8a68c6b..2e49def43 100644 +--- a/unit/test-avdtp.c ++++ b/unit/test-avdtp.c +@@ -48,7 +48,7 @@ struct test_data { + #define raw_pdu(args...) \ + { \ + .valid = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +@@ -56,7 +56,7 @@ struct test_data { + { \ + .valid = true, \ + .fragmented = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +@@ -67,7 +67,7 @@ struct test_data { + }; \ + static struct test_data data; \ + data.test_name = g_strdup(name); \ +- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ ++ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ + tester_add(name, &data, NULL, function, NULL); \ + } while (0) + +diff --git a/unit/test-avrcp.c b/unit/test-avrcp.c +index 34a70377d..b637a8a1b 100644 +--- a/unit/test-avrcp.c ++++ b/unit/test-avrcp.c +@@ -61,7 +61,7 @@ struct context { + #define raw_pdu(args...) \ + { \ + .valid = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +@@ -69,7 +69,7 @@ struct context { + { \ + .valid = true, \ + .browse = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +@@ -77,7 +77,7 @@ struct context { + { \ + .valid = true, \ + .fragmented = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +@@ -85,7 +85,7 @@ struct context { + { \ + .valid = true, \ + .continuing = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +@@ -96,7 +96,7 @@ struct context { + }; \ + static struct test_data data; \ + data.test_name = g_strdup(name); \ +- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ ++ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ + tester_add(name, &data, NULL, function, NULL); \ + } while (0) + +diff --git a/unit/test-gatt.c b/unit/test-gatt.c +index 6a47268e6..f92d860c4 100644 +--- a/unit/test-gatt.c ++++ b/unit/test-gatt.c +@@ -73,7 +73,7 @@ struct context { + #define raw_pdu(args...) \ + { \ + .valid = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +@@ -94,7 +94,7 @@ struct context { + data.uuid = bt_uuid; \ + data.step = test_step; \ + data.source_db = db; \ +- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ ++ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ + tester_add(name, &data, NULL, function, NULL); \ + } while (0) + +diff --git a/unit/test-hfp.c b/unit/test-hfp.c +index f504724d7..b4af99d53 100644 +--- a/unit/test-hfp.c ++++ b/unit/test-hfp.c +@@ -17,6 +17,7 @@ + #include + #include "src/shared/hfp.h" + #include "src/shared/tester.h" ++#include "src/shared/util.h" + + struct context { + guint watch_id; +@@ -50,7 +51,7 @@ struct test_data { + #define raw_pdu(args...) \ + { \ + .valid = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +@@ -62,7 +63,7 @@ struct test_data { + #define type_pdu(cmd_type, args...) \ + { \ + .valid = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + .type = cmd_type, \ + } +@@ -70,7 +71,7 @@ struct test_data { + #define frg_pdu(args...) \ + { \ + .valid = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + .fragmented = true, \ + } +@@ -82,7 +83,7 @@ struct test_data { + }; \ + static struct test_data data; \ + data.test_name = g_strdup(name); \ +- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ ++ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ + data.result_func = result_function; \ + tester_add(name, &data, NULL, function, NULL); \ + data.test_handler = test_handler; \ +@@ -96,7 +97,7 @@ struct test_data { + }; \ + static struct test_data data; \ + data.test_name = g_strdup(name); \ +- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ ++ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ + data.hf_result_func = result_func; \ + data.response_func = response_function; \ + tester_add(name, &data, NULL, function, NULL); \ +diff --git a/unit/test-hog.c b/unit/test-hog.c +index 116a5cb07..067497de4 100644 +--- a/unit/test-hog.c ++++ b/unit/test-hog.c +@@ -59,24 +59,24 @@ struct context { + #define raw_pdu(args...) \ + { \ + .valid = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +-#define false_pdu() \ +-{ \ +- .valid = false, \ ++#define false_pdu() \ ++{ \ ++ .valid = false, \ + } + +-#define define_test(name, function, args...) \ +- do { \ +- const struct test_pdu pdus[] = { \ +- args, { } \ +- }; \ +- static struct test_data data; \ +- data.test_name = g_strdup(name); \ +- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ +- tester_add(name, &data, NULL, function, NULL); \ ++#define define_test(name, function, args...) \ ++ do { \ ++ const struct test_pdu pdus[] = { \ ++ args, { } \ ++ }; \ ++ static struct test_data data; \ ++ data.test_name = g_strdup(name); \ ++ data.pdu_list = util_memdup(pdus, sizeof(pdus));\ ++ tester_add(name, &data, NULL, function, NULL); \ + } while (0) + + static gboolean context_quit(gpointer user_data) +diff --git a/unit/test-sdp.c b/unit/test-sdp.c +index 8f95fcb71..5c04a71eb 100644 +--- a/unit/test-sdp.c ++++ b/unit/test-sdp.c +@@ -47,14 +47,16 @@ struct test_data { + #define raw_pdu(args...) \ + { \ + .valid = true, \ +- .raw_data = g_memdup(raw_data(args), sizeof(raw_data(args))), \ ++ .raw_data = util_memdup(raw_data(args), \ ++ sizeof(raw_data(args))), \ + .raw_size = sizeof(raw_data(args)), \ + } + + #define raw_pdu_cont(cont, args...) \ + { \ + .valid = true, \ +- .raw_data = g_memdup(raw_data(args), sizeof(raw_data(args))), \ ++ .raw_data = util_memdup(raw_data(args), \ ++ sizeof(raw_data(args))), \ + .raw_size = sizeof(raw_data(args)), \ + .cont_len = cont, \ + } +@@ -66,7 +68,7 @@ struct test_data { + }; \ + static struct test_data data; \ + data.mtu = _mtu; \ +- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ ++ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ + tester_add(name, &data, NULL, test_sdp, NULL); \ + } while (0) + +@@ -92,7 +94,7 @@ struct test_data_de { + #define define_test_de_attr(name, input, exp) \ + do { \ + static struct test_data_de data; \ +- data.input_data = g_memdup(input, sizeof(input)); \ ++ data.input_data = util_memdup(input, sizeof(input)); \ + data.input_size = sizeof(input); \ + data.expected = exp; \ + tester_add("/sdp/DE/ATTR/" name, &data, NULL, \ +diff --git a/unit/test-uhid.c b/unit/test-uhid.c +index 001d39a3d..8a8eef855 100644 +--- a/unit/test-uhid.c ++++ b/unit/test-uhid.c +@@ -61,7 +61,7 @@ struct context { + }; \ + static struct test_data data; \ + data.test_name = g_strdup(name); \ +- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ ++ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ + tester_add(name, &data, NULL, function, NULL); \ + } while (0) + +-- +2.17.1 + From fontaine.fabrice at gmail.com Sun Feb 6 14:18:04 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 6 Feb 2022 15:18:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/ofono: bump to version 1.34 Message-ID: <20220206141804.1744721-1-fontaine.fabrice@gmail.com> Update indentation in hash file (two spaces) https://git.kernel.org/pub/scm/network/ofono/ofono.git/tree/ChangeLog?h=1.34 Signed-off-by: Fabrice Fontaine --- package/ofono/ofono.hash | 4 ++-- package/ofono/ofono.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ofono/ofono.hash b/package/ofono/ofono.hash index 02245a46f4..7edef0eb80 100644 --- a/package/ofono/ofono.hash +++ b/package/ofono/ofono.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/network/ofono/sha256sums.asc -sha256 a15c5d28096c10eb30e47a68b6dc2e7c4a5a99d7f4cfedf0b69624f33d859e9b ofono-1.31.tar.xz +sha256 c0b96d3013447ec2bcb74579bef90e4e59c68dbfa4b9c6fbce5d12401a43aac7 ofono-1.34.tar.xz # Locally computed -sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING +sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/package/ofono/ofono.mk b/package/ofono/ofono.mk index 57d6cab470..b7a2a923f9 100644 --- a/package/ofono/ofono.mk +++ b/package/ofono/ofono.mk @@ -4,7 +4,7 @@ # ################################################################################ -OFONO_VERSION = 1.31 +OFONO_VERSION = 1.34 OFONO_SOURCE = ofono-$(OFONO_VERSION).tar.xz OFONO_SITE = $(BR2_KERNEL_MIRROR)/linux/network/ofono OFONO_LICENSE = GPL-2.0 -- 2.34.1 From giulio.benetti at benettiengineering.com Sun Feb 6 14:24:03 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 15:24:03 +0100 Subject: [Buildroot] [PATCH] toolchain: fix gcc bug 99140 condition In-Reply-To: <2fec6210-3811-197d-45a7-1ece869f49e0@benettiengineering.com> References: <2fec6210-3811-197d-45a7-1ece869f49e0@benettiengineering.com> Message-ID: <20220206142403.1644118-1-giulio.benetti@benettiengineering.com> Gcc bug 99140 exhibits with gcc versions: - up to 7.x - 9.x - 10.x and doesn't show up with gcc versions: - 8.x - 11.x then moving BR2_TOOLCHAIN_GCC_AT_LEAST_9 to BR2_TOOLCHAIN_GCC_AT_LEAST_10 makes gcc version 9 set as working but it's not. So let's back substitute BR2_TOOLCHAIN_GCC_AT_LEAST_10 with BR2_TOOLCHAIN_GCC_AT_LEAST_9. Signed-off-by: Giulio Benetti --- toolchain/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchain/Config.in b/toolchain/Config.in index aed8f393a3..db3f451f45 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -189,7 +189,7 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_93847 config BR2_TOOLCHAIN_HAS_GCC_BUG_99140 bool default y if !BR2_TOOLCHAIN_GCC_AT_LEAST_8 - default y if BR2_TOOLCHAIN_GCC_AT_LEAST_10 && !BR2_TOOLCHAIN_GCC_AT_LEAST_11 + default y if BR2_TOOLCHAIN_GCC_AT_LEAST_9 && !BR2_TOOLCHAIN_GCC_AT_LEAST_11 depends on BR2_nios2 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101737 -- 2.25.1 From peter at korsgaard.com Sun Feb 6 14:24:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 06 Feb 2022 15:24:38 +0100 Subject: [Buildroot] [PATCH] DEVELOPERS: add entry for hostapd and wpa_supplicant to Yegor Yefremov In-Reply-To: <20220130105116.18458-1-yegorslists@googlemail.com> (yegorslists's message of "Sun, 30 Jan 2022 11:51:16 +0100") References: <20220130105116.18458-1-yegorslists@googlemail.com> Message-ID: <87leyovzrt.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 Sun Feb 6 14:24:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 06 Feb 2022 15:24:42 +0100 Subject: [Buildroot] [PATCH] DEVELOPERS: add entry for libqmi and libqrtr-glib to Yegor Yefremov In-Reply-To: <20220130105459.19339-1-yegorslists@googlemail.com> (yegorslists's message of "Sun, 30 Jan 2022 11:54:59 +0100") References: <20220130105459.19339-1-yegorslists@googlemail.com> Message-ID: <87h79cvzrp.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 giulio.benetti at benettiengineering.com Sun Feb 6 14:25:49 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 15:25:49 +0100 Subject: [Buildroot] [PATCH v3 1/2] configs/microchip_sama7g5ek_mmc_defconfig: set custom linux version to 5.15.21 and add host openssl for linux In-Reply-To: <20220206131656.16e2c8a6@windsurf> References: <20220206115156.6042cc1b@windsurf> <20220206112620.1637342-1-giulio.benetti@benettiengineering.com> <20220206112620.1637342-2-giulio.benetti@benettiengineering.com> <20220206131656.16e2c8a6@windsurf> Message-ID: Hi Thomas, On 06/02/22 13:16, Thomas Petazzoni wrote: > On Sun, 6 Feb 2022 12:26:19 +0100 > Giulio Benetti wrote: > >> Fixes: >> https://gitlab.com/ymorin/buildroot/-/jobs/2035821098 >> >> Signed-off-by: Giulio Benetti > > Did you actually test on HW that 5.15.21 was working? Unfortunately I don't have board, so no. > Shouldn't this be > done by the original submitter of the defconfig. > > Eugen, Ludovic? It would be great to have it tested. Both, this and the microchip_sama7g5ek_mmc_dev_defconfig too. Best regards -- Giulio Benetti Benetti Engineering sas From peter at korsgaard.com Sun Feb 6 14:24:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 15:24:01 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] DEVELOPERS: add entry for hostapd and wpa_supplicant to Yegor Yefremov Message-ID: <20220206141931.5635582627@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=72f648703e41ffc1268a57985e113a53fabc65e2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni (cherry picked from commit b4bdbc7c505157d0039d1010e67f653b0f89b945) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 57e4592b4a..bd1d2eca6b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2743,6 +2743,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/ @@ -2771,6 +2772,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 peter at korsgaard.com Sun Feb 6 14:24:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 15:24:03 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] DEVELOPERS: add entry for libqmi and libqrtr-glib to Yegor Yefremov Message-ID: <20220206141931.5F16A82BCD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fad154253deb5b5399ea52a19ed6608dcd00ee4d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni (cherry picked from commit 73ce754531b5e45bd42b56c58718fbacc754406f) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index bd1d2eca6b..7ec36e2185 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2753,6 +2753,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 peter at korsgaard.com Sun Feb 6 14:23:48 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 15:23:48 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] DEVELOPERS: add entry for hostapd and wpa_supplicant to Yegor Yefremov Message-ID: <20220206141937.048C182627@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b2f57d410a940ff719ad5691b575a3f0499ef7b7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni (cherry picked from commit b4bdbc7c505157d0039d1010e67f653b0f89b945) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index e2c0f4d521..d45cfc5572 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2886,6 +2886,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/ @@ -2914,6 +2915,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 peter at korsgaard.com Sun Feb 6 14:23:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 15:23:54 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] DEVELOPERS: add entry for libqmi and libqrtr-glib to Yegor Yefremov Message-ID: <20220206141937.0F3B082BCD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=873223cae13889d663ef8d07c2d71eb15182a4ee branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni (cherry picked from commit 73ce754531b5e45bd42b56c58718fbacc754406f) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index d45cfc5572..2f202e1f19 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2896,6 +2896,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 fontaine.fabrice at gmail.com Sun Feb 6 14:26:38 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 6 Feb 2022 15:26:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/mp4v2: needs gcc >= 5 Message-ID: <20220206142638.1751906-1-fontaine.fabrice@gmail.com> TechSmith fork of mp4v2 needs gcc >= 5: https://github.com/TechSmith/mp4v2/issues/47 As a result, the following build failure is raised since bump to version 5.0.1 in commit df22a9d6b77d9e245dceb7c8fd3f9d80c8917ca0: In file included from ./include/mp4v2/mp4v2.h:58:0, from ./libplatform/platform_posix.h:37, from ./libplatform/platform.h:24, from libplatform/impl.h:6: ./include/mp4v2/file.h:336:5: warning: identifier 'nullptr' is a keyword in C++11 [-Wc++0x-compat] ShouldParseAtomCallback cb = nullptr ); ^ While a it, drop first patch which is not needed now that mp4v2 depends on gcc >= 5 Fixes: - http://autobuild.buildroot.org/results/178f1266396d44c6659a67d8e68cb99e36d544ea Signed-off-by: Fabrice Fontaine --- ...atic-cast-to-unsigned-int-for-cases.patch} | 0 ...mp4track.cpp-replace-nullptr-by-NULL.patch | 50 ------------------- package/mp4v2/Config.in | 6 ++- 3 files changed, 4 insertions(+), 52 deletions(-) rename package/mp4v2/{0002-Static-cast-to-unsigned-int-for-cases.patch => 0001-Static-cast-to-unsigned-int-for-cases.patch} (100%) delete mode 100644 package/mp4v2/0001-src-mp4track.cpp-replace-nullptr-by-NULL.patch diff --git a/package/mp4v2/0002-Static-cast-to-unsigned-int-for-cases.patch b/package/mp4v2/0001-Static-cast-to-unsigned-int-for-cases.patch similarity index 100% rename from package/mp4v2/0002-Static-cast-to-unsigned-int-for-cases.patch rename to package/mp4v2/0001-Static-cast-to-unsigned-int-for-cases.patch diff --git a/package/mp4v2/0001-src-mp4track.cpp-replace-nullptr-by-NULL.patch b/package/mp4v2/0001-src-mp4track.cpp-replace-nullptr-by-NULL.patch deleted file mode 100644 index c279b9c56a..0000000000 --- a/package/mp4v2/0001-src-mp4track.cpp-replace-nullptr-by-NULL.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 78cf76b5d661e37e958163c37c0ad95940c09591 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 30 May 2020 11:42:19 +0200 -Subject: [PATCH] src/mp4track.cpp: replace nullptr by NULL - -Commit 15ec11166ba9ee7b77631d0d9234522f656cfd66 added code that uses -nullptr. nullptr is C++11, it will break the build with gcc < 5. - -Semantically, NULL and nullptr are different, so should not be mixed. -In this situaiton, m_File.FindAtom() indeed does not return nullptr, -but NULL (on error, that is). - -Switch back to comparing against NULL. - -Fixes: - - http://autobuild.buildroot.org/results/14937c96a82fb3d10e5d83bd7b2905b846fb09f9 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/TechSmith/mp4v2/pull/62] ---- - src/mp4track.cpp | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/mp4track.cpp b/src/mp4track.cpp -index 4b8fc9d..42489eb 100644 ---- a/src/mp4track.cpp -+++ b/src/mp4track.cpp -@@ -908,16 +908,16 @@ File* MP4Track::GetSampleFile( MP4SampleId sampleId ) - MP4FtypAtom *pFtypAtom = reinterpret_cast( m_File.FindAtom( "ftyp" ) ); - - // MOV spec does not require "ftyp" atom... -- if ( pFtypAtom == nullptr ) -+ if ( pFtypAtom == NULL ) - { -- return nullptr; -+ return NULL; - } - else - { - // ... but most often it is present with a "qt " value - const char *majorBrand = pFtypAtom->majorBrand.GetValue(); - if ( ::strcmp( pFtypAtom->majorBrand.GetValue(), "qt " ) == 0 ) -- return nullptr; -+ return NULL; - } - throw new Exception( "invalid stsd entry", __FILE__, __LINE__, __FUNCTION__ ); - } --- -2.26.2 - diff --git a/package/mp4v2/Config.in b/package/mp4v2/Config.in index 172d1baabe..00e80cd358 100644 --- a/package/mp4v2/Config.in +++ b/package/mp4v2/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_MP4V2 bool "mp4v2" depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++11 help The MP4v2 library provides functions to read, create, and modify mp4 files. @@ -18,5 +19,6 @@ config BR2_PACKAGE_MP4V2_UTIL endif -comment "mp4v2 needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP +comment "mp4v2 needs a toolchain w/ C++, gcc >= 5" + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 -- 2.34.1 From fontaine.fabrice at gmail.com Sun Feb 6 14:31:12 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 6 Feb 2022 15:31:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/jack1: drop celt comment Message-ID: <20220206143112.1752984-1-fontaine.fabrice@gmail.com> Drop celt comment which is not needed since removal of celt051 in commit b32efbdb0354557db48852478b99080705ba315b Signed-off-by: Fabrice Fontaine --- package/jack1/jack1.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/jack1/jack1.mk b/package/jack1/jack1.mk index 2f97434ebe..311f7c9ba0 100644 --- a/package/jack1/jack1.mk +++ b/package/jack1/jack1.mk @@ -11,8 +11,6 @@ JACK1_LICENSE = GPL-2.0+ (jack server), LGPL-2.1+ (jack library) JACK1_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL JACK1_INSTALL_STAGING = YES -# Dependency to celt can't be met: jack1 requires celt >= 0.8.0 but we -# only have 0.5.1.3 and we cannot upgrade. JACK1_DEPENDENCIES = host-pkgconf alsa-lib berkeleydb libsamplerate libsndfile ifeq ($(BR2_PACKAGE_READLINE),y) -- 2.34.1 From petr.vorel at gmail.com Sun Feb 6 14:34:46 2022 From: petr.vorel at gmail.com (Petr Vorel) Date: Sun, 6 Feb 2022 15:34:46 +0100 Subject: [Buildroot] [PATCH] package/nfs-utils: nfsiostat used python3, not python2 In-Reply-To: <87tudcw0zg.fsf@dell.be.48ers.dk> References: <20220206131758.28001-1-peter@korsgaard.com> <87tudcw0zg.fsf@dell.be.48ers.dk> Message-ID: Hi Peter, > >>>>> "Peter" == Peter Korsgaard writes: > s/used/uses/ in the subject naturally. +1 > > nfsiostat is a python3 script, so keep it if python3 is enabled and not > > python2: Good catch, thanks! Reviewed-by: Petr Vorel Kind regards, Petr > > head -n 1 target/usr/sbin/nfsiostat > > #!/usr/bin/python3 > > Signed-off-by: Peter Korsgaard > > --- > > package/nfs-utils/nfs-utils.mk | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk > > index 6a3a801359..44653e2707 100644 > > --- a/package/nfs-utils/nfs-utils.mk > > +++ b/package/nfs-utils/nfs-utils.mk > > @@ -114,7 +114,7 @@ define NFS_UTILS_REMOVE_NFSIOSTAT > > endef > > # nfsiostat is interpreted python, so remove it unless it's in the target > > -NFS_UTILS_POST_INSTALL_TARGET_HOOKS += $(if $(BR2_PACKAGE_PYTHON),,NFS_UTILS_REMOVE_NFSIOSTAT) > > +NFS_UTILS_POST_INSTALL_TARGET_HOOKS += $(if $(BR2_PACKAGE_PYTHON3),,NFS_UTILS_REMOVE_NFSIOSTAT) > > define HOST_NFS_UTILS_BUILD_CMDS > > $(MAKE) -C $(@D)/tools/rpcgen > > -- > > 2.20.1 From arnout at mind.be Sun Feb 6 14:35:20 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 6 Feb 2022 15:35:20 +0100 Subject: [Buildroot] [git commit] utils/docker-run: new script Message-ID: <20220206142819.E77CB82B2E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=242e9d72e7d2217d6213f63f65d93c5ba3b01f7c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 [Arnout: fix shellcheck errors; add exec] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- utils/docker-run | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/utils/docker-run b/utils/docker-run new file mode 100755 index 0000000000..0614f1325d --- /dev/null +++ b/utils/docker-run @@ -0,0 +1,10 @@ +#!/usr/bin/bash +set -o errexit -o pipefail +DIR=$(dirname "${0}") +MAIN_DIR=$(readlink -f "${DIR}/..") +# shellcheck disable=SC2016 +IMAGE=$(grep ^image: "${MAIN_DIR}/.gitlab-ci.yml" | \ + sed -e 's,^image: ,,g' | sed -e 's,\$CI_REGISTRY,registry.gitlab.com,g') + +set -x +exec docker run -v "${MAIN_DIR}:/home/br-user" -t "${IMAGE}" "$@" From arnout at mind.be Sun Feb 6 14:35:19 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 6 Feb 2022 15:35:19 +0100 Subject: [Buildroot] [git commit] support/docker: add python3-pytest Message-ID: <20220206142819.D6F4182BCD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a9061b7e689db1345afc863d9e60085dd2d83db8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master ... so the unit tests for check-package can run in the GitLab CI. Signed-off-by: Ricardo Martincoski Acked-by: Romain Naour 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 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 \ From arnout at mind.be Sun Feb 6 14:35:19 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 6 Feb 2022 15:35:19 +0100 Subject: [Buildroot] [git commit] utils/checkpackagelib: run unit tests on GitLab CI Message-ID: <20220206142819.DF20C82BD5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fcceee0b2ed2b36e6671c8209d17ccc4dd689548 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master ... so we can catch regressions on check-package. Update to the new docker image that was pushed after the previous commit. Signed-off-by: Ricardo Martincoski Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .gitlab-ci.yml | 2 +- support/misc/gitlab-ci.yml.in | 4 ++++ support/scripts/generate-gitlab-ci-yml | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ea4ec20a17..d54f46c409 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:20220105.2314 +image: $CI_REGISTRY/buildroot.org/buildroot/base:20220206.1324 stages: - generate-gitlab-ci 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) ) From arnout at mind.be Sun Feb 6 14:35:19 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 6 Feb 2022 15:35:19 +0100 Subject: [Buildroot] [git commit] utils/checkpackagelib: add unit tests Message-ID: <20220206142819.D06AA82B2E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fc254881e6dff16a9a4ff98ba981ca2a160e6483 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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(+) 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] From peter at korsgaard.com Sun Feb 6 14:36:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 06 Feb 2022 15:36:37 +0100 Subject: [Buildroot] [git commit] docs/manual/adding-packages-directory.txt: reorder select/depends In-Reply-To: <20220130140530.D72C082A75@busybox.osuosl.org> (Thomas Petazzoni via buildroot's message of "Sun, 30 Jan 2022 15:12:28 +0100") References: <20220130140530.D72C082A75@busybox.osuosl.org> Message-ID: <87czk0vz7u.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni via buildroot writes: > 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 Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Sun Feb 6 14:35:35 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 6 Feb 2022 15:35:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-tinyrpc: bump to version 1.1.4 Message-ID: <20220206143535.1754289-1-fontaine.fabrice@gmail.com> https://github.com/mbr/tinyrpc/compare/1.1.1...1.1.4 Signed-off-by: Fabrice Fontaine --- package/python-tinyrpc/python-tinyrpc.hash | 4 ++-- package/python-tinyrpc/python-tinyrpc.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-tinyrpc/python-tinyrpc.hash b/package/python-tinyrpc/python-tinyrpc.hash index c5bdad567e..d4bd348e61 100644 --- a/package/python-tinyrpc/python-tinyrpc.hash +++ b/package/python-tinyrpc/python-tinyrpc.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/tinyrpc/json -md5 34d7b41ab48297b6b8fbf937e3d43a57 tinyrpc-1.1.1.tar.gz -sha256 9e68d7b9688dac8deaa342a2507d04f0b2ece64a9d19382aa2ee13d692e87d7f tinyrpc-1.1.1.tar.gz +md5 cc7e62891eee806dfbbafb6e3875825e tinyrpc-1.1.4.tar.gz +sha256 c99f412e5d9849c2deb468ea37fee2faf12fbc95bdd3616ae5c276ea195ed6bd tinyrpc-1.1.4.tar.gz # Locally computed sha256 checksums sha256 587f1ea174824613f4a7e0d7fb95fda000a7f58ca17df12416e014c9ee82e619 LICENSE diff --git a/package/python-tinyrpc/python-tinyrpc.mk b/package/python-tinyrpc/python-tinyrpc.mk index f3f7dcc52b..e976778fa2 100644 --- a/package/python-tinyrpc/python-tinyrpc.mk +++ b/package/python-tinyrpc/python-tinyrpc.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TINYRPC_VERSION = 1.1.1 +PYTHON_TINYRPC_VERSION = 1.1.4 PYTHON_TINYRPC_SOURCE = tinyrpc-$(PYTHON_TINYRPC_VERSION).tar.gz -PYTHON_TINYRPC_SITE = https://files.pythonhosted.org/packages/6a/63/0851365686da1ca9ab03d63b035eccf87a1d85b743ce07d079462350da33 +PYTHON_TINYRPC_SITE = https://files.pythonhosted.org/packages/d2/86/2741f0c74cc339416c9803b6393eaf230254ecf36ffd839614799e15a202 PYTHON_TINYRPC_SETUP_TYPE = setuptools PYTHON_TINYRPC_LICENSE = MIT PYTHON_TINYRPC_LICENSE_FILES = LICENSE -- 2.34.1 From fontaine.fabrice at gmail.com Sun Feb 6 14:37:49 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 6 Feb 2022 15:37:49 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pysub: bump to version 1.2.1 Message-ID: <20220206143749.1754530-1-fontaine.fabrice@gmail.com> Update indentation in hash file (two spaces) https://github.com/pyusb/pyusb/releases/tag/v1.2.0 https://github.com/pyusb/pyusb/releases/tag/v1.2.1 Signed-off-by: Fabrice Fontaine --- package/python-pyusb/python-pyusb.hash | 8 ++++---- package/python-pyusb/python-pyusb.mk | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-pyusb/python-pyusb.hash b/package/python-pyusb/python-pyusb.hash index 9c634ef722..f08b212b3e 100644 --- a/package/python-pyusb/python-pyusb.hash +++ b/package/python-pyusb/python-pyusb.hash @@ -1,5 +1,5 @@ -# md5 from https://pypi.python.org/pypi/pyusb/json -md5 a9db479f1fb914e91d3106e67a13ae09 pyusb-1.1.1.tar.gz -# Locally computed -sha256 7d449ad916ce58aff60b89aae0b65ac130f289c24d6a5b7b317742eccffafc38 pyusb-1.1.1.tar.gz +# md5, sha256 from https://pypi.org/pypi/pyusb/json +md5 880008dff32dac8f58076b4e534492d9 pyusb-1.2.1.tar.gz +sha256 a4cc7404a203144754164b8b40994e2849fde1cfff06b08492f12fff9d9de7b9 pyusb-1.2.1.tar.gz +# Locally computed sha256 checksums sha256 03e39fdcee9c18f2f9d0c3500a993ddeac050695eb81070ea41347587c76a7fe LICENSE diff --git a/package/python-pyusb/python-pyusb.mk b/package/python-pyusb/python-pyusb.mk index dc81efde9e..2f4f9581b6 100644 --- a/package/python-pyusb/python-pyusb.mk +++ b/package/python-pyusb/python-pyusb.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYUSB_VERSION = 1.1.1 +PYTHON_PYUSB_VERSION = 1.2.1 PYTHON_PYUSB_SOURCE = pyusb-$(PYTHON_PYUSB_VERSION).tar.gz -PYTHON_PYUSB_SITE = https://files.pythonhosted.org/packages/b9/8d/25c4e446a07e918eb39b5af25c4a83a89db95ae44e4ed5a46c3c53b0a4d6 +PYTHON_PYUSB_SITE = https://files.pythonhosted.org/packages/d9/6e/433a5614132576289b8643fe598dd5d51b16e130fd591564be952e15bb45 PYTHON_PYUSB_LICENSE = BSD-3-Clause PYTHON_PYUSB_LICENSE_FILES = LICENSE PYTHON_PYUSB_SETUP_TYPE = setuptools -- 2.34.1 From fontaine.fabrice at gmail.com Sun Feb 6 14:39:18 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 6 Feb 2022 15:39:18 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/python-pyusb: bump to version 1.2.1 Message-ID: <20220206143918.1755288-1-fontaine.fabrice@gmail.com> Update indentation in hash file (two spaces) https://github.com/pyusb/pyusb/releases/tag/v1.2.0 https://github.com/pyusb/pyusb/releases/tag/v1.2.1 Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2: - Fix typo in commit title (pysub -> pyusb) package/python-pyusb/python-pyusb.hash | 8 ++++---- package/python-pyusb/python-pyusb.mk | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-pyusb/python-pyusb.hash b/package/python-pyusb/python-pyusb.hash index 9c634ef722..f08b212b3e 100644 --- a/package/python-pyusb/python-pyusb.hash +++ b/package/python-pyusb/python-pyusb.hash @@ -1,5 +1,5 @@ -# md5 from https://pypi.python.org/pypi/pyusb/json -md5 a9db479f1fb914e91d3106e67a13ae09 pyusb-1.1.1.tar.gz -# Locally computed -sha256 7d449ad916ce58aff60b89aae0b65ac130f289c24d6a5b7b317742eccffafc38 pyusb-1.1.1.tar.gz +# md5, sha256 from https://pypi.org/pypi/pyusb/json +md5 880008dff32dac8f58076b4e534492d9 pyusb-1.2.1.tar.gz +sha256 a4cc7404a203144754164b8b40994e2849fde1cfff06b08492f12fff9d9de7b9 pyusb-1.2.1.tar.gz +# Locally computed sha256 checksums sha256 03e39fdcee9c18f2f9d0c3500a993ddeac050695eb81070ea41347587c76a7fe LICENSE diff --git a/package/python-pyusb/python-pyusb.mk b/package/python-pyusb/python-pyusb.mk index dc81efde9e..2f4f9581b6 100644 --- a/package/python-pyusb/python-pyusb.mk +++ b/package/python-pyusb/python-pyusb.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYUSB_VERSION = 1.1.1 +PYTHON_PYUSB_VERSION = 1.2.1 PYTHON_PYUSB_SOURCE = pyusb-$(PYTHON_PYUSB_VERSION).tar.gz -PYTHON_PYUSB_SITE = https://files.pythonhosted.org/packages/b9/8d/25c4e446a07e918eb39b5af25c4a83a89db95ae44e4ed5a46c3c53b0a4d6 +PYTHON_PYUSB_SITE = https://files.pythonhosted.org/packages/d9/6e/433a5614132576289b8643fe598dd5d51b16e130fd591564be952e15bb45 PYTHON_PYUSB_LICENSE = BSD-3-Clause PYTHON_PYUSB_LICENSE_FILES = LICENSE PYTHON_PYUSB_SETUP_TYPE = setuptools -- 2.34.1 From peter at korsgaard.com Sun Feb 6 14:35:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 15:35:55 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] docs/manual/adding-packages-directory.txt: reorder select/depends Message-ID: <20220206143439.8B5A7818E5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=728ece090b894a9404d4944b453b78738774d721 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x >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 (cherry picked from commit 39458e33c1e0c4704fd1dbcd64b87cb7016c6deb) Signed-off-by: Peter Korsgaard --- 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 4ceb3fd772..54d96451fe 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 peter at korsgaard.com Sun Feb 6 14:35:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 15:35:50 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] docs/manual/adding-packages-directory.txt: reorder select/depends Message-ID: <20220206143445.3673B8152C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b8eb50e3dc924f06daf814b766116f6defac2924 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x >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 (cherry picked from commit 39458e33c1e0c4704fd1dbcd64b87cb7016c6deb) Signed-off-by: Peter Korsgaard --- 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 4ceb3fd772..54d96451fe 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 fontaine.fabrice at gmail.com Sun Feb 6 14:41:48 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 6 Feb 2022 15:41:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-lmdb: bump to version 1.3.0 Message-ID: <20220206144148.1755592-1-fontaine.fabrice@gmail.com> Update indentation in hash file (two spaces) https://github.com/jnwatson/py-lmdb/blob/py-lmdb_1.3.0/ChangeLog Signed-off-by: Fabrice Fontaine --- package/python-lmdb/python-lmdb.hash | 6 +++--- package/python-lmdb/python-lmdb.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-lmdb/python-lmdb.hash b/package/python-lmdb/python-lmdb.hash index e7b8ae3455..e50c35df67 100644 --- a/package/python-lmdb/python-lmdb.hash +++ b/package/python-lmdb/python-lmdb.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/lmdb/json -md5 b8f4a2cd1748e8a5f5e352d1cb3d4350 lmdb-1.2.1.tar.gz -sha256 5f76a90ebd08922acca11948779b5055f7a262687178e9e94f4e804b9f8465bc lmdb-1.2.1.tar.gz +md5 3c955c49be10a7a07a2fcd54d180c3af lmdb-1.3.0.tar.gz +sha256 60a11efc21aaf009d06518996360eed346f6000bfc9de05114374230879f992e lmdb-1.3.0.tar.gz # Locally computed sha256 checksums -sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE +sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE diff --git a/package/python-lmdb/python-lmdb.mk b/package/python-lmdb/python-lmdb.mk index 33c48cc8c7..fba168d340 100644 --- a/package/python-lmdb/python-lmdb.mk +++ b/package/python-lmdb/python-lmdb.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_LMDB_VERSION = 1.2.1 +PYTHON_LMDB_VERSION = 1.3.0 PYTHON_LMDB_SOURCE = lmdb-$(PYTHON_LMDB_VERSION).tar.gz -PYTHON_LMDB_SITE = https://files.pythonhosted.org/packages/2f/df/3aea5279753cb8ab0c96dec43106e24f388d4179d5224f6d3e652016c095 +PYTHON_LMDB_SITE = https://files.pythonhosted.org/packages/ed/61/41f3c7cbd8a67202ef24fad3375ed936093a0547dc645581dd11c09581b7 PYTHON_LMDB_LICENSE = OLDAP-2.8 PYTHON_LMDB_LICENSE_FILES = LICENSE PYTHON_LMDB_SETUP_TYPE = setuptools -- 2.34.1 From peter at korsgaard.com Sun Feb 6 14:50:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 06 Feb 2022 15:50:01 +0100 Subject: [Buildroot] [PATCH] board/andes: fix build failure with host gcc >= 10 In-Reply-To: <20220129231420.3470589-1-giulio.benetti@benettiengineering.com> (Giulio Benetti's message of "Sun, 30 Jan 2022 00:14:20 +0100") References: <20220129231420.3470589-1-giulio.benetti@benettiengineering.com> Message-ID: <878ruovyli.fsf@dell.be.48ers.dk> >>>>> "Giulio" == Giulio Benetti writes: > 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 Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 6 14:49:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 15:49:37 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] board/andes: fix build failure with host gcc >= 10 Message-ID: <20220206144251.E4E9A82BA0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b7dadab3e1c602fc98ad112ea622a3152862aead branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x 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 (cherry picked from commit 3529e8c21c939d73cc0090cb41c17b02db5b1013) Signed-off-by: Peter Korsgaard --- ...-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 peter at korsgaard.com Sun Feb 6 14:48:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 15:48:37 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] board/andes: fix build failure with host gcc >= 10 Message-ID: <20220206144259.6B70082BA0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6400186971ac3430e3827563b8bce73f15f18583 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x 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 (cherry picked from commit 3529e8c21c939d73cc0090cb41c17b02db5b1013) Signed-off-by: Peter Korsgaard --- ...-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 fontaine.fabrice at gmail.com Sun Feb 6 14:51:08 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 6 Feb 2022 15:51:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/lm-sensors: update LM_SENSORS_VERSION Message-ID: <20220206145108.1757971-1-fontaine.fabrice@gmail.com> Update LM_SENSORS_VERSION to make it match what is returned by https://release-monitoring.org Signed-off-by: Fabrice Fontaine --- package/lm-sensors/lm-sensors.hash | 2 +- package/lm-sensors/lm-sensors.mk | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/lm-sensors/lm-sensors.hash b/package/lm-sensors/lm-sensors.hash index 0ca07b7e69..c941043343 100644 --- a/package/lm-sensors/lm-sensors.hash +++ b/package/lm-sensors/lm-sensors.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 0591f9fa0339f0d15e75326d0365871c2d4e2ed8aa1ff759b3a55d3734b7d197 lm-sensors-3-6-0.tar.gz +sha256 0591f9fa0339f0d15e75326d0365871c2d4e2ed8aa1ff759b3a55d3734b7d197 lm-sensors-3.6.0.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL diff --git a/package/lm-sensors/lm-sensors.mk b/package/lm-sensors/lm-sensors.mk index 8975efaffa..1bf27fc25a 100644 --- a/package/lm-sensors/lm-sensors.mk +++ b/package/lm-sensors/lm-sensors.mk @@ -4,8 +4,9 @@ # ################################################################################ -LM_SENSORS_VERSION = 3-6-0 -LM_SENSORS_SITE = $(call github,lm-sensors,lm-sensors,V$(LM_SENSORS_VERSION)) +LM_SENSORS_VERSION = 3.6.0 +LM_SENSORS_SITE = \ + $(call github,lm-sensors,lm-sensors,V$(subst .,-,$(LM_SENSORS_VERSION))) LM_SENSORS_INSTALL_STAGING = YES LM_SENSORS_DEPENDENCIES = host-bison host-flex LM_SENSORS_LICENSE = LGPL-2.1+ (libsensors), GPL-2.0+ (programs) -- 2.34.1 From peter at korsgaard.com Sun Feb 6 14:52:29 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 15:52:29 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/pkcs11-helper: drop autoreconf Message-ID: <20220206144700.60FD382BBB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=95f5dcef1ba2c05a5ef23f619dac24c067148624 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x 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 (cherry picked from commit 59f8a971ae6c8f88bf99dede56946e701a2c1b40) Signed-off-by: Peter Korsgaard --- 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 peter at korsgaard.com Sun Feb 6 14:55:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 06 Feb 2022 15:55:02 +0100 Subject: [Buildroot] [PATCH 1/2] package/pkcs11-helper: drop autoreconf In-Reply-To: <20220128215013.2997212-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 28 Jan 2022 22:50:12 +0100") References: <20220128215013.2997212-1-fontaine.fabrice@gmail.com> Message-ID: <874k5cvyd5.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > autoreconf is not needed since commit > dbf8047f64f081ffbc97b67dd891690632377692 as the official tarball already > ships a configure file > Signed-off-by: Fabrice Fontaine Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 6 14:55:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 15:55:43 +0100 Subject: [Buildroot] [git commit] package/nfs-utils: nfsiostat uses python3, not python2 Message-ID: <20220206144852.55256817FB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cee035e4391417851fbbf41a1d4eb0c4d2ad60d4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master nfsiostat is a python3 script, so keep it if python3 is enabled and not python2: head -n 1 target/usr/sbin/nfsiostat #!/usr/bin/python3 Signed-off-by: Peter Korsgaard Reviewed-by: Petr Vorel Signed-off-by: Peter Korsgaard --- package/nfs-utils/nfs-utils.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk index 6a3a801359..44653e2707 100644 --- a/package/nfs-utils/nfs-utils.mk +++ b/package/nfs-utils/nfs-utils.mk @@ -114,7 +114,7 @@ define NFS_UTILS_REMOVE_NFSIOSTAT endef # nfsiostat is interpreted python, so remove it unless it's in the target -NFS_UTILS_POST_INSTALL_TARGET_HOOKS += $(if $(BR2_PACKAGE_PYTHON),,NFS_UTILS_REMOVE_NFSIOSTAT) +NFS_UTILS_POST_INSTALL_TARGET_HOOKS += $(if $(BR2_PACKAGE_PYTHON3),,NFS_UTILS_REMOVE_NFSIOSTAT) define HOST_NFS_UTILS_BUILD_CMDS $(MAKE) -C $(@D)/tools/rpcgen From peter at korsgaard.com Sun Feb 6 14:56:12 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 06 Feb 2022 15:56:12 +0100 Subject: [Buildroot] [PATCH] package/nfs-utils: nfsiostat used python3, not python2 In-Reply-To: (Petr Vorel's message of "Sun, 6 Feb 2022 15:34:46 +0100") References: <20220206131758.28001-1-peter@korsgaard.com> <87tudcw0zg.fsf@dell.be.48ers.dk> Message-ID: <87zgn4ujqr.fsf@dell.be.48ers.dk> >>>>> "Petr" == Petr Vorel writes: > Hi Peter, >> >>>>> "Peter" == Peter Korsgaard writes: >> s/used/uses/ in the subject naturally. > +1 >> > nfsiostat is a python3 script, so keep it if python3 is enabled and not >> > python2: > Good catch, thanks! > Reviewed-by: Petr Vorel Committed, thanks. -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Sun Feb 6 14:57:40 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 6 Feb 2022 15:57:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/protozero: bump to version 1.7.1 Message-ID: <20220206145740.1765660-1-fontaine.fabrice@gmail.com> Drop patch (already in version) https://github.com/mapbox/protozero/releases/tag/v1.7.1 Signed-off-by: Fabrice Fontaine --- ...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.34.1 From peter at korsgaard.com Sun Feb 6 15:21:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 06 Feb 2022 16:21:07 +0100 Subject: [Buildroot] [PATCH] package/apitrace: fix build failure on m68k architecture In-Reply-To: <20220129183426.152177-1-giulio.benetti@benettiengineering.com> (Giulio Benetti's message of "Sat, 29 Jan 2022 19:34:26 +0100") References: <20220129183426.152177-1-giulio.benetti@benettiengineering.com> Message-ID: <87v8xsuil8.fsf@dell.be.48ers.dk> >>>>> "Giulio" == Giulio Benetti writes: > 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 Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 6 15:20:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 16:20:06 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/apitrace: fix build failure on m68k architecture Message-ID: <20220206151401.9462782A9A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=08e8792c50685c1a8c2be7609943990f6083f714 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x 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 Signed-off-by: Thomas Petazzoni (cherry picked from commit fdee6c9f3987189eb743f54be2e545ce84d4d3bb) Signed-off-by: Peter Korsgaard --- 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)" From peter at korsgaard.com Sun Feb 6 15:28:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 06 Feb 2022 16:28:05 +0100 Subject: [Buildroot] [git commit] package/pistache: disable package if BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597=y In-Reply-To: <20220130215213.700B8817E3@busybox.osuosl.org> (Thomas Petazzoni via buildroot's message of "Sun, 30 Jan 2022 22:58:44 +0100") References: <20220130215213.700B8817E3@busybox.osuosl.org> Message-ID: <87r18gui9m.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni via buildroot writes: > commit: https://git.buildroot.net/buildroot/commit/?id=d5b08f37a4c3fb4f56f2ca440bafc865bdf04bfe > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Package pistache is affected by binutils bug 27597 (Nios II), so let's > disable it when BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597=y. Let's also > indent the comment dependencies. > Fixes: > http://autobuild.buildroot.net/results/0e7b74c5a07ced2bbae1a0a8c7d7ba26dfa04031/ > 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 Sun Feb 6 15:27:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 16:27:36 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/pistache: disable package if BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597=y Message-ID: <20220206152053.C8C9A8267F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=afcbd7abc4354d9aa3e312a723fc4374bbce919b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Package pistache is affected by binutils bug 27597 (Nios II), so let's disable it when BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597=y. Let's also indent the comment dependencies. Fixes: http://autobuild.buildroot.net/results/0e7b74c5a07ced2bbae1a0a8c7d7ba26dfa04031/ Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni (cherry picked from commit d5b08f37a4c3fb4f56f2ca440bafc865bdf04bfe) Signed-off-by: Peter Korsgaard --- 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 From peter at korsgaard.com Sun Feb 6 15:27:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 16:27:15 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/pistache: disable package if BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597=y Message-ID: <20220206152105.624FC8267F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eb7af923b23a444d3e79c8e7131ed6a03a8b2d9c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Package pistache is affected by binutils bug 27597 (Nios II), so let's disable it when BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597=y. Let's also indent the comment dependencies. Fixes: http://autobuild.buildroot.net/results/0e7b74c5a07ced2bbae1a0a8c7d7ba26dfa04031/ Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni (cherry picked from commit d5b08f37a4c3fb4f56f2ca440bafc865bdf04bfe) Signed-off-by: Peter Korsgaard --- 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 From peter at korsgaard.com Sun Feb 6 15:30:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 16:30:47 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/log4cxx: change download URL to https Message-ID: <20220206152340.0652C829FB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e46015c705e18097827e59cfc6fdee8e3dfccd92 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x - change download URL to https Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni (cherry picked from commit 0876da5ea1a9bd74737a4ccef2995f124368bb86) Signed-off-by: Peter Korsgaard --- 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 0ddea9466a..2bf70a99d2 100644 --- a/package/log4cxx/log4cxx.mk +++ b/package/log4cxx/log4cxx.mk @@ -5,7 +5,7 @@ ################################################################################ LOG4CXX_VERSION = 0.11.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 From peter at korsgaard.com Sun Feb 6 15:31:14 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 06 Feb 2022 16:31:14 +0100 Subject: [Buildroot] [PATCH v1 1/3] package/log4cxx: change download URL to https In-Reply-To: <20220128124538.31789-1-ps.report@gmx.net> (Peter Seiderer's message of "Fri, 28 Jan 2022 13:45:36 +0100") References: <20220128124538.31789-1-ps.report@gmx.net> Message-ID: <87mtj4ui4d.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > - change download URL 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 Sun Feb 6 15:34:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 06 Feb 2022 16:34:24 +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> (Peter Seiderer's message of "Fri, 28 Jan 2022 13:45:37 +0100") References: <20220128124538.31789-1-ps.report@gmx.net> <20220128124538.31789-2-ps.report@gmx.net> Message-ID: <87iltsuhz3.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > - 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 Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 6 15:34:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 06 Feb 2022 16:34:35 +0100 Subject: [Buildroot] [PATCH v1 3/3] package/log4cxx: bump version to 0.12.1 In-Reply-To: <20220128124538.31789-3-ps.report@gmx.net> (Peter Seiderer's message of "Fri, 28 Jan 2022 13:45:38 +0100") References: <20220128124538.31789-1-ps.report@gmx.net> <20220128124538.31789-3-ps.report@gmx.net> Message-ID: <87ee4guhys.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > - 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 Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 6 15:34:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 16:34:05 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/log4cxx: fix boost-fallback (only check for boost if really needed) Message-ID: <20220206152743.D98D682BBB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2a660956f3a14453d05831ad874e756bb39e3c86 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x - 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 Signed-off-by: Thomas Petazzoni (cherry picked from commit d76301be855d6d05af5aa5860e1d31385c197d16) Signed-off-by: Peter Korsgaard --- ...ack-only-check-for-boost-if-really-needed.patch | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) 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 + From peter at korsgaard.com Sun Feb 6 15:29:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 16:29:08 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/log4cxx: change download URL to https Message-ID: <20220206152743.D0A08829FB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f0b03fb9423652804aa5b16a8789a453527b7ba9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x - change download URL to https Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni (cherry picked from commit 0876da5ea1a9bd74737a4ccef2995f124368bb86) Signed-off-by: Peter Korsgaard --- 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 From peter at korsgaard.com Sun Feb 6 15:34:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 16:34:16 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/log4cxx: bump version to 0.12.1 Message-ID: <20220206152743.E59BC82BD7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9ff7b2165762d45479bfa2527c9ed10d2928e4cd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x - 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 Signed-off-by: Thomas Petazzoni (cherry picked from commit 38659ff0cb5b3d8a340adf5ff631200103f53e67) Signed-off-by: Peter Korsgaard --- package/log4cxx/0001-LOGCXX-528.patch | 189 --------------------- ...ck-only-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(-) 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 From arnout at mind.be Sun Feb 6 15:37:09 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 6 Feb 2022 16:37:09 +0100 Subject: [Buildroot] [PATCH 1/1] docs/manual: add section on start script recommendations In-Reply-To: <20211205102010.2834942-1-troglobit@gmail.com> References: <20211205102010.2834942-1-troglobit@gmail.com> Message-ID: On 05/12/2021 11:20, Joachim Wiberg wrote: > Signed-off-by: Joachim Wiberg > --- > docs/manual/adding-packages-directory.txt | 96 +++++++++++++++++++++++ > docs/manual/configure.txt | 1 + > 2 files changed, 97 insertions(+) > > diff --git a/docs/manual/adding-packages-directory.txt b/docs/manual/adding-packages-directory.txt > index 4ceb3fd772..72e8dac5ff 100644 > --- a/docs/manual/adding-packages-directory.txt > +++ b/docs/manual/adding-packages-directory.txt > @@ -554,3 +554,99 @@ over time. Such patches should not be downloaded, and instead be added > locally to the package folder. > > If the +.hash+ file is missing, then no check is done at all. > + > +[[adding-packages-start-script]] > +=== The +SNNfood+ start script > + > +Packages that provide a system daemon usually need to be started somehow > +at boot. Buildroot comes with support for several init systems, some > +are considered tier one (see xref:init-system[]), while others are also > +available but do not have the same level of integration. The > +recommended one in Buildroot is the BusyBox init. I think the intention is that systemd is at the same level as busybox init. And we generally don't distinguish between busybox init and SysV init. I made a few other small changes to the text and applied to master, thanks. Regards, Arnout > + > +All packages providing a system daemon must provide a start script for > +BusyBox init, and should provide a systemd unit file. For consistency, > +the init script must follow the style and composition as defined in the > +reference: +package/busybox/S01syslogd+. There is no recommendation for > +systemd unit files, but if a package comes with its own unit file, that > +is preferred over a local one. Provided of course that the unit file > +is compatible with a Buildroot system. > + > +The name of the start script is composed of the +SNN+ and the daemon > +name. The +NN+ is the start order number which needs to be carefully > +chosen. For example, a program that requires networking to be up should > +not start before +S40network+. The scripts are started in alphabetical > +order, so +S01syslogd+ starts before +S01watchdogd+, and +S02sysctl+ > +start thereafter. > + > +------------------------------ > +01: #!/bin/sh > +02: > +03: DAEMON="syslogd" > +04: PIDFILE="/var/run/$DAEMON.pid" > +05: > +06: SYSLOGD_ARGS="" > +07: > +08: # shellcheck source=/dev/null > +09: [ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" > +10: > +11: # BusyBox' syslogd does not create a pidfile, so pass "-n" in the command line > +12: # and use "-m" to instruct start-stop-daemon to create one. > +13: start() { > +14: printf 'Starting %s: ' "$DAEMON" > +15: # shellcheck disable=SC2086 # we need the word splitting > +16: start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/sbin/$DAEMON" \ > +17: -- -n $SYSLOGD_ARGS > +18: status=$? > +19: if [ "$status" -eq 0 ]; then > +20: echo "OK" > +21: else > +22: echo "FAIL" > +23: fi > +24: return "$status" > +25: } > +26: > +27: stop() { > +28: printf 'Stopping %s: ' "$DAEMON" > +29: start-stop-daemon -K -q -p "$PIDFILE" > +30: status=$? > +31: if [ "$status" -eq 0 ]; then > +32: rm -f "$PIDFILE" > +33: echo "OK" > +34: else > +35: echo "FAIL" > +36: fi > +37: return "$status" > +38: } > +39: > +40: restart() { > +41: stop > +42: sleep 1 > +43: start > +44: } > +45: > +46: case "$1" in > +47: start|stop|restart) > +48: "$1";; > +49: reload) > +50: # Restart, since there is no true "reload" feature. > +51: restart;; > +52: *) > +53: echo "Usage: $0 {start|stop|restart|reload}" > +54: exit 1 > +55: esac > +------------------------------ > + > +*Note:* programs that support reloading their configuration in some > +fashion (+SIGHUP+) should provide a +reload()+ function similar to > ++stop()+. The +start-stop-daemon+ supports +-K -s HUP+ for this. > +It is recommended to always append +-x "/sbin/$DAEMON"+ to all the > ++start-stop-daemon+ commands to ensure signals are set to a PID that > +matches +$DAEMON+. > + > +Both start scripts and unit files can source command line arguments from > ++/etc/default/foo+, in general, if such a file does not exist it should > +not block the start of the daemon, unless there is some site specirfic > +command line argument the daemon requires to start. For start scripts a > ++FOO_ARGS="-s -o -m -e -args"+ can be defined to a default value in and > +the user can override this from +/etc/default/foo+. > diff --git a/docs/manual/configure.txt b/docs/manual/configure.txt > index c9eef567f4..60860d2c71 100644 > --- a/docs/manual/configure.txt > +++ b/docs/manual/configure.txt > @@ -377,6 +377,7 @@ good solution. > Note that if +systemd+ is chosen as init system, /dev management will > be performed by the +udev+ program provided by +systemd+. > > +[[init-system]] > === init system > > The _init_ program is the first userspace program started by the From arnout at mind.be Sun Feb 6 15:35:53 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 6 Feb 2022 16:35:53 +0100 Subject: [Buildroot] [git commit] docs/manual: add section on start script recommendations Message-ID: <20220206153008.BB1268156C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4fe33a1b47ba9c1e90c2c794cefb13962ea89b99 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Joachim Wiberg Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- docs/manual/adding-packages-directory.txt | 96 +++++++++++++++++++++++++++++++ docs/manual/configure.txt | 1 + 2 files changed, 97 insertions(+) diff --git a/docs/manual/adding-packages-directory.txt b/docs/manual/adding-packages-directory.txt index e5c7462a6c..749e2d43b9 100644 --- a/docs/manual/adding-packages-directory.txt +++ b/docs/manual/adding-packages-directory.txt @@ -547,3 +547,99 @@ over time. Such patches should not be downloaded, and instead be added locally to the package folder. If the +.hash+ file is missing, then no check is done at all. + +[[adding-packages-start-script]] +=== The +SNNfoo+ start script + +Packages that provide a system daemon usually need to be started somehow +at boot. Buildroot comes with support for several init systems, some +are considered tier one (see xref:init-system[]), while others are also +available but do not have the same level of integration. Ideally, all +packages providing a system daemon should provide a start script for +BusyBox/SysV init and a systemd unit file. + +For consistency, the start script must follow the style and composition +as shown in the reference: +package/busybox/S01syslogd+. An annotated +example of this style is shown below. There is no specific coding style +for systemd unit files, but if a package comes with its own unit file, +that is preferred over a buildroot specific one, if it is compatible +with buildroot. + +The name of the start script is composed of the +SNN+ and the daemon +name. The +NN+ is the start order number which needs to be carefully +chosen. For example, a program that requires networking to be up should +not start before +S40network+. The scripts are started in alphabetical +order, so +S01syslogd+ starts before +S01watchdogd+, and +S02sysctl+ +start thereafter. + +------------------------------ +01: #!/bin/sh +02: +03: DAEMON="syslogd" +04: PIDFILE="/var/run/$DAEMON.pid" +05: +06: SYSLOGD_ARGS="" +07: +08: # shellcheck source=/dev/null +09: [ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" +10: +11: # BusyBox' syslogd does not create a pidfile, so pass "-n" in the command line +12: # and use "-m" to instruct start-stop-daemon to create one. +13: start() { +14: printf 'Starting %s: ' "$DAEMON" +15: # shellcheck disable=SC2086 # we need the word splitting +16: start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/sbin/$DAEMON" \ +17: -- -n $SYSLOGD_ARGS +18: status=$? +19: if [ "$status" -eq 0 ]; then +20: echo "OK" +21: else +22: echo "FAIL" +23: fi +24: return "$status" +25: } +26: +27: stop() { +28: printf 'Stopping %s: ' "$DAEMON" +29: start-stop-daemon -K -q -p "$PIDFILE" +30: status=$? +31: if [ "$status" -eq 0 ]; then +32: rm -f "$PIDFILE" +33: echo "OK" +34: else +35: echo "FAIL" +36: fi +37: return "$status" +38: } +39: +40: restart() { +41: stop +42: sleep 1 +43: start +44: } +45: +46: case "$1" in +47: start|stop|restart) +48: "$1";; +49: reload) +50: # Restart, since there is no true "reload" feature. +51: restart;; +52: *) +53: echo "Usage: $0 {start|stop|restart|reload}" +54: exit 1 +55: esac +------------------------------ + +*Note:* programs that support reloading their configuration in some +fashion (+SIGHUP+) should provide a +reload()+ function similar to ++stop()+. The +start-stop-daemon+ supports +-K -s HUP+ for this. +It is recommended to always append +-x "/sbin/$DAEMON"+ to all the ++start-stop-daemon+ commands to ensure signals are set to a PID that +matches +$DAEMON+. + +Both start scripts and unit files can source command line arguments from ++/etc/default/foo+, in general, if such a file does not exist it should +not block the start of the daemon, unless there is some site specirfic +command line argument the daemon requires to start. For start scripts a ++FOO_ARGS="-s -o -m -e -args"+ can be defined to a default value in and +the user can override this from +/etc/default/foo+. diff --git a/docs/manual/configure.txt b/docs/manual/configure.txt index c9eef567f4..60860d2c71 100644 --- a/docs/manual/configure.txt +++ b/docs/manual/configure.txt @@ -377,6 +377,7 @@ good solution. Note that if +systemd+ is chosen as init system, /dev management will be performed by the +udev+ program provided by +systemd+. +[[init-system]] === init system The _init_ program is the first userspace program started by the From peter at korsgaard.com Sun Feb 6 16:24:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 06 Feb 2022 17:24:55 +0100 Subject: [Buildroot] [PATCH 1/1] package/connman: bump to version 1.41 In-Reply-To: <20220130222317.2830755-1-james.hilliard1@gmail.com> (James Hilliard's message of "Sun, 30 Jan 2022 15:23:17 -0700") References: <20220130222317.2830755-1-james.hilliard1@gmail.com> Message-ID: <87a6f4ufmw.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard This fixes a number of security issues, so it should ideally have been tagged as a security bump: https://www.openwall.com/lists/oss-security/2022/01/25/1 Committed to 2021.02.x and 2021.11.x with that fixed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 6 15:48:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 16:48:16 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/connman: security bump to version 1.41 Message-ID: <20220206161747.9E8FC82931@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1dd480525f763cbcd7a50960d99cff89a0b0d5ea branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fixes the following security issues: - CVE-2022-23096: An issue was discovered in the DNS proxy in Connman through 1.40. The TCP server reply implementation lacks a check for the presence of sufficient Header Data, leading to an out-of-bounds read. - CVE-2022-23097: An issue was discovered in the DNS proxy in Connman through 1.40. forward_dns_reply mishandles a strnlen call, leading to an out-of-bounds read. - CVE-2022-23098: An issue was discovered in the DNS proxy in Connman through 1.40. The TCP server reply implementation has an infinite loop if no data is received. For details, see the advisory: https://www.openwall.com/lists/oss-security/2022/01/25/1 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni (cherry picked from commit 35a3c018246813597db52ef65b36a295ebdd9285) Signed-off-by: Peter Korsgaard --- package/connman/connman.hash | 2 +- package/connman/connman.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/connman/connman.hash b/package/connman/connman.hash index 797448337c..6fc5edf29a 100644 --- a/package/connman/connman.hash +++ b/package/connman/connman.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/network/connman/sha256sums.asc -sha256 1a57ae7ce234aa3a1744aac3be5c2121d98dce999440ef8ab9cc4edfd5edcb12 connman-1.40.tar.xz +sha256 79fb40f4fdd5530c45aa8e592fb16ba23d3674f3a98cf10b89a6576f198de589 connman-1.41.tar.xz # Locally computed sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING diff --git a/package/connman/connman.mk b/package/connman/connman.mk index 8c66a69882..61851bd2dc 100644 --- a/package/connman/connman.mk +++ b/package/connman/connman.mk @@ -4,7 +4,7 @@ # ################################################################################ -CONNMAN_VERSION = 1.40 +CONNMAN_VERSION = 1.41 CONNMAN_SOURCE = connman-$(CONNMAN_VERSION).tar.xz CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman CONNMAN_DEPENDENCIES = libglib2 dbus From peter at korsgaard.com Sun Feb 6 15:45:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 16:45:33 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/connman: security bump to version 1.41 Message-ID: <20220206161751.8BB7082BD9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b9794087bd971cfb49a22ca2ad01d754b1c47f53 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fixes the following security issues: - CVE-2022-23096: An issue was discovered in the DNS proxy in Connman through 1.40. The TCP server reply implementation lacks a check for the presence of sufficient Header Data, leading to an out-of-bounds read. - CVE-2022-23097: An issue was discovered in the DNS proxy in Connman through 1.40. forward_dns_reply mishandles a strnlen call, leading to an out-of-bounds read. - CVE-2022-23098: An issue was discovered in the DNS proxy in Connman through 1.40. The TCP server reply implementation has an infinite loop if no data is received. For details, see the advisory: https://www.openwall.com/lists/oss-security/2022/01/25/1 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni (cherry picked from commit 35a3c018246813597db52ef65b36a295ebdd9285) Signed-off-by: Peter Korsgaard --- package/connman/connman.hash | 2 +- package/connman/connman.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/connman/connman.hash b/package/connman/connman.hash index 797448337c..6fc5edf29a 100644 --- a/package/connman/connman.hash +++ b/package/connman/connman.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/network/connman/sha256sums.asc -sha256 1a57ae7ce234aa3a1744aac3be5c2121d98dce999440ef8ab9cc4edfd5edcb12 connman-1.40.tar.xz +sha256 79fb40f4fdd5530c45aa8e592fb16ba23d3674f3a98cf10b89a6576f198de589 connman-1.41.tar.xz # Locally computed sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING diff --git a/package/connman/connman.mk b/package/connman/connman.mk index 8c66a69882..61851bd2dc 100644 --- a/package/connman/connman.mk +++ b/package/connman/connman.mk @@ -4,7 +4,7 @@ # ################################################################################ -CONNMAN_VERSION = 1.40 +CONNMAN_VERSION = 1.41 CONNMAN_SOURCE = connman-$(CONNMAN_VERSION).tar.xz CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman CONNMAN_DEPENDENCIES = libglib2 dbus From arnout at mind.be Sun Feb 6 17:27:03 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 6 Feb 2022 18:27:03 +0100 Subject: [Buildroot] [git commit] support/docker: add shellcheck Message-ID: <20220206172023.5513882C83@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=236e2343f39b0aeb6aa18be26c92a0dee7fd656e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Acked-by: Romain Naour 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 120e301b7c..f54c31b54a 100644 --- a/support/docker/Dockerfile +++ b/support/docker/Dockerfile @@ -45,6 +45,7 @@ RUN apt-get install -y --no-install-recommends \ qemu-system-arm \ qemu-system-x86 \ rsync \ + shellcheck \ subversion \ unzip \ wget \ From arnout at mind.be Sun Feb 6 17:26:20 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 6 Feb 2022 18:26:20 +0100 Subject: [Buildroot] [git commit] utils/checkpackagelib: warn about executable files Message-ID: <20220206172023.42B7482BDD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7947328de48cbea36cadf2d41b0b401da761ba37 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Currently there are no .mk, Config.in, .patch or .hash files with executable permissions in the tree. But we don't want to have that. So warn when a file checked by check-package has executable permission. This check will be reused when testing SysV init scripts in the tree. Signed-off-by: Ricardo Martincoski [Arnout: use context manager for temp dir so it gets deleted] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- utils/checkpackagelib/lib_config.py | 1 + utils/checkpackagelib/lib_hash.py | 1 + utils/checkpackagelib/lib_mk.py | 1 + utils/checkpackagelib/lib_patch.py | 1 + utils/checkpackagelib/test_tool.py | 41 +++++++++++++++++++++++++++++++++++++ utils/checkpackagelib/tool.py | 8 ++++++++ 6 files changed, 53 insertions(+) diff --git a/utils/checkpackagelib/lib_config.py b/utils/checkpackagelib/lib_config.py index c348eec399..b05831f2c3 100644 --- a/utils/checkpackagelib/lib_config.py +++ b/utils/checkpackagelib/lib_config.py @@ -10,6 +10,7 @@ from checkpackagelib.lib import ConsecutiveEmptyLines # noqa: F401 from checkpackagelib.lib import EmptyLastLine # noqa: F401 from checkpackagelib.lib import NewlineAtEof # noqa: F401 from checkpackagelib.lib import TrailingSpace # noqa: F401 +from checkpackagelib.tool import NotExecutable # noqa: F401 def _empty_or_comment(text): diff --git a/utils/checkpackagelib/lib_hash.py b/utils/checkpackagelib/lib_hash.py index 1c595e84b8..5968c809bf 100644 --- a/utils/checkpackagelib/lib_hash.py +++ b/utils/checkpackagelib/lib_hash.py @@ -10,6 +10,7 @@ from checkpackagelib.lib import ConsecutiveEmptyLines # noqa: F401 from checkpackagelib.lib import EmptyLastLine # noqa: F401 from checkpackagelib.lib import NewlineAtEof # noqa: F401 from checkpackagelib.lib import TrailingSpace # noqa: F401 +from checkpackagelib.tool import NotExecutable # noqa: F401 def _empty_line_or_comment(text): diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py index 88e4b15c7c..153754b6f1 100644 --- a/utils/checkpackagelib/lib_mk.py +++ b/utils/checkpackagelib/lib_mk.py @@ -13,6 +13,7 @@ from checkpackagelib.lib import EmptyLastLine # noqa: F401 from checkpackagelib.lib import NewlineAtEof # noqa: F401 from checkpackagelib.lib import TrailingSpace # noqa: F401 from checkpackagelib.lib import Utf8Characters # noqa: F401 +from checkpackagelib.tool import NotExecutable # noqa: F401 # used in more than one check start_conditional = ["ifdef", "ifeq", "ifndef", "ifneq"] diff --git a/utils/checkpackagelib/lib_patch.py b/utils/checkpackagelib/lib_patch.py index e4e914b7f0..caee36158f 100644 --- a/utils/checkpackagelib/lib_patch.py +++ b/utils/checkpackagelib/lib_patch.py @@ -8,6 +8,7 @@ import re from checkpackagelib.base import _CheckFunction from checkpackagelib.lib import NewlineAtEof # noqa: F401 +from checkpackagelib.tool import NotExecutable # noqa: F401 class ApplyOrder(_CheckFunction): diff --git a/utils/checkpackagelib/test_tool.py b/utils/checkpackagelib/test_tool.py new file mode 100644 index 0000000000..51c8e0cb27 --- /dev/null +++ b/utils/checkpackagelib/test_tool.py @@ -0,0 +1,41 @@ +import os +import pytest +import re +import tempfile +import checkpackagelib.tool as m + +workdir_regex = re.compile(r'/tmp/tmp[^/]*-checkpackagelib-test-tool') + + +def check_file(tool, filename, string, permissions=None): + with tempfile.TemporaryDirectory(suffix='-checkpackagelib-test-tool') as workdir: + script = os.path.join(workdir, filename) + with open(script, 'wb') as f: + f.write(string.encode()) + if permissions: + os.chmod(script, permissions) + obj = tool(script) + result = obj.run() + if result is None: + return [] + return [workdir_regex.sub('dir', r) for r in result] + + +NotExecutable = [ + ('664', + 'package.mk', + 0o664, + '', + []), + ('775', + 'package.mk', + 0o775, + '', + ["dir/package.mk:0: This file does not need to be executable"]), + ] + + + at pytest.mark.parametrize('testname,filename,permissions,string,expected', NotExecutable) +def test_NotExecutable(testname, filename, permissions, string, expected): + warnings = check_file(m.NotExecutable, filename, string, permissions) + assert warnings == expected diff --git a/utils/checkpackagelib/tool.py b/utils/checkpackagelib/tool.py new file mode 100644 index 0000000000..f2007be1ff --- /dev/null +++ b/utils/checkpackagelib/tool.py @@ -0,0 +1,8 @@ +import os +from checkpackagelib.base import _Tool + + +class NotExecutable(_Tool): + def run(self): + if os.access(self.filename, os.X_OK): + return ["{}:0: This file does not need to be executable".format(self.filename)] From arnout at mind.be Sun Feb 6 17:27:03 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 6 Feb 2022 18:27:03 +0100 Subject: [Buildroot] [git commit] utils/checkpackagelib/lib_sysv: run shellcheck Message-ID: <20220206172023.5E1EE82BA3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d409fe085663194cbe23fbbfef38f566c4910bb8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For simplicity, when shellcheck returns one or more warnings, count it as a single check-package warning. The developer can get the full output either by running shellcheck directly or by calling check-package with -v. Examples: |$ ./utils/docker-run utils/check-package --include Shellcheck package/polkit/S50polkit |package/polkit/S50polkit:0: run 'shellcheck' and fix the warnings |51 lines processed |1 warnings generated |$ ./utils/docker-run utils/check-package --include Shellcheck -v package/polkit/S50polkit |package/polkit/S50polkit:0: run 'shellcheck' and fix the warnings |In package/polkit/S50polkit line 43: |< tab >start|stop|restart|reload) | ^----^ SC2221: This pattern always overrides a later one on line 45. |In package/polkit/S50polkit line 45: |< tab >reload) | ^----^ SC2222: This pattern never matches because of a previous pattern on line 43. |For more information: | https://www.shellcheck.net/wiki/SC2221 -- This pattern always overrides a l... | https://www.shellcheck.net/wiki/SC2222 -- This pattern never matches becaus... |51 lines processed |1 warnings generated NOTICE: shellcheck results depends on the version of the tool. This is why the examples above run inside the docker image. Also update .gitlab-ci.yml with the docker image after the change of the previous commit. We don't actually use shellcheck in CI, but the image from .gitlab-ci.yml is used by the docker-run script and we use that to run shellcheck. Signed-off-by: Ricardo Martincoski [Arnout: make sure a single -v is enough to get shellcheck output; update docker image tag in .gitlab-ci.yml] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .gitlab-ci.yml | 2 +- utils/checkpackagelib/lib_sysv.py | 1 + utils/checkpackagelib/test_tool.py | 46 ++++++++++++++++++++++++++++++++++++++ utils/checkpackagelib/tool.py | 16 +++++++++++++ 4 files changed, 64 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d54f46c409..cad35c96bc 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:20220206.1324 +image: $CI_REGISTRY/buildroot.org/buildroot/base:20220206.1756 stages: - generate-gitlab-ci diff --git a/utils/checkpackagelib/lib_sysv.py b/utils/checkpackagelib/lib_sysv.py index 2ee5f74af7..386d085afc 100644 --- a/utils/checkpackagelib/lib_sysv.py +++ b/utils/checkpackagelib/lib_sysv.py @@ -7,6 +7,7 @@ from checkpackagelib.lib import EmptyLastLine # noqa: F401 from checkpackagelib.lib import NewlineAtEof # noqa: F401 from checkpackagelib.lib import TrailingSpace # noqa: F401 import checkpackagelib.tool +from checkpackagelib.tool import Shellcheck # noqa: F401 class Indent(_CheckFunction): diff --git a/utils/checkpackagelib/test_tool.py b/utils/checkpackagelib/test_tool.py index 9e1abbfc23..38029297a5 100644 --- a/utils/checkpackagelib/test_tool.py +++ b/utils/checkpackagelib/test_tool.py @@ -64,3 +64,49 @@ def test_NotExecutable_hint(testname, hint, filename, permissions, string, expec return hint warnings = check_file(NotExecutable, filename, string, permissions) assert warnings == expected + + +Shellcheck = [ + ('missing shebang', + 'empty.sh', + '', + ["dir/empty.sh:0: run 'shellcheck' and fix the warnings", + "In dir/empty.sh line 1:", + "^-- SC2148: Tips depend on target shell and yours is unknown. Add a shebang or a 'shell' directive.", + "For more information:", + " https://www.shellcheck.net/wiki/SC2148 -- Tips depend on target shell and y..."]), + ('sh shebang', + 'sh-shebang.sh', + '#!/bin/sh', + []), + ('bash shebang', + 'bash-shebang.sh', + '#!/bin/bash', + []), + ('2 warnings', + 'unused.sh', + 'unused=""', + ["dir/unused.sh:0: run 'shellcheck' and fix the warnings", + "In dir/unused.sh line 1:", + 'unused=""', + "^-- SC2148: Tips depend on target shell and yours is unknown. Add a shebang or a 'shell' directive.", + "^----^ SC2034: unused appears unused. Verify use (or export if used externally).", + "For more information:", + " https://www.shellcheck.net/wiki/SC2148 -- Tips depend on target shell and y...", + " https://www.shellcheck.net/wiki/SC2034 -- unused appears unused. Verify use..."]), + ('tab', + 'tab.sh', + '\t#!/bin/sh', + ["dir/tab.sh:0: run 'shellcheck' and fix the warnings", + "In dir/tab.sh line 1:", + '\t#!/bin/sh', + "^-- SC1114: Remove leading spaces before the shebang.", + "For more information:", + " https://www.shellcheck.net/wiki/SC1114 -- Remove leading spaces before the ..."]), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', Shellcheck) +def test_Shellcheck(testname, filename, string, expected): + warnings = check_file(m.Shellcheck, filename, string) + assert warnings == expected diff --git a/utils/checkpackagelib/tool.py b/utils/checkpackagelib/tool.py index e931272554..e719fdd407 100644 --- a/utils/checkpackagelib/tool.py +++ b/utils/checkpackagelib/tool.py @@ -1,4 +1,5 @@ import os +import subprocess from checkpackagelib.base import _Tool @@ -6,3 +7,18 @@ class NotExecutable(_Tool): def run(self): if os.access(self.filename, os.X_OK): return ["{}:0: This file does not need to be executable{}".format(self.filename, self.hint())] + + +class Shellcheck(_Tool): + def run(self): + cmd = ['shellcheck', self.filename] + try: + p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + stdout = p.communicate()[0] + processed_output = [str(line.decode().rstrip()) for line in stdout.splitlines() if line] + if p.returncode == 0: + return + return ["{}:0: run 'shellcheck' and fix the warnings".format(self.filename), + '\n'.join(processed_output)] + except FileNotFoundError: + return ["{}:0: failed to call 'shellcheck'".format(self.filename)] From arnout at mind.be Sun Feb 6 17:27:00 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 6 Feb 2022 18:27:00 +0100 Subject: [Buildroot] [git commit] utils/checkpackagelib/lib_sysv: check SysV init scripts Message-ID: <20220206172023.4C66A82C6C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d020368eeae5f85eb125788d07a7b013e13b34c2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Enable the common checks: - consecutive empty lines - empty last line - missing new line at end of file - trailing space - warn for executable files, with the hint to instead use '$(INSTALL) -D -m 0755' in the .mk file Check indent with tabs: - add a simple check function to warn only when the indent is done using spaces or a mix of tabs and spaces. It does not check indenting levels, but it already makes the review easier, since it diferentiates spaces and tabs. Check variables: - check DAEMON is defined - when DAEMON is defined, check the filename is in the form S01daemon - when PIDFILE is defined, expect it to be in /var/run and defined using $DAEMON. Also add unit test for this. Signed-off-by: Ricardo Martincoski [Arnout: avoid 'del NotExecutable_base' by importing the module instead of the class; refer to manual in warnings] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- utils/check-package | 5 ++ utils/checkpackagelib/base.py | 3 + utils/checkpackagelib/lib_sysv.py | 68 +++++++++++++++++ utils/checkpackagelib/test_lib_sysv.py | 131 +++++++++++++++++++++++++++++++++ utils/checkpackagelib/test_tool.py | 25 +++++++ utils/checkpackagelib/tool.py | 2 +- 6 files changed, 233 insertions(+), 1 deletion(-) diff --git a/utils/check-package b/utils/check-package index 5fb430902d..f64daed84c 100755 --- a/utils/check-package +++ b/utils/check-package @@ -13,6 +13,7 @@ import checkpackagelib.lib_config import checkpackagelib.lib_hash import checkpackagelib.lib_mk import checkpackagelib.lib_patch +import checkpackagelib.lib_sysv VERBOSE_LEVEL_TO_SHOW_IGNORED_FILES = 3 flags = None # Command line arguments. @@ -66,6 +67,8 @@ DO_NOT_CHECK_INTREE = re.compile(r"|".join([ r"toolchain/toolchain-external/pkg-toolchain-external\.mk$", ])) +SYSV_INIT_SCRIPT_FILENAME = re.compile(r"/S\d\d[^/]+$") + def get_lib_from_filename(fname): if flags.intree_only: @@ -85,6 +88,8 @@ def get_lib_from_filename(fname): return checkpackagelib.lib_mk if fname.endswith(".patch"): return checkpackagelib.lib_patch + if SYSV_INIT_SCRIPT_FILENAME.search(fname): + return checkpackagelib.lib_sysv return None diff --git a/utils/checkpackagelib/base.py b/utils/checkpackagelib/base.py index 73da925a03..f666e4110b 100644 --- a/utils/checkpackagelib/base.py +++ b/utils/checkpackagelib/base.py @@ -24,3 +24,6 @@ class _Tool(object): def run(self): pass + + def hint(self): + return "" diff --git a/utils/checkpackagelib/lib_sysv.py b/utils/checkpackagelib/lib_sysv.py new file mode 100644 index 0000000000..2ee5f74af7 --- /dev/null +++ b/utils/checkpackagelib/lib_sysv.py @@ -0,0 +1,68 @@ +import os +import re + +from checkpackagelib.base import _CheckFunction +from checkpackagelib.lib import ConsecutiveEmptyLines # noqa: F401 +from checkpackagelib.lib import EmptyLastLine # noqa: F401 +from checkpackagelib.lib import NewlineAtEof # noqa: F401 +from checkpackagelib.lib import TrailingSpace # noqa: F401 +import checkpackagelib.tool + + +class Indent(_CheckFunction): + INDENTED_WITH_SPACES = re.compile(r"^[\t]* ") + + def check_line(self, lineno, text): + if self.INDENTED_WITH_SPACES.search(text.rstrip()): + return ["{}:{}: should be indented with tabs ({}#adding-packages-start-script)" + .format(self.filename, lineno, self.url_to_manual), + text] + + +class NotExecutable(checkpackagelib.tool.NotExecutable): + def hint(self): + return ", just make sure you use '$(INSTALL) -D -m 0755' in the .mk file" + + +class Variables(_CheckFunction): + DAEMON_VAR = re.compile(r"^DAEMON=[\"']{0,1}([^\"']*)[\"']{0,1}") + PIDFILE_PATTERN = re.compile(r"/var/run/(\$DAEMON|\$\{DAEMON\}).pid") + PIDFILE_VAR = re.compile(r"^PIDFILE=[\"']{0,1}([^\"']*)[\"']{0,1}") + + def before(self): + self.name = None + + def check_line(self, lineno, text): + name_found = self.DAEMON_VAR.search(text.rstrip()) + if name_found: + if self.name: + return ["{}:{}: DAEMON variable redefined ({}#adding-packages-start-script)" + .format(self.filename, lineno, self.url_to_manual), + text] + self.name = name_found.group(1) + if '/' in self.name: + self.name = os.path.basename(self.name) # to be used in after() to check the expected filename + return ["{}:{}: Do not include path in DAEMON ({}#adding-packages-start-script)" + .format(self.filename, lineno, self.url_to_manual), + text, + 'DAEMON="{}"'.format(self.name)] + return + + pidfile_found = self.PIDFILE_VAR.search(text.rstrip()) + if pidfile_found: + pidfile = pidfile_found.group(1) + if not self.PIDFILE_PATTERN.match(pidfile): + return ["{}:{}: Incorrect PIDFILE value ({}#adding-packages-start-script)" + .format(self.filename, lineno, self.url_to_manual), + text, + 'PIDFILE="/var/run/$DAEMON.pid"'] + + def after(self): + if self.name is None: + return ["{}:0: DAEMON variable not defined ({}#adding-packages-start-script)" + .format(self.filename, self.url_to_manual)] + expected_filename = re.compile(r"S\d\d{}$".format(self.name)) + if not expected_filename.match(os.path.basename(self.filename)): + return ["{}:0: filename should be S ({}#adding-packages-start-script)" + .format(self.filename, self.url_to_manual), + "expecting S{}".format(self.name)] diff --git a/utils/checkpackagelib/test_lib_sysv.py b/utils/checkpackagelib/test_lib_sysv.py new file mode 100644 index 0000000000..9ae840594f --- /dev/null +++ b/utils/checkpackagelib/test_lib_sysv.py @@ -0,0 +1,131 @@ +import os +import pytest +import re +import tempfile +import checkpackagelib.test_util as util +import checkpackagelib.lib_sysv as m +from checkpackagelib.test_tool import check_file as tool_check_file + +workdir = os.path.join(tempfile.mkdtemp(suffix='-checkpackagelib-test-sysv')) +workdir_regex = re.compile(r'/tmp/tmp[^/]*-checkpackagelib-test-sysv') + + +Indent = [ + ('empty file', + 'any', + '', + []), + ('empty line', + 'any', + '\n', + []), + ('ignore whitespace', + 'any', + ' \n', + []), + ('spaces', + 'any', + 'case "$1" in\n' + ' start)', + [['any:2: should be indented with tabs (url#adding-packages-start-script)', + ' start)']]), + ('tab', + 'any', + 'case "$1" in\n' + '\tstart)', + []), + ('tabs and spaces', + 'any', + 'case "$1" in\n' + '\t start)', + [['any:2: should be indented with tabs (url#adding-packages-start-script)', + '\t start)']]), + ('spaces and tabs', + 'any', + 'case "$1" in\n' + ' \tstart)', + [['any:2: should be indented with tabs (url#adding-packages-start-script)', + ' \tstart)']]), + ] + + + 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 + + +NotExecutable = [ + ('SysV', + 'sh-shebang.sh', + 0o775, + '#!/bin/sh', + ["dir/sh-shebang.sh:0: This file does not need to be executable," + " just make sure you use '$(INSTALL) -D -m 0755' in the .mk file"]), + ] + + + at pytest.mark.parametrize('testname,filename,permissions,string,expected', NotExecutable) +def test_NotExecutable(testname, filename, permissions, string, expected): + warnings = tool_check_file(m.NotExecutable, filename, string, permissions) + assert warnings == expected + + +Variables = [ + ('empty file', + 'any', + '', + [['any:0: DAEMON variable not defined (url#adding-packages-start-script)']]), + ('daemon and pidfile ok', + 'package/busybox/S01syslogd', + 'DAEMON="syslogd"\n' + 'PIDFILE="/var/run/$DAEMON.pid"\n', + []), + ('wrong filename', + 'package/busybox/S01syslog', + 'DAEMON="syslogd"\n' + 'PIDFILE="/var/run/${DAEMON}.pid"\n', + [['package/busybox/S01syslog:0: filename should be S (url#adding-packages-start-script)', + 'expecting Ssyslogd']]), + ('no pidfile ok', + 'S99something', + 'DAEMON="something"\n', + []), + ('hardcoded pidfile', + 'S99something', + 'DAEMON="something"\n' + 'PIDFILE="/var/run/something.pid"\n', + [['S99something:2: Incorrect PIDFILE value (url#adding-packages-start-script)', + 'PIDFILE="/var/run/something.pid"\n', + 'PIDFILE="/var/run/$DAEMON.pid"']]), + ('redefined daemon', + 'S50any', + 'DAEMON="any"\n' + 'DAEMON="other"\n', + [['S50any:2: DAEMON variable redefined (url#adding-packages-start-script)', + 'DAEMON="other"\n']]), + ('daemon name with dash', + 'S82cups-browsed', + 'DAEMON="cups-browsed"', + []), + ('daemon with path', + 'S50avahi-daemon', + 'DAEMON=/usr/sbin/avahi-daemon', + [['S50avahi-daemon:1: Do not include path in DAEMON (url#adding-packages-start-script)', + 'DAEMON=/usr/sbin/avahi-daemon', + 'DAEMON="avahi-daemon"']]), + ('daemon with path and wrong filename', + 'S50avahi', + 'DAEMON=/usr/sbin/avahi-daemon', + [['S50avahi:1: Do not include path in DAEMON (url#adding-packages-start-script)', + 'DAEMON=/usr/sbin/avahi-daemon', + 'DAEMON="avahi-daemon"'], + ['S50avahi:0: filename should be S (url#adding-packages-start-script)', + 'expecting Savahi-daemon']]), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', Variables) +def test_Variables(testname, filename, string, expected): + warnings = util.check_file(m.Variables, filename, string) + assert warnings == expected diff --git a/utils/checkpackagelib/test_tool.py b/utils/checkpackagelib/test_tool.py index 51c8e0cb27..9e1abbfc23 100644 --- a/utils/checkpackagelib/test_tool.py +++ b/utils/checkpackagelib/test_tool.py @@ -39,3 +39,28 @@ NotExecutable = [ def test_NotExecutable(testname, filename, permissions, string, expected): warnings = check_file(m.NotExecutable, filename, string, permissions) assert warnings == expected + + +NotExecutable_hint = [ + ('no hint', + "", + 'sh-shebang.sh', + 0o775, + '#!/bin/sh', + ["dir/sh-shebang.sh:0: This file does not need to be executable"]), + ('hint', + ", very special hint", + 'sh-shebang.sh', + 0o775, + '#!/bin/sh', + ["dir/sh-shebang.sh:0: This file does not need to be executable, very special hint"]), + ] + + + at pytest.mark.parametrize('testname,hint,filename,permissions,string,expected', NotExecutable_hint) +def test_NotExecutable_hint(testname, hint, filename, permissions, string, expected): + class NotExecutable(m.NotExecutable): + def hint(self): + return hint + warnings = check_file(NotExecutable, filename, string, permissions) + assert warnings == expected diff --git a/utils/checkpackagelib/tool.py b/utils/checkpackagelib/tool.py index f2007be1ff..e931272554 100644 --- a/utils/checkpackagelib/tool.py +++ b/utils/checkpackagelib/tool.py @@ -5,4 +5,4 @@ from checkpackagelib.base import _Tool class NotExecutable(_Tool): def run(self): if os.access(self.filename, os.X_OK): - return ["{}:0: This file does not need to be executable".format(self.filename)] + return ["{}:0: This file does not need to be executable{}".format(self.filename, self.hint())] From arnout at mind.be Sun Feb 6 15:38:52 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 6 Feb 2022 16:38:52 +0100 Subject: [Buildroot] [git commit] utils/check-package: prepare to run external tools Message-ID: <20220206172023.39B8A82BA3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1734127e5998f6874beee5430081f15cfcb33ce6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Some file formats have well-established syntax checkers. One example of this is the tool 'shellcheck' that can analyse shell scripts for common mistakes. There is no reason to reimplement such tools in check-package, when we can just call them. Add the ability to check-package to call external tools that will run once for each file to be analysed. For simplicity, when the tool generated one or more warnings, count it as a single warning from check-package, that can display something like this: |$ ./utils/check-package package/unscd/S46unscd |package/unscd/S46unscd:0: run 'shellcheck' and fix the warnings |25 lines processed |1 warnings generated |$ ./utils/check-package -vvvvvvvvvvvvvvvv package/unscd/S46unscd |package/unscd/S46unscd:0: run 'shellcheck' and fix the warnings |In package/unscd/S46unscd line 9: | printf "Starting ${NAME}: " | ^------------------^ SC2059: Don't use variables in the printf format string. Use printf "..%s.." "$foo". |In package/unscd/S46unscd line 11: | [ $? -eq 0 ] && echo "OK" || echo "FAIL" | ^-- SC2181: Check exit code directly with e.g. 'if mycmd;', not indirectly with $?. |In package/unscd/S46unscd line 14: | printf "Stopping ${NAME}: " | ^------------------^ SC2059: Don't use variables in the printf format string. Use printf "..%s.." "$foo". |In package/unscd/S46unscd line 16: | [ $? -eq 0 ] && echo "OK" || echo "FAIL" | ^-- SC2181: Check exit code directly with e.g. 'if mycmd;', not indirectly with $?. |For more information: | https://www.shellcheck.net/wiki/SC2059 -- Don't use variables in the printf... | https://www.shellcheck.net/wiki/SC2181 -- Check exit code directly with e.g... |25 lines processed |1 warnings generated In this first commit, add only the ability for check-package to call external tools and not an example of such tool, as adding each tool to call may need update to the docker image and can lead to it's own discussion on how to implement. Signed-off-by: Ricardo Martincoski Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- utils/check-package | 34 ++++++++++++++++++++++++++++------ utils/checkpackagelib/base.py | 8 ++++++++ 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/utils/check-package b/utils/check-package index a959fef079..5fb430902d 100755 --- a/utils/check-package +++ b/utils/check-package @@ -8,6 +8,7 @@ import re import six import sys +import checkpackagelib.base import checkpackagelib.lib_config import checkpackagelib.lib_hash import checkpackagelib.lib_mk @@ -87,9 +88,7 @@ def get_lib_from_filename(fname): return None -def is_a_check_function(m): - if not inspect.isclass(m): - return False +def common_inspect_rules(m): # do not call the base class if m.__name__.startswith("_"): return False @@ -100,6 +99,22 @@ def is_a_check_function(m): return True +def is_a_check_function(m): + if not inspect.isclass(m): + return False + if not issubclass(m, checkpackagelib.base._CheckFunction): + return False + return common_inspect_rules(m) + + +def is_external_tool(m): + if not inspect.isclass(m): + return False + if not issubclass(m, checkpackagelib.base._Tool): + return False + return common_inspect_rules(m) + + def print_warnings(warnings): # Avoid the need to use 'return []' at the end of every check function. if warnings is None: @@ -121,14 +136,16 @@ def check_file_using_lib(fname): if flags.verbose >= VERBOSE_LEVEL_TO_SHOW_IGNORED_FILES: print("{}: ignored".format(fname)) return nwarnings, nlines - classes = inspect.getmembers(lib, is_a_check_function) + internal_functions = inspect.getmembers(lib, is_a_check_function) + external_tools = inspect.getmembers(lib, is_external_tool) + all_checks = internal_functions + external_tools if flags.dry_run: - functions_to_run = [c[0] for c in classes] + functions_to_run = [c[0] for c in all_checks] print("{}: would run: {}".format(fname, functions_to_run)) return nwarnings, nlines - objects = [c[1](fname, flags.manual_url) for c in classes] + objects = [c[1](fname, flags.manual_url) for c in internal_functions] for cf in objects: nwarnings += print_warnings(cf.before()) @@ -148,6 +165,11 @@ def check_file_using_lib(fname): for cf in objects: nwarnings += print_warnings(cf.after()) + tools = [c[1](fname) for c in external_tools] + + for tool in tools: + nwarnings += print_warnings(tool.run()) + return nwarnings, nlines diff --git a/utils/checkpackagelib/base.py b/utils/checkpackagelib/base.py index 9544a64e5a..73da925a03 100644 --- a/utils/checkpackagelib/base.py +++ b/utils/checkpackagelib/base.py @@ -16,3 +16,11 @@ class _CheckFunction(object): def after(self): pass + + +class _Tool(object): + def __init__(self, filename): + self.filename = filename + + def run(self): + pass From arnout at mind.be Sun Feb 6 17:29:40 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 6 Feb 2022 18:29:40 +0100 Subject: [Buildroot] [PATCH 0/5] check-package for SysV init scripts (including shellcheck) In-Reply-To: <20211226184919.2753591-1-ricardo.martincoski@gmail.com> References: <20211226184919.2753591-1-ricardo.martincoski@gmail.com> Message-ID: <9d9678b5-3fb1-dc25-65f4-0edf4b27ef3c@mind.be> On 26/12/2021 19:49, Ricardo Martincoski wrote: > Hello, > > This small series (called series2 below) is built on top of [1] (called series1) > specially for its patches 1 (check-package unit tests) and 4 (script > utils/docker-run that eases to run locally commands in the docker image in order > to have stable results across machines). > > So: > series1 1/4 utils/checkpackagelib: add unit tests > series1 2/4 support/docker: add python3-pytest > series1 3/4 utils/checkpackagelib: run unit tests on GitLab CI > series1 4/4 utils/docker-run: new script > series2 1/5 utils/check-package: prepare to run external tools > series2 2/5 utils/checkpackagelib: warn about executable files > series2 3/5 utils/checkpackagelib/lib_sysv: check SysV init scripts > series2 4/5 support/docker: add shellcheck > series2 5/5 utils/checkpackagelib/lib_sysv: run shellcheck Series applied to master. > > This series is also related to [2]. > Cc: Joachim Wiberg > See an example output for patch [2]: > |$ utils/docker-run utils/check-package -vvv package/inadyn/S70inadyn > |package/inadyn/S70inadyn:24: should be indented with tabs, see package/busybox/S01syslogd > |< tab >< tab >< tab > -- $INADYN_ARGS > |package/inadyn/S70inadyn:0: This file does not need to be executable, just make sure you use '$(INSTALL) -D -m 0755' in the .mk file > |74 lines processed > |2 warnings generated > > This series is also related to [3]. > Perhaps if both series are accepted, we can add cross-reference between the doc > and the tool: > - check-package can point to a manual entry This I have done. > - the doc can mention to use check-package directly for SysV init script > - the doc can mention to use check-package inside docker image using > utils/docker-run These two I have not done. I've also made a few more changes, and I've put a new docker image to gitlab so it can be used by run-docker. With this tools thing in check-package, it would be nice if we could move flake8 in there as well. I have a post-commit hook that automatically runs check-package, but not flake8, and because of that it often happens that flake8 errors slip by (on this series as well...). Same for shellcheck, it would be nice to run it on all scripts (particularly in utils/ and support/), not just the init start script. Regards, Arnout > > What this series IS NOT: > - a complete rework of all SysV init scripts in the tree; > - an automated way to rework SysV init scripts; > - the ultimate checker for SysV init scripts that catches all possible errors; > - something to enable in GitLab CI in the short term. > > What this series IS (hopefully): > - a helper for developers willing to rework one SysV init script at a time; > - something that can be extended to check more common mistakes when reworking a > SysV init script with package/busybox/S01syslogd as base; > - a few years from now we can eventually enable the check in GitLab CI when all > SysV init script got reworked. > > In [4] one can see an example of all warnings that would be generated for all > scripts in the tree. > NOTICE that no warnings are generated for package/busybox/S01syslogd, as > expected. > At the end see some extracts from [4] with some interesting results (thanks to > shellcheck). > > NOTICE that as a consequence of using shellcheck, there will be cases that will > need shellcheck disables, just like S01syslogd already does: > | # shellcheck disable=SC2086 # we need the word splitting > > [1] http://patchwork.ozlabs.org/project/buildroot/list/?series=275236 > [2] http://patchwork.ozlabs.org/project/buildroot/patch/20211205102907.2836980-3-troglobit at gmail.com/ > [3] http://patchwork.ozlabs.org/project/buildroot/patch/20211205102010.2834942-1-troglobit at gmail.com/ > [4] https://gitlab.com/RicardoMartincoski/buildroot/-/jobs/1921130201 > > Regards, > Ricardo > > Extracts from [4] with some interesting results: > |board/intel/galileo/rootfs_overlay/etc/init.d/S09modload: ignored > | > |package/pigpio/S50pigpio:4: For PIDFILE use the same pattern found in package/busybox/S01syslogd > |PIDFILE="/var/run/pigpio.pid" > |PIDFILE="/var/run/$DAEMON.pid" > | > |package/pigpio/S50pigpio:0: filename should be S, see package/busybox/S01syslogd > |expecting Spigpiod > | > |package/motion/S99motion:5: Do not include path in DAEMON, see package/busybox/S01syslogd > |DAEMON=/usr/bin/$NAME > |DAEMON="$NAME" > | > |package/motion/S99motion:23: should be indented with tabs, see package/busybox/S01syslogd > | start) > | > |package/motion/S99motion:0: run 'shellcheck' and fix the warnings > |In package/motion/S99motion line 13: > |< tab >printf "Stopping $NAME: " > | ^----------------^ SC2059: Don't use variables in the printf format string. Use printf "..%s.." "$foo". > | > |package/mender/S42mender:0: run 'shellcheck' and fix the warnings > |In package/mender/S42mender line 13: > |< tab > -a "$(readlink /var/lib/mender)" = "/var/run/mender" ] > | ^-- SC2166: Prefer [ p ] && [ q ] as [ p -a q ] is not well defined. > |In package/mender/S42mender line 29: > |< tab >[ $? = 0 ] && echo "OK" || echo "FAIL" > | ^-- SC2181: Check exit code directly with e.g. 'if mycmd;', not indirectly with $?. > | > |package/eudev/S10udev:45: consecutive empty lines > | > |package/mrp/S65mrp:0: filename should be S, see package/busybox/S01syslogd > |expecting Smrp_server > | > |package/bluez5_utils/S40bluetooth:0: filename should be S, see package/busybox/S01syslogd > |expecting Sbluetoothd > | > |package/bluez5_utils/S40bluetooth:0: This file does not need to be executable, just make sure you use '$(INSTALL) -D -m 0755' in the .mk file > | > |package/netatalk/S50netatalk:33: empty line at end of file > | > |package/iptables/S35iptables:0: run 'shellcheck' and fix the warnings > |In package/iptables/S35iptables line 5: > |IPTABLES_ARGS="" > |^-----------^ SC2034: IPTABLES_ARGS appears unused. Verify use (or export if used externally). > | > |package/rpcbind/S30rpcbind:38: empty line at end of file > | > |In package/dhcp/S80dhcp-relay line 31: > |DHCRELAYPID=/var/run/dhcrelay.pid > |^---------^ SC2034: DHCRELAYPID appears unused. Verify use (or export if used externally). > | > |package/busybox/S10mdev:9: consecutive empty lines > | > |package/busybox/S10mdev:0: run 'shellcheck' and fix the warnings > |In package/busybox/S10mdev line 11: > |< tab >echo -n "Starting $DAEMON... " > | ^-- SC2039: In POSIX sh, echo flags are undefined. > | > |In package/targetcli-fb/S50target line 7: > |< tab >local ret > | ^-------^ SC2039: In POSIX sh, 'local' is undefined. > | > |package/oracle-mysql/S97mysqld:0: run 'shellcheck' and fix the warnings > |In package/oracle-mysql/S97mysqld line 28: > |< tab >< tab >< tab >kill `cat /run/mysql/mysqld.pid` > | ^-------------------------^ SC2046: Quote this to prevent word splitting. > | ^-------------------------^ SC2006: Use $(...) notation instead of legacy backticked `...`. > |Did you mean: > |< tab >< tab >< tab >kill $(cat /run/mysql/mysqld.pid) > | > |package/dbus/S30dbus:0: run 'shellcheck' and fix the warnings > |In package/dbus/S30dbus line 58: > | if [ -f /var/lock/subsys/$servicename ]; then > | ^----------^ SC2154: servicename is referenced but not assigned. > | ^----------^ SC2086: Double quote to prevent globbing and word splitting. > |Did you mean: > | if [ -f /var/lock/subsys/"$servicename" ]; then > | > |package/smcroute/S41smcroute:0: This file does not need to be executable, just make sure you use '$(INSTALL) -D -m 0755' in the .mk file > |package/c-icap/S96cicap:0: run 'shellcheck' and fix the warnings > |In package/c-icap/S96cicap line 12: > |< tab >[ $? == 0 ] && echo "OK" || echo "FAIL" > | ^-- SC2181: Check exit code directly with e.g. 'if mycmd;', not indirectly with $?. > | ^-- SC2039: In POSIX sh, == in place of = is undefined. > | > |package/polkit/S50polkit:0: This file does not need to be executable, just make sure you use '$(INSTALL) -D -m 0755' in the .mk file > | > |package/polkit/S50polkit:0: run 'shellcheck' and fix the warnings > |In package/polkit/S50polkit line 43: > |< tab >start|stop|restart|reload) > | ^----^ SC2221: This pattern always overrides a later one on line 45. > |In package/polkit/S50polkit line 45: > |< tab >reload) > | ^----^ SC2222: This pattern never matches because of a previous pattern on line 43. > | > |package/restorecond/S02restorecond:0: run 'shellcheck' and fix the warnings > |In package/restorecond/S02restorecond line 52: > |< tab >< tab >echo $"Usage: $0 {start|stop|restart|reload}" > | ^-- SC2039: In POSIX sh, $".." is undefined. > | > |package/earlyoom/S02earlyoom:0: run 'shellcheck' and fix the warnings > |In package/earlyoom/S02earlyoom line 10: > |start() { > | ^-- SC1009: The mentioned syntax error was in this brace group. > |In package/earlyoom/S02earlyoom line 11: > |< tab >printf() 'Starting %s: ' "$DAEMON" > | ^-- SC1073: Couldn't parse this function. Fix to allow more checks. > | ^-- SC1064: Expected a { to open the function definition. > | ^-- SC1072: Fix any mentioned problems and try again. > | > |package/watchdogd/S01watchdogd:0: This file does not need to be executable, just make sure you use '$(INSTALL) -D -m 0755' in the .mk file > | > |package/brltty/S10brltty:0: run 'shellcheck' and fix the warnings > |In package/brltty/S10brltty line 17: > |restart() { > |^-- SC2120: restart references arguments, but none are ever passed. > | > |package/audit/S02auditd:0: run 'shellcheck' and fix the warnings > |In package/audit/S02auditd line 13: > |CONFIG=/etc/audit/auditd.conf > |^----^ SC2034: CONFIG appears unused. Verify use (or export if used externally). > | > |package/network-manager/S45network-manager:40: consecutive empty lines > |package/network-manager/S45network-manager:41: consecutive empty lines > |package/network-manager/S45network-manager:41: empty line at end of file > | > |package/tftpd/S80tftpd-hpa:0: run 'shellcheck' and fix the warnings > |In package/tftpd/S80tftpd-hpa line 11: > |PIDFILE=/var/run/$NAME.pid > |^-----^ SC2034: PIDFILE appears unused. Verify use (or export if used externally). > | > |package/owfs/S60owfs:0: run 'shellcheck' and fix the warnings > |In package/owfs/S60owfs line 1: > |NAME="owfs" > |^-- SC2148: Tips depend on target shell and yours is unknown. Add a shebang. > | > |package/owfs/S55owserver:0: run 'shellcheck' and fix the warnings > |In package/owfs/S55owserver line 1: > |NAME="owserver" > |^-- SC2148: Tips depend on target shell and yours is unknown. Add a shebang. > | > |package/transmission/S92transmission:0: run 'shellcheck' and fix the warnings > |In package/transmission/S92transmission line 50: > |DAEMON=$(which $NAME) > | ^---^ SC2230: which is non-standard. Use builtin 'command -v' instead. > > Ricardo Martincoski (5): > utils/check-package: prepare to run external tools > utils/checkpackagelib: warn about executable files > utils/checkpackagelib/lib_sysv: check SysV init scripts > support/docker: add shellcheck > utils/checkpackagelib/lib_sysv: run shellcheck > > support/docker/Dockerfile | 1 + > utils/check-package | 39 ++++++-- > utils/checkpackagelib/base.py | 11 +++ > utils/checkpackagelib/lib_config.py | 1 + > utils/checkpackagelib/lib_hash.py | 1 + > utils/checkpackagelib/lib_mk.py | 1 + > utils/checkpackagelib/lib_patch.py | 1 + > utils/checkpackagelib/lib_sysv.py | 67 +++++++++++++ > utils/checkpackagelib/test_lib_sysv.py | 131 +++++++++++++++++++++++++ > utils/checkpackagelib/test_tool.py | 112 +++++++++++++++++++++ > utils/checkpackagelib/tool.py | 23 +++++ > 11 files changed, 382 insertions(+), 6 deletions(-) > create mode 100644 utils/checkpackagelib/lib_sysv.py > create mode 100644 utils/checkpackagelib/test_lib_sysv.py > create mode 100644 utils/checkpackagelib/test_tool.py > create mode 100644 utils/checkpackagelib/tool.py > From arnout at mind.be Sun Feb 6 18:31:44 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 6 Feb 2022 19:31:44 +0100 Subject: [Buildroot] [git commit] utils/checkpackagelib/test_tool.py: fix expectation Message-ID: <20220206184009.9156C82BDA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b42e87772a995b19913822b810f876a5890d2369 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master While committing the shellcheck feature, it was changed to output the full shellcheck output even at verbosity level 1. However, the expectation of the shellcheck test was not updated accordingly. Do that now, simply merging all the shellcheck output in a single string. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- utils/checkpackagelib/test_tool.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/utils/checkpackagelib/test_tool.py b/utils/checkpackagelib/test_tool.py index 38029297a5..a0bf88001d 100644 --- a/utils/checkpackagelib/test_tool.py +++ b/utils/checkpackagelib/test_tool.py @@ -71,9 +71,9 @@ Shellcheck = [ 'empty.sh', '', ["dir/empty.sh:0: run 'shellcheck' and fix the warnings", - "In dir/empty.sh line 1:", - "^-- SC2148: Tips depend on target shell and yours is unknown. Add a shebang or a 'shell' directive.", - "For more information:", + "In dir/empty.sh line 1:\n" + "^-- SC2148: Tips depend on target shell and yours is unknown. Add a shebang or a 'shell' directive.\n" + "For more information:\n" " https://www.shellcheck.net/wiki/SC2148 -- Tips depend on target shell and y..."]), ('sh shebang', 'sh-shebang.sh', @@ -87,21 +87,21 @@ Shellcheck = [ 'unused.sh', 'unused=""', ["dir/unused.sh:0: run 'shellcheck' and fix the warnings", - "In dir/unused.sh line 1:", - 'unused=""', - "^-- SC2148: Tips depend on target shell and yours is unknown. Add a shebang or a 'shell' directive.", - "^----^ SC2034: unused appears unused. Verify use (or export if used externally).", - "For more information:", - " https://www.shellcheck.net/wiki/SC2148 -- Tips depend on target shell and y...", + "In dir/unused.sh line 1:\n" + 'unused=""\n' + "^-- SC2148: Tips depend on target shell and yours is unknown. Add a shebang or a 'shell' directive.\n" + "^----^ SC2034: unused appears unused. Verify use (or export if used externally).\n" + "For more information:\n" + " https://www.shellcheck.net/wiki/SC2148 -- Tips depend on target shell and y...\n" " https://www.shellcheck.net/wiki/SC2034 -- unused appears unused. Verify use..."]), ('tab', 'tab.sh', '\t#!/bin/sh', ["dir/tab.sh:0: run 'shellcheck' and fix the warnings", - "In dir/tab.sh line 1:", - '\t#!/bin/sh', - "^-- SC1114: Remove leading spaces before the shebang.", - "For more information:", + "In dir/tab.sh line 1:\n" + '\t#!/bin/sh\n' + "^-- SC1114: Remove leading spaces before the shebang.\n" + "For more information:\n" " https://www.shellcheck.net/wiki/SC1114 -- Remove leading spaces before the ..."]), ] From baruch at tkos.co.il Sun Feb 6 18:43:21 2022 From: baruch at tkos.co.il (Baruch Siach) Date: Sun, 06 Feb 2022 20:43:21 +0200 Subject: [Buildroot] [BUG] boot/arm-trusted-firmware: Stack protection setting doesn't work In-Reply-To: <20220206020711.3dc6e42e@ux550ve> References: <20220206020711.3dc6e42e@ux550ve> Message-ID: <87mtj3de6j.fsf@tarshish> Hi Daniil Stas, On Sun, Feb 06 2022, Daniil Stas wrote: > The bug was introduced in commit ccac9a5bbb > ("boot/arm-trusted-firmware: don't force ENABLE_STACK_PROTECTOR"). > > In this commit the ENABLE_STACK_PROTECTOR option was moved from make > arguments to the environment. But this value gets overwritten in > make_helpers/defaults.mk (and platform specific makefiles) before it > gets handled in the lib/stack_protector/stack_protector.mk. > So setting it via environment doesn't work. > > You can check it, for example, if you compile TF-A for stm32mp157a_dk1 > platform, and then check if bl32/stack_protector.o file is > built. > It gets built only with commit ccac9a5bbb being reverted. What happens when you build with a toolchain that has no SSP support with the commit you mentioned reverted? I believe you will get a build error similar to this one: aarch64-buildroot-linux-uclibc-gcc.br_real: error: unrecognized command-line option ?-fstack-protector-0?; did you mean ?-fstack-protector?? aarch64-buildroot-linux-uclibc-gcc.br_real: error: unrecognized command-line option ?-fstack-protector-0?; did you mean ?-fstack-protector?? Makefile:1075: recipe for target '/builds/buildroot.org/buildroot/output/build/arm-trusted-firmware-v2.4/build/a80x0_mcbin/release/libc/assert.o' failed make[1]: *** [/builds/buildroot.org/buildroot/output/build/arm-trusted-firmware-v2.4/build/a80x0_mcbin/release/libc/assert.o] Error 1 Copied from https://gitlab.com/buildroot.org/buildroot/-/jobs/1497663294. Do you have a better suggestion? baruch -- ~. .~ Tk Open Systems =}------------------------------------------------ooO--U--Ooo------------{= - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il - From fontaine.fabrice at gmail.com Sun Feb 6 19:08:09 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 6 Feb 2022 20:08:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/protozero: bump to version 1.7.1 In-Reply-To: <1644174029.436223773@f387.i.mail.ru> References: <20220206145740.1765660-1-fontaine.fabrice@gmail.com> <1644174029.436223773@f387.i.mail.ru> Message-ID: Hi, Le dim. 6 f?vr. 2022 ? 20:00, ???????? ?????? a ?crit : > > I just sent the same patch this week. Thanks, I missed it, I set this one as superseded. > > -- > ?????????? ?? Mail.ru ??? Android > > ???????????, 06 ??????? 2022?., 17:59 +03:00 ?? Fabrice Fontaine fontaine.fabrice at gmail.com: > > Drop patch (already in version) > > https://github.com/mapbox/protozero/releases/tag/v1.7.1 > > Signed-off-by: Fabrice Fontaine > --- > ...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.34.1 Best Regards, Fabrice From fido_max at inbox.ru Sun Feb 6 19:00:29 2022 From: fido_max at inbox.ru (=?UTF-8?B?0JrQvtGH0LXRgtC60L7QsiDQnNCw0LrRgdC40Lw=?=) Date: Sun, 06 Feb 2022 22:00:29 +0300 Subject: [Buildroot] =?utf-8?q?=5BPATCH_1/1=5D_package/protozero=3A_bump_?= =?utf-8?q?to_version_1=2E7=2E1?= In-Reply-To: <20220206145740.1765660-1-fontaine.fabrice@gmail.com> References: <20220206145740.1765660-1-fontaine.fabrice@gmail.com> Message-ID: <1644174029.436223773@f387.i.mail.ru> I just sent the same patch this week. -- ?????????? ?? Mail.ru ??? Android ???????????, 06 ??????? 2022?., 17:59 +03:00 ?? Fabrice Fontaine fontaine.fabrice at gmail.com : >Drop patch (already in version) > >https://github.com/mapbox/protozero/releases/tag/v1.7.1 > >Signed-off-by: Fabrice Fontaine < fontaine.fabrice at gmail.com> >--- >?...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 < fontaine.fabrice at gmail.com> >-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 < fontaine.fabrice at gmail.com> >-[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.34.1 -------------- next part -------------- An HTML attachment was scrubbed... URL: From arnout at mind.be Sun Feb 6 19:16:07 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 6 Feb 2022 20:16:07 +0100 Subject: [Buildroot] [git commit] package/ace: new package Message-ID: <20220206191014.9865682BCC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3621918d1bc1ddc9312dd1cc8dec6db61e712fe2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master ACE is an open-source framework that provides many components and patterns for developing high-performance, distributed real-time and embedded systems. It provides powerful, yet efficient abstractions for sockets, demultiplexing loops, threads, synchronization primitives. Signed-off-by: Matt Weber Signed-off-by: Kalpesh Panchal Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 1 + package/Config.in | 1 + package/ace/Config.in | 12 ++++++++ package/ace/ace.hash | 3 ++ package/ace/ace.mk | 61 +++++++++++++++++++++++++++++++++++++++++ package/ace/platform_macros.GNU | 14 ++++++++++ 6 files changed, 92 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index c52cb35b60..1d1cf99898 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1868,6 +1868,7 @@ F: board/qemu/ppc64-e5500/ F: configs/freescale_p* F: configs/freescale_t* F: configs/qemu_ppc64_e5500_defconfig +F: package/ace/ F: package/argp-standalone/ F: package/aufs/ F: package/aufs-util/ diff --git a/package/Config.in b/package/Config.in index e4ca195beb..43ce9013c6 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1924,6 +1924,7 @@ menu "Networking" endmenu menu "Other" + source "package/ace/Config.in" source "package/apr/Config.in" source "package/apr-util/Config.in" source "package/argp-standalone/Config.in" diff --git a/package/ace/Config.in b/package/ace/Config.in new file mode 100644 index 0000000000..226e34df32 --- /dev/null +++ b/package/ace/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_ACE + bool "ace" + depends on BR2_TOOLCHAIN_USES_GLIBC + depends on !BR2_STATIC_LIBS + help + The ADAPTIVE Communication Environment (ACE(TM)) + An OO Network Programming Toolkit in C++. + + http://www.dre.vanderbilt.edu/~schmidt/ACE.html + +comment "ACE needs a glibc toolchain, dynamic library" + depends on !BR2_TOOLCHAIN_USES_GLIBC || BR2_STATIC_LIBS diff --git a/package/ace/ace.hash b/package/ace/ace.hash new file mode 100644 index 0000000000..92fd42e131 --- /dev/null +++ b/package/ace/ace.hash @@ -0,0 +1,3 @@ +# Locally Computed: +sha256 a28339750620c70cd29a8a7088a4bc6ebaf1ff7ba667498a0279ac97f0e32e01 ACE-7.0.1.tar.gz +sha256 687bf9d16119e0caf6fb5c18214928fd6ea0da10df91e906255b7613af8061d8 COPYING diff --git a/package/ace/ace.mk b/package/ace/ace.mk new file mode 100644 index 0000000000..b6b4cfbc24 --- /dev/null +++ b/package/ace/ace.mk @@ -0,0 +1,61 @@ +################################################################################ +# +# ace +# +################################################################################ + +ACE_VERSION = 7.0.1 +ACE_SOURCE = ACE-$(ACE_VERSION).tar.gz +ACE_SITE = http://download.dre.vanderbilt.edu/previous_versions +ACE_LICENSE = DOC +ACE_LICENSE_FILES = COPYING +ACE_INSTALL_STAGING = YES +ACE_CPE_ID_VENDOR = vanderbilt +ACE_CPE_ID_PRODUCT = adaptive_communication_environment + +# Note: We are excluding examples, apps and tests +# Only compiling ACE libraries (no TAO) +ACE_LIBARIES = ace ACEXML Kokyu netsvcs protocols/ace + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +ACE_LIBARIES += ace/SSL +ACE_DEPENDENCIES += openssl +define ACE_CONFIGURE_SSL + echo "ssl = 1" >> $(@D)/include/makeinclude/platform_macros.GNU +endef +endif + +# configure the target build +# refer: http://www.dre.vanderbilt.edu/~schmidt/DOC_ROOT/ACE/ACE-INSTALL.html#unix +define ACE_CONFIGURE_CMDS + # create a config file + echo ' #include "ace/config-linux.h" ' >> $(@D)/ace/config.h + + # Create platform/compiler-specific Makefile configurations + $(INSTALL) -m 0644 package/ace/platform_macros.GNU $(@D)/include/makeinclude/ + + $(ACE_CONFIGURE_SSL) +endef + +define ACE_BUILD_CMDS + $(foreach lib,$(ACE_LIBARIES), \ + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/$(lib) ACE_ROOT="$(@D)" all + ) +endef + +define ACE_LIBARIES_INSTALL + mkdir -p $(1)/usr/share/ace + $(foreach lib,$(ACE_LIBARIES), \ + $(MAKE) -C $(@D)/$(lib) ACE_ROOT="$(@D)" DESTDIR=$(1) install + ) +endef + +define ACE_INSTALL_TARGET_CMDS + $(call ACE_LIBARIES_INSTALL,$(TARGET_DIR)) +endef + +define ACE_INSTALL_STAGING_CMDS + $(call ACE_LIBARIES_INSTALL,$(STAGING_DIR)) +endef + +$(eval $(generic-package)) diff --git a/package/ace/platform_macros.GNU b/package/ace/platform_macros.GNU new file mode 100644 index 0000000000..ab5ec25a1b --- /dev/null +++ b/package/ace/platform_macros.GNU @@ -0,0 +1,14 @@ +# help: http://www.dre.vanderbilt.edu/~schmidt/DOC_ROOT/ACE/ACE-INSTALL.html#unix + +# create a platform macros file +include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU + +# disable RPATH +install_rpath = 0 + +# set the installation prefix +INSTALL_PREFIX = /usr + +# fix link error with ARM EABI tools +# http://list.isis.vanderbilt.edu/pipermail/ace-users/2008-January/002742.html +no_hidden_visibility = 1 From arnout at mind.be Sun Feb 6 19:17:37 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 6 Feb 2022 20:17:37 +0100 Subject: [Buildroot] [PATCH v2] package/ace: new package In-Reply-To: <20210413134139.13281-1-matthew.weber@rockwellcollins.com> References: <20210413134139.13281-1-matthew.weber@rockwellcollins.com> Message-ID: On 13/04/2021 15:41, Matt Weber wrote: > ACE is an open-source framework that provides many components and > patterns for developing high-performance, distributed real-time > and embedded systems. It provides powerful, yet efficient abstractions > for sockets, demultiplexing loops, threads, synchronization primitives. > > Signed-off-by: Matt Weber > Signed-off-by: Kalpesh Panchal I made a few more small modification/simplifications, and applied ot master, thanks. Regards, Arnout > --- > Changes > v1 -> v2: > [Thomas P > - Added platform specific Makefile config file > - Made Config.in dependency style updates > - Made OpenSSL optional > - Used foreach loop in makefile > - Used common install command for target and staging > --- > DEVELOPERS | 1 + > package/Config.in | 1 + > package/ace/Config.in | 12 +++++++ > package/ace/ace.hash | 3 ++ > package/ace/ace.mk | 63 +++++++++++++++++++++++++++++++++ > package/ace/platform_macros.GNU | 14 ++++++++ > 6 files changed, 94 insertions(+) > create mode 100644 package/ace/Config.in > create mode 100644 package/ace/ace.hash > create mode 100644 package/ace/ace.mk > create mode 100644 package/ace/platform_macros.GNU > > diff --git a/DEVELOPERS b/DEVELOPERS > index 626bb393dd..6dac446c68 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1699,6 +1699,7 @@ F: board/qemu/ppc64-e5500/ > F: configs/freescale_p* > F: configs/freescale_t* > F: configs/qemu_ppc64_e5500_defconfig > +F: package/ace/ > F: package/argp-standalone/ > F: package/aufs/ > F: package/aufs-util/ > diff --git a/package/Config.in b/package/Config.in > index 01e6bc0bfa..9f9b22d6d4 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1844,6 +1844,7 @@ menu "Networking" > endmenu > > menu "Other" > + source "package/ace/Config.in" > source "package/appstream-glib/Config.in" > source "package/apr/Config.in" > source "package/apr-util/Config.in" > diff --git a/package/ace/Config.in b/package/ace/Config.in > new file mode 100644 > index 0000000000..226e34df32 > --- /dev/null > +++ b/package/ace/Config.in > @@ -0,0 +1,12 @@ > +config BR2_PACKAGE_ACE > + bool "ace" > + depends on BR2_TOOLCHAIN_USES_GLIBC > + depends on !BR2_STATIC_LIBS > + help > + The ADAPTIVE Communication Environment (ACE(TM)) > + An OO Network Programming Toolkit in C++. > + > + http://www.dre.vanderbilt.edu/~schmidt/ACE.html > + > +comment "ACE needs a glibc toolchain, dynamic library" > + depends on !BR2_TOOLCHAIN_USES_GLIBC || BR2_STATIC_LIBS > diff --git a/package/ace/ace.hash b/package/ace/ace.hash > new file mode 100644 > index 0000000000..92fd42e131 > --- /dev/null > +++ b/package/ace/ace.hash > @@ -0,0 +1,3 @@ > +# Locally Computed: > +sha256 a28339750620c70cd29a8a7088a4bc6ebaf1ff7ba667498a0279ac97f0e32e01 ACE-7.0.1.tar.gz > +sha256 687bf9d16119e0caf6fb5c18214928fd6ea0da10df91e906255b7613af8061d8 COPYING > diff --git a/package/ace/ace.mk b/package/ace/ace.mk > new file mode 100644 > index 0000000000..539e0cc6c4 > --- /dev/null > +++ b/package/ace/ace.mk > @@ -0,0 +1,63 @@ > +################################################################################ > +# > +# ace > +# > +################################################################################ > + > +ACE_VERSION = 7.0.1 > +ACE_SOURCE = ACE-$(ACE_VERSION).tar.gz > +ACE_SITE = http://download.dre.vanderbilt.edu/previous_versions > +ACE_LICENSE = DOC > +ACE_LICENSE_FILES = COPYING > +ACE_INSTALL_STAGING = YES > +ACE_CPE_ID_VENDOR = vanderbilt > +ACE_CPE_ID_PRODUCT = adaptive_communication_environment > + > +# Note: We are excluding examples, apps and tests > +# Only compiling ACE libraries (no TAO) > +ACE_LIBARIES = ace ACEXML Kokyu netsvcs protocols/ace > + > +ifeq ($(BR2_PACKAGE_OPENSSL),y) > +ACE_LIBARIES += ace/SSL > +ACE_DEPENDENCIES = openssl > +ACE_SSL = "ssl = 1" > +endif > + > +# configure the target build > +# refer: http://www.dre.vanderbilt.edu/~schmidt/DOC_ROOT/ACE/ACE-INSTALL.html#unix > +define ACE_CONFIGURE_CMDS > + # create a config file > + echo ' #include "ace/config-linux.h" ' >> $(@D)/ace/config.h > + > + # Create platform/compiler-specific Makefile configurations > + $(INSTALL) -m 0644 package/ace/platform_macros.GNU $(@D)/include/makeinclude/ > + # Enable ssl if OpenSSL is configured > + [ ! -z $(ACE_SSL) ] && \ > + echo $(ACE_SSL) >> $(@D)/include/makeinclude/platform_macros.GNU || \ > + echo 'ace/SSL skipped' > +endef > + > +# compile ace,ACEXML, Kokyu, netsvcs & protocols/ace > +define ACE_BUILD_CMDS > + $(foreach lib,$(ACE_LIBARIES), \ > + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/$(lib) ACE_ROOT="$(@D)" all > + ) > +endef > + > +define ACE_LIBARIES_INSTALL > + # create below folder required by ACE makefiles during install > + mkdir -p $(1)/usr/share/ace > + $(foreach lib,$(ACE_LIBARIES), \ > + $(MAKE) -C $(@D)/$(lib) ACE_ROOT="$(@D)" DESTDIR=$(1) install > + ) > +endef > + > +define ACE_INSTALL_TARGET_CMDS > + $(call ACE_LIBARIES_INSTALL,$(TARGET_DIR)) > +endef > + > +define ACE_INSTALL_STAGING_CMDS > + $(call ACE_LIBARIES_INSTALL,$(STAGING_DIR)) > +endef > + > +$(eval $(generic-package)) > diff --git a/package/ace/platform_macros.GNU b/package/ace/platform_macros.GNU > new file mode 100644 > index 0000000000..ab5ec25a1b > --- /dev/null > +++ b/package/ace/platform_macros.GNU > @@ -0,0 +1,14 @@ > +# help: http://www.dre.vanderbilt.edu/~schmidt/DOC_ROOT/ACE/ACE-INSTALL.html#unix > + > +# create a platform macros file > +include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU > + > +# disable RPATH > +install_rpath = 0 > + > +# set the installation prefix > +INSTALL_PREFIX = /usr > + > +# fix link error with ARM EABI tools > +# http://list.isis.vanderbilt.edu/pipermail/ace-users/2008-January/002742.html > +no_hidden_visibility = 1 From arnout at mind.be Sun Feb 6 19:23:24 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 6 Feb 2022 20:23:24 +0100 Subject: [Buildroot] [PATCH] package/lua-cffi: new package In-Reply-To: <20210321154903.1950636-1-francois.perrad@gadz.org> References: <20210321154903.1950636-1-francois.perrad@gadz.org> Message-ID: <0a0771a9-43f2-0f10-5706-5beddf124a06@mind.be> On 21/03/2021 16:49, Francois Perrad wrote: > Signed-off-by: Francois Perrad > --- > package/Config.in | 1 + > package/lua-cffi/Config.in | 18 ++++++++++++++++++ > package/lua-cffi/lua-cffi.hash | 3 +++ > package/lua-cffi/lua-cffi.mk | 14 ++++++++++++++ > support/testing/tests/package/test_lua_cffi.py | 14 ++++++++++++++ > 5 files changed, 50 insertions(+) > create mode 100644 package/lua-cffi/Config.in > create mode 100644 package/lua-cffi/lua-cffi.hash > create mode 100644 package/lua-cffi/lua-cffi.mk > create mode 100644 support/testing/tests/package/test_lua_cffi.py > > diff --git a/package/Config.in b/package/Config.in > index 8fb173540..5b854f898 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -652,6 +652,7 @@ menu "Lua libraries/modules" > source "package/lua-basexx/Config.in" > source "package/lua-binaryheap/Config.in" > source "package/lua-bit32/Config.in" > + source "package/lua-cffi/Config.in" > source "package/lua-cjson/Config.in" > source "package/lua-coat/Config.in" > source "package/lua-coatpersistent/Config.in" > diff --git a/package/lua-cffi/Config.in b/package/lua-cffi/Config.in > new file mode 100644 > index 000000000..fcf3d25e2 > --- /dev/null > +++ b/package/lua-cffi/Config.in > @@ -0,0 +1,18 @@ > +config BR2_PACKAGE_LUA_CFFI > + bool "lua-cffi" > + depends on !BR2_PACKAGE_LUAJIT > + depends on BR2_TOOLCHAIN_HAS_THREADS # libffi > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 > + depends on BR2_INSTALL_LIBSTDCPP > + select BR2_PACKAGE_LIBFFI > + help > + This is a portable C FFI for Lua, based on libffi and aiming > + to be mostly compatible with LuaJIT FFI, but written from > + scratch. > + > + https://github.com/q66/cffi-lua > + > +comment "lua-cffi needs a toolchain w/ C++, gcc >= 4.8, threads" > + depends on !BR2_INSTALL_LIBSTDCPP || \ You should have copied the dependency on !luajit here, otherwise the comment appears when it can't be selected anyway. Applied to master with that fixed, thanks. Regards, Arnout > + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ > + !BR2_TOOLCHAIN_HAS_THREADS > diff --git a/package/lua-cffi/lua-cffi.hash b/package/lua-cffi/lua-cffi.hash > new file mode 100644 > index 000000000..a532c6c7b > --- /dev/null > +++ b/package/lua-cffi/lua-cffi.hash > @@ -0,0 +1,3 @@ > +# Locally computed > +sha256 c30080d6309167f86d1a96d3ee33f33ef52e884052b7feac140b8c52db10ad7a lua-cffi-0.2.1.tar.gz > +sha256 f5653a4d5864a3920ea1e07dacfd646067314be647598f0acaaf685beaa2e396 COPYING.md > diff --git a/package/lua-cffi/lua-cffi.mk b/package/lua-cffi/lua-cffi.mk > new file mode 100644 > index 000000000..07d84ad5f > --- /dev/null > +++ b/package/lua-cffi/lua-cffi.mk > @@ -0,0 +1,14 @@ > +################################################################################ > +# > +# lua-cffi > +# > +################################################################################ > + > +LUA_CFFI_VERSION=0.2.1 > +LUA_CFFI_SITE = $(call github,q66,cffi-lua,v$(LUA_CFFI_VERSION)) > +LUA_CFFI_LICENSE = MIT > +LUA_CFFI_LICENSE_FILES = COPYING.md > + > +LUA_CFFI_DEPENDENCIES = libffi lua > + > +$(eval $(meson-package)) > diff --git a/support/testing/tests/package/test_lua_cffi.py b/support/testing/tests/package/test_lua_cffi.py > new file mode 100644 > index 000000000..7f56eef56 > --- /dev/null > +++ b/support/testing/tests/package/test_lua_cffi.py > @@ -0,0 +1,14 @@ > +from tests.package.test_lua import TestLuaBase > + > + > +class TestLuaLuaCffi(TestLuaBase): > + config = TestLuaBase.config + \ > + """ > + BR2_PACKAGE_LUA=y > + BR2_PACKAGE_LUA_CFFI=y > + """ > + > + def test_run(self): > + self.login() > + self.module_test("cffi") > + From arnout at mind.be Sun Feb 6 19:22:12 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 6 Feb 2022 20:22:12 +0100 Subject: [Buildroot] [git commit] package/lua-cffi: new package Message-ID: <20220206191613.46D5682BD5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=13114d0f9352531e5d7ebed45cd3f679407c61d9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/Config.in | 1 + package/lua-cffi/Config.in | 19 +++++++++++++++++++ package/lua-cffi/lua-cffi.hash | 3 +++ package/lua-cffi/lua-cffi.mk | 14 ++++++++++++++ support/testing/tests/package/test_lua_cffi.py | 14 ++++++++++++++ 5 files changed, 51 insertions(+) diff --git a/package/Config.in b/package/Config.in index 43ce9013c6..d631ed784a 100644 --- a/package/Config.in +++ b/package/Config.in @@ -677,6 +677,7 @@ menu "Lua libraries/modules" source "package/lua-basexx/Config.in" source "package/lua-binaryheap/Config.in" source "package/lua-bit32/Config.in" + source "package/lua-cffi/Config.in" source "package/lua-cjson/Config.in" source "package/lua-coat/Config.in" source "package/lua-coatpersistent/Config.in" diff --git a/package/lua-cffi/Config.in b/package/lua-cffi/Config.in new file mode 100644 index 0000000000..64a36e1de4 --- /dev/null +++ b/package/lua-cffi/Config.in @@ -0,0 +1,19 @@ +config BR2_PACKAGE_LUA_CFFI + bool "lua-cffi" + depends on !BR2_PACKAGE_LUAJIT + depends on BR2_TOOLCHAIN_HAS_THREADS # libffi + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on BR2_INSTALL_LIBSTDCPP + select BR2_PACKAGE_LIBFFI + help + This is a portable C FFI for Lua, based on libffi and aiming + to be mostly compatible with LuaJIT FFI, but written from + scratch. + + https://github.com/q66/cffi-lua + +comment "lua-cffi needs a toolchain w/ C++, gcc >= 4.8, threads" + depends on !BR2_PACKAGE_LUAJIT + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ + !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/lua-cffi/lua-cffi.hash b/package/lua-cffi/lua-cffi.hash new file mode 100644 index 0000000000..a532c6c7b3 --- /dev/null +++ b/package/lua-cffi/lua-cffi.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 c30080d6309167f86d1a96d3ee33f33ef52e884052b7feac140b8c52db10ad7a lua-cffi-0.2.1.tar.gz +sha256 f5653a4d5864a3920ea1e07dacfd646067314be647598f0acaaf685beaa2e396 COPYING.md diff --git a/package/lua-cffi/lua-cffi.mk b/package/lua-cffi/lua-cffi.mk new file mode 100644 index 0000000000..07d84ad5fa --- /dev/null +++ b/package/lua-cffi/lua-cffi.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# lua-cffi +# +################################################################################ + +LUA_CFFI_VERSION=0.2.1 +LUA_CFFI_SITE = $(call github,q66,cffi-lua,v$(LUA_CFFI_VERSION)) +LUA_CFFI_LICENSE = MIT +LUA_CFFI_LICENSE_FILES = COPYING.md + +LUA_CFFI_DEPENDENCIES = libffi lua + +$(eval $(meson-package)) diff --git a/support/testing/tests/package/test_lua_cffi.py b/support/testing/tests/package/test_lua_cffi.py new file mode 100644 index 0000000000..7f56eef566 --- /dev/null +++ b/support/testing/tests/package/test_lua_cffi.py @@ -0,0 +1,14 @@ +from tests.package.test_lua import TestLuaBase + + +class TestLuaLuaCffi(TestLuaBase): + config = TestLuaBase.config + \ + """ + BR2_PACKAGE_LUA=y + BR2_PACKAGE_LUA_CFFI=y + """ + + def test_run(self): + self.login() + self.module_test("cffi") + From arnout at mind.be Sun Feb 6 19:29:53 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 6 Feb 2022 20:29:53 +0100 Subject: [Buildroot] [git commit] package/grpc: restrict host-grpc to the absolute minimum Message-ID: <20220206192321.0410782BD9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8251d8c2559b25f11684776fc343059cf100657d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 [Arnout: propagate removed dependency to collectd] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/collectd/Config.in | 1 - package/grpc/0004-host-grpc-only-cpp-plugin.patch | 223 ++++++++++++++++++++++ package/grpc/Config.in | 6 +- package/grpc/grpc.mk | 27 ++- 4 files changed, 244 insertions(+), 13 deletions(-) diff --git a/package/collectd/Config.in b/package/collectd/Config.in index 697dc51f7e..67413ffde0 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -680,7 +680,6 @@ config BR2_PACKAGE_COLLECTD_GRPC depends on BR2_INSTALL_LIBSTDCPP # grpc -> protobuf depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # grpc -> protobuf depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # grpc -> libabseil-cpp - depends on BR2_HOST_GCC_AT_LEAST_4_9 # grpc -> host-libabseil-cpp depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS # grpc select BR2_PACKAGE_GRPC help 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 2e8bc5049f..5d8201f12f 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 Sun Feb 6 19:31:29 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 6 Feb 2022 20:31:29 +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: 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? :-) As promised: applied to master, thanks. 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 Eugen.Hristev at microchip.com Sun Feb 6 19:39:48 2022 From: Eugen.Hristev at microchip.com (Eugen.Hristev at microchip.com) Date: Sun, 6 Feb 2022 19:39:48 +0000 Subject: [Buildroot] [PATCH v3 1/2] configs/microchip_sama7g5ek_mmc_defconfig: set custom linux version to 5.15.21 and add host openssl for linux In-Reply-To: References: <20220206115156.6042cc1b@windsurf> <20220206112620.1637342-1-giulio.benetti@benettiengineering.com> <20220206112620.1637342-2-giulio.benetti@benettiengineering.com> <20220206131656.16e2c8a6@windsurf> Message-ID: <0f8fcb54-806c-fb0b-27ea-38eb938a725f@microchip.com> On 2/6/22 4:25 PM, Giulio Benetti wrote: > Hi Thomas, > > On 06/02/22 13:16, Thomas Petazzoni wrote: >> On Sun,? 6 Feb 2022 12:26:19 +0100 >> Giulio Benetti wrote: >> >>> Fixes: >>> https://gitlab.com/ymorin/buildroot/-/jobs/2035821098 >>> >>> Signed-off-by: Giulio Benetti >> >> Did you actually test on HW that 5.15.21 was working? > > Unfortunately I don't have board, so no. > >> Shouldn't this be >> done by the original submitter of the defconfig. >> >> Eugen, Ludovic? I can test it. Do you have a built already done with it on top that I could download ? (would certainly speed things up) I do not really understand why we need to have a fixed kernel version. This board works with latest LTS starting from 5.15. Can't buildroot just select that ? And why just adding the missing dependency does not fix things. (I remember buildroot had something like kernel latest version to pick up ). Eugen > > It would be great to have it tested. Both, this and the > microchip_sama7g5ek_mmc_dev_defconfig too. > > Best regards > -- > Giulio Benetti > Benetti Engineering sas From giulio.benetti at benettiengineering.com Sun Feb 6 19:51:17 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 20:51:17 +0100 Subject: [Buildroot] [PATCH v3 1/2] configs/microchip_sama7g5ek_mmc_defconfig: set custom linux version to 5.15.21 and add host openssl for linux In-Reply-To: <0f8fcb54-806c-fb0b-27ea-38eb938a725f@microchip.com> References: <20220206115156.6042cc1b@windsurf> <20220206112620.1637342-1-giulio.benetti@benettiengineering.com> <20220206112620.1637342-2-giulio.benetti@benettiengineering.com> <20220206131656.16e2c8a6@windsurf> <0f8fcb54-806c-fb0b-27ea-38eb938a725f@microchip.com> Message-ID: <888aa13f-277c-f4a0-2447-79d58145816d@benettiengineering.com> Hi Eugen, Thomas, Ludovic, On 06/02/22 20:39, Eugen.Hristev at microchip.com wrote: > On 2/6/22 4:25 PM, Giulio Benetti wrote: >> Hi Thomas, >> >> On 06/02/22 13:16, Thomas Petazzoni wrote: >>> On Sun,? 6 Feb 2022 12:26:19 +0100 >>> Giulio Benetti wrote: >>> >>>> Fixes: >>>> https://gitlab.com/ymorin/buildroot/-/jobs/2035821098 >>>> >>>> Signed-off-by: Giulio Benetti >>> >>> Did you actually test on HW that 5.15.21 was working? >> >> Unfortunately I don't have board, so no. >> >>> Shouldn't this be >>> done by the original submitter of the defconfig. >>> >>> Eugen, Ludovic? > > I can test it. Do you have a built already done with it on top that I > could download ? (would certainly speed things up) Here are the 2 links with the prebuilt images for both boards: https://www.dropbox.com/s/av9vz28459hakjl/microchip_sama7g5ek_mmc_dev-sdcard.img?dl=0 https://www.dropbox.com/s/77t2tru95f6l0wk/microchip_sama7g5ek_mmc-sdcard.img?dl=0 > I do not really understand why we need to have a fixed kernel version. > This board works with latest LTS starting from 5.15. Can't buildroot > just select that ? It can't because otherwise, once Buildroot Latest Linux version gets bumped(like 5.16 etc.), your defconfig will be built with a new and untested Linux version(i.e 5.16). So we need to set a specific version, test it, commit it, and in the future we can bump it, wait for a HW testing, commit it etc. > And why just adding the missing dependency does not fix things. Because that only chooses the "Custom kernel headers series" and not Linux version, so once Latest version is bumped(i.e. to 5.16) it won't be valid anymore. The point here is that this: BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15 is needed because of these: BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.21" and these ^^^ allow us to have a stable, HW tested defconfig. > (I remember buildroot had something like kernel latest version to pick up ). That is not what we want because of above explanation. It can result in a non working defconfig. Best regards -- Giulio Benetti Benetti Engineering sas From fontaine.fabrice at gmail.com Sun Feb 6 19:56:43 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 6 Feb 2022 20:56:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/lua-cffi: fix spaces Message-ID: <20220206195643.2522277-1-fontaine.fabrice@gmail.com> Commit 13114d0f9352531e5d7ebed45cd3f679407c61d9 forgot to add spaces before and after '=' and added a spurious space in Config.in Signed-off-by: Fabrice Fontaine --- package/lua-cffi/Config.in | 2 +- package/lua-cffi/lua-cffi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lua-cffi/Config.in b/package/lua-cffi/Config.in index 64a36e1de4..f4a760ce0d 100644 --- a/package/lua-cffi/Config.in +++ b/package/lua-cffi/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_LUA_CFFI bool "lua-cffi" depends on !BR2_PACKAGE_LUAJIT - depends on BR2_TOOLCHAIN_HAS_THREADS # libffi + depends on BR2_TOOLCHAIN_HAS_THREADS # libffi depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_LIBFFI diff --git a/package/lua-cffi/lua-cffi.mk b/package/lua-cffi/lua-cffi.mk index 07d84ad5fa..964f49f030 100644 --- a/package/lua-cffi/lua-cffi.mk +++ b/package/lua-cffi/lua-cffi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_CFFI_VERSION=0.2.1 +LUA_CFFI_VERSION = 0.2.1 LUA_CFFI_SITE = $(call github,q66,cffi-lua,v$(LUA_CFFI_VERSION)) LUA_CFFI_LICENSE = MIT LUA_CFFI_LICENSE_FILES = COPYING.md -- 2.34.1 From giulio.benetti at benettiengineering.com Sun Feb 6 20:05:17 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 21:05:17 +0100 Subject: [Buildroot] [PATCH 01/16] board/aarch64-efi/genimage-efi: convert partition-type-uuid to single letter notation In-Reply-To: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> References: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> Message-ID: <20220206200532.2758493-2-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- board/aarch64-efi/genimage-efi.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/aarch64-efi/genimage-efi.cfg b/board/aarch64-efi/genimage-efi.cfg index 87e85816bc..7fbe13d390 100644 --- a/board/aarch64-efi/genimage-efi.cfg +++ b/board/aarch64-efi/genimage-efi.cfg @@ -18,13 +18,13 @@ image disk.img { partition boot { image = "efi-part.vfat" - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + partition-type-uuid = U offset = 32K bootable = true } partition root { - partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae + partition-type-uuid = L image = "rootfs.ext2" } } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 6 20:05:18 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 21:05:18 +0100 Subject: [Buildroot] [PATCH 02/16] board/beaglev/genimage-efi: convert partition-type-uuid to single letter notation In-Reply-To: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> References: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> Message-ID: <20220206200532.2758493-3-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- board/beaglev/genimage.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/beaglev/genimage.cfg b/board/beaglev/genimage.cfg index deefdbc110..54f9118ea9 100644 --- a/board/beaglev/genimage.cfg +++ b/board/beaglev/genimage.cfg @@ -4,7 +4,7 @@ image sdcard.img { } partition rootfs { - partition-type-uuid = 72ec70a6-cf74-40e6-bd49-4bda08e8f224 + partition-type-uuid = L partition-uuid = 0fef845a-c6e1-45bc-82f7-002fa720f958 bootable = "true" image = "rootfs.ext4" -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 6 20:05:16 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 21:05:16 +0100 Subject: [Buildroot] [PATCH 00/16] Use single letter notation in genimage.cfg files for partition-type-uuid Message-ID: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> This patchset convert partition-type-uuid to single letter notation *without* "". Note: This patchset must be applied after this patch: https://patchwork.ozlabs.org/project/buildroot/patch/20220204000657.747245-1-giulio.benetti at benettiengineering.com/ Giulio Benetti (16): board/aarch64-efi/genimage-efi: convert partition-type-uuid to single letter notation board/beaglev/genimage-efi: convert partition-type-uuid to single letter notation board/friendlyarm/nanopc-t4/genimage: convert partition-type-uuid to single letter notation board/friendlyarm/nanopi-m4/genimage: keep partition-type-uuid without "" for consistency board/orangepi/orangepi-pc-plus/genimage: keep partition-type-uuid without "" for consistency board/orangepi/orangepi-r1/genimage: fix partition-type-uuid for boot partition and remove "" for consistency board/orangepi/orangepi-zero-plus2/genimage: keep partition-type-uuid without "" for consistency board/pc/genimage-efi: convert partition-type-uuid to single letter notation board/pine64/rockpro64/genimage: convert partition-type-uuid to single letter notation board/qemu/aarch64-sbsa/genimage: convert partition-type-uuid to single letter notation board/radxa/rockpi-n4/genimage: convert partition-type-uuid to single letter notation board/radxa/rockpi-n10/genimage: convert partition-type-uuid to single letter notation board/radxa/rockpi-n8/genimage: convert partition-type-uuid to single letter notation board/sifive/hifive-unleashed/genimage_sdcard: convert partition-type-uuid to single letter notation board/sifive/hifive-unleashed/genimage_sdcard: add comments to particular partition-type-uuid parameters board/sifive/hifive-unleashed/genimage_spi-nor: add comments to particular partition-type-uuid parameters board/aarch64-efi/genimage-efi.cfg | 4 ++-- board/beaglev/genimage.cfg | 2 +- board/friendlyarm/nanopc-t4/genimage.cfg | 4 ++-- board/friendlyarm/nanopi-m4/genimage.cfg | 4 ++-- board/orangepi/orangepi-pc-plus/genimage.cfg | 4 ++-- board/orangepi/orangepi-r1/genimage.cfg | 4 ++-- board/orangepi/orangepi-zero-plus2/genimage.cfg | 4 ++-- board/pc/genimage-efi.cfg | 4 ++-- board/pine64/rockpro64/genimage.cfg | 4 ++-- board/qemu/aarch64-sbsa/genimage.cfg | 4 ++-- board/radxa/rockpi-4/genimage.cfg | 4 ++-- board/radxa/rockpi-n10/genimage.cfg | 4 ++-- board/radxa/rockpi-n8/genimage.cfg | 4 ++-- board/sifive/hifive-unleashed/genimage_sdcard.cfg | 4 +++- board/sifive/hifive-unleashed/genimage_spi-nor.cfg | 2 ++ 15 files changed, 30 insertions(+), 26 deletions(-) -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 6 20:05:22 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 21:05:22 +0100 Subject: [Buildroot] [PATCH 06/16] board/orangepi/orangepi-r1/genimage: fix partition-type-uuid for boot partition and remove "" for consistency In-Reply-To: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> References: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> Message-ID: <20220206200532.2758493-7-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- board/orangepi/orangepi-r1/genimage.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/orangepi/orangepi-r1/genimage.cfg b/board/orangepi/orangepi-r1/genimage.cfg index e93e802bd9..78b69269b7 100644 --- a/board/orangepi/orangepi-r1/genimage.cfg +++ b/board/orangepi/orangepi-r1/genimage.cfg @@ -28,7 +28,7 @@ image sdcard.img { } partition boot { - partition-type-uuid = "U" + partition-type-uuid = F bootable = "true" image = "boot.vfat" } @@ -36,7 +36,7 @@ image sdcard.img { # 'rootfs' will be used as the partition label, used # with root=PARTLABEL=rootfs kernel command line partition rootfs { - partition-type-uuid = "L" + partition-type-uuid = L image = "rootfs.ext4" size = 512M } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 6 20:05:19 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 21:05:19 +0100 Subject: [Buildroot] [PATCH 03/16] board/friendlyarm/nanopc-t4/genimage: convert partition-type-uuid to single letter notation In-Reply-To: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> References: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> Message-ID: <20220206200532.2758493-4-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- board/friendlyarm/nanopc-t4/genimage.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/friendlyarm/nanopc-t4/genimage.cfg b/board/friendlyarm/nanopc-t4/genimage.cfg index 98dc2f3892..272037c9f7 100644 --- a/board/friendlyarm/nanopc-t4/genimage.cfg +++ b/board/friendlyarm/nanopc-t4/genimage.cfg @@ -26,14 +26,14 @@ image sdcard.img { } partition boot { - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + partition-type-uuid = F bootable = "true" image = "boot.vfat" offset = 16M } partition rootfs { - partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae + partition-type-uuid = L image = "rootfs.ext4" } } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 6 20:05:21 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 21:05:21 +0100 Subject: [Buildroot] [PATCH 05/16] board/orangepi/orangepi-pc-plus/genimage: keep partition-type-uuid without "" for consistency In-Reply-To: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> References: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> Message-ID: <20220206200532.2758493-6-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- board/orangepi/orangepi-pc-plus/genimage.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/orangepi/orangepi-pc-plus/genimage.cfg b/board/orangepi/orangepi-pc-plus/genimage.cfg index 3812d785d5..d94239e9a2 100644 --- a/board/orangepi/orangepi-pc-plus/genimage.cfg +++ b/board/orangepi/orangepi-pc-plus/genimage.cfg @@ -28,7 +28,7 @@ image sdcard.img { } partition boot { - partition-type-uuid = "F" + partition-type-uuid = F bootable = "true" image = "boot.vfat" } @@ -36,7 +36,7 @@ image sdcard.img { # 'rootfs' will be used as the partition label, used # with root=PARTLABEL=rootfs kernel command line partition rootfs { - partition-type-uuid = "L" + partition-type-uuid = L image = "rootfs.ext4" size = 512M } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 6 20:05:23 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 21:05:23 +0100 Subject: [Buildroot] [PATCH 07/16] board/orangepi/orangepi-zero-plus2/genimage: keep partition-type-uuid without "" for consistency In-Reply-To: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> References: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> Message-ID: <20220206200532.2758493-8-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- board/orangepi/orangepi-zero-plus2/genimage.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/orangepi/orangepi-zero-plus2/genimage.cfg b/board/orangepi/orangepi-zero-plus2/genimage.cfg index 5a7ee7707a..9538e6a54e 100644 --- a/board/orangepi/orangepi-zero-plus2/genimage.cfg +++ b/board/orangepi/orangepi-zero-plus2/genimage.cfg @@ -26,7 +26,7 @@ image sdcard.img { } partition boot { - partition-type-uuid = "F" + 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-uuid = "L" + partition-type-uuid = L image = "rootfs.ext4" size = 256M } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 6 20:05:20 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 21:05:20 +0100 Subject: [Buildroot] [PATCH 04/16] board/friendlyarm/nanopi-m4/genimage: keep partition-type-uuid without "" for consistency In-Reply-To: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> References: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> Message-ID: <20220206200532.2758493-5-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- board/friendlyarm/nanopi-m4/genimage.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/friendlyarm/nanopi-m4/genimage.cfg b/board/friendlyarm/nanopi-m4/genimage.cfg index 8d0e6ad13b..655981847e 100644 --- a/board/friendlyarm/nanopi-m4/genimage.cfg +++ b/board/friendlyarm/nanopi-m4/genimage.cfg @@ -26,14 +26,14 @@ image sdcard.img { } partition boot { - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + partition-type-uuid = F bootable = "true" image = "boot.vfat" offset = 16M } partition rootfs { - partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae + partition-type-uuid = L image = "rootfs.ext4" } } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 6 20:05:51 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 21:05:51 +0100 Subject: [Buildroot] [PATCH 16/16] board/sifive/hifive-unleashed/genimage_spi-nor: add comments to particular partition-type-uuid parameters Message-ID: <20220206200551.2758572-1-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- board/sifive/hifive-unleashed/genimage_spi-nor.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/board/sifive/hifive-unleashed/genimage_spi-nor.cfg b/board/sifive/hifive-unleashed/genimage_spi-nor.cfg index 903e675a90..f5e8f188e3 100644 --- a/board/sifive/hifive-unleashed/genimage_spi-nor.cfg +++ b/board/sifive/hifive-unleashed/genimage_spi-nor.cfg @@ -8,12 +8,14 @@ image spi-nor.img { partition u-boot-spl { image = "u-boot-spl.bin" offset = 20K + # ZSBL only loads from this type of partition type uuid partition-type-uuid = 5B193300-FC78-40CD-8002-E86C45580B47 } partition u-boot { image = "u-boot.itb" offset = 1044K + # U-Boot expects exactly this partition type uuid partition-type-uuid = 2E54B353-1271-4842-806F-E436D6AF6985 } } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 6 20:05:24 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 21:05:24 +0100 Subject: [Buildroot] [PATCH 08/16] board/pc/genimage-efi: convert partition-type-uuid to single letter notation In-Reply-To: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> References: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> Message-ID: <20220206200532.2758493-9-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- board/pc/genimage-efi.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/pc/genimage-efi.cfg b/board/pc/genimage-efi.cfg index 035a077a78..9626a5f2e7 100644 --- a/board/pc/genimage-efi.cfg +++ b/board/pc/genimage-efi.cfg @@ -19,13 +19,13 @@ image disk.img { partition boot { image = "efi-part.vfat" - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + partition-type-uuid = U offset = 32K bootable = true } partition root { - partition-type-uuid = 44479540-f297-41b2-9af7-d131d5f0458a + partition-type-uuid = L partition-uuid = UUID_TMP image = "rootfs.ext2" } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 6 20:05:25 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 21:05:25 +0100 Subject: [Buildroot] [PATCH 09/16] board/pine64/rockpro64/genimage: convert partition-type-uuid to single letter notation In-Reply-To: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> References: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> Message-ID: <20220206200532.2758493-10-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- board/pine64/rockpro64/genimage.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/pine64/rockpro64/genimage.cfg b/board/pine64/rockpro64/genimage.cfg index d3926f2df6..4b96a3447d 100644 --- a/board/pine64/rockpro64/genimage.cfg +++ b/board/pine64/rockpro64/genimage.cfg @@ -26,14 +26,14 @@ image sdcard.img { } partition boot { - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + partition-type-uuid = F bootable = "true" image = "boot.vfat" offset = 16M } partition rootfs { - partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae + partition-type-uuid = L image = "rootfs.ext4" } } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 6 20:05:29 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 21:05:29 +0100 Subject: [Buildroot] [PATCH 13/16] board/radxa/rockpi-n8/genimage: convert partition-type-uuid to single letter notation In-Reply-To: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> References: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> Message-ID: <20220206200532.2758493-14-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- board/radxa/rockpi-n8/genimage.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/radxa/rockpi-n8/genimage.cfg b/board/radxa/rockpi-n8/genimage.cfg index 909a646499..3fced4a5d8 100644 --- a/board/radxa/rockpi-n8/genimage.cfg +++ b/board/radxa/rockpi-n8/genimage.cfg @@ -26,14 +26,14 @@ image sdcard.img { } partition boot { - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + partition-type-uuid = F bootable = "true" image = "boot.vfat" offset = 16M } partition rootfs { - partition-type-uuid = 69dad710-2ce4-4e3c-b16c-21a1d49abed3 + partition-type-uuid = L image = "rootfs.ext4" } } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 6 20:05:26 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 21:05:26 +0100 Subject: [Buildroot] [PATCH 10/16] board/qemu/aarch64-sbsa/genimage: convert partition-type-uuid to single letter notation In-Reply-To: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> References: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> Message-ID: <20220206200532.2758493-11-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- board/qemu/aarch64-sbsa/genimage.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/qemu/aarch64-sbsa/genimage.cfg b/board/qemu/aarch64-sbsa/genimage.cfg index bdf8a89d75..629f4e07b7 100644 --- a/board/qemu/aarch64-sbsa/genimage.cfg +++ b/board/qemu/aarch64-sbsa/genimage.cfg @@ -19,13 +19,13 @@ image disk.img { partition boot { image = "efi-part.vfat" - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + partition-type-uuid = U offset = 32K bootable = true } partition root { - partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae + partition-type-uuid = L image = "rootfs.ext2" } } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 6 20:05:30 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 21:05:30 +0100 Subject: [Buildroot] [PATCH 14/16] board/sifive/hifive-unleashed/genimage_sdcard: convert partition-type-uuid to single letter notation In-Reply-To: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> References: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> Message-ID: <20220206200532.2758493-15-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- board/sifive/hifive-unleashed/genimage_sdcard.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/sifive/hifive-unleashed/genimage_sdcard.cfg b/board/sifive/hifive-unleashed/genimage_sdcard.cfg index e66f221d73..b8bd787488 100644 --- a/board/sifive/hifive-unleashed/genimage_sdcard.cfg +++ b/board/sifive/hifive-unleashed/genimage_sdcard.cfg @@ -17,7 +17,7 @@ image sdcard.img { partition rootfs { image = "rootfs.ext4" - partition-type-uuid = 0FC63DAF-8483-4772-8E79-3D69D8477DE4 + partition-type-uuid = L bootable = true } } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 6 20:05:27 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 21:05:27 +0100 Subject: [Buildroot] [PATCH 11/16] board/radxa/rockpi-n4/genimage: convert partition-type-uuid to single letter notation In-Reply-To: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> References: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> Message-ID: <20220206200532.2758493-12-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- board/radxa/rockpi-4/genimage.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/radxa/rockpi-4/genimage.cfg b/board/radxa/rockpi-4/genimage.cfg index 68cc4d61a8..3c3bd8b7fc 100644 --- a/board/radxa/rockpi-4/genimage.cfg +++ b/board/radxa/rockpi-4/genimage.cfg @@ -26,14 +26,14 @@ image sdcard.img { } partition boot { - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + partition-type-uuid = F bootable = "true" image = "boot.vfat" offset = 16M } partition rootfs { - partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae + partition-type-uuid = L image = "rootfs.ext4" } } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 6 20:05:28 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 21:05:28 +0100 Subject: [Buildroot] [PATCH 12/16] board/radxa/rockpi-n10/genimage: convert partition-type-uuid to single letter notation In-Reply-To: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> References: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> Message-ID: <20220206200532.2758493-13-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- board/radxa/rockpi-n10/genimage.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/radxa/rockpi-n10/genimage.cfg b/board/radxa/rockpi-n10/genimage.cfg index 7f4b639bbc..2773658330 100644 --- a/board/radxa/rockpi-n10/genimage.cfg +++ b/board/radxa/rockpi-n10/genimage.cfg @@ -26,14 +26,14 @@ image sdcard.img { } partition boot { - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + partition-type-uuid = F bootable = "true" image = "boot.vfat" offset = 16M } partition rootfs { - partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae + partition-type-uuid = L image = "rootfs.ext4" } } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 6 20:05:31 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 21:05:31 +0100 Subject: [Buildroot] [PATCH 15/16] board/sifive/hifive-unleashed/genimage_sdcard: add comments to particular partition-type-uuid parameters In-Reply-To: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> References: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> Message-ID: <20220206200532.2758493-16-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- board/sifive/hifive-unleashed/genimage_sdcard.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/board/sifive/hifive-unleashed/genimage_sdcard.cfg b/board/sifive/hifive-unleashed/genimage_sdcard.cfg index b8bd787488..47e59a90d7 100644 --- a/board/sifive/hifive-unleashed/genimage_sdcard.cfg +++ b/board/sifive/hifive-unleashed/genimage_sdcard.cfg @@ -6,12 +6,14 @@ image sdcard.img { partition u-boot-spl { image = "u-boot-spl.bin" offset = 17K + # ZSBL only loads from this type of partition type uuid partition-type-uuid = 5B193300-FC78-40CD-8002-E86C45580B47 } partition u-boot { image = "u-boot.itb" offset = 1041K + # U-Boot expects exactly this partition type uuid partition-type-uuid = 2E54B353-1271-4842-806F-E436D6AF6985 } -- 2.25.1 From daniil.stas at posteo.net Sun Feb 6 20:47:00 2022 From: daniil.stas at posteo.net (Daniil Stas) Date: Sun, 6 Feb 2022 20:47:00 +0000 Subject: [Buildroot] [BUG] boot/arm-trusted-firmware: Stack protection setting doesn't work In-Reply-To: <87mtj3de6j.fsf@tarshish> References: <20220206020711.3dc6e42e@ux550ve> <87mtj3de6j.fsf@tarshish> Message-ID: <20220206224700.4b3519b2@ux550ve> Hi, Baruch > What happens when you build with a toolchain that has no SSP support > with the commit you mentioned reverted? I believe you will get a build > error similar to this one: > > aarch64-buildroot-linux-uclibc-gcc.br_real: error: unrecognized > command-line option ?-fstack-protector-0?; did you mean > ?-fstack-protector?? aarch64-buildroot-linux-uclibc-gcc.br_real: > error: unrecognized command-line option ?-fstack-protector-0?; did > you mean ?-fstack-protector?? Makefile:1075: recipe for target > '/builds/buildroot.org/buildroot/output/build/arm-trusted-firmware-v2.4/build/a80x0_mcbin/release/libc/assert.o' > failed make[1]: *** > [/builds/buildroot.org/buildroot/output/build/arm-trusted-firmware-v2.4/build/a80x0_mcbin/release/libc/assert.o] > Error 1 > > Copied from > https://gitlab.com/buildroot.org/buildroot/-/jobs/1497663294. > > Do you have a better suggestion? > > baruch > Yes, if you pass ENABLE_STACK_PROTECTOR=0 argument to the make command you will get this error. I don't know what is the proper fix here... The current TF-A documentation says that the valid ENABLE_STACK_PROTECTOR values are: "all", "strong", "default" and "none". And the comments in Buildroot say that's older versions didn't support "none" value and expected "0" value instead (looks like it was changed in TF-A commit fd7b287cbe). Maybe Buildroot should check the TF-A version and only pass "0" to the old versions. But I don't know if this version comparison can be implemented in Buildroot. Or maybe we can give user an additional option to specify how to pass ENABLE_STACK_PROTECTOR argument, but this doesn't look very convenient... Or maybe it's better to patch TF-A so the newer versions treated "0" value exactly as "none"... Best regards, Daniil From fontaine.fabrice at gmail.com Sun Feb 6 19:51:06 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 6 Feb 2022 20:51:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/guile: fix build with glibc 2.34 Message-ID: <20220206195106.2520033-1-fontaine.fabrice@gmail.com> Fix the following build failure with glibc 2.34 raised since bump to version 3.0.7 in commit d8bee3950aa851620d6a954aebad1f984caa105a: In file included from regexec.c:1368, from regex.c:74: ./malloc/dynarray-skeleton.c:195:24: error: expected declaration specifiers or '...' before '(' token 195 | __attribute_nonnull__ ((1)) | ^ https://lists.gnu.org/archive/html/bug-guile/2021-08/msg00003.html Fixes: - http://autobuild.buildroot.org/results/27a2a69e1177f15daec65eca035b99ea5355c34b Signed-off-by: Fabrice Fontaine --- ...38a53d64054ae2fc8b86c0f87c418c6176e6.patch | 13930 ++++++++++++++++ package/guile/guile.mk | 7 +- 2 files changed, 13935 insertions(+), 2 deletions(-) create mode 100644 package/guile/0004-Update-gnulib-to-8f4538a53d64054ae2fc8b86c0f87c418c6176e6.patch diff --git a/package/guile/0004-Update-gnulib-to-8f4538a53d64054ae2fc8b86c0f87c418c6176e6.patch b/package/guile/0004-Update-gnulib-to-8f4538a53d64054ae2fc8b86c0f87c418c6176e6.patch new file mode 100644 index 0000000000..f471dbc5c0 --- /dev/null +++ b/package/guile/0004-Update-gnulib-to-8f4538a53d64054ae2fc8b86c0f87c418c6176e6.patch @@ -0,0 +1,13930 @@ +From b4a80f4239b19fea4d2cc3e9d197f24b809f0624 Mon Sep 17 00:00:00 2001 +From: Daniel Llorens +Date: Mon, 16 Aug 2021 13:23:27 +0200 +Subject: Update gnulib to 8f4538a53d64054ae2fc8b86c0f87c418c6176e6 + +Includes gnulib:0c907f7da13232908f05c415b8cec56024071906 to fix #49930 +https://lists.gnu.org/archive/html/bug-guile/2021-08/msg00003.html. + +[Retrieved from: +https://git.savannah.gnu.org/cgit/guile.git/commit/?id=b4a80f4239b19fea4d2cc3e9d197f24b809f0624] +Signed-off-by: Fabrice Fontaine +--- + build-aux/announce-gen | 49 +- + build-aux/gendocs.sh | 6 +- + build-aux/git-version-gen | 8 +- + build-aux/gnupload | 17 +- + build-aux/useless-if-before-free | 18 +- + lib/Makefile.am | 986 ++++++++++++++++++++------------------- + lib/_Noreturn.h | 2 +- + lib/accept.c | 10 +- + lib/accept4.c | 14 +- + lib/alignof.h | 12 +- + lib/alloca.c | 4 +- + lib/alloca.in.h | 20 +- + lib/arpa_inet.in.h | 12 +- + lib/asnprintf.c | 14 +- + lib/assure.h | 10 +- + lib/attribute.h | 16 +- + lib/basename-lgpl.c | 10 +- + lib/basename-lgpl.h | 26 +- + lib/binary-io.c | 10 +- + lib/binary-io.h | 10 +- + lib/bind.c | 10 +- + lib/btowc.c | 10 +- + lib/byteswap.in.h | 10 +- + lib/c-ctype.c | 18 + + lib/c-ctype.h | 24 +- + lib/c-strcase.h | 12 +- + lib/c-strcasecmp.c | 12 +- + lib/c-strcaseeq.h | 14 +- + lib/c-strncasecmp.c | 12 +- + lib/canonicalize-lgpl.c | 3 +- + lib/cdefs.h | 43 +- + lib/ceil.c | 10 +- + lib/cloexec.c | 14 +- + lib/cloexec.h | 14 +- + lib/close.c | 10 +- + lib/connect.c | 10 +- + lib/copysign.c | 10 +- + lib/dirent.in.h | 111 +++-- + lib/dirfd.c | 10 +- + lib/dirname-lgpl.c | 10 +- + lib/dirname.h | 39 +- + lib/dup2.c | 10 +- + lib/duplocale.c | 10 +- + lib/dynarray.h | 20 +- + lib/errno.in.h | 12 +- + lib/fcntl.c | 10 +- + lib/fcntl.in.h | 10 +- + lib/fd-hook.c | 14 +- + lib/fd-hook.h | 14 +- + lib/float+.h | 12 +- + lib/float.c | 10 +- + lib/float.in.h | 10 +- + lib/floor.c | 10 +- + lib/free.c | 10 +- + lib/frexp.c | 10 +- + lib/fstat.c | 10 +- + lib/fsync.c | 14 +- + lib/full-read.c | 10 +- + lib/full-read.h | 10 +- + lib/full-write.c | 10 +- + lib/full-write.h | 10 +- + lib/gai_strerror.c | 12 +- + lib/getaddrinfo.c | 12 +- + lib/getdtablesize.c | 10 +- + lib/getlogin.c | 10 +- + lib/getpeername.c | 10 +- + lib/getrandom.c | 16 +- + lib/getsockname.c | 10 +- + lib/getsockopt.c | 10 +- + lib/gettext.h | 14 +- + lib/hard-locale.c | 10 +- + lib/hard-locale.h | 10 +- + lib/iconv.c | 14 +- + lib/iconv.in.h | 12 +- + lib/iconv_close.c | 14 +- + lib/iconv_open-aix.gperf | 14 +- + lib/iconv_open-hpux.gperf | 14 +- + lib/iconv_open-irix.gperf | 14 +- + lib/iconv_open-osf.gperf | 14 +- + lib/iconv_open-solaris.gperf | 14 +- + lib/iconv_open-zos.gperf | 14 +- + lib/iconv_open.c | 14 +- + lib/iconveh.h | 10 +- + lib/inet_ntop.c | 12 +- + lib/inet_pton.c | 10 +- + lib/inttypes.in.h | 10 +- + lib/isfinite.c | 14 +- + lib/isinf.c | 14 +- + lib/isnan.c | 10 +- + lib/isnand-nolibm.h | 10 +- + lib/isnand.c | 10 +- + lib/isnanf-nolibm.h | 10 +- + lib/isnanf.c | 10 +- + lib/isnanl-nolibm.h | 10 +- + lib/isnanl.c | 10 +- + lib/itold.c | 10 +- + lib/langinfo.in.h | 12 +- + lib/lc-charset-dispatch.c | 10 +- + lib/lc-charset-dispatch.h | 10 +- + lib/libc-config.h | 20 +- + lib/libunistring.valgrind | 22 +- + lib/limits.in.h | 28 +- + lib/link.c | 12 +- + lib/listen.c | 10 +- + lib/localcharset.c | 14 +- + lib/localcharset.h | 14 +- + lib/locale.in.h | 10 +- + lib/localeconv.c | 10 +- + lib/log.c | 10 +- + lib/log1p.c | 10 +- + lib/lstat.c | 10 +- + lib/malloc.c | 47 +- + lib/malloc/dynarray_at_failure.c | 3 +- + lib/malloca.c | 36 +- + lib/malloca.h | 36 +- + lib/math.c | 18 + + lib/math.in.h | 10 +- + lib/mbrtowc-impl-utf8.h | 10 +- + lib/mbrtowc-impl.h | 10 +- + lib/mbrtowc.c | 10 +- + lib/mbsinit.c | 10 +- + lib/mbtowc-impl.h | 10 +- + lib/mbtowc-lock.c | 10 +- + lib/mbtowc-lock.h | 10 +- + lib/mbtowc.c | 10 +- + lib/memchr.c | 24 +- + lib/memchr.valgrind | 10 +- + lib/mempcpy.c | 12 +- + lib/minmax.h | 12 +- + lib/mkdir.c | 10 +- + lib/mkostemp.c | 10 +- + lib/msvc-inval.c | 14 +- + lib/msvc-inval.h | 14 +- + lib/msvc-nothrow.c | 14 +- + lib/msvc-nothrow.h | 14 +- + lib/netdb.in.h | 12 +- + lib/netinet_in.in.h | 12 +- + lib/nl_langinfo-lock.c | 10 +- + lib/nl_langinfo.c | 10 +- + lib/nproc.c | 12 +- + lib/nproc.h | 12 +- + lib/nstrftime.c | 19 +- + lib/open.c | 10 +- + lib/pathmax.h | 12 +- + lib/pipe.c | 14 +- + lib/pipe2.c | 14 +- + lib/poll.c | 14 +- + lib/poll.in.h | 14 +- + lib/printf-args.c | 14 +- + lib/printf-args.h | 14 +- + lib/printf-parse.c | 25 +- + lib/printf-parse.h | 14 +- + lib/putenv.c | 10 +- + lib/raise.c | 10 +- + lib/rawmemchr.c | 10 +- + lib/rawmemchr.valgrind | 10 +- + lib/read.c | 10 +- + lib/readlink.c | 10 +- + lib/realloc.c | 68 +-- + lib/recv.c | 10 +- + lib/recvfrom.c | 10 +- + lib/regex_internal.c | 9 +- + lib/regexec.c | 12 +- + lib/rename.c | 10 +- + lib/rmdir.c | 10 +- + lib/round.c | 14 +- + lib/safe-read.c | 10 +- + lib/safe-read.h | 10 +- + lib/safe-write.c | 10 +- + lib/safe-write.h | 10 +- + lib/same-inode.h | 10 +- + lib/scratch_buffer.h | 20 +- + lib/select.c | 23 +- + lib/send.c | 10 +- + lib/sendto.c | 10 +- + lib/setenv.c | 10 +- + lib/setlocale-lock.c | 10 +- + lib/setlocale_null.c | 10 +- + lib/setlocale_null.h | 10 +- + lib/setsockopt.c | 10 +- + lib/shutdown.c | 10 +- + lib/signal.in.h | 10 +- + lib/signbitd.c | 10 +- + lib/signbitf.c | 10 +- + lib/signbitl.c | 10 +- + lib/size_max.h | 12 +- + lib/snprintf.c | 14 +- + lib/socket.c | 10 +- + lib/sockets.c | 10 +- + lib/sockets.h | 10 +- + lib/stat-time.c | 18 + + lib/stat-time.h | 10 +- + lib/stat-w32.c | 10 +- + lib/stat-w32.h | 10 +- + lib/stat.c | 10 +- + lib/stdalign.in.h | 12 +- + lib/stdbool.in.h | 12 +- + lib/stddef.in.h | 12 +- + lib/stdint.in.h | 16 +- + lib/stdio.in.h | 126 +++-- + lib/stdlib.in.h | 185 ++++++-- + lib/strdup.c | 14 +- + lib/streq.h | 14 +- + lib/strftime.h | 10 +- + lib/striconveh.c | 10 +- + lib/striconveh.h | 18 +- + lib/string.in.h | 68 ++- + lib/stripslash.c | 10 +- + lib/sys-limits.h | 12 +- + lib/sys_file.in.h | 12 +- + lib/sys_random.in.h | 12 +- + lib/sys_select.in.h | 12 +- + lib/sys_socket.c | 18 + + lib/sys_socket.in.h | 12 +- + lib/sys_stat.in.h | 12 +- + lib/sys_time.in.h | 12 +- + lib/sys_times.in.h | 12 +- + lib/sys_types.in.h | 12 +- + lib/sys_uio.in.h | 12 +- + lib/tempname.h | 10 +- + lib/time-internal.h | 14 +- + lib/time.in.h | 12 +- + lib/time_r.c | 14 +- + lib/time_rz.c | 14 +- + lib/times.c | 12 +- + lib/trunc.c | 10 +- + lib/tzset.c | 12 +- + lib/unistd.c | 18 + + lib/unistd.in.h | 25 +- + lib/unsetenv.c | 10 +- + lib/vasnprintf.c | 50 +- + lib/vasnprintf.h | 14 +- + lib/verify.h | 14 +- + lib/vsnprintf.c | 14 +- + lib/w32sock.h | 10 +- + lib/wchar.in.h | 63 ++- + lib/wcrtomb.c | 10 +- + lib/wctype-h.c | 19 + + lib/wctype.in.h | 22 +- + lib/windows-initguard.h | 12 +- + lib/write.c | 10 +- + lib/xalloc-oversized.h | 47 +- + lib/xsize.c | 18 + + lib/xsize.h | 12 +- + m4/arpa_inet_h.m4 | 31 +- + m4/dirent_h.m4 | 45 +- + m4/environ.m4 | 5 +- + m4/fcntl_h.m4 | 39 +- + m4/flock.m4 | 4 +- + m4/fstat.m4 | 4 +- + m4/getaddrinfo.m4 | 10 +- + m4/gnulib-common.m4 | 140 +++++- + m4/gnulib-comp.m4 | 140 ++++-- + m4/hostent.m4 | 4 +- + m4/iconv_h.m4 | 27 +- + m4/inttypes.m4 | 31 +- + m4/langinfo_h.m4 | 25 +- + m4/largefile.m4 | 28 +- + m4/limits-h.m4 | 3 +- + m4/locale_h.m4 | 37 +- + m4/malloc.m4 | 152 ++++-- + m4/math_h.m4 | 227 ++++----- + m4/memchr.m4 | 4 +- + m4/mempcpy.m4 | 4 +- + m4/mktime.m4 | 4 +- + m4/netdb_h.m4 | 25 +- + m4/poll_h.m4 | 29 +- + m4/printf.m4 | 5 +- + m4/rawmemchr.m4 | 4 +- + m4/realloc.m4 | 47 +- + m4/regex.m4 | 44 +- + m4/select.m4 | 4 +- + m4/servent.m4 | 4 +- + m4/signal_h.m4 | 33 +- + m4/sockpfaf.m4 | 6 +- + m4/stat.m4 | 4 +- + m4/stddef_h.m4 | 23 +- + m4/stdint.m4 | 6 +- + m4/stdio_h.m4 | 168 ++++--- + m4/stdlib_h.m4 | 116 +++-- + m4/strdup.m4 | 6 +- + m4/string_h.m4 | 124 ++--- + m4/sys_file_h.m4 | 29 +- + m4/sys_random_h.m4 | 25 +- + m4/sys_select_h.m4 | 29 +- + m4/sys_socket_h.m4 | 53 ++- + m4/sys_stat_h.m4 | 65 ++- + m4/sys_time_h.m4 | 34 +- + m4/sys_times_h.m4 | 25 +- + m4/sys_types_h.m4 | 16 +- + m4/sys_uio_h.m4 | 23 +- + m4/threadlib.m4 | 64 ++- + m4/time_h.m4 | 62 +-- + m4/time_r.m4 | 2 +- + m4/time_rz.m4 | 2 +- + m4/timegm.m4 | 4 +- + m4/tzset.m4 | 4 +- + m4/unistd_h.m4 | 194 ++++---- + m4/visibility.m4 | 6 +- + m4/wchar_h.m4 | 109 +++-- + m4/wctype_h.m4 | 39 +- + m4/wint_t.m4 | 10 +- + m4/year2038.m4 | 124 +++++ + maint.mk | 3 +- + 304 files changed, 4266 insertions(+), 3005 deletions(-) + create mode 100644 m4/year2038.m4 + +diff --git a/build-aux/announce-gen b/build-aux/announce-gen +index 84d2d63..f3b5461 100755 +--- a/build-aux/announce-gen ++++ b/build-aux/announce-gen +@@ -35,12 +35,14 @@ + eval 'exec perl -wSx "$0" "$@"' + if 0; + +-my $VERSION = '2020-05-10 16:13'; # UTC ++my $VERSION = '2021-08-04 09:17'; # UTC + # The definition above must lie within the first 8 lines in order + # for the Emacs time-stamp write hook (at end) to update it. + # If you change this file with Emacs, please let the write hook + # do its job. Otherwise, update this string manually. + ++my $copyright_year = '2021'; ++ + use strict; + use Getopt::Long; + use POSIX qw(strftime); +@@ -49,12 +51,6 @@ use POSIX qw(strftime); + + my %valid_release_types = map {$_ => 1} qw (alpha beta stable); + my @archive_suffixes = qw (tar.gz tar.bz2 tar.lz tar.lzma tar.xz); +-my %digest_classes = +- ( +- 'md5' => (eval { require Digest::MD5; } and 'Digest::MD5'), +- 'sha1' => ((eval { require Digest::SHA; } and 'Digest::SHA') +- or (eval { require Digest::SHA1; } and 'Digest::SHA1')) +- ); + my $srcdir = '.'; + + sub usage ($) +@@ -94,7 +90,7 @@ The following are optional: + VERSION is the result of running git describe + in the gnulib source directory. + required if gnulib is in TOOL_LIST. +- --no-print-checksums do not emit MD5 or SHA1 checksums ++ --no-print-checksums do not emit SHA1 or SHA256 checksums + --archive-suffix=SUF add SUF to the list of archive suffixes + --mail-headers=HEADERS a space-separated list of mail headers, e.g., + To: x\@example.com Cc: y-announce\@example.com,... +@@ -161,7 +157,7 @@ sub print_locations ($\@\%@) + + =item C. ++Print the SHA1 and SHA256 signature section for each C<@file>. + + =cut + +@@ -169,23 +165,18 @@ sub print_checksums (@) + { + my (@file) = @_; + +- print "Here are the MD5 and SHA1 checksums:\n"; ++ print "Here are the SHA1 and SHA256 checksums:\n"; + print "\n"; + +- foreach my $meth (qw (md5 sha1)) ++ use Digest::file qw(digest_file_hex digest_file_base64); ++ ++ foreach my $f (@file) + { +- my $class = $digest_classes{$meth} or next; +- foreach my $f (@file) +- { +- open IN, '<', $f +- or die "$ME: $f: cannot open for reading: $!\n"; +- binmode IN; +- my $dig = $class->new->addfile(*IN)->hexdigest; +- close IN; +- print "$dig $f\n"; +- } ++ print digest_file_hex($f, "SHA-1"), " $f\n"; ++ print digest_file_base64($f, "SHA-256"), " $f\n"; + } +- print "\n"; ++ print "\nThe SHA256 checksum is base64 encoded, instead of the\n"; ++ print "hexadecimal encoding that most checksum tools default to.\n\n"; + } + + =item C \@archive_suffixes, + + help => sub { usage 0 }, +- version => sub { print "$ME version $VERSION\n"; exit }, ++ version => ++ sub ++ { ++ print "$ME version $VERSION\n"; ++ print "Copyright (C) $copyright_year Free Software Foundation, Inc.\n"; ++ print "License GPLv3+: GNU GPL version 3 or later .\n" ++ . "This is free software: you are free to change and redistribute it.\n" ++ . "There is NO WARRANTY, to the extent permitted by law.\n"; ++ print "\n"; ++ my $author = "Jim Meyering"; ++ print "Written by $author.\n"; ++ exit ++ }, + ) or usage 1; + + my $fail = 0; +diff --git a/build-aux/gendocs.sh b/build-aux/gendocs.sh +index 1872de9..1241ee3 100755 +--- a/build-aux/gendocs.sh ++++ b/build-aux/gendocs.sh +@@ -2,7 +2,7 @@ + # gendocs.sh -- generate a GNU manual in many formats. This script is + # mentioned in maintain.texi. See the help message below for usage details. + +-scriptversion=2021-01-01.00 ++scriptversion=2021-07-19.18 + + # Copyright 2003-2021 Free Software Foundation, Inc. + # +@@ -58,7 +58,7 @@ EMAIL=webmasters at gnu.org # please override with --email + commonarg= # passed to all makeinfo/texi2html invcations. + dirargs= # passed to all tools (-I dir). + dirs= # -I directories. +-htmlarg="--css-ref=/software/gnulib/manual.css -c TOP_NODE_UP_URL=/manual" ++htmlarg="--css-ref=https://www.gnu.org/software/gnulib/manual.css -c TOP_NODE_UP_URL=/manual" + default_htmlarg=true + infoarg=--no-split + generate_ascii=true +@@ -202,7 +202,7 @@ base=$PACKAGE + + if $default_htmlarg && test -n "$use_texi2html"; then + # The legacy texi2html doesn't support TOP_NODE_UP_URL +- htmlarg="--css-ref=/software/gnulib/manual.css" ++ htmlarg="--css-ref=https://www.gnu.org/software/gnulib/manual.css" + fi + + if test -n "$srcfile"; then +diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen +index be0fc20..5e42afb 100755 +--- a/build-aux/git-version-gen ++++ b/build-aux/git-version-gen +@@ -75,10 +75,10 @@ me=$0 + year=`expr "$scriptversion" : '\([^-]*\)'` + version="git-version-gen $scriptversion + +-Copyright $year Free Software Foundation, Inc. +-There is NO warranty. You may redistribute this software +-under the terms of the GNU General Public License. +-For more information about these matters, see the files named COPYING." ++Copyright (C) ${year} Free Software Foundation, Inc. ++License GPLv3+: GNU GPL version 3 or later . ++This is free software: you are free to change and redistribute it. ++There is NO WARRANTY, to the extent permitted by law." + + usage="\ + Usage: $me [OPTION]... \$srcdir/.tarball-version [TAG-NORMALIZATION-SED-SCRIPT] +diff --git a/build-aux/gnupload b/build-aux/gnupload +index 434741d..e7822ae 100755 +--- a/build-aux/gnupload ++++ b/build-aux/gnupload +@@ -1,13 +1,13 @@ + #!/bin/sh + # Sign files and upload them. + +-scriptversion=2018-05-19.18; # UTC ++scriptversion=2021-04-11.09; # UTC + + # Copyright (C) 2004-2021 Free Software Foundation, Inc. + # + # 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, or (at your option) ++# the Free Software Foundation; either version 2, or (at your option) + # any later version. + # + # This program is distributed in the hope that it will be useful, +@@ -27,8 +27,8 @@ set -e + GPG=gpg + # Choose the proper version of gpg, so as to avoid a + # "gpg-agent is not available in this session" error +-# when gpg-agent is version 3 but gpg is still version 1. +-# FIXME-2020: remove, once all major distros ship gpg version 3 as /usr/bin/gpg ++# when gpg-agent is version 2 but gpg is still version 1. ++# FIXME-2020: remove, once all major distros ship gpg version 2 as /usr/bin/gpg + gpg_agent_version=`(gpg-agent --version) 2>/dev/null | sed -e '2,$d' -e 's/^[^0-9]*//'` + case "$gpg_agent_version" in + 2.*) +@@ -145,6 +145,12 @@ the build-aux/ directory of the gnulib package + + Send patches and bug reports to ." + ++copyright_year=`echo "$scriptversion" | sed -e 's/[^0-9].*//'` ++copyright="Copyright (C) ${copyright_year} Free Software Foundation, Inc. ++License GPLv2+: GNU GPL version 2 or later . ++This is free software: you are free to change and redistribute it. ++There is NO WARRANTY, to the extent permitted by law." ++ + # Read local configuration file + if test -r "$conffile"; then + echo "$0: Reading configuration file $conffile" +@@ -209,7 +215,8 @@ while test -n "$1"; do + ;; + --version) + echo "gnupload $scriptversion" +- exit $? ++ echo "$copyright" ++ exit 0 + ;; + --) + shift +diff --git a/build-aux/useless-if-before-free b/build-aux/useless-if-before-free +index 784d80b..5bbbc44 100755 +--- a/build-aux/useless-if-before-free ++++ b/build-aux/useless-if-before-free +@@ -36,12 +36,14 @@ + eval 'exec perl -wSx "$0" "$@"' + if 0; + +-my $VERSION = '2020-04-04 15:07'; # UTC ++my $VERSION = '2021-04-11 10:11'; # UTC + # The definition above must lie within the first 8 lines in order + # for the Emacs time-stamp write hook (at end) to update it. + # If you change this file with Emacs, please let the write hook + # do its job. Otherwise, update this string manually. + ++my $copyright_year = '2021'; ++ + use strict; + use warnings; + use Getopt::Long; +@@ -118,7 +120,19 @@ sub is_NULL ($) + GetOptions + ( + help => sub { usage 0 }, +- version => sub { print "$ME version $VERSION\n"; exit }, ++ version => ++ sub ++ { ++ print "$ME version $VERSION\n"; ++ print "Copyright (C) $copyright_year Free Software Foundation, Inc.\n"; ++ print "License GPLv3+: GNU GPL version 3 or later .\n" ++ . "This is free software: you are free to change and redistribute it.\n" ++ . "There is NO WARRANTY, to the extent permitted by law.\n"; ++ print "\n"; ++ my $author = "Jim Meyering"; ++ print "Written by $author.\n"; ++ exit ++ }, + list => \$list, + 'name=s@' => \@name, + ) or usage 1; +diff --git a/lib/Makefile.am b/lib/Makefile.am +index 02480f6..cb29c31 100644 +--- a/lib/Makefile.am ++++ b/lib/Makefile.am +@@ -288,8 +288,8 @@ arpa/inet.h: arpa_inet.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON + -e 's|@''HAVE_FEATURES_H''@|$(HAVE_FEATURES_H)|g' \ + -e 's|@''NEXT_ARPA_INET_H''@|$(NEXT_ARPA_INET_H)|g' \ + -e 's|@''HAVE_ARPA_INET_H''@|$(HAVE_ARPA_INET_H)|g' \ +- -e 's/@''GNULIB_INET_NTOP''@/$(GNULIB_INET_NTOP)/g' \ +- -e 's/@''GNULIB_INET_PTON''@/$(GNULIB_INET_PTON)/g' \ ++ -e 's/@''GNULIB_INET_NTOP''@/$(GL_GNULIB_INET_NTOP)/g' \ ++ -e 's/@''GNULIB_INET_PTON''@/$(GL_GNULIB_INET_PTON)/g' \ + -e 's|@''HAVE_WS2TCPIP_H''@|$(HAVE_WS2TCPIP_H)|g' \ + -e 's|@''HAVE_DECL_INET_NTOP''@|$(HAVE_DECL_INET_NTOP)|g' \ + -e 's|@''HAVE_DECL_INET_PTON''@|$(HAVE_DECL_INET_PTON)|g' \ +@@ -470,14 +470,14 @@ dirent.h: dirent.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_DIRENT_H''@|$(NEXT_DIRENT_H)|g' \ +- -e 's/@''GNULIB_OPENDIR''@/$(GNULIB_OPENDIR)/g' \ +- -e 's/@''GNULIB_READDIR''@/$(GNULIB_READDIR)/g' \ +- -e 's/@''GNULIB_REWINDDIR''@/$(GNULIB_REWINDDIR)/g' \ +- -e 's/@''GNULIB_CLOSEDIR''@/$(GNULIB_CLOSEDIR)/g' \ +- -e 's/@''GNULIB_DIRFD''@/$(GNULIB_DIRFD)/g' \ +- -e 's/@''GNULIB_FDOPENDIR''@/$(GNULIB_FDOPENDIR)/g' \ +- -e 's/@''GNULIB_SCANDIR''@/$(GNULIB_SCANDIR)/g' \ +- -e 's/@''GNULIB_ALPHASORT''@/$(GNULIB_ALPHASORT)/g' \ ++ -e 's/@''GNULIB_OPENDIR''@/$(GL_GNULIB_OPENDIR)/g' \ ++ -e 's/@''GNULIB_READDIR''@/$(GL_GNULIB_READDIR)/g' \ ++ -e 's/@''GNULIB_REWINDDIR''@/$(GL_GNULIB_REWINDDIR)/g' \ ++ -e 's/@''GNULIB_CLOSEDIR''@/$(GL_GNULIB_CLOSEDIR)/g' \ ++ -e 's/@''GNULIB_DIRFD''@/$(GL_GNULIB_DIRFD)/g' \ ++ -e 's/@''GNULIB_FDOPENDIR''@/$(GL_GNULIB_FDOPENDIR)/g' \ ++ -e 's/@''GNULIB_SCANDIR''@/$(GL_GNULIB_SCANDIR)/g' \ ++ -e 's/@''GNULIB_ALPHASORT''@/$(GL_GNULIB_ALPHASORT)/g' \ + -e 's/@''HAVE_OPENDIR''@/$(HAVE_OPENDIR)/g' \ + -e 's/@''HAVE_READDIR''@/$(HAVE_READDIR)/g' \ + -e 's/@''HAVE_REWINDDIR''@/$(HAVE_REWINDDIR)/g' \ +@@ -543,6 +543,32 @@ EXTRA_libgnu_la_SOURCES += duplocale.c + ## begin gnulib module dynarray + + if gl_GNULIB_ENABLED_dynarray ++BUILT_SOURCES += malloc/dynarray.gl.h malloc/dynarray-skeleton.gl.h ++ ++malloc/dynarray.gl.h: malloc/dynarray.h ++ $(AM_V_at)$(MKDIR_P) malloc ++ $(AM_V_GEN)rm -f $@-t $@ && \ ++ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ ++ sed -e '/libc_hidden_proto/d' < $(srcdir)/malloc/dynarray.h; \ ++ } > $@-t && \ ++ mv $@-t $@ ++MOSTLYCLEANFILES += malloc/dynarray.gl.h malloc/dynarray.gl.h-t ++ ++malloc/dynarray-skeleton.gl.h: malloc/dynarray-skeleton.c ++ $(AM_V_at)$(MKDIR_P) malloc ++ $(AM_V_GEN)rm -f $@-t $@ && \ ++ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ ++ sed -e 's|||g' \ ++ -e 's|__attribute_maybe_unused__|_GL_ATTRIBUTE_MAYBE_UNUSED|g' \ ++ -e 's|__attribute_nonnull__|_GL_ATTRIBUTE_NONNULL|g' \ ++ -e 's|__attribute_warn_unused_result__|_GL_ATTRIBUTE_NODISCARD|g' \ ++ -e 's|__glibc_likely|_GL_LIKELY|g' \ ++ -e 's|__glibc_unlikely|_GL_UNLIKELY|g' \ ++ < $(srcdir)/malloc/dynarray-skeleton.c; \ ++ } > $@-t && \ ++ mv $@-t $@ ++MOSTLYCLEANFILES += malloc/dynarray-skeleton.gl.h malloc/dynarray-skeleton.gl.h-t ++ + libgnu_la_SOURCES += malloc/dynarray_at_failure.c malloc/dynarray_emplace_enlarge.c malloc/dynarray_finalize.c malloc/dynarray_resize.c malloc/dynarray_resize_clear.c + + endif +@@ -620,13 +646,13 @@ fcntl.h: fcntl.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_FCNTL_H''@|$(NEXT_FCNTL_H)|g' \ +- -e 's/@''GNULIB_CREAT''@/$(GNULIB_CREAT)/g' \ +- -e 's/@''GNULIB_FCNTL''@/$(GNULIB_FCNTL)/g' \ +- -e 's/@''GNULIB_NONBLOCKING''@/$(GNULIB_NONBLOCKING)/g' \ +- -e 's/@''GNULIB_OPEN''@/$(GNULIB_OPEN)/g' \ +- -e 's/@''GNULIB_OPENAT''@/$(GNULIB_OPENAT)/g' \ +- -e 's/@''GNULIB_MDA_CREAT''@/$(GNULIB_MDA_CREAT)/g' \ +- -e 's/@''GNULIB_MDA_OPEN''@/$(GNULIB_MDA_OPEN)/g' \ ++ -e 's/@''GNULIB_CREAT''@/$(GL_GNULIB_CREAT)/g' \ ++ -e 's/@''GNULIB_FCNTL''@/$(GL_GNULIB_FCNTL)/g' \ ++ -e 's/@''GNULIB_NONBLOCKING''@/$(GL_GNULIB_NONBLOCKING)/g' \ ++ -e 's/@''GNULIB_OPEN''@/$(GL_GNULIB_OPEN)/g' \ ++ -e 's/@''GNULIB_OPENAT''@/$(GL_GNULIB_OPENAT)/g' \ ++ -e 's/@''GNULIB_MDA_CREAT''@/$(GL_GNULIB_MDA_CREAT)/g' \ ++ -e 's/@''GNULIB_MDA_OPEN''@/$(GL_GNULIB_MDA_OPEN)/g' \ + -e 's|@''HAVE_FCNTL''@|$(HAVE_FCNTL)|g' \ + -e 's|@''HAVE_OPENAT''@|$(HAVE_OPENAT)|g' \ + -e 's|@''REPLACE_CREAT''@|$(REPLACE_CREAT)|g' \ +@@ -930,7 +956,7 @@ iconv.h: iconv.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_ICONV_H''@|$(NEXT_ICONV_H)|g' \ +- -e 's/@''GNULIB_ICONV''@/$(GNULIB_ICONV)/g' \ ++ -e 's/@''GNULIB_ICONV''@/$(GL_GNULIB_ICONV)/g' \ + -e 's|@''ICONV_CONST''@|$(ICONV_CONST)|g' \ + -e 's|@''REPLACE_ICONV''@|$(REPLACE_ICONV)|g' \ + -e 's|@''REPLACE_ICONV_OPEN''@|$(REPLACE_ICONV_OPEN)|g' \ +@@ -984,10 +1010,8 @@ EXTRA_libgnu_la_SOURCES += iconv.c iconv_close.c iconv_open.c + + ## begin gnulib module idx + +-if gl_GNULIB_ENABLED_idx + libgnu_la_SOURCES += idx.h + +-endif + ## end gnulib module idx + + ## begin gnulib module inet_ntop +@@ -1031,10 +1055,10 @@ inttypes.h: inttypes.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_U + -e 's|@''NEXT_INTTYPES_H''@|$(NEXT_INTTYPES_H)|g' \ + -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \ + -e 's/@''PRIPTR_PREFIX''@/$(PRIPTR_PREFIX)/g' \ +- -e 's/@''GNULIB_IMAXABS''@/$(GNULIB_IMAXABS)/g' \ +- -e 's/@''GNULIB_IMAXDIV''@/$(GNULIB_IMAXDIV)/g' \ +- -e 's/@''GNULIB_STRTOIMAX''@/$(GNULIB_STRTOIMAX)/g' \ +- -e 's/@''GNULIB_STRTOUMAX''@/$(GNULIB_STRTOUMAX)/g' \ ++ -e 's/@''GNULIB_IMAXABS''@/$(GL_GNULIB_IMAXABS)/g' \ ++ -e 's/@''GNULIB_IMAXDIV''@/$(GL_GNULIB_IMAXDIV)/g' \ ++ -e 's/@''GNULIB_STRTOIMAX''@/$(GL_GNULIB_STRTOIMAX)/g' \ ++ -e 's/@''GNULIB_STRTOUMAX''@/$(GL_GNULIB_STRTOUMAX)/g' \ + -e 's/@''HAVE_DECL_IMAXABS''@/$(HAVE_DECL_IMAXABS)/g' \ + -e 's/@''HAVE_DECL_IMAXDIV''@/$(HAVE_DECL_IMAXDIV)/g' \ + -e 's/@''HAVE_DECL_STRTOIMAX''@/$(HAVE_DECL_STRTOIMAX)/g' \ +@@ -1151,7 +1175,7 @@ langinfo.h: langinfo.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_U + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_LANGINFO_H''@|$(NEXT_LANGINFO_H)|g' \ +- -e 's/@''GNULIB_NL_LANGINFO''@/$(GNULIB_NL_LANGINFO)/g' \ ++ -e 's/@''GNULIB_NL_LANGINFO''@/$(GL_GNULIB_NL_LANGINFO)/g' \ + -e 's|@''HAVE_LANGINFO_CODESET''@|$(HAVE_LANGINFO_CODESET)|g' \ + -e 's|@''HAVE_LANGINFO_T_FMT_AMPM''@|$(HAVE_LANGINFO_T_FMT_AMPM)|g' \ + -e 's|@''HAVE_LANGINFO_ALTMON''@|$(HAVE_LANGINFO_ALTMON)|g' \ +@@ -1264,11 +1288,11 @@ locale.h: locale.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_LOCALE_H''@|$(NEXT_LOCALE_H)|g' \ +- -e 's/@''GNULIB_LOCALECONV''@/$(GNULIB_LOCALECONV)/g' \ +- -e 's/@''GNULIB_SETLOCALE''@/$(GNULIB_SETLOCALE)/g' \ +- -e 's/@''GNULIB_SETLOCALE_NULL''@/$(GNULIB_SETLOCALE_NULL)/g' \ +- -e 's/@''GNULIB_DUPLOCALE''@/$(GNULIB_DUPLOCALE)/g' \ +- -e 's/@''GNULIB_LOCALENAME''@/$(GNULIB_LOCALENAME)/g' \ ++ -e 's/@''GNULIB_LOCALECONV''@/$(GL_GNULIB_LOCALECONV)/g' \ ++ -e 's/@''GNULIB_SETLOCALE''@/$(GL_GNULIB_SETLOCALE)/g' \ ++ -e 's/@''GNULIB_SETLOCALE_NULL''@/$(GL_GNULIB_SETLOCALE_NULL)/g' \ ++ -e 's/@''GNULIB_DUPLOCALE''@/$(GL_GNULIB_DUPLOCALE)/g' \ ++ -e 's/@''GNULIB_LOCALENAME''@/$(GL_GNULIB_LOCALENAME)/g' \ + -e 's|@''HAVE_NEWLOCALE''@|$(HAVE_NEWLOCALE)|g' \ + -e 's|@''HAVE_DUPLOCALE''@|$(HAVE_DUPLOCALE)|g' \ + -e 's|@''HAVE_FREELOCALE''@|$(HAVE_FREELOCALE)|g' \ +@@ -1379,108 +1403,108 @@ math.h: math.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $( + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_AS_FIRST_DIRECTIVE_MATH_H''@|$(NEXT_AS_FIRST_DIRECTIVE_MATH_H)|g' \ +- -e 's/@''GNULIB_ACOSF''@/$(GNULIB_ACOSF)/g' \ +- -e 's/@''GNULIB_ACOSL''@/$(GNULIB_ACOSL)/g' \ +- -e 's/@''GNULIB_ASINF''@/$(GNULIB_ASINF)/g' \ +- -e 's/@''GNULIB_ASINL''@/$(GNULIB_ASINL)/g' \ +- -e 's/@''GNULIB_ATANF''@/$(GNULIB_ATANF)/g' \ +- -e 's/@''GNULIB_ATANL''@/$(GNULIB_ATANL)/g' \ +- -e 's/@''GNULIB_ATAN2F''@/$(GNULIB_ATAN2F)/g' \ +- -e 's/@''GNULIB_CBRT''@/$(GNULIB_CBRT)/g' \ +- -e 's/@''GNULIB_CBRTF''@/$(GNULIB_CBRTF)/g' \ +- -e 's/@''GNULIB_CBRTL''@/$(GNULIB_CBRTL)/g' \ +- -e 's/@''GNULIB_CEIL''@/$(GNULIB_CEIL)/g' \ +- -e 's/@''GNULIB_CEILF''@/$(GNULIB_CEILF)/g' \ +- -e 's/@''GNULIB_CEILL''@/$(GNULIB_CEILL)/g' \ +- -e 's/@''GNULIB_COPYSIGN''@/$(GNULIB_COPYSIGN)/g' \ +- -e 's/@''GNULIB_COPYSIGNF''@/$(GNULIB_COPYSIGNF)/g' \ +- -e 's/@''GNULIB_COPYSIGNL''@/$(GNULIB_COPYSIGNL)/g' \ +- -e 's/@''GNULIB_COSF''@/$(GNULIB_COSF)/g' \ +- -e 's/@''GNULIB_COSL''@/$(GNULIB_COSL)/g' \ +- -e 's/@''GNULIB_COSHF''@/$(GNULIB_COSHF)/g' \ +- -e 's/@''GNULIB_EXPF''@/$(GNULIB_EXPF)/g' \ +- -e 's/@''GNULIB_EXPL''@/$(GNULIB_EXPL)/g' \ +- -e 's/@''GNULIB_EXP2''@/$(GNULIB_EXP2)/g' \ +- -e 's/@''GNULIB_EXP2F''@/$(GNULIB_EXP2F)/g' \ +- -e 's/@''GNULIB_EXP2L''@/$(GNULIB_EXP2L)/g' \ +- -e 's/@''GNULIB_EXPM1''@/$(GNULIB_EXPM1)/g' \ +- -e 's/@''GNULIB_EXPM1F''@/$(GNULIB_EXPM1F)/g' \ +- -e 's/@''GNULIB_EXPM1L''@/$(GNULIB_EXPM1L)/g' \ +- -e 's/@''GNULIB_FABSF''@/$(GNULIB_FABSF)/g' \ +- -e 's/@''GNULIB_FABSL''@/$(GNULIB_FABSL)/g' \ +- -e 's/@''GNULIB_FLOOR''@/$(GNULIB_FLOOR)/g' \ +- -e 's/@''GNULIB_FLOORF''@/$(GNULIB_FLOORF)/g' \ +- -e 's/@''GNULIB_FLOORL''@/$(GNULIB_FLOORL)/g' \ +- -e 's/@''GNULIB_FMA''@/$(GNULIB_FMA)/g' \ +- -e 's/@''GNULIB_FMAF''@/$(GNULIB_FMAF)/g' \ +- -e 's/@''GNULIB_FMAL''@/$(GNULIB_FMAL)/g' \ +- -e 's/@''GNULIB_FMOD''@/$(GNULIB_FMOD)/g' \ +- -e 's/@''GNULIB_FMODF''@/$(GNULIB_FMODF)/g' \ +- -e 's/@''GNULIB_FMODL''@/$(GNULIB_FMODL)/g' \ +- -e 's/@''GNULIB_FREXPF''@/$(GNULIB_FREXPF)/g' \ +- -e 's/@''GNULIB_FREXP''@/$(GNULIB_FREXP)/g' \ +- -e 's/@''GNULIB_FREXPL''@/$(GNULIB_FREXPL)/g' \ +- -e 's/@''GNULIB_HYPOT''@/$(GNULIB_HYPOT)/g' \ +- -e 's/@''GNULIB_HYPOTF''@/$(GNULIB_HYPOTF)/g' \ +- -e 's/@''GNULIB_HYPOTL''@/$(GNULIB_HYPOTL)/g' \ ++ -e 's/@''GNULIB_ACOSF''@/$(GL_GNULIB_ACOSF)/g' \ ++ -e 's/@''GNULIB_ACOSL''@/$(GL_GNULIB_ACOSL)/g' \ ++ -e 's/@''GNULIB_ASINF''@/$(GL_GNULIB_ASINF)/g' \ ++ -e 's/@''GNULIB_ASINL''@/$(GL_GNULIB_ASINL)/g' \ ++ -e 's/@''GNULIB_ATANF''@/$(GL_GNULIB_ATANF)/g' \ ++ -e 's/@''GNULIB_ATANL''@/$(GL_GNULIB_ATANL)/g' \ ++ -e 's/@''GNULIB_ATAN2F''@/$(GL_GNULIB_ATAN2F)/g' \ ++ -e 's/@''GNULIB_CBRT''@/$(GL_GNULIB_CBRT)/g' \ ++ -e 's/@''GNULIB_CBRTF''@/$(GL_GNULIB_CBRTF)/g' \ ++ -e 's/@''GNULIB_CBRTL''@/$(GL_GNULIB_CBRTL)/g' \ ++ -e 's/@''GNULIB_CEIL''@/$(GL_GNULIB_CEIL)/g' \ ++ -e 's/@''GNULIB_CEILF''@/$(GL_GNULIB_CEILF)/g' \ ++ -e 's/@''GNULIB_CEILL''@/$(GL_GNULIB_CEILL)/g' \ ++ -e 's/@''GNULIB_COPYSIGN''@/$(GL_GNULIB_COPYSIGN)/g' \ ++ -e 's/@''GNULIB_COPYSIGNF''@/$(GL_GNULIB_COPYSIGNF)/g' \ ++ -e 's/@''GNULIB_COPYSIGNL''@/$(GL_GNULIB_COPYSIGNL)/g' \ ++ -e 's/@''GNULIB_COSF''@/$(GL_GNULIB_COSF)/g' \ ++ -e 's/@''GNULIB_COSL''@/$(GL_GNULIB_COSL)/g' \ ++ -e 's/@''GNULIB_COSHF''@/$(GL_GNULIB_COSHF)/g' \ ++ -e 's/@''GNULIB_EXPF''@/$(GL_GNULIB_EXPF)/g' \ ++ -e 's/@''GNULIB_EXPL''@/$(GL_GNULIB_EXPL)/g' \ ++ -e 's/@''GNULIB_EXP2''@/$(GL_GNULIB_EXP2)/g' \ ++ -e 's/@''GNULIB_EXP2F''@/$(GL_GNULIB_EXP2F)/g' \ ++ -e 's/@''GNULIB_EXP2L''@/$(GL_GNULIB_EXP2L)/g' \ ++ -e 's/@''GNULIB_EXPM1''@/$(GL_GNULIB_EXPM1)/g' \ ++ -e 's/@''GNULIB_EXPM1F''@/$(GL_GNULIB_EXPM1F)/g' \ ++ -e 's/@''GNULIB_EXPM1L''@/$(GL_GNULIB_EXPM1L)/g' \ ++ -e 's/@''GNULIB_FABSF''@/$(GL_GNULIB_FABSF)/g' \ ++ -e 's/@''GNULIB_FABSL''@/$(GL_GNULIB_FABSL)/g' \ ++ -e 's/@''GNULIB_FLOOR''@/$(GL_GNULIB_FLOOR)/g' \ ++ -e 's/@''GNULIB_FLOORF''@/$(GL_GNULIB_FLOORF)/g' \ ++ -e 's/@''GNULIB_FLOORL''@/$(GL_GNULIB_FLOORL)/g' \ ++ -e 's/@''GNULIB_FMA''@/$(GL_GNULIB_FMA)/g' \ ++ -e 's/@''GNULIB_FMAF''@/$(GL_GNULIB_FMAF)/g' \ ++ -e 's/@''GNULIB_FMAL''@/$(GL_GNULIB_FMAL)/g' \ ++ -e 's/@''GNULIB_FMOD''@/$(GL_GNULIB_FMOD)/g' \ ++ -e 's/@''GNULIB_FMODF''@/$(GL_GNULIB_FMODF)/g' \ ++ -e 's/@''GNULIB_FMODL''@/$(GL_GNULIB_FMODL)/g' \ ++ -e 's/@''GNULIB_FREXPF''@/$(GL_GNULIB_FREXPF)/g' \ ++ -e 's/@''GNULIB_FREXP''@/$(GL_GNULIB_FREXP)/g' \ ++ -e 's/@''GNULIB_FREXPL''@/$(GL_GNULIB_FREXPL)/g' \ ++ -e 's/@''GNULIB_HYPOT''@/$(GL_GNULIB_HYPOT)/g' \ ++ -e 's/@''GNULIB_HYPOTF''@/$(GL_GNULIB_HYPOTF)/g' \ ++ -e 's/@''GNULIB_HYPOTL''@/$(GL_GNULIB_HYPOTL)/g' \ + < $(srcdir)/math.in.h | \ +- sed -e 's/@''GNULIB_ILOGB''@/$(GNULIB_ILOGB)/g' \ +- -e 's/@''GNULIB_ILOGBF''@/$(GNULIB_ILOGBF)/g' \ +- -e 's/@''GNULIB_ILOGBL''@/$(GNULIB_ILOGBL)/g' \ +- -e 's/@''GNULIB_ISFINITE''@/$(GNULIB_ISFINITE)/g' \ +- -e 's/@''GNULIB_ISINF''@/$(GNULIB_ISINF)/g' \ +- -e 's/@''GNULIB_ISNAN''@/$(GNULIB_ISNAN)/g' \ +- -e 's/@''GNULIB_ISNANF''@/$(GNULIB_ISNANF)/g' \ +- -e 's/@''GNULIB_ISNAND''@/$(GNULIB_ISNAND)/g' \ +- -e 's/@''GNULIB_ISNANL''@/$(GNULIB_ISNANL)/g' \ +- -e 's/@''GNULIB_LDEXPF''@/$(GNULIB_LDEXPF)/g' \ +- -e 's/@''GNULIB_LDEXPL''@/$(GNULIB_LDEXPL)/g' \ +- -e 's/@''GNULIB_LOG''@/$(GNULIB_LOG)/g' \ +- -e 's/@''GNULIB_LOGF''@/$(GNULIB_LOGF)/g' \ +- -e 's/@''GNULIB_LOGL''@/$(GNULIB_LOGL)/g' \ +- -e 's/@''GNULIB_LOG10''@/$(GNULIB_LOG10)/g' \ +- -e 's/@''GNULIB_LOG10F''@/$(GNULIB_LOG10F)/g' \ +- -e 's/@''GNULIB_LOG10L''@/$(GNULIB_LOG10L)/g' \ +- -e 's/@''GNULIB_LOG1P''@/$(GNULIB_LOG1P)/g' \ +- -e 's/@''GNULIB_LOG1PF''@/$(GNULIB_LOG1PF)/g' \ +- -e 's/@''GNULIB_LOG1PL''@/$(GNULIB_LOG1PL)/g' \ +- -e 's/@''GNULIB_LOG2''@/$(GNULIB_LOG2)/g' \ +- -e 's/@''GNULIB_LOG2F''@/$(GNULIB_LOG2F)/g' \ +- -e 's/@''GNULIB_LOG2L''@/$(GNULIB_LOG2L)/g' \ +- -e 's/@''GNULIB_LOGB''@/$(GNULIB_LOGB)/g' \ +- -e 's/@''GNULIB_LOGBF''@/$(GNULIB_LOGBF)/g' \ +- -e 's/@''GNULIB_LOGBL''@/$(GNULIB_LOGBL)/g' \ +- -e 's/@''GNULIB_MODF''@/$(GNULIB_MODF)/g' \ +- -e 's/@''GNULIB_MODFF''@/$(GNULIB_MODFF)/g' \ +- -e 's/@''GNULIB_MODFL''@/$(GNULIB_MODFL)/g' \ +- -e 's/@''GNULIB_POWF''@/$(GNULIB_POWF)/g' \ +- -e 's/@''GNULIB_REMAINDER''@/$(GNULIB_REMAINDER)/g' \ +- -e 's/@''GNULIB_REMAINDERF''@/$(GNULIB_REMAINDERF)/g' \ +- -e 's/@''GNULIB_REMAINDERL''@/$(GNULIB_REMAINDERL)/g' \ +- -e 's/@''GNULIB_RINT''@/$(GNULIB_RINT)/g' \ +- -e 's/@''GNULIB_RINTF''@/$(GNULIB_RINTF)/g' \ +- -e 's/@''GNULIB_RINTL''@/$(GNULIB_RINTL)/g' \ +- -e 's/@''GNULIB_ROUND''@/$(GNULIB_ROUND)/g' \ +- -e 's/@''GNULIB_ROUNDF''@/$(GNULIB_ROUNDF)/g' \ +- -e 's/@''GNULIB_ROUNDL''@/$(GNULIB_ROUNDL)/g' \ +- -e 's/@''GNULIB_SIGNBIT''@/$(GNULIB_SIGNBIT)/g' \ +- -e 's/@''GNULIB_SINF''@/$(GNULIB_SINF)/g' \ +- -e 's/@''GNULIB_SINL''@/$(GNULIB_SINL)/g' \ +- -e 's/@''GNULIB_SINHF''@/$(GNULIB_SINHF)/g' \ +- -e 's/@''GNULIB_SQRTF''@/$(GNULIB_SQRTF)/g' \ +- -e 's/@''GNULIB_SQRTL''@/$(GNULIB_SQRTL)/g' \ +- -e 's/@''GNULIB_TANF''@/$(GNULIB_TANF)/g' \ +- -e 's/@''GNULIB_TANL''@/$(GNULIB_TANL)/g' \ +- -e 's/@''GNULIB_TANHF''@/$(GNULIB_TANHF)/g' \ +- -e 's/@''GNULIB_TRUNC''@/$(GNULIB_TRUNC)/g' \ +- -e 's/@''GNULIB_TRUNCF''@/$(GNULIB_TRUNCF)/g' \ +- -e 's/@''GNULIB_TRUNCL''@/$(GNULIB_TRUNCL)/g' \ +- -e 's/@''GNULIB_MDA_J0''@/$(GNULIB_MDA_J0)/g' \ +- -e 's/@''GNULIB_MDA_J1''@/$(GNULIB_MDA_J1)/g' \ +- -e 's/@''GNULIB_MDA_JN''@/$(GNULIB_MDA_JN)/g' \ +- -e 's/@''GNULIB_MDA_Y0''@/$(GNULIB_MDA_Y0)/g' \ +- -e 's/@''GNULIB_MDA_Y1''@/$(GNULIB_MDA_Y1)/g' \ +- -e 's/@''GNULIB_MDA_YN''@/$(GNULIB_MDA_YN)/g' \ ++ sed -e 's/@''GNULIB_ILOGB''@/$(GL_GNULIB_ILOGB)/g' \ ++ -e 's/@''GNULIB_ILOGBF''@/$(GL_GNULIB_ILOGBF)/g' \ ++ -e 's/@''GNULIB_ILOGBL''@/$(GL_GNULIB_ILOGBL)/g' \ ++ -e 's/@''GNULIB_ISFINITE''@/$(GL_GNULIB_ISFINITE)/g' \ ++ -e 's/@''GNULIB_ISINF''@/$(GL_GNULIB_ISINF)/g' \ ++ -e 's/@''GNULIB_ISNAN''@/$(GL_GNULIB_ISNAN)/g' \ ++ -e 's/@''GNULIB_ISNANF''@/$(GL_GNULIB_ISNANF)/g' \ ++ -e 's/@''GNULIB_ISNAND''@/$(GL_GNULIB_ISNAND)/g' \ ++ -e 's/@''GNULIB_ISNANL''@/$(GL_GNULIB_ISNANL)/g' \ ++ -e 's/@''GNULIB_LDEXPF''@/$(GL_GNULIB_LDEXPF)/g' \ ++ -e 's/@''GNULIB_LDEXPL''@/$(GL_GNULIB_LDEXPL)/g' \ ++ -e 's/@''GNULIB_LOG''@/$(GL_GNULIB_LOG)/g' \ ++ -e 's/@''GNULIB_LOGF''@/$(GL_GNULIB_LOGF)/g' \ ++ -e 's/@''GNULIB_LOGL''@/$(GL_GNULIB_LOGL)/g' \ ++ -e 's/@''GNULIB_LOG10''@/$(GL_GNULIB_LOG10)/g' \ ++ -e 's/@''GNULIB_LOG10F''@/$(GL_GNULIB_LOG10F)/g' \ ++ -e 's/@''GNULIB_LOG10L''@/$(GL_GNULIB_LOG10L)/g' \ ++ -e 's/@''GNULIB_LOG1P''@/$(GL_GNULIB_LOG1P)/g' \ ++ -e 's/@''GNULIB_LOG1PF''@/$(GL_GNULIB_LOG1PF)/g' \ ++ -e 's/@''GNULIB_LOG1PL''@/$(GL_GNULIB_LOG1PL)/g' \ ++ -e 's/@''GNULIB_LOG2''@/$(GL_GNULIB_LOG2)/g' \ ++ -e 's/@''GNULIB_LOG2F''@/$(GL_GNULIB_LOG2F)/g' \ ++ -e 's/@''GNULIB_LOG2L''@/$(GL_GNULIB_LOG2L)/g' \ ++ -e 's/@''GNULIB_LOGB''@/$(GL_GNULIB_LOGB)/g' \ ++ -e 's/@''GNULIB_LOGBF''@/$(GL_GNULIB_LOGBF)/g' \ ++ -e 's/@''GNULIB_LOGBL''@/$(GL_GNULIB_LOGBL)/g' \ ++ -e 's/@''GNULIB_MODF''@/$(GL_GNULIB_MODF)/g' \ ++ -e 's/@''GNULIB_MODFF''@/$(GL_GNULIB_MODFF)/g' \ ++ -e 's/@''GNULIB_MODFL''@/$(GL_GNULIB_MODFL)/g' \ ++ -e 's/@''GNULIB_POWF''@/$(GL_GNULIB_POWF)/g' \ ++ -e 's/@''GNULIB_REMAINDER''@/$(GL_GNULIB_REMAINDER)/g' \ ++ -e 's/@''GNULIB_REMAINDERF''@/$(GL_GNULIB_REMAINDERF)/g' \ ++ -e 's/@''GNULIB_REMAINDERL''@/$(GL_GNULIB_REMAINDERL)/g' \ ++ -e 's/@''GNULIB_RINT''@/$(GL_GNULIB_RINT)/g' \ ++ -e 's/@''GNULIB_RINTF''@/$(GL_GNULIB_RINTF)/g' \ ++ -e 's/@''GNULIB_RINTL''@/$(GL_GNULIB_RINTL)/g' \ ++ -e 's/@''GNULIB_ROUND''@/$(GL_GNULIB_ROUND)/g' \ ++ -e 's/@''GNULIB_ROUNDF''@/$(GL_GNULIB_ROUNDF)/g' \ ++ -e 's/@''GNULIB_ROUNDL''@/$(GL_GNULIB_ROUNDL)/g' \ ++ -e 's/@''GNULIB_SIGNBIT''@/$(GL_GNULIB_SIGNBIT)/g' \ ++ -e 's/@''GNULIB_SINF''@/$(GL_GNULIB_SINF)/g' \ ++ -e 's/@''GNULIB_SINL''@/$(GL_GNULIB_SINL)/g' \ ++ -e 's/@''GNULIB_SINHF''@/$(GL_GNULIB_SINHF)/g' \ ++ -e 's/@''GNULIB_SQRTF''@/$(GL_GNULIB_SQRTF)/g' \ ++ -e 's/@''GNULIB_SQRTL''@/$(GL_GNULIB_SQRTL)/g' \ ++ -e 's/@''GNULIB_TANF''@/$(GL_GNULIB_TANF)/g' \ ++ -e 's/@''GNULIB_TANL''@/$(GL_GNULIB_TANL)/g' \ ++ -e 's/@''GNULIB_TANHF''@/$(GL_GNULIB_TANHF)/g' \ ++ -e 's/@''GNULIB_TRUNC''@/$(GL_GNULIB_TRUNC)/g' \ ++ -e 's/@''GNULIB_TRUNCF''@/$(GL_GNULIB_TRUNCF)/g' \ ++ -e 's/@''GNULIB_TRUNCL''@/$(GL_GNULIB_TRUNCL)/g' \ ++ -e 's/@''GNULIB_MDA_J0''@/$(GL_GNULIB_MDA_J0)/g' \ ++ -e 's/@''GNULIB_MDA_J1''@/$(GL_GNULIB_MDA_J1)/g' \ ++ -e 's/@''GNULIB_MDA_JN''@/$(GL_GNULIB_MDA_JN)/g' \ ++ -e 's/@''GNULIB_MDA_Y0''@/$(GL_GNULIB_MDA_Y0)/g' \ ++ -e 's/@''GNULIB_MDA_Y1''@/$(GL_GNULIB_MDA_Y1)/g' \ ++ -e 's/@''GNULIB_MDA_YN''@/$(GL_GNULIB_MDA_YN)/g' \ + | \ + sed -e 's|@''HAVE_ACOSF''@|$(HAVE_ACOSF)|g' \ + -e 's|@''HAVE_ACOSL''@|$(HAVE_ACOSL)|g' \ +@@ -1804,7 +1828,7 @@ netdb.h: netdb.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_NETDB_H''@|$(NEXT_NETDB_H)|g' \ + -e 's|@''HAVE_NETDB_H''@|$(HAVE_NETDB_H)|g' \ +- -e 's/@''GNULIB_GETADDRINFO''@/$(GNULIB_GETADDRINFO)/g' \ ++ -e 's/@''GNULIB_GETADDRINFO''@/$(GL_GNULIB_GETADDRINFO)/g' \ + -e 's|@''HAVE_STRUCT_ADDRINFO''@|$(HAVE_STRUCT_ADDRINFO)|g' \ + -e 's|@''HAVE_DECL_FREEADDRINFO''@|$(HAVE_DECL_FREEADDRINFO)|g' \ + -e 's|@''HAVE_DECL_GAI_STRERROR''@|$(HAVE_DECL_GAI_STRERROR)|g' \ +@@ -1937,7 +1961,7 @@ poll.h: poll.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_POLL_H''@|$(NEXT_POLL_H)|g' \ +- -e 's/@''GNULIB_POLL''@/$(GNULIB_POLL)/g' \ ++ -e 's/@''GNULIB_POLL''@/$(GL_GNULIB_POLL)/g' \ + -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \ + -e 's|@''HAVE_POLL''@|$(HAVE_POLL)|g' \ + -e 's|@''REPLACE_POLL''@|$(REPLACE_POLL)|g' \ +@@ -2098,6 +2122,21 @@ EXTRA_DIST += same-inode.h + ## begin gnulib module scratch_buffer + + if gl_GNULIB_ENABLED_scratch_buffer ++BUILT_SOURCES += malloc/scratch_buffer.gl.h ++ ++malloc/scratch_buffer.gl.h: malloc/scratch_buffer.h ++ $(AM_V_at)$(MKDIR_P) malloc ++ $(AM_V_GEN)rm -f $@-t $@ && \ ++ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ ++ sed -e 's|__always_inline|inline _GL_ATTRIBUTE_ALWAYS_INLINE|g' \ ++ -e 's|__glibc_likely|_GL_LIKELY|g' \ ++ -e 's|__glibc_unlikely|_GL_UNLIKELY|g' \ ++ -e '/libc_hidden_proto/d' \ ++ < $(srcdir)/malloc/scratch_buffer.h; \ ++ } > $@-t && \ ++ mv $@-t $@ ++MOSTLYCLEANFILES += malloc/scratch_buffer.gl.h malloc/scratch_buffer.gl.h-t ++ + libgnu_la_SOURCES += malloc/scratch_buffer_dupfree.c malloc/scratch_buffer_grow.c malloc/scratch_buffer_grow_preserve.c malloc/scratch_buffer_set_array_size.c + + endif +@@ -2185,11 +2224,11 @@ signal.h: signal.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_SIGNAL_H''@|$(NEXT_SIGNAL_H)|g' \ +- -e 's/@''GNULIB_PTHREAD_SIGMASK''@/$(GNULIB_PTHREAD_SIGMASK)/g' \ +- -e 's/@''GNULIB_RAISE''@/$(GNULIB_RAISE)/g' \ +- -e 's/@''GNULIB_SIGNAL_H_SIGPIPE''@/$(GNULIB_SIGNAL_H_SIGPIPE)/g' \ +- -e 's/@''GNULIB_SIGPROCMASK''@/$(GNULIB_SIGPROCMASK)/g' \ +- -e 's/@''GNULIB_SIGACTION''@/$(GNULIB_SIGACTION)/g' \ ++ -e 's/@''GNULIB_PTHREAD_SIGMASK''@/$(GL_GNULIB_PTHREAD_SIGMASK)/g' \ ++ -e 's/@''GNULIB_RAISE''@/$(GL_GNULIB_RAISE)/g' \ ++ -e 's/@''GNULIB_SIGNAL_H_SIGPIPE''@/$(GL_GNULIB_SIGNAL_H_SIGPIPE)/g' \ ++ -e 's/@''GNULIB_SIGPROCMASK''@/$(GL_GNULIB_SIGPROCMASK)/g' \ ++ -e 's/@''GNULIB_SIGACTION''@/$(GL_GNULIB_SIGACTION)/g' \ + -e 's|@''HAVE_POSIX_SIGNALBLOCKING''@|$(HAVE_POSIX_SIGNALBLOCKING)|g' \ + -e 's|@''HAVE_PTHREAD_SIGMASK''@|$(HAVE_PTHREAD_SIGMASK)|g' \ + -e 's|@''HAVE_RAISE''@|$(HAVE_RAISE)|g' \ +@@ -2442,7 +2481,7 @@ stdint.h: stdint.in.h $(top_builddir)/config.status + -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \ + -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \ + -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \ +- -e 's/@''GNULIB_OVERRIDES_WINT_T''@/$(GNULIB_OVERRIDES_WINT_T)/g' \ ++ -e 's/@''GNULIBHEADERS_OVERRIDE_WINT_T''@/$(GNULIBHEADERS_OVERRIDE_WINT_T)/g' \ + < $(srcdir)/stdint.in.h; \ + } > $@-t && \ + mv $@-t $@ +@@ -2470,65 +2509,65 @@ stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_STDIO_H''@|$(NEXT_STDIO_H)|g' \ +- -e 's/@''GNULIB_DPRINTF''@/$(GNULIB_DPRINTF)/g' \ +- -e 's/@''GNULIB_FCLOSE''@/$(GNULIB_FCLOSE)/g' \ +- -e 's/@''GNULIB_FDOPEN''@/$(GNULIB_FDOPEN)/g' \ +- -e 's/@''GNULIB_FFLUSH''@/$(GNULIB_FFLUSH)/g' \ +- -e 's/@''GNULIB_FGETC''@/$(GNULIB_FGETC)/g' \ +- -e 's/@''GNULIB_FGETS''@/$(GNULIB_FGETS)/g' \ +- -e 's/@''GNULIB_FOPEN''@/$(GNULIB_FOPEN)/g' \ +- -e 's/@''GNULIB_FPRINTF''@/$(GNULIB_FPRINTF)/g' \ +- -e 's/@''GNULIB_FPRINTF_POSIX''@/$(GNULIB_FPRINTF_POSIX)/g' \ +- -e 's/@''GNULIB_FPURGE''@/$(GNULIB_FPURGE)/g' \ +- -e 's/@''GNULIB_FPUTC''@/$(GNULIB_FPUTC)/g' \ +- -e 's/@''GNULIB_FPUTS''@/$(GNULIB_FPUTS)/g' \ +- -e 's/@''GNULIB_FREAD''@/$(GNULIB_FREAD)/g' \ +- -e 's/@''GNULIB_FREOPEN''@/$(GNULIB_FREOPEN)/g' \ +- -e 's/@''GNULIB_FSCANF''@/$(GNULIB_FSCANF)/g' \ +- -e 's/@''GNULIB_FSEEK''@/$(GNULIB_FSEEK)/g' \ +- -e 's/@''GNULIB_FSEEKO''@/$(GNULIB_FSEEKO)/g' \ +- -e 's/@''GNULIB_FTELL''@/$(GNULIB_FTELL)/g' \ +- -e 's/@''GNULIB_FTELLO''@/$(GNULIB_FTELLO)/g' \ +- -e 's/@''GNULIB_FWRITE''@/$(GNULIB_FWRITE)/g' \ +- -e 's/@''GNULIB_GETC''@/$(GNULIB_GETC)/g' \ +- -e 's/@''GNULIB_GETCHAR''@/$(GNULIB_GETCHAR)/g' \ +- -e 's/@''GNULIB_GETDELIM''@/$(GNULIB_GETDELIM)/g' \ +- -e 's/@''GNULIB_GETLINE''@/$(GNULIB_GETLINE)/g' \ +- -e 's/@''GNULIB_OBSTACK_PRINTF''@/$(GNULIB_OBSTACK_PRINTF)/g' \ +- -e 's/@''GNULIB_OBSTACK_PRINTF_POSIX''@/$(GNULIB_OBSTACK_PRINTF_POSIX)/g' \ +- -e 's/@''GNULIB_PCLOSE''@/$(GNULIB_PCLOSE)/g' \ +- -e 's/@''GNULIB_PERROR''@/$(GNULIB_PERROR)/g' \ +- -e 's/@''GNULIB_POPEN''@/$(GNULIB_POPEN)/g' \ +- -e 's/@''GNULIB_PRINTF''@/$(GNULIB_PRINTF)/g' \ +- -e 's/@''GNULIB_PRINTF_POSIX''@/$(GNULIB_PRINTF_POSIX)/g' \ +- -e 's/@''GNULIB_PUTC''@/$(GNULIB_PUTC)/g' \ +- -e 's/@''GNULIB_PUTCHAR''@/$(GNULIB_PUTCHAR)/g' \ +- -e 's/@''GNULIB_PUTS''@/$(GNULIB_PUTS)/g' \ +- -e 's/@''GNULIB_REMOVE''@/$(GNULIB_REMOVE)/g' \ +- -e 's/@''GNULIB_RENAME''@/$(GNULIB_RENAME)/g' \ +- -e 's/@''GNULIB_RENAMEAT''@/$(GNULIB_RENAMEAT)/g' \ +- -e 's/@''GNULIB_SCANF''@/$(GNULIB_SCANF)/g' \ +- -e 's/@''GNULIB_SNPRINTF''@/$(GNULIB_SNPRINTF)/g' \ +- -e 's/@''GNULIB_SPRINTF_POSIX''@/$(GNULIB_SPRINTF_POSIX)/g' \ +- -e 's/@''GNULIB_STDIO_H_NONBLOCKING''@/$(GNULIB_STDIO_H_NONBLOCKING)/g' \ +- -e 's/@''GNULIB_STDIO_H_SIGPIPE''@/$(GNULIB_STDIO_H_SIGPIPE)/g' \ +- -e 's/@''GNULIB_TMPFILE''@/$(GNULIB_TMPFILE)/g' \ +- -e 's/@''GNULIB_VASPRINTF''@/$(GNULIB_VASPRINTF)/g' \ +- -e 's/@''GNULIB_VDPRINTF''@/$(GNULIB_VDPRINTF)/g' \ +- -e 's/@''GNULIB_VFPRINTF''@/$(GNULIB_VFPRINTF)/g' \ +- -e 's/@''GNULIB_VFPRINTF_POSIX''@/$(GNULIB_VFPRINTF_POSIX)/g' \ +- -e 's/@''GNULIB_VFSCANF''@/$(GNULIB_VFSCANF)/g' \ +- -e 's/@''GNULIB_VSCANF''@/$(GNULIB_VSCANF)/g' \ +- -e 's/@''GNULIB_VPRINTF''@/$(GNULIB_VPRINTF)/g' \ +- -e 's/@''GNULIB_VPRINTF_POSIX''@/$(GNULIB_VPRINTF_POSIX)/g' \ +- -e 's/@''GNULIB_VSNPRINTF''@/$(GNULIB_VSNPRINTF)/g' \ +- -e 's/@''GNULIB_VSPRINTF_POSIX''@/$(GNULIB_VSPRINTF_POSIX)/g' \ +- -e 's/@''GNULIB_MDA_FCLOSEALL''@/$(GNULIB_MDA_FCLOSEALL)/g' \ +- -e 's/@''GNULIB_MDA_FDOPEN''@/$(GNULIB_MDA_FDOPEN)/g' \ +- -e 's/@''GNULIB_MDA_FILENO''@/$(GNULIB_MDA_FILENO)/g' \ +- -e 's/@''GNULIB_MDA_GETW''@/$(GNULIB_MDA_GETW)/g' \ +- -e 's/@''GNULIB_MDA_PUTW''@/$(GNULIB_MDA_PUTW)/g' \ +- -e 's/@''GNULIB_MDA_TEMPNAM''@/$(GNULIB_MDA_TEMPNAM)/g' \ ++ -e 's/@''GNULIB_DPRINTF''@/$(GL_GNULIB_DPRINTF)/g' \ ++ -e 's/@''GNULIB_FCLOSE''@/$(GL_GNULIB_FCLOSE)/g' \ ++ -e 's/@''GNULIB_FDOPEN''@/$(GL_GNULIB_FDOPEN)/g' \ ++ -e 's/@''GNULIB_FFLUSH''@/$(GL_GNULIB_FFLUSH)/g' \ ++ -e 's/@''GNULIB_FGETC''@/$(GL_GNULIB_FGETC)/g' \ ++ -e 's/@''GNULIB_FGETS''@/$(GL_GNULIB_FGETS)/g' \ ++ -e 's/@''GNULIB_FOPEN''@/$(GL_GNULIB_FOPEN)/g' \ ++ -e 's/@''GNULIB_FPRINTF''@/$(GL_GNULIB_FPRINTF)/g' \ ++ -e 's/@''GNULIB_FPRINTF_POSIX''@/$(GL_GNULIB_FPRINTF_POSIX)/g' \ ++ -e 's/@''GNULIB_FPURGE''@/$(GL_GNULIB_FPURGE)/g' \ ++ -e 's/@''GNULIB_FPUTC''@/$(GL_GNULIB_FPUTC)/g' \ ++ -e 's/@''GNULIB_FPUTS''@/$(GL_GNULIB_FPUTS)/g' \ ++ -e 's/@''GNULIB_FREAD''@/$(GL_GNULIB_FREAD)/g' \ ++ -e 's/@''GNULIB_FREOPEN''@/$(GL_GNULIB_FREOPEN)/g' \ ++ -e 's/@''GNULIB_FSCANF''@/$(GL_GNULIB_FSCANF)/g' \ ++ -e 's/@''GNULIB_FSEEK''@/$(GL_GNULIB_FSEEK)/g' \ ++ -e 's/@''GNULIB_FSEEKO''@/$(GL_GNULIB_FSEEKO)/g' \ ++ -e 's/@''GNULIB_FTELL''@/$(GL_GNULIB_FTELL)/g' \ ++ -e 's/@''GNULIB_FTELLO''@/$(GL_GNULIB_FTELLO)/g' \ ++ -e 's/@''GNULIB_FWRITE''@/$(GL_GNULIB_FWRITE)/g' \ ++ -e 's/@''GNULIB_GETC''@/$(GL_GNULIB_GETC)/g' \ ++ -e 's/@''GNULIB_GETCHAR''@/$(GL_GNULIB_GETCHAR)/g' \ ++ -e 's/@''GNULIB_GETDELIM''@/$(GL_GNULIB_GETDELIM)/g' \ ++ -e 's/@''GNULIB_GETLINE''@/$(GL_GNULIB_GETLINE)/g' \ ++ -e 's/@''GNULIB_OBSTACK_PRINTF''@/$(GL_GNULIB_OBSTACK_PRINTF)/g' \ ++ -e 's/@''GNULIB_OBSTACK_PRINTF_POSIX''@/$(GL_GNULIB_OBSTACK_PRINTF_POSIX)/g' \ ++ -e 's/@''GNULIB_PCLOSE''@/$(GL_GNULIB_PCLOSE)/g' \ ++ -e 's/@''GNULIB_PERROR''@/$(GL_GNULIB_PERROR)/g' \ ++ -e 's/@''GNULIB_POPEN''@/$(GL_GNULIB_POPEN)/g' \ ++ -e 's/@''GNULIB_PRINTF''@/$(GL_GNULIB_PRINTF)/g' \ ++ -e 's/@''GNULIB_PRINTF_POSIX''@/$(GL_GNULIB_PRINTF_POSIX)/g' \ ++ -e 's/@''GNULIB_PUTC''@/$(GL_GNULIB_PUTC)/g' \ ++ -e 's/@''GNULIB_PUTCHAR''@/$(GL_GNULIB_PUTCHAR)/g' \ ++ -e 's/@''GNULIB_PUTS''@/$(GL_GNULIB_PUTS)/g' \ ++ -e 's/@''GNULIB_REMOVE''@/$(GL_GNULIB_REMOVE)/g' \ ++ -e 's/@''GNULIB_RENAME''@/$(GL_GNULIB_RENAME)/g' \ ++ -e 's/@''GNULIB_RENAMEAT''@/$(GL_GNULIB_RENAMEAT)/g' \ ++ -e 's/@''GNULIB_SCANF''@/$(GL_GNULIB_SCANF)/g' \ ++ -e 's/@''GNULIB_SNPRINTF''@/$(GL_GNULIB_SNPRINTF)/g' \ ++ -e 's/@''GNULIB_SPRINTF_POSIX''@/$(GL_GNULIB_SPRINTF_POSIX)/g' \ ++ -e 's/@''GNULIB_STDIO_H_NONBLOCKING''@/$(GL_GNULIB_STDIO_H_NONBLOCKING)/g' \ ++ -e 's/@''GNULIB_STDIO_H_SIGPIPE''@/$(GL_GNULIB_STDIO_H_SIGPIPE)/g' \ ++ -e 's/@''GNULIB_TMPFILE''@/$(GL_GNULIB_TMPFILE)/g' \ ++ -e 's/@''GNULIB_VASPRINTF''@/$(GL_GNULIB_VASPRINTF)/g' \ ++ -e 's/@''GNULIB_VDPRINTF''@/$(GL_GNULIB_VDPRINTF)/g' \ ++ -e 's/@''GNULIB_VFPRINTF''@/$(GL_GNULIB_VFPRINTF)/g' \ ++ -e 's/@''GNULIB_VFPRINTF_POSIX''@/$(GL_GNULIB_VFPRINTF_POSIX)/g' \ ++ -e 's/@''GNULIB_VFSCANF''@/$(GL_GNULIB_VFSCANF)/g' \ ++ -e 's/@''GNULIB_VSCANF''@/$(GL_GNULIB_VSCANF)/g' \ ++ -e 's/@''GNULIB_VPRINTF''@/$(GL_GNULIB_VPRINTF)/g' \ ++ -e 's/@''GNULIB_VPRINTF_POSIX''@/$(GL_GNULIB_VPRINTF_POSIX)/g' \ ++ -e 's/@''GNULIB_VSNPRINTF''@/$(GL_GNULIB_VSNPRINTF)/g' \ ++ -e 's/@''GNULIB_VSPRINTF_POSIX''@/$(GL_GNULIB_VSPRINTF_POSIX)/g' \ ++ -e 's/@''GNULIB_MDA_FCLOSEALL''@/$(GL_GNULIB_MDA_FCLOSEALL)/g' \ ++ -e 's/@''GNULIB_MDA_FDOPEN''@/$(GL_GNULIB_MDA_FDOPEN)/g' \ ++ -e 's/@''GNULIB_MDA_FILENO''@/$(GL_GNULIB_MDA_FILENO)/g' \ ++ -e 's/@''GNULIB_MDA_GETW''@/$(GL_GNULIB_MDA_GETW)/g' \ ++ -e 's/@''GNULIB_MDA_PUTW''@/$(GL_GNULIB_MDA_PUTW)/g' \ ++ -e 's/@''GNULIB_MDA_TEMPNAM''@/$(GL_GNULIB_MDA_TEMPNAM)/g' \ + < $(srcdir)/stdio.in.h | \ + sed -e 's|@''HAVE_DECL_FCLOSEALL''@|$(HAVE_DECL_FCLOSEALL)|g' \ + -e 's|@''HAVE_DECL_FPURGE''@|$(HAVE_DECL_FPURGE)|g' \ +@@ -2606,51 +2645,51 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_STDLIB_H''@|$(NEXT_STDLIB_H)|g' \ +- -e 's/@''GNULIB__EXIT''@/$(GNULIB__EXIT)/g' \ +- -e 's/@''GNULIB_ALIGNED_ALLOC''@/$(GNULIB_ALIGNED_ALLOC)/g' \ +- -e 's/@''GNULIB_ATOLL''@/$(GNULIB_ATOLL)/g' \ +- -e 's/@''GNULIB_CALLOC_POSIX''@/$(GNULIB_CALLOC_POSIX)/g' \ +- -e 's/@''GNULIB_CANONICALIZE_FILE_NAME''@/$(GNULIB_CANONICALIZE_FILE_NAME)/g' \ +- -e 's/@''GNULIB_FREE_POSIX''@/$(GNULIB_FREE_POSIX)/g' \ +- -e 's/@''GNULIB_GETLOADAVG''@/$(GNULIB_GETLOADAVG)/g' \ +- -e 's/@''GNULIB_GETSUBOPT''@/$(GNULIB_GETSUBOPT)/g' \ +- -e 's/@''GNULIB_GRANTPT''@/$(GNULIB_GRANTPT)/g' \ +- -e 's/@''GNULIB_MALLOC_POSIX''@/$(GNULIB_MALLOC_POSIX)/g' \ +- -e 's/@''GNULIB_MBTOWC''@/$(GNULIB_MBTOWC)/g' \ +- -e 's/@''GNULIB_MKDTEMP''@/$(GNULIB_MKDTEMP)/g' \ +- -e 's/@''GNULIB_MKOSTEMP''@/$(GNULIB_MKOSTEMP)/g' \ +- -e 's/@''GNULIB_MKOSTEMPS''@/$(GNULIB_MKOSTEMPS)/g' \ +- -e 's/@''GNULIB_MKSTEMP''@/$(GNULIB_MKSTEMP)/g' \ +- -e 's/@''GNULIB_MKSTEMPS''@/$(GNULIB_MKSTEMPS)/g' \ +- -e 's/@''GNULIB_POSIX_MEMALIGN''@/$(GNULIB_POSIX_MEMALIGN)/g' \ +- -e 's/@''GNULIB_POSIX_OPENPT''@/$(GNULIB_POSIX_OPENPT)/g' \ +- -e 's/@''GNULIB_PTSNAME''@/$(GNULIB_PTSNAME)/g' \ +- -e 's/@''GNULIB_PTSNAME_R''@/$(GNULIB_PTSNAME_R)/g' \ +- -e 's/@''GNULIB_PUTENV''@/$(GNULIB_PUTENV)/g' \ +- -e 's/@''GNULIB_QSORT_R''@/$(GNULIB_QSORT_R)/g' \ +- -e 's/@''GNULIB_RANDOM''@/$(GNULIB_RANDOM)/g' \ +- -e 's/@''GNULIB_RANDOM_R''@/$(GNULIB_RANDOM_R)/g' \ +- -e 's/@''GNULIB_REALLOC_POSIX''@/$(GNULIB_REALLOC_POSIX)/g' \ +- -e 's/@''GNULIB_REALLOCARRAY''@/$(GNULIB_REALLOCARRAY)/g' \ +- -e 's/@''GNULIB_REALPATH''@/$(GNULIB_REALPATH)/g' \ +- -e 's/@''GNULIB_RPMATCH''@/$(GNULIB_RPMATCH)/g' \ +- -e 's/@''GNULIB_SECURE_GETENV''@/$(GNULIB_SECURE_GETENV)/g' \ +- -e 's/@''GNULIB_SETENV''@/$(GNULIB_SETENV)/g' \ +- -e 's/@''GNULIB_STRTOD''@/$(GNULIB_STRTOD)/g' \ +- -e 's/@''GNULIB_STRTOL''@/$(GNULIB_STRTOL)/g' \ +- -e 's/@''GNULIB_STRTOLD''@/$(GNULIB_STRTOLD)/g' \ +- -e 's/@''GNULIB_STRTOLL''@/$(GNULIB_STRTOLL)/g' \ +- -e 's/@''GNULIB_STRTOUL''@/$(GNULIB_STRTOUL)/g' \ +- -e 's/@''GNULIB_STRTOULL''@/$(GNULIB_STRTOULL)/g' \ +- -e 's/@''GNULIB_SYSTEM_POSIX''@/$(GNULIB_SYSTEM_POSIX)/g' \ +- -e 's/@''GNULIB_UNLOCKPT''@/$(GNULIB_UNLOCKPT)/g' \ +- -e 's/@''GNULIB_UNSETENV''@/$(GNULIB_UNSETENV)/g' \ +- -e 's/@''GNULIB_WCTOMB''@/$(GNULIB_WCTOMB)/g' \ +- -e 's/@''GNULIB_MDA_ECVT''@/$(GNULIB_MDA_ECVT)/g' \ +- -e 's/@''GNULIB_MDA_FCVT''@/$(GNULIB_MDA_FCVT)/g' \ +- -e 's/@''GNULIB_MDA_GCVT''@/$(GNULIB_MDA_GCVT)/g' \ +- -e 's/@''GNULIB_MDA_MKTEMP''@/$(GNULIB_MDA_MKTEMP)/g' \ +- -e 's/@''GNULIB_MDA_PUTENV''@/$(GNULIB_MDA_PUTENV)/g' \ ++ -e 's/@''GNULIB__EXIT''@/$(GL_GNULIB__EXIT)/g' \ ++ -e 's/@''GNULIB_ALIGNED_ALLOC''@/$(GL_GNULIB_ALIGNED_ALLOC)/g' \ ++ -e 's/@''GNULIB_ATOLL''@/$(GL_GNULIB_ATOLL)/g' \ ++ -e 's/@''GNULIB_CALLOC_POSIX''@/$(GL_GNULIB_CALLOC_POSIX)/g' \ ++ -e 's/@''GNULIB_CANONICALIZE_FILE_NAME''@/$(GL_GNULIB_CANONICALIZE_FILE_NAME)/g' \ ++ -e 's/@''GNULIB_FREE_POSIX''@/$(GL_GNULIB_FREE_POSIX)/g' \ ++ -e 's/@''GNULIB_GETLOADAVG''@/$(GL_GNULIB_GETLOADAVG)/g' \ ++ -e 's/@''GNULIB_GETSUBOPT''@/$(GL_GNULIB_GETSUBOPT)/g' \ ++ -e 's/@''GNULIB_GRANTPT''@/$(GL_GNULIB_GRANTPT)/g' \ ++ -e 's/@''GNULIB_MALLOC_POSIX''@/$(GL_GNULIB_MALLOC_POSIX)/g' \ ++ -e 's/@''GNULIB_MBTOWC''@/$(GL_GNULIB_MBTOWC)/g' \ ++ -e 's/@''GNULIB_MKDTEMP''@/$(GL_GNULIB_MKDTEMP)/g' \ ++ -e 's/@''GNULIB_MKOSTEMP''@/$(GL_GNULIB_MKOSTEMP)/g' \ ++ -e 's/@''GNULIB_MKOSTEMPS''@/$(GL_GNULIB_MKOSTEMPS)/g' \ ++ -e 's/@''GNULIB_MKSTEMP''@/$(GL_GNULIB_MKSTEMP)/g' \ ++ -e 's/@''GNULIB_MKSTEMPS''@/$(GL_GNULIB_MKSTEMPS)/g' \ ++ -e 's/@''GNULIB_POSIX_MEMALIGN''@/$(GL_GNULIB_POSIX_MEMALIGN)/g' \ ++ -e 's/@''GNULIB_POSIX_OPENPT''@/$(GL_GNULIB_POSIX_OPENPT)/g' \ ++ -e 's/@''GNULIB_PTSNAME''@/$(GL_GNULIB_PTSNAME)/g' \ ++ -e 's/@''GNULIB_PTSNAME_R''@/$(GL_GNULIB_PTSNAME_R)/g' \ ++ -e 's/@''GNULIB_PUTENV''@/$(GL_GNULIB_PUTENV)/g' \ ++ -e 's/@''GNULIB_QSORT_R''@/$(GL_GNULIB_QSORT_R)/g' \ ++ -e 's/@''GNULIB_RANDOM''@/$(GL_GNULIB_RANDOM)/g' \ ++ -e 's/@''GNULIB_RANDOM_R''@/$(GL_GNULIB_RANDOM_R)/g' \ ++ -e 's/@''GNULIB_REALLOC_POSIX''@/$(GL_GNULIB_REALLOC_POSIX)/g' \ ++ -e 's/@''GNULIB_REALLOCARRAY''@/$(GL_GNULIB_REALLOCARRAY)/g' \ ++ -e 's/@''GNULIB_REALPATH''@/$(GL_GNULIB_REALPATH)/g' \ ++ -e 's/@''GNULIB_RPMATCH''@/$(GL_GNULIB_RPMATCH)/g' \ ++ -e 's/@''GNULIB_SECURE_GETENV''@/$(GL_GNULIB_SECURE_GETENV)/g' \ ++ -e 's/@''GNULIB_SETENV''@/$(GL_GNULIB_SETENV)/g' \ ++ -e 's/@''GNULIB_STRTOD''@/$(GL_GNULIB_STRTOD)/g' \ ++ -e 's/@''GNULIB_STRTOL''@/$(GL_GNULIB_STRTOL)/g' \ ++ -e 's/@''GNULIB_STRTOLD''@/$(GL_GNULIB_STRTOLD)/g' \ ++ -e 's/@''GNULIB_STRTOLL''@/$(GL_GNULIB_STRTOLL)/g' \ ++ -e 's/@''GNULIB_STRTOUL''@/$(GL_GNULIB_STRTOUL)/g' \ ++ -e 's/@''GNULIB_STRTOULL''@/$(GL_GNULIB_STRTOULL)/g' \ ++ -e 's/@''GNULIB_SYSTEM_POSIX''@/$(GL_GNULIB_SYSTEM_POSIX)/g' \ ++ -e 's/@''GNULIB_UNLOCKPT''@/$(GL_GNULIB_UNLOCKPT)/g' \ ++ -e 's/@''GNULIB_UNSETENV''@/$(GL_GNULIB_UNSETENV)/g' \ ++ -e 's/@''GNULIB_WCTOMB''@/$(GL_GNULIB_WCTOMB)/g' \ ++ -e 's/@''GNULIB_MDA_ECVT''@/$(GL_GNULIB_MDA_ECVT)/g' \ ++ -e 's/@''GNULIB_MDA_FCVT''@/$(GL_GNULIB_MDA_FCVT)/g' \ ++ -e 's/@''GNULIB_MDA_GCVT''@/$(GL_GNULIB_MDA_GCVT)/g' \ ++ -e 's/@''GNULIB_MDA_MKTEMP''@/$(GL_GNULIB_MDA_MKTEMP)/g' \ ++ -e 's/@''GNULIB_MDA_PUTENV''@/$(GL_GNULIB_MDA_PUTENV)/g' \ + < $(srcdir)/stdlib.in.h | \ + sed -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \ + -e 's|@''HAVE_ALIGNED_ALLOC''@|$(HAVE_ALIGNED_ALLOC)|g' \ +@@ -2711,6 +2750,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ + -e 's|@''REPLACE_RANDOM''@|$(REPLACE_RANDOM)|g' \ + -e 's|@''REPLACE_RANDOM_R''@|$(REPLACE_RANDOM_R)|g' \ + -e 's|@''REPLACE_REALLOC''@|$(REPLACE_REALLOC)|g' \ ++ -e 's|@''REPLACE_REALLOCARRAY''@|$(REPLACE_REALLOCARRAY)|g' \ + -e 's|@''REPLACE_REALPATH''@|$(REPLACE_REALPATH)|g' \ + -e 's|@''REPLACE_SETENV''@|$(REPLACE_SETENV)|g' \ + -e 's|@''REPLACE_SETSTATE''@|$(REPLACE_SETSTATE)|g' \ +@@ -2779,49 +2819,49 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_STRING_H''@|$(NEXT_STRING_H)|g' \ +- -e 's/@''GNULIB_EXPLICIT_BZERO''@/$(GNULIB_EXPLICIT_BZERO)/g' \ +- -e 's/@''GNULIB_FFSL''@/$(GNULIB_FFSL)/g' \ +- -e 's/@''GNULIB_FFSLL''@/$(GNULIB_FFSLL)/g' \ +- -e 's/@''GNULIB_MBSLEN''@/$(GNULIB_MBSLEN)/g' \ +- -e 's/@''GNULIB_MBSNLEN''@/$(GNULIB_MBSNLEN)/g' \ +- -e 's/@''GNULIB_MBSCHR''@/$(GNULIB_MBSCHR)/g' \ +- -e 's/@''GNULIB_MBSRCHR''@/$(GNULIB_MBSRCHR)/g' \ +- -e 's/@''GNULIB_MBSSTR''@/$(GNULIB_MBSSTR)/g' \ +- -e 's/@''GNULIB_MBSCASECMP''@/$(GNULIB_MBSCASECMP)/g' \ +- -e 's/@''GNULIB_MBSNCASECMP''@/$(GNULIB_MBSNCASECMP)/g' \ +- -e 's/@''GNULIB_MBSPCASECMP''@/$(GNULIB_MBSPCASECMP)/g' \ +- -e 's/@''GNULIB_MBSCASESTR''@/$(GNULIB_MBSCASESTR)/g' \ +- -e 's/@''GNULIB_MBSCSPN''@/$(GNULIB_MBSCSPN)/g' \ +- -e 's/@''GNULIB_MBSPBRK''@/$(GNULIB_MBSPBRK)/g' \ +- -e 's/@''GNULIB_MBSSPN''@/$(GNULIB_MBSSPN)/g' \ +- -e 's/@''GNULIB_MBSSEP''@/$(GNULIB_MBSSEP)/g' \ +- -e 's/@''GNULIB_MBSTOK_R''@/$(GNULIB_MBSTOK_R)/g' \ +- -e 's/@''GNULIB_MEMCHR''@/$(GNULIB_MEMCHR)/g' \ +- -e 's/@''GNULIB_MEMMEM''@/$(GNULIB_MEMMEM)/g' \ +- -e 's/@''GNULIB_MEMPCPY''@/$(GNULIB_MEMPCPY)/g' \ +- -e 's/@''GNULIB_MEMRCHR''@/$(GNULIB_MEMRCHR)/g' \ +- -e 's/@''GNULIB_RAWMEMCHR''@/$(GNULIB_RAWMEMCHR)/g' \ +- -e 's/@''GNULIB_STPCPY''@/$(GNULIB_STPCPY)/g' \ +- -e 's/@''GNULIB_STPNCPY''@/$(GNULIB_STPNCPY)/g' \ +- -e 's/@''GNULIB_STRCHRNUL''@/$(GNULIB_STRCHRNUL)/g' \ +- -e 's/@''GNULIB_STRDUP''@/$(GNULIB_STRDUP)/g' \ +- -e 's/@''GNULIB_STRNCAT''@/$(GNULIB_STRNCAT)/g' \ +- -e 's/@''GNULIB_STRNDUP''@/$(GNULIB_STRNDUP)/g' \ +- -e 's/@''GNULIB_STRNLEN''@/$(GNULIB_STRNLEN)/g' \ +- -e 's/@''GNULIB_STRPBRK''@/$(GNULIB_STRPBRK)/g' \ +- -e 's/@''GNULIB_STRSEP''@/$(GNULIB_STRSEP)/g' \ +- -e 's/@''GNULIB_STRSTR''@/$(GNULIB_STRSTR)/g' \ +- -e 's/@''GNULIB_STRCASESTR''@/$(GNULIB_STRCASESTR)/g' \ +- -e 's/@''GNULIB_STRTOK_R''@/$(GNULIB_STRTOK_R)/g' \ +- -e 's/@''GNULIB_STRERROR''@/$(GNULIB_STRERROR)/g' \ +- -e 's/@''GNULIB_STRERROR_R''@/$(GNULIB_STRERROR_R)/g' \ +- -e 's/@''GNULIB_STRERRORNAME_NP''@/$(GNULIB_STRERRORNAME_NP)/g' \ +- -e 's/@''GNULIB_SIGABBREV_NP''@/$(GNULIB_SIGABBREV_NP)/g' \ +- -e 's/@''GNULIB_SIGDESCR_NP''@/$(GNULIB_SIGDESCR_NP)/g' \ +- -e 's/@''GNULIB_STRSIGNAL''@/$(GNULIB_STRSIGNAL)/g' \ +- -e 's/@''GNULIB_STRVERSCMP''@/$(GNULIB_STRVERSCMP)/g' \ +- -e 's/@''GNULIB_MDA_MEMCCPY''@/$(GNULIB_MDA_MEMCCPY)/g' \ +- -e 's/@''GNULIB_MDA_STRDUP''@/$(GNULIB_MDA_STRDUP)/g' \ ++ -e 's/@''GNULIB_EXPLICIT_BZERO''@/$(GL_GNULIB_EXPLICIT_BZERO)/g' \ ++ -e 's/@''GNULIB_FFSL''@/$(GL_GNULIB_FFSL)/g' \ ++ -e 's/@''GNULIB_FFSLL''@/$(GL_GNULIB_FFSLL)/g' \ ++ -e 's/@''GNULIB_MBSLEN''@/$(GL_GNULIB_MBSLEN)/g' \ ++ -e 's/@''GNULIB_MBSNLEN''@/$(GL_GNULIB_MBSNLEN)/g' \ ++ -e 's/@''GNULIB_MBSCHR''@/$(GL_GNULIB_MBSCHR)/g' \ ++ -e 's/@''GNULIB_MBSRCHR''@/$(GL_GNULIB_MBSRCHR)/g' \ ++ -e 's/@''GNULIB_MBSSTR''@/$(GL_GNULIB_MBSSTR)/g' \ ++ -e 's/@''GNULIB_MBSCASECMP''@/$(GL_GNULIB_MBSCASECMP)/g' \ ++ -e 's/@''GNULIB_MBSNCASECMP''@/$(GL_GNULIB_MBSNCASECMP)/g' \ ++ -e 's/@''GNULIB_MBSPCASECMP''@/$(GL_GNULIB_MBSPCASECMP)/g' \ ++ -e 's/@''GNULIB_MBSCASESTR''@/$(GL_GNULIB_MBSCASESTR)/g' \ ++ -e 's/@''GNULIB_MBSCSPN''@/$(GL_GNULIB_MBSCSPN)/g' \ ++ -e 's/@''GNULIB_MBSPBRK''@/$(GL_GNULIB_MBSPBRK)/g' \ ++ -e 's/@''GNULIB_MBSSPN''@/$(GL_GNULIB_MBSSPN)/g' \ ++ -e 's/@''GNULIB_MBSSEP''@/$(GL_GNULIB_MBSSEP)/g' \ ++ -e 's/@''GNULIB_MBSTOK_R''@/$(GL_GNULIB_MBSTOK_R)/g' \ ++ -e 's/@''GNULIB_MEMCHR''@/$(GL_GNULIB_MEMCHR)/g' \ ++ -e 's/@''GNULIB_MEMMEM''@/$(GL_GNULIB_MEMMEM)/g' \ ++ -e 's/@''GNULIB_MEMPCPY''@/$(GL_GNULIB_MEMPCPY)/g' \ ++ -e 's/@''GNULIB_MEMRCHR''@/$(GL_GNULIB_MEMRCHR)/g' \ ++ -e 's/@''GNULIB_RAWMEMCHR''@/$(GL_GNULIB_RAWMEMCHR)/g' \ ++ -e 's/@''GNULIB_STPCPY''@/$(GL_GNULIB_STPCPY)/g' \ ++ -e 's/@''GNULIB_STPNCPY''@/$(GL_GNULIB_STPNCPY)/g' \ ++ -e 's/@''GNULIB_STRCHRNUL''@/$(GL_GNULIB_STRCHRNUL)/g' \ ++ -e 's/@''GNULIB_STRDUP''@/$(GL_GNULIB_STRDUP)/g' \ ++ -e 's/@''GNULIB_STRNCAT''@/$(GL_GNULIB_STRNCAT)/g' \ ++ -e 's/@''GNULIB_STRNDUP''@/$(GL_GNULIB_STRNDUP)/g' \ ++ -e 's/@''GNULIB_STRNLEN''@/$(GL_GNULIB_STRNLEN)/g' \ ++ -e 's/@''GNULIB_STRPBRK''@/$(GL_GNULIB_STRPBRK)/g' \ ++ -e 's/@''GNULIB_STRSEP''@/$(GL_GNULIB_STRSEP)/g' \ ++ -e 's/@''GNULIB_STRSTR''@/$(GL_GNULIB_STRSTR)/g' \ ++ -e 's/@''GNULIB_STRCASESTR''@/$(GL_GNULIB_STRCASESTR)/g' \ ++ -e 's/@''GNULIB_STRTOK_R''@/$(GL_GNULIB_STRTOK_R)/g' \ ++ -e 's/@''GNULIB_STRERROR''@/$(GL_GNULIB_STRERROR)/g' \ ++ -e 's/@''GNULIB_STRERROR_R''@/$(GL_GNULIB_STRERROR_R)/g' \ ++ -e 's/@''GNULIB_STRERRORNAME_NP''@/$(GL_GNULIB_STRERRORNAME_NP)/g' \ ++ -e 's/@''GNULIB_SIGABBREV_NP''@/$(GL_GNULIB_SIGABBREV_NP)/g' \ ++ -e 's/@''GNULIB_SIGDESCR_NP''@/$(GL_GNULIB_SIGDESCR_NP)/g' \ ++ -e 's/@''GNULIB_STRSIGNAL''@/$(GL_GNULIB_STRSIGNAL)/g' \ ++ -e 's/@''GNULIB_STRVERSCMP''@/$(GL_GNULIB_STRVERSCMP)/g' \ ++ -e 's/@''GNULIB_MDA_MEMCCPY''@/$(GL_GNULIB_MDA_MEMCCPY)/g' \ ++ -e 's/@''GNULIB_MDA_STRDUP''@/$(GL_GNULIB_MDA_STRDUP)/g' \ + < $(srcdir)/string.in.h | \ + sed -e 's|@''HAVE_EXPLICIT_BZERO''@|$(HAVE_EXPLICIT_BZERO)|g' \ + -e 's|@''HAVE_FFSL''@|$(HAVE_FFSL)|g' \ +@@ -2893,7 +2933,7 @@ sys/file.h: sys_file.in.h $(top_builddir)/config.status $(WARN_ON_USE_H) + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_SYS_FILE_H''@|$(NEXT_SYS_FILE_H)|g' \ + -e 's/@''HAVE_FLOCK''@/$(HAVE_FLOCK)/g' \ +- -e 's/@''GNULIB_FLOCK''@/$(GNULIB_FLOCK)/g' \ ++ -e 's/@''GNULIB_FLOCK''@/$(GL_GNULIB_FLOCK)/g' \ + -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ + < $(srcdir)/sys_file.in.h; \ + } > $@-t && \ +@@ -2922,7 +2962,7 @@ sys/random.h: sys_random.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_N + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_SYS_RANDOM_H''@|$(NEXT_SYS_RANDOM_H)|g' \ + -e 's|@''HAVE_SYS_RANDOM_H''@|$(HAVE_SYS_RANDOM_H)|g' \ +- -e 's/@''GNULIB_GETRANDOM''@/$(GNULIB_GETRANDOM)/g' \ ++ -e 's/@''GNULIB_GETRANDOM''@/$(GL_GNULIB_GETRANDOM)/g' \ + -e 's/@''HAVE_GETRANDOM''@/$(HAVE_GETRANDOM)/g' \ + -e 's/@''REPLACE_GETRANDOM''@/$(REPLACE_GETRANDOM)/g' \ + -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ +@@ -2955,8 +2995,8 @@ sys/select.h: sys_select.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_SYS_SELECT_H''@|$(NEXT_SYS_SELECT_H)|g' \ + -e 's|@''HAVE_SYS_SELECT_H''@|$(HAVE_SYS_SELECT_H)|g' \ +- -e 's/@''GNULIB_PSELECT''@/$(GNULIB_PSELECT)/g' \ +- -e 's/@''GNULIB_SELECT''@/$(GNULIB_SELECT)/g' \ ++ -e 's/@''GNULIB_PSELECT''@/$(GL_GNULIB_PSELECT)/g' \ ++ -e 's/@''GNULIB_SELECT''@/$(GL_GNULIB_SELECT)/g' \ + -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \ + -e 's|@''HAVE_PSELECT''@|$(HAVE_PSELECT)|g' \ + -e 's|@''REPLACE_PSELECT''@|$(REPLACE_PSELECT)|g' \ +@@ -2990,22 +3030,22 @@ sys/socket.h: sys_socket.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_SYS_SOCKET_H''@|$(NEXT_SYS_SOCKET_H)|g' \ + -e 's|@''HAVE_SYS_SOCKET_H''@|$(HAVE_SYS_SOCKET_H)|g' \ +- -e 's/@''GNULIB_CLOSE''@/$(GNULIB_CLOSE)/g' \ +- -e 's/@''GNULIB_SOCKET''@/$(GNULIB_SOCKET)/g' \ +- -e 's/@''GNULIB_CONNECT''@/$(GNULIB_CONNECT)/g' \ +- -e 's/@''GNULIB_ACCEPT''@/$(GNULIB_ACCEPT)/g' \ +- -e 's/@''GNULIB_BIND''@/$(GNULIB_BIND)/g' \ +- -e 's/@''GNULIB_GETPEERNAME''@/$(GNULIB_GETPEERNAME)/g' \ +- -e 's/@''GNULIB_GETSOCKNAME''@/$(GNULIB_GETSOCKNAME)/g' \ +- -e 's/@''GNULIB_GETSOCKOPT''@/$(GNULIB_GETSOCKOPT)/g' \ +- -e 's/@''GNULIB_LISTEN''@/$(GNULIB_LISTEN)/g' \ +- -e 's/@''GNULIB_RECV''@/$(GNULIB_RECV)/g' \ +- -e 's/@''GNULIB_SEND''@/$(GNULIB_SEND)/g' \ +- -e 's/@''GNULIB_RECVFROM''@/$(GNULIB_RECVFROM)/g' \ +- -e 's/@''GNULIB_SENDTO''@/$(GNULIB_SENDTO)/g' \ +- -e 's/@''GNULIB_SETSOCKOPT''@/$(GNULIB_SETSOCKOPT)/g' \ +- -e 's/@''GNULIB_SHUTDOWN''@/$(GNULIB_SHUTDOWN)/g' \ +- -e 's/@''GNULIB_ACCEPT4''@/$(GNULIB_ACCEPT4)/g' \ ++ -e 's/@''GNULIB_CLOSE''@/$(GL_GNULIB_CLOSE)/g' \ ++ -e 's/@''GNULIB_SOCKET''@/$(GL_GNULIB_SOCKET)/g' \ ++ -e 's/@''GNULIB_CONNECT''@/$(GL_GNULIB_CONNECT)/g' \ ++ -e 's/@''GNULIB_ACCEPT''@/$(GL_GNULIB_ACCEPT)/g' \ ++ -e 's/@''GNULIB_BIND''@/$(GL_GNULIB_BIND)/g' \ ++ -e 's/@''GNULIB_GETPEERNAME''@/$(GL_GNULIB_GETPEERNAME)/g' \ ++ -e 's/@''GNULIB_GETSOCKNAME''@/$(GL_GNULIB_GETSOCKNAME)/g' \ ++ -e 's/@''GNULIB_GETSOCKOPT''@/$(GL_GNULIB_GETSOCKOPT)/g' \ ++ -e 's/@''GNULIB_LISTEN''@/$(GL_GNULIB_LISTEN)/g' \ ++ -e 's/@''GNULIB_RECV''@/$(GL_GNULIB_RECV)/g' \ ++ -e 's/@''GNULIB_SEND''@/$(GL_GNULIB_SEND)/g' \ ++ -e 's/@''GNULIB_RECVFROM''@/$(GL_GNULIB_RECVFROM)/g' \ ++ -e 's/@''GNULIB_SENDTO''@/$(GL_GNULIB_SENDTO)/g' \ ++ -e 's/@''GNULIB_SETSOCKOPT''@/$(GL_GNULIB_SETSOCKOPT)/g' \ ++ -e 's/@''GNULIB_SHUTDOWN''@/$(GL_GNULIB_SHUTDOWN)/g' \ ++ -e 's/@''GNULIB_ACCEPT4''@/$(GL_GNULIB_ACCEPT4)/g' \ + -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \ + -e 's|@''HAVE_WS2TCPIP_H''@|$(HAVE_WS2TCPIP_H)|g' \ + -e 's|@''HAVE_STRUCT_SOCKADDR_STORAGE''@|$(HAVE_STRUCT_SOCKADDR_STORAGE)|g' \ +@@ -3042,25 +3082,25 @@ sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU + -e 's|@''NEXT_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \ + -e 's|@''WINDOWS_64_BIT_ST_SIZE''@|$(WINDOWS_64_BIT_ST_SIZE)|g' \ + -e 's|@''WINDOWS_STAT_TIMESPEC''@|$(WINDOWS_STAT_TIMESPEC)|g' \ +- -e 's/@''GNULIB_FCHMODAT''@/$(GNULIB_FCHMODAT)/g' \ +- -e 's/@''GNULIB_FSTAT''@/$(GNULIB_FSTAT)/g' \ +- -e 's/@''GNULIB_FSTATAT''@/$(GNULIB_FSTATAT)/g' \ +- -e 's/@''GNULIB_FUTIMENS''@/$(GNULIB_FUTIMENS)/g' \ +- -e 's/@''GNULIB_GETUMASK''@/$(GNULIB_GETUMASK)/g' \ +- -e 's/@''GNULIB_LCHMOD''@/$(GNULIB_LCHMOD)/g' \ +- -e 's/@''GNULIB_LSTAT''@/$(GNULIB_LSTAT)/g' \ +- -e 's/@''GNULIB_MKDIR''@/$(GNULIB_MKDIR)/g' \ +- -e 's/@''GNULIB_MKDIRAT''@/$(GNULIB_MKDIRAT)/g' \ +- -e 's/@''GNULIB_MKFIFO''@/$(GNULIB_MKFIFO)/g' \ +- -e 's/@''GNULIB_MKFIFOAT''@/$(GNULIB_MKFIFOAT)/g' \ +- -e 's/@''GNULIB_MKNOD''@/$(GNULIB_MKNOD)/g' \ +- -e 's/@''GNULIB_MKNODAT''@/$(GNULIB_MKNODAT)/g' \ +- -e 's/@''GNULIB_STAT''@/$(GNULIB_STAT)/g' \ +- -e 's/@''GNULIB_UTIMENSAT''@/$(GNULIB_UTIMENSAT)/g' \ +- -e 's/@''GNULIB_OVERRIDES_STRUCT_STAT''@/$(GNULIB_OVERRIDES_STRUCT_STAT)/g' \ +- -e 's/@''GNULIB_MDA_CHMOD''@/$(GNULIB_MDA_CHMOD)/g' \ +- -e 's/@''GNULIB_MDA_MKDIR''@/$(GNULIB_MDA_MKDIR)/g' \ +- -e 's/@''GNULIB_MDA_UMASK''@/$(GNULIB_MDA_UMASK)/g' \ ++ -e 's/@''GNULIB_FCHMODAT''@/$(GL_GNULIB_FCHMODAT)/g' \ ++ -e 's/@''GNULIB_FSTAT''@/$(GL_GNULIB_FSTAT)/g' \ ++ -e 's/@''GNULIB_FSTATAT''@/$(GL_GNULIB_FSTATAT)/g' \ ++ -e 's/@''GNULIB_FUTIMENS''@/$(GL_GNULIB_FUTIMENS)/g' \ ++ -e 's/@''GNULIB_GETUMASK''@/$(GL_GNULIB_GETUMASK)/g' \ ++ -e 's/@''GNULIB_LCHMOD''@/$(GL_GNULIB_LCHMOD)/g' \ ++ -e 's/@''GNULIB_LSTAT''@/$(GL_GNULIB_LSTAT)/g' \ ++ -e 's/@''GNULIB_MKDIR''@/$(GL_GNULIB_MKDIR)/g' \ ++ -e 's/@''GNULIB_MKDIRAT''@/$(GL_GNULIB_MKDIRAT)/g' \ ++ -e 's/@''GNULIB_MKFIFO''@/$(GL_GNULIB_MKFIFO)/g' \ ++ -e 's/@''GNULIB_MKFIFOAT''@/$(GL_GNULIB_MKFIFOAT)/g' \ ++ -e 's/@''GNULIB_MKNOD''@/$(GL_GNULIB_MKNOD)/g' \ ++ -e 's/@''GNULIB_MKNODAT''@/$(GL_GNULIB_MKNODAT)/g' \ ++ -e 's/@''GNULIB_STAT''@/$(GL_GNULIB_STAT)/g' \ ++ -e 's/@''GNULIB_UTIMENSAT''@/$(GL_GNULIB_UTIMENSAT)/g' \ ++ -e 's/@''GNULIB_OVERRIDES_STRUCT_STAT''@/$(GL_GNULIB_OVERRIDES_STRUCT_STAT)/g' \ ++ -e 's/@''GNULIB_MDA_CHMOD''@/$(GL_GNULIB_MDA_CHMOD)/g' \ ++ -e 's/@''GNULIB_MDA_MKDIR''@/$(GL_GNULIB_MDA_MKDIR)/g' \ ++ -e 's/@''GNULIB_MDA_UMASK''@/$(GL_GNULIB_MDA_UMASK)/g' \ + -e 's|@''HAVE_FCHMODAT''@|$(HAVE_FCHMODAT)|g' \ + -e 's|@''HAVE_FSTATAT''@|$(HAVE_FSTATAT)|g' \ + -e 's|@''HAVE_FUTIMENS''@|$(HAVE_FUTIMENS)|g' \ +@@ -3114,7 +3154,7 @@ sys/time.h: sys_time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_SYS_TIME_H''@|$(NEXT_SYS_TIME_H)|g' \ +- -e 's/@''GNULIB_GETTIMEOFDAY''@/$(GNULIB_GETTIMEOFDAY)/g' \ ++ -e 's/@''GNULIB_GETTIMEOFDAY''@/$(GL_GNULIB_GETTIMEOFDAY)/g' \ + -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \ + -e 's/@''HAVE_GETTIMEOFDAY''@/$(HAVE_GETTIMEOFDAY)/g' \ + -e 's/@''HAVE_STRUCT_TIMEVAL''@/$(HAVE_STRUCT_TIMEVAL)/g' \ +@@ -3148,7 +3188,7 @@ sys/times.h: sys_times.in.h $(top_builddir)/config.status $(WARN_ON_USE_H) $(ARG + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_SYS_TIMES_H''@|$(NEXT_SYS_TIMES_H)|g' \ +- -e 's/@''GNULIB_TIMES''@/$(GNULIB_TIMES)/g' \ ++ -e 's/@''GNULIB_TIMES''@/$(GL_GNULIB_TIMES)/g' \ + -e 's|@''HAVE_STRUCT_TMS''@|$(HAVE_STRUCT_TMS)|g' \ + -e 's|@''HAVE_TIMES''@|$(HAVE_TIMES)|g' \ + -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ +@@ -3239,18 +3279,18 @@ time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $( + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_TIME_H''@|$(NEXT_TIME_H)|g' \ +- -e 's/@''GNULIB_CTIME''@/$(GNULIB_CTIME)/g' \ +- -e 's/@''GNULIB_LOCALTIME''@/$(GNULIB_LOCALTIME)/g' \ +- -e 's/@''GNULIB_MKTIME''@/$(GNULIB_MKTIME)/g' \ +- -e 's/@''GNULIB_NANOSLEEP''@/$(GNULIB_NANOSLEEP)/g' \ +- -e 's/@''GNULIB_STRFTIME''@/$(GNULIB_STRFTIME)/g' \ +- -e 's/@''GNULIB_STRPTIME''@/$(GNULIB_STRPTIME)/g' \ +- -e 's/@''GNULIB_TIMEGM''@/$(GNULIB_TIMEGM)/g' \ +- -e 's/@''GNULIB_TIMESPEC_GET''@/$(GNULIB_TIMESPEC_GET)/g' \ +- -e 's/@''GNULIB_TIME_R''@/$(GNULIB_TIME_R)/g' \ +- -e 's/@''GNULIB_TIME_RZ''@/$(GNULIB_TIME_RZ)/g' \ +- -e 's/@''GNULIB_TZSET''@/$(GNULIB_TZSET)/g' \ +- -e 's/@''GNULIB_MDA_TZSET''@/$(GNULIB_MDA_TZSET)/g' \ ++ -e 's/@''GNULIB_CTIME''@/$(GL_GNULIB_CTIME)/g' \ ++ -e 's/@''GNULIB_LOCALTIME''@/$(GL_GNULIB_LOCALTIME)/g' \ ++ -e 's/@''GNULIB_MKTIME''@/$(GL_GNULIB_MKTIME)/g' \ ++ -e 's/@''GNULIB_NANOSLEEP''@/$(GL_GNULIB_NANOSLEEP)/g' \ ++ -e 's/@''GNULIB_STRFTIME''@/$(GL_GNULIB_STRFTIME)/g' \ ++ -e 's/@''GNULIB_STRPTIME''@/$(GL_GNULIB_STRPTIME)/g' \ ++ -e 's/@''GNULIB_TIMEGM''@/$(GL_GNULIB_TIMEGM)/g' \ ++ -e 's/@''GNULIB_TIMESPEC_GET''@/$(GL_GNULIB_TIMESPEC_GET)/g' \ ++ -e 's/@''GNULIB_TIME_R''@/$(GL_GNULIB_TIME_R)/g' \ ++ -e 's/@''GNULIB_TIME_RZ''@/$(GL_GNULIB_TIME_RZ)/g' \ ++ -e 's/@''GNULIB_TZSET''@/$(GL_GNULIB_TZSET)/g' \ ++ -e 's/@''GNULIB_MDA_TZSET''@/$(GL_GNULIB_MDA_TZSET)/g' \ + -e 's|@''HAVE_DECL_LOCALTIME_R''@|$(HAVE_DECL_LOCALTIME_R)|g' \ + -e 's|@''HAVE_NANOSLEEP''@|$(HAVE_NANOSLEEP)|g' \ + -e 's|@''HAVE_STRPTIME''@|$(HAVE_STRPTIME)|g' \ +@@ -3360,89 +3400,89 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \ + -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \ +- -e 's/@''GNULIB_ACCESS''@/$(GNULIB_ACCESS)/g' \ +- -e 's/@''GNULIB_CHDIR''@/$(GNULIB_CHDIR)/g' \ +- -e 's/@''GNULIB_CHOWN''@/$(GNULIB_CHOWN)/g' \ +- -e 's/@''GNULIB_CLOSE''@/$(GNULIB_CLOSE)/g' \ +- -e 's/@''GNULIB_COPY_FILE_RANGE''@/$(GNULIB_COPY_FILE_RANGE)/g' \ +- -e 's/@''GNULIB_DUP''@/$(GNULIB_DUP)/g' \ +- -e 's/@''GNULIB_DUP2''@/$(GNULIB_DUP2)/g' \ +- -e 's/@''GNULIB_DUP3''@/$(GNULIB_DUP3)/g' \ +- -e 's/@''GNULIB_ENVIRON''@/$(GNULIB_ENVIRON)/g' \ +- -e 's/@''GNULIB_EUIDACCESS''@/$(GNULIB_EUIDACCESS)/g' \ +- -e 's/@''GNULIB_EXECL''@/$(GNULIB_EXECL)/g' \ +- -e 's/@''GNULIB_EXECLE''@/$(GNULIB_EXECLE)/g' \ +- -e 's/@''GNULIB_EXECLP''@/$(GNULIB_EXECLP)/g' \ +- -e 's/@''GNULIB_EXECV''@/$(GNULIB_EXECV)/g' \ +- -e 's/@''GNULIB_EXECVE''@/$(GNULIB_EXECVE)/g' \ +- -e 's/@''GNULIB_EXECVP''@/$(GNULIB_EXECVP)/g' \ +- -e 's/@''GNULIB_EXECVPE''@/$(GNULIB_EXECVPE)/g' \ +- -e 's/@''GNULIB_FACCESSAT''@/$(GNULIB_FACCESSAT)/g' \ +- -e 's/@''GNULIB_FCHDIR''@/$(GNULIB_FCHDIR)/g' \ +- -e 's/@''GNULIB_FCHOWNAT''@/$(GNULIB_FCHOWNAT)/g' \ +- -e 's/@''GNULIB_FDATASYNC''@/$(GNULIB_FDATASYNC)/g' \ +- -e 's/@''GNULIB_FSYNC''@/$(GNULIB_FSYNC)/g' \ +- -e 's/@''GNULIB_FTRUNCATE''@/$(GNULIB_FTRUNCATE)/g' \ +- -e 's/@''GNULIB_GETCWD''@/$(GNULIB_GETCWD)/g' \ +- -e 's/@''GNULIB_GETDOMAINNAME''@/$(GNULIB_GETDOMAINNAME)/g' \ +- -e 's/@''GNULIB_GETDTABLESIZE''@/$(GNULIB_GETDTABLESIZE)/g' \ +- -e 's/@''GNULIB_GETENTROPY''@/$(GNULIB_GETENTROPY)/g' \ +- -e 's/@''GNULIB_GETGROUPS''@/$(GNULIB_GETGROUPS)/g' \ +- -e 's/@''GNULIB_GETHOSTNAME''@/$(GNULIB_GETHOSTNAME)/g' \ +- -e 's/@''GNULIB_GETLOGIN''@/$(GNULIB_GETLOGIN)/g' \ +- -e 's/@''GNULIB_GETLOGIN_R''@/$(GNULIB_GETLOGIN_R)/g' \ +- -e 's/@''GNULIB_GETOPT_POSIX''@/$(GNULIB_GETOPT_POSIX)/g' \ +- -e 's/@''GNULIB_GETPAGESIZE''@/$(GNULIB_GETPAGESIZE)/g' \ +- -e 's/@''GNULIB_GETPASS''@/$(GNULIB_GETPASS)/g' \ +- -e 's/@''GNULIB_GETUSERSHELL''@/$(GNULIB_GETUSERSHELL)/g' \ +- -e 's/@''GNULIB_GROUP_MEMBER''@/$(GNULIB_GROUP_MEMBER)/g' \ +- -e 's/@''GNULIB_ISATTY''@/$(GNULIB_ISATTY)/g' \ +- -e 's/@''GNULIB_LCHOWN''@/$(GNULIB_LCHOWN)/g' \ +- -e 's/@''GNULIB_LINK''@/$(GNULIB_LINK)/g' \ +- -e 's/@''GNULIB_LINKAT''@/$(GNULIB_LINKAT)/g' \ +- -e 's/@''GNULIB_LSEEK''@/$(GNULIB_LSEEK)/g' \ +- -e 's/@''GNULIB_PIPE''@/$(GNULIB_PIPE)/g' \ +- -e 's/@''GNULIB_PIPE2''@/$(GNULIB_PIPE2)/g' \ +- -e 's/@''GNULIB_PREAD''@/$(GNULIB_PREAD)/g' \ +- -e 's/@''GNULIB_PWRITE''@/$(GNULIB_PWRITE)/g' \ +- -e 's/@''GNULIB_READ''@/$(GNULIB_READ)/g' \ +- -e 's/@''GNULIB_READLINK''@/$(GNULIB_READLINK)/g' \ +- -e 's/@''GNULIB_READLINKAT''@/$(GNULIB_READLINKAT)/g' \ +- -e 's/@''GNULIB_RMDIR''@/$(GNULIB_RMDIR)/g' \ +- -e 's/@''GNULIB_SETHOSTNAME''@/$(GNULIB_SETHOSTNAME)/g' \ +- -e 's/@''GNULIB_SLEEP''@/$(GNULIB_SLEEP)/g' \ +- -e 's/@''GNULIB_SYMLINK''@/$(GNULIB_SYMLINK)/g' \ +- -e 's/@''GNULIB_SYMLINKAT''@/$(GNULIB_SYMLINKAT)/g' \ +- -e 's/@''GNULIB_TRUNCATE''@/$(GNULIB_TRUNCATE)/g' \ +- -e 's/@''GNULIB_TTYNAME_R''@/$(GNULIB_TTYNAME_R)/g' \ +- -e 's/@''GNULIB_UNISTD_H_GETOPT''@/0$(GNULIB_GL_UNISTD_H_GETOPT)/g' \ +- -e 's/@''GNULIB_UNISTD_H_NONBLOCKING''@/$(GNULIB_UNISTD_H_NONBLOCKING)/g' \ +- -e 's/@''GNULIB_UNISTD_H_SIGPIPE''@/$(GNULIB_UNISTD_H_SIGPIPE)/g' \ +- -e 's/@''GNULIB_UNLINK''@/$(GNULIB_UNLINK)/g' \ +- -e 's/@''GNULIB_UNLINKAT''@/$(GNULIB_UNLINKAT)/g' \ +- -e 's/@''GNULIB_USLEEP''@/$(GNULIB_USLEEP)/g' \ +- -e 's/@''GNULIB_WRITE''@/$(GNULIB_WRITE)/g' \ +- -e 's/@''GNULIB_MDA_ACCESS''@/$(GNULIB_MDA_ACCESS)/g' \ +- -e 's/@''GNULIB_MDA_CHDIR''@/$(GNULIB_MDA_CHDIR)/g' \ +- -e 's/@''GNULIB_MDA_CLOSE''@/$(GNULIB_MDA_CLOSE)/g' \ +- -e 's/@''GNULIB_MDA_DUP''@/$(GNULIB_MDA_DUP)/g' \ +- -e 's/@''GNULIB_MDA_DUP2''@/$(GNULIB_MDA_DUP2)/g' \ +- -e 's/@''GNULIB_MDA_EXECL''@/$(GNULIB_MDA_EXECL)/g' \ +- -e 's/@''GNULIB_MDA_EXECLE''@/$(GNULIB_MDA_EXECLE)/g' \ +- -e 's/@''GNULIB_MDA_EXECLP''@/$(GNULIB_MDA_EXECLP)/g' \ +- -e 's/@''GNULIB_MDA_EXECV''@/$(GNULIB_MDA_EXECV)/g' \ +- -e 's/@''GNULIB_MDA_EXECVE''@/$(GNULIB_MDA_EXECVE)/g' \ +- -e 's/@''GNULIB_MDA_EXECVP''@/$(GNULIB_MDA_EXECVP)/g' \ +- -e 's/@''GNULIB_MDA_EXECVPE''@/$(GNULIB_MDA_EXECVPE)/g' \ +- -e 's/@''GNULIB_MDA_GETCWD''@/$(GNULIB_MDA_GETCWD)/g' \ +- -e 's/@''GNULIB_MDA_GETPID''@/$(GNULIB_MDA_GETPID)/g' \ +- -e 's/@''GNULIB_MDA_ISATTY''@/$(GNULIB_MDA_ISATTY)/g' \ +- -e 's/@''GNULIB_MDA_LSEEK''@/$(GNULIB_MDA_LSEEK)/g' \ +- -e 's/@''GNULIB_MDA_READ''@/$(GNULIB_MDA_READ)/g' \ +- -e 's/@''GNULIB_MDA_RMDIR''@/$(GNULIB_MDA_RMDIR)/g' \ +- -e 's/@''GNULIB_MDA_SWAB''@/$(GNULIB_MDA_SWAB)/g' \ +- -e 's/@''GNULIB_MDA_UNLINK''@/$(GNULIB_MDA_UNLINK)/g' \ +- -e 's/@''GNULIB_MDA_WRITE''@/$(GNULIB_MDA_WRITE)/g' \ ++ -e 's/@''GNULIB_ACCESS''@/$(GL_GNULIB_ACCESS)/g' \ ++ -e 's/@''GNULIB_CHDIR''@/$(GL_GNULIB_CHDIR)/g' \ ++ -e 's/@''GNULIB_CHOWN''@/$(GL_GNULIB_CHOWN)/g' \ ++ -e 's/@''GNULIB_CLOSE''@/$(GL_GNULIB_CLOSE)/g' \ ++ -e 's/@''GNULIB_COPY_FILE_RANGE''@/$(GL_GNULIB_COPY_FILE_RANGE)/g' \ ++ -e 's/@''GNULIB_DUP''@/$(GL_GNULIB_DUP)/g' \ ++ -e 's/@''GNULIB_DUP2''@/$(GL_GNULIB_DUP2)/g' \ ++ -e 's/@''GNULIB_DUP3''@/$(GL_GNULIB_DUP3)/g' \ ++ -e 's/@''GNULIB_ENVIRON''@/$(GL_GNULIB_ENVIRON)/g' \ ++ -e 's/@''GNULIB_EUIDACCESS''@/$(GL_GNULIB_EUIDACCESS)/g' \ ++ -e 's/@''GNULIB_EXECL''@/$(GL_GNULIB_EXECL)/g' \ ++ -e 's/@''GNULIB_EXECLE''@/$(GL_GNULIB_EXECLE)/g' \ ++ -e 's/@''GNULIB_EXECLP''@/$(GL_GNULIB_EXECLP)/g' \ ++ -e 's/@''GNULIB_EXECV''@/$(GL_GNULIB_EXECV)/g' \ ++ -e 's/@''GNULIB_EXECVE''@/$(GL_GNULIB_EXECVE)/g' \ ++ -e 's/@''GNULIB_EXECVP''@/$(GL_GNULIB_EXECVP)/g' \ ++ -e 's/@''GNULIB_EXECVPE''@/$(GL_GNULIB_EXECVPE)/g' \ ++ -e 's/@''GNULIB_FACCESSAT''@/$(GL_GNULIB_FACCESSAT)/g' \ ++ -e 's/@''GNULIB_FCHDIR''@/$(GL_GNULIB_FCHDIR)/g' \ ++ -e 's/@''GNULIB_FCHOWNAT''@/$(GL_GNULIB_FCHOWNAT)/g' \ ++ -e 's/@''GNULIB_FDATASYNC''@/$(GL_GNULIB_FDATASYNC)/g' \ ++ -e 's/@''GNULIB_FSYNC''@/$(GL_GNULIB_FSYNC)/g' \ ++ -e 's/@''GNULIB_FTRUNCATE''@/$(GL_GNULIB_FTRUNCATE)/g' \ ++ -e 's/@''GNULIB_GETCWD''@/$(GL_GNULIB_GETCWD)/g' \ ++ -e 's/@''GNULIB_GETDOMAINNAME''@/$(GL_GNULIB_GETDOMAINNAME)/g' \ ++ -e 's/@''GNULIB_GETDTABLESIZE''@/$(GL_GNULIB_GETDTABLESIZE)/g' \ ++ -e 's/@''GNULIB_GETENTROPY''@/$(GL_GNULIB_GETENTROPY)/g' \ ++ -e 's/@''GNULIB_GETGROUPS''@/$(GL_GNULIB_GETGROUPS)/g' \ ++ -e 's/@''GNULIB_GETHOSTNAME''@/$(GL_GNULIB_GETHOSTNAME)/g' \ ++ -e 's/@''GNULIB_GETLOGIN''@/$(GL_GNULIB_GETLOGIN)/g' \ ++ -e 's/@''GNULIB_GETLOGIN_R''@/$(GL_GNULIB_GETLOGIN_R)/g' \ ++ -e 's/@''GNULIB_GETOPT_POSIX''@/$(GL_GNULIB_GETOPT_POSIX)/g' \ ++ -e 's/@''GNULIB_GETPAGESIZE''@/$(GL_GNULIB_GETPAGESIZE)/g' \ ++ -e 's/@''GNULIB_GETPASS''@/$(GL_GNULIB_GETPASS)/g' \ ++ -e 's/@''GNULIB_GETUSERSHELL''@/$(GL_GNULIB_GETUSERSHELL)/g' \ ++ -e 's/@''GNULIB_GROUP_MEMBER''@/$(GL_GNULIB_GROUP_MEMBER)/g' \ ++ -e 's/@''GNULIB_ISATTY''@/$(GL_GNULIB_ISATTY)/g' \ ++ -e 's/@''GNULIB_LCHOWN''@/$(GL_GNULIB_LCHOWN)/g' \ ++ -e 's/@''GNULIB_LINK''@/$(GL_GNULIB_LINK)/g' \ ++ -e 's/@''GNULIB_LINKAT''@/$(GL_GNULIB_LINKAT)/g' \ ++ -e 's/@''GNULIB_LSEEK''@/$(GL_GNULIB_LSEEK)/g' \ ++ -e 's/@''GNULIB_PIPE''@/$(GL_GNULIB_PIPE)/g' \ ++ -e 's/@''GNULIB_PIPE2''@/$(GL_GNULIB_PIPE2)/g' \ ++ -e 's/@''GNULIB_PREAD''@/$(GL_GNULIB_PREAD)/g' \ ++ -e 's/@''GNULIB_PWRITE''@/$(GL_GNULIB_PWRITE)/g' \ ++ -e 's/@''GNULIB_READ''@/$(GL_GNULIB_READ)/g' \ ++ -e 's/@''GNULIB_READLINK''@/$(GL_GNULIB_READLINK)/g' \ ++ -e 's/@''GNULIB_READLINKAT''@/$(GL_GNULIB_READLINKAT)/g' \ ++ -e 's/@''GNULIB_RMDIR''@/$(GL_GNULIB_RMDIR)/g' \ ++ -e 's/@''GNULIB_SETHOSTNAME''@/$(GL_GNULIB_SETHOSTNAME)/g' \ ++ -e 's/@''GNULIB_SLEEP''@/$(GL_GNULIB_SLEEP)/g' \ ++ -e 's/@''GNULIB_SYMLINK''@/$(GL_GNULIB_SYMLINK)/g' \ ++ -e 's/@''GNULIB_SYMLINKAT''@/$(GL_GNULIB_SYMLINKAT)/g' \ ++ -e 's/@''GNULIB_TRUNCATE''@/$(GL_GNULIB_TRUNCATE)/g' \ ++ -e 's/@''GNULIB_TTYNAME_R''@/$(GL_GNULIB_TTYNAME_R)/g' \ ++ -e 's/@''GNULIB_UNISTD_H_GETOPT''@/0$(GL_GNULIB_UNISTD_H_GETOPT)/g' \ ++ -e 's/@''GNULIB_UNISTD_H_NONBLOCKING''@/$(GL_GNULIB_UNISTD_H_NONBLOCKING)/g' \ ++ -e 's/@''GNULIB_UNISTD_H_SIGPIPE''@/$(GL_GNULIB_UNISTD_H_SIGPIPE)/g' \ ++ -e 's/@''GNULIB_UNLINK''@/$(GL_GNULIB_UNLINK)/g' \ ++ -e 's/@''GNULIB_UNLINKAT''@/$(GL_GNULIB_UNLINKAT)/g' \ ++ -e 's/@''GNULIB_USLEEP''@/$(GL_GNULIB_USLEEP)/g' \ ++ -e 's/@''GNULIB_WRITE''@/$(GL_GNULIB_WRITE)/g' \ ++ -e 's/@''GNULIB_MDA_ACCESS''@/$(GL_GNULIB_MDA_ACCESS)/g' \ ++ -e 's/@''GNULIB_MDA_CHDIR''@/$(GL_GNULIB_MDA_CHDIR)/g' \ ++ -e 's/@''GNULIB_MDA_CLOSE''@/$(GL_GNULIB_MDA_CLOSE)/g' \ ++ -e 's/@''GNULIB_MDA_DUP''@/$(GL_GNULIB_MDA_DUP)/g' \ ++ -e 's/@''GNULIB_MDA_DUP2''@/$(GL_GNULIB_MDA_DUP2)/g' \ ++ -e 's/@''GNULIB_MDA_EXECL''@/$(GL_GNULIB_MDA_EXECL)/g' \ ++ -e 's/@''GNULIB_MDA_EXECLE''@/$(GL_GNULIB_MDA_EXECLE)/g' \ ++ -e 's/@''GNULIB_MDA_EXECLP''@/$(GL_GNULIB_MDA_EXECLP)/g' \ ++ -e 's/@''GNULIB_MDA_EXECV''@/$(GL_GNULIB_MDA_EXECV)/g' \ ++ -e 's/@''GNULIB_MDA_EXECVE''@/$(GL_GNULIB_MDA_EXECVE)/g' \ ++ -e 's/@''GNULIB_MDA_EXECVP''@/$(GL_GNULIB_MDA_EXECVP)/g' \ ++ -e 's/@''GNULIB_MDA_EXECVPE''@/$(GL_GNULIB_MDA_EXECVPE)/g' \ ++ -e 's/@''GNULIB_MDA_GETCWD''@/$(GL_GNULIB_MDA_GETCWD)/g' \ ++ -e 's/@''GNULIB_MDA_GETPID''@/$(GL_GNULIB_MDA_GETPID)/g' \ ++ -e 's/@''GNULIB_MDA_ISATTY''@/$(GL_GNULIB_MDA_ISATTY)/g' \ ++ -e 's/@''GNULIB_MDA_LSEEK''@/$(GL_GNULIB_MDA_LSEEK)/g' \ ++ -e 's/@''GNULIB_MDA_READ''@/$(GL_GNULIB_MDA_READ)/g' \ ++ -e 's/@''GNULIB_MDA_RMDIR''@/$(GL_GNULIB_MDA_RMDIR)/g' \ ++ -e 's/@''GNULIB_MDA_SWAB''@/$(GL_GNULIB_MDA_SWAB)/g' \ ++ -e 's/@''GNULIB_MDA_UNLINK''@/$(GL_GNULIB_MDA_UNLINK)/g' \ ++ -e 's/@''GNULIB_MDA_WRITE''@/$(GL_GNULIB_MDA_WRITE)/g' \ + < $(srcdir)/unistd.in.h | \ + sed -e 's|@''HAVE_CHOWN''@|$(HAVE_CHOWN)|g' \ + -e 's|@''HAVE_COPY_FILE_RANGE''@|$(HAVE_COPY_FILE_RANGE)|g' \ +@@ -3617,49 +3657,49 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) + -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \ + -e 's|@''HAVE_WCHAR_H''@|$(HAVE_WCHAR_H)|g' \ + -e 's/@''HAVE_CRTDEFS_H''@/$(HAVE_CRTDEFS_H)/g' \ +- -e 's/@''GNULIB_OVERRIDES_WINT_T''@/$(GNULIB_OVERRIDES_WINT_T)/g' \ +- -e 's/@''GNULIB_BTOWC''@/$(GNULIB_BTOWC)/g' \ +- -e 's/@''GNULIB_WCTOB''@/$(GNULIB_WCTOB)/g' \ +- -e 's/@''GNULIB_MBSINIT''@/$(GNULIB_MBSINIT)/g' \ +- -e 's/@''GNULIB_MBRTOWC''@/$(GNULIB_MBRTOWC)/g' \ +- -e 's/@''GNULIB_MBRLEN''@/$(GNULIB_MBRLEN)/g' \ +- -e 's/@''GNULIB_MBSRTOWCS''@/$(GNULIB_MBSRTOWCS)/g' \ +- -e 's/@''GNULIB_MBSNRTOWCS''@/$(GNULIB_MBSNRTOWCS)/g' \ +- -e 's/@''GNULIB_WCRTOMB''@/$(GNULIB_WCRTOMB)/g' \ +- -e 's/@''GNULIB_WCSRTOMBS''@/$(GNULIB_WCSRTOMBS)/g' \ +- -e 's/@''GNULIB_WCSNRTOMBS''@/$(GNULIB_WCSNRTOMBS)/g' \ +- -e 's/@''GNULIB_WCWIDTH''@/$(GNULIB_WCWIDTH)/g' \ +- -e 's/@''GNULIB_WMEMCHR''@/$(GNULIB_WMEMCHR)/g' \ +- -e 's/@''GNULIB_WMEMCMP''@/$(GNULIB_WMEMCMP)/g' \ +- -e 's/@''GNULIB_WMEMCPY''@/$(GNULIB_WMEMCPY)/g' \ +- -e 's/@''GNULIB_WMEMMOVE''@/$(GNULIB_WMEMMOVE)/g' \ +- -e 's/@''GNULIB_WMEMPCPY''@/$(GNULIB_WMEMPCPY)/g' \ +- -e 's/@''GNULIB_WMEMSET''@/$(GNULIB_WMEMSET)/g' \ +- -e 's/@''GNULIB_WCSLEN''@/$(GNULIB_WCSLEN)/g' \ +- -e 's/@''GNULIB_WCSNLEN''@/$(GNULIB_WCSNLEN)/g' \ +- -e 's/@''GNULIB_WCSCPY''@/$(GNULIB_WCSCPY)/g' \ +- -e 's/@''GNULIB_WCPCPY''@/$(GNULIB_WCPCPY)/g' \ +- -e 's/@''GNULIB_WCSNCPY''@/$(GNULIB_WCSNCPY)/g' \ +- -e 's/@''GNULIB_WCPNCPY''@/$(GNULIB_WCPNCPY)/g' \ +- -e 's/@''GNULIB_WCSCAT''@/$(GNULIB_WCSCAT)/g' \ +- -e 's/@''GNULIB_WCSNCAT''@/$(GNULIB_WCSNCAT)/g' \ +- -e 's/@''GNULIB_WCSCMP''@/$(GNULIB_WCSCMP)/g' \ +- -e 's/@''GNULIB_WCSNCMP''@/$(GNULIB_WCSNCMP)/g' \ +- -e 's/@''GNULIB_WCSCASECMP''@/$(GNULIB_WCSCASECMP)/g' \ +- -e 's/@''GNULIB_WCSNCASECMP''@/$(GNULIB_WCSNCASECMP)/g' \ +- -e 's/@''GNULIB_WCSCOLL''@/$(GNULIB_WCSCOLL)/g' \ +- -e 's/@''GNULIB_WCSXFRM''@/$(GNULIB_WCSXFRM)/g' \ +- -e 's/@''GNULIB_WCSDUP''@/$(GNULIB_WCSDUP)/g' \ +- -e 's/@''GNULIB_WCSCHR''@/$(GNULIB_WCSCHR)/g' \ +- -e 's/@''GNULIB_WCSRCHR''@/$(GNULIB_WCSRCHR)/g' \ +- -e 's/@''GNULIB_WCSCSPN''@/$(GNULIB_WCSCSPN)/g' \ +- -e 's/@''GNULIB_WCSSPN''@/$(GNULIB_WCSSPN)/g' \ +- -e 's/@''GNULIB_WCSPBRK''@/$(GNULIB_WCSPBRK)/g' \ +- -e 's/@''GNULIB_WCSSTR''@/$(GNULIB_WCSSTR)/g' \ +- -e 's/@''GNULIB_WCSTOK''@/$(GNULIB_WCSTOK)/g' \ +- -e 's/@''GNULIB_WCSWIDTH''@/$(GNULIB_WCSWIDTH)/g' \ +- -e 's/@''GNULIB_WCSFTIME''@/$(GNULIB_WCSFTIME)/g' \ +- -e 's/@''GNULIB_MDA_WCSDUP''@/$(GNULIB_MDA_WCSDUP)/g' \ ++ -e 's/@''GNULIBHEADERS_OVERRIDE_WINT_T''@/$(GNULIBHEADERS_OVERRIDE_WINT_T)/g' \ ++ -e 's/@''GNULIB_BTOWC''@/$(GL_GNULIB_BTOWC)/g' \ ++ -e 's/@''GNULIB_WCTOB''@/$(GL_GNULIB_WCTOB)/g' \ ++ -e 's/@''GNULIB_MBSINIT''@/$(GL_GNULIB_MBSINIT)/g' \ ++ -e 's/@''GNULIB_MBRTOWC''@/$(GL_GNULIB_MBRTOWC)/g' \ ++ -e 's/@''GNULIB_MBRLEN''@/$(GL_GNULIB_MBRLEN)/g' \ ++ -e 's/@''GNULIB_MBSRTOWCS''@/$(GL_GNULIB_MBSRTOWCS)/g' \ ++ -e 's/@''GNULIB_MBSNRTOWCS''@/$(GL_GNULIB_MBSNRTOWCS)/g' \ ++ -e 's/@''GNULIB_WCRTOMB''@/$(GL_GNULIB_WCRTOMB)/g' \ ++ -e 's/@''GNULIB_WCSRTOMBS''@/$(GL_GNULIB_WCSRTOMBS)/g' \ ++ -e 's/@''GNULIB_WCSNRTOMBS''@/$(GL_GNULIB_WCSNRTOMBS)/g' \ ++ -e 's/@''GNULIB_WCWIDTH''@/$(GL_GNULIB_WCWIDTH)/g' \ ++ -e 's/@''GNULIB_WMEMCHR''@/$(GL_GNULIB_WMEMCHR)/g' \ ++ -e 's/@''GNULIB_WMEMCMP''@/$(GL_GNULIB_WMEMCMP)/g' \ ++ -e 's/@''GNULIB_WMEMCPY''@/$(GL_GNULIB_WMEMCPY)/g' \ ++ -e 's/@''GNULIB_WMEMMOVE''@/$(GL_GNULIB_WMEMMOVE)/g' \ ++ -e 's/@''GNULIB_WMEMPCPY''@/$(GL_GNULIB_WMEMPCPY)/g' \ ++ -e 's/@''GNULIB_WMEMSET''@/$(GL_GNULIB_WMEMSET)/g' \ ++ -e 's/@''GNULIB_WCSLEN''@/$(GL_GNULIB_WCSLEN)/g' \ ++ -e 's/@''GNULIB_WCSNLEN''@/$(GL_GNULIB_WCSNLEN)/g' \ ++ -e 's/@''GNULIB_WCSCPY''@/$(GL_GNULIB_WCSCPY)/g' \ ++ -e 's/@''GNULIB_WCPCPY''@/$(GL_GNULIB_WCPCPY)/g' \ ++ -e 's/@''GNULIB_WCSNCPY''@/$(GL_GNULIB_WCSNCPY)/g' \ ++ -e 's/@''GNULIB_WCPNCPY''@/$(GL_GNULIB_WCPNCPY)/g' \ ++ -e 's/@''GNULIB_WCSCAT''@/$(GL_GNULIB_WCSCAT)/g' \ ++ -e 's/@''GNULIB_WCSNCAT''@/$(GL_GNULIB_WCSNCAT)/g' \ ++ -e 's/@''GNULIB_WCSCMP''@/$(GL_GNULIB_WCSCMP)/g' \ ++ -e 's/@''GNULIB_WCSNCMP''@/$(GL_GNULIB_WCSNCMP)/g' \ ++ -e 's/@''GNULIB_WCSCASECMP''@/$(GL_GNULIB_WCSCASECMP)/g' \ ++ -e 's/@''GNULIB_WCSNCASECMP''@/$(GL_GNULIB_WCSNCASECMP)/g' \ ++ -e 's/@''GNULIB_WCSCOLL''@/$(GL_GNULIB_WCSCOLL)/g' \ ++ -e 's/@''GNULIB_WCSXFRM''@/$(GL_GNULIB_WCSXFRM)/g' \ ++ -e 's/@''GNULIB_WCSDUP''@/$(GL_GNULIB_WCSDUP)/g' \ ++ -e 's/@''GNULIB_WCSCHR''@/$(GL_GNULIB_WCSCHR)/g' \ ++ -e 's/@''GNULIB_WCSRCHR''@/$(GL_GNULIB_WCSRCHR)/g' \ ++ -e 's/@''GNULIB_WCSCSPN''@/$(GL_GNULIB_WCSCSPN)/g' \ ++ -e 's/@''GNULIB_WCSSPN''@/$(GL_GNULIB_WCSSPN)/g' \ ++ -e 's/@''GNULIB_WCSPBRK''@/$(GL_GNULIB_WCSPBRK)/g' \ ++ -e 's/@''GNULIB_WCSSTR''@/$(GL_GNULIB_WCSSTR)/g' \ ++ -e 's/@''GNULIB_WCSTOK''@/$(GL_GNULIB_WCSTOK)/g' \ ++ -e 's/@''GNULIB_WCSWIDTH''@/$(GL_GNULIB_WCSWIDTH)/g' \ ++ -e 's/@''GNULIB_WCSFTIME''@/$(GL_GNULIB_WCSFTIME)/g' \ ++ -e 's/@''GNULIB_MDA_WCSDUP''@/$(GL_GNULIB_MDA_WCSDUP)/g' \ + < $(srcdir)/wchar.in.h | \ + sed -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \ + -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \ +@@ -3760,14 +3800,14 @@ wctype.h: wctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \ + -e 's/@''HAVE_CRTDEFS_H''@/$(HAVE_CRTDEFS_H)/g' \ +- -e 's/@''GNULIB_OVERRIDES_WINT_T''@/$(GNULIB_OVERRIDES_WINT_T)/g' \ +- -e 's/@''GNULIB_ISWBLANK''@/$(GNULIB_ISWBLANK)/g' \ +- -e 's/@''GNULIB_ISWDIGIT''@/$(GNULIB_ISWDIGIT)/g' \ +- -e 's/@''GNULIB_ISWXDIGIT''@/$(GNULIB_ISWXDIGIT)/g' \ +- -e 's/@''GNULIB_WCTYPE''@/$(GNULIB_WCTYPE)/g' \ +- -e 's/@''GNULIB_ISWCTYPE''@/$(GNULIB_ISWCTYPE)/g' \ +- -e 's/@''GNULIB_WCTRANS''@/$(GNULIB_WCTRANS)/g' \ +- -e 's/@''GNULIB_TOWCTRANS''@/$(GNULIB_TOWCTRANS)/g' \ ++ -e 's/@''GNULIBHEADERS_OVERRIDE_WINT_T''@/$(GNULIBHEADERS_OVERRIDE_WINT_T)/g' \ ++ -e 's/@''GNULIB_ISWBLANK''@/$(GL_GNULIB_ISWBLANK)/g' \ ++ -e 's/@''GNULIB_ISWDIGIT''@/$(GL_GNULIB_ISWDIGIT)/g' \ ++ -e 's/@''GNULIB_ISWXDIGIT''@/$(GL_GNULIB_ISWXDIGIT)/g' \ ++ -e 's/@''GNULIB_WCTYPE''@/$(GL_GNULIB_WCTYPE)/g' \ ++ -e 's/@''GNULIB_ISWCTYPE''@/$(GL_GNULIB_ISWCTYPE)/g' \ ++ -e 's/@''GNULIB_WCTRANS''@/$(GL_GNULIB_WCTRANS)/g' \ ++ -e 's/@''GNULIB_TOWCTRANS''@/$(GL_GNULIB_TOWCTRANS)/g' \ + -e 's/@''HAVE_ISWBLANK''@/$(HAVE_ISWBLANK)/g' \ + -e 's/@''HAVE_ISWCNTRL''@/$(HAVE_ISWCNTRL)/g' \ + -e 's/@''HAVE_WCTYPE_T''@/$(HAVE_WCTYPE_T)/g' \ +diff --git a/lib/_Noreturn.h b/lib/_Noreturn.h +index cb72f26..6fed3c7 100644 +--- a/lib/_Noreturn.h ++++ b/lib/_Noreturn.h +@@ -29,7 +29,7 @@ + # elif ((!defined __cplusplus || defined __clang__) \ + && (201112 <= (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) \ + || (!defined __STRICT_ANSI__ \ +- && (__4 < __GNUC__ + (7 <= __GNUC_MINOR__) \ ++ && (4 < __GNUC__ + (7 <= __GNUC_MINOR__) \ + || (defined __apple_build_version__ \ + ? 6000000 <= __apple_build_version__ \ + : 3 < __clang_major__ + (5 <= __clang_minor__)))))) +diff --git a/lib/accept.c b/lib/accept.c +index 4ec4f43..71457db 100644 +--- a/lib/accept.c ++++ b/lib/accept.c +@@ -2,12 +2,12 @@ + + Copyright (C) 2008-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/accept4.c b/lib/accept4.c +index b444e22..4c2b80e 100644 +--- a/lib/accept4.c ++++ b/lib/accept4.c +@@ -1,18 +1,18 @@ + /* Accept a connection on a socket, with specific opening flags. + Copyright (C) 2009-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser 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, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + #include + +diff --git a/lib/alignof.h b/lib/alignof.h +index 6977c3e..e6e7a51 100644 +--- a/lib/alignof.h ++++ b/lib/alignof.h +@@ -1,18 +1,18 @@ + /* Determine alignment of types. + Copyright (C) 2003-2004, 2006, 2009-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + #ifndef _ALIGNOF_H + #define _ALIGNOF_H +diff --git a/lib/alloca.c b/lib/alloca.c +index 91b9ec3..4880283 100644 +--- a/lib/alloca.c ++++ b/lib/alloca.c +@@ -1,5 +1,7 @@ + /* alloca.c -- allocate automatically reclaimed memory +- (Mostly) portable public-domain implementation -- D A Gwyn ++ This file is in the public domain. */ ++ ++/* (Mostly) portable implementation -- D A Gwyn + + This implementation of the PWB library alloca function, + which is used to allocate space off the run-time stack so +diff --git a/lib/alloca.in.h b/lib/alloca.in.h +index 9c7ccbb..65c2d4d 100644 +--- a/lib/alloca.in.h ++++ b/lib/alloca.in.h +@@ -3,20 +3,18 @@ + Copyright (C) 1995, 1999, 2001-2004, 2006-2021 Free Software Foundation, + Inc. + +- This program is free software; you can redistribute it and/or modify it +- under the terms of the GNU Lesser General Public License as published +- by the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 +- Lesser General Public License for more details. ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public +- License along with this program; if not, see +- . +- */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + /* Avoid using the symbol _ALLOCA_H here, as Bison assumes _ALLOCA_H + means there is a real alloca function. */ +diff --git a/lib/arpa_inet.in.h b/lib/arpa_inet.in.h +index 0ac83ab..9968067 100644 +--- a/lib/arpa_inet.in.h ++++ b/lib/arpa_inet.in.h +@@ -2,18 +2,18 @@ + + Copyright (C) 2005-2006, 2008-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + #ifndef _ at GUARD_PREFIX@_ARPA_INET_H + +diff --git a/lib/asnprintf.c b/lib/asnprintf.c +index 420440a..c5367b2 100644 +--- a/lib/asnprintf.c ++++ b/lib/asnprintf.c +@@ -1,18 +1,18 @@ + /* Formatted output to strings. + Copyright (C) 1999, 2002, 2006, 2009-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + #include + +diff --git a/lib/assure.h b/lib/assure.h +index d95c0c9..49aa82f 100644 +--- a/lib/assure.h ++++ b/lib/assure.h +@@ -2,12 +2,12 @@ + + Copyright (C) 2014-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/attribute.h b/lib/attribute.h +index 27a0fce..80a23f5 100644 +--- a/lib/attribute.h ++++ b/lib/attribute.h +@@ -2,15 +2,15 @@ + + Copyright 2020-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify it +- under the terms of the GNU Lesser General Public License as published +- by the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 +- Lesser General Public License for more details. ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ +@@ -32,7 +32,7 @@ + + + /* This file defines two types of attributes: +- * C2X standard attributes. These have macro names that do not begin with ++ * C2x standard attributes. These have macro names that do not begin with + 'ATTRIBUTE_'. + * Selected GCC attributes; see: + https://gcc.gnu.org/onlinedocs/gcc/Common-Function-Attributes.html +diff --git a/lib/basename-lgpl.c b/lib/basename-lgpl.c +index 405edfa..5dbd157 100644 +--- a/lib/basename-lgpl.c ++++ b/lib/basename-lgpl.c +@@ -3,12 +3,12 @@ + Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2021 Free Software + Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/basename-lgpl.h b/lib/basename-lgpl.h +index 222d21f..d520c09 100644 +--- a/lib/basename-lgpl.h ++++ b/lib/basename-lgpl.h +@@ -1,20 +1,20 @@ +-/* Extract the last component (base name) of a file name. ++/* Extract the last component (base name) of a file name. + +- Copyright (C) 1998, 2001, 2003-2006, 2009-2021 Free Software Foundation, +- Inc. ++ Copyright (C) 1998, 2001, 2003-2006, 2009-2021 Free Software Foundation, ++ Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details. ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License +- along with this program. If not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + #ifndef _BASENAME_LGPL_H + #define _BASENAME_LGPL_H +diff --git a/lib/binary-io.c b/lib/binary-io.c +index 83a820a..adc0ae2 100644 +--- a/lib/binary-io.c ++++ b/lib/binary-io.c +@@ -1,12 +1,12 @@ + /* Binary mode I/O. + Copyright 2017-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/binary-io.h b/lib/binary-io.h +index 1dfbe5a..0fa8d54 100644 +--- a/lib/binary-io.h ++++ b/lib/binary-io.h +@@ -1,12 +1,12 @@ + /* Binary mode I/O. + Copyright (C) 2001, 2003, 2005, 2008-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/bind.c b/lib/bind.c +index 87fe0ed..0e47254 100644 +--- a/lib/bind.c ++++ b/lib/bind.c +@@ -2,12 +2,12 @@ + + Copyright (C) 2008-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/btowc.c b/lib/btowc.c +index e800878..b8239af 100644 +--- a/lib/btowc.c ++++ b/lib/btowc.c +@@ -2,12 +2,12 @@ + Copyright (C) 2008, 2010-2021 Free Software Foundation, Inc. + Written by Bruno Haible , 2008. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/byteswap.in.h b/lib/byteswap.in.h +index c176238..113f878 100644 +--- a/lib/byteswap.in.h ++++ b/lib/byteswap.in.h +@@ -2,12 +2,12 @@ + Copyright (C) 2005, 2007, 2009-2021 Free Software Foundation, Inc. + Written by Oskar Liljeblad , 2005. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/c-ctype.c b/lib/c-ctype.c +index 5d9d4d8..300f97c 100644 +--- a/lib/c-ctype.c ++++ b/lib/c-ctype.c +@@ -1,3 +1,21 @@ ++/* Character handling in C locale. ++ ++ Copyright (C) 2003-2021 Free Software Foundation, Inc. ++ ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. ++ ++ This file 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 Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ ++ + #include ++ + #define C_CTYPE_INLINE _GL_EXTERN_INLINE + #include "c-ctype.h" +diff --git a/lib/c-ctype.h b/lib/c-ctype.h +index e8403db..3a652ac 100644 +--- a/lib/c-ctype.h ++++ b/lib/c-ctype.h +@@ -7,18 +7,18 @@ + + Copyright (C) 2000-2003, 2006, 2008-2021 Free Software Foundation, Inc. + +-This program is free software; you can redistribute it and/or modify +-it under the terms of the GNU Lesser 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 Lesser General Public License for more details. +- +-You should have received a copy of the GNU Lesser General Public License +-along with this program; if not, see . */ ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. ++ ++ This file 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 Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + #ifndef C_CTYPE_H + #define C_CTYPE_H +diff --git a/lib/c-strcase.h b/lib/c-strcase.h +index 8240dbc..82f99bb 100644 +--- a/lib/c-strcase.h ++++ b/lib/c-strcase.h +@@ -2,18 +2,18 @@ + Copyright (C) 1995-1996, 2001, 2003, 2005, 2009-2021 Free Software + Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + #ifndef C_STRCASE_H + #define C_STRCASE_H +diff --git a/lib/c-strcasecmp.c b/lib/c-strcasecmp.c +index 805dc99..3c22455 100644 +--- a/lib/c-strcasecmp.c ++++ b/lib/c-strcasecmp.c +@@ -1,18 +1,18 @@ + /* c-strcasecmp.c -- case insensitive string comparator in C locale + Copyright (C) 1998-1999, 2005-2006, 2009-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + #include + +diff --git a/lib/c-strcaseeq.h b/lib/c-strcaseeq.h +index ed979aa..66b9cf3 100644 +--- a/lib/c-strcaseeq.h ++++ b/lib/c-strcaseeq.h +@@ -1,15 +1,15 @@ + /* Optimized case-insensitive string comparison in C locale. + Copyright (C) 2001-2002, 2007, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify it +- under the terms of the GNU Lesser General Public License as published +- by the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 +- Lesser General Public License for more details. ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ +diff --git a/lib/c-strncasecmp.c b/lib/c-strncasecmp.c +index c3203fd..f3ca786 100644 +--- a/lib/c-strncasecmp.c ++++ b/lib/c-strncasecmp.c +@@ -1,18 +1,18 @@ + /* c-strncasecmp.c -- case insensitive string comparator in C locale + Copyright (C) 1998-1999, 2005-2006, 2009-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + #include + +diff --git a/lib/canonicalize-lgpl.c b/lib/canonicalize-lgpl.c +index c6fef17..92e9639 100644 +--- a/lib/canonicalize-lgpl.c ++++ b/lib/canonicalize-lgpl.c +@@ -74,7 +74,6 @@ + # define __pathconf pathconf + # define __rawmemchr rawmemchr + # define __readlink readlink +-# define __stat stat + # if IN_RELOCWRAPPER + /* When building the relocatable program wrapper, use the system's memmove + function, not the gnulib override, otherwise we would get a link error. +@@ -105,7 +104,7 @@ file_accessible (char const *file) + return __faccessat (AT_FDCWD, file, F_OK, AT_EACCESS) == 0; + # else + struct stat st; +- return __stat (file, &st) == 0 || errno == EOVERFLOW; ++ return stat (file, &st) == 0 || errno == EOVERFLOW; + # endif + } + +diff --git a/lib/cdefs.h b/lib/cdefs.h +index 90f9741..4dac9d2 100644 +--- a/lib/cdefs.h ++++ b/lib/cdefs.h +@@ -259,9 +259,7 @@ + # define __attribute_const__ /* Ignore */ + #endif + +-#if defined __STDC_VERSION__ && 201710L < __STDC_VERSION__ +-# define __attribute_maybe_unused__ [[__maybe_unused__]] +-#elif __GNUC_PREREQ (2,7) || __glibc_has_attribute (__unused__) ++#if __GNUC_PREREQ (2,7) || __glibc_has_attribute (__unused__) + # define __attribute_maybe_unused__ __attribute__ ((__unused__)) + #else + # define __attribute_maybe_unused__ /* Ignore */ +@@ -320,7 +318,9 @@ + #endif + + /* The nonnull function attribute marks pointer parameters that +- must not be NULL. */ ++ must not be NULL. This has the name __nonnull in glibc, ++ and __attribute_nonnull__ in files shared with Gnulib to avoid ++ collision with a different __nonnull in DragonFlyBSD 5.9. */ + #ifndef __attribute_nonnull__ + # if __GNUC_PREREQ (3,3) || __glibc_has_attribute (__nonnull__) + # define __attribute_nonnull__(params) __attribute__ ((__nonnull__ params)) +@@ -332,6 +332,16 @@ + # define __nonnull(params) __attribute_nonnull__ (params) + #endif + ++/* The returns_nonnull function attribute marks the return type of the function ++ as always being non-null. */ ++#ifndef __returns_nonnull ++# if __GNUC_PREREQ (4, 9) || __glibc_has_attribute (__returns_nonnull__) ++# define __returns_nonnull __attribute__ ((__returns_nonnull__)) ++# else ++# define __returns_nonnull ++# endif ++#endif ++ + /* If fortification mode, we warn about unused results of certain + function calls which can lead to problems. */ + #if __GNUC_PREREQ (3,4) || __glibc_has_attribute (__warn_unused_result__) +@@ -485,9 +495,9 @@ + [!!sizeof (struct { int __error_if_negative: (expr) ? 2 : -1; })] + #endif + +-/* The #ifndef lets Gnulib avoid including these on non-glibc +- platforms, where the includes typically do not exist. */ +-#ifndef __WORDSIZE ++/* Gnulib avoids including these, as they don't work on non-glibc or ++ older glibc platforms. */ ++#ifndef __GNULIB_CDEFS + # include + # include + #endif +@@ -594,9 +604,26 @@ _Static_assert (0, "IEEE 128-bits long double requires redirection on this platf + array according to access mode, or at least one element when + size-index is not provided: + access (access-mode, [, ]) */ +-#define __attr_access(x) __attribute__ ((__access__ x)) ++# define __attr_access(x) __attribute__ ((__access__ x)) ++# if __GNUC_PREREQ (11, 0) ++# define __attr_access_none(argno) __attribute__ ((__access__ (__none__, argno))) ++# else ++# define __attr_access_none(argno) ++# endif + #else + # define __attr_access(x) ++# define __attr_access_none(argno) ++#endif ++ ++#if __GNUC_PREREQ (11, 0) ++/* Designates dealloc as a function to call to deallocate objects ++ allocated by the declared function. */ ++# define __attr_dealloc(dealloc, argno) \ ++ __attribute__ ((__malloc__ (dealloc, argno))) ++# define __attr_dealloc_free __attr_dealloc (__builtin_free, 1) ++#else ++# define __attr_dealloc(dealloc, argno) ++# define __attr_dealloc_free + #endif + + /* Specify that a function such as setjmp or vfork may return +diff --git a/lib/ceil.c b/lib/ceil.c +index 06e7e5e..fce05d9 100644 +--- a/lib/ceil.c ++++ b/lib/ceil.c +@@ -1,12 +1,12 @@ + /* Round towards positive infinity. + Copyright (C) 2007, 2010-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser 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, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/cloexec.c b/lib/cloexec.c +index 1f58b72..7defa93 100644 +--- a/lib/cloexec.c ++++ b/lib/cloexec.c +@@ -2,20 +2,20 @@ + + Copyright (C) 1991, 2004-2006, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program. If not, see . ++ along with this program. If not, see . */ + +- The code is taken from glibc/manual/llio.texi */ ++/* The code is taken from glibc/manual/llio.texi */ + + #include + +diff --git a/lib/cloexec.h b/lib/cloexec.h +index 7a71ad4..97a3659 100644 +--- a/lib/cloexec.h ++++ b/lib/cloexec.h +@@ -2,20 +2,18 @@ + + Copyright (C) 2004, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program. If not, see . +- +-*/ ++ along with this program. If not, see . */ + + #include + +diff --git a/lib/close.c b/lib/close.c +index 11e31db..5b9ab6c 100644 +--- a/lib/close.c ++++ b/lib/close.c +@@ -1,12 +1,12 @@ + /* close replacement. + Copyright (C) 2008-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/connect.c b/lib/connect.c +index fe0de7e..b2b2e93 100644 +--- a/lib/connect.c ++++ b/lib/connect.c +@@ -2,12 +2,12 @@ + + Copyright (C) 2008-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/copysign.c b/lib/copysign.c +index ad5b102..fee131b 100644 +--- a/lib/copysign.c ++++ b/lib/copysign.c +@@ -1,12 +1,12 @@ + /* Copy sign into another 'double' number. + Copyright (C) 2011-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser 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, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/dirent.in.h b/lib/dirent.in.h +index a285bde..5775edf 100644 +--- a/lib/dirent.in.h ++++ b/lib/dirent.in.h +@@ -1,12 +1,12 @@ + /* A GNU-like . + Copyright (C) 2006-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +@@ -74,6 +74,30 @@ typedef struct gl_directory DIR; + + /* Declare overridden functions. */ + ++#if @GNULIB_CLOSEDIR@ ++# if @REPLACE_CLOSEDIR@ ++# if !(defined __cplusplus && defined GNULIB_NAMESPACE) ++# undef closedir ++# define closedir rpl_closedir ++# define GNULIB_defined_closedir 1 ++# endif ++_GL_FUNCDECL_RPL (closedir, int, (DIR *dirp) _GL_ARG_NONNULL ((1))); ++_GL_CXXALIAS_RPL (closedir, int, (DIR *dirp)); ++# else ++# if !@HAVE_CLOSEDIR@ ++_GL_FUNCDECL_SYS (closedir, int, (DIR *dirp) _GL_ARG_NONNULL ((1))); ++# endif ++_GL_CXXALIAS_SYS (closedir, int, (DIR *dirp)); ++# endif ++_GL_CXXALIASWARN (closedir); ++#elif defined GNULIB_POSIXCHECK ++# undef closedir ++# if HAVE_RAW_DECL_CLOSEDIR ++_GL_WARN_ON_USE (closedir, "closedir is not portable - " ++ "use gnulib module closedir for portability"); ++# endif ++#endif ++ + #if @GNULIB_OPENDIR@ + # if @REPLACE_OPENDIR@ + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) +@@ -81,20 +105,36 @@ typedef struct gl_directory DIR; + # define opendir rpl_opendir + # define GNULIB_defined_opendir 1 + # endif +-_GL_FUNCDECL_RPL (opendir, DIR *, (const char *dir_name) _GL_ARG_NONNULL ((1))); ++_GL_FUNCDECL_RPL (opendir, DIR *, ++ (const char *dir_name) ++ _GL_ARG_NONNULL ((1)) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC (closedir, 1)); + _GL_CXXALIAS_RPL (opendir, DIR *, (const char *dir_name)); + # else +-# if !@HAVE_OPENDIR@ +-_GL_FUNCDECL_SYS (opendir, DIR *, (const char *dir_name) _GL_ARG_NONNULL ((1))); ++# if !@HAVE_OPENDIR@ || __GNUC__ >= 11 ++_GL_FUNCDECL_SYS (opendir, DIR *, ++ (const char *dir_name) ++ _GL_ARG_NONNULL ((1)) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC (closedir, 1)); + # endif + _GL_CXXALIAS_SYS (opendir, DIR *, (const char *dir_name)); + # endif + _GL_CXXALIASWARN (opendir); +-#elif defined GNULIB_POSIXCHECK +-# undef opendir +-# if HAVE_RAW_DECL_OPENDIR ++#else ++# if @GNULIB_CLOSEDIR@ && __GNUC__ >= 11 && !defined opendir ++/* For -Wmismatched-dealloc: Associate opendir with closedir or ++ rpl_closedir. */ ++_GL_FUNCDECL_SYS (opendir, DIR *, ++ (const char *dir_name) ++ _GL_ARG_NONNULL ((1)) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC (closedir, 1)); ++# endif ++# if defined GNULIB_POSIXCHECK ++# undef opendir ++# if HAVE_RAW_DECL_OPENDIR + _GL_WARN_ON_USE (opendir, "opendir is not portable - " + "use gnulib module opendir for portability"); ++# endif + # endif + #endif + +@@ -126,30 +166,6 @@ _GL_WARN_ON_USE (rewinddir, "rewinddir is not portable - " + # endif + #endif + +-#if @GNULIB_CLOSEDIR@ +-# if @REPLACE_CLOSEDIR@ +-# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +-# undef closedir +-# define closedir rpl_closedir +-# define GNULIB_defined_closedir 1 +-# endif +-_GL_FUNCDECL_RPL (closedir, int, (DIR *dirp) _GL_ARG_NONNULL ((1))); +-_GL_CXXALIAS_RPL (closedir, int, (DIR *dirp)); +-# else +-# if !@HAVE_CLOSEDIR@ +-_GL_FUNCDECL_SYS (closedir, int, (DIR *dirp) _GL_ARG_NONNULL ((1))); +-# endif +-_GL_CXXALIAS_SYS (closedir, int, (DIR *dirp)); +-# endif +-_GL_CXXALIASWARN (closedir); +-#elif defined GNULIB_POSIXCHECK +-# undef closedir +-# if HAVE_RAW_DECL_CLOSEDIR +-_GL_WARN_ON_USE (closedir, "closedir is not portable - " +- "use gnulib module closedir for portability"); +-# endif +-#endif +- + #if @GNULIB_DIRFD@ + /* Return the file descriptor associated with the given directory stream, + or -1 if none exists. */ +@@ -200,20 +216,33 @@ _GL_WARN_ON_USE (dirfd, "dirfd is unportable - " + # undef fdopendir + # define fdopendir rpl_fdopendir + # endif +-_GL_FUNCDECL_RPL (fdopendir, DIR *, (int fd)); ++_GL_FUNCDECL_RPL (fdopendir, DIR *, ++ (int fd) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC (closedir, 1)); + _GL_CXXALIAS_RPL (fdopendir, DIR *, (int fd)); + # else +-# if !@HAVE_FDOPENDIR@ || !@HAVE_DECL_FDOPENDIR@ +-_GL_FUNCDECL_SYS (fdopendir, DIR *, (int fd)); ++# if !@HAVE_FDOPENDIR@ || !@HAVE_DECL_FDOPENDIR@ || __GNUC__ >= 11 ++_GL_FUNCDECL_SYS (fdopendir, DIR *, ++ (int fd) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC (closedir, 1)); + # endif + _GL_CXXALIAS_SYS (fdopendir, DIR *, (int fd)); + # endif + _GL_CXXALIASWARN (fdopendir); +-#elif defined GNULIB_POSIXCHECK +-# undef fdopendir +-# if HAVE_RAW_DECL_FDOPENDIR ++#else ++# if @GNULIB_CLOSEDIR@ && __GNUC__ >= 11 && !defined fdopendir ++/* For -Wmismatched-dealloc: Associate fdopendir with closedir or ++ rpl_closedir. */ ++_GL_FUNCDECL_SYS (fdopendir, DIR *, ++ (int fd) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC (closedir, 1)); ++# endif ++# if defined GNULIB_POSIXCHECK ++# undef fdopendir ++# if HAVE_RAW_DECL_FDOPENDIR + _GL_WARN_ON_USE (fdopendir, "fdopendir is unportable - " + "use gnulib module fdopendir for portability"); ++# endif + # endif + #endif + +diff --git a/lib/dirfd.c b/lib/dirfd.c +index 7da640f..640cb4f 100644 +--- a/lib/dirfd.c ++++ b/lib/dirfd.c +@@ -2,12 +2,12 @@ + + Copyright (C) 2001, 2006, 2008-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/dirname-lgpl.c b/lib/dirname-lgpl.c +index 9cc5db7..95f9c99 100644 +--- a/lib/dirname-lgpl.c ++++ b/lib/dirname-lgpl.c +@@ -3,12 +3,12 @@ + Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2021 Free Software + Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/dirname.h b/lib/dirname.h +index dce1859..25abc7b 100644 +--- a/lib/dirname.h ++++ b/lib/dirname.h +@@ -1,26 +1,26 @@ +-/* Take file names apart into directory and base names. ++/* Take file names apart into directory and base names. + +- Copyright (C) 1998, 2001, 2003-2006, 2009-2021 Free Software Foundation, +- Inc. ++ Copyright (C) 1998, 2001, 2003-2006, 2009-2021 Free Software Foundation, ++ Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details. ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License +- along with this program. If not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + #ifndef DIRNAME_H_ + # define DIRNAME_H_ 1 + + # include +-# include ++# include + # include "filename.h" + # include "basename-lgpl.h" + +@@ -33,11 +33,16 @@ extern "C" { + #endif + + # if GNULIB_DIRNAME +-char *base_name (char const *file) _GL_ATTRIBUTE_MALLOC; +-char *dir_name (char const *file); ++char *base_name (char const *file) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE ++ _GL_ATTRIBUTE_RETURNS_NONNULL; ++char *dir_name (char const *file) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE ++ _GL_ATTRIBUTE_RETURNS_NONNULL; + # endif + +-char *mdir_name (char const *file); ++char *mdir_name (char const *file) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE; + size_t dir_len (char const *file) _GL_ATTRIBUTE_PURE; + + bool strip_trailing_slashes (char *file); +diff --git a/lib/dup2.c b/lib/dup2.c +index 653ef89..53e5552 100644 +--- a/lib/dup2.c ++++ b/lib/dup2.c +@@ -2,12 +2,12 @@ + + Copyright (C) 1999, 2004-2007, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/duplocale.c b/lib/duplocale.c +index 430634d..bc8740d 100644 +--- a/lib/duplocale.c ++++ b/lib/duplocale.c +@@ -1,12 +1,12 @@ + /* Duplicate a locale object. + Copyright (C) 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser 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, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/dynarray.h b/lib/dynarray.h +index 5db6ed9..ec64273 100644 +--- a/lib/dynarray.h ++++ b/lib/dynarray.h +@@ -1,12 +1,12 @@ + /* Type-safe arrays which grow dynamically. + Copyright 2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +@@ -257,18 +257,22 @@ static DYNARRAY_ELEMENT * + + #if defined DYNARRAY_STRUCT || defined DYNARRAY_ELEMENT || defined DYNARRAY_PREFIX + +-# include ++# ifndef _GL_LIKELY ++/* Rely on __builtin_expect, as provided by the module 'builtin-expect'. */ ++# define _GL_LIKELY(cond) __builtin_expect ((cond), 1) ++# define _GL_UNLIKELY(cond) __builtin_expect ((cond), 0) ++# endif + + /* Define auxiliary structs and declare auxiliary functions, common to all + instantiations of dynarray. */ +-# include ++# include + + /* Define the instantiation, specified through + DYNARRAY_STRUCT + DYNARRAY_ELEMENT + DYNARRAY_PREFIX + etc. */ +-# include ++# include + + #else + +diff --git a/lib/errno.in.h b/lib/errno.in.h +index 0ae2ace..3cad9e2 100644 +--- a/lib/errno.in.h ++++ b/lib/errno.in.h +@@ -2,18 +2,18 @@ + + Copyright (C) 2008-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + #ifndef _ at GUARD_PREFIX@_ERRNO_H + +diff --git a/lib/fcntl.c b/lib/fcntl.c +index e6c4b8e..c744eb9 100644 +--- a/lib/fcntl.c ++++ b/lib/fcntl.c +@@ -2,12 +2,12 @@ + + Copyright (C) 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/fcntl.in.h b/lib/fcntl.in.h +index 7254a56..26dedc3 100644 +--- a/lib/fcntl.in.h ++++ b/lib/fcntl.in.h +@@ -2,12 +2,12 @@ + + Copyright (C) 2006-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/fd-hook.c b/lib/fd-hook.c +index f8e2781..75b1626 100644 +--- a/lib/fd-hook.c ++++ b/lib/fd-hook.c +@@ -2,15 +2,15 @@ + Copyright (C) 2009-2021 Free Software Foundation, Inc. + Written by Bruno Haible , 2009. + +- This program is free software: you can redistribute it and/or modify it +- under the terms of the GNU Lesser General Public License as published +- by the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 +- Lesser General Public License for more details. ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ +diff --git a/lib/fd-hook.h b/lib/fd-hook.h +index 0005db7..98e2a52 100644 +--- a/lib/fd-hook.h ++++ b/lib/fd-hook.h +@@ -1,15 +1,15 @@ + /* Hook for making file descriptor functions close(), ioctl() extensible. + Copyright (C) 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify it +- under the terms of the GNU Lesser General Public License as published +- by the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 +- Lesser General Public License for more details. ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ +diff --git a/lib/float+.h b/lib/float+.h +index d814bf1..ad891f6 100644 +--- a/lib/float+.h ++++ b/lib/float+.h +@@ -2,18 +2,18 @@ + Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. + Written by Bruno Haible , 2007. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + #ifndef _FLOATPLUS_H + #define _FLOATPLUS_H +diff --git a/lib/float.c b/lib/float.c +index 5c16d61..dd1e84a 100644 +--- a/lib/float.c ++++ b/lib/float.c +@@ -2,12 +2,12 @@ + Copyright (C) 2011-2021 Free Software Foundation, Inc. + Written by Bruno Haible , 2011. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/float.in.h b/lib/float.in.h +index 1179df5..f52aba3 100644 +--- a/lib/float.in.h ++++ b/lib/float.in.h +@@ -2,12 +2,12 @@ + + Copyright (C) 2007-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/floor.c b/lib/floor.c +index 9f13d16..1530300 100644 +--- a/lib/floor.c ++++ b/lib/floor.c +@@ -1,12 +1,12 @@ + /* Round towards negative infinity. + Copyright (C) 2007, 2010-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser 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, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/free.c b/lib/free.c +index b221241..780f03d 100644 +--- a/lib/free.c ++++ b/lib/free.c +@@ -2,12 +2,12 @@ + + Copyright (C) 2003, 2006, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/frexp.c b/lib/frexp.c +index 55340b8..ab5f343 100644 +--- a/lib/frexp.c ++++ b/lib/frexp.c +@@ -1,12 +1,12 @@ + /* Split a double into fraction and mantissa. + Copyright (C) 2007-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/fstat.c b/lib/fstat.c +index 30440d6..512c688 100644 +--- a/lib/fstat.c ++++ b/lib/fstat.c +@@ -1,12 +1,12 @@ + /* fstat() replacement. + Copyright (C) 2011-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/fsync.c b/lib/fsync.c +index 71fcdde..99a932d 100644 +--- a/lib/fsync.c ++++ b/lib/fsync.c +@@ -9,15 +9,15 @@ + + Copyright (C) 2008-2021 Free Software Foundation, Inc. + +- This library is free software; you can redistribute it and/or +- modify it under the terms of the GNU Lesser General Public +- License as published by the Free Software Foundation; either +- version 2.1 of the License, or (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This library is distributed in the hope that it will be useful, ++ This file 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 +- Lesser General Public License for more details. ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ +diff --git a/lib/full-read.c b/lib/full-read.c +index 32ff1a5..53be659 100644 +--- a/lib/full-read.c ++++ b/lib/full-read.c +@@ -1,12 +1,12 @@ + /* An interface to read that retries after partial reads and interrupts. + Copyright (C) 2002-2003, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/full-read.h b/lib/full-read.h +index 450d645..b36f2e1 100644 +--- a/lib/full-read.h ++++ b/lib/full-read.h +@@ -2,12 +2,12 @@ + + Copyright (C) 2002, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/full-write.c b/lib/full-write.c +index acbfc31..614ca0b 100644 +--- a/lib/full-write.c ++++ b/lib/full-write.c +@@ -2,12 +2,12 @@ + + Copyright (C) 1993-1994, 1997-2006, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/full-write.h b/lib/full-write.h +index 1220d05..c316224 100644 +--- a/lib/full-write.h ++++ b/lib/full-write.h +@@ -2,12 +2,12 @@ + + Copyright (C) 2002-2003, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/gai_strerror.c b/lib/gai_strerror.c +index 907e8e6..4874ef5 100644 +--- a/lib/gai_strerror.c ++++ b/lib/gai_strerror.c +@@ -3,18 +3,18 @@ + This file is part of the GNU C Library. + Contributed by Philip Blundell , 1997. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + #ifndef _LIBC + # include +diff --git a/lib/getaddrinfo.c b/lib/getaddrinfo.c +index 05fc59e..0c42d1b 100644 +--- a/lib/getaddrinfo.c ++++ b/lib/getaddrinfo.c +@@ -2,18 +2,18 @@ + Copyright (C) 1997, 2001-2002, 2004-2021 Free Software Foundation, Inc. + Contributed by Simon Josefsson . + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + /* Don't use __attribute__ __nonnull__ in this compilation unit. Otherwise gcc + optimizes away the sa == NULL test below. */ +diff --git a/lib/getdtablesize.c b/lib/getdtablesize.c +index 918db9d..5006c2d 100644 +--- a/lib/getdtablesize.c ++++ b/lib/getdtablesize.c +@@ -2,12 +2,12 @@ + Copyright (C) 2008-2021 Free Software Foundation, Inc. + Written by Bruno Haible , 2008. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/getlogin.c b/lib/getlogin.c +index 4a70994..7b78c67 100644 +--- a/lib/getlogin.c ++++ b/lib/getlogin.c +@@ -2,12 +2,12 @@ + + Copyright (C) 2010-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/getpeername.c b/lib/getpeername.c +index 5d9cf79..468bb3d 100644 +--- a/lib/getpeername.c ++++ b/lib/getpeername.c +@@ -2,12 +2,12 @@ + + Copyright (C) 2008-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/getrandom.c b/lib/getrandom.c +index b467caa..a186c4d 100644 +--- a/lib/getrandom.c ++++ b/lib/getrandom.c +@@ -2,12 +2,12 @@ + + Copyright 2020-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +@@ -178,7 +178,11 @@ getrandom (void *buffer, size_t length, unsigned int flags) + + (flags & GRND_NONBLOCK ? O_NONBLOCK : 0)); + fd = open (randdevice[devrandom], oflags); + if (fd < 0) +- return fd; ++ { ++ if (errno == ENOENT || errno == ENOTDIR) ++ errno = ENOSYS; ++ return -1; ++ } + randfd[devrandom] = fd; + } + +diff --git a/lib/getsockname.c b/lib/getsockname.c +index 83c1b7d..d1f17b3 100644 +--- a/lib/getsockname.c ++++ b/lib/getsockname.c +@@ -2,12 +2,12 @@ + + Copyright (C) 2008-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/getsockopt.c b/lib/getsockopt.c +index cec4933..b92d034 100644 +--- a/lib/getsockopt.c ++++ b/lib/getsockopt.c +@@ -2,12 +2,12 @@ + + Copyright (C) 2008-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/gettext.h b/lib/gettext.h +index dd05cda..f1c7a24 100644 +--- a/lib/gettext.h ++++ b/lib/gettext.h +@@ -2,18 +2,18 @@ + Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2021 Free Software + Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + #ifndef _LIBGETTEXT_H + #define _LIBGETTEXT_H 1 +diff --git a/lib/hard-locale.c b/lib/hard-locale.c +index ab3610d..8b6802d 100644 +--- a/lib/hard-locale.c ++++ b/lib/hard-locale.c +@@ -3,12 +3,12 @@ + Copyright (C) 1997-1999, 2002-2004, 2006-2007, 2009-2021 Free Software + Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/hard-locale.h b/lib/hard-locale.h +index c4449f9..eba6601 100644 +--- a/lib/hard-locale.h ++++ b/lib/hard-locale.h +@@ -2,12 +2,12 @@ + + Copyright (C) 1999, 2003-2004, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/iconv.c b/lib/iconv.c +index f3480aa..bf51493 100644 +--- a/lib/iconv.c ++++ b/lib/iconv.c +@@ -1,18 +1,18 @@ + /* Character set conversion. + Copyright (C) 1999-2001, 2007, 2009-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + #include + +diff --git a/lib/iconv.in.h b/lib/iconv.in.h +index 0fc0fa7..3a2f94e 100644 +--- a/lib/iconv.in.h ++++ b/lib/iconv.in.h +@@ -2,18 +2,18 @@ + + Copyright (C) 2007-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + #ifndef _ at GUARD_PREFIX@_ICONV_H + +diff --git a/lib/iconv_close.c b/lib/iconv_close.c +index bc40fec..7429b92 100644 +--- a/lib/iconv_close.c ++++ b/lib/iconv_close.c +@@ -1,18 +1,18 @@ + /* Character set conversion. + Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + #include + +diff --git a/lib/iconv_open-aix.gperf b/lib/iconv_open-aix.gperf +index 20ce70a..d073759 100644 +--- a/lib/iconv_open-aix.gperf ++++ b/lib/iconv_open-aix.gperf +@@ -1,18 +1,18 @@ + /* Character set conversion. + Copyright (C) 2007, 2020-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + struct mapping { int standard_name; const char vendor_name[10 + 1]; }; + %struct-type +diff --git a/lib/iconv_open-hpux.gperf b/lib/iconv_open-hpux.gperf +index 921c722..f4664d6 100644 +--- a/lib/iconv_open-hpux.gperf ++++ b/lib/iconv_open-hpux.gperf +@@ -1,18 +1,18 @@ + /* Character set conversion. + Copyright (C) 2007, 2020-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + struct mapping { int standard_name; const char vendor_name[9 + 1]; }; + %struct-type +diff --git a/lib/iconv_open-irix.gperf b/lib/iconv_open-irix.gperf +index 6241de6..9885d92 100644 +--- a/lib/iconv_open-irix.gperf ++++ b/lib/iconv_open-irix.gperf +@@ -1,18 +1,18 @@ + /* Character set conversion. + Copyright (C) 2007, 2020-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + struct mapping { int standard_name; const char vendor_name[10 + 1]; }; + %struct-type +diff --git a/lib/iconv_open-osf.gperf b/lib/iconv_open-osf.gperf +index 97d570c..d818d79 100644 +--- a/lib/iconv_open-osf.gperf ++++ b/lib/iconv_open-osf.gperf +@@ -1,18 +1,18 @@ + /* Character set conversion. + Copyright (C) 2007, 2020-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + struct mapping { int standard_name; const char vendor_name[10 + 1]; }; + %struct-type +diff --git a/lib/iconv_open-solaris.gperf b/lib/iconv_open-solaris.gperf +index 0283aba..648dd3a 100644 +--- a/lib/iconv_open-solaris.gperf ++++ b/lib/iconv_open-solaris.gperf +@@ -1,18 +1,18 @@ + /* Character set conversion. + Copyright (C) 2007, 2009, 2020-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + struct mapping { int standard_name; const char vendor_name[10 + 1]; }; + %struct-type +diff --git a/lib/iconv_open-zos.gperf b/lib/iconv_open-zos.gperf +index faf5d65..1c3552e 100644 +--- a/lib/iconv_open-zos.gperf ++++ b/lib/iconv_open-zos.gperf +@@ -1,18 +1,18 @@ + /* Character set conversion. + Copyright (C) 2019-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + struct mapping { int standard_name; const char vendor_name[10 + 1]; }; + %struct-type +diff --git a/lib/iconv_open.c b/lib/iconv_open.c +index 304592e..e573556 100644 +--- a/lib/iconv_open.c ++++ b/lib/iconv_open.c +@@ -1,18 +1,18 @@ + /* Character set conversion. + Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + #include + +diff --git a/lib/iconveh.h b/lib/iconveh.h +index b2be8fa..cbf692e 100644 +--- a/lib/iconveh.h ++++ b/lib/iconveh.h +@@ -2,12 +2,12 @@ + Copyright (C) 2001-2007, 2009-2021 Free Software Foundation, Inc. + Written by Bruno Haible. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/inet_ntop.c b/lib/inet_ntop.c +index 5b9ea11..409e88c 100644 +--- a/lib/inet_ntop.c ++++ b/lib/inet_ntop.c +@@ -2,18 +2,18 @@ + + Copyright (C) 2005-2006, 2008-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + /* + * Copyright (c) 1996-1999 by Internet Software Consortium. +diff --git a/lib/inet_pton.c b/lib/inet_pton.c +index 57dc7dc..14e8b0a 100644 +--- a/lib/inet_pton.c ++++ b/lib/inet_pton.c +@@ -2,12 +2,12 @@ + + Copyright (C) 2006, 2008-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/inttypes.in.h b/lib/inttypes.in.h +index fe0af82..41cb422 100644 +--- a/lib/inttypes.in.h ++++ b/lib/inttypes.in.h +@@ -2,12 +2,12 @@ + Written by Paul Eggert, Bruno Haible, Derek Price. + This file is part of gnulib. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/isfinite.c b/lib/isfinite.c +index cfd2d33..f1373b9 100644 +--- a/lib/isfinite.c ++++ b/lib/isfinite.c +@@ -1,18 +1,18 @@ + /* Test for finite value (zero, subnormal, or normal, and not infinite or NaN). + Copyright (C) 2007-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser 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, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + /* Written by Ben Pfaff , 2007. */ + +diff --git a/lib/isinf.c b/lib/isinf.c +index 6d4dfc0..62becf2 100644 +--- a/lib/isinf.c ++++ b/lib/isinf.c +@@ -1,18 +1,18 @@ + /* Test for positive or negative infinity. + Copyright (C) 2007-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser 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, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + /* Written by Ben Pfaff , 2008. */ + +diff --git a/lib/isnan.c b/lib/isnan.c +index 2282269..ed3452f 100644 +--- a/lib/isnan.c ++++ b/lib/isnan.c +@@ -1,12 +1,12 @@ + /* Test for NaN that does not need libm. + Copyright (C) 2007-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/isnand-nolibm.h b/lib/isnand-nolibm.h +index fbed474..df64f4e 100644 +--- a/lib/isnand-nolibm.h ++++ b/lib/isnand-nolibm.h +@@ -1,12 +1,12 @@ + /* Test for NaN that does not need libm. + Copyright (C) 2007-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/isnand.c b/lib/isnand.c +index f359130..7c5df90 100644 +--- a/lib/isnand.c ++++ b/lib/isnand.c +@@ -1,12 +1,12 @@ + /* Test for NaN that does not need libm. + Copyright (C) 2008-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/isnanf-nolibm.h b/lib/isnanf-nolibm.h +index ba609d5..bd85811 100644 +--- a/lib/isnanf-nolibm.h ++++ b/lib/isnanf-nolibm.h +@@ -1,12 +1,12 @@ + /* Test for NaN that does not need libm. + Copyright (C) 2007-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/isnanf.c b/lib/isnanf.c +index 94a32e5..3b60340 100644 +--- a/lib/isnanf.c ++++ b/lib/isnanf.c +@@ -1,12 +1,12 @@ + /* Test for NaN that does not need libm. + Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/isnanl-nolibm.h b/lib/isnanl-nolibm.h +index 797c06b..41fe156 100644 +--- a/lib/isnanl-nolibm.h ++++ b/lib/isnanl-nolibm.h +@@ -1,12 +1,12 @@ + /* Test for NaN that does not need libm. + Copyright (C) 2007-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/isnanl.c b/lib/isnanl.c +index b459560..e8dedf0 100644 +--- a/lib/isnanl.c ++++ b/lib/isnanl.c +@@ -1,12 +1,12 @@ + /* Test for NaN that does not need libm. + Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/itold.c b/lib/itold.c +index f52216a..7984866 100644 +--- a/lib/itold.c ++++ b/lib/itold.c +@@ -2,12 +2,12 @@ + Copyright (C) 2011-2021 Free Software Foundation, Inc. + Written by Bruno Haible , 2011. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/langinfo.in.h b/lib/langinfo.in.h +index e8ac12c..4873899 100644 +--- a/lib/langinfo.in.h ++++ b/lib/langinfo.in.h +@@ -1,18 +1,18 @@ + /* Substitute for and wrapper around . + Copyright (C) 2009-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + /* + * POSIX for platforms that lack it or have an incomplete one. +diff --git a/lib/lc-charset-dispatch.c b/lib/lc-charset-dispatch.c +index 98c6e9d..88a0bd3 100644 +--- a/lib/lc-charset-dispatch.c ++++ b/lib/lc-charset-dispatch.c +@@ -1,12 +1,12 @@ + /* Dispatching based on the current locale's character encoding. + Copyright (C) 2018-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/lc-charset-dispatch.h b/lib/lc-charset-dispatch.h +index d9d1ac1..59b485d 100644 +--- a/lib/lc-charset-dispatch.h ++++ b/lib/lc-charset-dispatch.h +@@ -1,12 +1,12 @@ + /* Dispatching based on the current locale's character encoding. + Copyright (C) 2018-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/libc-config.h b/lib/libc-config.h +index f14013f..886c11f 100644 +--- a/lib/libc-config.h ++++ b/lib/libc-config.h +@@ -28,7 +28,10 @@ + + When compiled as part of glibc this is a no-op; when compiled as + part of Gnulib this includes Gnulib's and defines macros +- that glibc library code would normally assume. */ ++ that glibc library code would normally assume. ++ ++ Note: This header file MUST NOT be included by public header files ++ of Gnulib. */ + + #include + +@@ -71,7 +74,7 @@ + # endif + #endif + +-#ifndef __attribute_maybe_unused__ ++#ifndef __attribute_nonnull__ + /* either does not exist, or is too old for Gnulib. + Prepare to include , which is Gnulib's version of a + more-recent glibc . */ +@@ -80,13 +83,9 @@ + # ifndef _FEATURES_H + # define _FEATURES_H 1 + # endif +-/* Define __WORDSIZE so that does not attempt to include +- nonexistent files. Make it a syntax error, since Gnulib does not +- use __WORDSIZE now, and if Gnulib uses it later the syntax error +- will let us know that __WORDSIZE needs configuring. */ +-# ifndef __WORDSIZE +-# define __WORDSIZE %%% +-# endif ++/* Define __GNULIB_CDEFS so that does not attempt to include ++ nonexistent files. */ ++# define __GNULIB_CDEFS + /* Undef the macros unconditionally defined by our copy of glibc + , so that they do not clash with any system-defined + versions. */ +@@ -118,6 +117,9 @@ + # undef __THROW + # undef __THROWNL + # undef __attr_access ++# undef __attr_access_none ++# undef __attr_dealloc ++# undef __attr_dealloc_free + # undef __attribute__ + # undef __attribute_alloc_size__ + # undef __attribute_artificial__ +diff --git a/lib/libunistring.valgrind b/lib/libunistring.valgrind +index 712c39a..9eee19a 100644 +--- a/lib/libunistring.valgrind ++++ b/lib/libunistring.valgrind +@@ -2,18 +2,26 @@ + + # Copyright (C) 2010-2021 Free Software Foundation, Inc. + # +-# This program is free software: you can redistribute it and/or modify it +-# under the terms of the GNU Lesser General Public License as published +-# by the Free Software Foundation; either version 2 of the License, or +-# (at your option) any later version. ++# This file is free software. ++# It is dual-licensed under "the GNU LGPLv3+ or the GNU GPLv2+". ++# You can redistribute it and/or modify it under either ++# - the terms of the GNU Lesser General Public License as published ++# by the Free Software Foundation; either version 3, or (at your ++# option) any later version, or ++# - the terms of the GNU General Public License as published by the ++# Free Software Foundation; either version 2, or (at your option) ++# any later version, or ++# - the same dual license "the GNU LGPLv3+ or the GNU GPLv2+". + # + # 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 +-# Lesser General Public License for more details. ++# Lesser General Public License and the GNU General Public License ++# for more details. + # +-# You should have received a copy of the GNU Lesser General Public License +-# along with this program. If not, see . ++# You should have received a copy of the GNU Lesser General Public ++# License and of the GNU General Public License along with this ++# program. If not, see . + + # Suppress a valgrind message about use of uninitialized memory in freea(). + # This use is OK because it provides only a speedup. +diff --git a/lib/limits.in.h b/lib/limits.in.h +index 4675ba4..2ecafeb 100644 +--- a/lib/limits.in.h ++++ b/lib/limits.in.h +@@ -2,18 +2,18 @@ + + Copyright 2016-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or +- modify it under the terms of the GNU Lesser General Public License +- as published by the Free Software Foundation; either version 2, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + #if __GNUC__ >= 3 + @PRAGMA_SYSTEM_HEADER@ +@@ -99,10 +99,11 @@ + # endif + #endif + +-/* Macros specified by ISO/IEC TS 18661-1:2014. */ ++/* Macros specified by C2x and by ISO/IEC TS 18661-1:2014. */ + + #if (! defined ULLONG_WIDTH \ +- && (defined _GNU_SOURCE || defined __STDC_WANT_IEC_60559_BFP_EXT__)) ++ && (defined _GNU_SOURCE || defined __STDC_WANT_IEC_60559_BFP_EXT__ \ ++ || (defined __STDC_VERSION__ && 201710 < __STDC_VERSION__))) + # define CHAR_WIDTH _GL_INTEGER_WIDTH (CHAR_MIN, CHAR_MAX) + # define SCHAR_WIDTH _GL_INTEGER_WIDTH (SCHAR_MIN, SCHAR_MAX) + # define UCHAR_WIDTH _GL_INTEGER_WIDTH (0, UCHAR_MAX) +@@ -114,7 +115,16 @@ + # define ULONG_WIDTH _GL_INTEGER_WIDTH (0, ULONG_MAX) + # define LLONG_WIDTH _GL_INTEGER_WIDTH (LLONG_MIN, LLONG_MAX) + # define ULLONG_WIDTH _GL_INTEGER_WIDTH (0, ULLONG_MAX) +-#endif /* !ULLONG_WIDTH && (_GNU_SOURCE || __STDC_WANT_IEC_60559_BFP_EXT__) */ ++#endif ++ ++/* Macros specified by C2x. */ ++ ++#if (! defined BOOL_WIDTH \ ++ && (defined _GNU_SOURCE \ ++ || (defined __STDC_VERSION__ && 201710 < __STDC_VERSION__))) ++# define BOOL_MAX 1 ++# define BOOL_WIDTH 1 ++#endif + + #endif /* _ at GUARD_PREFIX@_LIMITS_H */ + #endif /* _ at GUARD_PREFIX@_LIMITS_H */ +diff --git a/lib/link.c b/lib/link.c +index 3ba897a..bd4bef9 100644 +--- a/lib/link.c ++++ b/lib/link.c +@@ -2,18 +2,18 @@ + + Copyright (C) 2009-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + #include + +diff --git a/lib/listen.c b/lib/listen.c +index ccf881c..a145f82 100644 +--- a/lib/listen.c ++++ b/lib/listen.c +@@ -2,12 +2,12 @@ + + Copyright (C) 2008-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/localcharset.c b/lib/localcharset.c +index 87a5979..9c22050 100644 +--- a/lib/localcharset.c ++++ b/lib/localcharset.c +@@ -2,18 +2,18 @@ + + Copyright (C) 2000-2006, 2008-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + /* Written by Bruno Haible . */ + +diff --git a/lib/localcharset.h b/lib/localcharset.h +index c2c1c67..27c3ab6 100644 +--- a/lib/localcharset.h ++++ b/lib/localcharset.h +@@ -2,18 +2,18 @@ + Copyright (C) 2000-2003, 2009-2021 Free Software Foundation, Inc. + This file is part of the GNU CHARSET Library. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + #ifndef _LOCALCHARSET_H + #define _LOCALCHARSET_H +diff --git a/lib/locale.in.h b/lib/locale.in.h +index 4eb3c80..1063070 100644 +--- a/lib/locale.in.h ++++ b/lib/locale.in.h +@@ -1,12 +1,12 @@ + /* A POSIX . + Copyright (C) 2007-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/localeconv.c b/lib/localeconv.c +index cdcaf86..25e95a1 100644 +--- a/lib/localeconv.c ++++ b/lib/localeconv.c +@@ -1,12 +1,12 @@ + /* Query locale dependent information for formatting numbers. + Copyright (C) 2012-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/log.c b/lib/log.c +index 03e9ac9..3f142e8 100644 +--- a/lib/log.c ++++ b/lib/log.c +@@ -1,12 +1,12 @@ + /* Logarithm. + Copyright (C) 2012-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser 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, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/log1p.c b/lib/log1p.c +index 0e51498..c45c6ff 100644 +--- a/lib/log1p.c ++++ b/lib/log1p.c +@@ -1,12 +1,12 @@ + /* Natural logarithm of 1 plus argument. + Copyright (C) 2012-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser 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, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/lstat.c b/lib/lstat.c +index d414d3a..7de0bf1 100644 +--- a/lib/lstat.c ++++ b/lib/lstat.c +@@ -2,12 +2,12 @@ + + Copyright (C) 1997-2006, 2008-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/malloc.c b/lib/malloc.c +index 6bbb97d..0d8b359 100644 +--- a/lib/malloc.c ++++ b/lib/malloc.c +@@ -2,61 +2,50 @@ + + Copyright (C) 1997-1998, 2006-2007, 2009-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + /* written by Jim Meyering and Bruno Haible */ + + #define _GL_USE_STDLIB_ALLOC 1 + #include +-/* Only the AC_FUNC_MALLOC macro defines 'malloc' already in config.h. */ +-#ifdef malloc +-# define NEED_MALLOC_GNU 1 +-# undef malloc +-/* Whereas the gnulib module 'malloc-gnu' defines HAVE_MALLOC_GNU. */ +-#elif GNULIB_MALLOC_GNU && !HAVE_MALLOC_GNU +-# define NEED_MALLOC_GNU 1 +-#endif + + #include + +-/* A function definition is only needed if NEED_MALLOC_GNU is defined above +- or if the module 'malloc-posix' requests it. */ +-#if NEED_MALLOC_GNU || (GNULIB_MALLOC_POSIX && !HAVE_MALLOC_POSIX) ++#include + +-# include ++#include "xalloc-oversized.h" + +-/* Allocate an N-byte block of memory from the heap. +- If N is zero, allocate a 1-byte block. */ ++/* Allocate an N-byte block of memory from the heap, even if N is 0. */ + + void * + rpl_malloc (size_t n) + { +- void *result; +- +-# if NEED_MALLOC_GNU + if (n == 0) + n = 1; +-# endif + +- result = malloc (n); ++ if (xalloc_oversized (n, 1)) ++ { ++ errno = ENOMEM; ++ return NULL; ++ } ++ ++ void *result = malloc (n); + +-# if !HAVE_MALLOC_POSIX ++#if !HAVE_MALLOC_POSIX + if (result == NULL) + errno = ENOMEM; +-# endif ++#endif + + return result; + } +- +-#endif +diff --git a/lib/malloc/dynarray_at_failure.c b/lib/malloc/dynarray_at_failure.c +index 4f840db..8dd6850 100644 +--- a/lib/malloc/dynarray_at_failure.c ++++ b/lib/malloc/dynarray_at_failure.c +@@ -18,11 +18,11 @@ + + #ifndef _LIBC + # include ++# include + #endif + + #include + #include +-#include + + void + __libc_dynarray_at_failure (size_t size, size_t index) +@@ -32,6 +32,7 @@ __libc_dynarray_at_failure (size_t size, size_t index) + __snprintf (buf, sizeof (buf), "Fatal glibc error: " + "array index %zu not less than array length %zu\n", + index, size); ++ __libc_fatal (buf); + #else + abort (); + #endif +diff --git a/lib/malloca.c b/lib/malloca.c +index a546b30..b488423 100644 +--- a/lib/malloca.c ++++ b/lib/malloca.c +@@ -2,18 +2,18 @@ + Copyright (C) 2003, 2006-2007, 2009-2021 Free Software Foundation, Inc. + Written by Bruno Haible , 2003, 2018. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + #define _GL_USE_STDLIB_ALLOC 1 + #include +@@ -21,6 +21,8 @@ + /* Specification. */ + #include "malloca.h" + ++#include "idx.h" ++#include "intprops.h" + #include "verify.h" + + /* The speed critical point in this file is freea() applied to an alloca() +@@ -45,24 +47,30 @@ mmalloca (size_t n) + #if HAVE_ALLOCA + /* Allocate one more word, used to determine the address to pass to freea(), + and room for the alignment ? sa_alignment_max mod 2*sa_alignment_max. */ +- size_t nplus = n + sizeof (small_t) + 2 * sa_alignment_max - 1; +- +- if (nplus >= n) ++ uintptr_t alignment2_mask = 2 * sa_alignment_max - 1; ++ int plus = sizeof (small_t) + alignment2_mask; ++ idx_t nplus; ++ if (!INT_ADD_WRAPV (n, plus, &nplus) && !xalloc_oversized (nplus, 1)) + { + char *mem = (char *) malloc (nplus); + + if (mem != NULL) + { +- char *p = +- (char *)((((uintptr_t)mem + sizeof (small_t) + sa_alignment_max - 1) +- & ~(uintptr_t)(2 * sa_alignment_max - 1)) +- + sa_alignment_max); ++ uintptr_t umem = (uintptr_t)mem, umemplus; ++ /* The INT_ADD_WRAPV avoids signed integer overflow on ++ theoretical platforms where UINTPTR_MAX <= INT_MAX. */ ++ INT_ADD_WRAPV (umem, sizeof (small_t) + sa_alignment_max - 1, ++ &umemplus); ++ idx_t offset = ((umemplus & ~alignment2_mask) ++ + sa_alignment_max - umem); ++ void *vp = mem + offset; ++ small_t *p = vp; + /* Here p >= mem + sizeof (small_t), + and p <= mem + sizeof (small_t) + 2 * sa_alignment_max - 1 + hence p + n <= mem + nplus. + So, the memory range [p, p+n) lies in the allocated memory range + [mem, mem + nplus). */ +- ((small_t *) p)[-1] = p - mem; ++ p[-1] = offset; + /* p ? sa_alignment_max mod 2*sa_alignment_max. */ + return p; + } +diff --git a/lib/malloca.h b/lib/malloca.h +index 9cf7fbb..7eb63d2 100644 +--- a/lib/malloca.h ++++ b/lib/malloca.h +@@ -2,18 +2,18 @@ + Copyright (C) 2003-2007, 2009-2021 Free Software Foundation, Inc. + Written by Bruno Haible , 2003. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + #ifndef _MALLOCA_H + #define _MALLOCA_H +@@ -51,6 +51,13 @@ extern "C" { + # define safe_alloca(N) ((void) (N), NULL) + #endif + ++/* Free a block of memory allocated through malloca(). */ ++#if HAVE_ALLOCA ++extern void freea (void *p); ++#else ++# define freea free ++#endif ++ + /* malloca(N) is a safe variant of alloca(N). It allocates N bytes of + memory allocated on the stack, that must be freed using freea() before + the function returns. Upon failure, it returns NULL. */ +@@ -65,21 +72,16 @@ extern "C" { + # define malloca(N) \ + mmalloca (N) + #endif +-extern void * mmalloca (size_t n); +- +-/* Free a block of memory allocated through malloca(). */ +-#if HAVE_ALLOCA +-extern void freea (void *p); +-#else +-# define freea free +-#endif ++extern void *mmalloca (size_t n) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC (freea, 1) ++ _GL_ATTRIBUTE_ALLOC_SIZE ((1)); + + /* nmalloca(N,S) is an overflow-safe variant of malloca (N * S). + It allocates an array of N objects, each with S bytes of memory, +- on the stack. S must be positive and N must be nonnegative. +- Either N or S should be of type ptrdiff_t or size_t or wider. ++ on the stack. N and S should be nonnegative and free of side effects. + The array must be freed using freea() before the function returns. */ +-#define nmalloca(n, s) (xalloc_oversized (n, s) ? NULL : malloca ((n) * (s))) ++#define nmalloca(n, s) \ ++ (xalloc_oversized (n, s) ? NULL : malloca ((n) * (size_t) (s))) + + + #ifdef __cplusplus +diff --git a/lib/math.c b/lib/math.c +index ba2a6ab..3ffd1d7 100644 +--- a/lib/math.c ++++ b/lib/math.c +@@ -1,4 +1,22 @@ ++/* Inline functions for . ++ ++ Copyright (C) 2012-2021 Free Software Foundation, Inc. ++ ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. ++ ++ This file 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 Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ ++ + #include ++ + #define _GL_MATH_INLINE _GL_EXTERN_INLINE + #include "math.h" + typedef int dummy; +diff --git a/lib/math.in.h b/lib/math.in.h +index d80047c..6a055fb 100644 +--- a/lib/math.in.h ++++ b/lib/math.in.h +@@ -2,12 +2,12 @@ + + Copyright (C) 2002-2003, 2007-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/mbrtowc-impl-utf8.h b/lib/mbrtowc-impl-utf8.h +index ea5ef1f..330fb10 100644 +--- a/lib/mbrtowc-impl-utf8.h ++++ b/lib/mbrtowc-impl-utf8.h +@@ -1,12 +1,12 @@ + /* Convert multibyte character to wide character. + Copyright (C) 1999-2002, 2005-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/mbrtowc-impl.h b/lib/mbrtowc-impl.h +index f7e28fc..bc3e688 100644 +--- a/lib/mbrtowc-impl.h ++++ b/lib/mbrtowc-impl.h +@@ -1,12 +1,12 @@ + /* Convert multibyte character to wide character. + Copyright (C) 1999-2002, 2005-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/mbrtowc.c b/lib/mbrtowc.c +index 0db5104..8832f6e 100644 +--- a/lib/mbrtowc.c ++++ b/lib/mbrtowc.c +@@ -2,12 +2,12 @@ + Copyright (C) 1999-2002, 2005-2021 Free Software Foundation, Inc. + Written by Bruno Haible , 2008. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/mbsinit.c b/lib/mbsinit.c +index 7ca8df7..f440155 100644 +--- a/lib/mbsinit.c ++++ b/lib/mbsinit.c +@@ -2,12 +2,12 @@ + Copyright (C) 2008-2021 Free Software Foundation, Inc. + Written by Bruno Haible , 2008. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/mbtowc-impl.h b/lib/mbtowc-impl.h +index 01342af..30d715d 100644 +--- a/lib/mbtowc-impl.h ++++ b/lib/mbtowc-impl.h +@@ -2,12 +2,12 @@ + Copyright (C) 2011-2021 Free Software Foundation, Inc. + Written by Bruno Haible , 2011. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/mbtowc-lock.c b/lib/mbtowc-lock.c +index ce74793..0f7ae6c 100644 +--- a/lib/mbtowc-lock.c ++++ b/lib/mbtowc-lock.c +@@ -1,12 +1,12 @@ + /* Return the internal lock used by mbrtowc and mbrtoc32. + Copyright (C) 2019-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/mbtowc-lock.h b/lib/mbtowc-lock.h +index 0939517..d31b0b6 100644 +--- a/lib/mbtowc-lock.h ++++ b/lib/mbtowc-lock.h +@@ -1,12 +1,12 @@ + /* Use the internal lock used by mbrtowc and mbrtoc32. + Copyright (C) 2019-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/mbtowc.c b/lib/mbtowc.c +index 2711194..47b431a 100644 +--- a/lib/mbtowc.c ++++ b/lib/mbtowc.c +@@ -2,12 +2,12 @@ + Copyright (C) 2011-2021 Free Software Foundation, Inc. + Written by Bruno Haible , 2011. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/memchr.c b/lib/memchr.c +index d8feb19..56fd59d 100644 +--- a/lib/memchr.c ++++ b/lib/memchr.c +@@ -7,21 +7,21 @@ + adaptation to memchr suggested by Dick Karpinski (dick at cca.ucsf.edu), + and implemented by Roland McGrath (roland at ai.mit.edu). + +-NOTE: The canonical source of this file is maintained with the GNU C Library. +-Bugs can be reported to bug-glibc at prep.ai.mit.edu. ++ NOTE: The canonical source of this file is maintained with the GNU C Library. ++ Bugs can be reported to bug-glibc at prep.ai.mit.edu. + +-This program is free software: you can redistribute it and/or modify it +-under the terms of the GNU Lesser General Public License as published by the +-Free Software Foundation; either version 3 of the License, or any +-later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details. ++ This file 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 Lesser General Public License for more details. + +-You should have received a copy of the GNU Lesser General Public License +-along with this program. If not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + #ifndef _LIBC + # include +diff --git a/lib/memchr.valgrind b/lib/memchr.valgrind +index 034d1ee..4f16481 100644 +--- a/lib/memchr.valgrind ++++ b/lib/memchr.valgrind +@@ -2,12 +2,12 @@ + + # Copyright (C) 2009-2021 Free Software Foundation, Inc. + # +-# This program is free software: you can redistribute it and/or modify +-# it under the terms of the GNU Lesser General Public License as published by +-# the Free Software Foundation; either version 3 of the License, or +-# (at your option) any later version. ++# This file is free software: you can redistribute it and/or modify ++# it under the terms of the GNU Lesser General Public License as ++# published by the Free Software Foundation; either version 2.1 of the ++# License, or (at your option) any later version. + # +-# This program is distributed in the hope that it will be useful, ++# This file 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 Lesser General Public License for more details. +diff --git a/lib/mempcpy.c b/lib/mempcpy.c +index c80e119..cacacdb 100644 +--- a/lib/mempcpy.c ++++ b/lib/mempcpy.c +@@ -1,18 +1,18 @@ + /* Copy memory area and return pointer after last written byte. + Copyright (C) 2003, 2007, 2009-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + #include + +diff --git a/lib/minmax.h b/lib/minmax.h +index 7d0b672..a03361b 100644 +--- a/lib/minmax.h ++++ b/lib/minmax.h +@@ -2,18 +2,18 @@ + Copyright (C) 1995, 1998, 2001, 2003, 2005, 2009-2021 Free Software + Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + #ifndef _MINMAX_H + #define _MINMAX_H +diff --git a/lib/mkdir.c b/lib/mkdir.c +index 453e428..2766cc7 100644 +--- a/lib/mkdir.c ++++ b/lib/mkdir.c +@@ -3,12 +3,12 @@ + + Copyright (C) 2001, 2003, 2006, 2008-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/mkostemp.c b/lib/mkostemp.c +index cfab635..285f1ba 100644 +--- a/lib/mkostemp.c ++++ b/lib/mkostemp.c +@@ -2,12 +2,12 @@ + Foundation, Inc. + This file is derived from the one in the GNU C Library. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/msvc-inval.c b/lib/msvc-inval.c +index de6ebee..a23dac9 100644 +--- a/lib/msvc-inval.c ++++ b/lib/msvc-inval.c +@@ -1,18 +1,18 @@ + /* Invalid parameter handler for MSVC runtime libraries. + Copyright (C) 2011-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + #include + +diff --git a/lib/msvc-inval.h b/lib/msvc-inval.h +index 0d418e1..e115a35 100644 +--- a/lib/msvc-inval.h ++++ b/lib/msvc-inval.h +@@ -1,18 +1,18 @@ + /* Invalid parameter handler for MSVC runtime libraries. + Copyright (C) 2011-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + #ifndef _MSVC_INVAL_H + #define _MSVC_INVAL_H +diff --git a/lib/msvc-nothrow.c b/lib/msvc-nothrow.c +index e72dabe..d3c1f54 100644 +--- a/lib/msvc-nothrow.c ++++ b/lib/msvc-nothrow.c +@@ -2,18 +2,18 @@ + with MSVC runtime libraries. + Copyright (C) 2011-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + #include + +diff --git a/lib/msvc-nothrow.h b/lib/msvc-nothrow.h +index a56cd4e..057b5dd 100644 +--- a/lib/msvc-nothrow.h ++++ b/lib/msvc-nothrow.h +@@ -2,18 +2,18 @@ + with MSVC runtime libraries. + Copyright (C) 2011-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + #ifndef _MSVC_NOTHROW_H + #define _MSVC_NOTHROW_H +diff --git a/lib/netdb.in.h b/lib/netdb.in.h +index 6bcaf1a..eb5c960 100644 +--- a/lib/netdb.in.h ++++ b/lib/netdb.in.h +@@ -2,18 +2,18 @@ + Copyright (C) 2008-2021 Free Software Foundation, Inc. + Written by Simon Josefsson. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + /* This file is supposed to be used on platforms that lack . + It is intended to provide definitions and prototypes needed by an +diff --git a/lib/netinet_in.in.h b/lib/netinet_in.in.h +index 3c1cad6..21f3a64 100644 +--- a/lib/netinet_in.in.h ++++ b/lib/netinet_in.in.h +@@ -1,18 +1,18 @@ + /* Substitute for . + Copyright (C) 2007-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + #ifndef _ at GUARD_PREFIX@_NETINET_IN_H + +diff --git a/lib/nl_langinfo-lock.c b/lib/nl_langinfo-lock.c +index 915c38b..fcdf56d 100644 +--- a/lib/nl_langinfo-lock.c ++++ b/lib/nl_langinfo-lock.c +@@ -1,12 +1,12 @@ + /* Return the internal lock used by nl_langinfo. + Copyright (C) 2019-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/nl_langinfo.c b/lib/nl_langinfo.c +index e8f3cef..b481f20 100644 +--- a/lib/nl_langinfo.c ++++ b/lib/nl_langinfo.c +@@ -2,12 +2,12 @@ + + Copyright (C) 2007-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/nproc.c b/lib/nproc.c +index fef1f8b..e3ddb92 100644 +--- a/lib/nproc.c ++++ b/lib/nproc.c +@@ -2,18 +2,18 @@ + + Copyright (C) 2009-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + /* Written by Glen Lenker and Bruno Haible. */ + +diff --git a/lib/nproc.h b/lib/nproc.h +index cd3ed36..d7659a5 100644 +--- a/lib/nproc.h ++++ b/lib/nproc.h +@@ -2,18 +2,18 @@ + + Copyright (C) 2009-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + /* Written by Glen Lenker and Bruno Haible. */ + +diff --git a/lib/nstrftime.c b/lib/nstrftime.c +index 7ef7529..7f258e8 100644 +--- a/lib/nstrftime.c ++++ b/lib/nstrftime.c +@@ -1,19 +1,18 @@ + /* Copyright (C) 1991-2021 Free Software Foundation, Inc. + This file is part of the GNU C Library. + +- The GNU C Library is free software; you can redistribute it and/or +- modify it under the terms of the GNU Lesser General Public +- License as published by the Free Software Foundation; either +- version 2.1 of the License, or (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 3 of the ++ License, or (at your option) any later version. + +- The GNU C Library is distributed in the hope that it will be useful, ++ This file 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 +- Lesser General Public License for more details. ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public +- License along with the GNU C Library; if not, see +- . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + #ifdef _LIBC + # define USE_IN_EXTENDED_LOCALE_MODEL 1 +diff --git a/lib/open.c b/lib/open.c +index 5dc117e..372cda8 100644 +--- a/lib/open.c ++++ b/lib/open.c +@@ -1,12 +1,12 @@ + /* Open a descriptor to a file. + Copyright (C) 2007-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/pathmax.h b/lib/pathmax.h +index 4af7802..716f4a9 100644 +--- a/lib/pathmax.h ++++ b/lib/pathmax.h +@@ -2,18 +2,18 @@ + Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2021 Free Software + Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + #ifndef _PATHMAX_H + # define _PATHMAX_H +diff --git a/lib/pipe.c b/lib/pipe.c +index 3316ceb..fc978f2 100644 +--- a/lib/pipe.c ++++ b/lib/pipe.c +@@ -1,18 +1,18 @@ + /* Create a pipe. + Copyright (C) 2009-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + #include + +diff --git a/lib/pipe2.c b/lib/pipe2.c +index 25bce6f..9ba8c3b 100644 +--- a/lib/pipe2.c ++++ b/lib/pipe2.c +@@ -1,18 +1,18 @@ + /* Create a pipe, with specific opening flags. + Copyright (C) 2009-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + #include + +diff --git a/lib/poll.c b/lib/poll.c +index d787676..8d5ba96 100644 +--- a/lib/poll.c ++++ b/lib/poll.c +@@ -5,18 +5,18 @@ + + This file is part of gnulib. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + /* Tell gcc not to warn about the (nfd < 0) tests, below. */ + #if (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) || 4 < __GNUC__ +diff --git a/lib/poll.in.h b/lib/poll.in.h +index 1fe8370..e94cd31 100644 +--- a/lib/poll.in.h ++++ b/lib/poll.in.h +@@ -5,18 +5,18 @@ + + This file is part of gnulib. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + #ifndef _ at GUARD_PREFIX@_POLL_H + +diff --git a/lib/printf-args.c b/lib/printf-args.c +index 22e44ef..b822682 100644 +--- a/lib/printf-args.c ++++ b/lib/printf-args.c +@@ -2,18 +2,18 @@ + Copyright (C) 1999, 2002-2003, 2005-2007, 2009-2021 Free Software + Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + /* This file can be parametrized with the following macros: + ENABLE_UNISTDIO Set to 1 to enable the unistdio extensions. +diff --git a/lib/printf-args.h b/lib/printf-args.h +index d15b12d..c8d9174 100644 +--- a/lib/printf-args.h ++++ b/lib/printf-args.h +@@ -2,18 +2,18 @@ + Copyright (C) 1999, 2002-2003, 2006-2007, 2011-2021 Free Software + Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + #ifndef _PRINTF_ARGS_H + #define _PRINTF_ARGS_H +diff --git a/lib/printf-parse.c b/lib/printf-parse.c +index 9f97995..f21cc17 100644 +--- a/lib/printf-parse.c ++++ b/lib/printf-parse.c +@@ -1,18 +1,18 @@ + /* Formatted output to strings. + Copyright (C) 1999-2000, 2002-2003, 2006-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + /* This file can be parametrized with the following macros: + CHAR_T The element type of the format string. +@@ -48,16 +48,7 @@ + #include + + /* Get intmax_t. */ +-#if defined IN_LIBINTL || defined IN_LIBASPRINTF +-# if HAVE_STDINT_H_WITH_UINTMAX +-# include +-# endif +-# if HAVE_INTTYPES_H_WITH_UINTMAX +-# include +-# endif +-#else +-# include +-#endif ++#include + + /* malloc(), realloc(), free(). */ + #include +diff --git a/lib/printf-parse.h b/lib/printf-parse.h +index e05ac8f..77b7409 100644 +--- a/lib/printf-parse.h ++++ b/lib/printf-parse.h +@@ -2,18 +2,18 @@ + Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2021 Free Software + Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + #ifndef _PRINTF_PARSE_H + #define _PRINTF_PARSE_H +diff --git a/lib/putenv.c b/lib/putenv.c +index d342b81..435d10f 100644 +--- a/lib/putenv.c ++++ b/lib/putenv.c +@@ -4,12 +4,12 @@ + NOTE: The canonical source of this file is maintained with the GNU C + Library. Bugs can be reported to bug-glibc at prep.ai.mit.edu. + +- This program is free software: you can redistribute it and/or modify it +- under the terms of the GNU Lesser General Public License as published by the +- Free Software Foundation; either version 3 of the License, or any +- later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser 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, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/raise.c b/lib/raise.c +index eda9126..37c100d 100644 +--- a/lib/raise.c ++++ b/lib/raise.c +@@ -2,12 +2,12 @@ + + Copyright (C) 2002-2003, 2005-2006, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/rawmemchr.c b/lib/rawmemchr.c +index ef35689..896d435 100644 +--- a/lib/rawmemchr.c ++++ b/lib/rawmemchr.c +@@ -1,12 +1,12 @@ + /* Searching in a string. + Copyright (C) 2008-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/rawmemchr.valgrind b/lib/rawmemchr.valgrind +index 90ed95e..d489c32 100644 +--- a/lib/rawmemchr.valgrind ++++ b/lib/rawmemchr.valgrind +@@ -2,12 +2,12 @@ + + # Copyright (C) 2008-2021 Free Software Foundation, Inc. + # +-# This program is free software: you can redistribute it and/or modify +-# it under the terms of the GNU Lesser General Public License as published by +-# the Free Software Foundation; either version 3 of the License, or +-# (at your option) any later version. ++# This file is free software: you can redistribute it and/or modify ++# it under the terms of the GNU Lesser General Public License as ++# published by the Free Software Foundation; either version 2.1 of the ++# License, or (at your option) any later version. + # +-# This program is distributed in the hope that it will be useful, ++# This file 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 Lesser General Public License for more details. +diff --git a/lib/read.c b/lib/read.c +index 125e738..840d9ed 100644 +--- a/lib/read.c ++++ b/lib/read.c +@@ -2,12 +2,12 @@ + Copyright (C) 2008-2021 Free Software Foundation, Inc. + Written by Bruno Haible , 2011. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/readlink.c b/lib/readlink.c +index 38d9e0c..d4f4b08 100644 +--- a/lib/readlink.c ++++ b/lib/readlink.c +@@ -1,12 +1,12 @@ + /* Read the contents of a symbolic link. + Copyright (C) 2003-2007, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/realloc.c b/lib/realloc.c +index 1145514..af03f0c 100644 +--- a/lib/realloc.c ++++ b/lib/realloc.c +@@ -3,12 +3,12 @@ + Copyright (C) 1997, 2003-2004, 2006-2007, 2009-2021 Free Software + Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +@@ -18,68 +18,46 @@ + + /* written by Jim Meyering and Bruno Haible */ + +-#define _GL_USE_STDLIB_ALLOC 1 + #include + +-/* Only the AC_FUNC_REALLOC macro defines 'realloc' already in config.h. */ +-#ifdef realloc +-# define NEED_REALLOC_GNU 1 +-/* Whereas the gnulib module 'realloc-gnu' defines HAVE_REALLOC_GNU. */ +-#elif GNULIB_REALLOC_GNU && !HAVE_REALLOC_GNU +-# define NEED_REALLOC_GNU 1 +-#endif +- +-/* Infer the properties of the system's malloc function. +- The gnulib module 'malloc-gnu' defines HAVE_MALLOC_GNU. */ +-#if GNULIB_MALLOC_GNU && HAVE_MALLOC_GNU +-# define SYSTEM_MALLOC_GLIBC_COMPATIBLE 1 +-#endif +- + #include + +-/* A function definition is only needed if NEED_REALLOC_GNU is defined above +- or if the module 'realloc-posix' requests it. */ +-#if NEED_REALLOC_GNU || (GNULIB_REALLOC_POSIX && !HAVE_REALLOC_POSIX) ++#include ++ ++#include "xalloc-oversized.h" + +-# include ++/* Call the system's realloc below. This file does not define ++ _GL_USE_STDLIB_ALLOC because it needs Gnulib's malloc if present. */ ++#undef realloc + + /* Change the size of an allocated block of memory P to N bytes, +- with error checking. If N is zero, change it to 1. If P is NULL, +- use malloc. */ ++ with error checking. If P is NULL, use malloc. Otherwise if N is zero, ++ free P and return NULL. */ + + void * + rpl_realloc (void *p, size_t n) + { +- void *result; ++ if (p == NULL) ++ return malloc (n); + +-# if NEED_REALLOC_GNU + if (n == 0) + { +- n = 1; +- +- /* In theory realloc might fail, so don't rely on it to free. */ + free (p); +- p = NULL; ++ return NULL; + } +-# endif + +- if (p == NULL) ++ if (xalloc_oversized (n, 1)) + { +-# if GNULIB_REALLOC_GNU && !NEED_REALLOC_GNU && !SYSTEM_MALLOC_GLIBC_COMPATIBLE +- if (n == 0) +- n = 1; +-# endif +- result = malloc (n); ++ errno = ENOMEM; ++ return NULL; + } +- else +- result = realloc (p, n); + +-# if !HAVE_REALLOC_POSIX ++ void *result = realloc (p, n); ++ ++#if !HAVE_MALLOC_POSIX + if (result == NULL) + errno = ENOMEM; +-# endif ++#endif + + return result; + } +- +-#endif +diff --git a/lib/recv.c b/lib/recv.c +index f2a342f..3eb2b4d 100644 +--- a/lib/recv.c ++++ b/lib/recv.c +@@ -2,12 +2,12 @@ + + Copyright (C) 2008-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/recvfrom.c b/lib/recvfrom.c +index 8abda0c..25231ff 100644 +--- a/lib/recvfrom.c ++++ b/lib/recvfrom.c +@@ -2,12 +2,12 @@ + + Copyright (C) 2008-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/regex_internal.c b/lib/regex_internal.c +index 55f6b66..aefcfa2 100644 +--- a/lib/regex_internal.c ++++ b/lib/regex_internal.c +@@ -1211,6 +1211,10 @@ re_node_set_merge (re_node_set *dest, const re_node_set *src) + + if (__glibc_unlikely (dest->nelem == 0)) + { ++ /* Although we already guaranteed above that dest->alloc != 0 and ++ therefore dest->elems != NULL, add a debug assertion to pacify ++ GCC 11.2.1's -fanalyzer. */ ++ DEBUG_ASSERT (dest->elems); + dest->nelem = src->nelem; + memcpy (dest->elems, src->elems, src->nelem * sizeof (Idx)); + return REG_NOERROR; +@@ -1286,7 +1290,10 @@ re_node_set_insert (re_node_set *set, Idx elem) + + if (__glibc_unlikely (set->nelem) == 0) + { +- /* We already guaranteed above that set->alloc != 0. */ ++ /* Although we already guaranteed above that set->alloc != 0 and ++ therefore set->elems != NULL, add a debug assertion to pacify ++ GCC 11.2 -fanalyzer. */ ++ DEBUG_ASSERT (set->elems); + set->elems[0] = elem; + ++set->nelem; + return true; +diff --git a/lib/regexec.c b/lib/regexec.c +index 6309dea..5e4eb49 100644 +--- a/lib/regexec.c ++++ b/lib/regexec.c +@@ -1220,9 +1220,13 @@ proceed_next_node (const re_match_context_t *mctx, Idx nregs, regmatch_t *regs, + { + re_node_set *cur_nodes = &mctx->state_log[*pidx]->nodes; + re_node_set *edests = &dfa->edests[node]; +- bool ok = re_node_set_insert (eps_via_nodes, node); +- if (__glibc_unlikely (! ok)) +- return -2; ++ ++ if (! re_node_set_contains (eps_via_nodes, node)) ++ { ++ bool ok = re_node_set_insert (eps_via_nodes, node); ++ if (__glibc_unlikely (! ok)) ++ return -2; ++ } + + /* Pick a valid destination, or return -1 if none is found. */ + Idx dest_node = -1; +@@ -1414,7 +1418,7 @@ set_regs (const regex_t *preg, const re_match_context_t *mctx, size_t nmatch, + update_regs (dfa, pmatch, prev_idx_match, cur_node, idx, nmatch); + + if ((idx == pmatch[0].rm_eo && cur_node == mctx->last_node) +- || re_node_set_contains (&eps_via_nodes, cur_node)) ++ || (fs && re_node_set_contains (&eps_via_nodes, cur_node))) + { + Idx reg_idx; + cur_node = -1; +diff --git a/lib/rename.c b/lib/rename.c +index 4873025..a3b7dc6 100644 +--- a/lib/rename.c ++++ b/lib/rename.c +@@ -2,12 +2,12 @@ + + Copyright (C) 2001-2003, 2005-2006, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/rmdir.c b/lib/rmdir.c +index a99fb1e..6295e41 100644 +--- a/lib/rmdir.c ++++ b/lib/rmdir.c +@@ -3,12 +3,12 @@ + Copyright (C) 1988, 1990, 1999, 2003-2006, 2009-2021 Free Software + Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/round.c b/lib/round.c +index 47a3936..5525050 100644 +--- a/lib/round.c ++++ b/lib/round.c +@@ -1,18 +1,18 @@ + /* Round toward nearest, breaking ties away from zero. + Copyright (C) 2007, 2010-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser 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, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + /* Written by Ben Pfaff , 2007. + Based heavily on code by Bruno Haible. */ +diff --git a/lib/safe-read.c b/lib/safe-read.c +index a4a1b08..e187b12 100644 +--- a/lib/safe-read.c ++++ b/lib/safe-read.c +@@ -3,12 +3,12 @@ + Copyright (C) 1993-1994, 1998, 2002-2006, 2009-2021 Free Software + Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/safe-read.h b/lib/safe-read.h +index 5050124..111aff5 100644 +--- a/lib/safe-read.h ++++ b/lib/safe-read.h +@@ -1,12 +1,12 @@ + /* An interface to read() that retries after interrupts. + Copyright (C) 2002, 2006, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/safe-write.c b/lib/safe-write.c +index f8b3b8b..494de14 100644 +--- a/lib/safe-write.c ++++ b/lib/safe-write.c +@@ -1,12 +1,12 @@ + /* An interface to write that retries after interrupts. + Copyright (C) 2002, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/safe-write.h b/lib/safe-write.h +index 459629e..25d8c71 100644 +--- a/lib/safe-write.h ++++ b/lib/safe-write.h +@@ -1,12 +1,12 @@ + /* An interface to write() that retries after interrupts. + Copyright (C) 2002, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/same-inode.h b/lib/same-inode.h +index 45e322a8..c727777 100644 +--- a/lib/same-inode.h ++++ b/lib/same-inode.h +@@ -2,12 +2,12 @@ + + Copyright (C) 2006, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/scratch_buffer.h b/lib/scratch_buffer.h +index 4b17f72..8873577 100644 +--- a/lib/scratch_buffer.h ++++ b/lib/scratch_buffer.h +@@ -1,12 +1,12 @@ + /* Variable-sized buffer with on-stack default allocation. + Copyright (C) 2017-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +@@ -110,14 +110,18 @@ extern void *scratch_buffer_dupfree (struct scratch_buffer *buffer, + + /* The implementation is imported from glibc. */ + +-#include +- + /* Avoid possible conflicts with symbols exported by the GNU libc. */ + #define __libc_scratch_buffer_dupfree gl_scratch_buffer_dupfree + #define __libc_scratch_buffer_grow gl_scratch_buffer_grow + #define __libc_scratch_buffer_grow_preserve gl_scratch_buffer_grow_preserve + #define __libc_scratch_buffer_set_array_size gl_scratch_buffer_set_array_size + +-#include ++#ifndef _GL_LIKELY ++/* Rely on __builtin_expect, as provided by the module 'builtin-expect'. */ ++# define _GL_LIKELY(cond) __builtin_expect ((cond), 1) ++# define _GL_UNLIKELY(cond) __builtin_expect ((cond), 0) ++#endif ++ ++#include + + #endif /* _GL_SCRATCH_BUFFER_H */ +diff --git a/lib/select.c b/lib/select.c +index 9a6fc28..eddac4b 100644 +--- a/lib/select.c ++++ b/lib/select.c +@@ -5,18 +5,18 @@ + + This file is part of gnulib. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + #include + +@@ -530,12 +530,13 @@ restart: + if (h != handle_array[nhandles]) + { + /* Perform handle->descriptor mapping. */ +- WSAEventSelect ((SOCKET) h, NULL, 0); +- if (FD_ISSET (h, &handle_rfds)) ++ SOCKET s = (SOCKET) h; ++ WSAEventSelect (s, NULL, 0); ++ if (FD_ISSET (s, &handle_rfds)) + FD_SET (i, rfds); +- if (FD_ISSET (h, &handle_wfds)) ++ if (FD_ISSET (s, &handle_wfds)) + FD_SET (i, wfds); +- if (FD_ISSET (h, &handle_xfds)) ++ if (FD_ISSET (s, &handle_xfds)) + FD_SET (i, xfds); + } + else +diff --git a/lib/send.c b/lib/send.c +index 3625864..58cb70b 100644 +--- a/lib/send.c ++++ b/lib/send.c +@@ -2,12 +2,12 @@ + + Copyright (C) 2008-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/sendto.c b/lib/sendto.c +index 5372a66..029ccd6 100644 +--- a/lib/sendto.c ++++ b/lib/sendto.c +@@ -2,12 +2,12 @@ + + Copyright (C) 2008-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/setenv.c b/lib/setenv.c +index 5374044..3ad3477 100644 +--- a/lib/setenv.c ++++ b/lib/setenv.c +@@ -1,12 +1,12 @@ + /* Copyright (C) 1992, 1995-2003, 2005-2021 Free Software Foundation, Inc. + This file is part of the GNU C Library. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/setlocale-lock.c b/lib/setlocale-lock.c +index 3cb5d47..53e231c 100644 +--- a/lib/setlocale-lock.c ++++ b/lib/setlocale-lock.c +@@ -1,12 +1,12 @@ + /* Return the internal lock used by setlocale_null_r. + Copyright (C) 2019-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/setlocale_null.c b/lib/setlocale_null.c +index 4c50472..dbfda25 100644 +--- a/lib/setlocale_null.c ++++ b/lib/setlocale_null.c +@@ -1,12 +1,12 @@ + /* Query the name of the current global locale. + Copyright (C) 2019-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/setlocale_null.h b/lib/setlocale_null.h +index bf96fa4..00c42e2 100644 +--- a/lib/setlocale_null.h ++++ b/lib/setlocale_null.h +@@ -1,12 +1,12 @@ + /* Query the name of the current global locale. + Copyright (C) 2019-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/setsockopt.c b/lib/setsockopt.c +index db32996..10b1e90 100644 +--- a/lib/setsockopt.c ++++ b/lib/setsockopt.c +@@ -2,12 +2,12 @@ + + Copyright (C) 2008-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/shutdown.c b/lib/shutdown.c +index c5527cd..70c927c 100644 +--- a/lib/shutdown.c ++++ b/lib/shutdown.c +@@ -2,12 +2,12 @@ + + Copyright (C) 2008-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/signal.in.h b/lib/signal.in.h +index b211137..275da8c 100644 +--- a/lib/signal.in.h ++++ b/lib/signal.in.h +@@ -2,12 +2,12 @@ + + Copyright (C) 2006-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/signbitd.c b/lib/signbitd.c +index 2992dd4..2259771 100644 +--- a/lib/signbitd.c ++++ b/lib/signbitd.c +@@ -1,12 +1,12 @@ + /* signbit() macro: Determine the sign bit of a floating-point number. + Copyright (C) 2007-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/signbitf.c b/lib/signbitf.c +index 01be49a..b196d9a 100644 +--- a/lib/signbitf.c ++++ b/lib/signbitf.c +@@ -1,12 +1,12 @@ + /* signbit() macro: Determine the sign bit of a floating-point number. + Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/signbitl.c b/lib/signbitl.c +index 6e0f64e..f73802d 100644 +--- a/lib/signbitl.c ++++ b/lib/signbitl.c +@@ -1,12 +1,12 @@ + /* signbit() macro: Determine the sign bit of a floating-point number. + Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/size_max.h b/lib/size_max.h +index c6d4a18..1186ba9 100644 +--- a/lib/size_max.h ++++ b/lib/size_max.h +@@ -2,18 +2,18 @@ + Copyright (C) 2005-2006, 2009-2021 Free Software Foundation, Inc. + Written by Simon Josefsson. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + #ifndef GNULIB_SIZE_MAX_H + #define GNULIB_SIZE_MAX_H +diff --git a/lib/snprintf.c b/lib/snprintf.c +index 357f287..a589cf1 100644 +--- a/lib/snprintf.c ++++ b/lib/snprintf.c +@@ -2,18 +2,18 @@ + Copyright (C) 2004, 2006-2021 Free Software Foundation, Inc. + Written by Simon Josefsson and Paul Eggert. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + #include + +diff --git a/lib/socket.c b/lib/socket.c +index 8525260..0f2e6ff 100644 +--- a/lib/socket.c ++++ b/lib/socket.c +@@ -2,12 +2,12 @@ + + Copyright (C) 2008-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/sockets.c b/lib/sockets.c +index 394b01e..934da73 100644 +--- a/lib/sockets.c ++++ b/lib/sockets.c +@@ -2,12 +2,12 @@ + + Copyright (C) 2008-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/sockets.h b/lib/sockets.h +index a13b0cb..e70c2bb 100644 +--- a/lib/sockets.h ++++ b/lib/sockets.h +@@ -2,12 +2,12 @@ + + Copyright (C) 2008-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/stat-time.c b/lib/stat-time.c +index 81b83dd..7b92792 100644 +--- a/lib/stat-time.c ++++ b/lib/stat-time.c +@@ -1,3 +1,21 @@ ++/* stat-related time functions. ++ ++ Copyright (C) 2012-2021 Free Software Foundation, Inc. ++ ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. ++ ++ This file 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 Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ ++ + #include ++ + #define _GL_STAT_TIME_INLINE _GL_EXTERN_INLINE + #include "stat-time.h" +diff --git a/lib/stat-time.h b/lib/stat-time.h +index 00c9329..fe3483d 100644 +--- a/lib/stat-time.h ++++ b/lib/stat-time.h +@@ -2,12 +2,12 @@ + + Copyright (C) 2005, 2007, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/stat-w32.c b/lib/stat-w32.c +index fe505cb..4164199 100644 +--- a/lib/stat-w32.c ++++ b/lib/stat-w32.c +@@ -1,12 +1,12 @@ + /* Core of implementation of fstat and stat for native Windows. + Copyright (C) 2017-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/stat-w32.h b/lib/stat-w32.h +index 05c9b0f..5b56c09 100644 +--- a/lib/stat-w32.h ++++ b/lib/stat-w32.h +@@ -1,12 +1,12 @@ + /* Core of implementation of fstat and stat for native Windows. + Copyright (C) 2017-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/stat.c b/lib/stat.c +index 39a1269..bc9a767 100644 +--- a/lib/stat.c ++++ b/lib/stat.c +@@ -1,12 +1,12 @@ + /* Work around platform bugs in stat. + Copyright (C) 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/stdalign.in.h b/lib/stdalign.in.h +index 7b51043..592d58e 100644 +--- a/lib/stdalign.in.h ++++ b/lib/stdalign.in.h +@@ -2,18 +2,18 @@ + + Copyright 2011-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + /* Written by Paul Eggert and Bruno Haible. */ + +diff --git a/lib/stdbool.in.h b/lib/stdbool.in.h +index c404f8d..2a1992d 100644 +--- a/lib/stdbool.in.h ++++ b/lib/stdbool.in.h +@@ -1,18 +1,18 @@ + /* Copyright (C) 2001-2003, 2006-2021 Free Software Foundation, Inc. + Written by Bruno Haible , 2001. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + #ifndef _GL_STDBOOL_H + #define _GL_STDBOOL_H +diff --git a/lib/stddef.in.h b/lib/stddef.in.h +index 4c53e64..42290d4 100644 +--- a/lib/stddef.in.h ++++ b/lib/stddef.in.h +@@ -2,18 +2,18 @@ + + Copyright (C) 2009-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + /* Written by Eric Blake. */ + +diff --git a/lib/stdint.in.h b/lib/stdint.in.h +index a98f1c8..85c5418 100644 +--- a/lib/stdint.in.h ++++ b/lib/stdint.in.h +@@ -2,18 +2,18 @@ + Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood. + This file is part of gnulib. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + /* + * ISO C 99 for platforms that lack it. +@@ -85,7 +85,7 @@ + + /* Override WINT_MIN and WINT_MAX if gnulib's or overrides + wint_t. */ +-#if @GNULIB_OVERRIDES_WINT_T@ ++#if @GNULIBHEADERS_OVERRIDE_WINT_T@ + # undef WINT_MIN + # undef WINT_MAX + # define WINT_MIN 0x0U +@@ -598,7 +598,7 @@ typedef int _verify_intmax_size[sizeof (intmax_t) == sizeof (uintmax_t) + /* wint_t limits */ + /* If gnulib's or overrides wint_t, @WINT_T_SUFFIX@ is not + accurate, therefore use the definitions from above. */ +-# if !@GNULIB_OVERRIDES_WINT_T@ ++# if !@GNULIBHEADERS_OVERRIDE_WINT_T@ + # undef WINT_MIN + # undef WINT_MAX + # if @HAVE_SIGNED_WINT_T@ +diff --git a/lib/stdio.in.h b/lib/stdio.in.h +index 6e10c74..f1bf817 100644 +--- a/lib/stdio.in.h ++++ b/lib/stdio.in.h +@@ -2,18 +2,18 @@ + + Copyright (C) 2004, 2007-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + #if __GNUC__ >= 3 + @PRAGMA_SYSTEM_HEADER@ +@@ -242,7 +242,7 @@ _GL_WARN_ON_USE (fclose, "fclose is not always POSIX compliant - " + _GL_CXXALIAS_MDA (fcloseall, int, (void)); + # else + # if @HAVE_DECL_FCLOSEALL@ +-# if defined __FreeBSD__ ++# if defined __FreeBSD__ || defined __DragonFly__ + _GL_CXXALIAS_SYS (fcloseall, void, (void)); + # else + _GL_CXXALIAS_SYS (fcloseall, int, (void)); +@@ -260,8 +260,9 @@ _GL_CXXALIASWARN (fcloseall); + # undef fdopen + # define fdopen rpl_fdopen + # endif +-_GL_FUNCDECL_RPL (fdopen, FILE *, (int fd, const char *mode) +- _GL_ARG_NONNULL ((2))); ++_GL_FUNCDECL_RPL (fdopen, FILE *, ++ (int fd, const char *mode) ++ _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)); + _GL_CXXALIAS_RPL (fdopen, FILE *, (int fd, const char *mode)); + # elif defined _WIN32 && !defined __CYGWIN__ + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) +@@ -270,28 +271,42 @@ _GL_CXXALIAS_RPL (fdopen, FILE *, (int fd, const char *mode)); + # endif + _GL_CXXALIAS_MDA (fdopen, FILE *, (int fd, const char *mode)); + # else ++# if __GNUC__ >= 11 ++/* For -Wmismatched-dealloc: Associate fdopen with fclose or rpl_fclose. */ ++_GL_FUNCDECL_SYS (fdopen, FILE *, ++ (int fd, const char *mode) ++ _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)); ++# endif + _GL_CXXALIAS_SYS (fdopen, FILE *, (int fd, const char *mode)); + # endif + _GL_CXXALIASWARN (fdopen); +-#elif defined GNULIB_POSIXCHECK +-# undef fdopen ++#else ++# if @GNULIB_FCLOSE@ && __GNUC__ >= 11 && !defined fdopen ++/* For -Wmismatched-dealloc: Associate fdopen with fclose or rpl_fclose. */ ++_GL_FUNCDECL_SYS (fdopen, FILE *, ++ (int fd, const char *mode) ++ _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)); ++# endif ++# if defined GNULIB_POSIXCHECK ++# undef fdopen + /* Assume fdopen is always declared. */ + _GL_WARN_ON_USE (fdopen, "fdopen on native Windows platforms is not POSIX compliant - " + "use gnulib module fdopen for portability"); +-#elif @GNULIB_MDA_FDOPEN@ ++# elif @GNULIB_MDA_FDOPEN@ + /* On native Windows, map 'fdopen' to '_fdopen', so that -loldnames is not + required. In C++ with GNULIB_NAMESPACE, avoid differences between + platforms by defining GNULIB_NAMESPACE::fdopen always. */ +-# if defined _WIN32 && !defined __CYGWIN__ +-# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +-# undef fdopen +-# define fdopen _fdopen +-# endif ++# if defined _WIN32 && !defined __CYGWIN__ ++# if !(defined __cplusplus && defined GNULIB_NAMESPACE) ++# undef fdopen ++# define fdopen _fdopen ++# endif + _GL_CXXALIAS_MDA (fdopen, FILE *, (int fd, const char *mode)); +-# else ++# else + _GL_CXXALIAS_SYS (fdopen, FILE *, (int fd, const char *mode)); +-# endif ++# endif + _GL_CXXALIASWARN (fdopen); ++# endif + #endif + + #if @GNULIB_FFLUSH@ +@@ -380,21 +395,35 @@ _GL_CXXALIASWARN (fileno); + # endif + _GL_FUNCDECL_RPL (fopen, FILE *, + (const char *restrict filename, const char *restrict mode) +- _GL_ARG_NONNULL ((1, 2))); ++ _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)); + _GL_CXXALIAS_RPL (fopen, FILE *, + (const char *restrict filename, const char *restrict mode)); + # else ++# if __GNUC__ >= 11 ++/* For -Wmismatched-dealloc: Associate fopen with fclose or rpl_fclose. */ ++_GL_FUNCDECL_SYS (fopen, FILE *, ++ (const char *restrict filename, const char *restrict mode) ++ _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)); ++# endif + _GL_CXXALIAS_SYS (fopen, FILE *, + (const char *restrict filename, const char *restrict mode)); + # endif + # if __GLIBC__ >= 2 + _GL_CXXALIASWARN (fopen); + # endif +-#elif defined GNULIB_POSIXCHECK +-# undef fopen ++#else ++# if @GNULIB_FCLOSE@ && __GNUC__ >= 11 && !defined fopen ++/* For -Wmismatched-dealloc: Associate fopen with fclose or rpl_fclose. */ ++_GL_FUNCDECL_SYS (fopen, FILE *, ++ (const char *restrict filename, const char *restrict mode) ++ _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)); ++# endif ++# if defined GNULIB_POSIXCHECK ++# undef fopen + /* Assume fopen is always declared. */ + _GL_WARN_ON_USE (fopen, "fopen on native Windows platforms is not POSIX compliant - " + "use gnulib module fopen for portability"); ++# endif + #endif + + #if @GNULIB_FPRINTF_POSIX@ || @GNULIB_FPRINTF@ +@@ -1009,22 +1038,32 @@ _GL_WARN_ON_USE (perror, "perror is not always POSIX compliant - " + # undef popen + # define popen rpl_popen + # endif +-_GL_FUNCDECL_RPL (popen, FILE *, (const char *cmd, const char *mode) +- _GL_ARG_NONNULL ((1, 2))); ++_GL_FUNCDECL_RPL (popen, FILE *, ++ (const char *cmd, const char *mode) ++ _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (pclose, 1)); + _GL_CXXALIAS_RPL (popen, FILE *, (const char *cmd, const char *mode)); + # else +-# if !@HAVE_POPEN@ +-_GL_FUNCDECL_SYS (popen, FILE *, (const char *cmd, const char *mode) +- _GL_ARG_NONNULL ((1, 2))); ++# if !@HAVE_POPEN@ || __GNUC__ >= 11 ++_GL_FUNCDECL_SYS (popen, FILE *, ++ (const char *cmd, const char *mode) ++ _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (pclose, 1)); + # endif + _GL_CXXALIAS_SYS (popen, FILE *, (const char *cmd, const char *mode)); + # endif + _GL_CXXALIASWARN (popen); +-#elif defined GNULIB_POSIXCHECK +-# undef popen +-# if HAVE_RAW_DECL_POPEN ++#else ++# if @GNULIB_PCLOSE@ && __GNUC__ >= 11 && !defined popen ++/* For -Wmismatched-dealloc: Associate popen with pclose or rpl_pclose. */ ++_GL_FUNCDECL_SYS (popen, FILE *, ++ (const char *cmd, const char *mode) ++ _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (pclose, 1)); ++# endif ++# if defined GNULIB_POSIXCHECK ++# undef popen ++# if HAVE_RAW_DECL_POPEN + _GL_WARN_ON_USE (popen, "popen is buggy on some platforms - " + "use gnulib module popen or pipe for more portability"); ++# endif + # endif + #endif + +@@ -1257,6 +1296,7 @@ _GL_CXXALIASWARN (scanf); + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) + # define snprintf rpl_snprintf + # endif ++# define GNULIB_overrides_snprintf 1 + _GL_FUNCDECL_RPL (snprintf, int, + (char *restrict str, size_t size, + const char *restrict format, ...) +@@ -1302,6 +1342,7 @@ _GL_WARN_ON_USE (snprintf, "snprintf is unportable - " + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) + # define sprintf rpl_sprintf + # endif ++# define GNULIB_overrides_sprintf 1 + _GL_FUNCDECL_RPL (sprintf, int, + (char *restrict str, const char *restrict format, ...) + _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3) +@@ -1344,19 +1385,32 @@ _GL_CXXALIASWARN (tempnam); + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) + # define tmpfile rpl_tmpfile + # endif +-_GL_FUNCDECL_RPL (tmpfile, FILE *, (void)); ++_GL_FUNCDECL_RPL (tmpfile, FILE *, (void) ++ _GL_ATTRIBUTE_DEALLOC (fclose, 1)); + _GL_CXXALIAS_RPL (tmpfile, FILE *, (void)); + # else ++# if __GNUC__ >= 11 ++/* For -Wmismatched-dealloc: Associate tmpfile with fclose or rpl_fclose. */ ++_GL_FUNCDECL_SYS (tmpfile, FILE *, (void) ++ _GL_ATTRIBUTE_DEALLOC (fclose, 1)); ++# endif + _GL_CXXALIAS_SYS (tmpfile, FILE *, (void)); + # endif + # if __GLIBC__ >= 2 + _GL_CXXALIASWARN (tmpfile); + # endif +-#elif defined GNULIB_POSIXCHECK +-# undef tmpfile +-# if HAVE_RAW_DECL_TMPFILE ++#else ++# if @GNULIB_FCLOSE@ && __GNUC__ >= 11 && !defined tmpfile ++/* For -Wmismatched-dealloc: Associate tmpfile with fclose or rpl_fclose. */ ++_GL_FUNCDECL_SYS (tmpfile, FILE *, (void) ++ _GL_ATTRIBUTE_DEALLOC (fclose, 1)); ++# endif ++# if defined GNULIB_POSIXCHECK ++# undef tmpfile ++# if HAVE_RAW_DECL_TMPFILE + _GL_WARN_ON_USE (tmpfile, "tmpfile is not usable on mingw - " + "use gnulib module tmpfile for portability"); ++# endif + # endif + #endif + +@@ -1369,6 +1423,7 @@ _GL_WARN_ON_USE (tmpfile, "tmpfile is not usable on mingw - " + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) + # define asprintf rpl_asprintf + # endif ++# define GNULIB_overrides_asprintf + _GL_FUNCDECL_RPL (asprintf, int, + (char **result, const char *format, ...) + _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3) +@@ -1390,6 +1445,7 @@ _GL_CXXALIASWARN (asprintf); + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) + # define vasprintf rpl_vasprintf + # endif ++# define GNULIB_overrides_vasprintf 1 + _GL_FUNCDECL_RPL (vasprintf, int, + (char **result, const char *format, va_list args) + _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0) +@@ -1573,6 +1629,7 @@ _GL_CXXALIASWARN (vscanf); + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) + # define vsnprintf rpl_vsnprintf + # endif ++# define GNULIB_overrides_vsnprintf 1 + _GL_FUNCDECL_RPL (vsnprintf, int, + (char *restrict str, size_t size, + const char *restrict format, va_list args) +@@ -1609,6 +1666,7 @@ _GL_WARN_ON_USE (vsnprintf, "vsnprintf is unportable - " + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) + # define vsprintf rpl_vsprintf + # endif ++# define GNULIB_overrides_vsprintf 1 + _GL_FUNCDECL_RPL (vsprintf, int, + (char *restrict str, + const char *restrict format, va_list args) +diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h +index 7e01262..d86a880 100644 +--- a/lib/stdlib.in.h ++++ b/lib/stdlib.in.h +@@ -2,12 +2,12 @@ + + Copyright (C) 1995, 2001-2004, 2006-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +@@ -149,6 +149,28 @@ _GL_WARN_ON_USE (_Exit, "_Exit is unportable - " + #endif + + ++#if @GNULIB_FREE_POSIX@ ++# if @REPLACE_FREE@ ++# if !(defined __cplusplus && defined GNULIB_NAMESPACE) ++# undef free ++# define free rpl_free ++# endif ++_GL_FUNCDECL_RPL (free, void, (void *ptr)); ++_GL_CXXALIAS_RPL (free, void, (void *ptr)); ++# else ++_GL_CXXALIAS_SYS (free, void, (void *ptr)); ++# endif ++# if __GLIBC__ >= 2 ++_GL_CXXALIASWARN (free); ++# endif ++#elif defined GNULIB_POSIXCHECK ++# undef free ++/* Assume free is always declared. */ ++_GL_WARN_ON_USE (free, "free is not future POSIX compliant everywhere - " ++ "use gnulib module free for portability"); ++#endif ++ ++ + /* Allocate memory with indefinite extent and specified alignment. */ + #if @GNULIB_ALIGNED_ALLOC@ + # if @REPLACE_ALIGNED_ALLOC@ +@@ -156,21 +178,37 @@ _GL_WARN_ON_USE (_Exit, "_Exit is unportable - " + # undef aligned_alloc + # define aligned_alloc rpl_aligned_alloc + # endif +-_GL_FUNCDECL_RPL (aligned_alloc, void *, (size_t alignment, size_t size)); ++_GL_FUNCDECL_RPL (aligned_alloc, void *, ++ (size_t alignment, size_t size) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); + _GL_CXXALIAS_RPL (aligned_alloc, void *, (size_t alignment, size_t size)); + # else + # if @HAVE_ALIGNED_ALLOC@ ++# if __GNUC__ >= 11 ++/* For -Wmismatched-dealloc: Associate aligned_alloc with free or rpl_free. */ ++_GL_FUNCDECL_SYS (aligned_alloc, void *, ++ (size_t alignment, size_t size) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); ++# endif + _GL_CXXALIAS_SYS (aligned_alloc, void *, (size_t alignment, size_t size)); + # endif + # endif + # if @HAVE_ALIGNED_ALLOC@ + _GL_CXXALIASWARN (aligned_alloc); + # endif +-#elif defined GNULIB_POSIXCHECK +-# undef aligned_alloc +-# if HAVE_RAW_DECL_ALIGNED_ALLOC ++#else ++# if @GNULIB_FREE_POSIX@ && __GNUC__ >= 11 && !defined aligned_alloc ++/* For -Wmismatched-dealloc: Associate aligned_alloc with free or rpl_free. */ ++_GL_FUNCDECL_SYS (aligned_alloc, void *, ++ (size_t alignment, size_t size) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); ++# endif ++# if defined GNULIB_POSIXCHECK ++# undef aligned_alloc ++# if HAVE_RAW_DECL_ALIGNED_ALLOC + _GL_WARN_ON_USE (aligned_alloc, "aligned_alloc is not portable - " + "use gnulib module aligned_alloc for portability"); ++# endif + # endif + #endif + +@@ -198,19 +236,35 @@ _GL_WARN_ON_USE (atoll, "atoll is unportable - " + # undef calloc + # define calloc rpl_calloc + # endif +-_GL_FUNCDECL_RPL (calloc, void *, (size_t nmemb, size_t size)); ++_GL_FUNCDECL_RPL (calloc, void *, ++ (size_t nmemb, size_t size) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); + _GL_CXXALIAS_RPL (calloc, void *, (size_t nmemb, size_t size)); + # else ++# if __GNUC__ >= 11 ++/* For -Wmismatched-dealloc: Associate calloc with free or rpl_free. */ ++_GL_FUNCDECL_SYS (calloc, void *, ++ (size_t nmemb, size_t size) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); ++# endif + _GL_CXXALIAS_SYS (calloc, void *, (size_t nmemb, size_t size)); + # endif + # if __GLIBC__ >= 2 + _GL_CXXALIASWARN (calloc); + # endif +-#elif defined GNULIB_POSIXCHECK +-# undef calloc ++#else ++# if @GNULIB_FREE_POSIX@ && __GNUC__ >= 11 && !defined calloc ++/* For -Wmismatched-dealloc: Associate calloc with free or rpl_free. */ ++_GL_FUNCDECL_SYS (calloc, void *, ++ (size_t nmemb, size_t size) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); ++# endif ++# if defined GNULIB_POSIXCHECK ++# undef calloc + /* Assume calloc is always declared. */ + _GL_WARN_ON_USE (calloc, "calloc is not POSIX compliant everywhere - " + "use gnulib module calloc-posix for portability"); ++# endif + #endif + + #if @GNULIB_CANONICALIZE_FILE_NAME@ +@@ -218,13 +272,17 @@ _GL_WARN_ON_USE (calloc, "calloc is not POSIX compliant everywhere - " + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) + # define canonicalize_file_name rpl_canonicalize_file_name + # endif +-_GL_FUNCDECL_RPL (canonicalize_file_name, char *, (const char *name) +- _GL_ARG_NONNULL ((1))); ++_GL_FUNCDECL_RPL (canonicalize_file_name, char *, ++ (const char *name) ++ _GL_ARG_NONNULL ((1)) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); + _GL_CXXALIAS_RPL (canonicalize_file_name, char *, (const char *name)); + # else +-# if !@HAVE_CANONICALIZE_FILE_NAME@ +-_GL_FUNCDECL_SYS (canonicalize_file_name, char *, (const char *name) +- _GL_ARG_NONNULL ((1))); ++# if !@HAVE_CANONICALIZE_FILE_NAME@ || __GNUC__ >= 11 ++_GL_FUNCDECL_SYS (canonicalize_file_name, char *, ++ (const char *name) ++ _GL_ARG_NONNULL ((1)) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); + # endif + _GL_CXXALIAS_SYS (canonicalize_file_name, char *, (const char *name)); + # endif +@@ -233,12 +291,22 @@ _GL_CXXALIAS_SYS (canonicalize_file_name, char *, (const char *name)); + (!@HAVE_CANONICALIZE_FILE_NAME@ || @REPLACE_CANONICALIZE_FILE_NAME@) + # endif + _GL_CXXALIASWARN (canonicalize_file_name); +-#elif defined GNULIB_POSIXCHECK +-# undef canonicalize_file_name +-# if HAVE_RAW_DECL_CANONICALIZE_FILE_NAME ++#else ++# if @GNULIB_FREE_POSIX@ && __GNUC__ >= 11 && !defined canonicalize_file_name ++/* For -Wmismatched-dealloc: Associate canonicalize_file_name with free or ++ rpl_free. */ ++_GL_FUNCDECL_SYS (canonicalize_file_name, char *, ++ (const char *name) ++ _GL_ARG_NONNULL ((1)) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); ++# endif ++# if defined GNULIB_POSIXCHECK ++# undef canonicalize_file_name ++# if HAVE_RAW_DECL_CANONICALIZE_FILE_NAME + _GL_WARN_ON_USE (canonicalize_file_name, + "canonicalize_file_name is unportable - " + "use gnulib module canonicalize-lgpl for portability"); ++# endif + # endif + #endif + +@@ -288,27 +356,6 @@ _GL_CXXALIASWARN (fcvt); + # endif + #endif + +-#if @GNULIB_FREE_POSIX@ +-# if @REPLACE_FREE@ +-# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +-# undef free +-# define free rpl_free +-# endif +-_GL_FUNCDECL_RPL (free, void, (void *ptr)); +-_GL_CXXALIAS_RPL (free, void, (void *ptr)); +-# else +-_GL_CXXALIAS_SYS (free, void, (void *ptr)); +-# endif +-# if __GLIBC__ >= 2 +-_GL_CXXALIASWARN (free); +-# endif +-#elif defined GNULIB_POSIXCHECK +-# undef free +-/* Assume free is always declared. */ +-_GL_WARN_ON_USE (free, "free is not future POSIX compliant everywhere - " +- "use gnulib module free for portability"); +-#endif +- + #if @GNULIB_MDA_GCVT@ + /* On native Windows, map 'gcvt' to '_gcvt', so that -loldnames is not + required. In C++ with GNULIB_NAMESPACE, avoid differences between +@@ -404,19 +451,35 @@ _GL_WARN_ON_USE (grantpt, "grantpt is not portable - " + # undef malloc + # define malloc rpl_malloc + # endif +-_GL_FUNCDECL_RPL (malloc, void *, (size_t size)); ++_GL_FUNCDECL_RPL (malloc, void *, ++ (size_t size) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); + _GL_CXXALIAS_RPL (malloc, void *, (size_t size)); + # else ++# if __GNUC__ >= 11 ++/* For -Wmismatched-dealloc: Associate malloc with free or rpl_free. */ ++_GL_FUNCDECL_SYS (malloc, void *, ++ (size_t size) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); ++# endif + _GL_CXXALIAS_SYS (malloc, void *, (size_t size)); + # endif + # if __GLIBC__ >= 2 + _GL_CXXALIASWARN (malloc); + # endif +-#elif defined GNULIB_POSIXCHECK && !_GL_USE_STDLIB_ALLOC +-# undef malloc ++#else ++# if @GNULIB_FREE_POSIX@ && __GNUC__ >= 11 && !defined malloc ++/* For -Wmismatched-dealloc: Associate malloc with free or rpl_free. */ ++_GL_FUNCDECL_SYS (malloc, void *, ++ (size_t size) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); ++# endif ++# if defined GNULIB_POSIXCHECK && !_GL_USE_STDLIB_ALLOC ++# undef malloc + /* Assume malloc is always declared. */ + _GL_WARN_ON_USE (malloc, "malloc is not POSIX compliant everywhere - " + "use gnulib module malloc-posix for portability"); ++# endif + #endif + + /* Convert a multibyte character to a wide character. */ +@@ -1015,29 +1078,53 @@ _GL_WARN_ON_USE (setstate_r, "setstate_r is unportable - " + # undef realloc + # define realloc rpl_realloc + # endif +-_GL_FUNCDECL_RPL (realloc, void *, (void *ptr, size_t size)); ++_GL_FUNCDECL_RPL (realloc, void *, (void *ptr, size_t size) ++ _GL_ATTRIBUTE_DEALLOC_FREE); + _GL_CXXALIAS_RPL (realloc, void *, (void *ptr, size_t size)); + # else ++# if __GNUC__ >= 11 ++/* For -Wmismatched-dealloc: Associate realloc with free or rpl_free. */ ++_GL_FUNCDECL_SYS (realloc, void *, (void *ptr, size_t size) ++ _GL_ATTRIBUTE_DEALLOC_FREE); ++# endif + _GL_CXXALIAS_SYS (realloc, void *, (void *ptr, size_t size)); + # endif + # if __GLIBC__ >= 2 + _GL_CXXALIASWARN (realloc); + # endif +-#elif defined GNULIB_POSIXCHECK && !_GL_USE_STDLIB_ALLOC +-# undef realloc ++#else ++# if @GNULIB_FREE_POSIX@ && __GNUC__ >= 11 && !defined realloc ++/* For -Wmismatched-dealloc: Associate realloc with free or rpl_free. */ ++_GL_FUNCDECL_SYS (realloc, void *, (void *ptr, size_t size) ++ _GL_ATTRIBUTE_DEALLOC_FREE); ++# endif ++# if defined GNULIB_POSIXCHECK && !_GL_USE_STDLIB_ALLOC ++# undef realloc + /* Assume realloc is always declared. */ + _GL_WARN_ON_USE (realloc, "realloc is not POSIX compliant everywhere - " + "use gnulib module realloc-posix for portability"); ++# endif + #endif + + + #if @GNULIB_REALLOCARRAY@ +-# if ! @HAVE_REALLOCARRAY@ ++# if @REPLACE_REALLOCARRAY@ ++# if !(defined __cplusplus && defined GNULIB_NAMESPACE) ++# undef reallocarray ++# define reallocarray rpl_reallocarray ++# endif ++_GL_FUNCDECL_RPL (reallocarray, void *, ++ (void *ptr, size_t nmemb, size_t size)); ++_GL_CXXALIAS_RPL (reallocarray, void *, ++ (void *ptr, size_t nmemb, size_t size)); ++# else ++# if ! @HAVE_REALLOCARRAY@ + _GL_FUNCDECL_SYS (reallocarray, void *, + (void *ptr, size_t nmemb, size_t size)); +-# endif ++# endif + _GL_CXXALIAS_SYS (reallocarray, void *, + (void *ptr, size_t nmemb, size_t size)); ++# endif + _GL_CXXALIASWARN (reallocarray); + #elif defined GNULIB_POSIXCHECK + # undef reallocarray +diff --git a/lib/strdup.c b/lib/strdup.c +index 2a37049..e5d4d75 100644 +--- a/lib/strdup.c ++++ b/lib/strdup.c +@@ -3,18 +3,18 @@ + + This file is part of the GNU C Library. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + #ifndef _LIBC + # include +diff --git a/lib/streq.h b/lib/streq.h +index 2d9d4c2..adabd15 100644 +--- a/lib/streq.h ++++ b/lib/streq.h +@@ -1,15 +1,15 @@ + /* Optimized string comparison. + Copyright (C) 2001-2002, 2007, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify it +- under the terms of the GNU Lesser General Public License as published +- by the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 +- Lesser General Public License for more details. ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ +diff --git a/lib/strftime.h b/lib/strftime.h +index 645e8c7..790a80e 100644 +--- a/lib/strftime.h ++++ b/lib/strftime.h +@@ -2,12 +2,12 @@ + + Copyright (C) 2002, 2004, 2008-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser 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, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/striconveh.c b/lib/striconveh.c +index 82f6467..78a5e02 100644 +--- a/lib/striconveh.c ++++ b/lib/striconveh.c +@@ -2,12 +2,12 @@ + Copyright (C) 2001-2021 Free Software Foundation, Inc. + Written by Bruno Haible and Simon Josefsson. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/striconveh.h b/lib/striconveh.h +index c9dff1e..60c6329 100644 +--- a/lib/striconveh.h ++++ b/lib/striconveh.h +@@ -2,12 +2,12 @@ + Copyright (C) 2001-2007, 2009-2021 Free Software Foundation, Inc. + Written by Bruno Haible and Simon Josefsson. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +@@ -18,7 +18,7 @@ + #ifndef _STRICONVEH_H + #define _STRICONVEH_H + +-#include ++#include + #if HAVE_ICONV + #include + #endif +@@ -95,7 +95,8 @@ extern int + extern char * + str_cd_iconveh (const char *src, + const iconveh_t *cd, +- enum iconv_ilseq_handler handler); ++ enum iconv_ilseq_handler handler) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE; + + #endif + +@@ -129,7 +130,8 @@ extern int + extern char * + str_iconveh (const char *src, + const char *from_codeset, const char *to_codeset, +- enum iconv_ilseq_handler handler); ++ enum iconv_ilseq_handler handler) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE; + + + #ifdef __cplusplus +diff --git a/lib/string.in.h b/lib/string.in.h +index 1292e29..b043c75 100644 +--- a/lib/string.in.h ++++ b/lib/string.in.h +@@ -2,18 +2,18 @@ + + Copyright (C) 1995-1996, 2001-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + #if __GNUC__ >= 3 + @PRAGMA_SYSTEM_HEADER@ +@@ -47,6 +47,9 @@ + /* NetBSD 5.0 mis-defines NULL. */ + #include + ++/* Get free(). */ ++#include ++ + /* MirBSD defines mbslen as a macro. */ + #if @GNULIB_MBSLEN@ && defined __MirBSD__ + # include +@@ -418,7 +421,10 @@ _GL_WARN_ON_USE (strchrnul, "strchrnul is unportable - " + # undef strdup + # define strdup rpl_strdup + # endif +-_GL_FUNCDECL_RPL (strdup, char *, (char const *__s) _GL_ARG_NONNULL ((1))); ++_GL_FUNCDECL_RPL (strdup, char *, ++ (char const *__s) ++ _GL_ARG_NONNULL ((1)) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); + _GL_CXXALIAS_RPL (strdup, char *, (char const *__s)); + # elif defined _WIN32 && !defined __CYGWIN__ + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) +@@ -431,35 +437,47 @@ _GL_CXXALIAS_MDA (strdup, char *, (char const *__s)); + /* strdup exists as a function and as a macro. Get rid of the macro. */ + # undef strdup + # endif +-# if !(@HAVE_DECL_STRDUP@ || defined strdup) +-_GL_FUNCDECL_SYS (strdup, char *, (char const *__s) _GL_ARG_NONNULL ((1))); ++# if (!@HAVE_DECL_STRDUP@ || __GNUC__ >= 11) && !defined strdup ++_GL_FUNCDECL_SYS (strdup, char *, ++ (char const *__s) ++ _GL_ARG_NONNULL ((1)) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); + # endif + _GL_CXXALIAS_SYS (strdup, char *, (char const *__s)); + # endif + _GL_CXXALIASWARN (strdup); +-#elif defined GNULIB_POSIXCHECK +-# undef strdup +-# if HAVE_RAW_DECL_STRDUP ++#else ++# if __GNUC__ >= 11 && !defined strdup ++/* For -Wmismatched-dealloc: Associate strdup with free or rpl_free. */ ++_GL_FUNCDECL_SYS (strdup, char *, ++ (char const *__s) ++ _GL_ARG_NONNULL ((1)) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); ++# endif ++# if defined GNULIB_POSIXCHECK ++# undef strdup ++# if HAVE_RAW_DECL_STRDUP + _GL_WARN_ON_USE (strdup, "strdup is unportable - " + "use gnulib module strdup for portability"); +-# endif +-#elif @GNULIB_MDA_STRDUP@ ++# endif ++# elif @GNULIB_MDA_STRDUP@ + /* On native Windows, map 'creat' to '_creat', so that -loldnames is not + required. In C++ with GNULIB_NAMESPACE, avoid differences between +- platforms by defining GNULIB_NAMESPACE::creat always. */ +-# if defined _WIN32 && !defined __CYGWIN__ +-# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +-# undef strdup +-# define strdup _strdup +-# endif ++ platforms by defining GNULIB_NAMESPACE::strdup always. */ ++# if defined _WIN32 && !defined __CYGWIN__ ++# if !(defined __cplusplus && defined GNULIB_NAMESPACE) ++# undef strdup ++# define strdup _strdup ++# endif + _GL_CXXALIAS_MDA (strdup, char *, (char const *__s)); +-# else +-# if defined __cplusplus && defined GNULIB_NAMESPACE && defined strdup +-# undef strdup +-# endif ++# else ++# if defined __cplusplus && defined GNULIB_NAMESPACE && defined strdup ++# undef strdup ++# endif + _GL_CXXALIAS_SYS (strdup, char *, (char const *__s)); +-# endif ++# endif + _GL_CXXALIASWARN (strdup); ++# endif + #endif + + /* Append no more than N characters from SRC onto DEST. */ +diff --git a/lib/stripslash.c b/lib/stripslash.c +index b079795..99bfbe6 100644 +--- a/lib/stripslash.c ++++ b/lib/stripslash.c +@@ -3,12 +3,12 @@ + Copyright (C) 1990, 2001, 2003-2006, 2009-2021 Free Software Foundation, + Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/sys-limits.h b/lib/sys-limits.h +index 1856e7f..2d9784d 100644 +--- a/lib/sys-limits.h ++++ b/lib/sys-limits.h +@@ -2,18 +2,18 @@ + + Copyright 2018-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + #ifndef _GL_SYS_LIMITS_H + #define _GL_SYS_LIMITS_H +diff --git a/lib/sys_file.in.h b/lib/sys_file.in.h +index e18594f..4166082 100644 +--- a/lib/sys_file.in.h ++++ b/lib/sys_file.in.h +@@ -2,18 +2,18 @@ + + Copyright (C) 2007-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + /* Written by Richard W.M. Jones. */ + +diff --git a/lib/sys_random.in.h b/lib/sys_random.in.h +index 1a479e9..1abd6c5 100644 +--- a/lib/sys_random.in.h ++++ b/lib/sys_random.in.h +@@ -1,18 +1,18 @@ + /* Substitute for . + Copyright (C) 2020-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + # if __GNUC__ >= 3 + @PRAGMA_SYSTEM_HEADER@ +diff --git a/lib/sys_select.in.h b/lib/sys_select.in.h +index d82c5d1..f8ef648 100644 +--- a/lib/sys_select.in.h ++++ b/lib/sys_select.in.h +@@ -1,18 +1,18 @@ + /* Substitute for . + Copyright (C) 2007-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + # if __GNUC__ >= 3 + @PRAGMA_SYSTEM_HEADER@ +diff --git a/lib/sys_socket.c b/lib/sys_socket.c +index 3b261da..d90b32c 100644 +--- a/lib/sys_socket.c ++++ b/lib/sys_socket.c +@@ -1,4 +1,22 @@ ++/* Inline functions for . ++ ++ Copyright (C) 2012-2021 Free Software Foundation, Inc. ++ ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. ++ ++ This file 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 Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ ++ + #include ++ + #define _GL_SYS_SOCKET_INLINE _GL_EXTERN_INLINE + #include "sys/socket.h" + typedef int dummy; +diff --git a/lib/sys_socket.in.h b/lib/sys_socket.in.h +index c0baa71..0a2c57d 100644 +--- a/lib/sys_socket.in.h ++++ b/lib/sys_socket.in.h +@@ -3,18 +3,18 @@ + Copyright (C) 2005-2021 Free Software Foundation, Inc. + Written by Simon Josefsson. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + /* This file is supposed to be used on platforms that lack , + on platforms where cannot be included standalone, and on +diff --git a/lib/sys_stat.in.h b/lib/sys_stat.in.h +index 125aca0..babe3db 100644 +--- a/lib/sys_stat.in.h ++++ b/lib/sys_stat.in.h +@@ -1,18 +1,18 @@ + /* Provide a more complete sys/stat.h header file. + Copyright (C) 2005-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + /* Written by Eric Blake, Paul Eggert, and Jim Meyering. */ + +diff --git a/lib/sys_time.in.h b/lib/sys_time.in.h +index f310ca5..8035fbe 100644 +--- a/lib/sys_time.in.h ++++ b/lib/sys_time.in.h +@@ -2,18 +2,18 @@ + + Copyright (C) 2007-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + /* Written by Paul Eggert. */ + +diff --git a/lib/sys_times.in.h b/lib/sys_times.in.h +index 3d96200..85b728f 100644 +--- a/lib/sys_times.in.h ++++ b/lib/sys_times.in.h +@@ -1,18 +1,18 @@ + /* Provide a sys/times.h header file. + Copyright (C) 2008-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + /* Written by Simon Josefsson , 2008. */ + +diff --git a/lib/sys_types.in.h b/lib/sys_types.in.h +index 26e7db7..2079d72 100644 +--- a/lib/sys_types.in.h ++++ b/lib/sys_types.in.h +@@ -2,18 +2,18 @@ + + Copyright (C) 2011-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + #if __GNUC__ >= 3 + @PRAGMA_SYSTEM_HEADER@ +diff --git a/lib/sys_uio.in.h b/lib/sys_uio.in.h +index 1941360..507ab01 100644 +--- a/lib/sys_uio.in.h ++++ b/lib/sys_uio.in.h +@@ -1,18 +1,18 @@ + /* Substitute for . + Copyright (C) 2011-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + # if __GNUC__ >= 3 + @PRAGMA_SYSTEM_HEADER@ +diff --git a/lib/tempname.h b/lib/tempname.h +index c91a58d..795bb49 100644 +--- a/lib/tempname.h ++++ b/lib/tempname.h +@@ -2,12 +2,12 @@ + + Copyright (C) 2006, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/time-internal.h b/lib/time-internal.h +index b86b7a0..6bbd0a7 100644 +--- a/lib/time-internal.h ++++ b/lib/time-internal.h +@@ -2,18 +2,18 @@ + + Copyright 2015-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser 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, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + /* Written by Paul Eggert. */ + +diff --git a/lib/time.in.h b/lib/time.in.h +index cbd2bba..a73fe59 100644 +--- a/lib/time.in.h ++++ b/lib/time.in.h +@@ -2,18 +2,18 @@ + + Copyright (C) 2007-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + #if __GNUC__ >= 3 + @PRAGMA_SYSTEM_HEADER@ +diff --git a/lib/time_r.c b/lib/time_r.c +index 2510c4e..88d3c1c 100644 +--- a/lib/time_r.c ++++ b/lib/time_r.c +@@ -2,18 +2,18 @@ + + Copyright (C) 2003, 2006-2007, 2010-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + /* Written by Paul Eggert. */ + +diff --git a/lib/time_rz.c b/lib/time_rz.c +index d32cce7..e772244 100644 +--- a/lib/time_rz.c ++++ b/lib/time_rz.c +@@ -2,18 +2,18 @@ + + Copyright 2015-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser 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, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + /* Written by Paul Eggert. */ + +diff --git a/lib/times.c b/lib/times.c +index b8afa60..72b852e 100644 +--- a/lib/times.c ++++ b/lib/times.c +@@ -2,18 +2,18 @@ + + Copyright (C) 2008-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + /* Written by Simon Josefsson , 2008. */ + +diff --git a/lib/trunc.c b/lib/trunc.c +index cf2adac..1c9c420 100644 +--- a/lib/trunc.c ++++ b/lib/trunc.c +@@ -1,12 +1,12 @@ + /* Round towards zero. + Copyright (C) 2007, 2010-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser 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, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/tzset.c b/lib/tzset.c +index 1f423c4..7fd4936 100644 +--- a/lib/tzset.c ++++ b/lib/tzset.c +@@ -2,18 +2,18 @@ + + Copyright (C) 2001-2003, 2005-2007, 2009-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser 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, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + /* written by Jim Meyering */ + +diff --git a/lib/unistd.c b/lib/unistd.c +index 72bad1c..0763456 100644 +--- a/lib/unistd.c ++++ b/lib/unistd.c +@@ -1,4 +1,22 @@ ++/* Inline functions for . ++ ++ Copyright (C) 2012-2021 Free Software Foundation, Inc. ++ ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. ++ ++ This file 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 Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ ++ + #include ++ + #define _GL_UNISTD_INLINE _GL_EXTERN_INLINE + #include "unistd.h" + typedef int dummy; +diff --git a/lib/unistd.in.h b/lib/unistd.in.h +index 5914fd5..73c882f 100644 +--- a/lib/unistd.in.h ++++ b/lib/unistd.in.h +@@ -1,18 +1,18 @@ + /* Substitute for and wrapper around . + Copyright (C) 2003-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + #ifndef _ at GUARD_PREFIX@_UNISTD_H + +@@ -1521,6 +1521,7 @@ _GL_WARN_ON_USE (group_member, "group_member is unportable - " + # undef isatty + # define isatty rpl_isatty + # endif ++# define GNULIB_defined_isatty 1 + _GL_FUNCDECL_RPL (isatty, int, (int fd)); + _GL_CXXALIAS_RPL (isatty, int, (int fd)); + # elif defined _WIN32 && !defined __CYGWIN__ +@@ -2027,15 +2028,23 @@ _GL_WARN_ON_USE (sleep, "sleep is unportable - " + #if @GNULIB_MDA_SWAB@ + /* On native Windows, map 'swab' to '_swab', so that -loldnames is not + required. In C++ with GNULIB_NAMESPACE, avoid differences between +- platforms by defining GNULIB_NAMESPACE::creat always. */ ++ platforms by defining GNULIB_NAMESPACE::swab always. */ + # if defined _WIN32 && !defined __CYGWIN__ + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) + # undef swab + # define swab _swab + # endif +-_GL_CXXALIAS_MDA (swab, void, (char *from, char *to, int n)); ++/* Need to cast, because in old mingw the arguments are ++ (const char *from, char *to, size_t n). */ ++_GL_CXXALIAS_MDA_CAST (swab, void, (char *from, char *to, int n)); + # else ++# if defined __hpux /* HP-UX */ ++_GL_CXXALIAS_SYS (swab, void, (const char *from, char *to, int n)); ++# elif defined __sun && !defined _XPG4 /* Solaris */ ++_GL_CXXALIAS_SYS (swab, void, (const char *from, char *to, ssize_t n)); ++# else + _GL_CXXALIAS_SYS (swab, void, (const void *from, void *to, ssize_t n)); ++# endif + # endif + _GL_CXXALIASWARN (swab); + #endif +diff --git a/lib/unsetenv.c b/lib/unsetenv.c +index 005fb1f..b2e910e 100644 +--- a/lib/unsetenv.c ++++ b/lib/unsetenv.c +@@ -1,12 +1,12 @@ + /* Copyright (C) 1992, 1995-2002, 2005-2021 Free Software Foundation, Inc. + This file is part of the GNU C Library. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c +index 8d51006..d9b669d 100644 +--- a/lib/vasnprintf.c ++++ b/lib/vasnprintf.c +@@ -1,18 +1,18 @@ + /* vsprintf with automatic memory allocation. + Copyright (C) 1999, 2002-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + /* This file can be parametrized with the following macros: + VASNPRINTF The name of the function being defined. +@@ -60,10 +60,16 @@ + #ifndef VASNPRINTF + # include + #endif +-#ifndef IN_LIBINTL +-# include ++ ++/* As of GCC 11.2.1, gcc -Wanalyzer-too-complex reports that main's ++ use of CHECK macros expands to code that is too complicated for gcc ++ -fanalyzer. Suppress the resulting bogus warnings. */ ++#if 10 <= __GNUC__ ++# pragma GCC diagnostic ignored "-Wanalyzer-null-argument" + #endif + ++#include ++ + /* Specification. */ + #ifndef VASNPRINTF + # if WIDE_CHAR_VERSION +@@ -1924,7 +1930,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, + + /* Ensures that allocated >= needed. Aborts through a jump to + out_of_memory if needed is SIZE_MAX or otherwise too big. */ +-#define ENSURE_ALLOCATION(needed) \ ++#define ENSURE_ALLOCATION_ELSE(needed, oom_statement) \ + if ((needed) > allocated) \ + { \ + size_t memory_size; \ +@@ -1935,17 +1941,19 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, + allocated = (needed); \ + memory_size = xtimes (allocated, sizeof (DCHAR_T)); \ + if (size_overflow_p (memory_size)) \ +- goto out_of_memory; \ ++ oom_statement \ + if (result == resultbuf || result == NULL) \ + memory = (DCHAR_T *) malloc (memory_size); \ + else \ + memory = (DCHAR_T *) realloc (result, memory_size); \ + if (memory == NULL) \ +- goto out_of_memory; \ ++ oom_statement \ + if (result == resultbuf && length > 0) \ + DCHAR_CPY (memory, result, length); \ + result = memory; \ + } ++#define ENSURE_ALLOCATION(needed) \ ++ ENSURE_ALLOCATION_ELSE((needed), goto out_of_memory; ) + + for (cp = format, i = 0, dp = &d.dir[0]; ; cp = dp->dir_end, i++, dp++) + { +@@ -2193,7 +2201,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, + } + if (converted != result + length) + { +- ENSURE_ALLOCATION (xsum (length, converted_len)); ++ ENSURE_ALLOCATION_ELSE (xsum (length, converted_len), ++ { free (converted); goto out_of_memory; }); + DCHAR_CPY (result + length, converted, converted_len); + free (converted); + } +@@ -2317,7 +2326,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, + } + if (converted != result + length) + { +- ENSURE_ALLOCATION (xsum (length, converted_len)); ++ ENSURE_ALLOCATION_ELSE (xsum (length, converted_len), ++ { free (converted); goto out_of_memory; }); + DCHAR_CPY (result + length, converted, converted_len); + free (converted); + } +@@ -2441,7 +2451,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, + } + if (converted != result + length) + { +- ENSURE_ALLOCATION (xsum (length, converted_len)); ++ ENSURE_ALLOCATION_ELSE (xsum (length, converted_len), ++ { free (converted); goto out_of_memory; }); + DCHAR_CPY (result + length, converted, converted_len); + free (converted); + } +@@ -2944,7 +2955,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, + } + } + # else +- ENSURE_ALLOCATION (xsum (length, tmpdst_len)); ++ ENSURE_ALLOCATION_ELSE (xsum (length, tmpdst_len), ++ { free (tmpdst); goto out_of_memory; }); + DCHAR_CPY (result + length, tmpdst, tmpdst_len); + free (tmpdst); + length += tmpdst_len; +@@ -3147,7 +3159,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, + } + } + # else +- ENSURE_ALLOCATION (xsum (length, tmpdst_len)); ++ ENSURE_ALLOCATION_ELSE (xsum (length, tmpdst_len), ++ { free (tmpdst); goto out_of_memory; }); + DCHAR_CPY (result + length, tmpdst, tmpdst_len); + free (tmpdst); + length += tmpdst_len; +@@ -5598,7 +5611,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, + CLEANUP (); + return NULL; + } +- ENSURE_ALLOCATION (xsum (length, tmpdst_len)); ++ ENSURE_ALLOCATION_ELSE (xsum (length, tmpdst_len), ++ { free (tmpdst); goto out_of_memory; }); + DCHAR_CPY (result + length, tmpdst, tmpdst_len); + free (tmpdst); + count = tmpdst_len; +diff --git a/lib/vasnprintf.h b/lib/vasnprintf.h +index aaed859..9b02cdf 100644 +--- a/lib/vasnprintf.h ++++ b/lib/vasnprintf.h +@@ -1,18 +1,18 @@ + /* vsprintf with automatic memory allocation. + Copyright (C) 2002-2004, 2007-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + #ifndef _VASNPRINTF_H + #define _VASNPRINTF_H +diff --git a/lib/verify.h b/lib/verify.h +index d1b4995..a8ca59b 100644 +--- a/lib/verify.h ++++ b/lib/verify.h +@@ -2,12 +2,12 @@ + + Copyright (C) 2005-2006, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +@@ -25,7 +25,7 @@ + works as per C11. This is supported by GCC 4.6.0+ and by clang 4+. + + Define _GL_HAVE__STATIC_ASSERT1 to 1 if _Static_assert (R) works as +- per C2X. This is supported by GCC 9.1+. ++ per C2x. This is supported by GCC 9.1+. + + Support compilers claiming conformance to the relevant standard, + and also support GCC when not pedantic. If we were willing to slow +@@ -202,7 +202,7 @@ template + + This macro requires three or more arguments but uses at most the first + two, so that the _Static_assert macro optionally defined below supports +- both the C11 two-argument syntax and the C2X one-argument syntax. ++ both the C11 two-argument syntax and the C2x one-argument syntax. + + Unfortunately, unlike C11, this implementation must appear as an + ordinary declaration, and cannot appear inside struct { ... }. */ +diff --git a/lib/vsnprintf.c b/lib/vsnprintf.c +index c94c5cb..4a0a3dc 100644 +--- a/lib/vsnprintf.c ++++ b/lib/vsnprintf.c +@@ -2,18 +2,18 @@ + Copyright (C) 2004, 2006-2021 Free Software Foundation, Inc. + Written by Simon Josefsson and Yoann Vandoorselaere . + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + #ifdef HAVE_CONFIG_H + # include +diff --git a/lib/w32sock.h b/lib/w32sock.h +index 9b6a231..635a1b2 100644 +--- a/lib/w32sock.h ++++ b/lib/w32sock.h +@@ -2,12 +2,12 @@ + + Copyright (C) 2008-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/wchar.in.h b/lib/wchar.in.h +index fe4171c..be5d36c 100644 +--- a/lib/wchar.in.h ++++ b/lib/wchar.in.h +@@ -2,18 +2,18 @@ + + Copyright (C) 2007-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + /* Written by Eric Blake. */ + +@@ -72,6 +72,9 @@ + # include + #endif + ++/* Get free(). */ ++#include ++ + /* Include the original if it exists. + Some builds of uClibc lack it. */ + /* The include_next requires a split double-inclusion guard. */ +@@ -111,7 +114,7 @@ + /* mingw and MSVC define wint_t as 'unsigned short' in or + . This is too small: ISO C 99 section 7.24.1.(2) says that + wint_t must be "unchanged by default argument promotions". Override it. */ +-# if @GNULIB_OVERRIDES_WINT_T@ ++# if @GNULIBHEADERS_OVERRIDE_WINT_T@ + # if !GNULIB_defined_wint_t + # if @HAVE_CRTDEFS_H@ + # include +@@ -941,36 +944,48 @@ _GL_WARN_ON_USE (wcsxfrm, "wcsxfrm is unportable - " + # endif + _GL_CXXALIAS_MDA (wcsdup, wchar_t *, (const wchar_t *s)); + # else +-# if !@HAVE_WCSDUP@ +-_GL_FUNCDECL_SYS (wcsdup, wchar_t *, (const wchar_t *s)); ++# if !@HAVE_WCSDUP@ || __GNUC__ >= 11 ++_GL_FUNCDECL_SYS (wcsdup, wchar_t *, ++ (const wchar_t *s) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); + # endif + _GL_CXXALIAS_SYS (wcsdup, wchar_t *, (const wchar_t *s)); + # endif + _GL_CXXALIASWARN (wcsdup); +-#elif defined GNULIB_POSIXCHECK +-# undef wcsdup +-# if HAVE_RAW_DECL_WCSDUP ++#else ++# if __GNUC__ >= 11 && !defined wcsdup ++/* For -Wmismatched-dealloc: Associate wcsdup with free or rpl_free. */ ++_GL_FUNCDECL_SYS (wcsdup, wchar_t *, ++ (const wchar_t *s) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); ++# endif ++# if defined GNULIB_POSIXCHECK ++# undef wcsdup ++# if HAVE_RAW_DECL_WCSDUP + _GL_WARN_ON_USE (wcsdup, "wcsdup is unportable - " + "use gnulib module wcsdup for portability"); +-# endif +-#elif @GNULIB_MDA_WCSDUP@ ++# endif ++# elif @GNULIB_MDA_WCSDUP@ + /* On native Windows, map 'wcsdup' to '_wcsdup', so that -loldnames is not + required. In C++ with GNULIB_NAMESPACE, avoid differences between + platforms by defining GNULIB_NAMESPACE::wcsdup always. */ +-# if defined _WIN32 && !defined __CYGWIN__ +-# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +-# undef wcsdup +-# define wcsdup _wcsdup +-# endif ++# if defined _WIN32 && !defined __CYGWIN__ ++# if !(defined __cplusplus && defined GNULIB_NAMESPACE) ++# undef wcsdup ++# define wcsdup _wcsdup ++# endif + _GL_CXXALIAS_MDA (wcsdup, wchar_t *, (const wchar_t *s)); +-# else +-_GL_FUNCDECL_SYS (wcsdup, wchar_t *, (const wchar_t *s)); +-# if @HAVE_DECL_WCSDUP@ ++# else ++_GL_FUNCDECL_SYS (wcsdup, wchar_t *, ++ (const wchar_t *s) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); ++# if @HAVE_DECL_WCSDUP@ + _GL_CXXALIAS_SYS (wcsdup, wchar_t *, (const wchar_t *s)); ++# endif + # endif +-# endif +-# if (defined _WIN32 && !defined __CYGWIN__) || @HAVE_DECL_WCSDUP@ ++# if (defined _WIN32 && !defined __CYGWIN__) || @HAVE_DECL_WCSDUP@ + _GL_CXXALIASWARN (wcsdup); ++# endif + # endif + #endif + +diff --git a/lib/wcrtomb.c b/lib/wcrtomb.c +index 76d21ae..5c9fd79 100644 +--- a/lib/wcrtomb.c ++++ b/lib/wcrtomb.c +@@ -2,12 +2,12 @@ + Copyright (C) 2008-2021 Free Software Foundation, Inc. + Written by Bruno Haible , 2008. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/wctype-h.c b/lib/wctype-h.c +index bb5f847..150221d 100644 +--- a/lib/wctype-h.c ++++ b/lib/wctype-h.c +@@ -1,4 +1,23 @@ ++/* Inline functions for . ++ ++ Copyright (C) 2012-2021 Free Software Foundation, Inc. ++ ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. ++ ++ This file 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 Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ ++ + /* Normally this would be wctype.c, but that name's already taken. */ ++ + #include ++ + #define _GL_WCTYPE_INLINE _GL_EXTERN_INLINE + #include "wctype.h" +diff --git a/lib/wctype.in.h b/lib/wctype.in.h +index 6f0cd21..652d811 100644 +--- a/lib/wctype.in.h ++++ b/lib/wctype.in.h +@@ -2,18 +2,18 @@ + + Copyright (C) 2006-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + /* Written by Bruno Haible and Paul Eggert. */ + +@@ -103,7 +103,7 @@ _GL_INLINE_HEADER_BEGIN + /* mingw and MSVC define wint_t as 'unsigned short' in or + . This is too small: ISO C 99 section 7.24.1.(2) says that + wint_t must be "unchanged by default argument promotions". Override it. */ +-# if @GNULIB_OVERRIDES_WINT_T@ ++# if @GNULIBHEADERS_OVERRIDE_WINT_T@ + # if !GNULIB_defined_wint_t + # if @HAVE_CRTDEFS_H@ + # include +@@ -132,7 +132,7 @@ typedef unsigned int rpl_wint_t; + same way, or not at all. */ + # if ! @HAVE_ISWCNTRL@ || @REPLACE_ISWCNTRL@ + +-# if @GNULIB_OVERRIDES_WINT_T@ /* implies @REPLACE_ISWCNTRL@ */ ++# if @GNULIBHEADERS_OVERRIDE_WINT_T@ /* implies @REPLACE_ISWCNTRL@ */ + + _GL_WCTYPE_INLINE int + rpl_iswalnum (wint_t wc) +@@ -496,7 +496,7 @@ _GL_FUNCDECL_RPL (iswxdigit, int, (wint_t wc)); + + # endif + +-# if defined __MINGW32__ && !@GNULIB_OVERRIDES_WINT_T@ ++# if defined __MINGW32__ && !@GNULIBHEADERS_OVERRIDE_WINT_T@ + + /* On native Windows, wchar_t is uint16_t, and wint_t is uint32_t. + The functions towlower and towupper are implemented in the MSVCRT library +@@ -529,7 +529,7 @@ rpl_towupper (wint_t wc) + # define towupper rpl_towupper + # endif + +-# endif /* __MINGW32__ && !@GNULIB_OVERRIDES_WINT_T@ */ ++# endif /* __MINGW32__ && !@GNULIBHEADERS_OVERRIDE_WINT_T@ */ + + # define GNULIB_defined_wctype_functions 1 + #endif +@@ -646,7 +646,7 @@ _GL_WARN_ON_USE (wctype, "wctype is unportable - " + The argument WC must be either a wchar_t value or WEOF. + The argument DESC must have been returned by the wctype() function. */ + #if @GNULIB_ISWCTYPE@ +-# if @GNULIB_OVERRIDES_WINT_T@ ++# if @GNULIBHEADERS_OVERRIDE_WINT_T@ + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) + # undef iswctype + # define iswctype rpl_iswctype +diff --git a/lib/windows-initguard.h b/lib/windows-initguard.h +index e84051e..7999b23 100644 +--- a/lib/windows-initguard.h ++++ b/lib/windows-initguard.h +@@ -1,18 +1,18 @@ + /* Init guards, somewhat like spinlocks (native Windows implementation). + Copyright (C) 2005-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + /* Written by Bruno Haible , 2005. + Based on GCC's gthr-win32.h. */ +diff --git a/lib/write.c b/lib/write.c +index bc53d4d..614cdc6 100644 +--- a/lib/write.c ++++ b/lib/write.c +@@ -2,12 +2,12 @@ + Copyright (C) 2008-2021 Free Software Foundation, Inc. + Written by Bruno Haible , 2008. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/xalloc-oversized.h b/lib/xalloc-oversized.h +index d255969..4184f33 100644 +--- a/lib/xalloc-oversized.h ++++ b/lib/xalloc-oversized.h +@@ -2,12 +2,12 @@ + + Copyright (C) 1990-2000, 2003-2004, 2006-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +@@ -22,33 +22,38 @@ + #include + + /* True if N * S does not fit into both ptrdiff_t and size_t. +- S must be positive and N must be nonnegative. ++ N and S should be nonnegative and free of side effects. + This expands to a constant expression if N and S are both constants. + By gnulib convention, SIZE_MAX represents overflow in size_t + calculations, so the conservative size_t-based dividend to use here + is SIZE_MAX - 1. */ + #define __xalloc_oversized(n, s) \ +- ((size_t) (PTRDIFF_MAX < SIZE_MAX ? PTRDIFF_MAX : SIZE_MAX - 1) / (s) < (n)) ++ ((s) != 0 \ ++ && ((size_t) (PTRDIFF_MAX < SIZE_MAX ? PTRDIFF_MAX : SIZE_MAX - 1) / (s) \ ++ < (n))) + +-#if PTRDIFF_MAX < SIZE_MAX +-typedef ptrdiff_t xalloc_count_t; +-#else +-typedef size_t xalloc_count_t; +-#endif ++/* Return 1 if and only if an array of N objects, each of size S, ++ cannot exist reliably because its total size in bytes would exceed ++ MIN (PTRDIFF_MAX, SIZE_MAX - 1). ++ ++ N and S should be nonnegative and free of side effects. ++ ++ Warning: (xalloc_oversized (N, S) ? NULL : malloc (N * S)) can ++ misbehave if N and S are both narrower than ptrdiff_t and size_t, ++ and can be rewritten as (xalloc_oversized (N, S) ? NULL ++ : malloc (N * (size_t) S)). + +-/* Return 1 if an array of N objects, each of size S, cannot exist reliably +- because its total size in bytes exceeds MIN (PTRDIFF_MAX, SIZE_MAX). +- N must be nonnegative, S must be positive, and either N or S should be +- of type ptrdiff_t or size_t or wider. This is a macro, not a function, +- so that it works even if an argument exceeds MAX (PTRDIFF_MAX, SIZE_MAX). */ +-#if 7 <= __GNUC__ && !defined __clang__ ++ This is a macro, not a function, so that it works even if an ++ argument exceeds MAX (PTRDIFF_MAX, SIZE_MAX). */ ++#if 7 <= __GNUC__ && !defined __clang__ && PTRDIFF_MAX < SIZE_MAX + # define xalloc_oversized(n, s) \ +- __builtin_mul_overflow_p (n, s, (xalloc_count_t) 1) +-#elif 5 <= __GNUC__ && !defined __ICC && !__STRICT_ANSI__ ++ __builtin_mul_overflow_p (n, s, (ptrdiff_t) 1) ++#elif (5 <= __GNUC__ && !defined __ICC && !__STRICT_ANSI__ \ ++ && PTRDIFF_MAX < SIZE_MAX) + # define xalloc_oversized(n, s) \ + (__builtin_constant_p (n) && __builtin_constant_p (s) \ + ? __xalloc_oversized (n, s) \ +- : ({ xalloc_count_t __xalloc_count; \ ++ : ({ ptrdiff_t __xalloc_count; \ + __builtin_mul_overflow (n, s, &__xalloc_count); })) + + /* Other compilers use integer division; this may be slower but is +diff --git a/lib/xsize.c b/lib/xsize.c +index 4b4914c..b3d73a2 100644 +--- a/lib/xsize.c ++++ b/lib/xsize.c +@@ -1,3 +1,21 @@ ++/* Checked size_t computations. ++ ++ Copyright (C) 2012-2021 Free Software Foundation, Inc. ++ ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. ++ ++ This file 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 Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ ++ + #include ++ + #define XSIZE_INLINE _GL_EXTERN_INLINE + #include "xsize.h" +diff --git a/lib/xsize.h b/lib/xsize.h +index d4d7b1c..91fa877 100644 +--- a/lib/xsize.h ++++ b/lib/xsize.h +@@ -2,18 +2,18 @@ + + Copyright (C) 2003, 2008-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + #ifndef _XSIZE_H + #define _XSIZE_H +diff --git a/m4/arpa_inet_h.m4 b/m4/arpa_inet_h.m4 +index c4e386d..a3ba256 100644 +--- a/m4/arpa_inet_h.m4 ++++ b/m4/arpa_inet_h.m4 +@@ -1,4 +1,4 @@ +-# arpa_inet_h.m4 serial 14 ++# arpa_inet_h.m4 serial 17 + dnl Copyright (C) 2006, 2008-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -6,10 +6,10 @@ dnl with or without modifications, as long as this notice is preserved. + + dnl Written by Simon Josefsson and Bruno Haible + +-AC_DEFUN([gl_HEADER_ARPA_INET], ++AC_DEFUN_ONCE([gl_ARPA_INET_H], + [ +- dnl Use AC_REQUIRE here, so that the default behavior below is expanded +- dnl once only, before all statements that occur in other macros. ++ dnl Ensure to expand the default settings once only, before all statements ++ dnl that occur in other macros. + AC_REQUIRE([gl_ARPA_INET_H_DEFAULTS]) + + AC_CHECK_HEADERS_ONCE([arpa/inet.h]) +@@ -40,17 +40,32 @@ AC_DEFUN([gl_HEADER_ARPA_INET], + ]], [inet_ntop inet_pton]) + ]) + ++# gl_ARPA_INET_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_ARPA_INET_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_ARPA_INET_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_ARPA_INET_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_ARPA_INET_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_ARPA_INET_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_INET_NTOP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_INET_PTON]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_ARPA_INET_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_ARPA_INET_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_ARPA_INET_H_DEFAULTS], + [ +- GNULIB_INET_NTOP=0; AC_SUBST([GNULIB_INET_NTOP]) +- GNULIB_INET_PTON=0; AC_SUBST([GNULIB_INET_PTON]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_DECL_INET_NTOP=1; AC_SUBST([HAVE_DECL_INET_NTOP]) + HAVE_DECL_INET_PTON=1; AC_SUBST([HAVE_DECL_INET_PTON]) +diff --git a/m4/dirent_h.m4 b/m4/dirent_h.m4 +index 6d86142..17e2a20 100644 +--- a/m4/dirent_h.m4 ++++ b/m4/dirent_h.m4 +@@ -1,4 +1,4 @@ +-# dirent_h.m4 serial 16 ++# dirent_h.m4 serial 19 + dnl Copyright (C) 2008-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -6,10 +6,10 @@ dnl with or without modifications, as long as this notice is preserved. + + dnl Written by Bruno Haible. + +-AC_DEFUN([gl_DIRENT_H], ++AC_DEFUN_ONCE([gl_DIRENT_H], + [ +- dnl Use AC_REQUIRE here, so that the default behavior below is expanded +- dnl once only, before all statements that occur in other macros. ++ dnl Ensure to expand the default settings once only, before all statements ++ dnl that occur in other macros. + AC_REQUIRE([gl_DIRENT_H_DEFAULTS]) + + dnl is always overridden, because of GNULIB_POSIXCHECK. +@@ -27,26 +27,41 @@ AC_DEFUN([gl_DIRENT_H], + ]], [alphasort closedir dirfd fdopendir opendir readdir rewinddir scandir]) + ]) + ++# gl_DIRENT_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_DIRENT_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_DIRENT_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_DIRENT_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_DIRENT_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_DIRENT_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_UNISTD_H_REQUIRE_DEFAULTS dnl for REPLACE_FCHDIR ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OPENDIR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_READDIR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REWINDDIR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CLOSEDIR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DIRFD]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FDOPENDIR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SCANDIR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ALPHASORT]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_DIRENT_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_DIRENT_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_DIRENT_H_DEFAULTS], + [ +- AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) dnl for REPLACE_FCHDIR +- GNULIB_OPENDIR=0; AC_SUBST([GNULIB_OPENDIR]) +- GNULIB_READDIR=0; AC_SUBST([GNULIB_READDIR]) +- GNULIB_REWINDDIR=0; AC_SUBST([GNULIB_REWINDDIR]) +- GNULIB_CLOSEDIR=0; AC_SUBST([GNULIB_CLOSEDIR]) +- GNULIB_DIRFD=0; AC_SUBST([GNULIB_DIRFD]) +- GNULIB_FDOPENDIR=0; AC_SUBST([GNULIB_FDOPENDIR]) +- GNULIB_SCANDIR=0; AC_SUBST([GNULIB_SCANDIR]) +- GNULIB_ALPHASORT=0; AC_SUBST([GNULIB_ALPHASORT]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_OPENDIR=1; AC_SUBST([HAVE_OPENDIR]) + HAVE_READDIR=1; AC_SUBST([HAVE_READDIR]) +diff --git a/m4/environ.m4 b/m4/environ.m4 +index d971770..ae53291 100644 +--- a/m4/environ.m4 ++++ b/m4/environ.m4 +@@ -1,4 +1,4 @@ +-# environ.m4 serial 7 ++# environ.m4 serial 8 + dnl Copyright (C) 2001-2004, 2006-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -33,7 +33,8 @@ AC_DEFUN([gt_CHECK_VAR_DECL], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[$1 +- extern struct { int foo; } $2;]], ++ typedef struct { int foo; } foo_t; ++ extern foo_t $2;]], + [[$2.foo = 1;]])], + [gt_cv_var=no], + [gt_cv_var=yes])]) +diff --git a/m4/fcntl_h.m4 b/m4/fcntl_h.m4 +index e63a82f..aba4473 100644 +--- a/m4/fcntl_h.m4 ++++ b/m4/fcntl_h.m4 +@@ -1,4 +1,4 @@ +-# serial 17 ++# serial 20 + # Configure fcntl.h. + dnl Copyright (C) 2006-2007, 2009-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation +@@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is preserved. + + dnl Written by Paul Eggert. + +-AC_DEFUN([gl_FCNTL_H], ++AC_DEFUN_ONCE([gl_FCNTL_H], + [ + AC_REQUIRE([gl_FCNTL_H_DEFAULTS]) + AC_REQUIRE([gl_FCNTL_O_FLAGS]) +@@ -26,25 +26,40 @@ AC_DEFUN([gl_FCNTL_H], + ]], [fcntl openat]) + ]) + ++# gl_FCNTL_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_FCNTL_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_FCNTL_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_FCNTL_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_FCNTL_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_FCNTL_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CREAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FCNTL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_NONBLOCKING]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OPEN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OPENAT]) ++ dnl Support Microsoft deprecated alias function names by default. ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_CREAT], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_OPEN], [1]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_FCNTL_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_FCNTL_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_FCNTL_H_DEFAULTS], + [ +- GNULIB_CREAT=0; AC_SUBST([GNULIB_CREAT]) +- GNULIB_FCNTL=0; AC_SUBST([GNULIB_FCNTL]) +- GNULIB_NONBLOCKING=0; AC_SUBST([GNULIB_NONBLOCKING]) +- GNULIB_OPEN=0; AC_SUBST([GNULIB_OPEN]) +- GNULIB_OPENAT=0; AC_SUBST([GNULIB_OPENAT]) +- dnl Support Microsoft deprecated alias function names by default. +- GNULIB_MDA_CREAT=1; AC_SUBST([GNULIB_MDA_CREAT]) +- GNULIB_MDA_OPEN=1; AC_SUBST([GNULIB_MDA_OPEN]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_FCNTL=1; AC_SUBST([HAVE_FCNTL]) + HAVE_OPENAT=1; AC_SUBST([HAVE_OPENAT]) +diff --git a/m4/flock.m4 b/m4/flock.m4 +index eb46642..e1e5fe0 100644 +--- a/m4/flock.m4 ++++ b/m4/flock.m4 +@@ -1,4 +1,4 @@ +-# flock.m4 serial 3 ++# flock.m4 serial 4 + dnl Copyright (C) 2008-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is preserved. + + AC_DEFUN([gl_FUNC_FLOCK], + [ +- AC_REQUIRE([gl_HEADER_SYS_FILE_H_DEFAULTS]) ++ AC_REQUIRE([gl_SYS_FILE_H_DEFAULTS]) + AC_CHECK_FUNCS_ONCE([flock]) + if test $ac_cv_func_flock = no; then + HAVE_FLOCK=0 +diff --git a/m4/fstat.m4 b/m4/fstat.m4 +index 3b5b238..cdaca80 100644 +--- a/m4/fstat.m4 ++++ b/m4/fstat.m4 +@@ -1,4 +1,4 @@ +-# fstat.m4 serial 7 ++# fstat.m4 serial 8 + dnl Copyright (C) 2011-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -34,7 +34,7 @@ AC_DEFUN([gl_FUNC_FSTAT], + + # Prerequisites of lib/fstat.c and lib/stat-w32.c. + AC_DEFUN([gl_PREREQ_FSTAT], [ +- AC_REQUIRE([gl_HEADER_SYS_STAT_H]) ++ AC_REQUIRE([gl_SYS_STAT_H]) + AC_REQUIRE([gl_PREREQ_STAT_W32]) + : + ]) +diff --git a/m4/getaddrinfo.m4 b/m4/getaddrinfo.m4 +index 97889a8..3f8e04f 100644 +--- a/m4/getaddrinfo.m4 ++++ b/m4/getaddrinfo.m4 +@@ -1,4 +1,4 @@ +-# getaddrinfo.m4 serial 33 ++# getaddrinfo.m4 serial 34 + dnl Copyright (C) 2004-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -6,8 +6,8 @@ dnl with or without modifications, as long as this notice is preserved. + + AC_DEFUN([gl_GETADDRINFO], + [ +- AC_REQUIRE([gl_HEADER_SYS_SOCKET])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H +- AC_REQUIRE([gl_HEADER_NETDB])dnl for HAVE_NETDB_H ++ AC_REQUIRE([gl_SYS_SOCKET_H])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H ++ AC_REQUIRE([gl_NETDB_H])dnl for HAVE_NETDB_H + GETADDRINFO_LIB= + gai_saved_LIBS="$LIBS" + +@@ -156,13 +156,13 @@ const char *gai_strerror(int);]])], + # Prerequisites of lib/netdb.in.h and lib/getaddrinfo.c. + AC_DEFUN([gl_PREREQ_GETADDRINFO], [ + AC_REQUIRE([gl_NETDB_H_DEFAULTS]) +- AC_REQUIRE([gl_HEADER_SYS_SOCKET])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H ++ AC_REQUIRE([gl_SYS_SOCKET_H])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H + AC_REQUIRE([gl_HOSTENT]) dnl for HOSTENT_LIB + AC_REQUIRE([gl_SERVENT]) dnl for SERVENT_LIB + AC_REQUIRE([gl_FUNC_INET_NTOP]) dnl for INET_NTOP_LIB + AC_REQUIRE([AC_C_RESTRICT]) + AC_REQUIRE([gl_SOCKET_FAMILIES]) +- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) ++ AC_REQUIRE([gl_SYS_SOCKET_H]) + AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) + + dnl Including sys/socket.h is wrong for Windows, but Windows does not +diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4 +index f2eff10..c801b3d 100644 +--- a/m4/gnulib-common.m4 ++++ b/m4/gnulib-common.m4 +@@ -1,4 +1,4 @@ +-# gnulib-common.m4 serial 63 ++# gnulib-common.m4 serial 67 + dnl Copyright (C) 2007-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -85,12 +85,12 @@ AC_DEFUN([gl_COMMON_BODY], [ + # define _GL_ATTR_fallthrough _GL_GNUC_PREREQ (7, 0) + # define _GL_ATTR_format _GL_GNUC_PREREQ (2, 7) + # define _GL_ATTR_leaf _GL_GNUC_PREREQ (4, 6) ++# define _GL_ATTR_malloc _GL_GNUC_PREREQ (3, 0) + # ifdef _ICC + # define _GL_ATTR_may_alias 0 + # else + # define _GL_ATTR_may_alias _GL_GNUC_PREREQ (3, 3) + # endif +-# define _GL_ATTR_malloc _GL_GNUC_PREREQ (3, 0) + # define _GL_ATTR_noinline _GL_GNUC_PREREQ (3, 1) + # define _GL_ATTR_nonnull _GL_GNUC_PREREQ (3, 3) + # define _GL_ATTR_nonstring _GL_GNUC_PREREQ (8, 0) +@@ -103,6 +103,12 @@ AC_DEFUN([gl_COMMON_BODY], [ + # define _GL_ATTR_warn_unused_result _GL_GNUC_PREREQ (3, 4) + #endif + ++#ifdef __has_c_attribute ++# define _GL_HAS_C_ATTRIBUTE(attr) __has_c_attribute (__##attr##__) ++#else ++# define _GL_HAS_C_ATTRIBUTE(attr) 0 ++#endif ++ + ]dnl There is no _GL_ATTRIBUTE_ALIGNED; use stdalign's _Alignas instead. + [ + #if _GL_HAS_ATTRIBUTE (alloc_size) +@@ -142,7 +148,20 @@ AC_DEFUN([gl_COMMON_BODY], [ + # define _GL_ATTRIBUTE_CONST + #endif + +-#if 201710L < __STDC_VERSION__ ++/* _GL_ATTRIBUTE_DEALLOC (F, I) is for functions returning pointers ++ that can be freed by passing them as the Ith argument to the ++ function F. _GL_ATTRIBUTE_DEALLOC_FREE is for functions that ++ return pointers that can be freed via 'free'; it can be used ++ only after including stdlib.h. These macros cannot be used on ++ inline functions. */ ++#if _GL_GNUC_PREREQ (11, 0) ++# define _GL_ATTRIBUTE_DEALLOC(f, i) __attribute__ ((__malloc__ (f, i))) ++#else ++# define _GL_ATTRIBUTE_DEALLOC(f, i) ++#endif ++#define _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_DEALLOC (free, 1) ++ ++#if _GL_HAS_C_ATTRIBUTE (deprecated) + # define _GL_ATTRIBUTE_DEPRECATED [[__deprecated__]] + #elif _GL_HAS_ATTRIBUTE (deprecated) + # define _GL_ATTRIBUTE_DEPRECATED __attribute__ ((__deprecated__)) +@@ -168,7 +187,7 @@ AC_DEFUN([gl_COMMON_BODY], [ + #endif + + /* FALLTHROUGH is special, because it always expands to something. */ +-#if 201710L < __STDC_VERSION__ ++#if _GL_HAS_C_ATTRIBUTE (fallthrough) + # define _GL_ATTRIBUTE_FALLTHROUGH [[__fallthrough__]] + #elif _GL_HAS_ATTRIBUTE (fallthrough) + # define _GL_ATTRIBUTE_FALLTHROUGH __attribute__ ((__fallthrough__)) +@@ -188,6 +207,12 @@ AC_DEFUN([gl_COMMON_BODY], [ + # define _GL_ATTRIBUTE_LEAF + #endif + ++#if _GL_HAS_ATTRIBUTE (malloc) ++# define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__)) ++#else ++# define _GL_ATTRIBUTE_MALLOC ++#endif ++ + /* Oracle Studio 12.6 mishandles may_alias despite __has_attribute OK. */ + #if _GL_HAS_ATTRIBUTE (may_alias) && !defined __SUNPRO_C + # define _GL_ATTRIBUTE_MAY_ALIAS __attribute__ ((__may_alias__)) +@@ -195,24 +220,15 @@ AC_DEFUN([gl_COMMON_BODY], [ + # define _GL_ATTRIBUTE_MAY_ALIAS + #endif + +-#if 201710L < __STDC_VERSION__ ++#if _GL_HAS_C_ATTRIBUTE (maybe_unused) + # define _GL_ATTRIBUTE_MAYBE_UNUSED [[__maybe_unused__]] +-#elif _GL_HAS_ATTRIBUTE (unused) +-# define _GL_ATTRIBUTE_MAYBE_UNUSED __attribute__ ((__unused__)) + #else +-# define _GL_ATTRIBUTE_MAYBE_UNUSED ++# define _GL_ATTRIBUTE_MAYBE_UNUSED _GL_ATTRIBUTE_UNUSED + #endif + /* Earlier spellings of this macro. */ +-#define _GL_UNUSED _GL_ATTRIBUTE_MAYBE_UNUSED + #define _UNUSED_PARAMETER_ _GL_ATTRIBUTE_MAYBE_UNUSED + +-#if _GL_HAS_ATTRIBUTE (malloc) +-# define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__)) +-#else +-# define _GL_ATTRIBUTE_MALLOC +-#endif +- +-#if 201710L < __STDC_VERSION__ ++#if _GL_HAS_C_ATTRIBUTE (nodiscard) + # define _GL_ATTRIBUTE_NODISCARD [[__nodiscard__]] + #elif _GL_HAS_ATTRIBUTE (warn_unused_result) + # define _GL_ATTRIBUTE_NODISCARD __attribute__ ((__warn_unused_result__)) +@@ -270,11 +286,19 @@ AC_DEFUN([gl_COMMON_BODY], [ + # define _GL_ATTRIBUTE_SENTINEL(pos) + #endif + ++#if _GL_HAS_ATTRIBUTE (unused) ++# define _GL_ATTRIBUTE_UNUSED __attribute__ ((__unused__)) ++#else ++# define _GL_ATTRIBUTE_UNUSED ++#endif ++/* Earlier spellings of this macro. */ ++#define _GL_UNUSED _GL_ATTRIBUTE_UNUSED ++ + ]dnl There is no _GL_ATTRIBUTE_VISIBILITY; see m4/visibility.m4 instead. + [ + /* To support C++ as well as C, use _GL_UNUSED_LABEL with trailing ';'. */ + #if !defined __cplusplus || _GL_GNUC_PREREQ (4, 5) +-# define _GL_UNUSED_LABEL _GL_ATTRIBUTE_MAYBE_UNUSED ++# define _GL_UNUSED_LABEL _GL_ATTRIBUTE_UNUSED + #else + # define _GL_UNUSED_LABEL + #endif +@@ -357,6 +381,16 @@ AC_DEFUN([gl_COMMON_BODY], [ + export LIBC_FATAL_STDERR_ + ]) + ++# gl_MODULE_INDICATOR_INIT_VARIABLE([variablename]) ++# gl_MODULE_INDICATOR_INIT_VARIABLE([variablename], [initialvalue]) ++# initializes the shell variable that indicates the presence of the given module ++# as a C preprocessor expression. ++AC_DEFUN([gl_MODULE_INDICATOR_INIT_VARIABLE], ++[ ++ GL_MODULE_INDICATOR_PREFIX[]_[$1]=m4_if([$2], , [0], [$2]) ++ AC_SUBST(GL_MODULE_INDICATOR_PREFIX[]_[$1]) ++]) ++ + # gl_MODULE_INDICATOR_CONDITION + # expands to a C preprocessor expression that evaluates to 1 or 0, depending + # whether a gnulib module that has been requested shall be considered present +@@ -369,9 +403,9 @@ m4_define([gl_MODULE_INDICATOR_CONDITION], [1]) + AC_DEFUN([gl_MODULE_INDICATOR_SET_VARIABLE], + [ + gl_MODULE_INDICATOR_SET_VARIABLE_AUX( +- [GNULIB_[]m4_translit([[$1]], +- [abcdefghijklmnopqrstuvwxyz./-], +- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])], ++ [GL_MODULE_INDICATOR_PREFIX[]_GNULIB_[]m4_translit([[$1]], ++ [abcdefghijklmnopqrstuvwxyz./-], ++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])], + [gl_MODULE_INDICATOR_CONDITION]) + ]) + +@@ -656,6 +690,72 @@ AC_DEFUN([gl_CACHE_VAL_SILENT], + ]) + ]) + ++# gl_CC_ALLOW_WARNINGS ++# sets and substitutes a variable GL_CFLAG_ALLOW_WARNINGS, to a $(CC) option ++# that reverts a preceding '-Werror' option, if available. ++# This is expected to be '-Wno-error' on gcc, clang (except clang/MSVC), xlclang ++# and empty otherwise. ++AC_DEFUN([gl_CC_ALLOW_WARNINGS], ++[ ++ AC_REQUIRE([AC_PROG_CC]) ++ AC_CACHE_CHECK([for C compiler option to allow warnings], ++ [gl_cv_cc_wallow], ++ [rm -f conftest* ++ echo 'int dummy;' > conftest.c ++ AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS -c conftest.c 2>conftest1.err]) >/dev/null ++ AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS -Wno-error -c conftest.c 2>conftest2.err]) >/dev/null ++ dnl Test the number of error output lines, because AIX xlc accepts the ++ dnl option '-Wno-error', just to produce a warning ++ dnl "Option -Wno-error was incorrectly specified. The option will be ignored." ++ dnl afterwards. ++ if test $? = 0 && test `wc -l < conftest1.err` = `wc -l < conftest2.err`; then ++ gl_cv_cc_wallow='-Wno-error' ++ else ++ gl_cv_cc_wallow=none ++ fi ++ rm -f conftest* ++ ]) ++ case "$gl_cv_cc_wallow" in ++ none) GL_CFLAG_ALLOW_WARNINGS='' ;; ++ *) GL_CFLAG_ALLOW_WARNINGS="$gl_cv_cc_wallow" ;; ++ esac ++ AC_SUBST([GL_CFLAG_ALLOW_WARNINGS]) ++]) ++ ++# gl_CXX_ALLOW_WARNINGS ++# sets and substitutes a variable GL_CXXFLAG_ALLOW_WARNINGS, to a $(CC) option ++# that reverts a preceding '-Werror' option, if available. ++AC_DEFUN([gl_CXX_ALLOW_WARNINGS], ++[ ++ dnl Requires AC_PROG_CXX or gl_PROG_ANSI_CXX. ++ if test -n "$CXX" && test "$CXX" != no; then ++ AC_CACHE_CHECK([for C++ compiler option to allow warnings], ++ [gl_cv_cxx_wallow], ++ [rm -f conftest* ++ echo 'int dummy;' > conftest.cc ++ AC_TRY_COMMAND([${CXX-c++} $CXXFLAGS $CPPFLAGS -c conftest.cc 2>conftest1.err]) >/dev/null ++ AC_TRY_COMMAND([${CXX-c++} $CXXFLAGS $CPPFLAGS -Wno-error -c conftest.cc 2>conftest2.err]) >/dev/null ++ dnl Test the number of error output lines, because AIX xlC accepts the ++ dnl option '-Wno-error', just to produce a warning ++ dnl "Option -Wno-error was incorrectly specified. The option will be ignored." ++ dnl afterwards. ++ if test $? = 0 && test `wc -l < conftest1.err` = `wc -l < conftest2.err`; then ++ gl_cv_cxx_wallow='-Wno-error' ++ else ++ gl_cv_cxx_wallow=none ++ fi ++ rm -f conftest* ++ ]) ++ case "$gl_cv_cxx_wallow" in ++ none) GL_CXXFLAG_ALLOW_WARNINGS='' ;; ++ *) GL_CXXFLAG_ALLOW_WARNINGS="$gl_cv_cxx_wallow" ;; ++ esac ++ else ++ GL_CXXFLAG_ALLOW_WARNINGS='' ++ fi ++ AC_SUBST([GL_CXXFLAG_ALLOW_WARNINGS]) ++]) ++ + dnl Expands to some code for use in .c programs that, on native Windows, defines + dnl the Microsoft deprecated alias function names to the underscore-prefixed + dnl actual function names. With this macro, these function names are available +diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 +index 1290d75..0ae96ea 100644 +--- a/m4/gnulib-comp.m4 ++++ b/m4/gnulib-comp.m4 +@@ -142,6 +142,7 @@ AC_DEFUN([gl_EARLY], + # Code from module langinfo: + # Code from module largefile: + AC_REQUIRE([AC_SYS_LARGEFILE]) ++ AC_REQUIRE([gl_YEAR2038_EARLY]) + # Code from module ldexp: + # Code from module lib-symbol-versions: + # Code from module lib-symbol-visibility: +@@ -281,9 +282,11 @@ AC_DEFUN([gl_INIT], + m4_pushdef([AC_LIBSOURCES], m4_defn([gl_LIBSOURCES])) + m4_pushdef([gl_LIBSOURCES_LIST], []) + m4_pushdef([gl_LIBSOURCES_DIR], []) ++ m4_pushdef([GL_MACRO_PREFIX], [gl]) ++ m4_pushdef([GL_MODULE_INDICATOR_PREFIX], [GL]) + gl_COMMON + gl_source_base='lib' +- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) ++ AC_REQUIRE([gl_SYS_SOCKET_H]) + if test "$ac_cv_header_winsock2_h" = yes; then + AC_LIBOBJ([accept]) + fi +@@ -291,9 +294,10 @@ AC_DEFUN([gl_INIT], + gl_FUNC_ACCEPT4 + gl_SYS_SOCKET_MODULE_INDICATOR([accept4]) + gl_FUNC_ALLOCA +- gl_HEADER_ARPA_INET ++ gl_ARPA_INET_H ++ gl_ARPA_INET_H_REQUIRE_DEFAULTS + AC_PROG_MKDIR_P +- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) ++ AC_REQUIRE([gl_SYS_SOCKET_H]) + if test "$ac_cv_header_winsock2_h" = yes; then + AC_LIBOBJ([bind]) + fi +@@ -317,7 +321,7 @@ AC_DEFUN([gl_INIT], + AC_LIBOBJ([close]) + fi + gl_UNISTD_MODULE_INDICATOR([close]) +- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) ++ AC_REQUIRE([gl_SYS_SOCKET_H]) + if test "$ac_cv_header_winsock2_h" = yes; then + AC_LIBOBJ([connect]) + fi +@@ -328,6 +332,7 @@ AC_DEFUN([gl_INIT], + fi + gl_MATH_MODULE_INDICATOR([copysign]) + gl_DIRENT_H ++ gl_DIRENT_H_REQUIRE_DEFAULTS + gl_FUNC_DIRFD + if test $ac_cv_func_dirfd = no && test $gl_cv_func_dirfd_macro = no \ + || test $REPLACE_DIRFD = 1; then +@@ -347,6 +352,7 @@ AC_DEFUN([gl_INIT], + gl_HEADER_ERRNO_H + AC_REQUIRE([gl_EXTERN_INLINE]) + gl_FCNTL_H ++ gl_FCNTL_H_REQUIRE_DEFAULTS + AC_C_FLEXIBLE_ARRAY_MEMBER + gl_FLOAT_H + if test $REPLACE_FLOAT_LDBL = 1; then +@@ -360,7 +366,7 @@ AC_DEFUN([gl_INIT], + AC_LIBOBJ([flock]) + gl_PREREQ_FLOCK + fi +- gl_HEADER_SYS_FILE_MODULE_INDICATOR([flock]) ++ gl_SYS_FILE_MODULE_INDICATOR([flock]) + AC_REQUIRE([gl_FUNC_FLOOR]) + if test $REPLACE_FLOOR = 1; then + AC_LIBOBJ([floor]) +@@ -409,17 +415,17 @@ AC_DEFUN([gl_INIT], + fi + gl_UNISTD_MODULE_INDICATOR([getlogin]) + AC_REQUIRE([gl_LIB_GETLOGIN]) +- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) ++ AC_REQUIRE([gl_SYS_SOCKET_H]) + if test "$ac_cv_header_winsock2_h" = yes; then + AC_LIBOBJ([getpeername]) + fi + gl_SYS_SOCKET_MODULE_INDICATOR([getpeername]) +- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) ++ AC_REQUIRE([gl_SYS_SOCKET_H]) + if test "$ac_cv_header_winsock2_h" = yes; then + AC_LIBOBJ([getsockname]) + fi + gl_SYS_SOCKET_MODULE_INDICATOR([getsockname]) +- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) ++ AC_REQUIRE([gl_SYS_SOCKET_H]) + if test "$ac_cv_header_winsock2_h" = yes; then + AC_LIBOBJ([getsockopt]) + fi +@@ -439,6 +445,7 @@ AC_DEFUN([gl_INIT], + m4_ifdef([gl_ICONV_MODULE_INDICATOR], + [gl_ICONV_MODULE_INDICATOR([iconv])]) + gl_ICONV_H ++ gl_ICONV_H_REQUIRE_DEFAULTS + gl_FUNC_ICONV_OPEN + if test $REPLACE_ICONV_OPEN = 1; then + AC_LIBOBJ([iconv_open]) +@@ -461,6 +468,7 @@ AC_DEFUN([gl_INIT], + fi + gl_ARPA_INET_MODULE_INDICATOR([inet_pton]) + gl_INTTYPES_INCOMPLETE ++ gl_INTTYPES_H_REQUIRE_DEFAULTS + gl_ISFINITE + if test $REPLACE_ISFINITE = 1; then + AC_LIBOBJ([isfinite]) +@@ -501,6 +509,7 @@ AC_DEFUN([gl_INIT], + fi + gl_MATH_MODULE_INDICATOR([isnanl]) + gl_LANGINFO_H ++ gl_LANGINFO_H_REQUIRE_DEFAULTS + AC_REQUIRE([gl_LARGEFILE]) + gl_FUNC_LDEXP + gl_LD_VERSION_SCRIPT +@@ -512,7 +521,7 @@ AC_DEFUN([gl_INIT], + AC_LIBOBJ([link]) + fi + gl_UNISTD_MODULE_INDICATOR([link]) +- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) ++ AC_REQUIRE([gl_SYS_SOCKET_H]) + if test "$ac_cv_header_winsock2_h" = yes; then + AC_LIBOBJ([listen]) + fi +@@ -522,6 +531,7 @@ AC_DEFUN([gl_INIT], + LOCALCHARSET_TESTS_ENVIRONMENT= + AC_SUBST([LOCALCHARSET_TESTS_ENVIRONMENT]) + gl_LOCALE_H ++ gl_LOCALE_H_REQUIRE_DEFAULTS + gl_FUNC_LOG1P + if test $HAVE_LOG1P = 0 || test $REPLACE_LOG1P = 1; then + AC_LIBOBJ([log1p]) +@@ -541,15 +551,14 @@ AC_DEFUN([gl_INIT], + if test $REPLACE_MALLOC = 1; then + AC_LIBOBJ([malloc]) + fi +- gl_MODULE_INDICATOR([malloc-gnu]) +- gl_FUNC_MALLOC_POSIX ++ AC_REQUIRE([gl_FUNC_MALLOC_POSIX]) + if test $REPLACE_MALLOC = 1; then + AC_LIBOBJ([malloc]) + fi + gl_STDLIB_MODULE_INDICATOR([malloc-posix]) +- gl_MODULE_INDICATOR([malloc-posix]) + gl_MALLOCA + gl_MATH_H ++ gl_MATH_H_REQUIRE_DEFAULTS + gl_MINMAX + gl_FUNC_MKDIR + if test $REPLACE_MKDIR = 1; then +@@ -573,7 +582,8 @@ AC_DEFUN([gl_INIT], + fi + gl_MODULE_INDICATOR([msvc-nothrow]) + gl_MULTIARCH +- gl_HEADER_NETDB ++ gl_NETDB_H ++ gl_NETDB_H_REQUIRE_DEFAULTS + gl_HEADER_NETINET_IN + AC_PROG_MKDIR_P + gl_FUNC_NL_LANGINFO +@@ -607,6 +617,7 @@ AC_DEFUN([gl_INIT], + fi + gl_POLL_MODULE_INDICATOR([poll]) + gl_POLL_H ++ gl_POLL_H_REQUIRE_DEFAULTS + gl_FUNC_PUTENV + if test $REPLACE_PUTENV = 1; then + AC_LIBOBJ([putenv]) +@@ -625,12 +636,12 @@ AC_DEFUN([gl_INIT], + gl_PREREQ_READLINK + fi + gl_UNISTD_MODULE_INDICATOR([readlink]) +- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) ++ AC_REQUIRE([gl_SYS_SOCKET_H]) + if test "$ac_cv_header_winsock2_h" = yes; then + AC_LIBOBJ([recv]) + fi + gl_SYS_SOCKET_MODULE_INDICATOR([recv]) +- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) ++ AC_REQUIRE([gl_SYS_SOCKET_H]) + if test "$ac_cv_header_winsock2_h" = yes; then + AC_LIBOBJ([recvfrom]) + fi +@@ -657,12 +668,12 @@ AC_DEFUN([gl_INIT], + AC_LIBOBJ([select]) + fi + gl_SYS_SELECT_MODULE_INDICATOR([select]) +- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) ++ AC_REQUIRE([gl_SYS_SOCKET_H]) + if test "$ac_cv_header_winsock2_h" = yes; then + AC_LIBOBJ([send]) + fi + gl_SYS_SOCKET_MODULE_INDICATOR([send]) +- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) ++ AC_REQUIRE([gl_SYS_SOCKET_H]) + if test "$ac_cv_header_winsock2_h" = yes; then + AC_LIBOBJ([sendto]) + fi +@@ -672,25 +683,26 @@ AC_DEFUN([gl_INIT], + AC_LIBOBJ([setenv]) + fi + gl_STDLIB_MODULE_INDICATOR([setenv]) +- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) ++ AC_REQUIRE([gl_SYS_SOCKET_H]) + if test "$ac_cv_header_winsock2_h" = yes; then + AC_LIBOBJ([setsockopt]) + fi + gl_SYS_SOCKET_MODULE_INDICATOR([setsockopt]) +- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) ++ AC_REQUIRE([gl_SYS_SOCKET_H]) + if test "$ac_cv_header_winsock2_h" = yes; then + AC_LIBOBJ([shutdown]) + fi + gl_SYS_SOCKET_MODULE_INDICATOR([shutdown]) + gl_SIGNAL_H +- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) ++ gl_SIGNAL_H_REQUIRE_DEFAULTS ++ AC_REQUIRE([gl_SYS_SOCKET_H]) + if test "$ac_cv_header_winsock2_h" = yes; then + AC_LIBOBJ([socket]) + fi + # When this module is used, sockets may actually occur as file descriptors, + # hence it is worth warning if the modules 'close' and 'ioctl' are not used. +- m4_ifdef([gl_UNISTD_H_DEFAULTS], [AC_REQUIRE([gl_UNISTD_H_DEFAULTS])]) +- m4_ifdef([gl_SYS_IOCTL_H_DEFAULTS], [AC_REQUIRE([gl_SYS_IOCTL_H_DEFAULTS])]) ++ m4_ifdef([gl_UNISTD_H_DEFAULTS], [gl_UNISTD_H_REQUIRE_DEFAULTS]) ++ m4_ifdef([gl_SYS_IOCTL_H_DEFAULTS], [gl_SYS_IOCTL_H_REQUIRE_DEFAULTS]) + AC_REQUIRE([gl_PREREQ_SYS_H_WINSOCK2]) + if test "$ac_cv_header_winsock2_h" = yes; then + UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS=1 +@@ -705,31 +717,67 @@ AC_DEFUN([gl_INIT], + gl_STDALIGN_H + AM_STDBOOL_H + gl_STDDEF_H ++ gl_STDDEF_H_REQUIRE_DEFAULTS + gl_STDINT_H + gl_STDIO_H ++ gl_STDIO_H_REQUIRE_DEFAULTS ++ dnl No need to create extra modules for these functions. Everyone who uses ++ dnl likely needs them. ++ gl_STDIO_MODULE_INDICATOR([fscanf]) ++ gl_MODULE_INDICATOR([fscanf]) ++ gl_STDIO_MODULE_INDICATOR([scanf]) ++ gl_MODULE_INDICATOR([scanf]) ++ gl_STDIO_MODULE_INDICATOR([fgetc]) ++ gl_STDIO_MODULE_INDICATOR([getc]) ++ gl_STDIO_MODULE_INDICATOR([getchar]) ++ gl_STDIO_MODULE_INDICATOR([fgets]) ++ gl_STDIO_MODULE_INDICATOR([fread]) ++ dnl No need to create extra modules for these functions. Everyone who uses ++ dnl likely needs them. ++ gl_STDIO_MODULE_INDICATOR([fprintf]) ++ gl_STDIO_MODULE_INDICATOR([printf]) ++ gl_STDIO_MODULE_INDICATOR([vfprintf]) ++ gl_STDIO_MODULE_INDICATOR([vprintf]) ++ gl_STDIO_MODULE_INDICATOR([fputc]) ++ gl_STDIO_MODULE_INDICATOR([putc]) ++ gl_STDIO_MODULE_INDICATOR([putchar]) ++ gl_STDIO_MODULE_INDICATOR([fputs]) ++ gl_STDIO_MODULE_INDICATOR([puts]) ++ gl_STDIO_MODULE_INDICATOR([fwrite]) + gl_STDLIB_H ++ gl_STDLIB_H_REQUIRE_DEFAULTS + if test $gl_cond_libtool = false; then + gl_ltlibdeps="$gl_ltlibdeps $LTLIBICONV" + gl_libdeps="$gl_libdeps $LIBICONV" + fi +- gl_HEADER_STRING_H +- gl_HEADER_SYS_FILE_H ++ gl_STRING_H ++ gl_STRING_H_REQUIRE_DEFAULTS ++ gl_SYS_FILE_H ++ gl_SYS_FILE_H_REQUIRE_DEFAULTS + AC_PROG_MKDIR_P +- AC_REQUIRE([gl_HEADER_SYS_SELECT]) ++ gl_SYS_SELECT_H ++ gl_SYS_SELECT_H_REQUIRE_DEFAULTS + AC_PROG_MKDIR_P +- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) ++ gl_SYS_SOCKET_H ++ gl_SYS_SOCKET_H_REQUIRE_DEFAULTS + AC_PROG_MKDIR_P +- gl_HEADER_SYS_STAT_H ++ gl_SYS_STAT_H ++ gl_SYS_STAT_H_REQUIRE_DEFAULTS + AC_PROG_MKDIR_P +- gl_HEADER_SYS_TIME_H ++ gl_SYS_TIME_H ++ gl_SYS_TIME_H_REQUIRE_DEFAULTS + AC_PROG_MKDIR_P + gl_SYS_TIMES_H ++ gl_SYS_TIMES_H_REQUIRE_DEFAULTS + AC_PROG_MKDIR_P + gl_SYS_TYPES_H ++ gl_SYS_TYPES_H_REQUIRE_DEFAULTS + AC_PROG_MKDIR_P +- gl_HEADER_SYS_UIO ++ gl_SYS_UIO_H ++ gl_SYS_UIO_H_REQUIRE_DEFAULTS + AC_PROG_MKDIR_P +- gl_HEADER_TIME_H ++ gl_TIME_H ++ gl_TIME_H_REQUIRE_DEFAULTS + gl_TIME_RZ + if test $HAVE_TIMEZONE_T = 0; then + AC_LIBOBJ([time_rz]) +@@ -746,9 +794,11 @@ AC_DEFUN([gl_INIT], + fi + gl_MATH_MODULE_INDICATOR([trunc]) + gl_UNISTD_H ++ gl_UNISTD_H_REQUIRE_DEFAULTS + gl_FUNC_VSNPRINTF + gl_STDIO_MODULE_INDICATOR([vsnprintf]) + gl_WCHAR_H ++ gl_WCHAR_H_REQUIRE_DEFAULTS + gl_FUNC_WRITE + if test $REPLACE_WRITE = 1; then + AC_LIBOBJ([write]) +@@ -771,7 +821,6 @@ AC_DEFUN([gl_INIT], + gl_gnulib_enabled_be453cec5eecf5731a274f2de7f2db36=false + gl_gnulib_enabled_30838f5439487421042f2225bed3af76=false + gl_gnulib_enabled_hostent=false +- gl_gnulib_enabled_idx=false + gl_gnulib_enabled_b1df7117b479d2da59d76deba468ee21=false + gl_gnulib_enabled_3f0e593033d1fc2c127581960f641b66=false + gl_gnulib_enabled_dbdf22868a5367f28bf18e0013ac6f8f=false +@@ -880,7 +929,9 @@ AC_SUBST([LTALLOCA]) + func_gl_gnulib_m4code_dynarray () + { + if ! $gl_gnulib_enabled_dynarray; then ++ AC_PROG_MKDIR_P + gl_gnulib_enabled_dynarray=true ++ func_gl_gnulib_m4code_37f71b604aa9c54446783d80f42fe547 + func_gl_gnulib_m4code_21ee726a3540c09237a8e70c0baf7467 + fi + } +@@ -963,12 +1014,6 @@ AC_SUBST([LTALLOCA]) + gl_gnulib_enabled_hostent=true + fi + } +- func_gl_gnulib_m4code_idx () +- { +- if ! $gl_gnulib_enabled_idx; then +- gl_gnulib_enabled_idx=true +- fi +- } + func_gl_gnulib_m4code_b1df7117b479d2da59d76deba468ee21 () + { + if ! $gl_gnulib_enabled_b1df7117b479d2da59d76deba468ee21; then +@@ -1181,7 +1226,6 @@ AC_SUBST([LTALLOCA]) + AC_LIBOBJ([realloc]) + fi + gl_STDLIB_MODULE_INDICATOR([realloc-posix]) +- gl_MODULE_INDICATOR([realloc-posix]) + gl_gnulib_enabled_61bcaca76b3e6f9ae55d57a1c3193bc4=true + fi + } +@@ -1205,7 +1249,9 @@ AC_SUBST([LTALLOCA]) + func_gl_gnulib_m4code_scratch_buffer () + { + if ! $gl_gnulib_enabled_scratch_buffer; then ++ AC_PROG_MKDIR_P + gl_gnulib_enabled_scratch_buffer=true ++ func_gl_gnulib_m4code_37f71b604aa9c54446783d80f42fe547 + func_gl_gnulib_m4code_21ee726a3540c09237a8e70c0baf7467 + func_gl_gnulib_m4code_61bcaca76b3e6f9ae55d57a1c3193bc4 + fi +@@ -1319,7 +1365,8 @@ AC_SUBST([LTALLOCA]) + func_gl_gnulib_m4code_sys_random () + { + if ! $gl_gnulib_enabled_sys_random; then +- gl_HEADER_SYS_RANDOM ++ gl_SYS_RANDOM_H ++ gl_SYS_RANDOM_H_REQUIRE_DEFAULTS + AC_PROG_MKDIR_P + gl_gnulib_enabled_sys_random=true + fi +@@ -1416,6 +1463,7 @@ AC_SUBST([LTALLOCA]) + { + if ! $gl_gnulib_enabled_3dcce957eadc896e63ab5f137947b410; then + gl_WCTYPE_H ++ gl_WCTYPE_H_REQUIRE_DEFAULTS + gl_gnulib_enabled_3dcce957eadc896e63ab5f137947b410=true + fi + } +@@ -1431,9 +1479,6 @@ AC_SUBST([LTALLOCA]) + func_gl_gnulib_m4code_925677f0343de64b89a9f0c790b4104c + fi + if test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1; then +- func_gl_gnulib_m4code_idx +- fi +- if test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1; then + func_gl_gnulib_m4code_21ee726a3540c09237a8e70c0baf7467 + fi + if test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1; then +@@ -1584,9 +1629,6 @@ AC_SUBST([LTALLOCA]) + func_gl_gnulib_m4code_sockets + fi + if test $HAVE_TIMEZONE_T = 0; then +- func_gl_gnulib_m4code_idx +- fi +- if test $HAVE_TIMEZONE_T = 0; then + func_gl_gnulib_m4code_time_r + fi + if test $HAVE_TIMEZONE_T = 0; then +@@ -1621,7 +1663,6 @@ AC_SUBST([LTALLOCA]) + AM_CONDITIONAL([gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36], [$gl_gnulib_enabled_be453cec5eecf5731a274f2de7f2db36]) + AM_CONDITIONAL([gl_GNULIB_ENABLED_30838f5439487421042f2225bed3af76], [$gl_gnulib_enabled_30838f5439487421042f2225bed3af76]) + AM_CONDITIONAL([gl_GNULIB_ENABLED_hostent], [$gl_gnulib_enabled_hostent]) +- AM_CONDITIONAL([gl_GNULIB_ENABLED_idx], [$gl_gnulib_enabled_idx]) + AM_CONDITIONAL([gl_GNULIB_ENABLED_b1df7117b479d2da59d76deba468ee21], [$gl_gnulib_enabled_b1df7117b479d2da59d76deba468ee21]) + AM_CONDITIONAL([gl_GNULIB_ENABLED_3f0e593033d1fc2c127581960f641b66], [$gl_gnulib_enabled_3f0e593033d1fc2c127581960f641b66]) + AM_CONDITIONAL([gl_GNULIB_ENABLED_dbdf22868a5367f28bf18e0013ac6f8f], [$gl_gnulib_enabled_dbdf22868a5367f28bf18e0013ac6f8f]) +@@ -1673,6 +1714,8 @@ AC_SUBST([LTALLOCA]) + m4_if(m4_sysval, [0], [], + [AC_FATAL([expected source file, required through AC_LIBSOURCES, not found])]) + ]) ++ m4_popdef([GL_MODULE_INDICATOR_PREFIX]) ++ m4_popdef([GL_MACRO_PREFIX]) + m4_popdef([gl_LIBSOURCES_DIR]) + m4_popdef([gl_LIBSOURCES_LIST]) + m4_popdef([AC_LIBSOURCES]) +@@ -1699,6 +1742,8 @@ AC_SUBST([LTALLOCA]) + m4_pushdef([AC_LIBSOURCES], m4_defn([gltests_LIBSOURCES])) + m4_pushdef([gltests_LIBSOURCES_LIST], []) + m4_pushdef([gltests_LIBSOURCES_DIR], []) ++ m4_pushdef([GL_MACRO_PREFIX], [gltests]) ++ m4_pushdef([GL_MODULE_INDICATOR_PREFIX], [GL]) + gl_COMMON + gl_source_base='tests' + changequote(,)dnl +@@ -1720,6 +1765,8 @@ changequote([, ])dnl + m4_if(m4_sysval, [0], [], + [AC_FATAL([expected source file, required through AC_LIBSOURCES, not found])]) + ]) ++ m4_popdef([GL_MODULE_INDICATOR_PREFIX]) ++ m4_popdef([GL_MACRO_PREFIX]) + m4_popdef([gltests_LIBSOURCES_DIR]) + m4_popdef([gltests_LIBSOURCES_LIST]) + m4_popdef([AC_LIBSOURCES]) +@@ -2265,6 +2312,7 @@ AC_DEFUN([gl_FILE_LIST], [ + m4/wint_t.m4 + m4/write.m4 + m4/xsize.m4 ++ m4/year2038.m4 + m4/zzgnulib.m4 + top/GNUmakefile + top/maint.mk +diff --git a/m4/hostent.m4 b/m4/hostent.m4 +index 641d72f..f1390a3 100644 +--- a/m4/hostent.m4 ++++ b/m4/hostent.m4 +@@ -1,4 +1,4 @@ +-# hostent.m4 serial 3 ++# hostent.m4 serial 4 + dnl Copyright (C) 2008, 2010-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -13,7 +13,7 @@ AC_DEFUN([gl_HOSTENT], + dnl - On BeOS, they are in libnet. + dnl - On native Windows, they are in ws2_32.dll. + dnl - Otherwise they are in libc. +- AC_REQUIRE([gl_HEADER_SYS_SOCKET])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H ++ AC_REQUIRE([gl_SYS_SOCKET_H])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H + HOSTENT_LIB= + gl_saved_libs="$LIBS" + AC_SEARCH_LIBS([gethostbyname], [nsl network net], +diff --git a/m4/iconv_h.m4 b/m4/iconv_h.m4 +index ab8e283..2940988 100644 +--- a/m4/iconv_h.m4 ++++ b/m4/iconv_h.m4 +@@ -1,10 +1,10 @@ +-# iconv_h.m4 serial 12 ++# iconv_h.m4 serial 15 + dnl Copyright (C) 2007-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. + +-AC_DEFUN([gl_ICONV_H], ++AC_DEFUN_ONCE([gl_ICONV_H], + [ + AC_REQUIRE([gl_ICONV_H_DEFAULTS]) + +@@ -24,22 +24,37 @@ AC_DEFUN([gl_ICONV_H], + dnl Unconditionally enables the replacement of . + AC_DEFUN([gl_REPLACE_ICONV_H], + [ +- AC_REQUIRE([gl_ICONV_H_DEFAULTS]) ++ gl_ICONV_H_REQUIRE_DEFAULTS + ICONV_H='iconv.h' + AM_CONDITIONAL([GL_GENERATE_ICONV_H], [test -n "$ICONV_H"]) + ]) + ++# gl_ICONV_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_ICONV_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_ICONV_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_ICONV_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_ICONV_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_ICONV_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ICONV]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_ICONV_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_ICONV_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_ICONV_H_DEFAULTS], + [ + m4_ifdef([gl_ANSI_CXX], [AC_REQUIRE([gl_ANSI_CXX])]) +- GNULIB_ICONV=0; AC_SUBST([GNULIB_ICONV]) + dnl Assume proper GNU behavior unless another module says otherwise. + ICONV_CONST=; AC_SUBST([ICONV_CONST]) + REPLACE_ICONV=0; AC_SUBST([REPLACE_ICONV]) +diff --git a/m4/inttypes.m4 b/m4/inttypes.m4 +index f56e94a..64b1de5 100644 +--- a/m4/inttypes.m4 ++++ b/m4/inttypes.m4 +@@ -1,4 +1,4 @@ +-# inttypes.m4 serial 32 ++# inttypes.m4 serial 35 + dnl Copyright (C) 2006-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is preserved. + dnl From Derek Price, Bruno Haible. + dnl Test whether is supported or must be substituted. + +-AC_DEFUN([gl_INTTYPES_H], ++AC_DEFUN_ONCE([gl_INTTYPES_H], + [ + AC_REQUIRE([gl_INTTYPES_INCOMPLETE]) + gl_INTTYPES_PRI_SCN +@@ -136,19 +136,34 @@ AC_DEFUN([gl_INTTYPES_CHECK_LONG_LONG_INT_CONDITION], + AC_SUBST([$1]) + ]) + ++# gl_INTTYPES_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_INTTYPES_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_INTTYPES_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_INTTYPES_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_INTTYPES_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_INTTYPES_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_IMAXABS]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_IMAXDIV]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOIMAX]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOUMAX]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_INTTYPES_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_INTTYPES_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_INTTYPES_H_DEFAULTS], + [ +- GNULIB_IMAXABS=0; AC_SUBST([GNULIB_IMAXABS]) +- GNULIB_IMAXDIV=0; AC_SUBST([GNULIB_IMAXDIV]) +- GNULIB_STRTOIMAX=0; AC_SUBST([GNULIB_STRTOIMAX]) +- GNULIB_STRTOUMAX=0; AC_SUBST([GNULIB_STRTOUMAX]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_DECL_IMAXABS=1; AC_SUBST([HAVE_DECL_IMAXABS]) + HAVE_DECL_IMAXDIV=1; AC_SUBST([HAVE_DECL_IMAXDIV]) +diff --git a/m4/langinfo_h.m4 b/m4/langinfo_h.m4 +index 950fe20..87959f7 100644 +--- a/m4/langinfo_h.m4 ++++ b/m4/langinfo_h.m4 +@@ -1,10 +1,10 @@ +-# langinfo_h.m4 serial 9 ++# langinfo_h.m4 serial 12 + dnl Copyright (C) 2009-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. + +-AC_DEFUN([gl_LANGINFO_H], ++AC_DEFUN_ONCE([gl_LANGINFO_H], + [ + AC_REQUIRE([gl_LANGINFO_H_DEFAULTS]) + +@@ -104,18 +104,33 @@ int a = YESEXPR; + ]], [nl_langinfo]) + ]) + ++# gl_LANGINFO_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_LANGINFO_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_LANGINFO_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_LANGINFO_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_LANGINFO_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_LANGINFO_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_NL_LANGINFO]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_LANGINFO_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_LANGINFO_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_LANGINFO_H_DEFAULTS], + [ +- GNULIB_NL_LANGINFO=0; AC_SUBST([GNULIB_NL_LANGINFO]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_NL_LANGINFO=1; AC_SUBST([HAVE_NL_LANGINFO]) + REPLACE_NL_LANGINFO=0; AC_SUBST([REPLACE_NL_LANGINFO]) +diff --git a/m4/largefile.m4 b/m4/largefile.m4 +index cadb16d..fbde5e6 100644 +--- a/m4/largefile.m4 ++++ b/m4/largefile.m4 +@@ -22,7 +22,8 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE], + esac + ]) + +-# The following implementation works around a problem in autoconf <= 2.69; ++# Work around a problem in Autoconf through at least 2.71 on glibc 2.34+ ++# with _TIME_BITS. Also, work around a problem in autoconf <= 2.69: + # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5, + # or configures them incorrectly in some cases. + m4_version_prereq([2.70], [], [ +@@ -40,6 +41,7 @@ m4_define([_AC_SYS_LARGEFILE_TEST_INCLUDES], + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]];[]dnl + ]) ++])# m4_version_prereq 2.70 + + + # _AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE, +@@ -54,7 +56,8 @@ m4_define([_AC_SYS_LARGEFILE_MACRO_VALUE], + [AC_LANG_PROGRAM([$5], [$6])], + [$3=no; break]) + m4_ifval([$6], [AC_LINK_IFELSE], [AC_COMPILE_IFELSE])( +- [AC_LANG_PROGRAM([#define $1 $2 ++ [AC_LANG_PROGRAM([#undef $1 ++#define $1 $2 + $5], [$6])], + [$3=$2; break]) + $3=unknown +@@ -80,9 +83,8 @@ rm -rf conftest*[]dnl + AC_DEFUN([AC_SYS_LARGEFILE], + [AC_ARG_ENABLE(largefile, + [ --disable-largefile omit support for large files]) +-if test "$enable_largefile" != no; then +- +- AC_CACHE_CHECK([for special C compiler options needed for large files], ++AS_IF([test "$enable_largefile" != no], ++ [AC_CACHE_CHECK([for special C compiler options needed for large files], + ac_cv_sys_largefile_CC, + [ac_cv_sys_largefile_CC=no + if test "$GCC" != yes; then +@@ -107,15 +109,15 @@ if test "$enable_largefile" != no; then + ac_cv_sys_file_offset_bits, + [Number of bits in a file offset, on hosts where this is settable.], + [_AC_SYS_LARGEFILE_TEST_INCLUDES]) +- if test $ac_cv_sys_file_offset_bits = unknown; then +- _AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES, 1, +- ac_cv_sys_large_files, +- [Define for large files, on AIX-style hosts.], +- [_AC_SYS_LARGEFILE_TEST_INCLUDES]) +- fi +-fi ++ AS_CASE([$ac_cv_sys_file_offset_bits], ++ [unknown], ++ [_AC_SYS_LARGEFILE_MACRO_VALUE([_LARGE_FILES], [1], ++ [ac_cv_sys_large_files], ++ [Define for large files, on AIX-style hosts.], ++ [_AC_SYS_LARGEFILE_TEST_INCLUDES])], ++ [64], ++ [gl_YEAR2038_BODY([])])]) + ])# AC_SYS_LARGEFILE +-])# m4_version_prereq 2.70 + + # Enable large files on systems where this is implemented by Gnulib, not by the + # system headers. +diff --git a/m4/limits-h.m4 b/m4/limits-h.m4 +index 70dbb7d..00c9fe9 100644 +--- a/m4/limits-h.m4 ++++ b/m4/limits-h.m4 +@@ -11,7 +11,7 @@ AC_DEFUN_ONCE([gl_LIMITS_H], + [ + gl_CHECK_NEXT_HEADERS([limits.h]) + +- AC_CACHE_CHECK([whether limits.h has LLONG_MAX, WORD_BIT, ULLONG_WIDTH etc.], ++ AC_CACHE_CHECK([whether limits.h has WORD_BIT, BOOL_WIDTH etc.], + [gl_cv_header_limits_width], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( +@@ -22,6 +22,7 @@ AC_DEFUN_ONCE([gl_LIMITS_H], + long long llm = LLONG_MAX; + int wb = WORD_BIT; + int ullw = ULLONG_WIDTH; ++ int bw = BOOL_WIDTH; + ]])], + [gl_cv_header_limits_width=yes], + [gl_cv_header_limits_width=no])]) +diff --git a/m4/locale_h.m4 b/m4/locale_h.m4 +index 7b50aa7..444a381 100644 +--- a/m4/locale_h.m4 ++++ b/m4/locale_h.m4 +@@ -1,13 +1,13 @@ +-# locale_h.m4 serial 25 ++# locale_h.m4 serial 28 + dnl Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. + +-AC_DEFUN([gl_LOCALE_H], ++AC_DEFUN_ONCE([gl_LOCALE_H], + [ +- dnl Use AC_REQUIRE here, so that the default behavior below is expanded +- dnl once only, before all statements that occur in other macros. ++ dnl Ensure to expand the default settings once only, before all statements ++ dnl that occur in other macros. + AC_REQUIRE([gl_LOCALE_H_DEFAULTS]) + + dnl Persuade glibc to define locale_t and the int_p_*, int_n_* +@@ -129,22 +129,37 @@ AC_DEFUN([gl_LOCALE_T], + AC_SUBST([HAVE_XLOCALE_H]) + ]) + ++# gl_LOCALE_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_LOCALE_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_LOCALE_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_LOCALE_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_LOCALE_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_LOCALE_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOCALECONV]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETLOCALE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETLOCALE_NULL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DUPLOCALE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOCALENAME]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_LOCALE_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_LOCALE_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_LOCALE_H_DEFAULTS], + [ +- GNULIB_LOCALECONV=0; AC_SUBST([GNULIB_LOCALECONV]) +- GNULIB_SETLOCALE=0; AC_SUBST([GNULIB_SETLOCALE]) +- GNULIB_SETLOCALE_NULL=0; AC_SUBST([GNULIB_SETLOCALE_NULL]) +- GNULIB_DUPLOCALE=0; AC_SUBST([GNULIB_DUPLOCALE]) +- GNULIB_LOCALENAME=0; AC_SUBST([GNULIB_LOCALENAME]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_NEWLOCALE=1; AC_SUBST([HAVE_NEWLOCALE]) + HAVE_DUPLOCALE=1; AC_SUBST([HAVE_DUPLOCALE]) +diff --git a/m4/malloc.m4 b/m4/malloc.m4 +index 32ab42e..972e808 100644 +--- a/m4/malloc.m4 ++++ b/m4/malloc.m4 +@@ -1,21 +1,21 @@ +-# malloc.m4 serial 22 ++# malloc.m4 serial 27 + dnl Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. + + # This is adapted with modifications from upstream Autoconf here: +-# https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=04be2b7a29d65d9a08e64e8e56e594c91749598c ++# https://git.savannah.gnu.org/cgit/autoconf.git/tree/lib/autoconf/functions.m4?id=v2.70#n949 + AC_DEFUN([_AC_FUNC_MALLOC_IF], + [ + AC_REQUIRE([AC_CANONICAL_HOST])dnl for cross-compiles +- AC_CACHE_CHECK([for GNU libc compatible malloc], ++ AC_CACHE_CHECK([whether malloc (0) returns nonnull], + [ac_cv_func_malloc_0_nonnull], + [AC_RUN_IFELSE( + [AC_LANG_PROGRAM( + [[#include + ]], +- [[char *p = malloc (0); ++ [[void *p = malloc (0); + int result = !p; + free (p); + return result;]]) +@@ -24,75 +24,151 @@ AC_DEFUN([_AC_FUNC_MALLOC_IF], + [ac_cv_func_malloc_0_nonnull=no], + [case "$host_os" in + # Guess yes on platforms where we know the result. +- *-gnu* | gnu* | *-musl* | freebsd* | midnightbsd* | netbsd* | openbsd* \ +- | hpux* | solaris* | cygwin* | mingw*) ++ *-gnu* | freebsd* | netbsd* | openbsd* | bitrig* \ ++ | gnu* | *-musl* | midnightbsd* \ ++ | hpux* | solaris* | cygwin* | mingw* | msys* ) + ac_cv_func_malloc_0_nonnull="guessing yes" ;; + # If we don't know, obey --enable-cross-guesses. + *) ac_cv_func_malloc_0_nonnull="$gl_cross_guess_normal" ;; + esac + ]) + ]) +- case "$ac_cv_func_malloc_0_nonnull" in +- *yes) +- $1 +- ;; +- *) +- $2 +- ;; +- esac ++ AS_CASE([$ac_cv_func_malloc_0_nonnull], [*yes], [$1], [$2]) + ])# _AC_FUNC_MALLOC_IF + + # gl_FUNC_MALLOC_GNU + # ------------------ +-# Test whether 'malloc (0)' is handled like in GNU libc, and replace malloc if +-# it is not. ++# Replace malloc if it is not compatible with GNU libc. + AC_DEFUN([gl_FUNC_MALLOC_GNU], + [ + AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) +- dnl _AC_FUNC_MALLOC_IF is defined in Autoconf. +- _AC_FUNC_MALLOC_IF( +- [AC_DEFINE([HAVE_MALLOC_GNU], [1], +- [Define to 1 if your system has a GNU libc compatible 'malloc' +- function, and to 0 otherwise.])], +- [AC_DEFINE([HAVE_MALLOC_GNU], [0]) +- REPLACE_MALLOC=1 ++ AC_REQUIRE([gl_FUNC_MALLOC_POSIX]) ++ if test $REPLACE_MALLOC = 0; then ++ _AC_FUNC_MALLOC_IF([], [REPLACE_MALLOC=1]) ++ fi ++]) ++ ++# gl_FUNC_MALLOC_PTRDIFF ++# ---------------------- ++# Test whether malloc (N) reliably fails when N exceeds PTRDIFF_MAX, ++# and replace malloc otherwise. ++AC_DEFUN([gl_FUNC_MALLOC_PTRDIFF], ++[ ++ AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) ++ AC_REQUIRE([gl_CHECK_MALLOC_PTRDIFF]) ++ test "$gl_cv_malloc_ptrdiff" = yes || REPLACE_MALLOC=1 ++]) ++ ++# Test whether malloc, realloc, calloc refuse to create objects ++# larger than what can be expressed in ptrdiff_t. ++# Set gl_cv_func_malloc_gnu to yes or no accordingly. ++AC_DEFUN([gl_CHECK_MALLOC_PTRDIFF], ++[ ++ AC_CACHE_CHECK([whether malloc is ptrdiff_t safe], ++ [gl_cv_malloc_ptrdiff], ++ [AC_COMPILE_IFELSE( ++ [AC_LANG_PROGRAM( ++ [[#include ++ ]], ++ [[/* 64-bit ptrdiff_t is so wide that no practical platform ++ can exceed it. */ ++ #define WIDE_PTRDIFF (PTRDIFF_MAX >> 31 >> 31 != 0) ++ ++ /* On rare machines where size_t fits in ptrdiff_t there ++ is no problem. */ ++ #define NARROW_SIZE (SIZE_MAX <= PTRDIFF_MAX) ++ ++ /* glibc 2.30 and later malloc refuses to exceed ptrdiff_t ++ bounds even on 32-bit platforms. We don't know which ++ non-glibc systems are safe. */ ++ #define KNOWN_SAFE (2 < __GLIBC__ + (30 <= __GLIBC_MINOR__)) ++ ++ #if WIDE_PTRDIFF || NARROW_SIZE || KNOWN_SAFE ++ return 0; ++ #else ++ #error "malloc might not be ptrdiff_t safe" ++ syntax error ++ #endif ++ ]])], ++ [gl_cv_malloc_ptrdiff=yes], ++ [gl_cv_malloc_ptrdiff=no]) + ]) + ]) + + # gl_FUNC_MALLOC_POSIX + # -------------------- + # Test whether 'malloc' is POSIX compliant (sets errno to ENOMEM when it +-# fails), and replace malloc if it is not. ++# fails, and doesn't mess up with ptrdiff_t overflow), and replace ++# malloc if it is not. + AC_DEFUN([gl_FUNC_MALLOC_POSIX], + [ + AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) ++ AC_REQUIRE([gl_FUNC_MALLOC_PTRDIFF]) + AC_REQUIRE([gl_CHECK_MALLOC_POSIX]) +- if test $gl_cv_func_malloc_posix = yes; then ++ if test "$gl_cv_func_malloc_posix" = yes; then + AC_DEFINE([HAVE_MALLOC_POSIX], [1], +- [Define if the 'malloc' function is POSIX compliant.]) ++ [Define if malloc, realloc, and calloc set errno on allocation failure.]) + else + REPLACE_MALLOC=1 + fi + ]) + +-# Test whether malloc, realloc, calloc are POSIX compliant, ++# Test whether malloc, realloc, calloc set errno to ENOMEM on failure. + # Set gl_cv_func_malloc_posix to yes or no accordingly. + AC_DEFUN([gl_CHECK_MALLOC_POSIX], + [ +- AC_CACHE_CHECK([whether malloc, realloc, calloc are POSIX compliant], ++ AC_REQUIRE([AC_CANONICAL_HOST]) ++ AC_CACHE_CHECK([whether malloc, realloc, calloc set errno on failure], + [gl_cv_func_malloc_posix], + [ + dnl It is too dangerous to try to allocate a large amount of memory: + dnl some systems go to their knees when you do that. So assume that +- dnl all Unix implementations of the function are POSIX compliant. +- AC_COMPILE_IFELSE( +- [AC_LANG_PROGRAM( +- [[]], +- [[#if defined _WIN32 && ! defined __CYGWIN__ +- choke me +- #endif +- ]])], +- [gl_cv_func_malloc_posix=yes], +- [gl_cv_func_malloc_posix=no]) ++ dnl all Unix implementations of the function set errno on failure, ++ dnl except on those platforms where we have seen 'test-malloc-gnu', ++ dnl 'test-realloc-gnu', 'test-calloc-gnu' fail. ++ case "$host_os" in ++ mingw*) ++ gl_cv_func_malloc_posix=no ;; ++ irix* | solaris*) ++ dnl On IRIX 6.5, the three functions return NULL with errno unset ++ dnl when the argument is larger than PTRDIFF_MAX. ++ dnl On Solaris 11.3, the three functions return NULL with errno set ++ dnl to EAGAIN, not ENOMEM, when the argument is larger than ++ dnl PTRDIFF_MAX. ++ dnl Here is a test program: ++m4_divert_push([KILL]) ++#include ++#include ++#include ++#define ptrdiff_t long ++#ifndef PTRDIFF_MAX ++# define PTRDIFF_MAX ((ptrdiff_t) ((1UL << (8 * sizeof (ptrdiff_t) - 1)) - 1)) ++#endif ++ ++int main () ++{ ++ void *p; ++ ++ fprintf (stderr, "PTRDIFF_MAX = %lu\n", (unsigned long) PTRDIFF_MAX); ++ ++ errno = 0; ++ p = malloc ((unsigned long) PTRDIFF_MAX + 1); ++ fprintf (stderr, "p=%p errno=%d\n", p, errno); ++ ++ errno = 0; ++ p = calloc (PTRDIFF_MAX / 2 + 1, 2); ++ fprintf (stderr, "p=%p errno=%d\n", p, errno); ++ ++ errno = 0; ++ p = realloc (NULL, (unsigned long) PTRDIFF_MAX + 1); ++ fprintf (stderr, "p=%p errno=%d\n", p, errno); ++ ++ return 0; ++} ++m4_divert_pop([KILL]) ++ gl_cv_func_malloc_posix=no ;; ++ *) ++ gl_cv_func_malloc_posix=yes ;; ++ esac + ]) + ]) +diff --git a/m4/math_h.m4 b/m4/math_h.m4 +index a9ba5e6..b3a10c3 100644 +--- a/m4/math_h.m4 ++++ b/m4/math_h.m4 +@@ -1,10 +1,10 @@ +-# math_h.m4 serial 122 ++# math_h.m4 serial 125 + dnl Copyright (C) 2007-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. + +-AC_DEFUN([gl_MATH_H], ++AC_DEFUN_ONCE([gl_MATH_H], + [ + AC_REQUIRE([gl_MATH_H_DEFAULTS]) + gl_CHECK_NEXT_HEADERS([math.h]) +@@ -53,119 +53,134 @@ AC_DEFUN([gl_MATH_H], + tanf tanl tanhf trunc truncf truncl]) + ]) + ++# gl_MATH_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_MATH_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_MATH_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_MATH_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_MATH_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_MATH_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ACOSF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ACOSL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ASINF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ASINL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ATANF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ATANL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ATAN2F]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CBRT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CBRTF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CBRTL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CEIL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CEILF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CEILL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_COPYSIGN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_COPYSIGNF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_COPYSIGNL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_COSF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_COSL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_COSHF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXPF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXPL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXP2]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXP2F]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXP2L]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXPM1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXPM1F]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXPM1L]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FABSF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FABSL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FLOOR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FLOORF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FLOORL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FMA]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FMAF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FMAL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FMOD]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FMODF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FMODL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREXPF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREXP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREXPL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_HYPOT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_HYPOTF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_HYPOTL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ILOGB]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ILOGBF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ILOGBL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISFINITE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISINF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISNAN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISNANF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISNAND]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISNANL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LDEXPF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LDEXPL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOGF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOGL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG10]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG10F]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG10L]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG1P]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG1PF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG1PL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG2]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG2F]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG2L]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOGB]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOGBF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOGBL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MODF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MODFF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MODFL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POWF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REMAINDER]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REMAINDERF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REMAINDERL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RINT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RINTF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RINTL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ROUND]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ROUNDF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ROUNDL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGNBIT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SINF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SINL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SINHF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SQRTF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SQRTL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TANF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TANL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TANHF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TRUNC]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TRUNCF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TRUNCL]) ++ dnl Support Microsoft deprecated alias function names by default. ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_J0], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_J1], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_JN], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_Y0], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_Y1], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_YN], [1]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_MATH_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_MATH_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_MATH_H_DEFAULTS], + [ +- GNULIB_ACOSF=0; AC_SUBST([GNULIB_ACOSF]) +- GNULIB_ACOSL=0; AC_SUBST([GNULIB_ACOSL]) +- GNULIB_ASINF=0; AC_SUBST([GNULIB_ASINF]) +- GNULIB_ASINL=0; AC_SUBST([GNULIB_ASINL]) +- GNULIB_ATANF=0; AC_SUBST([GNULIB_ATANF]) +- GNULIB_ATANL=0; AC_SUBST([GNULIB_ATANL]) +- GNULIB_ATAN2F=0; AC_SUBST([GNULIB_ATAN2F]) +- GNULIB_CBRT=0; AC_SUBST([GNULIB_CBRT]) +- GNULIB_CBRTF=0; AC_SUBST([GNULIB_CBRTF]) +- GNULIB_CBRTL=0; AC_SUBST([GNULIB_CBRTL]) +- GNULIB_CEIL=0; AC_SUBST([GNULIB_CEIL]) +- GNULIB_CEILF=0; AC_SUBST([GNULIB_CEILF]) +- GNULIB_CEILL=0; AC_SUBST([GNULIB_CEILL]) +- GNULIB_COPYSIGN=0; AC_SUBST([GNULIB_COPYSIGN]) +- GNULIB_COPYSIGNF=0; AC_SUBST([GNULIB_COPYSIGNF]) +- GNULIB_COPYSIGNL=0; AC_SUBST([GNULIB_COPYSIGNL]) +- GNULIB_COSF=0; AC_SUBST([GNULIB_COSF]) +- GNULIB_COSL=0; AC_SUBST([GNULIB_COSL]) +- GNULIB_COSHF=0; AC_SUBST([GNULIB_COSHF]) +- GNULIB_EXPF=0; AC_SUBST([GNULIB_EXPF]) +- GNULIB_EXPL=0; AC_SUBST([GNULIB_EXPL]) +- GNULIB_EXP2=0; AC_SUBST([GNULIB_EXP2]) +- GNULIB_EXP2F=0; AC_SUBST([GNULIB_EXP2F]) +- GNULIB_EXP2L=0; AC_SUBST([GNULIB_EXP2L]) +- GNULIB_EXPM1=0; AC_SUBST([GNULIB_EXPM1]) +- GNULIB_EXPM1F=0; AC_SUBST([GNULIB_EXPM1F]) +- GNULIB_EXPM1L=0; AC_SUBST([GNULIB_EXPM1L]) +- GNULIB_FABSF=0; AC_SUBST([GNULIB_FABSF]) +- GNULIB_FABSL=0; AC_SUBST([GNULIB_FABSL]) +- GNULIB_FLOOR=0; AC_SUBST([GNULIB_FLOOR]) +- GNULIB_FLOORF=0; AC_SUBST([GNULIB_FLOORF]) +- GNULIB_FLOORL=0; AC_SUBST([GNULIB_FLOORL]) +- GNULIB_FMA=0; AC_SUBST([GNULIB_FMA]) +- GNULIB_FMAF=0; AC_SUBST([GNULIB_FMAF]) +- GNULIB_FMAL=0; AC_SUBST([GNULIB_FMAL]) +- GNULIB_FMOD=0; AC_SUBST([GNULIB_FMOD]) +- GNULIB_FMODF=0; AC_SUBST([GNULIB_FMODF]) +- GNULIB_FMODL=0; AC_SUBST([GNULIB_FMODL]) +- GNULIB_FREXPF=0; AC_SUBST([GNULIB_FREXPF]) +- GNULIB_FREXP=0; AC_SUBST([GNULIB_FREXP]) +- GNULIB_FREXPL=0; AC_SUBST([GNULIB_FREXPL]) +- GNULIB_HYPOT=0; AC_SUBST([GNULIB_HYPOT]) +- GNULIB_HYPOTF=0; AC_SUBST([GNULIB_HYPOTF]) +- GNULIB_HYPOTL=0; AC_SUBST([GNULIB_HYPOTL]) +- GNULIB_ILOGB=0; AC_SUBST([GNULIB_ILOGB]) +- GNULIB_ILOGBF=0; AC_SUBST([GNULIB_ILOGBF]) +- GNULIB_ILOGBL=0; AC_SUBST([GNULIB_ILOGBL]) +- GNULIB_ISFINITE=0; AC_SUBST([GNULIB_ISFINITE]) +- GNULIB_ISINF=0; AC_SUBST([GNULIB_ISINF]) +- GNULIB_ISNAN=0; AC_SUBST([GNULIB_ISNAN]) +- GNULIB_ISNANF=0; AC_SUBST([GNULIB_ISNANF]) +- GNULIB_ISNAND=0; AC_SUBST([GNULIB_ISNAND]) +- GNULIB_ISNANL=0; AC_SUBST([GNULIB_ISNANL]) +- GNULIB_LDEXPF=0; AC_SUBST([GNULIB_LDEXPF]) +- GNULIB_LDEXPL=0; AC_SUBST([GNULIB_LDEXPL]) +- GNULIB_LOG=0; AC_SUBST([GNULIB_LOG]) +- GNULIB_LOGF=0; AC_SUBST([GNULIB_LOGF]) +- GNULIB_LOGL=0; AC_SUBST([GNULIB_LOGL]) +- GNULIB_LOG10=0; AC_SUBST([GNULIB_LOG10]) +- GNULIB_LOG10F=0; AC_SUBST([GNULIB_LOG10F]) +- GNULIB_LOG10L=0; AC_SUBST([GNULIB_LOG10L]) +- GNULIB_LOG1P=0; AC_SUBST([GNULIB_LOG1P]) +- GNULIB_LOG1PF=0; AC_SUBST([GNULIB_LOG1PF]) +- GNULIB_LOG1PL=0; AC_SUBST([GNULIB_LOG1PL]) +- GNULIB_LOG2=0; AC_SUBST([GNULIB_LOG2]) +- GNULIB_LOG2F=0; AC_SUBST([GNULIB_LOG2F]) +- GNULIB_LOG2L=0; AC_SUBST([GNULIB_LOG2L]) +- GNULIB_LOGB=0; AC_SUBST([GNULIB_LOGB]) +- GNULIB_LOGBF=0; AC_SUBST([GNULIB_LOGBF]) +- GNULIB_LOGBL=0; AC_SUBST([GNULIB_LOGBL]) +- GNULIB_MODF=0; AC_SUBST([GNULIB_MODF]) +- GNULIB_MODFF=0; AC_SUBST([GNULIB_MODFF]) +- GNULIB_MODFL=0; AC_SUBST([GNULIB_MODFL]) +- GNULIB_POWF=0; AC_SUBST([GNULIB_POWF]) +- GNULIB_REMAINDER=0; AC_SUBST([GNULIB_REMAINDER]) +- GNULIB_REMAINDERF=0; AC_SUBST([GNULIB_REMAINDERF]) +- GNULIB_REMAINDERL=0; AC_SUBST([GNULIB_REMAINDERL]) +- GNULIB_RINT=0; AC_SUBST([GNULIB_RINT]) +- GNULIB_RINTF=0; AC_SUBST([GNULIB_RINTF]) +- GNULIB_RINTL=0; AC_SUBST([GNULIB_RINTL]) +- GNULIB_ROUND=0; AC_SUBST([GNULIB_ROUND]) +- GNULIB_ROUNDF=0; AC_SUBST([GNULIB_ROUNDF]) +- GNULIB_ROUNDL=0; AC_SUBST([GNULIB_ROUNDL]) +- GNULIB_SIGNBIT=0; AC_SUBST([GNULIB_SIGNBIT]) +- GNULIB_SINF=0; AC_SUBST([GNULIB_SINF]) +- GNULIB_SINL=0; AC_SUBST([GNULIB_SINL]) +- GNULIB_SINHF=0; AC_SUBST([GNULIB_SINHF]) +- GNULIB_SQRTF=0; AC_SUBST([GNULIB_SQRTF]) +- GNULIB_SQRTL=0; AC_SUBST([GNULIB_SQRTL]) +- GNULIB_TANF=0; AC_SUBST([GNULIB_TANF]) +- GNULIB_TANL=0; AC_SUBST([GNULIB_TANL]) +- GNULIB_TANHF=0; AC_SUBST([GNULIB_TANHF]) +- GNULIB_TRUNC=0; AC_SUBST([GNULIB_TRUNC]) +- GNULIB_TRUNCF=0; AC_SUBST([GNULIB_TRUNCF]) +- GNULIB_TRUNCL=0; AC_SUBST([GNULIB_TRUNCL]) +- dnl Support Microsoft deprecated alias function names by default. +- GNULIB_MDA_J0=1; AC_SUBST([GNULIB_MDA_J0]) +- GNULIB_MDA_J1=1; AC_SUBST([GNULIB_MDA_J1]) +- GNULIB_MDA_JN=1; AC_SUBST([GNULIB_MDA_JN]) +- GNULIB_MDA_Y0=1; AC_SUBST([GNULIB_MDA_Y0]) +- GNULIB_MDA_Y1=1; AC_SUBST([GNULIB_MDA_Y1]) +- GNULIB_MDA_YN=1; AC_SUBST([GNULIB_MDA_YN]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_ACOSF=1; AC_SUBST([HAVE_ACOSF]) + HAVE_ACOSL=1; AC_SUBST([HAVE_ACOSL]) +diff --git a/m4/memchr.m4 b/m4/memchr.m4 +index 64470de..ca08192 100644 +--- a/m4/memchr.m4 ++++ b/m4/memchr.m4 +@@ -1,4 +1,4 @@ +-# memchr.m4 serial 17 ++# memchr.m4 serial 18 + dnl Copyright (C) 2002-2004, 2009-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -13,7 +13,7 @@ AC_DEFUN_ONCE([gl_FUNC_MEMCHR], + AC_CHECK_HEADERS_ONCE([sys/mman.h]) + AC_CHECK_FUNCS_ONCE([mprotect]) + +- AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) ++ AC_REQUIRE([gl_STRING_H_DEFAULTS]) + # Detect platform-specific bugs in some versions of glibc: + # memchr should not dereference anything with length 0 + # https://bugzilla.redhat.com/show_bug.cgi?id=499689 +diff --git a/m4/mempcpy.m4 b/m4/mempcpy.m4 +index c5ee2af..f9d9ec8 100644 +--- a/m4/mempcpy.m4 ++++ b/m4/mempcpy.m4 +@@ -1,4 +1,4 @@ +-# mempcpy.m4 serial 11 ++# mempcpy.m4 serial 12 + dnl Copyright (C) 2003-2004, 2006-2007, 2009-2021 Free Software Foundation, + dnl Inc. + dnl This file is free software; the Free Software Foundation +@@ -13,7 +13,7 @@ AC_DEFUN([gl_FUNC_MEMPCPY], + dnl The mempcpy() declaration in lib/string.in.h uses 'restrict'. + AC_REQUIRE([AC_C_RESTRICT]) + +- AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) ++ AC_REQUIRE([gl_STRING_H_DEFAULTS]) + AC_CHECK_FUNCS([mempcpy]) + if test $ac_cv_func_mempcpy = no; then + HAVE_MEMPCPY=0 +diff --git a/m4/mktime.m4 b/m4/mktime.m4 +index 245649e..721189a 100644 +--- a/m4/mktime.m4 ++++ b/m4/mktime.m4 +@@ -1,4 +1,4 @@ +-# serial 35 ++# serial 36 + dnl Copyright (C) 2002-2003, 2005-2007, 2009-2021 Free Software Foundation, + dnl Inc. + dnl This file is free software; the Free Software Foundation +@@ -255,7 +255,7 @@ main () + dnl Main macro of module 'mktime'. + AC_DEFUN([gl_FUNC_MKTIME], + [ +- AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) ++ AC_REQUIRE([gl_TIME_H_DEFAULTS]) + AC_REQUIRE([AC_CANONICAL_HOST]) + AC_REQUIRE([gl_FUNC_MKTIME_WORKS]) + +diff --git a/m4/netdb_h.m4 b/m4/netdb_h.m4 +index db84c78..eb7c3b8 100644 +--- a/m4/netdb_h.m4 ++++ b/m4/netdb_h.m4 +@@ -1,10 +1,10 @@ +-# netdb_h.m4 serial 12 ++# netdb_h.m4 serial 15 + dnl Copyright (C) 2008-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. + +-AC_DEFUN([gl_HEADER_NETDB], ++AC_DEFUN_ONCE([gl_NETDB_H], + [ + AC_REQUIRE([gl_NETDB_H_DEFAULTS]) + gl_CHECK_NEXT_HEADERS([netdb.h]) +@@ -21,18 +21,33 @@ AC_DEFUN([gl_HEADER_NETDB], + [getaddrinfo freeaddrinfo gai_strerror getnameinfo]) + ]) + ++# gl_NETDB_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_NETDB_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_NETDB_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_NETDB_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_NETDB_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_NETDB_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETADDRINFO]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_NETDB_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_NETDB_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_NETDB_H_DEFAULTS], + [ +- GNULIB_GETADDRINFO=0; AC_SUBST([GNULIB_GETADDRINFO]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_STRUCT_ADDRINFO=1; AC_SUBST([HAVE_STRUCT_ADDRINFO]) + HAVE_DECL_FREEADDRINFO=1; AC_SUBST([HAVE_DECL_FREEADDRINFO]) +diff --git a/m4/poll_h.m4 b/m4/poll_h.m4 +index 20692d8..1f0d796 100644 +--- a/m4/poll_h.m4 ++++ b/m4/poll_h.m4 +@@ -1,4 +1,4 @@ +-# poll_h.m4 serial 3 ++# poll_h.m4 serial 6 + dnl Copyright (C) 2010-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -6,10 +6,10 @@ dnl with or without modifications, as long as this notice is preserved. + + dnl Written by Bruno Haible. + +-AC_DEFUN([gl_POLL_H], ++AC_DEFUN_ONCE([gl_POLL_H], + [ +- dnl Use AC_REQUIRE here, so that the default behavior below is expanded +- dnl once only, before all statements that occur in other macros. ++ dnl Ensure to expand the default settings once only, before all statements ++ dnl that occur in other macros. + AC_REQUIRE([gl_POLL_H_DEFAULTS]) + + AC_CHECK_HEADERS_ONCE([poll.h]) +@@ -31,18 +31,33 @@ AC_DEFUN([gl_POLL_H], + [poll]) + ]) + ++# gl_POLL_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_POLL_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_POLL_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_POLL_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_POLL_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_POLL_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POLL]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_POLL_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_POLL_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_POLL_H_DEFAULTS], + [ +- GNULIB_POLL=0; AC_SUBST([GNULIB_POLL]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_POLL=1; AC_SUBST([HAVE_POLL]) + REPLACE_POLL=0; AC_SUBST([REPLACE_POLL]) +diff --git a/m4/printf.m4 b/m4/printf.m4 +index d8b3521..284c7c5 100644 +--- a/m4/printf.m4 ++++ b/m4/printf.m4 +@@ -1,4 +1,4 @@ +-# printf.m4 serial 72 ++# printf.m4 serial 73 + dnl Copyright (C) 2003, 2007-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -537,7 +537,7 @@ int main () + && strcmp (buf, "-0X6.488P-1 33") != 0 + && strcmp (buf, "-0XC.91P-2 33") != 0)) + result |= 2; +- /* This catches a FreeBSD 6.1 bug: it doesn't round. */ ++ /* This catches a FreeBSD 13.0 bug: it doesn't round. */ + if (sprintf (buf, "%.2a %d", 1.51, 33, 44, 55) < 0 + || (strcmp (buf, "0x1.83p+0 33") != 0 + && strcmp (buf, "0x3.05p-1 33") != 0 +@@ -1690,6 +1690,7 @@ dnl + dnl 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 + dnl glibc 2.5 . . . . . . . . . . . . . . . . . . . . + dnl glibc 2.3.6 . . . . # . . . . . . . . . . . . . . . ++dnl FreeBSD 13.0 . . . . # . . . . . . . . # . . . . . . + dnl FreeBSD 5.4, 6.1 . . . . # . . . . . . # . # . . . . . . + dnl Mac OS X 10.13.5 . . . # # . # . . . . . . . . . . # . . + dnl Mac OS X 10.5.8 . . . # # . . . . . . # . . . . . . . . +diff --git a/m4/rawmemchr.m4 b/m4/rawmemchr.m4 +index f928465..452fab1 100644 +--- a/m4/rawmemchr.m4 ++++ b/m4/rawmemchr.m4 +@@ -1,4 +1,4 @@ +-# rawmemchr.m4 serial 2 ++# rawmemchr.m4 serial 3 + dnl Copyright (C) 2003, 2007-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -9,7 +9,7 @@ AC_DEFUN([gl_FUNC_RAWMEMCHR], + dnl Persuade glibc to declare rawmemchr(). + AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) + +- AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) ++ AC_REQUIRE([gl_STRING_H_DEFAULTS]) + AC_CHECK_FUNCS([rawmemchr]) + if test $ac_cv_func_rawmemchr = no; then + HAVE_RAWMEMCHR=0 +diff --git a/m4/realloc.m4 b/m4/realloc.m4 +index a80a02a..0abc418 100644 +--- a/m4/realloc.m4 ++++ b/m4/realloc.m4 +@@ -1,21 +1,21 @@ +-# realloc.m4 serial 20 ++# realloc.m4 serial 24 + dnl Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. + + # This is adapted with modifications from upstream Autoconf here: +-# https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=04be2b7a29d65d9a08e64e8e56e594c91749598c ++# https://git.savannah.gnu.org/cgit/autoconf.git/tree/lib/autoconf/functions.m4?id=v2.70#n1455 + AC_DEFUN([_AC_FUNC_REALLOC_IF], + [ + AC_REQUIRE([AC_CANONICAL_HOST])dnl for cross-compiles +- AC_CACHE_CHECK([for GNU libc compatible realloc], ++ AC_CACHE_CHECK([whether realloc (0, 0) returns nonnull], + [ac_cv_func_realloc_0_nonnull], + [AC_RUN_IFELSE( + [AC_LANG_PROGRAM( + [[#include + ]], +- [[char *p = realloc (0, 0); ++ [[void *p = realloc (0, 0); + int result = !p; + free (p); + return result;]]) +@@ -24,53 +24,40 @@ AC_DEFUN([_AC_FUNC_REALLOC_IF], + [ac_cv_func_realloc_0_nonnull=no], + [case "$host_os" in + # Guess yes on platforms where we know the result. +- *-gnu* | gnu* | *-musl* | freebsd* | midnightbsd* | netbsd* | openbsd* \ +- | hpux* | solaris* | cygwin* | mingw*) ++ *-gnu* | freebsd* | netbsd* | openbsd* | bitrig* \ ++ | gnu* | *-musl* | midnightbsd* \ ++ | hpux* | solaris* | cygwin* | mingw* | msys* ) + ac_cv_func_realloc_0_nonnull="guessing yes" ;; + # If we don't know, obey --enable-cross-guesses. + *) ac_cv_func_realloc_0_nonnull="$gl_cross_guess_normal" ;; + esac + ]) + ]) +- case "$ac_cv_func_realloc_0_nonnull" in +- *yes) +- $1 +- ;; +- *) +- $2 +- ;; +- esac ++ AS_CASE([$ac_cv_func_realloc_0_nonnull], [*yes], [$1], [$2]) + ])# AC_FUNC_REALLOC + + # gl_FUNC_REALLOC_GNU + # ------------------- +-# Test whether 'realloc (0, 0)' is handled like in GNU libc, and replace +-# realloc if it is not. ++# Replace realloc if it is not compatible with GNU libc. + AC_DEFUN([gl_FUNC_REALLOC_GNU], + [ + AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) +- dnl _AC_FUNC_REALLOC_IF is defined in Autoconf. +- _AC_FUNC_REALLOC_IF( +- [AC_DEFINE([HAVE_REALLOC_GNU], [1], +- [Define to 1 if your system has a GNU libc compatible 'realloc' +- function, and to 0 otherwise.])], +- [AC_DEFINE([HAVE_REALLOC_GNU], [0]) +- REPLACE_REALLOC=1 +- ]) ++ AC_REQUIRE([gl_FUNC_REALLOC_POSIX]) ++ if test $REPLACE_REALLOC = 0; then ++ _AC_FUNC_REALLOC_IF([], [REPLACE_REALLOC=1]) ++ fi + ])# gl_FUNC_REALLOC_GNU + + # gl_FUNC_REALLOC_POSIX + # --------------------- + # Test whether 'realloc' is POSIX compliant (sets errno to ENOMEM when it +-# fails), and replace realloc if it is not. ++# fails, and doesn't mess up with ptrdiff_t overflow), ++# and replace realloc if it is not. + AC_DEFUN([gl_FUNC_REALLOC_POSIX], + [ + AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) +- AC_REQUIRE([gl_CHECK_MALLOC_POSIX]) +- if test $gl_cv_func_malloc_posix = yes; then +- AC_DEFINE([HAVE_REALLOC_POSIX], [1], +- [Define if the 'realloc' function is POSIX compliant.]) +- else ++ AC_REQUIRE([gl_FUNC_MALLOC_POSIX]) ++ if test $REPLACE_MALLOC = 1; then + REPLACE_REALLOC=1 + fi + ]) +diff --git a/m4/regex.m4 b/m4/regex.m4 +index 850c572..1c7e562 100644 +--- a/m4/regex.m4 ++++ b/m4/regex.m4 +@@ -1,4 +1,4 @@ +-# serial 71 ++# serial 73 + + # Copyright (C) 1996-2001, 2003-2021 Free Software Foundation, Inc. + # +@@ -246,7 +246,7 @@ AC_DEFUN([gl_REGEX], + & ~RE_CONTEXT_INVALID_DUP + & ~RE_NO_EMPTY_RANGES); + memset (®ex, 0, sizeof regex); +- s = re_compile_pattern ("[[:alnum:]_-]\\\\+$", 16, ®ex); ++ s = re_compile_pattern ("[[:alnum:]_-]\\\\+\$", 16, ®ex); + if (s) + result |= 32; + else +@@ -264,14 +264,50 @@ AC_DEFUN([gl_REGEX], + back reference. */ + re_set_syntax (RE_SYNTAX_POSIX_EGREP); + memset (®ex, 0, sizeof regex); +- s = re_compile_pattern ("0|()0|\\1|0", 10, ®ex); ++ s = re_compile_pattern ("0|()0|\\\\1|0", 10, ®ex); + if (!s) +- result |= 64; ++ { ++ memset (®s, 0, sizeof regs); ++ i = re_search (®ex, "x", 1, 0, 1, ®s); ++ if (i != -1) ++ result |= 64; ++ if (0 <= i) ++ { ++ free (regs.start); ++ free (regs.end); ++ } ++ regfree (®ex); ++ } + else + { + if (strcmp (s, "Invalid back reference")) + result |= 64; ++ } ++ ++ /* glibc bug 11053. */ ++ re_set_syntax (RE_SYNTAX_POSIX_BASIC); ++ memset (®ex, 0, sizeof regex); ++ static char const pat_sub2[] = "\\\\(a*\\\\)*a*\\\\1"; ++ s = re_compile_pattern (pat_sub2, sizeof pat_sub2 - 1, ®ex); ++ if (s) ++ result |= 64; ++ else ++ { ++ memset (®s, 0, sizeof regs); ++ static char const data[] = "a"; ++ int datalen = sizeof data - 1; ++ i = re_search (®ex, data, datalen, 0, datalen, ®s); ++ if (i != 0) ++ result |= 64; ++ else if (regs.num_regs < 2) ++ result |= 64; ++ else if (! (regs.start[0] == 0 && regs.end[0] == 1)) ++ result |= 64; ++ else if (! (regs.start[1] == 0 && regs.end[1] == 0)) ++ result |= 64; + regfree (®ex); ++ free (regs.start); ++ free (regs.end); + } + + #if 0 +diff --git a/m4/select.m4 b/m4/select.m4 +index c7409d2..72c068f 100644 +--- a/m4/select.m4 ++++ b/m4/select.m4 +@@ -1,4 +1,4 @@ +-# select.m4 serial 12 ++# select.m4 serial 13 + dnl Copyright (C) 2009-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is preserved. + + AC_DEFUN([gl_FUNC_SELECT], + [ +- AC_REQUIRE([gl_HEADER_SYS_SELECT]) ++ AC_REQUIRE([gl_SYS_SELECT_H]) + AC_REQUIRE([AC_C_RESTRICT]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_REQUIRE([gl_SOCKETS]) +diff --git a/m4/servent.m4 b/m4/servent.m4 +index 2dda177..9bc3bcd 100644 +--- a/m4/servent.m4 ++++ b/m4/servent.m4 +@@ -1,4 +1,4 @@ +-# servent.m4 serial 3 ++# servent.m4 serial 4 + dnl Copyright (C) 2008, 2010-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -15,7 +15,7 @@ AC_DEFUN([gl_SERVENT], + dnl - On BeOS, they are in libnet. + dnl - On native Windows, they are in ws2_32.dll. + dnl - Otherwise they are in libc. +- AC_REQUIRE([gl_HEADER_SYS_SOCKET])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H ++ AC_REQUIRE([gl_SYS_SOCKET_H])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H + SERVENT_LIB= + gl_saved_libs="$LIBS" + AC_SEARCH_LIBS([getservbyname], [socket network net], +diff --git a/m4/signal_h.m4 b/m4/signal_h.m4 +index ff9f025..8b93880 100644 +--- a/m4/signal_h.m4 ++++ b/m4/signal_h.m4 +@@ -1,10 +1,10 @@ +-# signal_h.m4 serial 19 ++# signal_h.m4 serial 22 + dnl Copyright (C) 2007-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. + +-AC_DEFUN([gl_SIGNAL_H], ++AC_DEFUN_ONCE([gl_SIGNAL_H], + [ + AC_REQUIRE([gl_SIGNAL_H_DEFAULTS]) + AC_REQUIRE([gl_CHECK_TYPE_SIGSET_T]) +@@ -52,22 +52,37 @@ AC_DEFUN([gl_CHECK_TYPE_SIGSET_T], + fi + ]) + ++# gl_SIGNAL_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_SIGNAL_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_SIGNAL_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_SIGNAL_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_SIGNAL_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SIGNAL_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PTHREAD_SIGMASK]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RAISE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGNAL_H_SIGPIPE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGPROCMASK]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGACTION]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_SIGNAL_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_SIGNAL_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_SIGNAL_H_DEFAULTS], + [ +- GNULIB_PTHREAD_SIGMASK=0; AC_SUBST([GNULIB_PTHREAD_SIGMASK]) +- GNULIB_RAISE=0; AC_SUBST([GNULIB_RAISE]) +- GNULIB_SIGNAL_H_SIGPIPE=0; AC_SUBST([GNULIB_SIGNAL_H_SIGPIPE]) +- GNULIB_SIGPROCMASK=0; AC_SUBST([GNULIB_SIGPROCMASK]) +- GNULIB_SIGACTION=0; AC_SUBST([GNULIB_SIGACTION]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_POSIX_SIGNALBLOCKING=1; AC_SUBST([HAVE_POSIX_SIGNALBLOCKING]) + HAVE_PTHREAD_SIGMASK=1; AC_SUBST([HAVE_PTHREAD_SIGMASK]) +diff --git a/m4/sockpfaf.m4 b/m4/sockpfaf.m4 +index edae5d8..17e14c7 100644 +--- a/m4/sockpfaf.m4 ++++ b/m4/sockpfaf.m4 +@@ -1,4 +1,4 @@ +-# sockpfaf.m4 serial 9 ++# sockpfaf.m4 serial 10 + dnl Copyright (C) 2004, 2006, 2009-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -13,7 +13,7 @@ dnl From Bruno Haible. + + AC_DEFUN([gl_SOCKET_FAMILIES], + [ +- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) ++ AC_REQUIRE([gl_SYS_SOCKET_H]) + AC_CHECK_HEADERS_ONCE([netinet/in.h]) + + AC_CACHE_CHECK([for IPv4 sockets], +@@ -60,7 +60,7 @@ AC_DEFUN([gl_SOCKET_FAMILIES], + + AC_DEFUN([gl_SOCKET_FAMILY_UNIX], + [ +- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) ++ AC_REQUIRE([gl_SYS_SOCKET_H]) + AC_CHECK_HEADERS_ONCE([sys/un.h]) + + AC_CACHE_CHECK([for UNIX domain sockets], +diff --git a/m4/stat.m4 b/m4/stat.m4 +index 66f6c8c..9bcdb72 100644 +--- a/m4/stat.m4 ++++ b/m4/stat.m4 +@@ -1,4 +1,4 @@ +-# serial 17 ++# serial 18 + + # Copyright (C) 2009-2021 Free Software Foundation, Inc. + # +@@ -69,7 +69,7 @@ AC_DEFUN([gl_FUNC_STAT], + + # Prerequisites of lib/stat.c and lib/stat-w32.c. + AC_DEFUN([gl_PREREQ_STAT], [ +- AC_REQUIRE([gl_HEADER_SYS_STAT_H]) ++ AC_REQUIRE([gl_SYS_STAT_H]) + AC_REQUIRE([gl_PREREQ_STAT_W32]) + : + ]) +diff --git a/m4/stddef_h.m4 b/m4/stddef_h.m4 +index cd666c4..1303d2e 100644 +--- a/m4/stddef_h.m4 ++++ b/m4/stddef_h.m4 +@@ -1,4 +1,4 @@ +-# stddef_h.m4 serial 9 ++# stddef_h.m4 serial 11 + dnl Copyright (C) 2009-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is preserved. + + dnl A placeholder for , for platforms that have issues. + +-AC_DEFUN([gl_STDDEF_H], ++AC_DEFUN_ONCE([gl_STDDEF_H], + [ + AC_REQUIRE([gl_STDDEF_H_DEFAULTS]) + AC_REQUIRE([gt_TYPE_WCHAR_T]) +@@ -68,13 +68,28 @@ AC_DEFUN([gl_STDDEF_H], + fi + ]) + ++# gl_STDDEF_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_STDDEF_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_STDDEF_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_STDDEF_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_STDDEF_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_STDDEF_H_MODULE_INDICATOR_DEFAULTS], [ ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_STDDEF_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_STDDEF_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_STDDEF_H_DEFAULTS], + [ + dnl Assume proper GNU behavior unless another module says otherwise. +diff --git a/m4/stdint.m4 b/m4/stdint.m4 +index a785b44..2eb1652 100644 +--- a/m4/stdint.m4 ++++ b/m4/stdint.m4 +@@ -1,4 +1,4 @@ +-# stdint.m4 serial 58 ++# stdint.m4 serial 60 + dnl Copyright (C) 2001-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -170,7 +170,7 @@ struct s { + PTRDIFF_MIN == TYPE_MINIMUM (ptrdiff_t) + && PTRDIFF_MAX == TYPE_MAXIMUM (ptrdiff_t) + ? 1 : -1; +- /* Detect bug in FreeBSD 6.0 / ia64. */ ++ /* Detect bug in FreeBSD 6.0/ia64 and FreeBSD 13.0/arm64. */ + int check_SIG_ATOMIC: + SIG_ATOMIC_MIN == TYPE_MINIMUM (sig_atomic_t) + && SIG_ATOMIC_MAX == TYPE_MAXIMUM (sig_atomic_t) +@@ -527,7 +527,7 @@ AC_DEFUN([gl_STDINT_TYPE_PROPERTIES], + dnl requirement that wint_t is "unchanged by default argument promotions". + dnl In this case gnulib's and override wint_t. + dnl Set the variable BITSIZEOF_WINT_T accordingly. +- if test $GNULIB_OVERRIDES_WINT_T = 1; then ++ if test $GNULIBHEADERS_OVERRIDE_WINT_T = 1; then + BITSIZEOF_WINT_T=32 + fi + ]) +diff --git a/m4/stdio_h.m4 b/m4/stdio_h.m4 +index 4c3f24a..e704383 100644 +--- a/m4/stdio_h.m4 ++++ b/m4/stdio_h.m4 +@@ -1,11 +1,12 @@ +-# stdio_h.m4 serial 52 ++# stdio_h.m4 serial 56 + dnl Copyright (C) 2007-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. + +-AC_DEFUN([gl_STDIO_H], ++AC_DEFUN_ONCE([gl_STDIO_H], + [ ++ AC_REQUIRE([gl_STDIO_H_DEFAULTS]) + AH_VERBATIM([MINGW_ANSI_STDIO], + [/* Use GNU style printf and scanf. */ + #ifndef __USE_MINGW_ANSI_STDIO +@@ -13,7 +14,6 @@ AC_DEFUN([gl_STDIO_H], + #endif + ]) + AC_DEFINE([__USE_MINGW_ANSI_STDIO]) +- AC_REQUIRE([gl_STDIO_H_DEFAULTS]) + gl_NEXT_HEADERS([stdio.h]) + + dnl Determine whether __USE_MINGW_ANSI_STDIO makes printf and +@@ -40,17 +40,6 @@ AC_DEFUN([gl_STDIO_H], + attribute "__gnu_printf__" instead of "__printf__"]) + fi + +- dnl No need to create extra modules for these functions. Everyone who uses +- dnl likely needs them. +- GNULIB_FSCANF=1 +- gl_MODULE_INDICATOR([fscanf]) +- GNULIB_SCANF=1 +- gl_MODULE_INDICATOR([scanf]) +- GNULIB_FGETC=1 +- GNULIB_GETC=1 +- GNULIB_GETCHAR=1 +- GNULIB_FGETS=1 +- GNULIB_FREAD=1 + dnl This ifdef is necessary to avoid an error "missing file lib/stdio-read.c" + dnl "expected source file, required through AC_LIBSOURCES, not found". It is + dnl also an optimization, to avoid performing a configure check whose result +@@ -64,18 +53,6 @@ AC_DEFUN([gl_STDIO_H], + fi + ]) + +- dnl No need to create extra modules for these functions. Everyone who uses +- dnl likely needs them. +- GNULIB_FPRINTF=1 +- GNULIB_PRINTF=1 +- GNULIB_VFPRINTF=1 +- GNULIB_VPRINTF=1 +- GNULIB_FPUTC=1 +- GNULIB_PUTC=1 +- GNULIB_PUTCHAR=1 +- GNULIB_FPUTS=1 +- GNULIB_PUTS=1 +- GNULIB_FWRITE=1 + dnl This ifdef is necessary to avoid an error "missing file lib/stdio-write.c" + dnl "expected source file, required through AC_LIBSOURCES, not found". It is + dnl also an optimization, to avoid performing a configure check whose result +@@ -116,77 +93,92 @@ AC_DEFUN([gl_STDIO_H], + fi + ]) + ++# gl_STDIO_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_STDIO_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_STDIO_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_STDIO_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_STDIO_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_STDIO_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DPRINTF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FCLOSE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FDOPEN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FFLUSH]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FGETC]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FGETS]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FOPEN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FPRINTF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FPRINTF_POSIX]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FPURGE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FPUTC]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FPUTS]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREAD]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREOPEN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSCANF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSEEK]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSEEKO]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FTELL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FTELLO]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FWRITE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETC]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETCHAR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETDELIM]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETLINE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OBSTACK_PRINTF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OBSTACK_PRINTF_POSIX]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PCLOSE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PERROR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POPEN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PRINTF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PRINTF_POSIX]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PUTC]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PUTCHAR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PUTS]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REMOVE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RENAME]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RENAMEAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SCANF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SNPRINTF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SPRINTF_POSIX]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STDIO_H_NONBLOCKING]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STDIO_H_SIGPIPE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TMPFILE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VASPRINTF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VFSCANF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VSCANF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VDPRINTF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VFPRINTF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VFPRINTF_POSIX]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VPRINTF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VPRINTF_POSIX]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VSNPRINTF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VSPRINTF_POSIX]) ++ dnl Support Microsoft deprecated alias function names by default. ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_FCLOSEALL], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_FDOPEN], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_FILENO], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_GETW], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_PUTW], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_TEMPNAM], [1]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_STDIO_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_STDIO_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_STDIO_H_DEFAULTS], + [ +- GNULIB_DPRINTF=0; AC_SUBST([GNULIB_DPRINTF]) +- GNULIB_FCLOSE=0; AC_SUBST([GNULIB_FCLOSE]) +- GNULIB_FDOPEN=0; AC_SUBST([GNULIB_FDOPEN]) +- GNULIB_FFLUSH=0; AC_SUBST([GNULIB_FFLUSH]) +- GNULIB_FGETC=0; AC_SUBST([GNULIB_FGETC]) +- GNULIB_FGETS=0; AC_SUBST([GNULIB_FGETS]) +- GNULIB_FOPEN=0; AC_SUBST([GNULIB_FOPEN]) +- GNULIB_FPRINTF=0; AC_SUBST([GNULIB_FPRINTF]) +- GNULIB_FPRINTF_POSIX=0; AC_SUBST([GNULIB_FPRINTF_POSIX]) +- GNULIB_FPURGE=0; AC_SUBST([GNULIB_FPURGE]) +- GNULIB_FPUTC=0; AC_SUBST([GNULIB_FPUTC]) +- GNULIB_FPUTS=0; AC_SUBST([GNULIB_FPUTS]) +- GNULIB_FREAD=0; AC_SUBST([GNULIB_FREAD]) +- GNULIB_FREOPEN=0; AC_SUBST([GNULIB_FREOPEN]) +- GNULIB_FSCANF=0; AC_SUBST([GNULIB_FSCANF]) +- GNULIB_FSEEK=0; AC_SUBST([GNULIB_FSEEK]) +- GNULIB_FSEEKO=0; AC_SUBST([GNULIB_FSEEKO]) +- GNULIB_FTELL=0; AC_SUBST([GNULIB_FTELL]) +- GNULIB_FTELLO=0; AC_SUBST([GNULIB_FTELLO]) +- GNULIB_FWRITE=0; AC_SUBST([GNULIB_FWRITE]) +- GNULIB_GETC=0; AC_SUBST([GNULIB_GETC]) +- GNULIB_GETCHAR=0; AC_SUBST([GNULIB_GETCHAR]) +- GNULIB_GETDELIM=0; AC_SUBST([GNULIB_GETDELIM]) +- GNULIB_GETLINE=0; AC_SUBST([GNULIB_GETLINE]) +- GNULIB_OBSTACK_PRINTF=0; AC_SUBST([GNULIB_OBSTACK_PRINTF]) +- GNULIB_OBSTACK_PRINTF_POSIX=0; AC_SUBST([GNULIB_OBSTACK_PRINTF_POSIX]) +- GNULIB_PCLOSE=0; AC_SUBST([GNULIB_PCLOSE]) +- GNULIB_PERROR=0; AC_SUBST([GNULIB_PERROR]) +- GNULIB_POPEN=0; AC_SUBST([GNULIB_POPEN]) +- GNULIB_PRINTF=0; AC_SUBST([GNULIB_PRINTF]) +- GNULIB_PRINTF_POSIX=0; AC_SUBST([GNULIB_PRINTF_POSIX]) +- GNULIB_PUTC=0; AC_SUBST([GNULIB_PUTC]) +- GNULIB_PUTCHAR=0; AC_SUBST([GNULIB_PUTCHAR]) +- GNULIB_PUTS=0; AC_SUBST([GNULIB_PUTS]) +- GNULIB_REMOVE=0; AC_SUBST([GNULIB_REMOVE]) +- GNULIB_RENAME=0; AC_SUBST([GNULIB_RENAME]) +- GNULIB_RENAMEAT=0; AC_SUBST([GNULIB_RENAMEAT]) +- GNULIB_SCANF=0; AC_SUBST([GNULIB_SCANF]) +- GNULIB_SNPRINTF=0; AC_SUBST([GNULIB_SNPRINTF]) +- GNULIB_SPRINTF_POSIX=0; AC_SUBST([GNULIB_SPRINTF_POSIX]) +- GNULIB_STDIO_H_NONBLOCKING=0; AC_SUBST([GNULIB_STDIO_H_NONBLOCKING]) +- GNULIB_STDIO_H_SIGPIPE=0; AC_SUBST([GNULIB_STDIO_H_SIGPIPE]) +- GNULIB_TMPFILE=0; AC_SUBST([GNULIB_TMPFILE]) +- GNULIB_VASPRINTF=0; AC_SUBST([GNULIB_VASPRINTF]) +- GNULIB_VFSCANF=0; AC_SUBST([GNULIB_VFSCANF]) +- GNULIB_VSCANF=0; AC_SUBST([GNULIB_VSCANF]) +- GNULIB_VDPRINTF=0; AC_SUBST([GNULIB_VDPRINTF]) +- GNULIB_VFPRINTF=0; AC_SUBST([GNULIB_VFPRINTF]) +- GNULIB_VFPRINTF_POSIX=0; AC_SUBST([GNULIB_VFPRINTF_POSIX]) +- GNULIB_VPRINTF=0; AC_SUBST([GNULIB_VPRINTF]) +- GNULIB_VPRINTF_POSIX=0; AC_SUBST([GNULIB_VPRINTF_POSIX]) +- GNULIB_VSNPRINTF=0; AC_SUBST([GNULIB_VSNPRINTF]) +- GNULIB_VSPRINTF_POSIX=0; AC_SUBST([GNULIB_VSPRINTF_POSIX]) +- dnl Support Microsoft deprecated alias function names by default. +- GNULIB_MDA_FCLOSEALL=1; AC_SUBST([GNULIB_MDA_FCLOSEALL]) +- GNULIB_MDA_FDOPEN=1; AC_SUBST([GNULIB_MDA_FDOPEN]) +- GNULIB_MDA_FILENO=1; AC_SUBST([GNULIB_MDA_FILENO]) +- GNULIB_MDA_GETW=1; AC_SUBST([GNULIB_MDA_GETW]) +- GNULIB_MDA_PUTW=1; AC_SUBST([GNULIB_MDA_PUTW]) +- GNULIB_MDA_TEMPNAM=1; AC_SUBST([GNULIB_MDA_TEMPNAM]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_DECL_FCLOSEALL=1; AC_SUBST([HAVE_DECL_FCLOSEALL]) + HAVE_DECL_FPURGE=1; AC_SUBST([HAVE_DECL_FPURGE]) +diff --git a/m4/stdlib_h.m4 b/m4/stdlib_h.m4 +index 5fdb0a7..9c1d1c7 100644 +--- a/m4/stdlib_h.m4 ++++ b/m4/stdlib_h.m4 +@@ -1,10 +1,10 @@ +-# stdlib_h.m4 serial 59 ++# stdlib_h.m4 serial 63 + dnl Copyright (C) 2007-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. + +-AC_DEFUN([gl_STDLIB_H], ++AC_DEFUN_ONCE([gl_STDLIB_H], + [ + AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) + gl_NEXT_HEADERS([stdlib.h]) +@@ -46,63 +46,78 @@ AC_DEFUN([gl_STDLIB_H], + fi + ]) + ++# gl_STDLIB_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_STDLIB_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_STDLIB_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_STDLIB_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_STDLIB_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB__EXIT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ALIGNED_ALLOC]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ATOLL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CALLOC_POSIX]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CANONICALIZE_FILE_NAME]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREE_POSIX]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETLOADAVG]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETSUBOPT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GRANTPT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MALLOC_POSIX]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBTOWC]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKDTEMP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKOSTEMP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKOSTEMPS]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKSTEMP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKSTEMPS]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POSIX_MEMALIGN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POSIX_OPENPT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PTSNAME]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PTSNAME_R]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PUTENV]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_QSORT_R]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RANDOM]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RANDOM_R]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REALLOCARRAY]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REALLOC_POSIX]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REALPATH]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RPMATCH]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SECURE_GETENV]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETENV]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOD]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOLD]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOLL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOUL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOULL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SYSTEM_POSIX]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNLOCKPT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNSETENV]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCTOMB]) ++ dnl Support Microsoft deprecated alias function names by default. ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_ECVT], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_FCVT], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_GCVT], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_MKTEMP], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_PUTENV], [1]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_STDLIB_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_STDLIB_H_DEFAULTS], + [ +- GNULIB__EXIT=0; AC_SUBST([GNULIB__EXIT]) +- GNULIB_ALIGNED_ALLOC=0; AC_SUBST([GNULIB_ALIGNED_ALLOC]) +- GNULIB_ATOLL=0; AC_SUBST([GNULIB_ATOLL]) +- GNULIB_CALLOC_POSIX=0; AC_SUBST([GNULIB_CALLOC_POSIX]) +- GNULIB_CANONICALIZE_FILE_NAME=0; AC_SUBST([GNULIB_CANONICALIZE_FILE_NAME]) +- GNULIB_FREE_POSIX=0; AC_SUBST([GNULIB_FREE_POSIX]) +- GNULIB_GETLOADAVG=0; AC_SUBST([GNULIB_GETLOADAVG]) +- GNULIB_GETSUBOPT=0; AC_SUBST([GNULIB_GETSUBOPT]) +- GNULIB_GRANTPT=0; AC_SUBST([GNULIB_GRANTPT]) +- GNULIB_MALLOC_POSIX=0; AC_SUBST([GNULIB_MALLOC_POSIX]) +- GNULIB_MBTOWC=0; AC_SUBST([GNULIB_MBTOWC]) +- GNULIB_MKDTEMP=0; AC_SUBST([GNULIB_MKDTEMP]) +- GNULIB_MKOSTEMP=0; AC_SUBST([GNULIB_MKOSTEMP]) +- GNULIB_MKOSTEMPS=0; AC_SUBST([GNULIB_MKOSTEMPS]) +- GNULIB_MKSTEMP=0; AC_SUBST([GNULIB_MKSTEMP]) +- GNULIB_MKSTEMPS=0; AC_SUBST([GNULIB_MKSTEMPS]) +- GNULIB_POSIX_MEMALIGN=0;AC_SUBST([GNULIB_POSIX_MEMALIGN]) +- GNULIB_POSIX_OPENPT=0; AC_SUBST([GNULIB_POSIX_OPENPT]) +- GNULIB_PTSNAME=0; AC_SUBST([GNULIB_PTSNAME]) +- GNULIB_PTSNAME_R=0; AC_SUBST([GNULIB_PTSNAME_R]) +- GNULIB_PUTENV=0; AC_SUBST([GNULIB_PUTENV]) +- GNULIB_QSORT_R=0; AC_SUBST([GNULIB_QSORT_R]) +- GNULIB_RANDOM=0; AC_SUBST([GNULIB_RANDOM]) +- GNULIB_RANDOM_R=0; AC_SUBST([GNULIB_RANDOM_R]) +- GNULIB_REALLOCARRAY=0; AC_SUBST([GNULIB_REALLOCARRAY]) +- GNULIB_REALLOC_POSIX=0; AC_SUBST([GNULIB_REALLOC_POSIX]) +- GNULIB_REALPATH=0; AC_SUBST([GNULIB_REALPATH]) +- GNULIB_RPMATCH=0; AC_SUBST([GNULIB_RPMATCH]) +- GNULIB_SECURE_GETENV=0; AC_SUBST([GNULIB_SECURE_GETENV]) +- GNULIB_SETENV=0; AC_SUBST([GNULIB_SETENV]) +- GNULIB_STRTOD=0; AC_SUBST([GNULIB_STRTOD]) +- GNULIB_STRTOL=0; AC_SUBST([GNULIB_STRTOL]) +- GNULIB_STRTOLD=0; AC_SUBST([GNULIB_STRTOLD]) +- GNULIB_STRTOLL=0; AC_SUBST([GNULIB_STRTOLL]) +- GNULIB_STRTOUL=0; AC_SUBST([GNULIB_STRTOUL]) +- GNULIB_STRTOULL=0; AC_SUBST([GNULIB_STRTOULL]) +- GNULIB_SYSTEM_POSIX=0; AC_SUBST([GNULIB_SYSTEM_POSIX]) +- GNULIB_UNLOCKPT=0; AC_SUBST([GNULIB_UNLOCKPT]) +- GNULIB_UNSETENV=0; AC_SUBST([GNULIB_UNSETENV]) +- GNULIB_WCTOMB=0; AC_SUBST([GNULIB_WCTOMB]) +- dnl Support Microsoft deprecated alias function names by default. +- GNULIB_MDA_ECVT=1; AC_SUBST([GNULIB_MDA_ECVT]) +- GNULIB_MDA_FCVT=1; AC_SUBST([GNULIB_MDA_FCVT]) +- GNULIB_MDA_GCVT=1; AC_SUBST([GNULIB_MDA_GCVT]) +- GNULIB_MDA_MKTEMP=1; AC_SUBST([GNULIB_MDA_MKTEMP]) +- GNULIB_MDA_PUTENV=1; AC_SUBST([GNULIB_MDA_PUTENV]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE__EXIT=1; AC_SUBST([HAVE__EXIT]) + HAVE_ALIGNED_ALLOC=1; AC_SUBST([HAVE_ALIGNED_ALLOC]) +@@ -164,6 +179,7 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS], + REPLACE_RANDOM=0; AC_SUBST([REPLACE_RANDOM]) + REPLACE_RANDOM_R=0; AC_SUBST([REPLACE_RANDOM_R]) + REPLACE_REALLOC=0; AC_SUBST([REPLACE_REALLOC]) ++ REPLACE_REALLOCARRAY=0; AC_SUBST([REPLACE_REALLOCARRAY]) + REPLACE_REALPATH=0; AC_SUBST([REPLACE_REALPATH]) + REPLACE_SETENV=0; AC_SUBST([REPLACE_SETENV]) + REPLACE_SETSTATE=0; AC_SUBST([REPLACE_SETSTATE]) +diff --git a/m4/strdup.m4 b/m4/strdup.m4 +index f6f421d..5b6018f 100644 +--- a/m4/strdup.m4 ++++ b/m4/strdup.m4 +@@ -1,4 +1,4 @@ +-# strdup.m4 serial 14 ++# strdup.m4 serial 15 + + dnl Copyright (C) 2002-2021 Free Software Foundation, Inc. + +@@ -8,7 +8,7 @@ dnl with or without modifications, as long as this notice is preserved. + + AC_DEFUN([gl_FUNC_STRDUP], + [ +- AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) ++ AC_REQUIRE([gl_STRING_H_DEFAULTS]) + AC_CHECK_DECLS_ONCE([strdup]) + if test $ac_cv_have_decl_strdup = no; then + HAVE_DECL_STRDUP=0 +@@ -17,7 +17,7 @@ AC_DEFUN([gl_FUNC_STRDUP], + + AC_DEFUN([gl_FUNC_STRDUP_POSIX], + [ +- AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) ++ AC_REQUIRE([gl_STRING_H_DEFAULTS]) + AC_REQUIRE([gl_CHECK_MALLOC_POSIX]) + if test $gl_cv_func_malloc_posix != yes; then + REPLACE_STRDUP=1 +diff --git a/m4/string_h.m4 b/m4/string_h.m4 +index a4cc5b4..80d1e58 100644 +--- a/m4/string_h.m4 ++++ b/m4/string_h.m4 +@@ -5,20 +5,15 @@ + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 29 ++# serial 32 + + # Written by Paul Eggert. + +-AC_DEFUN([gl_HEADER_STRING_H], ++AC_DEFUN_ONCE([gl_STRING_H], + [ +- dnl Use AC_REQUIRE here, so that the default behavior below is expanded +- dnl once only, before all statements that occur in other macros. +- AC_REQUIRE([gl_HEADER_STRING_H_BODY]) +-]) +- +-AC_DEFUN([gl_HEADER_STRING_H_BODY], +-[ +- AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only, before all statements ++ dnl that occur in other macros. ++ AC_REQUIRE([gl_STRING_H_DEFAULTS]) + gl_NEXT_HEADERS([string.h]) + + dnl Check for declarations of anything we want to poison if the +@@ -33,62 +28,77 @@ AC_DEFUN([gl_HEADER_STRING_H_BODY], + AC_REQUIRE([AC_C_RESTRICT]) + ]) + ++# gl_STRING_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_STRING_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_STRING_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + +-AC_DEFUN([gl_HEADER_STRING_H_DEFAULTS], ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_STRING_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_STRING_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXPLICIT_BZERO]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FFSL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FFSLL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MEMCHR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MEMMEM]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MEMPCPY]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MEMRCHR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RAWMEMCHR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STPCPY]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STPNCPY]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRCHRNUL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRDUP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRNCAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRNDUP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRNLEN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRPBRK]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRSEP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRSTR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRCASESTR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOK_R]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSLEN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSNLEN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSCHR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSRCHR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSSTR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSCASECMP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSNCASECMP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSPCASECMP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSCASESTR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSCSPN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSPBRK]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSSPN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSSEP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSTOK_R]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRERROR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRERROR_R]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRERRORNAME_NP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGABBREV_NP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGDESCR_NP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRSIGNAL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRVERSCMP]) ++ dnl Support Microsoft deprecated alias function names by default. ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_MEMCCPY], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_STRDUP], [1]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_STRING_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_STRING_H_DEFAULTS]) ++]) ++ ++AC_DEFUN([gl_STRING_H_DEFAULTS], + [ +- GNULIB_EXPLICIT_BZERO=0; AC_SUBST([GNULIB_EXPLICIT_BZERO]) +- GNULIB_FFSL=0; AC_SUBST([GNULIB_FFSL]) +- GNULIB_FFSLL=0; AC_SUBST([GNULIB_FFSLL]) +- GNULIB_MEMCHR=0; AC_SUBST([GNULIB_MEMCHR]) +- GNULIB_MEMMEM=0; AC_SUBST([GNULIB_MEMMEM]) +- GNULIB_MEMPCPY=0; AC_SUBST([GNULIB_MEMPCPY]) +- GNULIB_MEMRCHR=0; AC_SUBST([GNULIB_MEMRCHR]) +- GNULIB_RAWMEMCHR=0; AC_SUBST([GNULIB_RAWMEMCHR]) +- GNULIB_STPCPY=0; AC_SUBST([GNULIB_STPCPY]) +- GNULIB_STPNCPY=0; AC_SUBST([GNULIB_STPNCPY]) +- GNULIB_STRCHRNUL=0; AC_SUBST([GNULIB_STRCHRNUL]) +- GNULIB_STRDUP=0; AC_SUBST([GNULIB_STRDUP]) +- GNULIB_STRNCAT=0; AC_SUBST([GNULIB_STRNCAT]) +- GNULIB_STRNDUP=0; AC_SUBST([GNULIB_STRNDUP]) +- GNULIB_STRNLEN=0; AC_SUBST([GNULIB_STRNLEN]) +- GNULIB_STRPBRK=0; AC_SUBST([GNULIB_STRPBRK]) +- GNULIB_STRSEP=0; AC_SUBST([GNULIB_STRSEP]) +- GNULIB_STRSTR=0; AC_SUBST([GNULIB_STRSTR]) +- GNULIB_STRCASESTR=0; AC_SUBST([GNULIB_STRCASESTR]) +- GNULIB_STRTOK_R=0; AC_SUBST([GNULIB_STRTOK_R]) +- GNULIB_MBSLEN=0; AC_SUBST([GNULIB_MBSLEN]) +- GNULIB_MBSNLEN=0; AC_SUBST([GNULIB_MBSNLEN]) +- GNULIB_MBSCHR=0; AC_SUBST([GNULIB_MBSCHR]) +- GNULIB_MBSRCHR=0; AC_SUBST([GNULIB_MBSRCHR]) +- GNULIB_MBSSTR=0; AC_SUBST([GNULIB_MBSSTR]) +- GNULIB_MBSCASECMP=0; AC_SUBST([GNULIB_MBSCASECMP]) +- GNULIB_MBSNCASECMP=0; AC_SUBST([GNULIB_MBSNCASECMP]) +- GNULIB_MBSPCASECMP=0; AC_SUBST([GNULIB_MBSPCASECMP]) +- GNULIB_MBSCASESTR=0; AC_SUBST([GNULIB_MBSCASESTR]) +- GNULIB_MBSCSPN=0; AC_SUBST([GNULIB_MBSCSPN]) +- GNULIB_MBSPBRK=0; AC_SUBST([GNULIB_MBSPBRK]) +- GNULIB_MBSSPN=0; AC_SUBST([GNULIB_MBSSPN]) +- GNULIB_MBSSEP=0; AC_SUBST([GNULIB_MBSSEP]) +- GNULIB_MBSTOK_R=0; AC_SUBST([GNULIB_MBSTOK_R]) +- GNULIB_STRERROR=0; AC_SUBST([GNULIB_STRERROR]) +- GNULIB_STRERROR_R=0; AC_SUBST([GNULIB_STRERROR_R]) +- GNULIB_STRERRORNAME_NP=0; AC_SUBST([GNULIB_STRERRORNAME_NP]) +- GNULIB_SIGABBREV_NP=0; AC_SUBST([GNULIB_SIGABBREV_NP]) +- GNULIB_SIGDESCR_NP=0; AC_SUBST([GNULIB_SIGDESCR_NP]) +- GNULIB_STRSIGNAL=0; AC_SUBST([GNULIB_STRSIGNAL]) +- GNULIB_STRVERSCMP=0; AC_SUBST([GNULIB_STRVERSCMP]) + HAVE_MBSLEN=0; AC_SUBST([HAVE_MBSLEN]) +- dnl Support Microsoft deprecated alias function names by default. +- GNULIB_MDA_MEMCCPY=1; AC_SUBST([GNULIB_MDA_MEMCCPY]) +- GNULIB_MDA_STRDUP=1; AC_SUBST([GNULIB_MDA_STRDUP]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_EXPLICIT_BZERO=1; AC_SUBST([HAVE_EXPLICIT_BZERO]) + HAVE_FFSL=1; AC_SUBST([HAVE_FFSL]) +diff --git a/m4/sys_file_h.m4 b/m4/sys_file_h.m4 +index 99c2285..bcde4d7 100644 +--- a/m4/sys_file_h.m4 ++++ b/m4/sys_file_h.m4 +@@ -1,5 +1,5 @@ + # Configure a replacement for . +-# serial 6 ++# serial 9 + + # Copyright (C) 2008-2021 Free Software Foundation, Inc. + # This file is free software; the Free Software Foundation +@@ -8,9 +8,9 @@ + + # Written by Richard W.M. Jones. + +-AC_DEFUN([gl_HEADER_SYS_FILE_H], ++AC_DEFUN_ONCE([gl_SYS_FILE_H], + [ +- AC_REQUIRE([gl_HEADER_SYS_FILE_H_DEFAULTS]) ++ AC_REQUIRE([gl_SYS_FILE_H_DEFAULTS]) + + dnl is always overridden, because of GNULIB_POSIXCHECK. + gl_CHECK_NEXT_HEADERS([sys/file.h]) +@@ -28,14 +28,29 @@ AC_DEFUN([gl_HEADER_SYS_FILE_H], + ]], [flock]) + ]) + +-AC_DEFUN([gl_HEADER_SYS_FILE_MODULE_INDICATOR], ++# gl_SYS_FILE_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. ++AC_DEFUN([gl_SYS_FILE_MODULE_INDICATOR], + [ +- AC_REQUIRE([gl_HEADER_SYS_FILE_H_DEFAULTS]) ++ gl_SYS_FILE_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + ]) + +-AC_DEFUN([gl_HEADER_SYS_FILE_H_DEFAULTS], ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_SYS_FILE_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_FILE_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FLOCK]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_FILE_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_SYS_FILE_H_DEFAULTS]) ++]) ++ ++AC_DEFUN([gl_SYS_FILE_H_DEFAULTS], + [ +- GNULIB_FLOCK=0; AC_SUBST([GNULIB_FLOCK]) + HAVE_FLOCK=1; AC_SUBST([HAVE_FLOCK]) + ]) +diff --git a/m4/sys_random_h.m4 b/m4/sys_random_h.m4 +index 45e0469..37bc316 100644 +--- a/m4/sys_random_h.m4 ++++ b/m4/sys_random_h.m4 +@@ -1,10 +1,10 @@ +-# sys_random_h.m4 serial 5 ++# sys_random_h.m4 serial 8 + dnl Copyright (C) 2020-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. + +-AC_DEFUN([gl_HEADER_SYS_RANDOM], ++AC_DEFUN_ONCE([gl_SYS_RANDOM_H], + [ + AC_REQUIRE([gl_SYS_RANDOM_H_DEFAULTS]) + dnl is always overridden, because of GNULIB_POSIXCHECK. +@@ -35,18 +35,33 @@ AC_DEFUN([gl_HEADER_SYS_RANDOM], + [getrandom]) + ]) + ++# gl_SYS_RANDOM_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_SYS_RANDOM_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_SYS_RANDOM_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_SYS_RANDOM_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_SYS_RANDOM_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_RANDOM_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETRANDOM]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_RANDOM_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_SYS_RANDOM_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_SYS_RANDOM_H_DEFAULTS], + [ +- GNULIB_GETRANDOM=0; AC_SUBST([GNULIB_GETRANDOM]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_GETRANDOM=1; AC_SUBST([HAVE_GETRANDOM]) + REPLACE_GETRANDOM=0; AC_SUBST([REPLACE_GETRANDOM]) +diff --git a/m4/sys_select_h.m4 b/m4/sys_select_h.m4 +index 4b33d31..2e7d140 100644 +--- a/m4/sys_select_h.m4 ++++ b/m4/sys_select_h.m4 +@@ -1,13 +1,13 @@ +-# sys_select_h.m4 serial 20 ++# sys_select_h.m4 serial 23 + dnl Copyright (C) 2006-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. + +-AC_DEFUN([gl_HEADER_SYS_SELECT], ++AC_DEFUN_ONCE([gl_SYS_SELECT_H], + [ +- AC_REQUIRE([AC_C_RESTRICT]) + AC_REQUIRE([gl_SYS_SELECT_H_DEFAULTS]) ++ AC_REQUIRE([AC_C_RESTRICT]) + AC_CACHE_CHECK([whether is self-contained], + [gl_cv_header_sys_select_h_selfcontained], + [ +@@ -75,19 +75,34 @@ AC_DEFUN([gl_HEADER_SYS_SELECT], + ]], [pselect select]) + ]) + ++# gl_SYS_SELECT_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_SYS_SELECT_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_SYS_SELECT_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_SYS_SELECT_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_SYS_SELECT_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_SELECT_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PSELECT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SELECT]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_SELECT_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_SYS_SELECT_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_SYS_SELECT_H_DEFAULTS], + [ +- GNULIB_PSELECT=0; AC_SUBST([GNULIB_PSELECT]) +- GNULIB_SELECT=0; AC_SUBST([GNULIB_SELECT]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_PSELECT=1; AC_SUBST([HAVE_PSELECT]) + REPLACE_PSELECT=0; AC_SUBST([REPLACE_PSELECT]) +diff --git a/m4/sys_socket_h.m4 b/m4/sys_socket_h.m4 +index 503cb96..5676a0d 100644 +--- a/m4/sys_socket_h.m4 ++++ b/m4/sys_socket_h.m4 +@@ -1,4 +1,4 @@ +-# sys_socket_h.m4 serial 25 ++# sys_socket_h.m4 serial 28 + dnl Copyright (C) 2005-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is preserved. + + dnl From Simon Josefsson. + +-AC_DEFUN([gl_HEADER_SYS_SOCKET], ++AC_DEFUN_ONCE([gl_SYS_SOCKET_H], + [ + AC_REQUIRE([gl_SYS_SOCKET_H_DEFAULTS]) + AC_REQUIRE([AC_CANONICAL_HOST]) +@@ -156,32 +156,47 @@ AC_DEFUN([gl_PREREQ_SYS_H_WS2TCPIP], + AC_SUBST([HAVE_WS2TCPIP_H]) + ]) + ++# gl_SYS_SOCKET_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_SYS_SOCKET_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_SYS_SOCKET_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_SYS_SOCKET_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_SYS_SOCKET_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_SOCKET_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SOCKET]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CONNECT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ACCEPT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_BIND]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETPEERNAME]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETSOCKNAME]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETSOCKOPT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LISTEN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RECV]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SEND]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RECVFROM]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SENDTO]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETSOCKOPT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SHUTDOWN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ACCEPT4]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_SOCKET_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_SYS_SOCKET_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_SYS_SOCKET_H_DEFAULTS], + [ +- GNULIB_SOCKET=0; AC_SUBST([GNULIB_SOCKET]) +- GNULIB_CONNECT=0; AC_SUBST([GNULIB_CONNECT]) +- GNULIB_ACCEPT=0; AC_SUBST([GNULIB_ACCEPT]) +- GNULIB_BIND=0; AC_SUBST([GNULIB_BIND]) +- GNULIB_GETPEERNAME=0; AC_SUBST([GNULIB_GETPEERNAME]) +- GNULIB_GETSOCKNAME=0; AC_SUBST([GNULIB_GETSOCKNAME]) +- GNULIB_GETSOCKOPT=0; AC_SUBST([GNULIB_GETSOCKOPT]) +- GNULIB_LISTEN=0; AC_SUBST([GNULIB_LISTEN]) +- GNULIB_RECV=0; AC_SUBST([GNULIB_RECV]) +- GNULIB_SEND=0; AC_SUBST([GNULIB_SEND]) +- GNULIB_RECVFROM=0; AC_SUBST([GNULIB_RECVFROM]) +- GNULIB_SENDTO=0; AC_SUBST([GNULIB_SENDTO]) +- GNULIB_SETSOCKOPT=0; AC_SUBST([GNULIB_SETSOCKOPT]) +- GNULIB_SHUTDOWN=0; AC_SUBST([GNULIB_SHUTDOWN]) +- GNULIB_ACCEPT4=0; AC_SUBST([GNULIB_ACCEPT4]) + HAVE_STRUCT_SOCKADDR_STORAGE=1; AC_SUBST([HAVE_STRUCT_SOCKADDR_STORAGE]) + HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY=1; + AC_SUBST([HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY]) +diff --git a/m4/sys_stat_h.m4 b/m4/sys_stat_h.m4 +index 23cbdd2..ac91d42 100644 +--- a/m4/sys_stat_h.m4 ++++ b/m4/sys_stat_h.m4 +@@ -1,4 +1,4 @@ +-# sys_stat_h.m4 serial 38 -*- Autoconf -*- ++# sys_stat_h.m4 serial 41 -*- Autoconf -*- + dnl Copyright (C) 2006-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is preserved. + dnl From Eric Blake. + dnl Provide a GNU-like . + +-AC_DEFUN([gl_HEADER_SYS_STAT_H], ++AC_DEFUN_ONCE([gl_SYS_STAT_H], + [ + AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS]) + +@@ -52,38 +52,53 @@ AC_DEFUN([gl_HEADER_SYS_STAT_H], + AC_REQUIRE([AC_C_RESTRICT]) + ]) + ++# gl_SYS_STAT_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_SYS_STAT_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_SYS_STAT_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_SYS_STAT_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_STAT_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_UNISTD_H_REQUIRE_DEFAULTS dnl for REPLACE_FCHDIR ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FCHMODAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSTAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSTATAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FUTIMENS]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETUMASK]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LCHMOD]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LSTAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKDIR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKDIRAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKFIFO]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKFIFOAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKNOD]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKNODAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UTIMENSAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OVERRIDES_STRUCT_STAT]) ++ dnl Support Microsoft deprecated alias function names by default. ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_CHMOD], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_MKDIR], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_UMASK], [1]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_STAT_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_SYS_STAT_H_DEFAULTS], + [ +- AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) dnl for REPLACE_FCHDIR +- GNULIB_FCHMODAT=0; AC_SUBST([GNULIB_FCHMODAT]) +- GNULIB_FSTAT=0; AC_SUBST([GNULIB_FSTAT]) +- GNULIB_FSTATAT=0; AC_SUBST([GNULIB_FSTATAT]) +- GNULIB_FUTIMENS=0; AC_SUBST([GNULIB_FUTIMENS]) +- GNULIB_GETUMASK=0; AC_SUBST([GNULIB_GETUMASK]) +- GNULIB_LCHMOD=0; AC_SUBST([GNULIB_LCHMOD]) +- GNULIB_LSTAT=0; AC_SUBST([GNULIB_LSTAT]) +- GNULIB_MKDIR=0; AC_SUBST([GNULIB_MKDIR]) +- GNULIB_MKDIRAT=0; AC_SUBST([GNULIB_MKDIRAT]) +- GNULIB_MKFIFO=0; AC_SUBST([GNULIB_MKFIFO]) +- GNULIB_MKFIFOAT=0; AC_SUBST([GNULIB_MKFIFOAT]) +- GNULIB_MKNOD=0; AC_SUBST([GNULIB_MKNOD]) +- GNULIB_MKNODAT=0; AC_SUBST([GNULIB_MKNODAT]) +- GNULIB_STAT=0; AC_SUBST([GNULIB_STAT]) +- GNULIB_UTIMENSAT=0; AC_SUBST([GNULIB_UTIMENSAT]) +- GNULIB_OVERRIDES_STRUCT_STAT=0; AC_SUBST([GNULIB_OVERRIDES_STRUCT_STAT]) +- dnl Support Microsoft deprecated alias function names by default. +- GNULIB_MDA_CHMOD=1; AC_SUBST([GNULIB_MDA_CHMOD]) +- GNULIB_MDA_MKDIR=1; AC_SUBST([GNULIB_MDA_MKDIR]) +- GNULIB_MDA_UMASK=1; AC_SUBST([GNULIB_MDA_UMASK]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_FCHMODAT=1; AC_SUBST([HAVE_FCHMODAT]) + HAVE_FSTATAT=1; AC_SUBST([HAVE_FSTATAT]) +diff --git a/m4/sys_time_h.m4 b/m4/sys_time_h.m4 +index 64f133d..c425a96 100644 +--- a/m4/sys_time_h.m4 ++++ b/m4/sys_time_h.m4 +@@ -1,5 +1,5 @@ + # Configure a replacement for . +-# serial 9 ++# serial 12 + + # Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. + # This file is free software; the Free Software Foundation +@@ -8,18 +8,13 @@ + + # Written by Paul Eggert and Martin Lambers. + +-AC_DEFUN([gl_HEADER_SYS_TIME_H], ++AC_DEFUN_ONCE([gl_SYS_TIME_H], + [ + dnl Use AC_REQUIRE here, so that the REPLACE_GETTIMEOFDAY=0 statement + dnl below is expanded once only, before all REPLACE_GETTIMEOFDAY=1 + dnl statements that occur in other macros. +- AC_REQUIRE([gl_HEADER_SYS_TIME_H_BODY]) +-]) +- +-AC_DEFUN([gl_HEADER_SYS_TIME_H_BODY], +-[ ++ AC_REQUIRE([gl_SYS_TIME_H_DEFAULTS]) + AC_REQUIRE([AC_C_RESTRICT]) +- AC_REQUIRE([gl_HEADER_SYS_TIME_H_DEFAULTS]) + AC_CHECK_HEADERS_ONCE([sys/time.h]) + gl_CHECK_NEXT_HEADERS([sys/time.h]) + +@@ -89,18 +84,33 @@ AC_DEFUN([gl_HEADER_SYS_TIME_H_BODY], + ]], [gettimeofday]) + ]) + ++# gl_SYS_TIME_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_SYS_TIME_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_HEADER_SYS_TIME_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_SYS_TIME_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + +-AC_DEFUN([gl_HEADER_SYS_TIME_H_DEFAULTS], ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_SYS_TIME_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_TIME_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETTIMEOFDAY]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_TIME_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_SYS_TIME_H_DEFAULTS]) ++]) ++ ++AC_DEFUN([gl_SYS_TIME_H_DEFAULTS], + [ +- GNULIB_GETTIMEOFDAY=0; AC_SUBST([GNULIB_GETTIMEOFDAY]) + dnl Assume POSIX behavior unless another module says otherwise. + HAVE_GETTIMEOFDAY=1; AC_SUBST([HAVE_GETTIMEOFDAY]) + HAVE_STRUCT_TIMEVAL=1; AC_SUBST([HAVE_STRUCT_TIMEVAL]) +diff --git a/m4/sys_times_h.m4 b/m4/sys_times_h.m4 +index b9daaa7..577ead6 100644 +--- a/m4/sys_times_h.m4 ++++ b/m4/sys_times_h.m4 +@@ -1,5 +1,5 @@ + # Configure a replacement for . +-# serial 8 ++# serial 11 + + # Copyright (C) 2008-2021 Free Software Foundation, Inc. + # This file is free software; the Free Software Foundation +@@ -8,7 +8,7 @@ + + # Written by Simon Josefsson. + +-AC_DEFUN([gl_SYS_TIMES_H], ++AC_DEFUN_ONCE([gl_SYS_TIMES_H], + [ + AC_REQUIRE([gl_SYS_TIMES_H_DEFAULTS]) + +@@ -36,16 +36,31 @@ AC_DEFUN([gl_SYS_TIMES_H], + ]], [times]) + ]) + ++# gl_SYS_TIMES_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_SYS_TIMES_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_SYS_TIMES_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_SYS_TIMES_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_SYS_TIMES_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_TIMES_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIMES]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_TIMES_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_SYS_TIMES_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_SYS_TIMES_H_DEFAULTS], + [ +- GNULIB_TIMES=0; AC_SUBST([GNULIB_TIMES]) + HAVE_STRUCT_TMS=1; AC_SUBST([HAVE_STRUCT_TMS]) + HAVE_TIMES=1; AC_SUBST([HAVE_TIMES]) + ]) +diff --git a/m4/sys_types_h.m4 b/m4/sys_types_h.m4 +index 2172c83..6dd6fee 100644 +--- a/m4/sys_types_h.m4 ++++ b/m4/sys_types_h.m4 +@@ -1,4 +1,4 @@ +-# sys_types_h.m4 serial 11 ++# sys_types_h.m4 serial 13 + dnl Copyright (C) 2011-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -6,10 +6,11 @@ dnl with or without modifications, as long as this notice is preserved. + + AC_DEFUN_ONCE([gl_SYS_TYPES_H], + [ ++ AC_REQUIRE([gl_SYS_TYPES_H_DEFAULTS]) ++ + dnl Use sane struct stat types in OpenVMS 8.2 and later. + AC_DEFINE([_USE_STD_STAT], 1, [For standard stat data types on VMS.]) + +- AC_REQUIRE([gl_SYS_TYPES_H_DEFAULTS]) + gl_NEXT_HEADERS([sys/types.h]) + + dnl Ensure the type pid_t gets defined. +@@ -30,6 +31,17 @@ AC_DEFUN_ONCE([gl_SYS_TYPES_H], + AC_SUBST([WINDOWS_STAT_INODES]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_SYS_TYPES_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_TYPE_H_MODULE_INDICATOR_DEFAULTS], [ ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_TYPE_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_SYS_TYPES_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_SYS_TYPES_H_DEFAULTS], + [ + ]) +diff --git a/m4/sys_uio_h.m4 b/m4/sys_uio_h.m4 +index 503de4d..fa176e0 100644 +--- a/m4/sys_uio_h.m4 ++++ b/m4/sys_uio_h.m4 +@@ -1,10 +1,10 @@ +-# sys_uio_h.m4 serial 1 ++# sys_uio_h.m4 serial 3 + dnl Copyright (C) 2011-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. + +-AC_DEFUN([gl_HEADER_SYS_UIO], ++AC_DEFUN_ONCE([gl_SYS_UIO_H], + [ + AC_REQUIRE([gl_SYS_UIO_H_DEFAULTS]) + dnl is always overridden, because of GNULIB_POSIXCHECK. +@@ -17,15 +17,30 @@ AC_DEFUN([gl_HEADER_SYS_UIO], + AC_SUBST([HAVE_SYS_UIO_H]) + ]) + ++# gl_SYS_UIO_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_SYS_UIO_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_SYS_UIO_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_SYS_UIO_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_SYS_UIO_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_UIO_H_MODULE_INDICATOR_DEFAULTS], [ ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_UIO_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_SYS_UIO_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_SYS_UIO_H_DEFAULTS], + [ + ]) +diff --git a/m4/threadlib.m4 b/m4/threadlib.m4 +index 8fc3dfd..37b797c 100644 +--- a/m4/threadlib.m4 ++++ b/m4/threadlib.m4 +@@ -1,4 +1,4 @@ +-# threadlib.m4 serial 30 ++# threadlib.m4 serial 31 + dnl Copyright (C) 2005-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -212,6 +212,27 @@ AC_DEFUN([gl_PTHREADLIB_BODY], + LIBS=$save_LIBS + test $gl_pthread_api = yes && break + done ++ echo "$as_me:__oline__: gl_pthread_api=$gl_pthread_api" >&AS_MESSAGE_LOG_FD ++ echo "$as_me:__oline__: LIBPTHREAD=$LIBPTHREAD" >&AS_MESSAGE_LOG_FD ++ ++ gl_pthread_in_glibc=no ++ # On Linux with glibc >= 2.34, libc contains the fully functional ++ # pthread functions. ++ case "$host_os" in ++ linux*) ++ AC_EGREP_CPP([Lucky user], ++ [#include ++ #ifdef __GNU_LIBRARY__ ++ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 34) || (__GLIBC__ > 2) ++ Lucky user ++ #endif ++ #endif ++ ], ++ [gl_pthread_in_glibc=yes], ++ []) ++ ;; ++ esac ++ echo "$as_me:__oline__: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&AS_MESSAGE_LOG_FD + + # Test for libpthread by looking for pthread_kill. (Not pthread_self, + # since it is defined as a macro on OSF/1.) +@@ -219,18 +240,22 @@ AC_DEFUN([gl_PTHREADLIB_BODY], + # The program links fine without libpthread. But it may actually + # need to link with libpthread in order to create multiple threads. + AC_CHECK_LIB([pthread], [pthread_kill], +- [LIBPMULTITHREAD=-lpthread +- # On Solaris and HP-UX, most pthread functions exist also in libc. +- # Therefore pthread_in_use() needs to actually try to create a +- # thread: pthread_create from libc will fail, whereas +- # pthread_create will actually create a thread. +- # On Solaris 10 or newer, this test is no longer needed, because +- # libc contains the fully functional pthread functions. +- case "$host_os" in +- solaris | solaris2.[1-9] | solaris2.[1-9].* | hpux*) +- AC_DEFINE([PTHREAD_IN_USE_DETECTION_HARD], [1], +- [Define if the pthread_in_use() detection is hard.]) +- esac ++ [if test $gl_pthread_in_glibc = yes; then ++ LIBPMULTITHREAD= ++ else ++ LIBPMULTITHREAD=-lpthread ++ # On Solaris and HP-UX, most pthread functions exist also in libc. ++ # Therefore pthread_in_use() needs to actually try to create a ++ # thread: pthread_create from libc will fail, whereas ++ # pthread_create will actually create a thread. ++ # On Solaris 10 or newer, this test is no longer needed, because ++ # libc contains the fully functional pthread functions. ++ case "$host_os" in ++ solaris | solaris2.[1-9] | solaris2.[1-9].* | hpux*) ++ AC_DEFINE([PTHREAD_IN_USE_DETECTION_HARD], [1], ++ [Define if the pthread_in_use() detection is hard.]) ++ esac ++ fi + ]) + elif test $gl_pthread_api != yes; then + # Some library is needed. Try libpthread and libc_r. +@@ -246,6 +271,7 @@ AC_DEFUN([gl_PTHREADLIB_BODY], + LIBPMULTITHREAD=-lc_r]) + fi + fi ++ echo "$as_me:__oline__: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&AS_MESSAGE_LOG_FD + fi + AC_MSG_CHECKING([whether POSIX threads API is available]) + AC_MSG_RESULT([$gl_pthread_api]) +@@ -311,7 +337,8 @@ AC_DEFUN([gl_STDTHREADLIB_BODY], + dnl glibc >= 2.29 has thrd_create in libpthread. + dnl FreeBSD >= 10 has thrd_create in libstdthreads; this library depends + dnl on libpthread (for the symbol 'pthread_mutexattr_gettype'). +- dnl AIX >= 7.1 and Solaris >= 11.4 have thrd_create in libc. ++ dnl glibc >= 2.34, AIX >= 7.1, and Solaris >= 11.4 have thrd_create in ++ dnl libc. + AC_CHECK_FUNCS([thrd_create]) + if test $ac_cv_func_thrd_create = yes; then + LIBSTDTHREAD= +@@ -481,7 +508,10 @@ AC_DEFUN([gl_THREADLIB_BODY], + gl_threads_api=posix + AC_DEFINE([USE_POSIX_THREADS], [1], + [Define if the POSIX multithreading library can be used.]) +- if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then ++ if test -z "$LIBMULTITHREAD" && test -z "$LTLIBMULTITHREAD"; then ++ AC_DEFINE([USE_POSIX_THREADS_FROM_LIBC], [1], ++ [Define if references to the POSIX multithreading library are satisfied by libc.]) ++ else + if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then + AC_DEFINE([USE_POSIX_THREADS_WEAK], [1], + [Define if references to the POSIX multithreading library should be made weak.]) +@@ -576,7 +606,9 @@ dnl flavours option weak result + dnl --------------- --------- --------- -------- --------- + dnl Linux 2.4/glibc posix -lpthread Y OK + dnl +-dnl GNU Hurd/glibc posix ++dnl Linux/glibc 2.34 posix Y OK ++dnl ++dnl GNU Hurd/glibc posix -lpthread Y OK + dnl + dnl Ubuntu 14.04 posix -pthread Y OK + dnl +diff --git a/m4/time_h.m4 b/m4/time_h.m4 +index b6a1aa3..b57474b 100644 +--- a/m4/time_h.m4 ++++ b/m4/time_h.m4 +@@ -2,7 +2,7 @@ + + # Copyright (C) 2000-2001, 2003-2007, 2009-2021 Free Software Foundation, Inc. + +-# serial 15 ++# serial 18 + + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -10,16 +10,11 @@ + + # Written by Paul Eggert and Jim Meyering. + +-AC_DEFUN([gl_HEADER_TIME_H], ++AC_DEFUN_ONCE([gl_TIME_H], + [ +- dnl Use AC_REQUIRE here, so that the default behavior below is expanded +- dnl once only, before all statements that occur in other macros. +- AC_REQUIRE([gl_HEADER_TIME_H_BODY]) +-]) +- +-AC_DEFUN([gl_HEADER_TIME_H_BODY], +-[ +- AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only, before all statements ++ dnl that occur in other macros. ++ AC_REQUIRE([gl_TIME_H_DEFAULTS]) + + gl_NEXT_HEADERS([time.h]) + AC_REQUIRE([gl_CHECK_TYPE_STRUCT_TIMESPEC]) +@@ -111,30 +106,45 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_TIMESPEC], + AC_SUBST([UNISTD_H_DEFINES_STRUCT_TIMESPEC]) + ]) + ++# gl_TIME_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_TIME_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_TIME_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + +-AC_DEFUN([gl_HEADER_TIME_H_DEFAULTS], ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_TIME_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_TIME_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CTIME]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKTIME]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOCALTIME]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_NANOSLEEP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRFTIME]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRPTIME]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIMEGM]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIMESPEC_GET]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIME_R]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIME_RZ]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TZSET]) ++ dnl Support Microsoft deprecated alias function names by default. ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_TZSET], [1]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_TIME_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_TIME_H_DEFAULTS]) ++]) ++ ++AC_DEFUN([gl_TIME_H_DEFAULTS], + [ +- GNULIB_CTIME=0; AC_SUBST([GNULIB_CTIME]) +- GNULIB_MKTIME=0; AC_SUBST([GNULIB_MKTIME]) +- GNULIB_LOCALTIME=0; AC_SUBST([GNULIB_LOCALTIME]) +- GNULIB_NANOSLEEP=0; AC_SUBST([GNULIB_NANOSLEEP]) +- GNULIB_STRFTIME=0; AC_SUBST([GNULIB_STRFTIME]) +- GNULIB_STRPTIME=0; AC_SUBST([GNULIB_STRPTIME]) +- GNULIB_TIMEGM=0; AC_SUBST([GNULIB_TIMEGM]) +- GNULIB_TIMESPEC_GET=0; AC_SUBST([GNULIB_TIMESPEC_GET]) +- GNULIB_TIME_R=0; AC_SUBST([GNULIB_TIME_R]) +- GNULIB_TIME_RZ=0; AC_SUBST([GNULIB_TIME_RZ]) +- GNULIB_TZSET=0; AC_SUBST([GNULIB_TZSET]) +- dnl Support Microsoft deprecated alias function names by default. +- GNULIB_MDA_TZSET=1; AC_SUBST([GNULIB_MDA_TZSET]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_DECL_LOCALTIME_R=1; AC_SUBST([HAVE_DECL_LOCALTIME_R]) + HAVE_NANOSLEEP=1; AC_SUBST([HAVE_NANOSLEEP]) +diff --git a/m4/time_r.m4 b/m4/time_r.m4 +index 713e93a..2d49b64 100644 +--- a/m4/time_r.m4 ++++ b/m4/time_r.m4 +@@ -12,7 +12,7 @@ AC_DEFUN([gl_TIME_R], + dnl Persuade glibc and Solaris to declare localtime_r. + AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) + +- AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) ++ AC_REQUIRE([gl_TIME_H_DEFAULTS]) + AC_REQUIRE([AC_C_RESTRICT]) + + dnl Some systems don't declare localtime_r() and gmtime_r() if _REENTRANT is +diff --git a/m4/time_rz.m4 b/m4/time_rz.m4 +index 34ef0ba..c5e85dc 100644 +--- a/m4/time_rz.m4 ++++ b/m4/time_rz.m4 +@@ -10,7 +10,7 @@ dnl Written by Paul Eggert. + AC_DEFUN([gl_TIME_RZ], + [ + AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) +- AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) ++ AC_REQUIRE([gl_TIME_H_DEFAULTS]) + AC_REQUIRE([AC_STRUCT_TIMEZONE]) + + # On Mac OS X 10.6, localtime loops forever with some time_t values. +diff --git a/m4/timegm.m4 b/m4/timegm.m4 +index 098c857..58123be 100644 +--- a/m4/timegm.m4 ++++ b/m4/timegm.m4 +@@ -1,4 +1,4 @@ +-# timegm.m4 serial 12 ++# timegm.m4 serial 13 + dnl Copyright (C) 2003, 2007, 2009-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is preserved. + + AC_DEFUN([gl_FUNC_TIMEGM], + [ +- AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) ++ AC_REQUIRE([gl_TIME_H_DEFAULTS]) + AC_REQUIRE([gl_FUNC_MKTIME_WORKS]) + REPLACE_TIMEGM=0 + AC_CHECK_FUNCS_ONCE([timegm]) +diff --git a/m4/tzset.m4 b/m4/tzset.m4 +index 8eaf41f..8a4f285 100644 +--- a/m4/tzset.m4 ++++ b/m4/tzset.m4 +@@ -1,4 +1,4 @@ +-# serial 15 ++# serial 16 + + # Copyright (C) 2003, 2007, 2009-2021 Free Software Foundation, Inc. + # This file is free software; the Free Software Foundation +@@ -9,7 +9,7 @@ + + AC_DEFUN([gl_FUNC_TZSET], + [ +- AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) ++ AC_REQUIRE([gl_TIME_H_DEFAULTS]) + AC_REQUIRE([AC_CANONICAL_HOST]) + REPLACE_TZSET=0 + case "$host_os" in +diff --git a/m4/unistd_h.m4 b/m4/unistd_h.m4 +index 0f26fb9..0ce4ea4 100644 +--- a/m4/unistd_h.m4 ++++ b/m4/unistd_h.m4 +@@ -1,4 +1,4 @@ +-# unistd_h.m4 serial 85 ++# unistd_h.m4 serial 89 + dnl Copyright (C) 2006-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -6,10 +6,10 @@ dnl with or without modifications, as long as this notice is preserved. + + dnl Written by Simon Josefsson, Bruno Haible. + +-AC_DEFUN([gl_UNISTD_H], ++AC_DEFUN_ONCE([gl_UNISTD_H], + [ +- dnl Use AC_REQUIRE here, so that the default behavior below is expanded +- dnl once only, before all statements that occur in other macros. ++ dnl Ensure to expand the default settings once only, before all statements ++ dnl that occur in other macros. + AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) + + gl_CHECK_NEXT_HEADERS([unistd.h]) +@@ -59,100 +59,116 @@ AC_DEFUN([gl_UNISTD_H], + fi + ]) + ++# gl_UNISTD_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_UNISTD_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_UNISTD_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_UNISTD_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_UNISTD_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ACCESS]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CHDIR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CHOWN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CLOSE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_COPY_FILE_RANGE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DUP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DUP2]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DUP3]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ENVIRON]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EUIDACCESS]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECLE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECLP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECV]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECVE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECVP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECVPE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FACCESSAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FCHDIR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FCHOWNAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FDATASYNC]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSYNC]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FTRUNCATE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETCWD]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETDOMAINNAME]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETDTABLESIZE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETENTROPY]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETGROUPS]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETHOSTNAME]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETLOGIN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETLOGIN_R]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETOPT_POSIX]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETPAGESIZE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETPASS]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETUSERSHELL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GROUP_MEMBER]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISATTY]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LCHOWN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LINK]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LINKAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LSEEK]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PIPE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PIPE2]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PREAD]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PWRITE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_READ]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_READLINK]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_READLINKAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RMDIR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETHOSTNAME]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SLEEP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SYMLINK]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SYMLINKAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TRUNCATE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TTYNAME_R]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNISTD_H_GETOPT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNISTD_H_NONBLOCKING]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNISTD_H_SIGPIPE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNLINK]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNLINKAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_USLEEP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WRITE]) ++ dnl Support Microsoft deprecated alias function names by default. ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_ACCESS], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_CHDIR], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_CLOSE], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_DUP], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_DUP2], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECL], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECLE], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECLP], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECV], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECVE], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECVP], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECVPE], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_GETCWD], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_GETPID], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_ISATTY], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_LSEEK], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_READ], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_RMDIR], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_SWAB], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_UNLINK], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_WRITE], [1]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_UNISTD_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_UNISTD_H_DEFAULTS], + [ +- GNULIB_ACCESS=0; AC_SUBST([GNULIB_ACCESS]) +- GNULIB_CHDIR=0; AC_SUBST([GNULIB_CHDIR]) +- GNULIB_CHOWN=0; AC_SUBST([GNULIB_CHOWN]) +- GNULIB_CLOSE=0; AC_SUBST([GNULIB_CLOSE]) +- GNULIB_COPY_FILE_RANGE=0; AC_SUBST([GNULIB_COPY_FILE_RANGE]) +- GNULIB_DUP=0; AC_SUBST([GNULIB_DUP]) +- GNULIB_DUP2=0; AC_SUBST([GNULIB_DUP2]) +- GNULIB_DUP3=0; AC_SUBST([GNULIB_DUP3]) +- GNULIB_ENVIRON=0; AC_SUBST([GNULIB_ENVIRON]) +- GNULIB_EUIDACCESS=0; AC_SUBST([GNULIB_EUIDACCESS]) +- GNULIB_EXECL=0; AC_SUBST([GNULIB_EXECL]) +- GNULIB_EXECLE=0; AC_SUBST([GNULIB_EXECLE]) +- GNULIB_EXECLP=0; AC_SUBST([GNULIB_EXECLP]) +- GNULIB_EXECV=0; AC_SUBST([GNULIB_EXECV]) +- GNULIB_EXECVE=0; AC_SUBST([GNULIB_EXECVE]) +- GNULIB_EXECVP=0; AC_SUBST([GNULIB_EXECVP]) +- GNULIB_EXECVPE=0; AC_SUBST([GNULIB_EXECVPE]) +- GNULIB_FACCESSAT=0; AC_SUBST([GNULIB_FACCESSAT]) +- GNULIB_FCHDIR=0; AC_SUBST([GNULIB_FCHDIR]) +- GNULIB_FCHOWNAT=0; AC_SUBST([GNULIB_FCHOWNAT]) +- GNULIB_FDATASYNC=0; AC_SUBST([GNULIB_FDATASYNC]) +- GNULIB_FSYNC=0; AC_SUBST([GNULIB_FSYNC]) +- GNULIB_FTRUNCATE=0; AC_SUBST([GNULIB_FTRUNCATE]) +- GNULIB_GETCWD=0; AC_SUBST([GNULIB_GETCWD]) +- GNULIB_GETDOMAINNAME=0; AC_SUBST([GNULIB_GETDOMAINNAME]) +- GNULIB_GETDTABLESIZE=0; AC_SUBST([GNULIB_GETDTABLESIZE]) +- GNULIB_GETENTROPY=0; AC_SUBST([GNULIB_GETENTROPY]) +- GNULIB_GETGROUPS=0; AC_SUBST([GNULIB_GETGROUPS]) +- GNULIB_GETHOSTNAME=0; AC_SUBST([GNULIB_GETHOSTNAME]) +- GNULIB_GETLOGIN=0; AC_SUBST([GNULIB_GETLOGIN]) +- GNULIB_GETLOGIN_R=0; AC_SUBST([GNULIB_GETLOGIN_R]) +- GNULIB_GETOPT_POSIX=0; AC_SUBST([GNULIB_GETOPT_POSIX]) +- GNULIB_GETPAGESIZE=0; AC_SUBST([GNULIB_GETPAGESIZE]) +- GNULIB_GETPASS=0; AC_SUBST([GNULIB_GETPASS]) +- GNULIB_GETUSERSHELL=0; AC_SUBST([GNULIB_GETUSERSHELL]) +- GNULIB_GROUP_MEMBER=0; AC_SUBST([GNULIB_GROUP_MEMBER]) +- GNULIB_ISATTY=0; AC_SUBST([GNULIB_ISATTY]) +- GNULIB_LCHOWN=0; AC_SUBST([GNULIB_LCHOWN]) +- GNULIB_LINK=0; AC_SUBST([GNULIB_LINK]) +- GNULIB_LINKAT=0; AC_SUBST([GNULIB_LINKAT]) +- GNULIB_LSEEK=0; AC_SUBST([GNULIB_LSEEK]) +- GNULIB_PIPE=0; AC_SUBST([GNULIB_PIPE]) +- GNULIB_PIPE2=0; AC_SUBST([GNULIB_PIPE2]) +- GNULIB_PREAD=0; AC_SUBST([GNULIB_PREAD]) +- GNULIB_PWRITE=0; AC_SUBST([GNULIB_PWRITE]) +- GNULIB_READ=0; AC_SUBST([GNULIB_READ]) +- GNULIB_READLINK=0; AC_SUBST([GNULIB_READLINK]) +- GNULIB_READLINKAT=0; AC_SUBST([GNULIB_READLINKAT]) +- GNULIB_RMDIR=0; AC_SUBST([GNULIB_RMDIR]) +- GNULIB_SETHOSTNAME=0; AC_SUBST([GNULIB_SETHOSTNAME]) +- GNULIB_SLEEP=0; AC_SUBST([GNULIB_SLEEP]) +- GNULIB_SYMLINK=0; AC_SUBST([GNULIB_SYMLINK]) +- GNULIB_SYMLINKAT=0; AC_SUBST([GNULIB_SYMLINKAT]) +- GNULIB_TRUNCATE=0; AC_SUBST([GNULIB_TRUNCATE]) +- GNULIB_TTYNAME_R=0; AC_SUBST([GNULIB_TTYNAME_R]) +- GNULIB_UNISTD_H_NONBLOCKING=0; AC_SUBST([GNULIB_UNISTD_H_NONBLOCKING]) +- GNULIB_UNISTD_H_SIGPIPE=0; AC_SUBST([GNULIB_UNISTD_H_SIGPIPE]) +- GNULIB_UNLINK=0; AC_SUBST([GNULIB_UNLINK]) +- GNULIB_UNLINKAT=0; AC_SUBST([GNULIB_UNLINKAT]) +- GNULIB_USLEEP=0; AC_SUBST([GNULIB_USLEEP]) +- GNULIB_WRITE=0; AC_SUBST([GNULIB_WRITE]) +- dnl Support Microsoft deprecated alias function names by default. +- GNULIB_MDA_ACCESS=1; AC_SUBST([GNULIB_MDA_ACCESS]) +- GNULIB_MDA_CHDIR=1; AC_SUBST([GNULIB_MDA_CHDIR]) +- GNULIB_MDA_CLOSE=1; AC_SUBST([GNULIB_MDA_CLOSE]) +- GNULIB_MDA_DUP=1; AC_SUBST([GNULIB_MDA_DUP]) +- GNULIB_MDA_DUP2=1; AC_SUBST([GNULIB_MDA_DUP2]) +- GNULIB_MDA_EXECL=1; AC_SUBST([GNULIB_MDA_EXECL]) +- GNULIB_MDA_EXECLE=1; AC_SUBST([GNULIB_MDA_EXECLE]) +- GNULIB_MDA_EXECLP=1; AC_SUBST([GNULIB_MDA_EXECLP]) +- GNULIB_MDA_EXECV=1; AC_SUBST([GNULIB_MDA_EXECV]) +- GNULIB_MDA_EXECVE=1; AC_SUBST([GNULIB_MDA_EXECVE]) +- GNULIB_MDA_EXECVP=1; AC_SUBST([GNULIB_MDA_EXECVP]) +- GNULIB_MDA_EXECVPE=1; AC_SUBST([GNULIB_MDA_EXECVPE]) +- GNULIB_MDA_GETCWD=1; AC_SUBST([GNULIB_MDA_GETCWD]) +- GNULIB_MDA_GETPID=1; AC_SUBST([GNULIB_MDA_GETPID]) +- GNULIB_MDA_ISATTY=1; AC_SUBST([GNULIB_MDA_ISATTY]) +- GNULIB_MDA_LSEEK=1; AC_SUBST([GNULIB_MDA_LSEEK]) +- GNULIB_MDA_READ=1; AC_SUBST([GNULIB_MDA_READ]) +- GNULIB_MDA_RMDIR=1; AC_SUBST([GNULIB_MDA_RMDIR]) +- GNULIB_MDA_SWAB=1; AC_SUBST([GNULIB_MDA_SWAB]) +- GNULIB_MDA_UNLINK=1; AC_SUBST([GNULIB_MDA_UNLINK]) +- GNULIB_MDA_WRITE=1; AC_SUBST([GNULIB_MDA_WRITE]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_CHOWN=1; AC_SUBST([HAVE_CHOWN]) + HAVE_COPY_FILE_RANGE=1; AC_SUBST([HAVE_COPY_FILE_RANGE]) +diff --git a/m4/visibility.m4 b/m4/visibility.m4 +index 8f27a12..d161bd7 100644 +--- a/m4/visibility.m4 ++++ b/m4/visibility.m4 +@@ -1,4 +1,4 @@ +-# visibility.m4 serial 7 ++# visibility.m4 serial 8 + dnl Copyright (C) 2005, 2008, 2010-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -59,6 +59,10 @@ AC_DEFUN([gl_VISIBILITY], + extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void); + extern __attribute__((__visibility__("default"))) int exportedfunc (void); + void dummyfunc (void); ++ int hiddenvar; ++ int exportedvar; ++ int hiddenfunc (void) { return 51; } ++ int exportedfunc (void) { return 1225736919; } + void dummyfunc (void) {} + ]], + [[]])], +diff --git a/m4/wchar_h.m4 b/m4/wchar_h.m4 +index 59c55fc..818b319 100644 +--- a/m4/wchar_h.m4 ++++ b/m4/wchar_h.m4 +@@ -7,9 +7,9 @@ dnl with or without modifications, as long as this notice is preserved. + + dnl Written by Eric Blake. + +-# wchar_h.m4 serial 50 ++# wchar_h.m4 serial 53 + +-AC_DEFUN([gl_WCHAR_H], ++AC_DEFUN_ONCE([gl_WCHAR_H], + [ + AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) + AC_REQUIRE([gl_WCHAR_H_INLINE_OK]) +@@ -125,60 +125,75 @@ Configuration aborted.]) + fi + ]) + ++# gl_WCHAR_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_WCHAR_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_WCHAR_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_WCHAR_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_WCHAR_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_BTOWC]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCTOB]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSINIT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBRTOWC]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBRLEN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSRTOWCS]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSNRTOWCS]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCRTOMB]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSRTOMBS]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNRTOMBS]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCWIDTH]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMCHR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMCMP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMCPY]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMMOVE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMPCPY]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMSET]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSLEN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNLEN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCPY]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCPCPY]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNCPY]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCPNCPY]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNCAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCMP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNCMP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCASECMP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNCASECMP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCOLL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSXFRM]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSDUP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCHR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSRCHR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCSPN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSSPN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSPBRK]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSSTR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSTOK]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSWIDTH]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSFTIME]) ++ dnl Support Microsoft deprecated alias function names by default. ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_WCSDUP], [1]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_WCHAR_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_WCHAR_H_DEFAULTS], + [ +- GNULIB_BTOWC=0; AC_SUBST([GNULIB_BTOWC]) +- GNULIB_WCTOB=0; AC_SUBST([GNULIB_WCTOB]) +- GNULIB_MBSINIT=0; AC_SUBST([GNULIB_MBSINIT]) +- GNULIB_MBRTOWC=0; AC_SUBST([GNULIB_MBRTOWC]) +- GNULIB_MBRLEN=0; AC_SUBST([GNULIB_MBRLEN]) +- GNULIB_MBSRTOWCS=0; AC_SUBST([GNULIB_MBSRTOWCS]) +- GNULIB_MBSNRTOWCS=0; AC_SUBST([GNULIB_MBSNRTOWCS]) +- GNULIB_WCRTOMB=0; AC_SUBST([GNULIB_WCRTOMB]) +- GNULIB_WCSRTOMBS=0; AC_SUBST([GNULIB_WCSRTOMBS]) +- GNULIB_WCSNRTOMBS=0; AC_SUBST([GNULIB_WCSNRTOMBS]) +- GNULIB_WCWIDTH=0; AC_SUBST([GNULIB_WCWIDTH]) +- GNULIB_WMEMCHR=0; AC_SUBST([GNULIB_WMEMCHR]) +- GNULIB_WMEMCMP=0; AC_SUBST([GNULIB_WMEMCMP]) +- GNULIB_WMEMCPY=0; AC_SUBST([GNULIB_WMEMCPY]) +- GNULIB_WMEMMOVE=0; AC_SUBST([GNULIB_WMEMMOVE]) +- GNULIB_WMEMPCPY=0; AC_SUBST([GNULIB_WMEMPCPY]) +- GNULIB_WMEMSET=0; AC_SUBST([GNULIB_WMEMSET]) +- GNULIB_WCSLEN=0; AC_SUBST([GNULIB_WCSLEN]) +- GNULIB_WCSNLEN=0; AC_SUBST([GNULIB_WCSNLEN]) +- GNULIB_WCSCPY=0; AC_SUBST([GNULIB_WCSCPY]) +- GNULIB_WCPCPY=0; AC_SUBST([GNULIB_WCPCPY]) +- GNULIB_WCSNCPY=0; AC_SUBST([GNULIB_WCSNCPY]) +- GNULIB_WCPNCPY=0; AC_SUBST([GNULIB_WCPNCPY]) +- GNULIB_WCSCAT=0; AC_SUBST([GNULIB_WCSCAT]) +- GNULIB_WCSNCAT=0; AC_SUBST([GNULIB_WCSNCAT]) +- GNULIB_WCSCMP=0; AC_SUBST([GNULIB_WCSCMP]) +- GNULIB_WCSNCMP=0; AC_SUBST([GNULIB_WCSNCMP]) +- GNULIB_WCSCASECMP=0; AC_SUBST([GNULIB_WCSCASECMP]) +- GNULIB_WCSNCASECMP=0; AC_SUBST([GNULIB_WCSNCASECMP]) +- GNULIB_WCSCOLL=0; AC_SUBST([GNULIB_WCSCOLL]) +- GNULIB_WCSXFRM=0; AC_SUBST([GNULIB_WCSXFRM]) +- GNULIB_WCSDUP=0; AC_SUBST([GNULIB_WCSDUP]) +- GNULIB_WCSCHR=0; AC_SUBST([GNULIB_WCSCHR]) +- GNULIB_WCSRCHR=0; AC_SUBST([GNULIB_WCSRCHR]) +- GNULIB_WCSCSPN=0; AC_SUBST([GNULIB_WCSCSPN]) +- GNULIB_WCSSPN=0; AC_SUBST([GNULIB_WCSSPN]) +- GNULIB_WCSPBRK=0; AC_SUBST([GNULIB_WCSPBRK]) +- GNULIB_WCSSTR=0; AC_SUBST([GNULIB_WCSSTR]) +- GNULIB_WCSTOK=0; AC_SUBST([GNULIB_WCSTOK]) +- GNULIB_WCSWIDTH=0; AC_SUBST([GNULIB_WCSWIDTH]) +- GNULIB_WCSFTIME=0; AC_SUBST([GNULIB_WCSFTIME]) +- dnl Support Microsoft deprecated alias function names by default. +- GNULIB_MDA_WCSDUP=1; AC_SUBST([GNULIB_MDA_WCSDUP]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_BTOWC=1; AC_SUBST([HAVE_BTOWC]) + HAVE_MBSINIT=1; AC_SUBST([HAVE_MBSINIT]) +diff --git a/m4/wctype_h.m4 b/m4/wctype_h.m4 +index 1ab0bc9..7d74212 100644 +--- a/m4/wctype_h.m4 ++++ b/m4/wctype_h.m4 +@@ -1,4 +1,4 @@ +-# wctype_h.m4 serial 26 ++# wctype_h.m4 serial 30 + + dnl A placeholder for ISO C99 , for platforms that lack it. + +@@ -9,7 +9,7 @@ dnl with or without modifications, as long as this notice is preserved. + + dnl Written by Paul Eggert. + +-AC_DEFUN([gl_WCTYPE_H], ++AC_DEFUN_ONCE([gl_WCTYPE_H], + [ + AC_REQUIRE([gl_WCTYPE_H_DEFAULTS]) + AC_REQUIRE([AC_PROG_CC]) +@@ -62,7 +62,7 @@ AC_DEFUN([gl_WCTYPE_H], + fi + AC_SUBST([HAVE_WCTYPE_H]) + +- if test $GNULIB_OVERRIDES_WINT_T = 1; then ++ if test $GNULIBHEADERS_OVERRIDE_WINT_T = 1; then + REPLACE_ISWCNTRL=1 + else + case "$gl_cv_func_iswcntrl_works" in +@@ -157,24 +157,39 @@ AC_DEFUN([gl_WCTYPE_H], + ]) + ]) + ++# gl_WCTYPE_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_WCTYPE_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_WCTYPE_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_WCTYPE_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_WCTYPE_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_WCTYPE_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISWBLANK]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISWDIGIT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISWXDIGIT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCTYPE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISWCTYPE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCTRANS]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TOWCTRANS]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_WCTYPE_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_WCTYPE_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_WCTYPE_H_DEFAULTS], + [ +- GNULIB_ISWBLANK=0; AC_SUBST([GNULIB_ISWBLANK]) +- GNULIB_ISWDIGIT=0; AC_SUBST([GNULIB_ISWDIGIT]) +- GNULIB_ISWXDIGIT=0; AC_SUBST([GNULIB_ISWXDIGIT]) +- GNULIB_WCTYPE=0; AC_SUBST([GNULIB_WCTYPE]) +- GNULIB_ISWCTYPE=0; AC_SUBST([GNULIB_ISWCTYPE]) +- GNULIB_WCTRANS=0; AC_SUBST([GNULIB_WCTRANS]) +- GNULIB_TOWCTRANS=0; AC_SUBST([GNULIB_TOWCTRANS]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_ISWBLANK=1; AC_SUBST([HAVE_ISWBLANK]) + HAVE_WCTYPE_T=1; AC_SUBST([HAVE_WCTYPE_T]) +diff --git a/m4/wint_t.m4 b/m4/wint_t.m4 +index 2fc7467..a49c508 100644 +--- a/m4/wint_t.m4 ++++ b/m4/wint_t.m4 +@@ -1,4 +1,4 @@ +-# wint_t.m4 serial 10 ++# wint_t.m4 serial 11 + dnl Copyright (C) 2003, 2007-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -34,14 +34,14 @@ AC_DEFUN([gt_TYPE_WINT_T], + [gl_cv_type_wint_t_large_enough=yes], + [gl_cv_type_wint_t_large_enough=no])]) + if test $gl_cv_type_wint_t_large_enough = no; then +- GNULIB_OVERRIDES_WINT_T=1 ++ GNULIBHEADERS_OVERRIDE_WINT_T=1 + else +- GNULIB_OVERRIDES_WINT_T=0 ++ GNULIBHEADERS_OVERRIDE_WINT_T=0 + fi + else +- GNULIB_OVERRIDES_WINT_T=0 ++ GNULIBHEADERS_OVERRIDE_WINT_T=0 + fi +- AC_SUBST([GNULIB_OVERRIDES_WINT_T]) ++ AC_SUBST([GNULIBHEADERS_OVERRIDE_WINT_T]) + ]) + + dnl Prerequisites of the 'wint_t' override. +diff --git a/m4/year2038.m4 b/m4/year2038.m4 +new file mode 100644 +index 0000000..da0f8d7 +--- /dev/null ++++ b/m4/year2038.m4 +@@ -0,0 +1,124 @@ ++# year2038.m4 serial 7 ++dnl Copyright (C) 2017-2021 Free Software Foundation, Inc. ++dnl This file is free software; the Free Software Foundation ++dnl gives unlimited permission to copy and/or distribute it, ++dnl with or without modifications, as long as this notice is preserved. ++ ++dnl Attempt to ensure that 'time_t' can go past the year 2038 and that ++dnl the functions 'time', 'stat', etc. work with post-2038 timestamps. ++ ++AC_DEFUN([gl_YEAR2038_EARLY], ++[ ++ AC_REQUIRE([AC_CANONICAL_HOST]) ++ case "$host_os" in ++ mingw*) ++ AC_DEFINE([__MINGW_USE_VC2005_COMPAT], [1], ++ [For 64-bit time_t on 32-bit mingw.]) ++ ;; ++ esac ++]) ++ ++# gl_YEAR2038_TEST_INCLUDES ++# ------------------------- ++AC_DEFUN([gl_YEAR2038_TEST_INCLUDES], ++[[ ++ #include ++ /* Check that time_t can represent 2**32 - 1 correctly. */ ++ #define LARGE_TIME_T \\ ++ ((time_t) (((time_t) 1 << 30) - 1 + 3 * ((time_t) 1 << 30))) ++ int verify_time_t_range[(LARGE_TIME_T / 65537 == 65535 ++ && LARGE_TIME_T % 65537 == 0) ++ ? 1 : -1]; ++]]) ++ ++# gl_YEAR2038_BODY(REQUIRE-YEAR2038-SAFE) ++----------------------------------------- ++AC_DEFUN([gl_YEAR2038_BODY], ++[ ++ AC_ARG_ENABLE([year2038], ++ [ --disable-year2038 omit support for timestamps past the year 2038]) ++ AS_IF([test "$enable_year2038" != no], ++ [ ++ dnl On many systems, time_t is already a 64-bit type. ++ dnl On those systems where time_t is still 32-bit, it requires kernel ++ dnl and libc support to make it 64-bit. For glibc 2.34 and later on Linux, ++ dnl defining _TIME_BITS=64 and _FILE_OFFSET_BITS=64 is needed on x86 and ARM. ++ dnl ++ dnl On native Windows, the system include files define types __time32_t ++ dnl and __time64_t. By default, time_t is an alias of ++ dnl - __time32_t on 32-bit mingw, ++ dnl - __time64_t on 64-bit mingw and on MSVC (since MSVC 8). ++ dnl But when compiling with -D__MINGW_USE_VC2005_COMPAT, time_t is an ++ dnl alias of __time64_t. ++ dnl And when compiling with -D_USE_32BIT_TIME_T, time_t is an alias of ++ dnl __time32_t. ++ AC_CACHE_CHECK([for time_t past the year 2038], [gl_cv_type_time_t_y2038], ++ [AC_COMPILE_IFELSE( ++ [AC_LANG_SOURCE([gl_YEAR2038_TEST_INCLUDES])], ++ [gl_cv_type_time_t_y2038=yes], [gl_cv_type_time_t_y2038=no]) ++ ]) ++ if test "$gl_cv_type_time_t_y2038" = no; then ++ AC_CACHE_CHECK([for 64-bit time_t with _TIME_BITS=64], ++ [gl_cv_type_time_t_bits_macro], ++ [AC_COMPILE_IFELSE( ++ [AC_LANG_SOURCE([[#define _TIME_BITS 64 ++ #define _FILE_OFFSET_BITS 64 ++ ]gl_YEAR2038_TEST_INCLUDES])], ++ [gl_cv_type_time_t_bits_macro=yes], ++ [gl_cv_type_time_t_bits_macro=no]) ++ ]) ++ if test "$gl_cv_type_time_t_bits_macro" = yes; then ++ AC_DEFINE([_TIME_BITS], [64], ++ [Number of bits in a timestamp, on hosts where this is settable.]) ++ dnl AC_SYS_LARGFILE also defines this; it's OK if we do too. ++ AC_DEFINE([_FILE_OFFSET_BITS], [64], ++ [Number of bits in a file offset, on hosts where this is settable.]) ++ gl_cv_type_time_t_y2038=yes ++ fi ++ fi ++ if test $gl_cv_type_time_t_y2038 = no; then ++ AC_COMPILE_IFELSE( ++ [AC_LANG_SOURCE( ++ [[#ifdef _USE_32BIT_TIME_T ++ int ok; ++ #else ++ error fail ++ #endif ++ ]])], ++ [AC_MSG_FAILURE( ++ [The 'time_t' type stops working after January 2038. ++ Remove _USE_32BIT_TIME_T from the compiler flags.])], ++ [# If not cross-compiling and $1 says we should check, ++ # and 'touch' works with a large timestamp, then evidently wider time_t ++ # is desired and supported, so fail and ask the builder to fix the ++ # problem. Otherwise, just warn the builder. ++ m4_ifval([$1], ++ [if test $cross_compiling = no \ ++ && TZ=UTC0 touch -t 210602070628.15 conftest.time 2>/dev/null; then ++ case `TZ=UTC0 LC_ALL=C ls -l conftest.time 2>/dev/null` in ++ *'Feb 7 2106'* | *'Feb 7 17:10'*) ++ AC_MSG_FAILURE( ++ [The 'time_t' type stops working after January 2038, ++ and your system appears to support a wider 'time_t'. ++ Try configuring with 'CC="${CC} -m64"'. ++ To build with a 32-bit time_t anyway (not recommended), ++ configure with '--disable-year2038'.]);; ++ esac ++ rm -f conftest.time ++ fi]) ++ if test "$gl_warned_about_y2038" != yes; then ++ AC_MSG_WARN( ++ [The 'time_t' type stops working after January 2038, ++ and this package needs a wider 'time_t' type ++ if there is any way to access timestamps after that. ++ Configure with 'CC="${CC} -m64"' perhaps?]) ++ gl_warned_about_y2038=yes ++ fi ++ ]) ++ fi]) ++]) ++ ++AC_DEFUN([gl_YEAR2038], ++[ ++ gl_YEAR2038_BODY([require-year2038-safe]) ++]) +diff --git a/maint.mk b/maint.mk +index ae3a817..6a3ea96 100644 +--- a/maint.mk ++++ b/maint.mk +@@ -1409,7 +1409,7 @@ announcement_mail_headers_alpha = \ + announcement_mail_Cc_beta = $(announcement_mail_Cc_alpha) + announcement_mail_headers_beta = $(announcement_mail_headers_alpha) + +-announcement_mail_Cc_ ?= $(announcement_mail_Cc_$(release-type)) ++announcement_Cc_ ?= $(announcement_Cc_$(release-type)) + announcement_mail_headers_ ?= $(announcement_mail_headers_$(release-type)) + announcement: NEWS ChangeLog $(rel-files) + # Not $(AM_V_GEN) since the output of this command serves as +@@ -1426,7 +1426,6 @@ announcement: NEWS ChangeLog $(rel-files) + --bootstrap-tools=$(bootstrap-tools) \ + $$(case ,$(bootstrap-tools), in (*,gnulib,*) \ + echo --gnulib-version=$(gnulib-version);; esac) \ +- --no-print-checksums \ + $(addprefix --url-dir=, $(url_dir_list)) + + .PHONY: release-commit +-- +cgit v1.1 + diff --git a/package/guile/guile.mk b/package/guile/guile.mk index 0f245fca76..36a1661d67 100644 --- a/package/guile/guile.mk +++ b/package/guile/guile.mk @@ -9,14 +9,17 @@ GUILE_SOURCE = guile-$(GUILE_VERSION).tar.xz GUILE_SITE = $(BR2_GNU_MIRROR)/guile GUILE_INSTALL_STAGING = YES # For 0002-calculate-csqrt_manually.patch and -# 0003-Makefile.am-fix-build-without-makeinfo.patch +# 0003-Makefile.am-fix-build-without-makeinfo.patch and +# 0004-Update-gnulib-to-8f4538a53d64054ae2fc8b86c0f87c418c6176e6.patch GUILE_AUTORECONF = YES GUILE_LICENSE = LGPL-3.0+ GUILE_LICENSE_FILES = LICENSE COPYING COPYING.LESSER GUILE_CPE_ID_VENDOR = gnu GUILE_DEPENDENCIES = host-guile libunistring libffi gmp bdwgc host-pkgconf -HOST_GUILE_DEPENDENCIES = host-libunistring host-libffi host-gmp host-bdwgc host-flex host-pkgconf host-gettext +HOST_GUILE_DEPENDENCIES = \ + host-libunistring host-libffi host-gmp host-bdwgc host-flex \ + host-pkgconf host-gettext host-gperf # The HAVE_GC* CFLAGS specify that we will use internal callbacks # instead of the ones provided by -- 2.34.1 From james.hilliard1 at gmail.com Sun Feb 6 21:06:18 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 6 Feb 2022 14:06:18 -0700 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5declarative: bump to version b3fc740080137fdc36853b8ffedc241c901cb34e Message-ID: <20220206210618.1781561-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/qt5/qt5declarative/qt5declarative.hash | 2 +- package/qt5/qt5declarative/qt5declarative.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash index adda7e03ba..3f2a0891a9 100644 --- a/package/qt5/qt5declarative/qt5declarative.hash +++ b/package/qt5/qt5declarative/qt5declarative.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 14a4b9640a2cd94771108dc3658a77c04c680f3d6444750d55e313b20774ce00 qtdeclarative-9349f3975d26632befc036fc9f2ea6e03aee2182.tar.bz2 +sha256 6c81d1d63991c682c6df74e8208cf22fa4c7753cd59b21ee5d665a6ec3f2982f qtdeclarative-b3fc740080137fdc36853b8ffedc241c901cb34e.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 e63a78021a..882b24d2e9 100644 --- a/package/qt5/qt5declarative/qt5declarative.mk +++ b/package/qt5/qt5declarative/qt5declarative.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5DECLARATIVE_VERSION = 9349f3975d26632befc036fc9f2ea6e03aee2182 +QT5DECLARATIVE_VERSION = b3fc740080137fdc36853b8ffedc241c901cb34e QT5DECLARATIVE_SITE = $(QT5_SITE)/qtdeclarative/-/archive/$(QT5DECLARATIVE_VERSION) QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5DECLARATIVE_VERSION).tar.bz2 QT5DECLARATIVE_INSTALL_STAGING = YES -- 2.25.1 From peter.macleod.thompson at gmail.com Sun Feb 6 21:07:39 2022 From: peter.macleod.thompson at gmail.com (PeterThompson) Date: Sun, 6 Feb 2022 14:07:39 -0700 Subject: [Buildroot] [PATCH 1/1] package/sdl2_ttf: bump version to 2.0.18 Message-ID: <20220206210739.19361-1-peter.macleod.thompson@gmail.com> From: Peter Thompson Updated package/sdl2_ttf/sdl2_ttf.mk from version 2.0.15 to 2.0.18 Updated package/sdl2_ttf/sdl2_ttf.hash to match version 2.0.18 Signed-off-by: Peter Thompson --- package/sdl2_ttf/sdl2_ttf.hash | 4 ++-- package/sdl2_ttf/sdl2_ttf.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sdl2_ttf/sdl2_ttf.hash b/package/sdl2_ttf/sdl2_ttf.hash index 16459e4a59..a490b002b6 100644 --- a/package/sdl2_ttf/sdl2_ttf.hash +++ b/package/sdl2_ttf/sdl2_ttf.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a9eceb1ad88c1f1545cd7bd28e7cbc0b2c14191d40238f531a15b01b1b22cd33 SDL2_ttf-2.0.15.tar.gz -sha256 f6370809c9f644760920d9945c5be07aed17664975f2e4741013d4d9a2ec696f COPYING.txt +sha256 7234eb8883514e019e7747c703e4a774575b18d435c22a4a29d068cb768a2251 SDL2_ttf-2.0.18.tar.gz +sha256 e211dfe7e2c36e64048be886fe3f2bbba8732ce4dd77b596a355d3abbec775a4 COPYING.txt diff --git a/package/sdl2_ttf/sdl2_ttf.mk b/package/sdl2_ttf/sdl2_ttf.mk index 326cb99366..1fe7c0a075 100644 --- a/package/sdl2_ttf/sdl2_ttf.mk +++ b/package/sdl2_ttf/sdl2_ttf.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_TTF_VERSION = 2.0.15 +SDL2_TTF_VERSION = 2.0.18 SDL2_TTF_SOURCE = SDL2_ttf-$(SDL2_TTF_VERSION).tar.gz SDL2_TTF_SITE = http://www.libsdl.org/projects/SDL_ttf/release SDL2_TTF_LICENSE = Zlib -- 2.20.1 From james.hilliard1 at gmail.com Sun Feb 6 21:20:28 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 6 Feb 2022 14:20:28 -0700 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5base: bump to version d16bf02a11953dcac01dca73e6f3778f293adefe Message-ID: <20220206212028.1786742-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/qt5/qt5base/qt5base.hash | 2 +- package/qt5/qt5base/qt5base.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash index 396f5044ff..1b9ff43ab2 100644 --- a/package/qt5/qt5base/qt5base.hash +++ b/package/qt5/qt5base/qt5base.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 269ae20ed74cb949420ac3abac0bdef3b65501ea47c9312c01e8f9073baf24fe qtbase-53a047c212af7fbded6505651f648172f9d7a34d.tar.bz2 +sha256 96b1c96041ae7b5186c94f231979217bd50e3c0a4caeba32982faa8054a6d113 qtbase-d16bf02a11953dcac01dca73e6f3778f293adefe.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 d8a0bf1d16..37ad9c652c 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5BASE_VERSION = 53a047c212af7fbded6505651f648172f9d7a34d +QT5BASE_VERSION = d16bf02a11953dcac01dca73e6f3778f293adefe QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 -- 2.25.1 From james.hilliard1 at gmail.com Sun Feb 6 21:24:05 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 6 Feb 2022 14:24:05 -0700 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5declarative: bump to version 1d49a5b678957adde7e2db23a485a3f48157bc8f Message-ID: <20220206212405.1787998-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/qt5/qt5declarative/qt5declarative.hash | 2 +- package/qt5/qt5declarative/qt5declarative.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash index adda7e03ba..e5b016fc20 100644 --- a/package/qt5/qt5declarative/qt5declarative.hash +++ b/package/qt5/qt5declarative/qt5declarative.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 14a4b9640a2cd94771108dc3658a77c04c680f3d6444750d55e313b20774ce00 qtdeclarative-9349f3975d26632befc036fc9f2ea6e03aee2182.tar.bz2 +sha256 afea60cbfa48f88c1f0f54b8dbbf90370f6d2535179b4ccaf489db8133ff37ea qtdeclarative-1d49a5b678957adde7e2db23a485a3f48157bc8f.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 e63a78021a..54aa3be1cb 100644 --- a/package/qt5/qt5declarative/qt5declarative.mk +++ b/package/qt5/qt5declarative/qt5declarative.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5DECLARATIVE_VERSION = 9349f3975d26632befc036fc9f2ea6e03aee2182 +QT5DECLARATIVE_VERSION = 1d49a5b678957adde7e2db23a485a3f48157bc8f QT5DECLARATIVE_SITE = $(QT5_SITE)/qtdeclarative/-/archive/$(QT5DECLARATIVE_VERSION) QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5DECLARATIVE_VERSION).tar.bz2 QT5DECLARATIVE_INSTALL_STAGING = YES -- 2.25.1 From james.hilliard1 at gmail.com Sun Feb 6 21:28:24 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 6 Feb 2022 14:28:24 -0700 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5wayland: bump to version ce2caf493a1343fbd9f8e4c85baf6a61c057f242 Message-ID: <20220206212824.1790375-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/qt5/qt5wayland/qt5wayland.hash | 2 +- package/qt5/qt5wayland/qt5wayland.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/qt5/qt5wayland/qt5wayland.hash b/package/qt5/qt5wayland/qt5wayland.hash index 1a7400de67..2acdd1643c 100644 --- a/package/qt5/qt5wayland/qt5wayland.hash +++ b/package/qt5/qt5wayland/qt5wayland.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 a29d52c7b12987ed56d922455e0776e161075392969f7c6a8b141b00bd3dd46b qtwayland-b6d85c2a75f5618e87267f5b5c361455be257a17.tar.bz2 +sha256 f43c8ce9070249dfa91b94c09bcbf7c4fa881daf5eecdb9ff93c0eed43a3b7b0 qtwayland-ce2caf493a1343fbd9f8e4c85baf6a61c057f242.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 bcc4915022..61182f611c 100644 --- a/package/qt5/qt5wayland/qt5wayland.mk +++ b/package/qt5/qt5wayland/qt5wayland.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5WAYLAND_VERSION = b6d85c2a75f5618e87267f5b5c361455be257a17 +QT5WAYLAND_VERSION = ce2caf493a1343fbd9f8e4c85baf6a61c057f242 QT5WAYLAND_SITE = $(QT5_SITE)/qtwayland/-/archive/$(QT5WAYLAND_VERSION) QT5WAYLAND_SOURCE = qtwayland-$(QT5WAYLAND_VERSION).tar.bz2 QT5WAYLAND_DEPENDENCIES = wayland -- 2.25.1 From yann.morin.1998 at free.fr Sun Feb 6 21:36:57 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 6 Feb 2022 22:36:57 +0100 Subject: [Buildroot] [PATCH 01/16] board/aarch64-efi/genimage-efi: convert partition-type-uuid to single letter notation In-Reply-To: <20220206200532.2758493-2-giulio.benetti@benettiengineering.com> References: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> <20220206200532.2758493-2-giulio.benetti@benettiengineering.com> Message-ID: <20220206213657.GA457876@scaer> Giulio, All, FTR, a little recap of what we discussed on IRC, see below On 2022-02-06 21:05 +0100, Giulio Benetti spake thusly: > Signed-off-by: Giulio Benetti > --- > board/aarch64-efi/genimage-efi.cfg | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/board/aarch64-efi/genimage-efi.cfg b/board/aarch64-efi/genimage-efi.cfg > index 87e85816bc..7fbe13d390 100644 > --- a/board/aarch64-efi/genimage-efi.cfg > +++ b/board/aarch64-efi/genimage-efi.cfg > @@ -18,13 +18,13 @@ image disk.img { > > partition boot { > image = "efi-part.vfat" > - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b > + partition-type-uuid = U > offset = 32K > bootable = true > } > > partition root { > - partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae > + partition-type-uuid = L As we discussed on IRC, this is not the same thing. genimage will extend the 'L' shorthand to the full UUID 0fc63daf-8483-4772-8e79-3d69d8477de4, which is different. So I don't think uaing the shorthands are correct. The UUID assignments are available on Wikipedia: https://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs But the systemd docuemntation has extra UUID definitions: https://man.archlinux.org/man/systemd-gpt-auto-generator.8 And finally, if neither resources has a UUID for a specific architecture, we can still use the 'generic' "Linux filesystem data" UUID 0FC63DAF-8483-4772-8E79-3D69D8477DE4. Regards, Yann E. MORIN. > image = "rootfs.ext2" > } > } > -- > 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 Sun Feb 6 21:57:34 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 6 Feb 2022 14:57:34 -0700 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5location: remove unused qt5location-mapboxgl Message-ID: <20220206215734.3853337-1-james.hilliard1@gmail.com> This was only needed when the mapboxgl submodule was a separate package(was never included in buildroot only a patch series). Signed-off-by: James Hilliard --- package/qt5/qt5location/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/qt5/qt5location/Config.in b/package/qt5/qt5location/Config.in index b811f9a590..3d91adaf1f 100644 --- a/package/qt5/qt5location/Config.in +++ b/package/qt5/qt5location/Config.in @@ -1,7 +1,6 @@ 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++. -- 2.25.1 From james.hilliard1 at gmail.com Sun Feb 6 22:01:49 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 6 Feb 2022 15:01:49 -0700 Subject: [Buildroot] [PATCH v7 1/1] package/qt5: bump packages to latest kde submodule versions In-Reply-To: References: <20220131225622.90226-1-james.hilliard1@gmail.com> Message-ID: On Thu, Feb 3, 2022 at 12:35 PM Arnout Vandecappelle wrote: > > > > On 31/01/2022 23:56, 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 > > It took me some reading of the patch and of the upstream repositories to > understand that there are actually no release tarballs or tags, and the the > 5.15.8 is something we just pull out of our hat to be compatible with > qt5webengine. So I updated the commit message to (hopefully) better explain that. > > > > > 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. > > Instead of creating a separate package for it (which BTW you forgot to add to > DEVELOPERS), I changed this to use the git download method and _GIT_SUBMODULES = > YES. I checked that it extracts to exactly the same thing. Looks like the package selection for qt5location-mapboxgl wasn't removed: https://patchwork.ozlabs.org/project/buildroot/patch/20220206215734.3853337-1-james.hilliard1 at gmail.com/ > > > > > 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. > > I don't really understand why this was needed rather than calling syncqt > explicitly, but OK. > > Applied to master, thanks. > > Regards, > Arnout > > > > > 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 > > [snip] From fontaine.fabrice at gmail.com Sun Feb 6 22:08:14 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 6 Feb 2022 23:08:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-regex: fix license Message-ID: <20220206220814.2580975-1-fontaine.fabrice@gmail.com> License is Apache-2.0 since bump to version 2021.4.4 in commit d973fac7ca2e7c0c4864e8045e5205764e84c45b and https://github.com/mrabarnett/mrab-regex/commit/b693a1fba731a9aa0dc6ae37b441267d4b7b0419 Signed-off-by: Fabrice Fontaine --- package/python-regex/python-regex.hash | 2 ++ package/python-regex/python-regex.mk | 3 ++- package/python3-regex/python3-regex.mk | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/package/python-regex/python-regex.hash b/package/python-regex/python-regex.hash index 4749cd6167..b0f5bb05da 100644 --- a/package/python-regex/python-regex.hash +++ b/package/python-regex/python-regex.hash @@ -1,3 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/regex/json md5 cd206281327b4c087bb20bf93cee4ab9 regex-2021.4.4.tar.gz sha256 52ba3d3f9b942c49d7e4bc105bb28551c44065f139a65062ab7912bef10c9afb regex-2021.4.4.tar.gz +# Locally computed sha256 checksums +sha256 bff55ef4cdcc8c14ce259f8e8ab60e264418440d6335f4dc138273fbd506144d LICENSE.txt diff --git a/package/python-regex/python-regex.mk b/package/python-regex/python-regex.mk index c46c4d1614..4019bcdd3e 100644 --- a/package/python-regex/python-regex.mk +++ b/package/python-regex/python-regex.mk @@ -9,6 +9,7 @@ PYTHON_REGEX_VERSION = 2021.4.4 PYTHON_REGEX_SOURCE = regex-$(PYTHON_REGEX_VERSION).tar.gz PYTHON_REGEX_SITE = https://files.pythonhosted.org/packages/38/3f/4c42a98c9ad7d08c16e7d23b2194a0e4f3b2914662da8bc88986e4e6de1f PYTHON_REGEX_SETUP_TYPE = setuptools -PYTHON_REGEX_LICENSE = CNRI-Python +PYTHON_REGEX_LICENSE = Apache-2.0 +PYTHON_REGEX_LICENSE_FILES = LICENSE.txt $(eval $(python-package)) diff --git a/package/python3-regex/python3-regex.mk b/package/python3-regex/python3-regex.mk index 0b71768e9d..5c08338437 100644 --- a/package/python3-regex/python3-regex.mk +++ b/package/python3-regex/python3-regex.mk @@ -9,7 +9,8 @@ PYTHON3_REGEX_VERSION = 2021.4.4 PYTHON3_REGEX_SOURCE = regex-$(PYTHON3_REGEX_VERSION).tar.gz PYTHON3_REGEX_SITE = https://files.pythonhosted.org/packages/38/3f/4c42a98c9ad7d08c16e7d23b2194a0e4f3b2914662da8bc88986e4e6de1f PYTHON3_REGEX_SETUP_TYPE = setuptools -PYTHON3_REGEX_LICENSE = CNRI-Python +PYTHON3_REGEX_LICENSE = Apache-2.0 +PYTHON3_REGEX_LICENSE_FILES = LICENSE.txt HOST_PYTHON3_REGEX_DL_SUBDIR = python-regex HOST_PYTHON3_REGEX_NEEDS_HOST_PYTHON = python3 -- 2.34.1 From giulio.benetti at benettiengineering.com Sun Feb 6 22:45:21 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 23:45:21 +0100 Subject: [Buildroot] [PATCH] package/libnss: bump to version 3.75 Message-ID: <20220206224521.3204040-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 819c272a30..07fb340c33 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_74_RTM/src/SHA256SUMS -sha256 88928811f9f40f87d42e2eaccdf6e454562e51486067f2ddbe90aa47ea6cd056 nss-3.74.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_75_RTM/src/SHA256SUMS +sha256 fd571507827284644f4dd522a032acda2286835f6683ed22a1c2d3878cc58582 nss-3.75.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index 537f6dd9b6..a9549e48dd 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.74 +LIBNSS_VERSION = 3.75 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 giulio.benetti at benettiengineering.com Sun Feb 6 22:59:02 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 23:59:02 +0100 Subject: [Buildroot] [PATCH] package/harfbuzz: bump to version 3.3.2 Message-ID: <20220206225902.3349344-1-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- This patch superseeds this: https://patchwork.ozlabs.org/project/buildroot/patch/20220131175341.4091688-1-giulio.benetti at benettiengineering.com/ --- 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..61f2865563 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 1c13bca136c4f66658059853e2c1253f34c88f4b5c5aba6050aba7b5e0ce2503 harfbuzz-3.3.2.tar.xz sha256 4345e1735f8bc6d812fed5180cabb5a5e88a4109d332652f2a45c13cfa5ee692 COPYING diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk index 67eab359c6..1f5dfa8822 100644 --- a/package/harfbuzz/harfbuzz.mk +++ b/package/harfbuzz/harfbuzz.mk @@ -4,7 +4,7 @@ # ################################################################################ -HARFBUZZ_VERSION = 3.2.0 +HARFBUZZ_VERSION = 3.3.2 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 thomas.petazzoni at bootlin.com Mon Feb 7 07:05:56 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 07 Feb 2022 07:05:56 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-02-06 Message-ID: <20220207070604.AF838400E5@smtp2.osuosl.org> Hello, Autobuild statistics for 2022-02-06 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 49 | 2 | 0 | 51 | 2021.11.x | 21 | 2 | 0 | 23 | master | 49 | 46 | 2 | 97 | Classification of failures by reason for master ----------------------------------------------- host-libselinux-3.3 | 8 host-python-docutils-0.15.2 | 7 bluez5_utils-5.63 | 4 gerbera-1.9.2 | 3 rtorrent-0.9.8 | 3 unknown | 3 frr-8.1 | 2 guile-3.0.7 | 2 libuwsc | 2 qt5base-53a047c212af7fbded6... | 2 rygel-0.40.2 | 2 bat-0.19.0 | 1 host-go-1.17.6 | 1 libuhttpd-3.14.1 | 1 luasyslog-2.2.0 | 1 Makefile:747: target-finalize | 1 python-greenlet-1.1.2 | 1 ruby-3.1.0 | 1 tovid-87c676f4aadb7303d2cd9... | 1 vlc-3.0.16 | 1 xvisor-0.3.1 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- i586 | bat-0.19.0 | NOK | http://autobuild.buildroot.net/results/b0587470d420f8f4f95c3ed23eea605c02cc6b51 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/6b8870d12e0804d6154230a7322c49416c1dc0e2 | x86_64 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/0c02afb0cd94fcad76a43e04e48484ee01600c0c | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/dc568a3fc3ba64303d5689b91bfe253331e2c080 | riscv64 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/0cc700483eb4ac5c44e1a1b4ca77c309a0d7b381 | microblazeel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/ef9084aab26e8f799137413e8647104ff82eb658 | mips64el | frr-8.1 | NOK | http://autobuild.buildroot.net/results/4f285a8f5a9c88dab48f235adeca7afec36fe17d | arc | gerbera-1.9.2 | NOK | http://autobuild.buildroot.net/results/8be8502709c3c09bbaa440761478e36af2b5183e | mips64el | gerbera-1.9.2 | NOK | http://autobuild.buildroot.net/results/009db44f83c3b02025c910ce4f190bd709c5ab49 | riscv64 | gerbera-1.9.2 | NOK | http://autobuild.buildroot.net/results/28c8119e26c4316a84c17611b74949dee6b7cfc1 | arm | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/0add99a8cbb143d912d48ef4670e09a6710bb8b1 | powerpc64le | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/27a2a69e1177f15daec65eca035b99ea5355c34b | mips64el | host-go-1.17.6 | NOK | http://autobuild.buildroot.net/results/3d8e942d232300d65ca51cab3425d8e4931d8472 | mipsel | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/3b30572b8a6474dba4db60cfcab03360ace1d8db | m68k | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/4b9aba5285d880865550c5b2541b99e00fa791f4 | sh4 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/a35f2bfc976305fd0d8652fb2e7e6122dc94d8f3 | aarch64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/39d61949058d63193c4049dbf88979af6f4f9d1b | arc | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/4d1b28ee5c869efa53b71930fd4b626bce6a35d2 | riscv64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/6788a3b3c36cfda8a5e87634991dce24e2af414c | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/76d174dee366cafe022c41bdd67cdae0c1589431 | or1k | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/b79b63cc2a35be50d9ab4a0dceacb914f2899da4 | riscv64 | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/15b35322eaeefd243b630f1e806084a80899cd51 | mips64el | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/0cda6d7538f4dc59a301b9e52665cb49232e1151 | mips | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/fa9c31b599f4923c580cbe4bdb37193654466010 | arm | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/0e2bda8245366697ec8c7b6bb90bcdf87dd1e1eb | s390x | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/4e8e7dadb27ccd52fc43e4c972a98e40cdfb29ce | aarch64 | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/19c7b3a2803b8e81b76e8a9b15d18818acf8872b | x86_64 | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/47db3cd830943cba8cd2504bdf1de756c28878f1 | arm | libuhttpd-3.14.1 | NOK | http://autobuild.buildroot.net/results/ccaf94784ed849d39e35f56a276ff9867395d736 | powerpc | libuwsc | TIM | http://autobuild.buildroot.net/results/4ec38cdf58ab740d03ed6961791b7ba402de1bc3 | xtensa | libuwsc | TIM | http://autobuild.buildroot.net/results/90a29dcddfeb9dbbe1b02b6f2ee4ebc866adfefa | i686 | luasyslog-2.2.0 | NOK | http://autobuild.buildroot.net/results/b096cdbe96fb6c24d56b02a3a2b8fde1567f71a9 | arc | Makefile:747: target-finalize | NOK | http://autobuild.buildroot.net/results/7dc93c961247893075c269c7d588cb2a843fb542 | riscv64 | python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/211ebdc837d063fbbe52c333f389ef4c6c647d66 | x86_64 | qt5base-53a047c212af7fbded6... | NOK | http://autobuild.buildroot.net/results/556c868df0050d70b22eb1add4b5402f0c3e3869 | riscv32 | qt5base-53a047c212af7fbded6... | NOK | http://autobuild.buildroot.net/results/503750d22d5244e7281f5a56c2e9eb4403b4155e | sh4 | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/911bfb7a63e1ff5df57cfca701e265b85c065314 | ORPH m68k | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/bc97826134def4dcb1f87f075ca9976dfa349b36 | ORPH arm | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/a6badb2c008db3f13329eb6a0b1a1a5c8083b2e1 | ORPH riscv64 | ruby-3.1.0 | NOK | http://autobuild.buildroot.net/results/43bc9c7929b6c2670b0d913987e8ecfb7a914d43 | sparc64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/40b1b31d209d33c89fe093d8e5c25e800e8e581c | or1k | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/2c485f20bd9055cd6f30a0d3f2a107869648db97 | mips64el | tovid-87c676f4aadb7303d2cd9... | NOK | http://autobuild.buildroot.net/results/8fda0d9b2a5ec6f190609416feb8fb452cfca077 | arm | unknown | NOK | http://autobuild.buildroot.net/results/d90478fe6072f030ce1ae32255a3f801e4ca9a29 | arm | unknown | NOK | http://autobuild.buildroot.net/results/d273a4f47231df0dcce7aa563677459a2395845b | microblazeel | unknown | NOK | http://autobuild.buildroot.net/results/9477863fc3c3a3ec99cd70286f13384fba9cdfca | s390x | vlc-3.0.16 | NOK | http://autobuild.buildroot.net/results/6548a7e6167d9a56d2bb528daee5a6e081935c64 | riscv32 | xvisor-0.3.1 | NOK | http://autobuild.buildroot.net/results/9a22b8fa1dd88ed69c8533078cb28a05e1b54de3 | Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 1 openldap-2.4.59 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- powerpc | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/914d78b433f123c6b87371036894d96a89fd6526 | riscv32 | openldap-2.4.59 | NOK | http://autobuild.buildroot.net/results/e80b16e03a12e74a8a359852572c9e05bf7b21a9 | Classification of failures by reason for 2021.11.x -------------------------------------------------- unknown | 1 wavemon-0.9.4 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- m68k | unknown | NOK | http://autobuild.buildroot.net/results/a324f07e37e8ab4b702c6ca48845dd871533de0a | arm | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/7e587d7408985429d1b8b7371ce1273c0bfc491f | Gitlab CI results for 2022-02-06 ================================ Packages having a newer version =============================== name | found by | link to release-monitoring.org | version | upstream | orph? -------------------------------+----------+----------------------------------------------+--------------+--------------+------- ace | DISTRO | https://release-monitoring.org/project/242395 | 7.0.1 | 7.0.6 | 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 | alfred | DISTRO | https://release-monitoring.org/project/241870 | 2021.4 | 2022.0 | 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.2 | assimp | DISTRO | https://release-monitoring.org/project/06988 | 5.1.6 | 5.2.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 | audit | DISTRO | https://release-monitoring.org/project/15225 | 3.0.6 | 3.0.7 | 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 batctl | DISTRO | https://release-monitoring.org/project/14740 | 2021.0 | 2022.0 | batman-adv | DISTRO | https://release-monitoring.org/project/19529 | 2021.4 | 2022.0 | 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.68 | ORPH bdwgc | DISTRO | https://release-monitoring.org/project/17108 | 8.0.6 | 8.2.0 | belle-sip | DISTRO | https://release-monitoring.org/project/14378 | 4.4.8 | 5.0.68 | belr | DISTRO | https://release-monitoring.org/project/80042 | 4.4.8 | 5.0.68 | 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.18.0 | 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.1 | ORPH 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.5.0 | 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.5 | 0.104.2 | clang | DISTRO | https://release-monitoring.org/project/11811 | 9.0.1 | 13.0.1 | cmake | DISTRO | https://release-monitoring.org/project/00306 | 3.16.9 | 3.22.2 | cog | DISTRO | https://release-monitoring.org/project/21333 | 0.12.0 | 0.13.3 | cryptsetup | DISTRO | https://release-monitoring.org/project/13709 | 2.4.2 | 2.4.3 | cups | DISTRO | https://release-monitoring.org/project/00380 | 2.4.0 | 2.4.1 | 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 | daq3 | DISTRO | https://release-monitoring.org/project/212345 | 3.0.5 | 3.0.6 | 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 debianutils | DISTRO | https://release-monitoring.org/project/21341 | 4.11 | 5.7 | ORPH dialog | DISTRO | https://release-monitoring.org/project/00431 | 1.3-20200327 | 1.3-20220117 | ORPH docker-compose | DISTRO | https://release-monitoring.org/project/06185 | 1.24.1 | 2.2.3 | dovecot | DISTRO | https://release-monitoring.org/project/00456 | 2.3.17.1 | 2.3.18 | drbd-utils | DISTRO | https://release-monitoring.org/project/00462 | 9.19.0 | 9.20.2 | dt | DISTRO | https://release-monitoring.org/project/21844 | 18.32 | 21.27 | ORPH ed | DISTRO | https://release-monitoring.org/project/00659 | 1.17 | 1.18 | ORPH edk2 | DISTRO | https://release-monitoring.org/project/125953 | edk2-stab... | 202111 | efivar | DISTRO | https://release-monitoring.org/project/00664 | 37 | 38 | 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 | ell | DISTRO | https://release-monitoring.org/project/17781 | 0.47 | 0.48 | erlang | DISTRO | https://release-monitoring.org/project/00707 | 22.3.4.22 | 24.2.1 | 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.27 | 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.3 | flare-engine | DISTRO | https://release-monitoring.org/project/21433 | 1.12 | 1.13 | flare-game | DISTRO | https://release-monitoring.org/project/21434 | 1.12 | 1.13 | 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.96 | ORPH fping | DISTRO | https://release-monitoring.org/project/00834 | 5.0 | 5.1 | fuse-overlayfs | DISTRO | https://release-monitoring.org/project/101220 | 1.5.0 | 1.8.2 | fwts | DISTRO | https://release-monitoring.org/project/17383 | 21.11.00 | 22.01.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 gdbm | DISTRO | https://release-monitoring.org/project/00882 | 1.22 | 1.23 | 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 git | DISTRO | https://release-monitoring.org/project/05350 | 2.31.1 | 2.35.1 | glib-networking | DISTRO | https://release-monitoring.org/project/21353 | 2.70.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.1.1 | gnutls | DISTRO | https://release-monitoring.org/project/01221 | 3.7.2 | 3.7.3 | gqrx | DISTRO | https://release-monitoring.org/project/09771 | 2.14.4 | 2.15.8 | granite | DISTRO | https://release-monitoring.org/project/05410 | 6.0.0 | 6.2.0 | ORPH grpc | DISTRO | https://release-monitoring.org/project/19117 | 1.43.0 | 1.43.2 | 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.6 | 1.20.0 | ORPH gst1-devtools | DISTRO | https://release-monitoring.org/project/21856 | 1.18.6 | 1.20.0 | 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.6 | 1.20.0 | ORPH gst1-plugins-bad | DISTRO | https://release-monitoring.org/project/21849 | 1.18.6 | 1.20.0 | ORPH gst1-plugins-base | DISTRO | https://release-monitoring.org/project/21850 | 1.18.6 | 1.20.0 | ORPH gst1-plugins-good | DISTRO | https://release-monitoring.org/project/21852 | 1.18.6 | 1.20.0 | ORPH gst1-plugins-ugly | DISTRO | https://release-monitoring.org/project/15187 | 1.18.6 | 1.20.0 | ORPH gst1-python | DISTRO | https://release-monitoring.org/project/03881 | 1.18.6 | 1.20.0 | ORPH gst1-rtsp-server | DISTRO | https://release-monitoring.org/project/21853 | 1.18.6 | 1.20.0 | ORPH gst1-vaapi | DISTRO | https://release-monitoring.org/project/21855 | 1.18.6 | 1.20.0 | ORPH gstd | DISTRO | https://release-monitoring.org/project/235022 | 0.13.0 | 0.13.2 | ORPH gstreamer1 | DISTRO | https://release-monitoring.org/project/01263 | 1.18.6 | 1.20.0 | ORPH gstreamer1-editing-services | DISTRO | https://release-monitoring.org/project/230920 | 1.18.6 | 1.20.0 | 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.1 | harfbuzz | DISTRO | https://release-monitoring.org/project/01299 | 3.2.0 | 3.3.2 | 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 hwdata | DISTRO | https://release-monitoring.org/project/05387 | 0.355 | 0.356 | 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-23 | 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 iperf3 | DISTRO | https://release-monitoring.org/project/01389 | 3.10.1 | 3.11 | 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.21 | 1.24 | 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 | janet | DISTRO | https://release-monitoring.org/project/155612 | 1.19.2 | 1.20.0 | janus-gateway | DISTRO | https://release-monitoring.org/project/15715 | 0.11.6 | 0.11.7 | 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.4 | ORPH jquery-mobile | DISTRO | https://release-monitoring.org/project/59395 | 1.4.3 | 1.4.5 | ORPH jquery-ui | DISTRO | https://release-monitoring.org/project/21815 | 1.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 | 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-R3a | 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.2-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.6-Ma... | 20.2.2-Nexus | kodi-pvr-iptvsimple | DISTRO | https://release-monitoring.org/project/21782 | 19.1.0-Ma... | 20.3.0-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.7-Ma... | 20.2.4-Nexus | kodi-pvr-nextpvr | DISTRO | https://release-monitoring.org/project/21779 | 19.0.3-Ma... | 20.2.2-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.2-Ma... | 20.2.1-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 | lcms2 | DISTRO | https://release-monitoring.org/project/09815 | 2.13 | 2.13.1 | 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.26 | 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.5 | libcap | DISTRO | https://release-monitoring.org/project/01569 | 2.62 | 2.63 | 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 | libfreeglut | DISTRO | https://release-monitoring.org/project/00846 | 3.2.1 | 3.2.2 | libfuse | GUESS | https://release-monitoring.org/project/00861 | 2.9.9 | 3.10.5 | ORPH libgcrypt | DISTRO | https://release-monitoring.org/project/01623 | 1.9.4 | 1.10.0 | ORPH libgdiplus | DISTRO | https://release-monitoring.org/project/06440 | 6.0.5 | 6.1 | 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.70.0 | 2.70.3 | 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.44 | 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.14 | 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 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 | libnfs | DISTRO | https://release-monitoring.org/project/07325 | 4.0.0 | 5.0.1 | ORPH libnss | DISTRO | https://release-monitoring.org/project/02503 | 3.74 | 3.75 | 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 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 | 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.2 | 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 | libxcrypt | DISTRO | https://release-monitoring.org/project/16436 | 4.4.27 | 4.4.28 | libxkbcommon | DISTRO | https://release-monitoring.org/project/01780 | 1.3.1 | 1.4.0 | 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.69 | ORPH liquid-dsp | DISTRO | https://release-monitoring.org/project/14535 | 1.3.2 | 1.4.0 | 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.1 | 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.1 | lm-sensors | DISTRO | https://release-monitoring.org/project/01831 | 3-6-0 | 3.6.0 | ORPH 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 | lttng-tools | DISTRO | https://release-monitoring.org/project/07136 | 2.13.2 | 2.13.4 | lua | DISTRO | https://release-monitoring.org/project/01847 | 5.1.5 | 5.4.4 | lua-resty-http | DISTRO | https://release-monitoring.org/project/13887 | 0.15-0 | 0.16.1 | luv | DISTRO | https://release-monitoring.org/project/21510 | 1.42.0-1 | 1.43.0-0 | luvi | DISTRO | https://release-monitoring.org/project/21512 | 2.12.0 | 2.13.0 | lxc | DISTRO | https://release-monitoring.org/project/01860 | 4.0.11 | 4.0.12 | lynx | DISTRO | https://release-monitoring.org/project/01863 | 2.8.9rel.1 | 2.9.0 | lzip | DISTRO | https://release-monitoring.org/project/01866 | 1.22 | 1.23 | ORPH 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.68 | 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 | mender | DISTRO | https://release-monitoring.org/project/20629 | 3.1.0 | 3.2.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 | minetest | DISTRO | https://release-monitoring.org/project/01978 | 5.4.1 | 5.5.0 | minetest-game | DISTRO | https://release-monitoring.org/project/21522 | 5.4.1 | 5.5.0 | 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.18 | 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.168 | 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 | 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-20220205 | ORPH netdata | DISTRO | https://release-monitoring.org/project/11046 | 1.21.1 | 1.33.0 | 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.6 | 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.47.03 | 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+8 | 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 | optee-benchmark | DISTRO | https://release-monitoring.org/project/21555 | 3.15.0 | 3.16.0 | optee-client | DISTRO | https://release-monitoring.org/project/21556 | 3.15.0 | 3.16.0 | optee-examples | DISTRO | https://release-monitoring.org/project/21557 | 3.15.0 | 3.16.0 | optee-test | DISTRO | https://release-monitoring.org/project/21558 | 3.15.0 | 3.16.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.68 | ORPH osm2pgsql | DISTRO | https://release-monitoring.org/project/02575 | 1.5.2 | 1.6.0 | 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 | 202201 | 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.76 | 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.15 | 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.3 | 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 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 | poke | DISTRO | https://release-monitoring.org/project/179926 | 1.4 | 2.0 | ORPH policycoreutils | DISTRO | https://release-monitoring.org/project/03680 | 3.2 | 20200710 | poppler | DISTRO | https://release-monitoring.org/project/03686 | 21.12.0 | 22.02.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.4 | 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.16 | 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-aioconsole | DISTRO | https://release-monitoring.org/project/21244 | 0.4.0 | 0.4.1 | python-aiohttp-remotes | DISTRO | https://release-monitoring.org/project/21248 | 1.1.0 | 1.2.0 | python-aiohttp-session | DISTRO | https://release-monitoring.org/project/21250 | 2.10.0 | 2.11.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.2 | python-asgiref | DISTRO | https://release-monitoring.org/project/18462 | 3.3.4 | 3.5.0 | 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.2 | python-boto3 | DISTRO | https://release-monitoring.org/project/08778 | 1.19.2 | 1.20.49 | python-botocore | DISTRO | https://release-monitoring.org/project/08748 | 1.22.2 | 1.23.49 | python-canopen | DISTRO | https://release-monitoring.org/project/23230 | 1.0.0 | 2.0.0b1 | 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-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-cython | DISTRO | https://release-monitoring.org/project/12679 | 0.29.27 | 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-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-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-entrypoints | DISTRO | https://release-monitoring.org/project/12081 | 0.3 | 0.4 | 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-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.4 | python-humanize | DISTRO | https://release-monitoring.org/project/19799 | 3.11.0 | 3.14.0 | 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-iwlib | DISTRO | https://release-monitoring.org/project/51611 | 1.5 | 1.7.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-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-libusb1 | DISTRO | https://release-monitoring.org/project/12301 | 2.0.1 | 3.0.0 | 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-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.2 | python-oauthlib | DISTRO | https://release-monitoring.org/project/05377 | 3.1.1 | 3.2.0 | 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-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 | 9.0.0 | 9.0.1 | python-pip | DISTRO | https://release-monitoring.org/project/06529 | 21.2.4 | 22.0.3 | 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.26 | python-protobuf | DISTRO | https://release-monitoring.org/project/03715 | 3.19.1 | 3.19.4 | 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-pybind | DISTRO | https://release-monitoring.org/project/13384 | 2.9.0 | 2.9.1 | python-pycairo | DISTRO | https://release-monitoring.org/project/13166 | 1.19.1 | 1.20.1 | python-pycryptodomex | DISTRO | https://release-monitoring.org/project/36851 | 3.13.0 | 3.14.1 | python-pydantic | DISTRO | https://release-monitoring.org/project/29768 | 1.8.2 | 1.9.0 | python-pyelftools | DISTRO | https://release-monitoring.org/project/16219 | 0.27 | 0.28 | 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.1 | python-pylibftdi | DISTRO | https://release-monitoring.org/project/21583 | 0.18.1 | 0.20.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.5 | python-pyopenssl | DISTRO | https://release-monitoring.org/project/05535 | 21.0.0 | 22.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 | DISTRO | https://release-monitoring.org/project/03765 | 6.2.5 | 7.0.0 | python-pytest-asyncio | DISTRO | https://release-monitoring.org/project/07273 | 0.15.1 | 0.17.2 | python-pyudev | DISTRO | https://release-monitoring.org/project/08485 | 0.22.0 | 0.23.2 | python-pyusb | DISTRO | https://release-monitoring.org/project/21595 | 1.1.1 | 1.2.1 | 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.2 | python-reentry | DISTRO | https://release-monitoring.org/project/21596 | 1.3.2 | 1.3.3 | python-regex | DISTRO | https://release-monitoring.org/project/05548 | 2021.4.4 | 2022.1.18 | python-requests-oauthlib | DISTRO | https://release-monitoring.org/project/11803 | 1.3.0 | 1.3.1 | python-rpi-gpio | DISTRO | https://release-monitoring.org/project/12026 | 0.7.0 | 0.7.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-s3transfer | DISTRO | https://release-monitoring.org/project/10428 | 0.5.0 | 0.5.1 | 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.4 | 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.8.1 | 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-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.1 | 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.4 | 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 | 22.1.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-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.1 | python-web2py | DISTRO | https://release-monitoring.org/project/20617 | 2.21.1 | 2.22.1 | 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.3 | python3-cython | DISTRO | https://release-monitoring.org/project/12679 | 0.29.27 | 3.0.0a10 | python3-psutil | DISTRO | https://release-monitoring.org/project/03978 | 5.8.0 | 5.9.0 | python3-pycryptodomex | DISTRO | https://release-monitoring.org/project/36851 | 3.13.0 | 3.14.1 | python3-pyelftools | DISTRO | https://release-monitoring.org/project/16219 | 0.27 | 0.28 | python3-regex | DISTRO | https://release-monitoring.org/project/05548 | 2021.4.4 | 2022.1.18 | python3-setuptools | DISTRO | https://release-monitoring.org/project/04021 | 60.7.0 | 60.8.1 | qpid-proton | DISTRO | https://release-monitoring.org/project/15198 | 0.35.0 | 0.36.0 | qt5coap | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.3 | qt5knx | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.3 | qt5mqtt | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.3 | qt5opcua | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.3 | qt5webengine | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.3 | qt5webkit | DISTRO | https://release-monitoring.org/project/07927 | 5.212.0-a... | 6.2.3 | 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 | re2 | DISTRO | https://release-monitoring.org/project/10500 | 2021-11-01 | 2022-02-01 | 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.28.2 | 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 | rygel | DISTRO | https://release-monitoring.org/project/04751 | 0.40.2 | 0.40.3 | s390-tools | DISTRO | https://release-monitoring.org/project/10714 | 2.19.0 | 2.20.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.2 | 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 | safeclib | DISTRO | https://release-monitoring.org/project/21385 | 3.7.1 | 01022022 | samba4 | DISTRO | https://release-monitoring.org/project/04758 | 4.15.4 | 4.15.5 | 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 | screen | DISTRO | https://release-monitoring.org/project/04772 | 4.8.0 | 4.9.0 | ORPH 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.1 | sentry-native | DISTRO | https://release-monitoring.org/project/135639 | 0.4.1 | 0.4.14 | 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.22.0 | sofia-sip | DISTRO | https://release-monitoring.org/project/10509 | 1.13.6-41... | 1.13.7 | 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 | sphinxbase | DISTRO | https://release-monitoring.org/project/20548 | 5prealpha | 0.8 | 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 | strongswan | DISTRO | https://release-monitoring.org/project/04899 | 5.9.4 | 5.9.5 | stunnel | DISTRO | https://release-monitoring.org/project/04901 | 5.60 | 5.62 | sudo | DISTRO | https://release-monitoring.org/project/04906 | 1.9.8p2 | 1.9.9 | ORPH 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 | tcpreplay | DISTRO | https://release-monitoring.org/project/13716 | 4.3.4 | 4.4.0 | ORPH 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 | 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 | 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 | 6.1.3 | 6.1.4 | ORPH upmpdcli | DISTRO | https://release-monitoring.org/project/15848 | 1.5.12 | 1.5.13 | upower | DISTRO | https://release-monitoring.org/project/05056 | 0.99.11 | 0.99.14 | 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.2 | ORPH valijson | DISTRO | https://release-monitoring.org/project/18452 | 0.3 | 0.6 | vim | DISTRO | https://release-monitoring.org/project/05092 | 8.2.4301 | 8.2.4309 | ORPH vnstat | DISTRO | https://release-monitoring.org/project/07283 | 2.8 | 2.9 | 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 | vulkan-headers | DISTRO | https://release-monitoring.org/project/88835 | 1.2.203 | 1.3.205 | ORPH 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.25 | ORPH waylandpp | DISTRO | https://release-monitoring.org/project/16969 | 0.2.8 | 0.2.9 | 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 weston | DISTRO | https://release-monitoring.org/project/13745 | 9.0.0 | 10.0.0 | wilc1000-firmware | DISTRO | https://release-monitoring.org/project/65598 | 14.1 | 15.6 | wine | DISTRO | https://release-monitoring.org/project/05134 | 6.0 | 7.1 | 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.1 | 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.4 | 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-input-libinput | DISTRO | https://release-monitoring.org/project/05782 | 1.2.0 | 1.2.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.4 | 4.16.0 | xinetd | DISTRO | https://release-monitoring.org/project/06382 | 2.3.15 | 2.3.15.4 | xmrig | DISTRO | https://release-monitoring.org/project/17499 | 6.16.3 | 6.16.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.19 | ORPH xterm | DISTRO | https://release-monitoring.org/project/05272 | 367 | 370 | ORPH yaml-cpp | DISTRO | https://release-monitoring.org/project/05284 | 0.6.3 | 0.7.0 | ORPH zabbix | DISTRO | https://release-monitoring.org/project/05492 | 5.4.9 | 5.4.10 | 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 | 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 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 hostapd | CVE-2022-23303 | https://security-tracker.debian.org/tracker/CVE-2022-23303 hostapd | CVE-2022-23304 | https://security-tracker.debian.org/tracker/CVE-2022-23304 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 libpjsip | CVE-2021-37706 | https://security-tracker.debian.org/tracker/CVE-2021-37706 libpjsip | CVE-2021-41141 | https://security-tracker.debian.org/tracker/CVE-2021-41141 libpjsip | CVE-2021-43804 | https://security-tracker.debian.org/tracker/CVE-2021-43804 libpjsip | CVE-2021-43845 | https://security-tracker.debian.org/tracker/CVE-2021-43845 libpjsip | CVE-2022-21722 | https://security-tracker.debian.org/tracker/CVE-2022-21722 libpjsip | CVE-2022-21723 | https://security-tracker.debian.org/tracker/CVE-2022-21723 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 mariadb | CVE-2021-46658 | https://security-tracker.debian.org/tracker/CVE-2021-46658 mariadb | CVE-2021-46659 | https://security-tracker.debian.org/tracker/CVE-2021-46659 mariadb | CVE-2021-46661 | https://security-tracker.debian.org/tracker/CVE-2021-46661 mariadb | CVE-2021-46662 | https://security-tracker.debian.org/tracker/CVE-2021-46662 mariadb | CVE-2021-46663 | https://security-tracker.debian.org/tracker/CVE-2021-46663 mariadb | CVE-2021-46664 | https://security-tracker.debian.org/tracker/CVE-2021-46664 mariadb | CVE-2021-46665 | https://security-tracker.debian.org/tracker/CVE-2021-46665 mariadb | CVE-2021-46667 | https://security-tracker.debian.org/tracker/CVE-2021-46667 mariadb | CVE-2021-46668 | https://security-tracker.debian.org/tracker/CVE-2021-46668 mariadb | CVE-2021-46669 | https://security-tracker.debian.org/tracker/CVE-2021-46669 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 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 polkit | CVE-2021-4034 | https://security-tracker.debian.org/tracker/CVE-2021-4034 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-ipython | CVE-2022-21699 | https://security-tracker.debian.org/tracker/CVE-2022-21699 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-4145 | https://security-tracker.debian.org/tracker/CVE-2021-4145 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 wpa_supplicant | CVE-2022-23303 | https://security-tracker.debian.org/tracker/CVE-2022-23303 wpa_supplicant | CVE-2022-23304 | https://security-tracker.debian.org/tracker/CVE-2022-23304 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-28707 | https://security-tracker.debian.org/tracker/CVE-2021-28707 xen | CVE-2021-28708 | https://security-tracker.debian.org/tracker/CVE-2021-28708 xen | CVE-2021-28711 | https://security-tracker.debian.org/tracker/CVE-2021-28711 xen | CVE-2021-28712 | https://security-tracker.debian.org/tracker/CVE-2021-28712 xen | CVE-2021-28713 | https://security-tracker.debian.org/tracker/CVE-2021-28713 xen | CVE-2022-23033 | https://security-tracker.debian.org/tracker/CVE-2022-23033 xen | CVE-2022-23035 | https://security-tracker.debian.org/tracker/CVE-2022-23035 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 xterm | CVE-2022-24130 | https://security-tracker.debian.org/tracker/CVE-2022-24130 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 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-2022-23852 | https://security-tracker.debian.org/tracker/CVE-2022-23852 expat | CVE-2022-23990 | https://security-tracker.debian.org/tracker/CVE-2022-23990 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 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-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 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 hostapd | CVE-2022-23303 | https://security-tracker.debian.org/tracker/CVE-2022-23303 hostapd | CVE-2022-23304 | https://security-tracker.debian.org/tracker/CVE-2022-23304 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 libldns | CVE-2020-19860 | https://security-tracker.debian.org/tracker/CVE-2020-19860 libldns | CVE-2020-19861 | https://security-tracker.debian.org/tracker/CVE-2020-19861 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 libpjsip | CVE-2021-37706 | https://security-tracker.debian.org/tracker/CVE-2021-37706 libpjsip | CVE-2021-41141 | https://security-tracker.debian.org/tracker/CVE-2021-41141 libpjsip | CVE-2021-43804 | https://security-tracker.debian.org/tracker/CVE-2021-43804 libpjsip | CVE-2021-43845 | https://security-tracker.debian.org/tracker/CVE-2021-43845 libpjsip | CVE-2022-21722 | https://security-tracker.debian.org/tracker/CVE-2022-21722 libpjsip | CVE-2022-21723 | https://security-tracker.debian.org/tracker/CVE-2022-21723 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 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 mariadb | CVE-2021-46658 | https://security-tracker.debian.org/tracker/CVE-2021-46658 mariadb | CVE-2021-46659 | https://security-tracker.debian.org/tracker/CVE-2021-46659 mariadb | CVE-2021-46661 | https://security-tracker.debian.org/tracker/CVE-2021-46661 mariadb | CVE-2021-46662 | https://security-tracker.debian.org/tracker/CVE-2021-46662 mariadb | CVE-2021-46663 | https://security-tracker.debian.org/tracker/CVE-2021-46663 mariadb | CVE-2021-46664 | https://security-tracker.debian.org/tracker/CVE-2021-46664 mariadb | CVE-2021-46665 | https://security-tracker.debian.org/tracker/CVE-2021-46665 mariadb | CVE-2021-46667 | https://security-tracker.debian.org/tracker/CVE-2021-46667 mariadb | CVE-2021-46668 | https://security-tracker.debian.org/tracker/CVE-2021-46668 mariadb | CVE-2021-46669 | https://security-tracker.debian.org/tracker/CVE-2021-46669 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 minetest | CVE-2022-24300 | https://security-tracker.debian.org/tracker/CVE-2022-24300 minetest | CVE-2022-24301 | https://security-tracker.debian.org/tracker/CVE-2022-24301 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 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 polkit | CVE-2021-4034 | https://security-tracker.debian.org/tracker/CVE-2021-4034 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 protobuf | CVE-2021-22570 | https://security-tracker.debian.org/tracker/CVE-2021-22570 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-ipython | CVE-2022-21699 | https://security-tracker.debian.org/tracker/CVE-2022-21699 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 qemu | CVE-2021-4145 | https://security-tracker.debian.org/tracker/CVE-2021-4145 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 rust | CVE-2022-21658 | https://security-tracker.debian.org/tracker/CVE-2022-21658 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-2022-0393 | https://security-tracker.debian.org/tracker/CVE-2022-0393 vim | CVE-2022-0408 | https://security-tracker.debian.org/tracker/CVE-2022-0408 vim | CVE-2022-0413 | https://security-tracker.debian.org/tracker/CVE-2022-0413 vim | CVE-2022-0417 | https://security-tracker.debian.org/tracker/CVE-2022-0417 vim | CVE-2022-0443 | https://security-tracker.debian.org/tracker/CVE-2022-0443 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 wpa_supplicant | CVE-2022-23303 | https://security-tracker.debian.org/tracker/CVE-2022-23303 wpa_supplicant | CVE-2022-23304 | https://security-tracker.debian.org/tracker/CVE-2022-23304 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 xen | CVE-2022-23033 | https://security-tracker.debian.org/tracker/CVE-2022-23033 xen | CVE-2022-23035 | https://security-tracker.debian.org/tracker/CVE-2022-23035 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 xterm | CVE-2022-24130 | https://security-tracker.debian.org/tracker/CVE-2022-24130 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 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-2022-23852 | https://security-tracker.debian.org/tracker/CVE-2022-23852 expat | CVE-2022-23990 | https://security-tracker.debian.org/tracker/CVE-2022-23990 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 hostapd | CVE-2022-23303 | https://security-tracker.debian.org/tracker/CVE-2022-23303 hostapd | CVE-2022-23304 | https://security-tracker.debian.org/tracker/CVE-2022-23304 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 libldns | CVE-2020-19860 | https://security-tracker.debian.org/tracker/CVE-2020-19860 libldns | CVE-2020-19861 | https://security-tracker.debian.org/tracker/CVE-2020-19861 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libpjsip | CVE-2021-37706 | https://security-tracker.debian.org/tracker/CVE-2021-37706 libpjsip | CVE-2021-41141 | https://security-tracker.debian.org/tracker/CVE-2021-41141 libpjsip | CVE-2021-43804 | https://security-tracker.debian.org/tracker/CVE-2021-43804 libpjsip | CVE-2021-43845 | https://security-tracker.debian.org/tracker/CVE-2021-43845 libpjsip | CVE-2022-21722 | https://security-tracker.debian.org/tracker/CVE-2022-21722 libpjsip | CVE-2022-21723 | https://security-tracker.debian.org/tracker/CVE-2022-21723 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 mariadb | CVE-2021-46658 | https://security-tracker.debian.org/tracker/CVE-2021-46658 mariadb | CVE-2021-46659 | https://security-tracker.debian.org/tracker/CVE-2021-46659 mariadb | CVE-2021-46661 | https://security-tracker.debian.org/tracker/CVE-2021-46661 mariadb | CVE-2021-46662 | https://security-tracker.debian.org/tracker/CVE-2021-46662 mariadb | CVE-2021-46663 | https://security-tracker.debian.org/tracker/CVE-2021-46663 mariadb | CVE-2021-46664 | https://security-tracker.debian.org/tracker/CVE-2021-46664 mariadb | CVE-2021-46665 | https://security-tracker.debian.org/tracker/CVE-2021-46665 mariadb | CVE-2021-46667 | https://security-tracker.debian.org/tracker/CVE-2021-46667 mariadb | CVE-2021-46668 | https://security-tracker.debian.org/tracker/CVE-2021-46668 mariadb | CVE-2021-46669 | https://security-tracker.debian.org/tracker/CVE-2021-46669 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 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 polkit | CVE-2021-4034 | https://security-tracker.debian.org/tracker/CVE-2021-4034 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-ipython | CVE-2022-21699 | https://security-tracker.debian.org/tracker/CVE-2022-21699 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 qemu | CVE-2021-4145 | https://security-tracker.debian.org/tracker/CVE-2021-4145 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 rust | CVE-2022-21658 | https://security-tracker.debian.org/tracker/CVE-2022-21658 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-2022-0393 | https://security-tracker.debian.org/tracker/CVE-2022-0393 vim | CVE-2022-0408 | https://security-tracker.debian.org/tracker/CVE-2022-0408 vim | CVE-2022-0413 | https://security-tracker.debian.org/tracker/CVE-2022-0413 vim | CVE-2022-0417 | https://security-tracker.debian.org/tracker/CVE-2022-0417 vim | CVE-2022-0443 | https://security-tracker.debian.org/tracker/CVE-2022-0443 webkitgtk | CVE-2021-42762 | https://security-tracker.debian.org/tracker/CVE-2021-42762 wpa_supplicant | CVE-2022-23303 | https://security-tracker.debian.org/tracker/CVE-2022-23303 wpa_supplicant | CVE-2022-23304 | https://security-tracker.debian.org/tracker/CVE-2022-23304 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 xen | CVE-2022-23033 | https://security-tracker.debian.org/tracker/CVE-2022-23033 xen | CVE-2022-23035 | https://security-tracker.debian.org/tracker/CVE-2022-23035 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 xterm | CVE-2022-24130 | https://security-tracker.debian.org/tracker/CVE-2022-24130 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 -- http://autobuild.buildroot.net From peter at korsgaard.com Mon Feb 7 07:31:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Feb 2022 08:31:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/lm-sensors: update LM_SENSORS_VERSION In-Reply-To: <20220206145108.1757971-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 6 Feb 2022 15:51:08 +0100") References: <20220206145108.1757971-1-fontaine.fabrice@gmail.com> Message-ID: <875ypruo88.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Update LM_SENSORS_VERSION to make it match what is returned by > https://release-monitoring.org > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 7 07:31:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Feb 2022 08:31:55 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-lmdb: bump to version 1.3.0 In-Reply-To: <20220206144148.1755592-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 6 Feb 2022 15:41:48 +0100") References: <20220206144148.1755592-1-fontaine.fabrice@gmail.com> Message-ID: <871r0fuo7o.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Update indentation in hash file (two spaces) > https://github.com/jnwatson/py-lmdb/blob/py-lmdb_1.3.0/ChangeLog > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 7 07:32:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Feb 2022 08:32:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/jack1: drop celt comment In-Reply-To: <20220206143112.1752984-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 6 Feb 2022 15:31:12 +0100") References: <20220206143112.1752984-1-fontaine.fabrice@gmail.com> Message-ID: <87wni7t9n1.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Drop celt comment which is not needed since removal of celt051 in commit > b32efbdb0354557db48852478b99080705ba315b > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 7 07:32:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Feb 2022 08:32:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/ofono: bump to version 1.34 In-Reply-To: <20220206141804.1744721-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 6 Feb 2022 15:18:04 +0100") References: <20220206141804.1744721-1-fontaine.fabrice@gmail.com> Message-ID: <87sfsvt9mi.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Update indentation in hash file (two spaces) > https://git.kernel.org/pub/scm/network/ofono/ofono.git/tree/ChangeLog?h=1.34 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 7 07:32:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Feb 2022 08:32:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-tinyrpc: bump to version 1.1.4 In-Reply-To: <20220206143535.1754289-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 6 Feb 2022 15:35:35 +0100") References: <20220206143535.1754289-1-fontaine.fabrice@gmail.com> Message-ID: <87o83jt9lz.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://github.com/mbr/tinyrpc/compare/1.1.1...1.1.4 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 7 07:33:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Feb 2022 08:33:08 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/python-pyusb: bump to version 1.2.1 In-Reply-To: <20220206143918.1755288-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 6 Feb 2022 15:39:18 +0100") References: <20220206143918.1755288-1-fontaine.fabrice@gmail.com> Message-ID: <87k0e7t9l7.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Update indentation in hash file (two spaces) > https://github.com/pyusb/pyusb/releases/tag/v1.2.0 > https://github.com/pyusb/pyusb/releases/tag/v1.2.1 > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2: > - Fix typo in commit title (pysub -> pyusb) Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 7 07:35:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Feb 2022 08:35:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/lua-cffi: fix spaces In-Reply-To: <20220206195643.2522277-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 6 Feb 2022 20:56:43 +0100") References: <20220206195643.2522277-1-fontaine.fabrice@gmail.com> Message-ID: <87czjzt9h9.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Commit 13114d0f9352531e5d7ebed45cd3f679407c61d9 forgot to add spaces > before and after '=' and added a spurious space in Config.in > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 7 07:31:18 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Feb 2022 08:31:18 +0100 Subject: [Buildroot] [git commit] package/jack1: drop celt comment Message-ID: <20220207072828.5897882BB8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c6e200383cdf738f58fe1c6e42d3d5a10f7c1a62 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop celt comment which is not needed since removal of celt051 in commit b32efbdb0354557db48852478b99080705ba315b Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/jack1/jack1.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/jack1/jack1.mk b/package/jack1/jack1.mk index 2f97434ebe..311f7c9ba0 100644 --- a/package/jack1/jack1.mk +++ b/package/jack1/jack1.mk @@ -11,8 +11,6 @@ JACK1_LICENSE = GPL-2.0+ (jack server), LGPL-2.1+ (jack library) JACK1_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL JACK1_INSTALL_STAGING = YES -# Dependency to celt can't be met: jack1 requires celt >= 0.8.0 but we -# only have 0.5.1.3 and we cannot upgrade. JACK1_DEPENDENCIES = host-pkgconf alsa-lib berkeleydb libsamplerate libsndfile ifeq ($(BR2_PACKAGE_READLINE),y) From peter at korsgaard.com Mon Feb 7 07:30:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Feb 2022 08:30:28 +0100 Subject: [Buildroot] [git commit] package/lm-sensors: update LM_SENSORS_VERSION Message-ID: <20220207072828.4F4B782B95@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=521afeab9b7c0b07a849355e8b1c1fde0965c84f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update LM_SENSORS_VERSION to make it match what is returned by https://release-monitoring.org Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/lm-sensors/lm-sensors.hash | 2 +- package/lm-sensors/lm-sensors.mk | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/lm-sensors/lm-sensors.hash b/package/lm-sensors/lm-sensors.hash index 0ca07b7e69..c941043343 100644 --- a/package/lm-sensors/lm-sensors.hash +++ b/package/lm-sensors/lm-sensors.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 0591f9fa0339f0d15e75326d0365871c2d4e2ed8aa1ff759b3a55d3734b7d197 lm-sensors-3-6-0.tar.gz +sha256 0591f9fa0339f0d15e75326d0365871c2d4e2ed8aa1ff759b3a55d3734b7d197 lm-sensors-3.6.0.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL diff --git a/package/lm-sensors/lm-sensors.mk b/package/lm-sensors/lm-sensors.mk index 8975efaffa..1bf27fc25a 100644 --- a/package/lm-sensors/lm-sensors.mk +++ b/package/lm-sensors/lm-sensors.mk @@ -4,8 +4,9 @@ # ################################################################################ -LM_SENSORS_VERSION = 3-6-0 -LM_SENSORS_SITE = $(call github,lm-sensors,lm-sensors,V$(LM_SENSORS_VERSION)) +LM_SENSORS_VERSION = 3.6.0 +LM_SENSORS_SITE = \ + $(call github,lm-sensors,lm-sensors,V$(subst .,-,$(LM_SENSORS_VERSION))) LM_SENSORS_INSTALL_STAGING = YES LM_SENSORS_DEPENDENCIES = host-bison host-flex LM_SENSORS_LICENSE = LGPL-2.1+ (libsensors), GPL-2.0+ (programs) From peter at korsgaard.com Mon Feb 7 07:32:18 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Feb 2022 08:32:18 +0100 Subject: [Buildroot] [git commit] package/ofono: bump to version 1.34 Message-ID: <20220207072828.6FFB4814A4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=91a0425d066fd073c8dd9907b902010162d5954b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update indentation in hash file (two spaces) https://git.kernel.org/pub/scm/network/ofono/ofono.git/tree/ChangeLog?h=1.34 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/ofono/ofono.hash | 4 ++-- package/ofono/ofono.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ofono/ofono.hash b/package/ofono/ofono.hash index 02245a46f4..7edef0eb80 100644 --- a/package/ofono/ofono.hash +++ b/package/ofono/ofono.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/network/ofono/sha256sums.asc -sha256 a15c5d28096c10eb30e47a68b6dc2e7c4a5a99d7f4cfedf0b69624f33d859e9b ofono-1.31.tar.xz +sha256 c0b96d3013447ec2bcb74579bef90e4e59c68dbfa4b9c6fbce5d12401a43aac7 ofono-1.34.tar.xz # Locally computed -sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING +sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/package/ofono/ofono.mk b/package/ofono/ofono.mk index 57d6cab470..b7a2a923f9 100644 --- a/package/ofono/ofono.mk +++ b/package/ofono/ofono.mk @@ -4,7 +4,7 @@ # ################################################################################ -OFONO_VERSION = 1.31 +OFONO_VERSION = 1.34 OFONO_SOURCE = ofono-$(OFONO_VERSION).tar.xz OFONO_SITE = $(BR2_KERNEL_MIRROR)/linux/network/ofono OFONO_LICENSE = GPL-2.0 From peter at korsgaard.com Mon Feb 7 07:32:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Feb 2022 08:32:36 +0100 Subject: [Buildroot] [git commit] package/python-tinyrpc: bump to version 1.1.4 Message-ID: <20220207072828.78EBD82BB8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=73d427137cc2867f1018261f61cf9c514f50a6fb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/mbr/tinyrpc/compare/1.1.1...1.1.4 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/python-tinyrpc/python-tinyrpc.hash | 4 ++-- package/python-tinyrpc/python-tinyrpc.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-tinyrpc/python-tinyrpc.hash b/package/python-tinyrpc/python-tinyrpc.hash index c5bdad567e..d4bd348e61 100644 --- a/package/python-tinyrpc/python-tinyrpc.hash +++ b/package/python-tinyrpc/python-tinyrpc.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/tinyrpc/json -md5 34d7b41ab48297b6b8fbf937e3d43a57 tinyrpc-1.1.1.tar.gz -sha256 9e68d7b9688dac8deaa342a2507d04f0b2ece64a9d19382aa2ee13d692e87d7f tinyrpc-1.1.1.tar.gz +md5 cc7e62891eee806dfbbafb6e3875825e tinyrpc-1.1.4.tar.gz +sha256 c99f412e5d9849c2deb468ea37fee2faf12fbc95bdd3616ae5c276ea195ed6bd tinyrpc-1.1.4.tar.gz # Locally computed sha256 checksums sha256 587f1ea174824613f4a7e0d7fb95fda000a7f58ca17df12416e014c9ee82e619 LICENSE diff --git a/package/python-tinyrpc/python-tinyrpc.mk b/package/python-tinyrpc/python-tinyrpc.mk index f3f7dcc52b..e976778fa2 100644 --- a/package/python-tinyrpc/python-tinyrpc.mk +++ b/package/python-tinyrpc/python-tinyrpc.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TINYRPC_VERSION = 1.1.1 +PYTHON_TINYRPC_VERSION = 1.1.4 PYTHON_TINYRPC_SOURCE = tinyrpc-$(PYTHON_TINYRPC_VERSION).tar.gz -PYTHON_TINYRPC_SITE = https://files.pythonhosted.org/packages/6a/63/0851365686da1ca9ab03d63b035eccf87a1d85b743ce07d079462350da33 +PYTHON_TINYRPC_SITE = https://files.pythonhosted.org/packages/d2/86/2741f0c74cc339416c9803b6393eaf230254ecf36ffd839614799e15a202 PYTHON_TINYRPC_SETUP_TYPE = setuptools PYTHON_TINYRPC_LICENSE = MIT PYTHON_TINYRPC_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 7 07:31:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Feb 2022 08:31:46 +0100 Subject: [Buildroot] [git commit] package/python-lmdb: bump to version 1.3.0 Message-ID: <20220207072828.6293082BC8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cb2d17921bfb1f34601f1f2fcf27aa89a88a9591 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update indentation in hash file (two spaces) https://github.com/jnwatson/py-lmdb/blob/py-lmdb_1.3.0/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/python-lmdb/python-lmdb.hash | 6 +++--- package/python-lmdb/python-lmdb.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-lmdb/python-lmdb.hash b/package/python-lmdb/python-lmdb.hash index e7b8ae3455..e50c35df67 100644 --- a/package/python-lmdb/python-lmdb.hash +++ b/package/python-lmdb/python-lmdb.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/lmdb/json -md5 b8f4a2cd1748e8a5f5e352d1cb3d4350 lmdb-1.2.1.tar.gz -sha256 5f76a90ebd08922acca11948779b5055f7a262687178e9e94f4e804b9f8465bc lmdb-1.2.1.tar.gz +md5 3c955c49be10a7a07a2fcd54d180c3af lmdb-1.3.0.tar.gz +sha256 60a11efc21aaf009d06518996360eed346f6000bfc9de05114374230879f992e lmdb-1.3.0.tar.gz # Locally computed sha256 checksums -sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE +sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE diff --git a/package/python-lmdb/python-lmdb.mk b/package/python-lmdb/python-lmdb.mk index 33c48cc8c7..fba168d340 100644 --- a/package/python-lmdb/python-lmdb.mk +++ b/package/python-lmdb/python-lmdb.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_LMDB_VERSION = 1.2.1 +PYTHON_LMDB_VERSION = 1.3.0 PYTHON_LMDB_SOURCE = lmdb-$(PYTHON_LMDB_VERSION).tar.gz -PYTHON_LMDB_SITE = https://files.pythonhosted.org/packages/2f/df/3aea5279753cb8ab0c96dec43106e24f388d4179d5224f6d3e652016c095 +PYTHON_LMDB_SITE = https://files.pythonhosted.org/packages/ed/61/41f3c7cbd8a67202ef24fad3375ed936093a0547dc645581dd11c09581b7 PYTHON_LMDB_LICENSE = OLDAP-2.8 PYTHON_LMDB_LICENSE_FILES = LICENSE PYTHON_LMDB_SETUP_TYPE = setuptools From peter at korsgaard.com Mon Feb 7 07:32:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Feb 2022 08:32:56 +0100 Subject: [Buildroot] [git commit] package/python-pyusb: bump to version 1.2.1 Message-ID: <20220207072828.82C93814A4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a181757f96bc83bb7ddaafcfb1df9f8f18d4bc0d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update indentation in hash file (two spaces) https://github.com/pyusb/pyusb/releases/tag/v1.2.0 https://github.com/pyusb/pyusb/releases/tag/v1.2.1 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/python-pyusb/python-pyusb.hash | 8 ++++---- package/python-pyusb/python-pyusb.mk | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-pyusb/python-pyusb.hash b/package/python-pyusb/python-pyusb.hash index 9c634ef722..f08b212b3e 100644 --- a/package/python-pyusb/python-pyusb.hash +++ b/package/python-pyusb/python-pyusb.hash @@ -1,5 +1,5 @@ -# md5 from https://pypi.python.org/pypi/pyusb/json -md5 a9db479f1fb914e91d3106e67a13ae09 pyusb-1.1.1.tar.gz -# Locally computed -sha256 7d449ad916ce58aff60b89aae0b65ac130f289c24d6a5b7b317742eccffafc38 pyusb-1.1.1.tar.gz +# md5, sha256 from https://pypi.org/pypi/pyusb/json +md5 880008dff32dac8f58076b4e534492d9 pyusb-1.2.1.tar.gz +sha256 a4cc7404a203144754164b8b40994e2849fde1cfff06b08492f12fff9d9de7b9 pyusb-1.2.1.tar.gz +# Locally computed sha256 checksums sha256 03e39fdcee9c18f2f9d0c3500a993ddeac050695eb81070ea41347587c76a7fe LICENSE diff --git a/package/python-pyusb/python-pyusb.mk b/package/python-pyusb/python-pyusb.mk index dc81efde9e..2f4f9581b6 100644 --- a/package/python-pyusb/python-pyusb.mk +++ b/package/python-pyusb/python-pyusb.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYUSB_VERSION = 1.1.1 +PYTHON_PYUSB_VERSION = 1.2.1 PYTHON_PYUSB_SOURCE = pyusb-$(PYTHON_PYUSB_VERSION).tar.gz -PYTHON_PYUSB_SITE = https://files.pythonhosted.org/packages/b9/8d/25c4e446a07e918eb39b5af25c4a83a89db95ae44e4ed5a46c3c53b0a4d6 +PYTHON_PYUSB_SITE = https://files.pythonhosted.org/packages/d9/6e/433a5614132576289b8643fe598dd5d51b16e130fd591564be952e15bb45 PYTHON_PYUSB_LICENSE = BSD-3-Clause PYTHON_PYUSB_LICENSE_FILES = LICENSE PYTHON_PYUSB_SETUP_TYPE = setuptools From peter at korsgaard.com Mon Feb 7 07:35:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Feb 2022 08:35:09 +0100 Subject: [Buildroot] [git commit] package/lua-cffi: fix spaces Message-ID: <20220207072828.8BF4882BC8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c33cecfac4d48346611b56e6f1a553a1fe86d704 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 13114d0f9352531e5d7ebed45cd3f679407c61d9 forgot to add spaces before and after '=' and added a spurious space in Config.in Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/lua-cffi/Config.in | 2 +- package/lua-cffi/lua-cffi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lua-cffi/Config.in b/package/lua-cffi/Config.in index 64a36e1de4..f4a760ce0d 100644 --- a/package/lua-cffi/Config.in +++ b/package/lua-cffi/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_LUA_CFFI bool "lua-cffi" depends on !BR2_PACKAGE_LUAJIT - depends on BR2_TOOLCHAIN_HAS_THREADS # libffi + depends on BR2_TOOLCHAIN_HAS_THREADS # libffi depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_LIBFFI diff --git a/package/lua-cffi/lua-cffi.mk b/package/lua-cffi/lua-cffi.mk index 07d84ad5fa..964f49f030 100644 --- a/package/lua-cffi/lua-cffi.mk +++ b/package/lua-cffi/lua-cffi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_CFFI_VERSION=0.2.1 +LUA_CFFI_VERSION = 0.2.1 LUA_CFFI_SITE = $(call github,q66,cffi-lua,v$(LUA_CFFI_VERSION)) LUA_CFFI_LICENSE = MIT LUA_CFFI_LICENSE_FILES = COPYING.md From peter at korsgaard.com Mon Feb 7 07:37:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Feb 2022 08:37:33 +0100 Subject: [Buildroot] [PATCH] package/rauc: d-bus support is optional In-Reply-To: <20220205144306.29481-1-peter@korsgaard.com> (Peter Korsgaard's message of "Sat, 5 Feb 2022 15:43:04 +0100") References: <20220205144306.29481-1-peter@korsgaard.com> Message-ID: <878runt9du.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > As pointed out by Jan L?bbe, D-Bus support is optional: >> You can build without D-Bus (./configure --disable-service). > So drop it from the required dependencies and add a RAUC_DBUS sub option > like it is done for network/json. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 7 07:37:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Feb 2022 08:37:21 +0100 Subject: [Buildroot] [git commit] package/rauc: d-bus support is optional Message-ID: <20220207073030.B5FD482D5B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=72308ab9a32de6e8b4b23e42f115ed5ee87e5f33 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master As pointed out by Jan L??bbe, D-Bus support is optional: > You can build without D-Bus (./configure --disable-service). So drop it from the required dependencies and add a RAUC_DBUS sub option like it is done for network/json. Signed-off-by: Peter Korsgaard --- package/rauc/Config.in | 8 +++++++- package/rauc/rauc.mk | 9 ++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/package/rauc/Config.in b/package/rauc/Config.in index 676ff42b51..b4f7b81948 100644 --- a/package/rauc/Config.in +++ b/package/rauc/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_RAUC depends on BR2_USE_WCHAR # glib2 select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_DBUS select BR2_PACKAGE_SQUASHFS # run-time dependency select BR2_PACKAGE_UBOOT_TOOLS if BR2_TARGET_UBOOT # run-time dependency select BR2_PACKAGE_UBOOT_TOOLS_FWPRINTENV if BR2_TARGET_UBOOT @@ -19,6 +18,13 @@ config BR2_PACKAGE_RAUC if BR2_PACKAGE_RAUC +config BR2_PACKAGE_RAUC_DBUS + bool "dbus support" + select BR2_PACKAGE_DBUS + help + This option enables support for controlling rauc through + D-Bus. + config BR2_PACKAGE_RAUC_NETWORK bool "network support" select BR2_PACKAGE_LIBCURL diff --git a/package/rauc/rauc.mk b/package/rauc/rauc.mk index 4fb3ddde3e..99efc16c2f 100644 --- a/package/rauc/rauc.mk +++ b/package/rauc/rauc.mk @@ -10,7 +10,14 @@ RAUC_SOURCE = rauc-$(RAUC_VERSION).tar.xz RAUC_LICENSE = LGPL-2.1 RAUC_LICENSE_FILES = COPYING RAUC_CPE_ID_VENDOR = pengutronix -RAUC_DEPENDENCIES = host-pkgconf openssl libglib2 dbus +RAUC_DEPENDENCIES = host-pkgconf openssl libglib2 + +ifeq ($(BR2_PACKAGE_RAUC_DBUS),y) +RAUC_CONF_OPTS += --enable-service +RAUC_DEPENDENCIES += dbus +else +RAUC_CONF_OPTS += --disable-service +endif ifeq ($(BR2_PACKAGE_RAUC_NETWORK),y) RAUC_CONF_OPTS += --enable-network From arnout at mind.be Mon Feb 7 07:52:55 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 7 Feb 2022 08:52:55 +0100 Subject: [Buildroot] [git commit] support/testing: fix test_lua_cffi.py flake8 error Message-ID: <20220207074629.4D4D982815@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=11f8b9fb45aee2d83fffd8d57f5c4ccfc1b1f613 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master support/testing/tests/package/test_lua_cffi.py:14:1: W391 blank line at end of file Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- support/testing/tests/package/test_lua_cffi.py | 1 - 1 file changed, 1 deletion(-) diff --git a/support/testing/tests/package/test_lua_cffi.py b/support/testing/tests/package/test_lua_cffi.py index 7f56eef566..32547a4ae1 100644 --- a/support/testing/tests/package/test_lua_cffi.py +++ b/support/testing/tests/package/test_lua_cffi.py @@ -11,4 +11,3 @@ class TestLuaLuaCffi(TestLuaBase): def test_run(self): self.login() self.module_test("cffi") - From thomas.petazzoni at bootlin.com Mon Feb 7 07:55:17 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 7 Feb 2022 08:55:17 +0100 Subject: [Buildroot] [PATCH 01/16] board/aarch64-efi/genimage-efi: convert partition-type-uuid to single letter notation In-Reply-To: <20220206213657.GA457876@scaer> References: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> <20220206200532.2758493-2-giulio.benetti@benettiengineering.com> <20220206213657.GA457876@scaer> Message-ID: <20220207085517.5c13c097@windsurf> Hello, On Sun, 6 Feb 2022 22:36:57 +0100 "Yann E. MORIN" wrote: > > partition root { > > - partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae > > + partition-type-uuid = L > > As we discussed on IRC, this is not the same thing. genimage will extend > the 'L' shorthand to the full UUID 0fc63daf-8483-4772-8e79-3d69d8477de4, > which is different. And? Is that really important? > So I don't think uaing the shorthands are correct. Why? > The UUID assignments are available on Wikipedia: > https://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs > > But the systemd docuemntation has extra UUID definitions: > https://man.archlinux.org/man/systemd-gpt-auto-generator.8 Yes, but how useful are they? Unless these systemd-defined UUID are really relevant, I would prefer that we use the shortcuts provided by genimage wherever possible, and only rely on using the full UUID for special cases, such as the board/sifive/hifive-unleashed/genimage_sdcard.cfg (PATCH 15/16). This way, it would be pretty clear that we have the "common cases" (boot partition, rootfs partition) and the "odd/special cases". Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From Eugen.Hristev at microchip.com Mon Feb 7 08:44:31 2022 From: Eugen.Hristev at microchip.com (Eugen.Hristev at microchip.com) Date: Mon, 7 Feb 2022 08:44:31 +0000 Subject: [Buildroot] [PATCH v3 1/2] configs/microchip_sama7g5ek_mmc_defconfig: set custom linux version to 5.15.21 and add host openssl for linux In-Reply-To: <888aa13f-277c-f4a0-2447-79d58145816d@benettiengineering.com> References: <20220206115156.6042cc1b@windsurf> <20220206112620.1637342-1-giulio.benetti@benettiengineering.com> <20220206112620.1637342-2-giulio.benetti@benettiengineering.com> <20220206131656.16e2c8a6@windsurf> <0f8fcb54-806c-fb0b-27ea-38eb938a725f@microchip.com> <888aa13f-277c-f4a0-2447-79d58145816d@benettiengineering.com> Message-ID: On 2/6/22 9:51 PM, Giulio Benetti wrote: > Hi Eugen, Thomas, Ludovic, > > On 06/02/22 20:39, Eugen.Hristev at microchip.com wrote: >> On 2/6/22 4:25 PM, Giulio Benetti wrote: >>> Hi Thomas, >>> >>> On 06/02/22 13:16, Thomas Petazzoni wrote: >>>> On Sun,? 6 Feb 2022 12:26:19 +0100 >>>> Giulio Benetti wrote: >>>> >>>>> Fixes: >>>>> https://gitlab.com/ymorin/buildroot/-/jobs/2035821098 >>>>> >>>>> Signed-off-by: Giulio Benetti >>>> >>>> Did you actually test on HW that 5.15.21 was working? >>> >>> Unfortunately I don't have board, so no. >>> >>>> Shouldn't this be >>>> done by the original submitter of the defconfig. >>>> >>>> Eugen, Ludovic? >> >> I can test it. Do you have a built already done with it on top that I >> could download ? (would certainly speed things up) > > Here are the 2 links with the prebuilt images for both boards: > https://www.dropbox.com/s/av9vz28459hakjl/microchip_sama7g5ek_mmc_dev-sdcard.img?dl=0 > > https://www.dropbox.com/s/77t2tru95f6l0wk/microchip_sama7g5ek_mmc-sdcard.img?dl=0 > > >> I do not really understand why we need to have a fixed kernel version. >> This board works with latest LTS starting from 5.15. Can't buildroot >> just select that ? > > It can't because otherwise, once Buildroot Latest Linux version gets > bumped(like 5.16 etc.), your defconfig will be built with a new and > untested Linux version(i.e 5.16). So we need to set a specific version, > test it, commit it, and in the future we can bump it, wait for a HW > testing, commit it etc. > >> And why just adding the missing dependency does not fix things. > > Because that only chooses the "Custom kernel headers series" and not > Linux version, so once Latest version is bumped(i.e. to 5.16) it won't > be valid anymore. The point here is that this: > BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15 > is needed because of these: > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.21" > > and these ^^^ allow us to have a stable, HW tested defconfig. > >> (I remember buildroot had something like kernel latest version to pick >> up ). > > That is not what we want because of above explanation. It can result in > a non working defconfig. Booting Linux on physical CPU 0x0 Linux version 5.15.21 (br-user at 73343cda1592) (arm-buildroot-linux-uclibcgnueabihf-gcc.br_real (Buildroot 2021.11-1538-g036577d6b5) 10.3.0, GNU ld (GNU Binutils) 2.36.1) #1 Sun Feb 6 14:40:03 UTC 2022 CPU: ARMv7 Processor [410fc075] revision 5 (ARMv7), cr=10c53c7d # cat /etc/os-release NAME=Buildroot VERSION=2021.11-1538-g036577d6b5 ID=buildroot VERSION_ID=2022.02-git PRETTY_NAME="Buildroot 2022.02-git" # It looks to boot fine. Tested-by: Eugen Hristev > > Best regards > -- > Giulio Benetti > Benetti Engineering sas From Eugen.Hristev at microchip.com Mon Feb 7 08:53:42 2022 From: Eugen.Hristev at microchip.com (Eugen.Hristev at microchip.com) Date: Mon, 7 Feb 2022 08:53:42 +0000 Subject: [Buildroot] [PATCH v3 2/2] configs/microchip_sama7g5ek_mmc_dev_defconfig: set custom linux version to 5.15.21 and add host openssl for linux In-Reply-To: <20220206112620.1637342-3-giulio.benetti@benettiengineering.com> References: <20220206115156.6042cc1b@windsurf> <20220206112620.1637342-1-giulio.benetti@benettiengineering.com> <20220206112620.1637342-3-giulio.benetti@benettiengineering.com> Message-ID: On 2/6/22 1:26 PM, Giulio Benetti wrote: > Fixes: > https://gitlab.com/ymorin/buildroot/-/jobs/2035821100 > > Signed-off-by: Giulio Benetti > --- > V1->V2: > * add host openssl linux > V2->V3: > * set custom linux version as suggested by Thomas > --- > configs/microchip_sama7g5ek_mmc_dev_defconfig | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/configs/microchip_sama7g5ek_mmc_dev_defconfig b/configs/microchip_sama7g5ek_mmc_dev_defconfig > index 3253bce401..c11ea2f518 100644 > --- a/configs/microchip_sama7g5ek_mmc_dev_defconfig > +++ b/configs/microchip_sama7g5ek_mmc_dev_defconfig > @@ -1,6 +1,7 @@ > BR2_arm=y > BR2_cortex_a7=y > BR2_ARM_FPU_NEON_VFPV4=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > BR2_TOOLCHAIN_BUILDROOT_WCHAR=y > BR2_PTHREAD_DEBUG=y > BR2_TOOLCHAIN_BUILDROOT_CXX=y > @@ -8,9 +9,12 @@ BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y > BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/microchip/sama7g5ek/genimage.cfg" > BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.21" > BR2_LINUX_KERNEL_DEFCONFIG="sama7" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama7g5ek" > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > BR2_PACKAGE_LINUX_TOOLS_IIO=y > BR2_PACKAGE_BZIP2=y > BR2_PACKAGE_XZ=y > -- > 2.25.1 > Hi, This one boots , but it has a small problem Here is the log : Waiting for root device /dev/mmcblk1p2... mmc1: new SDHC card at address aaaa mmcblk1: mmc1:aaaa SL16G 14.8 GiB mmcblk1: p1 p2 EXT4-fs (mmcblk1p2): mounted filesystem with ordered data mode. Opts: (null). Quota mode: disabled. VFS: Mounted root (ext4 filesystem) on device 179:2. devtmpfs: mounted Freeing unused kernel image (initmem) memory: 1024K Run /sbin/init as init process mmc0: new MMC card at address 0001 mmcblk0: mmc0:0001 S40004 3.64 GiB mmcblk0: p1 mmcblk0boot0: mmc0:0001 S40004 4.00 MiB mmcblk0boot1: mmc0:0001 S40004 4.00 MiB mmcblk0rpmb: mmc0:0001 S40004 4.00 MiB, chardev (246:0) EXT4-fs (mmcblk1p2): re-mounted. Opts: (null). Quota mode: disabled. Starting syslogd: OK Starting klogd: OK Running sysctl: OK Populating /dev using udev: udevd[101]: starting version 3.2.11 random: udevd: uninitialized urandom read (16 bytes read) random: udevd: uninitialized urandom read (16 bytes read) random: udevd: uninitialized urandom read (16 bytes read) udevd[102]: starting eudev-3.2.11 done Saving random seed: OK Starting system message bus: done Starting iptables: OK Starting bluetoothd: OK Starting network: OK urandom_read: 5 callbacks suppressed random: bluetoothd: uninitialized urandom read (4 bytes read) LDO2: disabling VDDOUT25: disabling ^C^C ^Z random: crng init done ssh-keygen: generating new host keys: RSA DSA ECDSA ED25519 Starting sshd: OK Welcome to Buildroot buildroot login: It takes a few minutes before crng init done. I remember such problem was caused by libjitterentropy . Even so, it looks like a different problem, so, Tested-by: Eugen Hristev Eugen From nealf at xilinx.com Mon Feb 7 09:34:31 2022 From: nealf at xilinx.com (Neal Frager) Date: Mon, 7 Feb 2022 09:34:31 +0000 Subject: [Buildroot] Xilinx zynqmp_zcu10x_defconfigs: two things left In-Reply-To: <8be136a0-1263-3b17-0b78-b7d34ef146c2@lucaceresoli.net> References: <0a82d8c7-a0c6-06a5-6a0b-788fd5c4a935@benettiengineering.com> <8be136a0-1263-3b17-0b78-b7d34ef146c2@lucaceresoli.net> Message-ID: Adding buildroot ML on copy of discussion: Hi Neal, Giulio, Neal, it's better to send technical discussion e-mail on the Buildroot mailing list: you'll get more replies, less latency and other people can benefit from the discussion (now and in the future). On 06/02/22 23:20, Giulio Benetti wrote: > Hi Neal, > > On 06/02/22 20:27, Neal Frager wrote: >> Hi Giulio, Luca, >> >> I now have a version of the defconfigs which will at least build >> cleanly with buildroot without requiring any manual steps. However, >> in order to get Linux to boot and login to the rootfs, I am still >> doing two manual things to make this happen. If our goal is to make >> defconfigs that just boot, then we need to find a solution to make >> these two manual things included with the buildroot build automation. >> >> 1. PMU firmware configuration object. Without configuring the >> following U-Boot .config option, the PMU firmware does not appear to >> be working properly. I have been fixing this manually by adding this >> configuration, rebuilding U-Boot, and then copying the results into >> the output/images directory. While this works, it is not a clean out >> of box experience for new users. >> >> CONFIG_ZYNQMP_SPL_PM_CFG_OBJ_FILE >> >> Is there a buildroot config option like BR2_TARGET_UBOOT_ZYNQMP_PMUFW >> available that can be used for configuring this with the automated >> build process? > > There is a better option I think: > BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES Even better, use BR2_TARGET_UBOOT_ZYNQMP_PM_CFG Buildroot option (Bootloaders -> U-Boot -> Boot on the Xilinx ZynqMP SoCs). It is specifically done for that purpose. -- Luca From nealf at xilinx.com Mon Feb 7 09:35:11 2022 From: nealf at xilinx.com (Neal Frager) Date: Mon, 7 Feb 2022 09:35:11 +0000 Subject: [Buildroot] Xilinx zynqmp_zcu10x_defconfigs: two things left In-Reply-To: <0a82d8c7-a0c6-06a5-6a0b-788fd5c4a935@benettiengineering.com> References: <0a82d8c7-a0c6-06a5-6a0b-788fd5c4a935@benettiengineering.com> Message-ID: Adding buildroot ML on copy of discussion: Hi Neal, On 06/02/22 20:27, Neal Frager wrote: > Hi Giulio, Luca, > > I now have a version of the defconfigs which will at least build cleanly with buildroot without requiring any manual steps. However, in order to get Linux to boot and login to the rootfs, I am still doing two manual things to make this happen. If our goal is to make defconfigs that just boot, then we need to find a solution to make these two manual things included with the buildroot build automation. > > 1. PMU firmware configuration object. Without configuring the following U-Boot .config option, the PMU firmware does not appear to be working properly. I have been fixing this manually by adding this configuration, rebuilding U-Boot, and then copying the results into the output/images directory. While this works, it is not a clean out of box experience for new users. > > CONFIG_ZYNQMP_SPL_PM_CFG_OBJ_FILE > > Is there a buildroot config option like BR2_TARGET_UBOOT_ZYNQMP_PMUFW available that can be used for configuring this with the automated build process? There is a better option I think: BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES With this you can add a fragment file like: https://github.com/buildroot/buildroot/blob/master/board/olimex/a20_olinuxino/linux-disable-lima.fragment in your board that simply enables that option, so it will contain: CONFIG_ZYNQMP_SPL_PM_CFG_OBJ_FILE=12345 To test it, remember to rebuild uboot from scratch with: # make uboot-dirclean uboot With this it should simply work. Hint: if you need to configure uboot, don't navigate to build/uboot-... and hint make menuconfig, but, in the buildroot folder simply hint: # make uboot-menuconfig and this is true for Linux too > 2. Kernel bootargs configuration. I suppose this should be the easier one to fix as there is probably already a solution. The current out of box buildroot build will fail to find the rootfs unless I stop the boot process within U-Boot to execute the two commands below. > > setenv bootargs "console=ttyPS0,115200n8 root=/dev/mmcblk0p2 rw rootwait" > saveenv > > Once the bootargs parameter is saved in the U-Boot environment, my buildroot image is able to boot properly. Is there a way to configure the bootargs parameter from the buildroot defconfig? Yes there is. You can go with 2 typical options: 1) use boot.scr script that ends up to rootfs /boot/ 2) use extlinux.conf The 2nd solution is the most used in the last months. You can take a look here: https://github.com/buildroot/buildroot/tree/master/board/orangepi/orangepi-lite2 and check extlinux.conf and post-build.sh scripts you will have to provide the same way and then add: https://github.com/buildroot/buildroot/blob/master/configs/orangepi_lite2_defconfig#L48 to your defconfigs. That way it should work depending if your u-boot search for extlinux.conf, but usually yes. So give a try that way and let us know. > I believe we are almost there for creating a new image which can build and run without any manual steps. Thank you both for all your help! Awesome! Best regards :-) -- Giulio Benetti Benetti Engineering sas From Alexey.Brodkin at synopsys.com Mon Feb 7 10:07:08 2022 From: Alexey.Brodkin at synopsys.com (Alexey Brodkin) Date: Mon, 7 Feb 2022 10:07:08 +0000 Subject: [Buildroot] [arc-buildroot] [PATCH 1/5] configs/snps_arc700_axs101: bump kernel and u-boot versions In-Reply-To: <20220131081214.12773-2-geomatsi@gmail.com> References: <20220131081214.12773-1-geomatsi@gmail.com> <20220131081214.12773-2-geomatsi@gmail.com> Message-ID: Hi Sergey, all, > Bump versions: > - use U-Boot 2022.01 > - use Linux kernel v5.16 > > Add U-Boot configuration fragment increasing early malloc pool size. > > Signed-off-by: Sergey Matyukevich Acked-by: Alexey Brodkin From Alexey.Brodkin at synopsys.com Mon Feb 7 10:08:12 2022 From: Alexey.Brodkin at synopsys.com (Alexey Brodkin) Date: Mon, 7 Feb 2022 10:08:12 +0000 Subject: [Buildroot] [arc-buildroot] [PATCH 2/5] configs/snps_archs32_axs103: bump kernel and u-boot versions In-Reply-To: <20220131081214.12773-3-geomatsi@gmail.com> References: <20220131081214.12773-1-geomatsi@gmail.com> <20220131081214.12773-3-geomatsi@gmail.com> Message-ID: Hi Sergey, all, > Bump versions: > - use U-Boot 2022.01 > - use Linux kernel v5.16 > > Add U-Boot configuration fragment increasing early malloc pool size. > > Signed-off-by: Sergey Matyukevich Acked-by: Alexey Brodkin From Alexey.Brodkin at synopsys.com Mon Feb 7 10:09:27 2022 From: Alexey.Brodkin at synopsys.com (Alexey Brodkin) Date: Mon, 7 Feb 2022 10:09:27 +0000 Subject: [Buildroot] [arc-buildroot] [PATCH 3/5] configs/snps_archs38_hsdk: bump kernel and u-boot versions In-Reply-To: <20220131081214.12773-4-geomatsi@gmail.com> References: <20220131081214.12773-1-geomatsi@gmail.com> <20220131081214.12773-4-geomatsi@gmail.com> Message-ID: Hi Sergey, all, > Bump versions: > - use U-Boot 2022.01 > - use Linux kernel v5.16 > > Signed-off-by: Sergey Matyukevich Acked-by: Alexey Brodkin From Alexey.Brodkin at synopsys.com Mon Feb 7 10:09:56 2022 From: Alexey.Brodkin at synopsys.com (Alexey Brodkin) Date: Mon, 7 Feb 2022 10:09:56 +0000 Subject: [Buildroot] [arc-buildroot] [PATCH 4/5] configs/snps_archs38_haps: bump kernel and u-boot versions In-Reply-To: <20220131081214.12773-5-geomatsi@gmail.com> References: <20220131081214.12773-1-geomatsi@gmail.com> <20220131081214.12773-5-geomatsi@gmail.com> Message-ID: Hi Sergey, all, > Bump versions: > - use U-Boot 2022.01 > - use Linux kernel v5.16 > > Signed-off-by: Sergey Matyukevich Acked-by: Alexey Brodkin From Alexey.Brodkin at synopsys.com Mon Feb 7 10:11:06 2022 From: Alexey.Brodkin at synopsys.com (Alexey Brodkin) Date: Mon, 7 Feb 2022 10:11:06 +0000 Subject: [Buildroot] [arc-buildroot] [PATCH 5/5] board/synopsys: remove outdated vdk boards In-Reply-To: <20220131081214.12773-6-geomatsi@gmail.com> References: <20220131081214.12773-1-geomatsi@gmail.com> <20220131081214.12773-6-geomatsi@gmail.com> Message-ID: Hi Sergey, all, > Remove outdated and unused aarch64 and archs38 Synopsys VDK boards. > > Signed-off-by: Sergey Matyukevich Acked-by: Alexey Brodkin From luca at lucaceresoli.net Mon Feb 7 10:25:15 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Mon, 7 Feb 2022 11:25:15 +0100 Subject: [Buildroot] Xilinx zynqmp_zcu10x_defconfigs: two things left In-Reply-To: References: <0a82d8c7-a0c6-06a5-6a0b-788fd5c4a935@benettiengineering.com> <8be136a0-1263-3b17-0b78-b7d34ef146c2@lucaceresoli.net> Message-ID: <032d657b-eb9a-2dc9-f60b-8536f1fc6c57@lucaceresoli.net> Hi Neal, On 07/02/22 10:34, Neal Frager wrote: > Adding buildroot ML on copy of discussion: > > Hi Neal, Giulio, > > Neal, it's better to send technical discussion e-mail on the Buildroot mailing list: you'll get more replies, less latency and other people can benefit from the discussion (now and in the future). Thanks for adding the ML in the loop! > > On 06/02/22 23:20, Giulio Benetti wrote: >> Hi Neal, >> >> On 06/02/22 20:27, Neal Frager wrote: >>> Hi Giulio, Luca, >>> >>> I now have a version of the defconfigs which will at least build >>> cleanly with buildroot without requiring any manual steps. However, >>> in order to get Linux to boot and login to the rootfs, I am still >>> doing two manual things to make this happen. If our goal is to make >>> defconfigs that just boot, then we need to find a solution to make >>> these two manual things included with the buildroot build automation. >>> >>> 1. PMU firmware configuration object. Without configuring the >>> following U-Boot .config option, the PMU firmware does not appear to >>> be working properly. I have been fixing this manually by adding this >>> configuration, rebuilding U-Boot, and then copying the results into >>> the output/images directory. While this works, it is not a clean out >>> of box experience for new users. >>> >>> CONFIG_ZYNQMP_SPL_PM_CFG_OBJ_FILE >>> >>> Is there a buildroot config option like BR2_TARGET_UBOOT_ZYNQMP_PMUFW >>> available that can be used for configuring this with the automated >>> build process? >> >> There is a better option I think: >> BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES > > Even better, use BR2_TARGET_UBOOT_ZYNQMP_PM_CFG Buildroot option (Bootloaders -> U-Boot -> Boot on the Xilinx ZynqMP SoCs). It is specifically done for that purpose. In reply to your additional question (sent privately): > Thank you for sharing this option. That should work well. But where > will it get the pmu_obj.bin file from? Do we need to put that file on > your git as well, so that it can get automatically downloaded at build > time? The zcu106 defconfig currently in Buildroot uses a pmufw that has a hard-coded pm_cfg_obj for zcu106 in its default Vivado configuration. It is an old and unflexible hack that required a different pmufw binary for each zynqmp hardware _and_ peripheral configuration (or other solutions like a "wildcard" configuration). Nowadays pmufw images do not contain a pm_cfg_obj anymore, as it gets passed from U-Boot SPL at runtime [0]. This allows to use the same pmufw binary for all zynqmp designs. This means you should provide a pm_cfg_obj.c file in boards/ and put the path to that file in BR2_TARGET_UBOOT_ZYNQMP_PM_CFG. It will be built in U-Boot SPL, which will pass it at runtime to the PMUFW. Note that you could handle similarly the psu_init_gpl.c: provide one in boards/ and put its path in BR2_TARGET_UBOOT_ZYNQMP_PSU_INIT_FILE. But since U-Boot has a builtin psu_init_gpl for the ZCU106 (and 102 too) then you should not need do anything. It's for other boards not supported in U-Boot. [0] https://lucaceresoli.net/zynqmp-uboot-spl-pmufw-cfg-load/ -- Luca From andreynech at gmail.com Mon Feb 7 10:33:16 2022 From: andreynech at gmail.com (Andrey Nechypurenko) Date: Mon, 7 Feb 2022 11:33:16 +0100 Subject: [Buildroot] Build error with 2021.11.x Message-ID: Hello Buildrooters, I just updated Buildroot from 2021.08.x to 2021.11.x and got build problems. In particular, ICU library could not be built. I was trying with ARM external toolchain and with Linaro 2018 getting the same error. It would be great if someone can provide hints on what might be wrong and how to fix the problem. Below are the relevant logs and information. Thank you, Andrey. ? buildroot git:(2021.11.x) uname -a Linux tutnix 5.4.0-97-generic #110-Ubuntu SMP Thu Jan 13 18:22:13 UTC 2022 x86_64 x86_64 x86_64 GNU/Linux ? buildroot git:(2021.11.x) lsb_release -a No LSB modules are available. Distributor ID: Ubuntu Description: Ubuntu 20.04.3 LTS Release: 20.04 Codename: focal =================== Error message: ========================== >>> icu 69-1 Extracting gzip -d -c /home/and/p2/download/icu/icu4c-69_1-src.tgz | tar --strip-components=1 -C /home/and/p2/build/prodx/build/icu-69-1 -xf - >>> icu 69-1 Patching Applying 0001-dont-build-static-dynamic-twice.patch using patch: patching file source/config/mh-linux Hunk #1 succeeded at 37 (offset 2 lines). Applying 0002-workaround-toolchain-bugs.patch using patch: patching file source/configure Hunk #1 succeeded at 4478 (offset 155 lines). Hunk #2 succeeded at 4492 (offset 155 lines). Applying 0003-link-icudata-as-data-only.patch using patch: patching file source/config/mh-linux Hunk #1 succeeded at 23 (offset 2 lines). Applying 0004-fix-static-linking-with-icu-uc.patch using patch: patching file source/Makefile.in Hunk #1 succeeded at 276 (offset 12 lines). Applying 0005-ICU-21587-Fix-memory-bug-w-baseName.patch using patch: patching file source/common/locid.cpp Hunk #2 succeeded at 2700 (offset 15 lines). patching file source/test/intltest/loctest.cpp Hunk #1 succeeded at 282 (offset -2 lines). Hunk #2 succeeded at 6479 (offset -43 lines). patching file source/test/intltest/loctest.h Hunk #1 succeeded at 154 (offset -2 lines). >>> icu 69-1 Updating config.sub and config.guess for file in config.guess config.sub; do for i in $(find /home/and/p2/build/prodx/build/icu-69-1 -name $file); do cp support/gnuconfig/$file $i; done; done >>> icu 69-1 Patching libtool >>> icu 69-1 Configuring (cd /home/and/p2/build/prodx/build/icu-69-1/source && rm -rf config.cache && PATH="/home/and/p2/build/prodx/host/bin:/home/and/p2/build/prodx/host/sbin:/home/and/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/home/and/.dotnet/tools:/usr/local/go/bin" AR="/home/and/p2/build/prodx/host/bin/arm-linux-gnueabihf-ar" AS="/home/and/p2/build/prodx/host/bin/arm-linux-gnueabihf-as" LD="/home/and/p2/build/prodx/host/bin/arm-linux-gnueabihf-ld" NM="/home/and/p2/build/prodx/host/bin/arm-linux-gnueabihf-nm" CC="/home/and/p2/build/prodx/host/bin/arm-linux-gnueabihf-gcc" GCC="/home/and/p2/build/prodx/host/bin/arm-linux-gnueabihf-gcc" CPP="/home/and/p2/build/prodx/host/bin/arm-linux-gnueabihf-cpp" CXX="/home/and/p2/build/prodx/host/bin/arm-linux-gnueabihf-g++" FC="/home/and/p2/build/prodx/host/bin/arm-linux-gnueabihf-gfortran" F77="/home/and/p2/build/prodx/host/bin/arm-linux-gnueabihf-gfortran" RANLIB="/home/and/p2/build/prodx/host/bin/arm-linux-gnueabihf-ranlib" READELF="/home/and/p2/build/prodx/host/bin/arm-linux-gnueabihf-readelf" STRIP="/home/and/p2/build/prodx/host/bin/arm-linux-gnueabihf-strip" OBJCOPY="/home/and/p2/build/prodx/host/bin/arm-linux-gnueabihf-objcopy" OBJDUMP="/home/and/p2/build/prodx/host/bin/arm-linux-gnueabihf-objdump" AR_FOR_BUILD="/usr/bin/ar" AS_FOR_BUILD="/usr/bin/as" CC_FOR_BUILD="/usr/bin/gcc" GCC_FOR_BUILD="/usr/bin/gcc" CXX_FOR_BUILD="/usr/bin/g++" LD_FOR_BUILD="/usr/bin/ld" CPPFLAGS_FOR_BUILD="-I/home/and/p2/build/prodx/host/include" CFLAGS_FOR_BUILD="-O2 -I/home/and/p2/build/prodx/host/include" CXXFLAGS_FOR_BUILD="-O2 -I/home/and/p2/build/prodx/host/include" LDFLAGS_FOR_BUILD="-L/home/and/p2/build/prodx/host/lib -Wl,-rpath,/home/and/p2/build/prodx/host/lib" FCFLAGS_FOR_BUILD="" DEFAULT_ASSEMBLER="/home/and/p2/build/prodx/host/bin/arm-linux-gnueabihf-as" DEFAULT_LINKER="/home/and/p2/build/prodx/host/bin/arm-linux-gnueabihf-ld" CPPFLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" CFLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O3 -g0 -D_FORTIFY_SOURCE=1" CXXFLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O3 -g0 -D_FORTIFY_SOURCE=1" LDFLAGS="" FCFLAGS=" -O3 -g0" FFLAGS=" -O3 -g0" PKG_CONFIG="/home/and/p2/build/prodx/host/bin/pkg-config" STAGING_DIR="/home/and/p2/build/prodx/host/arm-buildroot-linux-gnueabihf/sysroot" INTLTOOL_PERL=/usr/bin/perl CFLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O3 -g0 -D_FORTIFY_SOURCE=1 -I/home/and/p2/build/prodx/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/drm" LDFLAGS=" -ldrm" ac_cv_lbl_unaligned_fail=yes ac_cv_func_mmap_fixed_mapped=yes ac_cv_func_memcmp_working=yes ac_cv_have_decl_malloc=yes gl_cv_func_malloc_0_nonnull=yes ac_cv_func_malloc_0_nonnull=yes ac_cv_func_calloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes lt_cv_sys_lib_search_path_spec="" ac_cv_c_bigendian=no LIBS="-latomic" CONFIG_SITE=/dev/null ./configure --target=arm-buildroot-linux-gnueabihf --host=arm-buildroot-linux-gnueabihf --build=x86_64-pc-linux-gnu --prefix=/usr --exec-prefix=/usr --sysconfdir=/etc --localstatedir=/var --program-prefix="" --disable-gtk-doc --disable-gtk-doc-html --disable-doc --disable-docs --disable-documentation --with-xmlto=no --with-fop=no --disable-dependency-tracking --enable-ipv6 --enable-nls --disable-static --enable-shared --with-cross-build=/home/and/p2/build/prodx/build/host-icu-69-1/source --disable-samples --disable-tests ) configure: WARNING: unrecognized options: --disable-gtk-doc, --disable-gtk-doc-html, --disable-doc, --disable-docs, --disable-documentation, --with-xmlto, --with-fop, --disable-dependency-tracking, --enable-ipv6, --enable-nls checking for ICU version numbers... release 69.1, library 69.1, unicode version 13.0 checking build system type... x86_64-pc-linux-gnu checking host system type... arm-buildroot-linux-gnueabihf checking whether to build debug libraries... no checking whether to build release libraries... yes checking for arm-buildroot-linux-gnueabihf-clang... /home/and/p2/build/prodx/host/bin/arm-linux-gnueabihf-gcc checking whether the C compiler works... no configure: error: in `/home/and/p2/build/prodx/build/icu-69-1/source': configure: error: C compiler cannot create executables See `config.log' for more details make[1]: *** [package/pkg-generic.mk:285: /home/and/p2/build/prodx/build/icu-69-1/.stamp_configured] Error 77 make: *** [Makefile:23: _all] Error 2 =================== From config.log ============================= configure:3057: checking whether the C compiler works configure:3079: /home/and/p2/build/prodx/host/bin/arm-linux-gnueabihf-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O3 -g0 -D_FORTIFY_SOURCE=1 -I/home/and/p2/build/prodx/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/drm -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -ldrm conftest.c -latomic >&5 /home/and/p2/build/prodx/host/opt/ext-toolchain/bin/../lib/gcc/arm-linux-gnueabihf/7.3.1/../../../../arm-linux-gnueabihf/bin/ld: cannot find -ldrm collect2: error: ld returned 1 exit status configure:3083: $? = 1 configure:3121: result: no configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "ICU" | #define PACKAGE_TARNAME "International Components for Unicode" | #define PACKAGE_VERSION "69.1" | #define PACKAGE_STRING "ICU 69.1" | #define PACKAGE_BUGREPORT "http://icu-project.org/bugs" | #define PACKAGE_URL "http://icu-project.org" | /* end confdefs.h. */ | | int | main () | { | | ; | return 0; | } configure:3126: error: in `/home/and/p2/build/prodx/build/icu-69-1/source': configure:3128: error: C compiler cannot create executables =================== In build directory ========================= $ find . -name "*drm*" ./build/buildroot-config/br2/package/libdrm ./build/buildroot-config/br2/package/libdrm.h ./build/buildroot-config/br2/package/glmark2/flavor/drm ./build/buildroot-config/br2/package/weston/default/drm.h ./build/buildroot-config/br2/package/weston/drm.h ./build/buildroot-config/br2/package/sdl2/kmsdrm.h ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/drm ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/drm/msm_drm.h ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/drm/drm_sarea.h ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/drm/sis_drm.h ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/drm/r128_drm.h ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/drm/i915_drm.h ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/drm/amdgpu_drm.h ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/drm/qxl_drm.h ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/drm/drm.h ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/drm/via_drm.h ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/drm/radeon_drm.h ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/drm/savage_drm.h ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/drm/virtgpu_drm.h ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/drm/nouveau_drm.h ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/drm/exynos_drm.h ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/drm/vmwgfx_drm.h ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/drm/mga_drm.h ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/drm/tegra_drm.h ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/drm/i810_drm.h ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/drm/vc4_drm.h ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/drm/drm_fourcc.h ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/drm/drm_mode.h ./host/opt/ext-toolchain/arm-linux-gnueabihf/libc/usr/include/drm ./host/opt/ext-toolchain/arm-linux-gnueabihf/libc/usr/include/drm/msm_drm.h ./host/opt/ext-toolchain/arm-linux-gnueabihf/libc/usr/include/drm/drm_sarea.h ./host/opt/ext-toolchain/arm-linux-gnueabihf/libc/usr/include/drm/sis_drm.h ./host/opt/ext-toolchain/arm-linux-gnueabihf/libc/usr/include/drm/r128_drm.h ./host/opt/ext-toolchain/arm-linux-gnueabihf/libc/usr/include/drm/i915_drm.h ./host/opt/ext-toolchain/arm-linux-gnueabihf/libc/usr/include/drm/amdgpu_drm.h ./host/opt/ext-toolchain/arm-linux-gnueabihf/libc/usr/include/drm/qxl_drm.h ./host/opt/ext-toolchain/arm-linux-gnueabihf/libc/usr/include/drm/drm.h ./host/opt/ext-toolchain/arm-linux-gnueabihf/libc/usr/include/drm/via_drm.h ./host/opt/ext-toolchain/arm-linux-gnueabihf/libc/usr/include/drm/radeon_drm.h ./host/opt/ext-toolchain/arm-linux-gnueabihf/libc/usr/include/drm/savage_drm.h ./host/opt/ext-toolchain/arm-linux-gnueabihf/libc/usr/include/drm/virtgpu_drm.h ./host/opt/ext-toolchain/arm-linux-gnueabihf/libc/usr/include/drm/nouveau_drm.h ./host/opt/ext-toolchain/arm-linux-gnueabihf/libc/usr/include/drm/exynos_drm.h ./host/opt/ext-toolchain/arm-linux-gnueabihf/libc/usr/include/drm/vmwgfx_drm.h ./host/opt/ext-toolchain/arm-linux-gnueabihf/libc/usr/include/drm/mga_drm.h ./host/opt/ext-toolchain/arm-linux-gnueabihf/libc/usr/include/drm/tegra_drm.h ./host/opt/ext-toolchain/arm-linux-gnueabihf/libc/usr/include/drm/i810_drm.h ./host/opt/ext-toolchain/arm-linux-gnueabihf/libc/usr/include/drm/vc4_drm.h ./host/opt/ext-toolchain/arm-linux-gnueabihf/libc/usr/include/drm/drm_fourcc.h ./host/opt/ext-toolchain/arm-linux-gnueabihf/libc/usr/include/drm/drm_mode.h From jose.pekkarinen at unikie.com Mon Feb 7 11:22:28 2022 From: jose.pekkarinen at unikie.com (=?UTF-8?q?Jos=C3=A9=20Pekkarinen?=) Date: Mon, 7 Feb 2022 13:22:28 +0200 Subject: [Buildroot] [PATCH] package/alfred: bump to version 2022.0 Message-ID: <20220207112228.1753927-1-jose.pekkarinen@unikie.com> https://www.open-mesh.org/news/107 Signed-off-by: Jos? Pekkarinen --- package/alfred/alfred.hash | 6 +++--- package/alfred/alfred.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/alfred/alfred.hash b/package/alfred/alfred.hash index 0799071231..2da7eb31c8 100644 --- a/package/alfred/alfred.hash +++ b/package/alfred/alfred.hash @@ -1,5 +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 +# From https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2022.0.tar.gz.sha1 +sha1 8e00789d3e1e5c959dd985809861ff624d372694 alfred-2022.0.tar.gz # Locally computed -sha256 4c79b6c45de4bcc8cbfe64cba9a0f8b4ef304ca84c194622f2bfa41e01e2cb95 alfred-2021.4.tar.gz +sha256 abba1dac61eccfcd6329e7331d0555fecc937760fb36c6cf55ce6c1d751cfd98 alfred-2022.0.tar.gz sha256 cecbf53d1148e13256ac29f8b900655b7fc8dc12d59939a95bc2323ea1747025 LICENSES/preferred/GPL-2.0 diff --git a/package/alfred/alfred.mk b/package/alfred/alfred.mk index ed59066393..24b9956b11 100644 --- a/package/alfred/alfred.mk +++ b/package/alfred/alfred.mk @@ -4,7 +4,7 @@ # ################################################################################ -ALFRED_VERSION = 2021.4 +ALFRED_VERSION = 2022.0 ALFRED_SITE = https://downloads.open-mesh.org/batman/stable/sources/alfred ALFRED_LICENSE = GPL-2.0 ALFRED_LICENSE_FILES = LICENSES/preferred/GPL-2.0 -- 2.25.1 From fperrad at gmail.com Mon Feb 7 12:09:46 2022 From: fperrad at gmail.com (Francois Perrad) Date: Mon, 7 Feb 2022 13:09:46 +0100 Subject: [Buildroot] [PATCH] package/libbsd: bump to version 0.11.5 Message-ID: <20220207120946.1553618-1-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/libbsd/libbsd.hash | 8 +++++--- package/libbsd/libbsd.mk | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/libbsd/libbsd.hash b/package/libbsd/libbsd.hash index 17bb32e01..435ea5470 100644 --- a/package/libbsd/libbsd.hash +++ b/package/libbsd/libbsd.hash @@ -1,3 +1,5 @@ -# From https://lists.freedesktop.org/archives/libbsd/2021-February/000305.html -sha512 a7015ea1ffa3766b1a4690526a25231898ad8275149b31fb6801082450172249997c36165626d101ffce53b59767a46676eebc0806426922fe4e773a0376c1f5 libbsd-0.11.3.tar.xz -sha256 ff2fdeeb0fe8bcb9045fe91d69e8312a5b477c54db48dffe34dd1c0d730c5864 COPYING +# From https://lists.freedesktop.org/archives/libbsd/2022-January/000322.html +sha512 c52c19eddd53630aca14f9f6221f7b84aa9cc798b4bb91e867822b161793313aab872ac1c0350d29312a72fee6e2061f3910ff918b724ec171d8c9de5837c841 libbsd-0.11.5.tar.xz + +# License files (locally computed) +sha256 3761714adb9c45fa588b77b372d6e75dcc9e6822cc2d6baa712007241aec714e COPYING diff --git a/package/libbsd/libbsd.mk b/package/libbsd/libbsd.mk index 86df8a97a..0654bef82 100644 --- a/package/libbsd/libbsd.mk +++ b/package/libbsd/libbsd.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBBSD_VERSION = 0.11.3 +LIBBSD_VERSION = 0.11.5 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, \ -- 2.32.0 From nealf at xilinx.com Mon Feb 7 12:50:54 2022 From: nealf at xilinx.com (Neal Frager) Date: Mon, 7 Feb 2022 12:50:54 +0000 Subject: [Buildroot] Xilinx zynqmp_zcu10x_defconfigs: two things left In-Reply-To: <032d657b-eb9a-2dc9-f60b-8536f1fc6c57@lucaceresoli.net> References: <0a82d8c7-a0c6-06a5-6a0b-788fd5c4a935@benettiengineering.com> <8be136a0-1263-3b17-0b78-b7d34ef146c2@lucaceresoli.net> <032d657b-eb9a-2dc9-f60b-8536f1fc6c57@lucaceresoli.net> Message-ID: Hi Luca, >The zcu106 defconfig currently in Buildroot uses a pmufw that has a hard-coded pm_cfg_obj for zcu106 in its default Vivado configuration. It is an old and unflexible hack that required a different pmufw binary for each zynqmp hardware _and_ peripheral configuration (or other solutions like a "wildcard" configuration). > Nowadays pmufw images do not contain a pm_cfg_obj anymore, as it gets passed from U-Boot SPL at runtime [0]. This allows to use the same pmufw binary for all zynqmp designs. > This means you should provide a pm_cfg_obj.c file in boards/ and put the path to that file in BR2_TARGET_UBOOT_ZYNQMP_PM_CFG. It will be built in U-Boot SPL, which will pass it at runtime to the PMUFW. > Note that you could handle similarly the psu_init_gpl.c: provide one in boards/ and put its path in BR2_TARGET_UBOOT_ZYNQMP_PSU_INIT_FILE. But since U-Boot has a builtin psu_init_gpl for the ZCU106 (and 102 too) then you should not need do anything. It's for other boards not supported in U-Boot. > [0] https://lucaceresoli.net/zynqmp-uboot-spl-pmufw-cfg-load/ I tried this method, but I am getting the error below. Do you have any ideas? cp /buildroot/output/images/bl31.bin /buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/ /buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/tools/zynqmp_pm_cfg_obj_convert.py "board/zynqmp/pm_cfg_obj.c" "/buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/pm_cfg_obj.bin" package/pkg-generic.mk:289: recipe for target '/buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/.stamp_built' failed Traceback (most recent call last): File "/buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/tools/zynqmp_pm_cfg_obj_convert.py", line 293, in code, flags=re.DOTALL).group(1) AttributeError: 'NoneType' object has no attribute 'group' make: *** [/buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/.stamp_built] Error 1 Thank you for your help! Best regards, Neal Frager Xilinx From nealf at xilinx.com Mon Feb 7 13:00:35 2022 From: nealf at xilinx.com (Neal Frager) Date: Mon, 7 Feb 2022 13:00:35 +0000 Subject: [Buildroot] Xilinx zynqmp_zcu10x_defconfigs: two things left In-Reply-To: References: <0a82d8c7-a0c6-06a5-6a0b-788fd5c4a935@benettiengineering.com> <8be136a0-1263-3b17-0b78-b7d34ef146c2@lucaceresoli.net> <032d657b-eb9a-2dc9-f60b-8536f1fc6c57@lucaceresoli.net> Message-ID: Hi Luca, >The zcu106 defconfig currently in Buildroot uses a pmufw that has a hard-coded pm_cfg_obj for zcu106 in its default Vivado configuration. It is an old and unflexible hack that required a different pmufw binary for each zynqmp hardware _and_ peripheral configuration (or other solutions like a "wildcard" configuration). > Nowadays pmufw images do not contain a pm_cfg_obj anymore, as it gets passed from U-Boot SPL at runtime [0]. This allows to use the same pmufw binary for all zynqmp designs. > This means you should provide a pm_cfg_obj.c file in boards/ and put the path to that file in BR2_TARGET_UBOOT_ZYNQMP_PM_CFG. It will be built in U-Boot SPL, which will pass it at runtime to the PMUFW. > Note that you could handle similarly the psu_init_gpl.c: provide one in boards/ and put its path in BR2_TARGET_UBOOT_ZYNQMP_PSU_INIT_FILE. But since U-Boot has a builtin psu_init_gpl for the ZCU106 (and 102 too) then you should not need do anything. It's for other boards not supported in U-Boot. > [0] https://lucaceresoli.net/zynqmp-uboot-spl-pmufw-cfg-load/ I tried this method, but I am getting the error below. Do you have any ideas? Attached you can find the pm_cfg_obj.c source file that comes with Xilinx 2021.2. cp /buildroot/output/images/bl31.bin /buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/ /buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/tools/zynqmp_pm_cfg_obj_convert.py "board/zynqmp/pm_cfg_obj.c" "/buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/pm_cfg_obj.bin" package/pkg-generic.mk:289: recipe for target '/buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/.stamp_built' failed Traceback (most recent call last): File "/buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/tools/zynqmp_pm_cfg_obj_convert.py", line 293, in code, flags=re.DOTALL).group(1) AttributeError: 'NoneType' object has no attribute 'group' make: *** [/buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/.stamp_built] Error 1 Thank you for your help! Best regards, Neal Frager Xilinx -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: pm_cfg_obj.c URL: From nealf at xilinx.com Mon Feb 7 13:24:57 2022 From: nealf at xilinx.com (Neal Frager) Date: Mon, 7 Feb 2022 13:24:57 +0000 Subject: [Buildroot] Xilinx zynqmp_zcu10x_defconfigs: two things left In-Reply-To: References: <0a82d8c7-a0c6-06a5-6a0b-788fd5c4a935@benettiengineering.com> <8be136a0-1263-3b17-0b78-b7d34ef146c2@lucaceresoli.net> <032d657b-eb9a-2dc9-f60b-8536f1fc6c57@lucaceresoli.net> Message-ID: Hi Luca, >The zcu106 defconfig currently in Buildroot uses a pmufw that has a hard-coded pm_cfg_obj for zcu106 in its default Vivado configuration. It is an old and unflexible hack that required a different pmufw binary for each zynqmp hardware _and_ peripheral configuration (or other solutions like a "wildcard" configuration). > Nowadays pmufw images do not contain a pm_cfg_obj anymore, as it gets passed from U-Boot SPL at runtime [0]. This allows to use the same pmufw binary for all zynqmp designs. > This means you should provide a pm_cfg_obj.c file in boards/ and put the path to that file in BR2_TARGET_UBOOT_ZYNQMP_PM_CFG. It will be built in U-Boot SPL, which will pass it at runtime to the PMUFW. > Note that you could handle similarly the psu_init_gpl.c: provide one in boards/ and put its path in BR2_TARGET_UBOOT_ZYNQMP_PSU_INIT_FILE. But since U-Boot has a builtin psu_init_gpl for the ZCU106 (and 102 too) then you should not need do anything. It's for other boards not supported in U-Boot. > [0] https://lucaceresoli.net/zynqmp-uboot-spl-pmufw-cfg-load/ > I tried this method, but I am getting the error below. Do you have any ideas? Attached you can find the pm_cfg_obj.c source file that comes with Xilinx 2021.2. > cp /buildroot/output/images/bl31.bin /buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/ > /buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/tools/zynqmp_pm_cfg_obj_convert.py "board/zynqmp/pm_cfg_obj.c" "/buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/pm_cfg_obj.bin" > package/pkg-generic.mk:289: recipe for target '/buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/.stamp_built' failed Traceback (most recent call last): > File "/buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/tools/zynqmp_pm_cfg_obj_convert.py", line 293, in code, flags=re.DOTALL).group(1) > AttributeError: 'NoneType' object has no attribute 'group' > make: *** [/buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/.stamp_built] Error 1 I figured out the root cause. Our newer software tools provide support for the IAR compiler for customers using IAR and not Linux / gcc. This causes an issue for your script as it does not catch that there are two places now where the XPm_ConfigObject is defined, one for the gcc compiler and another for the IAR compiler. I can work around this for my current patch, but could you work on an updated zynqmp_pm_cfg_obj_convert.py which can handle the new pm_cfg_obj.c file with the IAR compiler support? It would be great if you could make a new version of this and push it into U-Boot mainline. Thanks for your help! Best regards, Neal Frager Xilinx From nealf at xilinx.com Mon Feb 7 13:27:03 2022 From: nealf at xilinx.com (Neal Frager) Date: Mon, 7 Feb 2022 13:27:03 +0000 Subject: [Buildroot] Xilinx zynqmp_zcu10x_defconfigs: two things left In-Reply-To: References: <0a82d8c7-a0c6-06a5-6a0b-788fd5c4a935@benettiengineering.com> <8be136a0-1263-3b17-0b78-b7d34ef146c2@lucaceresoli.net> <032d657b-eb9a-2dc9-f60b-8536f1fc6c57@lucaceresoli.net> Message-ID: Hi Luca, >The zcu106 defconfig currently in Buildroot uses a pmufw that has a hard-coded pm_cfg_obj for zcu106 in its default Vivado configuration. It is an old and unflexible hack that required a different pmufw binary for each zynqmp hardware _and_ peripheral configuration (or other solutions like a "wildcard" configuration). > Nowadays pmufw images do not contain a pm_cfg_obj anymore, as it gets passed from U-Boot SPL at runtime [0]. This allows to use the same pmufw binary for all zynqmp designs. > This means you should provide a pm_cfg_obj.c file in boards/ and put the path to that file in BR2_TARGET_UBOOT_ZYNQMP_PM_CFG. It will be built in U-Boot SPL, which will pass it at runtime to the PMUFW. > Note that you could handle similarly the psu_init_gpl.c: provide one in boards/ and put its path in BR2_TARGET_UBOOT_ZYNQMP_PSU_INIT_FILE. But since U-Boot has a builtin psu_init_gpl for the ZCU106 (and 102 too) then you should not need do anything. It's for other boards not supported in U-Boot. > [0] https://lucaceresoli.net/zynqmp-uboot-spl-pmufw-cfg-load/ > I tried this method, but I am getting the error below. Do you have any ideas? Attached you can find the pm_cfg_obj.c source file that comes with Xilinx 2021.2. > cp /buildroot/output/images/bl31.bin /buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/ > /buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/tools/zynqmp_pm_cfg_obj_convert.py "board/zynqmp/pm_cfg_obj.c" "/buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/pm_cfg_obj.bin" > package/pkg-generic.mk:289: recipe for target '/buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/.stamp_built' failed Traceback (most recent call last): > File "/buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/tools/zynqmp_pm_cfg_obj_convert.py", line 293, in code, flags=re.DOTALL).group(1) > AttributeError: 'NoneType' object has no attribute 'group' > make: *** [/buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/.stamp_built] Error 1 I figured out the root cause. Our newer software tools provide support for the IAR compiler for customers using IAR and not Linux / gcc. This causes an issue for your script as it does not catch that there are two places now where the XPm_ConfigObject is defined, one for the gcc compiler and another for the IAR compiler. I can work around this for my current patch, but could you work on an updated zynqmp_pm_cfg_obj_convert.py which can handle the new pm_cfg_obj.c file with the IAR compiler support? It would be great if you could make a new version of this and push it into U-Boot mainline. Thanks for your help! Best regards, Neal Frager Xilinx From luca at lucaceresoli.net Mon Feb 7 13:38:15 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Mon, 7 Feb 2022 14:38:15 +0100 Subject: [Buildroot] Xilinx zynqmp_zcu10x_defconfigs: two things left In-Reply-To: References: <0a82d8c7-a0c6-06a5-6a0b-788fd5c4a935@benettiengineering.com> <8be136a0-1263-3b17-0b78-b7d34ef146c2@lucaceresoli.net> <032d657b-eb9a-2dc9-f60b-8536f1fc6c57@lucaceresoli.net> Message-ID: <16f4b7bf-546b-3bf4-c6a3-b711c8cfcadb@lucaceresoli.net> Hi Neal, On 07/02/22 14:00, Neal Frager wrote: > Hi Luca, > >> The zcu106 defconfig currently in Buildroot uses a pmufw that has a hard-coded pm_cfg_obj for zcu106 in its default Vivado configuration. It is an old and unflexible hack that required a different pmufw binary for each zynqmp hardware _and_ peripheral configuration (or other solutions like a "wildcard" configuration). > >> Nowadays pmufw images do not contain a pm_cfg_obj anymore, as it gets passed from U-Boot SPL at runtime [0]. This allows to use the same pmufw binary for all zynqmp designs. > >> This means you should provide a pm_cfg_obj.c file in boards/ and put the path to that file in BR2_TARGET_UBOOT_ZYNQMP_PM_CFG. It will be built in U-Boot SPL, which will pass it at runtime to the PMUFW. > >> Note that you could handle similarly the psu_init_gpl.c: provide one in boards/ and put its path in BR2_TARGET_UBOOT_ZYNQMP_PSU_INIT_FILE. But since U-Boot has a builtin psu_init_gpl for the ZCU106 (and 102 too) then you should not need do anything. It's for other boards not supported in U-Boot. > >> [0] https://lucaceresoli.net/zynqmp-uboot-spl-pmufw-cfg-load/ > > I tried this method, but I am getting the error below. Do you have any ideas? Attached you can find the pm_cfg_obj.c source file that comes with Xilinx 2021.2. > > cp /buildroot/output/images/bl31.bin /buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/ > /buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/tools/zynqmp_pm_cfg_obj_convert.py "board/zynqmp/pm_cfg_obj.c" "/buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/pm_cfg_obj.bin" > package/pkg-generic.mk:289: recipe for target '/buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/.stamp_built' failed Traceback (most recent call last): > File "/buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/tools/zynqmp_pm_cfg_obj_convert.py", line 293, in > code, flags=re.DOTALL).group(1) > AttributeError: 'NoneType' object has no attribute 'group' Vitis 2020.1 changed the format of pm_cfg_obj.c. There's a fix commit [0] in U-Boot 2021.04 but as you are based on 2021.01 you don't have it. You have two options to use that fix: 1. use U-Boot >= 2021.04 2. provide that commit as a patch to the uboot package in Buildroot To go for option 2, you'll have to put the patch in the BR2_GLOBAL_PATCH_DIR, and of course _not_ remove BR2_GLOBAL_PATCH_DIR from the defconfig as you would otherwise. Hint to create the patch file: cd git format-patch -1 d42ab39f58e828c99a0cba6890e29986e87d11f5 mv 0001-*.patch /board/zynqmp/patches/uboot/ Then add a "Backported from:" line to the patch (see [1]) [0] https://source.denx.de/u-boot/u-boot/-/commit/d42ab39f58e828c99a0cba6890e29986e87d11f5 [1] https://buildroot.org/downloads/manual/manual.html#_integrating_patches_found_on_the_web -- Luca From oleks at arcturusnetworks.com Mon Feb 7 15:53:57 2022 From: oleks at arcturusnetworks.com (Oleksandr G Zhadan) Date: Mon, 7 Feb 2022 10:53:57 -0500 Subject: [Buildroot] [PATCH 1/1] board/arcturus/aarch64-ucls1012a: bump u-boot and kernel version Message-ID: <4b667326-5aca-538b-9b36-7f0d5a400e9f@arcturusnetworks.com> Signed-off-by: Oleksandr G Zhadan Signed-off-by: Michael Durrant --- ?board/arcturus/aarch64-ucls1012a/post-build.sh??? |? 2 -- ?board/arcturus/aarch64-ucls1012a/readme.txt?????? |? 8 ++++---- ?.../rootfs_overlay/etc/init.d/S09modload????????? | 14 -------------- ?configs/arcturus_ucls1012a_defconfig????????????? | 15 +++++++-------- ?4 files changed, 11 insertions(+), 28 deletions(-) ?delete mode 100755 board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload diff --git a/board/arcturus/aarch64-ucls1012a/post-build.sh b/board/arcturus/aarch64-ucls1012a/post-build.sh index f8ba78095f..ca3862988d 100755 --- a/board/arcturus/aarch64-ucls1012a/post-build.sh +++ b/board/arcturus/aarch64-ucls1012a/post-build.sh @@ -1,5 +1,3 @@ ?#!/bin/sh -mkdir -p ${TARGET_DIR}/lib/firmware -cp -f ${BUILD_DIR}/linux-custom/firmware/ppfe/* ${TARGET_DIR}/lib/firmware/ ?cp -f ${BUILD_DIR}/linux-custom/br2-ucls1012a.its ${BINARIES_DIR}/ diff --git a/board/arcturus/aarch64-ucls1012a/readme.txt b/board/arcturus/aarch64-ucls1012a/readme.txt index 483d5e9aef..f892fc4abc 100644 --- a/board/arcturus/aarch64-ucls1012a/readme.txt +++ b/board/arcturus/aarch64-ucls1012a/readme.txt @@ -23,14 +23,14 @@ Result of the build ?After building, you should obtain this tree: ???? output/images/ -??? +-- arc-ucls1012a.dtb -??? +-- Image +??? +-- br2-ucls1012a.its +??? +-- Image.gz ???? +-- part0-000000.itb ???? +-- rootfs.cpio ???? +-- rootfs.cpio.gz ???? +-- rootfs.tar ???? +-- u-boot.bin -??? +-- ucls1012a.its +??? +-- ucls1012a-som.dtb ?Flashing ?-------- @@ -60,7 +60,7 @@ u-boot shell. ?4. Program the ITB image (includes Kernel, DTB and Ramdisk) ???? B$ tftp part0-000000.itb -??? B$ run iprogram +??? B$ run program0 ?5. Booting your new system diff --git a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload b/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload deleted file mode 100755 index c87ffda14f..0000000000 --- a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -# -case "$1" in -?????? start) -??????????????? modprobe pfe -??????????????? ;; -??????? stop) -??????????????? ;; -??????? restart|reload) -??????????????? ;; -??????? *) -??????????????? echo "Usage: $0 {start|stop|restart}" -??????????????? exit 1 -esac diff --git a/configs/arcturus_ucls1012a_defconfig b/configs/arcturus_ucls1012a_defconfig index fd33ebf1f6..f544a5240a 100644 --- a/configs/arcturus_ucls1012a_defconfig +++ b/configs/arcturus_ucls1012a_defconfig @@ -1,24 +1,23 @@ ?# Architecture ?BR2_aarch64=y -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y ?# System settings ?BR2_TARGET_GENERIC_HOSTNAME="ucls1012a" ?BR2_TARGET_GENERIC_ISSUE="Welcome to uCLS1012A-SOM" ?BR2_SYSTEM_DHCP="eth0" -BR2_ROOTFS_OVERLAY="board/arcturus/aarch64-ucls1012a/rootfs_overlay" ?BR2_ROOTFS_POST_BUILD_SCRIPT="board/arcturus/aarch64-ucls1012a/post-build.sh" ?BR2_ROOTFS_POST_IMAGE_SCRIPT="board/arcturus/aarch64-ucls1012a/post-image.sh" ?# Kernel ?BR2_LINUX_KERNEL=y ?BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-kernel,v.20.31)/linux-v.20.31.tar.gz" -BR2_LINUX_KERNEL_DEFCONFIG="ucls1012a" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-kernel,v.22.05)/linux-v.22.05.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="ucls1012a_som" +BR2_LINUX_KERNEL_IMAGEGZ=y ?BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="arcturus/arc-ucls1012a" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="arcturus/ucls1012a-som" ?# Filesystem ?BR2_TARGET_ROOTFS_CPIO=y @@ -28,8 +27,8 @@ BR2_TARGET_ROOTFS_CPIO_GZIP=y ?BR2_TARGET_UBOOT=y ?BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y ?BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-uboot,v.20.31)/uboot-v.20.31.tar.gz" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="UCLS1012A_QSPI128" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-uboot,v.22.05)/uboot-v.22.05.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="UCLS1012A_SOM" ?# Tools ?BR2_PACKAGE_HOST_UBOOT_TOOLS=y -- 2.26.2 _______________________________________________ buildroot mailing list buildroot at buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot From nealf at xilinx.com Mon Feb 7 17:03:25 2022 From: nealf at xilinx.com (Neal Frager) Date: Mon, 7 Feb 2022 17:03:25 +0000 Subject: [Buildroot] Xilinx zynqmp_zcu10x_defconfigs: two things left In-Reply-To: <16f4b7bf-546b-3bf4-c6a3-b711c8cfcadb@lucaceresoli.net> References: <0a82d8c7-a0c6-06a5-6a0b-788fd5c4a935@benettiengineering.com> <8be136a0-1263-3b17-0b78-b7d34ef146c2@lucaceresoli.net> <032d657b-eb9a-2dc9-f60b-8536f1fc6c57@lucaceresoli.net> <16f4b7bf-546b-3bf4-c6a3-b711c8cfcadb@lucaceresoli.net> Message-ID: Hi Luca, > Vitis 2020.1 changed the format of pm_cfg_obj.c. There's a fix commit [0] in U-Boot 2021.04 but as you are based on 2021.01 you don't have it. > You have two options to use that fix: > 1. use U-Boot >= 2021.04 > 2. provide that commit as a patch to the uboot package in Buildroot > To go for option 2, you'll have to put the patch in the BR2_GLOBAL_PATCH_DIR, and of course _not_ remove BR2_GLOBAL_PATCH_DIR from the defconfig as you would otherwise. > Hint to create the patch file: > cd > git format-patch -1 d42ab39f58e828c99a0cba6890e29986e87d11f5 > mv 0001-*.patch /board/zynqmp/patches/uboot/ > Then add a "Backported from:" line to the patch (see [1]) I have tested the new version of zynqmp_pm_cfg_obj_convert.py with U-Boot 2022.01, and I confirm that is solves the problem! Great job! I now just need to figure out how to generate an vfat partition that has the file extlinux.conf in the path /extlinux/extlinux.conf. Once I have this piece, I will have a version of the defconfigs that builds and runs without manual steps. Best regards, Neal Frager Xilinx From giulio.benetti at benettiengineering.com Mon Feb 7 17:16:38 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 7 Feb 2022 18:16:38 +0100 Subject: [Buildroot] Xilinx zynqmp_zcu10x_defconfigs: two things left In-Reply-To: References: <0a82d8c7-a0c6-06a5-6a0b-788fd5c4a935@benettiengineering.com> <8be136a0-1263-3b17-0b78-b7d34ef146c2@lucaceresoli.net> <032d657b-eb9a-2dc9-f60b-8536f1fc6c57@lucaceresoli.net> <16f4b7bf-546b-3bf4-c6a3-b711c8cfcadb@lucaceresoli.net> Message-ID: Hi Neal, On 07/02/22 18:03, Neal Frager wrote: > Hi Luca, > >> Vitis 2020.1 changed the format of pm_cfg_obj.c. There's a fix commit [0] in U-Boot 2021.04 but as you are based on 2021.01 you don't have it. > >> You have two options to use that fix: >> 1. use U-Boot >= 2021.04 >> 2. provide that commit as a patch to the uboot package in Buildroot > >> To go for option 2, you'll have to put the patch in the BR2_GLOBAL_PATCH_DIR, and of course _not_ remove BR2_GLOBAL_PATCH_DIR from the defconfig as you would otherwise. > >> Hint to create the patch file: >> cd >> git format-patch -1 d42ab39f58e828c99a0cba6890e29986e87d11f5 >> mv 0001-*.patch /board/zynqmp/patches/uboot/ >> Then add a "Backported from:" line to the patch (see [1]) > > I have tested the new version of zynqmp_pm_cfg_obj_convert.py with U-Boot 2022.01, and I confirm that is solves the problem! Great job! > > I now just need to figure out how to generate an vfat partition that has the file extlinux.conf in the path /extlinux/extlinux.conf. Once I have this piece, I will have a version of the defconfigs that builds and runs without manual steps. In the boards I've pointed you before: https://github.com/buildroot/buildroot/tree/master/board/orangepi/orangepi-lite2 there is everythyng you need, the post-build script: https://github.com/buildroot/buildroot/blob/master/board/orangepi/orangepi-lite2/post-build.sh that copies the extlinux.conf. And as explained before you have to point to it like this: https://github.com/buildroot/buildroot/blob/master/configs/orangepi_lite2_defconfig#L48 For creating the VFAT you can imitate this genimage.cfg file: https://github.com/buildroot/buildroot/blob/master/board/orangepi/orangepi-lite2/genimage.cfg#L1-L11 that must be pointed by: https://github.com/buildroot/buildroot/blob/master/configs/orangepi_lite2_defconfig#L46-L47 So you can imitate those steps and it should work as expected. Best regards -- Giulio Benetti Benetti Engineering sas From nealf at xilinx.com Mon Feb 7 17:26:19 2022 From: nealf at xilinx.com (Neal Frager) Date: Mon, 7 Feb 2022 17:26:19 +0000 Subject: [Buildroot] Xilinx zynqmp_zcu10x_defconfigs: two things left In-Reply-To: References: <0a82d8c7-a0c6-06a5-6a0b-788fd5c4a935@benettiengineering.com> <8be136a0-1263-3b17-0b78-b7d34ef146c2@lucaceresoli.net> <032d657b-eb9a-2dc9-f60b-8536f1fc6c57@lucaceresoli.net> <16f4b7bf-546b-3bf4-c6a3-b711c8cfcadb@lucaceresoli.net> Message-ID: Hi Giulio, > In the boards I've pointed you before: > https://github.com/buildroot/buildroot/tree/master/board/orangepi/orangepi-lite2 > there is everythyng you need, the post-build script: > https://github.com/buildroot/buildroot/blob/master/board/orangepi/orangepi-lite2/post-build.sh > that copies the extlinux.conf. > And as explained before you have to point to it like this: > https://github.com/buildroot/buildroot/blob/master/configs/orangepi_lite2_defconfig#L48 > For creating the VFAT you can imitate this genimage.cfg file: > https://github.com/buildroot/buildroot/blob/master/board/orangepi/orangepi-lite2/genimage.cfg#L1-L11 > that must be pointed by: > https://github.com/buildroot/buildroot/blob/master/configs/orangepi_lite2_defconfig#L46-L47 Yes, the problem is that these steps put the extlinux.conf in the root directory of the vfat image, which does not work. U-Boot only looks for the extlinux.conf in the extlinux.conf directory. So what I was missing was figuring out how to build a vfat image with my extlinux.conf in the extlinux directory. I finally figured it out with the following genimage.cfg. image boot.vfat { vfat { files = { "boot.bin", "u-boot.itb", "system.dtb", "Image" } file extlinux/extlinux.conf { image = extlinux.conf } } size = 32M } image sdcard.img { hdimage { } partition boot { partition-type = 0xC bootable = "true" image = "boot.vfat" } partition rootfs { partition-type = 0x83 image = "rootfs.ext4" } } Thanks for your help! Best regards, Neal Frager Xilinx From fontaine.fabrice at gmail.com Mon Feb 7 17:25:00 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 7 Feb 2022 18:25:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/libusb: add -latomic to libusb-1.0.pc if needed Message-ID: <20220207172500.3041019-1-fontaine.fabrice@gmail.com> libusb unconditionally uses atomic since version 1.0.25 and https://github.com/libusb/libusb/commit/1a08aa84d96397a3840a75abe66051f5360c2c84 resulting in the following build failure with pcsc-lite or openocd since commit aad609936fc83acfe1eac6ffc86d29ac35dcf54e: checking for libusb_init... configure: error: libusb not found, use ./configure LIBUSB_LIBS=... /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: /home/buildroot/autobuild/instance-0/output-1/host/sparc-buildroot-linux-uclibc/sysroot/usr/lib/libusb-1.0.so: undefined reference to `__atomic_fetch_add_4' collect2: error: ld returned 1 exit status Fixes: - http://autobuild.buildroot.org/results/4a27a769bb3cdf78643c3049b87d792178d6512c - http://autobuild.buildroot.org/results/b59b30cbe0e27399db5c7586f369104e68a1589a Signed-off-by: Fabrice Fontaine --- ...igure.ac-link-with-latomic-if-needed.patch | 39 +++++++++++++++++++ package/libusb/libusb.mk | 2 + 2 files changed, 41 insertions(+) create mode 100644 package/libusb/0001-configure.ac-link-with-latomic-if-needed.patch diff --git a/package/libusb/0001-configure.ac-link-with-latomic-if-needed.patch b/package/libusb/0001-configure.ac-link-with-latomic-if-needed.patch new file mode 100644 index 0000000000..5f6c88e57d --- /dev/null +++ b/package/libusb/0001-configure.ac-link-with-latomic-if-needed.patch @@ -0,0 +1,39 @@ +From 0b857081d687f7ee41483a3d7e9846af44a5ba7d Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 7 Feb 2022 11:55:54 +0100 +Subject: [PATCH] configure.ac: link with -latomic if needed + +libusb unconditionally uses atomic_fetch_add since version 1.0.25 and +https://github.com/libusb/libusb/commit/1a08aa84d96397a3840a75abe66051f5360c2c84 +https://github.com/libusb/libusb/commit/eed8a371ea53939096ba94d44001e0637d042572 +but some architectures (e.g. sparc) needs to link with -latomic to be +able to use it. So check if -latomic is needed and update libusb-1.0.pc +accordingly to avoid the following build failure with openocd: + +/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: /home/buildroot/autobuild/instance-0/output-1/host/sparc-buildroot-linux-uclibc/sysroot/usr/lib/libusb-1.0.so: undefined reference to `__atomic_fetch_add_4' +collect2: error: ld returned 1 exit status + +Fixes: + - http://autobuild.buildroot.org/results/4a27a769bb3cdf78643c3049b87d792178d6512c + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/libusb/libusb/pull/1064] +--- + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure.ac b/configure.ac +index f6cf2f9..002bcf6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -152,6 +152,7 @@ if test "x$platform" = xposix; then + AC_SEARCH_LIBS([pthread_create], [pthread], + [test "x$ac_cv_search_pthread_create" != "xnone required" && AC_SUBST(THREAD_LIBS, [-lpthread])], + [], []) ++ AC_SEARCH_LIBS([__atomic_fetch_add_4], [atomic]) + elif test "x$platform" = xwindows; then + AC_DEFINE([PLATFORM_WINDOWS], [1], [Define to 1 if compiling for a Windows platform.]) + else +-- +2.34.1 + diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk index 1e82cb9a85..aa306e295d 100644 --- a/package/libusb/libusb.mk +++ b/package/libusb/libusb.mk @@ -13,6 +13,8 @@ LIBUSB_LICENSE_FILES = COPYING LIBUSB_CPE_ID_VENDOR = libusb LIBUSB_DEPENDENCIES = host-pkgconf LIBUSB_INSTALL_STAGING = YES +# We're patching configure.ac +LIBUSB_AUTORECONF = YES # Avoid the discovery of udev for the host variant HOST_LIBUSB_CONF_OPTS = --disable-udev -- 2.34.1 From fontaine.fabrice at gmail.com Mon Feb 7 17:26:49 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 7 Feb 2022 18:26:49 +0100 Subject: [Buildroot] [PATCH 1/1] package/lighttpd: pgsql needs wchar Message-ID: <20220207172649.3041300-1-fontaine.fabrice@gmail.com> Commit b429dce6f8e2ee162b79fe2a3ebb1bd179f462e3 forgot to add wchar dependency resulting in the following build failure of postgresql: configure: error: C compiler "/home/buildroot/autobuild/instance-2/output-1/host/bin/arm-linux-gcc" does not support C99 Fixes: - http://autobuild.buildroot.org/results/e4b59fecd2a5bcda8103ddf4eae3dbd78fe3b896 Signed-off-by: Fabrice Fontaine --- package/lighttpd/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index aa18c13171..6f0c927319 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -92,11 +92,13 @@ config BR2_PACKAGE_LIGHTTPD_PCRE config BR2_PACKAGE_LIGHTTPD_PGSQL bool "pgsql support" depends on BR2_USE_MMU # postgresql + depends on BR2_USE_WCHAR # 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_MMU depends on !BR2_USE_WCHAR config BR2_PACKAGE_LIGHTTPD_WEBDAV -- 2.34.1 From giulio.benetti at benettiengineering.com Mon Feb 7 17:29:57 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 7 Feb 2022 18:29:57 +0100 Subject: [Buildroot] [PATCH 1/1] board/arcturus/aarch64-ucls1012a: bump u-boot and kernel version In-Reply-To: <4b667326-5aca-538b-9b36-7f0d5a400e9f@arcturusnetworks.com> References: <4b667326-5aca-538b-9b36-7f0d5a400e9f@arcturusnetworks.com> Message-ID: Hi Oleksandr, can you improve commit log? Looking at what you do below I see you do more than just bumping u-boot and linux. Also please specify the versions you're bumping to, On 07/02/22 16:53, Oleksandr G Zhadan wrote: > Signed-off-by: Oleksandr G Zhadan > Signed-off-by: Michael Durrant > --- > ?board/arcturus/aarch64-ucls1012a/post-build.sh??? |? 2 -- > ?board/arcturus/aarch64-ucls1012a/readme.txt?????? |? 8 ++++---- > ?.../rootfs_overlay/etc/init.d/S09modload????????? | 14 -------------- > ?configs/arcturus_ucls1012a_defconfig????????????? | 15 +++++++-------- > ?4 files changed, 11 insertions(+), 28 deletions(-) > ?delete mode 100755 > board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload > > diff --git a/board/arcturus/aarch64-ucls1012a/post-build.sh > b/board/arcturus/aarch64-ucls1012a/post-build.sh > index f8ba78095f..ca3862988d 100755 > --- a/board/arcturus/aarch64-ucls1012a/post-build.sh > +++ b/board/arcturus/aarch64-ucls1012a/post-build.sh > @@ -1,5 +1,3 @@ > ?#!/bin/sh > > -mkdir -p ${TARGET_DIR}/lib/firmware > -cp -f ${BUILD_DIR}/linux-custom/firmware/ppfe/* ${TARGET_DIR}/lib/firmware/ > ?cp -f ${BUILD_DIR}/linux-custom/br2-ucls1012a.its ${BINARIES_DIR}/ > diff --git a/board/arcturus/aarch64-ucls1012a/readme.txt > b/board/arcturus/aarch64-ucls1012a/readme.txt > index 483d5e9aef..f892fc4abc 100644 > --- a/board/arcturus/aarch64-ucls1012a/readme.txt > +++ b/board/arcturus/aarch64-ucls1012a/readme.txt > @@ -23,14 +23,14 @@ Result of the build > ?After building, you should obtain this tree: > > ???? output/images/ > -??? +-- arc-ucls1012a.dtb > -??? +-- Image > +??? +-- br2-ucls1012a.its > +??? +-- Image.gz > ???? +-- part0-000000.itb > ???? +-- rootfs.cpio > ???? +-- rootfs.cpio.gz > ???? +-- rootfs.tar > ???? +-- u-boot.bin > -??? +-- ucls1012a.its > +??? +-- ucls1012a-som.dtb > > ?Flashing > ?-------- > @@ -60,7 +60,7 @@ u-boot shell. > ?4. Program the ITB image (includes Kernel, DTB and Ramdisk) > > ???? B$ tftp part0-000000.itb > -??? B$ run iprogram > +??? B$ run program0 > > ?5. Booting your new system > > diff --git > a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload > b/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload > deleted file mode 100755 > index c87ffda14f..0000000000 > --- a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload > +++ /dev/null > @@ -1,14 +0,0 @@ > -#!/bin/sh > -# > -case "$1" in > -?????? start) > -??????????????? modprobe pfe > -??????????????? ;; > -??????? stop) > -??????????????? ;; > -??????? restart|reload) > -??????????????? ;; > -??????? *) > -??????????????? echo "Usage: $0 {start|stop|restart}" > -??????????????? exit 1 > -esac Here you remove this file for modprobe() fpe, why? Can you elabore in commit log? > diff --git a/configs/arcturus_ucls1012a_defconfig > b/configs/arcturus_ucls1012a_defconfig > index fd33ebf1f6..f544a5240a 100644 > --- a/configs/arcturus_ucls1012a_defconfig > +++ b/configs/arcturus_ucls1012a_defconfig > @@ -1,24 +1,23 @@ > ?# Architecture > ?BR2_aarch64=y > > -# Linux headers same as kernel, a 4.14 series > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y > > ?# System settings > ?BR2_TARGET_GENERIC_HOSTNAME="ucls1012a" > ?BR2_TARGET_GENERIC_ISSUE="Welcome to uCLS1012A-SOM" > ?BR2_SYSTEM_DHCP="eth0" > -BR2_ROOTFS_OVERLAY="board/arcturus/aarch64-ucls1012a/rootfs_overlay" > ?BR2_ROOTFS_POST_BUILD_SCRIPT="board/arcturus/aarch64-ucls1012a/post-build.sh" > ?BR2_ROOTFS_POST_IMAGE_SCRIPT="board/arcturus/aarch64-ucls1012a/post-image.sh" > > ?# Kernel > ?BR2_LINUX_KERNEL=y > ?BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call > github,ArcturusNetworks,uCLS1012A-kernel,v.20.31)/linux-v.20.31.tar.gz" > -BR2_LINUX_KERNEL_DEFCONFIG="ucls1012a" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call > github,ArcturusNetworks,uCLS1012A-kernel,v.22.05)/linux-v.22.05.tar.gz" > +BR2_LINUX_KERNEL_DEFCONFIG="ucls1012a_som" Here ^^^ you also change the defconfig name, another thing to add to commit log and the reason > +BR2_LINUX_KERNEL_IMAGEGZ=y Here ^^^ you change to zImage, another thing to add to commit log > ?BR2_LINUX_KERNEL_DTS_SUPPORT=y > -BR2_LINUX_KERNEL_INTREE_DTS_NAME="arcturus/arc-ucls1012a" > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="arcturus/ucls1012a-som" > > ?# Filesystem > ?BR2_TARGET_ROOTFS_CPIO=y > @@ -28,8 +27,8 @@ BR2_TARGET_ROOTFS_CPIO_GZIP=y > ?BR2_TARGET_UBOOT=y > ?BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > ?BR2_TARGET_UBOOT_CUSTOM_TARBALL=y > -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call > github,ArcturusNetworks,uCLS1012A-uboot,v.20.31)/uboot-v.20.31.tar.gz" > -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="UCLS1012A_QSPI128" > +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call > github,ArcturusNetworks,uCLS1012A-uboot,v.22.05)/uboot-v.22.05.tar.gz" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="UCLS1012A_SOM" Ditto > ?# Tools > ?BR2_PACKAGE_HOST_UBOOT_TOOLS=y Also, which Buildroot version do you use to create patch? And which specific command do you use? I ask you this because patch results malformed: ``` patch -p1 < ~/Downloads/1-1-board-arcturus-aarch64-ucls1012a-bump-u-boot-and-kernel-version.patch patching file board/arcturus/aarch64-ucls1012a/post-build.sh Hunk #1 succeeded at 1 with fuzz 2. patching file board/arcturus/aarch64-ucls1012a/readme.txt Hunk #1 FAILED at 23. Hunk #2 FAILED at 60. 2 out of 2 hunks FAILED -- saving rejects to file board/arcturus/aarch64-ucls1012a/readme.txt.rej patching file board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload Reversed (or previously applied) patch detected! Assume -R? [n] Apply anyway? [n] Skipping patch. 1 out of 1 hunk ignored -- saving rejects to file board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload.rej patching file configs/arcturus_ucls1012a_defconfig patch: **** malformed patch at line 201: github,ArcturusNetworks,uCLS1012A-kernel,v.20.31)/linux-v.20.31.tar.gz" ``` I've tried applying with: git am xxx.patch and then with: patch -p1 < xxx.patch but that gave me the malformed patch error. Usually this is how I do: Rebase # git pull --rebase upstream master Create the patch assuming it is on top of the commits # git format-patch -M -s -o . -1 Then I send it with: # git send-email --to "buildroot " 0001-xxxx.patch Can you please check? Because I want to give a build and check in buildroot docker. Thank you! Best regards -- Giulio Benetti Benetti Engineering sas From fontaine.fabrice at gmail.com Mon Feb 7 17:32:15 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 7 Feb 2022 18:32:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/ace: needs C++11 Message-ID: <20220207173215.3041588-1-fontaine.fabrice@gmail.com> ace needs C++11 since its addition in commit 3621918d1bc1ddc9312dd1cc8dec6db61e712fe2 to avoid the following build failure: In file included from /home/peko/autobuild/instance-1/output-1/host/opt/ext-toolchain/mips-linux-gnu/include/c++/5.3.0/chrono:35:0, from /home/peko/autobuild/instance-1/output-1/build/ace-7.0.1/ace/Time_Value.h:23, from /home/peko/autobuild/instance-1/output-1/build/ace-7.0.1/ace/OS_NS_unistd.h:25, from /home/peko/autobuild/instance-1/output-1/build/ace-7.0.1/ace/ACE.inl:2, from /home/peko/autobuild/instance-1/output-1/build/ace-7.0.1/ace/ACE.h:886, from /home/peko/autobuild/instance-1/output-1/build/ace-7.0.1/ace/ACE.cpp:1: /home/peko/autobuild/instance-1/output-1/host/opt/ext-toolchain/mips-linux-gnu/include/c++/5.3.0/bits/c++0x_warning.h:32:2: error: #error This file requires compiler and library support for the ISO C++ 2011 standard. This support is currently experimental, and must be enabled with the -std=c++11 or -std=gnu++11 compiler options. #error This file requires compiler and library support for the \ ^ Fixes: - http://autobuild.buildroot.org/results/13376405e313da112f546076a10859e60631d5d5 Signed-off-by: Fabrice Fontaine --- package/ace/Config.in | 8 ++++++-- package/ace/ace.mk | 9 +++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/package/ace/Config.in b/package/ace/Config.in index 226e34df32..5000f2352f 100644 --- a/package/ace/Config.in +++ b/package/ace/Config.in @@ -2,11 +2,15 @@ config BR2_PACKAGE_ACE bool "ace" depends on BR2_TOOLCHAIN_USES_GLIBC depends on !BR2_STATIC_LIBS + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 help The ADAPTIVE Communication Environment (ACE(TM)) An OO Network Programming Toolkit in C++. http://www.dre.vanderbilt.edu/~schmidt/ACE.html -comment "ACE needs a glibc toolchain, dynamic library" - depends on !BR2_TOOLCHAIN_USES_GLIBC || BR2_STATIC_LIBS +comment "ACE needs a glibc toolchain, dynamic library, C++, gcc >= 4.8" + depends on !BR2_TOOLCHAIN_USES_GLIBC || BR2_STATIC_LIBS || \ + !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/package/ace/ace.mk b/package/ace/ace.mk index b6b4cfbc24..8df89d8c6f 100644 --- a/package/ace/ace.mk +++ b/package/ace/ace.mk @@ -17,6 +17,10 @@ ACE_CPE_ID_PRODUCT = adaptive_communication_environment # Only compiling ACE libraries (no TAO) ACE_LIBARIES = ace ACEXML Kokyu netsvcs protocols/ace +ACE_MAKE_OPTS = \ + ACE_ROOT="$(@D)" \ + DEFFLAGS="$(TARGET_CPPFLAGS) -std=c++11" + ifeq ($(BR2_PACKAGE_OPENSSL),y) ACE_LIBARIES += ace/SSL ACE_DEPENDENCIES += openssl @@ -39,14 +43,15 @@ endef define ACE_BUILD_CMDS $(foreach lib,$(ACE_LIBARIES), \ - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/$(lib) ACE_ROOT="$(@D)" all + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/$(lib) \ + $(ACE_MAKE_OPTS) all ) endef define ACE_LIBARIES_INSTALL mkdir -p $(1)/usr/share/ace $(foreach lib,$(ACE_LIBARIES), \ - $(MAKE) -C $(@D)/$(lib) ACE_ROOT="$(@D)" DESTDIR=$(1) install + $(MAKE) -C $(@D)/$(lib) $(ACE_MAKE_OPTS) DESTDIR=$(1) install ) endef -- 2.34.1 From giulio.benetti at benettiengineering.com Mon Feb 7 17:36:22 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 7 Feb 2022 18:36:22 +0100 Subject: [Buildroot] Xilinx zynqmp_zcu10x_defconfigs: two things left In-Reply-To: References: <0a82d8c7-a0c6-06a5-6a0b-788fd5c4a935@benettiengineering.com> <8be136a0-1263-3b17-0b78-b7d34ef146c2@lucaceresoli.net> <032d657b-eb9a-2dc9-f60b-8536f1fc6c57@lucaceresoli.net> <16f4b7bf-546b-3bf4-c6a3-b711c8cfcadb@lucaceresoli.net> Message-ID: Hi Neal, On 07/02/22 18:26, Neal Frager wrote: > Hi Giulio, > >> In the boards I've pointed you before: >> https://github.com/buildroot/buildroot/tree/master/board/orangepi/orangepi-lite2 > >> there is everythyng you need, the post-build script: >> https://github.com/buildroot/buildroot/blob/master/board/orangepi/orangepi-lite2/post-build.sh >> that copies the extlinux.conf. > >> And as explained before you have to point to it like this: >> https://github.com/buildroot/buildroot/blob/master/configs/orangepi_lite2_defconfig#L48 > >> For creating the VFAT you can imitate this genimage.cfg file: >> https://github.com/buildroot/buildroot/blob/master/board/orangepi/orangepi-lite2/genimage.cfg#L1-L11 > >> that must be pointed by: >> https://github.com/buildroot/buildroot/blob/master/configs/orangepi_lite2_defconfig#L46-L47 > > Yes, the problem is that these steps put the extlinux.conf in the root directory of the vfat image, which does not work. U-Boot only looks for the extlinux.conf in the extlinux.conf directory. So what I was missing was figuring out how to build a vfat image with my extlinux.conf in the extlinux directory. I finally figured it out with the following genimage.cfg. Aah ok. Usually /extlinux/extlinux.conf is found in ext4 /boot/ but it's ok even in vfat. > > image boot.vfat { > vfat { > files = { > "boot.bin", > "u-boot.itb", > "system.dtb", > "Image" > } > file extlinux/extlinux.conf { > image = extlinux.conf > } > } > > size = 32M > } > > image sdcard.img { > hdimage { > } > > partition boot { > partition-type = 0xC > bootable = "true" > image = "boot.vfat" > } > > partition rootfs { > partition-type = 0x83 > image = "rootfs.ext4" > } > } > > Thanks for your help! You're welcome Best regards -- Giulio Benetti Benetti Engineering sas From yann.morin.1998 at free.fr Mon Feb 7 17:37:51 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 7 Feb 2022 18:37:51 +0100 Subject: [Buildroot] [PATCH 01/16] board/aarch64-efi/genimage-efi: convert partition-type-uuid to single letter notation In-Reply-To: <20220207085517.5c13c097@windsurf> References: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> <20220206200532.2758493-2-giulio.benetti@benettiengineering.com> <20220206213657.GA457876@scaer> <20220207085517.5c13c097@windsurf> Message-ID: <20220207173751.GA2249818@scaer> Thomas, All, On 2022-02-07 08:55 +0100, Thomas Petazzoni spake thusly: > On Sun, 6 Feb 2022 22:36:57 +0100 > "Yann E. MORIN" wrote: > > > partition root { > > > - partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae > > > + partition-type-uuid = L > > As we discussed on IRC, this is not the same thing. genimage will extend > > the 'L' shorthand to the full UUID 0fc63daf-8483-4772-8e79-3d69d8477de4, > > which is different. > And? Is that really important? > > So I don't think uaing the shorthands are correct. > Why? I think that it is important that we do adhere to the expected values; see below... > > The UUID assignments are available on Wikipedia: > > https://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs > > But the systemd docuemntation has extra UUID definitions: > > https://man.archlinux.org/man/systemd-gpt-auto-generator.8 > Yes, but how useful are they? Why would we diverge from the specs? > Unless these systemd-defined UUID are really relevant, I would prefer > that we use the shortcuts provided by genimage wherever possible, and > only rely on using the full UUID for special cases, such as the > board/sifive/hifive-unleashed/genimage_sdcard.cfg (PATCH 15/16). There are tools that expect those values, to autodetect partitions. This is the case, of course, of systemd-gpt-auto-generator, which will lookup the partition UUIDs, but other tools may expect these UUIDs too. I am not saying that we would cause trouble by changing our board descriptions, but if we want to allow people to just copy them as the base for their own development, then diverging from expected behaviour is not nice. > This way, it would be pretty clear that we have the "common cases" (boot > partition, rootfs partition) and the "odd/special cases". I think the "common case" would be "adhere to spec, use specified values", while the exceptions are "the spec says nothing, use something else and comment it". Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Mon Feb 7 17:40:02 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 7 Feb 2022 18:40:02 +0100 Subject: [Buildroot] csky_gx6605s build failure In-Reply-To: References: Message-ID: <20220207174002.GB2249818@scaer> Guo, All, On 2022-02-07 15:33 +0800, Guo Ren spake thusly: > We?re using buildroot to build ck610 toolchain, here is the build log: > https://gitlab.com/c-sky/buildroot/-/jobs/1978229010 > Here is the Qemu testing log: > https://gitlab.com/c-sky/buildroot/-/jobs/1978229040 > > Could we use this toolchain which built from buildroot as the external toolchain you mentioned? > https://gitlab.com/c-sky/buildroot/-/jobs/1978229010/artifacts/file/output/images/toolchain_thead_610_compat_next_glibc_br_defconfig_8c99ae1c7cb66c0f062ed453fd9ae4c59422a42a.tar.xz > > Ps: > Ck610 ISA is mcore(we call it abiv1), gcc 12 doesn?t support it, here is toolchain related repo (base on gcc 6.3): > https://gitlab.com/c-sky/buildroot/-/blob/master/patches/0003-version.patch > > Git hub repo: > -else ifeq ($(BR2_GCC_VERSION_CSKY),y) > -GCC_SITE = $(call github,c-sky,gcc,$(GCC_VERSION)) > -GCC_SOURCE = gcc-$(GCC_VERSION).tar.gz Do you think you could send an update to the defconfig we have in-tree, and any change you've made on your Buildroot fork, 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 peter at korsgaard.com Mon Feb 7 18:19:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Feb 2022 19:19:40 +0100 Subject: [Buildroot] [PATCH] package/gnuradio: simplify pyver logic In-Reply-To: <20220206102956.15291-1-peter@korsgaard.com> (Peter Korsgaard's message of "Sun, 6 Feb 2022 11:29:55 +0100") References: <20220206102956.15291-1-peter@korsgaard.com> Message-ID: <874k5atu83.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Gnuradio only works with python3 since commit 786c783f3796 > (package/python-numpy: bump to version 1.18.2), so the python2/3 logic for > _PYVER can be dropped. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 7 18:19:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Feb 2022 19:19:51 +0100 Subject: [Buildroot] [PATCH] package/libpwquality: support python bindings with python3 In-Reply-To: <20220206121652.30854-1-peter@korsgaard.com> (Peter Korsgaard's message of "Sun, 6 Feb 2022 13:16:51 +0100") References: <20220206121652.30854-1-peter@korsgaard.com> Message-ID: <87zgn2sfnc.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > The python bindings support python3 as well, so enable it if python3 is > enabled. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 7 18:20:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Feb 2022 19:20:16 +0100 Subject: [Buildroot] [PATCH 1/2] package/avahi: drop unneeded am_cv_path_PYTHON In-Reply-To: <20220206094504.11415-1-peter@korsgaard.com> (Peter Korsgaard's message of "Sun, 6 Feb 2022 10:45:02 +0100") References: <20220206094504.11415-1-peter@korsgaard.com> Message-ID: <87v8xqsfmn.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > It is not used by the configure script and refer to PYTHON_TARGET_BINARY > which was dropped back in 2010 by commit e3418f69cf (python: convert to > autotargets, bump to 2.7.1, many improvements), so drop it. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 7 18:22:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Feb 2022 19:22:16 +0100 Subject: [Buildroot] [PATCH 2/2] package/avahi: add pygobject support, move to python3 In-Reply-To: <20220206094504.11415-2-peter@korsgaard.com> (Peter Korsgaard's message of "Sun, 6 Feb 2022 10:45:03 +0100") References: <20220206094504.11415-1-peter@korsgaard.com> <20220206094504.11415-2-peter@korsgaard.com> Message-ID: <87r18esfjb.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > The python support in avahi needs pygobjet to do anything: > Building avahi-python: no (You need python, pygobject and python-dbus!) > So add optional support for it. Python-gobject is only available for > python3, so change the python logic to use python 3. > Signed-off-by: Peter Korsgaard Committed, thanks. The further cleanup to only pass --enable-python if all the dependencies are present can be done later. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 7 18:23:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Feb 2022 19:23:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/lighttpd: pgsql needs wchar In-Reply-To: <20220207172649.3041300-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 7 Feb 2022 18:26:49 +0100") References: <20220207172649.3041300-1-fontaine.fabrice@gmail.com> Message-ID: <87mtj2sfhj.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Commit b429dce6f8e2ee162b79fe2a3ebb1bd179f462e3 forgot to add wchar > dependency resulting in the following build failure of postgresql: > configure: error: C compiler "/home/buildroot/autobuild/instance-2/output-1/host/bin/arm-linux-gcc" does not support C99 > Fixes: > - http://autobuild.buildroot.org/results/e4b59fecd2a5bcda8103ddf4eae3dbd78fe3b896 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 7 18:24:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Feb 2022 19:24:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/ace: needs C++11 In-Reply-To: <20220207173215.3041588-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 7 Feb 2022 18:32:15 +0100") References: <20220207173215.3041588-1-fontaine.fabrice@gmail.com> Message-ID: <87iltqsffd.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > ace needs C++11 since its addition in commit > 3621918d1bc1ddc9312dd1cc8dec6db61e712fe2 to avoid the following build > failure: > In file included from /home/peko/autobuild/instance-1/output-1/host/opt/ext-toolchain/mips-linux-gnu/include/c++/5.3.0/chrono:35:0, > from /home/peko/autobuild/instance-1/output-1/build/ace-7.0.1/ace/Time_Value.h:23, > from /home/peko/autobuild/instance-1/output-1/build/ace-7.0.1/ace/OS_NS_unistd.h:25, > from /home/peko/autobuild/instance-1/output-1/build/ace-7.0.1/ace/ACE.inl:2, > from /home/peko/autobuild/instance-1/output-1/build/ace-7.0.1/ace/ACE.h:886, > from /home/peko/autobuild/instance-1/output-1/build/ace-7.0.1/ace/ACE.cpp:1: > /home/peko/autobuild/instance-1/output-1/host/opt/ext-toolchain/mips-linux-gnu/include/c++/5.3.0/bits/c++0x_warning.h:32:2: error: #error This file requires compiler and library support for the ISO C++ 2011 standard. This support is currently experimental, and must be enabled with the -std=c++11 or -std=gnu++11 compiler options. > #error This file requires compiler and library support for the \ > ^ > Fixes: > - http://autobuild.buildroot.org/results/13376405e313da112f546076a10859e60631d5d5 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 7 18:19:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Feb 2022 19:19:32 +0100 Subject: [Buildroot] [git commit] package/libpwquality: support python bindings with python3 Message-ID: <20220207181734.8A84582DC2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=92a1b71204d6cccd2e1c4f4c67d4f0d17edc1adb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The python bindings support python3 as well, so enable it if python3 is enabled. Signed-off-by: Peter Korsgaard --- package/libpwquality/libpwquality.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libpwquality/libpwquality.mk b/package/libpwquality/libpwquality.mk index 7c0c5df38e..54a03be453 100644 --- a/package/libpwquality/libpwquality.mk +++ b/package/libpwquality/libpwquality.mk @@ -12,9 +12,9 @@ LIBPWQUALITY_INSTALL_STAGING = YES LIBPWQUALITY_DEPENDENCIES = cracklib LIBPWQUALITY_LICENSE_FILES = COPYING -ifeq ($(BR2_PACKAGE_PYTHON),y) +ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) LIBPWQUALITY_CONF_OPTS += --enable-python-bindings -LIBPWQUALITY_DEPENDENCIES += python +LIBPWQUALITY_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON3),python3,python) LIBPWQUALITY_MAKE_ENV += $(PKG_PYTHON_DISTUTILS_ENV) else LIBPWQUALITY_CONF_OPTS += --disable-python-bindings From peter at korsgaard.com Mon Feb 7 18:23:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Feb 2022 19:23:50 +0100 Subject: [Buildroot] [git commit] package/ace: needs C++11 Message-ID: <20220207181734.AE85582DC5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e8011a08b6fd83b43babc3b3d91d5636f28154de branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master ace needs C++11 since its addition in commit 3621918d1bc1ddc9312dd1cc8dec6db61e712fe2 to avoid the following build failure: In file included from /home/peko/autobuild/instance-1/output-1/host/opt/ext-toolchain/mips-linux-gnu/include/c++/5.3.0/chrono:35:0, from /home/peko/autobuild/instance-1/output-1/build/ace-7.0.1/ace/Time_Value.h:23, from /home/peko/autobuild/instance-1/output-1/build/ace-7.0.1/ace/OS_NS_unistd.h:25, from /home/peko/autobuild/instance-1/output-1/build/ace-7.0.1/ace/ACE.inl:2, from /home/peko/autobuild/instance-1/output-1/build/ace-7.0.1/ace/ACE.h:886, from /home/peko/autobuild/instance-1/output-1/build/ace-7.0.1/ace/ACE.cpp:1: /home/peko/autobuild/instance-1/output-1/host/opt/ext-toolchain/mips-linux-gnu/include/c++/5.3.0/bits/c++0x_warning.h:32:2: error: #error This file requires compiler and library support for the ISO C++ 2011 standard. This support is currently experimental, and must be enabled with the -std=c++11 or -std=gnu++11 compiler options. #error This file requires compiler and library support for the \ ^ Fixes: - http://autobuild.buildroot.org/results/13376405e313da112f546076a10859e60631d5d5 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/ace/Config.in | 8 ++++++-- package/ace/ace.mk | 9 +++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/package/ace/Config.in b/package/ace/Config.in index 226e34df32..5000f2352f 100644 --- a/package/ace/Config.in +++ b/package/ace/Config.in @@ -2,11 +2,15 @@ config BR2_PACKAGE_ACE bool "ace" depends on BR2_TOOLCHAIN_USES_GLIBC depends on !BR2_STATIC_LIBS + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 help The ADAPTIVE Communication Environment (ACE(TM)) An OO Network Programming Toolkit in C++. http://www.dre.vanderbilt.edu/~schmidt/ACE.html -comment "ACE needs a glibc toolchain, dynamic library" - depends on !BR2_TOOLCHAIN_USES_GLIBC || BR2_STATIC_LIBS +comment "ACE needs a glibc toolchain, dynamic library, C++, gcc >= 4.8" + depends on !BR2_TOOLCHAIN_USES_GLIBC || BR2_STATIC_LIBS || \ + !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/package/ace/ace.mk b/package/ace/ace.mk index b6b4cfbc24..8df89d8c6f 100644 --- a/package/ace/ace.mk +++ b/package/ace/ace.mk @@ -17,6 +17,10 @@ ACE_CPE_ID_PRODUCT = adaptive_communication_environment # Only compiling ACE libraries (no TAO) ACE_LIBARIES = ace ACEXML Kokyu netsvcs protocols/ace +ACE_MAKE_OPTS = \ + ACE_ROOT="$(@D)" \ + DEFFLAGS="$(TARGET_CPPFLAGS) -std=c++11" + ifeq ($(BR2_PACKAGE_OPENSSL),y) ACE_LIBARIES += ace/SSL ACE_DEPENDENCIES += openssl @@ -39,14 +43,15 @@ endef define ACE_BUILD_CMDS $(foreach lib,$(ACE_LIBARIES), \ - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/$(lib) ACE_ROOT="$(@D)" all + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/$(lib) \ + $(ACE_MAKE_OPTS) all ) endef define ACE_LIBARIES_INSTALL mkdir -p $(1)/usr/share/ace $(foreach lib,$(ACE_LIBARIES), \ - $(MAKE) -C $(@D)/$(lib) ACE_ROOT="$(@D)" DESTDIR=$(1) install + $(MAKE) -C $(@D)/$(lib) $(ACE_MAKE_OPTS) DESTDIR=$(1) install ) endef From peter at korsgaard.com Mon Feb 7 18:20:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Feb 2022 19:20:07 +0100 Subject: [Buildroot] [git commit] package/avahi: drop unneeded am_cv_path_PYTHON Message-ID: <20220207181734.9391E82DC5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ff44d53b647c20b5221fe960d7411ddf8094a3cc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master It is not used by the configure script and refer to PYTHON_TARGET_BINARY which was dropped back in 2010 by commit e3418f69cf (python: convert to autotargets, bump to 2.7.1, many improvements), so drop it. Signed-off-by: Peter Korsgaard --- package/avahi/avahi.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk index 13e2106014..04c4164af6 100644 --- a/package/avahi/avahi.mk +++ b/package/avahi/avahi.mk @@ -107,7 +107,6 @@ endif ifeq ($(BR2_PACKAGE_PYTHON),y) AVAHI_CONF_ENV += \ am_cv_pathless_PYTHON=python \ - am_cv_path_PYTHON=$(PYTHON_TARGET_BINARY) \ am_cv_python_version=$(PYTHON_VERSION) \ am_cv_python_platform=linux2 \ am_cv_python_pythondir=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \ From peter at korsgaard.com Mon Feb 7 18:21:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Feb 2022 19:21:33 +0100 Subject: [Buildroot] [git commit] package/avahi: add pygobject support, move to python3 Message-ID: <20220207181734.9BB0882AB5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=71dc252bb96c5d8f667f11abf3e0b8ba59fd4131 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The python support in avahi needs pygobjet to do anything: Building avahi-python: no (You need python, pygobject and python-dbus!) So add optional support for it. Python-gobject is only available for python3, so change the python logic to use python 3. Signed-off-by: Peter Korsgaard --- package/avahi/avahi.mk | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk index 04c4164af6..1992669a92 100644 --- a/package/avahi/avahi.mk +++ b/package/avahi/avahi.mk @@ -40,7 +40,6 @@ AVAHI_CONF_OPTS = \ --disable-gtk \ --disable-gtk3 \ --disable-gdbm \ - --disable-pygobject \ --disable-mono \ --disable-monodoc \ --disable-stack-protector \ @@ -104,16 +103,16 @@ else AVAHI_CONF_OPTS += --disable-glib --disable-gobject endif -ifeq ($(BR2_PACKAGE_PYTHON),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) AVAHI_CONF_ENV += \ - am_cv_pathless_PYTHON=python \ - am_cv_python_version=$(PYTHON_VERSION) \ - am_cv_python_platform=linux2 \ - am_cv_python_pythondir=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \ - am_cv_python_pyexecdir=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \ + am_cv_pathless_PYTHON=python3 \ + am_cv_python_version=$(PYTHON3_VERSION) \ + am_cv_python_platform=linux5 \ + am_cv_python_pythondir=/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + am_cv_python_pyexecdir=/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ py_cv_mod_socket_=yes -AVAHI_DEPENDENCIES += python +AVAHI_DEPENDENCIES += python3 AVAHI_CONF_OPTS += --enable-python else AVAHI_CONF_OPTS += --disable-python @@ -127,6 +126,13 @@ else AVAHI_CONF_OPTS += --disable-python-dbus endif +ifeq ($(BR2_PACKAGE_PYTHON_GOBJECT),y) +AVAHI_CONF_OPTS += --enable-pygobject +AVAHI_DEPENDENCIES += python-gobject +else +AVAHI_CONF_OPTS += --disable-pygobject +endif + AVAHI_CONF_ENV += CFLAGS="$(AVAHI_CFLAGS)" AVAHI_MAKE_OPTS += LIBS=$(TARGET_NLS_LIBS) From peter at korsgaard.com Mon Feb 7 18:18:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Feb 2022 19:18:58 +0100 Subject: [Buildroot] [git commit] package/gnuradio: simplify pyver logic Message-ID: <20220207181734.8228782AB5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7162d69194d606734e7148f009dd034b31d1302a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Gnuradio only works with python3 since commit 786c783f3796 (package/python-numpy: bump to version 1.18.2), so the python2/3 logic for _PYVER can be dropped. Signed-off-by: Peter Korsgaard --- package/gnuradio/gnuradio.mk | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index 658357398d..417a51e067 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -11,13 +11,6 @@ GNURADIO_LICENSE_FILES = COPYING GNURADIO_SUPPORTS_IN_SOURCE_BUILD = NO -# needed to determine site-packages path -ifeq ($(BR2_PACKAGE_PYTHON),y) -GNURADIO_PYVER = $(PYTHON_VERSION_MAJOR) -else ifeq ($(BR2_PACKAGE_PYTHON3),y) -GNURADIO_PYVER = $(PYTHON3_VERSION_MAJOR) -endif - # host-python-mako and host-python-six are needed for volk to compile GNURADIO_DEPENDENCIES = \ host-python3 \ @@ -125,7 +118,7 @@ GNURADIO_CONF_OPTS += -DENABLE_PYTHON=ON # mandatory to install python modules in site-packages and to use # correct path for python libraries GNURADIO_CONF_OPTS += -DGR_PYTHON_RELATIVE=ON \ - -DGR_PYTHON_DIR=lib/python$(GNURADIO_PYVER)/site-packages + -DGR_PYTHON_DIR=lib/python$(PYTHON3_VERSION_MAJOR)/site-packages else GNURADIO_CONF_OPTS += -DENABLE_PYTHON=OFF endif From peter at korsgaard.com Mon Feb 7 18:22:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Feb 2022 19:22:34 +0100 Subject: [Buildroot] [git commit] package/lighttpd: pgsql needs wchar Message-ID: <20220207181734.A59A682DC2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b8e7e90b839c5411674729326f3f603a5a2c69d9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit b429dce6f8e2ee162b79fe2a3ebb1bd179f462e3 forgot to add wchar dependency resulting in the following build failure of postgresql: configure: error: C compiler "/home/buildroot/autobuild/instance-2/output-1/host/bin/arm-linux-gcc" does not support C99 Fixes: - http://autobuild.buildroot.org/results/e4b59fecd2a5bcda8103ddf4eae3dbd78fe3b896 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/lighttpd/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index b9f64a3bc3..4406a685ba 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -83,11 +83,13 @@ config BR2_PACKAGE_LIGHTTPD_PCRE config BR2_PACKAGE_LIGHTTPD_PGSQL bool "pgsql support" depends on BR2_USE_MMU # postgresql + depends on BR2_USE_WCHAR # 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_MMU depends on !BR2_USE_WCHAR config BR2_PACKAGE_LIGHTTPD_WEBDAV From nealf at xilinx.com Mon Feb 7 18:40:41 2022 From: nealf at xilinx.com (Neal Frager) Date: Mon, 7 Feb 2022 18:40:41 +0000 Subject: [Buildroot] Xilinx zynqmp_zcu10x_defconfigs: two things left In-Reply-To: References: <0a82d8c7-a0c6-06a5-6a0b-788fd5c4a935@benettiengineering.com> <8be136a0-1263-3b17-0b78-b7d34ef146c2@lucaceresoli.net> <032d657b-eb9a-2dc9-f60b-8536f1fc6c57@lucaceresoli.net> <16f4b7bf-546b-3bf4-c6a3-b711c8cfcadb@lucaceresoli.net> Message-ID: Hi Giulio, > Aah ok. > Usually /extlinux/extlinux.conf is found in ext4 /boot/ but it's ok even in vfat. Unfortunately, it was a bit of a chicken and the egg issue. U-Boot could not find the rootfs.ext4 without the extlinux.conf. So if the extlinux.conf was in the ext4 file system, U-Boot could never find it. This is why it needs to be in the vfat partition for booting, and specifically in the /extlinux directory in the case of zynqmp. > > image boot.vfat { > vfat { > files = { > "boot.bin", > "u-boot.itb", > "system.dtb", > "Image" > } > file extlinux/extlinux.conf { > image = extlinux.conf > } > } > > size = 32M > } > > image sdcard.img { > hdimage { > } > > partition boot { > partition-type = 0xC > bootable = "true" > image = "boot.vfat" > } > > partition rootfs { > partition-type = 0x83 > image = "rootfs.ext4" > } > } > The good news is I just completed a build of a version that builds and runs without needing any manual post-build steps. All that is required is 'make zynqmp_zcu10x_defconfig' followed by 'make'. The way it should be. I will be submitting a new patch set tomorrow. It will include the following software versions. ATF v2.6 from https://github.com/Xilinx/arm-trusted-firmware U-Boot 2022.01 from https://github.com/Xilinx/u-boot-xlnx Linux 5.15 from https://github.com/Xilinx/linux-xlnx Using these versions allow me to make use of the updated U-Boot tools/zynqmp_pm_cfg_obj_convert.py without needing to be dependent on any build patches. Thank you both, Giulio and Luca, for your fantastic support! Best regards, Neal Frager Xilinx From peter at korsgaard.com Mon Feb 7 18:43:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Feb 2022 19:43:42 +0100 Subject: [Buildroot] Build error with 2021.11.x In-Reply-To: (Andrey Nechypurenko's message of "Mon, 7 Feb 2022 11:33:16 +0100") References: Message-ID: <87ee4esejl.fsf@dell.be.48ers.dk> >>>>> "Andrey" == Andrey Nechypurenko writes: > Hello Buildrooters, > I just updated Buildroot from 2021.08.x to 2021.11.x and got build problems. > In particular, ICU library could not be built. I was trying with ARM > external toolchain and with Linaro 2018 getting the same error. > It would be great if someone can provide hints on what might be wrong and > how to fix the problem. Below are the relevant logs and information. > Thank you, > Andrey. >>>> icu 69-1 Configuring [snip] > INTLTOOL_PERL=/usr/bin/perl CFLAGS="-D_LARGEFILE_SOURCE > -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O3 -g0 > -D_FORTIFY_SOURCE=1 > -I/home/and/p2/build/prodx/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/drm" > LDFLAGS=" -ldrm" ac_cv_lbl_unaligned_fail=yes Hmm, is this a pristine upstream Buildroot 2021.11 without any external packages? You seem to be passing some extra CFLAGS / LDFLAGS to the configure script. Variables like TARGET_CONFIGURE_OPTS are global, so you cannot change it in a custom package without causing problems, like this: > configure:3057: checking whether the C compiler works > configure:3079: > /home/and/p2/build/prodx/host/bin/arm-linux-gnueabihf-gcc > -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O3 > -g0 -D_FORTIFY_SOURCE=1 > -I/home/and/p2/build/prodx/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/drm > -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 > -ldrm conftest.c -latomic >&5 > /home/and/p2/build/prodx/host/opt/ext-toolchain/bin/../lib/gcc/arm-linux-gnueabihf/7.3.1/../../../../arm-linux-gnueabihf/bin/ld: > cannot find -ldrm -- Bye, Peter Korsgaard From aduskett at gmail.com Mon Feb 7 19:02:37 2022 From: aduskett at gmail.com (Adam Duskett) Date: Mon, 7 Feb 2022 11:02:37 -0800 Subject: [Buildroot] [PATCH 2/3] package/mender/mender.mk: add bootloader-integration inventory script In-Reply-To: <20220207190238.73906-1-aduskett@gmail.com> References: <20220207190238.73906-1-aduskett@gmail.com> Message-ID: <20220207190238.73906-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 33b4611a5f..f462a34fa5 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 Mon Feb 7 19:02:36 2022 From: aduskett at gmail.com (Adam Duskett) Date: Mon, 7 Feb 2022 11:02:36 -0800 Subject: [Buildroot] [PATCH 1/3] package/mender: bump to version 3.2.1 Message-ID: <20220207190238.73906-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..3a7a675341 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 8dd04f963f1816350c5406312969f5b11d45c772274a8c32f7a9da8b2cc36561 3.2.1.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..33b4611a5f 100644 --- a/package/mender/mender.mk +++ b/package/mender/mender.mk @@ -4,7 +4,7 @@ # ################################################################################ -MENDER_VERSION = 3.1.0 +MENDER_VERSION = 3.2.1 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 Mon Feb 7 19:02:38 2022 From: aduskett at gmail.com (Adam Duskett) Date: Mon, 7 Feb 2022 11:02:38 -0800 Subject: [Buildroot] [PATCH 3/3] package/mender-artifact: bump to version 3.7.0 In-Reply-To: <20220207190238.73906-1-aduskett@gmail.com> References: <20220207190238.73906-1-aduskett@gmail.com> Message-ID: <20220207190238.73906-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 andreynech at gmail.com Mon Feb 7 19:44:34 2022 From: andreynech at gmail.com (Andrey Nechypurenko) Date: Mon, 7 Feb 2022 20:44:34 +0100 Subject: [Buildroot] Build error with 2021.11.x In-Reply-To: <87ee4esejl.fsf@dell.be.48ers.dk> References: <87ee4esejl.fsf@dell.be.48ers.dk> Message-ID: Hi Peter, > >>>> icu 69-1 Configuring > > [snip] > > > INTLTOOL_PERL=/usr/bin/perl CFLAGS="-D_LARGEFILE_SOURCE > > -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O3 -g0 > > -D_FORTIFY_SOURCE=1 > > -I/home/and/p2/build/prodx/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/drm" > > LDFLAGS=" -ldrm" ac_cv_lbl_unaligned_fail=yes > > Hmm, is this a pristine upstream Buildroot 2021.11 without any external > packages? You seem to be passing some extra CFLAGS / LDFLAGS to the > configure script. > > Variables like TARGET_CONFIGURE_OPTS are global, so you cannot change it > in a custom package without causing problems, like this: Indeed, I am using an external tree and one custom package did modify TARGET_CONFIGURE_OPTS. Somehow I did not realize that these variables are global. Thank you very much! Really appreciate the help. Best regards, Andrey. From bugzilla at busybox.net Mon Feb 7 22:16:59 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Mon, 07 Feb 2022 22:16:59 +0000 Subject: [Buildroot] [Bug 14556] python-crossbar fails to build In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14556 --- Comment #1 from Emile Cormier --- I can launch Crossbar with the changes I made in my personal fork: https://github.com/ecorm/buildroot/tree/issue-14556-crossbar I will submit a patch once I confirm Crossbar works with our (proprietary) app. -- You are receiving this mail because: You are on the CC list for the bug. From fperrad at gmail.com Mon Feb 7 12:24:23 2022 From: fperrad at gmail.com (Francois Perrad) Date: Mon, 7 Feb 2022 13:24:23 +0100 Subject: [Buildroot] [PATCH] package/zstd: bump to version 1.5.2 Message-ID: <20220207122423.1561946-1-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/zstd/zstd.hash | 4 ++-- package/zstd/zstd.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/zstd/zstd.hash b/package/zstd/zstd.hash index d7d8a448f..eca44b89f 100644 --- a/package/zstd/zstd.hash +++ b/package/zstd/zstd.hash @@ -1,5 +1,5 @@ -# From https://github.com/facebook/zstd/releases/download/v1.5.1/zstd-1.5.1.tar.gz.sha256 -sha256 e28b2f2ed5710ea0d3a1ecac3f6a947a016b972b9dd30242369010e5f53d7002 zstd-1.5.1.tar.gz +# From https://github.com/facebook/zstd/releases/download/v1.5.2/zstd-1.5.2.tar.gz.sha256 +sha256 7c42d56fac126929a6a85dbc73ff1db2411d04f104fae9bdea51305663a83fd0 zstd-1.5.2.tar.gz # License files (locally computed) sha256 2c1a7fa704df8f3a606f6fc010b8b5aaebf403f3aeec339a12048f1ba7331a0b LICENSE diff --git a/package/zstd/zstd.mk b/package/zstd/zstd.mk index 476190e9a..a4bbada82 100644 --- a/package/zstd/zstd.mk +++ b/package/zstd/zstd.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZSTD_VERSION = 1.5.1 +ZSTD_VERSION = 1.5.2 ZSTD_SITE = https://github.com/facebook/zstd/releases/download/v$(ZSTD_VERSION) ZSTD_INSTALL_STAGING = YES ZSTD_LICENSE = BSD-3-Clause or GPL-2.0 -- 2.32.0 From neal.frager at xilinx.com Tue Feb 8 07:15:58 2022 From: neal.frager at xilinx.com (Neal Frager) Date: Tue, 8 Feb 2022 00:15:58 -0700 Subject: [Buildroot] [PATCH 1/2] configs/zynqmp_zcu106: Bump ATF/U-Boot/Linux to Xilinx 2022 Message-ID: <20220208071559.2862411-1-neal.frager@xilinx.com> This patch: - bumps configs/zynqmp_zcu106_defconfig to Xilinx 2022 - bumps ATF to Xilinx v2.6: mainline v2.6 requires patch to build - bumps U-Boot to Xilinx 2022.01: important drivers not in mainline - bumps Linux to Xilinx 5.15: important drivers not in mainline - deletes board/zynqmp/patches directory: patches already in mainline - modifies board/zynqmp/genimage.cfg: U-Boot 2022.01 uses u-boot.itb format - adds extlinux.conf to vfat bootfs - modifies U-Boot to unified xilinx_zynqmp_virt_defconfig (supports all boards) - adds support for SPL pm_cfg_obj.c loading to PMU firmware Signed-off-by: Neal Frager --- board/zynqmp/extlinux.conf | 4 + board/zynqmp/genimage.cfg | 6 +- ...-fix-Remove-GGC-ignore-Warray-bounds.patch | 68 -- ...64-zynqmp-zcu106-fix-SPL-MMC-booting.patch | 52 -- ...2-arm64-zynqmp-Enable-booting-to-ATF.patch | 114 ---- ...ept-an-absolute-path-for-PMUFW_INIT_.patch | 68 -- ...ynqmp-pass-the-PS-init-file-as-a-kco.patch | 175 ----- board/zynqmp/pm_cfg_obj.c | 614 ++++++++++++++++++ board/zynqmp/post-image.sh | 1 + board/zynqmp/readme.txt | 23 +- configs/zynqmp_zcu106_defconfig | 21 +- 11 files changed, 651 insertions(+), 495 deletions(-) create mode 100644 board/zynqmp/extlinux.conf delete mode 100644 board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch delete mode 100644 board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch delete mode 100644 board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch delete mode 100644 board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch delete mode 100644 board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch create mode 100755 board/zynqmp/pm_cfg_obj.c diff --git a/board/zynqmp/extlinux.conf b/board/zynqmp/extlinux.conf new file mode 100644 index 0000000000..15ef707ea2 --- /dev/null +++ b/board/zynqmp/extlinux.conf @@ -0,0 +1,4 @@ +label linux + kernel /Image + devicetree /system.dtb + append console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg index ed202f4550..20d8352c08 100644 --- a/board/zynqmp/genimage.cfg +++ b/board/zynqmp/genimage.cfg @@ -2,11 +2,13 @@ image boot.vfat { vfat { files = { "boot.bin", - "u-boot.bin", - "atf-uboot.ub", + "u-boot.itb", "system.dtb", "Image" } + file extlinux/extlinux.conf { + image = extlinux.conf + } } size = 32M diff --git a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch b/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch deleted file mode 100644 index 0c1a9ba2a4..0000000000 --- a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch +++ /dev/null @@ -1,68 +0,0 @@ -From da003e6ada7d0217fe99dc7c649a731f8ebd3c34 Mon Sep 17 00:00:00 2001 -From: Deepika Bhavnani -Date: Thu, 15 Aug 2019 00:56:46 +0300 -Subject: [PATCH] Coverity fix: Remove GGC ignore -Warray-bounds - -GCC diagnostics were added to ignore array boundaries, instead -of ignoring GCC warning current code will check for array boundaries -and perform and array update only for valid elements. - -Resolves: `CID 246574` `CID 246710` `CID 246651` - -Signed-off-by: Deepika Bhavnani -Change-Id: I7530ecf7a1707351c6ee87e90cc3d33574088f57 - -Backported from: 41af05154abe136938bcfb5f26c969933784bbef -[Adapted to apply on 1.5] - ---- - lib/psci/psci_common.c | 20 ++++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) - -diff --git a/lib/psci/psci_common.c b/lib/psci/psci_common.c -index 2220a745cd6e..6282d992a2f0 100644 ---- a/lib/psci/psci_common.c -+++ b/lib/psci/psci_common.c -@@ -188,21 +188,17 @@ static unsigned int get_power_on_target_pwrlvl(void) - /****************************************************************************** - * Helper function to update the requested local power state array. This array - * does not store the requested state for the CPU power level. Hence an -- * assertion is added to prevent us from accessing the wrong index. -+ * assertion is added to prevent us from accessing the CPU power level. - *****************************************************************************/ - static void psci_set_req_local_pwr_state(unsigned int pwrlvl, - unsigned int cpu_idx, - plat_local_state_t req_pwr_state) - { -- /* -- * This should never happen, we have this here to avoid -- * "array subscript is above array bounds" errors in GCC. -- */ - assert(pwrlvl > PSCI_CPU_PWR_LVL); --#pragma GCC diagnostic push --#pragma GCC diagnostic ignored "-Warray-bounds" -- psci_req_local_pwr_states[pwrlvl - 1][cpu_idx] = req_pwr_state; --#pragma GCC diagnostic pop -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && -+ (cpu_idx < PLATFORM_CORE_COUNT)) { -+ psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx] = req_pwr_state; -+ } - } - - /****************************************************************************** -@@ -228,7 +224,11 @@ static plat_local_state_t *psci_get_req_local_pwr_states(unsigned int pwrlvl, - { - assert(pwrlvl > PSCI_CPU_PWR_LVL); - -- return &psci_req_local_pwr_states[pwrlvl - 1][cpu_idx]; -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && -+ (cpu_idx < PLATFORM_CORE_COUNT)) { -+ return &psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx]; -+ } else -+ return NULL; - } - - /* --- -2.34.0 - diff --git a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch b/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch deleted file mode 100644 index 4d85e1bb12..0000000000 --- a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch +++ /dev/null @@ -1,52 +0,0 @@ -From e5d72ed8339eb05285448aad3c89d21e4d18fd29 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Mon, 26 Feb 2018 09:40:34 +0100 -Subject: [PATCH] arm64: zynqmp: zcu106: fix SPL MMC booting - -The U-Boot SPL generated with the current zcu106 defconfig cannot boot -from MMC: - - [...] - U-Boot SPL 2018.01 (Feb 21 2018 - 17:47:14) - EL Level: EL3 - Trying to boot from MMC1 - sdhci_transfer_data: Error detected in status(0x408020)! - spl_load_image_fat_os: error reading image u-boot.bin, err - -2 - spl_load_image_fat: error reading image u-boot.img, err - -6 - SPL: failed to boot from all boot devices - ### ERROR ### Please RESET the board ### - -Fix by lowering the rpll value. The new value for the RPLL_CTRL -register comes from the current psu_init_gpl.c from the HDF file at -https://github.com/xilinx/hdf-examples/tree/01ad8ea5fd1989abf4ea5a072d019a16cb2bc546/zcu106-zynqmp -(generated by Vivado v2017.4). - -RPLL and sdio1_ref clocks before and after this change: - - - Old values: RPLL 1.36 GHz, sdio1_ref 272 MHz - - New values: RPLL 1.16 GHz, sdio1_ref 233 MHz - -Signed-off-by: Luca Ceresoli -Cc: Michal Simek -Upstream-status: accepted upstream in a different form ---- - - board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -index 4d18abe000ca..e6fa477e53e7 100644 ---- a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -+++ b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -@@ -10,7 +10,7 @@ - static unsigned long psu_pll_init_data(void) - { - psu_mask_write(0xFF5E0034, 0xFE7FEDEFU, 0x7E4E2C62U); -- psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00013C00U); -+ psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00014600U); - psu_mask_write(0xFF5E0030, 0x00000008U, 0x00000008U); - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000001U); - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000000U); --- -2.7.4 - diff --git a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch b/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch deleted file mode 100644 index 487fff6812..0000000000 --- a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 5e3cac50cc981e01d9072241035a8d4162560c71 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Mon, 12 Mar 2018 17:18:38 +0100 -Subject: [PATCH] arm64: zynqmp: Enable booting to ATF - -U-Boot is now able to boot to ARM Trusted Firmware (ATF). The boot -flow is SPL(EL3) loads ATF and full u-boot and jump to ATF(EL3) which -pass control to full u-boot(EL2). This has been tested on zcu106, so -enable it in this defconfig. - -To generate an image that triggers this booting flow, you need to pass -'-O arm-trusted-firmware' to mkimage. - -Signed-off-by: Luca Ceresoli -Signed-off-by: Michal Simek -Backported from upstream: http://git.denx.de/?p=u-boot.git;a=commit;h=5e3cac50cc981e01d9072241035a8d4162560c71 ---- - - configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 + - configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 + - configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 + - configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 + - configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 1 + - configs/xilinx_zynqmp_zcu102_revA_defconfig | 1 + - configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 + - 7 files changed, 7 insertions(+) - -diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig -index c5bfa2b12638..488c72258b0e 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig -index f86dce403a42..5d501eec0edd 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig -@@ -20,6 +20,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig -index 6e947cf56827..6f7eaebd7676 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig -@@ -16,6 +16,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_CMD_MEMTEST=y - CONFIG_SYS_ALT_MEMTEST=y -diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig -index 1c934858c61c..7a3806cba4b5 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig -@@ -17,6 +17,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_CMD_MEMTEST=y - CONFIG_SYS_ALT_MEMTEST=y -diff --git a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig -index e13c7c56f310..e4408f182ca0 100644 ---- a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig -+++ b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig b/configs/xilinx_zynqmp_zcu102_revA_defconfig -index 5b2cd495ee85..b52f6789fd4b 100644 ---- a/configs/xilinx_zynqmp_zcu102_revA_defconfig -+++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig -index e6530fbfe7ff..80592554f682 100644 ---- a/configs/xilinx_zynqmp_zcu102_revB_defconfig -+++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y --- -2.7.4 - diff --git a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch b/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch deleted file mode 100644 index 95ab7b3b75..0000000000 --- a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch +++ /dev/null @@ -1,68 +0,0 @@ -From c7df098a71e05dc81cee818747759e8060b59626 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Mon, 4 Jun 2018 12:21:01 +0200 -Subject: [PATCH] arm64: zynqmp: accept an absolute path for PMUFW_INIT_FILE - -The value of PMUFW_INIT_FILE is prefixed with "$(srctree)/", thus -forcing it to be a relative path inside the U-Boot source tree. Since -the PMUFW is a binary file generated outside of U-Boot, the PMUFW -binary must be copied inside the U-Boot source tree before the -build. - -This generates a few problems: - - * if the source tree is shared among different out-of-tree builds, - they will pollute (and potentially corrupt) each other - * the source tree cannot be read-only - * any buildsystem must add a command to copy the PMUFW binary - * putting an externally-generated binary in the source tree is ugly - as hell - -Avoid these problems by accepting an absolute path for -PMUFW_INIT_FILE. This would be as simple as removing the "$(srctree)/" -prefix, but in order to keep backward compatibility we rather use the -shell and readlink to get the absolute path even when starting from a -relative path. - -Since 'readlink -f' produces an empty string if the file does not -exist, we also add a check to ensure the file configured in -PMUFW_INIT_FILE exists. Otherwise the build would exit successfully, -but produce a boot.bin without PMUFW as if PMUFW_INIT_FILE were empty. - -Tested in the 12 possible combinations of: - - PMUFW_INIT_FILE empty, relative, absolute, non-existing - - building in-tree, in subdir, in other directory - -Signed-off-by: Luca Ceresoli -Cc: Michal Simek -Cc: Simon Glass -Cc: Emmanuel Vadot -Signed-off-by: Michal Simek -Backported from upstream: https://git.denx.de/?p=u-boot.git;a=commit;h=c7df098a71e05dc81cee818747759e8060b59626 ---- - scripts/Makefile.spl | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl -index ef018b5b4056..252f13826d4c 100644 ---- a/scripts/Makefile.spl -+++ b/scripts/Makefile.spl -@@ -167,8 +167,14 @@ ifdef CONFIG_ARCH_ZYNQ - MKIMAGEFLAGS_boot.bin = -T zynqimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) - endif - ifdef CONFIG_ARCH_ZYNQMP -+ifneq ($(CONFIG_PMUFW_INIT_FILE),"") -+spl/boot.bin: zynqmp-check-pmufw -+zynqmp-check-pmufw: FORCE -+ ( cd $(srctree) && test -r $(CONFIG_PMUFW_INIT_FILE) ) \ -+ || ( echo "Cannot read $(CONFIG_PMUFW_INIT_FILE)" && false ) -+endif - MKIMAGEFLAGS_boot.bin = -T zynqmpimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) \ -- -n $(srctree)/$(CONFIG_PMUFW_INIT_FILE) -+ -n "$(shell cd $(srctree); readlink -f $(CONFIG_PMUFW_INIT_FILE))" - endif - - spl/boot.bin: $(obj)/u-boot-spl.bin FORCE --- -2.7.4 - diff --git a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch b/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch deleted file mode 100644 index b32e162780..0000000000 --- a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch +++ /dev/null @@ -1,175 +0,0 @@ -From 4c9d54ab5a41d65000c8d249b6fb1b76056f1812 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Wed, 20 Jun 2018 12:11:50 +0200 -Subject: [PATCH] arm/arm64: zynq/zynqmp: pass the PS init file as a kconfig - variable - -U-Boot needs to link ps7_init_gpl.c on Zynq or psu_init_gpl.c on -ZynqMP (PS init for short). The current logic to locate this file for -both platforms is: - - 1. if a board-specific file exists in - board/xilinx/zynq[mp]/$(CONFIG_DEFAULT_DEVICE_TREE)/ps?_init_gpl.c - then use it - 2. otherwise use board/xilinx/zynq/ps?_init_gpl.c - -In the latter case the file does not exist in the U-Boot sources and -must be copied in the source tree from the outside before starting the -build. This is typical when it is generated from Xilinx tools while -developing a custom hardware. However making sure that a -board-specific file is _not_ found (and used) requires some trickery -such as removing or overwriting all PS init files (e.g.: the current -meta-xilinx yocto layer [0]). - -This generates a few problems: - - * if the source tree is shared among different out-of-tree builds, - they will pollute (and potentially corrupt) each other - * the source tree cannot be read-only - * any buildsystem must add a command to copy the PS init file binary - * overwriting or deleting files in the source tree is ugly as hell - -Simplify usage by allowing to pass the path to the desired PS init -file in kconfig variable XILINX_PS_INIT_FILE. It can be an absolute -path or relative to $(srctree). If the variable is set, the -user-specified file will always be used without being copied -around. If the the variable is left empty, for backward compatibility -fall back to the old behaviour. - -Since the issue is the same for Zynq and ZynqMP, add one kconfig -variable in a common place and use it for both. - -Also use the new kconfig help text to document all the ways to give -U-Boot the PS init file. - -Build-tested with all combinations of: - - platform: zynq or zynqmp - - PS init file: from XILINX_PS_INIT_FILE (absolute, relative path, - non-existing), in-tree board-specific, in board/xilinx/zynq[mp]/ - - building in-tree, in subdir, in other directory - -[0] https://github.com/Xilinx/meta-xilinx/blob/b2f74cc7fe5c4881589d5e440a17cb51fc66a7ab/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init.inc#L9 - -Signed-off-by: Luca Ceresoli -Cc: Albert Aribaud -Cc: Michal Simek -Cc: Nathan Rossi -Backported from upstream: https://git.denx.de/?p=u-boot.git;a=commit;h=6da4f67ad09cd8b311d77b2b04e557b7ef65b56c ---- - arch/arm/Kconfig | 1 + - board/xilinx/Kconfig | 41 +++++++++++++++++++++++++++++++++++++++++ - board/xilinx/zynq/Makefile | 10 +++++++++- - board/xilinx/zynqmp/Makefile | 10 +++++++++- - 4 files changed, 60 insertions(+), 2 deletions(-) - create mode 100644 board/xilinx/Kconfig - -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 22234cde2ab6..e04979d0ef7e 100644 ---- a/arch/arm/Kconfig -+++ b/arch/arm/Kconfig -@@ -1293,4 +1293,5 @@ source "board/technologic/ts4600/Kconfig" - source "board/vscom/baltos/Kconfig" - source "board/woodburn/Kconfig" - source "board/work-microwave/work_92105/Kconfig" -+source "board/xilinx/Kconfig" - source "board/zipitz2/Kconfig" - - source "arch/arm/Kconfig.debug" -diff --git a/board/xilinx/Kconfig b/board/xilinx/Kconfig -new file mode 100644 -index 000000000000..aa3fa061edef ---- /dev/null -+++ b/board/xilinx/Kconfig -@@ -0,0 +1,41 @@ -+# Copyright (c) 2018, Luca Ceresoli -+# -+# SPDX-License-Identifier: GPL-2.0 -+ -+if ARCH_ZYNQ || ARCH_ZYNQMP -+ -+config XILINX_PS_INIT_FILE -+ string "Zynq/ZynqMP PS init file(s) location" -+ help -+ On Zynq and ZynqMP U-Boot SPL (or U-Boot proper if -+ ZYNQMP_PSU_INIT_ENABLED is set) is responsible for some -+ basic initializations, such as enabling peripherals and -+ configuring pinmuxes. The PS init file (called -+ psu_init_gpl.c on ZynqMP, ps7_init_gpl.c for Zynq-7000) -+ contains the code for such initializations. -+ -+ U-Boot contains PS init files for some boards, but each of -+ them describes only one specific configuration. Users of a -+ different board, or needing a different configuration, can -+ generate custom files using the Xilinx development tools. -+ -+ There are three ways to give a PS init file to U-Boot: -+ -+ 1. Set this variable to the path, either relative to the -+ source tree or absolute, where the psu_init_gpl.c or -+ ps7_init_gpl.c file is located. U-Boot will build this -+ file. -+ -+ 2. If you leave an empty string here, U-Boot will use -+ board/xilinx/zynq/$(CONFIG_DEFAULT_DEVICE_TREE)/ps7_init_gpl.c -+ for Zynq-7000, or -+ board/xilinx/zynqmp/$(CONFIG_DEFAULT_DEVICE_TREE)/psu_init_gpl.c -+ for ZynqMP. -+ -+ 3. If the above file does not exist, U-Boot will use -+ board/xilinx/zynq/ps7_init_gpl.c for Zynq-7000, or -+ board/xilinx/zynqmp/psu_init_gpl.c for ZynqMP. This file -+ is not provided by U-Boot, you have to copy it there -+ before the build. -+ -+endif -diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile -index 5a76a26720cd..03ad5f0532ee 100644 ---- a/board/xilinx/zynq/Makefile -+++ b/board/xilinx/zynq/Makefile -@@ -5,10 +5,18 @@ - - obj-y := board.o - --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE)) -+init-objs := ps_init_gpl.o -+spl/board/xilinx/zynq/ps_init_gpl.o board/xilinx/zynq/ps_init_gpl.o: $(PS_INIT_FILE) -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ -+endif - -+ifeq ($(init-objs),) -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/ps7_init_gpl.c),\ - $(hw-platform-y)/ps7_init_gpl.o) -+endif - - ifeq ($(init-objs),) - ifneq ($(wildcard $(srctree)/$(src)/ps7_init_gpl.c),) -diff --git a/board/xilinx/zynqmp/Makefile b/board/xilinx/zynqmp/Makefile -index 05ccd25dcef3..960b81fc5853 100644 ---- a/board/xilinx/zynqmp/Makefile -+++ b/board/xilinx/zynqmp/Makefile -@@ -5,10 +5,18 @@ - - obj-y := zynqmp.o - --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE)) -+init-objs := ps_init_gpl.o -+spl/board/xilinx/zynqmp/ps_init_gpl.o board/xilinx/zynqmp/ps_init_gpl.o: $(PS_INIT_FILE) -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ -+endif - -+ifeq ($(init-objs),) -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/psu_init_gpl.c),\ - $(hw-platform-y)/psu_init_gpl.o) -+endif - - ifeq ($(init-objs),) - ifneq ($(wildcard $(srctree)/$(src)/psu_init_gpl.c),) --- -2.7.4 - diff --git a/board/zynqmp/pm_cfg_obj.c b/board/zynqmp/pm_cfg_obj.c new file mode 100755 index 0000000000..7566b3236a --- /dev/null +++ b/board/zynqmp/pm_cfg_obj.c @@ -0,0 +1,614 @@ +/****************************************************************************** +* Copyright (c) 2017 - 2020 Xilinx, Inc. All rights reserved. +* SPDX-License-Identifier: MIT +******************************************************************************/ + + +#include "xil_types.h" +#include "pm_defs.h" + +#define PM_CONFIG_MASTER_SECTION_ID 0x101U +#define PM_CONFIG_SLAVE_SECTION_ID 0x102U +#define PM_CONFIG_PREALLOC_SECTION_ID 0x103U +#define PM_CONFIG_POWER_SECTION_ID 0x104U +#define PM_CONFIG_RESET_SECTION_ID 0x105U +#define PM_CONFIG_SHUTDOWN_SECTION_ID 0x106U +#define PM_CONFIG_SET_CONFIG_SECTION_ID 0x107U +#define PM_CONFIG_GPO_SECTION_ID 0x108U + +#define PM_SLAVE_FLAG_IS_SHAREABLE 0x1U +#define PM_MASTER_USING_SLAVE_MASK 0x2U + +#define PM_CONFIG_GPO1_MIO_PIN_34_MAP (1U << 10U) +#define PM_CONFIG_GPO1_MIO_PIN_35_MAP (1U << 11U) +#define PM_CONFIG_GPO1_MIO_PIN_36_MAP (1U << 12U) +#define PM_CONFIG_GPO1_MIO_PIN_37_MAP (1U << 13U) + +#define PM_CONFIG_GPO1_BIT_2_MASK (1U << 2U) +#define PM_CONFIG_GPO1_BIT_3_MASK (1U << 3U) +#define PM_CONFIG_GPO1_BIT_4_MASK (1U << 4U) +#define PM_CONFIG_GPO1_BIT_5_MASK (1U << 5U) + +#define SUSPEND_TIMEOUT 0xFFFFFFFFU + + +#define PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK 0x00000001 +#define PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK 0x00000100 +#define PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK 0x00000200 + + + +#if defined (__ICCARM__) +#pragma language=save +#pragma language=extended +#endif +#if defined (__GNUC__) + const u32 XPm_ConfigObject[] __attribute__((used, section(".sys_cfg_data"))) = +#elif defined (__ICCARM__) +#pragma location = ".sys_cfg_data" +__root const u32 XPm_ConfigObject[] = +#endif +{ + /**********************************************************************/ + /* HEADER */ + 1, /* Number of remaining words in the header */ + 8, /* Number of sections included in config object */ + /**********************************************************************/ + /* MASTER SECTION */ + PM_CONFIG_MASTER_SECTION_ID, /* Master SectionID */ + 3U, /* No. of Masters*/ + + NODE_APU, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_0, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_1, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Wake permissions */ + + + /**********************************************************************/ + /* SLAVE SECTION */ + + + PM_CONFIG_SLAVE_SECTION_ID, /* Section ID */ + 49, /* Number of slaves */ + + NODE_OCM_BANK_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TCM_0_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_0_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_1_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TCM_1_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_L2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU_PP_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU_PP_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_USB_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_USB_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_TTC_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SATA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_ETH_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_UART_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_UART_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SPI_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_SPI_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_I2C_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_I2C_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SD_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_SD_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_DP, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GDMA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_ADMA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_NAND, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_QSPI, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPIO, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_CAN_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_CAN_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_EXTERN, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_DDR, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_IPI_APU, + 0U, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_0, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_1, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_PCIE, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_PCAP, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_RTC, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_VCU, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_PL, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + + /**********************************************************************/ + /* PREALLOC SECTION */ + + PM_CONFIG_PREALLOC_SECTION_ID, /* Preallaoc SectionID */ + 3U, /* No. of Masters*/ + +/* Prealloc for psu_cortexa53_0 */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, + 12, + NODE_DDR, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_L2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_3, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_SD_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_QSPI, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_PL, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_APU, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_0 */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + 14, + NODE_TCM_0_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_0_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_DDR, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_3, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_SD_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_QSPI, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_PL, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_ADMA, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_1 */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + 3, + NODE_TCM_1_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_1_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /**********************************************************************/ + /* POWER SECTION */ + + PM_CONFIG_POWER_SECTION_ID, /* Power Section ID */ + 4U, /* Number of power nodes */ + + NODE_APU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_RPU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_FPD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_PLD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + + /**********************************************************************/ + /* RESET SECTION */ + + PM_CONFIG_RESET_SECTION_ID, /* Reset Section ID */ + 120U, /* Number of resets */ + + XILPM_RESET_PCIE_CFG, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_BRIDGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_CTRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRF, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GDMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SATA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APU_L2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DDR, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SOFT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_QSPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_NAND, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ADMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOU_CC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TIMESTAMP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R50, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R51, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_AMBA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_OCM, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_PGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RTC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SYSMON, 0, + XILPM_RESET_AFI_FM6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_LPD_SWDT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_FPD, PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + XILPM_RESET_RPU_DBG1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_DBG0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_VPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_7, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_8, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_9, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_10, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_11, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_12, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_13, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_14, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_15, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_16, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_17, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_18, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_19, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_20, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_21, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_22, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_23, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_24, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_25, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_26, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_27, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_28, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_29, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_30, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_31, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_LS, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PS_ONLY, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_92, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_93, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_94, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_95, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + + /**********************************************************************/ + /* SET CONFIG SECTION */ + PM_CONFIG_SET_CONFIG_SECTION_ID, /* Section ID */ + 0, /* Permissions to set config */ + /**********************************************************************/ + /* SHUTDOWN SECTION */ + PM_CONFIG_SHUTDOWN_SECTION_ID, /* Section ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* System Shutdown/Restart Permission */ + + /**********************************************************************/ + /* GPO SECTION */ + PM_CONFIG_GPO_SECTION_ID, /* GPO Section ID */ + PM_CONFIG_GPO1_BIT_2_MASK | + PM_CONFIG_GPO1_MIO_PIN_34_MAP | + PM_CONFIG_GPO1_MIO_PIN_35_MAP | + PM_CONFIG_GPO1_MIO_PIN_36_MAP | + PM_CONFIG_GPO1_MIO_PIN_37_MAP | + 0, /* State of GPO pins */ +}; +#if defined (__ICCARM__) +#pragma language=restore +#endif diff --git a/board/zynqmp/post-image.sh b/board/zynqmp/post-image.sh index b2b99fed01..a9f29b3175 100755 --- a/board/zynqmp/post-image.sh +++ b/board/zynqmp/post-image.sh @@ -10,4 +10,5 @@ FIRST_DT=$(sed -nr \ [ -z "${FIRST_DT}" ] || ln -fs ${FIRST_DT}.dtb ${BINARIES_DIR}/system.dtb +cp board/zynqmp/extlinux.conf output/images/extlinux.conf support/scripts/genimage.sh -c board/zynqmp/genimage.cfg diff --git a/board/zynqmp/readme.txt b/board/zynqmp/readme.txt index da37f4ccc9..0dc1793e03 100644 --- a/board/zynqmp/readme.txt +++ b/board/zynqmp/readme.txt @@ -1,10 +1,19 @@ -******************************** -Xilinx ZCU106 board - ZynqMP SoC -******************************** +****************************************** +Xilinx ZCU102 / ZCU106 boards - ZynqMP SoC +****************************************** + +This document describes the Buildroot support for the ZCU102 and ZCU106 +boards by Xilinx, based on the Zynq UltraScale+ MPSoC (aka ZynqMP). +It has been tested with the ZCU102 and ZCU106 production boards. + +Evaluation board features can be found here with the links below. + +ZCU102: +https://www.xilinx.com/products/boards-and-kits/zcu102.html + +ZCU106: +https://www.xilinx.com/products/boards-and-kits/zcu106.html -This document describes the Buildroot support for the ZCU106 board by -Xilinx, based on the Zynq UltraScale+ MPSoC (aka ZynqMP). It has been -tested with the EK-U1-ZCU106-ES2 pre-production board. How to build it =============== @@ -32,7 +41,7 @@ After building, you should get a tree like this: +-- rootfs.ext4 -> rootfs.ext2 +-- sdcard.img +-- system.dtb -> zynqmp-zcu106-revA.dtb - +-- u-boot.bin + +-- u-boot.itb `-- zynqmp-zcu106-revA.dtb How to write the SD card diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index bee7c1daf7..1b951b3313 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -1,34 +1,37 @@ BR2_aarch64=y -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.15" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.6" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA" +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2022.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/53fdb7b6c92860ceb0ec5fd14deee302f4a84269/bin/pmufw-zcu106-default-v2017.4.bin" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/v2021.2/bin/pmufw-v2021.2.bin" +BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/pm_cfg_obj.c" +BR2_TARGET_UBOOT_FORMAT_ITB=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -- 2.17.1 From neal.frager at xilinx.com Tue Feb 8 07:15:59 2022 From: neal.frager at xilinx.com (Neal Frager) Date: Tue, 8 Feb 2022 00:15:59 -0700 Subject: [Buildroot] [PATCH 2/2] Add configs/zynqmp_zcu102_defconfig In-Reply-To: <20220208071559.2862411-1-neal.frager@xilinx.com> References: <20220208071559.2862411-1-neal.frager@xilinx.com> Message-ID: <20220208071559.2862411-2-neal.frager@xilinx.com> This patch: - adds support for Xilinx ZCU102 evaluation board - ZCU102 features can be found here: - https://www.xilinx.com/products/boards-and-kits/zcu102.html Signed-off-by: Neal Frager --- configs/zynqmp_zcu102_defconfig | 37 +++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 configs/zynqmp_zcu102_defconfig diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig new file mode 100644 index 0000000000..65a32d11d0 --- /dev/null +++ b/configs/zynqmp_zcu102_defconfig @@ -0,0 +1,37 @@ +BR2_aarch64=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.15" +BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.6" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/Xilinx/u-boot-xlnx.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2022.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" +BR2_TARGET_UBOOT_ZYNQMP=y +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/v2021.2/bin/pmufw-v2021.2.bin" +BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/pm_cfg_obj.c" +BR2_TARGET_UBOOT_FORMAT_ITB=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y -- 2.17.1 From thomas.petazzoni at bootlin.com Tue Feb 8 07:25:58 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 08 Feb 2022 07:25:58 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-02-07 Message-ID: <20220208072603.4DB1C60888@smtp3.osuosl.org> Hello, Autobuild statistics for 2022-02-07 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 45 | 7 | 0 | 52 | 2021.11.x | 20 | 1 | 0 | 21 | master | 35 | 49 | 2 | 86 | Classification of failures by reason for master ----------------------------------------------- host-libselinux-3.3 | 13 bluez5_utils-5.63 | 11 host-python-docutils-0.15.2 | 5 gerbera-1.9.2 | 4 ace-7.0.1 | 2 bird-2.0.8 | 2 libuwsc | 2 belle-sip-4.4.8 | 1 host-grpc-1.43.0 | 1 libuhttpd-3.14.1 | 1 mpd-0.23.5 | 1 openocd-0.11.0 | 1 pcsc-lite-1.9.5 | 1 perl-5.34.0 | 1 poppler-21.12.0 | 1 postgresql-14.1 | 1 qt5base-53a047c212af7fbded6... | 1 rtorrent-0.9.8 | 1 unknown | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips | ace-7.0.1 | NOK | http://autobuild.buildroot.net/results/a10dae2e6e5f07590bcc1526216a4d41ae420fc7 | mips64el | ace-7.0.1 | NOK | http://autobuild.buildroot.net/results/13376405e313da112f546076a10859e60631d5d5 | xtensa | belle-sip-4.4.8 | NOK | http://autobuild.buildroot.net/results/67ffdea04cd847685c097551c6bb397ddac1b2d7 | mips64el | bird-2.0.8 | NOK | http://autobuild.buildroot.net/results/c633ec702afb8c4f63ab1807250e469904ece9b3 | nds32le | bird-2.0.8 | NOK | http://autobuild.buildroot.net/results/220501962e48cd7ddb5d5e849c41e5700e085177 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/fef25236f2fb1de7d2bab8c72cecfdbd760bf5e2 | sparc64 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/8d6ee2e834e5925bccce9e4cf302a8d7f161ba65 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/b2978749181775f71045e57746484e315834e2cc | or1k | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/ea576f4bab0f321a412645afbb70457a5d7595c1 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/8221e8684b6f4e7de254bc944df4e9194f53a138 | arc | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/4d2d72b006d42fb3ed5fd9dfce1631056cc11a3a | m68k | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/ccfeabf9509d070d7641f824bdeadd9bd1cfa995 | nios2 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/bf1ee71708644842b9b59b03f419b087358b8f22 | powerpc | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/98cf0818c6b5a8d2d347437a979ab08441803b4d | xtensa | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/d40e351c1f02bf6530aa9ffac170b6042e93f501 | powerpc64 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/ccb141f8ff040ebd2515cc3d3137ed6db9a35bc1 | powerpc64le | gerbera-1.9.2 | NOK | http://autobuild.buildroot.net/results/4a2fc2094ccb52cbaf4977140c78c3cc75b5d068 | xtensa | gerbera-1.9.2 | NOK | http://autobuild.buildroot.net/results/d9fae4b220b87be1c778e1228d7ed4adbbc1c278 | s390x | gerbera-1.9.2 | NOK | http://autobuild.buildroot.net/results/ac9eb751c853031a7c4eec525aa5f4a882320bd1 | riscv64 | gerbera-1.9.2 | NOK | http://autobuild.buildroot.net/results/2bfff4fd24fe07051cc07622eb6daa8312164f66 | aarch64 | host-grpc-1.43.0 | NOK | http://autobuild.buildroot.net/results/96de2e7560d8d985a4079e53f0a2c88545be745d | microblazeel | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/c53c52d3d233dda1766a04c0ff3a4081da947b09 | sh4 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/119efa9e934d1661b577e19d3dae3b28a494db3a | x86_64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/1e82a8b02a1ce56169cd8d6f48d2c7e161950752 | powerpc64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/73ff5f4b71caf6ee05d36a4e3b22ec3796393230 | powerpc | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/662524038ce5ae447821afd7e6ca41552036da86 | xtensa | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/6384c41865b35557f4559277bfb9b2b60654ab94 | s390x | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/7bb924e1c14989d57ab65cf9d4035ba89cd37cb0 | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/a7bdf69b603af0778264b9fce909569ef6a0a1de | riscv64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/c63b3a1aa07f000518239dcb86755f3482e2eaf6 | microblazeel | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/bae6af7f80c183ab282891e17c11ec6f834174b4 | mips64el | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/95d1afed62cddd4d911436bfa1dde52e3164edc3 | i586 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/5f7346d120ca9601c0cd521a8f7115898a218924 | xtensa | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/c94fcb109cce9ca0bed9d5e0cc077253f9bb39a5 | powerpc64le | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/b82682d3f0be0cdd9802a373faab651876f28ac3 | arm | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/bfec58eb8215d08c6fb2a681398ab6c0c121cc75 | powerpc | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/9c65891a4041db1c57cf8966cc62e5fbfa5d81e5 | mips | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/40b1274b1019eae80e1a6cffae4b46b3c9a0f814 | arm | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/61b863777ca9a417e7b9b0d20065d69e81f368e7 | arm | libuhttpd-3.14.1 | NOK | http://autobuild.buildroot.net/results/a3a970a6398dcb0e4e03f4277f1a50c6b5eff7bd | aarch64 | libuwsc | TIM | http://autobuild.buildroot.net/results/14f2e3517d432ecfba7c0c30b0b2d039007a611e | microblazeel | libuwsc | TIM | http://autobuild.buildroot.net/results/30cad6e8afb864fdf4e19f58ef83f22b5a77d15c | xtensa | mpd-0.23.5 | NOK | http://autobuild.buildroot.net/results/032aaff121fb114f388c67dbca3ad2b02f670e38 | sparc | openocd-0.11.0 | NOK | http://autobuild.buildroot.net/results/4a27a769bb3cdf78643c3049b87d792178d6512c | ORPH sparc | pcsc-lite-1.9.5 | NOK | http://autobuild.buildroot.net/results/b59b30cbe0e27399db5c7586f369104e68a1589a | ORPH powerpc | perl-5.34.0 | NOK | http://autobuild.buildroot.net/results/0e0291ed7c9db636c1e6b72e5e8f7d7f04bf1563 | xtensa | poppler-21.12.0 | NOK | http://autobuild.buildroot.net/results/0f2a841b03462dd34ccf4be489b76a2a12550e54 | arm | postgresql-14.1 | NOK | http://autobuild.buildroot.net/results/e4b59fecd2a5bcda8103ddf4eae3dbd78fe3b896 | riscv32 | qt5base-53a047c212af7fbded6... | NOK | http://autobuild.buildroot.net/results/3b1b1b2f97d5645cacbd1e021b18006bb765362f | sh4 | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/5d614713e047e57558ef785d6c3b497006deb5c5 | ORPH arm | unknown | NOK | http://autobuild.buildroot.net/results/b51b1c608b050cd2982abe58a3eff68c4756be0b | Classification of failures by reason for 2021.02.x -------------------------------------------------- python-pybind-2.6.1 | 2 zeromq-4.3.4 | 2 gvfs-1.44.1 | 1 host-sentry-cli-1.57.0 | 1 rocksdb-6.13.3 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- aarch64 | gvfs-1.44.1 | NOK | http://autobuild.buildroot.net/results/b4dfbb94f8cbfe40b3a566b90d87cc132a309099 | ORPH arm | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/abec1ecbfa3a7c56c1dddf03c641b66463124840 | aarch64_be | python-pybind-2.6.1 | NOK | http://autobuild.buildroot.net/results/0c77ee2af362301fc17eb641931436c4cb87f71c | riscv64 | python-pybind-2.6.1 | NOK | http://autobuild.buildroot.net/results/67ec201c11d4dfa2d491c0d8f23a5cab9d840956 | m68k | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/e74b26aea0be9f3bd6be31d3d923da30ac408f39 | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/fd9d319726f6ac85892f04ffc480bbcce00b3f9a | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/8d51430b95f864e53e5223b72b9761331f9b3f95 | Classification of failures by reason for 2021.11.x -------------------------------------------------- zeromq-4.3.4 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/47c0738e024ff2c2c4c65a0ea034c97454343b2f | Gitlab CI results for 2022-02-07 ================================ Detail of runtime-test failures for master ------------------------------------------ runtime-test | link to the job | orph? --------------------------+---------------------------------------------------------------+------ TestIPythonPy3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2060952123 | ORPH TestIso9660Grub2Hybrid | https://gitlab.com/buildroot.org/buildroot/-/jobs/2060952067 | ORPH TestLuaHttp | https://gitlab.com/buildroot.org/buildroot/-/jobs/2060952145 | ORPH TestLuaLuasyslog | https://gitlab.com/buildroot.org/buildroot/-/jobs/2060952178 | ORPH TestLxc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2060952181 | ORPH TestOci | https://gitlab.com/buildroot.org/buildroot/-/jobs/2060952078 | ORPH TestPerllibwwwperl | https://gitlab.com/buildroot.org/buildroot/-/jobs/2060952198 | ORPH TestPythonPy2Pynacl | https://gitlab.com/buildroot.org/buildroot/-/jobs/2060952264 | ORPH TestPythonPy2Pyyaml | https://gitlab.com/buildroot.org/buildroot/-/jobs/2060952270 | ORPH TestPythonPy3Automat | https://gitlab.com/buildroot.org/buildroot/-/jobs/2060952222 | ORPH TestPythonPy3Crossbar | https://gitlab.com/buildroot.org/buildroot/-/jobs/2060952238 | ORPH TestPythonPy3Pyyaml | https://gitlab.com/buildroot.org/buildroot/-/jobs/2060952271 | ORPH TestPythonPy3Treq | https://gitlab.com/buildroot.org/buildroot/-/jobs/2060952277 | ORPH TestPythonPy3Twisted | https://gitlab.com/buildroot.org/buildroot/-/jobs/2060952278 | ORPH TestPythonPy3Txtorcon | https://gitlab.com/buildroot.org/buildroot/-/jobs/2060952280 | ORPH TestRust | https://gitlab.com/buildroot.org/buildroot/-/jobs/2060952289 | ORPH TestRustBin | https://gitlab.com/buildroot.org/buildroot/-/jobs/2060952290 | ORPH -- http://autobuild.buildroot.net From davis.roman84 at gmail.com Tue Feb 8 07:54:16 2022 From: davis.roman84 at gmail.com (Davis Roman) Date: Tue, 8 Feb 2022 02:54:16 -0500 Subject: [Buildroot] how to install host package's .pc file into host/lib/pkgconfig Message-ID: Hello, I'm trying to build a host package and I would like for its corresponding .pc file to be copied into host/lib/pkgconfig Currently the manual says I should set LIBFOO_INSTALL_STAGING = YES for target packages but what should I use for host packages? Thank you, Davis -------------- next part -------------- An HTML attachment was scrubbed... URL: From paguilar at paguilar.org Tue Feb 8 09:19:13 2022 From: paguilar at paguilar.org (Pedro Aguilar) Date: Tue, 8 Feb 2022 10:19:13 +0100 (CET) Subject: [Buildroot] [PATCH v1 1/1] package/guile: Guile 3.0.7 requires libiconv. In-Reply-To: <20220206103040.1704ef40@windsurf> References: <20220206084334.1900252-1-paguilar@paguilar.org> <20220206103040.1704ef40@windsurf> Message-ID: <784201902.75253.1644311953307@email.ionos.it> Hi Thomas, I added libiconv based on the error I got while building. The attchmnt has the output error and the config file I used. However, I was not aware of BR2_ENABLE_LOCALE, so I selected it and removed libiconv and it also built correctly. The other config file shows this configuration. May be a correct solution could be to add the dependency on BR2_ENABLE_LOCALE. But if it's not present, enable libiconv. Thanks. Regards, > On 06/02/2022 10:30 Thomas Petazzoni wrote: > > > On Sun, 6 Feb 2022 09:43:34 +0100 > Pedro Aguilar wrote: > > > This fixes the error reported in the daily results. > > > > Signed-off-by: Pedro Aguilar > > libiconv is normally needed only on toolchains that don't have > BR2_ENABLE_LOCALE. But the build failure of guile happens with glibc > toolchains, so it doesn't make much sense. > > Are you sure that your analysis of the problem is correct? Could you > provide some more details? > > Thanks a lot! > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com Pedro Aguilar https://paguilar.org -------------- next part -------------- Making all in libguile SNARF filesys.x SNARF fports.x SNARF generalized-vectors.x SNARF goops.x SNARF gsubr.x SNARF guardians.x SNARF hash.x SNARF hashtab.x SNARF hooks.x filesys.c:28: warning: "_LARGEFILE64_SOURCE" redefined 28 | #define _LARGEFILE64_SOURCE /* ask for stat64 etc */ | : note: this is the location of the previous definition fports.c:22: warning: "_LARGEFILE64_SOURCE" redefined 22 | #define _LARGEFILE64_SOURCE /* ask for stat64 etc */ | : note: this is the location of the previous definition In file included from goops.c:46: ports-internal.h:26:10: fatal error: iconv.h: No such file or directory 26 | #include | ^~~~~~~~~ compilation terminated. SNARF i18n.x make[4]: *** [Makefile:4541: goops.x] Error 1 make[4]: *** Waiting for unfinished jobs.... In file included from fports.c:63: ports-internal.h:26:10: fatal error: iconv.h: No such file or directory 26 | #include | ^~~~~~~~~ compilation terminated. In file included from filesys.c:95: ports-internal.h:26:10: fatal error: iconv.h: No such file or directory 26 | #include | ^~~~~~~~~ compilation terminated. make[4]: *** [Makefile:4541: fports.x] Error 1 make[4]: *** [Makefile:4541: filesys.x] Error 1 make[3]: *** [Makefile:2044: all-recursive] Error 1 make[2]: *** [Makefile:1930: all] Error 2 make[1]: *** [package/pkg-generic.mk:292: /home/projects/br/build_qemu_x86/build/guile-3.0.7/.stamp_built] Error 2 make: *** [Makefile:23: _all] Error 2 -------------- next part -------------- A non-text attachment was scrubbed... Name: guile_enable_locale.config Type: application/octet-stream Size: 113072 bytes Desc: not available URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: guile_enable_libiconv.config Type: application/octet-stream Size: 113355 bytes Desc: not available URL: From nealf at xilinx.com Tue Feb 8 10:07:43 2022 From: nealf at xilinx.com (Neal Frager) Date: Tue, 8 Feb 2022 10:07:43 +0000 Subject: [Buildroot] [PATCH 1/2] configs/zynqmp_zcu106: Bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <20220208071559.2862411-1-neal.frager@xilinx.com> References: <20220208071559.2862411-1-neal.frager@xilinx.com> Message-ID: Hi everyone, Please disregard this patch set for now. I thought of a better way to handle the pm_cfg_obj.c file without adding it permanently to buildroot. I will be sending an updated patch set shortly using the following configuration: BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="https://raw.githubusercontent.com/Xilinx/embeddedsw/xlnx_rel_v2021.2/lib/sw_apps/zynqmp_fsbl/misc/pm_cfg_obj.c" Everything else will remain the same. Best regards, Neal Frager Xilinx From giulio.benetti at benettiengineering.com Tue Feb 8 10:18:02 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 8 Feb 2022 11:18:02 +0100 Subject: [Buildroot] [PATCH 1/2] configs/zynqmp_zcu106: Bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: References: <20220208071559.2862411-1-neal.frager@xilinx.com> Message-ID: <69efa9da-ae55-6795-8724-ed7105083924@benettiengineering.com> Hi Neal, On 08/02/22 11:07, Neal Frager wrote: > Hi everyone, > > Please disregard this patch set for now. I thought of a better way to handle the pm_cfg_obj.c file without adding it permanently to buildroot. I will be sending an updated patch set shortly using the following configuration: > > BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="https://raw.githubusercontent.com/Xilinx/embeddedsw/xlnx_rel_v2021.2/lib/sw_apps/zynqmp_fsbl/misc/pm_cfg_obj.c" Ok, I was about building your patches :-) Please send as v2, so when creating patches add -v2: # git format-patch -s -M -o outgoing -2 -v2 then add 3 dashes before the actual 3 dashes in the produced patches and described what is changed between V1 version to V2 like: --- V1->V2: * moved BR2_TARGET_UBOOT_ZYNQMP_PM_CFG to an URL instead of local patch as suggested by Giulio * other eventual modifies --- And if you send then a v3, then keep previous V1->V2 and add: --- V1->V2: * moved BR2_TARGET_UBOOT_ZYNQMP_PM_CFG to an URL instead of local patch as suggested by Giulio V2->V3: * modified .... --- Best regards -- Giulio Benetti Benetti Engineering sas From nealf at xilinx.com Tue Feb 8 10:19:47 2022 From: nealf at xilinx.com (Neal Frager) Date: Tue, 8 Feb 2022 10:19:47 +0000 Subject: [Buildroot] [PATCH 1/2] configs/zynqmp_zcu106: Bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: References: <20220208071559.2862411-1-neal.frager@xilinx.com> Message-ID: Hi Luca, Perhaps you can help with this step. It seems that the BR2_TARGET_UBOOT_ZYNQMP_PM_CFG configuration requires the pm_cfg_obj.c file to already be downloaded to the local machine. One solution which I have already implemented is to add the pm_cfg_obj.c file to the board/zynqmp directory. But I would imagine a better solution would be to download it off of the Xilinx github, so that users can always get the correct version should they want to use versions of software which are not pre-defined in the defconfig. Could you help us with adding support to the BR2_TARGET_UBOOT_ZYNQMP_PM_CFG configuration to enable the ability to download the pm_cfg_obj.c file to the dl directory like we do for the pmufw.bin file? BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="https://github.com/Xilinx/embeddedsw/blob/xlnx_rel_v2021.2/lib/sw_apps/zynqmp_fsbl/misc/pm_cfg_obj.c" Error message: Traceback (most recent call last): File "/buildroot/output/build/uboot-xlnx_rebase_v2022.01/tools/zynqmp_pm_cfg_obj_convert.py", line 252, in in_file = open(args.in_file, mode='r') FileNotFoundError: [Errno 2] No such file or directory: 'https://github.com/Xilinx/embeddedsw/blob/xlnx_rel_v2021.2/lib/sw_apps/zynqmp_fsbl/misc/pm_cfg_obj.c' What are your thoughts? Thanks for your help! Best regards, Neal Frager Xilinx From nealf at xilinx.com Tue Feb 8 10:24:56 2022 From: nealf at xilinx.com (Neal Frager) Date: Tue, 8 Feb 2022 10:24:56 +0000 Subject: [Buildroot] [PATCH 1/2] configs/zynqmp_zcu106: Bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <69efa9da-ae55-6795-8724-ed7105083924@benettiengineering.com> References: <20220208071559.2862411-1-neal.frager@xilinx.com> <69efa9da-ae55-6795-8724-ed7105083924@benettiengineering.com> Message-ID: Hi Giulio, > Ok, I was about building your patches :-) > Please send as v2, so when creating patches add -v2: > # git format-patch -s -M -o outgoing -2 -v2 then add 3 dashes before the actual 3 dashes in the produced patches and described what is changed between V1 version to V2 like: > --- > V1->V2: > * moved BR2_TARGET_UBOOT_ZYNQMP_PM_CFG to an URL instead of local patch as suggested by Giulio > * other eventual modifies > --- > And if you send then a v3, then keep previous V1->V2 and add: > --- > V1->V2: > * moved BR2_TARGET_UBOOT_ZYNQMP_PM_CFG to an URL instead of local patch as suggested by Giulio > V2->V3: > * modified .... > --- Thank you for your quick response. How do you think we should handle this? It appears that the BR2_TARGET_UBOOT_ZYNQMP_PM_CFG configuration does not yet support pre-downloading the file from a URL. Is this something that can easily be updated? If not, perhaps it makes sense to move forward with my patch set as is for now, and then I can include a new update once the BR2_TARGET_UBOOT_ZYNQMP_PM_CFG configuration accepts URL inputs. What are your thoughts on this? Best regards, Neal Frager Xilinx From nealf at xilinx.com Tue Feb 8 11:13:41 2022 From: nealf at xilinx.com (Neal Frager) Date: Tue, 8 Feb 2022 11:13:41 +0000 Subject: [Buildroot] Xilinx mainline ATF v2.6 Message-ID: Hi Giulio, > today morning I had couple of hours and I've managed to fix the build failure and sent the patch upstream: > https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/13800 > Can you please give a try to that patch? > Here is a fast link to download exactly that one: > https://review.trustedfirmware.org/changes/TF-A%2Ftrusted-firmware-a~13800/revisions/1/patch?download > But its name is awful. So please: > # git clone https://github.com/giuliobenetti/trusted-firmware-a.git > # git checkout bl31-zynqmp-linker-failure # git format-patch -s -M -o . -1 I am trying to test your patch now, but when I follow your instructions, I get the following error upon checkout: error: pathsec 'bl31-zynqmp-linker-failure' did not match any file(s) known to git. Any ideas how I can obtain the proper patch for testing? On 04/02/22 14:32, Neal Frager wrote: > Hi Giulio, > > If you simply modify the defconfig from my patch to change BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v2.4" to BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v2.6" and rebuild, you will see the build error when trying to build the mainline ATF v2.6. If you can fix it on your side, that would be great! >er > Best regards, > > Neal Frager > Xilinx > > Best regards, Neal Frager Xilinx From giulio.benetti at benettiengineering.com Tue Feb 8 11:16:46 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 8 Feb 2022 12:16:46 +0100 Subject: [Buildroot] [PATCH 1/2] configs/zynqmp_zcu106: Bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: References: <20220208071559.2862411-1-neal.frager@xilinx.com> <69efa9da-ae55-6795-8724-ed7105083924@benettiengineering.com> Message-ID: <32cc1c12-1496-7db9-5e32-1b99404a4fe3@benettiengineering.com> Hi Neal, On 08/02/22 11:24, Neal Frager wrote: > Hi Giulio, > >> Ok, I was about building your patches :-) > >> Please send as v2, so when creating patches add -v2: >> # git format-patch -s -M -o outgoing -2 -v2 then add 3 dashes before the actual 3 dashes in the produced patches and described what is changed between V1 version to V2 like: >> --- >> V1->V2: >> * moved BR2_TARGET_UBOOT_ZYNQMP_PM_CFG to an URL instead of local patch as suggested by Giulio >> * other eventual modifies >> --- > >> And if you send then a v3, then keep previous V1->V2 and add: >> --- >> V1->V2: >> * moved BR2_TARGET_UBOOT_ZYNQMP_PM_CFG to an URL instead of local patch as suggested by Giulio >> V2->V3: >> * modified .... >> --- > > Thank you for your quick response. How do you think we should handle this? It appears that the BR2_TARGET_UBOOT_ZYNQMP_PM_CFG configuration does not yet support pre-downloading the file from a URL. It's not its purpose. > Is this something that can easily be updated? If not, perhaps it makes sense to move forward with my patch set as is for now, and then I can include a new update once the BR2_TARGET_UBOOT_ZYNQMP_PM_CFG configuration accepts URL inputs. > > What are your thoughts on this? I think you should go with local patch honestly. As the patch is now. -- Giulio Benetti Benetti Engineering sas From giulio.benetti at benettiengineering.com Tue Feb 8 11:20:47 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 8 Feb 2022 12:20:47 +0100 Subject: [Buildroot] Xilinx mainline ATF v2.6 In-Reply-To: References: Message-ID: Hi Neal, On 08/02/22 12:13, Neal Frager wrote: > Hi Giulio, > >> today morning I had couple of hours and I've managed to fix the build failure and sent the patch upstream: >> https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/13800 > >> Can you please give a try to that patch? > >> Here is a fast link to download exactly that one: >> https://review.trustedfirmware.org/changes/TF-A%2Ftrusted-firmware-a~13800/revisions/1/patch?download > >> But its name is awful. So please: >> # git clone https://github.com/giuliobenetti/trusted-firmware-a.git >> # git checkout bl31-zynqmp-linker-failure # git format-patch -s -M -o . -1 > > I am trying to test your patch now, but when I follow your instructions, I get the following error upon checkout: > > error: pathsec 'bl31-zynqmp-linker-failure' did not match any file(s) known to git. > > Any ideas how I can obtain the proper patch for testing? Yes, the branch name was wrong. So: # git clone https://github.com/giuliobenetti/trusted-firmware-a.git # cd trusted-firmware-a # git checkout fix/bl31-zynqmp-linker-failure # git format-patch -s -M -o . -1 Here is the pending patch in ARM Gerrit: https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/13800 You can download it from there too following their instructions. Best regards -- Giulio Benetti Benetti Engineering sas > On 04/02/22 14:32, Neal Frager wrote: >> Hi Giulio, >> >> If you simply modify the defconfig from my patch to change BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v2.4" to BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v2.6" and rebuild, you will see the build error when trying to build the mainline ATF v2.6. If you can fix it on your side, that would be great! >> er >> Best regards, >> >> Neal Frager >> Xilinx >> >> > > Best regards, > Neal Frager > Xilinx > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From giulio.benetti at benettiengineering.com Tue Feb 8 11:47:03 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 8 Feb 2022 12:47:03 +0100 Subject: [Buildroot] [PATCH v1 1/1] package/guile: Guile 3.0.7 requires libiconv. In-Reply-To: <784201902.75253.1644311953307@email.ionos.it> References: <20220206084334.1900252-1-paguilar@paguilar.org> <20220206103040.1704ef40@windsurf> <784201902.75253.1644311953307@email.ionos.it> Message-ID: Hi Pedro, Thomas, please don't top-post, answer in-line. On 08/02/22 10:19, Pedro Aguilar wrote: > Hi Thomas, > > I added libiconv based on the error I got while building. The attchmnt has the output error and the config file I used. Please send your changes as patches, or otherwise paste here the last lines of logs or in the case log is very long use pastebin and point the URL here. So please don't attach anything. > However, I was not aware of BR2_ENABLE_LOCALE, so I selected it and removed libiconv and it also built correctly. The other config file shows this configuration. > > May be a correct solution could be to add the dependency on BR2_ENABLE_LOCALE. But if it's not present, enable libiconv. I think this is a good example of what you're trying to do: https://git.buildroot.net/buildroot/tree/package/libcdio/Config.in#n4 Best regards -- Giulio Benetti Benetti Engineering sas > Thanks. > > Regards, > >> On 06/02/2022 10:30 Thomas Petazzoni wrote: >> >> >> On Sun, 6 Feb 2022 09:43:34 +0100 >> Pedro Aguilar wrote: >> >>> This fixes the error reported in the daily results. >>> >>> Signed-off-by: Pedro Aguilar >> >> libiconv is normally needed only on toolchains that don't have >> BR2_ENABLE_LOCALE. But the build failure of guile happens with glibc >> toolchains, so it doesn't make much sense. >> >> Are you sure that your analysis of the problem is correct? Could you >> provide some more details? >> >> Thanks a lot! >> >> Thomas >> -- >> Thomas Petazzoni, co-owner and CEO, Bootlin >> Embedded Linux and Kernel engineering and training >> https://bootlin.com > > Pedro Aguilar > https://paguilar.org > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From nealf at xilinx.com Tue Feb 8 11:56:13 2022 From: nealf at xilinx.com (Neal Frager) Date: Tue, 8 Feb 2022 11:56:13 +0000 Subject: [Buildroot] [PATCH 1/2] configs/zynqmp_zcu106: Bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <32cc1c12-1496-7db9-5e32-1b99404a4fe3@benettiengineering.com> References: <20220208071559.2862411-1-neal.frager@xilinx.com> <69efa9da-ae55-6795-8724-ed7105083924@benettiengineering.com> <32cc1c12-1496-7db9-5e32-1b99404a4fe3@benettiengineering.com> Message-ID: Hi Giulio, > I think you should go with local patch honestly. > As the patch is now. > -- > Giulio Benetti > Benetti Engineering sas Ok. Please go ahead and start building with the patch as is. I have tested it on my side. It builds and runs without needing any manual steps. Best regards, Neal Frager Xilinx From giulio.benetti at benettiengineering.com Tue Feb 8 12:02:40 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 8 Feb 2022 13:02:40 +0100 Subject: [Buildroot] [PATCH v1 1/1] package/guile: Guile 3.0.7 requires libiconv. In-Reply-To: References: Message-ID: <0B93B49F-FD97-4CFE-9B13-DC866D12C7E1@benettiengineering.com> > Il giorno 8 feb 2022, alle ore 12:47, Giulio Benetti ha scritto: > > ?Hi Pedro, Thomas, > > please don't top-post, answer in-line. > >> On 08/02/22 10:19, Pedro Aguilar wrote: >> Hi Thomas, >> I added libiconv based on the error I got while building. The attchmnt has the output error and the config file I used. > > Please send your changes as patches, or otherwise paste here the last lines of logs or in the case log is very long use pastebin and point the URL here. So please don't attach anything. > >> However, I was not aware of BR2_ENABLE_LOCALE, so I selected it and removed libiconv and it also built correctly. The other config file shows this configuration. >> May be a correct solution could be to add the dependency on BR2_ENABLE_LOCALE. But if it's not present, enable libiconv. > > I think this is a good example of what you're trying to do: > https://git.buildroot.net/buildroot/tree/package/libcdio/Config.in#n4 And you also need this: https://git.buildroot.net/buildroot/tree/package/libcdio/libcdio.mk#n16 Best regards Giulio > > Best regards > -- > Giulio Benetti > Benetti Engineering sas > >> Thanks. >> Regards, >>>> On 06/02/2022 10:30 Thomas Petazzoni wrote: >>> >>> On Sun, 6 Feb 2022 09:43:34 +0100 >>> Pedro Aguilar wrote: >>> >>>> This fixes the error reported in the daily results. >>>> >>>> Signed-off-by: Pedro Aguilar >>> >>> libiconv is normally needed only on toolchains that don't have >>> BR2_ENABLE_LOCALE. But the build failure of guile happens with glibc >>> toolchains, so it doesn't make much sense. >>> >>> Are you sure that your analysis of the problem is correct? Could you >>> provide some more details? >>> >>> Thanks a lot! >>> >>> Thomas >>> -- >>> Thomas Petazzoni, co-owner and CEO, Bootlin >>> Embedded Linux and Kernel engineering and training >>> https://bootlin.com >> Pedro Aguilar >> https://paguilar.org >> _______________________________________________ >> 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 -------------- next part -------------- An HTML attachment was scrubbed... URL: From guillaume.bressaix at gmail.com Tue Feb 8 12:19:28 2022 From: guillaume.bressaix at gmail.com (Guillaume W. Bres) Date: Tue, 8 Feb 2022 13:19:28 +0100 Subject: [Buildroot] [PATCH 1/1] package/liquid-dsp: bump version to 1.4.0 Message-ID: <20220208121928.28519-1-guillaume.bressaix@gmail.com> Signed-off-by: Guillaume W. Bres --- package/liquid-dsp/liquid-dsp.hash | 4 ++-- package/liquid-dsp/liquid-dsp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/liquid-dsp/liquid-dsp.hash b/package/liquid-dsp/liquid-dsp.hash index 31bcd68767..7e5de6b259 100644 --- a/package/liquid-dsp/liquid-dsp.hash +++ b/package/liquid-dsp/liquid-dsp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 85093624ef9cb90ead64c836d2f42690197edace1a86257d6524c4e4dc870483 liquid-dsp-1.3.2.tar.gz -sha256 4df7126196efba1283deb99e3269418dde4ab0ad1fde80a55051153451eb4df2 LICENSE +sha256 66f38d509aa8f6207d2035bae5ee081a3d9df0f2cab516bc2118b5b1c6ce3333 liquid-dsp-1.4.0.tar.gz +sha256 4df7126196efba1283deb99e3269418dde4ab0ad1fde80a55051153451eb4df2 LICENSE diff --git a/package/liquid-dsp/liquid-dsp.mk b/package/liquid-dsp/liquid-dsp.mk index 9745893b7c..fcdf572532 100644 --- a/package/liquid-dsp/liquid-dsp.mk +++ b/package/liquid-dsp/liquid-dsp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIQUID_DSP_VERSION = 1.3.2 +LIQUID_DSP_VERSION = 1.4.0 LIQUID_DSP_SITE = $(call github,jgaeddert,liquid-dsp,v$(LIQUID_DSP_VERSION)) LIQUID_DSP_LICENSE = MIT LIQUID_DSP_LICENSE_FILES = LICENSE -- 2.30.2 From luca at lucaceresoli.net Tue Feb 8 12:26:14 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Tue, 8 Feb 2022 13:26:14 +0100 Subject: [Buildroot] [PATCH 1/2] configs/zynqmp_zcu106: Bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <32cc1c12-1496-7db9-5e32-1b99404a4fe3@benettiengineering.com> References: <20220208071559.2862411-1-neal.frager@xilinx.com> <69efa9da-ae55-6795-8724-ed7105083924@benettiengineering.com> <32cc1c12-1496-7db9-5e32-1b99404a4fe3@benettiengineering.com> Message-ID: <690d8e1b-fb6d-7c36-b07f-4ed9ca61b768@lucaceresoli.net> Hi Neal, On 08/02/22 12:16, Giulio Benetti wrote: > Hi Neal, > > On 08/02/22 11:24, Neal Frager wrote: >> Hi Giulio, >> >>> Ok, I was about building your patches :-) >> >>> Please send as v2, so when creating patches add -v2: >>> # git format-patch -s -M -o outgoing -2 -v2 then add 3 dashes before >>> the actual 3 dashes in the produced patches and described what is >>> changed between V1 version to V2 like: >>> --- >>> V1->V2: >>> * moved BR2_TARGET_UBOOT_ZYNQMP_PM_CFG to an URL instead of local >>> patch as suggested by Giulio >>> * other eventual modifies >>> --- >> >>> And if you send then a v3, then keep previous V1->V2 and add: >>> --- >>> V1->V2: >>> * moved BR2_TARGET_UBOOT_ZYNQMP_PM_CFG to an URL instead of local >>> patch as suggested by Giulio >>> V2->V3: >>> * modified .... >>> --- >> >> Thank you for your quick response.? How do you think we should handle >> this?? It appears that the BR2_TARGET_UBOOT_ZYNQMP_PM_CFG >> configuration does not yet support pre-downloading the file from a URL. > > It's not its purpose. > >> ?Is this something that can easily be updated?? If not, perhaps it >> makes sense to move forward with my patch set as is for now, and then >> I can include a new update once the BR2_TARGET_UBOOT_ZYNQMP_PM_CFG >> configuration accepts URL inputs. >> >> What are your thoughts on this? > > I think you should go with local patch honestly. > As the patch is now. I agree with Giulio, it's probably better to add the file to Buildroot. Here's the rationale. Downloading files instead of versioning them is not necessarily a bad idea. However pm_cfg_obj.c is unavoidably a configuration-dependent file, meaning each user making their _project_ (project = a specific configuration of a specific hardware) will have a different pm_cfg_obj.c. This is different from downloading a patch, or a pmufw.bin, which are reusable across several projects. Theoretically, it might make sense to have a repo hosting pm_cfg_obj.c only if that repo contains all project-specific material for the _project_ : schematics, FPGA design etc. But this is not the case here. BTW pm_cfg_obj.c is a 32 kB text file that compresses to 2 kB. Not a big deal. -- Luca From nealf at xilinx.com Tue Feb 8 13:56:38 2022 From: nealf at xilinx.com (Neal Frager) Date: Tue, 8 Feb 2022 13:56:38 +0000 Subject: [Buildroot] [PATCH 1/2] configs/zynqmp_zcu106: Bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <690d8e1b-fb6d-7c36-b07f-4ed9ca61b768@lucaceresoli.net> References: <20220208071559.2862411-1-neal.frager@xilinx.com> <69efa9da-ae55-6795-8724-ed7105083924@benettiengineering.com> <32cc1c12-1496-7db9-5e32-1b99404a4fe3@benettiengineering.com> <690d8e1b-fb6d-7c36-b07f-4ed9ca61b768@lucaceresoli.net> Message-ID: Hi Luca, > Hi Neal, > On 08/02/22 12:16, Giulio Benetti wrote: > Hi Neal, > > On 08/02/22 11:24, Neal Frager wrote: >> Hi Giulio, >> >>> Ok, I was about building your patches :-) >> >>> Please send as v2, so when creating patches add -v2: >>> # git format-patch -s -M -o outgoing -2 -v2 then add 3 dashes before >>> the actual 3 dashes in the produced patches and described what is >>> changed between V1 version to V2 like: >>> --- >>> V1->V2: >>> * moved BR2_TARGET_UBOOT_ZYNQMP_PM_CFG to an URL instead of local >>> patch as suggested by Giulio >>> * other eventual modifies >>> --- >> >>> And if you send then a v3, then keep previous V1->V2 and add: >>> --- >>> V1->V2: >>> * moved BR2_TARGET_UBOOT_ZYNQMP_PM_CFG to an URL instead of local >>> patch as suggested by Giulio >>> V2->V3: >>> * modified .... >>> --- >> >> Thank you for your quick response. How do you think we should handle >> this? It appears that the BR2_TARGET_UBOOT_ZYNQMP_PM_CFG >> configuration does not yet support pre-downloading the file from a URL. > > It's not its purpose. > >> Is this something that can easily be updated? If not, perhaps it >> makes sense to move forward with my patch set as is for now, and then >> I can include a new update once the BR2_TARGET_UBOOT_ZYNQMP_PM_CFG >> configuration accepts URL inputs. >> >> What are your thoughts on this? > > I think you should go with local patch honestly. > As the patch is now. > I agree with Giulio, it's probably better to add the file to Buildroot. > Here's the rationale. > Downloading files instead of versioning them is not necessarily a bad idea. However pm_cfg_obj.c is unavoidably a configuration-dependent file, meaning each user making their _project_ (project = a specific configuration of a specific hardware) will have a different pm_cfg_obj.c. This is different from downloading a patch, or a pmufw.bin, which are reusable across several projects. > Theoretically, it might make sense to have a repo hosting pm_cfg_obj.c only if that repo contains all project-specific material for the _project_ : schematics, FPGA design etc. But this is not the case here. > BTW pm_cfg_obj.c is a 32 kB text file that compresses to 2 kB. Not a big deal. I agree with your rationale. However, not every FPGA design will have a new pm_cfg_obj.c. While it is possible to do some customizations with this file, all of the Xilinx evaluation boards now use the same one. I would expect most developers never even touch this file, to be honest. So in a high percentage of cases, the pm_cfg_obj.c is really coming from a specific Xilinx embeddedsw release branch which developers should want to be the same release version as the PMU firmware binary. In any case, the short term solution of including a pm_cfg_obj.c in buildroot is already done using this patch set. On my side, this patch set builds and runs out of the box without needing any manual steps. Have you had a chance to at least test the build process? Best regards, Neal Frager Xilinx From nealf at xilinx.com Tue Feb 8 15:25:41 2022 From: nealf at xilinx.com (Neal Frager) Date: Tue, 8 Feb 2022 15:25:41 +0000 Subject: [Buildroot] Xilinx mainline ATF v2.6 In-Reply-To: References: Message-ID: Hi Giulio, > Yes, the branch name was wrong. So: > # git clone https://github.com/giuliobenetti/trusted-firmware-a.git > # cd trusted-firmware-a > # git checkout fix/bl31-zynqmp-linker-failure # git format-patch -s -M -o . -1 > Here is the pending patch in ARM Gerrit: > https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/13800 > You can download it from there too following their instructions. Good job! I tested your patch. Not only does it build, but it runs too! ------ U-Boot SPL 2022.01 (Feb 08 2022 - 15:18:47 +0000) PMUFW: v1.1 Loading new PMUFW cfg obj (2200 bytes) Silicon version: 3 EL Level: EL3 Chip ID: zu9eg Multiboot: 0 Trying to boot from MMC2 spl: could not initialize mmc. error: -19 Trying to boot from MMC1 spl_load_image_fat_os: error reading image u-boot.bin, err - -2 NOTICE: TF-A running on XCZU9EG/silicon at 0xfffea000 NOTICE: BL31: v2.6(release):2021.11-1539-gba7dbc88c5-dirty NOTICE: BL31: Built : 15:15:15, Feb 8 2022 U-Boot 2022.01 (Feb 08 2022 - 15:18:47 +0000) CPU: ZynqMP Silicon: v3 Model: ZynqMP ZCU102 Rev1.0 Board: Xilinx ZynqMP DRAM: 4 GiB PMUFW: v1.1 Xilinx I2C Legacy format at nvmem0: Board name: zcu102 Board rev: 1.0 Board SN: 847318611722-66244 Ethernet mac: 00:0a:35:03:6c:ca EL Level: EL2 Chip ID: zu9eg NAND: 0 MiB MMC: mmc at ff170000: 0 Loading Environment from FAT... *** Error - No Valid Environment Area found *** Warning - bad env area, using default environment In: serial Out: serial Err: serial Bootmode: LVL_SHFT_SD_MODE1 Reset reason: EXTERNAL Net: ZYNQ GEM: ff0e0000, mdio bus ff0e0000, phyaddr 12, interface rgmii-id eth0: ethernet at ff0e0000 scanning bus for devices... SATA link 0 timeout. SATA link 1 timeout. AHCI 0001.0301 32 slots 2 ports 6 Gbps 0x3 impl SATA mode flags: 64bit ncq pm clo only pmp fbss pio slum part ccc apst starting USB... Bus usb at fe200000: Register 2000440 NbrPorts 2 Starting the controller USB XHCI 1.00 scanning bus usb at fe200000 for devices... 1 USB Device(s) found scanning usb for storage devices... 0 Storage Device(s) found Hit any key to stop autoboot: 0 switch to partitions #0, OK mmc0 is current device Scanning mmc 0:1... Found /extlinux/extlinux.conf Retrieving file: /extlinux/extlinux.conf 1: linux Retrieving file: /Image append: console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait Retrieving file: /system.dtb ## Flattened Device Tree blob at 40000000 Booting using the fdt blob at 0x40000000 Loading Device Tree to 000000007bdf5000, end 000000007be01d46 ... OK Starting kernel ... [ 0.000000] Booting Linux on physical CPU 0x0000000000 [0x410fd034] [ 0.000000] Linux version 5.15.0 (nealf at xirengwts08) (aarch64-buildroot-linux-uclibc-gcc.br_real (Buildroot 2021.11-1539-gba7dbc88c5) 10.3.0, GNU ld (GNU Binutils) 2.36.1) #1 SMP Tue Feb 8 09:42:51 GMT 2022 [ 0.000000] Machine model: ZynqMP ZCU102 Rev1.0 [ 0.000000] efi: UEFI not found. [ 0.000000] Zone ranges: [ 0.000000] DMA32 [mem 0x0000000000000000-0x00000000ffffffff] [ 0.000000] Normal [mem 0x0000000100000000-0x000000087fffffff] [ 0.000000] Movable zone start for each node [ 0.000000] Early memory node ranges [ 0.000000] node 0: [mem 0x0000000000000000-0x000000007fffffff] [ 0.000000] node 0: [mem 0x0000000800000000-0x000000087fffffff] [ 0.000000] Initmem setup node 0 [mem 0x0000000000000000-0x000000087fffffff] [ 0.000000] cma: Reserved 256 MiB at 0x000000006bc00000 [ 0.000000] psci: probing for conduit method from DT. [ 0.000000] psci: PSCIv1.1 detected in firmware. [ 0.000000] psci: Using standard PSCI v0.2 function IDs [ 0.000000] psci: MIGRATE_INFO_TYPE not supported. [ 0.000000] psci: SMC Calling Convention v1.2 [ 0.000000] percpu: Embedded 18 pages/cpu s33048 r8192 d32488 u73728 [ 0.000000] Detected VIPT I-cache on CPU0 [ 0.000000] CPU features: detected: ARM erratum 845719 [ 0.000000] Built 1 zonelists, mobility grouping on. Total pages: 1034240 [ 0.000000] Kernel command line: console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait [ 0.000000] Dentry cache hash table entries: 524288 (order: 10, 4194304 bytes, linear) [ 0.000000] Inode-cache hash table entries: 262144 (order: 9, 2097152 bytes, linear) [ 0.000000] mem auto-init: stack:off, heap alloc:off, heap free:off [ 0.000000] software IO TLB: mapped [mem 0x000000007c000000-0x0000000080000000] (64MB) [ 0.000000] Memory: 3772784K/4194304K available (13568K kernel code, 904K rwdata, 3864K rodata, 1984K init, 306K bss, 159376K reserved, 262144K cma-reserved) [ 0.000000] rcu: Hierarchical RCU implementation. [ 0.000000] rcu: RCU event tracing is enabled. [ 0.000000] rcu: RCU calculated value of scheduler-enlistment delay is 25 jiffies. [ 0.000000] NR_IRQS: 64, nr_irqs: 64, preallocated irqs: 0 [ 0.000000] GIC: Adjusting CPU interface base to 0x00000000f902f000 [ 0.000000] Root IRQ handler: gic_handle_irq [ 0.000000] GIC: Using split EOI/Deactivate mode [ 0.000000] random: get_random_bytes called from start_kernel+0x470/0x6f8 with crng_init=0 [ 0.000000] arch_timer: cp15 timer(s) running at 100.00MHz (phys). [ 0.000000] clocksource: arch_sys_counter: mask: 0xffffffffffffff max_cycles: 0x171024e7e0, max_idle_ns: 440795205315 ns [ 0.000000] sched_clock: 56 bits at 100MHz, resolution 10ns, wraps every 4398046511100ns [ 0.000302] Console: colour dummy device 80x25 [ 0.000335] Calibrating delay loop (skipped), value calculated using timer frequency.. 200.00 BogoMIPS (lpj=400000) [ 0.000346] pid_max: default: 32768 minimum: 301 [ 0.000454] Mount-cache hash table entries: 8192 (order: 4, 65536 bytes, linear) [ 0.000474] Mountpoint-cache hash table entries: 8192 (order: 4, 65536 bytes, linear) [ 0.001288] rcu: Hierarchical SRCU implementation. [ 0.001556] EFI services will not be available. [ 0.001681] smp: Bringing up secondary CPUs ... [ 0.002000] Detected VIPT I-cache on CPU1 [ 0.002037] CPU1: Booted secondary processor 0x0000000001 [0x410fd034] [ 0.002399] Detected VIPT I-cache on CPU2 [ 0.002422] CPU2: Booted secondary processor 0x0000000002 [0x410fd034] [ 0.002749] Detected VIPT I-cache on CPU3 [ 0.002771] CPU3: Booted secondary processor 0x0000000003 [0x410fd034] [ 0.002814] smp: Brought up 1 node, 4 CPUs [ 0.002831] SMP: Total of 4 processors activated. [ 0.002836] CPU features: detected: 32-bit EL0 Support [ 0.002842] CPU features: detected: CRC32 instructions [ 0.002883] CPU: All CPU(s) started at EL2 [ 0.002898] alternatives: patching kernel code [ 0.003949] devtmpfs: initialized [ 0.009573] clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 7645041785100000 ns [ 0.009592] futex hash table entries: 1024 (order: 4, 65536 bytes, linear) [ 0.017450] pinctrl core: initialized pinctrl subsystem [ 0.018081] NET: Registered PF_NETLINK/PF_ROUTE protocol family [ 0.019062] DMA: preallocated 512 KiB GFP_KERNEL pool for atomic allocations [ 0.019156] DMA: preallocated 512 KiB GFP_KERNEL|GFP_DMA32 pool for atomic allocations [ 0.019193] audit: initializing netlink subsys (disabled) [ 0.019268] audit: type=2000 audit(0.016:1): state=initialized audit_enabled=0 res=1 [ 0.019561] hw-breakpoint: found 6 breakpoint and 4 watchpoint registers. [ 0.019621] ASID allocator initialised with 65536 entries [ 0.037594] HugeTLB registered 1.00 GiB page size, pre-allocated 0 pages [ 0.037607] HugeTLB registered 32.0 MiB page size, pre-allocated 0 pages [ 0.037614] HugeTLB registered 2.00 MiB page size, pre-allocated 0 pages [ 0.037620] HugeTLB registered 64.0 KiB page size, pre-allocated 0 pages [ 1.102226] DRBG: Continuing without Jitter RNG [ 1.204763] raid6: neonx8 gen() 2139 MB/s [ 1.272812] raid6: neonx8 xor() 1593 MB/s [ 1.340871] raid6: neonx4 gen() 2187 MB/s [ 1.408916] raid6: neonx4 xor() 1576 MB/s [ 1.476978] raid6: neonx2 gen() 2068 MB/s [ 1.545028] raid6: neonx2 xor() 1447 MB/s [ 1.613093] raid6: neonx1 gen() 1803 MB/s [ 1.681147] raid6: neonx1 xor() 1240 MB/s [ 1.749207] raid6: int64x8 gen() 1471 MB/s [ 1.817250] raid6: int64x8 xor() 785 MB/s [ 1.885312] raid6: int64x4 gen() 1557 MB/s [ 1.953371] raid6: int64x4 xor() 842 MB/s [ 2.021437] raid6: int64x2 gen() 1396 MB/s [ 2.089488] raid6: int64x2 xor() 750 MB/s [ 2.157543] raid6: int64x1 gen() 1186 MB/s [ 2.225599] raid6: int64x1 xor() 596 MB/s [ 2.225604] raid6: using algorithm neonx4 gen() 2187 MB/s [ 2.225610] raid6: .... xor() 1576 MB/s, rmw enabled [ 2.225615] raid6: using neon recovery algorithm [ 2.225994] iommu: Default domain type: Translated [ 2.226001] iommu: DMA domain TLB invalidation policy: strict mode [ 2.226220] SCSI subsystem initialized [ 2.226362] usbcore: registered new interface driver usbfs [ 2.226390] usbcore: registered new interface driver hub [ 2.226417] usbcore: registered new device driver usb [ 2.226469] mc: Linux media interface: v0.10 [ 2.226488] videodev: Linux video capture interface: v2.00 [ 2.226525] pps_core: LinuxPPS API ver. 1 registered [ 2.226531] pps_core: Software ver. 5.3.6 - Copyright 2005-2007 Rodolfo Giometti [ 2.226543] PTP clock support registered [ 2.226569] EDAC MC: Ver: 3.0.0 [ 2.226852] zynqmp-ipi-mbox mailbox at ff990400: Registered ZynqMP IPI mbox with TX/RX channels. [ 2.227040] FPGA manager framework [ 2.227166] Advanced Linux Sound Architecture Driver Initialized. [ 2.227447] Bluetooth: Core ver 2.22 [ 2.227471] NET: Registered PF_BLUETOOTH protocol family [ 2.227476] Bluetooth: HCI device and connection manager initialized [ 2.227485] Bluetooth: HCI socket layer initialized [ 2.227491] Bluetooth: L2CAP socket layer initialized [ 2.227502] Bluetooth: SCO socket layer initialized [ 2.227789] clocksource: Switched to clocksource arch_sys_counter [ 2.227887] VFS: Disk quotas dquot_6.6.0 [ 2.227926] VFS: Dquot-cache hash table entries: 512 (order 0, 4096 bytes) [ 2.231840] NET: Registered PF_INET protocol family [ 2.231964] IP idents hash table entries: 65536 (order: 7, 524288 bytes, linear) [ 2.233486] tcp_listen_portaddr_hash hash table entries: 2048 (order: 3, 32768 bytes, linear) [ 2.233533] TCP established hash table entries: 32768 (order: 6, 262144 bytes, linear) [ 2.233739] TCP bind hash table entries: 32768 (order: 7, 524288 bytes, linear) [ 2.234123] TCP: Hash tables configured (established 32768 bind 32768) [ 2.234190] UDP hash table entries: 2048 (order: 4, 65536 bytes, linear) [ 2.234266] UDP-Lite hash table entries: 2048 (order: 4, 65536 bytes, linear) [ 2.234416] NET: Registered PF_UNIX/PF_LOCAL protocol family [ 2.234703] RPC: Registered named UNIX socket transport module. [ 2.234710] RPC: Registered udp transport module. [ 2.234714] RPC: Registered tcp transport module. [ 2.234719] RPC: Registered tcp NFSv4.1 backchannel transport module. [ 2.235305] PCI: CLS 0 bytes, default 64 [ 2.235585] armv8-pmu pmu: hw perfevents: no interrupt-affinity property, guessing. [ 2.235747] hw perfevents: enabled with armv8_pmuv3 PMU driver, 7 counters available [ 2.236543] Initialise system trusted keyrings [ 2.236640] workingset: timestamp_bits=62 max_order=20 bucket_order=0 [ 2.237202] NFS: Registering the id_resolver key type [ 2.237216] Key type id_resolver registered [ 2.237221] Key type id_legacy registered [ 2.237237] nfs4filelayout_init: NFSv4 File Layout Driver Registering... [ 2.237244] nfs4flexfilelayout_init: NFSv4 Flexfile Layout Driver Registering... [ 2.237261] jffs2: version 2.2. (NAND) ?? 2001-2006 Red Hat, Inc. [ 2.273306] NET: Registered PF_ALG protocol family [ 2.273320] xor: measuring software checksum speed [ 2.277366] 8regs : 2438 MB/sec [ 2.280888] 32regs : 2800 MB/sec [ 2.285157] arm64_neon : 2309 MB/sec [ 2.285163] xor: using function: 32regs (2800 MB/sec) [ 2.285170] Key type asymmetric registered [ 2.285175] Asymmetric key parser 'x509' registered [ 2.285211] Block layer SCSI generic (bsg) driver version 0.4 loaded (major 245) [ 2.285218] io scheduler mq-deadline registered [ 2.285223] io scheduler kyber registered [ 2.309790] Serial: 8250/16550 driver, 4 ports, IRQ sharing disabled [ 2.313198] cacheinfo: Unable to detect cache hierarchy for CPU 0 [ 2.317134] brd: module loaded [ 2.320288] loop: module loaded [ 2.321033] mtdoops: mtd device (mtddev=name/number) must be supplied [ 2.322271] libphy: Fixed MDIO Bus: probed [ 2.323366] tun: Universal TUN/TAP device driver, 1.6 [ 2.323447] CAN device driver interface [ 2.324182] usbcore: registered new interface driver asix [ 2.324219] usbcore: registered new interface driver ax88179_178a [ 2.324244] usbcore: registered new interface driver cdc_ether [ 2.324266] usbcore: registered new interface driver net1080 [ 2.324287] usbcore: registered new interface driver cdc_subset [ 2.324310] usbcore: registered new interface driver zaurus [ 2.324342] usbcore: registered new interface driver cdc_ncm [ 2.325046] usbcore: registered new interface driver uas [ 2.325077] usbcore: registered new interface driver usb-storage [ 2.325704] rtc_zynqmp ffa60000.rtc: registered as rtc0 [ 2.325721] rtc_zynqmp ffa60000.rtc: setting system clock to 2021-01-25T16:34:35 UTC (1611592475) [ 2.325789] i2c_dev: i2c /dev entries driver [ 2.327253] usbcore: registered new interface driver uvcvideo [ 2.328075] Bluetooth: HCI UART driver ver 2.3 [ 2.328082] Bluetooth: HCI UART protocol H4 registered [ 2.328088] Bluetooth: HCI UART protocol BCSP registered [ 2.328106] Bluetooth: HCI UART protocol LL registered [ 2.328112] Bluetooth: HCI UART protocol ATH3K registered [ 2.328128] Bluetooth: HCI UART protocol Three-wire (H5) registered [ 2.328166] Bluetooth: HCI UART protocol Intel registered [ 2.328182] Bluetooth: HCI UART protocol QCA registered [ 2.328211] usbcore: registered new interface driver bcm203x [ 2.328237] usbcore: registered new interface driver bpa10x [ 2.328262] usbcore: registered new interface driver bfusb [ 2.328287] usbcore: registered new interface driver btusb [ 2.328324] usbcore: registered new interface driver ath3k [ 2.328397] EDAC MC: ECC not enabled [ 2.328531] EDAC DEVICE0: Giving out device to module edac controller cache_err: DEV edac (POLLED) [ 2.328682] EDAC DEVICE1: Giving out device to module zynqmp-ocm-edac controller zynqmp_ocm: DEV ff960000.memory-controller (INTERRUPT) [ 2.329022] sdhci: Secure Digital Host Controller Interface driver [ 2.329028] sdhci: Copyright(c) Pierre Ossman [ 2.329032] sdhci-pltfm: SDHCI platform and OF driver helper [ 2.329372] ledtrig-cpu: registered to indicate activity on CPUs [ 2.329463] SMCCC: SOC_ID: ARCH_SOC_ID not implemented, skipping .... [ 2.329501] zynqmp_firmware_probe Platform Management API v1.1 [ 2.329510] zynqmp_firmware_probe Trustzone version v1.0 [ 2.359668] securefw securefw: securefw probed [ 2.359886] alg: No test for xilinx-zynqmp-aes (zynqmp-aes) [ 2.359905] zynqmp_aes firmware:zynqmp-firmware:zynqmp-aes: AES Successfully Registered [ 2.360070] alg: No test for xilinx-keccak-384 (zynqmp-keccak-384) [ 2.360247] alg: No test for xilinx-zynqmp-rsa (zynqmp-rsa) [ 2.360389] usbcore: registered new interface driver usbhid [ 2.360395] usbhid: USB HID core driver [ 2.363052] fpga_manager fpga0: Xilinx ZynqMP FPGA Manager registered [ 2.363387] usbcore: registered new interface driver snd-usb-audio [ 2.364208] pktgen: Packet Generator for packet performance testing. Version: 2.75 [ 2.364576] Initializing XFRM netlink socket [ 2.364653] NET: Registered PF_INET6 protocol family [ 2.365096] Segment Routing with IPv6 [ 2.365114] In-situ OAM (IOAM) with IPv6 [ 2.365163] sit: IPv6, IPv4 and MPLS over IPv4 tunneling driver [ 2.365470] NET: Registered PF_PACKET protocol family [ 2.365487] NET: Registered PF_KEY protocol family [ 2.365507] can: controller area network core [ 2.365536] NET: Registered PF_CAN protocol family [ 2.365542] can: raw protocol [ 2.365548] can: broadcast manager protocol [ 2.365555] can: netlink gateway - max_hops=1 [ 2.365624] Bluetooth: RFCOMM TTY layer initialized [ 2.365634] Bluetooth: RFCOMM socket layer initialized [ 2.365649] Bluetooth: RFCOMM ver 1.11 [ 2.365658] Bluetooth: BNEP (Ethernet Emulation) ver 1.3 [ 2.365664] Bluetooth: BNEP filters: protocol multicast [ 2.365671] Bluetooth: BNEP socket layer initialized [ 2.365676] Bluetooth: HIDP (Human Interface Emulation) ver 1.2 [ 2.365683] Bluetooth: HIDP socket layer initialized [ 2.365793] 9pnet: Installing 9P2000 support [ 2.365811] Key type dns_resolver registered [ 2.365915] registered taskstats version 1 [ 2.365921] Loading compiled-in X.509 certificates [ 2.366901] Btrfs loaded, crc32c=crc32c-generic, zoned=no, fsverity=no [ 2.374985] ff000000.serial: ttyPS0 at MMIO 0xff000000 (irq = 47, base_baud = 6249999) is a xuartps [ 3.675073] printk: console [ttyPS0] enabled [ 3.680067] ff010000.serial: ttyPS1 at MMIO 0xff010000 (irq = 48, base_baud = 6249999) is a xuartps [ 3.689389] of-fpga-region fpga-full: FPGA Region probed [ 3.695960] nwl-pcie fd0e0000.pcie: host bridge /axi/pcie at fd0e0000 ranges: [ 3.702858] nwl-pcie fd0e0000.pcie: MEM 0x00e0000000..0x00efffffff -> 0x00e0000000 [ 3.710863] nwl-pcie fd0e0000.pcie: MEM 0x0600000000..0x07ffffffff -> 0x0600000000 [ 3.718932] nwl-pcie fd0e0000.pcie: Link is DOWN [ 3.723692] nwl-pcie fd0e0000.pcie: PCI host bridge to bus 0000:00 [ 3.729868] pci_bus 0000:00: root bus resource [bus 00-ff] [ 3.735353] pci_bus 0000:00: root bus resource [mem 0xe0000000-0xefffffff] [ 3.742225] pci_bus 0000:00: root bus resource [mem 0x600000000-0x7ffffffff pref] [ 3.749731] pci 0000:00:00.0: [10ee:d021] type 01 class 0x060400 [ 3.755796] pci 0000:00:00.0: PME# supported from D0 D1 D2 D3hot [ 3.765470] pci 0000:00:00.0: PCI bridge to [bus 01-0c] [ 3.771018] xilinx-zynqmp-dma fd500000.dma-controller: ZynqMP DMA driver Probe success [ 3.779096] xilinx-zynqmp-dma fd510000.dma-controller: ZynqMP DMA driver Probe success [ 3.787168] xilinx-zynqmp-dma fd520000.dma-controller: ZynqMP DMA driver Probe success [ 3.795240] xilinx-zynqmp-dma fd530000.dma-controller: ZynqMP DMA driver Probe success [ 3.803315] xilinx-zynqmp-dma fd540000.dma-controller: ZynqMP DMA driver Probe success [ 3.811381] xilinx-zynqmp-dma fd550000.dma-controller: ZynqMP DMA driver Probe success [ 3.819459] xilinx-zynqmp-dma fd560000.dma-controller: ZynqMP DMA driver Probe success [ 3.827528] xilinx-zynqmp-dma fd570000.dma-controller: ZynqMP DMA driver Probe success [ 3.835850] xilinx-zynqmp-dpdma fd4c0000.dma-controller: Xilinx DPDMA engine is probed [ 3.844554] spi-nor spi0.0: found n25q512a, expected m25p80 [ 3.850649] spi-nor spi0.0: n25q512a (131072 Kbytes) [ 3.855638] 4 fixed-partitions partitions found on MTD device spi0.0 [ 3.861982] Creating 4 MTD partitions on "spi0.0": [ 3.866765] 0x000000000000-0x000000100000 : "qspi-fsbl-uboot" [ 3.873306] 0x000000100000-0x000000600000 : "qspi-linux" [ 3.879305] 0x000000600000-0x000000620000 : "qspi-device-tree" [ 3.885811] 0x000000620000-0x000000c00000 : "qspi-rootfs" [ 3.894566] macb ff0e0000.ethernet: Not enabling partial store and forward [ 3.902041] libphy: MACB_mii_bus: probed [ 3.906625] macb ff0e0000.ethernet eth0: Cadence GEM rev 0x50070106 at 0xff0e0000 irq 30 (00:0a:35:03:6c:ca) [ 3.916754] xilinx-axipmon ffa00000.perf-monitor: Probed Xilinx APM [ 3.923298] xilinx-axipmon fd0b0000.perf-monitor: Probed Xilinx APM [ 3.929802] xilinx-axipmon fd490000.perf-monitor: Probed Xilinx APM [ 3.936303] xilinx-axipmon ffa10000.perf-monitor: Probed Xilinx APM [ 3.943645] pca953x 0-0020: supply vcc not found, using dummy regulator [ 3.950339] pca953x 0-0020: using no AI [ 3.954846] gpio-318 (sel0): hogged as output/low [ 3.959756] gpio-319 (sel1): hogged as output/high [ 3.964755] gpio-320 (sel2): hogged as output/high [ 3.969753] gpio-321 (sel3): hogged as output/high [ 3.974906] pca953x 0-0021: supply vcc not found, using dummy regulator [ 3.981575] pca953x 0-0021: using no AI [ 3.994348] i2c i2c-0: Added multiplexed i2c bus 2 [ 4.005627] i2c i2c-0: Added multiplexed i2c bus 3 [ 4.021538] random: fast init done [ 4.063343] i2c i2c-0: Added multiplexed i2c bus 4 [ 4.068256] i2c i2c-0: Added multiplexed i2c bus 5 [ 4.073051] pca954x 0-0075: registered 4 multiplexed busses for I2C mux pca9544 [ 4.080406] cdns-i2c ff020000.i2c: 400 kHz mmio ff020000 irq 32 [ 4.087774] at24 6-0054: supply vcc not found, using dummy regulator [ 4.094661] at24 6-0054: 1024 byte 24c08 EEPROM, writable, 1 bytes/write [ 4.101402] i2c i2c-1: Added multiplexed i2c bus 6 [ 4.106723] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out [ 4.114028] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out [ 4.121333] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out [ 4.128631] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out [ 4.135932] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out [ 4.143230] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out [ 4.150532] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out [ 4.157832] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out [ 4.166228] si5341 7-0036: Chip: 5341 Grade: 1 Rev: 1 [ 4.204262] i2c i2c-1: Added multiplexed i2c bus 7 [ 4.211860] si570 8-005d: registered, current frequency 300000000 Hz [ 4.218249] i2c i2c-1: Added multiplexed i2c bus 8 [ 4.237968] si570 9-005d: registered, current frequency 148500000 Hz [ 4.244356] i2c i2c-1: Added multiplexed i2c bus 9 [ 4.249368] si5324 10-0069: si5328 probed [ 4.316105] si5324 10-0069: si5328 probe successful [ 4.321023] i2c i2c-1: Added multiplexed i2c bus 10 [ 4.326009] i2c i2c-1: Added multiplexed i2c bus 11 [ 4.331002] i2c i2c-1: Added multiplexed i2c bus 12 [ 4.335995] i2c i2c-1: Added multiplexed i2c bus 13 [ 4.340870] pca954x 1-0074: registered 8 multiplexed busses for I2C switch pca9548 [ 4.348795] i2c i2c-1: Added multiplexed i2c bus 14 [ 4.353797] i2c i2c-1: Added multiplexed i2c bus 15 [ 4.358799] i2c i2c-1: Added multiplexed i2c bus 16 [ 4.363811] i2c i2c-1: Added multiplexed i2c bus 17 [ 4.368809] i2c i2c-1: Added multiplexed i2c bus 18 [ 4.373819] i2c i2c-1: Added multiplexed i2c bus 19 [ 4.378823] i2c i2c-1: Added multiplexed i2c bus 20 [ 4.383828] i2c i2c-1: Added multiplexed i2c bus 21 [ 4.388705] pca954x 1-0075: registered 8 multiplexed busses for I2C switch pca9548 [ 4.396304] cdns-i2c ff030000.i2c: 400 kHz mmio ff030000 irq 33 [ 4.406274] cdns-wdt fd4d0000.watchdog: Xilinx Watchdog Timer with timeout 60s [ 4.415726] zynqmp-display fd4a0000.display: vtc bridge property not present [ 4.424824] xilinx-dp-snd-codec fd4a0000.display:zynqmp_dp_snd_codec0: Xilinx DisplayPort Sound Codec probed [ 4.434896] xilinx-dp-snd-pcm zynqmp_dp_snd_pcm0: Xilinx DisplayPort Sound PCM probed [ 4.442954] xilinx-dp-snd-pcm zynqmp_dp_snd_pcm1: Xilinx DisplayPort Sound PCM probed [ 4.448513] mmc0: SDHCI controller on ff170000.mmc [ff170000.mmc] using ADMA 64-bit [ 4.459057] xilinx-dp-snd-card fd4a0000.display:zynqmp_dp_snd_card: Xilinx DisplayPort Sound Card probed [ 4.468634] OF: graph: no port node found in /axi/display at fd4a0000 [ 4.475120] xlnx-drm xlnx-drm.0: bound fd4a0000.display (ops 0xffffffc010e17fa0) [ 4.482712] [drm] Initialized xlnx 1.0.0 20130509 for fd4a0000.display on minor 0 [ 4.490206] zynqmp-display fd4a0000.display: ZynqMP DisplayPort Subsystem driver probed [ 4.496962] mmc0: new high speed SDHC card at address aaaa [ 4.498430] ahci-ceva fd0c0000.ahci: supply ahci not found, using dummy regulator [ 4.511219] ahci-ceva fd0c0000.ahci: supply phy not found, using dummy regulator [ 4.511379] mmcblk0: mmc0:aaaa SB16G 14.8 GiB [ 4.518690] ahci-ceva fd0c0000.ahci: supply target not found, using dummy regulator [ 4.527484] mmcblk0: p1 p2 [ 4.540954] ahci-ceva fd0c0000.ahci: AHCI 0001.0301 32 slots 2 ports 6 Gbps 0x3 impl platform mode [ 4.549923] ahci-ceva fd0c0000.ahci: flags: 64bit ncq sntf pm clo only pmp fbs pio slum part ccc sds apst [ 4.560268] scsi host0: ahci-ceva [ 4.563829] scsi host1: ahci-ceva [ 4.567237] ata1: SATA max UDMA/133 mmio [mem 0xfd0c0000-0xfd0c1fff] port 0x100 irq 45 [ 4.575152] ata2: SATA max UDMA/133 mmio [mem 0xfd0c0000-0xfd0c1fff] port 0x180 irq 45 [ 4.605877] xhci-hcd xhci-hcd.1.auto: xHCI Host Controller [ 4.611375] xhci-hcd xhci-hcd.1.auto: new USB bus registered, assigned bus number 1 [ 4.619123] xhci-hcd xhci-hcd.1.auto: hcc params 0x0238f625 hci version 0x100 quirks 0x0000000002010810 [ 4.628540] xhci-hcd xhci-hcd.1.auto: irq 53, io mem 0xfe200000 [ 4.634549] xhci-hcd xhci-hcd.1.auto: xHCI Host Controller [ 4.640035] xhci-hcd xhci-hcd.1.auto: new USB bus registered, assigned bus number 2 [ 4.647692] xhci-hcd xhci-hcd.1.auto: Host supports USB 3.0 SuperSpeed [ 4.654319] usb usb1: New USB device found, idVendor=1d6b, idProduct=0002, bcdDevice= 5.15 [ 4.662582] usb usb1: New USB device strings: Mfr=3, Product=2, SerialNumber=1 [ 4.669795] usb usb1: Product: xHCI Host Controller [ 4.674664] usb usb1: Manufacturer: Linux 5.15.0 xhci-hcd [ 4.680054] usb usb1: SerialNumber: xhci-hcd.1.auto [ 4.685214] hub 1-0:1.0: USB hub found [ 4.688988] hub 1-0:1.0: 1 port detected [ 4.693202] usb usb2: New USB device found, idVendor=1d6b, idProduct=0003, bcdDevice= 5.15 [ 4.701463] usb usb2: New USB device strings: Mfr=3, Product=2, SerialNumber=1 [ 4.708682] usb usb2: Product: xHCI Host Controller [ 4.713550] usb usb2: Manufacturer: Linux 5.15.0 xhci-hcd [ 4.718944] usb usb2: SerialNumber: xhci-hcd.1.auto [ 4.724075] hub 2-0:1.0: USB hub found [ 4.727842] hub 2-0:1.0: 1 port detected [ 4.734650] input: gpio-keys as /devices/platform/gpio-keys/input/input0 [ 4.741660] of_cfs_init [ 4.744131] of_cfs_init: OK [ 4.747039] cfg80211: Loading compiled-in X.509 certificates for regulatory database [ 4.881580] cfg80211: Loaded X.509 cert 'sforshee: 00b28ddf47aef9cea7' [ 4.888214] zynqmp_pll_disable() clock disable failed for dpll_int, ret = -13 [ 4.896228] platform regulatory.0: Direct firmware load for regulatory.db failed with error -2 [ 4.897975] ata2: SATA link down (SStatus 0 SControl 330) [ 4.904842] cfg80211: failed to load regulatory.db [ 4.905622] ALSA device list: [ 4.905626] #0: DisplayPort monitor [ 4.910252] ata1: SATA link down (SStatus 0 SControl 330) [ 4.950910] EXT4-fs (mmcblk0p2): mounted filesystem with ordered data mode. Opts: (null). Quota mode: none. [ 4.960680] VFS: Mounted root (ext4 filesystem) on device 179:2. [ 4.969332] devtmpfs: mounted [ 4.972830] Freeing unused kernel memory: 1984K [ 4.977453] Run /sbin/init as init process [ 5.056434] EXT4-fs (mmcblk0p2): re-mounted. Opts: (null). Quota mode: none. Starting syslogd: OK Starting klogd: OK Running sysctl: OK Saving random seed: [ 5.105554] random: dd: uninitialized urandom read (512 bytes read) OK Starting network: OK Welcome to Buildroot buildroot login: root # Best regards, Neal Frager Xilinx From giulio.benetti at benettiengineering.com Tue Feb 8 16:19:18 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 8 Feb 2022 17:19:18 +0100 Subject: [Buildroot] Xilinx mainline ATF v2.6 In-Reply-To: References: Message-ID: <11BB5427-9C48-4116-AECB-EA33631B3519@benettiengineering.com> Hi Neal, > Il giorno 8 feb 2022, alle ore 16:26, Neal Frager ha scritto: > > ?Hi Giulio, > >> Yes, the branch name was wrong. So: >> # git clone https://github.com/giuliobenetti/trusted-firmware-a.git >> # cd trusted-firmware-a >> # git checkout fix/bl31-zynqmp-linker-failure # git format-patch -s -M -o . -1 > >> Here is the pending patch in ARM Gerrit: >> https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/13800 >> You can download it from there too following their instructions. > > Good job! I tested your patch. Not only does it build, but it runs too! Thanks a lot for testing runtime. It should be merged soon as you can see from gerrit :-) Best regards Giulio > > ------ > > U-Boot SPL 2022.01 (Feb 08 2022 - 15:18:47 +0000) > PMUFW: v1.1 > Loading new PMUFW cfg obj (2200 bytes) > Silicon version: 3 > EL Level: EL3 > Chip ID: zu9eg > Multiboot: 0 > Trying to boot from MMC2 > spl: could not initialize mmc. error: -19 > Trying to boot from MMC1 > spl_load_image_fat_os: error reading image u-boot.bin, err - -2 > NOTICE: TF-A running on XCZU9EG/silicon at 0xfffea000 > NOTICE: BL31: v2.6(release):2021.11-1539-gba7dbc88c5-dirty > NOTICE: BL31: Built : 15:15:15, Feb 8 2022 > > > U-Boot 2022.01 (Feb 08 2022 - 15:18:47 +0000) > > CPU: ZynqMP > Silicon: v3 > Model: ZynqMP ZCU102 Rev1.0 > Board: Xilinx ZynqMP > DRAM: 4 GiB > PMUFW: v1.1 > Xilinx I2C Legacy format at nvmem0: > Board name: zcu102 > Board rev: 1.0 > Board SN: 847318611722-66244 > Ethernet mac: 00:0a:35:03:6c:ca > EL Level: EL2 > Chip ID: zu9eg > NAND: 0 MiB > MMC: mmc at ff170000: 0 > Loading Environment from FAT... *** Error - No Valid Environment Area found > *** Warning - bad env area, using default environment > > In: serial > Out: serial > Err: serial > Bootmode: LVL_SHFT_SD_MODE1 > Reset reason: EXTERNAL > Net: > ZYNQ GEM: ff0e0000, mdio bus ff0e0000, phyaddr 12, interface rgmii-id > eth0: ethernet at ff0e0000 > scanning bus for devices... > SATA link 0 timeout. > SATA link 1 timeout. > AHCI 0001.0301 32 slots 2 ports 6 Gbps 0x3 impl SATA mode > flags: 64bit ncq pm clo only pmp fbss pio slum part ccc apst > starting USB... > Bus usb at fe200000: Register 2000440 NbrPorts 2 > Starting the controller > USB XHCI 1.00 > scanning bus usb at fe200000 for devices... 1 USB Device(s) found > scanning usb for storage devices... 0 Storage Device(s) found > Hit any key to stop autoboot: 0 > switch to partitions #0, OK > mmc0 is current device > Scanning mmc 0:1... > Found /extlinux/extlinux.conf > Retrieving file: /extlinux/extlinux.conf > 1: linux > Retrieving file: /Image > append: console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait > Retrieving file: /system.dtb > ## Flattened Device Tree blob at 40000000 > Booting using the fdt blob at 0x40000000 > Loading Device Tree to 000000007bdf5000, end 000000007be01d46 ... OK > > Starting kernel ... > > [ 0.000000] Booting Linux on physical CPU 0x0000000000 [0x410fd034] > [ 0.000000] Linux version 5.15.0 (nealf at xirengwts08) (aarch64-buildroot-linux-uclibc-gcc.br_real (Buildroot 2021.11-1539-gba7dbc88c5) 10.3.0, GNU ld (GNU Binutils) 2.36.1) #1 SMP Tue Feb 8 09:42:51 GMT 2022 > [ 0.000000] Machine model: ZynqMP ZCU102 Rev1.0 > [ 0.000000] efi: UEFI not found. > [ 0.000000] Zone ranges: > [ 0.000000] DMA32 [mem 0x0000000000000000-0x00000000ffffffff] > [ 0.000000] Normal [mem 0x0000000100000000-0x000000087fffffff] > [ 0.000000] Movable zone start for each node > [ 0.000000] Early memory node ranges > [ 0.000000] node 0: [mem 0x0000000000000000-0x000000007fffffff] > [ 0.000000] node 0: [mem 0x0000000800000000-0x000000087fffffff] > [ 0.000000] Initmem setup node 0 [mem 0x0000000000000000-0x000000087fffffff] > [ 0.000000] cma: Reserved 256 MiB at 0x000000006bc00000 > [ 0.000000] psci: probing for conduit method from DT. > [ 0.000000] psci: PSCIv1.1 detected in firmware. > [ 0.000000] psci: Using standard PSCI v0.2 function IDs > [ 0.000000] psci: MIGRATE_INFO_TYPE not supported. > [ 0.000000] psci: SMC Calling Convention v1.2 > [ 0.000000] percpu: Embedded 18 pages/cpu s33048 r8192 d32488 u73728 > [ 0.000000] Detected VIPT I-cache on CPU0 > [ 0.000000] CPU features: detected: ARM erratum 845719 > [ 0.000000] Built 1 zonelists, mobility grouping on. Total pages: 1034240 > [ 0.000000] Kernel command line: console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait > [ 0.000000] Dentry cache hash table entries: 524288 (order: 10, 4194304 bytes, linear) > [ 0.000000] Inode-cache hash table entries: 262144 (order: 9, 2097152 bytes, linear) > [ 0.000000] mem auto-init: stack:off, heap alloc:off, heap free:off > [ 0.000000] software IO TLB: mapped [mem 0x000000007c000000-0x0000000080000000] (64MB) > [ 0.000000] Memory: 3772784K/4194304K available (13568K kernel code, 904K rwdata, 3864K rodata, 1984K init, 306K bss, 159376K reserved, 262144K cma-reserved) > [ 0.000000] rcu: Hierarchical RCU implementation. > [ 0.000000] rcu: RCU event tracing is enabled. > [ 0.000000] rcu: RCU calculated value of scheduler-enlistment delay is 25 jiffies. > [ 0.000000] NR_IRQS: 64, nr_irqs: 64, preallocated irqs: 0 > [ 0.000000] GIC: Adjusting CPU interface base to 0x00000000f902f000 > [ 0.000000] Root IRQ handler: gic_handle_irq > [ 0.000000] GIC: Using split EOI/Deactivate mode > [ 0.000000] random: get_random_bytes called from start_kernel+0x470/0x6f8 with crng_init=0 > [ 0.000000] arch_timer: cp15 timer(s) running at 100.00MHz (phys). > [ 0.000000] clocksource: arch_sys_counter: mask: 0xffffffffffffff max_cycles: 0x171024e7e0, max_idle_ns: 440795205315 ns > [ 0.000000] sched_clock: 56 bits at 100MHz, resolution 10ns, wraps every 4398046511100ns > [ 0.000302] Console: colour dummy device 80x25 > [ 0.000335] Calibrating delay loop (skipped), value calculated using timer frequency.. 200.00 BogoMIPS (lpj=400000) > [ 0.000346] pid_max: default: 32768 minimum: 301 > [ 0.000454] Mount-cache hash table entries: 8192 (order: 4, 65536 bytes, linear) > [ 0.000474] Mountpoint-cache hash table entries: 8192 (order: 4, 65536 bytes, linear) > [ 0.001288] rcu: Hierarchical SRCU implementation. > [ 0.001556] EFI services will not be available. > [ 0.001681] smp: Bringing up secondary CPUs ... > [ 0.002000] Detected VIPT I-cache on CPU1 > [ 0.002037] CPU1: Booted secondary processor 0x0000000001 [0x410fd034] > [ 0.002399] Detected VIPT I-cache on CPU2 > [ 0.002422] CPU2: Booted secondary processor 0x0000000002 [0x410fd034] > [ 0.002749] Detected VIPT I-cache on CPU3 > [ 0.002771] CPU3: Booted secondary processor 0x0000000003 [0x410fd034] > [ 0.002814] smp: Brought up 1 node, 4 CPUs > [ 0.002831] SMP: Total of 4 processors activated. > [ 0.002836] CPU features: detected: 32-bit EL0 Support > [ 0.002842] CPU features: detected: CRC32 instructions > [ 0.002883] CPU: All CPU(s) started at EL2 > [ 0.002898] alternatives: patching kernel code > [ 0.003949] devtmpfs: initialized > [ 0.009573] clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 7645041785100000 ns > [ 0.009592] futex hash table entries: 1024 (order: 4, 65536 bytes, linear) > [ 0.017450] pinctrl core: initialized pinctrl subsystem > [ 0.018081] NET: Registered PF_NETLINK/PF_ROUTE protocol family > [ 0.019062] DMA: preallocated 512 KiB GFP_KERNEL pool for atomic allocations > [ 0.019156] DMA: preallocated 512 KiB GFP_KERNEL|GFP_DMA32 pool for atomic allocations > [ 0.019193] audit: initializing netlink subsys (disabled) > [ 0.019268] audit: type=2000 audit(0.016:1): state=initialized audit_enabled=0 res=1 > [ 0.019561] hw-breakpoint: found 6 breakpoint and 4 watchpoint registers. > [ 0.019621] ASID allocator initialised with 65536 entries > [ 0.037594] HugeTLB registered 1.00 GiB page size, pre-allocated 0 pages > [ 0.037607] HugeTLB registered 32.0 MiB page size, pre-allocated 0 pages > [ 0.037614] HugeTLB registered 2.00 MiB page size, pre-allocated 0 pages > [ 0.037620] HugeTLB registered 64.0 KiB page size, pre-allocated 0 pages > [ 1.102226] DRBG: Continuing without Jitter RNG > [ 1.204763] raid6: neonx8 gen() 2139 MB/s > [ 1.272812] raid6: neonx8 xor() 1593 MB/s > [ 1.340871] raid6: neonx4 gen() 2187 MB/s > [ 1.408916] raid6: neonx4 xor() 1576 MB/s > [ 1.476978] raid6: neonx2 gen() 2068 MB/s > [ 1.545028] raid6: neonx2 xor() 1447 MB/s > [ 1.613093] raid6: neonx1 gen() 1803 MB/s > [ 1.681147] raid6: neonx1 xor() 1240 MB/s > [ 1.749207] raid6: int64x8 gen() 1471 MB/s > [ 1.817250] raid6: int64x8 xor() 785 MB/s > [ 1.885312] raid6: int64x4 gen() 1557 MB/s > [ 1.953371] raid6: int64x4 xor() 842 MB/s > [ 2.021437] raid6: int64x2 gen() 1396 MB/s > [ 2.089488] raid6: int64x2 xor() 750 MB/s > [ 2.157543] raid6: int64x1 gen() 1186 MB/s > [ 2.225599] raid6: int64x1 xor() 596 MB/s > [ 2.225604] raid6: using algorithm neonx4 gen() 2187 MB/s > [ 2.225610] raid6: .... xor() 1576 MB/s, rmw enabled > [ 2.225615] raid6: using neon recovery algorithm > [ 2.225994] iommu: Default domain type: Translated > [ 2.226001] iommu: DMA domain TLB invalidation policy: strict mode > [ 2.226220] SCSI subsystem initialized > [ 2.226362] usbcore: registered new interface driver usbfs > [ 2.226390] usbcore: registered new interface driver hub > [ 2.226417] usbcore: registered new device driver usb > [ 2.226469] mc: Linux media interface: v0.10 > [ 2.226488] videodev: Linux video capture interface: v2.00 > [ 2.226525] pps_core: LinuxPPS API ver. 1 registered > [ 2.226531] pps_core: Software ver. 5.3.6 - Copyright 2005-2007 Rodolfo Giometti > [ 2.226543] PTP clock support registered > [ 2.226569] EDAC MC: Ver: 3.0.0 > [ 2.226852] zynqmp-ipi-mbox mailbox at ff990400: Registered ZynqMP IPI mbox with TX/RX channels. > [ 2.227040] FPGA manager framework > [ 2.227166] Advanced Linux Sound Architecture Driver Initialized. > [ 2.227447] Bluetooth: Core ver 2.22 > [ 2.227471] NET: Registered PF_BLUETOOTH protocol family > [ 2.227476] Bluetooth: HCI device and connection manager initialized > [ 2.227485] Bluetooth: HCI socket layer initialized > [ 2.227491] Bluetooth: L2CAP socket layer initialized > [ 2.227502] Bluetooth: SCO socket layer initialized > [ 2.227789] clocksource: Switched to clocksource arch_sys_counter > [ 2.227887] VFS: Disk quotas dquot_6.6.0 > [ 2.227926] VFS: Dquot-cache hash table entries: 512 (order 0, 4096 bytes) > [ 2.231840] NET: Registered PF_INET protocol family > [ 2.231964] IP idents hash table entries: 65536 (order: 7, 524288 bytes, linear) > [ 2.233486] tcp_listen_portaddr_hash hash table entries: 2048 (order: 3, 32768 bytes, linear) > [ 2.233533] TCP established hash table entries: 32768 (order: 6, 262144 bytes, linear) > [ 2.233739] TCP bind hash table entries: 32768 (order: 7, 524288 bytes, linear) > [ 2.234123] TCP: Hash tables configured (established 32768 bind 32768) > [ 2.234190] UDP hash table entries: 2048 (order: 4, 65536 bytes, linear) > [ 2.234266] UDP-Lite hash table entries: 2048 (order: 4, 65536 bytes, linear) > [ 2.234416] NET: Registered PF_UNIX/PF_LOCAL protocol family > [ 2.234703] RPC: Registered named UNIX socket transport module. > [ 2.234710] RPC: Registered udp transport module. > [ 2.234714] RPC: Registered tcp transport module. > [ 2.234719] RPC: Registered tcp NFSv4.1 backchannel transport module. > [ 2.235305] PCI: CLS 0 bytes, default 64 > [ 2.235585] armv8-pmu pmu: hw perfevents: no interrupt-affinity property, guessing. > [ 2.235747] hw perfevents: enabled with armv8_pmuv3 PMU driver, 7 counters available > [ 2.236543] Initialise system trusted keyrings > [ 2.236640] workingset: timestamp_bits=62 max_order=20 bucket_order=0 > [ 2.237202] NFS: Registering the id_resolver key type > [ 2.237216] Key type id_resolver registered > [ 2.237221] Key type id_legacy registered > [ 2.237237] nfs4filelayout_init: NFSv4 File Layout Driver Registering... > [ 2.237244] nfs4flexfilelayout_init: NFSv4 Flexfile Layout Driver Registering... > [ 2.237261] jffs2: version 2.2. (NAND) ?? 2001-2006 Red Hat, Inc. > [ 2.273306] NET: Registered PF_ALG protocol family > [ 2.273320] xor: measuring software checksum speed > [ 2.277366] 8regs : 2438 MB/sec > [ 2.280888] 32regs : 2800 MB/sec > [ 2.285157] arm64_neon : 2309 MB/sec > [ 2.285163] xor: using function: 32regs (2800 MB/sec) > [ 2.285170] Key type asymmetric registered > [ 2.285175] Asymmetric key parser 'x509' registered > [ 2.285211] Block layer SCSI generic (bsg) driver version 0.4 loaded (major 245) > [ 2.285218] io scheduler mq-deadline registered > [ 2.285223] io scheduler kyber registered > [ 2.309790] Serial: 8250/16550 driver, 4 ports, IRQ sharing disabled > [ 2.313198] cacheinfo: Unable to detect cache hierarchy for CPU 0 > [ 2.317134] brd: module loaded > [ 2.320288] loop: module loaded > [ 2.321033] mtdoops: mtd device (mtddev=name/number) must be supplied > [ 2.322271] libphy: Fixed MDIO Bus: probed > [ 2.323366] tun: Universal TUN/TAP device driver, 1.6 > [ 2.323447] CAN device driver interface > [ 2.324182] usbcore: registered new interface driver asix > [ 2.324219] usbcore: registered new interface driver ax88179_178a > [ 2.324244] usbcore: registered new interface driver cdc_ether > [ 2.324266] usbcore: registered new interface driver net1080 > [ 2.324287] usbcore: registered new interface driver cdc_subset > [ 2.324310] usbcore: registered new interface driver zaurus > [ 2.324342] usbcore: registered new interface driver cdc_ncm > [ 2.325046] usbcore: registered new interface driver uas > [ 2.325077] usbcore: registered new interface driver usb-storage > [ 2.325704] rtc_zynqmp ffa60000.rtc: registered as rtc0 > [ 2.325721] rtc_zynqmp ffa60000.rtc: setting system clock to 2021-01-25T16:34:35 UTC (1611592475) > [ 2.325789] i2c_dev: i2c /dev entries driver > [ 2.327253] usbcore: registered new interface driver uvcvideo > [ 2.328075] Bluetooth: HCI UART driver ver 2.3 > [ 2.328082] Bluetooth: HCI UART protocol H4 registered > [ 2.328088] Bluetooth: HCI UART protocol BCSP registered > [ 2.328106] Bluetooth: HCI UART protocol LL registered > [ 2.328112] Bluetooth: HCI UART protocol ATH3K registered > [ 2.328128] Bluetooth: HCI UART protocol Three-wire (H5) registered > [ 2.328166] Bluetooth: HCI UART protocol Intel registered > [ 2.328182] Bluetooth: HCI UART protocol QCA registered > [ 2.328211] usbcore: registered new interface driver bcm203x > [ 2.328237] usbcore: registered new interface driver bpa10x > [ 2.328262] usbcore: registered new interface driver bfusb > [ 2.328287] usbcore: registered new interface driver btusb > [ 2.328324] usbcore: registered new interface driver ath3k > [ 2.328397] EDAC MC: ECC not enabled > [ 2.328531] EDAC DEVICE0: Giving out device to module edac controller cache_err: DEV edac (POLLED) > [ 2.328682] EDAC DEVICE1: Giving out device to module zynqmp-ocm-edac controller zynqmp_ocm: DEV ff960000.memory-controller (INTERRUPT) > [ 2.329022] sdhci: Secure Digital Host Controller Interface driver > [ 2.329028] sdhci: Copyright(c) Pierre Ossman > [ 2.329032] sdhci-pltfm: SDHCI platform and OF driver helper > [ 2.329372] ledtrig-cpu: registered to indicate activity on CPUs > [ 2.329463] SMCCC: SOC_ID: ARCH_SOC_ID not implemented, skipping .... > [ 2.329501] zynqmp_firmware_probe Platform Management API v1.1 > [ 2.329510] zynqmp_firmware_probe Trustzone version v1.0 > [ 2.359668] securefw securefw: securefw probed > [ 2.359886] alg: No test for xilinx-zynqmp-aes (zynqmp-aes) > [ 2.359905] zynqmp_aes firmware:zynqmp-firmware:zynqmp-aes: AES Successfully Registered > [ 2.360070] alg: No test for xilinx-keccak-384 (zynqmp-keccak-384) > [ 2.360247] alg: No test for xilinx-zynqmp-rsa (zynqmp-rsa) > [ 2.360389] usbcore: registered new interface driver usbhid > [ 2.360395] usbhid: USB HID core driver > [ 2.363052] fpga_manager fpga0: Xilinx ZynqMP FPGA Manager registered > [ 2.363387] usbcore: registered new interface driver snd-usb-audio > [ 2.364208] pktgen: Packet Generator for packet performance testing. Version: 2.75 > [ 2.364576] Initializing XFRM netlink socket > [ 2.364653] NET: Registered PF_INET6 protocol family > [ 2.365096] Segment Routing with IPv6 > [ 2.365114] In-situ OAM (IOAM) with IPv6 > [ 2.365163] sit: IPv6, IPv4 and MPLS over IPv4 tunneling driver > [ 2.365470] NET: Registered PF_PACKET protocol family > [ 2.365487] NET: Registered PF_KEY protocol family > [ 2.365507] can: controller area network core > [ 2.365536] NET: Registered PF_CAN protocol family > [ 2.365542] can: raw protocol > [ 2.365548] can: broadcast manager protocol > [ 2.365555] can: netlink gateway - max_hops=1 > [ 2.365624] Bluetooth: RFCOMM TTY layer initialized > [ 2.365634] Bluetooth: RFCOMM socket layer initialized > [ 2.365649] Bluetooth: RFCOMM ver 1.11 > [ 2.365658] Bluetooth: BNEP (Ethernet Emulation) ver 1.3 > [ 2.365664] Bluetooth: BNEP filters: protocol multicast > [ 2.365671] Bluetooth: BNEP socket layer initialized > [ 2.365676] Bluetooth: HIDP (Human Interface Emulation) ver 1.2 > [ 2.365683] Bluetooth: HIDP socket layer initialized > [ 2.365793] 9pnet: Installing 9P2000 support > [ 2.365811] Key type dns_resolver registered > [ 2.365915] registered taskstats version 1 > [ 2.365921] Loading compiled-in X.509 certificates > [ 2.366901] Btrfs loaded, crc32c=crc32c-generic, zoned=no, fsverity=no > [ 2.374985] ff000000.serial: ttyPS0 at MMIO 0xff000000 (irq = 47, base_baud = 6249999) is a xuartps > [ 3.675073] printk: console [ttyPS0] enabled > [ 3.680067] ff010000.serial: ttyPS1 at MMIO 0xff010000 (irq = 48, base_baud = 6249999) is a xuartps > [ 3.689389] of-fpga-region fpga-full: FPGA Region probed > [ 3.695960] nwl-pcie fd0e0000.pcie: host bridge /axi/pcie at fd0e0000 ranges: > [ 3.702858] nwl-pcie fd0e0000.pcie: MEM 0x00e0000000..0x00efffffff -> 0x00e0000000 > [ 3.710863] nwl-pcie fd0e0000.pcie: MEM 0x0600000000..0x07ffffffff -> 0x0600000000 > [ 3.718932] nwl-pcie fd0e0000.pcie: Link is DOWN > [ 3.723692] nwl-pcie fd0e0000.pcie: PCI host bridge to bus 0000:00 > [ 3.729868] pci_bus 0000:00: root bus resource [bus 00-ff] > [ 3.735353] pci_bus 0000:00: root bus resource [mem 0xe0000000-0xefffffff] > [ 3.742225] pci_bus 0000:00: root bus resource [mem 0x600000000-0x7ffffffff pref] > [ 3.749731] pci 0000:00:00.0: [10ee:d021] type 01 class 0x060400 > [ 3.755796] pci 0000:00:00.0: PME# supported from D0 D1 D2 D3hot > [ 3.765470] pci 0000:00:00.0: PCI bridge to [bus 01-0c] > [ 3.771018] xilinx-zynqmp-dma fd500000.dma-controller: ZynqMP DMA driver Probe success > [ 3.779096] xilinx-zynqmp-dma fd510000.dma-controller: ZynqMP DMA driver Probe success > [ 3.787168] xilinx-zynqmp-dma fd520000.dma-controller: ZynqMP DMA driver Probe success > [ 3.795240] xilinx-zynqmp-dma fd530000.dma-controller: ZynqMP DMA driver Probe success > [ 3.803315] xilinx-zynqmp-dma fd540000.dma-controller: ZynqMP DMA driver Probe success > [ 3.811381] xilinx-zynqmp-dma fd550000.dma-controller: ZynqMP DMA driver Probe success > [ 3.819459] xilinx-zynqmp-dma fd560000.dma-controller: ZynqMP DMA driver Probe success > [ 3.827528] xilinx-zynqmp-dma fd570000.dma-controller: ZynqMP DMA driver Probe success > [ 3.835850] xilinx-zynqmp-dpdma fd4c0000.dma-controller: Xilinx DPDMA engine is probed > [ 3.844554] spi-nor spi0.0: found n25q512a, expected m25p80 > [ 3.850649] spi-nor spi0.0: n25q512a (131072 Kbytes) > [ 3.855638] 4 fixed-partitions partitions found on MTD device spi0.0 > [ 3.861982] Creating 4 MTD partitions on "spi0.0": > [ 3.866765] 0x000000000000-0x000000100000 : "qspi-fsbl-uboot" > [ 3.873306] 0x000000100000-0x000000600000 : "qspi-linux" > [ 3.879305] 0x000000600000-0x000000620000 : "qspi-device-tree" > [ 3.885811] 0x000000620000-0x000000c00000 : "qspi-rootfs" > [ 3.894566] macb ff0e0000.ethernet: Not enabling partial store and forward > [ 3.902041] libphy: MACB_mii_bus: probed > [ 3.906625] macb ff0e0000.ethernet eth0: Cadence GEM rev 0x50070106 at 0xff0e0000 irq 30 (00:0a:35:03:6c:ca) > [ 3.916754] xilinx-axipmon ffa00000.perf-monitor: Probed Xilinx APM > [ 3.923298] xilinx-axipmon fd0b0000.perf-monitor: Probed Xilinx APM > [ 3.929802] xilinx-axipmon fd490000.perf-monitor: Probed Xilinx APM > [ 3.936303] xilinx-axipmon ffa10000.perf-monitor: Probed Xilinx APM > [ 3.943645] pca953x 0-0020: supply vcc not found, using dummy regulator > [ 3.950339] pca953x 0-0020: using no AI > [ 3.954846] gpio-318 (sel0): hogged as output/low > [ 3.959756] gpio-319 (sel1): hogged as output/high > [ 3.964755] gpio-320 (sel2): hogged as output/high > [ 3.969753] gpio-321 (sel3): hogged as output/high > [ 3.974906] pca953x 0-0021: supply vcc not found, using dummy regulator > [ 3.981575] pca953x 0-0021: using no AI > [ 3.994348] i2c i2c-0: Added multiplexed i2c bus 2 > [ 4.005627] i2c i2c-0: Added multiplexed i2c bus 3 > [ 4.021538] random: fast init done > [ 4.063343] i2c i2c-0: Added multiplexed i2c bus 4 > [ 4.068256] i2c i2c-0: Added multiplexed i2c bus 5 > [ 4.073051] pca954x 0-0075: registered 4 multiplexed busses for I2C mux pca9544 > [ 4.080406] cdns-i2c ff020000.i2c: 400 kHz mmio ff020000 irq 32 > [ 4.087774] at24 6-0054: supply vcc not found, using dummy regulator > [ 4.094661] at24 6-0054: 1024 byte 24c08 EEPROM, writable, 1 bytes/write > [ 4.101402] i2c i2c-1: Added multiplexed i2c bus 6 > [ 4.106723] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out > [ 4.114028] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out > [ 4.121333] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out > [ 4.128631] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out > [ 4.135932] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out > [ 4.143230] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out > [ 4.150532] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out > [ 4.157832] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out > [ 4.166228] si5341 7-0036: Chip: 5341 Grade: 1 Rev: 1 > [ 4.204262] i2c i2c-1: Added multiplexed i2c bus 7 > [ 4.211860] si570 8-005d: registered, current frequency 300000000 Hz > [ 4.218249] i2c i2c-1: Added multiplexed i2c bus 8 > [ 4.237968] si570 9-005d: registered, current frequency 148500000 Hz > [ 4.244356] i2c i2c-1: Added multiplexed i2c bus 9 > [ 4.249368] si5324 10-0069: si5328 probed > [ 4.316105] si5324 10-0069: si5328 probe successful > [ 4.321023] i2c i2c-1: Added multiplexed i2c bus 10 > [ 4.326009] i2c i2c-1: Added multiplexed i2c bus 11 > [ 4.331002] i2c i2c-1: Added multiplexed i2c bus 12 > [ 4.335995] i2c i2c-1: Added multiplexed i2c bus 13 > [ 4.340870] pca954x 1-0074: registered 8 multiplexed busses for I2C switch pca9548 > [ 4.348795] i2c i2c-1: Added multiplexed i2c bus 14 > [ 4.353797] i2c i2c-1: Added multiplexed i2c bus 15 > [ 4.358799] i2c i2c-1: Added multiplexed i2c bus 16 > [ 4.363811] i2c i2c-1: Added multiplexed i2c bus 17 > [ 4.368809] i2c i2c-1: Added multiplexed i2c bus 18 > [ 4.373819] i2c i2c-1: Added multiplexed i2c bus 19 > [ 4.378823] i2c i2c-1: Added multiplexed i2c bus 20 > [ 4.383828] i2c i2c-1: Added multiplexed i2c bus 21 > [ 4.388705] pca954x 1-0075: registered 8 multiplexed busses for I2C switch pca9548 > [ 4.396304] cdns-i2c ff030000.i2c: 400 kHz mmio ff030000 irq 33 > [ 4.406274] cdns-wdt fd4d0000.watchdog: Xilinx Watchdog Timer with timeout 60s > [ 4.415726] zynqmp-display fd4a0000.display: vtc bridge property not present > [ 4.424824] xilinx-dp-snd-codec fd4a0000.display:zynqmp_dp_snd_codec0: Xilinx DisplayPort Sound Codec probed > [ 4.434896] xilinx-dp-snd-pcm zynqmp_dp_snd_pcm0: Xilinx DisplayPort Sound PCM probed > [ 4.442954] xilinx-dp-snd-pcm zynqmp_dp_snd_pcm1: Xilinx DisplayPort Sound PCM probed > [ 4.448513] mmc0: SDHCI controller on ff170000.mmc [ff170000.mmc] using ADMA 64-bit > [ 4.459057] xilinx-dp-snd-card fd4a0000.display:zynqmp_dp_snd_card: Xilinx DisplayPort Sound Card probed > [ 4.468634] OF: graph: no port node found in /axi/display at fd4a0000 > [ 4.475120] xlnx-drm xlnx-drm.0: bound fd4a0000.display (ops 0xffffffc010e17fa0) > [ 4.482712] [drm] Initialized xlnx 1.0.0 20130509 for fd4a0000.display on minor 0 > [ 4.490206] zynqmp-display fd4a0000.display: ZynqMP DisplayPort Subsystem driver probed > [ 4.496962] mmc0: new high speed SDHC card at address aaaa > [ 4.498430] ahci-ceva fd0c0000.ahci: supply ahci not found, using dummy regulator > [ 4.511219] ahci-ceva fd0c0000.ahci: supply phy not found, using dummy regulator > [ 4.511379] mmcblk0: mmc0:aaaa SB16G 14.8 GiB > [ 4.518690] ahci-ceva fd0c0000.ahci: supply target not found, using dummy regulator > [ 4.527484] mmcblk0: p1 p2 > [ 4.540954] ahci-ceva fd0c0000.ahci: AHCI 0001.0301 32 slots 2 ports 6 Gbps 0x3 impl platform mode > [ 4.549923] ahci-ceva fd0c0000.ahci: flags: 64bit ncq sntf pm clo only pmp fbs pio slum part ccc sds apst > [ 4.560268] scsi host0: ahci-ceva > [ 4.563829] scsi host1: ahci-ceva > [ 4.567237] ata1: SATA max UDMA/133 mmio [mem 0xfd0c0000-0xfd0c1fff] port 0x100 irq 45 > [ 4.575152] ata2: SATA max UDMA/133 mmio [mem 0xfd0c0000-0xfd0c1fff] port 0x180 irq 45 > [ 4.605877] xhci-hcd xhci-hcd.1.auto: xHCI Host Controller > [ 4.611375] xhci-hcd xhci-hcd.1.auto: new USB bus registered, assigned bus number 1 > [ 4.619123] xhci-hcd xhci-hcd.1.auto: hcc params 0x0238f625 hci version 0x100 quirks 0x0000000002010810 > [ 4.628540] xhci-hcd xhci-hcd.1.auto: irq 53, io mem 0xfe200000 > [ 4.634549] xhci-hcd xhci-hcd.1.auto: xHCI Host Controller > [ 4.640035] xhci-hcd xhci-hcd.1.auto: new USB bus registered, assigned bus number 2 > [ 4.647692] xhci-hcd xhci-hcd.1.auto: Host supports USB 3.0 SuperSpeed > [ 4.654319] usb usb1: New USB device found, idVendor=1d6b, idProduct=0002, bcdDevice= 5.15 > [ 4.662582] usb usb1: New USB device strings: Mfr=3, Product=2, SerialNumber=1 > [ 4.669795] usb usb1: Product: xHCI Host Controller > [ 4.674664] usb usb1: Manufacturer: Linux 5.15.0 xhci-hcd > [ 4.680054] usb usb1: SerialNumber: xhci-hcd.1.auto > [ 4.685214] hub 1-0:1.0: USB hub found > [ 4.688988] hub 1-0:1.0: 1 port detected > [ 4.693202] usb usb2: New USB device found, idVendor=1d6b, idProduct=0003, bcdDevice= 5.15 > [ 4.701463] usb usb2: New USB device strings: Mfr=3, Product=2, SerialNumber=1 > [ 4.708682] usb usb2: Product: xHCI Host Controller > [ 4.713550] usb usb2: Manufacturer: Linux 5.15.0 xhci-hcd > [ 4.718944] usb usb2: SerialNumber: xhci-hcd.1.auto > [ 4.724075] hub 2-0:1.0: USB hub found > [ 4.727842] hub 2-0:1.0: 1 port detected > [ 4.734650] input: gpio-keys as /devices/platform/gpio-keys/input/input0 > [ 4.741660] of_cfs_init > [ 4.744131] of_cfs_init: OK > [ 4.747039] cfg80211: Loading compiled-in X.509 certificates for regulatory database > [ 4.881580] cfg80211: Loaded X.509 cert 'sforshee: 00b28ddf47aef9cea7' > [ 4.888214] zynqmp_pll_disable() clock disable failed for dpll_int, ret = -13 > [ 4.896228] platform regulatory.0: Direct firmware load for regulatory.db failed with error -2 > [ 4.897975] ata2: SATA link down (SStatus 0 SControl 330) > [ 4.904842] cfg80211: failed to load regulatory.db > [ 4.905622] ALSA device list: > [ 4.905626] #0: DisplayPort monitor > [ 4.910252] ata1: SATA link down (SStatus 0 SControl 330) > [ 4.950910] EXT4-fs (mmcblk0p2): mounted filesystem with ordered data mode. Opts: (null). Quota mode: none. > [ 4.960680] VFS: Mounted root (ext4 filesystem) on device 179:2. > [ 4.969332] devtmpfs: mounted > [ 4.972830] Freeing unused kernel memory: 1984K > [ 4.977453] Run /sbin/init as init process > [ 5.056434] EXT4-fs (mmcblk0p2): re-mounted. Opts: (null). Quota mode: none. > Starting syslogd: OK > Starting klogd: OK > Running sysctl: OK > Saving random seed: [ 5.105554] random: dd: uninitialized urandom read (512 bytes read) > OK > Starting network: OK > > Welcome to Buildroot > buildroot login: root > # > > Best regards, > Neal Frager > Xilinx > > From gwenj at trabucayre.com Tue Feb 8 16:24:08 2022 From: gwenj at trabucayre.com (Gwenhael Goavec-Merou) Date: Tue, 8 Feb 2022 17:24:08 +0100 Subject: [Buildroot] [PATCH 1/2] package/volk: new package Message-ID: <20220208162409.496110-1-gwenj@trabucayre.com> From: Gwenhael Goavec-Merou VOLK is the Vector-Optimized Library of Kernels Signed-off-by: Gwenhael Goavec-Merou --- DEVELOPERS | 1 + package/Config.in | 1 + package/volk/Config.in | 31 +++++++++++++++++++++++++++++++ package/volk/volk.hash | 3 +++ package/volk/volk.mk | 39 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 75 insertions(+) create mode 100644 package/volk/Config.in create mode 100644 package/volk/volk.hash create mode 100644 package/volk/volk.mk diff --git a/DEVELOPERS b/DEVELOPERS index 1d1cf99898..c8a9b87c47 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1181,6 +1181,7 @@ F: package/python-markdown/ F: package/python-remi/ F: package/python-sip/ F: package/uhd/ +F: package/volk/ N: Heiko Thiery F: board/kontron/pitx-imx8m/ diff --git a/package/Config.in b/package/Config.in index d631ed784a..c0353829a3 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2062,6 +2062,7 @@ endif source "package/tz/Config.in" source "package/tzdata/Config.in" source "package/uvw/Config.in" + source "package/volk/Config.in" source "package/xapian/Config.in" endmenu diff --git a/package/volk/Config.in b/package/volk/Config.in new file mode 100644 index 0000000000..4539cd2153 --- /dev/null +++ b/package/volk/Config.in @@ -0,0 +1,31 @@ +comment "volk needs a toolchain w/ C++, NPTL, wchar, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS + +config BR2_PACKAGE_VOLK + bool "volk" + depends on BR2_INSTALL_LIBSTDCPP + depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL + depends on BR2_USE_MMU # use fork() + depends on BR2_USE_WCHAR # boost + select BR2_PACKAGE_BOOST + select BR2_PACKAGE_BOOST_FILESYSTEM + select BR2_PACKAGE_BOOST_SYSTEM + help + VOLK is the Vector-Optimized Library of Kernels. It is a + library that contains kernels of hand-written SIMD code + for different mathematical operations. Since each SIMD + architecture can be very different and no compiler has yet + come along to handle vectorization properly or highly + efficiently, VOLK approaches the problem differently. + + For each architecture or platform that a developer wishes + to vectorize for, a new proto-kernel is added to VOLK. At + runtime, VOLK will select the correct proto-kernel. In this + way, the users of VOLK call a kernel for performing the + operation that is platform/architecture agnostic. This + allows us to write portable SIMD code. + + https://www.libvolk.org/ diff --git a/package/volk/volk.hash b/package/volk/volk.hash new file mode 100644 index 0000000000..9fca6c1b33 --- /dev/null +++ b/package/volk/volk.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 d9183b9f86a32cdbb8698cbbeb15de574962c05200ccf445c1058629073521f8 volk-2.5.0.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/volk/volk.mk b/package/volk/volk.mk new file mode 100644 index 0000000000..cdb0ea9a77 --- /dev/null +++ b/package/volk/volk.mk @@ -0,0 +1,39 @@ +################################################################################ +# +# volk +# +################################################################################ + +VOLK_VERSION = 2.5.0 +VOLK_SITE = https://github.com/gnuradio/volk/releases/download/v$(VOLK_VERSION) +VOLK_LICENSE = GPL-3.0+ +VOLK_LICENSE_FILES = COPYING + +VOLK_SUPPORTS_IN_SOURCE_BUILD = NO + +# host-python-mako are needed for volk to compile +VOLK_DEPENDENCIES = host-python3 host-python-mako boost + +VOLK_CONF_OPTS = \ + -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 \ + -DENABLE_MODTOOL=OFF \ + -DENABLE_TESTING=OFF \ + -DENABLE_PROFILING=OFF \ + -DVOLK_PYTHON_DIR=lib/python$(PYTHON3_VERSION_MAJOR)/site-packages + +# For third-party blocks, the volk library is mandatory at +# compile time. +VOLK_INSTALL_STAGING = YES + +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +VOLK_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic +endif + +ifeq ($(BR2_PACKAGE_ORC),y) +VOLK_DEPENDENCIES += orc +VOLK_CONF_OPTS += -DENABLE_ORC=ON +else +VOLK_CONF_OPTS += -DENABLE_ORC=OFF +endif + +$(eval $(cmake-package)) -- 2.34.1 From gwenj at trabucayre.com Tue Feb 8 16:24:09 2022 From: gwenj at trabucayre.com (Gwenhael Goavec-Merou) Date: Tue, 8 Feb 2022 17:24:09 +0100 Subject: [Buildroot] [PATCH 2/2] package/gnuradio: move to package/volk instead of using the internal one In-Reply-To: <20220208162409.496110-1-gwenj@trabucayre.com> References: <20220208162409.496110-1-gwenj@trabucayre.com> Message-ID: <20220208162409.496110-2-gwenj@trabucayre.com> From: Gwenhael Goavec-Merou Until recent releases GNURadio was shipped with volk as a submodule. With 3.9 and 3.10 this is no more true and requires building volk before GNURadio. This patch disable internal's volk, and add a dependency to the corresponding package, to use inconditionnaly the one build by buildroot Signed-off-by: Gwenhael Goavec-Merou --- package/gnuradio/Config.in | 1 + package/gnuradio/gnuradio.mk | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/package/gnuradio/Config.in b/package/gnuradio/Config.in index 1896d1326a..103175946c 100644 --- a/package/gnuradio/Config.in +++ b/package/gnuradio/Config.in @@ -28,6 +28,7 @@ config BR2_PACKAGE_GNURADIO select BR2_PACKAGE_BOOST_THREAD select BR2_PACKAGE_LOG4CPP select BR2_PACKAGE_GMP + select BR2_PACKAGE_VOLK help GNU Radio is a free & open-source software development toolkit that provides signal processing blocks to implement diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index 417a51e067..ed7060b85c 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -19,13 +19,15 @@ GNURADIO_DEPENDENCIES = \ host-swig \ boost \ log4cpp \ - gmp + gmp \ + volk GNURADIO_CONF_OPTS = \ -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 \ -DENABLE_DEFAULT=OFF \ -DENABLE_VOLK=ON \ -DENABLE_GNURADIO_RUNTIME=ON \ + -DENABLE_INTERNAL_VOLK=OFF \ -DENABLE_TESTING=OFF \ -DXMLTO_EXECUTABLE=NOTFOUND -- 2.34.1 From nealf at xilinx.com Tue Feb 8 16:31:17 2022 From: nealf at xilinx.com (Neal Frager) Date: Tue, 8 Feb 2022 16:31:17 +0000 Subject: [Buildroot] Xilinx mainline ATF v2.6 In-Reply-To: <11BB5427-9C48-4116-AECB-EA33631B3519@benettiengineering.com> References: <11BB5427-9C48-4116-AECB-EA33631B3519@benettiengineering.com> Message-ID: Hi Giulio, > Thanks a lot for testing runtime. > It should be merged soon as you can see from gerrit :-) Excellent news! I added a comment to gerrit which should only help. > > ------ > > U-Boot SPL 2022.01 (Feb 08 2022 - 15:18:47 +0000) > PMUFW: v1.1 > Loading new PMUFW cfg obj (2200 bytes) > Silicon version: 3 > EL Level: EL3 > Chip ID: zu9eg > Multiboot: 0 > Trying to boot from MMC2 > spl: could not initialize mmc. error: -19 Trying to boot from MMC1 > spl_load_image_fat_os: error reading image u-boot.bin, err - -2 > NOTICE: TF-A running on XCZU9EG/silicon at 0xfffea000 > NOTICE: BL31: v2.6(release):2021.11-1539-gba7dbc88c5-dirty > NOTICE: BL31: Built : 15:15:15, Feb 8 2022 > > > U-Boot 2022.01 (Feb 08 2022 - 15:18:47 +0000) > > CPU: ZynqMP > Silicon: v3 > Model: ZynqMP ZCU102 Rev1.0 > Board: Xilinx ZynqMP > DRAM: 4 GiB > PMUFW: v1.1 > Xilinx I2C Legacy format at nvmem0: > Board name: zcu102 > Board rev: 1.0 > Board SN: 847318611722-66244 > Ethernet mac: 00:0a:35:03:6c:ca > EL Level: EL2 > Chip ID: zu9eg > NAND: 0 MiB > MMC: mmc at ff170000: 0 > Loading Environment from FAT... *** Error - No Valid Environment Area found > *** Warning - bad env area, using default environment > > In: serial > Out: serial > Err: serial > Bootmode: LVL_SHFT_SD_MODE1 > Reset reason: EXTERNAL > Net: > ZYNQ GEM: ff0e0000, mdio bus ff0e0000, phyaddr 12, interface rgmii-id > eth0: ethernet at ff0e0000 > scanning bus for devices... > SATA link 0 timeout. > SATA link 1 timeout. > AHCI 0001.0301 32 slots 2 ports 6 Gbps 0x3 impl SATA mode > flags: 64bit ncq pm clo only pmp fbss pio slum part ccc apst > starting USB... > Bus usb at fe200000: Register 2000440 NbrPorts 2 > Starting the controller > USB XHCI 1.00 > scanning bus usb at fe200000 for devices... 1 USB Device(s) found > scanning usb for storage devices... 0 Storage Device(s) found > Hit any key to stop autoboot: 0 > switch to partitions #0, OK > mmc0 is current device > Scanning mmc 0:1... > Found /extlinux/extlinux.conf > Retrieving file: /extlinux/extlinux.conf > 1: linux > Retrieving file: /Image > append: console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait > Retrieving file: /system.dtb > ## Flattened Device Tree blob at 40000000 > Booting using the fdt blob at 0x40000000 > Loading Device Tree to 000000007bdf5000, end 000000007be01d46 ... OK > > Starting kernel ... > > [ 0.000000] Booting Linux on physical CPU 0x0000000000 [0x410fd034] > [ 0.000000] Linux version 5.15.0 (nealf at xirengwts08) (aarch64-buildroot-linux-uclibc-gcc.br_real (Buildroot 2021.11-1539-gba7dbc88c5) 10.3.0, GNU ld (GNU Binutils) 2.36.1) #1 SMP Tue Feb 8 09:42:51 GMT 2022 > [ 0.000000] Machine model: ZynqMP ZCU102 Rev1.0 > [ 0.000000] efi: UEFI not found. > [ 0.000000] Zone ranges: > [ 0.000000] DMA32 [mem 0x0000000000000000-0x00000000ffffffff] > [ 0.000000] Normal [mem 0x0000000100000000-0x000000087fffffff] > [ 0.000000] Movable zone start for each node > [ 0.000000] Early memory node ranges > [ 0.000000] node 0: [mem 0x0000000000000000-0x000000007fffffff] > [ 0.000000] node 0: [mem 0x0000000800000000-0x000000087fffffff] > [ 0.000000] Initmem setup node 0 [mem 0x0000000000000000-0x000000087fffffff] > [ 0.000000] cma: Reserved 256 MiB at 0x000000006bc00000 > [ 0.000000] psci: probing for conduit method from DT. > [ 0.000000] psci: PSCIv1.1 detected in firmware. > [ 0.000000] psci: Using standard PSCI v0.2 function IDs > [ 0.000000] psci: MIGRATE_INFO_TYPE not supported. > [ 0.000000] psci: SMC Calling Convention v1.2 > [ 0.000000] percpu: Embedded 18 pages/cpu s33048 r8192 d32488 u73728 > [ 0.000000] Detected VIPT I-cache on CPU0 > [ 0.000000] CPU features: detected: ARM erratum 845719 > [ 0.000000] Built 1 zonelists, mobility grouping on. Total pages: 1034240 > [ 0.000000] Kernel command line: console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait > [ 0.000000] Dentry cache hash table entries: 524288 (order: 10, 4194304 bytes, linear) > [ 0.000000] Inode-cache hash table entries: 262144 (order: 9, 2097152 bytes, linear) > [ 0.000000] mem auto-init: stack:off, heap alloc:off, heap free:off > [ 0.000000] software IO TLB: mapped [mem 0x000000007c000000-0x0000000080000000] (64MB) > [ 0.000000] Memory: 3772784K/4194304K available (13568K kernel code, 904K rwdata, 3864K rodata, 1984K init, 306K bss, 159376K reserved, 262144K cma-reserved) > [ 0.000000] rcu: Hierarchical RCU implementation. > [ 0.000000] rcu: RCU event tracing is enabled. > [ 0.000000] rcu: RCU calculated value of scheduler-enlistment delay is 25 jiffies. > [ 0.000000] NR_IRQS: 64, nr_irqs: 64, preallocated irqs: 0 > [ 0.000000] GIC: Adjusting CPU interface base to 0x00000000f902f000 > [ 0.000000] Root IRQ handler: gic_handle_irq > [ 0.000000] GIC: Using split EOI/Deactivate mode > [ 0.000000] random: get_random_bytes called from start_kernel+0x470/0x6f8 with crng_init=0 > [ 0.000000] arch_timer: cp15 timer(s) running at 100.00MHz (phys). > [ 0.000000] clocksource: arch_sys_counter: mask: 0xffffffffffffff max_cycles: 0x171024e7e0, max_idle_ns: 440795205315 ns > [ 0.000000] sched_clock: 56 bits at 100MHz, resolution 10ns, wraps every 4398046511100ns > [ 0.000302] Console: colour dummy device 80x25 > [ 0.000335] Calibrating delay loop (skipped), value calculated using timer frequency.. 200.00 BogoMIPS (lpj=400000) > [ 0.000346] pid_max: default: 32768 minimum: 301 > [ 0.000454] Mount-cache hash table entries: 8192 (order: 4, 65536 bytes, linear) > [ 0.000474] Mountpoint-cache hash table entries: 8192 (order: 4, 65536 bytes, linear) > [ 0.001288] rcu: Hierarchical SRCU implementation. > [ 0.001556] EFI services will not be available. > [ 0.001681] smp: Bringing up secondary CPUs ... > [ 0.002000] Detected VIPT I-cache on CPU1 > [ 0.002037] CPU1: Booted secondary processor 0x0000000001 [0x410fd034] > [ 0.002399] Detected VIPT I-cache on CPU2 > [ 0.002422] CPU2: Booted secondary processor 0x0000000002 [0x410fd034] > [ 0.002749] Detected VIPT I-cache on CPU3 > [ 0.002771] CPU3: Booted secondary processor 0x0000000003 [0x410fd034] > [ 0.002814] smp: Brought up 1 node, 4 CPUs > [ 0.002831] SMP: Total of 4 processors activated. > [ 0.002836] CPU features: detected: 32-bit EL0 Support > [ 0.002842] CPU features: detected: CRC32 instructions > [ 0.002883] CPU: All CPU(s) started at EL2 > [ 0.002898] alternatives: patching kernel code > [ 0.003949] devtmpfs: initialized > [ 0.009573] clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 7645041785100000 ns > [ 0.009592] futex hash table entries: 1024 (order: 4, 65536 bytes, linear) > [ 0.017450] pinctrl core: initialized pinctrl subsystem > [ 0.018081] NET: Registered PF_NETLINK/PF_ROUTE protocol family > [ 0.019062] DMA: preallocated 512 KiB GFP_KERNEL pool for atomic allocations > [ 0.019156] DMA: preallocated 512 KiB GFP_KERNEL|GFP_DMA32 pool for atomic allocations > [ 0.019193] audit: initializing netlink subsys (disabled) > [ 0.019268] audit: type=2000 audit(0.016:1): state=initialized audit_enabled=0 res=1 > [ 0.019561] hw-breakpoint: found 6 breakpoint and 4 watchpoint registers. > [ 0.019621] ASID allocator initialised with 65536 entries > [ 0.037594] HugeTLB registered 1.00 GiB page size, pre-allocated 0 pages > [ 0.037607] HugeTLB registered 32.0 MiB page size, pre-allocated 0 pages > [ 0.037614] HugeTLB registered 2.00 MiB page size, pre-allocated 0 pages > [ 0.037620] HugeTLB registered 64.0 KiB page size, pre-allocated 0 pages > [ 1.102226] DRBG: Continuing without Jitter RNG > [ 1.204763] raid6: neonx8 gen() 2139 MB/s > [ 1.272812] raid6: neonx8 xor() 1593 MB/s > [ 1.340871] raid6: neonx4 gen() 2187 MB/s > [ 1.408916] raid6: neonx4 xor() 1576 MB/s > [ 1.476978] raid6: neonx2 gen() 2068 MB/s > [ 1.545028] raid6: neonx2 xor() 1447 MB/s > [ 1.613093] raid6: neonx1 gen() 1803 MB/s > [ 1.681147] raid6: neonx1 xor() 1240 MB/s > [ 1.749207] raid6: int64x8 gen() 1471 MB/s > [ 1.817250] raid6: int64x8 xor() 785 MB/s > [ 1.885312] raid6: int64x4 gen() 1557 MB/s > [ 1.953371] raid6: int64x4 xor() 842 MB/s > [ 2.021437] raid6: int64x2 gen() 1396 MB/s > [ 2.089488] raid6: int64x2 xor() 750 MB/s > [ 2.157543] raid6: int64x1 gen() 1186 MB/s > [ 2.225599] raid6: int64x1 xor() 596 MB/s > [ 2.225604] raid6: using algorithm neonx4 gen() 2187 MB/s > [ 2.225610] raid6: .... xor() 1576 MB/s, rmw enabled > [ 2.225615] raid6: using neon recovery algorithm > [ 2.225994] iommu: Default domain type: Translated > [ 2.226001] iommu: DMA domain TLB invalidation policy: strict mode > [ 2.226220] SCSI subsystem initialized > [ 2.226362] usbcore: registered new interface driver usbfs > [ 2.226390] usbcore: registered new interface driver hub > [ 2.226417] usbcore: registered new device driver usb > [ 2.226469] mc: Linux media interface: v0.10 > [ 2.226488] videodev: Linux video capture interface: v2.00 > [ 2.226525] pps_core: LinuxPPS API ver. 1 registered > [ 2.226531] pps_core: Software ver. 5.3.6 - Copyright 2005-2007 Rodolfo Giometti > [ 2.226543] PTP clock support registered > [ 2.226569] EDAC MC: Ver: 3.0.0 > [ 2.226852] zynqmp-ipi-mbox mailbox at ff990400: Registered ZynqMP IPI mbox with TX/RX channels. > [ 2.227040] FPGA manager framework > [ 2.227166] Advanced Linux Sound Architecture Driver Initialized. > [ 2.227447] Bluetooth: Core ver 2.22 > [ 2.227471] NET: Registered PF_BLUETOOTH protocol family > [ 2.227476] Bluetooth: HCI device and connection manager initialized > [ 2.227485] Bluetooth: HCI socket layer initialized > [ 2.227491] Bluetooth: L2CAP socket layer initialized > [ 2.227502] Bluetooth: SCO socket layer initialized > [ 2.227789] clocksource: Switched to clocksource arch_sys_counter > [ 2.227887] VFS: Disk quotas dquot_6.6.0 > [ 2.227926] VFS: Dquot-cache hash table entries: 512 (order 0, 4096 bytes) > [ 2.231840] NET: Registered PF_INET protocol family > [ 2.231964] IP idents hash table entries: 65536 (order: 7, 524288 bytes, linear) > [ 2.233486] tcp_listen_portaddr_hash hash table entries: 2048 (order: 3, 32768 bytes, linear) > [ 2.233533] TCP established hash table entries: 32768 (order: 6, 262144 bytes, linear) > [ 2.233739] TCP bind hash table entries: 32768 (order: 7, 524288 bytes, linear) > [ 2.234123] TCP: Hash tables configured (established 32768 bind 32768) > [ 2.234190] UDP hash table entries: 2048 (order: 4, 65536 bytes, linear) > [ 2.234266] UDP-Lite hash table entries: 2048 (order: 4, 65536 bytes, linear) > [ 2.234416] NET: Registered PF_UNIX/PF_LOCAL protocol family > [ 2.234703] RPC: Registered named UNIX socket transport module. > [ 2.234710] RPC: Registered udp transport module. > [ 2.234714] RPC: Registered tcp transport module. > [ 2.234719] RPC: Registered tcp NFSv4.1 backchannel transport module. > [ 2.235305] PCI: CLS 0 bytes, default 64 > [ 2.235585] armv8-pmu pmu: hw perfevents: no interrupt-affinity property, guessing. > [ 2.235747] hw perfevents: enabled with armv8_pmuv3 PMU driver, 7 counters available > [ 2.236543] Initialise system trusted keyrings > [ 2.236640] workingset: timestamp_bits=62 max_order=20 bucket_order=0 > [ 2.237202] NFS: Registering the id_resolver key type > [ 2.237216] Key type id_resolver registered > [ 2.237221] Key type id_legacy registered > [ 2.237237] nfs4filelayout_init: NFSv4 File Layout Driver Registering... > [ 2.237244] nfs4flexfilelayout_init: NFSv4 Flexfile Layout Driver Registering... > [ 2.237261] jffs2: version 2.2. (NAND) ?? 2001-2006 Red Hat, Inc. > [ 2.273306] NET: Registered PF_ALG protocol family > [ 2.273320] xor: measuring software checksum speed > [ 2.277366] 8regs : 2438 MB/sec > [ 2.280888] 32regs : 2800 MB/sec > [ 2.285157] arm64_neon : 2309 MB/sec > [ 2.285163] xor: using function: 32regs (2800 MB/sec) > [ 2.285170] Key type asymmetric registered > [ 2.285175] Asymmetric key parser 'x509' registered > [ 2.285211] Block layer SCSI generic (bsg) driver version 0.4 loaded (major 245) > [ 2.285218] io scheduler mq-deadline registered > [ 2.285223] io scheduler kyber registered > [ 2.309790] Serial: 8250/16550 driver, 4 ports, IRQ sharing disabled > [ 2.313198] cacheinfo: Unable to detect cache hierarchy for CPU 0 > [ 2.317134] brd: module loaded > [ 2.320288] loop: module loaded > [ 2.321033] mtdoops: mtd device (mtddev=name/number) must be supplied > [ 2.322271] libphy: Fixed MDIO Bus: probed > [ 2.323366] tun: Universal TUN/TAP device driver, 1.6 > [ 2.323447] CAN device driver interface > [ 2.324182] usbcore: registered new interface driver asix > [ 2.324219] usbcore: registered new interface driver ax88179_178a > [ 2.324244] usbcore: registered new interface driver cdc_ether > [ 2.324266] usbcore: registered new interface driver net1080 > [ 2.324287] usbcore: registered new interface driver cdc_subset > [ 2.324310] usbcore: registered new interface driver zaurus > [ 2.324342] usbcore: registered new interface driver cdc_ncm > [ 2.325046] usbcore: registered new interface driver uas > [ 2.325077] usbcore: registered new interface driver usb-storage > [ 2.325704] rtc_zynqmp ffa60000.rtc: registered as rtc0 > [ 2.325721] rtc_zynqmp ffa60000.rtc: setting system clock to 2021-01-25T16:34:35 UTC (1611592475) > [ 2.325789] i2c_dev: i2c /dev entries driver > [ 2.327253] usbcore: registered new interface driver uvcvideo > [ 2.328075] Bluetooth: HCI UART driver ver 2.3 > [ 2.328082] Bluetooth: HCI UART protocol H4 registered > [ 2.328088] Bluetooth: HCI UART protocol BCSP registered > [ 2.328106] Bluetooth: HCI UART protocol LL registered > [ 2.328112] Bluetooth: HCI UART protocol ATH3K registered > [ 2.328128] Bluetooth: HCI UART protocol Three-wire (H5) registered > [ 2.328166] Bluetooth: HCI UART protocol Intel registered > [ 2.328182] Bluetooth: HCI UART protocol QCA registered > [ 2.328211] usbcore: registered new interface driver bcm203x > [ 2.328237] usbcore: registered new interface driver bpa10x > [ 2.328262] usbcore: registered new interface driver bfusb > [ 2.328287] usbcore: registered new interface driver btusb > [ 2.328324] usbcore: registered new interface driver ath3k > [ 2.328397] EDAC MC: ECC not enabled > [ 2.328531] EDAC DEVICE0: Giving out device to module edac controller cache_err: DEV edac (POLLED) > [ 2.328682] EDAC DEVICE1: Giving out device to module zynqmp-ocm-edac controller zynqmp_ocm: DEV ff960000.memory-controller (INTERRUPT) > [ 2.329022] sdhci: Secure Digital Host Controller Interface driver > [ 2.329028] sdhci: Copyright(c) Pierre Ossman > [ 2.329032] sdhci-pltfm: SDHCI platform and OF driver helper > [ 2.329372] ledtrig-cpu: registered to indicate activity on CPUs > [ 2.329463] SMCCC: SOC_ID: ARCH_SOC_ID not implemented, skipping .... > [ 2.329501] zynqmp_firmware_probe Platform Management API v1.1 > [ 2.329510] zynqmp_firmware_probe Trustzone version v1.0 > [ 2.359668] securefw securefw: securefw probed > [ 2.359886] alg: No test for xilinx-zynqmp-aes (zynqmp-aes) > [ 2.359905] zynqmp_aes firmware:zynqmp-firmware:zynqmp-aes: AES Successfully Registered > [ 2.360070] alg: No test for xilinx-keccak-384 (zynqmp-keccak-384) > [ 2.360247] alg: No test for xilinx-zynqmp-rsa (zynqmp-rsa) > [ 2.360389] usbcore: registered new interface driver usbhid > [ 2.360395] usbhid: USB HID core driver > [ 2.363052] fpga_manager fpga0: Xilinx ZynqMP FPGA Manager registered > [ 2.363387] usbcore: registered new interface driver snd-usb-audio > [ 2.364208] pktgen: Packet Generator for packet performance testing. Version: 2.75 > [ 2.364576] Initializing XFRM netlink socket > [ 2.364653] NET: Registered PF_INET6 protocol family > [ 2.365096] Segment Routing with IPv6 > [ 2.365114] In-situ OAM (IOAM) with IPv6 > [ 2.365163] sit: IPv6, IPv4 and MPLS over IPv4 tunneling driver > [ 2.365470] NET: Registered PF_PACKET protocol family > [ 2.365487] NET: Registered PF_KEY protocol family > [ 2.365507] can: controller area network core > [ 2.365536] NET: Registered PF_CAN protocol family > [ 2.365542] can: raw protocol > [ 2.365548] can: broadcast manager protocol > [ 2.365555] can: netlink gateway - max_hops=1 > [ 2.365624] Bluetooth: RFCOMM TTY layer initialized > [ 2.365634] Bluetooth: RFCOMM socket layer initialized > [ 2.365649] Bluetooth: RFCOMM ver 1.11 > [ 2.365658] Bluetooth: BNEP (Ethernet Emulation) ver 1.3 > [ 2.365664] Bluetooth: BNEP filters: protocol multicast > [ 2.365671] Bluetooth: BNEP socket layer initialized > [ 2.365676] Bluetooth: HIDP (Human Interface Emulation) ver 1.2 > [ 2.365683] Bluetooth: HIDP socket layer initialized > [ 2.365793] 9pnet: Installing 9P2000 support > [ 2.365811] Key type dns_resolver registered > [ 2.365915] registered taskstats version 1 > [ 2.365921] Loading compiled-in X.509 certificates > [ 2.366901] Btrfs loaded, crc32c=crc32c-generic, zoned=no, fsverity=no > [ 2.374985] ff000000.serial: ttyPS0 at MMIO 0xff000000 (irq = 47, base_baud = 6249999) is a xuartps > [ 3.675073] printk: console [ttyPS0] enabled > [ 3.680067] ff010000.serial: ttyPS1 at MMIO 0xff010000 (irq = 48, base_baud = 6249999) is a xuartps > [ 3.689389] of-fpga-region fpga-full: FPGA Region probed > [ 3.695960] nwl-pcie fd0e0000.pcie: host bridge /axi/pcie at fd0e0000 ranges: > [ 3.702858] nwl-pcie fd0e0000.pcie: MEM 0x00e0000000..0x00efffffff -> 0x00e0000000 > [ 3.710863] nwl-pcie fd0e0000.pcie: MEM 0x0600000000..0x07ffffffff -> 0x0600000000 > [ 3.718932] nwl-pcie fd0e0000.pcie: Link is DOWN > [ 3.723692] nwl-pcie fd0e0000.pcie: PCI host bridge to bus 0000:00 > [ 3.729868] pci_bus 0000:00: root bus resource [bus 00-ff] > [ 3.735353] pci_bus 0000:00: root bus resource [mem 0xe0000000-0xefffffff] > [ 3.742225] pci_bus 0000:00: root bus resource [mem 0x600000000-0x7ffffffff pref] > [ 3.749731] pci 0000:00:00.0: [10ee:d021] type 01 class 0x060400 > [ 3.755796] pci 0000:00:00.0: PME# supported from D0 D1 D2 D3hot > [ 3.765470] pci 0000:00:00.0: PCI bridge to [bus 01-0c] > [ 3.771018] xilinx-zynqmp-dma fd500000.dma-controller: ZynqMP DMA driver Probe success > [ 3.779096] xilinx-zynqmp-dma fd510000.dma-controller: ZynqMP DMA driver Probe success > [ 3.787168] xilinx-zynqmp-dma fd520000.dma-controller: ZynqMP DMA driver Probe success > [ 3.795240] xilinx-zynqmp-dma fd530000.dma-controller: ZynqMP DMA driver Probe success > [ 3.803315] xilinx-zynqmp-dma fd540000.dma-controller: ZynqMP DMA driver Probe success > [ 3.811381] xilinx-zynqmp-dma fd550000.dma-controller: ZynqMP DMA driver Probe success > [ 3.819459] xilinx-zynqmp-dma fd560000.dma-controller: ZynqMP DMA driver Probe success > [ 3.827528] xilinx-zynqmp-dma fd570000.dma-controller: ZynqMP DMA driver Probe success > [ 3.835850] xilinx-zynqmp-dpdma fd4c0000.dma-controller: Xilinx DPDMA engine is probed > [ 3.844554] spi-nor spi0.0: found n25q512a, expected m25p80 > [ 3.850649] spi-nor spi0.0: n25q512a (131072 Kbytes) > [ 3.855638] 4 fixed-partitions partitions found on MTD device spi0.0 > [ 3.861982] Creating 4 MTD partitions on "spi0.0": > [ 3.866765] 0x000000000000-0x000000100000 : "qspi-fsbl-uboot" > [ 3.873306] 0x000000100000-0x000000600000 : "qspi-linux" > [ 3.879305] 0x000000600000-0x000000620000 : "qspi-device-tree" > [ 3.885811] 0x000000620000-0x000000c00000 : "qspi-rootfs" > [ 3.894566] macb ff0e0000.ethernet: Not enabling partial store and forward > [ 3.902041] libphy: MACB_mii_bus: probed > [ 3.906625] macb ff0e0000.ethernet eth0: Cadence GEM rev 0x50070106 at 0xff0e0000 irq 30 (00:0a:35:03:6c:ca) > [ 3.916754] xilinx-axipmon ffa00000.perf-monitor: Probed Xilinx APM > [ 3.923298] xilinx-axipmon fd0b0000.perf-monitor: Probed Xilinx APM > [ 3.929802] xilinx-axipmon fd490000.perf-monitor: Probed Xilinx APM > [ 3.936303] xilinx-axipmon ffa10000.perf-monitor: Probed Xilinx APM > [ 3.943645] pca953x 0-0020: supply vcc not found, using dummy regulator > [ 3.950339] pca953x 0-0020: using no AI > [ 3.954846] gpio-318 (sel0): hogged as output/low > [ 3.959756] gpio-319 (sel1): hogged as output/high > [ 3.964755] gpio-320 (sel2): hogged as output/high > [ 3.969753] gpio-321 (sel3): hogged as output/high > [ 3.974906] pca953x 0-0021: supply vcc not found, using dummy regulator > [ 3.981575] pca953x 0-0021: using no AI > [ 3.994348] i2c i2c-0: Added multiplexed i2c bus 2 > [ 4.005627] i2c i2c-0: Added multiplexed i2c bus 3 > [ 4.021538] random: fast init done > [ 4.063343] i2c i2c-0: Added multiplexed i2c bus 4 > [ 4.068256] i2c i2c-0: Added multiplexed i2c bus 5 > [ 4.073051] pca954x 0-0075: registered 4 multiplexed busses for I2C mux pca9544 > [ 4.080406] cdns-i2c ff020000.i2c: 400 kHz mmio ff020000 irq 32 > [ 4.087774] at24 6-0054: supply vcc not found, using dummy regulator > [ 4.094661] at24 6-0054: 1024 byte 24c08 EEPROM, writable, 1 bytes/write > [ 4.101402] i2c i2c-1: Added multiplexed i2c bus 6 > [ 4.106723] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out > [ 4.114028] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out > [ 4.121333] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out > [ 4.128631] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out > [ 4.135932] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out > [ 4.143230] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out > [ 4.150532] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out > [ 4.157832] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out > [ 4.166228] si5341 7-0036: Chip: 5341 Grade: 1 Rev: 1 > [ 4.204262] i2c i2c-1: Added multiplexed i2c bus 7 > [ 4.211860] si570 8-005d: registered, current frequency 300000000 Hz > [ 4.218249] i2c i2c-1: Added multiplexed i2c bus 8 > [ 4.237968] si570 9-005d: registered, current frequency 148500000 Hz > [ 4.244356] i2c i2c-1: Added multiplexed i2c bus 9 > [ 4.249368] si5324 10-0069: si5328 probed > [ 4.316105] si5324 10-0069: si5328 probe successful > [ 4.321023] i2c i2c-1: Added multiplexed i2c bus 10 > [ 4.326009] i2c i2c-1: Added multiplexed i2c bus 11 > [ 4.331002] i2c i2c-1: Added multiplexed i2c bus 12 > [ 4.335995] i2c i2c-1: Added multiplexed i2c bus 13 > [ 4.340870] pca954x 1-0074: registered 8 multiplexed busses for I2C switch pca9548 > [ 4.348795] i2c i2c-1: Added multiplexed i2c bus 14 > [ 4.353797] i2c i2c-1: Added multiplexed i2c bus 15 > [ 4.358799] i2c i2c-1: Added multiplexed i2c bus 16 > [ 4.363811] i2c i2c-1: Added multiplexed i2c bus 17 > [ 4.368809] i2c i2c-1: Added multiplexed i2c bus 18 > [ 4.373819] i2c i2c-1: Added multiplexed i2c bus 19 > [ 4.378823] i2c i2c-1: Added multiplexed i2c bus 20 > [ 4.383828] i2c i2c-1: Added multiplexed i2c bus 21 > [ 4.388705] pca954x 1-0075: registered 8 multiplexed busses for I2C switch pca9548 > [ 4.396304] cdns-i2c ff030000.i2c: 400 kHz mmio ff030000 irq 33 > [ 4.406274] cdns-wdt fd4d0000.watchdog: Xilinx Watchdog Timer with timeout 60s > [ 4.415726] zynqmp-display fd4a0000.display: vtc bridge property not present > [ 4.424824] xilinx-dp-snd-codec fd4a0000.display:zynqmp_dp_snd_codec0: Xilinx DisplayPort Sound Codec probed > [ 4.434896] xilinx-dp-snd-pcm zynqmp_dp_snd_pcm0: Xilinx DisplayPort Sound PCM probed > [ 4.442954] xilinx-dp-snd-pcm zynqmp_dp_snd_pcm1: Xilinx DisplayPort Sound PCM probed > [ 4.448513] mmc0: SDHCI controller on ff170000.mmc [ff170000.mmc] using ADMA 64-bit > [ 4.459057] xilinx-dp-snd-card fd4a0000.display:zynqmp_dp_snd_card: Xilinx DisplayPort Sound Card probed > [ 4.468634] OF: graph: no port node found in /axi/display at fd4a0000 > [ 4.475120] xlnx-drm xlnx-drm.0: bound fd4a0000.display (ops 0xffffffc010e17fa0) > [ 4.482712] [drm] Initialized xlnx 1.0.0 20130509 for fd4a0000.display on minor 0 > [ 4.490206] zynqmp-display fd4a0000.display: ZynqMP DisplayPort Subsystem driver probed > [ 4.496962] mmc0: new high speed SDHC card at address aaaa > [ 4.498430] ahci-ceva fd0c0000.ahci: supply ahci not found, using dummy regulator > [ 4.511219] ahci-ceva fd0c0000.ahci: supply phy not found, using dummy regulator > [ 4.511379] mmcblk0: mmc0:aaaa SB16G 14.8 GiB > [ 4.518690] ahci-ceva fd0c0000.ahci: supply target not found, using dummy regulator > [ 4.527484] mmcblk0: p1 p2 > [ 4.540954] ahci-ceva fd0c0000.ahci: AHCI 0001.0301 32 slots 2 ports 6 Gbps 0x3 impl platform mode > [ 4.549923] ahci-ceva fd0c0000.ahci: flags: 64bit ncq sntf pm clo only pmp fbs pio slum part ccc sds apst > [ 4.560268] scsi host0: ahci-ceva > [ 4.563829] scsi host1: ahci-ceva > [ 4.567237] ata1: SATA max UDMA/133 mmio [mem 0xfd0c0000-0xfd0c1fff] port 0x100 irq 45 > [ 4.575152] ata2: SATA max UDMA/133 mmio [mem 0xfd0c0000-0xfd0c1fff] port 0x180 irq 45 > [ 4.605877] xhci-hcd xhci-hcd.1.auto: xHCI Host Controller > [ 4.611375] xhci-hcd xhci-hcd.1.auto: new USB bus registered, assigned bus number 1 > [ 4.619123] xhci-hcd xhci-hcd.1.auto: hcc params 0x0238f625 hci version 0x100 quirks 0x0000000002010810 > [ 4.628540] xhci-hcd xhci-hcd.1.auto: irq 53, io mem 0xfe200000 > [ 4.634549] xhci-hcd xhci-hcd.1.auto: xHCI Host Controller > [ 4.640035] xhci-hcd xhci-hcd.1.auto: new USB bus registered, assigned bus number 2 > [ 4.647692] xhci-hcd xhci-hcd.1.auto: Host supports USB 3.0 SuperSpeed > [ 4.654319] usb usb1: New USB device found, idVendor=1d6b, idProduct=0002, bcdDevice= 5.15 > [ 4.662582] usb usb1: New USB device strings: Mfr=3, Product=2, SerialNumber=1 > [ 4.669795] usb usb1: Product: xHCI Host Controller > [ 4.674664] usb usb1: Manufacturer: Linux 5.15.0 xhci-hcd > [ 4.680054] usb usb1: SerialNumber: xhci-hcd.1.auto > [ 4.685214] hub 1-0:1.0: USB hub found > [ 4.688988] hub 1-0:1.0: 1 port detected > [ 4.693202] usb usb2: New USB device found, idVendor=1d6b, idProduct=0003, bcdDevice= 5.15 > [ 4.701463] usb usb2: New USB device strings: Mfr=3, Product=2, SerialNumber=1 > [ 4.708682] usb usb2: Product: xHCI Host Controller > [ 4.713550] usb usb2: Manufacturer: Linux 5.15.0 xhci-hcd > [ 4.718944] usb usb2: SerialNumber: xhci-hcd.1.auto > [ 4.724075] hub 2-0:1.0: USB hub found > [ 4.727842] hub 2-0:1.0: 1 port detected > [ 4.734650] input: gpio-keys as /devices/platform/gpio-keys/input/input0 > [ 4.741660] of_cfs_init > [ 4.744131] of_cfs_init: OK > [ 4.747039] cfg80211: Loading compiled-in X.509 certificates for regulatory database > [ 4.881580] cfg80211: Loaded X.509 cert 'sforshee: 00b28ddf47aef9cea7' > [ 4.888214] zynqmp_pll_disable() clock disable failed for dpll_int, ret = -13 > [ 4.896228] platform regulatory.0: Direct firmware load for regulatory.db failed with error -2 > [ 4.897975] ata2: SATA link down (SStatus 0 SControl 330) > [ 4.904842] cfg80211: failed to load regulatory.db > [ 4.905622] ALSA device list: > [ 4.905626] #0: DisplayPort monitor > [ 4.910252] ata1: SATA link down (SStatus 0 SControl 330) > [ 4.950910] EXT4-fs (mmcblk0p2): mounted filesystem with ordered data mode. Opts: (null). Quota mode: none. > [ 4.960680] VFS: Mounted root (ext4 filesystem) on device 179:2. > [ 4.969332] devtmpfs: mounted > [ 4.972830] Freeing unused kernel memory: 1984K > [ 4.977453] Run /sbin/init as init process > [ 5.056434] EXT4-fs (mmcblk0p2): re-mounted. Opts: (null). Quota mode: none. > Starting syslogd: OK > Starting klogd: OK > Running sysctl: OK > Saving random seed: [ 5.105554] random: dd: uninitialized urandom read (512 bytes read) > OK > Starting network: OK > > Welcome to Buildroot > buildroot login: root > # > > Best regards, > Neal Frager > Xilinx > > From giulio.benetti at benettiengineering.com Tue Feb 8 16:31:31 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 8 Feb 2022 17:31:31 +0100 Subject: [Buildroot] [PATCH 1/2] configs/zynqmp_zcu106: Bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: References: <20220208071559.2862411-1-neal.frager@xilinx.com> <69efa9da-ae55-6795-8724-ed7105083924@benettiengineering.com> <32cc1c12-1496-7db9-5e32-1b99404a4fe3@benettiengineering.com> Message-ID: Hi Neal, On 08/02/22 12:56, Neal Frager wrote: > Hi Giulio, > >> I think you should go with local patch honestly. >> As the patch is now. > >> -- >> Giulio Benetti >> Benetti Engineering sas > > Ok. Please go ahead and start building with the patch as is. I have tested it on my side. It builds and runs without needing any manual steps. I'm building both defconfigs and see if everything is ok. In meanwhile I ask you to subscribe and set as "superseded" the old patches in buildroot patchwork: https://patchwork.ozlabs.org/project/buildroot/list/ Take care next times, when you send another version you should produce the patch with -v2(or -v3 etc.) flash and indicate what you've changed between versions. Thank you! Best regards -- Giulio Benetti Benetti Engineering sas From giulio.benetti at benettiengineering.com Tue Feb 8 16:32:59 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 8 Feb 2022 17:32:59 +0100 Subject: [Buildroot] Xilinx mainline ATF v2.6 In-Reply-To: References: <11BB5427-9C48-4116-AECB-EA33631B3519@benettiengineering.com> Message-ID: <2abae9e5-6dfc-838f-301e-a0e15af2a0f5@benettiengineering.com> On 08/02/22 17:31, Neal Frager wrote: > Hi Giulio, > >> Thanks a lot for testing runtime. >> It should be merged soon as you can see from gerrit :-) > > Excellent news! I added a comment to gerrit which should only help. I've just received the notifications via e-mail and checked, thanks a lot! :-) -- Giulio Benetti Benetti Engineering sas >> >> ------ >> >> U-Boot SPL 2022.01 (Feb 08 2022 - 15:18:47 +0000) >> PMUFW: v1.1 >> Loading new PMUFW cfg obj (2200 bytes) >> Silicon version: 3 >> EL Level: EL3 >> Chip ID: zu9eg >> Multiboot: 0 >> Trying to boot from MMC2 >> spl: could not initialize mmc. error: -19 Trying to boot from MMC1 >> spl_load_image_fat_os: error reading image u-boot.bin, err - -2 >> NOTICE: TF-A running on XCZU9EG/silicon at 0xfffea000 >> NOTICE: BL31: v2.6(release):2021.11-1539-gba7dbc88c5-dirty >> NOTICE: BL31: Built : 15:15:15, Feb 8 2022 >> >> >> U-Boot 2022.01 (Feb 08 2022 - 15:18:47 +0000) >> >> CPU: ZynqMP >> Silicon: v3 >> Model: ZynqMP ZCU102 Rev1.0 >> Board: Xilinx ZynqMP >> DRAM: 4 GiB >> PMUFW: v1.1 >> Xilinx I2C Legacy format at nvmem0: >> Board name: zcu102 >> Board rev: 1.0 >> Board SN: 847318611722-66244 >> Ethernet mac: 00:0a:35:03:6c:ca >> EL Level: EL2 >> Chip ID: zu9eg >> NAND: 0 MiB >> MMC: mmc at ff170000: 0 >> Loading Environment from FAT... *** Error - No Valid Environment Area found >> *** Warning - bad env area, using default environment >> >> In: serial >> Out: serial >> Err: serial >> Bootmode: LVL_SHFT_SD_MODE1 >> Reset reason: EXTERNAL >> Net: >> ZYNQ GEM: ff0e0000, mdio bus ff0e0000, phyaddr 12, interface rgmii-id >> eth0: ethernet at ff0e0000 >> scanning bus for devices... >> SATA link 0 timeout. >> SATA link 1 timeout. >> AHCI 0001.0301 32 slots 2 ports 6 Gbps 0x3 impl SATA mode >> flags: 64bit ncq pm clo only pmp fbss pio slum part ccc apst >> starting USB... >> Bus usb at fe200000: Register 2000440 NbrPorts 2 >> Starting the controller >> USB XHCI 1.00 >> scanning bus usb at fe200000 for devices... 1 USB Device(s) found >> scanning usb for storage devices... 0 Storage Device(s) found >> Hit any key to stop autoboot: 0 >> switch to partitions #0, OK >> mmc0 is current device >> Scanning mmc 0:1... >> Found /extlinux/extlinux.conf >> Retrieving file: /extlinux/extlinux.conf >> 1: linux >> Retrieving file: /Image >> append: console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait >> Retrieving file: /system.dtb >> ## Flattened Device Tree blob at 40000000 >> Booting using the fdt blob at 0x40000000 >> Loading Device Tree to 000000007bdf5000, end 000000007be01d46 ... OK >> >> Starting kernel ... >> >> [ 0.000000] Booting Linux on physical CPU 0x0000000000 [0x410fd034] >> [ 0.000000] Linux version 5.15.0 (nealf at xirengwts08) (aarch64-buildroot-linux-uclibc-gcc.br_real (Buildroot 2021.11-1539-gba7dbc88c5) 10.3.0, GNU ld (GNU Binutils) 2.36.1) #1 SMP Tue Feb 8 09:42:51 GMT 2022 >> [ 0.000000] Machine model: ZynqMP ZCU102 Rev1.0 >> [ 0.000000] efi: UEFI not found. >> [ 0.000000] Zone ranges: >> [ 0.000000] DMA32 [mem 0x0000000000000000-0x00000000ffffffff] >> [ 0.000000] Normal [mem 0x0000000100000000-0x000000087fffffff] >> [ 0.000000] Movable zone start for each node >> [ 0.000000] Early memory node ranges >> [ 0.000000] node 0: [mem 0x0000000000000000-0x000000007fffffff] >> [ 0.000000] node 0: [mem 0x0000000800000000-0x000000087fffffff] >> [ 0.000000] Initmem setup node 0 [mem 0x0000000000000000-0x000000087fffffff] >> [ 0.000000] cma: Reserved 256 MiB at 0x000000006bc00000 >> [ 0.000000] psci: probing for conduit method from DT. >> [ 0.000000] psci: PSCIv1.1 detected in firmware. >> [ 0.000000] psci: Using standard PSCI v0.2 function IDs >> [ 0.000000] psci: MIGRATE_INFO_TYPE not supported. >> [ 0.000000] psci: SMC Calling Convention v1.2 >> [ 0.000000] percpu: Embedded 18 pages/cpu s33048 r8192 d32488 u73728 >> [ 0.000000] Detected VIPT I-cache on CPU0 >> [ 0.000000] CPU features: detected: ARM erratum 845719 >> [ 0.000000] Built 1 zonelists, mobility grouping on. Total pages: 1034240 >> [ 0.000000] Kernel command line: console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait >> [ 0.000000] Dentry cache hash table entries: 524288 (order: 10, 4194304 bytes, linear) >> [ 0.000000] Inode-cache hash table entries: 262144 (order: 9, 2097152 bytes, linear) >> [ 0.000000] mem auto-init: stack:off, heap alloc:off, heap free:off >> [ 0.000000] software IO TLB: mapped [mem 0x000000007c000000-0x0000000080000000] (64MB) >> [ 0.000000] Memory: 3772784K/4194304K available (13568K kernel code, 904K rwdata, 3864K rodata, 1984K init, 306K bss, 159376K reserved, 262144K cma-reserved) >> [ 0.000000] rcu: Hierarchical RCU implementation. >> [ 0.000000] rcu: RCU event tracing is enabled. >> [ 0.000000] rcu: RCU calculated value of scheduler-enlistment delay is 25 jiffies. >> [ 0.000000] NR_IRQS: 64, nr_irqs: 64, preallocated irqs: 0 >> [ 0.000000] GIC: Adjusting CPU interface base to 0x00000000f902f000 >> [ 0.000000] Root IRQ handler: gic_handle_irq >> [ 0.000000] GIC: Using split EOI/Deactivate mode >> [ 0.000000] random: get_random_bytes called from start_kernel+0x470/0x6f8 with crng_init=0 >> [ 0.000000] arch_timer: cp15 timer(s) running at 100.00MHz (phys). >> [ 0.000000] clocksource: arch_sys_counter: mask: 0xffffffffffffff max_cycles: 0x171024e7e0, max_idle_ns: 440795205315 ns >> [ 0.000000] sched_clock: 56 bits at 100MHz, resolution 10ns, wraps every 4398046511100ns >> [ 0.000302] Console: colour dummy device 80x25 >> [ 0.000335] Calibrating delay loop (skipped), value calculated using timer frequency.. 200.00 BogoMIPS (lpj=400000) >> [ 0.000346] pid_max: default: 32768 minimum: 301 >> [ 0.000454] Mount-cache hash table entries: 8192 (order: 4, 65536 bytes, linear) >> [ 0.000474] Mountpoint-cache hash table entries: 8192 (order: 4, 65536 bytes, linear) >> [ 0.001288] rcu: Hierarchical SRCU implementation. >> [ 0.001556] EFI services will not be available. >> [ 0.001681] smp: Bringing up secondary CPUs ... >> [ 0.002000] Detected VIPT I-cache on CPU1 >> [ 0.002037] CPU1: Booted secondary processor 0x0000000001 [0x410fd034] >> [ 0.002399] Detected VIPT I-cache on CPU2 >> [ 0.002422] CPU2: Booted secondary processor 0x0000000002 [0x410fd034] >> [ 0.002749] Detected VIPT I-cache on CPU3 >> [ 0.002771] CPU3: Booted secondary processor 0x0000000003 [0x410fd034] >> [ 0.002814] smp: Brought up 1 node, 4 CPUs >> [ 0.002831] SMP: Total of 4 processors activated. >> [ 0.002836] CPU features: detected: 32-bit EL0 Support >> [ 0.002842] CPU features: detected: CRC32 instructions >> [ 0.002883] CPU: All CPU(s) started at EL2 >> [ 0.002898] alternatives: patching kernel code >> [ 0.003949] devtmpfs: initialized >> [ 0.009573] clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 7645041785100000 ns >> [ 0.009592] futex hash table entries: 1024 (order: 4, 65536 bytes, linear) >> [ 0.017450] pinctrl core: initialized pinctrl subsystem >> [ 0.018081] NET: Registered PF_NETLINK/PF_ROUTE protocol family >> [ 0.019062] DMA: preallocated 512 KiB GFP_KERNEL pool for atomic allocations >> [ 0.019156] DMA: preallocated 512 KiB GFP_KERNEL|GFP_DMA32 pool for atomic allocations >> [ 0.019193] audit: initializing netlink subsys (disabled) >> [ 0.019268] audit: type=2000 audit(0.016:1): state=initialized audit_enabled=0 res=1 >> [ 0.019561] hw-breakpoint: found 6 breakpoint and 4 watchpoint registers. >> [ 0.019621] ASID allocator initialised with 65536 entries >> [ 0.037594] HugeTLB registered 1.00 GiB page size, pre-allocated 0 pages >> [ 0.037607] HugeTLB registered 32.0 MiB page size, pre-allocated 0 pages >> [ 0.037614] HugeTLB registered 2.00 MiB page size, pre-allocated 0 pages >> [ 0.037620] HugeTLB registered 64.0 KiB page size, pre-allocated 0 pages >> [ 1.102226] DRBG: Continuing without Jitter RNG >> [ 1.204763] raid6: neonx8 gen() 2139 MB/s >> [ 1.272812] raid6: neonx8 xor() 1593 MB/s >> [ 1.340871] raid6: neonx4 gen() 2187 MB/s >> [ 1.408916] raid6: neonx4 xor() 1576 MB/s >> [ 1.476978] raid6: neonx2 gen() 2068 MB/s >> [ 1.545028] raid6: neonx2 xor() 1447 MB/s >> [ 1.613093] raid6: neonx1 gen() 1803 MB/s >> [ 1.681147] raid6: neonx1 xor() 1240 MB/s >> [ 1.749207] raid6: int64x8 gen() 1471 MB/s >> [ 1.817250] raid6: int64x8 xor() 785 MB/s >> [ 1.885312] raid6: int64x4 gen() 1557 MB/s >> [ 1.953371] raid6: int64x4 xor() 842 MB/s >> [ 2.021437] raid6: int64x2 gen() 1396 MB/s >> [ 2.089488] raid6: int64x2 xor() 750 MB/s >> [ 2.157543] raid6: int64x1 gen() 1186 MB/s >> [ 2.225599] raid6: int64x1 xor() 596 MB/s >> [ 2.225604] raid6: using algorithm neonx4 gen() 2187 MB/s >> [ 2.225610] raid6: .... xor() 1576 MB/s, rmw enabled >> [ 2.225615] raid6: using neon recovery algorithm >> [ 2.225994] iommu: Default domain type: Translated >> [ 2.226001] iommu: DMA domain TLB invalidation policy: strict mode >> [ 2.226220] SCSI subsystem initialized >> [ 2.226362] usbcore: registered new interface driver usbfs >> [ 2.226390] usbcore: registered new interface driver hub >> [ 2.226417] usbcore: registered new device driver usb >> [ 2.226469] mc: Linux media interface: v0.10 >> [ 2.226488] videodev: Linux video capture interface: v2.00 >> [ 2.226525] pps_core: LinuxPPS API ver. 1 registered >> [ 2.226531] pps_core: Software ver. 5.3.6 - Copyright 2005-2007 Rodolfo Giometti >> [ 2.226543] PTP clock support registered >> [ 2.226569] EDAC MC: Ver: 3.0.0 >> [ 2.226852] zynqmp-ipi-mbox mailbox at ff990400: Registered ZynqMP IPI mbox with TX/RX channels. >> [ 2.227040] FPGA manager framework >> [ 2.227166] Advanced Linux Sound Architecture Driver Initialized. >> [ 2.227447] Bluetooth: Core ver 2.22 >> [ 2.227471] NET: Registered PF_BLUETOOTH protocol family >> [ 2.227476] Bluetooth: HCI device and connection manager initialized >> [ 2.227485] Bluetooth: HCI socket layer initialized >> [ 2.227491] Bluetooth: L2CAP socket layer initialized >> [ 2.227502] Bluetooth: SCO socket layer initialized >> [ 2.227789] clocksource: Switched to clocksource arch_sys_counter >> [ 2.227887] VFS: Disk quotas dquot_6.6.0 >> [ 2.227926] VFS: Dquot-cache hash table entries: 512 (order 0, 4096 bytes) >> [ 2.231840] NET: Registered PF_INET protocol family >> [ 2.231964] IP idents hash table entries: 65536 (order: 7, 524288 bytes, linear) >> [ 2.233486] tcp_listen_portaddr_hash hash table entries: 2048 (order: 3, 32768 bytes, linear) >> [ 2.233533] TCP established hash table entries: 32768 (order: 6, 262144 bytes, linear) >> [ 2.233739] TCP bind hash table entries: 32768 (order: 7, 524288 bytes, linear) >> [ 2.234123] TCP: Hash tables configured (established 32768 bind 32768) >> [ 2.234190] UDP hash table entries: 2048 (order: 4, 65536 bytes, linear) >> [ 2.234266] UDP-Lite hash table entries: 2048 (order: 4, 65536 bytes, linear) >> [ 2.234416] NET: Registered PF_UNIX/PF_LOCAL protocol family >> [ 2.234703] RPC: Registered named UNIX socket transport module. >> [ 2.234710] RPC: Registered udp transport module. >> [ 2.234714] RPC: Registered tcp transport module. >> [ 2.234719] RPC: Registered tcp NFSv4.1 backchannel transport module. >> [ 2.235305] PCI: CLS 0 bytes, default 64 >> [ 2.235585] armv8-pmu pmu: hw perfevents: no interrupt-affinity property, guessing. >> [ 2.235747] hw perfevents: enabled with armv8_pmuv3 PMU driver, 7 counters available >> [ 2.236543] Initialise system trusted keyrings >> [ 2.236640] workingset: timestamp_bits=62 max_order=20 bucket_order=0 >> [ 2.237202] NFS: Registering the id_resolver key type >> [ 2.237216] Key type id_resolver registered >> [ 2.237221] Key type id_legacy registered >> [ 2.237237] nfs4filelayout_init: NFSv4 File Layout Driver Registering... >> [ 2.237244] nfs4flexfilelayout_init: NFSv4 Flexfile Layout Driver Registering... >> [ 2.237261] jffs2: version 2.2. (NAND) ?? 2001-2006 Red Hat, Inc. >> [ 2.273306] NET: Registered PF_ALG protocol family >> [ 2.273320] xor: measuring software checksum speed >> [ 2.277366] 8regs : 2438 MB/sec >> [ 2.280888] 32regs : 2800 MB/sec >> [ 2.285157] arm64_neon : 2309 MB/sec >> [ 2.285163] xor: using function: 32regs (2800 MB/sec) >> [ 2.285170] Key type asymmetric registered >> [ 2.285175] Asymmetric key parser 'x509' registered >> [ 2.285211] Block layer SCSI generic (bsg) driver version 0.4 loaded (major 245) >> [ 2.285218] io scheduler mq-deadline registered >> [ 2.285223] io scheduler kyber registered >> [ 2.309790] Serial: 8250/16550 driver, 4 ports, IRQ sharing disabled >> [ 2.313198] cacheinfo: Unable to detect cache hierarchy for CPU 0 >> [ 2.317134] brd: module loaded >> [ 2.320288] loop: module loaded >> [ 2.321033] mtdoops: mtd device (mtddev=name/number) must be supplied >> [ 2.322271] libphy: Fixed MDIO Bus: probed >> [ 2.323366] tun: Universal TUN/TAP device driver, 1.6 >> [ 2.323447] CAN device driver interface >> [ 2.324182] usbcore: registered new interface driver asix >> [ 2.324219] usbcore: registered new interface driver ax88179_178a >> [ 2.324244] usbcore: registered new interface driver cdc_ether >> [ 2.324266] usbcore: registered new interface driver net1080 >> [ 2.324287] usbcore: registered new interface driver cdc_subset >> [ 2.324310] usbcore: registered new interface driver zaurus >> [ 2.324342] usbcore: registered new interface driver cdc_ncm >> [ 2.325046] usbcore: registered new interface driver uas >> [ 2.325077] usbcore: registered new interface driver usb-storage >> [ 2.325704] rtc_zynqmp ffa60000.rtc: registered as rtc0 >> [ 2.325721] rtc_zynqmp ffa60000.rtc: setting system clock to 2021-01-25T16:34:35 UTC (1611592475) >> [ 2.325789] i2c_dev: i2c /dev entries driver >> [ 2.327253] usbcore: registered new interface driver uvcvideo >> [ 2.328075] Bluetooth: HCI UART driver ver 2.3 >> [ 2.328082] Bluetooth: HCI UART protocol H4 registered >> [ 2.328088] Bluetooth: HCI UART protocol BCSP registered >> [ 2.328106] Bluetooth: HCI UART protocol LL registered >> [ 2.328112] Bluetooth: HCI UART protocol ATH3K registered >> [ 2.328128] Bluetooth: HCI UART protocol Three-wire (H5) registered >> [ 2.328166] Bluetooth: HCI UART protocol Intel registered >> [ 2.328182] Bluetooth: HCI UART protocol QCA registered >> [ 2.328211] usbcore: registered new interface driver bcm203x >> [ 2.328237] usbcore: registered new interface driver bpa10x >> [ 2.328262] usbcore: registered new interface driver bfusb >> [ 2.328287] usbcore: registered new interface driver btusb >> [ 2.328324] usbcore: registered new interface driver ath3k >> [ 2.328397] EDAC MC: ECC not enabled >> [ 2.328531] EDAC DEVICE0: Giving out device to module edac controller cache_err: DEV edac (POLLED) >> [ 2.328682] EDAC DEVICE1: Giving out device to module zynqmp-ocm-edac controller zynqmp_ocm: DEV ff960000.memory-controller (INTERRUPT) >> [ 2.329022] sdhci: Secure Digital Host Controller Interface driver >> [ 2.329028] sdhci: Copyright(c) Pierre Ossman >> [ 2.329032] sdhci-pltfm: SDHCI platform and OF driver helper >> [ 2.329372] ledtrig-cpu: registered to indicate activity on CPUs >> [ 2.329463] SMCCC: SOC_ID: ARCH_SOC_ID not implemented, skipping .... >> [ 2.329501] zynqmp_firmware_probe Platform Management API v1.1 >> [ 2.329510] zynqmp_firmware_probe Trustzone version v1.0 >> [ 2.359668] securefw securefw: securefw probed >> [ 2.359886] alg: No test for xilinx-zynqmp-aes (zynqmp-aes) >> [ 2.359905] zynqmp_aes firmware:zynqmp-firmware:zynqmp-aes: AES Successfully Registered >> [ 2.360070] alg: No test for xilinx-keccak-384 (zynqmp-keccak-384) >> [ 2.360247] alg: No test for xilinx-zynqmp-rsa (zynqmp-rsa) >> [ 2.360389] usbcore: registered new interface driver usbhid >> [ 2.360395] usbhid: USB HID core driver >> [ 2.363052] fpga_manager fpga0: Xilinx ZynqMP FPGA Manager registered >> [ 2.363387] usbcore: registered new interface driver snd-usb-audio >> [ 2.364208] pktgen: Packet Generator for packet performance testing. Version: 2.75 >> [ 2.364576] Initializing XFRM netlink socket >> [ 2.364653] NET: Registered PF_INET6 protocol family >> [ 2.365096] Segment Routing with IPv6 >> [ 2.365114] In-situ OAM (IOAM) with IPv6 >> [ 2.365163] sit: IPv6, IPv4 and MPLS over IPv4 tunneling driver >> [ 2.365470] NET: Registered PF_PACKET protocol family >> [ 2.365487] NET: Registered PF_KEY protocol family >> [ 2.365507] can: controller area network core >> [ 2.365536] NET: Registered PF_CAN protocol family >> [ 2.365542] can: raw protocol >> [ 2.365548] can: broadcast manager protocol >> [ 2.365555] can: netlink gateway - max_hops=1 >> [ 2.365624] Bluetooth: RFCOMM TTY layer initialized >> [ 2.365634] Bluetooth: RFCOMM socket layer initialized >> [ 2.365649] Bluetooth: RFCOMM ver 1.11 >> [ 2.365658] Bluetooth: BNEP (Ethernet Emulation) ver 1.3 >> [ 2.365664] Bluetooth: BNEP filters: protocol multicast >> [ 2.365671] Bluetooth: BNEP socket layer initialized >> [ 2.365676] Bluetooth: HIDP (Human Interface Emulation) ver 1.2 >> [ 2.365683] Bluetooth: HIDP socket layer initialized >> [ 2.365793] 9pnet: Installing 9P2000 support >> [ 2.365811] Key type dns_resolver registered >> [ 2.365915] registered taskstats version 1 >> [ 2.365921] Loading compiled-in X.509 certificates >> [ 2.366901] Btrfs loaded, crc32c=crc32c-generic, zoned=no, fsverity=no >> [ 2.374985] ff000000.serial: ttyPS0 at MMIO 0xff000000 (irq = 47, base_baud = 6249999) is a xuartps >> [ 3.675073] printk: console [ttyPS0] enabled >> [ 3.680067] ff010000.serial: ttyPS1 at MMIO 0xff010000 (irq = 48, base_baud = 6249999) is a xuartps >> [ 3.689389] of-fpga-region fpga-full: FPGA Region probed >> [ 3.695960] nwl-pcie fd0e0000.pcie: host bridge /axi/pcie at fd0e0000 ranges: >> [ 3.702858] nwl-pcie fd0e0000.pcie: MEM 0x00e0000000..0x00efffffff -> 0x00e0000000 >> [ 3.710863] nwl-pcie fd0e0000.pcie: MEM 0x0600000000..0x07ffffffff -> 0x0600000000 >> [ 3.718932] nwl-pcie fd0e0000.pcie: Link is DOWN >> [ 3.723692] nwl-pcie fd0e0000.pcie: PCI host bridge to bus 0000:00 >> [ 3.729868] pci_bus 0000:00: root bus resource [bus 00-ff] >> [ 3.735353] pci_bus 0000:00: root bus resource [mem 0xe0000000-0xefffffff] >> [ 3.742225] pci_bus 0000:00: root bus resource [mem 0x600000000-0x7ffffffff pref] >> [ 3.749731] pci 0000:00:00.0: [10ee:d021] type 01 class 0x060400 >> [ 3.755796] pci 0000:00:00.0: PME# supported from D0 D1 D2 D3hot >> [ 3.765470] pci 0000:00:00.0: PCI bridge to [bus 01-0c] >> [ 3.771018] xilinx-zynqmp-dma fd500000.dma-controller: ZynqMP DMA driver Probe success >> [ 3.779096] xilinx-zynqmp-dma fd510000.dma-controller: ZynqMP DMA driver Probe success >> [ 3.787168] xilinx-zynqmp-dma fd520000.dma-controller: ZynqMP DMA driver Probe success >> [ 3.795240] xilinx-zynqmp-dma fd530000.dma-controller: ZynqMP DMA driver Probe success >> [ 3.803315] xilinx-zynqmp-dma fd540000.dma-controller: ZynqMP DMA driver Probe success >> [ 3.811381] xilinx-zynqmp-dma fd550000.dma-controller: ZynqMP DMA driver Probe success >> [ 3.819459] xilinx-zynqmp-dma fd560000.dma-controller: ZynqMP DMA driver Probe success >> [ 3.827528] xilinx-zynqmp-dma fd570000.dma-controller: ZynqMP DMA driver Probe success >> [ 3.835850] xilinx-zynqmp-dpdma fd4c0000.dma-controller: Xilinx DPDMA engine is probed >> [ 3.844554] spi-nor spi0.0: found n25q512a, expected m25p80 >> [ 3.850649] spi-nor spi0.0: n25q512a (131072 Kbytes) >> [ 3.855638] 4 fixed-partitions partitions found on MTD device spi0.0 >> [ 3.861982] Creating 4 MTD partitions on "spi0.0": >> [ 3.866765] 0x000000000000-0x000000100000 : "qspi-fsbl-uboot" >> [ 3.873306] 0x000000100000-0x000000600000 : "qspi-linux" >> [ 3.879305] 0x000000600000-0x000000620000 : "qspi-device-tree" >> [ 3.885811] 0x000000620000-0x000000c00000 : "qspi-rootfs" >> [ 3.894566] macb ff0e0000.ethernet: Not enabling partial store and forward >> [ 3.902041] libphy: MACB_mii_bus: probed >> [ 3.906625] macb ff0e0000.ethernet eth0: Cadence GEM rev 0x50070106 at 0xff0e0000 irq 30 (00:0a:35:03:6c:ca) >> [ 3.916754] xilinx-axipmon ffa00000.perf-monitor: Probed Xilinx APM >> [ 3.923298] xilinx-axipmon fd0b0000.perf-monitor: Probed Xilinx APM >> [ 3.929802] xilinx-axipmon fd490000.perf-monitor: Probed Xilinx APM >> [ 3.936303] xilinx-axipmon ffa10000.perf-monitor: Probed Xilinx APM >> [ 3.943645] pca953x 0-0020: supply vcc not found, using dummy regulator >> [ 3.950339] pca953x 0-0020: using no AI >> [ 3.954846] gpio-318 (sel0): hogged as output/low >> [ 3.959756] gpio-319 (sel1): hogged as output/high >> [ 3.964755] gpio-320 (sel2): hogged as output/high >> [ 3.969753] gpio-321 (sel3): hogged as output/high >> [ 3.974906] pca953x 0-0021: supply vcc not found, using dummy regulator >> [ 3.981575] pca953x 0-0021: using no AI >> [ 3.994348] i2c i2c-0: Added multiplexed i2c bus 2 >> [ 4.005627] i2c i2c-0: Added multiplexed i2c bus 3 >> [ 4.021538] random: fast init done >> [ 4.063343] i2c i2c-0: Added multiplexed i2c bus 4 >> [ 4.068256] i2c i2c-0: Added multiplexed i2c bus 5 >> [ 4.073051] pca954x 0-0075: registered 4 multiplexed busses for I2C mux pca9544 >> [ 4.080406] cdns-i2c ff020000.i2c: 400 kHz mmio ff020000 irq 32 >> [ 4.087774] at24 6-0054: supply vcc not found, using dummy regulator >> [ 4.094661] at24 6-0054: 1024 byte 24c08 EEPROM, writable, 1 bytes/write >> [ 4.101402] i2c i2c-1: Added multiplexed i2c bus 6 >> [ 4.106723] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out >> [ 4.114028] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out >> [ 4.121333] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out >> [ 4.128631] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out >> [ 4.135932] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out >> [ 4.143230] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out >> [ 4.150532] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out >> [ 4.157832] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out >> [ 4.166228] si5341 7-0036: Chip: 5341 Grade: 1 Rev: 1 >> [ 4.204262] i2c i2c-1: Added multiplexed i2c bus 7 >> [ 4.211860] si570 8-005d: registered, current frequency 300000000 Hz >> [ 4.218249] i2c i2c-1: Added multiplexed i2c bus 8 >> [ 4.237968] si570 9-005d: registered, current frequency 148500000 Hz >> [ 4.244356] i2c i2c-1: Added multiplexed i2c bus 9 >> [ 4.249368] si5324 10-0069: si5328 probed >> [ 4.316105] si5324 10-0069: si5328 probe successful >> [ 4.321023] i2c i2c-1: Added multiplexed i2c bus 10 >> [ 4.326009] i2c i2c-1: Added multiplexed i2c bus 11 >> [ 4.331002] i2c i2c-1: Added multiplexed i2c bus 12 >> [ 4.335995] i2c i2c-1: Added multiplexed i2c bus 13 >> [ 4.340870] pca954x 1-0074: registered 8 multiplexed busses for I2C switch pca9548 >> [ 4.348795] i2c i2c-1: Added multiplexed i2c bus 14 >> [ 4.353797] i2c i2c-1: Added multiplexed i2c bus 15 >> [ 4.358799] i2c i2c-1: Added multiplexed i2c bus 16 >> [ 4.363811] i2c i2c-1: Added multiplexed i2c bus 17 >> [ 4.368809] i2c i2c-1: Added multiplexed i2c bus 18 >> [ 4.373819] i2c i2c-1: Added multiplexed i2c bus 19 >> [ 4.378823] i2c i2c-1: Added multiplexed i2c bus 20 >> [ 4.383828] i2c i2c-1: Added multiplexed i2c bus 21 >> [ 4.388705] pca954x 1-0075: registered 8 multiplexed busses for I2C switch pca9548 >> [ 4.396304] cdns-i2c ff030000.i2c: 400 kHz mmio ff030000 irq 33 >> [ 4.406274] cdns-wdt fd4d0000.watchdog: Xilinx Watchdog Timer with timeout 60s >> [ 4.415726] zynqmp-display fd4a0000.display: vtc bridge property not present >> [ 4.424824] xilinx-dp-snd-codec fd4a0000.display:zynqmp_dp_snd_codec0: Xilinx DisplayPort Sound Codec probed >> [ 4.434896] xilinx-dp-snd-pcm zynqmp_dp_snd_pcm0: Xilinx DisplayPort Sound PCM probed >> [ 4.442954] xilinx-dp-snd-pcm zynqmp_dp_snd_pcm1: Xilinx DisplayPort Sound PCM probed >> [ 4.448513] mmc0: SDHCI controller on ff170000.mmc [ff170000.mmc] using ADMA 64-bit >> [ 4.459057] xilinx-dp-snd-card fd4a0000.display:zynqmp_dp_snd_card: Xilinx DisplayPort Sound Card probed >> [ 4.468634] OF: graph: no port node found in /axi/display at fd4a0000 >> [ 4.475120] xlnx-drm xlnx-drm.0: bound fd4a0000.display (ops 0xffffffc010e17fa0) >> [ 4.482712] [drm] Initialized xlnx 1.0.0 20130509 for fd4a0000.display on minor 0 >> [ 4.490206] zynqmp-display fd4a0000.display: ZynqMP DisplayPort Subsystem driver probed >> [ 4.496962] mmc0: new high speed SDHC card at address aaaa >> [ 4.498430] ahci-ceva fd0c0000.ahci: supply ahci not found, using dummy regulator >> [ 4.511219] ahci-ceva fd0c0000.ahci: supply phy not found, using dummy regulator >> [ 4.511379] mmcblk0: mmc0:aaaa SB16G 14.8 GiB >> [ 4.518690] ahci-ceva fd0c0000.ahci: supply target not found, using dummy regulator >> [ 4.527484] mmcblk0: p1 p2 >> [ 4.540954] ahci-ceva fd0c0000.ahci: AHCI 0001.0301 32 slots 2 ports 6 Gbps 0x3 impl platform mode >> [ 4.549923] ahci-ceva fd0c0000.ahci: flags: 64bit ncq sntf pm clo only pmp fbs pio slum part ccc sds apst >> [ 4.560268] scsi host0: ahci-ceva >> [ 4.563829] scsi host1: ahci-ceva >> [ 4.567237] ata1: SATA max UDMA/133 mmio [mem 0xfd0c0000-0xfd0c1fff] port 0x100 irq 45 >> [ 4.575152] ata2: SATA max UDMA/133 mmio [mem 0xfd0c0000-0xfd0c1fff] port 0x180 irq 45 >> [ 4.605877] xhci-hcd xhci-hcd.1.auto: xHCI Host Controller >> [ 4.611375] xhci-hcd xhci-hcd.1.auto: new USB bus registered, assigned bus number 1 >> [ 4.619123] xhci-hcd xhci-hcd.1.auto: hcc params 0x0238f625 hci version 0x100 quirks 0x0000000002010810 >> [ 4.628540] xhci-hcd xhci-hcd.1.auto: irq 53, io mem 0xfe200000 >> [ 4.634549] xhci-hcd xhci-hcd.1.auto: xHCI Host Controller >> [ 4.640035] xhci-hcd xhci-hcd.1.auto: new USB bus registered, assigned bus number 2 >> [ 4.647692] xhci-hcd xhci-hcd.1.auto: Host supports USB 3.0 SuperSpeed >> [ 4.654319] usb usb1: New USB device found, idVendor=1d6b, idProduct=0002, bcdDevice= 5.15 >> [ 4.662582] usb usb1: New USB device strings: Mfr=3, Product=2, SerialNumber=1 >> [ 4.669795] usb usb1: Product: xHCI Host Controller >> [ 4.674664] usb usb1: Manufacturer: Linux 5.15.0 xhci-hcd >> [ 4.680054] usb usb1: SerialNumber: xhci-hcd.1.auto >> [ 4.685214] hub 1-0:1.0: USB hub found >> [ 4.688988] hub 1-0:1.0: 1 port detected >> [ 4.693202] usb usb2: New USB device found, idVendor=1d6b, idProduct=0003, bcdDevice= 5.15 >> [ 4.701463] usb usb2: New USB device strings: Mfr=3, Product=2, SerialNumber=1 >> [ 4.708682] usb usb2: Product: xHCI Host Controller >> [ 4.713550] usb usb2: Manufacturer: Linux 5.15.0 xhci-hcd >> [ 4.718944] usb usb2: SerialNumber: xhci-hcd.1.auto >> [ 4.724075] hub 2-0:1.0: USB hub found >> [ 4.727842] hub 2-0:1.0: 1 port detected >> [ 4.734650] input: gpio-keys as /devices/platform/gpio-keys/input/input0 >> [ 4.741660] of_cfs_init >> [ 4.744131] of_cfs_init: OK >> [ 4.747039] cfg80211: Loading compiled-in X.509 certificates for regulatory database >> [ 4.881580] cfg80211: Loaded X.509 cert 'sforshee: 00b28ddf47aef9cea7' >> [ 4.888214] zynqmp_pll_disable() clock disable failed for dpll_int, ret = -13 >> [ 4.896228] platform regulatory.0: Direct firmware load for regulatory.db failed with error -2 >> [ 4.897975] ata2: SATA link down (SStatus 0 SControl 330) >> [ 4.904842] cfg80211: failed to load regulatory.db >> [ 4.905622] ALSA device list: >> [ 4.905626] #0: DisplayPort monitor >> [ 4.910252] ata1: SATA link down (SStatus 0 SControl 330) >> [ 4.950910] EXT4-fs (mmcblk0p2): mounted filesystem with ordered data mode. Opts: (null). Quota mode: none. >> [ 4.960680] VFS: Mounted root (ext4 filesystem) on device 179:2. >> [ 4.969332] devtmpfs: mounted >> [ 4.972830] Freeing unused kernel memory: 1984K >> [ 4.977453] Run /sbin/init as init process >> [ 5.056434] EXT4-fs (mmcblk0p2): re-mounted. Opts: (null). Quota mode: none. >> Starting syslogd: OK >> Starting klogd: OK >> Running sysctl: OK >> Saving random seed: [ 5.105554] random: dd: uninitialized urandom read (512 bytes read) >> OK >> Starting network: OK >> >> Welcome to Buildroot >> buildroot login: root >> # >> >> Best regards, >> Neal Frager >> Xilinx >> >> > From nealf at xilinx.com Tue Feb 8 16:43:10 2022 From: nealf at xilinx.com (Neal Frager) Date: Tue, 8 Feb 2022 16:43:10 +0000 Subject: [Buildroot] [PATCH 1/2] configs/zynqmp_zcu106: Bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: References: <20220208071559.2862411-1-neal.frager@xilinx.com> <69efa9da-ae55-6795-8724-ed7105083924@benettiengineering.com> <32cc1c12-1496-7db9-5e32-1b99404a4fe3@benettiengineering.com> Message-ID: Hi Giulio, > I'm building both defconfigs and see if everything is ok. > In meanwhile I ask you to subscribe and set as "superseded" the old patches in buildroot patchwork: > https://patchwork.ozlabs.org/project/buildroot/list/ Done. Let me know if you see any issues with my patch set. On my side, it builds and runs without any manual steps required. > Take care next times, when you send another version you should produce the patch with -v2(or -v3 etc.) flash and indicate what you've changed between versions. Ok, no problem. Thanks again for all your help! Best regards, Neal Frager Xilinx From giulio.benetti at benettiengineering.com Tue Feb 8 17:02:29 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 8 Feb 2022 18:02:29 +0100 Subject: [Buildroot] [PATCH 1/2] configs/zynqmp_zcu106: Bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: References: <20220208071559.2862411-1-neal.frager@xilinx.com> <69efa9da-ae55-6795-8724-ed7105083924@benettiengineering.com> <32cc1c12-1496-7db9-5e32-1b99404a4fe3@benettiengineering.com> Message-ID: <97653013-1d33-4a03-00cf-ffdb3fa5e723@benettiengineering.com> Hi Neal, On 08/02/22 17:43, Neal Frager wrote: > Hi Giulio, > >> I'm building both defconfigs and see if everything is ok. >> In meanwhile I ask you to subscribe and set as "superseded" the old patches in buildroot patchwork: >> https://patchwork.ozlabs.org/project/buildroot/list/ > > Done. Let me know if you see any issues with my patch set. On my side, it builds and runs without any manual steps required. You've missed one thing in defconfig you couldn't see because it's on host-side: BR2_TARGET_UBOOT_NEEDS_OPENSSL=y that goes after: BR2_TARGET_UBOOT_NEEDS_DTC=y that is required by uboot in hosts where openssl is not installed, in your system is installed so you don't see the error. This is true for both defconfigs. I ask you to reproduce it by using these docker's instructions: https://patchwork.ozlabs.org/project/buildroot/patch/20220203235438.610277-1-giulio.benetti at benettiengineering.com/ Have you already used docker? Also there is another problem on post-image.sh: ``` INFO: cmd: "find '/home/br-user/git/upstream/ci-tests/zynqmp_zcu106_defconfig/build/genimage.tmp/root' -depth -type d -printf '%P\0' | xargs -0 -I {} touch -r '/tmp/tmp.OZIeSLbRSO/{}' '/home/br-user/git/upstream/ci-tests/zynqmp_zcu106_defconfig/build/genimage.tmp/root/{}'" (stderr): ERROR: file(extlinux.conf): stat(/home/br-user/git/upstream/ci-tests/zynqmp_zcu106_defconfig/images/extlinux.conf) failed: No such file or directory ERROR: vfat(boot.vfat): could not setup extlinux.conf ``` That is because you need extlinux.conf to be copied in post-build.sh script, not in post-image.sh because it is too late(image is already generated), but you need it *to* generate image. So you have to create a specific post-build.sh with: cp board/zynqmp/extlinux.conf output/images/extlinux.conf and point to it with BR2_ROOTFS_POST_BUILD_SCRIPT. BUT don't use explicit paths like them, but always try to imitate what other boards/packages do, like: ``` #!/bin/sh BOARD_DIR="$(dirname $0)" install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf ``` Because if you change the output directory to build buildroot with: # make O=../output-zynqmp zynqmp_zcu102_defconfig that script will never work. And that fixes the problem. So now I wait for V2 :-) >> Take care next times, when you send another version you should produce the patch with -v2(or -v3 etc.) flash and indicate what you've changed between versions. > > Ok, no problem. +1 > Thanks again for all your help! It's a pleasure Best regards -- Giulio Benetti Benetti Engineering sas From oleks at arcturusnetworks.com Tue Feb 8 17:31:56 2022 From: oleks at arcturusnetworks.com (Oleksandr G Zhadan) Date: Tue, 8 Feb 2022 12:31:56 -0500 Subject: [Buildroot] [PATCH 1/1] board/arcturus/aarch64-ucls1012a: bump u-boot and kernel version In-Reply-To: References: <4b667326-5aca-538b-9b36-7f0d5a400e9f@arcturusnetworks.com> Message-ID: Hi Giulio, Thanks for the quick response and your notes. New V2 patch file attached. The patches are based on today's `git clone https://git.buildroot.net/buildroot`. Patches created with the options you suggested: `git format-patch -M -s -o . -1` Unfortunately I can't send it now with 'git send-email --to "buildroot " 0001-xxxx.patch`. If it doesn't work for you, we'll send it later. Kind Regards, Oleks On 2/7/22 12:29, Giulio Benetti wrote: > Hi Oleksandr, > > can you improve commit log? Looking at what you do below I see you do > more than just bumping u-boot and linux. Also please specify the > versions you're bumping to, > > On 07/02/22 16:53, Oleksandr G Zhadan wrote: >> Signed-off-by: Oleksandr G Zhadan >> Signed-off-by: Michael Durrant >> --- >> ? ?board/arcturus/aarch64-ucls1012a/post-build.sh??? |? 2 -- >> ? ?board/arcturus/aarch64-ucls1012a/readme.txt?????? |? 8 ++++---- >> ? ?.../rootfs_overlay/etc/init.d/S09modload????????? | 14 -------------- >> ? ?configs/arcturus_ucls1012a_defconfig????????????? | 15 >> +++++++-------- >> ? ?4 files changed, 11 insertions(+), 28 deletions(-) >> ? ?delete mode 100755 >> board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload >> >> diff --git a/board/arcturus/aarch64-ucls1012a/post-build.sh >> b/board/arcturus/aarch64-ucls1012a/post-build.sh >> index f8ba78095f..ca3862988d 100755 >> --- a/board/arcturus/aarch64-ucls1012a/post-build.sh >> +++ b/board/arcturus/aarch64-ucls1012a/post-build.sh >> @@ -1,5 +1,3 @@ >> ? ?#!/bin/sh >> >> -mkdir -p ${TARGET_DIR}/lib/firmware >> -cp -f ${BUILD_DIR}/linux-custom/firmware/ppfe/* >> ${TARGET_DIR}/lib/firmware/ >> ? ?cp -f ${BUILD_DIR}/linux-custom/br2-ucls1012a.its ${BINARIES_DIR}/ >> diff --git a/board/arcturus/aarch64-ucls1012a/readme.txt >> b/board/arcturus/aarch64-ucls1012a/readme.txt >> index 483d5e9aef..f892fc4abc 100644 >> --- a/board/arcturus/aarch64-ucls1012a/readme.txt >> +++ b/board/arcturus/aarch64-ucls1012a/readme.txt >> @@ -23,14 +23,14 @@ Result of the build >> ? ?After building, you should obtain this tree: >> >> ? ???? output/images/ >> -??? +-- arc-ucls1012a.dtb >> -??? +-- Image >> +??? +-- br2-ucls1012a.its >> +??? +-- Image.gz >> ? ???? +-- part0-000000.itb >> ? ???? +-- rootfs.cpio >> ? ???? +-- rootfs.cpio.gz >> ? ???? +-- rootfs.tar >> ? ???? +-- u-boot.bin >> -??? +-- ucls1012a.its >> +??? +-- ucls1012a-som.dtb >> >> ? ?Flashing >> ? ?-------- >> @@ -60,7 +60,7 @@ u-boot shell. >> ? ?4. Program the ITB image (includes Kernel, DTB and Ramdisk) >> >> ? ???? B$ tftp part0-000000.itb >> -??? B$ run iprogram >> +??? B$ run program0 >> >> ? ?5. Booting your new system >> >> diff --git >> a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload >> b/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload >> deleted file mode 100755 >> index c87ffda14f..0000000000 >> --- >> a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload >> +++ /dev/null >> @@ -1,14 +0,0 @@ >> -#!/bin/sh >> -# >> -case "$1" in >> -?????? start) >> -??????????????? modprobe pfe >> -??????????????? ;; >> -??????? stop) >> -??????????????? ;; >> -??????? restart|reload) >> -??????????????? ;; >> -??????? *) >> -??????????????? echo "Usage: $0 {start|stop|restart}" >> -??????????????? exit 1 >> -esac > > Here you remove this file for modprobe() fpe, why? Can you elabore in > commit log? > >> diff --git a/configs/arcturus_ucls1012a_defconfig >> b/configs/arcturus_ucls1012a_defconfig >> index fd33ebf1f6..f544a5240a 100644 >> --- a/configs/arcturus_ucls1012a_defconfig >> +++ b/configs/arcturus_ucls1012a_defconfig >> @@ -1,24 +1,23 @@ >> ? ?# Architecture >> ? ?BR2_aarch64=y >> >> -# Linux headers same as kernel, a 4.14 series >> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y >> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y >> >> ? ?# System settings >> ? ?BR2_TARGET_GENERIC_HOSTNAME="ucls1012a" >> ? ?BR2_TARGET_GENERIC_ISSUE="Welcome to uCLS1012A-SOM" >> ? ?BR2_SYSTEM_DHCP="eth0" >> -BR2_ROOTFS_OVERLAY="board/arcturus/aarch64-ucls1012a/rootfs_overlay" >> ?BR2_ROOTFS_POST_BUILD_SCRIPT="board/arcturus/aarch64-ucls1012a/post-build.sh" >> ?BR2_ROOTFS_POST_IMAGE_SCRIPT="board/arcturus/aarch64-ucls1012a/post-image.sh" >> >> ? ?# Kernel >> ? ?BR2_LINUX_KERNEL=y >> ? ?BR2_LINUX_KERNEL_CUSTOM_TARBALL=y >> -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call >> github,ArcturusNetworks,uCLS1012A-kernel,v.20.31)/linux-v.20.31.tar.gz" >> -BR2_LINUX_KERNEL_DEFCONFIG="ucls1012a" >> +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call >> github,ArcturusNetworks,uCLS1012A-kernel,v.22.05)/linux-v.22.05.tar.gz" >> +BR2_LINUX_KERNEL_DEFCONFIG="ucls1012a_som" > > Here ^^^ you also change the defconfig name, another thing to add to > commit log and the reason > >> +BR2_LINUX_KERNEL_IMAGEGZ=y > > Here ^^^ you change to zImage, another thing to add to commit log > >> ? ?BR2_LINUX_KERNEL_DTS_SUPPORT=y >> -BR2_LINUX_KERNEL_INTREE_DTS_NAME="arcturus/arc-ucls1012a" >> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="arcturus/ucls1012a-som" >> >> ? ?# Filesystem >> ? ?BR2_TARGET_ROOTFS_CPIO=y >> @@ -28,8 +27,8 @@ BR2_TARGET_ROOTFS_CPIO_GZIP=y >> ? ?BR2_TARGET_UBOOT=y >> ? ?BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y >> ? ?BR2_TARGET_UBOOT_CUSTOM_TARBALL=y >> -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call >> github,ArcturusNetworks,uCLS1012A-uboot,v.20.31)/uboot-v.20.31.tar.gz" >> -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="UCLS1012A_QSPI128" >> +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call >> github,ArcturusNetworks,uCLS1012A-uboot,v.22.05)/uboot-v.22.05.tar.gz" >> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="UCLS1012A_SOM" > > Ditto > >> ? ?# Tools >> ? ?BR2_PACKAGE_HOST_UBOOT_TOOLS=y > > Also, which Buildroot version do you use to create patch? > And which specific command do you use? I ask you this because patch > results malformed: > ``` > patch -p1 < > ~/Downloads/1-1-board-arcturus-aarch64-ucls1012a-bump-u-boot-and-kernel-version.patch > patching file board/arcturus/aarch64-ucls1012a/post-build.sh > Hunk #1 succeeded at 1 with fuzz 2. > patching file board/arcturus/aarch64-ucls1012a/readme.txt > Hunk #1 FAILED at 23. > Hunk #2 FAILED at 60. > 2 out of 2 hunks FAILED -- saving rejects to file > board/arcturus/aarch64-ucls1012a/readme.txt.rej > patching file > board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload > Reversed (or previously applied) patch detected!? Assume -R? [n] > Apply anyway? [n] > Skipping patch. > 1 out of 1 hunk ignored -- saving rejects to file > board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload.rej > patching file configs/arcturus_ucls1012a_defconfig > patch: **** malformed patch at line 201: > github,ArcturusNetworks,uCLS1012A-kernel,v.20.31)/linux-v.20.31.tar.gz" > ``` > > I've tried applying with: > git am xxx.patch > and then with: > patch -p1 < xxx.patch > > but that gave me the malformed patch error. > > Usually this is how I do: > Rebase > # git pull --rebase upstream master > Create the patch assuming it is on top of the commits > # git format-patch -M -s -o . -1 > Then I send it with: > # git send-email --to "buildroot " > 0001-xxxx.patch > > Can you please check? Because I want to give a build and check in > buildroot docker. > > Thank you! > > Best regards -- Oleksandr Zhadan oleks at arcturusnetworks.com 416.621.0125 x.235 }|{/\|)/\|-| -------------- next part -------------- A non-text attachment was scrubbed... Name: 0001-Buildroot-PATCH-V2-1-1-board-arcturus-aarch64-ucls10.patch Type: text/x-patch Size: 4483 bytes Desc: not available URL: From buildroot at busybox.net Tue Feb 8 17:37:20 2022 From: buildroot at busybox.net (busybox.net) Date: 8 Feb 2022 11:37:20 -0600 Subject: [Buildroot] ACTION REQUIRED Message-ID: <20220208113720.03C9A39E93F3AE2D@busybox.net> An HTML attachment was scrubbed... URL: From yann.morin at orange.com Tue Feb 8 18:05:26 2022 From: yann.morin at orange.com (yann.morin at orange.com) Date: Tue, 8 Feb 2022 19:05:26 +0100 Subject: [Buildroot] [PATCH 0/3] package/pkg-cargo: build in sub-directory Message-ID: <3095_1644343529_6202B0E9_3095_200_1_cover.1644343524.git.yann.morin@orange.com> From: "Yann E. MORIN" Hello All! This three-patch series allows cargo-based packages to reside in a sub-directory of the package source tree. It also allows cargo- and golang-based packages to declare their own download environment variables. The golang case was not tested, by lack of an affected package, but the change is simple enough (hopefully). Regards, Yann E. MORIN. The following changes since commit f9668ea37b81819794bb3964705f900895b54128 support/scripts/graph-build-time: add support for timeline graphing (2022-02-08 13:47:55 +0100) are available as patches in this mail series, for you to apply patches up to 61674c9d53c678f60a82c5c347147c31b9a29ba6 package/pkg-cargo: allow building in a sub-directory (2022-02-08 18:58:24 +0100) ---------------------------------------------------------------- Yann E. MORIN (3): package/pkg-cargo: allow packages to define download environment package/pkg-golang: allow packages to define download environment package/pkg-cargo: allow building in a sub-directory package/pkg-cargo.mk | 18 +++++++++++++----- package/pkg-golang.mk | 2 +- 2 files changed, 14 insertions(+), 6 deletions(-) -- ____________ .-----------------.--------------------: _ :------------------. | Yann E. MORIN | Real-Time Embedded | __/ ) | /"\ ASCII RIBBON | | +33 534.541.179 | Software Designer | _/ - /' | \ / CAMPAIGN | | +33 638.411.245 '--------------------: (_ `--, | X AGAINST | | yann.morin (at) orange.com |_=" ,--' | / \ HTML MAIL | '--------------------------------------:______/_____:------------------' _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From yann.morin at orange.com Tue Feb 8 18:05:28 2022 From: yann.morin at orange.com (yann.morin at orange.com) Date: Tue, 8 Feb 2022 19:05:28 +0100 Subject: [Buildroot] [PATCH 1/3] package/pkg-cargo: allow packages to define download environment In-Reply-To: References: Message-ID: <22854_1644343532_6202B0EC_22854_63_1_181af9d04551529f049a322dff7a44684beeabfc.1644343524.git.yann.morin@orange.com> From: "Yann E. MORIN" Currently, the cargo infrastructure forcibly sets the package _DL_ENV variable, instead of appending to it, which prevents packages from providing their own download environment variables. We fix that by using an append-assignment. Note: when introduced, that variable was explicitly not documented, and is supposed to only be used by packages infrastructures. However, that variable exists, and it can be (ab)used by br2-external packages (most probably to ill effects, but heh!). We anyway leave it undocumented, like _ROOTFS_PRE_CMD_HOOKS. Signed-off-by: Yann E. MORIN Cc: 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 e74a8358bc..66bea513e0 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -69,7 +69,7 @@ define inner-cargo-package $(2)_DOWNLOAD_DEPENDENCIES += host-rustc $(2)_DOWNLOAD_POST_PROCESS = cargo -$(2)_DL_ENV = CARGO_HOME=$$(HOST_DIR)/share/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.25.1 _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From yann.morin at orange.com Tue Feb 8 18:05:29 2022 From: yann.morin at orange.com (yann.morin at orange.com) Date: Tue, 8 Feb 2022 19:05:29 +0100 Subject: [Buildroot] [PATCH 2/3] package/pkg-golang: allow packages to define download environment In-Reply-To: References: Message-ID: <30606_1644343535_6202B0EF_30606_119_1_9d53b11cbc235d413367e901185b296b2c82b589.1644343524.git.yann.morin@orange.com> From: "Yann E. MORIN" Currently, the golang infrastructure forcibly sets the package _DL_ENV variable, instead of appending to it, which prevents packages from providing their own download environment variables. We fix that by using an append-assignment. Note: when introduced, that variable was explicitly not documented, and is supposed to only be used by packages infrastructures. However, that variable exists, and it can be (ab)used by br2-external packages (most probably to ill effects, but heh!). We anyway leave it undocumented, like _ROOTFS_PRE_CMD_HOOKS. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Christian Stewart Cc: Anisse Astier --- 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..69eae02830 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -83,7 +83,7 @@ endef $(2)_POST_PATCH_HOOKS += $(2)_GEN_GOMOD $(2)_DOWNLOAD_POST_PROCESS = go -$(2)_DL_ENV = \ +$(2)_DL_ENV += \ $(HOST_GO_COMMON_ENV) \ GOPROXY=direct \ BR_GOMOD=$$($(2)_GOMOD) -- 2.25.1 _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From yann.morin at orange.com Tue Feb 8 18:05:30 2022 From: yann.morin at orange.com (yann.morin at orange.com) Date: Tue, 8 Feb 2022 19:05:30 +0100 Subject: [Buildroot] [PATCH 3/3] package/pkg-cargo: allow building in a sub-directory In-Reply-To: References: Message-ID: <3095_1644343537_6202B0F1_3095_214_1_61674c9d53c678f60a82c5c347147c31b9a29ba6.1644343524.git.yann.morin@orange.com> From: "Yann E. MORIN" Some packages have their rust sources as a sub-directory, rather than at the root of the source tree. Do like we do for autotools-package, and use the package's _SRCDIR rather than the top-level directory $(@D). Additionally, in such a situation, it is more than probable that the Cargo.toml is also present in that sub-directory, so use that when vendoring the package, unless the package took extra precautions to specify an alternate location. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni --- package/pkg-cargo.mk | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index 66bea513e0..68e15e066c 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -71,6 +71,14 @@ $(2)_DOWNLOAD_DEPENDENCIES += host-rustc $(2)_DOWNLOAD_POST_PROCESS = cargo $(2)_DL_ENV += CARGO_HOME=$$(HOST_DIR)/share/cargo +# If building in a sub directory, use that to find the Cargo.toml, unless +# the package already provided its location. +ifneq ($$($(2)_SUBDIR),) +ifneq ($$(filter BR_CARGO_MANIFEST_PATH=%,$$($(2)_DL_ENV))) +$(2)_DL_ENV += BR_CARGO_MANIFEST_PATH=$$($(2)_SUBDIR)/Cargo.toml +endif +endif + # Due to vendoring, it is pretty likely that not all licenses are # listed in _LICENSE. $(2)_LICENSE += , vendored dependencies licenses probably not listed @@ -97,7 +105,7 @@ $(2)_LICENSE += , vendored dependencies licenses probably not listed ifndef $(2)_BUILD_CMDS ifeq ($(4),target) define $(2)_BUILD_CMDS - cd $$(@D) && \ + cd $$($$(PKG)_SRCDIR) && \ $$(TARGET_MAKE_ENV) \ $$(TARGET_CONFIGURE_OPTS) \ $$(PKG_CARGO_ENV) \ @@ -111,7 +119,7 @@ define $(2)_BUILD_CMDS endef else # ifeq ($(4),target) define $(2)_BUILD_CMDS - cd $$(@D) && \ + cd $$($$(PKG)_SRCDIR) && \ $$(HOST_MAKE_ENV) \ RUSTFLAGS="$$(addprefix -C link-args=,$$(HOST_LDFLAGS))" \ $$(HOST_CONFIGURE_OPTS) \ @@ -133,7 +141,7 @@ endif # ifndef $(2)_BUILD_CMDS # ifndef $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS - cd $$(@D) && \ + cd $$($$(PKG)_SRCDIR) && \ $$(TARGET_MAKE_ENV) \ $$(TARGET_CONFIGURE_OPTS) \ $$(PKG_CARGO_ENV) \ @@ -152,7 +160,7 @@ endif ifndef $(2)_INSTALL_CMDS define $(2)_INSTALL_CMDS - cd $$(@D) && \ + cd $$($$(PKG)_SRCDIR) && \ $$(HOST_MAKE_ENV) \ RUSTFLAGS="$$(addprefix -C link-args=,$$(HOST_LDFLAGS))" \ $$(HOST_CONFIGURE_OPTS) \ -- 2.25.1 _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From giulio.benetti at benettiengineering.com Tue Feb 8 18:25:01 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 8 Feb 2022 19:25:01 +0100 Subject: [Buildroot] [PATCH 1/1] board/arcturus/aarch64-ucls1012a: bump u-boot and kernel version In-Reply-To: References: <4b667326-5aca-538b-9b36-7f0d5a400e9f@arcturusnetworks.com> Message-ID: <2920974c-149f-ea4c-9b79-9a1b862fce95@benettiengineering.com> Hi Oleksandr, On 08/02/22 18:31, Oleksandr G Zhadan wrote: > Hi Giulio, > > Thanks for the quick response and your notes. > > New V2 patch file attached. The patches are based on today's `git clone > https://git.buildroot.net/buildroot`. good > Patches created with the options you suggested: `git format-patch -M -s > -o . -1` Ok, but you also need the flag -v2, so this is the command: # git format-patch -M -s -o . -1 -v2 And then you need to add what's changed after the 3 dashes. Check this patch as an example: https://lists.buildroot.org/pipermail/buildroot/2022-February/635926.html Take care of adding 3 dashes and listing: --- V1->V2: * changed this * changed that --- > Unfortunately I can't send it now with 'git send-email --to "buildroot > " 0001-xxxx.patch`. If it doesn't work for you, > we'll send it later. Yes, we need it sent like that for reviewing. Anyway I've checked that the attached patch now applies correctly, so you're on the right path! Best regards -- Giulio Benetti Benetti Engineering sas > > Kind Regards, > > Oleks > > > On 2/7/22 12:29, Giulio Benetti wrote: >> Hi Oleksandr, >> >> can you improve commit log? Looking at what you do below I see you do >> more than just bumping u-boot and linux. Also please specify the >> versions you're bumping to, >> >> On 07/02/22 16:53, Oleksandr G Zhadan wrote: >>> Signed-off-by: Oleksandr G Zhadan >>> Signed-off-by: Michael Durrant >>> --- >>> ? ?board/arcturus/aarch64-ucls1012a/post-build.sh??? |? 2 -- >>> ? ?board/arcturus/aarch64-ucls1012a/readme.txt?????? |? 8 ++++---- >>> ? ?.../rootfs_overlay/etc/init.d/S09modload????????? | 14 -------------- >>> ? ?configs/arcturus_ucls1012a_defconfig????????????? | 15 >>> +++++++-------- >>> ? ?4 files changed, 11 insertions(+), 28 deletions(-) >>> ? ?delete mode 100755 >>> board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload >>> >>> diff --git a/board/arcturus/aarch64-ucls1012a/post-build.sh >>> b/board/arcturus/aarch64-ucls1012a/post-build.sh >>> index f8ba78095f..ca3862988d 100755 >>> --- a/board/arcturus/aarch64-ucls1012a/post-build.sh >>> +++ b/board/arcturus/aarch64-ucls1012a/post-build.sh >>> @@ -1,5 +1,3 @@ >>> ? ?#!/bin/sh >>> >>> -mkdir -p ${TARGET_DIR}/lib/firmware >>> -cp -f ${BUILD_DIR}/linux-custom/firmware/ppfe/* >>> ${TARGET_DIR}/lib/firmware/ >>> ? ?cp -f ${BUILD_DIR}/linux-custom/br2-ucls1012a.its ${BINARIES_DIR}/ >>> diff --git a/board/arcturus/aarch64-ucls1012a/readme.txt >>> b/board/arcturus/aarch64-ucls1012a/readme.txt >>> index 483d5e9aef..f892fc4abc 100644 >>> --- a/board/arcturus/aarch64-ucls1012a/readme.txt >>> +++ b/board/arcturus/aarch64-ucls1012a/readme.txt >>> @@ -23,14 +23,14 @@ Result of the build >>> ? ?After building, you should obtain this tree: >>> >>> ? ???? output/images/ >>> -??? +-- arc-ucls1012a.dtb >>> -??? +-- Image >>> +??? +-- br2-ucls1012a.its >>> +??? +-- Image.gz >>> ? ???? +-- part0-000000.itb >>> ? ???? +-- rootfs.cpio >>> ? ???? +-- rootfs.cpio.gz >>> ? ???? +-- rootfs.tar >>> ? ???? +-- u-boot.bin >>> -??? +-- ucls1012a.its >>> +??? +-- ucls1012a-som.dtb >>> >>> ? ?Flashing >>> ? ?-------- >>> @@ -60,7 +60,7 @@ u-boot shell. >>> ? ?4. Program the ITB image (includes Kernel, DTB and Ramdisk) >>> >>> ? ???? B$ tftp part0-000000.itb >>> -??? B$ run iprogram >>> +??? B$ run program0 >>> >>> ? ?5. Booting your new system >>> >>> diff --git >>> a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload >>> b/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload >>> deleted file mode 100755 >>> index c87ffda14f..0000000000 >>> --- >>> a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload >>> +++ /dev/null >>> @@ -1,14 +0,0 @@ >>> -#!/bin/sh >>> -# >>> -case "$1" in >>> -?????? start) >>> -??????????????? modprobe pfe >>> -??????????????? ;; >>> -??????? stop) >>> -??????????????? ;; >>> -??????? restart|reload) >>> -??????????????? ;; >>> -??????? *) >>> -??????????????? echo "Usage: $0 {start|stop|restart}" >>> -??????????????? exit 1 >>> -esac >> >> Here you remove this file for modprobe() fpe, why? Can you elabore in >> commit log? >> >>> diff --git a/configs/arcturus_ucls1012a_defconfig >>> b/configs/arcturus_ucls1012a_defconfig >>> index fd33ebf1f6..f544a5240a 100644 >>> --- a/configs/arcturus_ucls1012a_defconfig >>> +++ b/configs/arcturus_ucls1012a_defconfig >>> @@ -1,24 +1,23 @@ >>> ? ?# Architecture >>> ? ?BR2_aarch64=y >>> >>> -# Linux headers same as kernel, a 4.14 series >>> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y >>> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y >>> >>> ? ?# System settings >>> ? ?BR2_TARGET_GENERIC_HOSTNAME="ucls1012a" >>> ? ?BR2_TARGET_GENERIC_ISSUE="Welcome to uCLS1012A-SOM" >>> ? ?BR2_SYSTEM_DHCP="eth0" >>> -BR2_ROOTFS_OVERLAY="board/arcturus/aarch64-ucls1012a/rootfs_overlay" >>> ?BR2_ROOTFS_POST_BUILD_SCRIPT="board/arcturus/aarch64-ucls1012a/post-build.sh" >>> ?BR2_ROOTFS_POST_IMAGE_SCRIPT="board/arcturus/aarch64-ucls1012a/post-image.sh" >>> >>> ? ?# Kernel >>> ? ?BR2_LINUX_KERNEL=y >>> ? ?BR2_LINUX_KERNEL_CUSTOM_TARBALL=y >>> -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call >>> github,ArcturusNetworks,uCLS1012A-kernel,v.20.31)/linux-v.20.31.tar.gz" >>> -BR2_LINUX_KERNEL_DEFCONFIG="ucls1012a" >>> +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call >>> github,ArcturusNetworks,uCLS1012A-kernel,v.22.05)/linux-v.22.05.tar.gz" >>> +BR2_LINUX_KERNEL_DEFCONFIG="ucls1012a_som" >> >> Here ^^^ you also change the defconfig name, another thing to add to >> commit log and the reason >> >>> +BR2_LINUX_KERNEL_IMAGEGZ=y >> >> Here ^^^ you change to zImage, another thing to add to commit log >> >>> ? ?BR2_LINUX_KERNEL_DTS_SUPPORT=y >>> -BR2_LINUX_KERNEL_INTREE_DTS_NAME="arcturus/arc-ucls1012a" >>> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="arcturus/ucls1012a-som" >>> >>> ? ?# Filesystem >>> ? ?BR2_TARGET_ROOTFS_CPIO=y >>> @@ -28,8 +27,8 @@ BR2_TARGET_ROOTFS_CPIO_GZIP=y >>> ? ?BR2_TARGET_UBOOT=y >>> ? ?BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y >>> ? ?BR2_TARGET_UBOOT_CUSTOM_TARBALL=y >>> -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call >>> github,ArcturusNetworks,uCLS1012A-uboot,v.20.31)/uboot-v.20.31.tar.gz" >>> -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="UCLS1012A_QSPI128" >>> +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call >>> github,ArcturusNetworks,uCLS1012A-uboot,v.22.05)/uboot-v.22.05.tar.gz" >>> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="UCLS1012A_SOM" >> >> Ditto >> >>> ? ?# Tools >>> ? ?BR2_PACKAGE_HOST_UBOOT_TOOLS=y >> >> Also, which Buildroot version do you use to create patch? >> And which specific command do you use? I ask you this because patch >> results malformed: >> ``` >> patch -p1 < >> ~/Downloads/1-1-board-arcturus-aarch64-ucls1012a-bump-u-boot-and-kernel-version.patch >> patching file board/arcturus/aarch64-ucls1012a/post-build.sh >> Hunk #1 succeeded at 1 with fuzz 2. >> patching file board/arcturus/aarch64-ucls1012a/readme.txt >> Hunk #1 FAILED at 23. >> Hunk #2 FAILED at 60. >> 2 out of 2 hunks FAILED -- saving rejects to file >> board/arcturus/aarch64-ucls1012a/readme.txt.rej >> patching file >> board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload >> Reversed (or previously applied) patch detected!? Assume -R? [n] >> Apply anyway? [n] >> Skipping patch. >> 1 out of 1 hunk ignored -- saving rejects to file >> board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload.rej >> patching file configs/arcturus_ucls1012a_defconfig >> patch: **** malformed patch at line 201: >> github,ArcturusNetworks,uCLS1012A-kernel,v.20.31)/linux-v.20.31.tar.gz" >> ``` >> >> I've tried applying with: >> git am xxx.patch >> and then with: >> patch -p1 < xxx.patch >> >> but that gave me the malformed patch error. >> >> Usually this is how I do: >> Rebase >> # git pull --rebase upstream master >> Create the patch assuming it is on top of the commits >> # git format-patch -M -s -o . -1 >> Then I send it with: >> # git send-email --to "buildroot " >> 0001-xxxx.patch >> >> Can you please check? Because I want to give a build and check in >> buildroot docker. >> >> Thank you! >> >> Best regards > From fontaine.fabrice at gmail.com Tue Feb 8 18:26:36 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 8 Feb 2022 19:26:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/neon: fix ssl build without threads Message-ID: <20220208182636.3976618-1-fontaine.fabrice@gmail.com> Fix the following ssl build failure without threads raised since bump to version 0.32.2 in commit 029a6dc3e3320984c6369747e0b79060f13b2afc and https://github.com/notroj/neon/commit/281c84fc3996c757efdf6e9b3f906d7a1fc08b1d: ne_openssl.c:43:10: fatal error: pthread.h: No such file or directory 43 | #include | ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/da995ef26001357e51a5907de9c6111b9ff89bdf Signed-off-by: Fabrice Fontaine --- ...se-TS_SSL-feature-with-OpenSSL-1.1.0.patch | 76 +++++++++++++++++++ .../0002-configure.ac-fix-autoreconf.patch | 28 +++++++ package/neon/neon.mk | 2 + 3 files changed, 106 insertions(+) create mode 100644 package/neon/0001-Revert-Advertise-TS_SSL-feature-with-OpenSSL-1.1.0.patch create mode 100644 package/neon/0002-configure.ac-fix-autoreconf.patch diff --git a/package/neon/0001-Revert-Advertise-TS_SSL-feature-with-OpenSSL-1.1.0.patch b/package/neon/0001-Revert-Advertise-TS_SSL-feature-with-OpenSSL-1.1.0.patch new file mode 100644 index 0000000000..02088bfe02 --- /dev/null +++ b/package/neon/0001-Revert-Advertise-TS_SSL-feature-with-OpenSSL-1.1.0.patch @@ -0,0 +1,76 @@ +From 8f9e110b391f065536780d19c2257ad7afd83522 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 31 Jan 2022 23:42:13 +0100 +Subject: [PATCH] Revert "Advertise TS_SSL feature with OpenSSL >= 1.1.0." + +This reverts commit 281c84fc3996c757efdf6e9b3f906d7a1fc08b1d. + +Indeed openssl can be built on toolchains without threads support which +will result in the following build failure: + +ne_openssl.c:43:10: fatal error: pthread.h: No such file or directory + 43 | #include + | ^~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/da995ef26001357e51a5907de9c6111b9ff89bdf + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/notroj/neon/pull/71] +--- + macros/neon.m4 | 15 ++++----------- + src/ne_openssl.c | 4 ++-- + 2 files changed, 6 insertions(+), 13 deletions(-) + +diff --git a/macros/neon.m4 b/macros/neon.m4 +index 129d4ac..5a5fb1b 100644 +--- a/macros/neon.m4 ++++ b/macros/neon.m4 +@@ -960,13 +960,9 @@ yes|openssl) + AC_CHECK_HEADERS(openssl/ssl.h openssl/opensslv.h,, + [AC_MSG_ERROR([OpenSSL headers not found, cannot enable SSL support])]) + ++ # Enable EGD support if using 0.9.7 or newer + NE_CHECK_OPENSSLVER(ne_cv_lib_ssl097, 0.9.7, 0x00907000L) +- NE_CHECK_OPENSSLVER(ne_cv_lib_ssl110, 1.1.0, 0x10100000L) +- if test "$ne_cv_lib_ssl110" = "yes"; then +- NE_ENABLE_SUPPORT(SSL, [SSL support enabled, using OpenSSL $NE_SSL_VERSION]) +- AC_DEFINE(HAVE_OPENSSL11, 1, [Enable OpenSSL 1.1 support]) +- elif test "$ne_cv_lib_ssl097" = "yes"; then +- # Enable EGD support if using 0.9.7 or newer ++ if test "$ne_cv_lib_ssl097" = "yes"; then + AC_MSG_NOTICE([OpenSSL >= 0.9.7; EGD support not needed in neon]) + NE_ENABLE_SUPPORT(SSL, [SSL support enabled, using OpenSSL $NE_SSL_VERSION]) + NE_CHECK_FUNCS(CRYPTO_set_idptr_callback SSL_SESSION_cmp) +@@ -1074,11 +1070,8 @@ CC/CFLAGS/LIBS must be used to make the POSIX library interfaces + available]),, + enable_threadsafe_ssl=no) + +-case ${enable_threadsafe_ssl}X${ne_cv_lib_ssl110} in +-*Xyes) +- NE_ENABLE_SUPPORT(TS_SSL, [OpenSSL is natively thread-safe]) +- ;; +-posixX*|yesX*) ++case $enable_threadsafe_ssl in ++posix|yes) + ne_pthr_ok=yes + AC_CHECK_FUNCS([pthread_mutex_init pthread_mutex_lock],,[ne_pthr_ok=no]) + if test "${ne_pthr_ok}" = "no"; then +diff --git a/src/ne_openssl.c b/src/ne_openssl.c +index 41a5c05..96c768e 100644 +--- a/src/ne_openssl.c ++++ b/src/ne_openssl.c +@@ -1194,8 +1194,8 @@ char *ne_vstrhash(unsigned int flags, va_list ap) + return ne__strhash2hex(v, vlen, flags); + } + +-#if defined(NE_HAVE_TS_SSL) && OPENSSL_VERSION_NUMBER < 0x10100000L +-/* From OpenSSL 1.1.0 locking callbacks are no longer needed. */ ++#if defined(NE_HAVE_TS_SSL) && OPENSSL_VERSION_NUMBER < 0x10101000L ++/* For OpenSSL 1.1.1 locking callbacks are no longer need at all. */ + #define WITH_OPENSSL_LOCKING (1) + + /* Implementation of locking callbacks to make OpenSSL thread-safe. +-- +2.34.1 + diff --git a/package/neon/0002-configure.ac-fix-autoreconf.patch b/package/neon/0002-configure.ac-fix-autoreconf.patch new file mode 100644 index 0000000000..cd63d1ed41 --- /dev/null +++ b/package/neon/0002-configure.ac-fix-autoreconf.patch @@ -0,0 +1,28 @@ +From cf779609a5dd38f0a8fdb3c4539371f13fd3a24a Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 8 Feb 2022 18:34:25 +0100 +Subject: [PATCH] configure.ac: fix autoreconf + +Add AC_CONFIG_MACRO_DIR(macros) to fix autoreconf + +Signed-off-by: Fabrice Fontaine +[Upstream status: not sent yet] +--- + configure.ac | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 37b14ec..122151d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1,5 +1,7 @@ + AC_PREREQ(2.58) dnl 2.58 required for AS_HELP_STRING + ++AC_CONFIG_MACRO_DIR(macros) ++ + dnl Extract the version (sans LF) from .version, created at release-time. + m4_define(ne_version, [m4_translit(m4_include(.version), [ + ])]) +-- +2.34.1 + diff --git a/package/neon/neon.mk b/package/neon/neon.mk index 3bbd12561f..eae6bfbad6 100644 --- a/package/neon/neon.mk +++ b/package/neon/neon.mk @@ -10,6 +10,8 @@ NEON_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (manual and tests) NEON_LICENSE_FILES = src/COPYING.LIB test/COPYING README.md NEON_CPE_ID_VENDOR = webdav NEON_INSTALL_STAGING = YES +# We're patching configure.ac +NEON_AUTORECONF = YES NEON_CONF_OPTS = --without-gssapi --disable-rpath NEON_CONFIG_SCRIPTS = neon-config NEON_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES) -- 2.34.1 From fontaine.fabrice at gmail.com Tue Feb 8 18:29:29 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 8 Feb 2022 19:29:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/resiprocate: fix build of rend with gcc 11 Message-ID: <20220208182929.3976984-1-fontaine.fabrice@gmail.com> Fix the following build failure of rend with gcc 11: /home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/riscv32-buildroot-linux-gnu/include/c++/11.2.0/bits/stl_tree.h:770:15: error: static assertion failed: comparison object must be invocable as const 770 | is_invocable_v, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/ad9d89fefe1a667daa123397a072bf130bfa03a7 Signed-off-by: Fabrice Fontaine --- ...e-issue-compiling-with-Visual-Studio.patch | 95 +++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100644 package/resiprocate/0001-Fix-some-issue-compiling-with-Visual-Studio.patch diff --git a/package/resiprocate/0001-Fix-some-issue-compiling-with-Visual-Studio.patch b/package/resiprocate/0001-Fix-some-issue-compiling-with-Visual-Studio.patch new file mode 100644 index 0000000000..826774ce8d --- /dev/null +++ b/package/resiprocate/0001-Fix-some-issue-compiling-with-Visual-Studio.patch @@ -0,0 +1,95 @@ +From be76b10a50749e2e11dce8dcc38b414a7f9d8747 Mon Sep 17 00:00:00 2001 +From: Ben Walden +Date: Sat, 22 Aug 2020 23:14:11 +0100 +Subject: [PATCH] Fix some issue compiling with Visual Studio 16.7.0 and tidy + up Visual Studio 16 project files + +[Retrieved (and updated to keep only RendKa.cxx update) from: +https://github.com/resiprocate/resiprocate/commit/be76b10a50749e2e11dce8dcc38b414a7f9d8747] +SIgned-off-by: Fabrice Fontaine +--- + VisualStudioReadme.htm | 65 + + contrib/GeoIP/GeoIP_12_0.vcxproj | 550 ------- + contrib/GeoIP/GeoIP_16_0.vcxproj | 93 +- + .../db/build_windows/db_static_12_0.vcxproj | 1260 ----------------- + .../db/build_windows/db_static_16_0.vcxproj | 696 +-------- + contrib/db/dbinc/atomic.h | 4 +- + contrib/db/mp/mp_fget.c | 4 +- + contrib/db/mp/mp_mvcc.c | 4 +- + contrib/db/mp/mp_region.c | 4 +- + contrib/db/mutex/mut_method.c | 2 +- + contrib/pcre/pcre_12_0.vcxproj | 466 ------ + contrib/pcre/pcre_16_0.vcxproj | 159 +-- + contrib/popt/popt_12_0.vcxproj | 394 ------ + contrib/popt/popt_16_0.vcxproj | 120 +- + reSIProcate_16_0.sln | 58 +- + .../queuetostream_12_0.vcxproj | 582 -------- + .../queuetostream_16_0.vcxproj | 207 ++- + repro/repro_12_0.vcxproj | 825 ----------- + repro/repro_12_0.vcxproj.filters | 47 - + repro/repro_16_0.vcxproj | 159 ++- + repro/reprocmd/reprocmd_12_0.vcxproj | 597 -------- + repro/reprocmd/reprocmd_16_0.vcxproj | 139 +- + repro/reprolib_12_0.vcxproj | 596 -------- + repro/reprolib_12_0.vcxproj.filters | 136 -- + repro/reprolib_16_0.vcxproj | 132 +- + resip/dum/dum_12_0.vcxproj | 615 -------- + resip/dum/dum_16_0.vcxproj | 124 +- + resip/dum/test/basicCall_12_0.vcxproj | 621 -------- + resip/dum/test/basicCall_16_0.vcxproj | 145 +- + resip/dum/test/basicClient_12_0.vcxproj | 653 --------- + resip/dum/test/basicClient_16_0.vcxproj | 158 +-- + resip/dum/test/basicMessage_12_0.vcxproj | 615 -------- + resip/dum/test/basicMessage_16_0.vcxproj | 141 +- + resip/dum/test/basicRegister_12_0.vcxproj | 615 -------- + resip/dum/test/basicRegister_16_0.vcxproj | 137 +- + resip/rend/RendKa.cxx | 2 +- + resip/rend/rend_12_0.vcxproj | 352 ----- + resip/rend/rend_16_0.vcxproj | 89 +- + resip/stack/resiprocate_12_0.vcxproj | 873 ------------ + resip/stack/resiprocate_12_0.vcxproj.filters | 351 ----- + resip/stack/resiprocate_16_0.vcxproj | 165 ++- + resip/stack/test/test_12_0.vcxproj | 627 -------- + resip/stack/test/test_16_0.vcxproj | 171 ++- + rutil/dns/ares/ares_12_0.vcxproj | 488 ------- + rutil/dns/ares/ares_12_0.vcxproj.filters | 34 - + rutil/dns/ares/ares_16_0.vcxproj | 159 +-- + rutil/rutil_12_0.vcxproj | 604 -------- + rutil/rutil_16_0.vcxproj | 153 +- + 48 files changed, 1409 insertions(+), 13782 deletions(-) + delete mode 100644 contrib/GeoIP/GeoIP_12_0.vcxproj + delete mode 100644 contrib/db/build_windows/db_static_12_0.vcxproj + delete mode 100644 contrib/pcre/pcre_12_0.vcxproj + delete mode 100644 contrib/popt/popt_12_0.vcxproj + delete mode 100644 repro/accountingconsumers/queuetostream_12_0.vcxproj + delete mode 100644 repro/repro_12_0.vcxproj + delete mode 100644 repro/repro_12_0.vcxproj.filters + delete mode 100644 repro/reprocmd/reprocmd_12_0.vcxproj + delete mode 100644 repro/reprolib_12_0.vcxproj + delete mode 100644 repro/reprolib_12_0.vcxproj.filters + delete mode 100644 resip/dum/dum_12_0.vcxproj + delete mode 100644 resip/dum/test/basicCall_12_0.vcxproj + delete mode 100644 resip/dum/test/basicClient_12_0.vcxproj + delete mode 100644 resip/dum/test/basicMessage_12_0.vcxproj + delete mode 100644 resip/dum/test/basicRegister_12_0.vcxproj + delete mode 100644 resip/rend/rend_12_0.vcxproj + delete mode 100644 resip/stack/resiprocate_12_0.vcxproj + delete mode 100644 resip/stack/resiprocate_12_0.vcxproj.filters + delete mode 100644 resip/stack/test/test_12_0.vcxproj + delete mode 100644 rutil/dns/ares/ares_12_0.vcxproj + delete mode 100644 rutil/dns/ares/ares_12_0.vcxproj.filters + delete mode 100644 rutil/rutil_12_0.vcxproj + +diff --git a/resip/rend/RendKa.cxx b/resip/rend/RendKa.cxx +index 8645f17636..8321ada1ee 100644 +--- a/resip/rend/RendKa.cxx ++++ b/resip/rend/RendKa.cxx +@@ -66,7 +66,7 @@ bool operator<(const RendKaAssoc& a, const RendKaAssoc& b) + + struct RendKaConn + { +- bool operator() (const RendKaAssocPtr& a, const RendKaAssocPtr& b) ++ bool operator()(const RendKaAssocPtr& a, const RendKaAssocPtr& b) const + { + return *a < *b; + } -- 2.34.1 From fontaine.fabrice at gmail.com Tue Feb 8 19:18:36 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 8 Feb 2022 20:18:36 +0100 Subject: [Buildroot] [PATCH 1/2] package/keepalived: fix build with kernel < 4.13 Message-ID: <20220208191837.4057713-1-fontaine.fabrice@gmail.com> Fix the following build failure with kernel < 4.13 raised since bump to version 2.27 in commit 79f631000fe6846e72f44810452bb764c228ad44: vrrp_nftables.c: In function 'setup_rule_move_igmp': vrrp_nftables.c:1226:15: error: 'NFT_META_L4PROTO' undeclared (first use in this function) add_meta(r, NFT_META_L4PROTO, NFT_REG_1); ^ Fixes: - http://autobuild.buildroot.org/results/2132570fb0407abc0e70146d771471e13ef10237 Signed-off-by: Fabrice Fontaine --- ...upport-meta-l4proro-until-Linux-3-14.patch | 76 +++++++++++++++++++ ...upport-meta-l4proro-until-Linux-3-14.patch | 40 ++++++++++ package/keepalived/keepalived.mk | 2 + 3 files changed, 118 insertions(+) create mode 100644 package/keepalived/0001-vrrp-nft-didn-t-support-meta-l4proro-until-Linux-3-14.patch create mode 100644 package/keepalived/0002-ipvs-nft-didn-t-support-meta-l4proro-until-Linux-3-14.patch diff --git a/package/keepalived/0001-vrrp-nft-didn-t-support-meta-l4proro-until-Linux-3-14.patch b/package/keepalived/0001-vrrp-nft-didn-t-support-meta-l4proro-until-Linux-3-14.patch new file mode 100644 index 0000000000..9d5f3f7905 --- /dev/null +++ b/package/keepalived/0001-vrrp-nft-didn-t-support-meta-l4proro-until-Linux-3-14.patch @@ -0,0 +1,76 @@ +From edc71b19c619fdc1d71df10a2d0e8f5822965d69 Mon Sep 17 00:00:00 2001 +From: Quentin Armitage +Date: Tue, 8 Feb 2022 14:58:49 +0000 +Subject: [PATCH] vrrp: nft didn't support meta l4proro until Linux 3.14 + +For Linux 3.13 (first version to support nftables), we instead specify: + at nh,48,8 58 + +Signed-off-by: Quentin Armitage + +[Retrieved (and updated to drop update of README.kernel_versions) from: +https://github.com/acassen/keepalived/commit/edc71b19c619fdc1d71df10a2d0e8f5822965d69] +Signed-off-by: Fabrice Fontaine +--- + README.kernel_versions | 1 + + configure.ac | 5 +++++ + keepalived/vrrp/vrrp_nftables.c | 16 ++++++++++++++-- + 3 files changed, 20 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 350a9f4e9..bc643dbf1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1754,6 +1754,11 @@ if test .${enable_nftables} != .no; then + ],[ + AC_MSG_RESULT(no) + ]) ++ ++ # nft l4proto from Linux 3.14 ++ AC_CHECK_DECLS([NFT_META_L4PROTO], [], [], ++ [#include ]) ++ + # nft dup from Linux 4.3 + AC_CHECK_DECLS([NFTA_DUP_MAX], [], [], + [#include ]) +diff --git a/keepalived/vrrp/vrrp_nftables.c b/keepalived/vrrp/vrrp_nftables.c +index d3ea39db3..8b5095ad4 100644 +--- a/keepalived/vrrp/vrrp_nftables.c ++++ b/keepalived/vrrp/vrrp_nftables.c +@@ -1191,6 +1191,8 @@ setup_rule_move_igmp(uint8_t family, const char *table, + otherwise: + nft add rule ip keepalived out ip protocol igmp [meta oifkind macvlan] oif @vmac_set drop + nft add rule ip6 keepalived out icmpv6 type mld2-listener-report [meta oifkind macvlan] oif @vmac_set drop ++ * ++ * Note: on 3.13 kernels, icmpv6 is specified as @nh,48,8 58 + */ + struct nftnl_rule *r = NULL; + uint64_t handle_num; +@@ -1223,7 +1225,12 @@ setup_rule_move_igmp(uint8_t family, const char *table, + offsetof(struct iphdr, daddr), sizeof(struct in_addr)); + #endif + } else { +- add_meta(r, NFT_META_L4PROTO, NFT_REG_1); ++#if HAVE_DECL_NFT_META_L4PROTO ++ add_meta(r, NFT_META_L4PROTO, NFT_REG_1); /* From Linux 3.14 */ ++#else ++ add_payload(r, NFT_PAYLOAD_NETWORK_HEADER, NFT_REG_1, ++ offsetof(struct ip6_hdr, ip6_nxt), sizeof(((struct ip6_hdr *)NULL)->ip6_nxt)); ++#endif + protocol = IPPROTO_ICMPV6; + add_cmp(r, NFT_REG_1, NFT_CMP_EQ, &protocol, sizeof(protocol)); + add_payload(r, NFT_PAYLOAD_TRANSPORT_HEADER, NFT_REG_1, +@@ -1279,7 +1286,12 @@ setup_rule_drop_router_solicit(const char *table, const char *chain, + nftnl_rule_set_u64(r, NFTNL_RULE_POSITION, handle_num); + } + +- add_meta(r, NFT_META_L4PROTO, NFT_REG_1); ++#if HAVE_DECL_NFT_META_L4PROTO ++ add_meta(r, NFT_META_L4PROTO, NFT_REG_1); /* From Linux 3.14 */ ++#else ++ add_payload(r, NFT_PAYLOAD_NETWORK_HEADER, NFT_REG_1, ++ offsetof(struct ip6_hdr, ip6_nxt), sizeof(((struct ip6_hdr *)NULL)->ip6_nxt)); ++#endif + protocol = IPPROTO_ICMPV6; + add_cmp(r, NFT_REG_1, NFT_CMP_EQ, &protocol, sizeof(protocol)); + add_payload(r, NFT_PAYLOAD_TRANSPORT_HEADER, NFT_REG_1, diff --git a/package/keepalived/0002-ipvs-nft-didn-t-support-meta-l4proro-until-Linux-3-14.patch b/package/keepalived/0002-ipvs-nft-didn-t-support-meta-l4proro-until-Linux-3-14.patch new file mode 100644 index 0000000000..3713de37c2 --- /dev/null +++ b/package/keepalived/0002-ipvs-nft-didn-t-support-meta-l4proro-until-Linux-3-14.patch @@ -0,0 +1,40 @@ +From 50e8a8d56cd5a3d7184b035708865302bbc7ef69 Mon Sep 17 00:00:00 2001 +From: Quentin Armitage +Date: Tue, 8 Feb 2022 17:43:49 +0000 +Subject: [PATCH] ipvs: nft didn't support meta l4proro until Linux 3.14 + +For Linux 3.13 (first version to support nftables), we instead specify: +ipv4: @nh,72,8 PROTO +ipv6: @nh,48,8 PROTO + +Signed-off-by: Quentin Armitage + +[Retrieved from: +https://github.com/acassen/keepalived/commit/50e8a8d56cd5a3d7184b035708865302bbc7ef69] +Signed-off-by: Fabrice Fontaine +--- + keepalived/check/check_nftables.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/keepalived/check/check_nftables.c b/keepalived/check/check_nftables.c +index 2d163ac14..45831203b 100644 +--- a/keepalived/check/check_nftables.c ++++ b/keepalived/check/check_nftables.c +@@ -150,7 +150,16 @@ setup_rule_set_mark(uint8_t family, const char *table, + nftnl_rule_set_u64(r, NFTNL_RULE_POSITION, handle_num); + } + +- add_meta(r, NFT_META_L4PROTO, NFT_REG_1); ++#if HAVE_DECL_NFT_META_L4PROTO ++ add_meta(r, NFT_META_L4PROTO, NFT_REG_1); /* From Linux 3.14 */ ++#else ++ if (family == NFPROTO_IPV4) ++ add_payload(r, NFT_PAYLOAD_NETWORK_HEADER, NFT_REG_1, ++ offsetof(struct iphdr, protocol), sizeof(((struct iphdr *)NULL)->protocol)); ++ else ++ add_payload(r, NFT_PAYLOAD_NETWORK_HEADER, NFT_REG_1, ++ offsetof(struct ip6_hdr, ip6_nxt), sizeof(((struct ip6_hdr *)NULL)->ip6_nxt)); ++#endif + add_cmp(r, NFT_REG_1, NFT_CMP_EQ, &l4_protocol, sizeof(l4_protocol)); + if (family == NFPROTO_IPV4) + add_payload(r, NFT_PAYLOAD_NETWORK_HEADER, NFT_REG_1, diff --git a/package/keepalived/keepalived.mk b/package/keepalived/keepalived.mk index 7a1123b4dd..c7e8c3e2ec 100644 --- a/package/keepalived/keepalived.mk +++ b/package/keepalived/keepalived.mk @@ -11,6 +11,8 @@ KEEPALIVED_LICENSE = GPL-2.0+ KEEPALIVED_LICENSE_FILES = COPYING KEEPALIVED_CPE_ID_VENDOR = keepalived KEEPALIVED_CONF_OPTS = --disable-hardening +# We're patching configure.ac +KEEPALIVED_AUTORECONF = YES ifeq ($(BR2_PACKAGE_JSON_C),y) KEEPALIVED_DEPENDENCIES += json-c -- 2.34.1 From fontaine.fabrice at gmail.com Tue Feb 8 19:18:37 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 8 Feb 2022 20:18:37 +0100 Subject: [Buildroot] [PATCH 2/2] package/keepalived: fix build with gcc < 4.9 In-Reply-To: <20220208191837.4057713-1-fontaine.fabrice@gmail.com> References: <20220208191837.4057713-1-fontaine.fabrice@gmail.com> Message-ID: <20220208191837.4057713-2-fontaine.fabrice@gmail.com> Disable track-process to avoid the following build failure with gcc < 4.9 raised since bump to version 2.2.7 in commit 79f631000fe6846e72f44810452bb764c228ad44 as suggested by upstream in https://github.com/acassen/keepalived/issues/2094: In file included from ../../lib/rbtree.h:24:0, from ../../lib/rbtree_ka.h:26, from ../../lib/scheduler.h:40, from ../../lib/notify.h:31, from ../../keepalived/include/vrrp.h:41, from ../../keepalived/include/track_process.h:31, from track_process.c:50: ../../lib/rbtree_types.h:31:25: error: initializer element is not constant #define RB_ROOT (struct rb_root) { NULL, } ^ Fixes: - http://autobuild.buildroot.org/results/2132570fb0407abc0e70146d771471e13ef10237 Signed-off-by: Fabrice Fontaine --- package/keepalived/keepalived.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/keepalived/keepalived.mk b/package/keepalived/keepalived.mk index c7e8c3e2ec..5d6cf174e3 100644 --- a/package/keepalived/keepalived.mk +++ b/package/keepalived/keepalived.mk @@ -56,4 +56,8 @@ else KEEPALIVED_CONF_OPTS += --disable-nftables endif +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_9),) +KEEPALIVED_CONF_OPTS += --disable-track-process +endif + $(eval $(autotools-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Tue Feb 8 19:21:56 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 8 Feb 2022 20:21:56 +0100 Subject: [Buildroot] [PATCH v2, 1/2] package/keepalived: fix build with kernel < 3.14 Message-ID: <20220208192157.4058193-1-fontaine.fabrice@gmail.com> Fix the following build failure with kernel < 3.14 raised since bump to version 2.27 in commit 79f631000fe6846e72f44810452bb764c228ad44: vrrp_nftables.c: In function 'setup_rule_move_igmp': vrrp_nftables.c:1226:15: error: 'NFT_META_L4PROTO' undeclared (first use in this function) add_meta(r, NFT_META_L4PROTO, NFT_REG_1); ^ Fixes: - http://autobuild.buildroot.org/results/2132570fb0407abc0e70146d771471e13ef10237 Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2: - Fix kernel version (4.13 -> 3.14) ...upport-meta-l4proro-until-Linux-3-14.patch | 76 +++++++++++++++++++ ...upport-meta-l4proro-until-Linux-3-14.patch | 40 ++++++++++ package/keepalived/keepalived.mk | 2 + 3 files changed, 118 insertions(+) create mode 100644 package/keepalived/0001-vrrp-nft-didn-t-support-meta-l4proro-until-Linux-3-14.patch create mode 100644 package/keepalived/0002-ipvs-nft-didn-t-support-meta-l4proro-until-Linux-3-14.patch diff --git a/package/keepalived/0001-vrrp-nft-didn-t-support-meta-l4proro-until-Linux-3-14.patch b/package/keepalived/0001-vrrp-nft-didn-t-support-meta-l4proro-until-Linux-3-14.patch new file mode 100644 index 0000000000..9d5f3f7905 --- /dev/null +++ b/package/keepalived/0001-vrrp-nft-didn-t-support-meta-l4proro-until-Linux-3-14.patch @@ -0,0 +1,76 @@ +From edc71b19c619fdc1d71df10a2d0e8f5822965d69 Mon Sep 17 00:00:00 2001 +From: Quentin Armitage +Date: Tue, 8 Feb 2022 14:58:49 +0000 +Subject: [PATCH] vrrp: nft didn't support meta l4proro until Linux 3.14 + +For Linux 3.13 (first version to support nftables), we instead specify: + at nh,48,8 58 + +Signed-off-by: Quentin Armitage + +[Retrieved (and updated to drop update of README.kernel_versions) from: +https://github.com/acassen/keepalived/commit/edc71b19c619fdc1d71df10a2d0e8f5822965d69] +Signed-off-by: Fabrice Fontaine +--- + README.kernel_versions | 1 + + configure.ac | 5 +++++ + keepalived/vrrp/vrrp_nftables.c | 16 ++++++++++++++-- + 3 files changed, 20 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 350a9f4e9..bc643dbf1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1754,6 +1754,11 @@ if test .${enable_nftables} != .no; then + ],[ + AC_MSG_RESULT(no) + ]) ++ ++ # nft l4proto from Linux 3.14 ++ AC_CHECK_DECLS([NFT_META_L4PROTO], [], [], ++ [#include ]) ++ + # nft dup from Linux 4.3 + AC_CHECK_DECLS([NFTA_DUP_MAX], [], [], + [#include ]) +diff --git a/keepalived/vrrp/vrrp_nftables.c b/keepalived/vrrp/vrrp_nftables.c +index d3ea39db3..8b5095ad4 100644 +--- a/keepalived/vrrp/vrrp_nftables.c ++++ b/keepalived/vrrp/vrrp_nftables.c +@@ -1191,6 +1191,8 @@ setup_rule_move_igmp(uint8_t family, const char *table, + otherwise: + nft add rule ip keepalived out ip protocol igmp [meta oifkind macvlan] oif @vmac_set drop + nft add rule ip6 keepalived out icmpv6 type mld2-listener-report [meta oifkind macvlan] oif @vmac_set drop ++ * ++ * Note: on 3.13 kernels, icmpv6 is specified as @nh,48,8 58 + */ + struct nftnl_rule *r = NULL; + uint64_t handle_num; +@@ -1223,7 +1225,12 @@ setup_rule_move_igmp(uint8_t family, const char *table, + offsetof(struct iphdr, daddr), sizeof(struct in_addr)); + #endif + } else { +- add_meta(r, NFT_META_L4PROTO, NFT_REG_1); ++#if HAVE_DECL_NFT_META_L4PROTO ++ add_meta(r, NFT_META_L4PROTO, NFT_REG_1); /* From Linux 3.14 */ ++#else ++ add_payload(r, NFT_PAYLOAD_NETWORK_HEADER, NFT_REG_1, ++ offsetof(struct ip6_hdr, ip6_nxt), sizeof(((struct ip6_hdr *)NULL)->ip6_nxt)); ++#endif + protocol = IPPROTO_ICMPV6; + add_cmp(r, NFT_REG_1, NFT_CMP_EQ, &protocol, sizeof(protocol)); + add_payload(r, NFT_PAYLOAD_TRANSPORT_HEADER, NFT_REG_1, +@@ -1279,7 +1286,12 @@ setup_rule_drop_router_solicit(const char *table, const char *chain, + nftnl_rule_set_u64(r, NFTNL_RULE_POSITION, handle_num); + } + +- add_meta(r, NFT_META_L4PROTO, NFT_REG_1); ++#if HAVE_DECL_NFT_META_L4PROTO ++ add_meta(r, NFT_META_L4PROTO, NFT_REG_1); /* From Linux 3.14 */ ++#else ++ add_payload(r, NFT_PAYLOAD_NETWORK_HEADER, NFT_REG_1, ++ offsetof(struct ip6_hdr, ip6_nxt), sizeof(((struct ip6_hdr *)NULL)->ip6_nxt)); ++#endif + protocol = IPPROTO_ICMPV6; + add_cmp(r, NFT_REG_1, NFT_CMP_EQ, &protocol, sizeof(protocol)); + add_payload(r, NFT_PAYLOAD_TRANSPORT_HEADER, NFT_REG_1, diff --git a/package/keepalived/0002-ipvs-nft-didn-t-support-meta-l4proro-until-Linux-3-14.patch b/package/keepalived/0002-ipvs-nft-didn-t-support-meta-l4proro-until-Linux-3-14.patch new file mode 100644 index 0000000000..3713de37c2 --- /dev/null +++ b/package/keepalived/0002-ipvs-nft-didn-t-support-meta-l4proro-until-Linux-3-14.patch @@ -0,0 +1,40 @@ +From 50e8a8d56cd5a3d7184b035708865302bbc7ef69 Mon Sep 17 00:00:00 2001 +From: Quentin Armitage +Date: Tue, 8 Feb 2022 17:43:49 +0000 +Subject: [PATCH] ipvs: nft didn't support meta l4proro until Linux 3.14 + +For Linux 3.13 (first version to support nftables), we instead specify: +ipv4: @nh,72,8 PROTO +ipv6: @nh,48,8 PROTO + +Signed-off-by: Quentin Armitage + +[Retrieved from: +https://github.com/acassen/keepalived/commit/50e8a8d56cd5a3d7184b035708865302bbc7ef69] +Signed-off-by: Fabrice Fontaine +--- + keepalived/check/check_nftables.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/keepalived/check/check_nftables.c b/keepalived/check/check_nftables.c +index 2d163ac14..45831203b 100644 +--- a/keepalived/check/check_nftables.c ++++ b/keepalived/check/check_nftables.c +@@ -150,7 +150,16 @@ setup_rule_set_mark(uint8_t family, const char *table, + nftnl_rule_set_u64(r, NFTNL_RULE_POSITION, handle_num); + } + +- add_meta(r, NFT_META_L4PROTO, NFT_REG_1); ++#if HAVE_DECL_NFT_META_L4PROTO ++ add_meta(r, NFT_META_L4PROTO, NFT_REG_1); /* From Linux 3.14 */ ++#else ++ if (family == NFPROTO_IPV4) ++ add_payload(r, NFT_PAYLOAD_NETWORK_HEADER, NFT_REG_1, ++ offsetof(struct iphdr, protocol), sizeof(((struct iphdr *)NULL)->protocol)); ++ else ++ add_payload(r, NFT_PAYLOAD_NETWORK_HEADER, NFT_REG_1, ++ offsetof(struct ip6_hdr, ip6_nxt), sizeof(((struct ip6_hdr *)NULL)->ip6_nxt)); ++#endif + add_cmp(r, NFT_REG_1, NFT_CMP_EQ, &l4_protocol, sizeof(l4_protocol)); + if (family == NFPROTO_IPV4) + add_payload(r, NFT_PAYLOAD_NETWORK_HEADER, NFT_REG_1, diff --git a/package/keepalived/keepalived.mk b/package/keepalived/keepalived.mk index 7a1123b4dd..c7e8c3e2ec 100644 --- a/package/keepalived/keepalived.mk +++ b/package/keepalived/keepalived.mk @@ -11,6 +11,8 @@ KEEPALIVED_LICENSE = GPL-2.0+ KEEPALIVED_LICENSE_FILES = COPYING KEEPALIVED_CPE_ID_VENDOR = keepalived KEEPALIVED_CONF_OPTS = --disable-hardening +# We're patching configure.ac +KEEPALIVED_AUTORECONF = YES ifeq ($(BR2_PACKAGE_JSON_C),y) KEEPALIVED_DEPENDENCIES += json-c -- 2.34.1 From fontaine.fabrice at gmail.com Tue Feb 8 19:21:57 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 8 Feb 2022 20:21:57 +0100 Subject: [Buildroot] [PATCH v2, 2/2] package/keepalived: fix build with gcc < 4.9 In-Reply-To: <20220208192157.4058193-1-fontaine.fabrice@gmail.com> References: <20220208192157.4058193-1-fontaine.fabrice@gmail.com> Message-ID: <20220208192157.4058193-2-fontaine.fabrice@gmail.com> Disable track-process to avoid the following build failure with gcc < 4.9 raised since bump to version 2.2.7 in commit 79f631000fe6846e72f44810452bb764c228ad44 as suggested by upstream in https://github.com/acassen/keepalived/issues/2094: In file included from ../../lib/rbtree.h:24:0, from ../../lib/rbtree_ka.h:26, from ../../lib/scheduler.h:40, from ../../lib/notify.h:31, from ../../keepalived/include/vrrp.h:41, from ../../keepalived/include/track_process.h:31, from track_process.c:50: ../../lib/rbtree_types.h:31:25: error: initializer element is not constant #define RB_ROOT (struct rb_root) { NULL, } ^ Fixes: - http://autobuild.buildroot.org/results/2132570fb0407abc0e70146d771471e13ef10237 Signed-off-by: Fabrice Fontaine --- package/keepalived/keepalived.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/keepalived/keepalived.mk b/package/keepalived/keepalived.mk index c7e8c3e2ec..5d6cf174e3 100644 --- a/package/keepalived/keepalived.mk +++ b/package/keepalived/keepalived.mk @@ -56,4 +56,8 @@ else KEEPALIVED_CONF_OPTS += --disable-nftables endif +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_9),) +KEEPALIVED_CONF_OPTS += --disable-track-process +endif + $(eval $(autotools-package)) -- 2.34.1 From arnout at mind.be Tue Feb 8 19:50:54 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 8 Feb 2022 20:50:54 +0100 Subject: [Buildroot] Getting Buildroot-created binaries to work with the Intel (TI) Puma 5 ARM-based CPU? In-Reply-To: References: <53fa9f43-8aa2-4820-70e9-365e22b3408c@mind.be> Message-ID: On 06/02/2022 14:55, Dan Jackson wrote: > > >> -----Original Message----- >> From: Arnout Vandecappelle >> Sent: 06 February 2022 11:50 >> To: Dan Jackson ; buildroot at buildroot.org >> Subject: Re: [Buildroot] Getting Buildroot-created binaries to work with the >> Intel (TI) Puma 5 ARM-based CPU? >> > > [...snip...] > >>> >>> Links to the two toolchains I mentioned: >>> https://github.com/bmaia/cross- >> utils/tree/master/armeb/puma5_toolchain (uses Buildroot 2009.02) >> >> This one uses >> >> BR2_armeb=y >> BR2_arm1176jz_s=y >> BR2_ARM_EABI=y >> >> It's not clear if there's an FPU, so use soft float. > > From /proc/cpuinfo on the target device I can see: > > Features : swp half thumb fastmult edsp java > > It's my understanding this line would include "vfp" if there was an FPU, so I don't believe there is one. > >> >> That should be enough to build a toolchain and userspace with current >> Buildroot. > > I tried creating a fresh Buildroot using the current stable version 2021.11 and only the above options. > > I then tried transferring the files from the generated rootfs.tar to a directory /var/tmp/test on the device (the reason for this is that / is a read-only file system, so /bin, /lib, /usr are not writable, but /var is a read-write file system). > > I then attempted to execute it in the following manner (accounting for the fact that Buildroot builds dynamically linked executables by default): > > /var/tmp/test/lib/ld-uClibc-1.0.39.so --library-path /var/tmp/test/lib /var/tmp/test/bin/busybox > > (this method was suggested in the section LD_LIBRARY_PATH on this page: https://tldp.org/HOWTO/Program-Library-HOWTO/shared-libraries.html) I generally find it easier to chroot, but OK. (To do anything more than the simplest thing, you'll have to bind-mount a bunch of directories of course: /proc, /sys, and whatever directories you want to share with the rest of the system). > However this did not work and in fact produced a "Segmentation fault" error. Segmentation fault is not what you'd expect if some arch-related setting is wrong - it would be SIGILL or SIGFPE or something like that. You could try building with BR2_STATIC_LIBS=y, then you don't have to worry about shared libraries. Oh hang on, I forgot: you need to make sure that the kernel headers version is set to the same version as the running kernel. With glibc there is some backward compatibility for older kernels, but uClibc needs to be identical. Regards, Arnout > > Have I made some kind of obvious error or mistake? > > Thanks, > Dan Jackson. From giulio.benetti at benettiengineering.com Tue Feb 8 20:00:36 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 8 Feb 2022 21:00:36 +0100 Subject: [Buildroot] [PATCH] board/pc: fix build failure due to new genimage 15 In-Reply-To: References: <98670320-83fa-c6e9-9bc4-aa30d9deb6ff@mind.be> <34C01EB2-BB12-4DE4-BC53-0141B5DF491D@benettiengineering.com> Message-ID: <41eaa6a2-6053-7671-1ff7-b8dd191263ba@benettiengineering.com> Hi Arnout, On 05/02/22 18:40, Giulio Benetti wrote: > Hi again Arnout, > > On 05/02/22 16:36, Giulio Benetti wrote: >> Hi Arnout, >> >>> Il giorno 5 feb 2022, alle ore 15:11, Arnout Vandecappelle ha scritto: >>> >>> ? Hi Giulio, >>> >>>> On 04/02/2022 01:56, Giulio Benetti wrote: >>>> Actually genimage fails to create final image with: >>>> ``` >>>> ERROR: hdimage(disk.img): partition [MBR] (offset 0x1b8, size 0x48) overlaps previous partition boot (offset 0x0, size 0x200) >>>> ERROR: hdimage(disk.img): bootloaders, etc. that overlap with the partition table must declare the overlapping area as a hole. >>>> ``` >>>> This is because genimage 15 is less permissive than before, so let's add >>>> holes = {"(440; 512)"} to leave room to MBR. >>>> Fixes: >>>> https://gitlab.com/buildroot.org/buildroot/-/jobs/1865935249 >>>> Signed-off-by: Giulio Benetti >>>> --- >>>> board/pc/genimage-bios.cfg | 1 + >>>> 1 file changed, 1 insertion(+) >>>> diff --git a/board/pc/genimage-bios.cfg b/board/pc/genimage-bios.cfg >>>> index 26d12d9ab3..54026f6527 100644 >>>> --- a/board/pc/genimage-bios.cfg >>>> +++ b/board/pc/genimage-bios.cfg >>>> @@ -7,6 +7,7 @@ image disk.img { >>>> image = "boot.img" >>>> offset = 0 >>>> size = 512 >>>> + holes = {"(440; 512)"} >>> >>> Have you tested this change on an actual board (i.e. a PC :-)? >> >> I?ve tested it with qemu and it boots the kernel correctly(that is in rootfs), only thing is that it can?t mount the rootfs and I don?t understand why. >> I wanted to ask about this but I?ve got lost among all the other patches :-) > > I've compared the 2 disk.img files, one generated with genimage 14 > without "holes..." and the other generated with genimage 15 and they are > the same. > > The problem here is not that it can't mount using qemu, but it doesn't > show the shell. > > Here is the qemu command: > qemu-system-x86_64 -M pc -drive > file=images/disk.img,if=virtio,format=raw -net nic,model=virtio -net user > > and this is the output: > https://imgur.com/a/ffZBlJR > > So it seems like a busybox/init system issue with tty1. I'm digging. I've found the problem. Using the grub.cfg as it is(root=/dev/sda1) works only with Virtualbox but not with Qemu that needs s/sda1/vda1. But it's not so well explained in readme.txt, so I'm going to send a patch for that. So I can give a: Tested-by: Giulio Benetti [Giulio: tested successfully with Qemu and Virtualbox] Best regards -- Giulio Benetti Benetti Engineering sas From giulio.benetti at benettiengineering.com Tue Feb 8 20:01:34 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 8 Feb 2022 21:01:34 +0100 Subject: [Buildroot] [PATCH] board/pc: fix build failure due to new genimage 15 In-Reply-To: <41eaa6a2-6053-7671-1ff7-b8dd191263ba@benettiengineering.com> References: <98670320-83fa-c6e9-9bc4-aa30d9deb6ff@mind.be> <34C01EB2-BB12-4DE4-BC53-0141B5DF491D@benettiengineering.com> <41eaa6a2-6053-7671-1ff7-b8dd191263ba@benettiengineering.com> Message-ID: <0a4cafd3-cbe0-16b7-cc3e-668e14240f0e@benettiengineering.com> On 08/02/22 21:00, Giulio Benetti wrote: > Hi Arnout, > > On 05/02/22 18:40, Giulio Benetti wrote: >> Hi again Arnout, >> >> On 05/02/22 16:36, Giulio Benetti wrote: >>> Hi Arnout, >>> >>>> Il giorno 5 feb 2022, alle ore 15:11, Arnout Vandecappelle ha scritto: >>>> >>>> ? Hi Giulio, >>>> >>>>> On 04/02/2022 01:56, Giulio Benetti wrote: >>>>> Actually genimage fails to create final image with: >>>>> ``` >>>>> ERROR: hdimage(disk.img): partition [MBR] (offset 0x1b8, size 0x48) overlaps previous partition boot (offset 0x0, size 0x200) >>>>> ERROR: hdimage(disk.img): bootloaders, etc. that overlap with the partition table must declare the overlapping area as a hole. >>>>> ``` >>>>> This is because genimage 15 is less permissive than before, so let's add >>>>> holes = {"(440; 512)"} to leave room to MBR. >>>>> Fixes: >>>>> https://gitlab.com/buildroot.org/buildroot/-/jobs/1865935249 >>>>> Signed-off-by: Giulio Benetti >>>>> --- >>>>> board/pc/genimage-bios.cfg | 1 + >>>>> 1 file changed, 1 insertion(+) >>>>> diff --git a/board/pc/genimage-bios.cfg b/board/pc/genimage-bios.cfg >>>>> index 26d12d9ab3..54026f6527 100644 >>>>> --- a/board/pc/genimage-bios.cfg >>>>> +++ b/board/pc/genimage-bios.cfg >>>>> @@ -7,6 +7,7 @@ image disk.img { >>>>> image = "boot.img" >>>>> offset = 0 >>>>> size = 512 >>>>> + holes = {"(440; 512)"} >>>> >>>> Have you tested this change on an actual board (i.e. a PC :-)? >>> >>> I?ve tested it with qemu and it boots the kernel correctly(that is in rootfs), only thing is that it can?t mount the rootfs and I don?t understand why. >>> I wanted to ask about this but I?ve got lost among all the other patches :-) >> >> I've compared the 2 disk.img files, one generated with genimage 14 >> without "holes..." and the other generated with genimage 15 and they are >> the same. >> >> The problem here is not that it can't mount using qemu, but it doesn't >> show the shell. >> >> Here is the qemu command: >> qemu-system-x86_64 -M pc -drive >> file=images/disk.img,if=virtio,format=raw -net nic,model=virtio -net user >> >> and this is the output: >> https://imgur.com/a/ffZBlJR >> >> So it seems like a busybox/init system issue with tty1. I'm digging. > > I've found the problem. Using the grub.cfg as it is(root=/dev/sda1) > works only with Virtualbox but not with Qemu that needs s/sda1/vda1. > > But it's not so well explained in readme.txt, so I'm going to send a > patch for that. Pardon, I've only misread. readme.txt is correct. > So I can give a: > Tested-by: Giulio Benetti > [Giulio: tested successfully with Qemu and Virtualbox] > > Best regards -- Giulio Benetti Benetti Engineering sas From arnout at mind.be Tue Feb 8 20:25:24 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 8 Feb 2022 21:25:24 +0100 Subject: [Buildroot] [PATCHv2 1/7] arch: move definition of KERNEL_ARCH to Config.in. files In-Reply-To: <20220115200306.14037-2-patrickdepinguin@gmail.com> References: <20220115200306.14037-1-patrickdepinguin@gmail.com> <20220115200306.14037-2-patrickdepinguin@gmail.com> Message-ID: On 15/01/2022 21:02, Thomas De Schampheleire wrote: > 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 Applied to master, thanks. Regards, Arnout > > --- > 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" > From arnout at mind.be Tue Feb 8 20:26:07 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 8 Feb 2022 21:26:07 +0100 Subject: [Buildroot] [PATCHv2 2/7] core: introduce NORMALIZED_ARCH as non-kernel replacement for KERNEL_ARCH In-Reply-To: <20220115200306.14037-3-patrickdepinguin@gmail.com> References: <20220115200306.14037-1-patrickdepinguin@gmail.com> <20220115200306.14037-3-patrickdepinguin@gmail.com> Message-ID: On 15/01/2022 21:03, Thomas De Schampheleire wrote: > 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 I also renamed BR2_KERNEL_ARCH introduced in the previous patch to BR2_NORMALIZED_ARCH. Applied to master, thanks. Regards, Arnout > > --- > 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 From arnout at mind.be Tue Feb 8 20:28:52 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 8 Feb 2022 21:28:52 +0100 Subject: [Buildroot] [PATCHv2 7/7] linux/linux.mk: correct LINUX_ARCH_PATH for sparc64 In-Reply-To: <20220115200306.14037-8-patrickdepinguin@gmail.com> References: <20220115200306.14037-1-patrickdepinguin@gmail.com> <20220115200306.14037-8-patrickdepinguin@gmail.com> Message-ID: On 15/01/2022 21:03, Thomas De Schampheleire wrote: > 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 AFAIU this is completely independent of the rest of the series, so I applied to master, thanks. Regards, Arnout > --- > 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 From arnout at mind.be Tue Feb 8 20:24:41 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 8 Feb 2022 21:24:41 +0100 Subject: [Buildroot] [git commit] linux/linux.mk: correct LINUX_ARCH_PATH for sparc64 Message-ID: <20220208202150.3CF6A82B8F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0ecfdc093227c37ed1083e43404b748e8ee8a323 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 From arnout at mind.be Tue Feb 8 19:55:36 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 8 Feb 2022 20:55:36 +0100 Subject: [Buildroot] [git commit] arch: move definition of KERNEL_ARCH to Config.in. files Message-ID: <20220208202150.2666B82B8F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cf198e229994ae4d55ed5c50c8e14bc0649aba37 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 27f2bfcd4c..521b02d1b6 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -564,6 +564,10 @@ config BR2_ARCH default "i686" if BR2_i386 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 arnout at mind.be Tue Feb 8 20:20:23 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 8 Feb 2022 21:20:23 +0100 Subject: [Buildroot] [git commit] core: introduce NORMALIZED_ARCH as non-kernel replacement for KERNEL_ARCH Message-ID: <20220208202150.3464E82DBF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dd8a410eafaceb30fd06e17edbb2d01283f99494 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 [Arnout: Also rename BR2_KERNEL_ARCH to BR2_NORMALIZED_ARCH] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- Makefile | 3 ++- arch/Config.in | 2 +- arch/Config.in.arc | 2 +- arch/Config.in.arm | 2 +- arch/Config.in.csky | 2 +- arch/Config.in.m68k | 2 +- arch/Config.in.microblaze | 2 +- arch/Config.in.mips | 2 +- arch/Config.in.nds32 | 2 +- arch/Config.in.nios2 | 2 +- arch/Config.in.or1k | 2 +- arch/Config.in.powerpc | 2 +- arch/Config.in.riscv | 2 +- arch/Config.in.s390x | 2 +- arch/Config.in.sh | 2 +- arch/Config.in.sparc | 2 +- arch/Config.in.x86 | 2 +- arch/Config.in.xtensa | 2 +- 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 +++++----- 29 files changed, 45 insertions(+), 44 deletions(-) diff --git a/Makefile b/Makefile index e012d121b9..8a4ec4ef85 100644 --- a/Makefile +++ b/Makefile @@ -437,7 +437,8 @@ QUIET := $(if $(findstring s,$(filter-out --%,$(MAKEFLAGS))),-q) # Strip off the annoying quoting ARCH := $(call qstrip,$(BR2_ARCH)) -KERNEL_ARCH := $(call qstrip,$(BR2_KERNEL_ARCH)) +NORMALIZED_ARCH := $(call qstrip,$(BR2_NORMALIZED_ARCH)) +KERNEL_ARCH := $(call qstrip,$(BR2_NORMALIZED_ARCH)) ZCAT := $(call qstrip,$(BR2_ZCAT)) BZCAT := $(call qstrip,$(BR2_BZCAT)) diff --git a/arch/Config.in b/arch/Config.in index edf337f13e..98b0e40d51 100644 --- a/arch/Config.in +++ b/arch/Config.in @@ -328,7 +328,7 @@ config BR2_ARCH_NEEDS_GCC_AT_LEAST_11 config BR2_ARCH string -config BR2_KERNEL_ARCH +config BR2_NORMALIZED_ARCH string config BR2_ENDIAN diff --git a/arch/Config.in.arc b/arch/Config.in.arc index cc55c9e68f..388d3496bc 100644 --- a/arch/Config.in.arc +++ b/arch/Config.in.arc @@ -62,7 +62,7 @@ config BR2_ARCH default "arc" if BR2_arcle default "arceb" if BR2_arceb -config BR2_KERNEL_ARCH +config BR2_NORMALIZED_ARCH default "arc" config BR2_arc diff --git a/arch/Config.in.arm b/arch/Config.in.arm index 0f50512fad..85040ac89f 100644 --- a/arch/Config.in.arm +++ b/arch/Config.in.arm @@ -822,7 +822,7 @@ config BR2_ARCH default "aarch64" if BR2_aarch64 default "aarch64_be" if BR2_aarch64_be -config BR2_KERNEL_ARCH +config BR2_NORMALIZED_ARCH default "arm" if BR2_arm || BR2_armeb default "arm64" if BR2_aarch64 || BR2_aarch64_be diff --git a/arch/Config.in.csky b/arch/Config.in.csky index df9e7ab75b..b20b39e225 100644 --- a/arch/Config.in.csky +++ b/arch/Config.in.csky @@ -39,7 +39,7 @@ config BR2_GCC_TARGET_FLOAT_ABI config BR2_ARCH default "csky" -config BR2_KERNEL_ARCH +config BR2_NORMALIZED_ARCH default "csky" config BR2_ENDIAN diff --git a/arch/Config.in.m68k b/arch/Config.in.m68k index 7f3aec7232..1f7d944621 100644 --- a/arch/Config.in.m68k +++ b/arch/Config.in.m68k @@ -1,7 +1,7 @@ config BR2_ARCH default "m68k" if BR2_m68k -config BR2_KERNEL_ARCH +config BR2_NORMALIZED_ARCH default "m68k" config BR2_ENDIAN diff --git a/arch/Config.in.microblaze b/arch/Config.in.microblaze index 52aa252a2c..0502001afc 100644 --- a/arch/Config.in.microblaze +++ b/arch/Config.in.microblaze @@ -2,7 +2,7 @@ config BR2_ARCH default "microblazeel" if BR2_microblazeel default "microblaze" if BR2_microblazebe -config BR2_KERNEL_ARCH +config BR2_NORMALIZED_ARCH default "microblaze" config BR2_ENDIAN diff --git a/arch/Config.in.mips b/arch/Config.in.mips index b4923f8484..7f44f06c9d 100644 --- a/arch/Config.in.mips +++ b/arch/Config.in.mips @@ -235,7 +235,7 @@ config BR2_ARCH default "mips64" if BR2_mips64 default "mips64el" if BR2_mips64el -config BR2_KERNEL_ARCH +config BR2_NORMALIZED_ARCH default "mips" config BR2_ENDIAN diff --git a/arch/Config.in.nds32 b/arch/Config.in.nds32 index 61fc346260..0babb2cf7f 100644 --- a/arch/Config.in.nds32 +++ b/arch/Config.in.nds32 @@ -1,7 +1,7 @@ config BR2_ARCH default "nds32le" -config BR2_KERNEL_ARCH +config BR2_NORMALIZED_ARCH default "nds32" config BR2_GCC_TARGET_ARCH diff --git a/arch/Config.in.nios2 b/arch/Config.in.nios2 index c77b1a1c59..a5d7e66d40 100644 --- a/arch/Config.in.nios2 +++ b/arch/Config.in.nios2 @@ -1,7 +1,7 @@ config BR2_ARCH default "nios2" -config BR2_KERNEL_ARCH +config BR2_NORMALIZED_ARCH default "nios2" config BR2_ENDIAN diff --git a/arch/Config.in.or1k b/arch/Config.in.or1k index ef1bded453..f42aef9eef 100644 --- a/arch/Config.in.or1k +++ b/arch/Config.in.or1k @@ -1,7 +1,7 @@ config BR2_ARCH default "or1k" -config BR2_KERNEL_ARCH +config BR2_NORMALIZED_ARCH default "openrisc" config BR2_ENDIAN diff --git a/arch/Config.in.powerpc b/arch/Config.in.powerpc index 33b2471cf9..4a39cfee70 100644 --- a/arch/Config.in.powerpc +++ b/arch/Config.in.powerpc @@ -157,7 +157,7 @@ config BR2_ARCH default "powerpc64" if BR2_powerpc64 default "powerpc64le" if BR2_powerpc64le -config BR2_KERNEL_ARCH +config BR2_NORMALIZED_ARCH default "powerpc" config BR2_ENDIAN diff --git a/arch/Config.in.riscv b/arch/Config.in.riscv index 1a008a935d..288ed833eb 100644 --- a/arch/Config.in.riscv +++ b/arch/Config.in.riscv @@ -118,7 +118,7 @@ config BR2_ARCH default "riscv32" if !BR2_ARCH_IS_64 default "riscv64" if BR2_ARCH_IS_64 -config BR2_KERNEL_ARCH +config BR2_NORMALIZED_ARCH default "riscv" config BR2_ENDIAN diff --git a/arch/Config.in.s390x b/arch/Config.in.s390x index bf4b70f957..da6ac55d8a 100644 --- a/arch/Config.in.s390x +++ b/arch/Config.in.s390x @@ -17,7 +17,7 @@ endchoice config BR2_ARCH default "s390x" if BR2_s390x -config BR2_KERNEL_ARCH +config BR2_NORMALIZED_ARCH default "s390" config BR2_ENDIAN diff --git a/arch/Config.in.sh b/arch/Config.in.sh index fde42dfce2..c1ba449dd5 100644 --- a/arch/Config.in.sh +++ b/arch/Config.in.sh @@ -24,7 +24,7 @@ config BR2_ARCH default "sh4a" if BR2_sh4a default "sh4aeb" if BR2_sh4aeb -config BR2_KERNEL_ARCH +config BR2_NORMALIZED_ARCH default "sh" config BR2_ENDIAN diff --git a/arch/Config.in.sparc b/arch/Config.in.sparc index b91df6892b..f5f4bd6708 100644 --- a/arch/Config.in.sparc +++ b/arch/Config.in.sparc @@ -21,7 +21,7 @@ config BR2_ARCH default "sparc" if BR2_sparc default "sparc64" if BR2_sparc64 -config BR2_KERNEL_ARCH +config BR2_NORMALIZED_ARCH default "sparc" if BR2_sparc default "sparc64" if BR2_sparc64 diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index 521b02d1b6..2560da922b 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -564,7 +564,7 @@ config BR2_ARCH default "i686" if BR2_i386 default "x86_64" if BR2_x86_64 -config BR2_KERNEL_ARCH +config BR2_NORMALIZED_ARCH default "i386" if !BR2_x86_64 default "x86_64" if BR2_x86_64 diff --git a/arch/Config.in.xtensa b/arch/Config.in.xtensa index acc340eca6..45ad2dc487 100644 --- a/arch/Config.in.xtensa +++ b/arch/Config.in.xtensa @@ -48,7 +48,7 @@ config BR2_ENDIAN config BR2_ARCH default "xtensa" if BR2_xtensa -config BR2_KERNEL_ARCH +config BR2_NORMALIZED_ARCH default "xtensa" config BR2_READELF_ARCH_NAME 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 a61d1c8135..d05b9bb479 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 From arnout at mind.be Tue Feb 8 20:49:47 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 8 Feb 2022 21:49:47 +0100 Subject: [Buildroot] [PATCHv2 0/7] Basic support for 64-bit kernel and 32-bit userland In-Reply-To: <20220115200306.14037-1-patrickdepinguin@gmail.com> References: <20220115200306.14037-1-patrickdepinguin@gmail.com> Message-ID: On 15/01/2022 21:02, Thomas De Schampheleire wrote: > 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. So, I'm not entirely convinced about this approach. Here are my objections. - At least for arm, you need an entirely different toolchain for the 32 and the 64-bit variants. But even for x86, the Buildroot internal toolchain for x86_64 doesn't support -m32. So for most users this is not even going to work. - There is an alternative: two separate Buildroot configs, one for the kernel + modules, one for userspace. - I don't think the flexibility is useful. I think it would be better to reuse the BR2_KERNEL_64_USERLAND_32 option. (E.g. add an option to Config.in.x86 when the arch is x86_64 to build a 32-bit userspace.) That way we can use it to pass -m32 where needed, to build an internal toolchain that supports it, and to check for the external toolchain if it supports it. Doesn't solve the issue for ARM, but it's a start. Also, I think we absolutely need to test this feature. At the very least, we'd need to config in the autobuilders that enables it, or enable it randomly in genrandconfig. Although I'm not sure if it tests anything if no kernel is built (let alone that it's not even booted). For now, I've left the rest of the series as New in patchwork, let's see what the others think. Regards, Arnout > > 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 > From fontaine.fabrice at gmail.com Tue Feb 8 20:52:32 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 8 Feb 2022 21:52:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/sudo: drop openssl workaround Message-ID: <20220208205232.16362-1-fontaine.fabrice@gmail.com> Drop workaround added by commit bf899e50d89439b1a1bdf22bc933075958ffc108 because sudo natively supports pkg-config for searching openssl (which is enabled by default) since version 1.9.2 and https://github.com/sudo-project/sudo/commit/4cadd549513ef35d4d740e941576294f4491d13d As a side-effect, this will fix the following build failure when openssl is not installed on host (as LIBS is set before AX_PROG_CC_FOR_BUILD): configure:8162: checking whether the C compiler works configure:8184: /usr/bin/gcc -O2 -I/home/buildroot/autobuild/instance-2/output-1/host/include -I/home/buildroot/autobuild/instance-2/output-1/host/include -L/home/buildroot/autobuild/instance-2/output-1/host/lib -Wl,-rpath,/home/buildroot/autobuild/instance-2/output-1/host/lib conftest.c -L/home/buildroot/autobuild/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib -lssl -L/home/buildroot/autobuild/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib -pthread -latomic -lcrypto -pthread -latomic >&5 /usr/bin/ld: skipping incompatible /home/buildroot/autobuild/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libssl.a when searching for -lssl /usr/bin/ld: skipping incompatible /home/buildroot/autobuild/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libssl.a when searching for -lssl /usr/bin/ld: cannot find -lssl Fixes: - http://autobuild.buildroot.org/results/7a5d4dd22343be46a5ddd1c1a1a8e1799517d564 Signed-off-by: Fabrice Fontaine --- package/sudo/sudo.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index f2c074e55f..a752217123 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -45,17 +45,17 @@ endif ifeq ($(BR2_PACKAGE_OPENLDAP),y) SUDO_DEPENDENCIES += openldap SUDO_CONF_OPTS += --with-ldap -# If we are building sudo statically and openldap was linked with openssl, then -# when we link sudo with openldap we need to specify the openssl libs, otherwise -# it will fail with "undefined reference" errors. -ifeq ($(BR2_STATIC_LIBS)$(BR2_PACKAGE_OPENSSL),yy) -SUDO_DEPENDENCIES += host-pkgconf -SUDO_CONF_ENV += LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs libssl libcrypto`" -endif else SUDO_CONF_OPTS += --without-ldap endif +ifeq ($(BR2_PACKAGE_OPENSSL),y) +SUDO_DEPENDENCIES += host-pkgconf openssl +SUDO_CONF_OPTS += --enable-openssl +else +SUDO_CONF_OPTS += --disable-openssl +endif + # mksigname/mksiglist needs to run on build host to generate source files define SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST $(MAKE) $(HOST_CONFIGURE_OPTS) \ -- 2.34.1 From arnout at mind.be Tue Feb 8 20:56:08 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 8 Feb 2022 21:56:08 +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: <6d74e1be-2ff0-5e4d-cf2d-1e2b078162c1@mind.be> On 27/05/2021 16:51, Juergen Stuber wrote: > 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. I've extended the commit message a bit to explain a use case where relative paths may be useful, and applied to master, thanks. Regards, Arnout > > 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 arnout at mind.be Tue Feb 8 20:51:36 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 8 Feb 2022 21:51:36 +0100 Subject: [Buildroot] [git commit] toolchain/toolchain-external: Allow relative paths in BR2_TOOLCHAIN_EXTERNAL_PATH. Message-ID: <20220208204854.1420882DC5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0b28ee9267f790792eb8335ee2ceba268ea6152e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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. Although relative paths sounds like something less than ideal to put in a Buildroot configuration, it's actually rather typical to put the buildroot sources as a submodule (or subdirectory) of custom sources (either in a BR2_EXTERNAL or not), in which case the relative path is well-defined. Signed-off-by: Juergen Stuber Reviewed-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 68d7a3fe21..299b6008aa 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 fontaine.fabrice at gmail.com Tue Feb 8 21:06:44 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 8 Feb 2022 22:06:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/libuhttpd: depends on gcc >= 4.9 Message-ID: <20220208210644.16926-1-fontaine.fabrice@gmail.com> Add a dependency on gcc >= 4.9 to avoid the following build failure with gcc 4.8.3 raised since bump to version 3.14.1 in commit 61797c52f5deef2cb67e60cf075ca243078c8855 and https://github.com/zhaojh329/libuhttpd/commit/ffdf7de3a4a1f5a62aa3814ac96e889958a30840: /home/peko/autobuild/instance-1/output-1/build/libuhttpd-3.14.1/src/cgi.c:41:5: error: initializer element is not a constant expression [-Werror] {"accept", strlen("accept"), "HTTP_ACCEPT"}, ^ It should be noted that upstream rejected a patch to remove -Werror: https://github.com/zhaojh329/libuhttpd/pull/12 Fixes: - http://autobuild.buildroot.org/results/a3a970a6398dcb0e4e03f4277f1a50c6b5eff7bd Signed-off-by: Fabrice Fontaine --- package/libuhttpd/Config.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/libuhttpd/Config.in b/package/libuhttpd/Config.in index 52bbd313bc..97fc984ea0 100644 --- a/package/libuhttpd/Config.in +++ b/package/libuhttpd/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_LIBUHTTPD bool "libuhttpd" depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 select BR2_PACKAGE_LIBEV select BR2_PACKAGE_WOLFSSL_ALL if BR2_PACKAGE_WOLFSSL help @@ -8,3 +9,7 @@ config BR2_PACKAGE_LIBUHTTPD library based on libev https://github.com/zhaojh329/libuhttpd + +comment "libuhttpd needs a toolchain w/ gcc >= 4.9" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 -- 2.34.1 From arnout at mind.be Tue Feb 8 21:09:44 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 8 Feb 2022 22:09:44 +0100 Subject: [Buildroot] [PATCH v5] package/libcamera-apps: new package In-Reply-To: <20210502095925.10744-1-ps.report@gmx.net> References: <20210502095925.10744-1-ps.report@gmx.net> Message-ID: On 02/05/2021 11:59, Peter Seiderer wrote: > Signed-off-by: Peter Seiderer (Finally) applied to master, thanks. However... [snip] > diff --git a/package/libcamera-apps/0001-cmake-remove-Wfatal-errors-compiler-command-line-opt.patch b/package/libcamera-apps/0001-cmake-remove-Wfatal-errors-compiler-command-line-opt.patch > new file mode 100644 > index 0000000000..11d19fa526 > --- /dev/null > +++ b/package/libcamera-apps/0001-cmake-remove-Wfatal-errors-compiler-command-line-opt.patch > @@ -0,0 +1,25 @@ > +From 22096ef8cfb18563c1955145db24742081910e10 Mon Sep 17 00:00:00 2001 > +From: Peter Seiderer > +Date: Fri, 5 Feb 2021 18:24:08 +0100 > +Subject: [PATCH] cmake: remove -Wfatal-errors compiler command line option > + > +Signed-off-by: Peter Seiderer > +--- > + CMakeLists.txt | 1 - > + 1 file changed, 1 deletion(-) > + > +diff --git a/CMakeLists.txt b/CMakeLists.txt > +index 4191245..199a0f6 100644 > +--- a/CMakeLists.txt > ++++ b/CMakeLists.txt > +@@ -10,7 +10,6 @@ endif() > + set (CMAKE_EXPORT_COMPILE_COMMANDS ON) > + set (CMAKE_CXX_STANDARD 17) > + set (CMAKE CXX_FLAGS "-Wall -Wextra -pedantic -Wno-unused-parameter -faligned-new") > +-add_definitions(-Wfatal-errors) Why is this patch needed? The only thing that -Wfatal-errors does is to stop compilation when there is an error, instead of trying to continue and find more errors in the rest of the file. It's not -Werror. I kept the patch anyway because I didn't test without it. Regards, Arnout > + add_definitions(-Wno-psabi) > + add_definitions(-DBOOST_LOG_DYN_LINK) > + > +-- > +2.30.0 > + > diff --git a/package/libcamera-apps/Config.in b/package/libcamera-apps/Config.in > new file mode 100644 > index 0000000000..08667eb830 > --- /dev/null > +++ b/package/libcamera-apps/Config.in > @@ -0,0 +1,31 @@ > +config BR2_PACKAGE_LIBCAMERA_APPS > + bool "libcamera-apps" > + depends on BR2_PACKAGE_LIBCAMERA_ARCH_SUPPORTS # libcamera > + depends on BR2_INSTALL_LIBSTDCPP # libcamera/boost > + depends on BR2_TOOLCHAIN_HAS_THREADS # libcamera/boost/libdrm > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17/libcamera > + depends on !BR2_STATIC_LIBS # gnutls/libcamera > + depends on BR2_USE_WCHAR # gnutls/libcamera/boost > + depends on BR2_PACKAGE_XORG7 > + depends on BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL # libepoxy > + select BR2_PACKAGE_BOOST > + select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS > + select BR2_PACKAGE_JPEG > + select BR2_PACKAGE_LIBCAMERA > + select BR2_PACKAGE_LIBDRM > + select BR2_PACKAGE_LIBEPOXY > + select BR2_PACKAGE_LIBEXIF > + select BR2_PACKAGE_LIBPNG > + select BR2_PACKAGE_TIFF > + select BR2_PACKAGE_XLIB_LIBX11 > + help > + This is a small suite of libcamera-based apps that aim to copy > + the functionality of the existing "raspicam" apps. > + > + https://github.com/raspberrypi/libcamera-apps > + > +comment "libcamera-apps needs a toolchain w/ C++, threads, wchar, dynamic library, gcc >= 7 and needs an OpenGL and/or OpenGL EGL backend" > + 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 > + depends on !BR2_PACKAGE_HAS_LIBEGL && !BR2_PACKAGE_HAS_LIBGL > diff --git a/package/libcamera-apps/libcamera-apps.hash b/package/libcamera-apps/libcamera-apps.hash > new file mode 100644 > index 0000000000..da426434c1 > --- /dev/null > +++ b/package/libcamera-apps/libcamera-apps.hash > @@ -0,0 +1,3 @@ > +# Locally computed > +sha256 9b3475e1c817cbcf942c4be0dac3d1f6bf2ee192b0ca5edb95c85c06c5a12b4f libcamera-apps-326fdfd120a0f62b7e76f4ee8aa0c82c2bf008e6.tar.gz > +sha256 36dfed86bdef661a0a14ec1a1cc84c771d5a06b6f9b92e9ebb610ba711bd528a license.txt > diff --git a/package/libcamera-apps/libcamera-apps.mk b/package/libcamera-apps/libcamera-apps.mk > new file mode 100644 > index 0000000000..5edcefefad > --- /dev/null > +++ b/package/libcamera-apps/libcamera-apps.mk > @@ -0,0 +1,25 @@ > +################################################################################ > +# > +# libcamera-apps > +# > +################################################################################ > + > +LIBCAMERA_APPS_VERSION = 326fdfd120a0f62b7e76f4ee8aa0c82c2bf008e6 > +LIBCAMERA_APPS_SITE = $(call github,raspberrypi,libcamera-apps,$(LIBCAMERA_APPS_VERSION)) > +LIBCAMERA_APPS_LICENSE = BSD-2-Clause > +LIBCAMERA_APPS_LICENSE_FILES = license.txt > +LIBCAMERA_APPS_DEPENDENCIES = \ > + host-pkgconf \ > + boost \ > + jpeg \ > + libcamera \ > + libdrm \ > + libexif \ > + libepoxy \ > + libpng \ > + tiff \ > + xlib_libX11 > + > +LIBCAMERA_APPS_CONF_OPTS = -DENABLE_COMPILE_FLAGS_FOR_TARGET=disabled > + > +$(eval $(cmake-package)) From ps.report at gmx.net Tue Feb 8 21:23:55 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 8 Feb 2022 22:23:55 +0100 Subject: [Buildroot] [PATCH v1 03/13] package/gst1-plugins-good: bump version to 1.20.0 In-Reply-To: <20220208212405.19243-1-ps.report@gmx.net> References: <20220208212405.19243-1-ps.report@gmx.net> Message-ID: <20220208212405.19243-4-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash | 4 ++-- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash index e342bd133e..9ad1d7bf46 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.6.tar.xz.sha256sum -sha256 26723ac01fcb360ade1f41d168c7c322d8af4ceb7e55c8c12ed2690d06a76eed gst-plugins-good-1.18.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.20.0.tar.xz.sha256sum +sha256 2d119c15ab8c9e79f8cd3c6bf582ff7a050b28ccae52ab4865e1a1464991659c gst-plugins-good-1.20.0.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk index e0ca29c5fd..6298d578ed 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_GOOD_VERSION = 1.18.6 +GST1_PLUGINS_GOOD_VERSION = 1.20.0 GST1_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST1_PLUGINS_GOOD_VERSION).tar.xz GST1_PLUGINS_GOOD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-good GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING -- 2.34.1 From ps.report at gmx.net Tue Feb 8 21:24:00 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 8 Feb 2022 22:24:00 +0100 Subject: [Buildroot] [PATCH v1 08/13] package/gst1-vaapi: bump version to 1.20.0 In-Reply-To: <20220208212405.19243-1-ps.report@gmx.net> References: <20220208212405.19243-1-ps.report@gmx.net> Message-ID: <20220208212405.19243-9-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-vaapi/gst1-vaapi.hash | 4 ++-- package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash index 7e22774c11..b32d91e1e2 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.18.6.tar.xz.sha256sum -sha256 ab6270f1e5e4546fbe6f5ea246d86ca3d196282eb863d46e6cdcc96f867449e0 gstreamer-vaapi-1.18.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.20.0.tar.xz.sha256sum +sha256 f79a47346dfd5e585e063e77078e5fc498b06dee895bfcbf47d8863fcac9ea32 gstreamer-vaapi-1.20.0.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk index 6af851602f..19ee625703 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_VAAPI_VERSION = 1.18.6 +GST1_VAAPI_VERSION = 1.20.0 GST1_VAAPI_SITE = https://gstreamer.freedesktop.org/src/gstreamer-vaapi GST1_VAAPI_SOURCE = gstreamer-vaapi-$(GST1_VAAPI_VERSION).tar.xz GST1_VAAPI_LICENSE = LGPL-2.1+ -- 2.34.1 From ps.report at gmx.net Tue Feb 8 21:23:54 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 8 Feb 2022 22:23:54 +0100 Subject: [Buildroot] [PATCH v1 02/13] package/gst1-plugins-base: bump version to 1.20.0 In-Reply-To: <20220208212405.19243-1-ps.report@gmx.net> References: <20220208212405.19243-1-ps.report@gmx.net> Message-ID: <20220208212405.19243-3-ps.report@gmx.net> - disable new qt5 (Qt5 QML examples) option (suboption of already disabled tests/examples) - update COPYING hash (license text update from LGPL-2.0+ to LGPL-2.1+, see [1]) and adjust GST1_PLUGINS_BASE_LICENSE accordingly [1] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/d157b23fb0ce175b167611a4cb019599d9017042.patch Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash | 6 +++--- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash index 081dc6f213..ffc3445cda 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.18.6.tar.xz.sha256sum -sha256 56a9ff2fe9e6603b9e658cf6897d412a173d2180829fe01e92568549c6bd0f5b gst-plugins-base-1.18.6.tar.xz -sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING +# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.20.0.tar.xz.sha256sum +sha256 4cb66fccf730b1037e6533862c2128990912a6db4e5bbd14e0ef914450eb4c7c gst-plugins-base-1.20.0.tar.xz +sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk index c99eeb6c59..68281738fa 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk @@ -4,12 +4,12 @@ # ################################################################################ -GST1_PLUGINS_BASE_VERSION = 1.18.6 +GST1_PLUGINS_BASE_VERSION = 1.20.0 GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz GST1_PLUGINS_BASE_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-base GST1_PLUGINS_BASE_INSTALL_STAGING = YES GST1_PLUGINS_BASE_LICENSE_FILES = COPYING -GST1_PLUGINS_BASE_LICENSE = LGPL-2.0+, LGPL-2.1+ +GST1_PLUGINS_BASE_LICENSE = LGPL-2.1+ GST1_PLUGINS_BASE_CONF_OPTS = \ -Dexamples=disabled \ @@ -17,6 +17,7 @@ GST1_PLUGINS_BASE_CONF_OPTS = \ -Dgobject-cast-checks=disabled \ -Dglib-asserts=disabled \ -Dglib-checks=disabled \ + -Dqt5=disabled \ -Ddoc=disabled # Options which require currently unpackaged libraries -- 2.34.1 From ps.report at gmx.net Tue Feb 8 21:23:52 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 8 Feb 2022 22:23:52 +0100 Subject: [Buildroot] [PATCH v1 00/13] package/gstreamer1/*: bump version to 1.20.0 Message-ID: <20220208212405.19243-1-ps.report@gmx.net> For details see [1] and [2]. [1] https://lists.freedesktop.org/archives/gstreamer-devel/2022-February/079534.html [2] https://gstreamer.freedesktop.org/releases/1.20/ Peter Seiderer (13): package/gstreamer1: bump version to 1.20.0 package/gst1-plugins-base: bump version to 1.20.0 package/gst1-plugins-good: bump version to 1.20.0 package/gst1-plugins-bad: bump version to 1.20.0 package/gst1-plugins-ugly: bump version to 1.20.0 package/gst1-devtools: bump version to 1.20.0 package/gst1-libav: bump version to 1.20.0 package/gst1-vaapi: bump version to 1.20.0 package/gst1-rtsp-server: bump version to 1.20.0 package/gstreamer1-editing-services: bump version to 1.20.0 package/gst-omx: bump version to 1.20.0 package/gst1-python: bump version to 1.20.0 package/gst1-plugins-bayer2rgb-neon: fix plugin install Config.in.legacy | 22 ++++++---- package/gstreamer1/gst-omx/gst-omx.hash | 4 +- package/gstreamer1/gst-omx/gst-omx.mk | 2 +- .../gst1-devtools/gst1-devtools.hash | 4 +- .../gstreamer1/gst1-devtools/gst1-devtools.mk | 13 ++++-- package/gstreamer1/gst1-libav/gst1-libav.hash | 6 +-- package/gstreamer1/gst1-libav/gst1-libav.mk | 4 +- ...n-Allow-building-against-neon-0-32-x.patch | 29 ------------- package/gstreamer1/gst1-plugins-bad/Config.in | 31 +++++++++----- .../gst1-plugins-bad/gst1-plugins-bad.hash | 4 +- .../gst1-plugins-bad/gst1-plugins-bad.mk | 36 ++++++++++++---- .../gst1-plugins-base/gst1-plugins-base.hash | 6 +-- .../gst1-plugins-base/gst1-plugins-base.mk | 5 ++- .../gst1-plugins-bayer2rgb-neon.mk | 4 +- .../gst1-plugins-good/gst1-plugins-good.hash | 4 +- .../gst1-plugins-good/gst1-plugins-good.mk | 2 +- .../gst1-plugins-ugly/gst1-plugins-ugly.hash | 4 +- .../gst1-plugins-ugly/gst1-plugins-ugly.mk | 3 +- .../gstreamer1/gst1-python/gst1-python.hash | 4 +- package/gstreamer1/gst1-python/gst1-python.mk | 2 +- ...-rtsp-server-meson.build-add-gst_dep.patch | 41 ------------------- .../gst1-rtsp-server/gst1-rtsp-server.hash | 8 ++-- .../gst1-rtsp-server/gst1-rtsp-server.mk | 4 +- package/gstreamer1/gst1-vaapi/gst1-vaapi.hash | 4 +- package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 2 +- .../gstreamer1-editing-services.hash | 4 +- .../gstreamer1-editing-services.mk | 2 +- package/gstreamer1/gstreamer1/gstreamer1.hash | 6 +-- package/gstreamer1/gstreamer1/gstreamer1.mk | 5 +-- 29 files changed, 119 insertions(+), 146 deletions(-) delete mode 100644 package/gstreamer1/gst1-plugins-bad/0001-neon-Allow-building-against-neon-0-32-x.patch delete mode 100644 package/gstreamer1/gst1-rtsp-server/0001-gst-rtsp-server-meson.build-add-gst_dep.patch -- 2.34.1 From ps.report at gmx.net Tue Feb 8 21:24:01 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 8 Feb 2022 22:24:01 +0100 Subject: [Buildroot] [PATCH v1 09/13] package/gst1-rtsp-server: bump version to 1.20.0 In-Reply-To: <20220208212405.19243-1-ps.report@gmx.net> References: <20220208212405.19243-1-ps.report@gmx.net> Message-ID: <20220208212405.19243-10-ps.report@gmx.net> - removed 0001-gst-rtsp-server-meson.build-add-gst_dep.patch (upstream accepted [1]) - update COPYING/COPYING.LIB hash (license text update from LGPL-2.0+ to LGPL-2.1+, see [2]) and adjust GST1_RTSP_SERVER_LICENSE accordingly [1] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/e637aae629f5b95b748a6f23abecc2b502272822.patch [2] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/cc5cdab0165e3bdf5f4f748b3ba2a3493d304e70.patch Signed-off-by: Peter Seiderer --- ...-rtsp-server-meson.build-add-gst_dep.patch | 41 ------------------- .../gst1-rtsp-server/gst1-rtsp-server.hash | 8 ++-- .../gst1-rtsp-server/gst1-rtsp-server.mk | 4 +- 3 files changed, 6 insertions(+), 47 deletions(-) delete mode 100644 package/gstreamer1/gst1-rtsp-server/0001-gst-rtsp-server-meson.build-add-gst_dep.patch 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 deleted file mode 100644 index b63f634598..0000000000 --- a/package/gstreamer1/gst1-rtsp-server/0001-gst-rtsp-server-meson.build-add-gst_dep.patch +++ /dev/null @@ -1,41 +0,0 @@ -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 - diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash index fadef41351..00ff974c6e 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash @@ -1,4 +1,4 @@ -# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.18.6.tar.xz.sha256sum -sha256 826f32afbcf94b823541efcac4a0dacdb62f6145ef58f363095749f440262be9 gst-rtsp-server-1.18.6.tar.xz -sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING -sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING.LIB +# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.20.0.tar.xz.sha256sum +sha256 c209f5ed906da713fdd44a8844e909aa6c8af3dfb630259b092cfb77a7755843 gst-rtsp-server-1.20.0.tar.xz +sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING +sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING.LIB diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk index 55403754f3..d22dd5e7cc 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk @@ -4,10 +4,10 @@ # ################################################################################ -GST1_RTSP_SERVER_VERSION = 1.18.6 +GST1_RTSP_SERVER_VERSION = 1.20.0 GST1_RTSP_SERVER_SOURCE = gst-rtsp-server-$(GST1_RTSP_SERVER_VERSION).tar.xz GST1_RTSP_SERVER_SITE = http://gstreamer.freedesktop.org/src/gst-rtsp-server -GST1_RTSP_SERVER_LICENSE = LGPL-2.0+ +GST1_RTSP_SERVER_LICENSE = LGPL-2.1+ GST1_RTSP_SERVER_LICENSE_FILES = COPYING COPYING.LIB GST1_RTSP_SERVER_CPE_ID_VENDOR = gstreamer_project GST1_RTSP_SERVER_CPE_ID_PRODUCT = gst-rtsp-server -- 2.34.1 From ps.report at gmx.net Tue Feb 8 21:24:03 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 8 Feb 2022 22:24:03 +0100 Subject: [Buildroot] [PATCH v1 11/13] package/gst-omx: bump version to 1.20.0 In-Reply-To: <20220208212405.19243-1-ps.report@gmx.net> References: <20220208212405.19243-1-ps.report@gmx.net> Message-ID: <20220208212405.19243-12-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gst-omx/gst-omx.hash | 4 ++-- package/gstreamer1/gst-omx/gst-omx.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst-omx/gst-omx.hash b/package/gstreamer1/gst-omx/gst-omx.hash index 47f7cb5893..0b95505c5f 100644 --- a/package/gstreamer1/gst-omx/gst-omx.hash +++ b/package/gstreamer1/gst-omx/gst-omx.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.18.6.tar.xz.sha256sum -sha256 b5281c938e959fd2418e989cfb6065fdd9fe5f6f87ee86236c9427166e708163 gst-omx-1.18.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.20.0.tar.xz.sha256sum +sha256 c1e46b70ac379ac7b3646506370c9e1007b56ae293f4d334bc0e724c76c345dd gst-omx-1.20.0.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst-omx/gst-omx.mk b/package/gstreamer1/gst-omx/gst-omx.mk index dc65509244..f71e1242ff 100644 --- a/package/gstreamer1/gst-omx/gst-omx.mk +++ b/package/gstreamer1/gst-omx/gst-omx.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST_OMX_VERSION = 1.18.6 +GST_OMX_VERSION = 1.20.0 GST_OMX_SOURCE = gst-omx-$(GST_OMX_VERSION).tar.xz GST_OMX_SITE = https://gstreamer.freedesktop.org/src/gst-omx -- 2.34.1 From ps.report at gmx.net Tue Feb 8 21:24:04 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 8 Feb 2022 22:24:04 +0100 Subject: [Buildroot] [PATCH v1 12/13] package/gst1-python: bump version to 1.20.0 In-Reply-To: <20220208212405.19243-1-ps.report@gmx.net> References: <20220208212405.19243-1-ps.report@gmx.net> Message-ID: <20220208212405.19243-13-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-python/gst1-python.hash | 4 ++-- package/gstreamer1/gst1-python/gst1-python.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-python/gst1-python.hash b/package/gstreamer1/gst1-python/gst1-python.hash index a760e53e7d..a2f17583fd 100644 --- a/package/gstreamer1/gst1-python/gst1-python.hash +++ b/package/gstreamer1/gst1-python/gst1-python.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.18.6.tar.xz.sha256sum -sha256 bdc0ea22fbd7335ad9decc151561aacc53c51206a9735b81eac700ce5b0bbd4a gst-python-1.18.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.20.0.tar.xz.sha256sum +sha256 8f67bdc5606ba33606c6bc896e89de7dcd8cf4fca459f71389b1b6fe075b5e54 gst-python-1.20.0.tar.xz sha256 ea3ad127610e5ded2210b3a86a46314f2b3b28e438eccffdae19a4d6fbcdb0c2 COPYING diff --git a/package/gstreamer1/gst1-python/gst1-python.mk b/package/gstreamer1/gst1-python/gst1-python.mk index 7faab752cd..a9cc32d1d7 100644 --- a/package/gstreamer1/gst1-python/gst1-python.mk +++ b/package/gstreamer1/gst1-python/gst1-python.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PYTHON_VERSION = 1.18.6 +GST1_PYTHON_VERSION = 1.20.0 GST1_PYTHON_SOURCE = gst-python-$(GST1_PYTHON_VERSION).tar.xz GST1_PYTHON_SITE = https://gstreamer.freedesktop.org/src/gst-python GST1_PYTHON_INSTALL_STAGING = YES -- 2.34.1 From ps.report at gmx.net Tue Feb 8 21:23:57 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 8 Feb 2022 22:23:57 +0100 Subject: [Buildroot] [PATCH v1 05/13] package/gst1-plugins-ugly: bump version to 1.20.0 In-Reply-To: <20220208212405.19243-1-ps.report@gmx.net> References: <20220208212405.19243-1-ps.report@gmx.net> Message-ID: <20220208212405.19243-6-ps.report@gmx.net> - enable new gpl option ('Allow build plugins that have GPL-licensed dependencies') in case gpl plugin enabled Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash | 4 ++-- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash index 26fd0fd9ac..d16134f24b 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.18.6.tar.xz.sha256sum -sha256 4969c409cb6a88317d2108b8577108e18623b2333d7b587ae3f39459c70e3a7f gst-plugins-ugly-1.18.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.20.0.tar.xz.sha256sum +sha256 4e8dcb5d26552f0a4937f6bc6279bd9070f55ca6ae0eaa32d72d264c44001c2e gst-plugins-ugly-1.20.0.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk index 7f483deb81..05b1fab304 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_UGLY_VERSION = 1.18.6 +GST1_PLUGINS_UGLY_VERSION = 1.20.0 GST1_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST1_PLUGINS_UGLY_VERSION).tar.xz GST1_PLUGINS_UGLY_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-ugly GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING @@ -89,6 +89,7 @@ endif # Add GPL license if GPL plugins enabled. ifeq ($(GST1_PLUGINS_UGLY_HAS_GPL_LICENSE),y) +GST1_PLUGINS_UGLY_CONF_OPTS += -Dgpl=enabled GST1_PLUGINS_UGLY_LICENSE += , GPL-2.0 endif -- 2.34.1 From ps.report at gmx.net Tue Feb 8 21:23:59 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 8 Feb 2022 22:23:59 +0100 Subject: [Buildroot] [PATCH v1 07/13] package/gst1-libav: bump version to 1.20.0 In-Reply-To: <20220208212405.19243-1-ps.report@gmx.net> References: <20220208212405.19243-1-ps.report@gmx.net> Message-ID: <20220208212405.19243-8-ps.report@gmx.net> - update COPYING hash (license text update from LGPL-2.0+ to LGPL-2.1+, see [1]) and adjust GST1_LIBAV_LICENSE accordingly [1] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/d157b23fb0ce175b167611a4cb019599d9017042.patch Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-libav/gst1-libav.hash | 6 +++--- package/gstreamer1/gst1-libav/gst1-libav.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/gstreamer1/gst1-libav/gst1-libav.hash b/package/gstreamer1/gst1-libav/gst1-libav.hash index 5fb39a0b3e..3204de3c14 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.hash +++ b/package/gstreamer1/gst1-libav/gst1-libav.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.18.6.tar.xz.sha256sum -sha256 e4e50dcd5a29441ae34de60d2221057e8064ed824bb6ca4dc0fd9ee88fbe9b81 gst-libav-1.18.6.tar.xz -sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING +# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.20.0.tar.xz.sha256sum +sha256 5eee5ed8d5082a31b500448e41535c722ee30cd5f8224f32982bbaba2eedef17 gst-libav-1.20.0.tar.xz +sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gst1-libav/gst1-libav.mk b/package/gstreamer1/gst1-libav/gst1-libav.mk index 55c6e06e0e..f07e5061b4 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.mk +++ b/package/gstreamer1/gst1-libav/gst1-libav.mk @@ -4,10 +4,10 @@ # ################################################################################ -GST1_LIBAV_VERSION = 1.18.6 +GST1_LIBAV_VERSION = 1.20.0 GST1_LIBAV_SOURCE = gst-libav-$(GST1_LIBAV_VERSION).tar.xz GST1_LIBAV_SITE = https://gstreamer.freedesktop.org/src/gst-libav -GST1_LIBAV_LICENSE = LGPL-2.0+ +GST1_LIBAV_LICENSE = LGPL-2.1+ GST1_LIBAV_LICENSE_FILES = COPYING GST1_LIBAV_DEPENDENCIES = host-pkgconf ffmpeg gstreamer1 gst1-plugins-base GST1_LIBAV_CONF_OPTS = -Ddoc=disabled -- 2.34.1 From ps.report at gmx.net Tue Feb 8 21:23:53 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 8 Feb 2022 22:23:53 +0100 Subject: [Buildroot] [PATCH v1 01/13] package/gstreamer1: bump version to 1.20.0 In-Reply-To: <20220208212405.19243-1-ps.report@gmx.net> References: <20220208212405.19243-1-ps.report@gmx.net> Message-ID: <20220208212405.19243-2-ps.report@gmx.net> - meson option gtk_doc removed ([1]) - update COPYING hash (license text update from LGPL-2.0+ to LGPL-2.1+, see [2]) and adjust GSTREAMER1_LICENSE accordingly [1] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/f5ee12395832d4305bb8dbdf4751552d03430d6d.patch [2] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/d157b23fb0ce175b167611a4cb019599d9017042.patch Signed-off-by: Peter Seiderer --- package/gstreamer1/gstreamer1/gstreamer1.hash | 6 +++--- package/gstreamer1/gstreamer1/gstreamer1.mk | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/gstreamer1/gstreamer1/gstreamer1.hash b/package/gstreamer1/gstreamer1/gstreamer1.hash index 1202bf2c50..f4a74a6125 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.hash +++ b/package/gstreamer1/gstreamer1/gstreamer1.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.18.6.tar.xz.sha256sum -sha256 4ec816010dd4d3a93cf470ad0a6f25315f52b204eb1d71dfa70ab8a1c3bd06e6 gstreamer-1.18.6.tar.xz -sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING +# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.20.0.tar.xz.sha256sum +sha256 edf4bffff85591d4fff7b21bb9ed7f0feabc123ac4a4eff29e73cbce454f9db7 gstreamer-1.20.0.tar.xz +sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk index 27745f3bf9..86df5d6cf6 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -4,12 +4,12 @@ # ################################################################################ -GSTREAMER1_VERSION = 1.18.6 +GSTREAMER1_VERSION = 1.20.0 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer GSTREAMER1_INSTALL_STAGING = YES GSTREAMER1_LICENSE_FILES = COPYING -GSTREAMER1_LICENSE = LGPL-2.0+, LGPL-2.1+ +GSTREAMER1_LICENSE = LGPL-2.1+ GSTREAMER1_CPE_ID_VENDOR = gstreamer_project GSTREAMER1_CPE_ID_PRODUCT = gstreamer @@ -18,7 +18,6 @@ GSTREAMER1_CONF_OPTS = \ -Dtests=disabled \ -Dbenchmarks=disabled \ -Dtools=$(if $(BR2_PACKAGE_GSTREAMER1_INSTALL_TOOLS),enabled,disabled) \ - -Dgtk_doc=disabled \ -Dgobject-cast-checks=disabled \ -Dglib-asserts=disabled \ -Dglib-checks=disabled \ -- 2.34.1 From ps.report at gmx.net Tue Feb 8 21:23:56 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 8 Feb 2022 22:23:56 +0100 Subject: [Buildroot] [PATCH v1 04/13] package/gst1-plugins-bad: bump version to 1.20.0 In-Reply-To: <20220208212405.19243-1-ps.report@gmx.net> References: <20220208212405.19243-1-ps.report@gmx.net> Message-ID: <20220208212405.19243-5-ps.report@gmx.net> - removed 0001-neon-Allow-building-against-neon-0-32-x.patch (from upstream [1]) - add codecalpha option (VP8/VP9 alpha support) - add qroverlay option (overlay data on top of video in the form of a QR code) with json-glib and libqrencode dependencies (omit json-glib explicit dependencies as they are the same as for gstreamer1, glib2 BR2_USE_WCHAR, BR2_TOOLCHAIN_HAS_THREADS and BR2_USE_MMU), place instead to 'plugins without external deps' section into 'plugins that need external deps' section as it clearly has dependencies (prelimary to upstream commit [2]) - add aes option (AES encryption/decryption plugin) - disable new option asio (Steinberg Audio Streaming, windows only) - disable new option gs (Google Cloud Storage, needs storage_client library) - disable new option ldac (LDAC bluetooth audio codec, needs ldacBT-enc library) - remove legacy option ofa (disabled) - disable new option onnx (ONNX neural network, needs libonnxruntime library) - disable new option isac (iSAC plugin, needs webrtc-audio-coding-1 library) - removed libmms ('Microsoft Multi Media Server streaming protocol' option, add Config.in.legacy entry - enable new gpl option ('Allow build plugins that have (A)GPL-licensed dependencies') in case gpl plugin enabled [1] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/b83e85ab677c79b46f520abebd1ee031e3a139c0.patch [2] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/5d70c168b356691073a0d22f7ce3ea7efb20641c.patch Signed-off-by: Peter Seiderer --- Config.in.legacy | 22 ++++++++---- ...n-Allow-building-against-neon-0-32-x.patch | 29 --------------- package/gstreamer1/gst1-plugins-bad/Config.in | 31 ++++++++++------ .../gst1-plugins-bad/gst1-plugins-bad.hash | 4 +-- .../gst1-plugins-bad/gst1-plugins-bad.mk | 36 ++++++++++++++----- 5 files changed, 64 insertions(+), 58 deletions(-) delete mode 100644 package/gstreamer1/gst1-plugins-bad/0001-neon-Allow-building-against-neon-0-32-x.patch diff --git a/Config.in.legacy b/Config.in.legacy index 34d8c71cc8..2d7f14f097 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,16 @@ 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_TARGET_UBOOT_ZYNQ_IMAGE bool "Generate image for Xilinx Zynq" select BR2_LEGACY @@ -159,15 +169,13 @@ config BR2_TARGET_UBOOT_ZYNQ_IMAGE https://gist.githubusercontent.com/jameshilliard/e09235dfc6f96c11418a134e6ebf7890/raw/135b7480c405ae8a77a9db615e495f9a9f2d3242/zynq-boot-bin.py -config BR2_PACKAGE_RPI_BT_FIRMWARE - bool "rpi-bt-firmware package was renamed" - depends on BR2_arm || BR2_aarch64 +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBMMS + bool "gst1-plugins-bad plugin libmms was removed" + depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_HAS_THREADS 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. + This plugin was removed with gst1-plugins-bad-1.20.0. config BR2_PACKAGE_RPI_WIFI_FIRMWARE bool "rpi-wifi-firmware package was renamed" 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 deleted file mode 100644 index e995a8cb91..0000000000 --- a/package/gstreamer1/gst1-plugins-bad/0001-neon-Allow-building-against-neon-0-32-x.patch +++ /dev/null @@ -1,29 +0,0 @@ -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 - diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in index b793cb8eb1..234d57636b 100644 --- a/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/package/gstreamer1/gst1-plugins-bad/Config.in @@ -76,6 +76,12 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CAMERABIN2 help Take image snapshots and record movies from camera +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CODECALPHA + bool "codecalpha" + help + Elements for VP8/VP9 alpha support (codecalphademux, + alphacombine, vp8alphadecodebin, vp9alphadecodebin) + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_COLOREFFECTS bool "coloreffects" help @@ -324,6 +330,12 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_Y4M comment "plugins with external dependencies" +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AES + bool "aes" + select BR2_PACKAGE_OPENSSL + help + "AES encryption/decryption plugin" + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASSRENDER bool "assrender" depends on BR2_INSTALL_LIBSTDCPP # libass -> harfbuzz @@ -458,17 +470,6 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_KMS help KMS video sink -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBMMS - bool "libmms" - depends on BR2_USE_WCHAR # libmms -> libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libmms -> libglib2 - select BR2_PACKAGE_LIBMMS - help - Microsoft Multi Media Server streaming protocol support - -comment "libmms needs a toolchain w/ wchar, threads" - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS - config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DTLS bool "dtls" select BR2_PACKAGE_OPENSSL @@ -558,6 +559,14 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPUS help OPUS plugin library +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_QROVERLAY + bool "qroverlay" + select BR2_PACKAGE_JSON_GLIB + select BR2_PACKAGE_LIBQRENCODE + help + Elements qroverlay, debugqroverlay (overlay data on top of + video in the form of a QR code) + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RSVG bool "rsvg" depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # librsvg diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash index d31a78981e..72c9624b94 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.6.tar.xz.sha256sum -sha256 0b1b50ac6311f0c510248b6cd64d6d3c94369344828baa602db85ded5bc70ec9 gst-plugins-bad-1.18.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.20.0.tar.xz.sha256sum +sha256 015b8d4d9a395ebf444d40876867a2034dd3304b3ad48bc3a0dd0c1ee71dc11d gst-plugins-bad-1.20.0.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index d02ca1ba74..24fd9dd312 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BAD_VERSION = 1.18.6 +GST1_PLUGINS_BAD_VERSION = 1.20.0 GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz GST1_PLUGINS_BAD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-bad GST1_PLUGINS_BAD_INSTALL_STAGING = YES @@ -34,6 +34,7 @@ GST1_PLUGINS_BAD_CONF_OPTS = \ # Options which require currently unpackaged libraries GST1_PLUGINS_BAD_CONF_OPTS += \ + -Dasio=disabled \ -Davtp=disabled \ -Dopensles=disabled \ -Dmsdk=disabled \ @@ -46,16 +47,18 @@ GST1_PLUGINS_BAD_CONF_OPTS += \ -Dresindvd=disabled \ -Dfaac=disabled \ -Dflite=disabled \ + -Dgs=disabled \ -Dgsm=disabled \ -Dkate=disabled \ -Dladspa=disabled \ + -Dldac=disabled \ -Dlv2=disabled \ -Dmediafoundation=disabled \ -Dmicrodns=disabled \ -Dlibde265=disabled \ -Dmodplug=disabled \ -Dmplex=disabled \ - -Dofa=disabled \ + -Donnx=disabled \ -Dopenexr=disabled \ -Dopenni2=disabled \ -Dteletext=disabled \ @@ -69,6 +72,7 @@ GST1_PLUGINS_BAD_CONF_OPTS += \ -Dwasapi2=disabled \ -Dzxing=disabled \ -Dmagicleap=disabled \ + -Disac=disabled \ -Diqa=disabled \ -Dopencv=disabled @@ -180,6 +184,12 @@ else GST1_PLUGINS_BAD_CONF_OPTS += -Dcamerabin2=disabled endif +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CODECALPHA),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Dcodecalpha=enabled +else +GST1_PLUGINS_BAD_CONF_OPTS += -Dcodecalpha=disabled +endif + ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_COLOREFFECTS),y) GST1_PLUGINS_BAD_CONF_OPTS += -Dcoloreffects=enabled else @@ -497,6 +507,13 @@ endif # Plugins with dependencies +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AES),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Daes=enabled +GST1_PLUGINS_BAD_DEPENDENCIES += openssl +else +GST1_PLUGINS_BAD_CONF_OPTS += -Daes=disabled +endif + ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASSRENDER),y) GST1_PLUGINS_BAD_CONF_OPTS += -Dassrender=enabled GST1_PLUGINS_BAD_DEPENDENCIES += libass @@ -604,13 +621,6 @@ else GST1_PLUGINS_BAD_CONF_OPTS += -Dkms=disabled endif -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBMMS),y) -GST1_PLUGINS_BAD_CONF_OPTS += -Dlibmms=enabled -GST1_PLUGINS_BAD_DEPENDENCIES += libmms -else -GST1_PLUGINS_BAD_CONF_OPTS += -Dlibmms=disabled -endif - ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DTLS),y) GST1_PLUGINS_BAD_CONF_OPTS += -Ddtls=enabled GST1_PLUGINS_BAD_DEPENDENCIES += openssl @@ -677,6 +687,13 @@ else GST1_PLUGINS_BAD_CONF_OPTS += -Dopus=disabled endif +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_QROVERLAY),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Dqroverlay=enabled +GST1_PLUGINS_BAD_DEPENDENCIES += json-glib libqrencode +else +GST1_PLUGINS_BAD_CONF_OPTS += -Dqroverlay=disabled +endif + ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RSVG),y) GST1_PLUGINS_BAD_CONF_OPTS += -Drsvg=enabled GST1_PLUGINS_BAD_DEPENDENCIES += librsvg @@ -787,6 +804,7 @@ endif # Add GPL license if GPL licensed plugins enabled. ifeq ($(GST1_PLUGINS_BAD_HAS_GPL_LICENSE),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Dgpl=enabled GST1_PLUGINS_BAD_LICENSE += , GPL-2.0+ GST1_PLUGINS_BAD_LICENSE_FILES += COPYING endif -- 2.34.1 From ps.report at gmx.net Tue Feb 8 21:24:02 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 8 Feb 2022 22:24:02 +0100 Subject: [Buildroot] [PATCH v1 10/13] package/gstreamer1-editing-services: bump version to 1.20.0 In-Reply-To: <20220208212405.19243-1-ps.report@gmx.net> References: <20220208212405.19243-1-ps.report@gmx.net> Message-ID: <20220208212405.19243-11-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- .../gstreamer1-editing-services.hash | 4 ++-- .../gstreamer1-editing-services.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash index e29dc112ce..9662e6b8fb 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash @@ -1,5 +1,5 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.18.6.tar.xz.sha256sum -sha256 fe10d14ef896aa21038317f6f81e1158ccc6caaed9b0d5a29ae5bdd63074582c gst-editing-services-1.18.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.20.0.tar.xz.sha256sum +sha256 f837adcf4073d19a5908984e879cd039f4192ca368e71d39e8ccd8a56b9feedf gst-editing-services-1.20.0.tar.xz # Hashes for license files: sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk index a3722cbbca..5e03c08ae7 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_EDITING_SERVICES_VERSION = 1.18.6 +GSTREAMER1_EDITING_SERVICES_VERSION = 1.20.0 GSTREAMER1_EDITING_SERVICES_SOURCE = gst-editing-services-$(GSTREAMER1_EDITING_SERVICES_VERSION).tar.xz GSTREAMER1_EDITING_SERVICES_SITE = https://gstreamer.freedesktop.org/src/gstreamer-editing-services GSTREAMER1_EDITING_SERVICES_LICENSE = LGPL-2.0+ -- 2.34.1 From ps.report at gmx.net Tue Feb 8 21:24:05 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 8 Feb 2022 22:24:05 +0100 Subject: [Buildroot] [PATCH v1 13/13] package/gst1-plugins-bayer2rgb-neon: fix plugin install In-Reply-To: <20220208212405.19243-1-ps.report@gmx.net> References: <20220208212405.19243-1-ps.report@gmx.net> Message-ID: <20220208212405.19243-14-ps.report@gmx.net> - fix plugin install path, add '-with-plugindir=/usr/lib/gstreamer-1.0', otherwise the plugins are installed with duplicated build path (as detected by step_check_build_dir) - remove GST1_PLUGINS_BAYER2RGB_NEON_INSTALL_STAGING (no need to install the plugin to staging) Signed-off-by: Peter Seiderer --- .../gst1-plugins-bayer2rgb-neon.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.mk b/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.mk index 815099e315..0d4aeac7f5 100644 --- a/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.mk +++ b/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.mk @@ -10,8 +10,6 @@ GST1_PLUGINS_BAYER2RGB_NEON_SITE_METHOD = git GST1_PLUGINS_BAYER2RGB_NEON_LICENSE = GPL-3.0 GST1_PLUGINS_BAYER2RGB_NEON_LICENSE_FILES = COPYING -GST1_PLUGINS_BAYER2RGB_NEON_INSTALL_STAGING = YES - GST1_PLUGINS_BAYER2RGB_NEON_DEPENDENCIES = \ host-pkgconf \ gstreamer1 \ @@ -20,4 +18,6 @@ GST1_PLUGINS_BAYER2RGB_NEON_DEPENDENCIES = \ GST1_PLUGINS_BAYER2RGB_NEON_AUTORECONF = YES +GST1_PLUGINS_BAYER2RGB_NEON_CONF_OPTS = --with-plugindir=/usr/lib/gstreamer-1.0 + $(eval $(autotools-package)) -- 2.34.1 From ps.report at gmx.net Tue Feb 8 21:23:58 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 8 Feb 2022 22:23:58 +0100 Subject: [Buildroot] [PATCH v1 06/13] package/gst1-devtools: bump version to 1.20.0 In-Reply-To: <20220208212405.19243-1-ps.report@gmx.net> References: <20220208212405.19243-1-ps.report@gmx.net> Message-ID: <20220208212405.19243-7-ps.report@gmx.net> - use new option cairo ('Build GstValidateVideo') instead pure optional dependency on packet cairo Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-devtools/gst1-devtools.hash | 4 ++-- package/gstreamer1/gst1-devtools/gst1-devtools.mk | 13 ++++++++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.hash b/package/gstreamer1/gst1-devtools/gst1-devtools.hash index 011385e757..dd09280a9c 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.hash +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.18.6.tar.xz.sha256sum -sha256 3725622c740a635452e54b79d065f963ab7706ca2403de6c43072ae7610a0de4 gst-devtools-1.18.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.20.0.tar.xz.sha256sum +sha256 69fc8756ec9d93e5c5258c99088434f203e91fdbc5af28d1f2c583fd819b7a1d gst-devtools-1.20.0.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 validate/COPYING diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.mk b/package/gstreamer1/gst1-devtools/gst1-devtools.mk index 66b509ae2c..59a55577cb 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.mk +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_DEVTOOLS_VERSION = 1.18.6 +GST1_DEVTOOLS_VERSION = 1.20.0 GST1_DEVTOOLS_SOURCE = gst-devtools-$(GST1_DEVTOOLS_VERSION).tar.xz GST1_DEVTOOLS_SITE = https://gstreamer.freedesktop.org/src/gst-devtools GST1_DEVTOOLS_LICENSE = LGPL-2.1+ @@ -14,8 +14,7 @@ GST1_DEVTOOLS_INSTALL_STAGING = YES GST1_DEVTOOLS_DEPENDENCIES = \ gstreamer1 \ gst1-plugins-base \ - json-glib \ - $(if $(BR2_PACKAGE_CAIRO),cairo) + json-glib ifeq ($(BR2_PACKAGE_PYTHON3),y) GST1_DEVTOOLS_DEPENDENCIES += host-python3 python3 @@ -34,4 +33,12 @@ GST1_DEVTOOLS_CONF_OPTS = \ -Dtests=disabled \ -Ddoc=disabled +# build GstValidateVideo +ifeq ($(BR2_PACKAGE_CAIRO),y) +GST1_DEVTOOLS_CONF_OPTS += -Dcairo=enabled +GST1_DEVTOOLS_DEPENDENCIES += cairo +else +GST1_DEVTOOLS_CONF_OPTS += -Dcairo=disabled +endif + $(eval $(meson-package)) -- 2.34.1 From romain.naour at gmail.com Tue Feb 8 21:35:13 2022 From: romain.naour at gmail.com (Romain Naour) Date: Tue, 8 Feb 2022 22:35:13 +0100 Subject: [Buildroot] [PATCH 1/2] support/scripts/gen-bootlin-toolchains: add s390x toolchain Message-ID: <20220208213514.7141-1-romain.naour@gmail.com> s390x support has been added since toolchain-builder release 2021.05 [1]. [1] https://github.com/bootlin/toolchains-builder/commit/4bbb52a6a30a340a30722bc170467aa6fa4adbe6 Signed-off-by: Romain Naour --- support/scripts/gen-bootlin-toolchains | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/support/scripts/gen-bootlin-toolchains b/support/scripts/gen-bootlin-toolchains index dc173fa949..f9dd9da9a8 100755 --- a/support/scripts/gen-bootlin-toolchains +++ b/support/scripts/gen-bootlin-toolchains @@ -162,6 +162,10 @@ arches = { 'conditions': ['BR2_riscv', 'BR2_riscv_g', 'BR2_RISCV_64', 'BR2_RISCV_ABI_LP64D'], 'prefix': 'riscv64', }, + 's390x-z13': { + 'conditions': ['BR2_s390x', 'BR2_s390x_z13'], + 'prefix': 's390x', + }, 'sh-sh4': { 'conditions': ['BR2_sh', 'BR2_sh4'], 'prefix': 'sh4', -- 2.34.1 From romain.naour at gmail.com Tue Feb 8 21:35:14 2022 From: romain.naour at gmail.com (Romain Naour) Date: Tue, 8 Feb 2022 22:35:14 +0100 Subject: [Buildroot] [PATCH 2/2] toolchain/toolchain-external/toolchain-external-bootlin: update with new s390x toolchain In-Reply-To: <20220208213514.7141-1-romain.naour@gmail.com> References: <20220208213514.7141-1-romain.naour@gmail.com> Message-ID: <20220208213514.7141-2-romain.naour@gmail.com> Signed-off-by: Romain Naour --- .../tests/toolchain/test_external_bootlin.py | 30 +++++++++++ .../Config.in.options | 51 +++++++++++++++++++ .../toolchain-external-bootlin.hash | 4 ++ .../toolchain-external-bootlin.mk | 12 +++++ 4 files changed, 97 insertions(+) diff --git a/support/testing/tests/toolchain/test_external_bootlin.py b/support/testing/tests/toolchain/test_external_bootlin.py index cf6174303e..94df9ac488 100644 --- a/support/testing/tests/toolchain/test_external_bootlin.py +++ b/support/testing/tests/toolchain/test_external_bootlin.py @@ -2152,6 +2152,36 @@ class TestExternalToolchainBootlinRiscv64lp64dUclibcStable(TestExternalToolchain TestExternalToolchain.common_check(self) +class TestExternalToolchainBootlinS390xz13GlibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_s390x=y + BR2_s390x_z13=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_GLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "s390x-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinS390xz13GlibcStable(TestExternalToolchain): + config = """ + BR2_s390x=y + BR2_s390x_z13=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_GLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "s390x-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + class TestExternalToolchainBootlinShsh4GlibcBleedingEdge(TestExternalToolchain): config = """ BR2_sh=y diff --git a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options index 4b4404620c..53034c4f5e 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options @@ -33,6 +33,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCH_SUPPORTS default y if BR2_powerpc64le && BR2_powerpc_power8 default y if BR2_riscv && BR2_riscv_g && BR2_RISCV_32 && BR2_RISCV_ABI_ILP32D default y if BR2_riscv && BR2_riscv_g && BR2_RISCV_64 && BR2_RISCV_ABI_LP64D + default y if BR2_s390x && BR2_s390x_z13 default y if BR2_sh && BR2_sh4 default y if BR2_sh && BR2_sh4aeb default y if BR2_sparc64 && BR2_sparc_v9 @@ -3455,6 +3456,56 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_UCLIBC_STABLE https://toolchains.bootlin.com/ +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_GLIBC_BLEEDING_EDGE + bool "s390x-z13 glibc bleeding-edge 2021.11-1" + depends on BR2_s390x + depends on BR2_s390x_z13 + 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 s390x-z13 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_S390X_Z13_GLIBC_STABLE + bool "s390x-z13 glibc stable 2021.11-1" + depends on BR2_s390x + depends on BR2_s390x_z13 + 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 s390x-z13 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_SH_SH4_GLIBC_BLEEDING_EDGE bool "sh-sh4 glibc bleeding-edge 2021.11-1" depends on BR2_sh 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 6542694033..1f2aa1386c 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash +++ b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash @@ -278,6 +278,10 @@ sha256 42ca8024547e51e6126e3c9e711d80815aa4b2997900dfc8af4b9514105e8b78 riscv6 sha256 02dd9fe4a024f84c7f73b7155640066017c7d18dd90c4da6efe6f0e66d24f75c riscv64-lp64d--uclibc--bleeding-edge-2021.11-1.tar.bz2 # From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--uclibc--stable-2021.11-1.sha256 sha256 01f061e1b3d106d25614ae5bd64df3a3588bc960caa3bbad14b50f718a558f41 riscv64-lp64d--uclibc--stable-2021.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/s390x-z13/tarballs/s390x-z13--glibc--bleeding-edge-2021.11-1.sha256 +sha256 d8e657ba00929007e938c7fc398fb5aee8abeceea3ad1cd304c05e7f47d9ef30 s390x-z13--glibc--bleeding-edge-2021.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/s390x-z13/tarballs/s390x-z13--glibc--stable-2021.11-1.sha256 +sha256 04d8c28bc1af09a949cfe76991379fef4b0876448192625a22c028c7daf92e3f s390x-z13--glibc--stable-2021.11-1.tar.bz2 # From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--glibc--bleeding-edge-2021.11-1.sha256 sha256 64c14617fb95b1eeb50564d1e0ccbf73fa73e5e58aea6b192549fc7127e4bd5c sh-sh4--glibc--bleeding-edge-2021.11-1.tar.bz2 # From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--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 fb19ef2909..786967052f 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk +++ b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk @@ -840,6 +840,18 @@ TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv64-lp64d--uclibc--stable-$(TOOLCHAIN_EX TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs endif +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_GLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = s390x-z13--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/s390x-z13/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_GLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = s390x-z13--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/s390x-z13/tarballs +endif + ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_GLIBC_BLEEDING_EDGE),y) TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 -- 2.34.1 From kieran.bingham at ideasonboard.com Tue Feb 8 21:28:49 2022 From: kieran.bingham at ideasonboard.com (Kieran Bingham) Date: Tue, 08 Feb 2022 21:28:49 +0000 Subject: [Buildroot] [PATCH v5] package/libcamera-apps: new package In-Reply-To: References: <20210502095925.10744-1-ps.report@gmx.net> Message-ID: <164435572997.3447701.14524139530215798014@Monstersaurus> Hi All, Quoting Arnout Vandecappelle (2022-02-08 21:09:44) > > > On 02/05/2021 11:59, Peter Seiderer wrote: > > Signed-off-by: Peter Seiderer > > (Finally) applied to master, thanks. However... Ohh, I'm happy to see this packaged. Can someone try to bump the libcamera to the latest revision soon please? There have been a couple of bug fixes/performance issues resolved that were quite noticable on the Pi. In fact, now I check there's a couple more RPi patches to be merged soon so it might be worth getting those in first. -- Kieran. > > [snip] > > diff --git a/package/libcamera-apps/0001-cmake-remove-Wfatal-errors-compiler-command-line-opt.patch b/package/libcamera-apps/0001-cmake-remove-Wfatal-errors-compiler-command-line-opt.patch > > new file mode 100644 > > index 0000000000..11d19fa526 > > --- /dev/null > > +++ b/package/libcamera-apps/0001-cmake-remove-Wfatal-errors-compiler-command-line-opt.patch > > @@ -0,0 +1,25 @@ > > +From 22096ef8cfb18563c1955145db24742081910e10 Mon Sep 17 00:00:00 2001 > > +From: Peter Seiderer > > +Date: Fri, 5 Feb 2021 18:24:08 +0100 > > +Subject: [PATCH] cmake: remove -Wfatal-errors compiler command line option > > + > > +Signed-off-by: Peter Seiderer > > +--- > > + CMakeLists.txt | 1 - > > + 1 file changed, 1 deletion(-) > > + > > +diff --git a/CMakeLists.txt b/CMakeLists.txt > > +index 4191245..199a0f6 100644 > > +--- a/CMakeLists.txt > > ++++ b/CMakeLists.txt > > +@@ -10,7 +10,6 @@ endif() > > + set (CMAKE_EXPORT_COMPILE_COMMANDS ON) > > + set (CMAKE_CXX_STANDARD 17) > > + set (CMAKE CXX_FLAGS "-Wall -Wextra -pedantic -Wno-unused-parameter -faligned-new") > > +-add_definitions(-Wfatal-errors) > > Why is this patch needed? The only thing that -Wfatal-errors does is to stop > compilation when there is an error, instead of trying to continue and find more > errors in the rest of the file. It's not -Werror. > > I kept the patch anyway because I didn't test without it. > > > Regards, > Arnout > > > > + add_definitions(-Wno-psabi) > > + add_definitions(-DBOOST_LOG_DYN_LINK) > > + > > +-- > > +2.30.0 > > + > > diff --git a/package/libcamera-apps/Config.in b/package/libcamera-apps/Config.in > > new file mode 100644 > > index 0000000000..08667eb830 > > --- /dev/null > > +++ b/package/libcamera-apps/Config.in > > @@ -0,0 +1,31 @@ > > +config BR2_PACKAGE_LIBCAMERA_APPS > > + bool "libcamera-apps" > > + depends on BR2_PACKAGE_LIBCAMERA_ARCH_SUPPORTS # libcamera > > + depends on BR2_INSTALL_LIBSTDCPP # libcamera/boost > > + depends on BR2_TOOLCHAIN_HAS_THREADS # libcamera/boost/libdrm > > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17/libcamera > > + depends on !BR2_STATIC_LIBS # gnutls/libcamera > > + depends on BR2_USE_WCHAR # gnutls/libcamera/boost > > + depends on BR2_PACKAGE_XORG7 > > + depends on BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL # libepoxy > > + select BR2_PACKAGE_BOOST > > + select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS > > + select BR2_PACKAGE_JPEG > > + select BR2_PACKAGE_LIBCAMERA > > + select BR2_PACKAGE_LIBDRM > > + select BR2_PACKAGE_LIBEPOXY > > + select BR2_PACKAGE_LIBEXIF > > + select BR2_PACKAGE_LIBPNG > > + select BR2_PACKAGE_TIFF > > + select BR2_PACKAGE_XLIB_LIBX11 > > + help > > + This is a small suite of libcamera-based apps that aim to copy > > + the functionality of the existing "raspicam" apps. > > + > > + https://github.com/raspberrypi/libcamera-apps > > + > > +comment "libcamera-apps needs a toolchain w/ C++, threads, wchar, dynamic library, gcc >= 7 and needs an OpenGL and/or OpenGL EGL backend" > > + 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 > > + depends on !BR2_PACKAGE_HAS_LIBEGL && !BR2_PACKAGE_HAS_LIBGL > > diff --git a/package/libcamera-apps/libcamera-apps.hash b/package/libcamera-apps/libcamera-apps.hash > > new file mode 100644 > > index 0000000000..da426434c1 > > --- /dev/null > > +++ b/package/libcamera-apps/libcamera-apps.hash > > @@ -0,0 +1,3 @@ > > +# Locally computed > > +sha256 9b3475e1c817cbcf942c4be0dac3d1f6bf2ee192b0ca5edb95c85c06c5a12b4f libcamera-apps-326fdfd120a0f62b7e76f4ee8aa0c82c2bf008e6.tar.gz > > +sha256 36dfed86bdef661a0a14ec1a1cc84c771d5a06b6f9b92e9ebb610ba711bd528a license.txt > > diff --git a/package/libcamera-apps/libcamera-apps.mk b/package/libcamera-apps/libcamera-apps.mk > > new file mode 100644 > > index 0000000000..5edcefefad > > --- /dev/null > > +++ b/package/libcamera-apps/libcamera-apps.mk > > @@ -0,0 +1,25 @@ > > +################################################################################ > > +# > > +# libcamera-apps > > +# > > +################################################################################ > > + > > +LIBCAMERA_APPS_VERSION = 326fdfd120a0f62b7e76f4ee8aa0c82c2bf008e6 > > +LIBCAMERA_APPS_SITE = $(call github,raspberrypi,libcamera-apps,$(LIBCAMERA_APPS_VERSION)) > > +LIBCAMERA_APPS_LICENSE = BSD-2-Clause > > +LIBCAMERA_APPS_LICENSE_FILES = license.txt > > +LIBCAMERA_APPS_DEPENDENCIES = \ > > + host-pkgconf \ > > + boost \ > > + jpeg \ > > + libcamera \ > > + libdrm \ > > + libexif \ > > + libepoxy \ > > + libpng \ > > + tiff \ > > + xlib_libX11 > > + > > +LIBCAMERA_APPS_CONF_OPTS = -DENABLE_COMPILE_FLAGS_FOR_TARGET=disabled > > + > > +$(eval $(cmake-package)) From paguilar at paguilar.org Tue Feb 8 21:37:22 2022 From: paguilar at paguilar.org (Pedro Aguilar) Date: Tue, 8 Feb 2022 22:37:22 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/guile: Add BR2_ENABLE_LOCALE as dependency. Message-ID: <20220208213722.836257-1-paguilar@paguilar.org> If it's not present, enable libiconv. Signed-off-by: Pedro Aguilar --- Changes v1 -> v2: - Use BR2_ENABLE_LOCALE if selected, otherwise use libiconv as before (pointed out by Thomas and Giulio) --- package/guile/Config.in | 1 + package/guile/guile.mk | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/package/guile/Config.in b/package/guile/Config.in index b1182a4cee..f70e674018 100644 --- a/package/guile/Config.in +++ b/package/guile/Config.in @@ -9,6 +9,7 @@ config BR2_PACKAGE_GUILE select BR2_PACKAGE_LIBFFI select BR2_PACKAGE_GMP select BR2_PACKAGE_BDWGC + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE help Guile is an interpreter and compiler for the Scheme programming language, a clean and elegant dialect of Lisp. diff --git a/package/guile/guile.mk b/package/guile/guile.mk index 0f245fca76..03420407f8 100644 --- a/package/guile/guile.mk +++ b/package/guile/guile.mk @@ -18,6 +18,10 @@ GUILE_CPE_ID_VENDOR = gnu GUILE_DEPENDENCIES = host-guile libunistring libffi gmp bdwgc host-pkgconf HOST_GUILE_DEPENDENCIES = host-libunistring host-libffi host-gmp host-bdwgc host-flex host-pkgconf host-gettext +ifeq ($(BR2_ENABLE_LOCALE),) +GUILE_DEPENDENCIES += libiconv +endif + # The HAVE_GC* CFLAGS specify that we will use internal callbacks # instead of the ones provided by # bdwgc. Eg. HAVE_GC_SET_FINALIZER_NOTIFIER specifies that we won't -- 2.25.1 From heiko.thiery at gmail.com Tue Feb 8 21:39:03 2022 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Tue, 8 Feb 2022 22:39:03 +0100 Subject: [Buildroot] Buildroot + RAUC In-Reply-To: References: Message-ID: Hi Charles, Am So., 2. Jan. 2022 um 00:53 Uhr schrieb Charles Steinkuehler : > > 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 For me this is a great work and a good starting point for my first attempts using rauc. > All comments welcome, especially the "no you fool, don't do it *THAT* > way!" variety. :) Thanks -- Heiko From giulio.benetti at benettiengineering.com Tue Feb 8 22:06:36 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 8 Feb 2022 23:06:36 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/guile: Add BR2_ENABLE_LOCALE as dependency. In-Reply-To: <20220208213722.836257-1-paguilar@paguilar.org> References: <20220208213722.836257-1-paguilar@paguilar.org> Message-ID: <5f710ea1-3f98-9435-c033-e73e70e86342@benettiengineering.com> Hi Pedro, On 08/02/22 22:37, Pedro Aguilar wrote: > If it's not present, enable libiconv. Here it's missing: Fixes: URL to autobuilder failure And also I can't find guile failing due to LIBICONV. At least, I only find: http://autobuild.buildroot.net/?reason=guile-3.0.7 But it seems to be about another problem(to be solved too). Can you please point the autobuilder failure? Otherwise I can't test/review your patch. Thank you! Best regards -- Giulio Benetti Benetti Engineering sas > Signed-off-by: Pedro Aguilar > > --- > Changes v1 -> v2: > - Use BR2_ENABLE_LOCALE if selected, otherwise use libiconv > as before (pointed out by Thomas and Giulio) > --- > package/guile/Config.in | 1 + > package/guile/guile.mk | 4 ++++ > 2 files changed, 5 insertions(+) > > diff --git a/package/guile/Config.in b/package/guile/Config.in > index b1182a4cee..f70e674018 100644 > --- a/package/guile/Config.in > +++ b/package/guile/Config.in > @@ -9,6 +9,7 @@ config BR2_PACKAGE_GUILE > select BR2_PACKAGE_LIBFFI > select BR2_PACKAGE_GMP > select BR2_PACKAGE_BDWGC > + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE > help > Guile is an interpreter and compiler for the Scheme > programming language, a clean and elegant dialect of Lisp. > diff --git a/package/guile/guile.mk b/package/guile/guile.mk > index 0f245fca76..03420407f8 100644 > --- a/package/guile/guile.mk > +++ b/package/guile/guile.mk > @@ -18,6 +18,10 @@ GUILE_CPE_ID_VENDOR = gnu > GUILE_DEPENDENCIES = host-guile libunistring libffi gmp bdwgc host-pkgconf > HOST_GUILE_DEPENDENCIES = host-libunistring host-libffi host-gmp host-bdwgc host-flex host-pkgconf host-gettext > > +ifeq ($(BR2_ENABLE_LOCALE),) > +GUILE_DEPENDENCIES += libiconv > +endif > + > # The HAVE_GC* CFLAGS specify that we will use internal callbacks > # instead of the ones provided by > # bdwgc. Eg. HAVE_GC_SET_FINALIZER_NOTIFIER specifies that we won't From giulio.benetti at benettiengineering.com Tue Feb 8 22:09:01 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 8 Feb 2022 23:09:01 +0100 Subject: [Buildroot] [PATCH v5] package/libcamera-apps: new package In-Reply-To: <164435572997.3447701.14524139530215798014@Monstersaurus> References: <20210502095925.10744-1-ps.report@gmx.net> <164435572997.3447701.14524139530215798014@Monstersaurus> Message-ID: <00d36960-8959-806c-1527-d08a8b94591b@benettiengineering.com> Hi Kieran, On 08/02/22 22:28, Kieran Bingham wrote: > Hi All, > > Quoting Arnout Vandecappelle (2022-02-08 21:09:44) >> >> >> On 02/05/2021 11:59, Peter Seiderer wrote: >>> Signed-off-by: Peter Seiderer >> >> (Finally) applied to master, thanks. However... > > Ohh, I'm happy to see this packaged. > > Can someone try to bump the libcamera to the latest revision soon > please? There have been a couple of bug fixes/performance issues > resolved that were quite noticable on the Pi. > > In fact, now I check there's a couple more RPi patches to be merged soon > so it might be worth getting those in first. I can bump the version once you've pushed the RPi patches, but I see that you're the maintainer here in Buildroot so you should. Anyway it's not a problem for me. Only let me know when it's time to bump it Thank you! Best regards -- Giulio Benetti Benetti Engineering sas > -- > Kieran. > >> >> [snip] >>> diff --git a/package/libcamera-apps/0001-cmake-remove-Wfatal-errors-compiler-command-line-opt.patch b/package/libcamera-apps/0001-cmake-remove-Wfatal-errors-compiler-command-line-opt.patch >>> new file mode 100644 >>> index 0000000000..11d19fa526 >>> --- /dev/null >>> +++ b/package/libcamera-apps/0001-cmake-remove-Wfatal-errors-compiler-command-line-opt.patch >>> @@ -0,0 +1,25 @@ >>> +From 22096ef8cfb18563c1955145db24742081910e10 Mon Sep 17 00:00:00 2001 >>> +From: Peter Seiderer >>> +Date: Fri, 5 Feb 2021 18:24:08 +0100 >>> +Subject: [PATCH] cmake: remove -Wfatal-errors compiler command line option >>> + >>> +Signed-off-by: Peter Seiderer >>> +--- >>> + CMakeLists.txt | 1 - >>> + 1 file changed, 1 deletion(-) >>> + >>> +diff --git a/CMakeLists.txt b/CMakeLists.txt >>> +index 4191245..199a0f6 100644 >>> +--- a/CMakeLists.txt >>> ++++ b/CMakeLists.txt >>> +@@ -10,7 +10,6 @@ endif() >>> + set (CMAKE_EXPORT_COMPILE_COMMANDS ON) >>> + set (CMAKE_CXX_STANDARD 17) >>> + set (CMAKE CXX_FLAGS "-Wall -Wextra -pedantic -Wno-unused-parameter -faligned-new") >>> +-add_definitions(-Wfatal-errors) >> >> Why is this patch needed? The only thing that -Wfatal-errors does is to stop >> compilation when there is an error, instead of trying to continue and find more >> errors in the rest of the file. It's not -Werror. >> >> I kept the patch anyway because I didn't test without it. >> >> >> Regards, >> Arnout >> >> >>> + add_definitions(-Wno-psabi) >>> + add_definitions(-DBOOST_LOG_DYN_LINK) >>> + >>> +-- >>> +2.30.0 >>> + >>> diff --git a/package/libcamera-apps/Config.in b/package/libcamera-apps/Config.in >>> new file mode 100644 >>> index 0000000000..08667eb830 >>> --- /dev/null >>> +++ b/package/libcamera-apps/Config.in >>> @@ -0,0 +1,31 @@ >>> +config BR2_PACKAGE_LIBCAMERA_APPS >>> + bool "libcamera-apps" >>> + depends on BR2_PACKAGE_LIBCAMERA_ARCH_SUPPORTS # libcamera >>> + depends on BR2_INSTALL_LIBSTDCPP # libcamera/boost >>> + depends on BR2_TOOLCHAIN_HAS_THREADS # libcamera/boost/libdrm >>> + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17/libcamera >>> + depends on !BR2_STATIC_LIBS # gnutls/libcamera >>> + depends on BR2_USE_WCHAR # gnutls/libcamera/boost >>> + depends on BR2_PACKAGE_XORG7 >>> + depends on BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL # libepoxy >>> + select BR2_PACKAGE_BOOST >>> + select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS >>> + select BR2_PACKAGE_JPEG >>> + select BR2_PACKAGE_LIBCAMERA >>> + select BR2_PACKAGE_LIBDRM >>> + select BR2_PACKAGE_LIBEPOXY >>> + select BR2_PACKAGE_LIBEXIF >>> + select BR2_PACKAGE_LIBPNG >>> + select BR2_PACKAGE_TIFF >>> + select BR2_PACKAGE_XLIB_LIBX11 >>> + help >>> + This is a small suite of libcamera-based apps that aim to copy >>> + the functionality of the existing "raspicam" apps. >>> + >>> + https://github.com/raspberrypi/libcamera-apps >>> + >>> +comment "libcamera-apps needs a toolchain w/ C++, threads, wchar, dynamic library, gcc >= 7 and needs an OpenGL and/or OpenGL EGL backend" >>> + 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 >>> + depends on !BR2_PACKAGE_HAS_LIBEGL && !BR2_PACKAGE_HAS_LIBGL >>> diff --git a/package/libcamera-apps/libcamera-apps.hash b/package/libcamera-apps/libcamera-apps.hash >>> new file mode 100644 >>> index 0000000000..da426434c1 >>> --- /dev/null >>> +++ b/package/libcamera-apps/libcamera-apps.hash >>> @@ -0,0 +1,3 @@ >>> +# Locally computed >>> +sha256 9b3475e1c817cbcf942c4be0dac3d1f6bf2ee192b0ca5edb95c85c06c5a12b4f libcamera-apps-326fdfd120a0f62b7e76f4ee8aa0c82c2bf008e6.tar.gz >>> +sha256 36dfed86bdef661a0a14ec1a1cc84c771d5a06b6f9b92e9ebb610ba711bd528a license.txt >>> diff --git a/package/libcamera-apps/libcamera-apps.mk b/package/libcamera-apps/libcamera-apps.mk >>> new file mode 100644 >>> index 0000000000..5edcefefad >>> --- /dev/null >>> +++ b/package/libcamera-apps/libcamera-apps.mk >>> @@ -0,0 +1,25 @@ >>> +################################################################################ >>> +# >>> +# libcamera-apps >>> +# >>> +################################################################################ >>> + >>> +LIBCAMERA_APPS_VERSION = 326fdfd120a0f62b7e76f4ee8aa0c82c2bf008e6 >>> +LIBCAMERA_APPS_SITE = $(call github,raspberrypi,libcamera-apps,$(LIBCAMERA_APPS_VERSION)) >>> +LIBCAMERA_APPS_LICENSE = BSD-2-Clause >>> +LIBCAMERA_APPS_LICENSE_FILES = license.txt >>> +LIBCAMERA_APPS_DEPENDENCIES = \ >>> + host-pkgconf \ >>> + boost \ >>> + jpeg \ >>> + libcamera \ >>> + libdrm \ >>> + libexif \ >>> + libepoxy \ >>> + libpng \ >>> + tiff \ >>> + xlib_libX11 >>> + >>> +LIBCAMERA_APPS_CONF_OPTS = -DENABLE_COMPILE_FLAGS_FOR_TARGET=disabled >>> + >>> +$(eval $(cmake-package)) > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From ps.report at gmx.net Tue Feb 8 22:20:24 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 8 Feb 2022 23:20:24 +0100 Subject: [Buildroot] [PATCH v1] package/libxkbcommon: bump version to 1.4.0 Message-ID: <20220208222024.24167-1-ps.report@gmx.net> - bump version to 1.4.0 - add new option to select some tools for the target (xkbcli, xkbcli-compile-keymap, xkbcli-how-to-type, xkbcli-interactive-evdev, xkbcli-interactive-x11, xkbcli-interactive-wayland For details see [1]. [1] https://lists.freedesktop.org/archives/wayland-devel/2022-February/042104.html Signed-off-by: Peter Seiderer --- package/libxkbcommon/Config.in | 11 +++++++++++ package/libxkbcommon/libxkbcommon.hash | 4 ++-- package/libxkbcommon/libxkbcommon.mk | 8 +++++++- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/package/libxkbcommon/Config.in b/package/libxkbcommon/Config.in index 4e73a24abb..e9f61227a0 100644 --- a/package/libxkbcommon/Config.in +++ b/package/libxkbcommon/Config.in @@ -7,3 +7,14 @@ config BR2_PACKAGE_LIBXKBCOMMON specification. https://xkbcommon.org + +if BR2_PACKAGE_LIBXKBCOMMON + +config BR2_PACKAGE_LIBXKBCOMMON_TOOLS + bool "tools" + help + Tools: xkbcli, xkbcli-compile-keymap, xkbcli-how-to-type, + xkbcli-interactive-evdev, xkbcli-interactive-x11, + xkbcli-interactive-wayland + +endif diff --git a/package/libxkbcommon/libxkbcommon.hash b/package/libxkbcommon/libxkbcommon.hash index c00fffe706..fff2b7a943 100644 --- a/package/libxkbcommon/libxkbcommon.hash +++ b/package/libxkbcommon/libxkbcommon.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2021-September/041976.html -sha256 b3c710d27a2630054e1e1399c85b7f330ef03359b460f0c1b3b587fd01fe9234 libxkbcommon-1.3.1.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2022-February/042104.html +sha256 106cec5263f9100a7e79b5f7220f889bc78e7d7ffc55d2b6fdb1efefb8024031 libxkbcommon-1.4.0.tar.xz # License file: sha256 086caee279449369d41c1157911ec7696e707b93feba7280de757d3c470b2dfb LICENSE diff --git a/package/libxkbcommon/libxkbcommon.mk b/package/libxkbcommon/libxkbcommon.mk index ee2bc1ee99..f2c49cc700 100644 --- a/package/libxkbcommon/libxkbcommon.mk +++ b/package/libxkbcommon/libxkbcommon.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBXKBCOMMON_VERSION = 1.3.1 +LIBXKBCOMMON_VERSION = 1.4.0 LIBXKBCOMMON_SITE = https://xkbcommon.org/download LIBXKBCOMMON_SOURCE = libxkbcommon-$(LIBXKBCOMMON_VERSION).tar.xz LIBXKBCOMMON_LICENSE = MIT/X11 @@ -23,4 +23,10 @@ else LIBXKBCOMMON_CONF_OPTS += -Denable-x11=false endif +ifeq ($(BR2_PACKAGE_LIBXKBCOMMON_TOOLS),y) +LIBXKBCOMMON_CONF_OPTS += -Denable-tools=true +else +LIBXKBCOMMON_CONF_OPTS += -Denable-tools=false +endif + $(eval $(meson-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Tue Feb 8 22:23:56 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 8 Feb 2022 23:23:56 +0100 Subject: [Buildroot] [PATCH 1/1] package/grpc: fix fourth patch Message-ID: <20220208222356.24675-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since the addition of fourth patch in commit 8251d8c2559b25f11684776fc343059cf100657d: 1 out of 22 hunks FAILED -- saving rejects to file CMakeLists.txt.rej Fixes: - http://autobuild.buildroot.org/results/44f6d7c61316e90d22e75cb1fb77c3bc5b31ad66 Signed-off-by: Fabrice Fontaine --- package/grpc/0004-host-grpc-only-cpp-plugin.patch | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/package/grpc/0004-host-grpc-only-cpp-plugin.patch b/package/grpc/0004-host-grpc-only-cpp-plugin.patch index 43fad7e3d6..c97d9a9385 100644 --- a/package/grpc/0004-host-grpc-only-cpp-plugin.patch +++ b/package/grpc/0004-host-grpc-only-cpp-plugin.patch @@ -10,6 +10,7 @@ others. Upstream-status: not accepted (see https://github.com/grpc/grpc/issues/25322) Signed-off-by: Thomas De Schampheleire +Signed-off-by: Fabrice Fontaine --- CMakeLists.txt | 43 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 35 insertions(+), 8 deletions(-) @@ -167,15 +168,6 @@ index e8934a3e03..c2df332cc6 100644 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} ) -- 2.34.1 From giulio.benetti at benettiengineering.com Tue Feb 8 22:54:17 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 8 Feb 2022 23:54:17 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/guile: Add BR2_ENABLE_LOCALE as dependency. In-Reply-To: <5f710ea1-3f98-9435-c033-e73e70e86342@benettiengineering.com> References: <20220208213722.836257-1-paguilar@paguilar.org> <5f710ea1-3f98-9435-c033-e73e70e86342@benettiengineering.com> Message-ID: Hi again Pedro, I've reproduced the build failure with your previous attached .config file and this patch fixes it. So below... On 08/02/22 23:06, Giulio Benetti wrote: > Hi Pedro, > > On 08/02/22 22:37, Pedro Aguilar wrote: >> If it's not present, enable libiconv. > Here it's missing: > Fixes: > URL to autobuilder failure ...please provide the autobuilder failure URL and if it doesn't exist than we don't need it. So once done this I can give you my Review. Waiting for V2 with improved commit log then. Thank you! Best regards -- Giulio Benetti Benetti Engineering sas > > And also I can't find guile failing due to LIBICONV. > > At least, I only find: > http://autobuild.buildroot.net/?reason=guile-3.0.7 > > But it seems to be about another problem(to be solved too). > > Can you please point the autobuilder failure? > Otherwise I can't test/review your patch. > > Thank you! > Best regards > -- Giulio Benetti Benetti Engineering sas >> Signed-off-by: Pedro Aguilar >> >> --- >> Changes v1 -> v2: >> - Use BR2_ENABLE_LOCALE if selected, otherwise use libiconv >> as before (pointed out by Thomas and Giulio) >> --- >> package/guile/Config.in | 1 + >> package/guile/guile.mk | 4 ++++ >> 2 files changed, 5 insertions(+) >> >> diff --git a/package/guile/Config.in b/package/guile/Config.in >> index b1182a4cee..f70e674018 100644 >> --- a/package/guile/Config.in >> +++ b/package/guile/Config.in >> @@ -9,6 +9,7 @@ config BR2_PACKAGE_GUILE >> select BR2_PACKAGE_LIBFFI >> select BR2_PACKAGE_GMP >> select BR2_PACKAGE_BDWGC >> + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE >> help >> Guile is an interpreter and compiler for the Scheme >> programming language, a clean and elegant dialect of Lisp. >> diff --git a/package/guile/guile.mk b/package/guile/guile.mk >> index 0f245fca76..03420407f8 100644 >> --- a/package/guile/guile.mk >> +++ b/package/guile/guile.mk >> @@ -18,6 +18,10 @@ GUILE_CPE_ID_VENDOR = gnu >> GUILE_DEPENDENCIES = host-guile libunistring libffi gmp bdwgc host-pkgconf >> HOST_GUILE_DEPENDENCIES = host-libunistring host-libffi host-gmp host-bdwgc host-flex host-pkgconf host-gettext >> >> +ifeq ($(BR2_ENABLE_LOCALE),) >> +GUILE_DEPENDENCIES += libiconv >> +endif >> + >> # The HAVE_GC* CFLAGS specify that we will use internal callbacks >> # instead of the ones provided by >> # bdwgc. Eg. HAVE_GC_SET_FINALIZER_NOTIFIER specifies that we won't > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > From romain.naour at gmail.com Wed Feb 9 00:23:08 2022 From: romain.naour at gmail.com (Romain Naour) Date: Wed, 9 Feb 2022 01:23:08 +0100 Subject: [Buildroot] [PATCHv2] package/poke: bump to version 2.1 Message-ID: <20220209002308.137832-1-romain.naour@gmail.com> Tested locally with poke testsuite on aarch64 with Qemu: === poke Summary === # of expected passes 6320 # of unsupported tests 7 Build tested with test-pkg: https://gitlab.com/kubu93/buildroot/-/pipelines/466516470 See: http://www.jemarch.net/poke-2.0-relnotes.html http://www.jemarch.net/poke-2.1-relnotes.html Signed-off-by: Romain Naour --- test-pkg config: BR2_PACKAGE_POKE=y BR2_PACKAGE_JSON_C=y v2: poke 2.0 had a issue with minimal-threading on several architectures (not only ARM thumb2), this feature is now disabled by default with poke 2.1. --- ...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..c30713b91c 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 cd528e6c1bbc540c3b629c2b4f36b784b30a026b005a38b99283422599442670 poke-2.1.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 jitter/COPYING diff --git a/package/poke/poke.mk b/package/poke/poke.mk index ddd03ae3b0..2852673548 100644 --- a/package/poke/poke.mk +++ b/package/poke/poke.mk @@ -4,7 +4,7 @@ # ################################################################################ -POKE_VERSION = 1.4 +POKE_VERSION = 2.1 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.34.1 From peterlin at andestech.com Wed Feb 9 03:55:52 2022 From: peterlin at andestech.com (Yu Chien Peter Lin) Date: Wed, 9 Feb 2022 11:55:52 +0800 Subject: [Buildroot] Patch state of andes/ae350 Message-ID: Hi Thomas, I would like to follow up on my patches last month. Are they still under review? Please let me know if I missed something that needs to be fixed. Regards, Yu-Chien Peter Lin From baruch at tkos.co.il Wed Feb 9 05:43:33 2022 From: baruch at tkos.co.il (Baruch Siach) Date: Wed, 09 Feb 2022 07:43:33 +0200 Subject: [Buildroot] [PATCH v1 04/13] package/gst1-plugins-bad: bump version to 1.20.0 In-Reply-To: <20220208212405.19243-5-ps.report@gmx.net> References: <20220208212405.19243-1-ps.report@gmx.net> <20220208212405.19243-5-ps.report@gmx.net> Message-ID: <875ypod24w.fsf@tarshish> Hi Peter, On Tue, Feb 08 2022, Peter Seiderer wrote: > - removed 0001-neon-Allow-building-against-neon-0-32-x.patch > (from upstream [1]) > > - add codecalpha option (VP8/VP9 alpha support) > > - add qroverlay option (overlay data on top of video in the form of a QR code) > with json-glib and libqrencode dependencies (omit json-glib explicit > dependencies as they are the same as for gstreamer1, glib2 BR2_USE_WCHAR, > BR2_TOOLCHAIN_HAS_THREADS and BR2_USE_MMU), place instead to 'plugins without > external deps' section into 'plugins that need external deps' section as it > clearly has dependencies (prelimary to upstream commit [2]) > > - add aes option (AES encryption/decryption plugin) > > - disable new option asio (Steinberg Audio Streaming, windows only) > > - disable new option gs (Google Cloud Storage, needs storage_client library) > > - disable new option ldac (LDAC bluetooth audio codec, needs ldacBT-enc library) > > - remove legacy option ofa (disabled) > > - disable new option onnx (ONNX neural network, needs libonnxruntime library) > > - disable new option isac (iSAC plugin, needs webrtc-audio-coding-1 library) > > - removed libmms ('Microsoft Multi Media Server streaming protocol' option, > add Config.in.legacy entry > > - enable new gpl option ('Allow build plugins that have (A)GPL-licensed > dependencies') in case gpl plugin enabled > > [1] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/b83e85ab677c79b46f520abebd1ee031e3a139c0.patch > [2] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/5d70c168b356691073a0d22f7ce3ea7efb20641c.patch > > Signed-off-by: Peter Seiderer > --- > Config.in.legacy | 22 ++++++++---- > ...n-Allow-building-against-neon-0-32-x.patch | 29 --------------- > package/gstreamer1/gst1-plugins-bad/Config.in | 31 ++++++++++------ > .../gst1-plugins-bad/gst1-plugins-bad.hash | 4 +-- > .../gst1-plugins-bad/gst1-plugins-bad.mk | 36 ++++++++++++++----- > 5 files changed, 64 insertions(+), 58 deletions(-) > delete mode 100644 package/gstreamer1/gst1-plugins-bad/0001-neon-Allow-building-against-neon-0-32-x.patch > > diff --git a/Config.in.legacy b/Config.in.legacy > index 34d8c71cc8..2d7f14f097 100644 > --- a/Config.in.legacy > +++ b/Config.in.legacy > @@ -146,6 +146,16 @@ 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. > + This is already in master (and it's unrelated). baruch -- ~. .~ 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 Feb 9 07:46:14 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 09 Feb 2022 07:46:14 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-02-08 Message-ID: <20220209074620.34B3183103@smtp1.osuosl.org> Hello, Autobuild statistics for 2022-02-08 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 48 | 7 | 0 | 55 | 2021.11.x | 14 | 0 | 0 | 14 | master | 60 | 44 | 0 | 104 | Classification of failures by reason for master ----------------------------------------------- host-libselinux-3.3 | 7 gerbera-1.9.2 | 5 bluez5_utils-5.63 | 4 host-python-docutils-0.15.2 | 4 unknown | 3 python-docutils-0.15.2 | 2 wavemon-0.9.4 | 2 boinc-7.18.1 | 1 cairo-1.16.0 | 1 docker-proxy-55685ba49593e6... | 1 frr-8.1 | 1 guile-3.0.7 | 1 host-grpc-1.43.0 | 1 keepalived-2.2.7 | 1 librtlsdr-ed0317e6a58c09887... | 1 linux-pam-1.5.2 | 1 Makefile:747: target-finalize | 1 neon-0.32.2 | 1 opencv4-4.5.5 | 1 python-greenlet-1.1.2 | 1 resiprocate-1.12.0 | 1 rtorrent-0.9.8 | 1 rygel-0.40.2 | 1 sudo-1.9.8p2 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- riscv64 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/5c96d82719691ad307021591bd5ef0d2de952ad0 | m68k | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/1e33ed794dfb5248e667feee2c3ec9a7a52f5056 | powerpc64 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/f417516c61d4999f17dfc16399a4d596d7d33beb | riscv64 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/0ddf026413bf968600124b9869511c3a54663771 | x86_64 | boinc-7.18.1 | NOK | http://autobuild.buildroot.net/results/5022a9dc3ea7c073be0b1c0c608428ae94ad4c26 | s390x | cairo-1.16.0 | NOK | http://autobuild.buildroot.net/results/031d61ed4df168d96be7aa4658733f812d732ef5 | x86_64 | docker-proxy-55685ba49593e6... | NOK | http://autobuild.buildroot.net/results/6c4d434c23f1aef90d04701cc7a79c7a80bfb6e4 | xtensa | frr-8.1 | NOK | http://autobuild.buildroot.net/results/010dd5ca7f2b24120212d3b9e2f14a54a59aa6ce | arc | gerbera-1.9.2 | NOK | http://autobuild.buildroot.net/results/8d89717067872feccf9127503b49d949351d8df0 | x86_64 | gerbera-1.9.2 | NOK | http://autobuild.buildroot.net/results/6d50a4b2424a298118252818ec5a5042e9356062 | i686 | gerbera-1.9.2 | NOK | http://autobuild.buildroot.net/results/d06f0ddc78b0c045e9698f27e93edf08101da925 | x86_64 | gerbera-1.9.2 | NOK | http://autobuild.buildroot.net/results/b273cb3c5948812456d4386c89f06462afb81a73 | arm | gerbera-1.9.2 | NOK | http://autobuild.buildroot.net/results/bc3dcdc6b0ced939368384fff6a63cd25450cae7 | arm | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/f8efe6143bc99f1cedddba9b4a54e7175e859f95 | riscv64 | host-grpc-1.43.0 | NOK | http://autobuild.buildroot.net/results/44f6d7c61316e90d22e75cb1fb77c3bc5b31ad66 | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/30fa8f979767eceda116b8d390f11b8da3bb2659 | powerpc | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/e43242875be865ef373fed673eabdad45adcc4cb | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/8cd5cd59b22b4e75d83d44130583cb251b4d8115 | arc | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/9d2fe02f9b922771aab72a4369f16125d3fd3159 | nios2 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/dbe756e340531454f19b8daaa1baf6058582b260 | x86_64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/064d5f44a2da73b0854869bf6e0678e12124d68d | aarch64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/aded9c08368582d96de4f36cf8f9c2fc786cd45f | arm | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/6b748d2330e869b1a239bca3284bc748ac95b2c9 | i586 | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/df7af0b8a54156ab8749c57c8c2bf17fb04400ec | mips64el | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/a941ae11f18805c4a0d6f672553550127072a571 | arc | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/0b0eef5c5f105a0c443529fa66f1ddb9f0ab7434 | arm | keepalived-2.2.7 | NOK | http://autobuild.buildroot.net/results/2132570fb0407abc0e70146d771471e13ef10237 | sparc | librtlsdr-ed0317e6a58c09887... | NOK | http://autobuild.buildroot.net/results/b6f373907f4e9f4979f332a4dfa3241f30a1f8c7 | x86_64 | linux-pam-1.5.2 | NOK | http://autobuild.buildroot.net/results/94c29bb6393f68547285b5ff8c4c65f644e16097 | ORPH aarch64 | Makefile:747: target-finalize | NOK | http://autobuild.buildroot.net/results/d0c081e1eeb0dc0e988de51cceff02c5c870fbc2 | arm | neon-0.32.2 | NOK | http://autobuild.buildroot.net/results/2b005bdfd0f4949cc45dfd427cd6bd796fd56907 | ORPH m68k | opencv4-4.5.5 | NOK | http://autobuild.buildroot.net/results/edcd1139f2ba4b1a66f61feb222c738718d824f5 | m68k | python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/fad07777625e14d1c722821e3a7023d877f2996f | xtensa | python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/78ccedbcd1c6cfef2ae52cdf387b353d0dd497b8 | mips64el | python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/42b4cf13af6ce93f8722922a0d21d40faa7375da | riscv32 | resiprocate-1.12.0 | NOK | http://autobuild.buildroot.net/results/ad9d89fefe1a667daa123397a072bf130bfa03a7 | ORPH mipsel | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/e87a99cb0392da58db831a369569537d9ef9be8a | ORPH arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/7c324c097979e00d383d9ff3e4b6927925253b4e | arm | sudo-1.9.8p2 | NOK | http://autobuild.buildroot.net/results/7a5d4dd22343be46a5ddd1c1a1a8e1799517d564 | ORPH nios2 | unknown | NOK | http://autobuild.buildroot.net/results/5ea7b2b23b6675b926cb5ed84b1d947184b6514e | microblazeel | unknown | NOK | http://autobuild.buildroot.net/results/a11e5fba7d7f11c21cc7c44e578e576c82c294be | m68k | unknown | NOK | http://autobuild.buildroot.net/results/f35806609fcc98e769939e607232e4b2fa4b3d1d | powerpc | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/de7a848ef4555f27a101ca4113e0a148316cbe37 | arm | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/30e4f0c68fa39dc82b52d7d0bf59111526ea11e5 | Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 2 monkey-f54856ce250c4e257354... | 2 libp11-0.4.11 | 1 unknown | 1 zeromq-4.3.4 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- xtensa | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/1753e968e19c461f00c775b9c43647ef8495381a | arm | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/59aa202cc83eb510da9b8abff23ce9e4cb83cd52 | riscv32 | libp11-0.4.11 | NOK | http://autobuild.buildroot.net/results/7e033fad93f56db7c5f860374ee2dc6d328b2cb3 | ORPH i686 | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/97699054e8252a9d0ea38c404e024d7714b30ec7 | nios2 | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/6f2a352a892f9a709c4c41e56cf8d0afe5c07d92 | arm | unknown | NOK | http://autobuild.buildroot.net/results/ce1ef4979f5409ab13e5ecf66b2ecb5ba34074c3 | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/eb270686f33ea625888f579f28110951296feafd | -- http://autobuild.buildroot.net From neal.frager at xilinx.com Wed Feb 9 08:28:20 2022 From: neal.frager at xilinx.com (Neal Frager) Date: Wed, 9 Feb 2022 01:28:20 -0700 Subject: [Buildroot] [PATCH 1/2] configs/zynqmp_zcu106: Bump ATF/U-Boot/Linux to Xilinx 2022 -v2 Message-ID: <20220209082821.72879-1-neal.frager@xilinx.com> This patch: - bumps configs/zynqmp_zcu106_defconfig to Xilinx 2022 - bumps ATF to Xilinx v2.6: mainline v2.6 requires patch to build - bumps U-Boot to Xilinx 2022.01: important drivers not in mainline - bumps Linux to Xilinx 5.15: important drivers not in mainline - deletes board/zynqmp/patches directory: patches already in mainline - modifies board/zynqmp/genimage.cfg: U-Boot 2022.01 uses u-boot.itb format - adds extlinux.conf to vfat bootfs - modifies U-Boot to unified xilinx_zynqmp_virt_defconfig (supports all boards) - adds support for SPL pm_cfg_obj.c loading to PMU firmware - adds support for host machines without SSL Signed-off-by: Neal Frager --- board/zynqmp/extlinux.conf | 4 + board/zynqmp/genimage.cfg | 6 +- board/zynqmp/pm_cfg_obj.c | 614 ++++++++++++++++++++++++++++++++ board/zynqmp/post-build.sh | 10 + board/zynqmp/post-image.sh | 4 +- board/zynqmp/readme.txt | 23 +- configs/zynqmp_zcu106_defconfig | 23 +- 7 files changed, 665 insertions(+), 19 deletions(-) create mode 100644 board/zynqmp/extlinux.conf create mode 100644 board/zynqmp/pm_cfg_obj.c create mode 100755 board/zynqmp/post-build.sh diff --git a/board/zynqmp/extlinux.conf b/board/zynqmp/extlinux.conf new file mode 100644 index 0000000000..15ef707ea2 --- /dev/null +++ b/board/zynqmp/extlinux.conf @@ -0,0 +1,4 @@ +label linux + kernel /Image + devicetree /system.dtb + append console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg index ed202f4550..20d8352c08 100644 --- a/board/zynqmp/genimage.cfg +++ b/board/zynqmp/genimage.cfg @@ -2,11 +2,13 @@ image boot.vfat { vfat { files = { "boot.bin", - "u-boot.bin", - "atf-uboot.ub", + "u-boot.itb", "system.dtb", "Image" } + file extlinux/extlinux.conf { + image = extlinux.conf + } } size = 32M diff --git a/board/zynqmp/pm_cfg_obj.c b/board/zynqmp/pm_cfg_obj.c new file mode 100644 index 0000000000..7566b3236a --- /dev/null +++ b/board/zynqmp/pm_cfg_obj.c @@ -0,0 +1,614 @@ +/****************************************************************************** +* Copyright (c) 2017 - 2020 Xilinx, Inc. All rights reserved. +* SPDX-License-Identifier: MIT +******************************************************************************/ + + +#include "xil_types.h" +#include "pm_defs.h" + +#define PM_CONFIG_MASTER_SECTION_ID 0x101U +#define PM_CONFIG_SLAVE_SECTION_ID 0x102U +#define PM_CONFIG_PREALLOC_SECTION_ID 0x103U +#define PM_CONFIG_POWER_SECTION_ID 0x104U +#define PM_CONFIG_RESET_SECTION_ID 0x105U +#define PM_CONFIG_SHUTDOWN_SECTION_ID 0x106U +#define PM_CONFIG_SET_CONFIG_SECTION_ID 0x107U +#define PM_CONFIG_GPO_SECTION_ID 0x108U + +#define PM_SLAVE_FLAG_IS_SHAREABLE 0x1U +#define PM_MASTER_USING_SLAVE_MASK 0x2U + +#define PM_CONFIG_GPO1_MIO_PIN_34_MAP (1U << 10U) +#define PM_CONFIG_GPO1_MIO_PIN_35_MAP (1U << 11U) +#define PM_CONFIG_GPO1_MIO_PIN_36_MAP (1U << 12U) +#define PM_CONFIG_GPO1_MIO_PIN_37_MAP (1U << 13U) + +#define PM_CONFIG_GPO1_BIT_2_MASK (1U << 2U) +#define PM_CONFIG_GPO1_BIT_3_MASK (1U << 3U) +#define PM_CONFIG_GPO1_BIT_4_MASK (1U << 4U) +#define PM_CONFIG_GPO1_BIT_5_MASK (1U << 5U) + +#define SUSPEND_TIMEOUT 0xFFFFFFFFU + + +#define PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK 0x00000001 +#define PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK 0x00000100 +#define PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK 0x00000200 + + + +#if defined (__ICCARM__) +#pragma language=save +#pragma language=extended +#endif +#if defined (__GNUC__) + const u32 XPm_ConfigObject[] __attribute__((used, section(".sys_cfg_data"))) = +#elif defined (__ICCARM__) +#pragma location = ".sys_cfg_data" +__root const u32 XPm_ConfigObject[] = +#endif +{ + /**********************************************************************/ + /* HEADER */ + 1, /* Number of remaining words in the header */ + 8, /* Number of sections included in config object */ + /**********************************************************************/ + /* MASTER SECTION */ + PM_CONFIG_MASTER_SECTION_ID, /* Master SectionID */ + 3U, /* No. of Masters*/ + + NODE_APU, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_0, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_1, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Wake permissions */ + + + /**********************************************************************/ + /* SLAVE SECTION */ + + + PM_CONFIG_SLAVE_SECTION_ID, /* Section ID */ + 49, /* Number of slaves */ + + NODE_OCM_BANK_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TCM_0_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_0_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_1_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TCM_1_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_L2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU_PP_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU_PP_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_USB_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_USB_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_TTC_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SATA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_ETH_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_UART_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_UART_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SPI_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_SPI_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_I2C_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_I2C_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SD_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_SD_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_DP, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GDMA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_ADMA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_NAND, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_QSPI, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPIO, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_CAN_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_CAN_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_EXTERN, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_DDR, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_IPI_APU, + 0U, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_0, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_1, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_PCIE, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_PCAP, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_RTC, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_VCU, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_PL, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + + /**********************************************************************/ + /* PREALLOC SECTION */ + + PM_CONFIG_PREALLOC_SECTION_ID, /* Preallaoc SectionID */ + 3U, /* No. of Masters*/ + +/* Prealloc for psu_cortexa53_0 */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, + 12, + NODE_DDR, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_L2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_3, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_SD_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_QSPI, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_PL, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_APU, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_0 */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + 14, + NODE_TCM_0_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_0_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_DDR, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_3, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_SD_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_QSPI, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_PL, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_ADMA, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_1 */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + 3, + NODE_TCM_1_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_1_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /**********************************************************************/ + /* POWER SECTION */ + + PM_CONFIG_POWER_SECTION_ID, /* Power Section ID */ + 4U, /* Number of power nodes */ + + NODE_APU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_RPU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_FPD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_PLD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + + /**********************************************************************/ + /* RESET SECTION */ + + PM_CONFIG_RESET_SECTION_ID, /* Reset Section ID */ + 120U, /* Number of resets */ + + XILPM_RESET_PCIE_CFG, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_BRIDGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_CTRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRF, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GDMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SATA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APU_L2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DDR, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SOFT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_QSPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_NAND, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ADMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOU_CC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TIMESTAMP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R50, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R51, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_AMBA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_OCM, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_PGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RTC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SYSMON, 0, + XILPM_RESET_AFI_FM6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_LPD_SWDT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_FPD, PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + XILPM_RESET_RPU_DBG1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_DBG0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_VPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_7, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_8, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_9, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_10, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_11, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_12, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_13, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_14, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_15, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_16, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_17, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_18, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_19, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_20, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_21, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_22, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_23, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_24, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_25, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_26, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_27, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_28, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_29, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_30, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_31, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_LS, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PS_ONLY, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_92, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_93, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_94, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_95, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + + /**********************************************************************/ + /* SET CONFIG SECTION */ + PM_CONFIG_SET_CONFIG_SECTION_ID, /* Section ID */ + 0, /* Permissions to set config */ + /**********************************************************************/ + /* SHUTDOWN SECTION */ + PM_CONFIG_SHUTDOWN_SECTION_ID, /* Section ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* System Shutdown/Restart Permission */ + + /**********************************************************************/ + /* GPO SECTION */ + PM_CONFIG_GPO_SECTION_ID, /* GPO Section ID */ + PM_CONFIG_GPO1_BIT_2_MASK | + PM_CONFIG_GPO1_MIO_PIN_34_MAP | + PM_CONFIG_GPO1_MIO_PIN_35_MAP | + PM_CONFIG_GPO1_MIO_PIN_36_MAP | + PM_CONFIG_GPO1_MIO_PIN_37_MAP | + 0, /* State of GPO pins */ +}; +#if defined (__ICCARM__) +#pragma language=restore +#endif diff --git a/board/zynqmp/post-build.sh b/board/zynqmp/post-build.sh new file mode 100755 index 0000000000..ef55f49376 --- /dev/null +++ b/board/zynqmp/post-build.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +# genimage will need to find the extlinux.conf +# in the binaries directory + +BOARD_DIR="$(dirname $0)" + +install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux.conf + + diff --git a/board/zynqmp/post-image.sh b/board/zynqmp/post-image.sh index b2b99fed01..ed6dbe188c 100755 --- a/board/zynqmp/post-image.sh +++ b/board/zynqmp/post-image.sh @@ -10,4 +10,6 @@ FIRST_DT=$(sed -nr \ [ -z "${FIRST_DT}" ] || ln -fs ${FIRST_DT}.dtb ${BINARIES_DIR}/system.dtb -support/scripts/genimage.sh -c board/zynqmp/genimage.cfg +BOARD_DIR="$(dirname $0)" + +support/scripts/genimage.sh -c $BOARD_DIR/genimage.cfg diff --git a/board/zynqmp/readme.txt b/board/zynqmp/readme.txt index da37f4ccc9..0dc1793e03 100644 --- a/board/zynqmp/readme.txt +++ b/board/zynqmp/readme.txt @@ -1,10 +1,19 @@ -******************************** -Xilinx ZCU106 board - ZynqMP SoC -******************************** +****************************************** +Xilinx ZCU102 / ZCU106 boards - ZynqMP SoC +****************************************** + +This document describes the Buildroot support for the ZCU102 and ZCU106 +boards by Xilinx, based on the Zynq UltraScale+ MPSoC (aka ZynqMP). +It has been tested with the ZCU102 and ZCU106 production boards. + +Evaluation board features can be found here with the links below. + +ZCU102: +https://www.xilinx.com/products/boards-and-kits/zcu102.html + +ZCU106: +https://www.xilinx.com/products/boards-and-kits/zcu106.html -This document describes the Buildroot support for the ZCU106 board by -Xilinx, based on the Zynq UltraScale+ MPSoC (aka ZynqMP). It has been -tested with the EK-U1-ZCU106-ES2 pre-production board. How to build it =============== @@ -32,7 +41,7 @@ After building, you should get a tree like this: +-- rootfs.ext4 -> rootfs.ext2 +-- sdcard.img +-- system.dtb -> zynqmp-zcu106-revA.dtb - +-- u-boot.bin + +-- u-boot.itb `-- zynqmp-zcu106-revA.dtb How to write the SD card diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index bee7c1daf7..2026f60bd1 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -1,34 +1,39 @@ BR2_aarch64=y -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.15" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.6" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA" +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2022.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/53fdb7b6c92860ceb0ec5fd14deee302f4a84269/bin/pmufw-zcu106-default-v2017.4.bin" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/v2021.2/bin/pmufw-v2021.2.bin" +BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/pm_cfg_obj.c" +BR2_TARGET_UBOOT_FORMAT_ITB=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -- 2.17.1 From neal.frager at xilinx.com Wed Feb 9 08:28:21 2022 From: neal.frager at xilinx.com (Neal Frager) Date: Wed, 9 Feb 2022 01:28:21 -0700 Subject: [Buildroot] [PATCH 2/2] Add configs/zynqmp_zcu102_defconfig -v2 In-Reply-To: <20220209082821.72879-1-neal.frager@xilinx.com> References: <20220209082821.72879-1-neal.frager@xilinx.com> Message-ID: <20220209082821.72879-2-neal.frager@xilinx.com> This patch: - adds support for Xilinx ZCU102 evaluation board - ZCU102 features can be found here: - https://www.xilinx.com/products/boards-and-kits/zcu102.html Signed-off-by: Neal Frager --- configs/zynqmp_zcu102_defconfig | 39 +++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 configs/zynqmp_zcu102_defconfig diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig new file mode 100644 index 0000000000..acffda64bf --- /dev/null +++ b/configs/zynqmp_zcu102_defconfig @@ -0,0 +1,39 @@ +BR2_aarch64=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.15" +BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.6" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/Xilinx/u-boot-xlnx.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2022.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" +BR2_TARGET_UBOOT_ZYNQMP=y +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/v2021.2/bin/pmufw-v2021.2.bin" +BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/pm_cfg_obj.c" +BR2_TARGET_UBOOT_FORMAT_ITB=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y -- 2.17.1 From nealf at xilinx.com Wed Feb 9 08:30:07 2022 From: nealf at xilinx.com (Neal Frager) Date: Wed, 9 Feb 2022 08:30:07 +0000 Subject: [Buildroot] [PATCH 1/2] configs/zynqmp_zcu106: Bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <97653013-1d33-4a03-00cf-ffdb3fa5e723@benettiengineering.com> References: <20220208071559.2862411-1-neal.frager@xilinx.com> <69efa9da-ae55-6795-8724-ed7105083924@benettiengineering.com> <32cc1c12-1496-7db9-5e32-1b99404a4fe3@benettiengineering.com> <97653013-1d33-4a03-00cf-ffdb3fa5e723@benettiengineering.com> Message-ID: Hi Giulio, > So now I wait for V2 :-) Thank you for your feedback. You can now find -v2 in your inbox for review. I appreciate your support! Best regards, Neal Frager Xilinx From yann.morin at orange.com Wed Feb 9 08:44:05 2022 From: yann.morin at orange.com (yann.morin at orange.com) Date: Wed, 9 Feb 2022 09:44:05 +0100 Subject: [Buildroot] [PATCH 3/3] package/pkg-cargo: allow building in a sub-directory In-Reply-To: <61674c9d53c678f60a82c5c347147c31b9a29ba6.1644343524.git.yann.morin@orange.com> References: <61674c9d53c678f60a82c5c347147c31b9a29ba6.1644343524.git.yann.morin@orange.com> Message-ID: <5856_1644396248_62037ED8_5856_45_6_20220209084405.GA3766@tl-lnx-nyma7486> All, On 2022-02-08 19:05 +0100, yann.morin at orange.com spake thusly: > From: "Yann E. MORIN" > Some packages have their rust sources as a sub-directory, rather > than at the root of the source tree. > > Do like we do for autotools-package, and use the package's _SRCDIR > rather than the top-level directory $(@D). > > Additionally, in such a situation, it is more than probable that > the Cargo.toml is also present in that sub-directory, so use that > when vendoring the package, unless the package took extra precautions > to specify an alternate location. > > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni > --- > package/pkg-cargo.mk | 16 ++++++++++++---- > 1 file changed, 12 insertions(+), 4 deletions(-) > > diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk > index 66bea513e0..68e15e066c 100644 > --- a/package/pkg-cargo.mk > +++ b/package/pkg-cargo.mk > @@ -71,6 +71,14 @@ $(2)_DOWNLOAD_DEPENDENCIES += host-rustc > $(2)_DOWNLOAD_POST_PROCESS = cargo > $(2)_DL_ENV += CARGO_HOME=$$(HOST_DIR)/share/cargo > > +# If building in a sub directory, use that to find the Cargo.toml, unless > +# the package already provided its location. > +ifneq ($$($(2)_SUBDIR),) > +ifneq ($$(filter BR_CARGO_MANIFEST_PATH=%,$$($(2)_DL_ENV))) ------^ I forgot to git commit --amend to add the missing comma. Sorry for the noise... :-( Regards, Yann E. MORIN. > +$(2)_DL_ENV += BR_CARGO_MANIFEST_PATH=$$($(2)_SUBDIR)/Cargo.toml > +endif > +endif > + > # Due to vendoring, it is pretty likely that not all licenses are > # listed in _LICENSE. > $(2)_LICENSE += , vendored dependencies licenses probably not listed > @@ -97,7 +105,7 @@ $(2)_LICENSE += , vendored dependencies licenses probably not listed > ifndef $(2)_BUILD_CMDS > ifeq ($(4),target) > define $(2)_BUILD_CMDS > - cd $$(@D) && \ > + cd $$($$(PKG)_SRCDIR) && \ > $$(TARGET_MAKE_ENV) \ > $$(TARGET_CONFIGURE_OPTS) \ > $$(PKG_CARGO_ENV) \ > @@ -111,7 +119,7 @@ define $(2)_BUILD_CMDS > endef > else # ifeq ($(4),target) > define $(2)_BUILD_CMDS > - cd $$(@D) && \ > + cd $$($$(PKG)_SRCDIR) && \ > $$(HOST_MAKE_ENV) \ > RUSTFLAGS="$$(addprefix -C link-args=,$$(HOST_LDFLAGS))" \ > $$(HOST_CONFIGURE_OPTS) \ > @@ -133,7 +141,7 @@ endif # ifndef $(2)_BUILD_CMDS > # > ifndef $(2)_INSTALL_TARGET_CMDS > define $(2)_INSTALL_TARGET_CMDS > - cd $$(@D) && \ > + cd $$($$(PKG)_SRCDIR) && \ > $$(TARGET_MAKE_ENV) \ > $$(TARGET_CONFIGURE_OPTS) \ > $$(PKG_CARGO_ENV) \ > @@ -152,7 +160,7 @@ endif > > ifndef $(2)_INSTALL_CMDS > define $(2)_INSTALL_CMDS > - cd $$(@D) && \ > + cd $$($$(PKG)_SRCDIR) && \ > $$(HOST_MAKE_ENV) \ > RUSTFLAGS="$$(addprefix -C link-args=,$$(HOST_LDFLAGS))" \ > $$(HOST_CONFIGURE_OPTS) \ > -- > 2.25.1 > -- ____________ .-----------------.--------------------: _ :------------------. | Yann E. MORIN | Real-Time Embedded | __/ ) | /"\ ASCII RIBBON | | +33 534.541.179 | Software Designer | _/ - /' | \ / CAMPAIGN | | +33 638.411.245 '--------------------: (_ `--, | X AGAINST | | yann.morin (at) orange.com |_=" ,--' | / \ HTML MAIL | '--------------------------------------:______/_____:------------------' _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From patrickdepinguin at gmail.com Wed Feb 9 11:55:00 2022 From: patrickdepinguin at gmail.com (Thomas De Schampheleire) Date: Wed, 9 Feb 2022 12:55:00 +0100 Subject: [Buildroot] [PATCHv2 0/7] Basic support for 64-bit kernel and 32-bit userland In-Reply-To: References: <20220115200306.14037-1-patrickdepinguin@gmail.com> Message-ID: Hi Arnout, El mar, 8 feb 2022 a las 21:49, Arnout Vandecappelle () escribi?: > > > > On 15/01/2022 21:02, Thomas De Schampheleire wrote: > > 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. > > So, I'm not entirely convinced about this approach. Here are my objections. > > - At least for arm, you need an entirely different toolchain for the 32 and the > 64-bit variants. But even for x86, the Buildroot internal toolchain for x86_64 > doesn't support -m32. So for most users this is not even going to work. With crosstool-ng it is possible to build a multilib toolchain for x86 without issue. It's true that the internal Buildroot logic does not allow this currently, but that by itself is not necessarily an objection to me. For ARM we have packaged two toolchains in one, with the bin/, lib/ etc. paths at top-level pointing to the 'default' toolchain, i.e. 32-bit in our case, and changes in linux/uboot to use the 64-bit toolchain specifically. We'd need to discuss if and how we would integrate that in mainline Buildroot. > > - There is an alternative: two separate Buildroot configs, one for the kernel + > modules, one for userspace. Ok, but it is not so convenient at least in our case, where all surrounding build logic and validation assumes that you just set a single defconfig, build it, then obtain the results from output/images. We'd need surrounding scripting to handle the separate kernel build. Additionally, what about a build with initramfs built-in the vmlinux image? This would need the rootfs file from the 32-bit buildroot copied over to the kernel buildroot context, and then attached there. This is additional complexity. > > - I don't think the flexibility is useful. I think it would be better to reuse > the BR2_KERNEL_64_USERLAND_32 option. (E.g. add an option to Config.in.x86 when > the arch is x86_64 to build a 32-bit userspace.) That way we can use it to pass > -m32 where needed, to build an internal toolchain that supports it, and to check > for the external toolchain if it supports it. Doesn't solve the issue for ARM, > but it's a start. > > > Also, I think we absolutely need to test this feature. At the very least, we'd > need to config in the autobuilders that enables it, or enable it randomly in > genrandconfig. Although I'm not sure if it tests anything if no kernel is built > (let alone that it's not even booted). Yes I had created a qemu defconfig and multilib toolchain that can be used for tests. But Romain found that the binaries do not run on the build farm. Would it be possible to get temporary shell access to that environment so I can find out what options I really need? > > > For now, I've left the rest of the series as New in patchwork, let's see what > the others think. Thanks for your feedback, Thomas From peter at korsgaard.com Wed Feb 9 15:26:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 16:26:06 +0100 Subject: [Buildroot] [PATCH] package/python-pyzmq: drop python2 dependency for comment Message-ID: <20220209152606.20762-1-peter@korsgaard.com> The package was updated to support python3 in commit 4a8bedc51d9 (python-pyzmq: enable PyZMQ for Python 3), but the comment dependency was missed. Signed-off-by: Peter Korsgaard --- package/python-pyzmq/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/python-pyzmq/Config.in b/package/python-pyzmq/Config.in index 8f33a635c8..f8ce52f844 100644 --- a/package/python-pyzmq/Config.in +++ b/package/python-pyzmq/Config.in @@ -9,5 +9,4 @@ config BR2_PACKAGE_PYTHON_PYZMQ http://zeromq.org/bindings:python comment "python-pyzmq needs a toolchain w/ C++, threads" - depends on BR2_PACKAGE_PYTHON depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS) -- 2.20.1 From derek at ihtfp.com Wed Feb 9 15:28:10 2022 From: derek at ihtfp.com (Derek Atkins) Date: Wed, 9 Feb 2022 10:28:10 -0500 Subject: [Buildroot] Makefile: add target to clean targetfs Message-ID: <60d52762385d6ecff820bddc8f91d1af.squirrel@mail2.ihtfp.org> Hi, Sorry to raise up a 6-year-old thread, but I'm looking to use Jenkins to implement a CI/CD solution to build a BuildRoot system, but I need to be able to "clean out" the target directory between each build to ensure that different branches don't contaminate each other. I don't want to delete all of 'build' because 90% (or more) of the build *is* consistent between branches, and I'd like to not require 3 hours per build to rebuild e.g. the whole toolchain. I've found that the patch as updated per the thread from 2015 does mostly work: target-clean: $(RM) -rf $(BR_DIR)/output/target $(BR_DIR)/output/staging \ $(BR_DIR)/output/build/.root \ $(BR_DIR)/output/build/*/.stamp_target_installed \ $(BR_DIR)/output/build/*/.stamp_staging_installed \ $(BR_DIR)/output/build/host-gcc-final-*/.stamp_host_installed When I rebuild using this rule, and then run the proposed rsync command (see below), the resulting target directory matches -- except for a few obvious changes like etc/issue and usr/lib/os-release (as the git release is now "dirty"). Strangely, lib/libpthread-2.32.so is different. rsync -rvncl --delete --exclude '*.pyc' --exclude '*.pyo' --exclude 'tmp/ldconfig/aux-cache' output/target/ output/target.orig/ HOWEVER, there are a few side-effects here that I'd like to ask about. Specifically, it looks like GLIBC and parts of the final-stage gcc actually recompile (I see a lot of instances of arm-buildroot-linux-gnueabi-gcc and xgcc in the logs). I would have just expected it to reinstall. Moreover, busybox seems to recompile, too. I am happy to share my config and makelog output if it would help, but I was trying to keep this message short. Any suggestions would be highly appreciated. Thanks, -derek PS: I have mail delivery turned off for the list, so I would appreciate if you could CC me on any replies. Thanks again. -- Derek Atkins 617-623-3745 derek at ihtfp.com www.ihtfp.com Computer and Internet Security Consultant From yann.morin at orange.com Wed Feb 9 16:08:43 2022 From: yann.morin at orange.com (yann.morin at orange.com) Date: Wed, 9 Feb 2022 17:08:43 +0100 Subject: [Buildroot] [PATCH 0/5 v2] package/pkg-{cargo, golang}: enhance build process Message-ID: <24539_1644422926_6203E70E_24539_404_5_cover.1644422916.git.yann.morin@orange.com> From: "Yann E. MORIN" Hello All! This five-patch series enhances the cargo- and golang-based package infrastructures: - allow building cargo packages in a sub-directory of the package source tree; - fix dependencies when using override-srcdir - allow passing arbitrary _DL_ENV The golang-related changes are not tested, by lack of a go package to test them against, but the changes look obvious and simple enough (note: they were spotted as the two infras got in simultaneously recently, so it looked like a good idea to fix both in the same series). Changes v1 -> v2: - fix conditional in the sub-directory patch - add patch to allow building with override-srcdir Regards, Yann E. MORIN. The following changes since commit 1753d7e667163aacf2ec1d495d2ab62fb384d52c package/doc-asciidoc: fix build for out-of-tree documents (2022-02-09 09:58:47 +0100) are available as patches in this mail series, for you to apply patches up to a1a52ce7fd9920435f8cc9e82513d62f9badd738 package/pkg-golang: host-go is also a build dependency (2022-02-09 16:39:52 +0100) ---------------------------------------------------------------- Yann E. MORIN (5): package/pkg-cargo: allow packages to define download environment package/pkg-cargo: allow building in a sub-directory package/pkg-cargo: host-rustc is also a build dependency package/pkg-golang: allow packages to define download environment package/pkg-golang: host-go is also a build dependency package/pkg-cargo.mk | 22 ++++++++++++++++------ package/pkg-golang.mk | 6 ++++-- 2 files changed, 20 insertions(+), 8 deletions(-) -- ____________ .-----------------.--------------------: _ :------------------. | Yann E. MORIN | Real-Time Embedded | __/ ) | /"\ ASCII RIBBON | | +33 534.541.179 | Software Designer | _/ - /' | \ / CAMPAIGN | | +33 638.411.245 '--------------------: (_ `--, | X AGAINST | | yann.morin (at) orange.com |_=" ,--' | / \ HTML MAIL | '--------------------------------------:______/_____:------------------' _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From yann.morin at orange.com Wed Feb 9 16:08:43 2022 From: yann.morin at orange.com (yann.morin at orange.com) Date: Wed, 9 Feb 2022 17:08:43 +0100 Subject: [Buildroot] [PATCH 1/5 v2] package/pkg-cargo: allow packages to define download environment In-Reply-To: References: Message-ID: <9354_1644422930_6203E712_9354_383_11_2d5b77c2a90cf722e007a5bf3ed4227d2bd1fda6.1644422916.git.yann.morin@orange.com> From: "Yann E. MORIN" Currently, the cargo infrastructure forcibly sets the package _DL_ENV variable, instead of appending to it, which prevents packages from providing their own download environment variables. We fix that by using an append-assignment. Note: when introduced, that variable was explicitly not documented, and is supposed to only be used by packages infrastructures. However, that variable exists, and it can be (ab)used by br2-external packages (most probably to ill effects, but heh!). We anyway leave it undocumented, like _ROOTFS_PRE_CMD_HOOKS. Signed-off-by: Yann E. MORIN Cc: 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 e74a8358bc..66bea513e0 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -69,7 +69,7 @@ define inner-cargo-package $(2)_DOWNLOAD_DEPENDENCIES += host-rustc $(2)_DOWNLOAD_POST_PROCESS = cargo -$(2)_DL_ENV = CARGO_HOME=$$(HOST_DIR)/share/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.25.1 _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From yann.morin at orange.com Wed Feb 9 16:08:44 2022 From: yann.morin at orange.com (yann.morin at orange.com) Date: Wed, 9 Feb 2022 17:08:44 +0100 Subject: [Buildroot] [PATCH 2/5 v2] package/pkg-cargo: allow building in a sub-directory In-Reply-To: References: Message-ID: <20175_1644422934_6203E716_20175_175_1_fea7d1545892211e01cb6660dc5fba16b0851c47.1644422916.git.yann.morin@orange.com> From: "Yann E. MORIN" Some packages have their rust sources as a sub-directory, rather than at the root of the source tree. Do like we do for autotools-package, and use the package's _SRCDIR rather than the top-level directory $(@D). Additionally, in such a situation, it is more than probable that the Cargo.toml is also present in that sub-directory, so use that when vendoring the package, unless the package took extra precautions to specify an alternate location. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni --- Changes v1 -> v2: - fix conditional (inverted logic) - fix syntax in conditional (missing comma) --- package/pkg-cargo.mk | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index 66bea513e0..e1d81197b5 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -71,6 +71,14 @@ $(2)_DOWNLOAD_DEPENDENCIES += host-rustc $(2)_DOWNLOAD_POST_PROCESS = cargo $(2)_DL_ENV += CARGO_HOME=$$(HOST_DIR)/share/cargo +# If building in a sub directory, use that to find the Cargo.toml, unless +# the package already provided its location. +ifneq ($$($(2)_SUBDIR),) +ifeq ($$(filter BR_CARGO_MANIFEST_PATH=%,$$($(2)_DL_ENV)),) +$(2)_DL_ENV += BR_CARGO_MANIFEST_PATH=$$($(2)_SUBDIR)/Cargo.toml +endif +endif + # Due to vendoring, it is pretty likely that not all licenses are # listed in _LICENSE. $(2)_LICENSE += , vendored dependencies licenses probably not listed @@ -97,7 +105,7 @@ $(2)_LICENSE += , vendored dependencies licenses probably not listed ifndef $(2)_BUILD_CMDS ifeq ($(4),target) define $(2)_BUILD_CMDS - cd $$(@D) && \ + cd $$($$(PKG)_SRCDIR) && \ $$(TARGET_MAKE_ENV) \ $$(TARGET_CONFIGURE_OPTS) \ $$(PKG_CARGO_ENV) \ @@ -111,7 +119,7 @@ define $(2)_BUILD_CMDS endef else # ifeq ($(4),target) define $(2)_BUILD_CMDS - cd $$(@D) && \ + cd $$($$(PKG)_SRCDIR) && \ $$(HOST_MAKE_ENV) \ RUSTFLAGS="$$(addprefix -C link-args=,$$(HOST_LDFLAGS))" \ $$(HOST_CONFIGURE_OPTS) \ @@ -133,7 +141,7 @@ endif # ifndef $(2)_BUILD_CMDS # ifndef $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS - cd $$(@D) && \ + cd $$($$(PKG)_SRCDIR) && \ $$(TARGET_MAKE_ENV) \ $$(TARGET_CONFIGURE_OPTS) \ $$(PKG_CARGO_ENV) \ @@ -152,7 +160,7 @@ endif ifndef $(2)_INSTALL_CMDS define $(2)_INSTALL_CMDS - cd $$(@D) && \ + cd $$($$(PKG)_SRCDIR) && \ $$(HOST_MAKE_ENV) \ RUSTFLAGS="$$(addprefix -C link-args=,$$(HOST_LDFLAGS))" \ $$(HOST_CONFIGURE_OPTS) \ -- 2.25.1 _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From yann.morin at orange.com Wed Feb 9 16:08:45 2022 From: yann.morin at orange.com (yann.morin at orange.com) Date: Wed, 9 Feb 2022 17:08:45 +0100 Subject: [Buildroot] [PATCH 3/5 v2] package/pkg-cargo: host-rustc is also a build dependency In-Reply-To: References: Message-ID: <9430_1644422939_6203E71B_9430_485_1_951512fc2010b31a4d2d50fe12c2ad86f3a0c1a1.1644422916.git.yann.morin@orange.com> From: "Yann E. MORIN" Currently, host-rustc is a download dependency, because we need cargo for the vendoring during the downlaod step. However, when using a package in override-srcdir, there is no download step, so host-rustc is not pulled in as a dependency which breaks running the build of a single pcakge from scratch: $ make clean $ make my-rust-package [...] [...] cargo build --offline --release --manifest-path Cargo.toml --locked /bin/sh: cargo: command not found We fix that by adding host-rustc as a standard dependency too. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni --- package/pkg-cargo.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index e1d81197b5..24dd50e399 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -65,8 +65,10 @@ HOST_PKG_CARGO_ENV = \ define inner-cargo-package -# We need host-rustc to run cargo +# We need host-rustc to run cargo at download time (for vendoring), +# and at build and install time. $(2)_DOWNLOAD_DEPENDENCIES += host-rustc +$(2)_DEPENDENCIES += host-rustc $(2)_DOWNLOAD_POST_PROCESS = cargo $(2)_DL_ENV += CARGO_HOME=$$(HOST_DIR)/share/cargo -- 2.25.1 _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From yann.morin at orange.com Wed Feb 9 16:08:46 2022 From: yann.morin at orange.com (yann.morin at orange.com) Date: Wed, 9 Feb 2022 17:08:46 +0100 Subject: [Buildroot] [PATCH 4/5 v2] package/pkg-golang: allow packages to define download environment In-Reply-To: References: Message-ID: <20175_1644422945_6203E721_20175_189_1_2f2cfe45bc7a546997c16e84a6e617dc0752a731.1644422916.git.yann.morin@orange.com> From: "Yann E. MORIN" Currently, the golang infrastructure forcibly sets the package _DL_ENV variable, instead of appending to it, which prevents packages from providing their own download environment variables. We fix that by using an append-assignment. Note: when introduced, that variable was explicitly not documented, and is supposed to only be used by packages infrastructures. However, that variable exists, and it can be (ab)used by br2-external packages (most probably to ill effects, but heh!). We anyway leave it undocumented, like _ROOTFS_PRE_CMD_HOOKS. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Christian Stewart Cc: Anisse Astier --- 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..69eae02830 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -83,7 +83,7 @@ endef $(2)_POST_PATCH_HOOKS += $(2)_GEN_GOMOD $(2)_DOWNLOAD_POST_PROCESS = go -$(2)_DL_ENV = \ +$(2)_DL_ENV += \ $(HOST_GO_COMMON_ENV) \ GOPROXY=direct \ BR_GOMOD=$$($(2)_GOMOD) -- 2.25.1 _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From yann.morin at orange.com Wed Feb 9 16:08:47 2022 From: yann.morin at orange.com (yann.morin at orange.com) Date: Wed, 9 Feb 2022 17:08:47 +0100 Subject: [Buildroot] [PATCH 5/5 v2] package/pkg-golang: host-go is also a build dependency In-Reply-To: References: Message-ID: <25580_1644422947_6203E723_25580_17_1_a1a52ce7fd9920435f8cc9e82513d62f9badd738.1644422916.git.yann.morin@orange.com> From: "Yann E. MORIN" Currently, host-go is a download dependency, because we need go for the vendoring during the downlaod step. However, when using a package in override-srcdir, there is no download step, so host-go is not pulled in as a dependency, which will break the build of a single package from scratch. We fix that by adding host-go as a standard dependency too. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Christian Stewart Cc: Anisse Astier --- package/pkg-golang.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk index 69eae02830..ddefdf1214 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -47,8 +47,10 @@ $(2)_BUILD_OPTS += \ -trimpath \ -p $(PARALLEL_JOBS) -# Target packages need the Go compiler on the host. +# Target packages need the Go compiler on the host at download time (for +# vendoring), and at build and install time. $(2)_DOWNLOAD_DEPENDENCIES += host-go +$(2)_DEPENDENCIES += host-go $(2)_BUILD_TARGETS ?= . -- 2.25.1 _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From ps.report at gmx.net Wed Feb 9 16:21:31 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 9 Feb 2022 17:21:31 +0100 Subject: [Buildroot] [PATCH v1 04/13] package/gst1-plugins-bad: bump version to 1.20.0 In-Reply-To: <875ypod24w.fsf@tarshish> References: <20220208212405.19243-1-ps.report@gmx.net> <20220208212405.19243-5-ps.report@gmx.net> <875ypod24w.fsf@tarshish> Message-ID: <20220209172131.0f03e25f@gmx.net> Hello Baruch, On Wed, 09 Feb 2022 07:43:33 +0200, Baruch Siach wrote: > Hi Peter, > > On Tue, Feb 08 2022, Peter Seiderer wrote: > > - removed 0001-neon-Allow-building-against-neon-0-32-x.patch > > (from upstream [1]) > > > > - add codecalpha option (VP8/VP9 alpha support) > > > > - add qroverlay option (overlay data on top of video in the form of a QR code) > > with json-glib and libqrencode dependencies (omit json-glib explicit > > dependencies as they are the same as for gstreamer1, glib2 BR2_USE_WCHAR, > > BR2_TOOLCHAIN_HAS_THREADS and BR2_USE_MMU), place instead to 'plugins without > > external deps' section into 'plugins that need external deps' section as it > > clearly has dependencies (prelimary to upstream commit [2]) > > > > - add aes option (AES encryption/decryption plugin) > > > > - disable new option asio (Steinberg Audio Streaming, windows only) > > > > - disable new option gs (Google Cloud Storage, needs storage_client library) > > > > - disable new option ldac (LDAC bluetooth audio codec, needs ldacBT-enc library) > > > > - remove legacy option ofa (disabled) > > > > - disable new option onnx (ONNX neural network, needs libonnxruntime library) > > > > - disable new option isac (iSAC plugin, needs webrtc-audio-coding-1 library) > > > > - removed libmms ('Microsoft Multi Media Server streaming protocol' option, > > add Config.in.legacy entry > > > > - enable new gpl option ('Allow build plugins that have (A)GPL-licensed > > dependencies') in case gpl plugin enabled > > > > [1] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/b83e85ab677c79b46f520abebd1ee031e3a139c0.patch > > [2] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/5d70c168b356691073a0d22f7ce3ea7efb20641c.patch > > > > Signed-off-by: Peter Seiderer > > --- > > Config.in.legacy | 22 ++++++++---- > > ...n-Allow-building-against-neon-0-32-x.patch | 29 --------------- > > package/gstreamer1/gst1-plugins-bad/Config.in | 31 ++++++++++------ > > .../gst1-plugins-bad/gst1-plugins-bad.hash | 4 +-- > > .../gst1-plugins-bad/gst1-plugins-bad.mk | 36 ++++++++++++++----- > > 5 files changed, 64 insertions(+), 58 deletions(-) > > delete mode 100644 package/gstreamer1/gst1-plugins-bad/0001-neon-Allow-building-against-neon-0-32-x.patch > > > > diff --git a/Config.in.legacy b/Config.in.legacy > > index 34d8c71cc8..2d7f14f097 100644 > > --- a/Config.in.legacy > > +++ b/Config.in.legacy > > @@ -146,6 +146,16 @@ 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. > > + > > This is already in master (and it's unrelated). Yes, you are right (seems to be some rebase/merge artefact), will respin the patchset..., thanks for review! Regards, Peter > > baruch > From ps.report at gmx.net Wed Feb 9 16:27:18 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 9 Feb 2022 17:27:18 +0100 Subject: [Buildroot] [PATCH v5] package/libcamera-apps: new package In-Reply-To: References: <20210502095925.10744-1-ps.report@gmx.net> Message-ID: <20220209172718.4afc2ed6@gmx.net> Hello Arnout, On Tue, 8 Feb 2022 22:09:44 +0100, Arnout Vandecappelle wrote: > On 02/05/2021 11:59, Peter Seiderer wrote: > > Signed-off-by: Peter Seiderer > > (Finally) applied to master, thanks. However... > > [snip] > > diff --git a/package/libcamera-apps/0001-cmake-remove-Wfatal-errors-compiler-command-line-opt.patch b/package/libcamera-apps/0001-cmake-remove-Wfatal-errors-compiler-command-line-opt.patch > > new file mode 100644 > > index 0000000000..11d19fa526 > > --- /dev/null > > +++ b/package/libcamera-apps/0001-cmake-remove-Wfatal-errors-compiler-command-line-opt.patch > > @@ -0,0 +1,25 @@ > > +From 22096ef8cfb18563c1955145db24742081910e10 Mon Sep 17 00:00:00 2001 > > +From: Peter Seiderer > > +Date: Fri, 5 Feb 2021 18:24:08 +0100 > > +Subject: [PATCH] cmake: remove -Wfatal-errors compiler command line option > > + > > +Signed-off-by: Peter Seiderer > > +--- > > + CMakeLists.txt | 1 - > > + 1 file changed, 1 deletion(-) > > + > > +diff --git a/CMakeLists.txt b/CMakeLists.txt > > +index 4191245..199a0f6 100644 > > +--- a/CMakeLists.txt > > ++++ b/CMakeLists.txt > > +@@ -10,7 +10,6 @@ endif() > > + set (CMAKE_EXPORT_COMPILE_COMMANDS ON) > > + set (CMAKE_CXX_STANDARD 17) > > + set (CMAKE CXX_FLAGS "-Wall -Wextra -pedantic -Wno-unused-parameter -faligned-new") > > +-add_definitions(-Wfatal-errors) > > Why is this patch needed? The only thing that -Wfatal-errors does is to stop > compilation when there is an error, instead of trying to continue and find more > errors in the rest of the file. It's not -Werror. Do not remember the exact failure.... > > I kept the patch anyway because I didn't test without it. Ups, patch needs some update anyway, fails with current libcamera package/version: -- Checking for module 'camera' -- Package 'camera', required by 'virtual:world', not found CMake Error at /usr/share/cmake/Modules/FindPkgConfig.cmake:603 (message): A required package was not found Call Stack (most recent call first): /usr/share/cmake/Modules/FindPkgConfig.cmake:825 (_pkg_check_modules_internal) CMakeLists.txt:36 (pkg_check_modules) Fixed upstream by [1]... Regards, Peter [1] https://github.com/raspberrypi/libcamera-apps/commit/729df015fb37ab25abd73c4832f9e7fa5d1cb8de > > > Regards, > Arnout > > > > + add_definitions(-Wno-psabi) > > + add_definitions(-DBOOST_LOG_DYN_LINK) > > + > > +-- > > +2.30.0 > > + > > diff --git a/package/libcamera-apps/Config.in b/package/libcamera-apps/Config.in > > new file mode 100644 > > index 0000000000..08667eb830 > > --- /dev/null > > +++ b/package/libcamera-apps/Config.in > > @@ -0,0 +1,31 @@ > > +config BR2_PACKAGE_LIBCAMERA_APPS > > + bool "libcamera-apps" > > + depends on BR2_PACKAGE_LIBCAMERA_ARCH_SUPPORTS # libcamera > > + depends on BR2_INSTALL_LIBSTDCPP # libcamera/boost > > + depends on BR2_TOOLCHAIN_HAS_THREADS # libcamera/boost/libdrm > > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17/libcamera > > + depends on !BR2_STATIC_LIBS # gnutls/libcamera > > + depends on BR2_USE_WCHAR # gnutls/libcamera/boost > > + depends on BR2_PACKAGE_XORG7 > > + depends on BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL # libepoxy > > + select BR2_PACKAGE_BOOST > > + select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS > > + select BR2_PACKAGE_JPEG > > + select BR2_PACKAGE_LIBCAMERA > > + select BR2_PACKAGE_LIBDRM > > + select BR2_PACKAGE_LIBEPOXY > > + select BR2_PACKAGE_LIBEXIF > > + select BR2_PACKAGE_LIBPNG > > + select BR2_PACKAGE_TIFF > > + select BR2_PACKAGE_XLIB_LIBX11 > > + help > > + This is a small suite of libcamera-based apps that aim to copy > > + the functionality of the existing "raspicam" apps. > > + > > + https://github.com/raspberrypi/libcamera-apps > > + > > +comment "libcamera-apps needs a toolchain w/ C++, threads, wchar, dynamic library, gcc >= 7 and needs an OpenGL and/or OpenGL EGL backend" > > + 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 > > + depends on !BR2_PACKAGE_HAS_LIBEGL && !BR2_PACKAGE_HAS_LIBGL > > diff --git a/package/libcamera-apps/libcamera-apps.hash b/package/libcamera-apps/libcamera-apps.hash > > new file mode 100644 > > index 0000000000..da426434c1 > > --- /dev/null > > +++ b/package/libcamera-apps/libcamera-apps.hash > > @@ -0,0 +1,3 @@ > > +# Locally computed > > +sha256 9b3475e1c817cbcf942c4be0dac3d1f6bf2ee192b0ca5edb95c85c06c5a12b4f libcamera-apps-326fdfd120a0f62b7e76f4ee8aa0c82c2bf008e6.tar.gz > > +sha256 36dfed86bdef661a0a14ec1a1cc84c771d5a06b6f9b92e9ebb610ba711bd528a license.txt > > diff --git a/package/libcamera-apps/libcamera-apps.mk b/package/libcamera-apps/libcamera-apps.mk > > new file mode 100644 > > index 0000000000..5edcefefad > > --- /dev/null > > +++ b/package/libcamera-apps/libcamera-apps.mk > > @@ -0,0 +1,25 @@ > > +################################################################################ > > +# > > +# libcamera-apps > > +# > > +################################################################################ > > + > > +LIBCAMERA_APPS_VERSION = 326fdfd120a0f62b7e76f4ee8aa0c82c2bf008e6 > > +LIBCAMERA_APPS_SITE = $(call github,raspberrypi,libcamera-apps,$(LIBCAMERA_APPS_VERSION)) > > +LIBCAMERA_APPS_LICENSE = BSD-2-Clause > > +LIBCAMERA_APPS_LICENSE_FILES = license.txt > > +LIBCAMERA_APPS_DEPENDENCIES = \ > > + host-pkgconf \ > > + boost \ > > + jpeg \ > > + libcamera \ > > + libdrm \ > > + libexif \ > > + libepoxy \ > > + libpng \ > > + tiff \ > > + xlib_libX11 > > + > > +LIBCAMERA_APPS_CONF_OPTS = -DENABLE_COMPILE_FLAGS_FOR_TARGET=disabled > > + > > +$(eval $(cmake-package)) From peter at korsgaard.com Wed Feb 9 16:50:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:26 +0100 Subject: [Buildroot] [PATCH 000/107] Drop python 2.7 Message-ID: <20220209165213.4498-1-peter@korsgaard.com> Python 2.7 is EOL since April 2020 and almost all packages support python 3, so drop it before the 2022.02 release. It is a big series, but the changes are mainly mechanical in nature. There is still some cleanup to do, E.G. the python2 support in pkg-python and the host python-setuptools package - But this is IMHO the minimum changes before -rc1. Peter Korsgaard (107): support/testing: drop python2 tests package/python: drop target package package/alsa-lib: drop python2 support package/bmap-tools: drop python2 support package/boost: drop python2 support package/cifs-utils: drop python2 support package/cracklib: move python support to python3 package/crudini: drop python2 support package/dbus-python: drop python2 support package/docker-compose: drop reference to BR2_PACKAGE_PYTHON package/dstat: drop python2 support package/evemu: drop python2 support package/fail2ban: drop python2 support package/glsandbox-player: drop reference to python2 package/gpsd: drop python2 support package/gst1-devtools: drop python2 support package/i2c-tools: drop python2 support package/iotop: drop python2 support package/jack2: drop python2 support package/kmod: drop python2 support package/libcec: drop python2 support package/libevent: drop python2 support package/libftdi1: drop python2 support package/libiio: drop python2 support package/libpwquality: drop python2 support package/libsigrokdecode: drop reference to python2 package/libsoc: drop python2 support package/lttng-libust: drop python2 support package/networkd-dispatcher: drop reference to python2 package/nftables: drop python2 support package/ogre: drop python2 support package/opkg-utils: drop reference to python2 package/owfs: drop python support package/python-aenum: drop python2 support package/python-argon2-cffi: drop python2 support package/python-bsdiff4: drop python2 support package/python-can: drop python2 support package/python-couchdb: drop python2 support package/python-dicttoxml: drop python2 support package/python-dpkt: drop python2 support package/python-esptool: drop python2 support package/python-fire: drop python2 support package/python-flask: drop python2 support package/python-jsonschema: drop python2 support package/python-libconfig: drop python2 support package/python-logbook: drop python2 support package/python-lxml: drop python2 support package/python-m2crypto: drop python2 support package/python-pexpect: drop python2 support package/python-pickleshare: drop python2 support package/python-pymodbus: drop python2 support package/python-pyqrcode: drop python2 support package/python-pyqt5: drop python2 support package/python-pyroute2: drop python2 support package/python-pyudev: drop python2 support package/python-raven: drop python2 support package/python-reentry: drop python2 support package/python-remi: drop python2 support package/python-scapy: drop python2 support package/python-sentry-sdk: drop python2 support package/python-setuptools: drop python2 support package/python-sip: drop python2 support package/python-txtorcon: drop python2 support package/python-typing-extensions: drop python2 support package/python-urllib3: drop python2 support package/python-web2py: drop python2 support package/python-webob: drop python2 support package/python-websocket-client: drop python2 support package/python-werkzeug: drop python2 support package/python-whoosh: drop python2 support package/python-xlrd: drop python2 support package/python-xmltodict: drop python2 support package/python3: drop references to python2 package/ranger: drop python2 support package/selinux-python: drop reference to python2 package/snmpclitools: drop python2 support package/supervisor: drop python2 support package/suricata: drop python2 support package/syslog-ng: drop python2 support package/tovid: drop python2 support package/trace-cmd: drop python2 support package/util-linux: drop python2 support package/zfs: drop python2 support package/python: drop host package package/python-backports-abc: drop python2 specific package package/python-backports-shutil-get-terminal-size: drop python2 specific package package/python-backports-ssl-match-hostname: drop python2 specific package package/python-futures: drop python2 specific package package/python-id3: drop python2 specific package package/python-ipaddr: drop python2 specific package package/python-ipaddress: drop python2 specific package package/python-mad: drop python2 specific package package/python-nfc: drop python2 specific package package/python-pam: drop python2 specific package package/python-pathlib2: drop python2 specific package package/python-pypcap: drop python2 specific package package/python-pyro: drop python2 specific package package/python-singledispatch: drop python2 specific package package/python-subprocess32: drop python2 specific package package/python-typing: drop python2 specific package package/python-yieldfrom: drop python2 specific package package/python-configobj: drop python2 specific package package/python-dialog: drop python2 specific package package/python-enum: drop python2 specific package package/python-enum34: drop python2 specific package package/python-functools32: drop python2 specific package docs/manual: drop python2 references Config.in.legacy | 140 ++++++++ DEVELOPERS | 15 - docs/manual/adding-packages-python.txt | 8 - docs/manual/writing-rules.txt | 8 +- package/Config.in | 25 +- package/Config.in.host | 1 - package/alsa-lib/Config.in | 2 +- package/alsa-lib/alsa-lib.mk | 11 +- package/bmap-tools/Config.in | 5 +- package/boost/Config.in | 2 +- package/boost/boost.mk | 11 +- package/cifs-utils/Config.in | 2 +- package/cracklib/cracklib.mk | 7 +- package/crudini/Config.in | 2 +- package/dbus-python/Config.in | 8 +- package/dbus-python/dbus-python.mk | 28 +- package/docker-compose/Config.in | 9 +- package/dstat/Config.in | 10 +- package/evemu/evemu.mk | 4 +- package/fail2ban/Config.in | 2 +- package/fail2ban/fail2ban.mk | 7 +- package/glslsandbox-player/Config.in | 1 - package/gpsd/Config.in | 4 +- package/gpsd/gpsd.mk | 4 - package/gstreamer1/gst1-devtools/Config.in | 6 +- package/i2c-tools/i2c-tools.mk | 8 +- package/iotop/Config.in | 9 +- package/jack2/Config.in | 5 +- package/kmod/kmod.mk | 4 +- package/libcec/libcec.mk | 4 +- package/libevent/libevent.mk | 2 +- package/libftdi1/Config.in | 2 +- package/libftdi1/libftdi1.mk | 2 +- package/libiio/Config.in | 2 +- package/libiio/libiio.mk | 10 +- package/libpwquality/libpwquality.mk | 4 +- package/libsigrokdecode/Config.in | 6 - package/libsoc/libsoc.mk | 6 +- package/lttng-libust/lttng-libust.mk | 5 +- package/networkd-dispatcher/Config.in | 2 - package/nftables/nftables.mk | 4 +- package/ogre/ogre.mk | 5 +- package/opkg-utils/Config.in | 6 - package/owfs/owfs.mk | 24 +- package/python-aenum/python-aenum.mk | 9 - package/python-argon2-cffi/Config.in | 1 - package/python-backports-abc/Config.in | 8 - .../python-backports-abc.hash | 5 - .../python-backports-abc.mk | 14 - .../Config.in | 8 - ...on-backports-shutil-get-terminal-size.hash | 5 - ...thon-backports-shutil-get-terminal-size.mk | 14 - .../Config.in | 7 - .../python-backports-ssl-match-hostname.hash | 5 - .../python-backports-ssl-match-hostname.mk | 14 - package/python-bsdiff4/Config.in | 3 +- package/python-can/Config.in | 7 +- package/python-configobj/Config.in | 10 - .../python-configobj/python-configobj.hash | 3 - package/python-configobj/python-configobj.mk | 14 - package/python-couchdb/Config.in | 3 +- package/python-dialog/Config.in | 10 - package/python-dialog/python-dialog.hash | 5 - package/python-dialog/python-dialog.mk | 15 - package/python-dicttoxml/Config.in | 3 +- package/python-dpkt/Config.in | 3 +- package/python-enum/Config.in | 12 - package/python-enum/python-enum.hash | 5 - package/python-enum/python-enum.mk | 14 - package/python-enum34/Config.in | 12 - package/python-enum34/python-enum34.hash | 5 - package/python-enum34/python-enum34.mk | 17 - package/python-esptool/Config.in | 3 +- package/python-fire/Config.in | 1 - package/python-fire/python-fire.mk | 9 - package/python-flask/Config.in | 7 +- package/python-functools32/Config.in | 8 - .../python-functools32.hash | 4 - .../python-functools32/python-functools32.mk | 14 - package/python-futures/Config.in | 7 - package/python-futures/python-futures.hash | 5 - package/python-futures/python-futures.mk | 14 - package/python-id3/Config.in | 9 - package/python-id3/python-id3.hash | 3 - package/python-id3/python-id3.mk | 14 - package/python-ipaddr/Config.in | 9 - package/python-ipaddr/python-ipaddr.hash | 5 - package/python-ipaddr/python-ipaddr.mk | 14 - package/python-ipaddress/Config.in | 7 - .../python-ipaddress/python-ipaddress.hash | 5 - package/python-ipaddress/python-ipaddress.mk | 14 - package/python-jsonschema/Config.in | 1 - package/python-libconfig/python-libconfig.mk | 8 +- package/python-logbook/Config.in | 3 +- package/python-lxml/Config.in | 3 +- package/python-m2crypto/Config.in | 7 +- package/python-mad/Config.in | 9 - package/python-mad/python-mad.hash | 3 - package/python-mad/python-mad.mk | 29 -- package/python-nfc/Config.in | 16 - package/python-nfc/python-nfc.hash | 3 - package/python-nfc/python-nfc.mk | 14 - package/python-pam/0001-dealloc.patch | 25 -- package/python-pam/0002-nofree.patch | 68 ---- .../0003-memory-errors-CVE2012-1502.patch | 136 -------- package/python-pam/Config.in | 16 - package/python-pam/python-pam.hash | 3 - package/python-pam/python-pam.mk | 16 - package/python-pathlib2/Config.in | 13 - package/python-pathlib2/python-pathlib2.hash | 5 - package/python-pathlib2/python-pathlib2.mk | 14 - package/python-pexpect/python-pexpect.mk | 10 - package/python-pickleshare/Config.in | 1 - package/python-pymodbus/python-pymodbus.mk | 9 - package/python-pypcap/Config.in | 9 - package/python-pypcap/python-pypcap.hash | 3 - package/python-pypcap/python-pypcap.mk | 21 -- package/python-pyqrcode/Config.in | 6 +- package/python-pyqt5/python-pyqt5.mk | 14 +- package/python-pyro/Config.in | 10 - package/python-pyro/python-pyro.hash | 5 - package/python-pyro/python-pyro.mk | 16 - package/python-pyroute2/Config.in | 3 +- package/python-pyudev/Config.in | 3 +- package/python-raven/Config.in | 9 +- package/python-reentry/Config.in | 1 - package/python-remi/Config.in | 3 +- package/python-scapy/Config.in | 3 +- .../python-sentry-sdk/python-sentry-sdk.mk | 10 - package/python-setuptools/Config.in | 6 +- .../python-setuptools/python-setuptools.mk | 16 - package/python-singledispatch/Config.in | 9 - .../python-singledispatch.hash | 5 - .../python-singledispatch.mk | 14 - package/python-sip/python-sip.mk | 19 +- package/python-subprocess32/Config.in | 13 - .../python-subprocess32.hash | 5 - .../python-subprocess32.mk | 31 -- package/python-txtorcon/python-txtorcon.mk | 9 - package/python-typing-extensions/Config.in | 1 - package/python-typing/Config.in | 8 - package/python-typing/python-typing.hash | 5 - package/python-typing/python-typing.mk | 15 - package/python-urllib3/Config.in | 3 +- package/python-web2py/Config.in | 9 +- package/python-webob/Config.in | 4 +- package/python-websocket-client/Config.in | 3 +- package/python-werkzeug/Config.in | 3 +- package/python-whoosh/Config.in | 3 +- package/python-xlrd/Config.in | 6 +- package/python-xmltodict/Config.in | 3 +- package/python-yieldfrom/Config.in | 8 - .../python-yieldfrom/python-yieldfrom.hash | 5 - package/python-yieldfrom/python-yieldfrom.mk | 15 - ...-do-not-add-invalid-header-locations.patch | 42 --- ...get_python_inc-for-cross-compilation.patch | 48 --- ...nstall-location-of-_sysconfigdata.py.patch | 88 ----- ...ilation-of-.pyc-and-.pyo-conditional.patch | 78 ----- ...taddrinfo-test-for-cross-compilation.patch | 31 -- ...astructure-to-be-able-to-disable-ext.patch | 81 ----- ...y-header-paths-for-cross-compilation.patch | 64 ---- ...ook-in-usr-lib-termcap-for-libraries.patch | 31 -- ...9-Fix-python-config-for-cross-builds.patch | 229 ------------- ...ove-the-python-symlink-install-rules.patch | 43 --- .../0011-Don-t-add-multiarch-paths.patch | 36 --- .../0012-Abort-on-failed-module-build.patch | 30 -- ...d-when-threads-are-not-used-availabl.patch | 58 ---- .../python/0014-Serial-ioctl-workaround.patch | 33 -- ...e-shebang-of-Python-scripts-for-cros.patch | 35 -- ...-disable-installation-of-test-module.patch | 105 ------ .../0017-Add-an-option-to-disable-pydoc.patch | 89 ------ ...018-Add-an-option-to-disable-lib2to3.patch | 92 ------ ...option-to-disable-the-sqlite3-module.patch | 69 ---- ...d-an-option-to-disable-the-tk-module.patch | 73 ----- ...-option-to-disable-the-curses-module.patch | 61 ---- .../0022-Add-an-option-to-disable-expat.patch | 92 ------ ...-Add-an-option-to-disable-CJK-codecs.patch | 32 -- .../0024-Add-an-option-to-disable-NIS.patch | 35 -- ...Add-an-option-to-disable-unicodedata.patch | 32 -- .../0026-Add-an-option-to-disable-bsddb.patch | 87 ----- ...-an-option-to-disable-the-ssl-module.patch | 32 -- ...-an-option-to-disable-the-bz2-module.patch | 32 -- ...an-option-to-disable-the-zlib-module.patch | 32 -- .../0030-Do-not-install-the-idle-editor.patch | 55 ---- ...on-to-disable-the-ossaudiodev-module.patch | 32 -- ...option-to-disable-the-hashlib-module.patch | 32 -- ...an-option-to-disable-readline-module.patch | 32 -- ...locale-and-set-to-default-when-addin.patch | 37 --- package/python/Config.in | 139 -------- package/python/Config.in.host | 16 - package/python/python.hash | 5 - package/python/python.mk | 302 ------------------ package/python3/Config.in | 1 - package/python3/python3.mk | 2 - package/ranger/Config.in | 5 +- package/selinux-python/Config.in | 5 - package/snmpclitools/Config.in | 2 +- package/supervisor/Config.in | 3 +- package/suricata/suricata.mk | 4 +- package/syslog-ng/syslog-ng.mk | 7 +- package/tovid/Config.in | 6 +- package/trace-cmd/trace-cmd.mk | 5 +- package/util-linux/util-linux.mk | 4 +- package/zfs/zfs.mk | 12 +- .../package/sample_python_subprocess32.py | 6 - .../testing/tests/package/test_bmap_tools.py | 8 - support/testing/tests/package/test_crudini.py | 8 - .../testing/tests/package/test_libftdi1.py | 12 - support/testing/tests/package/test_python.py | 14 - .../testing/tests/package/test_python_argh.py | 9 - .../tests/package/test_python_bitstring.py | 10 - .../testing/tests/package/test_python_can.py | 11 - .../testing/tests/package/test_python_cbor.py | 11 - .../tests/package/test_python_click.py | 9 - .../tests/package/test_python_constantly.py | 10 - .../tests/package/test_python_gnupg.py | 10 - .../tests/package/test_python_incremental.py | 11 - .../tests/package/test_python_passlib.py | 11 - .../tests/package/test_python_pexpect.py | 10 - .../tests/package/test_python_pynacl.py | 11 - .../tests/package/test_python_pyyaml.py | 11 - .../tests/package/test_python_subprocess32.py | 11 - .../tests/package/test_python_ubjson.py | 11 - 223 files changed, 270 insertions(+), 3981 deletions(-) delete mode 100644 package/python-backports-abc/Config.in delete mode 100644 package/python-backports-abc/python-backports-abc.hash delete mode 100644 package/python-backports-abc/python-backports-abc.mk delete mode 100644 package/python-backports-shutil-get-terminal-size/Config.in delete mode 100644 package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.hash delete mode 100644 package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.mk delete mode 100644 package/python-backports-ssl-match-hostname/Config.in delete mode 100644 package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.hash delete mode 100644 package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.mk delete mode 100644 package/python-configobj/Config.in delete mode 100644 package/python-configobj/python-configobj.hash delete mode 100644 package/python-configobj/python-configobj.mk delete mode 100644 package/python-dialog/Config.in delete mode 100644 package/python-dialog/python-dialog.hash delete mode 100644 package/python-dialog/python-dialog.mk delete mode 100644 package/python-enum/Config.in delete mode 100644 package/python-enum/python-enum.hash delete mode 100644 package/python-enum/python-enum.mk delete mode 100644 package/python-enum34/Config.in delete mode 100644 package/python-enum34/python-enum34.hash delete mode 100644 package/python-enum34/python-enum34.mk delete mode 100644 package/python-functools32/Config.in delete mode 100644 package/python-functools32/python-functools32.hash delete mode 100644 package/python-functools32/python-functools32.mk delete mode 100644 package/python-futures/Config.in delete mode 100644 package/python-futures/python-futures.hash delete mode 100644 package/python-futures/python-futures.mk delete mode 100644 package/python-id3/Config.in delete mode 100644 package/python-id3/python-id3.hash delete mode 100644 package/python-id3/python-id3.mk delete mode 100644 package/python-ipaddr/Config.in delete mode 100644 package/python-ipaddr/python-ipaddr.hash delete mode 100644 package/python-ipaddr/python-ipaddr.mk delete mode 100644 package/python-ipaddress/Config.in delete mode 100644 package/python-ipaddress/python-ipaddress.hash delete mode 100644 package/python-ipaddress/python-ipaddress.mk delete mode 100644 package/python-mad/Config.in delete mode 100644 package/python-mad/python-mad.hash delete mode 100644 package/python-mad/python-mad.mk delete mode 100644 package/python-nfc/Config.in delete mode 100644 package/python-nfc/python-nfc.hash delete mode 100644 package/python-nfc/python-nfc.mk delete mode 100644 package/python-pam/0001-dealloc.patch delete mode 100644 package/python-pam/0002-nofree.patch delete mode 100644 package/python-pam/0003-memory-errors-CVE2012-1502.patch delete mode 100644 package/python-pam/Config.in delete mode 100644 package/python-pam/python-pam.hash delete mode 100644 package/python-pam/python-pam.mk delete mode 100644 package/python-pathlib2/Config.in delete mode 100644 package/python-pathlib2/python-pathlib2.hash delete mode 100644 package/python-pathlib2/python-pathlib2.mk delete mode 100644 package/python-pypcap/Config.in delete mode 100644 package/python-pypcap/python-pypcap.hash delete mode 100644 package/python-pypcap/python-pypcap.mk delete mode 100644 package/python-pyro/Config.in delete mode 100644 package/python-pyro/python-pyro.hash delete mode 100644 package/python-pyro/python-pyro.mk delete mode 100644 package/python-singledispatch/Config.in delete mode 100644 package/python-singledispatch/python-singledispatch.hash delete mode 100644 package/python-singledispatch/python-singledispatch.mk delete mode 100644 package/python-subprocess32/Config.in delete mode 100644 package/python-subprocess32/python-subprocess32.hash delete mode 100644 package/python-subprocess32/python-subprocess32.mk delete mode 100644 package/python-typing/Config.in delete mode 100644 package/python-typing/python-typing.hash delete mode 100644 package/python-typing/python-typing.mk delete mode 100644 package/python-yieldfrom/Config.in delete mode 100644 package/python-yieldfrom/python-yieldfrom.hash delete mode 100644 package/python-yieldfrom/python-yieldfrom.mk delete mode 100644 package/python/0001-setup.py-do-not-add-invalid-header-locations.patch delete mode 100644 package/python/0002-Fix-get_python_inc-for-cross-compilation.patch delete mode 100644 package/python/0003-Change-the-install-location-of-_sysconfigdata.py.patch delete mode 100644 package/python/0004-Make-the-compilation-of-.pyc-and-.pyo-conditional.patch delete mode 100644 package/python/0005-Adjust-getaddrinfo-test-for-cross-compilation.patch delete mode 100644 package/python/0006-Add-minimal-infrastructure-to-be-able-to-disable-ext.patch delete mode 100644 package/python/0007-Adjust-library-header-paths-for-cross-compilation.patch delete mode 100644 package/python/0008-Don-t-look-in-usr-lib-termcap-for-libraries.patch delete mode 100644 package/python/0009-Fix-python-config-for-cross-builds.patch delete mode 100644 package/python/0010-Remove-the-python-symlink-install-rules.patch delete mode 100644 package/python/0011-Don-t-add-multiarch-paths.patch delete mode 100644 package/python/0012-Abort-on-failed-module-build.patch delete mode 100644 package/python/0013-sqlite3-fix-build-when-threads-are-not-used-availabl.patch delete mode 100644 package/python/0014-Serial-ioctl-workaround.patch delete mode 100644 package/python/0015-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch delete mode 100644 package/python/0016-Add-an-option-to-disable-installation-of-test-module.patch delete mode 100644 package/python/0017-Add-an-option-to-disable-pydoc.patch delete mode 100644 package/python/0018-Add-an-option-to-disable-lib2to3.patch delete mode 100644 package/python/0019-Add-option-to-disable-the-sqlite3-module.patch delete mode 100644 package/python/0020-Add-an-option-to-disable-the-tk-module.patch delete mode 100644 package/python/0021-Add-an-option-to-disable-the-curses-module.patch delete mode 100644 package/python/0022-Add-an-option-to-disable-expat.patch delete mode 100644 package/python/0023-Add-an-option-to-disable-CJK-codecs.patch delete mode 100644 package/python/0024-Add-an-option-to-disable-NIS.patch delete mode 100644 package/python/0025-Add-an-option-to-disable-unicodedata.patch delete mode 100644 package/python/0026-Add-an-option-to-disable-bsddb.patch delete mode 100644 package/python/0027-Add-an-option-to-disable-the-ssl-module.patch delete mode 100644 package/python/0028-Add-an-option-to-disable-the-bz2-module.patch delete mode 100644 package/python/0029-Add-an-option-to-disable-the-zlib-module.patch delete mode 100644 package/python/0030-Do-not-install-the-idle-editor.patch delete mode 100644 package/python/0031-Add-an-option-to-disable-the-ossaudiodev-module.patch delete mode 100644 package/python/0032-Add-option-to-disable-the-hashlib-module.patch delete mode 100644 package/python/0033-Add-an-option-to-disable-readline-module.patch delete mode 100644 package/python/0034-Override-system-locale-and-set-to-default-when-addin.patch delete mode 100644 package/python/Config.in delete mode 100644 package/python/Config.in.host delete mode 100644 package/python/python.hash delete mode 100644 package/python/python.mk delete mode 100644 support/testing/tests/package/sample_python_subprocess32.py delete mode 100644 support/testing/tests/package/test_python_subprocess32.py -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:32 +0100 Subject: [Buildroot] [PATCH 006/107] package/cifs-utils: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-7-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/cifs-utils/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/cifs-utils/Config.in b/package/cifs-utils/Config.in index f15d1e3dc4..d1b1406a3e 100644 --- a/package/cifs-utils/Config.in +++ b/package/cifs-utils/Config.in @@ -21,7 +21,7 @@ config BR2_PACKAGE_CIFS_UTILS_SMBTOOLS depends on BR2_USE_WCHAR # python3 depends on BR2_TOOLCHAIN_HAS_THREADS # python3 depends on !BR2_STATIC_LIBS # python3 - select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON # runtime + select BR2_PACKAGE_PYTHON3 # runtime help Install the smb tools smbinfo and smb2-quota (python implementations). -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:30 +0100 Subject: [Buildroot] [PATCH 004/107] package/bmap-tools: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-5-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/bmap-tools/Config.in | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package/bmap-tools/Config.in b/package/bmap-tools/Config.in index 83b4d92786..91081069c7 100644 --- a/package/bmap-tools/Config.in +++ b/package/bmap-tools/Config.in @@ -1,8 +1,7 @@ config BR2_PACKAGE_BMAP_TOOLS bool "bmap-tools" - depends on BR2_PACKAGE_PYTHON3 || BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime, pkg_resources select BR2_PACKAGE_PYTHON_SIX # runtime help -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:34 +0100 Subject: [Buildroot] [PATCH 008/107] package/crudini: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-9-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/crudini/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/crudini/Config.in b/package/crudini/Config.in index 240848dffc..ff4c98d579 100644 --- a/package/crudini/Config.in +++ b/package/crudini/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_CRUDINI bool "crudini" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_INIPARSE # runtime help A utility for handling ini files from the command line and -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:29 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:29 +0100 Subject: [Buildroot] [PATCH 003/107] package/alsa-lib: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-4-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/alsa-lib/Config.in | 2 +- package/alsa-lib/alsa-lib.mk | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/package/alsa-lib/Config.in b/package/alsa-lib/Config.in index 4168d1f220..af3de984d9 100644 --- a/package/alsa-lib/Config.in +++ b/package/alsa-lib/Config.in @@ -22,7 +22,7 @@ if BR2_PACKAGE_ALSA_LIB config BR2_PACKAGE_ALSA_LIB_PYTHON bool "Python support for alsa-lib" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 help Add python support for alsa-lib. Python will be built and libpython will be installed diff --git a/package/alsa-lib/alsa-lib.mk b/package/alsa-lib/alsa-lib.mk index b5cd3f0d13..5d12f5e6d8 100644 --- a/package/alsa-lib/alsa-lib.mk +++ b/package/alsa-lib/alsa-lib.mk @@ -61,20 +61,11 @@ endif ifeq ($(BR2_PACKAGE_ALSA_LIB_PYTHON),y) ALSA_LIB_CONF_OPTS += \ - --enable-mixer-pymods -ifeq ($(BR2_PACKAGE_PYTHON),y) -ALSA_LIB_CONF_OPTS += \ - --with-pythonlibs=-lpython$(PYTHON_VERSION_MAJOR) \ - --with-pythonincludes=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) -ALSA_LIB_CFLAGS += -I$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) -ALSA_LIB_DEPENDENCIES += python -else -ALSA_LIB_CONF_OPTS += \ + --enable-mixer-pymods \ --with-pythonlibs=-lpython$(PYTHON3_VERSION_MAJOR) \ --with-pythonincludes=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) ALSA_LIB_CFLAGS += -I$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) ALSA_LIB_DEPENDENCIES += python3 -endif else ALSA_LIB_CONF_OPTS += --disable-python endif -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:39 +0100 Subject: [Buildroot] [PATCH 013/107] package/fail2ban: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-14-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/fail2ban/Config.in | 2 +- package/fail2ban/fail2ban.mk | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/package/fail2ban/Config.in b/package/fail2ban/Config.in index 86e6233793..8a48a8c1d0 100644 --- a/package/fail2ban/Config.in +++ b/package/fail2ban/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_FAIL2BAN bool "fail2ban" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_SYSTEMD if BR2_PACKAGE_SYSTEMD help Fail2ban scans log files (e.g. /var/log/apache/error_log) and diff --git a/package/fail2ban/fail2ban.mk b/package/fail2ban/fail2ban.mk index 9202dc1ddd..4a08981a97 100644 --- a/package/fail2ban/fail2ban.mk +++ b/package/fail2ban/fail2ban.mk @@ -15,15 +15,13 @@ FAIL2BAN_SETUP_TYPE = distutils # 0001-fixed-possible-RCE-vulnerability-unset-escape-variable.patch FAIL2BAN_IGNORE_CVES += CVE-2021-32749 -ifeq ($(BR2_PACKAGE_PYTHON3),y) define FAIL2BAN_PYTHON_2TO3 $(HOST_DIR)/bin/2to3 --write --nobackups --no-diffs $(@D)/bin/* $(@D)/fail2ban endef -FAIL2BAN_DEPENDENCIES += host-python3 +FAIL2BAN_DEPENDENCIES = host-python3 # We can't use _POST_PATCH_HOOKS because dependencies are not guaranteed # to build and install before _POST_PATCH_HOOKS run. FAIL2BAN_PRE_CONFIGURE_HOOKS += FAIL2BAN_PYTHON_2TO3 -endif define FAIL2BAN_FIX_DEFAULT_CONFIG $(SED) '/^socket/c\socket = /run/fail2ban.sock' $(TARGET_DIR)/etc/fail2ban/fail2ban.conf @@ -34,8 +32,7 @@ FAIL2BAN_POST_INSTALL_TARGET_HOOKS += FAIL2BAN_FIX_DEFAULT_CONFIG # fail2ban-python points to host python define FAIL2BAN_FIX_FAIL2BAN_PYTHON_SYMLINK - ln -snf $(if $(BR2_PACKAGE_PYTHON),python,python3) \ - $(TARGET_DIR)/usr/bin/fail2ban-python + ln -snf python3 $(TARGET_DIR)/usr/bin/fail2ban-python endef FAIL2BAN_POST_INSTALL_TARGET_HOOKS += FAIL2BAN_FIX_FAIL2BAN_PYTHON_SYMLINK -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:37 +0100 Subject: [Buildroot] [PATCH 011/107] package/dstat: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-12-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/dstat/Config.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package/dstat/Config.in b/package/dstat/Config.in index 647a7033c6..09d1970f73 100644 --- a/package/dstat/Config.in +++ b/package/dstat/Config.in @@ -1,10 +1,10 @@ config BR2_PACKAGE_DSTAT bool "dstat" - depends on BR2_USE_WCHAR # python - depends on BR2_USE_MMU # python - depends on BR2_TOOLCHAIN_HAS_THREADS # python - depends on !BR2_STATIC_LIBS # python - select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON + depends on BR2_USE_WCHAR # python3 + depends on BR2_USE_MMU # python3 + depends on BR2_TOOLCHAIN_HAS_THREADS # python3 + depends on !BR2_STATIC_LIBS # python3 + select BR2_PACKAGE_PYTHON3 # runtime help Dstat, written in Python, is a versatile replacement for vmstat, iostat, netstat and ifstat. Dstat overcomes some of -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:35 +0100 Subject: [Buildroot] [PATCH 009/107] package/dbus-python: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-10-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/dbus-python/Config.in | 8 +++----- package/dbus-python/dbus-python.mk | 28 ++++------------------------ 2 files changed, 7 insertions(+), 29 deletions(-) diff --git a/package/dbus-python/Config.in b/package/dbus-python/Config.in index 4bfb59ed91..76453e168a 100644 --- a/package/dbus-python/Config.in +++ b/package/dbus-python/Config.in @@ -3,16 +3,14 @@ config BR2_PACKAGE_DBUS_PYTHON depends on BR2_USE_WCHAR # glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 depends on BR2_PACKAGE_DBUS - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_LIBGLIB2 - # pyexpat: runtime dependency only - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime help Python bindings for D-Bus http://dbus.freedesktop.org/doc/dbus-python/ comment "dbus-python needs a toolchain w/ wchar, threads" - depends on BR2_PACKAGE_DBUS && (BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3) + depends on BR2_PACKAGE_DBUS && BR2_PACKAGE_PYTHON3 depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/dbus-python/dbus-python.mk b/package/dbus-python/dbus-python.mk index 3e28aed25c..d9bb30ed67 100644 --- a/package/dbus-python/dbus-python.mk +++ b/package/dbus-python/dbus-python.mk @@ -9,40 +9,20 @@ DBUS_PYTHON_SITE = http://dbus.freedesktop.org/releases/dbus-python DBUS_PYTHON_INSTALL_STAGING = YES DBUS_PYTHON_LICENSE = MIT (dbus-python), AFL-2.1 or GPL-2.0+ (dbus-gmain) DBUS_PYTHON_LICENSE_FILES = COPYING dbus-gmain/COPYING -DBUS_PYTHON_DEPENDENCIES = dbus libglib2 -HOST_DBUS_PYTHON_DEPENDENCIES = host-dbus host-libglib2 +DBUS_PYTHON_DEPENDENCIES = dbus libglib2 python3 host-python3 +HOST_DBUS_PYTHON_DEPENDENCIES = host-dbus host-libglib2 host-python3 -ifeq ($(BR2_PACKAGE_PYTHON),y) -DBUS_PYTHON_DEPENDENCIES += python host-python - -DBUS_PYTHON_CONF_ENV += \ - PYTHON=$(HOST_DIR)/bin/python2 \ - PYTHON_INCLUDES="`$(STAGING_DIR)/usr/bin/python2-config --includes`" \ - PYTHON_LIBS="`$(STAGING_DIR)/usr/bin/python2-config --ldflags`" - -HOST_DBUS_PYTHON_DEPENDENCIES += host-python - -HOST_DBUS_PYTHON_CONF_ENV += \ - PYTHON=$(HOST_DIR)/bin/python2 \ - PYTHON_INCLUDES="`$(HOST_DIR)/usr/bin/python2-config --includes`" \ - PYTHON_LIBS="`$(HOST_DIR)/usr/bin/python2-config --ldflags`" -else -DBUS_PYTHON_DEPENDENCIES += python3 host-python3 - -DBUS_PYTHON_CONF_ENV += \ +DBUS_PYTHON_CONF_ENV = \ PYTHON=$(HOST_DIR)/bin/python3 \ PYTHON_INCLUDES="`$(STAGING_DIR)/usr/bin/python3-config --includes`" \ PYTHON_LIBS="`$(STAGING_DIR)/usr/bin/python3-config --ldflags`" \ PYTHON_EXTRA_LIBS="`$(STAGING_DIR)/usr/bin/python3-config --libs --embed`" -HOST_DBUS_PYTHON_DEPENDENCIES += host-python3 - -HOST_DBUS_PYTHON_CONF_ENV += \ +HOST_DBUS_PYTHON_CONF_ENV = \ PYTHON=$(HOST_DIR)/bin/python3 \ PYTHON_INCLUDES="`$(HOST_DIR)/usr/bin/python3-config --includes`" \ PYTHON_LIBS="`$(HOST_DIR)/usr/bin/python3-config --ldflags`" \ PYTHON_EXTRA_LIBS="`$(HOST_DIR)/usr/bin/python3-config --libs --embed`" -endif $(eval $(autotools-package)) $(eval $(host-autotools-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:40 +0100 Subject: [Buildroot] [PATCH 014/107] package/glsandbox-player: drop reference to python2 In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-15-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/glslsandbox-player/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/glslsandbox-player/Config.in b/package/glslsandbox-player/Config.in index 2d15a7e270..317eb62898 100644 --- a/package/glslsandbox-player/Config.in +++ b/package/glslsandbox-player/Config.in @@ -33,7 +33,6 @@ config BR2_PACKAGE_GLSLSANDBOX_PLAYER_TESTING config BR2_PACKAGE_GLSLSANDBOX_PLAYER_SCRIPTS bool "Install scripts" - depends on !BR2_PACKAGE_PYTHON # python3 depends on !BR2_STATIC_LIBS # python3 depends on BR2_TOOLCHAIN_HAS_THREADS # python3 depends on BR2_USE_MMU # bash, python3 -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:36 +0100 Subject: [Buildroot] [PATCH 010/107] package/docker-compose: drop reference to BR2_PACKAGE_PYTHON In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-11-peter@korsgaard.com> And adjust the comments to clarify that the toolchain dependencies are from python3. Signed-off-by: Peter Korsgaard --- package/docker-compose/Config.in | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/package/docker-compose/Config.in b/package/docker-compose/Config.in index 761befea4d..f82a0c4bc2 100644 --- a/package/docker-compose/Config.in +++ b/package/docker-compose/Config.in @@ -1,10 +1,9 @@ config BR2_PACKAGE_DOCKER_COMPOSE bool "docker-compose" - depends on !BR2_PACKAGE_PYTHON # python-paramiko -> python-bcrypt - depends on BR2_USE_MMU # python - depends on BR2_USE_WCHAR # python - depends on BR2_TOOLCHAIN_HAS_THREADS # python - depends on !BR2_STATIC_LIBS # python + depends on BR2_USE_MMU # python3 + depends on BR2_USE_WCHAR # python3 + depends on BR2_TOOLCHAIN_HAS_THREADS # python3 + depends on !BR2_STATIC_LIBS # python3 # python-paramiko -> python-cryptography depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS select BR2_PACKAGE_PYTHON3 -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:45 +0100 Subject: [Buildroot] [PATCH 019/107] package/jack2: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-20-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/jack2/Config.in | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package/jack2/Config.in b/package/jack2/Config.in index f9de7be041..bc883190d5 100644 --- a/package/jack2/Config.in +++ b/package/jack2/Config.in @@ -37,9 +37,8 @@ config BR2_PACKAGE_JACK2_DBUS depends on BR2_USE_WCHAR # dbus-python, python select BR2_PACKAGE_DBUS select BR2_PACKAGE_DBUS_PYTHON - select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime help Build and use jackdbus. -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:41 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:41 +0100 Subject: [Buildroot] [PATCH 015/107] package/gpsd: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-16-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/gpsd/Config.in | 4 ++-- package/gpsd/gpsd.mk | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/package/gpsd/Config.in b/package/gpsd/Config.in index 1da9a5ce2a..b66d0952dd 100644 --- a/package/gpsd/Config.in +++ b/package/gpsd/Config.in @@ -81,8 +81,8 @@ config BR2_PACKAGE_GPSD_SQUELCH config BR2_PACKAGE_GPSD_PYTHON bool "build Python support and modules" - depends on BR2_USE_WCHAR # python - select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON + depends on BR2_USE_WCHAR # python3 + select BR2_PACKAGE_PYTHON3 help Python libraries and tools for the gpsd service daemon including gpsfake test harness. diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk index 636c6c95ba..4388b7e24d 100644 --- a/package/gpsd/gpsd.mk +++ b/package/gpsd/gpsd.mk @@ -194,10 +194,6 @@ ifeq ($(BR2_PACKAGE_PYTHON3),y) GPSD_SCONS_OPTS += \ python=yes \ python_libdir="/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages" -else ifeq ($(BR2_PACKAGE_PYTHON),y) -GPSD_SCONS_OPTS += \ - python=yes \ - python_libdir="/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages" else GPSD_SCONS_OPTS += python=no endif -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:42 +0100 Subject: [Buildroot] [PATCH 016/107] package/gst1-devtools: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-17-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-devtools/Config.in | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package/gstreamer1/gst1-devtools/Config.in b/package/gstreamer1/gst1-devtools/Config.in index 55cf25d53e..3f39beff53 100644 --- a/package/gstreamer1/gst1-devtools/Config.in +++ b/package/gstreamer1/gst1-devtools/Config.in @@ -1,11 +1,10 @@ config BR2_PACKAGE_GST1_DEVTOOLS bool "gst1-devtools" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_GSTREAMER1_CHECK select BR2_PACKAGE_GST1_PLUGINS_BASE select BR2_PACKAGE_JSON_GLIB - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_PYEXPAT # cairo is autodetected but needs PNG support select BR2_PACKAGE_CAIRO_PNG if BR2_PACKAGE_CAIRO help @@ -14,5 +13,4 @@ config BR2_PACKAGE_GST1_DEVTOOLS https://gstreamer.freedesktop.org comment "gst1-devtools depends on python" - depends on !BR2_PACKAGE_PYTHON depends on !BR2_PACKAGE_PYTHON3 -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:44 +0100 Subject: [Buildroot] [PATCH 018/107] package/iotop: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-19-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/iotop/Config.in | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/package/iotop/Config.in b/package/iotop/Config.in index ada6131606..460503b9d7 100644 --- a/package/iotop/Config.in +++ b/package/iotop/Config.in @@ -1,11 +1,10 @@ -comment "iotop depends on python or python3" - depends on !BR2_PACKAGE_PYTHON && !BR2_PACKAGE_PYTHON3 +comment "iotop depends on python3" + depends on !BR2_PACKAGE_PYTHON3 config BR2_PACKAGE_IOTOP bool "iotop" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 - select BR2_PACKAGE_PYTHON_CURSES if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_CURSES if BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_CURSES help iotop does for I/O usage what top does for CPU usage. -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:47 +0100 Subject: [Buildroot] [PATCH 021/107] package/libcec: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-22-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/libcec/libcec.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libcec/libcec.mk b/package/libcec/libcec.mk index 6591bc009a..8b5d70d008 100644 --- a/package/libcec/libcec.mk +++ b/package/libcec/libcec.mk @@ -20,8 +20,8 @@ ifeq ($(BR2_PACKAGE_HAS_UDEV),y) LIBCEC_DEPENDENCIES += udev endif -ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) -LIBCEC_DEPENDENCIES += host-swig $(if $(BR2_PACKAGE_PYTHON3),python3,python) +ifeq ($(BR2_PACKAGE_PYTHON3),y) +LIBCEC_DEPENDENCIES += host-swig python3 endif ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:46 +0100 Subject: [Buildroot] [PATCH 020/107] package/kmod: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-21-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/kmod/kmod.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk index c7f510ec0f..82e8597759 100644 --- a/package/kmod/kmod.mk +++ b/package/kmod/kmod.mk @@ -62,8 +62,8 @@ else KMOD_CONF_OPTS += --without-openssl endif -ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) -KMOD_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,python3) +ifeq ($(BR2_PACKAGE_PYTHON3),y) +KMOD_DEPENDENCIES += python3 KMOD_CONF_OPTS += --enable-python endif -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:48 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:48 +0100 Subject: [Buildroot] [PATCH 022/107] package/libevent: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-23-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/libevent/libevent.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libevent/libevent.mk b/package/libevent/libevent.mk index 93ba88ca88..4c23156f72 100644 --- a/package/libevent/libevent.mk +++ b/package/libevent/libevent.mk @@ -25,7 +25,7 @@ endef # libevent installs a python script to target - get rid of it if we # don't have python support enabled -ifneq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) +ifneq ($(BR2_PACKAGE_PYTHON3),y) LIBEVENT_POST_INSTALL_TARGET_HOOKS += LIBEVENT_REMOVE_PYSCRIPT endif -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:49 +0100 Subject: [Buildroot] [PATCH 023/107] package/libftdi1: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-24-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/libftdi1/Config.in | 2 +- package/libftdi1/libftdi1.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libftdi1/Config.in b/package/libftdi1/Config.in index 2d32573563..ec91366115 100644 --- a/package/libftdi1/Config.in +++ b/package/libftdi1/Config.in @@ -24,7 +24,7 @@ comment "libftdipp1 needs a toolchain w/ C++, wchar" config BR2_PACKAGE_LIBFTDI1_PYTHON_BINDINGS bool "python bindings" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 help Python bindings for libftdi diff --git a/package/libftdi1/libftdi1.mk b/package/libftdi1/libftdi1.mk index 6688694b47..d2e3f42e14 100644 --- a/package/libftdi1/libftdi1.mk +++ b/package/libftdi1/libftdi1.mk @@ -24,7 +24,7 @@ LIBFTDI1_CONF_OPTS += -DFTDIPP=OFF endif ifeq ($(BR2_PACKAGE_LIBFTDI1_PYTHON_BINDINGS),y) -LIBFTDI1_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,python3) host-swig +LIBFTDI1_DEPENDENCIES += python3 host-swig LIBFTDI1_CONF_OPTS += -DPYTHON_BINDINGS=ON else LIBFTDI1_CONF_OPTS += -DPYTHON_BINDINGS=OFF -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:53 +0100 Subject: [Buildroot] [PATCH 027/107] package/libsoc: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-28-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/libsoc/libsoc.mk | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/package/libsoc/libsoc.mk b/package/libsoc/libsoc.mk index bbc33143cc..95753b8b68 100644 --- a/package/libsoc/libsoc.mk +++ b/package/libsoc/libsoc.mk @@ -12,12 +12,8 @@ LIBSOC_AUTORECONF = YES LIBSOC_INSTALL_STAGING = YES LIBSOC_DEPENDENCIES = host-pkgconf -# Install Python 2 bindings -ifeq ($(BR2_PACKAGE_PYTHON),y) -LIBSOC_DEPENDENCIES += python -LIBSOC_CONF_OPTS += --enable-python=2 # Install Python 3 bindings -else ifeq ($(BR2_PACKAGE_PYTHON3),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) LIBSOC_DEPENDENCIES += python3 LIBSOC_CONF_OPTS += --enable-python=3 else -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:50 +0100 Subject: [Buildroot] [PATCH 024/107] package/libiio: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-25-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/libiio/Config.in | 2 +- package/libiio/libiio.mk | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/package/libiio/Config.in b/package/libiio/Config.in index 0d89331c89..98d663e203 100644 --- a/package/libiio/Config.in +++ b/package/libiio/Config.in @@ -91,7 +91,7 @@ config BR2_PACKAGE_LIBIIO_BINDINGS_CSHARP config BR2_PACKAGE_LIBIIO_BINDINGS_PYTHON bool "Install Python bindings" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 help Install the Python bindings. diff --git a/package/libiio/libiio.mk b/package/libiio/libiio.mk index a4fe0d4541..48e2f385e3 100644 --- a/package/libiio/libiio.mk +++ b/package/libiio/libiio.mk @@ -73,14 +73,10 @@ LIBIIO_CONF_OPTS += -DHAVE_DNS_SD=OFF 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 +LIBIIO_CONF_OPTS += \ + -DPYTHON_BINDINGS=ON + -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 else LIBIIO_CONF_OPTS += -DPYTHON_BINDINGS=OFF endif -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:54 +0100 Subject: [Buildroot] [PATCH 028/107] package/lttng-libust: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-29-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/lttng-libust/lttng-libust.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/package/lttng-libust/lttng-libust.mk b/package/lttng-libust/lttng-libust.mk index ef7d1a6200..7ead28052e 100644 --- a/package/lttng-libust/lttng-libust.mk +++ b/package/lttng-libust/lttng-libust.mk @@ -20,10 +20,7 @@ LTTNG_LIBUST_AUTORECONF = YES # https://www.mail-archive.com/lttng-dev at lists.lttng.org/msg12950.html LTTNG_LIBUST_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -DUATOMIC_NO_LINK_ERROR" -ifeq ($(BR2_PACKAGE_PYTHON),y) -LTTNG_LIBUST_DEPENDENCIES += python -LTTNG_LIBUST_CONF_OPTS += --enable-python-agent -else ifeq ($(BR2_PACKAGE_PYTHON3),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) LTTNG_LIBUST_DEPENDENCIES += python3 LTTNG_LIBUST_CONF_OPTS += --enable-python-agent else -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:55 +0100 Subject: [Buildroot] [PATCH 029/107] package/networkd-dispatcher: drop reference to python2 In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-30-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/networkd-dispatcher/Config.in | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/networkd-dispatcher/Config.in b/package/networkd-dispatcher/Config.in index ab8c473951..54b48e4ca8 100644 --- a/package/networkd-dispatcher/Config.in +++ b/package/networkd-dispatcher/Config.in @@ -4,7 +4,6 @@ config BR2_PACKAGE_NETWORKD_DISPATCHER 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 @@ -23,7 +22,6 @@ config BR2_PACKAGE_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 -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:56 +0100 Subject: [Buildroot] [PATCH 030/107] package/nftables: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-31-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/nftables/nftables.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/nftables/nftables.mk b/package/nftables/nftables.mk index d5c16ac2be..232d541488 100644 --- a/package/nftables/nftables.mk +++ b/package/nftables/nftables.mk @@ -35,9 +35,9 @@ else NFTABLES_CONF_OPTS += --without-json endif -ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) NFTABLES_CONF_OPTS += --enable-python -NFTABLES_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,python3) +NFTABLES_DEPENDENCIES += python3 else NFTABLES_CONF_OPTS += --disable-python endif -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:52 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:52 +0100 Subject: [Buildroot] [PATCH 026/107] package/libsigrokdecode: drop reference to python2 In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-27-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/libsigrokdecode/Config.in | 6 ------ 1 file changed, 6 deletions(-) diff --git a/package/libsigrokdecode/Config.in b/package/libsigrokdecode/Config.in index 28cbb5ca5e..b58c8a2a29 100644 --- a/package/libsigrokdecode/Config.in +++ b/package/libsigrokdecode/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_LIBSIGROKDECODE bool "libsigrokdecode" - depends on !BR2_PACKAGE_PYTHON # python3 depends on BR2_USE_WCHAR # libglib2/python3 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2/python3 depends on BR2_USE_MMU # libglib2/python3 @@ -19,9 +18,4 @@ config BR2_PACKAGE_LIBSIGROKDECODE comment "libsigrokdecode needs a toolchain w/ wchar, threads, dynamic library" depends on BR2_USE_MMU - depends on !BR2_PACKAGE_PYTHON depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS - -comment "libsigrokdecode is not compatible with python" - depends on BR2_USE_MMU - depends on BR2_PACKAGE_PYTHON -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:58 +0100 Subject: [Buildroot] [PATCH 032/107] package/opkg-utils: drop reference to python2 In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-33-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/opkg-utils/Config.in | 6 ------ 1 file changed, 6 deletions(-) diff --git a/package/opkg-utils/Config.in b/package/opkg-utils/Config.in index 3c5a3ee347..2973055baf 100644 --- a/package/opkg-utils/Config.in +++ b/package/opkg-utils/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_OPKG_UTILS depends on BR2_USE_WCHAR # python3 depends on BR2_TOOLCHAIN_HAS_THREADS # python3 <- libffi depends on !BR2_STATIC_LIBS # python3 - depends on !BR2_PACKAGE_PYTHON # python3 select BR2_PACKAGE_BINUTILS if !BR2_PACKAGE_BUSYBOX # runtime select BR2_PACKAGE_BINUTILS_TARGET if !BR2_PACKAGE_BUSYBOX # runtime select BR2_PACKAGE_COREUTILS if !BR2_PACKAGE_BUSYBOX # runtime @@ -27,8 +26,3 @@ comment "opkg-utils needs a toolchain w/ wchar, threads, dynamic library" depends on !BR2_nios2 || BR2_PACKAGE_BUSYBOX depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS - -comment "opkg-utils needs python3" - depends on !BR2_nios2 || BR2_PACKAGE_BUSYBOX - depends on BR2_USE_MMU - depends on BR2_PACKAGE_PYTHON -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:59 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:59 +0100 Subject: [Buildroot] [PATCH 033/107] package/owfs: drop python support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-34-peter@korsgaard.com> The python support only works with python2, so drop it. Notice that there is a PR adding python3 support, but it is not yet merged: https://github.com/owfs/owfs/pull/32 Signed-off-by: Peter Korsgaard --- package/owfs/owfs.mk | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/package/owfs/owfs.mk b/package/owfs/owfs.mk index 7c69a5251b..986dca921a 100644 --- a/package/owfs/owfs.mk +++ b/package/owfs/owfs.mk @@ -67,30 +67,8 @@ else OWFS_CONF_OPTS += --disable-avahi endif -# setup.py isn't python3 compliant -ifeq ($(BR2_PACKAGE_PYTHON),y) -OWFS_CONF_OPTS += \ - --enable-owpython \ - --with-python \ - --with-pythonconfig=$(STAGING_DIR)/usr/bin/python-config -OWFS_MAKE_ENV += \ - CC="$(TARGET_CC)" \ - PYTHONPATH="$(PYTHON_PATH)" \ - _python_sysroot=$(STAGING_DIR) \ - _python_prefix=/usr \ - _python_exec_prefix=/usr -OWFS_DEPENDENCIES += python host-swig -# The configure scripts finds PYSITEDIR as the python_lib directory of -# host-python, and then prepends DESTDIR in front of it. So we end up -# installing things in $(TARGET_DIR)/$(HOST_DIR)/lib/python which is -# clearly wrong. -# Patching owfs to do the right thing is not trivial, it's much easier to -# override the PYSITEDIR variable in make. -OWFS_EXTRA_MAKE_OPTS += PYSITEDIR=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages - -else +# python2 only (https://github.com/owfs/owfs/pull/32) OWFS_CONF_OPTS += --disable-owpython --without-python -endif ifeq ($(BR2_STATIC_LIBS),y) # zeroconf support uses dlopen() -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:57 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:57 +0100 Subject: [Buildroot] [PATCH 031/107] package/ogre: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-32-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/ogre/ogre.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package/ogre/ogre.mk b/package/ogre/ogre.mk index 72fd616c0c..3fd2fc4650 100644 --- a/package/ogre/ogre.mk +++ b/package/ogre/ogre.mk @@ -42,9 +42,8 @@ OGRE_CONF_OPTS = -DOGRE_BUILD_DEPENDENCIES=OFF \ -DCMAKE_CXX_FLAGS="$(OGRE_CXXFLAGS)" # Enable optional python component if python interpreter is present on the target. -ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) -OGRE_DEPENDENCIES += host-swig \ - $(if $(BR2_PACKAGE_PYTHON3),host-python3,host-python) +ifeq ($(BR2_PACKAGE_PYTHON3),y) +OGRE_DEPENDENCIES += host-swig host-python3 OGRE_CONF_OPTS += -DOGRE_BUILD_COMPONENT_PYTHON=ON else OGRE_CONF_OPTS += -DOGRE_BUILD_COMPONENT_PYTHON=OFF -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:04 +0100 Subject: [Buildroot] [PATCH 038/107] package/python-couchdb: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-39-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-couchdb/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-couchdb/Config.in b/package/python-couchdb/Config.in index 9156883b38..5bff75750b 100644 --- a/package/python-couchdb/Config.in +++ b/package/python-couchdb/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_COUCHDB bool "python-couchdb" - select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_SSL # runtime help Python client library for working with CouchDB. -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:05 +0100 Subject: [Buildroot] [PATCH 039/107] package/python-dicttoxml: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-40-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-dicttoxml/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-dicttoxml/Config.in b/package/python-dicttoxml/Config.in index e38a5f7909..145887eddc 100644 --- a/package/python-dicttoxml/Config.in +++ b/package/python-dicttoxml/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_DICTTOXML bool "python-dicttoxml" - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_PYEXPAT help Converts a Python dictionary or other native data type into a valid XML string. -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:01 +0100 Subject: [Buildroot] [PATCH 035/107] package/python-argon2-cffi: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-36-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-argon2-cffi/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/python-argon2-cffi/Config.in b/package/python-argon2-cffi/Config.in index 16bbe6c4e3..5cddb3314e 100644 --- a/package/python-argon2-cffi/Config.in +++ b/package/python-argon2-cffi/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_PYTHON_ARGON2_CFFI depends on BR2_USE_MMU # libargon2 depends on !BR2_STATIC_LIBS # libargon2 select BR2_PACKAGE_PYTHON_CFFI # runtime - select BR2_PACKAGE_PYTHON_ENUM34 if BR2_PACKAGE_PYTHON # runtime select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_LIBARGON2 help -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:06 +0100 Subject: [Buildroot] [PATCH 040/107] package/python-dpkt: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-41-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-dpkt/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-dpkt/Config.in b/package/python-dpkt/Config.in index 9bd7a98d26..819d0fb613 100644 --- a/package/python-dpkt/Config.in +++ b/package/python-dpkt/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_DPKT bool "python-dpkt" - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_ZLIB # runtime help Fast, simple packet creation / parsing, with definitions for the basic TCP/IP protocols. -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:02 +0100 Subject: [Buildroot] [PATCH 036/107] package/python-bsdiff4: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-37-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-bsdiff4/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-bsdiff4/Config.in b/package/python-bsdiff4/Config.in index a383cda0f5..32070fb9a8 100644 --- a/package/python-bsdiff4/Config.in +++ b/package/python-bsdiff4/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_BSDIFF4 bool "python-bsdiff4" - select BR2_PACKAGE_PYTHON_BZIP2 if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_BZIP2 if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_BZIP2 # runtime help binary diff and patch using the BSDIFF4-format. -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:08 +0100 Subject: [Buildroot] [PATCH 042/107] package/python-fire: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-43-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-fire/Config.in | 1 - package/python-fire/python-fire.mk | 9 --------- 2 files changed, 10 deletions(-) diff --git a/package/python-fire/Config.in b/package/python-fire/Config.in index b718ddac5e..9c816b0fd0 100644 --- a/package/python-fire/Config.in +++ b/package/python-fire/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_PYTHON_FIRE bool "python-fire" select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_TERMCOLOR # runtime - select BR2_PACKAGE_PYTHON_ENUM34 if BR2_PACKAGE_PYTHON # runtime help A library for automatically generating command line interfaces. diff --git a/package/python-fire/python-fire.mk b/package/python-fire/python-fire.mk index 7ba971abc4..40631fce86 100644 --- a/package/python-fire/python-fire.mk +++ b/package/python-fire/python-fire.mk @@ -11,13 +11,4 @@ PYTHON_FIRE_SETUP_TYPE = setuptools PYTHON_FIRE_LICENSE = Apache-2.0 PYTHON_FIRE_LICENSE_FILES = LICENSE -ifeq ($(BR2_PACKAGE_PYTHON),y) -# only needed/valid for python 3.x -define PYTHON_FIRE_RM_PY3_FILE - rm -f $(TARGET_DIR)/usr/lib/python*/site-packages/fire/test_components_py3.py -endef - -PYTHON_FIRE_POST_INSTALL_TARGET_HOOKS += PYTHON_FIRE_RM_PY3_FILE -endif - $(eval $(python-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:03 +0100 Subject: [Buildroot] [PATCH 037/107] package/python-can: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-38-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-can/Config.in | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/package/python-can/Config.in b/package/python-can/Config.in index 3d06374c6a..dc9eb0ae4e 100644 --- a/package/python-can/Config.in +++ b/package/python-can/Config.in @@ -1,13 +1,10 @@ config BR2_PACKAGE_PYTHON_CAN bool "python-can" select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime - select BR2_PACKAGE_PYTHON_SQLITE if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_SQLITE if BR2_PACKAGE_PYTHON3 # runtime - select BR2_PACKAGE_PYTHON_TYPING if BR2_PACKAGE_PYTHON # runtime + select BR2_PACKAGE_PYTHON3_SQLITE # runtime select BR2_PACKAGE_PYTHON_AENUM # runtime select BR2_PACKAGE_PYTHON_WRAPT # runtime - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_ZLIB help This module provides controller area network support for Python. -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:07 +0100 Subject: [Buildroot] [PATCH 041/107] package/python-esptool: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-42-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-esptool/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-esptool/Config.in b/package/python-esptool/Config.in index 570f9aa42f..b21ccd72d5 100644 --- a/package/python-esptool/Config.in +++ b/package/python-esptool/Config.in @@ -3,8 +3,7 @@ config BR2_PACKAGE_PYTHON_ESPTOOL select BR2_PACKAGE_PYTHON_ECDSA # runtime select BR2_PACKAGE_PYTHON_PYAES # runtime select BR2_PACKAGE_PYTHON_SERIAL # runtime - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_ZLIB help A serial utility to communicate & flash code to Espressif ESP8266 & ESP32 chips. -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:09 +0100 Subject: [Buildroot] [PATCH 043/107] package/python-flask: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-44-peter@korsgaard.com> The package alredy depended on python3, so no functional change. Signed-off-by: Peter Korsgaard --- package/python-flask/Config.in | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/package/python-flask/Config.in b/package/python-flask/Config.in index 56bfe10f01..8a44bf2db4 100644 --- a/package/python-flask/Config.in +++ b/package/python-flask/Config.in @@ -1,15 +1,12 @@ config BR2_PACKAGE_PYTHON_FLASK bool "python-flask" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_CLICK # runtime select BR2_PACKAGE_PYTHON_JINJA2 # runtime select BR2_PACKAGE_PYTHON_WERKZEUG # runtime select BR2_PACKAGE_PYTHON_ITSDANGEROUS # runtime select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime - select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_SSL + select BR2_PACKAGE_PYTHON3_ZLIB help Flask is a microframework for Python based on Werkzeug, Jinja 2 and good intentions. -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:10 +0100 Subject: [Buildroot] [PATCH 044/107] package/python-jsonschema: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-45-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-jsonschema/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/python-jsonschema/Config.in b/package/python-jsonschema/Config.in index b547f4ae1a..7002653722 100644 --- a/package/python-jsonschema/Config.in +++ b/package/python-jsonschema/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_JSONSCHEMA bool "python-jsonschema" - select BR2_PACKAGE_PYTHON_FUNCTOOLS32 if BR2_PACKAGE_PYTHON # runtime help An implementation of JSON Schema validation for Python. -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:16 +0100 Subject: [Buildroot] [PATCH 050/107] package/python-pickleshare: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-51-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-pickleshare/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/python-pickleshare/Config.in b/package/python-pickleshare/Config.in index 35a26637a5..18391b7ce8 100644 --- a/package/python-pickleshare/Config.in +++ b/package/python-pickleshare/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PICKLESHARE bool "python-pickleshare" - select BR2_PACKAGE_PYTHON_PATHLIB2 if BR2_PACKAGE_PYTHON # runtime help Tiny 'shelve'-like database with concurrency support -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:15 +0100 Subject: [Buildroot] [PATCH 049/107] package/python-pexpect: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-50-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-pexpect/python-pexpect.mk | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/package/python-pexpect/python-pexpect.mk b/package/python-pexpect/python-pexpect.mk index a9609cbe79..3efda26825 100644 --- a/package/python-pexpect/python-pexpect.mk +++ b/package/python-pexpect/python-pexpect.mk @@ -11,14 +11,4 @@ PYTHON_PEXPECT_LICENSE = ISC PYTHON_PEXPECT_LICENSE_FILES = LICENSE PYTHON_PEXPECT_SETUP_TYPE = distutils -# async.py is not usable with Python 2, and removing is the solution -# recommended by upstream: -# https://github.com/pexpect/pexpect/issues/290 -ifeq ($(BR2_PACKAGE_PYTHON),y) -define PYTHON_PEXPECT_REMOVE_ASYNC_PY - $(RM) $(@D)/pexpect/_async.py -endef -PYTHON_PEXPECT_POST_PATCH_HOOKS += PYTHON_PEXPECT_REMOVE_ASYNC_PY -endif - $(eval $(python-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:17 +0100 Subject: [Buildroot] [PATCH 051/107] package/python-pymodbus: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-52-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-pymodbus/python-pymodbus.mk | 9 --------- 1 file changed, 9 deletions(-) diff --git a/package/python-pymodbus/python-pymodbus.mk b/package/python-pymodbus/python-pymodbus.mk index 9135a4d0c4..d96e21a55c 100644 --- a/package/python-pymodbus/python-pymodbus.mk +++ b/package/python-pymodbus/python-pymodbus.mk @@ -11,13 +11,4 @@ PYTHON_PYMODBUS_SETUP_TYPE = setuptools PYTHON_PYMODBUS_LICENSE = BSD-3-Clause PYTHON_PYMODBUS_LICENSE_FILES = doc/LICENSE -ifeq ($(BR2_PACKAGE_PYTHON),y) -# only needed/valid for python 3.x -define PYTHON_PYMODBUS_RM_PY3_FILES - rm -rf $(TARGET_DIR)/usr/lib/python*/site-packages/pymodbus/client/asynchronous/asyncio -endef - -PYTHON_PYMODBUS_POST_INSTALL_TARGET_HOOKS += PYTHON_PYMODBUS_RM_PY3_FILES -endif - $(eval $(python-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:13 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:13 +0100 Subject: [Buildroot] [PATCH 047/107] package/python-lxml: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-48-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-lxml/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-lxml/Config.in b/package/python-lxml/Config.in index fcb30d56ee..3f3cb5c550 100644 --- a/package/python-lxml/Config.in +++ b/package/python-lxml/Config.in @@ -2,8 +2,7 @@ config BR2_PACKAGE_PYTHON_LXML bool "python-lxml" select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_LIBXSLT - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_ZLIB help The lxml XML toolkit is a Pythonic binding for the C libraries libxml2 and libxslt. -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:18 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:18 +0100 Subject: [Buildroot] [PATCH 052/107] package/python-pyqrcode: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-53-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-pyqrcode/Config.in | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package/python-pyqrcode/Config.in b/package/python-pyqrcode/Config.in index 01b7ae8132..d07ab4965a 100644 --- a/package/python-pyqrcode/Config.in +++ b/package/python-pyqrcode/Config.in @@ -1,9 +1,7 @@ config BR2_PACKAGE_PYTHON_PYQRCODE bool "python-pyqrcode" - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime - select BR2_PACKAGE_PYTHON_CODECSCJK if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_CODECSCJK if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime + select BR2_PACKAGE_PYTHON3_CODECSCJK # runtime help A QR code generator written purely in Python with SVG, EPS, PNG and terminal output. -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:20 +0100 Subject: [Buildroot] [PATCH 054/107] package/python-pyroute2: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-55-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-pyroute2/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-pyroute2/Config.in b/package/python-pyroute2/Config.in index 5df0a63d4b..9e685f9d1e 100644 --- a/package/python-pyroute2/Config.in +++ b/package/python-pyroute2/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_PYROUTE2 bool "python-pyroute2" - select BR2_PACKAGE_PYTHON_SQLITE if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_SQLITE if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_SQLITE help Python netlink library - Linux network / netns / wireless / ipset configuration. -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:14 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:14 +0100 Subject: [Buildroot] [PATCH 048/107] package/python-m2crypto: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-49-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-m2crypto/Config.in | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/package/python-m2crypto/Config.in b/package/python-m2crypto/Config.in index 7481d49e5c..af710d5351 100644 --- a/package/python-m2crypto/Config.in +++ b/package/python-m2crypto/Config.in @@ -1,11 +1,8 @@ config BR2_PACKAGE_PYTHON_M2CRYPTO bool "python-m2crypto" select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime - select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 # runtime - select BR2_PACKAGE_PYTHON_TYPING if BR2_PACKAGE_PYTHON # runtime + select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime + select BR2_PACKAGE_PYTHON3_SSL # runtime help M2Crypto: A Python crypto and SSL toolkit. -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:19 +0100 Subject: [Buildroot] [PATCH 053/107] package/python-pyqt5: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-54-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-pyqt5/python-pyqt5.mk | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/package/python-pyqt5/python-pyqt5.mk b/package/python-pyqt5/python-pyqt5.mk index b05043563e..af32f63796 100644 --- a/package/python-pyqt5/python-pyqt5.mk +++ b/package/python-pyqt5/python-pyqt5.mk @@ -19,14 +19,6 @@ PYTHON_PYQT5_MODULES = \ $(if $(BR2_PACKAGE_QT5BASE_PRINTSUPPORT),QtPrintSupport) \ $(if $(BR2_PACKAGE_QT5BASE_XML),QtXml) -ifeq ($(BR2_PACKAGE_PYTHON),y) -PYTHON_PYQT5_PYTHON_DIR = python$(PYTHON_VERSION_MAJOR) -PYTHON_PYQT5_RM_PORT_BASE = port_v3 -else ifeq ($(BR2_PACKAGE_PYTHON3),y) -PYTHON_PYQT5_PYTHON_DIR = python$(PYTHON3_VERSION_MAJOR) -PYTHON_PYQT5_RM_PORT_BASE = port_v2 -endif - ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS),y) PYTHON_PYQT5_MODULES += QtWidgets @@ -159,7 +151,7 @@ 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 \ + --destdir $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ --qmake $(HOST_DIR)/bin/qmake \ --sysroot $(STAGING_DIR)/usr \ -w --confirm-license \ @@ -186,8 +178,8 @@ endef # __init__.pyc is needed if BR2_PACKAGE_PYTHON_PYC_ONLY is set define PYTHON_PYQT5_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) install - touch $(TARGET_DIR)/usr/lib/$(PYTHON_PYQT5_PYTHON_DIR)/site-packages/PyQt5/__init__.py - $(RM) -rf $(TARGET_DIR)/usr/lib/$(PYTHON_PYQT5_PYTHON_DIR)/site-packages/PyQt5/uic/$(PYTHON_PYQT5_RM_PORT_BASE) + touch $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/PyQt5/__init__.py + $(RM) -rf $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/PyQt5/uic/port_v2 endef $(eval $(generic-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:21 +0100 Subject: [Buildroot] [PATCH 055/107] package/python-pyudev: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-56-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-pyudev/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-pyudev/Config.in b/package/python-pyudev/Config.in index fb853956e8..e0da067cc2 100644 --- a/package/python-pyudev/Config.in +++ b/package/python-pyudev/Config.in @@ -1,8 +1,7 @@ config BR2_PACKAGE_PYTHON_PYUDEV bool "python-pyudev" depends on BR2_PACKAGE_HAS_UDEV - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_ZLIB # runtime select BR2_PACKAGE_PYTHON_SIX # runtime help pyudev is a LGPL licenced, pure Python 2/3 binding to -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:40 +0100 Subject: [Buildroot] [PATCH 074/107] package/ranger: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-75-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/ranger/Config.in | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package/ranger/Config.in b/package/ranger/Config.in index ee0ffecd13..a379002f95 100644 --- a/package/ranger/Config.in +++ b/package/ranger/Config.in @@ -4,9 +4,8 @@ config BR2_PACKAGE_RANGER depends on BR2_USE_WCHAR # python3 depends on BR2_TOOLCHAIN_HAS_THREADS # python3 depends on !BR2_STATIC_LIBS # python3 - select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON_CURSES if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_CURSES if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_CURSES help ranger is a console file manager with VI key bindings. It provides a minimalistic and nice curses interface with a -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:41 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:41 +0100 Subject: [Buildroot] [PATCH 075/107] package/selinux-python: drop reference to python2 In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-76-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/selinux-python/Config.in | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/selinux-python/Config.in b/package/selinux-python/Config.in index 6a518f97d4..ad50cc0735 100644 --- a/package/selinux-python/Config.in +++ b/package/selinux-python/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_SELINUX_PYTHON bool "selinux-python" - depends on !BR2_PACKAGE_PYTHON depends on BR2_USE_MMU depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS @@ -46,10 +45,6 @@ comment "sepolgen needs a toolchain w/ gcc 5" endif -comment "selinux-python needs python3" - depends on BR2_USE_MMU - depends on BR2_PACKAGE_PYTHON - comment "selinux-python packages needs a toolchain w/ wchar, threads, dynamic library" depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:43 +0100 Subject: [Buildroot] [PATCH 077/107] package/supervisor: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-78-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/supervisor/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/supervisor/Config.in b/package/supervisor/Config.in index 7ca3cae134..8ba19dc000 100644 --- a/package/supervisor/Config.in +++ b/package/supervisor/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_SUPERVISOR bool "supervisor" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime dependency help A client/server system that allows its users to control a @@ -9,5 +9,4 @@ config BR2_PACKAGE_SUPERVISOR http://supervisord.org/ comment "supervisor needs a python interpreter" - depends on !BR2_PACKAGE_PYTHON depends on !BR2_PACKAGE_PYTHON3 -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:46 +0100 Subject: [Buildroot] [PATCH 080/107] package/tovid: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-81-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/tovid/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/tovid/Config.in b/package/tovid/Config.in index f972e18852..3dbb0e229e 100644 --- a/package/tovid/Config.in +++ b/package/tovid/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_TOVID depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # mpv depends on BR2_TOOLCHAIN_HAS_ATOMIC # mpv @@ -40,8 +40,8 @@ comment "tovid needs a toolchain w/ threads, C++, wchar, gcc >= 4.9" || !BR2_USE_WCHAR depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC -comment "tovid depends on python or python3" - depends on !BR2_PACKAGE_PYTHON && !BR2_PACKAGE_PYTHON3 +comment "tovid depends on python3" + depends on !BR2_PACKAGE_PYTHON3 depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_TOOLCHAIN_HAS_SYNC_4 -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:44 +0100 Subject: [Buildroot] [PATCH 078/107] package/suricata: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-79-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/suricata/suricata.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/suricata/suricata.mk b/package/suricata/suricata.mk index 3255fd35a1..86d8970178 100644 --- a/package/suricata/suricata.mk +++ b/package/suricata/suricata.mk @@ -116,9 +116,9 @@ else SURICATA_CONF_OPTS += --disable-luajit endif -ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) SURICATA_CONF_OPTS += --enable-python -SURICATA_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,python3) +SURICATA_DEPENDENCIES += python3 else SURICATA_CONF_OPTS += --disable-python endif -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:47 +0100 Subject: [Buildroot] [PATCH 081/107] package/trace-cmd: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-82-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/trace-cmd/trace-cmd.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/package/trace-cmd/trace-cmd.mk b/package/trace-cmd/trace-cmd.mk index d9ed417f20..fe0cd71ec4 100644 --- a/package/trace-cmd/trace-cmd.mk +++ b/package/trace-cmd/trace-cmd.mk @@ -18,10 +18,7 @@ ifeq ($(BR2_PACKAGE_AUDIT),y) TRACE_CMD_DEPENDENCIES += audit endif -ifeq ($(BR2_PACKAGE_PYTHON),y) -TRACE_CMD_DEPENDENCIES += python host-swig -TRACE_CMD_MAKE_OPTS += PYTHON_VERS=python -else ifeq ($(BR2_PACKAGE_PYTHON3),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) TRACE_CMD_DEPENDENCIES += python3 host-swig TRACE_CMD_MAKE_OPTS += PYTHON_VERS=python3 else -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:48 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:48 +0100 Subject: [Buildroot] [PATCH 082/107] package/util-linux: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-83-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/util-linux/util-linux.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 5a4ff64d01..1ca605f3fb 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -241,9 +241,9 @@ HOST_UTIL_LINUX_CONF_OPTS += --disable-all-programs endif # Install libmount Python bindings -ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) UTIL_LINUX_CONF_OPTS += --with-python -UTIL_LINUX_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,python3) +UTIL_LINUX_DEPENDENCIES += python3 ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBMOUNT),y) UTIL_LINUX_CONF_OPTS += --enable-pylibmount else -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:49 +0100 Subject: [Buildroot] [PATCH 083/107] package/zfs: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-84-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/zfs/zfs.mk | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/package/zfs/zfs.mk b/package/zfs/zfs.mk index 0e7e3e4e74..6b542f5c05 100644 --- a/package/zfs/zfs.mk +++ b/package/zfs/zfs.mk @@ -37,17 +37,7 @@ else ZFS_CONF_OPTS += --disable-systemd 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 host-python-packaging -ZFS_CONF_ENV += \ - PYTHON=$(HOST_DIR)/usr/bin/python2 \ - PYTHON_CPPFLAGS="`$(STAGING_DIR)/usr/bin/python2-config --includes`" \ - PYTHON_LIBS="`$(STAGING_DIR)/usr/bin/python2-config --ldflags`" \ - PYTHON_SITE_PKG="/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages" -ZFS_CONF_OPTS += --enable-pyzfs -else ifeq ($(BR2_PACKAGE_PYTHON3),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) ZFS_DEPENDENCIES += python3 python-setuptools host-python-cffi host-python-packaging ZFS_CONF_ENV += \ PYTHON=$(HOST_DIR)/usr/bin/python3 \ -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:51 +0100 Subject: [Buildroot] [PATCH 085/107] package/python-backports-abc: drop python2 specific package In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-86-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++++ package/Config.in | 1 - package/python-backports-abc/Config.in | 8 -------- .../python-backports-abc/python-backports-abc.hash | 5 ----- .../python-backports-abc/python-backports-abc.mk | 14 -------------- 5 files changed, 6 insertions(+), 28 deletions(-) delete mode 100644 package/python-backports-abc/Config.in delete mode 100644 package/python-backports-abc/python-backports-abc.hash delete mode 100644 package/python-backports-abc/python-backports-abc.mk diff --git a/Config.in.legacy b/Config.in.legacy index 6bc3803a5c..cc1ed8f9d5 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_BACKPORTS_ABC + bool "python-backports-abc removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON bool "python2.7 package removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index ca2fb363e3..46e6b30cdf 100644 --- a/package/Config.in +++ b/package/Config.in @@ -941,7 +941,6 @@ menu "External python modules" source "package/python-avro/Config.in" source "package/python-babel/Config.in" source "package/python-backcall/Config.in" - source "package/python-backports-abc/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-abc/Config.in b/package/python-backports-abc/Config.in deleted file mode 100644 index 43566279e8..0000000000 --- a/package/python-backports-abc/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PYTHON_BACKPORTS_ABC - bool "python-backports-abc" - depends on BR2_PACKAGE_PYTHON - help - A backport of recent additions to the 'collections.abc' - module. - - https://pypi.python.org/pypi/backports_abc diff --git a/package/python-backports-abc/python-backports-abc.hash b/package/python-backports-abc/python-backports-abc.hash deleted file mode 100644 index 4f4c9bd1fe..0000000000 --- a/package/python-backports-abc/python-backports-abc.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5 from https://pypi.python.org/pypi/backports_abc/json -md5 7d1936ec183a3586290adf60f6f96764 backports_abc-0.5.tar.gz -# Locally computed -sha256 033be54514a03e255df75c5aee8f9e672f663f93abb723444caec8fe43437bde backports_abc-0.5.tar.gz -sha256 0a4f3b38055f50f047a42521568fa6ddb9a5976c2884f6ae138796d0f71150ca LICENSE diff --git a/package/python-backports-abc/python-backports-abc.mk b/package/python-backports-abc/python-backports-abc.mk deleted file mode 100644 index 66cea1703e..0000000000 --- a/package/python-backports-abc/python-backports-abc.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-backports-abc -# -################################################################################ - -PYTHON_BACKPORTS_ABC_VERSION = 0.5 -PYTHON_BACKPORTS_ABC_SOURCE = backports_abc-$(PYTHON_BACKPORTS_ABC_VERSION).tar.gz -PYTHON_BACKPORTS_ABC_SITE = https://pypi.python.org/packages/68/3c/1317a9113c377d1e33711ca8de1e80afbaf4a3c950dd0edfaf61f9bfe6d8 -PYTHON_BACKPORTS_ABC_LICENSE = Python-2.0 -PYTHON_BACKPORTS_ABC_LICENSE_FILES = LICENSE -PYTHON_BACKPORTS_ABC_SETUP_TYPE = setuptools - -$(eval $(python-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:52 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:52 +0100 Subject: [Buildroot] [PATCH 086/107] package/python-backports-shutil-get-terminal-size: drop python2 specific package In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-87-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++++ DEVELOPERS | 1 - package/Config.in | 1 - .../Config.in | 8 -------- .../python-backports-shutil-get-terminal-size.hash | 5 ----- .../python-backports-shutil-get-terminal-size.mk | 14 -------------- 6 files changed, 6 insertions(+), 29 deletions(-) delete mode 100644 package/python-backports-shutil-get-terminal-size/Config.in delete mode 100644 package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.hash delete mode 100644 package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.mk diff --git a/Config.in.legacy b/Config.in.legacy index cc1ed8f9d5..89c095a388 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE + bool "python-backports-shutil-get-terminal-size removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_BACKPORTS_ABC bool "python-backports-abc removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 1d1cf99898..2fd8d4d010 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -143,7 +143,6 @@ N: Andreas Ziegler F: package/mpd/ N: Andrey Smirnov -F: package/python-backports-shutil-get-terminal-size/ F: package/python-decorator/ F: package/python-ipython-genutils/ F: package/python-pathlib2/ diff --git a/package/Config.in b/package/Config.in index 46e6b30cdf..fbfc876d89 100644 --- a/package/Config.in +++ b/package/Config.in @@ -941,7 +941,6 @@ menu "External python modules" source "package/python-avro/Config.in" source "package/python-babel/Config.in" source "package/python-backcall/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" source "package/python-beautifulsoup4/Config.in" diff --git a/package/python-backports-shutil-get-terminal-size/Config.in b/package/python-backports-shutil-get-terminal-size/Config.in deleted file mode 100644 index 392e05a282..0000000000 --- a/package/python-backports-shutil-get-terminal-size/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE - bool "python-backports-shutil-get-terminal-size" - depends on BR2_PACKAGE_PYTHON - help - A backport of the get_terminal_size function from Python - 3.3's shutil. - - https://pypi.python.org/pypi/backports.shutil_get_terminal_size diff --git a/package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.hash b/package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.hash deleted file mode 100644 index 40883a4e3b..0000000000 --- a/package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5 from https://pypi.python.org/pypi/backports.shutil_get_terminal_size/json -md5 03267762480bd86b50580dc19dff3c66 backports.shutil_get_terminal_size-1.0.0.tar.gz -# Locally computed -sha256 713e7a8228ae80341c70586d1cc0a8caa5207346927e23d09dcbcaf18eadec80 backports.shutil_get_terminal_size-1.0.0.tar.gz -sha256 9edd99f8c339cddbfe36a9707e671fccf245b3e50b80eec0877dccec87a2dfe4 LICENSE diff --git a/package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.mk b/package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.mk deleted file mode 100644 index 7c24b196f2..0000000000 --- a/package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-backports-shutil-get-terminal-size -# -################################################################################ - -PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE_VERSION = 1.0.0 -PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE_SOURCE = backports.shutil_get_terminal_size-$(PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE_VERSION).tar.gz -PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE_SITE = https://pypi.python.org/packages/ec/9c/368086faa9c016efce5da3e0e13ba392c9db79e3ab740b763fe28620b18b -PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE_SETUP_TYPE = setuptools -PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE_LICENSE = MIT -PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE_LICENSE_FILES = LICENSE - -$(eval $(python-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:54 +0100 Subject: [Buildroot] [PATCH 088/107] package/python-futures: drop python2 specific package In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-89-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/python-futures/Config.in | 7 ------- package/python-futures/python-futures.hash | 5 ----- package/python-futures/python-futures.mk | 14 -------------- 6 files changed, 6 insertions(+), 28 deletions(-) delete mode 100644 package/python-futures/Config.in delete mode 100644 package/python-futures/python-futures.hash delete mode 100644 package/python-futures/python-futures.mk diff --git a/Config.in.legacy b/Config.in.legacy index 10476a2adf..7e85e4cf63 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_FUTURES + bool "python-futures removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME bool "python-backports-ssl-match-hostname removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index c94a7831fc..d2ed22dac0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -436,7 +436,6 @@ F: package/pulseaudio/ F: package/pure-ftpd/ F: package/python-couchdb/ F: package/python-cssutils/ -F: package/python-futures/ F: package/python-mwclient/ F: package/python-mwscrape/ F: package/python-mwscrape2slob/ diff --git a/package/Config.in b/package/Config.in index 73f266504a..b18d298a1b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1032,7 +1032,6 @@ menu "External python modules" source "package/python-frozenlist/Config.in" source "package/python-functools32/Config.in" source "package/python-future/Config.in" - source "package/python-futures/Config.in" source "package/python-git/Config.in" source "package/python-gitdb2/Config.in" source "package/python-gnupg/Config.in" diff --git a/package/python-futures/Config.in b/package/python-futures/Config.in deleted file mode 100644 index 2eb40e93bd..0000000000 --- a/package/python-futures/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_FUTURES - bool "python-futures" - depends on BR2_PACKAGE_PYTHON # not needed for python3 - help - Backport of the concurrent.futures package from Python 3.2. - - https://github.com/agronholm/pythonfutures diff --git a/package/python-futures/python-futures.hash b/package/python-futures/python-futures.hash deleted file mode 100644 index a4fbdf4fe9..0000000000 --- a/package/python-futures/python-futures.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/futures/json -md5 b43a39ae1475e3fd6940f2b4f7214675 futures-3.3.0.tar.gz -sha256 7e033af76a5e35f58e56da7a91e687706faf4e7bdfb2cbc3f2cca6b9bcda9794 futures-3.3.0.tar.gz -# Locally computed sha256 checksums -sha256 a698bd5d441e4a16af6c992b8e80cbfa12755d72d910854fa1fb11d4deb0059a LICENSE diff --git a/package/python-futures/python-futures.mk b/package/python-futures/python-futures.mk deleted file mode 100644 index 0666948115..0000000000 --- a/package/python-futures/python-futures.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-futures -# -################################################################################ - -PYTHON_FUTURES_VERSION = 3.3.0 -PYTHON_FUTURES_SOURCE = futures-$(PYTHON_FUTURES_VERSION).tar.gz -PYTHON_FUTURES_SITE = https://files.pythonhosted.org/packages/47/04/5fc6c74ad114032cd2c544c575bffc17582295e9cd6a851d6026ab4b2c00 -PYTHON_FUTURES_SETUP_TYPE = setuptools -PYTHON_FUTURES_LICENSE = BSD-2-Clause -PYTHON_FUTURES_LICENSE_FILES = LICENSE - -$(eval $(python-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:56 +0100 Subject: [Buildroot] [PATCH 090/107] package/python-ipaddr: drop python2 specific package In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-91-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/python-ipaddr/Config.in | 9 --------- package/python-ipaddr/python-ipaddr.hash | 5 ----- package/python-ipaddr/python-ipaddr.mk | 14 -------------- 6 files changed, 6 insertions(+), 30 deletions(-) delete mode 100644 package/python-ipaddr/Config.in delete mode 100644 package/python-ipaddr/python-ipaddr.hash delete mode 100644 package/python-ipaddr/python-ipaddr.mk diff --git a/Config.in.legacy b/Config.in.legacy index 03ea14a512..c78fb20756 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_IPADDR + bool "python-ipaddr removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_ID3 bool "python-id3 removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 985f43b614..c74bb3ae38 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2248,7 +2248,6 @@ F: package/python-docker-pycreds/ F: package/python-enum/ F: package/python-enum34/ F: package/python-functools32/ -F: package/python-ipaddr/ F: package/python-pam/ F: package/python-psutil/ F: package/python-request-id/ diff --git a/package/Config.in b/package/Config.in index 0ee1c8ddb4..611a8f6aa8 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1058,7 +1058,6 @@ menu "External python modules" source "package/python-iniparse/Config.in" source "package/python-intelhex/Config.in" source "package/python-iowait/Config.in" - source "package/python-ipaddr/Config.in" source "package/python-ipaddress/Config.in" source "package/python-ipdb/Config.in" source "package/python-iptables/Config.in" diff --git a/package/python-ipaddr/Config.in b/package/python-ipaddr/Config.in deleted file mode 100644 index 57279273f9..0000000000 --- a/package/python-ipaddr/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PYTHON_IPADDR - bool "python-ipaddr" - depends on BR2_PACKAGE_PYTHON # included since python3.3 - help - An IPv4/IPv6 manipulation library in Python. This library is - used to create/poke/manipulate IPv4 and IPv6 addresses and - prefixes. - - https://github.com/google/ipaddr-py diff --git a/package/python-ipaddr/python-ipaddr.hash b/package/python-ipaddr/python-ipaddr.hash deleted file mode 100644 index d9963a2933..0000000000 --- a/package/python-ipaddr/python-ipaddr.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/ipaddr/json -md5 f88353e40dec06410acfa075b8209b27 ipaddr-2.2.0.tar.gz -sha256 4092dfe667588d16aa12b59acb7c8a4024e5dcb23a681cd0b0b602373eca88d6 ipaddr-2.2.0.tar.gz -# Locally computed sha256 checksums -sha256 175b3b509d5c840db72ad8c22d22a690d15c67b317f34de8a8bb0a66059e8215 COPYING diff --git a/package/python-ipaddr/python-ipaddr.mk b/package/python-ipaddr/python-ipaddr.mk deleted file mode 100644 index 9a5d147533..0000000000 --- a/package/python-ipaddr/python-ipaddr.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-ipaddr -# -################################################################################ - -PYTHON_IPADDR_VERSION = 2.2.0 -PYTHON_IPADDR_SOURCE = ipaddr-$(PYTHON_IPADDR_VERSION).tar.gz -PYTHON_IPADDR_SITE = https://files.pythonhosted.org/packages/9d/a7/1b39a16cb90dfe491f57e1cab3103a15d4e8dd9a150872744f531b1106c1 -PYTHON_IPADDR_SETUP_TYPE = distutils -PYTHON_IPADDR_LICENSE = Apache-2.0 -PYTHON_IPADDR_LICENSE_FILES = COPYING - -$(eval $(python-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:53 +0100 Subject: [Buildroot] [PATCH 087/107] package/python-backports-ssl-match-hostname: drop python2 specific package In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-88-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++++ DEVELOPERS | 1 - package/Config.in | 1 - .../python-backports-ssl-match-hostname/Config.in | 7 ------- .../python-backports-ssl-match-hostname.hash | 5 ----- .../python-backports-ssl-match-hostname.mk | 14 -------------- 6 files changed, 6 insertions(+), 28 deletions(-) delete mode 100644 package/python-backports-ssl-match-hostname/Config.in delete mode 100644 package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.hash delete mode 100644 package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.mk diff --git a/Config.in.legacy b/Config.in.legacy index 89c095a388..10476a2adf 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME + bool "python-backports-ssl-match-hostname removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE bool "python-backports-shutil-get-terminal-size removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 2fd8d4d010..c94a7831fc 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2243,7 +2243,6 @@ F: package/lzop/ F: package/memtool/ F: package/mosquitto/ F: package/python-alsaaudio/ -F: package/python-backports-ssl-match-hostname/ F: package/python-cached-property/ F: package/python-docker/ F: package/python-dockerpty/ diff --git a/package/Config.in b/package/Config.in index fbfc876d89..73f266504a 100644 --- a/package/Config.in +++ b/package/Config.in @@ -941,7 +941,6 @@ menu "External python modules" source "package/python-avro/Config.in" source "package/python-babel/Config.in" source "package/python-backcall/Config.in" - source "package/python-backports-ssl-match-hostname/Config.in" source "package/python-bcrypt/Config.in" source "package/python-beautifulsoup4/Config.in" source "package/python-bidict/Config.in" diff --git a/package/python-backports-ssl-match-hostname/Config.in b/package/python-backports-ssl-match-hostname/Config.in deleted file mode 100644 index 8e55191a9e..0000000000 --- a/package/python-backports-ssl-match-hostname/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME - bool "python-backports-ssl-match-hostname" - depends on BR2_PACKAGE_PYTHON - help - The ssl.match_hostname() function from Python 3.5. - - http://bitbucket.org/brandon/backports.ssl_match_hostname diff --git a/package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.hash b/package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.hash deleted file mode 100644 index 145174cd5b..0000000000 --- a/package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/backports.ssl_match_hostname/json -md5 32d2f593af01a046bec3d2f5181a420a backports.ssl_match_hostname-3.7.0.1.tar.gz -sha256 bb82e60f9fbf4c080eabd957c39f0641f0fc247d9a16e31e26d594d8f42b9fd2 backports.ssl_match_hostname-3.7.0.1.tar.gz -# Locally computed sha256 checksums -sha256 bfc8a75a4b9aec224aa7973c0c9d7cc0134bdcbf8eefd008936b58554d66e97e LICENSE.txt diff --git a/package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.mk b/package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.mk deleted file mode 100644 index 300961662d..0000000000 --- a/package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-backports-ssl-match-hostname -# -################################################################################ - -PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_VERSION = 3.7.0.1 -PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_SOURCE = backports.ssl_match_hostname-$(PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_VERSION).tar.gz -PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_SITE = https://files.pythonhosted.org/packages/ff/2b/8265224812912bc5b7a607c44bf7b027554e1b9775e9ee0de8032e3de4b2 -PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_SETUP_TYPE = distutils -PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_LICENSE = Python-2.0 -PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_LICENSE_FILES = LICENSE.txt - -$(eval $(python-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:58 +0100 Subject: [Buildroot] [PATCH 092/107] package/python-mad: drop python2 specific package In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-93-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/python-mad/Config.in | 9 --------- package/python-mad/python-mad.hash | 3 --- package/python-mad/python-mad.mk | 29 ----------------------------- 6 files changed, 6 insertions(+), 43 deletions(-) delete mode 100644 package/python-mad/Config.in delete mode 100644 package/python-mad/python-mad.hash delete mode 100644 package/python-mad/python-mad.mk diff --git a/Config.in.legacy b/Config.in.legacy index 14b26408fe..f6607deeeb 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_MAD + bool "python-mad removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_IPADDRESS bool "python-ipaddress removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index c74bb3ae38..fe28772d8b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2805,7 +2805,6 @@ F: package/python3/ F: package/python-augeas/ F: package/python-flask-expects-json/ F: package/python-git/ -F: package/python-mad/ F: package/python-serial/ F: package/python-unittest-xml-reporting/ F: package/qextserialport/ diff --git a/package/Config.in b/package/Config.in index 50c0e13510..d5c46ef997 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1086,7 +1086,6 @@ menu "External python modules" source "package/python-lxml/Config.in" source "package/python-m2crypto/Config.in" source "package/python-m2r/Config.in" - source "package/python-mad/Config.in" source "package/python-mako/Config.in" source "package/python-markdown/Config.in" source "package/python-markdown2/Config.in" diff --git a/package/python-mad/Config.in b/package/python-mad/Config.in deleted file mode 100644 index 25354213d6..0000000000 --- a/package/python-mad/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PYTHON_MAD - bool "python-mad" - depends on BR2_PACKAGE_PYTHON - select BR2_PACKAGE_LIBMAD - help - python-mad is a Python binding for the MAD library, a - high-quality integer-only MPEG decoder. - - http://spacepants.org/src/pymad/ diff --git a/package/python-mad/python-mad.hash b/package/python-mad/python-mad.hash deleted file mode 100644 index 7b19ae5a44..0000000000 --- a/package/python-mad/python-mad.hash +++ /dev/null @@ -1,3 +0,0 @@ -# locally computed -sha256 1c9fc529b78de7d26e9e47cf182c9f8bf43838d8f62a9c1773540d57f5ebc522 pymad-0.6.tar.gz -sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING diff --git a/package/python-mad/python-mad.mk b/package/python-mad/python-mad.mk deleted file mode 100644 index a22214876f..0000000000 --- a/package/python-mad/python-mad.mk +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# -# python-mad -# -################################################################################ - -PYTHON_MAD_VERSION = 0.6 -PYTHON_MAD_SOURCE = pymad-$(PYTHON_MAD_VERSION).tar.gz -PYTHON_MAD_SITE = http://spacepants.org/src/pymad/download -PYTHON_MAD_SETUP_TYPE = distutils -PYTHON_MAD_LICENSE = GPL-2.0+ -PYTHON_MAD_LICENSE_FILES = COPYING - -PYTHON_MAD_DEPENDENCIES = libmad - -ifeq ($(BR2_ENDIAN),"LITTLE") -PYTHON_MAD_ENDIAN = little -else -PYTHON_MAD_ENDIAN = big -endif - -define PYTHON_MAD_CONFIGURE_CMDS - echo "endian = $(PYTHON_MAD_ENDIAN)" > $(@D)/Setup - echo "mad_libs = mad" >> $(@D)/Setup - echo "mad_lib_dir = $(STAGING_DIR)/usr/lib" >> $(@D)/Setup - echo "mad_include_dir = $(STAGING_DIR)/usr/include" >> $(@D)/Setup -endef - -$(eval $(python-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:59 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:59 +0100 Subject: [Buildroot] [PATCH 093/107] package/python-nfc: drop python2 specific package In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-94-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/python-nfc/Config.in | 16 ---------------- package/python-nfc/python-nfc.hash | 3 --- package/python-nfc/python-nfc.mk | 14 -------------- 6 files changed, 6 insertions(+), 35 deletions(-) delete mode 100644 package/python-nfc/Config.in delete mode 100644 package/python-nfc/python-nfc.hash delete mode 100644 package/python-nfc/python-nfc.mk diff --git a/Config.in.legacy b/Config.in.legacy index f6607deeeb..80adf521f8 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_NFC + bool "python-nfc removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_MAD bool "python-mad removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index fe28772d8b..7b38d3c0f7 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2598,7 +2598,6 @@ F: package/nanocom/ F: package/neard/ F: package/neardal/ F: package/owl-linux/ -F: package/python-nfc/ F: package/rapidjson/ F: package/sconeserver/ F: package/sound-theme-borealis/ diff --git a/package/Config.in b/package/Config.in index d5c46ef997..8dc91becb0 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1110,7 +1110,6 @@ menu "External python modules" source "package/python-netifaces/Config.in" source "package/python-networkmanager/Config.in" source "package/python-networkx/Config.in" - source "package/python-nfc/Config.in" source "package/python-numpy/Config.in" source "package/python-oauthlib/Config.in" source "package/python-opcua-asyncio/Config.in" diff --git a/package/python-nfc/Config.in b/package/python-nfc/Config.in deleted file mode 100644 index 7008723f60..0000000000 --- a/package/python-nfc/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_PYTHON_NFC - bool "python-nfc" - depends on BR2_PACKAGE_PYTHON - depends on BR2_TOOLCHAIN_HAS_THREADS # libusb - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb - select BR2_PACKAGE_LIBUSB - select BR2_PACKAGE_LIBUSB_COMPAT - help - Python module for near field communication. - - https://launchpad.net/nfcpy - -comment "python-nfc needs a toolchain w/ threads, gcc >= 4.9" - depends on BR2_PACKAGE_PYTHON - depends on !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/python-nfc/python-nfc.hash b/package/python-nfc/python-nfc.hash deleted file mode 100644 index 6514973f53..0000000000 --- a/package/python-nfc/python-nfc.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed: -sha256 7ff9265e393e9e70173ecef5a1f9124e67d3b6e481c2dc3a9537b6a769ebe16f python-nfc-0.13.5.tar.gz -sha256 0dc4b0a3362f197e250604567a6b4eb16bbc34c186425401e2201a193a82549f LICENSE diff --git a/package/python-nfc/python-nfc.mk b/package/python-nfc/python-nfc.mk deleted file mode 100644 index f5417410c9..0000000000 --- a/package/python-nfc/python-nfc.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-nfc -# -################################################################################ - -PYTHON_NFC_VERSION = 0.13.5 -PYTHON_NFC_SITE = $(call github,nfcpy,nfcpy,v$(PYTHON_NFC_VERSION)) -PYTHON_NFC_DEPENDENCIES = libusb libusb-compat -PYTHON_NFC_SETUP_TYPE = setuptools -PYTHON_NFC_LICENSE = EUPL-1.1+ -PYTHON_NFC_LICENSE_FILES = LICENSE - -$(eval $(python-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:50 +0100 Subject: [Buildroot] [PATCH 084/107] package/python: drop host package In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-85-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- ...-do-not-add-invalid-header-locations.patch | 42 --- ...get_python_inc-for-cross-compilation.patch | 48 --- ...nstall-location-of-_sysconfigdata.py.patch | 88 ----- ...ilation-of-.pyc-and-.pyo-conditional.patch | 78 ----- ...taddrinfo-test-for-cross-compilation.patch | 31 -- ...astructure-to-be-able-to-disable-ext.patch | 81 ----- ...y-header-paths-for-cross-compilation.patch | 64 ---- ...ook-in-usr-lib-termcap-for-libraries.patch | 31 -- ...9-Fix-python-config-for-cross-builds.patch | 229 ------------- ...ove-the-python-symlink-install-rules.patch | 43 --- .../0011-Don-t-add-multiarch-paths.patch | 36 --- .../0012-Abort-on-failed-module-build.patch | 30 -- ...d-when-threads-are-not-used-availabl.patch | 58 ---- .../python/0014-Serial-ioctl-workaround.patch | 33 -- ...e-shebang-of-Python-scripts-for-cros.patch | 35 -- ...-disable-installation-of-test-module.patch | 105 ------ .../0017-Add-an-option-to-disable-pydoc.patch | 89 ------ ...018-Add-an-option-to-disable-lib2to3.patch | 92 ------ ...option-to-disable-the-sqlite3-module.patch | 69 ---- ...d-an-option-to-disable-the-tk-module.patch | 73 ----- ...-option-to-disable-the-curses-module.patch | 61 ---- .../0022-Add-an-option-to-disable-expat.patch | 92 ------ ...-Add-an-option-to-disable-CJK-codecs.patch | 32 -- .../0024-Add-an-option-to-disable-NIS.patch | 35 -- ...Add-an-option-to-disable-unicodedata.patch | 32 -- .../0026-Add-an-option-to-disable-bsddb.patch | 87 ----- ...-an-option-to-disable-the-ssl-module.patch | 32 -- ...-an-option-to-disable-the-bz2-module.patch | 32 -- ...an-option-to-disable-the-zlib-module.patch | 32 -- .../0030-Do-not-install-the-idle-editor.patch | 55 ---- ...on-to-disable-the-ossaudiodev-module.patch | 32 -- ...option-to-disable-the-hashlib-module.patch | 32 -- ...an-option-to-disable-readline-module.patch | 32 -- ...locale-and-set-to-default-when-addin.patch | 37 --- package/python/Config.in.host | 16 - package/python/python.hash | 5 - package/python/python.mk | 302 ------------------ 37 files changed, 2301 deletions(-) delete mode 100644 package/python/0001-setup.py-do-not-add-invalid-header-locations.patch delete mode 100644 package/python/0002-Fix-get_python_inc-for-cross-compilation.patch delete mode 100644 package/python/0003-Change-the-install-location-of-_sysconfigdata.py.patch delete mode 100644 package/python/0004-Make-the-compilation-of-.pyc-and-.pyo-conditional.patch delete mode 100644 package/python/0005-Adjust-getaddrinfo-test-for-cross-compilation.patch delete mode 100644 package/python/0006-Add-minimal-infrastructure-to-be-able-to-disable-ext.patch delete mode 100644 package/python/0007-Adjust-library-header-paths-for-cross-compilation.patch delete mode 100644 package/python/0008-Don-t-look-in-usr-lib-termcap-for-libraries.patch delete mode 100644 package/python/0009-Fix-python-config-for-cross-builds.patch delete mode 100644 package/python/0010-Remove-the-python-symlink-install-rules.patch delete mode 100644 package/python/0011-Don-t-add-multiarch-paths.patch delete mode 100644 package/python/0012-Abort-on-failed-module-build.patch delete mode 100644 package/python/0013-sqlite3-fix-build-when-threads-are-not-used-availabl.patch delete mode 100644 package/python/0014-Serial-ioctl-workaround.patch delete mode 100644 package/python/0015-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch delete mode 100644 package/python/0016-Add-an-option-to-disable-installation-of-test-module.patch delete mode 100644 package/python/0017-Add-an-option-to-disable-pydoc.patch delete mode 100644 package/python/0018-Add-an-option-to-disable-lib2to3.patch delete mode 100644 package/python/0019-Add-option-to-disable-the-sqlite3-module.patch delete mode 100644 package/python/0020-Add-an-option-to-disable-the-tk-module.patch delete mode 100644 package/python/0021-Add-an-option-to-disable-the-curses-module.patch delete mode 100644 package/python/0022-Add-an-option-to-disable-expat.patch delete mode 100644 package/python/0023-Add-an-option-to-disable-CJK-codecs.patch delete mode 100644 package/python/0024-Add-an-option-to-disable-NIS.patch delete mode 100644 package/python/0025-Add-an-option-to-disable-unicodedata.patch delete mode 100644 package/python/0026-Add-an-option-to-disable-bsddb.patch delete mode 100644 package/python/0027-Add-an-option-to-disable-the-ssl-module.patch delete mode 100644 package/python/0028-Add-an-option-to-disable-the-bz2-module.patch delete mode 100644 package/python/0029-Add-an-option-to-disable-the-zlib-module.patch delete mode 100644 package/python/0030-Do-not-install-the-idle-editor.patch delete mode 100644 package/python/0031-Add-an-option-to-disable-the-ossaudiodev-module.patch delete mode 100644 package/python/0032-Add-option-to-disable-the-hashlib-module.patch delete mode 100644 package/python/0033-Add-an-option-to-disable-readline-module.patch delete mode 100644 package/python/0034-Override-system-locale-and-set-to-default-when-addin.patch delete mode 100644 package/python/Config.in.host delete mode 100644 package/python/python.hash delete mode 100644 package/python/python.mk diff --git a/package/python/0001-setup.py-do-not-add-invalid-header-locations.patch b/package/python/0001-setup.py-do-not-add-invalid-header-locations.patch deleted file mode 100644 index 3b2c9833e8..0000000000 --- a/package/python/0001-setup.py-do-not-add-invalid-header-locations.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 3dc31a435b67de2ba3dd3457f0c939e20b58e8de Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 22:17:06 +0100 -Subject: [PATCH] setup.py: do not add invalid header locations - -This piece of code incorrectly adds /usr/include to -self.compiler.include_dirs, and results in the following invalid -compilation line: - -/home/thomas/projets/buildroot/output/host/usr/bin/arm-none-linux-gnueabi-gcc -fPIC \ - -fno-strict-aliasing -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 \ - -pipe -Os -DNDEBUG -g -O3 -Wall -Wstrict-prototypes \ - -I/usr/include -I. -IInclude -I./Include \ - -I/home/thomas/projets/buildroot/output/host/usr/arm-buildroot-linux-gnueabi/sysroot/usr/include \ - -I/home/thomas/projets/buildroot/output/build/python-2.7.6/Include \ - -I/home/thomas/projets/buildroot/output/build/python-2.7.6 \ - -c /home/thomas/projets/buildroot/output/build/python-2.7.6/Modules/mathmodule.c \ - -o build/temp.linux2-arm-2.7/home/thomas/projets/buildroot/output/build/python-2.7.6/Modules/mathmodule.o -cc1: warning: include location "/usr/include" is unsafe for cross-compilation [-Wpoison-system-directories] -[...] - -Signed-off-by: Thomas Petazzoni ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 54054c2..64001e2 100644 ---- a/setup.py -+++ b/setup.py -@@ -496,7 +496,7 @@ class PyBuildExt(build_ext): - for directory in reversed(options.dirs): - add_dir_to_list(dir_list, directory) - -- if os.path.normpath(sys.prefix) != '/usr' \ -+ if False and os.path.normpath(sys.prefix) != '/usr' \ - and not sysconfig.get_config_var('PYTHONFRAMEWORK'): - # OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework - # (PYTHONFRAMEWORK is set) to avoid # linking problems when --- -2.7.4 - diff --git a/package/python/0002-Fix-get_python_inc-for-cross-compilation.patch b/package/python/0002-Fix-get_python_inc-for-cross-compilation.patch deleted file mode 100644 index 1fa4e92788..0000000000 --- a/package/python/0002-Fix-get_python_inc-for-cross-compilation.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 367ee7d103cf9f670c3925d555edf6f6a5b9d8d5 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 22:17:25 +0100 -Subject: [PATCH] Fix get_python_inc() for cross-compilation - -When we are cross compiling, doing os.path.dirname(sys.executable) to -get the build directory is incorrect, because we're executing the host -Python to build things for the target. Instead, we should use the -project_base variable. - -This fixes cross-compilation, which was adding incorrect header paths -pointing to the location where the host Python was built: - -/home/thomas/projets/buildroot/output/host/usr/bin/arm-none-linux-gnueabi-gcc -fPIC -fno-strict-aliasing \ - -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -pipe -Os -DNDEBUG -g -O3 -Wall -Wstrict-prototypes \ - -I/usr/include -I. -IInclude -I./Include -I/home/thomas/projets/buildroot/output/host/usr/arm-buildroot-linux-gnueabi/sysroot/usr/include \ - -I/home/thomas/projets/buildroot/output/host/usr/bin/Include -I/home/thomas/projets/buildroot/output/host/usr/bin \ - -c /home/thomas/projets/buildroot/output/build/python-2.7.6/Modules/_struct.c \ - -o build/temp.linux2-arm-2.7/home/thomas/projets/buildroot/output/build/python-2.7.6/Modules/_struct.o - -This patch allows to fix the -/home/thomas/projets/buildroot/output/host/usr/bin/Include and -/home/thomas/projets/buildroot/output/host/usr/bin paths that are -incorrectly added to the header paths. - -Signed-off-by: Thomas Petazzoni -[Asaf: update for 2.7.17] -Signed-off-by: Asaf Kahlon ---- - Lib/distutils/sysconfig.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py -index 1a4b792644..14c7d81c48 100644 ---- a/Lib/distutils/sysconfig.py -+++ b/Lib/distutils/sysconfig.py -@@ -85,7 +85,7 @@ def get_python_inc(plat_specific=0, prefix=None): - if os.name == "posix": - if python_build: - if sys.executable: -- buildir = os.path.dirname(sys.executable) -+ buildir = project_base - else: - # sys.executable can be empty if argv[0] has been changed - # and Python is unable to retrieve the real program name --- -2.20.1 - diff --git a/package/python/0003-Change-the-install-location-of-_sysconfigdata.py.patch b/package/python/0003-Change-the-install-location-of-_sysconfigdata.py.patch deleted file mode 100644 index 9e05af2e31..0000000000 --- a/package/python/0003-Change-the-install-location-of-_sysconfigdata.py.patch +++ /dev/null @@ -1,88 +0,0 @@ -From e3f3c454ec4992a2283640cef0a35da5a05fb399 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 22:17:59 +0100 -Subject: [PATCH] Change the install location of _sysconfigdata.py - -The _sysconfigdata.py module contains definitions that are needed when -building Python modules. In cross-compilation mode, when building -Python extensions for the target, we need to use the _sysconfigdata.py -of the target Python while executing the host Python. - -However until now, the _sysconfigdata.py module was installed in -build/lib.- directory, together with a number of -architecture-specific shared objects, which cannot be used with the -host Python. - -To solve this problem, this patch moves _sysconfigdata.py to a -separate location, build/sysconfigdata.-/, and only -this directory gets added to the PYTHONPATH of the host Python -interpreter when building Python modules for the target. - -Signed-off-by: Thomas Petazzoni -[Peter: update for 2.7.16] -Signed-off-by: Peter Korsgaard ---- - Makefile.pre.in | 12 ++++++++++-- - configure.ac | 2 +- - 2 files changed, 11 insertions(+), 3 deletions(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 9297e7fc89..49d3c0926f 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -509,6 +509,9 @@ pybuilddir.txt: $(BUILDPYTHON) - rm -f ./pybuilddir.txt ; \ - exit 1 ; \ - fi -+ echo `cat pybuilddir.txt`/sysconfigdata > pysysconfigdatadir.txt -+ mkdir -p `cat pysysconfigdatadir.txt` -+ cp `cat pybuilddir.txt`/_sysconfigdata.py `cat pysysconfigdatadir.txt` - - # This is shared by the math and cmath modules - Modules/_math.o: Modules/_math.c Modules/_math.h -@@ -1091,7 +1094,7 @@ libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c - else true; \ - fi; \ - done -- @for i in $(srcdir)/Lib/*.py `cat pybuilddir.txt`/_sysconfigdata.py $(srcdir)/Lib/*.doc $(srcdir)/Lib/*.egg-info ; \ -+ @for i in $(srcdir)/Lib/*.py $(srcdir)/Lib/*.doc $(srcdir)/Lib/*.egg-info ; \ - do \ - if test -x $$i; then \ - $(INSTALL_SCRIPT) $$i $(DESTDIR)$(LIBDEST); \ -@@ -1101,6 +1104,11 @@ libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c - echo $(INSTALL_DATA) $$i $(LIBDEST); \ - fi; \ - done -+ $(INSTALL_DATA) `cat pysysconfigdatadir.txt`/_sysconfigdata.py \ -+ $(DESTDIR)$(LIBDEST) -+ mkdir -p $(DESTDIR)$(LIBDEST)/sysconfigdata -+ $(INSTALL_DATA) `cat pysysconfigdatadir.txt`/_sysconfigdata.py \ -+ $(DESTDIR)$(LIBDEST)/sysconfigdata - @for d in $(LIBSUBDIRS); \ - do \ - a=$(srcdir)/Lib/$$d; \ -@@ -1426,7 +1434,7 @@ distclean: clobber - Modules/Setup Modules/Setup.local Modules/Setup.config \ - Modules/ld_so_aix Modules/python.exp Misc/python.pc - -rm -f python*-gdb.py -- -rm -f pybuilddir.txt -+ -rm -f pybuilddir.txt pysysconfigdatadir.txt - # Issue #28258: set LC_ALL to avoid issues with Estonian locale. - # Expansion is performed here by shell (spawned by make) itself before - # arguments are passed to find. So LC_ALL=C must be set as a separate -diff --git a/configure.ac b/configure.ac -index aecf6066e8..7143172b98 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -36,7 +36,7 @@ if test "$cross_compiling" = yes; then - AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found]) - fi - AC_MSG_RESULT($interp) -- PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/$(PLATDIR) '$interp -+ PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pysysconfigdatadir.txt && echo $(abs_builddir)/`cat pysysconfigdatadir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/$(PLATDIR) '$interp - fi - elif test "$cross_compiling" = maybe; then - AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH]) --- -2.11.0 - diff --git a/package/python/0004-Make-the-compilation-of-.pyc-and-.pyo-conditional.patch b/package/python/0004-Make-the-compilation-of-.pyc-and-.pyo-conditional.patch deleted file mode 100644 index ef1eb04046..0000000000 --- a/package/python/0004-Make-the-compilation-of-.pyc-and-.pyo-conditional.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 57ab41fa019d3ce276decd488938e5a00049cb9d Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 22:18:57 +0100 -Subject: [PATCH] Make the compilation of .pyc and .pyo conditional - -This commit adds --{enable,disable}-{pyc,pyo} options to enable/disable -the compilation of pyc/pyo files. - -Signed-off-by: Thomas Petazzoni -[Peter: update for 2.7.16] -Signed-off-by: Peter Korsgaard ---- - Makefile.pre.in | 8 ++++++++ - configure.ac | 11 +++++++++++ - 2 files changed, 19 insertions(+) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 49d3c0926f..247d3c2902 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -1139,24 +1139,32 @@ libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c - $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \ - $(DESTDIR)$(LIBDEST)/distutils/tests ; \ - fi -+ifeq (@PYC_BUILD@,yes) - PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - $(PYTHON_FOR_BUILD) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST) -f \ - -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ - $(DESTDIR)$(LIBDEST) -+endif -+ifeq (@PYO_BUILD@,yes) - PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - $(PYTHON_FOR_BUILD) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST) -f \ - -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ - $(DESTDIR)$(LIBDEST) -+endif -+ifeq (@PYC_BUILD@,yes) - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - $(PYTHON_FOR_BUILD) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST)/site-packages -f \ - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages -+endif -+ifeq (@PYO_BUILD@,yes) - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - $(PYTHON_FOR_BUILD) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST)/site-packages -f \ - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages -+endif - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - $(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 7143172b98..6bd8369105 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -773,6 +773,17 @@ SunOS*) - ;; - esac - -+AC_SUBST(PYC_BUILD) -+ -+AC_ARG_ENABLE(pyc-build, -+ AS_HELP_STRING([--disable-pyc-build], [disable build of pyc files]), -+ [ PYC_BUILD="${enableval}" ], [ PYC_BUILD=yes ]) -+ -+AC_SUBST(PYO_BUILD) -+ -+AC_ARG_ENABLE(pyo-build, -+ AS_HELP_STRING([--disable-pyo-build], [disable build of pyo files]), -+ [ PYO_BUILD="${enableval}" ], [ PYO_BUILD=yes ]) - - AC_SUBST(LIBRARY) - AC_MSG_CHECKING(LIBRARY) --- -2.11.0 - diff --git a/package/python/0005-Adjust-getaddrinfo-test-for-cross-compilation.patch b/package/python/0005-Adjust-getaddrinfo-test-for-cross-compilation.patch deleted file mode 100644 index c910ae7181..0000000000 --- a/package/python/0005-Adjust-getaddrinfo-test-for-cross-compilation.patch +++ /dev/null @@ -1,31 +0,0 @@ -From e674e29ceba34e55c9149ce99489e543aa4ebb01 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 22:19:47 +0100 -Subject: [PATCH] Adjust getaddrinfo() test for cross-compilation - -The getaddrinfo() test in configure.ac uses AC_RUN_IFELSE(), which isn't -cross-compilation friendly. - -Signed-off-by: Thomas Petazzoni -[Peter: update for 2.7.16] -Signed-off-by: Peter Korsgaard ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 6bd8369105..77ca6d86ca 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3563,7 +3563,7 @@ fi - - AC_MSG_RESULT($ac_cv_buggy_getaddrinfo) - --if test $have_getaddrinfo = no -o "$ac_cv_buggy_getaddrinfo" = yes -+if test $have_getaddrinfo = no || test "$cross_compiling" != "yes" -a "$ac_cv_buggy_getaddrinfo" = yes - then - if test $ipv6 = yes - then --- -2.11.0 - diff --git a/package/python/0006-Add-minimal-infrastructure-to-be-able-to-disable-ext.patch b/package/python/0006-Add-minimal-infrastructure-to-be-able-to-disable-ext.patch deleted file mode 100644 index b1a20eb04e..0000000000 --- a/package/python/0006-Add-minimal-infrastructure-to-be-able-to-disable-ext.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 94ec96dd8827adfb5e272d28a4d76510e28657b3 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 22:21:28 +0100 -Subject: [PATCH] Add minimal infrastructure to be able to disable extensions - -This commit adds some logic to the Python build system to be able to -disable Python extensions. Follow-up commits actually add options to -disable specific extensions. - -Signed-off-by: Thomas Petazzoni -[Peter: update for 2.7.16] -Signed-off-by: Peter Korsgaard ---- - Makefile.pre.in | 6 +++++- - configure.ac | 2 ++ - setup.py | 5 ++++- - 3 files changed, 11 insertions(+), 2 deletions(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 247d3c2902..c1c98ecc5a 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -160,6 +160,8 @@ FILEMODE= 644 - # configure script arguments - CONFIG_ARGS= @CONFIG_ARGS@ - -+# disabled extensions -+DISABLED_EXTENSIONS= @DISABLED_EXTENSIONS@ - - # Subdirectories with code - SRCDIRS= @SRCDIRS@ -@@ -528,6 +530,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o - esac; \ - $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ - _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \ -+ DISABLED_EXTENSIONS="$(DISABLED_EXTENSIONS)" \ - $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build - - # Build static library -@@ -1280,7 +1283,8 @@ libainstall: @DEF_MAKE_RULE@ python-config - # Install the dynamically loadable modules - # This goes into $(exec_prefix) - sharedinstall: sharedmods -- $(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \ -+ $(RUNSHARED) DISABLED_EXTENSIONS="$(DISABLED_EXTENSIONS)" \ -+ $(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \ - --prefix=$(prefix) \ - --install-scripts=$(BINDIR) \ - --install-platlib=$(DESTSHARED) \ -diff --git a/configure.ac b/configure.ac -index 77ca6d86ca..13f90b3ddd 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2491,6 +2491,8 @@ LIBS="$withval $LIBS" - - PKG_PROG_PKG_CONFIG - -+AC_SUBST(DISABLED_EXTENSIONS) -+ - # Check for use of the system expat library - AC_MSG_CHECKING(for --with-system-expat) - AC_ARG_WITH(system_expat, -diff --git a/setup.py b/setup.py -index 812d53d560..d426dd02ea 100644 ---- a/setup.py -+++ b/setup.py -@@ -33,7 +33,10 @@ host_platform = get_platform() - COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS")) - - # This global variable is used to hold the list of modules to be disabled. --disabled_module_list = [] -+try: -+ disabled_module_list = sysconfig.get_config_var("DISABLED_EXTENSIONS").split(" ") -+except KeyError: -+ disabled_module_list = list() - - def add_dir_to_list(dirlist, dir): - """Add the directory 'dir' to the list 'dirlist' (at the front) if --- -2.11.0 - diff --git a/package/python/0007-Adjust-library-header-paths-for-cross-compilation.patch b/package/python/0007-Adjust-library-header-paths-for-cross-compilation.patch deleted file mode 100644 index c68f1bf7f2..0000000000 --- a/package/python/0007-Adjust-library-header-paths-for-cross-compilation.patch +++ /dev/null @@ -1,64 +0,0 @@ -From f3e0a677c4736f95338825a022a884f8dc7a5c14 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 22:22:19 +0100 -Subject: [PATCH] Adjust library/header paths for cross-compilation - -When cross-compiling third-party extensions, the get_python_inc() or -get_python_lib() can be called, to return the path to headers or -libraries. However, they use the sys.prefix of the host Python, which -returns incorrect paths when cross-compiling (paths pointing to host -headers and libraries). - -In order to fix this, we introduce the _python_sysroot, _python_prefix -and _python_exec_prefix variables, that allow to override these -values, and get correct header/library paths when cross-compiling -third-party Python modules. - -The _python_sysroot variable is also used to prefix the LIBDIR value -taken from the sysconfigdata module. - -Signed-off-by: Thomas Petazzoni ---- - Lib/distutils/command/build_ext.py | 5 ++++- - Lib/distutils/sysconfig.py | 9 +++++++-- - 2 files changed, 11 insertions(+), 3 deletions(-) - -diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py -index 2c68be3..375b08c 100644 ---- a/Lib/distutils/command/build_ext.py -+++ b/Lib/distutils/command/build_ext.py -@@ -240,7 +240,10 @@ class build_ext (Command): - if (sysconfig.get_config_var('Py_ENABLE_SHARED')): - if not sysconfig.python_build: - # building third party extensions -- self.library_dirs.append(sysconfig.get_config_var('LIBDIR')) -+ libdir = sysconfig.get_config_var('LIBDIR') -+ if "_python_sysroot" in os.environ: -+ libdir = os.environ.get("_python_sysroot") + libdir -+ self.library_dirs.append(libdir) - else: - # building python standard extensions - self.library_dirs.append('.') -diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py -index d72b6e5..72151df 100644 ---- a/Lib/distutils/sysconfig.py -+++ b/Lib/distutils/sysconfig.py -@@ -19,8 +19,13 @@ import sys - from distutils.errors import DistutilsPlatformError - - # These are needed in a couple of spots, so just compute them once. --PREFIX = os.path.normpath(sys.prefix) --EXEC_PREFIX = os.path.normpath(sys.exec_prefix) -+if "_python_sysroot" in os.environ: -+ _sysroot=os.environ.get('_python_sysroot') -+ PREFIX = os.path.normpath(_sysroot + os.environ.get('_python_prefix')) -+ EXEC_PREFIX = os.path.normpath(_sysroot + os.environ.get('_python_exec_prefix')) -+else: -+ PREFIX = os.path.normpath(sys.prefix) -+ EXEC_PREFIX = os.path.normpath(sys.exec_prefix) - - # Path to the base directory of the project. On Windows the binary may - # live in project/PCBuild9. If we're dealing with an x64 Windows build, --- -2.7.4 - diff --git a/package/python/0008-Don-t-look-in-usr-lib-termcap-for-libraries.patch b/package/python/0008-Don-t-look-in-usr-lib-termcap-for-libraries.patch deleted file mode 100644 index d523b74638..0000000000 --- a/package/python/0008-Don-t-look-in-usr-lib-termcap-for-libraries.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 87b627d8845e67fd798449b414bece04f18bd450 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 22:22:40 +0100 -Subject: [PATCH] Don't look in /usr/lib/termcap for libraries - -Signed-off-by: Thomas Petazzoni ---- - setup.py | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/setup.py b/setup.py -index 3b51c0a..fa32532 100644 ---- a/setup.py -+++ b/setup.py -@@ -784,12 +784,9 @@ class PyBuildExt(build_ext): - pass # Issue 7384: Already linked against curses or tinfo. - elif curses_library: - readline_libs.append(curses_library) -- elif self.compiler.find_library_file(lib_dirs + -- ['/usr/lib/termcap'], -- 'termcap'): -+ elif self.compiler.find_library_file(lib_dirs, 'termcap'): - readline_libs.append('termcap') - exts.append( Extension('readline', ['readline.c'], -- library_dirs=['/usr/lib/termcap'], - extra_link_args=readline_extra_link_args, - libraries=readline_libs) ) - else: --- -2.7.4 - diff --git a/package/python/0009-Fix-python-config-for-cross-builds.patch b/package/python/0009-Fix-python-config-for-cross-builds.patch deleted file mode 100644 index 3cf8797c03..0000000000 --- a/package/python/0009-Fix-python-config-for-cross-builds.patch +++ /dev/null @@ -1,229 +0,0 @@ -From 1522c6c00ee88eb1148d3b2021d32d819b416375 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Tue, 7 Mar 2017 22:23:14 +0100 -Subject: [PATCH] Fix python-config for cross-builds - -Add a backport of http://bugs.python.org/issue16235 so we can use -python-config for cross builds. - -This basically replaces the python version of python-config with a -pure-shell version that's already preprocessed when installed and -doesn't depend on the sysconfig import that usually leads to bad -data/results. - -Signed-off-by: Gustavo Zacarias -[Bernd: rebased for Python 2.7.15] -Signed-off-by: Bernd Kuhls -[Peter: update for 2.7.16] -Signed-off-by: Peter Korsgaard ---- - Makefile.pre.in | 13 +++--- - Misc/python-config.sh.in | 102 +++++++++++++++++++++++++++++++++++++++++++++++ - configure.ac | 7 +++- - 3 files changed, 116 insertions(+), 6 deletions(-) - create mode 100644 Misc/python-config.sh.in - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index c1c98ecc5a..727a92af42 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -170,7 +170,7 @@ SRCDIRS= @SRCDIRS@ - SUBDIRSTOO= Include Lib Misc Demo - - # Files and directories to be distributed --CONFIGFILES= configure configure.ac acconfig.h pyconfig.h.in Makefile.pre.in -+CONFIGFILES= configure configure.ac acconfig.h pyconfig.h.in Makefile.pre.in Misc/python-config.sh - DISTFILES= README ChangeLog $(CONFIGFILES) - DISTDIRS= $(SUBDIRS) $(SUBDIRSTOO) Ext-dummy - DIST= $(DISTFILES) $(DISTDIRS) -@@ -403,7 +403,7 @@ LIBRARY_OBJS= \ - - # Default target - all: @DEF_MAKE_ALL_RULE@ --build_all: check-clean-src $(BUILDPYTHON) oldsharedmods sharedmods gdbhooks -+build_all: check-clean-src $(BUILDPYTHON) oldsharedmods sharedmods gdbhooks python-config - - # Check that the source is clean when building out of source. - check-clean-src: -@@ -1190,10 +1190,12 @@ $(srcdir)/Lib/$(PLATDIR): - fi; \ - cd $(srcdir)/Lib/$(PLATDIR); $(RUNSHARED) ./regen - --python-config: $(srcdir)/Misc/python-config.in -+python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh - # Substitution happens here, as the completely-expanded BINDIR - # is not available in configure -- sed -e "s, at EXENAME@,$(BINDIR)/python$(VERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config -+ sed -e "s, at EXENAME@,$(BINDIR)/python$(VERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config.py -+ # Replace makefile compat. variable references with shell script compat. ones; $(VAR) -> ${VAR} -+ sed -e 's,\$$(\([A-Za-z0-9_]*\)),\$$\{\1\},g' Misc/python-config.sh >python-config - - # Install the include files - INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY) -@@ -1252,7 +1254,7 @@ libainstall: @DEF_MAKE_RULE@ python-config - $(INSTALL_SCRIPT) $(srcdir)/Modules/makesetup $(DESTDIR)$(LIBPL)/makesetup - $(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh - $(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(VERSION)-config -- rm python-config -+ $(INSTALL_SCRIPT) python-config.py $(DESTDIR)$(LIBPL)/python-config.py - @if [ -s Modules/python.exp -a \ - "`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \ - echo; echo "Installing support files for building shared extension modules on AIX:"; \ -@@ -1434,6 +1436,7 @@ clobber: clean profile-removal - config.cache config.log pyconfig.h Modules/config.c - -rm -rf build platform - -rm -rf $(PYTHONFRAMEWORKDIR) -+ -rm -f python-config.py python-config - - # Make things extra clean, before making a distribution: - # remove all generated files, even Makefile[.pre] -diff --git a/Misc/python-config.sh.in b/Misc/python-config.sh.in -new file mode 100644 -index 0000000000..10db4c12eb ---- /dev/null -+++ b/Misc/python-config.sh.in -@@ -0,0 +1,102 @@ -+#!/bin/sh -+ -+exit_with_usage () -+{ -+ echo "Usage: $0 --prefix|--exec-prefix|--includes|--libs|--cflags|--ldflags|--extension-suffix|--help|--configdir" -+ exit $1 -+} -+ -+if [ "$1" = "" ] ; then -+ exit_with_usage 1 -+fi -+ -+# Returns the actual prefix where this script was installed to. -+installed_prefix () -+{ -+ RESULT=$(dirname $(cd $(dirname "$1") && pwd -P)) -+ if which readlink >/dev/null 2>&1 ; then -+ RESULT=$(readlink -f "$RESULT") -+ fi -+ echo $RESULT -+} -+ -+prefix_build="@prefix@" -+prefix_real=$(installed_prefix "$0") -+ -+# Use sed to fix paths from their built to locations to their installed to locations. -+prefix=$(echo "$prefix_build" | sed "s#$prefix_build#$prefix_real#") -+exec_prefix_build="@exec_prefix@" -+exec_prefix=$(echo "$exec_prefix_build" | sed "s#$exec_prefix_build#$prefix_real#") -+includedir=$(echo "@includedir@") -+libdir=$(echo "@libdir@" | sed "s#$prefix_build#$prefix_real#") -+CFLAGS=$(echo "@CFLAGS@" | sed "s#$prefix_build#$prefix_real#") -+VERSION="@VERSION@" -+LIBM="@LIBM@" -+LIBC="@LIBC@" -+SYSLIBS="$LIBM $LIBC" -+LIBS="@LIBS@ $SYSLIBS -lpython${VERSION}" -+BASECFLAGS="@BASECFLAGS@" -+LDLIBRARY="@LDLIBRARY@" -+LINKFORSHARED="@LINKFORSHARED@" -+OPT="@OPT@" -+PY_ENABLE_SHARED="@PY_ENABLE_SHARED@" -+LDVERSION="@LDVERSION@" -+LIBDEST=${prefix}/lib/python${VERSION} -+LIBPL=$(echo "@LIBPL@" | sed "s#$prefix_build#$prefix_real#") -+SO="@SO@" -+PYTHONFRAMEWORK="@PYTHONFRAMEWORK@" -+INCDIR="-I$includedir/python${VERSION}" -+PLATINCDIR="-I$includedir/python${VERSION}" -+ -+# Scan for --help or unknown argument. -+for ARG in $* -+do -+ case $ARG in -+ --help) -+ exit_with_usage 0 -+ ;; -+ --prefix|--exec-prefix|--includes|--libs|--cflags|--ldflags|--extension-suffix|--abiflags|--configdir) -+ ;; -+ *) -+ exit_with_usage 1 -+ ;; -+esac -+done -+ -+for ARG in "$@" -+do -+ case "$ARG" in -+ --prefix) -+ echo "$prefix" -+ ;; -+ --exec-prefix) -+ echo "$exec_prefix" -+ ;; -+ --includes) -+ echo "$INCDIR $PLATINCDIR" -+ ;; -+ --cflags) -+ echo "$INCDIR $PLATINCDIR $BASECFLAGS $CFLAGS $OPT" -+ ;; -+ --libs) -+ echo "$LIBS" -+ ;; -+ --ldflags) -+ LINKFORSHAREDUSED= -+ if [ -z "$PYTHONFRAMEWORK" ] ; then -+ LINKFORSHAREDUSED=$LINKFORSHARED -+ fi -+ LIBPLUSED= -+ if [ "$PY_ENABLE_SHARED" = "0" ] ; then -+ LIBPLUSED="-L$LIBPL" -+ fi -+ echo "$LIBPLUSED -L$libdir $LIBS $LINKFORSHAREDUSED" -+ ;; -+ --extension-suffix) -+ echo "$SO" -+ ;; -+ --configdir) -+ echo "$LIBPL" -+ ;; -+esac -+done -diff --git a/configure.ac b/configure.ac -index 13f90b3ddd..3f28ef1371 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -919,6 +919,7 @@ fi - - # Other platforms follow - if test $enable_shared = "yes"; then -+ PY_ENABLE_SHARED=1 - AC_DEFINE(Py_ENABLE_SHARED, 1, [Defined if Python is built as a shared library.]) - case $ac_sys_system in - BeOS*) -@@ -979,6 +980,7 @@ if test $enable_shared = "yes"; then - - esac - else # shared is disabled -+ PY_ENABLE_SHARED=0 - case $ac_sys_system in - CYGWIN*) - BLDLIBRARY='$(LIBRARY)' -@@ -2128,6 +2130,9 @@ AC_SUBST(LDCXXSHARED) - AC_SUBST(BLDSHARED) - AC_SUBST(CCSHARED) - AC_SUBST(LINKFORSHARED) -+AC_SUBST(PY_ENABLE_SHARED) -+LIBPL="${prefix}/lib/python${VERSION}/config" -+AC_SUBST(LIBPL) - # SO is the extension of shared libraries `(including the dot!) - # -- usually .so, .sl on HP-UX, .dll on Cygwin - AC_MSG_CHECKING(SO) -@@ -4944,7 +4949,7 @@ AC_MSG_RESULT($ENSUREPIP) - AC_SUBST(ENSUREPIP) - - # generate output files --AC_CONFIG_FILES(Makefile.pre Modules/Setup.config Misc/python.pc) -+AC_CONFIG_FILES(Makefile.pre Modules/Setup.config Misc/python.pc Misc/python-config.sh) - AC_CONFIG_FILES([Modules/ld_so_aix], [chmod +x Modules/ld_so_aix]) - AC_OUTPUT - --- -2.11.0 - diff --git a/package/python/0010-Remove-the-python-symlink-install-rules.patch b/package/python/0010-Remove-the-python-symlink-install-rules.patch deleted file mode 100644 index 4a2116b1b0..0000000000 --- a/package/python/0010-Remove-the-python-symlink-install-rules.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 706d62599fb3c3cb9b9941364aaf4a1ef4ebd276 Mon Sep 17 00:00:00 2001 -From: Samuel Martin -Date: Tue, 7 Mar 2017 22:23:58 +0100 -Subject: [PATCH] Remove the python symlink install rules - -The python symlink installation will be handled by Buildroot itself, -because Buildroot needs to control to what python interpreter (python2 -or python3) the python symlink points to. - -Signed-off-by: Samuel Martin -[Bernd: rebased against version 2.7.12.] -Signed-off-by: Bernd Kuhls -[Peter: update for 2.7.16] -Signed-off-by: Peter Korsgaard ---- - Makefile.pre.in | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 727a92af42..37b2ff3a5f 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -978,17 +978,10 @@ bininstall: altbininstall - echo "Creating directory $(LIBPC)"; \ - $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(LIBPC); \ - fi -- -if test -f $(DESTDIR)$(BINDIR)/$(PYTHON) -o -h $(DESTDIR)$(BINDIR)/$(PYTHON); \ -- then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON); \ -- else true; \ -- fi -- (cd $(DESTDIR)$(BINDIR); $(LN) -s python2$(EXE) $(PYTHON)) - -rm -f $(DESTDIR)$(BINDIR)/python2$(EXE) - (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(EXE) python2$(EXE)) - -rm -f $(DESTDIR)$(BINDIR)/python2-config - (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python2-config) -- -rm -f $(DESTDIR)$(BINDIR)/python-config -- (cd $(DESTDIR)$(BINDIR); $(LN) -s python2-config python-config) - -test -d $(DESTDIR)$(LIBPC) || $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(LIBPC) - -rm -f $(DESTDIR)$(LIBPC)/python2.pc - (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python2.pc) --- -2.11.0 - diff --git a/package/python/0011-Don-t-add-multiarch-paths.patch b/package/python/0011-Don-t-add-multiarch-paths.patch deleted file mode 100644 index b84c9077c9..0000000000 --- a/package/python/0011-Don-t-add-multiarch-paths.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 50a243a9c90f95e9248ac720e42e802b5922ab90 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 22:24:28 +0100 -Subject: [PATCH] Don't add multiarch paths - -The add_multiarch_paths() function leads, in certain build -environments, to the addition of host header paths to the CFLAGS, -which is not appropriate for cross-compilation. This patch fixes that -by simply removing the call to add_multiarch_paths() when we're -cross-compiling. - -Investigation done by David . - -Signed-off-by: Thomas Petazzoni ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index fa32532..0b9ea57 100644 ---- a/setup.py -+++ b/setup.py -@@ -461,9 +461,9 @@ 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') -+ self.add_multiarch_paths() - if cross_compiling: - self.add_gcc_paths() -- self.add_multiarch_paths() - - # Add paths specified in the environment variables LDFLAGS and - # CPPFLAGS for header and library files. --- -2.7.4 - diff --git a/package/python/0012-Abort-on-failed-module-build.patch b/package/python/0012-Abort-on-failed-module-build.patch deleted file mode 100644 index 7d952ca5c2..0000000000 --- a/package/python/0012-Abort-on-failed-module-build.patch +++ /dev/null @@ -1,30 +0,0 @@ -From a131e2ff219872d97eef6585117bd2f8ff9e310d Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 22:24:48 +0100 -Subject: [PATCH] Abort on failed module build - -When building a Python module fails, the setup.py script currently -doesn't exit with an error, and simply continues. This is not a really -nice behavior, so this patch changes setup.py to abort with an error, -so that the build issue is clearly noticeable. - -Signed-off-by: Thomas Petazzoni ---- - setup.py | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/setup.py b/setup.py -index 0b9ea57..9a5c2b8 100644 ---- a/setup.py -+++ b/setup.py -@@ -299,6 +299,7 @@ class PyBuildExt(build_ext): - print "Failed to build these modules:" - print_three_column(failed) - print -+ sys.exit(1) - - def build_extension(self, ext): - --- -2.7.4 - diff --git a/package/python/0013-sqlite3-fix-build-when-threads-are-not-used-availabl.patch b/package/python/0013-sqlite3-fix-build-when-threads-are-not-used-availabl.patch deleted file mode 100644 index dfc11efc7e..0000000000 --- a/package/python/0013-sqlite3-fix-build-when-threads-are-not-used-availabl.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 0f0be88526ece7d2f6ee21c1f59b1546ec6dc7c0 Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Tue, 7 Mar 2017 22:25:14 +0100 -Subject: [PATCH] sqlite3: fix build when threads are not used/available - -When threads are not used/available, a function in the sqlite3 extension -ends up with a label at the end: - - void _pysqlite_final_callback(sqlite3_context* context) - { - PyObject* function_result; - PyObject** aggregate_instance; - int ok; - - #ifdef WITH_THREAD - PyGILState_STATE threadstate; - - threadstate = PyGILState_Ensure(); - #endif - - aggregate_instance = (PyObject**)sqlite3_aggregate_context(context, sizeof(PyObject*)); - if (!*aggregate_instance) { - goto error; - } - - [......] - - error: - #ifdef WITH_THREAD - PyGILState_Release(threadstate); - #endif - } - -This is not valid, and gcc complains. - -Fix that by adding a dummy statement after the label, so that the label -is never the last statement of the function. - -Signed-off-by: "Yann E. MORIN" ---- - Modules/_sqlite/connection.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c -index 237d6e4..cdf69ab 100644 ---- a/Modules/_sqlite/connection.c -+++ b/Modules/_sqlite/connection.c -@@ -794,6 +794,7 @@ error: - #ifdef WITH_THREAD - PyGILState_Release(threadstate); - #endif -+ ; /* Make gcc happy: a label can't be at the end of a function */ - } - - static void _pysqlite_drop_unused_statement_references(pysqlite_Connection* self) --- -2.7.4 - diff --git a/package/python/0014-Serial-ioctl-workaround.patch b/package/python/0014-Serial-ioctl-workaround.patch deleted file mode 100644 index 468d535ac3..0000000000 --- a/package/python/0014-Serial-ioctl-workaround.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 22e5a4c5d29ddf0856d7f68f5a613aec00e26168 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Tue, 7 Mar 2017 22:25:36 +0100 -Subject: [PATCH] Serial ioctl() workaround - -The ioctls.h of some architectures (notably xtensa) references structs from -linux/serial.h. Make sure to include this header as well. - -Also, undef TIOCTTYGSTRUCT that require reference to internal kernel tty_struct, -but isn't actually referenced in modern kernels. - -Signed-off-by: Baruch Siach ---- - Modules/termios.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Modules/termios.c b/Modules/termios.c -index 57f30dc..a8c9855 100644 ---- a/Modules/termios.c -+++ b/Modules/termios.c -@@ -16,7 +16,9 @@ - * so this needs to be included first on that platform. */ - #include - #endif -+#include - #include -+#undef TIOCTTYGSTRUCT - - /* HP-UX requires that this be included to pick up MDCD, MCTS, MDSR, - * MDTR, MRI, and MRTS (appearantly used internally by some things --- -2.7.4 - diff --git a/package/python/0015-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch b/package/python/0015-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch deleted file mode 100644 index fecf29f4d6..0000000000 --- a/package/python/0015-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 70049366ddf1fc9084bb02cf4459380976cdf8f7 Mon Sep 17 00:00:00 2001 -From: Christophe Vu-Brugier -Date: Tue, 7 Mar 2017 22:26:09 +0100 -Subject: [PATCH] Do not adjust the shebang of Python scripts for - cross-compilation - -The copy_scripts() method in distutils copies the scripts listed in -the setup file and adjusts the first line to refer to the current -Python interpreter. When cross-compiling, this means that the adjusted -shebang refers to the host Python interpreter. - -This patch modifies copy_scripts() to preserve the shebang when -cross-compilation is detected. - -Signed-off-by: Christophe Vu-Brugier ---- - Lib/distutils/command/build_scripts.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Lib/distutils/command/build_scripts.py b/Lib/distutils/command/build_scripts.py -index 567df65..4922d50 100644 ---- a/Lib/distutils/command/build_scripts.py -+++ b/Lib/distutils/command/build_scripts.py -@@ -89,7 +89,7 @@ class build_scripts (Command): - adjust = 1 - post_interp = match.group(1) or '' - -- if adjust: -+ if adjust and not '_python_sysroot' in os.environ: - log.info("copying and adjusting %s -> %s", script, - self.build_dir) - if not self.dry_run: --- -2.7.4 - diff --git a/package/python/0016-Add-an-option-to-disable-installation-of-test-module.patch b/package/python/0016-Add-an-option-to-disable-installation-of-test-module.patch deleted file mode 100644 index 600fc40b69..0000000000 --- a/package/python/0016-Add-an-option-to-disable-installation-of-test-module.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 2c1810fb002128a6d33cc3a391a157e316479d15 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 22:27:16 +0100 -Subject: [PATCH] Add an option to disable installation of test modules - -The Python standard distribution comes with many test modules, that -are not necessarly useful on embedded targets. - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Samuel Martin -[Bernd: rebased against version 2.7.14] -Signed-off-by: Bernd Kuhls -[Peter: update for 2.7.16] -Signed-off-by: Peter Korsgaard ---- - Makefile.pre.in | 50 +++++++++++++++++++++++++++++++++----------------- - configure.ac | 6 ++++++ - 2 files changed, 39 insertions(+), 17 deletions(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 37b2ff3a5f..2a5e8adc61 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -1048,28 +1048,44 @@ PLATMACDIRS= plat-mac plat-mac/Carbon plat-mac/lib-scriptpackages \ - plat-mac/lib-scriptpackages/SystemEvents \ - plat-mac/lib-scriptpackages/Terminal - PLATMACPATH=:plat-mac:plat-mac/lib-scriptpackages --LIBSUBDIRS= lib-tk lib-tk/test lib-tk/test/test_tkinter \ -- lib-tk/test/test_ttk site-packages test test/audiodata test/capath \ -- test/data test/cjkencodings test/decimaltestdata test/xmltestdata \ -- test/imghdrdata \ -- test/subprocessdata \ -- test/support \ -- test/tracedmodules \ -+LIBSUBDIRS= lib-tk site-packages \ - encodings compiler hotshot \ -- email email/mime email/test email/test/data \ -+ email email/mime \ - ensurepip ensurepip/_bundled \ -- json json/tests \ -- sqlite3 sqlite3/test \ -- logging bsddb bsddb/test csv importlib wsgiref \ -- lib2to3 lib2to3/fixes lib2to3/pgen2 lib2to3/tests \ -- lib2to3/tests/data lib2to3/tests/data/fixers lib2to3/tests/data/fixers/myfixes \ -- ctypes ctypes/test ctypes/macholib \ -- idlelib idlelib/Icons idlelib/idle_test \ -- distutils distutils/command distutils/tests $(XMLLIBSUBDIRS) \ -+ json \ -+ sqlite3 \ -+ logging bsddb csv importlib wsgiref \ -+ lib2to3 lib2to3/fixes lib2to3/pgen2 \ -+ ctypes ctypes/macholib \ -+ idlelib idlelib/Icons \ -+ distutils distutils/command $(XMLLIBSUBDIRS) \ - multiprocessing multiprocessing/dummy \ -- unittest unittest/test \ -+ unittest \ - lib-old \ - curses pydoc_data $(MACHDEPS) -+ -+TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \ -+ lib-tk/test/test_ttk test test/audiodata test/capath test/data \ -+ test/cjkencodings test/decimaltestdata test/xmltestdata \ -+ test/imghdrdata \ -+ test/subprocessdata \ -+ test/support \ -+ test/tracedmodules \ -+ email/test email/test/data \ -+ json/tests \ -+ sqlite3/test \ -+ bsddb/test \ -+ lib2to3/tests \ -+ lib2to3/tests/data lib2to3/tests/data/fixers lib2to3/tests/data/fixers/myfixes \ -+ ctypes/test \ -+ idlelib/idle_test \ -+ distutils/tests \ -+ unittest/test -+ -+ifeq (@TEST_MODULES@,yes) -+LIBSUBDIRS += $(TESTSUBDIRS) -+endif -+ - libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c - @for i in $(SCRIPTDIR) $(LIBDEST); \ - do \ -diff --git a/configure.ac b/configure.ac -index 3f28ef1371..f257a25620 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2835,6 +2835,12 @@ if test "$posix_threads" = "yes"; then - fi - - -+AC_SUBST(TEST_MODULES) -+ -+AC_ARG_ENABLE(test-modules, -+ AS_HELP_STRING([--disable-test-modules], [disable test modules]), -+ [ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ]) -+ - # Check for enable-ipv6 - AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified]) - AC_MSG_CHECKING([if --enable-ipv6 is specified]) --- -2.11.0 - diff --git a/package/python/0017-Add-an-option-to-disable-pydoc.patch b/package/python/0017-Add-an-option-to-disable-pydoc.patch deleted file mode 100644 index 48c1b570df..0000000000 --- a/package/python/0017-Add-an-option-to-disable-pydoc.patch +++ /dev/null @@ -1,89 +0,0 @@ -From f98c3f981643411449aba6f93178b2ca14f9a68c Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 22:27:34 +0100 -Subject: [PATCH] Add an option to disable pydoc - -It removes 0.5 MB of data from the target plus the pydoc script -itself. - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Samuel Martin -[Peter: update for 2.7.16] -Signed-off-by: Peter Korsgaard ---- - Makefile.pre.in | 6 +++++- - configure.ac | 5 +++++ - setup.py | 10 +++++++--- - 3 files changed, 17 insertions(+), 4 deletions(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 2a5e8adc61..d3ba1aeb4e 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -1062,7 +1062,7 @@ LIBSUBDIRS= lib-tk site-packages \ - multiprocessing multiprocessing/dummy \ - unittest \ - lib-old \ -- curses pydoc_data $(MACHDEPS) -+ curses $(MACHDEPS) - - TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \ - lib-tk/test/test_ttk test test/audiodata test/capath test/data \ -@@ -1086,6 +1086,10 @@ ifeq (@TEST_MODULES@,yes) - LIBSUBDIRS += $(TESTSUBDIRS) - endif - -+ifeq (@PYDOC@,yes) -+LIBSUBDIRS += pydoc_data -+endif -+ - libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c - @for i in $(SCRIPTDIR) $(LIBDEST); \ - do \ -diff --git a/configure.ac b/configure.ac -index f257a25620..2ed4119478 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2834,6 +2834,11 @@ if test "$posix_threads" = "yes"; then - AC_CHECK_FUNCS(pthread_atfork) - fi - -+AC_SUBST(PYDOC) -+ -+AC_ARG_ENABLE(pydoc, -+ AS_HELP_STRING([--disable-pydoc], [disable pydoc]), -+ [ PYDOC="${enableval}" ], [ PYDOC=yes ]) - - AC_SUBST(TEST_MODULES) - -diff --git a/setup.py b/setup.py -index 2ef5b07189..49f810f72e 100644 ---- a/setup.py -+++ b/setup.py -@@ -2277,6 +2277,12 @@ def main(): - # turn off warnings when deprecated modules are imported - import warnings - warnings.filterwarnings("ignore",category=DeprecationWarning) -+ -+ scripts = ['Tools/scripts/idle', 'Tools/scripts/2to3', -+ 'Lib/smtpd.py'] -+ if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"): -+ scripts += [ 'Tools/scripts/pydoc' ] -+ - setup(# PyPI Metadata (PEP 301) - name = "Python", - version = sys.version.split()[0], -@@ -2297,9 +2303,7 @@ def main(): - ext_modules=[Extension('_struct', ['_struct.c'])], - - # Scripts to install -- scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle', -- 'Tools/scripts/2to3', -- 'Lib/smtpd.py'] -+ scripts = scripts, - ) - - # --install-platlib --- -2.11.0 - diff --git a/package/python/0018-Add-an-option-to-disable-lib2to3.patch b/package/python/0018-Add-an-option-to-disable-lib2to3.patch deleted file mode 100644 index 2c539fac35..0000000000 --- a/package/python/0018-Add-an-option-to-disable-lib2to3.patch +++ /dev/null @@ -1,92 +0,0 @@ -From d7f419246681e12f05e2eefc79286959c6aa18ab Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 22:27:49 +0100 -Subject: [PATCH] Add an option to disable lib2to3 - -lib2to3 is a library to convert Python 2.x code to Python 3.x. As -such, it is probably not very useful on embedded system targets. - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Samuel Martin -[Peter: update for 2.7.16] -Signed-off-by: Peter Korsgaard ---- - Makefile.pre.in | 11 ++++++++--- - configure.ac | 6 ++++++ - setup.py | 5 +++-- - 3 files changed, 17 insertions(+), 5 deletions(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index d3ba1aeb4e..0e15b6d6f4 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -1055,7 +1055,6 @@ LIBSUBDIRS= lib-tk site-packages \ - json \ - sqlite3 \ - logging bsddb csv importlib wsgiref \ -- lib2to3 lib2to3/fixes lib2to3/pgen2 \ - ctypes ctypes/macholib \ - idlelib idlelib/Icons \ - distutils distutils/command $(XMLLIBSUBDIRS) \ -@@ -1075,8 +1074,6 @@ TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \ - json/tests \ - sqlite3/test \ - bsddb/test \ -- lib2to3/tests \ -- lib2to3/tests/data lib2to3/tests/data/fixers lib2to3/tests/data/fixers/myfixes \ - ctypes/test \ - idlelib/idle_test \ - distutils/tests \ -@@ -1090,6 +1087,14 @@ ifeq (@PYDOC@,yes) - LIBSUBDIRS += pydoc_data - endif - -+ifeq (@LIB2TO3@,yes) -+LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2 -+TESTSUBDIRS += lib2to3/tests \ -+ lib2to3/tests/data \ -+ lib2to3/tests/data/fixers \ -+ lib2to3/tests/data/fixers/myfixes -+endif -+ - libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c - @for i in $(SCRIPTDIR) $(LIBDEST); \ - do \ -diff --git a/configure.ac b/configure.ac -index 2ed4119478..a2810ab8ed 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2846,6 +2846,12 @@ AC_ARG_ENABLE(test-modules, - AS_HELP_STRING([--disable-test-modules], [disable test modules]), - [ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ]) - -+AC_SUBST(LIB2TO3) -+ -+AC_ARG_ENABLE(lib2to3, -+ AS_HELP_STRING([--disable-lib2to3], [disable lib2to3]), -+ [ LIB2TO3="${enableval}" ], [ LIB2TO3=yes ]) -+ - # Check for enable-ipv6 - 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 49f810f72e..9130819454 100644 ---- a/setup.py -+++ b/setup.py -@@ -2278,10 +2278,11 @@ def main(): - import warnings - warnings.filterwarnings("ignore",category=DeprecationWarning) - -- scripts = ['Tools/scripts/idle', 'Tools/scripts/2to3', -- 'Lib/smtpd.py'] -+ scripts = ['Tools/scripts/idle', 'Lib/smtpd.py'] - if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"): - scripts += [ 'Tools/scripts/pydoc' ] -+ if not '--disable-lib2to3' in sysconfig.get_config_var("CONFIG_ARGS"): -+ scripts += [ 'Tools/scripts/2to3' ] - - setup(# PyPI Metadata (PEP 301) - name = "Python", --- -2.11.0 - diff --git a/package/python/0019-Add-option-to-disable-the-sqlite3-module.patch b/package/python/0019-Add-option-to-disable-the-sqlite3-module.patch deleted file mode 100644 index 433bb2973e..0000000000 --- a/package/python/0019-Add-option-to-disable-the-sqlite3-module.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 123ecc50932e3ad3f7a2d90d430b74822c9695d4 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 22:28:06 +0100 -Subject: [PATCH] Add option to disable the sqlite3 module - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Samuel Martin -[Peter: update for 2.7.16] -Signed-off-by: Peter Korsgaard ---- - Makefile.pre.in | 7 +++++-- - configure.ac | 9 +++++++++ - 2 files changed, 14 insertions(+), 2 deletions(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 0e15b6d6f4..a2e5ac6d41 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -1053,7 +1053,6 @@ LIBSUBDIRS= lib-tk site-packages \ - email email/mime \ - ensurepip ensurepip/_bundled \ - json \ -- sqlite3 \ - logging bsddb csv importlib wsgiref \ - ctypes ctypes/macholib \ - idlelib idlelib/Icons \ -@@ -1072,7 +1071,6 @@ TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \ - test/tracedmodules \ - email/test email/test/data \ - json/tests \ -- sqlite3/test \ - bsddb/test \ - ctypes/test \ - idlelib/idle_test \ -@@ -1095,6 +1093,11 @@ TESTSUBDIRS += lib2to3/tests \ - lib2to3/tests/data/fixers/myfixes - endif - -+ifeq (@SQLITE3@,yes) -+LIBSUBDIRS += sqlite3 -+TESTSUBDIRS += sqlite3/test -+endif -+ - libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c - @for i in $(SCRIPTDIR) $(LIBDEST); \ - do \ -diff --git a/configure.ac b/configure.ac -index a2810ab8ed..4ee3c60501 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2834,6 +2834,15 @@ if test "$posix_threads" = "yes"; then - AC_CHECK_FUNCS(pthread_atfork) - fi - -+AC_SUBST(SQLITE3) -+AC_ARG_ENABLE(sqlite3, -+ AS_HELP_STRING([--disable-sqlite3], [disable sqlite3]), -+ [ SQLITE3="${enableval}" ], [ SQLITE3=yes ]) -+ -+if test "$SQLITE3" = "no" ; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" -+fi -+ - AC_SUBST(PYDOC) - - AC_ARG_ENABLE(pydoc, --- -2.11.0 - diff --git a/package/python/0020-Add-an-option-to-disable-the-tk-module.patch b/package/python/0020-Add-an-option-to-disable-the-tk-module.patch deleted file mode 100644 index 26ae1799f8..0000000000 --- a/package/python/0020-Add-an-option-to-disable-the-tk-module.patch +++ /dev/null @@ -1,73 +0,0 @@ -From f0dc1198360c6875ed846a961e85dc41e239aa29 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 22:28:57 +0100 -Subject: [PATCH] Add an option to disable the tk module - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Samuel Martin -[Peter: update for 2.7.16] -Signed-off-by: Peter Korsgaard ---- - Makefile.pre.in | 11 ++++++++--- - configure.ac | 9 +++++++++ - 2 files changed, 17 insertions(+), 3 deletions(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index a2e5ac6d41..37ed70ab1d 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -1048,7 +1048,7 @@ PLATMACDIRS= plat-mac plat-mac/Carbon plat-mac/lib-scriptpackages \ - plat-mac/lib-scriptpackages/SystemEvents \ - plat-mac/lib-scriptpackages/Terminal - PLATMACPATH=:plat-mac:plat-mac/lib-scriptpackages --LIBSUBDIRS= lib-tk site-packages \ -+LIBSUBDIRS= site-packages \ - encodings compiler hotshot \ - email email/mime \ - ensurepip ensurepip/_bundled \ -@@ -1062,8 +1062,7 @@ LIBSUBDIRS= lib-tk site-packages \ - lib-old \ - curses $(MACHDEPS) - --TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \ -- lib-tk/test/test_ttk test test/audiodata test/capath test/data \ -+TESTSUBDIRS = test test/audiodata test/capath test/data \ - test/cjkencodings test/decimaltestdata test/xmltestdata \ - test/imghdrdata \ - test/subprocessdata \ -@@ -1098,6 +1097,12 @@ LIBSUBDIRS += sqlite3 - TESTSUBDIRS += sqlite3/test - endif - -+ifeq (@TK@,yes) -+LIBSUBDIRS += lib-tk -+TESTSUBDIRS += lib-tk/test lib-tk/test/test_tkinter \ -+ lib-tk/test/test_ttk -+endif -+ - libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c - @for i in $(SCRIPTDIR) $(LIBDEST); \ - do \ -diff --git a/configure.ac b/configure.ac -index 4ee3c60501..2c20f826c5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2843,6 +2843,15 @@ if test "$SQLITE3" = "no" ; then - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" - fi - -+AC_SUBST(TK) -+AC_ARG_ENABLE(tk, -+ AS_HELP_STRING([--disable-tk], [disable tk]), -+ [ TK="${enableval}" ], [ TK=yes ]) -+ -+if test "$TK" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter" -+fi -+ - AC_SUBST(PYDOC) - - AC_ARG_ENABLE(pydoc, --- -2.11.0 - diff --git a/package/python/0021-Add-an-option-to-disable-the-curses-module.patch b/package/python/0021-Add-an-option-to-disable-the-curses-module.patch deleted file mode 100644 index 3b1ab7fb4c..0000000000 --- a/package/python/0021-Add-an-option-to-disable-the-curses-module.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 3e51eef24c51b986c37b354f3de98218eb76909c Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 22:29:06 +0100 -Subject: [PATCH] Add an option to disable the curses module - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Samuel Martin -[Peter: update for 2.7.16] -Signed-off-by: Peter Korsgaard ---- - Makefile.pre.in | 6 +++++- - configure.ac | 9 +++++++++ - 2 files changed, 14 insertions(+), 1 deletion(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 37ed70ab1d..458f4ad55b 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -1060,7 +1060,7 @@ LIBSUBDIRS= site-packages \ - multiprocessing multiprocessing/dummy \ - unittest \ - lib-old \ -- curses $(MACHDEPS) -+ $(MACHDEPS) - - TESTSUBDIRS = test test/audiodata test/capath test/data \ - test/cjkencodings test/decimaltestdata test/xmltestdata \ -@@ -1103,6 +1103,10 @@ TESTSUBDIRS += lib-tk/test lib-tk/test/test_tkinter \ - lib-tk/test/test_ttk - endif - -+ifeq (@CURSES@,yes) -+LIBSUBDIRS += curses -+endif -+ - libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c - @for i in $(SCRIPTDIR) $(LIBDEST); \ - do \ -diff --git a/configure.ac b/configure.ac -index 2c20f826c5..a7ebcd091e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2852,6 +2852,15 @@ if test "$TK" = "no"; then - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter" - fi - -+AC_SUBST(CURSES) -+AC_ARG_ENABLE(curses, -+ AS_HELP_STRING([--disable-curses], [disable curses]), -+ [ CURSES="${enableval}" ], [ CURSES=yes ]) -+ -+if test "$CURSES" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _curses _curses_panel" -+fi -+ - AC_SUBST(PYDOC) - - AC_ARG_ENABLE(pydoc, --- -2.11.0 - diff --git a/package/python/0022-Add-an-option-to-disable-expat.patch b/package/python/0022-Add-an-option-to-disable-expat.patch deleted file mode 100644 index 2ebe7eabda..0000000000 --- a/package/python/0022-Add-an-option-to-disable-expat.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 548413a659cc5320560d6b794fe8edd06dd1d22e Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 22:29:20 +0100 -Subject: [PATCH] Add an option to disable expat - -This patch replaces the existing --with-system-expat option with a ---with-expat={system,builtin,none} option, which allows to tell Python -whether we want to use the system expat (already installed), the expat -builtin the Python sources, or no expat at all (which disables the -installation of XML modules). - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Samuel Martin -[Peter: update for 2.7.16] -Signed-off-by: Peter Korsgaard ---- - Makefile.pre.in | 6 +++++- - configure.ac | 18 +++++++++++++----- - setup.py | 2 +- - 3 files changed, 19 insertions(+), 7 deletions(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 458f4ad55b..8dee345539 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -1056,7 +1056,7 @@ LIBSUBDIRS= site-packages \ - logging bsddb csv importlib wsgiref \ - ctypes ctypes/macholib \ - idlelib idlelib/Icons \ -- distutils distutils/command $(XMLLIBSUBDIRS) \ -+ distutils distutils/command \ - multiprocessing multiprocessing/dummy \ - unittest \ - lib-old \ -@@ -1107,6 +1107,10 @@ ifeq (@CURSES@,yes) - LIBSUBDIRS += curses - endif - -+ifeq (@EXPAT@,yes) -+LIBSUBDIRS += $(XMLLIBSUBDIRS) -+endif -+ - libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c - @for i in $(SCRIPTDIR) $(LIBDEST); \ - do \ -diff --git a/configure.ac b/configure.ac -index a7ebcd091e..2f5759a890 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2499,13 +2499,21 @@ PKG_PROG_PKG_CONFIG - AC_SUBST(DISABLED_EXTENSIONS) - - # Check for use of the system expat library --AC_MSG_CHECKING(for --with-system-expat) --AC_ARG_WITH(system_expat, -- AS_HELP_STRING([--with-system-expat], [build pyexpat module using an installed expat library]), -+AC_MSG_CHECKING(for --with-expat) -+AC_ARG_WITH(expat, -+ AS_HELP_STRING([--with-expat], [select which expat version to use: system, builtin, none]), - [], -- [with_system_expat="no"]) -+ [with_expat="builtin"]) - --AC_MSG_RESULT($with_system_expat) -+AC_MSG_RESULT($with_expat) -+ -+if test "$with_expat" != "none"; then -+ EXPAT=yes -+else -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} pyexpat" -+ EXPAT=no -+fi -+AC_SUBST(EXPAT) - - # Check for use of the system libffi library - AC_MSG_CHECKING(for --with-system-ffi) -diff --git a/setup.py b/setup.py -index 9130819454..f439cbadc2 100644 ---- a/setup.py -+++ b/setup.py -@@ -1475,7 +1475,7 @@ class PyBuildExt(build_ext): - # - # More information on Expat can be found at www.libexpat.org. - # -- if '--with-system-expat' in sysconfig.get_config_var("CONFIG_ARGS"): -+ if '--with-expat=system' in sysconfig.get_config_var("CONFIG_ARGS"): - expat_inc = [] - define_macros = [] - expat_lib = ['expat'] --- -2.11.0 - diff --git a/package/python/0023-Add-an-option-to-disable-CJK-codecs.patch b/package/python/0023-Add-an-option-to-disable-CJK-codecs.patch deleted file mode 100644 index 3ee77fec36..0000000000 --- a/package/python/0023-Add-an-option-to-disable-CJK-codecs.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 6761066addfb6028e183d7fe4322b283af18117f Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 22:29:31 +0100 -Subject: [PATCH] Add an option to disable CJK codecs - -Signed-off-by: Thomas Petazzoni -[Peter: update for 2.7.16] -Signed-off-by: Peter Korsgaard ---- - configure.ac | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 2f5759a890..862c8ae516 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2851,6 +2851,12 @@ if test "$SQLITE3" = "no" ; then - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" - fi - -+AC_ARG_ENABLE(codecs-cjk, -+ AS_HELP_STRING([--disable-codecs-cjk], [disable CJK codecs]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk" -+ fi]) -+ - AC_SUBST(TK) - AC_ARG_ENABLE(tk, - AS_HELP_STRING([--disable-tk], [disable tk]), --- -2.11.0 - diff --git a/package/python/0024-Add-an-option-to-disable-NIS.patch b/package/python/0024-Add-an-option-to-disable-NIS.patch deleted file mode 100644 index bad4ba68dc..0000000000 --- a/package/python/0024-Add-an-option-to-disable-NIS.patch +++ /dev/null @@ -1,35 +0,0 @@ -From ecd8e926bd364d866f492df87d7c46d029445480 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 22:29:41 +0100 -Subject: [PATCH] Add an option to disable NIS - -NIS is not necessarily available in uClibc, so we need an option to -not compile support for it. - -Signed-off-by: Thomas Petazzoni -[Peter: update for 2.7.16] -Signed-off-by: Peter Korsgaard ---- - configure.ac | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 862c8ae516..354212fb16 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2857,6 +2857,12 @@ AC_ARG_ENABLE(codecs-cjk, - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk" - fi]) - -+AC_ARG_ENABLE(nis, -+ AS_HELP_STRING([--disable-nis], [disable NIS]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis" -+ fi]) -+ - AC_SUBST(TK) - AC_ARG_ENABLE(tk, - AS_HELP_STRING([--disable-tk], [disable tk]), --- -2.11.0 - diff --git a/package/python/0025-Add-an-option-to-disable-unicodedata.patch b/package/python/0025-Add-an-option-to-disable-unicodedata.patch deleted file mode 100644 index 687ea5027e..0000000000 --- a/package/python/0025-Add-an-option-to-disable-unicodedata.patch +++ /dev/null @@ -1,32 +0,0 @@ -From dc99b7a0331fe75d70ccb87dc0877ac5bbba51ca Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 22:29:52 +0100 -Subject: [PATCH] Add an option to disable unicodedata - -Signed-off-by: Thomas Petazzoni -[Peter: update for 2.7.16] -Signed-off-by: Peter Korsgaard ---- - configure.ac | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 354212fb16..4e430d82b8 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2863,6 +2863,12 @@ AC_ARG_ENABLE(nis, - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis" - fi]) - -+AC_ARG_ENABLE(unicodedata, -+ AS_HELP_STRING([--disable-unicodedata], [disable unicodedata]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} unicodedata" -+ fi]) -+ - AC_SUBST(TK) - AC_ARG_ENABLE(tk, - AS_HELP_STRING([--disable-tk], [disable tk]), --- -2.11.0 - diff --git a/package/python/0026-Add-an-option-to-disable-bsddb.patch b/package/python/0026-Add-an-option-to-disable-bsddb.patch deleted file mode 100644 index f216e8bb57..0000000000 --- a/package/python/0026-Add-an-option-to-disable-bsddb.patch +++ /dev/null @@ -1,87 +0,0 @@ -From a4bbbf0c5f1f68298d5f4e2c2cd80de7e758763c Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 22:30:06 +0100 -Subject: [PATCH] Add an option to disable bsddb - -bsddb has an external dependency on Berkeley DB. Since we want to be -able to build Python without it, this patch adds an option to disable -the build/installation of this Python module. - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Samuel Martin -[Peter: update for 2.7.16] -Signed-off-by: Peter Korsgaard ---- - Makefile.pre.in | 8 ++++++-- - configure.ac | 22 ++++++++++++++++++++++ - 2 files changed, 28 insertions(+), 2 deletions(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 8dee345539..a0473096c1 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -1053,7 +1053,7 @@ LIBSUBDIRS= site-packages \ - email email/mime \ - ensurepip ensurepip/_bundled \ - json \ -- logging bsddb csv importlib wsgiref \ -+ logging csv importlib wsgiref \ - ctypes ctypes/macholib \ - idlelib idlelib/Icons \ - distutils distutils/command \ -@@ -1070,7 +1070,6 @@ TESTSUBDIRS = test test/audiodata test/capath test/data \ - test/tracedmodules \ - email/test email/test/data \ - json/tests \ -- bsddb/test \ - ctypes/test \ - idlelib/idle_test \ - distutils/tests \ -@@ -1111,6 +1110,11 @@ ifeq (@EXPAT@,yes) - LIBSUBDIRS += $(XMLLIBSUBDIRS) - endif - -+ifeq (@BSDDB@,yes) -+LIBSUBDIRS += bsddb -+TESTSUBDIRS += bsddb/test -+endif -+ - libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c - @for i in $(SCRIPTDIR) $(LIBDEST); \ - do \ -diff --git a/configure.ac b/configure.ac -index 4e430d82b8..361e8c120e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2863,6 +2863,28 @@ AC_ARG_ENABLE(nis, - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis" - fi]) - -+AC_ARG_ENABLE(dbm, -+ AS_HELP_STRING([--disable-dbm], [disable DBM]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} dbm" -+ fi]) -+ -+AC_ARG_ENABLE(gdbm, -+ AS_HELP_STRING([--disable-gdbm], [disable GDBM]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} gdbm" -+ fi]) -+ -+AC_SUBST(BSDDB) -+AC_ARG_ENABLE(bsddb, -+ AS_HELP_STRING([--disable-bsddb], [disable BerkeyleyDB]), -+ [ if test "$enableval" = "no"; then -+ BSDDB=no -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _bsddb" -+ else -+ BSDDB=yes -+ fi], [ BSDDB=yes ]) -+ - AC_ARG_ENABLE(unicodedata, - AS_HELP_STRING([--disable-unicodedata], [disable unicodedata]), - [ if test "$enableval" = "no"; then --- -2.11.0 - diff --git a/package/python/0027-Add-an-option-to-disable-the-ssl-module.patch b/package/python/0027-Add-an-option-to-disable-the-ssl-module.patch deleted file mode 100644 index d62408e4e9..0000000000 --- a/package/python/0027-Add-an-option-to-disable-the-ssl-module.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a0e56b96c3bfb04a5c8ecc0987cdd294d8ce116b Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 22:30:22 +0100 -Subject: [PATCH] Add an option to disable the ssl module - -Signed-off-by: Thomas Petazzoni -[Peter: update for 2.7.16] -Signed-off-by: Peter Korsgaard ---- - configure.ac | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 361e8c120e..8fe47d8c37 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2863,6 +2863,12 @@ AC_ARG_ENABLE(nis, - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis" - fi]) - -+AC_ARG_ENABLE(ssl, -+ AS_HELP_STRING([--disable-ssl], [disable SSL]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _ssl" -+ fi]) -+ - AC_ARG_ENABLE(dbm, - AS_HELP_STRING([--disable-dbm], [disable DBM]), - [ if test "$enableval" = "no"; then --- -2.11.0 - diff --git a/package/python/0028-Add-an-option-to-disable-the-bz2-module.patch b/package/python/0028-Add-an-option-to-disable-the-bz2-module.patch deleted file mode 100644 index 5b89e8ef87..0000000000 --- a/package/python/0028-Add-an-option-to-disable-the-bz2-module.patch +++ /dev/null @@ -1,32 +0,0 @@ -From d1236c6f4d8d893709fa36f751af47b8ad9055c1 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 22:30:33 +0100 -Subject: [PATCH] Add an option to disable the bz2 module - -Signed-off-by: Thomas Petazzoni -[Peter: update for 2.7.16] -Signed-off-by: Peter Korsgaard ---- - configure.ac | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 8fe47d8c37..85df7b1478 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2869,6 +2869,12 @@ AC_ARG_ENABLE(ssl, - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _ssl" - fi]) - -+AC_ARG_ENABLE(bz2, -+ AS_HELP_STRING([--disable-bz2], [disable BZIP2]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} bz2" -+ fi]) -+ - AC_ARG_ENABLE(dbm, - AS_HELP_STRING([--disable-dbm], [disable DBM]), - [ if test "$enableval" = "no"; then --- -2.11.0 - diff --git a/package/python/0029-Add-an-option-to-disable-the-zlib-module.patch b/package/python/0029-Add-an-option-to-disable-the-zlib-module.patch deleted file mode 100644 index 95da586e46..0000000000 --- a/package/python/0029-Add-an-option-to-disable-the-zlib-module.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a9c7314e069036f74b503dfaef261e5f45477b7e Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 22:30:45 +0100 -Subject: [PATCH] Add an option to disable the zlib module - -Signed-off-by: Thomas Petazzoni -[Peter: update for 2.7.16] -Signed-off-by: Peter Korsgaard ---- - configure.ac | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 85df7b1478..3848b16b9f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2875,6 +2875,12 @@ AC_ARG_ENABLE(bz2, - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} bz2" - fi]) - -+AC_ARG_ENABLE(zlib, -+ AS_HELP_STRING([--disable-zlib], [disable ZLIB]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} zlib" -+ fi]) -+ - AC_ARG_ENABLE(dbm, - AS_HELP_STRING([--disable-dbm], [disable DBM]), - [ if test "$enableval" = "no"; then --- -2.11.0 - diff --git a/package/python/0030-Do-not-install-the-idle-editor.patch b/package/python/0030-Do-not-install-the-idle-editor.patch deleted file mode 100644 index e101e6a12c..0000000000 --- a/package/python/0030-Do-not-install-the-idle-editor.patch +++ /dev/null @@ -1,55 +0,0 @@ -From e789487c783f75c17a8951bd5324c86ceefde407 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 22:30:56 +0100 -Subject: [PATCH] Do not install the idle editor - -IDLE is the Python IDE built with the tkinter GUI toolkit. Since it's -highly unlikely to ever be useful in an embedded Linux system -generated by Buildroot, this patch simply disables the installation of -idle and the related Python modules. It saves 800 KB-900 KB of -installed .pyc files. - -Signed-off-by: Thomas Petazzoni -[Peter: update for 2.7.16] -Signed-off-by: Peter Korsgaard ---- - Makefile.pre.in | 2 -- - setup.py | 2 +- - 2 files changed, 1 insertion(+), 3 deletions(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index a0473096c1..750057fb96 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -1055,7 +1055,6 @@ LIBSUBDIRS= site-packages \ - json \ - logging csv importlib wsgiref \ - ctypes ctypes/macholib \ -- idlelib idlelib/Icons \ - distutils distutils/command \ - multiprocessing multiprocessing/dummy \ - unittest \ -@@ -1071,7 +1070,6 @@ TESTSUBDIRS = test test/audiodata test/capath test/data \ - email/test email/test/data \ - json/tests \ - ctypes/test \ -- idlelib/idle_test \ - distutils/tests \ - unittest/test - -diff --git a/setup.py b/setup.py -index f439cbadc2..227187681e 100644 ---- a/setup.py -+++ b/setup.py -@@ -2278,7 +2278,7 @@ def main(): - import warnings - warnings.filterwarnings("ignore",category=DeprecationWarning) - -- scripts = ['Tools/scripts/idle', 'Lib/smtpd.py'] -+ scripts = ['Lib/smtpd.py'] - if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"): - scripts += [ 'Tools/scripts/pydoc' ] - if not '--disable-lib2to3' in sysconfig.get_config_var("CONFIG_ARGS"): --- -2.11.0 - diff --git a/package/python/0031-Add-an-option-to-disable-the-ossaudiodev-module.patch b/package/python/0031-Add-an-option-to-disable-the-ossaudiodev-module.patch deleted file mode 100644 index 9768faf676..0000000000 --- a/package/python/0031-Add-an-option-to-disable-the-ossaudiodev-module.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 4ab280b8a7626de2565cf4ef6cf08a5c7326574b Mon Sep 17 00:00:00 2001 -From: Zoltan Gyarmati -Date: Tue, 7 Mar 2017 22:31:22 +0100 -Subject: [PATCH] Add an option to disable the ossaudiodev module - -Signed-off-by: Zoltan Gyarmati -[Peter: update for 2.7.16] -Signed-off-by: Peter Korsgaard ---- - configure.ac | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 3848b16b9f..6d19cdee95 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2927,6 +2927,12 @@ if test "$CURSES" = "no"; then - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _curses _curses_panel" - fi - -+AC_ARG_ENABLE(ossaudiodev, -+ AS_HELP_STRING([--disable-ossaudiodev], [disable OSSAUDIODEV]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ossaudiodev" -+ fi]) -+ - AC_SUBST(PYDOC) - - AC_ARG_ENABLE(pydoc, --- -2.11.0 - diff --git a/package/python/0032-Add-option-to-disable-the-hashlib-module.patch b/package/python/0032-Add-option-to-disable-the-hashlib-module.patch deleted file mode 100644 index 82ef3a13f7..0000000000 --- a/package/python/0032-Add-option-to-disable-the-hashlib-module.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 479bef8182c4f6b678a86820ccc06760ca60c286 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 22:33:02 +0100 -Subject: [PATCH] Add option to disable the hashlib module - -Signed-off-by: Thomas Petazzoni -[Peter: update for 2.7.16] -Signed-off-by: Peter Korsgaard ---- - configure.ac | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 6d19cdee95..ddccc79c2c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2869,6 +2869,12 @@ AC_ARG_ENABLE(ssl, - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _ssl" - fi]) - -+AC_ARG_ENABLE(hashlib, -+ AS_HELP_STRING([--disable-hashlib], [disable hashlib]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _hashlib" -+ fi]) -+ - AC_ARG_ENABLE(bz2, - AS_HELP_STRING([--disable-bz2], [disable BZIP2]), - [ if test "$enableval" = "no"; then --- -2.11.0 - diff --git a/package/python/0033-Add-an-option-to-disable-readline-module.patch b/package/python/0033-Add-an-option-to-disable-readline-module.patch deleted file mode 100644 index 02b1315179..0000000000 --- a/package/python/0033-Add-an-option-to-disable-readline-module.patch +++ /dev/null @@ -1,32 +0,0 @@ -From abea92958b073dfbf0c78bcb31ce9cfc709c20ca Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 22:33:55 +0100 -Subject: [PATCH] Add an option to disable readline module - -Signed-off-by: Thomas Petazzoni -[Peter: update for 2.7.16] -Signed-off-by: Peter Korsgaard ---- - configure.ac | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/configure.ac b/configure.ac -index ddccc79c2c..dae266326e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2875,6 +2875,12 @@ AC_ARG_ENABLE(hashlib, - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _hashlib" - fi]) - -+AC_ARG_ENABLE(readline, -+ AS_HELP_STRING([--disable-readline], [disable readline]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} readline" -+ fi]) -+ - AC_ARG_ENABLE(bz2, - AS_HELP_STRING([--disable-bz2], [disable BZIP2]), - [ if test "$enableval" = "no"; then --- -2.11.0 - diff --git a/package/python/0034-Override-system-locale-and-set-to-default-when-addin.patch b/package/python/0034-Override-system-locale-and-set-to-default-when-addin.patch deleted file mode 100644 index 8fe722bc6c..0000000000 --- a/package/python/0034-Override-system-locale-and-set-to-default-when-addin.patch +++ /dev/null @@ -1,37 +0,0 @@ -From d2bfa8805206db8c57c182094396d20a9d94bd8f Mon Sep 17 00:00:00 2001 -From: Samuel Cabrero -Date: Sat, 1 Apr 2017 09:31:52 +0200 -Subject: [PATCH] Override system locale and set to default when adding gcc - paths - -Forces the use of the default locale in the function -add_gcc_paths, which is called when cross compiling to add the -include and library paths. This is necessary because otherwise -the gcc output is localized and the output parsing fails, which -results in no paths added and detect_modules not able to find -any system library (eg. libz, libssl, etc.) - -[Thomas: patch taken from https://bugs.python.org/issue23767.] - -Signed-off-by: Samuel Cabrero -Signed-off-by: Thomas Petazzoni ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 8045a9b..c14f4ab 100644 ---- a/setup.py -+++ b/setup.py -@@ -430,7 +430,7 @@ class PyBuildExt(build_ext): - tmpfile = os.path.join(self.build_temp, 'gccpaths') - if not os.path.exists(self.build_temp): - os.makedirs(self.build_temp) -- ret = os.system('%s -E -v - %s 1>/dev/null' % (gcc, tmpfile)) -+ ret = os.system('LC_ALL=C %s -E -v - %s 1>/dev/null' % (gcc, tmpfile)) - is_gcc = False - in_incdirs = False - inc_dirs = [] --- -2.7.4 - diff --git a/package/python/Config.in.host b/package/python/Config.in.host deleted file mode 100644 index 724e5e223a..0000000000 --- a/package/python/Config.in.host +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_HOST_PYTHON - bool "host python" - help - The python language interpreter. Host package. - - http://www.python.org/ - -if BR2_PACKAGE_HOST_PYTHON - -config BR2_PACKAGE_HOST_PYTHON_SSL - bool "ssl" - select BR2_PACKAGE_HOST_OPENSSL - help - _ssl module for host Python. - -endif diff --git a/package/python/python.hash b/package/python/python.hash deleted file mode 100644 index f5e51d9638..0000000000 --- a/package/python/python.hash +++ /dev/null @@ -1,5 +0,0 @@ -# From https://www.python.org/downloads/release/python-2718/ -md5 fd6cc8ec0a78c44036f825e739f36e5a Python-2.7.18.tar.xz -# Locally calculated -sha256 b62c0e7937551d0cc02b8fd5cb0f544f9405bafc9a54d3808ed4594812edef43 Python-2.7.18.tar.xz -sha256 de4d1f2d2ad5ad0cfd1657a106476b31cb5db5ef9d1ff842b237c0c81f0c8a23 LICENSE diff --git a/package/python/python.mk b/package/python/python.mk deleted file mode 100644 index ae99f382f9..0000000000 --- a/package/python/python.mk +++ /dev/null @@ -1,302 +0,0 @@ -################################################################################ -# -# python -# -################################################################################ - -PYTHON_VERSION_MAJOR = 2.7 -PYTHON_VERSION = $(PYTHON_VERSION_MAJOR).18 -PYTHON_SOURCE = Python-$(PYTHON_VERSION).tar.xz -PYTHON_SITE = https://python.org/ftp/python/$(PYTHON_VERSION) -PYTHON_LICENSE = Python-2.0, others -PYTHON_LICENSE_FILES = LICENSE -PYTHON_CPE_ID_VENDOR = python -PYTHON_LIBTOOL_PATCH = NO - -# Python needs itself to be built, so in order to cross-compile -# Python, we need to build a host Python first. This host Python is -# also installed in $(HOST_DIR), as it is needed when cross-compiling -# third-party Python modules. - -HOST_PYTHON_CONF_OPTS += \ - --enable-static \ - --without-cxx-main \ - --disable-sqlite3 \ - --disable-tk \ - --with-expat=system \ - --with-system-ffi \ - --disable-curses \ - --disable-codecs-cjk \ - --disable-nis \ - --enable-unicodedata \ - --disable-dbm \ - --disable-gdbm \ - --disable-bsddb \ - --disable-test-modules \ - --disable-bz2 \ - --disable-ossaudiodev \ - --disable-pyo-build - -# Make sure that LD_LIBRARY_PATH overrides -rpath. -# This is needed because libpython may be installed at the same time that -# python is called. -# Make python believe we don't have 'hg' and 'svn', so that it doesn't -# try to communicate over the network during the build. -HOST_PYTHON_CONF_ENV += \ - LDFLAGS="$(HOST_LDFLAGS) -Wl,--enable-new-dtags" \ - ac_cv_prog_HAS_HG=/bin/false \ - ac_cv_prog_SVNVERSION=/bin/false - -# Building host python in parallel sometimes triggers a "Bus error" -# during the execution of "./python setup.py build" in the -# installation step. It is probably due to the installation of a -# shared library taking place in parallel to the execution of -# ./python, causing spurious Bus error. Building host-python with -# MAKE1 has shown to workaround the problem. -HOST_PYTHON_MAKE = $(MAKE1) - -PYTHON_DEPENDENCIES = host-python libffi $(TARGET_NLS_DEPENDENCIES) - -HOST_PYTHON_DEPENDENCIES = host-expat host-libffi host-zlib - -ifeq ($(BR2_PACKAGE_HOST_PYTHON_SSL),y) -HOST_PYTHON_DEPENDENCIES += host-openssl -else -HOST_PYTHON_CONF_OPTS += --disable-ssl -endif - -PYTHON_INSTALL_STAGING = YES - -ifeq ($(BR2_PACKAGE_PYTHON_READLINE),y) -PYTHON_DEPENDENCIES += readline -else -PYTHON_CONF_OPTS += --disable-readline -endif - -ifeq ($(BR2_PACKAGE_PYTHON_CURSES),y) -PYTHON_DEPENDENCIES += ncurses -else -PYTHON_CONF_OPTS += --disable-curses -endif - -ifeq ($(BR2_PACKAGE_PYTHON_PYEXPAT),y) -PYTHON_DEPENDENCIES += expat -PYTHON_CONF_OPTS += --with-expat=system -else -PYTHON_CONF_OPTS += --with-expat=none -endif - -ifeq ($(BR2_PACKAGE_PYTHON_BSDDB),y) -PYTHON_DEPENDENCIES += berkeleydb -else -PYTHON_CONF_OPTS += --disable-bsddb -endif - -ifeq ($(BR2_PACKAGE_PYTHON_SQLITE),y) -PYTHON_DEPENDENCIES += sqlite -else -PYTHON_CONF_OPTS += --disable-sqlite3 -endif - -ifeq ($(BR2_PACKAGE_PYTHON_SSL),y) -PYTHON_DEPENDENCIES += openssl -else -PYTHON_CONF_OPTS += --disable-ssl -endif - -ifneq ($(BR2_PACKAGE_PYTHON_CODECSCJK),y) -PYTHON_CONF_OPTS += --disable-codecs-cjk -endif - -ifneq ($(BR2_PACKAGE_PYTHON_UNICODEDATA),y) -PYTHON_CONF_OPTS += --disable-unicodedata -endif - -# Default is UCS2 w/o a conf opt -ifeq ($(BR2_PACKAGE_PYTHON_UCS4),y) -# host-python must have the same UCS2/4 configuration as the target -# python -HOST_PYTHON_CONF_OPTS += --enable-unicode=ucs4 -PYTHON_CONF_OPTS += --enable-unicode=ucs4 -endif - -ifeq ($(BR2_PACKAGE_PYTHON_2TO3),y) -PYTHON_CONF_OPTS += --enable-lib2to3 -else -PYTHON_CONF_OPTS += --disable-lib2to3 -endif - -ifeq ($(BR2_PACKAGE_PYTHON_BZIP2),y) -PYTHON_DEPENDENCIES += bzip2 -else -PYTHON_CONF_OPTS += --disable-bz2 -endif - -ifeq ($(BR2_PACKAGE_PYTHON_ZLIB),y) -PYTHON_DEPENDENCIES += zlib -else -PYTHON_CONF_OPTS += --disable-zlib -endif - -ifeq ($(BR2_PACKAGE_PYTHON_HASHLIB),y) -PYTHON_DEPENDENCIES += openssl -else -PYTHON_CONF_OPTS += --disable-hashlib -endif - -ifeq ($(BR2_PACKAGE_PYTHON_OSSAUDIODEV),y) -PYTHON_CONF_OPTS += --enable-ossaudiodev -else -PYTHON_CONF_OPTS += --disable-ossaudiodev -endif - -# Make python believe we don't have 'hg' and 'svn', so that it doesn't -# try to communicate over the network during the build. -PYTHON_CONF_ENV += \ - ac_cv_have_long_long_format=yes \ - ac_cv_file__dev_ptmx=yes \ - ac_cv_file__dev_ptc=yes \ - ac_cv_working_tzset=yes \ - ac_cv_prog_HAS_HG=/bin/false \ - ac_cv_prog_SVNVERSION=/bin/false - -# GCC is always compliant with IEEE754 -ifeq ($(BR2_ENDIAN),"LITTLE") -PYTHON_CONF_ENV += ac_cv_little_endian_double=yes -else -PYTHON_CONF_ENV += ac_cv_big_endian_double=yes -endif - -PYTHON_CONF_OPTS += \ - --without-cxx-main \ - --without-doc-strings \ - --with-system-ffi \ - --disable-pydoc \ - --disable-test-modules \ - --disable-gdbm \ - --disable-tk \ - --disable-nis \ - --disable-dbm \ - --disable-pyo-build \ - --disable-pyc-build - -# This is needed to make sure the Python build process doesn't try to -# regenerate those files with the pgen program. Otherwise, it builds -# pgen for the target, and tries to run it on the host. - -define PYTHON_TOUCH_GRAMMAR_FILES - touch $(@D)/Include/graminit.h $(@D)/Python/graminit.c -endef - -PYTHON_POST_PATCH_HOOKS += PYTHON_TOUCH_GRAMMAR_FILES - -# -# Remove useless files. In the config/ directory, only the Makefile -# and the pyconfig.h files are needed at runtime. -# -# idle & smtpd.py have bad shebangs and are mostly samples -# -define PYTHON_REMOVE_USELESS_FILES - rm -f $(TARGET_DIR)/usr/bin/python$(PYTHON_VERSION_MAJOR)-config - rm -f $(TARGET_DIR)/usr/bin/python2-config - rm -f $(TARGET_DIR)/usr/bin/python-config - rm -f $(TARGET_DIR)/usr/bin/smtpd.py - rm -f $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/distutils/command/wininst*.exe - for i in `find $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/config/ \ - -type f -not -name pyconfig.h -a -not -name Makefile` ; do \ - rm -f $$i ; \ - done -endef - -PYTHON_POST_INSTALL_TARGET_HOOKS += PYTHON_REMOVE_USELESS_FILES - -# -# Make sure libpython gets stripped out on target -# -define PYTHON_ENSURE_LIBPYTHON_STRIPPED - chmod u+w $(TARGET_DIR)/usr/lib/libpython$(PYTHON_VERSION_MAJOR)*.so -endef - -PYTHON_POST_INSTALL_TARGET_HOOKS += PYTHON_ENSURE_LIBPYTHON_STRIPPED - -# Always install the python symlink in the target tree -define PYTHON_INSTALL_TARGET_PYTHON_SYMLINK - ln -sf python2 $(TARGET_DIR)/usr/bin/python -endef - -PYTHON_POST_INSTALL_TARGET_HOOKS += PYTHON_INSTALL_TARGET_PYTHON_SYMLINK - -# Always install the python-config symlink in the staging tree -define PYTHON_INSTALL_STAGING_PYTHON_CONFIG_SYMLINK - ln -sf python2-config $(STAGING_DIR)/usr/bin/python-config -endef - -PYTHON_POST_INSTALL_STAGING_HOOKS += PYTHON_INSTALL_STAGING_PYTHON_CONFIG_SYMLINK - -PYTHON_AUTORECONF = YES - -# Some packages may have build scripts requiring python2. -# Only install the python symlink in the host tree if python3 is not enabled -# for the target, otherwise the default python program may be missing. -ifneq ($(BR2_PACKAGE_PYTHON3),y) -define HOST_PYTHON_INSTALL_PYTHON_SYMLINK - ln -sf python2 $(HOST_DIR)/bin/python - ln -sf python2-config $(HOST_DIR)/bin/python-config -endef - -HOST_PYTHON_POST_INSTALL_HOOKS += HOST_PYTHON_INSTALL_PYTHON_SYMLINK -endif - -# Provided to other packages -PYTHON_PATH = $(STAGING_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/sysconfigdata/ - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) - -ifeq ($(BR2_REPRODUCIBLE),y) -define PYTHON_FIX_TIME - find $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR) -name '*.py' -print0 | \ - xargs -0 --no-run-if-empty touch -d @$(SOURCE_DATE_EPOCH) -endef -endif - -define PYTHON_CREATE_PYC_FILES - $(PYTHON_FIX_TIME) - PYTHONPATH="$(PYTHON_PATH)" \ - $(HOST_DIR)/bin/python$(PYTHON_VERSION_MAJOR) \ - $(TOPDIR)/support/scripts/pycompile.py \ - $(if $(VERBOSE),--verbose) \ - --strip-root $(TARGET_DIR) \ - $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR) -endef - -ifeq ($(BR2_PACKAGE_PYTHON_PYC_ONLY)$(BR2_PACKAGE_PYTHON_PY_PYC),y) -PYTHON_TARGET_FINALIZE_HOOKS += PYTHON_CREATE_PYC_FILES -endif - -ifeq ($(BR2_PACKAGE_PYTHON_PYC_ONLY),y) -define PYTHON_REMOVE_PY_FILES - find $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR) -name '*.py' \ - $(if $(strip $(KEEP_PYTHON_PY_FILES)),-not \( $(call finddirclauses,$(TARGET_DIR),$(KEEP_PYTHON_PY_FILES)) \) ) \ - -print0 | \ - xargs -0 --no-run-if-empty rm -f -endef -PYTHON_TARGET_FINALIZE_HOOKS += PYTHON_REMOVE_PY_FILES -endif - -# Normally, *.pyc files should not have been compiled, but just in -# case, we make sure we remove all of them. -ifeq ($(BR2_PACKAGE_PYTHON_PY_ONLY),y) -define PYTHON_REMOVE_PYC_FILES - find $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR) -name '*.pyc' -print0 | \ - xargs -0 --no-run-if-empty rm -f -endef -PYTHON_TARGET_FINALIZE_HOOKS += PYTHON_REMOVE_PYC_FILES -endif - -# In all cases, we don't want to keep the optimized .pyo files -define PYTHON_REMOVE_PYO_FILES - find $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR) -name '*.pyo' -print0 | \ - xargs -0 --no-run-if-empty rm -f -endef -PYTHON_TARGET_FINALIZE_HOOKS += PYTHON_REMOVE_PYO_FILES -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:57 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:57 +0100 Subject: [Buildroot] [PATCH 091/107] package/python-ipaddress: drop python2 specific package In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-92-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++++ package/Config.in | 1 - package/python-ipaddress/Config.in | 7 ------- package/python-ipaddress/python-ipaddress.hash | 5 ----- package/python-ipaddress/python-ipaddress.mk | 14 -------------- 5 files changed, 6 insertions(+), 27 deletions(-) delete mode 100644 package/python-ipaddress/Config.in delete mode 100644 package/python-ipaddress/python-ipaddress.hash delete mode 100644 package/python-ipaddress/python-ipaddress.mk diff --git a/Config.in.legacy b/Config.in.legacy index c78fb20756..14b26408fe 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_IPADDRESS + bool "python-ipaddress removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_IPADDR bool "python-ipaddr removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index 611a8f6aa8..50c0e13510 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1058,7 +1058,6 @@ menu "External python modules" source "package/python-iniparse/Config.in" source "package/python-intelhex/Config.in" source "package/python-iowait/Config.in" - source "package/python-ipaddress/Config.in" source "package/python-ipdb/Config.in" source "package/python-iptables/Config.in" source "package/python-ipy/Config.in" diff --git a/package/python-ipaddress/Config.in b/package/python-ipaddress/Config.in deleted file mode 100644 index b2b9f0b1c3..0000000000 --- a/package/python-ipaddress/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_IPADDRESS - bool "python-ipaddress" - depends on BR2_PACKAGE_PYTHON - help - Python 3.3's ipaddress for older Python versions. - - https://github.com/phihag/ipaddress diff --git a/package/python-ipaddress/python-ipaddress.hash b/package/python-ipaddress/python-ipaddress.hash deleted file mode 100644 index e61835e192..0000000000 --- a/package/python-ipaddress/python-ipaddress.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/ipaddress/json -md5 aaee67a8026782af1831148beb0d9060 ipaddress-1.0.23.tar.gz -sha256 b7f8e0369580bb4a24d5ba1d7cc29660a4a6987763faf1d8a8046830e020e7e2 ipaddress-1.0.23.tar.gz -# Locally computed sha256 checksums -sha256 38675419eb4a79ec616396d70f1254b3a433fb7088fb3f4cc9b6c0bcdcec6162 LICENSE diff --git a/package/python-ipaddress/python-ipaddress.mk b/package/python-ipaddress/python-ipaddress.mk deleted file mode 100644 index 8f1ad5ffc7..0000000000 --- a/package/python-ipaddress/python-ipaddress.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-ipaddress -# -################################################################################ - -PYTHON_IPADDRESS_VERSION = 1.0.23 -PYTHON_IPADDRESS_SOURCE = ipaddress-$(PYTHON_IPADDRESS_VERSION).tar.gz -PYTHON_IPADDRESS_SITE = https://files.pythonhosted.org/packages/b9/9a/3e9da40ea28b8210dd6504d3fe9fe7e013b62bf45902b458d1cdc3c34ed9 -PYTHON_IPADDRESS_LICENSE = Python-2.0 -PYTHON_IPADDRESS_LICENSE_FILES = LICENSE -PYTHON_IPADDRESS_SETUP_TYPE = setuptools - -$(eval $(python-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:52:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:52:03 +0100 Subject: [Buildroot] [PATCH 097/107] package/python-pyro: drop python2 specific package In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-98-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++++ package/Config.in | 1 - package/python-pyro/Config.in | 10 ---------- package/python-pyro/python-pyro.hash | 5 ----- package/python-pyro/python-pyro.mk | 16 ---------------- 5 files changed, 6 insertions(+), 32 deletions(-) delete mode 100644 package/python-pyro/Config.in delete mode 100644 package/python-pyro/python-pyro.hash delete mode 100644 package/python-pyro/python-pyro.mk diff --git a/Config.in.legacy b/Config.in.legacy index f99535411d..319057f748 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_PYRO + bool "python-pyro removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_PYPCAP bool "python-pypcap removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index d406d372d3..0d8ff0d4d1 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1176,7 +1176,6 @@ menu "External python modules" source "package/python-pyqrcode/Config.in" source "package/python-pyqt5/Config.in" source "package/python-pyratemp/Config.in" - source "package/python-pyro/Config.in" source "package/python-pyroute2/Config.in" source "package/python-pysendfile/Config.in" source "package/python-pysftp/Config.in" diff --git a/package/python-pyro/Config.in b/package/python-pyro/Config.in deleted file mode 100644 index 6372a1d376..0000000000 --- a/package/python-pyro/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYRO - bool "python-pyro" - depends on BR2_PACKAGE_PYTHON - help - python-pyro is a Python library stands for PYthon Remote - Objects. It is an advanced and powerful Distributed Object - Technology system written entirely in Python, that is - designed to be very easy to use.. - - https://pypi.python.org/pypi/Pyro/ diff --git a/package/python-pyro/python-pyro.hash b/package/python-pyro/python-pyro.hash deleted file mode 100644 index c22b66ddc4..0000000000 --- a/package/python-pyro/python-pyro.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5 from https://pypi.python.org/pypi/pyro/json -md5 59d4d3f4a8786776c9d7f9051b8f1a69 Pyro-3.16.tar.gz -# Locally computed -sha256 1bed508453ef7a7556b51424a58101af2349b662baab7e7331c5cb85dbe7e578 Pyro-3.16.tar.gz -sha256 7c14017a2f543384bfcde86043758b68d023b47bf09700a7df6dacbae9c82103 LICENSE diff --git a/package/python-pyro/python-pyro.mk b/package/python-pyro/python-pyro.mk deleted file mode 100644 index 235575c195..0000000000 --- a/package/python-pyro/python-pyro.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# python-pyro -# -################################################################################ - -PYTHON_PYRO_VERSION = 3.16 -PYTHON_PYRO_SOURCE = Pyro-$(PYTHON_PYRO_VERSION).tar.gz -PYTHON_PYRO_SITE = https://pypi.python.org/packages/61/68/0978adae315261b87acd216517c2c7f00780396e4d1426c5412458c6a28f -PYTHON_PYRO_LICENSE = MIT -PYTHON_PYRO_LICENSE_FILES = LICENSE -PYTHON_PYRO_CPE_ID_VENDOR = pyro_project -PYTHON_PYRO_CPE_ID_PRODUCT = pyro -PYTHON_PYRO_SETUP_TYPE = setuptools - -$(eval $(python-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:52:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:52:00 +0100 Subject: [Buildroot] [PATCH 094/107] package/python-pam: drop python2 specific package In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-95-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 + DEVELOPERS | 1 - package/Config.in | 1 - package/python-pam/0001-dealloc.patch | 25 ---- package/python-pam/0002-nofree.patch | 68 --------- .../0003-memory-errors-CVE2012-1502.patch | 136 ------------------ package/python-pam/Config.in | 16 --- package/python-pam/python-pam.hash | 3 - package/python-pam/python-pam.mk | 16 --- 9 files changed, 6 insertions(+), 266 deletions(-) delete mode 100644 package/python-pam/0001-dealloc.patch delete mode 100644 package/python-pam/0002-nofree.patch delete mode 100644 package/python-pam/0003-memory-errors-CVE2012-1502.patch delete mode 100644 package/python-pam/Config.in delete mode 100644 package/python-pam/python-pam.hash delete mode 100644 package/python-pam/python-pam.mk diff --git a/Config.in.legacy b/Config.in.legacy index 80adf521f8..386f94e72b 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_PAM + bool "python-pam removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_NFC bool "python-nfc removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 7b38d3c0f7..a6ea3793ea 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2248,7 +2248,6 @@ F: package/python-docker-pycreds/ F: package/python-enum/ F: package/python-enum34/ F: package/python-functools32/ -F: package/python-pam/ F: package/python-psutil/ F: package/python-request-id/ F: package/python-semver/ diff --git a/package/Config.in b/package/Config.in index 8dc91becb0..73e8901a1d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1115,7 +1115,6 @@ menu "External python modules" source "package/python-opcua-asyncio/Config.in" source "package/python-packaging/Config.in" source "package/python-paho-mqtt/Config.in" - source "package/python-pam/Config.in" source "package/python-paramiko/Config.in" source "package/python-parso/Config.in" source "package/python-passlib/Config.in" diff --git a/package/python-pam/0001-dealloc.patch b/package/python-pam/0001-dealloc.patch deleted file mode 100644 index dd4f9610c7..0000000000 --- a/package/python-pam/0001-dealloc.patch +++ /dev/null @@ -1,25 +0,0 @@ -[PATCH] fix two bugs in the PAM object deallocation - -Fixes https://bugzilla.redhat.com/show_bug.cgi?id=658955 - -Downloaded from: -http://pkgs.fedoraproject.org/cgit/PyPAM.git/plain/PyPAM-0.5.0-dealloc.patch - -Signed-off-by: Peter Korsgaard -diff -up PyPAM-0.5.0/PAMmodule.c.dealloc PyPAM-0.5.0/PAMmodule.c ---- PyPAM-0.5.0/PAMmodule.c.dealloc 2011-01-17 22:48:22.000000000 +0100 -+++ PyPAM-0.5.0/PAMmodule.c 2011-01-18 21:24:59.000000000 +0100 -@@ -538,10 +538,11 @@ static void PyPAM_dealloc(PyPAMObject *s - free(self->service); - free(self->user); - free(self->conv); -- pam_end(self->pamh, PAM_SUCCESS); -+ if (self->pamh) -+ pam_end(self->pamh, PAM_SUCCESS); - dlclose(self->dlh2); - dlclose(self->dlh1); -- PyMem_DEL(self); -+ PyObject_Del(self); - } - - static PyObject * PyPAM_getattr(PyPAMObject *self, char *name) diff --git a/package/python-pam/0002-nofree.patch b/package/python-pam/0002-nofree.patch deleted file mode 100644 index 7de8801707..0000000000 --- a/package/python-pam/0002-nofree.patch +++ /dev/null @@ -1,68 +0,0 @@ -[PATCH] deallocate the conversation response only in case of error - -Fixes https://bugzilla.redhat.com/show_bug.cgi?id=679714 - -Downloaded from: -http://pkgs.fedoraproject.org/cgit/PyPAM.git/plain/PyPAM-0.5.0-nofree.patch - -Signed-off-by: Peter Korsgaard -diff --git a/PAMmodule.c b/PAMmodule.c -index 03cb799..a7ff8a5 100644 ---- a/PAMmodule.c -+++ b/PAMmodule.c -@@ -24,8 +24,6 @@ typedef struct { - char *service; - char *user; - PyObject *callback; -- struct pam_response *response_data; -- int response_len; - PyObject *user_data; - void *dlh1, *dlh2; - } PyPAMObject; -@@ -54,15 +52,6 @@ static int PyPAM_conv(int num_msg, const struct pam_message **msg, - - Py_INCREF(self); - -- if (NULL != self->response_data) { -- for (int i = 0; i < self->response_len; i++) { -- free(self->response_data[0].resp); -- } -- free(self->response_data); -- self->response_data = NULL; -- self->response_len = 0; -- } -- - PyObject* msgList = PyList_New(num_msg); - - for (int i = 0; i < num_msg; i++) { -@@ -92,6 +81,10 @@ static int PyPAM_conv(int num_msg, const struct pam_message **msg, - char* resp_text; - int resp_retcode = 0; - if (!PyArg_ParseTuple(respTuple, "si", &resp_text, &resp_retcode)) { -+ while (i > 0) { -+ free((--spr)->resp); -+ --i; -+ } - free(*resp); - Py_DECREF(respList); - return PAM_CONV_ERR; -@@ -100,10 +93,6 @@ static int PyPAM_conv(int num_msg, const struct pam_message **msg, - spr->resp_retcode = resp_retcode; - Py_DECREF(respTuple); - } -- -- // Save this so we can free it later. -- self->response_data = *resp; -- self->response_len = PyList_Size(respList); - - Py_DECREF(respList); - -@@ -144,8 +133,6 @@ static PyObject * PyPAM_pam(PyObject *self, PyObject *args) - p->user = NULL; - Py_INCREF(Py_None); - p->callback = Py_None; -- p->response_data = NULL; -- p->response_len = 0; - Py_INCREF(Py_None); - p->user_data = Py_None; - diff --git a/package/python-pam/0003-memory-errors-CVE2012-1502.patch b/package/python-pam/0003-memory-errors-CVE2012-1502.patch deleted file mode 100644 index 62405db058..0000000000 --- a/package/python-pam/0003-memory-errors-CVE2012-1502.patch +++ /dev/null @@ -1,136 +0,0 @@ -[PATCH] Fix Double Free Corruption (CVE2012-1502) - -Downloaded from: -http://pkgs.fedoraproject.org/cgit/PyPAM.git/plain/PyPAM-0.5.0-memory-errors.patch - -For details, see: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-1502 - -Signed-off-by: Peter Korsgaard -diff -up PyPAM-0.5.0/PAMmodule.c.memory PyPAM-0.5.0/PAMmodule.c ---- PyPAM-0.5.0/PAMmodule.c.memory 2012-05-07 17:22:54.503914026 +0200 -+++ PyPAM-0.5.0/PAMmodule.c 2012-05-07 17:23:15.644381942 +0200 -@@ -37,33 +37,48 @@ static void PyPAM_Err(PyPAMObject *self, - - err_msg = pam_strerror(self->pamh, result); - error = Py_BuildValue("(si)", err_msg, result); -- Py_INCREF(PyPAM_Error); - PyErr_SetObject(PyPAM_Error, error); -+ Py_XDECREF(error); - } - - static int PyPAM_conv(int num_msg, const struct pam_message **msg, - struct pam_response **resp, void *appdata_ptr) - { -- PyObject *args; -- -+ PyObject *args, *msgList, *respList, *item; -+ struct pam_response *response, *spr; - PyPAMObject* self = (PyPAMObject *) appdata_ptr; -+ - if (self->callback == NULL) - return PAM_CONV_ERR; - - Py_INCREF(self); - -- PyObject* msgList = PyList_New(num_msg); -- -+ msgList = PyList_New(num_msg); -+ if (msgList == NULL) { -+ Py_DECREF(self); -+ return PAM_CONV_ERR; -+ } -+ - for (int i = 0; i < num_msg; i++) { -- PyList_SetItem(msgList, i, -- Py_BuildValue("(si)", msg[i]->msg, msg[i]->msg_style)); -+ item = Py_BuildValue("(si)", msg[i]->msg, msg[i]->msg_style); -+ if (item == NULL) { -+ Py_DECREF(msgList); -+ Py_DECREF(self); -+ return PAM_CONV_ERR; -+ } -+ PyList_SetItem(msgList, i, item); - } -- -+ - args = Py_BuildValue("(OO)", self, msgList); -- PyObject* respList = PyEval_CallObject(self->callback, args); -+ if (args == NULL) { -+ Py_DECREF(self); -+ Py_DECREF(msgList); -+ return PAM_CONV_ERR; -+ } -+ respList = PyEval_CallObject(self->callback, args); - Py_DECREF(args); - Py_DECREF(self); -- -+ - if (respList == NULL) - return PAM_CONV_ERR; - -@@ -71,11 +86,15 @@ static int PyPAM_conv(int num_msg, const - Py_DECREF(respList); - return PAM_CONV_ERR; - } -- -- *resp = (struct pam_response *) malloc( -+ -+ response = (struct pam_response *) malloc( - PyList_Size(respList) * sizeof(struct pam_response)); -+ if (response == NULL) { -+ Py_DECREF(respList); -+ return PAM_CONV_ERR; -+ } -+ spr = response; - -- struct pam_response* spr = *resp; - for (int i = 0; i < PyList_Size(respList); i++, spr++) { - PyObject* respTuple = PyList_GetItem(respList, i); - char* resp_text; -@@ -85,7 +104,7 @@ static int PyPAM_conv(int num_msg, const - free((--spr)->resp); - --i; - } -- free(*resp); -+ free(response); - Py_DECREF(respList); - return PAM_CONV_ERR; - } -@@ -95,7 +114,8 @@ static int PyPAM_conv(int num_msg, const - } - - Py_DECREF(respList); -- -+ *resp = response; -+ - return PAM_SUCCESS; - } - -@@ -122,7 +142,11 @@ static PyObject * PyPAM_pam(PyObject *se - PyPAMObject_Type.ob_type = &PyType_Type; - p = (PyPAMObject *) PyObject_NEW(PyPAMObject, &PyPAMObject_Type); - -+ if (p == NULL) -+ return NULL; -+ - if ((spc = (struct pam_conv *) malloc(sizeof(struct pam_conv))) == NULL) { -+ Py_DECREF((PyObject *)p); - PyErr_SetString(PyExc_MemoryError, "out of memory"); - return NULL; - } -@@ -455,9 +479,15 @@ static PyObject * PyPAM_getenvlist(PyObj - } - - retval = PyList_New(0); -+ if (retval == NULL) -+ return NULL; - - while ((cp = *(result++)) != NULL) { - entry = Py_BuildValue("s", cp); -+ if (entry == NULL) { -+ Py_DECREF(retval); -+ return NULL; -+ } - PyList_Append(retval, entry); - Py_DECREF(entry); - } diff --git a/package/python-pam/Config.in b/package/python-pam/Config.in deleted file mode 100644 index 92ba105ebf..0000000000 --- a/package/python-pam/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -comment "python-pam needs a toolchain w/ wchar, locale, dynamic library" - depends on BR2_PACKAGE_PYTHON - depends on !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR || BR2_STATIC_LIBS - -config BR2_PACKAGE_PYTHON_PAM - bool "python-pam" - depends on BR2_PACKAGE_PYTHON # C extension not compatible with python3 - depends on BR2_ENABLE_LOCALE # linux-pam - depends on BR2_USE_WCHAR # linux-pam - depends on BR2_USE_MMU # linux-pam - depends on !BR2_STATIC_LIBS # linux-pam - select BR2_PACKAGE_LINUX_PAM - help - PAM (Pluggable Authentication Module) bindings for Python. - - https://admin.fedoraproject.org/pkgdb/package/PyPAM/ diff --git a/package/python-pam/python-pam.hash b/package/python-pam/python-pam.hash deleted file mode 100644 index 303455ae2f..0000000000 --- a/package/python-pam/python-pam.hash +++ /dev/null @@ -1,3 +0,0 @@ -# locally computed -sha256 796ac019b9ee805696d0d277d8fb912fa2391b6ac070dc6f9f1a9a0fadbc3a5a PyPAM-0.5.0.tar.gz -sha256 ca0061fc1381a3ab242310e4b3f56389f28e3d460eb2fd822ed7a21c6f030532 COPYING diff --git a/package/python-pam/python-pam.mk b/package/python-pam/python-pam.mk deleted file mode 100644 index 943e01dd64..0000000000 --- a/package/python-pam/python-pam.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# python-pam -# -################################################################################ - -PYTHON_PAM_VERSION = 0.5.0 -PYTHON_PAM_SOURCE = PyPAM-$(PYTHON_PAM_VERSION).tar.gz -# pangalactic.org gone -PYTHON_PAM_SITE = http://pkgs.fedoraproject.org/repo/pkgs/PyPAM/PyPAM-0.5.0.tar.gz/f1e7c2c56421dda28a75ace59a3c8871 -PYTHON_PAM_SETUP_TYPE = distutils -PYTHON_PAM_LICENSE = LGPL-2.1 -PYTHON_PAM_LICENSE_FILES = COPYING -PYTHON_PAM_DEPENDENCIES = linux-pam - -$(eval $(python-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:52:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:52:07 +0100 Subject: [Buildroot] [PATCH 101/107] package/python-yieldfrom: drop python2 specific package In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-102-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++++ package/Config.in | 1 - package/python-yieldfrom/Config.in | 8 -------- package/python-yieldfrom/python-yieldfrom.hash | 5 ----- package/python-yieldfrom/python-yieldfrom.mk | 15 --------------- 5 files changed, 6 insertions(+), 29 deletions(-) delete mode 100644 package/python-yieldfrom/Config.in delete mode 100644 package/python-yieldfrom/python-yieldfrom.hash delete mode 100644 package/python-yieldfrom/python-yieldfrom.mk diff --git a/Config.in.legacy b/Config.in.legacy index 998ea6b231..47e8d696e0 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_YIELDFROM + bool "python-yieldfrom removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_TYPING bool "python-typing removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index cfc4522be9..6fb62caa4c 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1300,7 +1300,6 @@ menu "External python modules" source "package/python-xmodem/Config.in" source "package/python-yarl/Config.in" source "package/python-yatl/Config.in" - source "package/python-yieldfrom/Config.in" source "package/python-zc-lockfile/Config.in" source "package/python-zeroconf/Config.in" source "package/python-zope-interface/Config.in" diff --git a/package/python-yieldfrom/Config.in b/package/python-yieldfrom/Config.in deleted file mode 100644 index 1a063d3128..0000000000 --- a/package/python-yieldfrom/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PYTHON_YIELDFROM - bool "python-yieldfrom" - depends on BR2_PACKAGE_PYTHON - help - A backport of the `yield from` semantic from Python 3.x to - Python 2.7. - - https://github.com/Nurdok/yieldfrom/ diff --git a/package/python-yieldfrom/python-yieldfrom.hash b/package/python-yieldfrom/python-yieldfrom.hash deleted file mode 100644 index 7730a1e578..0000000000 --- a/package/python-yieldfrom/python-yieldfrom.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/yieldfrom/json -md5 fd94120625ac1e69bb5946d5e63182da yieldfrom-1.0.5.tar.gz -sha256 eb75e58641410f06083f85013a438f28bceaabfe5af9c3206d5049362c37aca0 yieldfrom-1.0.5.tar.gz -# Locally computed sha256 checksums -sha256 b3092d61cce29e25f3799285495095d220e5e015b88c1c70e1e72dae052f21e8 LICENSE diff --git a/package/python-yieldfrom/python-yieldfrom.mk b/package/python-yieldfrom/python-yieldfrom.mk deleted file mode 100644 index c926936ae8..0000000000 --- a/package/python-yieldfrom/python-yieldfrom.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# python-yieldfrom -# -################################################################################ - -PYTHON_YIELDFROM_VERSION = 1.0.5 -PYTHON_YIELDFROM_SOURCE = yieldfrom-$(PYTHON_YIELDFROM_VERSION).tar.gz -PYTHON_YIELDFROM_SITE = https://files.pythonhosted.org/packages/4d/f9/395917f574ace618eb234bcbae8df3fabaa9624532d96d1fbd3a20678b1e -PYTHON_YIELDFROM_SETUP_TYPE = setuptools -PYTHON_YIELDFROM_LICENSE = MIT -PYTHON_YIELDFROM_LICENSE_FILES = LICENSE - -$(eval $(python-package)) -$(eval $(host-python-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:52:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:52:04 +0100 Subject: [Buildroot] [PATCH 098/107] package/python-singledispatch: drop python2 specific package In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-99-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++++ package/Config.in | 1 - package/python-singledispatch/Config.in | 9 --------- .../python-singledispatch.hash | 5 ----- .../python-singledispatch/python-singledispatch.mk | 14 -------------- 5 files changed, 6 insertions(+), 29 deletions(-) delete mode 100644 package/python-singledispatch/Config.in delete mode 100644 package/python-singledispatch/python-singledispatch.hash delete mode 100644 package/python-singledispatch/python-singledispatch.mk diff --git a/Config.in.legacy b/Config.in.legacy index 319057f748..3cd78ccf1c 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_SINGLEDISPATCH + bool "python-singledispatch removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_PYRO bool "python-pyro removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index 0d8ff0d4d1..0261463f45 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1229,7 +1229,6 @@ menu "External python modules" source "package/python-simplejson/Config.in" source "package/python-simplelogging/Config.in" source "package/python-simplesqlite/Config.in" - source "package/python-singledispatch/Config.in" source "package/python-sip/Config.in" source "package/python-six/Config.in" source "package/python-slob/Config.in" diff --git a/package/python-singledispatch/Config.in b/package/python-singledispatch/Config.in deleted file mode 100644 index 4abc219f95..0000000000 --- a/package/python-singledispatch/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PYTHON_SINGLEDISPATCH - bool "python-singledispatch" - depends on BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON_SIX # runtime - help - This library brings functools.singledispatch from - Python 3.4 to Python 2.6-3.3 - - https://pypi.python.org/pypi/singledispatch diff --git a/package/python-singledispatch/python-singledispatch.hash b/package/python-singledispatch/python-singledispatch.hash deleted file mode 100644 index c4eec53e30..0000000000 --- a/package/python-singledispatch/python-singledispatch.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=af2fc6a3d6cc5a02d0bf54d909785fcb -md5 af2fc6a3d6cc5a02d0bf54d909785fcb singledispatch-3.4.0.3.tar.gz -# Locally computed -sha256 5b06af87df13818d14f08a028e42f566640aef80805c3b50c5056b086e3c2b9c singledispatch-3.4.0.3.tar.gz -sha256 5a724c436f88585973787af91cecf58503cbf09e5c1721c516880614700767ef setup.py diff --git a/package/python-singledispatch/python-singledispatch.mk b/package/python-singledispatch/python-singledispatch.mk deleted file mode 100644 index 7e1d5ac8e0..0000000000 --- a/package/python-singledispatch/python-singledispatch.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-singledispatch -# -################################################################################ - -PYTHON_SINGLEDISPATCH_VERSION = 3.4.0.3 -PYTHON_SINGLEDISPATCH_SOURCE = singledispatch-$(PYTHON_SINGLEDISPATCH_VERSION).tar.gz -PYTHON_SINGLEDISPATCH_SITE = https://pypi.python.org/packages/source/s/singledispatch -PYTHON_SINGLEDISPATCH_LICENSE = MIT -PYTHON_SINGLEDISPATCH_LICENSE_FILES = setup.py -PYTHON_SINGLEDISPATCH_SETUP_TYPE = setuptools - -$(eval $(python-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:52:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:52:10 +0100 Subject: [Buildroot] [PATCH 104/107] package/python-enum: drop python2 specific package In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-105-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/python-enum/Config.in | 12 ------------ package/python-enum/python-enum.hash | 5 ----- package/python-enum/python-enum.mk | 14 -------------- 6 files changed, 6 insertions(+), 33 deletions(-) delete mode 100644 package/python-enum/Config.in delete mode 100644 package/python-enum/python-enum.hash delete mode 100644 package/python-enum/python-enum.mk diff --git a/Config.in.legacy b/Config.in.legacy index 630194edba..bc5df0e489 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_ENUM + bool "python-enum removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_DIALOG bool "python-dialog removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 8112873f14..0716729cee 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2243,7 +2243,6 @@ F: package/python-cached-property/ F: package/python-docker/ F: package/python-dockerpty/ F: package/python-docker-pycreds/ -F: package/python-enum/ F: package/python-enum34/ F: package/python-functools32/ F: package/python-psutil/ diff --git a/package/Config.in b/package/Config.in index b91e190c8e..f134b626be 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1010,7 +1010,6 @@ menu "External python modules" source "package/python-ecdsa/Config.in" source "package/python-engineio/Config.in" source "package/python-entrypoints/Config.in" - source "package/python-enum/Config.in" source "package/python-enum34/Config.in" source "package/python-esptool/Config.in" source "package/python-falcon/Config.in" diff --git a/package/python-enum/Config.in b/package/python-enum/Config.in deleted file mode 100644 index e26ae8bf97..0000000000 --- a/package/python-enum/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_PYTHON_ENUM - bool "python-enum" - depends on BR2_PACKAGE_PYTHON - help - Robust enumerated type support in Python - - An enumeration object is an immutable sequence object built - from a sequence of strings. Each value is also available as - an attribute. Such values are constant. Comparisons and - enumeration are supported. - - https://pypi.python.org/pypi/enum diff --git a/package/python-enum/python-enum.hash b/package/python-enum/python-enum.hash deleted file mode 100644 index 4b4b369e34..0000000000 --- a/package/python-enum/python-enum.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/enum/json -md5 e7d170e3f84435b77058de625c96ef58 enum-0.4.7.tar.gz -sha256 8c7cf3587eda51008bcc1eed99ea2c331ccd265c231dbaa95ec5258d3dc03100 enum-0.4.7.tar.gz -# Locally computed sha256 checksums -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL-3 diff --git a/package/python-enum/python-enum.mk b/package/python-enum/python-enum.mk deleted file mode 100644 index f1de8a9312..0000000000 --- a/package/python-enum/python-enum.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-enum -# -################################################################################ - -PYTHON_ENUM_VERSION = 0.4.7 -PYTHON_ENUM_SOURCE = enum-$(PYTHON_ENUM_VERSION).tar.gz -PYTHON_ENUM_SITE = https://files.pythonhosted.org/packages/02/a0/32e1d5a21b703f600183e205aafc6773577e16429af5ad3c3f9b956b07ca -PYTHON_ENUM_SETUP_TYPE = setuptools -PYTHON_ENUM_LICENSE = GPL-3.0+ -PYTHON_ENUM_LICENSE_FILES = LICENSE.GPL-3 - -$(eval $(python-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:52:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:52:05 +0100 Subject: [Buildroot] [PATCH 099/107] package/python-subprocess32: drop python2 specific package In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-100-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++ package/Config.in | 1 - package/python-subprocess32/Config.in | 13 -------- .../python-subprocess32.hash | 5 --- .../python-subprocess32.mk | 31 ------------------- 5 files changed, 6 insertions(+), 50 deletions(-) delete mode 100644 package/python-subprocess32/Config.in delete mode 100644 package/python-subprocess32/python-subprocess32.hash delete mode 100644 package/python-subprocess32/python-subprocess32.mk diff --git a/Config.in.legacy b/Config.in.legacy index 3cd78ccf1c..8db9558ed4 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_SUBPROCESS32 + bool "python-subprocess32 removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_SINGLEDISPATCH bool "python-singledispatch removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index 0261463f45..18de2a32a5 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1243,7 +1243,6 @@ menu "External python modules" source "package/python-sqlalchemy/Config.in" source "package/python-sqliteschema/Config.in" source "package/python-sqlparse/Config.in" - source "package/python-subprocess32/Config.in" source "package/python-systemd/Config.in" source "package/python-tabledata/Config.in" source "package/python-tempora/Config.in" diff --git a/package/python-subprocess32/Config.in b/package/python-subprocess32/Config.in deleted file mode 100644 index d7fe84f1e6..0000000000 --- a/package/python-subprocess32/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_PYTHON_SUBPROCESS32 - bool "python-subprocess32" - depends on BR2_PACKAGE_PYTHON - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 || !BR2_MIPS_NABI64 - help - A backport of the Python 3 subprocess module for use - on Python 2. - - https://github.com/google/python-subprocess32 - -comment "python-subprocess32 needs a toolchain w/ headers >= 3.10 on MIPS N64" - depends on BR2_MIPS_NABI64 - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 diff --git a/package/python-subprocess32/python-subprocess32.hash b/package/python-subprocess32/python-subprocess32.hash deleted file mode 100644 index 65d18763d1..0000000000 --- a/package/python-subprocess32/python-subprocess32.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/subprocess32/json -md5 748844d560be5f0c707931cba1cdb48b subprocess32-3.5.4.tar.gz -sha256 eb2937c80497978d181efa1b839ec2d9622cf9600a039a79d0e108d1f9aec79d subprocess32-3.5.4.tar.gz -# Locally computed sha256 checksums -sha256 826b43437249d39422642f695154d064da64de92eb1476048a615f50bc1beb4a LICENSE diff --git a/package/python-subprocess32/python-subprocess32.mk b/package/python-subprocess32/python-subprocess32.mk deleted file mode 100644 index fb8a47f974..0000000000 --- a/package/python-subprocess32/python-subprocess32.mk +++ /dev/null @@ -1,31 +0,0 @@ -################################################################################ -# -# python-subprocess32 -# -################################################################################ - -PYTHON_SUBPROCESS32_VERSION = 3.5.4 -PYTHON_SUBPROCESS32_SOURCE = subprocess32-$(PYTHON_SUBPROCESS32_VERSION).tar.gz -PYTHON_SUBPROCESS32_SITE = https://files.pythonhosted.org/packages/32/c8/564be4d12629b912ea431f1a50eb8b3b9d00f1a0b1ceff17f266be190007 -PYTHON_SUBPROCESS32_SETUP_TYPE = setuptools -PYTHON_SUBPROCESS32_LICENSE = Python-2.0 -PYTHON_SUBPROCESS32_LICENSE_FILES = LICENSE - -# The configure step needs to be run outside of the setup.py since it isn't -# run correctly for cross-compiling -define PYTHON_SUBPROCESS32_CONFIGURE_CMDS - (cd $(@D) && \ - $(TARGET_CONFIGURE_OPTS) \ - $(TARGET_CONFIGURE_ARGS) \ - ./configure \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - --prefix=/usr \ - --exec-prefix=/usr \ - --sysconfdir=/etc \ - --program-prefix="" \ - ) -endef - -$(eval $(python-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:52:12 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:52:12 +0100 Subject: [Buildroot] [PATCH 106/107] package/python-functools32: drop python2 specific package In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-107-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/python-functools32/Config.in | 8 -------- package/python-functools32/python-functools32.hash | 4 ---- package/python-functools32/python-functools32.mk | 14 -------------- 6 files changed, 6 insertions(+), 28 deletions(-) delete mode 100644 package/python-functools32/Config.in delete mode 100644 package/python-functools32/python-functools32.hash delete mode 100644 package/python-functools32/python-functools32.mk diff --git a/Config.in.legacy b/Config.in.legacy index 7df95691ca..49c24e61bf 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_FUNCTOOLS32 + bool "python-functools32 removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_ENUM34 bool "python-enum34 removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 92abe8a6dd..0e759bc168 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2243,7 +2243,6 @@ F: package/python-cached-property/ F: package/python-docker/ F: package/python-dockerpty/ F: package/python-docker-pycreds/ -F: package/python-functools32/ F: package/python-psutil/ F: package/python-request-id/ F: package/python-semver/ diff --git a/package/Config.in b/package/Config.in index 18388f82c3..1a9f3e29d8 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1026,7 +1026,6 @@ menu "External python modules" source "package/python-flup/Config.in" source "package/python-fonttools/Config.in" source "package/python-frozenlist/Config.in" - source "package/python-functools32/Config.in" source "package/python-future/Config.in" source "package/python-git/Config.in" source "package/python-gitdb2/Config.in" diff --git a/package/python-functools32/Config.in b/package/python-functools32/Config.in deleted file mode 100644 index 606341d828..0000000000 --- a/package/python-functools32/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PYTHON_FUNCTOOLS32 - bool "python-functools32" - depends on BR2_PACKAGE_PYTHON - help - Backport of the functools module from Python 3.2.3 for use on - 2.7 and PyPy. - - https://github.com/MiCHiLU/python-functools32 diff --git a/package/python-functools32/python-functools32.hash b/package/python-functools32/python-functools32.hash deleted file mode 100644 index 606de81774..0000000000 --- a/package/python-functools32/python-functools32.hash +++ /dev/null @@ -1,4 +0,0 @@ -# md5 from https://pypi.python.org/pypi/functools32/json, sha256 locally computed -md5 09f24ffd9af9f6cd0f63cb9f4e23d4b2 functools32-3.2.3-2.tar.gz -sha256 f6253dfbe0538ad2e387bd8fdfd9293c925d63553f5813c4e587745416501e6d functools32-3.2.3-2.tar.gz -sha256 3f9ea6b89abe1556b72aff67b987d64c8272564815cd6a2832e6c4f6abdfe3b1 LICENSE diff --git a/package/python-functools32/python-functools32.mk b/package/python-functools32/python-functools32.mk deleted file mode 100644 index 8a88bb2a7f..0000000000 --- a/package/python-functools32/python-functools32.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-functools32 -# -################################################################################ - -PYTHON_FUNCTOOLS32_VERSION = 3.2.3-2 -PYTHON_FUNCTOOLS32_SOURCE = functools32-$(PYTHON_FUNCTOOLS32_VERSION).tar.gz -PYTHON_FUNCTOOLS32_SITE = https://pypi.python.org/packages/c5/60/6ac26ad05857c601308d8fb9e87fa36d0ebf889423f47c3502ef034365db -PYTHON_FUNCTOOLS32_SETUP_TYPE = distutils -PYTHON_FUNCTOOLS32_LICENSE = Python-2.0 -PYTHON_FUNCTOOLS32_LICENSE_FILES = LICENSE - -$(eval $(python-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:52:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:52:09 +0100 Subject: [Buildroot] [PATCH 103/107] package/python-dialog: drop python2 specific package In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-104-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++++ package/Config.in | 1 - package/python-dialog/Config.in | 10 ---------- package/python-dialog/python-dialog.hash | 5 ----- package/python-dialog/python-dialog.mk | 15 --------------- 5 files changed, 6 insertions(+), 31 deletions(-) delete mode 100644 package/python-dialog/Config.in delete mode 100644 package/python-dialog/python-dialog.hash delete mode 100644 package/python-dialog/python-dialog.mk diff --git a/Config.in.legacy b/Config.in.legacy index 6776048fc4..630194edba 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_DIALOG + bool "python-dialog removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_CONFIGOBJ bool "python-configobj removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index 478a4e6b90..b91e190c8e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -994,7 +994,6 @@ menu "External python modules" source "package/python-dbus-next/Config.in" source "package/python-decorator/Config.in" source "package/python-defusedxml/Config.in" - source "package/python-dialog/Config.in" source "package/python-dialog3/Config.in" source "package/python-dicttoxml/Config.in" source "package/python-distro/Config.in" diff --git a/package/python-dialog/Config.in b/package/python-dialog/Config.in deleted file mode 100644 index c1fdb23723..0000000000 --- a/package/python-dialog/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_PYTHON_DIALOG - bool "python-dialog" - depends on BR2_PACKAGE_PYTHON - depends on BR2_USE_MMU # dialog - select BR2_PACKAGE_DIALOG - help - A Python interface to the UNIX dialog utility and - mostly-compatible programs. - - http://pythondialog.sourceforge.net/ diff --git a/package/python-dialog/python-dialog.hash b/package/python-dialog/python-dialog.hash deleted file mode 100644 index 8f84e198b2..0000000000 --- a/package/python-dialog/python-dialog.hash +++ /dev/null @@ -1,5 +0,0 @@ -# Locally computed after verifying -# https://sourceforge.net/projects/pythondialog/files/pythondialog/3.4.0/python3-pythondialog-3.4.0.tar.bz2.asc -# with key 9B6F19FB52965E6C21FE76142A205688F8489BDD -sha256 8978d355c8db6728eeb9e23b39449b14597f1c76cb06dc72462642ca7cde46a0 python2-pythondialog-3.4.0.tar.bz2 -sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING diff --git a/package/python-dialog/python-dialog.mk b/package/python-dialog/python-dialog.mk deleted file mode 100644 index d5d4a4ceb5..0000000000 --- a/package/python-dialog/python-dialog.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# python-dialog -# -################################################################################ - -PYTHON_DIALOG_VERSION = 3.4.0 -PYTHON_DIALOG_SOURCE = python2-pythondialog-$(PYTHON_DIALOG_VERSION).tar.bz2 -PYTHON_DIALOG_SITE = http://downloads.sourceforge.net/project/pythondialog/pythondialog/$(PYTHON_DIALOG_VERSION) -PYTHON_DIALOG_LICENSE = LGPL-2.1+ -PYTHON_DIALOG_LICENSE_FILES = COPYING -PYTHON_DIALOG_SETUP_TYPE = distutils -PYTHON_DIALOG_DEPENDENCIES = dialog - -$(eval $(python-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:52:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:52:06 +0100 Subject: [Buildroot] [PATCH 100/107] package/python-typing: drop python2 specific package In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-101-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++++ package/Config.in | 1 - package/python-typing/Config.in | 8 -------- package/python-typing/python-typing.hash | 5 ----- package/python-typing/python-typing.mk | 15 --------------- 5 files changed, 6 insertions(+), 29 deletions(-) delete mode 100644 package/python-typing/Config.in delete mode 100644 package/python-typing/python-typing.hash delete mode 100644 package/python-typing/python-typing.mk diff --git a/Config.in.legacy b/Config.in.legacy index 8db9558ed4..998ea6b231 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_TYPING + bool "python-typing removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_SUBPROCESS32 bool "python-subprocess32 removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index 18de2a32a5..cfc4522be9 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1264,7 +1264,6 @@ menu "External python modules" source "package/python-txdbus/Config.in" source "package/python-txtorcon/Config.in" source "package/python-typepy/Config.in" - source "package/python-typing/Config.in" source "package/python-typing-extensions/Config.in" source "package/python-u-msgpack/Config.in" source "package/python-ubjson/Config.in" diff --git a/package/python-typing/Config.in b/package/python-typing/Config.in deleted file mode 100644 index 81b7d71b4b..0000000000 --- a/package/python-typing/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PYTHON_TYPING - bool "python-typing" - depends on BR2_PACKAGE_PYTHON - help - Type Hints for Python. This is a backport of the standard - library typing module to Python versions older than 3.5. - - https://docs.python.org/3/library/typing.html diff --git a/package/python-typing/python-typing.hash b/package/python-typing/python-typing.hash deleted file mode 100644 index f587eb7bfa..0000000000 --- a/package/python-typing/python-typing.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/typing/json -md5 d6dd450cfe0c8c6547eef09a0491775d typing-3.10.0.0.tar.gz -sha256 13b4ad211f54ddbf93e5901a9967b1e07720c1d1b78d596ac6a439641aa1b130 typing-3.10.0.0.tar.gz -# Locally computed sha256 checksums -sha256 ff17ce94e102024deb68773eb1cc74ca76da4e658f373531f0ac22d68a6bb1ad LICENSE diff --git a/package/python-typing/python-typing.mk b/package/python-typing/python-typing.mk deleted file mode 100644 index dd1d8f29b5..0000000000 --- a/package/python-typing/python-typing.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# python-typing -# -################################################################################ - -PYTHON_TYPING_VERSION = 3.10.0.0 -PYTHON_TYPING_SOURCE = typing-$(PYTHON_TYPING_VERSION).tar.gz -PYTHON_TYPING_SITE = https://files.pythonhosted.org/packages/b0/1b/835d4431805939d2996f8772aca1d2313a57e8860fec0e48e8e7dfe3a477 -PYTHON_TYPING_SETUP_TYPE = setuptools -PYTHON_TYPING_LICENSE = Python-2.0, others -PYTHON_TYPING_LICENSE_FILES = LICENSE - -$(eval $(python-package)) -$(eval $(host-python-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:52:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:52:02 +0100 Subject: [Buildroot] [PATCH 096/107] package/python-pypcap: drop python2 specific package In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-97-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/python-pypcap/Config.in | 9 --------- package/python-pypcap/python-pypcap.hash | 3 --- package/python-pypcap/python-pypcap.mk | 21 --------------------- 6 files changed, 6 insertions(+), 35 deletions(-) delete mode 100644 package/python-pypcap/Config.in delete mode 100644 package/python-pypcap/python-pypcap.hash delete mode 100644 package/python-pypcap/python-pypcap.mk diff --git a/Config.in.legacy b/Config.in.legacy index 74317a2d7c..f99535411d 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_PYPCAP + bool "python-pypcap removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_PATHLIB2 bool "python-pathlib2 removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 07f9304766..9c1411648e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1934,7 +1934,6 @@ F: package/python-ipy/ F: package/python-iwlib/ F: package/python-posix-ipc/ F: package/python-pycairo/ -F: package/python-pypcap/ F: package/python-pyrex/ F: package/python-pysftp/ F: package/python-tinyrpc/ diff --git a/package/Config.in b/package/Config.in index 3c55dec6c5..d406d372d3 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1172,7 +1172,6 @@ menu "External python modules" source "package/python-pyopenssl/Config.in" source "package/python-pyparsing/Config.in" source "package/python-pyparted/Config.in" - source "package/python-pypcap/Config.in" source "package/python-pyphen/Config.in" source "package/python-pyqrcode/Config.in" source "package/python-pyqt5/Config.in" diff --git a/package/python-pypcap/Config.in b/package/python-pypcap/Config.in deleted file mode 100644 index 9b410ecc2b..0000000000 --- a/package/python-pypcap/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYPCAP - bool "python-pypcap" - depends on BR2_PACKAGE_PYTHON - select BR2_PACKAGE_LIBPCAP - help - The pypcap module is an object-oriented wrapper of the C - libpcap library. - - https://github.com/dugsong/pypcap diff --git a/package/python-pypcap/python-pypcap.hash b/package/python-pypcap/python-pypcap.hash deleted file mode 100644 index 40db6b4f33..0000000000 --- a/package/python-pypcap/python-pypcap.hash +++ /dev/null @@ -1,3 +0,0 @@ -# locally computed -sha256 5716d97b39d40b79daf7b0c6a8c8c514f5f1de8f20561c8621ee62a90b93fb03 python-pypcap-6f46e7bf29a648256ddc732a7d0ec83d3ffca390.tar.gz -sha256 48306c284fdbdf836b880528c3bdd658deac47ed78ffeb24a4ca5a8c39a39304 LICENSE diff --git a/package/python-pypcap/python-pypcap.mk b/package/python-pypcap/python-pypcap.mk deleted file mode 100644 index fc6fc6ed92..0000000000 --- a/package/python-pypcap/python-pypcap.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# python-pypcap -# -################################################################################ - -PYTHON_PYPCAP_VERSION = 6f46e7bf29a648256ddc732a7d0ec83d3ffca390 -PYTHON_PYPCAP_SITE = $(call github,dugsong,pypcap,$(PYTHON_PYPCAP_VERSION)) -PYTHON_PYPCAP_LICENSE = BSD-3-Clause -PYTHON_PYPCAP_LICENSE_FILES = LICENSE -PYTHON_PYPCAP_SETUP_TYPE = distutils -PYTHON_PYPCAP_DEPENDENCIES = host-python-pyrex libpcap - -define PYTHON_PYPCAP_CONFIGURE_CMDS - $(HOST_DIR)/bin/python2 $(HOST_DIR)/bin/pyrexc $(@D)/pcap.pyx - (cd $(@D); \ - $(HOST_DIR)/bin/python setup.py \ - config --with-pcap=$(STAGING_DIR)/usr) -endef - -$(eval $(python-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:52:11 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:52:11 +0100 Subject: [Buildroot] [PATCH 105/107] package/python-enum34: drop python2 specific package In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-106-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/python-enum34/Config.in | 12 ------------ package/python-enum34/python-enum34.hash | 5 ----- package/python-enum34/python-enum34.mk | 17 ----------------- 6 files changed, 6 insertions(+), 36 deletions(-) delete mode 100644 package/python-enum34/Config.in delete mode 100644 package/python-enum34/python-enum34.hash delete mode 100644 package/python-enum34/python-enum34.mk diff --git a/Config.in.legacy b/Config.in.legacy index bc5df0e489..7df95691ca 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_ENUM34 + bool "python-enum34 removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_ENUM bool "python-enum removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 0716729cee..92abe8a6dd 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2243,7 +2243,6 @@ F: package/python-cached-property/ F: package/python-docker/ F: package/python-dockerpty/ F: package/python-docker-pycreds/ -F: package/python-enum34/ F: package/python-functools32/ F: package/python-psutil/ F: package/python-request-id/ diff --git a/package/Config.in b/package/Config.in index f134b626be..18388f82c3 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1010,7 +1010,6 @@ menu "External python modules" source "package/python-ecdsa/Config.in" source "package/python-engineio/Config.in" source "package/python-entrypoints/Config.in" - source "package/python-enum34/Config.in" source "package/python-esptool/Config.in" source "package/python-falcon/Config.in" source "package/python-filelock/Config.in" diff --git a/package/python-enum34/Config.in b/package/python-enum34/Config.in deleted file mode 100644 index 2511a350e0..0000000000 --- a/package/python-enum34/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_PYTHON_ENUM34 - bool "python-enum34" - depends on BR2_PACKAGE_PYTHON - help - Python 3.4 Enum backported to 2.x. - - An enumeration is a set of symbolic names (members) bound to - unique, constant values. Within an enumeration, the members - can be compared by identity, and the enumeration itself can - be iterated over. - - https://pypi.python.org/pypi/enum34 diff --git a/package/python-enum34/python-enum34.hash b/package/python-enum34/python-enum34.hash deleted file mode 100644 index e43e00a5fe..0000000000 --- a/package/python-enum34/python-enum34.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5 from https://pypi.python.org/pypi/enum34/json -md5 b5ac0bb5ea9e830029599e410d09d3b5 enum34-1.1.10.tar.gz -# Locally computed -sha256 cce6a7477ed816bd2542d03d53db9f0db935dd013b70f336a95c73979289f248 enum34-1.1.10.tar.gz -sha256 88ec6a6c8eafa3b9757e745783938bef3f5e4d5e3c76b1db576aa3ab520e5e1d enum/LICENSE diff --git a/package/python-enum34/python-enum34.mk b/package/python-enum34/python-enum34.mk deleted file mode 100644 index 0bd00508aa..0000000000 --- a/package/python-enum34/python-enum34.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# python-enum34 -# -################################################################################ - -PYTHON_ENUM34_VERSION = 1.1.10 -PYTHON_ENUM34_SOURCE = enum34-$(PYTHON_ENUM34_VERSION).tar.gz -PYTHON_ENUM34_SITE = https://files.pythonhosted.org/packages/11/c4/2da1f4952ba476677a42f25cd32ab8aaf0e1c0d0e00b89822b835c7e654c -PYTHON_ENUM34_SETUP_TYPE = setuptools -PYTHON_ENUM34_LICENSE = BSD-3-Clause -PYTHON_ENUM34_LICENSE_FILES = enum/LICENSE -PYTHON_ENUM34_CPE_ID_VENDOR = python -PYTHON_ENUM34_CPE_ID_PRODUCT = enum34 - -$(eval $(python-package)) -$(eval $(host-python-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:52:13 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:52:13 +0100 Subject: [Buildroot] [PATCH 107/107] docs/manual: drop python2 references In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-108-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- docs/manual/adding-packages-python.txt | 8 -------- docs/manual/writing-rules.txt | 8 ++++---- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/docs/manual/adding-packages-python.txt b/docs/manual/adding-packages-python.txt index 0c100859be..cfd2f88920 100644 --- a/docs/manual/adding-packages-python.txt +++ b/docs/manual/adding-packages-python.txt @@ -67,14 +67,6 @@ Python build system, but are not Python modules, can freely choose their name (existing examples in Buildroot are +scons+ and +supervisor+). -Packages that are only compatible with one version of Python (as in: -Python 2 or Python 3) should depend on that version explicitely in -their +Config.in+ file (+BR2_PACKAGE_PYTHON+ for Python 2, -+BR2_PACKAGE_PYTHON3+ for Python 3). Packages that are compatible -with both versions should not explicitely depend on them in their -+Config.in+ file, since that condition is already expressed for the -whole "External python modules" menu. - The main macro of the Python package infrastructure is +python-package+. It is similar to the +generic-package+ macro. It is also possible to create Python host packages with the diff --git a/docs/manual/writing-rules.txt b/docs/manual/writing-rules.txt index 3eec095d0e..6255a08c1c 100644 --- a/docs/manual/writing-rules.txt +++ b/docs/manual/writing-rules.txt @@ -93,9 +93,9 @@ so _make_ recognizes them as commands. YES: + --------------------- -ifeq ($(BR2_PACKAGE_PYTHON),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) LIBFOO_CONF_OPTS += --with-python-support -LIBFOO_DEPENDENCIES += python +LIBFOO_DEPENDENCIES += python3 else LIBFOO_CONF_OPTS += --without-python-support endif @@ -104,8 +104,8 @@ endif NO: + --------------------- -LIBFOO_CONF_OPTS += --with$(if $(BR2_PACKAGE_PYTHON),,out)-python-support -LIBFOO_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,) +LIBFOO_CONF_OPTS += --with$(if $(BR2_PACKAGE_PYTHON3),,out)-python-support +LIBFOO_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON3),python3,) --------------------- ** Keep configure options and dependencies close together. -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:52:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:52:08 +0100 Subject: [Buildroot] [PATCH 102/107] package/python-configobj: drop python2 specific package In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-103-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++++ DEVELOPERS | 2 -- package/Config.in | 1 - package/Config.in.host | 1 - package/python-configobj/Config.in | 10 ---------- package/python-configobj/python-configobj.hash | 3 --- package/python-configobj/python-configobj.mk | 14 -------------- 7 files changed, 6 insertions(+), 31 deletions(-) delete mode 100644 package/python-configobj/Config.in delete mode 100644 package/python-configobj/python-configobj.hash delete mode 100644 package/python-configobj/python-configobj.mk diff --git a/Config.in.legacy b/Config.in.legacy index 47e8d696e0..6776048fc4 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_CONFIGOBJ + bool "python-configobj removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_YIELDFROM bool "python-yieldfrom removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 9c1411648e..8112873f14 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2796,7 +2796,6 @@ F: package/ne10/ F: package/pkg-python.mk F: package/pkg-autotools.mk F: package/pkg-generic.mk -F: package/python/ F: package/python3/ F: package/python-augeas/ F: package/python-flask-expects-json/ @@ -3034,7 +3033,6 @@ F: package/grantlee/ F: package/libusb/ F: package/libusb-compat/ F: package/proj/ -F: package/python-configobj/ F: package/python-iniparse/ F: package/qjson/ F: package/quazip/ diff --git a/package/Config.in b/package/Config.in index 6fb62caa4c..478a4e6b90 100644 --- a/package/Config.in +++ b/package/Config.in @@ -973,7 +973,6 @@ menu "External python modules" source "package/python-colorama/Config.in" source "package/python-colorlog/Config.in" source "package/python-colorzero/Config.in" - source "package/python-configobj/Config.in" source "package/python-configshell-fb/Config.in" source "package/python-constantly/Config.in" source "package/python-couchdb/Config.in" diff --git a/package/Config.in.host b/package/Config.in.host index 341e24926b..e5fbb07fc2 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -69,7 +69,6 @@ menu "Host utilities" source "package/pkgconf/Config.in.host" source "package/pru-software-support/Config.in.host" 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" diff --git a/package/python-configobj/Config.in b/package/python-configobj/Config.in deleted file mode 100644 index fc57e26f1c..0000000000 --- a/package/python-configobj/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_PYTHON_CONFIGOBJ - bool "python-configobj" - depends on BR2_PACKAGE_PYTHON - help - ConfigObj is a simple but powerful config file reader and - writer: an ini file round tripper. Its main feature is that - it is very easy to use, with a straightforward programmer's - interface and a simple syntax for config files. - - http://www.voidspace.org.uk/python/configobj.html diff --git a/package/python-configobj/python-configobj.hash b/package/python-configobj/python-configobj.hash deleted file mode 100644 index d43c453796..0000000000 --- a/package/python-configobj/python-configobj.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/configobj/json, sha256 locally computed -md5 e472a3a1c2a67bb0ec9b5d54c13a47d6 configobj-5.0.6.tar.gz -sha256 a2f5650770e1c87fb335af19a9b7eb73fc05ccf22144eb68db7d00cd2bcb0902 configobj-5.0.6.tar.gz diff --git a/package/python-configobj/python-configobj.mk b/package/python-configobj/python-configobj.mk deleted file mode 100644 index 9e281d28e7..0000000000 --- a/package/python-configobj/python-configobj.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-configobj -# -################################################################################ - -PYTHON_CONFIGOBJ_VERSION = 5.0.6 -PYTHON_CONFIGOBJ_SOURCE = configobj-$(PYTHON_CONFIGOBJ_VERSION).tar.gz -PYTHON_CONFIGOBJ_SITE = https://pypi.python.org/packages/64/61/079eb60459c44929e684fa7d9e2fdca403f67d64dd9dbac27296be2e0fab -PYTHON_CONFIGOBJ_LICENSE = BSD-3-Clause -# License only mentioned in the source -PYTHON_CONFIGOBJ_SETUP_TYPE = distutils - -$(eval $(python-package)) -- 2.20.1 From giulio.benetti at benettiengineering.com Wed Feb 9 16:57:48 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 9 Feb 2022 17:57:48 +0100 Subject: [Buildroot] [PATCH 1/2] configs/zynqmp_zcu106: Bump ATF/U-Boot/Linux to Xilinx 2022 -v2 In-Reply-To: <20220209082821.72879-1-neal.frager@xilinx.com> References: <20220209082821.72879-1-neal.frager@xilinx.com> Message-ID: Hi Neal, the subject doesn't need "-v2" in it. I'm pretty sure you've used the wrong command to generate the V2 patchset. This are the correct commands: # cd buildroot # git format-patch -s -M -o . -2 then retrieve who to send to with: # ./utils/get-developers *.patch take the output and add people alredy in Cc for the rest On 09/02/22 09:28, Neal Frager wrote: > This patch: > - bumps configs/zynqmp_zcu106_defconfig to Xilinx 2022 What does this ^^^ line means? Xilinx 2022? Maybe it is what it's already below, Linux, u-boot, ATF. So I think you can drop it > - bumps ATF to Xilinx v2.6: mainline v2.6 requires patch to build > - bumps U-Boot to Xilinx 2022.01: important drivers not in mainline > - bumps Linux to Xilinx 5.15: important drivers not in mainline > - deletes board/zynqmp/patches directory: patches already in mainline as you see below, this patch doesn't delete those patches and folder > - modifies board/zynqmp/genimage.cfg: U-Boot 2022.01 uses u-boot.itb format > - adds extlinux.conf to vfat bootfs it's worth mentioning that it switches from boot.scr to extlinux.conf also > - modifies U-Boot to unified xilinx_zynqmp_virt_defconfig (supports all boards) > - adds support for SPL pm_cfg_obj.c loading to PMU firmware > - adds support for host machines without SSL ^^^ - enable support for host machines without OpenSSL required by u-boot Because you don't add support and it's OpenSSL that is required by u-boot > > Signed-off-by: Neal Frager > --- > board/zynqmp/extlinux.conf | 4 + > board/zynqmp/genimage.cfg | 6 +- > board/zynqmp/pm_cfg_obj.c | 614 ++++++++++++++++++++++++++++++++ > board/zynqmp/post-build.sh | 10 + > board/zynqmp/post-image.sh | 4 +- > board/zynqmp/readme.txt | 23 +- > configs/zynqmp_zcu106_defconfig | 23 +- > 7 files changed, 665 insertions(+), 19 deletions(-) > create mode 100644 board/zynqmp/extlinux.conf > create mode 100644 board/zynqmp/pm_cfg_obj.c > create mode 100755 board/zynqmp/post-build.sh As mentioned above deletes are missing > diff --git a/board/zynqmp/extlinux.conf b/board/zynqmp/extlinux.conf > new file mode 100644 > index 0000000000..15ef707ea2 > --- /dev/null > +++ b/board/zynqmp/extlinux.conf > @@ -0,0 +1,4 @@ > +label linux > + kernel /Image > + devicetree /system.dtb > + append console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait > diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg > index ed202f4550..20d8352c08 100644 > --- a/board/zynqmp/genimage.cfg > +++ b/board/zynqmp/genimage.cfg > @@ -2,11 +2,13 @@ image boot.vfat { > vfat { > files = { > "boot.bin", > - "u-boot.bin", > - "atf-uboot.ub", > + "u-boot.itb", > "system.dtb", > "Image" > } > + file extlinux/extlinux.conf { > + image = extlinux.conf > + } > } > > size = 32M > diff --git a/board/zynqmp/pm_cfg_obj.c b/board/zynqmp/pm_cfg_obj.c > new file mode 100644 > index 0000000000..7566b3236a > --- /dev/null > +++ b/board/zynqmp/pm_cfg_obj.c > @@ -0,0 +1,614 @@ > +/****************************************************************************** > +* Copyright (c) 2017 - 2020 Xilinx, Inc. All rights reserved. > +* SPDX-License-Identifier: MIT > +******************************************************************************/ > + > + > +#include "xil_types.h" > +#include "pm_defs.h" > + > +#define PM_CONFIG_MASTER_SECTION_ID 0x101U > +#define PM_CONFIG_SLAVE_SECTION_ID 0x102U > +#define PM_CONFIG_PREALLOC_SECTION_ID 0x103U > +#define PM_CONFIG_POWER_SECTION_ID 0x104U > +#define PM_CONFIG_RESET_SECTION_ID 0x105U > +#define PM_CONFIG_SHUTDOWN_SECTION_ID 0x106U > +#define PM_CONFIG_SET_CONFIG_SECTION_ID 0x107U > +#define PM_CONFIG_GPO_SECTION_ID 0x108U > + > +#define PM_SLAVE_FLAG_IS_SHAREABLE 0x1U > +#define PM_MASTER_USING_SLAVE_MASK 0x2U > + > +#define PM_CONFIG_GPO1_MIO_PIN_34_MAP (1U << 10U) > +#define PM_CONFIG_GPO1_MIO_PIN_35_MAP (1U << 11U) > +#define PM_CONFIG_GPO1_MIO_PIN_36_MAP (1U << 12U) > +#define PM_CONFIG_GPO1_MIO_PIN_37_MAP (1U << 13U) > + > +#define PM_CONFIG_GPO1_BIT_2_MASK (1U << 2U) > +#define PM_CONFIG_GPO1_BIT_3_MASK (1U << 3U) > +#define PM_CONFIG_GPO1_BIT_4_MASK (1U << 4U) > +#define PM_CONFIG_GPO1_BIT_5_MASK (1U << 5U) > + > +#define SUSPEND_TIMEOUT 0xFFFFFFFFU > + > + > +#define PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK 0x00000001 > +#define PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK 0x00000100 > +#define PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK 0x00000200 > + > + > + > +#if defined (__ICCARM__) > +#pragma language=save > +#pragma language=extended > +#endif > +#if defined (__GNUC__) > + const u32 XPm_ConfigObject[] __attribute__((used, section(".sys_cfg_data"))) = > +#elif defined (__ICCARM__) > +#pragma location = ".sys_cfg_data" > +__root const u32 XPm_ConfigObject[] = > +#endif > +{ > + /**********************************************************************/ > + /* HEADER */ > + 1, /* Number of remaining words in the header */ > + 8, /* Number of sections included in config object */ > + /**********************************************************************/ > + /* MASTER SECTION */ > + PM_CONFIG_MASTER_SECTION_ID, /* Master SectionID */ > + 3U, /* No. of Masters*/ > + > + NODE_APU, /* Master Node ID */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask of this master */ > + SUSPEND_TIMEOUT, /* Suspend timeout */ > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ > + > + NODE_RPU_0, /* Master Node ID */ > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask of this master */ > + SUSPEND_TIMEOUT, /* Suspend timeout */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ > + > + NODE_RPU_1, /* Master Node ID */ > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask of this master */ > + SUSPEND_TIMEOUT, /* Suspend timeout */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Suspend permissions */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Wake permissions */ > + > + > + /**********************************************************************/ > + /* SLAVE SECTION */ > + > + > + PM_CONFIG_SLAVE_SECTION_ID, /* Section ID */ > + 49, /* Number of slaves */ > + > + NODE_OCM_BANK_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_OCM_BANK_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_OCM_BANK_2, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_OCM_BANK_3, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_TCM_0_A, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ > + > + NODE_TCM_0_B, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ > + > + NODE_TCM_1_A, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_TCM_1_B, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_L2, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_GPU_PP_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_GPU_PP_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_USB_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_USB_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_TTC_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_TTC_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_TTC_2, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_TTC_3, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_SATA, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_ETH_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_ETH_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_ETH_2, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_ETH_3, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_UART_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_UART_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_SPI_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_SPI_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_I2C_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_I2C_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_SD_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_SD_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_DP, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_GDMA, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_ADMA, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_NAND, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_QSPI, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_GPIO, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_CAN_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_CAN_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_EXTERN, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_DDR, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_IPI_APU, > + 0U, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask */ > + > + NODE_IPI_RPU_0, > + 0U, > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ > + > + NODE_IPI_RPU_1, > + 0U, > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_GPU, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_PCIE, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_PCAP, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_RTC, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_VCU, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_PL, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + > + /**********************************************************************/ > + /* PREALLOC SECTION */ > + > + PM_CONFIG_PREALLOC_SECTION_ID, /* Preallaoc SectionID */ > + 3U, /* No. of Masters*/ > + > +/* Prealloc for psu_cortexa53_0 */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, > + 12, > + NODE_DDR, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_L2, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_0, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_2, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_3, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_I2C_0, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_I2C_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_SD_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_QSPI, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_PL, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_IPI_APU, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + > + /* Prealloc for psu_cortexr5_0 */ > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, > + 14, > + NODE_TCM_0_A, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_TCM_0_B, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_DDR, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_0, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_2, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_3, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_I2C_0, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_I2C_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_SD_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_QSPI, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_PL, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_ADMA, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_IPI_RPU_0, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + > + /* Prealloc for psu_cortexr5_1 */ > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + 3, > + NODE_TCM_1_A, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_TCM_1_B, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_IPI_RPU_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + > + /**********************************************************************/ > + /* POWER SECTION */ > + > + PM_CONFIG_POWER_SECTION_ID, /* Power Section ID */ > + 4U, /* Number of power nodes */ > + > + NODE_APU, /* Power node ID */ > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ > + > + NODE_RPU, /* Power node ID */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ > + > + NODE_FPD, /* Power node ID */ > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ > + > + NODE_PLD, /* Power node ID */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ > + > + > + /**********************************************************************/ > + /* RESET SECTION */ > + > + PM_CONFIG_RESET_SECTION_ID, /* Reset Section ID */ > + 120U, /* Number of resets */ > + > + XILPM_RESET_PCIE_CFG, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_PCIE_BRIDGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_PCIE_CTRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_DP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SWDT_CRF, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_AFI_FM5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_AFI_FM4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_AFI_FM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_AFI_FM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_AFI_FM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_AFI_FM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GDMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPU_PP1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPU_PP0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPU, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SATA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU3_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU2_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU1_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU0_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_APU_L2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_DDR, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_APM_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SOFT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GEM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GEM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GEM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GEM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_QSPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_UART0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_UART1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SPI0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SPI1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SDIO0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SDIO1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_CAN0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_CAN1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_I2C0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_I2C1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_TTC0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_TTC1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_TTC2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_TTC3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SWDT_CRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_NAND, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ADMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPIO, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_IOU_CC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_TIMESTAMP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPU_R50, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPU_R51, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPU_AMBA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_OCM, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPU_PGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_USB0_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_USB1_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_USB0_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_USB1_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_USB0_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_USB1_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_IPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_APM_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RTC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SYSMON, 0, > + XILPM_RESET_AFI_FM6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_LPD_SWDT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_FPD, PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, > + XILPM_RESET_RPU_DBG1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPU_DBG0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_DBG_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_DBG_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_APLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_DPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_VPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_IOPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_7, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_8, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_9, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_10, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_11, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_12, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_13, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_14, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_15, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_16, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_17, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_18, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_19, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_20, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_21, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_22, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_23, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_24, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_25, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_26, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_27, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_28, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_29, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_30, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_31, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPU_LS, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_PS_ONLY, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_PL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPIO5_EMIO_92, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPIO5_EMIO_93, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPIO5_EMIO_94, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPIO5_EMIO_95, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + > + /**********************************************************************/ > + /* SET CONFIG SECTION */ > + PM_CONFIG_SET_CONFIG_SECTION_ID, /* Section ID */ > + 0, /* Permissions to set config */ > + /**********************************************************************/ > + /* SHUTDOWN SECTION */ > + PM_CONFIG_SHUTDOWN_SECTION_ID, /* Section ID */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* System Shutdown/Restart Permission */ > + > + /**********************************************************************/ > + /* GPO SECTION */ > + PM_CONFIG_GPO_SECTION_ID, /* GPO Section ID */ > + PM_CONFIG_GPO1_BIT_2_MASK | > + PM_CONFIG_GPO1_MIO_PIN_34_MAP | > + PM_CONFIG_GPO1_MIO_PIN_35_MAP | > + PM_CONFIG_GPO1_MIO_PIN_36_MAP | > + PM_CONFIG_GPO1_MIO_PIN_37_MAP | > + 0, /* State of GPO pins */ > +}; > +#if defined (__ICCARM__) > +#pragma language=restore > +#endif > diff --git a/board/zynqmp/post-build.sh b/board/zynqmp/post-build.sh > new file mode 100755 > index 0000000000..ef55f49376 > --- /dev/null > +++ b/board/zynqmp/post-build.sh > @@ -0,0 +1,10 @@ > +#!/bin/sh > + > +# genimage will need to find the extlinux.conf > +# in the binaries directory > + > +BOARD_DIR="$(dirname $0)" > + > +install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux.conf > + > + please remove useless whiteline, we only need 1 at the end of the file > diff --git a/board/zynqmp/post-image.sh b/board/zynqmp/post-image.sh > index b2b99fed01..ed6dbe188c 100755 > --- a/board/zynqmp/post-image.sh > +++ b/board/zynqmp/post-image.sh > @@ -10,4 +10,6 @@ FIRST_DT=$(sed -nr \ > > [ -z "${FIRST_DT}" ] || ln -fs ${FIRST_DT}.dtb ${BINARIES_DIR}/system.dtb > > -support/scripts/genimage.sh -c board/zynqmp/genimage.cfg > +BOARD_DIR="$(dirname $0)" > + > +support/scripts/genimage.sh -c $BOARD_DIR/genimage.cfg > diff --git a/board/zynqmp/readme.txt b/board/zynqmp/readme.txt > index da37f4ccc9..0dc1793e03 100644 > --- a/board/zynqmp/readme.txt > +++ b/board/zynqmp/readme.txt > @@ -1,10 +1,19 @@ > -******************************** > -Xilinx ZCU106 board - ZynqMP SoC > -******************************** > +****************************************** > +Xilinx ZCU102 / ZCU106 boards - ZynqMP SoC > +****************************************** This ^^^ must be moved to next patch since this patch only deals with zcu106 and not with zcu102 > + > +This document describes the Buildroot support for the ZCU102 and ZCU106 > +boards by Xilinx, based on the Zynq UltraScale+ MPSoC (aka ZynqMP). > +It has been tested with the ZCU102 and ZCU106 production boards. Same here ^^^ > + > +Evaluation board features can be found here with the links below. > + > +ZCU102: > +https://www.xilinx.com/products/boards-and-kits/zcu102.html Ditto > +ZCU106: > +https://www.xilinx.com/products/boards-and-kits/zcu106.html > > -This document describes the Buildroot support for the ZCU106 board by > -Xilinx, based on the Zynq UltraScale+ MPSoC (aka ZynqMP). It has been > -tested with the EK-U1-ZCU106-ES2 pre-production board. > > How to build it > =============== > @@ -32,7 +41,7 @@ After building, you should get a tree like this: > +-- rootfs.ext4 -> rootfs.ext2 > +-- sdcard.img > +-- system.dtb -> zynqmp-zcu106-revA.dtb > - +-- u-boot.bin > + +-- u-boot.itb > `-- zynqmp-zcu106-revA.dtb > > How to write the SD card > diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig > index bee7c1daf7..2026f60bd1 100644 > --- a/configs/zynqmp_zcu106_defconfig > +++ b/configs/zynqmp_zcu106_defconfig > @@ -1,34 +1,39 @@ > BR2_aarch64=y > -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_GIT=y > BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" > -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.15" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > # BR2_TARGET_ROOTFS_TAR is not set > BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.6" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" > -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7" > -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA" > +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2022.01" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" > BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > BR2_TARGET_UBOOT_SPL=y > BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" > BR2_TARGET_UBOOT_ZYNQMP=y > -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/53fdb7b6c92860ceb0ec5fd14deee302f4a84269/bin/pmufw-zcu106-default-v2017.4.bin" > +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/v2021.2/bin/pmufw-v2021.2.bin" > +BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/pm_cfg_obj.c" > +BR2_TARGET_UBOOT_FORMAT_ITB=y > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > BR2_PACKAGE_HOST_DOSFSTOOLS=y > BR2_PACKAGE_HOST_GENIMAGE=y > BR2_PACKAGE_HOST_MTOOLS=y For the rest it looks good to me and it builds correctly using docker. Best regards -- Giulio Benetti Benetti Engineering sas From peter at korsgaard.com Wed Feb 9 16:50:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:33 +0100 Subject: [Buildroot] [PATCH 007/107] package/cracklib: move python support to python3 In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-8-peter@korsgaard.com> The configure script needs a bit of help to detect the python version. Signed-off-by: Peter Korsgaard --- package/cracklib/cracklib.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/package/cracklib/cracklib.mk b/package/cracklib/cracklib.mk index 8e6a844f11..46917b7926 100644 --- a/package/cracklib/cracklib.mk +++ b/package/cracklib/cracklib.mk @@ -20,9 +20,12 @@ else CRACKLIB_CONF_OPTS += --without-zlib endif -ifeq ($(BR2_PACKAGE_PYTHON),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) CRACKLIB_CONF_OPTS += --with-python -CRACKLIB_DEPENDENCIES += python +CRACKLIB_CONF_ENV += \ + ac_cv_path_PYTHON=$(HOST_DIR)/bin/python3 \ + am_cv_python_version=$(PYTHON3_VERSION_MAJOR) +CRACKLIB_DEPENDENCIES += python3 else CRACKLIB_CONF_OPTS += --without-python endif -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:31 +0100 Subject: [Buildroot] [PATCH 005/107] package/boost: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-6-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/boost/Config.in | 2 +- package/boost/boost.mk | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/package/boost/Config.in b/package/boost/Config.in index 2c458bf88a..33a5337096 100644 --- a/package/boost/Config.in +++ b/package/boost/Config.in @@ -296,7 +296,7 @@ config BR2_PACKAGE_BOOST_PROGRAM_OPTIONS config BR2_PACKAGE_BOOST_PYTHON bool "boost-python" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 help The Boost Python Library is a framework for interfacing Python and C++. It allows you to quickly and seamlessly expose C++ diff --git a/package/boost/boost.mk b/package/boost/boost.mk index b6681b0ad3..032ba5c820 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -68,16 +68,11 @@ BOOST_DEPENDENCIES += bzip2 zlib endif ifeq ($(BR2_PACKAGE_BOOST_PYTHON),y) -BOOST_FLAGS += --with-python-root=$(HOST_DIR) -ifeq ($(BR2_PACKAGE_PYTHON3),y) -BOOST_FLAGS += --with-python=$(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) +BOOST_FLAGS += \ + --with-python-root=$(HOST_DIR) \ + --with-python=$(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) BOOST_TARGET_CXXFLAGS += -I$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) BOOST_DEPENDENCIES += python3 -else -BOOST_FLAGS += --with-python=$(HOST_DIR)/bin/python$(PYTHON_VERSION_MAJOR) -BOOST_TARGET_CXXFLAGS += -I$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) -BOOST_DEPENDENCIES += python -endif endif HOST_BOOST_OPTS += --no-cmake-config toolset=gcc threading=multi \ -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:38 +0100 Subject: [Buildroot] [PATCH 012/107] package/evemu: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-13-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/evemu/evemu.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/evemu/evemu.mk b/package/evemu/evemu.mk index 02e5abdb8f..b27033afa4 100644 --- a/package/evemu/evemu.mk +++ b/package/evemu/evemu.mk @@ -22,9 +22,9 @@ EVEMU_CONF_OPTS += --disable-tests EVEMU_DEPENDENCIES = host-pkgconf libevdev # Check for target python -ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) EVEMU_CONF_OPTS += --enable-python-bindings -EVEMU_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON3),python3,python) +EVEMU_DEPENDENCIES += python3 else EVEMU_CONF_OPTS += --disable-python-bindings endif -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:28 +0100 Subject: [Buildroot] [PATCH 002/107] package/python: drop target package In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-3-peter@korsgaard.com> Python 2.7 is EOL since April 2020, so drop support for the target package. https://www.python.org/dev/peps/pep-0373/ Signed-off-by: Peter Korsgaard --- Config.in.legacy | 8 +++ package/Config.in | 3 +- package/python/Config.in | 139 --------------------------------------- 3 files changed, 9 insertions(+), 141 deletions(-) delete mode 100644 package/python/Config.in diff --git a/Config.in.legacy b/Config.in.legacy index 34d8c71cc8..6bc3803a5c 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,14 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON + bool "python2.7 package removed" + select BR2_LEGACY + help + Python 2.7 is EOL since April 2020 and has been removed. + + https://www.python.org/dev/peps/pep-0373/ + config BR2_TARGET_UBOOT_ZYNQ_IMAGE bool "Generate image for Xilinx Zynq" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index d631ed784a..ca2fb363e3 100644 --- a/package/Config.in +++ b/package/Config.in @@ -897,9 +897,8 @@ if BR2_STATIC_LIBS comment "External PHP extensions need a toolchain w/ dynamic library" endif endif - source "package/python/Config.in" source "package/python3/Config.in" -if BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 +if BR2_PACKAGE_PYTHON3 menu "External python modules" source "package/python-aenum/Config.in" source "package/python-aexpect/Config.in" diff --git a/package/python/Config.in b/package/python/Config.in deleted file mode 100644 index ab6950cae8..0000000000 --- a/package/python/Config.in +++ /dev/null @@ -1,139 +0,0 @@ -comment "python needs a toolchain w/ wchar, threads, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS - -config BR2_PACKAGE_PYTHON - bool "python2.7 (deprecated)" - depends on BR2_USE_WCHAR - # uses fork() - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_THREADS # libffi - depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_LIBFFI - help - The python language interpreter. - - http://www.python.org/ - -if BR2_PACKAGE_PYTHON - -choice - prompt "python module format to install" - default BR2_PACKAGE_PYTHON_PYC_ONLY - help - Select Python module format to install on target (py, pyc or - both) - -config BR2_PACKAGE_PYTHON_PY_ONLY - bool ".py sources only" - -config BR2_PACKAGE_PYTHON_PYC_ONLY - bool ".pyc compiled sources only" - -config BR2_PACKAGE_PYTHON_PY_PYC - bool ".py sources and .pyc compiled" - -endchoice - -menu "core python modules" - -comment "The following modules are unusual or require extra libraries" - -config BR2_PACKAGE_PYTHON_2TO3 - bool "2to3 module" - help - code translation from python 2 to 3 - -config BR2_PACKAGE_PYTHON_BZIP2 - bool "bzip2 module" - select BR2_PACKAGE_BZIP2 - help - bzip2 module for Python - -config BR2_PACKAGE_PYTHON_BSDDB - bool "bsddb module" - select BR2_PACKAGE_BERKELEYDB - help - bsddb module for Python. - -config BR2_PACKAGE_PYTHON_CODECSCJK - bool "codecscjk module" - help - Chinese/Japanese/Korean codecs module for Python (large). - -config BR2_PACKAGE_PYTHON_CURSES - bool "curses module" - select BR2_PACKAGE_NCURSES - help - curses module for Python. - -config BR2_PACKAGE_PYTHON_OSSAUDIODEV - bool "ossaudiodev module" - help - ossaudiodev module for Python. - -config BR2_PACKAGE_PYTHON_READLINE - bool "readline" - select BR2_PACKAGE_READLINE - help - readline module for Python (required for command-line - editing in the Python shell). - -config BR2_PACKAGE_PYTHON_SSL - bool "ssl" - select BR2_PACKAGE_OPENSSL - help - _ssl module for Python (required for https in urllib etc). - -config BR2_PACKAGE_PYTHON_UNICODEDATA - bool "unicodedata module" - default y - help - Unicode character database (used by stringprep module) - (large). - -if BR2_PACKAGE_PYTHON_UNICODEDATA - -choice - prompt "Python unicode database format" - default BR2_PACKAGE_PYTHON_UCS2 - help - Select Python unicode database format for target - -config BR2_PACKAGE_PYTHON_UCS2 - bool "Universal Character Set 2-byte (UCS2)" - -config BR2_PACKAGE_PYTHON_UCS4 - bool "Universal Character Set 4-byte (UCS4)" - -endchoice - -endif - -config BR2_PACKAGE_PYTHON_SQLITE - bool "sqlite module" - select BR2_PACKAGE_SQLITE - help - SQLite database support - -config BR2_PACKAGE_PYTHON_PYEXPAT - bool "xml module" - select BR2_PACKAGE_EXPAT - help - pyexpat and xml libraries for Python - -config BR2_PACKAGE_PYTHON_ZLIB - bool "zlib module" - select BR2_PACKAGE_ZLIB - help - zlib support in Python - -config BR2_PACKAGE_PYTHON_HASHLIB - bool "hashlib module" - select BR2_PACKAGE_OPENSSL - help - hashlib support in Python - -endmenu - -endif -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:27 +0100 Subject: [Buildroot] [PATCH 001/107] support/testing: drop python2 tests In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-2-peter@korsgaard.com> Python2 for the target is about to get removed, so drop the tests using it. Signed-off-by: Peter Korsgaard --- .../tests/package/sample_python_subprocess32.py | 6 ------ support/testing/tests/package/test_bmap_tools.py | 8 -------- support/testing/tests/package/test_crudini.py | 8 -------- support/testing/tests/package/test_libftdi1.py | 12 ------------ support/testing/tests/package/test_python.py | 14 -------------- support/testing/tests/package/test_python_argh.py | 9 --------- .../testing/tests/package/test_python_bitstring.py | 10 ---------- support/testing/tests/package/test_python_can.py | 11 ----------- support/testing/tests/package/test_python_cbor.py | 11 ----------- support/testing/tests/package/test_python_click.py | 9 --------- .../tests/package/test_python_constantly.py | 10 ---------- support/testing/tests/package/test_python_gnupg.py | 10 ---------- .../tests/package/test_python_incremental.py | 11 ----------- .../testing/tests/package/test_python_passlib.py | 11 ----------- .../testing/tests/package/test_python_pexpect.py | 10 ---------- .../testing/tests/package/test_python_pynacl.py | 11 ----------- .../testing/tests/package/test_python_pyyaml.py | 11 ----------- .../tests/package/test_python_subprocess32.py | 11 ----------- .../testing/tests/package/test_python_ubjson.py | 11 ----------- 19 files changed, 194 deletions(-) delete mode 100644 support/testing/tests/package/sample_python_subprocess32.py delete mode 100644 support/testing/tests/package/test_python_subprocess32.py diff --git a/support/testing/tests/package/sample_python_subprocess32.py b/support/testing/tests/package/sample_python_subprocess32.py deleted file mode 100644 index 8579745cc8..0000000000 --- a/support/testing/tests/package/sample_python_subprocess32.py +++ /dev/null @@ -1,6 +0,0 @@ -import subprocess32 - -output = subprocess32.check_output(["ls", "-l", "/dev/null"]) -print(output) -assert("/dev/null" in output) -assert("No such" not in output) diff --git a/support/testing/tests/package/test_bmap_tools.py b/support/testing/tests/package/test_bmap_tools.py index baa23154f8..a179027633 100644 --- a/support/testing/tests/package/test_bmap_tools.py +++ b/support/testing/tests/package/test_bmap_tools.py @@ -45,14 +45,6 @@ class TestBmapTools(BRTest): self.assertRunOk(cmd, timeout=20) -class TestPy2BmapTools(TestBmapTools): - __test__ = True - config = TestBmapTools.config + \ - """ - BR2_PACKAGE_PYTHON=y - """ - - class TestPy3BmapTools(TestBmapTools): __test__ = True config = TestBmapTools.config + \ diff --git a/support/testing/tests/package/test_crudini.py b/support/testing/tests/package/test_crudini.py index e320d3207e..470a714eb6 100644 --- a/support/testing/tests/package/test_crudini.py +++ b/support/testing/tests/package/test_crudini.py @@ -33,14 +33,6 @@ class TestCrudiniBase(TestPythonPackageBase): self.assertEqual(out, ['this-is-the-magic-value']) -class TestCrudiniPy2(TestCrudiniBase): - __test__ = True - config = TestCrudiniBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - """ - - class TestCrudiniPy3(TestCrudiniBase): __test__ = True config = TestCrudiniBase.config + \ diff --git a/support/testing/tests/package/test_libftdi1.py b/support/testing/tests/package/test_libftdi1.py index 78c928484c..5c29dea04f 100644 --- a/support/testing/tests/package/test_libftdi1.py +++ b/support/testing/tests/package/test_libftdi1.py @@ -1,18 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Libftdi1(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_LIBFTDI1=y - BR2_PACKAGE_LIBFTDI1_PYTHON_BINDINGS=y - """ - sample_scripts = ["tests/package/sample_libftdi1.py"] - timeout = 40 - - class TestPythonPy3Libftdi1(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python.py b/support/testing/tests/package/test_python.py index 60da8765c4..f29aff6624 100644 --- a/support/testing/tests/package/test_python.py +++ b/support/testing/tests/package/test_python.py @@ -39,20 +39,6 @@ class TestPythonBase(infra.basetest.BRTest): self.assertEqual(exit_code, 1) -class TestPython2(TestPythonBase): - config = TestPythonBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - """ - - def test_run(self): - self.login() - self.version_test("Python 2") - self.math_floor_test() - self.libc_time_test() - self.zlib_test() - - class TestPython3(TestPythonBase): config = TestPythonBase.config + \ """ diff --git a/support/testing/tests/package/test_python_argh.py b/support/testing/tests/package/test_python_argh.py index de4b4cbe74..887d9acd46 100644 --- a/support/testing/tests/package/test_python_argh.py +++ b/support/testing/tests/package/test_python_argh.py @@ -27,15 +27,6 @@ class TestPythonArgh(TestPythonPackageBase): self.assertEqual(exit_code, 2) -class TestPythonPy2Argh(TestPythonArgh): - __test__ = True - config = TestPythonArgh.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_ARGH=y - """ - - class TestPythonPy3Argh(TestPythonArgh): __test__ = True config = TestPythonArgh.config + \ diff --git a/support/testing/tests/package/test_python_bitstring.py b/support/testing/tests/package/test_python_bitstring.py index 63b3fdb69c..bd358a2fc5 100644 --- a/support/testing/tests/package/test_python_bitstring.py +++ b/support/testing/tests/package/test_python_bitstring.py @@ -1,16 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Bitstring(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_BITSTRING=y - """ - sample_scripts = ["tests/package/sample_python_bitstring.py"] - - class TestPythonPy3Bitstring(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python_can.py b/support/testing/tests/package/test_python_can.py index d509d05dbb..dba5539c5d 100644 --- a/support/testing/tests/package/test_python_can.py +++ b/support/testing/tests/package/test_python_can.py @@ -1,17 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Can(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_CAN=y - """ - sample_scripts = ["tests/package/sample_python_can.py"] - timeout = 40 - - class TestPythonPy3Can(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python_cbor.py b/support/testing/tests/package/test_python_cbor.py index 9da3503763..23a1e3e701 100644 --- a/support/testing/tests/package/test_python_cbor.py +++ b/support/testing/tests/package/test_python_cbor.py @@ -1,17 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Cbor(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_CBOR=y - """ - sample_scripts = ["tests/package/sample_python_cbor_enc.py", - "tests/package/sample_python_cbor_dec.py"] - - class TestPythonPy3Cbor(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python_click.py b/support/testing/tests/package/test_python_click.py index db57d3aa9f..0ee9702cce 100644 --- a/support/testing/tests/package/test_python_click.py +++ b/support/testing/tests/package/test_python_click.py @@ -26,15 +26,6 @@ class TestPythonClick(TestPythonPackageBase): self.assertEqual(exit_code, 2) -class TestPythonPy2Click(TestPythonClick): - __test__ = True - config = TestPythonClick.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_CLICK=y - """ - - class TestPythonPy3Click(TestPythonClick): __test__ = True config = TestPythonClick.config + \ diff --git a/support/testing/tests/package/test_python_constantly.py b/support/testing/tests/package/test_python_constantly.py index 5be01c4f8c..edcb9bfd69 100644 --- a/support/testing/tests/package/test_python_constantly.py +++ b/support/testing/tests/package/test_python_constantly.py @@ -1,16 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Constantly(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_CONSTANTLY=y - """ - sample_scripts = ["tests/package/sample_python_constantly.py"] - - class TestPythonPy3Constantly(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python_gnupg.py b/support/testing/tests/package/test_python_gnupg.py index 0c71f6b6d0..8861115130 100644 --- a/support/testing/tests/package/test_python_gnupg.py +++ b/support/testing/tests/package/test_python_gnupg.py @@ -1,16 +1,6 @@ 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 + \ diff --git a/support/testing/tests/package/test_python_incremental.py b/support/testing/tests/package/test_python_incremental.py index 49800d8937..4c53d61321 100644 --- a/support/testing/tests/package/test_python_incremental.py +++ b/support/testing/tests/package/test_python_incremental.py @@ -1,17 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Incremental(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_INCREMENTAL=y - """ - sample_scripts = ["tests/package/sample_python_incremental.py"] - timeout = 30 - - class TestPythonPy3Incremental(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python_passlib.py b/support/testing/tests/package/test_python_passlib.py index 7c85882bf8..e12e86d91b 100644 --- a/support/testing/tests/package/test_python_passlib.py +++ b/support/testing/tests/package/test_python_passlib.py @@ -1,17 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Passlib(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_PASSLIB=y - """ - sample_scripts = ["tests/package/sample_python_passlib.py"] - timeout = 30 - - class TestPythonPy3Passlib(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python_pexpect.py b/support/testing/tests/package/test_python_pexpect.py index ba31cdbdbe..70037a7d3c 100644 --- a/support/testing/tests/package/test_python_pexpect.py +++ b/support/testing/tests/package/test_python_pexpect.py @@ -1,16 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Pexpect(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_PEXPECT=y - """ - sample_scripts = ["tests/package/sample_python_pexpect.py"] - - class TestPythonPy3Pexpect(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python_pynacl.py b/support/testing/tests/package/test_python_pynacl.py index f4dd54940a..cef8a7e780 100644 --- a/support/testing/tests/package/test_python_pynacl.py +++ b/support/testing/tests/package/test_python_pynacl.py @@ -1,17 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Pynacl(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_PYNACL=y - """ - sample_scripts = ["tests/package/sample_python_pynacl.py"] - timeout = 10 - - class TestPythonPy3Pynacl(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python_pyyaml.py b/support/testing/tests/package/test_python_pyyaml.py index cd45a57b86..9d0a351f72 100644 --- a/support/testing/tests/package/test_python_pyyaml.py +++ b/support/testing/tests/package/test_python_pyyaml.py @@ -1,17 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Pyyaml(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_PYYAML=y - """ - sample_scripts = ["tests/package/sample_python_pyyaml_enc.py", - "tests/package/sample_python_pyyaml_dec.py"] - - class TestPythonPy3Pyyaml(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python_subprocess32.py b/support/testing/tests/package/test_python_subprocess32.py deleted file mode 100644 index d2878046d1..0000000000 --- a/support/testing/tests/package/test_python_subprocess32.py +++ /dev/null @@ -1,11 +0,0 @@ -from tests.package.test_python import TestPythonPackageBase - - -class TestPythonPy2Subprocess32(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_SUBPROCESS32=y - """ - sample_scripts = ["tests/package/sample_python_subprocess32.py"] diff --git a/support/testing/tests/package/test_python_ubjson.py b/support/testing/tests/package/test_python_ubjson.py index 85c707e292..a15dbd54b8 100644 --- a/support/testing/tests/package/test_python_ubjson.py +++ b/support/testing/tests/package/test_python_ubjson.py @@ -1,17 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Ubjson(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_UBJSON=y - """ - sample_scripts = ["tests/package/sample_python_ubjson_enc.py", - "tests/package/sample_python_ubjson_dec.py"] - - class TestPythonPy3Ubjson(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:51 +0100 Subject: [Buildroot] [PATCH 025/107] package/libpwquality: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-26-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/libpwquality/libpwquality.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libpwquality/libpwquality.mk b/package/libpwquality/libpwquality.mk index 54a03be453..d4f7a47120 100644 --- a/package/libpwquality/libpwquality.mk +++ b/package/libpwquality/libpwquality.mk @@ -12,9 +12,9 @@ LIBPWQUALITY_INSTALL_STAGING = YES LIBPWQUALITY_DEPENDENCIES = cracklib LIBPWQUALITY_LICENSE_FILES = COPYING -ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) LIBPWQUALITY_CONF_OPTS += --enable-python-bindings -LIBPWQUALITY_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON3),python3,python) +LIBPWQUALITY_DEPENDENCIES += python3 LIBPWQUALITY_MAKE_ENV += $(PKG_PYTHON_DISTUTILS_ENV) else LIBPWQUALITY_CONF_OPTS += --disable-python-bindings -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:43 +0100 Subject: [Buildroot] [PATCH 017/107] package/i2c-tools: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-18-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/i2c-tools/i2c-tools.mk | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/package/i2c-tools/i2c-tools.mk b/package/i2c-tools/i2c-tools.mk index 7565349f5e..5c9ce26628 100644 --- a/package/i2c-tools/i2c-tools.mk +++ b/package/i2c-tools/i2c-tools.mk @@ -13,10 +13,6 @@ I2C_TOOLS_CPE_ID_VENDOR = i2c-tools_project I2C_TOOLS_MAKE_OPTS = EXTRA=eeprog I2C_TOOLS_INSTALL_STAGING = YES -ifeq ($(BR2_PACKAGE_PYTHON),y) -I2C_TOOLS_DEPENDENCIES += python -endif - ifeq ($(BR2_PACKAGE_PYTHON3),y) I2C_TOOLS_DEPENDENCIES += python3 endif @@ -31,7 +27,7 @@ endif # Build/install steps mirror the distutil python package type in the python package # infrastructure -ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) # BASE_ENV taken from PKG_PYTHON_DISTUTILS_ENV in package/pkg-python.mk I2C_TOOLS_PYTHON_BASE_ENV = \ $(PKG_PYTHON_DISTUTILS_ENV) \ @@ -51,7 +47,7 @@ define I2C_TOOLS_INSTALL_PYSMBUS $(PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS)) endef -endif # BR2_PACKAGE_PYTHON +endif # BR2_PACKAGE_PYTHON3 define I2C_TOOLS_BUILD_CMDS $(MAKE) $(TARGET_CONFIGURE_OPTS) $(I2C_TOOLS_MAKE_OPTS) -C $(@D) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:12 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:12 +0100 Subject: [Buildroot] [PATCH 046/107] package/python-logbook: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-47-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-logbook/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-logbook/Config.in b/package/python-logbook/Config.in index d4fbf0fe67..99996b6517 100644 --- a/package/python-logbook/Config.in +++ b/package/python-logbook/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_LOGBOOK bool "python-logbook" - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_ZLIB help A logging replacement for Python. -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:11 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:11 +0100 Subject: [Buildroot] [PATCH 045/107] package/python-libconfig: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-46-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-libconfig/python-libconfig.mk | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/package/python-libconfig/python-libconfig.mk b/package/python-libconfig/python-libconfig.mk index 2db7e99cf3..c7d87f408a 100644 --- a/package/python-libconfig/python-libconfig.mk +++ b/package/python-libconfig/python-libconfig.mk @@ -14,14 +14,8 @@ PYTHON_LIBCONFIG_SETUP_TYPE = setuptools PYTHON_LIBCONFIG_DEPENDENCIES = libconfig boost -ifeq ($(BR2_PACKAGE_PYTHON),y) -PYTHON_LIBCONFIG_PYVER = $(PYTHON_VERSION_MAJOR) -else ifeq ($(BR2_PACKAGE_PYTHON3),y) -PYTHON_LIBCONFIG_PYVER = $(PYTHON3_VERSION_MAJOR) -endif - define PYTHON_LIBCONFIG_FIX_SETUP - $(SED) 's/boost_python/boost_python$(subst .,,$(PYTHON_LIBCONFIG_PYVER))/g' \ + $(SED) 's/boost_python/boost_python$(subst .,,$(PYTHON3_VERSION_MAJOR))/g' \ $(@D)/setup.py endef PYTHON_LIBCONFIG_POST_PATCH_HOOKS += PYTHON_LIBCONFIG_FIX_SETUP -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:42 +0100 Subject: [Buildroot] [PATCH 076/107] package/snmpclitools: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-77-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/snmpclitools/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/snmpclitools/Config.in b/package/snmpclitools/Config.in index 00bf5994d1..bf3668a89b 100644 --- a/package/snmpclitools/Config.in +++ b/package/snmpclitools/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_SNMPCLITOOLS bool "snmpclitools" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_PYSMI # runtime select BR2_PACKAGE_PYTHON_PYSNMP # runtime help -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:00 +0100 Subject: [Buildroot] [PATCH 034/107] package/python-aenum: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-35-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-aenum/python-aenum.mk | 9 --------- 1 file changed, 9 deletions(-) diff --git a/package/python-aenum/python-aenum.mk b/package/python-aenum/python-aenum.mk index 98695d99ce..72eaa1db2b 100644 --- a/package/python-aenum/python-aenum.mk +++ b/package/python-aenum/python-aenum.mk @@ -11,13 +11,4 @@ PYTHON_AENUM_SETUP_TYPE = setuptools PYTHON_AENUM_LICENSE = BSD-3-Clause PYTHON_AENUM_LICENSE_FILES = aenum/LICENSE -ifeq ($(BR2_PACKAGE_PYTHON),y) -# only needed/valid for python 3.x -define PYTHON_AENUM_RM_PY3_FILE - rm -f $(TARGET_DIR)/usr/lib/python*/site-packages/aenum/test_v3.py -endef - -PYTHON_AENUM_POST_INSTALL_TARGET_HOOKS += PYTHON_AENUM_RM_PY3_FILE -endif - $(eval $(python-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:55 +0100 Subject: [Buildroot] [PATCH 089/107] package/python-id3: drop python2 specific package In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-90-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/python-id3/Config.in | 9 --------- package/python-id3/python-id3.hash | 3 --- package/python-id3/python-id3.mk | 14 -------------- 6 files changed, 6 insertions(+), 28 deletions(-) delete mode 100644 package/python-id3/Config.in delete mode 100644 package/python-id3/python-id3.hash delete mode 100644 package/python-id3/python-id3.mk diff --git a/Config.in.legacy b/Config.in.legacy index 7e85e4cf63..03ea14a512 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_ID3 + bool "python-id3 removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_FUTURES bool "python-futures removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index d2ed22dac0..985f43b614 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -729,7 +729,6 @@ F: package/wireless-regdb/ N: Dominik Faessler F: package/logsurfer/ -F: package/python-id3/ N: Doug Kehn F: package/nss-pam-ldapd/ diff --git a/package/Config.in b/package/Config.in index b18d298a1b..0ee1c8ddb4 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1049,7 +1049,6 @@ menu "External python modules" source "package/python-hyperframe/Config.in" source "package/python-hyperlink/Config.in" source "package/python-ibmiotf/Config.in" - source "package/python-id3/Config.in" source "package/python-idna/Config.in" source "package/python-ifaddr/Config.in" source "package/python-incremental/Config.in" diff --git a/package/python-id3/Config.in b/package/python-id3/Config.in deleted file mode 100644 index 6ddfd541bd..0000000000 --- a/package/python-id3/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PYTHON_ID3 - bool "python-id3" - depends on BR2_PACKAGE_PYTHON - help - This module allows one to read and manipulate so-called ID3 - informational tags on MP3 files through an object-oriented - Python interface. - - http://id3-py.sourceforge.net/ diff --git a/package/python-id3/python-id3.hash b/package/python-id3/python-id3.hash deleted file mode 100644 index c83b34a2d9..0000000000 --- a/package/python-id3/python-id3.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed: -sha256 ba612342b59a49cbf9a7eb23a646667757ffda96dc23b67245fc6cd8d90c2022 id3-py_1.2.tar.gz -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/python-id3/python-id3.mk b/package/python-id3/python-id3.mk deleted file mode 100644 index d4cdded00c..0000000000 --- a/package/python-id3/python-id3.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-id3 -# -################################################################################ - -PYTHON_ID3_VERSION = 1.2 -PYTHON_ID3_SOURCE = id3-py_$(PYTHON_ID3_VERSION).tar.gz -PYTHON_ID3_SITE = http://downloads.sourceforge.net/project/id3-py/id3-py/$(PYTHON_ID3_VERSION) -PYTHON_ID3_SETUP_TYPE = distutils -PYTHON_ID3_LICENSE = GPL-2.0+ -PYTHON_ID3_LICENSE_FILES = COPYING - -$(eval $(python-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:45 +0100 Subject: [Buildroot] [PATCH 079/107] package/syslog-ng: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-80-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/syslog-ng/syslog-ng.mk | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/package/syslog-ng/syslog-ng.mk b/package/syslog-ng/syslog-ng.mk index f37e7c2ea5..c05ec9785c 100644 --- a/package/syslog-ng/syslog-ng.mk +++ b/package/syslog-ng/syslog-ng.mk @@ -32,12 +32,7 @@ else SYSLOG_NG_CONF_OPTS += --disable-linux-caps endif -ifeq ($(BR2_PACKAGE_PYTHON),y) -SYSLOG_NG_DEPENDENCIES += python -SYSLOG_NG_CONF_OPTS += \ - --enable-python \ - --with-python=$(PYTHON_VERSION_MAJOR) -else ifeq ($(BR2_PACKAGE_PYTHON3),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) SYSLOG_NG_DEPENDENCIES += python3 SYSLOG_NG_CONF_OPTS += \ --enable-python \ -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:52:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:52:01 +0100 Subject: [Buildroot] [PATCH 095/107] package/python-pathlib2: drop python2 specific package In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-96-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/python-pathlib2/Config.in | 13 ------------- package/python-pathlib2/python-pathlib2.hash | 5 ----- package/python-pathlib2/python-pathlib2.mk | 14 -------------- 6 files changed, 6 insertions(+), 34 deletions(-) delete mode 100644 package/python-pathlib2/Config.in delete mode 100644 package/python-pathlib2/python-pathlib2.hash delete mode 100644 package/python-pathlib2/python-pathlib2.mk diff --git a/Config.in.legacy b/Config.in.legacy index 386f94e72b..74317a2d7c 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_PATHLIB2 + bool "python-pathlib2 removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_PAM bool "python-pam removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index a6ea3793ea..07f9304766 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -145,7 +145,6 @@ F: package/mpd/ N: Andrey Smirnov F: package/python-decorator/ F: package/python-ipython-genutils/ -F: package/python-pathlib2/ F: package/python-pickleshare/ F: package/python-scandir/ F: package/python-simplegeneric/ diff --git a/package/Config.in b/package/Config.in index 73e8901a1d..3c55dec6c5 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1118,7 +1118,6 @@ menu "External python modules" source "package/python-paramiko/Config.in" source "package/python-parso/Config.in" source "package/python-passlib/Config.in" - source "package/python-pathlib2/Config.in" source "package/python-pathpy/Config.in" source "package/python-pathtools/Config.in" source "package/python-pathvalidate/Config.in" diff --git a/package/python-pathlib2/Config.in b/package/python-pathlib2/Config.in deleted file mode 100644 index e28de4c12e..0000000000 --- a/package/python-pathlib2/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_PYTHON_PATHLIB2 - bool "python-pathlib2" - depends on BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON_SIX # runtime - help - Object-oriented filesystem paths. - - The goal of pathlib2 is to provide a backport of standard - pathlib module which tracks the standard library module, so - all the newest features of the standard pathlib can be used - also on older Python versions. - - https://pypi.python.org/pypi/pathlib2 diff --git a/package/python-pathlib2/python-pathlib2.hash b/package/python-pathlib2/python-pathlib2.hash deleted file mode 100644 index ebd197b62e..0000000000 --- a/package/python-pathlib2/python-pathlib2.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/pathlib2/json -md5 e50a0cf94e406c5110b3aed535626e9e pathlib2-2.3.6.tar.gz -sha256 7d8bcb5555003cdf4a8d2872c538faa3a0f5d20630cb360e518ca3b981795e5f pathlib2-2.3.6.tar.gz -# Locally computed sha256 checksums -sha256 861f813004a151ac77024ad445794653809ddf8a7572aee7bab18d11df2ba1c6 LICENSE.rst diff --git a/package/python-pathlib2/python-pathlib2.mk b/package/python-pathlib2/python-pathlib2.mk deleted file mode 100644 index 4bcfea78fb..0000000000 --- a/package/python-pathlib2/python-pathlib2.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-pathlib2 -# -################################################################################ - -PYTHON_PATHLIB2_VERSION = 2.3.6 -PYTHON_PATHLIB2_SOURCE = pathlib2-$(PYTHON_PATHLIB2_VERSION).tar.gz -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 - -$(eval $(python-package)) -- 2.20.1 From nealf at xilinx.com Wed Feb 9 17:15:16 2022 From: nealf at xilinx.com (Neal Frager) Date: Wed, 9 Feb 2022 17:15:16 +0000 Subject: [Buildroot] [PATCH 1/2] configs/zynqmp_zcu106: Bump ATF/U-Boot/Linux to Xilinx 2022 -v2 In-Reply-To: References: <20220209082821.72879-1-neal.frager@xilinx.com> Message-ID: Hi Giulio, > the subject doesn't need "-v2" in it. I'm pretty sure you've used the wrong command to generate the V2 patchset. > This are the correct commands: > # cd buildroot > # git format-patch -s -M -o . -2 Thank you for the command. I misunderstood what you meant in your previous email, as I was just creating the whole patch set again from the beginning. On 09/02/22 09:28, Neal Frager wrote: > This patch: > - bumps configs/zynqmp_zcu106_defconfig to Xilinx 2022 > What does this ^^^ line means? Xilinx 2022? Maybe it is what it's already below, Linux, u-boot, ATF. So I think you can drop it I wanted the defconfigs to match a Xilinx software release. We have two releases per year, 2022.1 and 2022.2. Neither of these has happened yet, which is why originally, I wanted to just bump buildroot to 2021.2. Unfortunately, to get a perfectly clean build without the patches directory, I needed the updated pm_cfg_obj_convert.py script, which forced me into U-Boot 2022.01. So in the end, these defconfigs use all Xilinx software versions (ATF, U-Boot and Linux) that will eventually come with Xilinx 2022.1. My long term plan is to maintain these zynqmp_zcu10x_defconfigs with each Xilinx software release. Eventually, I will be bumping to Xilinx 2022.1 and Xilinx 2022.2, etc. Since these current patches are not tied directly to a Xilinx software release, I suppose it is easier to just remove this comment from the log. > - bumps ATF to Xilinx v2.6: mainline v2.6 requires patch to build > - bumps U-Boot to Xilinx 2022.01: important drivers not in mainline > - bumps Linux to Xilinx 5.15: important drivers not in mainline > - deletes board/zynqmp/patches directory: patches already in mainline > as you see below, this patch doesn't delete those patches and folder With v3 that I will be sending shortly, I am going to fix this. > - modifies board/zynqmp/genimage.cfg: U-Boot 2022.01 uses u-boot.itb > format > - adds extlinux.conf to vfat bootfs > it's worth mentioning that it switches from boot.scr to extlinux.conf also How come? boot.scr was never used with the zynqmp devices on buildroot before. I was considering using boot.scr, but since this was never part of buildroot, why mention it? > - modifies U-Boot to unified xilinx_zynqmp_virt_defconfig (supports > all boards) > - adds support for SPL pm_cfg_obj.c loading to PMU firmware > - adds support for host machines without SSL > ^^^ - enable support for host machines without OpenSSL required by u-boot Because you don't add support and it's OpenSSL that is required by u-boot Ok. I will update this comment. > > Signed-off-by: Neal Frager > --- > board/zynqmp/extlinux.conf | 4 + > board/zynqmp/genimage.cfg | 6 +- > board/zynqmp/pm_cfg_obj.c | 614 ++++++++++++++++++++++++++++++++ > board/zynqmp/post-build.sh | 10 + > board/zynqmp/post-image.sh | 4 +- > board/zynqmp/readme.txt | 23 +- > configs/zynqmp_zcu106_defconfig | 23 +- > 7 files changed, 665 insertions(+), 19 deletions(-) > create mode 100644 board/zynqmp/extlinux.conf > create mode 100644 board/zynqmp/pm_cfg_obj.c > create mode 100755 board/zynqmp/post-build.sh > As mentioned above deletes are missing As mentioned, I will fix this with v3. > diff --git a/board/zynqmp/extlinux.conf b/board/zynqmp/extlinux.conf > new file mode 100644 index 0000000000..15ef707ea2 > --- /dev/null > +++ b/board/zynqmp/extlinux.conf > @@ -0,0 +1,4 @@ > +label linux > + kernel /Image > + devicetree /system.dtb > + append console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait > diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg > index ed202f4550..20d8352c08 100644 > --- a/board/zynqmp/genimage.cfg > +++ b/board/zynqmp/genimage.cfg > @@ -2,11 +2,13 @@ image boot.vfat { > vfat { > files = { > "boot.bin", > - "u-boot.bin", > - "atf-uboot.ub", > + "u-boot.itb", > "system.dtb", > "Image" > } > + file extlinux/extlinux.conf { > + image = extlinux.conf > + } > } > > size = 32M > diff --git a/board/zynqmp/pm_cfg_obj.c b/board/zynqmp/pm_cfg_obj.c new > file mode 100644 index 0000000000..7566b3236a > --- /dev/null > +++ b/board/zynqmp/pm_cfg_obj.c > @@ -0,0 +1,614 @@ > +/******************************************************************** > +********** > +* Copyright (c) 2017 - 2020 Xilinx, Inc. All rights reserved. > +* SPDX-License-Identifier: MIT > +********************************************************************* > +*********/ > + > + > +#include "xil_types.h" > +#include "pm_defs.h" > + > +#define PM_CONFIG_MASTER_SECTION_ID 0x101U > +#define PM_CONFIG_SLAVE_SECTION_ID 0x102U > +#define PM_CONFIG_PREALLOC_SECTION_ID 0x103U > +#define PM_CONFIG_POWER_SECTION_ID 0x104U > +#define PM_CONFIG_RESET_SECTION_ID 0x105U > +#define PM_CONFIG_SHUTDOWN_SECTION_ID 0x106U > +#define PM_CONFIG_SET_CONFIG_SECTION_ID 0x107U > +#define PM_CONFIG_GPO_SECTION_ID 0x108U > + > +#define PM_SLAVE_FLAG_IS_SHAREABLE 0x1U > +#define PM_MASTER_USING_SLAVE_MASK 0x2U > + > +#define PM_CONFIG_GPO1_MIO_PIN_34_MAP (1U << 10U) > +#define PM_CONFIG_GPO1_MIO_PIN_35_MAP (1U << 11U) > +#define PM_CONFIG_GPO1_MIO_PIN_36_MAP (1U << 12U) > +#define PM_CONFIG_GPO1_MIO_PIN_37_MAP (1U << 13U) > + > +#define PM_CONFIG_GPO1_BIT_2_MASK (1U << 2U) > +#define PM_CONFIG_GPO1_BIT_3_MASK (1U << 3U) > +#define PM_CONFIG_GPO1_BIT_4_MASK (1U << 4U) > +#define PM_CONFIG_GPO1_BIT_5_MASK (1U << 5U) > + > +#define SUSPEND_TIMEOUT 0xFFFFFFFFU > + > + > +#define PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK 0x00000001 > +#define PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK 0x00000100 > +#define PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK 0x00000200 > + > + > + > +#if defined (__ICCARM__) > +#pragma language=save > +#pragma language=extended > +#endif > +#if defined (__GNUC__) > + const u32 XPm_ConfigObject[] __attribute__((used, > +section(".sys_cfg_data"))) = #elif defined (__ICCARM__) #pragma > +location = ".sys_cfg_data" > +__root const u32 XPm_ConfigObject[] = #endif { > + /**********************************************************************/ > + /* HEADER */ > + 1, /* Number of remaining words in the header */ > + 8, /* Number of sections included in config object */ > + /**********************************************************************/ > + /* MASTER SECTION */ > + PM_CONFIG_MASTER_SECTION_ID, /* Master SectionID */ > + 3U, /* No. of Masters*/ > + > + NODE_APU, /* Master Node ID */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask of this master */ > + SUSPEND_TIMEOUT, /* Suspend timeout */ > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ > + > + NODE_RPU_0, /* Master Node ID */ > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask of this master */ > + SUSPEND_TIMEOUT, /* Suspend timeout */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ > + > + NODE_RPU_1, /* Master Node ID */ > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask of this master */ > + SUSPEND_TIMEOUT, /* Suspend timeout */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Suspend permissions */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Wake permissions */ > + > + > + /**********************************************************************/ > + /* SLAVE SECTION */ > + > + > + PM_CONFIG_SLAVE_SECTION_ID, /* Section ID */ > + 49, /* Number of slaves */ > + > + NODE_OCM_BANK_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_OCM_BANK_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_OCM_BANK_2, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_OCM_BANK_3, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_TCM_0_A, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ > + > + NODE_TCM_0_B, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ > + > + NODE_TCM_1_A, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_TCM_1_B, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_L2, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_GPU_PP_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_GPU_PP_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_USB_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_USB_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_TTC_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_TTC_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_TTC_2, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_TTC_3, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_SATA, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_ETH_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_ETH_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_ETH_2, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_ETH_3, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_UART_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_UART_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_SPI_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_SPI_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_I2C_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_I2C_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_SD_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_SD_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_DP, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_GDMA, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_ADMA, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_NAND, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_QSPI, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_GPIO, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_CAN_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_CAN_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_EXTERN, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_DDR, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_IPI_APU, > + 0U, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask */ > + > + NODE_IPI_RPU_0, > + 0U, > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ > + > + NODE_IPI_RPU_1, > + 0U, > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_GPU, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_PCIE, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_PCAP, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_RTC, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_VCU, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_PL, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + > + /**********************************************************************/ > + /* PREALLOC SECTION */ > + > + PM_CONFIG_PREALLOC_SECTION_ID, /* Preallaoc SectionID */ > + 3U, /* No. of Masters*/ > + > +/* Prealloc for psu_cortexa53_0 */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, > + 12, > + NODE_DDR, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_L2, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_0, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_2, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_3, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_I2C_0, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_I2C_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_SD_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_QSPI, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_PL, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_IPI_APU, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + > + /* Prealloc for psu_cortexr5_0 */ > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, > + 14, > + NODE_TCM_0_A, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_TCM_0_B, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_DDR, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_0, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_2, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_3, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_I2C_0, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_I2C_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_SD_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_QSPI, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_PL, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_ADMA, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_IPI_RPU_0, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + > + /* Prealloc for psu_cortexr5_1 */ > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + 3, > + NODE_TCM_1_A, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_TCM_1_B, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_IPI_RPU_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + > + /**********************************************************************/ > + /* POWER SECTION */ > + > + PM_CONFIG_POWER_SECTION_ID, /* Power Section ID */ > + 4U, /* Number of power nodes */ > + > + NODE_APU, /* Power node ID */ > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions > + */ > + > + NODE_RPU, /* Power node ID */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions > + */ > + > + NODE_FPD, /* Power node ID */ > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions > + */ > + > + NODE_PLD, /* Power node ID */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions > + */ > + > + > + /**********************************************************************/ > + /* RESET SECTION */ > + > + PM_CONFIG_RESET_SECTION_ID, /* Reset Section ID */ > + 120U, /* Number of resets */ > + > + XILPM_RESET_PCIE_CFG, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_PCIE_BRIDGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_PCIE_CTRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_DP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SWDT_CRF, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_AFI_FM5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_AFI_FM4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_AFI_FM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_AFI_FM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_AFI_FM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_AFI_FM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GDMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPU_PP1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPU_PP0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPU, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SATA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU3_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU2_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU1_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU0_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_APU_L2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_DDR, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_APM_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SOFT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GEM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GEM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GEM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GEM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_QSPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_UART0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_UART1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SPI0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SPI1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SDIO0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SDIO1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_CAN0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_CAN1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_I2C0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_I2C1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_TTC0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_TTC1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_TTC2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_TTC3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SWDT_CRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_NAND, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ADMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPIO, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_IOU_CC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_TIMESTAMP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPU_R50, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPU_R51, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPU_AMBA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_OCM, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPU_PGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_USB0_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_USB1_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_USB0_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_USB1_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_USB0_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_USB1_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_IPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_APM_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RTC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SYSMON, 0, > + XILPM_RESET_AFI_FM6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_LPD_SWDT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_FPD, PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, > + XILPM_RESET_RPU_DBG1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPU_DBG0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_DBG_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_DBG_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_APLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_DPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_VPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_IOPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_7, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_8, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_9, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_10, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_11, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_12, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_13, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_14, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_15, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_16, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_17, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_18, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_19, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_20, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_21, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_22, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_23, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_24, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_25, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_26, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_27, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_28, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_29, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_30, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_31, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPU_LS, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_PS_ONLY, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_PL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPIO5_EMIO_92, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPIO5_EMIO_93, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPIO5_EMIO_94, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPIO5_EMIO_95, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + > + /**********************************************************************/ > + /* SET CONFIG SECTION */ > + PM_CONFIG_SET_CONFIG_SECTION_ID, /* Section ID */ > + 0, /* Permissions to set config */ > + /**********************************************************************/ > + /* SHUTDOWN SECTION */ > + PM_CONFIG_SHUTDOWN_SECTION_ID, /* Section ID */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* System Shutdown/Restart > + Permission */ > + > + /**********************************************************************/ > + /* GPO SECTION */ > + PM_CONFIG_GPO_SECTION_ID, /* GPO Section ID */ > + PM_CONFIG_GPO1_BIT_2_MASK | > + PM_CONFIG_GPO1_MIO_PIN_34_MAP | > + PM_CONFIG_GPO1_MIO_PIN_35_MAP | > + PM_CONFIG_GPO1_MIO_PIN_36_MAP | > + PM_CONFIG_GPO1_MIO_PIN_37_MAP | > + 0, /* State of GPO pins */ > +}; > +#if defined (__ICCARM__) > +#pragma language=restore > +#endif > diff --git a/board/zynqmp/post-build.sh b/board/zynqmp/post-build.sh > new file mode 100755 index 0000000000..ef55f49376 > --- /dev/null > +++ b/board/zynqmp/post-build.sh > @@ -0,0 +1,10 @@ > +#!/bin/sh > + > +# genimage will need to find the extlinux.conf # in the binaries > +directory > + > +BOARD_DIR="$(dirname $0)" > + > +install -m 0644 -D $BOARD_DIR/extlinux.conf > +$BINARIES_DIR/extlinux.conf > + > + > please remove useless whiteline, we only need 1 at the end of the file Ok, no problem. > diff --git a/board/zynqmp/post-image.sh b/board/zynqmp/post-image.sh > index b2b99fed01..ed6dbe188c 100755 > --- a/board/zynqmp/post-image.sh > +++ b/board/zynqmp/post-image.sh > @@ -10,4 +10,6 @@ FIRST_DT=$(sed -nr \ > > [ -z "${FIRST_DT}" ] || ln -fs ${FIRST_DT}.dtb > ${BINARIES_DIR}/system.dtb > > -support/scripts/genimage.sh -c board/zynqmp/genimage.cfg > +BOARD_DIR="$(dirname $0)" > + > +support/scripts/genimage.sh -c $BOARD_DIR/genimage.cfg > diff --git a/board/zynqmp/readme.txt b/board/zynqmp/readme.txt index > da37f4ccc9..0dc1793e03 100644 > --- a/board/zynqmp/readme.txt > +++ b/board/zynqmp/readme.txt > @@ -1,10 +1,19 @@ > -******************************** > -Xilinx ZCU106 board - ZynqMP SoC > -******************************** > +****************************************** > +Xilinx ZCU102 / ZCU106 boards - ZynqMP SoC > +****************************************** > This ^^^ must be moved to next patch since this patch only deals with > zcu106 and not with zcu102 Good catch. I will move the updated readme.txt file into the zcu102 patch with v3. > + > +This document describes the Buildroot support for the ZCU102 and > +ZCU106 boards by Xilinx, based on the Zynq UltraScale+ MPSoC (aka ZynqMP). > +It has been tested with the ZCU102 and ZCU106 production boards. > Same here ^^^ > + > +Evaluation board features can be found here with the links below. > + > +ZCU102: > +https://www.xilinx.com/products/boards-and-kits/zcu102.html > Ditto > +ZCU106: > +https://www.xilinx.com/products/boards-and-kits/zcu106.html > > -This document describes the Buildroot support for the ZCU106 board by > -Xilinx, based on the Zynq UltraScale+ MPSoC (aka ZynqMP). It has been > -tested with the EK-U1-ZCU106-ES2 pre-production board. > > How to build it > =============== > @@ -32,7 +41,7 @@ After building, you should get a tree like this: > +-- rootfs.ext4 -> rootfs.ext2 > +-- sdcard.img > +-- system.dtb -> zynqmp-zcu106-revA.dtb > - +-- u-boot.bin > + +-- u-boot.itb > `-- zynqmp-zcu106-revA.dtb > > How to write the SD card > diff --git a/configs/zynqmp_zcu106_defconfig > b/configs/zynqmp_zcu106_defconfig index bee7c1daf7..2026f60bd1 100644 > --- a/configs/zynqmp_zcu106_defconfig > +++ b/configs/zynqmp_zcu106_defconfig > @@ -1,34 +1,39 @@ > BR2_aarch64=y > -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_GIT=y > BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" > -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.15" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > # BR2_TARGET_ROOTFS_TAR is not set > BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.6" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" > -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7" > -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA" > +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2022.01" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" > BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > BR2_TARGET_UBOOT_SPL=y > BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" > BR2_TARGET_UBOOT_ZYNQMP=y > -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/53fdb7b6c92860ceb0ec5fd14deee302f4a84269/bin/pmufw-zcu106-default-v2017.4.bin" > +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/v2021.2/bin/pmufw-v2021.2.bin" > +BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/pm_cfg_obj.c" > +BR2_TARGET_UBOOT_FORMAT_ITB=y > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > BR2_PACKAGE_HOST_DOSFSTOOLS=y > BR2_PACKAGE_HOST_GENIMAGE=y > BR2_PACKAGE_HOST_MTOOLS=y > For the rest it looks good to me and it builds correctly using docker. Thanks for your help! Best regards, Neal Frager Xilinx From neal.frager at xilinx.com Wed Feb 9 18:03:06 2022 From: neal.frager at xilinx.com (Neal Frager) Date: Wed, 9 Feb 2022 11:03:06 -0700 Subject: [Buildroot] [PATCH v3 2/2] add configs/zynqmp_zcu102_defconfig In-Reply-To: <20220209180306.2629180-1-neal.frager@xilinx.com> References: <20220209180306.2629180-1-neal.frager@xilinx.com> Message-ID: <20220209180306.2629180-2-neal.frager@xilinx.com> This patch: - adds support for Xilinx ZCU102 evaluation board - ZCU102 features can be found here: - https://www.xilinx.com/products/boards-and-kits/zcu102.html Signed-off-by: Neal Frager --- board/zynqmp/readme.txt | 23 +++++++++++++------ configs/zynqmp_zcu102_defconfig | 39 +++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 7 deletions(-) create mode 100644 configs/zynqmp_zcu102_defconfig diff --git a/board/zynqmp/readme.txt b/board/zynqmp/readme.txt index da37f4ccc9..0dc1793e03 100644 --- a/board/zynqmp/readme.txt +++ b/board/zynqmp/readme.txt @@ -1,10 +1,19 @@ -******************************** -Xilinx ZCU106 board - ZynqMP SoC -******************************** +****************************************** +Xilinx ZCU102 / ZCU106 boards - ZynqMP SoC +****************************************** + +This document describes the Buildroot support for the ZCU102 and ZCU106 +boards by Xilinx, based on the Zynq UltraScale+ MPSoC (aka ZynqMP). +It has been tested with the ZCU102 and ZCU106 production boards. + +Evaluation board features can be found here with the links below. + +ZCU102: +https://www.xilinx.com/products/boards-and-kits/zcu102.html + +ZCU106: +https://www.xilinx.com/products/boards-and-kits/zcu106.html -This document describes the Buildroot support for the ZCU106 board by -Xilinx, based on the Zynq UltraScale+ MPSoC (aka ZynqMP). It has been -tested with the EK-U1-ZCU106-ES2 pre-production board. How to build it =============== @@ -32,7 +41,7 @@ After building, you should get a tree like this: +-- rootfs.ext4 -> rootfs.ext2 +-- sdcard.img +-- system.dtb -> zynqmp-zcu106-revA.dtb - +-- u-boot.bin + +-- u-boot.itb `-- zynqmp-zcu106-revA.dtb How to write the SD card diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig new file mode 100644 index 0000000000..acffda64bf --- /dev/null +++ b/configs/zynqmp_zcu102_defconfig @@ -0,0 +1,39 @@ +BR2_aarch64=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.15" +BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.6" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/Xilinx/u-boot-xlnx.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2022.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" +BR2_TARGET_UBOOT_ZYNQMP=y +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/v2021.2/bin/pmufw-v2021.2.bin" +BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/pm_cfg_obj.c" +BR2_TARGET_UBOOT_FORMAT_ITB=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y -- 2.17.1 From neal.frager at xilinx.com Wed Feb 9 18:03:05 2022 From: neal.frager at xilinx.com (Neal Frager) Date: Wed, 9 Feb 2022 11:03:05 -0700 Subject: [Buildroot] [PATCH v3 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 Message-ID: <20220209180306.2629180-1-neal.frager@xilinx.com> This patch: - bumps ATF to Xilinx v2.6: mainline v2.6 requires patch to build - bumps U-Boot to Xilinx 2022.01: important drivers not in mainline - bumps Linux to Xilinx 5.15: important drivers not in mainline - deletes board/zynqmp/patches directory: patches already in mainline - modifies board/zynqmp/genimage.cfg: U-Boot 2022.01 uses u-boot.itb format - adds extlinux.conf to vfat bootfs - modifies U-Boot to unified xilinx_zynqmp_virt_defconfig (supports all boards) - adds support for SPL pm_cfg_obj.c loading to PMU firmware - enables support for host machines without OpenSSL required by u-boot Signed-off-by: Neal Frager --- board/zynqmp/extlinux.conf | 5 + board/zynqmp/genimage.cfg | 6 +- ...-fix-Remove-GGC-ignore-Warray-bounds.patch | 68 -- ...64-zynqmp-zcu106-fix-SPL-MMC-booting.patch | 52 -- ...2-arm64-zynqmp-Enable-booting-to-ATF.patch | 114 ---- ...ept-an-absolute-path-for-PMUFW_INIT_.patch | 68 -- ...ynqmp-pass-the-PS-init-file-as-a-kco.patch | 175 ----- board/zynqmp/pm_cfg_obj.c | 614 ++++++++++++++++++ board/zynqmp/post-build.sh | 8 + board/zynqmp/post-image.sh | 4 +- configs/zynqmp_zcu106_defconfig | 23 +- 11 files changed, 648 insertions(+), 489 deletions(-) create mode 100644 board/zynqmp/extlinux.conf delete mode 100644 board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch delete mode 100644 board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch delete mode 100644 board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch delete mode 100644 board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch delete mode 100644 board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch create mode 100644 board/zynqmp/pm_cfg_obj.c create mode 100755 board/zynqmp/post-build.sh diff --git a/board/zynqmp/extlinux.conf b/board/zynqmp/extlinux.conf new file mode 100644 index 0000000000..a69a2e1963 --- /dev/null +++ b/board/zynqmp/extlinux.conf @@ -0,0 +1,5 @@ +label linux + kernel /Image + devicetree /system.dtb + append console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait + \ No newline at end of file diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg index ed202f4550..20d8352c08 100644 --- a/board/zynqmp/genimage.cfg +++ b/board/zynqmp/genimage.cfg @@ -2,11 +2,13 @@ image boot.vfat { vfat { files = { "boot.bin", - "u-boot.bin", - "atf-uboot.ub", + "u-boot.itb", "system.dtb", "Image" } + file extlinux/extlinux.conf { + image = extlinux.conf + } } size = 32M diff --git a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch b/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch deleted file mode 100644 index 0c1a9ba2a4..0000000000 --- a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch +++ /dev/null @@ -1,68 +0,0 @@ -From da003e6ada7d0217fe99dc7c649a731f8ebd3c34 Mon Sep 17 00:00:00 2001 -From: Deepika Bhavnani -Date: Thu, 15 Aug 2019 00:56:46 +0300 -Subject: [PATCH] Coverity fix: Remove GGC ignore -Warray-bounds - -GCC diagnostics were added to ignore array boundaries, instead -of ignoring GCC warning current code will check for array boundaries -and perform and array update only for valid elements. - -Resolves: `CID 246574` `CID 246710` `CID 246651` - -Signed-off-by: Deepika Bhavnani -Change-Id: I7530ecf7a1707351c6ee87e90cc3d33574088f57 - -Backported from: 41af05154abe136938bcfb5f26c969933784bbef -[Adapted to apply on 1.5] - ---- - lib/psci/psci_common.c | 20 ++++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) - -diff --git a/lib/psci/psci_common.c b/lib/psci/psci_common.c -index 2220a745cd6e..6282d992a2f0 100644 ---- a/lib/psci/psci_common.c -+++ b/lib/psci/psci_common.c -@@ -188,21 +188,17 @@ static unsigned int get_power_on_target_pwrlvl(void) - /****************************************************************************** - * Helper function to update the requested local power state array. This array - * does not store the requested state for the CPU power level. Hence an -- * assertion is added to prevent us from accessing the wrong index. -+ * assertion is added to prevent us from accessing the CPU power level. - *****************************************************************************/ - static void psci_set_req_local_pwr_state(unsigned int pwrlvl, - unsigned int cpu_idx, - plat_local_state_t req_pwr_state) - { -- /* -- * This should never happen, we have this here to avoid -- * "array subscript is above array bounds" errors in GCC. -- */ - assert(pwrlvl > PSCI_CPU_PWR_LVL); --#pragma GCC diagnostic push --#pragma GCC diagnostic ignored "-Warray-bounds" -- psci_req_local_pwr_states[pwrlvl - 1][cpu_idx] = req_pwr_state; --#pragma GCC diagnostic pop -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && -+ (cpu_idx < PLATFORM_CORE_COUNT)) { -+ psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx] = req_pwr_state; -+ } - } - - /****************************************************************************** -@@ -228,7 +224,11 @@ static plat_local_state_t *psci_get_req_local_pwr_states(unsigned int pwrlvl, - { - assert(pwrlvl > PSCI_CPU_PWR_LVL); - -- return &psci_req_local_pwr_states[pwrlvl - 1][cpu_idx]; -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && -+ (cpu_idx < PLATFORM_CORE_COUNT)) { -+ return &psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx]; -+ } else -+ return NULL; - } - - /* --- -2.34.0 - diff --git a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch b/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch deleted file mode 100644 index 4d85e1bb12..0000000000 --- a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch +++ /dev/null @@ -1,52 +0,0 @@ -From e5d72ed8339eb05285448aad3c89d21e4d18fd29 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Mon, 26 Feb 2018 09:40:34 +0100 -Subject: [PATCH] arm64: zynqmp: zcu106: fix SPL MMC booting - -The U-Boot SPL generated with the current zcu106 defconfig cannot boot -from MMC: - - [...] - U-Boot SPL 2018.01 (Feb 21 2018 - 17:47:14) - EL Level: EL3 - Trying to boot from MMC1 - sdhci_transfer_data: Error detected in status(0x408020)! - spl_load_image_fat_os: error reading image u-boot.bin, err - -2 - spl_load_image_fat: error reading image u-boot.img, err - -6 - SPL: failed to boot from all boot devices - ### ERROR ### Please RESET the board ### - -Fix by lowering the rpll value. The new value for the RPLL_CTRL -register comes from the current psu_init_gpl.c from the HDF file at -https://github.com/xilinx/hdf-examples/tree/01ad8ea5fd1989abf4ea5a072d019a16cb2bc546/zcu106-zynqmp -(generated by Vivado v2017.4). - -RPLL and sdio1_ref clocks before and after this change: - - - Old values: RPLL 1.36 GHz, sdio1_ref 272 MHz - - New values: RPLL 1.16 GHz, sdio1_ref 233 MHz - -Signed-off-by: Luca Ceresoli -Cc: Michal Simek -Upstream-status: accepted upstream in a different form ---- - - board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -index 4d18abe000ca..e6fa477e53e7 100644 ---- a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -+++ b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -@@ -10,7 +10,7 @@ - static unsigned long psu_pll_init_data(void) - { - psu_mask_write(0xFF5E0034, 0xFE7FEDEFU, 0x7E4E2C62U); -- psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00013C00U); -+ psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00014600U); - psu_mask_write(0xFF5E0030, 0x00000008U, 0x00000008U); - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000001U); - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000000U); --- -2.7.4 - diff --git a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch b/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch deleted file mode 100644 index 487fff6812..0000000000 --- a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 5e3cac50cc981e01d9072241035a8d4162560c71 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Mon, 12 Mar 2018 17:18:38 +0100 -Subject: [PATCH] arm64: zynqmp: Enable booting to ATF - -U-Boot is now able to boot to ARM Trusted Firmware (ATF). The boot -flow is SPL(EL3) loads ATF and full u-boot and jump to ATF(EL3) which -pass control to full u-boot(EL2). This has been tested on zcu106, so -enable it in this defconfig. - -To generate an image that triggers this booting flow, you need to pass -'-O arm-trusted-firmware' to mkimage. - -Signed-off-by: Luca Ceresoli -Signed-off-by: Michal Simek -Backported from upstream: http://git.denx.de/?p=u-boot.git;a=commit;h=5e3cac50cc981e01d9072241035a8d4162560c71 ---- - - configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 + - configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 + - configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 + - configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 + - configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 1 + - configs/xilinx_zynqmp_zcu102_revA_defconfig | 1 + - configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 + - 7 files changed, 7 insertions(+) - -diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig -index c5bfa2b12638..488c72258b0e 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig -index f86dce403a42..5d501eec0edd 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig -@@ -20,6 +20,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig -index 6e947cf56827..6f7eaebd7676 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig -@@ -16,6 +16,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_CMD_MEMTEST=y - CONFIG_SYS_ALT_MEMTEST=y -diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig -index 1c934858c61c..7a3806cba4b5 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig -@@ -17,6 +17,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_CMD_MEMTEST=y - CONFIG_SYS_ALT_MEMTEST=y -diff --git a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig -index e13c7c56f310..e4408f182ca0 100644 ---- a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig -+++ b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig b/configs/xilinx_zynqmp_zcu102_revA_defconfig -index 5b2cd495ee85..b52f6789fd4b 100644 ---- a/configs/xilinx_zynqmp_zcu102_revA_defconfig -+++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig -index e6530fbfe7ff..80592554f682 100644 ---- a/configs/xilinx_zynqmp_zcu102_revB_defconfig -+++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y --- -2.7.4 - diff --git a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch b/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch deleted file mode 100644 index 95ab7b3b75..0000000000 --- a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch +++ /dev/null @@ -1,68 +0,0 @@ -From c7df098a71e05dc81cee818747759e8060b59626 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Mon, 4 Jun 2018 12:21:01 +0200 -Subject: [PATCH] arm64: zynqmp: accept an absolute path for PMUFW_INIT_FILE - -The value of PMUFW_INIT_FILE is prefixed with "$(srctree)/", thus -forcing it to be a relative path inside the U-Boot source tree. Since -the PMUFW is a binary file generated outside of U-Boot, the PMUFW -binary must be copied inside the U-Boot source tree before the -build. - -This generates a few problems: - - * if the source tree is shared among different out-of-tree builds, - they will pollute (and potentially corrupt) each other - * the source tree cannot be read-only - * any buildsystem must add a command to copy the PMUFW binary - * putting an externally-generated binary in the source tree is ugly - as hell - -Avoid these problems by accepting an absolute path for -PMUFW_INIT_FILE. This would be as simple as removing the "$(srctree)/" -prefix, but in order to keep backward compatibility we rather use the -shell and readlink to get the absolute path even when starting from a -relative path. - -Since 'readlink -f' produces an empty string if the file does not -exist, we also add a check to ensure the file configured in -PMUFW_INIT_FILE exists. Otherwise the build would exit successfully, -but produce a boot.bin without PMUFW as if PMUFW_INIT_FILE were empty. - -Tested in the 12 possible combinations of: - - PMUFW_INIT_FILE empty, relative, absolute, non-existing - - building in-tree, in subdir, in other directory - -Signed-off-by: Luca Ceresoli -Cc: Michal Simek -Cc: Simon Glass -Cc: Emmanuel Vadot -Signed-off-by: Michal Simek -Backported from upstream: https://git.denx.de/?p=u-boot.git;a=commit;h=c7df098a71e05dc81cee818747759e8060b59626 ---- - scripts/Makefile.spl | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl -index ef018b5b4056..252f13826d4c 100644 ---- a/scripts/Makefile.spl -+++ b/scripts/Makefile.spl -@@ -167,8 +167,14 @@ ifdef CONFIG_ARCH_ZYNQ - MKIMAGEFLAGS_boot.bin = -T zynqimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) - endif - ifdef CONFIG_ARCH_ZYNQMP -+ifneq ($(CONFIG_PMUFW_INIT_FILE),"") -+spl/boot.bin: zynqmp-check-pmufw -+zynqmp-check-pmufw: FORCE -+ ( cd $(srctree) && test -r $(CONFIG_PMUFW_INIT_FILE) ) \ -+ || ( echo "Cannot read $(CONFIG_PMUFW_INIT_FILE)" && false ) -+endif - MKIMAGEFLAGS_boot.bin = -T zynqmpimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) \ -- -n $(srctree)/$(CONFIG_PMUFW_INIT_FILE) -+ -n "$(shell cd $(srctree); readlink -f $(CONFIG_PMUFW_INIT_FILE))" - endif - - spl/boot.bin: $(obj)/u-boot-spl.bin FORCE --- -2.7.4 - diff --git a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch b/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch deleted file mode 100644 index b32e162780..0000000000 --- a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch +++ /dev/null @@ -1,175 +0,0 @@ -From 4c9d54ab5a41d65000c8d249b6fb1b76056f1812 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Wed, 20 Jun 2018 12:11:50 +0200 -Subject: [PATCH] arm/arm64: zynq/zynqmp: pass the PS init file as a kconfig - variable - -U-Boot needs to link ps7_init_gpl.c on Zynq or psu_init_gpl.c on -ZynqMP (PS init for short). The current logic to locate this file for -both platforms is: - - 1. if a board-specific file exists in - board/xilinx/zynq[mp]/$(CONFIG_DEFAULT_DEVICE_TREE)/ps?_init_gpl.c - then use it - 2. otherwise use board/xilinx/zynq/ps?_init_gpl.c - -In the latter case the file does not exist in the U-Boot sources and -must be copied in the source tree from the outside before starting the -build. This is typical when it is generated from Xilinx tools while -developing a custom hardware. However making sure that a -board-specific file is _not_ found (and used) requires some trickery -such as removing or overwriting all PS init files (e.g.: the current -meta-xilinx yocto layer [0]). - -This generates a few problems: - - * if the source tree is shared among different out-of-tree builds, - they will pollute (and potentially corrupt) each other - * the source tree cannot be read-only - * any buildsystem must add a command to copy the PS init file binary - * overwriting or deleting files in the source tree is ugly as hell - -Simplify usage by allowing to pass the path to the desired PS init -file in kconfig variable XILINX_PS_INIT_FILE. It can be an absolute -path or relative to $(srctree). If the variable is set, the -user-specified file will always be used without being copied -around. If the the variable is left empty, for backward compatibility -fall back to the old behaviour. - -Since the issue is the same for Zynq and ZynqMP, add one kconfig -variable in a common place and use it for both. - -Also use the new kconfig help text to document all the ways to give -U-Boot the PS init file. - -Build-tested with all combinations of: - - platform: zynq or zynqmp - - PS init file: from XILINX_PS_INIT_FILE (absolute, relative path, - non-existing), in-tree board-specific, in board/xilinx/zynq[mp]/ - - building in-tree, in subdir, in other directory - -[0] https://github.com/Xilinx/meta-xilinx/blob/b2f74cc7fe5c4881589d5e440a17cb51fc66a7ab/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init.inc#L9 - -Signed-off-by: Luca Ceresoli -Cc: Albert Aribaud -Cc: Michal Simek -Cc: Nathan Rossi -Backported from upstream: https://git.denx.de/?p=u-boot.git;a=commit;h=6da4f67ad09cd8b311d77b2b04e557b7ef65b56c ---- - arch/arm/Kconfig | 1 + - board/xilinx/Kconfig | 41 +++++++++++++++++++++++++++++++++++++++++ - board/xilinx/zynq/Makefile | 10 +++++++++- - board/xilinx/zynqmp/Makefile | 10 +++++++++- - 4 files changed, 60 insertions(+), 2 deletions(-) - create mode 100644 board/xilinx/Kconfig - -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 22234cde2ab6..e04979d0ef7e 100644 ---- a/arch/arm/Kconfig -+++ b/arch/arm/Kconfig -@@ -1293,4 +1293,5 @@ source "board/technologic/ts4600/Kconfig" - source "board/vscom/baltos/Kconfig" - source "board/woodburn/Kconfig" - source "board/work-microwave/work_92105/Kconfig" -+source "board/xilinx/Kconfig" - source "board/zipitz2/Kconfig" - - source "arch/arm/Kconfig.debug" -diff --git a/board/xilinx/Kconfig b/board/xilinx/Kconfig -new file mode 100644 -index 000000000000..aa3fa061edef ---- /dev/null -+++ b/board/xilinx/Kconfig -@@ -0,0 +1,41 @@ -+# Copyright (c) 2018, Luca Ceresoli -+# -+# SPDX-License-Identifier: GPL-2.0 -+ -+if ARCH_ZYNQ || ARCH_ZYNQMP -+ -+config XILINX_PS_INIT_FILE -+ string "Zynq/ZynqMP PS init file(s) location" -+ help -+ On Zynq and ZynqMP U-Boot SPL (or U-Boot proper if -+ ZYNQMP_PSU_INIT_ENABLED is set) is responsible for some -+ basic initializations, such as enabling peripherals and -+ configuring pinmuxes. The PS init file (called -+ psu_init_gpl.c on ZynqMP, ps7_init_gpl.c for Zynq-7000) -+ contains the code for such initializations. -+ -+ U-Boot contains PS init files for some boards, but each of -+ them describes only one specific configuration. Users of a -+ different board, or needing a different configuration, can -+ generate custom files using the Xilinx development tools. -+ -+ There are three ways to give a PS init file to U-Boot: -+ -+ 1. Set this variable to the path, either relative to the -+ source tree or absolute, where the psu_init_gpl.c or -+ ps7_init_gpl.c file is located. U-Boot will build this -+ file. -+ -+ 2. If you leave an empty string here, U-Boot will use -+ board/xilinx/zynq/$(CONFIG_DEFAULT_DEVICE_TREE)/ps7_init_gpl.c -+ for Zynq-7000, or -+ board/xilinx/zynqmp/$(CONFIG_DEFAULT_DEVICE_TREE)/psu_init_gpl.c -+ for ZynqMP. -+ -+ 3. If the above file does not exist, U-Boot will use -+ board/xilinx/zynq/ps7_init_gpl.c for Zynq-7000, or -+ board/xilinx/zynqmp/psu_init_gpl.c for ZynqMP. This file -+ is not provided by U-Boot, you have to copy it there -+ before the build. -+ -+endif -diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile -index 5a76a26720cd..03ad5f0532ee 100644 ---- a/board/xilinx/zynq/Makefile -+++ b/board/xilinx/zynq/Makefile -@@ -5,10 +5,18 @@ - - obj-y := board.o - --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE)) -+init-objs := ps_init_gpl.o -+spl/board/xilinx/zynq/ps_init_gpl.o board/xilinx/zynq/ps_init_gpl.o: $(PS_INIT_FILE) -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ -+endif - -+ifeq ($(init-objs),) -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/ps7_init_gpl.c),\ - $(hw-platform-y)/ps7_init_gpl.o) -+endif - - ifeq ($(init-objs),) - ifneq ($(wildcard $(srctree)/$(src)/ps7_init_gpl.c),) -diff --git a/board/xilinx/zynqmp/Makefile b/board/xilinx/zynqmp/Makefile -index 05ccd25dcef3..960b81fc5853 100644 ---- a/board/xilinx/zynqmp/Makefile -+++ b/board/xilinx/zynqmp/Makefile -@@ -5,10 +5,18 @@ - - obj-y := zynqmp.o - --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE)) -+init-objs := ps_init_gpl.o -+spl/board/xilinx/zynqmp/ps_init_gpl.o board/xilinx/zynqmp/ps_init_gpl.o: $(PS_INIT_FILE) -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ -+endif - -+ifeq ($(init-objs),) -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/psu_init_gpl.c),\ - $(hw-platform-y)/psu_init_gpl.o) -+endif - - ifeq ($(init-objs),) - ifneq ($(wildcard $(srctree)/$(src)/psu_init_gpl.c),) --- -2.7.4 - diff --git a/board/zynqmp/pm_cfg_obj.c b/board/zynqmp/pm_cfg_obj.c new file mode 100644 index 0000000000..7566b3236a --- /dev/null +++ b/board/zynqmp/pm_cfg_obj.c @@ -0,0 +1,614 @@ +/****************************************************************************** +* Copyright (c) 2017 - 2020 Xilinx, Inc. All rights reserved. +* SPDX-License-Identifier: MIT +******************************************************************************/ + + +#include "xil_types.h" +#include "pm_defs.h" + +#define PM_CONFIG_MASTER_SECTION_ID 0x101U +#define PM_CONFIG_SLAVE_SECTION_ID 0x102U +#define PM_CONFIG_PREALLOC_SECTION_ID 0x103U +#define PM_CONFIG_POWER_SECTION_ID 0x104U +#define PM_CONFIG_RESET_SECTION_ID 0x105U +#define PM_CONFIG_SHUTDOWN_SECTION_ID 0x106U +#define PM_CONFIG_SET_CONFIG_SECTION_ID 0x107U +#define PM_CONFIG_GPO_SECTION_ID 0x108U + +#define PM_SLAVE_FLAG_IS_SHAREABLE 0x1U +#define PM_MASTER_USING_SLAVE_MASK 0x2U + +#define PM_CONFIG_GPO1_MIO_PIN_34_MAP (1U << 10U) +#define PM_CONFIG_GPO1_MIO_PIN_35_MAP (1U << 11U) +#define PM_CONFIG_GPO1_MIO_PIN_36_MAP (1U << 12U) +#define PM_CONFIG_GPO1_MIO_PIN_37_MAP (1U << 13U) + +#define PM_CONFIG_GPO1_BIT_2_MASK (1U << 2U) +#define PM_CONFIG_GPO1_BIT_3_MASK (1U << 3U) +#define PM_CONFIG_GPO1_BIT_4_MASK (1U << 4U) +#define PM_CONFIG_GPO1_BIT_5_MASK (1U << 5U) + +#define SUSPEND_TIMEOUT 0xFFFFFFFFU + + +#define PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK 0x00000001 +#define PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK 0x00000100 +#define PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK 0x00000200 + + + +#if defined (__ICCARM__) +#pragma language=save +#pragma language=extended +#endif +#if defined (__GNUC__) + const u32 XPm_ConfigObject[] __attribute__((used, section(".sys_cfg_data"))) = +#elif defined (__ICCARM__) +#pragma location = ".sys_cfg_data" +__root const u32 XPm_ConfigObject[] = +#endif +{ + /**********************************************************************/ + /* HEADER */ + 1, /* Number of remaining words in the header */ + 8, /* Number of sections included in config object */ + /**********************************************************************/ + /* MASTER SECTION */ + PM_CONFIG_MASTER_SECTION_ID, /* Master SectionID */ + 3U, /* No. of Masters*/ + + NODE_APU, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_0, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_1, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Wake permissions */ + + + /**********************************************************************/ + /* SLAVE SECTION */ + + + PM_CONFIG_SLAVE_SECTION_ID, /* Section ID */ + 49, /* Number of slaves */ + + NODE_OCM_BANK_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TCM_0_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_0_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_1_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TCM_1_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_L2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU_PP_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU_PP_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_USB_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_USB_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_TTC_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SATA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_ETH_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_UART_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_UART_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SPI_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_SPI_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_I2C_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_I2C_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SD_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_SD_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_DP, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GDMA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_ADMA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_NAND, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_QSPI, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPIO, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_CAN_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_CAN_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_EXTERN, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_DDR, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_IPI_APU, + 0U, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_0, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_1, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_PCIE, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_PCAP, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_RTC, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_VCU, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_PL, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + + /**********************************************************************/ + /* PREALLOC SECTION */ + + PM_CONFIG_PREALLOC_SECTION_ID, /* Preallaoc SectionID */ + 3U, /* No. of Masters*/ + +/* Prealloc for psu_cortexa53_0 */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, + 12, + NODE_DDR, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_L2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_3, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_SD_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_QSPI, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_PL, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_APU, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_0 */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + 14, + NODE_TCM_0_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_0_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_DDR, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_3, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_SD_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_QSPI, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_PL, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_ADMA, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_1 */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + 3, + NODE_TCM_1_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_1_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /**********************************************************************/ + /* POWER SECTION */ + + PM_CONFIG_POWER_SECTION_ID, /* Power Section ID */ + 4U, /* Number of power nodes */ + + NODE_APU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_RPU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_FPD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_PLD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + + /**********************************************************************/ + /* RESET SECTION */ + + PM_CONFIG_RESET_SECTION_ID, /* Reset Section ID */ + 120U, /* Number of resets */ + + XILPM_RESET_PCIE_CFG, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_BRIDGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_CTRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRF, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GDMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SATA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APU_L2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DDR, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SOFT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_QSPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_NAND, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ADMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOU_CC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TIMESTAMP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R50, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R51, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_AMBA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_OCM, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_PGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RTC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SYSMON, 0, + XILPM_RESET_AFI_FM6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_LPD_SWDT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_FPD, PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + XILPM_RESET_RPU_DBG1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_DBG0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_VPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_7, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_8, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_9, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_10, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_11, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_12, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_13, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_14, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_15, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_16, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_17, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_18, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_19, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_20, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_21, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_22, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_23, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_24, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_25, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_26, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_27, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_28, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_29, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_30, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_31, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_LS, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PS_ONLY, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_92, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_93, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_94, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_95, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + + /**********************************************************************/ + /* SET CONFIG SECTION */ + PM_CONFIG_SET_CONFIG_SECTION_ID, /* Section ID */ + 0, /* Permissions to set config */ + /**********************************************************************/ + /* SHUTDOWN SECTION */ + PM_CONFIG_SHUTDOWN_SECTION_ID, /* Section ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* System Shutdown/Restart Permission */ + + /**********************************************************************/ + /* GPO SECTION */ + PM_CONFIG_GPO_SECTION_ID, /* GPO Section ID */ + PM_CONFIG_GPO1_BIT_2_MASK | + PM_CONFIG_GPO1_MIO_PIN_34_MAP | + PM_CONFIG_GPO1_MIO_PIN_35_MAP | + PM_CONFIG_GPO1_MIO_PIN_36_MAP | + PM_CONFIG_GPO1_MIO_PIN_37_MAP | + 0, /* State of GPO pins */ +}; +#if defined (__ICCARM__) +#pragma language=restore +#endif diff --git a/board/zynqmp/post-build.sh b/board/zynqmp/post-build.sh new file mode 100755 index 0000000000..9fd8bbf2c8 --- /dev/null +++ b/board/zynqmp/post-build.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +# genimage will need to find the extlinux.conf +# in the binaries directory + +BOARD_DIR="$(dirname $0)" + +install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux.conf diff --git a/board/zynqmp/post-image.sh b/board/zynqmp/post-image.sh index b2b99fed01..ed6dbe188c 100755 --- a/board/zynqmp/post-image.sh +++ b/board/zynqmp/post-image.sh @@ -10,4 +10,6 @@ FIRST_DT=$(sed -nr \ [ -z "${FIRST_DT}" ] || ln -fs ${FIRST_DT}.dtb ${BINARIES_DIR}/system.dtb -support/scripts/genimage.sh -c board/zynqmp/genimage.cfg +BOARD_DIR="$(dirname $0)" + +support/scripts/genimage.sh -c $BOARD_DIR/genimage.cfg diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index bee7c1daf7..2026f60bd1 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -1,34 +1,39 @@ BR2_aarch64=y -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.15" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.6" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA" +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2022.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/53fdb7b6c92860ceb0ec5fd14deee302f4a84269/bin/pmufw-zcu106-default-v2017.4.bin" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/v2021.2/bin/pmufw-v2021.2.bin" +BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/pm_cfg_obj.c" +BR2_TARGET_UBOOT_FORMAT_ITB=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -- 2.17.1 From peter at korsgaard.com Wed Feb 9 16:51:29 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:29 +0100 Subject: [Buildroot] [PATCH 063/107] package/python-txtorcon: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-64-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-txtorcon/python-txtorcon.mk | 9 --------- 1 file changed, 9 deletions(-) diff --git a/package/python-txtorcon/python-txtorcon.mk b/package/python-txtorcon/python-txtorcon.mk index b8414d96d0..acf586cb8c 100644 --- a/package/python-txtorcon/python-txtorcon.mk +++ b/package/python-txtorcon/python-txtorcon.mk @@ -11,13 +11,4 @@ PYTHON_TXTORCON_SETUP_TYPE = setuptools PYTHON_TXTORCON_LICENSE = MIT PYTHON_TXTORCON_LICENSE_FILES = LICENSE -ifeq ($(BR2_PACKAGE_PYTHON),y) -# only needed/valid for python 3.x -define PYTHON_TXTORCON_RM_PY3_FILE - rm -f $(TARGET_DIR)/usr/lib/python*/site-packages/txtorcon/controller_py3.py -endef - -PYTHON_TXTORCON_POST_INSTALL_TARGET_HOOKS += PYTHON_TXTORCON_RM_PY3_FILE -endif - $(eval $(python-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:30 +0100 Subject: [Buildroot] [PATCH 064/107] package/python-typing-extensions: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-65-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-typing-extensions/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/python-typing-extensions/Config.in b/package/python-typing-extensions/Config.in index 0c7c74c5fa..b59693282f 100644 --- a/package/python-typing-extensions/Config.in +++ b/package/python-typing-extensions/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS bool "python-typing-extensions" - select BR2_PACKAGE_PYTHON_TYPING if BR2_PACKAGE_PYTHON # runtime help Backported and Experimental Type Hints for Python 3.5+. -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:34 +0100 Subject: [Buildroot] [PATCH 068/107] package/python-websocket-client: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-69-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-websocket-client/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-websocket-client/Config.in b/package/python-websocket-client/Config.in index 0fbb15b328..519e506615 100644 --- a/package/python-websocket-client/Config.in +++ b/package/python-websocket-client/Config.in @@ -1,8 +1,7 @@ config BR2_PACKAGE_PYTHON_WEBSOCKET_CLIENT bool "python-websocket-client" select BR2_PACKAGE_PYTHON_SIX # runtime - select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_SSL # runtime help WebSocket client for python. hybi13 is supported. -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:27 +0100 Subject: [Buildroot] [PATCH 061/107] package/python-setuptools: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-62-peter@korsgaard.com> For the target. Signed-off-by: Peter Korsgaard --- package/python-setuptools/Config.in | 6 ++---- package/python-setuptools/python-setuptools.mk | 16 ---------------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/package/python-setuptools/Config.in b/package/python-setuptools/Config.in index f203d0f814..28228534f8 100644 --- a/package/python-setuptools/Config.in +++ b/package/python-setuptools/Config.in @@ -1,9 +1,7 @@ config BR2_PACKAGE_PYTHON_SETUPTOOLS bool "python-setuptools" - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_ZLIB # runtime + select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime help Download, build, install, upgrade, and uninstall Python packages. diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk index 8bca852fe2..04b872fb79 100644 --- a/package/python-setuptools/python-setuptools.mk +++ b/package/python-setuptools/python-setuptools.mk @@ -4,19 +4,11 @@ # ################################################################################ -# For the target variant, we adapt the version depending on whether -# Python 3.x or 2.x is selected for the target. -ifeq ($(BR2_PACKAGE_PYTHON3),y) # Please keep in sync with # package/python3-setuptools/python3-setuptools.mk PYTHON_SETUPTOOLS_VERSION = 60.7.0 PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON3_SETUPTOOLS_VERSION).tar.gz PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/29/dd/48d662bb93e5e51e72265ef612f869947d4ae4126328d7156824cd50d440 -else # Python -PYTHON_SETUPTOOLS_VERSION = 44.0.0 -PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).zip -PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/b0/f3/44da7482ac6da3f36f68e253cb04de37365b3dba9036a3c70773b778b485 -endif # The host variant is only for Python 2.x, so we need to use 44.0.0. HOST_PYTHON_SETUPTOOLS_VERSION = 44.0.0 @@ -30,14 +22,6 @@ PYTHON_SETUPTOOLS_CPE_ID_VENDOR = python PYTHON_SETUPTOOLS_CPE_ID_PRODUCT = setuptools PYTHON_SETUPTOOLS_SETUP_TYPE = setuptools -ifeq ($(BR2_PACKAGE_PYTHON),y) -define PYTHON_SETUPTOOLS_EXTRACT_CMDS - $(UNZIP) -d $(@D) $(PYTHON_SETUPTOOLS_DL_DIR)/$(PYTHON_SETUPTOOLS_SOURCE) - mv $(@D)/setuptools-$(PYTHON_SETUPTOOLS_VERSION)/* $(@D) - $(RM) -r $(@D)/setuptools-$(PYTHON_SETUPTOOLS_VERSION) -endef -endif - define HOST_PYTHON_SETUPTOOLS_EXTRACT_CMDS $(UNZIP) -d $(@D) $(HOST_PYTHON_SETUPTOOLS_DL_DIR)/$(HOST_PYTHON_SETUPTOOLS_SOURCE) mv $(@D)/setuptools-$(HOST_PYTHON_SETUPTOOLS_VERSION)/* $(@D) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:28 +0100 Subject: [Buildroot] [PATCH 062/107] package/python-sip: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-63-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-sip/python-sip.mk | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/package/python-sip/python-sip.mk b/package/python-sip/python-sip.mk index 1d6c205396..01ccb1ddd5 100644 --- a/package/python-sip/python-sip.mk +++ b/package/python-sip/python-sip.mk @@ -10,19 +10,8 @@ PYTHON_SIP_SITE = http://downloads.sourceforge.net/project/pyqt/sip/sip-$(PYTHON PYTHON_SIP_LICENSE = SIP license or GPL-2.0 or GPL-3.0 PYTHON_SIP_LICENSE_FILES = LICENSE LICENSE-GPL2 LICENSE-GPL3 -PYTHON_SIP_DEPENDENCIES = qt5base - -ifeq ($(BR2_PACKAGE_PYTHON),y) -PYTHON_SIP_DEPENDENCIES += python -HOST_PYTHON_SIP_DEPENDENCIES += host-python -PYTHON_SIP_LIB_DIR = usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages -PYTHON_SIP_INCLUDE_DIR = usr/include/python$(PYTHON_VERSION_MAJOR) -else ifeq ($(BR2_PACKAGE_PYTHON3),y) -PYTHON_SIP_DEPENDENCIES += python3 -HOST_PYTHON_SIP_DEPENDENCIES += host-python3 -PYTHON_SIP_LIB_DIR = usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages -PYTHON_SIP_INCLUDE_DIR = usr/include/python$(PYTHON3_VERSION_MAJOR) -endif +PYTHON_SIP_DEPENDENCIES = python3 qt5base +HOST_PYTHON_SIP_DEPENDENCIES = host-python3 define HOST_PYTHON_SIP_CONFIGURE_CMDS (cd $(@D); \ @@ -41,8 +30,8 @@ define PYTHON_SIP_CONFIGURE_CMDS (cd $(@D); \ $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(HOST_DIR)/bin/python configure.py \ --bindir $(TARGET_DIR)/usr/bin \ - --destdir $(TARGET_DIR)/$(PYTHON_SIP_LIB_DIR) \ - --incdir $(STAGING_DIR)/$(PYTHON_SIP_INCLUDE_DIR) \ + --destdir $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --incdir $(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --sipdir $(TARGET_DIR)/usr/share/sip \ --sysroot $(STAGING_DIR)/usr \ --use-qmake && \ -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:31 +0100 Subject: [Buildroot] [PATCH 065/107] package/python-urllib3: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-66-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-urllib3/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-urllib3/Config.in b/package/python-urllib3/Config.in index 21d3f6748e..90e10b7969 100644 --- a/package/python-urllib3/Config.in +++ b/package/python-urllib3/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_URLLIB3 bool "python-urllib3" - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_ZLIB # runtime help Python HTTP library with thread-safe connection pooling, file post support, sanity friendly, and more. -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:37 +0100 Subject: [Buildroot] [PATCH 071/107] package/python-xlrd: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-72-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-xlrd/Config.in | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package/python-xlrd/Config.in b/package/python-xlrd/Config.in index 40920f7b02..264ee93e78 100644 --- a/package/python-xlrd/Config.in +++ b/package/python-xlrd/Config.in @@ -1,9 +1,7 @@ config BR2_PACKAGE_PYTHON_XLRD bool "python-xlrd" - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_PYEXPAT + select BR2_PACKAGE_PYTHON3_ZLIB help Library for developers to extract data from Microsoft Excel(tm) spreadsheet files. -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:24 +0100 Subject: [Buildroot] [PATCH 058/107] package/python-remi: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-59-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-remi/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-remi/Config.in b/package/python-remi/Config.in index e0c5e9bfe1..da2c2f4cfb 100644 --- a/package/python-remi/Config.in +++ b/package/python-remi/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_REMI bool "python-remi" - select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_SSL # runtime select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime help Remi is a GUI library for Python applications which transpiles -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:26 +0100 Subject: [Buildroot] [PATCH 060/107] package/python-sentry-sdk: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-61-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-sentry-sdk/python-sentry-sdk.mk | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/package/python-sentry-sdk/python-sentry-sdk.mk b/package/python-sentry-sdk/python-sentry-sdk.mk index 556f03e137..9238b7fb1c 100644 --- a/package/python-sentry-sdk/python-sentry-sdk.mk +++ b/package/python-sentry-sdk/python-sentry-sdk.mk @@ -11,14 +11,4 @@ PYTHON_SENTRY_SDK_SETUP_TYPE = setuptools PYTHON_SENTRY_SDK_LICENSE = BSD-2-Clause PYTHON_SENTRY_SDK_LICENSE_FILES = LICENSE -ifeq ($(BR2_PACKAGE_PYTHON),y) -# only needed/valid for python 3.x -define PYTHON_SENTRY_SDK_RM_PY3_FILES - rm -f $(addprefix $(TARGET_DIR)/usr/lib/python*/site-packages/sentry_sdk/integrations/,\ - aiohttp.py asgi.py django/asgi.py httpx.py sanic.py tornado.py) -endef - -PYTHON_SENTRY_SDK_POST_INSTALL_TARGET_HOOKS += PYTHON_SENTRY_SDK_RM_PY3_FILES -endif - $(eval $(python-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:22 +0100 Subject: [Buildroot] [PATCH 056/107] package/python-raven: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-57-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-raven/Config.in | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/package/python-raven/Config.in b/package/python-raven/Config.in index 0d4b26c054..d02232cfd8 100644 --- a/package/python-raven/Config.in +++ b/package/python-raven/Config.in @@ -1,11 +1,8 @@ config BR2_PACKAGE_PYTHON_RAVEN bool "python-raven" - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 - select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 - select BR2_PACKAGE_PYTHON_UNICODEDATA if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_UNICODEDATA if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_ZLIB + select BR2_PACKAGE_PYTHON3_SSL + select BR2_PACKAGE_PYTHON3_UNICODEDATA help Raven is a client for Sentry (https://getsentry.com). -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:39 +0100 Subject: [Buildroot] [PATCH 073/107] package/python3: drop references to python2 In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-74-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python3/Config.in | 1 - package/python3/python3.mk | 2 -- 2 files changed, 3 deletions(-) diff --git a/package/python3/Config.in b/package/python3/Config.in index 7714518edc..61470c2944 100644 --- a/package/python3/Config.in +++ b/package/python3/Config.in @@ -4,7 +4,6 @@ comment "python3 needs a toolchain w/ wchar, threads, dynamic library" config BR2_PACKAGE_PYTHON3 bool "python3" - depends on !BR2_PACKAGE_PYTHON depends on BR2_USE_WCHAR # uses fork() depends on BR2_USE_MMU diff --git a/package/python3/python3.mk b/package/python3/python3.mk index f9afcd5097..6af7488ddd 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -260,9 +260,7 @@ define PYTHON3_INSTALL_SYMLINK ln -fs python3 $(TARGET_DIR)/usr/bin/python endef -ifneq ($(BR2_PACKAGE_PYTHON),y) PYTHON3_POST_INSTALL_TARGET_HOOKS += PYTHON3_INSTALL_SYMLINK -endif # Some packages may have build scripts requiring python3, whatever is the # python version chosen for the target. -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:38 +0100 Subject: [Buildroot] [PATCH 072/107] package/python-xmltodict: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-73-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-xmltodict/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-xmltodict/Config.in b/package/python-xmltodict/Config.in index cb12392c93..af2bbbf489 100644 --- a/package/python-xmltodict/Config.in +++ b/package/python-xmltodict/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_XMLTODICT bool "python-xmltodict" - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime help Makes working with XML feel like you are working with JSON. -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:25 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:25 +0100 Subject: [Buildroot] [PATCH 059/107] package/python-scapy: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-60-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-scapy/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-scapy/Config.in b/package/python-scapy/Config.in index 6575a33af3..517fb51714 100644 --- a/package/python-scapy/Config.in +++ b/package/python-scapy/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_SCAPY bool "python-scapy" - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_ZLIB help Scapy: interactive packet manipulation tool. -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:23 +0100 Subject: [Buildroot] [PATCH 057/107] package/python-reentry: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-58-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-reentry/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/python-reentry/Config.in b/package/python-reentry/Config.in index 8ebbe395c8..07d8988a18 100644 --- a/package/python-reentry/Config.in +++ b/package/python-reentry/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_PYTHON_REENTRY select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime select BR2_PACKAGE_PYTHON_CLICK # runtime select BR2_PACKAGE_PYTHON_SIX # runtime - select BR2_PACKAGE_PYTHON_PATHLIB2 if BR2_PACKAGE_PYTHON # runtime help A plugin manager based on setuptools entry points mechanism. -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:33 +0100 Subject: [Buildroot] [PATCH 067/107] package/python-webob: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-68-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-webob/Config.in | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package/python-webob/Config.in b/package/python-webob/Config.in index fe77723f95..d3397587a1 100644 --- a/package/python-webob/Config.in +++ b/package/python-webob/Config.in @@ -1,8 +1,6 @@ config BR2_PACKAGE_PYTHON_WEBOB bool "python-webob" - select BR2_PACKAGE_PYTHON_HASHLIB if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_ZLIB # runtime help WSGI request and response object. -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:35 +0100 Subject: [Buildroot] [PATCH 069/107] package/python-werkzeug: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-70-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-werkzeug/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-werkzeug/Config.in b/package/python-werkzeug/Config.in index 79e9a4561e..27b2fdeaab 100644 --- a/package/python-werkzeug/Config.in +++ b/package/python-werkzeug/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_WERKZEUG bool "python-werkzeug" - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_ZLIB # runtime help Werkzeug is a WSGI utility library for Python. It's widely used and BSD licensed. -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:32 +0100 Subject: [Buildroot] [PATCH 066/107] package/python-web2py: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-67-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-web2py/Config.in | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/package/python-web2py/Config.in b/package/python-web2py/Config.in index a0452060ba..bb455dfa7a 100644 --- a/package/python-web2py/Config.in +++ b/package/python-web2py/Config.in @@ -1,12 +1,9 @@ config BR2_PACKAGE_PYTHON_WEB2PY bool "python-web2py" select BR2_PACKAGE_PYTHON_PYDAL # runtime - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime - select BR2_PACKAGE_PYTHON_SQLITE if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_SQLITE if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_ZLIB # runtime + select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime + select BR2_PACKAGE_PYTHON3_SQLITE # runtime select BR2_PACKAGE_PYTHON_YATL # runtime help web2py is a free open source full-stack framework for rapid -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:36 +0100 Subject: [Buildroot] [PATCH 070/107] package/python-whoosh: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-71-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-whoosh/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-whoosh/Config.in b/package/python-whoosh/Config.in index 1128ce6417..e1fb144985 100644 --- a/package/python-whoosh/Config.in +++ b/package/python-whoosh/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_WHOOSH bool "python-whoosh" - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_ZLIB # runtime help Whoosh is a fast, pure-Python full text indexing, search and spell checking library. -- 2.20.1 From fontaine.fabrice at gmail.com Wed Feb 9 19:13:27 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 9 Feb 2022 20:13:27 +0100 Subject: [Buildroot] [PATCH 1/3] package/sdl2_ttf: drop FREETYPE_CONFIG Message-ID: <20220209191329.201362-1-fontaine.fabrice@gmail.com> FREETYPE_CONFIG is not used since version 2.0.15 and https://github.com/libsdl-org/SDL_ttf/commit/50d72e55315e25d34f4209824275e3b1cbe6c6f8 Signed-off-by: Fabrice Fontaine --- package/sdl2_ttf/sdl2_ttf.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/sdl2_ttf/sdl2_ttf.mk b/package/sdl2_ttf/sdl2_ttf.mk index 1fe7c0a075..3b2b35e157 100644 --- a/package/sdl2_ttf/sdl2_ttf.mk +++ b/package/sdl2_ttf/sdl2_ttf.mk @@ -12,9 +12,6 @@ SDL2_TTF_LICENSE_FILES = COPYING.txt SDL2_TTF_INSTALL_STAGING = YES SDL2_TTF_DEPENDENCIES = sdl2 freetype host-pkgconf -SDL2_TTF_CONF_ENV = \ - FREETYPE_CONFIG=$(STAGING_DIR)/usr/bin/freetype-config - # x-includes and x-libraries must be set for cross-compiling # By default x_includes and x_libraries contains unsafe paths. # (/usr/include and /usr/lib) -- 2.34.1 From fontaine.fabrice at gmail.com Wed Feb 9 19:13:28 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 9 Feb 2022 20:13:28 +0100 Subject: [Buildroot] [PATCH 2/3] package/sdl2_ttf: disable builtin freetype2 In-Reply-To: <20220209191329.201362-1-fontaine.fabrice@gmail.com> References: <20220209191329.201362-1-fontaine.fabrice@gmail.com> Message-ID: <20220209191329.201362-2-fontaine.fabrice@gmail.com> Disable builtin freetype2 which is enabled by default since bump to version 2.0.18 in commit f4da031a77f200515bcc5b2e0fe665a7b4f2a780 and https://github.com/libsdl-org/SDL_ttf/commit/834ec54127dc9c2a12928f5fe32cf110ec4c7a7f Signed-off-by: Fabrice Fontaine --- package/sdl2_ttf/sdl2_ttf.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/sdl2_ttf/sdl2_ttf.mk b/package/sdl2_ttf/sdl2_ttf.mk index 3b2b35e157..e9397d8505 100644 --- a/package/sdl2_ttf/sdl2_ttf.mk +++ b/package/sdl2_ttf/sdl2_ttf.mk @@ -11,6 +11,7 @@ SDL2_TTF_LICENSE = Zlib SDL2_TTF_LICENSE_FILES = COPYING.txt SDL2_TTF_INSTALL_STAGING = YES SDL2_TTF_DEPENDENCIES = sdl2 freetype host-pkgconf +SDL2_TTF_CONF_OPTS = --disable-freetype-builtin # x-includes and x-libraries must be set for cross-compiling # By default x_includes and x_libraries contains unsafe paths. -- 2.34.1 From fontaine.fabrice at gmail.com Wed Feb 9 19:13:29 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 9 Feb 2022 20:13:29 +0100 Subject: [Buildroot] [PATCH 3/3] package/sdl2_ttf: add harfbuzz optional dependency In-Reply-To: <20220209191329.201362-1-fontaine.fabrice@gmail.com> References: <20220209191329.201362-1-fontaine.fabrice@gmail.com> Message-ID: <20220209191329.201362-3-fontaine.fabrice@gmail.com> harfbuzz is an optional dependency (which is enabled by default) since version 2.0.18 and https://github.com/libsdl-org/SDL_ttf/commit/328bbed78db496ff36720e8a809661ffb236e673 If harfbuzz is not disabled and not found, builtin harfbuzz is enabled resulting in the following build failure without C++ since commit f4da031a77f200515bcc5b2e0fe665a7b4f2a780 and https://github.com/libsdl-org/SDL_ttf/commit/9a7ef3fb640a1f086d9b02954c3b4bbfb3578871: configure: error: *** A compiler with support for C++11 language features is required. Fixes: - http://autobuild.buildroot.org/results/3fecb96a8063b1a28703682e9373714c1c9cfa24 Signed-off-by: Fabrice Fontaine --- package/sdl2_ttf/sdl2_ttf.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/sdl2_ttf/sdl2_ttf.mk b/package/sdl2_ttf/sdl2_ttf.mk index e9397d8505..54e76815f1 100644 --- a/package/sdl2_ttf/sdl2_ttf.mk +++ b/package/sdl2_ttf/sdl2_ttf.mk @@ -13,6 +13,13 @@ SDL2_TTF_INSTALL_STAGING = YES SDL2_TTF_DEPENDENCIES = sdl2 freetype host-pkgconf SDL2_TTF_CONF_OPTS = --disable-freetype-builtin +ifeq ($(BR2_PACKAGE_HARFBUZZ),y) +SDL2_TTF_DEPENDENCIES += harfbuzz +SDL2_TTF_CONF_OPTS += --enable-harfbuzz +else +SDL2_TTF_CONF_OPTS += --disable-harfbuzz +endif + # x-includes and x-libraries must be set for cross-compiling # By default x_includes and x_libraries contains unsafe paths. # (/usr/include and /usr/lib) -- 2.34.1 From fontaine.fabrice at gmail.com Wed Feb 9 19:20:48 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 9 Feb 2022 20:20:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/mongrel2: fix build with gcc 4.8 Message-ID: <20220209192048.319559-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump to version 1.13.0 in commit b0a7bffad9e041d9920171802621b67903f9389e: arm-none-linux-gnueabi-gcc: error: unrecognized command line option '-Wimplicit-fallthrough=0' Fixes: - http://autobuild.buildroot.org/results/de324b733e09057c87352220069fe65f6e535eb8 Signed-off-by: Fabrice Fontaine --- .../0003-fix-build-with-gcc-4.8.patch | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 package/mongrel2/0003-fix-build-with-gcc-4.8.patch diff --git a/package/mongrel2/0003-fix-build-with-gcc-4.8.patch b/package/mongrel2/0003-fix-build-with-gcc-4.8.patch new file mode 100644 index 0000000000..eebfce0487 --- /dev/null +++ b/package/mongrel2/0003-fix-build-with-gcc-4.8.patch @@ -0,0 +1,60 @@ +From cc2dd3995dc9a9e6f0e705e11e791f3f3c7d7326 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 18 Jan 2022 22:41:36 +0100 +Subject: [PATCH] fix build with gcc 4.8 + +Drop "-Wno-unused-const-variable -Wimplicit-fallthrough=0" as +"-Wno-implicit-fallthrough -Wno-unused-const-variable" is already set in +CFLAGS. This will avoid the following build failure with gcc 4.8 raised +since version 1.13.0 and +https://github.com/mongrel2/mongrel2/commit/725209578599bd7784753d86aee34f6441ff78a5: + +arm-none-linux-gnueabi-gcc: error: unrecognized command line option '-Wimplicit-fallthrough=0' + +Fixes: + - http://autobuild.buildroot.org/results/de324b733e09057c87352220069fe65f6e535eb8 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/mongrel2/mongrel2/pull/354] +--- + Makefile | 1 - + tools/m2sh/Makefile | 4 ++-- + 2 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index f6627ed..fb8d028 100644 +--- a/Makefile ++++ b/Makefile +@@ -22,7 +22,6 @@ all: bin/mongrel2 tests m2sh procer + + ${OBJECTS_NOEXT}: CFLAGS += ${NOEXTCFLAGS} + ${OBJECTS}: | builddirs +-$(RAGEL_OBJECTS): CFLAGS += -Wno-unused-const-variable -Wimplicit-fallthrough=0 + + .PHONY: builddirs + builddirs: +diff --git a/tools/m2sh/Makefile b/tools/m2sh/Makefile +index 83e7ae4..86364af 100644 +--- a/tools/m2sh/Makefile ++++ b/tools/m2sh/Makefile +@@ -10,7 +10,7 @@ LIB_SRC=$(filter-out src/m2sh.c,${SOURCES}) + LIB_OBJ=$(filter-out src/m2sh.o,${OBJECTS}) + RAGEL_OBJECTS=src/lexer.o src/cli.o + +-$(RAGEL_OBJECTS): CFLAGS += -Wno-unused-const-variable -Wimplicit-fallthrough=0 -Wno-unused-parameter ++$(RAGEL_OBJECTS): CFLAGS += -Wno-unused-parameter + + all: ../lemon/lemon tests build/m2sh + +@@ -20,7 +20,7 @@ dev: all + install: build/m2sh + install build/m2sh ${DESTDIR}${PREFIX}/bin + +-src/parser.o: CFLAGS += -Wno-unused-const-variable -Wno-unused-parameter ++src/parser.o: CFLAGS += -Wno-unused-parameter + + build/libm2sh.a: ${LIB_OBJ} + mkdir -p build +-- +2.34.1 + -- 2.34.1 From fontaine.fabrice at gmail.com Wed Feb 9 19:24:36 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 9 Feb 2022 20:24:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/rng-tools: bump to version 6.15 Message-ID: <20220209192436.319769-1-fontaine.fabrice@gmail.com> Drop patches (already in version) https://github.com/nhorman/rng-tools/releases/tag/v6.15 Signed-off-by: Fabrice Fontaine --- ...ct-non-posix-extensions-for-pthreads.patch | 43 ---------------- ...-either-pthread-affinity-set-methods.patch | 49 ------------------- package/rng-tools/rng-tools.hash | 2 +- package/rng-tools/rng-tools.mk | 2 +- 4 files changed, 2 insertions(+), 94 deletions(-) delete mode 100644 package/rng-tools/0001-Adding-ability-to-detect-non-posix-extensions-for-pthreads.patch delete mode 100644 package/rng-tools/0002-Allow-for-use-of-either-pthread-affinity-set-methods.patch 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 deleted file mode 100644 index ba6cf63d7c..0000000000 --- a/package/rng-tools/0001-Adding-ability-to-detect-non-posix-extensions-for-pthreads.patch +++ /dev/null @@ -1,43 +0,0 @@ -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 deleted file mode 100644 index 17285baa6a..0000000000 --- a/package/rng-tools/0002-Allow-for-use-of-either-pthread-affinity-set-methods.patch +++ /dev/null @@ -1,49 +0,0 @@ -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; - } diff --git a/package/rng-tools/rng-tools.hash b/package/rng-tools/rng-tools.hash index 6806a99fc6..be2ee13969 100644 --- a/package/rng-tools/rng-tools.hash +++ b/package/rng-tools/rng-tools.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4dd86f6ae37d917a8489f44070d39d7feddcc622429b95efd7aa85a1f3cfdf81 rng-tools-6.14.tar.gz +sha256 bff0c58dff90ec10bd61f672e48618e045155eabd60b32d63a9c4ffbdad05f3a rng-tools-6.15.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/rng-tools/rng-tools.mk b/package/rng-tools/rng-tools.mk index 8db97569d4..8b195ea875 100644 --- a/package/rng-tools/rng-tools.mk +++ b/package/rng-tools/rng-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -RNG_TOOLS_VERSION = 6.14 +RNG_TOOLS_VERSION = 6.15 RNG_TOOLS_SITE = $(call github,nhorman,$(RNG_TOOLS_NAME),v$(RNG_TOOLS_VERSION)) RNG_TOOLS_LICENSE = GPL-2.0 RNG_TOOLS_LICENSE_FILES = COPYING -- 2.34.1 From fontaine.fabrice at gmail.com Wed Feb 9 19:36:14 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 9 Feb 2022 20:36:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/libarchive: security bump to version 3.5.3 Message-ID: <20220209193614.330861-1-fontaine.fabrice@gmail.com> Libarchive 3.5.3 is a security release Security Fixes: - extended fix for following symlinks when processing the fixup list (CVE-2021-31566) - fix invalid memory access and out of bounds read in RAR5 reader (CVE-2021-36976) https://github.com/libarchive/libarchive/releases/tag/v3.5.3 Signed-off-by: Fabrice Fontaine --- package/libarchive/libarchive.hash | 2 +- package/libarchive/libarchive.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libarchive/libarchive.hash b/package/libarchive/libarchive.hash index d31e9f55f4..5dd8e5c167 100644 --- a/package/libarchive/libarchive.hash +++ b/package/libarchive/libarchive.hash @@ -1,4 +1,4 @@ # From https://www.libarchive.de/downloads/sha256sums -sha256 f0b19ff39c3c9a5898a219497ababbadab99d8178acc980155c7e1271089b5a0 libarchive-3.5.2.tar.xz +sha256 5cac725dd4be31c4a10b65d30f29dc957ea29ef3d758df6e46e8ae90a996a19a libarchive-3.5.3.tar.xz # Locally computed: sha256 b2cdf763345de2de34cebf54394df3c61a105c3b71288603c251f2fa638200ba COPYING diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk index eec256ba75..cf16c27e67 100644 --- a/package/libarchive/libarchive.mk +++ b/package/libarchive/libarchive.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBARCHIVE_VERSION = 3.5.2 +LIBARCHIVE_VERSION = 3.5.3 LIBARCHIVE_SOURCE = libarchive-$(LIBARCHIVE_VERSION).tar.xz LIBARCHIVE_SITE = https://www.libarchive.de/downloads LIBARCHIVE_INSTALL_STAGING = YES -- 2.34.1 From giulio.benetti at benettiengineering.com Wed Feb 9 19:38:06 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 9 Feb 2022 20:38:06 +0100 Subject: [Buildroot] [PATCH v3 2/2] add configs/zynqmp_zcu102_defconfig In-Reply-To: <20220209180306.2629180-2-neal.frager@xilinx.com> References: <20220209180306.2629180-1-neal.frager@xilinx.com> <20220209180306.2629180-2-neal.frager@xilinx.com> Message-ID: <6de61d14-67ba-2c21-ad51-b23690420009@benettiengineering.com> Hi Neal, On 09/02/22 19:03, Neal Frager wrote: > This patch: > - adds support for Xilinx ZCU102 evaluation board > - ZCU102 features can be found here: > - https://www.xilinx.com/products/boards-and-kits/zcu102.html ^^^ please remove the dash > > Signed-off-by: Neal Frager Here like on previous patch add: --- V1->V2: * etc. > --- > board/zynqmp/readme.txt | 23 +++++++++++++------ > configs/zynqmp_zcu102_defconfig | 39 +++++++++++++++++++++++++++++++++ > 2 files changed, 55 insertions(+), 7 deletions(-) > create mode 100644 configs/zynqmp_zcu102_defconfig > > diff --git a/board/zynqmp/readme.txt b/board/zynqmp/readme.txt > index da37f4ccc9..0dc1793e03 100644 > --- a/board/zynqmp/readme.txt > +++ b/board/zynqmp/readme.txt > @@ -1,10 +1,19 @@ > -******************************** > -Xilinx ZCU106 board - ZynqMP SoC > -******************************** > +****************************************** > +Xilinx ZCU102 / ZCU106 boards - ZynqMP SoC > +****************************************** > + > +This document describes the Buildroot support for the ZCU102 and ZCU106 > +boards by Xilinx, based on the Zynq UltraScale+ MPSoC (aka ZynqMP). > +It has been tested with the ZCU102 and ZCU106 production boards. > + > +Evaluation board features can be found here with the links below. > + > +ZCU102: > +https://www.xilinx.com/products/boards-and-kits/zcu102.html > + > +ZCU106: > +https://www.xilinx.com/products/boards-and-kits/zcu106.html > > -This document describes the Buildroot support for the ZCU106 board by > -Xilinx, based on the Zynq UltraScale+ MPSoC (aka ZynqMP). It has been > -tested with the EK-U1-ZCU106-ES2 pre-production board. > > How to build it > =============== > @@ -32,7 +41,7 @@ After building, you should get a tree like this: > +-- rootfs.ext4 -> rootfs.ext2 > +-- sdcard.img > +-- system.dtb -> zynqmp-zcu106-revA.dtb > - +-- u-boot.bin > + +-- u-boot.itb > `-- zynqmp-zcu106-revA.dtb > > How to write the SD card > diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig > new file mode 100644 > index 0000000000..acffda64bf > --- /dev/null > +++ b/configs/zynqmp_zcu102_defconfig > @@ -0,0 +1,39 @@ > +BR2_aarch64=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_GIT=y > +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.15" > +BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +# BR2_TARGET_ROOTFS_TAR is not set > +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.6" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/Xilinx/u-boot-xlnx.git" > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2022.01" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > +BR2_TARGET_UBOOT_SPL=y > +BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" > +BR2_TARGET_UBOOT_ZYNQMP=y > +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/v2021.2/bin/pmufw-v2021.2.bin" > +BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/pm_cfg_obj.c" > +BR2_TARGET_UBOOT_FORMAT_ITB=y > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_MTOOLS=y Please send a V4 with the few requested changes and add in commit log like this: ``` Signed-off-by: Neal Frager Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti [Giulio: only build tested] ``` Thank you! Best regards -- Giulio Benetti Benetti Engineering sas From fontaine.fabrice at gmail.com Wed Feb 9 19:44:54 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 9 Feb 2022 20:44:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/audit: bump to version 3.0.7 Message-ID: <20220209194454.344276-1-fontaine.fabrice@gmail.com> https://github.com/linux-audit/audit-userspace/releases/tag/v3.0.7 Signed-off-by: Fabrice Fontaine --- package/audit/audit.hash | 2 +- package/audit/audit.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/audit/audit.hash b/package/audit/audit.hash index 9e16a339d6..6260f158d8 100644 --- a/package/audit/audit.hash +++ b/package/audit/audit.hash @@ -1,4 +1,4 @@ #Locally computed -sha256 c3e44d77513a42401d417dd0ceb203cf23886cb89402dea7b9494faa3f4fcc5e audit-3.0.6.tar.gz +sha256 8b4c78632a9301a1c7f859b0e38fc0b9c260b8214d6b7c771bf28b3d73a62597 audit-3.0.7.tar.gz sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING sha256 f18a0811fa0e220ccbc42f661545e77f0388631e209585ed582a1c693029c6aa COPYING.LIB diff --git a/package/audit/audit.mk b/package/audit/audit.mk index 7f364ab010..cbb174b980 100644 --- a/package/audit/audit.mk +++ b/package/audit/audit.mk @@ -4,7 +4,7 @@ # ################################################################################ -AUDIT_VERSION = 3.0.6 +AUDIT_VERSION = 3.0.7 AUDIT_SITE = http://people.redhat.com/sgrubb/audit AUDIT_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) AUDIT_LICENSE_FILES = COPYING COPYING.LIB -- 2.34.1 From thomas.petazzoni at bootlin.com Wed Feb 9 19:50:57 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 9 Feb 2022 20:50:57 +0100 Subject: [Buildroot] [PATCH 1/5 v2] package/pkg-cargo: allow packages to define download environment In-Reply-To: <9354_1644422930_6203E712_9354_383_11_2d5b77c2a90cf722e007a5bf3ed4227d2bd1fda6.1644422916.git.yann.morin@orange.com> References: <9354_1644422930_6203E712_9354_383_11_2d5b77c2a90cf722e007a5bf3ed4227d2bd1fda6.1644422916.git.yann.morin@orange.com> Message-ID: <20220209205057.57a6d1ce@windsurf> On Wed, 9 Feb 2022 17:08:43 +0100 wrote: > From: "Yann E. MORIN" > > Currently, the cargo infrastructure forcibly sets the package _DL_ENV > variable, instead of appending to it, which prevents packages from > providing their own download environment variables. > > We fix that by using an append-assignment. > > Note: when introduced, that variable was explicitly not documented, and > is supposed to only be used by packages infrastructures. However, that > variable exists, and it can be (ab)used by br2-external packages (most > probably to ill effects, but heh!). We anyway leave it undocumented, > like _ROOTFS_PRE_CMD_HOOKS. > > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni Acked-by: Thomas Petazzoni -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From fontaine.fabrice at gmail.com Wed Feb 9 19:52:40 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 9 Feb 2022 20:52:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/fatcat: bump to version 1.1.1 Message-ID: <20220209195240.346534-1-fontaine.fabrice@gmail.com> Update indentation in hash file (two spaces) https://github.com/Gregwar/fatcat/compare/v1.1.0...v1.1.1 Signed-off-by: Fabrice Fontaine --- package/fatcat/fatcat.hash | 4 ++-- package/fatcat/fatcat.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/fatcat/fatcat.hash b/package/fatcat/fatcat.hash index 66823e2d9e..56f89edd50 100644 --- a/package/fatcat/fatcat.hash +++ b/package/fatcat/fatcat.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 303efe2aa73cbfe6fbc5d8af346d0f2c70b3f996fc891e8859213a58b95ad88c fatcat-1.1.0.tar.gz -sha256 3ea03755e32cf7f5b12981de92a0fdad396448195fe0024990c9cbc388e9866c LICENSE +sha256 5574f715f62a9feda7fffc8099f8bca7134ff4f1274bb1bc0db96a2969eea206 fatcat-1.1.1.tar.gz +sha256 3ea03755e32cf7f5b12981de92a0fdad396448195fe0024990c9cbc388e9866c LICENSE diff --git a/package/fatcat/fatcat.mk b/package/fatcat/fatcat.mk index 1a2e5aacae..0dff53fa65 100644 --- a/package/fatcat/fatcat.mk +++ b/package/fatcat/fatcat.mk @@ -4,7 +4,7 @@ # ################################################################################ -FATCAT_VERSION = 1.1.0 +FATCAT_VERSION = 1.1.1 FATCAT_SITE = $(call github,Gregwar,fatcat,v$(FATCAT_VERSION)) FATCAT_LICENSE = MIT FATCAT_LICENSE_FILES = LICENSE -- 2.34.1 From thomas.petazzoni at bootlin.com Wed Feb 9 19:52:59 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 9 Feb 2022 20:52:59 +0100 Subject: [Buildroot] [PATCH 1/5 v2] package/pkg-cargo: allow packages to define download environment In-Reply-To: <9354_1644422930_6203E712_9354_383_11_2d5b77c2a90cf722e007a5bf3ed4227d2bd1fda6.1644422916.git.yann.morin@orange.com> References: <9354_1644422930_6203E712_9354_383_11_2d5b77c2a90cf722e007a5bf3ed4227d2bd1fda6.1644422916.git.yann.morin@orange.com> Message-ID: <20220209205259.725e17c2@windsurf> On Wed, 9 Feb 2022 17:08:43 +0100 wrote: > $(2)_DOWNLOAD_POST_PROCESS = cargo > -$(2)_DL_ENV = CARGO_HOME=$$(HOST_DIR)/share/cargo > +$(2)_DL_ENV += CARGO_HOME=$$(HOST_DIR)/share/cargo But, but, then, how is: PYTHON_CRYPTOGRAPHY_DL_ENV = \ BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml currently working? Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 9 19:54:10 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 9 Feb 2022 20:54:10 +0100 Subject: [Buildroot] [PATCH 2/5 v2] package/pkg-cargo: allow building in a sub-directory In-Reply-To: <20175_1644422934_6203E716_20175_175_1_fea7d1545892211e01cb6660dc5fba16b0851c47.1644422916.git.yann.morin@orange.com> References: <20175_1644422934_6203E716_20175_175_1_fea7d1545892211e01cb6660dc5fba16b0851c47.1644422916.git.yann.morin@orange.com> Message-ID: <20220209205410.071f193a@windsurf> On Wed, 9 Feb 2022 17:08:44 +0100 wrote: > +# If building in a sub directory, use that to find the Cargo.toml, unless > +# the package already provided its location. > +ifneq ($$($(2)_SUBDIR),) > +ifeq ($$(filter BR_CARGO_MANIFEST_PATH=%,$$($(2)_DL_ENV)),) > +$(2)_DL_ENV += BR_CARGO_MANIFEST_PATH=$$($(2)_SUBDIR)/Cargo.toml I find that a bit "meh". Should we have an explicit package variable that tells the location of the Cargo.toml, instead of directly have packages pass this "magic" BR_CARGO_MANIFEST_PATH variable ? Should $(2)_SUBDIR be documented for the cargo-package infra in the documentation ? Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 9 19:55:18 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 9 Feb 2022 20:55:18 +0100 Subject: [Buildroot] [PATCH 3/5 v2] package/pkg-cargo: host-rustc is also a build dependency In-Reply-To: <9430_1644422939_6203E71B_9430_485_1_951512fc2010b31a4d2d50fe12c2ad86f3a0c1a1.1644422916.git.yann.morin@orange.com> References: <9430_1644422939_6203E71B_9430_485_1_951512fc2010b31a4d2d50fe12c2ad86f3a0c1a1.1644422916.git.yann.morin@orange.com> Message-ID: <20220209205518.18d720ef@windsurf> On Wed, 9 Feb 2022 17:08:45 +0100 wrote: > From: "Yann E. MORIN" > > Currently, host-rustc is a download dependency, because we need cargo > for the vendoring during the downlaod step. ^^^^^^^^ download > However, when using a package in override-srcdir, there is no download > step, so host-rustc is not pulled in as a dependency which breaks > running the build of a single pcakge from scratch: ^^^^^^ package > $ make clean > $ make my-rust-package > [...] > [...] cargo build --offline --release --manifest-path Cargo.toml --locked > /bin/sh: cargo: command not found > > We fix that by adding host-rustc as a standard dependency too. > > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni Acked-by: Thomas Petazzoni -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 9 19:55:44 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 9 Feb 2022 20:55:44 +0100 Subject: [Buildroot] [PATCH 4/5 v2] package/pkg-golang: allow packages to define download environment In-Reply-To: <20175_1644422945_6203E721_20175_189_1_2f2cfe45bc7a546997c16e84a6e617dc0752a731.1644422916.git.yann.morin@orange.com> References: <20175_1644422945_6203E721_20175_189_1_2f2cfe45bc7a546997c16e84a6e617dc0752a731.1644422916.git.yann.morin@orange.com> Message-ID: <20220209205544.6a944b47@windsurf> On Wed, 9 Feb 2022 17:08:46 +0100 wrote: > From: "Yann E. MORIN" > > Currently, the golang infrastructure forcibly sets the package _DL_ENV > variable, instead of appending to it, which prevents packages from > providing their own download environment variables. > > We fix that by using an append-assignment. > > Note: when introduced, that variable was explicitly not documented, and > is supposed to only be used by packages infrastructures. However, that > variable exists, and it can be (ab)used by br2-external packages (most > probably to ill effects, but heh!). We anyway leave it undocumented, > like _ROOTFS_PRE_CMD_HOOKS. > > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni > Cc: Christian Stewart > Cc: Anisse Astier Acked-by: Thomas Petazzoni -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From fontaine.fabrice at gmail.com Wed Feb 9 19:59:30 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 9 Feb 2022 20:59:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/fping: bump to version 5.1 Message-ID: <20220209195930.349179-1-fontaine.fabrice@gmail.com> https://github.com/schweikert/fping/releases/tag/v5.1 Signed-off-by: Fabrice Fontaine --- package/fping/fping.hash | 2 +- package/fping/fping.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/fping/fping.hash b/package/fping/fping.hash index 0b2233f379..4671cd77cf 100644 --- a/package/fping/fping.hash +++ b/package/fping/fping.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 ed38c0b9b64686a05d1b3bc1d66066114a492e04e44eef1821d43b1263cd57b8 fping-5.0.tar.gz +sha256 1ee5268c063d76646af2b4426052e7d81a42b657e6a77d8e7d3d2e60fd7409fe fping-5.1.tar.gz # Hash for license file sha256 6051b27e4b4a648f7bc8b329024da53a6e95ce88fcf0ccc259c371a74b741757 COPYING diff --git a/package/fping/fping.mk b/package/fping/fping.mk index 0a03c1dfdc..5986d05b93 100644 --- a/package/fping/fping.mk +++ b/package/fping/fping.mk @@ -4,7 +4,7 @@ # ################################################################################ -FPING_VERSION = 5.0 +FPING_VERSION = 5.1 FPING_SITE = http://fping.org/dist FPING_LICENSE = BSD-like FPING_LICENSE_FILES = COPYING -- 2.34.1 From thomas.petazzoni at bootlin.com Wed Feb 9 20:03:42 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 9 Feb 2022 21:03:42 +0100 Subject: [Buildroot] [PATCH 5/5 v2] package/pkg-golang: host-go is also a build dependency In-Reply-To: <25580_1644422947_6203E723_25580_17_1_a1a52ce7fd9920435f8cc9e82513d62f9badd738.1644422916.git.yann.morin@orange.com> References: <25580_1644422947_6203E723_25580_17_1_a1a52ce7fd9920435f8cc9e82513d62f9badd738.1644422916.git.yann.morin@orange.com> Message-ID: <20220209210342.604b2661@windsurf> On Wed, 9 Feb 2022 17:08:47 +0100 wrote: > From: "Yann E. MORIN" > > Currently, host-go is a download dependency, because we need go for the > vendoring during the downlaod step. > > However, when using a package in override-srcdir, there is no download > step, so host-go is not pulled in as a dependency, which will break the > build of a single package from scratch. > > We fix that by adding host-go as a standard dependency too. > > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni > Cc: Christian Stewart > Cc: Anisse Astier Acked-by: Thomas Petazzoni -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From christian at paral.in Wed Feb 9 20:11:37 2022 From: christian at paral.in (Christian Stewart) Date: Wed, 9 Feb 2022 12:11:37 -0800 Subject: [Buildroot] [PATCH 5/5 v2] package/pkg-golang: host-go is also a build dependency In-Reply-To: <25580_1644422947_6203E723_25580_17_1_a1a52ce7fd9920435f8cc9e82513d62f9badd738.1644422916.git.yann.morin@orange.com> References: <25580_1644422947_6203E723_25580_17_1_a1a52ce7fd9920435f8cc9e82513d62f9badd738.1644422916.git.yann.morin@orange.com> Message-ID: On Wed, Feb 9, 2022 at 8:09 AM wrote: > > From: "Yann E. MORIN" > > Currently, host-go is a download dependency, because we need go for the > vendoring during the downlaod step. > > However, when using a package in override-srcdir, there is no download > step, so host-go is not pulled in as a dependency, which will break the > build of a single package from scratch. > > We fix that by adding host-go as a standard dependency too. > > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni > Cc: Christian Stewart > Cc: Anisse Astier > --- > package/pkg-golang.mk | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk > index 69eae02830..ddefdf1214 100644 Reviewed-by: Christian Stewart Best, Christian From christian at paral.in Wed Feb 9 20:12:11 2022 From: christian at paral.in (Christian Stewart) Date: Wed, 9 Feb 2022 12:12:11 -0800 Subject: [Buildroot] [PATCH 4/5 v2] package/pkg-golang: allow packages to define download environment In-Reply-To: <20175_1644422945_6203E721_20175_189_1_2f2cfe45bc7a546997c16e84a6e617dc0752a731.1644422916.git.yann.morin@orange.com> References: <20175_1644422945_6203E721_20175_189_1_2f2cfe45bc7a546997c16e84a6e617dc0752a731.1644422916.git.yann.morin@orange.com> Message-ID: Hi, On Wed, Feb 9, 2022 at 8:09 AM wrote: > > From: "Yann E. MORIN" > > Currently, the golang infrastructure forcibly sets the package _DL_ENV > variable, instead of appending to it, which prevents packages from > providing their own download environment variables. > > We fix that by using an append-assignment. > > Note: when introduced, that variable was explicitly not documented, and > is supposed to only be used by packages infrastructures. However, that > variable exists, and it can be (ab)used by br2-external packages (most > probably to ill effects, but heh!). We anyway leave it undocumented, > like _ROOTFS_PRE_CMD_HOOKS. > > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni > Cc: Christian Stewart > Cc: Anisse Astier > --- > 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..69eae02830 100644 Reviewed-by: Christian Stewart Best, Christian From fontaine.fabrice at gmail.com Wed Feb 9 20:14:44 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 9 Feb 2022 21:14:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/gauche: drop autoreconf Message-ID: <20220209201444.352250-1-fontaine.fabrice@gmail.com> Commit 11cb72be570409be77d4bb49c17b4a2feef31be7 forgot to drop autoreconf Signed-off-by: Fabrice Fontaine --- package/gauche/gauche.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/gauche/gauche.mk b/package/gauche/gauche.mk index 2520379369..fe0a613a9d 100644 --- a/package/gauche/gauche.mk +++ b/package/gauche/gauche.mk @@ -10,8 +10,6 @@ GAUCHE_SITE = http://downloads.sourceforge.net/project/gauche/Gauche GAUCHE_LICENSE = BSD-3-Clause, Boehm-gc, SRFI (srfi-11.scm), reload (reload.scm) GAUCHE_LICENSE_FILES = COPYING GAUCHE_DEPENDENCIES = host-gauche -# We're patching configure.ac -GAUCHE_AUTORECONF = YES HOST_GAUCHE_CONF_OPTS = --without-zlib GAUCHE_CONF_OPTS = --without-libatomic-ops -- 2.34.1 From fontaine.fabrice at gmail.com Wed Feb 9 20:21:23 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 9 Feb 2022 21:21:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/jo: bump to version 1.6 Message-ID: <20220209202123.354897-1-fontaine.fabrice@gmail.com> https://github.com/jpmens/jo/blob/1.6/ChangeLog Signed-off-by: Fabrice Fontaine --- package/jo/jo.hash | 2 +- package/jo/jo.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/jo/jo.hash b/package/jo/jo.hash index 8f1cc8fcd9..efad8228a7 100644 --- a/package/jo/jo.hash +++ b/package/jo/jo.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 24c64d2eb863900947f58f32b502c95fec8f086105fd31151b91f54b7b5256a2 jo-1.4.tar.gz +sha256 eb15592f1ba6d5a77468a1438a20e3d21c3d63bb7d045fb3544f223340fcd1a1 jo-1.6.tar.gz sha256 41d8b23dc6e76731f4920b9ce42d0d4a248d243a510319e2441d174a115f35cf COPYING diff --git a/package/jo/jo.mk b/package/jo/jo.mk index 24b499f345..dd5dd03ddb 100644 --- a/package/jo/jo.mk +++ b/package/jo/jo.mk @@ -4,7 +4,7 @@ # ################################################################################ -JO_VERSION = 1.4 +JO_VERSION = 1.6 JO_SITE = https://github.com/jpmens/jo/releases/download/$(JO_VERSION) JO_LICENSE = MIT (json.[ch]), GPL-2.0+ (rest) JO_LICENSE_FILES = COPYING -- 2.34.1 From fontaine.fabrice at gmail.com Wed Feb 9 20:28:25 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 9 Feb 2022 21:28:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/libmodbus: bump to version 3.1.7 Message-ID: <20220209202825.359811-1-fontaine.fabrice@gmail.com> https://github.com/stephane/libmodbus/releases/tag/v3.1.7 Signed-off-by: Fabrice Fontaine --- package/libmodbus/libmodbus.hash | 2 +- package/libmodbus/libmodbus.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libmodbus/libmodbus.hash b/package/libmodbus/libmodbus.hash index 2931f3f3d7..b676d261de 100644 --- a/package/libmodbus/libmodbus.hash +++ b/package/libmodbus/libmodbus.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d7d9fa94a16edb094e5fdf5d87ae17a0dc3f3e3d687fead81835d9572cf87c16 libmodbus-3.1.6.tar.gz +sha256 7dfe958431d0570b271e1a5b329b76a658e89c614cf119eb5aadb725c87f8fbd libmodbus-3.1.7.tar.gz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LESSER diff --git a/package/libmodbus/libmodbus.mk b/package/libmodbus/libmodbus.mk index 52eb318a99..46eb860392 100644 --- a/package/libmodbus/libmodbus.mk +++ b/package/libmodbus/libmodbus.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMODBUS_VERSION = 3.1.6 +LIBMODBUS_VERSION = 3.1.7 LIBMODBUS_SITE = http://libmodbus.org/releases LIBMODBUS_LICENSE = LGPL-2.1+ LIBMODBUS_LICENSE_FILES = COPYING.LESSER -- 2.34.1 From yann.morin.1998 at free.fr Wed Feb 9 20:30:26 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 21:30:26 +0100 Subject: [Buildroot] [PATCH] support/scripts/graph-build-time: add support for timeline graphing Message-ID: <20220209203026.3724993-1-yann.morin.1998@free.fr> From: Thomas Petazzoni This commit adds support for a new type of graph, showing the timeline of a build. It shows, with one line per package, when each of this package steps started/ended, and therefore allows to see the sequencing of the package builds. For a fully serialized build like we have today, this is not super useful (except to show that everything is serialized), but it becomes much more useful in the context of top-level parallel build. We chose to order the graph by the time-of-configure, as it is the closest to the actual cascade-style of a true dependency graph, which is tiny bit more complex to achieve properly. The actual result still looks pretty good. The graph-build make target is extended to also generate this new timeline graph. Signed-off-by: Thomas Petazzoni [yann.morin.1998 at free.fr: - sort by start-of-configure time - re-use existing colorsets (default or alternate) - fix python2isms - fix check-package ] Signed-off-by: Yann E. MORIN --- Makefile | 3 ++ support/scripts/graph-build-time | 63 +++++++++++++++++++++++++++++++- 2 files changed, 65 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8a4ec4ef85..da2dd8cfba 100644 --- a/Makefile +++ b/Makefile @@ -872,6 +872,9 @@ graph-build: $(O)/build/build-time.log --type=pie-$(t) --input=$(<) \ --output=$(GRAPHS_DIR)/build.pie-$(t).$(BR_GRAPH_OUT) \ $(if $(BR2_GRAPH_ALT),--alternate-colors)$(sep)) + ./support/scripts/graph-build-time --type=timeline --input=$(<) \ + --output=$(GRAPHS_DIR)/build.timeline.$(BR_GRAPH_OUT) \ + $(if $(BR2_GRAPH_ALT),--alternate-colors) .PHONY: graph-depends-requirements graph-depends-requirements: diff --git a/support/scripts/graph-build-time b/support/scripts/graph-build-time index 742c9a7a50..1edc3b3c00 100755 --- a/support/scripts/graph-build-time +++ b/support/scripts/graph-build-time @@ -241,6 +241,65 @@ def pkg_pie_time_per_step(data, output): plt.savefig(output) +def pkg_timeline(data, output): + start = 0 + end = 0 + + # Find the first timestamp and the last timestamp + for p in data: + for k, v in p.steps_start.items(): + if start == 0 or v < start: + start = v + if end < v: + end = v + + # Readjust all timestamps so that 0 is the start of the build + # instead of being Epoch + for p in data: + for k, v in p.steps_start.items(): + p.steps_start[k] = v - start + for k, v in p.steps_end.items(): + p.steps_end[k] = v - start + + plt.figure() + + i = 0 + labels_names = [] + labels_coords = [] + # put last packages that started to configure last; this does not + # give the proper dependency chain, but still provides a good-enough + # cascade graph. + for p in sorted(data, reverse=True, key=lambda x: x.steps_start['configure']): + durations = [] + facecolors = [] + for step in steps: + if step not in p.steps_start or step not in p.steps_end: + continue + durations.append((p.steps_start[step], + p.steps_end[step] - p.steps_start[step])) + facecolors.append(colors[steps.index(step)]) + plt.broken_barh(durations, (i, 6), facecolors=facecolors) + labels_coords.append(i + 3) + labels_names.append(p.name) + i += 10 + + axes = plt.gcf().gca() + + axes.set_ylim(0, i + 10) + axes.set_xlim(0, end - start) + axes.set_xlabel('seconds since start') + axes.set_yticks(labels_coords) + axes.set_yticklabels(labels_names) + axes.set_axisbelow(True) + axes.grid(True, linewidth=0.2, zorder=-1) + + plt.gcf().subplots_adjust(left=0.2) + + plt.tick_params(axis='y', which='both', labelsize=6) + plt.title('Timeline') + plt.savefig(output, dpi=300) + + # Parses the csv file passed on standard input and returns a list of # Package objects, filed with the duration of each step and the total # duration of the package. @@ -277,7 +336,7 @@ def read_data(input_file): parser = argparse.ArgumentParser(description='Draw build time graphs') parser.add_argument("--type", '-t', metavar="GRAPH_TYPE", - help="Type of graph (histogram, pie-packages, pie-steps)") + help="Type of graph (histogram, pie-packages, pie-steps, timeline)") parser.add_argument("--order", '-O', metavar="GRAPH_ORDER", help="Ordering of packages: build or duration (for histogram only)") parser.add_argument("--alternate-colors", '-c', action="store_true", @@ -307,6 +366,8 @@ elif args.type == "pie-packages": pkg_pie_time_per_package(d, args.output) elif args.type == "pie-steps": pkg_pie_time_per_step(d, args.output) +elif args.type == "timeline": + pkg_timeline(d, args.output) else: sys.stderr.write("Unknown type: %s\n" % args.type) exit(1) -- 2.25.1 From yann.morin.1998 at free.fr Wed Feb 9 20:33:36 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 21:33:36 +0100 Subject: [Buildroot] [PATCH] package/python-pyzmq: drop python2 dependency for comment In-Reply-To: <20220209152606.20762-1-peter@korsgaard.com> References: <20220209152606.20762-1-peter@korsgaard.com> Message-ID: <20220209203336.GC2249818@scaer> Peter, All, On 2022-02-09 16:26 +0100, Peter Korsgaard spake thusly: > The package was updated to support python3 in commit 4a8bedc51d9 > (python-pyzmq: enable PyZMQ for Python 3), but the comment dependency was > missed. > > Signed-off-by: Peter Korsgaard Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/python-pyzmq/Config.in | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/package/python-pyzmq/Config.in b/package/python-pyzmq/Config.in > index 8f33a635c8..f8ce52f844 100644 > --- a/package/python-pyzmq/Config.in > +++ b/package/python-pyzmq/Config.in > @@ -9,5 +9,4 @@ config BR2_PACKAGE_PYTHON_PYZMQ > http://zeromq.org/bindings:python > > comment "python-pyzmq needs a toolchain w/ C++, threads" > - depends on BR2_PACKAGE_PYTHON > depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS) > -- > 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 Feb 9 20:31:36 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 21:31:36 +0100 Subject: [Buildroot] [git commit] package/python-pyzmq: drop python2 dependency for comment Message-ID: <20220209202625.6067482B8F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6e9ecaa0c9d9aea41212566a58ffab5e25e52bda branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The package was updated to support python3 in commit 4a8bedc51d9 (python-pyzmq: enable PyZMQ for Python 3), but the comment dependency was missed. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-pyzmq/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/python-pyzmq/Config.in b/package/python-pyzmq/Config.in index 8f33a635c8..f8ce52f844 100644 --- a/package/python-pyzmq/Config.in +++ b/package/python-pyzmq/Config.in @@ -9,5 +9,4 @@ config BR2_PACKAGE_PYTHON_PYZMQ http://zeromq.org/bindings:python comment "python-pyzmq needs a toolchain w/ C++, threads" - depends on BR2_PACKAGE_PYTHON depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS) From fontaine.fabrice at gmail.com Wed Feb 9 20:35:35 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 9 Feb 2022 21:35:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/lzip: bump to version 1.23 Message-ID: <20220209203535.361814-1-fontaine.fabrice@gmail.com> https://lists.nongnu.org/archive/html/lzip-bug/2022-02/msg00000.html Signed-off-by: Fabrice Fontaine --- package/lzip/lzip.hash | 4 ++-- package/lzip/lzip.mk | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/lzip/lzip.hash b/package/lzip/lzip.hash index 57e7eb43f4..5e285a5ad8 100644 --- a/package/lzip/lzip.hash +++ b/package/lzip/lzip.hash @@ -1,4 +1,4 @@ -# From https://lists.nongnu.org/archive/html/lzip-bug/2021-01/msg00008.html -sha256 c3342d42e67139c165b8b128d033b5c96893a13ac5f25933190315214e87a948 lzip-1.22.tar.gz +# From https://lists.nongnu.org/archive/html/lzip-bug/2022-02/msg00000.html +sha256 ea02b9e6fb25d0e1a1d3ef4fdeb6ab26b931f1ece66fa1cee2983c95215e930a lzip-1.23.tar.lz # Locally calculated sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef COPYING diff --git a/package/lzip/lzip.mk b/package/lzip/lzip.mk index cca6da07d0..e3cc86b956 100644 --- a/package/lzip/lzip.mk +++ b/package/lzip/lzip.mk @@ -4,7 +4,8 @@ # ################################################################################ -LZIP_VERSION = 1.22 +LZIP_VERSION = 1.23 +LZIP_SOURCE = lzip-$(LZIP_VERSION).tar.lz LZIP_SITE = http://download.savannah.gnu.org/releases/lzip LZIP_LICENSE = GPL-2.0+ LZIP_LICENSE_FILES = COPYING -- 2.34.1 From giulio.benetti at benettiengineering.com Wed Feb 9 20:38:53 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 9 Feb 2022 21:38:53 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/guile: Add BR2_ENABLE_LOCALE as dependency. In-Reply-To: References: Message-ID: <3147FE8A-CB1B-4CB0-A92B-48767C06ED92@benettiengineering.com> Ah last thing, please register on patchwork and mark your V1 and v2 patches as superseded: https://patchwork.ozlabs.org/project/buildroot/list/?submitter=64998 Best regards Giulio Inviato da iPhone > Il giorno 8 feb 2022, alle ore 23:54, Giulio Benetti ha scritto: > > ?Hi again Pedro, > > I've reproduced the build failure with your previous attached .config file and this patch fixes it. So below... > >> On 08/02/22 23:06, Giulio Benetti wrote: >> Hi Pedro, >>> On 08/02/22 22:37, Pedro Aguilar wrote: >>> If it's not present, enable libiconv. >> Here it's missing: >> Fixes: >> URL to autobuilder failure > > ...please provide the autobuilder failure URL and if it doesn't exist than we don't need it. > > So once done this I can give you my Review. > > Waiting for V2 with improved commit log then. > > Thank you! > Best regards > -- > Giulio Benetti > Benetti Engineering sas > >> And also I can't find guile failing due to LIBICONV. >> At least, I only find: >> http://autobuild.buildroot.net/?reason=guile-3.0.7 >> But it seems to be about another problem(to be solved too). >> Can you please point the autobuilder failure? >> Otherwise I can't test/review your patch. >> Thank you! >> Best regards >> -- Giulio Benetti Benetti Engineering sas >>> Signed-off-by: Pedro Aguilar >>> >>> --- >>> Changes v1 -> v2: >>> - Use BR2_ENABLE_LOCALE if selected, otherwise use libiconv >>> as before (pointed out by Thomas and Giulio) >>> --- >>> package/guile/Config.in | 1 + >>> package/guile/guile.mk | 4 ++++ >>> 2 files changed, 5 insertions(+) >>> >>> diff --git a/package/guile/Config.in b/package/guile/Config.in >>> index b1182a4cee..f70e674018 100644 >>> --- a/package/guile/Config.in >>> +++ b/package/guile/Config.in >>> @@ -9,6 +9,7 @@ config BR2_PACKAGE_GUILE >>> select BR2_PACKAGE_LIBFFI >>> select BR2_PACKAGE_GMP >>> select BR2_PACKAGE_BDWGC >>> + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE >>> help >>> Guile is an interpreter and compiler for the Scheme >>> programming language, a clean and elegant dialect of Lisp. >>> diff --git a/package/guile/guile.mk b/package/guile/guile.mk >>> index 0f245fca76..03420407f8 100644 >>> --- a/package/guile/guile.mk >>> +++ b/package/guile/guile.mk >>> @@ -18,6 +18,10 @@ GUILE_CPE_ID_VENDOR = gnu >>> GUILE_DEPENDENCIES = host-guile libunistring libffi gmp bdwgc host-pkgconf >>> HOST_GUILE_DEPENDENCIES = host-libunistring host-libffi host-gmp host-bdwgc host-flex host-pkgconf host-gettext >>> +ifeq ($(BR2_ENABLE_LOCALE),) >>> +GUILE_DEPENDENCIES += libiconv >>> +endif >>> + >>> # The HAVE_GC* CFLAGS specify that we will use internal callbacks >>> # instead of the ones provided by >>> # bdwgc. Eg. HAVE_GC_SET_FINALIZER_NOTIFIER specifies that we won't >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > -------------- next part -------------- An HTML attachment was scrubbed... URL: From giulio.benetti at benettiengineering.com Wed Feb 9 20:46:42 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 9 Feb 2022 21:46:42 +0100 Subject: [Buildroot] [PATCH v3 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <20220209180306.2629180-1-neal.frager@xilinx.com> References: <20220209180306.2629180-1-neal.frager@xilinx.com> Message-ID: Hi Neal, > Il giorno 9 feb 2022, alle ore 19:04, Neal Frager ha scritto: > > ?This patch: > - bumps ATF to Xilinx v2.6: mainline v2.6 requires patch to build > - bumps U-Boot to Xilinx 2022.01: important drivers not in mainline > - bumps Linux to Xilinx 5.15: important drivers not in mainline > - deletes board/zynqmp/patches directory: patches already in mainline > - modifies board/zynqmp/genimage.cfg: U-Boot 2022.01 uses u-boot.itb format > - adds extlinux.conf to vfat bootfs > - modifies U-Boot to unified xilinx_zynqmp_virt_defconfig (supports all boards) > - adds support for SPL pm_cfg_obj.c loading to PMU firmware > - enables support for host machines without OpenSSL required by u-boot > > Signed-off-by: Neal Frager > --- > board/zynqmp/extlinux.conf | 5 + > board/zynqmp/genimage.cfg | 6 +- > ...-fix-Remove-GGC-ignore-Warray-bounds.patch | 68 -- > ...64-zynqmp-zcu106-fix-SPL-MMC-booting.patch | 52 -- > ...2-arm64-zynqmp-Enable-booting-to-ATF.patch | 114 ---- > ...ept-an-absolute-path-for-PMUFW_INIT_.patch | 68 -- > ...ynqmp-pass-the-PS-init-file-as-a-kco.patch | 175 ----- > board/zynqmp/pm_cfg_obj.c | 614 ++++++++++++++++++ > board/zynqmp/post-build.sh | 8 + > board/zynqmp/post-image.sh | 4 +- > configs/zynqmp_zcu106_defconfig | 23 +- > 11 files changed, 648 insertions(+), 489 deletions(-) > create mode 100644 board/zynqmp/extlinux.conf > delete mode 100644 board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch > delete mode 100644 board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch > delete mode 100644 board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch > delete mode 100644 board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch > delete mode 100644 board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch > create mode 100644 board/zynqmp/pm_cfg_obj.c > create mode 100755 board/zynqmp/post-build.sh > > diff --git a/board/zynqmp/extlinux.conf b/board/zynqmp/extlinux.conf > new file mode 100644 > index 0000000000..a69a2e1963 > --- /dev/null > +++ b/board/zynqmp/extlinux.conf > @@ -0,0 +1,5 @@ > +label linux > + kernel /Image > + devicetree /system.dtb > + append console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait > + > \ No newline at end of file Here ^^^ please remove the 2 spaces so it will be recognized as a newline. > diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg > index ed202f4550..20d8352c08 100644 > --- a/board/zynqmp/genimage.cfg > +++ b/board/zynqmp/genimage.cfg > @@ -2,11 +2,13 @@ image boot.vfat { > vfat { > files = { > "boot.bin", > - "u-boot.bin", > - "atf-uboot.ub", > + "u-boot.itb", > "system.dtb", > "Image" > } > + file extlinux/extlinux.conf { > + image = extlinux.conf > + } > } > > size = 32M > diff --git a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch b/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch > deleted file mode 100644 > index 0c1a9ba2a4..0000000000 > --- a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch > +++ /dev/null > @@ -1,68 +0,0 @@ > -From da003e6ada7d0217fe99dc7c649a731f8ebd3c34 Mon Sep 17 00:00:00 2001 > -From: Deepika Bhavnani > -Date: Thu, 15 Aug 2019 00:56:46 +0300 > -Subject: [PATCH] Coverity fix: Remove GGC ignore -Warray-bounds > - > -GCC diagnostics were added to ignore array boundaries, instead > -of ignoring GCC warning current code will check for array boundaries > -and perform and array update only for valid elements. > - > -Resolves: `CID 246574` `CID 246710` `CID 246651` > - > -Signed-off-by: Deepika Bhavnani > -Change-Id: I7530ecf7a1707351c6ee87e90cc3d33574088f57 > - > -Backported from: 41af05154abe136938bcfb5f26c969933784bbef > -[Adapted to apply on 1.5] > - > ---- > - lib/psci/psci_common.c | 20 ++++++++++---------- > - 1 file changed, 10 insertions(+), 10 deletions(-) > - > -diff --git a/lib/psci/psci_common.c b/lib/psci/psci_common.c > -index 2220a745cd6e..6282d992a2f0 100644 > ---- a/lib/psci/psci_common.c > -+++ b/lib/psci/psci_common.c > -@@ -188,21 +188,17 @@ static unsigned int get_power_on_target_pwrlvl(void) > - /****************************************************************************** > - * Helper function to update the requested local power state array. This array > - * does not store the requested state for the CPU power level. Hence an > -- * assertion is added to prevent us from accessing the wrong index. > -+ * assertion is added to prevent us from accessing the CPU power level. > - *****************************************************************************/ > - static void psci_set_req_local_pwr_state(unsigned int pwrlvl, > - unsigned int cpu_idx, > - plat_local_state_t req_pwr_state) > - { > -- /* > -- * This should never happen, we have this here to avoid > -- * "array subscript is above array bounds" errors in GCC. > -- */ > - assert(pwrlvl > PSCI_CPU_PWR_LVL); > --#pragma GCC diagnostic push > --#pragma GCC diagnostic ignored "-Warray-bounds" > -- psci_req_local_pwr_states[pwrlvl - 1][cpu_idx] = req_pwr_state; > --#pragma GCC diagnostic pop > -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && > -+ (cpu_idx < PLATFORM_CORE_COUNT)) { > -+ psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx] = req_pwr_state; > -+ } > - } > - > - /****************************************************************************** > -@@ -228,7 +224,11 @@ static plat_local_state_t *psci_get_req_local_pwr_states(unsigned int pwrlvl, > - { > - assert(pwrlvl > PSCI_CPU_PWR_LVL); > - > -- return &psci_req_local_pwr_states[pwrlvl - 1][cpu_idx]; > -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && > -+ (cpu_idx < PLATFORM_CORE_COUNT)) { > -+ return &psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx]; > -+ } else > -+ return NULL; > - } > - > - /* > --- > -2.34.0 > - > diff --git a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch b/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch > deleted file mode 100644 > index 4d85e1bb12..0000000000 > --- a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch > +++ /dev/null > @@ -1,52 +0,0 @@ > -From e5d72ed8339eb05285448aad3c89d21e4d18fd29 Mon Sep 17 00:00:00 2001 > -From: Luca Ceresoli > -Date: Mon, 26 Feb 2018 09:40:34 +0100 > -Subject: [PATCH] arm64: zynqmp: zcu106: fix SPL MMC booting > - > -The U-Boot SPL generated with the current zcu106 defconfig cannot boot > -from MMC: > - > - [...] > - U-Boot SPL 2018.01 (Feb 21 2018 - 17:47:14) > - EL Level: EL3 > - Trying to boot from MMC1 > - sdhci_transfer_data: Error detected in status(0x408020)! > - spl_load_image_fat_os: error reading image u-boot.bin, err - -2 > - spl_load_image_fat: error reading image u-boot.img, err - -6 > - SPL: failed to boot from all boot devices > - ### ERROR ### Please RESET the board ### > - > -Fix by lowering the rpll value. The new value for the RPLL_CTRL > -register comes from the current psu_init_gpl.c from the HDF file at > -https://github.com/xilinx/hdf-examples/tree/01ad8ea5fd1989abf4ea5a072d019a16cb2bc546/zcu106-zynqmp > -(generated by Vivado v2017.4). > - > -RPLL and sdio1_ref clocks before and after this change: > - > - - Old values: RPLL 1.36 GHz, sdio1_ref 272 MHz > - - New values: RPLL 1.16 GHz, sdio1_ref 233 MHz > - > -Signed-off-by: Luca Ceresoli > -Cc: Michal Simek > -Upstream-status: accepted upstream in a different form > ---- > - > - board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c > -index 4d18abe000ca..e6fa477e53e7 100644 > ---- a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c > -+++ b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c > -@@ -10,7 +10,7 @@ > - static unsigned long psu_pll_init_data(void) > - { > - psu_mask_write(0xFF5E0034, 0xFE7FEDEFU, 0x7E4E2C62U); > -- psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00013C00U); > -+ psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00014600U); > - psu_mask_write(0xFF5E0030, 0x00000008U, 0x00000008U); > - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000001U); > - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000000U); > --- > -2.7.4 > - > diff --git a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch b/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch > deleted file mode 100644 > index 487fff6812..0000000000 > --- a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch > +++ /dev/null > @@ -1,114 +0,0 @@ > -From 5e3cac50cc981e01d9072241035a8d4162560c71 Mon Sep 17 00:00:00 2001 > -From: Luca Ceresoli > -Date: Mon, 12 Mar 2018 17:18:38 +0100 > -Subject: [PATCH] arm64: zynqmp: Enable booting to ATF > - > -U-Boot is now able to boot to ARM Trusted Firmware (ATF). The boot > -flow is SPL(EL3) loads ATF and full u-boot and jump to ATF(EL3) which > -pass control to full u-boot(EL2). This has been tested on zcu106, so > -enable it in this defconfig. > - > -To generate an image that triggers this booting flow, you need to pass > -'-O arm-trusted-firmware' to mkimage. > - > -Signed-off-by: Luca Ceresoli > -Signed-off-by: Michal Simek > -Backported from upstream: http://git.denx.de/?p=u-boot.git;a=commit;h=5e3cac50cc981e01d9072241035a8d4162560c71 > ---- > - > - configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 + > - configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 + > - configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 + > - configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 + > - configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 1 + > - configs/xilinx_zynqmp_zcu102_revA_defconfig | 1 + > - configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 + > - 7 files changed, 7 insertions(+) > - > -diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig > -index c5bfa2b12638..488c72258b0e 100644 > ---- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig > -+++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig > -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_FASTBOOT=y > - CONFIG_FASTBOOT_FLASH=y > -diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig > -index f86dce403a42..5d501eec0edd 100644 > ---- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig > -+++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig > -@@ -20,6 +20,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_FASTBOOT=y > - CONFIG_FASTBOOT_FLASH=y > -diff --git a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig > -index 6e947cf56827..6f7eaebd7676 100644 > ---- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig > -+++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig > -@@ -16,6 +16,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_CMD_MEMTEST=y > - CONFIG_SYS_ALT_MEMTEST=y > -diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig > -index 1c934858c61c..7a3806cba4b5 100644 > ---- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig > -+++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig > -@@ -17,6 +17,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_CMD_MEMTEST=y > - CONFIG_SYS_ALT_MEMTEST=y > -diff --git a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig > -index e13c7c56f310..e4408f182ca0 100644 > ---- a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig > -+++ b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig > -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_FASTBOOT=y > - CONFIG_FASTBOOT_FLASH=y > -diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig b/configs/xilinx_zynqmp_zcu102_revA_defconfig > -index 5b2cd495ee85..b52f6789fd4b 100644 > ---- a/configs/xilinx_zynqmp_zcu102_revA_defconfig > -+++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig > -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_FASTBOOT=y > - CONFIG_FASTBOOT_FLASH=y > -diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig > -index e6530fbfe7ff..80592554f682 100644 > ---- a/configs/xilinx_zynqmp_zcu102_revB_defconfig > -+++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig > -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_FASTBOOT=y > - CONFIG_FASTBOOT_FLASH=y > --- > -2.7.4 > - > diff --git a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch b/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch > deleted file mode 100644 > index 95ab7b3b75..0000000000 > --- a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch > +++ /dev/null > @@ -1,68 +0,0 @@ > -From c7df098a71e05dc81cee818747759e8060b59626 Mon Sep 17 00:00:00 2001 > -From: Luca Ceresoli > -Date: Mon, 4 Jun 2018 12:21:01 +0200 > -Subject: [PATCH] arm64: zynqmp: accept an absolute path for PMUFW_INIT_FILE > - > -The value of PMUFW_INIT_FILE is prefixed with "$(srctree)/", thus > -forcing it to be a relative path inside the U-Boot source tree. Since > -the PMUFW is a binary file generated outside of U-Boot, the PMUFW > -binary must be copied inside the U-Boot source tree before the > -build. > - > -This generates a few problems: > - > - * if the source tree is shared among different out-of-tree builds, > - they will pollute (and potentially corrupt) each other > - * the source tree cannot be read-only > - * any buildsystem must add a command to copy the PMUFW binary > - * putting an externally-generated binary in the source tree is ugly > - as hell > - > -Avoid these problems by accepting an absolute path for > -PMUFW_INIT_FILE. This would be as simple as removing the "$(srctree)/" > -prefix, but in order to keep backward compatibility we rather use the > -shell and readlink to get the absolute path even when starting from a > -relative path. > - > -Since 'readlink -f' produces an empty string if the file does not > -exist, we also add a check to ensure the file configured in > -PMUFW_INIT_FILE exists. Otherwise the build would exit successfully, > -but produce a boot.bin without PMUFW as if PMUFW_INIT_FILE were empty. > - > -Tested in the 12 possible combinations of: > - - PMUFW_INIT_FILE empty, relative, absolute, non-existing > - - building in-tree, in subdir, in other directory > - > -Signed-off-by: Luca Ceresoli > -Cc: Michal Simek > -Cc: Simon Glass > -Cc: Emmanuel Vadot > -Signed-off-by: Michal Simek > -Backported from upstream: https://git.denx.de/?p=u-boot.git;a=commit;h=c7df098a71e05dc81cee818747759e8060b59626 > ---- > - scripts/Makefile.spl | 8 +++++++- > - 1 file changed, 7 insertions(+), 1 deletion(-) > - > -diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl > -index ef018b5b4056..252f13826d4c 100644 > ---- a/scripts/Makefile.spl > -+++ b/scripts/Makefile.spl > -@@ -167,8 +167,14 @@ ifdef CONFIG_ARCH_ZYNQ > - MKIMAGEFLAGS_boot.bin = -T zynqimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) > - endif > - ifdef CONFIG_ARCH_ZYNQMP > -+ifneq ($(CONFIG_PMUFW_INIT_FILE),"") > -+spl/boot.bin: zynqmp-check-pmufw > -+zynqmp-check-pmufw: FORCE > -+ ( cd $(srctree) && test -r $(CONFIG_PMUFW_INIT_FILE) ) \ > -+ || ( echo "Cannot read $(CONFIG_PMUFW_INIT_FILE)" && false ) > -+endif > - MKIMAGEFLAGS_boot.bin = -T zynqmpimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) \ > -- -n $(srctree)/$(CONFIG_PMUFW_INIT_FILE) > -+ -n "$(shell cd $(srctree); readlink -f $(CONFIG_PMUFW_INIT_FILE))" > - endif > - > - spl/boot.bin: $(obj)/u-boot-spl.bin FORCE > --- > -2.7.4 > - > diff --git a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch b/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch > deleted file mode 100644 > index b32e162780..0000000000 > --- a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch > +++ /dev/null > @@ -1,175 +0,0 @@ > -From 4c9d54ab5a41d65000c8d249b6fb1b76056f1812 Mon Sep 17 00:00:00 2001 > -From: Luca Ceresoli > -Date: Wed, 20 Jun 2018 12:11:50 +0200 > -Subject: [PATCH] arm/arm64: zynq/zynqmp: pass the PS init file as a kconfig > - variable > - > -U-Boot needs to link ps7_init_gpl.c on Zynq or psu_init_gpl.c on > -ZynqMP (PS init for short). The current logic to locate this file for > -both platforms is: > - > - 1. if a board-specific file exists in > - board/xilinx/zynq[mp]/$(CONFIG_DEFAULT_DEVICE_TREE)/ps?_init_gpl.c > - then use it > - 2. otherwise use board/xilinx/zynq/ps?_init_gpl.c > - > -In the latter case the file does not exist in the U-Boot sources and > -must be copied in the source tree from the outside before starting the > -build. This is typical when it is generated from Xilinx tools while > -developing a custom hardware. However making sure that a > -board-specific file is _not_ found (and used) requires some trickery > -such as removing or overwriting all PS init files (e.g.: the current > -meta-xilinx yocto layer [0]). > - > -This generates a few problems: > - > - * if the source tree is shared among different out-of-tree builds, > - they will pollute (and potentially corrupt) each other > - * the source tree cannot be read-only > - * any buildsystem must add a command to copy the PS init file binary > - * overwriting or deleting files in the source tree is ugly as hell > - > -Simplify usage by allowing to pass the path to the desired PS init > -file in kconfig variable XILINX_PS_INIT_FILE. It can be an absolute > -path or relative to $(srctree). If the variable is set, the > -user-specified file will always be used without being copied > -around. If the the variable is left empty, for backward compatibility > -fall back to the old behaviour. > - > -Since the issue is the same for Zynq and ZynqMP, add one kconfig > -variable in a common place and use it for both. > - > -Also use the new kconfig help text to document all the ways to give > -U-Boot the PS init file. > - > -Build-tested with all combinations of: > - - platform: zynq or zynqmp > - - PS init file: from XILINX_PS_INIT_FILE (absolute, relative path, > - non-existing), in-tree board-specific, in board/xilinx/zynq[mp]/ > - - building in-tree, in subdir, in other directory > - > -[0] https://github.com/Xilinx/meta-xilinx/blob/b2f74cc7fe5c4881589d5e440a17cb51fc66a7ab/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init.inc#L9 > - > -Signed-off-by: Luca Ceresoli > -Cc: Albert Aribaud > -Cc: Michal Simek > -Cc: Nathan Rossi > -Backported from upstream: https://git.denx.de/?p=u-boot.git;a=commit;h=6da4f67ad09cd8b311d77b2b04e557b7ef65b56c > ---- > - arch/arm/Kconfig | 1 + > - board/xilinx/Kconfig | 41 +++++++++++++++++++++++++++++++++++++++++ > - board/xilinx/zynq/Makefile | 10 +++++++++- > - board/xilinx/zynqmp/Makefile | 10 +++++++++- > - 4 files changed, 60 insertions(+), 2 deletions(-) > - create mode 100644 board/xilinx/Kconfig > - > -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig > -index 22234cde2ab6..e04979d0ef7e 100644 > ---- a/arch/arm/Kconfig > -+++ b/arch/arm/Kconfig > -@@ -1293,4 +1293,5 @@ source "board/technologic/ts4600/Kconfig" > - source "board/vscom/baltos/Kconfig" > - source "board/woodburn/Kconfig" > - source "board/work-microwave/work_92105/Kconfig" > -+source "board/xilinx/Kconfig" > - source "board/zipitz2/Kconfig" > - > - source "arch/arm/Kconfig.debug" > -diff --git a/board/xilinx/Kconfig b/board/xilinx/Kconfig > -new file mode 100644 > -index 000000000000..aa3fa061edef > ---- /dev/null > -+++ b/board/xilinx/Kconfig > -@@ -0,0 +1,41 @@ > -+# Copyright (c) 2018, Luca Ceresoli > -+# > -+# SPDX-License-Identifier: GPL-2.0 > -+ > -+if ARCH_ZYNQ || ARCH_ZYNQMP > -+ > -+config XILINX_PS_INIT_FILE > -+ string "Zynq/ZynqMP PS init file(s) location" > -+ help > -+ On Zynq and ZynqMP U-Boot SPL (or U-Boot proper if > -+ ZYNQMP_PSU_INIT_ENABLED is set) is responsible for some > -+ basic initializations, such as enabling peripherals and > -+ configuring pinmuxes. The PS init file (called > -+ psu_init_gpl.c on ZynqMP, ps7_init_gpl.c for Zynq-7000) > -+ contains the code for such initializations. > -+ > -+ U-Boot contains PS init files for some boards, but each of > -+ them describes only one specific configuration. Users of a > -+ different board, or needing a different configuration, can > -+ generate custom files using the Xilinx development tools. > -+ > -+ There are three ways to give a PS init file to U-Boot: > -+ > -+ 1. Set this variable to the path, either relative to the > -+ source tree or absolute, where the psu_init_gpl.c or > -+ ps7_init_gpl.c file is located. U-Boot will build this > -+ file. > -+ > -+ 2. If you leave an empty string here, U-Boot will use > -+ board/xilinx/zynq/$(CONFIG_DEFAULT_DEVICE_TREE)/ps7_init_gpl.c > -+ for Zynq-7000, or > -+ board/xilinx/zynqmp/$(CONFIG_DEFAULT_DEVICE_TREE)/psu_init_gpl.c > -+ for ZynqMP. > -+ > -+ 3. If the above file does not exist, U-Boot will use > -+ board/xilinx/zynq/ps7_init_gpl.c for Zynq-7000, or > -+ board/xilinx/zynqmp/psu_init_gpl.c for ZynqMP. This file > -+ is not provided by U-Boot, you have to copy it there > -+ before the build. > -+ > -+endif > -diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile > -index 5a76a26720cd..03ad5f0532ee 100644 > ---- a/board/xilinx/zynq/Makefile > -+++ b/board/xilinx/zynq/Makefile > -@@ -5,10 +5,18 @@ > - > - obj-y := board.o > - > --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) > -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") > -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE)) > -+init-objs := ps_init_gpl.o > -+spl/board/xilinx/zynq/ps_init_gpl.o board/xilinx/zynq/ps_init_gpl.o: $(PS_INIT_FILE) > -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ > -+endif > - > -+ifeq ($(init-objs),) > -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) > - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/ps7_init_gpl.c),\ > - $(hw-platform-y)/ps7_init_gpl.o) > -+endif > - > - ifeq ($(init-objs),) > - ifneq ($(wildcard $(srctree)/$(src)/ps7_init_gpl.c),) > -diff --git a/board/xilinx/zynqmp/Makefile b/board/xilinx/zynqmp/Makefile > -index 05ccd25dcef3..960b81fc5853 100644 > ---- a/board/xilinx/zynqmp/Makefile > -+++ b/board/xilinx/zynqmp/Makefile > -@@ -5,10 +5,18 @@ > - > - obj-y := zynqmp.o > - > --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) > -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") > -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE)) > -+init-objs := ps_init_gpl.o > -+spl/board/xilinx/zynqmp/ps_init_gpl.o board/xilinx/zynqmp/ps_init_gpl.o: $(PS_INIT_FILE) > -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ > -+endif > - > -+ifeq ($(init-objs),) > -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) > - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/psu_init_gpl.c),\ > - $(hw-platform-y)/psu_init_gpl.o) > -+endif > - > - ifeq ($(init-objs),) > - ifneq ($(wildcard $(srctree)/$(src)/psu_init_gpl.c),) > --- > -2.7.4 > - > diff --git a/board/zynqmp/pm_cfg_obj.c b/board/zynqmp/pm_cfg_obj.c > new file mode 100644 > index 0000000000..7566b3236a > --- /dev/null > +++ b/board/zynqmp/pm_cfg_obj.c > @@ -0,0 +1,614 @@ > +/****************************************************************************** > +* Copyright (c) 2017 - 2020 Xilinx, Inc. All rights reserved. > +* SPDX-License-Identifier: MIT > +******************************************************************************/ > + > + > +#include "xil_types.h" > +#include "pm_defs.h" > + > +#define PM_CONFIG_MASTER_SECTION_ID 0x101U > +#define PM_CONFIG_SLAVE_SECTION_ID 0x102U > +#define PM_CONFIG_PREALLOC_SECTION_ID 0x103U > +#define PM_CONFIG_POWER_SECTION_ID 0x104U > +#define PM_CONFIG_RESET_SECTION_ID 0x105U > +#define PM_CONFIG_SHUTDOWN_SECTION_ID 0x106U > +#define PM_CONFIG_SET_CONFIG_SECTION_ID 0x107U > +#define PM_CONFIG_GPO_SECTION_ID 0x108U > + > +#define PM_SLAVE_FLAG_IS_SHAREABLE 0x1U > +#define PM_MASTER_USING_SLAVE_MASK 0x2U > + > +#define PM_CONFIG_GPO1_MIO_PIN_34_MAP (1U << 10U) > +#define PM_CONFIG_GPO1_MIO_PIN_35_MAP (1U << 11U) > +#define PM_CONFIG_GPO1_MIO_PIN_36_MAP (1U << 12U) > +#define PM_CONFIG_GPO1_MIO_PIN_37_MAP (1U << 13U) > + > +#define PM_CONFIG_GPO1_BIT_2_MASK (1U << 2U) > +#define PM_CONFIG_GPO1_BIT_3_MASK (1U << 3U) > +#define PM_CONFIG_GPO1_BIT_4_MASK (1U << 4U) > +#define PM_CONFIG_GPO1_BIT_5_MASK (1U << 5U) > + > +#define SUSPEND_TIMEOUT 0xFFFFFFFFU > + > + > +#define PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK 0x00000001 > +#define PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK 0x00000100 > +#define PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK 0x00000200 > + > + > + > +#if defined (__ICCARM__) > +#pragma language=save > +#pragma language=extended > +#endif > +#if defined (__GNUC__) > + const u32 XPm_ConfigObject[] __attribute__((used, section(".sys_cfg_data"))) = > +#elif defined (__ICCARM__) > +#pragma location = ".sys_cfg_data" > +__root const u32 XPm_ConfigObject[] = > +#endif > +{ > + /**********************************************************************/ > + /* HEADER */ > + 1, /* Number of remaining words in the header */ > + 8, /* Number of sections included in config object */ > + /**********************************************************************/ > + /* MASTER SECTION */ > + PM_CONFIG_MASTER_SECTION_ID, /* Master SectionID */ > + 3U, /* No. of Masters*/ > + > + NODE_APU, /* Master Node ID */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask of this master */ > + SUSPEND_TIMEOUT, /* Suspend timeout */ > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ > + > + NODE_RPU_0, /* Master Node ID */ > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask of this master */ > + SUSPEND_TIMEOUT, /* Suspend timeout */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ > + > + NODE_RPU_1, /* Master Node ID */ > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask of this master */ > + SUSPEND_TIMEOUT, /* Suspend timeout */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Suspend permissions */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Wake permissions */ > + > + > + /**********************************************************************/ > + /* SLAVE SECTION */ > + > + > + PM_CONFIG_SLAVE_SECTION_ID, /* Section ID */ > + 49, /* Number of slaves */ > + > + NODE_OCM_BANK_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_OCM_BANK_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_OCM_BANK_2, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_OCM_BANK_3, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_TCM_0_A, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ > + > + NODE_TCM_0_B, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ > + > + NODE_TCM_1_A, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_TCM_1_B, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_L2, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_GPU_PP_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_GPU_PP_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_USB_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_USB_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_TTC_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_TTC_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_TTC_2, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_TTC_3, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_SATA, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_ETH_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_ETH_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_ETH_2, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_ETH_3, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_UART_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_UART_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_SPI_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_SPI_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_I2C_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_I2C_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_SD_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_SD_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_DP, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_GDMA, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_ADMA, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_NAND, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_QSPI, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_GPIO, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_CAN_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_CAN_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_EXTERN, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_DDR, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_IPI_APU, > + 0U, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask */ > + > + NODE_IPI_RPU_0, > + 0U, > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ > + > + NODE_IPI_RPU_1, > + 0U, > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_GPU, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_PCIE, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_PCAP, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_RTC, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_VCU, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_PL, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + > + /**********************************************************************/ > + /* PREALLOC SECTION */ > + > + PM_CONFIG_PREALLOC_SECTION_ID, /* Preallaoc SectionID */ > + 3U, /* No. of Masters*/ > + > +/* Prealloc for psu_cortexa53_0 */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, > + 12, > + NODE_DDR, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_L2, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_0, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_2, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_3, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_I2C_0, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_I2C_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_SD_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_QSPI, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_PL, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_IPI_APU, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + > + /* Prealloc for psu_cortexr5_0 */ > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, > + 14, > + NODE_TCM_0_A, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_TCM_0_B, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_DDR, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_0, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_2, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_3, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_I2C_0, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_I2C_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_SD_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_QSPI, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_PL, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_ADMA, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_IPI_RPU_0, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + > + /* Prealloc for psu_cortexr5_1 */ > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + 3, > + NODE_TCM_1_A, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_TCM_1_B, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_IPI_RPU_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + > + /**********************************************************************/ > + /* POWER SECTION */ > + > + PM_CONFIG_POWER_SECTION_ID, /* Power Section ID */ > + 4U, /* Number of power nodes */ > + > + NODE_APU, /* Power node ID */ > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ > + > + NODE_RPU, /* Power node ID */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ > + > + NODE_FPD, /* Power node ID */ > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ > + > + NODE_PLD, /* Power node ID */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ > + > + > + /**********************************************************************/ > + /* RESET SECTION */ > + > + PM_CONFIG_RESET_SECTION_ID, /* Reset Section ID */ > + 120U, /* Number of resets */ > + > + XILPM_RESET_PCIE_CFG, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_PCIE_BRIDGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_PCIE_CTRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_DP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SWDT_CRF, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_AFI_FM5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_AFI_FM4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_AFI_FM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_AFI_FM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_AFI_FM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_AFI_FM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GDMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPU_PP1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPU_PP0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPU, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SATA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU3_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU2_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU1_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU0_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_APU_L2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_DDR, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_APM_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SOFT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GEM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GEM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GEM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GEM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_QSPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_UART0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_UART1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SPI0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SPI1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SDIO0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SDIO1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_CAN0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_CAN1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_I2C0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_I2C1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_TTC0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_TTC1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_TTC2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_TTC3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SWDT_CRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_NAND, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ADMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPIO, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_IOU_CC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_TIMESTAMP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPU_R50, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPU_R51, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPU_AMBA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_OCM, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPU_PGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_USB0_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_USB1_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_USB0_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_USB1_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_USB0_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_USB1_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_IPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_APM_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RTC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SYSMON, 0, > + XILPM_RESET_AFI_FM6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_LPD_SWDT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_FPD, PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, > + XILPM_RESET_RPU_DBG1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPU_DBG0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_DBG_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_DBG_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_APLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_DPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_VPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_IOPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_7, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_8, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_9, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_10, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_11, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_12, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_13, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_14, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_15, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_16, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_17, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_18, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_19, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_20, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_21, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_22, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_23, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_24, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_25, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_26, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_27, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_28, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_29, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_30, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_31, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPU_LS, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_PS_ONLY, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_PL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPIO5_EMIO_92, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPIO5_EMIO_93, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPIO5_EMIO_94, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPIO5_EMIO_95, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + > + /**********************************************************************/ > + /* SET CONFIG SECTION */ > + PM_CONFIG_SET_CONFIG_SECTION_ID, /* Section ID */ > + 0, /* Permissions to set config */ > + /**********************************************************************/ > + /* SHUTDOWN SECTION */ > + PM_CONFIG_SHUTDOWN_SECTION_ID, /* Section ID */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* System Shutdown/Restart Permission */ > + > + /**********************************************************************/ > + /* GPO SECTION */ > + PM_CONFIG_GPO_SECTION_ID, /* GPO Section ID */ > + PM_CONFIG_GPO1_BIT_2_MASK | > + PM_CONFIG_GPO1_MIO_PIN_34_MAP | > + PM_CONFIG_GPO1_MIO_PIN_35_MAP | > + PM_CONFIG_GPO1_MIO_PIN_36_MAP | > + PM_CONFIG_GPO1_MIO_PIN_37_MAP | > + 0, /* State of GPO pins */ > +}; > +#if defined (__ICCARM__) > +#pragma language=restore > +#endif > diff --git a/board/zynqmp/post-build.sh b/board/zynqmp/post-build.sh > new file mode 100755 > index 0000000000..9fd8bbf2c8 > --- /dev/null > +++ b/board/zynqmp/post-build.sh > @@ -0,0 +1,8 @@ > +#!/bin/sh > + > +# genimage will need to find the extlinux.conf > +# in the binaries directory > + > +BOARD_DIR="$(dirname $0)" > + > +install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux.conf > diff --git a/board/zynqmp/post-image.sh b/board/zynqmp/post-image.sh > index b2b99fed01..ed6dbe188c 100755 > --- a/board/zynqmp/post-image.sh > +++ b/board/zynqmp/post-image.sh > @@ -10,4 +10,6 @@ FIRST_DT=$(sed -nr \ > > [ -z "${FIRST_DT}" ] || ln -fs ${FIRST_DT}.dtb ${BINARIES_DIR}/system.dtb > > -support/scripts/genimage.sh -c board/zynqmp/genimage.cfg > +BOARD_DIR="$(dirname $0)" > + > +support/scripts/genimage.sh -c $BOARD_DIR/genimage.cfg > diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig > index bee7c1daf7..2026f60bd1 100644 > --- a/configs/zynqmp_zcu106_defconfig > +++ b/configs/zynqmp_zcu106_defconfig > @@ -1,34 +1,39 @@ > BR2_aarch64=y > -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_GIT=y > BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" > -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.15" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > # BR2_TARGET_ROOTFS_TAR is not set > BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.6" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" > -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7" > -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA" > +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2022.01" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" > BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > BR2_TARGET_UBOOT_SPL=y > BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" > BR2_TARGET_UBOOT_ZYNQMP=y > -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/53fdb7b6c92860ceb0ec5fd14deee302f4a84269/bin/pmufw-zcu106-default-v2017.4.bin" > +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/v2021.2/bin/pmufw-v2021.2.bin" > +BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/pm_cfg_obj.c" > +BR2_TARGET_UBOOT_FORMAT_ITB=y > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > BR2_PACKAGE_HOST_DOSFSTOOLS=y > BR2_PACKAGE_HOST_GENIMAGE=y > BR2_PACKAGE_HOST_MTOOLS=y > -- > 2.17.1 > As other patch please send V4 and add my Reviewed-by and Tested-by Thank you! Best regards Giulio From yann.morin.1998 at free.fr Wed Feb 9 20:55:27 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 21:55:27 +0100 Subject: [Buildroot] [PATCH 1/5 v2] package/pkg-cargo: allow packages to define download environment In-Reply-To: <20220209205259.725e17c2@windsurf> References: <9354_1644422930_6203E712_9354_383_11_2d5b77c2a90cf722e007a5bf3ed4227d2bd1fda6.1644422916.git.yann.morin@orange.com> <20220209205259.725e17c2@windsurf> Message-ID: <20220209205527.GD2249818@scaer> Thomas, All, On 2022-02-09 20:52 +0100, Thomas Petazzoni via buildroot spake thusly: > On Wed, 9 Feb 2022 17:08:43 +0100 > wrote: > > $(2)_DOWNLOAD_POST_PROCESS = cargo > > -$(2)_DL_ENV = CARGO_HOME=$$(HOST_DIR)/share/cargo > > +$(2)_DL_ENV += CARGO_HOME=$$(HOST_DIR)/share/cargo > > But, but, then, how is: > > PYTHON_CRYPTOGRAPHY_DL_ENV = \ > BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml > > currently working? Because, its the name implies, it is a python-package, not a cargo-package. Yeah, I got puzzled too. ;-) Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Feb 9 21:33:12 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:33:12 +0100 Subject: [Buildroot] [PATCH 000/107] Drop python 2.7 In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209213312.GE2249818@scaer> Peter ,All, On 2022-02-09 17:50 +0100, Peter Korsgaard spake thusly: > Python 2.7 is EOL since April 2020 and almost all packages support > python 3, so drop it before the 2022.02 release. > > It is a big series, but the changes are mainly mechanical in nature. > > There is still some cleanup to do, E.G. the python2 support in > pkg-python and the host python-setuptools package - But this is IMHO > the minimum changes before -rc1. > > Peter Korsgaard (107): ... > package/python: drop target package ... > package/python: drop host package ... > docs/manual: drop python2 references All 107 patches applied, thanks! I'll reply further to two of them, with ultra-minor nits. Pfew, 21st century, here we come at last! ;-) Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Feb 9 21:07:45 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:07:45 +0100 Subject: [Buildroot] [git commit] package/cifs-utils: drop python2 support Message-ID: <20220209212559.6E9458323E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=66dbb7476390ddc939dc3ae7f7ea1ea71fa6153e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/cifs-utils/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/cifs-utils/Config.in b/package/cifs-utils/Config.in index f15d1e3dc4..d1b1406a3e 100644 --- a/package/cifs-utils/Config.in +++ b/package/cifs-utils/Config.in @@ -21,7 +21,7 @@ config BR2_PACKAGE_CIFS_UTILS_SMBTOOLS depends on BR2_USE_WCHAR # python3 depends on BR2_TOOLCHAIN_HAS_THREADS # python3 depends on !BR2_STATIC_LIBS # python3 - select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON # runtime + select BR2_PACKAGE_PYTHON3 # runtime help Install the smb tools smbinfo and smb2-quota (python implementations). From yann.morin.1998 at free.fr Wed Feb 9 21:07:40 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:07:40 +0100 Subject: [Buildroot] [git commit] package/bmap-tools: drop python2 support Message-ID: <20220209212559.5C9AB81335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=611e04609bea5fbe9f3616504d04f747653a789e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/bmap-tools/Config.in | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package/bmap-tools/Config.in b/package/bmap-tools/Config.in index 83b4d92786..91081069c7 100644 --- a/package/bmap-tools/Config.in +++ b/package/bmap-tools/Config.in @@ -1,8 +1,7 @@ config BR2_PACKAGE_BMAP_TOOLS bool "bmap-tools" - depends on BR2_PACKAGE_PYTHON3 || BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime, pkg_resources select BR2_PACKAGE_PYTHON_SIX # runtime help From yann.morin.1998 at free.fr Wed Feb 9 21:08:08 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:08:08 +0100 Subject: [Buildroot] [git commit] package/gst1-devtools: drop python2 support Message-ID: <20220209212559.C3BAD81335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c4bbd6da50488944debba29e195557e5b345f2b1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/gstreamer1/gst1-devtools/Config.in | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package/gstreamer1/gst1-devtools/Config.in b/package/gstreamer1/gst1-devtools/Config.in index 55cf25d53e..3f39beff53 100644 --- a/package/gstreamer1/gst1-devtools/Config.in +++ b/package/gstreamer1/gst1-devtools/Config.in @@ -1,11 +1,10 @@ config BR2_PACKAGE_GST1_DEVTOOLS bool "gst1-devtools" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_GSTREAMER1_CHECK select BR2_PACKAGE_GST1_PLUGINS_BASE select BR2_PACKAGE_JSON_GLIB - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_PYEXPAT # cairo is autodetected but needs PNG support select BR2_PACKAGE_CAIRO_PNG if BR2_PACKAGE_CAIRO help @@ -14,5 +13,4 @@ config BR2_PACKAGE_GST1_DEVTOOLS https://gstreamer.freedesktop.org comment "gst1-devtools depends on python" - depends on !BR2_PACKAGE_PYTHON depends on !BR2_PACKAGE_PYTHON3 From yann.morin.1998 at free.fr Wed Feb 9 21:08:26 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:08:26 +0100 Subject: [Buildroot] [git commit] package/libiio: drop python2 support Message-ID: <20220209212600.1192C8323E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5ac65831d5b6434dfaa42c0278cb0ae19bdc1d4e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/libiio/Config.in | 2 +- package/libiio/libiio.mk | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/package/libiio/Config.in b/package/libiio/Config.in index 0d89331c89..98d663e203 100644 --- a/package/libiio/Config.in +++ b/package/libiio/Config.in @@ -91,7 +91,7 @@ config BR2_PACKAGE_LIBIIO_BINDINGS_CSHARP config BR2_PACKAGE_LIBIIO_BINDINGS_PYTHON bool "Install Python bindings" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 help Install the Python bindings. diff --git a/package/libiio/libiio.mk b/package/libiio/libiio.mk index a4fe0d4541..48e2f385e3 100644 --- a/package/libiio/libiio.mk +++ b/package/libiio/libiio.mk @@ -73,14 +73,10 @@ LIBIIO_CONF_OPTS += -DHAVE_DNS_SD=OFF 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 +LIBIIO_CONF_OPTS += \ + -DPYTHON_BINDINGS=ON + -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 else LIBIIO_CONF_OPTS += -DPYTHON_BINDINGS=OFF endif From yann.morin.1998 at free.fr Wed Feb 9 21:07:38 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:07:38 +0100 Subject: [Buildroot] [git commit] package/alsa-lib: drop python2 support Message-ID: <20220209212559.52ACA8323E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5dd2cdd10f579059d01167d9a427b5cfea0bea2d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/alsa-lib/Config.in | 2 +- package/alsa-lib/alsa-lib.mk | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/package/alsa-lib/Config.in b/package/alsa-lib/Config.in index 4168d1f220..af3de984d9 100644 --- a/package/alsa-lib/Config.in +++ b/package/alsa-lib/Config.in @@ -22,7 +22,7 @@ if BR2_PACKAGE_ALSA_LIB config BR2_PACKAGE_ALSA_LIB_PYTHON bool "Python support for alsa-lib" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 help Add python support for alsa-lib. Python will be built and libpython will be installed diff --git a/package/alsa-lib/alsa-lib.mk b/package/alsa-lib/alsa-lib.mk index b5cd3f0d13..5d12f5e6d8 100644 --- a/package/alsa-lib/alsa-lib.mk +++ b/package/alsa-lib/alsa-lib.mk @@ -61,20 +61,11 @@ endif ifeq ($(BR2_PACKAGE_ALSA_LIB_PYTHON),y) ALSA_LIB_CONF_OPTS += \ - --enable-mixer-pymods -ifeq ($(BR2_PACKAGE_PYTHON),y) -ALSA_LIB_CONF_OPTS += \ - --with-pythonlibs=-lpython$(PYTHON_VERSION_MAJOR) \ - --with-pythonincludes=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) -ALSA_LIB_CFLAGS += -I$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) -ALSA_LIB_DEPENDENCIES += python -else -ALSA_LIB_CONF_OPTS += \ + --enable-mixer-pymods \ --with-pythonlibs=-lpython$(PYTHON3_VERSION_MAJOR) \ --with-pythonincludes=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) ALSA_LIB_CFLAGS += -I$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) ALSA_LIB_DEPENDENCIES += python3 -endif else ALSA_LIB_CONF_OPTS += --disable-python endif From yann.morin.1998 at free.fr Wed Feb 9 21:07:35 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:07:35 +0100 Subject: [Buildroot] [git commit] package/python: drop target package Message-ID: <20220209212559.48F1E8323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=306839586bbff4b026aae7fee5a8d551f223f63f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Python 2.7 is EOL since April 2020, so drop support for the target package. https://www.python.org/dev/peps/pep-0373/ Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Config.in.legacy | 8 +++ package/Config.in | 3 +- package/python/Config.in | 139 ----------------------------------------------- 3 files changed, 9 insertions(+), 141 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 34d8c71cc8..6bc3803a5c 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,14 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON + bool "python2.7 package removed" + select BR2_LEGACY + help + Python 2.7 is EOL since April 2020 and has been removed. + + https://www.python.org/dev/peps/pep-0373/ + config BR2_TARGET_UBOOT_ZYNQ_IMAGE bool "Generate image for Xilinx Zynq" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index d631ed784a..ca2fb363e3 100644 --- a/package/Config.in +++ b/package/Config.in @@ -897,9 +897,8 @@ if BR2_STATIC_LIBS comment "External PHP extensions need a toolchain w/ dynamic library" endif endif - source "package/python/Config.in" source "package/python3/Config.in" -if BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 +if BR2_PACKAGE_PYTHON3 menu "External python modules" source "package/python-aenum/Config.in" source "package/python-aexpect/Config.in" diff --git a/package/python/Config.in b/package/python/Config.in deleted file mode 100644 index ab6950cae8..0000000000 --- a/package/python/Config.in +++ /dev/null @@ -1,139 +0,0 @@ -comment "python needs a toolchain w/ wchar, threads, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS - -config BR2_PACKAGE_PYTHON - bool "python2.7 (deprecated)" - depends on BR2_USE_WCHAR - # uses fork() - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_THREADS # libffi - depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_LIBFFI - help - The python language interpreter. - - http://www.python.org/ - -if BR2_PACKAGE_PYTHON - -choice - prompt "python module format to install" - default BR2_PACKAGE_PYTHON_PYC_ONLY - help - Select Python module format to install on target (py, pyc or - both) - -config BR2_PACKAGE_PYTHON_PY_ONLY - bool ".py sources only" - -config BR2_PACKAGE_PYTHON_PYC_ONLY - bool ".pyc compiled sources only" - -config BR2_PACKAGE_PYTHON_PY_PYC - bool ".py sources and .pyc compiled" - -endchoice - -menu "core python modules" - -comment "The following modules are unusual or require extra libraries" - -config BR2_PACKAGE_PYTHON_2TO3 - bool "2to3 module" - help - code translation from python 2 to 3 - -config BR2_PACKAGE_PYTHON_BZIP2 - bool "bzip2 module" - select BR2_PACKAGE_BZIP2 - help - bzip2 module for Python - -config BR2_PACKAGE_PYTHON_BSDDB - bool "bsddb module" - select BR2_PACKAGE_BERKELEYDB - help - bsddb module for Python. - -config BR2_PACKAGE_PYTHON_CODECSCJK - bool "codecscjk module" - help - Chinese/Japanese/Korean codecs module for Python (large). - -config BR2_PACKAGE_PYTHON_CURSES - bool "curses module" - select BR2_PACKAGE_NCURSES - help - curses module for Python. - -config BR2_PACKAGE_PYTHON_OSSAUDIODEV - bool "ossaudiodev module" - help - ossaudiodev module for Python. - -config BR2_PACKAGE_PYTHON_READLINE - bool "readline" - select BR2_PACKAGE_READLINE - help - readline module for Python (required for command-line - editing in the Python shell). - -config BR2_PACKAGE_PYTHON_SSL - bool "ssl" - select BR2_PACKAGE_OPENSSL - help - _ssl module for Python (required for https in urllib etc). - -config BR2_PACKAGE_PYTHON_UNICODEDATA - bool "unicodedata module" - default y - help - Unicode character database (used by stringprep module) - (large). - -if BR2_PACKAGE_PYTHON_UNICODEDATA - -choice - prompt "Python unicode database format" - default BR2_PACKAGE_PYTHON_UCS2 - help - Select Python unicode database format for target - -config BR2_PACKAGE_PYTHON_UCS2 - bool "Universal Character Set 2-byte (UCS2)" - -config BR2_PACKAGE_PYTHON_UCS4 - bool "Universal Character Set 4-byte (UCS4)" - -endchoice - -endif - -config BR2_PACKAGE_PYTHON_SQLITE - bool "sqlite module" - select BR2_PACKAGE_SQLITE - help - SQLite database support - -config BR2_PACKAGE_PYTHON_PYEXPAT - bool "xml module" - select BR2_PACKAGE_EXPAT - help - pyexpat and xml libraries for Python - -config BR2_PACKAGE_PYTHON_ZLIB - bool "zlib module" - select BR2_PACKAGE_ZLIB - help - zlib support in Python - -config BR2_PACKAGE_PYTHON_HASHLIB - bool "hashlib module" - select BR2_PACKAGE_OPENSSL - help - hashlib support in Python - -endmenu - -endif From yann.morin.1998 at free.fr Wed Feb 9 21:08:24 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:08:24 +0100 Subject: [Buildroot] [git commit] package/libftdi1: drop python2 support Message-ID: <20220209212600.09EE68323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1a1db54c309ac1509ddffd26da35313ac923202a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/libftdi1/Config.in | 2 +- package/libftdi1/libftdi1.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libftdi1/Config.in b/package/libftdi1/Config.in index 2d32573563..ec91366115 100644 --- a/package/libftdi1/Config.in +++ b/package/libftdi1/Config.in @@ -24,7 +24,7 @@ comment "libftdipp1 needs a toolchain w/ C++, wchar" config BR2_PACKAGE_LIBFTDI1_PYTHON_BINDINGS bool "python bindings" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 help Python bindings for libftdi diff --git a/package/libftdi1/libftdi1.mk b/package/libftdi1/libftdi1.mk index 6688694b47..d2e3f42e14 100644 --- a/package/libftdi1/libftdi1.mk +++ b/package/libftdi1/libftdi1.mk @@ -24,7 +24,7 @@ LIBFTDI1_CONF_OPTS += -DFTDIPP=OFF endif ifeq ($(BR2_PACKAGE_LIBFTDI1_PYTHON_BINDINGS),y) -LIBFTDI1_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,python3) host-swig +LIBFTDI1_DEPENDENCIES += python3 host-swig LIBFTDI1_CONF_OPTS += -DPYTHON_BINDINGS=ON else LIBFTDI1_CONF_OPTS += -DPYTHON_BINDINGS=OFF From yann.morin.1998 at free.fr Wed Feb 9 21:08:36 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:08:36 +0100 Subject: [Buildroot] [git commit] package/lttng-libust: drop python2 support Message-ID: <20220209212600.356218323E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ba163dea744630f6af915c3428f5f5d510437e0e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/lttng-libust/lttng-libust.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/package/lttng-libust/lttng-libust.mk b/package/lttng-libust/lttng-libust.mk index ef7d1a6200..7ead28052e 100644 --- a/package/lttng-libust/lttng-libust.mk +++ b/package/lttng-libust/lttng-libust.mk @@ -20,10 +20,7 @@ LTTNG_LIBUST_AUTORECONF = YES # https://www.mail-archive.com/lttng-dev at lists.lttng.org/msg12950.html LTTNG_LIBUST_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -DUATOMIC_NO_LINK_ERROR" -ifeq ($(BR2_PACKAGE_PYTHON),y) -LTTNG_LIBUST_DEPENDENCIES += python -LTTNG_LIBUST_CONF_OPTS += --enable-python-agent -else ifeq ($(BR2_PACKAGE_PYTHON3),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) LTTNG_LIBUST_DEPENDENCIES += python3 LTTNG_LIBUST_CONF_OPTS += --enable-python-agent else From yann.morin.1998 at free.fr Wed Feb 9 21:07:47 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:07:47 +0100 Subject: [Buildroot] [git commit] package/cracklib: move python support to python3 Message-ID: <20220209212559.76D6283245@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6ab41d540ef7b88496bf3fe9cb39a1c747f29f3e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The configure script needs a bit of help to detect the python version. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/cracklib/cracklib.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/package/cracklib/cracklib.mk b/package/cracklib/cracklib.mk index 8e6a844f11..46917b7926 100644 --- a/package/cracklib/cracklib.mk +++ b/package/cracklib/cracklib.mk @@ -20,9 +20,12 @@ else CRACKLIB_CONF_OPTS += --without-zlib endif -ifeq ($(BR2_PACKAGE_PYTHON),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) CRACKLIB_CONF_OPTS += --with-python -CRACKLIB_DEPENDENCIES += python +CRACKLIB_CONF_ENV += \ + ac_cv_path_PYTHON=$(HOST_DIR)/bin/python3 \ + am_cv_python_version=$(PYTHON3_VERSION_MAJOR) +CRACKLIB_DEPENDENCIES += python3 else CRACKLIB_CONF_OPTS += --without-python endif From yann.morin.1998 at free.fr Wed Feb 9 21:07:52 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:07:52 +0100 Subject: [Buildroot] [git commit] package/dbus-python: drop python2 support Message-ID: <20220209212559.87CDF8323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cf47c53f80a6ab82971b70b5475ecc26beffeef7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/dbus-python/Config.in | 8 +++----- package/dbus-python/dbus-python.mk | 28 ++++------------------------ 2 files changed, 7 insertions(+), 29 deletions(-) diff --git a/package/dbus-python/Config.in b/package/dbus-python/Config.in index 4bfb59ed91..76453e168a 100644 --- a/package/dbus-python/Config.in +++ b/package/dbus-python/Config.in @@ -3,16 +3,14 @@ config BR2_PACKAGE_DBUS_PYTHON depends on BR2_USE_WCHAR # glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 depends on BR2_PACKAGE_DBUS - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_LIBGLIB2 - # pyexpat: runtime dependency only - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime help Python bindings for D-Bus http://dbus.freedesktop.org/doc/dbus-python/ comment "dbus-python needs a toolchain w/ wchar, threads" - depends on BR2_PACKAGE_DBUS && (BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3) + depends on BR2_PACKAGE_DBUS && BR2_PACKAGE_PYTHON3 depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/dbus-python/dbus-python.mk b/package/dbus-python/dbus-python.mk index 3e28aed25c..d9bb30ed67 100644 --- a/package/dbus-python/dbus-python.mk +++ b/package/dbus-python/dbus-python.mk @@ -9,40 +9,20 @@ DBUS_PYTHON_SITE = http://dbus.freedesktop.org/releases/dbus-python DBUS_PYTHON_INSTALL_STAGING = YES DBUS_PYTHON_LICENSE = MIT (dbus-python), AFL-2.1 or GPL-2.0+ (dbus-gmain) DBUS_PYTHON_LICENSE_FILES = COPYING dbus-gmain/COPYING -DBUS_PYTHON_DEPENDENCIES = dbus libglib2 -HOST_DBUS_PYTHON_DEPENDENCIES = host-dbus host-libglib2 +DBUS_PYTHON_DEPENDENCIES = dbus libglib2 python3 host-python3 +HOST_DBUS_PYTHON_DEPENDENCIES = host-dbus host-libglib2 host-python3 -ifeq ($(BR2_PACKAGE_PYTHON),y) -DBUS_PYTHON_DEPENDENCIES += python host-python - -DBUS_PYTHON_CONF_ENV += \ - PYTHON=$(HOST_DIR)/bin/python2 \ - PYTHON_INCLUDES="`$(STAGING_DIR)/usr/bin/python2-config --includes`" \ - PYTHON_LIBS="`$(STAGING_DIR)/usr/bin/python2-config --ldflags`" - -HOST_DBUS_PYTHON_DEPENDENCIES += host-python - -HOST_DBUS_PYTHON_CONF_ENV += \ - PYTHON=$(HOST_DIR)/bin/python2 \ - PYTHON_INCLUDES="`$(HOST_DIR)/usr/bin/python2-config --includes`" \ - PYTHON_LIBS="`$(HOST_DIR)/usr/bin/python2-config --ldflags`" -else -DBUS_PYTHON_DEPENDENCIES += python3 host-python3 - -DBUS_PYTHON_CONF_ENV += \ +DBUS_PYTHON_CONF_ENV = \ PYTHON=$(HOST_DIR)/bin/python3 \ PYTHON_INCLUDES="`$(STAGING_DIR)/usr/bin/python3-config --includes`" \ PYTHON_LIBS="`$(STAGING_DIR)/usr/bin/python3-config --ldflags`" \ PYTHON_EXTRA_LIBS="`$(STAGING_DIR)/usr/bin/python3-config --libs --embed`" -HOST_DBUS_PYTHON_DEPENDENCIES += host-python3 - -HOST_DBUS_PYTHON_CONF_ENV += \ +HOST_DBUS_PYTHON_CONF_ENV = \ PYTHON=$(HOST_DIR)/bin/python3 \ PYTHON_INCLUDES="`$(HOST_DIR)/usr/bin/python3-config --includes`" \ PYTHON_LIBS="`$(HOST_DIR)/usr/bin/python3-config --ldflags`" \ PYTHON_EXTRA_LIBS="`$(HOST_DIR)/usr/bin/python3-config --libs --embed`" -endif $(eval $(autotools-package)) $(eval $(host-autotools-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:08:45 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:08:45 +0100 Subject: [Buildroot] [git commit] package/opkg-utils: drop reference to python2 Message-ID: <20220209212600.553CE8323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=36f31032087332806342fcc6eb97a94b80201f49 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/opkg-utils/Config.in | 6 ------ 1 file changed, 6 deletions(-) diff --git a/package/opkg-utils/Config.in b/package/opkg-utils/Config.in index 3c5a3ee347..2973055baf 100644 --- a/package/opkg-utils/Config.in +++ b/package/opkg-utils/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_OPKG_UTILS depends on BR2_USE_WCHAR # python3 depends on BR2_TOOLCHAIN_HAS_THREADS # python3 <- libffi depends on !BR2_STATIC_LIBS # python3 - depends on !BR2_PACKAGE_PYTHON # python3 select BR2_PACKAGE_BINUTILS if !BR2_PACKAGE_BUSYBOX # runtime select BR2_PACKAGE_BINUTILS_TARGET if !BR2_PACKAGE_BUSYBOX # runtime select BR2_PACKAGE_COREUTILS if !BR2_PACKAGE_BUSYBOX # runtime @@ -27,8 +26,3 @@ comment "opkg-utils needs a toolchain w/ wchar, threads, dynamic library" depends on !BR2_nios2 || BR2_PACKAGE_BUSYBOX depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS - -comment "opkg-utils needs python3" - depends on !BR2_nios2 || BR2_PACKAGE_BUSYBOX - depends on BR2_USE_MMU - depends on BR2_PACKAGE_PYTHON From yann.morin.1998 at free.fr Wed Feb 9 21:09:12 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:09:12 +0100 Subject: [Buildroot] [git commit] package/python-jsonschema: drop python2 support Message-ID: <20220209212600.C6FEB8323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=baa88adcc66c8107fd8524186150bdbf09923532 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-jsonschema/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/python-jsonschema/Config.in b/package/python-jsonschema/Config.in index b547f4ae1a..7002653722 100644 --- a/package/python-jsonschema/Config.in +++ b/package/python-jsonschema/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_JSONSCHEMA bool "python-jsonschema" - select BR2_PACKAGE_PYTHON_FUNCTOOLS32 if BR2_PACKAGE_PYTHON # runtime help An implementation of JSON Schema validation for Python. From yann.morin.1998 at free.fr Wed Feb 9 21:07:42 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:07:42 +0100 Subject: [Buildroot] [git commit] package/boost: drop python2 support Message-ID: <20220209212559.6673E8323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=82fc920fbe0dc774e2cf8639b450ac9e0b29d56a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/boost/Config.in | 2 +- package/boost/boost.mk | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/package/boost/Config.in b/package/boost/Config.in index 2c458bf88a..33a5337096 100644 --- a/package/boost/Config.in +++ b/package/boost/Config.in @@ -296,7 +296,7 @@ config BR2_PACKAGE_BOOST_PROGRAM_OPTIONS config BR2_PACKAGE_BOOST_PYTHON bool "boost-python" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 help The Boost Python Library is a framework for interfacing Python and C++. It allows you to quickly and seamlessly expose C++ diff --git a/package/boost/boost.mk b/package/boost/boost.mk index b6681b0ad3..032ba5c820 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -68,16 +68,11 @@ BOOST_DEPENDENCIES += bzip2 zlib endif ifeq ($(BR2_PACKAGE_BOOST_PYTHON),y) -BOOST_FLAGS += --with-python-root=$(HOST_DIR) -ifeq ($(BR2_PACKAGE_PYTHON3),y) -BOOST_FLAGS += --with-python=$(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) +BOOST_FLAGS += \ + --with-python-root=$(HOST_DIR) \ + --with-python=$(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) BOOST_TARGET_CXXFLAGS += -I$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) BOOST_DEPENDENCIES += python3 -else -BOOST_FLAGS += --with-python=$(HOST_DIR)/bin/python$(PYTHON_VERSION_MAJOR) -BOOST_TARGET_CXXFLAGS += -I$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) -BOOST_DEPENDENCIES += python -endif endif HOST_BOOST_OPTS += --no-cmake-config toolset=gcc threading=multi \ From yann.morin.1998 at free.fr Wed Feb 9 21:10:26 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:10:26 +0100 Subject: [Buildroot] [git commit] package/snmpclitools: drop python2 support Message-ID: <20220209212601.F2EAD8323E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4ba81e68398d1c5c71403b38c007d4091b4b74b8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/snmpclitools/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/snmpclitools/Config.in b/package/snmpclitools/Config.in index 00bf5994d1..bf3668a89b 100644 --- a/package/snmpclitools/Config.in +++ b/package/snmpclitools/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_SNMPCLITOOLS bool "snmpclitools" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_PYSMI # runtime select BR2_PACKAGE_PYTHON_PYSNMP # runtime help From yann.morin.1998 at free.fr Wed Feb 9 21:08:47 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:08:47 +0100 Subject: [Buildroot] [git commit] package/owfs: drop python support Message-ID: <20220209212600.5DF4A8323E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5f479fbffba50768dd6add82d83aad50104c3843 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The python support only works with python2, so drop it. Notice that there is a PR adding python3 support, but it is not yet merged: https://github.com/owfs/owfs/pull/32 Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/owfs/owfs.mk | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/package/owfs/owfs.mk b/package/owfs/owfs.mk index 7c69a5251b..986dca921a 100644 --- a/package/owfs/owfs.mk +++ b/package/owfs/owfs.mk @@ -67,30 +67,8 @@ else OWFS_CONF_OPTS += --disable-avahi endif -# setup.py isn't python3 compliant -ifeq ($(BR2_PACKAGE_PYTHON),y) -OWFS_CONF_OPTS += \ - --enable-owpython \ - --with-python \ - --with-pythonconfig=$(STAGING_DIR)/usr/bin/python-config -OWFS_MAKE_ENV += \ - CC="$(TARGET_CC)" \ - PYTHONPATH="$(PYTHON_PATH)" \ - _python_sysroot=$(STAGING_DIR) \ - _python_prefix=/usr \ - _python_exec_prefix=/usr -OWFS_DEPENDENCIES += python host-swig -# The configure scripts finds PYSITEDIR as the python_lib directory of -# host-python, and then prepends DESTDIR in front of it. So we end up -# installing things in $(TARGET_DIR)/$(HOST_DIR)/lib/python which is -# clearly wrong. -# Patching owfs to do the right thing is not trivial, it's much easier to -# override the PYSITEDIR variable in make. -OWFS_EXTRA_MAKE_OPTS += PYSITEDIR=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages - -else +# python2 only (https://github.com/owfs/owfs/pull/32) OWFS_CONF_OPTS += --disable-owpython --without-python -endif ifeq ($(BR2_STATIC_LIBS),y) # zeroconf support uses dlopen() From yann.morin.1998 at free.fr Wed Feb 9 21:07:56 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:07:56 +0100 Subject: [Buildroot] [git commit] package/dstat: drop python2 support Message-ID: <20220209212559.9879B8323E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1682e9b23b6aa8cd4f93a56c0efc8d7ec3566b42 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/dstat/Config.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package/dstat/Config.in b/package/dstat/Config.in index 647a7033c6..09d1970f73 100644 --- a/package/dstat/Config.in +++ b/package/dstat/Config.in @@ -1,10 +1,10 @@ config BR2_PACKAGE_DSTAT bool "dstat" - depends on BR2_USE_WCHAR # python - depends on BR2_USE_MMU # python - depends on BR2_TOOLCHAIN_HAS_THREADS # python - depends on !BR2_STATIC_LIBS # python - select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON + depends on BR2_USE_WCHAR # python3 + depends on BR2_USE_MMU # python3 + depends on BR2_TOOLCHAIN_HAS_THREADS # python3 + depends on !BR2_STATIC_LIBS # python3 + select BR2_PACKAGE_PYTHON3 # runtime help Dstat, written in Python, is a versatile replacement for vmstat, iostat, netstat and ifstat. Dstat overcomes some of From yann.morin.1998 at free.fr Wed Feb 9 21:09:03 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:09:03 +0100 Subject: [Buildroot] [git commit] package/python-dpkt: drop python2 support Message-ID: <20220209212600.A001A8323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a0544dab33b8ca5b5f8d2f46ded5106ceb636e5f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-dpkt/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-dpkt/Config.in b/package/python-dpkt/Config.in index 9bd7a98d26..819d0fb613 100644 --- a/package/python-dpkt/Config.in +++ b/package/python-dpkt/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_DPKT bool "python-dpkt" - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_ZLIB # runtime help Fast, simple packet creation / parsing, with definitions for the basic TCP/IP protocols. From yann.morin.1998 at free.fr Wed Feb 9 21:07:33 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:07:33 +0100 Subject: [Buildroot] [git commit] support/testing: drop python2 tests Message-ID: <20220209212559.3C7CE81335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f697096a770ff4704ac6917d7841dfaa02a945a0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Python2 for the target is about to get removed, so drop the tests using it. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- .../testing/tests/package/sample_python_subprocess32.py | 6 ------ support/testing/tests/package/test_bmap_tools.py | 8 -------- support/testing/tests/package/test_crudini.py | 8 -------- support/testing/tests/package/test_libftdi1.py | 12 ------------ support/testing/tests/package/test_python.py | 14 -------------- support/testing/tests/package/test_python_argh.py | 9 --------- support/testing/tests/package/test_python_bitstring.py | 10 ---------- support/testing/tests/package/test_python_can.py | 11 ----------- support/testing/tests/package/test_python_cbor.py | 11 ----------- support/testing/tests/package/test_python_click.py | 9 --------- support/testing/tests/package/test_python_constantly.py | 10 ---------- support/testing/tests/package/test_python_gnupg.py | 10 ---------- support/testing/tests/package/test_python_incremental.py | 11 ----------- support/testing/tests/package/test_python_passlib.py | 11 ----------- support/testing/tests/package/test_python_pexpect.py | 10 ---------- support/testing/tests/package/test_python_pynacl.py | 11 ----------- support/testing/tests/package/test_python_pyyaml.py | 11 ----------- support/testing/tests/package/test_python_subprocess32.py | 11 ----------- support/testing/tests/package/test_python_ubjson.py | 11 ----------- 19 files changed, 194 deletions(-) diff --git a/support/testing/tests/package/sample_python_subprocess32.py b/support/testing/tests/package/sample_python_subprocess32.py deleted file mode 100644 index 8579745cc8..0000000000 --- a/support/testing/tests/package/sample_python_subprocess32.py +++ /dev/null @@ -1,6 +0,0 @@ -import subprocess32 - -output = subprocess32.check_output(["ls", "-l", "/dev/null"]) -print(output) -assert("/dev/null" in output) -assert("No such" not in output) diff --git a/support/testing/tests/package/test_bmap_tools.py b/support/testing/tests/package/test_bmap_tools.py index baa23154f8..a179027633 100644 --- a/support/testing/tests/package/test_bmap_tools.py +++ b/support/testing/tests/package/test_bmap_tools.py @@ -45,14 +45,6 @@ class TestBmapTools(BRTest): self.assertRunOk(cmd, timeout=20) -class TestPy2BmapTools(TestBmapTools): - __test__ = True - config = TestBmapTools.config + \ - """ - BR2_PACKAGE_PYTHON=y - """ - - class TestPy3BmapTools(TestBmapTools): __test__ = True config = TestBmapTools.config + \ diff --git a/support/testing/tests/package/test_crudini.py b/support/testing/tests/package/test_crudini.py index e320d3207e..470a714eb6 100644 --- a/support/testing/tests/package/test_crudini.py +++ b/support/testing/tests/package/test_crudini.py @@ -33,14 +33,6 @@ class TestCrudiniBase(TestPythonPackageBase): self.assertEqual(out, ['this-is-the-magic-value']) -class TestCrudiniPy2(TestCrudiniBase): - __test__ = True - config = TestCrudiniBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - """ - - class TestCrudiniPy3(TestCrudiniBase): __test__ = True config = TestCrudiniBase.config + \ diff --git a/support/testing/tests/package/test_libftdi1.py b/support/testing/tests/package/test_libftdi1.py index 78c928484c..5c29dea04f 100644 --- a/support/testing/tests/package/test_libftdi1.py +++ b/support/testing/tests/package/test_libftdi1.py @@ -1,18 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Libftdi1(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_LIBFTDI1=y - BR2_PACKAGE_LIBFTDI1_PYTHON_BINDINGS=y - """ - sample_scripts = ["tests/package/sample_libftdi1.py"] - timeout = 40 - - class TestPythonPy3Libftdi1(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python.py b/support/testing/tests/package/test_python.py index 60da8765c4..f29aff6624 100644 --- a/support/testing/tests/package/test_python.py +++ b/support/testing/tests/package/test_python.py @@ -39,20 +39,6 @@ class TestPythonBase(infra.basetest.BRTest): self.assertEqual(exit_code, 1) -class TestPython2(TestPythonBase): - config = TestPythonBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - """ - - def test_run(self): - self.login() - self.version_test("Python 2") - self.math_floor_test() - self.libc_time_test() - self.zlib_test() - - class TestPython3(TestPythonBase): config = TestPythonBase.config + \ """ diff --git a/support/testing/tests/package/test_python_argh.py b/support/testing/tests/package/test_python_argh.py index de4b4cbe74..887d9acd46 100644 --- a/support/testing/tests/package/test_python_argh.py +++ b/support/testing/tests/package/test_python_argh.py @@ -27,15 +27,6 @@ class TestPythonArgh(TestPythonPackageBase): self.assertEqual(exit_code, 2) -class TestPythonPy2Argh(TestPythonArgh): - __test__ = True - config = TestPythonArgh.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_ARGH=y - """ - - class TestPythonPy3Argh(TestPythonArgh): __test__ = True config = TestPythonArgh.config + \ diff --git a/support/testing/tests/package/test_python_bitstring.py b/support/testing/tests/package/test_python_bitstring.py index 63b3fdb69c..bd358a2fc5 100644 --- a/support/testing/tests/package/test_python_bitstring.py +++ b/support/testing/tests/package/test_python_bitstring.py @@ -1,16 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Bitstring(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_BITSTRING=y - """ - sample_scripts = ["tests/package/sample_python_bitstring.py"] - - class TestPythonPy3Bitstring(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python_can.py b/support/testing/tests/package/test_python_can.py index d509d05dbb..dba5539c5d 100644 --- a/support/testing/tests/package/test_python_can.py +++ b/support/testing/tests/package/test_python_can.py @@ -1,17 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Can(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_CAN=y - """ - sample_scripts = ["tests/package/sample_python_can.py"] - timeout = 40 - - class TestPythonPy3Can(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python_cbor.py b/support/testing/tests/package/test_python_cbor.py index 9da3503763..23a1e3e701 100644 --- a/support/testing/tests/package/test_python_cbor.py +++ b/support/testing/tests/package/test_python_cbor.py @@ -1,17 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Cbor(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_CBOR=y - """ - sample_scripts = ["tests/package/sample_python_cbor_enc.py", - "tests/package/sample_python_cbor_dec.py"] - - class TestPythonPy3Cbor(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python_click.py b/support/testing/tests/package/test_python_click.py index db57d3aa9f..0ee9702cce 100644 --- a/support/testing/tests/package/test_python_click.py +++ b/support/testing/tests/package/test_python_click.py @@ -26,15 +26,6 @@ class TestPythonClick(TestPythonPackageBase): self.assertEqual(exit_code, 2) -class TestPythonPy2Click(TestPythonClick): - __test__ = True - config = TestPythonClick.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_CLICK=y - """ - - class TestPythonPy3Click(TestPythonClick): __test__ = True config = TestPythonClick.config + \ diff --git a/support/testing/tests/package/test_python_constantly.py b/support/testing/tests/package/test_python_constantly.py index 5be01c4f8c..edcb9bfd69 100644 --- a/support/testing/tests/package/test_python_constantly.py +++ b/support/testing/tests/package/test_python_constantly.py @@ -1,16 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Constantly(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_CONSTANTLY=y - """ - sample_scripts = ["tests/package/sample_python_constantly.py"] - - class TestPythonPy3Constantly(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python_gnupg.py b/support/testing/tests/package/test_python_gnupg.py index 0c71f6b6d0..8861115130 100644 --- a/support/testing/tests/package/test_python_gnupg.py +++ b/support/testing/tests/package/test_python_gnupg.py @@ -1,16 +1,6 @@ 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 + \ diff --git a/support/testing/tests/package/test_python_incremental.py b/support/testing/tests/package/test_python_incremental.py index 49800d8937..4c53d61321 100644 --- a/support/testing/tests/package/test_python_incremental.py +++ b/support/testing/tests/package/test_python_incremental.py @@ -1,17 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Incremental(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_INCREMENTAL=y - """ - sample_scripts = ["tests/package/sample_python_incremental.py"] - timeout = 30 - - class TestPythonPy3Incremental(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python_passlib.py b/support/testing/tests/package/test_python_passlib.py index 7c85882bf8..e12e86d91b 100644 --- a/support/testing/tests/package/test_python_passlib.py +++ b/support/testing/tests/package/test_python_passlib.py @@ -1,17 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Passlib(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_PASSLIB=y - """ - sample_scripts = ["tests/package/sample_python_passlib.py"] - timeout = 30 - - class TestPythonPy3Passlib(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python_pexpect.py b/support/testing/tests/package/test_python_pexpect.py index ba31cdbdbe..70037a7d3c 100644 --- a/support/testing/tests/package/test_python_pexpect.py +++ b/support/testing/tests/package/test_python_pexpect.py @@ -1,16 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Pexpect(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_PEXPECT=y - """ - sample_scripts = ["tests/package/sample_python_pexpect.py"] - - class TestPythonPy3Pexpect(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python_pynacl.py b/support/testing/tests/package/test_python_pynacl.py index f4dd54940a..cef8a7e780 100644 --- a/support/testing/tests/package/test_python_pynacl.py +++ b/support/testing/tests/package/test_python_pynacl.py @@ -1,17 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Pynacl(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_PYNACL=y - """ - sample_scripts = ["tests/package/sample_python_pynacl.py"] - timeout = 10 - - class TestPythonPy3Pynacl(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python_pyyaml.py b/support/testing/tests/package/test_python_pyyaml.py index cd45a57b86..9d0a351f72 100644 --- a/support/testing/tests/package/test_python_pyyaml.py +++ b/support/testing/tests/package/test_python_pyyaml.py @@ -1,17 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Pyyaml(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_PYYAML=y - """ - sample_scripts = ["tests/package/sample_python_pyyaml_enc.py", - "tests/package/sample_python_pyyaml_dec.py"] - - class TestPythonPy3Pyyaml(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python_subprocess32.py b/support/testing/tests/package/test_python_subprocess32.py deleted file mode 100644 index d2878046d1..0000000000 --- a/support/testing/tests/package/test_python_subprocess32.py +++ /dev/null @@ -1,11 +0,0 @@ -from tests.package.test_python import TestPythonPackageBase - - -class TestPythonPy2Subprocess32(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_SUBPROCESS32=y - """ - sample_scripts = ["tests/package/sample_python_subprocess32.py"] diff --git a/support/testing/tests/package/test_python_ubjson.py b/support/testing/tests/package/test_python_ubjson.py index 85c707e292..a15dbd54b8 100644 --- a/support/testing/tests/package/test_python_ubjson.py +++ b/support/testing/tests/package/test_python_ubjson.py @@ -1,17 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Ubjson(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_UBJSON=y - """ - sample_scripts = ["tests/package/sample_python_ubjson_enc.py", - "tests/package/sample_python_ubjson_dec.py"] - - class TestPythonPy3Ubjson(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ From yann.morin.1998 at free.fr Wed Feb 9 21:13:18 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:13:18 +0100 Subject: [Buildroot] [git commit] package/python-backports-abc: drop python2 specific package Message-ID: <20220209212602.558528323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=532dd66e0477968cbed59f380924e9849bfbd04b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Config.in.legacy | 6 ++++++ package/Config.in | 1 - package/python-backports-abc/Config.in | 8 -------- package/python-backports-abc/python-backports-abc.hash | 5 ----- package/python-backports-abc/python-backports-abc.mk | 14 -------------- 5 files changed, 6 insertions(+), 28 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 6bc3803a5c..cc1ed8f9d5 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_BACKPORTS_ABC + bool "python-backports-abc removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON bool "python2.7 package removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index ca2fb363e3..46e6b30cdf 100644 --- a/package/Config.in +++ b/package/Config.in @@ -941,7 +941,6 @@ menu "External python modules" source "package/python-avro/Config.in" source "package/python-babel/Config.in" source "package/python-backcall/Config.in" - source "package/python-backports-abc/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-abc/Config.in b/package/python-backports-abc/Config.in deleted file mode 100644 index 43566279e8..0000000000 --- a/package/python-backports-abc/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PYTHON_BACKPORTS_ABC - bool "python-backports-abc" - depends on BR2_PACKAGE_PYTHON - help - A backport of recent additions to the 'collections.abc' - module. - - https://pypi.python.org/pypi/backports_abc diff --git a/package/python-backports-abc/python-backports-abc.hash b/package/python-backports-abc/python-backports-abc.hash deleted file mode 100644 index 4f4c9bd1fe..0000000000 --- a/package/python-backports-abc/python-backports-abc.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5 from https://pypi.python.org/pypi/backports_abc/json -md5 7d1936ec183a3586290adf60f6f96764 backports_abc-0.5.tar.gz -# Locally computed -sha256 033be54514a03e255df75c5aee8f9e672f663f93abb723444caec8fe43437bde backports_abc-0.5.tar.gz -sha256 0a4f3b38055f50f047a42521568fa6ddb9a5976c2884f6ae138796d0f71150ca LICENSE diff --git a/package/python-backports-abc/python-backports-abc.mk b/package/python-backports-abc/python-backports-abc.mk deleted file mode 100644 index 66cea1703e..0000000000 --- a/package/python-backports-abc/python-backports-abc.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-backports-abc -# -################################################################################ - -PYTHON_BACKPORTS_ABC_VERSION = 0.5 -PYTHON_BACKPORTS_ABC_SOURCE = backports_abc-$(PYTHON_BACKPORTS_ABC_VERSION).tar.gz -PYTHON_BACKPORTS_ABC_SITE = https://pypi.python.org/packages/68/3c/1317a9113c377d1e33711ca8de1e80afbaf4a3c950dd0edfaf61f9bfe6d8 -PYTHON_BACKPORTS_ABC_LICENSE = Python-2.0 -PYTHON_BACKPORTS_ABC_LICENSE_FILES = LICENSE -PYTHON_BACKPORTS_ABC_SETUP_TYPE = setuptools - -$(eval $(python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:08:20 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:08:20 +0100 Subject: [Buildroot] [git commit] package/libcec: drop python2 support Message-ID: <20220209212559.EE0DB8323E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=83ed2d60ccc775aa02585f8e6ab5edee6b8d51f9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/libcec/libcec.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libcec/libcec.mk b/package/libcec/libcec.mk index 6591bc009a..8b5d70d008 100644 --- a/package/libcec/libcec.mk +++ b/package/libcec/libcec.mk @@ -20,8 +20,8 @@ ifeq ($(BR2_PACKAGE_HAS_UDEV),y) LIBCEC_DEPENDENCIES += udev endif -ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) -LIBCEC_DEPENDENCIES += host-swig $(if $(BR2_PACKAGE_PYTHON3),python3,python) +ifeq ($(BR2_PACKAGE_PYTHON3),y) +LIBCEC_DEPENDENCIES += host-swig python3 endif ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) From yann.morin.1998 at free.fr Wed Feb 9 21:09:35 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:09:35 +0100 Subject: [Buildroot] [git commit] package/python-pyroute2: drop python2 support Message-ID: <20220209212601.35B988323E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c449ceaae2044c7ecf30fc769a51d2b02c3ab2f1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-pyroute2/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-pyroute2/Config.in b/package/python-pyroute2/Config.in index 5df0a63d4b..9e685f9d1e 100644 --- a/package/python-pyroute2/Config.in +++ b/package/python-pyroute2/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_PYROUTE2 bool "python-pyroute2" - select BR2_PACKAGE_PYTHON_SQLITE if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_SQLITE if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_SQLITE help Python netlink library - Linux network / netns / wireless / ipset configuration. From yann.morin.1998 at free.fr Wed Feb 9 21:07:54 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:07:54 +0100 Subject: [Buildroot] [git commit] package/docker-compose: drop reference to BR2_PACKAGE_PYTHON Message-ID: <20220209212559.905788323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=459dd7a9850c7b3be519ae6bf7cc6a689c22cd32 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master And adjust the comments to clarify that the toolchain dependencies are from python3. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/docker-compose/Config.in | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/package/docker-compose/Config.in b/package/docker-compose/Config.in index 761befea4d..f82a0c4bc2 100644 --- a/package/docker-compose/Config.in +++ b/package/docker-compose/Config.in @@ -1,10 +1,9 @@ config BR2_PACKAGE_DOCKER_COMPOSE bool "docker-compose" - depends on !BR2_PACKAGE_PYTHON # python-paramiko -> python-bcrypt - depends on BR2_USE_MMU # python - depends on BR2_USE_WCHAR # python - depends on BR2_TOOLCHAIN_HAS_THREADS # python - depends on !BR2_STATIC_LIBS # python + depends on BR2_USE_MMU # python3 + depends on BR2_USE_WCHAR # python3 + depends on BR2_TOOLCHAIN_HAS_THREADS # python3 + depends on !BR2_STATIC_LIBS # python3 # python-paramiko -> python-cryptography depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS select BR2_PACKAGE_PYTHON3 From yann.morin.1998 at free.fr Wed Feb 9 21:09:56 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:09:56 +0100 Subject: [Buildroot] [git commit] package/python-txtorcon: drop python2 support Message-ID: <20220209212601.8290F8323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c45680dd66f8fab32d24963bf8eacb48211c48a2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-txtorcon/python-txtorcon.mk | 9 --------- 1 file changed, 9 deletions(-) diff --git a/package/python-txtorcon/python-txtorcon.mk b/package/python-txtorcon/python-txtorcon.mk index b8414d96d0..acf586cb8c 100644 --- a/package/python-txtorcon/python-txtorcon.mk +++ b/package/python-txtorcon/python-txtorcon.mk @@ -11,13 +11,4 @@ PYTHON_TXTORCON_SETUP_TYPE = setuptools PYTHON_TXTORCON_LICENSE = MIT PYTHON_TXTORCON_LICENSE_FILES = LICENSE -ifeq ($(BR2_PACKAGE_PYTHON),y) -# only needed/valid for python 3.x -define PYTHON_TXTORCON_RM_PY3_FILE - rm -f $(TARGET_DIR)/usr/lib/python*/site-packages/txtorcon/controller_py3.py -endef - -PYTHON_TXTORCON_POST_INSTALL_TARGET_HOOKS += PYTHON_TXTORCON_RM_PY3_FILE -endif - $(eval $(python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:08:33 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:08:33 +0100 Subject: [Buildroot] [git commit] package/libsoc: drop python2 support Message-ID: <20220209212600.2D0378323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a642bb925de97fb0afcbba0bee31bcb73d997c20 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/libsoc/libsoc.mk | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/package/libsoc/libsoc.mk b/package/libsoc/libsoc.mk index bbc33143cc..95753b8b68 100644 --- a/package/libsoc/libsoc.mk +++ b/package/libsoc/libsoc.mk @@ -12,12 +12,8 @@ LIBSOC_AUTORECONF = YES LIBSOC_INSTALL_STAGING = YES LIBSOC_DEPENDENCIES = host-pkgconf -# Install Python 2 bindings -ifeq ($(BR2_PACKAGE_PYTHON),y) -LIBSOC_DEPENDENCIES += python -LIBSOC_CONF_OPTS += --enable-python=2 # Install Python 3 bindings -else ifeq ($(BR2_PACKAGE_PYTHON3),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) LIBSOC_DEPENDENCIES += python3 LIBSOC_CONF_OPTS += --enable-python=3 else From yann.morin.1998 at free.fr Wed Feb 9 21:13:46 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:13:46 +0100 Subject: [Buildroot] [git commit] package/python-pypcap: drop python2 specific package Message-ID: <20220209212602.DC93C81335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=aec1a69a202352e61264a20561dcd729b733eb54 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Config.in.legacy | 6 ++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/python-pypcap/Config.in | 9 --------- package/python-pypcap/python-pypcap.hash | 3 --- package/python-pypcap/python-pypcap.mk | 21 --------------------- 6 files changed, 6 insertions(+), 35 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 74317a2d7c..f99535411d 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_PYPCAP + bool "python-pypcap removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_PATHLIB2 bool "python-pathlib2 removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 4bb8821563..90988478f9 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1934,7 +1934,6 @@ F: package/python-ipy/ F: package/python-iwlib/ F: package/python-posix-ipc/ F: package/python-pycairo/ -F: package/python-pypcap/ F: package/python-pyrex/ F: package/python-pysftp/ F: package/python-tinyrpc/ diff --git a/package/Config.in b/package/Config.in index 3c55dec6c5..d406d372d3 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1172,7 +1172,6 @@ menu "External python modules" source "package/python-pyopenssl/Config.in" source "package/python-pyparsing/Config.in" source "package/python-pyparted/Config.in" - source "package/python-pypcap/Config.in" source "package/python-pyphen/Config.in" source "package/python-pyqrcode/Config.in" source "package/python-pyqt5/Config.in" diff --git a/package/python-pypcap/Config.in b/package/python-pypcap/Config.in deleted file mode 100644 index 9b410ecc2b..0000000000 --- a/package/python-pypcap/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYPCAP - bool "python-pypcap" - depends on BR2_PACKAGE_PYTHON - select BR2_PACKAGE_LIBPCAP - help - The pypcap module is an object-oriented wrapper of the C - libpcap library. - - https://github.com/dugsong/pypcap diff --git a/package/python-pypcap/python-pypcap.hash b/package/python-pypcap/python-pypcap.hash deleted file mode 100644 index 40db6b4f33..0000000000 --- a/package/python-pypcap/python-pypcap.hash +++ /dev/null @@ -1,3 +0,0 @@ -# locally computed -sha256 5716d97b39d40b79daf7b0c6a8c8c514f5f1de8f20561c8621ee62a90b93fb03 python-pypcap-6f46e7bf29a648256ddc732a7d0ec83d3ffca390.tar.gz -sha256 48306c284fdbdf836b880528c3bdd658deac47ed78ffeb24a4ca5a8c39a39304 LICENSE diff --git a/package/python-pypcap/python-pypcap.mk b/package/python-pypcap/python-pypcap.mk deleted file mode 100644 index fc6fc6ed92..0000000000 --- a/package/python-pypcap/python-pypcap.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# python-pypcap -# -################################################################################ - -PYTHON_PYPCAP_VERSION = 6f46e7bf29a648256ddc732a7d0ec83d3ffca390 -PYTHON_PYPCAP_SITE = $(call github,dugsong,pypcap,$(PYTHON_PYPCAP_VERSION)) -PYTHON_PYPCAP_LICENSE = BSD-3-Clause -PYTHON_PYPCAP_LICENSE_FILES = LICENSE -PYTHON_PYPCAP_SETUP_TYPE = distutils -PYTHON_PYPCAP_DEPENDENCIES = host-python-pyrex libpcap - -define PYTHON_PYPCAP_CONFIGURE_CMDS - $(HOST_DIR)/bin/python2 $(HOST_DIR)/bin/pyrexc $(@D)/pcap.pyx - (cd $(@D); \ - $(HOST_DIR)/bin/python setup.py \ - config --with-pcap=$(STAGING_DIR)/usr) -endef - -$(eval $(python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:08:03 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:08:03 +0100 Subject: [Buildroot] [git commit] package/glsandbox-player: drop reference to python2 Message-ID: <20220209212559.B0D0B83245@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d27906769fa6cf2bce268ea957527579165e2d8e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/glslsandbox-player/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/glslsandbox-player/Config.in b/package/glslsandbox-player/Config.in index 2d15a7e270..317eb62898 100644 --- a/package/glslsandbox-player/Config.in +++ b/package/glslsandbox-player/Config.in @@ -33,7 +33,6 @@ config BR2_PACKAGE_GLSLSANDBOX_PLAYER_TESTING config BR2_PACKAGE_GLSLSANDBOX_PLAYER_SCRIPTS bool "Install scripts" - depends on !BR2_PACKAGE_PYTHON # python3 depends on !BR2_STATIC_LIBS # python3 depends on BR2_TOOLCHAIN_HAS_THREADS # python3 depends on BR2_USE_MMU # bash, python3 From yann.morin.1998 at free.fr Wed Feb 9 21:07:49 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:07:49 +0100 Subject: [Buildroot] [git commit] package/crudini: drop python2 support Message-ID: <20220209212559.7F98D81335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=246077a8890c96283419f93d7df4ca85f190b2c0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/crudini/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/crudini/Config.in b/package/crudini/Config.in index 240848dffc..ff4c98d579 100644 --- a/package/crudini/Config.in +++ b/package/crudini/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_CRUDINI bool "crudini" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_INIPARSE # runtime help A utility for handling ini files from the command line and From yann.morin.1998 at free.fr Wed Feb 9 21:12:39 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:12:39 +0100 Subject: [Buildroot] [git commit] package/python: drop host package Message-ID: <20220209212602.4A76581335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2743ce00ca61fde1537b64a165a69d497052be58 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard [yann.morin.1998 at free.fr: drop from DEVELOPERS] Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 - ...up.py-do-not-add-invalid-header-locations.patch | 42 --- ...-Fix-get_python_inc-for-cross-compilation.patch | 48 ---- ...the-install-location-of-_sysconfigdata.py.patch | 88 ------ ...-compilation-of-.pyc-and-.pyo-conditional.patch | 78 ------ ...st-getaddrinfo-test-for-cross-compilation.patch | 31 --- ...-infrastructure-to-be-able-to-disable-ext.patch | 81 ------ ...ibrary-header-paths-for-cross-compilation.patch | 64 ----- ...n-t-look-in-usr-lib-termcap-for-libraries.patch | 31 --- .../0009-Fix-python-config-for-cross-builds.patch | 229 ---------------- ...0-Remove-the-python-symlink-install-rules.patch | 43 --- .../python/0011-Don-t-add-multiarch-paths.patch | 36 --- .../python/0012-Abort-on-failed-module-build.patch | 30 -- ...-build-when-threads-are-not-used-availabl.patch | 58 ---- package/python/0014-Serial-ioctl-workaround.patch | 33 --- ...st-the-shebang-of-Python-scripts-for-cros.patch | 35 --- ...on-to-disable-installation-of-test-module.patch | 105 ------- .../0017-Add-an-option-to-disable-pydoc.patch | 89 ------ .../0018-Add-an-option-to-disable-lib2to3.patch | 92 ------- ...-Add-option-to-disable-the-sqlite3-module.patch | 69 ----- ...20-Add-an-option-to-disable-the-tk-module.patch | 73 ----- ...dd-an-option-to-disable-the-curses-module.patch | 61 ----- .../0022-Add-an-option-to-disable-expat.patch | 92 ------- .../0023-Add-an-option-to-disable-CJK-codecs.patch | 32 --- .../python/0024-Add-an-option-to-disable-NIS.patch | 35 --- ...0025-Add-an-option-to-disable-unicodedata.patch | 32 --- .../0026-Add-an-option-to-disable-bsddb.patch | 87 ------ ...7-Add-an-option-to-disable-the-ssl-module.patch | 32 --- ...8-Add-an-option-to-disable-the-bz2-module.patch | 32 --- ...-Add-an-option-to-disable-the-zlib-module.patch | 32 --- .../0030-Do-not-install-the-idle-editor.patch | 55 ---- ...-option-to-disable-the-ossaudiodev-module.patch | 32 --- ...-Add-option-to-disable-the-hashlib-module.patch | 32 --- ...-Add-an-option-to-disable-readline-module.patch | 32 --- ...stem-locale-and-set-to-default-when-addin.patch | 37 --- package/python/Config.in.host | 16 -- package/python/python.hash | 5 - package/python/python.mk | 302 --------------------- 38 files changed, 2302 deletions(-) Patch is too large, so refusing to show it From yann.morin.1998 at free.fr Wed Feb 9 21:08:56 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:08:56 +0100 Subject: [Buildroot] [git commit] package/python-can: drop python2 support Message-ID: <20220209212600.8333180196@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=07ac57eab1409b9255300126280ed43c89a88fdd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-can/Config.in | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/package/python-can/Config.in b/package/python-can/Config.in index 3d06374c6a..dc9eb0ae4e 100644 --- a/package/python-can/Config.in +++ b/package/python-can/Config.in @@ -1,13 +1,10 @@ config BR2_PACKAGE_PYTHON_CAN bool "python-can" select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime - select BR2_PACKAGE_PYTHON_SQLITE if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_SQLITE if BR2_PACKAGE_PYTHON3 # runtime - select BR2_PACKAGE_PYTHON_TYPING if BR2_PACKAGE_PYTHON # runtime + select BR2_PACKAGE_PYTHON3_SQLITE # runtime select BR2_PACKAGE_PYTHON_AENUM # runtime select BR2_PACKAGE_PYTHON_WRAPT # runtime - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_ZLIB help This module provides controller area network support for Python. From yann.morin.1998 at free.fr Wed Feb 9 21:13:48 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:13:48 +0100 Subject: [Buildroot] [git commit] package/python-pyro: drop python2 specific package Message-ID: <20220209212602.E67478323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6449cc73ca442aa5c6381552b3725809801df274 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Config.in.legacy | 6 ++++++ package/Config.in | 1 - package/python-pyro/Config.in | 10 ---------- package/python-pyro/python-pyro.hash | 5 ----- package/python-pyro/python-pyro.mk | 16 ---------------- 5 files changed, 6 insertions(+), 32 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index f99535411d..319057f748 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_PYRO + bool "python-pyro removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_PYPCAP bool "python-pypcap removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index d406d372d3..0d8ff0d4d1 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1176,7 +1176,6 @@ menu "External python modules" source "package/python-pyqrcode/Config.in" source "package/python-pyqt5/Config.in" source "package/python-pyratemp/Config.in" - source "package/python-pyro/Config.in" source "package/python-pyroute2/Config.in" source "package/python-pysendfile/Config.in" source "package/python-pysftp/Config.in" diff --git a/package/python-pyro/Config.in b/package/python-pyro/Config.in deleted file mode 100644 index 6372a1d376..0000000000 --- a/package/python-pyro/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYRO - bool "python-pyro" - depends on BR2_PACKAGE_PYTHON - help - python-pyro is a Python library stands for PYthon Remote - Objects. It is an advanced and powerful Distributed Object - Technology system written entirely in Python, that is - designed to be very easy to use.. - - https://pypi.python.org/pypi/Pyro/ diff --git a/package/python-pyro/python-pyro.hash b/package/python-pyro/python-pyro.hash deleted file mode 100644 index c22b66ddc4..0000000000 --- a/package/python-pyro/python-pyro.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5 from https://pypi.python.org/pypi/pyro/json -md5 59d4d3f4a8786776c9d7f9051b8f1a69 Pyro-3.16.tar.gz -# Locally computed -sha256 1bed508453ef7a7556b51424a58101af2349b662baab7e7331c5cb85dbe7e578 Pyro-3.16.tar.gz -sha256 7c14017a2f543384bfcde86043758b68d023b47bf09700a7df6dacbae9c82103 LICENSE diff --git a/package/python-pyro/python-pyro.mk b/package/python-pyro/python-pyro.mk deleted file mode 100644 index 235575c195..0000000000 --- a/package/python-pyro/python-pyro.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# python-pyro -# -################################################################################ - -PYTHON_PYRO_VERSION = 3.16 -PYTHON_PYRO_SOURCE = Pyro-$(PYTHON_PYRO_VERSION).tar.gz -PYTHON_PYRO_SITE = https://pypi.python.org/packages/61/68/0978adae315261b87acd216517c2c7f00780396e4d1426c5412458c6a28f -PYTHON_PYRO_LICENSE = MIT -PYTHON_PYRO_LICENSE_FILES = LICENSE -PYTHON_PYRO_CPE_ID_VENDOR = pyro_project -PYTHON_PYRO_CPE_ID_PRODUCT = pyro -PYTHON_PYRO_SETUP_TYPE = setuptools - -$(eval $(python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:08:01 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:08:01 +0100 Subject: [Buildroot] [git commit] package/fail2ban: drop python2 support Message-ID: <20220209212559.A8E9F8323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=109ff80fc1159df11ca58df6d3e9669685862cad branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/fail2ban/Config.in | 2 +- package/fail2ban/fail2ban.mk | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/package/fail2ban/Config.in b/package/fail2ban/Config.in index 86e6233793..8a48a8c1d0 100644 --- a/package/fail2ban/Config.in +++ b/package/fail2ban/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_FAIL2BAN bool "fail2ban" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_SYSTEMD if BR2_PACKAGE_SYSTEMD help Fail2ban scans log files (e.g. /var/log/apache/error_log) and diff --git a/package/fail2ban/fail2ban.mk b/package/fail2ban/fail2ban.mk index 9202dc1ddd..4a08981a97 100644 --- a/package/fail2ban/fail2ban.mk +++ b/package/fail2ban/fail2ban.mk @@ -15,15 +15,13 @@ FAIL2BAN_SETUP_TYPE = distutils # 0001-fixed-possible-RCE-vulnerability-unset-escape-variable.patch FAIL2BAN_IGNORE_CVES += CVE-2021-32749 -ifeq ($(BR2_PACKAGE_PYTHON3),y) define FAIL2BAN_PYTHON_2TO3 $(HOST_DIR)/bin/2to3 --write --nobackups --no-diffs $(@D)/bin/* $(@D)/fail2ban endef -FAIL2BAN_DEPENDENCIES += host-python3 +FAIL2BAN_DEPENDENCIES = host-python3 # We can't use _POST_PATCH_HOOKS because dependencies are not guaranteed # to build and install before _POST_PATCH_HOOKS run. FAIL2BAN_PRE_CONFIGURE_HOOKS += FAIL2BAN_PYTHON_2TO3 -endif define FAIL2BAN_FIX_DEFAULT_CONFIG $(SED) '/^socket/c\socket = /run/fail2ban.sock' $(TARGET_DIR)/etc/fail2ban/fail2ban.conf @@ -34,8 +32,7 @@ FAIL2BAN_POST_INSTALL_TARGET_HOOKS += FAIL2BAN_FIX_DEFAULT_CONFIG # fail2ban-python points to host python define FAIL2BAN_FIX_FAIL2BAN_PYTHON_SYMLINK - ln -snf $(if $(BR2_PACKAGE_PYTHON),python,python3) \ - $(TARGET_DIR)/usr/bin/fail2ban-python + ln -snf python3 $(TARGET_DIR)/usr/bin/fail2ban-python endef FAIL2BAN_POST_INSTALL_TARGET_HOOKS += FAIL2BAN_FIX_FAIL2BAN_PYTHON_SYMLINK From yann.morin.1998 at free.fr Wed Feb 9 21:13:23 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:13:23 +0100 Subject: [Buildroot] [git commit] package/python-backports-ssl-match-hostname: drop python2 specific package Message-ID: <20220209212602.6E74481335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ee520d5a0f5b117534a038399d1bfa4e5fbf97a5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Config.in.legacy | 6 ++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/python-backports-ssl-match-hostname/Config.in | 7 ------- .../python-backports-ssl-match-hostname.hash | 5 ----- .../python-backports-ssl-match-hostname.mk | 14 -------------- 6 files changed, 6 insertions(+), 28 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 89c095a388..10476a2adf 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME + bool "python-backports-ssl-match-hostname removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE bool "python-backports-shutil-get-terminal-size removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 7fe7e4287a..ebdf388d09 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2243,7 +2243,6 @@ F: package/lzop/ F: package/memtool/ F: package/mosquitto/ F: package/python-alsaaudio/ -F: package/python-backports-ssl-match-hostname/ F: package/python-cached-property/ F: package/python-docker/ F: package/python-dockerpty/ diff --git a/package/Config.in b/package/Config.in index fbfc876d89..73f266504a 100644 --- a/package/Config.in +++ b/package/Config.in @@ -941,7 +941,6 @@ menu "External python modules" source "package/python-avro/Config.in" source "package/python-babel/Config.in" source "package/python-backcall/Config.in" - source "package/python-backports-ssl-match-hostname/Config.in" source "package/python-bcrypt/Config.in" source "package/python-beautifulsoup4/Config.in" source "package/python-bidict/Config.in" diff --git a/package/python-backports-ssl-match-hostname/Config.in b/package/python-backports-ssl-match-hostname/Config.in deleted file mode 100644 index 8e55191a9e..0000000000 --- a/package/python-backports-ssl-match-hostname/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME - bool "python-backports-ssl-match-hostname" - depends on BR2_PACKAGE_PYTHON - help - The ssl.match_hostname() function from Python 3.5. - - http://bitbucket.org/brandon/backports.ssl_match_hostname diff --git a/package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.hash b/package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.hash deleted file mode 100644 index 145174cd5b..0000000000 --- a/package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/backports.ssl_match_hostname/json -md5 32d2f593af01a046bec3d2f5181a420a backports.ssl_match_hostname-3.7.0.1.tar.gz -sha256 bb82e60f9fbf4c080eabd957c39f0641f0fc247d9a16e31e26d594d8f42b9fd2 backports.ssl_match_hostname-3.7.0.1.tar.gz -# Locally computed sha256 checksums -sha256 bfc8a75a4b9aec224aa7973c0c9d7cc0134bdcbf8eefd008936b58554d66e97e LICENSE.txt diff --git a/package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.mk b/package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.mk deleted file mode 100644 index 300961662d..0000000000 --- a/package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-backports-ssl-match-hostname -# -################################################################################ - -PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_VERSION = 3.7.0.1 -PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_SOURCE = backports.ssl_match_hostname-$(PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_VERSION).tar.gz -PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_SITE = https://files.pythonhosted.org/packages/ff/2b/8265224812912bc5b7a607c44bf7b027554e1b9775e9ee0de8032e3de4b2 -PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_SETUP_TYPE = distutils -PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_LICENSE = Python-2.0 -PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_LICENSE_FILES = LICENSE.txt - -$(eval $(python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:08:15 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:08:15 +0100 Subject: [Buildroot] [git commit] package/jack2: drop python2 support Message-ID: <20220209212559.DEAF881335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c1ba0b8757c8919f77a931d2b04d3c1e9f6f1830 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/jack2/Config.in | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package/jack2/Config.in b/package/jack2/Config.in index f9de7be041..bc883190d5 100644 --- a/package/jack2/Config.in +++ b/package/jack2/Config.in @@ -37,9 +37,8 @@ config BR2_PACKAGE_JACK2_DBUS depends on BR2_USE_WCHAR # dbus-python, python select BR2_PACKAGE_DBUS select BR2_PACKAGE_DBUS_PYTHON - select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime help Build and use jackdbus. From yann.morin.1998 at free.fr Wed Feb 9 21:09:01 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:09:01 +0100 Subject: [Buildroot] [git commit] package/python-dicttoxml: drop python2 support Message-ID: <20220209212600.967A480196@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=25fe06d41df4fd240eceb361e54828eafe8b22ea branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-dicttoxml/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-dicttoxml/Config.in b/package/python-dicttoxml/Config.in index e38a5f7909..145887eddc 100644 --- a/package/python-dicttoxml/Config.in +++ b/package/python-dicttoxml/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_DICTTOXML bool "python-dicttoxml" - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_PYEXPAT help Converts a Python dictionary or other native data type into a valid XML string. From yann.morin.1998 at free.fr Wed Feb 9 21:13:55 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:13:55 +0100 Subject: [Buildroot] [git commit] package/python-typing: drop python2 specific package Message-ID: <20220209212603.14B5E81335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=53b288cbe03b6a197af820caad0d77c24678f2ef branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Config.in.legacy | 6 ++++++ package/Config.in | 1 - package/python-typing/Config.in | 8 -------- package/python-typing/python-typing.hash | 5 ----- package/python-typing/python-typing.mk | 15 --------------- 5 files changed, 6 insertions(+), 29 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 8db9558ed4..998ea6b231 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_TYPING + bool "python-typing removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_SUBPROCESS32 bool "python-subprocess32 removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index 18de2a32a5..cfc4522be9 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1264,7 +1264,6 @@ menu "External python modules" source "package/python-txdbus/Config.in" source "package/python-txtorcon/Config.in" source "package/python-typepy/Config.in" - source "package/python-typing/Config.in" source "package/python-typing-extensions/Config.in" source "package/python-u-msgpack/Config.in" source "package/python-ubjson/Config.in" diff --git a/package/python-typing/Config.in b/package/python-typing/Config.in deleted file mode 100644 index 81b7d71b4b..0000000000 --- a/package/python-typing/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PYTHON_TYPING - bool "python-typing" - depends on BR2_PACKAGE_PYTHON - help - Type Hints for Python. This is a backport of the standard - library typing module to Python versions older than 3.5. - - https://docs.python.org/3/library/typing.html diff --git a/package/python-typing/python-typing.hash b/package/python-typing/python-typing.hash deleted file mode 100644 index f587eb7bfa..0000000000 --- a/package/python-typing/python-typing.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/typing/json -md5 d6dd450cfe0c8c6547eef09a0491775d typing-3.10.0.0.tar.gz -sha256 13b4ad211f54ddbf93e5901a9967b1e07720c1d1b78d596ac6a439641aa1b130 typing-3.10.0.0.tar.gz -# Locally computed sha256 checksums -sha256 ff17ce94e102024deb68773eb1cc74ca76da4e658f373531f0ac22d68a6bb1ad LICENSE diff --git a/package/python-typing/python-typing.mk b/package/python-typing/python-typing.mk deleted file mode 100644 index dd1d8f29b5..0000000000 --- a/package/python-typing/python-typing.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# python-typing -# -################################################################################ - -PYTHON_TYPING_VERSION = 3.10.0.0 -PYTHON_TYPING_SOURCE = typing-$(PYTHON_TYPING_VERSION).tar.gz -PYTHON_TYPING_SITE = https://files.pythonhosted.org/packages/b0/1b/835d4431805939d2996f8772aca1d2313a57e8860fec0e48e8e7dfe3a477 -PYTHON_TYPING_SETUP_TYPE = setuptools -PYTHON_TYPING_LICENSE = Python-2.0, others -PYTHON_TYPING_LICENSE_FILES = LICENSE - -$(eval $(python-package)) -$(eval $(host-python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:13:41 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:13:41 +0100 Subject: [Buildroot] [git commit] package/python-pam: drop python2 specific package Message-ID: <20220209212602.C5C7A8323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c8ab303417e95a804719d1e1d76df8849e86d2b0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Config.in.legacy | 6 + DEVELOPERS | 1 - package/Config.in | 1 - package/python-pam/0001-dealloc.patch | 25 ---- package/python-pam/0002-nofree.patch | 68 ----------- .../0003-memory-errors-CVE2012-1502.patch | 136 --------------------- package/python-pam/Config.in | 16 --- package/python-pam/python-pam.hash | 3 - package/python-pam/python-pam.mk | 16 --- 9 files changed, 6 insertions(+), 266 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 80adf521f8..386f94e72b 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_PAM + bool "python-pam removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_NFC bool "python-nfc removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index d661693e4d..0ca1ee9f38 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2248,7 +2248,6 @@ F: package/python-docker-pycreds/ F: package/python-enum/ F: package/python-enum34/ F: package/python-functools32/ -F: package/python-pam/ F: package/python-psutil/ F: package/python-request-id/ F: package/python-semver/ diff --git a/package/Config.in b/package/Config.in index 8dc91becb0..73e8901a1d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1115,7 +1115,6 @@ menu "External python modules" source "package/python-opcua-asyncio/Config.in" source "package/python-packaging/Config.in" source "package/python-paho-mqtt/Config.in" - source "package/python-pam/Config.in" source "package/python-paramiko/Config.in" source "package/python-parso/Config.in" source "package/python-passlib/Config.in" diff --git a/package/python-pam/0001-dealloc.patch b/package/python-pam/0001-dealloc.patch deleted file mode 100644 index dd4f9610c7..0000000000 --- a/package/python-pam/0001-dealloc.patch +++ /dev/null @@ -1,25 +0,0 @@ -[PATCH] fix two bugs in the PAM object deallocation - -Fixes https://bugzilla.redhat.com/show_bug.cgi?id=658955 - -Downloaded from: -http://pkgs.fedoraproject.org/cgit/PyPAM.git/plain/PyPAM-0.5.0-dealloc.patch - -Signed-off-by: Peter Korsgaard -diff -up PyPAM-0.5.0/PAMmodule.c.dealloc PyPAM-0.5.0/PAMmodule.c ---- PyPAM-0.5.0/PAMmodule.c.dealloc 2011-01-17 22:48:22.000000000 +0100 -+++ PyPAM-0.5.0/PAMmodule.c 2011-01-18 21:24:59.000000000 +0100 -@@ -538,10 +538,11 @@ static void PyPAM_dealloc(PyPAMObject *s - free(self->service); - free(self->user); - free(self->conv); -- pam_end(self->pamh, PAM_SUCCESS); -+ if (self->pamh) -+ pam_end(self->pamh, PAM_SUCCESS); - dlclose(self->dlh2); - dlclose(self->dlh1); -- PyMem_DEL(self); -+ PyObject_Del(self); - } - - static PyObject * PyPAM_getattr(PyPAMObject *self, char *name) diff --git a/package/python-pam/0002-nofree.patch b/package/python-pam/0002-nofree.patch deleted file mode 100644 index 7de8801707..0000000000 --- a/package/python-pam/0002-nofree.patch +++ /dev/null @@ -1,68 +0,0 @@ -[PATCH] deallocate the conversation response only in case of error - -Fixes https://bugzilla.redhat.com/show_bug.cgi?id=679714 - -Downloaded from: -http://pkgs.fedoraproject.org/cgit/PyPAM.git/plain/PyPAM-0.5.0-nofree.patch - -Signed-off-by: Peter Korsgaard -diff --git a/PAMmodule.c b/PAMmodule.c -index 03cb799..a7ff8a5 100644 ---- a/PAMmodule.c -+++ b/PAMmodule.c -@@ -24,8 +24,6 @@ typedef struct { - char *service; - char *user; - PyObject *callback; -- struct pam_response *response_data; -- int response_len; - PyObject *user_data; - void *dlh1, *dlh2; - } PyPAMObject; -@@ -54,15 +52,6 @@ static int PyPAM_conv(int num_msg, const struct pam_message **msg, - - Py_INCREF(self); - -- if (NULL != self->response_data) { -- for (int i = 0; i < self->response_len; i++) { -- free(self->response_data[0].resp); -- } -- free(self->response_data); -- self->response_data = NULL; -- self->response_len = 0; -- } -- - PyObject* msgList = PyList_New(num_msg); - - for (int i = 0; i < num_msg; i++) { -@@ -92,6 +81,10 @@ static int PyPAM_conv(int num_msg, const struct pam_message **msg, - char* resp_text; - int resp_retcode = 0; - if (!PyArg_ParseTuple(respTuple, "si", &resp_text, &resp_retcode)) { -+ while (i > 0) { -+ free((--spr)->resp); -+ --i; -+ } - free(*resp); - Py_DECREF(respList); - return PAM_CONV_ERR; -@@ -100,10 +93,6 @@ static int PyPAM_conv(int num_msg, const struct pam_message **msg, - spr->resp_retcode = resp_retcode; - Py_DECREF(respTuple); - } -- -- // Save this so we can free it later. -- self->response_data = *resp; -- self->response_len = PyList_Size(respList); - - Py_DECREF(respList); - -@@ -144,8 +133,6 @@ static PyObject * PyPAM_pam(PyObject *self, PyObject *args) - p->user = NULL; - Py_INCREF(Py_None); - p->callback = Py_None; -- p->response_data = NULL; -- p->response_len = 0; - Py_INCREF(Py_None); - p->user_data = Py_None; - diff --git a/package/python-pam/0003-memory-errors-CVE2012-1502.patch b/package/python-pam/0003-memory-errors-CVE2012-1502.patch deleted file mode 100644 index 62405db058..0000000000 --- a/package/python-pam/0003-memory-errors-CVE2012-1502.patch +++ /dev/null @@ -1,136 +0,0 @@ -[PATCH] Fix Double Free Corruption (CVE2012-1502) - -Downloaded from: -http://pkgs.fedoraproject.org/cgit/PyPAM.git/plain/PyPAM-0.5.0-memory-errors.patch - -For details, see: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-1502 - -Signed-off-by: Peter Korsgaard -diff -up PyPAM-0.5.0/PAMmodule.c.memory PyPAM-0.5.0/PAMmodule.c ---- PyPAM-0.5.0/PAMmodule.c.memory 2012-05-07 17:22:54.503914026 +0200 -+++ PyPAM-0.5.0/PAMmodule.c 2012-05-07 17:23:15.644381942 +0200 -@@ -37,33 +37,48 @@ static void PyPAM_Err(PyPAMObject *self, - - err_msg = pam_strerror(self->pamh, result); - error = Py_BuildValue("(si)", err_msg, result); -- Py_INCREF(PyPAM_Error); - PyErr_SetObject(PyPAM_Error, error); -+ Py_XDECREF(error); - } - - static int PyPAM_conv(int num_msg, const struct pam_message **msg, - struct pam_response **resp, void *appdata_ptr) - { -- PyObject *args; -- -+ PyObject *args, *msgList, *respList, *item; -+ struct pam_response *response, *spr; - PyPAMObject* self = (PyPAMObject *) appdata_ptr; -+ - if (self->callback == NULL) - return PAM_CONV_ERR; - - Py_INCREF(self); - -- PyObject* msgList = PyList_New(num_msg); -- -+ msgList = PyList_New(num_msg); -+ if (msgList == NULL) { -+ Py_DECREF(self); -+ return PAM_CONV_ERR; -+ } -+ - for (int i = 0; i < num_msg; i++) { -- PyList_SetItem(msgList, i, -- Py_BuildValue("(si)", msg[i]->msg, msg[i]->msg_style)); -+ item = Py_BuildValue("(si)", msg[i]->msg, msg[i]->msg_style); -+ if (item == NULL) { -+ Py_DECREF(msgList); -+ Py_DECREF(self); -+ return PAM_CONV_ERR; -+ } -+ PyList_SetItem(msgList, i, item); - } -- -+ - args = Py_BuildValue("(OO)", self, msgList); -- PyObject* respList = PyEval_CallObject(self->callback, args); -+ if (args == NULL) { -+ Py_DECREF(self); -+ Py_DECREF(msgList); -+ return PAM_CONV_ERR; -+ } -+ respList = PyEval_CallObject(self->callback, args); - Py_DECREF(args); - Py_DECREF(self); -- -+ - if (respList == NULL) - return PAM_CONV_ERR; - -@@ -71,11 +86,15 @@ static int PyPAM_conv(int num_msg, const - Py_DECREF(respList); - return PAM_CONV_ERR; - } -- -- *resp = (struct pam_response *) malloc( -+ -+ response = (struct pam_response *) malloc( - PyList_Size(respList) * sizeof(struct pam_response)); -+ if (response == NULL) { -+ Py_DECREF(respList); -+ return PAM_CONV_ERR; -+ } -+ spr = response; - -- struct pam_response* spr = *resp; - for (int i = 0; i < PyList_Size(respList); i++, spr++) { - PyObject* respTuple = PyList_GetItem(respList, i); - char* resp_text; -@@ -85,7 +104,7 @@ static int PyPAM_conv(int num_msg, const - free((--spr)->resp); - --i; - } -- free(*resp); -+ free(response); - Py_DECREF(respList); - return PAM_CONV_ERR; - } -@@ -95,7 +114,8 @@ static int PyPAM_conv(int num_msg, const - } - - Py_DECREF(respList); -- -+ *resp = response; -+ - return PAM_SUCCESS; - } - -@@ -122,7 +142,11 @@ static PyObject * PyPAM_pam(PyObject *se - PyPAMObject_Type.ob_type = &PyType_Type; - p = (PyPAMObject *) PyObject_NEW(PyPAMObject, &PyPAMObject_Type); - -+ if (p == NULL) -+ return NULL; -+ - if ((spc = (struct pam_conv *) malloc(sizeof(struct pam_conv))) == NULL) { -+ Py_DECREF((PyObject *)p); - PyErr_SetString(PyExc_MemoryError, "out of memory"); - return NULL; - } -@@ -455,9 +479,15 @@ static PyObject * PyPAM_getenvlist(PyObj - } - - retval = PyList_New(0); -+ if (retval == NULL) -+ return NULL; - - while ((cp = *(result++)) != NULL) { - entry = Py_BuildValue("s", cp); -+ if (entry == NULL) { -+ Py_DECREF(retval); -+ return NULL; -+ } - PyList_Append(retval, entry); - Py_DECREF(entry); - } diff --git a/package/python-pam/Config.in b/package/python-pam/Config.in deleted file mode 100644 index 92ba105ebf..0000000000 --- a/package/python-pam/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -comment "python-pam needs a toolchain w/ wchar, locale, dynamic library" - depends on BR2_PACKAGE_PYTHON - depends on !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR || BR2_STATIC_LIBS - -config BR2_PACKAGE_PYTHON_PAM - bool "python-pam" - depends on BR2_PACKAGE_PYTHON # C extension not compatible with python3 - depends on BR2_ENABLE_LOCALE # linux-pam - depends on BR2_USE_WCHAR # linux-pam - depends on BR2_USE_MMU # linux-pam - depends on !BR2_STATIC_LIBS # linux-pam - select BR2_PACKAGE_LINUX_PAM - help - PAM (Pluggable Authentication Module) bindings for Python. - - https://admin.fedoraproject.org/pkgdb/package/PyPAM/ diff --git a/package/python-pam/python-pam.hash b/package/python-pam/python-pam.hash deleted file mode 100644 index 303455ae2f..0000000000 --- a/package/python-pam/python-pam.hash +++ /dev/null @@ -1,3 +0,0 @@ -# locally computed -sha256 796ac019b9ee805696d0d277d8fb912fa2391b6ac070dc6f9f1a9a0fadbc3a5a PyPAM-0.5.0.tar.gz -sha256 ca0061fc1381a3ab242310e4b3f56389f28e3d460eb2fd822ed7a21c6f030532 COPYING diff --git a/package/python-pam/python-pam.mk b/package/python-pam/python-pam.mk deleted file mode 100644 index 943e01dd64..0000000000 --- a/package/python-pam/python-pam.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# python-pam -# -################################################################################ - -PYTHON_PAM_VERSION = 0.5.0 -PYTHON_PAM_SOURCE = PyPAM-$(PYTHON_PAM_VERSION).tar.gz -# pangalactic.org gone -PYTHON_PAM_SITE = http://pkgs.fedoraproject.org/repo/pkgs/PyPAM/PyPAM-0.5.0.tar.gz/f1e7c2c56421dda28a75ace59a3c8871 -PYTHON_PAM_SETUP_TYPE = distutils -PYTHON_PAM_LICENSE = LGPL-2.1 -PYTHON_PAM_LICENSE_FILES = COPYING -PYTHON_PAM_DEPENDENCIES = linux-pam - -$(eval $(python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:09:10 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:09:10 +0100 Subject: [Buildroot] [git commit] package/python-flask: drop python2 support Message-ID: <20220209212600.BDE9980196@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=458bdb7f02144ab85729743b4506741601cb3d84 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The package alredy depended on python3, so no functional change. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-flask/Config.in | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/package/python-flask/Config.in b/package/python-flask/Config.in index 56bfe10f01..8a44bf2db4 100644 --- a/package/python-flask/Config.in +++ b/package/python-flask/Config.in @@ -1,15 +1,12 @@ config BR2_PACKAGE_PYTHON_FLASK bool "python-flask" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_CLICK # runtime select BR2_PACKAGE_PYTHON_JINJA2 # runtime select BR2_PACKAGE_PYTHON_WERKZEUG # runtime select BR2_PACKAGE_PYTHON_ITSDANGEROUS # runtime select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime - select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_SSL + select BR2_PACKAGE_PYTHON3_ZLIB help Flask is a microframework for Python based on Werkzeug, Jinja 2 and good intentions. From yann.morin.1998 at free.fr Wed Feb 9 21:08:12 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:08:12 +0100 Subject: [Buildroot] [git commit] package/iotop: drop python2 support Message-ID: <20220209212559.D2C5D8323E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bdc286aa907c7b682777254ec1256c981391b525 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/iotop/Config.in | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/package/iotop/Config.in b/package/iotop/Config.in index ada6131606..460503b9d7 100644 --- a/package/iotop/Config.in +++ b/package/iotop/Config.in @@ -1,11 +1,10 @@ -comment "iotop depends on python or python3" - depends on !BR2_PACKAGE_PYTHON && !BR2_PACKAGE_PYTHON3 +comment "iotop depends on python3" + depends on !BR2_PACKAGE_PYTHON3 config BR2_PACKAGE_IOTOP bool "iotop" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 - select BR2_PACKAGE_PYTHON_CURSES if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_CURSES if BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_CURSES help iotop does for I/O usage what top does for CPU usage. From yann.morin.1998 at free.fr Wed Feb 9 21:13:58 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:13:58 +0100 Subject: [Buildroot] [git commit] package/python-yieldfrom: drop python2 specific package Message-ID: <20220209212603.202918323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ecee967c03d8215ff3a40eed7c4faa42a14fd137 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Config.in.legacy | 6 ++++++ package/Config.in | 1 - package/python-yieldfrom/Config.in | 8 -------- package/python-yieldfrom/python-yieldfrom.hash | 5 ----- package/python-yieldfrom/python-yieldfrom.mk | 15 --------------- 5 files changed, 6 insertions(+), 29 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 998ea6b231..47e8d696e0 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_YIELDFROM + bool "python-yieldfrom removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_TYPING bool "python-typing removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index cfc4522be9..6fb62caa4c 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1300,7 +1300,6 @@ menu "External python modules" source "package/python-xmodem/Config.in" source "package/python-yarl/Config.in" source "package/python-yatl/Config.in" - source "package/python-yieldfrom/Config.in" source "package/python-zc-lockfile/Config.in" source "package/python-zeroconf/Config.in" source "package/python-zope-interface/Config.in" diff --git a/package/python-yieldfrom/Config.in b/package/python-yieldfrom/Config.in deleted file mode 100644 index 1a063d3128..0000000000 --- a/package/python-yieldfrom/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PYTHON_YIELDFROM - bool "python-yieldfrom" - depends on BR2_PACKAGE_PYTHON - help - A backport of the `yield from` semantic from Python 3.x to - Python 2.7. - - https://github.com/Nurdok/yieldfrom/ diff --git a/package/python-yieldfrom/python-yieldfrom.hash b/package/python-yieldfrom/python-yieldfrom.hash deleted file mode 100644 index 7730a1e578..0000000000 --- a/package/python-yieldfrom/python-yieldfrom.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/yieldfrom/json -md5 fd94120625ac1e69bb5946d5e63182da yieldfrom-1.0.5.tar.gz -sha256 eb75e58641410f06083f85013a438f28bceaabfe5af9c3206d5049362c37aca0 yieldfrom-1.0.5.tar.gz -# Locally computed sha256 checksums -sha256 b3092d61cce29e25f3799285495095d220e5e015b88c1c70e1e72dae052f21e8 LICENSE diff --git a/package/python-yieldfrom/python-yieldfrom.mk b/package/python-yieldfrom/python-yieldfrom.mk deleted file mode 100644 index c926936ae8..0000000000 --- a/package/python-yieldfrom/python-yieldfrom.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# python-yieldfrom -# -################################################################################ - -PYTHON_YIELDFROM_VERSION = 1.0.5 -PYTHON_YIELDFROM_SOURCE = yieldfrom-$(PYTHON_YIELDFROM_VERSION).tar.gz -PYTHON_YIELDFROM_SITE = https://files.pythonhosted.org/packages/4d/f9/395917f574ace618eb234bcbae8df3fabaa9624532d96d1fbd3a20678b1e -PYTHON_YIELDFROM_SETUP_TYPE = setuptools -PYTHON_YIELDFROM_LICENSE = MIT -PYTHON_YIELDFROM_LICENSE_FILES = LICENSE - -$(eval $(python-package)) -$(eval $(host-python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:16:23 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:16:23 +0100 Subject: [Buildroot] [git commit] package/python-enum34: drop python2 specific package Message-ID: <20220209212603.4CA068323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cbd2900ba81c4bb0ce9664850fcd1c3ec7de2a60 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Config.in.legacy | 6 ++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/python-enum34/Config.in | 12 ------------ package/python-enum34/python-enum34.hash | 5 ----- package/python-enum34/python-enum34.mk | 17 ----------------- 6 files changed, 6 insertions(+), 36 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index bc5df0e489..7df95691ca 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_ENUM34 + bool "python-enum34 removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_ENUM bool "python-enum removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 0716729cee..92abe8a6dd 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2243,7 +2243,6 @@ F: package/python-cached-property/ F: package/python-docker/ F: package/python-dockerpty/ F: package/python-docker-pycreds/ -F: package/python-enum34/ F: package/python-functools32/ F: package/python-psutil/ F: package/python-request-id/ diff --git a/package/Config.in b/package/Config.in index f134b626be..18388f82c3 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1010,7 +1010,6 @@ menu "External python modules" source "package/python-ecdsa/Config.in" source "package/python-engineio/Config.in" source "package/python-entrypoints/Config.in" - source "package/python-enum34/Config.in" source "package/python-esptool/Config.in" source "package/python-falcon/Config.in" source "package/python-filelock/Config.in" diff --git a/package/python-enum34/Config.in b/package/python-enum34/Config.in deleted file mode 100644 index 2511a350e0..0000000000 --- a/package/python-enum34/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_PYTHON_ENUM34 - bool "python-enum34" - depends on BR2_PACKAGE_PYTHON - help - Python 3.4 Enum backported to 2.x. - - An enumeration is a set of symbolic names (members) bound to - unique, constant values. Within an enumeration, the members - can be compared by identity, and the enumeration itself can - be iterated over. - - https://pypi.python.org/pypi/enum34 diff --git a/package/python-enum34/python-enum34.hash b/package/python-enum34/python-enum34.hash deleted file mode 100644 index e43e00a5fe..0000000000 --- a/package/python-enum34/python-enum34.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5 from https://pypi.python.org/pypi/enum34/json -md5 b5ac0bb5ea9e830029599e410d09d3b5 enum34-1.1.10.tar.gz -# Locally computed -sha256 cce6a7477ed816bd2542d03d53db9f0db935dd013b70f336a95c73979289f248 enum34-1.1.10.tar.gz -sha256 88ec6a6c8eafa3b9757e745783938bef3f5e4d5e3c76b1db576aa3ab520e5e1d enum/LICENSE diff --git a/package/python-enum34/python-enum34.mk b/package/python-enum34/python-enum34.mk deleted file mode 100644 index 0bd00508aa..0000000000 --- a/package/python-enum34/python-enum34.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# python-enum34 -# -################################################################################ - -PYTHON_ENUM34_VERSION = 1.1.10 -PYTHON_ENUM34_SOURCE = enum34-$(PYTHON_ENUM34_VERSION).tar.gz -PYTHON_ENUM34_SITE = https://files.pythonhosted.org/packages/11/c4/2da1f4952ba476677a42f25cd32ab8aaf0e1c0d0e00b89822b835c7e654c -PYTHON_ENUM34_SETUP_TYPE = setuptools -PYTHON_ENUM34_LICENSE = BSD-3-Clause -PYTHON_ENUM34_LICENSE_FILES = enum/LICENSE -PYTHON_ENUM34_CPE_ID_VENDOR = python -PYTHON_ENUM34_CPE_ID_PRODUCT = enum34 - -$(eval $(python-package)) -$(eval $(host-python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:07:59 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:07:59 +0100 Subject: [Buildroot] [git commit] package/evemu: drop python2 support Message-ID: <20220209212559.A0BA681335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8af1b5df85d0e9eac8926b1b967d2737d1947a74 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/evemu/evemu.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/evemu/evemu.mk b/package/evemu/evemu.mk index 02e5abdb8f..b27033afa4 100644 --- a/package/evemu/evemu.mk +++ b/package/evemu/evemu.mk @@ -22,9 +22,9 @@ EVEMU_CONF_OPTS += --disable-tests EVEMU_DEPENDENCIES = host-pkgconf libevdev # Check for target python -ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) EVEMU_CONF_OPTS += --enable-python-bindings -EVEMU_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON3),python3,python) +EVEMU_DEPENDENCIES += python3 else EVEMU_CONF_OPTS += --disable-python-bindings endif From yann.morin.1998 at free.fr Wed Feb 9 21:09:15 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:09:15 +0100 Subject: [Buildroot] [git commit] package/python-libconfig: drop python2 support Message-ID: <20220209212600.D07228323E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8d73a7adde447b730e11fea5a2938f7737f47b95 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-libconfig/python-libconfig.mk | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/package/python-libconfig/python-libconfig.mk b/package/python-libconfig/python-libconfig.mk index 2db7e99cf3..c7d87f408a 100644 --- a/package/python-libconfig/python-libconfig.mk +++ b/package/python-libconfig/python-libconfig.mk @@ -14,14 +14,8 @@ PYTHON_LIBCONFIG_SETUP_TYPE = setuptools PYTHON_LIBCONFIG_DEPENDENCIES = libconfig boost -ifeq ($(BR2_PACKAGE_PYTHON),y) -PYTHON_LIBCONFIG_PYVER = $(PYTHON_VERSION_MAJOR) -else ifeq ($(BR2_PACKAGE_PYTHON3),y) -PYTHON_LIBCONFIG_PYVER = $(PYTHON3_VERSION_MAJOR) -endif - define PYTHON_LIBCONFIG_FIX_SETUP - $(SED) 's/boost_python/boost_python$(subst .,,$(PYTHON_LIBCONFIG_PYVER))/g' \ + $(SED) 's/boost_python/boost_python$(subst .,,$(PYTHON3_VERSION_MAJOR))/g' \ $(@D)/setup.py endef PYTHON_LIBCONFIG_POST_PATCH_HOOKS += PYTHON_LIBCONFIG_FIX_SETUP From yann.morin.1998 at free.fr Wed Feb 9 21:09:24 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:09:24 +0100 Subject: [Buildroot] [git commit] package/python-pexpect: drop python2 support Message-ID: <20220209212601.049108323E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=480f54219da1593c16018c3f8c61a411eb9e1c04 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-pexpect/python-pexpect.mk | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/package/python-pexpect/python-pexpect.mk b/package/python-pexpect/python-pexpect.mk index a9609cbe79..3efda26825 100644 --- a/package/python-pexpect/python-pexpect.mk +++ b/package/python-pexpect/python-pexpect.mk @@ -11,14 +11,4 @@ PYTHON_PEXPECT_LICENSE = ISC PYTHON_PEXPECT_LICENSE_FILES = LICENSE PYTHON_PEXPECT_SETUP_TYPE = distutils -# async.py is not usable with Python 2, and removing is the solution -# recommended by upstream: -# https://github.com/pexpect/pexpect/issues/290 -ifeq ($(BR2_PACKAGE_PYTHON),y) -define PYTHON_PEXPECT_REMOVE_ASYNC_PY - $(RM) $(@D)/pexpect/_async.py -endef -PYTHON_PEXPECT_POST_PATCH_HOOKS += PYTHON_PEXPECT_REMOVE_ASYNC_PY -endif - $(eval $(python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:16:21 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:16:21 +0100 Subject: [Buildroot] [git commit] package/python-enum: drop python2 specific package Message-ID: <20220209212603.4132081335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ef2c5ce5d1687384f7fb0cce019af8168e3e04df branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Config.in.legacy | 6 ++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/python-enum/Config.in | 12 ------------ package/python-enum/python-enum.hash | 5 ----- package/python-enum/python-enum.mk | 14 -------------- 6 files changed, 6 insertions(+), 33 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 630194edba..bc5df0e489 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_ENUM + bool "python-enum removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_DIALOG bool "python-dialog removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 8112873f14..0716729cee 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2243,7 +2243,6 @@ F: package/python-cached-property/ F: package/python-docker/ F: package/python-dockerpty/ F: package/python-docker-pycreds/ -F: package/python-enum/ F: package/python-enum34/ F: package/python-functools32/ F: package/python-psutil/ diff --git a/package/Config.in b/package/Config.in index b91e190c8e..f134b626be 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1010,7 +1010,6 @@ menu "External python modules" source "package/python-ecdsa/Config.in" source "package/python-engineio/Config.in" source "package/python-entrypoints/Config.in" - source "package/python-enum/Config.in" source "package/python-enum34/Config.in" source "package/python-esptool/Config.in" source "package/python-falcon/Config.in" diff --git a/package/python-enum/Config.in b/package/python-enum/Config.in deleted file mode 100644 index e26ae8bf97..0000000000 --- a/package/python-enum/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_PYTHON_ENUM - bool "python-enum" - depends on BR2_PACKAGE_PYTHON - help - Robust enumerated type support in Python - - An enumeration object is an immutable sequence object built - from a sequence of strings. Each value is also available as - an attribute. Such values are constant. Comparisons and - enumeration are supported. - - https://pypi.python.org/pypi/enum diff --git a/package/python-enum/python-enum.hash b/package/python-enum/python-enum.hash deleted file mode 100644 index 4b4b369e34..0000000000 --- a/package/python-enum/python-enum.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/enum/json -md5 e7d170e3f84435b77058de625c96ef58 enum-0.4.7.tar.gz -sha256 8c7cf3587eda51008bcc1eed99ea2c331ccd265c231dbaa95ec5258d3dc03100 enum-0.4.7.tar.gz -# Locally computed sha256 checksums -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL-3 diff --git a/package/python-enum/python-enum.mk b/package/python-enum/python-enum.mk deleted file mode 100644 index f1de8a9312..0000000000 --- a/package/python-enum/python-enum.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-enum -# -################################################################################ - -PYTHON_ENUM_VERSION = 0.4.7 -PYTHON_ENUM_SOURCE = enum-$(PYTHON_ENUM_VERSION).tar.gz -PYTHON_ENUM_SITE = https://files.pythonhosted.org/packages/02/a0/32e1d5a21b703f600183e205aafc6773577e16429af5ad3c3f9b956b07ca -PYTHON_ENUM_SETUP_TYPE = setuptools -PYTHON_ENUM_LICENSE = GPL-3.0+ -PYTHON_ENUM_LICENSE_FILES = LICENSE.GPL-3 - -$(eval $(python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:08:10 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:08:10 +0100 Subject: [Buildroot] [git commit] package/i2c-tools: drop python2 support Message-ID: <20220209212559.CB3038323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f8c3859b6f351aab631e1b3abdb87ce8fa930d3d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/i2c-tools/i2c-tools.mk | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/package/i2c-tools/i2c-tools.mk b/package/i2c-tools/i2c-tools.mk index 7565349f5e..5c9ce26628 100644 --- a/package/i2c-tools/i2c-tools.mk +++ b/package/i2c-tools/i2c-tools.mk @@ -13,10 +13,6 @@ I2C_TOOLS_CPE_ID_VENDOR = i2c-tools_project I2C_TOOLS_MAKE_OPTS = EXTRA=eeprog I2C_TOOLS_INSTALL_STAGING = YES -ifeq ($(BR2_PACKAGE_PYTHON),y) -I2C_TOOLS_DEPENDENCIES += python -endif - ifeq ($(BR2_PACKAGE_PYTHON3),y) I2C_TOOLS_DEPENDENCIES += python3 endif @@ -31,7 +27,7 @@ endif # Build/install steps mirror the distutil python package type in the python package # infrastructure -ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) # BASE_ENV taken from PKG_PYTHON_DISTUTILS_ENV in package/pkg-python.mk I2C_TOOLS_PYTHON_BASE_ENV = \ $(PKG_PYTHON_DISTUTILS_ENV) \ @@ -51,7 +47,7 @@ define I2C_TOOLS_INSTALL_PYSMBUS $(PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS)) endef -endif # BR2_PACKAGE_PYTHON +endif # BR2_PACKAGE_PYTHON3 define I2C_TOOLS_BUILD_CMDS $(MAKE) $(TARGET_CONFIGURE_OPTS) $(I2C_TOOLS_MAKE_OPTS) -C $(@D) From yann.morin.1998 at free.fr Wed Feb 9 21:09:28 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:09:28 +0100 Subject: [Buildroot] [git commit] package/python-pymodbus: drop python2 support Message-ID: <20220209212601.174DD8323E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6cf1e50c952486e175abdbb8ce909fa8087eabb3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-pymodbus/python-pymodbus.mk | 9 --------- 1 file changed, 9 deletions(-) diff --git a/package/python-pymodbus/python-pymodbus.mk b/package/python-pymodbus/python-pymodbus.mk index 9135a4d0c4..d96e21a55c 100644 --- a/package/python-pymodbus/python-pymodbus.mk +++ b/package/python-pymodbus/python-pymodbus.mk @@ -11,13 +11,4 @@ PYTHON_PYMODBUS_SETUP_TYPE = setuptools PYTHON_PYMODBUS_LICENSE = BSD-3-Clause PYTHON_PYMODBUS_LICENSE_FILES = doc/LICENSE -ifeq ($(BR2_PACKAGE_PYTHON),y) -# only needed/valid for python 3.x -define PYTHON_PYMODBUS_RM_PY3_FILES - rm -rf $(TARGET_DIR)/usr/lib/python*/site-packages/pymodbus/client/asynchronous/asyncio -endef - -PYTHON_PYMODBUS_POST_INSTALL_TARGET_HOOKS += PYTHON_PYMODBUS_RM_PY3_FILES -endif - $(eval $(python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:08:05 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:08:05 +0100 Subject: [Buildroot] [git commit] package/gpsd: drop python2 support Message-ID: <20220209212559.BB9658323E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e643be1bfc3dccd82e0940d61c5f6954f4033a21 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/gpsd/Config.in | 4 ++-- package/gpsd/gpsd.mk | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/package/gpsd/Config.in b/package/gpsd/Config.in index 1da9a5ce2a..b66d0952dd 100644 --- a/package/gpsd/Config.in +++ b/package/gpsd/Config.in @@ -81,8 +81,8 @@ config BR2_PACKAGE_GPSD_SQUELCH config BR2_PACKAGE_GPSD_PYTHON bool "build Python support and modules" - depends on BR2_USE_WCHAR # python - select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON + depends on BR2_USE_WCHAR # python3 + select BR2_PACKAGE_PYTHON3 help Python libraries and tools for the gpsd service daemon including gpsfake test harness. diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk index 636c6c95ba..4388b7e24d 100644 --- a/package/gpsd/gpsd.mk +++ b/package/gpsd/gpsd.mk @@ -194,10 +194,6 @@ ifeq ($(BR2_PACKAGE_PYTHON3),y) GPSD_SCONS_OPTS += \ python=yes \ python_libdir="/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages" -else ifeq ($(BR2_PACKAGE_PYTHON),y) -GPSD_SCONS_OPTS += \ - python=yes \ - python_libdir="/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages" else GPSD_SCONS_OPTS += python=no endif From yann.morin.1998 at free.fr Wed Feb 9 21:08:17 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:08:17 +0100 Subject: [Buildroot] [git commit] package/kmod: drop python2 support Message-ID: <20220209212559.E67A18323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7f0c0f3bc2431a38d38de22e922c5c55a9773fce branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/kmod/kmod.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk index c7f510ec0f..82e8597759 100644 --- a/package/kmod/kmod.mk +++ b/package/kmod/kmod.mk @@ -62,8 +62,8 @@ else KMOD_CONF_OPTS += --without-openssl endif -ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) -KMOD_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,python3) +ifeq ($(BR2_PACKAGE_PYTHON3),y) +KMOD_DEPENDENCIES += python3 KMOD_CONF_OPTS += --enable-python endif From yann.morin.1998 at free.fr Wed Feb 9 21:09:42 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:09:42 +0100 Subject: [Buildroot] [git commit] package/python-reentry: drop python2 support Message-ID: <20220209212601.4F2BA8323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8bdfa708578d72c05797f34ea96e81f4abce83a9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-reentry/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/python-reentry/Config.in b/package/python-reentry/Config.in index 8ebbe395c8..07d8988a18 100644 --- a/package/python-reentry/Config.in +++ b/package/python-reentry/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_PYTHON_REENTRY select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime select BR2_PACKAGE_PYTHON_CLICK # runtime select BR2_PACKAGE_PYTHON_SIX # runtime - select BR2_PACKAGE_PYTHON_PATHLIB2 if BR2_PACKAGE_PYTHON # runtime help A plugin manager based on setuptools entry points mechanism. From yann.morin.1998 at free.fr Wed Feb 9 21:09:49 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:09:49 +0100 Subject: [Buildroot] [git commit] package/python-sentry-sdk: drop python2 support Message-ID: <20220209212601.68C598323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0cdc510d7b62562ae1e9018cec26a50f4b33dba6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-sentry-sdk/python-sentry-sdk.mk | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/package/python-sentry-sdk/python-sentry-sdk.mk b/package/python-sentry-sdk/python-sentry-sdk.mk index 556f03e137..9238b7fb1c 100644 --- a/package/python-sentry-sdk/python-sentry-sdk.mk +++ b/package/python-sentry-sdk/python-sentry-sdk.mk @@ -11,14 +11,4 @@ PYTHON_SENTRY_SDK_SETUP_TYPE = setuptools PYTHON_SENTRY_SDK_LICENSE = BSD-2-Clause PYTHON_SENTRY_SDK_LICENSE_FILES = LICENSE -ifeq ($(BR2_PACKAGE_PYTHON),y) -# only needed/valid for python 3.x -define PYTHON_SENTRY_SDK_RM_PY3_FILES - rm -f $(addprefix $(TARGET_DIR)/usr/lib/python*/site-packages/sentry_sdk/integrations/,\ - aiohttp.py asgi.py django/asgi.py httpx.py sanic.py tornado.py) -endef - -PYTHON_SENTRY_SDK_POST_INSTALL_TARGET_HOOKS += PYTHON_SENTRY_SDK_RM_PY3_FILES -endif - $(eval $(python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:08:22 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:08:22 +0100 Subject: [Buildroot] [git commit] package/libevent: drop python2 support Message-ID: <20220209212600.01E5981335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=538dc7f0270485675d8d88d0a7be3ab21901f0b0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/libevent/libevent.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libevent/libevent.mk b/package/libevent/libevent.mk index 93ba88ca88..4c23156f72 100644 --- a/package/libevent/libevent.mk +++ b/package/libevent/libevent.mk @@ -25,7 +25,7 @@ endef # libevent installs a python script to target - get rid of it if we # don't have python support enabled -ifneq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) +ifneq ($(BR2_PACKAGE_PYTHON3),y) LIBEVENT_POST_INSTALL_TARGET_HOOKS += LIBEVENT_REMOVE_PYSCRIPT endif From yann.morin.1998 at free.fr Wed Feb 9 21:09:52 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:09:52 +0100 Subject: [Buildroot] [git commit] package/python-setuptools: drop python2 support Message-ID: <20220209212601.7147B8323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d83f1f933f45ad5824c594aa939c2772cdb184eb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For the target. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-setuptools/Config.in | 6 ++---- package/python-setuptools/python-setuptools.mk | 16 ---------------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/package/python-setuptools/Config.in b/package/python-setuptools/Config.in index f203d0f814..28228534f8 100644 --- a/package/python-setuptools/Config.in +++ b/package/python-setuptools/Config.in @@ -1,9 +1,7 @@ config BR2_PACKAGE_PYTHON_SETUPTOOLS bool "python-setuptools" - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_ZLIB # runtime + select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime help Download, build, install, upgrade, and uninstall Python packages. diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk index 8bca852fe2..04b872fb79 100644 --- a/package/python-setuptools/python-setuptools.mk +++ b/package/python-setuptools/python-setuptools.mk @@ -4,19 +4,11 @@ # ################################################################################ -# For the target variant, we adapt the version depending on whether -# Python 3.x or 2.x is selected for the target. -ifeq ($(BR2_PACKAGE_PYTHON3),y) # Please keep in sync with # package/python3-setuptools/python3-setuptools.mk PYTHON_SETUPTOOLS_VERSION = 60.7.0 PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON3_SETUPTOOLS_VERSION).tar.gz PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/29/dd/48d662bb93e5e51e72265ef612f869947d4ae4126328d7156824cd50d440 -else # Python -PYTHON_SETUPTOOLS_VERSION = 44.0.0 -PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).zip -PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/b0/f3/44da7482ac6da3f36f68e253cb04de37365b3dba9036a3c70773b778b485 -endif # The host variant is only for Python 2.x, so we need to use 44.0.0. HOST_PYTHON_SETUPTOOLS_VERSION = 44.0.0 @@ -30,14 +22,6 @@ PYTHON_SETUPTOOLS_CPE_ID_VENDOR = python PYTHON_SETUPTOOLS_CPE_ID_PRODUCT = setuptools PYTHON_SETUPTOOLS_SETUP_TYPE = setuptools -ifeq ($(BR2_PACKAGE_PYTHON),y) -define PYTHON_SETUPTOOLS_EXTRACT_CMDS - $(UNZIP) -d $(@D) $(PYTHON_SETUPTOOLS_DL_DIR)/$(PYTHON_SETUPTOOLS_SOURCE) - mv $(@D)/setuptools-$(PYTHON_SETUPTOOLS_VERSION)/* $(@D) - $(RM) -r $(@D)/setuptools-$(PYTHON_SETUPTOOLS_VERSION) -endef -endif - define HOST_PYTHON_SETUPTOOLS_EXTRACT_CMDS $(UNZIP) -d $(@D) $(HOST_PYTHON_SETUPTOOLS_DL_DIR)/$(HOST_PYTHON_SETUPTOOLS_SOURCE) mv $(@D)/setuptools-$(HOST_PYTHON_SETUPTOOLS_VERSION)/* $(@D) From yann.morin.1998 at free.fr Wed Feb 9 21:08:29 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:08:29 +0100 Subject: [Buildroot] [git commit] package/libpwquality: drop python2 support Message-ID: <20220209212600.1A1B181335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fe70e4987e6fbcb986b28790c9311d1f3b56f8d1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/libpwquality/libpwquality.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libpwquality/libpwquality.mk b/package/libpwquality/libpwquality.mk index 54a03be453..d4f7a47120 100644 --- a/package/libpwquality/libpwquality.mk +++ b/package/libpwquality/libpwquality.mk @@ -12,9 +12,9 @@ LIBPWQUALITY_INSTALL_STAGING = YES LIBPWQUALITY_DEPENDENCIES = cracklib LIBPWQUALITY_LICENSE_FILES = COPYING -ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) LIBPWQUALITY_CONF_OPTS += --enable-python-bindings -LIBPWQUALITY_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON3),python3,python) +LIBPWQUALITY_DEPENDENCIES += python3 LIBPWQUALITY_MAKE_ENV += $(PKG_PYTHON_DISTUTILS_ENV) else LIBPWQUALITY_CONF_OPTS += --disable-python-bindings From yann.morin.1998 at free.fr Wed Feb 9 21:09:58 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:09:58 +0100 Subject: [Buildroot] [git commit] package/python-typing-extensions: drop python2 support Message-ID: <20220209212601.8B0EB8323E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=26ddbe11ab24a0dd33d920c088393728d5821030 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-typing-extensions/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/python-typing-extensions/Config.in b/package/python-typing-extensions/Config.in index 0c7c74c5fa..b59693282f 100644 --- a/package/python-typing-extensions/Config.in +++ b/package/python-typing-extensions/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS bool "python-typing-extensions" - select BR2_PACKAGE_PYTHON_TYPING if BR2_PACKAGE_PYTHON # runtime help Backported and Experimental Type Hints for Python 3.5+. From yann.morin.1998 at free.fr Wed Feb 9 21:08:31 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:08:31 +0100 Subject: [Buildroot] [git commit] package/libsigrokdecode: drop reference to python2 Message-ID: <20220209212600.2304D81335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ae86cd8dba6579443559a03058bf02e08a8fae38 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/libsigrokdecode/Config.in | 6 ------ 1 file changed, 6 deletions(-) diff --git a/package/libsigrokdecode/Config.in b/package/libsigrokdecode/Config.in index 28cbb5ca5e..b58c8a2a29 100644 --- a/package/libsigrokdecode/Config.in +++ b/package/libsigrokdecode/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_LIBSIGROKDECODE bool "libsigrokdecode" - depends on !BR2_PACKAGE_PYTHON # python3 depends on BR2_USE_WCHAR # libglib2/python3 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2/python3 depends on BR2_USE_MMU # libglib2/python3 @@ -19,9 +18,4 @@ config BR2_PACKAGE_LIBSIGROKDECODE comment "libsigrokdecode needs a toolchain w/ wchar, threads, dynamic library" depends on BR2_USE_MMU - depends on !BR2_PACKAGE_PYTHON depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS - -comment "libsigrokdecode is not compatible with python" - depends on BR2_USE_MMU - depends on BR2_PACKAGE_PYTHON From yann.morin.1998 at free.fr Wed Feb 9 21:10:08 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:10:08 +0100 Subject: [Buildroot] [git commit] package/python-websocket-client: drop python2 support Message-ID: <20220209212601.AD1EC8323E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=30cb3dfab2ffe0c69b95b0f29363613b38d1ba52 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-websocket-client/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-websocket-client/Config.in b/package/python-websocket-client/Config.in index 0fbb15b328..519e506615 100644 --- a/package/python-websocket-client/Config.in +++ b/package/python-websocket-client/Config.in @@ -1,8 +1,7 @@ config BR2_PACKAGE_PYTHON_WEBSOCKET_CLIENT bool "python-websocket-client" select BR2_PACKAGE_PYTHON_SIX # runtime - select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_SSL # runtime help WebSocket client for python. hybi13 is supported. From yann.morin.1998 at free.fr Wed Feb 9 21:08:40 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:08:40 +0100 Subject: [Buildroot] [git commit] package/nftables: drop python2 support Message-ID: <20220209212600.458A981335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e45321b19cd193ba333012cfc56439650a8907e3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/nftables/nftables.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/nftables/nftables.mk b/package/nftables/nftables.mk index d5c16ac2be..232d541488 100644 --- a/package/nftables/nftables.mk +++ b/package/nftables/nftables.mk @@ -35,9 +35,9 @@ else NFTABLES_CONF_OPTS += --without-json endif -ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) NFTABLES_CONF_OPTS += --enable-python -NFTABLES_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,python3) +NFTABLES_DEPENDENCIES += python3 else NFTABLES_CONF_OPTS += --disable-python endif From yann.morin.1998 at free.fr Wed Feb 9 21:10:14 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:10:14 +0100 Subject: [Buildroot] [git commit] package/python-xlrd: drop python2 support Message-ID: <20220209212601.C5B3B8323E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a7590ba6300a86206defe86646cafe5730cc5391 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-xlrd/Config.in | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package/python-xlrd/Config.in b/package/python-xlrd/Config.in index 40920f7b02..264ee93e78 100644 --- a/package/python-xlrd/Config.in +++ b/package/python-xlrd/Config.in @@ -1,9 +1,7 @@ config BR2_PACKAGE_PYTHON_XLRD bool "python-xlrd" - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_PYEXPAT + select BR2_PACKAGE_PYTHON3_ZLIB help Library for developers to extract data from Microsoft Excel(tm) spreadsheet files. From yann.morin.1998 at free.fr Wed Feb 9 21:08:38 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:08:38 +0100 Subject: [Buildroot] [git commit] package/networkd-dispatcher: drop reference to python2 Message-ID: <20220209212600.3D34981335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=02a067680373b8e1073e64a5bed99a3c0a62b8b2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/networkd-dispatcher/Config.in | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/networkd-dispatcher/Config.in b/package/networkd-dispatcher/Config.in index ab8c473951..54b48e4ca8 100644 --- a/package/networkd-dispatcher/Config.in +++ b/package/networkd-dispatcher/Config.in @@ -4,7 +4,6 @@ config BR2_PACKAGE_NETWORKD_DISPATCHER 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 @@ -23,7 +22,6 @@ config BR2_PACKAGE_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 From yann.morin.1998 at free.fr Wed Feb 9 21:10:17 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:10:17 +0100 Subject: [Buildroot] [git commit] package/python-xmltodict: drop python2 support Message-ID: <20220209212601.CDC608323E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5fbafe603554c741d54792f87e60f2aa943b5a6c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-xmltodict/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-xmltodict/Config.in b/package/python-xmltodict/Config.in index cb12392c93..af2bbbf489 100644 --- a/package/python-xmltodict/Config.in +++ b/package/python-xmltodict/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_XMLTODICT bool "python-xmltodict" - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime help Makes working with XML feel like you are working with JSON. From yann.morin.1998 at free.fr Wed Feb 9 21:08:49 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:08:49 +0100 Subject: [Buildroot] [git commit] package/python-aenum: drop python2 support Message-ID: <20220209212600.677A181335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8c08ac2eb33a738456eb268b83dffd2027405ae8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-aenum/python-aenum.mk | 9 --------- 1 file changed, 9 deletions(-) diff --git a/package/python-aenum/python-aenum.mk b/package/python-aenum/python-aenum.mk index 98695d99ce..72eaa1db2b 100644 --- a/package/python-aenum/python-aenum.mk +++ b/package/python-aenum/python-aenum.mk @@ -11,13 +11,4 @@ PYTHON_AENUM_SETUP_TYPE = setuptools PYTHON_AENUM_LICENSE = BSD-3-Clause PYTHON_AENUM_LICENSE_FILES = aenum/LICENSE -ifeq ($(BR2_PACKAGE_PYTHON),y) -# only needed/valid for python 3.x -define PYTHON_AENUM_RM_PY3_FILE - rm -f $(TARGET_DIR)/usr/lib/python*/site-packages/aenum/test_v3.py -endef - -PYTHON_AENUM_POST_INSTALL_TARGET_HOOKS += PYTHON_AENUM_RM_PY3_FILE -endif - $(eval $(python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:10:21 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:10:21 +0100 Subject: [Buildroot] [git commit] package/ranger: drop python2 support Message-ID: <20220209212601.E23BA81335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f26bd4e9196a1d242a0a98207e2911c50c4f878f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/ranger/Config.in | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package/ranger/Config.in b/package/ranger/Config.in index ee0ffecd13..a379002f95 100644 --- a/package/ranger/Config.in +++ b/package/ranger/Config.in @@ -4,9 +4,8 @@ config BR2_PACKAGE_RANGER depends on BR2_USE_WCHAR # python3 depends on BR2_TOOLCHAIN_HAS_THREADS # python3 depends on !BR2_STATIC_LIBS # python3 - select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON_CURSES if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_CURSES if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_CURSES help ranger is a console file manager with VI key bindings. It provides a minimalistic and nice curses interface with a From yann.morin.1998 at free.fr Wed Feb 9 21:08:59 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:08:59 +0100 Subject: [Buildroot] [git commit] package/python-couchdb: drop python2 support Message-ID: <20220209212600.8EE9481335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a10ad866364b4474f25233bac13676bc53d6cf0f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-couchdb/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-couchdb/Config.in b/package/python-couchdb/Config.in index 9156883b38..5bff75750b 100644 --- a/package/python-couchdb/Config.in +++ b/package/python-couchdb/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_COUCHDB bool "python-couchdb" - select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_SSL # runtime help Python client library for working with CouchDB. From yann.morin.1998 at free.fr Wed Feb 9 21:10:24 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:10:24 +0100 Subject: [Buildroot] [git commit] package/selinux-python: drop reference to python2 Message-ID: <20220209212601.E9C298323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=96cda325b1c9873bec520752507841318fd1f78c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/selinux-python/Config.in | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/selinux-python/Config.in b/package/selinux-python/Config.in index 6a518f97d4..ad50cc0735 100644 --- a/package/selinux-python/Config.in +++ b/package/selinux-python/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_SELINUX_PYTHON bool "selinux-python" - depends on !BR2_PACKAGE_PYTHON depends on BR2_USE_MMU depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS @@ -46,10 +45,6 @@ comment "sepolgen needs a toolchain w/ gcc 5" endif -comment "selinux-python needs python3" - depends on BR2_USE_MMU - depends on BR2_PACKAGE_PYTHON - comment "selinux-python packages needs a toolchain w/ wchar, threads, dynamic library" depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ From yann.morin.1998 at free.fr Wed Feb 9 21:08:52 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:08:52 +0100 Subject: [Buildroot] [git commit] package/python-argon2-cffi: drop python2 support Message-ID: <20220209212600.6F5BF81335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f11a922b3b90e11bb85f9d4c211b487188389790 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-argon2-cffi/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/python-argon2-cffi/Config.in b/package/python-argon2-cffi/Config.in index 16bbe6c4e3..5cddb3314e 100644 --- a/package/python-argon2-cffi/Config.in +++ b/package/python-argon2-cffi/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_PYTHON_ARGON2_CFFI depends on BR2_USE_MMU # libargon2 depends on !BR2_STATIC_LIBS # libargon2 select BR2_PACKAGE_PYTHON_CFFI # runtime - select BR2_PACKAGE_PYTHON_ENUM34 if BR2_PACKAGE_PYTHON # runtime select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_LIBARGON2 help From yann.morin.1998 at free.fr Wed Feb 9 21:10:37 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:10:37 +0100 Subject: [Buildroot] [git commit] package/trace-cmd: drop python2 support Message-ID: <20220209212602.284A88323E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8d6b607962404e343910b2222ad78553d5485c0e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/trace-cmd/trace-cmd.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/package/trace-cmd/trace-cmd.mk b/package/trace-cmd/trace-cmd.mk index d9ed417f20..fe0cd71ec4 100644 --- a/package/trace-cmd/trace-cmd.mk +++ b/package/trace-cmd/trace-cmd.mk @@ -18,10 +18,7 @@ ifeq ($(BR2_PACKAGE_AUDIT),y) TRACE_CMD_DEPENDENCIES += audit endif -ifeq ($(BR2_PACKAGE_PYTHON),y) -TRACE_CMD_DEPENDENCIES += python host-swig -TRACE_CMD_MAKE_OPTS += PYTHON_VERS=python -else ifeq ($(BR2_PACKAGE_PYTHON3),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) TRACE_CMD_DEPENDENCIES += python3 host-swig TRACE_CMD_MAKE_OPTS += PYTHON_VERS=python3 else From yann.morin.1998 at free.fr Wed Feb 9 21:08:42 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:08:42 +0100 Subject: [Buildroot] [git commit] package/ogre: drop python2 support Message-ID: <20220209212600.4D84E81335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2d7b5748bd5ef76d1229f7ac0149bf2934a60a86 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/ogre/ogre.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package/ogre/ogre.mk b/package/ogre/ogre.mk index 72fd616c0c..3fd2fc4650 100644 --- a/package/ogre/ogre.mk +++ b/package/ogre/ogre.mk @@ -42,9 +42,8 @@ OGRE_CONF_OPTS = -DOGRE_BUILD_DEPENDENCIES=OFF \ -DCMAKE_CXX_FLAGS="$(OGRE_CXXFLAGS)" # Enable optional python component if python interpreter is present on the target. -ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) -OGRE_DEPENDENCIES += host-swig \ - $(if $(BR2_PACKAGE_PYTHON3),host-python3,host-python) +ifeq ($(BR2_PACKAGE_PYTHON3),y) +OGRE_DEPENDENCIES += host-swig host-python3 OGRE_CONF_OPTS += -DOGRE_BUILD_COMPONENT_PYTHON=ON else OGRE_CONF_OPTS += -DOGRE_BUILD_COMPONENT_PYTHON=OFF From yann.morin.1998 at free.fr Wed Feb 9 21:13:36 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:13:36 +0100 Subject: [Buildroot] [git commit] package/python-mad: drop python2 specific package Message-ID: <20220209212602.A79418323E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=82e096a23e67961feef3e41a326aefe34cc974b8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Config.in.legacy | 6 ++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/python-mad/Config.in | 9 --------- package/python-mad/python-mad.hash | 3 --- package/python-mad/python-mad.mk | 29 ----------------------------- 6 files changed, 6 insertions(+), 43 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 14b26408fe..f6607deeeb 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_MAD + bool "python-mad removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_IPADDRESS bool "python-ipaddress removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index dbed9df4b5..9fb51b4481 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2804,7 +2804,6 @@ F: package/python3/ F: package/python-augeas/ F: package/python-flask-expects-json/ F: package/python-git/ -F: package/python-mad/ F: package/python-serial/ F: package/python-unittest-xml-reporting/ F: package/qextserialport/ diff --git a/package/Config.in b/package/Config.in index 50c0e13510..d5c46ef997 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1086,7 +1086,6 @@ menu "External python modules" source "package/python-lxml/Config.in" source "package/python-m2crypto/Config.in" source "package/python-m2r/Config.in" - source "package/python-mad/Config.in" source "package/python-mako/Config.in" source "package/python-markdown/Config.in" source "package/python-markdown2/Config.in" diff --git a/package/python-mad/Config.in b/package/python-mad/Config.in deleted file mode 100644 index 25354213d6..0000000000 --- a/package/python-mad/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PYTHON_MAD - bool "python-mad" - depends on BR2_PACKAGE_PYTHON - select BR2_PACKAGE_LIBMAD - help - python-mad is a Python binding for the MAD library, a - high-quality integer-only MPEG decoder. - - http://spacepants.org/src/pymad/ diff --git a/package/python-mad/python-mad.hash b/package/python-mad/python-mad.hash deleted file mode 100644 index 7b19ae5a44..0000000000 --- a/package/python-mad/python-mad.hash +++ /dev/null @@ -1,3 +0,0 @@ -# locally computed -sha256 1c9fc529b78de7d26e9e47cf182c9f8bf43838d8f62a9c1773540d57f5ebc522 pymad-0.6.tar.gz -sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING diff --git a/package/python-mad/python-mad.mk b/package/python-mad/python-mad.mk deleted file mode 100644 index a22214876f..0000000000 --- a/package/python-mad/python-mad.mk +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# -# python-mad -# -################################################################################ - -PYTHON_MAD_VERSION = 0.6 -PYTHON_MAD_SOURCE = pymad-$(PYTHON_MAD_VERSION).tar.gz -PYTHON_MAD_SITE = http://spacepants.org/src/pymad/download -PYTHON_MAD_SETUP_TYPE = distutils -PYTHON_MAD_LICENSE = GPL-2.0+ -PYTHON_MAD_LICENSE_FILES = COPYING - -PYTHON_MAD_DEPENDENCIES = libmad - -ifeq ($(BR2_ENDIAN),"LITTLE") -PYTHON_MAD_ENDIAN = little -else -PYTHON_MAD_ENDIAN = big -endif - -define PYTHON_MAD_CONFIGURE_CMDS - echo "endian = $(PYTHON_MAD_ENDIAN)" > $(@D)/Setup - echo "mad_libs = mad" >> $(@D)/Setup - echo "mad_lib_dir = $(STAGING_DIR)/usr/lib" >> $(@D)/Setup - echo "mad_include_dir = $(STAGING_DIR)/usr/include" >> $(@D)/Setup -endef - -$(eval $(python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:08:54 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:08:54 +0100 Subject: [Buildroot] [git commit] package/python-bsdiff4: drop python2 support Message-ID: <20220209212600.7AFCC8323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f84db1ef5537e27afffce2df9ec60702c013a6e3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-bsdiff4/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-bsdiff4/Config.in b/package/python-bsdiff4/Config.in index a383cda0f5..32070fb9a8 100644 --- a/package/python-bsdiff4/Config.in +++ b/package/python-bsdiff4/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_BSDIFF4 bool "python-bsdiff4" - select BR2_PACKAGE_PYTHON_BZIP2 if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_BZIP2 if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_BZIP2 # runtime help binary diff and patch using the BSDIFF4-format. From yann.morin.1998 at free.fr Wed Feb 9 21:09:05 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:09:05 +0100 Subject: [Buildroot] [git commit] package/python-esptool: drop python2 support Message-ID: <20220209212600.AB68780196@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9dc598a7e6f56b46cf3f6c16d13286bf82aab870 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-esptool/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-esptool/Config.in b/package/python-esptool/Config.in index 570f9aa42f..b21ccd72d5 100644 --- a/package/python-esptool/Config.in +++ b/package/python-esptool/Config.in @@ -3,8 +3,7 @@ config BR2_PACKAGE_PYTHON_ESPTOOL select BR2_PACKAGE_PYTHON_ECDSA # runtime select BR2_PACKAGE_PYTHON_PYAES # runtime select BR2_PACKAGE_PYTHON_SERIAL # runtime - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_ZLIB help A serial utility to communicate & flash code to Espressif ESP8266 & ESP32 chips. From yann.morin.1998 at free.fr Wed Feb 9 21:09:19 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:09:19 +0100 Subject: [Buildroot] [git commit] package/python-lxml: drop python2 support Message-ID: <20220209212600.E281880196@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=36ff042eab959a3113a76f72923a3a1544a1e0c3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-lxml/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-lxml/Config.in b/package/python-lxml/Config.in index fcb30d56ee..3f3cb5c550 100644 --- a/package/python-lxml/Config.in +++ b/package/python-lxml/Config.in @@ -2,8 +2,7 @@ config BR2_PACKAGE_PYTHON_LXML bool "python-lxml" select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_LIBXSLT - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_ZLIB help The lxml XML toolkit is a Pythonic binding for the C libraries libxml2 and libxslt. From yann.morin.1998 at free.fr Wed Feb 9 21:09:22 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:09:22 +0100 Subject: [Buildroot] [git commit] package/python-m2crypto: drop python2 support Message-ID: <20220209212600.F048D8323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=445726415ad7d44dbdd326facc86865f245b1c17 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-m2crypto/Config.in | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/package/python-m2crypto/Config.in b/package/python-m2crypto/Config.in index 7481d49e5c..af710d5351 100644 --- a/package/python-m2crypto/Config.in +++ b/package/python-m2crypto/Config.in @@ -1,11 +1,8 @@ config BR2_PACKAGE_PYTHON_M2CRYPTO bool "python-m2crypto" select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime - select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 # runtime - select BR2_PACKAGE_PYTHON_TYPING if BR2_PACKAGE_PYTHON # runtime + select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime + select BR2_PACKAGE_PYTHON3_SSL # runtime help M2Crypto: A Python crypto and SSL toolkit. From yann.morin.1998 at free.fr Wed Feb 9 21:09:17 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:09:17 +0100 Subject: [Buildroot] [git commit] package/python-logbook: drop python2 support Message-ID: <20220209212600.D926A80196@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=44198eee393fa90a8f24867ed7813d658410e897 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-logbook/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-logbook/Config.in b/package/python-logbook/Config.in index d4fbf0fe67..99996b6517 100644 --- a/package/python-logbook/Config.in +++ b/package/python-logbook/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_LOGBOOK bool "python-logbook" - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_ZLIB help A logging replacement for Python. From yann.morin.1998 at free.fr Wed Feb 9 21:09:31 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:09:31 +0100 Subject: [Buildroot] [git commit] package/python-pyqrcode: drop python2 support Message-ID: <20220209212601.2420181335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9dc8526170bdf308c353eaa7d67cc7f31b8ad555 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-pyqrcode/Config.in | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package/python-pyqrcode/Config.in b/package/python-pyqrcode/Config.in index 01b7ae8132..d07ab4965a 100644 --- a/package/python-pyqrcode/Config.in +++ b/package/python-pyqrcode/Config.in @@ -1,9 +1,7 @@ config BR2_PACKAGE_PYTHON_PYQRCODE bool "python-pyqrcode" - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime - select BR2_PACKAGE_PYTHON_CODECSCJK if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_CODECSCJK if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime + select BR2_PACKAGE_PYTHON3_CODECSCJK # runtime help A QR code generator written purely in Python with SVG, EPS, PNG and terminal output. From yann.morin.1998 at free.fr Wed Feb 9 21:09:26 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:09:26 +0100 Subject: [Buildroot] [git commit] package/python-pickleshare: drop python2 support Message-ID: <20220209212601.0E0AC81335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7affa6a59b0b7834cebff4079983603ff134f4c3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-pickleshare/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/python-pickleshare/Config.in b/package/python-pickleshare/Config.in index 35a26637a5..18391b7ce8 100644 --- a/package/python-pickleshare/Config.in +++ b/package/python-pickleshare/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PICKLESHARE bool "python-pickleshare" - select BR2_PACKAGE_PYTHON_PATHLIB2 if BR2_PACKAGE_PYTHON # runtime help Tiny 'shelve'-like database with concurrency support From yann.morin.1998 at free.fr Wed Feb 9 21:09:08 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:09:08 +0100 Subject: [Buildroot] [git commit] package/python-fire: drop python2 support Message-ID: <20220209212600.B43D48323E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=87a84dfc6c7b3081d18807cfdddc3fc9a5fec3f1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-fire/Config.in | 1 - package/python-fire/python-fire.mk | 9 --------- 2 files changed, 10 deletions(-) diff --git a/package/python-fire/Config.in b/package/python-fire/Config.in index b718ddac5e..9c816b0fd0 100644 --- a/package/python-fire/Config.in +++ b/package/python-fire/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_PYTHON_FIRE bool "python-fire" select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_TERMCOLOR # runtime - select BR2_PACKAGE_PYTHON_ENUM34 if BR2_PACKAGE_PYTHON # runtime help A library for automatically generating command line interfaces. diff --git a/package/python-fire/python-fire.mk b/package/python-fire/python-fire.mk index 7ba971abc4..40631fce86 100644 --- a/package/python-fire/python-fire.mk +++ b/package/python-fire/python-fire.mk @@ -11,13 +11,4 @@ PYTHON_FIRE_SETUP_TYPE = setuptools PYTHON_FIRE_LICENSE = Apache-2.0 PYTHON_FIRE_LICENSE_FILES = LICENSE -ifeq ($(BR2_PACKAGE_PYTHON),y) -# only needed/valid for python 3.x -define PYTHON_FIRE_RM_PY3_FILE - rm -f $(TARGET_DIR)/usr/lib/python*/site-packages/fire/test_components_py3.py -endef - -PYTHON_FIRE_POST_INSTALL_TARGET_HOOKS += PYTHON_FIRE_RM_PY3_FILE -endif - $(eval $(python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:09:33 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:09:33 +0100 Subject: [Buildroot] [git commit] package/python-pyqt5: drop python2 support Message-ID: <20220209212601.2D5F18323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7e346f494c1507648f60c0e0174f06bd35ca84e3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-pyqt5/python-pyqt5.mk | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/package/python-pyqt5/python-pyqt5.mk b/package/python-pyqt5/python-pyqt5.mk index b05043563e..af32f63796 100644 --- a/package/python-pyqt5/python-pyqt5.mk +++ b/package/python-pyqt5/python-pyqt5.mk @@ -19,14 +19,6 @@ PYTHON_PYQT5_MODULES = \ $(if $(BR2_PACKAGE_QT5BASE_PRINTSUPPORT),QtPrintSupport) \ $(if $(BR2_PACKAGE_QT5BASE_XML),QtXml) -ifeq ($(BR2_PACKAGE_PYTHON),y) -PYTHON_PYQT5_PYTHON_DIR = python$(PYTHON_VERSION_MAJOR) -PYTHON_PYQT5_RM_PORT_BASE = port_v3 -else ifeq ($(BR2_PACKAGE_PYTHON3),y) -PYTHON_PYQT5_PYTHON_DIR = python$(PYTHON3_VERSION_MAJOR) -PYTHON_PYQT5_RM_PORT_BASE = port_v2 -endif - ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS),y) PYTHON_PYQT5_MODULES += QtWidgets @@ -159,7 +151,7 @@ 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 \ + --destdir $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ --qmake $(HOST_DIR)/bin/qmake \ --sysroot $(STAGING_DIR)/usr \ -w --confirm-license \ @@ -186,8 +178,8 @@ endef # __init__.pyc is needed if BR2_PACKAGE_PYTHON_PYC_ONLY is set define PYTHON_PYQT5_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) install - touch $(TARGET_DIR)/usr/lib/$(PYTHON_PYQT5_PYTHON_DIR)/site-packages/PyQt5/__init__.py - $(RM) -rf $(TARGET_DIR)/usr/lib/$(PYTHON_PYQT5_PYTHON_DIR)/site-packages/PyQt5/uic/$(PYTHON_PYQT5_RM_PORT_BASE) + touch $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/PyQt5/__init__.py + $(RM) -rf $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/PyQt5/uic/port_v2 endef $(eval $(generic-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:09:38 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:09:38 +0100 Subject: [Buildroot] [git commit] package/python-pyudev: drop python2 support Message-ID: <20220209212601.3E6A781335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3aa1a0dfd0eee8c356eaba8bca51881eec219fa0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-pyudev/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-pyudev/Config.in b/package/python-pyudev/Config.in index fb853956e8..e0da067cc2 100644 --- a/package/python-pyudev/Config.in +++ b/package/python-pyudev/Config.in @@ -1,8 +1,7 @@ config BR2_PACKAGE_PYTHON_PYUDEV bool "python-pyudev" depends on BR2_PACKAGE_HAS_UDEV - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_ZLIB # runtime select BR2_PACKAGE_PYTHON_SIX # runtime help pyudev is a LGPL licenced, pure Python 2/3 binding to From yann.morin.1998 at free.fr Wed Feb 9 21:09:47 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:09:47 +0100 Subject: [Buildroot] [git commit] package/python-scapy: drop python2 support Message-ID: <20220209212601.6038F81335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=47e031b9b68bf6a8143dfbd1b0c2953eaecf2a95 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-scapy/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-scapy/Config.in b/package/python-scapy/Config.in index 6575a33af3..517fb51714 100644 --- a/package/python-scapy/Config.in +++ b/package/python-scapy/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_SCAPY bool "python-scapy" - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_ZLIB help Scapy: interactive packet manipulation tool. From yann.morin.1998 at free.fr Wed Feb 9 21:09:45 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:09:45 +0100 Subject: [Buildroot] [git commit] package/python-remi: drop python2 support Message-ID: <20220209212601.576838323E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0d01e5eb3d4bc834c16b34e2419648bda1b53c47 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-remi/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-remi/Config.in b/package/python-remi/Config.in index e0c5e9bfe1..da2c2f4cfb 100644 --- a/package/python-remi/Config.in +++ b/package/python-remi/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_REMI bool "python-remi" - select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_SSL # runtime select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime help Remi is a GUI library for Python applications which transpiles From yann.morin.1998 at free.fr Wed Feb 9 21:09:40 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:09:40 +0100 Subject: [Buildroot] [git commit] package/python-raven: drop python2 support Message-ID: <20220209212601.46C5D83245@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d3d2aff4a56317dbda466374c0919ad1936342ff branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-raven/Config.in | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/package/python-raven/Config.in b/package/python-raven/Config.in index 0d4b26c054..d02232cfd8 100644 --- a/package/python-raven/Config.in +++ b/package/python-raven/Config.in @@ -1,11 +1,8 @@ config BR2_PACKAGE_PYTHON_RAVEN bool "python-raven" - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 - select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 - select BR2_PACKAGE_PYTHON_UNICODEDATA if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_UNICODEDATA if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_ZLIB + select BR2_PACKAGE_PYTHON3_SSL + select BR2_PACKAGE_PYTHON3_UNICODEDATA help Raven is a client for Sentry (https://getsentry.com). From yann.morin.1998 at free.fr Wed Feb 9 21:09:54 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:09:54 +0100 Subject: [Buildroot] [git commit] package/python-sip: drop python2 support Message-ID: <20220209212601.7A6A281335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=67a90aa2065ad87605e5c37a8f206ed4b6f52fdd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-sip/python-sip.mk | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/package/python-sip/python-sip.mk b/package/python-sip/python-sip.mk index 1d6c205396..01ccb1ddd5 100644 --- a/package/python-sip/python-sip.mk +++ b/package/python-sip/python-sip.mk @@ -10,19 +10,8 @@ PYTHON_SIP_SITE = http://downloads.sourceforge.net/project/pyqt/sip/sip-$(PYTHON PYTHON_SIP_LICENSE = SIP license or GPL-2.0 or GPL-3.0 PYTHON_SIP_LICENSE_FILES = LICENSE LICENSE-GPL2 LICENSE-GPL3 -PYTHON_SIP_DEPENDENCIES = qt5base - -ifeq ($(BR2_PACKAGE_PYTHON),y) -PYTHON_SIP_DEPENDENCIES += python -HOST_PYTHON_SIP_DEPENDENCIES += host-python -PYTHON_SIP_LIB_DIR = usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages -PYTHON_SIP_INCLUDE_DIR = usr/include/python$(PYTHON_VERSION_MAJOR) -else ifeq ($(BR2_PACKAGE_PYTHON3),y) -PYTHON_SIP_DEPENDENCIES += python3 -HOST_PYTHON_SIP_DEPENDENCIES += host-python3 -PYTHON_SIP_LIB_DIR = usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages -PYTHON_SIP_INCLUDE_DIR = usr/include/python$(PYTHON3_VERSION_MAJOR) -endif +PYTHON_SIP_DEPENDENCIES = python3 qt5base +HOST_PYTHON_SIP_DEPENDENCIES = host-python3 define HOST_PYTHON_SIP_CONFIGURE_CMDS (cd $(@D); \ @@ -41,8 +30,8 @@ define PYTHON_SIP_CONFIGURE_CMDS (cd $(@D); \ $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(HOST_DIR)/bin/python configure.py \ --bindir $(TARGET_DIR)/usr/bin \ - --destdir $(TARGET_DIR)/$(PYTHON_SIP_LIB_DIR) \ - --incdir $(STAGING_DIR)/$(PYTHON_SIP_INCLUDE_DIR) \ + --destdir $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --incdir $(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --sipdir $(TARGET_DIR)/usr/share/sip \ --sysroot $(STAGING_DIR)/usr \ --use-qmake && \ From yann.morin.1998 at free.fr Wed Feb 9 21:10:01 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:10:01 +0100 Subject: [Buildroot] [git commit] package/python-urllib3: drop python2 support Message-ID: <20220209212601.934AA81335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=60cb89675489553853304dd92a99cf2a7a92fd43 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-urllib3/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-urllib3/Config.in b/package/python-urllib3/Config.in index 21d3f6748e..90e10b7969 100644 --- a/package/python-urllib3/Config.in +++ b/package/python-urllib3/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_URLLIB3 bool "python-urllib3" - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_ZLIB # runtime help Python HTTP library with thread-safe connection pooling, file post support, sanity friendly, and more. From yann.morin.1998 at free.fr Wed Feb 9 21:10:30 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:10:30 +0100 Subject: [Buildroot] [git commit] package/suricata: drop python2 support Message-ID: <20220209212602.0EB3781335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6051682d9e4d216fca0d39b3ece51381f2cfd85e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/suricata/suricata.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/suricata/suricata.mk b/package/suricata/suricata.mk index 3255fd35a1..86d8970178 100644 --- a/package/suricata/suricata.mk +++ b/package/suricata/suricata.mk @@ -116,9 +116,9 @@ else SURICATA_CONF_OPTS += --disable-luajit endif -ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) SURICATA_CONF_OPTS += --enable-python -SURICATA_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,python3) +SURICATA_DEPENDENCIES += python3 else SURICATA_CONF_OPTS += --disable-python endif From yann.morin.1998 at free.fr Wed Feb 9 21:10:12 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:10:12 +0100 Subject: [Buildroot] [git commit] package/python-whoosh: drop python2 support Message-ID: <20220209212601.BDEE781335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=47cd94a11530348c4a3707e21edf412f1c3aa7da branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-whoosh/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-whoosh/Config.in b/package/python-whoosh/Config.in index 1128ce6417..e1fb144985 100644 --- a/package/python-whoosh/Config.in +++ b/package/python-whoosh/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_WHOOSH bool "python-whoosh" - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_ZLIB # runtime help Whoosh is a fast, pure-Python full text indexing, search and spell checking library. From yann.morin.1998 at free.fr Wed Feb 9 21:10:03 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:10:03 +0100 Subject: [Buildroot] [git commit] package/python-web2py: drop python2 support Message-ID: <20220209212601.9BD2281335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=53c6323ef6361527b2735867e879e1559cb3027a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-web2py/Config.in | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/package/python-web2py/Config.in b/package/python-web2py/Config.in index a0452060ba..bb455dfa7a 100644 --- a/package/python-web2py/Config.in +++ b/package/python-web2py/Config.in @@ -1,12 +1,9 @@ config BR2_PACKAGE_PYTHON_WEB2PY bool "python-web2py" select BR2_PACKAGE_PYTHON_PYDAL # runtime - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime - select BR2_PACKAGE_PYTHON_SQLITE if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_SQLITE if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_ZLIB # runtime + select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime + select BR2_PACKAGE_PYTHON3_SQLITE # runtime select BR2_PACKAGE_PYTHON_YATL # runtime help web2py is a free open source full-stack framework for rapid From yann.morin.1998 at free.fr Wed Feb 9 21:10:33 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:10:33 +0100 Subject: [Buildroot] [git commit] package/syslog-ng: drop python2 support Message-ID: <20220209212602.16F0D81335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c1b79cbc68826924d3a324c5611721f377e46ae4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/syslog-ng/syslog-ng.mk | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/package/syslog-ng/syslog-ng.mk b/package/syslog-ng/syslog-ng.mk index f37e7c2ea5..c05ec9785c 100644 --- a/package/syslog-ng/syslog-ng.mk +++ b/package/syslog-ng/syslog-ng.mk @@ -32,12 +32,7 @@ else SYSLOG_NG_CONF_OPTS += --disable-linux-caps endif -ifeq ($(BR2_PACKAGE_PYTHON),y) -SYSLOG_NG_DEPENDENCIES += python -SYSLOG_NG_CONF_OPTS += \ - --enable-python \ - --with-python=$(PYTHON_VERSION_MAJOR) -else ifeq ($(BR2_PACKAGE_PYTHON3),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) SYSLOG_NG_DEPENDENCIES += python3 SYSLOG_NG_CONF_OPTS += \ --enable-python \ From yann.morin.1998 at free.fr Wed Feb 9 21:10:40 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:10:40 +0100 Subject: [Buildroot] [git commit] package/util-linux: drop python2 support Message-ID: <20220209212602.3175C8323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cb4ac01d5a282a1edd647b09576379094c5ed1d8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/util-linux/util-linux.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 5a4ff64d01..1ca605f3fb 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -241,9 +241,9 @@ HOST_UTIL_LINUX_CONF_OPTS += --disable-all-programs endif # Install libmount Python bindings -ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) UTIL_LINUX_CONF_OPTS += --with-python -UTIL_LINUX_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,python3) +UTIL_LINUX_DEPENDENCIES += python3 ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBMOUNT),y) UTIL_LINUX_CONF_OPTS += --enable-pylibmount else From yann.morin.1998 at free.fr Wed Feb 9 21:10:05 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:10:05 +0100 Subject: [Buildroot] [git commit] package/python-webob: drop python2 support Message-ID: <20220209212601.A48708323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=35fb719b57ee5e4e872e954d8217cea2a833a6b2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-webob/Config.in | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package/python-webob/Config.in b/package/python-webob/Config.in index fe77723f95..d3397587a1 100644 --- a/package/python-webob/Config.in +++ b/package/python-webob/Config.in @@ -1,8 +1,6 @@ config BR2_PACKAGE_PYTHON_WEBOB bool "python-webob" - select BR2_PACKAGE_PYTHON_HASHLIB if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_ZLIB # runtime help WSGI request and response object. From yann.morin.1998 at free.fr Wed Feb 9 21:10:10 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:10:10 +0100 Subject: [Buildroot] [git commit] package/python-werkzeug: drop python2 support Message-ID: <20220209212601.B5FA58323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=db41ae375613edf94892a131c7b5507a0e2a9e53 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-werkzeug/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-werkzeug/Config.in b/package/python-werkzeug/Config.in index 79e9a4561e..27b2fdeaab 100644 --- a/package/python-werkzeug/Config.in +++ b/package/python-werkzeug/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_WERKZEUG bool "python-werkzeug" - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_ZLIB # runtime help Werkzeug is a WSGI utility library for Python. It's widely used and BSD licensed. From yann.morin.1998 at free.fr Wed Feb 9 21:10:19 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:10:19 +0100 Subject: [Buildroot] [git commit] package/python3: drop references to python2 Message-ID: <20220209212601.D587181335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=15c47b462e0065a96c7b0436ec70f9be08d623c4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python3/Config.in | 1 - package/python3/python3.mk | 2 -- 2 files changed, 3 deletions(-) diff --git a/package/python3/Config.in b/package/python3/Config.in index 7714518edc..61470c2944 100644 --- a/package/python3/Config.in +++ b/package/python3/Config.in @@ -4,7 +4,6 @@ comment "python3 needs a toolchain w/ wchar, threads, dynamic library" config BR2_PACKAGE_PYTHON3 bool "python3" - depends on !BR2_PACKAGE_PYTHON depends on BR2_USE_WCHAR # uses fork() depends on BR2_USE_MMU diff --git a/package/python3/python3.mk b/package/python3/python3.mk index f9afcd5097..6af7488ddd 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -260,9 +260,7 @@ define PYTHON3_INSTALL_SYMLINK ln -fs python3 $(TARGET_DIR)/usr/bin/python endef -ifneq ($(BR2_PACKAGE_PYTHON),y) PYTHON3_POST_INSTALL_TARGET_HOOKS += PYTHON3_INSTALL_SYMLINK -endif # Some packages may have build scripts requiring python3, whatever is the # python version chosen for the target. From yann.morin.1998 at free.fr Wed Feb 9 21:10:28 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:10:28 +0100 Subject: [Buildroot] [git commit] package/supervisor: drop python2 support Message-ID: <20220209212602.0651683245@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=edfea809a2d22aea31fcd7f48dace4341650893a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/supervisor/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/supervisor/Config.in b/package/supervisor/Config.in index 7ca3cae134..8ba19dc000 100644 --- a/package/supervisor/Config.in +++ b/package/supervisor/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_SUPERVISOR bool "supervisor" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime dependency help A client/server system that allows its users to control a @@ -9,5 +9,4 @@ config BR2_PACKAGE_SUPERVISOR http://supervisord.org/ comment "supervisor needs a python interpreter" - depends on !BR2_PACKAGE_PYTHON depends on !BR2_PACKAGE_PYTHON3 From yann.morin.1998 at free.fr Wed Feb 9 21:10:35 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:10:35 +0100 Subject: [Buildroot] [git commit] package/tovid: drop python2 support Message-ID: <20220209212602.1F5AA8323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5f0b3c48f3fea31d4c5dd80063387324839a6ff7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/tovid/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/tovid/Config.in b/package/tovid/Config.in index f972e18852..3dbb0e229e 100644 --- a/package/tovid/Config.in +++ b/package/tovid/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_TOVID depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # mpv depends on BR2_TOOLCHAIN_HAS_ATOMIC # mpv @@ -40,8 +40,8 @@ comment "tovid needs a toolchain w/ threads, C++, wchar, gcc >= 4.9" || !BR2_USE_WCHAR depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC -comment "tovid depends on python or python3" - depends on !BR2_PACKAGE_PYTHON && !BR2_PACKAGE_PYTHON3 +comment "tovid depends on python3" + depends on !BR2_PACKAGE_PYTHON3 depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_TOOLCHAIN_HAS_SYNC_4 From yann.morin.1998 at free.fr Wed Feb 9 21:13:28 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:13:28 +0100 Subject: [Buildroot] [git commit] package/python-id3: drop python2 specific package Message-ID: <20220209212602.84CF481335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6ad80649c769e0ebc7f30392da493e26d00d9299 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Config.in.legacy | 6 ++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/python-id3/Config.in | 9 --------- package/python-id3/python-id3.hash | 3 --- package/python-id3/python-id3.mk | 14 -------------- 6 files changed, 6 insertions(+), 28 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 7e85e4cf63..03ea14a512 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_ID3 + bool "python-id3 removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_FUTURES bool "python-futures removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index f09990c544..371a0aab9a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -729,7 +729,6 @@ F: package/wireless-regdb/ N: Dominik Faessler F: package/logsurfer/ -F: package/python-id3/ N: Doug Kehn F: package/nss-pam-ldapd/ diff --git a/package/Config.in b/package/Config.in index b18d298a1b..0ee1c8ddb4 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1049,7 +1049,6 @@ menu "External python modules" source "package/python-hyperframe/Config.in" source "package/python-hyperlink/Config.in" source "package/python-ibmiotf/Config.in" - source "package/python-id3/Config.in" source "package/python-idna/Config.in" source "package/python-ifaddr/Config.in" source "package/python-incremental/Config.in" diff --git a/package/python-id3/Config.in b/package/python-id3/Config.in deleted file mode 100644 index 6ddfd541bd..0000000000 --- a/package/python-id3/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PYTHON_ID3 - bool "python-id3" - depends on BR2_PACKAGE_PYTHON - help - This module allows one to read and manipulate so-called ID3 - informational tags on MP3 files through an object-oriented - Python interface. - - http://id3-py.sourceforge.net/ diff --git a/package/python-id3/python-id3.hash b/package/python-id3/python-id3.hash deleted file mode 100644 index c83b34a2d9..0000000000 --- a/package/python-id3/python-id3.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed: -sha256 ba612342b59a49cbf9a7eb23a646667757ffda96dc23b67245fc6cd8d90c2022 id3-py_1.2.tar.gz -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/python-id3/python-id3.mk b/package/python-id3/python-id3.mk deleted file mode 100644 index d4cdded00c..0000000000 --- a/package/python-id3/python-id3.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-id3 -# -################################################################################ - -PYTHON_ID3_VERSION = 1.2 -PYTHON_ID3_SOURCE = id3-py_$(PYTHON_ID3_VERSION).tar.gz -PYTHON_ID3_SITE = http://downloads.sourceforge.net/project/id3-py/id3-py/$(PYTHON_ID3_VERSION) -PYTHON_ID3_SETUP_TYPE = distutils -PYTHON_ID3_LICENSE = GPL-2.0+ -PYTHON_ID3_LICENSE_FILES = COPYING - -$(eval $(python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:10:42 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:10:42 +0100 Subject: [Buildroot] [git commit] package/zfs: drop python2 support Message-ID: <20220209212602.3A93F81335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=55df30f8b1fb2fff0dd4dce1cab83d6bf55b9527 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/zfs/zfs.mk | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/package/zfs/zfs.mk b/package/zfs/zfs.mk index 0e7e3e4e74..6b542f5c05 100644 --- a/package/zfs/zfs.mk +++ b/package/zfs/zfs.mk @@ -37,17 +37,7 @@ else ZFS_CONF_OPTS += --disable-systemd 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 host-python-packaging -ZFS_CONF_ENV += \ - PYTHON=$(HOST_DIR)/usr/bin/python2 \ - PYTHON_CPPFLAGS="`$(STAGING_DIR)/usr/bin/python2-config --includes`" \ - PYTHON_LIBS="`$(STAGING_DIR)/usr/bin/python2-config --ldflags`" \ - PYTHON_SITE_PKG="/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages" -ZFS_CONF_OPTS += --enable-pyzfs -else ifeq ($(BR2_PACKAGE_PYTHON3),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) ZFS_DEPENDENCIES += python3 python-setuptools host-python-cffi host-python-packaging ZFS_CONF_ENV += \ PYTHON=$(HOST_DIR)/usr/bin/python3 \ From yann.morin.1998 at free.fr Wed Feb 9 21:13:38 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:13:38 +0100 Subject: [Buildroot] [git commit] package/python-nfc: drop python2 specific package Message-ID: <20220209212602.B948481335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=67aad59d5eebd9150d5787780f754df9703eff84 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Config.in.legacy | 6 ++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/python-nfc/Config.in | 16 ---------------- package/python-nfc/python-nfc.hash | 3 --- package/python-nfc/python-nfc.mk | 14 -------------- 6 files changed, 6 insertions(+), 35 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index f6607deeeb..80adf521f8 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_NFC + bool "python-nfc removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_MAD bool "python-mad removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 9fb51b4481..d661693e4d 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2598,7 +2598,6 @@ F: package/nanocom/ F: package/neard/ F: package/neardal/ F: package/owl-linux/ -F: package/python-nfc/ F: package/rapidjson/ F: package/sconeserver/ F: package/sound-theme-borealis/ diff --git a/package/Config.in b/package/Config.in index d5c46ef997..8dc91becb0 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1110,7 +1110,6 @@ menu "External python modules" source "package/python-netifaces/Config.in" source "package/python-networkmanager/Config.in" source "package/python-networkx/Config.in" - source "package/python-nfc/Config.in" source "package/python-numpy/Config.in" source "package/python-oauthlib/Config.in" source "package/python-opcua-asyncio/Config.in" diff --git a/package/python-nfc/Config.in b/package/python-nfc/Config.in deleted file mode 100644 index 7008723f60..0000000000 --- a/package/python-nfc/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_PYTHON_NFC - bool "python-nfc" - depends on BR2_PACKAGE_PYTHON - depends on BR2_TOOLCHAIN_HAS_THREADS # libusb - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb - select BR2_PACKAGE_LIBUSB - select BR2_PACKAGE_LIBUSB_COMPAT - help - Python module for near field communication. - - https://launchpad.net/nfcpy - -comment "python-nfc needs a toolchain w/ threads, gcc >= 4.9" - depends on BR2_PACKAGE_PYTHON - depends on !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/python-nfc/python-nfc.hash b/package/python-nfc/python-nfc.hash deleted file mode 100644 index 6514973f53..0000000000 --- a/package/python-nfc/python-nfc.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed: -sha256 7ff9265e393e9e70173ecef5a1f9124e67d3b6e481c2dc3a9537b6a769ebe16f python-nfc-0.13.5.tar.gz -sha256 0dc4b0a3362f197e250604567a6b4eb16bbc34c186425401e2201a193a82549f LICENSE diff --git a/package/python-nfc/python-nfc.mk b/package/python-nfc/python-nfc.mk deleted file mode 100644 index f5417410c9..0000000000 --- a/package/python-nfc/python-nfc.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-nfc -# -################################################################################ - -PYTHON_NFC_VERSION = 0.13.5 -PYTHON_NFC_SITE = $(call github,nfcpy,nfcpy,v$(PYTHON_NFC_VERSION)) -PYTHON_NFC_DEPENDENCIES = libusb libusb-compat -PYTHON_NFC_SETUP_TYPE = setuptools -PYTHON_NFC_LICENSE = EUPL-1.1+ -PYTHON_NFC_LICENSE_FILES = LICENSE - -$(eval $(python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:13:26 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:13:26 +0100 Subject: [Buildroot] [git commit] package/python-futures: drop python2 specific package Message-ID: <20220209212602.799CC8323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c24cc667978fb7850b45c84dfec9b7c1d884bd9e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Config.in.legacy | 6 ++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/python-futures/Config.in | 7 ------- package/python-futures/python-futures.hash | 5 ----- package/python-futures/python-futures.mk | 14 -------------- 6 files changed, 6 insertions(+), 28 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 10476a2adf..7e85e4cf63 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_FUTURES + bool "python-futures removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME bool "python-backports-ssl-match-hostname removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index ebdf388d09..f09990c544 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -436,7 +436,6 @@ F: package/pulseaudio/ F: package/pure-ftpd/ F: package/python-couchdb/ F: package/python-cssutils/ -F: package/python-futures/ F: package/python-mwclient/ F: package/python-mwscrape/ F: package/python-mwscrape2slob/ diff --git a/package/Config.in b/package/Config.in index 73f266504a..b18d298a1b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1032,7 +1032,6 @@ menu "External python modules" source "package/python-frozenlist/Config.in" source "package/python-functools32/Config.in" source "package/python-future/Config.in" - source "package/python-futures/Config.in" source "package/python-git/Config.in" source "package/python-gitdb2/Config.in" source "package/python-gnupg/Config.in" diff --git a/package/python-futures/Config.in b/package/python-futures/Config.in deleted file mode 100644 index 2eb40e93bd..0000000000 --- a/package/python-futures/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_FUTURES - bool "python-futures" - depends on BR2_PACKAGE_PYTHON # not needed for python3 - help - Backport of the concurrent.futures package from Python 3.2. - - https://github.com/agronholm/pythonfutures diff --git a/package/python-futures/python-futures.hash b/package/python-futures/python-futures.hash deleted file mode 100644 index a4fbdf4fe9..0000000000 --- a/package/python-futures/python-futures.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/futures/json -md5 b43a39ae1475e3fd6940f2b4f7214675 futures-3.3.0.tar.gz -sha256 7e033af76a5e35f58e56da7a91e687706faf4e7bdfb2cbc3f2cca6b9bcda9794 futures-3.3.0.tar.gz -# Locally computed sha256 checksums -sha256 a698bd5d441e4a16af6c992b8e80cbfa12755d72d910854fa1fb11d4deb0059a LICENSE diff --git a/package/python-futures/python-futures.mk b/package/python-futures/python-futures.mk deleted file mode 100644 index 0666948115..0000000000 --- a/package/python-futures/python-futures.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-futures -# -################################################################################ - -PYTHON_FUTURES_VERSION = 3.3.0 -PYTHON_FUTURES_SOURCE = futures-$(PYTHON_FUTURES_VERSION).tar.gz -PYTHON_FUTURES_SITE = https://files.pythonhosted.org/packages/47/04/5fc6c74ad114032cd2c544c575bffc17582295e9cd6a851d6026ab4b2c00 -PYTHON_FUTURES_SETUP_TYPE = setuptools -PYTHON_FUTURES_LICENSE = BSD-2-Clause -PYTHON_FUTURES_LICENSE_FILES = LICENSE - -$(eval $(python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:13:21 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:13:21 +0100 Subject: [Buildroot] [git commit] package/python-backports-shutil-get-terminal-size: drop python2 specific package Message-ID: <20220209212602.631B881335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1727e80dfface4dbddbc84604ed781c12b0174d2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Config.in.legacy | 6 ++++++ DEVELOPERS | 1 - package/Config.in | 1 - .../python-backports-shutil-get-terminal-size/Config.in | 8 -------- .../python-backports-shutil-get-terminal-size.hash | 5 ----- .../python-backports-shutil-get-terminal-size.mk | 14 -------------- 6 files changed, 6 insertions(+), 29 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index cc1ed8f9d5..89c095a388 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE + bool "python-backports-shutil-get-terminal-size removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_BACKPORTS_ABC bool "python-backports-abc removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index f92bd32a9f..7fe7e4287a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -143,7 +143,6 @@ N: Andreas Ziegler F: package/mpd/ N: Andrey Smirnov -F: package/python-backports-shutil-get-terminal-size/ F: package/python-decorator/ F: package/python-ipython-genutils/ F: package/python-pathlib2/ diff --git a/package/Config.in b/package/Config.in index 46e6b30cdf..fbfc876d89 100644 --- a/package/Config.in +++ b/package/Config.in @@ -941,7 +941,6 @@ menu "External python modules" source "package/python-avro/Config.in" source "package/python-babel/Config.in" source "package/python-backcall/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" source "package/python-beautifulsoup4/Config.in" diff --git a/package/python-backports-shutil-get-terminal-size/Config.in b/package/python-backports-shutil-get-terminal-size/Config.in deleted file mode 100644 index 392e05a282..0000000000 --- a/package/python-backports-shutil-get-terminal-size/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE - bool "python-backports-shutil-get-terminal-size" - depends on BR2_PACKAGE_PYTHON - help - A backport of the get_terminal_size function from Python - 3.3's shutil. - - https://pypi.python.org/pypi/backports.shutil_get_terminal_size diff --git a/package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.hash b/package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.hash deleted file mode 100644 index 40883a4e3b..0000000000 --- a/package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5 from https://pypi.python.org/pypi/backports.shutil_get_terminal_size/json -md5 03267762480bd86b50580dc19dff3c66 backports.shutil_get_terminal_size-1.0.0.tar.gz -# Locally computed -sha256 713e7a8228ae80341c70586d1cc0a8caa5207346927e23d09dcbcaf18eadec80 backports.shutil_get_terminal_size-1.0.0.tar.gz -sha256 9edd99f8c339cddbfe36a9707e671fccf245b3e50b80eec0877dccec87a2dfe4 LICENSE diff --git a/package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.mk b/package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.mk deleted file mode 100644 index 7c24b196f2..0000000000 --- a/package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-backports-shutil-get-terminal-size -# -################################################################################ - -PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE_VERSION = 1.0.0 -PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE_SOURCE = backports.shutil_get_terminal_size-$(PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE_VERSION).tar.gz -PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE_SITE = https://pypi.python.org/packages/ec/9c/368086faa9c016efce5da3e0e13ba392c9db79e3ab740b763fe28620b18b -PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE_SETUP_TYPE = setuptools -PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE_LICENSE = MIT -PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE_LICENSE_FILES = LICENSE - -$(eval $(python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:13:33 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:13:33 +0100 Subject: [Buildroot] [git commit] package/python-ipaddress: drop python2 specific package Message-ID: <20220209212602.9AEF18323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e990a926797edadb6b0e8b94c85b9d52a79f47ae branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Config.in.legacy | 6 ++++++ package/Config.in | 1 - package/python-ipaddress/Config.in | 7 ------- package/python-ipaddress/python-ipaddress.hash | 5 ----- package/python-ipaddress/python-ipaddress.mk | 14 -------------- 5 files changed, 6 insertions(+), 27 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index c78fb20756..14b26408fe 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_IPADDRESS + bool "python-ipaddress removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_IPADDR bool "python-ipaddr removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index 611a8f6aa8..50c0e13510 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1058,7 +1058,6 @@ menu "External python modules" source "package/python-iniparse/Config.in" source "package/python-intelhex/Config.in" source "package/python-iowait/Config.in" - source "package/python-ipaddress/Config.in" source "package/python-ipdb/Config.in" source "package/python-iptables/Config.in" source "package/python-ipy/Config.in" diff --git a/package/python-ipaddress/Config.in b/package/python-ipaddress/Config.in deleted file mode 100644 index b2b9f0b1c3..0000000000 --- a/package/python-ipaddress/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_IPADDRESS - bool "python-ipaddress" - depends on BR2_PACKAGE_PYTHON - help - Python 3.3's ipaddress for older Python versions. - - https://github.com/phihag/ipaddress diff --git a/package/python-ipaddress/python-ipaddress.hash b/package/python-ipaddress/python-ipaddress.hash deleted file mode 100644 index e61835e192..0000000000 --- a/package/python-ipaddress/python-ipaddress.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/ipaddress/json -md5 aaee67a8026782af1831148beb0d9060 ipaddress-1.0.23.tar.gz -sha256 b7f8e0369580bb4a24d5ba1d7cc29660a4a6987763faf1d8a8046830e020e7e2 ipaddress-1.0.23.tar.gz -# Locally computed sha256 checksums -sha256 38675419eb4a79ec616396d70f1254b3a433fb7088fb3f4cc9b6c0bcdcec6162 LICENSE diff --git a/package/python-ipaddress/python-ipaddress.mk b/package/python-ipaddress/python-ipaddress.mk deleted file mode 100644 index 8f1ad5ffc7..0000000000 --- a/package/python-ipaddress/python-ipaddress.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-ipaddress -# -################################################################################ - -PYTHON_IPADDRESS_VERSION = 1.0.23 -PYTHON_IPADDRESS_SOURCE = ipaddress-$(PYTHON_IPADDRESS_VERSION).tar.gz -PYTHON_IPADDRESS_SITE = https://files.pythonhosted.org/packages/b9/9a/3e9da40ea28b8210dd6504d3fe9fe7e013b62bf45902b458d1cdc3c34ed9 -PYTHON_IPADDRESS_LICENSE = Python-2.0 -PYTHON_IPADDRESS_LICENSE_FILES = LICENSE -PYTHON_IPADDRESS_SETUP_TYPE = setuptools - -$(eval $(python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:13:31 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:13:31 +0100 Subject: [Buildroot] [git commit] package/python-ipaddr: drop python2 specific package Message-ID: <20220209212602.8FD8581335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=da9233cee3c93a7e903794008f35e87839aed746 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Config.in.legacy | 6 ++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/python-ipaddr/Config.in | 9 --------- package/python-ipaddr/python-ipaddr.hash | 5 ----- package/python-ipaddr/python-ipaddr.mk | 14 -------------- 6 files changed, 6 insertions(+), 30 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 03ea14a512..c78fb20756 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_IPADDR + bool "python-ipaddr removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_ID3 bool "python-id3 removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 371a0aab9a..dbed9df4b5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2248,7 +2248,6 @@ F: package/python-docker-pycreds/ F: package/python-enum/ F: package/python-enum34/ F: package/python-functools32/ -F: package/python-ipaddr/ F: package/python-pam/ F: package/python-psutil/ F: package/python-request-id/ diff --git a/package/Config.in b/package/Config.in index 0ee1c8ddb4..611a8f6aa8 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1058,7 +1058,6 @@ menu "External python modules" source "package/python-iniparse/Config.in" source "package/python-intelhex/Config.in" source "package/python-iowait/Config.in" - source "package/python-ipaddr/Config.in" source "package/python-ipaddress/Config.in" source "package/python-ipdb/Config.in" source "package/python-iptables/Config.in" diff --git a/package/python-ipaddr/Config.in b/package/python-ipaddr/Config.in deleted file mode 100644 index 57279273f9..0000000000 --- a/package/python-ipaddr/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PYTHON_IPADDR - bool "python-ipaddr" - depends on BR2_PACKAGE_PYTHON # included since python3.3 - help - An IPv4/IPv6 manipulation library in Python. This library is - used to create/poke/manipulate IPv4 and IPv6 addresses and - prefixes. - - https://github.com/google/ipaddr-py diff --git a/package/python-ipaddr/python-ipaddr.hash b/package/python-ipaddr/python-ipaddr.hash deleted file mode 100644 index d9963a2933..0000000000 --- a/package/python-ipaddr/python-ipaddr.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/ipaddr/json -md5 f88353e40dec06410acfa075b8209b27 ipaddr-2.2.0.tar.gz -sha256 4092dfe667588d16aa12b59acb7c8a4024e5dcb23a681cd0b0b602373eca88d6 ipaddr-2.2.0.tar.gz -# Locally computed sha256 checksums -sha256 175b3b509d5c840db72ad8c22d22a690d15c67b317f34de8a8bb0a66059e8215 COPYING diff --git a/package/python-ipaddr/python-ipaddr.mk b/package/python-ipaddr/python-ipaddr.mk deleted file mode 100644 index 9a5d147533..0000000000 --- a/package/python-ipaddr/python-ipaddr.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-ipaddr -# -################################################################################ - -PYTHON_IPADDR_VERSION = 2.2.0 -PYTHON_IPADDR_SOURCE = ipaddr-$(PYTHON_IPADDR_VERSION).tar.gz -PYTHON_IPADDR_SITE = https://files.pythonhosted.org/packages/9d/a7/1b39a16cb90dfe491f57e1cab3103a15d4e8dd9a150872744f531b1106c1 -PYTHON_IPADDR_SETUP_TYPE = distutils -PYTHON_IPADDR_LICENSE = Apache-2.0 -PYTHON_IPADDR_LICENSE_FILES = COPYING - -$(eval $(python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:16:26 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:16:26 +0100 Subject: [Buildroot] [git commit] package/python-functools32: drop python2 specific package Message-ID: <20220209212603.57DD581335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=71d5d8c1082bfd94ce066a9d5b03e5d573799e8b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Config.in.legacy | 6 ++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/python-functools32/Config.in | 8 -------- package/python-functools32/python-functools32.hash | 4 ---- package/python-functools32/python-functools32.mk | 14 -------------- 6 files changed, 6 insertions(+), 28 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 7df95691ca..49c24e61bf 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_FUNCTOOLS32 + bool "python-functools32 removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_ENUM34 bool "python-enum34 removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 92abe8a6dd..0e759bc168 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2243,7 +2243,6 @@ F: package/python-cached-property/ F: package/python-docker/ F: package/python-dockerpty/ F: package/python-docker-pycreds/ -F: package/python-functools32/ F: package/python-psutil/ F: package/python-request-id/ F: package/python-semver/ diff --git a/package/Config.in b/package/Config.in index 18388f82c3..1a9f3e29d8 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1026,7 +1026,6 @@ menu "External python modules" source "package/python-flup/Config.in" source "package/python-fonttools/Config.in" source "package/python-frozenlist/Config.in" - source "package/python-functools32/Config.in" source "package/python-future/Config.in" source "package/python-git/Config.in" source "package/python-gitdb2/Config.in" diff --git a/package/python-functools32/Config.in b/package/python-functools32/Config.in deleted file mode 100644 index 606341d828..0000000000 --- a/package/python-functools32/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PYTHON_FUNCTOOLS32 - bool "python-functools32" - depends on BR2_PACKAGE_PYTHON - help - Backport of the functools module from Python 3.2.3 for use on - 2.7 and PyPy. - - https://github.com/MiCHiLU/python-functools32 diff --git a/package/python-functools32/python-functools32.hash b/package/python-functools32/python-functools32.hash deleted file mode 100644 index 606de81774..0000000000 --- a/package/python-functools32/python-functools32.hash +++ /dev/null @@ -1,4 +0,0 @@ -# md5 from https://pypi.python.org/pypi/functools32/json, sha256 locally computed -md5 09f24ffd9af9f6cd0f63cb9f4e23d4b2 functools32-3.2.3-2.tar.gz -sha256 f6253dfbe0538ad2e387bd8fdfd9293c925d63553f5813c4e587745416501e6d functools32-3.2.3-2.tar.gz -sha256 3f9ea6b89abe1556b72aff67b987d64c8272564815cd6a2832e6c4f6abdfe3b1 LICENSE diff --git a/package/python-functools32/python-functools32.mk b/package/python-functools32/python-functools32.mk deleted file mode 100644 index 8a88bb2a7f..0000000000 --- a/package/python-functools32/python-functools32.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-functools32 -# -################################################################################ - -PYTHON_FUNCTOOLS32_VERSION = 3.2.3-2 -PYTHON_FUNCTOOLS32_SOURCE = functools32-$(PYTHON_FUNCTOOLS32_VERSION).tar.gz -PYTHON_FUNCTOOLS32_SITE = https://pypi.python.org/packages/c5/60/6ac26ad05857c601308d8fb9e87fa36d0ebf889423f47c3502ef034365db -PYTHON_FUNCTOOLS32_SETUP_TYPE = distutils -PYTHON_FUNCTOOLS32_LICENSE = Python-2.0 -PYTHON_FUNCTOOLS32_LICENSE_FILES = LICENSE - -$(eval $(python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:13:51 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:13:51 +0100 Subject: [Buildroot] [git commit] package/python-singledispatch: drop python2 specific package Message-ID: <20220209212602.F327681335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5fce56ae9b98e061706e6a57005a7b411b6db77f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Config.in.legacy | 6 ++++++ package/Config.in | 1 - package/python-singledispatch/Config.in | 9 --------- package/python-singledispatch/python-singledispatch.hash | 5 ----- package/python-singledispatch/python-singledispatch.mk | 14 -------------- 5 files changed, 6 insertions(+), 29 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 319057f748..3cd78ccf1c 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_SINGLEDISPATCH + bool "python-singledispatch removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_PYRO bool "python-pyro removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index 0d8ff0d4d1..0261463f45 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1229,7 +1229,6 @@ menu "External python modules" source "package/python-simplejson/Config.in" source "package/python-simplelogging/Config.in" source "package/python-simplesqlite/Config.in" - source "package/python-singledispatch/Config.in" source "package/python-sip/Config.in" source "package/python-six/Config.in" source "package/python-slob/Config.in" diff --git a/package/python-singledispatch/Config.in b/package/python-singledispatch/Config.in deleted file mode 100644 index 4abc219f95..0000000000 --- a/package/python-singledispatch/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PYTHON_SINGLEDISPATCH - bool "python-singledispatch" - depends on BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON_SIX # runtime - help - This library brings functools.singledispatch from - Python 3.4 to Python 2.6-3.3 - - https://pypi.python.org/pypi/singledispatch diff --git a/package/python-singledispatch/python-singledispatch.hash b/package/python-singledispatch/python-singledispatch.hash deleted file mode 100644 index c4eec53e30..0000000000 --- a/package/python-singledispatch/python-singledispatch.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=af2fc6a3d6cc5a02d0bf54d909785fcb -md5 af2fc6a3d6cc5a02d0bf54d909785fcb singledispatch-3.4.0.3.tar.gz -# Locally computed -sha256 5b06af87df13818d14f08a028e42f566640aef80805c3b50c5056b086e3c2b9c singledispatch-3.4.0.3.tar.gz -sha256 5a724c436f88585973787af91cecf58503cbf09e5c1721c516880614700767ef setup.py diff --git a/package/python-singledispatch/python-singledispatch.mk b/package/python-singledispatch/python-singledispatch.mk deleted file mode 100644 index 7e1d5ac8e0..0000000000 --- a/package/python-singledispatch/python-singledispatch.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-singledispatch -# -################################################################################ - -PYTHON_SINGLEDISPATCH_VERSION = 3.4.0.3 -PYTHON_SINGLEDISPATCH_SOURCE = singledispatch-$(PYTHON_SINGLEDISPATCH_VERSION).tar.gz -PYTHON_SINGLEDISPATCH_SITE = https://pypi.python.org/packages/source/s/singledispatch -PYTHON_SINGLEDISPATCH_LICENSE = MIT -PYTHON_SINGLEDISPATCH_LICENSE_FILES = setup.py -PYTHON_SINGLEDISPATCH_SETUP_TYPE = setuptools - -$(eval $(python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:16:28 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:16:28 +0100 Subject: [Buildroot] [git commit] docs/manual: drop python2 references Message-ID: <20220209212603.5F5EF81335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=da9f2a8fda2a746cd7f387d3335f28be6afd6e37 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- docs/manual/adding-packages-python.txt | 8 -------- docs/manual/writing-rules.txt | 8 ++++---- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/docs/manual/adding-packages-python.txt b/docs/manual/adding-packages-python.txt index 0c100859be..cfd2f88920 100644 --- a/docs/manual/adding-packages-python.txt +++ b/docs/manual/adding-packages-python.txt @@ -67,14 +67,6 @@ Python build system, but are not Python modules, can freely choose their name (existing examples in Buildroot are +scons+ and +supervisor+). -Packages that are only compatible with one version of Python (as in: -Python 2 or Python 3) should depend on that version explicitely in -their +Config.in+ file (+BR2_PACKAGE_PYTHON+ for Python 2, -+BR2_PACKAGE_PYTHON3+ for Python 3). Packages that are compatible -with both versions should not explicitely depend on them in their -+Config.in+ file, since that condition is already expressed for the -whole "External python modules" menu. - The main macro of the Python package infrastructure is +python-package+. It is similar to the +generic-package+ macro. It is also possible to create Python host packages with the diff --git a/docs/manual/writing-rules.txt b/docs/manual/writing-rules.txt index 3eec095d0e..6255a08c1c 100644 --- a/docs/manual/writing-rules.txt +++ b/docs/manual/writing-rules.txt @@ -93,9 +93,9 @@ so _make_ recognizes them as commands. YES: + --------------------- -ifeq ($(BR2_PACKAGE_PYTHON),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) LIBFOO_CONF_OPTS += --with-python-support -LIBFOO_DEPENDENCIES += python +LIBFOO_DEPENDENCIES += python3 else LIBFOO_CONF_OPTS += --without-python-support endif @@ -104,8 +104,8 @@ endif NO: + --------------------- -LIBFOO_CONF_OPTS += --with$(if $(BR2_PACKAGE_PYTHON),,out)-python-support -LIBFOO_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,) +LIBFOO_CONF_OPTS += --with$(if $(BR2_PACKAGE_PYTHON3),,out)-python-support +LIBFOO_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON3),python3,) --------------------- ** Keep configure options and dependencies close together. From yann.morin.1998 at free.fr Wed Feb 9 21:16:19 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:16:19 +0100 Subject: [Buildroot] [git commit] package/python-dialog: drop python2 specific package Message-ID: <20220209212603.359348323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1e44c7bcd928148ed31ade22512635e562bda7b2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Config.in.legacy | 6 ++++++ package/Config.in | 1 - package/python-dialog/Config.in | 10 ---------- package/python-dialog/python-dialog.hash | 5 ----- package/python-dialog/python-dialog.mk | 15 --------------- 5 files changed, 6 insertions(+), 31 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 6776048fc4..630194edba 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_DIALOG + bool "python-dialog removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_CONFIGOBJ bool "python-configobj removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index 478a4e6b90..b91e190c8e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -994,7 +994,6 @@ menu "External python modules" source "package/python-dbus-next/Config.in" source "package/python-decorator/Config.in" source "package/python-defusedxml/Config.in" - source "package/python-dialog/Config.in" source "package/python-dialog3/Config.in" source "package/python-dicttoxml/Config.in" source "package/python-distro/Config.in" diff --git a/package/python-dialog/Config.in b/package/python-dialog/Config.in deleted file mode 100644 index c1fdb23723..0000000000 --- a/package/python-dialog/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_PYTHON_DIALOG - bool "python-dialog" - depends on BR2_PACKAGE_PYTHON - depends on BR2_USE_MMU # dialog - select BR2_PACKAGE_DIALOG - help - A Python interface to the UNIX dialog utility and - mostly-compatible programs. - - http://pythondialog.sourceforge.net/ diff --git a/package/python-dialog/python-dialog.hash b/package/python-dialog/python-dialog.hash deleted file mode 100644 index 8f84e198b2..0000000000 --- a/package/python-dialog/python-dialog.hash +++ /dev/null @@ -1,5 +0,0 @@ -# Locally computed after verifying -# https://sourceforge.net/projects/pythondialog/files/pythondialog/3.4.0/python3-pythondialog-3.4.0.tar.bz2.asc -# with key 9B6F19FB52965E6C21FE76142A205688F8489BDD -sha256 8978d355c8db6728eeb9e23b39449b14597f1c76cb06dc72462642ca7cde46a0 python2-pythondialog-3.4.0.tar.bz2 -sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING diff --git a/package/python-dialog/python-dialog.mk b/package/python-dialog/python-dialog.mk deleted file mode 100644 index d5d4a4ceb5..0000000000 --- a/package/python-dialog/python-dialog.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# python-dialog -# -################################################################################ - -PYTHON_DIALOG_VERSION = 3.4.0 -PYTHON_DIALOG_SOURCE = python2-pythondialog-$(PYTHON_DIALOG_VERSION).tar.bz2 -PYTHON_DIALOG_SITE = http://downloads.sourceforge.net/project/pythondialog/pythondialog/$(PYTHON_DIALOG_VERSION) -PYTHON_DIALOG_LICENSE = LGPL-2.1+ -PYTHON_DIALOG_LICENSE_FILES = COPYING -PYTHON_DIALOG_SETUP_TYPE = distutils -PYTHON_DIALOG_DEPENDENCIES = dialog - -$(eval $(python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:13:53 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:13:53 +0100 Subject: [Buildroot] [git commit] package/python-subprocess32: drop python2 specific package Message-ID: <20220209212603.0A91D8323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c2d0a365decdaf56f62ee39420c63c3d0953b721 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Config.in.legacy | 6 +++++ package/Config.in | 1 - package/python-subprocess32/Config.in | 13 --------- .../python-subprocess32/python-subprocess32.hash | 5 ---- package/python-subprocess32/python-subprocess32.mk | 31 ---------------------- 5 files changed, 6 insertions(+), 50 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 3cd78ccf1c..8db9558ed4 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_SUBPROCESS32 + bool "python-subprocess32 removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_SINGLEDISPATCH bool "python-singledispatch removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index 0261463f45..18de2a32a5 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1243,7 +1243,6 @@ menu "External python modules" source "package/python-sqlalchemy/Config.in" source "package/python-sqliteschema/Config.in" source "package/python-sqlparse/Config.in" - source "package/python-subprocess32/Config.in" source "package/python-systemd/Config.in" source "package/python-tabledata/Config.in" source "package/python-tempora/Config.in" diff --git a/package/python-subprocess32/Config.in b/package/python-subprocess32/Config.in deleted file mode 100644 index d7fe84f1e6..0000000000 --- a/package/python-subprocess32/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_PYTHON_SUBPROCESS32 - bool "python-subprocess32" - depends on BR2_PACKAGE_PYTHON - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 || !BR2_MIPS_NABI64 - help - A backport of the Python 3 subprocess module for use - on Python 2. - - https://github.com/google/python-subprocess32 - -comment "python-subprocess32 needs a toolchain w/ headers >= 3.10 on MIPS N64" - depends on BR2_MIPS_NABI64 - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 diff --git a/package/python-subprocess32/python-subprocess32.hash b/package/python-subprocess32/python-subprocess32.hash deleted file mode 100644 index 65d18763d1..0000000000 --- a/package/python-subprocess32/python-subprocess32.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/subprocess32/json -md5 748844d560be5f0c707931cba1cdb48b subprocess32-3.5.4.tar.gz -sha256 eb2937c80497978d181efa1b839ec2d9622cf9600a039a79d0e108d1f9aec79d subprocess32-3.5.4.tar.gz -# Locally computed sha256 checksums -sha256 826b43437249d39422642f695154d064da64de92eb1476048a615f50bc1beb4a LICENSE diff --git a/package/python-subprocess32/python-subprocess32.mk b/package/python-subprocess32/python-subprocess32.mk deleted file mode 100644 index fb8a47f974..0000000000 --- a/package/python-subprocess32/python-subprocess32.mk +++ /dev/null @@ -1,31 +0,0 @@ -################################################################################ -# -# python-subprocess32 -# -################################################################################ - -PYTHON_SUBPROCESS32_VERSION = 3.5.4 -PYTHON_SUBPROCESS32_SOURCE = subprocess32-$(PYTHON_SUBPROCESS32_VERSION).tar.gz -PYTHON_SUBPROCESS32_SITE = https://files.pythonhosted.org/packages/32/c8/564be4d12629b912ea431f1a50eb8b3b9d00f1a0b1ceff17f266be190007 -PYTHON_SUBPROCESS32_SETUP_TYPE = setuptools -PYTHON_SUBPROCESS32_LICENSE = Python-2.0 -PYTHON_SUBPROCESS32_LICENSE_FILES = LICENSE - -# The configure step needs to be run outside of the setup.py since it isn't -# run correctly for cross-compiling -define PYTHON_SUBPROCESS32_CONFIGURE_CMDS - (cd $(@D) && \ - $(TARGET_CONFIGURE_OPTS) \ - $(TARGET_CONFIGURE_ARGS) \ - ./configure \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - --prefix=/usr \ - --exec-prefix=/usr \ - --sysconfdir=/etc \ - --program-prefix="" \ - ) -endef - -$(eval $(python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:13:43 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:13:43 +0100 Subject: [Buildroot] [git commit] package/python-pathlib2: drop python2 specific package Message-ID: <20220209212602.D19E181335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cc3eda104a340f0a5a0ad96a74ffb31574a6df47 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Config.in.legacy | 6 ++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/python-pathlib2/Config.in | 13 ------------- package/python-pathlib2/python-pathlib2.hash | 5 ----- package/python-pathlib2/python-pathlib2.mk | 14 -------------- 6 files changed, 6 insertions(+), 34 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 386f94e72b..74317a2d7c 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_PATHLIB2 + bool "python-pathlib2 removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_PAM bool "python-pam removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 0ca1ee9f38..4bb8821563 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -145,7 +145,6 @@ F: package/mpd/ N: Andrey Smirnov F: package/python-decorator/ F: package/python-ipython-genutils/ -F: package/python-pathlib2/ F: package/python-pickleshare/ F: package/python-scandir/ F: package/python-simplegeneric/ diff --git a/package/Config.in b/package/Config.in index 73e8901a1d..3c55dec6c5 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1118,7 +1118,6 @@ menu "External python modules" source "package/python-paramiko/Config.in" source "package/python-parso/Config.in" source "package/python-passlib/Config.in" - source "package/python-pathlib2/Config.in" source "package/python-pathpy/Config.in" source "package/python-pathtools/Config.in" source "package/python-pathvalidate/Config.in" diff --git a/package/python-pathlib2/Config.in b/package/python-pathlib2/Config.in deleted file mode 100644 index e28de4c12e..0000000000 --- a/package/python-pathlib2/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_PYTHON_PATHLIB2 - bool "python-pathlib2" - depends on BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON_SIX # runtime - help - Object-oriented filesystem paths. - - The goal of pathlib2 is to provide a backport of standard - pathlib module which tracks the standard library module, so - all the newest features of the standard pathlib can be used - also on older Python versions. - - https://pypi.python.org/pypi/pathlib2 diff --git a/package/python-pathlib2/python-pathlib2.hash b/package/python-pathlib2/python-pathlib2.hash deleted file mode 100644 index ebd197b62e..0000000000 --- a/package/python-pathlib2/python-pathlib2.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/pathlib2/json -md5 e50a0cf94e406c5110b3aed535626e9e pathlib2-2.3.6.tar.gz -sha256 7d8bcb5555003cdf4a8d2872c538faa3a0f5d20630cb360e518ca3b981795e5f pathlib2-2.3.6.tar.gz -# Locally computed sha256 checksums -sha256 861f813004a151ac77024ad445794653809ddf8a7572aee7bab18d11df2ba1c6 LICENSE.rst diff --git a/package/python-pathlib2/python-pathlib2.mk b/package/python-pathlib2/python-pathlib2.mk deleted file mode 100644 index 4bcfea78fb..0000000000 --- a/package/python-pathlib2/python-pathlib2.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-pathlib2 -# -################################################################################ - -PYTHON_PATHLIB2_VERSION = 2.3.6 -PYTHON_PATHLIB2_SOURCE = pathlib2-$(PYTHON_PATHLIB2_VERSION).tar.gz -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 - -$(eval $(python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:15:56 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:15:56 +0100 Subject: [Buildroot] [git commit] package/python-configobj: drop python2 specific package Message-ID: <20220209212603.2B44081335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8d264a96172cfa1c1f515d1160b921c013fa3bd7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Config.in.legacy | 6 ++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/Config.in.host | 1 - package/python-configobj/Config.in | 10 ---------- package/python-configobj/python-configobj.hash | 3 --- package/python-configobj/python-configobj.mk | 14 -------------- 7 files changed, 6 insertions(+), 30 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 47e8d696e0..6776048fc4 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_CONFIGOBJ + bool "python-configobj removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_YIELDFROM bool "python-yieldfrom removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 90988478f9..8112873f14 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -3033,7 +3033,6 @@ F: package/grantlee/ F: package/libusb/ F: package/libusb-compat/ F: package/proj/ -F: package/python-configobj/ F: package/python-iniparse/ F: package/qjson/ F: package/quazip/ diff --git a/package/Config.in b/package/Config.in index 6fb62caa4c..478a4e6b90 100644 --- a/package/Config.in +++ b/package/Config.in @@ -973,7 +973,6 @@ menu "External python modules" source "package/python-colorama/Config.in" source "package/python-colorlog/Config.in" source "package/python-colorzero/Config.in" - source "package/python-configobj/Config.in" source "package/python-configshell-fb/Config.in" source "package/python-constantly/Config.in" source "package/python-couchdb/Config.in" diff --git a/package/Config.in.host b/package/Config.in.host index 341e24926b..e5fbb07fc2 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -69,7 +69,6 @@ menu "Host utilities" source "package/pkgconf/Config.in.host" source "package/pru-software-support/Config.in.host" 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" diff --git a/package/python-configobj/Config.in b/package/python-configobj/Config.in deleted file mode 100644 index fc57e26f1c..0000000000 --- a/package/python-configobj/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_PYTHON_CONFIGOBJ - bool "python-configobj" - depends on BR2_PACKAGE_PYTHON - help - ConfigObj is a simple but powerful config file reader and - writer: an ini file round tripper. Its main feature is that - it is very easy to use, with a straightforward programmer's - interface and a simple syntax for config files. - - http://www.voidspace.org.uk/python/configobj.html diff --git a/package/python-configobj/python-configobj.hash b/package/python-configobj/python-configobj.hash deleted file mode 100644 index d43c453796..0000000000 --- a/package/python-configobj/python-configobj.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/configobj/json, sha256 locally computed -md5 e472a3a1c2a67bb0ec9b5d54c13a47d6 configobj-5.0.6.tar.gz -sha256 a2f5650770e1c87fb335af19a9b7eb73fc05ccf22144eb68db7d00cd2bcb0902 configobj-5.0.6.tar.gz diff --git a/package/python-configobj/python-configobj.mk b/package/python-configobj/python-configobj.mk deleted file mode 100644 index 9e281d28e7..0000000000 --- a/package/python-configobj/python-configobj.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-configobj -# -################################################################################ - -PYTHON_CONFIGOBJ_VERSION = 5.0.6 -PYTHON_CONFIGOBJ_SOURCE = configobj-$(PYTHON_CONFIGOBJ_VERSION).tar.gz -PYTHON_CONFIGOBJ_SITE = https://pypi.python.org/packages/64/61/079eb60459c44929e684fa7d9e2fdca403f67d64dd9dbac27296be2e0fab -PYTHON_CONFIGOBJ_LICENSE = BSD-3-Clause -# License only mentioned in the source -PYTHON_CONFIGOBJ_SETUP_TYPE = distutils - -$(eval $(python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:34:37 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:34:37 +0100 Subject: [Buildroot] [PATCH 084/107] package/python: drop host package In-Reply-To: <20220209165213.4498-85-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> <20220209165213.4498-85-peter@korsgaard.com> Message-ID: <20220209213437.GF2249818@scaer> Peter, All, On 2022-02-09 17:51 +0100, Peter Korsgaard spake thusly: > Signed-off-by: Peter Korsgaard > --- ... > package/python/Config.in.host | 16 - > package/python/python.hash | 5 - > package/python/python.mk | 302 ------------------ > 37 files changed, 2301 deletions(-) You forgot to update DEVELOPPERS, so I cherry-picked the hunk from patch 102 and applied it here. 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 paguilar at paguilar.org Wed Feb 9 21:35:58 2022 From: paguilar at paguilar.org (Pedro Aguilar) Date: Wed, 9 Feb 2022 22:35:58 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/guile: Add BR2_ENABLE_LOCALE as dependency. In-Reply-To: References: <20220208213722.836257-1-paguilar@paguilar.org> <5f710ea1-3f98-9435-c033-e73e70e86342@benettiengineering.com> Message-ID: <890b73ae-305c-2674-ed03-c06562983328@paguilar.org> Hi Giulio, On 2/8/22 23:54, Giulio Benetti wrote: > Hi again Pedro, > > I've reproduced the build failure with your previous attached .config > file and this patch fixes it. So below... > > On 08/02/22 23:06, Giulio Benetti wrote: >> Hi Pedro, >> >> On 08/02/22 22:37, Pedro Aguilar wrote: >>> If it's not present, enable libiconv. >> Here it's missing: >> Fixes: >> URL to autobuilder failure > > ...please provide the autobuilder failure URL and if it doesn't exist > than we don't need it. AFAIK, the build failure fixed by this patch was not reported by the autobuilder, so I'm afraid there isn't any URL to share. In a previous email I wrongly mentioned that it fixed an autobuilder failure, but all those failures are linked to another issue that seems to be fixed by a patch sent by Fabrice, although I haven't tested it: https://lists.buildroot.org/pipermail/buildroot/2022-February/636041.html May be the commit message of the current v2 patch can remain as is. Thanks! > So once done this I can give you my Review. > > Waiting for V2 with improved commit log then. > > Thank you! > Best regards Regards, -- Pedro Aguilar https://paguilar.org From yann.morin.1998 at free.fr Wed Feb 9 21:36:35 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:36:35 +0100 Subject: [Buildroot] [PATCH 102/107] package/python-configobj: drop python2 specific package In-Reply-To: <20220209165213.4498-103-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> <20220209165213.4498-103-peter@korsgaard.com> Message-ID: <20220209213635.GG2249818@scaer> Peter, All, On 2022-02-09 17:52 +0100, Peter Korsgaard spake thusly: > Signed-off-by: Peter Korsgaard > --- [--SNIP--] > diff --git a/DEVELOPERS b/DEVELOPERS > index 9c1411648e..8112873f14 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -2796,7 +2796,6 @@ F: package/ne10/ > F: package/pkg-python.mk > F: package/pkg-autotools.mk > F: package/pkg-generic.mk > -F: package/python/ Not sure how you managed to have this hunk in this patch, but given the tediousness of this series, I am not going to ask you to fix and respin, so, as I replied to patch 84, I cherry-picked this hunk in to that previous patch, and so dropped it here. 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 heiko.thiery at gmail.com Wed Feb 9 21:43:27 2022 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Wed, 9 Feb 2022 22:43:27 +0100 Subject: [Buildroot] [PATCH] package/rauc: bump to version 1.6 Message-ID: <20220209214326.21671-1-heiko.thiery@gmail.com> For release notes see: https://github.com/rauc/rauc/releases/tag/v1.6 Signed-off-by: Heiko Thiery --- # utils/test-pkg -p rauc 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 package/rauc/rauc.hash | 4 ++-- package/rauc/rauc.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/rauc/rauc.hash b/package/rauc/rauc.hash index a025257845..f6c1446de4 100644 --- a/package/rauc/rauc.hash +++ b/package/rauc/rauc.hash @@ -1,4 +1,4 @@ # Locally calculated, after verifying against -# https://github.com/rauc/rauc/releases/download/v1.5.1/rauc-1.5.1.tar.xz.asc -sha256 d4ea009ce702bcb083d942398ccfedec959c6bbb7adc0fd77ae9314ce11d9d91 rauc-1.5.1.tar.xz +# https://github.com/rauc/rauc/releases/download/v1.6/rauc-1.6.tar.xz.asc +sha256 86013788dd02321b7c3f913ad3a1f8802afbc784ec076fa278524a9e1ef9e7b0 rauc-1.6.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/rauc/rauc.mk b/package/rauc/rauc.mk index 99efc16c2f..39f5255812 100644 --- a/package/rauc/rauc.mk +++ b/package/rauc/rauc.mk @@ -4,7 +4,7 @@ # ################################################################################ -RAUC_VERSION = 1.5.1 +RAUC_VERSION = 1.6 RAUC_SITE = https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION) RAUC_SOURCE = rauc-$(RAUC_VERSION).tar.xz RAUC_LICENSE = LGPL-2.1 -- 2.20.1 From thomas.petazzoni at bootlin.com Wed Feb 9 21:48:00 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 9 Feb 2022 22:48:00 +0100 Subject: [Buildroot] [PATCH 1/5 v2] package/pkg-cargo: allow packages to define download environment In-Reply-To: <20220209205527.GD2249818@scaer> References: <9354_1644422930_6203E712_9354_383_11_2d5b77c2a90cf722e007a5bf3ed4227d2bd1fda6.1644422916.git.yann.morin@orange.com> <20220209205259.725e17c2@windsurf> <20220209205527.GD2249818@scaer> Message-ID: <20220209224800.7717a488@windsurf> On Wed, 9 Feb 2022 21:55:27 +0100 "Yann E. MORIN" wrote: > > But, but, then, how is: > > > > PYTHON_CRYPTOGRAPHY_DL_ENV = \ > > BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml > > > > currently working? > > Because, its the name implies, it is a python-package, not a > cargo-package. > > Yeah, I got puzzled too. ;-) Aah, yes. Indeed. A python-package that builds Rust stuff. I wonder how it's possible for me to forget this, after having spent so many hours on this particular package! :-) Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From marcus.hoffmann at othermo.de Wed Feb 9 21:43:05 2022 From: marcus.hoffmann at othermo.de (Marcus Hoffmann) Date: Wed, 9 Feb 2022 22:43:05 +0100 Subject: [Buildroot] [PATCH] package/libqmi: fix build failure without host-python Message-ID: <20220209214305.314272-1-marcus.hoffmann@othermo.de> Add an upstream patch to use python3 instead of just python during the libqmi build. Fixes a build error with the following defconfig inside the buildroot:base docker image. BR2_aarch64=y BR2_cortex_a72=y BR2_ARM_FPU_VFPV4=y BR2_TOOLCHAIN_BUILDROOT_WCHAR=y BR2_PACKAGE_LIBQMI=y Fixes: FAILED: src/libqmi-glib/generated/qmi-ctl.c src/libqmi-glib/generated/qmi-ctl.h src/libqmi-glib/generated/qmi-ctl.sections /builds/othermo/buildroot/output/build/libqmi-1.30.2/build-aux/qmi-codegen/qmi-codegen --input /builds/othermo/buildroot/output/build/libqmi-1.30.2/data/qmi-service-ctl.json --include /builds/othermo/buildroot/output/build/libqmi-1.30.2/data/qmi-common.json --output src/libqmi-glib/generated/qmi-ctl /usr/bin/env: 'python': No such file or directory Signed-off-by: Marcus Hoffmann --- package/libqmi/libqmi.hash | 1 + package/libqmi/libqmi.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/package/libqmi/libqmi.hash b/package/libqmi/libqmi.hash index 1f2da45ac0..854de8512c 100644 --- a/package/libqmi/libqmi.hash +++ b/package/libqmi/libqmi.hash @@ -2,3 +2,4 @@ sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB sha256 2eb7c7971b91a64ad830643b0170cff692a69bf0f093ca61d72d3f466a0272d4 libqmi-1.30.2.tar.gz +sha256 1fb80064cddc9a0a2a2abeb622acc535c3f1c74795bdee48c81f32e15442d7d7 17c604d7bd78dd081868798a702db0eaa8abb169.patch diff --git a/package/libqmi/libqmi.mk b/package/libqmi/libqmi.mk index a4839f1efb..f3c51f7486 100644 --- a/package/libqmi/libqmi.mk +++ b/package/libqmi/libqmi.mk @@ -6,6 +6,7 @@ LIBQMI_VERSION = 1.30.2 LIBQMI_SITE = https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/archive/$(LIBQMI_VERSION) +LIBQMI_PATCH = https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/commit/17c604d7bd78dd081868798a702db0eaa8abb169.patch LIBQMI_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (programs) LIBQMI_LICENSE_FILES = COPYING COPYING.LIB LIBQMI_CPE_ID_VENDOR = libqmi_project -- 2.25.1 From peter at korsgaard.com Wed Feb 9 21:56:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 09 Feb 2022 22:56:49 +0100 Subject: [Buildroot] [PATCH 102/107] package/python-configobj: drop python2 specific package In-Reply-To: <20220209213635.GG2249818@scaer> (Yann E. MORIN's message of "Wed, 9 Feb 2022 22:36:35 +0100") References: <20220209165213.4498-1-peter@korsgaard.com> <20220209165213.4498-103-peter@korsgaard.com> <20220209213635.GG2249818@scaer> Message-ID: <874k57ya8u.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Peter, All, > On 2022-02-09 17:52 +0100, Peter Korsgaard spake thusly: >> Signed-off-by: Peter Korsgaard >> --- > [--SNIP--] >> diff --git a/DEVELOPERS b/DEVELOPERS >> index 9c1411648e..8112873f14 100644 >> --- a/DEVELOPERS >> +++ b/DEVELOPERS >> @@ -2796,7 +2796,6 @@ F: package/ne10/ >> F: package/pkg-python.mk >> F: package/pkg-autotools.mk >> F: package/pkg-generic.mk >> -F: package/python/ > Not sure how you managed to have this hunk in this patch, but given the > tediousness of this series, I am not going to ask you to fix and respin, > so, as I replied to patch 84, I cherry-picked this hunk in to that > previous patch, and so dropped it here. Ups, thanks for fixing it. I originally had the python host package after these (but somehow forgot to amend the DEVELOPERS change), which is why it ended up here. > Applied to master, thanks. Thanks! -- Bye, Peter Korsgaard From mdurrant at arcturusnetworks.com Wed Feb 9 22:17:31 2022 From: mdurrant at arcturusnetworks.com (Michael PDQ) Date: Wed, 9 Feb 2022 17:17:31 -0500 Subject: [Buildroot] [PATCH v2] board/arcturus/aarch64-ucls1012a: bump u-boot and kernel version Message-ID: <20220209221731.51116-1-mdurrant@arcturusnetworks.com> From: Oleksandr G Zhadan --- V1->V2: - Bump the kernel to "Linux version 5.4.137" - Bootloader version is still "U-Boot 2019.10" but new targets added. - Remove the /etc/init.d/S09modload script to load the pfe firmware module because now the pfe firmware module is loaded by the kernel - New compressed Image.gz is used --- Signed-off-by: Oleksandr Zhadan Signed-off-by: Michael Durrant --- board/arcturus/aarch64-ucls1012a/post-build.sh | 2 -- board/arcturus/aarch64-ucls1012a/readme.txt | 5 +++-- .../rootfs_overlay/etc/init.d/S09modload | 14 -------------- configs/arcturus_ucls1012a_defconfig | 9 ++++----- 4 files changed, 7 insertions(+), 23 deletions(-) delete mode 100755 board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload diff --git a/board/arcturus/aarch64-ucls1012a/post-build.sh b/board/arcturus/aarch64-ucls1012a/post-build.sh index f8ba78095f..ca3862988d 100755 --- a/board/arcturus/aarch64-ucls1012a/post-build.sh +++ b/board/arcturus/aarch64-ucls1012a/post-build.sh @@ -1,5 +1,3 @@ #!/bin/sh -mkdir -p ${TARGET_DIR}/lib/firmware -cp -f ${BUILD_DIR}/linux-custom/firmware/ppfe/* ${TARGET_DIR}/lib/firmware/ cp -f ${BUILD_DIR}/linux-custom/br2-ucls1012a.its ${BINARIES_DIR}/ diff --git a/board/arcturus/aarch64-ucls1012a/readme.txt b/board/arcturus/aarch64-ucls1012a/readme.txt index 483d5e9aef..cb91716b34 100644 --- a/board/arcturus/aarch64-ucls1012a/readme.txt +++ b/board/arcturus/aarch64-ucls1012a/readme.txt @@ -23,14 +23,15 @@ Result of the build After building, you should obtain this tree: output/images/ + +-- Image.gz +-- arc-ucls1012a.dtb - +-- Image + +-- br2-ucls1012a.its +-- part0-000000.itb +-- rootfs.cpio +-- rootfs.cpio.gz +-- rootfs.tar +-- u-boot.bin - +-- ucls1012a.its + Flashing -------- diff --git a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload b/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload deleted file mode 100755 index c87ffda14f..0000000000 --- a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -# -case "$1" in - start) - modprobe pfe - ;; - stop) - ;; - restart|reload) - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac diff --git a/configs/arcturus_ucls1012a_defconfig b/configs/arcturus_ucls1012a_defconfig index fd33ebf1f6..2a9c1e0582 100644 --- a/configs/arcturus_ucls1012a_defconfig +++ b/configs/arcturus_ucls1012a_defconfig @@ -1,22 +1,21 @@ # Architecture BR2_aarch64=y -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # System settings BR2_TARGET_GENERIC_HOSTNAME="ucls1012a" BR2_TARGET_GENERIC_ISSUE="Welcome to uCLS1012A-SOM" BR2_SYSTEM_DHCP="eth0" -BR2_ROOTFS_OVERLAY="board/arcturus/aarch64-ucls1012a/rootfs_overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="board/arcturus/aarch64-ucls1012a/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/arcturus/aarch64-ucls1012a/post-image.sh" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-kernel,v.20.31)/linux-v.20.31.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-kernel,v.22.06)/linux-v.22.06.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="ucls1012a" +BR2_LINUX_KERNEL_IMAGEGZ=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="arcturus/arc-ucls1012a" @@ -28,7 +27,7 @@ BR2_TARGET_ROOTFS_CPIO_GZIP=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-uboot,v.20.31)/uboot-v.20.31.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-uboot,v.22.06)/uboot-v.22.06.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="UCLS1012A_QSPI128" # Tools -- 2.26.2 From giulio.benetti at benettiengineering.com Wed Feb 9 22:27:08 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 9 Feb 2022 23:27:08 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/guile: Add BR2_ENABLE_LOCALE as dependency. In-Reply-To: <890b73ae-305c-2674-ed03-c06562983328@paguilar.org> References: <20220208213722.836257-1-paguilar@paguilar.org> <5f710ea1-3f98-9435-c033-e73e70e86342@benettiengineering.com> <890b73ae-305c-2674-ed03-c06562983328@paguilar.org> Message-ID: <8d1e16bc-d34f-1760-74c4-2d98b600321d@benettiengineering.com> Hi Pedro, On 09/02/22 22:35, Pedro Aguilar wrote: > Hi Giulio, > > On 2/8/22 23:54, Giulio Benetti wrote: >> Hi again Pedro, >> >> I've reproduced the build failure with your previous attached .config >> file and this patch fixes it. So below... >> >> On 08/02/22 23:06, Giulio Benetti wrote: >>> Hi Pedro, >>> >>> On 08/02/22 22:37, Pedro Aguilar wrote: >>>> If it's not present, enable libiconv. >>> Here it's missing: >>> Fixes: >>> URL to autobuilder failure >> >> ...please provide the autobuilder failure URL and if it doesn't exist >> than we don't need it. > > AFAIK, the build failure fixed by this patch was not reported by the > autobuilder, so I'm afraid there isn't any URL to share. > > In a previous email I wrongly mentioned that it fixed an autobuilder > failure, but all those failures are linked to another issue that seems > to be fixed by a patch sent by Fabrice, although I haven't tested it: > > https://lists.buildroot.org/pipermail/buildroot/2022-February/636041.html Ok, so no autobuilder failure. > May be the commit message of the current v2 patch can remain as is. Can you improve the commit log a bit? Try to 'git log --grep=' some file which has that fix, or git blame it so you can find the commit log and imitate it. That's the best way to learn how to write commit logs. Because "Add BR2_ENABLE_LOCALE as dependency." doesn't mean that much, and "If it's not present, enable libiconv." doesn't sound so good. What about: ``` package/guile: fix build failure due to missing libiconv When building package guile with BR2_ENABLE_LOCALE=n we get the following error: ``` In file included from filesys.c:95: ports-internal.h:26:10: fatal error: iconv.h: No such file or directory 26 | #include | ^~~~~~~~~ compilation terminated. ``` So let's fix it by selecting BR2_PACKAGE_LIBICONV and adding libiconv package as dependency. Signed-off-by: Pedro... ``` Can you please a V3 with this also pointing the V1->V2, V2->V3 changes? Thank you! Best regards -- Giulio Benetti Benetti Engineering sas From james.hilliard1 at gmail.com Wed Feb 9 22:35:51 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 9 Feb 2022 15:35:51 -0700 Subject: [Buildroot] [PATCH 1/1] package/gst1-devtools: drop python2 build dependencies Message-ID: <20220209223551.772606-1-james.hilliard1@gmail.com> Looks like this was missed in c4bbd6da50488944debba29e195557e5b345f2b1 Signed-off-by: James Hilliard --- package/gstreamer1/gst1-devtools/gst1-devtools.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.mk b/package/gstreamer1/gst1-devtools/gst1-devtools.mk index 66b509ae2c..390b20de16 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.mk +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.mk @@ -17,11 +17,7 @@ GST1_DEVTOOLS_DEPENDENCIES = \ json-glib \ $(if $(BR2_PACKAGE_CAIRO),cairo) -ifeq ($(BR2_PACKAGE_PYTHON3),y) GST1_DEVTOOLS_DEPENDENCIES += host-python3 python3 -else -GST1_DEVTOOLS_DEPENDENCIES += host-python python -endif ifeq ($(BR2_PACKAGE_GST1_RTSP_SERVER),y) GST1_DEVTOOLS_DEPENDENCIES += gst1-rtsp-server -- 2.25.1 From james.hilliard1 at gmail.com Wed Feb 9 22:41:05 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 9 Feb 2022 15:41:05 -0700 Subject: [Buildroot] [PATCH 1/1] package/gtest: drop host python2 support Message-ID: <20220209224105.772909-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/gtest/gtest.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/gtest/gtest.mk b/package/gtest/gtest.mk index 673e626c45..5bad1fb5f7 100644 --- a/package/gtest/gtest.mk +++ b/package/gtest/gtest.mk @@ -19,13 +19,8 @@ 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 -- 2.25.1 From giulio.benetti at benettiengineering.com Wed Feb 9 22:42:59 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 9 Feb 2022 23:42:59 +0100 Subject: [Buildroot] Patch state of andes/ae350 In-Reply-To: References: Message-ID: <5D73A104-6D13-4082-9A55-E22215647C87@benettiengineering.com> Hi Peter, I?m going to review this patch soon. Sorry I?ve skipped your board that came before other I?ve reviewed. Best regards ?- Giulio Benetti Benetti Engineering sas > Il giorno 9 feb 2022, alle ore 04:57, Yu Chien Peter Lin ha scritto: > > ?Hi Thomas, > > I would like to follow up on my patches last month. > Are they still under review? Please let me know if > I missed something that needs to be fixed. > > Regards, > Yu-Chien Peter Lin > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From giulio.benetti at benettiengineering.com Wed Feb 9 22:54:31 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 9 Feb 2022 23:54:31 +0100 Subject: [Buildroot] [PATCH v2] board/arcturus/aarch64-ucls1012a: bump u-boot and kernel version In-Reply-To: <20220209221731.51116-1-mdurrant@arcturusnetworks.com> References: <20220209221731.51116-1-mdurrant@arcturusnetworks.com> Message-ID: Hi Oleksander, On 09/02/22 23:17, Michael PDQ wrote: > From: Oleksandr G Zhadan > [0] > --- > V1->V2: > - Bump the kernel to "Linux version 5.4.137" > - Bootloader version is still "U-Boot 2019.10" but new targets added. > - Remove the /etc/init.d/S09modload script to load the pfe firmware > module because now the pfe firmware module is loaded by the kernel > - New compressed Image.gz is used > > --- Please move the 2 SoBs above [0], otherwise they will be dropped since everything after the 3 dashes will be dropped and it's only useful for patch reviewing. > Signed-off-by: Oleksandr Zhadan > Signed-off-by: Michael Durrant > --- > board/arcturus/aarch64-ucls1012a/post-build.sh | 2 -- > board/arcturus/aarch64-ucls1012a/readme.txt | 5 +++-- > .../rootfs_overlay/etc/init.d/S09modload | 14 -------------- > configs/arcturus_ucls1012a_defconfig | 9 ++++----- > 4 files changed, 7 insertions(+), 23 deletions(-) > delete mode 100755 board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload > > diff --git a/board/arcturus/aarch64-ucls1012a/post-build.sh b/board/arcturus/aarch64-ucls1012a/post-build.sh > index f8ba78095f..ca3862988d 100755 > --- a/board/arcturus/aarch64-ucls1012a/post-build.sh > +++ b/board/arcturus/aarch64-ucls1012a/post-build.sh > @@ -1,5 +1,3 @@ > #!/bin/sh > > -mkdir -p ${TARGET_DIR}/lib/firmware > -cp -f ${BUILD_DIR}/linux-custom/firmware/ppfe/* ${TARGET_DIR}/lib/firmware/ > cp -f ${BUILD_DIR}/linux-custom/br2-ucls1012a.its ${BINARIES_DIR}/ > diff --git a/board/arcturus/aarch64-ucls1012a/readme.txt b/board/arcturus/aarch64-ucls1012a/readme.txt > index 483d5e9aef..cb91716b34 100644 > --- a/board/arcturus/aarch64-ucls1012a/readme.txt > +++ b/board/arcturus/aarch64-ucls1012a/readme.txt > @@ -23,14 +23,15 @@ Result of the build > After building, you should obtain this tree: > > output/images/ > + +-- Image.gz This change ^^^ is worth to be mention in commit log > +-- arc-ucls1012a.dtb > - +-- Image > + +-- br2-ucls1012a.its Is there a reason why .its file changes name? If yes can you please write it in commit log? > +-- part0-000000.itb > +-- rootfs.cpio > +-- rootfs.cpio.gz > +-- rootfs.tar > +-- u-boot.bin > - +-- ucls1012a.its > + This ^^^ newline is useless, please drop it > Flashing > -------- > diff --git a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload b/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload > deleted file mode 100755 > index c87ffda14f..0000000000 > --- a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload > +++ /dev/null > @@ -1,14 +0,0 @@ > -#!/bin/sh > -# > -case "$1" in > - start) > - modprobe pfe > - ;; > - stop) > - ;; > - restart|reload) > - ;; > - *) > - echo "Usage: $0 {start|stop|restart}" > - exit 1 > -esac You're removing this script and... > diff --git a/configs/arcturus_ucls1012a_defconfig b/configs/arcturus_ucls1012a_defconfig > index fd33ebf1f6..2a9c1e0582 100644 > --- a/configs/arcturus_ucls1012a_defconfig > +++ b/configs/arcturus_ucls1012a_defconfig > @@ -1,22 +1,21 @@ > # Architecture > BR2_aarch64=y > > -# Linux headers same as kernel, a 4.14 series > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y > > # System settings > BR2_TARGET_GENERIC_HOSTNAME="ucls1012a" > BR2_TARGET_GENERIC_ISSUE="Welcome to uCLS1012A-SOM" > BR2_SYSTEM_DHCP="eth0" > -BR2_ROOTFS_OVERLAY="board/arcturus/aarch64-ucls1012a/rootfs_overlay" ...the overlay directory, can you explain why in commit log? > BR2_ROOTFS_POST_BUILD_SCRIPT="board/arcturus/aarch64-ucls1012a/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/arcturus/aarch64-ucls1012a/post-image.sh" > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-kernel,v.20.31)/linux-v.20.31.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-kernel,v.22.06)/linux-v.22.06.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="ucls1012a" > +BR2_LINUX_KERNEL_IMAGEGZ=y This ^^^ is the reason of renaming to Image.gz but it's worth mention it in commit log > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="arcturus/arc-ucls1012a" > > @@ -28,7 +27,7 @@ BR2_TARGET_ROOTFS_CPIO_GZIP=y > BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > BR2_TARGET_UBOOT_CUSTOM_TARBALL=y > -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-uboot,v.20.31)/uboot-v.20.31.tar.gz" > +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-uboot,v.22.06)/uboot-v.22.06.tar.gz" > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="UCLS1012A_QSPI128" > > # Tools I've built it successfully in gitlab-ci docker, so I think you only need to fix those few stuff and send a V3 so I can re-test and give you my Reviewed-by and Tested-by: Thank you! Best regards -- Giulio Benetti Benetti Engineering sas From giulio.benetti at benettiengineering.com Wed Feb 9 22:58:04 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 9 Feb 2022 23:58:04 +0100 Subject: [Buildroot] [PATCH v2 1/3] board/andes: rearrange nds32 folder structure In-Reply-To: <20220125054956.27492-1-peterlin@andestech.com> References: <20220125054956.27492-1-peterlin@andestech.com> Message-ID: <2135e397-ab3a-8f85-0715-671b8c7382b7@benettiengineering.com> Hi Peter, On 25/01/22 06:49, Yu Chien Peter Lin wrote: I would add also: "Rearrange nds32 folder structure to add different boards"(or SoCs) > 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 Best regards -- Giulio Benetti Benetti Engineering sas From paguilar at paguilar.org Wed Feb 9 22:59:57 2022 From: paguilar at paguilar.org (Pedro Aguilar) Date: Wed, 9 Feb 2022 23:59:57 +0100 Subject: [Buildroot] [PATCH v3 1/1] package/guile: Fix build failure due to missing libiconv Message-ID: <20220209225957.1257630-1-paguilar@paguilar.org> When building package guile with BR2_ENABLE_LOCALE=n we get the following error: ``` In file included from filesys.c:95: ports-internal.h:26:10: fatal error: iconv.h: No such file or directory 26 | #include | ^~~~~~~~~ compilation terminated. ``` So let's fix it by selecting BR2_PACKAGE_LIBICONV and adding libiconv package as dependency. Signed-off-by: Pedro Aguilar --- Changes v2 -> v3: - Improve commit message (thanks to Giulio comments) Changes v1 -> v2: - Use BR2_ENABLE_LOCALE if selected, otherwise use libiconv as before (pointed out by Thomas and Giulio) --- package/guile/Config.in | 1 + package/guile/guile.mk | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/package/guile/Config.in b/package/guile/Config.in index b1182a4cee..f70e674018 100644 --- a/package/guile/Config.in +++ b/package/guile/Config.in @@ -9,6 +9,7 @@ config BR2_PACKAGE_GUILE select BR2_PACKAGE_LIBFFI select BR2_PACKAGE_GMP select BR2_PACKAGE_BDWGC + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE help Guile is an interpreter and compiler for the Scheme programming language, a clean and elegant dialect of Lisp. diff --git a/package/guile/guile.mk b/package/guile/guile.mk index 0f245fca76..03420407f8 100644 --- a/package/guile/guile.mk +++ b/package/guile/guile.mk @@ -18,6 +18,10 @@ GUILE_CPE_ID_VENDOR = gnu GUILE_DEPENDENCIES = host-guile libunistring libffi gmp bdwgc host-pkgconf HOST_GUILE_DEPENDENCIES = host-libunistring host-libffi host-gmp host-bdwgc host-flex host-pkgconf host-gettext +ifeq ($(BR2_ENABLE_LOCALE),) +GUILE_DEPENDENCIES += libiconv +endif + # The HAVE_GC* CFLAGS specify that we will use internal callbacks # instead of the ones provided by # bdwgc. Eg. HAVE_GC_SET_FINALIZER_NOTIFIER specifies that we won't -- 2.25.1 From giulio.benetti at benettiengineering.com Wed Feb 9 23:09:27 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 10 Feb 2022 00:09:27 +0100 Subject: [Buildroot] [PATCH v2 3/3] DEVELOPERS: add Yu-Chien Lin to board/andes In-Reply-To: <20220125054956.27492-3-peterlin@andestech.com> References: <20220125054956.27492-1-peterlin@andestech.com> <20220125054956.27492-3-peterlin@andestech.com> Message-ID: <674c1c83-4bcf-3740-8f79-184c1a86cda3@benettiengineering.com> Hi Peter, On 25/01/22 06:49, Yu Chien Peter Lin wrote: > 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 This ^^^ line goes before its previous one for alphabetical order > F: toolchain/toolchain-external/toolchain-external-andes-nds32/ > > N: Olaf Rempel Best regards -- Giulio Benetti Benetti Engineering sas From giulio.benetti at benettiengineering.com Wed Feb 9 23:16:03 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 10 Feb 2022 00:16:03 +0100 Subject: [Buildroot] [PATCH v3 1/1] package/guile: Fix build failure due to missing libiconv In-Reply-To: <20220209225957.1257630-1-paguilar@paguilar.org> References: <20220209225957.1257630-1-paguilar@paguilar.org> Message-ID: <966178a8-693f-fdf7-b438-8e6c1302258c@benettiengineering.com> Hi Pedro, On 09/02/22 23:59, Pedro Aguilar wrote: > When building package guile with BR2_ENABLE_LOCALE=n > we get the following error: > > ``` > In file included from filesys.c:95: > ports-internal.h:26:10: fatal error: iconv.h: No such file or directory > 26 | #include > | ^~~~~~~~~ > compilation terminated. > ``` > > So let's fix it by selecting BR2_PACKAGE_LIBICONV and > adding libiconv package as dependency. > > Signed-off-by: Pedro Aguilar Reviewed-by: Giulio Benetti Thank you! Best regards -- Giulio Benetti Benetti Engineering sas > --- > Changes v2 -> v3: > - Improve commit message (thanks to Giulio comments) > Changes v1 -> v2: > - Use BR2_ENABLE_LOCALE if selected, otherwise use libiconv > as before (pointed out by Thomas and Giulio) > --- > package/guile/Config.in | 1 + > package/guile/guile.mk | 4 ++++ > 2 files changed, 5 insertions(+) > > diff --git a/package/guile/Config.in b/package/guile/Config.in > index b1182a4cee..f70e674018 100644 > --- a/package/guile/Config.in > +++ b/package/guile/Config.in > @@ -9,6 +9,7 @@ config BR2_PACKAGE_GUILE > select BR2_PACKAGE_LIBFFI > select BR2_PACKAGE_GMP > select BR2_PACKAGE_BDWGC > + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE > help > Guile is an interpreter and compiler for the Scheme > programming language, a clean and elegant dialect of Lisp. > diff --git a/package/guile/guile.mk b/package/guile/guile.mk > index 0f245fca76..03420407f8 100644 > --- a/package/guile/guile.mk > +++ b/package/guile/guile.mk > @@ -18,6 +18,10 @@ GUILE_CPE_ID_VENDOR = gnu > GUILE_DEPENDENCIES = host-guile libunistring libffi gmp bdwgc host-pkgconf > HOST_GUILE_DEPENDENCIES = host-libunistring host-libffi host-gmp host-bdwgc host-flex host-pkgconf host-gettext > > +ifeq ($(BR2_ENABLE_LOCALE),) > +GUILE_DEPENDENCIES += libiconv > +endif > + > # The HAVE_GC* CFLAGS specify that we will use internal callbacks > # instead of the ones provided by > # bdwgc. Eg. HAVE_GC_SET_FINALIZER_NOTIFIER specifies that we won't From giulio.benetti at benettiengineering.com Wed Feb 9 23:17:01 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 10 Feb 2022 00:17:01 +0100 Subject: [Buildroot] [PATCH v3 1/1] package/guile: Fix build failure due to missing libiconv In-Reply-To: <20220209225957.1257630-1-paguilar@paguilar.org> References: <20220209225957.1257630-1-paguilar@paguilar.org> Message-ID: <26f60dc2-965b-08b1-bbd1-2a042a09bd0d@benettiengineering.com> On 09/02/22 23:59, Pedro Aguilar wrote: > When building package guile with BR2_ENABLE_LOCALE=n > we get the following error: > > ``` > In file included from filesys.c:95: > ports-internal.h:26:10: fatal error: iconv.h: No such file or directory > 26 | #include > | ^~~~~~~~~ > compilation terminated. > ``` > > So let's fix it by selecting BR2_PACKAGE_LIBICONV and > adding libiconv package as dependency. > > Signed-off-by: Pedro Aguilar And forgotten: Tested-by: Giulio Benetti Best regards -- Giulio Benetti Benetti Engineering sas > --- > Changes v2 -> v3: > - Improve commit message (thanks to Giulio comments) > Changes v1 -> v2: > - Use BR2_ENABLE_LOCALE if selected, otherwise use libiconv > as before (pointed out by Thomas and Giulio) > --- > package/guile/Config.in | 1 + > package/guile/guile.mk | 4 ++++ > 2 files changed, 5 insertions(+) > > diff --git a/package/guile/Config.in b/package/guile/Config.in > index b1182a4cee..f70e674018 100644 > --- a/package/guile/Config.in > +++ b/package/guile/Config.in > @@ -9,6 +9,7 @@ config BR2_PACKAGE_GUILE > select BR2_PACKAGE_LIBFFI > select BR2_PACKAGE_GMP > select BR2_PACKAGE_BDWGC > + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE > help > Guile is an interpreter and compiler for the Scheme > programming language, a clean and elegant dialect of Lisp. > diff --git a/package/guile/guile.mk b/package/guile/guile.mk > index 0f245fca76..03420407f8 100644 > --- a/package/guile/guile.mk > +++ b/package/guile/guile.mk > @@ -18,6 +18,10 @@ GUILE_CPE_ID_VENDOR = gnu > GUILE_DEPENDENCIES = host-guile libunistring libffi gmp bdwgc host-pkgconf > HOST_GUILE_DEPENDENCIES = host-libunistring host-libffi host-gmp host-bdwgc host-flex host-pkgconf host-gettext > > +ifeq ($(BR2_ENABLE_LOCALE),) > +GUILE_DEPENDENCIES += libiconv > +endif > + > # The HAVE_GC* CFLAGS specify that we will use internal callbacks > # instead of the ones provided by > # bdwgc. Eg. HAVE_GC_SET_FINALIZER_NOTIFIER specifies that we won't From giulio.benetti at benettiengineering.com Wed Feb 9 23:39:07 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 10 Feb 2022 00:39:07 +0100 Subject: [Buildroot] [PATCH v2 2/3] board/andes/ae350: add support for Andes AE350 In-Reply-To: <20220125054956.27492-2-peterlin@andestech.com> References: <20220125054956.27492-1-peterlin@andestech.com> <20220125054956.27492-2-peterlin@andestech.com> Message-ID: <7f565a32-0e66-d828-3d38-4e91577e88ff@benettiengineering.com> Hi Peter, I review it now, On 25/01/22 06:49, 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 Here you need to write the changes from previous patches like: --- V1->V2: * done this * done that V2->V3: * done this * done that > --- > 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 Would it be possible for you to upstream these patches? I mean, do you maintain the uboot, opensbi repositories so you can do that? If yes it would be great having no patches at all here. > 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; > + }; > + }; > + }; > +}; It's a bit out of topic, but with this .dts ^^^ you define and entire SoC+board, shouldn't it be like a .dtsi file for SoC and a .dts file for board? > 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 This is ok, but during the last 15-20 days I've seen the increasing wish to go for extlinux.conf instead of boot.scr because it's easier to debug. Then nothing prevents one to customize the defconfig and use the boot.scr in production, where for example I find checksum very important. But please use extlinux.conf here. > 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" > + } > +} This file ^^^ doesn't respect the standard I've defined in Buildroot manual: https://buildroot.org/downloads/manual/manual.html#writing-genimage-cfg It's some time I have to write a Linter for it, but time is always few and I will take some other time :-/ > 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 Here please add: $ sudo sync > + > +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. "it should boot..." > 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" I've just built your defconfig using gitlab-ci docker but it fails because you need to add also: BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y > +# BR2_TARGET_UBOOT_FORMAT_BIN is not set > +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.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" For the rest it looks good to me. So I wait the V3 from you. Thank you! Best regards -- Giulio Benetti Benetti Engineering sas From baruch at tkos.co.il Thu Feb 10 05:42:19 2022 From: baruch at tkos.co.il (Baruch Siach) Date: Thu, 10 Feb 2022 07:42:19 +0200 Subject: [Buildroot] [PATCH 1/1] package/gst1-devtools: drop python2 build dependencies In-Reply-To: <20220209223551.772606-1-james.hilliard1@gmail.com> References: <20220209223551.772606-1-james.hilliard1@gmail.com> Message-ID: <87wni3b7iq.fsf@tarshish> Hi James, On Wed, Feb 09 2022, James Hilliard wrote: > Looks like this was missed in c4bbd6da50488944debba29e195557e5b345f2b1 > > Signed-off-by: James Hilliard > --- > package/gstreamer1/gst1-devtools/gst1-devtools.mk | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.mk b/package/gstreamer1/gst1-devtools/gst1-devtools.mk > index 66b509ae2c..390b20de16 100644 > --- a/package/gstreamer1/gst1-devtools/gst1-devtools.mk > +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.mk > @@ -17,11 +17,7 @@ GST1_DEVTOOLS_DEPENDENCIES = \ > json-glib \ > $(if $(BR2_PACKAGE_CAIRO),cairo) > > -ifeq ($(BR2_PACKAGE_PYTHON3),y) > GST1_DEVTOOLS_DEPENDENCIES += host-python3 python3 Maybe better add this to the list of unconditional dependencies above? baruch > -else > -GST1_DEVTOOLS_DEPENDENCIES += host-python python > -endif > > ifeq ($(BR2_PACKAGE_GST1_RTSP_SERVER),y) > GST1_DEVTOOLS_DEPENDENCIES += gst1-rtsp-server -- ~. .~ Tk Open Systems =}------------------------------------------------ooO--U--Ooo------------{= - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il - From james.hilliard1 at gmail.com Thu Feb 10 06:11:00 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 9 Feb 2022 23:11:00 -0700 Subject: [Buildroot] [PATCH v2 1/1] package/gst1-devtools: drop python2 build dependencies Message-ID: <20220210061100.810772-1-james.hilliard1@gmail.com> Looks like this was missed in c4bbd6da50488944debba29e195557e5b345f2b1 Signed-off-by: James Hilliard --- Changes v1 -> v2: - move python3 deps to unconditional deps list --- package/gstreamer1/gst1-devtools/gst1-devtools.mk | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.mk b/package/gstreamer1/gst1-devtools/gst1-devtools.mk index 66b509ae2c..9089b12188 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.mk +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.mk @@ -12,17 +12,13 @@ GST1_DEVTOOLS_LICENSE_FILES = validate/COPYING GST1_DEVTOOLS_INSTALL_STAGING = YES GST1_DEVTOOLS_DEPENDENCIES = \ + host-python3 \ + python3 \ gstreamer1 \ gst1-plugins-base \ json-glib \ $(if $(BR2_PACKAGE_CAIRO),cairo) -ifeq ($(BR2_PACKAGE_PYTHON3),y) -GST1_DEVTOOLS_DEPENDENCIES += host-python3 python3 -else -GST1_DEVTOOLS_DEPENDENCIES += host-python python -endif - ifeq ($(BR2_PACKAGE_GST1_RTSP_SERVER),y) GST1_DEVTOOLS_DEPENDENCIES += gst1-rtsp-server endif -- 2.25.1 From a.marud at post.pl Thu Feb 10 06:23:39 2022 From: a.marud at post.pl (Arek Marud) Date: Thu, 10 Feb 2022 07:23:39 +0100 Subject: [Buildroot] I have a problem adding new package In-Reply-To: References: <20220130234800.14da56ca@windsurf> Message-ID: Hi Arnout, > Hi Arek, > > Please don't top-post, but reply inline like I do below. > > On 04/02/2022 11:22, Arek Marud wrote: > > Helo Thomas, > > > > Thank you for your answer. > > I had a problem with libonvif compilation. Compiler complaing about > > unsafe include path (details pasted below). > > > > I was able to compile project ONLY when --includedir parameter was set, > > without it - compiler complains about include path. > > > > https://gist.github.com/arekmd/11e9621ae3fc476cf37e80150d15b177 > > > > I pasted build log without LIBONVIF_CONF_OPTS line. > > > > > > myname buildroot$> make libonvif-build > > WARNING: no hash file for v1.1.1.tar.gz > > > > > libonvif 1.1.1 Extracting > [snip] > > make[3]: Entering directory '/home/myname/workbench/resources/development/myproj/bu > > ildroot/buildroot/output/build/libonvif-1.1.1/build' > > /bin/sh ../libtool --tag=CC --mode=compile /home/myname/workbench/resources/dev > > elopment/myproj/buildroot/buildroot/output/host/bin/aarch64-myproj-linux-gnu-gcc - > > DHAVE_CONFIG_H -I. -I.. -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFS > > ET_BITS=64 -I/usr/include -I/usr/include/libxml2 -I../source -D_LARGEFILE_SOURCE > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > > This is what is wrong. > > It is caused by the following lines in build/Makefile.am [1] > > AM_CFLAGS = -I$(INCLUDE) -I$(INCLUDE)/libxml2 -I../source > ... > INCLUDE = @includedir@ > LIB = @libdir@ > > That is just simply wrong. > > The proper fix is to patch the project and > > - Remove the -I stuff from AM_CFLAGS, instead just set AM_CFLAGS = -I../source > - Remove the INCLUDE and LIB assignments > - Do proper discovery of libxml2 in configure.ac > - Add the libxml2 include and lib directories to CFLAGS and LIBS either in > configure.ac or in build/Makefile.am > > > But it seems that this project is pretty dead, so the easier approach is to > just add > > LIBONVIF_MAKE_OPTS = \ > INCLUDE=$(STAGING_DIR)/usr/include \ > LIBS=$(STAGING_DIR)/usr/lib That worked. Library successfully compile and install. > > Regards, > Arnout > > [1] https://github.com/sr99622/libonvif/blob/76961fb9f3ece462724a4a6c09b4bd7cc051b759/build/Makefile.am#L7 > Thank your for your help. -- Best regards, Arek From br015 at umbiko.net Thu Feb 10 06:42:57 2022 From: br015 at umbiko.net (Andreas Ziegler) Date: Thu, 10 Feb 2022 06:42:57 +0000 Subject: [Buildroot] [PATCH 000/107] Drop python 2.7 In-Reply-To: References: Message-ID: <2378b58c9e724d2bb27ec019e165798e@umbiko.net> Hi Yann, Hi Peter, On 2022-02-09 21:34, Yann E. MORIN wrote: > Peter ,All, > > On 2022-02-09 17:50 +0100, Peter Korsgaard spake thusly: >> Python 2.7 is EOL since April 2020 and almost all packages support >> python 3, so drop it before the 2022.02 release. >> >> It is a big series, but the changes are mainly mechanical in nature. >> >> There is still some cleanup to do, E.G. the python2 support in >> pkg-python and the host python-setuptools package - But this is IMHO >> the minimum changes before -rc1. There seem to be some more references to python(2) in packages; this build failure is from package/crda: # make clean && make ... make[1]: *** No rule to make target 'host-python', needed by '/home/data/buildroot.x86_64/build/host-python-pycryptodomex-3.13.0/.stamp_configured'. Stop. make: *** [Makefile:23: _all] Error 2 $ grep python-pycryptodomex */*.mk crda/crda.mk:CRDA_DEPENDENCIES = host-pkgconf host-python-pycryptodomex libnl libgcrypt python3-pycryptodomex/python3-pycryptodomex.mk:# Please keep in sync with package/python-pycryptodomex/python-pycryptodomex.mk python3-pycryptodomex/python3-pycryptodomex.mk:HOST_PYTHON3_PYCRYPTODOMEX_DL_SUBDIR = python-pycryptodomex python-pycryptodomex/python-pycryptodomex.mk:# python-pycryptodomex Kind regards, Andreas >> Peter Korsgaard (107): > ... >> package/python: drop target package > ... >> package/python: drop host package > ... >> docs/manual: drop python2 references > > All 107 patches applied, thanks! > > I'll reply further to two of them, with ultra-minor nits. > > Pfew, 21st century, here we come at last! ;-) > > Regards, > Yann E. MORIN. From thomas.petazzoni at bootlin.com Thu Feb 10 07:22:42 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 10 Feb 2022 07:22:42 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-02-09 Message-ID: <20220210072247.8A7AB60E79@smtp3.osuosl.org> Hello, Autobuild statistics for 2022-02-09 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 47 | 7 | 0 | 54 | 2021.11.x | 17 | 0 | 0 | 17 | master | 57 | 49 | 0 | 106 | Classification of failures by reason for master ----------------------------------------------- bluez5_utils-5.63 | 9 host-grpc-1.43.0 | 5 host-libselinux-3.3 | 5 gerbera-1.9.2 | 4 host-python-docutils-0.15.2 | 3 unknown | 3 mongrel2-1.13.0 | 2 qt5webkit-5.212.0-alpha4 | 2 rygel-0.40.2 | 2 sg3_utils-1.47 | 2 wavemon-0.9.4 | 2 bat-0.19.0 | 1 belle-sip-4.4.8 | 1 cryptsetup-2.4.2 | 1 frr-8.1 | 1 google-breakpad-7515ab13768... | 1 luasyslog-2.2.0 | 1 python-docutils-0.15.2 | 1 sdl2_ttf-2.0.18 | 1 target-finalize | 1 tovid-87c676f4aadb7303d2cd9... | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | bat-0.19.0 | NOK | http://autobuild.buildroot.net/results/8018316713099d5463e02d5887bfab38faa4f9af | xtensa | belle-sip-4.4.8 | NOK | http://autobuild.buildroot.net/results/2cf6fa7f585238132353e85c3cf12d8b03aa53e2 | mips64el | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/8f29828d2e5e086e0c38731a1e57e78a03cdcaf9 | nios2 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/2acd2b4213e9daf1c99a5bff6a7fad03ca80ce57 | riscv64 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/66bf0da754768aa93c7d5ff9479bf88157300be1 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/3eba47dde018c21537d1636e532f719a0743bd67 | or1k | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/19ff00944d01159cbccfaf3d8ad5d3b92163b957 | mips64el | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/dfb6eb9903441b1fdebeef806983b5c07eb74b55 | sparc64 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/17d0cc94c02f77158892cb2084092e12e6c59544 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/13a739a14e04379ffc4d7d232ed9bb03aac7a6f3 | mips64el | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/063bca06fb3c292edc688cfa04bf82ebcc86cead | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/5a20fb24d9f35b89b119b1b7e15b3a76db0da087 | xtensa | frr-8.1 | NOK | http://autobuild.buildroot.net/results/1fee99de78187d70cdc755e8bcfc2a98df8d751d | powerpc | gerbera-1.9.2 | NOK | http://autobuild.buildroot.net/results/2195632ac503ef69792dfbe497ca5da8749a28c5 | arm | gerbera-1.9.2 | NOK | http://autobuild.buildroot.net/results/76527c72fb9f88a726afb6af7437d799e8b852c1 | arc | gerbera-1.9.2 | NOK | http://autobuild.buildroot.net/results/13774bf24f4dc22dc860d921a54829398f7b8a40 | s390x | gerbera-1.9.2 | NOK | http://autobuild.buildroot.net/results/b9eb00edc7fa3e38df4f05219f7fa40be237489b | mipsel | google-breakpad-7515ab13768... | NOK | http://autobuild.buildroot.net/results/4bc37008fe12a21007f543a3c4de39a2b709b433 | arm | host-grpc-1.43.0 | NOK | http://autobuild.buildroot.net/results/a4f15d2acf57ab352a89916f2424283d63b8dfc3 | arm | host-grpc-1.43.0 | NOK | http://autobuild.buildroot.net/results/d5430c68b6cea214f8f277a096016b0b2427d803 | riscv64 | host-grpc-1.43.0 | NOK | http://autobuild.buildroot.net/results/7171f69f51f85a3e3f92bec65dd6bbbf7806ec11 | mips64el | host-grpc-1.43.0 | NOK | http://autobuild.buildroot.net/results/574bfde8739b9ba3daa928b82556df6818746316 | mips64el | host-grpc-1.43.0 | NOK | http://autobuild.buildroot.net/results/50387c4fb591a12d818fdbf361fe78a17959536c | mipsel | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/b7cdc5da21cde72de06177d8fb03a892fc22661e | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/56821dbcef76c80a7c523fe82586d61fec85c4bb | i586 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/bda8c8084fa268058ecf198cbd5e30513bd10461 | m68k | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/d84ef6090b9c0fbf80a6450367b1873e6e65f583 | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/b4b7d70f285f0264c23430b8f413f9e7bcf782d3 | arm | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/48ab2eedf9bf80293e152a095a6d08b7e284f914 | aarch64 | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/59ad72cecefee98d62b2ca7686d4f905954d3b32 | or1k | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/b65a9974017724a2cb4a0550513398020a72df53 | powerpc64 | luasyslog-2.2.0 | NOK | http://autobuild.buildroot.net/results/df2aabcf2ae07cad66b869ec4ac76702d2c32dc5 | arm | mongrel2-1.13.0 | NOK | http://autobuild.buildroot.net/results/dcb2c5cbdd6a703eb9cb3fb44c814bfcb86dbbaa | arm | mongrel2-1.13.0 | NOK | http://autobuild.buildroot.net/results/b9dd4b65444a2cff4cb68844d97bdb40f1681b9d | mipsel | python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/f071f406feef00732f69d998453a3d4472eb82ef | arm | qt5webkit-5.212.0-alpha4 | NOK | http://autobuild.buildroot.net/results/ea44b4ca9d851f21f75afbda9f4bc97557cc8a72 | arm | qt5webkit-5.212.0-alpha4 | NOK | http://autobuild.buildroot.net/results/5d1ecf9585025f3fa7cb0d06bf0a7e0600586dc7 | arc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/6696bb7570fd988055088daf0fbff00e1945724e | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/c4897e6086036963b3b6ef4cc4d027a6b17d9656 | arm | sdl2_ttf-2.0.18 | NOK | http://autobuild.buildroot.net/results/3fecb96a8063b1a28703682e9373714c1c9cfa24 | m68k | sg3_utils-1.47 | NOK | http://autobuild.buildroot.net/results/db2eef5351bf6f50664a5d9d306c9207257e92cd | m68k | sg3_utils-1.47 | NOK | http://autobuild.buildroot.net/results/34c3c48e2574d1684b0621e7fa59ae9a2249c139 | powerpc | target-finalize | NOK | http://autobuild.buildroot.net/results/5454298ea61c4d59e4936cba084b8159d8e3c91e | arc | tovid-87c676f4aadb7303d2cd9... | NOK | http://autobuild.buildroot.net/results/e01b393b78c4c81e8dc17fabd61cbee7e6000fba | powerpc64 | unknown | NOK | http://autobuild.buildroot.net/results/1eb464ddafc85cc24ecf97f646dc6e277e58e280 | aarch64 | unknown | NOK | http://autobuild.buildroot.net/results/cf3ddf408b26fa8f86a545588b24882b4a7ac257 | sh4 | unknown | NOK | http://autobuild.buildroot.net/results/31dfc54636c76f2b5a13373e9d420f7b01d78cec | mips64el | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/edec191fc961fff3b5669c464395474cff67af96 | riscv64 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/2341cb5c97085d4fe5c065477e9212330d604c4c | Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 2 openal-1.20.1 | 2 erlang-jiffy-1.0.6 | 1 monkey-f54856ce250c4e257354... | 1 unknown | 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/e66956c1179a7f5a9868511c8459429d9091faea | m68k | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/17f56c0d4ba7c66003d31886fe2aab17e1a2123f | arm | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/2ccb85a89c9adf912704f573858425612270abc4 | aarch64 | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/9f9f8d470bff55c0a223b9471df95b6eedeb87be | or1k | openal-1.20.1 | NOK | http://autobuild.buildroot.net/results/7d532a48093aef35eee2293e8049796eb8500823 | or1k | openal-1.20.1 | NOK | http://autobuild.buildroot.net/results/7239e5ebbdf2754fdb955de61a73b6cceef03f4f | i586 | unknown | NOK | http://autobuild.buildroot.net/results/5155f6513a60c43843b9c2101a1b2c33de06f41c | Gitlab CI results for 2022-02-09 ================================ -- http://autobuild.buildroot.net From peter at korsgaard.com Thu Feb 10 07:24:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 08:24:21 +0100 Subject: [Buildroot] [PATCH 000/107] Drop python 2.7 In-Reply-To: <2378b58c9e724d2bb27ec019e165798e@umbiko.net> (Andreas Ziegler's message of "Thu, 10 Feb 2022 06:42:57 +0000") References: <2378b58c9e724d2bb27ec019e165798e@umbiko.net> Message-ID: <87zgmzw5ei.fsf@dell.be.48ers.dk> >>>>> "Andreas" == Andreas Ziegler writes: > Hi Yann, > Hi Peter, > On 2022-02-09 21:34, Yann E. MORIN wrote: >> Peter ,All, >> >> On 2022-02-09 17:50 +0100, Peter Korsgaard spake thusly: >>> Python 2.7 is EOL since April 2020 and almost all packages support >>> python 3, so drop it before the 2022.02 release. >>> >>> It is a big series, but the changes are mainly mechanical in nature. >>> >>> There is still some cleanup to do, E.G. the python2 support in >>> pkg-python and the host python-setuptools package - But this is IMHO >>> the minimum changes before -rc1. > There seem to be some more references to python(2) in packages; this > build failure is from package/crda: > # make clean && make > ... > make[1]: *** No rule to make target 'host-python', needed by > '/home/data/buildroot.x86_64/build/host-python-pycryptodomex-3.13.0/.stamp_configured'. Stop. > make: *** [Makefile:23: _all] Error 2 Ahh yes, that is because we end up in package/pkg-python.mk with: ifeq ($$($(2)_NEEDS_HOST_PYTHON),) $(2)_DEPENDENCIES += $$(if $$(BR2_PACKAGE_PYTHON3),host-python3,host-python) And you (presumably) don't have python3 enabled. I'll send a fix. -- Bye, Peter Korsgaard From br015 at umbiko.net Thu Feb 10 07:56:36 2022 From: br015 at umbiko.net (Andreas Ziegler) Date: Thu, 10 Feb 2022 07:56:36 +0000 Subject: [Buildroot] [PATCH 000/107] Drop python 2.7 In-Reply-To: <87zgmzw5ei.fsf@dell.be.48ers.dk> References: <2378b58c9e724d2bb27ec019e165798e@umbiko.net> <87zgmzw5ei.fsf@dell.be.48ers.dk> Message-ID: <0ae21fe17b6d8e56be3d19feb0480e3c@umbiko.net> Hi Peter, On 2022-02-10 07:24, Peter Korsgaard wrote: >>>>>> "Andreas" == Andreas Ziegler writes: > > > Hi Yann, > > Hi Peter, > > > On 2022-02-09 21:34, Yann E. MORIN wrote: > >> Peter ,All, > >> > >> On 2022-02-09 17:50 +0100, Peter Korsgaard spake thusly: > >>> Python 2.7 is EOL since April 2020 and almost all packages support > >>> python 3, so drop it before the 2022.02 release. > >>> > >>> It is a big series, but the changes are mainly mechanical in > nature. > >>> > >>> There is still some cleanup to do, E.G. the python2 support in > >>> pkg-python and the host python-setuptools package - But this is > IMHO > >>> the minimum changes before -rc1. > > > There seem to be some more references to python(2) in packages; this > > build failure is from package/crda: > > > # make clean && make > > ... > > make[1]: *** No rule to make target 'host-python', needed by > > > '/home/data/buildroot.x86_64/build/host-python-pycryptodomex-3.13.0/.stamp_configured'. > Stop. > > make: *** [Makefile:23: _all] Error 2 > > Ahh yes, that is because we end up in package/pkg-python.mk with: > > ifeq ($$($(2)_NEEDS_HOST_PYTHON),) > $(2)_DEPENDENCIES += $$(if > $$(BR2_PACKAGE_PYTHON3),host-python3,host-python) Ah, this may be the reason I have two sets of host-python packages in my build tree :-D > > And you (presumably) don't have python3 enabled. I'll send a fix. Correct, I do not use Python on the target, but (at lest) one package insists on having host-python. I'm currently testing by changing host-python to host-python3 in package/crda, and found another issue; this probably also needs a change: [python3.mk] # Some packages may have build scripts requiring python3, whatever is the # python version chosen for the target. # Only install the python symlink in the host tree if python3 is enabled # for the target. ifeq ($(BR2_PACKAGE_PYTHON3),y) define HOST_PYTHON3_INSTALL_SYMLINK ln -fs python3 $(HOST_DIR)/bin/python ln -fs python3-config $(HOST_DIR)/bin/python-config endef Is there any need of keeping separate python3 packages, now that python == python3? Kind regards, Andreas > -- > Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Thu Feb 10 07:58:21 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 10 Feb 2022 08:58:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/omniorb: switch to host-python3 Message-ID: <20220210075821.493485-1-fontaine.fabrice@gmail.com> Switch to host-python3 which is supported since version 4.2.1 and https://sourceforge.net/p/omniorb/svn/HEAD/tree/tags/4_2_1/omniORBpy/update.log to avoid the following build failure since removal of host-python in commit 2743ce00ca61fde1537b64a165a69d497052be58: make: *** No rule to make target 'host-python', needed by '/home/buildroot/autobuild/instance-1/output-1/build/host-omniorb-4.3.0/.stamp_configured'. Stop. Fixes: - http://autobuild.buildroot.org/results/d415c2501b27cacf2356f0f6924ee7706d7a4070 Signed-off-by: Fabrice Fontaine --- package/omniorb/omniorb.mk | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/package/omniorb/omniorb.mk b/package/omniorb/omniorb.mk index a1943968f1..b44ec53fd5 100644 --- a/package/omniorb/omniorb.mk +++ b/package/omniorb/omniorb.mk @@ -11,11 +11,7 @@ OMNIORB_INSTALL_STAGING = YES OMNIORB_LICENSE = GPL2+, LGPL-2.1+ OMNIORB_LICENSE_FILES = COPYING COPYING.LIB OMNIORB_DEPENDENCIES = host-omniorb -HOST_OMNIORB_DEPENDENCIES = host-python - -# omniorb is not python3 friendly, so force the python interpreter -OMNIORB_CONF_OPTS = ac_cv_path_PYTHON=$(HOST_DIR)/bin/python2 -HOST_OMNIORB_CONF_OPTS = ac_cv_path_PYTHON=$(HOST_DIR)/bin/python2 +HOST_OMNIORB_DEPENDENCIES = host-python3 # Defaulting long double support to a safe option for the # mix of embedded targets, this could later be automated -- 2.34.1 From neal.frager at xilinx.com Thu Feb 10 08:19:31 2022 From: neal.frager at xilinx.com (Neal Frager) Date: Thu, 10 Feb 2022 01:19:31 -0700 Subject: [Buildroot] [PATCH v4 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 Message-ID: <20220210081932.3114763-1-neal.frager@xilinx.com> This patch: - bumps ATF to Xilinx v2.6: mainline v2.6 requires patch to build - bumps U-Boot to Xilinx 2022.01: important drivers not in mainline - bumps Linux to Xilinx 5.15: important drivers not in mainline - deletes board/zynqmp/patches directory: patches already in mainline - modifies board/zynqmp/genimage.cfg: U-Boot 2022.01 uses u-boot.itb format - adds extlinux.conf to vfat bootfs - modifies U-Boot to unified xilinx_zynqmp_virt_defconfig (supports all boards) - adds support for SPL pm_cfg_obj.c loading to PMU firmware - enables support for host machines without OpenSSL required by U-Boot and Linux --- V1->V2: * fixed general build issues * added extlinux.conf for run-time boot issue V2->V3: * enabled support for host machines without OpenSSL required by U-Boot and Linux * moved readme.txt update to zynqmp_zcu102_defconfig patch 2/2 V3->V4: * cleaned up commit log messages * added version history --- Signed-off-by: Neal Frager Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti [Giulio: only build tested] Signed-off-by: Neal Frager --- board/zynqmp/extlinux.conf | 5 + board/zynqmp/genimage.cfg | 6 +- ...-fix-Remove-GGC-ignore-Warray-bounds.patch | 68 -- ...64-zynqmp-zcu106-fix-SPL-MMC-booting.patch | 52 -- ...2-arm64-zynqmp-Enable-booting-to-ATF.patch | 114 ---- ...ept-an-absolute-path-for-PMUFW_INIT_.patch | 68 -- ...ynqmp-pass-the-PS-init-file-as-a-kco.patch | 175 ----- board/zynqmp/pm_cfg_obj.c | 614 ++++++++++++++++++ board/zynqmp/post-build.sh | 8 + board/zynqmp/post-image.sh | 4 +- configs/zynqmp_zcu106_defconfig | 23 +- 11 files changed, 648 insertions(+), 489 deletions(-) create mode 100644 board/zynqmp/extlinux.conf delete mode 100644 board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch delete mode 100644 board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch delete mode 100644 board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch delete mode 100644 board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch delete mode 100644 board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch create mode 100644 board/zynqmp/pm_cfg_obj.c create mode 100755 board/zynqmp/post-build.sh diff --git a/board/zynqmp/extlinux.conf b/board/zynqmp/extlinux.conf new file mode 100644 index 0000000000..ae3ec8614a --- /dev/null +++ b/board/zynqmp/extlinux.conf @@ -0,0 +1,5 @@ +label linux + kernel /Image + devicetree /system.dtb + append console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait + diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg index ed202f4550..20d8352c08 100644 --- a/board/zynqmp/genimage.cfg +++ b/board/zynqmp/genimage.cfg @@ -2,11 +2,13 @@ image boot.vfat { vfat { files = { "boot.bin", - "u-boot.bin", - "atf-uboot.ub", + "u-boot.itb", "system.dtb", "Image" } + file extlinux/extlinux.conf { + image = extlinux.conf + } } size = 32M diff --git a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch b/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch deleted file mode 100644 index 0c1a9ba2a4..0000000000 --- a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch +++ /dev/null @@ -1,68 +0,0 @@ -From da003e6ada7d0217fe99dc7c649a731f8ebd3c34 Mon Sep 17 00:00:00 2001 -From: Deepika Bhavnani -Date: Thu, 15 Aug 2019 00:56:46 +0300 -Subject: [PATCH] Coverity fix: Remove GGC ignore -Warray-bounds - -GCC diagnostics were added to ignore array boundaries, instead -of ignoring GCC warning current code will check for array boundaries -and perform and array update only for valid elements. - -Resolves: `CID 246574` `CID 246710` `CID 246651` - -Signed-off-by: Deepika Bhavnani -Change-Id: I7530ecf7a1707351c6ee87e90cc3d33574088f57 - -Backported from: 41af05154abe136938bcfb5f26c969933784bbef -[Adapted to apply on 1.5] - ---- - lib/psci/psci_common.c | 20 ++++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) - -diff --git a/lib/psci/psci_common.c b/lib/psci/psci_common.c -index 2220a745cd6e..6282d992a2f0 100644 ---- a/lib/psci/psci_common.c -+++ b/lib/psci/psci_common.c -@@ -188,21 +188,17 @@ static unsigned int get_power_on_target_pwrlvl(void) - /****************************************************************************** - * Helper function to update the requested local power state array. This array - * does not store the requested state for the CPU power level. Hence an -- * assertion is added to prevent us from accessing the wrong index. -+ * assertion is added to prevent us from accessing the CPU power level. - *****************************************************************************/ - static void psci_set_req_local_pwr_state(unsigned int pwrlvl, - unsigned int cpu_idx, - plat_local_state_t req_pwr_state) - { -- /* -- * This should never happen, we have this here to avoid -- * "array subscript is above array bounds" errors in GCC. -- */ - assert(pwrlvl > PSCI_CPU_PWR_LVL); --#pragma GCC diagnostic push --#pragma GCC diagnostic ignored "-Warray-bounds" -- psci_req_local_pwr_states[pwrlvl - 1][cpu_idx] = req_pwr_state; --#pragma GCC diagnostic pop -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && -+ (cpu_idx < PLATFORM_CORE_COUNT)) { -+ psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx] = req_pwr_state; -+ } - } - - /****************************************************************************** -@@ -228,7 +224,11 @@ static plat_local_state_t *psci_get_req_local_pwr_states(unsigned int pwrlvl, - { - assert(pwrlvl > PSCI_CPU_PWR_LVL); - -- return &psci_req_local_pwr_states[pwrlvl - 1][cpu_idx]; -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && -+ (cpu_idx < PLATFORM_CORE_COUNT)) { -+ return &psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx]; -+ } else -+ return NULL; - } - - /* --- -2.34.0 - diff --git a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch b/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch deleted file mode 100644 index 4d85e1bb12..0000000000 --- a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch +++ /dev/null @@ -1,52 +0,0 @@ -From e5d72ed8339eb05285448aad3c89d21e4d18fd29 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Mon, 26 Feb 2018 09:40:34 +0100 -Subject: [PATCH] arm64: zynqmp: zcu106: fix SPL MMC booting - -The U-Boot SPL generated with the current zcu106 defconfig cannot boot -from MMC: - - [...] - U-Boot SPL 2018.01 (Feb 21 2018 - 17:47:14) - EL Level: EL3 - Trying to boot from MMC1 - sdhci_transfer_data: Error detected in status(0x408020)! - spl_load_image_fat_os: error reading image u-boot.bin, err - -2 - spl_load_image_fat: error reading image u-boot.img, err - -6 - SPL: failed to boot from all boot devices - ### ERROR ### Please RESET the board ### - -Fix by lowering the rpll value. The new value for the RPLL_CTRL -register comes from the current psu_init_gpl.c from the HDF file at -https://github.com/xilinx/hdf-examples/tree/01ad8ea5fd1989abf4ea5a072d019a16cb2bc546/zcu106-zynqmp -(generated by Vivado v2017.4). - -RPLL and sdio1_ref clocks before and after this change: - - - Old values: RPLL 1.36 GHz, sdio1_ref 272 MHz - - New values: RPLL 1.16 GHz, sdio1_ref 233 MHz - -Signed-off-by: Luca Ceresoli -Cc: Michal Simek -Upstream-status: accepted upstream in a different form ---- - - board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -index 4d18abe000ca..e6fa477e53e7 100644 ---- a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -+++ b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -@@ -10,7 +10,7 @@ - static unsigned long psu_pll_init_data(void) - { - psu_mask_write(0xFF5E0034, 0xFE7FEDEFU, 0x7E4E2C62U); -- psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00013C00U); -+ psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00014600U); - psu_mask_write(0xFF5E0030, 0x00000008U, 0x00000008U); - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000001U); - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000000U); --- -2.7.4 - diff --git a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch b/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch deleted file mode 100644 index 487fff6812..0000000000 --- a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 5e3cac50cc981e01d9072241035a8d4162560c71 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Mon, 12 Mar 2018 17:18:38 +0100 -Subject: [PATCH] arm64: zynqmp: Enable booting to ATF - -U-Boot is now able to boot to ARM Trusted Firmware (ATF). The boot -flow is SPL(EL3) loads ATF and full u-boot and jump to ATF(EL3) which -pass control to full u-boot(EL2). This has been tested on zcu106, so -enable it in this defconfig. - -To generate an image that triggers this booting flow, you need to pass -'-O arm-trusted-firmware' to mkimage. - -Signed-off-by: Luca Ceresoli -Signed-off-by: Michal Simek -Backported from upstream: http://git.denx.de/?p=u-boot.git;a=commit;h=5e3cac50cc981e01d9072241035a8d4162560c71 ---- - - configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 + - configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 + - configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 + - configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 + - configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 1 + - configs/xilinx_zynqmp_zcu102_revA_defconfig | 1 + - configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 + - 7 files changed, 7 insertions(+) - -diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig -index c5bfa2b12638..488c72258b0e 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig -index f86dce403a42..5d501eec0edd 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig -@@ -20,6 +20,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig -index 6e947cf56827..6f7eaebd7676 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig -@@ -16,6 +16,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_CMD_MEMTEST=y - CONFIG_SYS_ALT_MEMTEST=y -diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig -index 1c934858c61c..7a3806cba4b5 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig -@@ -17,6 +17,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_CMD_MEMTEST=y - CONFIG_SYS_ALT_MEMTEST=y -diff --git a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig -index e13c7c56f310..e4408f182ca0 100644 ---- a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig -+++ b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig b/configs/xilinx_zynqmp_zcu102_revA_defconfig -index 5b2cd495ee85..b52f6789fd4b 100644 ---- a/configs/xilinx_zynqmp_zcu102_revA_defconfig -+++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig -index e6530fbfe7ff..80592554f682 100644 ---- a/configs/xilinx_zynqmp_zcu102_revB_defconfig -+++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y --- -2.7.4 - diff --git a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch b/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch deleted file mode 100644 index 95ab7b3b75..0000000000 --- a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch +++ /dev/null @@ -1,68 +0,0 @@ -From c7df098a71e05dc81cee818747759e8060b59626 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Mon, 4 Jun 2018 12:21:01 +0200 -Subject: [PATCH] arm64: zynqmp: accept an absolute path for PMUFW_INIT_FILE - -The value of PMUFW_INIT_FILE is prefixed with "$(srctree)/", thus -forcing it to be a relative path inside the U-Boot source tree. Since -the PMUFW is a binary file generated outside of U-Boot, the PMUFW -binary must be copied inside the U-Boot source tree before the -build. - -This generates a few problems: - - * if the source tree is shared among different out-of-tree builds, - they will pollute (and potentially corrupt) each other - * the source tree cannot be read-only - * any buildsystem must add a command to copy the PMUFW binary - * putting an externally-generated binary in the source tree is ugly - as hell - -Avoid these problems by accepting an absolute path for -PMUFW_INIT_FILE. This would be as simple as removing the "$(srctree)/" -prefix, but in order to keep backward compatibility we rather use the -shell and readlink to get the absolute path even when starting from a -relative path. - -Since 'readlink -f' produces an empty string if the file does not -exist, we also add a check to ensure the file configured in -PMUFW_INIT_FILE exists. Otherwise the build would exit successfully, -but produce a boot.bin without PMUFW as if PMUFW_INIT_FILE were empty. - -Tested in the 12 possible combinations of: - - PMUFW_INIT_FILE empty, relative, absolute, non-existing - - building in-tree, in subdir, in other directory - -Signed-off-by: Luca Ceresoli -Cc: Michal Simek -Cc: Simon Glass -Cc: Emmanuel Vadot -Signed-off-by: Michal Simek -Backported from upstream: https://git.denx.de/?p=u-boot.git;a=commit;h=c7df098a71e05dc81cee818747759e8060b59626 ---- - scripts/Makefile.spl | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl -index ef018b5b4056..252f13826d4c 100644 ---- a/scripts/Makefile.spl -+++ b/scripts/Makefile.spl -@@ -167,8 +167,14 @@ ifdef CONFIG_ARCH_ZYNQ - MKIMAGEFLAGS_boot.bin = -T zynqimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) - endif - ifdef CONFIG_ARCH_ZYNQMP -+ifneq ($(CONFIG_PMUFW_INIT_FILE),"") -+spl/boot.bin: zynqmp-check-pmufw -+zynqmp-check-pmufw: FORCE -+ ( cd $(srctree) && test -r $(CONFIG_PMUFW_INIT_FILE) ) \ -+ || ( echo "Cannot read $(CONFIG_PMUFW_INIT_FILE)" && false ) -+endif - MKIMAGEFLAGS_boot.bin = -T zynqmpimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) \ -- -n $(srctree)/$(CONFIG_PMUFW_INIT_FILE) -+ -n "$(shell cd $(srctree); readlink -f $(CONFIG_PMUFW_INIT_FILE))" - endif - - spl/boot.bin: $(obj)/u-boot-spl.bin FORCE --- -2.7.4 - diff --git a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch b/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch deleted file mode 100644 index b32e162780..0000000000 --- a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch +++ /dev/null @@ -1,175 +0,0 @@ -From 4c9d54ab5a41d65000c8d249b6fb1b76056f1812 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Wed, 20 Jun 2018 12:11:50 +0200 -Subject: [PATCH] arm/arm64: zynq/zynqmp: pass the PS init file as a kconfig - variable - -U-Boot needs to link ps7_init_gpl.c on Zynq or psu_init_gpl.c on -ZynqMP (PS init for short). The current logic to locate this file for -both platforms is: - - 1. if a board-specific file exists in - board/xilinx/zynq[mp]/$(CONFIG_DEFAULT_DEVICE_TREE)/ps?_init_gpl.c - then use it - 2. otherwise use board/xilinx/zynq/ps?_init_gpl.c - -In the latter case the file does not exist in the U-Boot sources and -must be copied in the source tree from the outside before starting the -build. This is typical when it is generated from Xilinx tools while -developing a custom hardware. However making sure that a -board-specific file is _not_ found (and used) requires some trickery -such as removing or overwriting all PS init files (e.g.: the current -meta-xilinx yocto layer [0]). - -This generates a few problems: - - * if the source tree is shared among different out-of-tree builds, - they will pollute (and potentially corrupt) each other - * the source tree cannot be read-only - * any buildsystem must add a command to copy the PS init file binary - * overwriting or deleting files in the source tree is ugly as hell - -Simplify usage by allowing to pass the path to the desired PS init -file in kconfig variable XILINX_PS_INIT_FILE. It can be an absolute -path or relative to $(srctree). If the variable is set, the -user-specified file will always be used without being copied -around. If the the variable is left empty, for backward compatibility -fall back to the old behaviour. - -Since the issue is the same for Zynq and ZynqMP, add one kconfig -variable in a common place and use it for both. - -Also use the new kconfig help text to document all the ways to give -U-Boot the PS init file. - -Build-tested with all combinations of: - - platform: zynq or zynqmp - - PS init file: from XILINX_PS_INIT_FILE (absolute, relative path, - non-existing), in-tree board-specific, in board/xilinx/zynq[mp]/ - - building in-tree, in subdir, in other directory - -[0] https://github.com/Xilinx/meta-xilinx/blob/b2f74cc7fe5c4881589d5e440a17cb51fc66a7ab/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init.inc#L9 - -Signed-off-by: Luca Ceresoli -Cc: Albert Aribaud -Cc: Michal Simek -Cc: Nathan Rossi -Backported from upstream: https://git.denx.de/?p=u-boot.git;a=commit;h=6da4f67ad09cd8b311d77b2b04e557b7ef65b56c ---- - arch/arm/Kconfig | 1 + - board/xilinx/Kconfig | 41 +++++++++++++++++++++++++++++++++++++++++ - board/xilinx/zynq/Makefile | 10 +++++++++- - board/xilinx/zynqmp/Makefile | 10 +++++++++- - 4 files changed, 60 insertions(+), 2 deletions(-) - create mode 100644 board/xilinx/Kconfig - -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 22234cde2ab6..e04979d0ef7e 100644 ---- a/arch/arm/Kconfig -+++ b/arch/arm/Kconfig -@@ -1293,4 +1293,5 @@ source "board/technologic/ts4600/Kconfig" - source "board/vscom/baltos/Kconfig" - source "board/woodburn/Kconfig" - source "board/work-microwave/work_92105/Kconfig" -+source "board/xilinx/Kconfig" - source "board/zipitz2/Kconfig" - - source "arch/arm/Kconfig.debug" -diff --git a/board/xilinx/Kconfig b/board/xilinx/Kconfig -new file mode 100644 -index 000000000000..aa3fa061edef ---- /dev/null -+++ b/board/xilinx/Kconfig -@@ -0,0 +1,41 @@ -+# Copyright (c) 2018, Luca Ceresoli -+# -+# SPDX-License-Identifier: GPL-2.0 -+ -+if ARCH_ZYNQ || ARCH_ZYNQMP -+ -+config XILINX_PS_INIT_FILE -+ string "Zynq/ZynqMP PS init file(s) location" -+ help -+ On Zynq and ZynqMP U-Boot SPL (or U-Boot proper if -+ ZYNQMP_PSU_INIT_ENABLED is set) is responsible for some -+ basic initializations, such as enabling peripherals and -+ configuring pinmuxes. The PS init file (called -+ psu_init_gpl.c on ZynqMP, ps7_init_gpl.c for Zynq-7000) -+ contains the code for such initializations. -+ -+ U-Boot contains PS init files for some boards, but each of -+ them describes only one specific configuration. Users of a -+ different board, or needing a different configuration, can -+ generate custom files using the Xilinx development tools. -+ -+ There are three ways to give a PS init file to U-Boot: -+ -+ 1. Set this variable to the path, either relative to the -+ source tree or absolute, where the psu_init_gpl.c or -+ ps7_init_gpl.c file is located. U-Boot will build this -+ file. -+ -+ 2. If you leave an empty string here, U-Boot will use -+ board/xilinx/zynq/$(CONFIG_DEFAULT_DEVICE_TREE)/ps7_init_gpl.c -+ for Zynq-7000, or -+ board/xilinx/zynqmp/$(CONFIG_DEFAULT_DEVICE_TREE)/psu_init_gpl.c -+ for ZynqMP. -+ -+ 3. If the above file does not exist, U-Boot will use -+ board/xilinx/zynq/ps7_init_gpl.c for Zynq-7000, or -+ board/xilinx/zynqmp/psu_init_gpl.c for ZynqMP. This file -+ is not provided by U-Boot, you have to copy it there -+ before the build. -+ -+endif -diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile -index 5a76a26720cd..03ad5f0532ee 100644 ---- a/board/xilinx/zynq/Makefile -+++ b/board/xilinx/zynq/Makefile -@@ -5,10 +5,18 @@ - - obj-y := board.o - --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE)) -+init-objs := ps_init_gpl.o -+spl/board/xilinx/zynq/ps_init_gpl.o board/xilinx/zynq/ps_init_gpl.o: $(PS_INIT_FILE) -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ -+endif - -+ifeq ($(init-objs),) -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/ps7_init_gpl.c),\ - $(hw-platform-y)/ps7_init_gpl.o) -+endif - - ifeq ($(init-objs),) - ifneq ($(wildcard $(srctree)/$(src)/ps7_init_gpl.c),) -diff --git a/board/xilinx/zynqmp/Makefile b/board/xilinx/zynqmp/Makefile -index 05ccd25dcef3..960b81fc5853 100644 ---- a/board/xilinx/zynqmp/Makefile -+++ b/board/xilinx/zynqmp/Makefile -@@ -5,10 +5,18 @@ - - obj-y := zynqmp.o - --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE)) -+init-objs := ps_init_gpl.o -+spl/board/xilinx/zynqmp/ps_init_gpl.o board/xilinx/zynqmp/ps_init_gpl.o: $(PS_INIT_FILE) -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ -+endif - -+ifeq ($(init-objs),) -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/psu_init_gpl.c),\ - $(hw-platform-y)/psu_init_gpl.o) -+endif - - ifeq ($(init-objs),) - ifneq ($(wildcard $(srctree)/$(src)/psu_init_gpl.c),) --- -2.7.4 - diff --git a/board/zynqmp/pm_cfg_obj.c b/board/zynqmp/pm_cfg_obj.c new file mode 100644 index 0000000000..7566b3236a --- /dev/null +++ b/board/zynqmp/pm_cfg_obj.c @@ -0,0 +1,614 @@ +/****************************************************************************** +* Copyright (c) 2017 - 2020 Xilinx, Inc. All rights reserved. +* SPDX-License-Identifier: MIT +******************************************************************************/ + + +#include "xil_types.h" +#include "pm_defs.h" + +#define PM_CONFIG_MASTER_SECTION_ID 0x101U +#define PM_CONFIG_SLAVE_SECTION_ID 0x102U +#define PM_CONFIG_PREALLOC_SECTION_ID 0x103U +#define PM_CONFIG_POWER_SECTION_ID 0x104U +#define PM_CONFIG_RESET_SECTION_ID 0x105U +#define PM_CONFIG_SHUTDOWN_SECTION_ID 0x106U +#define PM_CONFIG_SET_CONFIG_SECTION_ID 0x107U +#define PM_CONFIG_GPO_SECTION_ID 0x108U + +#define PM_SLAVE_FLAG_IS_SHAREABLE 0x1U +#define PM_MASTER_USING_SLAVE_MASK 0x2U + +#define PM_CONFIG_GPO1_MIO_PIN_34_MAP (1U << 10U) +#define PM_CONFIG_GPO1_MIO_PIN_35_MAP (1U << 11U) +#define PM_CONFIG_GPO1_MIO_PIN_36_MAP (1U << 12U) +#define PM_CONFIG_GPO1_MIO_PIN_37_MAP (1U << 13U) + +#define PM_CONFIG_GPO1_BIT_2_MASK (1U << 2U) +#define PM_CONFIG_GPO1_BIT_3_MASK (1U << 3U) +#define PM_CONFIG_GPO1_BIT_4_MASK (1U << 4U) +#define PM_CONFIG_GPO1_BIT_5_MASK (1U << 5U) + +#define SUSPEND_TIMEOUT 0xFFFFFFFFU + + +#define PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK 0x00000001 +#define PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK 0x00000100 +#define PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK 0x00000200 + + + +#if defined (__ICCARM__) +#pragma language=save +#pragma language=extended +#endif +#if defined (__GNUC__) + const u32 XPm_ConfigObject[] __attribute__((used, section(".sys_cfg_data"))) = +#elif defined (__ICCARM__) +#pragma location = ".sys_cfg_data" +__root const u32 XPm_ConfigObject[] = +#endif +{ + /**********************************************************************/ + /* HEADER */ + 1, /* Number of remaining words in the header */ + 8, /* Number of sections included in config object */ + /**********************************************************************/ + /* MASTER SECTION */ + PM_CONFIG_MASTER_SECTION_ID, /* Master SectionID */ + 3U, /* No. of Masters*/ + + NODE_APU, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_0, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_1, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Wake permissions */ + + + /**********************************************************************/ + /* SLAVE SECTION */ + + + PM_CONFIG_SLAVE_SECTION_ID, /* Section ID */ + 49, /* Number of slaves */ + + NODE_OCM_BANK_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TCM_0_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_0_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_1_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TCM_1_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_L2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU_PP_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU_PP_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_USB_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_USB_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_TTC_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SATA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_ETH_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_UART_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_UART_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SPI_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_SPI_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_I2C_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_I2C_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SD_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_SD_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_DP, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GDMA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_ADMA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_NAND, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_QSPI, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPIO, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_CAN_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_CAN_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_EXTERN, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_DDR, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_IPI_APU, + 0U, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_0, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_1, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_PCIE, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_PCAP, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_RTC, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_VCU, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_PL, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + + /**********************************************************************/ + /* PREALLOC SECTION */ + + PM_CONFIG_PREALLOC_SECTION_ID, /* Preallaoc SectionID */ + 3U, /* No. of Masters*/ + +/* Prealloc for psu_cortexa53_0 */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, + 12, + NODE_DDR, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_L2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_3, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_SD_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_QSPI, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_PL, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_APU, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_0 */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + 14, + NODE_TCM_0_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_0_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_DDR, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_3, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_SD_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_QSPI, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_PL, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_ADMA, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_1 */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + 3, + NODE_TCM_1_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_1_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /**********************************************************************/ + /* POWER SECTION */ + + PM_CONFIG_POWER_SECTION_ID, /* Power Section ID */ + 4U, /* Number of power nodes */ + + NODE_APU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_RPU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_FPD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_PLD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + + /**********************************************************************/ + /* RESET SECTION */ + + PM_CONFIG_RESET_SECTION_ID, /* Reset Section ID */ + 120U, /* Number of resets */ + + XILPM_RESET_PCIE_CFG, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_BRIDGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_CTRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRF, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GDMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SATA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APU_L2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DDR, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SOFT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_QSPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_NAND, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ADMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOU_CC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TIMESTAMP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R50, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R51, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_AMBA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_OCM, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_PGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RTC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SYSMON, 0, + XILPM_RESET_AFI_FM6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_LPD_SWDT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_FPD, PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + XILPM_RESET_RPU_DBG1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_DBG0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_VPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_7, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_8, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_9, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_10, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_11, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_12, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_13, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_14, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_15, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_16, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_17, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_18, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_19, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_20, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_21, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_22, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_23, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_24, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_25, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_26, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_27, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_28, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_29, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_30, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_31, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_LS, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PS_ONLY, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_92, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_93, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_94, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_95, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + + /**********************************************************************/ + /* SET CONFIG SECTION */ + PM_CONFIG_SET_CONFIG_SECTION_ID, /* Section ID */ + 0, /* Permissions to set config */ + /**********************************************************************/ + /* SHUTDOWN SECTION */ + PM_CONFIG_SHUTDOWN_SECTION_ID, /* Section ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* System Shutdown/Restart Permission */ + + /**********************************************************************/ + /* GPO SECTION */ + PM_CONFIG_GPO_SECTION_ID, /* GPO Section ID */ + PM_CONFIG_GPO1_BIT_2_MASK | + PM_CONFIG_GPO1_MIO_PIN_34_MAP | + PM_CONFIG_GPO1_MIO_PIN_35_MAP | + PM_CONFIG_GPO1_MIO_PIN_36_MAP | + PM_CONFIG_GPO1_MIO_PIN_37_MAP | + 0, /* State of GPO pins */ +}; +#if defined (__ICCARM__) +#pragma language=restore +#endif diff --git a/board/zynqmp/post-build.sh b/board/zynqmp/post-build.sh new file mode 100755 index 0000000000..9fd8bbf2c8 --- /dev/null +++ b/board/zynqmp/post-build.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +# genimage will need to find the extlinux.conf +# in the binaries directory + +BOARD_DIR="$(dirname $0)" + +install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux.conf diff --git a/board/zynqmp/post-image.sh b/board/zynqmp/post-image.sh index b2b99fed01..ed6dbe188c 100755 --- a/board/zynqmp/post-image.sh +++ b/board/zynqmp/post-image.sh @@ -10,4 +10,6 @@ FIRST_DT=$(sed -nr \ [ -z "${FIRST_DT}" ] || ln -fs ${FIRST_DT}.dtb ${BINARIES_DIR}/system.dtb -support/scripts/genimage.sh -c board/zynqmp/genimage.cfg +BOARD_DIR="$(dirname $0)" + +support/scripts/genimage.sh -c $BOARD_DIR/genimage.cfg diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index bee7c1daf7..2026f60bd1 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -1,34 +1,39 @@ BR2_aarch64=y -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.15" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.6" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA" +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2022.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/53fdb7b6c92860ceb0ec5fd14deee302f4a84269/bin/pmufw-zcu106-default-v2017.4.bin" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/v2021.2/bin/pmufw-v2021.2.bin" +BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/pm_cfg_obj.c" +BR2_TARGET_UBOOT_FORMAT_ITB=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -- 2.17.1 From neal.frager at xilinx.com Thu Feb 10 08:19:32 2022 From: neal.frager at xilinx.com (Neal Frager) Date: Thu, 10 Feb 2022 01:19:32 -0700 Subject: [Buildroot] [PATCH v4 2/2] add configs/zynqmp_zcu102_defconfig In-Reply-To: <20220210081932.3114763-1-neal.frager@xilinx.com> References: <20220210081932.3114763-1-neal.frager@xilinx.com> Message-ID: <20220210081932.3114763-2-neal.frager@xilinx.com> This patch: - adds support for Xilinx ZCU102 evaluation board - ZCU102 features can be found here: https://www.xilinx.com/products/boards-and-kits/zcu102.html --- V1->V2: * fixed general build issues * added extlinux.conf for run-time boot issue V2->V3: * enabled support for host machines without OpenSSL required by U-Boot and Linux * moved board/zynqmp/readme.txt update to zynqmp_zcu102_defconfig patch 2/2 V3->V4: * cleaned up commit log messages * added version history --- Signed-off-by: Neal Frager Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti [Giulio: only build tested] Signed-off-by: Neal Frager --- board/zynqmp/readme.txt | 23 +++++++++++++------ configs/zynqmp_zcu102_defconfig | 39 +++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 7 deletions(-) create mode 100644 configs/zynqmp_zcu102_defconfig diff --git a/board/zynqmp/readme.txt b/board/zynqmp/readme.txt index da37f4ccc9..0dc1793e03 100644 --- a/board/zynqmp/readme.txt +++ b/board/zynqmp/readme.txt @@ -1,10 +1,19 @@ -******************************** -Xilinx ZCU106 board - ZynqMP SoC -******************************** +****************************************** +Xilinx ZCU102 / ZCU106 boards - ZynqMP SoC +****************************************** + +This document describes the Buildroot support for the ZCU102 and ZCU106 +boards by Xilinx, based on the Zynq UltraScale+ MPSoC (aka ZynqMP). +It has been tested with the ZCU102 and ZCU106 production boards. + +Evaluation board features can be found here with the links below. + +ZCU102: +https://www.xilinx.com/products/boards-and-kits/zcu102.html + +ZCU106: +https://www.xilinx.com/products/boards-and-kits/zcu106.html -This document describes the Buildroot support for the ZCU106 board by -Xilinx, based on the Zynq UltraScale+ MPSoC (aka ZynqMP). It has been -tested with the EK-U1-ZCU106-ES2 pre-production board. How to build it =============== @@ -32,7 +41,7 @@ After building, you should get a tree like this: +-- rootfs.ext4 -> rootfs.ext2 +-- sdcard.img +-- system.dtb -> zynqmp-zcu106-revA.dtb - +-- u-boot.bin + +-- u-boot.itb `-- zynqmp-zcu106-revA.dtb How to write the SD card diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig new file mode 100644 index 0000000000..acffda64bf --- /dev/null +++ b/configs/zynqmp_zcu102_defconfig @@ -0,0 +1,39 @@ +BR2_aarch64=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.15" +BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.6" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/Xilinx/u-boot-xlnx.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2022.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" +BR2_TARGET_UBOOT_ZYNQMP=y +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/v2021.2/bin/pmufw-v2021.2.bin" +BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/pm_cfg_obj.c" +BR2_TARGET_UBOOT_FORMAT_ITB=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y -- 2.17.1 From nealf at xilinx.com Thu Feb 10 08:24:54 2022 From: nealf at xilinx.com (Neal Frager) Date: Thu, 10 Feb 2022 08:24:54 +0000 Subject: [Buildroot] [PATCH v3 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: References: <20220209180306.2629180-1-neal.frager@xilinx.com> Message-ID: Hi Giulio, > As other patch please send V4 and add my > Reviewed-by and Tested-by I have submitted v4 of the patch set including your feedback. Please let me know if you find anything else. Best regards, Neal Frager Xilinx From buildroot at heine.tech Thu Feb 10 11:05:38 2022 From: buildroot at heine.tech (Michael Nosthoff) Date: Thu, 10 Feb 2022 12:05:38 +0100 Subject: [Buildroot] [PATCH] package/re2: bump version to 2022-02-01 Message-ID: <20220210110546.345600-1-buildroot@heine.tech> Signed-off-by: Michael Nosthoff --- package/re2/re2.hash | 2 +- package/re2/re2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/re2/re2.hash b/package/re2/re2.hash index a0a7d15938..7cfece5d5e 100644 --- a/package/re2/re2.hash +++ b/package/re2/re2.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 8c45f7fba029ab41f2a7e6545058d9eec94eef97ce70df58e92d85cfc08b4669 re2-2021-11-01.tar.gz +sha256 9c1e6acfd0fed71f40b025a7a1dabaf3ee2ebb74d64ced1f9ee1b0b01d22fd27 re2-2022-02-01.tar.gz sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 LICENSE diff --git a/package/re2/re2.mk b/package/re2/re2.mk index b562d5d7ef..31252ee82f 100644 --- a/package/re2/re2.mk +++ b/package/re2/re2.mk @@ -4,7 +4,7 @@ # ################################################################################ -RE2_VERSION = 2021-11-01 +RE2_VERSION = 2022-02-01 RE2_SITE = $(call github,google,re2,$(RE2_VERSION)) RE2_LICENSE = BSD-3-Clause RE2_LICENSE_FILES = LICENSE -- 2.25.1 From buildroot at uclibc.org Thu Feb 10 12:24:45 2022 From: buildroot at uclibc.org (=?UTF-8?Q?=E2=9D=A4=EF=B8=8F_Rachel_want_to_meet_you!_Click_Here=3A_https?= =?UTF-8?Q?=3A//cutt=2Eus/Yb2mo=3Fkb83_=E2=9D=A4=EF=B8=8F?=) Date: Thu, 10 Feb 2022 12:24:45 +0000 Subject: [Buildroot] =?utf-8?b?44GK5ZWP5ZCI44Gb44GC44KK44GM44Go44GG44GU?= =?utf-8?b?44GW44GE44G+44GX44Gf44CC44CQ44CR?= Message-ID: <0def24c43e515508a153e72856e4dc10@boi-reves.com> ?? Rachel want to meet you! Click Here: https://cutt.us/Yb2mo?kb83 ??? ????????????????????????? ????????????????????? ?????????????????? ---------------------------------------------------- [textarea your-message class:mess 90x10 ] ---------------------------------------------------- ?? Rachel want to meet you! Click Here: https://cutt.us/Yb2mo?kb83 ????????????????? 3?4??????????????????????? ???????????????????? From bugzilla at busybox.net Thu Feb 10 13:46:58 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Thu, 10 Feb 2022 13:46:58 +0000 Subject: [Buildroot] [Bug 14581] New: qemu-system-ppc -M mac99 does not boot for glibc system Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14581 Bug ID: 14581 Summary: qemu-system-ppc -M mac99 does not boot for glibc system Product: buildroot Version: unspecified Hardware: All OS: Linux Status: NEW Severity: normal Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: wbx at openadk.org CC: buildroot at uclibc.org Target Milestone: --- Hi, you get following error when trying to boot a glibc system in qemu-system-ppc: Run /sbin/init as init process init[1]: segfault (11) at 7369693e nip 7eb024 lr 7ead8c code 1 in libc.so.6[772000+1fa000] init[1]: code: 7d5d5378 815efd38 39200000 913f0000 814a0000 813f000c 75291fbf 2c0a0000 init[1]: code: 913f000c 41e2fe94 893d0000 5529103a <7d2a482e> 2c090000 41c2fe80 7fe4fb78 Kernel panic - not syncing: Attempted to kill init! exitcode=0x0000000b CPU: 0 PID: 1 Comm: init Not tainted 5.15.0 #1 Call Trace: [f1019d80] [c004c054] panic+0x124/0x308 (unreliable) [f1019de0] [c004eadc] do_exit+0x910/0x918 [f1019e30] [c004fb38] do_group_exit+0x34/0xa8 [f1019e50] [c005e550] get_signal+0x1ec/0x86c [f1019eb0] [c000cdcc] do_notify_resume+0x78/0x304 [f1019f10] [c00128a0] interrupt_exit_user_prepare_main+0xf8/0x130 [f1019f30] [c0019224] interrupt_return+0x14/0x144 --- interrupt: 300 at 0x7eb024 NIP: 007eb024 LR: 007ead8c CTR: 007ff680 REGS: f1019f40 TRAP: 0300 Not tainted (5.15.0) MSR: 0000d032 CR: 48002424 XER: 20000000 DAR: 7369693e DSISR: 40000000 GPR00: 007e16a0 af9058c0 a7b8a430 00ab1879 00000000 af905d20 af906138 af906630 GPR08: 00000030 000001cc 73696772 00000000 48002424 00acfa54 00000000 af905d20 GPR16: 00000000 00ab1879 af905d20 00000000 00000000 4ec40000 af906630 00000000 GPR24: af906138 af9066f8 af906138 00000000 00000000 00ab187a 00981fb8 af905d20 NIP [007eb024] 0x7eb024 LR [007ead8c] 0x7ead8c --- interrupt: 300 Rebooting in 180 seconds.. best regards Waldemar -- You are receiving this mail because: You are on the CC list for the bug. From giulio.benetti at benettiengineering.com Thu Feb 10 13:47:46 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 10 Feb 2022 14:47:46 +0100 Subject: [Buildroot] [PATCH v3 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: References: <20220209180306.2629180-1-neal.frager@xilinx.com> Message-ID: Hi Neal, On 10/02/22 09:24, Neal Frager wrote: > Hi Giulio, > >> As other patch please send V4 and add my >> Reviewed-by and Tested-by > > I have submitted v4 of the patch set including your feedback. Please let me know if you find anything else. I've rebuilt both of them and now they have my tags so they are ready to be committed! Best regards -- Giulio Benetti Benetti Engineering sas From nealf at xilinx.com Thu Feb 10 14:19:02 2022 From: nealf at xilinx.com (Neal Frager) Date: Thu, 10 Feb 2022 14:19:02 +0000 Subject: [Buildroot] [PATCH v3 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: References: <20220209180306.2629180-1-neal.frager@xilinx.com> Message-ID: Hi Giulio, > I've rebuilt both of them and now they have my tags so they are ready to be committed! Fantastic! Thank you so much for your reactivity and support. Now that we have done this once, future version bumps will be much easier. Please let me know when the patches are committed, so that I can clone the new tree. Best regards, Neal Frager Xilinx From giulio.benetti at benettiengineering.com Thu Feb 10 14:32:25 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 10 Feb 2022 15:32:25 +0100 Subject: [Buildroot] [PATCH v3 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: References: Message-ID: <92FA06A8-01FB-46CC-A9B8-8883406C1D11@benettiengineering.com> Hi Neal, > Il giorno 10 feb 2022, alle ore 15:21, Neal Frager ha scritto: > > ?Hi Giulio, > >> I've rebuilt both of them and now they have my tags so they are ready to be committed! > > Fantastic! Thank you so much for your reactivity and support. Now that we have done this once, future version bumps will be much easier. Yes :-) > Please let me know when the patches are commiste, so that I can clone the new tree. You will be in Cc once committed. Best regards Giulio > > Best regards, > Neal Frager > Xilinx > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From yann.morin at orange.com Thu Feb 10 15:08:50 2022 From: yann.morin at orange.com (yann.morin at orange.com) Date: Thu, 10 Feb 2022 16:08:50 +0100 Subject: [Buildroot] [PATCH 2/5 v2] package/pkg-cargo: allow building in a sub-directory In-Reply-To: <20220209205410.071f193a@windsurf> References: <20220209205410.071f193a@windsurf> Message-ID: <11338_1644505732_62052A83_11338_59_1_20220210150850.GA2599@tl-lnx-nyma7486> Thomas, All, On 2022-02-09 20:54 +0100, Thomas Petazzoni spake thusly: > On Wed, 9 Feb 2022 17:08:44 +0100 > wrote: > > +# If building in a sub directory, use that to find the Cargo.toml, unless > > +# the package already provided its location. > > +ifneq ($$($(2)_SUBDIR),) > > +ifeq ($$(filter BR_CARGO_MANIFEST_PATH=%,$$($(2)_DL_ENV)),) > > +$(2)_DL_ENV += BR_CARGO_MANIFEST_PATH=$$($(2)_SUBDIR)/Cargo.toml > > I find that a bit "meh". I too am not fond of it, to be honest... But I am not a rust/cargo expert, by far, I wanted not to break any existing setup. However, the cargo infra is brand new, and BR_CARGO_MANIFEST_PATH was not even advertised either, so we should probably not have to expect any package to actually use it already. > Should we have an explicit package variable > that tells the location of the Cargo.toml, instead of directly have > packages pass this "magic" BR_CARGO_MANIFEST_PATH variable ? I was wondering if that would even make sense to have a different _SUBDIR and BR_CARGO_MANIFEST_PATH to begin with? We have a package here that seems to be in such a situation, though: https://github.com/Orange-OpenSource/its-client The Cargo.toml is in rust/ but we need to do the build in rust/its-client/ ("cargo build" works perfectly well with a virtual workspace, like is used here, but "cargo install" refuses to work, muahaha...) Still, because of a missing Cargo.lock in that package, vendoring by Buildroot does not work eother (we'll fix that later). So, for now, I suggest we just expect that BR_CARGO_MANIFEST_PATH is the same as _SUBDIR, and thus the conditional assignment is not needed. If in the future we do have an actual, working situation where they differ, then we may add the necessary infra, seems like a plan? In the meantime, I'll respin the series with the ugly conditional removed. > Should $(2)_SUBDIR be documented for the cargo-package infra in the > documentation ? It is not documented for any of the other infras that make use of it (autotools, cmake, python, etc...). The only mention of _SUBDIR in the manual is about _SUBDIRS (plural) for the kernel-module sub-infra. Thanks for the review! Regards, Yann E. MORIN. > 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 | | +33 534.541.179 | Software Designer | _/ - /' | \ / CAMPAIGN | | +33 638.411.245 '--------------------: (_ `--, | X AGAINST | | yann.morin (at) orange.com |_=" ,--' | / \ HTML MAIL | '--------------------------------------:______/_____:------------------' _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From luca at lucaceresoli.net Thu Feb 10 15:14:09 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Thu, 10 Feb 2022 16:14:09 +0100 Subject: [Buildroot] [PATCH 1/2] configs/zynqmp_zcu106: Bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: References: <20220208071559.2862411-1-neal.frager@xilinx.com> <69efa9da-ae55-6795-8724-ed7105083924@benettiengineering.com> <32cc1c12-1496-7db9-5e32-1b99404a4fe3@benettiengineering.com> <690d8e1b-fb6d-7c36-b07f-4ed9ca61b768@lucaceresoli.net> Message-ID: <489a02df-4f2b-a46c-aa49-15c3c545f8f2@lucaceresoli.net> Hi Neal, apologies for the delay in replies. Too busy. On 08/02/22 14:56, Neal Frager wrote: [...] >>> Is this something that can easily be updated? If not, perhaps it >>> makes sense to move forward with my patch set as is for now, and then >>> I can include a new update once the BR2_TARGET_UBOOT_ZYNQMP_PM_CFG >>> configuration accepts URL inputs. >>> >>> What are your thoughts on this? >> >> I think you should go with local patch honestly. >> As the patch is now. > >> I agree with Giulio, it's probably better to add the file to Buildroot. > >> Here's the rationale. > >> Downloading files instead of versioning them is not necessarily a bad idea. However pm_cfg_obj.c is unavoidably a configuration-dependent file, meaning each user making their _project_ (project = a specific configuration of a specific hardware) will have a different pm_cfg_obj.c. This is different from downloading a patch, or a pmufw.bin, which are reusable across several projects. > >> Theoretically, it might make sense to have a repo hosting pm_cfg_obj.c only if that repo contains all project-specific material for the _project_ : schematics, FPGA design etc. But this is not the case here. > >> BTW pm_cfg_obj.c is a 32 kB text file that compresses to 2 kB. Not a big deal. > > I agree with your rationale. However, not every FPGA design will have a new pm_cfg_obj.c. While it is possible to do some customizations with this file, all of the Xilinx evaluation boards now use the same one. I would expect most developers never even touch this file, to be honest. So in a high percentage of cases, the pm_cfg_obj.c is really coming from a specific Xilinx embeddedsw release branch which developers should want to be the same release version as the PMU firmware binary. Interesting, I'm curious how this works. The pm_cfg_obj.c at the URL you provided, as well as in the patches you sent, has some peripherals disabled: USB1, ETH0/1/2, both SPIs, NAND, CAN0, VCU and more. Do current kernels implement enabling these at runtime, making appropriate requests to PMUFW? This wasn't the case last time I looked into that, it would be very interesting if it has happened in the meantime. Otherwise one would need to provide a per-configuration pmu config or a "wildcard" config, but I'm not sure whether it would cover all potential use cases. Even though Buildroot has [almost] only defconfigs for well-known evaluation boards, it is really meant to be used by custom designs, thus we want to be able to use other configurations than those useful for Xilinx boards. -- Luca From yann.morin at orange.com Thu Feb 10 15:19:16 2022 From: yann.morin at orange.com (yann.morin at orange.com) Date: Thu, 10 Feb 2022 16:19:16 +0100 Subject: [Buildroot] [PATCH 2/5 v2] package/pkg-cargo: allow building in a sub-directory In-Reply-To: <20220210150850.GA2599@tl-lnx-nyma7486> References: <20220209205410.071f193a@windsurf> <20220210150850.GA2599@tl-lnx-nyma7486> Message-ID: <7033_1644506358_62052CF5_7033_331_1_20220210151916.GB2599@tl-lnx-nyma7486> Thomas, Alll, On 2022-02-10 16:08 +0100, MORIN Yann INNOV/IT-S spake thusly: > On 2022-02-09 20:54 +0100, Thomas Petazzoni spake thusly: > > Should $(2)_SUBDIR be documented for the cargo-package infra in the > > documentation ? > It is not documented for any of the other infras that make use of it > (autotools, cmake, python, etc...). > The only mention of _SUBDIR in the manual is about _SUBDIRS (plural) for > the kernel-module sub-infra. Scratch that, I seem to be unable to do a proper search in a webpage... :-( I'll add it to the cargo part of the manual. Cordialement, Yann E. MORIN. -- ____________ .-----------------.--------------------: _ :------------------. | Yann E. MORIN | Real-Time Embedded | __/ ) | /"\ ASCII RIBBON | | +33 534.541.179 | Software Designer | _/ - /' | \ / CAMPAIGN | | +33 638.411.245 '--------------------: (_ `--, | X AGAINST | | yann.morin (at) orange.com |_=" ,--' | / \ HTML MAIL | '--------------------------------------:______/_____:------------------' _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From yann.morin at orange.com Thu Feb 10 15:29:25 2022 From: yann.morin at orange.com (yann.morin at orange.com) Date: Thu, 10 Feb 2022 16:29:25 +0100 Subject: [Buildroot] [PATCH 0/5 v3] package/pkg-{cargo, golang}: enhance build process Message-ID: <3778_1644506967_62052F57_3778_468_1_cover.1644506959.git.yann.morin@orange.com> From: "Yann E. MORIN" Hello All! This five-patch series enhances the cargo- and golang-based package infrastructures: - allow building cargo packages in a sub-directory of the package source tree; - fix dependencies when using override-srcdir - allow passing arbitrary _DL_ENV The golang-related changes are not tested, by lack of a go package to test them against, but the changes look obvious and simple enough (note: they were spotted as the two infras got in simultaneously recently, so it looked like a good idea to fix both in the same series). Changes v2 -> v3: - always use _SUBDIR to find Cargo.toml - add _SUBDIR for cargo infra in the manual - carry tags from Christian and Thomas where appropriate (Thanks!) Changes v1 -> v2: - fix conditional in the sub-directory patch - add patch to allow building with override-srcdir Regards, Yann E. MORIN. The following changes since commit 4419123f9c5e93fe6247e522c6b27800a36893c5 package/doc-asciidoc: fix build for out-of-tree documents (2022-02-10 13:44:03 +0100) are available as patches in this mail series, for you to apply patches up to 1cfdf4aa3ac96d2d2cf246385325f93b451d773b package/pkg-golang: host-go is also a build dependency (2022-02-10 16:22:45 +0100) ---------------------------------------------------------------- Yann E. MORIN (5): package/pkg-cargo: allow packages to define download environment package/pkg-cargo: allow building in a sub-directory package/pkg-cargo: host-rustc is also a build dependency package/pkg-golang: allow packages to define download environment package/pkg-golang: host-go is also a build dependency docs/manual/adding-packages-cargo.txt | 5 +++++ package/pkg-cargo.mk | 19 +++++++++++++------ package/pkg-golang.mk | 6 ++++-- 3 files changed, 22 insertions(+), 8 deletions(-) -- ____________ .-----------------.--------------------: _ :------------------. | Yann E. MORIN | Real-Time Embedded | __/ ) | /"\ ASCII RIBBON | | +33 534.541.179 | Software Designer | _/ - /' | \ / CAMPAIGN | | +33 638.411.245 '--------------------: (_ `--, | X AGAINST | | yann.morin (at) orange.com |_=" ,--' | / \ HTML MAIL | '--------------------------------------:______/_____:------------------' _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From yann.morin at orange.com Thu Feb 10 15:29:24 2022 From: yann.morin at orange.com (yann.morin at orange.com) Date: Thu, 10 Feb 2022 16:29:24 +0100 Subject: [Buildroot] [PATCH 1/5 v3] package/pkg-cargo: allow packages to define download environment In-Reply-To: References: Message-ID: <19116_1644506970_62052F5A_19116_77_1_cb2a6466cea018c4bf8b8877140a9f389bb7918f.1644506959.git.yann.morin@orange.com> From: "Yann E. MORIN" Currently, the cargo infrastructure forcibly sets the package _DL_ENV variable, instead of appending to it, which prevents packages from providing their own download environment variables. We fix that by using an append-assignment. Note: when introduced, that variable was explicitly not documented, and is supposed to only be used by packages infrastructures. However, that variable exists, and it can be (ab)used by br2-external packages (most probably to ill effects, but heh!). We anyway leave it undocumented, like _ROOTFS_PRE_CMD_HOOKS. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Acked-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 e74a8358bc..66bea513e0 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -69,7 +69,7 @@ define inner-cargo-package $(2)_DOWNLOAD_DEPENDENCIES += host-rustc $(2)_DOWNLOAD_POST_PROCESS = cargo -$(2)_DL_ENV = CARGO_HOME=$$(HOST_DIR)/share/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.25.1 _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From yann.morin at orange.com Thu Feb 10 15:29:25 2022 From: yann.morin at orange.com (yann.morin at orange.com) Date: Thu, 10 Feb 2022 16:29:25 +0100 Subject: [Buildroot] [PATCH 2/5 v3] package/pkg-cargo: allow building in a sub-directory In-Reply-To: References: Message-ID: <11477_1644506971_62052F5B_11477_140_26_81fca21f2b24da16bb9e6d3af5add173f382f242.1644506959.git.yann.morin@orange.com> From: "Yann E. MORIN" Some packages have their rust sources as a sub-directory, rather than at the root of the source tree. Do like we do for autotools-package, and use the package's _SRCDIR rather than the top-level directory $(@D). Additionally, in such a situation, it is more than probable that the Cargo.toml is also present in that sub-directory, so use that when vendoring the package. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni --- Changes v2 -> v3: - always consider Cargo.toml to be in _SUBDIR (Thomas) - add _SUBDIR to the manual (Thomas) Changes v1 -> v2: - fix conditional (inverted logic) - fix syntax in conditional (missing comma) --- docs/manual/adding-packages-cargo.txt | 5 +++++ package/pkg-cargo.mk | 13 +++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/docs/manual/adding-packages-cargo.txt b/docs/manual/adding-packages-cargo.txt index 5343fbd4e6..e18fd9ce23 100644 --- a/docs/manual/adding-packages-cargo.txt +++ b/docs/manual/adding-packages-cargo.txt @@ -73,6 +73,11 @@ 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_SUBDIR+ may contain the name of a subdirectory inside the package + that contains the Cargo.toml file. This is useful, if for example, it + is not at the root of the tree extracted by the tarball. If + +HOST_FOO_SUBDIR+ is not specified, it defaults to +FOO_SUBDIR+. + * +FOO_CARGO_ENV+ can be used to pass additional variables in the environment of +cargo+ invocations. It used at both build and installation time diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index 66bea513e0..8b246abfed 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -71,6 +71,11 @@ $(2)_DOWNLOAD_DEPENDENCIES += host-rustc $(2)_DOWNLOAD_POST_PROCESS = cargo $(2)_DL_ENV += CARGO_HOME=$$(HOST_DIR)/share/cargo +# If building in a sub directory, use that to find the Cargo.toml +ifneq ($$($(2)_SUBDIR),) +$(2)_DL_ENV += BR_CARGO_MANIFEST_PATH=$$($(2)_SUBDIR)/Cargo.toml +endif + # Due to vendoring, it is pretty likely that not all licenses are # listed in _LICENSE. $(2)_LICENSE += , vendored dependencies licenses probably not listed @@ -97,7 +102,7 @@ $(2)_LICENSE += , vendored dependencies licenses probably not listed ifndef $(2)_BUILD_CMDS ifeq ($(4),target) define $(2)_BUILD_CMDS - cd $$(@D) && \ + cd $$($$(PKG)_SRCDIR) && \ $$(TARGET_MAKE_ENV) \ $$(TARGET_CONFIGURE_OPTS) \ $$(PKG_CARGO_ENV) \ @@ -111,7 +116,7 @@ define $(2)_BUILD_CMDS endef else # ifeq ($(4),target) define $(2)_BUILD_CMDS - cd $$(@D) && \ + cd $$($$(PKG)_SRCDIR) && \ $$(HOST_MAKE_ENV) \ RUSTFLAGS="$$(addprefix -C link-args=,$$(HOST_LDFLAGS))" \ $$(HOST_CONFIGURE_OPTS) \ @@ -133,7 +138,7 @@ endif # ifndef $(2)_BUILD_CMDS # ifndef $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS - cd $$(@D) && \ + cd $$($$(PKG)_SRCDIR) && \ $$(TARGET_MAKE_ENV) \ $$(TARGET_CONFIGURE_OPTS) \ $$(PKG_CARGO_ENV) \ @@ -152,7 +157,7 @@ endif ifndef $(2)_INSTALL_CMDS define $(2)_INSTALL_CMDS - cd $$(@D) && \ + cd $$($$(PKG)_SRCDIR) && \ $$(HOST_MAKE_ENV) \ RUSTFLAGS="$$(addprefix -C link-args=,$$(HOST_LDFLAGS))" \ $$(HOST_CONFIGURE_OPTS) \ -- 2.25.1 _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From yann.morin at orange.com Thu Feb 10 15:29:26 2022 From: yann.morin at orange.com (yann.morin at orange.com) Date: Thu, 10 Feb 2022 16:29:26 +0100 Subject: [Buildroot] [PATCH 3/5 v3] package/pkg-cargo: host-rustc is also a build dependency In-Reply-To: References: Message-ID: <11363_1644506973_62052F5D_11363_173_9_da4c09036712600e0ab76db801a5a5c693bfa267.1644506959.git.yann.morin@orange.com> From: "Yann E. MORIN" Currently, host-rustc is a download dependency, because we need cargo for the vendoring during the download step. However, when using a package in override-srcdir, there is no download step, so host-rustc is not pulled in as a dependency which breaks running the build of a single package from scratch: $ make clean $ make my-rust-package [...] [...] cargo build --offline --release --manifest-path Cargo.toml --locked /bin/sh: cargo: command not found We fix that by adding host-rustc as a standard dependency too. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Acked-by: Thomas Petazzoni --- package/pkg-cargo.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index 8b246abfed..6f5125f1d4 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -65,8 +65,10 @@ HOST_PKG_CARGO_ENV = \ define inner-cargo-package -# We need host-rustc to run cargo +# We need host-rustc to run cargo at download time (for vendoring), +# and at build and install time. $(2)_DOWNLOAD_DEPENDENCIES += host-rustc +$(2)_DEPENDENCIES += host-rustc $(2)_DOWNLOAD_POST_PROCESS = cargo $(2)_DL_ENV += CARGO_HOME=$$(HOST_DIR)/share/cargo -- 2.25.1 _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From yann.morin at orange.com Thu Feb 10 15:29:27 2022 From: yann.morin at orange.com (yann.morin at orange.com) Date: Thu, 10 Feb 2022 16:29:27 +0100 Subject: [Buildroot] [PATCH 4/5 v3] package/pkg-golang: allow packages to define download environment In-Reply-To: References: Message-ID: <1449_1644506975_62052F5F_1449_399_1_68889e1f1d960c99ade7457d58a115bf955a7b64.1644506959.git.yann.morin@orange.com> From: "Yann E. MORIN" Currently, the golang infrastructure forcibly sets the package _DL_ENV variable, instead of appending to it, which prevents packages from providing their own download environment variables. We fix that by using an append-assignment. Note: when introduced, that variable was explicitly not documented, and is supposed to only be used by packages infrastructures. However, that variable exists, and it can be (ab)used by br2-external packages (most probably to ill effects, but heh!). We anyway leave it undocumented, like _ROOTFS_PRE_CMD_HOOKS. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Christian Stewart Cc: Anisse Astier Acked-by: Thomas Petazzoni Reviewed-by: Christian Stewart --- 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..69eae02830 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -83,7 +83,7 @@ endef $(2)_POST_PATCH_HOOKS += $(2)_GEN_GOMOD $(2)_DOWNLOAD_POST_PROCESS = go -$(2)_DL_ENV = \ +$(2)_DL_ENV += \ $(HOST_GO_COMMON_ENV) \ GOPROXY=direct \ BR_GOMOD=$$($(2)_GOMOD) -- 2.25.1 _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From yann.morin at orange.com Thu Feb 10 15:29:28 2022 From: yann.morin at orange.com (yann.morin at orange.com) Date: Thu, 10 Feb 2022 16:29:28 +0100 Subject: [Buildroot] [PATCH 5/5 v3] package/pkg-golang: host-go is also a build dependency In-Reply-To: References: Message-ID: <11477_1644506977_62052F61_11477_142_1_1cfdf4aa3ac96d2d2cf246385325f93b451d773b.1644506959.git.yann.morin@orange.com> From: "Yann E. MORIN" Currently, host-go is a download dependency, because we need go for the vendoring during the download step. However, when using a package in override-srcdir, there is no download step, so host-go is not pulled in as a dependency, which will break the build of a single package from scratch. We fix that by adding host-go as a standard dependency too. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Christian Stewart Cc: Anisse Astier Acked-by: Thomas Petazzoni Reviewed-by: Christian Stewart --- package/pkg-golang.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk index 69eae02830..ddefdf1214 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -47,8 +47,10 @@ $(2)_BUILD_OPTS += \ -trimpath \ -p $(PARALLEL_JOBS) -# Target packages need the Go compiler on the host. +# Target packages need the Go compiler on the host at download time (for +# vendoring), and at build and install time. $(2)_DOWNLOAD_DEPENDENCIES += host-go +$(2)_DEPENDENCIES += host-go $(2)_BUILD_TARGETS ?= . -- 2.25.1 _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From nealf at xilinx.com Thu Feb 10 15:46:41 2022 From: nealf at xilinx.com (Neal Frager) Date: Thu, 10 Feb 2022 15:46:41 +0000 Subject: [Buildroot] [PATCH 1/2] configs/zynqmp_zcu106: Bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <489a02df-4f2b-a46c-aa49-15c3c545f8f2@lucaceresoli.net> References: <20220208071559.2862411-1-neal.frager@xilinx.com> <69efa9da-ae55-6795-8724-ed7105083924@benettiengineering.com> <32cc1c12-1496-7db9-5e32-1b99404a4fe3@benettiengineering.com> <690d8e1b-fb6d-7c36-b07f-4ed9ca61b768@lucaceresoli.net> <489a02df-4f2b-a46c-aa49-15c3c545f8f2@lucaceresoli.net> Message-ID: Hi Luca, > Interesting, I'm curious how this works. The pm_cfg_obj.c at the URL you provided, as well as in the patches you sent, has some peripherals > disabled: USB1, ETH0/1/2, both SPIs, NAND, CAN0, VCU and more. Do current kernels implement enabling these at runtime, making appropriate requests to PMUFW? This wasn't the case last time I looked into that, it would be very interesting if it has happened in the meantime. > Otherwise one would need to provide a per-configuration pmu config or a "wildcard" config, but I'm not sure whether it would cover all potential use cases. Even though Buildroot has [almost] only defconfigs for well-known evaluation boards, it is really meant to be used by custom designs, thus we want to be able to use other configurations than those useful for Xilinx boards. I took a closer look at the pm_cfg_obj.c, and I see what you mean. What confused me is that Vivado does not generate this file when you create an xsa or hdf file for the hardware design like the psu_init.c files. So I thought the file was always the same regardless of the hardware. Instead, users have two choices. They can either use Vitis to generate a FSBL which will have a pm_cfg_obj.c file in it, or they can modify this example file manually. The pm_cfg_obj.c that I have included with buildroot enables all of the peripherals that are enabled on the ZCU102 and ZCU106 boards, so I think it is fine for having an out of box example for our customers. Perhaps a good solution would be adding a readme file for the pm_cfg_obj.c alerting developers that they will need to modify this file for building designs for custom hardware. In any case, we need to have an example pm_cfg_obj.c file in order for the buildroot examples to build and run. And I think the pm_cfg_obj.c is only one of many things developers will need to modify when moving from an evaluation board to their own custom hardware. What are your thoughts? You have been working with this issue much longer than I have. Thank you for your feedback and support! Best regards, Neal Frager Xilinx From giulio.benetti at benettiengineering.com Thu Feb 10 16:31:20 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 10 Feb 2022 17:31:20 +0100 Subject: [Buildroot] [PATCH 1/2] configs/zynqmp_zcu106: Bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: References: <20220208071559.2862411-1-neal.frager@xilinx.com> <69efa9da-ae55-6795-8724-ed7105083924@benettiengineering.com> <32cc1c12-1496-7db9-5e32-1b99404a4fe3@benettiengineering.com> <690d8e1b-fb6d-7c36-b07f-4ed9ca61b768@lucaceresoli.net> <489a02df-4f2b-a46c-aa49-15c3c545f8f2@lucaceresoli.net> Message-ID: Hi Neal and Luca, On 10/02/22 16:46, Neal Frager wrote: > Hi Luca, > >> Interesting, I'm curious how this works. The pm_cfg_obj.c at the URL you provided, as well as in the patches you sent, has some peripherals >> disabled: USB1, ETH0/1/2, both SPIs, NAND, CAN0, VCU and more. Do current kernels implement enabling these at runtime, making appropriate requests to PMUFW? This wasn't the case last time I looked into that, it would be very interesting if it has happened in the meantime. Neal, can you reply about this ^^^. At least, are USB1, ETH0/1/2, both SPIs, NAND, CAN0, VCU present on those 2 boards? >> Otherwise one would need to provide a per-configuration pmu config or a "wildcard" config, but I'm not sure whether it would cover all potential use cases. I agree. > Even though Buildroot has [almost] only defconfigs for well-known evaluation boards, it is really meant to be used by custom designs, thus we want to be able to use other configurations than those useful for Xilinx boards. No, it's not meant to be used for custom boards, the goal is having the 2 BSP for the 2 boards and that's it. The ones who will need to create custom BSP will ad new BSPs starting from your reference. So here again what Luca pointed above about a wildcard config is true: we don't know if it will really cover all cases. Since this is not the goal of Buildroot I would narrow things to deal with the 2 actual boards peripherals only. > I took a closer look at the pm_cfg_obj.c, and I see what you mean. What confused me is that Vivado does not generate this file when you create an xsa or hdf file for the hardware design like the psu_init.c files. So I thought the file was always the same regardless of the hardware. > > Instead, users have two choices. They can either use Vitis to generate a FSBL which will have a pm_cfg_obj.c file in it, or they can modify this example file manually. The pm_cfg_obj.c that I have included with buildroot enables all of the peripherals that are enabled on the ZCU102 and ZCU106 boards, so I think it is fine for having an out of box example for our customers. I agree that here we need to deal with those 2 specific boards. > Perhaps a good solution would be adding a readme file for the pm_cfg_obj.c alerting developers that they will need to modify this file for building designs for custom hardware. This is implicit > In any case, we need to have an example pm_cfg_obj.c file in order for the buildroot examples to build and run. And I think the pm_cfg_obj.c is only one of many things developers will need to modify when moving from an evaluation board to their own custom hardware. This is out of scope here. As patch names point you're bumping or adding 2 specific boards, so I wouldn't worry about eventual custom boards. If someone will deal with it I think they will also deal with Vivado to create specific config files. At least that is what I would do while approaching these 2 FPGAs. > > What are your thoughts? You have been working with this issue much longer than I have. Thank you for your feedback and support! > > Best regards, > Neal Frager > Xilinx Neal, please use 72 wrapping on your e-mail client, otherwise lines are very long :-) Thank you! Best regards -- Giulio Benetti Benetti Engineering sas From giulio.benetti at benettiengineering.com Thu Feb 10 16:39:34 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 10 Feb 2022 17:39:34 +0100 Subject: [Buildroot] [PATCH v4 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <20220210081932.3114763-1-neal.frager@xilinx.com> References: <20220210081932.3114763-1-neal.frager@xilinx.com> Message-ID: <7ed72b26-0729-93c7-e1c7-c429e2a5fb87@benettiengineering.com> Hi Neal, On 10/02/22 09:19, Neal Frager wrote: > This patch: > - bumps ATF to Xilinx v2.6: mainline v2.6 requires patch to build > - bumps U-Boot to Xilinx 2022.01: important drivers not in mainline > - bumps Linux to Xilinx 5.15: important drivers not in mainline > - deletes board/zynqmp/patches directory: patches already in mainline > - modifies board/zynqmp/genimage.cfg: U-Boot 2022.01 uses u-boot.itb format > - adds extlinux.conf to vfat bootfs > - modifies U-Boot to unified xilinx_zynqmp_virt_defconfig (supports all boards) > - adds support for SPL pm_cfg_obj.c loading to PMU firmware > - enables support for host machines without OpenSSL required by U-Boot and Linux > If you put the 3 dashes below, everything after them will be ignored, so you need to put here... > --- > V1->V2: > * fixed general build issues > * added extlinux.conf for run-time boot issue > V2->V3: > * enabled support for host machines without OpenSSL required by U-Boot and Linux > * moved readme.txt update to zynqmp_zcu102_defconfig patch 2/2 > V3->V4: > * cleaned up commit log messages > * added version history > --- > > Signed-off-by: Neal Frager > Reviewed-by: Giulio Benetti > Tested-by: Giulio Benetti > [Giulio: only build tested] These ^^^ > Signed-off-by: Neal Frager And drop this ^^^ that is already part of the patch. Same goes for patch 2/2 And I would shrink pm_cfg_obj.c down to what boards really sport without thinking too much about eventual custom boards as discussed here: https://lists.buildroot.org/pipermail/buildroot/2022-February/636513.html > --- > board/zynqmp/extlinux.conf | 5 + > board/zynqmp/genimage.cfg | 6 +- > ...-fix-Remove-GGC-ignore-Warray-bounds.patch | 68 -- > ...64-zynqmp-zcu106-fix-SPL-MMC-booting.patch | 52 -- > ...2-arm64-zynqmp-Enable-booting-to-ATF.patch | 114 ---- > ...ept-an-absolute-path-for-PMUFW_INIT_.patch | 68 -- > ...ynqmp-pass-the-PS-init-file-as-a-kco.patch | 175 ----- > board/zynqmp/pm_cfg_obj.c | 614 ++++++++++++++++++ But here I see you only have one pm_cfg_obj.c for both z102 and z106, is that sufficient? I mean, have they so common peripherals? I see we have to deal with: Zynq UltraScale+ XCZU7EV-2FFVC1156 MPSoC for z106 and Zynq UltraScale+ XCZU9EG-2FFVB1156 MPSoC for z102 so I don't know if having a common pm_cfg_obj.c should be a good idea. I know few about FPGAs, but I don't know if they are really compatible. What you and Luca think about this? Btw, thank you Luca for noticing it! Best regards -- Giulio Benetti Benetti Engineering sas > board/zynqmp/post-build.sh | 8 + > board/zynqmp/post-image.sh | 4 +- > configs/zynqmp_zcu106_defconfig | 23 +- > 11 files changed, 648 insertions(+), 489 deletions(-) > create mode 100644 board/zynqmp/extlinux.conf > delete mode 100644 board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch > delete mode 100644 board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch > delete mode 100644 board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch > delete mode 100644 board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch > delete mode 100644 board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch > create mode 100644 board/zynqmp/pm_cfg_obj.c > create mode 100755 board/zynqmp/post-build.sh > > diff --git a/board/zynqmp/extlinux.conf b/board/zynqmp/extlinux.conf > new file mode 100644 > index 0000000000..ae3ec8614a > --- /dev/null > +++ b/board/zynqmp/extlinux.conf > @@ -0,0 +1,5 @@ > +label linux > + kernel /Image > + devicetree /system.dtb > + append console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait > + > diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg > index ed202f4550..20d8352c08 100644 > --- a/board/zynqmp/genimage.cfg > +++ b/board/zynqmp/genimage.cfg > @@ -2,11 +2,13 @@ image boot.vfat { > vfat { > files = { > "boot.bin", > - "u-boot.bin", > - "atf-uboot.ub", > + "u-boot.itb", > "system.dtb", > "Image" > } > + file extlinux/extlinux.conf { > + image = extlinux.conf > + } > } > > size = 32M > diff --git a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch b/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch > deleted file mode 100644 > index 0c1a9ba2a4..0000000000 > --- a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch > +++ /dev/null > @@ -1,68 +0,0 @@ > -From da003e6ada7d0217fe99dc7c649a731f8ebd3c34 Mon Sep 17 00:00:00 2001 > -From: Deepika Bhavnani > -Date: Thu, 15 Aug 2019 00:56:46 +0300 > -Subject: [PATCH] Coverity fix: Remove GGC ignore -Warray-bounds > - > -GCC diagnostics were added to ignore array boundaries, instead > -of ignoring GCC warning current code will check for array boundaries > -and perform and array update only for valid elements. > - > -Resolves: `CID 246574` `CID 246710` `CID 246651` > - > -Signed-off-by: Deepika Bhavnani > -Change-Id: I7530ecf7a1707351c6ee87e90cc3d33574088f57 > - > -Backported from: 41af05154abe136938bcfb5f26c969933784bbef > -[Adapted to apply on 1.5] > - > ---- > - lib/psci/psci_common.c | 20 ++++++++++---------- > - 1 file changed, 10 insertions(+), 10 deletions(-) > - > -diff --git a/lib/psci/psci_common.c b/lib/psci/psci_common.c > -index 2220a745cd6e..6282d992a2f0 100644 > ---- a/lib/psci/psci_common.c > -+++ b/lib/psci/psci_common.c > -@@ -188,21 +188,17 @@ static unsigned int get_power_on_target_pwrlvl(void) > - /****************************************************************************** > - * Helper function to update the requested local power state array. This array > - * does not store the requested state for the CPU power level. Hence an > -- * assertion is added to prevent us from accessing the wrong index. > -+ * assertion is added to prevent us from accessing the CPU power level. > - *****************************************************************************/ > - static void psci_set_req_local_pwr_state(unsigned int pwrlvl, > - unsigned int cpu_idx, > - plat_local_state_t req_pwr_state) > - { > -- /* > -- * This should never happen, we have this here to avoid > -- * "array subscript is above array bounds" errors in GCC. > -- */ > - assert(pwrlvl > PSCI_CPU_PWR_LVL); > --#pragma GCC diagnostic push > --#pragma GCC diagnostic ignored "-Warray-bounds" > -- psci_req_local_pwr_states[pwrlvl - 1][cpu_idx] = req_pwr_state; > --#pragma GCC diagnostic pop > -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && > -+ (cpu_idx < PLATFORM_CORE_COUNT)) { > -+ psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx] = req_pwr_state; > -+ } > - } > - > - /****************************************************************************** > -@@ -228,7 +224,11 @@ static plat_local_state_t *psci_get_req_local_pwr_states(unsigned int pwrlvl, > - { > - assert(pwrlvl > PSCI_CPU_PWR_LVL); > - > -- return &psci_req_local_pwr_states[pwrlvl - 1][cpu_idx]; > -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && > -+ (cpu_idx < PLATFORM_CORE_COUNT)) { > -+ return &psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx]; > -+ } else > -+ return NULL; > - } > - > - /* > --- > -2.34.0 > - > diff --git a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch b/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch > deleted file mode 100644 > index 4d85e1bb12..0000000000 > --- a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch > +++ /dev/null > @@ -1,52 +0,0 @@ > -From e5d72ed8339eb05285448aad3c89d21e4d18fd29 Mon Sep 17 00:00:00 2001 > -From: Luca Ceresoli > -Date: Mon, 26 Feb 2018 09:40:34 +0100 > -Subject: [PATCH] arm64: zynqmp: zcu106: fix SPL MMC booting > - > -The U-Boot SPL generated with the current zcu106 defconfig cannot boot > -from MMC: > - > - [...] > - U-Boot SPL 2018.01 (Feb 21 2018 - 17:47:14) > - EL Level: EL3 > - Trying to boot from MMC1 > - sdhci_transfer_data: Error detected in status(0x408020)! > - spl_load_image_fat_os: error reading image u-boot.bin, err - -2 > - spl_load_image_fat: error reading image u-boot.img, err - -6 > - SPL: failed to boot from all boot devices > - ### ERROR ### Please RESET the board ### > - > -Fix by lowering the rpll value. The new value for the RPLL_CTRL > -register comes from the current psu_init_gpl.c from the HDF file at > -https://github.com/xilinx/hdf-examples/tree/01ad8ea5fd1989abf4ea5a072d019a16cb2bc546/zcu106-zynqmp > -(generated by Vivado v2017.4). > - > -RPLL and sdio1_ref clocks before and after this change: > - > - - Old values: RPLL 1.36 GHz, sdio1_ref 272 MHz > - - New values: RPLL 1.16 GHz, sdio1_ref 233 MHz > - > -Signed-off-by: Luca Ceresoli > -Cc: Michal Simek > -Upstream-status: accepted upstream in a different form > ---- > - > - board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c > -index 4d18abe000ca..e6fa477e53e7 100644 > ---- a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c > -+++ b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c > -@@ -10,7 +10,7 @@ > - static unsigned long psu_pll_init_data(void) > - { > - psu_mask_write(0xFF5E0034, 0xFE7FEDEFU, 0x7E4E2C62U); > -- psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00013C00U); > -+ psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00014600U); > - psu_mask_write(0xFF5E0030, 0x00000008U, 0x00000008U); > - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000001U); > - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000000U); > --- > -2.7.4 > - > diff --git a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch b/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch > deleted file mode 100644 > index 487fff6812..0000000000 > --- a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch > +++ /dev/null > @@ -1,114 +0,0 @@ > -From 5e3cac50cc981e01d9072241035a8d4162560c71 Mon Sep 17 00:00:00 2001 > -From: Luca Ceresoli > -Date: Mon, 12 Mar 2018 17:18:38 +0100 > -Subject: [PATCH] arm64: zynqmp: Enable booting to ATF > - > -U-Boot is now able to boot to ARM Trusted Firmware (ATF). The boot > -flow is SPL(EL3) loads ATF and full u-boot and jump to ATF(EL3) which > -pass control to full u-boot(EL2). This has been tested on zcu106, so > -enable it in this defconfig. > - > -To generate an image that triggers this booting flow, you need to pass > -'-O arm-trusted-firmware' to mkimage. > - > -Signed-off-by: Luca Ceresoli > -Signed-off-by: Michal Simek > -Backported from upstream: http://git.denx.de/?p=u-boot.git;a=commit;h=5e3cac50cc981e01d9072241035a8d4162560c71 > ---- > - > - configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 + > - configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 + > - configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 + > - configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 + > - configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 1 + > - configs/xilinx_zynqmp_zcu102_revA_defconfig | 1 + > - configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 + > - 7 files changed, 7 insertions(+) > - > -diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig > -index c5bfa2b12638..488c72258b0e 100644 > ---- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig > -+++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig > -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_FASTBOOT=y > - CONFIG_FASTBOOT_FLASH=y > -diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig > -index f86dce403a42..5d501eec0edd 100644 > ---- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig > -+++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig > -@@ -20,6 +20,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_FASTBOOT=y > - CONFIG_FASTBOOT_FLASH=y > -diff --git a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig > -index 6e947cf56827..6f7eaebd7676 100644 > ---- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig > -+++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig > -@@ -16,6 +16,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_CMD_MEMTEST=y > - CONFIG_SYS_ALT_MEMTEST=y > -diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig > -index 1c934858c61c..7a3806cba4b5 100644 > ---- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig > -+++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig > -@@ -17,6 +17,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_CMD_MEMTEST=y > - CONFIG_SYS_ALT_MEMTEST=y > -diff --git a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig > -index e13c7c56f310..e4408f182ca0 100644 > ---- a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig > -+++ b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig > -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_FASTBOOT=y > - CONFIG_FASTBOOT_FLASH=y > -diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig b/configs/xilinx_zynqmp_zcu102_revA_defconfig > -index 5b2cd495ee85..b52f6789fd4b 100644 > ---- a/configs/xilinx_zynqmp_zcu102_revA_defconfig > -+++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig > -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_FASTBOOT=y > - CONFIG_FASTBOOT_FLASH=y > -diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig > -index e6530fbfe7ff..80592554f682 100644 > ---- a/configs/xilinx_zynqmp_zcu102_revB_defconfig > -+++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig > -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_FASTBOOT=y > - CONFIG_FASTBOOT_FLASH=y > --- > -2.7.4 > - > diff --git a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch b/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch > deleted file mode 100644 > index 95ab7b3b75..0000000000 > --- a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch > +++ /dev/null > @@ -1,68 +0,0 @@ > -From c7df098a71e05dc81cee818747759e8060b59626 Mon Sep 17 00:00:00 2001 > -From: Luca Ceresoli > -Date: Mon, 4 Jun 2018 12:21:01 +0200 > -Subject: [PATCH] arm64: zynqmp: accept an absolute path for PMUFW_INIT_FILE > - > -The value of PMUFW_INIT_FILE is prefixed with "$(srctree)/", thus > -forcing it to be a relative path inside the U-Boot source tree. Since > -the PMUFW is a binary file generated outside of U-Boot, the PMUFW > -binary must be copied inside the U-Boot source tree before the > -build. > - > -This generates a few problems: > - > - * if the source tree is shared among different out-of-tree builds, > - they will pollute (and potentially corrupt) each other > - * the source tree cannot be read-only > - * any buildsystem must add a command to copy the PMUFW binary > - * putting an externally-generated binary in the source tree is ugly > - as hell > - > -Avoid these problems by accepting an absolute path for > -PMUFW_INIT_FILE. This would be as simple as removing the "$(srctree)/" > -prefix, but in order to keep backward compatibility we rather use the > -shell and readlink to get the absolute path even when starting from a > -relative path. > - > -Since 'readlink -f' produces an empty string if the file does not > -exist, we also add a check to ensure the file configured in > -PMUFW_INIT_FILE exists. Otherwise the build would exit successfully, > -but produce a boot.bin without PMUFW as if PMUFW_INIT_FILE were empty. > - > -Tested in the 12 possible combinations of: > - - PMUFW_INIT_FILE empty, relative, absolute, non-existing > - - building in-tree, in subdir, in other directory > - > -Signed-off-by: Luca Ceresoli > -Cc: Michal Simek > -Cc: Simon Glass > -Cc: Emmanuel Vadot > -Signed-off-by: Michal Simek > -Backported from upstream: https://git.denx.de/?p=u-boot.git;a=commit;h=c7df098a71e05dc81cee818747759e8060b59626 > ---- > - scripts/Makefile.spl | 8 +++++++- > - 1 file changed, 7 insertions(+), 1 deletion(-) > - > -diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl > -index ef018b5b4056..252f13826d4c 100644 > ---- a/scripts/Makefile.spl > -+++ b/scripts/Makefile.spl > -@@ -167,8 +167,14 @@ ifdef CONFIG_ARCH_ZYNQ > - MKIMAGEFLAGS_boot.bin = -T zynqimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) > - endif > - ifdef CONFIG_ARCH_ZYNQMP > -+ifneq ($(CONFIG_PMUFW_INIT_FILE),"") > -+spl/boot.bin: zynqmp-check-pmufw > -+zynqmp-check-pmufw: FORCE > -+ ( cd $(srctree) && test -r $(CONFIG_PMUFW_INIT_FILE) ) \ > -+ || ( echo "Cannot read $(CONFIG_PMUFW_INIT_FILE)" && false ) > -+endif > - MKIMAGEFLAGS_boot.bin = -T zynqmpimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) \ > -- -n $(srctree)/$(CONFIG_PMUFW_INIT_FILE) > -+ -n "$(shell cd $(srctree); readlink -f $(CONFIG_PMUFW_INIT_FILE))" > - endif > - > - spl/boot.bin: $(obj)/u-boot-spl.bin FORCE > --- > -2.7.4 > - > diff --git a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch b/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch > deleted file mode 100644 > index b32e162780..0000000000 > --- a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch > +++ /dev/null > @@ -1,175 +0,0 @@ > -From 4c9d54ab5a41d65000c8d249b6fb1b76056f1812 Mon Sep 17 00:00:00 2001 > -From: Luca Ceresoli > -Date: Wed, 20 Jun 2018 12:11:50 +0200 > -Subject: [PATCH] arm/arm64: zynq/zynqmp: pass the PS init file as a kconfig > - variable > - > -U-Boot needs to link ps7_init_gpl.c on Zynq or psu_init_gpl.c on > -ZynqMP (PS init for short). The current logic to locate this file for > -both platforms is: > - > - 1. if a board-specific file exists in > - board/xilinx/zynq[mp]/$(CONFIG_DEFAULT_DEVICE_TREE)/ps?_init_gpl.c > - then use it > - 2. otherwise use board/xilinx/zynq/ps?_init_gpl.c > - > -In the latter case the file does not exist in the U-Boot sources and > -must be copied in the source tree from the outside before starting the > -build. This is typical when it is generated from Xilinx tools while > -developing a custom hardware. However making sure that a > -board-specific file is _not_ found (and used) requires some trickery > -such as removing or overwriting all PS init files (e.g.: the current > -meta-xilinx yocto layer [0]). > - > -This generates a few problems: > - > - * if the source tree is shared among different out-of-tree builds, > - they will pollute (and potentially corrupt) each other > - * the source tree cannot be read-only > - * any buildsystem must add a command to copy the PS init file binary > - * overwriting or deleting files in the source tree is ugly as hell > - > -Simplify usage by allowing to pass the path to the desired PS init > -file in kconfig variable XILINX_PS_INIT_FILE. It can be an absolute > -path or relative to $(srctree). If the variable is set, the > -user-specified file will always be used without being copied > -around. If the the variable is left empty, for backward compatibility > -fall back to the old behaviour. > - > -Since the issue is the same for Zynq and ZynqMP, add one kconfig > -variable in a common place and use it for both. > - > -Also use the new kconfig help text to document all the ways to give > -U-Boot the PS init file. > - > -Build-tested with all combinations of: > - - platform: zynq or zynqmp > - - PS init file: from XILINX_PS_INIT_FILE (absolute, relative path, > - non-existing), in-tree board-specific, in board/xilinx/zynq[mp]/ > - - building in-tree, in subdir, in other directory > - > -[0] https://github.com/Xilinx/meta-xilinx/blob/b2f74cc7fe5c4881589d5e440a17cb51fc66a7ab/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init.inc#L9 > - > -Signed-off-by: Luca Ceresoli > -Cc: Albert Aribaud > -Cc: Michal Simek > -Cc: Nathan Rossi > -Backported from upstream: https://git.denx.de/?p=u-boot.git;a=commit;h=6da4f67ad09cd8b311d77b2b04e557b7ef65b56c > ---- > - arch/arm/Kconfig | 1 + > - board/xilinx/Kconfig | 41 +++++++++++++++++++++++++++++++++++++++++ > - board/xilinx/zynq/Makefile | 10 +++++++++- > - board/xilinx/zynqmp/Makefile | 10 +++++++++- > - 4 files changed, 60 insertions(+), 2 deletions(-) > - create mode 100644 board/xilinx/Kconfig > - > -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig > -index 22234cde2ab6..e04979d0ef7e 100644 > ---- a/arch/arm/Kconfig > -+++ b/arch/arm/Kconfig > -@@ -1293,4 +1293,5 @@ source "board/technologic/ts4600/Kconfig" > - source "board/vscom/baltos/Kconfig" > - source "board/woodburn/Kconfig" > - source "board/work-microwave/work_92105/Kconfig" > -+source "board/xilinx/Kconfig" > - source "board/zipitz2/Kconfig" > - > - source "arch/arm/Kconfig.debug" > -diff --git a/board/xilinx/Kconfig b/board/xilinx/Kconfig > -new file mode 100644 > -index 000000000000..aa3fa061edef > ---- /dev/null > -+++ b/board/xilinx/Kconfig > -@@ -0,0 +1,41 @@ > -+# Copyright (c) 2018, Luca Ceresoli > -+# > -+# SPDX-License-Identifier: GPL-2.0 > -+ > -+if ARCH_ZYNQ || ARCH_ZYNQMP > -+ > -+config XILINX_PS_INIT_FILE > -+ string "Zynq/ZynqMP PS init file(s) location" > -+ help > -+ On Zynq and ZynqMP U-Boot SPL (or U-Boot proper if > -+ ZYNQMP_PSU_INIT_ENABLED is set) is responsible for some > -+ basic initializations, such as enabling peripherals and > -+ configuring pinmuxes. The PS init file (called > -+ psu_init_gpl.c on ZynqMP, ps7_init_gpl.c for Zynq-7000) > -+ contains the code for such initializations. > -+ > -+ U-Boot contains PS init files for some boards, but each of > -+ them describes only one specific configuration. Users of a > -+ different board, or needing a different configuration, can > -+ generate custom files using the Xilinx development tools. > -+ > -+ There are three ways to give a PS init file to U-Boot: > -+ > -+ 1. Set this variable to the path, either relative to the > -+ source tree or absolute, where the psu_init_gpl.c or > -+ ps7_init_gpl.c file is located. U-Boot will build this > -+ file. > -+ > -+ 2. If you leave an empty string here, U-Boot will use > -+ board/xilinx/zynq/$(CONFIG_DEFAULT_DEVICE_TREE)/ps7_init_gpl.c > -+ for Zynq-7000, or > -+ board/xilinx/zynqmp/$(CONFIG_DEFAULT_DEVICE_TREE)/psu_init_gpl.c > -+ for ZynqMP. > -+ > -+ 3. If the above file does not exist, U-Boot will use > -+ board/xilinx/zynq/ps7_init_gpl.c for Zynq-7000, or > -+ board/xilinx/zynqmp/psu_init_gpl.c for ZynqMP. This file > -+ is not provided by U-Boot, you have to copy it there > -+ before the build. > -+ > -+endif > -diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile > -index 5a76a26720cd..03ad5f0532ee 100644 > ---- a/board/xilinx/zynq/Makefile > -+++ b/board/xilinx/zynq/Makefile > -@@ -5,10 +5,18 @@ > - > - obj-y := board.o > - > --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) > -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") > -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE)) > -+init-objs := ps_init_gpl.o > -+spl/board/xilinx/zynq/ps_init_gpl.o board/xilinx/zynq/ps_init_gpl.o: $(PS_INIT_FILE) > -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ > -+endif > - > -+ifeq ($(init-objs),) > -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) > - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/ps7_init_gpl.c),\ > - $(hw-platform-y)/ps7_init_gpl.o) > -+endif > - > - ifeq ($(init-objs),) > - ifneq ($(wildcard $(srctree)/$(src)/ps7_init_gpl.c),) > -diff --git a/board/xilinx/zynqmp/Makefile b/board/xilinx/zynqmp/Makefile > -index 05ccd25dcef3..960b81fc5853 100644 > ---- a/board/xilinx/zynqmp/Makefile > -+++ b/board/xilinx/zynqmp/Makefile > -@@ -5,10 +5,18 @@ > - > - obj-y := zynqmp.o > - > --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) > -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") > -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE)) > -+init-objs := ps_init_gpl.o > -+spl/board/xilinx/zynqmp/ps_init_gpl.o board/xilinx/zynqmp/ps_init_gpl.o: $(PS_INIT_FILE) > -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ > -+endif > - > -+ifeq ($(init-objs),) > -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) > - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/psu_init_gpl.c),\ > - $(hw-platform-y)/psu_init_gpl.o) > -+endif > - > - ifeq ($(init-objs),) > - ifneq ($(wildcard $(srctree)/$(src)/psu_init_gpl.c),) > --- > -2.7.4 > - > diff --git a/board/zynqmp/pm_cfg_obj.c b/board/zynqmp/pm_cfg_obj.c > new file mode 100644 > index 0000000000..7566b3236a > --- /dev/null > +++ b/board/zynqmp/pm_cfg_obj.c > @@ -0,0 +1,614 @@ > +/****************************************************************************** > +* Copyright (c) 2017 - 2020 Xilinx, Inc. All rights reserved. > +* SPDX-License-Identifier: MIT > +******************************************************************************/ > + > + > +#include "xil_types.h" > +#include "pm_defs.h" > + > +#define PM_CONFIG_MASTER_SECTION_ID 0x101U > +#define PM_CONFIG_SLAVE_SECTION_ID 0x102U > +#define PM_CONFIG_PREALLOC_SECTION_ID 0x103U > +#define PM_CONFIG_POWER_SECTION_ID 0x104U > +#define PM_CONFIG_RESET_SECTION_ID 0x105U > +#define PM_CONFIG_SHUTDOWN_SECTION_ID 0x106U > +#define PM_CONFIG_SET_CONFIG_SECTION_ID 0x107U > +#define PM_CONFIG_GPO_SECTION_ID 0x108U > + > +#define PM_SLAVE_FLAG_IS_SHAREABLE 0x1U > +#define PM_MASTER_USING_SLAVE_MASK 0x2U > + > +#define PM_CONFIG_GPO1_MIO_PIN_34_MAP (1U << 10U) > +#define PM_CONFIG_GPO1_MIO_PIN_35_MAP (1U << 11U) > +#define PM_CONFIG_GPO1_MIO_PIN_36_MAP (1U << 12U) > +#define PM_CONFIG_GPO1_MIO_PIN_37_MAP (1U << 13U) > + > +#define PM_CONFIG_GPO1_BIT_2_MASK (1U << 2U) > +#define PM_CONFIG_GPO1_BIT_3_MASK (1U << 3U) > +#define PM_CONFIG_GPO1_BIT_4_MASK (1U << 4U) > +#define PM_CONFIG_GPO1_BIT_5_MASK (1U << 5U) > + > +#define SUSPEND_TIMEOUT 0xFFFFFFFFU > + > + > +#define PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK 0x00000001 > +#define PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK 0x00000100 > +#define PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK 0x00000200 > + > + > + > +#if defined (__ICCARM__) > +#pragma language=save > +#pragma language=extended > +#endif > +#if defined (__GNUC__) > + const u32 XPm_ConfigObject[] __attribute__((used, section(".sys_cfg_data"))) = > +#elif defined (__ICCARM__) > +#pragma location = ".sys_cfg_data" > +__root const u32 XPm_ConfigObject[] = > +#endif > +{ > + /**********************************************************************/ > + /* HEADER */ > + 1, /* Number of remaining words in the header */ > + 8, /* Number of sections included in config object */ > + /**********************************************************************/ > + /* MASTER SECTION */ > + PM_CONFIG_MASTER_SECTION_ID, /* Master SectionID */ > + 3U, /* No. of Masters*/ > + > + NODE_APU, /* Master Node ID */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask of this master */ > + SUSPEND_TIMEOUT, /* Suspend timeout */ > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ > + > + NODE_RPU_0, /* Master Node ID */ > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask of this master */ > + SUSPEND_TIMEOUT, /* Suspend timeout */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ > + > + NODE_RPU_1, /* Master Node ID */ > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask of this master */ > + SUSPEND_TIMEOUT, /* Suspend timeout */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Suspend permissions */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Wake permissions */ > + > + > + /**********************************************************************/ > + /* SLAVE SECTION */ > + > + > + PM_CONFIG_SLAVE_SECTION_ID, /* Section ID */ > + 49, /* Number of slaves */ > + > + NODE_OCM_BANK_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_OCM_BANK_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_OCM_BANK_2, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_OCM_BANK_3, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_TCM_0_A, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ > + > + NODE_TCM_0_B, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ > + > + NODE_TCM_1_A, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_TCM_1_B, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_L2, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_GPU_PP_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_GPU_PP_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_USB_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_USB_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_TTC_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_TTC_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_TTC_2, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_TTC_3, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_SATA, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_ETH_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_ETH_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_ETH_2, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_ETH_3, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_UART_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_UART_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_SPI_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_SPI_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_I2C_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_I2C_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_SD_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_SD_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_DP, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_GDMA, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_ADMA, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_NAND, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_QSPI, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_GPIO, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_CAN_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_CAN_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_EXTERN, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_DDR, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_IPI_APU, > + 0U, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask */ > + > + NODE_IPI_RPU_0, > + 0U, > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ > + > + NODE_IPI_RPU_1, > + 0U, > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_GPU, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_PCIE, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_PCAP, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_RTC, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_VCU, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_PL, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + > + /**********************************************************************/ > + /* PREALLOC SECTION */ > + > + PM_CONFIG_PREALLOC_SECTION_ID, /* Preallaoc SectionID */ > + 3U, /* No. of Masters*/ > + > +/* Prealloc for psu_cortexa53_0 */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, > + 12, > + NODE_DDR, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_L2, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_0, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_2, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_3, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_I2C_0, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_I2C_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_SD_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_QSPI, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_PL, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_IPI_APU, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + > + /* Prealloc for psu_cortexr5_0 */ > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, > + 14, > + NODE_TCM_0_A, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_TCM_0_B, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_DDR, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_0, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_2, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_3, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_I2C_0, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_I2C_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_SD_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_QSPI, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_PL, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_ADMA, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_IPI_RPU_0, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + > + /* Prealloc for psu_cortexr5_1 */ > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + 3, > + NODE_TCM_1_A, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_TCM_1_B, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_IPI_RPU_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + > + /**********************************************************************/ > + /* POWER SECTION */ > + > + PM_CONFIG_POWER_SECTION_ID, /* Power Section ID */ > + 4U, /* Number of power nodes */ > + > + NODE_APU, /* Power node ID */ > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ > + > + NODE_RPU, /* Power node ID */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ > + > + NODE_FPD, /* Power node ID */ > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ > + > + NODE_PLD, /* Power node ID */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ > + > + > + /**********************************************************************/ > + /* RESET SECTION */ > + > + PM_CONFIG_RESET_SECTION_ID, /* Reset Section ID */ > + 120U, /* Number of resets */ > + > + XILPM_RESET_PCIE_CFG, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_PCIE_BRIDGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_PCIE_CTRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_DP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SWDT_CRF, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_AFI_FM5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_AFI_FM4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_AFI_FM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_AFI_FM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_AFI_FM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_AFI_FM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GDMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPU_PP1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPU_PP0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPU, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SATA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU3_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU2_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU1_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU0_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_APU_L2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_DDR, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_APM_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SOFT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GEM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GEM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GEM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GEM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_QSPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_UART0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_UART1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SPI0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SPI1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SDIO0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SDIO1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_CAN0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_CAN1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_I2C0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_I2C1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_TTC0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_TTC1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_TTC2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_TTC3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SWDT_CRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_NAND, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ADMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPIO, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_IOU_CC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_TIMESTAMP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPU_R50, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPU_R51, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPU_AMBA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_OCM, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPU_PGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_USB0_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_USB1_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_USB0_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_USB1_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_USB0_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_USB1_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_IPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_APM_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RTC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SYSMON, 0, > + XILPM_RESET_AFI_FM6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_LPD_SWDT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_FPD, PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, > + XILPM_RESET_RPU_DBG1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPU_DBG0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_DBG_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_DBG_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_APLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_DPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_VPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_IOPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_7, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_8, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_9, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_10, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_11, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_12, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_13, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_14, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_15, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_16, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_17, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_18, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_19, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_20, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_21, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_22, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_23, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_24, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_25, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_26, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_27, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_28, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_29, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_30, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_31, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPU_LS, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_PS_ONLY, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_PL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPIO5_EMIO_92, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPIO5_EMIO_93, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPIO5_EMIO_94, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPIO5_EMIO_95, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + > + /**********************************************************************/ > + /* SET CONFIG SECTION */ > + PM_CONFIG_SET_CONFIG_SECTION_ID, /* Section ID */ > + 0, /* Permissions to set config */ > + /**********************************************************************/ > + /* SHUTDOWN SECTION */ > + PM_CONFIG_SHUTDOWN_SECTION_ID, /* Section ID */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* System Shutdown/Restart Permission */ > + > + /**********************************************************************/ > + /* GPO SECTION */ > + PM_CONFIG_GPO_SECTION_ID, /* GPO Section ID */ > + PM_CONFIG_GPO1_BIT_2_MASK | > + PM_CONFIG_GPO1_MIO_PIN_34_MAP | > + PM_CONFIG_GPO1_MIO_PIN_35_MAP | > + PM_CONFIG_GPO1_MIO_PIN_36_MAP | > + PM_CONFIG_GPO1_MIO_PIN_37_MAP | > + 0, /* State of GPO pins */ > +}; > +#if defined (__ICCARM__) > +#pragma language=restore > +#endif > diff --git a/board/zynqmp/post-build.sh b/board/zynqmp/post-build.sh > new file mode 100755 > index 0000000000..9fd8bbf2c8 > --- /dev/null > +++ b/board/zynqmp/post-build.sh > @@ -0,0 +1,8 @@ > +#!/bin/sh > + > +# genimage will need to find the extlinux.conf > +# in the binaries directory > + > +BOARD_DIR="$(dirname $0)" > + > +install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux.conf > diff --git a/board/zynqmp/post-image.sh b/board/zynqmp/post-image.sh > index b2b99fed01..ed6dbe188c 100755 > --- a/board/zynqmp/post-image.sh > +++ b/board/zynqmp/post-image.sh > @@ -10,4 +10,6 @@ FIRST_DT=$(sed -nr \ > > [ -z "${FIRST_DT}" ] || ln -fs ${FIRST_DT}.dtb ${BINARIES_DIR}/system.dtb > > -support/scripts/genimage.sh -c board/zynqmp/genimage.cfg > +BOARD_DIR="$(dirname $0)" > + > +support/scripts/genimage.sh -c $BOARD_DIR/genimage.cfg > diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig > index bee7c1daf7..2026f60bd1 100644 > --- a/configs/zynqmp_zcu106_defconfig > +++ b/configs/zynqmp_zcu106_defconfig > @@ -1,34 +1,39 @@ > BR2_aarch64=y > -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_GIT=y > BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" > -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.15" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > # BR2_TARGET_ROOTFS_TAR is not set > BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.6" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" > -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7" > -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA" > +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2022.01" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" > BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > BR2_TARGET_UBOOT_SPL=y > BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" > BR2_TARGET_UBOOT_ZYNQMP=y > -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/53fdb7b6c92860ceb0ec5fd14deee302f4a84269/bin/pmufw-zcu106-default-v2017.4.bin" > +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/v2021.2/bin/pmufw-v2021.2.bin" > +BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/pm_cfg_obj.c" > +BR2_TARGET_UBOOT_FORMAT_ITB=y > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > BR2_PACKAGE_HOST_DOSFSTOOLS=y > BR2_PACKAGE_HOST_GENIMAGE=y > BR2_PACKAGE_HOST_MTOOLS=y From nealf at xilinx.com Thu Feb 10 16:44:02 2022 From: nealf at xilinx.com (Neal Frager) Date: Thu, 10 Feb 2022 16:44:02 +0000 Subject: [Buildroot] [PATCH 1/2] configs/zynqmp_zcu106: Bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: References: <20220208071559.2862411-1-neal.frager@xilinx.com> <69efa9da-ae55-6795-8724-ed7105083924@benettiengineering.com> <32cc1c12-1496-7db9-5e32-1b99404a4fe3@benettiengineering.com> <690d8e1b-fb6d-7c36-b07f-4ed9ca61b768@lucaceresoli.net> <489a02df-4f2b-a46c-aa49-15c3c545f8f2@lucaceresoli.net> Message-ID: <1EC54279-220E-4043-AFBA-953D2CF5E54A@xilinx.com> Hi Giulio, Luca, > > Neal, can you reply about this ^^^. At least, are USB1, ETH0/1/2, both > SPIs, NAND, CAN0, VCU present on those 2 boards? I confirm that the pm_cfg_obj.c file provided is correct for the ZCU102 and ZCU106 boards. These boards use USB0 and ETH3 for these respective peripherals. The peripherals disabled are not connected on either board. To clarify things, I may send another patch with two separate pm_cfg_obj.c files including the board names in the file names. One thing that is different is that the ZCU106 comes with silicon that supports the VCU whereas the ZCU102 does not. So I could create a ZCU106 version of this file which enables the VCU. I think this would be a good example by having two different boards with different pm_cfg_obj.c files, so developers know they will need to modify this file for their custom hardware. Best regards, Neal Frager Xilinx From giulio.benetti at benettiengineering.com Thu Feb 10 16:44:52 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 10 Feb 2022 17:44:52 +0100 Subject: [Buildroot] [PATCH 1/1] board/arcturus/aarch64-ucls1012a: bump u-boot and kernel version In-Reply-To: <2920974c-149f-ea4c-9b79-9a1b862fce95@benettiengineering.com> References: <4b667326-5aca-538b-9b36-7f0d5a400e9f@arcturusnetworks.com> <2920974c-149f-ea4c-9b79-9a1b862fce95@benettiengineering.com> Message-ID: <05091af5-9095-1b40-29c5-b2480b859ae2@benettiengineering.com> Hi Oleksandr, On 08/02/22 19:25, Giulio Benetti wrote: > Hi Oleksandr, > > On 08/02/22 18:31, Oleksandr G Zhadan wrote: >> Hi Giulio, >> >> Thanks for the quick response and your notes. >> >> New V2 patch file attached. The patches are based on today's `git clone >> https://git.buildroot.net/buildroot`. > > good > >> Patches created with the options you suggested: `git format-patch -M -s >> -o . -1` > > Ok, but you also need the flag -v2, so this is the command: > # git format-patch -M -s -o . -1 -v2 > > And then you need to add what's changed after the 3 dashes. Check this > patch as an example: > https://lists.buildroot.org/pipermail/buildroot/2022-February/635926.html > > Take care of adding 3 dashes and listing: > --- > V1->V2: > * changed this > * changed that > --- > >> Unfortunately I can't send it now with 'git send-email --to "buildroot >> " 0001-xxxx.patch`. If it doesn't work for you, >> we'll send it later. > > Yes, we need it sent like that for reviewing. > Anyway I've checked that the attached patch now applies correctly, so > you're on the right path! > > Best regards also, please register to patchwork: https://patchwork.ozlabs.org/project/buildroot/list/ and tag your previous patch as superseded: https://patchwork.ozlabs.org/project/buildroot/patch/4b667326-5aca-538b-9b36-7f0d5a400e9f at arcturusnetworks.com/ and also the V2 since you've been requested for Changes, so you can tag as Change Request now and once sent V3 as superseded. Thank you! Best regards -- Giulio Benetti Benetti Engineering sas From giulio.benetti at benettiengineering.com Thu Feb 10 16:54:25 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 10 Feb 2022 17:54:25 +0100 Subject: [Buildroot] [PATCH 1/2] configs/zynqmp_zcu106: Bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <1EC54279-220E-4043-AFBA-953D2CF5E54A@xilinx.com> References: <20220208071559.2862411-1-neal.frager@xilinx.com> <69efa9da-ae55-6795-8724-ed7105083924@benettiengineering.com> <32cc1c12-1496-7db9-5e32-1b99404a4fe3@benettiengineering.com> <690d8e1b-fb6d-7c36-b07f-4ed9ca61b768@lucaceresoli.net> <489a02df-4f2b-a46c-aa49-15c3c545f8f2@lucaceresoli.net> <1EC54279-220E-4043-AFBA-953D2CF5E54A@xilinx.com> Message-ID: <099dd7ff-c841-f7b5-88b7-f036ebc02a66@benettiengineering.com> Hi Neal, On 10/02/22 17:44, Neal Frager wrote: > Hi Giulio, Luca, > >> >> Neal, can you reply about this ^^^. At least, are USB1, ETH0/1/2, both >> SPIs, NAND, CAN0, VCU present on those 2 boards? > > I confirm that the pm_cfg_obj.c file provided is correct for the ZCU102 and ZCU106 boards. These boards use USB0 and ETH3 for these respective peripherals. The peripherals disabled are not connected on either board. So I would keep the pm_cfg_obj.c as is, but so why .dts file disable peripherals that are not present? > To clarify things, I may send another patch with two separate pm_cfg_obj.c files including the board names in the file names. One thing that is different is that the ZCU106 comes with silicon that supports the VCU whereas the ZCU102 does not. So I could create a ZCU106 version of this file which enables the VCU. I would definitely do that, so 2 pm_cfg_obj.c for 2 FPGAs > I think this would be a good example by having two different boards with different pm_cfg_obj.c files, so developers know they will need to modify this file for their custom hardware. Exactly! PS: please wrap lines at 72 characters! :-) Thank you! Best regards -- Giulio Benetti Benetti Engineering sas From arnout at mind.be Thu Feb 10 17:15:11 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 10 Feb 2022 18:15:11 +0100 Subject: [Buildroot] [PATCH 000/107] Drop python 2.7 In-Reply-To: <20220209213312.GE2249818@scaer> References: <20220209165213.4498-1-peter@korsgaard.com> <20220209213312.GE2249818@scaer> Message-ID: <2cba2cd6-ca70-6336-f2fe-60649a0f1a0d@mind.be> On 09/02/2022 22:33, Yann E. MORIN wrote: > Peter ,All, > > On 2022-02-09 17:50 +0100, Peter Korsgaard spake thusly: >> Python 2.7 is EOL since April 2020 and almost all packages support >> python 3, so drop it before the 2022.02 release. >> >> It is a big series, but the changes are mainly mechanical in nature. >> >> There is still some cleanup to do, E.G. the python2 support in >> pkg-python and the host python-setuptools package - But this is IMHO >> the minimum changes before -rc1. >> >> Peter Korsgaard (107): > ... >> package/python: drop target package > ... >> package/python: drop host package > ... >> docs/manual: drop python2 references > > All 107 patches applied, thanks! > > I'll reply further to two of them, with ultra-minor nits. > > Pfew, 21st century, here we come at last! ;-) Thank you Peter and Yann for handling this! I did a bit of grepping for leftovers and found these: package/pkg-python.mk:# BR2_PACKAGE_PYTHON=y, or a host-package with neither package/pkg-python.mk:# BR2_PACKAGE_PYTHON3=y or BR2_PACKAGE_PYTHON=y. docs/manual/adding-packages-python.txt: * It is not necessary to add +python+ or +host-python+ in the package/gstreamer1/gst1-devtools/gst1-devtools.mk:GST1_DEVTOOLS_DEPENDENCIES += host-python python package/omniorb/omniorb.mk:# omniorb is not python3 friendly, so force the python interpreter package/omniorb/omniorb.mk:OMNIORB_CONF_OPTS = ac_cv_path_PYTHON=$(HOST_DIR)/bin/python2 package/omniorb/omniorb.mk:HOST_OMNIORB_CONF_OPTS = ac_cv_path_PYTHON=$(HOST_DIR)/bin/python2 package/pkg-python.mk:$(2)_DEPENDENCIES += $$(if $$(BR2_PACKAGE_PYTHON3),host-python3 python3,host-python python) package/pkg-python.mk:ifeq ($$($(2)_NEEDS_HOST_PYTHON),python2) package/pkg-python.mk:# setuptools for python2. package/pkg-python.mk:# In all other cases, we install setuptools for python2. Those other package/pkg-python.mk:else ifeq ($(4):$$($(2)_NEEDS_HOST_PYTHON),host:python2) package/pkg-python.mk:# We may want to specify the python interpreter to be used for building a package/pkg-python.mk:# - for target packages, we always use the default python interpreter (which package/python-pyrex/python-pyrex.mk:HOST_PYTHON_PYREX_NEEDS_HOST_PYTHON = python2 package/python-setuptools/python-setuptools.mk:HOST_PYTHON_SETUPTOOLS_NEEDS_HOST_PYTHON = python2 package/python-web2py/python-web2py.mk:PYTHON_WEB2PY_DEPENDENCIES = $(if $(BR2_PACKAGE_PYTHON3),host-python3 python3,host-python python) \ package/python3/python3.mk:# python version chosen for the target. package/python3/python3.mk:# Only install the python symlink in the host tree if python3 is enabled package/python3/python3.mk: ln -fs python3 $(HOST_DIR)/bin/python package/qt5/qt5webengine/qt5webengine.mk:# QtWebengine's build system uses python, but only supports python2. We work package/qt5/qt5webengine/qt5webengine.mk:# around this by forcing python2 early in the PATH, via a python->python2 package/qt5/qt5webengine/qt5webengine.mk: ln -sf $(HOST_DIR)/bin/python2 $(@D)/host-bin/python package/rust/rust.mk: echo 'python = "$(HOST_DIR)/bin/python$(HOST_RUST_PYTHON_VERSION)"'; \ The ones in gst1-devtools.mk and omniorb.mk look important, the rest is just cleanup. qt5webengine is also a bit worrisome... Also, some cleanups that I think are needed: - get rid of HOST_PYTHON_FOO_NEEDS_HOST_PYTHON - symlink $(HOST_DIR)/bin/python to python3, and get rid of the workarounds in e.g. nodejs Regards, Arnout From giulio.benetti at benettiengineering.com Thu Feb 10 17:26:31 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 10 Feb 2022 18:26:31 +0100 Subject: [Buildroot] Various questions for Buildroot contributing In-Reply-To: References: Message-ID: Hi Peter, I add ML in Cc, since these informations are too precious to not be shared, and I've changed Subject and removed some personal questions from Peter to me, On 10/02/22 07:38, Peter Thompson wrote: > Hi Giulio, > > Thanks so much for helping me with buildroot.??? I have a few nit-picky > items that I don't understand and if you have easy solutions, it would > be appreciated.?? Do not worry if you do not know. Sure, np. > > Question #1 > I am now registered on patchwork/buildroot under PeterThompson (instead > of Peter Thompson).???? Somehow PeterThompson was in .gitconfig and when > I correct it to Peter Thompson it removes the From: Peter Thompson in > the git-send message.? Is it possible I have it wrong in duplicate > .gitconfig?? Other suggestions? Mmh, yes, you defintely have problem in .gitconfig What you can do to fix this is updating Name in git with: # git config --global user.name "Peter Thompson" I understand it's a git problem because your SoB are with "PeterThompson". So once done it should be fine with patchwork, because it matches only by e-mail and not by name. > > Question #2 > Patchwork/Buildroot seems to have? only one incorrect patch for me. > [1/1] bump version to 2.0.18 > . > The others seem to have disappeared. Probably because some maintainer tagged them as superseded or rejected, please try to filter less by unchecking: State = Action Required and Archived = No That way you will see all yours. Of course you need to filter for Submitter(that is you). And you will see all your patches. > ? ? I am reluctant to mark the > patch as superseded until I have a better understanding of what is > happening. I think problem is solved with above instructions > Question #3 > When fixing Buildroot, I normally follow happenings on the mailing list. > ? I know others (eg Peter Korsgaard) are doing things in the background > to approve, Reviewers: that can be Maintainers or other people like me or Romain or someone else, even you! > then move my patch submission to a branch commit and then > test the build with the changes (Fabrice Fontaine). Yes, but what Fabrice and other people do is fixing bugs taken from autobuilders: http://autobuild.buildroot.net/ and send patches for them. What you mean instead is done by Maintainers that are the ones that can basically push commits into Buildroot's repository. > ? I do not want to > do anything in Patchwork to mess them up. You simply can't, because you can't touch other's patches status, only Maintainers and Romain as I know. > ? It seems everything is in > order for the next push which I assume is Mar 1. Nay, you need to fix what I've asked you and send a V2 patch, check what I've written below about commit log: https://patchwork.ozlabs.org/project/buildroot/patch/20220205181259.5831-1-peter.macleod.thompson at gmail.com/ > [Buildroot] [git commit] package/sdl2_ttf: bump version to 2.0.18 > /Peter > Korsgaard/ > > * [Buildroot] [PATCH 1/1] bump version to 2.0.18 > /Peter > Thompson / > * [Buildroot] [PATCH 1/1] bump version to 2.0.18 > /Yegor > Yefremov / > * [Buildroot] [PATCH 1/1] bump version to 2.0.18 > /Peter > Thompson / > * [Buildroot] [PATCH 1/1] bump version to 2.0.18 > /Giulio > Benetti/ > > * [Buildroot] [PATCH 1/1] package/sdl2_ttf: bump version to 2.0.18 > /Peter > Thompson / > * [Buildroot] [PATCH 1/1] package/sdl2_ttf: bump version to 2.0.18 > /Peter > Korsgaard / > * [Buildroot] [PATCH 1/1] package/sdl2_ttf: bump version to 2.0.18 > /PeterThompson > / > > > > > Question #4 > # [Buildroot] [PATCH 1/1] package/sdl2: bump version to 2.0.20 > /Arnout > Vandecappelle / > # > > When the license hash changes, please explain in the commit message why it > changed. I added: > > Copyright year updated in LICENSE.txt. > > > Applied to master, thanks. > > Regards, > Arnout > > Arnout added the above re changing the hash. Yes, because the package's LICENSE.txt has actually changed after bumping, so it's worth mention what changed in LICENSE.txt file because it could be that you have to update SDL2_LICENSE = Zlib to something else or it's simply good as it is, but need to mention it. >??? My reason for changing > the hash was different.... I thought the hash was a cross-check to make > sure the whole file was downloaded correctly. It is >?? Hence when you bump to a > new version - you had to re-do the hash. Yes >?? Peter K asked me the same > question and I answered differently? saying it was a needed cross check > for the download.?? ? Are we both correct? It should be like above patch requested by Arnout and Peter told he did it for you: https://patchwork.ozlabs.org/project/buildroot/patch/20220206055330.11218-1-peter.macleod.thompson at gmail.com/ resulting in: https://git.buildroot.net/buildroot/commit/?id=f4da031a77f200515bcc5b2e0fe665a7b4f2a780 ``` - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga ``` > Question #5 > After the commit (to a branch presumably) they (Fabrice Fontaine) found > a build error that I feel badly about and feel I should have caught. You won't be able to caught them all. But what you can do to be "more sure" is to issue: # ./utils/test-pkg -p sdl2_ttf -d ../test-sdl2_ttf -a With -a flash you build for a lot of architectures, while without you only build for 6. But don't mind, it's normal other bugs come out, that's why autobuilders are there always building. But anyway, if you are the maintainer you should fix the bug. And issuing test-pkg -a is something more, but it requires a lot of time too. So go for test-pkg -a for a while and when you feel comfortable use it without -a. If it gives you SKIPPED, it means you need a config fragment by passing a file with library depedency with -c flag. Like a mini-defconfig with only the dependency for sdl2_ttf to build. > # [Buildroot] [PATCH 1/3] package/sdl2_ttf: drop FREETYPE_CONFIG > /Fabrice > Fontaine / > [Buildroot] [PATCH 2/3] package/sdl2_ttf: disable builtin freetype2 > /Fabrice > Fontaine/ > /[Buildroot] [PATCH 3/3] package/sdl2_ttf: add harfbuzz optional > dependency > /Fabrice > Fontaine// > > My challenge is that I do not have a copy of the exact build they use to > catch the error and for me to try all the possible builds is a huge > job. Pointed above >?? I had this issue before when something in SDL2 broke and I could > not replicate the issue (ie it worked fine on my personal build). > Again, I was at a loss at how to help.? ? Is there an easy way to test > changes and replicate problems in buildroot? Sure there is! Check this out: http://autobuild.buildroot.net/ and download: http://git.buildroot.net/buildroot-test/plain/utils/br-reproduce-build with that script you can reproduce the exact problem. Also take care that someone else already fixed it in Patchwork. I always check the NOK and reproduce them with that script, pull the buildroot to latest master or branch where error occurs, fix it, create patch and git send-email. -- Giulio Benetti Benetti Engineering sas From marcus.hoffmann at othermo.de Thu Feb 10 17:31:38 2022 From: marcus.hoffmann at othermo.de (Marcus Hoffmann) Date: Thu, 10 Feb 2022 18:31:38 +0100 Subject: [Buildroot] [PATCH 000/107] Drop python 2.7 In-Reply-To: <2cba2cd6-ca70-6336-f2fe-60649a0f1a0d@mind.be> References: <20220209165213.4498-1-peter@korsgaard.com> <20220209213312.GE2249818@scaer> <2cba2cd6-ca70-6336-f2fe-60649a0f1a0d@mind.be> Message-ID: <9be8fa8f-44d8-6025-3161-dd1818d9c323@othermo.de> Hi all! On 10.02.22 18:15, Arnout Vandecappelle wrote: [...] > > > The ones in gst1-devtools.mk and omniorb.mk look important, the rest is > just cleanup. qt5webengine is also a bit worrisome... > > Also, some cleanups that I think are needed: > - get rid of HOST_PYTHON_FOO_NEEDS_HOST_PYTHON > - symlink $(HOST_DIR)/bin/python to python3, and get rid of the > workarounds in e.g. nodejs This last bit would actually supersede the patch I send yesterday :-) http://patchwork.ozlabs.org/project/buildroot/patch/20220209214305.314272-1-marcus.hoffmann at othermo.de/ > > > ?Regards, > ?Arnout Best, Marcus From marcus.hoffmann at othermo.de Thu Feb 10 17:37:54 2022 From: marcus.hoffmann at othermo.de (Marcus Hoffmann) Date: Thu, 10 Feb 2022 18:37:54 +0100 Subject: [Buildroot] [PATCH] package/rauc: bump to version 1.6 In-Reply-To: <20220209214326.21671-1-heiko.thiery@gmail.com> References: <20220209214326.21671-1-heiko.thiery@gmail.com> Message-ID: Hi! On 09.02.22 22:43, Heiko Thiery wrote: > For release notes see: https://github.com/rauc/rauc/releases/tag/v1.6 > > Signed-off-by: Heiko Thiery Builds and works fine on a raspberrypi CM4. Tested-by: Marcus Hoffmann From luca at lucaceresoli.net Thu Feb 10 17:38:49 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Thu, 10 Feb 2022 18:38:49 +0100 Subject: [Buildroot] [PATCH 1/2] configs/zynqmp_zcu106: Bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: References: <20220208071559.2862411-1-neal.frager@xilinx.com> <69efa9da-ae55-6795-8724-ed7105083924@benettiengineering.com> <32cc1c12-1496-7db9-5e32-1b99404a4fe3@benettiengineering.com> <690d8e1b-fb6d-7c36-b07f-4ed9ca61b768@lucaceresoli.net> <489a02df-4f2b-a46c-aa49-15c3c545f8f2@lucaceresoli.net> Message-ID: <261c3a21-23cb-4217-e396-a85dc605d4d1@lucaceresoli.net> Hi Giulio, Neal, On 10/02/22 17:31, Giulio Benetti wrote: > Hi Neal and Luca, > > On 10/02/22 16:46, Neal Frager wrote: >> Hi Luca, >> >>> Interesting, I'm curious how this works. The pm_cfg_obj.c at the URL >>> you provided, as well as in the patches you sent, has some peripherals >>> disabled: USB1, ETH0/1/2, both SPIs, NAND, CAN0, VCU and more. Do >>> current kernels implement enabling these at runtime, making >>> appropriate requests to PMUFW? This wasn't the case last time I >>> looked into that, it would be very interesting if it? has happened in >>> the meantime. > > Neal, can you reply about this ^^^. At least, are USB1, ETH0/1/2, both > SPIs, NAND, CAN0, VCU present on those 2 boards? > >>> Otherwise one would need to provide a per-configuration pmu config or >>> a "wildcard" config, but I'm not sure whether it would cover all >>> potential use cases. > > I agree. > >> Even though Buildroot has [almost] only defconfigs for well-known >> evaluation boards, it is really meant to be used by custom designs, >> thus we want to be able to use other configurations than those useful >> for Xilinx boards. > > No, it's not meant to be used for custom boards, the goal is having the > 2 BSP for the 2 boards and that's it. The ones who will need to create > custom BSP will ad new BSPs starting from your reference. So here again > what Luca pointed above about a wildcard config is true: we don't know > if it will really cover all cases. Either I didn't explain clearly or we completely disagree. :) What I mean is: the goal *of Buildroot* is to build the software to run embedded Linux systems. Any embedded Linux system, first and foremost the electronic products that many companies make, and that I call "custom designs". Development/evaluation boards are a small subset of the above, however Buildroot defconfigs tend to cover those boards because they are publicly available and commonly used by embedded developers. Of course I agree that the goal *of Neal's patches* is to support two specific evaluation boards. Back to the initial discussion topic, we need Buildroot to be able to contain a pm_cfg_obj.c for each "project" (project ~= defconfig). E.g. a company makes two zynqmp products, one having 2 USB ports and one having 0 USB ports: they'll need two pm_cfg_obj.c files accordingly and none of them will be equal to the file(s) provided by Neal's patches which enable 1 USB. I hope it is clearer now. > Since this is not the goal of Buildroot I would narrow things to deal > with the 2 actual boards peripherals only. > >> I took a closer look at the pm_cfg_obj.c, and I see what you mean.? >> What confused me is that Vivado does not generate this file when you >> create an xsa or hdf file for the hardware design like the psu_init.c >> files.? So I thought the file was always the same regardless of the >> hardware. >> >> Instead, users have two choices.? They can either use Vitis to >> generate a FSBL which will have a pm_cfg_obj.c file in it, or they can >> modify this example file manually.? The pm_cfg_obj.c that I have >> included with buildroot enables all of the peripherals that are >> enabled on the ZCU102 and ZCU106 boards, so I think it is fine for >> having an out of box example for our customers. > > I agree that here we need to deal with those 2 specific boards. > >> Perhaps a good solution would be adding a readme file for the >> pm_cfg_obj.c alerting developers that they will need to modify this >> file for building designs for custom hardware. > > This is implicit I agree this is implicit, meaning it is not the duty of Buildroot to explain people how Xilinx tools work. Or at least Buildroot should at most give a pointer on what the users should do and leave them their homework. Anyway the help for BR2_TARGET_UBOOT_ZYNQMP_PM_CFG already give enough hints IMO. >> In any case, we need to have an example pm_cfg_obj.c file in order for >> the buildroot examples to build and run.? And I think the pm_cfg_obj.c >> is only one of many things developers will need to modify when moving >> from an evaluation board to their own custom hardware. > > This is out of scope here. As patch names point you're bumping or adding > 2 specific boards, so I wouldn't worry about eventual custom boards. > > If someone will deal with it I think they will also deal with Vivado to > create specific config files. At least that is what I would do while > approaching these 2 FPGAs. Exactly. -- Luca From luca at lucaceresoli.net Thu Feb 10 17:42:05 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Thu, 10 Feb 2022 18:42:05 +0100 Subject: [Buildroot] [PATCH 1/2] configs/zynqmp_zcu106: Bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <1EC54279-220E-4043-AFBA-953D2CF5E54A@xilinx.com> References: <20220208071559.2862411-1-neal.frager@xilinx.com> <69efa9da-ae55-6795-8724-ed7105083924@benettiengineering.com> <32cc1c12-1496-7db9-5e32-1b99404a4fe3@benettiengineering.com> <690d8e1b-fb6d-7c36-b07f-4ed9ca61b768@lucaceresoli.net> <489a02df-4f2b-a46c-aa49-15c3c545f8f2@lucaceresoli.net> <1EC54279-220E-4043-AFBA-953D2CF5E54A@xilinx.com> Message-ID: <1f0c37e0-6d9e-97d7-0421-58228d52405b@lucaceresoli.net> Hi Neal, On 10/02/22 17:44, Neal Frager wrote: > Hi Giulio, Luca, > >> >> Neal, can you reply about this ^^^. At least, are USB1, ETH0/1/2, both >> SPIs, NAND, CAN0, VCU present on those 2 boards? > > I confirm that the pm_cfg_obj.c file provided is correct for the ZCU102 and ZCU106 boards. These boards use USB0 and ETH3 for these respective peripherals. The peripherals disabled are not connected on either board. > > To clarify things, I may send another patch with two separate pm_cfg_obj.c files including the board names in the file names. OK, but it's better to use a subdirectory per board and leave the filename as is, as per board/zynqmp/zcu102/pm_cfg_obj.c board/zynqmp/zcu106/pm_cfg_obj.c > One thing that is different is that the ZCU106 comes with silicon that supports the VCU whereas the ZCU102 does not. So I could create a ZCU106 version of this file which enables the VCU. Good point. > I think this would be a good example by having two different boards with different pm_cfg_obj.c files, so developers know they will need to modify this file for their custom hardware. Yes. -- Luca From bernd.kuhls at t-online.de Thu Feb 10 17:46:24 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Thu, 10 Feb 2022 18:46:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi-inputstream-adaptive: bump version to 19.0.3-Matrix Message-ID: <20220210174624.288510-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 c7a081f887..74aefe2138 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 f2285e77043a0c9160d1ab11dd5943cc584be17a2f7920be3002751ff697ec7b kodi-inputstream-adaptive-19.0.2-Matrix.tar.gz +sha256 1549422ac1386929dfc1a479898d6311440d1f8bfd1bc94e1fe5da9cc2db805c kodi-inputstream-adaptive-19.0.3-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 f632a42adb..83ac897037 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.2-Matrix +KODI_INPUTSTREAM_ADAPTIVE_VERSION = 19.0.3-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 mdurrant at arcturusnetworks.com Thu Feb 10 17:47:39 2022 From: mdurrant at arcturusnetworks.com (Michael Durrant) Date: Thu, 10 Feb 2022 12:47:39 -0500 Subject: [Buildroot] [PATCH v3] board/arcturus/aarch64-ucls1012a: bump u-boot and kernel version Message-ID: <20220210174739.15866-1-mdurrant@arcturusnetworks.com> From: Oleksandr G Zhadan Signed-off-by: Oleksandr Zhadan Signed-off-by: Michael Durrant --- V1->V2: - Bump the kernel to "Linux version 5.4.137" - Bootloader version is still "U-Boot 2019.10" but new targets added. - Remove the /etc/init.d/S09modload script to load the pfe firmware module because now the pfe firmware module is loaded by the kernel - New compressed Image.gz is used V2->V3: - Moved SoB to top of patch - The use of Image.gz replace Image to force use of compression. - Our scripts use br2-ucls1012a.its in error ucls1012a.its was used in original readme. - Removing extra newline - The NXP Packet Forward Engine (PFE) firmware loader was the only file used in the overlay. As the PFE is now loaded directly by the kernel the BR2_ROOTFS_OVERLAY script has been removed. --- board/arcturus/aarch64-ucls1012a/post-build.sh | 2 -- board/arcturus/aarch64-ucls1012a/readme.txt | 5 +++-- .../rootfs_overlay/etc/init.d/S09modload | 14 -------------- configs/arcturus_ucls1012a_defconfig | 9 ++++----- 4 files changed, 7 insertions(+), 23 deletions(-) delete mode 100755 board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload diff --git a/board/arcturus/aarch64-ucls1012a/post-build.sh b/board/arcturus/aarch64-ucls1012a/post-build.sh index f8ba78095f..ca3862988d 100755 --- a/board/arcturus/aarch64-ucls1012a/post-build.sh +++ b/board/arcturus/aarch64-ucls1012a/post-build.sh @@ -1,5 +1,3 @@ #!/bin/sh -mkdir -p ${TARGET_DIR}/lib/firmware -cp -f ${BUILD_DIR}/linux-custom/firmware/ppfe/* ${TARGET_DIR}/lib/firmware/ cp -f ${BUILD_DIR}/linux-custom/br2-ucls1012a.its ${BINARIES_DIR}/ diff --git a/board/arcturus/aarch64-ucls1012a/readme.txt b/board/arcturus/aarch64-ucls1012a/readme.txt index 483d5e9aef..cb91716b34 100644 --- a/board/arcturus/aarch64-ucls1012a/readme.txt +++ b/board/arcturus/aarch64-ucls1012a/readme.txt @@ -23,14 +23,15 @@ Result of the build After building, you should obtain this tree: output/images/ + +-- Image.gz +-- arc-ucls1012a.dtb - +-- Image + +-- br2-ucls1012a.its +-- part0-000000.itb +-- rootfs.cpio +-- rootfs.cpio.gz +-- rootfs.tar +-- u-boot.bin - +-- ucls1012a.its Flashing -------- diff --git a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload b/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload deleted file mode 100755 index c87ffda14f..0000000000 --- a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -# -case "$1" in - start) - modprobe pfe - ;; - stop) - ;; - restart|reload) - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac diff --git a/configs/arcturus_ucls1012a_defconfig b/configs/arcturus_ucls1012a_defconfig index fd33ebf1f6..2a9c1e0582 100644 --- a/configs/arcturus_ucls1012a_defconfig +++ b/configs/arcturus_ucls1012a_defconfig @@ -1,22 +1,21 @@ # Architecture BR2_aarch64=y -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # System settings BR2_TARGET_GENERIC_HOSTNAME="ucls1012a" BR2_TARGET_GENERIC_ISSUE="Welcome to uCLS1012A-SOM" BR2_SYSTEM_DHCP="eth0" -BR2_ROOTFS_OVERLAY="board/arcturus/aarch64-ucls1012a/rootfs_overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="board/arcturus/aarch64-ucls1012a/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/arcturus/aarch64-ucls1012a/post-image.sh" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-kernel,v.20.31)/linux-v.20.31.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-kernel,v.22.06)/linux-v.22.06.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="ucls1012a" +BR2_LINUX_KERNEL_IMAGEGZ=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="arcturus/arc-ucls1012a" @@ -28,7 +27,7 @@ BR2_TARGET_ROOTFS_CPIO_GZIP=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-uboot,v.20.31)/uboot-v.20.31.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-uboot,v.22.06)/uboot-v.22.06.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="UCLS1012A_QSPI128" # Tools -- 2.26.2 From marcus.hoffmann at othermo.de Thu Feb 10 17:47:40 2022 From: marcus.hoffmann at othermo.de (Marcus Hoffmann) Date: Thu, 10 Feb 2022 18:47:40 +0100 Subject: [Buildroot] [PATCH] package/rauc: bump to version 1.6 In-Reply-To: References: <20220209214326.21671-1-heiko.thiery@gmail.com> Message-ID: On 10.02.22 18:37, Marcus Hoffmann wrote: > Hi! > > On 09.02.22 22:43, Heiko Thiery wrote: >> For release notes see: https://github.com/rauc/rauc/releases/tag/v1.6 >> >> Signed-off-by: Heiko Thiery > > Builds and works fine on a raspberrypi CM4. Rereading that, this sounds slightly off... built *for* raspberrypi cm4. > > Tested-by: Marcus Hoffmann > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From giulio.benetti at benettiengineering.com Thu Feb 10 18:21:16 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 10 Feb 2022 19:21:16 +0100 Subject: [Buildroot] [PATCH v3] board/arcturus/aarch64-ucls1012a: bump u-boot and kernel version In-Reply-To: <20220210174739.15866-1-mdurrant@arcturusnetworks.com> References: <20220210174739.15866-1-mdurrant@arcturusnetworks.com> Message-ID: <6450c1a7-6448-a6b4-78fb-a27d53b268a7@benettiengineering.com> Hi Michale, Oleksandr, On 10/02/22 18:47, Michael Durrant wrote: > From: Oleksandr G Zhadan Here we're missing the real commit log. I think you've added only to change log some stuff that should go here. Below you only need to point the changes between patches. But here there will be the commit log. So please list here what this patch changes and below only the changes between patches(that looks good actually). What about: ``` - Bump Linux to version 5.4.137 - Bump U-Boot to add new targets, version remains the same - Drop BR2_ROOTFS_OVERLAY and remove S09modload script because it was only used by PFE and now PFE is loaded directly by the kernel - Use Image.gz instead of Image to have a compressed kernel - Rename ucls1012a.its to br2-ucls1012a.its since post-build.sh and post-image.sh use different name. This fixes the actual bug that didn't allow to obtain part0-000000.itb file ``` > Signed-off-by: Oleksandr Zhadan > Signed-off-by: Michael Durrant > --- > V1->V2: > - Bump the kernel to "Linux version 5.4.137" > - Bootloader version is still "U-Boot 2019.10" but new targets added. Why do you need new targets? I mean, this defconfig build for only 1 target, isn't it? > - Remove the /etc/init.d/S09modload script to load the pfe firmware > module because now the pfe firmware module is loaded by the kernel > - New compressed Image.gz is used > V2->V3: > - Moved SoB to top of patch > - The use of Image.gz replace Image to force use of compression. > - Our scripts use br2-ucls1012a.its in error ucls1012a.its was used > in original readme. Ah, so actually this board doesn't work, right? > - Removing extra newline > - The NXP Packet Forward Engine (PFE) firmware loader was the only > file used in the overlay. As the PFE is now loaded directly by > the kernel the BR2_ROOTFS_OVERLAY script has been removed. So here on V4 you only need to write: V3->V4: - Improved commit log by listing all the changed as suggested by Giulio I also see that you have post-build.sh and post-image.sh, but you can move the content of post-build.sh into post-image.sh, or better, the content of post-image.sh back to post-build.sh. This because you don't actually create a final image(like image.img or something else) as I can see. For the rest it looks good to me. I wait for V4. PS: have you thought about also creating a final image by using genimage? That way you could flash the NOR using only 1 file. Does NXP QorIQ? LS1012A processor has some kind of tool to flash directly NOR? Thank you! Best regards -- Giulio Benetti Benetti Engineering sas > --- > board/arcturus/aarch64-ucls1012a/post-build.sh | 2 -- > board/arcturus/aarch64-ucls1012a/readme.txt | 5 +++-- > .../rootfs_overlay/etc/init.d/S09modload | 14 -------------- > configs/arcturus_ucls1012a_defconfig | 9 ++++----- > 4 files changed, 7 insertions(+), 23 deletions(-) > delete mode 100755 board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload > > diff --git a/board/arcturus/aarch64-ucls1012a/post-build.sh b/board/arcturus/aarch64-ucls1012a/post-build.sh > index f8ba78095f..ca3862988d 100755 > --- a/board/arcturus/aarch64-ucls1012a/post-build.sh > +++ b/board/arcturus/aarch64-ucls1012a/post-build.sh > @@ -1,5 +1,3 @@ > #!/bin/sh > > -mkdir -p ${TARGET_DIR}/lib/firmware > -cp -f ${BUILD_DIR}/linux-custom/firmware/ppfe/* ${TARGET_DIR}/lib/firmware/ > cp -f ${BUILD_DIR}/linux-custom/br2-ucls1012a.its ${BINARIES_DIR}/ > diff --git a/board/arcturus/aarch64-ucls1012a/readme.txt b/board/arcturus/aarch64-ucls1012a/readme.txt > index 483d5e9aef..cb91716b34 100644 > --- a/board/arcturus/aarch64-ucls1012a/readme.txt > +++ b/board/arcturus/aarch64-ucls1012a/readme.txt > @@ -23,14 +23,15 @@ Result of the build > After building, you should obtain this tree: > > output/images/ > + +-- Image.gz > +-- arc-ucls1012a.dtb > - +-- Image > + +-- br2-ucls1012a.its > +-- part0-000000.itb > +-- rootfs.cpio > +-- rootfs.cpio.gz > +-- rootfs.tar > +-- u-boot.bin > - +-- ucls1012a.its > > Flashing > -------- > diff --git a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload b/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload > deleted file mode 100755 > index c87ffda14f..0000000000 > --- a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload > +++ /dev/null > @@ -1,14 +0,0 @@ > -#!/bin/sh > -# > -case "$1" in > - start) > - modprobe pfe > - ;; > - stop) > - ;; > - restart|reload) > - ;; > - *) > - echo "Usage: $0 {start|stop|restart}" > - exit 1 > -esac > diff --git a/configs/arcturus_ucls1012a_defconfig b/configs/arcturus_ucls1012a_defconfig > index fd33ebf1f6..2a9c1e0582 100644 > --- a/configs/arcturus_ucls1012a_defconfig > +++ b/configs/arcturus_ucls1012a_defconfig > @@ -1,22 +1,21 @@ > # Architecture > BR2_aarch64=y > > -# Linux headers same as kernel, a 4.14 series > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y > > # System settings > BR2_TARGET_GENERIC_HOSTNAME="ucls1012a" > BR2_TARGET_GENERIC_ISSUE="Welcome to uCLS1012A-SOM" > BR2_SYSTEM_DHCP="eth0" > -BR2_ROOTFS_OVERLAY="board/arcturus/aarch64-ucls1012a/rootfs_overlay" > BR2_ROOTFS_POST_BUILD_SCRIPT="board/arcturus/aarch64-ucls1012a/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/arcturus/aarch64-ucls1012a/post-image.sh" > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-kernel,v.20.31)/linux-v.20.31.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-kernel,v.22.06)/linux-v.22.06.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="ucls1012a" > +BR2_LINUX_KERNEL_IMAGEGZ=y > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="arcturus/arc-ucls1012a" > > @@ -28,7 +27,7 @@ BR2_TARGET_ROOTFS_CPIO_GZIP=y > BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > BR2_TARGET_UBOOT_CUSTOM_TARBALL=y > -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-uboot,v.20.31)/uboot-v.20.31.tar.gz" > +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-uboot,v.22.06)/uboot-v.22.06.tar.gz" > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="UCLS1012A_QSPI128" > > # Tools From peter at korsgaard.com Thu Feb 10 18:56:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 19:56:16 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/gst1-devtools: drop python2 build dependencies In-Reply-To: <20220210061100.810772-1-james.hilliard1@gmail.com> (James Hilliard's message of "Wed, 9 Feb 2022 23:11:00 -0700") References: <20220210061100.810772-1-james.hilliard1@gmail.com> Message-ID: <87leyiwnxr.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Looks like this was missed in c4bbd6da50488944debba29e195557e5b345f2b1 > Signed-off-by: James Hilliard > --- > Changes v1 -> v2: > - move python3 deps to unconditional deps list Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 10 18:56:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 19:56:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/omniorb: switch to host-python3 In-Reply-To: <20220210075821.493485-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 10 Feb 2022 08:58:21 +0100") References: <20220210075821.493485-1-fontaine.fabrice@gmail.com> Message-ID: <87h796wnwy.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Switch to host-python3 which is supported since version 4.2.1 and > https://sourceforge.net/p/omniorb/svn/HEAD/tree/tags/4_2_1/omniORBpy/update.log > to avoid the following build failure since removal of host-python in > commit 2743ce00ca61fde1537b64a165a69d497052be58: > make: *** No rule to make target 'host-python', needed by > '/home/buildroot/autobuild/instance-1/output-1/build/host-omniorb-4.3.0/.stamp_configured'. > Stop. > Fixes: > - http://autobuild.buildroot.org/results/d415c2501b27cacf2356f0f6924ee7706d7a4070 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 10 18:54:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 19:54:01 +0100 Subject: [Buildroot] [git commit] package/gst1-devtools: drop python2 build dependencies Message-ID: <20220210185001.CB92D8275E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=54ee9dc4f88c021f5501a0ae90a5b219736b56f5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Looks like this was missed in c4bbd6da50488944debba29e195557e5b345f2b1 Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-devtools/gst1-devtools.mk | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.mk b/package/gstreamer1/gst1-devtools/gst1-devtools.mk index 66b509ae2c..9089b12188 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.mk +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.mk @@ -12,17 +12,13 @@ GST1_DEVTOOLS_LICENSE_FILES = validate/COPYING GST1_DEVTOOLS_INSTALL_STAGING = YES GST1_DEVTOOLS_DEPENDENCIES = \ + host-python3 \ + python3 \ gstreamer1 \ gst1-plugins-base \ json-glib \ $(if $(BR2_PACKAGE_CAIRO),cairo) -ifeq ($(BR2_PACKAGE_PYTHON3),y) -GST1_DEVTOOLS_DEPENDENCIES += host-python3 python3 -else -GST1_DEVTOOLS_DEPENDENCIES += host-python python -endif - ifeq ($(BR2_PACKAGE_GST1_RTSP_SERVER),y) GST1_DEVTOOLS_DEPENDENCIES += gst1-rtsp-server endif From peter at korsgaard.com Thu Feb 10 18:56:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 19:56:26 +0100 Subject: [Buildroot] [git commit] package/omniorb: switch to host-python3 Message-ID: <20220210185001.D424281319@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f32a2b04c89b6fbcd2cccf22b34fcfebfbcc1f2d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Switch to host-python3 which is supported since version 4.2.1 and https://sourceforge.net/p/omniorb/svn/HEAD/tree/tags/4_2_1/omniORBpy/update.log to avoid the following build failure since removal of host-python in commit 2743ce00ca61fde1537b64a165a69d497052be58: make: *** No rule to make target 'host-python', needed by '/home/buildroot/autobuild/instance-1/output-1/build/host-omniorb-4.3.0/.stamp_configured'. Stop. Fixes: - http://autobuild.buildroot.org/results/d415c2501b27cacf2356f0f6924ee7706d7a4070 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/omniorb/omniorb.mk | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/package/omniorb/omniorb.mk b/package/omniorb/omniorb.mk index a1943968f1..b44ec53fd5 100644 --- a/package/omniorb/omniorb.mk +++ b/package/omniorb/omniorb.mk @@ -11,11 +11,7 @@ OMNIORB_INSTALL_STAGING = YES OMNIORB_LICENSE = GPL2+, LGPL-2.1+ OMNIORB_LICENSE_FILES = COPYING COPYING.LIB OMNIORB_DEPENDENCIES = host-omniorb -HOST_OMNIORB_DEPENDENCIES = host-python - -# omniorb is not python3 friendly, so force the python interpreter -OMNIORB_CONF_OPTS = ac_cv_path_PYTHON=$(HOST_DIR)/bin/python2 -HOST_OMNIORB_CONF_OPTS = ac_cv_path_PYTHON=$(HOST_DIR)/bin/python2 +HOST_OMNIORB_DEPENDENCIES = host-python3 # Defaulting long double support to a safe option for the # mix of embedded targets, this could later be automated From peter at korsgaard.com Thu Feb 10 19:14:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 20:14:00 +0100 Subject: [Buildroot] [PATCH] package/gtest: drop python2 host support Message-ID: <20220210191401.13822-1-peter@korsgaard.com> And simplify the package a bit while we're at it. Signed-off-by: Peter Korsgaard --- package/gtest/gtest.mk | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/package/gtest/gtest.mk b/package/gtest/gtest.mk index 673e626c45..e7ce89a3f4 100644 --- a/package/gtest/gtest.mk +++ b/package/gtest/gtest.mk @@ -19,16 +19,7 @@ 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 +HOST_GTEST_DEPENDENCIES = host-python3 # 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 @@ -56,7 +47,7 @@ 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) + $(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages endef HOST_GTEST_POST_INSTALL_HOOKS += HOST_GTEST_POST_INSTALL_PYTHON -- 2.20.1 From peter at korsgaard.com Thu Feb 10 19:17:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 20:17:47 +0100 Subject: [Buildroot] [PATCH] package/python-web2py: drop python2 host support Message-ID: <20220210191748.14603-1-peter@korsgaard.com> With host-python gone, BR2_PACKAGE_PYTHON3 will always be enabled for a python package, so drop the legacy logic. Signed-off-by: Peter Korsgaard --- package/python-web2py/python-web2py.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-web2py/python-web2py.mk b/package/python-web2py/python-web2py.mk index 5ea46fbfd9..3e453282a9 100644 --- a/package/python-web2py/python-web2py.mk +++ b/package/python-web2py/python-web2py.mk @@ -10,7 +10,7 @@ PYTHON_WEB2PY_LICENSE = LGPL-3.0 PYTHON_WEB2PY_LICENSE_FILES = LICENSE PYTHON_WEB2PY_CPE_ID_VENDOR = web2py PYTHON_WEB2PY_CPE_ID_PRODUCT = web2py -PYTHON_WEB2PY_DEPENDENCIES = $(if $(BR2_PACKAGE_PYTHON3),host-python3 python3,host-python python) \ +PYTHON_WEB2PY_DEPENDENCIES = host-python3 python3 \ host-python-pydal host-python-yatl PYTHON_WEB2PY_EXCLUSIONS = \ -- 2.20.1 From peter at korsgaard.com Thu Feb 10 19:22:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 20:22:02 +0100 Subject: [Buildroot] [PATCH] package/rust: drop host-python2 support Message-ID: <20220210192203.15626-1-peter@korsgaard.com> host-python2 is gone, so always use host-python3. Signed-off-by: Peter Korsgaard --- package/rust/rust.mk | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/package/rust/rust.mk b/package/rust/rust.mk index 5fad7d404c..46487fe4b7 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -14,18 +14,11 @@ HOST_RUST_PROVIDES = host-rustc HOST_RUST_DEPENDENCIES = \ toolchain \ + host-python3 \ host-rust-bin \ host-openssl \ $(BR2_CMAKE_HOST_DEPENDENCY) -ifeq ($(BR2_PACKAGE_PYTHON3),y) -HOST_RUST_PYTHON_VERSION = $(PYTHON3_VERSION_MAJOR) -HOST_RUST_DEPENDENCIES += host-python3 -else -HOST_RUST_PYTHON_VERSION = $(PYTHON_VERSION_MAJOR) -HOST_RUST_DEPENDENCIES += host-python -endif - HOST_RUST_VERBOSITY = $(if $(VERBOSE),2,0) # Some vendor crates contain Cargo.toml.orig files. The associated @@ -50,7 +43,7 @@ define HOST_RUST_CONFIGURE_CMDS echo 'target = ["$(RUSTC_TARGET_NAME)"]'; \ echo 'cargo = "$(HOST_RUST_BIN_DIR)/cargo/bin/cargo"'; \ echo 'rustc = "$(HOST_RUST_BIN_DIR)/rustc/bin/rustc"'; \ - echo 'python = "$(HOST_DIR)/bin/python$(HOST_RUST_PYTHON_VERSION)"'; \ + echo 'python = "$(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR)"'; \ echo 'submodules = false'; \ echo 'vendor = true'; \ echo 'extended = true'; \ @@ -71,12 +64,12 @@ define HOST_RUST_CONFIGURE_CMDS endef define HOST_RUST_BUILD_CMDS - cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(HOST_RUST_PYTHON_VERSION) x.py build + cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py build endef define HOST_RUST_INSTALL_CMDS - cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(HOST_RUST_PYTHON_VERSION) x.py dist - cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(HOST_RUST_PYTHON_VERSION) x.py install + cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py dist + cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py install endef $(eval $(host-generic-package)) -- 2.20.1 From peter at korsgaard.com Thu Feb 10 19:23:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 20:23:32 +0100 Subject: [Buildroot] [PATCH] package/libsigrok: drop host-python2 support Message-ID: <20220210192333.15993-1-peter@korsgaard.com> host-python2 is gone, so always use host-python3. Signed-off-by: Peter Korsgaard --- package/libsigrok/libsigrok.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libsigrok/libsigrok.mk b/package/libsigrok/libsigrok.mk index 2a26518614..639ee4dc25 100644 --- a/package/libsigrok/libsigrok.mk +++ b/package/libsigrok/libsigrok.mk @@ -60,7 +60,7 @@ LIBSIGROK_CONF_OPTS += --enable-cxx LIBSIGROK_DEPENDENCIES += \ glibmm \ host-doxygen \ - $(if $(BR2_PACKAGE_PYTHON3),host-python3,host-python) + host-python3 else LIBSIGROK_CONF_OPTS += --disable-cxx endif -- 2.20.1 From ps.report at gmx.net Thu Feb 10 19:28:52 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 10 Feb 2022 20:28:52 +0100 Subject: [Buildroot] [PATCH v2 00/13] package/gstreamer1/*: bump version to 1.20.0 Message-ID: <20220210192905.4500-1-ps.report@gmx.net> For details see [1] and [2]. [1] https://lists.freedesktop.org/archives/gstreamer-devel/2022-February/079534.html [2] https://gstreamer.freedesktop.org/releases/1.20/ Changes v1 -> v2: - package/gst1-plugins-bad: bump version to 1.20.0: fix rebase/merge artefact in Config.in.legacy (Baruch Siach) Peter Seiderer (13): package/gstreamer1: bump version to 1.20.0 package/gst1-plugins-base: bump version to 1.20.0 package/gst1-plugins-good: bump version to 1.20.0 package/gst1-plugins-bad: bump version to 1.20.0 package/gst1-plugins-ugly: bump version to 1.20.0 package/gst1-devtools: bump version to 1.20.0 package/gst1-libav: bump version to 1.20.0 package/gst1-vaapi: bump version to 1.20.0 package/gst1-rtsp-server: bump version to 1.20.0 package/gstreamer1-editing-services: bump version to 1.20.0 package/gst-omx: bump version to 1.20.0 package/gst1-python: bump version to 1.20.0 package/gst1-plugins-bayer2rgb-neon: fix plugin install Config.in.legacy | 8 ++++ package/gstreamer1/gst-omx/gst-omx.hash | 4 +- package/gstreamer1/gst-omx/gst-omx.mk | 2 +- .../gst1-devtools/gst1-devtools.hash | 4 +- .../gstreamer1/gst1-devtools/gst1-devtools.mk | 13 ++++-- package/gstreamer1/gst1-libav/gst1-libav.hash | 6 +-- package/gstreamer1/gst1-libav/gst1-libav.mk | 4 +- ...n-Allow-building-against-neon-0-32-x.patch | 29 ------------- package/gstreamer1/gst1-plugins-bad/Config.in | 31 +++++++++----- .../gst1-plugins-bad/gst1-plugins-bad.hash | 4 +- .../gst1-plugins-bad/gst1-plugins-bad.mk | 36 ++++++++++++---- .../gst1-plugins-base/gst1-plugins-base.hash | 6 +-- .../gst1-plugins-base/gst1-plugins-base.mk | 5 ++- .../gst1-plugins-bayer2rgb-neon.mk | 4 +- .../gst1-plugins-good/gst1-plugins-good.hash | 4 +- .../gst1-plugins-good/gst1-plugins-good.mk | 2 +- .../gst1-plugins-ugly/gst1-plugins-ugly.hash | 4 +- .../gst1-plugins-ugly/gst1-plugins-ugly.mk | 3 +- .../gstreamer1/gst1-python/gst1-python.hash | 4 +- package/gstreamer1/gst1-python/gst1-python.mk | 2 +- ...-rtsp-server-meson.build-add-gst_dep.patch | 41 ------------------- .../gst1-rtsp-server/gst1-rtsp-server.hash | 8 ++-- .../gst1-rtsp-server/gst1-rtsp-server.mk | 4 +- package/gstreamer1/gst1-vaapi/gst1-vaapi.hash | 4 +- package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 2 +- .../gstreamer1-editing-services.hash | 4 +- .../gstreamer1-editing-services.mk | 2 +- package/gstreamer1/gstreamer1/gstreamer1.hash | 6 +-- package/gstreamer1/gstreamer1/gstreamer1.mk | 5 +-- 29 files changed, 112 insertions(+), 139 deletions(-) delete mode 100644 package/gstreamer1/gst1-plugins-bad/0001-neon-Allow-building-against-neon-0-32-x.patch delete mode 100644 package/gstreamer1/gst1-rtsp-server/0001-gst-rtsp-server-meson.build-add-gst_dep.patch -- 2.34.1 From ps.report at gmx.net Thu Feb 10 19:28:59 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 10 Feb 2022 20:28:59 +0100 Subject: [Buildroot] [PATCH v2 07/13] package/gst1-libav: bump version to 1.20.0 In-Reply-To: <20220210192905.4500-1-ps.report@gmx.net> References: <20220210192905.4500-1-ps.report@gmx.net> Message-ID: <20220210192905.4500-8-ps.report@gmx.net> - update COPYING hash (license text update from LGPL-2.0+ to LGPL-2.1+, see [1]) and adjust GST1_LIBAV_LICENSE accordingly [1] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/d157b23fb0ce175b167611a4cb019599d9017042.patch Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-libav/gst1-libav.hash | 6 +++--- package/gstreamer1/gst1-libav/gst1-libav.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/gstreamer1/gst1-libav/gst1-libav.hash b/package/gstreamer1/gst1-libav/gst1-libav.hash index 5fb39a0b3e..3204de3c14 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.hash +++ b/package/gstreamer1/gst1-libav/gst1-libav.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.18.6.tar.xz.sha256sum -sha256 e4e50dcd5a29441ae34de60d2221057e8064ed824bb6ca4dc0fd9ee88fbe9b81 gst-libav-1.18.6.tar.xz -sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING +# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.20.0.tar.xz.sha256sum +sha256 5eee5ed8d5082a31b500448e41535c722ee30cd5f8224f32982bbaba2eedef17 gst-libav-1.20.0.tar.xz +sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gst1-libav/gst1-libav.mk b/package/gstreamer1/gst1-libav/gst1-libav.mk index 55c6e06e0e..f07e5061b4 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.mk +++ b/package/gstreamer1/gst1-libav/gst1-libav.mk @@ -4,10 +4,10 @@ # ################################################################################ -GST1_LIBAV_VERSION = 1.18.6 +GST1_LIBAV_VERSION = 1.20.0 GST1_LIBAV_SOURCE = gst-libav-$(GST1_LIBAV_VERSION).tar.xz GST1_LIBAV_SITE = https://gstreamer.freedesktop.org/src/gst-libav -GST1_LIBAV_LICENSE = LGPL-2.0+ +GST1_LIBAV_LICENSE = LGPL-2.1+ GST1_LIBAV_LICENSE_FILES = COPYING GST1_LIBAV_DEPENDENCIES = host-pkgconf ffmpeg gstreamer1 gst1-plugins-base GST1_LIBAV_CONF_OPTS = -Ddoc=disabled -- 2.34.1 From ps.report at gmx.net Thu Feb 10 19:28:54 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 10 Feb 2022 20:28:54 +0100 Subject: [Buildroot] [PATCH v2 02/13] package/gst1-plugins-base: bump version to 1.20.0 In-Reply-To: <20220210192905.4500-1-ps.report@gmx.net> References: <20220210192905.4500-1-ps.report@gmx.net> Message-ID: <20220210192905.4500-3-ps.report@gmx.net> - disable new qt5 (Qt5 QML examples) option (suboption of already disabled tests/examples) - update COPYING hash (license text update from LGPL-2.0+ to LGPL-2.1+, see [1]) and adjust GST1_PLUGINS_BASE_LICENSE accordingly [1] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/d157b23fb0ce175b167611a4cb019599d9017042.patch Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash | 6 +++--- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash index 081dc6f213..ffc3445cda 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.18.6.tar.xz.sha256sum -sha256 56a9ff2fe9e6603b9e658cf6897d412a173d2180829fe01e92568549c6bd0f5b gst-plugins-base-1.18.6.tar.xz -sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING +# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.20.0.tar.xz.sha256sum +sha256 4cb66fccf730b1037e6533862c2128990912a6db4e5bbd14e0ef914450eb4c7c gst-plugins-base-1.20.0.tar.xz +sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk index c99eeb6c59..68281738fa 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk @@ -4,12 +4,12 @@ # ################################################################################ -GST1_PLUGINS_BASE_VERSION = 1.18.6 +GST1_PLUGINS_BASE_VERSION = 1.20.0 GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz GST1_PLUGINS_BASE_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-base GST1_PLUGINS_BASE_INSTALL_STAGING = YES GST1_PLUGINS_BASE_LICENSE_FILES = COPYING -GST1_PLUGINS_BASE_LICENSE = LGPL-2.0+, LGPL-2.1+ +GST1_PLUGINS_BASE_LICENSE = LGPL-2.1+ GST1_PLUGINS_BASE_CONF_OPTS = \ -Dexamples=disabled \ @@ -17,6 +17,7 @@ GST1_PLUGINS_BASE_CONF_OPTS = \ -Dgobject-cast-checks=disabled \ -Dglib-asserts=disabled \ -Dglib-checks=disabled \ + -Dqt5=disabled \ -Ddoc=disabled # Options which require currently unpackaged libraries -- 2.34.1 From ps.report at gmx.net Thu Feb 10 19:28:53 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 10 Feb 2022 20:28:53 +0100 Subject: [Buildroot] [PATCH v2 01/13] package/gstreamer1: bump version to 1.20.0 In-Reply-To: <20220210192905.4500-1-ps.report@gmx.net> References: <20220210192905.4500-1-ps.report@gmx.net> Message-ID: <20220210192905.4500-2-ps.report@gmx.net> - meson option gtk_doc removed ([1]) - update COPYING hash (license text update from LGPL-2.0+ to LGPL-2.1+, see [2]) and adjust GSTREAMER1_LICENSE accordingly [1] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/f5ee12395832d4305bb8dbdf4751552d03430d6d.patch [2] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/d157b23fb0ce175b167611a4cb019599d9017042.patch Signed-off-by: Peter Seiderer --- package/gstreamer1/gstreamer1/gstreamer1.hash | 6 +++--- package/gstreamer1/gstreamer1/gstreamer1.mk | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/gstreamer1/gstreamer1/gstreamer1.hash b/package/gstreamer1/gstreamer1/gstreamer1.hash index 1202bf2c50..f4a74a6125 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.hash +++ b/package/gstreamer1/gstreamer1/gstreamer1.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.18.6.tar.xz.sha256sum -sha256 4ec816010dd4d3a93cf470ad0a6f25315f52b204eb1d71dfa70ab8a1c3bd06e6 gstreamer-1.18.6.tar.xz -sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING +# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.20.0.tar.xz.sha256sum +sha256 edf4bffff85591d4fff7b21bb9ed7f0feabc123ac4a4eff29e73cbce454f9db7 gstreamer-1.20.0.tar.xz +sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk index 27745f3bf9..86df5d6cf6 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -4,12 +4,12 @@ # ################################################################################ -GSTREAMER1_VERSION = 1.18.6 +GSTREAMER1_VERSION = 1.20.0 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer GSTREAMER1_INSTALL_STAGING = YES GSTREAMER1_LICENSE_FILES = COPYING -GSTREAMER1_LICENSE = LGPL-2.0+, LGPL-2.1+ +GSTREAMER1_LICENSE = LGPL-2.1+ GSTREAMER1_CPE_ID_VENDOR = gstreamer_project GSTREAMER1_CPE_ID_PRODUCT = gstreamer @@ -18,7 +18,6 @@ GSTREAMER1_CONF_OPTS = \ -Dtests=disabled \ -Dbenchmarks=disabled \ -Dtools=$(if $(BR2_PACKAGE_GSTREAMER1_INSTALL_TOOLS),enabled,disabled) \ - -Dgtk_doc=disabled \ -Dgobject-cast-checks=disabled \ -Dglib-asserts=disabled \ -Dglib-checks=disabled \ -- 2.34.1 From ps.report at gmx.net Thu Feb 10 19:28:56 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 10 Feb 2022 20:28:56 +0100 Subject: [Buildroot] [PATCH v2 04/13] package/gst1-plugins-bad: bump version to 1.20.0 In-Reply-To: <20220210192905.4500-1-ps.report@gmx.net> References: <20220210192905.4500-1-ps.report@gmx.net> Message-ID: <20220210192905.4500-5-ps.report@gmx.net> - removed 0001-neon-Allow-building-against-neon-0-32-x.patch (from upstream [1]) - add codecalpha option (VP8/VP9 alpha support) - add qroverlay option (overlay data on top of video in the form of a QR code) with json-glib and libqrencode dependencies (omit json-glib explicit dependencies as they are the same as for gstreamer1, glib2 BR2_USE_WCHAR, BR2_TOOLCHAIN_HAS_THREADS and BR2_USE_MMU), place instead to 'plugins without external deps' section into 'plugins that need external deps' section as it clearly has dependencies (prelimary to upstream commit [2]) - add aes option (AES encryption/decryption plugin) - disable new option asio (Steinberg Audio Streaming, windows only) - disable new option gs (Google Cloud Storage, needs storage_client library) - disable new option ldac (LDAC bluetooth audio codec, needs ldacBT-enc library) - remove legacy option ofa (disabled) - disable new option onnx (ONNX neural network, needs libonnxruntime library) - disable new option isac (iSAC plugin, needs webrtc-audio-coding-1 library) - removed libmms ('Microsoft Multi Media Server streaming protocol' option, add Config.in.legacy entry - enable new gpl option ('Allow build plugins that have (A)GPL-licensed dependencies') in case gpl plugin enabled [1] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/b83e85ab677c79b46f520abebd1ee031e3a139c0.patch [2] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/5d70c168b356691073a0d22f7ce3ea7efb20641c.patch Signed-off-by: Peter Seiderer --- Changes v1 -> v2: - fix rebase/merge artefact in Config.in.legacy (Baruch Siach) --- Config.in.legacy | 8 +++++ ...n-Allow-building-against-neon-0-32-x.patch | 29 --------------- package/gstreamer1/gst1-plugins-bad/Config.in | 31 ++++++++++------ .../gst1-plugins-bad/gst1-plugins-bad.hash | 4 +-- .../gst1-plugins-bad/gst1-plugins-bad.mk | 36 ++++++++++++++----- 5 files changed, 57 insertions(+), 51 deletions(-) delete mode 100644 package/gstreamer1/gst1-plugins-bad/0001-neon-Allow-building-against-neon-0-32-x.patch diff --git a/Config.in.legacy b/Config.in.legacy index 49c24e61bf..2b1fd48de5 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,14 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBMMS + bool "gst1-plugins-bad plugin libmms was removed" + depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_LEGACY + help + This plugin was removed with gst1-plugins-bad-1.20.0. + config BR2_PACKAGE_PYTHON_FUNCTOOLS32 bool "python-functools32 removed" select BR2_LEGACY 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 deleted file mode 100644 index e995a8cb91..0000000000 --- a/package/gstreamer1/gst1-plugins-bad/0001-neon-Allow-building-against-neon-0-32-x.patch +++ /dev/null @@ -1,29 +0,0 @@ -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 - diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in index b793cb8eb1..234d57636b 100644 --- a/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/package/gstreamer1/gst1-plugins-bad/Config.in @@ -76,6 +76,12 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CAMERABIN2 help Take image snapshots and record movies from camera +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CODECALPHA + bool "codecalpha" + help + Elements for VP8/VP9 alpha support (codecalphademux, + alphacombine, vp8alphadecodebin, vp9alphadecodebin) + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_COLOREFFECTS bool "coloreffects" help @@ -324,6 +330,12 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_Y4M comment "plugins with external dependencies" +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AES + bool "aes" + select BR2_PACKAGE_OPENSSL + help + "AES encryption/decryption plugin" + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASSRENDER bool "assrender" depends on BR2_INSTALL_LIBSTDCPP # libass -> harfbuzz @@ -458,17 +470,6 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_KMS help KMS video sink -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBMMS - bool "libmms" - depends on BR2_USE_WCHAR # libmms -> libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libmms -> libglib2 - select BR2_PACKAGE_LIBMMS - help - Microsoft Multi Media Server streaming protocol support - -comment "libmms needs a toolchain w/ wchar, threads" - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS - config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DTLS bool "dtls" select BR2_PACKAGE_OPENSSL @@ -558,6 +559,14 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPUS help OPUS plugin library +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_QROVERLAY + bool "qroverlay" + select BR2_PACKAGE_JSON_GLIB + select BR2_PACKAGE_LIBQRENCODE + help + Elements qroverlay, debugqroverlay (overlay data on top of + video in the form of a QR code) + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RSVG bool "rsvg" depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # librsvg diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash index d31a78981e..72c9624b94 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.6.tar.xz.sha256sum -sha256 0b1b50ac6311f0c510248b6cd64d6d3c94369344828baa602db85ded5bc70ec9 gst-plugins-bad-1.18.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.20.0.tar.xz.sha256sum +sha256 015b8d4d9a395ebf444d40876867a2034dd3304b3ad48bc3a0dd0c1ee71dc11d gst-plugins-bad-1.20.0.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index d02ca1ba74..24fd9dd312 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BAD_VERSION = 1.18.6 +GST1_PLUGINS_BAD_VERSION = 1.20.0 GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz GST1_PLUGINS_BAD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-bad GST1_PLUGINS_BAD_INSTALL_STAGING = YES @@ -34,6 +34,7 @@ GST1_PLUGINS_BAD_CONF_OPTS = \ # Options which require currently unpackaged libraries GST1_PLUGINS_BAD_CONF_OPTS += \ + -Dasio=disabled \ -Davtp=disabled \ -Dopensles=disabled \ -Dmsdk=disabled \ @@ -46,16 +47,18 @@ GST1_PLUGINS_BAD_CONF_OPTS += \ -Dresindvd=disabled \ -Dfaac=disabled \ -Dflite=disabled \ + -Dgs=disabled \ -Dgsm=disabled \ -Dkate=disabled \ -Dladspa=disabled \ + -Dldac=disabled \ -Dlv2=disabled \ -Dmediafoundation=disabled \ -Dmicrodns=disabled \ -Dlibde265=disabled \ -Dmodplug=disabled \ -Dmplex=disabled \ - -Dofa=disabled \ + -Donnx=disabled \ -Dopenexr=disabled \ -Dopenni2=disabled \ -Dteletext=disabled \ @@ -69,6 +72,7 @@ GST1_PLUGINS_BAD_CONF_OPTS += \ -Dwasapi2=disabled \ -Dzxing=disabled \ -Dmagicleap=disabled \ + -Disac=disabled \ -Diqa=disabled \ -Dopencv=disabled @@ -180,6 +184,12 @@ else GST1_PLUGINS_BAD_CONF_OPTS += -Dcamerabin2=disabled endif +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CODECALPHA),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Dcodecalpha=enabled +else +GST1_PLUGINS_BAD_CONF_OPTS += -Dcodecalpha=disabled +endif + ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_COLOREFFECTS),y) GST1_PLUGINS_BAD_CONF_OPTS += -Dcoloreffects=enabled else @@ -497,6 +507,13 @@ endif # Plugins with dependencies +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AES),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Daes=enabled +GST1_PLUGINS_BAD_DEPENDENCIES += openssl +else +GST1_PLUGINS_BAD_CONF_OPTS += -Daes=disabled +endif + ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASSRENDER),y) GST1_PLUGINS_BAD_CONF_OPTS += -Dassrender=enabled GST1_PLUGINS_BAD_DEPENDENCIES += libass @@ -604,13 +621,6 @@ else GST1_PLUGINS_BAD_CONF_OPTS += -Dkms=disabled endif -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBMMS),y) -GST1_PLUGINS_BAD_CONF_OPTS += -Dlibmms=enabled -GST1_PLUGINS_BAD_DEPENDENCIES += libmms -else -GST1_PLUGINS_BAD_CONF_OPTS += -Dlibmms=disabled -endif - ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DTLS),y) GST1_PLUGINS_BAD_CONF_OPTS += -Ddtls=enabled GST1_PLUGINS_BAD_DEPENDENCIES += openssl @@ -677,6 +687,13 @@ else GST1_PLUGINS_BAD_CONF_OPTS += -Dopus=disabled endif +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_QROVERLAY),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Dqroverlay=enabled +GST1_PLUGINS_BAD_DEPENDENCIES += json-glib libqrencode +else +GST1_PLUGINS_BAD_CONF_OPTS += -Dqroverlay=disabled +endif + ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RSVG),y) GST1_PLUGINS_BAD_CONF_OPTS += -Drsvg=enabled GST1_PLUGINS_BAD_DEPENDENCIES += librsvg @@ -787,6 +804,7 @@ endif # Add GPL license if GPL licensed plugins enabled. ifeq ($(GST1_PLUGINS_BAD_HAS_GPL_LICENSE),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Dgpl=enabled GST1_PLUGINS_BAD_LICENSE += , GPL-2.0+ GST1_PLUGINS_BAD_LICENSE_FILES += COPYING endif -- 2.34.1 From ps.report at gmx.net Thu Feb 10 19:29:03 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 10 Feb 2022 20:29:03 +0100 Subject: [Buildroot] [PATCH v2 11/13] package/gst-omx: bump version to 1.20.0 In-Reply-To: <20220210192905.4500-1-ps.report@gmx.net> References: <20220210192905.4500-1-ps.report@gmx.net> Message-ID: <20220210192905.4500-12-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gst-omx/gst-omx.hash | 4 ++-- package/gstreamer1/gst-omx/gst-omx.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst-omx/gst-omx.hash b/package/gstreamer1/gst-omx/gst-omx.hash index 47f7cb5893..0b95505c5f 100644 --- a/package/gstreamer1/gst-omx/gst-omx.hash +++ b/package/gstreamer1/gst-omx/gst-omx.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.18.6.tar.xz.sha256sum -sha256 b5281c938e959fd2418e989cfb6065fdd9fe5f6f87ee86236c9427166e708163 gst-omx-1.18.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.20.0.tar.xz.sha256sum +sha256 c1e46b70ac379ac7b3646506370c9e1007b56ae293f4d334bc0e724c76c345dd gst-omx-1.20.0.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst-omx/gst-omx.mk b/package/gstreamer1/gst-omx/gst-omx.mk index dc65509244..f71e1242ff 100644 --- a/package/gstreamer1/gst-omx/gst-omx.mk +++ b/package/gstreamer1/gst-omx/gst-omx.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST_OMX_VERSION = 1.18.6 +GST_OMX_VERSION = 1.20.0 GST_OMX_SOURCE = gst-omx-$(GST_OMX_VERSION).tar.xz GST_OMX_SITE = https://gstreamer.freedesktop.org/src/gst-omx -- 2.34.1 From ps.report at gmx.net Thu Feb 10 19:29:01 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 10 Feb 2022 20:29:01 +0100 Subject: [Buildroot] [PATCH v2 09/13] package/gst1-rtsp-server: bump version to 1.20.0 In-Reply-To: <20220210192905.4500-1-ps.report@gmx.net> References: <20220210192905.4500-1-ps.report@gmx.net> Message-ID: <20220210192905.4500-10-ps.report@gmx.net> - removed 0001-gst-rtsp-server-meson.build-add-gst_dep.patch (upstream accepted [1]) - update COPYING/COPYING.LIB hash (license text update from LGPL-2.0+ to LGPL-2.1+, see [2]) and adjust GST1_RTSP_SERVER_LICENSE accordingly [1] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/e637aae629f5b95b748a6f23abecc2b502272822.patch [2] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/cc5cdab0165e3bdf5f4f748b3ba2a3493d304e70.patch Signed-off-by: Peter Seiderer --- ...-rtsp-server-meson.build-add-gst_dep.patch | 41 ------------------- .../gst1-rtsp-server/gst1-rtsp-server.hash | 8 ++-- .../gst1-rtsp-server/gst1-rtsp-server.mk | 4 +- 3 files changed, 6 insertions(+), 47 deletions(-) delete mode 100644 package/gstreamer1/gst1-rtsp-server/0001-gst-rtsp-server-meson.build-add-gst_dep.patch 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 deleted file mode 100644 index b63f634598..0000000000 --- a/package/gstreamer1/gst1-rtsp-server/0001-gst-rtsp-server-meson.build-add-gst_dep.patch +++ /dev/null @@ -1,41 +0,0 @@ -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 - diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash index fadef41351..00ff974c6e 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash @@ -1,4 +1,4 @@ -# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.18.6.tar.xz.sha256sum -sha256 826f32afbcf94b823541efcac4a0dacdb62f6145ef58f363095749f440262be9 gst-rtsp-server-1.18.6.tar.xz -sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING -sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING.LIB +# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.20.0.tar.xz.sha256sum +sha256 c209f5ed906da713fdd44a8844e909aa6c8af3dfb630259b092cfb77a7755843 gst-rtsp-server-1.20.0.tar.xz +sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING +sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING.LIB diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk index 55403754f3..d22dd5e7cc 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk @@ -4,10 +4,10 @@ # ################################################################################ -GST1_RTSP_SERVER_VERSION = 1.18.6 +GST1_RTSP_SERVER_VERSION = 1.20.0 GST1_RTSP_SERVER_SOURCE = gst-rtsp-server-$(GST1_RTSP_SERVER_VERSION).tar.xz GST1_RTSP_SERVER_SITE = http://gstreamer.freedesktop.org/src/gst-rtsp-server -GST1_RTSP_SERVER_LICENSE = LGPL-2.0+ +GST1_RTSP_SERVER_LICENSE = LGPL-2.1+ GST1_RTSP_SERVER_LICENSE_FILES = COPYING COPYING.LIB GST1_RTSP_SERVER_CPE_ID_VENDOR = gstreamer_project GST1_RTSP_SERVER_CPE_ID_PRODUCT = gst-rtsp-server -- 2.34.1 From ps.report at gmx.net Thu Feb 10 19:28:55 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 10 Feb 2022 20:28:55 +0100 Subject: [Buildroot] [PATCH v2 03/13] package/gst1-plugins-good: bump version to 1.20.0 In-Reply-To: <20220210192905.4500-1-ps.report@gmx.net> References: <20220210192905.4500-1-ps.report@gmx.net> Message-ID: <20220210192905.4500-4-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash | 4 ++-- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash index e342bd133e..9ad1d7bf46 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.6.tar.xz.sha256sum -sha256 26723ac01fcb360ade1f41d168c7c322d8af4ceb7e55c8c12ed2690d06a76eed gst-plugins-good-1.18.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.20.0.tar.xz.sha256sum +sha256 2d119c15ab8c9e79f8cd3c6bf582ff7a050b28ccae52ab4865e1a1464991659c gst-plugins-good-1.20.0.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk index e0ca29c5fd..6298d578ed 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_GOOD_VERSION = 1.18.6 +GST1_PLUGINS_GOOD_VERSION = 1.20.0 GST1_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST1_PLUGINS_GOOD_VERSION).tar.xz GST1_PLUGINS_GOOD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-good GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING -- 2.34.1 From ps.report at gmx.net Thu Feb 10 19:29:05 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 10 Feb 2022 20:29:05 +0100 Subject: [Buildroot] [PATCH v2 13/13] package/gst1-plugins-bayer2rgb-neon: fix plugin install In-Reply-To: <20220210192905.4500-1-ps.report@gmx.net> References: <20220210192905.4500-1-ps.report@gmx.net> Message-ID: <20220210192905.4500-14-ps.report@gmx.net> - fix plugin install path, add '-with-plugindir=/usr/lib/gstreamer-1.0', otherwise the plugins are installed with duplicated build path (as detected by step_check_build_dir) - remove GST1_PLUGINS_BAYER2RGB_NEON_INSTALL_STAGING (no need to install the plugin to staging) Signed-off-by: Peter Seiderer --- .../gst1-plugins-bayer2rgb-neon.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.mk b/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.mk index 815099e315..0d4aeac7f5 100644 --- a/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.mk +++ b/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.mk @@ -10,8 +10,6 @@ GST1_PLUGINS_BAYER2RGB_NEON_SITE_METHOD = git GST1_PLUGINS_BAYER2RGB_NEON_LICENSE = GPL-3.0 GST1_PLUGINS_BAYER2RGB_NEON_LICENSE_FILES = COPYING -GST1_PLUGINS_BAYER2RGB_NEON_INSTALL_STAGING = YES - GST1_PLUGINS_BAYER2RGB_NEON_DEPENDENCIES = \ host-pkgconf \ gstreamer1 \ @@ -20,4 +18,6 @@ GST1_PLUGINS_BAYER2RGB_NEON_DEPENDENCIES = \ GST1_PLUGINS_BAYER2RGB_NEON_AUTORECONF = YES +GST1_PLUGINS_BAYER2RGB_NEON_CONF_OPTS = --with-plugindir=/usr/lib/gstreamer-1.0 + $(eval $(autotools-package)) -- 2.34.1 From ps.report at gmx.net Thu Feb 10 19:28:58 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 10 Feb 2022 20:28:58 +0100 Subject: [Buildroot] [PATCH v2 06/13] package/gst1-devtools: bump version to 1.20.0 In-Reply-To: <20220210192905.4500-1-ps.report@gmx.net> References: <20220210192905.4500-1-ps.report@gmx.net> Message-ID: <20220210192905.4500-7-ps.report@gmx.net> - use new option cairo ('Build GstValidateVideo') instead pure optional dependency on packet cairo Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-devtools/gst1-devtools.hash | 4 ++-- package/gstreamer1/gst1-devtools/gst1-devtools.mk | 13 ++++++++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.hash b/package/gstreamer1/gst1-devtools/gst1-devtools.hash index 011385e757..dd09280a9c 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.hash +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.18.6.tar.xz.sha256sum -sha256 3725622c740a635452e54b79d065f963ab7706ca2403de6c43072ae7610a0de4 gst-devtools-1.18.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.20.0.tar.xz.sha256sum +sha256 69fc8756ec9d93e5c5258c99088434f203e91fdbc5af28d1f2c583fd819b7a1d gst-devtools-1.20.0.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 validate/COPYING diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.mk b/package/gstreamer1/gst1-devtools/gst1-devtools.mk index 9089b12188..f72df9cf71 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.mk +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_DEVTOOLS_VERSION = 1.18.6 +GST1_DEVTOOLS_VERSION = 1.20.0 GST1_DEVTOOLS_SOURCE = gst-devtools-$(GST1_DEVTOOLS_VERSION).tar.xz GST1_DEVTOOLS_SITE = https://gstreamer.freedesktop.org/src/gst-devtools GST1_DEVTOOLS_LICENSE = LGPL-2.1+ @@ -16,8 +16,7 @@ GST1_DEVTOOLS_DEPENDENCIES = \ python3 \ gstreamer1 \ gst1-plugins-base \ - json-glib \ - $(if $(BR2_PACKAGE_CAIRO),cairo) + json-glib ifeq ($(BR2_PACKAGE_GST1_RTSP_SERVER),y) GST1_DEVTOOLS_DEPENDENCIES += gst1-rtsp-server @@ -30,4 +29,12 @@ GST1_DEVTOOLS_CONF_OPTS = \ -Dtests=disabled \ -Ddoc=disabled +# build GstValidateVideo +ifeq ($(BR2_PACKAGE_CAIRO),y) +GST1_DEVTOOLS_CONF_OPTS += -Dcairo=enabled +GST1_DEVTOOLS_DEPENDENCIES += cairo +else +GST1_DEVTOOLS_CONF_OPTS += -Dcairo=disabled +endif + $(eval $(meson-package)) -- 2.34.1 From ps.report at gmx.net Thu Feb 10 19:28:57 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 10 Feb 2022 20:28:57 +0100 Subject: [Buildroot] [PATCH v2 05/13] package/gst1-plugins-ugly: bump version to 1.20.0 In-Reply-To: <20220210192905.4500-1-ps.report@gmx.net> References: <20220210192905.4500-1-ps.report@gmx.net> Message-ID: <20220210192905.4500-6-ps.report@gmx.net> - enable new gpl option ('Allow build plugins that have GPL-licensed dependencies') in case gpl plugin enabled Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash | 4 ++-- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash index 26fd0fd9ac..d16134f24b 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.18.6.tar.xz.sha256sum -sha256 4969c409cb6a88317d2108b8577108e18623b2333d7b587ae3f39459c70e3a7f gst-plugins-ugly-1.18.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.20.0.tar.xz.sha256sum +sha256 4e8dcb5d26552f0a4937f6bc6279bd9070f55ca6ae0eaa32d72d264c44001c2e gst-plugins-ugly-1.20.0.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk index 7f483deb81..05b1fab304 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_UGLY_VERSION = 1.18.6 +GST1_PLUGINS_UGLY_VERSION = 1.20.0 GST1_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST1_PLUGINS_UGLY_VERSION).tar.xz GST1_PLUGINS_UGLY_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-ugly GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING @@ -89,6 +89,7 @@ endif # Add GPL license if GPL plugins enabled. ifeq ($(GST1_PLUGINS_UGLY_HAS_GPL_LICENSE),y) +GST1_PLUGINS_UGLY_CONF_OPTS += -Dgpl=enabled GST1_PLUGINS_UGLY_LICENSE += , GPL-2.0 endif -- 2.34.1 From ps.report at gmx.net Thu Feb 10 19:29:04 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 10 Feb 2022 20:29:04 +0100 Subject: [Buildroot] [PATCH v2 12/13] package/gst1-python: bump version to 1.20.0 In-Reply-To: <20220210192905.4500-1-ps.report@gmx.net> References: <20220210192905.4500-1-ps.report@gmx.net> Message-ID: <20220210192905.4500-13-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-python/gst1-python.hash | 4 ++-- package/gstreamer1/gst1-python/gst1-python.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-python/gst1-python.hash b/package/gstreamer1/gst1-python/gst1-python.hash index a760e53e7d..a2f17583fd 100644 --- a/package/gstreamer1/gst1-python/gst1-python.hash +++ b/package/gstreamer1/gst1-python/gst1-python.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.18.6.tar.xz.sha256sum -sha256 bdc0ea22fbd7335ad9decc151561aacc53c51206a9735b81eac700ce5b0bbd4a gst-python-1.18.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.20.0.tar.xz.sha256sum +sha256 8f67bdc5606ba33606c6bc896e89de7dcd8cf4fca459f71389b1b6fe075b5e54 gst-python-1.20.0.tar.xz sha256 ea3ad127610e5ded2210b3a86a46314f2b3b28e438eccffdae19a4d6fbcdb0c2 COPYING diff --git a/package/gstreamer1/gst1-python/gst1-python.mk b/package/gstreamer1/gst1-python/gst1-python.mk index 7faab752cd..a9cc32d1d7 100644 --- a/package/gstreamer1/gst1-python/gst1-python.mk +++ b/package/gstreamer1/gst1-python/gst1-python.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PYTHON_VERSION = 1.18.6 +GST1_PYTHON_VERSION = 1.20.0 GST1_PYTHON_SOURCE = gst-python-$(GST1_PYTHON_VERSION).tar.xz GST1_PYTHON_SITE = https://gstreamer.freedesktop.org/src/gst-python GST1_PYTHON_INSTALL_STAGING = YES -- 2.34.1 From ps.report at gmx.net Thu Feb 10 19:29:00 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 10 Feb 2022 20:29:00 +0100 Subject: [Buildroot] [PATCH v2 08/13] package/gst1-vaapi: bump version to 1.20.0 In-Reply-To: <20220210192905.4500-1-ps.report@gmx.net> References: <20220210192905.4500-1-ps.report@gmx.net> Message-ID: <20220210192905.4500-9-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-vaapi/gst1-vaapi.hash | 4 ++-- package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash index 7e22774c11..b32d91e1e2 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.18.6.tar.xz.sha256sum -sha256 ab6270f1e5e4546fbe6f5ea246d86ca3d196282eb863d46e6cdcc96f867449e0 gstreamer-vaapi-1.18.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.20.0.tar.xz.sha256sum +sha256 f79a47346dfd5e585e063e77078e5fc498b06dee895bfcbf47d8863fcac9ea32 gstreamer-vaapi-1.20.0.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk index 6af851602f..19ee625703 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_VAAPI_VERSION = 1.18.6 +GST1_VAAPI_VERSION = 1.20.0 GST1_VAAPI_SITE = https://gstreamer.freedesktop.org/src/gstreamer-vaapi GST1_VAAPI_SOURCE = gstreamer-vaapi-$(GST1_VAAPI_VERSION).tar.xz GST1_VAAPI_LICENSE = LGPL-2.1+ -- 2.34.1 From ps.report at gmx.net Thu Feb 10 19:29:02 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 10 Feb 2022 20:29:02 +0100 Subject: [Buildroot] [PATCH v2 10/13] package/gstreamer1-editing-services: bump version to 1.20.0 In-Reply-To: <20220210192905.4500-1-ps.report@gmx.net> References: <20220210192905.4500-1-ps.report@gmx.net> Message-ID: <20220210192905.4500-11-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- .../gstreamer1-editing-services.hash | 4 ++-- .../gstreamer1-editing-services.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash index e29dc112ce..9662e6b8fb 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash @@ -1,5 +1,5 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.18.6.tar.xz.sha256sum -sha256 fe10d14ef896aa21038317f6f81e1158ccc6caaed9b0d5a29ae5bdd63074582c gst-editing-services-1.18.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.20.0.tar.xz.sha256sum +sha256 f837adcf4073d19a5908984e879cd039f4192ca368e71d39e8ccd8a56b9feedf gst-editing-services-1.20.0.tar.xz # Hashes for license files: sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk index a3722cbbca..5e03c08ae7 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_EDITING_SERVICES_VERSION = 1.18.6 +GSTREAMER1_EDITING_SERVICES_VERSION = 1.20.0 GSTREAMER1_EDITING_SERVICES_SOURCE = gst-editing-services-$(GSTREAMER1_EDITING_SERVICES_VERSION).tar.xz GSTREAMER1_EDITING_SERVICES_SITE = https://gstreamer.freedesktop.org/src/gstreamer-editing-services GSTREAMER1_EDITING_SERVICES_LICENSE = LGPL-2.0+ -- 2.34.1 From giulio.benetti at benettiengineering.com Thu Feb 10 20:01:02 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 10 Feb 2022 21:01:02 +0100 Subject: [Buildroot] [PATCH v4 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <20cfc8a7-9e51-8e16-3db6-775658503a75@xilinx.com> References: <20220210081932.3114763-1-neal.frager@xilinx.com> <7ed72b26-0729-93c7-e1c7-c429e2a5fb87@benettiengineering.com> <20cfc8a7-9e51-8e16-3db6-775658503a75@xilinx.com> Message-ID: Hi Michal, On 10/02/22 19:41, Michal Simek wrote: > > > On 2/10/22 17:39, Giulio Benetti wrote: >> Hi Neal, >> >> On 10/02/22 09:19, Neal Frager wrote: >>> This patch: >>> - bumps ATF to Xilinx v2.6: mainline v2.6 requires patch to build >>> - bumps U-Boot to Xilinx 2022.01: important drivers not in mainline >>> - bumps Linux to Xilinx 5.15: important drivers not in mainline >>> - deletes board/zynqmp/patches directory: patches already in mainline >>> - modifies board/zynqmp/genimage.cfg: U-Boot 2022.01 uses u-boot.itb format >>> - adds extlinux.conf to vfat bootfs >>> - modifies U-Boot to unified xilinx_zynqmp_virt_defconfig (supports all boards) >>> - adds support for SPL pm_cfg_obj.c loading to PMU firmware >>> - enables support for host machines without OpenSSL required by U-Boot and Linux >>> >> >> If you put the 3 dashes below, everything after them will be ignored, so you >> need to put here... >> >>> --- >>> V1->V2: >>> * fixed general build issues >>> * added extlinux.conf for run-time boot issue >>> V2->V3: >>> * enabled support for host machines without OpenSSL required by U-Boot and Linux >>> * moved readme.txt update to zynqmp_zcu102_defconfig patch 2/2 >>> V3->V4: >>> * cleaned up commit log messages >>> * added version history >>> --- >>> >>> Signed-off-by: Neal Frager >>> Reviewed-by: Giulio Benetti >>> Tested-by: Giulio Benetti >>> [Giulio: only build tested] >> >> These ^^^ >> >>> Signed-off-by: Neal Frager >> >> And drop this ^^^ that is already part of the patch. >> >> Same goes for patch 2/2 >> >> And I would shrink pm_cfg_obj.c down to what boards really sport without >> thinking too much about eventual custom boards as discussed here: >> https://lists.buildroot.org/pipermail/buildroot/2022-February/636513.html >> >>> --- >>> ? board/zynqmp/extlinux.conf??????????????????? |?? 5 + >>> ? board/zynqmp/genimage.cfg???????????????????? |?? 6 +- >>> ? ...-fix-Remove-GGC-ignore-Warray-bounds.patch |? 68 -- >>> ? ...64-zynqmp-zcu106-fix-SPL-MMC-booting.patch |? 52 -- >>> ? ...2-arm64-zynqmp-Enable-booting-to-ATF.patch | 114 ---- >>> ? ...ept-an-absolute-path-for-PMUFW_INIT_.patch |? 68 -- >>> ? ...ynqmp-pass-the-PS-init-file-as-a-kco.patch | 175 ----- >>> ? board/zynqmp/pm_cfg_obj.c???????????????????? | 614 ++++++++++++++++++ >> >> But here I see you only have one pm_cfg_obj.c for both z102 and z106, is that >> sufficient? I mean, have they so common peripherals? >> >> I see we have to deal with: >> Zynq UltraScale+ XCZU7EV-2FFVC1156 MPSoC for z106 >> and >> Zynq UltraScale+ XCZU9EG-2FFVB1156 MPSoC for z102 >> >> so I don't know if having a common pm_cfg_obj.c should be a good idea. >> >> I know few about FPGAs, but I don't know if they are really compatible. > > These boards can use the same config object. But it all the time depends on > configurations you want. But default every board/config/bitstream can require > different config object. Yes, so it's better using different pm_cfg_obj.c in different directories. This way if you will add another FPGA it will have its own bistream(pm_cfg_obj.c AFAICU). Thank you! Best regards -- Giulio Benetti Benetti Engineering sas From yann.morin.1998 at free.fr Thu Feb 10 20:37:19 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 10 Feb 2022 21:37:19 +0100 Subject: [Buildroot] [PATCH 000/107] Drop python 2.7 In-Reply-To: <2cba2cd6-ca70-6336-f2fe-60649a0f1a0d@mind.be> References: <20220209165213.4498-1-peter@korsgaard.com> <20220209213312.GE2249818@scaer> <2cba2cd6-ca70-6336-f2fe-60649a0f1a0d@mind.be> Message-ID: <20220210203719.GA3752867@scaer> Arnout, All, On 2022-02-10 18:15 +0100, Arnout Vandecappelle spake thusly: > On 09/02/2022 22:33, Yann E. MORIN wrote: > >On 2022-02-09 17:50 +0100, Peter Korsgaard spake thusly: > >>Python 2.7 is EOL since April 2020 and almost all packages support > >>python 3, so drop it before the 2022.02 release. [--SNIP--] > I did a bit of grepping for leftovers and found these: [--SNIP--] Yeah, I knew we had missed a few things, and Peter had already noticed a few in the cover-letter, but we needed to move forward quick, at the risk of breaking things. After all, the post-rc1 period is actually to fix things we broke! ;-) > The ones in gst1-devtools.mk and omniorb.mk look important, the rest is just > cleanup. qt5webengine is also a bit worrisome... For qt5webengine, IIRC James and Adam were working on it, and may have a pending change ready? I was thinking maybe about this: https://patchwork.ozlabs.org/project/buildroot/list/?series=284619 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 Thu Feb 10 20:44:30 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 10 Feb 2022 21:44:30 +0100 Subject: [Buildroot] [git commit] package/gtest: drop python2 host support Message-ID: <20220210203748.6253F82984@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=aa01b17862ab3af9d95a05018bf8ccf5e875057b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master And simplify the package a bit while we're at it. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/gtest/gtest.mk | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/package/gtest/gtest.mk b/package/gtest/gtest.mk index 673e626c45..e7ce89a3f4 100644 --- a/package/gtest/gtest.mk +++ b/package/gtest/gtest.mk @@ -19,16 +19,7 @@ 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 +HOST_GTEST_DEPENDENCIES = host-python3 # 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 @@ -56,7 +47,7 @@ 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) + $(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages endef HOST_GTEST_POST_INSTALL_HOOKS += HOST_GTEST_POST_INSTALL_PYTHON From yann.morin.1998 at free.fr Thu Feb 10 20:44:35 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 10 Feb 2022 21:44:35 +0100 Subject: [Buildroot] [git commit] package/rust: drop host-python2 support Message-ID: <20220210203748.75FE982DF5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4c8ae13e7ce84d76e7ed06d05322a49b26bd3c7f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master host-python2 is gone, so always use host-python3. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/rust/rust.mk | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/package/rust/rust.mk b/package/rust/rust.mk index 5fad7d404c..46487fe4b7 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -14,18 +14,11 @@ HOST_RUST_PROVIDES = host-rustc HOST_RUST_DEPENDENCIES = \ toolchain \ + host-python3 \ host-rust-bin \ host-openssl \ $(BR2_CMAKE_HOST_DEPENDENCY) -ifeq ($(BR2_PACKAGE_PYTHON3),y) -HOST_RUST_PYTHON_VERSION = $(PYTHON3_VERSION_MAJOR) -HOST_RUST_DEPENDENCIES += host-python3 -else -HOST_RUST_PYTHON_VERSION = $(PYTHON_VERSION_MAJOR) -HOST_RUST_DEPENDENCIES += host-python -endif - HOST_RUST_VERBOSITY = $(if $(VERBOSE),2,0) # Some vendor crates contain Cargo.toml.orig files. The associated @@ -50,7 +43,7 @@ define HOST_RUST_CONFIGURE_CMDS echo 'target = ["$(RUSTC_TARGET_NAME)"]'; \ echo 'cargo = "$(HOST_RUST_BIN_DIR)/cargo/bin/cargo"'; \ echo 'rustc = "$(HOST_RUST_BIN_DIR)/rustc/bin/rustc"'; \ - echo 'python = "$(HOST_DIR)/bin/python$(HOST_RUST_PYTHON_VERSION)"'; \ + echo 'python = "$(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR)"'; \ echo 'submodules = false'; \ echo 'vendor = true'; \ echo 'extended = true'; \ @@ -71,12 +64,12 @@ define HOST_RUST_CONFIGURE_CMDS endef define HOST_RUST_BUILD_CMDS - cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(HOST_RUST_PYTHON_VERSION) x.py build + cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py build endef define HOST_RUST_INSTALL_CMDS - cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(HOST_RUST_PYTHON_VERSION) x.py dist - cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(HOST_RUST_PYTHON_VERSION) x.py install + cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py dist + cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py install endef $(eval $(host-generic-package)) From yann.morin.1998 at free.fr Thu Feb 10 20:44:37 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 10 Feb 2022 21:44:37 +0100 Subject: [Buildroot] [git commit] package/libsigrok: drop host-python2 support Message-ID: <20220210203748.8158582DBD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0309124a499b37c3fb253386ad88eca19fa065ef branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master host-python2 is gone, so always use host-python3. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/libsigrok/libsigrok.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libsigrok/libsigrok.mk b/package/libsigrok/libsigrok.mk index 2a26518614..639ee4dc25 100644 --- a/package/libsigrok/libsigrok.mk +++ b/package/libsigrok/libsigrok.mk @@ -60,7 +60,7 @@ LIBSIGROK_CONF_OPTS += --enable-cxx LIBSIGROK_DEPENDENCIES += \ glibmm \ host-doxygen \ - $(if $(BR2_PACKAGE_PYTHON3),host-python3,host-python) + host-python3 else LIBSIGROK_CONF_OPTS += --disable-cxx endif From yann.morin.1998 at free.fr Thu Feb 10 20:44:32 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 10 Feb 2022 21:44:32 +0100 Subject: [Buildroot] [git commit] package/python-web2py: drop python2 host support Message-ID: <20220210203748.6C1ED81392@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=39b025258539b8686eb5615a6df10e2c06b5c228 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master With host-python gone, BR2_PACKAGE_PYTHON3 will always be enabled for a python package, so drop the legacy logic. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-web2py/python-web2py.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-web2py/python-web2py.mk b/package/python-web2py/python-web2py.mk index 5ea46fbfd9..3e453282a9 100644 --- a/package/python-web2py/python-web2py.mk +++ b/package/python-web2py/python-web2py.mk @@ -10,7 +10,7 @@ PYTHON_WEB2PY_LICENSE = LGPL-3.0 PYTHON_WEB2PY_LICENSE_FILES = LICENSE PYTHON_WEB2PY_CPE_ID_VENDOR = web2py PYTHON_WEB2PY_CPE_ID_PRODUCT = web2py -PYTHON_WEB2PY_DEPENDENCIES = $(if $(BR2_PACKAGE_PYTHON3),host-python3 python3,host-python python) \ +PYTHON_WEB2PY_DEPENDENCIES = host-python3 python3 \ host-python-pydal host-python-yatl PYTHON_WEB2PY_EXCLUSIONS = \ From yann.morin.1998 at free.fr Thu Feb 10 20:46:20 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 10 Feb 2022 21:46:20 +0100 Subject: [Buildroot] [PATCH] package/gtest: drop python2 host support In-Reply-To: <20220210191401.13822-1-peter@korsgaard.com> References: <20220210191401.13822-1-peter@korsgaard.com> Message-ID: <20220210204620.GB3752867@scaer> Peter, All, On 2022-02-10 20:14 +0100, Peter Korsgaard spake thusly: > And simplify the package a bit while we're at it. > > Signed-off-by: Peter Korsgaard Appied to master, along with your three other python-related patches. Regards, Yann E. MORIN. > --- > package/gtest/gtest.mk | 13 ++----------- > 1 file changed, 2 insertions(+), 11 deletions(-) > > diff --git a/package/gtest/gtest.mk b/package/gtest/gtest.mk > index 673e626c45..e7ce89a3f4 100644 > --- a/package/gtest/gtest.mk > +++ b/package/gtest/gtest.mk > @@ -19,16 +19,7 @@ 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 > +HOST_GTEST_DEPENDENCIES = host-python3 > > # 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 > @@ -56,7 +47,7 @@ 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) > + $(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages > endef > > HOST_GTEST_POST_INSTALL_HOOKS += HOST_GTEST_POST_INSTALL_PYTHON > -- > 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 Feb 10 20:48:16 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 10 Feb 2022 21:48:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/gtest: drop host python2 support In-Reply-To: <20220209224105.772909-1-james.hilliard1@gmail.com> References: <20220209224105.772909-1-james.hilliard1@gmail.com> Message-ID: <20220210204816.GC3752867@scaer> James, All, On 2022-02-09 15:41 -0700, James Hilliard spake thusly: > Signed-off-by: James Hilliard Thanks for your patch. I've instead applied Peter's patch, that did go the extra length of cleaning up now-unnecessary variables too. Thanks! ;-) Regards, Yann E. MORIN. > --- > package/gtest/gtest.mk | 5 ----- > 1 file changed, 5 deletions(-) > > diff --git a/package/gtest/gtest.mk b/package/gtest/gtest.mk > index 673e626c45..5bad1fb5f7 100644 > --- a/package/gtest/gtest.mk > +++ b/package/gtest/gtest.mk > @@ -19,13 +19,8 @@ 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 > -- > 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 peter at korsgaard.com Thu Feb 10 21:18:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:18:44 +0100 Subject: [Buildroot] [PATCH 000/107] Drop python 2.7 In-Reply-To: <20220210203719.GA3752867@scaer> (Yann E. MORIN's message of "Thu, 10 Feb 2022 21:37:19 +0100") References: <20220209165213.4498-1-peter@korsgaard.com> <20220209213312.GE2249818@scaer> <2cba2cd6-ca70-6336-f2fe-60649a0f1a0d@mind.be> <20220210203719.GA3752867@scaer> Message-ID: <87czjuwhcb.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: Hi, > Arnout, All, > On 2022-02-10 18:15 +0100, Arnout Vandecappelle spake thusly: >> On 09/02/2022 22:33, Yann E. MORIN wrote: >> >On 2022-02-09 17:50 +0100, Peter Korsgaard spake thusly: >> >>Python 2.7 is EOL since April 2020 and almost all packages support >> >>python 3, so drop it before the 2022.02 release. > [--SNIP--] >> I did a bit of grepping for leftovers and found these: > [--SNIP--] > Yeah, I knew we had missed a few things, and Peter had already noticed a > few in the cover-letter, but we needed to move forward quick, at the > risk of breaking things. > After all, the post-rc1 period is actually to fix things we broke! ;-) Indeed ;) >> The ones in gst1-devtools.mk and omniorb.mk look important, the rest is just >> cleanup. qt5webengine is also a bit worrisome... > For qt5webengine, IIRC James and Adam were working on it, and may have a > pending change ready? > I was thinking maybe about this: > https://patchwork.ozlabs.org/project/buildroot/list/?series=284619 Yes, I guess we'll need something like that. I did a quick test to see if the current qt5webengine version works with python3 - But it doesn't :/ -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 10 21:21:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:21:15 +0100 Subject: [Buildroot] [PATCH] package/rauc: bump to version 1.6 In-Reply-To: <20220209214326.21671-1-heiko.thiery@gmail.com> (Heiko Thiery's message of "Wed, 9 Feb 2022 22:43:27 +0100") References: <20220209214326.21671-1-heiko.thiery@gmail.com> Message-ID: <878ruiwh84.fsf@dell.be.48ers.dk> >>>>> "Heiko" == Heiko Thiery writes: > For release notes see: https://github.com/rauc/rauc/releases/tag/v1.6 > Signed-off-by: Heiko Thiery > --- > # utils/test-pkg -p rauc > 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 Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 10 21:20:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:20:35 +0100 Subject: [Buildroot] [git commit] package/rauc: bump to version 1.6 Message-ID: <20220210211521.34BE882235@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c24eff63a8f5f4f06e95ed6c899e1813287e33a4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For release notes see: https://github.com/rauc/rauc/releases/tag/v1.6 Signed-off-by: Heiko Thiery Tested-by: Marcus Hoffmann Signed-off-by: Peter Korsgaard --- package/rauc/rauc.hash | 4 ++-- package/rauc/rauc.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/rauc/rauc.hash b/package/rauc/rauc.hash index a025257845..f6c1446de4 100644 --- a/package/rauc/rauc.hash +++ b/package/rauc/rauc.hash @@ -1,4 +1,4 @@ # Locally calculated, after verifying against -# https://github.com/rauc/rauc/releases/download/v1.5.1/rauc-1.5.1.tar.xz.asc -sha256 d4ea009ce702bcb083d942398ccfedec959c6bbb7adc0fd77ae9314ce11d9d91 rauc-1.5.1.tar.xz +# https://github.com/rauc/rauc/releases/download/v1.6/rauc-1.6.tar.xz.asc +sha256 86013788dd02321b7c3f913ad3a1f8802afbc784ec076fa278524a9e1ef9e7b0 rauc-1.6.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/rauc/rauc.mk b/package/rauc/rauc.mk index 99efc16c2f..39f5255812 100644 --- a/package/rauc/rauc.mk +++ b/package/rauc/rauc.mk @@ -4,7 +4,7 @@ # ################################################################################ -RAUC_VERSION = 1.5.1 +RAUC_VERSION = 1.6 RAUC_SITE = https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION) RAUC_SOURCE = rauc-$(RAUC_VERSION).tar.xz RAUC_LICENSE = LGPL-2.1 From peter at korsgaard.com Thu Feb 10 21:24:29 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:24:29 +0100 Subject: [Buildroot] [PATCH] package/python3: unconditionally install python{, -config} symlinks Message-ID: <20220210212429.31856-1-peter@korsgaard.com> Now that host-python2 is gone, it makes sense to unconditionally install the symlinks for the host, similar to how it is done for the target. Signed-off-by: Peter Korsgaard --- package/python3/python3.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 6af7488ddd..3a334fb28d 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -262,18 +262,12 @@ endef PYTHON3_POST_INSTALL_TARGET_HOOKS += PYTHON3_INSTALL_SYMLINK -# Some packages may have build scripts requiring python3, whatever is the -# python version chosen for the target. -# Only install the python symlink in the host tree if python3 is enabled -# for the target. -ifeq ($(BR2_PACKAGE_PYTHON3),y) define HOST_PYTHON3_INSTALL_SYMLINK ln -fs python3 $(HOST_DIR)/bin/python ln -fs python3-config $(HOST_DIR)/bin/python-config endef HOST_PYTHON3_POST_INSTALL_HOOKS += HOST_PYTHON3_INSTALL_SYMLINK -endif # Provided to other packages PYTHON3_PATH = $(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/ -- 2.20.1 From peter at korsgaard.com Thu Feb 10 21:31:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:31:39 +0100 Subject: [Buildroot] [PATCH v4 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <20220210081932.3114763-1-neal.frager@xilinx.com> (Neal Frager's message of "Thu, 10 Feb 2022 01:19:31 -0700") References: <20220210081932.3114763-1-neal.frager@xilinx.com> Message-ID: <874k56wgqs.fsf@dell.be.48ers.dk> >>>>> "Neal" == Neal Frager writes: > This patch: > - bumps ATF to Xilinx v2.6: mainline v2.6 requires patch to build > - bumps U-Boot to Xilinx 2022.01: important drivers not in mainline > - bumps Linux to Xilinx 5.15: important drivers not in mainline > - deletes board/zynqmp/patches directory: patches already in mainline > - modifies board/zynqmp/genimage.cfg: U-Boot 2022.01 uses u-boot.itb format > - adds extlinux.conf to vfat bootfs > - modifies U-Boot to unified xilinx_zynqmp_virt_defconfig (supports all boards) > - adds support for SPL pm_cfg_obj.c loading to PMU firmware > - enables support for host machines without OpenSSL required by U-Boot and Linux > V3-> V4: > * cleaned up commit log messages > * added version history > --- [snip] > +++ b/configs/zynqmp_zcu106_defconfig > @@ -1,34 +1,39 @@ > BR2_aarch64=y > -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_GIT=y > BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" > -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.15" xlnx_rebase_v5.15 is a branch. A git version should point to a tag og a sha1 so the build is reproducible. > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.6" Same for xlnx_rebase_v2.6 > BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" > -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7" > -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA" > +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2022.01" And xlnx_rebase_v2022.01 I think I earlier asked you not to change the URL when it is not needed, please leave the existing /xilinx/ URL. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 10 21:32:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:32:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi-inputstream-adaptive: bump version to 19.0.3-Matrix In-Reply-To: <20220210174624.288510-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Thu, 10 Feb 2022 18:46:24 +0100") References: <20220210174624.288510-1-bernd.kuhls@t-online.de> Message-ID: <87zgmyv24j.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 10 21:33:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:33:07 +0100 Subject: [Buildroot] [PATCH] package/re2: bump version to 2022-02-01 In-Reply-To: <20220210110546.345600-1-buildroot@heine.tech> (Michael Nosthoff via buildroot's message of "Thu, 10 Feb 2022 12:05:38 +0100") References: <20220210110546.345600-1-buildroot@heine.tech> Message-ID: <87v8xmv23w.fsf@dell.be.48ers.dk> >>>>> "Michael" == Michael Nosthoff via buildroot writes: > Signed-off-by: Michael Nosthoff Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 10 21:34:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:34:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/libarchive: security bump to version 3.5.3 In-Reply-To: <20220209193614.330861-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 9 Feb 2022 20:36:14 +0100") References: <20220209193614.330861-1-fontaine.fabrice@gmail.com> Message-ID: <87r18av21r.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Libarchive 3.5.3 is a security release > Security Fixes: > - extended fix for following symlinks when processing the fixup list > (CVE-2021-31566) > - fix invalid memory access and out of bounds read in RAR5 reader > (CVE-2021-36976) > https://github.com/libarchive/libarchive/releases/tag/v3.5.3 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 10 21:34:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:34:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/audit: bump to version 3.0.7 In-Reply-To: <20220209194454.344276-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 9 Feb 2022 20:44:54 +0100") References: <20220209194454.344276-1-fontaine.fabrice@gmail.com> Message-ID: <87mtiyv219.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://github.com/linux-audit/audit-userspace/releases/tag/v3.0.7 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 10 21:34:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:34:58 +0100 Subject: [Buildroot] [PATCH 1/1] package/fping: bump to version 5.1 In-Reply-To: <20220209195930.349179-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 9 Feb 2022 20:59:30 +0100") References: <20220209195930.349179-1-fontaine.fabrice@gmail.com> Message-ID: <87iltmv20t.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://github.com/schweikert/fping/releases/tag/v5.1 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 10 21:35:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:35:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/gauche: drop autoreconf In-Reply-To: <20220209201444.352250-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 9 Feb 2022 21:14:44 +0100") References: <20220209201444.352250-1-fontaine.fabrice@gmail.com> Message-ID: <87ee4av204.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Commit 11cb72be570409be77d4bb49c17b4a2feef31be7 forgot to drop > autoreconf > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 10 21:35:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:35:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/libmodbus: bump to version 3.1.7 In-Reply-To: <20220209202825.359811-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 9 Feb 2022 21:28:25 +0100") References: <20220209202825.359811-1-fontaine.fabrice@gmail.com> Message-ID: <87a6eyv1zr.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://github.com/stephane/libmodbus/releases/tag/v3.1.7 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From nealf at xilinx.com Thu Feb 10 21:36:26 2022 From: nealf at xilinx.com (Neal Frager) Date: Thu, 10 Feb 2022 21:36:26 +0000 Subject: [Buildroot] [PATCH 1/2] configs/zynqmp_zcu106: Bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <1f0c37e0-6d9e-97d7-0421-58228d52405b@lucaceresoli.net> References: <20220208071559.2862411-1-neal.frager@xilinx.com> <69efa9da-ae55-6795-8724-ed7105083924@benettiengineering.com> <32cc1c12-1496-7db9-5e32-1b99404a4fe3@benettiengineering.com> <690d8e1b-fb6d-7c36-b07f-4ed9ca61b768@lucaceresoli.net> <489a02df-4f2b-a46c-aa49-15c3c545f8f2@lucaceresoli.net> <1EC54279-220E-4043-AFBA-953D2CF5E54A@xilinx.com> <1f0c37e0-6d9e-97d7-0421-58228d52405b@lucaceresoli.net> Message-ID: Hi Luca, > > OK, but it's better to use a subdirectory per board and leave the > filename as is, as per > > board/zynqmp/zcu102/pm_cfg_obj.c > board/zynqmp/zcu106/pm_cfg_obj.c > Good idea. We actually do agree on the purpose of buildroot. The whole point behind updating the zynqmp_zcu10x_defconfig files is to give buildroot users a better example to start from. In addition to evaluation boards being common and available, they are usually where developers get their starting example. That said, I will update the patch using Vitis 2021.2 generated pm_cfg_obj.c files for each board. I like your directory structure idea and will add the files this way. By having two examples, it should be clear for developers that the pm_cfg_obj.c file is something they will probably need to modify for their target hardware. All of this being said, I will make another version of the patch to incorporate this. Best regards, Neal Frager Xilinx From peter at korsgaard.com Thu Feb 10 21:37:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:37:28 +0100 Subject: [Buildroot] [PATCH 1/1] package/lzip: bump to version 1.23 In-Reply-To: <20220209203535.361814-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 9 Feb 2022 21:35:35 +0100") References: <20220209203535.361814-1-fontaine.fabrice@gmail.com> Message-ID: <875ypmv1wn.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://lists.nongnu.org/archive/html/lzip-bug/2022-02/msg00000.html > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 10 21:32:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:32:31 +0100 Subject: [Buildroot] [git commit] package/kodi-inputstream-adaptive: bump version to 19.0.3-Matrix Message-ID: <20220210213036.ABD5C82DE9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5eac014874d0d5be36f0d9a580b6fc9378678e35 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash | 2 +- package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash index c7a081f887..74aefe2138 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 f2285e77043a0c9160d1ab11dd5943cc584be17a2f7920be3002751ff697ec7b kodi-inputstream-adaptive-19.0.2-Matrix.tar.gz +sha256 1549422ac1386929dfc1a479898d6311440d1f8bfd1bc94e1fe5da9cc2db805c kodi-inputstream-adaptive-19.0.3-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 f632a42adb..83ac897037 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.2-Matrix +KODI_INPUTSTREAM_ADAPTIVE_VERSION = 19.0.3-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 peter at korsgaard.com Thu Feb 10 21:34:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:34:17 +0100 Subject: [Buildroot] [git commit] package/libarchive: security bump to version 3.5.3 Message-ID: <20220210213036.C395082DE9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=99d3d6afe7a5df12552d0d305743f64abdd155c4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Libarchive 3.5.3 is a security release Security Fixes: - extended fix for following symlinks when processing the fixup list (CVE-2021-31566) - fix invalid memory access and out of bounds read in RAR5 reader (CVE-2021-36976) https://github.com/libarchive/libarchive/releases/tag/v3.5.3 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libarchive/libarchive.hash | 2 +- package/libarchive/libarchive.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libarchive/libarchive.hash b/package/libarchive/libarchive.hash index d31e9f55f4..5dd8e5c167 100644 --- a/package/libarchive/libarchive.hash +++ b/package/libarchive/libarchive.hash @@ -1,4 +1,4 @@ # From https://www.libarchive.de/downloads/sha256sums -sha256 f0b19ff39c3c9a5898a219497ababbadab99d8178acc980155c7e1271089b5a0 libarchive-3.5.2.tar.xz +sha256 5cac725dd4be31c4a10b65d30f29dc957ea29ef3d758df6e46e8ae90a996a19a libarchive-3.5.3.tar.xz # Locally computed: sha256 b2cdf763345de2de34cebf54394df3c61a105c3b71288603c251f2fa638200ba COPYING diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk index eec256ba75..cf16c27e67 100644 --- a/package/libarchive/libarchive.mk +++ b/package/libarchive/libarchive.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBARCHIVE_VERSION = 3.5.2 +LIBARCHIVE_VERSION = 3.5.3 LIBARCHIVE_SOURCE = libarchive-$(LIBARCHIVE_VERSION).tar.xz LIBARCHIVE_SITE = https://www.libarchive.de/downloads LIBARCHIVE_INSTALL_STAGING = YES From peter at korsgaard.com Thu Feb 10 21:33:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:33:02 +0100 Subject: [Buildroot] [git commit] package/re2: bump version to 2022-02-01 Message-ID: <20220210213036.B72B882DFF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d2cf91e0c6a082261cc7ebb06dfdbd7bc2c2956f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Michael Nosthoff Signed-off-by: Peter Korsgaard --- package/re2/re2.hash | 2 +- package/re2/re2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/re2/re2.hash b/package/re2/re2.hash index a0a7d15938..7cfece5d5e 100644 --- a/package/re2/re2.hash +++ b/package/re2/re2.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 8c45f7fba029ab41f2a7e6545058d9eec94eef97ce70df58e92d85cfc08b4669 re2-2021-11-01.tar.gz +sha256 9c1e6acfd0fed71f40b025a7a1dabaf3ee2ebb74d64ced1f9ee1b0b01d22fd27 re2-2022-02-01.tar.gz sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 LICENSE diff --git a/package/re2/re2.mk b/package/re2/re2.mk index b562d5d7ef..31252ee82f 100644 --- a/package/re2/re2.mk +++ b/package/re2/re2.mk @@ -4,7 +4,7 @@ # ################################################################################ -RE2_VERSION = 2021-11-01 +RE2_VERSION = 2022-02-01 RE2_SITE = $(call github,google,re2,$(RE2_VERSION)) RE2_LICENSE = BSD-3-Clause RE2_LICENSE_FILES = LICENSE From peter at korsgaard.com Thu Feb 10 21:34:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:34:32 +0100 Subject: [Buildroot] [git commit] package/audit: bump to version 3.0.7 Message-ID: <20220210213036.CD1E482DFF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=de2df3109aaf4bcd2424bea0711b699c11bfb2d4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/linux-audit/audit-userspace/releases/tag/v3.0.7 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/audit/audit.hash | 2 +- package/audit/audit.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/audit/audit.hash b/package/audit/audit.hash index 9e16a339d6..6260f158d8 100644 --- a/package/audit/audit.hash +++ b/package/audit/audit.hash @@ -1,4 +1,4 @@ #Locally computed -sha256 c3e44d77513a42401d417dd0ceb203cf23886cb89402dea7b9494faa3f4fcc5e audit-3.0.6.tar.gz +sha256 8b4c78632a9301a1c7f859b0e38fc0b9c260b8214d6b7c771bf28b3d73a62597 audit-3.0.7.tar.gz sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING sha256 f18a0811fa0e220ccbc42f661545e77f0388631e209585ed582a1c693029c6aa COPYING.LIB diff --git a/package/audit/audit.mk b/package/audit/audit.mk index c89404f570..aa8ef515e6 100644 --- a/package/audit/audit.mk +++ b/package/audit/audit.mk @@ -4,7 +4,7 @@ # ################################################################################ -AUDIT_VERSION = 3.0.6 +AUDIT_VERSION = 3.0.7 AUDIT_SITE = http://people.redhat.com/sgrubb/audit AUDIT_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) AUDIT_LICENSE_FILES = COPYING COPYING.LIB From peter at korsgaard.com Thu Feb 10 21:34:52 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:34:52 +0100 Subject: [Buildroot] [git commit] package/fping: bump to version 5.1 Message-ID: <20220210213036.D62A382E01@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cde834f4777be4a855755703a291452ed6a5b052 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/schweikert/fping/releases/tag/v5.1 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/fping/fping.hash | 2 +- package/fping/fping.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/fping/fping.hash b/package/fping/fping.hash index 0b2233f379..4671cd77cf 100644 --- a/package/fping/fping.hash +++ b/package/fping/fping.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 ed38c0b9b64686a05d1b3bc1d66066114a492e04e44eef1821d43b1263cd57b8 fping-5.0.tar.gz +sha256 1ee5268c063d76646af2b4426052e7d81a42b657e6a77d8e7d3d2e60fd7409fe fping-5.1.tar.gz # Hash for license file sha256 6051b27e4b4a648f7bc8b329024da53a6e95ce88fcf0ccc259c371a74b741757 COPYING diff --git a/package/fping/fping.mk b/package/fping/fping.mk index 0a03c1dfdc..5986d05b93 100644 --- a/package/fping/fping.mk +++ b/package/fping/fping.mk @@ -4,7 +4,7 @@ # ################################################################################ -FPING_VERSION = 5.0 +FPING_VERSION = 5.1 FPING_SITE = http://fping.org/dist FPING_LICENSE = BSD-like FPING_LICENSE_FILES = COPYING From peter at korsgaard.com Thu Feb 10 21:35:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:35:31 +0100 Subject: [Buildroot] [git commit] package/libmodbus: bump to version 3.1.7 Message-ID: <20220210213036.E95D782DE9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ac89223b747add3b1bc15fa45d876d545c50cdd3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/stephane/libmodbus/releases/tag/v3.1.7 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libmodbus/libmodbus.hash | 2 +- package/libmodbus/libmodbus.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libmodbus/libmodbus.hash b/package/libmodbus/libmodbus.hash index 2931f3f3d7..b676d261de 100644 --- a/package/libmodbus/libmodbus.hash +++ b/package/libmodbus/libmodbus.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d7d9fa94a16edb094e5fdf5d87ae17a0dc3f3e3d687fead81835d9572cf87c16 libmodbus-3.1.6.tar.gz +sha256 7dfe958431d0570b271e1a5b329b76a658e89c614cf119eb5aadb725c87f8fbd libmodbus-3.1.7.tar.gz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LESSER diff --git a/package/libmodbus/libmodbus.mk b/package/libmodbus/libmodbus.mk index 52eb318a99..46eb860392 100644 --- a/package/libmodbus/libmodbus.mk +++ b/package/libmodbus/libmodbus.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMODBUS_VERSION = 3.1.6 +LIBMODBUS_VERSION = 3.1.7 LIBMODBUS_SITE = http://libmodbus.org/releases LIBMODBUS_LICENSE = LGPL-2.1+ LIBMODBUS_LICENSE_FILES = COPYING.LESSER From peter at korsgaard.com Thu Feb 10 21:37:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:37:23 +0100 Subject: [Buildroot] [git commit] package/lzip: bump to version 1.23 Message-ID: <20220210213036.F2A0582DFF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4648090a89a2478a4b0fa8cc43a49bc94668622c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://lists.nongnu.org/archive/html/lzip-bug/2022-02/msg00000.html Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/lzip/lzip.hash | 4 ++-- package/lzip/lzip.mk | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/lzip/lzip.hash b/package/lzip/lzip.hash index 57e7eb43f4..5e285a5ad8 100644 --- a/package/lzip/lzip.hash +++ b/package/lzip/lzip.hash @@ -1,4 +1,4 @@ -# From https://lists.nongnu.org/archive/html/lzip-bug/2021-01/msg00008.html -sha256 c3342d42e67139c165b8b128d033b5c96893a13ac5f25933190315214e87a948 lzip-1.22.tar.gz +# From https://lists.nongnu.org/archive/html/lzip-bug/2022-02/msg00000.html +sha256 ea02b9e6fb25d0e1a1d3ef4fdeb6ab26b931f1ece66fa1cee2983c95215e930a lzip-1.23.tar.lz # Locally calculated sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef COPYING diff --git a/package/lzip/lzip.mk b/package/lzip/lzip.mk index cca6da07d0..e3cc86b956 100644 --- a/package/lzip/lzip.mk +++ b/package/lzip/lzip.mk @@ -4,7 +4,8 @@ # ################################################################################ -LZIP_VERSION = 1.22 +LZIP_VERSION = 1.23 +LZIP_SOURCE = lzip-$(LZIP_VERSION).tar.lz LZIP_SITE = http://download.savannah.gnu.org/releases/lzip LZIP_LICENSE = GPL-2.0+ LZIP_LICENSE_FILES = COPYING From peter at korsgaard.com Thu Feb 10 21:35:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:35:17 +0100 Subject: [Buildroot] [git commit] package/gauche: drop autoreconf Message-ID: <20220210213036.E068482DE9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5f703276e0713b746f2c937c4c4fc02ef6ad1d77 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 11cb72be570409be77d4bb49c17b4a2feef31be7 forgot to drop autoreconf Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/gauche/gauche.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/gauche/gauche.mk b/package/gauche/gauche.mk index 2520379369..fe0a613a9d 100644 --- a/package/gauche/gauche.mk +++ b/package/gauche/gauche.mk @@ -10,8 +10,6 @@ GAUCHE_SITE = http://downloads.sourceforge.net/project/gauche/Gauche GAUCHE_LICENSE = BSD-3-Clause, Boehm-gc, SRFI (srfi-11.scm), reload (reload.scm) GAUCHE_LICENSE_FILES = COPYING GAUCHE_DEPENDENCIES = host-gauche -# We're patching configure.ac -GAUCHE_AUTORECONF = YES HOST_GAUCHE_CONF_OPTS = --without-zlib GAUCHE_CONF_OPTS = --without-libatomic-ops From peter at korsgaard.com Thu Feb 10 21:48:41 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:48:41 +0100 Subject: [Buildroot] [PATCH v2 07/13] package/gst1-libav: bump version to 1.20.0 In-Reply-To: <20220210192905.4500-8-ps.report@gmx.net> (Peter Seiderer's message of "Thu, 10 Feb 2022 20:28:59 +0100") References: <20220210192905.4500-1-ps.report@gmx.net> <20220210192905.4500-8-ps.report@gmx.net> Message-ID: <87y22itmti.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > - update COPYING hash (license text update from LGPL-2.0+ to LGPL-2.1+, > see [1]) and adjust GST1_LIBAV_LICENSE accordingly > [1] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/d157b23fb0ce175b167611a4cb019599d9017042.patch > Signed-off-by: Peter Seiderer Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 10 21:48:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:48:46 +0100 Subject: [Buildroot] [PATCH v2 02/13] package/gst1-plugins-base: bump version to 1.20.0 In-Reply-To: <20220210192905.4500-3-ps.report@gmx.net> (Peter Seiderer's message of "Thu, 10 Feb 2022 20:28:54 +0100") References: <20220210192905.4500-1-ps.report@gmx.net> <20220210192905.4500-3-ps.report@gmx.net> Message-ID: <87tud6tmtd.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > - disable new qt5 (Qt5 QML examples) option (suboption of already disabled > tests/examples) > - update COPYING hash (license text update from LGPL-2.0+ to LGPL-2.1+, > see [1]) and adjust GST1_PLUGINS_BASE_LICENSE accordingly > [1] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/d157b23fb0ce175b167611a4cb019599d9017042.patch > Signed-off-by: Peter Seiderer Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 10 21:48:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:48:51 +0100 Subject: [Buildroot] [PATCH v2 01/13] package/gstreamer1: bump version to 1.20.0 In-Reply-To: <20220210192905.4500-2-ps.report@gmx.net> (Peter Seiderer's message of "Thu, 10 Feb 2022 20:28:53 +0100") References: <20220210192905.4500-1-ps.report@gmx.net> <20220210192905.4500-2-ps.report@gmx.net> Message-ID: <87pmnutmt8.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > - meson option gtk_doc removed ([1]) > - update COPYING hash (license text update from LGPL-2.0+ to LGPL-2.1+, > see [2]) and adjust GSTREAMER1_LICENSE accordingly > [1] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/f5ee12395832d4305bb8dbdf4751552d03430d6d.patch > [2] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/d157b23fb0ce175b167611a4cb019599d9017042.patch > Signed-off-by: Peter Seiderer Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 10 21:49:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:49:10 +0100 Subject: [Buildroot] [PATCH v2 04/13] package/gst1-plugins-bad: bump version to 1.20.0 In-Reply-To: <20220210192905.4500-5-ps.report@gmx.net> (Peter Seiderer's message of "Thu, 10 Feb 2022 20:28:56 +0100") References: <20220210192905.4500-1-ps.report@gmx.net> <20220210192905.4500-5-ps.report@gmx.net> Message-ID: <87leyitmsp.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > - removed 0001-neon-Allow-building-against-neon-0-32-x.patch > (from upstream [1]) > - add codecalpha option (VP8/VP9 alpha support) > - add qroverlay option (overlay data on top of video in the form of a QR code) > with json-glib and libqrencode dependencies (omit json-glib explicit > dependencies as they are the same as for gstreamer1, glib2 BR2_USE_WCHAR, > BR2_TOOLCHAIN_HAS_THREADS and BR2_USE_MMU), place instead to 'plugins without > external deps' section into 'plugins that need external deps' section as it > clearly has dependencies (prelimary to upstream commit [2]) > - add aes option (AES encryption/decryption plugin) > - disable new option asio (Steinberg Audio Streaming, windows only) > - disable new option gs (Google Cloud Storage, needs storage_client library) > - disable new option ldac (LDAC bluetooth audio codec, needs ldacBT-enc library) > - remove legacy option ofa (disabled) > - disable new option onnx (ONNX neural network, needs libonnxruntime library) > - disable new option isac (iSAC plugin, needs webrtc-audio-coding-1 library) > - removed libmms ('Microsoft Multi Media Server streaming protocol' option, > add Config.in.legacy entry > - enable new gpl option ('Allow build plugins that have (A)GPL-licensed > dependencies') in case gpl plugin enabled > [1] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/b83e85ab677c79b46f520abebd1ee031e3a139c0.patch > [2] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/5d70c168b356691073a0d22f7ce3ea7efb20641c.patch > Signed-off-by: Peter Seiderer > --- > Changes v1 -> v2: > - fix rebase/merge artefact in Config.in.legacy (Baruch Siach) Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 10 21:49:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:49:16 +0100 Subject: [Buildroot] [PATCH v2 11/13] package/gst-omx: bump version to 1.20.0 In-Reply-To: <20220210192905.4500-12-ps.report@gmx.net> (Peter Seiderer's message of "Thu, 10 Feb 2022 20:29:03 +0100") References: <20220210192905.4500-1-ps.report@gmx.net> <20220210192905.4500-12-ps.report@gmx.net> Message-ID: <87h796tmsj.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > Signed-off-by: Peter Seiderer Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 10 21:49:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:49:23 +0100 Subject: [Buildroot] [PATCH v2 09/13] package/gst1-rtsp-server: bump version to 1.20.0 In-Reply-To: <20220210192905.4500-10-ps.report@gmx.net> (Peter Seiderer's message of "Thu, 10 Feb 2022 20:29:01 +0100") References: <20220210192905.4500-1-ps.report@gmx.net> <20220210192905.4500-10-ps.report@gmx.net> Message-ID: <87czjutmsc.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > - removed 0001-gst-rtsp-server-meson.build-add-gst_dep.patch > (upstream accepted [1]) > - update COPYING/COPYING.LIB hash (license text update from LGPL-2.0+ to > LGPL-2.1+, see [2]) and adjust GST1_RTSP_SERVER_LICENSE accordingly > [1] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/e637aae629f5b95b748a6f23abecc2b502272822.patch > [2] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/cc5cdab0165e3bdf5f4f748b3ba2a3493d304e70.patch > Signed-off-by: Peter Seiderer Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 10 21:49:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:49:28 +0100 Subject: [Buildroot] [PATCH v2 03/13] package/gst1-plugins-good: bump version to 1.20.0 In-Reply-To: <20220210192905.4500-4-ps.report@gmx.net> (Peter Seiderer's message of "Thu, 10 Feb 2022 20:28:55 +0100") References: <20220210192905.4500-1-ps.report@gmx.net> <20220210192905.4500-4-ps.report@gmx.net> Message-ID: <878ruitms7.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > Signed-off-by: Peter Seiderer Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 10 21:50:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:50:17 +0100 Subject: [Buildroot] [PATCH v2 13/13] package/gst1-plugins-bayer2rgb-neon: fix plugin install In-Reply-To: <20220210192905.4500-14-ps.report@gmx.net> (Peter Seiderer's message of "Thu, 10 Feb 2022 20:29:05 +0100") References: <20220210192905.4500-1-ps.report@gmx.net> <20220210192905.4500-14-ps.report@gmx.net> Message-ID: <874k56tmqu.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > - fix plugin install path, add '-with-plugindir=/usr/lib/gstreamer-1.0', > otherwise the plugins are installed with duplicated build path > (as detected by step_check_build_dir) > - remove GST1_PLUGINS_BAYER2RGB_NEON_INSTALL_STAGING (no need to install > the plugin to staging) > Signed-off-by: Peter Seiderer Committed, thanks. You have this as the last patch of the series, but is it related to the 1.20 bump or is this a fix that should also be backported to the LTS branch? -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 10 21:50:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:50:21 +0100 Subject: [Buildroot] [PATCH v2 06/13] package/gst1-devtools: bump version to 1.20.0 In-Reply-To: <20220210192905.4500-7-ps.report@gmx.net> (Peter Seiderer's message of "Thu, 10 Feb 2022 20:28:58 +0100") References: <20220210192905.4500-1-ps.report@gmx.net> <20220210192905.4500-7-ps.report@gmx.net> Message-ID: <87zgmys86a.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > - use new option cairo ('Build GstValidateVideo') instead pure optional > dependency on packet cairo > Signed-off-by: Peter Seiderer Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 10 21:50:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:50:26 +0100 Subject: [Buildroot] [PATCH v2 05/13] package/gst1-plugins-ugly: bump version to 1.20.0 In-Reply-To: <20220210192905.4500-6-ps.report@gmx.net> (Peter Seiderer's message of "Thu, 10 Feb 2022 20:28:57 +0100") References: <20220210192905.4500-1-ps.report@gmx.net> <20220210192905.4500-6-ps.report@gmx.net> Message-ID: <87v8xms865.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > - enable new gpl option ('Allow build plugins that have GPL-licensed > dependencies') in case gpl plugin enabled > Signed-off-by: Peter Seiderer Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 10 21:50:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:50:30 +0100 Subject: [Buildroot] [PATCH v2 12/13] package/gst1-python: bump version to 1.20.0 In-Reply-To: <20220210192905.4500-13-ps.report@gmx.net> (Peter Seiderer's message of "Thu, 10 Feb 2022 20:29:04 +0100") References: <20220210192905.4500-1-ps.report@gmx.net> <20220210192905.4500-13-ps.report@gmx.net> Message-ID: <87r18as861.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > Signed-off-by: Peter Seiderer Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 10 21:50:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:50:34 +0100 Subject: [Buildroot] [PATCH v2 08/13] package/gst1-vaapi: bump version to 1.20.0 In-Reply-To: <20220210192905.4500-9-ps.report@gmx.net> (Peter Seiderer's message of "Thu, 10 Feb 2022 20:29:00 +0100") References: <20220210192905.4500-1-ps.report@gmx.net> <20220210192905.4500-9-ps.report@gmx.net> Message-ID: <87mtiys85x.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > Signed-off-by: Peter Seiderer Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 10 21:50:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:50:38 +0100 Subject: [Buildroot] [PATCH v2 10/13] package/gstreamer1-editing-services: bump version to 1.20.0 In-Reply-To: <20220210192905.4500-11-ps.report@gmx.net> (Peter Seiderer's message of "Thu, 10 Feb 2022 20:29:02 +0100") References: <20220210192905.4500-1-ps.report@gmx.net> <20220210192905.4500-11-ps.report@gmx.net> Message-ID: <87iltms85t.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > Signed-off-by: Peter Seiderer Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 10 21:44:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:44:23 +0100 Subject: [Buildroot] [git commit] package/gst1-plugins-good: bump version to 1.20.0 Message-ID: <20220210214419.DF0DC82E01@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=34317969278d7b6d923d4889fb4235f112b2b201 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash | 4 ++-- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash index e342bd133e..9ad1d7bf46 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.6.tar.xz.sha256sum -sha256 26723ac01fcb360ade1f41d168c7c322d8af4ceb7e55c8c12ed2690d06a76eed gst-plugins-good-1.18.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.20.0.tar.xz.sha256sum +sha256 2d119c15ab8c9e79f8cd3c6bf582ff7a050b28ccae52ab4865e1a1464991659c gst-plugins-good-1.20.0.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk index e0ca29c5fd..6298d578ed 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_GOOD_VERSION = 1.18.6 +GST1_PLUGINS_GOOD_VERSION = 1.20.0 GST1_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST1_PLUGINS_GOOD_VERSION).tar.xz GST1_PLUGINS_GOOD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-good GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING From peter at korsgaard.com Thu Feb 10 21:44:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:44:05 +0100 Subject: [Buildroot] [git commit] package/gst1-plugins-base: bump version to 1.20.0 Message-ID: <20220210214419.D47BC828EF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=801131157dcef2c97e947a1d3e8c9bfa7aa3d870 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - disable new qt5 (Qt5 QML examples) option (suboption of already disabled tests/examples) - update COPYING hash (license text update from LGPL-2.0+ to LGPL-2.1+, see [1]) and adjust GST1_PLUGINS_BASE_LICENSE accordingly [1] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/d157b23fb0ce175b167611a4cb019599d9017042.patch Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash | 6 +++--- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash index 081dc6f213..ffc3445cda 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.18.6.tar.xz.sha256sum -sha256 56a9ff2fe9e6603b9e658cf6897d412a173d2180829fe01e92568549c6bd0f5b gst-plugins-base-1.18.6.tar.xz -sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING +# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.20.0.tar.xz.sha256sum +sha256 4cb66fccf730b1037e6533862c2128990912a6db4e5bbd14e0ef914450eb4c7c gst-plugins-base-1.20.0.tar.xz +sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk index c99eeb6c59..68281738fa 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk @@ -4,12 +4,12 @@ # ################################################################################ -GST1_PLUGINS_BASE_VERSION = 1.18.6 +GST1_PLUGINS_BASE_VERSION = 1.20.0 GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz GST1_PLUGINS_BASE_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-base GST1_PLUGINS_BASE_INSTALL_STAGING = YES GST1_PLUGINS_BASE_LICENSE_FILES = COPYING -GST1_PLUGINS_BASE_LICENSE = LGPL-2.0+, LGPL-2.1+ +GST1_PLUGINS_BASE_LICENSE = LGPL-2.1+ GST1_PLUGINS_BASE_CONF_OPTS = \ -Dexamples=disabled \ @@ -17,6 +17,7 @@ GST1_PLUGINS_BASE_CONF_OPTS = \ -Dgobject-cast-checks=disabled \ -Dglib-asserts=disabled \ -Dglib-checks=disabled \ + -Dqt5=disabled \ -Ddoc=disabled # Options which require currently unpackaged libraries From peter at korsgaard.com Thu Feb 10 21:47:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:47:01 +0100 Subject: [Buildroot] [git commit] package/gst1-vaapi: bump version to 1.20.0 Message-ID: <20220210214420.1DA4882E01@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4ca3cee910a174412a30bc87aa1b9b7cf41c15f0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-vaapi/gst1-vaapi.hash | 4 ++-- package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash index 7e22774c11..b32d91e1e2 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.18.6.tar.xz.sha256sum -sha256 ab6270f1e5e4546fbe6f5ea246d86ca3d196282eb863d46e6cdcc96f867449e0 gstreamer-vaapi-1.18.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.20.0.tar.xz.sha256sum +sha256 f79a47346dfd5e585e063e77078e5fc498b06dee895bfcbf47d8863fcac9ea32 gstreamer-vaapi-1.20.0.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk index 6af851602f..19ee625703 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_VAAPI_VERSION = 1.18.6 +GST1_VAAPI_VERSION = 1.20.0 GST1_VAAPI_SITE = https://gstreamer.freedesktop.org/src/gstreamer-vaapi GST1_VAAPI_SOURCE = gstreamer-vaapi-$(GST1_VAAPI_VERSION).tar.xz GST1_VAAPI_LICENSE = LGPL-2.1+ From peter at korsgaard.com Thu Feb 10 21:47:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:47:24 +0100 Subject: [Buildroot] [git commit] package/gstreamer1-editing-services: bump version to 1.20.0 Message-ID: <20220210214420.32B83826C1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=94aad30ba9893c6addef13c643646d46972af3d7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- .../gstreamer1-editing-services/gstreamer1-editing-services.hash | 4 ++-- .../gstreamer1-editing-services/gstreamer1-editing-services.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash index e29dc112ce..9662e6b8fb 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash @@ -1,5 +1,5 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.18.6.tar.xz.sha256sum -sha256 fe10d14ef896aa21038317f6f81e1158ccc6caaed9b0d5a29ae5bdd63074582c gst-editing-services-1.18.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.20.0.tar.xz.sha256sum +sha256 f837adcf4073d19a5908984e879cd039f4192ca368e71d39e8ccd8a56b9feedf gst-editing-services-1.20.0.tar.xz # Hashes for license files: sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk index a3722cbbca..5e03c08ae7 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_EDITING_SERVICES_VERSION = 1.18.6 +GSTREAMER1_EDITING_SERVICES_VERSION = 1.20.0 GSTREAMER1_EDITING_SERVICES_SOURCE = gst-editing-services-$(GSTREAMER1_EDITING_SERVICES_VERSION).tar.xz GSTREAMER1_EDITING_SERVICES_SITE = https://gstreamer.freedesktop.org/src/gstreamer-editing-services GSTREAMER1_EDITING_SERVICES_LICENSE = LGPL-2.0+ From peter at korsgaard.com Thu Feb 10 21:46:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:46:00 +0100 Subject: [Buildroot] [git commit] package/gst1-plugins-ugly: bump version to 1.20.0 Message-ID: <20220210214420.01780828EF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=40d94d268e2d658304e848f66d9264795ae8f637 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - enable new gpl option ('Allow build plugins that have GPL-licensed dependencies') in case gpl plugin enabled Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash | 4 ++-- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash index 26fd0fd9ac..d16134f24b 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.18.6.tar.xz.sha256sum -sha256 4969c409cb6a88317d2108b8577108e18623b2333d7b587ae3f39459c70e3a7f gst-plugins-ugly-1.18.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.20.0.tar.xz.sha256sum +sha256 4e8dcb5d26552f0a4937f6bc6279bd9070f55ca6ae0eaa32d72d264c44001c2e gst-plugins-ugly-1.20.0.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk index 7f483deb81..05b1fab304 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_UGLY_VERSION = 1.18.6 +GST1_PLUGINS_UGLY_VERSION = 1.20.0 GST1_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST1_PLUGINS_UGLY_VERSION).tar.xz GST1_PLUGINS_UGLY_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-ugly GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING @@ -89,6 +89,7 @@ endif # Add GPL license if GPL plugins enabled. ifeq ($(GST1_PLUGINS_UGLY_HAS_GPL_LICENSE),y) +GST1_PLUGINS_UGLY_CONF_OPTS += -Dgpl=enabled GST1_PLUGINS_UGLY_LICENSE += , GPL-2.0 endif From peter at korsgaard.com Thu Feb 10 21:46:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:46:44 +0100 Subject: [Buildroot] [git commit] package/gst1-libav: bump version to 1.20.0 Message-ID: <20220210214420.148C3828EF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1509fbe0689f37d002ec91a02068a942085b978b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - update COPYING hash (license text update from LGPL-2.0+ to LGPL-2.1+, see [1]) and adjust GST1_LIBAV_LICENSE accordingly [1] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/d157b23fb0ce175b167611a4cb019599d9017042.patch Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-libav/gst1-libav.hash | 6 +++--- package/gstreamer1/gst1-libav/gst1-libav.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/gstreamer1/gst1-libav/gst1-libav.hash b/package/gstreamer1/gst1-libav/gst1-libav.hash index 5fb39a0b3e..3204de3c14 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.hash +++ b/package/gstreamer1/gst1-libav/gst1-libav.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.18.6.tar.xz.sha256sum -sha256 e4e50dcd5a29441ae34de60d2221057e8064ed824bb6ca4dc0fd9ee88fbe9b81 gst-libav-1.18.6.tar.xz -sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING +# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.20.0.tar.xz.sha256sum +sha256 5eee5ed8d5082a31b500448e41535c722ee30cd5f8224f32982bbaba2eedef17 gst-libav-1.20.0.tar.xz +sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gst1-libav/gst1-libav.mk b/package/gstreamer1/gst1-libav/gst1-libav.mk index 55c6e06e0e..f07e5061b4 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.mk +++ b/package/gstreamer1/gst1-libav/gst1-libav.mk @@ -4,10 +4,10 @@ # ################################################################################ -GST1_LIBAV_VERSION = 1.18.6 +GST1_LIBAV_VERSION = 1.20.0 GST1_LIBAV_SOURCE = gst-libav-$(GST1_LIBAV_VERSION).tar.xz GST1_LIBAV_SITE = https://gstreamer.freedesktop.org/src/gst-libav -GST1_LIBAV_LICENSE = LGPL-2.0+ +GST1_LIBAV_LICENSE = LGPL-2.1+ GST1_LIBAV_LICENSE_FILES = COPYING GST1_LIBAV_DEPENDENCIES = host-pkgconf ffmpeg gstreamer1 gst1-plugins-base GST1_LIBAV_CONF_OPTS = -Ddoc=disabled From peter at korsgaard.com Thu Feb 10 21:47:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:47:46 +0100 Subject: [Buildroot] [git commit] package/gst1-python: bump version to 1.20.0 Message-ID: <20220210214420.4545C826C1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=68f93d3a8a6400190e6dc6bba691317062bf18b7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-python/gst1-python.hash | 4 ++-- package/gstreamer1/gst1-python/gst1-python.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-python/gst1-python.hash b/package/gstreamer1/gst1-python/gst1-python.hash index a760e53e7d..a2f17583fd 100644 --- a/package/gstreamer1/gst1-python/gst1-python.hash +++ b/package/gstreamer1/gst1-python/gst1-python.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.18.6.tar.xz.sha256sum -sha256 bdc0ea22fbd7335ad9decc151561aacc53c51206a9735b81eac700ce5b0bbd4a gst-python-1.18.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.20.0.tar.xz.sha256sum +sha256 8f67bdc5606ba33606c6bc896e89de7dcd8cf4fca459f71389b1b6fe075b5e54 gst-python-1.20.0.tar.xz sha256 ea3ad127610e5ded2210b3a86a46314f2b3b28e438eccffdae19a4d6fbcdb0c2 COPYING diff --git a/package/gstreamer1/gst1-python/gst1-python.mk b/package/gstreamer1/gst1-python/gst1-python.mk index 7faab752cd..a9cc32d1d7 100644 --- a/package/gstreamer1/gst1-python/gst1-python.mk +++ b/package/gstreamer1/gst1-python/gst1-python.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PYTHON_VERSION = 1.18.6 +GST1_PYTHON_VERSION = 1.20.0 GST1_PYTHON_SOURCE = gst-python-$(GST1_PYTHON_VERSION).tar.xz GST1_PYTHON_SITE = https://gstreamer.freedesktop.org/src/gst-python GST1_PYTHON_INSTALL_STAGING = YES From peter at korsgaard.com Thu Feb 10 21:47:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:47:35 +0100 Subject: [Buildroot] [git commit] package/gst-omx: bump version to 1.20.0 Message-ID: <20220210214420.3C025828EF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=19278dc72f887377980d3f704fecf1858766fbb5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst-omx/gst-omx.hash | 4 ++-- package/gstreamer1/gst-omx/gst-omx.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst-omx/gst-omx.hash b/package/gstreamer1/gst-omx/gst-omx.hash index 47f7cb5893..0b95505c5f 100644 --- a/package/gstreamer1/gst-omx/gst-omx.hash +++ b/package/gstreamer1/gst-omx/gst-omx.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.18.6.tar.xz.sha256sum -sha256 b5281c938e959fd2418e989cfb6065fdd9fe5f6f87ee86236c9427166e708163 gst-omx-1.18.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.20.0.tar.xz.sha256sum +sha256 c1e46b70ac379ac7b3646506370c9e1007b56ae293f4d334bc0e724c76c345dd gst-omx-1.20.0.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst-omx/gst-omx.mk b/package/gstreamer1/gst-omx/gst-omx.mk index dc65509244..f71e1242ff 100644 --- a/package/gstreamer1/gst-omx/gst-omx.mk +++ b/package/gstreamer1/gst-omx/gst-omx.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST_OMX_VERSION = 1.18.6 +GST_OMX_VERSION = 1.20.0 GST_OMX_SOURCE = gst-omx-$(GST_OMX_VERSION).tar.xz GST_OMX_SITE = https://gstreamer.freedesktop.org/src/gst-omx From peter at korsgaard.com Thu Feb 10 21:46:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:46:16 +0100 Subject: [Buildroot] [git commit] package/gst1-devtools: bump version to 1.20.0 Message-ID: <20220210214420.0B490826C1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b286cd169c57eb456ff8c540cafe8b314768aa72 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - use new option cairo ('Build GstValidateVideo') instead pure optional dependency on packet cairo Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-devtools/gst1-devtools.hash | 4 ++-- package/gstreamer1/gst1-devtools/gst1-devtools.mk | 13 ++++++++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.hash b/package/gstreamer1/gst1-devtools/gst1-devtools.hash index 011385e757..dd09280a9c 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.hash +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.18.6.tar.xz.sha256sum -sha256 3725622c740a635452e54b79d065f963ab7706ca2403de6c43072ae7610a0de4 gst-devtools-1.18.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.20.0.tar.xz.sha256sum +sha256 69fc8756ec9d93e5c5258c99088434f203e91fdbc5af28d1f2c583fd819b7a1d gst-devtools-1.20.0.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 validate/COPYING diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.mk b/package/gstreamer1/gst1-devtools/gst1-devtools.mk index 9089b12188..f72df9cf71 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.mk +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_DEVTOOLS_VERSION = 1.18.6 +GST1_DEVTOOLS_VERSION = 1.20.0 GST1_DEVTOOLS_SOURCE = gst-devtools-$(GST1_DEVTOOLS_VERSION).tar.xz GST1_DEVTOOLS_SITE = https://gstreamer.freedesktop.org/src/gst-devtools GST1_DEVTOOLS_LICENSE = LGPL-2.1+ @@ -16,8 +16,7 @@ GST1_DEVTOOLS_DEPENDENCIES = \ python3 \ gstreamer1 \ gst1-plugins-base \ - json-glib \ - $(if $(BR2_PACKAGE_CAIRO),cairo) + json-glib ifeq ($(BR2_PACKAGE_GST1_RTSP_SERVER),y) GST1_DEVTOOLS_DEPENDENCIES += gst1-rtsp-server @@ -30,4 +29,12 @@ GST1_DEVTOOLS_CONF_OPTS = \ -Dtests=disabled \ -Ddoc=disabled +# build GstValidateVideo +ifeq ($(BR2_PACKAGE_CAIRO),y) +GST1_DEVTOOLS_CONF_OPTS += -Dcairo=enabled +GST1_DEVTOOLS_DEPENDENCIES += cairo +else +GST1_DEVTOOLS_CONF_OPTS += -Dcairo=disabled +endif + $(eval $(meson-package)) From peter at korsgaard.com Thu Feb 10 21:44:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:44:35 +0100 Subject: [Buildroot] [git commit] package/gst1-plugins-bad: bump version to 1.20.0 Message-ID: <20220210214419.EC0F2826C1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3aa07290678aba1159341ab463d9a8936a896492 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - removed 0001-neon-Allow-building-against-neon-0-32-x.patch (from upstream [1]) - add codecalpha option (VP8/VP9 alpha support) - add qroverlay option (overlay data on top of video in the form of a QR code) with json-glib and libqrencode dependencies (omit json-glib explicit dependencies as they are the same as for gstreamer1, glib2 BR2_USE_WCHAR, BR2_TOOLCHAIN_HAS_THREADS and BR2_USE_MMU), place instead to 'plugins without external deps' section into 'plugins that need external deps' section as it clearly has dependencies (prelimary to upstream commit [2]) - add aes option (AES encryption/decryption plugin) - disable new option asio (Steinberg Audio Streaming, windows only) - disable new option gs (Google Cloud Storage, needs storage_client library) - disable new option ldac (LDAC bluetooth audio codec, needs ldacBT-enc library) - remove legacy option ofa (disabled) - disable new option onnx (ONNX neural network, needs libonnxruntime library) - disable new option isac (iSAC plugin, needs webrtc-audio-coding-1 library) - removed libmms ('Microsoft Multi Media Server streaming protocol' option, add Config.in.legacy entry - enable new gpl option ('Allow build plugins that have (A)GPL-licensed dependencies') in case gpl plugin enabled [1] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/b83e85ab677c79b46f520abebd1ee031e3a139c0.patch [2] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/5d70c168b356691073a0d22f7ce3ea7efb20641c.patch Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- Config.in.legacy | 8 +++++ ...1-neon-Allow-building-against-neon-0-32-x.patch | 29 ----------------- package/gstreamer1/gst1-plugins-bad/Config.in | 31 ++++++++++++------- .../gst1-plugins-bad/gst1-plugins-bad.hash | 4 +-- .../gst1-plugins-bad/gst1-plugins-bad.mk | 36 ++++++++++++++++------ 5 files changed, 57 insertions(+), 51 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 49c24e61bf..2b1fd48de5 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,14 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBMMS + bool "gst1-plugins-bad plugin libmms was removed" + depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_LEGACY + help + This plugin was removed with gst1-plugins-bad-1.20.0. + config BR2_PACKAGE_PYTHON_FUNCTOOLS32 bool "python-functools32 removed" select BR2_LEGACY 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 deleted file mode 100644 index e995a8cb91..0000000000 --- a/package/gstreamer1/gst1-plugins-bad/0001-neon-Allow-building-against-neon-0-32-x.patch +++ /dev/null @@ -1,29 +0,0 @@ -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 - diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in index b793cb8eb1..234d57636b 100644 --- a/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/package/gstreamer1/gst1-plugins-bad/Config.in @@ -76,6 +76,12 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CAMERABIN2 help Take image snapshots and record movies from camera +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CODECALPHA + bool "codecalpha" + help + Elements for VP8/VP9 alpha support (codecalphademux, + alphacombine, vp8alphadecodebin, vp9alphadecodebin) + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_COLOREFFECTS bool "coloreffects" help @@ -324,6 +330,12 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_Y4M comment "plugins with external dependencies" +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AES + bool "aes" + select BR2_PACKAGE_OPENSSL + help + "AES encryption/decryption plugin" + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASSRENDER bool "assrender" depends on BR2_INSTALL_LIBSTDCPP # libass -> harfbuzz @@ -458,17 +470,6 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_KMS help KMS video sink -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBMMS - bool "libmms" - depends on BR2_USE_WCHAR # libmms -> libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libmms -> libglib2 - select BR2_PACKAGE_LIBMMS - help - Microsoft Multi Media Server streaming protocol support - -comment "libmms needs a toolchain w/ wchar, threads" - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS - config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DTLS bool "dtls" select BR2_PACKAGE_OPENSSL @@ -558,6 +559,14 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPUS help OPUS plugin library +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_QROVERLAY + bool "qroverlay" + select BR2_PACKAGE_JSON_GLIB + select BR2_PACKAGE_LIBQRENCODE + help + Elements qroverlay, debugqroverlay (overlay data on top of + video in the form of a QR code) + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RSVG bool "rsvg" depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # librsvg diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash index d31a78981e..72c9624b94 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.6.tar.xz.sha256sum -sha256 0b1b50ac6311f0c510248b6cd64d6d3c94369344828baa602db85ded5bc70ec9 gst-plugins-bad-1.18.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.20.0.tar.xz.sha256sum +sha256 015b8d4d9a395ebf444d40876867a2034dd3304b3ad48bc3a0dd0c1ee71dc11d gst-plugins-bad-1.20.0.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index d02ca1ba74..24fd9dd312 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BAD_VERSION = 1.18.6 +GST1_PLUGINS_BAD_VERSION = 1.20.0 GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz GST1_PLUGINS_BAD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-bad GST1_PLUGINS_BAD_INSTALL_STAGING = YES @@ -34,6 +34,7 @@ GST1_PLUGINS_BAD_CONF_OPTS = \ # Options which require currently unpackaged libraries GST1_PLUGINS_BAD_CONF_OPTS += \ + -Dasio=disabled \ -Davtp=disabled \ -Dopensles=disabled \ -Dmsdk=disabled \ @@ -46,16 +47,18 @@ GST1_PLUGINS_BAD_CONF_OPTS += \ -Dresindvd=disabled \ -Dfaac=disabled \ -Dflite=disabled \ + -Dgs=disabled \ -Dgsm=disabled \ -Dkate=disabled \ -Dladspa=disabled \ + -Dldac=disabled \ -Dlv2=disabled \ -Dmediafoundation=disabled \ -Dmicrodns=disabled \ -Dlibde265=disabled \ -Dmodplug=disabled \ -Dmplex=disabled \ - -Dofa=disabled \ + -Donnx=disabled \ -Dopenexr=disabled \ -Dopenni2=disabled \ -Dteletext=disabled \ @@ -69,6 +72,7 @@ GST1_PLUGINS_BAD_CONF_OPTS += \ -Dwasapi2=disabled \ -Dzxing=disabled \ -Dmagicleap=disabled \ + -Disac=disabled \ -Diqa=disabled \ -Dopencv=disabled @@ -180,6 +184,12 @@ else GST1_PLUGINS_BAD_CONF_OPTS += -Dcamerabin2=disabled endif +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CODECALPHA),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Dcodecalpha=enabled +else +GST1_PLUGINS_BAD_CONF_OPTS += -Dcodecalpha=disabled +endif + ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_COLOREFFECTS),y) GST1_PLUGINS_BAD_CONF_OPTS += -Dcoloreffects=enabled else @@ -497,6 +507,13 @@ endif # Plugins with dependencies +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AES),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Daes=enabled +GST1_PLUGINS_BAD_DEPENDENCIES += openssl +else +GST1_PLUGINS_BAD_CONF_OPTS += -Daes=disabled +endif + ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASSRENDER),y) GST1_PLUGINS_BAD_CONF_OPTS += -Dassrender=enabled GST1_PLUGINS_BAD_DEPENDENCIES += libass @@ -604,13 +621,6 @@ else GST1_PLUGINS_BAD_CONF_OPTS += -Dkms=disabled endif -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBMMS),y) -GST1_PLUGINS_BAD_CONF_OPTS += -Dlibmms=enabled -GST1_PLUGINS_BAD_DEPENDENCIES += libmms -else -GST1_PLUGINS_BAD_CONF_OPTS += -Dlibmms=disabled -endif - ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DTLS),y) GST1_PLUGINS_BAD_CONF_OPTS += -Ddtls=enabled GST1_PLUGINS_BAD_DEPENDENCIES += openssl @@ -677,6 +687,13 @@ else GST1_PLUGINS_BAD_CONF_OPTS += -Dopus=disabled endif +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_QROVERLAY),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Dqroverlay=enabled +GST1_PLUGINS_BAD_DEPENDENCIES += json-glib libqrencode +else +GST1_PLUGINS_BAD_CONF_OPTS += -Dqroverlay=disabled +endif + ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RSVG),y) GST1_PLUGINS_BAD_CONF_OPTS += -Drsvg=enabled GST1_PLUGINS_BAD_DEPENDENCIES += librsvg @@ -787,6 +804,7 @@ endif # Add GPL license if GPL licensed plugins enabled. ifeq ($(GST1_PLUGINS_BAD_HAS_GPL_LICENSE),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Dgpl=enabled GST1_PLUGINS_BAD_LICENSE += , GPL-2.0+ GST1_PLUGINS_BAD_LICENSE_FILES += COPYING endif From peter at korsgaard.com Thu Feb 10 21:47:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:47:10 +0100 Subject: [Buildroot] [git commit] package/gst1-rtsp-server: bump version to 1.20.0 Message-ID: <20220210214420.29001826C1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f68a5faf201ea176361055517ff655b6e59c9c3b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - removed 0001-gst-rtsp-server-meson.build-add-gst_dep.patch (upstream accepted [1]) - update COPYING/COPYING.LIB hash (license text update from LGPL-2.0+ to LGPL-2.1+, see [2]) and adjust GST1_RTSP_SERVER_LICENSE accordingly [1] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/e637aae629f5b95b748a6f23abecc2b502272822.patch [2] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/cc5cdab0165e3bdf5f4f748b3ba2a3493d304e70.patch Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- ...1-gst-rtsp-server-meson.build-add-gst_dep.patch | 41 ---------------------- .../gst1-rtsp-server/gst1-rtsp-server.hash | 8 ++--- .../gst1-rtsp-server/gst1-rtsp-server.mk | 4 +-- 3 files changed, 6 insertions(+), 47 deletions(-) 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 deleted file mode 100644 index b63f634598..0000000000 --- a/package/gstreamer1/gst1-rtsp-server/0001-gst-rtsp-server-meson.build-add-gst_dep.patch +++ /dev/null @@ -1,41 +0,0 @@ -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 - diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash index fadef41351..00ff974c6e 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash @@ -1,4 +1,4 @@ -# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.18.6.tar.xz.sha256sum -sha256 826f32afbcf94b823541efcac4a0dacdb62f6145ef58f363095749f440262be9 gst-rtsp-server-1.18.6.tar.xz -sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING -sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING.LIB +# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.20.0.tar.xz.sha256sum +sha256 c209f5ed906da713fdd44a8844e909aa6c8af3dfb630259b092cfb77a7755843 gst-rtsp-server-1.20.0.tar.xz +sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING +sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING.LIB diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk index 55403754f3..d22dd5e7cc 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk @@ -4,10 +4,10 @@ # ################################################################################ -GST1_RTSP_SERVER_VERSION = 1.18.6 +GST1_RTSP_SERVER_VERSION = 1.20.0 GST1_RTSP_SERVER_SOURCE = gst-rtsp-server-$(GST1_RTSP_SERVER_VERSION).tar.xz GST1_RTSP_SERVER_SITE = http://gstreamer.freedesktop.org/src/gst-rtsp-server -GST1_RTSP_SERVER_LICENSE = LGPL-2.0+ +GST1_RTSP_SERVER_LICENSE = LGPL-2.1+ GST1_RTSP_SERVER_LICENSE_FILES = COPYING COPYING.LIB GST1_RTSP_SERVER_CPE_ID_VENDOR = gstreamer_project GST1_RTSP_SERVER_CPE_ID_PRODUCT = gst-rtsp-server From peter at korsgaard.com Thu Feb 10 21:42:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:42:21 +0100 Subject: [Buildroot] [git commit] package/gstreamer1: bump version to 1.20.0 Message-ID: <20220210214419.CA1A0826C1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c88a382c55840a71b7b56c8fffdfb2b64eb701d2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - meson option gtk_doc removed ([1]) - update COPYING hash (license text update from LGPL-2.0+ to LGPL-2.1+, see [2]) and adjust GSTREAMER1_LICENSE accordingly [1] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/f5ee12395832d4305bb8dbdf4751552d03430d6d.patch [2] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/d157b23fb0ce175b167611a4cb019599d9017042.patch Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/gstreamer1/gstreamer1/gstreamer1.hash | 6 +++--- package/gstreamer1/gstreamer1/gstreamer1.mk | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/gstreamer1/gstreamer1/gstreamer1.hash b/package/gstreamer1/gstreamer1/gstreamer1.hash index 1202bf2c50..f4a74a6125 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.hash +++ b/package/gstreamer1/gstreamer1/gstreamer1.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.18.6.tar.xz.sha256sum -sha256 4ec816010dd4d3a93cf470ad0a6f25315f52b204eb1d71dfa70ab8a1c3bd06e6 gstreamer-1.18.6.tar.xz -sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING +# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.20.0.tar.xz.sha256sum +sha256 edf4bffff85591d4fff7b21bb9ed7f0feabc123ac4a4eff29e73cbce454f9db7 gstreamer-1.20.0.tar.xz +sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk index 27745f3bf9..86df5d6cf6 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -4,12 +4,12 @@ # ################################################################################ -GSTREAMER1_VERSION = 1.18.6 +GSTREAMER1_VERSION = 1.20.0 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer GSTREAMER1_INSTALL_STAGING = YES GSTREAMER1_LICENSE_FILES = COPYING -GSTREAMER1_LICENSE = LGPL-2.0+, LGPL-2.1+ +GSTREAMER1_LICENSE = LGPL-2.1+ GSTREAMER1_CPE_ID_VENDOR = gstreamer_project GSTREAMER1_CPE_ID_PRODUCT = gstreamer @@ -18,7 +18,6 @@ GSTREAMER1_CONF_OPTS = \ -Dtests=disabled \ -Dbenchmarks=disabled \ -Dtools=$(if $(BR2_PACKAGE_GSTREAMER1_INSTALL_TOOLS),enabled,disabled) \ - -Dgtk_doc=disabled \ -Dgobject-cast-checks=disabled \ -Dglib-asserts=disabled \ -Dglib-checks=disabled \ From peter at korsgaard.com Thu Feb 10 21:47:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:47:54 +0100 Subject: [Buildroot] [git commit] package/gst1-plugins-bayer2rgb-neon: fix plugin install Message-ID: <20220210214420.4F108828EF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2db52eed25f20bf0b56a6fa146f384c9139d8f83 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - fix plugin install path, add '-with-plugindir=/usr/lib/gstreamer-1.0', otherwise the plugins are installed with duplicated build path (as detected by step_check_build_dir) - remove GST1_PLUGINS_BAYER2RGB_NEON_INSTALL_STAGING (no need to install the plugin to staging) Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- .../gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.mk b/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.mk index 815099e315..0d4aeac7f5 100644 --- a/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.mk +++ b/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.mk @@ -10,8 +10,6 @@ GST1_PLUGINS_BAYER2RGB_NEON_SITE_METHOD = git GST1_PLUGINS_BAYER2RGB_NEON_LICENSE = GPL-3.0 GST1_PLUGINS_BAYER2RGB_NEON_LICENSE_FILES = COPYING -GST1_PLUGINS_BAYER2RGB_NEON_INSTALL_STAGING = YES - GST1_PLUGINS_BAYER2RGB_NEON_DEPENDENCIES = \ host-pkgconf \ gstreamer1 \ @@ -20,4 +18,6 @@ GST1_PLUGINS_BAYER2RGB_NEON_DEPENDENCIES = \ GST1_PLUGINS_BAYER2RGB_NEON_AUTORECONF = YES +GST1_PLUGINS_BAYER2RGB_NEON_CONF_OPTS = --with-plugindir=/usr/lib/gstreamer-1.0 + $(eval $(autotools-package)) From peter at korsgaard.com Thu Feb 10 21:55:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:55:46 +0100 Subject: [Buildroot] [PATCH 000/107] Drop python 2.7 In-Reply-To: <9be8fa8f-44d8-6025-3161-dd1818d9c323@othermo.de> (Marcus Hoffmann's message of "Thu, 10 Feb 2022 18:31:38 +0100") References: <20220209165213.4498-1-peter@korsgaard.com> <20220209213312.GE2249818@scaer> <2cba2cd6-ca70-6336-f2fe-60649a0f1a0d@mind.be> <9be8fa8f-44d8-6025-3161-dd1818d9c323@othermo.de> Message-ID: <87bkzes7x9.fsf@dell.be.48ers.dk> >>>>> "Marcus" == Marcus Hoffmann writes: > Hi all! > On 10.02.22 18:15, Arnout Vandecappelle wrote: > [...] >> >> >> The ones in gst1-devtools.mk and omniorb.mk look important, the rest >> is just cleanup. qt5webengine is also a bit worrisome... >> >> Also, some cleanups that I think are needed: >> - get rid of HOST_PYTHON_FOO_NEEDS_HOST_PYTHON >> - symlink $(HOST_DIR)/bin/python to python3, and get rid of the >> workarounds in e.g. nodejs > This last bit would actually supersede the patch I send yesterday :-) > http://patchwork.ozlabs.org/project/buildroot/patch/20220209214305.314272-1-marcus.hoffmann at othermo.de/ Yes, I've sent a patch doing that and marked your patch as superseeded: https://patchwork.ozlabs.org/project/buildroot/patch/20220210212429.31856-1-peter at korsgaard.com/ -- Bye, Peter Korsgaard From james.hilliard1 at gmail.com Thu Feb 10 21:59:09 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 10 Feb 2022 14:59:09 -0700 Subject: [Buildroot] [PATCH 000/107] Drop python 2.7 In-Reply-To: <87czjuwhcb.fsf@dell.be.48ers.dk> References: <20220209165213.4498-1-peter@korsgaard.com> <20220209213312.GE2249818@scaer> <2cba2cd6-ca70-6336-f2fe-60649a0f1a0d@mind.be> <20220210203719.GA3752867@scaer> <87czjuwhcb.fsf@dell.be.48ers.dk> Message-ID: On Thu, Feb 10, 2022 at 2:19 PM Peter Korsgaard wrote: > > >>>>> "Yann" == Yann E MORIN writes: > > Hi, > > > Arnout, All, > > On 2022-02-10 18:15 +0100, Arnout Vandecappelle spake thusly: > >> On 09/02/2022 22:33, Yann E. MORIN wrote: > >> >On 2022-02-09 17:50 +0100, Peter Korsgaard spake thusly: > >> >>Python 2.7 is EOL since April 2020 and almost all packages support > >> >>python 3, so drop it before the 2022.02 release. > > [--SNIP--] > >> I did a bit of grepping for leftovers and found these: > > [--SNIP--] > > > Yeah, I knew we had missed a few things, and Peter had already noticed a > > few in the cover-letter, but we needed to move forward quick, at the > > risk of breaking things. > > > After all, the post-rc1 period is actually to fix things we broke! ;-) > > Indeed ;) > > >> The ones in gst1-devtools.mk and omniorb.mk look important, the rest is just > >> cleanup. qt5webengine is also a bit worrisome... > > > For qt5webengine, IIRC James and Adam were working on it, and may have a > > pending change ready? > > > I was thinking maybe about this: > > https://patchwork.ozlabs.org/project/buildroot/list/?series=284619 > > Yes, I guess we'll need something like that. I did a quick test to see > if the current qt5webengine version works with python3 - But it doesn't Yeah, that should get qt5webengine working on python3, there's a bunch of other issues it should fix as well relating to handling the host/target pkg-config split. > :/ > > -- > Bye, Peter Korsgaard > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From ps.report at gmx.net Thu Feb 10 22:18:13 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 10 Feb 2022 23:18:13 +0100 Subject: [Buildroot] [PATCH v2 13/13] package/gst1-plugins-bayer2rgb-neon: fix plugin install In-Reply-To: <874k56tmqu.fsf@dell.be.48ers.dk> References: <20220210192905.4500-1-ps.report@gmx.net> <20220210192905.4500-14-ps.report@gmx.net> <874k56tmqu.fsf@dell.be.48ers.dk> Message-ID: <20220210231813.236e2aae@gmx.net> Hello Peter, On Thu, 10 Feb 2022 22:50:17 +0100, Peter Korsgaard wrote: > >>>>> "Peter" == Peter Seiderer writes: > > > - fix plugin install path, add '-with-plugindir=/usr/lib/gstreamer-1.0', > > otherwise the plugins are installed with duplicated build path > > (as detected by step_check_build_dir) > > > - remove GST1_PLUGINS_BAYER2RGB_NEON_INSTALL_STAGING (no need to install > > the plugin to staging) > > > Signed-off-by: Peter Seiderer > > Committed, thanks. > > You have this as the last patch of the series, but is it related to the > 1.20 bump or is this a fix that should also be backported to the LTS > branch? > Observed the failure only after the 1.20.0 version bump..., but did not find any explanation why the failure should depend (or not depend) on the version bump...., but I think the patch should do no harm for the 1.18.x version..., so should be save for the LTS branch (specially the drop of install staging)... Regards, Peter From peter at korsgaard.com Thu Feb 10 22:31:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 23:31:27 +0100 Subject: [Buildroot] [PATCH] package/python3-pycparser: drop unused host package Message-ID: <20220210223128.11002-1-peter@korsgaard.com> Commit d9bf97cf16fa6945466a67 (package/python-cryptography: drop host variant) dropped the dependency on host-python3-pycparser, so it is now unused. Drop it. Signed-off-by: Peter Korsgaard --- package/python-pycparser/python-pycparser.mk | 1 - .../python3-pycparser/python3-pycparser.hash | 1 - package/python3-pycparser/python3-pycparser.mk | 17 ----------------- 3 files changed, 19 deletions(-) delete mode 120000 package/python3-pycparser/python3-pycparser.hash delete mode 100644 package/python3-pycparser/python3-pycparser.mk diff --git a/package/python-pycparser/python-pycparser.mk b/package/python-pycparser/python-pycparser.mk index 20c3f641a9..1737c99a32 100644 --- a/package/python-pycparser/python-pycparser.mk +++ b/package/python-pycparser/python-pycparser.mk @@ -4,7 +4,6 @@ # ################################################################################ -# Please keep in sync with package/python3-pycparser/python3-pycparser.mk PYTHON_PYCPARSER_VERSION = 2.21 PYTHON_PYCPARSER_SOURCE = pycparser-$(PYTHON_PYCPARSER_VERSION).tar.gz PYTHON_PYCPARSER_SITE = https://files.pythonhosted.org/packages/5e/0b/95d387f5f4433cb0f53ff7ad859bd2c6051051cebbb564f139a999ab46de diff --git a/package/python3-pycparser/python3-pycparser.hash b/package/python3-pycparser/python3-pycparser.hash deleted file mode 120000 index 7a1912cad2..0000000000 --- a/package/python3-pycparser/python3-pycparser.hash +++ /dev/null @@ -1 +0,0 @@ -../python-pycparser/python-pycparser.hash \ No newline at end of file diff --git a/package/python3-pycparser/python3-pycparser.mk b/package/python3-pycparser/python3-pycparser.mk deleted file mode 100644 index 4075f4a38f..0000000000 --- a/package/python3-pycparser/python3-pycparser.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# python3-pycparser -# -################################################################################ - -# Please keep in sync with package/python-pycparser/python-pycparser.mk -PYTHON3_PYCPARSER_VERSION = 2.21 -PYTHON3_PYCPARSER_SOURCE = pycparser-$(PYTHON3_PYCPARSER_VERSION).tar.gz -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 -HOST_PYTHON3_PYCPARSER_DL_SUBDIR = python-pycparser -HOST_PYTHON3_PYCPARSER_NEEDS_HOST_PYTHON = python3 - -$(eval $(host-python-package)) -- 2.20.1 From peter at korsgaard.com Thu Feb 10 22:40:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 23:40:43 +0100 Subject: [Buildroot] [PATCH 2/5] package/python3-cheetah: drop host package In-Reply-To: <20220210224047.11992-1-peter@korsgaard.com> References: <20220210224047.11992-1-peter@korsgaard.com> Message-ID: <20220210224047.11992-2-peter@korsgaard.com> Now that host-python2 is gone, the custom python3 variant can be dropped. Signed-off-by: Peter Korsgaard --- package/mongodb/mongodb.mk | 2 +- package/python-cheetah/python-cheetah.mk | 1 - package/python3-cheetah/python3-cheetah.hash | 1 - package/python3-cheetah/python3-cheetah.mk | 18 ------------------ 4 files changed, 1 insertion(+), 21 deletions(-) delete mode 120000 package/python3-cheetah/python3-cheetah.hash delete mode 100644 package/python3-cheetah/python3-cheetah.mk diff --git a/package/mongodb/mongodb.mk b/package/mongodb/mongodb.mk index 311b9de14e..2a5e00be79 100644 --- a/package/mongodb/mongodb.mk +++ b/package/mongodb/mongodb.mk @@ -16,7 +16,7 @@ MONGODB_SELINUX_MODULES = mongodb MONGODB_DEPENDENCIES = \ boost \ - host-python3-cheetah \ + host-python-cheetah \ host-python3-psutil \ host-python-pyyaml \ host-python3-regex \ diff --git a/package/python-cheetah/python-cheetah.mk b/package/python-cheetah/python-cheetah.mk index 02877e03c4..92688f6ced 100644 --- a/package/python-cheetah/python-cheetah.mk +++ b/package/python-cheetah/python-cheetah.mk @@ -4,7 +4,6 @@ # ################################################################################ -# Please keep in sync with package/python3-cheetah/python3-cheetah.mk PYTHON_CHEETAH_VERSION = 3.2.6.post2 PYTHON_CHEETAH_SOURCE = Cheetah3-$(PYTHON_CHEETAH_VERSION).tar.gz PYTHON_CHEETAH_SITE = https://files.pythonhosted.org/packages/c0/97/c3fa47e223207e6ca6b501a954c5c959ed3e99f2a1ceec9918238ce38418 diff --git a/package/python3-cheetah/python3-cheetah.hash b/package/python3-cheetah/python3-cheetah.hash deleted file mode 120000 index c29a76ea80..0000000000 --- a/package/python3-cheetah/python3-cheetah.hash +++ /dev/null @@ -1 +0,0 @@ -../python-cheetah/python-cheetah.hash \ No newline at end of file diff --git a/package/python3-cheetah/python3-cheetah.mk b/package/python3-cheetah/python3-cheetah.mk deleted file mode 100644 index 93d16201aa..0000000000 --- a/package/python3-cheetah/python3-cheetah.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# python3-cheetah -# -################################################################################ - -# Please keep in sync with -# package/python-cheetah/python-cheetah.mk -PYTHON3_CHEETAH_VERSION = 3.2.6.post2 -PYTHON3_CHEETAH_SOURCE = Cheetah3-$(PYTHON3_CHEETAH_VERSION).tar.gz -PYTHON3_CHEETAH_SITE = https://files.pythonhosted.org/packages/c0/97/c3fa47e223207e6ca6b501a954c5c959ed3e99f2a1ceec9918238ce38418 -PYTHON3_CHEETAH_LICENSE = MIT -PYTHON3_CHEETAH_LICENSE_FILES = LICENSE -PYTHON3_CHEETAH_SETUP_TYPE = setuptools -HOST_PYTHON3_CHEETAH_DL_SUBDIR = python-cheetah -HOST_PYTHON3_CHEETAH_NEEDS_HOST_PYTHON = python3 - -$(eval $(host-python-package)) -- 2.20.1 From peter at korsgaard.com Thu Feb 10 22:40:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 23:40:42 +0100 Subject: [Buildroot] [PATCH 1/5] package/python3-cffi: drop unused host package Message-ID: <20220210224047.11992-1-peter@korsgaard.com> Commit d9bf97cf16fa6945466a67 (package/python-cryptography: drop host variant) dropped the dependency on host-python3-cffi, so it is now unused. Drop it. Signed-off-by: Peter Korsgaard --- package/python-cffi/python-cffi.mk | 1 - package/python3-cffi/python3-cffi.hash | 1 - package/python3-cffi/python3-cffi.mk | 29 -------------------------- 3 files changed, 31 deletions(-) delete mode 120000 package/python3-cffi/python3-cffi.hash delete mode 100644 package/python3-cffi/python3-cffi.mk diff --git a/package/python-cffi/python-cffi.mk b/package/python-cffi/python-cffi.mk index b14dce8225..83a21cb75a 100644 --- a/package/python-cffi/python-cffi.mk +++ b/package/python-cffi/python-cffi.mk @@ -4,7 +4,6 @@ # ################################################################################ -# Please keep in sync with package/python3-cffi/python3-cffi.mk PYTHON_CFFI_VERSION = 1.15.0 PYTHON_CFFI_SOURCE = cffi-$(PYTHON_CFFI_VERSION).tar.gz PYTHON_CFFI_SITE = https://files.pythonhosted.org/packages/00/9e/92de7e1217ccc3d5f352ba21e52398372525765b2e0c4530e6eb2ba9282a diff --git a/package/python3-cffi/python3-cffi.hash b/package/python3-cffi/python3-cffi.hash deleted file mode 120000 index 1f98d8df9c..0000000000 --- a/package/python3-cffi/python3-cffi.hash +++ /dev/null @@ -1 +0,0 @@ -../python-cffi/python-cffi.hash \ No newline at end of file diff --git a/package/python3-cffi/python3-cffi.mk b/package/python3-cffi/python3-cffi.mk deleted file mode 100644 index 2770eda93e..0000000000 --- a/package/python3-cffi/python3-cffi.mk +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# -# python3-cffi -# -################################################################################ - -# Please keep in sync with package/python-cffi/python-cffi.mk -PYTHON3_CFFI_VERSION = 1.15.0 -PYTHON3_CFFI_SOURCE = cffi-$(PYTHON3_CFFI_VERSION).tar.gz -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 - -# This host package uses pkg-config to find libffi, so we have to -# provide the proper hints for pkg-config to behave properly for host -# packages. -HOST_PYTHON3_CFFI_ENV = \ - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ - PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \ - PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ - PKG_CONFIG_SYSROOT_DIR="/" \ - PKG_CONFIG_LIBDIR="$(HOST_DIR)/lib/pkgconfig:$(HOST_DIR)/share/pkgconfig" -HOST_PYTHON3_CFFI_DEPENDENCIES = host-pkgconf host-python3-pycparser host-libffi - -HOST_PYTHON3_CFFI_DL_SUBDIR = python-cffi -HOST_PYTHON3_CFFI_NEEDS_HOST_PYTHON = python3 - -$(eval $(host-python-package)) -- 2.20.1 From peter at korsgaard.com Thu Feb 10 22:40:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 23:40:44 +0100 Subject: [Buildroot] [PATCH 3/5] package/python3-cython: drop host package In-Reply-To: <20220210224047.11992-1-peter@korsgaard.com> References: <20220210224047.11992-1-peter@korsgaard.com> Message-ID: <20220210224047.11992-3-peter@korsgaard.com> Now that host-python2 is gone, the custom python3 variant can be dropped. Signed-off-by: Peter Korsgaard --- package/libdnet/libdnet.mk | 2 +- package/python-cython/python-cython.mk | 1 - package/python-fonttools/python-fonttools.mk | 2 +- package/python3-cython/python3-cython.hash | 1 - package/python3-cython/python3-cython.mk | 16 ---------------- package/setools/setools.mk | 2 +- 6 files changed, 3 insertions(+), 21 deletions(-) delete mode 120000 package/python3-cython/python3-cython.hash delete mode 100644 package/python3-cython/python3-cython.mk diff --git a/package/libdnet/libdnet.mk b/package/libdnet/libdnet.mk index e9a57d6ed2..4c58ea20a5 100644 --- a/package/libdnet/libdnet.mk +++ b/package/libdnet/libdnet.mk @@ -16,7 +16,7 @@ LIBDNET_CONF_OPTS = \ LIBDNET_CONFIG_SCRIPTS = dnet-config ifeq ($(BR2_PACKAGE_LIBDNET_PYTHON),y) -LIBDNET_DEPENDENCIES += host-python3-cython python3 +LIBDNET_DEPENDENCIES += host-python-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 diff --git a/package/python-cython/python-cython.mk b/package/python-cython/python-cython.mk index 89708cb9a8..b9fbf7b11a 100644 --- a/package/python-cython/python-cython.mk +++ b/package/python-cython/python-cython.mk @@ -4,7 +4,6 @@ # ################################################################################ -# Please keep in sync with package/python3-cython/python3-cython.mk PYTHON_CYTHON_VERSION = 0.29.27 PYTHON_CYTHON_SOURCE = Cython-$(PYTHON_CYTHON_VERSION).tar.gz PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/eb/46/80dd9e5ad67ebc766ff3229901bde4a7bc82907efe93cd7007c4df458dd5 diff --git a/package/python-fonttools/python-fonttools.mk b/package/python-fonttools/python-fonttools.mk index d5c4cdf8e5..c07011daa0 100644 --- a/package/python-fonttools/python-fonttools.mk +++ b/package/python-fonttools/python-fonttools.mk @@ -10,7 +10,7 @@ PYTHON_FONTTOOLS_SITE = https://files.pythonhosted.org/packages/2d/4c/49ba863863 PYTHON_FONTTOOLS_SETUP_TYPE = setuptools PYTHON_FONTTOOLS_LICENSE = MIT PYTHON_FONTTOOLS_LICENSE_FILES = LICENSE -PYTHON_FONTTOOLS_DEPENDENCIES = host-python3-cython +PYTHON_FONTTOOLS_DEPENDENCIES = host-python-cython PYTHON_FONTTOOLS_ENV = FONTTOOLS_WITH_CYTHON=1 define PYTHON_FONTTOOLS_EXTRACT_CMDS diff --git a/package/python3-cython/python3-cython.hash b/package/python3-cython/python3-cython.hash deleted file mode 120000 index 70dde64105..0000000000 --- a/package/python3-cython/python3-cython.hash +++ /dev/null @@ -1 +0,0 @@ -../python-cython/python-cython.hash \ No newline at end of file diff --git a/package/python3-cython/python3-cython.mk b/package/python3-cython/python3-cython.mk deleted file mode 100644 index 56d88b5bf7..0000000000 --- a/package/python3-cython/python3-cython.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# python3-cython -# -################################################################################ - -# Please keep in sync with package/python-cython/python-cython.mk -PYTHON3_CYTHON_VERSION = 0.29.27 -PYTHON3_CYTHON_SOURCE = Cython-$(PYTHON3_CYTHON_VERSION).tar.gz -PYTHON3_CYTHON_SITE = https://files.pythonhosted.org/packages/eb/46/80dd9e5ad67ebc766ff3229901bde4a7bc82907efe93cd7007c4df458dd5 -PYTHON3_CYTHON_SETUP_TYPE = setuptools -PYTHON3_CYTHON_LICENSE = Apache-2.0 -PYTHON3_CYTHON_LICENSE_FILES = COPYING.txt LICENSE.txt -HOST_PYTHON3_CYTHON_NEEDS_HOST_PYTHON = python3 - -$(eval $(host-python-package)) diff --git a/package/setools/setools.mk b/package/setools/setools.mk index 8e1c0d2cc6..5b4b4e30d8 100644 --- a/package/setools/setools.mk +++ b/package/setools/setools.mk @@ -12,7 +12,7 @@ SETOOLS_LICENSE = GPL-2.0+, LGPL-2.1+ SETOOLS_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL SETOOLS_CPE_ID_VENDOR = selinuxproject SETOOLS_SETUP_TYPE = setuptools -HOST_SETOOLS_DEPENDENCIES = host-python3-cython host-libselinux host-libsepol host-python-networkx +HOST_SETOOLS_DEPENDENCIES = host-python-cython host-libselinux host-libsepol host-python-networkx HOST_SETOOLS_NEEDS_HOST_PYTHON = python3 define SETOOLS_FIX_SETUP -- 2.20.1 From peter at korsgaard.com Thu Feb 10 22:40:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 23:40:46 +0100 Subject: [Buildroot] [PATCH 5/5] package/python3-psutil: drop host package In-Reply-To: <20220210224047.11992-1-peter@korsgaard.com> References: <20220210224047.11992-1-peter@korsgaard.com> Message-ID: <20220210224047.11992-5-peter@korsgaard.com> Now that host-python2 is gone, the custom python3 variant can be dropped. Signed-off-by: Peter Korsgaard --- package/mongodb/mongodb.mk | 2 +- package/python-psutil/python-psutil.mk | 1 - package/python3-psutil/python3-psutil.hash | 1 - package/python3-psutil/python3-psutil.mk | 19 ------------------- 4 files changed, 1 insertion(+), 22 deletions(-) delete mode 120000 package/python3-psutil/python3-psutil.hash delete mode 100644 package/python3-psutil/python3-psutil.mk diff --git a/package/mongodb/mongodb.mk b/package/mongodb/mongodb.mk index 2a5e00be79..e2a58a5f4e 100644 --- a/package/mongodb/mongodb.mk +++ b/package/mongodb/mongodb.mk @@ -17,7 +17,7 @@ MONGODB_SELINUX_MODULES = mongodb MONGODB_DEPENDENCIES = \ boost \ host-python-cheetah \ - host-python3-psutil \ + host-python-psutil \ host-python-pyyaml \ host-python3-regex \ host-python-requests \ diff --git a/package/python-psutil/python-psutil.mk b/package/python-psutil/python-psutil.mk index 3bba7ca343..413fc8a391 100644 --- a/package/python-psutil/python-psutil.mk +++ b/package/python-psutil/python-psutil.mk @@ -4,7 +4,6 @@ # ################################################################################ -# Please keep in sync with package/python3-psutil/python3-psutil.mk PYTHON_PSUTIL_VERSION = 5.8.0 PYTHON_PSUTIL_SOURCE = psutil-$(PYTHON_PSUTIL_VERSION).tar.gz PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/e1/b0/7276de53321c12981717490516b7e612364f2cb372ee8901bd4a66a000d7 diff --git a/package/python3-psutil/python3-psutil.hash b/package/python3-psutil/python3-psutil.hash deleted file mode 120000 index ff688fab28..0000000000 --- a/package/python3-psutil/python3-psutil.hash +++ /dev/null @@ -1 +0,0 @@ -../python-psutil/python-psutil.hash \ No newline at end of file diff --git a/package/python3-psutil/python3-psutil.mk b/package/python3-psutil/python3-psutil.mk deleted file mode 100644 index 1304124f57..0000000000 --- a/package/python3-psutil/python3-psutil.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# python3-psutil -# -################################################################################ - -# Please keep in sync with package/python-psutil/python-psutil.mk -PYTHON3_PSUTIL_VERSION = 5.8.0 -PYTHON3_PSUTIL_SOURCE = psutil-$(PYTHON3_PSUTIL_VERSION).tar.gz -PYTHON3_PSUTIL_SITE = https://files.pythonhosted.org/packages/e1/b0/7276de53321c12981717490516b7e612364f2cb372ee8901bd4a66a000d7 -PYTHON3_PSUTIL_SETUP_TYPE = setuptools -PYTHON3_PSUTIL_LICENSE = BSD-3-Clause -PYTHON3_PSUTIL_LICENSE_FILES = LICENSE -PYTHON3_PSUTIL_CPE_ID_VENDOR = psutil_project -PYTHON3_PSUTIL_CPE_ID_PRODUCT = psutil -HOST_PYTHON3_PSUTIL_DL_SUBDIR = python-psutil -HOST_PYTHON3_PSUTIL_NEEDS_HOST_PYTHON = python3 - -$(eval $(host-python-package)) -- 2.20.1 From peter at korsgaard.com Thu Feb 10 22:40:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 23:40:45 +0100 Subject: [Buildroot] [PATCH 4/5] package/python3-ply: drop host package In-Reply-To: <20220210224047.11992-1-peter@korsgaard.com> References: <20220210224047.11992-1-peter@korsgaard.com> Message-ID: <20220210224047.11992-4-peter@korsgaard.com> Now that host-python2 is gone, the custom python3 variant can be dropped. Signed-off-by: Peter Korsgaard --- package/libcamera/libcamera.mk | 2 +- package/python-ply/python-ply.mk | 1 - package/python3-ply/python3-ply.hash | 1 - package/python3-ply/python3-ply.mk | 16 ---------------- 4 files changed, 1 insertion(+), 19 deletions(-) delete mode 120000 package/python3-ply/python3-ply.hash delete mode 100644 package/python3-ply/python3-ply.mk diff --git a/package/libcamera/libcamera.mk b/package/libcamera/libcamera.mk index 534d8d2637..7cd4bfa758 100644 --- a/package/libcamera/libcamera.mk +++ b/package/libcamera/libcamera.mk @@ -11,7 +11,7 @@ LIBCAMERA_DEPENDENCIES = \ host-openssl \ host-pkgconf \ host-python-jinja2 \ - host-python3-ply \ + host-python-ply \ host-python-pyyaml \ gnutls LIBCAMERA_CONF_OPTS = \ diff --git a/package/python-ply/python-ply.mk b/package/python-ply/python-ply.mk index 50a3e32bc2..5dc7964d5f 100644 --- a/package/python-ply/python-ply.mk +++ b/package/python-ply/python-ply.mk @@ -4,7 +4,6 @@ # ################################################################################ -# Please keep in sync with package/python3-ply/python3-ply.mk PYTHON_PLY_VERSION = 3.11 PYTHON_PLY_SOURCE = ply-$(PYTHON_PLY_VERSION).tar.gz PYTHON_PLY_SITE = https://files.pythonhosted.org/packages/e5/69/882ee5c9d017149285cab114ebeab373308ef0f874fcdac9beb90e0ac4da diff --git a/package/python3-ply/python3-ply.hash b/package/python3-ply/python3-ply.hash deleted file mode 120000 index 5e07165c93..0000000000 --- a/package/python3-ply/python3-ply.hash +++ /dev/null @@ -1 +0,0 @@ -../python-ply/python-ply.hash \ No newline at end of file diff --git a/package/python3-ply/python3-ply.mk b/package/python3-ply/python3-ply.mk deleted file mode 100644 index 15f66a49db..0000000000 --- a/package/python3-ply/python3-ply.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# python3-ply -# -################################################################################ - -PYTHON3_PLY_VERSION = 3.11 -PYTHON3_PLY_SOURCE = ply-$(PYTHON3_PLY_VERSION).tar.gz -PYTHON3_PLY_SITE = https://files.pythonhosted.org/packages/e5/69/882ee5c9d017149285cab114ebeab373308ef0f874fcdac9beb90e0ac4da -PYTHON3_PLY_SETUP_TYPE = setuptools -PYTHON3_PLY_LICENSE = BSD-3-Clause -PYTHON3_PLY_LICENSE_FILES = README.md - -HOST_PYTHON3_PLY_NEEDS_HOST_PYTHON = python3 - -$(eval $(host-python-package)) -- 2.20.1 From clayton.shotwell at rockwellcollins.com Thu Feb 10 23:23:27 2022 From: clayton.shotwell at rockwellcollins.com (Clayton Shotwell) Date: Thu, 10 Feb 2022 17:23:27 -0600 Subject: [Buildroot] [PATCH] support/download/post-process-helpers: adjust for older coreutils versions Message-ID: <20220210232327.119488-1-clayton.shotwell@rockwellcollins.com> From: Clayton Shotwell Ran into an issue with the post_process_unpack function using "head -z" on a RHEL box which is using an older version or coreutils. The "-z" flag was added in coreutils v8.25 but my IT managed RHEL box is only using v8.22. The fix I have implemented relies on the null terminated list and sed to remove the first null character and everthing afterwards. Signed-off-by: Clayton Shotwell --- support/download/helpers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/download/helpers b/support/download/helpers index ab31e27..90a7d6c 100755 --- a/support/download/helpers +++ b/support/download/helpers @@ -79,7 +79,7 @@ post_process_unpack() { mkdir "${dest}" 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")" + one_file="$(find "${dest}" -type f -print0 |LC_ALL=C sort -z |sed 's/\x0.*//')" touch -r "${one_file}" "${dest}.timestamp" } -- 1.8.3.1 From christian at paral.in Thu Feb 10 23:59:06 2022 From: christian at paral.in (Christian Stewart) Date: Thu, 10 Feb 2022 15:59:06 -0800 Subject: [Buildroot] [PATCH 1/1] package/go: security bump to 1.17.7 Message-ID: <20220210235906.23355-1-christian@paral.in> go1.17.7 includes security fixes to the crypto/elliptic, math/big packages and to the go command, as well as bug fixes to the compiler, linker, runtime, the go command, and the debug/macho, debug/pe, and net/http/httptest packages. https://github.com/golang/go/issues?q=milestone%3AGo1.17.7+label%3ACherryPickApproved 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 9111c8c9aa..fdf342e602 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://golang.org/dl/ -sha256 4dc1bbf3ff61f0c1ff2b19355e6d88151a70126268a47c761477686ef94748c8 go1.17.6.src.tar.gz +sha256 c108cd33b73b1911a02b697741df3dea43e01a5c4e08e409e8b3a0e3745d2b4d go1.17.7.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 062bec378c..56a21dfe55 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.17.6 +GO_VERSION = 1.17.7 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz -- 2.35.1 From giulio.benetti at benettiengineering.com Fri Feb 11 05:08:46 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 11 Feb 2022 06:08:46 +0100 Subject: [Buildroot] [PATCH v4 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <874k56wgqs.fsf@dell.be.48ers.dk> References: <20220210081932.3114763-1-neal.frager@xilinx.com> <874k56wgqs.fsf@dell.be.48ers.dk> Message-ID: Hi All, On 10/02/22 22:31, Peter Korsgaard wrote: >>>>>> "Neal" == Neal Frager writes: > > > This patch: > > - bumps ATF to Xilinx v2.6: mainline v2.6 requires patch to build > > - bumps U-Boot to Xilinx 2022.01: important drivers not in mainline > > - bumps Linux to Xilinx 5.15: important drivers not in mainline > > - deletes board/zynqmp/patches directory: patches already in mainline > > - modifies board/zynqmp/genimage.cfg: U-Boot 2022.01 uses u-boot.itb format > > - adds extlinux.conf to vfat bootfs > > - modifies U-Boot to unified xilinx_zynqmp_virt_defconfig (supports all boards) > > - adds support for SPL pm_cfg_obj.c loading to PMU firmware > > - enables support for host machines without OpenSSL required by U-Boot and Linux > > > V3-> V4: > > * cleaned up commit log messages > > * added version history > > --- > > [snip] > > > +++ b/configs/zynqmp_zcu106_defconfig > > @@ -1,34 +1,39 @@ > > BR2_aarch64=y > > -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" > > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y > > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" > > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > > BR2_LINUX_KERNEL=y > > BR2_LINUX_KERNEL_CUSTOM_GIT=y > > BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" > > -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" > > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.15" > > xlnx_rebase_v5.15 is a branch. A git version should point to a tag og a > sha1 so the build is reproducible. Thank you Peter! I've missed this, and for completeness I point where manual talks about it: https://buildroot.org/downloads/manual/manual.html#generic-package-reference ``` Note: Using a branch name as FOO_VERSION is not supported, because it does not and can not work as people would expect it should: 1. due to local caching, Buildroot will not re-fetch the repository, so people who expect to be able to follow the remote repository would be quite surprised and disappointed; 2. because two builds can never be perfectly simultaneous, and because the remote repository may get new commits on the branch anytime, two users, using the same Buildroot tree and building the same configuration, may get different source, thus rendering the build non reproducible, and people would be quite surprised and disappointed. ``` Best regards -- Giulio Benetti Benetti Engineering sas > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.6" > > Same for xlnx_rebase_v2.6 > > > BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" > > BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" > > -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7" > > -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA" > > +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" > > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2022.01" > > And xlnx_rebase_v2022.01 > > I think I earlier asked you not to change the URL when it is not needed, > please leave the existing /xilinx/ URL. > From giulio.benetti at benettiengineering.com Fri Feb 11 05:26:29 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 11 Feb 2022 06:26:29 +0100 Subject: [Buildroot] [PATCH] docs/manual/adding-packages-generic: remove useless carriage return Message-ID: <20220211052629.2289507-1-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- docs/manual/adding-packages-generic.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt index 8723da214a..fbe37f9ca9 100644 --- a/docs/manual/adding-packages-generic.txt +++ b/docs/manual/adding-packages-generic.txt @@ -316,8 +316,7 @@ not and can not work as people would expect it should: 13:45+01" see "man cvs" for further details). ** +git+ for retrieving source code from a Git repository. Used by default when +LIBFOO_SITE+ begins with +git://+. The downloaded - source code is cached as with the +svn+ - method. + source code is cached as with the +svn+ method. ** +hg+ for retrieving source code from a Mercurial repository. One 'must' specify +LIBFOO_SITE_METHOD=hg+ when +LIBFOO_SITE+ contains a Mercurial repository URL. The downloaded source code -- 2.25.1 From thomas.petazzoni at bootlin.com Fri Feb 11 07:11:13 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 11 Feb 2022 07:11:13 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-02-10 Message-ID: <20220211071118.6921F40124@smtp2.osuosl.org> Hello, Autobuild statistics for 2022-02-10 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 42 | 4 | 0 | 46 | 2021.11.x | 18 | 1 | 0 | 19 | master | 30 | 61 | 0 | 91 | Classification of failures by reason for master ----------------------------------------------- bluez5_utils-5.63 | 6 host-omniorb-4.3.0 | 6 host-cxxtest-4.4 | 5 host-bmap-tools-3.6 | 4 host-libselinux-3.3 | 4 host-grpc-1.43.0 | 3 host-python-pycryptodomex-3... | 3 bat-0.19.0 | 2 frr-8.1 | 2 gerbera-1.9.2 | 2 host-python-cython-0.29.27 | 2 host-python-docutils-0.15.2 | 2 host-python-greenlet-1.1.2 | 2 host-python-lxml-4.6.5 | 2 rygel-0.40.2 | 2 unknown | 2 file-5.41 | 1 guile-3.0.7 | 1 host-binutils-2.36.1 | 1 host-clang-9.0.1 | 1 ibrdtnd-1.0.1 | 1 libopenssl-1.1.1m | 1 libv4l-1.22.1 | 1 libwpe-1.12.0 | 1 mp4v2-5.0.1 | 1 pulseview-0.4.2 | 1 python-docutils-0.15.2 | 1 ulog-0389d243352255f6182326... | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- i586 | bat-0.19.0 | NOK | http://autobuild.buildroot.net/results/a73a9122fffa494bae8e47ad4e445516fb0cf2ee | i586 | bat-0.19.0 | NOK | http://autobuild.buildroot.net/results/1891b6da5575ed8e4070c8ac054f75b04ae13d42 | mips | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/4b1d67f001fcad5727aad2bbd2c73adbdb78acb3 | mips | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/541cf1365b446b2c9dffdeb50e34b5bc7ec10627 | x86_64 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/d94c3c2dcbc2e226b3bafae507c444be4c4e99b0 | x86_64 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/c722e4b1e962bd02942cd0b119997d2ad9d6e758 | arc | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/5d04a4af76b9bc89450f727e145fa6eba48298ff | powerpc | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/e2f77f4f1be19f7b62a9982061c96aab129306c1 | arm | file-5.41 | NOK | http://autobuild.buildroot.net/results/f082c2f95550d6a7457e55e34c1ed297a85f22a8 | ORPH arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/83c8ec262cdf35ca403ec15eaad38de4394876b0 | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/0c2891943111b721a3d615fe2875b8092e7652ad | s390x | gerbera-1.9.2 | NOK | http://autobuild.buildroot.net/results/37bc85d8b41f36f885e6adfacef1fc972e811ec1 | arc | gerbera-1.9.2 | NOK | http://autobuild.buildroot.net/results/4efc15d79682e14232945226ead18c45ac2a5c39 | arm | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/098b2f3917aebf1e415df9592bed7d1a06004e22 | arm | host-binutils-2.36.1 | NOK | http://autobuild.buildroot.net/results/ef5469e3e0158302f25f321bf58d516e9331eed3 | arm | host-bmap-tools-3.6 | NOK | http://autobuild.buildroot.net/results/df591e0a88e767622780441ef404160d2787d50a | arm | host-bmap-tools-3.6 | NOK | http://autobuild.buildroot.net/results/02a54bb47f780ee47fb633b7aa18437fc87d190b | microblazeel | host-bmap-tools-3.6 | NOK | http://autobuild.buildroot.net/results/c2314927f595907c8ce1fa0bcb36c1f03fc26c56 | powerpc | host-bmap-tools-3.6 | NOK | http://autobuild.buildroot.net/results/b431c240567bc80e390a81abdd0f6c71b1f633e7 | arm | host-clang-9.0.1 | NOK | http://autobuild.buildroot.net/results/a118ee0b4ccbac2c0dd0e9bb85a2b318499a3262 | arm | host-cxxtest-4.4 | NOK | http://autobuild.buildroot.net/results/f31b8f94d9512fb7f8d973a9a8595fc6bc306403 | x86_64 | host-cxxtest-4.4 | NOK | http://autobuild.buildroot.net/results/6d87e0a89554b742684bcda905958c34468095fb | x86_64 | host-cxxtest-4.4 | NOK | http://autobuild.buildroot.net/results/3b43cd6d1540f2b7aaf97e417e47908a0b9cb45d | arm | host-cxxtest-4.4 | NOK | http://autobuild.buildroot.net/results/d3c30978368ce1657551aaa4c2202e8f0ce05fe1 | arm | host-cxxtest-4.4 | NOK | http://autobuild.buildroot.net/results/f98a27d92f7d9e3763a980cc9fd75c49d082ecf4 | arm | host-grpc-1.43.0 | NOK | http://autobuild.buildroot.net/results/acdc905fc688f2e02e2f600e6746be9f4c407942 | aarch64 | host-grpc-1.43.0 | NOK | http://autobuild.buildroot.net/results/f5d501274d3fa139e3d3147ad37a58ba7dec64da | mips | host-grpc-1.43.0 | NOK | http://autobuild.buildroot.net/results/0c99b5a9b2334ab8ce283608dd6db8df4d226d01 | microblazeel | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/e91bdf6bffb019f168dd61d36b5de3c09f084386 | m68k | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/0e330ee5faf6ecefee4bf7b626d2c00036b923e3 | mipsel | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/ec6614f24d4b84c85a9b0c3bf6959a96e7d9653f | xtensa | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/e5059ff1e63a8717a29f1e9aa6a53e0b09ca72c8 | microblazeel | host-omniorb-4.3.0 | NOK | http://autobuild.buildroot.net/results/d415c2501b27cacf2356f0f6924ee7706d7a4070 | arm | host-omniorb-4.3.0 | NOK | http://autobuild.buildroot.net/results/9d2e3c692cda8f75780b75dd15f82f5650590bc4 | i686 | host-omniorb-4.3.0 | NOK | http://autobuild.buildroot.net/results/060518df089d51bc4abd7c27757cdcee0d836305 | powerpc | host-omniorb-4.3.0 | NOK | http://autobuild.buildroot.net/results/3e873090c0a4eacb98ba728ff4ba8bda667b1485 | powerpc | host-omniorb-4.3.0 | NOK | http://autobuild.buildroot.net/results/1fadafbc2f085bf4341bace2a233729315bb2c5e | xtensa | host-omniorb-4.3.0 | NOK | http://autobuild.buildroot.net/results/34ff6e6cff0cb973dc7b8a17e58c2fc43d227401 | arc | host-python-cython-0.29.27 | NOK | http://autobuild.buildroot.net/results/bb71485bc1dc5c87578537d54ae3ea895b2f6aed | nds32le | host-python-cython-0.29.27 | NOK | http://autobuild.buildroot.net/results/3f2f9995f57a5f47d521a539961f493a5f3a3418 | aarch64 | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/0d4d52f3b935d7a17241a6e9f351b98be09bf707 | sparc64 | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/d32c6dece11a6410db9596ca7217e28aecc023bb | m68k | host-python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/e408b45a3b633e23e96cb0e58d80a93734384d40 | aarch64 | host-python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/501dadc1d4a07dc643047eef10336f6e82179dae | arm | host-python-lxml-4.6.5 | NOK | http://autobuild.buildroot.net/results/8347c3d92b9b1df6da94941936a543e5fb52f8eb | nds32le | host-python-lxml-4.6.5 | NOK | http://autobuild.buildroot.net/results/33a6b0d44db36690a5258ed401eb1a08a2f25aa2 | aarch64 | host-python-pycryptodomex-3... | NOK | http://autobuild.buildroot.net/results/90cc2c3416c4b2b60e0992206804e344df7ecbf3 | powerpc | host-python-pycryptodomex-3... | NOK | http://autobuild.buildroot.net/results/2d56e80824e9b5dd6350598220932530ee61bc6e | nios2 | host-python-pycryptodomex-3... | NOK | http://autobuild.buildroot.net/results/12b8a70310967aaa4d0c26cc587fc5e16657377c | aarch64 | ibrdtnd-1.0.1 | NOK | http://autobuild.buildroot.net/results/a7a254c92215a89bb18c71120d7c7980caaf830a | ORPH s390x | libopenssl-1.1.1m | NOK | http://autobuild.buildroot.net/results/0f14b7d0f55801c6ee644cc89bbbbd5e60dc0223 | arm | libv4l-1.22.1 | NOK | http://autobuild.buildroot.net/results/cacd73e08cfb359d608bca807189b7bd3c5c79bd | powerpc | libwpe-1.12.0 | NOK | http://autobuild.buildroot.net/results/0500187cf51dc96ae1f8dbce03165df08e77019c | arm | mp4v2-5.0.1 | NOK | http://autobuild.buildroot.net/results/126fe37b729cb66702a8650cfa119aa5f1745b9a | ORPH xtensa | pulseview-0.4.2 | NOK | http://autobuild.buildroot.net/results/f7a41f23bc3e46d5e2973a20abce197248c2d915 | riscv32 | python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/03575ee0f3d6390780652cfd97efd15cfea5d780 | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/e7f38e2a2d81be907eedbe462e3c14f382edb4fe | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/dbec470842e7fd3d0ee8aa6100625dfeb8d65a14 | arm | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/0a163fc75a5bdea4a28f83cce6539e13fca099a5 | riscv64 | unknown | NOK | http://autobuild.buildroot.net/results/85544591733b07ed1cc80c9f4cc56dea102f6259 | i686 | unknown | NOK | http://autobuild.buildroot.net/results/4acb608ef98a11f3bd300f0700ff96dcddbb149d | Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 2 unknown | 1 zeromq-4.3.4 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/1694ba94102b3e92b9a9c3892ff73f3f955db915 | mips64el | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/3b5ac2b9774b542bfab23e8505923d0558ff60df | mips64el | unknown | NOK | http://autobuild.buildroot.net/results/e08b44e3f9e518e8d743c3faa0908897f5e7b7bc | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/7447eeee52cf2417af30efb5b961f0b343167fad | 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/18fcd39612ab725e56b8956cf59376f00eac7664 | Gitlab CI results for 2022-02-10 ================================ -- http://autobuild.buildroot.net From jorgen.sigvardsson at gmail.com Fri Feb 11 08:13:57 2022 From: jorgen.sigvardsson at gmail.com (=?UTF-8?q?J=C3=B6rgen=20Sigvardsson?=) Date: Fri, 11 Feb 2022 09:13:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/libwebsockets: option for building with LWS_WITH_ZIP_FOPS Message-ID: <20220211081357.40439-1-jorgen.sigvardsson@gmail.com> Signed-off-by: J?rgen Sigvardsson --- package/libwebsockets/Config.in | 14 ++++++++++++++ package/libwebsockets/libwebsockets.mk | 4 ++++ 2 files changed, 18 insertions(+) diff --git a/package/libwebsockets/Config.in b/package/libwebsockets/Config.in index d7b529cafd..8db1d8b975 100644 --- a/package/libwebsockets/Config.in +++ b/package/libwebsockets/Config.in @@ -9,5 +9,19 @@ config BR2_PACKAGE_LIBWEBSOCKETS https://libwebsockets.org/ +if BR2_PACKAGE_LIBWEBSOCKETS + +config BR2_PACKAGE_LIBWEBSOCKETS_ZIP_FOPS + bool "enable serving files from zip archives" + default y + help + By enabling this flag, files can be served from a (preferably + uncompressed) zip file. Furthermore, the contained files can + be gzipped. Gzipped files may be delivered as-is (no deflation + needed) to clients that accept gzipped encoded contents (all + modern browsers do that). + +endif + comment "libwebsockets needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS diff --git a/package/libwebsockets/libwebsockets.mk b/package/libwebsockets/libwebsockets.mk index c25686d385..a62f1c70d9 100644 --- a/package/libwebsockets/libwebsockets.mk +++ b/package/libwebsockets/libwebsockets.mk @@ -73,4 +73,8 @@ ifeq ($(BR2_SHARED_LIBS),y) LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_STATIC=OFF endif +ifeq ($(BR2_PACKAGE_LIBWEBSOCKETS_ZIP_FOPS),y) +LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_ZIP_FOPS=ON +endif + $(eval $(cmake-package)) -- 2.32.0 From peter at korsgaard.com Fri Feb 11 08:17:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 09:17:26 +0100 Subject: [Buildroot] [PATCH 2/5] boot/uboot: drop host-python2 support In-Reply-To: <20220211081730.23068-1-peter@korsgaard.com> References: <20220211081730.23068-1-peter@korsgaard.com> Message-ID: <20220211081730.23068-2-peter@korsgaard.com> host-python2 is gone, so drop the _NEEDS_PYTHON2 logic. Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++++ boot/uboot/Config.in | 28 +++------------------------- boot/uboot/uboot.mk | 8 +------- 3 files changed, 10 insertions(+), 32 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 2b1fd48de5..0794813a97 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_TARGET_UBOOT_NEEDS_PYTHON2 + bool "host-python 2.7 support for U-Boot was removed" + select BR2_LEGACY + help + Option was removed together with python 2.7 support. + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBMMS bool "gst1-plugins-bad plugin libmms was removed" depends on BR2_USE_WCHAR diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index 1fd4dede92..953c36135e 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -143,45 +143,23 @@ config BR2_TARGET_UBOOT_NEEDS_DTC Select this option if your U-Boot board configuration requires the Device Tree compiler to be available. -config BR2_TARGET_UBOOT_NEEDS_PYTHON - bool - -choice - bool "U-Boot needs host Python" - -config BR2_TARGET_UBOOT_NEEDS_PYTHON_NONE - bool "no" - depends on !BR2_TARGET_UBOOT_NEEDS_PYTHON - help - Select this option if U-Boot does not need any - host python to build. - -config BR2_TARGET_UBOOT_NEEDS_PYTHON2 - bool "python 2.x" - help - Select this option if U-Boot needs a host Python 2.x - interpreter. This is the case for some U-Boot - configurations, prior to U-Boot 2020.01. - config BR2_TARGET_UBOOT_NEEDS_PYTHON3 - bool "python 3.x" + bool "U-Boot needs host python 3.x" help Select this option if U-Boot needs a host Python 3.x interpreter. This is the case for some U-Boot configurations, after U-Boot 2020.01. -endchoice - config BR2_TARGET_UBOOT_NEEDS_PYLIBFDT bool "U-Boot needs pylibfdt" - select BR2_TARGET_UBOOT_NEEDS_PYTHON + select BR2_TARGET_UBOOT_NEEDS_PYTHON3 help Select this option if your U-Boot board configuration requires the Python libfdt library to be available. config BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS bool "U-Boot needs pyelftools" - select BR2_TARGET_UBOOT_NEEDS_PYTHON + select BR2_TARGET_UBOOT_NEEDS_PYTHON3 help Select this option if your U-Boot board configuration requires the Python pyelftools library to be available. diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index d05b9bb479..9e227fed91 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -207,9 +207,7 @@ ifeq ($(BR2_TARGET_UBOOT_NEEDS_DTC),y) UBOOT_DEPENDENCIES += host-dtc endif -ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON2),y) -UBOOT_DEPENDENCIES += host-python host-python-setuptools -else ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON3),y) +ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON3),y) UBOOT_DEPENDENCIES += host-python3 host-python3-setuptools endif @@ -218,12 +216,8 @@ UBOOT_DEPENDENCIES += host-swig endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS),y) -ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON2),y) -UBOOT_DEPENDENCIES += host-python-pyelftools -else ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON3),y) UBOOT_DEPENDENCIES += host-python3-pyelftools endif -endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSSL),y) UBOOT_DEPENDENCIES += host-openssl -- 2.20.1 From peter at korsgaard.com Fri Feb 11 08:17:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 09:17:28 +0100 Subject: [Buildroot] [PATCH 4/5] package/python3-regex: drop host package In-Reply-To: <20220211081730.23068-1-peter@korsgaard.com> References: <20220211081730.23068-1-peter@korsgaard.com> Message-ID: <20220211081730.23068-4-peter@korsgaard.com> Now that host-python2 is gone, the custom python3 variant can be dropped and instead host support added to python-regex. Signed-off-by: Peter Korsgaard --- package/mongodb/mongodb.mk | 2 +- package/python-regex/python-regex.mk | 1 + package/python3-regex/python3-regex.hash | 1 - package/python3-regex/python3-regex.mk | 16 ---------------- 4 files changed, 2 insertions(+), 18 deletions(-) delete mode 120000 package/python3-regex/python3-regex.hash delete mode 100644 package/python3-regex/python3-regex.mk diff --git a/package/mongodb/mongodb.mk b/package/mongodb/mongodb.mk index e2a58a5f4e..9f6c7d31b8 100644 --- a/package/mongodb/mongodb.mk +++ b/package/mongodb/mongodb.mk @@ -19,7 +19,7 @@ MONGODB_DEPENDENCIES = \ host-python-cheetah \ host-python-psutil \ host-python-pyyaml \ - host-python3-regex \ + host-python-regex \ host-python-requests \ host-scons \ pcre \ diff --git a/package/python-regex/python-regex.mk b/package/python-regex/python-regex.mk index c46c4d1614..a90fd579ac 100644 --- a/package/python-regex/python-regex.mk +++ b/package/python-regex/python-regex.mk @@ -12,3 +12,4 @@ PYTHON_REGEX_SETUP_TYPE = setuptools PYTHON_REGEX_LICENSE = CNRI-Python $(eval $(python-package)) +$(eval $(host-python-package)) diff --git a/package/python3-regex/python3-regex.hash b/package/python3-regex/python3-regex.hash deleted file mode 120000 index 274f4dc277..0000000000 --- a/package/python3-regex/python3-regex.hash +++ /dev/null @@ -1 +0,0 @@ -../python-regex/python-regex.hash \ No newline at end of file diff --git a/package/python3-regex/python3-regex.mk b/package/python3-regex/python3-regex.mk deleted file mode 100644 index 0b71768e9d..0000000000 --- a/package/python3-regex/python3-regex.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# python3-regex -# -################################################################################ - -# Please keep in sync with package/python-regex/python-regex.mk -PYTHON3_REGEX_VERSION = 2021.4.4 -PYTHON3_REGEX_SOURCE = regex-$(PYTHON3_REGEX_VERSION).tar.gz -PYTHON3_REGEX_SITE = https://files.pythonhosted.org/packages/38/3f/4c42a98c9ad7d08c16e7d23b2194a0e4f3b2914662da8bc88986e4e6de1f -PYTHON3_REGEX_SETUP_TYPE = setuptools -PYTHON3_REGEX_LICENSE = CNRI-Python -HOST_PYTHON3_REGEX_DL_SUBDIR = python-regex -HOST_PYTHON3_REGEX_NEEDS_HOST_PYTHON = python3 - -$(eval $(host-python-package)) -- 2.20.1 From peter at korsgaard.com Fri Feb 11 08:17:25 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 09:17:25 +0100 Subject: [Buildroot] [PATCH 1/5] package/python3-pycryptodomex: drop host package Message-ID: <20220211081730.23068-1-peter@korsgaard.com> Now that host-python2 is gone, the custom python3 variant can be dropped. Signed-off-by: Peter Korsgaard --- boot/optee-os/optee-os.mk | 2 +- .../python-pycryptodomex.mk | 1 - .../python3-pycryptodomex.hash | 1 - .../python3-pycryptodomex.mk | 19 ------------------- 4 files changed, 1 insertion(+), 22 deletions(-) delete mode 120000 package/python3-pycryptodomex/python3-pycryptodomex.hash delete mode 100644 package/python3-pycryptodomex/python3-pycryptodomex.mk diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk index 03ce08ffb2..2884b48513 100644 --- a/boot/optee-os/optee-os.mk +++ b/boot/optee-os/optee-os.mk @@ -21,7 +21,7 @@ else OPTEE_OS_SITE = $(call github,OP-TEE,optee_os,$(OPTEE_OS_VERSION)) endif -OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python3-pycryptodomex host-python3-pyelftools +OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pycryptodomex host-python3-pyelftools # On 64bit targets, OP-TEE OS can be built in 32bit mode, or # can be built in 64bit mode and support 32bit and 64bit diff --git a/package/python-pycryptodomex/python-pycryptodomex.mk b/package/python-pycryptodomex/python-pycryptodomex.mk index 92780327a1..d752122550 100644 --- a/package/python-pycryptodomex/python-pycryptodomex.mk +++ b/package/python-pycryptodomex/python-pycryptodomex.mk @@ -4,7 +4,6 @@ # ################################################################################ -# Please keep in sync with package/python3-pycryptodomex/python3-pycryptodomex.mk PYTHON_PYCRYPTODOMEX_VERSION = 3.13.0 PYTHON_PYCRYPTODOMEX_SOURCE = pycryptodomex-$(PYTHON_PYCRYPTODOMEX_VERSION).tar.gz PYTHON_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/7a/21/f399ba8dfd6e40eee444151af3237af22788b8b16077c75ec0419125f619 diff --git a/package/python3-pycryptodomex/python3-pycryptodomex.hash b/package/python3-pycryptodomex/python3-pycryptodomex.hash deleted file mode 120000 index 0c6761d8a4..0000000000 --- a/package/python3-pycryptodomex/python3-pycryptodomex.hash +++ /dev/null @@ -1 +0,0 @@ -../python-pycryptodomex/python-pycryptodomex.hash \ No newline at end of file diff --git a/package/python3-pycryptodomex/python3-pycryptodomex.mk b/package/python3-pycryptodomex/python3-pycryptodomex.mk deleted file mode 100644 index 06a46cdf63..0000000000 --- a/package/python3-pycryptodomex/python3-pycryptodomex.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# python3-pycryptodomex -# -################################################################################ - -# Please keep in sync with package/python-pycryptodomex/python-pycryptodomex.mk -PYTHON3_PYCRYPTODOMEX_VERSION = 3.13.0 -PYTHON3_PYCRYPTODOMEX_SOURCE = pycryptodomex-$(PYTHON3_PYCRYPTODOMEX_VERSION).tar.gz -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) -PYTHON3_PYCRYPTODOMEX_LICENSE_FILES = LICENSE.rst Doc/LEGAL/COPYRIGHT.pycrypto -HOST_PYTHON3_PYCRYPTODOMEX_DL_SUBDIR = python-pycryptodomex -HOST_PYTHON3_PYCRYPTODOMEX_NEEDS_HOST_PYTHON = python3 - -$(eval $(host-python-package)) -- 2.20.1 From peter at korsgaard.com Fri Feb 11 08:17:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 09:17:27 +0100 Subject: [Buildroot] [PATCH 3/5] package/python3-pyelftools: drop host package In-Reply-To: <20220211081730.23068-1-peter@korsgaard.com> References: <20220211081730.23068-1-peter@korsgaard.com> Message-ID: <20220211081730.23068-3-peter@korsgaard.com> Now that host-python2 is gone, the custom python3 variant can be dropped. Signed-off-by: Peter Korsgaard --- boot/optee-os/optee-os.mk | 2 +- boot/uboot/uboot.mk | 2 +- package/python-pyelftools/python-pyelftools.mk | 1 - .../python3-pyelftools/python3-pyelftools.hash | 1 - .../python3-pyelftools/python3-pyelftools.mk | 17 ----------------- 5 files changed, 2 insertions(+), 21 deletions(-) delete mode 120000 package/python3-pyelftools/python3-pyelftools.hash delete mode 100644 package/python3-pyelftools/python3-pyelftools.mk diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk index 2884b48513..166b5e693c 100644 --- a/boot/optee-os/optee-os.mk +++ b/boot/optee-os/optee-os.mk @@ -21,7 +21,7 @@ else OPTEE_OS_SITE = $(call github,OP-TEE,optee_os,$(OPTEE_OS_VERSION)) endif -OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pycryptodomex host-python3-pyelftools +OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pycryptodomex host-python-pyelftools # On 64bit targets, OP-TEE OS can be built in 32bit mode, or # can be built in 64bit mode and support 32bit and 64bit diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 9e227fed91..9e569906ce 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -216,7 +216,7 @@ UBOOT_DEPENDENCIES += host-swig endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS),y) -UBOOT_DEPENDENCIES += host-python3-pyelftools +UBOOT_DEPENDENCIES += host-python-pyelftools endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSSL),y) diff --git a/package/python-pyelftools/python-pyelftools.mk b/package/python-pyelftools/python-pyelftools.mk index 3ae0a4ffc2..5bfdcd33ae 100644 --- a/package/python-pyelftools/python-pyelftools.mk +++ b/package/python-pyelftools/python-pyelftools.mk @@ -4,7 +4,6 @@ # ################################################################################ -# Please keep in sync with package/python3-pyelftools/python3-pyelftools.mk PYTHON_PYELFTOOLS_VERSION = 0.27 PYTHON_PYELFTOOLS_SOURCE = pyelftools-$(PYTHON_PYELFTOOLS_VERSION).tar.gz PYTHON_PYELFTOOLS_SITE = https://files.pythonhosted.org/packages/6b/b5/f7022f2d950327ba970ec85fb8f85c79244031092c129b6f34ab17514ae0 diff --git a/package/python3-pyelftools/python3-pyelftools.hash b/package/python3-pyelftools/python3-pyelftools.hash deleted file mode 120000 index e8eebeda9f..0000000000 --- a/package/python3-pyelftools/python3-pyelftools.hash +++ /dev/null @@ -1 +0,0 @@ -../python-pyelftools/python-pyelftools.hash \ No newline at end of file diff --git a/package/python3-pyelftools/python3-pyelftools.mk b/package/python3-pyelftools/python3-pyelftools.mk deleted file mode 100644 index 3d21d3040e..0000000000 --- a/package/python3-pyelftools/python3-pyelftools.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# python3-pyelftools -# -################################################################################ - -# Please keep in sync with package/python-pyelftools/python-pyelftools.mk -PYTHON3_PYELFTOOLS_VERSION = 0.27 -PYTHON3_PYELFTOOLS_SOURCE = pyelftools-$(PYTHON3_PYELFTOOLS_VERSION).tar.gz -PYTHON3_PYELFTOOLS_SITE = https://files.pythonhosted.org/packages/6b/b5/f7022f2d950327ba970ec85fb8f85c79244031092c129b6f34ab17514ae0 -PYTHON3_PYELFTOOLS_LICENSE = Public domain -PYTHON3_PYELFTOOLS_LICENSE_FILES = LICENSE -PYTHON3_PYELFTOOLS_SETUP_TYPE = setuptools -HOST_PYTHON3_PYELFTOOLS_DL_SUBDIR = python-pyelftools -HOST_PYTHON3_PYELFTOOLS_NEEDS_HOST_PYTHON = python3 - -$(eval $(host-python-package)) -- 2.20.1 From peter at korsgaard.com Fri Feb 11 08:17:29 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 09:17:29 +0100 Subject: [Buildroot] [PATCH 5/5] package/python3-six: drop host package In-Reply-To: <20220211081730.23068-1-peter@korsgaard.com> References: <20220211081730.23068-1-peter@korsgaard.com> Message-ID: <20220211081730.23068-5-peter@korsgaard.com> Now that host-python2 is gone, the custom python3 variant can be dropped. Signed-off-by: Peter Korsgaard --- package/gnuradio/gnuradio.mk | 2 +- package/python-six/python-six.mk | 1 - package/python3-six/python3-six.hash | 1 - package/python3-six/python3-six.mk | 17 ----------------- 4 files changed, 1 insertion(+), 20 deletions(-) delete mode 120000 package/python3-six/python3-six.hash delete mode 100644 package/python3-six/python3-six.mk diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index 417a51e067..49e3b95191 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -15,7 +15,7 @@ GNURADIO_SUPPORTS_IN_SOURCE_BUILD = NO GNURADIO_DEPENDENCIES = \ host-python3 \ host-python-mako \ - host-python3-six \ + host-python-six \ host-swig \ boost \ log4cpp \ diff --git a/package/python-six/python-six.mk b/package/python-six/python-six.mk index 41ef41d0ba..9e3e5fcf50 100644 --- a/package/python-six/python-six.mk +++ b/package/python-six/python-six.mk @@ -4,7 +4,6 @@ # ################################################################################ -# Please keep in sync with package/python3-six/python3-six.mk PYTHON_SIX_VERSION = 1.16.0 PYTHON_SIX_SOURCE = six-$(PYTHON_SIX_VERSION).tar.gz PYTHON_SIX_SITE = https://files.pythonhosted.org/packages/71/39/171f1c67cd00715f190ba0b100d606d440a28c93c7714febeca8b79af85e diff --git a/package/python3-six/python3-six.hash b/package/python3-six/python3-six.hash deleted file mode 120000 index ed8cb89a6b..0000000000 --- a/package/python3-six/python3-six.hash +++ /dev/null @@ -1 +0,0 @@ -../python-six/python-six.hash \ No newline at end of file diff --git a/package/python3-six/python3-six.mk b/package/python3-six/python3-six.mk deleted file mode 100644 index ee9dc818ee..0000000000 --- a/package/python3-six/python3-six.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# python3-six -# -################################################################################ - -# Please keep in sync with package/python-six/python-six.mk -PYTHON3_SIX_VERSION = 1.16.0 -PYTHON3_SIX_SOURCE = six-$(PYTHON3_SIX_VERSION).tar.gz -PYTHON3_SIX_SITE = https://files.pythonhosted.org/packages/71/39/171f1c67cd00715f190ba0b100d606d440a28c93c7714febeca8b79af85e -PYTHON3_SIX_SETUP_TYPE = setuptools -PYTHON3_SIX_LICENSE = MIT -PYTHON3_SIX_LICENSE_FILES = LICENSE -HOST_PYTHON3_SIX_DL_SUBDIR = python-six -HOST_PYTHON3_SIX_NEEDS_HOST_PYTHON = python3 - -$(eval $(host-python-package)) -- 2.20.1 From peter at korsgaard.com Fri Feb 11 09:10:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 10:10:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/go: security bump to 1.17.7 In-Reply-To: <20220210235906.23355-1-christian@paral.in> (Christian Stewart's message of "Thu, 10 Feb 2022 15:59:06 -0800") References: <20220210235906.23355-1-christian@paral.in> Message-ID: <877da1sr8x.fsf@dell.be.48ers.dk> >>>>> "Christian" == Christian Stewart writes: > go1.17.7 includes security fixes to the crypto/elliptic, math/big packages and > to the go command, as well as bug fixes to the compiler, linker, runtime, the go > command, and the debug/macho, debug/pe, and net/http/httptest packages. > https://github.com/golang/go/issues?q=milestone%3AGo1.17.7+label%3ACherryPickApproved > Signed-off-by: Christian Stewart Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 11 09:10:59 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 10:10:59 +0100 Subject: [Buildroot] [PATCH] docs/manual/adding-packages-generic: remove useless carriage return In-Reply-To: <20220211052629.2289507-1-giulio.benetti@benettiengineering.com> (Giulio Benetti's message of "Fri, 11 Feb 2022 06:26:29 +0100") References: <20220211052629.2289507-1-giulio.benetti@benettiengineering.com> Message-ID: <8735kpsr8c.fsf@dell.be.48ers.dk> >>>>> "Giulio" == Giulio Benetti writes: > Signed-off-by: Giulio Benetti Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 11 09:10:18 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 10:10:18 +0100 Subject: [Buildroot] [git commit] docs/manual/adding-packages-generic: remove useless carriage return Message-ID: <20220211090341.5189482DDC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a3529b8020a8c8b61d9eadc455f38ce892a7c6f3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- docs/manual/adding-packages-generic.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt index 8723da214a..fbe37f9ca9 100644 --- a/docs/manual/adding-packages-generic.txt +++ b/docs/manual/adding-packages-generic.txt @@ -316,8 +316,7 @@ not and can not work as people would expect it should: 13:45+01" see "man cvs" for further details). ** +git+ for retrieving source code from a Git repository. Used by default when +LIBFOO_SITE+ begins with +git://+. The downloaded - source code is cached as with the +svn+ - method. + source code is cached as with the +svn+ method. ** +hg+ for retrieving source code from a Mercurial repository. One 'must' specify +LIBFOO_SITE_METHOD=hg+ when +LIBFOO_SITE+ contains a Mercurial repository URL. The downloaded source code From peter at korsgaard.com Fri Feb 11 09:10:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 10:10:06 +0100 Subject: [Buildroot] [git commit] package/go: security bump to 1.17.7 Message-ID: <20220211090341.48977811FB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=362b2822eea66b0775d9eba94d22c85939d2c8c9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master go1.17.7 includes security fixes to the crypto/elliptic, math/big packages and to the go command, as well as bug fixes to the compiler, linker, runtime, the go command, and the debug/macho, debug/pe, and net/http/httptest packages. https://github.com/golang/go/issues?q=milestone%3AGo1.17.7+label%3ACherryPickApproved 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 9111c8c9aa..fdf342e602 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://golang.org/dl/ -sha256 4dc1bbf3ff61f0c1ff2b19355e6d88151a70126268a47c761477686ef94748c8 go1.17.6.src.tar.gz +sha256 c108cd33b73b1911a02b697741df3dea43e01a5c4e08e409e8b3a0e3745d2b4d go1.17.7.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 062bec378c..56a21dfe55 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.17.6 +GO_VERSION = 1.17.7 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From nealf at xilinx.com Fri Feb 11 09:36:47 2022 From: nealf at xilinx.com (Neal Frager) Date: Fri, 11 Feb 2022 09:36:47 +0000 Subject: [Buildroot] [PATCH v4 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <874k56wgqs.fsf@dell.be.48ers.dk> References: <20220210081932.3114763-1-neal.frager@xilinx.com> <874k56wgqs.fsf@dell.be.48ers.dk> Message-ID: Hi Peter, > +++ b/configs/zynqmp_zcu106_defconfig > @@ -1,34 +1,39 @@ > BR2_aarch64=y > -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_GIT=y > BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" > -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.15" > xlnx_rebase_v5.15 is a branch. A git version should point to a tag og a > sha1 so the build is reproducible. Ok. I will correct this for ATF, U-Boot and Linux. > I think I earlier asked you not to change the URL when it is not needed, please leave the existing /xilinx/ URL. Yes, we did discuss this earlier. But after thinking about it, don't you think the defconfigs will look cleaner if the URL is the same format for ATF, U-Boot and the Linux kernel? It is strictly a cosmetic thing. My preference would be for all 3 to be either "Xilinx" or "xilinx". Do you prefer uppercase or lowercase? Thank for your review and support. Best regards, Neal Frager Xilinx From peter at korsgaard.com Fri Feb 11 10:08:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 11:08:16 +0100 Subject: [Buildroot] [PATCH v4 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: (Neal Frager's message of "Fri, 11 Feb 2022 09:36:47 +0000") References: <20220210081932.3114763-1-neal.frager@xilinx.com> <874k56wgqs.fsf@dell.be.48ers.dk> Message-ID: <87y22hra0f.fsf@dell.be.48ers.dk> >>>>> "Neal" == Neal Frager writes: > Hi Peter, >> +++ b/configs/zynqmp_zcu106_defconfig > @@ -1,34 +1,39 @@ > >> BR2_aarch64=y > -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" >> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y >> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y >> +BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" >> BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" >> BR2_LINUX_KERNEL=y >> BR2_LINUX_KERNEL_CUSTOM_GIT=y >> BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" >> -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" >> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.15" >> xlnx_rebase_v5.15 is a branch. A git version should point to a tag og a >> sha1 so the build is reproducible. > Ok. I will correct this for ATF, U-Boot and Linux. Good! >> I think I earlier asked you not to change the URL when it is not needed, please leave the existing /xilinx/ URL. > Yes, we did discuss this earlier. But after thinking about it, don't > you think the defconfigs will look cleaner if the URL is the same > format for ATF, U-Boot and the Linux kernel? > It is strictly a cosmetic thing. My preference would be for all 3 to > be either "Xilinx" or "xilinx". Do you prefer uppercase or lowercase? Ahh yes, agreed. The "official" URLs on Github seems to use Xilinx, so perhaps that is the best approach. -- Bye, Peter Korsgaard From nealf at xilinx.com Fri Feb 11 10:37:38 2022 From: nealf at xilinx.com (Neal Frager) Date: Fri, 11 Feb 2022 10:37:38 +0000 Subject: [Buildroot] [PATCH 1/2] configs/zynqmp_zcu106: Bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <1f0c37e0-6d9e-97d7-0421-58228d52405b@lucaceresoli.net> References: <20220208071559.2862411-1-neal.frager@xilinx.com> <69efa9da-ae55-6795-8724-ed7105083924@benettiengineering.com> <32cc1c12-1496-7db9-5e32-1b99404a4fe3@benettiengineering.com> <690d8e1b-fb6d-7c36-b07f-4ed9ca61b768@lucaceresoli.net> <489a02df-4f2b-a46c-aa49-15c3c545f8f2@lucaceresoli.net> <1EC54279-220E-4043-AFBA-953D2CF5E54A@xilinx.com> <1f0c37e0-6d9e-97d7-0421-58228d52405b@lucaceresoli.net> Message-ID: Hi Luca, I used Vitis 2021.2 to generate the pm_cfg_obj.c automatically for the zcu102 and zcu106 boards. You are correct that the files are not completely identical, so I will make sure to use the Vitis generated files in each case. board/zynqmp/zcu102/pm_cfg_obj.c board/zynqmp/zcu106/pm_cfg_obj.c For reference, there are 3 differences between the two boards when it comes to the pm_cfg_obj.c file: 1. zcu102 has pcie and zcu106 does not. 2. zcu106 has vcu and zcu102 does not. 3. zcu102 pmu uses gpio1.2 and zcu106 does not. While the two boards are similar enough to run from the same pm_cfg_obj, if these 3 features are not used, I agree that it is best to use the Vitis generated pm_cfg_obj.c files in each case. That is what I will use for these files in the next patch release. Thank you for catching this! Best regards, Neal Frager Xilinx From kieran.bingham at ideasonboard.com Fri Feb 11 11:22:45 2022 From: kieran.bingham at ideasonboard.com (Kieran Bingham) Date: Fri, 11 Feb 2022 11:22:45 +0000 Subject: [Buildroot] [PATCH] package/libcamera bump to 1966b9a58436fab51f8270aad6a228b935e4fac4 Message-ID: <20220211112245.1357817-1-kieran.bingham@ideasonboard.com> Update to the latest libcamera commit. This incorporates fixes and improvements for Raspberry Pi which will be needed to go along side the new libcamera-apps package. Signed-off-by: Kieran Bingham --- package/libcamera/libcamera.hash | 2 +- package/libcamera/libcamera.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libcamera/libcamera.hash b/package/libcamera/libcamera.hash index a7ca27a96b7f..8d5abf0e621c 100644 --- a/package/libcamera/libcamera.hash +++ b/package/libcamera/libcamera.hash @@ -1,4 +1,4 @@ -sha256 305e6f458d2bf3d4b697ffe33e104b696db6b1492bb5422e2cce1937e58516f1 libcamera-40f5fddca7f774944a53f58eeaebc4db79c373d8-br1.tar.gz +sha256 3624c71ba492c602c5335aab3dc87798193f7596c6cc75f7cfb847165f180930 libcamera-1966b9a58436fab51f8270aad6a228b935e4fac4-br1.tar.gz # license files sha256 fd38b2c053c0cce46d9c5ef3545a6e34d157a240ba99c9b8dca5d37a8147da6c LICENSES/BSD-2-Clause.txt diff --git a/package/libcamera/libcamera.mk b/package/libcamera/libcamera.mk index 534d8d26371f..cf1af5aaf065 100644 --- a/package/libcamera/libcamera.mk +++ b/package/libcamera/libcamera.mk @@ -5,7 +5,7 @@ ################################################################################ LIBCAMERA_SITE = https://git.linuxtv.org/libcamera.git -LIBCAMERA_VERSION = 40f5fddca7f774944a53f58eeaebc4db79c373d8 +LIBCAMERA_VERSION = 1966b9a58436fab51f8270aad6a228b935e4fac4 LIBCAMERA_SITE_METHOD = git LIBCAMERA_DEPENDENCIES = \ host-openssl \ -- 2.32.0 From wbx at openadk.org Fri Feb 11 11:56:06 2022 From: wbx at openadk.org (Waldemar Brodkorb) Date: Fri, 11 Feb 2022 12:56:06 +0100 Subject: [Buildroot] [git commit] package/lzip: bump to version 1.23 In-Reply-To: <20220210213036.F2A0582DFF@busybox.osuosl.org> References: <20220210213036.F2A0582DFF@busybox.osuosl.org> Message-ID: Hi Peter, Peter Korsgaard wrote, > commit: https://git.buildroot.net/buildroot/commit/?id=4648090a89a2478a4b0fa8cc43a49bc94668622c > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > > https://lists.nongnu.org/archive/html/lzip-bug/2022-02/msg00000.html > > Signed-off-by: Fabrice Fontaine > Signed-off-by: Peter Korsgaard > --- > package/lzip/lzip.hash | 4 ++-- > package/lzip/lzip.mk | 3 ++- > 2 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/package/lzip/lzip.hash b/package/lzip/lzip.hash > index 57e7eb43f4..5e285a5ad8 100644 > --- a/package/lzip/lzip.hash > +++ b/package/lzip/lzip.hash > @@ -1,4 +1,4 @@ > -# From https://lists.nongnu.org/archive/html/lzip-bug/2021-01/msg00008.html > -sha256 c3342d42e67139c165b8b128d033b5c96893a13ac5f25933190315214e87a948 lzip-1.22.tar.gz > +# From https://lists.nongnu.org/archive/html/lzip-bug/2022-02/msg00000.html > +sha256 ea02b9e6fb25d0e1a1d3ef4fdeb6ab26b931f1ece66fa1cee2983c95215e930a lzip-1.23.tar.lz > # Locally calculated > sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef COPYING > diff --git a/package/lzip/lzip.mk b/package/lzip/lzip.mk > index cca6da07d0..e3cc86b956 100644 > --- a/package/lzip/lzip.mk > +++ b/package/lzip/lzip.mk > @@ -4,7 +4,8 @@ > # > ################################################################################ > > -LZIP_VERSION = 1.22 > +LZIP_VERSION = 1.23 > +LZIP_SOURCE = lzip-$(LZIP_VERSION).tar.lz ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ This seems to break the build for at least snps_archs38_hsdk_defconfig, when no lzip is installed on the host. Kind of chicken-egg problem. https://pastebin.com/cyt1UsuG best regards Waldemar From neal.frager at xilinx.com Fri Feb 11 12:17:39 2022 From: neal.frager at xilinx.com (Neal Frager) Date: Fri, 11 Feb 2022 05:17:39 -0700 Subject: [Buildroot] [PATCH v5 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 Message-ID: <20220211121740.1257919-1-neal.frager@xilinx.com> This patch: - bumps ATF to Xilinx v2.6: mainline v2.6 requires patch to build - bumps U-Boot to Xilinx 2022.01: important drivers not in mainline - bumps Linux to Xilinx 5.15: important drivers not in mainline - deletes board/zynqmp/patches directory: patches already in mainline - modifies board/zynqmp/genimage.cfg: U-Boot 2022.01 uses u-boot.itb format - adds extlinux.conf to vfat bootfs - modifies U-Boot to unified xilinx_zynqmp_virt_defconfig (supports all boards) - adds support for SPL pm_cfg_obj.c loading to PMU firmware - enables support for host machines without OpenSSL required by U-Boot and Linux Signed-off-by: Neal Frager Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti [Giulio: only build tested] --- V1->V2: * fixed general build issues * added extlinux.conf for run-time boot issue V2->V3: * enabled support for host machines without OpenSSL required by U-Boot and Linux * moved readme.txt update to zynqmp_zcu102_defconfig patch 2/2 V3->V4: * cleaned up commit log messages * added version history V4->V5: * switched to sha1 urls to make ATF, U-Boot and Linux builds reproducible * generated board specific pm_cfg_obj.c files with vitis 2021.2 --- --- board/zynqmp/extlinux.conf | 5 + board/zynqmp/genimage.cfg | 6 +- ...-fix-Remove-GGC-ignore-Warray-bounds.patch | 68 --- ...64-zynqmp-zcu106-fix-SPL-MMC-booting.patch | 52 -- ...2-arm64-zynqmp-Enable-booting-to-ATF.patch | 114 ---- ...ept-an-absolute-path-for-PMUFW_INIT_.patch | 68 --- ...ynqmp-pass-the-PS-init-file-as-a-kco.patch | 175 ------ board/zynqmp/post-build.sh | 8 + board/zynqmp/post-image.sh | 4 +- board/zynqmp/zcu106/pm_cfg_obj.c | 565 ++++++++++++++++++ configs/zynqmp_zcu106_defconfig | 23 +- 11 files changed, 599 insertions(+), 489 deletions(-) create mode 100644 board/zynqmp/extlinux.conf delete mode 100644 board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch delete mode 100644 board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch delete mode 100644 board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch delete mode 100644 board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch delete mode 100644 board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch create mode 100755 board/zynqmp/post-build.sh create mode 100644 board/zynqmp/zcu106/pm_cfg_obj.c diff --git a/board/zynqmp/extlinux.conf b/board/zynqmp/extlinux.conf new file mode 100644 index 0000000000..ae3ec8614a --- /dev/null +++ b/board/zynqmp/extlinux.conf @@ -0,0 +1,5 @@ +label linux + kernel /Image + devicetree /system.dtb + append console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait + diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg index ed202f4550..20d8352c08 100644 --- a/board/zynqmp/genimage.cfg +++ b/board/zynqmp/genimage.cfg @@ -2,11 +2,13 @@ image boot.vfat { vfat { files = { "boot.bin", - "u-boot.bin", - "atf-uboot.ub", + "u-boot.itb", "system.dtb", "Image" } + file extlinux/extlinux.conf { + image = extlinux.conf + } } size = 32M diff --git a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch b/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch deleted file mode 100644 index 0c1a9ba2a4..0000000000 --- a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch +++ /dev/null @@ -1,68 +0,0 @@ -From da003e6ada7d0217fe99dc7c649a731f8ebd3c34 Mon Sep 17 00:00:00 2001 -From: Deepika Bhavnani -Date: Thu, 15 Aug 2019 00:56:46 +0300 -Subject: [PATCH] Coverity fix: Remove GGC ignore -Warray-bounds - -GCC diagnostics were added to ignore array boundaries, instead -of ignoring GCC warning current code will check for array boundaries -and perform and array update only for valid elements. - -Resolves: `CID 246574` `CID 246710` `CID 246651` - -Signed-off-by: Deepika Bhavnani -Change-Id: I7530ecf7a1707351c6ee87e90cc3d33574088f57 - -Backported from: 41af05154abe136938bcfb5f26c969933784bbef -[Adapted to apply on 1.5] - ---- - lib/psci/psci_common.c | 20 ++++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) - -diff --git a/lib/psci/psci_common.c b/lib/psci/psci_common.c -index 2220a745cd6e..6282d992a2f0 100644 ---- a/lib/psci/psci_common.c -+++ b/lib/psci/psci_common.c -@@ -188,21 +188,17 @@ static unsigned int get_power_on_target_pwrlvl(void) - /****************************************************************************** - * Helper function to update the requested local power state array. This array - * does not store the requested state for the CPU power level. Hence an -- * assertion is added to prevent us from accessing the wrong index. -+ * assertion is added to prevent us from accessing the CPU power level. - *****************************************************************************/ - static void psci_set_req_local_pwr_state(unsigned int pwrlvl, - unsigned int cpu_idx, - plat_local_state_t req_pwr_state) - { -- /* -- * This should never happen, we have this here to avoid -- * "array subscript is above array bounds" errors in GCC. -- */ - assert(pwrlvl > PSCI_CPU_PWR_LVL); --#pragma GCC diagnostic push --#pragma GCC diagnostic ignored "-Warray-bounds" -- psci_req_local_pwr_states[pwrlvl - 1][cpu_idx] = req_pwr_state; --#pragma GCC diagnostic pop -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && -+ (cpu_idx < PLATFORM_CORE_COUNT)) { -+ psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx] = req_pwr_state; -+ } - } - - /****************************************************************************** -@@ -228,7 +224,11 @@ static plat_local_state_t *psci_get_req_local_pwr_states(unsigned int pwrlvl, - { - assert(pwrlvl > PSCI_CPU_PWR_LVL); - -- return &psci_req_local_pwr_states[pwrlvl - 1][cpu_idx]; -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && -+ (cpu_idx < PLATFORM_CORE_COUNT)) { -+ return &psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx]; -+ } else -+ return NULL; - } - - /* --- -2.34.0 - diff --git a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch b/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch deleted file mode 100644 index 4d85e1bb12..0000000000 --- a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch +++ /dev/null @@ -1,52 +0,0 @@ -From e5d72ed8339eb05285448aad3c89d21e4d18fd29 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Mon, 26 Feb 2018 09:40:34 +0100 -Subject: [PATCH] arm64: zynqmp: zcu106: fix SPL MMC booting - -The U-Boot SPL generated with the current zcu106 defconfig cannot boot -from MMC: - - [...] - U-Boot SPL 2018.01 (Feb 21 2018 - 17:47:14) - EL Level: EL3 - Trying to boot from MMC1 - sdhci_transfer_data: Error detected in status(0x408020)! - spl_load_image_fat_os: error reading image u-boot.bin, err - -2 - spl_load_image_fat: error reading image u-boot.img, err - -6 - SPL: failed to boot from all boot devices - ### ERROR ### Please RESET the board ### - -Fix by lowering the rpll value. The new value for the RPLL_CTRL -register comes from the current psu_init_gpl.c from the HDF file at -https://github.com/xilinx/hdf-examples/tree/01ad8ea5fd1989abf4ea5a072d019a16cb2bc546/zcu106-zynqmp -(generated by Vivado v2017.4). - -RPLL and sdio1_ref clocks before and after this change: - - - Old values: RPLL 1.36 GHz, sdio1_ref 272 MHz - - New values: RPLL 1.16 GHz, sdio1_ref 233 MHz - -Signed-off-by: Luca Ceresoli -Cc: Michal Simek -Upstream-status: accepted upstream in a different form ---- - - board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -index 4d18abe000ca..e6fa477e53e7 100644 ---- a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -+++ b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -@@ -10,7 +10,7 @@ - static unsigned long psu_pll_init_data(void) - { - psu_mask_write(0xFF5E0034, 0xFE7FEDEFU, 0x7E4E2C62U); -- psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00013C00U); -+ psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00014600U); - psu_mask_write(0xFF5E0030, 0x00000008U, 0x00000008U); - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000001U); - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000000U); --- -2.7.4 - diff --git a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch b/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch deleted file mode 100644 index 487fff6812..0000000000 --- a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 5e3cac50cc981e01d9072241035a8d4162560c71 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Mon, 12 Mar 2018 17:18:38 +0100 -Subject: [PATCH] arm64: zynqmp: Enable booting to ATF - -U-Boot is now able to boot to ARM Trusted Firmware (ATF). The boot -flow is SPL(EL3) loads ATF and full u-boot and jump to ATF(EL3) which -pass control to full u-boot(EL2). This has been tested on zcu106, so -enable it in this defconfig. - -To generate an image that triggers this booting flow, you need to pass -'-O arm-trusted-firmware' to mkimage. - -Signed-off-by: Luca Ceresoli -Signed-off-by: Michal Simek -Backported from upstream: http://git.denx.de/?p=u-boot.git;a=commit;h=5e3cac50cc981e01d9072241035a8d4162560c71 ---- - - configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 + - configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 + - configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 + - configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 + - configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 1 + - configs/xilinx_zynqmp_zcu102_revA_defconfig | 1 + - configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 + - 7 files changed, 7 insertions(+) - -diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig -index c5bfa2b12638..488c72258b0e 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig -index f86dce403a42..5d501eec0edd 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig -@@ -20,6 +20,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig -index 6e947cf56827..6f7eaebd7676 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig -@@ -16,6 +16,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_CMD_MEMTEST=y - CONFIG_SYS_ALT_MEMTEST=y -diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig -index 1c934858c61c..7a3806cba4b5 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig -@@ -17,6 +17,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_CMD_MEMTEST=y - CONFIG_SYS_ALT_MEMTEST=y -diff --git a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig -index e13c7c56f310..e4408f182ca0 100644 ---- a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig -+++ b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig b/configs/xilinx_zynqmp_zcu102_revA_defconfig -index 5b2cd495ee85..b52f6789fd4b 100644 ---- a/configs/xilinx_zynqmp_zcu102_revA_defconfig -+++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig -index e6530fbfe7ff..80592554f682 100644 ---- a/configs/xilinx_zynqmp_zcu102_revB_defconfig -+++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y --- -2.7.4 - diff --git a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch b/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch deleted file mode 100644 index 95ab7b3b75..0000000000 --- a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch +++ /dev/null @@ -1,68 +0,0 @@ -From c7df098a71e05dc81cee818747759e8060b59626 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Mon, 4 Jun 2018 12:21:01 +0200 -Subject: [PATCH] arm64: zynqmp: accept an absolute path for PMUFW_INIT_FILE - -The value of PMUFW_INIT_FILE is prefixed with "$(srctree)/", thus -forcing it to be a relative path inside the U-Boot source tree. Since -the PMUFW is a binary file generated outside of U-Boot, the PMUFW -binary must be copied inside the U-Boot source tree before the -build. - -This generates a few problems: - - * if the source tree is shared among different out-of-tree builds, - they will pollute (and potentially corrupt) each other - * the source tree cannot be read-only - * any buildsystem must add a command to copy the PMUFW binary - * putting an externally-generated binary in the source tree is ugly - as hell - -Avoid these problems by accepting an absolute path for -PMUFW_INIT_FILE. This would be as simple as removing the "$(srctree)/" -prefix, but in order to keep backward compatibility we rather use the -shell and readlink to get the absolute path even when starting from a -relative path. - -Since 'readlink -f' produces an empty string if the file does not -exist, we also add a check to ensure the file configured in -PMUFW_INIT_FILE exists. Otherwise the build would exit successfully, -but produce a boot.bin without PMUFW as if PMUFW_INIT_FILE were empty. - -Tested in the 12 possible combinations of: - - PMUFW_INIT_FILE empty, relative, absolute, non-existing - - building in-tree, in subdir, in other directory - -Signed-off-by: Luca Ceresoli -Cc: Michal Simek -Cc: Simon Glass -Cc: Emmanuel Vadot -Signed-off-by: Michal Simek -Backported from upstream: https://git.denx.de/?p=u-boot.git;a=commit;h=c7df098a71e05dc81cee818747759e8060b59626 ---- - scripts/Makefile.spl | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl -index ef018b5b4056..252f13826d4c 100644 ---- a/scripts/Makefile.spl -+++ b/scripts/Makefile.spl -@@ -167,8 +167,14 @@ ifdef CONFIG_ARCH_ZYNQ - MKIMAGEFLAGS_boot.bin = -T zynqimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) - endif - ifdef CONFIG_ARCH_ZYNQMP -+ifneq ($(CONFIG_PMUFW_INIT_FILE),"") -+spl/boot.bin: zynqmp-check-pmufw -+zynqmp-check-pmufw: FORCE -+ ( cd $(srctree) && test -r $(CONFIG_PMUFW_INIT_FILE) ) \ -+ || ( echo "Cannot read $(CONFIG_PMUFW_INIT_FILE)" && false ) -+endif - MKIMAGEFLAGS_boot.bin = -T zynqmpimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) \ -- -n $(srctree)/$(CONFIG_PMUFW_INIT_FILE) -+ -n "$(shell cd $(srctree); readlink -f $(CONFIG_PMUFW_INIT_FILE))" - endif - - spl/boot.bin: $(obj)/u-boot-spl.bin FORCE --- -2.7.4 - diff --git a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch b/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch deleted file mode 100644 index b32e162780..0000000000 --- a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch +++ /dev/null @@ -1,175 +0,0 @@ -From 4c9d54ab5a41d65000c8d249b6fb1b76056f1812 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Wed, 20 Jun 2018 12:11:50 +0200 -Subject: [PATCH] arm/arm64: zynq/zynqmp: pass the PS init file as a kconfig - variable - -U-Boot needs to link ps7_init_gpl.c on Zynq or psu_init_gpl.c on -ZynqMP (PS init for short). The current logic to locate this file for -both platforms is: - - 1. if a board-specific file exists in - board/xilinx/zynq[mp]/$(CONFIG_DEFAULT_DEVICE_TREE)/ps?_init_gpl.c - then use it - 2. otherwise use board/xilinx/zynq/ps?_init_gpl.c - -In the latter case the file does not exist in the U-Boot sources and -must be copied in the source tree from the outside before starting the -build. This is typical when it is generated from Xilinx tools while -developing a custom hardware. However making sure that a -board-specific file is _not_ found (and used) requires some trickery -such as removing or overwriting all PS init files (e.g.: the current -meta-xilinx yocto layer [0]). - -This generates a few problems: - - * if the source tree is shared among different out-of-tree builds, - they will pollute (and potentially corrupt) each other - * the source tree cannot be read-only - * any buildsystem must add a command to copy the PS init file binary - * overwriting or deleting files in the source tree is ugly as hell - -Simplify usage by allowing to pass the path to the desired PS init -file in kconfig variable XILINX_PS_INIT_FILE. It can be an absolute -path or relative to $(srctree). If the variable is set, the -user-specified file will always be used without being copied -around. If the the variable is left empty, for backward compatibility -fall back to the old behaviour. - -Since the issue is the same for Zynq and ZynqMP, add one kconfig -variable in a common place and use it for both. - -Also use the new kconfig help text to document all the ways to give -U-Boot the PS init file. - -Build-tested with all combinations of: - - platform: zynq or zynqmp - - PS init file: from XILINX_PS_INIT_FILE (absolute, relative path, - non-existing), in-tree board-specific, in board/xilinx/zynq[mp]/ - - building in-tree, in subdir, in other directory - -[0] https://github.com/Xilinx/meta-xilinx/blob/b2f74cc7fe5c4881589d5e440a17cb51fc66a7ab/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init.inc#L9 - -Signed-off-by: Luca Ceresoli -Cc: Albert Aribaud -Cc: Michal Simek -Cc: Nathan Rossi -Backported from upstream: https://git.denx.de/?p=u-boot.git;a=commit;h=6da4f67ad09cd8b311d77b2b04e557b7ef65b56c ---- - arch/arm/Kconfig | 1 + - board/xilinx/Kconfig | 41 +++++++++++++++++++++++++++++++++++++++++ - board/xilinx/zynq/Makefile | 10 +++++++++- - board/xilinx/zynqmp/Makefile | 10 +++++++++- - 4 files changed, 60 insertions(+), 2 deletions(-) - create mode 100644 board/xilinx/Kconfig - -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 22234cde2ab6..e04979d0ef7e 100644 ---- a/arch/arm/Kconfig -+++ b/arch/arm/Kconfig -@@ -1293,4 +1293,5 @@ source "board/technologic/ts4600/Kconfig" - source "board/vscom/baltos/Kconfig" - source "board/woodburn/Kconfig" - source "board/work-microwave/work_92105/Kconfig" -+source "board/xilinx/Kconfig" - source "board/zipitz2/Kconfig" - - source "arch/arm/Kconfig.debug" -diff --git a/board/xilinx/Kconfig b/board/xilinx/Kconfig -new file mode 100644 -index 000000000000..aa3fa061edef ---- /dev/null -+++ b/board/xilinx/Kconfig -@@ -0,0 +1,41 @@ -+# Copyright (c) 2018, Luca Ceresoli -+# -+# SPDX-License-Identifier: GPL-2.0 -+ -+if ARCH_ZYNQ || ARCH_ZYNQMP -+ -+config XILINX_PS_INIT_FILE -+ string "Zynq/ZynqMP PS init file(s) location" -+ help -+ On Zynq and ZynqMP U-Boot SPL (or U-Boot proper if -+ ZYNQMP_PSU_INIT_ENABLED is set) is responsible for some -+ basic initializations, such as enabling peripherals and -+ configuring pinmuxes. The PS init file (called -+ psu_init_gpl.c on ZynqMP, ps7_init_gpl.c for Zynq-7000) -+ contains the code for such initializations. -+ -+ U-Boot contains PS init files for some boards, but each of -+ them describes only one specific configuration. Users of a -+ different board, or needing a different configuration, can -+ generate custom files using the Xilinx development tools. -+ -+ There are three ways to give a PS init file to U-Boot: -+ -+ 1. Set this variable to the path, either relative to the -+ source tree or absolute, where the psu_init_gpl.c or -+ ps7_init_gpl.c file is located. U-Boot will build this -+ file. -+ -+ 2. If you leave an empty string here, U-Boot will use -+ board/xilinx/zynq/$(CONFIG_DEFAULT_DEVICE_TREE)/ps7_init_gpl.c -+ for Zynq-7000, or -+ board/xilinx/zynqmp/$(CONFIG_DEFAULT_DEVICE_TREE)/psu_init_gpl.c -+ for ZynqMP. -+ -+ 3. If the above file does not exist, U-Boot will use -+ board/xilinx/zynq/ps7_init_gpl.c for Zynq-7000, or -+ board/xilinx/zynqmp/psu_init_gpl.c for ZynqMP. This file -+ is not provided by U-Boot, you have to copy it there -+ before the build. -+ -+endif -diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile -index 5a76a26720cd..03ad5f0532ee 100644 ---- a/board/xilinx/zynq/Makefile -+++ b/board/xilinx/zynq/Makefile -@@ -5,10 +5,18 @@ - - obj-y := board.o - --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE)) -+init-objs := ps_init_gpl.o -+spl/board/xilinx/zynq/ps_init_gpl.o board/xilinx/zynq/ps_init_gpl.o: $(PS_INIT_FILE) -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ -+endif - -+ifeq ($(init-objs),) -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/ps7_init_gpl.c),\ - $(hw-platform-y)/ps7_init_gpl.o) -+endif - - ifeq ($(init-objs),) - ifneq ($(wildcard $(srctree)/$(src)/ps7_init_gpl.c),) -diff --git a/board/xilinx/zynqmp/Makefile b/board/xilinx/zynqmp/Makefile -index 05ccd25dcef3..960b81fc5853 100644 ---- a/board/xilinx/zynqmp/Makefile -+++ b/board/xilinx/zynqmp/Makefile -@@ -5,10 +5,18 @@ - - obj-y := zynqmp.o - --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE)) -+init-objs := ps_init_gpl.o -+spl/board/xilinx/zynqmp/ps_init_gpl.o board/xilinx/zynqmp/ps_init_gpl.o: $(PS_INIT_FILE) -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ -+endif - -+ifeq ($(init-objs),) -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/psu_init_gpl.c),\ - $(hw-platform-y)/psu_init_gpl.o) -+endif - - ifeq ($(init-objs),) - ifneq ($(wildcard $(srctree)/$(src)/psu_init_gpl.c),) --- -2.7.4 - diff --git a/board/zynqmp/post-build.sh b/board/zynqmp/post-build.sh new file mode 100755 index 0000000000..9fd8bbf2c8 --- /dev/null +++ b/board/zynqmp/post-build.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +# genimage will need to find the extlinux.conf +# in the binaries directory + +BOARD_DIR="$(dirname $0)" + +install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux.conf diff --git a/board/zynqmp/post-image.sh b/board/zynqmp/post-image.sh index b2b99fed01..ed6dbe188c 100755 --- a/board/zynqmp/post-image.sh +++ b/board/zynqmp/post-image.sh @@ -10,4 +10,6 @@ FIRST_DT=$(sed -nr \ [ -z "${FIRST_DT}" ] || ln -fs ${FIRST_DT}.dtb ${BINARIES_DIR}/system.dtb -support/scripts/genimage.sh -c board/zynqmp/genimage.cfg +BOARD_DIR="$(dirname $0)" + +support/scripts/genimage.sh -c $BOARD_DIR/genimage.cfg diff --git a/board/zynqmp/zcu106/pm_cfg_obj.c b/board/zynqmp/zcu106/pm_cfg_obj.c new file mode 100644 index 0000000000..fd4f2d3304 --- /dev/null +++ b/board/zynqmp/zcu106/pm_cfg_obj.c @@ -0,0 +1,565 @@ +/****************************************************************************** +* Copyright (c) 2017 - 2021 Xilinx, Inc. All rights reserved. +* SPDX-License-Identifier: MIT +******************************************************************************/ + +#include "xil_types.h" +#include "pm_defs.h" + +#define PM_CONFIG_MASTER_SECTION_ID 0x101U +#define PM_CONFIG_SLAVE_SECTION_ID 0x102U +#define PM_CONFIG_PREALLOC_SECTION_ID 0x103U +#define PM_CONFIG_POWER_SECTION_ID 0x104U +#define PM_CONFIG_RESET_SECTION_ID 0x105U +#define PM_CONFIG_SHUTDOWN_SECTION_ID 0x106U +#define PM_CONFIG_SET_CONFIG_SECTION_ID 0x107U +#define PM_CONFIG_GPO_SECTION_ID 0x108U + +#define PM_SLAVE_FLAG_IS_SHAREABLE 0x1U +#define PM_MASTER_USING_SLAVE_MASK 0x2U + +#define PM_CONFIG_GPO1_MIO_PIN_34_MAP (1U << 10U) +#define PM_CONFIG_GPO1_MIO_PIN_35_MAP (1U << 11U) +#define PM_CONFIG_GPO1_MIO_PIN_36_MAP (1U << 12U) +#define PM_CONFIG_GPO1_MIO_PIN_37_MAP (1U << 13U) + +#define PM_CONFIG_GPO1_BIT_2_MASK (1U << 2U) +#define PM_CONFIG_GPO1_BIT_3_MASK (1U << 3U) +#define PM_CONFIG_GPO1_BIT_4_MASK (1U << 4U) +#define PM_CONFIG_GPO1_BIT_5_MASK (1U << 5U) + +#define SUSPEND_TIMEOUT 0xFFFFFFFFU + +#define PM_CONFIG_OBJECT_TYPE_BASE 0x1U + + +#define PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK 0x00000001 +#define PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK 0x00000100 +#define PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK 0x00000200 + + + +#if defined (__ICCARM__) +#pragma language=save +#pragma language=extended +#endif +#if defined (__GNUC__) + const u32 XPm_ConfigObject[] __attribute__((used, section(".sys_cfg_data"))) = +#elif defined (__ICCARM__) +#pragma location = ".sys_cfg_data" +__root const u32 XPm_ConfigObject[] = +#endif +{ + /**********************************************************************/ + /* HEADER */ + 2, /* Number of remaining words in the header */ + 8, /* Number of sections included in config object */ + PM_CONFIG_OBJECT_TYPE_BASE, /* Type of config object as base */ + /**********************************************************************/ + /* MASTER SECTION */ + PM_CONFIG_MASTER_SECTION_ID, /* Master SectionID */ + 3U, /* No. of Masters*/ + + NODE_APU, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_0, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_1, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Wake permissions */ + + + /**********************************************************************/ + /* SLAVE SECTION */ + + + PM_CONFIG_SLAVE_SECTION_ID, /* Section ID */ + 49, /* Number of slaves */ + + NODE_OCM_BANK_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TCM_0_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_0_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_1_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TCM_1_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_L2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU_PP_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU_PP_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_USB_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_USB_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_TTC_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SATA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_ETH_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_UART_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_UART_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SPI_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_SPI_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_I2C_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_I2C_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SD_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_SD_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_DP, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GDMA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_ADMA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_NAND, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_QSPI, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPIO, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_CAN_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_CAN_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_EXTERN, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_DDR, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_IPI_APU, + 0U, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_0, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_1, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_PCIE, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_PCAP, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_RTC, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_VCU, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_PL, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + + /**********************************************************************/ + /* PREALLOC SECTION */ + + PM_CONFIG_PREALLOC_SECTION_ID, /* Preallaoc SectionID */ + 3U, /* No. of Masters*/ + +/* Prealloc for psu_cortexa53_0 */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, + 12, + NODE_DDR, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_L2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_3, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_SD_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_QSPI, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_PL, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_APU, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_0 */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + 3, + NODE_TCM_0_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_0_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_1 */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + 3, + NODE_TCM_1_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_1_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + + /**********************************************************************/ + /* POWER SECTION */ + + PM_CONFIG_POWER_SECTION_ID, /* Power Section ID */ + 4U, /* Number of power nodes */ + + NODE_APU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_RPU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_FPD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_PLD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + + /**********************************************************************/ + /* RESET SECTION */ + + PM_CONFIG_RESET_SECTION_ID, /* Reset Section ID */ + 120U, /* Number of resets */ + + XILPM_RESET_PCIE_CFG, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_BRIDGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_CTRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRF, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GDMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SATA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APU_L2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DDR, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SOFT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_QSPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_NAND, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ADMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOU_CC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TIMESTAMP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R50, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R51, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_AMBA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_OCM, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_PGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RTC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SYSMON, 0, + XILPM_RESET_AFI_FM6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_LPD_SWDT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_FPD, PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + XILPM_RESET_RPU_DBG1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_DBG0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_VPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_7, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_8, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_9, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_10, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_11, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_12, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_13, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_14, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_15, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_16, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_17, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_18, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_19, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_20, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_21, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_22, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_23, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_24, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_25, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_26, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_27, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_28, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_29, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_30, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_31, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_LS, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PS_ONLY, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_92, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_93, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_94, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_95, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + + /**********************************************************************/ + /* SET CONFIG SECTION */ + PM_CONFIG_SET_CONFIG_SECTION_ID, /* Set Config Section ID */ + 0U, /* Permissions to load base config object */ + 0U, /* Permissions to load overlay config object */ + + /**********************************************************************/ + /* SHUTDOWN SECTION */ + + PM_CONFIG_SHUTDOWN_SECTION_ID, /* Shutdown Section ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* System Shutdown/Restart Permission */ + + /**********************************************************************/ + /* GPO SECTION */ + PM_CONFIG_GPO_SECTION_ID, /* GPO Section ID */ + PM_CONFIG_GPO1_MIO_PIN_34_MAP | + PM_CONFIG_GPO1_MIO_PIN_35_MAP | + PM_CONFIG_GPO1_MIO_PIN_36_MAP | + PM_CONFIG_GPO1_MIO_PIN_37_MAP | + 0, /* State of GPO pins */ +}; +#if defined (__ICCARM__) +#pragma language=restore +#endif + diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index bee7c1daf7..4910252f78 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -1,34 +1,39 @@ BR2_aarch64=y -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="966124532656bc95d781abf57531e4cd4f962237" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="e678d5ddc475f34dea8f5004fb6ebde118621784" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA" +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="667001319cbe511ce6353195fb4910ae5cb041ce" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/53fdb7b6c92860ceb0ec5fd14deee302f4a84269/bin/pmufw-zcu106-default-v2017.4.bin" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/v2021.2/bin/pmufw-v2021.2.bin" +BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/zcu106/pm_cfg_obj.c" +BR2_TARGET_UBOOT_FORMAT_ITB=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -- 2.17.1 From neal.frager at xilinx.com Fri Feb 11 12:17:40 2022 From: neal.frager at xilinx.com (Neal Frager) Date: Fri, 11 Feb 2022 05:17:40 -0700 Subject: [Buildroot] [PATCH v5 2/2] add configs/zynqmp_zcu102_defconfig In-Reply-To: <20220211121740.1257919-1-neal.frager@xilinx.com> References: <20220211121740.1257919-1-neal.frager@xilinx.com> Message-ID: <20220211121740.1257919-2-neal.frager@xilinx.com> This patch: - adds support for Xilinx ZCU102 evaluation board - ZCU102 features can be found here: https://www.xilinx.com/products/boards-and-kits/zcu102.html Signed-off-by: Neal Frager Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti [Giulio: only build tested] --- V1->V2: * fixed general build issues * added extlinux.conf for run-time boot issue V2->V3: * enabled support for host machines without OpenSSL required by U-Boot and Linux * moved readme.txt update to zynqmp_zcu102_defconfig patch 2/2 V3->V4: * cleaned up commit log messages * added version history V4->V5: * switched to sha1 urls to make ATF, U-Boot and Linux builds reproducible * generated board specific pm_cfg_obj.c files with vitis 2021.2 --- --- board/zynqmp/readme.txt | 23 +- board/zynqmp/zcu102/pm_cfg_obj.c | 566 +++++++++++++++++++++++++++++++ configs/zynqmp_zcu102_defconfig | 39 +++ 3 files changed, 621 insertions(+), 7 deletions(-) create mode 100644 board/zynqmp/zcu102/pm_cfg_obj.c create mode 100644 configs/zynqmp_zcu102_defconfig diff --git a/board/zynqmp/readme.txt b/board/zynqmp/readme.txt index da37f4ccc9..0dc1793e03 100644 --- a/board/zynqmp/readme.txt +++ b/board/zynqmp/readme.txt @@ -1,10 +1,19 @@ -******************************** -Xilinx ZCU106 board - ZynqMP SoC -******************************** +****************************************** +Xilinx ZCU102 / ZCU106 boards - ZynqMP SoC +****************************************** + +This document describes the Buildroot support for the ZCU102 and ZCU106 +boards by Xilinx, based on the Zynq UltraScale+ MPSoC (aka ZynqMP). +It has been tested with the ZCU102 and ZCU106 production boards. + +Evaluation board features can be found here with the links below. + +ZCU102: +https://www.xilinx.com/products/boards-and-kits/zcu102.html + +ZCU106: +https://www.xilinx.com/products/boards-and-kits/zcu106.html -This document describes the Buildroot support for the ZCU106 board by -Xilinx, based on the Zynq UltraScale+ MPSoC (aka ZynqMP). It has been -tested with the EK-U1-ZCU106-ES2 pre-production board. How to build it =============== @@ -32,7 +41,7 @@ After building, you should get a tree like this: +-- rootfs.ext4 -> rootfs.ext2 +-- sdcard.img +-- system.dtb -> zynqmp-zcu106-revA.dtb - +-- u-boot.bin + +-- u-boot.itb `-- zynqmp-zcu106-revA.dtb How to write the SD card diff --git a/board/zynqmp/zcu102/pm_cfg_obj.c b/board/zynqmp/zcu102/pm_cfg_obj.c new file mode 100644 index 0000000000..d93e1746e6 --- /dev/null +++ b/board/zynqmp/zcu102/pm_cfg_obj.c @@ -0,0 +1,566 @@ +/****************************************************************************** +* Copyright (c) 2017 - 2021 Xilinx, Inc. All rights reserved. +* SPDX-License-Identifier: MIT +******************************************************************************/ + +#include "xil_types.h" +#include "pm_defs.h" + +#define PM_CONFIG_MASTER_SECTION_ID 0x101U +#define PM_CONFIG_SLAVE_SECTION_ID 0x102U +#define PM_CONFIG_PREALLOC_SECTION_ID 0x103U +#define PM_CONFIG_POWER_SECTION_ID 0x104U +#define PM_CONFIG_RESET_SECTION_ID 0x105U +#define PM_CONFIG_SHUTDOWN_SECTION_ID 0x106U +#define PM_CONFIG_SET_CONFIG_SECTION_ID 0x107U +#define PM_CONFIG_GPO_SECTION_ID 0x108U + +#define PM_SLAVE_FLAG_IS_SHAREABLE 0x1U +#define PM_MASTER_USING_SLAVE_MASK 0x2U + +#define PM_CONFIG_GPO1_MIO_PIN_34_MAP (1U << 10U) +#define PM_CONFIG_GPO1_MIO_PIN_35_MAP (1U << 11U) +#define PM_CONFIG_GPO1_MIO_PIN_36_MAP (1U << 12U) +#define PM_CONFIG_GPO1_MIO_PIN_37_MAP (1U << 13U) + +#define PM_CONFIG_GPO1_BIT_2_MASK (1U << 2U) +#define PM_CONFIG_GPO1_BIT_3_MASK (1U << 3U) +#define PM_CONFIG_GPO1_BIT_4_MASK (1U << 4U) +#define PM_CONFIG_GPO1_BIT_5_MASK (1U << 5U) + +#define SUSPEND_TIMEOUT 0xFFFFFFFFU + +#define PM_CONFIG_OBJECT_TYPE_BASE 0x1U + + +#define PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK 0x00000001 +#define PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK 0x00000100 +#define PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK 0x00000200 + + + +#if defined (__ICCARM__) +#pragma language=save +#pragma language=extended +#endif +#if defined (__GNUC__) + const u32 XPm_ConfigObject[] __attribute__((used, section(".sys_cfg_data"))) = +#elif defined (__ICCARM__) +#pragma location = ".sys_cfg_data" +__root const u32 XPm_ConfigObject[] = +#endif +{ + /**********************************************************************/ + /* HEADER */ + 2, /* Number of remaining words in the header */ + 8, /* Number of sections included in config object */ + PM_CONFIG_OBJECT_TYPE_BASE, /* Type of config object as base */ + /**********************************************************************/ + /* MASTER SECTION */ + PM_CONFIG_MASTER_SECTION_ID, /* Master SectionID */ + 3U, /* No. of Masters*/ + + NODE_APU, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_0, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_1, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Wake permissions */ + + + /**********************************************************************/ + /* SLAVE SECTION */ + + + PM_CONFIG_SLAVE_SECTION_ID, /* Section ID */ + 49, /* Number of slaves */ + + NODE_OCM_BANK_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TCM_0_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_0_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_1_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TCM_1_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_L2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU_PP_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU_PP_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_USB_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_USB_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_TTC_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SATA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_ETH_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_UART_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_UART_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SPI_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_SPI_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_I2C_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_I2C_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SD_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_SD_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_DP, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GDMA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_ADMA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_NAND, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_QSPI, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPIO, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_CAN_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_CAN_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_EXTERN, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_DDR, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_IPI_APU, + 0U, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_0, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_1, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_PCIE, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_PCAP, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_RTC, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_VCU, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_PL, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + + /**********************************************************************/ + /* PREALLOC SECTION */ + + PM_CONFIG_PREALLOC_SECTION_ID, /* Preallaoc SectionID */ + 3U, /* No. of Masters*/ + +/* Prealloc for psu_cortexa53_0 */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, + 12, + NODE_DDR, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_L2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_3, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_SD_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_QSPI, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_PL, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_APU, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_0 */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + 3, + NODE_TCM_0_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_0_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_1 */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + 3, + NODE_TCM_1_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_1_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + + /**********************************************************************/ + /* POWER SECTION */ + + PM_CONFIG_POWER_SECTION_ID, /* Power Section ID */ + 4U, /* Number of power nodes */ + + NODE_APU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_RPU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_FPD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_PLD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + + /**********************************************************************/ + /* RESET SECTION */ + + PM_CONFIG_RESET_SECTION_ID, /* Reset Section ID */ + 120U, /* Number of resets */ + + XILPM_RESET_PCIE_CFG, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_BRIDGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_CTRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRF, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GDMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SATA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APU_L2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DDR, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SOFT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_QSPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_NAND, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ADMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOU_CC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TIMESTAMP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R50, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R51, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_AMBA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_OCM, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_PGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RTC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SYSMON, 0, + XILPM_RESET_AFI_FM6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_LPD_SWDT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_FPD, PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + XILPM_RESET_RPU_DBG1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_DBG0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_VPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_7, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_8, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_9, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_10, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_11, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_12, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_13, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_14, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_15, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_16, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_17, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_18, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_19, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_20, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_21, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_22, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_23, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_24, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_25, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_26, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_27, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_28, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_29, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_30, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_31, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_LS, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PS_ONLY, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_92, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_93, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_94, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_95, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + + /**********************************************************************/ + /* SET CONFIG SECTION */ + PM_CONFIG_SET_CONFIG_SECTION_ID, /* Set Config Section ID */ + 0U, /* Permissions to load base config object */ + 0U, /* Permissions to load overlay config object */ + + /**********************************************************************/ + /* SHUTDOWN SECTION */ + + PM_CONFIG_SHUTDOWN_SECTION_ID, /* Shutdown Section ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* System Shutdown/Restart Permission */ + + /**********************************************************************/ + /* GPO SECTION */ + PM_CONFIG_GPO_SECTION_ID, /* GPO Section ID */ + PM_CONFIG_GPO1_BIT_2_MASK | + PM_CONFIG_GPO1_MIO_PIN_34_MAP | + PM_CONFIG_GPO1_MIO_PIN_35_MAP | + PM_CONFIG_GPO1_MIO_PIN_36_MAP | + PM_CONFIG_GPO1_MIO_PIN_37_MAP | + 0, /* State of GPO pins */ +}; +#if defined (__ICCARM__) +#pragma language=restore +#endif + diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig new file mode 100644 index 0000000000..6e9e50ca77 --- /dev/null +++ b/configs/zynqmp_zcu102_defconfig @@ -0,0 +1,39 @@ +BR2_aarch64=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="966124532656bc95d781abf57531e4cd4f962237" +BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="e678d5ddc475f34dea8f5004fb6ebde118621784" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/Xilinx/u-boot-xlnx.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="667001319cbe511ce6353195fb4910ae5cb041ce" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" +BR2_TARGET_UBOOT_ZYNQMP=y +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/v2021.2/bin/pmufw-v2021.2.bin" +BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/zcu102/pm_cfg_obj.c" +BR2_TARGET_UBOOT_FORMAT_ITB=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y -- 2.17.1 From peter at korsgaard.com Fri Feb 11 12:17:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 13:17:05 +0100 Subject: [Buildroot] [git commit] package/lzip: use .tar.gz format for source Message-ID: <20220211121158.D0B9D81392@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=618c5f7671643516432c1ec6b9f7b203313763a7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Using a lzip compressed tarball to build host-lzip so lzip compressed tarballs can be extracted naturally doesn't work. Use the .tar.gz format instead. Reported-by: Waldemar Brodkorb Signed-off-by: Peter Korsgaard --- package/lzip/lzip.hash | 2 +- package/lzip/lzip.mk | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/package/lzip/lzip.hash b/package/lzip/lzip.hash index 5e285a5ad8..48ee8175ca 100644 --- a/package/lzip/lzip.hash +++ b/package/lzip/lzip.hash @@ -1,4 +1,4 @@ # From https://lists.nongnu.org/archive/html/lzip-bug/2022-02/msg00000.html -sha256 ea02b9e6fb25d0e1a1d3ef4fdeb6ab26b931f1ece66fa1cee2983c95215e930a lzip-1.23.tar.lz +sha256 4792c047ddf15ef29d55ba8e68a1a21e0cb7692d87ecdf7204419864582f280d lzip-1.23.tar.gz # Locally calculated sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef COPYING diff --git a/package/lzip/lzip.mk b/package/lzip/lzip.mk index e3cc86b956..31b5750767 100644 --- a/package/lzip/lzip.mk +++ b/package/lzip/lzip.mk @@ -5,7 +5,6 @@ ################################################################################ LZIP_VERSION = 1.23 -LZIP_SOURCE = lzip-$(LZIP_VERSION).tar.lz LZIP_SITE = http://download.savannah.gnu.org/releases/lzip LZIP_LICENSE = GPL-2.0+ LZIP_LICENSE_FILES = COPYING From peter at korsgaard.com Fri Feb 11 12:19:25 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 13:19:25 +0100 Subject: [Buildroot] [git commit] package/lzip: bump to version 1.23 In-Reply-To: (Waldemar Brodkorb's message of "Fri, 11 Feb 2022 12:56:06 +0100") References: <20220210213036.F2A0582DFF@busybox.osuosl.org> Message-ID: <87tud5r3xu.fsf@dell.be.48ers.dk> >>>>> "Waldemar" == Waldemar Brodkorb writes: > Hi Peter, > Peter Korsgaard wrote, >> commit: https://git.buildroot.net/buildroot/commit/?id=4648090a89a2478a4b0fa8cc43a49bc94668622c >> branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master >> >> https://lists.nongnu.org/archive/html/lzip-bug/2022-02/msg00000.html >> >> Signed-off-by: Fabrice Fontaine >> Signed-off-by: Peter Korsgaard >> --- >> package/lzip/lzip.hash | 4 ++-- >> package/lzip/lzip.mk | 3 ++- >> 2 files changed, 4 insertions(+), 3 deletions(-) >> >> diff --git a/package/lzip/lzip.hash b/package/lzip/lzip.hash >> index 57e7eb43f4..5e285a5ad8 100644 >> --- a/package/lzip/lzip.hash >> +++ b/package/lzip/lzip.hash >> @@ -1,4 +1,4 @@ >> -# From https://lists.nongnu.org/archive/html/lzip-bug/2021-01/msg00008.html >> -sha256 c3342d42e67139c165b8b128d033b5c96893a13ac5f25933190315214e87a948 lzip-1.22.tar.gz >> +# From https://lists.nongnu.org/archive/html/lzip-bug/2022-02/msg00000.html >> +sha256 ea02b9e6fb25d0e1a1d3ef4fdeb6ab26b931f1ece66fa1cee2983c95215e930a lzip-1.23.tar.lz >> # Locally calculated >> sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef COPYING >> diff --git a/package/lzip/lzip.mk b/package/lzip/lzip.mk >> index cca6da07d0..e3cc86b956 100644 >> --- a/package/lzip/lzip.mk >> +++ b/package/lzip/lzip.mk >> @@ -4,7 +4,8 @@ >> # >> ################################################################################ >> >> -LZIP_VERSION = 1.22 >> +LZIP_VERSION = 1.23 >> +LZIP_SOURCE = lzip-$(LZIP_VERSION).tar.lz > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > This seems to break the build for at least snps_archs38_hsdk_defconfig, when no > lzip is installed on the host. Kind of chicken-egg problem. > https://pastebin.com/cyt1UsuG Doh, indeed - I've pushed a change to use the .tar.gz instead. -- Bye, Peter Korsgaard From nealf at xilinx.com Fri Feb 11 13:16:14 2022 From: nealf at xilinx.com (Neal Frager) Date: Fri, 11 Feb 2022 13:16:14 +0000 Subject: [Buildroot] [PATCH v5 2/2] add configs/zynqmp_zcu102_defconfig In-Reply-To: <20220211121740.1257919-2-neal.frager@xilinx.com> References: <20220211121740.1257919-1-neal.frager@xilinx.com> <20220211121740.1257919-2-neal.frager@xilinx.com> Message-ID: Hi Luca, I have encountered yet another issue. If the pm_cfg_obj.c file is generated with Vitis 2021.2, it looks like the following: There is a new "#define PM_CONFIG_OBJECT_TYPE_BASE 0x1U" which breaks the pm_cfg_obj_convert.py. Could you generate a new version of the script that supports the Vitis 2021 file format? I have attached an example which is what Vitis generates for the zcu106 evaluation board. /****************************************************************************** * Copyright (c) 2017 - 2021 Xilinx, Inc. All rights reserved. * SPDX-License-Identifier: MIT ******************************************************************************/ #include "xil_types.h" #include "pm_defs.h" #define PM_CONFIG_MASTER_SECTION_ID 0x101U #define PM_CONFIG_SLAVE_SECTION_ID 0x102U #define PM_CONFIG_PREALLOC_SECTION_ID 0x103U #define PM_CONFIG_POWER_SECTION_ID 0x104U #define PM_CONFIG_RESET_SECTION_ID 0x105U #define PM_CONFIG_SHUTDOWN_SECTION_ID 0x106U #define PM_CONFIG_SET_CONFIG_SECTION_ID 0x107U #define PM_CONFIG_GPO_SECTION_ID 0x108U #define PM_SLAVE_FLAG_IS_SHAREABLE 0x1U #define PM_MASTER_USING_SLAVE_MASK 0x2U #define PM_CONFIG_GPO1_MIO_PIN_34_MAP (1U << 10U) #define PM_CONFIG_GPO1_MIO_PIN_35_MAP (1U << 11U) #define PM_CONFIG_GPO1_MIO_PIN_36_MAP (1U << 12U) #define PM_CONFIG_GPO1_MIO_PIN_37_MAP (1U << 13U) #define PM_CONFIG_GPO1_BIT_2_MASK (1U << 2U) #define PM_CONFIG_GPO1_BIT_3_MASK (1U << 3U) #define PM_CONFIG_GPO1_BIT_4_MASK (1U << 4U) #define PM_CONFIG_GPO1_BIT_5_MASK (1U << 5U) #define SUSPEND_TIMEOUT 0xFFFFFFFFU #define PM_CONFIG_OBJECT_TYPE_BASE 0x1U #define PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK 0x00000001 #define PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK 0x00000100 #define PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK 0x00000200 #if defined (__ICCARM__) #pragma language=save #pragma language=extended #endif #if defined (__GNUC__) const u32 XPm_ConfigObject[] __attribute__((used, section(".sys_cfg_data"))) = #elif defined (__ICCARM__) #pragma location = ".sys_cfg_data" __root const u32 XPm_ConfigObject[] = #endif { Best regards, Neal Frager Xilinx -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: pm_cfg_obj.c URL: From nealf at xilinx.com Fri Feb 11 13:20:30 2022 From: nealf at xilinx.com (Neal Frager) Date: Fri, 11 Feb 2022 13:20:30 +0000 Subject: [Buildroot] [PATCH v5 2/2] add configs/zynqmp_zcu102_defconfig In-Reply-To: References: <20220211121740.1257919-1-neal.frager@xilinx.com> <20220211121740.1257919-2-neal.frager@xilinx.com> Message-ID: Hi Giulio, Luca, As PM_CONFIG_OBJECT_TYPE_BASE is used only a single time in the pm_cfg_obj.c, I am going to solve this by removing the define and replacing it with the value 0x1U. In the meantime, it would be great if Luca could update the script in mainline to handle new Vitis generated pm_cfg_obj.c files. Best regards, Neal Frager Xilinx From ps.report at gmx.net Fri Feb 11 13:37:42 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 11 Feb 2022 14:37:42 +0100 Subject: [Buildroot] [PATCH] package/libcamera bump to 1966b9a58436fab51f8270aad6a228b935e4fac4 In-Reply-To: <20220211112245.1357817-1-kieran.bingham@ideasonboard.com> References: <20220211112245.1357817-1-kieran.bingham@ideasonboard.com> Message-ID: <20220211143742.1fdec542@gmx.net> Hello Kieran, one nitpick: the patch subject should be 'package/libcamera: bump to ...' (instead of 'package/libcamera bump to ...').... On Fri, 11 Feb 2022 11:22:45 +0000, Kieran Bingham wrote: > Update to the latest libcamera commit. > > This incorporates fixes and improvements for Raspberry Pi which will be > needed to go along side the new libcamera-apps package. > > Signed-off-by: Kieran Bingham Reviewed-by: Peter Seiderer Tested-by: Peter Seiderer Regards, Peter > --- > package/libcamera/libcamera.hash | 2 +- > package/libcamera/libcamera.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/libcamera/libcamera.hash b/package/libcamera/libcamera.hash > index a7ca27a96b7f..8d5abf0e621c 100644 > --- a/package/libcamera/libcamera.hash > +++ b/package/libcamera/libcamera.hash > @@ -1,4 +1,4 @@ > -sha256 305e6f458d2bf3d4b697ffe33e104b696db6b1492bb5422e2cce1937e58516f1 libcamera-40f5fddca7f774944a53f58eeaebc4db79c373d8-br1.tar.gz > +sha256 3624c71ba492c602c5335aab3dc87798193f7596c6cc75f7cfb847165f180930 libcamera-1966b9a58436fab51f8270aad6a228b935e4fac4-br1.tar.gz > > # license files > sha256 fd38b2c053c0cce46d9c5ef3545a6e34d157a240ba99c9b8dca5d37a8147da6c LICENSES/BSD-2-Clause.txt > diff --git a/package/libcamera/libcamera.mk b/package/libcamera/libcamera.mk > index 534d8d26371f..cf1af5aaf065 100644 > --- a/package/libcamera/libcamera.mk > +++ b/package/libcamera/libcamera.mk > @@ -5,7 +5,7 @@ > ################################################################################ > > LIBCAMERA_SITE = https://git.linuxtv.org/libcamera.git > -LIBCAMERA_VERSION = 40f5fddca7f774944a53f58eeaebc4db79c373d8 > +LIBCAMERA_VERSION = 1966b9a58436fab51f8270aad6a228b935e4fac4 > LIBCAMERA_SITE_METHOD = git > LIBCAMERA_DEPENDENCIES = \ > host-openssl \ From ps.report at gmx.net Fri Feb 11 13:49:06 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 11 Feb 2022 14:49:06 +0100 Subject: [Buildroot] [PATCH v1] package/libv4l: v4l-utils needs C++11 support Message-ID: <20220211134906.18280-1-ps.report@gmx.net> Fixes: - http://autobuild.buildroot.net/results/cacd73e08cfb359d608bca807189b7bd3c5c79bd v4l2-ctl.cpp:53:2: warning: identifier 'nullptr' is a keyword in C++11 [-Wc++0x-compat] v4l2-ctl.cpp:53:37: error: 'nullptr' was not declared in this scope [...] v4l2-ctl-tuner.cpp: In function 'void parse_freq_seek(char*, v4l2_hw_freq_seek&)': v4l2-ctl-tuner.cpp:160:10: error: 'constexpr' does not name a type static constexpr const char *subopts[] = { ^ v4l2-ctl-tuner.cpp:160:10: note: C++11 'constexpr' only available with -std=c++11 or -std=gnu++11 Signed-off-by: Peter Seiderer --- package/libv4l/Config.in | 4 ++++ package/libv4l/libv4l.mk | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/package/libv4l/Config.in b/package/libv4l/Config.in index 57ddde1dfb..c88f280c3b 100644 --- a/package/libv4l/Config.in +++ b/package/libv4l/Config.in @@ -20,6 +20,7 @@ comment "libv4l JPEG support not enabled" config BR2_PACKAGE_LIBV4L_UTILS bool "v4l-utils tools" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 help v4l-utils is a collection of various video4linux and DVB utilities. @@ -35,6 +36,9 @@ config BR2_PACKAGE_LIBV4L_UTILS - rds-ctl - qv4l2 (if Qt is enabled) +comment "v4l-utils tools needs a toolchain w/ C++11" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + endif comment "libv4l needs a toolchain w/ threads, C++ and headers >= 3.0" diff --git a/package/libv4l/libv4l.mk b/package/libv4l/libv4l.mk index 4dc0f15f94..ee5a1f2241 100644 --- a/package/libv4l/libv4l.mk +++ b/package/libv4l/libv4l.mk @@ -59,6 +59,10 @@ ifeq ($(BR2_PACKAGE_LIBV4L_UTILS),y) LIBV4L_CONF_OPTS += --enable-v4l-utils LIBV4L_DEPENDENCIES += $(TARGET_NLS_DEPENDENCIES) +# v4l2-ctl needs c++11, qt5 needs c++11 (since qt-5.7)/use gnu++11 for +# typeof support +LIBV4L_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=gnu++11" + # IR BPF decoder support needs toolchain with linux-headers >= 3.18 # libelf and clang support LIBV4L_CONF_OPTS += --disable-bpf @@ -71,8 +75,6 @@ LIBV4L_CONF_ENV += \ ac_cv_prog_MOC=$(HOST_DIR)/bin/moc \ ac_cv_prog_RCC=$(HOST_DIR)/bin/rcc \ ac_cv_prog_UIC=$(HOST_DIR)/bin/uic -# qt5 needs c++11 (since qt-5.7)/use gnu++11 for typeof support -LIBV4L_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=gnu++11" else LIBV4L_CONF_OPTS += --disable-qv4l2 endif -- 2.34.1 From kieran.bingham at ideasonboard.com Fri Feb 11 13:50:00 2022 From: kieran.bingham at ideasonboard.com (Kieran Bingham) Date: Fri, 11 Feb 2022 13:50:00 +0000 Subject: [Buildroot] [PATCH] package/libcamera bump to 1966b9a58436fab51f8270aad6a228b935e4fac4 In-Reply-To: <20220211143742.1fdec542@gmx.net> References: <20220211112245.1357817-1-kieran.bingham@ideasonboard.com> <20220211143742.1fdec542@gmx.net> Message-ID: <164458740032.83878.10164451267230898478@Monstersaurus> Hi Peter, Quoting Peter Seiderer (2022-02-11 13:37:42) > Hello Kieran, > > one nitpick: the patch subject should be 'package/libcamera: bump to ...' > (instead of 'package/libcamera bump to ...').... Completely agreed, I think I'd call that a typo ... or a not-typoed ;-) If it can be fixed while applying that's fine, otherwise I'll resend. > On Fri, 11 Feb 2022 11:22:45 +0000, Kieran Bingham wrote: > > > Update to the latest libcamera commit. > > > > This incorporates fixes and improvements for Raspberry Pi which will be > > needed to go along side the new libcamera-apps package. > > > > Signed-off-by: Kieran Bingham > > Reviewed-by: Peter Seiderer > Tested-by: Peter Seiderer > Thanks Kieran > Regards, > Peter > > > --- > > package/libcamera/libcamera.hash | 2 +- > > package/libcamera/libcamera.mk | 2 +- > > 2 files changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/package/libcamera/libcamera.hash b/package/libcamera/libcamera.hash > > index a7ca27a96b7f..8d5abf0e621c 100644 > > --- a/package/libcamera/libcamera.hash > > +++ b/package/libcamera/libcamera.hash > > @@ -1,4 +1,4 @@ > > -sha256 305e6f458d2bf3d4b697ffe33e104b696db6b1492bb5422e2cce1937e58516f1 libcamera-40f5fddca7f774944a53f58eeaebc4db79c373d8-br1.tar.gz > > +sha256 3624c71ba492c602c5335aab3dc87798193f7596c6cc75f7cfb847165f180930 libcamera-1966b9a58436fab51f8270aad6a228b935e4fac4-br1.tar.gz > > > > # license files > > sha256 fd38b2c053c0cce46d9c5ef3545a6e34d157a240ba99c9b8dca5d37a8147da6c LICENSES/BSD-2-Clause.txt > > diff --git a/package/libcamera/libcamera.mk b/package/libcamera/libcamera.mk > > index 534d8d26371f..cf1af5aaf065 100644 > > --- a/package/libcamera/libcamera.mk > > +++ b/package/libcamera/libcamera.mk > > @@ -5,7 +5,7 @@ > > ################################################################################ > > > > LIBCAMERA_SITE = https://git.linuxtv.org/libcamera.git > > -LIBCAMERA_VERSION = 40f5fddca7f774944a53f58eeaebc4db79c373d8 > > +LIBCAMERA_VERSION = 1966b9a58436fab51f8270aad6a228b935e4fac4 > > LIBCAMERA_SITE_METHOD = git > > LIBCAMERA_DEPENDENCIES = \ > > host-openssl \ > From eugen.hristev at microchip.com Fri Feb 11 14:08:55 2022 From: eugen.hristev at microchip.com (Eugen Hristev) Date: Fri, 11 Feb 2022 16:08:55 +0200 Subject: [Buildroot] [PATCH] configs/microchip_sama7g5ek_mmc_dev_defconfig: add rng tools Message-ID: <20220211140855.917229-1-eugen.hristev@microchip.com> Add rng tools. Without this, when booting, prompt will not appear until 'random: crng init done' appears. Avoid this by using rng tools without the libjitterentropy. Libjitterentropy is a jitter source of entropy which does not help for AT91 cpus as the jitter does not have enough variance to generate fast enough entropy. Signed-off-by: Eugen Hristev --- Hi, This should go for 2022.02 in my opinion. Thanks, configs/microchip_sama7g5ek_mmc_dev_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/microchip_sama7g5ek_mmc_dev_defconfig b/configs/microchip_sama7g5ek_mmc_dev_defconfig index 3253bce401..895e63edcd 100644 --- a/configs/microchip_sama7g5ek_mmc_dev_defconfig +++ b/configs/microchip_sama7g5ek_mmc_dev_defconfig @@ -27,6 +27,8 @@ BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y BR2_PACKAGE_EVTEST=y +BR2_PACKAGE_RNG_TOOLS=y +# BR2_PACKAGE_RNG_TOOLS_JITTERENTROPY_LIBRARY is not set BR2_PACKAGE_SETSERIAL=y BR2_PACKAGE_SPI_TOOLS=y BR2_PACKAGE_USBUTILS=y -- 2.33.0 From giulio.benetti at benettiengineering.com Fri Feb 11 14:31:53 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 11 Feb 2022 15:31:53 +0100 Subject: [Buildroot] [PATCH] configs/microchip_sama7g5ek_mmc_dev_defconfig: add rng tools In-Reply-To: <20220211140855.917229-1-eugen.hristev@microchip.com> References: <20220211140855.917229-1-eugen.hristev@microchip.com> Message-ID: Hi Engin, All, sorry for html but I?m on mobile, > Il giorno 11 feb 2022, alle ore 15:09, Eugen Hristev via buildroot ha scritto: > > ?Add rng tools. Without this, when booting, prompt will not > appear until 'random: crng init done' appears. > Avoid this by using rng tools without the libjitterentropy. > Libjitterentropy is a jitter source of entropy which does > not help for AT91 cpus as the jitter does not have > enough variance to generate fast enough entropy. > > Signed-off-by: Eugen Hristev > --- > Hi, > > This should go for 2022.02 in my opinion. > > Thanks, Here you should add other 3 dashes more. Thank you for providing such fix. Unfortunately I didn?t have the hardware to test and fix it. Reviewed-by: Giulio Benetti Best regards ?- Giulio Benetti Benetti Engineering sas > > configs/microchip_sama7g5ek_mmc_dev_defconfig | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/configs/microchip_sama7g5ek_mmc_dev_defconfig b/configs/microchip_sama7g5ek_mmc_dev_defconfig > index 3253bce401..895e63edcd 100644 > --- a/configs/microchip_sama7g5ek_mmc_dev_defconfig > +++ b/configs/microchip_sama7g5ek_mmc_dev_defconfig > @@ -27,6 +27,8 @@ BR2_PACKAGE_MMC_UTILS=y > BR2_PACKAGE_MTD=y > BR2_PACKAGE_WILC1000_FIRMWARE=y > BR2_PACKAGE_EVTEST=y > +BR2_PACKAGE_RNG_TOOLS=y > +# BR2_PACKAGE_RNG_TOOLS_JITTERENTROPY_LIBRARY is not set > BR2_PACKAGE_SETSERIAL=y > BR2_PACKAGE_SPI_TOOLS=y > BR2_PACKAGE_USBUTILS=y > -- > 2.33.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From neal.frager at xilinx.com Fri Feb 11 14:44:02 2022 From: neal.frager at xilinx.com (Neal Frager) Date: Fri, 11 Feb 2022 07:44:02 -0700 Subject: [Buildroot] [PATCH v6 2/2] add configs/zynqmp_zcu102_defconfig In-Reply-To: <20220211144402.1626443-1-neal.frager@xilinx.com> References: <20220211144402.1626443-1-neal.frager@xilinx.com> Message-ID: <20220211144402.1626443-2-neal.frager@xilinx.com> This patch: - adds support for Xilinx ZCU102 evaluation board - ZCU102 features can be found here: https://www.xilinx.com/products/boards-and-kits/zcu102.html Signed-off-by: Neal Frager Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti [Giulio: only build tested] --- V1->V2: * fixed general build issues * added extlinux.conf for run-time boot issue V2->V3: * enabled support for host machines without OpenSSL required by U-Boot and Linux * moved readme.txt update to zynqmp_zcu102_defconfig patch 2/2 V3->V4: * cleaned up commit log messages * added version history V4->V5: * switched to sha1 urls to make ATF, U-Boot and Linux builds reproducible * generated board specific pm_cfg_obj.c files with vitis 2021.2 V5->V6: * fixed build issue with pm_cfg_obj.c files --- --- board/zynqmp/readme.txt | 23 +- board/zynqmp/zcu102/pm_cfg_obj.c | 563 +++++++++++++++++++++++++++++++ configs/zynqmp_zcu102_defconfig | 39 +++ 3 files changed, 618 insertions(+), 7 deletions(-) create mode 100644 board/zynqmp/zcu102/pm_cfg_obj.c create mode 100644 configs/zynqmp_zcu102_defconfig diff --git a/board/zynqmp/readme.txt b/board/zynqmp/readme.txt index da37f4ccc9..0dc1793e03 100644 --- a/board/zynqmp/readme.txt +++ b/board/zynqmp/readme.txt @@ -1,10 +1,19 @@ -******************************** -Xilinx ZCU106 board - ZynqMP SoC -******************************** +****************************************** +Xilinx ZCU102 / ZCU106 boards - ZynqMP SoC +****************************************** + +This document describes the Buildroot support for the ZCU102 and ZCU106 +boards by Xilinx, based on the Zynq UltraScale+ MPSoC (aka ZynqMP). +It has been tested with the ZCU102 and ZCU106 production boards. + +Evaluation board features can be found here with the links below. + +ZCU102: +https://www.xilinx.com/products/boards-and-kits/zcu102.html + +ZCU106: +https://www.xilinx.com/products/boards-and-kits/zcu106.html -This document describes the Buildroot support for the ZCU106 board by -Xilinx, based on the Zynq UltraScale+ MPSoC (aka ZynqMP). It has been -tested with the EK-U1-ZCU106-ES2 pre-production board. How to build it =============== @@ -32,7 +41,7 @@ After building, you should get a tree like this: +-- rootfs.ext4 -> rootfs.ext2 +-- sdcard.img +-- system.dtb -> zynqmp-zcu106-revA.dtb - +-- u-boot.bin + +-- u-boot.itb `-- zynqmp-zcu106-revA.dtb How to write the SD card diff --git a/board/zynqmp/zcu102/pm_cfg_obj.c b/board/zynqmp/zcu102/pm_cfg_obj.c new file mode 100644 index 0000000000..68557c4cb4 --- /dev/null +++ b/board/zynqmp/zcu102/pm_cfg_obj.c @@ -0,0 +1,563 @@ +/****************************************************************************** +* Copyright (c) 2017 - 2021 Xilinx, Inc. All rights reserved. +* SPDX-License-Identifier: MIT +******************************************************************************/ + +#include "xil_types.h" +#include "pm_defs.h" + +#define PM_CONFIG_MASTER_SECTION_ID 0x101U +#define PM_CONFIG_SLAVE_SECTION_ID 0x102U +#define PM_CONFIG_PREALLOC_SECTION_ID 0x103U +#define PM_CONFIG_POWER_SECTION_ID 0x104U +#define PM_CONFIG_RESET_SECTION_ID 0x105U +#define PM_CONFIG_SHUTDOWN_SECTION_ID 0x106U +#define PM_CONFIG_SET_CONFIG_SECTION_ID 0x107U +#define PM_CONFIG_GPO_SECTION_ID 0x108U + +#define PM_SLAVE_FLAG_IS_SHAREABLE 0x1U +#define PM_MASTER_USING_SLAVE_MASK 0x2U + +#define PM_CONFIG_GPO1_MIO_PIN_34_MAP (1U << 10U) +#define PM_CONFIG_GPO1_MIO_PIN_35_MAP (1U << 11U) +#define PM_CONFIG_GPO1_MIO_PIN_36_MAP (1U << 12U) +#define PM_CONFIG_GPO1_MIO_PIN_37_MAP (1U << 13U) + +#define PM_CONFIG_GPO1_BIT_2_MASK (1U << 2U) +#define PM_CONFIG_GPO1_BIT_3_MASK (1U << 3U) +#define PM_CONFIG_GPO1_BIT_4_MASK (1U << 4U) +#define PM_CONFIG_GPO1_BIT_5_MASK (1U << 5U) + +#define SUSPEND_TIMEOUT 0xFFFFFFFFU + +#define PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK 0x00000001 +#define PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK 0x00000100 +#define PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK 0x00000200 + + + +#if defined (__ICCARM__) +#pragma language=save +#pragma language=extended +#endif +#if defined (__GNUC__) + const u32 XPm_ConfigObject[] __attribute__((used, section(".sys_cfg_data"))) = +#elif defined (__ICCARM__) +#pragma location = ".sys_cfg_data" +__root const u32 XPm_ConfigObject[] = +#endif +{ + /**********************************************************************/ + /* HEADER */ + 2, /* Number of remaining words in the header */ + 8, /* Number of sections included in config object */ + 1U, /* Type of config object as base */ + /**********************************************************************/ + /* MASTER SECTION */ + PM_CONFIG_MASTER_SECTION_ID, /* Master SectionID */ + 3U, /* No. of Masters*/ + + NODE_APU, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_0, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_1, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Wake permissions */ + + + /**********************************************************************/ + /* SLAVE SECTION */ + + + PM_CONFIG_SLAVE_SECTION_ID, /* Section ID */ + 49, /* Number of slaves */ + + NODE_OCM_BANK_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TCM_0_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_0_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_1_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TCM_1_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_L2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU_PP_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU_PP_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_USB_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_USB_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_TTC_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SATA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_ETH_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_UART_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_UART_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SPI_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_SPI_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_I2C_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_I2C_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SD_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_SD_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_DP, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GDMA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_ADMA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_NAND, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_QSPI, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPIO, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_CAN_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_CAN_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_EXTERN, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_DDR, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_IPI_APU, + 0U, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_0, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_1, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_PCIE, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_PCAP, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_RTC, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_VCU, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_PL, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + + /**********************************************************************/ + /* PREALLOC SECTION */ + + PM_CONFIG_PREALLOC_SECTION_ID, /* Preallaoc SectionID */ + 3U, /* No. of Masters*/ + +/* Prealloc for psu_cortexa53_0 */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, + 12, + NODE_DDR, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_L2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_3, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_SD_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_QSPI, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_PL, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_APU, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_0 */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + 3, + NODE_TCM_0_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_0_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_1 */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + 3, + NODE_TCM_1_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_1_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + + /**********************************************************************/ + /* POWER SECTION */ + + PM_CONFIG_POWER_SECTION_ID, /* Power Section ID */ + 4U, /* Number of power nodes */ + + NODE_APU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_RPU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_FPD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_PLD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + + /**********************************************************************/ + /* RESET SECTION */ + + PM_CONFIG_RESET_SECTION_ID, /* Reset Section ID */ + 120U, /* Number of resets */ + + XILPM_RESET_PCIE_CFG, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_BRIDGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_CTRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRF, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GDMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SATA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APU_L2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DDR, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SOFT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_QSPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_NAND, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ADMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOU_CC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TIMESTAMP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R50, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R51, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_AMBA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_OCM, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_PGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RTC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SYSMON, 0, + XILPM_RESET_AFI_FM6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_LPD_SWDT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_FPD, PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + XILPM_RESET_RPU_DBG1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_DBG0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_VPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_7, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_8, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_9, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_10, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_11, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_12, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_13, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_14, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_15, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_16, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_17, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_18, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_19, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_20, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_21, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_22, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_23, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_24, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_25, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_26, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_27, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_28, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_29, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_30, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_31, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_LS, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PS_ONLY, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_92, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_93, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_94, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_95, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + + /**********************************************************************/ + /* SET CONFIG SECTION */ + PM_CONFIG_SET_CONFIG_SECTION_ID, /* Set Config Section ID */ + 0U, /* Permissions to load base config object */ + 0U, /* Permissions to load overlay config object */ + + /**********************************************************************/ + /* SHUTDOWN SECTION */ + + PM_CONFIG_SHUTDOWN_SECTION_ID, /* Shutdown Section ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* System Shutdown/Restart Permission */ + + /**********************************************************************/ + /* GPO SECTION */ + PM_CONFIG_GPO_SECTION_ID, /* GPO Section ID */ + PM_CONFIG_GPO1_BIT_2_MASK | + PM_CONFIG_GPO1_MIO_PIN_34_MAP | + PM_CONFIG_GPO1_MIO_PIN_35_MAP | + PM_CONFIG_GPO1_MIO_PIN_36_MAP | + PM_CONFIG_GPO1_MIO_PIN_37_MAP | + 0, /* State of GPO pins */ +}; +#if defined (__ICCARM__) +#pragma language=restore +#endif + diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig new file mode 100644 index 0000000000..6e9e50ca77 --- /dev/null +++ b/configs/zynqmp_zcu102_defconfig @@ -0,0 +1,39 @@ +BR2_aarch64=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="966124532656bc95d781abf57531e4cd4f962237" +BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="e678d5ddc475f34dea8f5004fb6ebde118621784" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/Xilinx/u-boot-xlnx.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="667001319cbe511ce6353195fb4910ae5cb041ce" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" +BR2_TARGET_UBOOT_ZYNQMP=y +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/v2021.2/bin/pmufw-v2021.2.bin" +BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/zcu102/pm_cfg_obj.c" +BR2_TARGET_UBOOT_FORMAT_ITB=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y -- 2.17.1 From neal.frager at xilinx.com Fri Feb 11 14:44:01 2022 From: neal.frager at xilinx.com (Neal Frager) Date: Fri, 11 Feb 2022 07:44:01 -0700 Subject: [Buildroot] [PATCH v6 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 Message-ID: <20220211144402.1626443-1-neal.frager@xilinx.com> This patch: - bumps ATF to Xilinx v2.6: mainline v2.6 requires patch to build - bumps U-Boot to Xilinx 2022.01: important drivers not in mainline - bumps Linux to Xilinx 5.15: important drivers not in mainline - deletes board/zynqmp/patches directory: patches already in mainline - modifies board/zynqmp/genimage.cfg: U-Boot 2022.01 uses u-boot.itb format - adds extlinux.conf to vfat bootfs - modifies U-Boot to unified xilinx_zynqmp_virt_defconfig (supports all boards) - adds support for SPL pm_cfg_obj.c loading to PMU firmware - enables support for host machines without OpenSSL required by U-Boot and Linux Signed-off-by: Neal Frager Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti [Giulio: only build tested] --- V1->V2: * fixed general build issues * added extlinux.conf for run-time boot issue V2->V3: * enabled support for host machines without OpenSSL required by U-Boot and Linux * moved readme.txt update to zynqmp_zcu102_defconfig patch 2/2 V3->V4: * cleaned up commit log messages * added version history V4->V5: * switched to sha1 urls to make ATF, U-Boot and Linux builds reproducible * generated board specific pm_cfg_obj.c files with vitis 2021.2 V5->V6: * fixed build issue with pm_cfg_obj.c files --- --- board/zynqmp/extlinux.conf | 5 + board/zynqmp/genimage.cfg | 6 +- ...-fix-Remove-GGC-ignore-Warray-bounds.patch | 68 --- ...64-zynqmp-zcu106-fix-SPL-MMC-booting.patch | 52 -- ...2-arm64-zynqmp-Enable-booting-to-ATF.patch | 114 ---- ...ept-an-absolute-path-for-PMUFW_INIT_.patch | 68 --- ...ynqmp-pass-the-PS-init-file-as-a-kco.patch | 175 ------ board/zynqmp/post-build.sh | 8 + board/zynqmp/post-image.sh | 4 +- board/zynqmp/zcu106/pm_cfg_obj.c | 562 ++++++++++++++++++ configs/zynqmp_zcu106_defconfig | 23 +- 11 files changed, 596 insertions(+), 489 deletions(-) create mode 100644 board/zynqmp/extlinux.conf delete mode 100644 board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch delete mode 100644 board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch delete mode 100644 board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch delete mode 100644 board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch delete mode 100644 board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch create mode 100755 board/zynqmp/post-build.sh create mode 100644 board/zynqmp/zcu106/pm_cfg_obj.c diff --git a/board/zynqmp/extlinux.conf b/board/zynqmp/extlinux.conf new file mode 100644 index 0000000000..ae3ec8614a --- /dev/null +++ b/board/zynqmp/extlinux.conf @@ -0,0 +1,5 @@ +label linux + kernel /Image + devicetree /system.dtb + append console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait + diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg index ed202f4550..20d8352c08 100644 --- a/board/zynqmp/genimage.cfg +++ b/board/zynqmp/genimage.cfg @@ -2,11 +2,13 @@ image boot.vfat { vfat { files = { "boot.bin", - "u-boot.bin", - "atf-uboot.ub", + "u-boot.itb", "system.dtb", "Image" } + file extlinux/extlinux.conf { + image = extlinux.conf + } } size = 32M diff --git a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch b/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch deleted file mode 100644 index 0c1a9ba2a4..0000000000 --- a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch +++ /dev/null @@ -1,68 +0,0 @@ -From da003e6ada7d0217fe99dc7c649a731f8ebd3c34 Mon Sep 17 00:00:00 2001 -From: Deepika Bhavnani -Date: Thu, 15 Aug 2019 00:56:46 +0300 -Subject: [PATCH] Coverity fix: Remove GGC ignore -Warray-bounds - -GCC diagnostics were added to ignore array boundaries, instead -of ignoring GCC warning current code will check for array boundaries -and perform and array update only for valid elements. - -Resolves: `CID 246574` `CID 246710` `CID 246651` - -Signed-off-by: Deepika Bhavnani -Change-Id: I7530ecf7a1707351c6ee87e90cc3d33574088f57 - -Backported from: 41af05154abe136938bcfb5f26c969933784bbef -[Adapted to apply on 1.5] - ---- - lib/psci/psci_common.c | 20 ++++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) - -diff --git a/lib/psci/psci_common.c b/lib/psci/psci_common.c -index 2220a745cd6e..6282d992a2f0 100644 ---- a/lib/psci/psci_common.c -+++ b/lib/psci/psci_common.c -@@ -188,21 +188,17 @@ static unsigned int get_power_on_target_pwrlvl(void) - /****************************************************************************** - * Helper function to update the requested local power state array. This array - * does not store the requested state for the CPU power level. Hence an -- * assertion is added to prevent us from accessing the wrong index. -+ * assertion is added to prevent us from accessing the CPU power level. - *****************************************************************************/ - static void psci_set_req_local_pwr_state(unsigned int pwrlvl, - unsigned int cpu_idx, - plat_local_state_t req_pwr_state) - { -- /* -- * This should never happen, we have this here to avoid -- * "array subscript is above array bounds" errors in GCC. -- */ - assert(pwrlvl > PSCI_CPU_PWR_LVL); --#pragma GCC diagnostic push --#pragma GCC diagnostic ignored "-Warray-bounds" -- psci_req_local_pwr_states[pwrlvl - 1][cpu_idx] = req_pwr_state; --#pragma GCC diagnostic pop -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && -+ (cpu_idx < PLATFORM_CORE_COUNT)) { -+ psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx] = req_pwr_state; -+ } - } - - /****************************************************************************** -@@ -228,7 +224,11 @@ static plat_local_state_t *psci_get_req_local_pwr_states(unsigned int pwrlvl, - { - assert(pwrlvl > PSCI_CPU_PWR_LVL); - -- return &psci_req_local_pwr_states[pwrlvl - 1][cpu_idx]; -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && -+ (cpu_idx < PLATFORM_CORE_COUNT)) { -+ return &psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx]; -+ } else -+ return NULL; - } - - /* --- -2.34.0 - diff --git a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch b/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch deleted file mode 100644 index 4d85e1bb12..0000000000 --- a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch +++ /dev/null @@ -1,52 +0,0 @@ -From e5d72ed8339eb05285448aad3c89d21e4d18fd29 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Mon, 26 Feb 2018 09:40:34 +0100 -Subject: [PATCH] arm64: zynqmp: zcu106: fix SPL MMC booting - -The U-Boot SPL generated with the current zcu106 defconfig cannot boot -from MMC: - - [...] - U-Boot SPL 2018.01 (Feb 21 2018 - 17:47:14) - EL Level: EL3 - Trying to boot from MMC1 - sdhci_transfer_data: Error detected in status(0x408020)! - spl_load_image_fat_os: error reading image u-boot.bin, err - -2 - spl_load_image_fat: error reading image u-boot.img, err - -6 - SPL: failed to boot from all boot devices - ### ERROR ### Please RESET the board ### - -Fix by lowering the rpll value. The new value for the RPLL_CTRL -register comes from the current psu_init_gpl.c from the HDF file at -https://github.com/xilinx/hdf-examples/tree/01ad8ea5fd1989abf4ea5a072d019a16cb2bc546/zcu106-zynqmp -(generated by Vivado v2017.4). - -RPLL and sdio1_ref clocks before and after this change: - - - Old values: RPLL 1.36 GHz, sdio1_ref 272 MHz - - New values: RPLL 1.16 GHz, sdio1_ref 233 MHz - -Signed-off-by: Luca Ceresoli -Cc: Michal Simek -Upstream-status: accepted upstream in a different form ---- - - board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -index 4d18abe000ca..e6fa477e53e7 100644 ---- a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -+++ b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -@@ -10,7 +10,7 @@ - static unsigned long psu_pll_init_data(void) - { - psu_mask_write(0xFF5E0034, 0xFE7FEDEFU, 0x7E4E2C62U); -- psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00013C00U); -+ psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00014600U); - psu_mask_write(0xFF5E0030, 0x00000008U, 0x00000008U); - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000001U); - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000000U); --- -2.7.4 - diff --git a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch b/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch deleted file mode 100644 index 487fff6812..0000000000 --- a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 5e3cac50cc981e01d9072241035a8d4162560c71 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Mon, 12 Mar 2018 17:18:38 +0100 -Subject: [PATCH] arm64: zynqmp: Enable booting to ATF - -U-Boot is now able to boot to ARM Trusted Firmware (ATF). The boot -flow is SPL(EL3) loads ATF and full u-boot and jump to ATF(EL3) which -pass control to full u-boot(EL2). This has been tested on zcu106, so -enable it in this defconfig. - -To generate an image that triggers this booting flow, you need to pass -'-O arm-trusted-firmware' to mkimage. - -Signed-off-by: Luca Ceresoli -Signed-off-by: Michal Simek -Backported from upstream: http://git.denx.de/?p=u-boot.git;a=commit;h=5e3cac50cc981e01d9072241035a8d4162560c71 ---- - - configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 + - configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 + - configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 + - configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 + - configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 1 + - configs/xilinx_zynqmp_zcu102_revA_defconfig | 1 + - configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 + - 7 files changed, 7 insertions(+) - -diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig -index c5bfa2b12638..488c72258b0e 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig -index f86dce403a42..5d501eec0edd 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig -@@ -20,6 +20,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig -index 6e947cf56827..6f7eaebd7676 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig -@@ -16,6 +16,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_CMD_MEMTEST=y - CONFIG_SYS_ALT_MEMTEST=y -diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig -index 1c934858c61c..7a3806cba4b5 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig -@@ -17,6 +17,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_CMD_MEMTEST=y - CONFIG_SYS_ALT_MEMTEST=y -diff --git a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig -index e13c7c56f310..e4408f182ca0 100644 ---- a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig -+++ b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig b/configs/xilinx_zynqmp_zcu102_revA_defconfig -index 5b2cd495ee85..b52f6789fd4b 100644 ---- a/configs/xilinx_zynqmp_zcu102_revA_defconfig -+++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig -index e6530fbfe7ff..80592554f682 100644 ---- a/configs/xilinx_zynqmp_zcu102_revB_defconfig -+++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y --- -2.7.4 - diff --git a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch b/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch deleted file mode 100644 index 95ab7b3b75..0000000000 --- a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch +++ /dev/null @@ -1,68 +0,0 @@ -From c7df098a71e05dc81cee818747759e8060b59626 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Mon, 4 Jun 2018 12:21:01 +0200 -Subject: [PATCH] arm64: zynqmp: accept an absolute path for PMUFW_INIT_FILE - -The value of PMUFW_INIT_FILE is prefixed with "$(srctree)/", thus -forcing it to be a relative path inside the U-Boot source tree. Since -the PMUFW is a binary file generated outside of U-Boot, the PMUFW -binary must be copied inside the U-Boot source tree before the -build. - -This generates a few problems: - - * if the source tree is shared among different out-of-tree builds, - they will pollute (and potentially corrupt) each other - * the source tree cannot be read-only - * any buildsystem must add a command to copy the PMUFW binary - * putting an externally-generated binary in the source tree is ugly - as hell - -Avoid these problems by accepting an absolute path for -PMUFW_INIT_FILE. This would be as simple as removing the "$(srctree)/" -prefix, but in order to keep backward compatibility we rather use the -shell and readlink to get the absolute path even when starting from a -relative path. - -Since 'readlink -f' produces an empty string if the file does not -exist, we also add a check to ensure the file configured in -PMUFW_INIT_FILE exists. Otherwise the build would exit successfully, -but produce a boot.bin without PMUFW as if PMUFW_INIT_FILE were empty. - -Tested in the 12 possible combinations of: - - PMUFW_INIT_FILE empty, relative, absolute, non-existing - - building in-tree, in subdir, in other directory - -Signed-off-by: Luca Ceresoli -Cc: Michal Simek -Cc: Simon Glass -Cc: Emmanuel Vadot -Signed-off-by: Michal Simek -Backported from upstream: https://git.denx.de/?p=u-boot.git;a=commit;h=c7df098a71e05dc81cee818747759e8060b59626 ---- - scripts/Makefile.spl | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl -index ef018b5b4056..252f13826d4c 100644 ---- a/scripts/Makefile.spl -+++ b/scripts/Makefile.spl -@@ -167,8 +167,14 @@ ifdef CONFIG_ARCH_ZYNQ - MKIMAGEFLAGS_boot.bin = -T zynqimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) - endif - ifdef CONFIG_ARCH_ZYNQMP -+ifneq ($(CONFIG_PMUFW_INIT_FILE),"") -+spl/boot.bin: zynqmp-check-pmufw -+zynqmp-check-pmufw: FORCE -+ ( cd $(srctree) && test -r $(CONFIG_PMUFW_INIT_FILE) ) \ -+ || ( echo "Cannot read $(CONFIG_PMUFW_INIT_FILE)" && false ) -+endif - MKIMAGEFLAGS_boot.bin = -T zynqmpimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) \ -- -n $(srctree)/$(CONFIG_PMUFW_INIT_FILE) -+ -n "$(shell cd $(srctree); readlink -f $(CONFIG_PMUFW_INIT_FILE))" - endif - - spl/boot.bin: $(obj)/u-boot-spl.bin FORCE --- -2.7.4 - diff --git a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch b/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch deleted file mode 100644 index b32e162780..0000000000 --- a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch +++ /dev/null @@ -1,175 +0,0 @@ -From 4c9d54ab5a41d65000c8d249b6fb1b76056f1812 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Wed, 20 Jun 2018 12:11:50 +0200 -Subject: [PATCH] arm/arm64: zynq/zynqmp: pass the PS init file as a kconfig - variable - -U-Boot needs to link ps7_init_gpl.c on Zynq or psu_init_gpl.c on -ZynqMP (PS init for short). The current logic to locate this file for -both platforms is: - - 1. if a board-specific file exists in - board/xilinx/zynq[mp]/$(CONFIG_DEFAULT_DEVICE_TREE)/ps?_init_gpl.c - then use it - 2. otherwise use board/xilinx/zynq/ps?_init_gpl.c - -In the latter case the file does not exist in the U-Boot sources and -must be copied in the source tree from the outside before starting the -build. This is typical when it is generated from Xilinx tools while -developing a custom hardware. However making sure that a -board-specific file is _not_ found (and used) requires some trickery -such as removing or overwriting all PS init files (e.g.: the current -meta-xilinx yocto layer [0]). - -This generates a few problems: - - * if the source tree is shared among different out-of-tree builds, - they will pollute (and potentially corrupt) each other - * the source tree cannot be read-only - * any buildsystem must add a command to copy the PS init file binary - * overwriting or deleting files in the source tree is ugly as hell - -Simplify usage by allowing to pass the path to the desired PS init -file in kconfig variable XILINX_PS_INIT_FILE. It can be an absolute -path or relative to $(srctree). If the variable is set, the -user-specified file will always be used without being copied -around. If the the variable is left empty, for backward compatibility -fall back to the old behaviour. - -Since the issue is the same for Zynq and ZynqMP, add one kconfig -variable in a common place and use it for both. - -Also use the new kconfig help text to document all the ways to give -U-Boot the PS init file. - -Build-tested with all combinations of: - - platform: zynq or zynqmp - - PS init file: from XILINX_PS_INIT_FILE (absolute, relative path, - non-existing), in-tree board-specific, in board/xilinx/zynq[mp]/ - - building in-tree, in subdir, in other directory - -[0] https://github.com/Xilinx/meta-xilinx/blob/b2f74cc7fe5c4881589d5e440a17cb51fc66a7ab/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init.inc#L9 - -Signed-off-by: Luca Ceresoli -Cc: Albert Aribaud -Cc: Michal Simek -Cc: Nathan Rossi -Backported from upstream: https://git.denx.de/?p=u-boot.git;a=commit;h=6da4f67ad09cd8b311d77b2b04e557b7ef65b56c ---- - arch/arm/Kconfig | 1 + - board/xilinx/Kconfig | 41 +++++++++++++++++++++++++++++++++++++++++ - board/xilinx/zynq/Makefile | 10 +++++++++- - board/xilinx/zynqmp/Makefile | 10 +++++++++- - 4 files changed, 60 insertions(+), 2 deletions(-) - create mode 100644 board/xilinx/Kconfig - -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 22234cde2ab6..e04979d0ef7e 100644 ---- a/arch/arm/Kconfig -+++ b/arch/arm/Kconfig -@@ -1293,4 +1293,5 @@ source "board/technologic/ts4600/Kconfig" - source "board/vscom/baltos/Kconfig" - source "board/woodburn/Kconfig" - source "board/work-microwave/work_92105/Kconfig" -+source "board/xilinx/Kconfig" - source "board/zipitz2/Kconfig" - - source "arch/arm/Kconfig.debug" -diff --git a/board/xilinx/Kconfig b/board/xilinx/Kconfig -new file mode 100644 -index 000000000000..aa3fa061edef ---- /dev/null -+++ b/board/xilinx/Kconfig -@@ -0,0 +1,41 @@ -+# Copyright (c) 2018, Luca Ceresoli -+# -+# SPDX-License-Identifier: GPL-2.0 -+ -+if ARCH_ZYNQ || ARCH_ZYNQMP -+ -+config XILINX_PS_INIT_FILE -+ string "Zynq/ZynqMP PS init file(s) location" -+ help -+ On Zynq and ZynqMP U-Boot SPL (or U-Boot proper if -+ ZYNQMP_PSU_INIT_ENABLED is set) is responsible for some -+ basic initializations, such as enabling peripherals and -+ configuring pinmuxes. The PS init file (called -+ psu_init_gpl.c on ZynqMP, ps7_init_gpl.c for Zynq-7000) -+ contains the code for such initializations. -+ -+ U-Boot contains PS init files for some boards, but each of -+ them describes only one specific configuration. Users of a -+ different board, or needing a different configuration, can -+ generate custom files using the Xilinx development tools. -+ -+ There are three ways to give a PS init file to U-Boot: -+ -+ 1. Set this variable to the path, either relative to the -+ source tree or absolute, where the psu_init_gpl.c or -+ ps7_init_gpl.c file is located. U-Boot will build this -+ file. -+ -+ 2. If you leave an empty string here, U-Boot will use -+ board/xilinx/zynq/$(CONFIG_DEFAULT_DEVICE_TREE)/ps7_init_gpl.c -+ for Zynq-7000, or -+ board/xilinx/zynqmp/$(CONFIG_DEFAULT_DEVICE_TREE)/psu_init_gpl.c -+ for ZynqMP. -+ -+ 3. If the above file does not exist, U-Boot will use -+ board/xilinx/zynq/ps7_init_gpl.c for Zynq-7000, or -+ board/xilinx/zynqmp/psu_init_gpl.c for ZynqMP. This file -+ is not provided by U-Boot, you have to copy it there -+ before the build. -+ -+endif -diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile -index 5a76a26720cd..03ad5f0532ee 100644 ---- a/board/xilinx/zynq/Makefile -+++ b/board/xilinx/zynq/Makefile -@@ -5,10 +5,18 @@ - - obj-y := board.o - --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE)) -+init-objs := ps_init_gpl.o -+spl/board/xilinx/zynq/ps_init_gpl.o board/xilinx/zynq/ps_init_gpl.o: $(PS_INIT_FILE) -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ -+endif - -+ifeq ($(init-objs),) -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/ps7_init_gpl.c),\ - $(hw-platform-y)/ps7_init_gpl.o) -+endif - - ifeq ($(init-objs),) - ifneq ($(wildcard $(srctree)/$(src)/ps7_init_gpl.c),) -diff --git a/board/xilinx/zynqmp/Makefile b/board/xilinx/zynqmp/Makefile -index 05ccd25dcef3..960b81fc5853 100644 ---- a/board/xilinx/zynqmp/Makefile -+++ b/board/xilinx/zynqmp/Makefile -@@ -5,10 +5,18 @@ - - obj-y := zynqmp.o - --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE)) -+init-objs := ps_init_gpl.o -+spl/board/xilinx/zynqmp/ps_init_gpl.o board/xilinx/zynqmp/ps_init_gpl.o: $(PS_INIT_FILE) -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ -+endif - -+ifeq ($(init-objs),) -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/psu_init_gpl.c),\ - $(hw-platform-y)/psu_init_gpl.o) -+endif - - ifeq ($(init-objs),) - ifneq ($(wildcard $(srctree)/$(src)/psu_init_gpl.c),) --- -2.7.4 - diff --git a/board/zynqmp/post-build.sh b/board/zynqmp/post-build.sh new file mode 100755 index 0000000000..9fd8bbf2c8 --- /dev/null +++ b/board/zynqmp/post-build.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +# genimage will need to find the extlinux.conf +# in the binaries directory + +BOARD_DIR="$(dirname $0)" + +install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux.conf diff --git a/board/zynqmp/post-image.sh b/board/zynqmp/post-image.sh index b2b99fed01..ed6dbe188c 100755 --- a/board/zynqmp/post-image.sh +++ b/board/zynqmp/post-image.sh @@ -10,4 +10,6 @@ FIRST_DT=$(sed -nr \ [ -z "${FIRST_DT}" ] || ln -fs ${FIRST_DT}.dtb ${BINARIES_DIR}/system.dtb -support/scripts/genimage.sh -c board/zynqmp/genimage.cfg +BOARD_DIR="$(dirname $0)" + +support/scripts/genimage.sh -c $BOARD_DIR/genimage.cfg diff --git a/board/zynqmp/zcu106/pm_cfg_obj.c b/board/zynqmp/zcu106/pm_cfg_obj.c new file mode 100644 index 0000000000..6d15d510e9 --- /dev/null +++ b/board/zynqmp/zcu106/pm_cfg_obj.c @@ -0,0 +1,562 @@ +/****************************************************************************** +* Copyright (c) 2017 - 2021 Xilinx, Inc. All rights reserved. +* SPDX-License-Identifier: MIT +******************************************************************************/ + +#include "xil_types.h" +#include "pm_defs.h" + +#define PM_CONFIG_MASTER_SECTION_ID 0x101U +#define PM_CONFIG_SLAVE_SECTION_ID 0x102U +#define PM_CONFIG_PREALLOC_SECTION_ID 0x103U +#define PM_CONFIG_POWER_SECTION_ID 0x104U +#define PM_CONFIG_RESET_SECTION_ID 0x105U +#define PM_CONFIG_SHUTDOWN_SECTION_ID 0x106U +#define PM_CONFIG_SET_CONFIG_SECTION_ID 0x107U +#define PM_CONFIG_GPO_SECTION_ID 0x108U + +#define PM_SLAVE_FLAG_IS_SHAREABLE 0x1U +#define PM_MASTER_USING_SLAVE_MASK 0x2U + +#define PM_CONFIG_GPO1_MIO_PIN_34_MAP (1U << 10U) +#define PM_CONFIG_GPO1_MIO_PIN_35_MAP (1U << 11U) +#define PM_CONFIG_GPO1_MIO_PIN_36_MAP (1U << 12U) +#define PM_CONFIG_GPO1_MIO_PIN_37_MAP (1U << 13U) + +#define PM_CONFIG_GPO1_BIT_2_MASK (1U << 2U) +#define PM_CONFIG_GPO1_BIT_3_MASK (1U << 3U) +#define PM_CONFIG_GPO1_BIT_4_MASK (1U << 4U) +#define PM_CONFIG_GPO1_BIT_5_MASK (1U << 5U) + +#define SUSPEND_TIMEOUT 0xFFFFFFFFU + +#define PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK 0x00000001 +#define PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK 0x00000100 +#define PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK 0x00000200 + + + +#if defined (__ICCARM__) +#pragma language=save +#pragma language=extended +#endif +#if defined (__GNUC__) + const u32 XPm_ConfigObject[] __attribute__((used, section(".sys_cfg_data"))) = +#elif defined (__ICCARM__) +#pragma location = ".sys_cfg_data" +__root const u32 XPm_ConfigObject[] = +#endif +{ + /**********************************************************************/ + /* HEADER */ + 2, /* Number of remaining words in the header */ + 8, /* Number of sections included in config object */ + 1U, /* Type of config object as base */ + /**********************************************************************/ + /* MASTER SECTION */ + PM_CONFIG_MASTER_SECTION_ID, /* Master SectionID */ + 3U, /* No. of Masters*/ + + NODE_APU, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_0, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_1, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Wake permissions */ + + + /**********************************************************************/ + /* SLAVE SECTION */ + + + PM_CONFIG_SLAVE_SECTION_ID, /* Section ID */ + 49, /* Number of slaves */ + + NODE_OCM_BANK_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TCM_0_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_0_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_1_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TCM_1_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_L2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU_PP_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU_PP_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_USB_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_USB_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_TTC_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SATA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_ETH_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_UART_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_UART_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SPI_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_SPI_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_I2C_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_I2C_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SD_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_SD_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_DP, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GDMA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_ADMA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_NAND, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_QSPI, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPIO, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_CAN_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_CAN_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_EXTERN, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_DDR, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_IPI_APU, + 0U, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_0, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_1, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_PCIE, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_PCAP, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_RTC, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_VCU, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_PL, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + + /**********************************************************************/ + /* PREALLOC SECTION */ + + PM_CONFIG_PREALLOC_SECTION_ID, /* Preallaoc SectionID */ + 3U, /* No. of Masters*/ + +/* Prealloc for psu_cortexa53_0 */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, + 12, + NODE_DDR, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_L2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_3, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_SD_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_QSPI, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_PL, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_APU, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_0 */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + 3, + NODE_TCM_0_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_0_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_1 */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + 3, + NODE_TCM_1_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_1_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + + /**********************************************************************/ + /* POWER SECTION */ + + PM_CONFIG_POWER_SECTION_ID, /* Power Section ID */ + 4U, /* Number of power nodes */ + + NODE_APU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_RPU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_FPD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_PLD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + + /**********************************************************************/ + /* RESET SECTION */ + + PM_CONFIG_RESET_SECTION_ID, /* Reset Section ID */ + 120U, /* Number of resets */ + + XILPM_RESET_PCIE_CFG, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_BRIDGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_CTRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRF, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GDMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SATA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APU_L2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DDR, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SOFT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_QSPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_NAND, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ADMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOU_CC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TIMESTAMP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R50, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R51, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_AMBA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_OCM, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_PGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RTC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SYSMON, 0, + XILPM_RESET_AFI_FM6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_LPD_SWDT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_FPD, PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + XILPM_RESET_RPU_DBG1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_DBG0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_VPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_7, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_8, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_9, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_10, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_11, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_12, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_13, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_14, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_15, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_16, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_17, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_18, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_19, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_20, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_21, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_22, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_23, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_24, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_25, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_26, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_27, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_28, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_29, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_30, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_31, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_LS, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PS_ONLY, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_92, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_93, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_94, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_95, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + + /**********************************************************************/ + /* SET CONFIG SECTION */ + PM_CONFIG_SET_CONFIG_SECTION_ID, /* Set Config Section ID */ + 0U, /* Permissions to load base config object */ + 0U, /* Permissions to load overlay config object */ + + /**********************************************************************/ + /* SHUTDOWN SECTION */ + + PM_CONFIG_SHUTDOWN_SECTION_ID, /* Shutdown Section ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* System Shutdown/Restart Permission */ + + /**********************************************************************/ + /* GPO SECTION */ + PM_CONFIG_GPO_SECTION_ID, /* GPO Section ID */ + PM_CONFIG_GPO1_MIO_PIN_34_MAP | + PM_CONFIG_GPO1_MIO_PIN_35_MAP | + PM_CONFIG_GPO1_MIO_PIN_36_MAP | + PM_CONFIG_GPO1_MIO_PIN_37_MAP | + 0, /* State of GPO pins */ +}; +#if defined (__ICCARM__) +#pragma language=restore +#endif + diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index bee7c1daf7..4910252f78 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -1,34 +1,39 @@ BR2_aarch64=y -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="966124532656bc95d781abf57531e4cd4f962237" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="e678d5ddc475f34dea8f5004fb6ebde118621784" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA" +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="667001319cbe511ce6353195fb4910ae5cb041ce" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/53fdb7b6c92860ceb0ec5fd14deee302f4a84269/bin/pmufw-zcu106-default-v2017.4.bin" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/v2021.2/bin/pmufw-v2021.2.bin" +BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/zcu106/pm_cfg_obj.c" +BR2_TARGET_UBOOT_FORMAT_ITB=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -- 2.17.1 From Eugen.Hristev at microchip.com Fri Feb 11 14:53:36 2022 From: Eugen.Hristev at microchip.com (Eugen.Hristev at microchip.com) Date: Fri, 11 Feb 2022 14:53:36 +0000 Subject: [Buildroot] [PATCH] configs/microchip_sama7g5ek_mmc_dev_defconfig: add rng tools In-Reply-To: References: <20220211140855.917229-1-eugen.hristev@microchip.com> Message-ID: On 2/11/22 4:31 PM, Giulio Benetti wrote: > Hi Engin, All, > > sorry for html but I?m on mobile, > >> Il giorno 11 feb 2022, alle ore 15:09, Eugen Hristev via buildroot ha scritto: >> >> ?Add rng tools. Without this, when booting, prompt will not >> appear until 'random: crng init done' appears. >> Avoid this by using rng tools without the libjitterentropy. >> Libjitterentropy is a jitter source of entropy which does >> not help for AT91 cpus as the jitter does not have >> enough variance to generate fast enough entropy. >> >> Signed-off-by: Eugen Hristev >> --- >> Hi, >> >> This should go for 2022.02 in my opinion. >> >> Thanks, > > Here you should add other 3 dashes more. > > Thank you for providing such fix. Unfortunately I didn?t have the hardware to test and fix it. I tested it on the real board, on top of your pending fix for the kernel build which I also tested earlier this week. > > Reviewed-by: Giulio Benetti > > Best regards > ?- > Giulio Benetti > Benetti Engineering sas > >> >> configs/microchip_sama7g5ek_mmc_dev_defconfig | 2 ++ >> 1 file changed, 2 insertions(+) >> >> diff --git a/configs/microchip_sama7g5ek_mmc_dev_defconfig b/configs/microchip_sama7g5ek_mmc_dev_defconfig >> index 3253bce401..895e63edcd 100644 >> --- a/configs/microchip_sama7g5ek_mmc_dev_defconfig >> +++ b/configs/microchip_sama7g5ek_mmc_dev_defconfig >> @@ -27,6 +27,8 @@ BR2_PACKAGE_MMC_UTILS=y >> BR2_PACKAGE_MTD=y >> BR2_PACKAGE_WILC1000_FIRMWARE=y >> BR2_PACKAGE_EVTEST=y >> +BR2_PACKAGE_RNG_TOOLS=y >> +# BR2_PACKAGE_RNG_TOOLS_JITTERENTROPY_LIBRARY is not set >> BR2_PACKAGE_SETSERIAL=y >> BR2_PACKAGE_SPI_TOOLS=y >> BR2_PACKAGE_USBUTILS=y >> -- >> 2.33.0 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > From ps.report at gmx.net Fri Feb 11 15:06:03 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 11 Feb 2022 16:06:03 +0100 Subject: [Buildroot] [PATCH v6 0/1] package/libcamera-apps: new package Message-ID: <20220211150604.23489-1-ps.report@gmx.net> - patch on top of latest libcamera version bump ([1]) - tested with test-pkg and the following test config BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER=y BR2_PACKAGE_MESA3D_DRIVER=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y BR2_PACKAGE_MESA3D_GBM=y BR2_PACKAGE_MESA3D_OPENGL_EGL=y BR2_PACKAGE_XORG7=y BR2_PACKAGE_XLIB_LIBX11=y BR2_PACKAGE_LIBEPOXY=y BR2_PACKAGE_LIBDRM=y BR2_PACKAGE_BOOST=y BR2_PACKAGE_BOOST_PROGRAM_OPTIONS=y BR2_PACKAGE_LIBEXIF=y BR2_PACKAGE_JPEG=y BR2_PACKAGE_TIFF=y BR2_PACKAGE_LIBPNG=y BR2_PACKAGE_LIBCAMERA=y BR2_PACKAGE_LIBCAMERA_V4L2=y - runtime tested on RPi3-b-plus/Pi-Camaera-v2.1) with the followig defconfig (raspberrypi3_64_defconfig based) 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_MTOOLS=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_PACKAGE_LIBXKBCOMMON=y BR2_PACKAGE_LIBCAMERA_V4L2=y BR2_PACKAGE_LIBCAMERA_PIPELINE_RASPBERRYPI=y BR2_PACKAGE_LIBCAMERA_PIPELINE_RKISP1=y BR2_PACKAGE_LIBCAMERA_PIPELINE_SIMPLE=y BR2_PACKAGE_LIBCAMERA_PIPELINE_UVCVIDEO=y BR2_PACKAGE_LIBCAMERA_PIPELINE_VIMC=y BR2_PACKAGE_LIBCAMERA_COMPLIANCE=y BR2_PACKAGE_LIBCAMERA_APPS=y BR2_PACKAGE_DDRESCUE=y 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 and the additional /boot/config.txt entries dtoverlay=vc4-kms-v3d dtoverlay=imx219 and the followig change in the kernel config to fix imx219 camera detection ('imx219 10-0010: failed to get regulators') @@ -3485,7 +3485,7 @@ CONFIG_REGULATOR=y # CONFIG_REGULATOR_DEBUG is not set -# CONFIG_REGULATOR_FIXED_VOLTAGE is not set +CONFIG_REGULATOR_FIXED_VOLTAGE=y # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set # CONFIG_REGULATOR_USERSPACE_CONSUMER is not set # CONFIG_REGULATOR_88PG86X is not set and the following libcamera patch to disable the signature check (see [2] and [3] for details) diff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp index ad05b9c9..66d4ea48 100644 --- a/src/libcamera/ipa_manager.cpp +++ b/src/libcamera/ipa_manager.cpp @@ -302,6 +302,9 @@ std::unique_ptr IPAManager::createIPA(PipelineHandler *pipe, bool IPAManager::isSignatureValid([[maybe_unused]] IPAModule *ipa) const { +#if 1 + return true; +#else #if HAVE_IPA_PUBKEY File file{ ipa->path() }; if (!file.open(File::ReadOnly)) @@ -321,6 +324,7 @@ bool IPAManager::isSignatureValid([[maybe_unused]] IPAModule *ipa) const #else return false; #endif +#endif } } /* namespace libcamera */ [1] https://patchwork.ozlabs.org/project/buildroot/patch/20220211112245.1357817-1-kieran.bingham at ideasonboard.com/ [2] https://lists.buildroot.org/pipermail/buildroot/2020-June/284963.html [3] http://lists.busybox.net/pipermail/buildroot/2021-January/302373.html Peter Seiderer (1): package/libcamera-apps: new package DEVELOPERS | 1 + package/Config.in | 1 + ...ror-and-Wfatal-errors-compiler-comma.patch | 37 +++++++++++++++ package/libcamera-apps/Config.in | 30 ++++++++++++ package/libcamera-apps/libcamera-apps.hash | 3 ++ package/libcamera-apps/libcamera-apps.mk | 46 +++++++++++++++++++ 6 files changed, 118 insertions(+) create mode 100644 package/libcamera-apps/0001-cmake-remove-Werror-and-Wfatal-errors-compiler-comma.patch create mode 100644 package/libcamera-apps/Config.in create mode 100644 package/libcamera-apps/libcamera-apps.hash create mode 100644 package/libcamera-apps/libcamera-apps.mk -- 2.34.1 From ps.report at gmx.net Fri Feb 11 15:06:04 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 11 Feb 2022 16:06:04 +0100 Subject: [Buildroot] [PATCH v6 1/1] package/libcamera-apps: new package In-Reply-To: <20220211150604.23489-1-ps.report@gmx.net> References: <20220211150604.23489-1-ps.report@gmx.net> Message-ID: <20220211150604.23489-2-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- Changes v5 -> v6: - bump version to 2d1009e - refresh 0001-cmake-remove-Werror-and-Wfatal-errors-compiler-comma.patch update to remove -Werror and -Wfatal-errors and add failure description - libdrm, libepoxy, xlib_libX11 are now optional - disable opencv (opencv2) and tflite support - optional libdrm support - optional X11 support - optional Qt5 support Changes v4 -> v5: - rebased on master, updated version to 326fdfd Changes v3 -> v4: - bump version - remove 14 upstream applied patches Changes v2 -> v3: - bump version - add license file entry/hash - exchange patch 0002-cmake-remove-unrecognized-gcc-command-line-option.patch with 0002-cmake-add-option-ENABLE_COMPILE_FLAGS_FOR_TARGET.patch (a upstream suggested solution) and add cmake configure option accordingly Changes v1 -> v2: - fix Config.in indent (Thomas Petazzoni) - fix Config.in select ordering (Thomas Petazzoni) - fix Config.in comment regarding OpenGL - change download to use github macro (Thomas Petazzoni) - update 0001-cmake-remove-unsafe-host-include-path-for-libdrm-use.patch (add upstream link) - update 0002-cmake-remove-unrecognized-gcc-command-line-option.patch (add upstream link) - update 0003-cmake-remove-Wfatal-errors-compiler-command-line-opt.patch (new patch) - update 0004-libcamera_vid-fix-getline-call-needs-size_t.patch (add upstream link) - update 0005-libcamera_still-fix-getline-call-needs-size_t.patch (add upstream link) - update 0006-libcamera_app-fix-int64_t-constants.patch (add upstream link) - update 0007-cmake-fix-linking-with-exif-jpeg.patch (add upstream link) - update 0008-cmake-add-install-target.patch (add upstream link, update on upstream request to support older cmake versions - add DESTINATION defaults) - update 0009-cmake-no-need-to-link-against-ipa_rpi.so.patch (add upstream link) - update 0010-circular_output-fix-size_t-vs.-unsigned-int-narrowin.patch (new patch) - update 0011-egl_preview-fix-XVisualInfo-initializer.patch (new patch) - update 0012-jpeg-fix-long-unsigned-int-vs.-size_t-mismatch.patch (new patch) - update 0013-jpeg-fix-bool-vs.-boolean-mismatch.patch (new patch) - update 0014-mjpeg_encoder-fix-long-unsigned-int-vs.-size_t-misma.patch (new patch) - update 0015-mjpeg_encoder-fix-bool-vs.-boolean-mismatch.patch (new patch) --- DEVELOPERS | 1 + package/Config.in | 1 + ...ror-and-Wfatal-errors-compiler-comma.patch | 37 +++++++++++++++ package/libcamera-apps/Config.in | 30 ++++++++++++ package/libcamera-apps/libcamera-apps.hash | 3 ++ package/libcamera-apps/libcamera-apps.mk | 46 +++++++++++++++++++ 6 files changed, 118 insertions(+) create mode 100644 package/libcamera-apps/0001-cmake-remove-Werror-and-Wfatal-errors-compiler-comma.patch create mode 100644 package/libcamera-apps/Config.in create mode 100644 package/libcamera-apps/libcamera-apps.hash create mode 100644 package/libcamera-apps/libcamera-apps.mk diff --git a/DEVELOPERS b/DEVELOPERS index 0e759bc168..acf8438ab8 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2272,6 +2272,7 @@ F: package/gstreamer1/gst1-devtools/ F: package/gstreamer1/gst1-interpipe/ F: package/gstreamer1/gstreamer1-editing-services/ F: package/iwd/ +F: package/libcamera-apps/ F: package/libevdev/ F: package/libuev/ F: package/log4cplus/ diff --git a/package/Config.in b/package/Config.in index 1a9f3e29d8..0dfd2e89db 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1731,6 +1731,7 @@ menu "Multimedia" source "package/libbdplus/Config.in" source "package/libbluray/Config.in" source "package/libcamera/Config.in" + source "package/libcamera-apps/Config.in" source "package/libdcadec/Config.in" source "package/libdvbcsa/Config.in" source "package/libdvbpsi/Config.in" diff --git a/package/libcamera-apps/0001-cmake-remove-Werror-and-Wfatal-errors-compiler-comma.patch b/package/libcamera-apps/0001-cmake-remove-Werror-and-Wfatal-errors-compiler-comma.patch new file mode 100644 index 0000000000..988d89cca3 --- /dev/null +++ b/package/libcamera-apps/0001-cmake-remove-Werror-and-Wfatal-errors-compiler-comma.patch @@ -0,0 +1,37 @@ +From 6bd733b52f0b4039407c676cd3126a9e2f79456b Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Fri, 5 Feb 2021 18:24:08 +0100 +Subject: [PATCH] cmake: remove -Werror and -Wfatal-errors compiler command + line option +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes (with bootlin-riscv64-musl toolchain): + + .../build/libcamera-apps-2d1009e3badcc8047361ff81149ad6cba3b911b5/core/libcamera_app.cpp:30:22: error: overflow in conversion from ?long unsigned int? to ?int? changes value from ?2154321408? to ?-2140645888? [-Werror=overflow] + 30 | int ret = ioctl(fd, VIDIOC_QUERYCAP, &caps); + | ^~~~~~~~~~~~~~~ + cc1plus: all warnings being treated as errors + +Signed-off-by: Peter Seiderer +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 748c6dd..1ca1e39 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -11,7 +11,7 @@ endif() + + set (CMAKE_EXPORT_COMPILE_COMMANDS ON) + set (CMAKE_CXX_STANDARD 17) +-add_compile_options(-Wall -Wextra -pedantic -Wno-unused-parameter -faligned-new -Werror -Wfatal-errors) ++add_compile_options(-Wall -Wextra -pedantic -Wno-unused-parameter -faligned-new) + add_definitions(-D_FILE_OFFSET_BITS=64) + + if (CMAKE_COMPILER_IS_GNUCXX) +-- +2.34.1 + diff --git a/package/libcamera-apps/Config.in b/package/libcamera-apps/Config.in new file mode 100644 index 0000000000..75807b9c01 --- /dev/null +++ b/package/libcamera-apps/Config.in @@ -0,0 +1,30 @@ +config BR2_PACKAGE_LIBCAMERA_APPS + bool "libcamera-apps" + depends on BR2_PACKAGE_LIBCAMERA_ARCH_SUPPORTS # libcamera + depends on BR2_INSTALL_LIBSTDCPP # libcamera/boost + depends on BR2_TOOLCHAIN_HAS_THREADS # libcamera/boost + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17/libcamera + depends on !BR2_STATIC_LIBS # gnutls/libcamera + depends on BR2_USE_WCHAR # gnutls/libcamera/boost + select BR2_PACKAGE_BOOST + select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS + select BR2_PACKAGE_JPEG + select BR2_PACKAGE_LIBCAMERA + select BR2_PACKAGE_LIBEXIF + select BR2_PACKAGE_LIBPNG + select BR2_PACKAGE_TIFF + select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 && (BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL) + select BR2_PACKAGE_LIBEPOXY if BR2_PACKAGE_XORG7 && (BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL) + select BR2_PACKAGE_QT5BASE_GUI if BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT5BASE_WIDGETS if BR2_PACKAGE_QT5 + + help + This is a small suite of libcamera-based apps that aim to copy + the functionality of the existing "raspicam" apps. + + https://github.com/raspberrypi/libcamera-apps + +comment "libcamera-apps needs a toolchain w/ C++, threads, wchar, dynamic library, gcc >= 7" + 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 diff --git a/package/libcamera-apps/libcamera-apps.hash b/package/libcamera-apps/libcamera-apps.hash new file mode 100644 index 0000000000..2dbb74d463 --- /dev/null +++ b/package/libcamera-apps/libcamera-apps.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 611aec06dd24de6586580164d9b7c55da0698ac4cf129944b2fc41fe67210597 libcamera-apps-2d1009e3badcc8047361ff81149ad6cba3b911b5.tar.gz +sha256 36dfed86bdef661a0a14ec1a1cc84c771d5a06b6f9b92e9ebb610ba711bd528a license.txt diff --git a/package/libcamera-apps/libcamera-apps.mk b/package/libcamera-apps/libcamera-apps.mk new file mode 100644 index 0000000000..23cc02793d --- /dev/null +++ b/package/libcamera-apps/libcamera-apps.mk @@ -0,0 +1,46 @@ +################################################################################ +# +# libcamera-apps +# +################################################################################ + +LIBCAMERA_APPS_VERSION = 2d1009e3badcc8047361ff81149ad6cba3b911b5 +LIBCAMERA_APPS_SITE = $(call github,raspberrypi,libcamera-apps,$(LIBCAMERA_APPS_VERSION)) +LIBCAMERA_APPS_LICENSE = BSD-2-Clause +LIBCAMERA_APPS_LICENSE_FILES = license.txt +LIBCAMERA_APPS_DEPENDENCIES = \ + host-pkgconf \ + boost \ + jpeg \ + libcamera \ + libexif \ + libpng \ + tiff + +LIBCAMERA_APPS_CONF_OPTS = \ + -DENABLE_COMPILE_FLAGS_FOR_TARGET=disabled \ + -DENABLE_OPENCV=0 \ + -DENABLE_TFLITE=0 + +ifeq ($(BR2_PACKAGE_LIBDRM),y) +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_DRM=1 +LIBCAMERA_APPS_DEPENDENCIES += libdrm +else +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_DRM=0 +endif + +ifeq ($(BR2_PACKAGE_XORG7)$(BR2_PACKAGE_LIBEPOXY),yy) +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_X11=1 +LIBCAMERA_APPS_DEPENDENCIES += libepoxy xlib_libX11 +else +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_X11=0 +endif + +ifeq ($(BR2_PACKAGE_QT5)$(BR2_PACKAGE_QT5BASE_GUI)$(BR2_PACKAGE_QT5BASE_WIDGETS),yyy) +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_QT=1 +LIBCAMERA_APPS_DEPENDENCIES += qt5base +else +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_QT=0 +endif + +$(eval $(cmake-package)) -- 2.34.1 From yann.morin.1998 at free.fr Fri Feb 11 16:25:24 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 11 Feb 2022 17:25:24 +0100 Subject: [Buildroot] [git commit] support/download/helpers: adjust for older coreutils versions Message-ID: <20220211170444.4CABA82DEA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6e40891a6679bc0dd87af32d5e672180751987b9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The -z option for head was only added in coreutils 8.25, but some older enterprise-grade distributions (e.g. the oldest still maintained RHEL 7) only have nothing more recent than coreutils 8.22. We fix that by using sed to remove everything that starts with the first NULL byte, \x00. Signed-off-by: Clayton Shotwell [yann.morin.1998 at free.fr: hex is \xHH, not \xH, reword commit log] Signed-off-by: Yann E. MORIN --- support/download/helpers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/download/helpers b/support/download/helpers index ab31e27a69..90a7d6c1ec 100755 --- a/support/download/helpers +++ b/support/download/helpers @@ -79,7 +79,7 @@ post_process_unpack() { mkdir "${dest}" 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")" + one_file="$(find "${dest}" -type f -print0 |LC_ALL=C sort -z |sed 's/\x0.*//')" touch -r "${one_file}" "${dest}.timestamp" } From yann.morin.1998 at free.fr Fri Feb 11 17:12:13 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 11 Feb 2022 18:12:13 +0100 Subject: [Buildroot] [PATCH] support/download/post-process-helpers: adjust for older coreutils versions In-Reply-To: <20220210232327.119488-1-clayton.shotwell@rockwellcollins.com> References: <20220210232327.119488-1-clayton.shotwell@rockwellcollins.com> Message-ID: <20220211171213.GD3752867@scaer> Clayton, All, On 2022-02-10 17:23 -0600, Clayton Shotwell spake thusly: > From: Clayton Shotwell > > Ran into an issue with the post_process_unpack function using "head -z" > on a RHEL box which is using an older version or coreutils. The "-z" > flag was added in coreutils v8.25 but my IT managed RHEL box is only > using v8.22. The fix I have implemented relies on the null terminated > list and sed to remove the first null character and everthing > afterwards. coreutils v8.25 were released 2016-01-20, more than 6 years ago now, and v8.22 were released 2013-12-13, more than eight years ago. That is sad that you have to use an up-to-date Buildroot (even one that is not even yet released!) with such an old system... :-/ > Signed-off-by: Clayton Shotwell > --- > support/download/helpers | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/support/download/helpers b/support/download/helpers > index ab31e27..90a7d6c 100755 > --- a/support/download/helpers > +++ b/support/download/helpers > @@ -79,7 +79,7 @@ post_process_unpack() { > > mkdir "${dest}" > 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")" > + one_file="$(find "${dest}" -type f -print0 |LC_ALL=C sort -z |sed 's/\x0.*//')" As far as I know, hexa needs two digits to represent a byte, so \x00 http://sed.sourceforge.net/grabbag/tutorials/sedfaq.txt 4.2. How do I represent control-codes or nonprintable characters? Several versions of sed support the notation \xHH, where "HH" are two hex digits, 00-FF [...] So I fixed that, and applied to master, with a rewokred commit log, thanks. Regards, Yann E. MORIN. > touch -r "${one_file}" "${dest}.timestamp" > } > > -- > 1.8.3.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 wbx at openadk.org Fri Feb 11 18:06:51 2022 From: wbx at openadk.org (Waldemar Brodkorb) Date: Fri, 11 Feb 2022 19:06:51 +0100 Subject: [Buildroot] [PATCH 1/2] package/binutils: fixes glibc build compiled with -Os on x86 Message-ID: See here: https://sourceware.org/bugzilla/show_bug.cgi?id=28870 Signed-off-by: Waldemar Brodkorb --- ...OT32-relocations-against-ABS-symbols.patch | 46 ++++++++++++++++ ...OT32-relocations-against-ABS-symbols.patch | 53 +++++++++++++++++++ ...OT32-relocations-against-ABS-symbols.patch | 47 ++++++++++++++++ 3 files changed, 146 insertions(+) create mode 100644 package/binutils/2.35.2/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch create mode 100644 package/binutils/2.36.1/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch create mode 100644 package/binutils/2.37/0007-i386-Allow-GOT32-relocations-against-ABS-symbols.patch diff --git a/package/binutils/2.35.2/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch b/package/binutils/2.35.2/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch new file mode 100644 index 0000000000..e95eb1e7c5 --- /dev/null +++ b/package/binutils/2.35.2/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch @@ -0,0 +1,46 @@ +From 30a954525f4e53a9cd50a1a8a6f201c7cf6595c7 Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" +Date: Mon, 7 Feb 2022 15:22:19 -0800 +Subject: [PATCH] i386: Allow GOT32 relocations against ABS symbols + +GOT32 relocations are allowed since absolute value + addend is stored in +the GOT slot. + +Tested on glibc 2.35 build with GCC 11.2 and -Os. + +bfd/ + + PR ld/28870 + * elfxx-x86.c (_bfd_elf_x86_valid_reloc_p): Also allow GOT32 + relocations. + +Signed-off-by: Waldemar Brodkorb + +diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c +index 7ac2411fc80..d00dc45677b 100644 +--- a/bfd/elfxx-x86.c ++++ b/bfd/elfxx-x86.c +@@ -1942,9 +1942,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section, + irel = *rel; + + /* Only allow relocations against absolute symbol, which can be +- resolved as absolute value + addend. GOTPCREL relocations +- are allowed since absolute value + addend is stored in the +- GOT slot. */ ++ resolved as absolute value + addend. GOTPCREL and GOT32 ++ relocations are allowed since absolute value + addend is ++ stored in the GOT slot. */ + if (bed->target_id == X86_64_ELF_DATA) + { + r_type &= ~R_X86_64_converted_reloc_bit; +@@ -1965,7 +1965,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section, + else + valid_p = (r_type == R_386_32 + || r_type == R_386_16 +- || r_type == R_386_8); ++ || r_type == R_386_8 ++ || r_type == R_386_GOT32 ++ || r_type == R_386_GOT32X); + + if (valid_p) + *no_dynreloc_p = true; diff --git a/package/binutils/2.36.1/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch b/package/binutils/2.36.1/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch new file mode 100644 index 0000000000..af96f1a0f0 --- /dev/null +++ b/package/binutils/2.36.1/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch @@ -0,0 +1,53 @@ +From 30a954525f4e53a9cd50a1a8a6f201c7cf6595c7 Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" +Date: Mon, 7 Feb 2022 15:22:19 -0800 +Subject: [PATCH] i386: Allow GOT32 relocations against ABS symbols + +GOT32 relocations are allowed since absolute value + addend is stored in +the GOT slot. + +Tested on glibc 2.35 build with GCC 11.2 and -Os. + +bfd/ + + PR ld/28870 + * elfxx-x86.c (_bfd_elf_x86_valid_reloc_p): Also allow GOT32 + relocations. + +ld/ + + PR ld/28870 + * testsuite/ld-i386/i386.exp: Run pr28870. + * testsuite/ld-i386/pr28870.d: New file. + * testsuite/ld-i386/pr28870.s: Likewise. + +Signed-off-by: Waldemar Brodkorb + +diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c +index 7ac2411fc80..d00dc45677b 100644 +--- a/bfd/elfxx-x86.c ++++ b/bfd/elfxx-x86.c +@@ -1942,9 +1942,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section, + irel = *rel; + + /* Only allow relocations against absolute symbol, which can be +- resolved as absolute value + addend. GOTPCREL relocations +- are allowed since absolute value + addend is stored in the +- GOT slot. */ ++ resolved as absolute value + addend. GOTPCREL and GOT32 ++ relocations are allowed since absolute value + addend is ++ stored in the GOT slot. */ + if (bed->target_id == X86_64_ELF_DATA) + { + r_type &= ~R_X86_64_converted_reloc_bit; +@@ -1965,7 +1965,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section, + else + valid_p = (r_type == R_386_32 + || r_type == R_386_16 +- || r_type == R_386_8); ++ || r_type == R_386_8 ++ || r_type == R_386_GOT32 ++ || r_type == R_386_GOT32X); + + if (valid_p) + *no_dynreloc_p = true; diff --git a/package/binutils/2.37/0007-i386-Allow-GOT32-relocations-against-ABS-symbols.patch b/package/binutils/2.37/0007-i386-Allow-GOT32-relocations-against-ABS-symbols.patch new file mode 100644 index 0000000000..3e29282261 --- /dev/null +++ b/package/binutils/2.37/0007-i386-Allow-GOT32-relocations-against-ABS-symbols.patch @@ -0,0 +1,47 @@ +From 30a954525f4e53a9cd50a1a8a6f201c7cf6595c7 Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" +Date: Mon, 7 Feb 2022 15:22:19 -0800 +Subject: [PATCH] i386: Allow GOT32 relocations against ABS symbols + +GOT32 relocations are allowed since absolute value + addend is stored in +the GOT slot. + +Tested on glibc 2.35 build with GCC 11.2 and -Os. + +bfd/ + + PR ld/28870 + * elfxx-x86.c (_bfd_elf_x86_valid_reloc_p): Also allow GOT32 + relocations. + + +Signed-off-by: Waldemar Brodkorb + +diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c +index 7ac2411fc80..d00dc45677b 100644 +--- a/bfd/elfxx-x86.c ++++ b/bfd/elfxx-x86.c +@@ -1942,9 +1942,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section, + irel = *rel; + + /* Only allow relocations against absolute symbol, which can be +- resolved as absolute value + addend. GOTPCREL relocations +- are allowed since absolute value + addend is stored in the +- GOT slot. */ ++ resolved as absolute value + addend. GOTPCREL and GOT32 ++ relocations are allowed since absolute value + addend is ++ stored in the GOT slot. */ + if (bed->target_id == X86_64_ELF_DATA) + { + r_type &= ~R_X86_64_converted_reloc_bit; +@@ -1965,7 +1965,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section, + else + valid_p = (r_type == R_386_32 + || r_type == R_386_16 +- || r_type == R_386_8); ++ || r_type == R_386_8 ++ || r_type == R_386_GOT32 ++ || r_type == R_386_GOT32X); + + if (valid_p) + *no_dynreloc_p = true; -- 2.30.2 From wbx at openadk.org Fri Feb 11 18:08:07 2022 From: wbx at openadk.org (Waldemar Brodkorb) Date: Fri, 11 Feb 2022 19:08:07 +0100 Subject: [Buildroot] [PATCH 2/2] package/{glibc, localedef}: update to 2.35 Message-ID: https://sourceware.org/pipermail/libc-alpha/2022-February/136040.html - allow to use optimization CFLAGS (not CPPFLAGS) which are nowadays supported by upstream (except nios2) - enable support for or1k, which is now included upstream - runtime tested with qemu-system for aarch64/arm/microblaze/mips/mips64/nios2/ or1k/powerpc/powerpc64/powerpc64le/riscv32/riscv64/s390x/sh4/sparc64/x86/x86_64 Signed-off-by: Waldemar Brodkorb --- ...v-linux-microblaze-pselect32.c-add-m.patch | 85 ------------------- .../glibc.hash | 2 +- package/glibc/glibc.mk | 16 ++-- ...ACK-only-build-and-install-localedef.patch | 0 ...y-on-GCC-to-4.8-and-binutils-to-2.24.patch | 0 .../localedef.hash | 2 +- package/localedef/localedef.mk | 2 +- toolchain/toolchain-buildroot/Config.in | 3 +- 8 files changed, 15 insertions(+), 95 deletions(-) delete mode 100644 package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch rename package/glibc/{2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c => 2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586}/glibc.hash (70%) rename package/localedef/{2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c => 2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586}/0001-HACK-only-build-and-install-localedef.patch (100%) rename package/localedef/{2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c => 2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586}/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch (100%) rename package/localedef/{2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c => 2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586}/localedef.hash (70%) diff --git a/package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch b/package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch deleted file mode 100644 index 3597cd6a11..0000000000 --- a/package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch +++ /dev/null @@ -1,85 +0,0 @@ -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 - diff --git a/package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/glibc.hash b/package/glibc/2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586/glibc.hash similarity index 70% rename from package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/glibc.hash rename to package/glibc/2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586/glibc.hash index dfd939020f..f28c15c2a3 100644 --- a/package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/glibc.hash +++ b/package/glibc/2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586/glibc.hash @@ -1,5 +1,5 @@ # Locally calculated (fetched from Github) -sha256 3c299a21468a80356b848ca341f45551616c4928a6c871e6d45cee942e8b0f24 glibc-2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c.tar.gz +sha256 0ca43b2a6cd74609519554303a16e350abdac0e66943c5d98d91228233c826a0 glibc-2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586.tar.gz # Hashes for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index 2702994c6b..f258f33c96 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -7,7 +7,7 @@ # Generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- # When updating the version, please also update localedef -GLIBC_VERSION = 2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c +GLIBC_VERSION = 2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586 # Upstream doesn't officially provide an https download link. # There is one (https://sourceware.org/git/glibc.git) but it's not reliable, # sometimes the connection times out. So use an unofficial github mirror. @@ -110,16 +110,20 @@ endif # # 2. We have to execute the configure script with bash and not sh. # -# Note that as mentionned in -# http://patches.openembedded.org/patch/38849/, glibc must be -# built with -O2, so we pass our own CFLAGS and CXXFLAGS below. +# Glibc nowadays can be build with optimization flags f.e. -Os + +# crash in qemu-system-nios2 with -Os +ifeq ($(BR2_nios2),y) +TARGET_FCFLAGS := -O2 +endif + define GLIBC_CONFIGURE_CMDS mkdir -p $(@D)/build # Do the configuration (cd $(@D)/build; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="-O2 $(GLIBC_EXTRA_CFLAGS)" CPPFLAGS="" \ - CXXFLAGS="-O2 $(GLIBC_EXTRA_CFLAGS)" \ + CFLAGS="$(TARGET_FCFLAGS) $(GLIBC_EXTRA_CFLAGS)" CPPFLAGS="" \ + CXXFLAGS="$(TARGET_FCFLAGS) $(GLIBC_EXTRA_CFLAGS)" \ $(GLIBC_CONF_ENV) \ $(SHELL) $(@D)/configure \ --target=$(GNU_TARGET_NAME) \ diff --git a/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-HACK-only-build-and-install-localedef.patch b/package/localedef/2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586/0001-HACK-only-build-and-install-localedef.patch similarity index 100% rename from package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-HACK-only-build-and-install-localedef.patch rename to package/localedef/2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586/0001-HACK-only-build-and-install-localedef.patch diff --git a/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch b/package/localedef/2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch similarity index 100% rename from package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch rename to package/localedef/2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch diff --git a/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/localedef.hash b/package/localedef/2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586/localedef.hash similarity index 70% rename from package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/localedef.hash rename to package/localedef/2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586/localedef.hash index dfd939020f..f28c15c2a3 100644 --- a/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/localedef.hash +++ b/package/localedef/2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586/localedef.hash @@ -1,5 +1,5 @@ # Locally calculated (fetched from Github) -sha256 3c299a21468a80356b848ca341f45551616c4928a6c871e6d45cee942e8b0f24 glibc-2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c.tar.gz +sha256 0ca43b2a6cd74609519554303a16e350abdac0e66943c5d98d91228233c826a0 glibc-2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586.tar.gz # Hashes for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/localedef/localedef.mk b/package/localedef/localedef.mk index f8f0b42984..fb5edde0c2 100644 --- a/package/localedef/localedef.mk +++ b/package/localedef/localedef.mk @@ -7,7 +7,7 @@ # Use the same VERSION and SITE as target glibc # As in glibc.mk, generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- -LOCALEDEF_VERSION = 2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c +LOCALEDEF_VERSION = 2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586 LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION).tar.gz LOCALEDEF_SITE = $(call github,bminor,glibc,$(LOCALEDEF_VERSION)) HOST_LOCALEDEF_DL_SUBDIR = glibc diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in index 4004c0edf8..437daafa74 100644 --- a/toolchain/toolchain-buildroot/Config.in +++ b/toolchain/toolchain-buildroot/Config.in @@ -49,7 +49,8 @@ config BR2_TOOLCHAIN_BUILDROOT_GLIBC BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le || \ BR2_riscv || BR2_s390x || BR2_sh || \ BR2_sparc64 || BR2_x86_64 || BR2_microblaze || \ - BR2_nios2 || (BR2_arc && BR2_ARC_ATOMIC_EXT) || BR2_csky + BR2_nios2 || (BR2_arc && BR2_ARC_ATOMIC_EXT) || \ + BR2_csky || BR2_or1k depends on BR2_USE_MMU depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 -- 2.30.2 From nunojpg at gmail.com Fri Feb 11 18:22:03 2022 From: nunojpg at gmail.com (=?UTF-8?Q?Nuno_Gon=C3=A7alves?=) Date: Fri, 11 Feb 2022 18:22:03 +0000 Subject: [Buildroot] [PATCH] package/casync: fix zstd dependency to correct package name In-Reply-To: References: Message-ID: Signed-off-by: Nuno Goncalves --- package/casync/casync.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/casync/casync.mk b/package/casync/casync.mk index d74cb1bfe8..bb9bd8ccac 100644 --- a/package/casync/casync.mk +++ b/package/casync/casync.mk @@ -40,8 +40,8 @@ else CASYNC_CONF_OPTS += -Dudev=false endif -ifeq ($(BR2_PACKAGE_LIBZSTD),y) -CASYNC_DEPENDENCIES += libzstd +ifeq ($(BR2_PACKAGE_ZSTD),y) +CASYNC_DEPENDENCIES += zstd CASYNC_CONF_OPTS += -Dlibzstd=enabled else CASYNC_CONF_OPTS += -Dlibzstd=disabled -- 2.32.0 From peter at korsgaard.com Fri Feb 11 19:08:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 20:08:46 +0100 Subject: [Buildroot] [PATCH] package/python3: unconditionally install python{, -config} symlinks In-Reply-To: <20220210212429.31856-1-peter@korsgaard.com> (Peter Korsgaard's message of "Thu, 10 Feb 2022 22:24:29 +0100") References: <20220210212429.31856-1-peter@korsgaard.com> Message-ID: <87mtixqkzl.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Now that host-python2 is gone, it makes sense to unconditionally install the > symlinks for the host, similar to how it is done for the target. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 11 19:08:52 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 20:08:52 +0100 Subject: [Buildroot] [PATCH] package/python3-pycparser: drop unused host package In-Reply-To: <20220210223128.11002-1-peter@korsgaard.com> (Peter Korsgaard's message of "Thu, 10 Feb 2022 23:31:27 +0100") References: <20220210223128.11002-1-peter@korsgaard.com> Message-ID: <87iltlqkzf.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Commit d9bf97cf16fa6945466a67 (package/python-cryptography: drop host > variant) dropped the dependency on host-python3-pycparser, so it is now > unused. Drop it. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 11 19:08:59 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 20:08:59 +0100 Subject: [Buildroot] [PATCH 1/5] package/python3-cffi: drop unused host package In-Reply-To: <20220210224047.11992-1-peter@korsgaard.com> (Peter Korsgaard's message of "Thu, 10 Feb 2022 23:40:42 +0100") References: <20220210224047.11992-1-peter@korsgaard.com> Message-ID: <87ee49qkz8.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Commit d9bf97cf16fa6945466a67 (package/python-cryptography: drop host > variant) dropped the dependency on host-python3-cffi, so it is now unused. > Drop it. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 11 19:09:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 20:09:04 +0100 Subject: [Buildroot] [PATCH 2/5] package/python3-cheetah: drop host package In-Reply-To: <20220210224047.11992-2-peter@korsgaard.com> (Peter Korsgaard's message of "Thu, 10 Feb 2022 23:40:43 +0100") References: <20220210224047.11992-1-peter@korsgaard.com> <20220210224047.11992-2-peter@korsgaard.com> Message-ID: <87a6exqkz3.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Now that host-python2 is gone, the custom python3 variant can be dropped. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 11 19:09:13 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 20:09:13 +0100 Subject: [Buildroot] [PATCH 3/5] package/python3-cython: drop host package In-Reply-To: <20220210224047.11992-3-peter@korsgaard.com> (Peter Korsgaard's message of "Thu, 10 Feb 2022 23:40:44 +0100") References: <20220210224047.11992-1-peter@korsgaard.com> <20220210224047.11992-3-peter@korsgaard.com> Message-ID: <875yplqkyu.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Now that host-python2 is gone, the custom python3 variant can be dropped. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 11 19:09:18 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 20:09:18 +0100 Subject: [Buildroot] [PATCH 5/5] package/python3-psutil: drop host package In-Reply-To: <20220210224047.11992-5-peter@korsgaard.com> (Peter Korsgaard's message of "Thu, 10 Feb 2022 23:40:46 +0100") References: <20220210224047.11992-1-peter@korsgaard.com> <20220210224047.11992-5-peter@korsgaard.com> Message-ID: <871r09qkyp.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Now that host-python2 is gone, the custom python3 variant can be dropped. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 11 19:09:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 20:09:26 +0100 Subject: [Buildroot] [PATCH 4/5] package/python3-ply: drop host package In-Reply-To: <20220210224047.11992-4-peter@korsgaard.com> (Peter Korsgaard's message of "Thu, 10 Feb 2022 23:40:45 +0100") References: <20220210224047.11992-1-peter@korsgaard.com> <20220210224047.11992-4-peter@korsgaard.com> Message-ID: <87wni1p6e1.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Now that host-python2 is gone, the custom python3 variant can be dropped. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 11 19:09:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 20:09:37 +0100 Subject: [Buildroot] [PATCH 1/5] package/python3-pycryptodomex: drop host package In-Reply-To: <20220211081730.23068-1-peter@korsgaard.com> (Peter Korsgaard's message of "Fri, 11 Feb 2022 09:17:25 +0100") References: <20220211081730.23068-1-peter@korsgaard.com> Message-ID: <87sfspp6dq.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Now that host-python2 is gone, the custom python3 variant can be dropped. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 11 19:09:41 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 20:09:41 +0100 Subject: [Buildroot] [PATCH 2/5] boot/uboot: drop host-python2 support In-Reply-To: <20220211081730.23068-2-peter@korsgaard.com> (Peter Korsgaard's message of "Fri, 11 Feb 2022 09:17:26 +0100") References: <20220211081730.23068-1-peter@korsgaard.com> <20220211081730.23068-2-peter@korsgaard.com> Message-ID: <87o83dp6dm.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > host-python2 is gone, so drop the _NEEDS_PYTHON2 logic. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 11 19:09:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 20:09:45 +0100 Subject: [Buildroot] [PATCH 4/5] package/python3-regex: drop host package In-Reply-To: <20220211081730.23068-4-peter@korsgaard.com> (Peter Korsgaard's message of "Fri, 11 Feb 2022 09:17:28 +0100") References: <20220211081730.23068-1-peter@korsgaard.com> <20220211081730.23068-4-peter@korsgaard.com> Message-ID: <87k0e1p6di.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Now that host-python2 is gone, the custom python3 variant can be dropped and > instead host support added to python-regex. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 11 19:09:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 20:09:49 +0100 Subject: [Buildroot] [PATCH 3/5] package/python3-pyelftools: drop host package In-Reply-To: <20220211081730.23068-3-peter@korsgaard.com> (Peter Korsgaard's message of "Fri, 11 Feb 2022 09:17:27 +0100") References: <20220211081730.23068-1-peter@korsgaard.com> <20220211081730.23068-3-peter@korsgaard.com> Message-ID: <87fsopp6de.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Now that host-python2 is gone, the custom python3 variant can be dropped. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 11 19:09:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 20:09:53 +0100 Subject: [Buildroot] [PATCH 5/5] package/python3-six: drop host package In-Reply-To: <20220211081730.23068-5-peter@korsgaard.com> (Peter Korsgaard's message of "Fri, 11 Feb 2022 09:17:29 +0100") References: <20220211081730.23068-1-peter@korsgaard.com> <20220211081730.23068-5-peter@korsgaard.com> Message-ID: <87bkzdp6da.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Now that host-python2 is gone, the custom python3 variant can be dropped. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 11 19:06:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 20:06:50 +0100 Subject: [Buildroot] [git commit] package/python3-cheetah: drop host package Message-ID: <20220211190258.EB22582DDC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=255e7030f199ebb98ce6e6f283289a95c8f0f0a8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Now that host-python2 is gone, the custom python3 variant can be dropped. Signed-off-by: Peter Korsgaard --- package/mongodb/mongodb.mk | 2 +- package/python-cheetah/python-cheetah.mk | 1 - package/python3-cheetah/python3-cheetah.hash | 1 - package/python3-cheetah/python3-cheetah.mk | 18 ------------------ 4 files changed, 1 insertion(+), 21 deletions(-) diff --git a/package/mongodb/mongodb.mk b/package/mongodb/mongodb.mk index 311b9de14e..2a5e00be79 100644 --- a/package/mongodb/mongodb.mk +++ b/package/mongodb/mongodb.mk @@ -16,7 +16,7 @@ MONGODB_SELINUX_MODULES = mongodb MONGODB_DEPENDENCIES = \ boost \ - host-python3-cheetah \ + host-python-cheetah \ host-python3-psutil \ host-python-pyyaml \ host-python3-regex \ diff --git a/package/python-cheetah/python-cheetah.mk b/package/python-cheetah/python-cheetah.mk index 02877e03c4..92688f6ced 100644 --- a/package/python-cheetah/python-cheetah.mk +++ b/package/python-cheetah/python-cheetah.mk @@ -4,7 +4,6 @@ # ################################################################################ -# Please keep in sync with package/python3-cheetah/python3-cheetah.mk PYTHON_CHEETAH_VERSION = 3.2.6.post2 PYTHON_CHEETAH_SOURCE = Cheetah3-$(PYTHON_CHEETAH_VERSION).tar.gz PYTHON_CHEETAH_SITE = https://files.pythonhosted.org/packages/c0/97/c3fa47e223207e6ca6b501a954c5c959ed3e99f2a1ceec9918238ce38418 diff --git a/package/python3-cheetah/python3-cheetah.hash b/package/python3-cheetah/python3-cheetah.hash deleted file mode 120000 index c29a76ea80..0000000000 --- a/package/python3-cheetah/python3-cheetah.hash +++ /dev/null @@ -1 +0,0 @@ -../python-cheetah/python-cheetah.hash \ No newline at end of file diff --git a/package/python3-cheetah/python3-cheetah.mk b/package/python3-cheetah/python3-cheetah.mk deleted file mode 100644 index 93d16201aa..0000000000 --- a/package/python3-cheetah/python3-cheetah.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# python3-cheetah -# -################################################################################ - -# Please keep in sync with -# package/python-cheetah/python-cheetah.mk -PYTHON3_CHEETAH_VERSION = 3.2.6.post2 -PYTHON3_CHEETAH_SOURCE = Cheetah3-$(PYTHON3_CHEETAH_VERSION).tar.gz -PYTHON3_CHEETAH_SITE = https://files.pythonhosted.org/packages/c0/97/c3fa47e223207e6ca6b501a954c5c959ed3e99f2a1ceec9918238ce38418 -PYTHON3_CHEETAH_LICENSE = MIT -PYTHON3_CHEETAH_LICENSE_FILES = LICENSE -PYTHON3_CHEETAH_SETUP_TYPE = setuptools -HOST_PYTHON3_CHEETAH_DL_SUBDIR = python-cheetah -HOST_PYTHON3_CHEETAH_NEEDS_HOST_PYTHON = python3 - -$(eval $(host-python-package)) From peter at korsgaard.com Fri Feb 11 19:06:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 20:06:56 +0100 Subject: [Buildroot] [git commit] package/python3-cython: drop host package Message-ID: <20220211190259.01460832DA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=866b42ce4985affd0ab578e15b77eac1dc6533a5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Now that host-python2 is gone, the custom python3 variant can be dropped. Signed-off-by: Peter Korsgaard --- package/libdnet/libdnet.mk | 2 +- package/python-cython/python-cython.mk | 1 - package/python-fonttools/python-fonttools.mk | 2 +- package/python3-cython/python3-cython.hash | 1 - package/python3-cython/python3-cython.mk | 16 ---------------- package/setools/setools.mk | 2 +- 6 files changed, 3 insertions(+), 21 deletions(-) diff --git a/package/libdnet/libdnet.mk b/package/libdnet/libdnet.mk index e9a57d6ed2..4c58ea20a5 100644 --- a/package/libdnet/libdnet.mk +++ b/package/libdnet/libdnet.mk @@ -16,7 +16,7 @@ LIBDNET_CONF_OPTS = \ LIBDNET_CONFIG_SCRIPTS = dnet-config ifeq ($(BR2_PACKAGE_LIBDNET_PYTHON),y) -LIBDNET_DEPENDENCIES += host-python3-cython python3 +LIBDNET_DEPENDENCIES += host-python-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 diff --git a/package/python-cython/python-cython.mk b/package/python-cython/python-cython.mk index 89708cb9a8..b9fbf7b11a 100644 --- a/package/python-cython/python-cython.mk +++ b/package/python-cython/python-cython.mk @@ -4,7 +4,6 @@ # ################################################################################ -# Please keep in sync with package/python3-cython/python3-cython.mk PYTHON_CYTHON_VERSION = 0.29.27 PYTHON_CYTHON_SOURCE = Cython-$(PYTHON_CYTHON_VERSION).tar.gz PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/eb/46/80dd9e5ad67ebc766ff3229901bde4a7bc82907efe93cd7007c4df458dd5 diff --git a/package/python-fonttools/python-fonttools.mk b/package/python-fonttools/python-fonttools.mk index d5c4cdf8e5..c07011daa0 100644 --- a/package/python-fonttools/python-fonttools.mk +++ b/package/python-fonttools/python-fonttools.mk @@ -10,7 +10,7 @@ PYTHON_FONTTOOLS_SITE = https://files.pythonhosted.org/packages/2d/4c/49ba863863 PYTHON_FONTTOOLS_SETUP_TYPE = setuptools PYTHON_FONTTOOLS_LICENSE = MIT PYTHON_FONTTOOLS_LICENSE_FILES = LICENSE -PYTHON_FONTTOOLS_DEPENDENCIES = host-python3-cython +PYTHON_FONTTOOLS_DEPENDENCIES = host-python-cython PYTHON_FONTTOOLS_ENV = FONTTOOLS_WITH_CYTHON=1 define PYTHON_FONTTOOLS_EXTRACT_CMDS diff --git a/package/python3-cython/python3-cython.hash b/package/python3-cython/python3-cython.hash deleted file mode 120000 index 70dde64105..0000000000 --- a/package/python3-cython/python3-cython.hash +++ /dev/null @@ -1 +0,0 @@ -../python-cython/python-cython.hash \ No newline at end of file diff --git a/package/python3-cython/python3-cython.mk b/package/python3-cython/python3-cython.mk deleted file mode 100644 index 56d88b5bf7..0000000000 --- a/package/python3-cython/python3-cython.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# python3-cython -# -################################################################################ - -# Please keep in sync with package/python-cython/python-cython.mk -PYTHON3_CYTHON_VERSION = 0.29.27 -PYTHON3_CYTHON_SOURCE = Cython-$(PYTHON3_CYTHON_VERSION).tar.gz -PYTHON3_CYTHON_SITE = https://files.pythonhosted.org/packages/eb/46/80dd9e5ad67ebc766ff3229901bde4a7bc82907efe93cd7007c4df458dd5 -PYTHON3_CYTHON_SETUP_TYPE = setuptools -PYTHON3_CYTHON_LICENSE = Apache-2.0 -PYTHON3_CYTHON_LICENSE_FILES = COPYING.txt LICENSE.txt -HOST_PYTHON3_CYTHON_NEEDS_HOST_PYTHON = python3 - -$(eval $(host-python-package)) diff --git a/package/setools/setools.mk b/package/setools/setools.mk index 8e1c0d2cc6..5b4b4e30d8 100644 --- a/package/setools/setools.mk +++ b/package/setools/setools.mk @@ -12,7 +12,7 @@ SETOOLS_LICENSE = GPL-2.0+, LGPL-2.1+ SETOOLS_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL SETOOLS_CPE_ID_VENDOR = selinuxproject SETOOLS_SETUP_TYPE = setuptools -HOST_SETOOLS_DEPENDENCIES = host-python3-cython host-libselinux host-libsepol host-python-networkx +HOST_SETOOLS_DEPENDENCIES = host-python-cython host-libselinux host-libsepol host-python-networkx HOST_SETOOLS_NEEDS_HOST_PYTHON = python3 define SETOOLS_FIX_SETUP From peter at korsgaard.com Fri Feb 11 19:08:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 20:08:39 +0100 Subject: [Buildroot] [git commit] package/python3: unconditionally install python{, -config} symlinks Message-ID: <20220211190259.5CF9482DDC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b6ff83722f96f71c8b883c63dde37fe9867c1bdc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Now that host-python2 is gone, it makes sense to unconditionally install the symlinks for the host, similar to how it is done for the target. Signed-off-by: Peter Korsgaard --- package/python3/python3.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 6af7488ddd..3a334fb28d 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -262,18 +262,12 @@ endef PYTHON3_POST_INSTALL_TARGET_HOOKS += PYTHON3_INSTALL_SYMLINK -# Some packages may have build scripts requiring python3, whatever is the -# python version chosen for the target. -# Only install the python symlink in the host tree if python3 is enabled -# for the target. -ifeq ($(BR2_PACKAGE_PYTHON3),y) define HOST_PYTHON3_INSTALL_SYMLINK ln -fs python3 $(HOST_DIR)/bin/python ln -fs python3-config $(HOST_DIR)/bin/python-config endef HOST_PYTHON3_POST_INSTALL_HOOKS += HOST_PYTHON3_INSTALL_SYMLINK -endif # Provided to other packages PYTHON3_PATH = $(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/ From peter at korsgaard.com Fri Feb 11 19:07:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 20:07:51 +0100 Subject: [Buildroot] [git commit] boot/uboot: drop host-python2 support Message-ID: <20220211190259.3452E82DDC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ea6a0a60e28f3047e762806a0cef3b4d55d7b576 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master host-python2 is gone, so drop the _NEEDS_PYTHON2 logic. Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++++ boot/uboot/Config.in | 28 +++------------------------- boot/uboot/uboot.mk | 8 +------- 3 files changed, 10 insertions(+), 32 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 2b1fd48de5..0794813a97 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_TARGET_UBOOT_NEEDS_PYTHON2 + bool "host-python 2.7 support for U-Boot was removed" + select BR2_LEGACY + help + Option was removed together with python 2.7 support. + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBMMS bool "gst1-plugins-bad plugin libmms was removed" depends on BR2_USE_WCHAR diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index 1fd4dede92..953c36135e 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -143,45 +143,23 @@ config BR2_TARGET_UBOOT_NEEDS_DTC Select this option if your U-Boot board configuration requires the Device Tree compiler to be available. -config BR2_TARGET_UBOOT_NEEDS_PYTHON - bool - -choice - bool "U-Boot needs host Python" - -config BR2_TARGET_UBOOT_NEEDS_PYTHON_NONE - bool "no" - depends on !BR2_TARGET_UBOOT_NEEDS_PYTHON - help - Select this option if U-Boot does not need any - host python to build. - -config BR2_TARGET_UBOOT_NEEDS_PYTHON2 - bool "python 2.x" - help - Select this option if U-Boot needs a host Python 2.x - interpreter. This is the case for some U-Boot - configurations, prior to U-Boot 2020.01. - config BR2_TARGET_UBOOT_NEEDS_PYTHON3 - bool "python 3.x" + bool "U-Boot needs host python 3.x" help Select this option if U-Boot needs a host Python 3.x interpreter. This is the case for some U-Boot configurations, after U-Boot 2020.01. -endchoice - config BR2_TARGET_UBOOT_NEEDS_PYLIBFDT bool "U-Boot needs pylibfdt" - select BR2_TARGET_UBOOT_NEEDS_PYTHON + select BR2_TARGET_UBOOT_NEEDS_PYTHON3 help Select this option if your U-Boot board configuration requires the Python libfdt library to be available. config BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS bool "U-Boot needs pyelftools" - select BR2_TARGET_UBOOT_NEEDS_PYTHON + select BR2_TARGET_UBOOT_NEEDS_PYTHON3 help Select this option if your U-Boot board configuration requires the Python pyelftools library to be available. diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index d05b9bb479..9e227fed91 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -207,9 +207,7 @@ ifeq ($(BR2_TARGET_UBOOT_NEEDS_DTC),y) UBOOT_DEPENDENCIES += host-dtc endif -ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON2),y) -UBOOT_DEPENDENCIES += host-python host-python-setuptools -else ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON3),y) +ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON3),y) UBOOT_DEPENDENCIES += host-python3 host-python3-setuptools endif @@ -218,12 +216,8 @@ UBOOT_DEPENDENCIES += host-swig endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS),y) -ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON2),y) -UBOOT_DEPENDENCIES += host-python-pyelftools -else ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON3),y) UBOOT_DEPENDENCIES += host-python3-pyelftools endif -endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSSL),y) UBOOT_DEPENDENCIES += host-openssl From peter at korsgaard.com Fri Feb 11 19:07:57 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 20:07:57 +0100 Subject: [Buildroot] [git commit] package/python3-pyelftools: drop host package Message-ID: <20220211190259.3EF11832DA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d3730ae991107d338b4acab5e617c9ff0cd754a4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Now that host-python2 is gone, the custom python3 variant can be dropped. Signed-off-by: Peter Korsgaard --- boot/optee-os/optee-os.mk | 2 +- boot/uboot/uboot.mk | 2 +- package/python-pyelftools/python-pyelftools.mk | 1 - package/python3-pyelftools/python3-pyelftools.hash | 1 - package/python3-pyelftools/python3-pyelftools.mk | 17 ----------------- 5 files changed, 2 insertions(+), 21 deletions(-) diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk index 2884b48513..166b5e693c 100644 --- a/boot/optee-os/optee-os.mk +++ b/boot/optee-os/optee-os.mk @@ -21,7 +21,7 @@ else OPTEE_OS_SITE = $(call github,OP-TEE,optee_os,$(OPTEE_OS_VERSION)) endif -OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pycryptodomex host-python3-pyelftools +OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pycryptodomex host-python-pyelftools # On 64bit targets, OP-TEE OS can be built in 32bit mode, or # can be built in 64bit mode and support 32bit and 64bit diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 9e227fed91..9e569906ce 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -216,7 +216,7 @@ UBOOT_DEPENDENCIES += host-swig endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS),y) -UBOOT_DEPENDENCIES += host-python3-pyelftools +UBOOT_DEPENDENCIES += host-python-pyelftools endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSSL),y) diff --git a/package/python-pyelftools/python-pyelftools.mk b/package/python-pyelftools/python-pyelftools.mk index 3ae0a4ffc2..5bfdcd33ae 100644 --- a/package/python-pyelftools/python-pyelftools.mk +++ b/package/python-pyelftools/python-pyelftools.mk @@ -4,7 +4,6 @@ # ################################################################################ -# Please keep in sync with package/python3-pyelftools/python3-pyelftools.mk PYTHON_PYELFTOOLS_VERSION = 0.27 PYTHON_PYELFTOOLS_SOURCE = pyelftools-$(PYTHON_PYELFTOOLS_VERSION).tar.gz PYTHON_PYELFTOOLS_SITE = https://files.pythonhosted.org/packages/6b/b5/f7022f2d950327ba970ec85fb8f85c79244031092c129b6f34ab17514ae0 diff --git a/package/python3-pyelftools/python3-pyelftools.hash b/package/python3-pyelftools/python3-pyelftools.hash deleted file mode 120000 index e8eebeda9f..0000000000 --- a/package/python3-pyelftools/python3-pyelftools.hash +++ /dev/null @@ -1 +0,0 @@ -../python-pyelftools/python-pyelftools.hash \ No newline at end of file diff --git a/package/python3-pyelftools/python3-pyelftools.mk b/package/python3-pyelftools/python3-pyelftools.mk deleted file mode 100644 index 3d21d3040e..0000000000 --- a/package/python3-pyelftools/python3-pyelftools.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# python3-pyelftools -# -################################################################################ - -# Please keep in sync with package/python-pyelftools/python-pyelftools.mk -PYTHON3_PYELFTOOLS_VERSION = 0.27 -PYTHON3_PYELFTOOLS_SOURCE = pyelftools-$(PYTHON3_PYELFTOOLS_VERSION).tar.gz -PYTHON3_PYELFTOOLS_SITE = https://files.pythonhosted.org/packages/6b/b5/f7022f2d950327ba970ec85fb8f85c79244031092c129b6f34ab17514ae0 -PYTHON3_PYELFTOOLS_LICENSE = Public domain -PYTHON3_PYELFTOOLS_LICENSE_FILES = LICENSE -PYTHON3_PYELFTOOLS_SETUP_TYPE = setuptools -HOST_PYTHON3_PYELFTOOLS_DL_SUBDIR = python-pyelftools -HOST_PYTHON3_PYELFTOOLS_NEEDS_HOST_PYTHON = python3 - -$(eval $(host-python-package)) From peter at korsgaard.com Fri Feb 11 19:07:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 20:07:42 +0100 Subject: [Buildroot] [git commit] package/python3-pycryptodomex: drop host package Message-ID: <20220211190259.287F0825B5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1fc1b258d39b215194b868eb002200871e535595 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Now that host-python2 is gone, the custom python3 variant can be dropped. Signed-off-by: Peter Korsgaard --- boot/optee-os/optee-os.mk | 2 +- package/python-pycryptodomex/python-pycryptodomex.mk | 1 - .../python3-pycryptodomex/python3-pycryptodomex.hash | 1 - .../python3-pycryptodomex/python3-pycryptodomex.mk | 19 ------------------- 4 files changed, 1 insertion(+), 22 deletions(-) diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk index 03ce08ffb2..2884b48513 100644 --- a/boot/optee-os/optee-os.mk +++ b/boot/optee-os/optee-os.mk @@ -21,7 +21,7 @@ else OPTEE_OS_SITE = $(call github,OP-TEE,optee_os,$(OPTEE_OS_VERSION)) endif -OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python3-pycryptodomex host-python3-pyelftools +OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pycryptodomex host-python3-pyelftools # On 64bit targets, OP-TEE OS can be built in 32bit mode, or # can be built in 64bit mode and support 32bit and 64bit diff --git a/package/python-pycryptodomex/python-pycryptodomex.mk b/package/python-pycryptodomex/python-pycryptodomex.mk index 92780327a1..d752122550 100644 --- a/package/python-pycryptodomex/python-pycryptodomex.mk +++ b/package/python-pycryptodomex/python-pycryptodomex.mk @@ -4,7 +4,6 @@ # ################################################################################ -# Please keep in sync with package/python3-pycryptodomex/python3-pycryptodomex.mk PYTHON_PYCRYPTODOMEX_VERSION = 3.13.0 PYTHON_PYCRYPTODOMEX_SOURCE = pycryptodomex-$(PYTHON_PYCRYPTODOMEX_VERSION).tar.gz PYTHON_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/7a/21/f399ba8dfd6e40eee444151af3237af22788b8b16077c75ec0419125f619 diff --git a/package/python3-pycryptodomex/python3-pycryptodomex.hash b/package/python3-pycryptodomex/python3-pycryptodomex.hash deleted file mode 120000 index 0c6761d8a4..0000000000 --- a/package/python3-pycryptodomex/python3-pycryptodomex.hash +++ /dev/null @@ -1 +0,0 @@ -../python-pycryptodomex/python-pycryptodomex.hash \ No newline at end of file diff --git a/package/python3-pycryptodomex/python3-pycryptodomex.mk b/package/python3-pycryptodomex/python3-pycryptodomex.mk deleted file mode 100644 index 06a46cdf63..0000000000 --- a/package/python3-pycryptodomex/python3-pycryptodomex.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# python3-pycryptodomex -# -################################################################################ - -# Please keep in sync with package/python-pycryptodomex/python-pycryptodomex.mk -PYTHON3_PYCRYPTODOMEX_VERSION = 3.13.0 -PYTHON3_PYCRYPTODOMEX_SOURCE = pycryptodomex-$(PYTHON3_PYCRYPTODOMEX_VERSION).tar.gz -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) -PYTHON3_PYCRYPTODOMEX_LICENSE_FILES = LICENSE.rst Doc/LEGAL/COPYRIGHT.pycrypto -HOST_PYTHON3_PYCRYPTODOMEX_DL_SUBDIR = python-pycryptodomex -HOST_PYTHON3_PYCRYPTODOMEX_NEEDS_HOST_PYTHON = python3 - -$(eval $(host-python-package)) From peter at korsgaard.com Fri Feb 11 19:07:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 20:07:08 +0100 Subject: [Buildroot] [git commit] package/python3-psutil: drop host package Message-ID: <20220211190259.1655482DDC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=aab7bc4a1d499b3f926464290eee3d6459d0e816 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Now that host-python2 is gone, the custom python3 variant can be dropped. Signed-off-by: Peter Korsgaard --- package/mongodb/mongodb.mk | 2 +- package/python-psutil/python-psutil.mk | 1 - package/python3-psutil/python3-psutil.hash | 1 - package/python3-psutil/python3-psutil.mk | 19 ------------------- 4 files changed, 1 insertion(+), 22 deletions(-) diff --git a/package/mongodb/mongodb.mk b/package/mongodb/mongodb.mk index 2a5e00be79..e2a58a5f4e 100644 --- a/package/mongodb/mongodb.mk +++ b/package/mongodb/mongodb.mk @@ -17,7 +17,7 @@ MONGODB_SELINUX_MODULES = mongodb MONGODB_DEPENDENCIES = \ boost \ host-python-cheetah \ - host-python3-psutil \ + host-python-psutil \ host-python-pyyaml \ host-python3-regex \ host-python-requests \ diff --git a/package/python-psutil/python-psutil.mk b/package/python-psutil/python-psutil.mk index 3bba7ca343..413fc8a391 100644 --- a/package/python-psutil/python-psutil.mk +++ b/package/python-psutil/python-psutil.mk @@ -4,7 +4,6 @@ # ################################################################################ -# Please keep in sync with package/python3-psutil/python3-psutil.mk PYTHON_PSUTIL_VERSION = 5.8.0 PYTHON_PSUTIL_SOURCE = psutil-$(PYTHON_PSUTIL_VERSION).tar.gz PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/e1/b0/7276de53321c12981717490516b7e612364f2cb372ee8901bd4a66a000d7 diff --git a/package/python3-psutil/python3-psutil.hash b/package/python3-psutil/python3-psutil.hash deleted file mode 120000 index ff688fab28..0000000000 --- a/package/python3-psutil/python3-psutil.hash +++ /dev/null @@ -1 +0,0 @@ -../python-psutil/python-psutil.hash \ No newline at end of file diff --git a/package/python3-psutil/python3-psutil.mk b/package/python3-psutil/python3-psutil.mk deleted file mode 100644 index 1304124f57..0000000000 --- a/package/python3-psutil/python3-psutil.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# python3-psutil -# -################################################################################ - -# Please keep in sync with package/python-psutil/python-psutil.mk -PYTHON3_PSUTIL_VERSION = 5.8.0 -PYTHON3_PSUTIL_SOURCE = psutil-$(PYTHON3_PSUTIL_VERSION).tar.gz -PYTHON3_PSUTIL_SITE = https://files.pythonhosted.org/packages/e1/b0/7276de53321c12981717490516b7e612364f2cb372ee8901bd4a66a000d7 -PYTHON3_PSUTIL_SETUP_TYPE = setuptools -PYTHON3_PSUTIL_LICENSE = BSD-3-Clause -PYTHON3_PSUTIL_LICENSE_FILES = LICENSE -PYTHON3_PSUTIL_CPE_ID_VENDOR = psutil_project -PYTHON3_PSUTIL_CPE_ID_PRODUCT = psutil -HOST_PYTHON3_PSUTIL_DL_SUBDIR = python-psutil -HOST_PYTHON3_PSUTIL_NEEDS_HOST_PYTHON = python3 - -$(eval $(host-python-package)) From peter at korsgaard.com Fri Feb 11 19:07:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 20:07:01 +0100 Subject: [Buildroot] [git commit] package/python3-ply: drop host package Message-ID: <20220211190259.0AEBA825B5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f2b862405abbafd68520f167ccb8b03975dc3aea branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Now that host-python2 is gone, the custom python3 variant can be dropped. Signed-off-by: Peter Korsgaard --- package/libcamera/libcamera.mk | 2 +- package/python-ply/python-ply.mk | 1 - package/python3-ply/python3-ply.hash | 1 - package/python3-ply/python3-ply.mk | 16 ---------------- 4 files changed, 1 insertion(+), 19 deletions(-) diff --git a/package/libcamera/libcamera.mk b/package/libcamera/libcamera.mk index 534d8d2637..7cd4bfa758 100644 --- a/package/libcamera/libcamera.mk +++ b/package/libcamera/libcamera.mk @@ -11,7 +11,7 @@ LIBCAMERA_DEPENDENCIES = \ host-openssl \ host-pkgconf \ host-python-jinja2 \ - host-python3-ply \ + host-python-ply \ host-python-pyyaml \ gnutls LIBCAMERA_CONF_OPTS = \ diff --git a/package/python-ply/python-ply.mk b/package/python-ply/python-ply.mk index 50a3e32bc2..5dc7964d5f 100644 --- a/package/python-ply/python-ply.mk +++ b/package/python-ply/python-ply.mk @@ -4,7 +4,6 @@ # ################################################################################ -# Please keep in sync with package/python3-ply/python3-ply.mk PYTHON_PLY_VERSION = 3.11 PYTHON_PLY_SOURCE = ply-$(PYTHON_PLY_VERSION).tar.gz PYTHON_PLY_SITE = https://files.pythonhosted.org/packages/e5/69/882ee5c9d017149285cab114ebeab373308ef0f874fcdac9beb90e0ac4da diff --git a/package/python3-ply/python3-ply.hash b/package/python3-ply/python3-ply.hash deleted file mode 120000 index 5e07165c93..0000000000 --- a/package/python3-ply/python3-ply.hash +++ /dev/null @@ -1 +0,0 @@ -../python-ply/python-ply.hash \ No newline at end of file diff --git a/package/python3-ply/python3-ply.mk b/package/python3-ply/python3-ply.mk deleted file mode 100644 index 15f66a49db..0000000000 --- a/package/python3-ply/python3-ply.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# python3-ply -# -################################################################################ - -PYTHON3_PLY_VERSION = 3.11 -PYTHON3_PLY_SOURCE = ply-$(PYTHON3_PLY_VERSION).tar.gz -PYTHON3_PLY_SITE = https://files.pythonhosted.org/packages/e5/69/882ee5c9d017149285cab114ebeab373308ef0f874fcdac9beb90e0ac4da -PYTHON3_PLY_SETUP_TYPE = setuptools -PYTHON3_PLY_LICENSE = BSD-3-Clause -PYTHON3_PLY_LICENSE_FILES = README.md - -HOST_PYTHON3_PLY_NEEDS_HOST_PYTHON = python3 - -$(eval $(host-python-package)) From peter at korsgaard.com Fri Feb 11 19:08:14 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 20:08:14 +0100 Subject: [Buildroot] [git commit] package/python3-six: drop host package Message-ID: <20220211190259.52FC9825B5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f4f0e2a63726efe84032c69b4f2b41a883c5e822 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Now that host-python2 is gone, the custom python3 variant can be dropped. Signed-off-by: Peter Korsgaard --- package/gnuradio/gnuradio.mk | 2 +- package/python-six/python-six.mk | 1 - package/python3-six/python3-six.hash | 1 - package/python3-six/python3-six.mk | 17 ----------------- 4 files changed, 1 insertion(+), 20 deletions(-) diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index 417a51e067..49e3b95191 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -15,7 +15,7 @@ GNURADIO_SUPPORTS_IN_SOURCE_BUILD = NO GNURADIO_DEPENDENCIES = \ host-python3 \ host-python-mako \ - host-python3-six \ + host-python-six \ host-swig \ boost \ log4cpp \ diff --git a/package/python-six/python-six.mk b/package/python-six/python-six.mk index 41ef41d0ba..9e3e5fcf50 100644 --- a/package/python-six/python-six.mk +++ b/package/python-six/python-six.mk @@ -4,7 +4,6 @@ # ################################################################################ -# Please keep in sync with package/python3-six/python3-six.mk PYTHON_SIX_VERSION = 1.16.0 PYTHON_SIX_SOURCE = six-$(PYTHON_SIX_VERSION).tar.gz PYTHON_SIX_SITE = https://files.pythonhosted.org/packages/71/39/171f1c67cd00715f190ba0b100d606d440a28c93c7714febeca8b79af85e diff --git a/package/python3-six/python3-six.hash b/package/python3-six/python3-six.hash deleted file mode 120000 index ed8cb89a6b..0000000000 --- a/package/python3-six/python3-six.hash +++ /dev/null @@ -1 +0,0 @@ -../python-six/python-six.hash \ No newline at end of file diff --git a/package/python3-six/python3-six.mk b/package/python3-six/python3-six.mk deleted file mode 100644 index ee9dc818ee..0000000000 --- a/package/python3-six/python3-six.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# python3-six -# -################################################################################ - -# Please keep in sync with package/python-six/python-six.mk -PYTHON3_SIX_VERSION = 1.16.0 -PYTHON3_SIX_SOURCE = six-$(PYTHON3_SIX_VERSION).tar.gz -PYTHON3_SIX_SITE = https://files.pythonhosted.org/packages/71/39/171f1c67cd00715f190ba0b100d606d440a28c93c7714febeca8b79af85e -PYTHON3_SIX_SETUP_TYPE = setuptools -PYTHON3_SIX_LICENSE = MIT -PYTHON3_SIX_LICENSE_FILES = LICENSE -HOST_PYTHON3_SIX_DL_SUBDIR = python-six -HOST_PYTHON3_SIX_NEEDS_HOST_PYTHON = python3 - -$(eval $(host-python-package)) From peter at korsgaard.com Fri Feb 11 19:07:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 20:07:17 +0100 Subject: [Buildroot] [git commit] package/python3-pycparser: drop unused host package Message-ID: <20220211190259.1F9E0825B5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5211de7d789ba8c9eaf649612711a40d02f3eec9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit d9bf97cf16fa6945466a67 (package/python-cryptography: drop host variant) dropped the dependency on host-python3-pycparser, so it is now unused. Drop it. Signed-off-by: Peter Korsgaard --- package/python-pycparser/python-pycparser.mk | 1 - package/python3-pycparser/python3-pycparser.hash | 1 - package/python3-pycparser/python3-pycparser.mk | 17 ----------------- 3 files changed, 19 deletions(-) diff --git a/package/python-pycparser/python-pycparser.mk b/package/python-pycparser/python-pycparser.mk index 20c3f641a9..1737c99a32 100644 --- a/package/python-pycparser/python-pycparser.mk +++ b/package/python-pycparser/python-pycparser.mk @@ -4,7 +4,6 @@ # ################################################################################ -# Please keep in sync with package/python3-pycparser/python3-pycparser.mk PYTHON_PYCPARSER_VERSION = 2.21 PYTHON_PYCPARSER_SOURCE = pycparser-$(PYTHON_PYCPARSER_VERSION).tar.gz PYTHON_PYCPARSER_SITE = https://files.pythonhosted.org/packages/5e/0b/95d387f5f4433cb0f53ff7ad859bd2c6051051cebbb564f139a999ab46de diff --git a/package/python3-pycparser/python3-pycparser.hash b/package/python3-pycparser/python3-pycparser.hash deleted file mode 120000 index 7a1912cad2..0000000000 --- a/package/python3-pycparser/python3-pycparser.hash +++ /dev/null @@ -1 +0,0 @@ -../python-pycparser/python-pycparser.hash \ No newline at end of file diff --git a/package/python3-pycparser/python3-pycparser.mk b/package/python3-pycparser/python3-pycparser.mk deleted file mode 100644 index 4075f4a38f..0000000000 --- a/package/python3-pycparser/python3-pycparser.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# python3-pycparser -# -################################################################################ - -# Please keep in sync with package/python-pycparser/python-pycparser.mk -PYTHON3_PYCPARSER_VERSION = 2.21 -PYTHON3_PYCPARSER_SOURCE = pycparser-$(PYTHON3_PYCPARSER_VERSION).tar.gz -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 -HOST_PYTHON3_PYCPARSER_DL_SUBDIR = python-pycparser -HOST_PYTHON3_PYCPARSER_NEEDS_HOST_PYTHON = python3 - -$(eval $(host-python-package)) From peter at korsgaard.com Fri Feb 11 19:06:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 20:06:44 +0100 Subject: [Buildroot] [git commit] package/python3-cffi: drop unused host package Message-ID: <20220211190258.E2E3F825B5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=caca05020d1e2cc1d9ab9202abab44e13bda73fd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit d9bf97cf16fa6945466a67 (package/python-cryptography: drop host variant) dropped the dependency on host-python3-cffi, so it is now unused. Drop it. Signed-off-by: Peter Korsgaard --- package/python-cffi/python-cffi.mk | 1 - package/python3-cffi/python3-cffi.hash | 1 - package/python3-cffi/python3-cffi.mk | 29 ----------------------------- 3 files changed, 31 deletions(-) diff --git a/package/python-cffi/python-cffi.mk b/package/python-cffi/python-cffi.mk index b14dce8225..83a21cb75a 100644 --- a/package/python-cffi/python-cffi.mk +++ b/package/python-cffi/python-cffi.mk @@ -4,7 +4,6 @@ # ################################################################################ -# Please keep in sync with package/python3-cffi/python3-cffi.mk PYTHON_CFFI_VERSION = 1.15.0 PYTHON_CFFI_SOURCE = cffi-$(PYTHON_CFFI_VERSION).tar.gz PYTHON_CFFI_SITE = https://files.pythonhosted.org/packages/00/9e/92de7e1217ccc3d5f352ba21e52398372525765b2e0c4530e6eb2ba9282a diff --git a/package/python3-cffi/python3-cffi.hash b/package/python3-cffi/python3-cffi.hash deleted file mode 120000 index 1f98d8df9c..0000000000 --- a/package/python3-cffi/python3-cffi.hash +++ /dev/null @@ -1 +0,0 @@ -../python-cffi/python-cffi.hash \ No newline at end of file diff --git a/package/python3-cffi/python3-cffi.mk b/package/python3-cffi/python3-cffi.mk deleted file mode 100644 index 2770eda93e..0000000000 --- a/package/python3-cffi/python3-cffi.mk +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# -# python3-cffi -# -################################################################################ - -# Please keep in sync with package/python-cffi/python-cffi.mk -PYTHON3_CFFI_VERSION = 1.15.0 -PYTHON3_CFFI_SOURCE = cffi-$(PYTHON3_CFFI_VERSION).tar.gz -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 - -# This host package uses pkg-config to find libffi, so we have to -# provide the proper hints for pkg-config to behave properly for host -# packages. -HOST_PYTHON3_CFFI_ENV = \ - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ - PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \ - PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ - PKG_CONFIG_SYSROOT_DIR="/" \ - PKG_CONFIG_LIBDIR="$(HOST_DIR)/lib/pkgconfig:$(HOST_DIR)/share/pkgconfig" -HOST_PYTHON3_CFFI_DEPENDENCIES = host-pkgconf host-python3-pycparser host-libffi - -HOST_PYTHON3_CFFI_DL_SUBDIR = python-cffi -HOST_PYTHON3_CFFI_NEEDS_HOST_PYTHON = python3 - -$(eval $(host-python-package)) From peter at korsgaard.com Fri Feb 11 19:08:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 20:08:03 +0100 Subject: [Buildroot] [git commit] package/python3-regex: drop host package Message-ID: <20220211190259.484B2825B5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2a8cea2ebcadb53d0b7545e9dd489344064d90d5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Now that host-python2 is gone, the custom python3 variant can be dropped and instead host support added to python-regex. Signed-off-by: Peter Korsgaard --- package/mongodb/mongodb.mk | 2 +- package/python-regex/python-regex.mk | 1 + package/python3-regex/python3-regex.hash | 1 - package/python3-regex/python3-regex.mk | 16 ---------------- 4 files changed, 2 insertions(+), 18 deletions(-) diff --git a/package/mongodb/mongodb.mk b/package/mongodb/mongodb.mk index e2a58a5f4e..9f6c7d31b8 100644 --- a/package/mongodb/mongodb.mk +++ b/package/mongodb/mongodb.mk @@ -19,7 +19,7 @@ MONGODB_DEPENDENCIES = \ host-python-cheetah \ host-python-psutil \ host-python-pyyaml \ - host-python3-regex \ + host-python-regex \ host-python-requests \ host-scons \ pcre \ diff --git a/package/python-regex/python-regex.mk b/package/python-regex/python-regex.mk index c46c4d1614..a90fd579ac 100644 --- a/package/python-regex/python-regex.mk +++ b/package/python-regex/python-regex.mk @@ -12,3 +12,4 @@ PYTHON_REGEX_SETUP_TYPE = setuptools PYTHON_REGEX_LICENSE = CNRI-Python $(eval $(python-package)) +$(eval $(host-python-package)) diff --git a/package/python3-regex/python3-regex.hash b/package/python3-regex/python3-regex.hash deleted file mode 120000 index 274f4dc277..0000000000 --- a/package/python3-regex/python3-regex.hash +++ /dev/null @@ -1 +0,0 @@ -../python-regex/python-regex.hash \ No newline at end of file diff --git a/package/python3-regex/python3-regex.mk b/package/python3-regex/python3-regex.mk deleted file mode 100644 index 0b71768e9d..0000000000 --- a/package/python3-regex/python3-regex.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# python3-regex -# -################################################################################ - -# Please keep in sync with package/python-regex/python-regex.mk -PYTHON3_REGEX_VERSION = 2021.4.4 -PYTHON3_REGEX_SOURCE = regex-$(PYTHON3_REGEX_VERSION).tar.gz -PYTHON3_REGEX_SITE = https://files.pythonhosted.org/packages/38/3f/4c42a98c9ad7d08c16e7d23b2194a0e4f3b2914662da8bc88986e4e6de1f -PYTHON3_REGEX_SETUP_TYPE = setuptools -PYTHON3_REGEX_LICENSE = CNRI-Python -HOST_PYTHON3_REGEX_DL_SUBDIR = python-regex -HOST_PYTHON3_REGEX_NEEDS_HOST_PYTHON = python3 - -$(eval $(host-python-package)) From fontaine.fabrice at gmail.com Fri Feb 11 20:31:43 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 11 Feb 2022 21:31:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/lzip: switch to tar.gz tarball Message-ID: <20220211203143.603357-1-fontaine.fabrice@gmail.com> One of the autobuilder seems to have an issue with tar.lz tarball so switch to tar.gz to avoid the following build failure since bump to version 1.23 in commit 4648090a89a2478a4b0fa8cc43a49bc94668622c: tar: This does not look like a tar archive Fixes: - http://autobuild.buildroot.org/results/76d8afa81e478cb4f408292484f67898236ca5a0 Signed-off-by: Fabrice Fontaine --- package/lzip/lzip.hash | 2 +- package/lzip/lzip.mk | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/package/lzip/lzip.hash b/package/lzip/lzip.hash index 5e285a5ad8..48ee8175ca 100644 --- a/package/lzip/lzip.hash +++ b/package/lzip/lzip.hash @@ -1,4 +1,4 @@ # From https://lists.nongnu.org/archive/html/lzip-bug/2022-02/msg00000.html -sha256 ea02b9e6fb25d0e1a1d3ef4fdeb6ab26b931f1ece66fa1cee2983c95215e930a lzip-1.23.tar.lz +sha256 4792c047ddf15ef29d55ba8e68a1a21e0cb7692d87ecdf7204419864582f280d lzip-1.23.tar.gz # Locally calculated sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef COPYING diff --git a/package/lzip/lzip.mk b/package/lzip/lzip.mk index e3cc86b956..31b5750767 100644 --- a/package/lzip/lzip.mk +++ b/package/lzip/lzip.mk @@ -5,7 +5,6 @@ ################################################################################ LZIP_VERSION = 1.23 -LZIP_SOURCE = lzip-$(LZIP_VERSION).tar.lz LZIP_SITE = http://download.savannah.gnu.org/releases/lzip LZIP_LICENSE = GPL-2.0+ LZIP_LICENSE_FILES = COPYING -- 2.34.1 From fontaine.fabrice at gmail.com Fri Feb 11 20:35:44 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 11 Feb 2022 21:35:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pyrex: drop package Message-ID: <20220211203544.603682-1-fontaine.fabrice@gmail.com> Drop package which is not used by anyone and can't be built since drop of host-python in commit 2743ce00ca61fde1537b64a165a69d497052be58 Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine --- DEVELOPERS | 1 - package/python-pyrex/python-pyrex.hash | 3 --- package/python-pyrex/python-pyrex.mk | 15 --------------- 3 files changed, 19 deletions(-) delete mode 100644 package/python-pyrex/python-pyrex.hash delete mode 100644 package/python-pyrex/python-pyrex.mk diff --git a/DEVELOPERS b/DEVELOPERS index 0e759bc168..eb073c41f1 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1934,7 +1934,6 @@ F: package/python-ipy/ F: package/python-iwlib/ F: package/python-posix-ipc/ F: package/python-pycairo/ -F: package/python-pyrex/ F: package/python-pysftp/ F: package/python-tinyrpc/ F: package/python-txdbus/ diff --git a/package/python-pyrex/python-pyrex.hash b/package/python-pyrex/python-pyrex.hash deleted file mode 100644 index e8963558fc..0000000000 --- a/package/python-pyrex/python-pyrex.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 5f87df06831d0b3412eb4bc9d3fc2ee7bfae1b913d7da8c23ab2bf5699fb6b50 Pyrex-0.9.9.tar.gz -sha256 5c1aec55fc8c399ec23968ddb2117eec8f7a53f002c15472a8b0aa7426790700 LICENSE.txt diff --git a/package/python-pyrex/python-pyrex.mk b/package/python-pyrex/python-pyrex.mk deleted file mode 100644 index 6284a5f228..0000000000 --- a/package/python-pyrex/python-pyrex.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# python-pyrex -# -################################################################################ - -PYTHON_PYREX_VERSION = 0.9.9 -PYTHON_PYREX_SOURCE = Pyrex-$(PYTHON_PYREX_VERSION).tar.gz -PYTHON_PYREX_SITE = http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex -PYTHON_PYREX_LICENSE = Apache-2.0 -PYTHON_PYREX_LICENSE_FILES = LICENSE.txt -PYTHON_PYREX_SETUP_TYPE = distutils -HOST_PYTHON_PYREX_NEEDS_HOST_PYTHON = python2 - -$(eval $(host-python-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Fri Feb 11 21:12:07 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 11 Feb 2022 22:12:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/gstreamer1/gst1-plugins-base: fix build with gcc 4.8 Message-ID: <20220211211207.762485-1-fontaine.fabrice@gmail.com> Fix the following build failure with gcc 4.8 raised since bump to version 1.20.0 in commit 801131157dcef2c97e947a1d3e8c9bfa7aa3d870: ../gst-libs/gst/video/video-converter.c: In function 'convert_I420_v210': ../gst-libs/gst/video/video-converter.c:3771:7: error: 'for' loop initial declarations are only allowed in C99 mode for (int j = width * 4 - 1; j >= 0; j--) { ^ Fixes: - http://autobuild.buildroot.org/results/c4b1449f35debcbabff7e42abe239695d4ad4d21 Signed-off-by: Fabrice Fontaine --- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk index 68281738fa..08aac850cd 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk @@ -11,6 +11,8 @@ GST1_PLUGINS_BASE_INSTALL_STAGING = YES GST1_PLUGINS_BASE_LICENSE_FILES = COPYING GST1_PLUGINS_BASE_LICENSE = LGPL-2.1+ +GST1_PLUGINS_BASE_CFLAGS = $(TARGET_CFLAGS) -std=gnu99 + GST1_PLUGINS_BASE_CONF_OPTS = \ -Dexamples=disabled \ -Dtests=disabled \ -- 2.34.1 From peter at korsgaard.com Fri Feb 11 22:26:12 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 23:26:12 +0100 Subject: [Buildroot] [PATCH] package/casync: fix zstd dependency to correct package name In-Reply-To: ("Nuno =?utf-8?Q?Gon=C3=A7alves=22's?= message of "Fri, 11 Feb 2022 18:22:03 +0000") References: Message-ID: <877da1oxa3.fsf@dell.be.48ers.dk> >>>>> "Nuno" == Nuno Gon?alves writes: > Signed-off-by: Nuno Goncalves Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 11 22:27:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 23:27:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/lzip: switch to tar.gz tarball In-Reply-To: <20220211203143.603357-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 11 Feb 2022 21:31:43 +0100") References: <20220211203143.603357-1-fontaine.fabrice@gmail.com> Message-ID: <8735kpox86.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > One of the autobuilder seems to have an issue with tar.lz tarball so > switch to tar.gz to avoid the following build failure since bump to > version 1.23 in commit 4648090a89a2478a4b0fa8cc43a49bc94668622c: > tar: This does not look like a tar archive > Fixes: > - http://autobuild.buildroot.org/results/76d8afa81e478cb4f408292484f67898236ca5a0 > Signed-off-by: Fabrice Fontaine This is already fixed by https://git.buildroot.net/buildroot/commit/?id=618c5f7671643516432c1ec6b9f7b203313763a7 so I have marked it as superseeded. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 11 22:26:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 23:26:01 +0100 Subject: [Buildroot] [git commit] package/casync: fix zstd dependency to correct package name Message-ID: <20220211222017.0DC4C82DDC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=807bf505f42997f98f8acb7c7046ca5f97df08bb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Nuno Goncalves Signed-off-by: Peter Korsgaard --- package/casync/casync.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/casync/casync.mk b/package/casync/casync.mk index d74cb1bfe8..bb9bd8ccac 100644 --- a/package/casync/casync.mk +++ b/package/casync/casync.mk @@ -40,8 +40,8 @@ else CASYNC_CONF_OPTS += -Dudev=false endif -ifeq ($(BR2_PACKAGE_LIBZSTD),y) -CASYNC_DEPENDENCIES += libzstd +ifeq ($(BR2_PACKAGE_ZSTD),y) +CASYNC_DEPENDENCIES += zstd CASYNC_CONF_OPTS += -Dlibzstd=enabled else CASYNC_CONF_OPTS += -Dlibzstd=disabled From peter at korsgaard.com Fri Feb 11 22:41:52 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 23:41:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pyrex: drop package In-Reply-To: <20220211203544.603682-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 11 Feb 2022 21:35:44 +0100") References: <20220211203544.603682-1-fontaine.fabrice@gmail.com> Message-ID: <87y22hnhzj.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Drop package which is not used by anyone and can't be built since drop > of host-python in commit 2743ce00ca61fde1537b64a165a69d497052be58 > Fixes: > - No autobuilder failures (yet) > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 11 22:41:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 23:41:22 +0100 Subject: [Buildroot] [git commit] package/python-pyrex: drop package Message-ID: <20220211223443.3A77B82B88@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c26eab78ab17bcc507b28a7e9eb70a08ffe88ef3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop package which is not used by anyone and can't be built since drop of host-python in commit 2743ce00ca61fde1537b64a165a69d497052be58 Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 - package/python-pyrex/python-pyrex.hash | 3 --- package/python-pyrex/python-pyrex.mk | 15 --------------- 3 files changed, 19 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 0e759bc168..eb073c41f1 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1934,7 +1934,6 @@ F: package/python-ipy/ F: package/python-iwlib/ F: package/python-posix-ipc/ F: package/python-pycairo/ -F: package/python-pyrex/ F: package/python-pysftp/ F: package/python-tinyrpc/ F: package/python-txdbus/ diff --git a/package/python-pyrex/python-pyrex.hash b/package/python-pyrex/python-pyrex.hash deleted file mode 100644 index e8963558fc..0000000000 --- a/package/python-pyrex/python-pyrex.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 5f87df06831d0b3412eb4bc9d3fc2ee7bfae1b913d7da8c23ab2bf5699fb6b50 Pyrex-0.9.9.tar.gz -sha256 5c1aec55fc8c399ec23968ddb2117eec8f7a53f002c15472a8b0aa7426790700 LICENSE.txt diff --git a/package/python-pyrex/python-pyrex.mk b/package/python-pyrex/python-pyrex.mk deleted file mode 100644 index 6284a5f228..0000000000 --- a/package/python-pyrex/python-pyrex.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# python-pyrex -# -################################################################################ - -PYTHON_PYREX_VERSION = 0.9.9 -PYTHON_PYREX_SOURCE = Pyrex-$(PYTHON_PYREX_VERSION).tar.gz -PYTHON_PYREX_SITE = http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex -PYTHON_PYREX_LICENSE = Apache-2.0 -PYTHON_PYREX_LICENSE_FILES = LICENSE.txt -PYTHON_PYREX_SETUP_TYPE = distutils -HOST_PYTHON_PYREX_NEEDS_HOST_PYTHON = python2 - -$(eval $(host-python-package)) From james.hilliard1 at gmail.com Sat Feb 12 05:42:27 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 11 Feb 2022 22:42:27 -0700 Subject: [Buildroot] [PATCH 1/1] package/pkg-python: drop python2 host/setuptools support Message-ID: <20220212054227.1207008-1-james.hilliard1@gmail.com> Drop conditonal python version handling now that python2 has been removed. Remove python3-setuptools and replace usage with python3 only python-setuptools. Signed-off-by: James Hilliard --- package/libapparmor/libapparmor.mk | 2 +- package/libiio/libiio.mk | 2 +- package/lirc-tools/lirc-tools.mk | 2 +- package/pkg-python.mk | 66 +---------------- .../{60.7.0 => }/0001-add-executable.patch | 0 .../44.0.0/0001-add-executable.patch | 72 ------------------- .../44.0.0/python-setuptools.hash | 4 -- .../{60.7.0 => }/python-setuptools.hash | 0 .../python-setuptools/python-setuptools.mk | 17 +---- .../0001-add-executable.patch | 1 - .../python3-setuptools.hash | 1 - .../python3-setuptools/python3-setuptools.mk | 20 ------ 12 files changed, 6 insertions(+), 181 deletions(-) rename package/python-setuptools/{60.7.0 => }/0001-add-executable.patch (100%) delete mode 100644 package/python-setuptools/44.0.0/0001-add-executable.patch delete mode 100644 package/python-setuptools/44.0.0/python-setuptools.hash rename package/python-setuptools/{60.7.0 => }/python-setuptools.hash (100%) delete mode 120000 package/python3-setuptools/0001-add-executable.patch delete mode 120000 package/python3-setuptools/python3-setuptools.hash delete mode 100644 package/python3-setuptools/python3-setuptools.mk diff --git a/package/libapparmor/libapparmor.mk b/package/libapparmor/libapparmor.mk index f3d744e3e7..7bb849ab94 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-python3-setuptools host-swig python3 +LIBAPPARMOR_DEPENDENCIES += host-python3 host-python-setuptools host-swig python3 LIBAPPARMOR_CONF_OPTS += \ --with-python \ PYTHON=$(HOST_DIR)/usr/bin/python3 \ diff --git a/package/libiio/libiio.mk b/package/libiio/libiio.mk index 48e2f385e3..9464a44ae7 100644 --- a/package/libiio/libiio.mk +++ b/package/libiio/libiio.mk @@ -73,7 +73,7 @@ LIBIIO_CONF_OPTS += -DHAVE_DNS_SD=OFF endif ifeq ($(BR2_PACKAGE_LIBIIO_BINDINGS_PYTHON),y) -LIBIIO_DEPENDENCIES += host-python3-setuptools python3 +LIBIIO_DEPENDENCIES += host-python-setuptools python3 LIBIIO_CONF_OPTS += \ -DPYTHON_BINDINGS=ON -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 diff --git a/package/lirc-tools/lirc-tools.mk b/package/lirc-tools/lirc-tools.mk index 27aa5b97cc..05f20f5726 100644 --- a/package/lirc-tools/lirc-tools.mk +++ b/package/lirc-tools/lirc-tools.mk @@ -47,7 +47,7 @@ LIRC_TOOLS_DEPENDENCIES += libftdi1 endif ifeq ($(BR2_PACKAGE_PYTHON3),y) -LIRC_TOOLS_DEPENDENCIES += python3 host-python3-setuptools +LIRC_TOOLS_DEPENDENCIES += python3 host-python-setuptools LIRC_TOOLS_MAKE_ENV += SETUPTOOLS_ENV='$(PKG_PYTHON_SETUPTOOLS_ENV)' endif diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 00bdb9150a..bf0649fc9c 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -150,86 +150,24 @@ endif # Target packages need both the python interpreter on the target (for # runtime) and the python interpreter on the host (for # compilation). However, host packages only need the python -# interpreter on the host, whose version may be enforced by setting -# the *_NEEDS_HOST_PYTHON variable. -# -# So: -# - 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 use the default -# interpreter; -# - otherwise, we depend on the one requested by *_NEEDS_HOST_PYTHON. +# interpreter on the host. # ifeq ($(4),target) -$(2)_DEPENDENCIES += $$(if $$(BR2_PACKAGE_PYTHON3),host-python3 python3,host-python python) -else -ifeq ($$($(2)_NEEDS_HOST_PYTHON),) -$(2)_DEPENDENCIES += $$(if $$(BR2_PACKAGE_PYTHON3),host-python3,host-python) +$(2)_DEPENDENCIES += host-python3 python3 else -ifeq ($$($(2)_NEEDS_HOST_PYTHON),python2) -$(2)_DEPENDENCIES += host-python -else ifeq ($$($(2)_NEEDS_HOST_PYTHON),python3) $(2)_DEPENDENCIES += host-python3 -else -$$(error Incorrect value '$$($(2)_NEEDS_HOST_PYTHON)' for $(2)_NEEDS_HOST_PYTHON) -endif -endif # ($$($(2)_NEEDS_HOST_PYTHON),) endif # ($(4),target) # Setuptools based packages will need setuptools for the host Python # interpreter (both host and target). # -# If we have a host package that says "I need Python 3", we install -# setuptools for python3. -# -# If we have a host packge that says "I need Python 2", we install -# setuptools for python2. -# -# If we have a target package, or a host package that doesn't have any -# _NEEDS_HOST_PYTHON, and BR2_PACKAGE_PYTHON3 is used, then -# Python 3.x is the default Python interpreter, so we install -# setuptools for python3. -# -# In all other cases, we install setuptools for python2. Those other -# cases are: a target package or host package with -# BR2_PACKAGE_PYTHON=y, or a host-package with neither -# BR2_PACKAGE_PYTHON3=y or BR2_PACKAGE_PYTHON=y. ifeq ($$($(2)_SETUP_TYPE),setuptools) -ifeq ($(4):$$($(2)_NEEDS_HOST_PYTHON),host:python3) -$(2)_DEPENDENCIES += $$(if $$(filter host-python3-setuptools,$(1)),,host-python3-setuptools) -else ifeq ($(4):$$($(2)_NEEDS_HOST_PYTHON),host:python2) -$(2)_DEPENDENCIES += $$(if $$(filter host-python-setuptools,$(1)),,host-python-setuptools) -else ifeq ($$(BR2_PACKAGE_PYTHON3),y) -$(2)_DEPENDENCIES += $$(if $$(filter host-python3-setuptools,$(1)),,host-python3-setuptools) -else $(2)_DEPENDENCIES += $$(if $$(filter host-python-setuptools,$(1)),,host-python-setuptools) -endif endif # SETUP_TYPE # Python interpreter to use for building the package. # -# We may want to specify the python interpreter to be used for building a -# package, especially for host-packages (target packages must be built using -# the same version of the interpreter as the one installed on the target). -# -# So: -# - 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 the default -# interpreter; -# - otherwise, we use the one requested by *_NEEDS_HOST_PYTHON. -# -ifeq ($(4),target) $(2)_PYTHON_INTERPRETER = $$(HOST_DIR)/bin/python -else -ifeq ($$($(2)_NEEDS_HOST_PYTHON),) -$(2)_PYTHON_INTERPRETER = $$(HOST_DIR)/bin/python -else -$(2)_PYTHON_INTERPRETER = $$(HOST_DIR)/bin/$$($(2)_NEEDS_HOST_PYTHON) -endif -endif # # Build step. Only define it if not already defined by the package .mk diff --git a/package/python-setuptools/60.7.0/0001-add-executable.patch b/package/python-setuptools/0001-add-executable.patch similarity index 100% rename from package/python-setuptools/60.7.0/0001-add-executable.patch rename to package/python-setuptools/0001-add-executable.patch diff --git a/package/python-setuptools/44.0.0/0001-add-executable.patch b/package/python-setuptools/44.0.0/0001-add-executable.patch deleted file mode 100644 index 8a59f5a4d8..0000000000 --- a/package/python-setuptools/44.0.0/0001-add-executable.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 9b3d307f8f6a1af88f3f810f5a6cf0835830e1e8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Mon, 7 Dec 2015 01:14:33 +0100 -Subject: [PATCH] add executable -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Add a new --executable option to distribute so that we can -force the shebang line in installed python scripts. - -[Thomas: refresh for setuptools 5.8.] -[J?rg: refresh for setuptools 18.7.1] - -Signed-off-by: Gustavo Zacarias -Signed-off-by: Thomas Petazzoni -Signed-off-by: J?rg Krause ---- - setuptools/command/install.py | 2 ++ - setuptools/command/install_scripts.py | 9 +++++++++ - 2 files changed, 11 insertions(+) - -diff --git a/setuptools/command/install.py b/setuptools/command/install.py -index d2bca2e..b60ef19 100644 ---- a/setuptools/command/install.py -+++ b/setuptools/command/install.py -@@ -16,6 +16,7 @@ class install(orig.install): - """Use easy_install to install the package, w/dependencies""" - - user_options = orig.install.user_options + [ -+ ('executable=', 'e', "specify final destination interpreter path"), - ('old-and-unmanageable', None, "Try not to use this!"), - ('single-version-externally-managed', None, - "used by system package builders to create 'flat' eggs"), -@@ -31,6 +32,7 @@ class install(orig.install): - - def initialize_options(self): - orig.install.initialize_options(self) -+ self.executable = None - self.old_and_unmanageable = None - self.single_version_externally_managed = None - -diff --git a/setuptools/command/install_scripts.py b/setuptools/command/install_scripts.py -index be66cb2..07afaf8 100755 ---- a/setuptools/command/install_scripts.py -+++ b/setuptools/command/install_scripts.py -@@ -11,6 +11,13 @@ class install_scripts(orig.install_scripts): - def initialize_options(self): - orig.install_scripts.initialize_options(self) - self.no_ep = False -+ self.executable = None -+ -+ def finalize_options(self): -+ orig.install_scripts.finalize_options(self) -+ self.set_undefined_options('install', -+ ('executable','executable') -+ ) - - def run(self): - import setuptools.command.easy_install as ei -@@ -31,6 +38,8 @@ class install_scripts(orig.install_scripts): - ) - bs_cmd = self.get_finalized_command('build_scripts') - exec_param = getattr(bs_cmd, 'executable', None) -+ if self.executable is not None: -+ exec_param = self.executable - bw_cmd = self.get_finalized_command("bdist_wininst") - is_wininst = getattr(bw_cmd, '_is_running', False) - writer = ei.ScriptWriter --- -2.6.3 - diff --git a/package/python-setuptools/44.0.0/python-setuptools.hash b/package/python-setuptools/44.0.0/python-setuptools.hash deleted file mode 100644 index 769b68c35d..0000000000 --- a/package/python-setuptools/44.0.0/python-setuptools.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From https://pypi.org/pypi/setuptools/json -md5 32b6cdce670ce462086d246bea181e9d setuptools-44.0.0.zip -sha256 e5baf7723e5bb8382fc146e33032b241efc63314211a3a120aaa55d62d2bb008 setuptools-44.0.0.zip -sha256 c32a3ac395af6321efd28be73d06a00f0db6ab887d1c21d4fec46128d2056d5a LICENSE diff --git a/package/python-setuptools/60.7.0/python-setuptools.hash b/package/python-setuptools/python-setuptools.hash similarity index 100% rename from package/python-setuptools/60.7.0/python-setuptools.hash rename to package/python-setuptools/python-setuptools.hash diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk index 04b872fb79..584f83f7a0 100644 --- a/package/python-setuptools/python-setuptools.mk +++ b/package/python-setuptools/python-setuptools.mk @@ -4,29 +4,14 @@ # ################################################################################ -# Please keep in sync with -# package/python3-setuptools/python3-setuptools.mk PYTHON_SETUPTOOLS_VERSION = 60.7.0 -PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON3_SETUPTOOLS_VERSION).tar.gz +PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).tar.gz PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/29/dd/48d662bb93e5e51e72265ef612f869947d4ae4126328d7156824cd50d440 - -# The host variant is only for Python 2.x, so we need to use 44.0.0. -HOST_PYTHON_SETUPTOOLS_VERSION = 44.0.0 -HOST_PYTHON_SETUPTOOLS_SOURCE = setuptools-$(HOST_PYTHON_SETUPTOOLS_VERSION).zip -HOST_PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/b0/f3/44da7482ac6da3f36f68e253cb04de37365b3dba9036a3c70773b778b485 -HOST_PYTHON_SETUPTOOLS_NEEDS_HOST_PYTHON = python2 - PYTHON_SETUPTOOLS_LICENSE = MIT PYTHON_SETUPTOOLS_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_CPE_ID_VENDOR = python PYTHON_SETUPTOOLS_CPE_ID_PRODUCT = setuptools PYTHON_SETUPTOOLS_SETUP_TYPE = setuptools -define HOST_PYTHON_SETUPTOOLS_EXTRACT_CMDS - $(UNZIP) -d $(@D) $(HOST_PYTHON_SETUPTOOLS_DL_DIR)/$(HOST_PYTHON_SETUPTOOLS_SOURCE) - mv $(@D)/setuptools-$(HOST_PYTHON_SETUPTOOLS_VERSION)/* $(@D) - $(RM) -r $(@D)/setuptools-$(HOST_PYTHON_SETUPTOOLS_VERSION) -endef - $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python3-setuptools/0001-add-executable.patch b/package/python3-setuptools/0001-add-executable.patch deleted file mode 120000 index 46b5935d33..0000000000 --- a/package/python3-setuptools/0001-add-executable.patch +++ /dev/null @@ -1 +0,0 @@ -../python-setuptools/60.7.0/0001-add-executable.patch \ No newline at end of file diff --git a/package/python3-setuptools/python3-setuptools.hash b/package/python3-setuptools/python3-setuptools.hash deleted file mode 120000 index 2c9d3614d5..0000000000 --- a/package/python3-setuptools/python3-setuptools.hash +++ /dev/null @@ -1 +0,0 @@ -../python-setuptools/60.7.0/python-setuptools.hash \ No newline at end of file diff --git a/package/python3-setuptools/python3-setuptools.mk b/package/python3-setuptools/python3-setuptools.mk deleted file mode 100644 index d5aaa01918..0000000000 --- a/package/python3-setuptools/python3-setuptools.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# python3-setuptools -# -################################################################################ - -# Please keep in sync with -# package/python-setuptools/python-setuptools.mk -PYTHON3_SETUPTOOLS_VERSION = 60.7.0 -PYTHON3_SETUPTOOLS_SOURCE = setuptools-$(PYTHON3_SETUPTOOLS_VERSION).tar.gz -PYTHON3_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/29/dd/48d662bb93e5e51e72265ef612f869947d4ae4126328d7156824cd50d440 -PYTHON3_SETUPTOOLS_LICENSE = MIT -PYTHON3_SETUPTOOLS_LICENSE_FILES = LICENSE -PYTHON3_SETUPTOOLS_CPE_ID_VENDOR = python -PYTHON3_SETUPTOOLS_CPE_ID_PRODUCT = setuptools -PYTHON3_SETUPTOOLS_SETUP_TYPE = setuptools -HOST_PYTHON3_SETUPTOOLS_DL_SUBDIR = python-setuptools -HOST_PYTHON3_SETUPTOOLS_NEEDS_HOST_PYTHON = python3 - -$(eval $(host-python-package)) -- 2.25.1 From bernd.kuhls at t-online.de Sat Feb 12 06:22:20 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 12 Feb 2022 07:22:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/xmrig: bump version to 6.16.4 Message-ID: <20220212062220.611561-1-bernd.kuhls@t-online.de> 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 36b0c8c8a1..ff5f80a67b 100644 --- a/package/xmrig/xmrig.hash +++ b/package/xmrig/xmrig.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d413b6a20a0ce30410388d330e1056715333e0863165369668dda596766e9d5b xmrig-6.16.3.tar.gz +sha256 245ba47a6b8ae8e9a9df1c055e90f22f944a7d1219416cb30268881d0c0d377b xmrig-6.16.4.tar.gz sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE diff --git a/package/xmrig/xmrig.mk b/package/xmrig/xmrig.mk index 7fa638a54c..1feab499fc 100644 --- a/package/xmrig/xmrig.mk +++ b/package/xmrig/xmrig.mk @@ -4,7 +4,7 @@ # ################################################################################ -XMRIG_VERSION = 6.16.3 +XMRIG_VERSION = 6.16.4 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 Sat Feb 12 08:02:33 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 12 Feb 2022 08:02:33 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-02-11 Message-ID: <20220212080238.E802C83E96@smtp1.osuosl.org> Hello, Autobuild statistics for 2022-02-11 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 54 | 8 | 0 | 62 | 2021.11.x | 19 | 1 | 0 | 20 | master | 26 | 60 | 0 | 86 | Classification of failures by reason for master ----------------------------------------------- host-lzip-1.23 | 18 bluez5_utils-5.63 | 7 host-cxxtest-4.4 | 5 host-python-greenlet-1.1.2 | 4 host-python-six-1.16.0 | 4 gst1-plugins-base-1.20.0 | 2 host-bmap-tools-3.6 | 2 host-grpc-1.43.0 | 2 host-python-cython-0.29.27 | 2 host-python-docutils-0.15.2 | 2 host-python-pycryptodomex-3... | 2 bat-0.19.0 | 1 frr-8.1 | 1 gerbera-1.9.2 | 1 google-breakpad-7515ab13768... | 1 host-python-lxml-4.6.5 | 1 host-python-xlrd-2.0.1 | 1 mpdecimal-2.5.1 | 1 python-docutils-0.15.2 | 1 target-finalize | 1 unknown | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | bat-0.19.0 | NOK | http://autobuild.buildroot.net/results/233c48db483d771ec79433f7d8c956757619c29b | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/b514a5d49ceeba7d87191e80fd9e790e2331a688 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/decb0e0fd5234d339ef1f2a6083b5ae5eb16f9ab | powerpc | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/731da7effd1a6f09d2d930518b25deb5b698d91a | nios2 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/7b5361d9e0160db8c1c42202c2f819c88b9ed712 | i586 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/9e6c817ed1294b32704d302150210e2d18380db4 | riscv64 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/bce5cdd062f8ed00dadc209f50eab44a49d196e7 | riscv64 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/25ca25c5ac0422fb31f1506744c1081da6220d36 | nios2 | frr-8.1 | NOK | http://autobuild.buildroot.net/results/9ea759fc4177cc70c650d79fabe3e439dc5d0a9d | arc | gerbera-1.9.2 | NOK | http://autobuild.buildroot.net/results/0606c01f099f3d44d9e4d6c9dc2edf2afb2d7a72 | mipsel | google-breakpad-7515ab13768... | NOK | http://autobuild.buildroot.net/results/0b2dc409a8d9c0f30563c14654f1bbbdd39926e4 | arm | gst1-plugins-base-1.20.0 | NOK | http://autobuild.buildroot.net/results/c4b1449f35debcbabff7e42abe239695d4ad4d21 | ORPH arm | gst1-plugins-base-1.20.0 | NOK | http://autobuild.buildroot.net/results/4d4f6533e275f3f420221424d49efe1106b79248 | ORPH x86_64 | host-bmap-tools-3.6 | NOK | http://autobuild.buildroot.net/results/d99c4c6824244085941ba1b8b8a19428893adbbf | m68k | host-bmap-tools-3.6 | NOK | http://autobuild.buildroot.net/results/3dde991f3fc971ef7db888ba9e9731092f2fdd04 | m68k | host-cxxtest-4.4 | NOK | http://autobuild.buildroot.net/results/d4f4f272788fb7b2a50df4aed1cae56fef3cf7e6 | powerpc64 | host-cxxtest-4.4 | NOK | http://autobuild.buildroot.net/results/1f504875be72d5bbc8c2d181eeddb5b0ed19519b | arm | host-cxxtest-4.4 | NOK | http://autobuild.buildroot.net/results/d4e450a75fa6673003a4f50d8effc4b23f62bac8 | mipsel | host-cxxtest-4.4 | NOK | http://autobuild.buildroot.net/results/0e6f0e8f9902bfbf98b1db88c61df70cfc022868 | i686 | host-cxxtest-4.4 | NOK | http://autobuild.buildroot.net/results/a70fa6f9a8829cc86d7e1fdcbecb97e451a564ba | riscv64 | host-grpc-1.43.0 | NOK | http://autobuild.buildroot.net/results/c4a3b10cfbdb781136ec22915fe11df2c65e4ad3 | i686 | host-grpc-1.43.0 | NOK | http://autobuild.buildroot.net/results/9355d10fb99f197248a5f5825f1b2c661f89fb20 | sparc64 | host-lzip-1.23 | NOK | http://autobuild.buildroot.net/results/4ac1de927d4b988c6b9b1d51e3a06c37f33109eb | ORPH microblazeel | host-lzip-1.23 | NOK | http://autobuild.buildroot.net/results/291bded53473f87f604e054b1473aac1e0080327 | ORPH arm | host-lzip-1.23 | NOK | http://autobuild.buildroot.net/results/59c517407f890de89916b0c5b01d217f2bac88ef | ORPH arm | host-lzip-1.23 | NOK | http://autobuild.buildroot.net/results/1ebc53a1c1307567b31cc08d0e542d68f09fdd20 | ORPH arm | host-lzip-1.23 | NOK | http://autobuild.buildroot.net/results/afe026f053a9f8184ba0346d994f8dbad8e96c19 | ORPH arm | host-lzip-1.23 | NOK | http://autobuild.buildroot.net/results/fe27629126d383eded056a8808778d2f6d3661f6 | ORPH arm | host-lzip-1.23 | NOK | http://autobuild.buildroot.net/results/76d8afa81e478cb4f408292484f67898236ca5a0 | ORPH riscv64 | host-lzip-1.23 | NOK | http://autobuild.buildroot.net/results/feaad6b96bd4083bd42c4ceb46831d8adabca7ca | ORPH sparc | host-lzip-1.23 | NOK | http://autobuild.buildroot.net/results/c5f90590e95d71d4df893c90d31ca0567337602d | ORPH mips64el | host-lzip-1.23 | NOK | http://autobuild.buildroot.net/results/9f1377daa4682d8881048819222158e4d402324d | ORPH riscv64 | host-lzip-1.23 | NOK | http://autobuild.buildroot.net/results/bc2c91f1020b124aee972e357a4ea36302c0f236 | ORPH arm | host-lzip-1.23 | NOK | http://autobuild.buildroot.net/results/8c587a9b122a6be4cf2d072b6f4f8d1ea0a2e559 | ORPH riscv64 | host-lzip-1.23 | NOK | http://autobuild.buildroot.net/results/d1512d274fe36a77c87844714edb28c333d711d1 | ORPH mips64el | host-lzip-1.23 | NOK | http://autobuild.buildroot.net/results/289caf01c243a4fe5427db81e132161e8fab3721 | ORPH m68k | host-lzip-1.23 | NOK | http://autobuild.buildroot.net/results/61afee5b7f1250ce1540a4128a6c0dceec5349eb | ORPH riscv64 | host-lzip-1.23 | NOK | http://autobuild.buildroot.net/results/1abfe907c4cab333f9b40a9c3fe0b4ab969a850d | ORPH mips64el | host-lzip-1.23 | NOK | http://autobuild.buildroot.net/results/cf5a59b0322e9fe359ef2053370840944e222b26 | ORPH arc | host-lzip-1.23 | NOK | http://autobuild.buildroot.net/results/49b598458fcfd20f3d185f57019dc2225c8f6ced | ORPH nds32le | host-python-cython-0.29.27 | NOK | http://autobuild.buildroot.net/results/f9c7da94e38ea83f4db37de3862d7685fcfef514 | arm | host-python-cython-0.29.27 | NOK | http://autobuild.buildroot.net/results/8b405edb03e0e869ffec2d95a54b97dc1bd5fa4c | riscv64 | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/937ccd09532ff966c070da7fdb863a742d115b86 | x86_64 | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/c2f9a8a2d0d7c29695ae94106f5684def2a52a63 | arc | host-python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/5f2f334b7a93da7213f7535410ac2bc7eb161449 | riscv32 | host-python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/df691de7749b5e998ee824c67eff46885a83b4c8 | arm | host-python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/c90060446e8f73c9bc510fb27626fb309ae4ada1 | arm | host-python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/f012d6c16e518ffc9e3a784d0a9486058463e8f6 | microblazeel | host-python-lxml-4.6.5 | NOK | http://autobuild.buildroot.net/results/7a54e772510b0b407243599c69de7aa4b10943de | arm | host-python-pycryptodomex-3... | NOK | http://autobuild.buildroot.net/results/1255ad0d0cbcd7048221643b8d2388edb2fdef74 | riscv64 | host-python-pycryptodomex-3... | NOK | http://autobuild.buildroot.net/results/56ff2c33aa0e36e7a9bf3e3fe83de149493c1cd4 | arc | host-python-six-1.16.0 | NOK | http://autobuild.buildroot.net/results/da51646656640c0ae7a18097212b48790065406f | arm | host-python-six-1.16.0 | NOK | http://autobuild.buildroot.net/results/97e36712c5138552778149f5ebf91f63e533047e | riscv64 | host-python-six-1.16.0 | NOK | http://autobuild.buildroot.net/results/fb9e8d595f66f33d9bc9365f8eba6abd16e31afb | riscv64 | host-python-six-1.16.0 | NOK | http://autobuild.buildroot.net/results/79e0e8e12420a5fb98144e44805581b643f238c9 | arm | host-python-xlrd-2.0.1 | NOK | http://autobuild.buildroot.net/results/8806c24202a81dab011a45011afb0956c1871e7b | arm | mpdecimal-2.5.1 | NOK | http://autobuild.buildroot.net/results/38174e993635677a63061e97993e5eee8645cc32 | or1k | python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/ed3e196841c1d02787f7fa102cd52456e09d58fd | arm | target-finalize | NOK | http://autobuild.buildroot.net/results/46a9750de4b98be96a480231acf9ca15b86d64bd | arm | unknown | NOK | http://autobuild.buildroot.net/results/590e256491926126388121fc5062721569149041 | Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 3 monkey-f54856ce250c4e257354... | 2 gerbera-1.6.4 | 1 unknown | 1 zeromq-4.3.4 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- riscv64 | gerbera-1.6.4 | NOK | http://autobuild.buildroot.net/results/737def3cb23c2e802ddc0a3a36cf0543f4d67583 | riscv64 | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/0ed9ab091a22a7b2135e06d25001ebe3c662fa96 | powerpc | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/01cfdf1c3cdadb6055bd477c5ccdf9f5a52e8bd1 | arc | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/7f35f70f00539110cb6b825565e6005f7041c018 | arm | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/376dc3a093dc2c63e571462ae82139aaa3e32cb4 | powerpc64le | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/c8aa7278008745b462c00d4e44bc49e6973da11b | riscv64 | unknown | NOK | http://autobuild.buildroot.net/results/ee582b3937cbbfb83d25146caa5b763acffb771b | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/1d2d94ac74d8db5d1abad6604cc19f24f7dcd07c | Classification of failures by reason for 2021.11.x -------------------------------------------------- zeromq-4.3.4 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/429d2dd34e5d8e2fff40ce7707fa1bb18260f3d6 | Gitlab CI results for 2022-02-11 ================================ Detail of defconfig failures for master --------------------------------------- defconfig | link to the job | orph? ----------------------------------+---------------------------------------------------------------+------ amarula_a64_relic | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076474884 | arcturus_ucls1012a | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076474890 | arcturus_ucp1020 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076474895 | arm_juno | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076474910 | armadeus_apf27 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076474912 | at91sam9260eknf | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076474927 | at91sam9g20dfc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076474931 | at91sam9g45m10ek | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076474936 | at91sam9rlek | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076474940 | at91sam9x5ek | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076474944 | at91sam9x5ek_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076474946 | at91sam9x5ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076474949 | at91sam9x5ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076474951 | atmel_sama5d27_som1_ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076474954 | atmel_sama5d2_xplained_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076474957 | atmel_sama5d2_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076474960 | atmel_sama5d3_xplained | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076474964 | atmel_sama5d3_xplained_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076474966 | atmel_sama5d3_xplained_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076474968 | atmel_sama5d3_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076474972 | atmel_sama5d3xek | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076474973 | atmel_sama5d4_xplained | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076474984 | atmel_sama5d4_xplained_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076474988 | atmel_sama5d4_xplained_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076474990 | atmel_sama5d4_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076474993 | bananapi_m1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475005 | bananapi_m1_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475009 | bananapi_m2_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475012 | bananapi_m2_ultra | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475014 | bananapi_m64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475020 | bananapro | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475021 | beagleboardx15 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475022 | beaglebone_qt5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475025 | beelink_gs1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475033 | chromebook_snow | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475038 | csky_gx6605s | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475043 | engicam_imx6qdl_icore | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475048 | engicam_imx6qdl_icore_qt5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475049 | engicam_imx6qdl_icore_rqs | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475053 | engicam_imx6ul_geam | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475055 | engicam_imx6ul_isiot | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475058 | freescale_imx6dlsabreauto | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475062 | freescale_imx8mpevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475082 | freescale_imx8qxpmek | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475085 | freescale_p1025twr | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475086 | freescale_t1040d4rdb | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475087 | freescale_t2080_qds_rdb | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475088 | friendlyarm_nanopi_a64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475091 | friendlyarm_nanopi_m1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475092 | ORPH friendlyarm_nanopi_m1_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475093 | ORPH friendlyarm_nanopi_m4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475094 | friendlyarm_nanopi_neo | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475098 | friendlyarm_nanopi_neo2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475095 | friendlyarm_nanopi_neo4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475097 | friendlyarm_nanopi_neo_plus2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475099 | friendlyarm_nanopi_r1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475101 | galileo | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475103 | imx23evk | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475113 | imx8mmpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475134 | imx8mpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475137 | lego_ev3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475143 | licheepi_zero | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475145 | microchip_sam9x60ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475147 | microchip_sam9x60ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475150 | microchip_sama5d27_wlsom1_ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475153 | ...hip_sama5d27_wlsom1_ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475154 | microchip_sama7g5ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475161 | microchip_sama7g5ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475162 | minnowboard_max-graphical | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475164 | mx25pdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475170 | odroidxu4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475225 | olimex_a20_olinuxino_lime2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475232 | olimex_imx233_olinuxino | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475245 | orangepi_lite2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475263 | orangepi_one_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475273 | orangepi_pc2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475275 | orangepi_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475280 | ORPH orangepi_prime | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475285 | orangepi_rk3399 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475294 | orangepi_win | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475299 | pc_x86_64_bios | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475326 | pcengines_apu2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475329 | pine64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475330 | pine64_sopine | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475334 | raspberrypi3_qt5we | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475425 | riotboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475437 | roc_pc_rk3399 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475438 | rock_pi_n8 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475447 | s6lx9_microboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475454 | snps_aarch64_vdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475459 | snps_arc700_axs101 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475461 | snps_archs38_axs103 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475464 | snps_archs38_hsdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475467 | socrates_cyclone5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475472 | solidrun_clearfog | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475475 | toradex_apalis_imx6 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475493 | ts4900 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475495 | ts7680 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475498 | warpboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475506 | zynq_microzed | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475507 | zynq_qmtech | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475508 | zynq_zc706 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475509 | zynq_zed | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475510 | zynqmp_zcu106 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475511 | -- http://autobuild.buildroot.net From michael at amarulasolutions.com Sat Feb 12 10:12:08 2022 From: michael at amarulasolutions.com (Michael Nazzareno Trimarchi) Date: Sat, 12 Feb 2022 11:12:08 +0100 Subject: [Buildroot] [PATCH V3] board: Add support for iMX8MN BSH SMM S2 PRO In-Reply-To: References: <20220131145555.2819020-1-michael@amarulasolutions.com> Message-ID: Hi all Should I need to resend? anything is missing now? Michael On Mon, Jan 31, 2022 at 5:20 PM Ariel D'Alessandro wrote: > > 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 -- 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 michael at amarulasolutions.com Sat Feb 12 10:13:25 2022 From: michael at amarulasolutions.com (Michael Nazzareno Trimarchi) Date: Sat, 12 Feb 2022 11:13:25 +0100 Subject: [Buildroot] [PATCH] package/freescale-imx: Add installation of easrc-imx8mn.bin firmware In-Reply-To: <20220129140831.1284832-1-michael@amarulasolutions.com> References: <20220129140831.1284832-1-michael@amarulasolutions.com> Message-ID: Hi On Sat, Jan 29, 2022 at 3:08 PM Michael Trimarchi wrote: > > 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) Is something missing here? Michael > -- > 2.25.1 > -- 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 peter at korsgaard.com Sat Feb 12 10:12:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 12 Feb 2022 11:12:33 +0100 Subject: [Buildroot] [git commit] package/libiio: add missing backslash to python binding logic Message-ID: <20220212100722.3D73D82AA2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0baf647329010270ccdd91dfe65a819886a4a21f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 5ac65831d5b6434dfa (package/libiio: drop python2 support) combined two LIBIIO_CONF_OPTS lines, but forgot the backslash at the end of the line. Fix that. Signed-off-by: Peter Korsgaard --- package/libiio/libiio.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libiio/libiio.mk b/package/libiio/libiio.mk index 48e2f385e3..e15d276b44 100644 --- a/package/libiio/libiio.mk +++ b/package/libiio/libiio.mk @@ -75,7 +75,7 @@ endif ifeq ($(BR2_PACKAGE_LIBIIO_BINDINGS_PYTHON),y) LIBIIO_DEPENDENCIES += host-python3-setuptools python3 LIBIIO_CONF_OPTS += \ - -DPYTHON_BINDINGS=ON + -DPYTHON_BINDINGS=ON \ -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 else LIBIIO_CONF_OPTS += -DPYTHON_BINDINGS=OFF From peter at korsgaard.com Sat Feb 12 10:24:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 12 Feb 2022 11:24:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/pkg-python: drop python2 host/setuptools support In-Reply-To: <20220212054227.1207008-1-james.hilliard1@gmail.com> (James Hilliard's message of "Fri, 11 Feb 2022 22:42:27 -0700") References: <20220212054227.1207008-1-james.hilliard1@gmail.com> Message-ID: <87tud4o01o.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Drop conditonal python version handling now that python2 has been > removed. > Remove python3-setuptools and replace usage with python3 only > python-setuptools. > Signed-off-by: James Hilliard Committed, thanks. I will send a patch to also update the documentation. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 12 10:15:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 12 Feb 2022 11:15:01 +0100 Subject: [Buildroot] [git commit] package/pkg-python: drop python2 host/setuptools support Message-ID: <20220212101743.115D882435@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=697acda00d9f6fc601e6724da36f0e0b96aeee09 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop conditonal python version handling now that python2 has been removed. Remove python3-setuptools and replace usage with python3 only python-setuptools. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/libapparmor/libapparmor.mk | 2 +- package/libiio/libiio.mk | 2 +- package/lirc-tools/lirc-tools.mk | 2 +- package/pkg-python.mk | 66 +------------------- .../{60.7.0 => }/0001-add-executable.patch | 0 .../44.0.0/0001-add-executable.patch | 72 ---------------------- .../44.0.0/python-setuptools.hash | 4 -- .../{60.7.0 => }/python-setuptools.hash | 0 package/python-setuptools/python-setuptools.mk | 17 +---- .../python3-setuptools/0001-add-executable.patch | 1 - package/python3-setuptools/python3-setuptools.hash | 1 - package/python3-setuptools/python3-setuptools.mk | 20 ------ 12 files changed, 6 insertions(+), 181 deletions(-) diff --git a/package/libapparmor/libapparmor.mk b/package/libapparmor/libapparmor.mk index f3d744e3e7..7bb849ab94 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-python3-setuptools host-swig python3 +LIBAPPARMOR_DEPENDENCIES += host-python3 host-python-setuptools host-swig python3 LIBAPPARMOR_CONF_OPTS += \ --with-python \ PYTHON=$(HOST_DIR)/usr/bin/python3 \ diff --git a/package/libiio/libiio.mk b/package/libiio/libiio.mk index e15d276b44..cfae34b2b7 100644 --- a/package/libiio/libiio.mk +++ b/package/libiio/libiio.mk @@ -73,7 +73,7 @@ LIBIIO_CONF_OPTS += -DHAVE_DNS_SD=OFF endif ifeq ($(BR2_PACKAGE_LIBIIO_BINDINGS_PYTHON),y) -LIBIIO_DEPENDENCIES += host-python3-setuptools python3 +LIBIIO_DEPENDENCIES += host-python-setuptools python3 LIBIIO_CONF_OPTS += \ -DPYTHON_BINDINGS=ON \ -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 diff --git a/package/lirc-tools/lirc-tools.mk b/package/lirc-tools/lirc-tools.mk index 27aa5b97cc..05f20f5726 100644 --- a/package/lirc-tools/lirc-tools.mk +++ b/package/lirc-tools/lirc-tools.mk @@ -47,7 +47,7 @@ LIRC_TOOLS_DEPENDENCIES += libftdi1 endif ifeq ($(BR2_PACKAGE_PYTHON3),y) -LIRC_TOOLS_DEPENDENCIES += python3 host-python3-setuptools +LIRC_TOOLS_DEPENDENCIES += python3 host-python-setuptools LIRC_TOOLS_MAKE_ENV += SETUPTOOLS_ENV='$(PKG_PYTHON_SETUPTOOLS_ENV)' endif diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 00bdb9150a..bf0649fc9c 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -150,86 +150,24 @@ endif # Target packages need both the python interpreter on the target (for # runtime) and the python interpreter on the host (for # compilation). However, host packages only need the python -# interpreter on the host, whose version may be enforced by setting -# the *_NEEDS_HOST_PYTHON variable. -# -# So: -# - 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 use the default -# interpreter; -# - otherwise, we depend on the one requested by *_NEEDS_HOST_PYTHON. +# interpreter on the host. # ifeq ($(4),target) -$(2)_DEPENDENCIES += $$(if $$(BR2_PACKAGE_PYTHON3),host-python3 python3,host-python python) -else -ifeq ($$($(2)_NEEDS_HOST_PYTHON),) -$(2)_DEPENDENCIES += $$(if $$(BR2_PACKAGE_PYTHON3),host-python3,host-python) +$(2)_DEPENDENCIES += host-python3 python3 else -ifeq ($$($(2)_NEEDS_HOST_PYTHON),python2) -$(2)_DEPENDENCIES += host-python -else ifeq ($$($(2)_NEEDS_HOST_PYTHON),python3) $(2)_DEPENDENCIES += host-python3 -else -$$(error Incorrect value '$$($(2)_NEEDS_HOST_PYTHON)' for $(2)_NEEDS_HOST_PYTHON) -endif -endif # ($$($(2)_NEEDS_HOST_PYTHON),) endif # ($(4),target) # Setuptools based packages will need setuptools for the host Python # interpreter (both host and target). # -# If we have a host package that says "I need Python 3", we install -# setuptools for python3. -# -# If we have a host packge that says "I need Python 2", we install -# setuptools for python2. -# -# If we have a target package, or a host package that doesn't have any -# _NEEDS_HOST_PYTHON, and BR2_PACKAGE_PYTHON3 is used, then -# Python 3.x is the default Python interpreter, so we install -# setuptools for python3. -# -# In all other cases, we install setuptools for python2. Those other -# cases are: a target package or host package with -# BR2_PACKAGE_PYTHON=y, or a host-package with neither -# BR2_PACKAGE_PYTHON3=y or BR2_PACKAGE_PYTHON=y. ifeq ($$($(2)_SETUP_TYPE),setuptools) -ifeq ($(4):$$($(2)_NEEDS_HOST_PYTHON),host:python3) -$(2)_DEPENDENCIES += $$(if $$(filter host-python3-setuptools,$(1)),,host-python3-setuptools) -else ifeq ($(4):$$($(2)_NEEDS_HOST_PYTHON),host:python2) -$(2)_DEPENDENCIES += $$(if $$(filter host-python-setuptools,$(1)),,host-python-setuptools) -else ifeq ($$(BR2_PACKAGE_PYTHON3),y) -$(2)_DEPENDENCIES += $$(if $$(filter host-python3-setuptools,$(1)),,host-python3-setuptools) -else $(2)_DEPENDENCIES += $$(if $$(filter host-python-setuptools,$(1)),,host-python-setuptools) -endif endif # SETUP_TYPE # Python interpreter to use for building the package. # -# We may want to specify the python interpreter to be used for building a -# package, especially for host-packages (target packages must be built using -# the same version of the interpreter as the one installed on the target). -# -# So: -# - 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 the default -# interpreter; -# - otherwise, we use the one requested by *_NEEDS_HOST_PYTHON. -# -ifeq ($(4),target) $(2)_PYTHON_INTERPRETER = $$(HOST_DIR)/bin/python -else -ifeq ($$($(2)_NEEDS_HOST_PYTHON),) -$(2)_PYTHON_INTERPRETER = $$(HOST_DIR)/bin/python -else -$(2)_PYTHON_INTERPRETER = $$(HOST_DIR)/bin/$$($(2)_NEEDS_HOST_PYTHON) -endif -endif # # Build step. Only define it if not already defined by the package .mk diff --git a/package/python-setuptools/60.7.0/0001-add-executable.patch b/package/python-setuptools/0001-add-executable.patch similarity index 100% rename from package/python-setuptools/60.7.0/0001-add-executable.patch rename to package/python-setuptools/0001-add-executable.patch diff --git a/package/python-setuptools/44.0.0/0001-add-executable.patch b/package/python-setuptools/44.0.0/0001-add-executable.patch deleted file mode 100644 index 8a59f5a4d8..0000000000 --- a/package/python-setuptools/44.0.0/0001-add-executable.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 9b3d307f8f6a1af88f3f810f5a6cf0835830e1e8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Mon, 7 Dec 2015 01:14:33 +0100 -Subject: [PATCH] add executable -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Add a new --executable option to distribute so that we can -force the shebang line in installed python scripts. - -[Thomas: refresh for setuptools 5.8.] -[J??rg: refresh for setuptools 18.7.1] - -Signed-off-by: Gustavo Zacarias -Signed-off-by: Thomas Petazzoni -Signed-off-by: J??rg Krause ---- - setuptools/command/install.py | 2 ++ - setuptools/command/install_scripts.py | 9 +++++++++ - 2 files changed, 11 insertions(+) - -diff --git a/setuptools/command/install.py b/setuptools/command/install.py -index d2bca2e..b60ef19 100644 ---- a/setuptools/command/install.py -+++ b/setuptools/command/install.py -@@ -16,6 +16,7 @@ class install(orig.install): - """Use easy_install to install the package, w/dependencies""" - - user_options = orig.install.user_options + [ -+ ('executable=', 'e', "specify final destination interpreter path"), - ('old-and-unmanageable', None, "Try not to use this!"), - ('single-version-externally-managed', None, - "used by system package builders to create 'flat' eggs"), -@@ -31,6 +32,7 @@ class install(orig.install): - - def initialize_options(self): - orig.install.initialize_options(self) -+ self.executable = None - self.old_and_unmanageable = None - self.single_version_externally_managed = None - -diff --git a/setuptools/command/install_scripts.py b/setuptools/command/install_scripts.py -index be66cb2..07afaf8 100755 ---- a/setuptools/command/install_scripts.py -+++ b/setuptools/command/install_scripts.py -@@ -11,6 +11,13 @@ class install_scripts(orig.install_scripts): - def initialize_options(self): - orig.install_scripts.initialize_options(self) - self.no_ep = False -+ self.executable = None -+ -+ def finalize_options(self): -+ orig.install_scripts.finalize_options(self) -+ self.set_undefined_options('install', -+ ('executable','executable') -+ ) - - def run(self): - import setuptools.command.easy_install as ei -@@ -31,6 +38,8 @@ class install_scripts(orig.install_scripts): - ) - bs_cmd = self.get_finalized_command('build_scripts') - exec_param = getattr(bs_cmd, 'executable', None) -+ if self.executable is not None: -+ exec_param = self.executable - bw_cmd = self.get_finalized_command("bdist_wininst") - is_wininst = getattr(bw_cmd, '_is_running', False) - writer = ei.ScriptWriter --- -2.6.3 - diff --git a/package/python-setuptools/44.0.0/python-setuptools.hash b/package/python-setuptools/44.0.0/python-setuptools.hash deleted file mode 100644 index 769b68c35d..0000000000 --- a/package/python-setuptools/44.0.0/python-setuptools.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From https://pypi.org/pypi/setuptools/json -md5 32b6cdce670ce462086d246bea181e9d setuptools-44.0.0.zip -sha256 e5baf7723e5bb8382fc146e33032b241efc63314211a3a120aaa55d62d2bb008 setuptools-44.0.0.zip -sha256 c32a3ac395af6321efd28be73d06a00f0db6ab887d1c21d4fec46128d2056d5a LICENSE diff --git a/package/python-setuptools/60.7.0/python-setuptools.hash b/package/python-setuptools/python-setuptools.hash similarity index 100% rename from package/python-setuptools/60.7.0/python-setuptools.hash rename to package/python-setuptools/python-setuptools.hash diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk index 04b872fb79..584f83f7a0 100644 --- a/package/python-setuptools/python-setuptools.mk +++ b/package/python-setuptools/python-setuptools.mk @@ -4,29 +4,14 @@ # ################################################################################ -# Please keep in sync with -# package/python3-setuptools/python3-setuptools.mk PYTHON_SETUPTOOLS_VERSION = 60.7.0 -PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON3_SETUPTOOLS_VERSION).tar.gz +PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).tar.gz PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/29/dd/48d662bb93e5e51e72265ef612f869947d4ae4126328d7156824cd50d440 - -# The host variant is only for Python 2.x, so we need to use 44.0.0. -HOST_PYTHON_SETUPTOOLS_VERSION = 44.0.0 -HOST_PYTHON_SETUPTOOLS_SOURCE = setuptools-$(HOST_PYTHON_SETUPTOOLS_VERSION).zip -HOST_PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/b0/f3/44da7482ac6da3f36f68e253cb04de37365b3dba9036a3c70773b778b485 -HOST_PYTHON_SETUPTOOLS_NEEDS_HOST_PYTHON = python2 - PYTHON_SETUPTOOLS_LICENSE = MIT PYTHON_SETUPTOOLS_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_CPE_ID_VENDOR = python PYTHON_SETUPTOOLS_CPE_ID_PRODUCT = setuptools PYTHON_SETUPTOOLS_SETUP_TYPE = setuptools -define HOST_PYTHON_SETUPTOOLS_EXTRACT_CMDS - $(UNZIP) -d $(@D) $(HOST_PYTHON_SETUPTOOLS_DL_DIR)/$(HOST_PYTHON_SETUPTOOLS_SOURCE) - mv $(@D)/setuptools-$(HOST_PYTHON_SETUPTOOLS_VERSION)/* $(@D) - $(RM) -r $(@D)/setuptools-$(HOST_PYTHON_SETUPTOOLS_VERSION) -endef - $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python3-setuptools/0001-add-executable.patch b/package/python3-setuptools/0001-add-executable.patch deleted file mode 120000 index 46b5935d33..0000000000 --- a/package/python3-setuptools/0001-add-executable.patch +++ /dev/null @@ -1 +0,0 @@ -../python-setuptools/60.7.0/0001-add-executable.patch \ No newline at end of file diff --git a/package/python3-setuptools/python3-setuptools.hash b/package/python3-setuptools/python3-setuptools.hash deleted file mode 120000 index 2c9d3614d5..0000000000 --- a/package/python3-setuptools/python3-setuptools.hash +++ /dev/null @@ -1 +0,0 @@ -../python-setuptools/60.7.0/python-setuptools.hash \ No newline at end of file diff --git a/package/python3-setuptools/python3-setuptools.mk b/package/python3-setuptools/python3-setuptools.mk deleted file mode 100644 index d5aaa01918..0000000000 --- a/package/python3-setuptools/python3-setuptools.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# python3-setuptools -# -################################################################################ - -# Please keep in sync with -# package/python-setuptools/python-setuptools.mk -PYTHON3_SETUPTOOLS_VERSION = 60.7.0 -PYTHON3_SETUPTOOLS_SOURCE = setuptools-$(PYTHON3_SETUPTOOLS_VERSION).tar.gz -PYTHON3_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/29/dd/48d662bb93e5e51e72265ef612f869947d4ae4126328d7156824cd50d440 -PYTHON3_SETUPTOOLS_LICENSE = MIT -PYTHON3_SETUPTOOLS_LICENSE_FILES = LICENSE -PYTHON3_SETUPTOOLS_CPE_ID_VENDOR = python -PYTHON3_SETUPTOOLS_CPE_ID_PRODUCT = setuptools -PYTHON3_SETUPTOOLS_SETUP_TYPE = setuptools -HOST_PYTHON3_SETUPTOOLS_DL_SUBDIR = python-setuptools -HOST_PYTHON3_SETUPTOOLS_NEEDS_HOST_PYTHON = python3 - -$(eval $(host-python-package)) From peter at korsgaard.com Sat Feb 12 10:34:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 12 Feb 2022 11:34:20 +0100 Subject: [Buildroot] [PATCH 2/2] docs/manual/adding-packages-python.txt: drop _NEEDS_HOST_PYTHON In-Reply-To: <20220212103421.1351-1-peter@korsgaard.com> References: <20220212103421.1351-1-peter@korsgaard.com> Message-ID: <20220212103421.1351-2-peter@korsgaard.com> Now that host-python2 is gone and the corresponding logic in pkg-python. Signed-off-by: Peter Korsgaard --- docs/manual/adding-packages-python.txt | 7 ------- 1 file changed, 7 deletions(-) diff --git a/docs/manual/adding-packages-python.txt b/docs/manual/adding-packages-python.txt index cfd2f88920..0141fea85b 100644 --- a/docs/manual/adding-packages-python.txt +++ b/docs/manual/adding-packages-python.txt @@ -141,13 +141,6 @@ therefore only use a few of them, or none. packages) and +HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS+ (for host setuptools packages). -* +HOST_PYTHON_FOO_NEEDS_HOST_PYTHON+, to define the host python - interpreter. The usage of this variable is limited to host - packages. The two supported value are +python2+ and +python3+. It - will ensure the right host python package is available and will - invoke it for the build. If some build steps are overloaded, the - right python interpreter must be explicitly called in the commands. - With the Python infrastructure, all the steps required to build and install the packages are already defined, and they generally work well for most Python-based packages. However, when required, it is still -- 2.20.1 From peter at korsgaard.com Sat Feb 12 10:34:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 12 Feb 2022 11:34:19 +0100 Subject: [Buildroot] [PATCH 1/2] package: drop _NEEDS_HOST_PYTHON Message-ID: <20220212103421.1351-1-peter@korsgaard.com> Now that host-python2 is gone and the corresponding logic in pkg-python. Signed-off-by: Peter Korsgaard --- package/meson/meson.mk | 1 - package/python-charset-normalizer/python-charset-normalizer.mk | 1 - package/python-decorator/python-decorator.mk | 1 - package/python-idna/python-idna.mk | 1 - package/python-inflection/python-inflection.mk | 1 - package/python-installer/python-installer.mk | 1 - package/python-jinja2/python-jinja2.mk | 2 -- package/python-mako/python-mako.mk | 2 -- package/python-markupsafe/python-markupsafe.mk | 2 -- package/python-networkx/python-networkx.mk | 1 - package/python-packaging/python-packaging.mk | 1 - package/python-pep517/python-pep517.mk | 1 - package/python-pypa-build/python-pypa-build.mk | 1 - package/python-pyparsing/python-pyparsing.mk | 1 - package/python-pyyaml/python-pyyaml.mk | 1 - package/python-requests/python-requests.mk | 1 - package/python-setuptools-rust/python-setuptools-rust.mk | 1 - .../python-setuptools-scm-git-archive.mk | 1 - package/python-setuptools-scm/python-setuptools-scm.mk | 1 - package/python-tomli/python-tomli.mk | 1 - package/python-typing-extensions/python-typing-extensions.mk | 1 - package/python-urllib3/python-urllib3.mk | 1 - package/scons/scons.mk | 2 -- package/setools/setools.mk | 1 - 24 files changed, 28 deletions(-) diff --git a/package/meson/meson.mk b/package/meson/meson.mk index ad15e3f91e..125488dd46 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -11,7 +11,6 @@ MESON_LICENSE_FILES = COPYING MESON_SETUP_TYPE = setuptools HOST_MESON_DEPENDENCIES = host-ninja -HOST_MESON_NEEDS_HOST_PYTHON = python3 # Avoid interpreter shebang longer than 128 chars define HOST_MESON_SET_INTERPRETER diff --git a/package/python-charset-normalizer/python-charset-normalizer.mk b/package/python-charset-normalizer/python-charset-normalizer.mk index 0a96a6b078..c37b068b36 100644 --- a/package/python-charset-normalizer/python-charset-normalizer.mk +++ b/package/python-charset-normalizer/python-charset-normalizer.mk @@ -10,7 +10,6 @@ PYTHON_CHARSET_NORMALIZER_SITE = https://files.pythonhosted.org/packages/e8/e8/b 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)) diff --git a/package/python-decorator/python-decorator.mk b/package/python-decorator/python-decorator.mk index a7e338bdc0..a61f045e2a 100644 --- a/package/python-decorator/python-decorator.mk +++ b/package/python-decorator/python-decorator.mk @@ -12,7 +12,6 @@ PYTHON_DECORATOR_LICENSE_FILES = LICENSE.txt PYTHON_DECORATOR_CPE_ID_VENDOR = python PYTHON_DECORATOR_CPE_ID_PRODUCT = decorator PYTHON_DECORATOR_SETUP_TYPE = setuptools -HOST_PYTHON_DECORATOR_NEEDS_HOST_PYTHON = python3 $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python-idna/python-idna.mk b/package/python-idna/python-idna.mk index 2a1ec8314b..6f416156d0 100644 --- a/package/python-idna/python-idna.mk +++ b/package/python-idna/python-idna.mk @@ -10,7 +10,6 @@ PYTHON_IDNA_SITE = https://files.pythonhosted.org/packages/62/08/e3fc7c8161090f7 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)) diff --git a/package/python-inflection/python-inflection.mk b/package/python-inflection/python-inflection.mk index 59f35aa135..7c030e99b9 100644 --- a/package/python-inflection/python-inflection.mk +++ b/package/python-inflection/python-inflection.mk @@ -10,7 +10,6 @@ PYTHON_INFLECTION_SITE = https://files.pythonhosted.org/packages/e1/7e/691d061b7 PYTHON_INFLECTION_SETUP_TYPE = setuptools PYTHON_INFLECTION_LICENSE = MIT PYTHON_INFLECTION_LICENSE_FILES = LICENSE -HOST_PYTHON_INFLECTION_NEEDS_HOST_PYTHON = python3 $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python-installer/python-installer.mk b/package/python-installer/python-installer.mk index 2c1d371dab..82739a8003 100644 --- a/package/python-installer/python-installer.mk +++ b/package/python-installer/python-installer.mk @@ -10,6 +10,5 @@ PYTHON_INSTALLER_SITE = https://files.pythonhosted.org/packages/71/9a/8d7c724b0d 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)) diff --git a/package/python-jinja2/python-jinja2.mk b/package/python-jinja2/python-jinja2.mk index 752daf653c..0503984bef 100644 --- a/package/python-jinja2/python-jinja2.mk +++ b/package/python-jinja2/python-jinja2.mk @@ -17,7 +17,5 @@ PYTHON_JINJA2_CPE_ID_PRODUCT = jinja2 PYTHON_JINJA2_DEPENDENCIES = host-python-markupsafe HOST_PYTHON_JINJA2_DEPENDENCIES = host-python-markupsafe -HOST_PYTHON_JINJA2_NEEDS_HOST_PYTHON = python3 - $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python-mako/python-mako.mk b/package/python-mako/python-mako.mk index 26fe95c606..553c4a5339 100644 --- a/package/python-mako/python-mako.mk +++ b/package/python-mako/python-mako.mk @@ -11,8 +11,6 @@ PYTHON_MAKO_SETUP_TYPE = setuptools PYTHON_MAKO_LICENSE = MIT PYTHON_MAKO_LICENSE_FILES = LICENSE -HOST_PYTHON_MAKO_NEEDS_HOST_PYTHON = python3 - # In host build, setup.py tries to download markupsafe if it is not installed HOST_PYTHON_MAKO_DEPENDENCIES = host-python-markupsafe diff --git a/package/python-markupsafe/python-markupsafe.mk b/package/python-markupsafe/python-markupsafe.mk index 14a8d06dfe..e0e689f5a1 100644 --- a/package/python-markupsafe/python-markupsafe.mk +++ b/package/python-markupsafe/python-markupsafe.mk @@ -11,7 +11,5 @@ PYTHON_MARKUPSAFE_SETUP_TYPE = setuptools PYTHON_MARKUPSAFE_LICENSE = BSD-3-Clause PYTHON_MARKUPSAFE_LICENSE_FILES = LICENSE.rst -HOST_PYTHON_MARKUPSAFE_NEEDS_HOST_PYTHON = python3 - $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python-networkx/python-networkx.mk b/package/python-networkx/python-networkx.mk index 3b05011eb9..1908ed8f93 100644 --- a/package/python-networkx/python-networkx.mk +++ b/package/python-networkx/python-networkx.mk @@ -13,7 +13,6 @@ PYTHON_NETWORKX_CPE_ID_VENDOR = python PYTHON_NETWORKX_CPE_ID_PRODUCT = networkx PYTHON_NETWORKX_SETUP_TYPE = setuptools HOST_PYTHON_NETWORKX_DEPENDENCIES = host-python-decorator -HOST_PYTHON_NETWORKX_NEEDS_HOST_PYTHON = python3 $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python-packaging/python-packaging.mk b/package/python-packaging/python-packaging.mk index 569dc0bf58..74b5803525 100644 --- a/package/python-packaging/python-packaging.mk +++ b/package/python-packaging/python-packaging.mk @@ -10,7 +10,6 @@ PYTHON_PACKAGING_SITE = https://files.pythonhosted.org/packages/df/9e/d1a7217f69 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)) diff --git a/package/python-pep517/python-pep517.mk b/package/python-pep517/python-pep517.mk index da0431a637..99aa62d51d 100644 --- a/package/python-pep517/python-pep517.mk +++ b/package/python-pep517/python-pep517.mk @@ -10,7 +10,6 @@ PYTHON_PEP517_SITE = https://files.pythonhosted.org/packages/0a/65/6e656d49c6791 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)) diff --git a/package/python-pypa-build/python-pypa-build.mk b/package/python-pypa-build/python-pypa-build.mk index 6babade672..dc8363f59e 100644 --- a/package/python-pypa-build/python-pypa-build.mk +++ b/package/python-pypa-build/python-pypa-build.mk @@ -10,7 +10,6 @@ PYTHON_PYPA_BUILD_SITE = https://files.pythonhosted.org/packages/f0/62/c73b77521 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 \ diff --git a/package/python-pyparsing/python-pyparsing.mk b/package/python-pyparsing/python-pyparsing.mk index e33541bdb7..2fb705bc7a 100644 --- a/package/python-pyparsing/python-pyparsing.mk +++ b/package/python-pyparsing/python-pyparsing.mk @@ -10,7 +10,6 @@ PYTHON_PYPARSING_SITE = https://files.pythonhosted.org/packages/d6/60/9bed18f432 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)) diff --git a/package/python-pyyaml/python-pyyaml.mk b/package/python-pyyaml/python-pyyaml.mk index 8f5a2d269e..067af8ea7d 100644 --- a/package/python-pyyaml/python-pyyaml.mk +++ b/package/python-pyyaml/python-pyyaml.mk @@ -15,7 +15,6 @@ PYTHON_PYYAML_CPE_ID_PRODUCT = pyyaml PYTHON_PYYAML_DEPENDENCIES = host-python-cython libyaml PYTHON_PYYAML_ENV = PYYAML_FORCE_CYTHON=1 HOST_PYTHON_PYYAML_DEPENDENCIES = host-libyaml -HOST_PYTHON_PYYAML_NEEDS_HOST_PYTHON = python3 $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python-requests/python-requests.mk b/package/python-requests/python-requests.mk index 962646516e..9613a2c47c 100644 --- a/package/python-requests/python-requests.mk +++ b/package/python-requests/python-requests.mk @@ -12,7 +12,6 @@ PYTHON_REQUESTS_LICENSE = Apache-2.0 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 \ diff --git a/package/python-setuptools-rust/python-setuptools-rust.mk b/package/python-setuptools-rust/python-setuptools-rust.mk index c87a0da3c7..394789b056 100644 --- a/package/python-setuptools-rust/python-setuptools-rust.mk +++ b/package/python-setuptools-rust/python-setuptools-rust.mk @@ -11,6 +11,5 @@ 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-typing-extensions -HOST_PYTHON_SETUPTOOLS_RUST_NEEDS_HOST_PYTHON = python3 $(eval $(host-python-package)) diff --git a/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk b/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk index 48ca9c89ae..032e2d3fc9 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,6 +11,5 @@ 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 8c5229e1a6..132eb398aa 100644 --- a/package/python-setuptools-scm/python-setuptools-scm.mk +++ b/package/python-setuptools-scm/python-setuptools-scm.mk @@ -11,6 +11,5 @@ 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-tomli/python-tomli.mk b/package/python-tomli/python-tomli.mk index 4e6b023ef7..b8c20ca736 100644 --- a/package/python-tomli/python-tomli.mk +++ b/package/python-tomli/python-tomli.mk @@ -10,7 +10,6 @@ PYTHON_TOMLI_SITE = https://files.pythonhosted.org/packages/ec/38/8eccdc662c61ae 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)) diff --git a/package/python-typing-extensions/python-typing-extensions.mk b/package/python-typing-extensions/python-typing-extensions.mk index 407fe99b54..668071e025 100644 --- a/package/python-typing-extensions/python-typing-extensions.mk +++ b/package/python-typing-extensions/python-typing-extensions.mk @@ -10,7 +10,6 @@ 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)) diff --git a/package/python-urllib3/python-urllib3.mk b/package/python-urllib3/python-urllib3.mk index c9c8a912d1..d94c97b4ed 100644 --- a/package/python-urllib3/python-urllib3.mk +++ b/package/python-urllib3/python-urllib3.mk @@ -12,7 +12,6 @@ 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)) diff --git a/package/scons/scons.mk b/package/scons/scons.mk index bc5d2a1ef9..6b75d3ddca 100644 --- a/package/scons/scons.mk +++ b/package/scons/scons.mk @@ -10,8 +10,6 @@ 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) diff --git a/package/setools/setools.mk b/package/setools/setools.mk index 5b4b4e30d8..ea355f10c8 100644 --- a/package/setools/setools.mk +++ b/package/setools/setools.mk @@ -13,7 +13,6 @@ SETOOLS_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL SETOOLS_CPE_ID_VENDOR = selinuxproject SETOOLS_SETUP_TYPE = setuptools HOST_SETOOLS_DEPENDENCIES = host-python-cython host-libselinux host-libsepol host-python-networkx -HOST_SETOOLS_NEEDS_HOST_PYTHON = python3 define SETOOLS_FIX_SETUP # By default, setup.py will look for libsepol.a in the host machines -- 2.20.1 From peter at korsgaard.com Sat Feb 12 10:43:48 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 12 Feb 2022 11:43:48 +0100 Subject: [Buildroot] [PATCH] package/python-*: drop python3 dependency Message-ID: <20220212104349.6015-1-peter@korsgaard.com> All the python packages are inside an if BR2_PACKAGE_PYTHON3, so with the removal of python2 support, the explicit python3 dependency is redundant. Remove it. Signed-off-by: Peter Korsgaard --- package/python-aexpect/Config.in | 1 - package/python-aioblescan/Config.in | 1 - package/python-aiocoap/Config.in | 1 - package/python-aioconsole/Config.in | 1 - package/python-aiodns/Config.in | 1 - package/python-aiofiles/Config.in | 1 - package/python-aiohttp-cors/Config.in | 1 - package/python-aiohttp-debugtoolbar/Config.in | 1 - package/python-aiohttp-jinja2/Config.in | 1 - package/python-aiohttp-mako/Config.in | 1 - package/python-aiohttp-remotes/Config.in | 1 - package/python-aiohttp-security/Config.in | 1 - package/python-aiohttp-session/Config.in | 1 - package/python-aiohttp-sse/Config.in | 1 - package/python-aiohttp/Config.in | 1 - package/python-aiojobs/Config.in | 1 - package/python-aiologstash/Config.in | 1 - package/python-aiomonitor/Config.in | 1 - package/python-aioprocessing/Config.in | 1 - package/python-aioredis/Config.in | 1 - package/python-aiorwlock/Config.in | 1 - package/python-aiosignal/Config.in | 1 - package/python-aiozipkin/Config.in | 1 - package/python-argon2-cffi-bindings/Config.in | 1 - package/python-arrow/Config.in | 1 - package/python-asgiref/Config.in | 1 - package/python-async-lru/Config.in | 1 - package/python-async-timeout/Config.in | 1 - package/python-attrs/Config.in | 1 - package/python-autobahn/Config.in | 1 - package/python-automat/Config.in | 1 - package/python-avro/Config.in | 1 - package/python-bcrypt/Config.in | 1 - package/python-beautifulsoup4/Config.in | 1 - package/python-bidict/Config.in | 1 - package/python-bleak/Config.in | 1 - package/python-bluezero/Config.in | 2 -- package/python-boto3/Config.in | 1 - package/python-botocore/Config.in | 1 - package/python-cbor2/Config.in | 1 - package/python-cchardet/Config.in | 2 -- package/python-channels-redis/Config.in | 1 - package/python-channels/Config.in | 1 - package/python-charset-normalizer/Config.in | 1 - package/python-cheroot/Config.in | 1 - package/python-cherrypy/Config.in | 1 - package/python-colorlog/Config.in | 1 - package/python-colorzero/Config.in | 1 - package/python-configshell-fb/Config.in | 1 - package/python-crayons/Config.in | 1 - package/python-crontab/Config.in | 1 - package/python-crossbar/Config.in | 1 - package/python-cryptography/Config.in | 1 - package/python-cssselect2/Config.in | 1 - package/python-cssutils/Config.in | 1 - package/python-cycler/Config.in | 1 - package/python-daphne/Config.in | 1 - package/python-dataproperty/Config.in | 1 - package/python-dateutil/Config.in | 1 - package/python-dbus-next/Config.in | 1 - package/python-decorator/Config.in | 1 - package/python-dialog3/Config.in | 1 - package/python-django-enumfields/Config.in | 1 - package/python-django/Config.in | 1 - package/python-dnspython/Config.in | 1 - package/python-docker/Config.in | 1 - package/python-engineio/Config.in | 1 - package/python-falcon/Config.in | 1 - package/python-filelock/Config.in | 1 - package/python-flask-babel/Config.in | 1 - package/python-flask-cors/Config.in | 1 - package/python-flask-expects-json/Config.in | 1 - package/python-flask-jsonrpc/Config.in | 1 - package/python-flask-login/Config.in | 1 - package/python-flask-sqlalchemy/Config.in | 1 - package/python-flask-wtf/Config.in | 1 - package/python-flup/Config.in | 1 - package/python-fonttools/Config.in | 1 - package/python-frozenlist/Config.in | 1 - package/python-git/Config.in | 1 - package/python-gitdb2/Config.in | 1 - package/python-gobject/Config.in | 1 - package/python-gpiozero/Config.in | 1 - package/python-gunicorn/Config.in | 1 - package/python-h2/Config.in | 1 - package/python-hiredis/Config.in | 1 - package/python-hpack/Config.in | 1 - package/python-httplib2/Config.in | 1 - package/python-humanize/Config.in | 1 - package/python-hyperframe/Config.in | 1 - package/python-hyperlink/Config.in | 1 - package/python-ibmiotf/Config.in | 1 - package/python-idna/Config.in | 1 - package/python-inflection/Config.in | 1 - package/python-influxdb/Config.in | 1 - package/python-ipdb/Config.in | 1 - package/python-ipython/Config.in | 1 - package/python-itsdangerous/Config.in | 1 - package/python-janus/Config.in | 1 - package/python-jaraco-classes/Config.in | 1 - package/python-jaraco-functools/Config.in | 1 - package/python-jedi/Config.in | 1 - package/python-jinja2/Config.in | 1 - package/python-jsonmodels/Config.in | 1 - package/python-keyring/Config.in | 1 - package/python-libusb1/Config.in | 2 -- package/python-markdown/Config.in | 1 - package/python-markdown2/Config.in | 1 - package/python-markupsafe/Config.in | 1 - package/python-matplotlib/Config.in | 1 - package/python-mbstrdecoder/Config.in | 1 - package/python-memory-profiler/Config.in | 1 - package/python-more-itertools/Config.in | 1 - package/python-mpd2/Config.in | 1 - package/python-msgfy/Config.in | 1 - package/python-multidict/Config.in | 1 - package/python-mutagen/Config.in | 1 - package/python-mwclient/Config.in | 1 - package/python-mwscrape/Config.in | 1 - package/python-mwscrape2slob/Config.in | 2 -- package/python-networkx/Config.in | 1 - package/python-numpy/Config.in | 2 -- package/python-oauthlib/Config.in | 1 - package/python-opcua-asyncio/Config.in | 1 - package/python-packaging/Config.in | 1 - package/python-paramiko/Config.in | 1 - package/python-parso/Config.in | 1 - package/python-pathpy/Config.in | 1 - package/python-pathvalidate/Config.in | 1 - package/python-piexif/Config.in | 1 - package/python-pillow/Config.in | 1 - package/python-pip/Config.in | 1 - package/python-pluggy/Config.in | 1 - package/python-portend/Config.in | 1 - package/python-priority/Config.in | 1 - package/python-prompt-toolkit/Config.in | 1 - package/python-protobuf/Config.in | 1 - package/python-psycopg2/Config.in | 2 -- package/python-pudb/Config.in | 1 - package/python-py/Config.in | 1 - package/python-pybind/Config.in | 1 - package/python-pycairo/Config.in | 1 - package/python-pycares/Config.in | 1 - package/python-pycups/Config.in | 1 - package/python-pydantic/Config.in | 1 - package/python-pydyf/Config.in | 1 - package/python-pygments/Config.in | 1 - package/python-pyhamcrest/Config.in | 1 - package/python-pyjwt/Config.in | 1 - package/python-pymupdf/Config.in | 3 --- package/python-pymysql/Config.in | 1 - package/python-pynacl/Config.in | 1 - package/python-pyndiff/Config.in | 1 - package/python-pyopenssl/Config.in | 1 - package/python-pyparsing/Config.in | 1 - package/python-pyparted/Config.in | 2 -- package/python-pyphen/Config.in | 1 - package/python-pysftp/Config.in | 1 - package/python-pytablereader/Config.in | 1 - package/python-pytablewriter/Config.in | 1 - package/python-pytest-asyncio/Config.in | 1 - package/python-pytest/Config.in | 1 - package/python-pytrie/Config.in | 1 - package/python-pyusb/Config.in | 1 - package/python-pyyaml/Config.in | 1 - package/python-requests-oauthlib/Config.in | 1 - package/python-requests-toolbelt/Config.in | 1 - package/python-requests/Config.in | 1 - package/python-rsa/Config.in | 1 - package/python-s3transfer/Config.in | 1 - package/python-schedule/Config.in | 1 - package/python-secretstorage/Config.in | 1 - package/python-serial-asyncio/Config.in | 1 - package/python-service-identity/Config.in | 1 - package/python-setproctitle/Config.in | 1 - package/python-simpleaudio/Config.in | 1 - package/python-simplelogging/Config.in | 1 - package/python-simplesqlite/Config.in | 1 - package/python-slob/Config.in | 2 -- package/python-smmap2/Config.in | 1 - package/python-socketio/Config.in | 1 - package/python-sockjs/Config.in | 1 - package/python-soupsieve/Config.in | 1 - package/python-sqliteschema/Config.in | 1 - package/python-tabledata/Config.in | 1 - package/python-tempora/Config.in | 1 - package/python-tinycss2/Config.in | 1 - package/python-tinyrpc/Config.in | 1 - package/python-tomako/Config.in | 1 - package/python-tomli/Config.in | 1 - package/python-tornado/Config.in | 1 - package/python-traitlets/Config.in | 1 - package/python-treq/Config.in | 1 - package/python-twisted/Config.in | 1 - package/python-txaio/Config.in | 1 - package/python-txdbus/Config.in | 1 - package/python-txtorcon/Config.in | 1 - package/python-typepy/Config.in | 1 - package/python-ujson/Config.in | 1 - package/python-unittest-xml-reporting/Config.in | 1 - package/python-urwid/Config.in | 1 - package/python-uvloop/Config.in | 1 - package/python-validators/Config.in | 1 - package/python-watchdog/Config.in | 1 - package/python-weasyprint/Config.in | 1 - package/python-webpy/Config.in | 1 - package/python-websockets/Config.in | 1 - package/python-wtforms/Config.in | 1 - package/python-xlib/Config.in | 1 - package/python-xlsxwriter/Config.in | 1 - package/python-yarl/Config.in | 1 - package/python-zeroconf/Config.in | 1 - package/python-zopfli/Config.in | 1 - 213 files changed, 223 deletions(-) diff --git a/package/python-aexpect/Config.in b/package/python-aexpect/Config.in index eddba8e0b7..cc805da657 100644 --- a/package/python-aexpect/Config.in +++ b/package/python-aexpect/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_AEXPECT bool "python-aexpect" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_SIX # runtime help Aexpect. diff --git a/package/python-aioblescan/Config.in b/package/python-aioblescan/Config.in index dd1acfa095..8f6db48a8b 100644 --- a/package/python-aioblescan/Config.in +++ b/package/python-aioblescan/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_AIOBLESCAN bool "python-aioblescan" - depends on BR2_PACKAGE_PYTHON3 help Scanning Bluetooth for advertised info with asyncio. diff --git a/package/python-aiocoap/Config.in b/package/python-aiocoap/Config.in index cf5ca4e844..c46614324f 100644 --- a/package/python-aiocoap/Config.in +++ b/package/python-aiocoap/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_AIOCOAP bool "python-aiocoap" - depends on BR2_PACKAGE_PYTHON3 help Python CoAP library. diff --git a/package/python-aioconsole/Config.in b/package/python-aioconsole/Config.in index cd52eecf32..6b2a15e115 100644 --- a/package/python-aioconsole/Config.in +++ b/package/python-aioconsole/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_AIOCONSOLE bool "python-aioconsole" - depends on BR2_PACKAGE_PYTHON3 help Asynchronous console and interfaces for asyncio. diff --git a/package/python-aiodns/Config.in b/package/python-aiodns/Config.in index aa5970598f..63c2429390 100644 --- a/package/python-aiodns/Config.in +++ b/package/python-aiodns/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_AIODNS bool "python-aiodns" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_PYCARES # runtime help Simple DNS resolver for asyncio. diff --git a/package/python-aiofiles/Config.in b/package/python-aiofiles/Config.in index 9cc3d7fe59..1e6add5358 100644 --- a/package/python-aiofiles/Config.in +++ b/package/python-aiofiles/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_AIOFILES bool "python-aiofiles" - depends on BR2_PACKAGE_PYTHON3 help aiofiles aims to handle local disk files in asyncio applications. diff --git a/package/python-aiohttp-cors/Config.in b/package/python-aiohttp-cors/Config.in index 1c97cf3f87..dea3b44080 100644 --- a/package/python-aiohttp-cors/Config.in +++ b/package/python-aiohttp-cors/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_AIOHTTP_CORS bool "python-aiohttp-cors" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_AIOHTTP # runtime help CORS support for aiohttp. diff --git a/package/python-aiohttp-debugtoolbar/Config.in b/package/python-aiohttp-debugtoolbar/Config.in index b22d2cf946..e2fede8065 100644 --- a/package/python-aiohttp-debugtoolbar/Config.in +++ b/package/python-aiohttp-debugtoolbar/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_AIOHTTP_DEBUGTOOLBAR bool "python-aiohttp-debugtoolbar" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_AIOHTTP # runtime select BR2_PACKAGE_PYTHON_AIOHTTP_JINJA2 # runtime help diff --git a/package/python-aiohttp-jinja2/Config.in b/package/python-aiohttp-jinja2/Config.in index dd4bb0d23b..a536825b7e 100644 --- a/package/python-aiohttp-jinja2/Config.in +++ b/package/python-aiohttp-jinja2/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_AIOHTTP_JINJA2 bool "python-aiohttp-jinja2" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_AIOHTTP # runtime select BR2_PACKAGE_PYTHON_JINJA2 # runtime help diff --git a/package/python-aiohttp-mako/Config.in b/package/python-aiohttp-mako/Config.in index 8c5df6a481..4dae5d95ad 100644 --- a/package/python-aiohttp-mako/Config.in +++ b/package/python-aiohttp-mako/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_AIOHTTP_MAKO bool "python-aiohttp-mako" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_AIOHTTP # runtime select BR2_PACKAGE_PYTHON_MAKO # runtime help diff --git a/package/python-aiohttp-remotes/Config.in b/package/python-aiohttp-remotes/Config.in index e44696ba1e..7208e373ad 100644 --- a/package/python-aiohttp-remotes/Config.in +++ b/package/python-aiohttp-remotes/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_AIOHTTP_REMOTES bool "python-aiohttp-remotes" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_AIOHTTP # runtime help Control remote side information. diff --git a/package/python-aiohttp-security/Config.in b/package/python-aiohttp-security/Config.in index f92c458584..96204d7e22 100644 --- a/package/python-aiohttp-security/Config.in +++ b/package/python-aiohttp-security/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_AIOHTTP_SECURITY bool "python-aiohttp-security" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_AIOHTTP # runtime help Security for aiohttp.web. diff --git a/package/python-aiohttp-session/Config.in b/package/python-aiohttp-session/Config.in index c148165f00..99c01794a7 100644 --- a/package/python-aiohttp-session/Config.in +++ b/package/python-aiohttp-session/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_AIOHTTP_SESSION bool "python-aiohttp-session" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_AIOHTTP # runtime help Sessions for aiohttp.web. diff --git a/package/python-aiohttp-sse/Config.in b/package/python-aiohttp-sse/Config.in index 781bbf4de7..6e408b7e12 100644 --- a/package/python-aiohttp-sse/Config.in +++ b/package/python-aiohttp-sse/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_AIOHTTP_SSE bool "python-aiohttp-sse" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_AIOHTTP # runtime help Server-sent events support for aiohttp. diff --git a/package/python-aiohttp/Config.in b/package/python-aiohttp/Config.in index 85a6862141..35c162b948 100644 --- a/package/python-aiohttp/Config.in +++ b/package/python-aiohttp/Config.in @@ -1,6 +1,5 @@ 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 diff --git a/package/python-aiojobs/Config.in b/package/python-aiojobs/Config.in index ab61985164..0cdd1c106f 100644 --- a/package/python-aiojobs/Config.in +++ b/package/python-aiojobs/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_AIOJOBS bool "python-aiojobs" - depends on BR2_PACKAGE_PYTHON3 help Jobs scheduler for managing background task (asyncio). diff --git a/package/python-aiologstash/Config.in b/package/python-aiologstash/Config.in index e70c232fd2..ce7ebe03cd 100644 --- a/package/python-aiologstash/Config.in +++ b/package/python-aiologstash/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_AIOLOGSTASH bool "python-aiologstash" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_ASYNC_TIMEOUT # runtime select BR2_PACKAGE_PYTHON_LOGSTASH # runtime help diff --git a/package/python-aiomonitor/Config.in b/package/python-aiomonitor/Config.in index c76c952c82..435900ae32 100644 --- a/package/python-aiomonitor/Config.in +++ b/package/python-aiomonitor/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_AIOMONITOR bool "python-aiomonitor" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_TERMINALTABLES # runtime select BR2_PACKAGE_PYTHON_AIOCONSOLE # runtime help diff --git a/package/python-aioprocessing/Config.in b/package/python-aioprocessing/Config.in index 2e76bc562b..381805c759 100644 --- a/package/python-aioprocessing/Config.in +++ b/package/python-aioprocessing/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_AIOPROCESSING bool "python-aioprocessing" - depends on BR2_PACKAGE_PYTHON3 help A Python 3.5+ library that integrates the multiprocessing module with asyncio. diff --git a/package/python-aioredis/Config.in b/package/python-aioredis/Config.in index dc2ee01d9a..46ed2c7a46 100644 --- a/package/python-aioredis/Config.in +++ b/package/python-aioredis/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_AIOREDIS bool "python-aioredis" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_ASYNC_TIMEOUT # runtime select BR2_PACKAGE_PYTHON_HIREDIS # runtime help diff --git a/package/python-aiorwlock/Config.in b/package/python-aiorwlock/Config.in index afdc27dd6f..3b61890555 100644 --- a/package/python-aiorwlock/Config.in +++ b/package/python-aiorwlock/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_AIORWLOCK bool "python-aiorwlock" - depends on BR2_PACKAGE_PYTHON3 help Read write lock for asyncio. diff --git a/package/python-aiosignal/Config.in b/package/python-aiosignal/Config.in index 6b7753defd..9bb2998304 100644 --- a/package/python-aiosignal/Config.in +++ b/package/python-aiosignal/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_AIOSIGNAL bool "python-aiosignal" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_FROZENLIST # runtime help aiosignal: a list of registered asynchronous callbacks. diff --git a/package/python-aiozipkin/Config.in b/package/python-aiozipkin/Config.in index 643fc9a4da..6ce6d86b6e 100644 --- a/package/python-aiozipkin/Config.in +++ b/package/python-aiozipkin/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_AIOZIPKIN bool "python-aiozipkin" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_AIOHTTP # runtime help Distributed tracing instrumentation for asyncio application diff --git a/package/python-argon2-cffi-bindings/Config.in b/package/python-argon2-cffi-bindings/Config.in index 3d409759e0..2e6a4a6c96 100644 --- a/package/python-argon2-cffi-bindings/Config.in +++ b/package/python-argon2-cffi-bindings/Config.in @@ -1,6 +1,5 @@ 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 diff --git a/package/python-arrow/Config.in b/package/python-arrow/Config.in index aed9a682ff..244956879c 100644 --- a/package/python-arrow/Config.in +++ b/package/python-arrow/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_ARROW bool "python-arrow" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_DATEUTIL # runtime help Better dates and times for Python. diff --git a/package/python-asgiref/Config.in b/package/python-asgiref/Config.in index e131f476c2..d0b816c369 100644 --- a/package/python-asgiref/Config.in +++ b/package/python-asgiref/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_ASGIREF bool "python-asgiref" - depends on BR2_PACKAGE_PYTHON3 help ASGI is a standard for Python asynchronous web apps and servers to communicate with each other, and positioned as diff --git a/package/python-async-lru/Config.in b/package/python-async-lru/Config.in index 794f504e5e..dc44e8cd11 100644 --- a/package/python-async-lru/Config.in +++ b/package/python-async-lru/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_ASYNC_LRU bool "python-async-lru" - depends on BR2_PACKAGE_PYTHON3 help Simple lru_cache for asyncio. diff --git a/package/python-async-timeout/Config.in b/package/python-async-timeout/Config.in index 27cfe51f7b..d19f15b3c6 100644 --- a/package/python-async-timeout/Config.in +++ b/package/python-async-timeout/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_ASYNC_TIMEOUT bool "python-async-timeout" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime help asyncio-compatible timeout context manager. diff --git a/package/python-attrs/Config.in b/package/python-attrs/Config.in index b1a69d0e3e..fb0ab248fa 100644 --- a/package/python-attrs/Config.in +++ b/package/python-attrs/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_ATTRS bool "python-attrs" - depends on BR2_PACKAGE_PYTHON3 help attrs is the Python package that will bring back the joy of writing classes by relieving you from the drudgery of diff --git a/package/python-autobahn/Config.in b/package/python-autobahn/Config.in index 92ddad0ea4..627bcd73e5 100644 --- a/package/python-autobahn/Config.in +++ b/package/python-autobahn/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_AUTOBAHN bool "python-autobahn" 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 select BR2_PACKAGE_PYTHON_HYPERLINK # runtime diff --git a/package/python-automat/Config.in b/package/python-automat/Config.in index 9d22276c2c..ee02d22b5b 100644 --- a/package/python-automat/Config.in +++ b/package/python-automat/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_AUTOMAT bool "python-automat" - depends on BR2_PACKAGE_PYTHON3 # python-attrs select BR2_PACKAGE_PYTHON_ATTRS # runtime select BR2_PACKAGE_PYTHON_SIX # runtime help diff --git a/package/python-avro/Config.in b/package/python-avro/Config.in index e1d7fc832c..1f67732ce0 100644 --- a/package/python-avro/Config.in +++ b/package/python-avro/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_AVRO bool "python-avro" - depends on BR2_PACKAGE_PYTHON3 help Select this option to install the Avro Python3 language bindings, and the `avro` command line tool diff --git a/package/python-bcrypt/Config.in b/package/python-bcrypt/Config.in index 81becad322..9e9864e9d2 100644 --- a/package/python-bcrypt/Config.in +++ b/package/python-bcrypt/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_BCRYPT bool "python-bcrypt" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_CFFI # runtime help Modern password hashing for your software and your servers. diff --git a/package/python-beautifulsoup4/Config.in b/package/python-beautifulsoup4/Config.in index 93fa540a73..eb7d2ba673 100644 --- a/package/python-beautifulsoup4/Config.in +++ b/package/python-beautifulsoup4/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_BEAUTIFULSOUP4 bool "python-beautifulsoup4" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_SOUPSIEVE # runtime help Beautiful Soup is a Python library for pulling data out of diff --git a/package/python-bidict/Config.in b/package/python-bidict/Config.in index adbfda69b8..dfc55b87dd 100644 --- a/package/python-bidict/Config.in +++ b/package/python-bidict/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_BIDICT bool "python-bidict" - depends on BR2_PACKAGE_PYTHON3 help The bidirectional mapping library for Python. diff --git a/package/python-bleak/Config.in b/package/python-bleak/Config.in index 43ed65d752..085c16fae8 100644 --- a/package/python-bleak/Config.in +++ b/package/python-bleak/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_BLEAK bool "python-bleak" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_DBUS_NEXT # runtime help Bluetooth Low Energy platform Agnostic Klient. diff --git a/package/python-bluezero/Config.in b/package/python-bluezero/Config.in index d617b96d67..fa0998a298 100644 --- a/package/python-bluezero/Config.in +++ b/package/python-bluezero/Config.in @@ -4,7 +4,6 @@ config BR2_PACKAGE_PYTHON_BLUEZERO depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # python-gobject -> gobject-introspection 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_PYTHON3 select BR2_PACKAGE_DBUS # runtime select BR2_PACKAGE_DBUS_PYTHON # runtime select BR2_PACKAGE_PYTHON_GOBJECT # runtime @@ -14,7 +13,6 @@ config BR2_PACKAGE_PYTHON_BLUEZERO https://github.com/ukBaz/python-bluezero comment "python-bluezero needs a glibc toolchain, gcc >= 4.9, host gcc >= 8" - depends on BR2_PACKAGE_PYTHON3 depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_USES_GLIBC || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ diff --git a/package/python-boto3/Config.in b/package/python-boto3/Config.in index 1cb1ebfd12..67b1420388 100644 --- a/package/python-boto3/Config.in +++ b/package/python-boto3/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_BOTO3 bool "python-boto3" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_BOTOCORE # runtime select BR2_PACKAGE_PYTHON_JMESPATH # runtime select BR2_PACKAGE_PYTHON_S3TRANSFER # runtime diff --git a/package/python-botocore/Config.in b/package/python-botocore/Config.in index 51cb660477..cc5e32b504 100644 --- a/package/python-botocore/Config.in +++ b/package/python-botocore/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_BOTOCORE bool "python-botocore" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_DATEUTIL # runtime select BR2_PACKAGE_PYTHON_JMESPATH # runtime select BR2_PACKAGE_PYTHON_URLLIB3 # runtime diff --git a/package/python-cbor2/Config.in b/package/python-cbor2/Config.in index e35e37f018..ba9383f787 100644 --- a/package/python-cbor2/Config.in +++ b/package/python-cbor2/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_CBOR2 bool "python-cbor2" - depends on BR2_PACKAGE_PYTHON3 help Pure Python CBOR (de)serializer with extensive tag support. diff --git a/package/python-cchardet/Config.in b/package/python-cchardet/Config.in index 0f8645aafe..74153126fb 100644 --- a/package/python-cchardet/Config.in +++ b/package/python-cchardet/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_CCHARDET bool "python-cchardet" - depends on BR2_PACKAGE_PYTHON3 depends on BR2_INSTALL_LIBSTDCPP help cChardet is high speed universal character encoding @@ -9,5 +8,4 @@ config BR2_PACKAGE_PYTHON_CCHARDET https://github.com/PyYoshi/cChardet comment "python-cchardet needs a toolchain w/ C++" - depends on BR2_PACKAGE_PYTHON3 depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-channels-redis/Config.in b/package/python-channels-redis/Config.in index bab801d2a9..d25f8ffe31 100644 --- a/package/python-channels-redis/Config.in +++ b/package/python-channels-redis/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_PYTHON_CHANNELS_REDIS bool "python-channels-redis" # 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 select BR2_PACKAGE_PYTHON_CHANNELS # runtime diff --git a/package/python-channels/Config.in b/package/python-channels/Config.in index 6cd6e5f60d..b94f53ceaa 100644 --- a/package/python-channels/Config.in +++ b/package/python-channels/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_PYTHON_CHANNELS bool "python-channels" # 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 select BR2_PACKAGE_PYTHON_DJANGO # runtime diff --git a/package/python-charset-normalizer/Config.in b/package/python-charset-normalizer/Config.in index c4c40fc99b..63e04a7a33 100644 --- a/package/python-charset-normalizer/Config.in +++ b/package/python-charset-normalizer/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_CHARSET_NORMALIZER bool "python-charset-normalizer" - depends on BR2_PACKAGE_PYTHON3 help The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet. diff --git a/package/python-cheroot/Config.in b/package/python-cheroot/Config.in index 45dd2d8a11..bb9b4abbc3 100644 --- a/package/python-cheroot/Config.in +++ b/package/python-cheroot/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_CHEROOT bool "python-cheroot" - depends on BR2_PACKAGE_PYTHON3 # python-more-itertools, python-jaraco-functools select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_MORE_ITERTOOLS # runtime select BR2_PACKAGE_PYTHON_JARACO_FUNCTOOLS # runtime diff --git a/package/python-cherrypy/Config.in b/package/python-cherrypy/Config.in index eb83054be3..7548dcf91b 100644 --- a/package/python-cherrypy/Config.in +++ b/package/python-cherrypy/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_CHERRYPY bool "python-cherrypy" - depends on BR2_PACKAGE_PYTHON3 # python-cheroot, python-portend select BR2_PACKAGE_PYTHON_CHEROOT # runtime select BR2_PACKAGE_PYTHON_JARACO_CLASSES # runtime select BR2_PACKAGE_PYTHON_PORTEND # runtime diff --git a/package/python-colorlog/Config.in b/package/python-colorlog/Config.in index e191ae82ac..673f97aad2 100644 --- a/package/python-colorlog/Config.in +++ b/package/python-colorlog/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_COLORLOG bool "python-colorlog" - depends on BR2_PACKAGE_PYTHON3 help Log formatting with colors. diff --git a/package/python-colorzero/Config.in b/package/python-colorzero/Config.in index a1deada5fc..b2ef711fbe 100644 --- a/package/python-colorzero/Config.in +++ b/package/python-colorzero/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_COLORZERO bool "python-colorzero" - depends on BR2_PACKAGE_PYTHON3 help A color manipulation library for Python. diff --git a/package/python-configshell-fb/Config.in b/package/python-configshell-fb/Config.in index a0326e9150..ed7f9e0234 100644 --- a/package/python-configshell-fb/Config.in +++ b/package/python-configshell-fb/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_CONFIGSHELL_FB bool "python-configshell-fb" - depends on BR2_PACKAGE_PYTHON3 # python-urwid select BR2_PACKAGE_PYTHON_PYPARSING select BR2_PACKAGE_PYTHON3_READLINE select BR2_PACKAGE_PYTHON_SIX diff --git a/package/python-crayons/Config.in b/package/python-crayons/Config.in index 10f3ece009..865a142b4c 100644 --- a/package/python-crayons/Config.in +++ b/package/python-crayons/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_CRAYONS bool "python-crayons" - depends on BR2_PACKAGE_PYTHON3 help This module is really simple, it gives you colored strings for terminal usage. diff --git a/package/python-crontab/Config.in b/package/python-crontab/Config.in index 7514a3866b..102dbbdb6b 100644 --- a/package/python-crontab/Config.in +++ b/package/python-crontab/Config.in @@ -1,6 +1,5 @@ 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-crossbar/Config.in b/package/python-crossbar/Config.in index b72d64c19d..9625d9ce8e 100644 --- a/package/python-crossbar/Config.in +++ b/package/python-crossbar/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_CROSSBAR bool "python-crossbar" 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 select BR2_PACKAGE_PYTHON_AUTOBAHN diff --git a/package/python-cryptography/Config.in b/package/python-cryptography/Config.in index 07a22bf846..213aa24fa8 100644 --- a/package/python-cryptography/Config.in +++ b/package/python-cryptography/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_CRYPTOGRAPHY bool "python-cryptography" - depends on BR2_PACKAGE_PYTHON3 depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_PYTHON_CFFI # runtime diff --git a/package/python-cssselect2/Config.in b/package/python-cssselect2/Config.in index 0196471253..030d6df0de 100644 --- a/package/python-cssselect2/Config.in +++ b/package/python-cssselect2/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_CSSSELECT2 bool "python-cssselect2" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_TINYCSS2 # runtime select BR2_PACKAGE_PYTHON_WEBENCODINGS # runtime help diff --git a/package/python-cssutils/Config.in b/package/python-cssutils/Config.in index 141561901c..1c23a587f6 100644 --- a/package/python-cssutils/Config.in +++ b/package/python-cssutils/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_CSSUTILS bool "python-cssutils" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime help A CSS Cascading Style Sheets library for Python. diff --git a/package/python-cycler/Config.in b/package/python-cycler/Config.in index 39ff23e45f..813bc69dd4 100644 --- a/package/python-cycler/Config.in +++ b/package/python-cycler/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_CYCLER bool "python-cycler" - depends on BR2_PACKAGE_PYTHON3 help Creates a Cycler objects much like cycler, but includes input validation. diff --git a/package/python-daphne/Config.in b/package/python-daphne/Config.in index c4479417e9..51c66532f0 100644 --- a/package/python-daphne/Config.in +++ b/package/python-daphne/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_PYTHON_DAPHNE bool "python-daphne" # 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 select BR2_PACKAGE_PYTHON_TWISTED # runtime diff --git a/package/python-dataproperty/Config.in b/package/python-dataproperty/Config.in index 3de9cc685e..9dab9e4f64 100644 --- a/package/python-dataproperty/Config.in +++ b/package/python-dataproperty/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_DATAPROPERTY bool "python-dataproperty" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime select BR2_PACKAGE_PYTHON_TYPEPY # runtime help diff --git a/package/python-dateutil/Config.in b/package/python-dateutil/Config.in index bbf61f6813..1a36a150b1 100644 --- a/package/python-dateutil/Config.in +++ b/package/python-dateutil/Config.in @@ -1,6 +1,5 @@ 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-dbus-next/Config.in b/package/python-dbus-next/Config.in index bafead8986..6b00e70765 100644 --- a/package/python-dbus-next/Config.in +++ b/package/python-dbus-next/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_DBUS_NEXT bool "python-dbus-next" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime help A zero-dependency DBus library for Python with asyncio diff --git a/package/python-decorator/Config.in b/package/python-decorator/Config.in index 0e84840657..e7ec00cd69 100644 --- a/package/python-decorator/Config.in +++ b/package/python-decorator/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_DECORATOR bool "python-decorator" - depends on BR2_PACKAGE_PYTHON3 help Better living through Python with decorators diff --git a/package/python-dialog3/Config.in b/package/python-dialog3/Config.in index cd0760854b..86812d2764 100644 --- a/package/python-dialog3/Config.in +++ b/package/python-dialog3/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_DIALOG3 bool "python-dialog3" - depends on BR2_PACKAGE_PYTHON3 depends on BR2_USE_MMU # dialog select BR2_PACKAGE_DIALOG help diff --git a/package/python-django-enumfields/Config.in b/package/python-django-enumfields/Config.in index 51efbcbf53..e7236d130a 100644 --- a/package/python-django-enumfields/Config.in +++ b/package/python-django-enumfields/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_DJANGO_ENUMFIELDS bool "python-django-enumfields" - depends on BR2_PACKAGE_PYTHON3 help Real Python Enums for Django. diff --git a/package/python-django/Config.in b/package/python-django/Config.in index 6748d42e1a..8ffceb7275 100644 --- a/package/python-django/Config.in +++ b/package/python-django/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_DJANGO bool "python-django" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON3_UNICODEDATA select BR2_PACKAGE_PYTHON3_PYEXPAT select BR2_PACKAGE_PYTHON_ASGIREF # runtime diff --git a/package/python-dnspython/Config.in b/package/python-dnspython/Config.in index da9b959366..99fd6a9a5f 100644 --- a/package/python-dnspython/Config.in +++ b/package/python-dnspython/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_DNSPYTHON bool "python-dnspython" - depends on BR2_PACKAGE_PYTHON3 help A powerful DNS toolkit for python. diff --git a/package/python-docker/Config.in b/package/python-docker/Config.in index 41b4aacd5e..b2296f42eb 100644 --- a/package/python-docker/Config.in +++ b/package/python-docker/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_DOCKER bool "python-docker" - depends on BR2_PACKAGE_PYTHON3 # python-requests -> python-idna # docker-engine may be running on another host, so no other dependency select BR2_PACKAGE_PYTHON3_SSL # runtime select BR2_PACKAGE_PYTHON_REQUESTS # runtime diff --git a/package/python-engineio/Config.in b/package/python-engineio/Config.in index 48f3391e53..b42b609e0d 100644 --- a/package/python-engineio/Config.in +++ b/package/python-engineio/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_ENGINEIO bool "python-engineio" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON3_ZLIB help Engine.IO server. diff --git a/package/python-falcon/Config.in b/package/python-falcon/Config.in index f90ef55b30..1bf93064bb 100644 --- a/package/python-falcon/Config.in +++ b/package/python-falcon/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_FALCON bool "python-falcon" - depends on BR2_PACKAGE_PYTHON3 help An unladen web framework for building APIs and app backends. diff --git a/package/python-filelock/Config.in b/package/python-filelock/Config.in index bda4582ac1..57ec039400 100644 --- a/package/python-filelock/Config.in +++ b/package/python-filelock/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_FILELOCK bool "python-filelock" - depends on BR2_PACKAGE_PYTHON3 help A platform independent file lock. diff --git a/package/python-flask-babel/Config.in b/package/python-flask-babel/Config.in index 52f05f1e6a..272d9ef1c1 100644 --- a/package/python-flask-babel/Config.in +++ b/package/python-flask-babel/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_FLASK_BABEL bool "python-flask-babel" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_FLASK # runtime select BR2_PACKAGE_PYTHON_BABEL # runtime select BR2_PACKAGE_PYTHON_JINJA2 # runtime diff --git a/package/python-flask-cors/Config.in b/package/python-flask-cors/Config.in index f34f77e5b0..e2e84797f9 100644 --- a/package/python-flask-cors/Config.in +++ b/package/python-flask-cors/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_FLASK_CORS bool "python-flask-cors" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_FLASK # runtime select BR2_PACKAGE_PYTHON_SIX # runtime help diff --git a/package/python-flask-expects-json/Config.in b/package/python-flask-expects-json/Config.in index efe4c248d3..901234762e 100644 --- a/package/python-flask-expects-json/Config.in +++ b/package/python-flask-expects-json/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_FLASK_EXPECTS_JSON bool "python-flask-expects-json" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_FLASK # runtime select BR2_PACKAGE_PYTHON_JSONSCHEMA # runtime help diff --git a/package/python-flask-jsonrpc/Config.in b/package/python-flask-jsonrpc/Config.in index 4bc13f9bcb..c8ecd854b3 100644 --- a/package/python-flask-jsonrpc/Config.in +++ b/package/python-flask-jsonrpc/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_FLASK_JSONRPC bool "python-flask-jsonrpc" - depends on BR2_PACKAGE_PYTHON3 # runtime dependency select BR2_PACKAGE_PYTHON_FLASK help diff --git a/package/python-flask-login/Config.in b/package/python-flask-login/Config.in index 00fa58d783..88c413e2a2 100644 --- a/package/python-flask-login/Config.in +++ b/package/python-flask-login/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_FLASK_LOGIN bool "python-flask-login" - depends on BR2_PACKAGE_PYTHON3 # runtime dependency select BR2_PACKAGE_PYTHON_FLASK help diff --git a/package/python-flask-sqlalchemy/Config.in b/package/python-flask-sqlalchemy/Config.in index e96bd7078c..fa4a035110 100644 --- a/package/python-flask-sqlalchemy/Config.in +++ b/package/python-flask-sqlalchemy/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_FLASK_SQLALCHEMY bool "python-flask-sqlalchemy" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_FLASK # runtime select BR2_PACKAGE_PYTHON_SQLALCHEMY # runtime help diff --git a/package/python-flask-wtf/Config.in b/package/python-flask-wtf/Config.in index 18329d0776..4a8566a26a 100644 --- a/package/python-flask-wtf/Config.in +++ b/package/python-flask-wtf/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_FLASK_WTF bool "python-flask-wtf" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_FLASK # runtime select BR2_PACKAGE_PYTHON_ITSDANGEROUS # runtime select BR2_PACKAGE_PYTHON_WTFORMS # runtime diff --git a/package/python-flup/Config.in b/package/python-flup/Config.in index f40f250163..50d1dfa3ac 100644 --- a/package/python-flup/Config.in +++ b/package/python-flup/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_FLUP bool "python-flup" - depends on BR2_PACKAGE_PYTHON3 help flup provides of a collection of WSGI modules for Python. It allows a webserver to use scgi-mod and fastcgi-mod diff --git a/package/python-fonttools/Config.in b/package/python-fonttools/Config.in index 714f547430..64de1efe5f 100644 --- a/package/python-fonttools/Config.in +++ b/package/python-fonttools/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_FONTTOOLS bool "python-fonttools" - depends on BR2_PACKAGE_PYTHON3 help Tools to manipulate font files. diff --git a/package/python-frozenlist/Config.in b/package/python-frozenlist/Config.in index 67a58b40ca..05714199ca 100644 --- a/package/python-frozenlist/Config.in +++ b/package/python-frozenlist/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_FROZENLIST bool "python-frozenlist" - depends on BR2_PACKAGE_PYTHON3 help A list-like structure which implements collections.abc.MutableSequence. diff --git a/package/python-git/Config.in b/package/python-git/Config.in index b8dbc3a6c1..3c23f91c36 100644 --- a/package/python-git/Config.in +++ b/package/python-git/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_GIT bool "python-git" - depends on BR2_PACKAGE_PYTHON3 depends on BR2_USE_MMU # git select BR2_PACKAGE_GIT # runtime select BR2_PACKAGE_PYTHON_GITDB2 # runtime diff --git a/package/python-gitdb2/Config.in b/package/python-gitdb2/Config.in index 158e4b6980..4a87cc8e8d 100644 --- a/package/python-gitdb2/Config.in +++ b/package/python-gitdb2/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_GITDB2 bool "python-gitdb2" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_SMMAP2 # runtime select BR2_PACKAGE_PYTHON3_ZLIB help diff --git a/package/python-gobject/Config.in b/package/python-gobject/Config.in index efc781a1ff..3354535637 100644 --- a/package/python-gobject/Config.in +++ b/package/python-gobject/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_PYTHON_GOBJECT depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # gobject-introspection depends on BR2_HOST_GCC_AT_LEAST_8 # gobject-introspection -> host-qemu depends on BR2_TOOLCHAIN_USES_GLIBC # gobject-introspection - depends on BR2_PACKAGE_PYTHON3 # gobject-introspection select BR2_PACKAGE_GOBJECT_INTROSPECTION select BR2_PACKAGE_LIBGLIB2 help diff --git a/package/python-gpiozero/Config.in b/package/python-gpiozero/Config.in index 13506ae45f..93e5de3e55 100644 --- a/package/python-gpiozero/Config.in +++ b/package/python-gpiozero/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_GPIOZERO bool "python-gpiozero" depends on BR2_arm - depends on BR2_PACKAGE_PYTHON3 # python-colorzero select BR2_PACKAGE_PYTHON_COLORZERO # runtime select BR2_PACKAGE_PYTHON_RPI_GPIO # runtime select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime diff --git a/package/python-gunicorn/Config.in b/package/python-gunicorn/Config.in index 4e7c0179a5..18f0c034ba 100644 --- a/package/python-gunicorn/Config.in +++ b/package/python-gunicorn/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_GUNICORN bool "python-gunicorn" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime select BR2_PACKAGE_PYTHON3_SSL # runtime help diff --git a/package/python-h2/Config.in b/package/python-h2/Config.in index d88ad36761..74a6b2ad08 100644 --- a/package/python-h2/Config.in +++ b/package/python-h2/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_H2 bool "python-h2" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_HPACK # runtime select BR2_PACKAGE_PYTHON_HYPERFRAME # runtime help diff --git a/package/python-hiredis/Config.in b/package/python-hiredis/Config.in index aacdc87cd2..a401de055d 100644 --- a/package/python-hiredis/Config.in +++ b/package/python-hiredis/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_HIREDIS bool "python-hiredis" - depends on BR2_PACKAGE_PYTHON3 help Python wrapper for hiredis. diff --git a/package/python-hpack/Config.in b/package/python-hpack/Config.in index 0608f97281..b34a3f31fa 100644 --- a/package/python-hpack/Config.in +++ b/package/python-hpack/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_HPACK bool "python-hpack" - depends on BR2_PACKAGE_PYTHON3 help Pure-Python HPACK header compression. diff --git a/package/python-httplib2/Config.in b/package/python-httplib2/Config.in index 0095d95b51..a029814f03 100644 --- a/package/python-httplib2/Config.in +++ b/package/python-httplib2/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_HTTPLIB2 bool "python-httplib2" - depends on BR2_PACKAGE_PYTHON3 # python-pyparsing select BR2_PACKAGE_PYTHON3_ZLIB select BR2_PACKAGE_PYTHON3_SSL select BR2_PACKAGE_PYTHON_PYPARSING # runtime diff --git a/package/python-humanize/Config.in b/package/python-humanize/Config.in index ec63be9b35..f4f4e67b65 100644 --- a/package/python-humanize/Config.in +++ b/package/python-humanize/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_HUMANIZE bool "python-humanize" - depends on BR2_PACKAGE_PYTHON3 help Python humanize package contains various common humanization utilities, like turning a number into a fuzzy human readable diff --git a/package/python-hyperframe/Config.in b/package/python-hyperframe/Config.in index 30457fe86e..fb83c895af 100644 --- a/package/python-hyperframe/Config.in +++ b/package/python-hyperframe/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_HYPERFRAME bool "python-hyperframe" - depends on BR2_PACKAGE_PYTHON3 help HTTP/2 framing layer for Python. diff --git a/package/python-hyperlink/Config.in b/package/python-hyperlink/Config.in index 3a85e6f461..8dad0af19a 100644 --- a/package/python-hyperlink/Config.in +++ b/package/python-hyperlink/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_HYPERLINK bool "python-hyperlink" - depends on BR2_PACKAGE_PYTHON3 # python-idna select BR2_PACKAGE_PYTHON_IDNA # runtime help A featureful, correct URL for Python. diff --git a/package/python-ibmiotf/Config.in b/package/python-ibmiotf/Config.in index 3f3f7e1965..64362db998 100644 --- a/package/python-ibmiotf/Config.in +++ b/package/python-ibmiotf/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_IBMIOTF bool "python-ibmiotf" - depends on BR2_PACKAGE_PYTHON3 # python-requests -> python-idna select BR2_PACKAGE_PYTHON_ISO8601 # runtime select BR2_PACKAGE_PYTHON_PAHO_MQTT # runtime select BR2_PACKAGE_PYTHON_PYTZ # runtime diff --git a/package/python-idna/Config.in b/package/python-idna/Config.in index 3df634f9bf..ddc2cd7d17 100644 --- a/package/python-idna/Config.in +++ b/package/python-idna/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_IDNA bool "python-idna" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON3_UNICODEDATA help A library to support the Internationalised Domain Names in diff --git a/package/python-inflection/Config.in b/package/python-inflection/Config.in index 5b6a26fead..84240060fd 100644 --- a/package/python-inflection/Config.in +++ b/package/python-inflection/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_INFLECTION bool "python-inflection" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON3_UNICODEDATA help A string transformation library that singularizes and diff --git a/package/python-influxdb/Config.in b/package/python-influxdb/Config.in index 48c300f90d..6ebbd4aa9c 100644 --- a/package/python-influxdb/Config.in +++ b/package/python-influxdb/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_INFLUXDB bool "python-influxdb" - depends on BR2_PACKAGE_PYTHON3 # python-requests -> python-idna select BR2_PACKAGE_PYTHON_DATEUTIL # runtime select BR2_PACKAGE_PYTHON_MSGPACK # runtime select BR2_PACKAGE_PYTHON_PYTZ # runtime diff --git a/package/python-ipdb/Config.in b/package/python-ipdb/Config.in index 4a89bf75de..a9d6af1684 100644 --- a/package/python-ipdb/Config.in +++ b/package/python-ipdb/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_IPDB bool "python-ipdb" - depends on BR2_PACKAGE_PYTHON3 # python-ipython select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime select BR2_PACKAGE_PYTHON_IPYTHON # runtime help diff --git a/package/python-ipython/Config.in b/package/python-ipython/Config.in index c151ac2dd2..3de49ae574 100644 --- a/package/python-ipython/Config.in +++ b/package/python-ipython/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_IPYTHON bool "python-ipython" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_BACKCALL # runtime select BR2_PACKAGE_PYTHON_DECORATOR # runtime select BR2_PACKAGE_PYTHON_JEDI # runtime diff --git a/package/python-itsdangerous/Config.in b/package/python-itsdangerous/Config.in index 72aa9165f8..fc0cfe1591 100644 --- a/package/python-itsdangerous/Config.in +++ b/package/python-itsdangerous/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_ITSDANGEROUS bool "python-itsdangerous" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON3_ZLIB # runtime help Itsdangerous contains various helpers to pass data to diff --git a/package/python-janus/Config.in b/package/python-janus/Config.in index 38e4b7217f..924c1fa97d 100644 --- a/package/python-janus/Config.in +++ b/package/python-janus/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_JANUS bool "python-janus" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime help Mixed sync-async queue to interoperate between asyncio diff --git a/package/python-jaraco-classes/Config.in b/package/python-jaraco-classes/Config.in index 271e085c6f..05c11237ab 100644 --- a/package/python-jaraco-classes/Config.in +++ b/package/python-jaraco-classes/Config.in @@ -1,6 +1,5 @@ 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-jaraco-functools/Config.in b/package/python-jaraco-functools/Config.in index 6c914f3851..f65664018d 100644 --- a/package/python-jaraco-functools/Config.in +++ b/package/python-jaraco-functools/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_JARACO_FUNCTOOLS bool "python-jaraco-functools" - depends on BR2_PACKAGE_PYTHON3 # python-more-itertools select BR2_PACKAGE_PYTHON_MORE_ITERTOOLS # runtime help Additional functools in the spirit of stdlib?s diff --git a/package/python-jedi/Config.in b/package/python-jedi/Config.in index e14fa54ffb..8ceaa1530c 100644 --- a/package/python-jedi/Config.in +++ b/package/python-jedi/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_JEDI bool "python-jedi" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_PARSO # runtime help An autocompletion tool for Python that can be used for text diff --git a/package/python-jinja2/Config.in b/package/python-jinja2/Config.in index 8ba2fa4df8..84a46bd264 100644 --- a/package/python-jinja2/Config.in +++ b/package/python-jinja2/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_JINJA2 bool "python-jinja2" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_MARKUPSAFE # runtime select BR2_PACKAGE_PYTHON3_UNICODEDATA help diff --git a/package/python-jsonmodels/Config.in b/package/python-jsonmodels/Config.in index 84a269f171..f66982874a 100644 --- a/package/python-jsonmodels/Config.in +++ b/package/python-jsonmodels/Config.in @@ -1,6 +1,5 @@ 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-keyring/Config.in b/package/python-keyring/Config.in index 61cb98952f..6b33686cbe 100644 --- a/package/python-keyring/Config.in +++ b/package/python-keyring/Config.in @@ -2,7 +2,6 @@ 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 select BR2_PACKAGE_PYTHON_ENTRYPOINTS # runtime select BR2_PACKAGE_PYTHON_SECRETSTORAGE # runtime help diff --git a/package/python-libusb1/Config.in b/package/python-libusb1/Config.in index fbad70c375..e464a0394d 100644 --- a/package/python-libusb1/Config.in +++ b/package/python-libusb1/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_LIBUSB1 bool "python-libusb1" - depends on BR2_PACKAGE_PYTHON3 depends on BR2_TOOLCHAIN_HAS_THREADS # libusb depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB @@ -10,6 +9,5 @@ config BR2_PACKAGE_PYTHON_LIBUSB1 http://github.com/vpelletier/python-libusb1 comment "python-libusb1 needs a toolchain w/ threads, gcc >= 4.9" - depends on BR2_PACKAGE_PYTHON3 depends on !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/python-markdown/Config.in b/package/python-markdown/Config.in index 454c2729bd..4963ec6560 100644 --- a/package/python-markdown/Config.in +++ b/package/python-markdown/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_MARKDOWN bool "python-markdown" - depends on BR2_PACKAGE_PYTHON3 # runtime dependency on Python's xml module select BR2_PACKAGE_PYTHON3_PYEXPAT help diff --git a/package/python-markdown2/Config.in b/package/python-markdown2/Config.in index 5513219a40..8fe2332491 100644 --- a/package/python-markdown2/Config.in +++ b/package/python-markdown2/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_MARKDOWN2 bool "python-markdown2" - depends on BR2_PACKAGE_PYTHON3 help A fast and complete Python implementation of Markdown. diff --git a/package/python-markupsafe/Config.in b/package/python-markupsafe/Config.in index cd7cb2d8e9..48421e0a32 100644 --- a/package/python-markupsafe/Config.in +++ b/package/python-markupsafe/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_MARKUPSAFE bool "python-markupsafe" - depends on BR2_PACKAGE_PYTHON3 help MarkupSafe implements a XML/HTML/XHTML Markup safe string for Python. diff --git a/package/python-matplotlib/Config.in b/package/python-matplotlib/Config.in index e5a4064538..b936777662 100644 --- a/package/python-matplotlib/Config.in +++ b/package/python-matplotlib/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_MATPLOTLIB bool "python-matplotlib" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_PACKAGE_PYTHON3 depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy select BR2_PACKAGE_FREETYPE # runtime diff --git a/package/python-mbstrdecoder/Config.in b/package/python-mbstrdecoder/Config.in index 5ba3a19cc4..0ff0a310a5 100644 --- a/package/python-mbstrdecoder/Config.in +++ b/package/python-mbstrdecoder/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_MBSTRDECODER bool "python-mbstrdecoder" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_CHARDET # runtime help multi-byte character string decoder. diff --git a/package/python-memory-profiler/Config.in b/package/python-memory-profiler/Config.in index 60833304ae..9d29e5f1ca 100644 --- a/package/python-memory-profiler/Config.in +++ b/package/python-memory-profiler/Config.in @@ -1,6 +1,5 @@ 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. diff --git a/package/python-more-itertools/Config.in b/package/python-more-itertools/Config.in index f54b52d1f0..5a74f95d59 100644 --- a/package/python-more-itertools/Config.in +++ b/package/python-more-itertools/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_MORE_ITERTOOLS bool "python-more-itertools" - depends on BR2_PACKAGE_PYTHON3 help More routines for operating on iterables, beyond itertools. diff --git a/package/python-mpd2/Config.in b/package/python-mpd2/Config.in index 823c82e52d..52dcbf0096 100644 --- a/package/python-mpd2/Config.in +++ b/package/python-mpd2/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_MPD2 bool "python-mpd2" - depends on BR2_PACKAGE_PYTHON3 help A Python MPD client library. diff --git a/package/python-msgfy/Config.in b/package/python-msgfy/Config.in index f5a471633a..7875379e9e 100644 --- a/package/python-msgfy/Config.in +++ b/package/python-msgfy/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_MSGFY bool "python-msgfy" - depends on BR2_PACKAGE_PYTHON3 help msgfy is a Python library for convert Exception instance to a human-readable error message. diff --git a/package/python-multidict/Config.in b/package/python-multidict/Config.in index 7bfaa36db2..9a92a6d396 100644 --- a/package/python-multidict/Config.in +++ b/package/python-multidict/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_MULTIDICT bool "python-multidict" - depends on BR2_PACKAGE_PYTHON3 help Multidict is dict-like collection of key-value pairs where a key may occur more than once in the container. diff --git a/package/python-mutagen/Config.in b/package/python-mutagen/Config.in index 655562893f..dc183a6e4e 100644 --- a/package/python-mutagen/Config.in +++ b/package/python-mutagen/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_MUTAGEN bool "python-mutagen" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime select BR2_PACKAGE_PYTHON3_ZLIB # runtime help diff --git a/package/python-mwclient/Config.in b/package/python-mwclient/Config.in index 1af60fdcd0..dc93e6c0df 100644 --- a/package/python-mwclient/Config.in +++ b/package/python-mwclient/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_MWCLIENT bool "python-mwclient" - depends on BR2_PACKAGE_PYTHON3 # python-requests-oauthlib -> python-requests -> python-idna select BR2_PACKAGE_PYTHON_REQUESTS_OAUTHLIB # runtime select BR2_PACKAGE_PYTHON_SIX # runtime help diff --git a/package/python-mwscrape/Config.in b/package/python-mwscrape/Config.in index cb1e30506f..fc9d5223f2 100644 --- a/package/python-mwscrape/Config.in +++ b/package/python-mwscrape/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_MWSCRAPE bool "python-mwscrape" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_COUCHDB # runtime select BR2_PACKAGE_PYTHON_MWCLIENT # runtime select BR2_PACKAGE_PYTHON_PYLRU # runtime diff --git a/package/python-mwscrape2slob/Config.in b/package/python-mwscrape2slob/Config.in index 6d543bda28..6ced253451 100644 --- a/package/python-mwscrape2slob/Config.in +++ b/package/python-mwscrape2slob/Config.in @@ -4,7 +4,6 @@ config BR2_PACKAGE_PYTHON_MWSCRAPE2SLOB depends on BR2_HOST_GCC_AT_LEAST_4_9 # python-slob -> python-pyicu -> icu depends on BR2_INSTALL_LIBSTDCPP # python-slob -> python-pyicu -> icu depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # python-slob -> python-pyicu -> icu - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_COUCHDB # runtime select BR2_PACKAGE_PYTHON_CSSSELECT # runtime select BR2_PACKAGE_PYTHON_CSSUTILS # runtime @@ -17,7 +16,6 @@ config BR2_PACKAGE_PYTHON_MWSCRAPE2SLOB https://github.com/itkach/mwscrape2slob comment "python-mwscrape2slob needs a toolchain w/ C++, gcc >= 4.9, host gcc >= 4.9" - depends on BR2_PACKAGE_PYTHON3 && !BR2_BINFMT_FLAT depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ !BR2_HOST_GCC_AT_LEAST_4_9 diff --git a/package/python-networkx/Config.in b/package/python-networkx/Config.in index 2ae3841dfa..0f3e86f497 100644 --- a/package/python-networkx/Config.in +++ b/package/python-networkx/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_NETWORKX bool "python-networkx" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_DECORATOR # runtime help A Python package for the creation, manipulation, diff --git a/package/python-numpy/Config.in b/package/python-numpy/Config.in index 23dcbc7986..a65164d9d5 100644 --- a/package/python-numpy/Config.in +++ b/package/python-numpy/Config.in @@ -15,7 +15,6 @@ config BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS config BR2_PACKAGE_PYTHON_NUMPY bool "python-numpy" - depends on BR2_PACKAGE_PYTHON3 depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS # python-numpy needs fenv.h which is not provided by uclibc depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL @@ -29,6 +28,5 @@ config BR2_PACKAGE_PYTHON_NUMPY http://www.numpy.org/ comment "python-numpy needs glibc or musl" - depends on BR2_PACKAGE_PYTHON3 depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) diff --git a/package/python-oauthlib/Config.in b/package/python-oauthlib/Config.in index 0084e7cbd9..65016c1d08 100644 --- a/package/python-oauthlib/Config.in +++ b/package/python-oauthlib/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_OAUTHLIB bool "python-oauthlib" - depends on BR2_PACKAGE_PYTHON3 help A generic, spec-compliant, thorough implementation of the OAuth request-signing logic. diff --git a/package/python-opcua-asyncio/Config.in b/package/python-opcua-asyncio/Config.in index 95715fdd08..e5b8623f0d 100644 --- a/package/python-opcua-asyncio/Config.in +++ b/package/python-opcua-asyncio/Config.in @@ -1,7 +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 select BR2_PACKAGE_PYTHON_DATEUTIL # runtime diff --git a/package/python-packaging/Config.in b/package/python-packaging/Config.in index 74d5205e8d..12170df84e 100644 --- a/package/python-packaging/Config.in +++ b/package/python-packaging/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PACKAGING bool "python-packaging" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_PYPARSING # runtime help Core utilities for Python packages. diff --git a/package/python-paramiko/Config.in b/package/python-paramiko/Config.in index d48051bd22..a07af19a4b 100644 --- a/package/python-paramiko/Config.in +++ b/package/python-paramiko/Config.in @@ -1,7 +1,6 @@ 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, 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-parso/Config.in b/package/python-parso/Config.in index 4f5482d8a0..ea1c5a4732 100644 --- a/package/python-parso/Config.in +++ b/package/python-parso/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PARSO bool "python-parso" - depends on BR2_PACKAGE_PYTHON3 help A Python Parser. diff --git a/package/python-pathpy/Config.in b/package/python-pathpy/Config.in index 7c7ffc9e92..98c05126bf 100644 --- a/package/python-pathpy/Config.in +++ b/package/python-pathpy/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PATHPY bool "python-pathpy" - depends on BR2_PACKAGE_PYTHON3 help path.py implements a path objects as first-class entities, allowing common operations on files to diff --git a/package/python-pathvalidate/Config.in b/package/python-pathvalidate/Config.in index f8658e6165..8606696e1b 100644 --- a/package/python-pathvalidate/Config.in +++ b/package/python-pathvalidate/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PATHVALIDATE bool "python-pathvalidate" - depends on BR2_PACKAGE_PYTHON3 help pathvalidate is a python library to validate/sanitize a string such as filename/variable-name. diff --git a/package/python-piexif/Config.in b/package/python-piexif/Config.in index 2f7eff80b5..1c8c31b9c6 100644 --- a/package/python-piexif/Config.in +++ b/package/python-piexif/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PIEXIF bool "python-piexif" - depends on BR2_PACKAGE_PYTHON3 help Piexif simplifies interacting with EXIF data in Python. It includes the tools necessary for extracting, creating, diff --git a/package/python-pillow/Config.in b/package/python-pillow/Config.in index ae6d8c8346..126cb452fa 100644 --- a/package/python-pillow/Config.in +++ b/package/python-pillow/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PILLOW bool "python-pillow" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime select BR2_PACKAGE_PYTHON3_ZLIB help diff --git a/package/python-pip/Config.in b/package/python-pip/Config.in index 92c3e3bd46..805dc01545 100644 --- a/package/python-pip/Config.in +++ b/package/python-pip/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PIP bool "python-pip" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime select BR2_PACKAGE_PYTHON3_SSL help diff --git a/package/python-pluggy/Config.in b/package/python-pluggy/Config.in index 7179bc427c..35b18c824f 100644 --- a/package/python-pluggy/Config.in +++ b/package/python-pluggy/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PLUGGY bool "python-pluggy" - depends on BR2_PACKAGE_PYTHON3 help plugin and hook calling mechanisms for python. diff --git a/package/python-portend/Config.in b/package/python-portend/Config.in index 30a50c7f61..6b21078caa 100644 --- a/package/python-portend/Config.in +++ b/package/python-portend/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PORTEND bool "python-portend" - depends on BR2_PACKAGE_PYTHON3 # python-tempora select BR2_PACKAGE_PYTHON_TEMPORA # runtime help TCP port monitoring utilities. diff --git a/package/python-priority/Config.in b/package/python-priority/Config.in index 8ac2d13824..b73b7e2ad4 100644 --- a/package/python-priority/Config.in +++ b/package/python-priority/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PRIORITY bool "python-priority" - depends on BR2_PACKAGE_PYTHON3 help A pure-Python implementation of the HTTP/2 priority tree. diff --git a/package/python-prompt-toolkit/Config.in b/package/python-prompt-toolkit/Config.in index a16ac13d53..ad4f8162de 100644 --- a/package/python-prompt-toolkit/Config.in +++ b/package/python-prompt-toolkit/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PROMPT_TOOLKIT bool "python-prompt-toolkit" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_WCWIDTH # runtime select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime diff --git a/package/python-protobuf/Config.in b/package/python-protobuf/Config.in index 9b20881196..1af82112b4 100644 --- a/package/python-protobuf/Config.in +++ b/package/python-protobuf/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_PYTHON_PROTOBUF bool "python-protobuf" # host-protobuf only builds on certain architectures depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_SIX # runtime help Python implementation of the Google Protocol Buffers. diff --git a/package/python-psycopg2/Config.in b/package/python-psycopg2/Config.in index fba781c014..ec27d706de 100644 --- a/package/python-psycopg2/Config.in +++ b/package/python-psycopg2/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PSYCOPG2 bool "python-psycopg2" - depends on BR2_PACKAGE_PYTHON3 depends on BR2_USE_WCHAR # postgresql select BR2_PACKAGE_POSTGRESQL help @@ -24,5 +23,4 @@ config BR2_PACKAGE_PYTHON_PSYCOPG2 http://initd.org/psycopg/ comment "python-psycopg2 needs a toolchain w/ wchar" - depends on BR2_PACKAGE_PYTHON3 depends on !BR2_USE_WCHAR diff --git a/package/python-pudb/Config.in b/package/python-pudb/Config.in index 64789021d1..06f1b20c26 100644 --- a/package/python-pudb/Config.in +++ b/package/python-pudb/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PUDB bool "python-pudb" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_URWID # runtime select BR2_PACKAGE_PYTHON_JEDI # runtime select BR2_PACKAGE_PYTHON_PYGMENTS # runtime diff --git a/package/python-py/Config.in b/package/python-py/Config.in index 0e3c3390a0..354372f5b4 100644 --- a/package/python-py/Config.in +++ b/package/python-py/Config.in @@ -1,6 +1,5 @@ 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-pybind/Config.in b/package/python-pybind/Config.in index 27bc196e32..604cb9ee67 100644 --- a/package/python-pybind/Config.in +++ b/package/python-pybind/Config.in @@ -1,6 +1,5 @@ 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-pycairo/Config.in b/package/python-pycairo/Config.in index a44a0421e6..0d8de977e1 100644 --- a/package/python-pycairo/Config.in +++ b/package/python-pycairo/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PYCAIRO bool "python-pycairo" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_CAIRO help Python interface for cairo. diff --git a/package/python-pycares/Config.in b/package/python-pycares/Config.in index 3452ae6b10..889e0943be 100644 --- a/package/python-pycares/Config.in +++ b/package/python-pycares/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PYCARES bool "python-pycares" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_CFFI # runtime help Python interface for c-ares. diff --git a/package/python-pycups/Config.in b/package/python-pycups/Config.in index 61c2ba21d1..eeaf70c9e6 100644 --- a/package/python-pycups/Config.in +++ b/package/python-pycups/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_PYCUPS bool "python-pycups" depends on BR2_PACKAGE_CUPS - depends on BR2_PACKAGE_PYTHON3 help Python bindings for libcups. diff --git a/package/python-pydantic/Config.in b/package/python-pydantic/Config.in index ac81aeb342..41ec43adf4 100644 --- a/package/python-pydantic/Config.in +++ b/package/python-pydantic/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PYDANTIC bool "python-pydantic" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime help Data validation and settings management using python 3.6 diff --git a/package/python-pydyf/Config.in b/package/python-pydyf/Config.in index f283a6d6aa..42530eafbb 100644 --- a/package/python-pydyf/Config.in +++ b/package/python-pydyf/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PYDYF bool "python-pydyf" - depends on BR2_PACKAGE_PYTHON3 help A low-level PDF generator. diff --git a/package/python-pygments/Config.in b/package/python-pygments/Config.in index d74e53d4c8..f097c52397 100644 --- a/package/python-pygments/Config.in +++ b/package/python-pygments/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PYGMENTS bool "python-pygments" - depends on BR2_PACKAGE_PYTHON3 help Pygments is a syntax highlighting package written in Python. diff --git a/package/python-pyhamcrest/Config.in b/package/python-pyhamcrest/Config.in index 1bbae3fec7..c2a4dc06f7 100644 --- a/package/python-pyhamcrest/Config.in +++ b/package/python-pyhamcrest/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PYHAMCREST bool "python-pyhamcrest" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime select BR2_PACKAGE_PYTHON_SIX # runtime help diff --git a/package/python-pyjwt/Config.in b/package/python-pyjwt/Config.in index f8d4f8a9b8..510875ce2f 100644 --- a/package/python-pyjwt/Config.in +++ b/package/python-pyjwt/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PYJWT bool "python-pyjwt" - depends on BR2_PACKAGE_PYTHON3 help JSON Web Token implementation in Python. diff --git a/package/python-pymupdf/Config.in b/package/python-pymupdf/Config.in index 0ecb288922..b3f9565238 100644 --- a/package/python-pymupdf/Config.in +++ b/package/python-pymupdf/Config.in @@ -4,7 +4,6 @@ config BR2_PACKAGE_PYTHON_PYMUPDF depends on BR2_TOOLCHAIN_HAS_SYNC_4 # mupdf -> harfbuzz depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # mupdf -> harfbuzz depends on BR2_PACKAGE_XORG7 - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_MUPDF select BR2_PACKAGE_ZLIB @@ -14,12 +13,10 @@ config BR2_PACKAGE_PYTHON_PYMUPDF https://github.com/pymupdf/PyMuPDF comment "python-pymupdf needs Xorg" - depends on BR2_PACKAGE_PYTHON3 depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_PACKAGE_XORG7 comment "python-pymupdf needs a toolchain w/ C++, gcc >= 4.9" - depends on BR2_PACKAGE_PYTHON3 depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/python-pymysql/Config.in b/package/python-pymysql/Config.in index 69ba485e77..75b447cbd1 100644 --- a/package/python-pymysql/Config.in +++ b/package/python-pymysql/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PYMYSQL bool "python-pymysql" - depends on BR2_PACKAGE_PYTHON3 help PyMySQL is a pure-Python MySQL client library. It follows the DB-API 2.0. diff --git a/package/python-pynacl/Config.in b/package/python-pynacl/Config.in index 3bb4e29630..0553d82ce9 100644 --- a/package/python-pynacl/Config.in +++ b/package/python-pynacl/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PYNACL bool "python-pynacl" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_LIBSODIUM select BR2_PACKAGE_PYTHON_CFFI # runtime help diff --git a/package/python-pyndiff/Config.in b/package/python-pyndiff/Config.in index cd13056d79..58ca35ba97 100644 --- a/package/python-pyndiff/Config.in +++ b/package/python-pyndiff/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PYNDIFF bool "python-pyndiff" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_XMLJSON # runtime select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime help diff --git a/package/python-pyopenssl/Config.in b/package/python-pyopenssl/Config.in index 65d516813f..1a6fbd2147 100644 --- a/package/python-pyopenssl/Config.in +++ b/package/python-pyopenssl/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_PYOPENSSL bool "python-pyopenssl" 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 diff --git a/package/python-pyparsing/Config.in b/package/python-pyparsing/Config.in index 9b5894116d..926ca07ed7 100644 --- a/package/python-pyparsing/Config.in +++ b/package/python-pyparsing/Config.in @@ -1,6 +1,5 @@ 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 diff --git a/package/python-pyparted/Config.in b/package/python-pyparted/Config.in index 0ed24f8836..60f54a5484 100644 --- a/package/python-pyparted/Config.in +++ b/package/python-pyparted/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PYPARTED bool "python-pyparted" - depends on BR2_PACKAGE_PYTHON3 depends on BR2_ENABLE_LOCALE # parted depends on BR2_USE_WCHAR select BR2_PACKAGE_PARTED @@ -10,5 +9,4 @@ config BR2_PACKAGE_PYTHON_PYPARTED https://github.com/rhinstaller/pyparted comment "pyparted needs a toolchain w/ locale, wchar" - depends on BR2_PACKAGE_PYTHON3 depends on !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR diff --git a/package/python-pyphen/Config.in b/package/python-pyphen/Config.in index 30ccafcda4..e4707ff036 100644 --- a/package/python-pyphen/Config.in +++ b/package/python-pyphen/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PYPHEN bool "python-pyphen" - depends on BR2_PACKAGE_PYTHON3 help Pure Python module to hyphenate text. diff --git a/package/python-pysftp/Config.in b/package/python-pysftp/Config.in index c65369b667..fc4fdd972d 100644 --- a/package/python-pysftp/Config.in +++ b/package/python-pysftp/Config.in @@ -1,7 +1,6 @@ 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 select BR2_PACKAGE_PYTHON_PARAMIKO # runtime help A friendly face on SFTP. diff --git a/package/python-pytablereader/Config.in b/package/python-pytablereader/Config.in index 1c3f2af82f..889cb79820 100644 --- a/package/python-pytablereader/Config.in +++ b/package/python-pytablereader/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PYTABLEREADER bool "python-pytablereader" - depends on BR2_PACKAGE_PYTHON3 # python-mbstrdecoder, python-pathpy, python-beautifulsoup4, python-pathvalidate select BR2_PACKAGE_PYTHON_BEAUTIFULSOUP4 # runtime select BR2_PACKAGE_PYTHON_DATAPROPERTY # runtime select BR2_PACKAGE_PYTHON_JSONSCHEMA # runtime diff --git a/package/python-pytablewriter/Config.in b/package/python-pytablewriter/Config.in index e0405d12c8..041c30eb6c 100644 --- a/package/python-pytablewriter/Config.in +++ b/package/python-pytablewriter/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PYTABLEWRITER bool "python-pytablewriter" - depends on BR2_PACKAGE_PYTHON3 # python-dataproperty, python-mbstrdecoder, python-pathvalidate select BR2_PACKAGE_PYTHON_DATAPROPERTY # runtime select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime select BR2_PACKAGE_PYTHON_MSGFY # runtime diff --git a/package/python-pytest-asyncio/Config.in b/package/python-pytest-asyncio/Config.in index 3fa90e4e18..2088a8bdbf 100644 --- a/package/python-pytest-asyncio/Config.in +++ b/package/python-pytest-asyncio/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PYTEST_ASYNCIO bool "python-pytest-asyncio" - depends on BR2_PACKAGE_PYTHON3 # pytest select BR2_PACKAGE_PYTHON_PYTEST # runtime help Pytest support for asyncio. diff --git a/package/python-pytest/Config.in b/package/python-pytest/Config.in index ebbaeeea58..c3956c76d2 100644 --- a/package/python-pytest/Config.in +++ b/package/python-pytest/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PYTEST bool "python-pytest" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_ATTRS # runtime select BR2_PACKAGE_PYTHON_INICONFIG # runtime select BR2_PACKAGE_PYTHON_PACKAGING # runtime diff --git a/package/python-pytrie/Config.in b/package/python-pytrie/Config.in index 722d263d7e..156638476c 100644 --- a/package/python-pytrie/Config.in +++ b/package/python-pytrie/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PYTRIE bool "python-pytrie" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_SORTEDCONTAINERS # runtime help A pure Python implementation of the trie data structure. diff --git a/package/python-pyusb/Config.in b/package/python-pyusb/Config.in index 13080a9fde..bba3480a1b 100644 --- a/package/python-pyusb/Config.in +++ b/package/python-pyusb/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PYUSB bool "python-pyusb" - depends on BR2_PACKAGE_PYTHON3 depends on BR2_TOOLCHAIN_HAS_THREADS # libusb depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB diff --git a/package/python-pyyaml/Config.in b/package/python-pyyaml/Config.in index eb073b9c03..45e818b7e7 100644 --- a/package/python-pyyaml/Config.in +++ b/package/python-pyyaml/Config.in @@ -1,6 +1,5 @@ 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-requests-oauthlib/Config.in b/package/python-requests-oauthlib/Config.in index 2510644bd1..85283b209c 100644 --- a/package/python-requests-oauthlib/Config.in +++ b/package/python-requests-oauthlib/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_REQUESTS_OAUTHLIB bool "python-requests-oauthlib" - depends on BR2_PACKAGE_PYTHON3 # python-requests -> python-idna select BR2_PACKAGE_PYTHON_OAUTHLIB # runtime select BR2_PACKAGE_PYTHON_REQUESTS # runtime help diff --git a/package/python-requests-toolbelt/Config.in b/package/python-requests-toolbelt/Config.in index 47141c2c8a..ba2b95152e 100644 --- a/package/python-requests-toolbelt/Config.in +++ b/package/python-requests-toolbelt/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_REQUESTS_TOOLBELT bool "python-requests-toolbelt" - depends on BR2_PACKAGE_PYTHON3 # python-requests -> python-idna select BR2_PACKAGE_PYTHON_REQUESTS # runtime help A utility belt for advanced users of python-requests. diff --git a/package/python-requests/Config.in b/package/python-requests/Config.in index 9b04c07fc9..94a44682f4 100644 --- a/package/python-requests/Config.in +++ b/package/python-requests/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_REQUESTS bool "python-requests" - depends on BR2_PACKAGE_PYTHON3 # python-idna select BR2_PACKAGE_PYTHON_CERTIFI # runtime select BR2_PACKAGE_PYTHON_CHARSET_NORMALIZER # runtime select BR2_PACKAGE_PYTHON_IDNA # runtime diff --git a/package/python-rsa/Config.in b/package/python-rsa/Config.in index bc9ec2feab..5cafd8215f 100644 --- a/package/python-rsa/Config.in +++ b/package/python-rsa/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_RSA bool "python-rsa" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_PYASN1 # runtime help Python-RSA is a pure-Python RSA implementation. It supports diff --git a/package/python-s3transfer/Config.in b/package/python-s3transfer/Config.in index ad3a673938..a7f85b146c 100644 --- a/package/python-s3transfer/Config.in +++ b/package/python-s3transfer/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_S3TRANSFER bool "python-s3transfer" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_BOTOCORE # runtime help An Amazon S3 Transfer Manager. diff --git a/package/python-schedule/Config.in b/package/python-schedule/Config.in index a0f800e364..d00c245948 100644 --- a/package/python-schedule/Config.in +++ b/package/python-schedule/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_SCHEDULE bool "python-schedule" - depends on BR2_PACKAGE_PYTHON3 help Job scheduling for humans. diff --git a/package/python-secretstorage/Config.in b/package/python-secretstorage/Config.in index 059ea097bb..f0a8689ecd 100644 --- a/package/python-secretstorage/Config.in +++ b/package/python-secretstorage/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_SECRETSTORAGE bool "python-secretstorage" - depends on BR2_PACKAGE_PYTHON3 depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime help diff --git a/package/python-serial-asyncio/Config.in b/package/python-serial-asyncio/Config.in index 5520b72506..08396a0eeb 100644 --- a/package/python-serial-asyncio/Config.in +++ b/package/python-serial-asyncio/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_SERIAL_ASYNCIO bool "python-serial-asyncio" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_SERIAL help asyncio extension package for pyserial. diff --git a/package/python-service-identity/Config.in b/package/python-service-identity/Config.in index c571065e92..aa6d0fe715 100644 --- a/package/python-service-identity/Config.in +++ b/package/python-service-identity/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_PYTHON_SERVICE_IDENTITY # 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 diff --git a/package/python-setproctitle/Config.in b/package/python-setproctitle/Config.in index a901fd7055..d13afaa401 100644 --- a/package/python-setproctitle/Config.in +++ b/package/python-setproctitle/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_SETPROCTITLE bool "python-setproctitle" - depends on BR2_PACKAGE_PYTHON3 help A Python module to customize the process title. diff --git a/package/python-simpleaudio/Config.in b/package/python-simpleaudio/Config.in index c6fcd8b07a..1169342be7 100644 --- a/package/python-simpleaudio/Config.in +++ b/package/python-simpleaudio/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_SIMPLEAUDIO bool "python-simpleaudio" - depends on BR2_PACKAGE_PYTHON3 depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib select BR2_PACKAGE_ALSA_LIB help diff --git a/package/python-simplelogging/Config.in b/package/python-simplelogging/Config.in index 7f58791836..db95efa25f 100644 --- a/package/python-simplelogging/Config.in +++ b/package/python-simplelogging/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_SIMPLELOGGING bool "python-simplelogging" - depends on BR2_PACKAGE_PYTHON3 # python-colorlog select BR2_PACKAGE_PYTHON_COLORLOG # runtime help Logging made simple, no excuse for any debug print call. diff --git a/package/python-simplesqlite/Config.in b/package/python-simplesqlite/Config.in index 5a9fa4a5db..81501c9e83 100644 --- a/package/python-simplesqlite/Config.in +++ b/package/python-simplesqlite/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_SIMPLESQLITE bool "python-simplesqlite" - depends on BR2_PACKAGE_PYTHON3 # python-mbstrdecoder, python-pathvalidate select BR2_PACKAGE_PYTHON_DATAPROPERTY # runtime select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime select BR2_PACKAGE_PYTHON_PATHVALIDATE # runtime diff --git a/package/python-slob/Config.in b/package/python-slob/Config.in index 07d04d49a2..c06f544534 100644 --- a/package/python-slob/Config.in +++ b/package/python-slob/Config.in @@ -4,7 +4,6 @@ config BR2_PACKAGE_PYTHON_SLOB depends on BR2_HOST_GCC_AT_LEAST_4_9 # python-pyicu -> icu depends on BR2_INSTALL_LIBSTDCPP # python-pyicu -> icu depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # python-pyicu -> icu - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_PYICU # runtime # although optional, it is used as default compression select BR2_PACKAGE_PYTHON3_XZ # runtime @@ -15,7 +14,6 @@ config BR2_PACKAGE_PYTHON_SLOB https://github.com/itkach/slob comment "python-slob needs a toolchain w/ C++, gcc >= 4.9, host gcc >= 4.9" - depends on BR2_PACKAGE_PYTHON3 && !BR2_BINFMT_FLAT depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ !BR2_HOST_GCC_AT_LEAST_4_9 diff --git a/package/python-smmap2/Config.in b/package/python-smmap2/Config.in index 1d4b1fabbe..21a3bdb613 100644 --- a/package/python-smmap2/Config.in +++ b/package/python-smmap2/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_SMMAP2 bool "python-smmap2" - depends on BR2_PACKAGE_PYTHON3 help Smmap wraps an interface around mmap and tracks the mapped files as well as the amount of clients who use it. If the diff --git a/package/python-socketio/Config.in b/package/python-socketio/Config.in index 89d23b6ddf..a34853ec10 100644 --- a/package/python-socketio/Config.in +++ b/package/python-socketio/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_SOCKETIO bool "python-socketio" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_BIDICT # runtime select BR2_PACKAGE_PYTHON_ENGINEIO # runtime help diff --git a/package/python-sockjs/Config.in b/package/python-sockjs/Config.in index 583d7ec741..92489ec71f 100644 --- a/package/python-sockjs/Config.in +++ b/package/python-sockjs/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_SOCKJS bool "python-sockjs" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_AIOHTTP # runtime help SockJS server implementation for aiohttp. diff --git a/package/python-soupsieve/Config.in b/package/python-soupsieve/Config.in index eeac0ee36e..3cb7f8d0c5 100644 --- a/package/python-soupsieve/Config.in +++ b/package/python-soupsieve/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_SOUPSIEVE bool "python-soupsieve" - depends on BR2_PACKAGE_PYTHON3 help A modern CSS selector implementation for Beautiful Soup. diff --git a/package/python-sqliteschema/Config.in b/package/python-sqliteschema/Config.in index b8fed33c49..102a615765 100644 --- a/package/python-sqliteschema/Config.in +++ b/package/python-sqliteschema/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_SQLITESCHEMA bool "python-sqliteschema" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime select BR2_PACKAGE_PYTHON_TABLEDATA # runtime diff --git a/package/python-tabledata/Config.in b/package/python-tabledata/Config.in index a73207f9c0..9947f41af6 100644 --- a/package/python-tabledata/Config.in +++ b/package/python-tabledata/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_TABLEDATA bool "python-tabledata" - depends on BR2_PACKAGE_PYTHON3 # python-dataproperty, python-typepy select BR2_PACKAGE_PYTHON_DATAPROPERTY # runtime select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime select BR2_PACKAGE_PYTHON_SIX # runtime diff --git a/package/python-tempora/Config.in b/package/python-tempora/Config.in index 06ccbfc283..508cbae3f3 100644 --- a/package/python-tempora/Config.in +++ b/package/python-tempora/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_TEMPORA bool "python-tempora" - depends on BR2_PACKAGE_PYTHON3 # python-jaraco-functools select BR2_PACKAGE_PYTHON_JARACO_FUNCTOOLS # runtime select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_PYTZ # runtime diff --git a/package/python-tinycss2/Config.in b/package/python-tinycss2/Config.in index e6c992b8c5..a34717e002 100644 --- a/package/python-tinycss2/Config.in +++ b/package/python-tinycss2/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_TINYCSS2 bool "python-tinycss2" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_WEBENCODINGS # runtime help A tiny CSS parser. diff --git a/package/python-tinyrpc/Config.in b/package/python-tinyrpc/Config.in index 3194b7825a..3c643c754a 100644 --- a/package/python-tinyrpc/Config.in +++ b/package/python-tinyrpc/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_TINYRPC bool "python-tinyrpc" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_SIX # runtime help A small, modular, transport and protocol neutral RPC diff --git a/package/python-tomako/Config.in b/package/python-tomako/Config.in index 1521035bb6..bd6d29982a 100644 --- a/package/python-tomako/Config.in +++ b/package/python-tomako/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_TOMAKO bool "python-tomako" - depends on BR2_PACKAGE_PYTHON3 # python-tornado select BR2_PACKAGE_PYTHON_TORNADO # runtime select BR2_PACKAGE_PYTHON_MAKO # runtime help diff --git a/package/python-tomli/Config.in b/package/python-tomli/Config.in index e1cecaaa36..d2ae49a45f 100644 --- a/package/python-tomli/Config.in +++ b/package/python-tomli/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_TOMLI bool "python-tomli" - depends on BR2_PACKAGE_PYTHON3 help A lil' TOML parser. diff --git a/package/python-tornado/Config.in b/package/python-tornado/Config.in index e1bf8343f0..b5c59e970d 100644 --- a/package/python-tornado/Config.in +++ b/package/python-tornado/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_TORNADO bool "python-tornado" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON3_ZLIB select BR2_PACKAGE_PYTHON3_SSL help diff --git a/package/python-traitlets/Config.in b/package/python-traitlets/Config.in index 6515cdf8d1..a273601163 100644 --- a/package/python-traitlets/Config.in +++ b/package/python-traitlets/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_TRAITLETS bool "python-traitlets" - depends on BR2_PACKAGE_PYTHON3 help A configuration system for Python applications. diff --git a/package/python-treq/Config.in b/package/python-treq/Config.in index 6e54c19e16..f781b37305 100644 --- a/package/python-treq/Config.in +++ b/package/python-treq/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_PYTHON_TREQ # 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 diff --git a/package/python-twisted/Config.in b/package/python-twisted/Config.in index 89298b2e0c..49a21c4204 100644 --- a/package/python-twisted/Config.in +++ b/package/python-twisted/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_TWISTED bool "python-twisted" - depends on BR2_PACKAGE_PYTHON3 # python-pyhamcrest; python-hyperlink -> python-idna select BR2_PACKAGE_PYTHON_INCREMENTAL select BR2_PACKAGE_PYTHON_ATTRS # runtime select BR2_PACKAGE_PYTHON_AUTOMAT # runtime diff --git a/package/python-txaio/Config.in b/package/python-txaio/Config.in index 19a318a902..eddd983ea6 100644 --- a/package/python-txaio/Config.in +++ b/package/python-txaio/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_TXAIO bool "python-txaio" - depends on BR2_PACKAGE_PYTHON3 help Compatibility API between asyncio/Twisted/Trollius. diff --git a/package/python-txdbus/Config.in b/package/python-txdbus/Config.in index ffd00f153e..f3ea4c78d6 100644 --- a/package/python-txdbus/Config.in +++ b/package/python-txdbus/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_PYTHON_TXDBUS # 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 0606e5f442..fbea7be8cf 100644 --- a/package/python-txtorcon/Config.in +++ b/package/python-txtorcon/Config.in @@ -2,7 +2,6 @@ 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 select BR2_PACKAGE_PYTHON_AUTOMAT # runtime select BR2_PACKAGE_PYTHON_IDNA # runtime select BR2_PACKAGE_PYTHON_INCREMENTAL # runtime diff --git a/package/python-typepy/Config.in b/package/python-typepy/Config.in index fd3b983186..3438e74475 100644 --- a/package/python-typepy/Config.in +++ b/package/python-typepy/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_TYPEPY bool "python-typepy" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime help A Python library for variable type diff --git a/package/python-ujson/Config.in b/package/python-ujson/Config.in index aee1d75fce..81d1bc457c 100644 --- a/package/python-ujson/Config.in +++ b/package/python-ujson/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_UJSON bool "python-ujson" - depends on BR2_PACKAGE_PYTHON3 help UltraJSON is an ultra fast JSON encoder and decoder written in pure C with bindings for Python 3. diff --git a/package/python-unittest-xml-reporting/Config.in b/package/python-unittest-xml-reporting/Config.in index b1a6244dd3..43b054faa7 100644 --- a/package/python-unittest-xml-reporting/Config.in +++ b/package/python-unittest-xml-reporting/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_UNITTEST_XML_REPORTING bool "python-unittest-xml-reporting" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON3_PYEXPAT help unittest-based test runner with Ant/JUnit like XML diff --git a/package/python-urwid/Config.in b/package/python-urwid/Config.in index c141e8c0bd..f584a9258d 100644 --- a/package/python-urwid/Config.in +++ b/package/python-urwid/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_URWID bool "python-urwid" - depends on BR2_PACKAGE_PYTHON3 help Urwid is a console user interface library for Python diff --git a/package/python-uvloop/Config.in b/package/python-uvloop/Config.in index 76e06ac3f4..b3fb275091 100644 --- a/package/python-uvloop/Config.in +++ b/package/python-uvloop/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_UVLOOP bool "python-uvloop" - depends on BR2_PACKAGE_PYTHON3 depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv depends on BR2_USE_MMU # libuv depends on !BR2_STATIC_LIBS # libuv diff --git a/package/python-validators/Config.in b/package/python-validators/Config.in index 802b1dde5b..e700369910 100644 --- a/package/python-validators/Config.in +++ b/package/python-validators/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_VALIDATORS bool "python-validators" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_DECORATOR # runtime help diff --git a/package/python-watchdog/Config.in b/package/python-watchdog/Config.in index 6f0dd62073..18f569ee44 100644 --- a/package/python-watchdog/Config.in +++ b/package/python-watchdog/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_WATCHDOG bool "python-watchdog" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_ARGH # runtime select BR2_PACKAGE_PYTHON_PATHTOOLS # runtime select BR2_PACKAGE_PYTHON_PYYAML # runtime diff --git a/package/python-weasyprint/Config.in b/package/python-weasyprint/Config.in index de68fe2f5b..4a7e5a513d 100644 --- a/package/python-weasyprint/Config.in +++ b/package/python-weasyprint/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_WEASYPRINT bool "python-weasyprint" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_BROTLI # runtime select BR2_PACKAGE_PYTHON_CFFI # runtime select BR2_PACKAGE_PYTHON_CSSSELECT2 # runtime diff --git a/package/python-webpy/Config.in b/package/python-webpy/Config.in index 419a4a180f..ed78409572 100644 --- a/package/python-webpy/Config.in +++ b/package/python-webpy/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_WEBPY bool "python-webpy" - depends on BR2_PACKAGE_PYTHON3 # python-cheroot select BR2_PACKAGE_PYTHON_CHEROOT # runtime select BR2_PACKAGE_PYTHON_MARKDOWN # runtime help diff --git a/package/python-websockets/Config.in b/package/python-websockets/Config.in index 888bec616f..60495b6284 100644 --- a/package/python-websockets/Config.in +++ b/package/python-websockets/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_WEBSOCKETS bool "python-websockets" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON3_ZLIB select BR2_PACKAGE_PYTHON3_SSL help diff --git a/package/python-wtforms/Config.in b/package/python-wtforms/Config.in index 0cc136fc13..33a17d3d37 100644 --- a/package/python-wtforms/Config.in +++ b/package/python-wtforms/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_WTFORMS bool "python-wtforms" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_MARKUPSAFE # runtime help A flexible forms validation and rendering library for diff --git a/package/python-xlib/Config.in b/package/python-xlib/Config.in index 20e585db9a..081af6a2fc 100644 --- a/package/python-xlib/Config.in +++ b/package/python-xlib/Config.in @@ -1,6 +1,5 @@ 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) diff --git a/package/python-xlsxwriter/Config.in b/package/python-xlsxwriter/Config.in index b5da7f3f1a..59fe3ba91c 100644 --- a/package/python-xlsxwriter/Config.in +++ b/package/python-xlsxwriter/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_XLSXWRITER bool "python-xlsxwriter" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON3_ZLIB help A Python module for creating Excel XLSX files. diff --git a/package/python-yarl/Config.in b/package/python-yarl/Config.in index e52050451d..84e14ce92e 100644 --- a/package/python-yarl/Config.in +++ b/package/python-yarl/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_YARL bool "python-yarl" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_MULTIDICT select BR2_PACKAGE_PYTHON_IDNA help diff --git a/package/python-zeroconf/Config.in b/package/python-zeroconf/Config.in index a56bf7c16c..1570674f59 100644 --- a/package/python-zeroconf/Config.in +++ b/package/python-zeroconf/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_ZEROCONF bool "python-zeroconf" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_IFADDR # runtime help Pure Python Multicast DNS Service Discovery Library diff --git a/package/python-zopfli/Config.in b/package/python-zopfli/Config.in index 69d4b8b514..0b1ebca85c 100644 --- a/package/python-zopfli/Config.in +++ b/package/python-zopfli/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_ZOPFLI bool "python-zopfli" - depends on BR2_PACKAGE_PYTHON3 help Zopfli module for python. -- 2.20.1 From peron.clem at gmail.com Sat Feb 12 11:17:10 2022 From: peron.clem at gmail.com (=?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?=) Date: Sat, 12 Feb 2022 12:17:10 +0100 Subject: [Buildroot] [PATCH] configs/beelink_gs1: select BR2_TARGET_UBOOT_NEEDS_OPENSSL Message-ID: <20220212111710.22559-1-peron.clem@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/2076475033 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 ca953df3ea..b7b7eb84d0 100644 --- a/configs/beelink_gs1_defconfig +++ b/configs/beelink_gs1_defconfig @@ -39,6 +39,7 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y 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_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -- 2.32.0 From james.hilliard1 at gmail.com Sat Feb 12 11:18:43 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 12 Feb 2022 04:18:43 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-setuptools: bump to version 60.8.2 Message-ID: <20220212111843.1210441-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-setuptools/python-setuptools.hash | 4 ++-- package/python-setuptools/python-setuptools.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-setuptools/python-setuptools.hash b/package/python-setuptools/python-setuptools.hash index 8df7155d4c..e04235e041 100644 --- a/package/python-setuptools/python-setuptools.hash +++ b/package/python-setuptools/python-setuptools.hash @@ -1,4 +1,4 @@ # From https://pypi.org/pypi/setuptools/json -md5 082637e8fbc2e1fd9c637665d8fcccd8 setuptools-60.7.0.tar.gz -sha256 b83cf328a4f6a987c95610e76b29a30778db05174eef71f771776c48f8f25d1b setuptools-60.7.0.tar.gz +md5 f47a5750f6084cce3418f213a9d97785 setuptools-60.8.2.tar.gz +sha256 66b8598da112b8dc8cd941d54cf63ef91d3b50657b374457eda5851f3ff6a899 setuptools-60.8.2.tar.gz sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk index 584f83f7a0..8653c42259 100644 --- a/package/python-setuptools/python-setuptools.mk +++ b/package/python-setuptools/python-setuptools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SETUPTOOLS_VERSION = 60.7.0 +PYTHON_SETUPTOOLS_VERSION = 60.8.2 PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).tar.gz -PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/29/dd/48d662bb93e5e51e72265ef612f869947d4ae4126328d7156824cd50d440 +PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/ae/0b/e458b0d07dced3d7fa2d21d828e708f374ef82040f2012c05d35f47f9af3 PYTHON_SETUPTOOLS_LICENSE = MIT PYTHON_SETUPTOOLS_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_CPE_ID_VENDOR = python -- 2.25.1 From james.hilliard1 at gmail.com Sat Feb 12 11:20:57 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 12 Feb 2022 04:20:57 -0700 Subject: [Buildroot] [PATCH] package/python-*: drop python3 dependency In-Reply-To: <20220212104349.6015-1-peter@korsgaard.com> References: <20220212104349.6015-1-peter@korsgaard.com> Message-ID: On Sat, Feb 12, 2022 at 3:44 AM Peter Korsgaard wrote: > > All the python packages are inside an if BR2_PACKAGE_PYTHON3, so with the > removal of python2 support, the explicit python3 dependency is redundant. > Remove it. > > Signed-off-by: Peter Korsgaard Reviewed-by: James Hilliard > --- > package/python-aexpect/Config.in | 1 - > package/python-aioblescan/Config.in | 1 - > package/python-aiocoap/Config.in | 1 - > package/python-aioconsole/Config.in | 1 - > package/python-aiodns/Config.in | 1 - > package/python-aiofiles/Config.in | 1 - > package/python-aiohttp-cors/Config.in | 1 - > package/python-aiohttp-debugtoolbar/Config.in | 1 - > package/python-aiohttp-jinja2/Config.in | 1 - > package/python-aiohttp-mako/Config.in | 1 - > package/python-aiohttp-remotes/Config.in | 1 - > package/python-aiohttp-security/Config.in | 1 - > package/python-aiohttp-session/Config.in | 1 - > package/python-aiohttp-sse/Config.in | 1 - > package/python-aiohttp/Config.in | 1 - > package/python-aiojobs/Config.in | 1 - > package/python-aiologstash/Config.in | 1 - > package/python-aiomonitor/Config.in | 1 - > package/python-aioprocessing/Config.in | 1 - > package/python-aioredis/Config.in | 1 - > package/python-aiorwlock/Config.in | 1 - > package/python-aiosignal/Config.in | 1 - > package/python-aiozipkin/Config.in | 1 - > package/python-argon2-cffi-bindings/Config.in | 1 - > package/python-arrow/Config.in | 1 - > package/python-asgiref/Config.in | 1 - > package/python-async-lru/Config.in | 1 - > package/python-async-timeout/Config.in | 1 - > package/python-attrs/Config.in | 1 - > package/python-autobahn/Config.in | 1 - > package/python-automat/Config.in | 1 - > package/python-avro/Config.in | 1 - > package/python-bcrypt/Config.in | 1 - > package/python-beautifulsoup4/Config.in | 1 - > package/python-bidict/Config.in | 1 - > package/python-bleak/Config.in | 1 - > package/python-bluezero/Config.in | 2 -- > package/python-boto3/Config.in | 1 - > package/python-botocore/Config.in | 1 - > package/python-cbor2/Config.in | 1 - > package/python-cchardet/Config.in | 2 -- > package/python-channels-redis/Config.in | 1 - > package/python-channels/Config.in | 1 - > package/python-charset-normalizer/Config.in | 1 - > package/python-cheroot/Config.in | 1 - > package/python-cherrypy/Config.in | 1 - > package/python-colorlog/Config.in | 1 - > package/python-colorzero/Config.in | 1 - > package/python-configshell-fb/Config.in | 1 - > package/python-crayons/Config.in | 1 - > package/python-crontab/Config.in | 1 - > package/python-crossbar/Config.in | 1 - > package/python-cryptography/Config.in | 1 - > package/python-cssselect2/Config.in | 1 - > package/python-cssutils/Config.in | 1 - > package/python-cycler/Config.in | 1 - > package/python-daphne/Config.in | 1 - > package/python-dataproperty/Config.in | 1 - > package/python-dateutil/Config.in | 1 - > package/python-dbus-next/Config.in | 1 - > package/python-decorator/Config.in | 1 - > package/python-dialog3/Config.in | 1 - > package/python-django-enumfields/Config.in | 1 - > package/python-django/Config.in | 1 - > package/python-dnspython/Config.in | 1 - > package/python-docker/Config.in | 1 - > package/python-engineio/Config.in | 1 - > package/python-falcon/Config.in | 1 - > package/python-filelock/Config.in | 1 - > package/python-flask-babel/Config.in | 1 - > package/python-flask-cors/Config.in | 1 - > package/python-flask-expects-json/Config.in | 1 - > package/python-flask-jsonrpc/Config.in | 1 - > package/python-flask-login/Config.in | 1 - > package/python-flask-sqlalchemy/Config.in | 1 - > package/python-flask-wtf/Config.in | 1 - > package/python-flup/Config.in | 1 - > package/python-fonttools/Config.in | 1 - > package/python-frozenlist/Config.in | 1 - > package/python-git/Config.in | 1 - > package/python-gitdb2/Config.in | 1 - > package/python-gobject/Config.in | 1 - > package/python-gpiozero/Config.in | 1 - > package/python-gunicorn/Config.in | 1 - > package/python-h2/Config.in | 1 - > package/python-hiredis/Config.in | 1 - > package/python-hpack/Config.in | 1 - > package/python-httplib2/Config.in | 1 - > package/python-humanize/Config.in | 1 - > package/python-hyperframe/Config.in | 1 - > package/python-hyperlink/Config.in | 1 - > package/python-ibmiotf/Config.in | 1 - > package/python-idna/Config.in | 1 - > package/python-inflection/Config.in | 1 - > package/python-influxdb/Config.in | 1 - > package/python-ipdb/Config.in | 1 - > package/python-ipython/Config.in | 1 - > package/python-itsdangerous/Config.in | 1 - > package/python-janus/Config.in | 1 - > package/python-jaraco-classes/Config.in | 1 - > package/python-jaraco-functools/Config.in | 1 - > package/python-jedi/Config.in | 1 - > package/python-jinja2/Config.in | 1 - > package/python-jsonmodels/Config.in | 1 - > package/python-keyring/Config.in | 1 - > package/python-libusb1/Config.in | 2 -- > package/python-markdown/Config.in | 1 - > package/python-markdown2/Config.in | 1 - > package/python-markupsafe/Config.in | 1 - > package/python-matplotlib/Config.in | 1 - > package/python-mbstrdecoder/Config.in | 1 - > package/python-memory-profiler/Config.in | 1 - > package/python-more-itertools/Config.in | 1 - > package/python-mpd2/Config.in | 1 - > package/python-msgfy/Config.in | 1 - > package/python-multidict/Config.in | 1 - > package/python-mutagen/Config.in | 1 - > package/python-mwclient/Config.in | 1 - > package/python-mwscrape/Config.in | 1 - > package/python-mwscrape2slob/Config.in | 2 -- > package/python-networkx/Config.in | 1 - > package/python-numpy/Config.in | 2 -- > package/python-oauthlib/Config.in | 1 - > package/python-opcua-asyncio/Config.in | 1 - > package/python-packaging/Config.in | 1 - > package/python-paramiko/Config.in | 1 - > package/python-parso/Config.in | 1 - > package/python-pathpy/Config.in | 1 - > package/python-pathvalidate/Config.in | 1 - > package/python-piexif/Config.in | 1 - > package/python-pillow/Config.in | 1 - > package/python-pip/Config.in | 1 - > package/python-pluggy/Config.in | 1 - > package/python-portend/Config.in | 1 - > package/python-priority/Config.in | 1 - > package/python-prompt-toolkit/Config.in | 1 - > package/python-protobuf/Config.in | 1 - > package/python-psycopg2/Config.in | 2 -- > package/python-pudb/Config.in | 1 - > package/python-py/Config.in | 1 - > package/python-pybind/Config.in | 1 - > package/python-pycairo/Config.in | 1 - > package/python-pycares/Config.in | 1 - > package/python-pycups/Config.in | 1 - > package/python-pydantic/Config.in | 1 - > package/python-pydyf/Config.in | 1 - > package/python-pygments/Config.in | 1 - > package/python-pyhamcrest/Config.in | 1 - > package/python-pyjwt/Config.in | 1 - > package/python-pymupdf/Config.in | 3 --- > package/python-pymysql/Config.in | 1 - > package/python-pynacl/Config.in | 1 - > package/python-pyndiff/Config.in | 1 - > package/python-pyopenssl/Config.in | 1 - > package/python-pyparsing/Config.in | 1 - > package/python-pyparted/Config.in | 2 -- > package/python-pyphen/Config.in | 1 - > package/python-pysftp/Config.in | 1 - > package/python-pytablereader/Config.in | 1 - > package/python-pytablewriter/Config.in | 1 - > package/python-pytest-asyncio/Config.in | 1 - > package/python-pytest/Config.in | 1 - > package/python-pytrie/Config.in | 1 - > package/python-pyusb/Config.in | 1 - > package/python-pyyaml/Config.in | 1 - > package/python-requests-oauthlib/Config.in | 1 - > package/python-requests-toolbelt/Config.in | 1 - > package/python-requests/Config.in | 1 - > package/python-rsa/Config.in | 1 - > package/python-s3transfer/Config.in | 1 - > package/python-schedule/Config.in | 1 - > package/python-secretstorage/Config.in | 1 - > package/python-serial-asyncio/Config.in | 1 - > package/python-service-identity/Config.in | 1 - > package/python-setproctitle/Config.in | 1 - > package/python-simpleaudio/Config.in | 1 - > package/python-simplelogging/Config.in | 1 - > package/python-simplesqlite/Config.in | 1 - > package/python-slob/Config.in | 2 -- > package/python-smmap2/Config.in | 1 - > package/python-socketio/Config.in | 1 - > package/python-sockjs/Config.in | 1 - > package/python-soupsieve/Config.in | 1 - > package/python-sqliteschema/Config.in | 1 - > package/python-tabledata/Config.in | 1 - > package/python-tempora/Config.in | 1 - > package/python-tinycss2/Config.in | 1 - > package/python-tinyrpc/Config.in | 1 - > package/python-tomako/Config.in | 1 - > package/python-tomli/Config.in | 1 - > package/python-tornado/Config.in | 1 - > package/python-traitlets/Config.in | 1 - > package/python-treq/Config.in | 1 - > package/python-twisted/Config.in | 1 - > package/python-txaio/Config.in | 1 - > package/python-txdbus/Config.in | 1 - > package/python-txtorcon/Config.in | 1 - > package/python-typepy/Config.in | 1 - > package/python-ujson/Config.in | 1 - > package/python-unittest-xml-reporting/Config.in | 1 - > package/python-urwid/Config.in | 1 - > package/python-uvloop/Config.in | 1 - > package/python-validators/Config.in | 1 - > package/python-watchdog/Config.in | 1 - > package/python-weasyprint/Config.in | 1 - > package/python-webpy/Config.in | 1 - > package/python-websockets/Config.in | 1 - > package/python-wtforms/Config.in | 1 - > package/python-xlib/Config.in | 1 - > package/python-xlsxwriter/Config.in | 1 - > package/python-yarl/Config.in | 1 - > package/python-zeroconf/Config.in | 1 - > package/python-zopfli/Config.in | 1 - > 213 files changed, 223 deletions(-) > > diff --git a/package/python-aexpect/Config.in b/package/python-aexpect/Config.in > index eddba8e0b7..cc805da657 100644 > --- a/package/python-aexpect/Config.in > +++ b/package/python-aexpect/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_AEXPECT > bool "python-aexpect" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_SIX # runtime > help > Aexpect. > diff --git a/package/python-aioblescan/Config.in b/package/python-aioblescan/Config.in > index dd1acfa095..8f6db48a8b 100644 > --- a/package/python-aioblescan/Config.in > +++ b/package/python-aioblescan/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_AIOBLESCAN > bool "python-aioblescan" > - depends on BR2_PACKAGE_PYTHON3 > help > Scanning Bluetooth for advertised info with asyncio. > > diff --git a/package/python-aiocoap/Config.in b/package/python-aiocoap/Config.in > index cf5ca4e844..c46614324f 100644 > --- a/package/python-aiocoap/Config.in > +++ b/package/python-aiocoap/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_AIOCOAP > bool "python-aiocoap" > - depends on BR2_PACKAGE_PYTHON3 > help > Python CoAP library. > > diff --git a/package/python-aioconsole/Config.in b/package/python-aioconsole/Config.in > index cd52eecf32..6b2a15e115 100644 > --- a/package/python-aioconsole/Config.in > +++ b/package/python-aioconsole/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_AIOCONSOLE > bool "python-aioconsole" > - depends on BR2_PACKAGE_PYTHON3 > help > Asynchronous console and interfaces for asyncio. > > diff --git a/package/python-aiodns/Config.in b/package/python-aiodns/Config.in > index aa5970598f..63c2429390 100644 > --- a/package/python-aiodns/Config.in > +++ b/package/python-aiodns/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_AIODNS > bool "python-aiodns" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_PYCARES # runtime > help > Simple DNS resolver for asyncio. > diff --git a/package/python-aiofiles/Config.in b/package/python-aiofiles/Config.in > index 9cc3d7fe59..1e6add5358 100644 > --- a/package/python-aiofiles/Config.in > +++ b/package/python-aiofiles/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_AIOFILES > bool "python-aiofiles" > - depends on BR2_PACKAGE_PYTHON3 > help > aiofiles aims to handle local disk files in > asyncio applications. > diff --git a/package/python-aiohttp-cors/Config.in b/package/python-aiohttp-cors/Config.in > index 1c97cf3f87..dea3b44080 100644 > --- a/package/python-aiohttp-cors/Config.in > +++ b/package/python-aiohttp-cors/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_AIOHTTP_CORS > bool "python-aiohttp-cors" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_AIOHTTP # runtime > help > CORS support for aiohttp. > diff --git a/package/python-aiohttp-debugtoolbar/Config.in b/package/python-aiohttp-debugtoolbar/Config.in > index b22d2cf946..e2fede8065 100644 > --- a/package/python-aiohttp-debugtoolbar/Config.in > +++ b/package/python-aiohttp-debugtoolbar/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_AIOHTTP_DEBUGTOOLBAR > bool "python-aiohttp-debugtoolbar" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_AIOHTTP # runtime > select BR2_PACKAGE_PYTHON_AIOHTTP_JINJA2 # runtime > help > diff --git a/package/python-aiohttp-jinja2/Config.in b/package/python-aiohttp-jinja2/Config.in > index dd4bb0d23b..a536825b7e 100644 > --- a/package/python-aiohttp-jinja2/Config.in > +++ b/package/python-aiohttp-jinja2/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_AIOHTTP_JINJA2 > bool "python-aiohttp-jinja2" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_AIOHTTP # runtime > select BR2_PACKAGE_PYTHON_JINJA2 # runtime > help > diff --git a/package/python-aiohttp-mako/Config.in b/package/python-aiohttp-mako/Config.in > index 8c5df6a481..4dae5d95ad 100644 > --- a/package/python-aiohttp-mako/Config.in > +++ b/package/python-aiohttp-mako/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_AIOHTTP_MAKO > bool "python-aiohttp-mako" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_AIOHTTP # runtime > select BR2_PACKAGE_PYTHON_MAKO # runtime > help > diff --git a/package/python-aiohttp-remotes/Config.in b/package/python-aiohttp-remotes/Config.in > index e44696ba1e..7208e373ad 100644 > --- a/package/python-aiohttp-remotes/Config.in > +++ b/package/python-aiohttp-remotes/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_AIOHTTP_REMOTES > bool "python-aiohttp-remotes" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_AIOHTTP # runtime > help > Control remote side information. > diff --git a/package/python-aiohttp-security/Config.in b/package/python-aiohttp-security/Config.in > index f92c458584..96204d7e22 100644 > --- a/package/python-aiohttp-security/Config.in > +++ b/package/python-aiohttp-security/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_AIOHTTP_SECURITY > bool "python-aiohttp-security" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_AIOHTTP # runtime > help > Security for aiohttp.web. > diff --git a/package/python-aiohttp-session/Config.in b/package/python-aiohttp-session/Config.in > index c148165f00..99c01794a7 100644 > --- a/package/python-aiohttp-session/Config.in > +++ b/package/python-aiohttp-session/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_AIOHTTP_SESSION > bool "python-aiohttp-session" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_AIOHTTP # runtime > help > Sessions for aiohttp.web. > diff --git a/package/python-aiohttp-sse/Config.in b/package/python-aiohttp-sse/Config.in > index 781bbf4de7..6e408b7e12 100644 > --- a/package/python-aiohttp-sse/Config.in > +++ b/package/python-aiohttp-sse/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_AIOHTTP_SSE > bool "python-aiohttp-sse" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_AIOHTTP # runtime > help > Server-sent events support for aiohttp. > diff --git a/package/python-aiohttp/Config.in b/package/python-aiohttp/Config.in > index 85a6862141..35c162b948 100644 > --- a/package/python-aiohttp/Config.in > +++ b/package/python-aiohttp/Config.in > @@ -1,6 +1,5 @@ > 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 > diff --git a/package/python-aiojobs/Config.in b/package/python-aiojobs/Config.in > index ab61985164..0cdd1c106f 100644 > --- a/package/python-aiojobs/Config.in > +++ b/package/python-aiojobs/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_AIOJOBS > bool "python-aiojobs" > - depends on BR2_PACKAGE_PYTHON3 > help > Jobs scheduler for managing background task (asyncio). > > diff --git a/package/python-aiologstash/Config.in b/package/python-aiologstash/Config.in > index e70c232fd2..ce7ebe03cd 100644 > --- a/package/python-aiologstash/Config.in > +++ b/package/python-aiologstash/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_AIOLOGSTASH > bool "python-aiologstash" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_ASYNC_TIMEOUT # runtime > select BR2_PACKAGE_PYTHON_LOGSTASH # runtime > help > diff --git a/package/python-aiomonitor/Config.in b/package/python-aiomonitor/Config.in > index c76c952c82..435900ae32 100644 > --- a/package/python-aiomonitor/Config.in > +++ b/package/python-aiomonitor/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_AIOMONITOR > bool "python-aiomonitor" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_TERMINALTABLES # runtime > select BR2_PACKAGE_PYTHON_AIOCONSOLE # runtime > help > diff --git a/package/python-aioprocessing/Config.in b/package/python-aioprocessing/Config.in > index 2e76bc562b..381805c759 100644 > --- a/package/python-aioprocessing/Config.in > +++ b/package/python-aioprocessing/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_AIOPROCESSING > bool "python-aioprocessing" > - depends on BR2_PACKAGE_PYTHON3 > help > A Python 3.5+ library that integrates the multiprocessing > module with asyncio. > diff --git a/package/python-aioredis/Config.in b/package/python-aioredis/Config.in > index dc2ee01d9a..46ed2c7a46 100644 > --- a/package/python-aioredis/Config.in > +++ b/package/python-aioredis/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_AIOREDIS > bool "python-aioredis" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_ASYNC_TIMEOUT # runtime > select BR2_PACKAGE_PYTHON_HIREDIS # runtime > help > diff --git a/package/python-aiorwlock/Config.in b/package/python-aiorwlock/Config.in > index afdc27dd6f..3b61890555 100644 > --- a/package/python-aiorwlock/Config.in > +++ b/package/python-aiorwlock/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_AIORWLOCK > bool "python-aiorwlock" > - depends on BR2_PACKAGE_PYTHON3 > help > Read write lock for asyncio. > > diff --git a/package/python-aiosignal/Config.in b/package/python-aiosignal/Config.in > index 6b7753defd..9bb2998304 100644 > --- a/package/python-aiosignal/Config.in > +++ b/package/python-aiosignal/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_AIOSIGNAL > bool "python-aiosignal" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_FROZENLIST # runtime > help > aiosignal: a list of registered asynchronous callbacks. > diff --git a/package/python-aiozipkin/Config.in b/package/python-aiozipkin/Config.in > index 643fc9a4da..6ce6d86b6e 100644 > --- a/package/python-aiozipkin/Config.in > +++ b/package/python-aiozipkin/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_AIOZIPKIN > bool "python-aiozipkin" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_AIOHTTP # runtime > help > Distributed tracing instrumentation for asyncio application > diff --git a/package/python-argon2-cffi-bindings/Config.in b/package/python-argon2-cffi-bindings/Config.in > index 3d409759e0..2e6a4a6c96 100644 > --- a/package/python-argon2-cffi-bindings/Config.in > +++ b/package/python-argon2-cffi-bindings/Config.in > @@ -1,6 +1,5 @@ > 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 > diff --git a/package/python-arrow/Config.in b/package/python-arrow/Config.in > index aed9a682ff..244956879c 100644 > --- a/package/python-arrow/Config.in > +++ b/package/python-arrow/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_ARROW > bool "python-arrow" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_DATEUTIL # runtime > help > Better dates and times for Python. > diff --git a/package/python-asgiref/Config.in b/package/python-asgiref/Config.in > index e131f476c2..d0b816c369 100644 > --- a/package/python-asgiref/Config.in > +++ b/package/python-asgiref/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_ASGIREF > bool "python-asgiref" > - depends on BR2_PACKAGE_PYTHON3 > help > ASGI is a standard for Python asynchronous web apps and > servers to communicate with each other, and positioned as > diff --git a/package/python-async-lru/Config.in b/package/python-async-lru/Config.in > index 794f504e5e..dc44e8cd11 100644 > --- a/package/python-async-lru/Config.in > +++ b/package/python-async-lru/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_ASYNC_LRU > bool "python-async-lru" > - depends on BR2_PACKAGE_PYTHON3 > help > Simple lru_cache for asyncio. > > diff --git a/package/python-async-timeout/Config.in b/package/python-async-timeout/Config.in > index 27cfe51f7b..d19f15b3c6 100644 > --- a/package/python-async-timeout/Config.in > +++ b/package/python-async-timeout/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_ASYNC_TIMEOUT > bool "python-async-timeout" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime > help > asyncio-compatible timeout context manager. > diff --git a/package/python-attrs/Config.in b/package/python-attrs/Config.in > index b1a69d0e3e..fb0ab248fa 100644 > --- a/package/python-attrs/Config.in > +++ b/package/python-attrs/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_ATTRS > bool "python-attrs" > - depends on BR2_PACKAGE_PYTHON3 > help > attrs is the Python package that will bring back the joy of > writing classes by relieving you from the drudgery of > diff --git a/package/python-autobahn/Config.in b/package/python-autobahn/Config.in > index 92ddad0ea4..627bcd73e5 100644 > --- a/package/python-autobahn/Config.in > +++ b/package/python-autobahn/Config.in > @@ -1,7 +1,6 @@ > config BR2_PACKAGE_PYTHON_AUTOBAHN > bool "python-autobahn" > 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 > select BR2_PACKAGE_PYTHON_HYPERLINK # runtime > diff --git a/package/python-automat/Config.in b/package/python-automat/Config.in > index 9d22276c2c..ee02d22b5b 100644 > --- a/package/python-automat/Config.in > +++ b/package/python-automat/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_AUTOMAT > bool "python-automat" > - depends on BR2_PACKAGE_PYTHON3 # python-attrs > select BR2_PACKAGE_PYTHON_ATTRS # runtime > select BR2_PACKAGE_PYTHON_SIX # runtime > help > diff --git a/package/python-avro/Config.in b/package/python-avro/Config.in > index e1d7fc832c..1f67732ce0 100644 > --- a/package/python-avro/Config.in > +++ b/package/python-avro/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_AVRO > bool "python-avro" > - depends on BR2_PACKAGE_PYTHON3 > help > Select this option to install the Avro Python3 language > bindings, and the `avro` command line tool > diff --git a/package/python-bcrypt/Config.in b/package/python-bcrypt/Config.in > index 81becad322..9e9864e9d2 100644 > --- a/package/python-bcrypt/Config.in > +++ b/package/python-bcrypt/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_BCRYPT > bool "python-bcrypt" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_CFFI # runtime > help > Modern password hashing for your software and your servers. > diff --git a/package/python-beautifulsoup4/Config.in b/package/python-beautifulsoup4/Config.in > index 93fa540a73..eb7d2ba673 100644 > --- a/package/python-beautifulsoup4/Config.in > +++ b/package/python-beautifulsoup4/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_BEAUTIFULSOUP4 > bool "python-beautifulsoup4" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_SOUPSIEVE # runtime > help > Beautiful Soup is a Python library for pulling data out of > diff --git a/package/python-bidict/Config.in b/package/python-bidict/Config.in > index adbfda69b8..dfc55b87dd 100644 > --- a/package/python-bidict/Config.in > +++ b/package/python-bidict/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_BIDICT > bool "python-bidict" > - depends on BR2_PACKAGE_PYTHON3 > help > The bidirectional mapping library for Python. > > diff --git a/package/python-bleak/Config.in b/package/python-bleak/Config.in > index 43ed65d752..085c16fae8 100644 > --- a/package/python-bleak/Config.in > +++ b/package/python-bleak/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_BLEAK > bool "python-bleak" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_DBUS_NEXT # runtime > help > Bluetooth Low Energy platform Agnostic Klient. > diff --git a/package/python-bluezero/Config.in b/package/python-bluezero/Config.in > index d617b96d67..fa0998a298 100644 > --- a/package/python-bluezero/Config.in > +++ b/package/python-bluezero/Config.in > @@ -4,7 +4,6 @@ config BR2_PACKAGE_PYTHON_BLUEZERO > depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # python-gobject -> gobject-introspection > 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_PYTHON3 > select BR2_PACKAGE_DBUS # runtime > select BR2_PACKAGE_DBUS_PYTHON # runtime > select BR2_PACKAGE_PYTHON_GOBJECT # runtime > @@ -14,7 +13,6 @@ config BR2_PACKAGE_PYTHON_BLUEZERO > https://github.com/ukBaz/python-bluezero > > comment "python-bluezero needs a glibc toolchain, gcc >= 4.9, host gcc >= 8" > - depends on BR2_PACKAGE_PYTHON3 > depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS > depends on !BR2_TOOLCHAIN_USES_GLIBC || \ > !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ > diff --git a/package/python-boto3/Config.in b/package/python-boto3/Config.in > index 1cb1ebfd12..67b1420388 100644 > --- a/package/python-boto3/Config.in > +++ b/package/python-boto3/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_BOTO3 > bool "python-boto3" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_BOTOCORE # runtime > select BR2_PACKAGE_PYTHON_JMESPATH # runtime > select BR2_PACKAGE_PYTHON_S3TRANSFER # runtime > diff --git a/package/python-botocore/Config.in b/package/python-botocore/Config.in > index 51cb660477..cc5e32b504 100644 > --- a/package/python-botocore/Config.in > +++ b/package/python-botocore/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_BOTOCORE > bool "python-botocore" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_DATEUTIL # runtime > select BR2_PACKAGE_PYTHON_JMESPATH # runtime > select BR2_PACKAGE_PYTHON_URLLIB3 # runtime > diff --git a/package/python-cbor2/Config.in b/package/python-cbor2/Config.in > index e35e37f018..ba9383f787 100644 > --- a/package/python-cbor2/Config.in > +++ b/package/python-cbor2/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_CBOR2 > bool "python-cbor2" > - depends on BR2_PACKAGE_PYTHON3 > help > Pure Python CBOR (de)serializer with extensive tag support. > > diff --git a/package/python-cchardet/Config.in b/package/python-cchardet/Config.in > index 0f8645aafe..74153126fb 100644 > --- a/package/python-cchardet/Config.in > +++ b/package/python-cchardet/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_CCHARDET > bool "python-cchardet" > - depends on BR2_PACKAGE_PYTHON3 > depends on BR2_INSTALL_LIBSTDCPP > help > cChardet is high speed universal character encoding > @@ -9,5 +8,4 @@ config BR2_PACKAGE_PYTHON_CCHARDET > https://github.com/PyYoshi/cChardet > > comment "python-cchardet needs a toolchain w/ C++" > - depends on BR2_PACKAGE_PYTHON3 > depends on !BR2_INSTALL_LIBSTDCPP > diff --git a/package/python-channels-redis/Config.in b/package/python-channels-redis/Config.in > index bab801d2a9..d25f8ffe31 100644 > --- a/package/python-channels-redis/Config.in > +++ b/package/python-channels-redis/Config.in > @@ -2,7 +2,6 @@ config BR2_PACKAGE_PYTHON_CHANNELS_REDIS > bool "python-channels-redis" > # 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 > select BR2_PACKAGE_PYTHON_CHANNELS # runtime > diff --git a/package/python-channels/Config.in b/package/python-channels/Config.in > index 6cd6e5f60d..b94f53ceaa 100644 > --- a/package/python-channels/Config.in > +++ b/package/python-channels/Config.in > @@ -2,7 +2,6 @@ config BR2_PACKAGE_PYTHON_CHANNELS > bool "python-channels" > # 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 > select BR2_PACKAGE_PYTHON_DJANGO # runtime > diff --git a/package/python-charset-normalizer/Config.in b/package/python-charset-normalizer/Config.in > index c4c40fc99b..63e04a7a33 100644 > --- a/package/python-charset-normalizer/Config.in > +++ b/package/python-charset-normalizer/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_CHARSET_NORMALIZER > bool "python-charset-normalizer" > - depends on BR2_PACKAGE_PYTHON3 > help > The Real First Universal Charset Detector. Open, modern and > actively maintained alternative to Chardet. > diff --git a/package/python-cheroot/Config.in b/package/python-cheroot/Config.in > index 45dd2d8a11..bb9b4abbc3 100644 > --- a/package/python-cheroot/Config.in > +++ b/package/python-cheroot/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_CHEROOT > bool "python-cheroot" > - depends on BR2_PACKAGE_PYTHON3 # python-more-itertools, python-jaraco-functools > select BR2_PACKAGE_PYTHON_SIX # runtime > select BR2_PACKAGE_PYTHON_MORE_ITERTOOLS # runtime > select BR2_PACKAGE_PYTHON_JARACO_FUNCTOOLS # runtime > diff --git a/package/python-cherrypy/Config.in b/package/python-cherrypy/Config.in > index eb83054be3..7548dcf91b 100644 > --- a/package/python-cherrypy/Config.in > +++ b/package/python-cherrypy/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_CHERRYPY > bool "python-cherrypy" > - depends on BR2_PACKAGE_PYTHON3 # python-cheroot, python-portend > select BR2_PACKAGE_PYTHON_CHEROOT # runtime > select BR2_PACKAGE_PYTHON_JARACO_CLASSES # runtime > select BR2_PACKAGE_PYTHON_PORTEND # runtime > diff --git a/package/python-colorlog/Config.in b/package/python-colorlog/Config.in > index e191ae82ac..673f97aad2 100644 > --- a/package/python-colorlog/Config.in > +++ b/package/python-colorlog/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_COLORLOG > bool "python-colorlog" > - depends on BR2_PACKAGE_PYTHON3 > help > Log formatting with colors. > > diff --git a/package/python-colorzero/Config.in b/package/python-colorzero/Config.in > index a1deada5fc..b2ef711fbe 100644 > --- a/package/python-colorzero/Config.in > +++ b/package/python-colorzero/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_COLORZERO > bool "python-colorzero" > - depends on BR2_PACKAGE_PYTHON3 > help > A color manipulation library for Python. > > diff --git a/package/python-configshell-fb/Config.in b/package/python-configshell-fb/Config.in > index a0326e9150..ed7f9e0234 100644 > --- a/package/python-configshell-fb/Config.in > +++ b/package/python-configshell-fb/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_CONFIGSHELL_FB > bool "python-configshell-fb" > - depends on BR2_PACKAGE_PYTHON3 # python-urwid > select BR2_PACKAGE_PYTHON_PYPARSING > select BR2_PACKAGE_PYTHON3_READLINE > select BR2_PACKAGE_PYTHON_SIX > diff --git a/package/python-crayons/Config.in b/package/python-crayons/Config.in > index 10f3ece009..865a142b4c 100644 > --- a/package/python-crayons/Config.in > +++ b/package/python-crayons/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_CRAYONS > bool "python-crayons" > - depends on BR2_PACKAGE_PYTHON3 > help > This module is really simple, it gives you > colored strings for terminal usage. > diff --git a/package/python-crontab/Config.in b/package/python-crontab/Config.in > index 7514a3866b..102dbbdb6b 100644 > --- a/package/python-crontab/Config.in > +++ b/package/python-crontab/Config.in > @@ -1,6 +1,5 @@ > 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-crossbar/Config.in b/package/python-crossbar/Config.in > index b72d64c19d..9625d9ce8e 100644 > --- a/package/python-crossbar/Config.in > +++ b/package/python-crossbar/Config.in > @@ -1,7 +1,6 @@ > config BR2_PACKAGE_PYTHON_CROSSBAR > bool "python-crossbar" > 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 > select BR2_PACKAGE_PYTHON_AUTOBAHN > diff --git a/package/python-cryptography/Config.in b/package/python-cryptography/Config.in > index 07a22bf846..213aa24fa8 100644 > --- a/package/python-cryptography/Config.in > +++ b/package/python-cryptography/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_CRYPTOGRAPHY > bool "python-cryptography" > - depends on BR2_PACKAGE_PYTHON3 > depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS > select BR2_PACKAGE_OPENSSL > select BR2_PACKAGE_PYTHON_CFFI # runtime > diff --git a/package/python-cssselect2/Config.in b/package/python-cssselect2/Config.in > index 0196471253..030d6df0de 100644 > --- a/package/python-cssselect2/Config.in > +++ b/package/python-cssselect2/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_CSSSELECT2 > bool "python-cssselect2" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_TINYCSS2 # runtime > select BR2_PACKAGE_PYTHON_WEBENCODINGS # runtime > help > diff --git a/package/python-cssutils/Config.in b/package/python-cssutils/Config.in > index 141561901c..1c23a587f6 100644 > --- a/package/python-cssutils/Config.in > +++ b/package/python-cssutils/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_CSSUTILS > bool "python-cssutils" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime > help > A CSS Cascading Style Sheets library for Python. > diff --git a/package/python-cycler/Config.in b/package/python-cycler/Config.in > index 39ff23e45f..813bc69dd4 100644 > --- a/package/python-cycler/Config.in > +++ b/package/python-cycler/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_CYCLER > bool "python-cycler" > - depends on BR2_PACKAGE_PYTHON3 > help > Creates a Cycler objects much like cycler, but > includes input validation. > diff --git a/package/python-daphne/Config.in b/package/python-daphne/Config.in > index c4479417e9..51c66532f0 100644 > --- a/package/python-daphne/Config.in > +++ b/package/python-daphne/Config.in > @@ -2,7 +2,6 @@ config BR2_PACKAGE_PYTHON_DAPHNE > bool "python-daphne" > # 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 > select BR2_PACKAGE_PYTHON_TWISTED # runtime > diff --git a/package/python-dataproperty/Config.in b/package/python-dataproperty/Config.in > index 3de9cc685e..9dab9e4f64 100644 > --- a/package/python-dataproperty/Config.in > +++ b/package/python-dataproperty/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_DATAPROPERTY > bool "python-dataproperty" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime > select BR2_PACKAGE_PYTHON_TYPEPY # runtime > help > diff --git a/package/python-dateutil/Config.in b/package/python-dateutil/Config.in > index bbf61f6813..1a36a150b1 100644 > --- a/package/python-dateutil/Config.in > +++ b/package/python-dateutil/Config.in > @@ -1,6 +1,5 @@ > 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-dbus-next/Config.in b/package/python-dbus-next/Config.in > index bafead8986..6b00e70765 100644 > --- a/package/python-dbus-next/Config.in > +++ b/package/python-dbus-next/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_DBUS_NEXT > bool "python-dbus-next" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime > help > A zero-dependency DBus library for Python with asyncio > diff --git a/package/python-decorator/Config.in b/package/python-decorator/Config.in > index 0e84840657..e7ec00cd69 100644 > --- a/package/python-decorator/Config.in > +++ b/package/python-decorator/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_DECORATOR > bool "python-decorator" > - depends on BR2_PACKAGE_PYTHON3 > help > Better living through Python with decorators > > diff --git a/package/python-dialog3/Config.in b/package/python-dialog3/Config.in > index cd0760854b..86812d2764 100644 > --- a/package/python-dialog3/Config.in > +++ b/package/python-dialog3/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_DIALOG3 > bool "python-dialog3" > - depends on BR2_PACKAGE_PYTHON3 > depends on BR2_USE_MMU # dialog > select BR2_PACKAGE_DIALOG > help > diff --git a/package/python-django-enumfields/Config.in b/package/python-django-enumfields/Config.in > index 51efbcbf53..e7236d130a 100644 > --- a/package/python-django-enumfields/Config.in > +++ b/package/python-django-enumfields/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_DJANGO_ENUMFIELDS > bool "python-django-enumfields" > - depends on BR2_PACKAGE_PYTHON3 > help > Real Python Enums for Django. > > diff --git a/package/python-django/Config.in b/package/python-django/Config.in > index 6748d42e1a..8ffceb7275 100644 > --- a/package/python-django/Config.in > +++ b/package/python-django/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_DJANGO > bool "python-django" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON3_UNICODEDATA > select BR2_PACKAGE_PYTHON3_PYEXPAT > select BR2_PACKAGE_PYTHON_ASGIREF # runtime > diff --git a/package/python-dnspython/Config.in b/package/python-dnspython/Config.in > index da9b959366..99fd6a9a5f 100644 > --- a/package/python-dnspython/Config.in > +++ b/package/python-dnspython/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_DNSPYTHON > bool "python-dnspython" > - depends on BR2_PACKAGE_PYTHON3 > help > A powerful DNS toolkit for python. > > diff --git a/package/python-docker/Config.in b/package/python-docker/Config.in > index 41b4aacd5e..b2296f42eb 100644 > --- a/package/python-docker/Config.in > +++ b/package/python-docker/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_DOCKER > bool "python-docker" > - depends on BR2_PACKAGE_PYTHON3 # python-requests -> python-idna > # docker-engine may be running on another host, so no other dependency > select BR2_PACKAGE_PYTHON3_SSL # runtime > select BR2_PACKAGE_PYTHON_REQUESTS # runtime > diff --git a/package/python-engineio/Config.in b/package/python-engineio/Config.in > index 48f3391e53..b42b609e0d 100644 > --- a/package/python-engineio/Config.in > +++ b/package/python-engineio/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_ENGINEIO > bool "python-engineio" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON3_ZLIB > help > Engine.IO server. > diff --git a/package/python-falcon/Config.in b/package/python-falcon/Config.in > index f90ef55b30..1bf93064bb 100644 > --- a/package/python-falcon/Config.in > +++ b/package/python-falcon/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_FALCON > bool "python-falcon" > - depends on BR2_PACKAGE_PYTHON3 > help > An unladen web framework for building APIs and app > backends. > diff --git a/package/python-filelock/Config.in b/package/python-filelock/Config.in > index bda4582ac1..57ec039400 100644 > --- a/package/python-filelock/Config.in > +++ b/package/python-filelock/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_FILELOCK > bool "python-filelock" > - depends on BR2_PACKAGE_PYTHON3 > help > A platform independent file lock. > > diff --git a/package/python-flask-babel/Config.in b/package/python-flask-babel/Config.in > index 52f05f1e6a..272d9ef1c1 100644 > --- a/package/python-flask-babel/Config.in > +++ b/package/python-flask-babel/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_FLASK_BABEL > bool "python-flask-babel" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_FLASK # runtime > select BR2_PACKAGE_PYTHON_BABEL # runtime > select BR2_PACKAGE_PYTHON_JINJA2 # runtime > diff --git a/package/python-flask-cors/Config.in b/package/python-flask-cors/Config.in > index f34f77e5b0..e2e84797f9 100644 > --- a/package/python-flask-cors/Config.in > +++ b/package/python-flask-cors/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_FLASK_CORS > bool "python-flask-cors" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_FLASK # runtime > select BR2_PACKAGE_PYTHON_SIX # runtime > help > diff --git a/package/python-flask-expects-json/Config.in b/package/python-flask-expects-json/Config.in > index efe4c248d3..901234762e 100644 > --- a/package/python-flask-expects-json/Config.in > +++ b/package/python-flask-expects-json/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_FLASK_EXPECTS_JSON > bool "python-flask-expects-json" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_FLASK # runtime > select BR2_PACKAGE_PYTHON_JSONSCHEMA # runtime > help > diff --git a/package/python-flask-jsonrpc/Config.in b/package/python-flask-jsonrpc/Config.in > index 4bc13f9bcb..c8ecd854b3 100644 > --- a/package/python-flask-jsonrpc/Config.in > +++ b/package/python-flask-jsonrpc/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_FLASK_JSONRPC > bool "python-flask-jsonrpc" > - depends on BR2_PACKAGE_PYTHON3 > # runtime dependency > select BR2_PACKAGE_PYTHON_FLASK > help > diff --git a/package/python-flask-login/Config.in b/package/python-flask-login/Config.in > index 00fa58d783..88c413e2a2 100644 > --- a/package/python-flask-login/Config.in > +++ b/package/python-flask-login/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_FLASK_LOGIN > bool "python-flask-login" > - depends on BR2_PACKAGE_PYTHON3 > # runtime dependency > select BR2_PACKAGE_PYTHON_FLASK > help > diff --git a/package/python-flask-sqlalchemy/Config.in b/package/python-flask-sqlalchemy/Config.in > index e96bd7078c..fa4a035110 100644 > --- a/package/python-flask-sqlalchemy/Config.in > +++ b/package/python-flask-sqlalchemy/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_FLASK_SQLALCHEMY > bool "python-flask-sqlalchemy" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_FLASK # runtime > select BR2_PACKAGE_PYTHON_SQLALCHEMY # runtime > help > diff --git a/package/python-flask-wtf/Config.in b/package/python-flask-wtf/Config.in > index 18329d0776..4a8566a26a 100644 > --- a/package/python-flask-wtf/Config.in > +++ b/package/python-flask-wtf/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_FLASK_WTF > bool "python-flask-wtf" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_FLASK # runtime > select BR2_PACKAGE_PYTHON_ITSDANGEROUS # runtime > select BR2_PACKAGE_PYTHON_WTFORMS # runtime > diff --git a/package/python-flup/Config.in b/package/python-flup/Config.in > index f40f250163..50d1dfa3ac 100644 > --- a/package/python-flup/Config.in > +++ b/package/python-flup/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_FLUP > bool "python-flup" > - depends on BR2_PACKAGE_PYTHON3 > help > flup provides of a collection of WSGI modules for Python. > It allows a webserver to use scgi-mod and fastcgi-mod > diff --git a/package/python-fonttools/Config.in b/package/python-fonttools/Config.in > index 714f547430..64de1efe5f 100644 > --- a/package/python-fonttools/Config.in > +++ b/package/python-fonttools/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_FONTTOOLS > bool "python-fonttools" > - depends on BR2_PACKAGE_PYTHON3 > help > Tools to manipulate font files. > > diff --git a/package/python-frozenlist/Config.in b/package/python-frozenlist/Config.in > index 67a58b40ca..05714199ca 100644 > --- a/package/python-frozenlist/Config.in > +++ b/package/python-frozenlist/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_FROZENLIST > bool "python-frozenlist" > - depends on BR2_PACKAGE_PYTHON3 > help > A list-like structure which implements > collections.abc.MutableSequence. > diff --git a/package/python-git/Config.in b/package/python-git/Config.in > index b8dbc3a6c1..3c23f91c36 100644 > --- a/package/python-git/Config.in > +++ b/package/python-git/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_GIT > bool "python-git" > - depends on BR2_PACKAGE_PYTHON3 > depends on BR2_USE_MMU # git > select BR2_PACKAGE_GIT # runtime > select BR2_PACKAGE_PYTHON_GITDB2 # runtime > diff --git a/package/python-gitdb2/Config.in b/package/python-gitdb2/Config.in > index 158e4b6980..4a87cc8e8d 100644 > --- a/package/python-gitdb2/Config.in > +++ b/package/python-gitdb2/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_GITDB2 > bool "python-gitdb2" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_SMMAP2 # runtime > select BR2_PACKAGE_PYTHON3_ZLIB > help > diff --git a/package/python-gobject/Config.in b/package/python-gobject/Config.in > index efc781a1ff..3354535637 100644 > --- a/package/python-gobject/Config.in > +++ b/package/python-gobject/Config.in > @@ -5,7 +5,6 @@ config BR2_PACKAGE_PYTHON_GOBJECT > depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # gobject-introspection > depends on BR2_HOST_GCC_AT_LEAST_8 # gobject-introspection -> host-qemu > depends on BR2_TOOLCHAIN_USES_GLIBC # gobject-introspection > - depends on BR2_PACKAGE_PYTHON3 # gobject-introspection > select BR2_PACKAGE_GOBJECT_INTROSPECTION > select BR2_PACKAGE_LIBGLIB2 > help > diff --git a/package/python-gpiozero/Config.in b/package/python-gpiozero/Config.in > index 13506ae45f..93e5de3e55 100644 > --- a/package/python-gpiozero/Config.in > +++ b/package/python-gpiozero/Config.in > @@ -1,7 +1,6 @@ > config BR2_PACKAGE_PYTHON_GPIOZERO > bool "python-gpiozero" > depends on BR2_arm > - depends on BR2_PACKAGE_PYTHON3 # python-colorzero > select BR2_PACKAGE_PYTHON_COLORZERO # runtime > select BR2_PACKAGE_PYTHON_RPI_GPIO # runtime > select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime > diff --git a/package/python-gunicorn/Config.in b/package/python-gunicorn/Config.in > index 4e7c0179a5..18f0c034ba 100644 > --- a/package/python-gunicorn/Config.in > +++ b/package/python-gunicorn/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_GUNICORN > bool "python-gunicorn" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime > select BR2_PACKAGE_PYTHON3_SSL # runtime > help > diff --git a/package/python-h2/Config.in b/package/python-h2/Config.in > index d88ad36761..74a6b2ad08 100644 > --- a/package/python-h2/Config.in > +++ b/package/python-h2/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_H2 > bool "python-h2" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_HPACK # runtime > select BR2_PACKAGE_PYTHON_HYPERFRAME # runtime > help > diff --git a/package/python-hiredis/Config.in b/package/python-hiredis/Config.in > index aacdc87cd2..a401de055d 100644 > --- a/package/python-hiredis/Config.in > +++ b/package/python-hiredis/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_HIREDIS > bool "python-hiredis" > - depends on BR2_PACKAGE_PYTHON3 > help > Python wrapper for hiredis. > > diff --git a/package/python-hpack/Config.in b/package/python-hpack/Config.in > index 0608f97281..b34a3f31fa 100644 > --- a/package/python-hpack/Config.in > +++ b/package/python-hpack/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_HPACK > bool "python-hpack" > - depends on BR2_PACKAGE_PYTHON3 > help > Pure-Python HPACK header compression. > > diff --git a/package/python-httplib2/Config.in b/package/python-httplib2/Config.in > index 0095d95b51..a029814f03 100644 > --- a/package/python-httplib2/Config.in > +++ b/package/python-httplib2/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_HTTPLIB2 > bool "python-httplib2" > - depends on BR2_PACKAGE_PYTHON3 # python-pyparsing > select BR2_PACKAGE_PYTHON3_ZLIB > select BR2_PACKAGE_PYTHON3_SSL > select BR2_PACKAGE_PYTHON_PYPARSING # runtime > diff --git a/package/python-humanize/Config.in b/package/python-humanize/Config.in > index ec63be9b35..f4f4e67b65 100644 > --- a/package/python-humanize/Config.in > +++ b/package/python-humanize/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_HUMANIZE > bool "python-humanize" > - depends on BR2_PACKAGE_PYTHON3 > help > Python humanize package contains various common humanization > utilities, like turning a number into a fuzzy human readable > diff --git a/package/python-hyperframe/Config.in b/package/python-hyperframe/Config.in > index 30457fe86e..fb83c895af 100644 > --- a/package/python-hyperframe/Config.in > +++ b/package/python-hyperframe/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_HYPERFRAME > bool "python-hyperframe" > - depends on BR2_PACKAGE_PYTHON3 > help > HTTP/2 framing layer for Python. > > diff --git a/package/python-hyperlink/Config.in b/package/python-hyperlink/Config.in > index 3a85e6f461..8dad0af19a 100644 > --- a/package/python-hyperlink/Config.in > +++ b/package/python-hyperlink/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_HYPERLINK > bool "python-hyperlink" > - depends on BR2_PACKAGE_PYTHON3 # python-idna > select BR2_PACKAGE_PYTHON_IDNA # runtime > help > A featureful, correct URL for Python. > diff --git a/package/python-ibmiotf/Config.in b/package/python-ibmiotf/Config.in > index 3f3f7e1965..64362db998 100644 > --- a/package/python-ibmiotf/Config.in > +++ b/package/python-ibmiotf/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_IBMIOTF > bool "python-ibmiotf" > - depends on BR2_PACKAGE_PYTHON3 # python-requests -> python-idna > select BR2_PACKAGE_PYTHON_ISO8601 # runtime > select BR2_PACKAGE_PYTHON_PAHO_MQTT # runtime > select BR2_PACKAGE_PYTHON_PYTZ # runtime > diff --git a/package/python-idna/Config.in b/package/python-idna/Config.in > index 3df634f9bf..ddc2cd7d17 100644 > --- a/package/python-idna/Config.in > +++ b/package/python-idna/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_IDNA > bool "python-idna" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON3_UNICODEDATA > help > A library to support the Internationalised Domain Names in > diff --git a/package/python-inflection/Config.in b/package/python-inflection/Config.in > index 5b6a26fead..84240060fd 100644 > --- a/package/python-inflection/Config.in > +++ b/package/python-inflection/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_INFLECTION > bool "python-inflection" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON3_UNICODEDATA > help > A string transformation library that singularizes and > diff --git a/package/python-influxdb/Config.in b/package/python-influxdb/Config.in > index 48c300f90d..6ebbd4aa9c 100644 > --- a/package/python-influxdb/Config.in > +++ b/package/python-influxdb/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_INFLUXDB > bool "python-influxdb" > - depends on BR2_PACKAGE_PYTHON3 # python-requests -> python-idna > select BR2_PACKAGE_PYTHON_DATEUTIL # runtime > select BR2_PACKAGE_PYTHON_MSGPACK # runtime > select BR2_PACKAGE_PYTHON_PYTZ # runtime > diff --git a/package/python-ipdb/Config.in b/package/python-ipdb/Config.in > index 4a89bf75de..a9d6af1684 100644 > --- a/package/python-ipdb/Config.in > +++ b/package/python-ipdb/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_IPDB > bool "python-ipdb" > - depends on BR2_PACKAGE_PYTHON3 # python-ipython > select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime > select BR2_PACKAGE_PYTHON_IPYTHON # runtime > help > diff --git a/package/python-ipython/Config.in b/package/python-ipython/Config.in > index c151ac2dd2..3de49ae574 100644 > --- a/package/python-ipython/Config.in > +++ b/package/python-ipython/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_IPYTHON > bool "python-ipython" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_BACKCALL # runtime > select BR2_PACKAGE_PYTHON_DECORATOR # runtime > select BR2_PACKAGE_PYTHON_JEDI # runtime > diff --git a/package/python-itsdangerous/Config.in b/package/python-itsdangerous/Config.in > index 72aa9165f8..fc0cfe1591 100644 > --- a/package/python-itsdangerous/Config.in > +++ b/package/python-itsdangerous/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_ITSDANGEROUS > bool "python-itsdangerous" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON3_ZLIB # runtime > help > Itsdangerous contains various helpers to pass data to > diff --git a/package/python-janus/Config.in b/package/python-janus/Config.in > index 38e4b7217f..924c1fa97d 100644 > --- a/package/python-janus/Config.in > +++ b/package/python-janus/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_JANUS > bool "python-janus" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime > help > Mixed sync-async queue to interoperate between asyncio > diff --git a/package/python-jaraco-classes/Config.in b/package/python-jaraco-classes/Config.in > index 271e085c6f..05c11237ab 100644 > --- a/package/python-jaraco-classes/Config.in > +++ b/package/python-jaraco-classes/Config.in > @@ -1,6 +1,5 @@ > 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-jaraco-functools/Config.in b/package/python-jaraco-functools/Config.in > index 6c914f3851..f65664018d 100644 > --- a/package/python-jaraco-functools/Config.in > +++ b/package/python-jaraco-functools/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_JARACO_FUNCTOOLS > bool "python-jaraco-functools" > - depends on BR2_PACKAGE_PYTHON3 # python-more-itertools > select BR2_PACKAGE_PYTHON_MORE_ITERTOOLS # runtime > help > Additional functools in the spirit of stdlib?s > diff --git a/package/python-jedi/Config.in b/package/python-jedi/Config.in > index e14fa54ffb..8ceaa1530c 100644 > --- a/package/python-jedi/Config.in > +++ b/package/python-jedi/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_JEDI > bool "python-jedi" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_PARSO # runtime > help > An autocompletion tool for Python that can be used for text > diff --git a/package/python-jinja2/Config.in b/package/python-jinja2/Config.in > index 8ba2fa4df8..84a46bd264 100644 > --- a/package/python-jinja2/Config.in > +++ b/package/python-jinja2/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_JINJA2 > bool "python-jinja2" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_MARKUPSAFE # runtime > select BR2_PACKAGE_PYTHON3_UNICODEDATA > help > diff --git a/package/python-jsonmodels/Config.in b/package/python-jsonmodels/Config.in > index 84a269f171..f66982874a 100644 > --- a/package/python-jsonmodels/Config.in > +++ b/package/python-jsonmodels/Config.in > @@ -1,6 +1,5 @@ > 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-keyring/Config.in b/package/python-keyring/Config.in > index 61cb98952f..6b33686cbe 100644 > --- a/package/python-keyring/Config.in > +++ b/package/python-keyring/Config.in > @@ -2,7 +2,6 @@ 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 > select BR2_PACKAGE_PYTHON_ENTRYPOINTS # runtime > select BR2_PACKAGE_PYTHON_SECRETSTORAGE # runtime > help > diff --git a/package/python-libusb1/Config.in b/package/python-libusb1/Config.in > index fbad70c375..e464a0394d 100644 > --- a/package/python-libusb1/Config.in > +++ b/package/python-libusb1/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_LIBUSB1 > bool "python-libusb1" > - depends on BR2_PACKAGE_PYTHON3 > depends on BR2_TOOLCHAIN_HAS_THREADS # libusb > depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb > select BR2_PACKAGE_LIBUSB > @@ -10,6 +9,5 @@ config BR2_PACKAGE_PYTHON_LIBUSB1 > http://github.com/vpelletier/python-libusb1 > > comment "python-libusb1 needs a toolchain w/ threads, gcc >= 4.9" > - depends on BR2_PACKAGE_PYTHON3 > depends on !BR2_TOOLCHAIN_HAS_THREADS || \ > !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 > diff --git a/package/python-markdown/Config.in b/package/python-markdown/Config.in > index 454c2729bd..4963ec6560 100644 > --- a/package/python-markdown/Config.in > +++ b/package/python-markdown/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_MARKDOWN > bool "python-markdown" > - depends on BR2_PACKAGE_PYTHON3 > # runtime dependency on Python's xml module > select BR2_PACKAGE_PYTHON3_PYEXPAT > help > diff --git a/package/python-markdown2/Config.in b/package/python-markdown2/Config.in > index 5513219a40..8fe2332491 100644 > --- a/package/python-markdown2/Config.in > +++ b/package/python-markdown2/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_MARKDOWN2 > bool "python-markdown2" > - depends on BR2_PACKAGE_PYTHON3 > help > A fast and complete Python implementation of Markdown. > > diff --git a/package/python-markupsafe/Config.in b/package/python-markupsafe/Config.in > index cd7cb2d8e9..48421e0a32 100644 > --- a/package/python-markupsafe/Config.in > +++ b/package/python-markupsafe/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_MARKUPSAFE > bool "python-markupsafe" > - depends on BR2_PACKAGE_PYTHON3 > help > MarkupSafe implements a XML/HTML/XHTML Markup safe string > for Python. > diff --git a/package/python-matplotlib/Config.in b/package/python-matplotlib/Config.in > index e5a4064538..b936777662 100644 > --- a/package/python-matplotlib/Config.in > +++ b/package/python-matplotlib/Config.in > @@ -1,7 +1,6 @@ > config BR2_PACKAGE_PYTHON_MATPLOTLIB > bool "python-matplotlib" > depends on BR2_INSTALL_LIBSTDCPP > - depends on BR2_PACKAGE_PYTHON3 > depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS > depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy > select BR2_PACKAGE_FREETYPE # runtime > diff --git a/package/python-mbstrdecoder/Config.in b/package/python-mbstrdecoder/Config.in > index 5ba3a19cc4..0ff0a310a5 100644 > --- a/package/python-mbstrdecoder/Config.in > +++ b/package/python-mbstrdecoder/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_MBSTRDECODER > bool "python-mbstrdecoder" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_CHARDET # runtime > help > multi-byte character string decoder. > diff --git a/package/python-memory-profiler/Config.in b/package/python-memory-profiler/Config.in > index 60833304ae..9d29e5f1ca 100644 > --- a/package/python-memory-profiler/Config.in > +++ b/package/python-memory-profiler/Config.in > @@ -1,6 +1,5 @@ > 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. > diff --git a/package/python-more-itertools/Config.in b/package/python-more-itertools/Config.in > index f54b52d1f0..5a74f95d59 100644 > --- a/package/python-more-itertools/Config.in > +++ b/package/python-more-itertools/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_MORE_ITERTOOLS > bool "python-more-itertools" > - depends on BR2_PACKAGE_PYTHON3 > help > More routines for operating on iterables, beyond itertools. > > diff --git a/package/python-mpd2/Config.in b/package/python-mpd2/Config.in > index 823c82e52d..52dcbf0096 100644 > --- a/package/python-mpd2/Config.in > +++ b/package/python-mpd2/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_MPD2 > bool "python-mpd2" > - depends on BR2_PACKAGE_PYTHON3 > help > A Python MPD client library. > > diff --git a/package/python-msgfy/Config.in b/package/python-msgfy/Config.in > index f5a471633a..7875379e9e 100644 > --- a/package/python-msgfy/Config.in > +++ b/package/python-msgfy/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_MSGFY > bool "python-msgfy" > - depends on BR2_PACKAGE_PYTHON3 > help > msgfy is a Python library for convert Exception instance to > a human-readable error message. > diff --git a/package/python-multidict/Config.in b/package/python-multidict/Config.in > index 7bfaa36db2..9a92a6d396 100644 > --- a/package/python-multidict/Config.in > +++ b/package/python-multidict/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_MULTIDICT > bool "python-multidict" > - depends on BR2_PACKAGE_PYTHON3 > help > Multidict is dict-like collection of key-value pairs where a > key may occur more than once in the container. > diff --git a/package/python-mutagen/Config.in b/package/python-mutagen/Config.in > index 655562893f..dc183a6e4e 100644 > --- a/package/python-mutagen/Config.in > +++ b/package/python-mutagen/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_MUTAGEN > bool "python-mutagen" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime > select BR2_PACKAGE_PYTHON3_ZLIB # runtime > help > diff --git a/package/python-mwclient/Config.in b/package/python-mwclient/Config.in > index 1af60fdcd0..dc93e6c0df 100644 > --- a/package/python-mwclient/Config.in > +++ b/package/python-mwclient/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_MWCLIENT > bool "python-mwclient" > - depends on BR2_PACKAGE_PYTHON3 # python-requests-oauthlib -> python-requests -> python-idna > select BR2_PACKAGE_PYTHON_REQUESTS_OAUTHLIB # runtime > select BR2_PACKAGE_PYTHON_SIX # runtime > help > diff --git a/package/python-mwscrape/Config.in b/package/python-mwscrape/Config.in > index cb1e30506f..fc9d5223f2 100644 > --- a/package/python-mwscrape/Config.in > +++ b/package/python-mwscrape/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_MWSCRAPE > bool "python-mwscrape" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_COUCHDB # runtime > select BR2_PACKAGE_PYTHON_MWCLIENT # runtime > select BR2_PACKAGE_PYTHON_PYLRU # runtime > diff --git a/package/python-mwscrape2slob/Config.in b/package/python-mwscrape2slob/Config.in > index 6d543bda28..6ced253451 100644 > --- a/package/python-mwscrape2slob/Config.in > +++ b/package/python-mwscrape2slob/Config.in > @@ -4,7 +4,6 @@ config BR2_PACKAGE_PYTHON_MWSCRAPE2SLOB > depends on BR2_HOST_GCC_AT_LEAST_4_9 # python-slob -> python-pyicu -> icu > depends on BR2_INSTALL_LIBSTDCPP # python-slob -> python-pyicu -> icu > depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # python-slob -> python-pyicu -> icu > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_COUCHDB # runtime > select BR2_PACKAGE_PYTHON_CSSSELECT # runtime > select BR2_PACKAGE_PYTHON_CSSUTILS # runtime > @@ -17,7 +16,6 @@ config BR2_PACKAGE_PYTHON_MWSCRAPE2SLOB > https://github.com/itkach/mwscrape2slob > > comment "python-mwscrape2slob needs a toolchain w/ C++, gcc >= 4.9, host gcc >= 4.9" > - depends on BR2_PACKAGE_PYTHON3 && !BR2_BINFMT_FLAT > depends on !BR2_INSTALL_LIBSTDCPP || \ > !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ > !BR2_HOST_GCC_AT_LEAST_4_9 > diff --git a/package/python-networkx/Config.in b/package/python-networkx/Config.in > index 2ae3841dfa..0f3e86f497 100644 > --- a/package/python-networkx/Config.in > +++ b/package/python-networkx/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_NETWORKX > bool "python-networkx" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_DECORATOR # runtime > help > A Python package for the creation, manipulation, > diff --git a/package/python-numpy/Config.in b/package/python-numpy/Config.in > index 23dcbc7986..a65164d9d5 100644 > --- a/package/python-numpy/Config.in > +++ b/package/python-numpy/Config.in > @@ -15,7 +15,6 @@ config BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS > > config BR2_PACKAGE_PYTHON_NUMPY > bool "python-numpy" > - depends on BR2_PACKAGE_PYTHON3 > depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS > # python-numpy needs fenv.h which is not provided by uclibc > depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL > @@ -29,6 +28,5 @@ config BR2_PACKAGE_PYTHON_NUMPY > http://www.numpy.org/ > > comment "python-numpy needs glibc or musl" > - depends on BR2_PACKAGE_PYTHON3 > depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS > depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) > diff --git a/package/python-oauthlib/Config.in b/package/python-oauthlib/Config.in > index 0084e7cbd9..65016c1d08 100644 > --- a/package/python-oauthlib/Config.in > +++ b/package/python-oauthlib/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_OAUTHLIB > bool "python-oauthlib" > - depends on BR2_PACKAGE_PYTHON3 > help > A generic, spec-compliant, thorough implementation of the > OAuth request-signing logic. > diff --git a/package/python-opcua-asyncio/Config.in b/package/python-opcua-asyncio/Config.in > index 95715fdd08..e5b8623f0d 100644 > --- a/package/python-opcua-asyncio/Config.in > +++ b/package/python-opcua-asyncio/Config.in > @@ -1,7 +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 > select BR2_PACKAGE_PYTHON_DATEUTIL # runtime > diff --git a/package/python-packaging/Config.in b/package/python-packaging/Config.in > index 74d5205e8d..12170df84e 100644 > --- a/package/python-packaging/Config.in > +++ b/package/python-packaging/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PACKAGING > bool "python-packaging" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_PYPARSING # runtime > help > Core utilities for Python packages. > diff --git a/package/python-paramiko/Config.in b/package/python-paramiko/Config.in > index d48051bd22..a07af19a4b 100644 > --- a/package/python-paramiko/Config.in > +++ b/package/python-paramiko/Config.in > @@ -1,7 +1,6 @@ > 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, 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-parso/Config.in b/package/python-parso/Config.in > index 4f5482d8a0..ea1c5a4732 100644 > --- a/package/python-parso/Config.in > +++ b/package/python-parso/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PARSO > bool "python-parso" > - depends on BR2_PACKAGE_PYTHON3 > help > A Python Parser. > > diff --git a/package/python-pathpy/Config.in b/package/python-pathpy/Config.in > index 7c7ffc9e92..98c05126bf 100644 > --- a/package/python-pathpy/Config.in > +++ b/package/python-pathpy/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PATHPY > bool "python-pathpy" > - depends on BR2_PACKAGE_PYTHON3 > help > path.py implements a path objects as first-class > entities, allowing common operations on files to > diff --git a/package/python-pathvalidate/Config.in b/package/python-pathvalidate/Config.in > index f8658e6165..8606696e1b 100644 > --- a/package/python-pathvalidate/Config.in > +++ b/package/python-pathvalidate/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PATHVALIDATE > bool "python-pathvalidate" > - depends on BR2_PACKAGE_PYTHON3 > help > pathvalidate is a python library to validate/sanitize a string > such as filename/variable-name. > diff --git a/package/python-piexif/Config.in b/package/python-piexif/Config.in > index 2f7eff80b5..1c8c31b9c6 100644 > --- a/package/python-piexif/Config.in > +++ b/package/python-piexif/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PIEXIF > bool "python-piexif" > - depends on BR2_PACKAGE_PYTHON3 > help > Piexif simplifies interacting with EXIF data in Python. It > includes the tools necessary for extracting, creating, > diff --git a/package/python-pillow/Config.in b/package/python-pillow/Config.in > index ae6d8c8346..126cb452fa 100644 > --- a/package/python-pillow/Config.in > +++ b/package/python-pillow/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PILLOW > bool "python-pillow" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime > select BR2_PACKAGE_PYTHON3_ZLIB > help > diff --git a/package/python-pip/Config.in b/package/python-pip/Config.in > index 92c3e3bd46..805dc01545 100644 > --- a/package/python-pip/Config.in > +++ b/package/python-pip/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PIP > bool "python-pip" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime > select BR2_PACKAGE_PYTHON3_SSL > help > diff --git a/package/python-pluggy/Config.in b/package/python-pluggy/Config.in > index 7179bc427c..35b18c824f 100644 > --- a/package/python-pluggy/Config.in > +++ b/package/python-pluggy/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PLUGGY > bool "python-pluggy" > - depends on BR2_PACKAGE_PYTHON3 > help > plugin and hook calling mechanisms for python. > > diff --git a/package/python-portend/Config.in b/package/python-portend/Config.in > index 30a50c7f61..6b21078caa 100644 > --- a/package/python-portend/Config.in > +++ b/package/python-portend/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PORTEND > bool "python-portend" > - depends on BR2_PACKAGE_PYTHON3 # python-tempora > select BR2_PACKAGE_PYTHON_TEMPORA # runtime > help > TCP port monitoring utilities. > diff --git a/package/python-priority/Config.in b/package/python-priority/Config.in > index 8ac2d13824..b73b7e2ad4 100644 > --- a/package/python-priority/Config.in > +++ b/package/python-priority/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PRIORITY > bool "python-priority" > - depends on BR2_PACKAGE_PYTHON3 > help > A pure-Python implementation of the HTTP/2 priority tree. > > diff --git a/package/python-prompt-toolkit/Config.in b/package/python-prompt-toolkit/Config.in > index a16ac13d53..ad4f8162de 100644 > --- a/package/python-prompt-toolkit/Config.in > +++ b/package/python-prompt-toolkit/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PROMPT_TOOLKIT > bool "python-prompt-toolkit" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_SIX # runtime > select BR2_PACKAGE_PYTHON_WCWIDTH # runtime > select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime > diff --git a/package/python-protobuf/Config.in b/package/python-protobuf/Config.in > index 9b20881196..1af82112b4 100644 > --- a/package/python-protobuf/Config.in > +++ b/package/python-protobuf/Config.in > @@ -2,7 +2,6 @@ config BR2_PACKAGE_PYTHON_PROTOBUF > bool "python-protobuf" > # host-protobuf only builds on certain architectures > depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_SIX # runtime > help > Python implementation of the Google Protocol Buffers. > diff --git a/package/python-psycopg2/Config.in b/package/python-psycopg2/Config.in > index fba781c014..ec27d706de 100644 > --- a/package/python-psycopg2/Config.in > +++ b/package/python-psycopg2/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PSYCOPG2 > bool "python-psycopg2" > - depends on BR2_PACKAGE_PYTHON3 > depends on BR2_USE_WCHAR # postgresql > select BR2_PACKAGE_POSTGRESQL > help > @@ -24,5 +23,4 @@ config BR2_PACKAGE_PYTHON_PSYCOPG2 > http://initd.org/psycopg/ > > comment "python-psycopg2 needs a toolchain w/ wchar" > - depends on BR2_PACKAGE_PYTHON3 > depends on !BR2_USE_WCHAR > diff --git a/package/python-pudb/Config.in b/package/python-pudb/Config.in > index 64789021d1..06f1b20c26 100644 > --- a/package/python-pudb/Config.in > +++ b/package/python-pudb/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PUDB > bool "python-pudb" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_URWID # runtime > select BR2_PACKAGE_PYTHON_JEDI # runtime > select BR2_PACKAGE_PYTHON_PYGMENTS # runtime > diff --git a/package/python-py/Config.in b/package/python-py/Config.in > index 0e3c3390a0..354372f5b4 100644 > --- a/package/python-py/Config.in > +++ b/package/python-py/Config.in > @@ -1,6 +1,5 @@ > 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-pybind/Config.in b/package/python-pybind/Config.in > index 27bc196e32..604cb9ee67 100644 > --- a/package/python-pybind/Config.in > +++ b/package/python-pybind/Config.in > @@ -1,6 +1,5 @@ > 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-pycairo/Config.in b/package/python-pycairo/Config.in > index a44a0421e6..0d8de977e1 100644 > --- a/package/python-pycairo/Config.in > +++ b/package/python-pycairo/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PYCAIRO > bool "python-pycairo" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_CAIRO > help > Python interface for cairo. > diff --git a/package/python-pycares/Config.in b/package/python-pycares/Config.in > index 3452ae6b10..889e0943be 100644 > --- a/package/python-pycares/Config.in > +++ b/package/python-pycares/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PYCARES > bool "python-pycares" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_CFFI # runtime > help > Python interface for c-ares. > diff --git a/package/python-pycups/Config.in b/package/python-pycups/Config.in > index 61c2ba21d1..eeaf70c9e6 100644 > --- a/package/python-pycups/Config.in > +++ b/package/python-pycups/Config.in > @@ -1,7 +1,6 @@ > config BR2_PACKAGE_PYTHON_PYCUPS > bool "python-pycups" > depends on BR2_PACKAGE_CUPS > - depends on BR2_PACKAGE_PYTHON3 > help > Python bindings for libcups. > > diff --git a/package/python-pydantic/Config.in b/package/python-pydantic/Config.in > index ac81aeb342..41ec43adf4 100644 > --- a/package/python-pydantic/Config.in > +++ b/package/python-pydantic/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PYDANTIC > bool "python-pydantic" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime > help > Data validation and settings management using python 3.6 > diff --git a/package/python-pydyf/Config.in b/package/python-pydyf/Config.in > index f283a6d6aa..42530eafbb 100644 > --- a/package/python-pydyf/Config.in > +++ b/package/python-pydyf/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PYDYF > bool "python-pydyf" > - depends on BR2_PACKAGE_PYTHON3 > help > A low-level PDF generator. > > diff --git a/package/python-pygments/Config.in b/package/python-pygments/Config.in > index d74e53d4c8..f097c52397 100644 > --- a/package/python-pygments/Config.in > +++ b/package/python-pygments/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PYGMENTS > bool "python-pygments" > - depends on BR2_PACKAGE_PYTHON3 > help > Pygments is a syntax highlighting package written in Python. > > diff --git a/package/python-pyhamcrest/Config.in b/package/python-pyhamcrest/Config.in > index 1bbae3fec7..c2a4dc06f7 100644 > --- a/package/python-pyhamcrest/Config.in > +++ b/package/python-pyhamcrest/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PYHAMCREST > bool "python-pyhamcrest" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime > select BR2_PACKAGE_PYTHON_SIX # runtime > help > diff --git a/package/python-pyjwt/Config.in b/package/python-pyjwt/Config.in > index f8d4f8a9b8..510875ce2f 100644 > --- a/package/python-pyjwt/Config.in > +++ b/package/python-pyjwt/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PYJWT > bool "python-pyjwt" > - depends on BR2_PACKAGE_PYTHON3 > help > JSON Web Token implementation in Python. > > diff --git a/package/python-pymupdf/Config.in b/package/python-pymupdf/Config.in > index 0ecb288922..b3f9565238 100644 > --- a/package/python-pymupdf/Config.in > +++ b/package/python-pymupdf/Config.in > @@ -4,7 +4,6 @@ config BR2_PACKAGE_PYTHON_PYMUPDF > depends on BR2_TOOLCHAIN_HAS_SYNC_4 # mupdf -> harfbuzz > depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # mupdf -> harfbuzz > depends on BR2_PACKAGE_XORG7 > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_FREETYPE > select BR2_PACKAGE_MUPDF > select BR2_PACKAGE_ZLIB > @@ -14,12 +13,10 @@ config BR2_PACKAGE_PYTHON_PYMUPDF > https://github.com/pymupdf/PyMuPDF > > comment "python-pymupdf needs Xorg" > - depends on BR2_PACKAGE_PYTHON3 > depends on BR2_TOOLCHAIN_HAS_SYNC_4 > depends on !BR2_PACKAGE_XORG7 > > comment "python-pymupdf needs a toolchain w/ C++, gcc >= 4.9" > - depends on BR2_PACKAGE_PYTHON3 > depends on BR2_TOOLCHAIN_HAS_SYNC_4 > depends on !BR2_INSTALL_LIBSTDCPP || \ > !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 > diff --git a/package/python-pymysql/Config.in b/package/python-pymysql/Config.in > index 69ba485e77..75b447cbd1 100644 > --- a/package/python-pymysql/Config.in > +++ b/package/python-pymysql/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PYMYSQL > bool "python-pymysql" > - depends on BR2_PACKAGE_PYTHON3 > help > PyMySQL is a pure-Python MySQL client library. It follows > the DB-API 2.0. > diff --git a/package/python-pynacl/Config.in b/package/python-pynacl/Config.in > index 3bb4e29630..0553d82ce9 100644 > --- a/package/python-pynacl/Config.in > +++ b/package/python-pynacl/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PYNACL > bool "python-pynacl" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_LIBSODIUM > select BR2_PACKAGE_PYTHON_CFFI # runtime > help > diff --git a/package/python-pyndiff/Config.in b/package/python-pyndiff/Config.in > index cd13056d79..58ca35ba97 100644 > --- a/package/python-pyndiff/Config.in > +++ b/package/python-pyndiff/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PYNDIFF > bool "python-pyndiff" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_XMLJSON # runtime > select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime > help > diff --git a/package/python-pyopenssl/Config.in b/package/python-pyopenssl/Config.in > index 65d516813f..1a6fbd2147 100644 > --- a/package/python-pyopenssl/Config.in > +++ b/package/python-pyopenssl/Config.in > @@ -1,7 +1,6 @@ > config BR2_PACKAGE_PYTHON_PYOPENSSL > bool "python-pyopenssl" > 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 > diff --git a/package/python-pyparsing/Config.in b/package/python-pyparsing/Config.in > index 9b5894116d..926ca07ed7 100644 > --- a/package/python-pyparsing/Config.in > +++ b/package/python-pyparsing/Config.in > @@ -1,6 +1,5 @@ > 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 > diff --git a/package/python-pyparted/Config.in b/package/python-pyparted/Config.in > index 0ed24f8836..60f54a5484 100644 > --- a/package/python-pyparted/Config.in > +++ b/package/python-pyparted/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PYPARTED > bool "python-pyparted" > - depends on BR2_PACKAGE_PYTHON3 > depends on BR2_ENABLE_LOCALE # parted > depends on BR2_USE_WCHAR > select BR2_PACKAGE_PARTED > @@ -10,5 +9,4 @@ config BR2_PACKAGE_PYTHON_PYPARTED > https://github.com/rhinstaller/pyparted > > comment "pyparted needs a toolchain w/ locale, wchar" > - depends on BR2_PACKAGE_PYTHON3 > depends on !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR > diff --git a/package/python-pyphen/Config.in b/package/python-pyphen/Config.in > index 30ccafcda4..e4707ff036 100644 > --- a/package/python-pyphen/Config.in > +++ b/package/python-pyphen/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PYPHEN > bool "python-pyphen" > - depends on BR2_PACKAGE_PYTHON3 > help > Pure Python module to hyphenate text. > > diff --git a/package/python-pysftp/Config.in b/package/python-pysftp/Config.in > index c65369b667..fc4fdd972d 100644 > --- a/package/python-pysftp/Config.in > +++ b/package/python-pysftp/Config.in > @@ -1,7 +1,6 @@ > 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 > select BR2_PACKAGE_PYTHON_PARAMIKO # runtime > help > A friendly face on SFTP. > diff --git a/package/python-pytablereader/Config.in b/package/python-pytablereader/Config.in > index 1c3f2af82f..889cb79820 100644 > --- a/package/python-pytablereader/Config.in > +++ b/package/python-pytablereader/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PYTABLEREADER > bool "python-pytablereader" > - depends on BR2_PACKAGE_PYTHON3 # python-mbstrdecoder, python-pathpy, python-beautifulsoup4, python-pathvalidate > select BR2_PACKAGE_PYTHON_BEAUTIFULSOUP4 # runtime > select BR2_PACKAGE_PYTHON_DATAPROPERTY # runtime > select BR2_PACKAGE_PYTHON_JSONSCHEMA # runtime > diff --git a/package/python-pytablewriter/Config.in b/package/python-pytablewriter/Config.in > index e0405d12c8..041c30eb6c 100644 > --- a/package/python-pytablewriter/Config.in > +++ b/package/python-pytablewriter/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PYTABLEWRITER > bool "python-pytablewriter" > - depends on BR2_PACKAGE_PYTHON3 # python-dataproperty, python-mbstrdecoder, python-pathvalidate > select BR2_PACKAGE_PYTHON_DATAPROPERTY # runtime > select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime > select BR2_PACKAGE_PYTHON_MSGFY # runtime > diff --git a/package/python-pytest-asyncio/Config.in b/package/python-pytest-asyncio/Config.in > index 3fa90e4e18..2088a8bdbf 100644 > --- a/package/python-pytest-asyncio/Config.in > +++ b/package/python-pytest-asyncio/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PYTEST_ASYNCIO > bool "python-pytest-asyncio" > - depends on BR2_PACKAGE_PYTHON3 # pytest > select BR2_PACKAGE_PYTHON_PYTEST # runtime > help > Pytest support for asyncio. > diff --git a/package/python-pytest/Config.in b/package/python-pytest/Config.in > index ebbaeeea58..c3956c76d2 100644 > --- a/package/python-pytest/Config.in > +++ b/package/python-pytest/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PYTEST > bool "python-pytest" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_ATTRS # runtime > select BR2_PACKAGE_PYTHON_INICONFIG # runtime > select BR2_PACKAGE_PYTHON_PACKAGING # runtime > diff --git a/package/python-pytrie/Config.in b/package/python-pytrie/Config.in > index 722d263d7e..156638476c 100644 > --- a/package/python-pytrie/Config.in > +++ b/package/python-pytrie/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PYTRIE > bool "python-pytrie" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_SORTEDCONTAINERS # runtime > help > A pure Python implementation of the trie data structure. > diff --git a/package/python-pyusb/Config.in b/package/python-pyusb/Config.in > index 13080a9fde..bba3480a1b 100644 > --- a/package/python-pyusb/Config.in > +++ b/package/python-pyusb/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PYUSB > bool "python-pyusb" > - depends on BR2_PACKAGE_PYTHON3 > depends on BR2_TOOLCHAIN_HAS_THREADS # libusb > depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb > select BR2_PACKAGE_LIBUSB > diff --git a/package/python-pyyaml/Config.in b/package/python-pyyaml/Config.in > index eb073b9c03..45e818b7e7 100644 > --- a/package/python-pyyaml/Config.in > +++ b/package/python-pyyaml/Config.in > @@ -1,6 +1,5 @@ > 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-requests-oauthlib/Config.in b/package/python-requests-oauthlib/Config.in > index 2510644bd1..85283b209c 100644 > --- a/package/python-requests-oauthlib/Config.in > +++ b/package/python-requests-oauthlib/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_REQUESTS_OAUTHLIB > bool "python-requests-oauthlib" > - depends on BR2_PACKAGE_PYTHON3 # python-requests -> python-idna > select BR2_PACKAGE_PYTHON_OAUTHLIB # runtime > select BR2_PACKAGE_PYTHON_REQUESTS # runtime > help > diff --git a/package/python-requests-toolbelt/Config.in b/package/python-requests-toolbelt/Config.in > index 47141c2c8a..ba2b95152e 100644 > --- a/package/python-requests-toolbelt/Config.in > +++ b/package/python-requests-toolbelt/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_REQUESTS_TOOLBELT > bool "python-requests-toolbelt" > - depends on BR2_PACKAGE_PYTHON3 # python-requests -> python-idna > select BR2_PACKAGE_PYTHON_REQUESTS # runtime > help > A utility belt for advanced users of python-requests. > diff --git a/package/python-requests/Config.in b/package/python-requests/Config.in > index 9b04c07fc9..94a44682f4 100644 > --- a/package/python-requests/Config.in > +++ b/package/python-requests/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_REQUESTS > bool "python-requests" > - depends on BR2_PACKAGE_PYTHON3 # python-idna > select BR2_PACKAGE_PYTHON_CERTIFI # runtime > select BR2_PACKAGE_PYTHON_CHARSET_NORMALIZER # runtime > select BR2_PACKAGE_PYTHON_IDNA # runtime > diff --git a/package/python-rsa/Config.in b/package/python-rsa/Config.in > index bc9ec2feab..5cafd8215f 100644 > --- a/package/python-rsa/Config.in > +++ b/package/python-rsa/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_RSA > bool "python-rsa" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_PYASN1 # runtime > help > Python-RSA is a pure-Python RSA implementation. It supports > diff --git a/package/python-s3transfer/Config.in b/package/python-s3transfer/Config.in > index ad3a673938..a7f85b146c 100644 > --- a/package/python-s3transfer/Config.in > +++ b/package/python-s3transfer/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_S3TRANSFER > bool "python-s3transfer" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_BOTOCORE # runtime > help > An Amazon S3 Transfer Manager. > diff --git a/package/python-schedule/Config.in b/package/python-schedule/Config.in > index a0f800e364..d00c245948 100644 > --- a/package/python-schedule/Config.in > +++ b/package/python-schedule/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_SCHEDULE > bool "python-schedule" > - depends on BR2_PACKAGE_PYTHON3 > help > Job scheduling for humans. > > diff --git a/package/python-secretstorage/Config.in b/package/python-secretstorage/Config.in > index 059ea097bb..f0a8689ecd 100644 > --- a/package/python-secretstorage/Config.in > +++ b/package/python-secretstorage/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_SECRETSTORAGE > bool "python-secretstorage" > - depends on BR2_PACKAGE_PYTHON3 > depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography > select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime > help > diff --git a/package/python-serial-asyncio/Config.in b/package/python-serial-asyncio/Config.in > index 5520b72506..08396a0eeb 100644 > --- a/package/python-serial-asyncio/Config.in > +++ b/package/python-serial-asyncio/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_SERIAL_ASYNCIO > bool "python-serial-asyncio" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_SERIAL > help > asyncio extension package for pyserial. > diff --git a/package/python-service-identity/Config.in b/package/python-service-identity/Config.in > index c571065e92..aa6d0fe715 100644 > --- a/package/python-service-identity/Config.in > +++ b/package/python-service-identity/Config.in > @@ -3,7 +3,6 @@ config BR2_PACKAGE_PYTHON_SERVICE_IDENTITY > # 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 > diff --git a/package/python-setproctitle/Config.in b/package/python-setproctitle/Config.in > index a901fd7055..d13afaa401 100644 > --- a/package/python-setproctitle/Config.in > +++ b/package/python-setproctitle/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_SETPROCTITLE > bool "python-setproctitle" > - depends on BR2_PACKAGE_PYTHON3 > help > A Python module to customize the process title. > > diff --git a/package/python-simpleaudio/Config.in b/package/python-simpleaudio/Config.in > index c6fcd8b07a..1169342be7 100644 > --- a/package/python-simpleaudio/Config.in > +++ b/package/python-simpleaudio/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_SIMPLEAUDIO > bool "python-simpleaudio" > - depends on BR2_PACKAGE_PYTHON3 > depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib > select BR2_PACKAGE_ALSA_LIB > help > diff --git a/package/python-simplelogging/Config.in b/package/python-simplelogging/Config.in > index 7f58791836..db95efa25f 100644 > --- a/package/python-simplelogging/Config.in > +++ b/package/python-simplelogging/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_SIMPLELOGGING > bool "python-simplelogging" > - depends on BR2_PACKAGE_PYTHON3 # python-colorlog > select BR2_PACKAGE_PYTHON_COLORLOG # runtime > help > Logging made simple, no excuse for any debug print call. > diff --git a/package/python-simplesqlite/Config.in b/package/python-simplesqlite/Config.in > index 5a9fa4a5db..81501c9e83 100644 > --- a/package/python-simplesqlite/Config.in > +++ b/package/python-simplesqlite/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_SIMPLESQLITE > bool "python-simplesqlite" > - depends on BR2_PACKAGE_PYTHON3 # python-mbstrdecoder, python-pathvalidate > select BR2_PACKAGE_PYTHON_DATAPROPERTY # runtime > select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime > select BR2_PACKAGE_PYTHON_PATHVALIDATE # runtime > diff --git a/package/python-slob/Config.in b/package/python-slob/Config.in > index 07d04d49a2..c06f544534 100644 > --- a/package/python-slob/Config.in > +++ b/package/python-slob/Config.in > @@ -4,7 +4,6 @@ config BR2_PACKAGE_PYTHON_SLOB > depends on BR2_HOST_GCC_AT_LEAST_4_9 # python-pyicu -> icu > depends on BR2_INSTALL_LIBSTDCPP # python-pyicu -> icu > depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # python-pyicu -> icu > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_PYICU # runtime > # although optional, it is used as default compression > select BR2_PACKAGE_PYTHON3_XZ # runtime > @@ -15,7 +14,6 @@ config BR2_PACKAGE_PYTHON_SLOB > https://github.com/itkach/slob > > comment "python-slob needs a toolchain w/ C++, gcc >= 4.9, host gcc >= 4.9" > - depends on BR2_PACKAGE_PYTHON3 && !BR2_BINFMT_FLAT > depends on !BR2_INSTALL_LIBSTDCPP || \ > !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ > !BR2_HOST_GCC_AT_LEAST_4_9 > diff --git a/package/python-smmap2/Config.in b/package/python-smmap2/Config.in > index 1d4b1fabbe..21a3bdb613 100644 > --- a/package/python-smmap2/Config.in > +++ b/package/python-smmap2/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_SMMAP2 > bool "python-smmap2" > - depends on BR2_PACKAGE_PYTHON3 > help > Smmap wraps an interface around mmap and tracks the mapped > files as well as the amount of clients who use it. If the > diff --git a/package/python-socketio/Config.in b/package/python-socketio/Config.in > index 89d23b6ddf..a34853ec10 100644 > --- a/package/python-socketio/Config.in > +++ b/package/python-socketio/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_SOCKETIO > bool "python-socketio" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_BIDICT # runtime > select BR2_PACKAGE_PYTHON_ENGINEIO # runtime > help > diff --git a/package/python-sockjs/Config.in b/package/python-sockjs/Config.in > index 583d7ec741..92489ec71f 100644 > --- a/package/python-sockjs/Config.in > +++ b/package/python-sockjs/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_SOCKJS > bool "python-sockjs" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_AIOHTTP # runtime > help > SockJS server implementation for aiohttp. > diff --git a/package/python-soupsieve/Config.in b/package/python-soupsieve/Config.in > index eeac0ee36e..3cb7f8d0c5 100644 > --- a/package/python-soupsieve/Config.in > +++ b/package/python-soupsieve/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_SOUPSIEVE > bool "python-soupsieve" > - depends on BR2_PACKAGE_PYTHON3 > help > A modern CSS selector implementation for Beautiful Soup. > > diff --git a/package/python-sqliteschema/Config.in b/package/python-sqliteschema/Config.in > index b8fed33c49..102a615765 100644 > --- a/package/python-sqliteschema/Config.in > +++ b/package/python-sqliteschema/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_SQLITESCHEMA > bool "python-sqliteschema" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime > select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime > select BR2_PACKAGE_PYTHON_TABLEDATA # runtime > diff --git a/package/python-tabledata/Config.in b/package/python-tabledata/Config.in > index a73207f9c0..9947f41af6 100644 > --- a/package/python-tabledata/Config.in > +++ b/package/python-tabledata/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_TABLEDATA > bool "python-tabledata" > - depends on BR2_PACKAGE_PYTHON3 # python-dataproperty, python-typepy > select BR2_PACKAGE_PYTHON_DATAPROPERTY # runtime > select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime > select BR2_PACKAGE_PYTHON_SIX # runtime > diff --git a/package/python-tempora/Config.in b/package/python-tempora/Config.in > index 06ccbfc283..508cbae3f3 100644 > --- a/package/python-tempora/Config.in > +++ b/package/python-tempora/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_TEMPORA > bool "python-tempora" > - depends on BR2_PACKAGE_PYTHON3 # python-jaraco-functools > select BR2_PACKAGE_PYTHON_JARACO_FUNCTOOLS # runtime > select BR2_PACKAGE_PYTHON_SIX # runtime > select BR2_PACKAGE_PYTHON_PYTZ # runtime > diff --git a/package/python-tinycss2/Config.in b/package/python-tinycss2/Config.in > index e6c992b8c5..a34717e002 100644 > --- a/package/python-tinycss2/Config.in > +++ b/package/python-tinycss2/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_TINYCSS2 > bool "python-tinycss2" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_WEBENCODINGS # runtime > help > A tiny CSS parser. > diff --git a/package/python-tinyrpc/Config.in b/package/python-tinyrpc/Config.in > index 3194b7825a..3c643c754a 100644 > --- a/package/python-tinyrpc/Config.in > +++ b/package/python-tinyrpc/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_TINYRPC > bool "python-tinyrpc" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_SIX # runtime > help > A small, modular, transport and protocol neutral RPC > diff --git a/package/python-tomako/Config.in b/package/python-tomako/Config.in > index 1521035bb6..bd6d29982a 100644 > --- a/package/python-tomako/Config.in > +++ b/package/python-tomako/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_TOMAKO > bool "python-tomako" > - depends on BR2_PACKAGE_PYTHON3 # python-tornado > select BR2_PACKAGE_PYTHON_TORNADO # runtime > select BR2_PACKAGE_PYTHON_MAKO # runtime > help > diff --git a/package/python-tomli/Config.in b/package/python-tomli/Config.in > index e1cecaaa36..d2ae49a45f 100644 > --- a/package/python-tomli/Config.in > +++ b/package/python-tomli/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_TOMLI > bool "python-tomli" > - depends on BR2_PACKAGE_PYTHON3 > help > A lil' TOML parser. > > diff --git a/package/python-tornado/Config.in b/package/python-tornado/Config.in > index e1bf8343f0..b5c59e970d 100644 > --- a/package/python-tornado/Config.in > +++ b/package/python-tornado/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_TORNADO > bool "python-tornado" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON3_ZLIB > select BR2_PACKAGE_PYTHON3_SSL > help > diff --git a/package/python-traitlets/Config.in b/package/python-traitlets/Config.in > index 6515cdf8d1..a273601163 100644 > --- a/package/python-traitlets/Config.in > +++ b/package/python-traitlets/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_TRAITLETS > bool "python-traitlets" > - depends on BR2_PACKAGE_PYTHON3 > help > A configuration system for Python applications. > > diff --git a/package/python-treq/Config.in b/package/python-treq/Config.in > index 6e54c19e16..f781b37305 100644 > --- a/package/python-treq/Config.in > +++ b/package/python-treq/Config.in > @@ -3,7 +3,6 @@ config BR2_PACKAGE_PYTHON_TREQ > # 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 > diff --git a/package/python-twisted/Config.in b/package/python-twisted/Config.in > index 89298b2e0c..49a21c4204 100644 > --- a/package/python-twisted/Config.in > +++ b/package/python-twisted/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_TWISTED > bool "python-twisted" > - depends on BR2_PACKAGE_PYTHON3 # python-pyhamcrest; python-hyperlink -> python-idna > select BR2_PACKAGE_PYTHON_INCREMENTAL > select BR2_PACKAGE_PYTHON_ATTRS # runtime > select BR2_PACKAGE_PYTHON_AUTOMAT # runtime > diff --git a/package/python-txaio/Config.in b/package/python-txaio/Config.in > index 19a318a902..eddd983ea6 100644 > --- a/package/python-txaio/Config.in > +++ b/package/python-txaio/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_TXAIO > bool "python-txaio" > - depends on BR2_PACKAGE_PYTHON3 > help > Compatibility API between asyncio/Twisted/Trollius. > > diff --git a/package/python-txdbus/Config.in b/package/python-txdbus/Config.in > index ffd00f153e..f3ea4c78d6 100644 > --- a/package/python-txdbus/Config.in > +++ b/package/python-txdbus/Config.in > @@ -3,7 +3,6 @@ config BR2_PACKAGE_PYTHON_TXDBUS > # 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 0606e5f442..fbea7be8cf 100644 > --- a/package/python-txtorcon/Config.in > +++ b/package/python-txtorcon/Config.in > @@ -2,7 +2,6 @@ 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 > select BR2_PACKAGE_PYTHON_AUTOMAT # runtime > select BR2_PACKAGE_PYTHON_IDNA # runtime > select BR2_PACKAGE_PYTHON_INCREMENTAL # runtime > diff --git a/package/python-typepy/Config.in b/package/python-typepy/Config.in > index fd3b983186..3438e74475 100644 > --- a/package/python-typepy/Config.in > +++ b/package/python-typepy/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_TYPEPY > bool "python-typepy" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime > help > A Python library for variable type > diff --git a/package/python-ujson/Config.in b/package/python-ujson/Config.in > index aee1d75fce..81d1bc457c 100644 > --- a/package/python-ujson/Config.in > +++ b/package/python-ujson/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_UJSON > bool "python-ujson" > - depends on BR2_PACKAGE_PYTHON3 > help > UltraJSON is an ultra fast JSON encoder and decoder written > in pure C with bindings for Python 3. > diff --git a/package/python-unittest-xml-reporting/Config.in b/package/python-unittest-xml-reporting/Config.in > index b1a6244dd3..43b054faa7 100644 > --- a/package/python-unittest-xml-reporting/Config.in > +++ b/package/python-unittest-xml-reporting/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_UNITTEST_XML_REPORTING > bool "python-unittest-xml-reporting" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON3_PYEXPAT > help > unittest-based test runner with Ant/JUnit like XML > diff --git a/package/python-urwid/Config.in b/package/python-urwid/Config.in > index c141e8c0bd..f584a9258d 100644 > --- a/package/python-urwid/Config.in > +++ b/package/python-urwid/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_URWID > bool "python-urwid" > - depends on BR2_PACKAGE_PYTHON3 > help > Urwid is a console user interface library for Python > > diff --git a/package/python-uvloop/Config.in b/package/python-uvloop/Config.in > index 76e06ac3f4..b3fb275091 100644 > --- a/package/python-uvloop/Config.in > +++ b/package/python-uvloop/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_UVLOOP > bool "python-uvloop" > - depends on BR2_PACKAGE_PYTHON3 > depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv > depends on BR2_USE_MMU # libuv > depends on !BR2_STATIC_LIBS # libuv > diff --git a/package/python-validators/Config.in b/package/python-validators/Config.in > index 802b1dde5b..e700369910 100644 > --- a/package/python-validators/Config.in > +++ b/package/python-validators/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_VALIDATORS > bool "python-validators" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_SIX # runtime > select BR2_PACKAGE_PYTHON_DECORATOR # runtime > help > diff --git a/package/python-watchdog/Config.in b/package/python-watchdog/Config.in > index 6f0dd62073..18f569ee44 100644 > --- a/package/python-watchdog/Config.in > +++ b/package/python-watchdog/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_WATCHDOG > bool "python-watchdog" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_ARGH # runtime > select BR2_PACKAGE_PYTHON_PATHTOOLS # runtime > select BR2_PACKAGE_PYTHON_PYYAML # runtime > diff --git a/package/python-weasyprint/Config.in b/package/python-weasyprint/Config.in > index de68fe2f5b..4a7e5a513d 100644 > --- a/package/python-weasyprint/Config.in > +++ b/package/python-weasyprint/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_WEASYPRINT > bool "python-weasyprint" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_BROTLI # runtime > select BR2_PACKAGE_PYTHON_CFFI # runtime > select BR2_PACKAGE_PYTHON_CSSSELECT2 # runtime > diff --git a/package/python-webpy/Config.in b/package/python-webpy/Config.in > index 419a4a180f..ed78409572 100644 > --- a/package/python-webpy/Config.in > +++ b/package/python-webpy/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_WEBPY > bool "python-webpy" > - depends on BR2_PACKAGE_PYTHON3 # python-cheroot > select BR2_PACKAGE_PYTHON_CHEROOT # runtime > select BR2_PACKAGE_PYTHON_MARKDOWN # runtime > help > diff --git a/package/python-websockets/Config.in b/package/python-websockets/Config.in > index 888bec616f..60495b6284 100644 > --- a/package/python-websockets/Config.in > +++ b/package/python-websockets/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_WEBSOCKETS > bool "python-websockets" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON3_ZLIB > select BR2_PACKAGE_PYTHON3_SSL > help > diff --git a/package/python-wtforms/Config.in b/package/python-wtforms/Config.in > index 0cc136fc13..33a17d3d37 100644 > --- a/package/python-wtforms/Config.in > +++ b/package/python-wtforms/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_WTFORMS > bool "python-wtforms" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_MARKUPSAFE # runtime > help > A flexible forms validation and rendering library for > diff --git a/package/python-xlib/Config.in b/package/python-xlib/Config.in > index 20e585db9a..081af6a2fc 100644 > --- a/package/python-xlib/Config.in > +++ b/package/python-xlib/Config.in > @@ -1,6 +1,5 @@ > 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) > diff --git a/package/python-xlsxwriter/Config.in b/package/python-xlsxwriter/Config.in > index b5da7f3f1a..59fe3ba91c 100644 > --- a/package/python-xlsxwriter/Config.in > +++ b/package/python-xlsxwriter/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_XLSXWRITER > bool "python-xlsxwriter" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON3_ZLIB > help > A Python module for creating Excel XLSX files. > diff --git a/package/python-yarl/Config.in b/package/python-yarl/Config.in > index e52050451d..84e14ce92e 100644 > --- a/package/python-yarl/Config.in > +++ b/package/python-yarl/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_YARL > bool "python-yarl" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_MULTIDICT > select BR2_PACKAGE_PYTHON_IDNA > help > diff --git a/package/python-zeroconf/Config.in b/package/python-zeroconf/Config.in > index a56bf7c16c..1570674f59 100644 > --- a/package/python-zeroconf/Config.in > +++ b/package/python-zeroconf/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_ZEROCONF > bool "python-zeroconf" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_IFADDR # runtime > help > Pure Python Multicast DNS Service Discovery Library > diff --git a/package/python-zopfli/Config.in b/package/python-zopfli/Config.in > index 69d4b8b514..0b1ebca85c 100644 > --- a/package/python-zopfli/Config.in > +++ b/package/python-zopfli/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_ZOPFLI > bool "python-zopfli" > - depends on BR2_PACKAGE_PYTHON3 > help > Zopfli module for python. > > -- > 2.20.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From peter at korsgaard.com Sat Feb 12 11:24:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 12 Feb 2022 12:24:08 +0100 Subject: [Buildroot] [PATCH] utils/genrandconfig: drop BR2_PACKAGE_PYTHON_PY_ONLY logic Message-ID: <20220212112409.11674-1-peter@korsgaard.com> The option was removed by commit 306839586b (package/python: drop target package). Signed-off-by: Peter Korsgaard --- utils/genrandconfig | 2 -- 1 file changed, 2 deletions(-) diff --git a/utils/genrandconfig b/utils/genrandconfig index 77c7e585f5..3483d55c14 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -365,8 +365,6 @@ def gen_config(args): configlines.append("BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y\n") if randint(0, 20) == 0: configlines.append("BR2_STATIC_LIBS=y\n") - if randint(0, 20) == 0: - configlines.append("BR2_PACKAGE_PYTHON_PY_ONLY=y\n") if randint(0, 20) == 0: configlines.append("BR2_PACKAGE_PYTHON3_PY_ONLY=y\n") if randint(0, 5) == 0: -- 2.20.1 From james.hilliard1 at gmail.com Sat Feb 12 11:31:30 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 12 Feb 2022 04:31:30 -0700 Subject: [Buildroot] [PATCH v2 1/1] package/python-flit-core: new package/infrastructure Message-ID: <20220212113130.1213295-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 --- Changes v1 -> v2: - rebase on master --- 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 bf0649fc9c..d574bfa2b0 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -94,6 +94,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 @@ -143,6 +184,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 @@ -163,6 +217,12 @@ endif # ($(4),target) # ifeq ($$($(2)_SETUP_TYPE),setuptools) $(2)_DEPENDENCIES += $$(if $$(filter host-python-setuptools,$(1)),,host-python-setuptools) +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. @@ -174,6 +234,15 @@ $(2)_PYTHON_INTERPRETER = $$(HOST_DIR)/bin/python # 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) \ @@ -182,12 +251,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) \ @@ -195,12 +273,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) \ @@ -209,12 +297,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) \ @@ -223,6 +321,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 james.hilliard1 at gmail.com Sat Feb 12 11:34:06 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 12 Feb 2022 04:34:06 -0700 Subject: [Buildroot] [PATCH v3 1/2] package/python-flit-core: new package/infrastructure Message-ID: <20220212113407.1213446-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 --- Changes v1 -> v2: - rebase on master --- 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 bf0649fc9c..d574bfa2b0 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -94,6 +94,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 @@ -143,6 +184,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 @@ -163,6 +217,12 @@ endif # ($(4),target) # ifeq ($$($(2)_SETUP_TYPE),setuptools) $(2)_DEPENDENCIES += $$(if $$(filter host-python-setuptools,$(1)),,host-python-setuptools) +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. @@ -174,6 +234,15 @@ $(2)_PYTHON_INTERPRETER = $$(HOST_DIR)/bin/python # 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) \ @@ -182,12 +251,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) \ @@ -195,12 +273,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) \ @@ -209,12 +297,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) \ @@ -223,6 +321,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 james.hilliard1 at gmail.com Sat Feb 12 11:34:07 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 12 Feb 2022 04:34:07 -0700 Subject: [Buildroot] [PATCH v3 2/2] package/python-tinycss2: bump to version 1.1.1 In-Reply-To: <20220212113407.1213446-1-james.hilliard1@gmail.com> References: <20220212113407.1213446-1-james.hilliard1@gmail.com> Message-ID: <20220212113407.1213446-2-james.hilliard1@gmail.com> This update drops distutils support and requires flit package infrastructure. Signed-off-by: James Hilliard --- Changes v2 -> v3: - add python-tinycss2 back in series --- 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 giulio.benetti at benettiengineering.com Sat Feb 12 11:41:56 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 12 Feb 2022 12:41:56 +0100 Subject: [Buildroot] [PATCH V3] board: Add support for iMX8MN BSH SMM S2 PRO In-Reply-To: References: Message-ID: <26185F3A-7ADE-4AEB-8769-01C07430ECD7@benettiengineering.com> Hi Michael, > Il giorno 12 feb 2022, alle ore 11:12, Michael Nazzareno Trimarchi ha scritto: > > ?Hi all > > Should I need to resend? anything is missing now? No, only need to wait until maintainers submit it or find something I haven?t found(hope not). Best regards Giulio > > Michael > >> On Mon, Jan 31, 2022 at 5:20 PM Ariel D'Alessandro >> wrote: >> >> 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 > > > > -- > 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 james.hilliard1 at gmail.com Sat Feb 12 11:50:27 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 12 Feb 2022 04:50:27 -0700 Subject: [Buildroot] [PATCH buildroot-test 1/1] scripts/autobuild-run: fix and default to python3 Message-ID: <20220212115027.1533516-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- scripts/autobuild-run | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/autobuild-run b/scripts/autobuild-run index 346928f..9219134 100755 --- a/scripts/autobuild-run +++ b/scripts/autobuild-run @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright (C) 2014 by Thomas Petazzoni # @@ -794,7 +794,7 @@ class Builder: while True: try: self.run_one_build() - except URLError, e: + except URLError as e: sleep(30) # args / config file merging inspired by: -- 2.25.1 From arnout at mind.be Sat Feb 12 11:53:49 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 12:53:49 +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: <57cb38e0-b657-a6be-9722-4444ec9c0558@mind.be> On 31/01/2022 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. > > 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 Series applied to master, thanks! Regards, Arnout > > 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 arnout at mind.be Sat Feb 12 11:50:05 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 12:50:05 +0100 Subject: [Buildroot] [git commit] configs/snps_arc700_axs101: bump kernel and u-boot versions Message-ID: <20220212114631.9BFDC8284B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=758a3dffd2769ee2fe27bd50f2a0ec7175c69f75 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Bump versions: - use U-Boot 2022.01 - use Linux kernel v5.16 Add U-Boot configuration fragment increasing early malloc pool size. Signed-off-by: Sergey Matyukevich Acked-by: Alexey Brodkin Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- board/synopsys/axs10x/uboot-fragment.config | 1 + configs/snps_arc700_axs101_defconfig | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/board/synopsys/axs10x/uboot-fragment.config b/board/synopsys/axs10x/uboot-fragment.config new file mode 100644 index 0000000000..92fe20f463 --- /dev/null +++ b/board/synopsys/axs10x/uboot-fragment.config @@ -0,0 +1 @@ +CONFIG_SYS_MALLOC_F_LEN=0x0500 diff --git a/configs/snps_arc700_axs101_defconfig b/configs/snps_arc700_axs101_defconfig index 080250e92b..3a6bd5c0d3 100644 --- a/configs/snps_arc700_axs101_defconfig +++ b/configs/snps_arc700_axs101_defconfig @@ -8,13 +8,13 @@ BR2_TARGET_ROOTFS_INITRAMFS=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/synopsys/axs10x/post-build.sh" -# Linux headers same as kernel, a 5.6 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_6=y +# Linux headers same as kernel, a 5.16 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.6.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" BR2_LINUX_KERNEL_DEFCONFIG="axs101" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y @@ -22,6 +22,8 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=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.05" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="axs101" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/synopsys/axs10x/uboot-fragment.config" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y From arnout at mind.be Sat Feb 12 11:50:42 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 12:50:42 +0100 Subject: [Buildroot] [git commit] configs/snps_archs32_axs103: bump kernel and u-boot versions Message-ID: <20220212114631.A357F7F960@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3d03b24075c3d02d3471412dd7e087964b1d9198 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Bump versions: - use U-Boot 2022.01 - use Linux kernel v5.16 Add U-Boot configuration fragment increasing early malloc pool size. Signed-off-by: Sergey Matyukevich Acked-by: Alexey Brodkin Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- configs/snps_archs38_axs103_defconfig | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/configs/snps_archs38_axs103_defconfig b/configs/snps_archs38_axs103_defconfig index c5847809ba..2002520d1b 100644 --- a/configs/snps_archs38_axs103_defconfig +++ b/configs/snps_archs38_axs103_defconfig @@ -9,13 +9,13 @@ BR2_TARGET_ROOTFS_INITRAMFS=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/synopsys/axs10x/post-build.sh" -# Linux headers same as kernel, a 5.6 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_6=y +# Linux headers same as kernel, a 5.16 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.6.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" BR2_LINUX_KERNEL_DEFCONFIG="axs103_smp" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y @@ -23,6 +23,8 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=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.05" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="axs103" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/synopsys/axs10x/uboot-fragment.config" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y From arnout at mind.be Sat Feb 12 11:51:01 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 12:51:01 +0100 Subject: [Buildroot] [git commit] configs/snps_archs38_haps: bump kernel and u-boot versions Message-ID: <20220212114631.B237B82ACC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=37dae0ac31f82d5808c40dafc42267db35cbd262 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Bump versions: - use U-Boot 2022.01 - use Linux kernel v5.16 Signed-off-by: Sergey Matyukevich Acked-by: Alexey Brodkin Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- configs/snps_archs38_haps_defconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/snps_archs38_haps_defconfig b/configs/snps_archs38_haps_defconfig index a95d760df2..02e020bb47 100644 --- a/configs/snps_archs38_haps_defconfig +++ b/configs/snps_archs38_haps_defconfig @@ -7,12 +7,12 @@ BR2_TARGET_GENERIC_HOSTNAME="zebu_hs" BR2_TARGET_GENERIC_ISSUE="Welcome to the HAPS Development Platform" BR2_TARGET_ROOTFS_INITRAMFS=y -# Linux headers same as kernel, a 5.6 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_6=y +# Linux headers same as kernel, a 5.16 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.6.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" BR2_LINUX_KERNEL_DEFCONFIG="haps_hs_smp" BR2_LINUX_KERNEL_VMLINUX=y From arnout at mind.be Sat Feb 12 11:51:11 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 12:51:11 +0100 Subject: [Buildroot] [git commit] board/synopsys: remove outdated vdk boards Message-ID: <20220212114631.C019A7F960@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a778def2ac28eb7a993a33e51ab305b0c833d713 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Remove outdated and unused aarch64 and archs38 Synopsys VDK boards. Signed-off-by: Sergey Matyukevich Acked-by: Alexey Brodkin Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 5 - board/synopsys/vdk/linux-vdk-aarch64-defconfig | 143 ------------------------- board/synopsys/vdk/readme.txt | 65 ----------- configs/snps_aarch64_vdk_defconfig | 12 --- configs/snps_archs38_vdk_defconfig | 20 ---- 5 files changed, 245 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index eb073c41f1..689673fce7 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -215,7 +215,6 @@ F: configs/snps_arc700_axs101_defconfig F: configs/snps_archs38_axs103_defconfig F: configs/snps_archs38_haps_defconfig F: configs/snps_archs38_hsdk_defconfig -F: configs/snps_archs38_vdk_defconfig N: Ariel D'Alessandro F: package/axfsutils/ @@ -1420,10 +1419,6 @@ F: package/ssdp-responder/ F: package/sysklogd/ F: package/watchdogd/ -N: Joao Pinto -F: board/synopsys/vdk/ -F: configs/snps_aarch64_vdk_defconfig - N: Jochen Baltes F: package/altera-stapl diff --git a/board/synopsys/vdk/linux-vdk-aarch64-defconfig b/board/synopsys/vdk/linux-vdk-aarch64-defconfig deleted file mode 100644 index 8109e16925..0000000000 --- a/board/synopsys/vdk/linux-vdk-aarch64-defconfig +++ /dev/null @@ -1,143 +0,0 @@ -CONFIG_SYSVIPC=y -CONFIG_POSIX_MQUEUE=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=16 -CONFIG_CGROUPS=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_EMBEDDED=y -CONFIG_SLAB=y -CONFIG_PROFILING=y -CONFIG_CC_STACKPROTECTOR_REGULAR=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_SMP=y -CONFIG_SCHED_MC=y -CONFIG_SCHED_SMT=y -CONFIG_NR_CPUS=8 -CONFIG_PREEMPT=y -CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 -CONFIG_TRANSPARENT_HUGEPAGE=y -CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y -CONFIG_CMDLINE="console=ttyAMA0 earlyprintk=pl011,0x1c090000 debug user_debug=31 loglevel=9 root=/dev/vda" -CONFIG_CMDLINE_FORCE=y -CONFIG_BINFMT_MISC=y -CONFIG_CPU_IDLE=y -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_GOV_USERSPACE=y -CONFIG_CPU_FREQ_GOV_ONDEMAND=y -CONFIG_ARM_BIG_LITTLE_CPUFREQ=y -CONFIG_ARM_DT_BL_CPUFREQ=y -CONFIG_ARM_SPCI_CPUFREQ=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_XFRM_USER=y -CONFIG_NET_KEY=y -CONFIG_NET_KEY_MIGRATE=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -CONFIG_IP_PNP_RARP=y -CONFIG_SYN_COOKIES=y -CONFIG_NETWORK_PHY_TIMESTAMPING=y -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_DEVTMPFS=y -CONFIG_DEVTMPFS_MOUNT=y -CONFIG_VEXPRESS_CONFIG=y -CONFIG_CONNECTOR=m -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_NBD=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=65536 -CONFIG_VIRTIO_BLK=y -CONFIG_SCSI=y -CONFIG_BLK_DEV_SD=y -CONFIG_BLK_DEV_DM=y -CONFIG_NETDEVICES=y -CONFIG_STMMAC_ETH=m -CONFIG_INPUT_EVDEV=y -CONFIG_INPUT_MISC=y -CONFIG_INPUT_UINPUT=y -CONFIG_SERIO_AMBAKMI=y -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_AMBA_PL011=y -CONFIG_SERIAL_AMBA_PL011_CONSOLE=y -CONFIG_SERIAL_OF_PLATFORM=y -CONFIG_VIRTIO_CONSOLE=y -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_DESIGNWARE_PLATFORM=y -CONFIG_GPIOLIB=y -CONFIG_GPIO_SYSFS=y -CONFIG_POWER_RESET_VEXPRESS=y -CONFIG_FB=y -CONFIG_FB_ARMCLCD=y -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_LOGO=y -CONFIG_USB_HIDDEV=y -CONFIG_USB=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_HCD_SYNOPSYS=y -CONFIG_USB_OHCI_HCD=y -CONFIG_NOP_USB_XCEIV=y -CONFIG_USB_ULPI=y -CONFIG_USB_DUMMY_HCD=m -CONFIG_USB_G_SERIAL=m -CONFIG_MMC=y -CONFIG_MMC_ARMMMCI=y -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -CONFIG_LEDS_GPIO=y -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_TIMER=y -CONFIG_LEDS_TRIGGER_ONESHOT=y -CONFIG_LEDS_TRIGGER_HEARTBEAT=y -CONFIG_LEDS_TRIGGER_BACKLIGHT=y -CONFIG_LEDS_TRIGGER_CPU=y -CONFIG_LEDS_TRIGGER_GPIO=y -CONFIG_SWITCH=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_PL031=y -CONFIG_VIRTIO_BALLOON=y -CONFIG_VIRTIO_MMIO=y -CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y -CONFIG_COMMON_CLK_VERSATILE=y -CONFIG_CLK_SP810=y -CONFIG_CLK_VEXPRESS_OSC=y -CONFIG_COMMON_CLK_SCPI=y -CONFIG_MAILBOX=y -CONFIG_ARM_SCPI_PROTOCOL=y -CONFIG_EXT4_FS=y -CONFIG_EXT4_FS_SECURITY=y -CONFIG_BTRFS_FS=m -CONFIG_QFMT_V2=y -CONFIG_AUTOFS4_FS=m -CONFIG_MSDOS_FS=m -CONFIG_VFAT_FS=m -CONFIG_TMPFS=y -CONFIG_TMPFS_POSIX_ACL=y -CONFIG_HUGETLBFS=m -CONFIG_ECRYPT_FS=m -CONFIG_CRAMFS=m -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ISO8859_1=y -CONFIG_VIRTUALIZATION=y -CONFIG_KVM=y -CONFIG_DYNAMIC_DEBUG=y -CONFIG_DEBUG_INFO=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_SCHEDSTATS=y -CONFIG_TIMER_STATS=y -CONFIG_FUNCTION_TRACER=y -CONFIG_STRICT_DEVMEM=y -CONFIG_SECURITY=y -CONFIG_SECURITY_NETWORK_XFRM=y -CONFIG_LSM_MMAP_MIN_ADDR=0 - diff --git a/board/synopsys/vdk/readme.txt b/board/synopsys/vdk/readme.txt deleted file mode 100644 index 9804647340..0000000000 --- a/board/synopsys/vdk/readme.txt +++ /dev/null @@ -1,65 +0,0 @@ -Synopsys VDK Software Development Platform - -Intro -===== - -The Virtualizer Development Kit (VDK) Family for ARM Cortex Products -consists of a set of virtual prototypes that provide a virtualizer for -the ARM core variants. The VDK is a standalone package that runs on an -host computer. - -Buildroot will generate the kernel image and a minimal root filesystem. - -How to build it -=============== - -Configure Buildroot -------------------- - -Configuring Buildroot is pretty simple, just execute: - - $ make snps_aarch64_vdk_defconfig - -Build the rootfs and kernel ---------------------------- - -Note: you will need to have access to the network, since Buildroot will -download the packages' sources. - -You may now build your rootfs with: - - $ make - -(This may take a while) - -Result of the build -------------------- - -After building, you should obtain this tree: - - output/images/ - -- rootfs.ext2 - -- Image - -Installing your rootfs and Image -================================ - -Now copy the content of the output/images folder to the VDK' skins -folder: - - $ cp rootfs.ext2 Image /skins/Vanilla-Cortex/ARMv8 - - -Starting the VDK -================================ - -Go the VDK' installation root and execute the 'start' script: - - $ cd - $ ./start.sh - -The VP Explorer application will be executed, starting the simulation -automatically. - -For more information about Synopsys' VDK please check: -http://www.synopsys.com/Prototyping/VirtualPrototyping/Pages/default.aspx diff --git a/configs/snps_aarch64_vdk_defconfig b/configs/snps_aarch64_vdk_defconfig deleted file mode 100644 index b55dce1ad6..0000000000 --- a/configs/snps_aarch64_vdk_defconfig +++ /dev/null @@ -1,12 +0,0 @@ -BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_6=y -BR2_TARGET_GENERIC_HOSTNAME="vdk-buildroot" -BR2_TARGET_GENERIC_ISSUE="Welcome to SNPS VDK by Buildroot" -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.6" -BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/synopsys/vdk/linux-vdk-aarch64-defconfig" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -# BR2_TARGET_ROOTFS_TAR is not set diff --git a/configs/snps_archs38_vdk_defconfig b/configs/snps_archs38_vdk_defconfig deleted file mode 100644 index 8d8e9f7559..0000000000 --- a/configs/snps_archs38_vdk_defconfig +++ /dev/null @@ -1,20 +0,0 @@ -# Architecture -BR2_arcle=y -BR2_archs38=y - -# System -BR2_TARGET_GENERIC_HOSTNAME="archs38_vdk" -BR2_TARGET_GENERIC_ISSUE="Welcome to the HS38 VDK Software Development Platform" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/synopsys/axs10x/post-build.sh" -BR2_TARGET_ROOTFS_EXT2=y - -# Linux headers same as kernel, a 5.6 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_6=y - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.6.3" -BR2_LINUX_KERNEL_DEFCONFIG="vdk_hs38_smp" -BR2_LINUX_KERNEL_VMLINUX=y -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y From arnout at mind.be Sat Feb 12 11:50:51 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 12:50:51 +0100 Subject: [Buildroot] [git commit] configs/snps_archs38_hsdk: bump kernel and u-boot versions Message-ID: <20220212114631.AAC0682AB5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5069a6ba15b4118111bf6b33b8e98553b3c084e6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Bump versions: - use U-Boot 2022.01 - use Linux kernel v5.16 Signed-off-by: Sergey Matyukevich Acked-by: Alexey Brodkin Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- configs/snps_archs38_hsdk_defconfig | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/configs/snps_archs38_hsdk_defconfig b/configs/snps_archs38_hsdk_defconfig index 4a1ac3fcff..413ca5098c 100644 --- a/configs/snps_archs38_hsdk_defconfig +++ b/configs/snps_archs38_hsdk_defconfig @@ -1,7 +1,7 @@ BR2_arcle=y BR2_archs38_full=y BR2_TOOLCHAIN_BUILDROOT_GLIBC=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y BR2_PACKAGE_GLIBC_UTILS=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_TARGET_OPTIMIZATION="-mfpu=fpud_all" @@ -12,7 +12,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/synopsys/hsdk/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.6.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" BR2_LINUX_KERNEL_DEFCONFIG="hsdk" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/synopsys/hsdk/linux.fragment" BR2_TARGET_ROOTFS_EXT2=y @@ -21,10 +21,11 @@ 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.05" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="hsdk" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_ELF=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y From arnout at mind.be Sat Feb 12 12:10:01 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 13:10:01 +0100 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: On 31/01/2022 15:55, Michael Trimarchi wrote: > Add initial support for iMX8MN BSH SMM S2 PRO board: > > - Linux: v5.17-rc1 I'm a bit uncomfortable to add an -rc version. But I guess it can be updated as soon as 5.17 is released. > - 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 [snip] > 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/ You should also add configs/bsh_smms2pro_defconfig here. > 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" This is really a great way of doing it! > 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 Please also explain where you get uuu. Can we build it as part of buildroot? Then refer to it as output/host/bin/uuu. > + > + > +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 Even if the default happens to be correct, I prefer the subarch to be specified explicitly. That way we can change the default later without affecting this defconfig. > +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" I may be missing something, but this doesn't seem to be used by any of the post- scripts? > +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" Please use the tarball instead. Simply setting CUSTOM_VERSION should be sufficient - if not, linux.mk has tobe fixed. > +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" Gitlab is able to generate tarballs as well. There are plenty of examples in the tree. I would normally fix these things up while applying, but since I'm not entirely sure about merging a -rc kernel anyway, I'll wait for a v4 instead. Oh, one more thing: the subject for a new defconfig is typically "configs/bsh_smms2pro_defconfig: new defconfig" Regards, Arnout > +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 From arnout at mind.be Sat Feb 12 12:19:38 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 13:19:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/pkg-python: fix get_platform for target builds In-Reply-To: <20220130090535.404853-1-james.hilliard1@gmail.com> References: <20220130090535.404853-1-james.hilliard1@gmail.com> Message-ID: <449521f4-cef8-6209-7e94-bc2e7b9ca504@mind.be> On 30/01/2022 10:05, James Hilliard wrote: > 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 Applied to master, thanks. Regards, Arnout > --- > 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) \ From arnout at mind.be Sat Feb 12 12:13:18 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 13:13:18 +0100 Subject: [Buildroot] [git commit] package/pkg-python: fix get_platform for target builds Message-ID: <20220212121212.582E382578@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=59d3a1a9994c337207cd0bfdfbd79f01ff8739e6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/pkg-python.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index bf0649fc9c..02df061a19 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_PROJECT_BASE="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_DIR),$(PYTHON_DIR))" \ _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ _python_sysroot=$(STAGING_DIR) \ @@ -61,6 +69,7 @@ HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \ # Target setuptools-based packages PKG_PYTHON_SETUPTOOLS_ENV = \ + _PYTHON_HOST_PLATFORM="$(PKG_PYTHON_HOST_PLATFORM)" \ _PYTHON_PROJECT_BASE="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_DIR),$(PYTHON_DIR))" \ _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ PATH=$(BR_PATH) \ From michael at amarulasolutions.com Sat Feb 12 12:36:01 2022 From: michael at amarulasolutions.com (Michael Nazzareno Trimarchi) Date: Sat, 12 Feb 2022 13:36:01 +0100 Subject: [Buildroot] [PATCH V3] board: Add support for iMX8MN BSH SMM S2 PRO In-Reply-To: References: <20220131145555.2819020-1-michael@amarulasolutions.com> Message-ID: Hi On Sat, Feb 12, 2022 at 1:10 PM Arnout Vandecappelle wrote: > > > > On 31/01/2022 15:55, Michael Trimarchi wrote: > > Add initial support for iMX8MN BSH SMM S2 PRO board: > > > > - Linux: v5.17-rc1 > > I'm a bit uncomfortable to add an -rc version. But I guess it can be updated > as soon as 5.17 is released. Ok, I will then wait > > > - 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 > [snip] > > 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/ > > You should also add configs/bsh_smms2pro_defconfig here. > > > 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" > > This is really a great way of doing it! > Well, I have taken from another submitted board > > 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 > > Please also explain where you get uuu. Can we build it as part of buildroot? > Then refer to it as output/host/bin/uuu. Ok I will update it > > > + > > + > > +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 > > Even if the default happens to be correct, I prefer the subarch to be > specified explicitly. That way we can change the default later without affecting > this defconfig. > > > +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" > > I may be missing something, but this doesn't seem to be used by any of the > post- scripts? Ok > > > +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" > > Please use the tarball instead. Simply setting CUSTOM_VERSION should be > sufficient - if not, linux.mk has tobe fixed. Ok > > > +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" > > Gitlab is able to generate tarballs as well. There are plenty of examples in > the tree. > > > I would normally fix these things up while applying, but since I'm not > entirely sure about merging a -rc kernel anyway, I'll wait for a v4 instead. > I will prepare v4 Michael > Oh, one more thing: the subject for a new defconfig is typically > "configs/bsh_smms2pro_defconfig: new defconfig" > > Regards, > Arnout > > > +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 -- 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 arnout at mind.be Sat Feb 12 12:42:14 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 13:42:14 +0100 Subject: [Buildroot] [PATCH V3] board: Add support for iMX8MN BSH SMM S2 PRO In-Reply-To: References: <20220131145555.2819020-1-michael@amarulasolutions.com> Message-ID: On 12/02/2022 13:36, Michael Nazzareno Trimarchi wrote: > Hi > > On Sat, Feb 12, 2022 at 1:10 PM Arnout Vandecappelle wrote: >> >> >> >> On 31/01/2022 15:55, Michael Trimarchi wrote: >>> Add initial support for iMX8MN BSH SMM S2 PRO board: >>> >>> - Linux: v5.17-rc1 >> >> I'm a bit uncomfortable to add an -rc version. But I guess it can be updated >> as soon as 5.17 is released. > > Ok, I will then wait No, what I meant to say is: it's OK to do it with the -rc, just make sure that you update it to the release version when it comes around (which will still be another 8-ish weeks). If we still manage to merge this board before 2022.02, we'll just backport the bump to the LTS branch. Regards, Arnout [snip] From arnout at mind.be Sat Feb 12 12:46:33 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 13:46:33 +0100 Subject: [Buildroot] [PATCH 1/2] boot/uboot: depend on host-python-setuptools Message-ID: <20220212124634.3148041-1-arnout@mind.be> host-python3-setuptools was removed, we should instead use plain host-python-setuptools. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- boot/uboot/uboot.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 9e569906ce..6750069173 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -208,7 +208,7 @@ UBOOT_DEPENDENCIES += host-dtc endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON3),y) -UBOOT_DEPENDENCIES += host-python3 host-python3-setuptools +UBOOT_DEPENDENCIES += host-python3 host-python-setuptools endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYLIBFDT),y) -- 2.34.1 From arnout at mind.be Sat Feb 12 12:46:34 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 13:46:34 +0100 Subject: [Buildroot] [PATCH 2/2] package/python-regex: remove outdated comment In-Reply-To: <20220212124634.3148041-1-arnout@mind.be> References: <20220212124634.3148041-1-arnout@mind.be> Message-ID: <20220212124634.3148041-2-arnout@mind.be> python3-regex no longer exists, so there's no need to keep in sync with it. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-regex/python-regex.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/python-regex/python-regex.mk b/package/python-regex/python-regex.mk index a90fd579ac..b93607e40f 100644 --- a/package/python-regex/python-regex.mk +++ b/package/python-regex/python-regex.mk @@ -4,7 +4,6 @@ # ################################################################################ -# Please keep in sync with package/python3-regex/python3-regex.mk PYTHON_REGEX_VERSION = 2021.4.4 PYTHON_REGEX_SOURCE = regex-$(PYTHON_REGEX_VERSION).tar.gz PYTHON_REGEX_SITE = https://files.pythonhosted.org/packages/38/3f/4c42a98c9ad7d08c16e7d23b2194a0e4f3b2914662da8bc88986e4e6de1f -- 2.34.1 From arnout at mind.be Sat Feb 12 12:51:58 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 13:51:58 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add test for python-distro In-Reply-To: <20220130172145.888946-1-ju.o@free.fr> References: <20220130172145.888946-1-ju.o@free.fr> Message-ID: On 30/01/2022 18:21, Julien Olivain wrote: > 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 Applied to master, thanks. I removed the python2 part of course. Regards, Arnout > --- > 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"] From arnout at mind.be Sat Feb 12 12:55:17 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 13:55:17 +0100 Subject: [Buildroot] [PATCH 1/1] package:{clang, lld, llvm}: bump to version 11.1.0 In-Reply-To: References: <20220131015937.4113728-1-james.hilliard1@gmail.com> <20220131104553.715b97ce@windsurf> <731c2ec5-e693-f2d4-5f48-0eaf376c57d1@smile.fr> Message-ID: <6b5d3b43-fe50-0dd2-2903-e404ee7792b9@mind.be> On 02/02/2022 20:39, James Hilliard wrote: > On Mon, Jan 31, 2022 at 4:36 AM Romain Naour wrote: >> >> Hello James, Thomas, All, >> >> Le 31/01/2022 ? 10:45, Thomas Petazzoni via buildroot a ?crit : >>> On Sun, 30 Jan 2022 18:59:37 -0700 >>> James Hilliard wrote: >>> >>>> This appears to be the latest version that has a working lld build. >>>> >>>> Version 12.0.0 and newer have broken lld stand-alone builds: >>>> https://bugs.llvm.org/show_bug.cgi?id=49228 >>>> >>>> Signed-off-by: James Hilliard >>> >>> Is this really enough? I remember seeing patches a long time ago doing >>> bumps on LLVM/Clang and that was much more involved, which I think >>> explains why we're still at version 9.x. >>> >>> Romain, any comments on this? >> >> Adding Matt in Cc: >> >> IIRC, there is an issue with libclc package which is part of the llvm project. >> >> Due to the gap between the two version, all CMake options must be reviewed (long >> and boring task I agree). > > Oh, I guess there was already a series here with more changes: > https://patchwork.ozlabs.org/project/buildroot/list/?series=233431&submitter=&state=*&q=&archive=both&delegate= Given the discussion in both these threads, I've marked the patch as Changes Requested. Regards, Arnout From arnout at mind.be Sat Feb 12 13:05:12 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 14:05:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/libbpf: bump to version 0.6.1 In-Reply-To: <20220131020258.4114933-1-james.hilliard1@gmail.com> References: <20220131020258.4114933-1-james.hilliard1@gmail.com> Message-ID: <6cb7068a-66a0-9d93-2494-5e0d9fb4f364@mind.be> On 31/01/2022 03:02, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/libbpf/libbpf.hash | 2 +- > package/libbpf/libbpf.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/libbpf/libbpf.hash b/package/libbpf/libbpf.hash > index afc7aec1bf..27e22be9e9 100644 > --- a/package/libbpf/libbpf.hash > +++ b/package/libbpf/libbpf.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 21cbee4df093e7fd29e76ed429650d3f3abe3a893f35e346ab9bc3484f6e68c0 libbpf-0.4.0.tar.gz > +sha256 ce3a8eb32d85ac48490256597736d8b27e0a5e947a0731613b7aba6b4ae43ac0 libbpf-0.6.1.tar.gz > sha256 847f4addbd56e2d5be20c4ea0845e972672fc07b755fadaae5f7abd35d71e349 LICENSE > sha256 6313108c23efffa36948f8b2cff1560a5935373b527b0e1a837cc77e6ed1bacd LICENSE.BSD-2-Clause > sha256 0b9a4febcdee6de55872501d5c1a8f5d8b0d1650cd4d5351995ceb22e889f8ca LICENSE.LGPL-2.1 > diff --git a/package/libbpf/libbpf.mk b/package/libbpf/libbpf.mk > index 3f09cc38dc..6750b063c0 100644 > --- a/package/libbpf/libbpf.mk > +++ b/package/libbpf/libbpf.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBBPF_VERSION = 0.4.0 > +LIBBPF_VERSION = 0.6.1 > LIBBPF_SITE = $(call github,libbpf,libbpf,v$(LIBBPF_VERSION)) > LIBBPF_LICENSE = GPL-2.0, LGPL-2.1, BSD-2-Clause > LIBBPF_LICENSE_FILES = LICENSE LICENSE.BSD-2-Clause LICENSE.LGPL-2.1 From arnout at mind.be Sat Feb 12 13:06:53 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 14:06:53 +0100 Subject: [Buildroot] [PATCH 1/2] package/thermald: update URL in the docs In-Reply-To: <20220131024451.2580165-1-ricardo.martincoski@gmail.com> References: <20220131024451.2580165-1-ricardo.martincoski@gmail.com> Message-ID: On 31/01/2022 03:44, Ricardo Martincoski wrote: > Old project homepage was removed, so switch to github, already in use to > download the sources. > > Signed-off-by: Ricardo Martincoski Applied to master, thanks. Regards, Arnout > --- > This commit can be backported to maintenance branches > --- > package/thermald/Config.in | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/thermald/Config.in b/package/thermald/Config.in > index 6d74a164b6..e5e15b9b8d 100644 > --- a/package/thermald/Config.in > +++ b/package/thermald/Config.in > @@ -20,7 +20,7 @@ config BR2_PACKAGE_THERMALD > reaches a certain threshold, the Linux daemon activates > various cooling methods to try to cool the system. > > - https://01.org/linux-thermal-daemon > + https://github.com/intel/thermal_daemon > > comment "thermald needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" > depends on BR2_i386 || BR2_x86_64 From arnout at mind.be Sat Feb 12 13:09:14 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 14:09:14 +0100 Subject: [Buildroot] [PATCH 2/2] package/thermald: bump to 2.4.8 In-Reply-To: <20220131024451.2580165-2-ricardo.martincoski@gmail.com> References: <20220131024451.2580165-1-ricardo.martincoski@gmail.com> <20220131024451.2580165-2-ricardo.martincoski@gmail.com> Message-ID: <3537c4f9-b868-977e-12a1-c6d464aef044@mind.be> On 31/01/2022 03:44, Ricardo Martincoski wrote: > Two source files had their header updated to correctly state the licence > is GPL-2.0+, not GPL-2.0. There is no real licensing change to the > project in this bump. > > Signed-off-by: Ricardo Martincoski > --- > It is a bugfix release, so it is only for master: No, it's a bugfix release, so it should be backported to stable... > > Release 2.4.8 > -Fix Ideapad thermal shutdown issue #328 > > Release 2.4.7 > - Fix AC/DC power limit issue in some HP TigerLake systems > - Regression fix for RAPL MSR usage in xml config file > - Added Japer Lake and Alder Lake CPU models > - Debug scripts for log collection to upload Peter does backporting by going through the commit messages and deciding based on them whether it's for backport or not. Therefore, it's better to put this above the --- line. Applied to master, thanks. Regards, Arnout > --- > test-pkg config 1: > BR2_PACKAGE_THERMALD=y > BR2_INIT_SYSTEMD=y > https://gitlab.com/RicardoMartincoski/buildroot/-/pipelines/459263710 > > test-pkg config 2: > BR2_PACKAGE_THERMALD=y > BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y > https://gitlab.com/RicardoMartincoski/buildroot/-/pipelines/459264537 > --- > package/thermald/thermald.hash | 2 +- > package/thermald/thermald.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/thermald/thermald.hash b/package/thermald/thermald.hash > index 0a37f0e413..3a7c0f6952 100644 > --- a/package/thermald/thermald.hash > +++ b/package/thermald/thermald.hash > @@ -1,3 +1,3 @@ > # Locally computed: > -sha256 80c92902a89b72a9df85c51a8b5fc472cc01b4410600ef1f56d62c4ac23890c1 thermald-2.4.6.tar.gz > +sha256 3e5a5033339c021de41ed4f946dd39e13f79f722fb5bd98d798e83658184c39b thermald-2.4.8.tar.gz > sha256 e98be8bc482e038a14bfbc01caf800bbd0024fff275ef14cd999db6560254a8d COPYING > diff --git a/package/thermald/thermald.mk b/package/thermald/thermald.mk > index 9b303104e3..4e43277128 100644 > --- a/package/thermald/thermald.mk > +++ b/package/thermald/thermald.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -THERMALD_VERSION = 2.4.6 > +THERMALD_VERSION = 2.4.8 > THERMALD_SITE = $(call github,intel,thermal_daemon,v$(THERMALD_VERSION)) > # fetched from Github, with no configure script > THERMALD_AUTORECONF = YES From luca at lucaceresoli.net Sat Feb 12 13:09:18 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Sat, 12 Feb 2022 14:09:18 +0100 Subject: [Buildroot] [PATCH v5 2/2] add configs/zynqmp_zcu102_defconfig In-Reply-To: References: <20220211121740.1257919-1-neal.frager@xilinx.com> <20220211121740.1257919-2-neal.frager@xilinx.com> Message-ID: Hi Neal, On 11/02/22 14:16, Neal Frager wrote: > Hi Luca, > > I have encountered yet another issue. > > If the pm_cfg_obj.c file is generated with Vitis 2021.2, it looks like the following: > There is a new "#define PM_CONFIG_OBJECT_TYPE_BASE 0x1U" > which breaks the pm_cfg_obj_convert.py. > > Could you generate a new version of the script that supports the Vitis 2021 file format? Thank you for the report! I just sent a patch [0] to U-Boot to add this define to the script. I compared your file with one generated by an older Vivado and it looks like no other define has been added. Of course you can reply to that patch with your review, it would help getting it in mainline sooner. Now you can send a new version of your Buildroot patches that adds this U-Boot patch, so you can use an unmodified pm_cfg_obj.c Hint to use the patch: - go to [0] - click "mbox" to download the patch in the same format as 'git format-patch' - save that file into your Buildroot $BR2_GLOBAL_PATCH_DIR/uboot - edit the file to add a 'Fetch from:' line according to [1] The patch should be applied automatically on 'make uboot-clean uboot'. [0] https://patchwork.ozlabs.org/project/uboot/patch/20220212125121.3398547-1-luca at lucaceresoli.net/ [1] https://buildroot.org/downloads/manual/manual.html#_integrating_patches_found_on_the_web -- Luca From arnout at mind.be Sat Feb 12 13:10:29 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 14:10:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/xml-security-c: needs threads In-Reply-To: <20220128173002.2483220-1-fontaine.fabrice@gmail.com> References: <20220128173002.2483220-1-fontaine.fabrice@gmail.com> Message-ID: <4dbf1b11-209a-b222-bea5-7ad7c531baff@mind.be> On 28/01/2022 18:30, Fabrice Fontaine wrote: > 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 Applied to master, thanks. Regards, Arnout > --- > 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 From arnout at mind.be Sat Feb 12 13:11:57 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 14:11:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/protozero: bump version to 1.7.1 In-Reply-To: <20220128045140.272465-1-fido_max@inbox.ru> References: <20220128045140.272465-1-fido_max@inbox.ru> Message-ID: On 28/01/2022 05:51, Maxim Kochetkov via buildroot wrote: > Drop upstream patch. > Release-notes: https://github.com/mapbox/protozero/releases/tag/v1.7.1 > > Signed-off-by: Maxim Kochetkov Applied to master, thanks. Regards, Arnout > --- > ...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 From luca at lucaceresoli.net Sat Feb 12 13:13:28 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Sat, 12 Feb 2022 14:13:28 +0100 Subject: [Buildroot] [PATCH v6 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <20220211144402.1626443-1-neal.frager@xilinx.com> References: <20220211144402.1626443-1-neal.frager@xilinx.com> Message-ID: <69189572-6eba-ed26-52dd-08a8b098f124@lucaceresoli.net> Hi Neal, On 11/02/22 15:44, Neal Frager wrote: [...] > diff --git a/board/zynqmp/zcu106/pm_cfg_obj.c b/board/zynqmp/zcu106/pm_cfg_obj.c > new file mode 100644 > index 0000000000..6d15d510e9 > --- /dev/null > +++ b/board/zynqmp/zcu106/pm_cfg_obj.c > @@ -0,0 +1,562 @@ > +/****************************************************************************** > +* Copyright (c) 2017 - 2021 Xilinx, Inc. All rights reserved. > +* SPDX-License-Identifier: MIT > +******************************************************************************/ > + > +#include "xil_types.h" > +#include "pm_defs.h" > + > +#define PM_CONFIG_MASTER_SECTION_ID 0x101U > +#define PM_CONFIG_SLAVE_SECTION_ID 0x102U > +#define PM_CONFIG_PREALLOC_SECTION_ID 0x103U > +#define PM_CONFIG_POWER_SECTION_ID 0x104U > +#define PM_CONFIG_RESET_SECTION_ID 0x105U > +#define PM_CONFIG_SHUTDOWN_SECTION_ID 0x106U > +#define PM_CONFIG_SET_CONFIG_SECTION_ID 0x107U > +#define PM_CONFIG_GPO_SECTION_ID 0x108U > + > +#define PM_SLAVE_FLAG_IS_SHAREABLE 0x1U > +#define PM_MASTER_USING_SLAVE_MASK 0x2U > + > +#define PM_CONFIG_GPO1_MIO_PIN_34_MAP (1U << 10U) > +#define PM_CONFIG_GPO1_MIO_PIN_35_MAP (1U << 11U) > +#define PM_CONFIG_GPO1_MIO_PIN_36_MAP (1U << 12U) > +#define PM_CONFIG_GPO1_MIO_PIN_37_MAP (1U << 13U) > + > +#define PM_CONFIG_GPO1_BIT_2_MASK (1U << 2U) > +#define PM_CONFIG_GPO1_BIT_3_MASK (1U << 3U) > +#define PM_CONFIG_GPO1_BIT_4_MASK (1U << 4U) > +#define PM_CONFIG_GPO1_BIT_5_MASK (1U << 5U) > + > +#define SUSPEND_TIMEOUT 0xFFFFFFFFU > + > +#define PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK 0x00000001 > +#define PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK 0x00000100 > +#define PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK 0x00000200 > + > + > + > +#if defined (__ICCARM__) > +#pragma language=save > +#pragma language=extended > +#endif > +#if defined (__GNUC__) > + const u32 XPm_ConfigObject[] __attribute__((used, section(".sys_cfg_data"))) = > +#elif defined (__ICCARM__) > +#pragma location = ".sys_cfg_data" > +__root const u32 XPm_ConfigObject[] = > +#endif > +{ > + /**********************************************************************/ > + /* HEADER */ > + 2, /* Number of remaining words in the header */ > + 8, /* Number of sections included in config object */ > + 1U, /* Type of config object as base */ Here's where you have manually replaced "PM_CONFIG_OBJECT_TYPE_BASE" -> "1U", right? Well, it should be well noted in the commit message. This file is supposed to be generated by Vitis and used untouched, any manual edits whould be documented. Or, even better, use the U-Boot patch I sent (see other e-mail I just wrote) and use an unmodified pm_cfg_obj.c -- Luca From arnout at mind.be Sat Feb 12 12:55:52 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 13:55:52 +0100 Subject: [Buildroot] [git commit] support/testing: add test for python-distro Message-ID: <20220212130602.B9FDD82ACC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ebde11d29f5ceb7f7398d24cbf71909c1e08a073 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 [Arnout: drop python2 variant] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 2 ++ support/testing/tests/package/sample_python_distro.py | 4 ++++ support/testing/tests/package/test_python_distro.py | 11 +++++++++++ 3 files changed, 17 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 689673fce7..e89149cea0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1604,7 +1604,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..c26f9c499e --- /dev/null +++ b/support/testing/tests/package/test_python_distro.py @@ -0,0 +1,11 @@ +from tests.package.test_python import TestPythonPackageBase + + +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"] From arnout at mind.be Sat Feb 12 13:05:31 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 14:05:31 +0100 Subject: [Buildroot] [git commit] package/thermald: update URL in the docs Message-ID: <20220212130602.DF42482210@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1ddced072abefa001a10df56b9820e96db1b2b6f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Old project homepage was removed, so switch to github, already in use to download the sources. Signed-off-by: Ricardo Martincoski Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/thermald/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/thermald/Config.in b/package/thermald/Config.in index 6d74a164b6..e5e15b9b8d 100644 --- a/package/thermald/Config.in +++ b/package/thermald/Config.in @@ -20,7 +20,7 @@ config BR2_PACKAGE_THERMALD reaches a certain threshold, the Linux daemon activates various cooling methods to try to cool the system. - https://01.org/linux-thermal-daemon + https://github.com/intel/thermal_daemon comment "thermald needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" depends on BR2_i386 || BR2_x86_64 From arnout at mind.be Sat Feb 12 13:11:24 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 14:11:24 +0100 Subject: [Buildroot] [git commit] package/protozero: bump version to 1.7.1 Message-ID: <20220212130603.0A83382AD1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=89ac26c3043b02b60c24c3793c834ba053d91fde branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop upstream patch. Release-notes: https://github.com/mapbox/protozero/releases/tag/v1.7.1 Signed-off-by: Maxim Kochetkov Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...0001-CMakeLists.txt-respect-BUILD_TESTING.patch | 47 ---------------------- package/protozero/protozero.hash | 2 +- package/protozero/protozero.mk | 2 +- 3 files changed, 2 insertions(+), 49 deletions(-) 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 From arnout at mind.be Sat Feb 12 13:10:12 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 14:10:12 +0100 Subject: [Buildroot] [git commit] package/xml-security-c: needs threads Message-ID: <20220212130603.0077782210@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cdbe856675dafc43838f628ce4838ee8dc8d3080 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 From arnout at mind.be Sat Feb 12 13:04:33 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 14:04:33 +0100 Subject: [Buildroot] [git commit] package/libbpf: bump to version 0.6.1 Message-ID: <20220212130602.D341E82AD4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3e031008ce489dea29073c5750f5773c2e4b13cd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libbpf/libbpf.hash | 2 +- package/libbpf/libbpf.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libbpf/libbpf.hash b/package/libbpf/libbpf.hash index afc7aec1bf..27e22be9e9 100644 --- a/package/libbpf/libbpf.hash +++ b/package/libbpf/libbpf.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 21cbee4df093e7fd29e76ed429650d3f3abe3a893f35e346ab9bc3484f6e68c0 libbpf-0.4.0.tar.gz +sha256 ce3a8eb32d85ac48490256597736d8b27e0a5e947a0731613b7aba6b4ae43ac0 libbpf-0.6.1.tar.gz sha256 847f4addbd56e2d5be20c4ea0845e972672fc07b755fadaae5f7abd35d71e349 LICENSE sha256 6313108c23efffa36948f8b2cff1560a5935373b527b0e1a837cc77e6ed1bacd LICENSE.BSD-2-Clause sha256 0b9a4febcdee6de55872501d5c1a8f5d8b0d1650cd4d5351995ceb22e889f8ca LICENSE.LGPL-2.1 diff --git a/package/libbpf/libbpf.mk b/package/libbpf/libbpf.mk index 3f09cc38dc..6750b063c0 100644 --- a/package/libbpf/libbpf.mk +++ b/package/libbpf/libbpf.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBBPF_VERSION = 0.4.0 +LIBBPF_VERSION = 0.6.1 LIBBPF_SITE = $(call github,libbpf,libbpf,v$(LIBBPF_VERSION)) LIBBPF_LICENSE = GPL-2.0, LGPL-2.1, BSD-2-Clause LIBBPF_LICENSE_FILES = LICENSE LICENSE.BSD-2-Clause LICENSE.LGPL-2.1 From arnout at mind.be Sat Feb 12 13:08:46 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 14:08:46 +0100 Subject: [Buildroot] [git commit] package/thermald: bump to 2.4.8 Message-ID: <20220212130602.E98E982AD1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c8406392466ecd1591265e24e619202c79f08a39 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Two source files had their header updated to correctly state the licence is GPL-2.0+, not GPL-2.0. There is no real licensing change to the project in this bump. Release 2.4.8 -Fix Ideapad thermal shutdown issue #328 Release 2.4.7 - Fix AC/DC power limit issue in some HP TigerLake systems - Regression fix for RAPL MSR usage in xml config file - Added Japer Lake and Alder Lake CPU models - Debug scripts for log collection to upload Signed-off-by: Ricardo Martincoski Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/thermald/thermald.hash | 2 +- package/thermald/thermald.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/thermald/thermald.hash b/package/thermald/thermald.hash index 0a37f0e413..3a7c0f6952 100644 --- a/package/thermald/thermald.hash +++ b/package/thermald/thermald.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 80c92902a89b72a9df85c51a8b5fc472cc01b4410600ef1f56d62c4ac23890c1 thermald-2.4.6.tar.gz +sha256 3e5a5033339c021de41ed4f946dd39e13f79f722fb5bd98d798e83658184c39b thermald-2.4.8.tar.gz sha256 e98be8bc482e038a14bfbc01caf800bbd0024fff275ef14cd999db6560254a8d COPYING diff --git a/package/thermald/thermald.mk b/package/thermald/thermald.mk index 9b303104e3..4e43277128 100644 --- a/package/thermald/thermald.mk +++ b/package/thermald/thermald.mk @@ -4,7 +4,7 @@ # ################################################################################ -THERMALD_VERSION = 2.4.6 +THERMALD_VERSION = 2.4.8 THERMALD_SITE = $(call github,intel,thermal_daemon,v$(THERMALD_VERSION)) # fetched from Github, with no configure script THERMALD_AUTORECONF = YES From arnout at mind.be Sat Feb 12 13:12:11 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 14:12:11 +0100 Subject: [Buildroot] [git commit] package/osm2pgsql: bump version 1.6.0 Message-ID: <20220212130603.14D1982AD4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7c7de551c5bbe2fb4f392c4303a4d3475270fca7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release-notes: https://github.com/openstreetmap/osm2pgsql/releases/tag/1.6.0 Signed-off-by: Maxim Kochetkov Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 From arnout at mind.be Sat Feb 12 12:56:38 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 13:56:38 +0100 Subject: [Buildroot] [git commit] configs/friendlyarm_nanopi_r2s: new defconfig Message-ID: <20220212130602.C7FE982210@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9c78c8c0d7120b6de7103879961c778d32c57d52 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 [Arnout: - explicitly set BR2_cortex_a53=y; - remove unused mtools and dosfstools; - add BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y; ] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 | 40 +++++++++++++++++++++ 6 files changed, 130 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index e89149cea0..55fd9344ef 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1068,7 +1068,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..818c847f4b --- /dev/null +++ b/configs/friendlyarm_nanopi_r2s_defconfig @@ -0,0 +1,40 @@ +BR2_aarch64=y +BR2_cortex_a53=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_PYLIBFDT=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_GENIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y From arnout at mind.be Sat Feb 12 13:13:57 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 14:13:57 +0100 Subject: [Buildroot] [PATCH 1/1 next] package/osm2pgsql: bump version 1.6.0 In-Reply-To: <20220128060728.800722-1-fido_max@inbox.ru> References: <20220128060728.800722-1-fido_max@inbox.ru> Message-ID: On 28/01/2022 07:07, Maxim Kochetkov via buildroot wrote: > Release-notes: https://github.com/openstreetmap/osm2pgsql/releases/tag/1.6.0 > > Signed-off-by: Maxim Kochetkov Applied to master, thanks. Regards, Arnout > --- > 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 From nealf at xilinx.com Sat Feb 12 13:18:54 2022 From: nealf at xilinx.com (Neal Frager) Date: Sat, 12 Feb 2022 13:18:54 +0000 Subject: [Buildroot] [PATCH v6 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <69189572-6eba-ed26-52dd-08a8b098f124@lucaceresoli.net> References: <20220211144402.1626443-1-neal.frager@xilinx.com> <69189572-6eba-ed26-52dd-08a8b098f124@lucaceresoli.net> Message-ID: <039975A9-9273-4FC1-852B-C81AC2EF7077@xilinx.com> Hi Luca, > > Here's where you have manually replaced "PM_CONFIG_OBJECT_TYPE_BASE" -> > "1U", right? Well, it should be well noted in the commit message. This > file is supposed to be generated by Vitis and used untouched, any manual > edits whould be documented. > > Or, even better, use the U-Boot patch I sent (see other e-mail I just > wrote) and use an unmodified pm_cfg_obj.c > > -- > Luca Yes, exactly. I just deleted the define and replaced the one line where it was used with the 1U value. Unfortunately, I am on vacation this week, which is why I wanted to get the v6 patch in so quickly. I leave it up to Giulio and Peter if this patch can be accepted as is, or if we need to wait until I return in order to submit a new version of the patch. It would be really great if we can get this included in time for the 2022 long term support version of buildroot. Thanks for everyone?s support! Best regards, Neal Frager Xilinx From arnout at mind.be Sat Feb 12 13:25:24 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 14:25:24 +0100 Subject: [Buildroot] [PATCH v4 1/1] package/bpftool: new package In-Reply-To: <20220131185154.26343-1-james.hilliard1@gmail.com> References: <20220131185154.26343-1-james.hilliard1@gmail.com> Message-ID: <08b9ef7c-8ce6-3216-3f56-5c64af2f4a66@mind.be> On 31/01/2022 19:51, James Hilliard wrote: > 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. I don't understand this: linux-tools is part of the kernel build itself, so there shouldn't be any differences between kernel versions... Anyway, you probably experienced it so I kept the comment. > > The host bpftool is needed for enabling features such as the systemd > bpf-framework(to be added in a future patch). Normally we only accept host packages if there's a (target) package that actually depends on it. Knowing you however we're not going to have to wait long for this systemd bpf framework, so I kept the host package. > Signed-off-by: James Hilliard > --- > Changes v3 -> v4: > - remove linux-tools bpftool kconfig entry Ideally this should have been done in a separate patch, but OK. > 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 > [snip] > 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 This is purely for the libbpf submodule. We normally prefer to unbundle such dependencies, since we have libbpf as a package. I've kept it for now, but if you could unbundle it, that would be great. I've added a line to the commit message to explain why the git download method is used. Applied to master, thanks. Regards, Arnout > +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 From arnout at mind.be Sat Feb 12 13:19:15 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 14:19:15 +0100 Subject: [Buildroot] [git commit] package/bpftool: new package Message-ID: <20220212131841.98B4D82AD1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3675131e6c654d7536a184db0184fde7a97040e0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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). Use the git download method to get the libbpf submodule. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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(-) diff --git a/Config.in.legacy b/Config.in.legacy index 0794813a97..aefb0ba6ea 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_TARGET_UBOOT_NEEDS_PYTHON2 bool "host-python 2.7 support for U-Boot was removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 55fd9344ef..bcfcacb91d 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1279,6 +1279,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 1a9f3e29d8..7aff9e7cb7 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 From heiko.thiery at gmail.com Sat Feb 12 13:27:03 2022 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Sat, 12 Feb 2022 14:27:03 +0100 Subject: [Buildroot] [PATCH V3] board: Add support for iMX8MN BSH SMM S2 PRO In-Reply-To: References: <20220131145555.2819020-1-michael@amarulasolutions.com> Message-ID: Hi, Am Sa., 12. Feb. 2022 um 13:10 Uhr schrieb Arnout Vandecappelle : > > > > On 31/01/2022 15:55, Michael Trimarchi wrote: > > Add initial support for iMX8MN BSH SMM S2 PRO board: > > > > - Linux: v5.17-rc1 > > I'm a bit uncomfortable to add an -rc version. But I guess it can be updated > as soon as 5.17 is released. > > > - 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 > [snip] > > 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/ > > You should also add configs/bsh_smms2pro_defconfig here. > > > 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" > > This is really a great way of doing it! There was already a comment about that topic from Thomas: https://lists.buildroot.org/pipermail/buildroot/2022-January/634308.html > > > 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 > > Please also explain where you get uuu. Can we build it as part of buildroot? > Then refer to it as output/host/bin/uuu. > > > + > > + > > +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 > > Even if the default happens to be correct, I prefer the subarch to be > specified explicitly. That way we can change the default later without affecting > this defconfig. > > > +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" > > I may be missing something, but this doesn't seem to be used by any of the > post- scripts? This seems to be a leftover from the state where "board/freescale/common/imx/imx8-bootloader-prepare.sh" was used to generate the imx flash image. Now this is done by u-boot using binman Therefore this argument is no longer needed. > > > +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" > > Please use the tarball instead. Simply setting CUSTOM_VERSION should be > sufficient - if not, linux.mk has tobe fixed. > > > +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" > > Gitlab is able to generate tarballs as well. There are plenty of examples in > the tree. > > > I would normally fix these things up while applying, but since I'm not > entirely sure about merging a -rc kernel anyway, I'll wait for a v4 instead. > > Oh, one more thing: the subject for a new defconfig is typically > "configs/bsh_smms2pro_defconfig: new defconfig" > > Regards, > Arnout > > > +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 -- Heiko From arnout at mind.be Sat Feb 12 13:40:26 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 14:40:26 +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: On 31/01/2022 16:30, 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 Applied to master, thanks. Regards, Arnout [snip] From arnout at mind.be Sat Feb 12 13:39:16 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 14:39:16 +0100 Subject: [Buildroot] [git commit] configs/kontron_bl_imx8mm_defconfig: new defconfig Message-ID: <20220212133302.DD38B82AA5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ed5bbb7606c8b2614b3cfae640803eab79a1f2ac branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 [Arnout: explicitly set BR2_cortex_a53=y] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 2 + board/kontron/bl-imx8mm/extlinux.conf | 4 + board/kontron/bl-imx8mm/genimage.cfg | 18 ++ ...imx8mm-kontron-n801x-s-convert-options-to.patch | 31 +++ ...imx8mm-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(+) diff --git a/DEVELOPERS b/DEVELOPERS index bcfcacb91d..d29d8f3a21 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1180,7 +1180,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..57e7e9683d --- /dev/null +++ b/configs/kontron_bl_imx8mm_defconfig @@ -0,0 +1,59 @@ +# Architecture +BR2_aarch64=y +BR2_cortex_a53=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 From peter at korsgaard.com Sat Feb 12 13:42:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 12 Feb 2022 14:42:32 +0100 Subject: [Buildroot] [PATCH v6 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <20220211144402.1626443-1-neal.frager@xilinx.com> (Neal Frager's message of "Fri, 11 Feb 2022 07:44:01 -0700") References: <20220211144402.1626443-1-neal.frager@xilinx.com> Message-ID: <87pmnsnquv.fsf@dell.be.48ers.dk> >>>>> "Neal" == Neal Frager writes: > This patch: > - bumps ATF to Xilinx v2.6: mainline v2.6 requires patch to build > - bumps U-Boot to Xilinx 2022.01: important drivers not in mainline > - bumps Linux to Xilinx 5.15: important drivers not in mainline > - deletes board/zynqmp/patches directory: patches already in mainline > - modifies board/zynqmp/genimage.cfg: U-Boot 2022.01 uses u-boot.itb format > - adds extlinux.conf to vfat bootfs > - modifies U-Boot to unified xilinx_zynqmp_virt_defconfig (supports all boards) > - adds support for SPL pm_cfg_obj.c loading to PMU firmware > - enables support for host machines without OpenSSL required by U-Boot and Linux > Signed-off-by: Neal Frager > Reviewed-by: Giulio Benetti > Tested-by: Giulio Benetti > [Giulio: only build tested] > +++ b/configs/zynqmp_zcu106_defconfig > @@ -1,34 +1,39 @@ > BR2_aarch64=y > -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_GIT=y > BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" > -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="966124532656bc95d781abf57531e4cd4f962237" The git hashes do not make it directly clear what version this is, so I changed it to use the output of describe --abbrev=40 which adds a prefix like v5.15-930-g in front, directly making it clear that this is based on upstream 5.15 with 930 patches on top. I've done it for ATF and U-Boot as well and committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 12 13:43:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 12 Feb 2022 14:43:20 +0100 Subject: [Buildroot] [PATCH v6 2/2] add configs/zynqmp_zcu102_defconfig In-Reply-To: <20220211144402.1626443-2-neal.frager@xilinx.com> (Neal Frager's message of "Fri, 11 Feb 2022 07:44:02 -0700") References: <20220211144402.1626443-1-neal.frager@xilinx.com> <20220211144402.1626443-2-neal.frager@xilinx.com> Message-ID: <87leygnqtj.fsf@dell.be.48ers.dk> >>>>> "Neal" == Neal Frager writes: > This patch: > - adds support for Xilinx ZCU102 evaluation board > - ZCU102 features can be found here: > https://www.xilinx.com/products/boards-and-kits/zcu102.html > Signed-off-by: Neal Frager > Reviewed-by: Giulio Benetti > Tested-by: Giulio Benetti > [Giulio: only build tested] > --- V1-> V2: > * fixed general build issues > * added extlinux.conf for run-time boot issue V2-> V3: > * enabled support for host machines without OpenSSL required by U-Boot and Linux > * moved readme.txt update to zynqmp_zcu102_defconfig patch 2/2 V3-> V4: > * cleaned up commit log messages > * added version history V4-> V5: > * switched to sha1 urls to make ATF, U-Boot and Linux builds reproducible > * generated board specific pm_cfg_obj.c files with vitis 2021.2 V5-> V6: > * fixed build issue with pm_cfg_obj.c files > --- > --- > board/zynqmp/readme.txt | 23 +- > board/zynqmp/zcu102/pm_cfg_obj.c | 563 +++++++++++++++++++++++++++++++ > configs/zynqmp_zcu102_defconfig | 39 +++ > 3 files changed, 618 insertions(+), 7 deletions(-) > create mode 100644 board/zynqmp/zcu102/pm_cfg_obj.c > create mode 100644 configs/zynqmp_zcu102_defconfig You forgot to add an entry to the DEVELOPERS file for it, so I've done that, changed the git hashes with the git describe output like I explained for zcu106 and committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 12 13:43:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 12 Feb 2022 14:43:33 +0100 Subject: [Buildroot] [git commit] add configs/zynqmp_zcu102_defconfig Message-ID: <20220212133614.4D62E82B32@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f1090b9e8c217a87561c090c98ba26e713806ec1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This patch: - adds support for Xilinx ZCU102 evaluation board - ZCU102 features can be found here: https://www.xilinx.com/products/boards-and-kits/zcu102.html Signed-off-by: Neal Frager Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti [Giulio: only build tested] [Peter: use git describe for git hashes for clarity, add DEVELOPERS entry] Signed-off-by: Peter Korsgaard --- DEVELOPERS | 4 + board/zynqmp/readme.txt | 24 +- board/zynqmp/zcu102/pm_cfg_obj.c | 563 +++++++++++++++++++++++++++++++++++++++ configs/zynqmp_zcu102_defconfig | 39 +++ 4 files changed, 623 insertions(+), 7 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index d29d8f3a21..a91dccd1e0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2078,6 +2078,10 @@ F: package/libevdev/ F: package/pkg-qmake.mk F: package/qt5/qt5opcua/ +N: Neal Frager +F: board/zynqmp/ +F: configs/zynqmp_zcu102_defconfig + N: Nicola Di Lieto F: package/uacme/ diff --git a/board/zynqmp/readme.txt b/board/zynqmp/readme.txt index da37f4ccc9..dcde422091 100644 --- a/board/zynqmp/readme.txt +++ b/board/zynqmp/readme.txt @@ -1,10 +1,20 @@ -******************************** -Xilinx ZCU106 board - ZynqMP SoC -******************************** +****************************************** +Xilinx ZCU102 / ZCU106 boards - ZynqMP SoC +****************************************** + +This document describes the Buildroot support for the ZCU102 and +ZCU106 boards by Xilinx, based on the Zynq UltraScale+ MPSoC (aka +ZynqMP). It has been tested with the ZCU102 and ZCU106 production +boards. + +Evaluation board features can be found here with the links below. + +ZCU102: +https://www.xilinx.com/products/boards-and-kits/zcu102.html + +ZCU106: +https://www.xilinx.com/products/boards-and-kits/zcu106.html -This document describes the Buildroot support for the ZCU106 board by -Xilinx, based on the Zynq UltraScale+ MPSoC (aka ZynqMP). It has been -tested with the EK-U1-ZCU106-ES2 pre-production board. How to build it =============== @@ -32,7 +42,7 @@ After building, you should get a tree like this: +-- rootfs.ext4 -> rootfs.ext2 +-- sdcard.img +-- system.dtb -> zynqmp-zcu106-revA.dtb - +-- u-boot.bin + +-- u-boot.itb `-- zynqmp-zcu106-revA.dtb How to write the SD card diff --git a/board/zynqmp/zcu102/pm_cfg_obj.c b/board/zynqmp/zcu102/pm_cfg_obj.c new file mode 100644 index 0000000000..68557c4cb4 --- /dev/null +++ b/board/zynqmp/zcu102/pm_cfg_obj.c @@ -0,0 +1,563 @@ +/****************************************************************************** +* Copyright (c) 2017 - 2021 Xilinx, Inc. All rights reserved. +* SPDX-License-Identifier: MIT +******************************************************************************/ + +#include "xil_types.h" +#include "pm_defs.h" + +#define PM_CONFIG_MASTER_SECTION_ID 0x101U +#define PM_CONFIG_SLAVE_SECTION_ID 0x102U +#define PM_CONFIG_PREALLOC_SECTION_ID 0x103U +#define PM_CONFIG_POWER_SECTION_ID 0x104U +#define PM_CONFIG_RESET_SECTION_ID 0x105U +#define PM_CONFIG_SHUTDOWN_SECTION_ID 0x106U +#define PM_CONFIG_SET_CONFIG_SECTION_ID 0x107U +#define PM_CONFIG_GPO_SECTION_ID 0x108U + +#define PM_SLAVE_FLAG_IS_SHAREABLE 0x1U +#define PM_MASTER_USING_SLAVE_MASK 0x2U + +#define PM_CONFIG_GPO1_MIO_PIN_34_MAP (1U << 10U) +#define PM_CONFIG_GPO1_MIO_PIN_35_MAP (1U << 11U) +#define PM_CONFIG_GPO1_MIO_PIN_36_MAP (1U << 12U) +#define PM_CONFIG_GPO1_MIO_PIN_37_MAP (1U << 13U) + +#define PM_CONFIG_GPO1_BIT_2_MASK (1U << 2U) +#define PM_CONFIG_GPO1_BIT_3_MASK (1U << 3U) +#define PM_CONFIG_GPO1_BIT_4_MASK (1U << 4U) +#define PM_CONFIG_GPO1_BIT_5_MASK (1U << 5U) + +#define SUSPEND_TIMEOUT 0xFFFFFFFFU + +#define PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK 0x00000001 +#define PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK 0x00000100 +#define PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK 0x00000200 + + + +#if defined (__ICCARM__) +#pragma language=save +#pragma language=extended +#endif +#if defined (__GNUC__) + const u32 XPm_ConfigObject[] __attribute__((used, section(".sys_cfg_data"))) = +#elif defined (__ICCARM__) +#pragma location = ".sys_cfg_data" +__root const u32 XPm_ConfigObject[] = +#endif +{ + /**********************************************************************/ + /* HEADER */ + 2, /* Number of remaining words in the header */ + 8, /* Number of sections included in config object */ + 1U, /* Type of config object as base */ + /**********************************************************************/ + /* MASTER SECTION */ + PM_CONFIG_MASTER_SECTION_ID, /* Master SectionID */ + 3U, /* No. of Masters*/ + + NODE_APU, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_0, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_1, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Wake permissions */ + + + /**********************************************************************/ + /* SLAVE SECTION */ + + + PM_CONFIG_SLAVE_SECTION_ID, /* Section ID */ + 49, /* Number of slaves */ + + NODE_OCM_BANK_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TCM_0_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_0_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_1_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TCM_1_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_L2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU_PP_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU_PP_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_USB_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_USB_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_TTC_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SATA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_ETH_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_UART_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_UART_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SPI_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_SPI_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_I2C_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_I2C_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SD_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_SD_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_DP, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GDMA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_ADMA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_NAND, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_QSPI, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPIO, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_CAN_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_CAN_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_EXTERN, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_DDR, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_IPI_APU, + 0U, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_0, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_1, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_PCIE, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_PCAP, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_RTC, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_VCU, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_PL, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + + /**********************************************************************/ + /* PREALLOC SECTION */ + + PM_CONFIG_PREALLOC_SECTION_ID, /* Preallaoc SectionID */ + 3U, /* No. of Masters*/ + +/* Prealloc for psu_cortexa53_0 */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, + 12, + NODE_DDR, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_L2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_3, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_SD_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_QSPI, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_PL, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_APU, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_0 */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + 3, + NODE_TCM_0_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_0_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_1 */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + 3, + NODE_TCM_1_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_1_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + + /**********************************************************************/ + /* POWER SECTION */ + + PM_CONFIG_POWER_SECTION_ID, /* Power Section ID */ + 4U, /* Number of power nodes */ + + NODE_APU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_RPU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_FPD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_PLD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + + /**********************************************************************/ + /* RESET SECTION */ + + PM_CONFIG_RESET_SECTION_ID, /* Reset Section ID */ + 120U, /* Number of resets */ + + XILPM_RESET_PCIE_CFG, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_BRIDGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_CTRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRF, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GDMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SATA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APU_L2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DDR, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SOFT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_QSPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_NAND, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ADMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOU_CC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TIMESTAMP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R50, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R51, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_AMBA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_OCM, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_PGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RTC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SYSMON, 0, + XILPM_RESET_AFI_FM6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_LPD_SWDT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_FPD, PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + XILPM_RESET_RPU_DBG1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_DBG0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_VPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_7, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_8, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_9, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_10, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_11, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_12, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_13, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_14, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_15, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_16, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_17, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_18, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_19, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_20, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_21, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_22, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_23, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_24, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_25, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_26, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_27, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_28, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_29, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_30, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_31, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_LS, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PS_ONLY, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_92, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_93, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_94, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_95, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + + /**********************************************************************/ + /* SET CONFIG SECTION */ + PM_CONFIG_SET_CONFIG_SECTION_ID, /* Set Config Section ID */ + 0U, /* Permissions to load base config object */ + 0U, /* Permissions to load overlay config object */ + + /**********************************************************************/ + /* SHUTDOWN SECTION */ + + PM_CONFIG_SHUTDOWN_SECTION_ID, /* Shutdown Section ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* System Shutdown/Restart Permission */ + + /**********************************************************************/ + /* GPO SECTION */ + PM_CONFIG_GPO_SECTION_ID, /* GPO Section ID */ + PM_CONFIG_GPO1_BIT_2_MASK | + PM_CONFIG_GPO1_MIO_PIN_34_MAP | + PM_CONFIG_GPO1_MIO_PIN_35_MAP | + PM_CONFIG_GPO1_MIO_PIN_36_MAP | + PM_CONFIG_GPO1_MIO_PIN_37_MAP | + 0, /* State of GPO pins */ +}; +#if defined (__ICCARM__) +#pragma language=restore +#endif + diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig new file mode 100644 index 0000000000..298ce2388c --- /dev/null +++ b/configs/zynqmp_zcu102_defconfig @@ -0,0 +1,39 @@ +BR2_aarch64=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.15-930-g966124532656bc95d781abf57531e4cd4f962237" +BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v2.6-33-ge678d5ddc475f34dea8f5004fb6ebde118621784" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/Xilinx/u-boot-xlnx.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2022.01-165-g667001319cbe511ce6353195fb4910ae5cb041ce" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" +BR2_TARGET_UBOOT_ZYNQMP=y +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/v2021.2/bin/pmufw-v2021.2.bin" +BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/zcu102/pm_cfg_obj.c" +BR2_TARGET_UBOOT_FORMAT_ITB=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y From peter at korsgaard.com Sat Feb 12 13:43:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 12 Feb 2022 14:43:32 +0100 Subject: [Buildroot] [git commit] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 Message-ID: <20220212133614.415FE82AA5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4ade9cb1c1751d11f8e174443e5a999b3701a627 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This patch: - bumps ATF to Xilinx v2.6: mainline v2.6 requires patch to build - bumps U-Boot to Xilinx 2022.01: important drivers not in mainline - bumps Linux to Xilinx 5.15: important drivers not in mainline - deletes board/zynqmp/patches directory: patches already in mainline - modifies board/zynqmp/genimage.cfg: U-Boot 2022.01 uses u-boot.itb format - adds extlinux.conf to vfat bootfs - modifies U-Boot to unified xilinx_zynqmp_virt_defconfig (supports all boards) - adds support for SPL pm_cfg_obj.c loading to PMU firmware - enables support for host machines without OpenSSL required by U-Boot and Linux Signed-off-by: Neal Frager Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti [Giulio: only build tested] [Peter: use git describe for git hashes for clarity] Signed-off-by: Peter Korsgaard --- board/zynqmp/extlinux.conf | 5 + board/zynqmp/genimage.cfg | 6 +- ...erity-fix-Remove-GGC-ignore-Warray-bounds.patch | 68 --- ...1-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch | 52 -- .../0002-arm64-zynqmp-Enable-booting-to-ATF.patch | 114 ----- ...p-accept-an-absolute-path-for-PMUFW_INIT_.patch | 68 --- ...ynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch | 175 ------- board/zynqmp/post-build.sh | 8 + board/zynqmp/post-image.sh | 4 +- board/zynqmp/zcu106/pm_cfg_obj.c | 562 +++++++++++++++++++++ configs/zynqmp_zcu106_defconfig | 23 +- 11 files changed, 596 insertions(+), 489 deletions(-) diff --git a/board/zynqmp/extlinux.conf b/board/zynqmp/extlinux.conf new file mode 100644 index 0000000000..ae3ec8614a --- /dev/null +++ b/board/zynqmp/extlinux.conf @@ -0,0 +1,5 @@ +label linux + kernel /Image + devicetree /system.dtb + append console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait + diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg index ed202f4550..20d8352c08 100644 --- a/board/zynqmp/genimage.cfg +++ b/board/zynqmp/genimage.cfg @@ -2,11 +2,13 @@ image boot.vfat { vfat { files = { "boot.bin", - "u-boot.bin", - "atf-uboot.ub", + "u-boot.itb", "system.dtb", "Image" } + file extlinux/extlinux.conf { + image = extlinux.conf + } } size = 32M diff --git a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch b/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch deleted file mode 100644 index 0c1a9ba2a4..0000000000 --- a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch +++ /dev/null @@ -1,68 +0,0 @@ -From da003e6ada7d0217fe99dc7c649a731f8ebd3c34 Mon Sep 17 00:00:00 2001 -From: Deepika Bhavnani -Date: Thu, 15 Aug 2019 00:56:46 +0300 -Subject: [PATCH] Coverity fix: Remove GGC ignore -Warray-bounds - -GCC diagnostics were added to ignore array boundaries, instead -of ignoring GCC warning current code will check for array boundaries -and perform and array update only for valid elements. - -Resolves: `CID 246574` `CID 246710` `CID 246651` - -Signed-off-by: Deepika Bhavnani -Change-Id: I7530ecf7a1707351c6ee87e90cc3d33574088f57 - -Backported from: 41af05154abe136938bcfb5f26c969933784bbef -[Adapted to apply on 1.5] - ---- - lib/psci/psci_common.c | 20 ++++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) - -diff --git a/lib/psci/psci_common.c b/lib/psci/psci_common.c -index 2220a745cd6e..6282d992a2f0 100644 ---- a/lib/psci/psci_common.c -+++ b/lib/psci/psci_common.c -@@ -188,21 +188,17 @@ static unsigned int get_power_on_target_pwrlvl(void) - /****************************************************************************** - * Helper function to update the requested local power state array. This array - * does not store the requested state for the CPU power level. Hence an -- * assertion is added to prevent us from accessing the wrong index. -+ * assertion is added to prevent us from accessing the CPU power level. - *****************************************************************************/ - static void psci_set_req_local_pwr_state(unsigned int pwrlvl, - unsigned int cpu_idx, - plat_local_state_t req_pwr_state) - { -- /* -- * This should never happen, we have this here to avoid -- * "array subscript is above array bounds" errors in GCC. -- */ - assert(pwrlvl > PSCI_CPU_PWR_LVL); --#pragma GCC diagnostic push --#pragma GCC diagnostic ignored "-Warray-bounds" -- psci_req_local_pwr_states[pwrlvl - 1][cpu_idx] = req_pwr_state; --#pragma GCC diagnostic pop -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && -+ (cpu_idx < PLATFORM_CORE_COUNT)) { -+ psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx] = req_pwr_state; -+ } - } - - /****************************************************************************** -@@ -228,7 +224,11 @@ static plat_local_state_t *psci_get_req_local_pwr_states(unsigned int pwrlvl, - { - assert(pwrlvl > PSCI_CPU_PWR_LVL); - -- return &psci_req_local_pwr_states[pwrlvl - 1][cpu_idx]; -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && -+ (cpu_idx < PLATFORM_CORE_COUNT)) { -+ return &psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx]; -+ } else -+ return NULL; - } - - /* --- -2.34.0 - diff --git a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch b/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch deleted file mode 100644 index 4d85e1bb12..0000000000 --- a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch +++ /dev/null @@ -1,52 +0,0 @@ -From e5d72ed8339eb05285448aad3c89d21e4d18fd29 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Mon, 26 Feb 2018 09:40:34 +0100 -Subject: [PATCH] arm64: zynqmp: zcu106: fix SPL MMC booting - -The U-Boot SPL generated with the current zcu106 defconfig cannot boot -from MMC: - - [...] - U-Boot SPL 2018.01 (Feb 21 2018 - 17:47:14) - EL Level: EL3 - Trying to boot from MMC1 - sdhci_transfer_data: Error detected in status(0x408020)! - spl_load_image_fat_os: error reading image u-boot.bin, err - -2 - spl_load_image_fat: error reading image u-boot.img, err - -6 - SPL: failed to boot from all boot devices - ### ERROR ### Please RESET the board ### - -Fix by lowering the rpll value. The new value for the RPLL_CTRL -register comes from the current psu_init_gpl.c from the HDF file at -https://github.com/xilinx/hdf-examples/tree/01ad8ea5fd1989abf4ea5a072d019a16cb2bc546/zcu106-zynqmp -(generated by Vivado v2017.4). - -RPLL and sdio1_ref clocks before and after this change: - - - Old values: RPLL 1.36 GHz, sdio1_ref 272 MHz - - New values: RPLL 1.16 GHz, sdio1_ref 233 MHz - -Signed-off-by: Luca Ceresoli -Cc: Michal Simek -Upstream-status: accepted upstream in a different form ---- - - board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -index 4d18abe000ca..e6fa477e53e7 100644 ---- a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -+++ b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -@@ -10,7 +10,7 @@ - static unsigned long psu_pll_init_data(void) - { - psu_mask_write(0xFF5E0034, 0xFE7FEDEFU, 0x7E4E2C62U); -- psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00013C00U); -+ psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00014600U); - psu_mask_write(0xFF5E0030, 0x00000008U, 0x00000008U); - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000001U); - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000000U); --- -2.7.4 - diff --git a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch b/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch deleted file mode 100644 index 487fff6812..0000000000 --- a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 5e3cac50cc981e01d9072241035a8d4162560c71 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Mon, 12 Mar 2018 17:18:38 +0100 -Subject: [PATCH] arm64: zynqmp: Enable booting to ATF - -U-Boot is now able to boot to ARM Trusted Firmware (ATF). The boot -flow is SPL(EL3) loads ATF and full u-boot and jump to ATF(EL3) which -pass control to full u-boot(EL2). This has been tested on zcu106, so -enable it in this defconfig. - -To generate an image that triggers this booting flow, you need to pass -'-O arm-trusted-firmware' to mkimage. - -Signed-off-by: Luca Ceresoli -Signed-off-by: Michal Simek -Backported from upstream: http://git.denx.de/?p=u-boot.git;a=commit;h=5e3cac50cc981e01d9072241035a8d4162560c71 ---- - - configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 + - configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 + - configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 + - configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 + - configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 1 + - configs/xilinx_zynqmp_zcu102_revA_defconfig | 1 + - configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 + - 7 files changed, 7 insertions(+) - -diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig -index c5bfa2b12638..488c72258b0e 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig -index f86dce403a42..5d501eec0edd 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig -@@ -20,6 +20,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig -index 6e947cf56827..6f7eaebd7676 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig -@@ -16,6 +16,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_CMD_MEMTEST=y - CONFIG_SYS_ALT_MEMTEST=y -diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig -index 1c934858c61c..7a3806cba4b5 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig -@@ -17,6 +17,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_CMD_MEMTEST=y - CONFIG_SYS_ALT_MEMTEST=y -diff --git a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig -index e13c7c56f310..e4408f182ca0 100644 ---- a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig -+++ b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig b/configs/xilinx_zynqmp_zcu102_revA_defconfig -index 5b2cd495ee85..b52f6789fd4b 100644 ---- a/configs/xilinx_zynqmp_zcu102_revA_defconfig -+++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig -index e6530fbfe7ff..80592554f682 100644 ---- a/configs/xilinx_zynqmp_zcu102_revB_defconfig -+++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y --- -2.7.4 - diff --git a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch b/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch deleted file mode 100644 index 95ab7b3b75..0000000000 --- a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch +++ /dev/null @@ -1,68 +0,0 @@ -From c7df098a71e05dc81cee818747759e8060b59626 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Mon, 4 Jun 2018 12:21:01 +0200 -Subject: [PATCH] arm64: zynqmp: accept an absolute path for PMUFW_INIT_FILE - -The value of PMUFW_INIT_FILE is prefixed with "$(srctree)/", thus -forcing it to be a relative path inside the U-Boot source tree. Since -the PMUFW is a binary file generated outside of U-Boot, the PMUFW -binary must be copied inside the U-Boot source tree before the -build. - -This generates a few problems: - - * if the source tree is shared among different out-of-tree builds, - they will pollute (and potentially corrupt) each other - * the source tree cannot be read-only - * any buildsystem must add a command to copy the PMUFW binary - * putting an externally-generated binary in the source tree is ugly - as hell - -Avoid these problems by accepting an absolute path for -PMUFW_INIT_FILE. This would be as simple as removing the "$(srctree)/" -prefix, but in order to keep backward compatibility we rather use the -shell and readlink to get the absolute path even when starting from a -relative path. - -Since 'readlink -f' produces an empty string if the file does not -exist, we also add a check to ensure the file configured in -PMUFW_INIT_FILE exists. Otherwise the build would exit successfully, -but produce a boot.bin without PMUFW as if PMUFW_INIT_FILE were empty. - -Tested in the 12 possible combinations of: - - PMUFW_INIT_FILE empty, relative, absolute, non-existing - - building in-tree, in subdir, in other directory - -Signed-off-by: Luca Ceresoli -Cc: Michal Simek -Cc: Simon Glass -Cc: Emmanuel Vadot -Signed-off-by: Michal Simek -Backported from upstream: https://git.denx.de/?p=u-boot.git;a=commit;h=c7df098a71e05dc81cee818747759e8060b59626 ---- - scripts/Makefile.spl | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl -index ef018b5b4056..252f13826d4c 100644 ---- a/scripts/Makefile.spl -+++ b/scripts/Makefile.spl -@@ -167,8 +167,14 @@ ifdef CONFIG_ARCH_ZYNQ - MKIMAGEFLAGS_boot.bin = -T zynqimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) - endif - ifdef CONFIG_ARCH_ZYNQMP -+ifneq ($(CONFIG_PMUFW_INIT_FILE),"") -+spl/boot.bin: zynqmp-check-pmufw -+zynqmp-check-pmufw: FORCE -+ ( cd $(srctree) && test -r $(CONFIG_PMUFW_INIT_FILE) ) \ -+ || ( echo "Cannot read $(CONFIG_PMUFW_INIT_FILE)" && false ) -+endif - MKIMAGEFLAGS_boot.bin = -T zynqmpimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) \ -- -n $(srctree)/$(CONFIG_PMUFW_INIT_FILE) -+ -n "$(shell cd $(srctree); readlink -f $(CONFIG_PMUFW_INIT_FILE))" - endif - - spl/boot.bin: $(obj)/u-boot-spl.bin FORCE --- -2.7.4 - diff --git a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch b/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch deleted file mode 100644 index b32e162780..0000000000 --- a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch +++ /dev/null @@ -1,175 +0,0 @@ -From 4c9d54ab5a41d65000c8d249b6fb1b76056f1812 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Wed, 20 Jun 2018 12:11:50 +0200 -Subject: [PATCH] arm/arm64: zynq/zynqmp: pass the PS init file as a kconfig - variable - -U-Boot needs to link ps7_init_gpl.c on Zynq or psu_init_gpl.c on -ZynqMP (PS init for short). The current logic to locate this file for -both platforms is: - - 1. if a board-specific file exists in - board/xilinx/zynq[mp]/$(CONFIG_DEFAULT_DEVICE_TREE)/ps?_init_gpl.c - then use it - 2. otherwise use board/xilinx/zynq/ps?_init_gpl.c - -In the latter case the file does not exist in the U-Boot sources and -must be copied in the source tree from the outside before starting the -build. This is typical when it is generated from Xilinx tools while -developing a custom hardware. However making sure that a -board-specific file is _not_ found (and used) requires some trickery -such as removing or overwriting all PS init files (e.g.: the current -meta-xilinx yocto layer [0]). - -This generates a few problems: - - * if the source tree is shared among different out-of-tree builds, - they will pollute (and potentially corrupt) each other - * the source tree cannot be read-only - * any buildsystem must add a command to copy the PS init file binary - * overwriting or deleting files in the source tree is ugly as hell - -Simplify usage by allowing to pass the path to the desired PS init -file in kconfig variable XILINX_PS_INIT_FILE. It can be an absolute -path or relative to $(srctree). If the variable is set, the -user-specified file will always be used without being copied -around. If the the variable is left empty, for backward compatibility -fall back to the old behaviour. - -Since the issue is the same for Zynq and ZynqMP, add one kconfig -variable in a common place and use it for both. - -Also use the new kconfig help text to document all the ways to give -U-Boot the PS init file. - -Build-tested with all combinations of: - - platform: zynq or zynqmp - - PS init file: from XILINX_PS_INIT_FILE (absolute, relative path, - non-existing), in-tree board-specific, in board/xilinx/zynq[mp]/ - - building in-tree, in subdir, in other directory - -[0] https://github.com/Xilinx/meta-xilinx/blob/b2f74cc7fe5c4881589d5e440a17cb51fc66a7ab/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init.inc#L9 - -Signed-off-by: Luca Ceresoli -Cc: Albert Aribaud -Cc: Michal Simek -Cc: Nathan Rossi -Backported from upstream: https://git.denx.de/?p=u-boot.git;a=commit;h=6da4f67ad09cd8b311d77b2b04e557b7ef65b56c ---- - arch/arm/Kconfig | 1 + - board/xilinx/Kconfig | 41 +++++++++++++++++++++++++++++++++++++++++ - board/xilinx/zynq/Makefile | 10 +++++++++- - board/xilinx/zynqmp/Makefile | 10 +++++++++- - 4 files changed, 60 insertions(+), 2 deletions(-) - create mode 100644 board/xilinx/Kconfig - -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 22234cde2ab6..e04979d0ef7e 100644 ---- a/arch/arm/Kconfig -+++ b/arch/arm/Kconfig -@@ -1293,4 +1293,5 @@ source "board/technologic/ts4600/Kconfig" - source "board/vscom/baltos/Kconfig" - source "board/woodburn/Kconfig" - source "board/work-microwave/work_92105/Kconfig" -+source "board/xilinx/Kconfig" - source "board/zipitz2/Kconfig" - - source "arch/arm/Kconfig.debug" -diff --git a/board/xilinx/Kconfig b/board/xilinx/Kconfig -new file mode 100644 -index 000000000000..aa3fa061edef ---- /dev/null -+++ b/board/xilinx/Kconfig -@@ -0,0 +1,41 @@ -+# Copyright (c) 2018, Luca Ceresoli -+# -+# SPDX-License-Identifier: GPL-2.0 -+ -+if ARCH_ZYNQ || ARCH_ZYNQMP -+ -+config XILINX_PS_INIT_FILE -+ string "Zynq/ZynqMP PS init file(s) location" -+ help -+ On Zynq and ZynqMP U-Boot SPL (or U-Boot proper if -+ ZYNQMP_PSU_INIT_ENABLED is set) is responsible for some -+ basic initializations, such as enabling peripherals and -+ configuring pinmuxes. The PS init file (called -+ psu_init_gpl.c on ZynqMP, ps7_init_gpl.c for Zynq-7000) -+ contains the code for such initializations. -+ -+ U-Boot contains PS init files for some boards, but each of -+ them describes only one specific configuration. Users of a -+ different board, or needing a different configuration, can -+ generate custom files using the Xilinx development tools. -+ -+ There are three ways to give a PS init file to U-Boot: -+ -+ 1. Set this variable to the path, either relative to the -+ source tree or absolute, where the psu_init_gpl.c or -+ ps7_init_gpl.c file is located. U-Boot will build this -+ file. -+ -+ 2. If you leave an empty string here, U-Boot will use -+ board/xilinx/zynq/$(CONFIG_DEFAULT_DEVICE_TREE)/ps7_init_gpl.c -+ for Zynq-7000, or -+ board/xilinx/zynqmp/$(CONFIG_DEFAULT_DEVICE_TREE)/psu_init_gpl.c -+ for ZynqMP. -+ -+ 3. If the above file does not exist, U-Boot will use -+ board/xilinx/zynq/ps7_init_gpl.c for Zynq-7000, or -+ board/xilinx/zynqmp/psu_init_gpl.c for ZynqMP. This file -+ is not provided by U-Boot, you have to copy it there -+ before the build. -+ -+endif -diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile -index 5a76a26720cd..03ad5f0532ee 100644 ---- a/board/xilinx/zynq/Makefile -+++ b/board/xilinx/zynq/Makefile -@@ -5,10 +5,18 @@ - - obj-y := board.o - --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE)) -+init-objs := ps_init_gpl.o -+spl/board/xilinx/zynq/ps_init_gpl.o board/xilinx/zynq/ps_init_gpl.o: $(PS_INIT_FILE) -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ -+endif - -+ifeq ($(init-objs),) -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/ps7_init_gpl.c),\ - $(hw-platform-y)/ps7_init_gpl.o) -+endif - - ifeq ($(init-objs),) - ifneq ($(wildcard $(srctree)/$(src)/ps7_init_gpl.c),) -diff --git a/board/xilinx/zynqmp/Makefile b/board/xilinx/zynqmp/Makefile -index 05ccd25dcef3..960b81fc5853 100644 ---- a/board/xilinx/zynqmp/Makefile -+++ b/board/xilinx/zynqmp/Makefile -@@ -5,10 +5,18 @@ - - obj-y := zynqmp.o - --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE)) -+init-objs := ps_init_gpl.o -+spl/board/xilinx/zynqmp/ps_init_gpl.o board/xilinx/zynqmp/ps_init_gpl.o: $(PS_INIT_FILE) -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ -+endif - -+ifeq ($(init-objs),) -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/psu_init_gpl.c),\ - $(hw-platform-y)/psu_init_gpl.o) -+endif - - ifeq ($(init-objs),) - ifneq ($(wildcard $(srctree)/$(src)/psu_init_gpl.c),) --- -2.7.4 - diff --git a/board/zynqmp/post-build.sh b/board/zynqmp/post-build.sh new file mode 100755 index 0000000000..9fd8bbf2c8 --- /dev/null +++ b/board/zynqmp/post-build.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +# genimage will need to find the extlinux.conf +# in the binaries directory + +BOARD_DIR="$(dirname $0)" + +install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux.conf diff --git a/board/zynqmp/post-image.sh b/board/zynqmp/post-image.sh index b2b99fed01..ed6dbe188c 100755 --- a/board/zynqmp/post-image.sh +++ b/board/zynqmp/post-image.sh @@ -10,4 +10,6 @@ FIRST_DT=$(sed -nr \ [ -z "${FIRST_DT}" ] || ln -fs ${FIRST_DT}.dtb ${BINARIES_DIR}/system.dtb -support/scripts/genimage.sh -c board/zynqmp/genimage.cfg +BOARD_DIR="$(dirname $0)" + +support/scripts/genimage.sh -c $BOARD_DIR/genimage.cfg diff --git a/board/zynqmp/zcu106/pm_cfg_obj.c b/board/zynqmp/zcu106/pm_cfg_obj.c new file mode 100644 index 0000000000..6d15d510e9 --- /dev/null +++ b/board/zynqmp/zcu106/pm_cfg_obj.c @@ -0,0 +1,562 @@ +/****************************************************************************** +* Copyright (c) 2017 - 2021 Xilinx, Inc. All rights reserved. +* SPDX-License-Identifier: MIT +******************************************************************************/ + +#include "xil_types.h" +#include "pm_defs.h" + +#define PM_CONFIG_MASTER_SECTION_ID 0x101U +#define PM_CONFIG_SLAVE_SECTION_ID 0x102U +#define PM_CONFIG_PREALLOC_SECTION_ID 0x103U +#define PM_CONFIG_POWER_SECTION_ID 0x104U +#define PM_CONFIG_RESET_SECTION_ID 0x105U +#define PM_CONFIG_SHUTDOWN_SECTION_ID 0x106U +#define PM_CONFIG_SET_CONFIG_SECTION_ID 0x107U +#define PM_CONFIG_GPO_SECTION_ID 0x108U + +#define PM_SLAVE_FLAG_IS_SHAREABLE 0x1U +#define PM_MASTER_USING_SLAVE_MASK 0x2U + +#define PM_CONFIG_GPO1_MIO_PIN_34_MAP (1U << 10U) +#define PM_CONFIG_GPO1_MIO_PIN_35_MAP (1U << 11U) +#define PM_CONFIG_GPO1_MIO_PIN_36_MAP (1U << 12U) +#define PM_CONFIG_GPO1_MIO_PIN_37_MAP (1U << 13U) + +#define PM_CONFIG_GPO1_BIT_2_MASK (1U << 2U) +#define PM_CONFIG_GPO1_BIT_3_MASK (1U << 3U) +#define PM_CONFIG_GPO1_BIT_4_MASK (1U << 4U) +#define PM_CONFIG_GPO1_BIT_5_MASK (1U << 5U) + +#define SUSPEND_TIMEOUT 0xFFFFFFFFU + +#define PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK 0x00000001 +#define PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK 0x00000100 +#define PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK 0x00000200 + + + +#if defined (__ICCARM__) +#pragma language=save +#pragma language=extended +#endif +#if defined (__GNUC__) + const u32 XPm_ConfigObject[] __attribute__((used, section(".sys_cfg_data"))) = +#elif defined (__ICCARM__) +#pragma location = ".sys_cfg_data" +__root const u32 XPm_ConfigObject[] = +#endif +{ + /**********************************************************************/ + /* HEADER */ + 2, /* Number of remaining words in the header */ + 8, /* Number of sections included in config object */ + 1U, /* Type of config object as base */ + /**********************************************************************/ + /* MASTER SECTION */ + PM_CONFIG_MASTER_SECTION_ID, /* Master SectionID */ + 3U, /* No. of Masters*/ + + NODE_APU, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_0, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_1, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Wake permissions */ + + + /**********************************************************************/ + /* SLAVE SECTION */ + + + PM_CONFIG_SLAVE_SECTION_ID, /* Section ID */ + 49, /* Number of slaves */ + + NODE_OCM_BANK_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TCM_0_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_0_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_1_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TCM_1_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_L2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU_PP_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU_PP_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_USB_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_USB_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_TTC_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SATA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_ETH_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_UART_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_UART_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SPI_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_SPI_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_I2C_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_I2C_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SD_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_SD_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_DP, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GDMA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_ADMA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_NAND, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_QSPI, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPIO, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_CAN_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_CAN_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_EXTERN, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_DDR, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_IPI_APU, + 0U, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_0, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_1, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_PCIE, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_PCAP, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_RTC, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_VCU, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_PL, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + + /**********************************************************************/ + /* PREALLOC SECTION */ + + PM_CONFIG_PREALLOC_SECTION_ID, /* Preallaoc SectionID */ + 3U, /* No. of Masters*/ + +/* Prealloc for psu_cortexa53_0 */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, + 12, + NODE_DDR, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_L2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_3, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_SD_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_QSPI, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_PL, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_APU, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_0 */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + 3, + NODE_TCM_0_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_0_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_1 */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + 3, + NODE_TCM_1_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_1_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + + /**********************************************************************/ + /* POWER SECTION */ + + PM_CONFIG_POWER_SECTION_ID, /* Power Section ID */ + 4U, /* Number of power nodes */ + + NODE_APU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_RPU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_FPD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_PLD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + + /**********************************************************************/ + /* RESET SECTION */ + + PM_CONFIG_RESET_SECTION_ID, /* Reset Section ID */ + 120U, /* Number of resets */ + + XILPM_RESET_PCIE_CFG, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_BRIDGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_CTRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRF, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GDMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SATA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APU_L2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DDR, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SOFT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_QSPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_NAND, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ADMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOU_CC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TIMESTAMP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R50, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R51, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_AMBA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_OCM, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_PGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RTC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SYSMON, 0, + XILPM_RESET_AFI_FM6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_LPD_SWDT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_FPD, PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + XILPM_RESET_RPU_DBG1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_DBG0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_VPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_7, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_8, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_9, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_10, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_11, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_12, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_13, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_14, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_15, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_16, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_17, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_18, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_19, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_20, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_21, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_22, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_23, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_24, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_25, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_26, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_27, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_28, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_29, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_30, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_31, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_LS, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PS_ONLY, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_92, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_93, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_94, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_95, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + + /**********************************************************************/ + /* SET CONFIG SECTION */ + PM_CONFIG_SET_CONFIG_SECTION_ID, /* Set Config Section ID */ + 0U, /* Permissions to load base config object */ + 0U, /* Permissions to load overlay config object */ + + /**********************************************************************/ + /* SHUTDOWN SECTION */ + + PM_CONFIG_SHUTDOWN_SECTION_ID, /* Shutdown Section ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* System Shutdown/Restart Permission */ + + /**********************************************************************/ + /* GPO SECTION */ + PM_CONFIG_GPO_SECTION_ID, /* GPO Section ID */ + PM_CONFIG_GPO1_MIO_PIN_34_MAP | + PM_CONFIG_GPO1_MIO_PIN_35_MAP | + PM_CONFIG_GPO1_MIO_PIN_36_MAP | + PM_CONFIG_GPO1_MIO_PIN_37_MAP | + 0, /* State of GPO pins */ +}; +#if defined (__ICCARM__) +#pragma language=restore +#endif + diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index bee7c1daf7..3e51cbfaab 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -1,34 +1,39 @@ BR2_aarch64=y -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.15-930-g966124532656bc95d781abf57531e4cd4f962237" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v2.6-33-ge678d5ddc475f34dea8f5004fb6ebde118621784" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA" +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2022.01-165-g667001319cbe511ce6353195fb4910ae5cb041ce" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/53fdb7b6c92860ceb0ec5fd14deee302f4a84269/bin/pmufw-zcu106-default-v2017.4.bin" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/v2021.2/bin/pmufw-v2021.2.bin" +BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/zcu106/pm_cfg_obj.c" +BR2_TARGET_UBOOT_FORMAT_ITB=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y From arnout at mind.be Sat Feb 12 13:44:30 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 14:44:30 +0100 Subject: [Buildroot] [git commit] package/wpa_supplicant: bump version to 2.10 Message-ID: <20220212133723.8F1D882AA5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=39381a467cd2cfc15f77d3f9adbf329d2f92e312 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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. README's copyright year was updated. Signed-off-by: Sergey Matyukevich Reviewed-by: Yegor Yefremov Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...-ignore-management-frame-from-unexpected-.patch | 77 -------------- ...date-DigestAlgorithmIdentifier-parameters.patch | 116 --------------------- ...de-stdbool.h-to-allow-C99-bool-to-be-used.patch | 32 ------ ...elper-functions-for-recognizing-tag-value.patch | 37 ------- package/wpa_supplicant/wpa_supplicant.hash | 6 +- package/wpa_supplicant/wpa_supplicant.mk | 14 +-- 6 files changed, 3 insertions(+), 279 deletions(-) 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..fcaee0a30b 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 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 +sha256 20df7ae5154b3830355f8ab4269123a87affdea59fe74fe9292a91d0d7e17b2f wpa_supplicant-2.10.tar.gz +sha256 af01e1d1ee065a1054d20ebe8a78a016f1fb1133b73e6a9d50801b165bb280c7 README 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 From arnout at mind.be Sat Feb 12 13:44:40 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 14:44:40 +0100 Subject: [Buildroot] [git commit] package/hostapd: bump version to 2.10 Message-ID: <20220212133723.985BC82B32@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7ae68402f889fbb9febe01cbda2f2bcf5b7cc2d6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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. README's copyright year was updated. Signed-off-by: Sergey Matyukevich Reviewed-by: Yegor Yefremov Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...-ignore-management-frame-from-unexpected-.patch | 77 -------------- ...date-DigestAlgorithmIdentifier-parameters.patch | 116 --------------------- ...de-stdbool.h-to-allow-C99-bool-to-be-used.patch | 32 ------ ...elper-functions-for-recognizing-tag-value.patch | 37 ------- package/hostapd/hostapd.hash | 8 +- package/hostapd/hostapd.mk | 19 +--- 6 files changed, 3 insertions(+), 286 deletions(-) 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..4e130d01ca 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 9da5dd0776da266b180b915e460ff75c6ff729aca1196ab396529510f24f3761 README +sha256 206e7c799b678572c2e3d12030238784bc4a9f82323b0156b4c9466f1498915d hostapd-2.10.tar.gz +sha256 af01e1d1ee065a1054d20ebe8a78a016f1fb1133b73e6a9d50801b165bb280c7 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 = From peter at korsgaard.com Sat Feb 12 13:45:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 12 Feb 2022 14:45:30 +0100 Subject: [Buildroot] [PATCH v6 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <69189572-6eba-ed26-52dd-08a8b098f124@lucaceresoli.net> (Luca Ceresoli's message of "Sat, 12 Feb 2022 14:13:28 +0100") References: <20220211144402.1626443-1-neal.frager@xilinx.com> <69189572-6eba-ed26-52dd-08a8b098f124@lucaceresoli.net> Message-ID: <87bkzcnqpx.fsf@dell.be.48ers.dk> >>>>> "Luca" == Luca Ceresoli writes: Hi, >> +#endif >> +{ >> + /**********************************************************************/ >> + /* HEADER */ >> + 2, /* Number of remaining words in the header */ >> + 8, /* Number of sections included in config object */ >> + 1U, /* Type of config object as base */ > Here's where you have manually replaced "PM_CONFIG_OBJECT_TYPE_BASE" -> > "1U", right? Well, it should be well noted in the commit message. This > file is supposed to be generated by Vitis and used untouched, any manual > edits whould be documented. > Or, even better, use the U-Boot patch I sent (see other e-mail I just > wrote) and use an unmodified pm_cfg_obj.c Ups, I applied the series before seeing this comment. Lets handle it as a followup patch for zcu102/106. -- Bye, Peter Korsgaard From arnout at mind.be Sat Feb 12 13:45:55 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 14:45:55 +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: On 31/01/2022 20:48, 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 The copyright year was also updated in README, which changes the hash. I fixed that and applied both to master, thanks. Regards, Arnout [snip] From arnout at mind.be Sat Feb 12 13:46:04 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 14:46:04 +0100 Subject: [Buildroot] [PATCH v3] configs/friendlyarm_nanopi_r2s: new defconfig In-Reply-To: <20220130101150.20605-1-gilles.talis@gmail.com> References: <20220130101150.20605-1-gilles.talis@gmail.com> Message-ID: <6b45334f-0339-5f67-0c59-2f20b5d17b1e@mind.be> On 30/01/2022 11:11, 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 [snip] > 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 I've added an explicit BR2_cortex_a53=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 python3 is not enough, it uses pylibfdt, so I added BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=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 Since you switch to ext4-only, dosfstools and mtools are not longer needed, so I removed those. > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_MTOOLS=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS=y I don't think this is needed either, but I wasn't 100% sure so I kept it. Applied to master with those changes, thanks. Regards, Arnout From peter at korsgaard.com Sat Feb 12 13:48:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 12 Feb 2022 14:48:37 +0100 Subject: [Buildroot] [PATCH 1/2] boot/uboot: depend on host-python-setuptools In-Reply-To: <20220212124634.3148041-1-arnout@mind.be> (Arnout Vandecappelle's message of "Sat, 12 Feb 2022 13:46:33 +0100") References: <20220212124634.3148041-1-arnout@mind.be> Message-ID: <877da0nqkq.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) writes: > host-python3-setuptools was removed, we should instead use plain > host-python-setuptools. > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 12 13:48:41 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 12 Feb 2022 14:48:41 +0100 Subject: [Buildroot] [PATCH 2/2] package/python-regex: remove outdated comment In-Reply-To: <20220212124634.3148041-2-arnout@mind.be> (Arnout Vandecappelle's message of "Sat, 12 Feb 2022 13:46:34 +0100") References: <20220212124634.3148041-1-arnout@mind.be> <20220212124634.3148041-2-arnout@mind.be> Message-ID: <8735konqkm.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) writes: > python3-regex no longer exists, so there's no need to keep in sync with > it. > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 12 13:48:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 12 Feb 2022 14:48:50 +0100 Subject: [Buildroot] [git commit] boot/uboot: depend on host-python-setuptools Message-ID: <20220212134124.A13EE81D2A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0e8957839cc82433b4a9eb4d0c3f11d07f7c2b48 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master host-python3-setuptools was removed, we should instead use plain host-python-setuptools. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- boot/uboot/uboot.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 9e569906ce..6750069173 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -208,7 +208,7 @@ UBOOT_DEPENDENCIES += host-dtc endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON3),y) -UBOOT_DEPENDENCIES += host-python3 host-python3-setuptools +UBOOT_DEPENDENCIES += host-python3 host-python-setuptools endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYLIBFDT),y) From peter at korsgaard.com Sat Feb 12 13:48:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 12 Feb 2022 14:48:50 +0100 Subject: [Buildroot] [git commit] package/python-regex: remove outdated comment Message-ID: <20220212134124.AA5F482B32@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e1081382fcdd09fcd9421d6cbdfd5b1a05e9454b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master python3-regex no longer exists, so there's no need to keep in sync with it. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- package/python-regex/python-regex.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/python-regex/python-regex.mk b/package/python-regex/python-regex.mk index a90fd579ac..b93607e40f 100644 --- a/package/python-regex/python-regex.mk +++ b/package/python-regex/python-regex.mk @@ -4,7 +4,6 @@ # ################################################################################ -# Please keep in sync with package/python3-regex/python3-regex.mk PYTHON_REGEX_VERSION = 2021.4.4 PYTHON_REGEX_SOURCE = regex-$(PYTHON_REGEX_VERSION).tar.gz PYTHON_REGEX_SITE = https://files.pythonhosted.org/packages/38/3f/4c42a98c9ad7d08c16e7d23b2194a0e4f3b2914662da8bc88986e4e6de1f From arnout at mind.be Sat Feb 12 13:50:57 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 14:50:57 +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: <2bda4de0-2931-d25d-9b2b-91390a363143@mind.be> On 22/01/2022 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. It's like the preference we have for extlinux.conf in an ext4 filesystem: we prefer it over FAT, but it's not a really hard requirement, and we're definitely not going to update existing defconfigs unless an actual developer with the board tests them. Between all of those options, I think the randomly generated UUID is probably the best one. Well, actually, the automatic filling in by U-Boot is the best one but not all boards support that I guess. Regards, Arnout From peter at korsgaard.com Sat Feb 12 13:51:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 12 Feb 2022 14:51:37 +0100 Subject: [Buildroot] [PATCH] package/python-*: drop python3 dependency In-Reply-To: <20220212104349.6015-1-peter@korsgaard.com> (Peter Korsgaard's message of "Sat, 12 Feb 2022 11:43:48 +0100") References: <20220212104349.6015-1-peter@korsgaard.com> Message-ID: <87y22gmbva.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > All the python packages are inside an if BR2_PACKAGE_PYTHON3, so with the > removal of python2 support, the explicit python3 dependency is redundant. > Remove it. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 12 13:51:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 12 Feb 2022 14:51:10 +0100 Subject: [Buildroot] [git commit] package/python-*: drop python3 dependency Message-ID: <20220212134420.C3E4E825CB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a2ba9e7db9bd5fabff738147f73039fc8d4f1b3d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master All the python packages are inside an if BR2_PACKAGE_PYTHON3, so with the removal of python2 support, the explicit python3 dependency is redundant. Remove it. Signed-off-by: Peter Korsgaard Reviewed-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-aexpect/Config.in | 1 - package/python-aioblescan/Config.in | 1 - package/python-aiocoap/Config.in | 1 - package/python-aioconsole/Config.in | 1 - package/python-aiodns/Config.in | 1 - package/python-aiofiles/Config.in | 1 - package/python-aiohttp-cors/Config.in | 1 - package/python-aiohttp-debugtoolbar/Config.in | 1 - package/python-aiohttp-jinja2/Config.in | 1 - package/python-aiohttp-mako/Config.in | 1 - package/python-aiohttp-remotes/Config.in | 1 - package/python-aiohttp-security/Config.in | 1 - package/python-aiohttp-session/Config.in | 1 - package/python-aiohttp-sse/Config.in | 1 - package/python-aiohttp/Config.in | 1 - package/python-aiojobs/Config.in | 1 - package/python-aiologstash/Config.in | 1 - package/python-aiomonitor/Config.in | 1 - package/python-aioprocessing/Config.in | 1 - package/python-aioredis/Config.in | 1 - package/python-aiorwlock/Config.in | 1 - package/python-aiosignal/Config.in | 1 - package/python-aiozipkin/Config.in | 1 - package/python-argon2-cffi-bindings/Config.in | 1 - package/python-arrow/Config.in | 1 - package/python-asgiref/Config.in | 1 - package/python-async-lru/Config.in | 1 - package/python-async-timeout/Config.in | 1 - package/python-attrs/Config.in | 1 - package/python-autobahn/Config.in | 1 - package/python-automat/Config.in | 1 - package/python-avro/Config.in | 1 - package/python-bcrypt/Config.in | 1 - package/python-beautifulsoup4/Config.in | 1 - package/python-bidict/Config.in | 1 - package/python-bleak/Config.in | 1 - package/python-bluezero/Config.in | 2 -- package/python-boto3/Config.in | 1 - package/python-botocore/Config.in | 1 - package/python-cbor2/Config.in | 1 - package/python-cchardet/Config.in | 2 -- package/python-channels-redis/Config.in | 1 - package/python-channels/Config.in | 1 - package/python-charset-normalizer/Config.in | 1 - package/python-cheroot/Config.in | 1 - package/python-cherrypy/Config.in | 1 - package/python-colorlog/Config.in | 1 - package/python-colorzero/Config.in | 1 - package/python-configshell-fb/Config.in | 1 - package/python-crayons/Config.in | 1 - package/python-crontab/Config.in | 1 - package/python-crossbar/Config.in | 1 - package/python-cryptography/Config.in | 1 - package/python-cssselect2/Config.in | 1 - package/python-cssutils/Config.in | 1 - package/python-cycler/Config.in | 1 - package/python-daphne/Config.in | 1 - package/python-dataproperty/Config.in | 1 - package/python-dateutil/Config.in | 1 - package/python-dbus-next/Config.in | 1 - package/python-decorator/Config.in | 1 - package/python-dialog3/Config.in | 1 - package/python-django-enumfields/Config.in | 1 - package/python-django/Config.in | 1 - package/python-dnspython/Config.in | 1 - package/python-docker/Config.in | 1 - package/python-engineio/Config.in | 1 - package/python-falcon/Config.in | 1 - package/python-filelock/Config.in | 1 - package/python-flask-babel/Config.in | 1 - package/python-flask-cors/Config.in | 1 - package/python-flask-expects-json/Config.in | 1 - package/python-flask-jsonrpc/Config.in | 1 - package/python-flask-login/Config.in | 1 - package/python-flask-sqlalchemy/Config.in | 1 - package/python-flask-wtf/Config.in | 1 - package/python-flup/Config.in | 1 - package/python-fonttools/Config.in | 1 - package/python-frozenlist/Config.in | 1 - package/python-git/Config.in | 1 - package/python-gitdb2/Config.in | 1 - package/python-gobject/Config.in | 1 - package/python-gpiozero/Config.in | 1 - package/python-gunicorn/Config.in | 1 - package/python-h2/Config.in | 1 - package/python-hiredis/Config.in | 1 - package/python-hpack/Config.in | 1 - package/python-httplib2/Config.in | 1 - package/python-humanize/Config.in | 1 - package/python-hyperframe/Config.in | 1 - package/python-hyperlink/Config.in | 1 - package/python-ibmiotf/Config.in | 1 - package/python-idna/Config.in | 1 - package/python-inflection/Config.in | 1 - package/python-influxdb/Config.in | 1 - package/python-ipdb/Config.in | 1 - package/python-ipython/Config.in | 1 - package/python-itsdangerous/Config.in | 1 - package/python-janus/Config.in | 1 - package/python-jaraco-classes/Config.in | 1 - package/python-jaraco-functools/Config.in | 1 - package/python-jedi/Config.in | 1 - package/python-jinja2/Config.in | 1 - package/python-jsonmodels/Config.in | 1 - package/python-keyring/Config.in | 1 - package/python-libusb1/Config.in | 2 -- package/python-markdown/Config.in | 1 - package/python-markdown2/Config.in | 1 - package/python-markupsafe/Config.in | 1 - package/python-matplotlib/Config.in | 1 - package/python-mbstrdecoder/Config.in | 1 - package/python-memory-profiler/Config.in | 1 - package/python-more-itertools/Config.in | 1 - package/python-mpd2/Config.in | 1 - package/python-msgfy/Config.in | 1 - package/python-multidict/Config.in | 1 - package/python-mutagen/Config.in | 1 - package/python-mwclient/Config.in | 1 - package/python-mwscrape/Config.in | 1 - package/python-mwscrape2slob/Config.in | 2 -- package/python-networkx/Config.in | 1 - package/python-numpy/Config.in | 2 -- package/python-oauthlib/Config.in | 1 - package/python-opcua-asyncio/Config.in | 1 - package/python-packaging/Config.in | 1 - package/python-paramiko/Config.in | 1 - package/python-parso/Config.in | 1 - package/python-pathpy/Config.in | 1 - package/python-pathvalidate/Config.in | 1 - package/python-piexif/Config.in | 1 - package/python-pillow/Config.in | 1 - package/python-pip/Config.in | 1 - package/python-pluggy/Config.in | 1 - package/python-portend/Config.in | 1 - package/python-priority/Config.in | 1 - package/python-prompt-toolkit/Config.in | 1 - package/python-protobuf/Config.in | 1 - package/python-psycopg2/Config.in | 2 -- package/python-pudb/Config.in | 1 - package/python-py/Config.in | 1 - package/python-pybind/Config.in | 1 - package/python-pycairo/Config.in | 1 - package/python-pycares/Config.in | 1 - package/python-pycups/Config.in | 1 - package/python-pydantic/Config.in | 1 - package/python-pydyf/Config.in | 1 - package/python-pygments/Config.in | 1 - package/python-pyhamcrest/Config.in | 1 - package/python-pyjwt/Config.in | 1 - package/python-pymupdf/Config.in | 3 --- package/python-pymysql/Config.in | 1 - package/python-pynacl/Config.in | 1 - package/python-pyndiff/Config.in | 1 - package/python-pyopenssl/Config.in | 1 - package/python-pyparsing/Config.in | 1 - package/python-pyparted/Config.in | 2 -- package/python-pyphen/Config.in | 1 - package/python-pysftp/Config.in | 1 - package/python-pytablereader/Config.in | 1 - package/python-pytablewriter/Config.in | 1 - package/python-pytest-asyncio/Config.in | 1 - package/python-pytest/Config.in | 1 - package/python-pytrie/Config.in | 1 - package/python-pyusb/Config.in | 1 - package/python-pyyaml/Config.in | 1 - package/python-requests-oauthlib/Config.in | 1 - package/python-requests-toolbelt/Config.in | 1 - package/python-requests/Config.in | 1 - package/python-rsa/Config.in | 1 - package/python-s3transfer/Config.in | 1 - package/python-schedule/Config.in | 1 - package/python-secretstorage/Config.in | 1 - package/python-serial-asyncio/Config.in | 1 - package/python-service-identity/Config.in | 1 - package/python-setproctitle/Config.in | 1 - package/python-simpleaudio/Config.in | 1 - package/python-simplelogging/Config.in | 1 - package/python-simplesqlite/Config.in | 1 - package/python-slob/Config.in | 2 -- package/python-smmap2/Config.in | 1 - package/python-socketio/Config.in | 1 - package/python-sockjs/Config.in | 1 - package/python-soupsieve/Config.in | 1 - package/python-sqliteschema/Config.in | 1 - package/python-tabledata/Config.in | 1 - package/python-tempora/Config.in | 1 - package/python-tinycss2/Config.in | 1 - package/python-tinyrpc/Config.in | 1 - package/python-tomako/Config.in | 1 - package/python-tomli/Config.in | 1 - package/python-tornado/Config.in | 1 - package/python-traitlets/Config.in | 1 - package/python-treq/Config.in | 1 - package/python-twisted/Config.in | 1 - package/python-txaio/Config.in | 1 - package/python-txdbus/Config.in | 1 - package/python-txtorcon/Config.in | 1 - package/python-typepy/Config.in | 1 - package/python-ujson/Config.in | 1 - package/python-unittest-xml-reporting/Config.in | 1 - package/python-urwid/Config.in | 1 - package/python-uvloop/Config.in | 1 - package/python-validators/Config.in | 1 - package/python-watchdog/Config.in | 1 - package/python-weasyprint/Config.in | 1 - package/python-webpy/Config.in | 1 - package/python-websockets/Config.in | 1 - package/python-wtforms/Config.in | 1 - package/python-xlib/Config.in | 1 - package/python-xlsxwriter/Config.in | 1 - package/python-yarl/Config.in | 1 - package/python-zeroconf/Config.in | 1 - package/python-zopfli/Config.in | 1 - 213 files changed, 223 deletions(-) Patch is too large, so refusing to show it From arnout at mind.be Sat Feb 12 14:32:19 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 15:32:19 +0100 Subject: [Buildroot] [PATCH v2 1/5] package/serd: new package In-Reply-To: <20220127192311.1954197-1-james.hilliard1@gmail.com> References: <20220127192311.1954197-1-james.hilliard1@gmail.com> Message-ID: On 27/01/2022 20:23, James Hilliard wrote: > Signed-off-by: James Hilliard You didn't carry Gilles' Tested-by tags from v1, so I added those. Applied to master, thanks. Regards, Arnout > --- > 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)) From arnout at mind.be Sat Feb 12 14:27:39 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 15:27:39 +0100 Subject: [Buildroot] [git commit] package/sord: new package Message-ID: <20220212142506.53C6382B40@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0d4c8ce8a2f26989e0e2d95b977d60e450c090a9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Tested-by: Gilles Talis Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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(+) diff --git a/DEVELOPERS b/DEVELOPERS index ece07026bc..bdea8142e0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1337,6 +1337,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 a8f408844d..0b533ce999 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1700,6 +1700,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)) From arnout at mind.be Sat Feb 12 14:27:34 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 15:27:34 +0100 Subject: [Buildroot] [git commit] package/serd: new package Message-ID: <20220212142506.464E682B3B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e55f57b3d367213ef4b667988e42f7d26c6b23c9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Tested-by: Gilles Talis Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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(+) diff --git a/DEVELOPERS b/DEVELOPERS index a91dccd1e0..ece07026bc 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1336,6 +1336,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 7aff9e7cb7..a8f408844d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1699,6 +1699,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)) From arnout at mind.be Sat Feb 12 14:28:23 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 15:28:23 +0100 Subject: [Buildroot] [git commit] package/lv2: new package Message-ID: <20220212142506.603B482B35@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b066f1756f9af4a8577321ec09c17796bfb153d7 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/lv2/Config.in | 8 ++++++++ package/lv2/lv2.hash | 4 ++++ package/lv2/lv2.mk | 36 ++++++++++++++++++++++++++++++++++++ 5 files changed, 50 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index bdea8142e0..5573c62f0b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1286,6 +1286,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 0b533ce999..d95257e7aa 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1351,6 +1351,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)) From arnout at mind.be Sat Feb 12 14:31:38 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 15:31:38 +0100 Subject: [Buildroot] [git commit] package/lilv: new package Message-ID: <20220212142506.7992782B35@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9c8453734bf0f2c3e9dbf50c604952253f2b1524 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Tested-by: Gilles Talis Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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(+) diff --git a/DEVELOPERS b/DEVELOPERS index 356e74d51f..be8231a2af 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1286,6 +1286,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 86c654e3fc..f48b0c646d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1351,6 +1351,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)) From arnout at mind.be Sat Feb 12 14:30:08 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 15:30:08 +0100 Subject: [Buildroot] [git commit] package/sratom: new package Message-ID: <20220212142506.6C37582B3B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=47c0176b39f7fd4eeebf19a6c29c5c967a229674 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Tested-by: Gilles Talis Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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(+) diff --git a/DEVELOPERS b/DEVELOPERS index 5573c62f0b..356e74d51f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1339,6 +1339,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 d95257e7aa..86c654e3fc 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1362,6 +1362,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)) From arnout at mind.be Sat Feb 12 14:24:55 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 15:24:55 +0100 Subject: [Buildroot] [git commit] package/busybox: bump version to 1.35.0 Message-ID: <20220212142506.39E8782B35@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b501e1a43d9f08e461937984a939f7afbc726336 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Updating the busybox configuration files by loading and saving it back. Signed-off-by: Michael Fischer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 75e57ba53f..3e49de0a84 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 From arnout at mind.be Sat Feb 12 14:32:52 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 15:32:52 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/busybox: bump version to 1.35.0 In-Reply-To: <20220127121824.32092-1-mf@go-sys.de> References: <20220126231554.0fcc106d@windsurf> <20220127121824.32092-1-mf@go-sys.de> Message-ID: <78653596-5ab1-a080-ebf3-22fcbdff7ec5@mind.be> On 27/01/2022 13:18, Michael Fischer wrote: > Updating the busybox configuration files by loading and saving it back. > > Signed-off-by: Michael Fischer Applied to master, thanks. Regards, Arnout From arnout at mind.be Sat Feb 12 14:44:22 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 15:44:22 +0100 Subject: [Buildroot] [PATCH] package/dbus-cxx: new package In-Reply-To: References: Message-ID: On 28/01/2022 12:12, Lang Daniel via buildroot wrote: > DBus-cxx provides an object-oriented interface to DBus > > Signed-off-by: Lang Daniel Applied to master, thanks. I made some changes though. > --- > 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 > [snip] > 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 I converted this into a "select". Normally you'd say that obviously this package is only relevant if you have dbus, but it's very well possible that some other package has a non-optional dependency on dbus-cxx and you want to use that in a context where you don't actually need dbus for anything else. So select is more appropriate. > + 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 I've made these automatic dependencies instead of explicit options. I assume that the overhead of them is fairly small. > + > +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 I put GPL-3.0 at the beginning. It's not a very strict convention, but it seems obvious that the "main" license should be first. Regards, Arnout > +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)) From arnout at mind.be Sat Feb 12 14:37:51 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 15:37:51 +0100 Subject: [Buildroot] [git commit] package/dbus-cxx: new package Message-ID: <20220212143702.16C0080114@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a0fb3eed27cc0fa4a7729f46b88b935309374b4d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master DBus-cxx provides an object-oriented interface to DBus Signed-off-by: Lang Daniel [Arnout: - reorder licenses; - select dbus instead of depends, + propagate dependency - make qt5 and libglib2 integration automatic ] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 1 + package/Config.in | 1 + package/dbus-cxx/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 | 24 ++++++ package/dbus-cxx/dbus-cxx.hash | 5 ++ package/dbus-cxx/dbus-cxx.mk | 28 +++++++ 8 files changed, 220 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index be8231a2af..b36f42e274 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -622,6 +622,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 f48b0c646d..314a17a6db 100644 --- a/package/Config.in +++ b/package/Config.in @@ -461,6 +461,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..f08769b6c5 --- /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..1892f73a72 --- /dev/null +++ b/package/dbus-cxx/Config.in @@ -0,0 +1,24 @@ +config BR2_PACKAGE_DBUS_CXX + bool "dbus-cxx" + depends on BR2_USE_MMU # dbus + 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 + select BR2_PACKAGE_DBUS # runtime + 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/ + +comment "dbus-cxx needs a toolchain w/ C++, threads, gcc >= 7 and dynamic library support" + depends on BR2_USE_MMU # dbus + 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..3e89fc9db7 --- /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 = GPL-3.0, Boost license (cmake-modules), Apache 2.0 (libcppgenerate) +DBUS_CXX_LICENSE_FILES = COPYING cmake-modules/LICENSE_1_0.txt tools/libcppgenerate/LICENSE +DBUS_CXX_INSTALL_STAGING = YES +DBUS_CXX_DEPENDENCIES = libsigc + +ifeq ($(BR2_PACKAGE_QT5BASE),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_LIBGLIB2),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)) From nealf at xilinx.com Sat Feb 12 14:47:25 2022 From: nealf at xilinx.com (Neal Frager) Date: Sat, 12 Feb 2022 14:47:25 +0000 Subject: [Buildroot] [PATCH v6 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <87bkzcnqpx.fsf@dell.be.48ers.dk> References: <20220211144402.1626443-1-neal.frager@xilinx.com> <69189572-6eba-ed26-52dd-08a8b098f124@lucaceresoli.net> <87bkzcnqpx.fsf@dell.be.48ers.dk> Message-ID: Hi Peter, > > Ups, I applied the series before seeing this comment. Lets handle it as > a followup patch for zcu102/106. > > -- > Bye, Peter Korsgaard Yes, I agree. I will make another patch to cover this when I return from my vacation the week of February 21st. Thank you for applying this patch set and for all your support! Thank you to Giulio and Luca as well! Best regards, Neal Frager Xilinx From yann.morin.1998 at free.fr Sat Feb 12 16:49:51 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 12 Feb 2022 17:49:51 +0100 Subject: [Buildroot] [PATCH] package/libcamera: fix missing comment for binutils-bug-27597 In-Reply-To: <20220128110542.1101197-2-giulio.benetti@benettiengineering.com> References: <20220128110542.1101197-1-giulio.benetti@benettiengineering.com> <20220128110542.1101197-2-giulio.benetti@benettiengineering.com> Message-ID: <20220212164951.GE3752867@scaer> Giulio, All, On 2022-01-28 12:05 +0100, Giulio Benetti spake thusly: > 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" Bug 27597 is inherently an architecture-speific bug, which is always set for NIOS2, so there is nothing the user can do about it except switch to another architecture... The comments are meant for when the user has an alternative option, like chossing a different version of a component. In this case, there is nothing the user can do, so we don't add it to the comment. Regards, Yann E. MORIN. > 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 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Feb 12 16:52:15 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 12 Feb 2022 17:52:15 +0100 Subject: [Buildroot] [PATCH] package/libcamera bump to 1966b9a58436fab51f8270aad6a228b935e4fac4 In-Reply-To: <20220211112245.1357817-1-kieran.bingham@ideasonboard.com> References: <20220211112245.1357817-1-kieran.bingham@ideasonboard.com> Message-ID: <20220212165215.GF3752867@scaer> Kieran, All, On 2022-02-11 11:22 +0000, Kieran Bingham spake thusly: > Update to the latest libcamera commit. > > This incorporates fixes and improvements for Raspberry Pi which will be > needed to go along side the new libcamera-apps package. > > Signed-off-by: Kieran Bingham Applied to master, with the minor typo spotted by Peter fixed, thanks. Regards, Yann E. MORIN. > --- > package/libcamera/libcamera.hash | 2 +- > package/libcamera/libcamera.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/libcamera/libcamera.hash b/package/libcamera/libcamera.hash > index a7ca27a96b7f..8d5abf0e621c 100644 > --- a/package/libcamera/libcamera.hash > +++ b/package/libcamera/libcamera.hash > @@ -1,4 +1,4 @@ > -sha256 305e6f458d2bf3d4b697ffe33e104b696db6b1492bb5422e2cce1937e58516f1 libcamera-40f5fddca7f774944a53f58eeaebc4db79c373d8-br1.tar.gz > +sha256 3624c71ba492c602c5335aab3dc87798193f7596c6cc75f7cfb847165f180930 libcamera-1966b9a58436fab51f8270aad6a228b935e4fac4-br1.tar.gz > > # license files > sha256 fd38b2c053c0cce46d9c5ef3545a6e34d157a240ba99c9b8dca5d37a8147da6c LICENSES/BSD-2-Clause.txt > diff --git a/package/libcamera/libcamera.mk b/package/libcamera/libcamera.mk > index 534d8d26371f..cf1af5aaf065 100644 > --- a/package/libcamera/libcamera.mk > +++ b/package/libcamera/libcamera.mk > @@ -5,7 +5,7 @@ > ################################################################################ > > LIBCAMERA_SITE = https://git.linuxtv.org/libcamera.git > -LIBCAMERA_VERSION = 40f5fddca7f774944a53f58eeaebc4db79c373d8 > +LIBCAMERA_VERSION = 1966b9a58436fab51f8270aad6a228b935e4fac4 > LIBCAMERA_SITE_METHOD = git > LIBCAMERA_DEPENDENCIES = \ > host-openssl \ > -- > 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 Feb 12 16:51:25 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 12 Feb 2022 17:51:25 +0100 Subject: [Buildroot] [git commit] package/libcamera: bump to 1966b9a58436fab51f8270aad6a228b935e4fac4 Message-ID: <20220212164453.2EE1C8212B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=695b21d6a16ab2033e8bdc86a5df38880e5aecda branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update to the latest libcamera commit. This incorporates fixes and improvements for Raspberry Pi which will be needed to go along side the new libcamera-apps package. Signed-off-by: Kieran Bingham Reviewed-by: Peter Seiderer Tested-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/libcamera/libcamera.hash | 2 +- package/libcamera/libcamera.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libcamera/libcamera.hash b/package/libcamera/libcamera.hash index a7ca27a96b..8d5abf0e62 100644 --- a/package/libcamera/libcamera.hash +++ b/package/libcamera/libcamera.hash @@ -1,4 +1,4 @@ -sha256 305e6f458d2bf3d4b697ffe33e104b696db6b1492bb5422e2cce1937e58516f1 libcamera-40f5fddca7f774944a53f58eeaebc4db79c373d8-br1.tar.gz +sha256 3624c71ba492c602c5335aab3dc87798193f7596c6cc75f7cfb847165f180930 libcamera-1966b9a58436fab51f8270aad6a228b935e4fac4-br1.tar.gz # license files sha256 fd38b2c053c0cce46d9c5ef3545a6e34d157a240ba99c9b8dca5d37a8147da6c LICENSES/BSD-2-Clause.txt diff --git a/package/libcamera/libcamera.mk b/package/libcamera/libcamera.mk index 7cd4bfa758..9cbb1910dc 100644 --- a/package/libcamera/libcamera.mk +++ b/package/libcamera/libcamera.mk @@ -5,7 +5,7 @@ ################################################################################ LIBCAMERA_SITE = https://git.linuxtv.org/libcamera.git -LIBCAMERA_VERSION = 40f5fddca7f774944a53f58eeaebc4db79c373d8 +LIBCAMERA_VERSION = 1966b9a58436fab51f8270aad6a228b935e4fac4 LIBCAMERA_SITE_METHOD = git LIBCAMERA_DEPENDENCIES = \ host-openssl \ From giulio.benetti at benettiengineering.com Sat Feb 12 16:56:51 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 12 Feb 2022 17:56:51 +0100 Subject: [Buildroot] [PATCH] package/libcamera: fix missing comment for binutils-bug-27597 In-Reply-To: <20220212164951.GE3752867@scaer> References: <20220128110542.1101197-1-giulio.benetti@benettiengineering.com> <20220128110542.1101197-2-giulio.benetti@benettiengineering.com> <20220212164951.GE3752867@scaer> Message-ID: On 12/02/22 17:49, Yann E. MORIN wrote: > Giulio, All, > > On 2022-01-28 12:05 +0100, Giulio Benetti spake thusly: >> 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" > > Bug 27597 is inherently an architecture-speific bug, which is always set > for NIOS2, so there is nothing the user can do about it except switch to > another architecture... > > The comments are meant for when the user has an alternative option, like > chossing a different version of a component. > > In this case, there is nothing the user can do, so we don't add it to > the comment. Aaah, right, like hidden options. Ok, so let's drop this patch. Thank you! Best regards -- Giulio Benetti Benetti Engineering sas > Regards, > Yann E. MORIN. > >> 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 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > From yann.morin.1998 at free.fr Sat Feb 12 17:11:52 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 12 Feb 2022 18:11:52 +0100 Subject: [Buildroot] [git commit] package/libcamera-apps: new package Message-ID: <20220212170619.DCB5F8215C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7227d005d2435ec7b38995a6247d233ddb5ba365 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer [yann.morin.1998 at free.fr: - only depend on libx11-xlib or libexpoxy if actually enabled - simplify qt5 dependency - fix check-package ] Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + package/Config.in | 1 + ...e-Werror-and-Wfatal-errors-compiler-comma.patch | 37 +++++++++++++++++ package/libcamera-apps/Config.in | 29 +++++++++++++ package/libcamera-apps/libcamera-apps.hash | 3 ++ package/libcamera-apps/libcamera-apps.mk | 48 ++++++++++++++++++++++ 6 files changed, 119 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index b36f42e274..9e3142d8a4 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2283,6 +2283,7 @@ F: package/gstreamer1/gst1-devtools/ F: package/gstreamer1/gst1-interpipe/ F: package/gstreamer1/gstreamer1-editing-services/ F: package/iwd/ +F: package/libcamera-apps/ F: package/libevdev/ F: package/libuev/ F: package/log4cplus/ diff --git a/package/Config.in b/package/Config.in index 314a17a6db..10209d84d7 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1738,6 +1738,7 @@ menu "Multimedia" source "package/libbdplus/Config.in" source "package/libbluray/Config.in" source "package/libcamera/Config.in" + source "package/libcamera-apps/Config.in" source "package/libdcadec/Config.in" source "package/libdvbcsa/Config.in" source "package/libdvbpsi/Config.in" diff --git a/package/libcamera-apps/0001-cmake-remove-Werror-and-Wfatal-errors-compiler-comma.patch b/package/libcamera-apps/0001-cmake-remove-Werror-and-Wfatal-errors-compiler-comma.patch new file mode 100644 index 0000000000..988d89cca3 --- /dev/null +++ b/package/libcamera-apps/0001-cmake-remove-Werror-and-Wfatal-errors-compiler-comma.patch @@ -0,0 +1,37 @@ +From 6bd733b52f0b4039407c676cd3126a9e2f79456b Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Fri, 5 Feb 2021 18:24:08 +0100 +Subject: [PATCH] cmake: remove -Werror and -Wfatal-errors compiler command + line option +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes (with bootlin-riscv64-musl toolchain): + + .../build/libcamera-apps-2d1009e3badcc8047361ff81149ad6cba3b911b5/core/libcamera_app.cpp:30:22: error: overflow in conversion from ???long unsigned int??? to ???int??? changes value from ???2154321408??? to ???-2140645888??? [-Werror=overflow] + 30 | int ret = ioctl(fd, VIDIOC_QUERYCAP, &caps); + | ^~~~~~~~~~~~~~~ + cc1plus: all warnings being treated as errors + +Signed-off-by: Peter Seiderer +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 748c6dd..1ca1e39 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -11,7 +11,7 @@ endif() + + set (CMAKE_EXPORT_COMPILE_COMMANDS ON) + set (CMAKE_CXX_STANDARD 17) +-add_compile_options(-Wall -Wextra -pedantic -Wno-unused-parameter -faligned-new -Werror -Wfatal-errors) ++add_compile_options(-Wall -Wextra -pedantic -Wno-unused-parameter -faligned-new) + add_definitions(-D_FILE_OFFSET_BITS=64) + + if (CMAKE_COMPILER_IS_GNUCXX) +-- +2.34.1 + diff --git a/package/libcamera-apps/Config.in b/package/libcamera-apps/Config.in new file mode 100644 index 0000000000..a1affc2d23 --- /dev/null +++ b/package/libcamera-apps/Config.in @@ -0,0 +1,29 @@ +config BR2_PACKAGE_LIBCAMERA_APPS + bool "libcamera-apps" + depends on BR2_PACKAGE_LIBCAMERA_ARCH_SUPPORTS # libcamera + depends on BR2_INSTALL_LIBSTDCPP # libcamera/boost + depends on BR2_TOOLCHAIN_HAS_THREADS # libcamera/boost + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17/libcamera + depends on !BR2_STATIC_LIBS # gnutls/libcamera + depends on BR2_USE_WCHAR # gnutls/libcamera/boost + select BR2_PACKAGE_BOOST + select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS + select BR2_PACKAGE_JPEG + select BR2_PACKAGE_LIBCAMERA + select BR2_PACKAGE_LIBEXIF + select BR2_PACKAGE_LIBPNG + select BR2_PACKAGE_TIFF + select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 && (BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL) + select BR2_PACKAGE_LIBEPOXY if BR2_PACKAGE_XORG7 && (BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL) + select BR2_PACKAGE_QT5BASE_GUI if BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT5BASE_WIDGETS if BR2_PACKAGE_QT5 + help + This is a small suite of libcamera-based apps that aim to copy + the functionality of the existing "raspicam" apps. + + https://github.com/raspberrypi/libcamera-apps + +comment "libcamera-apps needs a toolchain w/ C++, threads, wchar, dynamic library, gcc >= 7" + 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 diff --git a/package/libcamera-apps/libcamera-apps.hash b/package/libcamera-apps/libcamera-apps.hash new file mode 100644 index 0000000000..2dbb74d463 --- /dev/null +++ b/package/libcamera-apps/libcamera-apps.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 611aec06dd24de6586580164d9b7c55da0698ac4cf129944b2fc41fe67210597 libcamera-apps-2d1009e3badcc8047361ff81149ad6cba3b911b5.tar.gz +sha256 36dfed86bdef661a0a14ec1a1cc84c771d5a06b6f9b92e9ebb610ba711bd528a license.txt diff --git a/package/libcamera-apps/libcamera-apps.mk b/package/libcamera-apps/libcamera-apps.mk new file mode 100644 index 0000000000..210d4e1e52 --- /dev/null +++ b/package/libcamera-apps/libcamera-apps.mk @@ -0,0 +1,48 @@ +################################################################################ +# +# libcamera-apps +# +################################################################################ + +LIBCAMERA_APPS_VERSION = 2d1009e3badcc8047361ff81149ad6cba3b911b5 +LIBCAMERA_APPS_SITE = $(call github,raspberrypi,libcamera-apps,$(LIBCAMERA_APPS_VERSION)) +LIBCAMERA_APPS_LICENSE = BSD-2-Clause +LIBCAMERA_APPS_LICENSE_FILES = license.txt +LIBCAMERA_APPS_DEPENDENCIES = \ + host-pkgconf \ + boost \ + jpeg \ + libcamera \ + libexif \ + libpng \ + tiff + +LIBCAMERA_APPS_CONF_OPTS = \ + -DENABLE_COMPILE_FLAGS_FOR_TARGET=disabled \ + -DENABLE_OPENCV=0 \ + -DENABLE_TFLITE=0 + +ifeq ($(BR2_PACKAGE_LIBDRM),y) +LIBCAMERA_APPS_DEPENDENCIES += libdrm +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_DRM=1 +else +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_DRM=0 +endif + +ifeq ($(BR2_PACKAGE_XORG7),y) +LIBCAMERA_APPS_DEPENDENCIES += \ + $(if $(BR2_PACKAGE_LIBEPOXY),libepoxy) \ + $(if $(BR2_PACKAGE_XLIB_LIBX11),xlib_libX11) +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_X11=1 +else +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_X11=0 +endif + +ifeq ($(BR2_PACKAGE_QT5),y) +LIBCAMERA_APPS_DEPENDENCIES += qt5base +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_QT=1 +else +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_QT=0 +endif + +$(eval $(cmake-package)) From yann.morin.1998 at free.fr Sat Feb 12 17:24:57 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 12 Feb 2022 18:24:57 +0100 Subject: [Buildroot] [PATCH v6 1/1] package/libcamera-apps: new package In-Reply-To: <20220211150604.23489-2-ps.report@gmx.net> References: <20220211150604.23489-1-ps.report@gmx.net> <20220211150604.23489-2-ps.report@gmx.net> Message-ID: <20220212172457.GG3752867@scaer> Peter, All, +Kieran On 2022-02-11 16:06 +0100, Peter Seiderer spake thusly: > Signed-off-by: Peter Seiderer Finally applied to master, thanks. However, see below for somme important comments... > --- [--SNIP--] > diff --git a/package/libcamera-apps/0001-cmake-remove-Werror-and-Wfatal-errors-compiler-comma.patch b/package/libcamera-apps/0001-cmake-remove-Werror-and-Wfatal-errors-compiler-comma.patch > new file mode 100644 > index 0000000000..988d89cca3 > --- /dev/null > +++ b/package/libcamera-apps/0001-cmake-remove-Werror-and-Wfatal-errors-compiler-comma.patch > @@ -0,0 +1,37 @@ > +From 6bd733b52f0b4039407c676cd3126a9e2f79456b Mon Sep 17 00:00:00 2001 > +From: Peter Seiderer > +Date: Fri, 5 Feb 2021 18:24:08 +0100 > +Subject: [PATCH] cmake: remove -Werror and -Wfatal-errors compiler command > + line option > +MIME-Version: 1.0 > +Content-Type: text/plain; charset=UTF-8 > +Content-Transfer-Encoding: 8bit > + > +Fixes (with bootlin-riscv64-musl toolchain): > + > + .../build/libcamera-apps-2d1009e3badcc8047361ff81149ad6cba3b911b5/core/libcamera_app.cpp:30:22: error: overflow in conversion from ?long unsigned int? to ?int? changes value from ?2154321408? to ?-2140645888? [-Werror=overflow] > + 30 | int ret = ioctl(fd, VIDIOC_QUERYCAP, &caps); > + | ^~~~~~~~~~~~~~~ > + cc1plus: all warnings being treated as errors Kieran, I believe this really needs some investigation on your side. Peter, can you provide a defconfig that exhibits the issue, please? [--SNIP--] > diff --git a/package/libcamera-apps/Config.in b/package/libcamera-apps/Config.in > new file mode 100644 > index 0000000000..75807b9c01 > --- /dev/null > +++ b/package/libcamera-apps/Config.in > @@ -0,0 +1,30 @@ > +config BR2_PACKAGE_LIBCAMERA_APPS > + bool "libcamera-apps" > + depends on BR2_PACKAGE_LIBCAMERA_ARCH_SUPPORTS # libcamera > + depends on BR2_INSTALL_LIBSTDCPP # libcamera/boost > + depends on BR2_TOOLCHAIN_HAS_THREADS # libcamera/boost > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17/libcamera > + depends on !BR2_STATIC_LIBS # gnutls/libcamera > + depends on BR2_USE_WCHAR # gnutls/libcamera/boost > + select BR2_PACKAGE_BOOST > + select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS > + select BR2_PACKAGE_JPEG > + select BR2_PACKAGE_LIBCAMERA > + select BR2_PACKAGE_LIBEXIF > + select BR2_PACKAGE_LIBPNG > + select BR2_PACKAGE_TIFF > + select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 && (BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL) > + select BR2_PACKAGE_LIBEPOXY if BR2_PACKAGE_XORG7 && (BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL) Look closely those two select: if neither EGL nor GL are neabled, then neither libeopxy nor xlib-libx11 are enabled, even when Xorg is. So, see later [0]... > + select BR2_PACKAGE_QT5BASE_GUI if BR2_PACKAGE_QT5 > + select BR2_PACKAGE_QT5BASE_WIDGETS if BR2_PACKAGE_QT5 When Qt5 is enabled, then Qt5GUI and Qt5Widgets are enabled, so [1]... > + Spurious empty line, I dropeed it. [--SNIP--] > diff --git a/package/libcamera-apps/libcamera-apps.mk b/package/libcamera-apps/libcamera-apps.mk > new file mode 100644 > index 0000000000..23cc02793d > --- /dev/null > +++ b/package/libcamera-apps/libcamera-apps.mk > @@ -0,0 +1,46 @@ > +################################################################################ > +# > +# libcamera-apps > +# > +################################################################################ > + > +LIBCAMERA_APPS_VERSION = 2d1009e3badcc8047361ff81149ad6cba3b911b5 > +LIBCAMERA_APPS_SITE = $(call github,raspberrypi,libcamera-apps,$(LIBCAMERA_APPS_VERSION)) > +LIBCAMERA_APPS_LICENSE = BSD-2-Clause > +LIBCAMERA_APPS_LICENSE_FILES = license.txt > +LIBCAMERA_APPS_DEPENDENCIES = \ > + host-pkgconf \ > + boost \ > + jpeg \ > + libcamera \ > + libexif \ > + libpng \ > + tiff > + > +LIBCAMERA_APPS_CONF_OPTS = \ > + -DENABLE_COMPILE_FLAGS_FOR_TARGET=disabled \ > + -DENABLE_OPENCV=0 \ > + -DENABLE_TFLITE=0 > + > +ifeq ($(BR2_PACKAGE_LIBDRM),y) > +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_DRM=1 > +LIBCAMERA_APPS_DEPENDENCIES += libdrm > +else > +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_DRM=0 > +endif > + > +ifeq ($(BR2_PACKAGE_XORG7)$(BR2_PACKAGE_LIBEPOXY),yy) > +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_X11=1 > +LIBCAMERA_APPS_DEPENDENCIES += libepoxy xlib_libX11 [0] so here, the condition is only on Xorg && linepoxy, and nothing about xlib-libx11, but still a dependency is added against it, although it may well be not enabled. So, I changed the condition to: ifeq ($(BR2_PACKAGE_XORG7),y) LIBCAMERA_APPS_DEPENDENCIES += \ $(if $(BR2_PACKAGE_LIBEPOXY),libepoxy) \ $(if $(BR2_PACKAGE_XLIB_LIBX11),xlib_libX11) LIBCAMERA_APPS_CONF_OPTS += -DENABLE_X11=1 else LIBCAMERA_APPS_CONF_OPTS += -DENABLE_X11=0 endif Argh, and now I see I missed something: indeed, libepoxy and xlib-libx11 are selected udner the same conditions, so if either is enabled, the other is.... Oh, wait, no, they can either be enabled manually by the user, and not 'selected' by libcanera-apps, so we still can have the situation where they are not both enabled... So, if both xlib-libx11 are required, then please send a patch to fix the comndition. In any case, pelase review the current code, at least to check if I did not mess too much... > +else > +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_X11=0 > +endif > + > +ifeq ($(BR2_PACKAGE_QT5)$(BR2_PACKAGE_QT5BASE_GUI)$(BR2_PACKAGE_QT5BASE_WIDGETS),yyy) [1] so here, GUI and widgets will be enabled when Qt5 is, so checking for them is redundant. Also: # make check-package package/libcamera-apps/libcamera-apps.mk:39: line contains trailing whitespace Applied to master with a buncha fixes for all the above, thanks. Regards, Yann E. MORIN. > +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_QT=1 > +LIBCAMERA_APPS_DEPENDENCIES += qt5base > +else > +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_QT=0 > +endif > + > +$(eval $(cmake-package)) > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Feb 12 18:41:55 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 12 Feb 2022 19:41:55 +0100 Subject: [Buildroot] [PATCH] support/pkg-stats: fix regression after cleanup in show-info Message-ID: <20220212184155.4188927-1-yann.morin.1998@free.fr> Commit 471ecea5eeb0 (core/show-info: 'name' only applies to packages) removed the 'name' field for rootfs (really, for non-package) entries, thus breaking the pkg-stats processing. We fix that by excluding any entry that has no 'name', on the assumption that if it has no name, it is not a package. Reported-by: Xogium on IRC Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni --- support/scripts/pkg-stats | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index abd36a3dd5..c235d99407 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -371,7 +371,7 @@ def get_pkglist(npackages, package_list): def get_config_packages(): cmd = ["make", "--no-print-directory", "show-info"] js = json.loads(subprocess.check_output(cmd)) - return set([v["name"] for v in js.values()]) + return set([v["name"] for v in js.values() if 'name' in v]) def package_init_make_info(): -- 2.25.1 From arnout at mind.be Sat Feb 12 20:35:16 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 21:35:16 +0100 Subject: [Buildroot] [PATCH] boot/uboot: add support for bundling TEE in BIN format into U-Boot In-Reply-To: <20220201091342.143010-1-michael@amarulasolutions.com> References: <20220201091342.143010-1-michael@amarulasolutions.com> Message-ID: On 01/02/2022 10:13, Michael Trimarchi wrote: > Some U-Boot platforms (e.g. nxp) can bundle OPTEE's tee.bin > into the U-Boot image using binman. This patch brings the necessary changes to > enable this feature. > > Signed-off-by: Michael Trimarchi > --- > boot/uboot/Config.in | 12 ++++++++++++ > boot/uboot/uboot.mk | 12 ++++++++++++ > 2 files changed, 24 insertions(+) > > diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in > index c630fc6552..117bbd3faf 100644 > --- a/boot/uboot/Config.in > +++ b/boot/uboot/Config.in > @@ -237,6 +237,18 @@ config BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE > U-Boot. This option makes sure optee-os gets built prior to > U-Boot, and that the TEE variable pointing to OPTEE's > tee.elf, is passed during the Buildroot build. ^^^^^^^ This is inconsistent with the choice below. Perhaps reformulate like this: U-Boot, and that the TEE variable pointing to OPTEE's binary is passed during the Buildroot build. > +choice > + prompt "U-Boot OPTEE BL32 format" > + default BR2_TARGET_UBOOT_NEEDS_OPTEE_BIN > + depends on BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE (nitpick) IMHO it's nicer to write this with if...endif around the choice. More importantly: there should be a help text. > + > +config BR2_TARGET_UBOOT_NEEDS_OPTEE_BIN > + bool "tee.bin" > + > +config BR2_TARGET_UBOOT_NEEDS_OPTEE_ELF > + bool "tee.elf" > + > +endchoice > > config BR2_TARGET_UBOOT_NEEDS_OPENSBI > bool "U-Boot needs OpenSBI" > diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk > index 574fc7089a..210fa219ed 100644 > --- a/boot/uboot/uboot.mk > +++ b/boot/uboot/uboot.mk > @@ -177,7 +177,19 @@ endif > > ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE),y) > UBOOT_DEPENDENCIES += optee-os > +ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPTEE_ELF),y) > UBOOT_MAKE_OPTS += TEE=$(BINARIES_DIR)/tee.elf > +define UBOOT_COPY_TEE_FIRMWARE > + cp $(BINARIES_DIR)/tee.elf $(@D)/ As Yann explained but it didn't appear to get through: before, it supposedly wasn't necessary to make this copy, so why is it necessary now? Perhaps it is necessary to copy it in more recent versions of U-Boot (i.e. when using binman). In that case, I think it would be good to also update the make option to TEE=tee.elf, to make it more consistent. > +endef > +UBOOT_PRE_BUILD_HOOKS += UBOOT_COPY_TEE_FIRMWARE > +else > +UBOOT_MAKE_OPTS += BL32=$(BINARIES_DIR)/tee.bin > +define UBOOT_COPY_TEE_FIRMWARE > + cp $(BINARIES_DIR)/tee-raw.bin $(@D)/tee.bin Again, it's very weird that you pass in a BL32= that refers to a different file (really different this time, because it's not the tee-raw.bin but the full tee.bin). There may be good reasons to do it this way, but that should be explained in detail in the commit message, and also briefly in a comment because it's simply too weird to understand like this. I've marked the patch as Changes Requested. Regards, Arnout > +endef > +UBOOT_PRE_BUILD_HOOKS += UBOOT_COPY_TEE_FIRMWARE > +endif > endif > > ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSBI),y) From arnout at mind.be Sat Feb 12 20:36:25 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 21:36:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-aiohttp-session: bump to version 2.11.0 In-Reply-To: <20220201013307.1956972-1-james.hilliard1@gmail.com> References: <20220201013307.1956972-1-james.hilliard1@gmail.com> Message-ID: On 01/02/2022 02:33, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-aiohttp-session/python-aiohttp-session.hash | 4 ++-- > package/python-aiohttp-session/python-aiohttp-session.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-aiohttp-session/python-aiohttp-session.hash b/package/python-aiohttp-session/python-aiohttp-session.hash > index 3842f0c7af..8b44318307 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 d57d463a9db13b681f7924b38aa77f64 aiohttp-session-2.10.0.tar.gz > -sha256 2af19af9f435937baacbb6420f887b21e5021bb34be146c2702c58e6ebf6b76b aiohttp-session-2.10.0.tar.gz > +md5 797273eb5f0ef9e95fa92c6a933cf4ad aiohttp-session-2.11.0.tar.gz > +sha256 0fdf39600f6a05c4943ef6c7b099071ca9854413111a26761626244be5015dc4 aiohttp-session-2.11.0.tar.gz > # Locally computed sha256 checksums > sha256 7bc5dd2f229a6b922befb1427fd4ad2c0b255f12c1b1869370ba77520dc22bc7 LICENSE > diff --git a/package/python-aiohttp-session/python-aiohttp-session.mk b/package/python-aiohttp-session/python-aiohttp-session.mk > index a28b1ae143..3d59b75e3d 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.10.0 > +PYTHON_AIOHTTP_SESSION_VERSION = 2.11.0 > PYTHON_AIOHTTP_SESSION_SOURCE = aiohttp-session-$(PYTHON_AIOHTTP_SESSION_VERSION).tar.gz > -PYTHON_AIOHTTP_SESSION_SITE = https://files.pythonhosted.org/packages/d6/3f/ab6288e8bbf4a9ae63ea0d3d5711bccc3a6dad1cb85a420c14fdeabc209e > +PYTHON_AIOHTTP_SESSION_SITE = https://files.pythonhosted.org/packages/3b/a7/0b97b9a2e3a553a86a6703f86b0e9b1afb2b262849700e8f80015c0f643f > PYTHON_AIOHTTP_SESSION_SETUP_TYPE = setuptools > PYTHON_AIOHTTP_SESSION_LICENSE = Apache-2.0 > PYTHON_AIOHTTP_SESSION_LICENSE_FILES = LICENSE From arnout at mind.be Sat Feb 12 20:36:44 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 21:36:44 +0100 Subject: [Buildroot] [PATCH v1] package/qt5base: fix uclibc/musl compile with libexecinfo enabled In-Reply-To: <20220131223024.22386-1-ps.report@gmx.net> References: <20220131223024.22386-1-ps.report@gmx.net> Message-ID: On 31/01/2022 23:30, Peter Seiderer wrote: > - 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 Applied to master, thanks. Regards, Arnout > --- > 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) \ From arnout at mind.be Sat Feb 12 20:38:47 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 21:38:47 +0100 Subject: [Buildroot] [PATCH 0/2 v2] linux|uboot: fix build with host-gcc 10+ for older versions (branch yem/yylloc) In-Reply-To: References: Message-ID: <0efa84fe-ed18-b918-d410-1d3042a52de4@mind.be> On 31/01/2022 22:38, Yann E. MORIN wrote: > 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 Applied to master, thanks. Regards, Arnout > > 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(+) > From arnout at mind.be Sat Feb 12 20:39:08 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 21:39:08 +0100 Subject: [Buildroot] [PATCH 1/1] linux: build after wireless-regdb if enabled for early loading support In-Reply-To: <20220131202151.937124-1-joerg.krause@embedded.rocks> References: <20220131202151.937124-1-joerg.krause@embedded.rocks> Message-ID: On 31/01/2022 21:21, J?rg Krause wrote: > 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 Applied to master, thanks. Regards, Arnout > --- > 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 From arnout at mind.be Sat Feb 12 20:38:18 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 21:38:18 +0100 Subject: [Buildroot] [git commit] linux: build after wireless-regdb if enabled for early loading support Message-ID: <20220212203150.B150881D55@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=de0f5ba17a15a87bc16a6d6aa318104510c38f9d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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. The dependency is harmless if CONFIG_EXTRA_FIRMWARE isn't actually set. Signed-off-by: J??rg Krause Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- linux/linux.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/linux/linux.mk b/linux/linux.mk index 35e2484588..d798aea057 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 From arnout at mind.be Sat Feb 12 20:38:18 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 21:38:18 +0100 Subject: [Buildroot] [git commit] package/python-aiohttp-session: bump to version 2.11.0 Message-ID: <20220212203150.DA02382470@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=37e49ce3e17cc1f434b05a9a431c716bd70dc540 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-aiohttp-session/python-aiohttp-session.hash | 4 ++-- package/python-aiohttp-session/python-aiohttp-session.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aiohttp-session/python-aiohttp-session.hash b/package/python-aiohttp-session/python-aiohttp-session.hash index 3842f0c7af..8b44318307 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 d57d463a9db13b681f7924b38aa77f64 aiohttp-session-2.10.0.tar.gz -sha256 2af19af9f435937baacbb6420f887b21e5021bb34be146c2702c58e6ebf6b76b aiohttp-session-2.10.0.tar.gz +md5 797273eb5f0ef9e95fa92c6a933cf4ad aiohttp-session-2.11.0.tar.gz +sha256 0fdf39600f6a05c4943ef6c7b099071ca9854413111a26761626244be5015dc4 aiohttp-session-2.11.0.tar.gz # Locally computed sha256 checksums sha256 7bc5dd2f229a6b922befb1427fd4ad2c0b255f12c1b1869370ba77520dc22bc7 LICENSE diff --git a/package/python-aiohttp-session/python-aiohttp-session.mk b/package/python-aiohttp-session/python-aiohttp-session.mk index a28b1ae143..3d59b75e3d 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.10.0 +PYTHON_AIOHTTP_SESSION_VERSION = 2.11.0 PYTHON_AIOHTTP_SESSION_SOURCE = aiohttp-session-$(PYTHON_AIOHTTP_SESSION_VERSION).tar.gz -PYTHON_AIOHTTP_SESSION_SITE = https://files.pythonhosted.org/packages/d6/3f/ab6288e8bbf4a9ae63ea0d3d5711bccc3a6dad1cb85a420c14fdeabc209e +PYTHON_AIOHTTP_SESSION_SITE = https://files.pythonhosted.org/packages/3b/a7/0b97b9a2e3a553a86a6703f86b0e9b1afb2b262849700e8f80015c0f643f PYTHON_AIOHTTP_SESSION_SETUP_TYPE = setuptools PYTHON_AIOHTTP_SESSION_LICENSE = Apache-2.0 PYTHON_AIOHTTP_SESSION_LICENSE_FILES = LICENSE From arnout at mind.be Sat Feb 12 20:38:18 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 21:38:18 +0100 Subject: [Buildroot] [git commit] package/qt5base: fix uclibc/musl compile with libexecinfo enabled Message-ID: <20220212203150.D1A8381D55@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=af0ea7d0372445fb315e739190fd98ecaf37c607 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 d8a0bf1d16..ef38d03253 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -235,6 +235,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 @@ -283,7 +291,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 @@ -306,7 +314,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) \ From arnout at mind.be Sat Feb 12 20:38:18 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 21:38:18 +0100 Subject: [Buildroot] [git commit] boot/uboot: fix build with host-gcc 10+ Message-ID: <20220212203150.BCAF482470@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3b3859cc7df8edce10e5b4dad9005bd05342c8c3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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) Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- boot/uboot/uboot.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 6750069173..cb26fc8d3e 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -238,6 +238,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) From arnout at mind.be Sat Feb 12 20:38:18 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 21:38:18 +0100 Subject: [Buildroot] [git commit] linux: fix build with host-gcc 10+ Message-ID: <20220212203150.C868C824EE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9b41b54be07711c10ad13ce157be272ed1cf402e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Linux 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) Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- linux/linux.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/linux/linux.mk b/linux/linux.mk index d798aea057..102b7a15d4 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -271,6 +271,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 yann.morin.1998 at free.fr Sat Feb 12 20:39:43 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 12 Feb 2022 21:39:43 +0100 Subject: [Buildroot] [git commit] utils/genrandconfig: drop BR2_PACKAGE_PYTHON_PY_ONLY logic Message-ID: <20220212203220.7560E81D55@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6c00a319ac6bd1b1f113abe988f8d62e76984323 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The option was removed by commit 306839586b (package/python: drop target package). Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- utils/genrandconfig | 2 -- 1 file changed, 2 deletions(-) diff --git a/utils/genrandconfig b/utils/genrandconfig index 77c7e585f5..3483d55c14 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -365,8 +365,6 @@ def gen_config(args): configlines.append("BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y\n") if randint(0, 20) == 0: configlines.append("BR2_STATIC_LIBS=y\n") - if randint(0, 20) == 0: - configlines.append("BR2_PACKAGE_PYTHON_PY_ONLY=y\n") if randint(0, 20) == 0: configlines.append("BR2_PACKAGE_PYTHON3_PY_ONLY=y\n") if randint(0, 5) == 0: From arnout at mind.be Sat Feb 12 20:44:29 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 21:44:29 +0100 Subject: [Buildroot] [PATCH] package/freescale-imx: Add installation of easrc-imx8mn.bin firmware In-Reply-To: References: <20220129140831.1284832-1-michael@amarulasolutions.com> Message-ID: On 12/02/2022 11:13, Michael Nazzareno Trimarchi wrote: > Hi > > On Sat, Jan 29, 2022 at 3:08 PM Michael Trimarchi > wrote: >> >> 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) > > > Is something missing here? No, it's just that patches that are not reviewed or version bumps or fixes can take a long time before they get applied, because there's such a huge stream of incoming patches. Anyway, applied to master, thanks. Regards, Arnout > > Michael >> -- >> 2.25.1 >> > > From arnout at mind.be Sat Feb 12 20:45:39 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 21:45:39 +0100 Subject: [Buildroot] [git commit] package/freescale-imx: Add installation of easrc-imx8mn.bin firmware Message-ID: <20220212203819.D6F9682470@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b538b43c7665f54e3d1e47cfd7bbe824cd6d7544 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The easrc firmware is used for audio resampling. The firmware for now exists only for imx8mn device Signed-off-by: Michael Trimarchi Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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) From wbx at openadk.org Sat Feb 12 21:49:36 2022 From: wbx at openadk.org (Waldemar Brodkorb) Date: Sat, 12 Feb 2022 22:49:36 +0100 Subject: [Buildroot] [PATCH] board/qemu/ppc-bamboo: use path to vmlinux image for copy and paste users Message-ID: Signed-off-by: Waldemar Brodkorb --- board/qemu/ppc-bamboo/readme.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/qemu/ppc-bamboo/readme.txt b/board/qemu/ppc-bamboo/readme.txt index 0b70d2fa54..53d1970698 100644 --- a/board/qemu/ppc-bamboo/readme.txt +++ b/board/qemu/ppc-bamboo/readme.txt @@ -1,5 +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 +qemu-system-ppc -nographic -M bamboo -kernel output/images/vmlinux -net nic,model=virtio-net-pci -net user # qemu_ppc_bamboo_defconfig The login prompt will appear in the terminal that started Qemu. -- 2.30.2 From wbx at openadk.org Sat Feb 12 21:51:55 2022 From: wbx at openadk.org (Waldemar Brodkorb) Date: Sat, 12 Feb 2022 22:51:55 +0100 Subject: [Buildroot] [PATCH 1/3] package/binutils: add version 2.38 Message-ID: See: https://sourceware.org/pipermail/binutils/2022-February/119721.html Signed-off-by: Waldemar Brodkorb --- package/binutils/2.38/0001-sh-conf.patch | 48 +++ .../2.38/0002-poison-system-directories.patch | 306 ++++++++++++++++++ ...or1k-fix-building-with-gcc-version-5.patch | 50 +++ ...K_GOT16-signed-overflow-by-using-spe.patch | 75 +++++ package/binutils/Config.in.host | 7 + package/binutils/binutils.hash | 1 + 6 files changed, 487 insertions(+) create mode 100644 package/binutils/2.38/0001-sh-conf.patch create mode 100644 package/binutils/2.38/0002-poison-system-directories.patch create mode 100644 package/binutils/2.38/0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch create mode 100644 package/binutils/2.38/0004-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch diff --git a/package/binutils/2.38/0001-sh-conf.patch b/package/binutils/2.38/0001-sh-conf.patch new file mode 100644 index 0000000000..fcc597e4d9 --- /dev/null +++ b/package/binutils/2.38/0001-sh-conf.patch @@ -0,0 +1,48 @@ +From 33f3c1f804efc2e4f97849081589efb70cda31e5 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 25 Dec 2015 11:38:13 +0100 +Subject: [PATCH] sh-conf + +Likewise, binutils has no idea about any of these new targets either, so we +fix that up too.. now we're able to actually build a real toolchain for +sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more +inept targets than that one, really. Go look, I promise). + +[Romain: rebase on top of 2.32] +Signed-off-by: Romain Naour +[Thomas: rebase on top of 2.29, in which sh64 support was removed.] +Signed-off-by: Thomas Petazzoni +--- + configure | 2 +- + configure.ac | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 3dd206525a7..6881ce632f5 100755 +--- a/configure ++++ b/configure +@@ -3892,7 +3892,7 @@ case "${target}" in + nvptx*-*-*) + noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" + ;; +- sh-*-*) ++ sh*-*-*) + case "${target}" in + sh*-*-elf) + ;; +diff --git a/configure.ac b/configure.ac +index 797a624621e..1f9256bbf18 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1175,7 +1175,7 @@ case "${target}" in + nvptx*-*-*) + noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" + ;; +- sh-*-*) ++ sh*-*-*) + case "${target}" in + sh*-*-elf) + ;; +-- +2.31.1 + diff --git a/package/binutils/2.38/0002-poison-system-directories.patch b/package/binutils/2.38/0002-poison-system-directories.patch new file mode 100644 index 0000000000..1a5fe46575 --- /dev/null +++ b/package/binutils/2.38/0002-poison-system-directories.patch @@ -0,0 +1,306 @@ +From 4d8705ddb55897e8a74b617ab95736d520d9e1ea Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 25 Dec 2015 11:45:38 +0100 +Subject: [PATCH] poison-system-directories + +Patch adapted to binutils 2.23.2 and extended to use +BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni. + +[Romain: rebase on top of 2.33.1] +Signed-off-by: Romain Naour +[Gustavo: adapt to binutils 2.25] +Signed-off-by: Thomas Petazzoni +Signed-off-by: Gustavo Zacarias + +Upstream-Status: Inappropriate [distribution: codesourcery] + +Patch originally created by Mark Hatle, forward-ported to +binutils 2.21 by Scott Garman. + +purpose: warn for uses of system directories when cross linking + +Code Merged from Sourcery G++ binutils 2.19 - 4.4-277 + +2008-07-02 Joseph Myers + + ld/ + * ld.h (args_type): Add error_poison_system_directories. + * ld.texinfo (--error-poison-system-directories): Document. + * ldfile.c (ldfile_add_library_path): Check + command_line.error_poison_system_directories. + * ldmain.c (main): Initialize + command_line.error_poison_system_directories. + * lexsup.c (enum option_values): Add + OPTION_ERROR_POISON_SYSTEM_DIRECTORIES. + (ld_options): Add --error-poison-system-directories. + (parse_args): Handle new option. + +2007-06-13 Joseph Myers + + ld/ + * config.in: Regenerate. + * ld.h (args_type): Add poison_system_directories. + * ld.texinfo (--no-poison-system-directories): Document. + * ldfile.c (ldfile_add_library_path): Check + command_line.poison_system_directories. + * ldmain.c (main): Initialize + command_line.poison_system_directories. + * lexsup.c (enum option_values): Add + OPTION_NO_POISON_SYSTEM_DIRECTORIES. + (ld_options): Add --no-poison-system-directories. + (parse_args): Handle new option. + +2007-04-20 Joseph Myers + + Merge from Sourcery G++ binutils 2.17: + + 2007-03-20 Joseph Myers + Based on patch by Mark Hatle . + ld/ + * configure.ac (--enable-poison-system-directories): New option. + * configure, config.in: Regenerate. + * ldfile.c (ldfile_add_library_path): If + ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib, + /usr/lib, /usr/local/lib or /usr/X11R6/lib. + +Signed-off-by: Mark Hatle +Signed-off-by: Scott Garman +--- + ld/config.in | 3 +++ + ld/configure | 14 ++++++++++++++ + ld/configure.ac | 10 ++++++++++ + ld/ld.h | 8 ++++++++ + ld/ld.texi | 12 ++++++++++++ + ld/ldfile.c | 17 +++++++++++++++++ + ld/ldlex.h | 2 ++ + ld/ldmain.c | 2 ++ + ld/lexsup.c | 21 +++++++++++++++++++++ + 9 files changed, 89 insertions(+) + +diff --git a/ld/config.in b/ld/config.in +index 26d55a00d47..ffad464783c 100644 +--- a/ld/config.in ++++ b/ld/config.in +@@ -43,6 +43,9 @@ + language is requested. */ + #undef ENABLE_NLS + ++/* Define to warn for use of native system library directories */ ++#undef ENABLE_POISON_SYSTEM_DIRECTORIES ++ + /* Additional extension a shared object might have. */ + #undef EXTRA_SHLIB_EXTENSION + +diff --git a/ld/configure b/ld/configure +index c197aaef3cb..882263aa43f 100755 +--- a/ld/configure ++++ b/ld/configure +@@ -829,6 +829,7 @@ with_lib_path + enable_targets + enable_64_bit_bfd + with_sysroot ++enable_poison_system_directories + enable_gold + enable_got + enable_compressed_debug_sections +@@ -1498,6 +1499,8 @@ Optional Features: + --enable-checking enable run-time checks + --enable-targets alternative target configurations + --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) ++ --enable-poison-system-directories ++ warn for use of native system library directories + --enable-gold[=ARG] build gold [ARG={default,yes,no}] + --enable-got= GOT handling scheme (target, single, negative, + multigot) +@@ -15236,7 +15239,18 @@ else + fi + + ++# Check whether --enable-poison-system-directories was given. ++if test "${enable_poison_system_directories+set}" = set; then : ++ enableval=$enable_poison_system_directories; ++else ++ enable_poison_system_directories=no ++fi ++ ++if test "x${enable_poison_system_directories}" = "xyes"; then + ++$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h ++ ++fi + + # Check whether --enable-got was given. + if test "${enable_got+set}" = set; then : +diff --git a/ld/configure.ac b/ld/configure.ac +index 8ea97c43cd4..0f246db67d8 100644 +--- a/ld/configure.ac ++++ b/ld/configure.ac +@@ -106,6 +106,16 @@ AC_SUBST(use_sysroot) + AC_SUBST(TARGET_SYSTEM_ROOT) + AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) + ++AC_ARG_ENABLE([poison-system-directories], ++ AS_HELP_STRING([--enable-poison-system-directories], ++ [warn for use of native system library directories]),, ++ [enable_poison_system_directories=no]) ++if test "x${enable_poison_system_directories}" = "xyes"; then ++ AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES], ++ [1], ++ [Define to warn for use of native system library directories]) ++fi ++ + dnl Use --enable-gold to decide if this linker should be the default. + dnl "install_as_default" is set to false if gold is the default linker. + dnl "installed_linker" is the installed BFD linker name. +diff --git a/ld/ld.h b/ld/ld.h +index 35fafebfaed..74e66405de6 100644 +--- a/ld/ld.h ++++ b/ld/ld.h +@@ -162,6 +162,14 @@ typedef struct + in the linker script. */ + bool force_group_allocation; + ++ /* If TRUE (the default) warn for uses of system directories when ++ cross linking. */ ++ bool poison_system_directories; ++ ++ /* If TRUE (default FALSE) give an error for uses of system ++ directories when cross linking instead of a warning. */ ++ bool error_poison_system_directories; ++ + /* Big or little endian as set on command line. */ + enum endian_enum endian; + +diff --git a/ld/ld.texi b/ld/ld.texi +index dd8f571d4e4..3ab210b41b9 100644 +--- a/ld/ld.texi ++++ b/ld/ld.texi +@@ -2863,6 +2863,18 @@ string identifying the original linked file does not change. + + Passing @code{none} for @var{style} disables the setting from any + @code{--build-id} options earlier on the command line. ++ ++ at kindex --no-poison-system-directories ++ at item --no-poison-system-directories ++Do not warn for @option{-L} options using system directories such as ++ at file{/usr/lib} when cross linking. This option is intended for use ++in chroot environments when such directories contain the correct ++libraries for the target system rather than the host. ++ ++ at kindex --error-poison-system-directories ++ at item --error-poison-system-directories ++Give an error instead of a warning for @option{-L} options using ++system directories when cross linking. + @end table + + @c man end +diff --git a/ld/ldfile.c b/ld/ldfile.c +index 9d0af06f1f6..7cdd3b1c1b1 100644 +--- a/ld/ldfile.c ++++ b/ld/ldfile.c +@@ -117,6 +117,23 @@ ldfile_add_library_path (const char *name, bool cmdline) + new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); + else + new_dirs->name = xstrdup (name); ++ ++#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES ++ if (command_line.poison_system_directories ++ && ((!strncmp (name, "/lib", 4)) ++ || (!strncmp (name, "/usr/lib", 8)) ++ || (!strncmp (name, "/usr/local/lib", 14)) ++ || (!strncmp (name, "/usr/X11R6/lib", 14)))) ++ { ++ if (command_line.error_poison_system_directories) ++ einfo (_("%X%P: error: library search path \"%s\" is unsafe for " ++ "cross-compilation\n"), name); ++ else ++ einfo (_("%P: warning: library search path \"%s\" is unsafe for " ++ "cross-compilation\n"), name); ++ } ++#endif ++ + } + + /* Try to open a BFD for a lang_input_statement. */ +diff --git a/ld/ldlex.h b/ld/ldlex.h +index 9e8bf5fb835..2f0fadfe0a3 100644 +--- a/ld/ldlex.h ++++ b/ld/ldlex.h +@@ -163,6 +163,8 @@ enum option_values + OPTION_CTF_VARIABLES, + OPTION_NO_CTF_VARIABLES, + OPTION_CTF_SHARE_TYPES, ++ OPTION_NO_POISON_SYSTEM_DIRECTORIES, ++ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, + }; + + /* The initial parser states. */ +diff --git a/ld/ldmain.c b/ld/ldmain.c +index 42660eb9a3c..1aef9387f93 100644 +--- a/ld/ldmain.c ++++ b/ld/ldmain.c +@@ -321,6 +321,8 @@ main (int argc, char **argv) + command_line.warn_mismatch = true; + command_line.warn_search_mismatch = true; + command_line.check_section_addresses = -1; ++ command_line.poison_system_directories = true; ++ command_line.error_poison_system_directories = false; + + /* We initialize DEMANGLING based on the environment variable + COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the +diff --git a/ld/lexsup.c b/ld/lexsup.c +index 00274c500d0..4f23b3a2da2 100644 +--- a/ld/lexsup.c ++++ b/ld/lexsup.c +@@ -595,6 +595,14 @@ static const struct ld_option ld_options[] = + " is: share-unconflicted (default),\n" + " share-duplicated"), + TWO_DASHES }, ++ { {"no-poison-system-directories", no_argument, NULL, ++ OPTION_NO_POISON_SYSTEM_DIRECTORIES}, ++ '\0', NULL, N_("Do not warn for -L options using system directories"), ++ TWO_DASHES }, ++ { {"error-poison-system-directories", no_argument, NULL, ++ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES}, ++ '\0', NULL, N_("Give an error for -L options using system directories"), ++ TWO_DASHES }, + }; + + #define OPTION_COUNT ARRAY_SIZE (ld_options) +@@ -607,6 +615,7 @@ parse_args (unsigned argc, char **argv) + int ingroup = 0; + char *default_dirlist = NULL; + char *shortopts; ++ char *BR_paranoid_env; + struct option *longopts; + struct option *really_longopts; + int last_optind; +@@ -1643,6 +1652,14 @@ parse_args (unsigned argc, char **argv) + } + break; + ++ case OPTION_NO_POISON_SYSTEM_DIRECTORIES: ++ command_line.poison_system_directories = false; ++ break; ++ ++ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: ++ command_line.error_poison_system_directories = true; ++ break; ++ + case OPTION_PUSH_STATE: + input_flags.pushed = xmemdup (&input_flags, + sizeof (input_flags), +@@ -1788,6 +1805,10 @@ parse_args (unsigned argc, char **argv) + command_line.soname = NULL; + } + ++ BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH"); ++ if (BR_paranoid_env && strlen(BR_paranoid_env) > 0) ++ command_line.error_poison_system_directories = true; ++ + while (ingroup) + { + einfo (_("%P: missing --end-group; added as last command line option\n")); +-- +2.31.1 + diff --git a/package/binutils/2.38/0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch b/package/binutils/2.38/0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch new file mode 100644 index 0000000000..bfd531b818 --- /dev/null +++ b/package/binutils/2.38/0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch @@ -0,0 +1,50 @@ +From ef4ba1da823e8366ea4f126f50885a44ebf4dcf0 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Wed, 9 Jun 2021 17:28:27 +0200 +Subject: [PATCH] bfd/elf32-or1k: fix building with gcc version < 5 + +Gcc version >= 5 has standard C mode not set to -std=gnu11, so if we use +an old compiler(i.e. gcc 4.9) build fails on: +``` +elf32-or1k.c:2251:3: error: 'for' loop initial declarations are only allowed in +C99 or C11 mode + for (size_t i = 0; i < insn_count; i++) + ^ +``` + +So let's declare `size_t i` at the top of the function instead of inside +for loop. + +Signed-off-by: Giulio Benetti +--- + bfd/elf32-or1k.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c +index 4ae7f324d33..32063ab0289 100644 +--- a/bfd/elf32-or1k.c ++++ b/bfd/elf32-or1k.c +@@ -2244,9 +2244,10 @@ or1k_write_plt_entry (bfd *output_bfd, bfd_byte *contents, unsigned insnj, + { + unsigned nodelay = elf_elfheader (output_bfd)->e_flags & EF_OR1K_NODELAY; + unsigned output_insns[PLT_MAX_INSN_COUNT]; ++ size_t i; + + /* Copy instructions into the output buffer. */ +- for (size_t i = 0; i < insn_count; i++) ++ for (i = 0; i < insn_count; i++) + output_insns[i] = insns[i]; + + /* Honor the no-delay-slot setting. */ +@@ -2277,7 +2278,7 @@ or1k_write_plt_entry (bfd *output_bfd, bfd_byte *contents, unsigned insnj, + } + + /* Write out the output buffer. */ +- for (size_t i = 0; i < (insn_count+1); i++) ++ for (i = 0; i < (insn_count+1); i++) + bfd_put_32 (output_bfd, output_insns[i], contents + (i*4)); + } + +-- +2.31.1 + diff --git a/package/binutils/2.38/0004-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch b/package/binutils/2.38/0004-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch new file mode 100644 index 0000000000..8609db95b7 --- /dev/null +++ b/package/binutils/2.38/0004-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 + diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index ea1f020989..17de6e4e41 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -36,6 +36,12 @@ config BR2_BINUTILS_VERSION_2_37_X # https://github.com/uclinux-dev/elf2flt/issues/12 depends on !BR2_BINFMT_FLAT +config BR2_BINUTILS_VERSION_2_38_X + bool "binutils 2.38" + # https://github.com/uclinux-dev/elf2flt/pull/16 + # https://github.com/uclinux-dev/elf2flt/issues/12 + depends on !BR2_BINFMT_FLAT + config BR2_BINUTILS_VERSION_ARC bool "binutils arc (2.34.50)" depends on BR2_arc @@ -49,6 +55,7 @@ config BR2_BINUTILS_VERSION default "2.35.2" if BR2_BINUTILS_VERSION_2_35_X default "2.36.1" if BR2_BINUTILS_VERSION_2_36_X default "2.37" if BR2_BINUTILS_VERSION_2_37_X + default "2.38" if BR2_BINUTILS_VERSION_2_38_X config BR2_BINUTILS_ENABLE_LTO bool diff --git a/package/binutils/binutils.hash b/package/binutils/binutils.hash index d1be6cbce8..fe31b34d40 100644 --- a/package/binutils/binutils.hash +++ b/package/binutils/binutils.hash @@ -3,6 +3,7 @@ sha512 d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724a sha512 9974ede5978d32e0d68fef23da48fa00bd06b0bff7ec45b00ca075c126d6bbe0cf2defc03ecc3f17bc6cc85b64271a13009c4049d7ba17de26e84e3a6e2c0348 binutils-2.35.2.tar.xz sha512 cc24590bcead10b90763386b6f96bb027d7594c659c2d95174a6352e8b98465a50ec3e4088d0da038428abe059bbc4ae5f37b269f31a40fc048072c8a234f4e9 binutils-2.36.1.tar.xz sha512 5c11aeef6935860a6819ed3a3c93371f052e52b4bdc5033da36037c1544d013b7f12cb8d561ec954fe7469a68f1b66f1a3cd53d5a3af7293635a90d69edd15e7 binutils-2.37.tar.xz +sha512 8bf0b0d193c9c010e0518ee2b2e5a830898af206510992483b427477ed178396cd210235e85fd7bd99a96fc6d5eedbeccbd48317a10f752b7336ada8b2bb826d binutils-2.38.tar.xz # Locally calculated (fetched from Github) sha512 76a8227a19218435319c660e4983ea17985194b7f496f163e97543e7f6fd3e9249241fdc05a16ba512fba96a1d846c1f7b080983404d821d6215f10e7f11e238 binutils-gdb-arc-2020.09-release.tar.gz -- 2.30.2 From wbx at openadk.org Sat Feb 12 21:52:57 2022 From: wbx at openadk.org (Waldemar Brodkorb) Date: Sat, 12 Feb 2022 22:52:57 +0100 Subject: [Buildroot] [PATCH 2/3] package/binutils: remove 2.35.2 Message-ID: Signed-off-by: Waldemar Brodkorb --- package/binutils/Config.in.host | 8 -------- package/binutils/binutils.hash | 1 - 2 files changed, 9 deletions(-) diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index 17de6e4e41..21b15b5c36 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -16,13 +16,6 @@ config BR2_BINUTILS_VERSION_2_32_X bool "binutils 2.32" depends on !BR2_csky -config BR2_BINUTILS_VERSION_2_35_X - bool "binutils 2.35.2" - depends on !BR2_csky - # https://github.com/uclinux-dev/elf2flt/pull/16 - # https://github.com/uclinux-dev/elf2flt/issues/12 - depends on !BR2_BINFMT_FLAT - config BR2_BINUTILS_VERSION_2_36_X bool "binutils 2.36.1" depends on !BR2_csky @@ -52,7 +45,6 @@ config BR2_BINUTILS_VERSION string default "arc-2020.09-release" if BR2_BINUTILS_VERSION_ARC default "2.32" if BR2_BINUTILS_VERSION_2_32_X - default "2.35.2" if BR2_BINUTILS_VERSION_2_35_X default "2.36.1" if BR2_BINUTILS_VERSION_2_36_X default "2.37" if BR2_BINUTILS_VERSION_2_37_X default "2.38" if BR2_BINUTILS_VERSION_2_38_X diff --git a/package/binutils/binutils.hash b/package/binutils/binutils.hash index fe31b34d40..4141e0c5f2 100644 --- a/package/binutils/binutils.hash +++ b/package/binutils/binutils.hash @@ -1,6 +1,5 @@ # From ftp://gcc.gnu.org/pub/binutils/releases/sha512.sum sha512 d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724afa1e43bd0db45cfc9916b41519b67dfce03232aa4978704492a6994a binutils-2.32.tar.xz -sha512 9974ede5978d32e0d68fef23da48fa00bd06b0bff7ec45b00ca075c126d6bbe0cf2defc03ecc3f17bc6cc85b64271a13009c4049d7ba17de26e84e3a6e2c0348 binutils-2.35.2.tar.xz sha512 cc24590bcead10b90763386b6f96bb027d7594c659c2d95174a6352e8b98465a50ec3e4088d0da038428abe059bbc4ae5f37b269f31a40fc048072c8a234f4e9 binutils-2.36.1.tar.xz sha512 5c11aeef6935860a6819ed3a3c93371f052e52b4bdc5033da36037c1544d013b7f12cb8d561ec954fe7469a68f1b66f1a3cd53d5a3af7293635a90d69edd15e7 binutils-2.37.tar.xz sha512 8bf0b0d193c9c010e0518ee2b2e5a830898af206510992483b427477ed178396cd210235e85fd7bd99a96fc6d5eedbeccbd48317a10f752b7336ada8b2bb826d binutils-2.38.tar.xz -- 2.30.2 From wbx at openadk.org Sat Feb 12 21:53:54 2022 From: wbx at openadk.org (Waldemar Brodkorb) Date: Sat, 12 Feb 2022 22:53:54 +0100 Subject: [Buildroot] [PATCH 3/3] package/binutils: make 2.37 the default Message-ID: Signed-off-by: Waldemar Brodkorb --- package/binutils/Config.in.host | 2 +- package/binutils/binutils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index 21b15b5c36..e639c67149 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -7,7 +7,7 @@ config BR2_PACKAGE_HOST_BINUTILS_SUPPORTS_CFI choice prompt "Binutils Version" - default BR2_BINUTILS_VERSION_2_36_X if !BR2_arc && !BR2_csky + default BR2_BINUTILS_VERSION_2_37_X if !BR2_arc && !BR2_csky default BR2_BINUTILS_VERSION_ARC if BR2_arc help Select the version of binutils you wish to use. diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index 8c4a1371ca..c94ebe0995 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -11,7 +11,7 @@ ifeq ($(BINUTILS_VERSION),) ifeq ($(BR2_arc),y) BINUTILS_VERSION = arc-2020.09-release else -BINUTILS_VERSION = 2.36.1 +BINUTILS_VERSION = 2.37 endif endif # BINUTILS_VERSION -- 2.30.2 From arnout at mind.be Sat Feb 12 22:00:53 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 23:00:53 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/android-tools: fastboot needs gcc >= 5 In-Reply-To: <20220129155019.3819750-1-fontaine.fabrice@gmail.com> References: <20220129155019.3819750-1-fontaine.fabrice@gmail.com> Message-ID: <56728901-85a9-87ef-1a97-b1d907f17056@mind.be> On 29/01/2022 16:50, Fabrice Fontaine wrote: > 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 Applied to master, thanks. Regards, Arnout > --- > 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 From arnout at mind.be Sat Feb 12 22:00:38 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 23:00:38 +0100 Subject: [Buildroot] [git commit] package/android-tools: fastboot needs gcc >= 5 Message-ID: <20220212215328.0005E825B3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cdefb4538e07ef37d77aa3634907b15652d31ff9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 From arnout at mind.be Sat Feb 12 22:02:20 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 23:02:20 +0100 Subject: [Buildroot] [PATCH v2] package/util-linux: improve host build failure fix In-Reply-To: <20220203223124.3017611-1-giulio.benetti@benettiengineering.com> References: <20220203212328.264bc948@gmx.net> <20220203223124.3017611-1-giulio.benetti@benettiengineering.com> Message-ID: <410007c0-2496-3a06-bb91-19f7acbef174@mind.be> On 03/02/2022 23:31, Giulio Benetti wrote: > As suggested by Peter Seiderer package util-linux doesn't need raw support > when built for host, so let's remove: > HOST_UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE > in favor of: > HOST_UTIL_LINUX_CONF_OPTS += --disable-raw > This is a better approach than my commit: > https://git.buildroot.net/buildroot/commit/?id=d895bd973b35fde10d3dd7db530d9e4782926497 > > Suggested-by: Peter Seiderer > Tested-by: Peter Seiderer > Reviewed-by: Peter Seiderer > Signed-off-by: Giulio Benetti Applied to master, thanks. Regards, Arnout > --- > V1->V2: > * move --disable-raw to a dedicated HOST_UTIL_LINUX_CONF_OPTS as suggested > by Peter Seiderer. This avoid ambiguity since previously it was under the > comment "# We also don't want the host-python dependency". > --- > package/util-linux/util-linux.mk | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk > index 5a4ff64d01..40fd518a58 100644 > --- a/package/util-linux/util-linux.mk > +++ b/package/util-linux/util-linux.mk > @@ -41,7 +41,6 @@ define UTIL_LINUX_FIX_DISK_UTILS_COMPILE > touch $(@D)/disk-utils/raw.8 > endef > UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE > -HOST_UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE > > HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf > > @@ -202,6 +201,11 @@ HOST_UTIL_LINUX_CONF_OPTS += \ > --without-ncursesw \ > --without-tinfo > > +# Disable raw command since starting from version 2.37 needs a > +# work-around to build but in the end we don't need at all. > +HOST_UTIL_LINUX_CONF_OPTS += \ > + --disable-raw > + > ifeq ($(BR2_PACKAGE_HOST_UTIL_LINUX),y) > HOST_UTIL_LINUX_CONF_OPTS += --disable-makeinstall-chown > # disable commands that have ncurses dependency, as well as From arnout at mind.be Sat Feb 12 22:01:45 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 23:01:45 +0100 Subject: [Buildroot] [git commit] package/util-linux: improve host build failure fix Message-ID: <20220212215455.A6588825B3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=498117df1261c582ca70851c8a4f58db95632f2c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master As suggested by Peter Seiderer package util-linux doesn't need raw support when built for host, so let's remove: HOST_UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE in favor of: HOST_UTIL_LINUX_CONF_OPTS += --disable-raw This is a better approach than my commit: https://git.buildroot.net/buildroot/commit/?id=d895bd973b35fde10d3dd7db530d9e4782926497 Suggested-by: Peter Seiderer Tested-by: Peter Seiderer Reviewed-by: Peter Seiderer Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/util-linux/util-linux.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 1ca605f3fb..a25b69d910 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -41,7 +41,6 @@ define UTIL_LINUX_FIX_DISK_UTILS_COMPILE touch $(@D)/disk-utils/raw.8 endef UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE -HOST_UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf @@ -202,6 +201,11 @@ HOST_UTIL_LINUX_CONF_OPTS += \ --without-ncursesw \ --without-tinfo +# Disable raw command since starting from version 2.37 needs a +# work-around to build but in the end we don't need at all. +HOST_UTIL_LINUX_CONF_OPTS += \ + --disable-raw + ifeq ($(BR2_PACKAGE_HOST_UTIL_LINUX),y) HOST_UTIL_LINUX_CONF_OPTS += --disable-makeinstall-chown # disable commands that have ncurses dependency, as well as From arnout at mind.be Sat Feb 12 22:05:04 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 23:05:04 +0100 Subject: [Buildroot] [PATCH] board/pc: fix build failure due to new genimage 15 In-Reply-To: <20220204005610.897894-1-giulio.benetti@benettiengineering.com> References: <20220204005610.897894-1-giulio.benetti@benettiengineering.com> Message-ID: <32309155-0d7e-94ff-603f-496c783e82d5@mind.be> On 04/02/2022 01:56, Giulio Benetti wrote: > Actually genimage fails to create final image with: > ``` > ERROR: hdimage(disk.img): partition [MBR] (offset 0x1b8, size 0x48) overlaps previous partition boot (offset 0x0, size 0x200) > ERROR: hdimage(disk.img): bootloaders, etc. that overlap with the partition table must declare the overlapping area as a hole. > ``` > > This is because genimage 15 is less permissive than before, so let's add > holes = {"(440; 512)"} to leave room to MBR. > > Fixes: > https://gitlab.com/buildroot.org/buildroot/-/jobs/1865935249 > > Signed-off-by: Giulio Benetti Applied to master, thanks. Regards, Arnout > --- > board/pc/genimage-bios.cfg | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/board/pc/genimage-bios.cfg b/board/pc/genimage-bios.cfg > index 26d12d9ab3..54026f6527 100644 > --- a/board/pc/genimage-bios.cfg > +++ b/board/pc/genimage-bios.cfg > @@ -7,6 +7,7 @@ image disk.img { > image = "boot.img" > offset = 0 > size = 512 > + holes = {"(440; 512)"} > } > > partition grub { From arnout at mind.be Sat Feb 12 22:04:28 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 23:04:28 +0100 Subject: [Buildroot] [git commit] board/pc: fix build failure due to new genimage 15 Message-ID: <20220212215739.F1AFC825C1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=92dc22dd6823b93b5989a704a2440e724d954bd3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Actually genimage fails to create final image with: ``` ERROR: hdimage(disk.img): partition [MBR] (offset 0x1b8, size 0x48) overlaps previous partition boot (offset 0x0, size 0x200) ERROR: hdimage(disk.img): bootloaders, etc. that overlap with the partition table must declare the overlapping area as a hole. ``` This is because genimage 15 is less permissive than before, so let's add holes = {"(440; 512)"} to leave room to MBR. The generated image is identical to the image generated by the previous version of genimage. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/1865935249 Signed-off-by: Giulio Benetti Tested-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- board/pc/genimage-bios.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/board/pc/genimage-bios.cfg b/board/pc/genimage-bios.cfg index 26d12d9ab3..54026f6527 100644 --- a/board/pc/genimage-bios.cfg +++ b/board/pc/genimage-bios.cfg @@ -7,6 +7,7 @@ image disk.img { image = "boot.img" offset = 0 size = 512 + holes = {"(440; 512)"} } partition grub { From arnout at mind.be Sat Feb 12 22:11:45 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 23:11:45 +0100 Subject: [Buildroot] [PATCH v4] configs/orangepi_zero_defconfig: switch to extlinux In-Reply-To: <20220206074853.25887-1-kuzminov.sergey81@gmail.com> References: <20220206074853.25887-1-kuzminov.sergey81@gmail.com> Message-ID: On 06/02/2022 08:48, Sergey Kuzminov wrote: > Changes: > * Exclude FAT partition, it is no longer needed for U-Boot. > * Switch the rootfs partition from MBR to GPT for partition-uuid to work. > * Switch to extlinux, this is convenient for debugging. > * Create common scenarios for multiple boards to create an SD image: board/orangepi/common. > * Add BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y, remount root filesystem read-write during boot. > > Signed-off-by: Sergey Kuzminov > --- > V1->V2: > * improved commit log > * removed commented line in extlinux.conf > * removed one boot option from extlinux.conf > > V2->V3: > * improved commit log > * removed comment from board/orangepi/common/genimage.cfg > > V3->V4: > * fixed Signed-off-by position I think I'm going to use this commit message as an example for the documentation... Well, if I ever get around to it :-) [snip] > diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig > index 5aaa1566c5..96f0c3f600 100644 > --- a/configs/orangepi_zero_defconfig > +++ b/configs/orangepi_zero_defconfig > @@ -20,10 +20,13 @@ 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_NEEDS_HOST_OPENSSL=y > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > > # Filesystem > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="63M" Why? Increase from 60M to 63M seems a bit odd... I removed this. > +BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y We don't do this for any other defconfig. I removed this. Applied to master, thanks. Regards, Arnout > # BR2_TARGET_ROOTFS_TAR is not set > > # Bootloader > @@ -39,16 +42,12 @@ 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 > > # 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" > > # Wireless driver and firmware > BR2_PACKAGE_XR819_XRADIO=y From arnout at mind.be Sat Feb 12 22:09:09 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 23:09:09 +0100 Subject: [Buildroot] [git commit] configs/orangepi_zero_defconfig: switch to extlinux Message-ID: <20220212220421.1E558825C1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c0312f71cc89434e2f29e37b4586186240aa4d14 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changes: * Exclude FAT partition, it is no longer needed for U-Boot. * Switch the rootfs partition from MBR to GPT for partition-uuid to work. * Switch to extlinux, this is convenient for debugging. * Create common scenarios for multiple boards to create an SD image: board/orangepi/common. Currently only orangepi_zero makes use of the common infrastructure. Signed-off-by: Sergey Kuzminov Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti [Arnout: remove rootfs size = 63M and remount rw] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- board/orangepi/common/extlinux.conf | 4 ++++ board/orangepi/common/genimage.cfg | 20 +++++++++++++++++ board/orangepi/common/post-build.sh | 34 +++++++++++++++++++++++++++++ board/orangepi/orangepi-zero/boot.cmd | 9 -------- board/orangepi/orangepi-zero/genimage.cfg | 36 ------------------------------- configs/orangepi_zero_defconfig | 9 +++----- 6 files changed, 61 insertions(+), 51 deletions(-) diff --git a/board/orangepi/common/extlinux.conf b/board/orangepi/common/extlinux.conf new file mode 100644 index 0000000000..12f496b1fa --- /dev/null +++ b/board/orangepi/common/extlinux.conf @@ -0,0 +1,4 @@ +LABEL default + kernel /boot/%LINUXIMAGE% + devicetreedir /boot + 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..a61c4a039f --- /dev/null +++ b/board/orangepi/common/genimage.cfg @@ -0,0 +1,20 @@ +image sdcard.img { + partition u-boot { + in-partition-table = false + image = "u-boot-sunxi-with-spl.bin" + offset = 8K + size = 1000K # 1MB - 8KB(offset) - 16KB(GPT) + } + + hdimage { + partition-table-type = gpt + gpt-location = 1008K # 1MB - 16KB(GPT) + gpt-no-backup = true + } + + 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/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 5aaa1566c5..464e075e5c 100644 --- a/configs/orangepi_zero_defconfig +++ b/configs/orangepi_zero_defconfig @@ -20,6 +20,7 @@ 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_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y # Filesystem BR2_TARGET_ROOTFS_EXT2=y @@ -39,16 +40,12 @@ 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 # 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" # Wireless driver and firmware BR2_PACKAGE_XR819_XRADIO=y From arnout at mind.be Sat Feb 12 22:17:20 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 23:17:20 +0100 Subject: [Buildroot] [PATCH v3 0/2] Fix gitlab CI build failure due to missing HOST_ dependencies In-Reply-To: <20220206112620.1637342-1-giulio.benetti@benettiengineering.com> References: <20220206115156.6042cc1b@windsurf> <20220206112620.1637342-1-giulio.benetti@benettiengineering.com> Message-ID: On 06/02/2022 12:26, Giulio Benetti wrote: > This patchset fixes the gitlab build failure due to HOST_ dependencies(uboot/linux). > > V1->V2: > * add missing host openssl for linux on microchip_sama7g5ek_mmc_defconfig/_dev_defconfig > V2->V3: > * add specific custom linux version as suggested by Thomas > > Giulio Benetti (2): > configs/microchip_sama7g5ek_mmc_defconfig: set custom linux version to > 5.15.21 and add host openssl for linux > configs/microchip_sama7g5ek_mmc_dev_defconfig: set custom linux > version to 5.15.21 and add host openssl for linux Both applied to master, thanks. The entropy issue can be resolved later. Regards, Arnout > > configs/microchip_sama7g5ek_mmc_defconfig | 4 ++++ > configs/microchip_sama7g5ek_mmc_dev_defconfig | 4 ++++ > 2 files changed, 8 insertions(+) > From arnout at mind.be Sat Feb 12 22:13:02 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 23:13:02 +0100 Subject: [Buildroot] [git commit] configs/microchip_sama7g5ek_mmc_dev_defconfig: set custom linux version to 5.15.21 and add host openssl for linux Message-ID: <20220212221033.1A291825C1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f6e2920c94baa70fb78af57b7cc6afcbf621c4d0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: https://gitlab.com/ymorin/buildroot/-/jobs/2035821100 Signed-off-by: Giulio Benetti Tested-by: Eugen Hristev Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- configs/microchip_sama7g5ek_mmc_dev_defconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configs/microchip_sama7g5ek_mmc_dev_defconfig b/configs/microchip_sama7g5ek_mmc_dev_defconfig index 3253bce401..c11ea2f518 100644 --- a/configs/microchip_sama7g5ek_mmc_dev_defconfig +++ b/configs/microchip_sama7g5ek_mmc_dev_defconfig @@ -1,6 +1,7 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_TOOLCHAIN_BUILDROOT_WCHAR=y BR2_PTHREAD_DEBUG=y BR2_TOOLCHAIN_BUILDROOT_CXX=y @@ -8,9 +9,12 @@ BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/microchip/sama7g5ek/genimage.cfg" BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.21" BR2_LINUX_KERNEL_DEFCONFIG="sama7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama7g5ek" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_LINUX_TOOLS_IIO=y BR2_PACKAGE_BZIP2=y BR2_PACKAGE_XZ=y From arnout at mind.be Sat Feb 12 22:12:43 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 23:12:43 +0100 Subject: [Buildroot] [git commit] configs/microchip_sama7g5ek_mmc_defconfig: set custom linux version to 5.15.21 and add host openssl for linux Message-ID: <20220212221033.124E182518@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=27edd4d18a913d08217217f6da725e88b4796211 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: https://gitlab.com/ymorin/buildroot/-/jobs/2035821098 Signed-off-by: Giulio Benetti Tested-by: Eugen Hristev Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- configs/microchip_sama7g5ek_mmc_defconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configs/microchip_sama7g5ek_mmc_defconfig b/configs/microchip_sama7g5ek_mmc_defconfig index b1cd193829..7ab81d1dd0 100644 --- a/configs/microchip_sama7g5ek_mmc_defconfig +++ b/configs/microchip_sama7g5ek_mmc_defconfig @@ -1,12 +1,16 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/microchip/sama7g5ek/genimage.cfg" BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.21" BR2_LINUX_KERNEL_DEFCONFIG="sama7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama7g5ek" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" From arnout at mind.be Sat Feb 12 22:18:55 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 23:18:55 +0100 Subject: [Buildroot] [PATCH v3 1/1] package/guile: Fix build failure due to missing libiconv In-Reply-To: <20220209225957.1257630-1-paguilar@paguilar.org> References: <20220209225957.1257630-1-paguilar@paguilar.org> Message-ID: On 09/02/2022 23:59, Pedro Aguilar wrote: > When building package guile with BR2_ENABLE_LOCALE=n > we get the following error: > > ``` > In file included from filesys.c:95: > ports-internal.h:26:10: fatal error: iconv.h: No such file or directory > 26 | #include > | ^~~~~~~~~ > compilation terminated. > ``` > > So let's fix it by selecting BR2_PACKAGE_LIBICONV and > adding libiconv package as dependency. > > Signed-off-by: Pedro Aguilar Applied to master, thanks. Regards, Arnout > > --- > Changes v2 -> v3: > - Improve commit message (thanks to Giulio comments) > Changes v1 -> v2: > - Use BR2_ENABLE_LOCALE if selected, otherwise use libiconv > as before (pointed out by Thomas and Giulio) > --- > package/guile/Config.in | 1 + > package/guile/guile.mk | 4 ++++ > 2 files changed, 5 insertions(+) > > diff --git a/package/guile/Config.in b/package/guile/Config.in > index b1182a4cee..f70e674018 100644 > --- a/package/guile/Config.in > +++ b/package/guile/Config.in > @@ -9,6 +9,7 @@ config BR2_PACKAGE_GUILE > select BR2_PACKAGE_LIBFFI > select BR2_PACKAGE_GMP > select BR2_PACKAGE_BDWGC > + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE > help > Guile is an interpreter and compiler for the Scheme > programming language, a clean and elegant dialect of Lisp. > diff --git a/package/guile/guile.mk b/package/guile/guile.mk > index 0f245fca76..03420407f8 100644 > --- a/package/guile/guile.mk > +++ b/package/guile/guile.mk > @@ -18,6 +18,10 @@ GUILE_CPE_ID_VENDOR = gnu > GUILE_DEPENDENCIES = host-guile libunistring libffi gmp bdwgc host-pkgconf > HOST_GUILE_DEPENDENCIES = host-libunistring host-libffi host-gmp host-bdwgc host-flex host-pkgconf host-gettext > > +ifeq ($(BR2_ENABLE_LOCALE),) > +GUILE_DEPENDENCIES += libiconv > +endif > + > # The HAVE_GC* CFLAGS specify that we will use internal callbacks > # instead of the ones provided by > # bdwgc. Eg. HAVE_GC_SET_FINALIZER_NOTIFIER specifies that we won't From arnout at mind.be Sat Feb 12 22:18:37 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 23:18:37 +0100 Subject: [Buildroot] [git commit] package/guile: Fix build failure due to missing libiconv Message-ID: <20220212221137.B099082518@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5050f07fdfbd6b7cb4447745b4eb18606692dbf7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master When building package guile with BR2_ENABLE_LOCALE=n we get the following error: ``` In file included from filesys.c:95: ports-internal.h:26:10: fatal error: iconv.h: No such file or directory 26 | #include | ^~~~~~~~~ compilation terminated. ``` So let's fix it by selecting BR2_PACKAGE_LIBICONV and adding libiconv package as dependency. Signed-off-by: Pedro Aguilar Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/guile/Config.in | 1 + package/guile/guile.mk | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/package/guile/Config.in b/package/guile/Config.in index b1182a4cee..f70e674018 100644 --- a/package/guile/Config.in +++ b/package/guile/Config.in @@ -9,6 +9,7 @@ config BR2_PACKAGE_GUILE select BR2_PACKAGE_LIBFFI select BR2_PACKAGE_GMP select BR2_PACKAGE_BDWGC + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE help Guile is an interpreter and compiler for the Scheme programming language, a clean and elegant dialect of Lisp. diff --git a/package/guile/guile.mk b/package/guile/guile.mk index 0f245fca76..03420407f8 100644 --- a/package/guile/guile.mk +++ b/package/guile/guile.mk @@ -18,6 +18,10 @@ GUILE_CPE_ID_VENDOR = gnu GUILE_DEPENDENCIES = host-guile libunistring libffi gmp bdwgc host-pkgconf HOST_GUILE_DEPENDENCIES = host-libunistring host-libffi host-gmp host-bdwgc host-flex host-pkgconf host-gettext +ifeq ($(BR2_ENABLE_LOCALE),) +GUILE_DEPENDENCIES += libiconv +endif + # The HAVE_GC* CFLAGS specify that we will use internal callbacks # instead of the ones provided by # bdwgc. Eg. HAVE_GC_SET_FINALIZER_NOTIFIER specifies that we won't From luca at lucaceresoli.net Sat Feb 12 22:56:25 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Sat, 12 Feb 2022 23:56:25 +0100 Subject: [Buildroot] [PATCH] manual: board support: add instructions to test defconfig in the official docker In-Reply-To: <20220203235438.610277-1-giulio.benetti@benettiengineering.com> References: <20220203235438.610277-1-giulio.benetti@benettiengineering.com> Message-ID: Hi Giulio, On 04/02/22 00:54, Giulio Benetti wrote: > Often new boards have not been tested with official docker so let's add > instructions to do it. Thank you, I think this is a very useful addition to the documentation! However I would suggest some changes for it to look more "professional". > Signed-off-by: Giulio Benetti > --- > docs/manual/adding-board-support.txt | 22 ++++++++++++++++++++++ > 1 file changed, 22 insertions(+) > > diff --git a/docs/manual/adding-board-support.txt b/docs/manual/adding-board-support.txt > index 33ed709535..f5fb3af371 100644 > --- a/docs/manual/adding-board-support.txt > +++ b/docs/manual/adding-board-support.txt > @@ -46,3 +46,25 @@ create a directory +board/+ and a subdirectory > +board//+. You can then store your patches > and configurations in these directories, and reference them from the main > Buildroot configuration. Refer to xref:customize[] for more details. > + > +Before submitting patches for new boards it would be better to test it "it would be better" -> "it is recommended". > +by building it using .gitlab-ci.yml specified docker. For example at the I think this should be reworded in a simpler way: "by building it using the docker specified in .gitlab-ci.yml". BTW as I am a docker newbie: is it common to say "the docker"? Or would "the docker container" be more correct? -- By comparison, I would never say "using the virtualbox" but rather "using the virtualbox machine". > +time of this writing the docker is: Remove the ':' from this line, or you'll have multiple ':' per line, which looks awkward. > +$CI_REGISTRY/buildroot.org/buildroot/base:20220105.2314 Hm, this string is already old. There's no sane way to keep docs and .yml in sync. I wonder whether we should have in the manual a command line that always use the current string, such as: DOCKER_IMAGE=$(cat .gitlab-ci.yml | \ sed -n '/^image/s/^.*CI_REGISTRY/registry.gitlab.com/p') docker pull $DOCKER_IMAGE sudo docker run -it $DOCKER_IMAGE However I must admit this is not very readable in the docs... :( What about adding a simple script (utils/run-docker?) that does the trick and just mention that in the docs? > +so: Add an empty line here, so that the output separates from the next line. > +Pull the docker: > +-------------------- > + $ docker pull registry.gitlab.com/buildroot.org/buildroot/base:20220105.2314 Missing 'sudo'? > +-------------------- Add an empty line here. This has no effect on the output but makes source code more readable. > +Run the docker: > +-------------------- > + $ sudo docker run -it registry.gitlab.com/buildroot.org/buildroot/base:20220105.2314 /bin/bash > +-------------------- As above, add an empty line here. > +Inside the docker hint: > +-------------------- > + $ git clone git://git.busybox.net/buildroot > + $ cd buildroot > + $ make +_defconfig+ > + $ make > +-------------------- As above, add an empty line here. > +Wait until build finishes and eventually add host dependencies. If I understand what you mean here, it should be "and add host dependencies if needed" ("eventually" is not the english translation of italian "eventualmente"). If my understanding is correct, I don't find this sentence very useful: a docker newbie perhaps doesn't know how to add a host dependency (and maybe not even how to understand that they are missing one). I would just remove this line, but if you think it is very important I'd clarify it, maybe with some examples. -- Luca From james.hilliard1 at gmail.com Sun Feb 13 01:20:51 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 12 Feb 2022 18:20:51 -0700 Subject: [Buildroot] [PATCH v4 1/1] package/bpftool: new package In-Reply-To: <08b9ef7c-8ce6-3216-3f56-5c64af2f4a66@mind.be> References: <20220131185154.26343-1-james.hilliard1@gmail.com> <08b9ef7c-8ce6-3216-3f56-5c64af2f4a66@mind.be> Message-ID: On Sat, Feb 12, 2022 at 6:25 AM Arnout Vandecappelle wrote: > > > > On 31/01/2022 19:51, James Hilliard wrote: > > 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. > > I don't understand this: linux-tools is part of the kernel build itself, so > there shouldn't be any differences between kernel versions... Anyway, you > probably experienced it so I kept the comment. I mean that older kernels provide outdated versions of bpftool which may cause issues especially for host-bpftool as stuff like systemd bpf-framework has minimum version requirements there for build side. > > > > > The host bpftool is needed for enabling features such as the systemd > > bpf-framework(to be added in a future patch). > > Normally we only accept host packages if there's a (target) package that > actually depends on it. Knowing you however we're not going to have to wait long > for this systemd bpf framework, so I kept the host package. Yeah, I think I'll have that working once we bump clang/llvm, min version is 10.0.0 and we're still on 9.0.1: https://patchwork.ozlabs.org/project/buildroot/list/?series=233431&submitter=&state=*&q=&archive=both&delegate= > > > > Signed-off-by: James Hilliard > > --- > > Changes v3 -> v4: > > - remove linux-tools bpftool kconfig entry > > Ideally this should have been done in a separate patch, but OK. > > > 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 > > > > [snip] > > 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 > > This is purely for the libbpf submodule. We normally prefer to unbundle such > dependencies, since we have libbpf as a package. I've kept it for now, but if > you could unbundle it, that would be great. Yeah, unbundled doesn't seem to really be a supported configuration here yet. > > I've added a line to the commit message to explain why the git download method > is used. > > > Applied to master, thanks. > > Regards, > Arnout > > > > +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 From james.hilliard1 at gmail.com Sun Feb 13 01:40:24 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 12 Feb 2022 18:40:24 -0700 Subject: [Buildroot] [PATCH 1/1] package/pipewire: add optional lv2 support Message-ID: <20220213014024.1868278-1-james.hilliard1@gmail.com> Pipewire supports lv2 via the lilv dependency. https://github.com/PipeWire/pipewire/blob/0.3.45/meson.build#L451 Signed-off-by: James Hilliard --- package/pipewire/pipewire.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index fc521c86ac..2a38db9977 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -29,8 +29,7 @@ PIPEWIRE_CONF_OPTS += \ -Dvideotestsrc=enabled \ -Dvolume=enabled \ -Dsession-managers=[] \ - -Dlibcanberra=disabled \ - -Dlv2=disabled + -Dlibcanberra=disabled ifeq ($(BR2_PACKAGE_DBUS),y) PIPEWIRE_CONF_OPTS += -Ddbus=enabled @@ -129,6 +128,13 @@ else PIPEWIRE_CONF_OPTS += -Dlibcamera=disabled endif +ifeq ($(BR2_PACKAGE_LILV),y) +PIPEWIRE_CONF_OPTS += -Dlv2=enabled +PIPEWIRE_DEPENDENCIES += lilv +else +PIPEWIRE_CONF_OPTS += -Dlv2=disabled +endif + ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y) PIPEWIRE_CONF_OPTS += -Dx11=enabled PIPEWIRE_DEPENDENCIES += xlib_libX11 -- 2.25.1 From kuzminov.sergey81 at gmail.com Sun Feb 13 05:14:10 2022 From: kuzminov.sergey81 at gmail.com (Sergey Kuzminov) Date: Sun, 13 Feb 2022 08:14:10 +0300 Subject: [Buildroot] [PATCH v4] configs/orangepi_zero_defconfig: switch to extlinux In-Reply-To: References: <20220206074853.25887-1-kuzminov.sergey81@gmail.com> Message-ID: <9441c983-821e-5f10-27f3-30d5705e365b@gmail.com> Hi Arnout, 13.02.2022 01:11, Arnout Vandecappelle: > > > On 06/02/2022 08:48, Sergey Kuzminov wrote: >> Changes: >> * Exclude FAT partition, it is no longer needed for U-Boot. >> * Switch the rootfs partition from MBR to GPT for partition-uuid to work. >> * Switch to extlinux, this is convenient for debugging. >> * Create common scenarios for multiple boards to create an SD image: >> board/orangepi/common. >> * Add BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y, remount root filesystem >> read-write during boot. >> >> Signed-off-by: Sergey Kuzminov >> --- >> V1->V2: >> * improved commit log >> * removed commented line in extlinux.conf >> * removed one boot option from extlinux.conf >> >> V2->V3: >> * improved commit log >> * removed comment from board/orangepi/common/genimage.cfg >> >> V3->V4: >> * fixed Signed-off-by position > > ?I think I'm going to use this commit message as an example for the > documentation... Well, if I ever get around to it :-) Giulio Benetti helped me. Thanks Giulio. > [snip] >> diff --git a/configs/orangepi_zero_defconfig >> b/configs/orangepi_zero_defconfig >> index 5aaa1566c5..96f0c3f600 100644 >> --- a/configs/orangepi_zero_defconfig >> +++ b/configs/orangepi_zero_defconfig >> @@ -20,10 +20,13 @@ 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_NEEDS_HOST_OPENSSL=y >> +BR2_LINUX_KERNEL_INSTALL_TARGET=y >> ? # Filesystem >> ? BR2_TARGET_ROOTFS_EXT2=y >> ? BR2_TARGET_ROOTFS_EXT2_4=y >> +BR2_TARGET_ROOTFS_EXT2_SIZE="63M" > > ?Why? Increase from 60M to 63M seems a bit odd... > > ?I removed this. Initially, 512 MB was in the genimage.cfg configuration. Beautifully obtained 1 MB (u-boot) + 63 MB (rootfs) = 64 MB (SD Card Image) :) >> +BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y > > ?We don't do this for any other defconfig. I removed this. > > > ?Applied to master, thanks. > > ?Regards, > ?Arnout > > >> ? # BR2_TARGET_ROOTFS_TAR is not set >> ? # Bootloader >> @@ -39,16 +42,12 @@ 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 >> ? # 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" >> ? # Wireless driver and firmware >> ? BR2_PACKAGE_XR819_XRADIO=y From thomas.petazzoni at bootlin.com Sun Feb 13 07:32:18 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 13 Feb 2022 07:32:18 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-02-12 Message-ID: <20220213073223.4C6B560AFA@smtp3.osuosl.org> Hello, Autobuild statistics for 2022-02-12 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 58 | 7 | 0 | 65 | 2021.11.x | 18 | 3 | 0 | 21 | master | 40 | 74 | 0 | 114 | Classification of failures by reason for master ----------------------------------------------- bluez5_utils-5.63 | 12 host-libselinux-3.3 | 10 host-python-docutils-0.15.2 | 5 host-python-xlrd-2.0.1 | 5 unknown | 5 frr-8.1 | 4 gerbera-1.9.2 | 4 host-python-pycryptodomex-3... | 3 host-bmap-tools-3.6 | 2 host-python-lxml-4.6.5 | 2 host-python-ply-3.11 | 2 bat-0.19.0 | 1 bird-2.0.8 | 1 boinc-7.18.1 | 1 cryptsetup-2.4.2 | 1 docker-cli-20.10.12 | 1 hackrf-2018.01.1 | 1 host-cxxtest-4.4 | 1 host-go-1.17.7 | 1 host-grpc-1.43.0 | 1 host-python-cython-0.29.27 | 1 host-python-greenlet-1.1.2 | 1 hostapd-2.10 | 1 mp4v2-5.0.1 | 1 pcsc-lite-1.9.5 | 1 poppler-21.12.0 | 1 python-docutils-0.15.2 | 1 qt5base-53a047c212af7fbded6... | 1 qt5webkit-5.212.0-alpha4 | 1 safeclib-3.7.1 | 1 target-finalize | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | bat-0.19.0 | NOK | http://autobuild.buildroot.net/results/8b0521c0a3fd1d74824fc86ad6972109957f45cc | mips64el | bird-2.0.8 | NOK | http://autobuild.buildroot.net/results/f0b7300fa2bc6bbeb0ee8afdc74c6ffd62bee477 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/fbe96c327b9db8da471683f634c5367899181651 | arc | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/dea45334d4c0b08a1042dc1eaa8f9f0aab676636 | arc | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/1c84bdfa8a9cb8eef32c1c6df06cd02b54d711c3 | x86_64 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/91c2549717e5bb331bf485e176e95db67f68d86b | i686 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/8e0576b7d22a74006d8bb754a6e4fd74d489bcc7 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/2991525b4696db6be2ac224e4ec825415cfa7022 | mips64el | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/2c91999fa26fba708bc71805acac386c31987452 | mipsel | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/44c21d737c9056e0772c21e32459a61342fdc876 | s390x | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/26f64ee265fe325ce4e4b6fe1585ebe5006da04b | xtensa | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/faa7a669ae0618e75c7bb8912e51c7fe1da1fe06 | nios2 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/727cc106331d517b1069854f877200b0ae09d3f9 | m68k | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/347d55ef864f68b2f62a088220b18b441635e9df | riscv64 | boinc-7.18.1 | NOK | http://autobuild.buildroot.net/results/b25fa43418e1c3bff1093ed6a82848626b6fe850 | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/35f7b82fb842f57de04a56139d7e939f8fb0e33a | x86_64 | docker-cli-20.10.12 | NOK | http://autobuild.buildroot.net/results/7dbe6fbe2c9afc3842805784065d64957bc424d3 | xtensa | frr-8.1 | NOK | http://autobuild.buildroot.net/results/d955325a2b63d890c6a1c8be2631ebe4f67bf49a | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/7a210063c2e4a3b290409d2dd20ae3ed1654953e | microblazeel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/3cdb50f5e5a1b3f37a6edcd4276fcbf015e28828 | xtensa | frr-8.1 | NOK | http://autobuild.buildroot.net/results/25ee913b551d04d79da6ad73d7fe901844cd62c4 | nios2 | gerbera-1.9.2 | NOK | http://autobuild.buildroot.net/results/b734a4e8ae8780f84d23045b40ec4415a891841e | x86_64 | gerbera-1.9.2 | NOK | http://autobuild.buildroot.net/results/0a1541ef3d87ccb704b8bcd2bb721f0ae206e214 | arc | gerbera-1.9.2 | NOK | http://autobuild.buildroot.net/results/2b679caf0dbcbf7e58bf3335beb4757c33db1337 | riscv64 | gerbera-1.9.2 | NOK | http://autobuild.buildroot.net/results/475752729af9943d5b52b3b55d670e4c7ea8e0a9 | sparc | hackrf-2018.01.1 | NOK | http://autobuild.buildroot.net/results/fd6eda3a52fc946cf9ccf71717e33825612ed08d | ORPH riscv64 | host-bmap-tools-3.6 | NOK | http://autobuild.buildroot.net/results/5bb82e762a764e2614826897fcc6d7535bc93fd9 | microblazeel | host-bmap-tools-3.6 | NOK | http://autobuild.buildroot.net/results/ff1ede12d623db3108e7a302cef5bcf71a9107a6 | sh4 | host-cxxtest-4.4 | NOK | http://autobuild.buildroot.net/results/4b680ad0ac4e7639dfba1558900601bb4d2d8ec6 | mips64el | host-go-1.17.7 | NOK | http://autobuild.buildroot.net/results/10186cd792cdd3ec4da8e97481e3a9f3a1ba6525 | powerpc64 | host-grpc-1.43.0 | NOK | http://autobuild.buildroot.net/results/38f9560a49522c23b278ca38e5c1b34020c238a3 | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/6b14d33ac67b94ecd44cd58f34e4e90e09737cdb | riscv64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/1c9eb8cad02c377f734b667e21cddf14c11d168a | aarch64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/e0eaacad3427e9fe488cce5f37eec0a81969f45b | or1k | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/e922fd0b251468ef6814fc03f9bf993aff119f0d | i686 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/2cf41a8aa6e118f3d0cb9598aad66f167c36fedf | mipsel | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/f4b7ed2e54411b5342ae1705e846b2e1570a8e9f | powerpc64le | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/e29cefe0d8b62656733cbc5cccd58581dbb6767b | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/49eda3af5d1a48249d345560464ed6c9c227e534 | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/a21c50dc9e68ef42c7252b3a99b42b8812d1dceb | arc | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/13b4181b5f5b332ee60c3310da1df904819873f9 | sparc | host-python-cython-0.29.27 | NOK | http://autobuild.buildroot.net/results/2166e3fa2b132831d56cc8102c49307034b490b0 | mips64el | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/d4a3df11a627495a2d39028c9da1f80c2de89b2d | aarch64 | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/f86fa61635afaef94bbadd904991ca8f03d8d1a5 | arc | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/3d5fbd6be33234b07c4c4d4728f213bd687a2c2b | xtensa | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/0082cfa8a18895172f4bed7368ead6172b68f566 | or1k | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/325a0dcf9a56c6448c3547a335fe57c64c5d00dd | i686 | host-python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/cf81c380f4838c4d8d83843307dfae8060c7b8b5 | m68k | host-python-lxml-4.6.5 | NOK | http://autobuild.buildroot.net/results/8a9af7bae77bc67555a3a2d72214da988ce63a6c | powerpc | host-python-lxml-4.6.5 | NOK | http://autobuild.buildroot.net/results/3bc400c783cf8046f26512b2d84c73941b6c672d | arm | host-python-ply-3.11 | NOK | http://autobuild.buildroot.net/results/28abf0e40d8ea0260d427dfd77488e40ffcc4167 | powerpc64 | host-python-ply-3.11 | NOK | http://autobuild.buildroot.net/results/f832b4ced36cc803f27ff27b06a7a5ef039dbb8b | mips64el | host-python-pycryptodomex-3... | NOK | http://autobuild.buildroot.net/results/9fcc9a7fe2387c9c4716ff798af0defda963a1eb | nios2 | host-python-pycryptodomex-3... | NOK | http://autobuild.buildroot.net/results/6dc1023eb1560e80acf0bf4ad003a58a2a688b97 | arm | host-python-pycryptodomex-3... | NOK | http://autobuild.buildroot.net/results/dfe9cc566ea86b0325367087ea3b0637fd3bca4b | arm | host-python-xlrd-2.0.1 | NOK | http://autobuild.buildroot.net/results/85d0ddd3b769b253854959f31f33852fd222f8d8 | sh4 | host-python-xlrd-2.0.1 | NOK | http://autobuild.buildroot.net/results/eea867ea6d46688a887307a5f78587db56d08fd2 | m68k | host-python-xlrd-2.0.1 | NOK | http://autobuild.buildroot.net/results/18790a618a64650e6ed079c5b9dfe71588b72846 | nios2 | host-python-xlrd-2.0.1 | NOK | http://autobuild.buildroot.net/results/3b6e34cd213863e13873891ba899676e2eddf7e6 | arm | host-python-xlrd-2.0.1 | NOK | http://autobuild.buildroot.net/results/0d47442028c3e95aec8392b109d5c5dfbed4728f | arm | hostapd-2.10 | NOK | http://autobuild.buildroot.net/results/3f8058ee6f3913fda795578f206db895731ba1e6 | arm | mp4v2-5.0.1 | NOK | http://autobuild.buildroot.net/results/9a3095852c93c30795cf6579cafbbc6ea8095308 | ORPH sparc | pcsc-lite-1.9.5 | NOK | http://autobuild.buildroot.net/results/6abb9f976f7ca61e266dc824befcc7dbfe77c68d | ORPH xtensa | poppler-21.12.0 | NOK | http://autobuild.buildroot.net/results/7a3452edbf7e610658bd6f829b7e7aab5f831cbe | s390x | python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/679ce46b9712b6bd23f32cc4153c28369eb427d9 | riscv32 | qt5base-53a047c212af7fbded6... | NOK | http://autobuild.buildroot.net/results/83778f1d9ed30d2a71b052e0a49db0fc35065da1 | arm | qt5webkit-5.212.0-alpha4 | NOK | http://autobuild.buildroot.net/results/17065373b8dfc9545e6c7e6d1ad7c23562a27550 | arm | safeclib-3.7.1 | NOK | http://autobuild.buildroot.net/results/5c3468585942879b47331e05058d25d324c8cc23 | nios2 | target-finalize | NOK | http://autobuild.buildroot.net/results/ee5d43d31bbbd54bf462c9ddc2908af63d4b6893 | arm | unknown | NOK | http://autobuild.buildroot.net/results/2b41ea89a665c2cb6aee459a1259a2d126dbe0a8 | arm | unknown | NOK | http://autobuild.buildroot.net/results/8a7a5806ed4f54796f240aaeebb3dc8d19918010 | arm | unknown | NOK | http://autobuild.buildroot.net/results/0a5d9cf528ca86dcf04a614525a9ea1dd29e2ef5 | arm | unknown | NOK | http://autobuild.buildroot.net/results/ad847cbf0cdfe568707ec3354956d89d30eaef04 | mipsel | unknown | NOK | http://autobuild.buildroot.net/results/9a4f1f3489b4b4788e74b6b5e565c135cc40bc3f | Classification of failures by reason for 2021.02.x -------------------------------------------------- gensio-2.2.3 | 2 host-sentry-cli-1.57.0 | 2 glib-networking-2.66.0 | 1 openldap-2.4.59 | 1 piglit-2affee53f3ad7a96f5b3... | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- riscv32 | gensio-2.2.3 | NOK | http://autobuild.buildroot.net/results/947596cdffbaa12c30046410d4245b27f7b9e11f | riscv32 | gensio-2.2.3 | NOK | http://autobuild.buildroot.net/results/cb29c7c2bb9ef0a02679d93087b3712ba31397eb | riscv32 | glib-networking-2.66.0 | NOK | http://autobuild.buildroot.net/results/64deca9250fce6a5a85a1989179c845919722b88 | ORPH i686 | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/cedfcb3f3dbe169606a7f421ba742c5f1a59fc58 | mips64el | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/6517803de9962ec04026a7e2f776390ff31891a8 | riscv32 | openldap-2.4.59 | NOK | http://autobuild.buildroot.net/results/bc35ab69838aba23bbd568c3d6375489aca1cd09 | aarch64 | piglit-2affee53f3ad7a96f5b3... | NOK | http://autobuild.buildroot.net/results/28f3a4ded772577d5f01c942538ec13bc2036889 | Classification of failures by reason for 2021.11.x -------------------------------------------------- wavemon-0.9.4 | 2 libvirt-7.7.0 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- x86_64 | libvirt-7.7.0 | NOK | http://autobuild.buildroot.net/results/c371bd49968e8156fba0bbc436d3306a1aca911c | riscv64 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/8c18092143a88af7760cadedf5b44eda6c2241c5 | x86_64 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/4d3f2817062782d1e64647d355909dbdd34465a1 | -- http://autobuild.buildroot.net From Eugen.Hristev at microchip.com Sun Feb 13 07:51:05 2022 From: Eugen.Hristev at microchip.com (Eugen.Hristev at microchip.com) Date: Sun, 13 Feb 2022 07:51:05 +0000 Subject: [Buildroot] [PATCH v3 0/2] Fix gitlab CI build failure due to missing HOST_ dependencies In-Reply-To: References: <20220206115156.6042cc1b@windsurf> <20220206112620.1637342-1-giulio.benetti@benettiengineering.com> Message-ID: <79d7d2a5-d915-3838-2771-37604ee9a835@microchip.com> On 2/13/22 12:17 AM, Arnout Vandecappelle wrote: > On 06/02/2022 12:26, Giulio Benetti wrote: >> This patchset fixes the gitlab build failure due to HOST_ >> dependencies(uboot/linux). >> >> V1->V2: >> * add missing host openssl for linux on >> microchip_sama7g5ek_mmc_defconfig/_dev_defconfig >> V2->V3: >> * add specific custom linux version as suggested by Thomas >> >> Giulio Benetti (2): >> ?? configs/microchip_sama7g5ek_mmc_defconfig: set custom linux version to >> ???? 5.15.21 and add host openssl for linux >> ?? configs/microchip_sama7g5ek_mmc_dev_defconfig: set custom linux >> ???? version to 5.15.21 and add host openssl for linux > > ?Both applied to master, thanks. > > ?The entropy issue can be resolved later. I already sent another patch to fix that. Please have a look. Thanks ! Eugen > > ?Regards, > ?Arnout > >> >> ? configs/microchip_sama7g5ek_mmc_defconfig???? | 4 ++++ >> ? configs/microchip_sama7g5ek_mmc_dev_defconfig | 4 ++++ >> ? 2 files changed, 8 insertions(+) >> From peter at korsgaard.com Sun Feb 13 08:18:12 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Feb 2022 09:18:12 +0100 Subject: [Buildroot] [PATCH] configs/beelink_gs1: select BR2_TARGET_UBOOT_NEEDS_OPENSSL In-Reply-To: <20220212111710.22559-1-peron.clem@gmail.com> (=?utf-8?Q?=22C?= =?utf-8?Q?l=C3=A9ment_P=C3=A9ron=22's?= message of "Sat, 12 Feb 2022 12:17:10 +0100") References: <20220212111710.22559-1-peron.clem@gmail.com> Message-ID: <87leyfmb7f.fsf@dell.be.48ers.dk> >>>>> "Cl?ment" == Cl?ment P?ron 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/2076475033 > Signed-off-by: Cl?ment P?ron Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 13 08:17:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Feb 2022 09:17:32 +0100 Subject: [Buildroot] [git commit] configs/beelink_gs1: select BR2_TARGET_UBOOT_NEEDS_OPENSSL Message-ID: <20220213083309.8A11781DB5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=93d751217ee4cc18ebe48138ee4e712b5224fcf7 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/2076475033 Signed-off-by: Cl??ment P??ron Signed-off-by: Peter Korsgaard --- configs/beelink_gs1_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/beelink_gs1_defconfig b/configs/beelink_gs1_defconfig index aa8a2cfb6b..d4682d6b7c 100644 --- a/configs/beelink_gs1_defconfig +++ b/configs/beelink_gs1_defconfig @@ -34,6 +34,7 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y 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_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y From bernd.kuhls at t-online.de Sun Feb 13 09:15:32 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 13 Feb 2022 10:15:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/{mesa3d, mesa3d-headers}: bump version to 21.3.6 Message-ID: <20220213091532.1260695-1-bernd.kuhls@t-online.de> Release notes: https://lists.freedesktop.org/archives/mesa-announce/2022-February/000663.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 871cf2f495..c8573fafad 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.5 +MESA3D_HEADERS_VERSION = 21.3.6 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 e36d798e21..d64b833100 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/000660.html -sha256 d93b2a9d2464ee856d7637a07dff6b7cd950f295ad58518bb959f76882cf4a4c mesa-21.3.5.tar.xz -sha512 417d1787f8177567f0c547dde3e24212f7497f2fe7cdaa945fe998cd61ec0e9eb9388feb444e377c4fd8794b056af02aac28d1bbfb9527844391ba49e6893933 mesa-21.3.5.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2022-February/000663.html +sha256 96bb761fd546e9aa41d025fcc025225c5668443839dae21e3731959beb096736 mesa-21.3.6.tar.xz +sha512 8c930e04eade29f689384ee7d6e2f178acbbf30fa6c9fdf132281279658c3c221ec7f9b1318e3c0a654c6136f925a5c0a35eaf849b65db7674641127c71e8a4f mesa-21.3.6.tar.xz # License sha256 998437f3f75f0c542046f83c1cb349408122268168fb13eb4ae6967aa18b7d98 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 5f080ff5fc..95618b2072 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.5 +MESA3D_VERSION = 21.3.6 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 Sun Feb 13 09:16:50 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 13 Feb 2022 10:16:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi: fix buld with python-3.10 Message-ID: <20220213091650.1260849-1-bernd.kuhls@t-online.de> Fixes build error: CMake Error at /usr/share/cmake-3.18/Modules/FindPackageHandleStandardArgs.cmake:165 (message): Could NOT find PythonLibs (missing: PYTHON_LIBRARIES) (found suitable version "3.10.2", minimum required is "3.5") Signed-off-by: Bernd Kuhls --- package/kodi/0002-cmake-findpython.patch | 135 ++++++++++++++++++ ...-cmake-search-for-python-interpreter.patch | 48 +++++++ ...-allow-to-override-PYTHON_EXECUTABLE.patch | 39 +++++ package/kodi/kodi.mk | 4 + 4 files changed, 226 insertions(+) create mode 100644 package/kodi/0002-cmake-findpython.patch create mode 100644 package/kodi/0003-cmake-search-for-python-interpreter.patch create mode 100644 package/kodi/0004-cmake-allow-to-override-PYTHON_EXECUTABLE.patch diff --git a/package/kodi/0002-cmake-findpython.patch b/package/kodi/0002-cmake-findpython.patch new file mode 100644 index 0000000000..60728aa465 --- /dev/null +++ b/package/kodi/0002-cmake-findpython.patch @@ -0,0 +1,135 @@ +From 52f44ec5c7b728a6afaca867e8d815fced2012ec Mon Sep 17 00:00:00 2001 +From: fuzzard +Date: Sat, 31 Jul 2021 19:22:08 +1000 +Subject: [PATCH] [cmake] findpython + +use cmakes (3.12+) FindPython3 module. +Provide cmake vars for user to overide specific version, and search path + +Backport of https://github.com/xbmc/xbmc/pull/20045 + +Patch sent upstream: https://github.com/xbmc/xbmc/pull/20989 + +Signed-off-by: Bernd Kuhls +--- + CMakeLists.txt | 4 +- + cmake/modules/FindPython.cmake | 71 ++++++++++++++++++++++++++-------- + 2 files changed, 56 insertions(+), 19 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2d5369798d..9bed54ef40 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.4) ++cmake_minimum_required(VERSION 3.12) + if(WIN32) + # Version 3.15 is required to use "PREPEND" for dependencies + cmake_minimum_required(VERSION 3.15) +@@ -187,8 +187,6 @@ core_require_dep(${required_deps}) + find_package(TexturePacker REQUIRED) + find_package(JsonSchemaBuilder REQUIRED) + +-SET(PYTHON_VERSION 3.8) +- + if(ENABLE_MARIADBCLIENT AND NOT ENABLE_MARIADBCLIENT STREQUAL AUTO AND ENABLE_MYSQLCLIENT AND NOT ENABLE_MYSQLCLIENT STREQUAL AUTO) + MESSAGE(FATAL_ERROR "You can not use MySql and MariaDB at the same time. Disable one by adding -DENABLE_MYSQLCLIENT=OFF or -DENABLE_MARIADBCLIENT=OFF.") + elseif(ENABLE_MYSQLCLIENT AND NOT ENABLE_MYSQLCLIENT STREQUAL AUTO) +diff --git a/cmake/modules/FindPython.cmake b/cmake/modules/FindPython.cmake +index c40e12d551..35220b5426 100644 +--- a/cmake/modules/FindPython.cmake ++++ b/cmake/modules/FindPython.cmake +@@ -1,17 +1,56 @@ +-# - Try to find python +-# Once done this will define ++# FindPython ++# -------- ++# Finds Python3 libraries ++# ++# This module will search for the required python libraries on the system ++# If multiple versions are found, the highest version will be used. ++# ++# -------- ++# ++# the following variables influence behaviour: ++# ++# PYTHON_PATH - use external python not found in system paths ++# usage: -DPYTHON_PATH=/path/to/python/lib ++# PYTHON_VER - use exact python version, fail if not found ++# usage: -DPYTHON_VER=3.8 ++# ++# -------- ++# ++# This module will define the following variables: + # + # PYTHON_FOUND - system has PYTHON ++# PYTHON_VERSION - Python version number (Major.Minor) + # PYTHON_INCLUDE_DIRS - the python include directory + # PYTHON_LIBRARIES - The python libraries ++# PYTHON_LDFLAGS - Python provided link options ++# ++# -------- ++# ++ ++# for Depends builds, set search root dir to depends path ++if(KODI_DEPENDSBUILD) ++ set(Python3_USE_STATIC_LIBS TRUE) ++ set(Python3_ROOT_DIR ${DEPENDS_PATH}/lib) ++endif() ++ ++# Provide root dir to search for Python if provided ++if(PYTHON_PATH) ++ set(Python3_ROOT_DIR ${PYTHON_PATH}) ++ ++ # unset cache var so we can generate again with a different dir (or none) if desired ++ unset(PYTHON_PATH CACHE) ++endif() ++ ++# Set specific version of Python to find if provided ++if(PYTHON_VER) ++ set(VERSION ${PYTHON_VER}) ++ set(EXACT_VER "EXACT") + +-if(PKG_CONFIG_FOUND) +- pkg_check_modules(PC_PYTHON python3>=3.5 QUIET) ++ # unset cache var so we can generate again with a different ver (or none) if desired ++ unset(PYTHON_VER CACHE) + endif() + +-find_program(PYTHON_EXECUTABLE python3 ONLY_CMAKE_FIND_ROOT_PATH) +-find_library(PYTHON_LIBRARY NAMES python3.9 python3.8 python3.7 python3.6 python3.5 PATHS ${PC_PYTHON_LIBDIR}) +-find_path(PYTHON_INCLUDE_DIR NAMES Python.h PATHS ${PC_PYTHON_INCLUDE_DIRS} PATH_SUFFIXES python3.9 python3.8 python3.7 python3.6 python3.5) ++find_package(Python3 ${VERSION} ${EXACT_VER} COMPONENTS Development) + + if(KODI_DEPENDSBUILD) + find_library(FFI_LIBRARY ffi REQUIRED) +@@ -27,17 +66,17 @@ if(KODI_DEPENDSBUILD) + endif() + endif() + +- set(PYTHON_LIBRARIES ${PYTHON_LIBRARY} ${FFI_LIBRARY} ${EXPAT_LIBRARY} ${INTL_LIBRARY} ${GMP_LIBRARY} ${PYTHON_DEP_LIBRARIES}) +-else() +- find_package(PythonLibs 3.5 REQUIRED) +- list(APPEND PYTHON_LIBRARIES ${PC_PYTHON_STATIC_LIBRARIES}) ++ list(APPEND Python3_LIBRARIES ${FFI_LIBRARY} ${EXPAT_LIBRARY} ${INTL_LIBRARY} ${GMP_LIBRARY} ${PYTHON_DEP_LIBRARIES}) + endif() + +-include(FindPackageHandleStandardArgs) +-find_package_handle_standard_args(Python REQUIRED_VARS PYTHON_INCLUDE_DIR PYTHON_LIBRARY PYTHON_LIBRARIES) +-if(PYTHON_FOUND) +- set(PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_DIR}) ++if(Python3_FOUND) + list(APPEND PYTHON_DEFINITIONS -DHAS_PYTHON=1) ++ # These are all set for easy integration with the rest of our build system ++ set(PYTHON_FOUND ${Python3_FOUND}) ++ set(PYTHON_INCLUDE_DIRS ${Python3_INCLUDE_DIRS}) ++ set(PYTHON_LIBRARIES ${Python3_LIBRARIES}) ++ set(PYTHON_VERSION "${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}" CACHE INTERNAL "" FORCE) ++ set(PYTHON_LDFLAGS ${Python3_LINK_OPTIONS}) + endif() + +-mark_as_advanced(PYTHON_EXECUTABLE PYTHON_INCLUDE_DIRS PYTHON_INCLUDE_DIR PYTHON_LIBRARY PYTHON_LIBRARIES PYTHON_LDFLAGS FFI_LIBRARY EXPAT_LIBRARY INTL_LIBRARY GMP_LIBRARY) ++mark_as_advanced(PYTHON_EXECUTABLE PYTHON_VERSION PYTHON_INCLUDE_DIRS PYTHON_LDFLAGS FFI_LIBRARY EXPAT_LIBRARY INTL_LIBRARY GMP_LIBRARY) +-- +2.30.2 + diff --git a/package/kodi/0003-cmake-search-for-python-interpreter.patch b/package/kodi/0003-cmake-search-for-python-interpreter.patch new file mode 100644 index 0000000000..158345a212 --- /dev/null +++ b/package/kodi/0003-cmake-search-for-python-interpreter.patch @@ -0,0 +1,48 @@ +From 6bb112e585f2ffd10e5af70ca28159dd235d063b Mon Sep 17 00:00:00 2001 +From: wsnipex +Date: Thu, 19 Aug 2021 08:50:05 +0200 +Subject: [PATCH] [cmake] search for python interpreter fixes installing + eventclients on linux + +Backport of https://github.com/xbmc/xbmc/pull/20058 + +Patch sent upstream: https://github.com/xbmc/xbmc/pull/20989 + +Signed-off-by: Bernd Kuhls +--- + cmake/modules/FindPython.cmake | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/cmake/modules/FindPython.cmake b/cmake/modules/FindPython.cmake +index 35220b5426..c469ed9fb6 100644 +--- a/cmake/modules/FindPython.cmake ++++ b/cmake/modules/FindPython.cmake +@@ -20,6 +20,7 @@ + # + # PYTHON_FOUND - system has PYTHON + # PYTHON_VERSION - Python version number (Major.Minor) ++# PYTHON_EXECUTABLE - Python interpreter binary + # PYTHON_INCLUDE_DIRS - the python include directory + # PYTHON_LIBRARIES - The python libraries + # PYTHON_LDFLAGS - Python provided link options +@@ -51,6 +52,9 @@ if(PYTHON_VER) + endif() + + find_package(Python3 ${VERSION} ${EXACT_VER} COMPONENTS Development) ++if(CORE_SYSTEM_NAME STREQUAL linux) ++ find_package(Python3 ${VERSION} ${EXACT_VER} COMPONENTS Interpreter) ++endif() + + if(KODI_DEPENDSBUILD) + find_library(FFI_LIBRARY ffi REQUIRED) +@@ -73,6 +77,7 @@ if(Python3_FOUND) + list(APPEND PYTHON_DEFINITIONS -DHAS_PYTHON=1) + # These are all set for easy integration with the rest of our build system + set(PYTHON_FOUND ${Python3_FOUND}) ++ set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE} CACHE FILEPATH "Python interpreter" FORCE) + set(PYTHON_INCLUDE_DIRS ${Python3_INCLUDE_DIRS}) + set(PYTHON_LIBRARIES ${Python3_LIBRARIES}) + set(PYTHON_VERSION "${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}" CACHE INTERNAL "" FORCE) +-- +2.30.2 + diff --git a/package/kodi/0004-cmake-allow-to-override-PYTHON_EXECUTABLE.patch b/package/kodi/0004-cmake-allow-to-override-PYTHON_EXECUTABLE.patch new file mode 100644 index 0000000000..d1e9b3f25f --- /dev/null +++ b/package/kodi/0004-cmake-allow-to-override-PYTHON_EXECUTABLE.patch @@ -0,0 +1,39 @@ +From 25681d8adde4a90d5da02051e30f6a3a27322136 Mon Sep 17 00:00:00 2001 +From: Jernej Skrabec +Date: Sat, 25 Sep 2021 07:41:10 +0200 +Subject: [PATCH] [cmake] allow to override PYTHON_EXECUTABLE + +If Kodi is being build for distro which has different python version +than host, PYTHON_EXECUTABLE must be overriden and point to distro +version. Otherwise, eventclients will be installed in wrong location and +be thus unusable. + +Use case: Cross compiling Kodi for LibreELEC + +Backport of https://github.com/xbmc/xbmc/pull/20171 + +Patch sent upstream: https://github.com/xbmc/xbmc/pull/20989 + +Signed-off-by: Bernd Kuhls +--- + cmake/modules/FindPython.cmake | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/cmake/modules/FindPython.cmake b/cmake/modules/FindPython.cmake +index c469ed9fb6..87b8368705 100644 +--- a/cmake/modules/FindPython.cmake ++++ b/cmake/modules/FindPython.cmake +@@ -77,7 +77,9 @@ if(Python3_FOUND) + list(APPEND PYTHON_DEFINITIONS -DHAS_PYTHON=1) + # These are all set for easy integration with the rest of our build system + set(PYTHON_FOUND ${Python3_FOUND}) +- set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE} CACHE FILEPATH "Python interpreter" FORCE) ++ if(NOT PYTHON_EXECUTABLE) ++ set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE} CACHE FILEPATH "Python interpreter" FORCE) ++ endif() + set(PYTHON_INCLUDE_DIRS ${Python3_INCLUDE_DIRS}) + set(PYTHON_LIBRARIES ${Python3_LIBRARIES}) + set(PYTHON_VERSION "${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}" CACHE INTERNAL "" FORCE) +-- +2.30.2 + diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index a2c42b64c9..67459f4ccb 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -76,6 +76,10 @@ KODI_CONF_OPTS += \ -DNATIVEPREFIX=$(HOST_DIR) \ -DDEPENDS_PATH=$(STAGING_DIR)/usr \ -DENABLE_TESTING=OFF \ + -DPYTHON_EXECUTABLE=$(HOST_DIR)/usr/bin/python3 \ + -DPYTHON_INCLUDE_DIRS=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ + -DPYTHON_PATH=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR) \ + -DPYTHON_VER=$(PYTHON3_VERSION_MAJOR) \ -DWITH_JSONSCHEMABUILDER=$(HOST_DIR)/bin/JsonSchemaBuilder \ -DWITH_TEXTUREPACKER=$(HOST_DIR)/bin/TexturePacker \ -DLIBDVDCSS_URL=$(KODI_DL_DIR)/kodi-libdvdcss-$(KODI_LIBDVDCSS_VERSION).tar.gz \ -- 2.30.2 From arnout at mind.be Sun Feb 13 10:39:57 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 11:39:57 +0100 Subject: [Buildroot] [PATCH] manual: board support: add instructions to test defconfig in the official docker In-Reply-To: References: <20220203235438.610277-1-giulio.benetti@benettiengineering.com> Message-ID: On 12/02/2022 23:56, Luca Ceresoli wrote: > Hi Giulio, > > On 04/02/22 00:54, Giulio Benetti wrote: >> Often new boards have not been tested with official docker so let's add >> instructions to do it. > > Thank you, I think this is a very useful addition to the documentation! > However I would suggest some changes for it to look more "professional". > >> Signed-off-by: Giulio Benetti >> --- >> docs/manual/adding-board-support.txt | 22 ++++++++++++++++++++++ >> 1 file changed, 22 insertions(+) >> >> diff --git a/docs/manual/adding-board-support.txt b/docs/manual/adding-board-support.txt >> index 33ed709535..f5fb3af371 100644 >> --- a/docs/manual/adding-board-support.txt >> +++ b/docs/manual/adding-board-support.txt >> @@ -46,3 +46,25 @@ create a directory +board/+ and a subdirectory >> +board//+. You can then store your patches >> and configurations in these directories, and reference them from the main >> Buildroot configuration. Refer to xref:customize[] for more details. >> + >> +Before submitting patches for new boards it would be better to test it > > "it would be better" -> "it is recommended". > >> +by building it using .gitlab-ci.yml specified docker. For example at the > > I think this should be reworded in a simpler way: "by building it using > the docker specified in .gitlab-ci.yml". > > BTW as I am a docker newbie: is it common to say "the docker"? Or would > "the docker container" be more correct? -- By comparison, I would never > say "using the virtualbox" but rather "using the virtualbox machine". I would say "the container" since you can use it with any container manager that follows the OCI spec. > >> +time of this writing the docker is: > > Remove the ':' from this line, or you'll have multiple ':' per line, > which looks awkward. > >> +$CI_REGISTRY/buildroot.org/buildroot/base:20220105.2314 > > Hm, this string is already old. Actually, this part of the documentation is already superseded since we now have utils/docker-run that does everything. > There's no sane way to keep docs and > .yml in sync. I wonder whether we should have in the manual a command > line that always use the current string, such as: > > DOCKER_IMAGE=$(cat .gitlab-ci.yml | \ > sed -n '/^image/s/^.*CI_REGISTRY/registry.gitlab.com/p') > docker pull $DOCKER_IMAGE > sudo docker run -it $DOCKER_IMAGE > > However I must admit this is not very readable in the docs... :( What > about adding a simple script (utils/run-docker?) that does the trick and > just mention that in the docs? > >> +so: > > Add an empty line here, so that the output separates from the next line. > >> +Pull the docker: >> +-------------------- >> + $ docker pull registry.gitlab.com/buildroot.org/buildroot/base:20220105.2314 > > Missing 'sudo'? Docker access is usually managed through the "docker" group rather than sudo. And if you use podman as docker replacement, it can even be done in an unprivileged container. Not that I tried it, but I think so. Oh BTW, the pull is in fact not needed, both podman and docker pull automatically when you start a container. That's the reason the container name is so convoluted. > >> +-------------------- > > Add an empty line here. This has no effect on the output but makes > source code more readable. > >> +Run the docker: >> +-------------------- >> + $ sudo docker run -it registry.gitlab.com/buildroot.org/buildroot/base:20220105.2314 /bin/bash >> +-------------------- > > As above, add an empty line here. > >> +Inside the docker hint: >> +-------------------- >> + $ git clone git://git.busybox.net/buildroot >> + $ cd buildroot >> + $ make +_defconfig+ >> + $ make >> +-------------------- > > As above, add an empty line here. > >> +Wait until build finishes and eventually add host dependencies. > > If I understand what you mean here, it should be "and add host > dependencies if needed" ("eventually" is not the english translation of > italian "eventualmente"). If my understanding is correct, I don't find > this sentence very useful: a docker newbie perhaps doesn't know how to > add a host dependency (and maybe not even how to understand that they > are missing one). > > I would just remove this line, but if you think it is very important I'd > clarify it, maybe with some examples. Yes, I think this is what triggered the addition of this documentation. If you have e.g. libopenssl-dev installed on your build host, then you usually won't notice in your test builds that a dependency on host-openssl is needed. So test builds should be done in a minimal container. Unfortunately, the buildroot/base container is not exactly minimal. It's really what is meant to be used for running CI tests, not exactly what is needed for build tests. Ideally, we'd have - an absolutely minimal container that can be used for build tests - ideally in a couple of variants for different distros; - a container for CI; - a more complete container you could use for development, though I can't immediately think of extra stuff you'd want in there (but then, I wouldn't use a container for development). Regards, Arnout From arnout at mind.be Sun Feb 13 10:43:48 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 11:43:48 +0100 Subject: [Buildroot] [PATCH v4] configs/orangepi_zero_defconfig: switch to extlinux In-Reply-To: <9441c983-821e-5f10-27f3-30d5705e365b@gmail.com> References: <20220206074853.25887-1-kuzminov.sergey81@gmail.com> <9441c983-821e-5f10-27f3-30d5705e365b@gmail.com> Message-ID: On 13/02/2022 06:14, Sergey Kuzminov wrote: > Hi Arnout, > > 13.02.2022 01:11, Arnout Vandecappelle: >> >> >> On 06/02/2022 08:48, Sergey Kuzminov wrote: >>> Changes: >>> * Exclude FAT partition, it is no longer needed for U-Boot. >>> * Switch the rootfs partition from MBR to GPT for partition-uuid to work. >>> * Switch to extlinux, this is convenient for debugging. >>> * Create common scenarios for multiple boards to create an SD image: >>> board/orangepi/common. >>> * Add BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y, remount root filesystem >>> read-write during boot. >>> >>> Signed-off-by: Sergey Kuzminov >>> --- >>> V1->V2: >>> * improved commit log >>> * removed commented line in extlinux.conf >>> * removed one boot option from extlinux.conf >>> >>> V2->V3: >>> * improved commit log >>> * removed comment from board/orangepi/common/genimage.cfg >>> >>> V3->V4: >>> * fixed Signed-off-by position >> >> ??I think I'm going to use this commit message as an example for the >> documentation... Well, if I ever get around to it :-) > > Giulio Benetti helped me. Thanks Giulio. > >> [snip] >>> diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig >>> index 5aaa1566c5..96f0c3f600 100644 >>> --- a/configs/orangepi_zero_defconfig >>> +++ b/configs/orangepi_zero_defconfig >>> @@ -20,10 +20,13 @@ 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_NEEDS_HOST_OPENSSL=y >>> +BR2_LINUX_KERNEL_INSTALL_TARGET=y >>> ? # Filesystem >>> ? BR2_TARGET_ROOTFS_EXT2=y >>> ? BR2_TARGET_ROOTFS_EXT2_4=y >>> +BR2_TARGET_ROOTFS_EXT2_SIZE="63M" >> >> ??Why? Increase from 60M to 63M seems a bit odd... >> >> ??I removed this. > > Initially, 512 MB was in the genimage.cfg configuration. Beautifully obtained 1 > MB (u-boot) + 63 MB (rootfs) = 64 MB (SD Card Image) :) An SD card labelled as 64MB would typically have about 60-62MB of actual space, the rest being used for spares for bad blocks. That's why we use 60M as the default. Regards, Arnout > >>> +BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y >> >> ??We don't do this for any other defconfig. I removed this. >> >> >> ??Applied to master, thanks. >> >> ??Regards, >> ??Arnout >> >> >>> ? # BR2_TARGET_ROOTFS_TAR is not set >>> ? # Bootloader >>> @@ -39,16 +42,12 @@ 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 >>> ? # 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" >>> ? # Wireless driver and firmware >>> ? BR2_PACKAGE_XR819_XRADIO=y > From arnout at mind.be Sun Feb 13 10:47:48 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 11:47:48 +0100 Subject: [Buildroot] [PATCH] configs/microchip_sama7g5ek_mmc_dev_defconfig: add rng tools In-Reply-To: <20220211140855.917229-1-eugen.hristev@microchip.com> References: <20220211140855.917229-1-eugen.hristev@microchip.com> Message-ID: <92785a1f-9323-9d54-b7a6-8b0c40d6bd92@mind.be> On 11/02/2022 15:08, Eugen Hristev via buildroot wrote: > Add rng tools. Without this, when booting, prompt will not > appear until 'random: crng init done' appears. > Avoid this by using rng tools without the libjitterentropy. > Libjitterentropy is a jitter source of entropy which does > not help for AT91 cpus as the jitter does not have > enough variance to generate fast enough entropy. > > Signed-off-by: Eugen Hristev Applied to master, thanks. Regards, Arnout > --- > Hi, > > This should go for 2022.02 in my opinion. > > Thanks, > > configs/microchip_sama7g5ek_mmc_dev_defconfig | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/configs/microchip_sama7g5ek_mmc_dev_defconfig b/configs/microchip_sama7g5ek_mmc_dev_defconfig > index 3253bce401..895e63edcd 100644 > --- a/configs/microchip_sama7g5ek_mmc_dev_defconfig > +++ b/configs/microchip_sama7g5ek_mmc_dev_defconfig > @@ -27,6 +27,8 @@ BR2_PACKAGE_MMC_UTILS=y > BR2_PACKAGE_MTD=y > BR2_PACKAGE_WILC1000_FIRMWARE=y > BR2_PACKAGE_EVTEST=y > +BR2_PACKAGE_RNG_TOOLS=y > +# BR2_PACKAGE_RNG_TOOLS_JITTERENTROPY_LIBRARY is not set > BR2_PACKAGE_SETSERIAL=y > BR2_PACKAGE_SPI_TOOLS=y > BR2_PACKAGE_USBUTILS=y From arnout at mind.be Sun Feb 13 10:48:18 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 11:48:18 +0100 Subject: [Buildroot] [PATCH] configs/microchip_sam9x60ek_mmc_dev_defconfig: expand rootfs size to 120M In-Reply-To: <20220202155821.4038299-1-giulio.benetti@benettiengineering.com> References: <20220202155821.4038299-1-giulio.benetti@benettiengineering.com> Message-ID: <4f066fcb-2d9a-488c-1e95-d8e24dbb935c@mind.be> On 02/02/2022 16:58, Giulio Benetti wrote: > Default 60M for rootfs are not enough and generate a build failure, so > let's expand rootfs size to 120M. > > Fixes: > https://gitlab.com/ymorin/buildroot/-/jobs/2035821088 > > Signed-off-by: Giulio Benetti Applied to master, thanks. Regards, Arnout > --- > configs/microchip_sam9x60ek_mmc_dev_defconfig | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/configs/microchip_sam9x60ek_mmc_dev_defconfig b/configs/microchip_sam9x60ek_mmc_dev_defconfig > index da1bd33dd3..00ccd784b5 100644 > --- a/configs/microchip_sam9x60ek_mmc_dev_defconfig > +++ b/configs/microchip_sam9x60ek_mmc_dev_defconfig > @@ -7,6 +7,7 @@ BR2_TARGET_GENERIC_HOSTNAME="sam9x60ek" > BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y > BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/microchip/sam9x60ek_mmc/genimage.cfg" > +BR2_TARGET_ROOTFS_EXT2_SIZE=120M > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,linux4microchip-2021.10)/linux-linux4microchip-2021.10.tar.gz" From arnout at mind.be Sun Feb 13 10:45:26 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 11:45:26 +0100 Subject: [Buildroot] [git commit] configs/microchip_sama7g5ek_mmc_dev_defconfig: add rng tools Message-ID: <20220213104101.503F782815@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bc54915cebf609b4b4b2037f9ba6464ff2a7e9f3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add rng tools. Without this, when booting, prompt will not appear until 'random: crng init done' appears. Avoid this by using rng tools without the libjitterentropy. Libjitterentropy is a jitter source of entropy which does not help for AT91 cpus as the jitter does not have enough variance to generate fast enough entropy. Signed-off-by: Eugen Hristev Reviewed-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- configs/microchip_sama7g5ek_mmc_dev_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/microchip_sama7g5ek_mmc_dev_defconfig b/configs/microchip_sama7g5ek_mmc_dev_defconfig index c11ea2f518..6eb6c282e0 100644 --- a/configs/microchip_sama7g5ek_mmc_dev_defconfig +++ b/configs/microchip_sama7g5ek_mmc_dev_defconfig @@ -31,6 +31,8 @@ BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y BR2_PACKAGE_EVTEST=y +BR2_PACKAGE_RNG_TOOLS=y +# BR2_PACKAGE_RNG_TOOLS_JITTERENTROPY_LIBRARY is not set BR2_PACKAGE_SETSERIAL=y BR2_PACKAGE_SPI_TOOLS=y BR2_PACKAGE_USBUTILS=y From arnout at mind.be Sun Feb 13 10:47:24 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 11:47:24 +0100 Subject: [Buildroot] [git commit] configs/microchip_sam9x60ek_mmc_dev_defconfig: expand rootfs size to 120M Message-ID: <20220213104101.5862482817@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=616ba9c90b014637dc9925fa442a0af4a11f04b8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Default 60M for rootfs are not enough and generate a build failure, so let's expand rootfs size to 120M. Fixes: https://gitlab.com/ymorin/buildroot/-/jobs/2035821088 Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- configs/microchip_sam9x60ek_mmc_dev_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/microchip_sam9x60ek_mmc_dev_defconfig b/configs/microchip_sam9x60ek_mmc_dev_defconfig index da1bd33dd3..00ccd784b5 100644 --- a/configs/microchip_sam9x60ek_mmc_dev_defconfig +++ b/configs/microchip_sam9x60ek_mmc_dev_defconfig @@ -7,6 +7,7 @@ BR2_TARGET_GENERIC_HOSTNAME="sam9x60ek" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/microchip/sam9x60ek_mmc/genimage.cfg" +BR2_TARGET_ROOTFS_EXT2_SIZE=120M BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,linux4microchip-2021.10)/linux-linux4microchip-2021.10.tar.gz" From arnout at mind.be Sun Feb 13 11:07:08 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 12:07:08 +0100 Subject: [Buildroot] [PATCH] board: x86_64: Enable and mount debugfs In-Reply-To: <20220202031745.448551-1-joel@jms.id.au> References: <20220202031745.448551-1-joel@jms.id.au> Message-ID: <2b888540-8ee9-fc8d-58e3-4a7d0c71da48@mind.be> On 02/02/2022 04:17, Joel Stanley wrote: > Add DEBUG_FS to the kernel options, and modify fstab so it is > automatically mounted at boot. > > This is useful when testing. "This is useful when testing" is not much of an explanation. Why only for this defconfig? Why only debugfs and not strace, dropbear, gdbserver, and tons of other tools useful for testing? For now, I've marked this as Rejected but if there's a good reason we can pick up this patch again. Regards, Arnout > > Signed-off-by: Joel Stanley > --- > board/qemu/x86_64/linux.config | 1 + > board/qemu/x86_64/post-build.sh | 3 +++ > 2 files changed, 4 insertions(+) > > diff --git a/board/qemu/x86_64/linux.config b/board/qemu/x86_64/linux.config > index e1d2ce01b004..2ed5c4194560 100644 > --- a/board/qemu/x86_64/linux.config > +++ b/board/qemu/x86_64/linux.config > @@ -50,4 +50,5 @@ CONFIG_EXT4_FS=y > CONFIG_AUTOFS4_FS=y > CONFIG_TMPFS=y > CONFIG_TMPFS_POSIX_ACL=y > +CONFIG_DEBUG_FS=y > CONFIG_UNWINDER_FRAME_POINTER=y > diff --git a/board/qemu/x86_64/post-build.sh b/board/qemu/x86_64/post-build.sh > index bf83a002c2fc..0b27ab2c8074 100755 > --- a/board/qemu/x86_64/post-build.sh > +++ b/board/qemu/x86_64/post-build.sh > @@ -9,3 +9,6 @@ if [ -e ${TARGET_DIR}/etc/inittab ]; then > sed -i '/GENERIC_SERIAL/a\ > tty1::respawn:/sbin/getty -L tty1 0 vt100 # QEMU graphical window' ${TARGET_DIR}/etc/inittab > fi > + > +# Mount debugfs on boot > +echo "debugfs /sys/kernel/debug debugfs defaults 0 0" >> ${TARGET_DIR}/etc/fstab From peter at korsgaard.com Sun Feb 13 11:12:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Feb 2022 12:12:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/fatcat: bump to version 1.1.1 In-Reply-To: <20220209195240.346534-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 9 Feb 2022 20:52:40 +0100") References: <20220209195240.346534-1-fontaine.fabrice@gmail.com> Message-ID: <87ee47m35h.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Update indentation in hash file (two spaces) > https://github.com/Gregwar/fatcat/compare/v1.1.0...v1.1.1 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 13 11:12:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Feb 2022 12:12:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/jo: bump to version 1.6 In-Reply-To: <20220209202123.354897-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 9 Feb 2022 21:21:23 +0100") References: <20220209202123.354897-1-fontaine.fabrice@gmail.com> Message-ID: <87a6evm35b.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://github.com/jpmens/jo/blob/1.6/ChangeLog > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 13 11:12:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Feb 2022 12:12:37 +0100 Subject: [Buildroot] [PATCH 1/2] package: drop _NEEDS_HOST_PYTHON In-Reply-To: <20220212103421.1351-1-peter@korsgaard.com> (Peter Korsgaard's message of "Sat, 12 Feb 2022 11:34:19 +0100") References: <20220212103421.1351-1-peter@korsgaard.com> Message-ID: <875ypjm34q.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Now that host-python2 is gone and the corresponding logic in pkg-python. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 13 11:12:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Feb 2022 12:12:40 +0100 Subject: [Buildroot] [PATCH 2/2] docs/manual/adding-packages-python.txt: drop _NEEDS_HOST_PYTHON In-Reply-To: <20220212103421.1351-2-peter@korsgaard.com> (Peter Korsgaard's message of "Sat, 12 Feb 2022 11:34:20 +0100") References: <20220212103421.1351-1-peter@korsgaard.com> <20220212103421.1351-2-peter@korsgaard.com> Message-ID: <871r07m34n.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Now that host-python2 is gone and the corresponding logic in pkg-python. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 13 11:11:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Feb 2022 12:11:28 +0100 Subject: [Buildroot] [git commit] package/jo: bump to version 1.6 Message-ID: <20220213110615.506AA821DB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=968908b93ad6528dc7458442dabaceefd53ad4eb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/jpmens/jo/blob/1.6/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/jo/jo.hash | 2 +- package/jo/jo.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/jo/jo.hash b/package/jo/jo.hash index 8f1cc8fcd9..efad8228a7 100644 --- a/package/jo/jo.hash +++ b/package/jo/jo.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 24c64d2eb863900947f58f32b502c95fec8f086105fd31151b91f54b7b5256a2 jo-1.4.tar.gz +sha256 eb15592f1ba6d5a77468a1438a20e3d21c3d63bb7d045fb3544f223340fcd1a1 jo-1.6.tar.gz sha256 41d8b23dc6e76731f4920b9ce42d0d4a248d243a510319e2441d174a115f35cf COPYING diff --git a/package/jo/jo.mk b/package/jo/jo.mk index 24b499f345..dd5dd03ddb 100644 --- a/package/jo/jo.mk +++ b/package/jo/jo.mk @@ -4,7 +4,7 @@ # ################################################################################ -JO_VERSION = 1.4 +JO_VERSION = 1.6 JO_SITE = https://github.com/jpmens/jo/releases/download/$(JO_VERSION) JO_LICENSE = MIT (json.[ch]), GPL-2.0+ (rest) JO_LICENSE_FILES = COPYING From peter at korsgaard.com Sun Feb 13 11:12:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Feb 2022 12:12:06 +0100 Subject: [Buildroot] [git commit] package/fatcat: bump to version 1.1.1 Message-ID: <20220213110615.725EA82817@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4c2e26681724085106df18b382f591b47fe43141 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update indentation in hash file (two spaces) https://github.com/Gregwar/fatcat/compare/v1.1.0...v1.1.1 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/fatcat/fatcat.hash | 4 ++-- package/fatcat/fatcat.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/fatcat/fatcat.hash b/package/fatcat/fatcat.hash index 66823e2d9e..56f89edd50 100644 --- a/package/fatcat/fatcat.hash +++ b/package/fatcat/fatcat.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 303efe2aa73cbfe6fbc5d8af346d0f2c70b3f996fc891e8859213a58b95ad88c fatcat-1.1.0.tar.gz -sha256 3ea03755e32cf7f5b12981de92a0fdad396448195fe0024990c9cbc388e9866c LICENSE +sha256 5574f715f62a9feda7fffc8099f8bca7134ff4f1274bb1bc0db96a2969eea206 fatcat-1.1.1.tar.gz +sha256 3ea03755e32cf7f5b12981de92a0fdad396448195fe0024990c9cbc388e9866c LICENSE diff --git a/package/fatcat/fatcat.mk b/package/fatcat/fatcat.mk index 1a2e5aacae..0dff53fa65 100644 --- a/package/fatcat/fatcat.mk +++ b/package/fatcat/fatcat.mk @@ -4,7 +4,7 @@ # ################################################################################ -FATCAT_VERSION = 1.1.0 +FATCAT_VERSION = 1.1.1 FATCAT_SITE = $(call github,Gregwar,fatcat,v$(FATCAT_VERSION)) FATCAT_LICENSE = MIT FATCAT_LICENSE_FILES = LICENSE From peter at korsgaard.com Sun Feb 13 11:11:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Feb 2022 12:11:44 +0100 Subject: [Buildroot] [git commit] package: drop _NEEDS_HOST_PYTHON Message-ID: <20220213110615.5F6037F8A8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=594b2e9d3c427abac3efcbdf98359d2abe3d6888 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Now that host-python2 is gone and the corresponding logic in pkg-python. Signed-off-by: Peter Korsgaard --- package/meson/meson.mk | 1 - package/python-charset-normalizer/python-charset-normalizer.mk | 1 - package/python-decorator/python-decorator.mk | 1 - package/python-idna/python-idna.mk | 1 - package/python-inflection/python-inflection.mk | 1 - package/python-installer/python-installer.mk | 1 - package/python-jinja2/python-jinja2.mk | 2 -- package/python-mako/python-mako.mk | 2 -- package/python-markupsafe/python-markupsafe.mk | 2 -- package/python-networkx/python-networkx.mk | 1 - package/python-packaging/python-packaging.mk | 1 - package/python-pep517/python-pep517.mk | 1 - package/python-pypa-build/python-pypa-build.mk | 1 - package/python-pyparsing/python-pyparsing.mk | 1 - package/python-pyyaml/python-pyyaml.mk | 1 - package/python-requests/python-requests.mk | 1 - package/python-setuptools-rust/python-setuptools-rust.mk | 1 - .../python-setuptools-scm-git-archive.mk | 1 - package/python-setuptools-scm/python-setuptools-scm.mk | 1 - package/python-tomli/python-tomli.mk | 1 - package/python-typing-extensions/python-typing-extensions.mk | 1 - package/python-urllib3/python-urllib3.mk | 1 - package/scons/scons.mk | 2 -- package/setools/setools.mk | 1 - 24 files changed, 28 deletions(-) diff --git a/package/meson/meson.mk b/package/meson/meson.mk index ad15e3f91e..125488dd46 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -11,7 +11,6 @@ MESON_LICENSE_FILES = COPYING MESON_SETUP_TYPE = setuptools HOST_MESON_DEPENDENCIES = host-ninja -HOST_MESON_NEEDS_HOST_PYTHON = python3 # Avoid interpreter shebang longer than 128 chars define HOST_MESON_SET_INTERPRETER diff --git a/package/python-charset-normalizer/python-charset-normalizer.mk b/package/python-charset-normalizer/python-charset-normalizer.mk index 0a96a6b078..c37b068b36 100644 --- a/package/python-charset-normalizer/python-charset-normalizer.mk +++ b/package/python-charset-normalizer/python-charset-normalizer.mk @@ -10,7 +10,6 @@ PYTHON_CHARSET_NORMALIZER_SITE = https://files.pythonhosted.org/packages/e8/e8/b 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)) diff --git a/package/python-decorator/python-decorator.mk b/package/python-decorator/python-decorator.mk index a7e338bdc0..a61f045e2a 100644 --- a/package/python-decorator/python-decorator.mk +++ b/package/python-decorator/python-decorator.mk @@ -12,7 +12,6 @@ PYTHON_DECORATOR_LICENSE_FILES = LICENSE.txt PYTHON_DECORATOR_CPE_ID_VENDOR = python PYTHON_DECORATOR_CPE_ID_PRODUCT = decorator PYTHON_DECORATOR_SETUP_TYPE = setuptools -HOST_PYTHON_DECORATOR_NEEDS_HOST_PYTHON = python3 $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python-idna/python-idna.mk b/package/python-idna/python-idna.mk index 2a1ec8314b..6f416156d0 100644 --- a/package/python-idna/python-idna.mk +++ b/package/python-idna/python-idna.mk @@ -10,7 +10,6 @@ PYTHON_IDNA_SITE = https://files.pythonhosted.org/packages/62/08/e3fc7c8161090f7 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)) diff --git a/package/python-inflection/python-inflection.mk b/package/python-inflection/python-inflection.mk index 59f35aa135..7c030e99b9 100644 --- a/package/python-inflection/python-inflection.mk +++ b/package/python-inflection/python-inflection.mk @@ -10,7 +10,6 @@ PYTHON_INFLECTION_SITE = https://files.pythonhosted.org/packages/e1/7e/691d061b7 PYTHON_INFLECTION_SETUP_TYPE = setuptools PYTHON_INFLECTION_LICENSE = MIT PYTHON_INFLECTION_LICENSE_FILES = LICENSE -HOST_PYTHON_INFLECTION_NEEDS_HOST_PYTHON = python3 $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python-installer/python-installer.mk b/package/python-installer/python-installer.mk index 2c1d371dab..82739a8003 100644 --- a/package/python-installer/python-installer.mk +++ b/package/python-installer/python-installer.mk @@ -10,6 +10,5 @@ PYTHON_INSTALLER_SITE = https://files.pythonhosted.org/packages/71/9a/8d7c724b0d 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)) diff --git a/package/python-jinja2/python-jinja2.mk b/package/python-jinja2/python-jinja2.mk index 752daf653c..0503984bef 100644 --- a/package/python-jinja2/python-jinja2.mk +++ b/package/python-jinja2/python-jinja2.mk @@ -17,7 +17,5 @@ PYTHON_JINJA2_CPE_ID_PRODUCT = jinja2 PYTHON_JINJA2_DEPENDENCIES = host-python-markupsafe HOST_PYTHON_JINJA2_DEPENDENCIES = host-python-markupsafe -HOST_PYTHON_JINJA2_NEEDS_HOST_PYTHON = python3 - $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python-mako/python-mako.mk b/package/python-mako/python-mako.mk index 26fe95c606..553c4a5339 100644 --- a/package/python-mako/python-mako.mk +++ b/package/python-mako/python-mako.mk @@ -11,8 +11,6 @@ PYTHON_MAKO_SETUP_TYPE = setuptools PYTHON_MAKO_LICENSE = MIT PYTHON_MAKO_LICENSE_FILES = LICENSE -HOST_PYTHON_MAKO_NEEDS_HOST_PYTHON = python3 - # In host build, setup.py tries to download markupsafe if it is not installed HOST_PYTHON_MAKO_DEPENDENCIES = host-python-markupsafe diff --git a/package/python-markupsafe/python-markupsafe.mk b/package/python-markupsafe/python-markupsafe.mk index 14a8d06dfe..e0e689f5a1 100644 --- a/package/python-markupsafe/python-markupsafe.mk +++ b/package/python-markupsafe/python-markupsafe.mk @@ -11,7 +11,5 @@ PYTHON_MARKUPSAFE_SETUP_TYPE = setuptools PYTHON_MARKUPSAFE_LICENSE = BSD-3-Clause PYTHON_MARKUPSAFE_LICENSE_FILES = LICENSE.rst -HOST_PYTHON_MARKUPSAFE_NEEDS_HOST_PYTHON = python3 - $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python-networkx/python-networkx.mk b/package/python-networkx/python-networkx.mk index 3b05011eb9..1908ed8f93 100644 --- a/package/python-networkx/python-networkx.mk +++ b/package/python-networkx/python-networkx.mk @@ -13,7 +13,6 @@ PYTHON_NETWORKX_CPE_ID_VENDOR = python PYTHON_NETWORKX_CPE_ID_PRODUCT = networkx PYTHON_NETWORKX_SETUP_TYPE = setuptools HOST_PYTHON_NETWORKX_DEPENDENCIES = host-python-decorator -HOST_PYTHON_NETWORKX_NEEDS_HOST_PYTHON = python3 $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python-packaging/python-packaging.mk b/package/python-packaging/python-packaging.mk index 569dc0bf58..74b5803525 100644 --- a/package/python-packaging/python-packaging.mk +++ b/package/python-packaging/python-packaging.mk @@ -10,7 +10,6 @@ PYTHON_PACKAGING_SITE = https://files.pythonhosted.org/packages/df/9e/d1a7217f69 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)) diff --git a/package/python-pep517/python-pep517.mk b/package/python-pep517/python-pep517.mk index da0431a637..99aa62d51d 100644 --- a/package/python-pep517/python-pep517.mk +++ b/package/python-pep517/python-pep517.mk @@ -10,7 +10,6 @@ PYTHON_PEP517_SITE = https://files.pythonhosted.org/packages/0a/65/6e656d49c6791 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)) diff --git a/package/python-pypa-build/python-pypa-build.mk b/package/python-pypa-build/python-pypa-build.mk index 6babade672..dc8363f59e 100644 --- a/package/python-pypa-build/python-pypa-build.mk +++ b/package/python-pypa-build/python-pypa-build.mk @@ -10,7 +10,6 @@ PYTHON_PYPA_BUILD_SITE = https://files.pythonhosted.org/packages/f0/62/c73b77521 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 \ diff --git a/package/python-pyparsing/python-pyparsing.mk b/package/python-pyparsing/python-pyparsing.mk index e33541bdb7..2fb705bc7a 100644 --- a/package/python-pyparsing/python-pyparsing.mk +++ b/package/python-pyparsing/python-pyparsing.mk @@ -10,7 +10,6 @@ PYTHON_PYPARSING_SITE = https://files.pythonhosted.org/packages/d6/60/9bed18f432 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)) diff --git a/package/python-pyyaml/python-pyyaml.mk b/package/python-pyyaml/python-pyyaml.mk index 8f5a2d269e..067af8ea7d 100644 --- a/package/python-pyyaml/python-pyyaml.mk +++ b/package/python-pyyaml/python-pyyaml.mk @@ -15,7 +15,6 @@ PYTHON_PYYAML_CPE_ID_PRODUCT = pyyaml PYTHON_PYYAML_DEPENDENCIES = host-python-cython libyaml PYTHON_PYYAML_ENV = PYYAML_FORCE_CYTHON=1 HOST_PYTHON_PYYAML_DEPENDENCIES = host-libyaml -HOST_PYTHON_PYYAML_NEEDS_HOST_PYTHON = python3 $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python-requests/python-requests.mk b/package/python-requests/python-requests.mk index 962646516e..9613a2c47c 100644 --- a/package/python-requests/python-requests.mk +++ b/package/python-requests/python-requests.mk @@ -12,7 +12,6 @@ PYTHON_REQUESTS_LICENSE = Apache-2.0 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 \ diff --git a/package/python-setuptools-rust/python-setuptools-rust.mk b/package/python-setuptools-rust/python-setuptools-rust.mk index c87a0da3c7..394789b056 100644 --- a/package/python-setuptools-rust/python-setuptools-rust.mk +++ b/package/python-setuptools-rust/python-setuptools-rust.mk @@ -11,6 +11,5 @@ 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-typing-extensions -HOST_PYTHON_SETUPTOOLS_RUST_NEEDS_HOST_PYTHON = python3 $(eval $(host-python-package)) diff --git a/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk b/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk index 48ca9c89ae..032e2d3fc9 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,6 +11,5 @@ 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 8c5229e1a6..132eb398aa 100644 --- a/package/python-setuptools-scm/python-setuptools-scm.mk +++ b/package/python-setuptools-scm/python-setuptools-scm.mk @@ -11,6 +11,5 @@ 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-tomli/python-tomli.mk b/package/python-tomli/python-tomli.mk index 4e6b023ef7..b8c20ca736 100644 --- a/package/python-tomli/python-tomli.mk +++ b/package/python-tomli/python-tomli.mk @@ -10,7 +10,6 @@ PYTHON_TOMLI_SITE = https://files.pythonhosted.org/packages/ec/38/8eccdc662c61ae 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)) diff --git a/package/python-typing-extensions/python-typing-extensions.mk b/package/python-typing-extensions/python-typing-extensions.mk index 407fe99b54..668071e025 100644 --- a/package/python-typing-extensions/python-typing-extensions.mk +++ b/package/python-typing-extensions/python-typing-extensions.mk @@ -10,7 +10,6 @@ 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)) diff --git a/package/python-urllib3/python-urllib3.mk b/package/python-urllib3/python-urllib3.mk index c9c8a912d1..d94c97b4ed 100644 --- a/package/python-urllib3/python-urllib3.mk +++ b/package/python-urllib3/python-urllib3.mk @@ -12,7 +12,6 @@ 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)) diff --git a/package/scons/scons.mk b/package/scons/scons.mk index bc5d2a1ef9..6b75d3ddca 100644 --- a/package/scons/scons.mk +++ b/package/scons/scons.mk @@ -10,8 +10,6 @@ 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) diff --git a/package/setools/setools.mk b/package/setools/setools.mk index 5b4b4e30d8..ea355f10c8 100644 --- a/package/setools/setools.mk +++ b/package/setools/setools.mk @@ -13,7 +13,6 @@ SETOOLS_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL SETOOLS_CPE_ID_VENDOR = selinuxproject SETOOLS_SETUP_TYPE = setuptools HOST_SETOOLS_DEPENDENCIES = host-python-cython host-libselinux host-libsepol host-python-networkx -HOST_SETOOLS_NEEDS_HOST_PYTHON = python3 define SETOOLS_FIX_SETUP # By default, setup.py will look for libsepol.a in the host machines From peter at korsgaard.com Sun Feb 13 11:11:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Feb 2022 12:11:50 +0100 Subject: [Buildroot] [git commit] docs/manual/adding-packages-python.txt: drop _NEEDS_HOST_PYTHON Message-ID: <20220213110615.68FFF82821@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=26157321240adb9f5cc2802183d3955a877b9487 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Now that host-python2 is gone and the corresponding logic in pkg-python. Signed-off-by: Peter Korsgaard --- docs/manual/adding-packages-python.txt | 7 ------- 1 file changed, 7 deletions(-) diff --git a/docs/manual/adding-packages-python.txt b/docs/manual/adding-packages-python.txt index cfd2f88920..0141fea85b 100644 --- a/docs/manual/adding-packages-python.txt +++ b/docs/manual/adding-packages-python.txt @@ -141,13 +141,6 @@ therefore only use a few of them, or none. packages) and +HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS+ (for host setuptools packages). -* +HOST_PYTHON_FOO_NEEDS_HOST_PYTHON+, to define the host python - interpreter. The usage of this variable is limited to host - packages. The two supported value are +python2+ and +python3+. It - will ensure the right host python package is available and will - invoke it for the build. If some build steps are overloaded, the - right python interpreter must be explicitly called in the commands. - With the Python infrastructure, all the steps required to build and install the packages are already defined, and they generally work well for most Python-based packages. However, when required, it is still From fontaine.fabrice at gmail.com Sun Feb 13 11:20:25 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 13 Feb 2022 12:20:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/safeclib: fix build with gcc 4.8 Message-ID: <20220213112025.979418-1-fontaine.fabrice@gmail.com> Add -std=c99 to fix the following build failure with gcc 4.8 raised since bump to version 3.7.1 in commit cc27267ae41bf44276c63b1e86042c4fae4adf50: In file included from abort_handler_s.c:35:0: safeclib_private.h:167:18: error: anonymous variadic macros were introduced in C99 [-Werror=variadic-macros] #define slprintf(...) fprintf(stderr, __VA_ARGS__) ^ Fixes: - http://autobuild.buildroot.org/results/5c3468585942879b47331e05058d25d324c8cc23 Signed-off-by: Fabrice Fontaine --- package/safeclib/safeclib.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/safeclib/safeclib.mk b/package/safeclib/safeclib.mk index 91b3e26c68..bc58c1a38c 100644 --- a/package/safeclib/safeclib.mk +++ b/package/safeclib/safeclib.mk @@ -11,6 +11,7 @@ SAFECLIB_SOURCE = safeclib-$(SAFECLIB_VERSION).tar.xz SAFECLIB_LICENSE = MIT SAFECLIB_LICENSE_FILES = COPYING SAFECLIB_INSTALL_STAGING = YES +SAFECLIB_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=c99" # -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 -- 2.34.1 From arnout at mind.be Sun Feb 13 11:20:27 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 12:20:27 +0100 Subject: [Buildroot] [PATCH] package/doc-asciidoc: fix build for out-of-tree documents In-Reply-To: <11822_1643723386_61F93A7A_11822_315_1_f2cd4a063f756aa49d3dc715be368bd3738e5f1d.1643723384.git.yann.morin@orange.com> References: <11822_1643723386_61F93A7A_11822_315_1_f2cd4a063f756aa49d3dc715be368bd3738e5f1d.1643723384.git.yann.morin@orange.com> Message-ID: On 01/02/2022 14:49, yann.morin at orange.com wrote: > From: "Yann E. MORIN" > > The doc-asciidoc infra allows document to define sources and resources, > and those can only be local (there is no download support for documents). > The currently documented way to specify those is to use the $(pkgdir) > macro to point to the document sources and resources when they are along > the .mk. > > However, this works only for sources and not for resources. > > Indeed, sources are used to generate Makefile dependency rules, so > $(pkgdir) is expanded and evaluated during the call to $(doc-asciidoc), > while resources are expanded and evaluated when the rules are executed, > which always happen after all the parsing has be done, at which point > $(pkgdir) expands to the last Makefile that was parsed, which is always > Buildroot's own manual. > > This went unnoticed so far because Buildroot's manual is 1) the last to > be parsed, and 2) not using $(pkgdir) anyway. > > Additionally, $(pkgdir) is mostly an internal macro, that is, as this > change demonstrates, difficult to use, and thus should not be used, in > packages or in documents. > > We fix that by introducing $(FOO_DOCDIR), similar to $(FOO_PKGDIR), > which points to the document directory. We choose not to name the > variable FOO_PKGDIR, because it semantically is not a package. > > As a consequence, the last argument to the doc-asciidoc macro is now > superfluous, so it is removed, which causes a little bit of churn in > the main macro. As a further consequence, the third argument in the > inner macro is no longer needed either, so it too is removed, which > causes a bit more churn yet in the inner macro. > > Signed-off-by: Yann E. MORIN > Cc: Frederic GARDES Applied to master, thanks. Regards, Arnout > --- > docs/manual/adding-packages-asciidoc.txt | 17 ++++- > package/doc-asciidoc.mk | 90 ++++++++++++------------ > 2 files changed, 59 insertions(+), 48 deletions(-) > > diff --git a/docs/manual/adding-packages-asciidoc.txt b/docs/manual/adding-packages-asciidoc.txt > index f9688b36c7..0bfe99d22e 100644 > --- a/docs/manual/adding-packages-asciidoc.txt > +++ b/docs/manual/adding-packages-asciidoc.txt > @@ -39,7 +39,7 @@ Here is an example to render a simple AsciiDoc document. > 04: # > 05: ################################################################################ > 06: > -07: FOO_SOURCES = $(sort $(wildcard $(pkgdir)/*)) > +07: FOO_SOURCES = $(sort $(wildcard $(FOO_DOCDIR)/*)) > 08: $(eval $(call asciidoc-document)) > ---- > > @@ -85,6 +85,17 @@ various steps: > * +FOO_CHECK_DEPENDENCIES__HOOKS+, to run additional tests for > the specified format ++ (see the list of rendered formats, above). > > +Buildroot sets the following variable that can be used in the definitions > +above: > + > +* +$(FOO_DOCDIR)+, similar to +$(FOO_PKGDIR)+, contains the path to the > + directory containing +foo.mk+. It can be used to refer to the document > + sources, and can be used in the hooks, especially the post-rsync hook > + if parts of the documentation needs to be generated. > + > +* +$(@D)+, as for traditional packages, contains the path to the directory > + where the document will be copied and built. > + > Here is a complete example that uses all variables and all hooks: > > ---- > @@ -94,8 +105,8 @@ Here is a complete example that uses all variables and all hooks: > 04: # > 05: ################################################################################ > 06: > -07: FOO_SOURCES = $(sort $(wildcard $(pkgdir)/*)) > -08: FOO_RESOURCES = $(sort $(wildcard $(pkgdir)/ressources)) > +07: FOO_SOURCES = $(sort $(wildcard $(FOO_DOCDIR)/*)) > +08: FOO_RESOURCES = $(sort $(wildcard $(FOO_DOCDIR)/ressources)) > 09: > 10: define FOO_GEN_EXTRA_DOC > 11: /path/to/generate-script --outdir=$(@D) > diff --git a/package/doc-asciidoc.mk b/package/doc-asciidoc.mk > index be92496c2e..2bd761edfb 100644 > --- a/package/doc-asciidoc.mk > +++ b/package/doc-asciidoc.mk > @@ -42,12 +42,11 @@ BR_ASCIIDOC_CONF = docs/conf/asciidoc.conf > # argument 1 is the name of the document and the top-level asciidoc file must > # have the same name > # argument 2 is the uppercase name of the document > -# argument 3 is the directory containing the document > -# argument 4 is the type of document to generate (-f argument of a2x) > -# argument 5 is the document type as used in the make target > -# argument 6 is the output file extension for the document type > -# argument 7 is the human text for the document type > -# argument 8 (optional) are extra arguments for a2x > +# argument 3 is the type of document to generate (-f argument of a2x) > +# argument 4 is the document type as used in the make target > +# argument 5 is the output file extension for the document type > +# argument 6 is the human text for the document type > +# argument 7 (optional) are extra arguments for a2x > # > # The variable _SOURCES defines the dependencies. > # > @@ -55,55 +54,55 @@ BR_ASCIIDOC_CONF = docs/conf/asciidoc.conf > # all variable references except the arguments must be $$-quoted. > ################################################################################ > define ASCIIDOC_INNER > -$(1): $(1)-$(5) > -.PHONY: $(1)-$(5) > -$(1)-$(5): $$(O)/docs/$(1)/$(1).$(6) > +$(1): $(1)-$(4) > +.PHONY: $(1)-$(4) > +$(1)-$(4): $$(O)/docs/$(1)/$(1).$(5) > > -asciidoc-check-dependencies-$(5): > -.PHONY: $(1)-check-dependencies-$(5) > +asciidoc-check-dependencies-$(4): > +.PHONY: $(1)-check-dependencies-$(4) > # Single line, because splitting a foreach is not easy... > -$(1)-check-dependencies-$(5): asciidoc-check-dependencies-$(5) > - $$(Q)$$(foreach hook,$$($(2)_CHECK_DEPENDENCIES_$$(call UPPERCASE,$(5))_HOOKS),$$(call $$(hook))$$(sep)) > +$(1)-check-dependencies-$(4): asciidoc-check-dependencies-$(4) > + $$(Q)$$(foreach hook,$$($(2)_CHECK_DEPENDENCIES_$$(call UPPERCASE,$(4))_HOOKS),$$(call $$(hook))$$(sep)) > > # Include Buildroot's AsciiDoc configuration first: > # - generic configuration, > # - then output-specific configuration > ifneq ($$(wildcard $$(BR_ASCIIDOC_CONF)),) > -$(2)_$(4)_ASCIIDOC_OPTS += -f $$(BR_ASCIIDOC_CONF) > +$(2)_$(3)_ASCIIDOC_OPTS += -f $$(BR_ASCIIDOC_CONF) > endif > -BR_$(4)_ASCIIDOC_CONF = docs/conf/asciidoc-$(4).conf > -ifneq ($$(wildcard $$(BR_$(4)_ASCIIDOC_CONF)),) > -$(2)_$(4)_ASCIIDOC_OPTS += -f $$(BR_$(4)_ASCIIDOC_CONF) > +BR_$(3)_ASCIIDOC_CONF = docs/conf/asciidoc-$(3).conf > +ifneq ($$(wildcard $$(BR_$(3)_ASCIIDOC_CONF)),) > +$(2)_$(3)_ASCIIDOC_OPTS += -f $$(BR_$(3)_ASCIIDOC_CONF) > endif > > # Then include the document's AsciiDoc configuration: > # - generic configuration, > # - then output-specific configuration > ifneq ($$(wildcard $$($(2)_ASCIIDOC_CONF)),) > -$(2)_$(4)_ASCIIDOC_OPTS += -f $$($(2)_ASCIIDOC_CONF) > +$(2)_$(3)_ASCIIDOC_OPTS += -f $$($(2)_ASCIIDOC_CONF) > endif > -$(2)_$(4)_ASCIIDOC_CONF = $(3)/asciidoc-$(4).conf > -ifneq ($$(wildcard $$($(2)_$(4)_ASCIIDOC_CONF)),) > -$(2)_$(4)_ASCIIDOC_OPTS += -f $$($(2)_$(4)_ASCIIDOC_CONF) > +$(2)_$(3)_ASCIIDOC_CONF = $$($(2)_DOCDIR)/asciidoc-$(3).conf > +ifneq ($$(wildcard $$($(2)_$(3)_ASCIIDOC_CONF)),) > +$(2)_$(3)_ASCIIDOC_OPTS += -f $$($(2)_$(3)_ASCIIDOC_CONF) > endif > > # Handle a2x warning about --destination-dir option only applicable to HTML > # based outputs. So: > # - use the --destination-dir option if possible (html and split-html), > # - otherwise copy the generated document to the output directory > -$(2)_$(4)_A2X_OPTS = > -ifneq ($$(filter $(5),html split-html),) > -$(2)_$(4)_A2X_OPTS += --destination-dir="$$(@D)" > +$(2)_$(3)_A2X_OPTS = > +ifneq ($$(filter $(4),html split-html),) > +$(2)_$(3)_A2X_OPTS += --destination-dir="$$(@D)" > else > -define $(2)_$(4)_INSTALL_CMDS > - $$(Q)cp -f $$(BUILD_DIR)/docs/$(1)/$(1).$(6) $$(@D) > +define $(2)_$(3)_INSTALL_CMDS > + $$(Q)cp -f $$(BUILD_DIR)/docs/$(1)/$(1).$(5) $$(@D) > endef > endif > > -$$(O)/docs/$(1)/$(1).$(6): export TZ=UTC > +$$(O)/docs/$(1)/$(1).$(5): export TZ=UTC > > -ifeq ($(6)-$$(GENDOC_XSLTPROC_IS_BROKEN),pdf-y) > -$$(O)/docs/$(1)/$(1).$(6): > +ifeq ($(5)-$$(GENDOC_XSLTPROC_IS_BROKEN),pdf-y) > +$$(O)/docs/$(1)/$(1).$(5): > $$(warning PDF generation is disabled because of a bug in \ > xsltproc. To be able to generate a PDF, you should \ > build xsltproc from the libxslt sources >=1.1.29 and pass it \ > @@ -112,20 +111,20 @@ $$(O)/docs/$(1)/$(1).$(6): > else > # -r $(@D) is there for documents that use external filters; those filters > # generate code at the same location it finds the document's source files. > -$$(O)/docs/$(1)/$(1).$(6): $$($(2)_SOURCES) \ > +$$(O)/docs/$(1)/$(1).$(5): $$($(2)_SOURCES) \ > $(1)-check-dependencies \ > - $(1)-check-dependencies-$(5) \ > + $(1)-check-dependencies-$(4) \ > $(1)-prepare-sources > - $$(Q)$$(call MESSAGE,"Generating $(7) $(1)...") > + $$(Q)$$(call MESSAGE,"Generating $(6) $(1)...") > $$(Q)mkdir -p $$(@D) > - $$(Q)a2x $(8) -f $(4) -d book -L \ > + $$(Q)a2x $(7) -f $(3) -d book -L \ > $$(foreach r,$$($(2)_RESOURCES) $$(@D), \ > --resource="$$(abspath $$(r))") \ > - $$($(2)_$(4)_A2X_OPTS) \ > - --asciidoc-opts="$$($(2)_$(4)_ASCIIDOC_OPTS)" \ > + $$($(2)_$(3)_A2X_OPTS) \ > + --asciidoc-opts="$$($(2)_$(3)_ASCIIDOC_OPTS)" \ > $$(BUILD_DIR)/docs/$(1)/$(1).txt > # install the generated document > - $$($(2)_$(4)_INSTALL_CMDS) > + $$($(2)_$(3)_INSTALL_CMDS) > endif > endef > > @@ -135,13 +134,14 @@ endef > # argument 1 is the lowercase name of the document; the document's main file > # must have the same name, with the .txt extension > # argument 2 is the uppercase name of the document > -# argument 3 is the directory containing the document's sources > # > # The variable _SOURCES defines the dependencies. > # The variable _RESOURCES defines where the document's > # resources, such as images, are located; must be an absolute path. > ################################################################################ > define ASCIIDOC > +$(2)_DOCDIR = $(pkgdir) > + > # Single line, because splitting a foreach is not easy... > .PHONY: $(1)-check-dependencies > $(1)-check-dependencies: asciidoc-check-dependencies $$($(2)_DEPENDENCIES) > @@ -153,29 +153,29 @@ $(1)-check-dependencies: asciidoc-check-dependencies $$($(2)_DEPENDENCIES) > $$(BUILD_DIR)/docs/$(1)/.stamp_doc_rsynced: > $$(Q)$$(call MESSAGE,"Preparing the $(1) sources...") > $$(Q)mkdir -p $$(@D) > - $$(Q)rsync -a $(3) $$(@D) > + $$(Q)rsync -a $$($(2)_DOCDIR) $$(@D) > $$(Q)$$(foreach hook,$$($(2)_POST_RSYNC_HOOKS),$$(call $$(hook))$$(sep)) > > .PHONY: $(1)-prepare-sources > $(1)-prepare-sources: $$(BUILD_DIR)/docs/$(1)/.stamp_doc_rsynced > > -$(2)_ASCIIDOC_CONF = $(3)/asciidoc.conf > +$(2)_ASCIIDOC_CONF = $$($(2)_DOCDIR)/asciidoc.conf > > -$(call ASCIIDOC_INNER,$(1),$(2),$(3),xhtml,html,html,HTML,\ > +$(call ASCIIDOC_INNER,$(1),$(2),xhtml,html,html,HTML,\ > --xsltproc-opts "--stringparam toc.section.depth 1") > > -$(call ASCIIDOC_INNER,$(1),$(2),$(3),chunked,split-html,chunked,split HTML,\ > +$(call ASCIIDOC_INNER,$(1),$(2),chunked,split-html,chunked,split HTML,\ > --xsltproc-opts "--stringparam toc.section.depth 1") > > # dblatex needs to pass the '--maxvars ...' option to xsltproc to prevent it > # from reaching the template recursion limit when processing the (long) target > # package table and bailing out. > -$(call ASCIIDOC_INNER,$(1),$(2),$(3),pdf,pdf,pdf,PDF,\ > +$(call ASCIIDOC_INNER,$(1),$(2),pdf,pdf,pdf,PDF,\ > --dblatex-opts "-P latex.output.revhistory=0 -x '--maxvars 100000'") > > -$(call ASCIIDOC_INNER,$(1),$(2),$(3),text,text,text,text) > +$(call ASCIIDOC_INNER,$(1),$(2),text,text,text,text) > > -$(call ASCIIDOC_INNER,$(1),$(2),$(3),epub,epub,epub,ePUB) > +$(call ASCIIDOC_INNER,$(1),$(2),epub,epub,epub,ePUB) > > clean: $(1)-clean > $(1)-clean: > @@ -187,4 +187,4 @@ endef > # asciidoc-document -- the target generator macro for asciidoc documents > ################################################################################ > > -asciidoc-document = $(call ASCIIDOC,$(pkgname),$(call UPPERCASE,$(pkgname)),$(pkgdir)) > +asciidoc-document = $(call ASCIIDOC,$(pkgname),$(call UPPERCASE,$(pkgname))) From arnout at mind.be Sun Feb 13 11:21:19 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 12:21:19 +0100 Subject: [Buildroot] [PATCH 1/2] package/cryptsetup: bump version to 2.4.3 In-Reply-To: <20220201173352.160244-1-giulio.benetti@benettiengineering.com> References: <20220201173352.160244-1-giulio.benetti@benettiengineering.com> Message-ID: On 01/02/2022 18:33, Giulio Benetti wrote: > Signed-off-by: Giulio Benetti Both applied to master, thanks. Regards, Arnout > --- > package/cryptsetup/cryptsetup.hash | 2 +- > package/cryptsetup/cryptsetup.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/cryptsetup/cryptsetup.hash b/package/cryptsetup/cryptsetup.hash > index b3bb859bdc..dce2686d31 100644 > --- a/package/cryptsetup/cryptsetup.hash > +++ b/package/cryptsetup/cryptsetup.hash > @@ -1,4 +1,4 @@ > # From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.4/sha256sums.asc > -sha256 170cc2326a9daeeeb578579176bd10d4a60ee5c4fc5bc69018ce67dafc540b9c cryptsetup-2.4.2.tar.xz > +sha256 fc0df945188172264ec5bf1d0bda08264fadc8a3f856d47eba91f31fe354b507 cryptsetup-2.4.3.tar.xz > sha256 45670cce8b6a0ddd66c8016cd8ccef6cd71f35717cbacc7f1e895b3855207b33 COPYING > sha256 8c33cc37871654ec7ed87e6fbb896c8cf33ef5ef05b1611a5aed857596ffafa5 COPYING.LGPL > diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk > index 9cfd647ac6..2e06047c56 100644 > --- a/package/cryptsetup/cryptsetup.mk > +++ b/package/cryptsetup/cryptsetup.mk > @@ -5,7 +5,7 @@ > ################################################################################ > > CRYPTSETUP_VERSION_MAJOR = 2.4 > -CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).2 > +CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).3 > CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz > CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR) > CRYPTSETUP_DEPENDENCIES = \ From arnout at mind.be Sun Feb 13 11:21:54 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 12:21:54 +0100 Subject: [Buildroot] [PATCH] DEVELOPERS: remove Martin Hicks from file In-Reply-To: <20220201174202.286878-1-giulio.benetti@benettiengineering.com> References: <20220201174202.286878-1-giulio.benetti@benettiengineering.com> Message-ID: <2ff02c8e-f9bc-8acb-28d4-c4e8297b90fc@mind.be> On 01/02/2022 18:42, Giulio Benetti wrote: > Martin Hicks asked to not maintain cryptsetup anymore: > https://lists.buildroot.org/pipermail/buildroot/2022-February/635413.html > > Also he doesn't mantain any other package, so let's remove him from this > file. > > Signed-off-by: Giulio Benetti Applied to master, thanks. Regards, Arnout > --- > DEVELOPERS | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/DEVELOPERS b/DEVELOPERS > index 5255b096b0..555723867e 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1847,9 +1847,6 @@ F: package/rpi-firmware/ > F: package/tzdata/ > F: package/zic/ > > -N: Martin Hicks > -F: package/cryptsetup/ > - > N: Martin Kepplinger > F: package/tslib/ > F: package/x11r7/xdriver_xf86-input-tslib/ From arnout at mind.be Sun Feb 13 11:25:39 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 12:25:39 +0100 Subject: [Buildroot] [PATCH] package/libglfw: bump to 3.3.6 and enable Wayland/libGLES support In-Reply-To: <8B42D9C7-D86C-4A08-B552-3523E7D0C50D@ignavus.net> References: <8B42D9C7-D86C-4A08-B552-3523E7D0C50D@ignavus.net> Message-ID: <8c6d99e1-c645-3f6d-cd18-6346f2c3d2a7@mind.be> On 01/02/2022 21:43, Andre Renaud wrote: > Signed-off-by: Andre Renaud > --- > package/libglfw/Config.in | 19 ++++++++++--------- > package/libglfw/libglfw.hash | 2 +- > package/libglfw/libglfw.mk | 16 ++++++++++++++-- > 3 files changed, 25 insertions(+), 12 deletions(-) > > diff --git a/package/libglfw/Config.in b/package/libglfw/Config.in > index 06f4376453..9705fef432 100644 > --- a/package/libglfw/Config.in > +++ b/package/libglfw/Config.in > @@ -1,17 +1,18 @@ > config BR2_PACKAGE_LIBGLFW > bool "libglfw" > - depends on BR2_PACKAGE_XORG7 > - depends on BR2_PACKAGE_HAS_LIBGL > - select BR2_PACKAGE_XLIB_LIBXCURSOR > - select BR2_PACKAGE_XLIB_LIBXEXT > - select BR2_PACKAGE_XLIB_LIBXI > - select BR2_PACKAGE_XLIB_LIBXINERAMA > - select BR2_PACKAGE_XLIB_LIBXRANDR > + depends on BR2_PACKAGE_XORG7 || BR2_PACKAGE_WAYLAND > + depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES > + select BR2_PACKAGE_XLIB_LIBXCURSOR if BR2_PACKAGE_XORG7 > + select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 > + select BR2_PACKAGE_XLIB_LIBXI if BR2_PACKAGE_XORG7 > + select BR2_PACKAGE_XLIB_LIBXINERAMA if BR2_PACKAGE_XORG7 > + select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_XORG7 > help > GLFW is an Open Source, multi-platform library for creating > windows with OpenGL contexts and receiving input and events. > > http://www.glfw.org > > -comment "libglfw depends on X.org and needs an OpenGL backend" > - depends on !BR2_PACKAGE_XORG7 || !BR2_PACKAGE_HAS_LIBGL > +comment "libglfw depends on X.org/Wayland and needs an OpenGL/GLES backend" > + depends on !(BR2_PACKAGE_XORG7 || BR2_PACKAGE_WAYLAND) > + depends on !(BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES) > diff --git a/package/libglfw/libglfw.hash b/package/libglfw/libglfw.hash > index c21a595bbc..5bffc55d26 100644 > --- a/package/libglfw/libglfw.hash > +++ b/package/libglfw/libglfw.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 98768e12e615fbe9f3386f5bbfeb91b5a3b45a8c4c77159cef06b1f6ff749537 libglfw-3.3.2.tar.gz > +sha256 ed07b90e334dcd39903e6288d90fa1ae0cf2d2119fec516cf743a0a404527c02 libglfw-3.3.6.tar.gz > sha256 149704059b5d0bf551637e50042dd4de9c2cae921021f6636298911e3a5f9462 LICENSE.md > diff --git a/package/libglfw/libglfw.mk b/package/libglfw/libglfw.mk > index 63d2a88bf8..7daf61af0e 100644 > --- a/package/libglfw/libglfw.mk > +++ b/package/libglfw/libglfw.mk > @@ -4,11 +4,19 @@ > # > ################################################################################ > > -LIBGLFW_VERSION = 3.3.2 > +LIBGLFW_VERSION = 3.3.6 > LIBGLFW_SITE = $(call github,glfw,glfw,$(LIBGLFW_VERSION)) > LIBGLFW_INSTALL_STAGING = YES > -LIBGLFW_DEPENDENCIES = libgl xlib_libXcursor xlib_libXext \ > +ifeq ($(BR2_PACKAGE_XORG7),y) > +LIBGLFW_DEPENDENCIES = xlib_libXcursor xlib_libXext \ Overriding assignment within conditions is no longer accepted by check-package, so I changed this into += I also reordered stuff so the unconditional stuff precedes the conditional stuff, and added an empty line between the different conditions. Applied to master with those changes, thanks. > xlib_libXi xlib_libXinerama xlib_libXrandr > +endif > +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) > +LIBGLFW_DEPENDENCIES += libgl > +endif > +ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) > +LIBGLFW_DEPENDENCIES += libgles Does the combination X11+GLES work? It wasn't possible before and it is possible now. I guess the autobuilders will tell us that. However, you're not registered as a developer for this package, so you won't get notified. Could you add yourself to DEVELOPERS for this package? Regards, Arnout > +endif > LIBGLFW_LICENSE = Zlib > LIBGLFW_LICENSE_FILES = LICENSE.md > > @@ -17,6 +25,10 @@ LIBGLFW_CONF_OPTS += \ > -DGLFW_BUILD_TESTS=OFF \ > -DGLFW_BUILD_DOCS=OFF > > +ifeq ($(BR2_PACKAGE_WAYLAND),y) > +LIBGLFW_CONF_OPTS += -DGLFW_USE_WAYLAND=1 > +endif > + > ifeq ($(BR2_PACKAGE_XLIB_LIBXXF86VM),y) > LIBGLFW_DEPENDENCIES += xlib_libXxf86vm > endif > -- > 2.32.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From arnout at mind.be Sun Feb 13 11:28:21 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 12:28:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/python{3}-pycryptodomex: bump to version 3.14.0 In-Reply-To: <20220202040619.2197495-1-james.hilliard1@gmail.com> References: <20220202040619.2197495-1-james.hilliard1@gmail.com> Message-ID: <79f8e0b9-8979-44d3-c0ce-0d67c101c32d@mind.be> On 02/02/2022 05:06, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master after dropping the python3 part, thanks. Regards, Arnout > --- > package/python-pycryptodomex/python-pycryptodomex.hash | 4 ++-- > package/python-pycryptodomex/python-pycryptodomex.mk | 4 ++-- > package/python3-pycryptodomex/python3-pycryptodomex.mk | 4 ++-- > 3 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/package/python-pycryptodomex/python-pycryptodomex.hash b/package/python-pycryptodomex/python-pycryptodomex.hash > index 9512f185a8..920cec2518 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 dcf0d13044c700410bdce31a5afdf6d0 pycryptodomex-3.13.0.tar.gz > -sha256 63443230247837dd03c5d4028cae5cb2e6793a9ae110e321798bee48a04ff3e9 pycryptodomex-3.13.0.tar.gz > +md5 18f571832bbfbf0f4516ccef009f2dfb pycryptodomex-3.14.0.tar.gz > +sha256 2d8bda8f949b79b78b293706aa7fc1e5c171c62661252bfdd5d12c70acd03282 pycryptodomex-3.14.0.tar.gz > # Locally computed sha256 checksums > sha256 4e04660d77c1c64e89d79537919fb8240fa21484a7e3db29f358b2c7f84ea073 LICENSE.rst > sha256 8e563c767164faa0831a333b57d23d4311cf566eb1b15d93250f4606be4eb549 Doc/LEGAL/COPYRIGHT.pycrypto > diff --git a/package/python-pycryptodomex/python-pycryptodomex.mk b/package/python-pycryptodomex/python-pycryptodomex.mk > index 92780327a1..7821052b43 100644 > --- a/package/python-pycryptodomex/python-pycryptodomex.mk > +++ b/package/python-pycryptodomex/python-pycryptodomex.mk > @@ -5,9 +5,9 @@ > ################################################################################ > > # Please keep in sync with package/python3-pycryptodomex/python3-pycryptodomex.mk > -PYTHON_PYCRYPTODOMEX_VERSION = 3.13.0 > +PYTHON_PYCRYPTODOMEX_VERSION = 3.14.0 > PYTHON_PYCRYPTODOMEX_SOURCE = pycryptodomex-$(PYTHON_PYCRYPTODOMEX_VERSION).tar.gz > -PYTHON_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/7a/21/f399ba8dfd6e40eee444151af3237af22788b8b16077c75ec0419125f619 > +PYTHON_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/a6/b3/a5e59cd3ad65d4dc470a3a63381d0495885cf1ac7659c83c6bc9e9e79df6 > PYTHON_PYCRYPTODOMEX_SETUP_TYPE = setuptools > PYTHON_PYCRYPTODOMEX_LICENSE = \ > BSD-2-Clause, \ > diff --git a/package/python3-pycryptodomex/python3-pycryptodomex.mk b/package/python3-pycryptodomex/python3-pycryptodomex.mk > index 06a46cdf63..35469df85a 100644 > --- a/package/python3-pycryptodomex/python3-pycryptodomex.mk > +++ b/package/python3-pycryptodomex/python3-pycryptodomex.mk > @@ -5,9 +5,9 @@ > ################################################################################ > > # Please keep in sync with package/python-pycryptodomex/python-pycryptodomex.mk > -PYTHON3_PYCRYPTODOMEX_VERSION = 3.13.0 > +PYTHON3_PYCRYPTODOMEX_VERSION = 3.14.0 > PYTHON3_PYCRYPTODOMEX_SOURCE = pycryptodomex-$(PYTHON3_PYCRYPTODOMEX_VERSION).tar.gz > -PYTHON3_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/7a/21/f399ba8dfd6e40eee444151af3237af22788b8b16077c75ec0419125f619 > +PYTHON3_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/a6/b3/a5e59cd3ad65d4dc470a3a63381d0495885cf1ac7659c83c6bc9e9e79df6 > PYTHON3_PYCRYPTODOMEX_SETUP_TYPE = setuptools > PYTHON3_PYCRYPTODOMEX_LICENSE = \ > BSD-2-Clause, \ From arnout at mind.be Sun Feb 13 11:24:02 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 12:24:02 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: add Giulio Benetti to cryptsetup package Message-ID: <20220213112133.553D282821@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a5e72ca9e7e490c2f94c574b29f34d17cc79d816 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 9e3142d8a4..d4b8da55ac 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1095,6 +1095,7 @@ F: configs/asus_tinker_rk3288_defconfig F: configs/olimex_a* F: package/at/ F: package/binutils/ +F: package/cryptsetup/ F: package/erlang-jiffy/ F: package/gcc/ F: package/harfbuzz/ From arnout at mind.be Sun Feb 13 11:24:02 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 12:24:02 +0100 Subject: [Buildroot] [git commit] package/cryptsetup: bump version to 2.4.3 Message-ID: <20220213112133.4CC688141E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=13472596a781b3ca622fe8528fe9d571811125f8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/cryptsetup/cryptsetup.hash | 2 +- package/cryptsetup/cryptsetup.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cryptsetup/cryptsetup.hash b/package/cryptsetup/cryptsetup.hash index b3bb859bdc..dce2686d31 100644 --- a/package/cryptsetup/cryptsetup.hash +++ b/package/cryptsetup/cryptsetup.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.4/sha256sums.asc -sha256 170cc2326a9daeeeb578579176bd10d4a60ee5c4fc5bc69018ce67dafc540b9c cryptsetup-2.4.2.tar.xz +sha256 fc0df945188172264ec5bf1d0bda08264fadc8a3f856d47eba91f31fe354b507 cryptsetup-2.4.3.tar.xz sha256 45670cce8b6a0ddd66c8016cd8ccef6cd71f35717cbacc7f1e895b3855207b33 COPYING sha256 8c33cc37871654ec7ed87e6fbb896c8cf33ef5ef05b1611a5aed857596ffafa5 COPYING.LGPL diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index 9cfd647ac6..2e06047c56 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -5,7 +5,7 @@ ################################################################################ CRYPTSETUP_VERSION_MAJOR = 2.4 -CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).2 +CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).3 CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR) CRYPTSETUP_DEPENDENCIES = \ From arnout at mind.be Sun Feb 13 11:24:02 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 12:24:02 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: remove Martin Hicks from file Message-ID: <20220213112133.5EDEA82817@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d06bf4a9d73e7a05e651e737e26abac86080878e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Martin Hicks asked to not maintain cryptsetup anymore: https://lists.buildroot.org/pipermail/buildroot/2022-February/635413.html Also he doesn't mantain any other package, so let's remove him from this file. Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 3 --- 1 file changed, 3 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index d4b8da55ac..ac702d8d0f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1849,9 +1849,6 @@ F: package/rpi-firmware/ F: package/tzdata/ F: package/zic/ -N: Martin Hicks -F: package/cryptsetup/ - N: Martin Kepplinger F: package/tslib/ F: package/x11r7/xdriver_xf86-input-tslib/ From arnout at mind.be Sun Feb 13 11:27:47 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 12:27:47 +0100 Subject: [Buildroot] [git commit] package/python-pycryptodomex: bump to version 3.14.0 Message-ID: <20220213112133.714A182821@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5e19ca4cf302c772e5a6725e7d2ab80b7b3978da 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-pycryptodomex/python-pycryptodomex.hash | 4 ++-- package/python-pycryptodomex/python-pycryptodomex.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pycryptodomex/python-pycryptodomex.hash b/package/python-pycryptodomex/python-pycryptodomex.hash index 9512f185a8..920cec2518 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 dcf0d13044c700410bdce31a5afdf6d0 pycryptodomex-3.13.0.tar.gz -sha256 63443230247837dd03c5d4028cae5cb2e6793a9ae110e321798bee48a04ff3e9 pycryptodomex-3.13.0.tar.gz +md5 18f571832bbfbf0f4516ccef009f2dfb pycryptodomex-3.14.0.tar.gz +sha256 2d8bda8f949b79b78b293706aa7fc1e5c171c62661252bfdd5d12c70acd03282 pycryptodomex-3.14.0.tar.gz # Locally computed sha256 checksums sha256 4e04660d77c1c64e89d79537919fb8240fa21484a7e3db29f358b2c7f84ea073 LICENSE.rst sha256 8e563c767164faa0831a333b57d23d4311cf566eb1b15d93250f4606be4eb549 Doc/LEGAL/COPYRIGHT.pycrypto diff --git a/package/python-pycryptodomex/python-pycryptodomex.mk b/package/python-pycryptodomex/python-pycryptodomex.mk index d752122550..e3cc11afda 100644 --- a/package/python-pycryptodomex/python-pycryptodomex.mk +++ b/package/python-pycryptodomex/python-pycryptodomex.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYCRYPTODOMEX_VERSION = 3.13.0 +PYTHON_PYCRYPTODOMEX_VERSION = 3.14.0 PYTHON_PYCRYPTODOMEX_SOURCE = pycryptodomex-$(PYTHON_PYCRYPTODOMEX_VERSION).tar.gz -PYTHON_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/7a/21/f399ba8dfd6e40eee444151af3237af22788b8b16077c75ec0419125f619 +PYTHON_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/a6/b3/a5e59cd3ad65d4dc470a3a63381d0495885cf1ac7659c83c6bc9e9e79df6 PYTHON_PYCRYPTODOMEX_SETUP_TYPE = setuptools PYTHON_PYCRYPTODOMEX_LICENSE = \ BSD-2-Clause, \ From arnout at mind.be Sun Feb 13 11:24:02 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 12:24:02 +0100 Subject: [Buildroot] [git commit] package/doc-asciidoc: fix build for out-of-tree documents Message-ID: <20220213112133.4203E82287@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4f59ababc018ee2a41b11b4f0723b2d54fa6b91b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The doc-asciidoc infra allows document to define sources and resources, and those can only be local (there is no download support for documents). The currently documented way to specify those is to use the $(pkgdir) macro to point to the document sources and resources when they are along the .mk. However, this works only for sources and not for resources. Indeed, sources are used to generate Makefile dependency rules, so $(pkgdir) is expanded and evaluated during the call to $(doc-asciidoc), while resources are expanded and evaluated when the rules are executed, which always happen after all the parsing has be done, at which point $(pkgdir) expands to the last Makefile that was parsed, which is always Buildroot's own manual. This went unnoticed so far because Buildroot's manual is 1) the last to be parsed, and 2) not using $(pkgdir) anyway. Additionally, $(pkgdir) is mostly an internal macro, that is, as this change demonstrates, difficult to use, and thus should not be used, in packages or in documents. We fix that by introducing $(FOO_DOCDIR), similar to $(FOO_PKGDIR), which points to the document directory. We choose not to name the variable FOO_PKGDIR, because it semantically is not a package. As a consequence, the last argument to the doc-asciidoc macro is now superfluous, so it is removed, which causes a little bit of churn in the main macro. As a further consequence, the third argument in the inner macro is no longer needed either, so it too is removed, which causes a bit more churn yet in the inner macro. Signed-off-by: Yann E. MORIN Cc: Frederic GARDES Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- docs/manual/adding-packages-asciidoc.txt | 17 ++++-- package/doc-asciidoc.mk | 90 ++++++++++++++++---------------- 2 files changed, 59 insertions(+), 48 deletions(-) diff --git a/docs/manual/adding-packages-asciidoc.txt b/docs/manual/adding-packages-asciidoc.txt index f9688b36c7..0bfe99d22e 100644 --- a/docs/manual/adding-packages-asciidoc.txt +++ b/docs/manual/adding-packages-asciidoc.txt @@ -39,7 +39,7 @@ Here is an example to render a simple AsciiDoc document. 04: # 05: ################################################################################ 06: -07: FOO_SOURCES = $(sort $(wildcard $(pkgdir)/*)) +07: FOO_SOURCES = $(sort $(wildcard $(FOO_DOCDIR)/*)) 08: $(eval $(call asciidoc-document)) ---- @@ -85,6 +85,17 @@ various steps: * +FOO_CHECK_DEPENDENCIES__HOOKS+, to run additional tests for the specified format ++ (see the list of rendered formats, above). +Buildroot sets the following variable that can be used in the definitions +above: + +* +$(FOO_DOCDIR)+, similar to +$(FOO_PKGDIR)+, contains the path to the + directory containing +foo.mk+. It can be used to refer to the document + sources, and can be used in the hooks, especially the post-rsync hook + if parts of the documentation needs to be generated. + +* +$(@D)+, as for traditional packages, contains the path to the directory + where the document will be copied and built. + Here is a complete example that uses all variables and all hooks: ---- @@ -94,8 +105,8 @@ Here is a complete example that uses all variables and all hooks: 04: # 05: ################################################################################ 06: -07: FOO_SOURCES = $(sort $(wildcard $(pkgdir)/*)) -08: FOO_RESOURCES = $(sort $(wildcard $(pkgdir)/ressources)) +07: FOO_SOURCES = $(sort $(wildcard $(FOO_DOCDIR)/*)) +08: FOO_RESOURCES = $(sort $(wildcard $(FOO_DOCDIR)/ressources)) 09: 10: define FOO_GEN_EXTRA_DOC 11: /path/to/generate-script --outdir=$(@D) diff --git a/package/doc-asciidoc.mk b/package/doc-asciidoc.mk index be92496c2e..2bd761edfb 100644 --- a/package/doc-asciidoc.mk +++ b/package/doc-asciidoc.mk @@ -42,12 +42,11 @@ BR_ASCIIDOC_CONF = docs/conf/asciidoc.conf # argument 1 is the name of the document and the top-level asciidoc file must # have the same name # argument 2 is the uppercase name of the document -# argument 3 is the directory containing the document -# argument 4 is the type of document to generate (-f argument of a2x) -# argument 5 is the document type as used in the make target -# argument 6 is the output file extension for the document type -# argument 7 is the human text for the document type -# argument 8 (optional) are extra arguments for a2x +# argument 3 is the type of document to generate (-f argument of a2x) +# argument 4 is the document type as used in the make target +# argument 5 is the output file extension for the document type +# argument 6 is the human text for the document type +# argument 7 (optional) are extra arguments for a2x # # The variable _SOURCES defines the dependencies. # @@ -55,55 +54,55 @@ BR_ASCIIDOC_CONF = docs/conf/asciidoc.conf # all variable references except the arguments must be $$-quoted. ################################################################################ define ASCIIDOC_INNER -$(1): $(1)-$(5) -.PHONY: $(1)-$(5) -$(1)-$(5): $$(O)/docs/$(1)/$(1).$(6) +$(1): $(1)-$(4) +.PHONY: $(1)-$(4) +$(1)-$(4): $$(O)/docs/$(1)/$(1).$(5) -asciidoc-check-dependencies-$(5): -.PHONY: $(1)-check-dependencies-$(5) +asciidoc-check-dependencies-$(4): +.PHONY: $(1)-check-dependencies-$(4) # Single line, because splitting a foreach is not easy... -$(1)-check-dependencies-$(5): asciidoc-check-dependencies-$(5) - $$(Q)$$(foreach hook,$$($(2)_CHECK_DEPENDENCIES_$$(call UPPERCASE,$(5))_HOOKS),$$(call $$(hook))$$(sep)) +$(1)-check-dependencies-$(4): asciidoc-check-dependencies-$(4) + $$(Q)$$(foreach hook,$$($(2)_CHECK_DEPENDENCIES_$$(call UPPERCASE,$(4))_HOOKS),$$(call $$(hook))$$(sep)) # Include Buildroot's AsciiDoc configuration first: # - generic configuration, # - then output-specific configuration ifneq ($$(wildcard $$(BR_ASCIIDOC_CONF)),) -$(2)_$(4)_ASCIIDOC_OPTS += -f $$(BR_ASCIIDOC_CONF) +$(2)_$(3)_ASCIIDOC_OPTS += -f $$(BR_ASCIIDOC_CONF) endif -BR_$(4)_ASCIIDOC_CONF = docs/conf/asciidoc-$(4).conf -ifneq ($$(wildcard $$(BR_$(4)_ASCIIDOC_CONF)),) -$(2)_$(4)_ASCIIDOC_OPTS += -f $$(BR_$(4)_ASCIIDOC_CONF) +BR_$(3)_ASCIIDOC_CONF = docs/conf/asciidoc-$(3).conf +ifneq ($$(wildcard $$(BR_$(3)_ASCIIDOC_CONF)),) +$(2)_$(3)_ASCIIDOC_OPTS += -f $$(BR_$(3)_ASCIIDOC_CONF) endif # Then include the document's AsciiDoc configuration: # - generic configuration, # - then output-specific configuration ifneq ($$(wildcard $$($(2)_ASCIIDOC_CONF)),) -$(2)_$(4)_ASCIIDOC_OPTS += -f $$($(2)_ASCIIDOC_CONF) +$(2)_$(3)_ASCIIDOC_OPTS += -f $$($(2)_ASCIIDOC_CONF) endif -$(2)_$(4)_ASCIIDOC_CONF = $(3)/asciidoc-$(4).conf -ifneq ($$(wildcard $$($(2)_$(4)_ASCIIDOC_CONF)),) -$(2)_$(4)_ASCIIDOC_OPTS += -f $$($(2)_$(4)_ASCIIDOC_CONF) +$(2)_$(3)_ASCIIDOC_CONF = $$($(2)_DOCDIR)/asciidoc-$(3).conf +ifneq ($$(wildcard $$($(2)_$(3)_ASCIIDOC_CONF)),) +$(2)_$(3)_ASCIIDOC_OPTS += -f $$($(2)_$(3)_ASCIIDOC_CONF) endif # Handle a2x warning about --destination-dir option only applicable to HTML # based outputs. So: # - use the --destination-dir option if possible (html and split-html), # - otherwise copy the generated document to the output directory -$(2)_$(4)_A2X_OPTS = -ifneq ($$(filter $(5),html split-html),) -$(2)_$(4)_A2X_OPTS += --destination-dir="$$(@D)" +$(2)_$(3)_A2X_OPTS = +ifneq ($$(filter $(4),html split-html),) +$(2)_$(3)_A2X_OPTS += --destination-dir="$$(@D)" else -define $(2)_$(4)_INSTALL_CMDS - $$(Q)cp -f $$(BUILD_DIR)/docs/$(1)/$(1).$(6) $$(@D) +define $(2)_$(3)_INSTALL_CMDS + $$(Q)cp -f $$(BUILD_DIR)/docs/$(1)/$(1).$(5) $$(@D) endef endif -$$(O)/docs/$(1)/$(1).$(6): export TZ=UTC +$$(O)/docs/$(1)/$(1).$(5): export TZ=UTC -ifeq ($(6)-$$(GENDOC_XSLTPROC_IS_BROKEN),pdf-y) -$$(O)/docs/$(1)/$(1).$(6): +ifeq ($(5)-$$(GENDOC_XSLTPROC_IS_BROKEN),pdf-y) +$$(O)/docs/$(1)/$(1).$(5): $$(warning PDF generation is disabled because of a bug in \ xsltproc. To be able to generate a PDF, you should \ build xsltproc from the libxslt sources >=1.1.29 and pass it \ @@ -112,20 +111,20 @@ $$(O)/docs/$(1)/$(1).$(6): else # -r $(@D) is there for documents that use external filters; those filters # generate code at the same location it finds the document's source files. -$$(O)/docs/$(1)/$(1).$(6): $$($(2)_SOURCES) \ +$$(O)/docs/$(1)/$(1).$(5): $$($(2)_SOURCES) \ $(1)-check-dependencies \ - $(1)-check-dependencies-$(5) \ + $(1)-check-dependencies-$(4) \ $(1)-prepare-sources - $$(Q)$$(call MESSAGE,"Generating $(7) $(1)...") + $$(Q)$$(call MESSAGE,"Generating $(6) $(1)...") $$(Q)mkdir -p $$(@D) - $$(Q)a2x $(8) -f $(4) -d book -L \ + $$(Q)a2x $(7) -f $(3) -d book -L \ $$(foreach r,$$($(2)_RESOURCES) $$(@D), \ --resource="$$(abspath $$(r))") \ - $$($(2)_$(4)_A2X_OPTS) \ - --asciidoc-opts="$$($(2)_$(4)_ASCIIDOC_OPTS)" \ + $$($(2)_$(3)_A2X_OPTS) \ + --asciidoc-opts="$$($(2)_$(3)_ASCIIDOC_OPTS)" \ $$(BUILD_DIR)/docs/$(1)/$(1).txt # install the generated document - $$($(2)_$(4)_INSTALL_CMDS) + $$($(2)_$(3)_INSTALL_CMDS) endif endef @@ -135,13 +134,14 @@ endef # argument 1 is the lowercase name of the document; the document's main file # must have the same name, with the .txt extension # argument 2 is the uppercase name of the document -# argument 3 is the directory containing the document's sources # # The variable _SOURCES defines the dependencies. # The variable _RESOURCES defines where the document's # resources, such as images, are located; must be an absolute path. ################################################################################ define ASCIIDOC +$(2)_DOCDIR = $(pkgdir) + # Single line, because splitting a foreach is not easy... .PHONY: $(1)-check-dependencies $(1)-check-dependencies: asciidoc-check-dependencies $$($(2)_DEPENDENCIES) @@ -153,29 +153,29 @@ $(1)-check-dependencies: asciidoc-check-dependencies $$($(2)_DEPENDENCIES) $$(BUILD_DIR)/docs/$(1)/.stamp_doc_rsynced: $$(Q)$$(call MESSAGE,"Preparing the $(1) sources...") $$(Q)mkdir -p $$(@D) - $$(Q)rsync -a $(3) $$(@D) + $$(Q)rsync -a $$($(2)_DOCDIR) $$(@D) $$(Q)$$(foreach hook,$$($(2)_POST_RSYNC_HOOKS),$$(call $$(hook))$$(sep)) .PHONY: $(1)-prepare-sources $(1)-prepare-sources: $$(BUILD_DIR)/docs/$(1)/.stamp_doc_rsynced -$(2)_ASCIIDOC_CONF = $(3)/asciidoc.conf +$(2)_ASCIIDOC_CONF = $$($(2)_DOCDIR)/asciidoc.conf -$(call ASCIIDOC_INNER,$(1),$(2),$(3),xhtml,html,html,HTML,\ +$(call ASCIIDOC_INNER,$(1),$(2),xhtml,html,html,HTML,\ --xsltproc-opts "--stringparam toc.section.depth 1") -$(call ASCIIDOC_INNER,$(1),$(2),$(3),chunked,split-html,chunked,split HTML,\ +$(call ASCIIDOC_INNER,$(1),$(2),chunked,split-html,chunked,split HTML,\ --xsltproc-opts "--stringparam toc.section.depth 1") # dblatex needs to pass the '--maxvars ...' option to xsltproc to prevent it # from reaching the template recursion limit when processing the (long) target # package table and bailing out. -$(call ASCIIDOC_INNER,$(1),$(2),$(3),pdf,pdf,pdf,PDF,\ +$(call ASCIIDOC_INNER,$(1),$(2),pdf,pdf,pdf,PDF,\ --dblatex-opts "-P latex.output.revhistory=0 -x '--maxvars 100000'") -$(call ASCIIDOC_INNER,$(1),$(2),$(3),text,text,text,text) +$(call ASCIIDOC_INNER,$(1),$(2),text,text,text,text) -$(call ASCIIDOC_INNER,$(1),$(2),$(3),epub,epub,epub,ePUB) +$(call ASCIIDOC_INNER,$(1),$(2),epub,epub,epub,ePUB) clean: $(1)-clean $(1)-clean: @@ -187,4 +187,4 @@ endef # asciidoc-document -- the target generator macro for asciidoc documents ################################################################################ -asciidoc-document = $(call ASCIIDOC,$(pkgname),$(call UPPERCASE,$(pkgname)),$(pkgdir)) +asciidoc-document = $(call ASCIIDOC,$(pkgname),$(call UPPERCASE,$(pkgname))) From arnout at mind.be Sun Feb 13 11:24:02 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 12:24:02 +0100 Subject: [Buildroot] [git commit] package/libglfw: bump to 3.3.6 and enable Wayland/libGLES support Message-ID: <20220213112133.681EE82287@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3cd9bb4f2a91d3739c5da96f5e4dd37d3ae13799 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Andre Renaud [Arnout: reorder .mk so conditional parts come after unconditional, and use += within conditions] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libglfw/Config.in | 19 ++++++++++--------- package/libglfw/libglfw.hash | 2 +- package/libglfw/libglfw.mk | 21 ++++++++++++++++++--- 3 files changed, 29 insertions(+), 13 deletions(-) diff --git a/package/libglfw/Config.in b/package/libglfw/Config.in index 06f4376453..281b55df7b 100644 --- a/package/libglfw/Config.in +++ b/package/libglfw/Config.in @@ -1,17 +1,18 @@ config BR2_PACKAGE_LIBGLFW bool "libglfw" - depends on BR2_PACKAGE_XORG7 - depends on BR2_PACKAGE_HAS_LIBGL - select BR2_PACKAGE_XLIB_LIBXCURSOR - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_XLIB_LIBXI - select BR2_PACKAGE_XLIB_LIBXINERAMA - select BR2_PACKAGE_XLIB_LIBXRANDR + depends on BR2_PACKAGE_XORG7 || BR2_PACKAGE_WAYLAND + depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES + select BR2_PACKAGE_XLIB_LIBXCURSOR if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBXI if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBXINERAMA if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_XORG7 help GLFW is an Open Source, multi-platform library for creating windows with OpenGL contexts and receiving input and events. http://www.glfw.org -comment "libglfw depends on X.org and needs an OpenGL backend" - depends on !BR2_PACKAGE_XORG7 || !BR2_PACKAGE_HAS_LIBGL +comment "libglfw depends on X.org or Wayland and an OpenGL or GLES backend" + depends on !(BR2_PACKAGE_XORG7 || BR2_PACKAGE_WAYLAND) + depends on !(BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES) diff --git a/package/libglfw/libglfw.hash b/package/libglfw/libglfw.hash index c21a595bbc..5bffc55d26 100644 --- a/package/libglfw/libglfw.hash +++ b/package/libglfw/libglfw.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 98768e12e615fbe9f3386f5bbfeb91b5a3b45a8c4c77159cef06b1f6ff749537 libglfw-3.3.2.tar.gz +sha256 ed07b90e334dcd39903e6288d90fa1ae0cf2d2119fec516cf743a0a404527c02 libglfw-3.3.6.tar.gz sha256 149704059b5d0bf551637e50042dd4de9c2cae921021f6636298911e3a5f9462 LICENSE.md diff --git a/package/libglfw/libglfw.mk b/package/libglfw/libglfw.mk index 63d2a88bf8..2ba31fd674 100644 --- a/package/libglfw/libglfw.mk +++ b/package/libglfw/libglfw.mk @@ -4,11 +4,9 @@ # ################################################################################ -LIBGLFW_VERSION = 3.3.2 +LIBGLFW_VERSION = 3.3.6 LIBGLFW_SITE = $(call github,glfw,glfw,$(LIBGLFW_VERSION)) LIBGLFW_INSTALL_STAGING = YES -LIBGLFW_DEPENDENCIES = libgl xlib_libXcursor xlib_libXext \ - xlib_libXi xlib_libXinerama xlib_libXrandr LIBGLFW_LICENSE = Zlib LIBGLFW_LICENSE_FILES = LICENSE.md @@ -17,6 +15,23 @@ LIBGLFW_CONF_OPTS += \ -DGLFW_BUILD_TESTS=OFF \ -DGLFW_BUILD_DOCS=OFF +ifeq ($(BR2_PACKAGE_XORG7),y) +LIBGLFW_DEPENDENCIES += xlib_libXcursor xlib_libXext \ + xlib_libXi xlib_libXinerama xlib_libXrandr +endif + +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) +LIBGLFW_DEPENDENCIES += libgl +endif + +ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) +LIBGLFW_DEPENDENCIES += libgles +endif + +ifeq ($(BR2_PACKAGE_WAYLAND),y) +LIBGLFW_CONF_OPTS += -DGLFW_USE_WAYLAND=1 +endif + ifeq ($(BR2_PACKAGE_XLIB_LIBXXF86VM),y) LIBGLFW_DEPENDENCIES += xlib_libXxf86vm endif From fontaine.fabrice at gmail.com Sun Feb 13 11:33:32 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 13 Feb 2022 12:33:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/strongswan: security bump to version 5.9.5 Message-ID: <20220213113332.1056370-1-fontaine.fabrice@gmail.com> Fixed a vulnerability in the EAP client implementation that was caused by incorrectly handling early EAP-Success messages. It may allow to bypass the client and in some scenarios even the server authentication, or could lead to a denial-of-service attack. This vulnerability has been registered as CVE-2021-45079: https://www.strongswan.org/blog/2022/01/24/strongswan-vulnerability-(cve-2021-45079).html https://github.com/strongswan/strongswan/releases/tag/5.9.5 Signed-off-by: Fabrice Fontaine --- package/strongswan/strongswan.hash | 6 +++--- package/strongswan/strongswan.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/strongswan/strongswan.hash b/package/strongswan/strongswan.hash index 69b3547f91..aca7ddf5cd 100644 --- a/package/strongswan/strongswan.hash +++ b/package/strongswan/strongswan.hash @@ -1,7 +1,7 @@ -# From http://download.strongswan.org/strongswan-5.9.4.tar.bz2.md5 -md5 9c387eb77f0159fdefbcf7e81c905c35 strongswan-5.9.4.tar.bz2 +# From http://download.strongswan.org/strongswan-5.9.5.tar.bz2.md5 +md5 53005324e3cba8592f1fb958b1c2d0e5 strongswan-5.9.5.tar.bz2 # Calculated based on the hash above -sha256 45fdf1a4c2af086d8ff5b76fd7b21d3b6f0890f365f83bf4c9a75dda26887518 strongswan-5.9.4.tar.bz2 +sha256 983e4ef4a4c6c9d69f5fe6707c7fe0b2b9a9291943bbf4e008faab6bf91c0bdd strongswan-5.9.5.tar.bz2 # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 2292e21797754548dccdef9eef6aee7584e552fbd890fa914e1de8d3577d23f0 LICENSE diff --git a/package/strongswan/strongswan.mk b/package/strongswan/strongswan.mk index 2891e5aa5e..95079aceb3 100644 --- a/package/strongswan/strongswan.mk +++ b/package/strongswan/strongswan.mk @@ -4,7 +4,7 @@ # ################################################################################ -STRONGSWAN_VERSION = 5.9.4 +STRONGSWAN_VERSION = 5.9.5 STRONGSWAN_SOURCE = strongswan-$(STRONGSWAN_VERSION).tar.bz2 STRONGSWAN_SITE = http://download.strongswan.org STRONGSWAN_LICENSE = GPL-2.0+ -- 2.34.1 From arnout at mind.be Sun Feb 13 11:35:33 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 12:35:33 +0100 Subject: [Buildroot] [PATCH] configs/roc_pc_rk3399_defconfig: expand rootfs size to 120M In-Reply-To: <20220202171035.1740791-2-giulio.benetti@benettiengineering.com> References: <20220202171035.1740791-1-giulio.benetti@benettiengineering.com> <20220202171035.1740791-2-giulio.benetti@benettiengineering.com> Message-ID: On 02/02/2022 18:10, Giulio Benetti wrote: > Default 60M for rootfs are not enough and generate a build failure, so > let's expand rootfs size to 120M. Did you find out _why_ 64M wasn't enough for just the kernel and busybox? Is it because of all the stupid modules in the default arm64 defconfig? But most other arm64 defconfigs don't seem to need this... > > Signed-off-by: Giulio Benetti > --- > configs/roc_pc_rk3399_defconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/configs/roc_pc_rk3399_defconfig b/configs/roc_pc_rk3399_defconfig > index dfbc5e4f47..ae7cf19a80 100644 > --- a/configs/roc_pc_rk3399_defconfig > +++ b/configs/roc_pc_rk3399_defconfig > @@ -45,7 +45,7 @@ BR2_TARGET_GENERIC_HOSTNAME="roc-rk3399-pc" > BR2_TARGET_GENERIC_ISSUE="Welcome to ROC-RK3399-PC!" > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > -BR2_TARGET_ROOTFS_EXT2_SIZE="64M" > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > BR2_PACKAGE_HOST_DOSFSTOOLS=y > BR2_PACKAGE_HOST_GENIMAGE=y > BR2_PACKAGE_HOST_MTOOLS=y Unrelated by this patch, but the image doesn't have a FAT partition so dosfstols and mtools aren't needed. Regards, Arnout From fontaine.fabrice at gmail.com Sun Feb 13 11:42:14 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 13 Feb 2022 12:42:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/libbpf: add LIBBPF_CPE_ID_VENDOR Message-ID: <20220213114214.1057171-1-fontaine.fabrice@gmail.com> cpe:2.3:a:libbpf_project:libbpf is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Alibbpf_project%3Alibbpf Signed-off-by: Fabrice Fontaine --- package/libbpf/libbpf.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libbpf/libbpf.mk b/package/libbpf/libbpf.mk index 6750b063c0..06f3f3475a 100644 --- a/package/libbpf/libbpf.mk +++ b/package/libbpf/libbpf.mk @@ -8,6 +8,7 @@ LIBBPF_VERSION = 0.6.1 LIBBPF_SITE = $(call github,libbpf,libbpf,v$(LIBBPF_VERSION)) LIBBPF_LICENSE = GPL-2.0, LGPL-2.1, BSD-2-Clause LIBBPF_LICENSE_FILES = LICENSE LICENSE.BSD-2-Clause LICENSE.LGPL-2.1 +LIBBPF_CPE_ID_VENDOR = libbpf_project LIBBPF_DEPENDENCIES = host-bison host-flex host-pkgconf elfutils zlib LIBBPF_INSTALL_STAGING = YES -- 2.34.1 From peter at korsgaard.com Sun Feb 13 11:43:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Feb 2022 12:43:45 +0100 Subject: [Buildroot] [PATCH v6 1/8] package/webp: enable host build In-Reply-To: <20220205201837.3324085-1-james.hilliard1@gmail.com> (James Hilliard's message of "Sat, 5 Feb 2022 13:18:30 -0700") References: <20220205201837.3324085-1-james.hilliard1@gmail.com> Message-ID: <87wnhzkn4e.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > This will be needed by qt5webengine. > Signed-off-by: James Hilliard > --- > package/webp/webp.mk | 5 +++++ > 1 file changed, 5 insertions(+) > 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 What about the other configure options? It should also explicitly disable gif/gl/png/jpeg/tiff support (unless you need it?) Committed with that fixed, thanks. I also pushed a cleanup patch to use --enable/--disable for png/jpeg/tiff for the target build. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 13 11:43:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Feb 2022 12:43:56 +0100 Subject: [Buildroot] [git commit] package/webp: enable host build Message-ID: <20220213113628.CB30B82578@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=78a3807295f7436297056aab6ff4916bdb0f8289 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This will be needed by qt5webengine. Signed-off-by: James Hilliard [Peter: explicitly disable gif/gl/jpeg/png/tiff support] Signed-off-by: Peter Korsgaard --- package/webp/webp.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package/webp/webp.mk b/package/webp/webp.mk index d1462426c6..e8d204919c 100644 --- a/package/webp/webp.mk +++ b/package/webp/webp.mk @@ -19,6 +19,15 @@ WEBP_CONF_OPTS += \ --with-tiffincludedir=$(STAGING_DIR)/usr/include \ --with-tifflibdir=$(STAGING_DIR)/usr/lib +HOST_WEBP_CONF_OPTS += \ + --enable-libwebpdemux \ + --enable-libwebpmux \ + --disable-gif \ + --disable-gl \ + --disable-jpeg \ + --disable-png \ + --disable-tiff + ifeq ($(BR2_PACKAGE_WEBP_DEMUX),y) WEBP_CONF_OPTS += --enable-libwebpdemux else @@ -56,3 +65,4 @@ WEBP_DEPENDENCIES += $(if $(BR2_PACKAGE_JPEG),jpeg) WEBP_DEPENDENCIES += $(if $(BR2_PACKAGE_TIFF),tiff) $(eval $(autotools-package)) +$(eval $(host-autotools-package)) From peter at korsgaard.com Sun Feb 13 11:43:57 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Feb 2022 12:43:57 +0100 Subject: [Buildroot] [git commit] package/webp: use configure options for jpeg/png/tiff support Message-ID: <20220213113628.DAF5082745@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4284eea7c9f66b22a7f87a4edd827692f88afed4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Webp nowadays has explicit configure options for jpeg/png/tiff, so use those to explicitly enable/disable support. Signed-off-by: Peter Korsgaard --- package/webp/webp.mk | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/package/webp/webp.mk b/package/webp/webp.mk index e8d204919c..d725b44438 100644 --- a/package/webp/webp.mk +++ b/package/webp/webp.mk @@ -13,12 +13,6 @@ WEBP_CPE_ID_VENDOR = webmproject WEBP_CPE_ID_PRODUCT = libwebp WEBP_INSTALL_STAGING = YES -WEBP_CONF_OPTS += \ - --with-jpegincludedir=$(STAGING_DIR)/usr/include \ - --with-jpeglibdir=$(STAGING_DIR)/usr/lib \ - --with-tiffincludedir=$(STAGING_DIR)/usr/include \ - --with-tifflibdir=$(STAGING_DIR)/usr/lib - HOST_WEBP_CONF_OPTS += \ --enable-libwebpdemux \ --enable-libwebpmux \ @@ -47,6 +41,16 @@ else WEBP_CONF_OPTS += --disable-gif endif +ifeq ($(BR2_PACKAGE_JPEG),y) +WEBP_DEPENDENCIES += jpeg +WEBP_CONF_OPTS += \ + --enable-jpeg \ + --with-jpegincludedir=$(STAGING_DIR)/usr/include \ + --with-jpeglibdir=$(STAGING_DIR)/usr/lib +else +WEBP_CONF_OPTS += --disable-jpeg +endif + ifeq ($(BR2_PACKAGE_LIBFREEGLUT),y) WEBP_DEPENDENCIES += libfreeglut WEBP_CONF_OPTS += --enable-gl @@ -56,13 +60,21 @@ endif ifeq ($(BR2_PACKAGE_LIBPNG),y) WEBP_DEPENDENCIES += libpng +WEBP_CONF_OPTS += --enable-png WEBP_CONF_ENV += ac_cv_path_LIBPNG_CONFIG=$(STAGING_DIR)/usr/bin/libpng-config else -WEBP_CONF_ENV += ac_cv_path_LIBPNG_CONFIG=/bin/false +WEBP_CONF_OPTS += --disable-png endif -WEBP_DEPENDENCIES += $(if $(BR2_PACKAGE_JPEG),jpeg) -WEBP_DEPENDENCIES += $(if $(BR2_PACKAGE_TIFF),tiff) +ifeq ($(BR2_PACKAGE_TIFF),y) +WEBP_DEPENDENCIES += tiff +WEBP_CONF_OPTS += \ + --enable-tiff \ + --with-tiffincludedir=$(STAGING_DIR)/usr/include \ + --with-tifflibdir=$(STAGING_DIR)/usr/lib +else +WEBP_CONF_OPTS += --disable-tiff +endif $(eval $(autotools-package)) $(eval $(host-autotools-package)) From peter at korsgaard.com Sun Feb 13 11:43:57 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Feb 2022 12:43:57 +0100 Subject: [Buildroot] [git commit] package/webp: explicitly disable SDL support Message-ID: <20220213113628.EC60F82578@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=af54104cbb38a2d8843f1a55e3f4283cc9a5aca9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Webp has optional SDL support. Explicitly disable it for now. Signed-off-by: Peter Korsgaard --- package/webp/webp.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/webp/webp.mk b/package/webp/webp.mk index d725b44438..f23e1c92e1 100644 --- a/package/webp/webp.mk +++ b/package/webp/webp.mk @@ -13,6 +13,9 @@ WEBP_CPE_ID_VENDOR = webmproject WEBP_CPE_ID_PRODUCT = libwebp WEBP_INSTALL_STAGING = YES +WEBP_CONF_OPTS += \ + --disable-sdl + HOST_WEBP_CONF_OPTS += \ --enable-libwebpdemux \ --enable-libwebpmux \ @@ -20,6 +23,7 @@ HOST_WEBP_CONF_OPTS += \ --disable-gl \ --disable-jpeg \ --disable-png \ + --disable-sdl \ --disable-tiff ifeq ($(BR2_PACKAGE_WEBP_DEMUX),y) From arnout at mind.be Sun Feb 13 11:44:29 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 12:44:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/sconeserver: fix build with icu and libxml2 In-Reply-To: <20220202173306.42559-1-fontaine.fabrice@gmail.com> References: <20220202173306.42559-1-fontaine.fabrice@gmail.com> Message-ID: <19a05780-b4ed-08a5-8a95-4320fe9e7f42@mind.be> On 02/02/2022 18:33, Fabrice Fontaine wrote: > Fix the following build failure raised since addition of icu support in > libxml2 through commit 49d7c85421e87d9d762be9352805cb47a2f0bbeb: > > In file included from /home/peko/autobuild/instance-1/output-1/host/mips64el-buildroot-linux-gnu/sysroot/usr/include/unicode/ptypes.h:52:0, > from /home/peko/autobuild/instance-1/output-1/host/mips64el-buildroot-linux-gnu/sysroot/usr/include/unicode/umachine.h:46, > from /home/peko/autobuild/instance-1/output-1/host/mips64el-buildroot-linux-gnu/sysroot/usr/include/unicode/utypes.h:38, > from /home/peko/autobuild/instance-1/output-1/host/mips64el-buildroot-linux-gnu/sysroot/usr/include/unicode/ucnv_err.h:88, > from /home/peko/autobuild/instance-1/output-1/host/mips64el-buildroot-linux-gnu/sysroot/usr/include/unicode/ucnv.h:51, > from /home/peko/autobuild/instance-1/output-1/host/mips64el-buildroot-linux-gnu/sysroot/usr/bin/../../usr/include/libxml2/libxml/encoding.h:31, > from /home/peko/autobuild/instance-1/output-1/host/mips64el-buildroot-linux-gnu/sysroot/usr/bin/../../usr/include/libxml2/libxml/parser.h:812, > from conftest.cpp:61: > /home/peko/autobuild/instance-1/output-1/host/mips64el-buildroot-linux-gnu/sysroot/usr/include/unicode/localpointer.h:224:41: error: 'noexcept' does not name a type > LocalPointer(LocalPointer &&src) U_NOEXCEPT : LocalPointerBase(src.ptr) { > ^ > /home/peko/autobuild/instance-1/output-1/host/mips64el-buildroot-linux-gnu/sysroot/usr/include/unicode/localpointer.h:224:41: note: C++11 'noexcept' only available with -std=c++11 or -std=gnu++11 > > Fixes: > - http://autobuild.buildroot.org/results/be043792e6e5501631517881b10096291a654364 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/sconeserver/sconeserver.mk | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/package/sconeserver/sconeserver.mk b/package/sconeserver/sconeserver.mk > index 17407c29f5..2b28f8015c 100644 > --- a/package/sconeserver/sconeserver.mk > +++ b/package/sconeserver/sconeserver.mk > @@ -29,6 +29,8 @@ SCONESERVER_CONF_OPTS += \ > ifeq ($(BR2_PACKAGE_LIBXML2),y) > SCONESERVER_CONF_OPTS += \ > --with-xml2-config="$(STAGING_DIR)/usr/bin/xml2-config" > +# Needed to fix build failure when icu is enabled in libxml2 > +SCONESERVER_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" > endif > > ifeq ($(BR2_PACKAGE_OPENSSL),y) From arnout at mind.be Sun Feb 13 11:44:56 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 12:44:56 +0100 Subject: [Buildroot] [PATCH] package/cryptsetup: fix build failure with Microblaze In-Reply-To: <20220202203725.2115889-1-giulio.benetti@benettiengineering.com> References: <20220202203725.2115889-1-giulio.benetti@benettiengineering.com> Message-ID: On 02/02/2022 21:37, Giulio Benetti wrote: > Add local patch pending upstream[1] to fix the build failure after my > suggestion[2] to imitate what I've done with libfuse[3]. > > [1]: https://gitlab.com/cryptsetup/cryptsetup/-/merge_requests/275?commit_id=5f71b3d63181aa88a68f7f71eab8801f2d8d2cde > [2]: https://gitlab.com/cryptsetup/cryptsetup/-/issues/709 > [3]: https://github.com/libfuse/libfuse/pull/620/commits/3aba09a5c56e017746c5c1652dbc845f4db7374a > > Fixes: > http://autobuild.buildroot.net/results/bad/bad4d01fde3191e4d481a8e9dae18df3b1a94537/ > > Signed-off-by: Giulio Benetti Applied to master, thanks. Regards, Arnout > --- > ...d-check-program-for-symver-attribute.patch | 56 +++++++++++++++++++ > 1 file changed, 56 insertions(+) > create mode 100644 package/cryptsetup/0001-Add-check-program-for-symver-attribute.patch > > diff --git a/package/cryptsetup/0001-Add-check-program-for-symver-attribute.patch b/package/cryptsetup/0001-Add-check-program-for-symver-attribute.patch > new file mode 100644 > index 0000000000..04f59a2050 > --- /dev/null > +++ b/package/cryptsetup/0001-Add-check-program-for-symver-attribute.patch > @@ -0,0 +1,56 @@ > +From 7c6ec620de3f99d4212f4a54aa576df1b97020ab Mon Sep 17 00:00:00 2001 > +From: Ondrej Kozina > +Date: Wed, 2 Feb 2022 11:34:57 +0100 > +Subject: [PATCH] Add check program for symver attribute. > + > +Fixes: #709. > +Signed-off-by: Giulio Benetti > +--- > + configure.ac | 11 +++++++++++ > + lib/libcryptsetup_symver.h | 8 +++----- > + 2 files changed, 14 insertions(+), 5 deletions(-) > + > +diff --git a/configure.ac b/configure.ac > +index a0e5990d..b052f8cf 100644 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -554,6 +554,17 @@ if test "x$enable_static_cryptsetup" = "xyes"; then > + PKG_CONFIG=$saved_PKG_CONFIG > + fi > + > ++dnl Check compiler support for symver function attribute > ++saved_CFLAGS=$CFLAGS > ++CFLAGS="-O0 -Werror" > ++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ > ++ void _test_sym(void); > ++ __attribute__((__symver__("sym at VERSION_4.2"))) void _test_sym(void) {} > ++]], > ++[[ _test_sym() ]] > ++)],[ AC_DEFINE([HAVE_ATTRIBUTE_SYMVER], 1, [Define to 1 to use __attribute__((symver))])]) > ++CFLAGS=$saved_CFLAGS > ++ > + AC_MSG_CHECKING([for systemd tmpfiles config directory]) > + PKG_CHECK_VAR([systemd_tmpfilesdir], [systemd], [tmpfilesdir], [], [systemd_tmpfilesdir=no]) > + AC_MSG_RESULT([$systemd_tmpfilesdir]) > +diff --git a/lib/libcryptsetup_symver.h b/lib/libcryptsetup_symver.h > +index 2a804b6a..3558310d 100644 > +--- a/lib/libcryptsetup_symver.h > ++++ b/lib/libcryptsetup_symver.h > +@@ -67,11 +67,9 @@ > + * under CRYPT_SYMBOL_EXPORT_OLD(int, crypt_func_X, ...) macro > + */ > + > +-#ifdef __has_attribute > +-# if __has_attribute(symver) > +-# define _CRYPT_SYMVER(_local_sym, _public_sym, _ver_str, _maj, _min) \ > +- __attribute__((__symver__(#_public_sym _ver_str #_maj "." #_min))) > +-# endif > ++#if HAVE_ATTRIBUTE_SYMVER > ++# define _CRYPT_SYMVER(_local_sym, _public_sym, _ver_str, _maj, _min) \ > ++ __attribute__((__symver__(#_public_sym _ver_str #_maj "." #_min))) > + #endif > + > + #if !defined(_CRYPT_SYMVER) && defined(__GNUC__) > +-- > +2.25.1 > + From arnout at mind.be Sun Feb 13 11:46:05 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 12:46:05 +0100 Subject: [Buildroot] [PATCH] board/intel/galileo: fix build failure with host gcc 10 In-Reply-To: <20220202214357.2640301-1-giulio.benetti@benettiengineering.com> References: <20220202214357.2640301-1-giulio.benetti@benettiengineering.com> Message-ID: On 02/02/2022 22:43, Giulio Benetti wrote: > Building galileo_defconfig throws error: > ``` > /usr/bin/ld: arch/x86/tools/relocs_64.o:(.bss+0x0): multiple definition of `per_cpu_load_addr'; arch/x86/tools/relocs_32.o:(.bss+0x0): first defined here > ``` > > To fix this let's add an upstreamed patch[1] and add BR2_GLOBAL_PATCH_DIR > to galileo_defconfig to point to where patch is. > > [1]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=eeeda4cd06e828b331b15741a204ff9f5874d28d.patch > > Fixes: > https://gitlab.com/ymorin/buildroot/-/jobs/2035821039 > > Signed-off-by: Giulio Benetti You can't imagine how much joy it gives me to see a patch from 2014 applied here... Applied to master, thanks. Regards, Arnout > --- > ...relocs-Make-per_cpu_load_addr-static.patch | 39 +++++++++++++++++++ > configs/galileo_defconfig | 1 + > 2 files changed, 40 insertions(+) > create mode 100644 board/intel/galileo/patches/linux/0001-x86-relocs-Make-per_cpu_load_addr-static.patch > > diff --git a/board/intel/galileo/patches/linux/0001-x86-relocs-Make-per_cpu_load_addr-static.patch b/board/intel/galileo/patches/linux/0001-x86-relocs-Make-per_cpu_load_addr-static.patch > new file mode 100644 > index 0000000000..1d206cc6d1 > --- /dev/null > +++ b/board/intel/galileo/patches/linux/0001-x86-relocs-Make-per_cpu_load_addr-static.patch > @@ -0,0 +1,39 @@ > +From eeeda4cd06e828b331b15741a204ff9f5874d28d Mon Sep 17 00:00:00 2001 > +From: Ben Hutchings > +Date: Wed, 24 Sep 2014 13:30:12 +0100 > +Subject: [PATCH] x86/relocs: Make per_cpu_load_addr static > + > +per_cpu_load_addr is only used for 64-bit relocations, but is > +declared in both configurations of relocs.c - with different > +types. This has undefined behaviour in general. GNU ld is > +documented to use the larger size in this case, but other tools > +may differ and some warn about this. > + > +References: https://bugs.debian.org/748577 > +Reported-by: Michael Tautschnig > +Signed-off-by: Ben Hutchings > +Cc: 748577 at bugs.debian.org > +Cc: Linus Torvalds > +Link: http://lkml.kernel.org/r/1411561812.3659.23.camel at decadent.org.uk > +Signed-off-by: Ingo Molnar > +Signed-off-by: Giulio Benetti > +--- > + arch/x86/tools/relocs.c | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c > +index bbb1d2259ecf..a5efb21d5228 100644 > +--- a/arch/x86/tools/relocs.c > ++++ b/arch/x86/tools/relocs.c > +@@ -695,7 +695,7 @@ static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel, > + * > + */ > + static int per_cpu_shndx = -1; > +-Elf_Addr per_cpu_load_addr; > ++static Elf_Addr per_cpu_load_addr; > + > + static void percpu_init(void) > + { > +-- > +2.25.1 > + > diff --git a/configs/galileo_defconfig b/configs/galileo_defconfig > index 03ca23f414..a8fd0a6dcc 100644 > --- a/configs/galileo_defconfig > +++ b/configs/galileo_defconfig > @@ -1,4 +1,5 @@ > BR2_x86_x1000=y > +BR2_GLOBAL_PATCH_DIR=board/intel/galileo/patches > # Needed for TARGET_GRUB2 > BR2_TOOLCHAIN_BUILDROOT_WCHAR=y > # Linux headers same as kernel, a 3.14 series From bernd.kuhls at t-online.de Sun Feb 13 11:47:12 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 13 Feb 2022 12:47:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi: fix build with python-3.10 Message-ID: <20220213114712.2738619-1-bernd.kuhls@t-online.de> Fixes build error: CMake Error at /usr/share/cmake-3.18/Modules/FindPackageHandleStandardArgs.cmake:165 (message): Could NOT find PythonLibs (missing: PYTHON_LIBRARIES) (found suitable version "3.10.2", minimum required is "3.5") Signed-off-by: Bernd Kuhls --- v2: fixed typo in PYTHON_EXECUTABLE configure option (usr/bin/ -> bin/) package/kodi/0002-cmake-findpython.patch | 135 ++++++++++++++++++ ...-cmake-search-for-python-interpreter.patch | 48 +++++++ ...-allow-to-override-PYTHON_EXECUTABLE.patch | 39 +++++ package/kodi/kodi.mk | 4 + 4 files changed, 226 insertions(+) create mode 100644 package/kodi/0002-cmake-findpython.patch create mode 100644 package/kodi/0003-cmake-search-for-python-interpreter.patch create mode 100644 package/kodi/0004-cmake-allow-to-override-PYTHON_EXECUTABLE.patch diff --git a/package/kodi/0002-cmake-findpython.patch b/package/kodi/0002-cmake-findpython.patch new file mode 100644 index 0000000000..60728aa465 --- /dev/null +++ b/package/kodi/0002-cmake-findpython.patch @@ -0,0 +1,135 @@ +From 52f44ec5c7b728a6afaca867e8d815fced2012ec Mon Sep 17 00:00:00 2001 +From: fuzzard +Date: Sat, 31 Jul 2021 19:22:08 +1000 +Subject: [PATCH] [cmake] findpython + +use cmakes (3.12+) FindPython3 module. +Provide cmake vars for user to overide specific version, and search path + +Backport of https://github.com/xbmc/xbmc/pull/20045 + +Patch sent upstream: https://github.com/xbmc/xbmc/pull/20989 + +Signed-off-by: Bernd Kuhls +--- + CMakeLists.txt | 4 +- + cmake/modules/FindPython.cmake | 71 ++++++++++++++++++++++++++-------- + 2 files changed, 56 insertions(+), 19 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2d5369798d..9bed54ef40 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.4) ++cmake_minimum_required(VERSION 3.12) + if(WIN32) + # Version 3.15 is required to use "PREPEND" for dependencies + cmake_minimum_required(VERSION 3.15) +@@ -187,8 +187,6 @@ core_require_dep(${required_deps}) + find_package(TexturePacker REQUIRED) + find_package(JsonSchemaBuilder REQUIRED) + +-SET(PYTHON_VERSION 3.8) +- + if(ENABLE_MARIADBCLIENT AND NOT ENABLE_MARIADBCLIENT STREQUAL AUTO AND ENABLE_MYSQLCLIENT AND NOT ENABLE_MYSQLCLIENT STREQUAL AUTO) + MESSAGE(FATAL_ERROR "You can not use MySql and MariaDB at the same time. Disable one by adding -DENABLE_MYSQLCLIENT=OFF or -DENABLE_MARIADBCLIENT=OFF.") + elseif(ENABLE_MYSQLCLIENT AND NOT ENABLE_MYSQLCLIENT STREQUAL AUTO) +diff --git a/cmake/modules/FindPython.cmake b/cmake/modules/FindPython.cmake +index c40e12d551..35220b5426 100644 +--- a/cmake/modules/FindPython.cmake ++++ b/cmake/modules/FindPython.cmake +@@ -1,17 +1,56 @@ +-# - Try to find python +-# Once done this will define ++# FindPython ++# -------- ++# Finds Python3 libraries ++# ++# This module will search for the required python libraries on the system ++# If multiple versions are found, the highest version will be used. ++# ++# -------- ++# ++# the following variables influence behaviour: ++# ++# PYTHON_PATH - use external python not found in system paths ++# usage: -DPYTHON_PATH=/path/to/python/lib ++# PYTHON_VER - use exact python version, fail if not found ++# usage: -DPYTHON_VER=3.8 ++# ++# -------- ++# ++# This module will define the following variables: + # + # PYTHON_FOUND - system has PYTHON ++# PYTHON_VERSION - Python version number (Major.Minor) + # PYTHON_INCLUDE_DIRS - the python include directory + # PYTHON_LIBRARIES - The python libraries ++# PYTHON_LDFLAGS - Python provided link options ++# ++# -------- ++# ++ ++# for Depends builds, set search root dir to depends path ++if(KODI_DEPENDSBUILD) ++ set(Python3_USE_STATIC_LIBS TRUE) ++ set(Python3_ROOT_DIR ${DEPENDS_PATH}/lib) ++endif() ++ ++# Provide root dir to search for Python if provided ++if(PYTHON_PATH) ++ set(Python3_ROOT_DIR ${PYTHON_PATH}) ++ ++ # unset cache var so we can generate again with a different dir (or none) if desired ++ unset(PYTHON_PATH CACHE) ++endif() ++ ++# Set specific version of Python to find if provided ++if(PYTHON_VER) ++ set(VERSION ${PYTHON_VER}) ++ set(EXACT_VER "EXACT") + +-if(PKG_CONFIG_FOUND) +- pkg_check_modules(PC_PYTHON python3>=3.5 QUIET) ++ # unset cache var so we can generate again with a different ver (or none) if desired ++ unset(PYTHON_VER CACHE) + endif() + +-find_program(PYTHON_EXECUTABLE python3 ONLY_CMAKE_FIND_ROOT_PATH) +-find_library(PYTHON_LIBRARY NAMES python3.9 python3.8 python3.7 python3.6 python3.5 PATHS ${PC_PYTHON_LIBDIR}) +-find_path(PYTHON_INCLUDE_DIR NAMES Python.h PATHS ${PC_PYTHON_INCLUDE_DIRS} PATH_SUFFIXES python3.9 python3.8 python3.7 python3.6 python3.5) ++find_package(Python3 ${VERSION} ${EXACT_VER} COMPONENTS Development) + + if(KODI_DEPENDSBUILD) + find_library(FFI_LIBRARY ffi REQUIRED) +@@ -27,17 +66,17 @@ if(KODI_DEPENDSBUILD) + endif() + endif() + +- set(PYTHON_LIBRARIES ${PYTHON_LIBRARY} ${FFI_LIBRARY} ${EXPAT_LIBRARY} ${INTL_LIBRARY} ${GMP_LIBRARY} ${PYTHON_DEP_LIBRARIES}) +-else() +- find_package(PythonLibs 3.5 REQUIRED) +- list(APPEND PYTHON_LIBRARIES ${PC_PYTHON_STATIC_LIBRARIES}) ++ list(APPEND Python3_LIBRARIES ${FFI_LIBRARY} ${EXPAT_LIBRARY} ${INTL_LIBRARY} ${GMP_LIBRARY} ${PYTHON_DEP_LIBRARIES}) + endif() + +-include(FindPackageHandleStandardArgs) +-find_package_handle_standard_args(Python REQUIRED_VARS PYTHON_INCLUDE_DIR PYTHON_LIBRARY PYTHON_LIBRARIES) +-if(PYTHON_FOUND) +- set(PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_DIR}) ++if(Python3_FOUND) + list(APPEND PYTHON_DEFINITIONS -DHAS_PYTHON=1) ++ # These are all set for easy integration with the rest of our build system ++ set(PYTHON_FOUND ${Python3_FOUND}) ++ set(PYTHON_INCLUDE_DIRS ${Python3_INCLUDE_DIRS}) ++ set(PYTHON_LIBRARIES ${Python3_LIBRARIES}) ++ set(PYTHON_VERSION "${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}" CACHE INTERNAL "" FORCE) ++ set(PYTHON_LDFLAGS ${Python3_LINK_OPTIONS}) + endif() + +-mark_as_advanced(PYTHON_EXECUTABLE PYTHON_INCLUDE_DIRS PYTHON_INCLUDE_DIR PYTHON_LIBRARY PYTHON_LIBRARIES PYTHON_LDFLAGS FFI_LIBRARY EXPAT_LIBRARY INTL_LIBRARY GMP_LIBRARY) ++mark_as_advanced(PYTHON_EXECUTABLE PYTHON_VERSION PYTHON_INCLUDE_DIRS PYTHON_LDFLAGS FFI_LIBRARY EXPAT_LIBRARY INTL_LIBRARY GMP_LIBRARY) +-- +2.30.2 + diff --git a/package/kodi/0003-cmake-search-for-python-interpreter.patch b/package/kodi/0003-cmake-search-for-python-interpreter.patch new file mode 100644 index 0000000000..158345a212 --- /dev/null +++ b/package/kodi/0003-cmake-search-for-python-interpreter.patch @@ -0,0 +1,48 @@ +From 6bb112e585f2ffd10e5af70ca28159dd235d063b Mon Sep 17 00:00:00 2001 +From: wsnipex +Date: Thu, 19 Aug 2021 08:50:05 +0200 +Subject: [PATCH] [cmake] search for python interpreter fixes installing + eventclients on linux + +Backport of https://github.com/xbmc/xbmc/pull/20058 + +Patch sent upstream: https://github.com/xbmc/xbmc/pull/20989 + +Signed-off-by: Bernd Kuhls +--- + cmake/modules/FindPython.cmake | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/cmake/modules/FindPython.cmake b/cmake/modules/FindPython.cmake +index 35220b5426..c469ed9fb6 100644 +--- a/cmake/modules/FindPython.cmake ++++ b/cmake/modules/FindPython.cmake +@@ -20,6 +20,7 @@ + # + # PYTHON_FOUND - system has PYTHON + # PYTHON_VERSION - Python version number (Major.Minor) ++# PYTHON_EXECUTABLE - Python interpreter binary + # PYTHON_INCLUDE_DIRS - the python include directory + # PYTHON_LIBRARIES - The python libraries + # PYTHON_LDFLAGS - Python provided link options +@@ -51,6 +52,9 @@ if(PYTHON_VER) + endif() + + find_package(Python3 ${VERSION} ${EXACT_VER} COMPONENTS Development) ++if(CORE_SYSTEM_NAME STREQUAL linux) ++ find_package(Python3 ${VERSION} ${EXACT_VER} COMPONENTS Interpreter) ++endif() + + if(KODI_DEPENDSBUILD) + find_library(FFI_LIBRARY ffi REQUIRED) +@@ -73,6 +77,7 @@ if(Python3_FOUND) + list(APPEND PYTHON_DEFINITIONS -DHAS_PYTHON=1) + # These are all set for easy integration with the rest of our build system + set(PYTHON_FOUND ${Python3_FOUND}) ++ set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE} CACHE FILEPATH "Python interpreter" FORCE) + set(PYTHON_INCLUDE_DIRS ${Python3_INCLUDE_DIRS}) + set(PYTHON_LIBRARIES ${Python3_LIBRARIES}) + set(PYTHON_VERSION "${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}" CACHE INTERNAL "" FORCE) +-- +2.30.2 + diff --git a/package/kodi/0004-cmake-allow-to-override-PYTHON_EXECUTABLE.patch b/package/kodi/0004-cmake-allow-to-override-PYTHON_EXECUTABLE.patch new file mode 100644 index 0000000000..d1e9b3f25f --- /dev/null +++ b/package/kodi/0004-cmake-allow-to-override-PYTHON_EXECUTABLE.patch @@ -0,0 +1,39 @@ +From 25681d8adde4a90d5da02051e30f6a3a27322136 Mon Sep 17 00:00:00 2001 +From: Jernej Skrabec +Date: Sat, 25 Sep 2021 07:41:10 +0200 +Subject: [PATCH] [cmake] allow to override PYTHON_EXECUTABLE + +If Kodi is being build for distro which has different python version +than host, PYTHON_EXECUTABLE must be overriden and point to distro +version. Otherwise, eventclients will be installed in wrong location and +be thus unusable. + +Use case: Cross compiling Kodi for LibreELEC + +Backport of https://github.com/xbmc/xbmc/pull/20171 + +Patch sent upstream: https://github.com/xbmc/xbmc/pull/20989 + +Signed-off-by: Bernd Kuhls +--- + cmake/modules/FindPython.cmake | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/cmake/modules/FindPython.cmake b/cmake/modules/FindPython.cmake +index c469ed9fb6..87b8368705 100644 +--- a/cmake/modules/FindPython.cmake ++++ b/cmake/modules/FindPython.cmake +@@ -77,7 +77,9 @@ if(Python3_FOUND) + list(APPEND PYTHON_DEFINITIONS -DHAS_PYTHON=1) + # These are all set for easy integration with the rest of our build system + set(PYTHON_FOUND ${Python3_FOUND}) +- set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE} CACHE FILEPATH "Python interpreter" FORCE) ++ if(NOT PYTHON_EXECUTABLE) ++ set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE} CACHE FILEPATH "Python interpreter" FORCE) ++ endif() + set(PYTHON_INCLUDE_DIRS ${Python3_INCLUDE_DIRS}) + set(PYTHON_LIBRARIES ${Python3_LIBRARIES}) + set(PYTHON_VERSION "${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}" CACHE INTERNAL "" FORCE) +-- +2.30.2 + diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index 646c6e0ab4..56e901fa17 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -76,6 +76,10 @@ KODI_CONF_OPTS += \ -DNATIVEPREFIX=$(HOST_DIR) \ -DDEPENDS_PATH=$(STAGING_DIR)/usr \ -DENABLE_TESTING=OFF \ + -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python \ + -DPYTHON_INCLUDE_DIRS=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ + -DPYTHON_PATH=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR) \ + -DPYTHON_VER=$(PYTHON3_VERSION_MAJOR) \ -DWITH_JSONSCHEMABUILDER=$(HOST_DIR)/bin/JsonSchemaBuilder \ -DWITH_TEXTUREPACKER=$(HOST_DIR)/bin/TexturePacker \ -DLIBDVDCSS_URL=$(KODI_DL_DIR)/kodi-libdvdcss-$(KODI_LIBDVDCSS_VERSION).tar.gz \ -- 2.30.2 From bernd.kuhls at t-online.de Sun Feb 13 11:47:21 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 13 Feb 2022 12:47:21 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/kodi: fix build with python-3.10 Message-ID: <20220213114721.2738803-1-bernd.kuhls@t-online.de> Fixes build error: CMake Error at /usr/share/cmake-3.18/Modules/FindPackageHandleStandardArgs.cmake:165 (message): Could NOT find PythonLibs (missing: PYTHON_LIBRARIES) (found suitable version "3.10.2", minimum required is "3.5") Signed-off-by: Bernd Kuhls --- v2: fixed typo in PYTHON_EXECUTABLE configure option (usr/bin/ -> bin/) package/kodi/0002-cmake-findpython.patch | 135 ++++++++++++++++++ ...-cmake-search-for-python-interpreter.patch | 48 +++++++ ...-allow-to-override-PYTHON_EXECUTABLE.patch | 39 +++++ package/kodi/kodi.mk | 4 + 4 files changed, 226 insertions(+) create mode 100644 package/kodi/0002-cmake-findpython.patch create mode 100644 package/kodi/0003-cmake-search-for-python-interpreter.patch create mode 100644 package/kodi/0004-cmake-allow-to-override-PYTHON_EXECUTABLE.patch diff --git a/package/kodi/0002-cmake-findpython.patch b/package/kodi/0002-cmake-findpython.patch new file mode 100644 index 0000000000..60728aa465 --- /dev/null +++ b/package/kodi/0002-cmake-findpython.patch @@ -0,0 +1,135 @@ +From 52f44ec5c7b728a6afaca867e8d815fced2012ec Mon Sep 17 00:00:00 2001 +From: fuzzard +Date: Sat, 31 Jul 2021 19:22:08 +1000 +Subject: [PATCH] [cmake] findpython + +use cmakes (3.12+) FindPython3 module. +Provide cmake vars for user to overide specific version, and search path + +Backport of https://github.com/xbmc/xbmc/pull/20045 + +Patch sent upstream: https://github.com/xbmc/xbmc/pull/20989 + +Signed-off-by: Bernd Kuhls +--- + CMakeLists.txt | 4 +- + cmake/modules/FindPython.cmake | 71 ++++++++++++++++++++++++++-------- + 2 files changed, 56 insertions(+), 19 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2d5369798d..9bed54ef40 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.4) ++cmake_minimum_required(VERSION 3.12) + if(WIN32) + # Version 3.15 is required to use "PREPEND" for dependencies + cmake_minimum_required(VERSION 3.15) +@@ -187,8 +187,6 @@ core_require_dep(${required_deps}) + find_package(TexturePacker REQUIRED) + find_package(JsonSchemaBuilder REQUIRED) + +-SET(PYTHON_VERSION 3.8) +- + if(ENABLE_MARIADBCLIENT AND NOT ENABLE_MARIADBCLIENT STREQUAL AUTO AND ENABLE_MYSQLCLIENT AND NOT ENABLE_MYSQLCLIENT STREQUAL AUTO) + MESSAGE(FATAL_ERROR "You can not use MySql and MariaDB at the same time. Disable one by adding -DENABLE_MYSQLCLIENT=OFF or -DENABLE_MARIADBCLIENT=OFF.") + elseif(ENABLE_MYSQLCLIENT AND NOT ENABLE_MYSQLCLIENT STREQUAL AUTO) +diff --git a/cmake/modules/FindPython.cmake b/cmake/modules/FindPython.cmake +index c40e12d551..35220b5426 100644 +--- a/cmake/modules/FindPython.cmake ++++ b/cmake/modules/FindPython.cmake +@@ -1,17 +1,56 @@ +-# - Try to find python +-# Once done this will define ++# FindPython ++# -------- ++# Finds Python3 libraries ++# ++# This module will search for the required python libraries on the system ++# If multiple versions are found, the highest version will be used. ++# ++# -------- ++# ++# the following variables influence behaviour: ++# ++# PYTHON_PATH - use external python not found in system paths ++# usage: -DPYTHON_PATH=/path/to/python/lib ++# PYTHON_VER - use exact python version, fail if not found ++# usage: -DPYTHON_VER=3.8 ++# ++# -------- ++# ++# This module will define the following variables: + # + # PYTHON_FOUND - system has PYTHON ++# PYTHON_VERSION - Python version number (Major.Minor) + # PYTHON_INCLUDE_DIRS - the python include directory + # PYTHON_LIBRARIES - The python libraries ++# PYTHON_LDFLAGS - Python provided link options ++# ++# -------- ++# ++ ++# for Depends builds, set search root dir to depends path ++if(KODI_DEPENDSBUILD) ++ set(Python3_USE_STATIC_LIBS TRUE) ++ set(Python3_ROOT_DIR ${DEPENDS_PATH}/lib) ++endif() ++ ++# Provide root dir to search for Python if provided ++if(PYTHON_PATH) ++ set(Python3_ROOT_DIR ${PYTHON_PATH}) ++ ++ # unset cache var so we can generate again with a different dir (or none) if desired ++ unset(PYTHON_PATH CACHE) ++endif() ++ ++# Set specific version of Python to find if provided ++if(PYTHON_VER) ++ set(VERSION ${PYTHON_VER}) ++ set(EXACT_VER "EXACT") + +-if(PKG_CONFIG_FOUND) +- pkg_check_modules(PC_PYTHON python3>=3.5 QUIET) ++ # unset cache var so we can generate again with a different ver (or none) if desired ++ unset(PYTHON_VER CACHE) + endif() + +-find_program(PYTHON_EXECUTABLE python3 ONLY_CMAKE_FIND_ROOT_PATH) +-find_library(PYTHON_LIBRARY NAMES python3.9 python3.8 python3.7 python3.6 python3.5 PATHS ${PC_PYTHON_LIBDIR}) +-find_path(PYTHON_INCLUDE_DIR NAMES Python.h PATHS ${PC_PYTHON_INCLUDE_DIRS} PATH_SUFFIXES python3.9 python3.8 python3.7 python3.6 python3.5) ++find_package(Python3 ${VERSION} ${EXACT_VER} COMPONENTS Development) + + if(KODI_DEPENDSBUILD) + find_library(FFI_LIBRARY ffi REQUIRED) +@@ -27,17 +66,17 @@ if(KODI_DEPENDSBUILD) + endif() + endif() + +- set(PYTHON_LIBRARIES ${PYTHON_LIBRARY} ${FFI_LIBRARY} ${EXPAT_LIBRARY} ${INTL_LIBRARY} ${GMP_LIBRARY} ${PYTHON_DEP_LIBRARIES}) +-else() +- find_package(PythonLibs 3.5 REQUIRED) +- list(APPEND PYTHON_LIBRARIES ${PC_PYTHON_STATIC_LIBRARIES}) ++ list(APPEND Python3_LIBRARIES ${FFI_LIBRARY} ${EXPAT_LIBRARY} ${INTL_LIBRARY} ${GMP_LIBRARY} ${PYTHON_DEP_LIBRARIES}) + endif() + +-include(FindPackageHandleStandardArgs) +-find_package_handle_standard_args(Python REQUIRED_VARS PYTHON_INCLUDE_DIR PYTHON_LIBRARY PYTHON_LIBRARIES) +-if(PYTHON_FOUND) +- set(PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_DIR}) ++if(Python3_FOUND) + list(APPEND PYTHON_DEFINITIONS -DHAS_PYTHON=1) ++ # These are all set for easy integration with the rest of our build system ++ set(PYTHON_FOUND ${Python3_FOUND}) ++ set(PYTHON_INCLUDE_DIRS ${Python3_INCLUDE_DIRS}) ++ set(PYTHON_LIBRARIES ${Python3_LIBRARIES}) ++ set(PYTHON_VERSION "${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}" CACHE INTERNAL "" FORCE) ++ set(PYTHON_LDFLAGS ${Python3_LINK_OPTIONS}) + endif() + +-mark_as_advanced(PYTHON_EXECUTABLE PYTHON_INCLUDE_DIRS PYTHON_INCLUDE_DIR PYTHON_LIBRARY PYTHON_LIBRARIES PYTHON_LDFLAGS FFI_LIBRARY EXPAT_LIBRARY INTL_LIBRARY GMP_LIBRARY) ++mark_as_advanced(PYTHON_EXECUTABLE PYTHON_VERSION PYTHON_INCLUDE_DIRS PYTHON_LDFLAGS FFI_LIBRARY EXPAT_LIBRARY INTL_LIBRARY GMP_LIBRARY) +-- +2.30.2 + diff --git a/package/kodi/0003-cmake-search-for-python-interpreter.patch b/package/kodi/0003-cmake-search-for-python-interpreter.patch new file mode 100644 index 0000000000..158345a212 --- /dev/null +++ b/package/kodi/0003-cmake-search-for-python-interpreter.patch @@ -0,0 +1,48 @@ +From 6bb112e585f2ffd10e5af70ca28159dd235d063b Mon Sep 17 00:00:00 2001 +From: wsnipex +Date: Thu, 19 Aug 2021 08:50:05 +0200 +Subject: [PATCH] [cmake] search for python interpreter fixes installing + eventclients on linux + +Backport of https://github.com/xbmc/xbmc/pull/20058 + +Patch sent upstream: https://github.com/xbmc/xbmc/pull/20989 + +Signed-off-by: Bernd Kuhls +--- + cmake/modules/FindPython.cmake | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/cmake/modules/FindPython.cmake b/cmake/modules/FindPython.cmake +index 35220b5426..c469ed9fb6 100644 +--- a/cmake/modules/FindPython.cmake ++++ b/cmake/modules/FindPython.cmake +@@ -20,6 +20,7 @@ + # + # PYTHON_FOUND - system has PYTHON + # PYTHON_VERSION - Python version number (Major.Minor) ++# PYTHON_EXECUTABLE - Python interpreter binary + # PYTHON_INCLUDE_DIRS - the python include directory + # PYTHON_LIBRARIES - The python libraries + # PYTHON_LDFLAGS - Python provided link options +@@ -51,6 +52,9 @@ if(PYTHON_VER) + endif() + + find_package(Python3 ${VERSION} ${EXACT_VER} COMPONENTS Development) ++if(CORE_SYSTEM_NAME STREQUAL linux) ++ find_package(Python3 ${VERSION} ${EXACT_VER} COMPONENTS Interpreter) ++endif() + + if(KODI_DEPENDSBUILD) + find_library(FFI_LIBRARY ffi REQUIRED) +@@ -73,6 +77,7 @@ if(Python3_FOUND) + list(APPEND PYTHON_DEFINITIONS -DHAS_PYTHON=1) + # These are all set for easy integration with the rest of our build system + set(PYTHON_FOUND ${Python3_FOUND}) ++ set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE} CACHE FILEPATH "Python interpreter" FORCE) + set(PYTHON_INCLUDE_DIRS ${Python3_INCLUDE_DIRS}) + set(PYTHON_LIBRARIES ${Python3_LIBRARIES}) + set(PYTHON_VERSION "${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}" CACHE INTERNAL "" FORCE) +-- +2.30.2 + diff --git a/package/kodi/0004-cmake-allow-to-override-PYTHON_EXECUTABLE.patch b/package/kodi/0004-cmake-allow-to-override-PYTHON_EXECUTABLE.patch new file mode 100644 index 0000000000..d1e9b3f25f --- /dev/null +++ b/package/kodi/0004-cmake-allow-to-override-PYTHON_EXECUTABLE.patch @@ -0,0 +1,39 @@ +From 25681d8adde4a90d5da02051e30f6a3a27322136 Mon Sep 17 00:00:00 2001 +From: Jernej Skrabec +Date: Sat, 25 Sep 2021 07:41:10 +0200 +Subject: [PATCH] [cmake] allow to override PYTHON_EXECUTABLE + +If Kodi is being build for distro which has different python version +than host, PYTHON_EXECUTABLE must be overriden and point to distro +version. Otherwise, eventclients will be installed in wrong location and +be thus unusable. + +Use case: Cross compiling Kodi for LibreELEC + +Backport of https://github.com/xbmc/xbmc/pull/20171 + +Patch sent upstream: https://github.com/xbmc/xbmc/pull/20989 + +Signed-off-by: Bernd Kuhls +--- + cmake/modules/FindPython.cmake | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/cmake/modules/FindPython.cmake b/cmake/modules/FindPython.cmake +index c469ed9fb6..87b8368705 100644 +--- a/cmake/modules/FindPython.cmake ++++ b/cmake/modules/FindPython.cmake +@@ -77,7 +77,9 @@ if(Python3_FOUND) + list(APPEND PYTHON_DEFINITIONS -DHAS_PYTHON=1) + # These are all set for easy integration with the rest of our build system + set(PYTHON_FOUND ${Python3_FOUND}) +- set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE} CACHE FILEPATH "Python interpreter" FORCE) ++ if(NOT PYTHON_EXECUTABLE) ++ set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE} CACHE FILEPATH "Python interpreter" FORCE) ++ endif() + set(PYTHON_INCLUDE_DIRS ${Python3_INCLUDE_DIRS}) + set(PYTHON_LIBRARIES ${Python3_LIBRARIES}) + set(PYTHON_VERSION "${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}" CACHE INTERNAL "" FORCE) +-- +2.30.2 + diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index 646c6e0ab4..56e901fa17 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -76,6 +76,10 @@ KODI_CONF_OPTS += \ -DNATIVEPREFIX=$(HOST_DIR) \ -DDEPENDS_PATH=$(STAGING_DIR)/usr \ -DENABLE_TESTING=OFF \ + -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python \ + -DPYTHON_INCLUDE_DIRS=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ + -DPYTHON_PATH=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR) \ + -DPYTHON_VER=$(PYTHON3_VERSION_MAJOR) \ -DWITH_JSONSCHEMABUILDER=$(HOST_DIR)/bin/JsonSchemaBuilder \ -DWITH_TEXTUREPACKER=$(HOST_DIR)/bin/TexturePacker \ -DLIBDVDCSS_URL=$(KODI_DL_DIR)/kodi-libdvdcss-$(KODI_LIBDVDCSS_VERSION).tar.gz \ -- 2.30.2 From peter at korsgaard.com Sun Feb 13 11:59:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Feb 2022 12:59:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/grpc: fix fourth patch In-Reply-To: <20220208222356.24675-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 8 Feb 2022 23:23:56 +0100") References: <20220208222356.24675-1-fontaine.fabrice@gmail.com> Message-ID: <87sfsnkmeq.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure raised since the addition of fourth > patch in commit 8251d8c2559b25f11684776fc343059cf100657d: > 1 out of 22 hunks FAILED -- saving rejects to file CMakeLists.txt.rej > Fixes: > - http://autobuild.buildroot.org/results/44f6d7c61316e90d22e75cb1fb77c3bc5b31ad66 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From b.bilas at grinn-global.com Sun Feb 13 12:02:58 2022 From: b.bilas at grinn-global.com (Bartosz Bilas) Date: Sun, 13 Feb 2022 13:02:58 +0100 Subject: [Buildroot] [PATCH] boot/barebox: bump version to 2022.01.0 Message-ID: <20220213120258.601369-1-b.bilas@grinn-global.com> Signed-off-by: Bartosz Bilas --- boot/barebox/Config.in | 4 ++-- boot/barebox/barebox.hash | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in index 23f8a5ac8a..c16fea3cea 100644 --- a/boot/barebox/Config.in +++ b/boot/barebox/Config.in @@ -12,7 +12,7 @@ choice Select the specific Barebox version you want to use config BR2_TARGET_BAREBOX_LATEST_VERSION - bool "2021.12.0" + bool "2022.01.0" config BR2_TARGET_BAREBOX_CUSTOM_VERSION bool "Custom version" @@ -40,7 +40,7 @@ endif config BR2_TARGET_BAREBOX_VERSION string - default "2021.12.0" if BR2_TARGET_BAREBOX_LATEST_VERSION + default "2022.01.0" if BR2_TARGET_BAREBOX_LATEST_VERSION default BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE if BR2_TARGET_BAREBOX_CUSTOM_VERSION default "custom" if BR2_TARGET_BAREBOX_CUSTOM_TARBALL default BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT diff --git a/boot/barebox/barebox.hash b/boot/barebox/barebox.hash index 0a853866b5..3d52d40beb 100644 --- a/boot/barebox/barebox.hash +++ b/boot/barebox/barebox.hash @@ -1,8 +1,8 @@ # From https://www.barebox.org/download/barebox-2021.12.0.tar.bz2.md5 -md5 199b6d7ff3441cec2062ab18a52454dc barebox-2021.12.0.tar.bz2 +md5 753ba533ced54f4113f9e97846c13fc1 barebox-2022.01.0.tar.bz2 # Locally calculated -sha256 555569fe9e71524e0bf927eaa2c1aa2e81ee2c34dd71e39fe21620db6ccc8aa6 barebox-2021.12.0.tar.bz2 +sha256 ddf7898075bec05e4865ce0f7a2ac19c2b1efaaa0d066eba1939494e25711d28 barebox-2022.01.0.tar.bz2 # License files, locally computed sha256 ab1122aa9f9073ad1ec824edcd970b16a6a7881a34a18fd56c080debb2dca5d4 COPYING -- 2.35.1 From arnout at mind.be Sun Feb 13 12:04:46 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 13:04:46 +0100 Subject: [Buildroot] [PATCH] package/python-docutils: bump to version 0.18.1 In-Reply-To: <20220203090848.22869-1-yegorslists@googlemail.com> References: <20220203090848.22869-1-yegorslists@googlemail.com> Message-ID: <88094627-fe17-f255-ef93-2e6aaae0e995@mind.be> On 03/02/2022 10:08, yegorslists--- via buildroot wrote: > From: Yegor Yefremov > > Remove the obsolete patch as docutils is now a setuptools package. > > The package also includes code licensed under BSD-3-Clause licence. > COPYING.txt has the following changes: > > * copyright year > * more exceptions from the Public Domain added > * BSD-3-Clause license added > > Fixes: > http://autobuild.buildroot.net/results/02dd94c09dabdbdd8b47673393577a7fd3af3aeb > > Signed-off-by: Yegor Yefremov James came later with a largely identical patch, but it also extended the list of licenses a bit. So I incorporated that change, with his Sob, and applied to master, thanks. Regards, Arnout > --- > .../0001-Update-setup.py.patch | 64 ------------------- > package/python-docutils/python-docutils.hash | 6 +- > package/python-docutils/python-docutils.mk | 8 +-- > 3 files changed, 7 insertions(+), 71 deletions(-) > delete mode 100644 package/python-docutils/0001-Update-setup.py.patch > > diff --git a/package/python-docutils/0001-Update-setup.py.patch b/package/python-docutils/0001-Update-setup.py.patch > deleted file mode 100644 > index 3fb34a9763..0000000000 > --- a/package/python-docutils/0001-Update-setup.py.patch > +++ /dev/null > @@ -1,64 +0,0 @@ > -From 583e59ccf72a02c2a6f0399f29f622c7f2f4a932 Mon Sep 17 00:00:00 2001 > -From: milde > -Date: Sun, 1 Sep 2019 19:39:36 +0000 > -Subject: [PATCH] Update setup.py > - > -Python 3.4 no longer supported, > -more languages supported (and Lithuanian accepted by PyPi). > - > -git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk at 8383 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 > - > -[Asaf: adjust upstream patch to 0.15.2] > -Signed-off-by: Asaf Kahlon > ---- > - setup.py | 14 +++++++++++++- > - 1 file changed, 13 insertions(+), 1 deletion(-) > - > -diff --git a/setup.py b/setup.py > -index f801ea2..5c1ebfd 100755 > ---- a/setup.py > -+++ b/setup.py > -@@ -7,6 +7,10 @@ import os > - import glob > - try: > - import setuptools > -+except ImportError: > -+ print('Warning: Could not load package `setuptools`.') > -+ print('Actions requiring `setuptools` instead of `distutils` will fail') > -+try: > - from distutils.core import setup, Command > - from distutils.command.build import build > - from distutils.command.build_py import build_py > -@@ -123,7 +127,7 @@ what-you-see-is-what-you-get plaintext markup syntax.""", # wrap at col 60 > - 'maintainer_email': 'docutils-develop at lists.sourceforge.net', > - 'license': 'public domain, Python, 2-Clause BSD, GPL 3 (see COPYING.txt)', > - 'platforms': 'OS-independent', > -- 'python_requires': '>=2.6, !=3.0.*, !=3.1.*, !=3.2.*', > -+ 'python_requires': '>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*', > - 'package_dir': {'docutils': 'docutils', > - 'docutils.tools': 'tools'}, > - 'packages': ['docutils', > -@@ -213,14 +219,20 @@ classifiers = [ > - 'Natural Language :: Chinese (Simplified)', > - 'Natural Language :: Chinese (Traditional)', > - 'Natural Language :: Czech', > -+ 'Natural Language :: Danish', > - 'Natural Language :: Dutch', > - 'Natural Language :: Esperanto', > - 'Natural Language :: Finnish', > - 'Natural Language :: French', > - 'Natural Language :: Galician', > - 'Natural Language :: German', > -+ 'Natural Language :: Hebrew', > - 'Natural Language :: Italian', > - 'Natural Language :: Japanese', > -+ 'Natural Language :: Korean', > -+ 'Natural Language :: Latvian', > -+ 'Natural Language :: Lithuanian', > -+ 'Natural Language :: Persian', > - 'Natural Language :: Polish', > - 'Natural Language :: Portuguese (Brazilian)', > - 'Natural Language :: Russian', > --- > -2.20.1 > -k > diff --git a/package/python-docutils/python-docutils.hash b/package/python-docutils/python-docutils.hash > index ccccca1064..9f6bb53bdb 100644 > --- a/package/python-docutils/python-docutils.hash > +++ b/package/python-docutils/python-docutils.hash > @@ -1,4 +1,4 @@ > # md5 from https://pypi.python.org/pypi/docutils/json, sha256 locally computed > -md5 e26a308d8000b0bed7416a633217c676 docutils-0.15.2.tar.gz > -sha256 a2aeea129088da402665e92e0b25b04b073c04b2dce4ab65caaa38b7ce2e1a99 docutils-0.15.2.tar.gz > -sha256 efa0c85aa99ea5b4781240031b0d02af54d7b5554c87ad2b2bea9ba490f6663f COPYING.txt > +md5 ca5827e2432fd58f4c8d74a6591135de docutils-0.18.1.tar.gz > +sha256 679987caf361a7539d76e584cbeddc311e3aee937877c87346f31debc63e9d06 docutils-0.18.1.tar.gz > +sha256 f20172170ef9aeebbf53adf5d8f7d309f7dc6068e9a3a1b52ea772305686739d COPYING.txt > diff --git a/package/python-docutils/python-docutils.mk b/package/python-docutils/python-docutils.mk > index 9a42d3e5dc..3872b54906 100644 > --- a/package/python-docutils/python-docutils.mk > +++ b/package/python-docutils/python-docutils.mk > @@ -4,12 +4,12 @@ > # > ################################################################################ > > -PYTHON_DOCUTILS_VERSION = 0.15.2 > +PYTHON_DOCUTILS_VERSION = 0.18.1 > PYTHON_DOCUTILS_SOURCE = docutils-$(PYTHON_DOCUTILS_VERSION).tar.gz > -PYTHON_DOCUTILS_SITE = https://files.pythonhosted.org/packages/93/22/953e071b589b0b1fee420ab06a0d15e5aa0c7470eb9966d60393ce58ad61 > -PYTHON_DOCUTILS_LICENSE = Public Domain, BSD-2-Clause, GPL-3.0 (emacs mode), other > +PYTHON_DOCUTILS_SITE = https://files.pythonhosted.org/packages/57/b1/b880503681ea1b64df05106fc7e3c4e3801736cf63deffc6fa7fc5404cf5 > +PYTHON_DOCUTILS_LICENSE = Public Domain, BSD-2-Clause, BSD-3-Clause, GPL-3.0 (emacs mode), other > PYTHON_DOCUTILS_LICENSE_FILES = COPYING.txt > -PYTHON_DOCUTILS_SETUP_TYPE = distutils > +PYTHON_DOCUTILS_SETUP_TYPE = setuptools > > $(eval $(python-package)) > $(eval $(host-python-package)) From arnout at mind.be Sun Feb 13 12:05:05 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 13:05:05 +0100 Subject: [Buildroot] [git commit] package/sconeserver: fix build with icu and libxml2 Message-ID: <20220213115753.22A1482745@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b9eca021594470341bec2876edc0a27251f3f9b2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since addition of icu support in libxml2 through commit 49d7c85421e87d9d762be9352805cb47a2f0bbeb: In file included from /home/peko/autobuild/instance-1/output-1/host/mips64el-buildroot-linux-gnu/sysroot/usr/include/unicode/ptypes.h:52:0, from /home/peko/autobuild/instance-1/output-1/host/mips64el-buildroot-linux-gnu/sysroot/usr/include/unicode/umachine.h:46, from /home/peko/autobuild/instance-1/output-1/host/mips64el-buildroot-linux-gnu/sysroot/usr/include/unicode/utypes.h:38, from /home/peko/autobuild/instance-1/output-1/host/mips64el-buildroot-linux-gnu/sysroot/usr/include/unicode/ucnv_err.h:88, from /home/peko/autobuild/instance-1/output-1/host/mips64el-buildroot-linux-gnu/sysroot/usr/include/unicode/ucnv.h:51, from /home/peko/autobuild/instance-1/output-1/host/mips64el-buildroot-linux-gnu/sysroot/usr/bin/../../usr/include/libxml2/libxml/encoding.h:31, from /home/peko/autobuild/instance-1/output-1/host/mips64el-buildroot-linux-gnu/sysroot/usr/bin/../../usr/include/libxml2/libxml/parser.h:812, from conftest.cpp:61: /home/peko/autobuild/instance-1/output-1/host/mips64el-buildroot-linux-gnu/sysroot/usr/include/unicode/localpointer.h:224:41: error: 'noexcept' does not name a type LocalPointer(LocalPointer &&src) U_NOEXCEPT : LocalPointerBase(src.ptr) { ^ /home/peko/autobuild/instance-1/output-1/host/mips64el-buildroot-linux-gnu/sysroot/usr/include/unicode/localpointer.h:224:41: note: C++11 'noexcept' only available with -std=c++11 or -std=gnu++11 Fixes: - http://autobuild.buildroot.org/results/be043792e6e5501631517881b10096291a654364 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/sconeserver/sconeserver.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/sconeserver/sconeserver.mk b/package/sconeserver/sconeserver.mk index 17407c29f5..2b28f8015c 100644 --- a/package/sconeserver/sconeserver.mk +++ b/package/sconeserver/sconeserver.mk @@ -29,6 +29,8 @@ SCONESERVER_CONF_OPTS += \ ifeq ($(BR2_PACKAGE_LIBXML2),y) SCONESERVER_CONF_OPTS += \ --with-xml2-config="$(STAGING_DIR)/usr/bin/xml2-config" +# Needed to fix build failure when icu is enabled in libxml2 +SCONESERVER_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" endif ifeq ($(BR2_PACKAGE_OPENSSL),y) From arnout at mind.be Sun Feb 13 12:05:06 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 13:05:06 +0100 Subject: [Buildroot] [git commit] package/python-docutils: bump to version 0.18.1 Message-ID: <20220213115753.45B168287C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9324d53bc5114cf862602cafcf214adfc7375d32 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Remove the obsolete patch as docutils is now a setuptools package. The package also includes code licensed under BSD-3-Clause licence. COPYING.txt has the following changes: * copyright year * more exceptions from the Public Domain added * BSD-3-Clause license added * emacs mode is GPL-3.0+ instead of just GPL-3.0 * added Python-2.0 for roman.py The "other" license is removed since the list covers all licenses mentioned in COPYING.txt. Also update hash file whitespace to two spaces. Fixes: http://autobuild.buildroot.net/results/02dd94c09dabdbdd8b47673393577a7fd3af3aeb Signed-off-by: Yegor Yefremov Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-docutils/0001-Update-setup.py.patch | 64 ---------------------- package/python-docutils/python-docutils.hash | 6 +- package/python-docutils/python-docutils.mk | 8 +-- 3 files changed, 7 insertions(+), 71 deletions(-) diff --git a/package/python-docutils/0001-Update-setup.py.patch b/package/python-docutils/0001-Update-setup.py.patch deleted file mode 100644 index 3fb34a9763..0000000000 --- a/package/python-docutils/0001-Update-setup.py.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 583e59ccf72a02c2a6f0399f29f622c7f2f4a932 Mon Sep 17 00:00:00 2001 -From: milde -Date: Sun, 1 Sep 2019 19:39:36 +0000 -Subject: [PATCH] Update setup.py - -Python 3.4 no longer supported, -more languages supported (and Lithuanian accepted by PyPi). - -git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk at 8383 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 - -[Asaf: adjust upstream patch to 0.15.2] -Signed-off-by: Asaf Kahlon ---- - setup.py | 14 +++++++++++++- - 1 file changed, 13 insertions(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index f801ea2..5c1ebfd 100755 ---- a/setup.py -+++ b/setup.py -@@ -7,6 +7,10 @@ import os - import glob - try: - import setuptools -+except ImportError: -+ print('Warning: Could not load package `setuptools`.') -+ print('Actions requiring `setuptools` instead of `distutils` will fail') -+try: - from distutils.core import setup, Command - from distutils.command.build import build - from distutils.command.build_py import build_py -@@ -123,7 +127,7 @@ what-you-see-is-what-you-get plaintext markup syntax.""", # wrap at col 60 - 'maintainer_email': 'docutils-develop at lists.sourceforge.net', - 'license': 'public domain, Python, 2-Clause BSD, GPL 3 (see COPYING.txt)', - 'platforms': 'OS-independent', -- 'python_requires': '>=2.6, !=3.0.*, !=3.1.*, !=3.2.*', -+ 'python_requires': '>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*', - 'package_dir': {'docutils': 'docutils', - 'docutils.tools': 'tools'}, - 'packages': ['docutils', -@@ -213,14 +219,20 @@ classifiers = [ - 'Natural Language :: Chinese (Simplified)', - 'Natural Language :: Chinese (Traditional)', - 'Natural Language :: Czech', -+ 'Natural Language :: Danish', - 'Natural Language :: Dutch', - 'Natural Language :: Esperanto', - 'Natural Language :: Finnish', - 'Natural Language :: French', - 'Natural Language :: Galician', - 'Natural Language :: German', -+ 'Natural Language :: Hebrew', - 'Natural Language :: Italian', - 'Natural Language :: Japanese', -+ 'Natural Language :: Korean', -+ 'Natural Language :: Latvian', -+ 'Natural Language :: Lithuanian', -+ 'Natural Language :: Persian', - 'Natural Language :: Polish', - 'Natural Language :: Portuguese (Brazilian)', - 'Natural Language :: Russian', --- -2.20.1 -k diff --git a/package/python-docutils/python-docutils.hash b/package/python-docutils/python-docutils.hash index ccccca1064..f5e0b82db8 100644 --- a/package/python-docutils/python-docutils.hash +++ b/package/python-docutils/python-docutils.hash @@ -1,4 +1,4 @@ # md5 from https://pypi.python.org/pypi/docutils/json, sha256 locally computed -md5 e26a308d8000b0bed7416a633217c676 docutils-0.15.2.tar.gz -sha256 a2aeea129088da402665e92e0b25b04b073c04b2dce4ab65caaa38b7ce2e1a99 docutils-0.15.2.tar.gz -sha256 efa0c85aa99ea5b4781240031b0d02af54d7b5554c87ad2b2bea9ba490f6663f COPYING.txt +md5 ca5827e2432fd58f4c8d74a6591135de docutils-0.18.1.tar.gz +sha256 679987caf361a7539d76e584cbeddc311e3aee937877c87346f31debc63e9d06 docutils-0.18.1.tar.gz +sha256 f20172170ef9aeebbf53adf5d8f7d309f7dc6068e9a3a1b52ea772305686739d COPYING.txt diff --git a/package/python-docutils/python-docutils.mk b/package/python-docutils/python-docutils.mk index 9a42d3e5dc..39a570f5a1 100644 --- a/package/python-docutils/python-docutils.mk +++ b/package/python-docutils/python-docutils.mk @@ -4,12 +4,12 @@ # ################################################################################ -PYTHON_DOCUTILS_VERSION = 0.15.2 +PYTHON_DOCUTILS_VERSION = 0.18.1 PYTHON_DOCUTILS_SOURCE = docutils-$(PYTHON_DOCUTILS_VERSION).tar.gz -PYTHON_DOCUTILS_SITE = https://files.pythonhosted.org/packages/93/22/953e071b589b0b1fee420ab06a0d15e5aa0c7470eb9966d60393ce58ad61 -PYTHON_DOCUTILS_LICENSE = Public Domain, BSD-2-Clause, GPL-3.0 (emacs mode), other +PYTHON_DOCUTILS_SITE = https://files.pythonhosted.org/packages/57/b1/b880503681ea1b64df05106fc7e3c4e3801736cf63deffc6fa7fc5404cf5 +PYTHON_DOCUTILS_LICENSE = Public Domain, BSD-2-Clause, BSD-3-Clause, Python-2.0, GPL-3.0+ (emacs mode) PYTHON_DOCUTILS_LICENSE_FILES = COPYING.txt -PYTHON_DOCUTILS_SETUP_TYPE = distutils +PYTHON_DOCUTILS_SETUP_TYPE = setuptools $(eval $(python-package)) $(eval $(host-python-package)) From arnout at mind.be Sun Feb 13 12:05:05 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 13:05:05 +0100 Subject: [Buildroot] [git commit] board/intel/galileo: fix build failure with host gcc 10 Message-ID: <20220213115753.393B082745@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9dd5382d791c3d5197b9ef401a0d103ad1457d5d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Building galileo_defconfig throws error: ``` /usr/bin/ld: arch/x86/tools/relocs_64.o:(.bss+0x0): multiple definition of `per_cpu_load_addr'; arch/x86/tools/relocs_32.o:(.bss+0x0): first defined here ``` To fix this let's add an upstreamed patch[1] and add BR2_GLOBAL_PATCH_DIR to galileo_defconfig to point to where patch is. [1]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=eeeda4cd06e828b331b15741a204ff9f5874d28d.patch Fixes: https://gitlab.com/ymorin/buildroot/-/jobs/2035821039 Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...-x86-relocs-Make-per_cpu_load_addr-static.patch | 39 ++++++++++++++++++++++ configs/galileo_defconfig | 1 + 2 files changed, 40 insertions(+) diff --git a/board/intel/galileo/patches/linux/0001-x86-relocs-Make-per_cpu_load_addr-static.patch b/board/intel/galileo/patches/linux/0001-x86-relocs-Make-per_cpu_load_addr-static.patch new file mode 100644 index 0000000000..1d206cc6d1 --- /dev/null +++ b/board/intel/galileo/patches/linux/0001-x86-relocs-Make-per_cpu_load_addr-static.patch @@ -0,0 +1,39 @@ +From eeeda4cd06e828b331b15741a204ff9f5874d28d Mon Sep 17 00:00:00 2001 +From: Ben Hutchings +Date: Wed, 24 Sep 2014 13:30:12 +0100 +Subject: [PATCH] x86/relocs: Make per_cpu_load_addr static + +per_cpu_load_addr is only used for 64-bit relocations, but is +declared in both configurations of relocs.c - with different +types. This has undefined behaviour in general. GNU ld is +documented to use the larger size in this case, but other tools +may differ and some warn about this. + +References: https://bugs.debian.org/748577 +Reported-by: Michael Tautschnig +Signed-off-by: Ben Hutchings +Cc: 748577 at bugs.debian.org +Cc: Linus Torvalds +Link: http://lkml.kernel.org/r/1411561812.3659.23.camel at decadent.org.uk +Signed-off-by: Ingo Molnar +Signed-off-by: Giulio Benetti +--- + arch/x86/tools/relocs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c +index bbb1d2259ecf..a5efb21d5228 100644 +--- a/arch/x86/tools/relocs.c ++++ b/arch/x86/tools/relocs.c +@@ -695,7 +695,7 @@ static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel, + * + */ + static int per_cpu_shndx = -1; +-Elf_Addr per_cpu_load_addr; ++static Elf_Addr per_cpu_load_addr; + + static void percpu_init(void) + { +-- +2.25.1 + diff --git a/configs/galileo_defconfig b/configs/galileo_defconfig index 03ca23f414..a8fd0a6dcc 100644 --- a/configs/galileo_defconfig +++ b/configs/galileo_defconfig @@ -1,4 +1,5 @@ BR2_x86_x1000=y +BR2_GLOBAL_PATCH_DIR=board/intel/galileo/patches # Needed for TARGET_GRUB2 BR2_TOOLCHAIN_BUILDROOT_WCHAR=y # Linux headers same as kernel, a 3.14 series From arnout at mind.be Sun Feb 13 12:05:05 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 13:05:05 +0100 Subject: [Buildroot] [git commit] package/cryptsetup: fix build failure with Microblaze Message-ID: <20220213115753.3042A82868@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=683e8387d05cb506c30592ab43a3e7534d7cf56e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add local patch pending upstream[1] to fix the build failure after my suggestion[2] to imitate what I've done with libfuse[3]. [1]: https://gitlab.com/cryptsetup/cryptsetup/-/merge_requests/275?commit_id=5f71b3d63181aa88a68f7f71eab8801f2d8d2cde [2]: https://gitlab.com/cryptsetup/cryptsetup/-/issues/709 [3]: https://github.com/libfuse/libfuse/pull/620/commits/3aba09a5c56e017746c5c1652dbc845f4db7374a Fixes: http://autobuild.buildroot.net/results/bad/bad4d01fde3191e4d481a8e9dae18df3b1a94537/ Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...01-Add-check-program-for-symver-attribute.patch | 56 ++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/package/cryptsetup/0001-Add-check-program-for-symver-attribute.patch b/package/cryptsetup/0001-Add-check-program-for-symver-attribute.patch new file mode 100644 index 0000000000..04f59a2050 --- /dev/null +++ b/package/cryptsetup/0001-Add-check-program-for-symver-attribute.patch @@ -0,0 +1,56 @@ +From 7c6ec620de3f99d4212f4a54aa576df1b97020ab Mon Sep 17 00:00:00 2001 +From: Ondrej Kozina +Date: Wed, 2 Feb 2022 11:34:57 +0100 +Subject: [PATCH] Add check program for symver attribute. + +Fixes: #709. +Signed-off-by: Giulio Benetti +--- + configure.ac | 11 +++++++++++ + lib/libcryptsetup_symver.h | 8 +++----- + 2 files changed, 14 insertions(+), 5 deletions(-) + +diff --git a/configure.ac b/configure.ac +index a0e5990d..b052f8cf 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -554,6 +554,17 @@ if test "x$enable_static_cryptsetup" = "xyes"; then + PKG_CONFIG=$saved_PKG_CONFIG + fi + ++dnl Check compiler support for symver function attribute ++saved_CFLAGS=$CFLAGS ++CFLAGS="-O0 -Werror" ++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ++ void _test_sym(void); ++ __attribute__((__symver__("sym at VERSION_4.2"))) void _test_sym(void) {} ++]], ++[[ _test_sym() ]] ++)],[ AC_DEFINE([HAVE_ATTRIBUTE_SYMVER], 1, [Define to 1 to use __attribute__((symver))])]) ++CFLAGS=$saved_CFLAGS ++ + AC_MSG_CHECKING([for systemd tmpfiles config directory]) + PKG_CHECK_VAR([systemd_tmpfilesdir], [systemd], [tmpfilesdir], [], [systemd_tmpfilesdir=no]) + AC_MSG_RESULT([$systemd_tmpfilesdir]) +diff --git a/lib/libcryptsetup_symver.h b/lib/libcryptsetup_symver.h +index 2a804b6a..3558310d 100644 +--- a/lib/libcryptsetup_symver.h ++++ b/lib/libcryptsetup_symver.h +@@ -67,11 +67,9 @@ + * under CRYPT_SYMBOL_EXPORT_OLD(int, crypt_func_X, ...) macro + */ + +-#ifdef __has_attribute +-# if __has_attribute(symver) +-# define _CRYPT_SYMVER(_local_sym, _public_sym, _ver_str, _maj, _min) \ +- __attribute__((__symver__(#_public_sym _ver_str #_maj "." #_min))) +-# endif ++#if HAVE_ATTRIBUTE_SYMVER ++# define _CRYPT_SYMVER(_local_sym, _public_sym, _ver_str, _maj, _min) \ ++ __attribute__((__symver__(#_public_sym _ver_str #_maj "." #_min))) + #endif + + #if !defined(_CRYPT_SYMVER) && defined(__GNUC__) +-- +2.25.1 + From giulio.benetti at benettiengineering.com Sun Feb 13 12:56:05 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 13 Feb 2022 13:56:05 +0100 Subject: [Buildroot] [PATCH] board/intel/galileo: fix build failure with host gcc 10 In-Reply-To: References: Message-ID: <42058D10-AAA9-41FE-91E3-1D5153134FCA@benettiengineering.com> Hi Nicolas, sorry for html but I?m mobile. My patch for fixing the build failure for Galileo has been upstream, but Linux version is very old, I?ve added a local patch from 2014 as pointed Arnout below. I don?t have a Galileo board and you are the maintainer, can you please update uboot and Linux versions and send a patch for that after testing please? Thank you! ?- Giulio Benetti Benetti Engineering sas > Il giorno 13 feb 2022, alle ore 12:46, Arnout Vandecappelle ha scritto: > > ? > >> On 02/02/2022 22:43, Giulio Benetti wrote: >> Building galileo_defconfig throws error: >> ``` >> /usr/bin/ld: arch/x86/tools/relocs_64.o:(.bss+0x0): multiple definition of `per_cpu_load_addr'; arch/x86/tools/relocs_32.o:(.bss+0x0): first defined here >> ``` >> To fix this let's add an upstreamed patch[1] and add BR2_GLOBAL_PATCH_DIR >> to galileo_defconfig to point to where patch is. >> [1]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=eeeda4cd06e828b331b15741a204ff9f5874d28d.patch >> Fixes: >> https://gitlab.com/ymorin/buildroot/-/jobs/2035821039 >> Signed-off-by: Giulio Benetti > > You can't imagine how much joy it gives me to see a patch from 2014 applied here... > > > Applied to master, thanks. > > Regards, > Arnout > >> --- >> ...relocs-Make-per_cpu_load_addr-static.patch | 39 +++++++++++++++++++ >> configs/galileo_defconfig | 1 + >> 2 files changed, 40 insertions(+) >> create mode 100644 board/intel/galileo/patches/linux/0001-x86-relocs-Make-per_cpu_load_addr-static.patch >> diff --git a/board/intel/galileo/patches/linux/0001-x86-relocs-Make-per_cpu_load_addr-static.patch b/board/intel/galileo/patches/linux/0001-x86-relocs-Make-per_cpu_load_addr-static.patch >> new file mode 100644 >> index 0000000000..1d206cc6d1 >> --- /dev/null >> +++ b/board/intel/galileo/patches/linux/0001-x86-relocs-Make-per_cpu_load_addr-static.patch >> @@ -0,0 +1,39 @@ >> +From eeeda4cd06e828b331b15741a204ff9f5874d28d Mon Sep 17 00:00:00 2001 >> +From: Ben Hutchings >> +Date: Wed, 24 Sep 2014 13:30:12 +0100 >> +Subject: [PATCH] x86/relocs: Make per_cpu_load_addr static >> + >> +per_cpu_load_addr is only used for 64-bit relocations, but is >> +declared in both configurations of relocs.c - with different >> +types. This has undefined behaviour in general. GNU ld is >> +documented to use the larger size in this case, but other tools >> +may differ and some warn about this. >> + >> +References: https://bugs.debian.org/748577 >> +Reported-by: Michael Tautschnig >> +Signed-off-by: Ben Hutchings >> +Cc: 748577 at bugs.debian.org >> +Cc: Linus Torvalds >> +Link: http://lkml.kernel.org/r/1411561812.3659.23.camel at decadent.org.uk >> +Signed-off-by: Ingo Molnar >> +Signed-off-by: Giulio Benetti >> +--- >> + arch/x86/tools/relocs.c | 2 +- >> + 1 file changed, 1 insertion(+), 1 deletion(-) >> + >> +diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c >> +index bbb1d2259ecf..a5efb21d5228 100644 >> +--- a/arch/x86/tools/relocs.c >> ++++ b/arch/x86/tools/relocs.c >> +@@ -695,7 +695,7 @@ static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel, >> + * >> + */ >> + static int per_cpu_shndx = -1; >> +-Elf_Addr per_cpu_load_addr; >> ++static Elf_Addr per_cpu_load_addr; >> + >> + static void percpu_init(void) >> + { >> +-- >> +2.25.1 >> + >> diff --git a/configs/galileo_defconfig b/configs/galileo_defconfig >> index 03ca23f414..a8fd0a6dcc 100644 >> --- a/configs/galileo_defconfig >> +++ b/configs/galileo_defconfig >> @@ -1,4 +1,5 @@ >> BR2_x86_x1000=y >> +BR2_GLOBAL_PATCH_DIR=board/intel/galileo/patches >> # Needed for TARGET_GRUB2 >> BR2_TOOLCHAIN_BUILDROOT_WCHAR=y >> # Linux headers same as kernel, a 3.14 series > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From bernd.kuhls at t-online.de Sun Feb 13 13:03:06 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 13 Feb 2022 14:03:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/e3: new package Message-ID: <20220213130306.3002130-1-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- Build was successful: [...] bootlin-x86-64-glibc [24/45]: OK bootlin-x86-64-musl [25/45]: OK bootlin-x86-64-uclibc [26/45]: OK [...] br-i386-pentium4-full [31/45]: OK br-i386-pentium-mmx-musl [32/45]: OK [...] 45 builds, 40 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed DEVELOPERS | 1 + package/Config.in | 1 + package/e3/0001-makefile.patch | 42 +++++++++++++++ .../e3/0002-Align-header-to-avoid-crash.patch | 26 +++++++++ package/e3/0003-format-1.0.patch | 54 +++++++++++++++++++ package/e3/0004-e3-gnu-stack.patch | 50 +++++++++++++++++ package/e3/Config.in | 9 ++++ package/e3/e3.hash | 3 ++ package/e3/e3.mk | 24 +++++++++ 9 files changed, 210 insertions(+) create mode 100644 package/e3/0001-makefile.patch create mode 100644 package/e3/0002-Align-header-to-avoid-crash.patch create mode 100644 package/e3/0003-format-1.0.patch create mode 100644 package/e3/0004-e3-gnu-stack.patch create mode 100644 package/e3/Config.in create mode 100644 package/e3/e3.hash create mode 100644 package/e3/e3.mk diff --git a/DEVELOPERS b/DEVELOPERS index 7b5f4d992c..f8aab505ed 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -326,6 +326,7 @@ F: package/dht/ F: package/dovecot/ F: package/dovecot-pigeonhole/ F: package/dtv-scan-tables/ +F: package/e3/ F: package/eudev/ F: package/exim/ F: package/fetchmail/ diff --git a/package/Config.in b/package/Config.in index c004228759..f47f003a00 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2612,6 +2612,7 @@ endmenu menu "Text editors and viewers" source "package/bat/Config.in" + source "package/e3/Config.in" source "package/ed/Config.in" source "package/joe/Config.in" source "package/less/Config.in" diff --git a/package/e3/0001-makefile.patch b/package/e3/0001-makefile.patch new file mode 100644 index 0000000000..62b2b3a94b --- /dev/null +++ b/package/e3/0001-makefile.patch @@ -0,0 +1,42 @@ +Add build fixes from Gentoo + +Downloaded from +https://gitweb.gentoo.org/repo/gentoo.git/tree/app-editors/e3/files/e3-2.8.2-makefile.patch + +Signed-off-by: Bernd Kuhls +--- e3-2.82-orig/Makefile ++++ e3-2.82/Makefile +@@ -17,6 +17,8 @@ + NASM_OR_YASM=nasm + #NASM_OR_YASM=yasm + ++LD=ld ++ + EXMODE=SED + + #----------------------do not edit below line------------------------------- +@@ -41,12 +43,12 @@ + + 32: $(ASOURCES) Makefile + ifeq ($(OS),LINUX) +- nasm -O2 -f bin -l e3.lst -o e3 e3.asm -DCRIPLED_ELF=1 -D$(OS) -D$(EXMODE) ++ nasm -O2 -f bin -l e3.lst -o e3 e3.asm -DCRIPLED_ELF=1 -D$(OS) + chmod +x e3 + else + echo $(ASVER) +- nasm -O2 $(AFLAGS) -o e3.o e3.asm -l e3.lst -D$(OS) -D$(EXMODE) +- ld -s -o e3 e3.o ++ nasm -O2 $(AFLAGS) -o e3.o e3.asm -l e3.lst -D$(OS) ++ $(LD) -s -o e3 e3.o + strip --remove-section .comment e3 + endif + ln -sf e3 e3ws +@@ -60,7 +62,7 @@ + 64: $(ASOURCES) Makefile + cat e3.asm | sed -f e3_32to64.sed >e3.tmp + $(ASSEMBLER64) +- ld -b elf64-x86-64 --oformat elf64-x86-64 -o e3 e3.o ++ $(LD) -o e3 e3.o + ifneq ($(DEBUG),true) + strip e3 + endif diff --git a/package/e3/0002-Align-header-to-avoid-crash.patch b/package/e3/0002-Align-header-to-avoid-crash.patch new file mode 100644 index 0000000000..f24f180b0c --- /dev/null +++ b/package/e3/0002-Align-header-to-avoid-crash.patch @@ -0,0 +1,26 @@ +From: =?utf-8?q?Bernhard_=C3=9Cbelacker?= +Date: Tue, 6 Nov 2018 18:52:41 +0100 +Subject: [PATCH] Align header to avoid crash. + +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=913014 + +Downloaded from +https://sources.debian.org/src/e3/1%3A2.82%2Bdfsg-2/debian/patches/0001-Align-header-to-avoid-crash.patch/ + +Signed-off-by: Bernd Kuhls +--- + e3.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/e3.h b/e3.h +index 96f8dc7..6508e9b 100644 +--- a/e3.h ++++ b/e3.h +@@ -861,6 +861,7 @@ phdr2: ;another Elf32_Phdr starts here + %else + org 0x8048000 + ELFheader ++ times 0xBF2 db 0 + %endif + %else + ;nothing diff --git a/package/e3/0003-format-1.0.patch b/package/e3/0003-format-1.0.patch new file mode 100644 index 0000000000..c7ace235c4 --- /dev/null +++ b/package/e3/0003-format-1.0.patch @@ -0,0 +1,54 @@ +From: Debian QA Group +Date: Sun, 12 May 2019 04:36:49 +0000 +Subject: format-1.0 + +Downloaded from +https://sources.debian.org/src/e3/1%3A2.82%2Bdfsg-2/debian/patches/format-1.0.patch/ + +and removed Makefile patch. + +Signed-off-by: Bernd Kuhls + + e3.asm | 26 ++++++++++++++++++++++++++ + 2 files changed, 40 insertions(+), 12 deletions(-) +--- + e3.asm | 26 ++++++++++++++++++++++++++ + 2 files changed, 33 insertions(+), 11 deletions(-) + +diff --git a/e3.asm b/e3.asm +index b0a17ca..7d99f17 100644 +--- a/e3.asm ++++ b/e3.asm +@@ -3653,6 +3653,32 @@ NoPi: cmp ecx,'e3vi' + mov byte [eax],VI + ret + NoVi: cmp ecx,'e3ws' ++ jnz NoWs ++ mov byte [eax],WS ++ ret ++NoWs: cmp ecx,'edit' ++ jnz NoNe2 ++ mov byte [eax],NE ++ ret ++NoNe2: cmp ecx,'macs' ++ jnz NoEm2 ++ mov byte [eax],EM ++ ret ++NoEm2: cmp ecx,'pico' ++ jnz NoPi2 ++ mov byte [eax],PI ++ ret ++NoPi2: push cx ++ mov cx,'__' ++ cmp ecx,'__vi' ++ pop cx ++ jnz NoVi2 ++ mov byte [eax],VI ++ ret ++NoVi2: push cx ++ mov cx,'__' ++ cmp ecx,'__ws' ++ pop cx + jnz modeOK + mov byte [eax],WS + modeOK: ret diff --git a/package/e3/0004-e3-gnu-stack.patch b/package/e3/0004-e3-gnu-stack.patch new file mode 100644 index 0000000000..81eb6b14bb --- /dev/null +++ b/package/e3/0004-e3-gnu-stack.patch @@ -0,0 +1,50 @@ +Fix GNU stack + +Quoted from https://src.fedoraproject.org/rpms/e3/blob/f30/f/e3.spec + +# mark the stack as non-executable and disable tiny/crippled elf on 32 +# bit linux so that stack can be marked as non-executable on it too + +Downloaded from +https://src.fedoraproject.org/rpms/e3/blob/f30/f/e3-gnu-stack.patch + +Signed-off-by: Bernd Kuhls + +Common subdirectories: e3-2.8.orig/bin and e3-2.8/bin +diff -u e3-2.8.orig/e3.asm e3-2.8/e3.asm +--- e3-2.8.orig/e3.asm 2010-05-09 12:16:47.000000000 -0400 ++++ e3-2.8/e3.asm 2013-02-22 14:24:46.884384131 -0500 +@@ -6553,3 +6553,13 @@ + %ifdef CRIPLED_ELF + bsssize equ $-bssstart + %endif ++ ++%ifidn __OUTPUT_FORMAT__,elf ++section .note.GNU-stack noalloc noexec nowrite progbits ++%endif ++%ifidn __OUTPUT_FORMAT__,elf32 ++section .note.GNU-stack noalloc noexec nowrite progbits ++%endif ++%ifidn __OUTPUT_FORMAT__,elf64 ++section .note.GNU-stack noalloc noexec nowrite progbits ++%endif +Only in e3-2.8: e3.asm~ +diff -u e3-2.8.orig/Makefile e3-2.8/Makefile +--- e3-2.8.orig/Makefile 2010-05-27 14:58:59.000000000 -0400 ++++ e3-2.8/Makefile 2013-02-22 15:38:57.729605772 -0500 +@@ -42,15 +42,10 @@ + #---------------- 32 bit LINUX (and perhaps BSD) -- + + 32: $(ASOURCES) Makefile +-ifeq ($(OS),LINUX) +- nasm -O2 -f bin -l e3.lst -o e3 e3.asm -DCRIPLED_ELF=1 -D$(OS) +- chmod +x e3 +-else + echo $(ASVER) + nasm -O2 $(AFLAGS) -o e3.o e3.asm -l e3.lst -D$(OS) + $(LD) -s -o e3 e3.o + strip --remove-section .comment e3 +-endif + ln -sf e3 e3ws + ln -sf e3 e3em + ln -sf e3 e3pi diff --git a/package/e3/Config.in b/package/e3/Config.in new file mode 100644 index 0000000000..2854ea8ed7 --- /dev/null +++ b/package/e3/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_E3 + bool "e3" + depends on BR2_i386 || BR2_x86_64 + help + e3 is a full-screen, user-friendly text editor with an + interface similar to that of either WordStar, Emacs, Pico, + Nedit, or vi written in NASM assembler. + + https://sites.google.com/site/e3editor diff --git a/package/e3/e3.hash b/package/e3/e3.hash new file mode 100644 index 0000000000..5fc794f206 --- /dev/null +++ b/package/e3/e3.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 53c51d656801fd3ae0179a5b27f028e07eaba328e80c8c55050268359b9a2924 e3-2.82.tgz +sha256 cc2a6651c315b233ebc110b49ea3c6452eff9a28f8bc051ffd2bb92a8dcfa3d2 COPYING.GPL diff --git a/package/e3/e3.mk b/package/e3/e3.mk new file mode 100644 index 0000000000..63c97078ff --- /dev/null +++ b/package/e3/e3.mk @@ -0,0 +1,24 @@ +################################################################################ +# +# e3 +# +################################################################################ + +E3_VERSION = 2.82 +E3_SITE = https://gentoo.osuosl.org/distfiles +E3_SOURCE = e3-$(E3_VERSION).tgz +E3_LICENSE = GPL-2.0+ +E3_LICENSE_FILES = COPYING.GPL +E3_DEPENDENCIES = host-nasm + +define E3_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \ + $(if $(BR2_ARCH_IS_64),64,32) +endef + +define E3_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \ + PREFIX="$(TARGET_DIR)/usr" install +endef + +$(eval $(generic-package)) -- 2.30.2 From kyle at balena.io Sun Feb 13 13:55:40 2022 From: kyle at balena.io (Kyle Harding) Date: Sun, 13 Feb 2022 08:55:40 -0500 Subject: [Buildroot] [PATCH 1/1] package/unbound: bump version to 1.15.0 Message-ID: <20220213135540.49983-1-kyle@balena.io> Signed-off-by: Kyle Harding --- package/unbound/unbound.hash | 4 ++-- package/unbound/unbound.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/unbound/unbound.hash b/package/unbound/unbound.hash index ca6fe174e0..99caf7dd3d 100644 --- a/package/unbound/unbound.hash +++ b/package/unbound/unbound.hash @@ -1,5 +1,5 @@ -# From https://nlnetlabs.nl/downloads/unbound/unbound-1.14.0.tar.gz.sha256 -sha256 6ef91cbf02d5299eab39328c0857393de7b4885a2fe7233ddfe3c124ff5a89c8 unbound-1.14.0.tar.gz +# From https://nlnetlabs.nl/downloads/unbound/unbound-1.15.0.tar.gz.sha256 +sha256 a480dc6c8937447b98d161fe911ffc76cfaffa2da18788781314e81339f1126f unbound-1.15.0.tar.gz # Locally calculated sha256 8eb9a16cbfb8703090bbfa3a2028fd46bb351509a2f90dc1001e51fbe6fd45db LICENSE diff --git a/package/unbound/unbound.mk b/package/unbound/unbound.mk index 61fdc5389b..1e6e0d99d7 100644 --- a/package/unbound/unbound.mk +++ b/package/unbound/unbound.mk @@ -4,7 +4,7 @@ # ################################################################################ -UNBOUND_VERSION = 1.14.0 +UNBOUND_VERSION = 1.15.0 UNBOUND_SITE = https://www.unbound.net/downloads UNBOUND_DEPENDENCIES = host-pkgconf expat libevent openssl UNBOUND_LICENSE = BSD-3-Clause -- 2.30.2 From yann.morin.1998 at free.fr Sun Feb 13 14:42:18 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 13 Feb 2022 15:42:18 +0100 Subject: [Buildroot] [PATCH v6 2/8] package/re2: switch to generic-package make build In-Reply-To: <20220205201837.3324085-2-james.hilliard1@gmail.com> References: <20220205201837.3324085-1-james.hilliard1@gmail.com> <20220205201837.3324085-2-james.hilliard1@gmail.com> Message-ID: <20220213144218.GA4462@scaer> Jmes, All, On 2022-02-05 13:18 -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. I was wondering why we could not just fix the CMake buildsystem, and submit the fix upstream... And then I remembered already talking about this earlier, but this commit did not carry any explanations why we could not do it... So I had to dig the archives to recover the previous discussion. So, bottom line is, the commit log would be better off with more explanations, like: The cmake build appears to be missing features, such as pkg-config generation support which is needed for some packages to find re2, like qt5webengine. Upstream is not keen on fixing the CMake-absed buildsystem [0] Instead of patching it on our side, and then have to carry the patch forever, we switch to the Makefile-based generic buildsystem. Note that previously some packages like grpc failed when the generic Makefile was used, because they would not find the cmake-equivalent of pkg-config, but this is now fixed [1]. Signed-off-by: you. [0] https://github.com/google/re2/issues/349 [1] https://github.com/grpc/grpc/commit/45e413d2520795e7281e9a592af81620349bc186 > This will be needed by qt5webengine. > > 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) \ We usually do not double-quote STAGING_DIR, TARGET_DIR, or HOST_DIR, because we do not even support building in a directory with spaces in its name. $ git grep -E '=\$\(STAGING_DIR\)' |wc -l 693 $ git grep -E '="\$\(STAGING_DIR\)"' |wc -l 23 So I'd prefer we stick to the not-double-quoted situation. No need to respin, this can be fixed when applying... Regards, Yann E. MORIN. > + $(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 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From peter at korsgaard.com Sun Feb 13 14:44:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Feb 2022 15:44:04 +0100 Subject: [Buildroot] [git commit] package/grpc: fix fourth patch Message-ID: <20220213143638.EA37082901@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9f22134430f00edcfb9093f6095b1b5f72c27069 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since the addition of fourth patch in commit 8251d8c2559b25f11684776fc343059cf100657d: 1 out of 22 hunks FAILED -- saving rejects to file CMakeLists.txt.rej Fixes: - http://autobuild.buildroot.org/results/44f6d7c61316e90d22e75cb1fb77c3bc5b31ad66 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/grpc/0004-host-grpc-only-cpp-plugin.patch | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/package/grpc/0004-host-grpc-only-cpp-plugin.patch b/package/grpc/0004-host-grpc-only-cpp-plugin.patch index 43fad7e3d6..c97d9a9385 100644 --- a/package/grpc/0004-host-grpc-only-cpp-plugin.patch +++ b/package/grpc/0004-host-grpc-only-cpp-plugin.patch @@ -10,6 +10,7 @@ others. Upstream-status: not accepted (see https://github.com/grpc/grpc/issues/25322) Signed-off-by: Thomas De Schampheleire +Signed-off-by: Fabrice Fontaine --- CMakeLists.txt | 43 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 35 insertions(+), 8 deletions(-) @@ -167,15 +168,6 @@ index e8934a3e03..c2df332cc6 100644 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} ) From peter at korsgaard.com Sun Feb 13 14:52:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Feb 2022 15:52:23 +0100 Subject: [Buildroot] [PATCH v6 2/8] package/re2: switch to generic-package make build In-Reply-To: <20220213144218.GA4462@scaer> (Yann E. MORIN's message of "Sun, 13 Feb 2022 15:42:18 +0100") References: <20220205201837.3324085-1-james.hilliard1@gmail.com> <20220205201837.3324085-2-james.hilliard1@gmail.com> <20220213144218.GA4462@scaer> Message-ID: <87o83alsyg.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Jmes, All, > On 2022-02-05 13:18 -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. > I was wondering why we could not just fix the CMake buildsystem, and > submit the fix upstream... > And then I remembered already talking about this earlier, but this > commit did not carry any explanations why we could not do it... So I > had to dig the archives to recover the previous discussion. > So, bottom line is, the commit log would be better off with more > explanations, like: > The cmake build appears to be missing features, such as pkg-config > generation support which is needed for some packages to find re2, > like qt5webengine. > Upstream is not keen on fixing the CMake-absed buildsystem [0] > Instead of patching it on our side, and then have to carry the patch > forever, we switch to the Makefile-based generic buildsystem. > Note that previously some packages like grpc failed when the generic > Makefile was used, because they would not find the cmake-equivalent > of pkg-config, but this is now fixed [1]. > Signed-off-by: you. > [0] https://github.com/google/re2/issues/349 > [1] https://github.com/grpc/grpc/commit/45e413d2520795e7281e9a592af81620349bc186 Yes, a lot nicer! Committed with the commit message changed to the above, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 13 14:53:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Feb 2022 15:53:24 +0100 Subject: [Buildroot] [git commit] package/re2: switch to generic-package make build Message-ID: <20220213144604.E9CB082293@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9ecf705d8c65f6dfce189bc49e880ff6cd009882 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The cmake build appears to be missing features, such as pkg-config generation support which is needed for some packages to find re2, like qt5webengine. Upstream is not keen on fixing the CMake-based buildsystem [0] Instead of patching it on our side, and then have to carry the patch forever, we switch to the Makefile-based generic buildsystem. Note that previously some packages like grpc failed when the generic Makefile was used, because they would not find the cmake-equivalent of pkg-config, but this is now fixed [1]. [0] https://github.com/google/re2/issues/349 [1] https://github.com/grpc/grpc/commit/45e413d2520795e7281e9a592af81620349bc186 Signed-off-by: James Hilliard [Peter: Reword commit message as suggested by Yann] Signed-off-by: Peter Korsgaard --- 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 31252ee82f..41392cb179 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)) From bernd.kuhls at t-online.de Sun Feb 13 14:58:03 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 13 Feb 2022 15:58:03 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/libdeflate: new package Message-ID: <20220213145803.3132537-1-bernd.kuhls@t-online.de> Needed for transmission: https://github.com/transmission/transmission/commit/d8d765c59551b97ffb10bedb6f66133a54954a0e Signed-off-by: Bernd Kuhls --- v2: bumped to v1.10, added commit URL for patch Build test using this defconfig BR2_PACKAGE_LIBDEFLATE=y was successful: 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]: 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]: OK br-arm-full-nothread [29/45]: OK br-arm-full-static [30/45]: OK br-i386-pentium4-full [31/45]: OK br-i386-pentium-mmx-musl [32/45]: OK br-mips64-n64-full [33/45]: OK br-mips64r6-el-hf-glibc [34/45]: OK br-powerpc-603e-basic-cpp [35/45]: OK br-powerpc64-power7-glibc [36/45]: OK linaro-aarch64-be [37/45]: OK linaro-aarch64 [38/45]: OK linaro-arm [39/45]: OK sourcery-arm-armv4t [40/45]: OK sourcery-arm [41/45]: OK sourcery-arm-thumb2 [42/45]: OK sourcery-mips64 [43/45]: OK sourcery-mips [44/45]: OK sourcery-nios2 [45/45]: OK 45 builds, 0 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed DEVELOPERS | 1 + package/Config.in | 1 + ...e-ARM-CRC32-intrinsics-when-affected.patch | 66 +++++++++++++++++++ package/libdeflate/Config.in | 7 ++ package/libdeflate/libdeflate.hash | 3 + package/libdeflate/libdeflate.mk | 34 ++++++++++ 6 files changed, 112 insertions(+) create mode 100644 package/libdeflate/0001-Don-t-use-ARM-CRC32-intrinsics-when-affected.patch create mode 100644 package/libdeflate/Config.in create mode 100644 package/libdeflate/libdeflate.hash create mode 100644 package/libdeflate/libdeflate.mk diff --git a/DEVELOPERS b/DEVELOPERS index ac702d8d0f..53795ba67c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -361,6 +361,7 @@ F: package/libcec/ F: package/libcodec2/ F: package/libcrossguid/ F: package/libdcadec/ +F: package/libdeflate/ F: package/libdrm/ F: package/libdvbcsa/ F: package/libdvdcss/ diff --git a/package/Config.in b/package/Config.in index e4a0f35cb8..268549c4a1 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1376,6 +1376,7 @@ endmenu menu "Compression and decompression" source "package/libarchive/Config.in" + source "package/libdeflate/Config.in" source "package/libmspack/Config.in" source "package/libsquish/Config.in" source "package/libzip/Config.in" diff --git a/package/libdeflate/0001-Don-t-use-ARM-CRC32-intrinsics-when-affected.patch b/package/libdeflate/0001-Don-t-use-ARM-CRC32-intrinsics-when-affected.patch new file mode 100644 index 0000000000..63832810e9 --- /dev/null +++ b/package/libdeflate/0001-Don-t-use-ARM-CRC32-intrinsics-when-affected.patch @@ -0,0 +1,66 @@ +From d045a4933585fceef38d235727c49d9eac61cd61 Mon Sep 17 00:00:00 2001 +From: Eric Biggers +Date: Tue, 8 Feb 2022 00:22:00 -0800 +Subject: [PATCH] Don't use ARM CRC32 intrinsics when affected by gcc bug + 104439 + +The following build error was reported at +https://github.com/ebiggers/libdeflate/pull/163: + + /tmp/ccAwbDTP.s:140: Error: selected processor does not support crc32b r0,r0,r3' in ARM mode + [followed by lots of similar errors] + +This is caused by https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104439, a +gcc bug that has been fixed. To work around this, disable building +crc32_arm() as dynamically-dispatched code on the affected gcc versions. + +Downloaded from upstream commit +https://github.com/ebiggers/libdeflate/commit/d045a4933585fceef38d235727c49d9eac61cd61 + +Signed-off-by: Bernd Kuhls +--- + common/compiler_gcc.h | 29 ++++++++++++++++++++++------- + 1 file changed, 22 insertions(+), 7 deletions(-) + +diff --git a/common/compiler_gcc.h b/common/compiler_gcc.h +index 2a45b05..8ea3ff8 100644 +--- a/common/compiler_gcc.h ++++ b/common/compiler_gcc.h +@@ -122,15 +122,30 @@ + # endif + + /* +- * Determine whether CRC32 intrinsics are supported. ++ * Determine whether ARM CRC32 intrinsics are supported. + * +- * With gcc r274827 or later (gcc 10.1+, 9.3+, or 8.4+), or with clang, +- * they work as expected. (Well, not quite. There's still a bug, but we +- * have to work around it later when including arm_acle.h.) ++ * This support has been affected by several gcc bugs, which we must avoid ++ * by only allowing gcc versions that have the corresponding fixes. First, ++ * gcc commit 943766d37ae4 ("[arm] Fix use of CRC32 intrinsics with Armv8-a ++ * and hard-float"), i.e. gcc 8.4+, 9.3+, 10.1+, or 11+, is needed. ++ * Second, gcc commit c1cdabe3aab8 ("arm: reorder assembler architecture ++ * directives [PR101723]"), i.e. gcc 9.5+, 10.4+, 11.3+, or 12+, is needed ++ * when binutils is 2.34 or later, due to ++ * https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104439. We use the second ++ * set of prerequisites, as they are stricter and we have no way to detect ++ * the binutils version in C source without requiring a configure script. ++ * ++ * Yet another gcc bug makes arm_acle.h sometimes not define the crc ++ * functions even when the corresponding builtins are available. However, ++ * we work around this later when including arm_acle.h. ++ * ++ * Things are a bit easier with clang -- we can just check whether the ++ * crc builtins are available. However, clang's arm_acle.h is broken in ++ * the same way as gcc's, which we work around later in the same way. + */ +-# if GCC_PREREQ(10, 1) || \ +- (GCC_PREREQ(9, 3) && !GCC_PREREQ(10, 0)) || \ +- (GCC_PREREQ(8, 4) && !GCC_PREREQ(9, 0)) || \ ++# if GCC_PREREQ(11, 3) || \ ++ (GCC_PREREQ(10, 4) && !GCC_PREREQ(11, 0)) || \ ++ (GCC_PREREQ(9, 5) && !GCC_PREREQ(10, 0)) || \ + (defined(__clang__) && __has_builtin(__builtin_arm_crc32b)) + # define COMPILER_SUPPORTS_CRC32_TARGET_INTRINSICS 1 + # endif diff --git a/package/libdeflate/Config.in b/package/libdeflate/Config.in new file mode 100644 index 0000000000..d2fb0d6c55 --- /dev/null +++ b/package/libdeflate/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_LIBDEFLATE + bool "libdeflate" + help + Libdeflate is a heavily optimized library for DEFLATE/zlib/ + gzip compression and decompression + + https://github.com/ebiggers/libdeflate diff --git a/package/libdeflate/libdeflate.hash b/package/libdeflate/libdeflate.hash new file mode 100644 index 0000000000..0a941bd8d6 --- /dev/null +++ b/package/libdeflate/libdeflate.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 5c1f75c285cd87202226f4de49985dcb75732f527eefba2b3ddd70a8865f2533 libdeflate-1.10.tar.gz +sha256 5d246dd2537307b80fed9ba5fdddf5d0fe7a8f023393a071182b9daed56b40fe COPYING diff --git a/package/libdeflate/libdeflate.mk b/package/libdeflate/libdeflate.mk new file mode 100644 index 0000000000..08901ed5ed --- /dev/null +++ b/package/libdeflate/libdeflate.mk @@ -0,0 +1,34 @@ +################################################################################ +# +# libdeflate +# +################################################################################ + +LIBDEFLATE_VERSION = 1.10 +LIBDEFLATE_SITE = $(call github,ebiggers,libdeflate,v$(LIBDEFLATE_VERSION)) +LIBDEFLATE_LICENSE = MIT +LIBDEFLATE_LICENSE_FILES = COPYING +LIBDEFLATE_INSTALL_STAGING = YES + +ifeq ($(BR2_STATIC_LIBS),y) +LIBDEFLATE_MAKE_OPTS += DISABLE_SHARED=yes +endif + +define LIBDEFLATE_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \ + $(LIBDEFLATE_MAKE_OPTS) +endef + +define LIBDEFLATE_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \ + $(LIBDEFLATE_MAKE_OPTS) \ + DESTDIR="$(STAGING_DIR)" PREFIX=/usr install +endef + +define LIBDEFLATE_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \ + $(LIBDEFLATE_MAKE_OPTS) \ + DESTDIR="$(TARGET_DIR)" PREFIX=/usr install +endef + +$(eval $(generic-package)) -- 2.30.2 From yann.morin.1998 at free.fr Sun Feb 13 15:00:51 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 13 Feb 2022 16:00:51 +0100 Subject: [Buildroot] [PATCH v6 3/8] package/icu: don't disable renaming for host build In-Reply-To: <20220205201837.3324085-3-james.hilliard1@gmail.com> References: <20220205201837.3324085-1-james.hilliard1@gmail.com> <20220205201837.3324085-3-james.hilliard1@gmail.com> Message-ID: <20220213150051.GB4462@scaer> James, All, On 2022-02-05 13:18 -0700, James Hilliard spake thusly: > Using a different renaming option for the icu host build can cause > issues for packages such as qt5webengine which expect target and > host packages to be built with the same options. This little hand-waving is not explaning the actual error that those packages encounter, nor the root cause for that error. A package that needs both host and target to have the same options is most probably doing somethig wrong, like linking a host program and taking the result as valid for the target... However, our adding the --disable-renaming in the first place in 3911e67151b (icu: security bump to version 51.2) did not provide any explanations why it was needed to begin with. So it is not much uglier to remove it without further explanations either. Yet, a reference to the original commit would be nice, like the little blurb I wrote above maybe... Regards, Yann E. MORIN. > Signed-off-by: James Hilliard > --- > package/icu/icu.mk | 3 +-- > package/nodejs/nodejs.mk | 2 +- > 2 files changed, 2 insertions(+), 3 deletions(-) > > diff --git a/package/icu/icu.mk b/package/icu/icu.mk > index 7e0c96e43a..ebbb1968fc 100644 > --- a/package/icu/icu.mk > +++ b/package/icu/icu.mk > @@ -45,8 +45,7 @@ HOST_ICU_CONF_OPTS = \ > --disable-tests \ > --disable-extras \ > --disable-icuio \ > - --disable-layout \ > - --disable-renaming > + --disable-layout > ICU_SUBDIR = source > HOST_ICU_SUBDIR = source > > diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk > index 727af6dc50..2e41c11dbd 100644 > --- a/package/nodejs/nodejs.mk > +++ b/package/nodejs/nodejs.mk > @@ -94,7 +94,7 @@ NODEJS_HOST_TOOLS_V8 = \ > NODEJS_HOST_TOOLS_NODE = mkcodecache > NODEJS_HOST_TOOLS = $(NODEJS_HOST_TOOLS_V8) $(NODEJS_HOST_TOOLS_NODE) > > -HOST_NODEJS_CXXFLAGS = $(HOST_CXXFLAGS) -DU_DISABLE_RENAMING=1 > +HOST_NODEJS_CXXFLAGS = $(HOST_CXXFLAGS) > > define HOST_NODEJS_BUILD_CMDS > $(HOST_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python3 \ > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Feb 13 15:01:13 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 13 Feb 2022 16:01:13 +0100 Subject: [Buildroot] [PATCH v6 3/8] package/icu: don't disable renaming for host build In-Reply-To: <20220205201837.3324085-3-james.hilliard1@gmail.com> References: <20220205201837.3324085-1-james.hilliard1@gmail.com> <20220205201837.3324085-3-james.hilliard1@gmail.com> Message-ID: <20220213150113.GC4462@scaer> On 2022-02-05 13:18 -0700, James Hilliard spake thusly: > Using a different renaming option for the icu host build can cause > issues for packages such as qt5webengine which expect target and > host packages to be built with the same options. > > Signed-off-by: James Hilliard I forgot to add: Reviewed-by: Yann E. MORIN Regards, Yann E. MORIN. > --- > package/icu/icu.mk | 3 +-- > package/nodejs/nodejs.mk | 2 +- > 2 files changed, 2 insertions(+), 3 deletions(-) > > diff --git a/package/icu/icu.mk b/package/icu/icu.mk > index 7e0c96e43a..ebbb1968fc 100644 > --- a/package/icu/icu.mk > +++ b/package/icu/icu.mk > @@ -45,8 +45,7 @@ HOST_ICU_CONF_OPTS = \ > --disable-tests \ > --disable-extras \ > --disable-icuio \ > - --disable-layout \ > - --disable-renaming > + --disable-layout > ICU_SUBDIR = source > HOST_ICU_SUBDIR = source > > diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk > index 727af6dc50..2e41c11dbd 100644 > --- a/package/nodejs/nodejs.mk > +++ b/package/nodejs/nodejs.mk > @@ -94,7 +94,7 @@ NODEJS_HOST_TOOLS_V8 = \ > NODEJS_HOST_TOOLS_NODE = mkcodecache > NODEJS_HOST_TOOLS = $(NODEJS_HOST_TOOLS_V8) $(NODEJS_HOST_TOOLS_NODE) > > -HOST_NODEJS_CXXFLAGS = $(HOST_CXXFLAGS) -DU_DISABLE_RENAMING=1 > +HOST_NODEJS_CXXFLAGS = $(HOST_CXXFLAGS) > > define HOST_NODEJS_BUILD_CMDS > $(HOST_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python3 \ > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Feb 13 15:06:21 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 13 Feb 2022 16:06:21 +0100 Subject: [Buildroot] [PATCH v6 4/8] package/qt5/qt5base: enable ccache via configure option In-Reply-To: <20220205201837.3324085-4-james.hilliard1@gmail.com> References: <20220205201837.3324085-1-james.hilliard1@gmail.com> <20220205201837.3324085-4-james.hilliard1@gmail.com> Message-ID: <20220213150621.GD4462@scaer> James, All, +Arnout On 2022-02-05 13:18 -0700, James Hilliard spake thusly: > This should be cleaner than editing mkspecs/common/g++-base.conf. Is this actually fixing something? Is ccache as we sue it badly handled by the qt5webengin buildsystem somehow? Thomas, Arnout: IIRC some time ago, there were talks about using the compiler wrapper also for the host compiler. Maybe this would solve this kind of situations? Regards, Yann E. MORIN. > Signed-off-by: James Hilliard > --- > package/qt5/qt5base/qt5base.mk | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk > index d8a0bf1d16..4b7a2a937d 100644 > --- a/package/qt5/qt5base/qt5base.mk > +++ b/package/qt5/qt5base/qt5base.mk > @@ -289,10 +289,9 @@ endef > endif > > # This allows to use ccache when available > -define QT5BASE_CONFIGURE_HOSTCC > - $(SED) 's,^QMAKE_CC\s*=.*,QMAKE_CC = $(HOSTCC),' $(@D)/mkspecs/common/g++-base.conf > - $(SED) 's,^QMAKE_CXX\s*=.*,QMAKE_CXX = $(HOSTCXX),' $(@D)/mkspecs/common/g++-base.conf > -endef > +ifeq ($(BR2_CCACHE),y) > +QT5BASE_CONFIGURE_OPTS += -ccache > +endif > > # Must be last so can override all options set by Buildroot > QT5BASE_CONFIGURE_OPTS += $(call qstrip,$(BR2_PACKAGE_QT5BASE_CUSTOM_CONF_OPTS)) > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From arnout at mind.be Sun Feb 13 15:06:57 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 16:06:57 +0100 Subject: [Buildroot] [PATCH 01/16] board/aarch64-efi/genimage-efi: convert partition-type-uuid to single letter notation In-Reply-To: <20220207173751.GA2249818@scaer> References: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> <20220206200532.2758493-2-giulio.benetti@benettiengineering.com> <20220206213657.GA457876@scaer> <20220207085517.5c13c097@windsurf> <20220207173751.GA2249818@scaer> Message-ID: On 07/02/2022 18:37, Yann E. MORIN wrote: > Thomas, All, > > On 2022-02-07 08:55 +0100, Thomas Petazzoni spake thusly: >> On Sun, 6 Feb 2022 22:36:57 +0100 >> "Yann E. MORIN" wrote: >>>> partition root { >>>> - partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae >>>> + partition-type-uuid = L >>> As we discussed on IRC, this is not the same thing. genimage will extend >>> the 'L' shorthand to the full UUID 0fc63daf-8483-4772-8e79-3d69d8477de4, >>> which is different. >> And? Is that really important? >>> So I don't think uaing the shorthands are correct. >> Why? > > I think that it is important that we do adhere to the expected values; > see below... > >>> The UUID assignments are available on Wikipedia: >>> https://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs >>> But the systemd docuemntation has extra UUID definitions: >>> https://man.archlinux.org/man/systemd-gpt-auto-generator.8 >> Yes, but how useful are they? > > Why would we diverge from the specs? > >> Unless these systemd-defined UUID are really relevant, I would prefer >> that we use the shortcuts provided by genimage wherever possible, and >> only rely on using the full UUID for special cases, such as the >> board/sifive/hifive-unleashed/genimage_sdcard.cfg (PATCH 15/16). > > There are tools that expect those values, to autodetect partitions. This > is the case, of course, of systemd-gpt-auto-generator, which will lookup > the partition UUIDs, but other tools may expect these UUIDs too. At least for systemd-gpt-auto-generator, the UUID for rootfs is only relevant in case systemd is the one mounting the rootfs, i.e. in case of it running from initramfs and pivoting into a mounted root. That is not a scenario that we support in Buildroot, by a long shot. Therefore, my suggestion would be to use the default Linux partition type for the rootfs, i.e. L. Since this is actually the default for genimage, I would even leave it out completely. Giulio, that would mean rewriting this series and removing everywhere L is specified. Do you agree with that? > I am not saying that we would cause trouble by changing our board > descriptions, but if we want to allow people to just copy them as the > base for their own development, then diverging from expected behaviour > is not nice. I think the cases where a non-standard (where "standard" means the actual GPT standard, not the additional stuff that systemd invented) partition type is relevant are going to be so unusual that the default we put in our genimage.cfg is going to be of no relevance whatsoever. Regards, Arnout > >> This way, it would be pretty clear that we have the "common cases" (boot >> partition, rootfs partition) and the "odd/special cases". > > I think the "common case" would be "adhere to spec, use specified > values", while the exceptions are "the spec says nothing, use something > else and comment it". > > Regards, > Yann E. MORIN. > From arnout at mind.be Sun Feb 13 15:18:54 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 16:18:54 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/rygel: gobject-introspection is mandatory In-Reply-To: <20220206095359.854435-1-fontaine.fabrice@gmail.com> References: <20220206095359.854435-1-fontaine.fabrice@gmail.com> Message-ID: <9e24e8c1-2b12-59c1-82a9-6ef49557132f@mind.be> On 06/02/2022 10:53, Fabrice Fontaine wrote: > vapi (and gobject-introspection) is mandatory since bump to version > 0.40.2 in commit 6acdbb81c8d6cdd3ecb476ae24e72fd4547011c3: > > valac -C --pkg posix --pkg libxml-2.0 --pkg gmodule-2.0 --pkg gio-2.0 --pkg gssdp-1.2 --pkg gee-0.8 --pkg gupnp-1.2 --target-glib ' 2.56' --pkg glib-2.0 --color=always --directory src/librygel-core/librygel-core-2.6.so.2.0.4.p --basedir ../src/librygel-core --library rygel-core-2.6 --header src/librygel-core/rygel-core.h --vapi ../rygel-core-2.6.vapi --gir ../Rygel-2.6.gir ../src/librygel-core/rygel-build-config.vapi ../src/librygel-core/rygel-connection-manager.vala ../src/librygel-core/rygel-basic-management.vala ../src/librygel-core/rygel-basic-management-test.vala ../src/librygel-core/rygel-basic-management-test-ping.vala ../src/librygel-core/rygel-basic-management-test-nslookup.vala ../src/librygel-core/rygel-basic-management-test-traceroute.vala ../src/librygel-core/rygel-description-file.vala ../src/librygel-core/rygel-dlna-profile.vala ../src/librygel-core/rygel-energy-management.vala ../src/librygel-core/rygel-root-device.vala ../src/librygel-core/rygel-root-device-factory.v > ala ../src/librygel-core/rygel-dbus-interface.vala ../src/librygel-core/rygel-log-handler.vala ../src/librygel-core/rygel-meta-config.vala ../src/librygel-core/rygel-plugin-loader.vala ../src/librygel-core/rygel-recursive-module-loader.vala ../src/librygel-core/rygel-plugin.vala ../src/librygel-core/rygel-resource-info.vala ../src/librygel-core/rygel-media-device.vala ../src/librygel-core/rygel-configuration.vala ../src/librygel-core/rygel-base-configuration.vala ../src/librygel-core/rygel-cmdline-config.vala ../src/librygel-core/rygel-environment-config.vala ../src/librygel-core/rygel-user-config.vala ../src/librygel-core/rygel-state-machine.vala ../src/librygel-core/rygel-v1-hacks.vala ../src/librygel-core/rygel-icon-info.vala ../src/librygel-core/rygel-xml-utils.vala ../src/librygel-core/rygel-plugin-information.vala > error: Package `gssdp-1.2' not found in specified Vala API directories or GObject-Introspection GIR directories > error: Package `gupnp-1.2' not found in specified Vala API directories or GObject-Introspection GIR directories > > Depends on BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES instead of selecting > it to avoid the following recursive dependency: > > package/gstreamer1/gstreamer1/Config.in:5:error: recursive dependency detected! > package/gstreamer1/gstreamer1/Config.in:5: symbol BR2_PACKAGE_GSTREAMER1 is selected by BR2_PACKAGE_RYGEL_MEDIA_ENGINE_GSTREAMER1 > package/rygel/Config.in:46: symbol BR2_PACKAGE_RYGEL_MEDIA_ENGINE_GSTREAMER1 is part of choice > package/rygel/Config.in:39: choice contains symbol > package/rygel/Config.in:39: choice contains symbol BR2_PACKAGE_RYGEL > package/rygel/Config.in:1: symbol BR2_PACKAGE_RYGEL depends on BR2_PACKAGE_PYTHON3 > package/python3/Config.in:5: symbol BR2_PACKAGE_PYTHON3 is selected by BR2_PACKAGE_JACK2_DBUS > package/jack2/Config.in:35: symbol BR2_PACKAGE_JACK2_DBUS depends on BR2_PACKAGE_JACK2 > package/jack2/Config.in:1: symbol BR2_PACKAGE_JACK2 is selected by BR2_PACKAGE_FLUIDSYNTH_JACK2 > package/fluidsynth/Config.in:37: symbol BR2_PACKAGE_FLUIDSYNTH_JACK2 depends on BR2_PACKAGE_FLUIDSYNTH > package/fluidsynth/Config.in:1: symbol BR2_PACKAGE_FLUIDSYNTH is selected by BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FLUIDSYNTH > package/gstreamer1/gst1-plugins-bad/Config.in:425: symbol BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FLUIDSYNTH depends on BR2_PACKAGE_GSTREAMER1 I think that now python2 has been removed, we can select python3 for gobject-introspection instead of depending on it, and that that would break this circular dependency. select python3 would also allow us to remove the python3 dependency from all transitive dependencies of gobject-introspection. Regards, Arnout > > Fixes: > - http://autobuild.buildroot.org/results/027ce84895fab6fb251dd37cd5cfb7169287a2de > > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2: > - Depends on BR2_PACKAGE_{PYTHON3,GSTREAMER1_EDITING_SERVICES} > > package/rygel/Config.in | 23 +++++++++++++++++------ > package/rygel/rygel.mk | 9 ++------- > 2 files changed, 19 insertions(+), 13 deletions(-) > > diff --git a/package/rygel/Config.in b/package/rygel/Config.in > index df48918833..30e8430537 100644 > --- a/package/rygel/Config.in > +++ b/package/rygel/Config.in > @@ -2,8 +2,14 @@ config BR2_PACKAGE_RYGEL > bool "rygel" > depends on BR2_USE_WCHAR # gupnp-av > depends on BR2_TOOLCHAIN_HAS_THREADS # gupnp-av > - depends on BR2_USE_MMU # gupnp-av > + depends on BR2_USE_MMU # gupnp-av, gobject-introspection > + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS # gobject-introspection > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # gobject-introspection > + depends on BR2_HOST_GCC_AT_LEAST_8 # gobject-introspection -> host-qemu > + depends on BR2_TOOLCHAIN_USES_GLIBC # gobject-introspection > + depends on BR2_PACKAGE_PYTHON3 # gobject-introspection > select BR2_PACKAGE_GDK_PIXBUF > + select BR2_PACKAGE_GOBJECT_INTROSPECTION > select BR2_PACKAGE_GUPNP_AV > select BR2_PACKAGE_GUPNP_DLNA > select BR2_PACKAGE_LIBGEE > @@ -39,14 +45,19 @@ config BR2_PACKAGE_RYGEL_MEDIA_ENGINE_SIMPLE > > config BR2_PACKAGE_RYGEL_MEDIA_ENGINE_GSTREAMER1 > bool "gstreamer1" > - select BR2_PACKAGE_GSTREAMER1 > - select BR2_PACKAGE_GST1_PLUGINS_BASE > - select BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES > + depends on BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES > + > +comment "gstreamer1 needs gst1-editing-services" > + depends on !BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES > > endchoice > > -comment "rygel needs a toolchain w/ wchar, threads" > +comment "rygel needs a glibc toolchain w/ wchar, threads, gcc >= 4.9, host gcc >= 8" > depends on BR2_USE_MMU > - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS > + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS > + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ > + !BR2_TOOLCHAIN_USES_GLIBC || \ > + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ > + !BR2_HOST_GCC_AT_LEAST_8 > > endif # BR2_PACKAGE_RYGEL > diff --git a/package/rygel/rygel.mk b/package/rygel/rygel.mk > index c541cdc0ed..bfcd5df3c6 100644 > --- a/package/rygel/rygel.mk > +++ b/package/rygel/rygel.mk > @@ -12,6 +12,7 @@ RYGEL_LICENSE = LGPL-2.1+, CC-BY-SA-3.0 (logo) > RYGEL_LICENSE_FILES = COPYING COPYING.logo > RYGEL_DEPENDENCIES = \ > gdk-pixbuf \ > + gobject-introspection \ > gupnp-av \ > gupnp-dlna \ > libgee \ > @@ -24,16 +25,10 @@ RYGEL_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) > RYGEL_CONF_OPTS += \ > -Dapi-docs=false \ > -Dexamples=false \ > + -Dintrospection=enabled \ > -Dtests=false > RYGEL_PLUGINS = external,lms,mpris,ruih > > -ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) > -RYGEL_CONF_OPTS += -Dintrospection=enabled > -RYGEL_DEPENDENCIES += gobject-introspection > -else > -RYGEL_CONF_OPTS += -Dintrospection=disabled > -endif > - > ifeq ($(BR2_PACKAGE_RYGEL_MEDIA_ENGINE_GSTREAMER1),y) > RYGEL_CONF_OPTS += \ > -Dengines=gstreamer \ From arnout at mind.be Sun Feb 13 15:21:26 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 16:21:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/mpd: ignore CVE-2020-746[56] intended for FreeBSD PPP daemon In-Reply-To: <20220203094746.22715-1-br015@umbiko.net> References: <20220203094746.22715-1-br015@umbiko.net> Message-ID: <48283b3f-b38a-051c-40cc-e8473d11e9c1@mind.be> On 03/02/2022 10:47, Andreas Ziegler wrote: > cpe:2.3:a:mpd_project:mpd:*:*:*:*:*:*:*:* is not a valid CPE > identifier for mpd (musicpd.org); this string refers to > MPD /FreeBSD PPP daemon (sourceforge.net/projects/mpd) > > Since mpd does not have entries in the CVE database, put these > two CVE identifiers on the mpd ignore list: > > https://nvd.nist.gov/vuln/detail/CVE-2020-7465 > https://nvd.nist.gov/vuln/detail/CVE-2020-7466 > > Signed-off-by: Andreas Ziegler Applied to master, thanks. Regards, Arnout > --- > package/mpd/mpd.mk | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk > index 6f01b29c6d..a55e4adde2 100644 > --- a/package/mpd/mpd.mk > +++ b/package/mpd/mpd.mk > @@ -11,6 +11,8 @@ 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 > +# these refer to the FreeBSD PPP daemon > +MPD_IGNORE_CVES = CVE-2020-7465 CVE-2020-7466 > MPD_SELINUX_MODULES = mpd > MPD_CONF_OPTS = \ > -Daudiofile=disabled \ From arnout at mind.be Sun Feb 13 15:21:57 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 16:21:57 +0100 Subject: [Buildroot] [PATCH 1/1] configs/qemu_*: bump kernel version to 5.15.18 In-Reply-To: <20220203155951.1277343-1-david.heng@smile.fr> References: <20220203155951.1277343-1-david.heng@smile.fr> Message-ID: On 03/02/2022 16:59, David HENG wrote: > See runtimes test here : > https://gitlab.com/davidheng.pw/buildroot/-/pipelines/460019580 > > Signed-off-by: David HENG Applied to master, thanks. Regards, Arnout > --- > It seems that qemu_s390x_defconfig made a timeout on Gitlab shared-runner at the end but work after a restarting. > https://gitlab.com/davidheng.pw/buildroot/-/jobs/2044971657 > --- > configs/qemu_aarch64_sbsa_defconfig | 2 +- > configs/qemu_aarch64_virt_defconfig | 2 +- > configs/qemu_arm_versatile_defconfig | 2 +- > configs/qemu_arm_versatile_nommu_defconfig | 2 +- > configs/qemu_arm_vexpress_defconfig | 2 +- > configs/qemu_arm_vexpress_tz_defconfig | 2 +- > configs/qemu_m68k_mcf5208_defconfig | 2 +- > configs/qemu_m68k_q800_defconfig | 2 +- > configs/qemu_microblazebe_mmu_defconfig | 2 +- > configs/qemu_microblazeel_mmu_defconfig | 2 +- > configs/qemu_mips32r2_malta_defconfig | 2 +- > configs/qemu_mips32r2el_malta_defconfig | 2 +- > configs/qemu_mips32r6_malta_defconfig | 2 +- > configs/qemu_mips32r6el_malta_defconfig | 2 +- > configs/qemu_mips64_malta_defconfig | 2 +- > configs/qemu_mips64el_malta_defconfig | 2 +- > configs/qemu_mips64r6_malta_defconfig | 2 +- > configs/qemu_mips64r6el_malta_defconfig | 2 +- > configs/qemu_nios2_10m50_defconfig | 2 +- > configs/qemu_or1k_defconfig | 2 +- > configs/qemu_ppc64_e5500_defconfig | 2 +- > configs/qemu_ppc64_pseries_defconfig | 2 +- > configs/qemu_ppc64le_powernv8_defconfig | 2 +- > configs/qemu_ppc64le_pseries_defconfig | 2 +- > configs/qemu_ppc_bamboo_defconfig | 2 +- > configs/qemu_ppc_e500mc_defconfig | 2 +- > configs/qemu_ppc_g3beige_defconfig | 2 +- > configs/qemu_ppc_mac99_defconfig | 2 +- > configs/qemu_ppc_mpc8544ds_defconfig | 2 +- > configs/qemu_riscv32_virt_defconfig | 2 +- > configs/qemu_riscv64_virt_defconfig | 2 +- > configs/qemu_s390x_defconfig | 2 +- > configs/qemu_sh4_r2d_defconfig | 2 +- > configs/qemu_sh4eb_r2d_defconfig | 2 +- > configs/qemu_sparc64_sun4u_defconfig | 2 +- > configs/qemu_sparc_ss10_defconfig | 2 +- > configs/qemu_x86_64_defconfig | 2 +- > configs/qemu_x86_defconfig | 2 +- > configs/qemu_xtensa_lx60_defconfig | 2 +- > configs/qemu_xtensa_lx60_nommu_defconfig | 2 +- > 40 files changed, 40 insertions(+), 40 deletions(-) > > diff --git a/configs/qemu_aarch64_sbsa_defconfig b/configs/qemu_aarch64_sbsa_defconfig > index e7d3bd03ca..2d6134e78c 100644 > --- a/configs/qemu_aarch64_sbsa_defconfig > +++ b/configs/qemu_aarch64_sbsa_defconfig > @@ -25,7 +25,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.18" > BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > > diff --git a/configs/qemu_aarch64_virt_defconfig b/configs/qemu_aarch64_virt_defconfig > index 9fbf293311..03df0ad9e2 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.16" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig > index 5e399d17de..4f43273a82 100644 > --- a/configs/qemu_arm_versatile_defconfig > +++ b/configs/qemu_arm_versatile_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.18" > BR2_LINUX_KERNEL_DEFCONFIG="versatile" > BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-versatile/linux.fragment" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > diff --git a/configs/qemu_arm_versatile_nommu_defconfig b/configs/qemu_arm_versatile_nommu_defconfig > index 1357742703..0c49d1b67d 100644 > --- a/configs/qemu_arm_versatile_nommu_defconfig > +++ b/configs/qemu_arm_versatile_nommu_defconfig > @@ -31,7 +31,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.18" > BR2_LINUX_KERNEL_DEFCONFIG="versatile" > BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-versatile/linux-nommu.fragment" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > diff --git a/configs/qemu_arm_vexpress_defconfig b/configs/qemu_arm_vexpress_defconfig > index dafcc37bc0..2c813456f4 100644 > --- a/configs/qemu_arm_vexpress_defconfig > +++ b/configs/qemu_arm_vexpress_defconfig > @@ -25,7 +25,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.18" > BR2_LINUX_KERNEL_DEFCONFIG="vexpress" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" > diff --git a/configs/qemu_arm_vexpress_tz_defconfig b/configs/qemu_arm_vexpress_tz_defconfig > index 327762277b..def11721ae 100644 > --- a/configs/qemu_arm_vexpress_tz_defconfig > +++ b/configs/qemu_arm_vexpress_tz_defconfig > @@ -22,7 +22,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.18" > BR2_LINUX_KERNEL_DEFCONFIG="vexpress" > BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-vexpress-tz/linux.fragment" > > diff --git a/configs/qemu_m68k_mcf5208_defconfig b/configs/qemu_m68k_mcf5208_defconfig > index 1dcd8272c3..0490b9e29e 100644 > --- a/configs/qemu_m68k_mcf5208_defconfig > +++ b/configs/qemu_m68k_mcf5208_defconfig > @@ -19,7 +19,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.18" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-mcf5208/linux.config" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_m68k_q800_defconfig b/configs/qemu_m68k_q800_defconfig > index 7bf8b4061f..30d8982db3 100644 > --- a/configs/qemu_m68k_q800_defconfig > +++ b/configs/qemu_m68k_q800_defconfig > @@ -19,7 +19,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.18" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-q800/linux.config" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_microblazebe_mmu_defconfig b/configs/qemu_microblazebe_mmu_defconfig > index 0508f92c36..7bd2ae53b8 100644 > --- a/configs/qemu_microblazebe_mmu_defconfig > +++ b/configs/qemu_microblazebe_mmu_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.18" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux.config" > BR2_LINUX_KERNEL_LINUX_BIN=y > diff --git a/configs/qemu_microblazeel_mmu_defconfig b/configs/qemu_microblazeel_mmu_defconfig > index 10811e284e..cd8c5a3cb2 100644 > --- a/configs/qemu_microblazeel_mmu_defconfig > +++ b/configs/qemu_microblazeel_mmu_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.18" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux.config" > BR2_LINUX_KERNEL_LINUX_BIN=y > diff --git a/configs/qemu_mips32r2_malta_defconfig b/configs/qemu_mips32r2_malta_defconfig > index c08ca862c5..49d84c308b 100644 > --- a/configs/qemu_mips32r2_malta_defconfig > +++ b/configs/qemu_mips32r2_malta_defconfig > @@ -19,7 +19,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.18" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2-malta/linux.config" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_mips32r2el_malta_defconfig b/configs/qemu_mips32r2el_malta_defconfig > index 0bb16b9320..5363018c47 100644 > --- a/configs/qemu_mips32r2el_malta_defconfig > +++ b/configs/qemu_mips32r2el_malta_defconfig > @@ -19,7 +19,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.18" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2el-malta/linux.config" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_mips32r6_malta_defconfig b/configs/qemu_mips32r6_malta_defconfig > index f7b218c62a..f77feb9b6d 100644 > --- a/configs/qemu_mips32r6_malta_defconfig > +++ b/configs/qemu_mips32r6_malta_defconfig > @@ -19,7 +19,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.18" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6-malta/linux.config" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_mips32r6el_malta_defconfig b/configs/qemu_mips32r6el_malta_defconfig > index d0f118ff90..575034441a 100644 > --- a/configs/qemu_mips32r6el_malta_defconfig > +++ b/configs/qemu_mips32r6el_malta_defconfig > @@ -19,7 +19,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.18" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6el-malta/linux.config" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_mips64_malta_defconfig b/configs/qemu_mips64_malta_defconfig > index fe03b911c5..e9438fda1e 100644 > --- a/configs/qemu_mips64_malta_defconfig > +++ b/configs/qemu_mips64_malta_defconfig > @@ -19,7 +19,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.18" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux.config" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_mips64el_malta_defconfig b/configs/qemu_mips64el_malta_defconfig > index c6d428226c..4b1c8e22af 100644 > --- a/configs/qemu_mips64el_malta_defconfig > +++ b/configs/qemu_mips64el_malta_defconfig > @@ -19,7 +19,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.18" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64el-malta/linux.config" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_mips64r6_malta_defconfig b/configs/qemu_mips64r6_malta_defconfig > index 9cf651a4ba..87ef7902af 100644 > --- a/configs/qemu_mips64r6_malta_defconfig > +++ b/configs/qemu_mips64r6_malta_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.18" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6-malta/linux.config" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_mips64r6el_malta_defconfig b/configs/qemu_mips64r6el_malta_defconfig > index 0d02a5b4df..5774207f65 100644 > --- a/configs/qemu_mips64r6el_malta_defconfig > +++ b/configs/qemu_mips64r6el_malta_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.18" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6el-malta/linux.config" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_nios2_10m50_defconfig b/configs/qemu_nios2_10m50_defconfig > index 44afb928e3..4b9c53e8de 100644 > --- a/configs/qemu_nios2_10m50_defconfig > +++ b/configs/qemu_nios2_10m50_defconfig > @@ -1,7 +1,7 @@ > BR2_nios2=y > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > BR2_LINUX_KERNEL_DEFCONFIG="10m50" > BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/nios2-10m50/linux.fragment" > BR2_TARGET_ROOTFS_INITRAMFS=y > diff --git a/configs/qemu_or1k_defconfig b/configs/qemu_or1k_defconfig > index 9d55cb3420..b3d9d79156 100644 > --- a/configs/qemu_or1k_defconfig > +++ b/configs/qemu_or1k_defconfig > @@ -15,7 +15,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.18" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/or1k/linux.config" > > diff --git a/configs/qemu_ppc64_e5500_defconfig b/configs/qemu_ppc64_e5500_defconfig > index 09aac50252..072240c99c 100644 > --- a/configs/qemu_ppc64_e5500_defconfig > +++ b/configs/qemu_ppc64_e5500_defconfig > @@ -16,7 +16,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.18" > BR2_LINUX_KERNEL_DEFCONFIG="corenet64_smp" > BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc64-e5500/linux.fragment" > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > diff --git a/configs/qemu_ppc64_pseries_defconfig b/configs/qemu_ppc64_pseries_defconfig > index 1a20e2ee0e..ad523ec2ef 100644 > --- a/configs/qemu_ppc64_pseries_defconfig > +++ b/configs/qemu_ppc64_pseries_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.18" > BR2_LINUX_KERNEL_DEFCONFIG="pseries" > BR2_LINUX_KERNEL_VMLINUX=y > > diff --git a/configs/qemu_ppc64le_powernv8_defconfig b/configs/qemu_ppc64le_powernv8_defconfig > index d8ea6655fc..a784695ddf 100644 > --- a/configs/qemu_ppc64le_powernv8_defconfig > +++ b/configs/qemu_ppc64le_powernv8_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.18" > BR2_LINUX_KERNEL_DEFCONFIG="powernv" > BR2_LINUX_KERNEL_VMLINUX=y > > diff --git a/configs/qemu_ppc64le_pseries_defconfig b/configs/qemu_ppc64le_pseries_defconfig > index 46f62b8313..f10b0fdf40 100644 > --- a/configs/qemu_ppc64le_pseries_defconfig > +++ b/configs/qemu_ppc64le_pseries_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.18" > BR2_LINUX_KERNEL_DEFCONFIG="pseries_le" > BR2_LINUX_KERNEL_VMLINUX=y > > diff --git a/configs/qemu_ppc_bamboo_defconfig b/configs/qemu_ppc_bamboo_defconfig > index d6abbeb452..6129c4a663 100644 > --- a/configs/qemu_ppc_bamboo_defconfig > +++ b/configs/qemu_ppc_bamboo_defconfig > @@ -19,7 +19,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.18" > BR2_LINUX_KERNEL_DEFCONFIG="44x/bamboo" > BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-bamboo/linux.fragment" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_ppc_e500mc_defconfig b/configs/qemu_ppc_e500mc_defconfig > index 232bc1f70c..1853e538bb 100644 > --- a/configs/qemu_ppc_e500mc_defconfig > +++ b/configs/qemu_ppc_e500mc_defconfig > @@ -16,7 +16,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.18" > BR2_LINUX_KERNEL_DEFCONFIG="corenet32_smp" > BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-e500mc/linux.fragment" > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > diff --git a/configs/qemu_ppc_g3beige_defconfig b/configs/qemu_ppc_g3beige_defconfig > index 824fe648ab..9bbebede1b 100644 > --- a/configs/qemu_ppc_g3beige_defconfig > +++ b/configs/qemu_ppc_g3beige_defconfig > @@ -19,7 +19,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.18" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-g3beige/linux.config" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_ppc_mac99_defconfig b/configs/qemu_ppc_mac99_defconfig > index ddeb99465a..e9629ff233 100644 > --- a/configs/qemu_ppc_mac99_defconfig > +++ b/configs/qemu_ppc_mac99_defconfig > @@ -11,7 +11,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.18" > BR2_LINUX_KERNEL_DEFCONFIG="pmac32" > BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-mac99/linux.fragment" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_ppc_mpc8544ds_defconfig b/configs/qemu_ppc_mpc8544ds_defconfig > index 1a72d81ed5..2b51573da9 100644 > --- a/configs/qemu_ppc_mpc8544ds_defconfig > +++ b/configs/qemu_ppc_mpc8544ds_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.18" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-mpc8544ds/linux.config" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_riscv32_virt_defconfig b/configs/qemu_riscv32_virt_defconfig > index e2753cfcfd..dff87ef342 100644 > --- a/configs/qemu_riscv32_virt_defconfig > +++ b/configs/qemu_riscv32_virt_defconfig > @@ -19,7 +19,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.18" > BR2_LINUX_KERNEL_DEFCONFIG="rv32" > BR2_LINUX_KERNEL_IMAGE=y > > diff --git a/configs/qemu_riscv64_virt_defconfig b/configs/qemu_riscv64_virt_defconfig > index 07f20776f0..d67d070185 100644 > --- a/configs/qemu_riscv64_virt_defconfig > +++ b/configs/qemu_riscv64_virt_defconfig > @@ -19,7 +19,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.18" > BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > BR2_LINUX_KERNEL_IMAGE=y > > diff --git a/configs/qemu_s390x_defconfig b/configs/qemu_s390x_defconfig > index 86ac1fd024..346df04ada 100644 > --- a/configs/qemu_s390x_defconfig > +++ b/configs/qemu_s390x_defconfig > @@ -17,7 +17,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.18" > BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > > diff --git a/configs/qemu_sh4_r2d_defconfig b/configs/qemu_sh4_r2d_defconfig > index c8177e6096..0f12b7dfe9 100644 > --- a/configs/qemu_sh4_r2d_defconfig > +++ b/configs/qemu_sh4_r2d_defconfig > @@ -20,7 +20,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > # Linux 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.18" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux.config" > BR2_LINUX_KERNEL_ZIMAGE=y > diff --git a/configs/qemu_sh4eb_r2d_defconfig b/configs/qemu_sh4eb_r2d_defconfig > index f334569779..d5ee371e79 100644 > --- a/configs/qemu_sh4eb_r2d_defconfig > +++ b/configs/qemu_sh4eb_r2d_defconfig > @@ -19,7 +19,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > # Linux 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.18" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4eb-r2d/linux.config" > BR2_LINUX_KERNEL_ZIMAGE=y > diff --git a/configs/qemu_sparc64_sun4u_defconfig b/configs/qemu_sparc64_sun4u_defconfig > index 941439d338..485b497e71 100644 > --- a/configs/qemu_sparc64_sun4u_defconfig > +++ b/configs/qemu_sparc64_sun4u_defconfig > @@ -19,7 +19,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > # Linux 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.18" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc64-sun4u/linux.config" > > diff --git a/configs/qemu_sparc_ss10_defconfig b/configs/qemu_sparc_ss10_defconfig > index 62d3acb16b..2ba04c0864 100644 > --- a/configs/qemu_sparc_ss10_defconfig > +++ b/configs/qemu_sparc_ss10_defconfig > @@ -19,7 +19,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > # Linux 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.18" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc-ss10/linux.config" > > diff --git a/configs/qemu_x86_64_defconfig b/configs/qemu_x86_64_defconfig > index 1bca76df44..cc505a8540 100644 > --- a/configs/qemu_x86_64_defconfig > +++ b/configs/qemu_x86_64_defconfig > @@ -21,7 +21,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.18" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux.config" > BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y > diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig > index 54cf8e9794..34b7e2d292 100644 > --- a/configs/qemu_x86_defconfig > +++ b/configs/qemu_x86_defconfig > @@ -22,7 +22,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.18" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux.config" > > diff --git a/configs/qemu_xtensa_lx60_defconfig b/configs/qemu_xtensa_lx60_defconfig > index 1db3fd3ce4..cb78106091 100644 > --- a/configs/qemu_xtensa_lx60_defconfig > +++ b/configs/qemu_xtensa_lx60_defconfig > @@ -21,7 +21,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.18" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux.config" > BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y > diff --git a/configs/qemu_xtensa_lx60_nommu_defconfig b/configs/qemu_xtensa_lx60_nommu_defconfig > index d4c07b574c..c4473fb32a 100644 > --- a/configs/qemu_xtensa_lx60_nommu_defconfig > +++ b/configs/qemu_xtensa_lx60_nommu_defconfig > @@ -25,7 +25,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.18" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux-nommu.config" > BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y From arnout at mind.be Sun Feb 13 15:21:36 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 16:21:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/mpdecimal: fix build without threads In-Reply-To: <20220205145039.439160-1-fontaine.fabrice@gmail.com> References: <20220205145039.439160-1-fontaine.fabrice@gmail.com> Message-ID: <052f34a5-6ae9-2cb4-e4b0-b6549beaf14a@mind.be> On 05/02/2022 15:50, Fabrice Fontaine wrote: > Fix the following build failure raised since bump to version 2.5.1 in > commit 995c093d6a3e8042110d6a8d96fdc7ad65a557c4: > > /home/peko/autobuild/instance-0/output-1/per-package/mpdecimal/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: cannot find -lpthread > > Fixes: > - http://autobuild.buildroot.org/results/b20c090f2ac5ea6d1c761820763037b87bde137a > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/mpdecimal/mpdecimal.mk | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/package/mpdecimal/mpdecimal.mk b/package/mpdecimal/mpdecimal.mk > index 25c12c08b1..aa322df340 100644 > --- a/package/mpdecimal/mpdecimal.mk > +++ b/package/mpdecimal/mpdecimal.mk > @@ -11,6 +11,9 @@ MPDECIMAL_LICENSE = BSD-2-Clause > MPDECIMAL_LICENSE_FILES = LICENSE.txt > MPDECIMAL_CONF_OPTS = LD="$(TARGET_CC)" > > +# threads are only needed for tests > +MPDECIMAL_MAKE_OPTS = MPD_PTHREAD= > + > # On i386, by default, mpdecimal tries to uses which is not > # available in musl/uclibc. So in this case, we tell mpdecimal to use > # the generic 32 bits code, which is anyway the one used on ARM, From arnout at mind.be Sun Feb 13 15:22:20 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 16:22:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/dt-utils: use snapshot tarball In-Reply-To: <20220203222639.725822-1-fontaine.fabrice@gmail.com> References: <20220203222639.725822-1-fontaine.fabrice@gmail.com> Message-ID: On 03/02/2022 23:26, Fabrice Fontaine wrote: > Use snapshot tarball so DT_UTILS_VERSION will match what is returned by > https://release-monitoring.org > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/dt-utils/dt-utils.hash | 2 +- > package/dt-utils/dt-utils.mk | 6 +++--- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/dt-utils/dt-utils.hash b/package/dt-utils/dt-utils.hash > index 74819158bb..9fca594db5 100644 > --- a/package/dt-utils/dt-utils.hash > +++ b/package/dt-utils/dt-utils.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 8b29d3a8799170afdb1b077e655528bf4e6afe0c789107b1eec8fff9d4482771 dt-utils-v2021.03.0-br1.tar.gz > +sha256 63cf47c70911bb3605bafac38a5a7e19eb753ac1c90de2abceaf2fdefd71be6d dt-utils-2021.03.0.tar.xz > sha256 a45932c79317d15116eadbf1c9c6fc59117ec3c4621db3a876066defa723963b COPYING > diff --git a/package/dt-utils/dt-utils.mk b/package/dt-utils/dt-utils.mk > index bc7fd90631..d264e2cdc9 100644 > --- a/package/dt-utils/dt-utils.mk > +++ b/package/dt-utils/dt-utils.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -DT_UTILS_VERSION = v2021.03.0 > -DT_UTILS_SITE = https://git.pengutronix.de/git/tools/dt-utils > -DT_UTILS_SITE_METHOD = git > +DT_UTILS_VERSION = 2021.03.0 > +DT_UTILS_SOURCE = dt-utils-$(DT_UTILS_VERSION).tar.xz > +DT_UTILS_SITE = https://git.pengutronix.de/cgit/tools/dt-utils/snapshot > DT_UTILS_LICENSE = GPL-2.0 > DT_UTILS_LICENSE_FILES = COPYING > DT_UTILS_DEPENDENCIES = udev From arnout at mind.be Sun Feb 13 15:23:17 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 16:23:17 +0100 Subject: [Buildroot] [PATCH] board/radxa/rockpi-n8:use partition-type-uuid for genimage-15 In-Reply-To: <20220204000657.747245-1-giulio.benetti@benettiengineering.com> References: <20220204000657.747245-1-giulio.benetti@benettiengineering.com> Message-ID: <09ecf96b-e69d-c143-d37b-f32681c3cd5c@mind.be> On 04/02/2022 01:06, Giulio Benetti wrote: > 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 > > So let's use for EFI System partition: > 'partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b' > and for Root partition (32-bit ARM): > 'partition-type-uuid = 69DAD710-2CE4-4E3C-B16C-21A1D49ABED3' > > Fixes: > https://gitlab.com/buildroot.org/buildroot/-/jobs/1929717242 > > FTR, the magic UUID are from: > https://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs > > Signed-off-by: Giulio Benetti I considered squashing it with the patch in the partition-type-uuid abbreviation series, but since that's still a bit in the air: applied to master, thanks. Regards, Arnout > --- > board/radxa/rockpi-n8/genimage.cfg | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/board/radxa/rockpi-n8/genimage.cfg b/board/radxa/rockpi-n8/genimage.cfg > index 2e064d48c0..909a646499 100644 > --- a/board/radxa/rockpi-n8/genimage.cfg > +++ b/board/radxa/rockpi-n8/genimage.cfg > @@ -26,14 +26,14 @@ image sdcard.img { > } > > partition boot { > - partition-type = 0xC > + partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b > bootable = "true" > image = "boot.vfat" > offset = 16M > } > > partition rootfs { > - partition-type = 0x83 > + partition-type-uuid = 69dad710-2ce4-4e3c-b16c-21a1d49abed3 > image = "rootfs.ext4" > } > } From arnout at mind.be Sun Feb 13 15:23:36 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 16:23:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/cryptopp: disable altivec if needed In-Reply-To: <20220205135806.312865-1-fontaine.fabrice@gmail.com> References: <20220205135806.312865-1-fontaine.fabrice@gmail.com> Message-ID: <734ec41c-a138-e7b4-eeba-7db667e226f1@mind.be> On 05/02/2022 14:58, Fabrice Fontaine wrote: > Fix the following build failure raised since commit > bf4cf9de833e2d571d98d1ca935ea08a3468e463: > > blake2s_simd.cpp:715:8: error: 'uint32x4_p' does not name a type; did you mean 'uint32_t'? > 715 | inline uint32x4_p VecLoad32(const T* p) > | ^~~~~~~~~~ > | uint32_t > > Fixes: > - http://autobuild.buildroot.org/results/9e9f8559b12b8e2cf99cfab435fa7dd5796bbcd5 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/cryptopp/cryptopp.mk | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/package/cryptopp/cryptopp.mk b/package/cryptopp/cryptopp.mk > index 4353e35e0a..87d6fba237 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_POWERPC_CPU_HAS_ALTIVEC),y) > +CRYPTOPP_CXXFLAGS += -DCRYPTOPP_DISABLE_ALTIVEC > +endif > + > ifneq ($(BR2_ARM_CPU_HAS_NEON),y) > CRYPTOPP_CXXFLAGS += -DCRYPTOPP_DISABLE_ARM_NEON > endif From arnout at mind.be Sun Feb 13 15:23:57 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 16:23:57 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/libldns: enable dane-verify for OpenSSL In-Reply-To: <20220205174046.1850152-1-bernd.kuhls@t-online.de> References: <20220205174046.1850152-1-bernd.kuhls@t-online.de> Message-ID: <100393fa-c571-821c-9226-b01d0a144df4@mind.be> On 05/02/2022 18:40, Bernd Kuhls wrote: > Since the bump of libopenssl to 1.1.x support for offline DANE > verification can be enabled. > > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Arnout > --- > v2: enable only for libopenssl, libressl does not support SSL_get0_dane > (Peter) > > package/libldns/libldns.mk | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/package/libldns/libldns.mk b/package/libldns/libldns.mk > index 7deca978da..86e7c0eafc 100644 > --- a/package/libldns/libldns.mk > +++ b/package/libldns/libldns.mk > @@ -13,11 +13,9 @@ LIBLDNS_CPE_ID_VENDOR = nlnetlabs > LIBLDNS_CPE_ID_PRODUCT = ldns > LIBLDNS_INSTALL_STAGING = YES > LIBLDNS_DEPENDENCIES = openssl > -# --disable-dane-verify can be removed after openssl bump to 1.1.x > LIBLDNS_CONF_OPTS = \ > --with-ssl=$(STAGING_DIR)/usr \ > --enable-dane \ > - --disable-dane-verify \ > --enable-ecdsa \ > --enable-gost \ > --enable-sha2 \ > @@ -26,6 +24,12 @@ LIBLDNS_CONF_OPTS = \ > --without-pyldns \ > --without-pyldnsx > > +ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) > +LIBLDNS_CONF_OPTS += --enable-dane-verify > +else > +LIBLDNS_CONF_OPTS += --disable-dane-verify > +endif > + > ifeq ($(BR2_STATIC_LIBS),y) > LIBLDNS_DEPENDENCIES += host-pkgconf > # missing -lz breaks configure, add it using pkgconf From arnout at mind.be Sun Feb 13 15:24:20 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 16:24:20 +0100 Subject: [Buildroot] [PATCH 1/2] package/wayland-protocols: bump to version 1.25 In-Reply-To: <20220205230302.3837382-1-james.hilliard1@gmail.com> References: <20220205230302.3837382-1-james.hilliard1@gmail.com> Message-ID: <468a9439-90fd-76bf-1dbe-ad64d0771603@mind.be> On 06/02/2022 00:03, James Hilliard wrote: > Drop patch that is now upstream. > > Signed-off-by: James Hilliard Applied both to master, thanks. Regards, Arnout > --- > ...and-scanner-is-only-needed-for-tests.patch | 42 ------------------- > .../wayland-protocols/wayland-protocols.hash | 8 ++-- > .../wayland-protocols/wayland-protocols.mk | 2 +- > 3 files changed, 5 insertions(+), 47 deletions(-) > delete mode 100644 package/wayland-protocols/0001-meson.build-wayland-scanner-is-only-needed-for-tests.patch > > diff --git a/package/wayland-protocols/0001-meson.build-wayland-scanner-is-only-needed-for-tests.patch b/package/wayland-protocols/0001-meson.build-wayland-scanner-is-only-needed-for-tests.patch > deleted file mode 100644 > index ff3ec5719c..0000000000 > --- a/package/wayland-protocols/0001-meson.build-wayland-scanner-is-only-needed-for-tests.patch > +++ /dev/null > @@ -1,42 +0,0 @@ > -From 80e97bd00bf6263845aa98b411507baba28be67e Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Sun, 19 Sep 2021 11:01:00 +0200 > -Subject: [PATCH] meson.build: wayland-scanner is only needed for tests > - > -wayland-scanner is only needed for tests so don't require it if tests > -are disabled > - > -Signed-off-by: Fabrice Fontaine > -[Retrieved from: > -https://gitlab.freedesktop.org/wayland/wayland-protocols/-/commit/80e97bd00bf6263845aa98b411507baba28be67e] > ---- > - meson.build | 2 -- > - tests/meson.build | 1 + > - 2 files changed, 1 insertion(+), 2 deletions(-) > - > -diff --git a/meson.build b/meson.build > -index 94b49e7..15dbc37 100644 > ---- a/meson.build > -+++ b/meson.build > -@@ -8,8 +8,6 @@ wayland_protocols_version = meson.project_version() > - > - fs = import('fs') > - > --dep_scanner = dependency('wayland-scanner', native: true) > -- > - stable_protocols = [ > - 'presentation-time', > - 'viewporter', > -diff --git a/tests/meson.build b/tests/meson.build > -index 66337e7..74824ae 100644 > ---- a/tests/meson.build > -+++ b/tests/meson.build > -@@ -1,4 +1,5 @@ > - prog_scan_sh = find_program('scan.sh') > -+dep_scanner = dependency('wayland-scanner', native: true) > - prog_scanner = find_program(dep_scanner.get_pkgconfig_variable('wayland_scanner')) > - > - libwayland = [ > --- > -GitLab > - > diff --git a/package/wayland-protocols/wayland-protocols.hash b/package/wayland-protocols/wayland-protocols.hash > index b76bafb437..1262f0f9d7 100644 > --- a/package/wayland-protocols/wayland-protocols.hash > +++ b/package/wayland-protocols/wayland-protocols.hash > @@ -1,5 +1,5 @@ > -# From https://lists.freedesktop.org/archives/wayland-devel/2021-September/041979.html > -md5 31a6c469718db37d2688109e548506e4 wayland-protocols-1.23.tar.xz > -sha1 8c4ebdce35953b1e2af458c139a432a308af6f50 wayland-protocols-1.23.tar.xz > -sha256 6c0af1915f96f615927a6270d025bd973ff1c58e521e4ca1fc9abfc914633f76 wayland-protocols-1.23.tar.xz > +# From https://lists.freedesktop.org/archives/wayland-devel/2022-January/042102.html > +md5 0c192bf32de09ec30de4a82d1c65329c wayland-protocols-1.25.tar.xz > +sha1 275298332d124e40e345aa82bc8f48ef8cad3480 wayland-protocols-1.25.tar.xz > +sha256 f1ff0f7199d0a0da337217dd8c99979967808dc37731a1e759e822b75b571460 wayland-protocols-1.25.tar.xz > sha256 f1a2b233e8a9a71c40f4aa885be08a0842ac85bb8588703c1dd7e6e6502e3124 COPYING > diff --git a/package/wayland-protocols/wayland-protocols.mk b/package/wayland-protocols/wayland-protocols.mk > index 41ab1e1c99..746d82e308 100644 > --- a/package/wayland-protocols/wayland-protocols.mk > +++ b/package/wayland-protocols/wayland-protocols.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -WAYLAND_PROTOCOLS_VERSION = 1.23 > +WAYLAND_PROTOCOLS_VERSION = 1.25 > WAYLAND_PROTOCOLS_SITE = https://wayland.freedesktop.org/releases > WAYLAND_PROTOCOLS_SOURCE = wayland-protocols-$(WAYLAND_PROTOCOLS_VERSION).tar.xz > WAYLAND_PROTOCOLS_LICENSE = MIT From arnout at mind.be Sun Feb 13 15:24:36 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 16:24:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/lighttpd: add mysql support In-Reply-To: <20220206073805.832602-1-fontaine.fabrice@gmail.com> References: <20220206073805.832602-1-fontaine.fabrice@gmail.com> Message-ID: On 06/02/2022 08:38, Fabrice Fontaine wrote: > lighttpd only supports mariadb > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/lighttpd/Config.in | 9 +++++++++ > package/lighttpd/lighttpd.mk | 8 +++++++- > 2 files changed, 16 insertions(+), 1 deletion(-) > > diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in > index b9f64a3bc3..aa18c13171 100644 > --- a/package/lighttpd/Config.in > +++ b/package/lighttpd/Config.in > @@ -61,6 +61,15 @@ config BR2_PACKAGE_LIGHTTPD_MAXMINDDB > help > Enable MaxMind GeoIP2 support. Needed to support mod_maxminddb > > +config BR2_PACKAGE_LIGHTTPD_MYSQL > + bool "mysql support" > + depends on BR2_PACKAGE_MARIADB > + help > + Enable mysql support for lighttpd mod_vhostdb_mysql. > + > +comment "mysql support needs mariadb" > + depends on !BR2_PACKAGE_MARIADB > + > 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 49ab8587f7..595c59cb37 100644 > --- a/package/lighttpd/lighttpd.mk > +++ b/package/lighttpd/lighttpd.mk > @@ -19,7 +19,6 @@ LIGHTTPD_CONF_OPTS = \ > -Dwith_libev=false \ > -Dwith_libunwind=false \ > -Dwith_mbedtls=false \ > - -Dwith_mysql=false \ > -Dwith_nettle=false \ > -Dwith_nss=false \ > -Dwith_pcre=false \ > @@ -73,6 +72,13 @@ else > LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=false > endif > > +ifeq ($(BR2_PACKAGE_LIGHTTPD_MYSQL),y) > +LIGHTTPD_DEPENDENCIES += mysql > +LIGHTTPD_CONF_OPTS += -Dwith_mysql=true > +else > +LIGHTTPD_CONF_OPTS += -Dwith_mysql=false > +endif > + > ifeq ($(BR2_PACKAGE_LIGHTTPD_OPENSSL),y) > LIGHTTPD_DEPENDENCIES += openssl > LIGHTTPD_CONF_OPTS += -Dwith_openssl=true From arnout at mind.be Sun Feb 13 15:21:03 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 16:21:03 +0100 Subject: [Buildroot] [git commit] package/lighttpd: add mysql support Message-ID: <20220213151835.420A08295E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1cd93b69ccc90346f5cb0f3460d48625a41eaec9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master lighttpd only supports mariadb Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/lighttpd/Config.in | 9 +++++++++ package/lighttpd/lighttpd.mk | 8 +++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index 4406a685ba..6f0c927319 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -61,6 +61,15 @@ config BR2_PACKAGE_LIGHTTPD_MAXMINDDB help Enable MaxMind GeoIP2 support. Needed to support mod_maxminddb +config BR2_PACKAGE_LIGHTTPD_MYSQL + bool "mysql support" + depends on BR2_PACKAGE_MARIADB + help + Enable mysql support for lighttpd mod_vhostdb_mysql. + +comment "mysql support needs mariadb" + depends on !BR2_PACKAGE_MARIADB + 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 49ab8587f7..595c59cb37 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -19,7 +19,6 @@ LIGHTTPD_CONF_OPTS = \ -Dwith_libev=false \ -Dwith_libunwind=false \ -Dwith_mbedtls=false \ - -Dwith_mysql=false \ -Dwith_nettle=false \ -Dwith_nss=false \ -Dwith_pcre=false \ @@ -73,6 +72,13 @@ else LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=false endif +ifeq ($(BR2_PACKAGE_LIGHTTPD_MYSQL),y) +LIGHTTPD_DEPENDENCIES += mysql +LIGHTTPD_CONF_OPTS += -Dwith_mysql=true +else +LIGHTTPD_CONF_OPTS += -Dwith_mysql=false +endif + ifeq ($(BR2_PACKAGE_LIGHTTPD_OPENSSL),y) LIGHTTPD_DEPENDENCIES += openssl LIGHTTPD_CONF_OPTS += -Dwith_openssl=true From arnout at mind.be Sun Feb 13 15:21:04 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 16:21:04 +0100 Subject: [Buildroot] [git commit] package/mp4v2: needs gcc >= 5 Message-ID: <20220213151835.5D88A8295E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ec720d210634b55faf0eb6c060d915b100c5028d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master TechSmith fork of mp4v2 needs gcc >= 5: https://github.com/TechSmith/mp4v2/issues/47 As a result, the following build failure is raised since bump to version 5.0.1 in commit df22a9d6b77d9e245dceb7c8fd3f9d80c8917ca0: In file included from ./include/mp4v2/mp4v2.h:58:0, from ./libplatform/platform_posix.h:37, from ./libplatform/platform.h:24, from libplatform/impl.h:6: ./include/mp4v2/file.h:336:5: warning: identifier 'nullptr' is a keyword in C++11 [-Wc++0x-compat] ShouldParseAtomCallback cb = nullptr ); ^ While a it, drop first patch which is not needed now that mp4v2 depends on gcc >= 5 Fixes: - http://autobuild.buildroot.org/results/178f1266396d44c6659a67d8e68cb99e36d544ea Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...01-Static-cast-to-unsigned-int-for-cases.patch} | 0 ...-src-mp4track.cpp-replace-nullptr-by-NULL.patch | 50 ---------------------- package/mp4v2/Config.in | 6 ++- 3 files changed, 4 insertions(+), 52 deletions(-) diff --git a/package/mp4v2/0002-Static-cast-to-unsigned-int-for-cases.patch b/package/mp4v2/0001-Static-cast-to-unsigned-int-for-cases.patch similarity index 100% rename from package/mp4v2/0002-Static-cast-to-unsigned-int-for-cases.patch rename to package/mp4v2/0001-Static-cast-to-unsigned-int-for-cases.patch diff --git a/package/mp4v2/0001-src-mp4track.cpp-replace-nullptr-by-NULL.patch b/package/mp4v2/0001-src-mp4track.cpp-replace-nullptr-by-NULL.patch deleted file mode 100644 index c279b9c56a..0000000000 --- a/package/mp4v2/0001-src-mp4track.cpp-replace-nullptr-by-NULL.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 78cf76b5d661e37e958163c37c0ad95940c09591 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 30 May 2020 11:42:19 +0200 -Subject: [PATCH] src/mp4track.cpp: replace nullptr by NULL - -Commit 15ec11166ba9ee7b77631d0d9234522f656cfd66 added code that uses -nullptr. nullptr is C++11, it will break the build with gcc < 5. - -Semantically, NULL and nullptr are different, so should not be mixed. -In this situaiton, m_File.FindAtom() indeed does not return nullptr, -but NULL (on error, that is). - -Switch back to comparing against NULL. - -Fixes: - - http://autobuild.buildroot.org/results/14937c96a82fb3d10e5d83bd7b2905b846fb09f9 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/TechSmith/mp4v2/pull/62] ---- - src/mp4track.cpp | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/mp4track.cpp b/src/mp4track.cpp -index 4b8fc9d..42489eb 100644 ---- a/src/mp4track.cpp -+++ b/src/mp4track.cpp -@@ -908,16 +908,16 @@ File* MP4Track::GetSampleFile( MP4SampleId sampleId ) - MP4FtypAtom *pFtypAtom = reinterpret_cast( m_File.FindAtom( "ftyp" ) ); - - // MOV spec does not require "ftyp" atom... -- if ( pFtypAtom == nullptr ) -+ if ( pFtypAtom == NULL ) - { -- return nullptr; -+ return NULL; - } - else - { - // ... but most often it is present with a "qt " value - const char *majorBrand = pFtypAtom->majorBrand.GetValue(); - if ( ::strcmp( pFtypAtom->majorBrand.GetValue(), "qt " ) == 0 ) -- return nullptr; -+ return NULL; - } - throw new Exception( "invalid stsd entry", __FILE__, __LINE__, __FUNCTION__ ); - } --- -2.26.2 - diff --git a/package/mp4v2/Config.in b/package/mp4v2/Config.in index 172d1baabe..00e80cd358 100644 --- a/package/mp4v2/Config.in +++ b/package/mp4v2/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_MP4V2 bool "mp4v2" depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++11 help The MP4v2 library provides functions to read, create, and modify mp4 files. @@ -18,5 +19,6 @@ config BR2_PACKAGE_MP4V2_UTIL endif -comment "mp4v2 needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP +comment "mp4v2 needs a toolchain w/ C++, gcc >= 5" + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 From arnout at mind.be Sun Feb 13 15:25:07 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 16:25:07 +0100 Subject: [Buildroot] [PATCH] docs/manual: fix "+size = +" latex formatting In-Reply-To: <20220206095403.1563814-1-giulio.benetti@benettiengineering.com> References: <20220206095403.1563814-1-giulio.benetti@benettiengineering.com> Message-ID: <54fda3e6-1188-f104-4c6d-f1686df77bcd@mind.be> On 06/02/2022 10:54, Giulio Benetti wrote: > Signed-off-by: Giulio Benetti Not sure why you say "latex formatting", but OK. Applied to master, thanks. Regards, Arnout > --- > docs/manual/writing-rules.txt | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/docs/manual/writing-rules.txt b/docs/manual/writing-rules.txt > index 3eec095d0e..06f87556ed 100644 > --- a/docs/manual/writing-rules.txt > +++ b/docs/manual/writing-rules.txt > @@ -184,7 +184,7 @@ image sdimage.img { > * Every node(+section+, +partition+, +file+, +subnode+) must have an open > curly bracket on the same line of the node's name, while the closing one > must be on a newline and after it a newline must be added except for the > - last one node. Same goes for its option, for example option +size = +. > + last one node. Same goes for its option, for example option +size+ +=+. > > * Every +option+(i.e. +image+, +offset+, +size+) must have the +=+ > assignment one space from it and one space from the value specified. From arnout at mind.be Sun Feb 13 15:25:24 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 16:25:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/gerbera: fix build with fmt > 8.0 In-Reply-To: <20220206140459.1622884-1-fontaine.fabrice@gmail.com> References: <20220206140459.1622884-1-fontaine.fabrice@gmail.com> Message-ID: On 06/02/2022 15:04, Fabrice Fontaine wrote: > Fix the following build failure raised since bump of fmt to version > 8.1.1 in commit ec7fd50d08690a383fec40748ac9b78c3f764316: > > /home/peko/autobuild/instance-0/output-1/host/mips64el-buildroot-linux-uclibc/sysroot/usr/include/fmt/core.h:1728:7: error: static assertion failed: Cannot format an argument. To make type T formattable provide a formatter specialization: https://fmt.dev/latest/api.html#udt > formattable, > ^~~~~~~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/009db44f83c3b02025c910ce4f190bd709c5ab49 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/gerbera/0001-Fix-for-fmt-8-0.patch | 44 ++++++++++++++++++++++ > 1 file changed, 44 insertions(+) > create mode 100644 package/gerbera/0001-Fix-for-fmt-8-0.patch > > diff --git a/package/gerbera/0001-Fix-for-fmt-8-0.patch b/package/gerbera/0001-Fix-for-fmt-8-0.patch > new file mode 100644 > index 0000000000..c4419209a5 > --- /dev/null > +++ b/package/gerbera/0001-Fix-for-fmt-8-0.patch > @@ -0,0 +1,44 @@ > +From 82d84ac5e62c23e717198fc7b2ef190ff95e70d1 Mon Sep 17 00:00:00 2001 > +From: kyak > +Date: Wed, 12 Jan 2022 19:41:37 +0300 > +Subject: [PATCH] Fix for fmt > 8.0 > + > +[Retrieved from: > +https://github.com/gerbera/gerbera/commit/82d84ac5e62c23e717198fc7b2ef190ff95e70d1] > +Signed-off-by: Fabrice Fontaine > +--- > + src/util/logger.h | 15 +++++++++++++++ > + 1 file changed, 15 insertions(+) > + > +diff --git a/src/util/logger.h b/src/util/logger.h > +index 58696e52f..ba64afa79 100644 > +--- a/src/util/logger.h > ++++ b/src/util/logger.h > +@@ -32,7 +32,9 @@ > + #ifndef __LOGGER_H__ > + #define __LOGGER_H__ > + > ++#include > + #include > ++#include > + > + #define log_debug SPDLOG_DEBUG > + #define log_info SPDLOG_INFO > +@@ -40,4 +42,17 @@ > + #define log_error SPDLOG_ERROR > + #define log_js SPDLOG_INFO > + > ++#if FMT_VERSION >= 80100 > ++template > ++struct fmt::formatter, char>> > ++ : formatter> { > ++ template > ++ auto format(const T& value, FormatContext& ctx) -> decltype(ctx.out()) > ++ { > ++ return fmt::formatter>::format( > ++ static_cast>(value), ctx); > ++ } > ++}; > ++#endif > ++ > + #endif // __LOGGER_H__ From arnout at mind.be Sun Feb 13 15:25:41 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 16:25:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/mp4v2: needs gcc >= 5 In-Reply-To: <20220206142638.1751906-1-fontaine.fabrice@gmail.com> References: <20220206142638.1751906-1-fontaine.fabrice@gmail.com> Message-ID: <86d76831-de88-4d8a-3f1a-16bde429fa61@mind.be> On 06/02/2022 15:26, Fabrice Fontaine wrote: > TechSmith fork of mp4v2 needs gcc >= 5: > https://github.com/TechSmith/mp4v2/issues/47 > > As a result, the following build failure is raised since bump to version > 5.0.1 in commit df22a9d6b77d9e245dceb7c8fd3f9d80c8917ca0: > > In file included from ./include/mp4v2/mp4v2.h:58:0, > from ./libplatform/platform_posix.h:37, > from ./libplatform/platform.h:24, > from libplatform/impl.h:6: > ./include/mp4v2/file.h:336:5: warning: identifier 'nullptr' is a keyword in C++11 [-Wc++0x-compat] > ShouldParseAtomCallback cb = nullptr ); > ^ > > While a it, drop first patch which is not needed now that mp4v2 depends > on gcc >= 5 > > Fixes: > - http://autobuild.buildroot.org/results/178f1266396d44c6659a67d8e68cb99e36d544ea > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...atic-cast-to-unsigned-int-for-cases.patch} | 0 > ...mp4track.cpp-replace-nullptr-by-NULL.patch | 50 ------------------- > package/mp4v2/Config.in | 6 ++- > 3 files changed, 4 insertions(+), 52 deletions(-) > rename package/mp4v2/{0002-Static-cast-to-unsigned-int-for-cases.patch => 0001-Static-cast-to-unsigned-int-for-cases.patch} (100%) > delete mode 100644 package/mp4v2/0001-src-mp4track.cpp-replace-nullptr-by-NULL.patch > > diff --git a/package/mp4v2/0002-Static-cast-to-unsigned-int-for-cases.patch b/package/mp4v2/0001-Static-cast-to-unsigned-int-for-cases.patch > similarity index 100% > rename from package/mp4v2/0002-Static-cast-to-unsigned-int-for-cases.patch > rename to package/mp4v2/0001-Static-cast-to-unsigned-int-for-cases.patch > diff --git a/package/mp4v2/0001-src-mp4track.cpp-replace-nullptr-by-NULL.patch b/package/mp4v2/0001-src-mp4track.cpp-replace-nullptr-by-NULL.patch > deleted file mode 100644 > index c279b9c56a..0000000000 > --- a/package/mp4v2/0001-src-mp4track.cpp-replace-nullptr-by-NULL.patch > +++ /dev/null > @@ -1,50 +0,0 @@ > -From 78cf76b5d661e37e958163c37c0ad95940c09591 Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Sat, 30 May 2020 11:42:19 +0200 > -Subject: [PATCH] src/mp4track.cpp: replace nullptr by NULL > - > -Commit 15ec11166ba9ee7b77631d0d9234522f656cfd66 added code that uses > -nullptr. nullptr is C++11, it will break the build with gcc < 5. > - > -Semantically, NULL and nullptr are different, so should not be mixed. > -In this situaiton, m_File.FindAtom() indeed does not return nullptr, > -but NULL (on error, that is). > - > -Switch back to comparing against NULL. > - > -Fixes: > - - http://autobuild.buildroot.org/results/14937c96a82fb3d10e5d83bd7b2905b846fb09f9 > - > -Signed-off-by: Fabrice Fontaine > -[Upstream status: https://github.com/TechSmith/mp4v2/pull/62] > ---- > - src/mp4track.cpp | 6 +++--- > - 1 file changed, 3 insertions(+), 3 deletions(-) > - > -diff --git a/src/mp4track.cpp b/src/mp4track.cpp > -index 4b8fc9d..42489eb 100644 > ---- a/src/mp4track.cpp > -+++ b/src/mp4track.cpp > -@@ -908,16 +908,16 @@ File* MP4Track::GetSampleFile( MP4SampleId sampleId ) > - MP4FtypAtom *pFtypAtom = reinterpret_cast( m_File.FindAtom( "ftyp" ) ); > - > - // MOV spec does not require "ftyp" atom... > -- if ( pFtypAtom == nullptr ) > -+ if ( pFtypAtom == NULL ) > - { > -- return nullptr; > -+ return NULL; > - } > - else > - { > - // ... but most often it is present with a "qt " value > - const char *majorBrand = pFtypAtom->majorBrand.GetValue(); > - if ( ::strcmp( pFtypAtom->majorBrand.GetValue(), "qt " ) == 0 ) > -- return nullptr; > -+ return NULL; > - } > - throw new Exception( "invalid stsd entry", __FILE__, __LINE__, __FUNCTION__ ); > - } > --- > -2.26.2 > - > diff --git a/package/mp4v2/Config.in b/package/mp4v2/Config.in > index 172d1baabe..00e80cd358 100644 > --- a/package/mp4v2/Config.in > +++ b/package/mp4v2/Config.in > @@ -1,6 +1,7 @@ > config BR2_PACKAGE_MP4V2 > bool "mp4v2" > depends on BR2_INSTALL_LIBSTDCPP > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++11 > help > The MP4v2 library provides functions to read, create, and > modify mp4 files. > @@ -18,5 +19,6 @@ config BR2_PACKAGE_MP4V2_UTIL > > endif > > -comment "mp4v2 needs a toolchain w/ C++" > - depends on !BR2_INSTALL_LIBSTDCPP > +comment "mp4v2 needs a toolchain w/ C++, gcc >= 5" > + depends on !BR2_INSTALL_LIBSTDCPP || \ > + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 From arnout at mind.be Sun Feb 13 15:21:02 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 16:21:02 +0100 Subject: [Buildroot] [git commit] package/mpd: ignore CVE-2020-746[56] intended for FreeBSD PPP daemon Message-ID: <20220213151834.E14058295E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=210e6bd55991497c45eb3a6baf9ed0c20a88067c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:mpd_project:mpd:*:*:*:*:*:*:*:* is not a valid CPE identifier for mpd (musicpd.org); this string refers to MPD /FreeBSD PPP daemon (sourceforge.net/projects/mpd) Since mpd does not have entries in the CVE database, put these two CVE identifiers on the mpd ignore list: https://nvd.nist.gov/vuln/detail/CVE-2020-7465 https://nvd.nist.gov/vuln/detail/CVE-2020-7466 Signed-off-by: Andreas Ziegler Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/mpd/mpd.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index 6f01b29c6d..a55e4adde2 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -11,6 +11,8 @@ 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 +# these refer to the FreeBSD PPP daemon +MPD_IGNORE_CVES = CVE-2020-7465 CVE-2020-7466 MPD_SELINUX_MODULES = mpd MPD_CONF_OPTS = \ -Daudiofile=disabled \ From arnout at mind.be Sun Feb 13 15:21:03 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 16:21:03 +0100 Subject: [Buildroot] [git commit] board/radxa/rockpi-n8:use partition-type-uuid for genimage-15 Message-ID: <20220213151835.0DFFB82983@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=85ee640eb5a3904eae0d743d32afa015dd6cc760 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 So let's use for EFI System partition: 'partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b' and for Root partition (32-bit ARM): 'partition-type-uuid = 69DAD710-2CE4-4E3C-B16C-21A1D49ABED3' Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/1929717242 FTR, the magic UUID are from: https://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- board/radxa/rockpi-n8/genimage.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/radxa/rockpi-n8/genimage.cfg b/board/radxa/rockpi-n8/genimage.cfg index 2e064d48c0..909a646499 100644 --- a/board/radxa/rockpi-n8/genimage.cfg +++ b/board/radxa/rockpi-n8/genimage.cfg @@ -26,14 +26,14 @@ image sdcard.img { } partition boot { - partition-type = 0xC + partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b bootable = "true" image = "boot.vfat" offset = 16M } partition rootfs { - partition-type = 0x83 + partition-type-uuid = 69dad710-2ce4-4e3c-b16c-21a1d49abed3 image = "rootfs.ext4" } } From arnout at mind.be Sun Feb 13 15:21:03 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 16:21:03 +0100 Subject: [Buildroot] [git commit] docs/manual: fix "+size = +" latex formatting Message-ID: <20220213151835.4A50F82974@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=46beca0656505e9a9d4d5d17d22f40550ac487c6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- docs/manual/writing-rules.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/manual/writing-rules.txt b/docs/manual/writing-rules.txt index 6255a08c1c..57ba61bdb1 100644 --- a/docs/manual/writing-rules.txt +++ b/docs/manual/writing-rules.txt @@ -184,7 +184,7 @@ image sdimage.img { * Every node(+section+, +partition+, +file+, +subnode+) must have an open curly bracket on the same line of the node's name, while the closing one must be on a newline and after it a newline must be added except for the - last one node. Same goes for its option, for example option +size = +. + last one node. Same goes for its option, for example option +size+ +=+. * Every +option+(i.e. +image+, +offset+, +size+) must have the +=+ assignment one space from it and one space from the value specified. From arnout at mind.be Sun Feb 13 15:21:03 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 16:21:03 +0100 Subject: [Buildroot] [git commit] package/cryptopp: disable altivec if needed Message-ID: <20220213151835.15E9F82974@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d0339905fcdfce98d2c0b45c0795ad79faf6c519 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since commit bf4cf9de833e2d571d98d1ca935ea08a3468e463: blake2s_simd.cpp:715:8: error: 'uint32x4_p' does not name a type; did you mean 'uint32_t'? 715 | inline uint32x4_p VecLoad32(const T* p) | ^~~~~~~~~~ | uint32_t Fixes: - http://autobuild.buildroot.org/results/9e9f8559b12b8e2cf99cfab435fa7dd5796bbcd5 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/cryptopp/cryptopp.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/cryptopp/cryptopp.mk b/package/cryptopp/cryptopp.mk index 4353e35e0a..87d6fba237 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_POWERPC_CPU_HAS_ALTIVEC),y) +CRYPTOPP_CXXFLAGS += -DCRYPTOPP_DISABLE_ALTIVEC +endif + ifneq ($(BR2_ARM_CPU_HAS_NEON),y) CRYPTOPP_CXXFLAGS += -DCRYPTOPP_DISABLE_ARM_NEON endif From arnout at mind.be Sun Feb 13 15:21:02 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 16:21:02 +0100 Subject: [Buildroot] [git commit] package/dt-utils: use snapshot tarball Message-ID: <20220213151835.060398295E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e33cd57b2515675d9aa1a9abdfdf8b21025705ea branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Use snapshot tarball so DT_UTILS_VERSION will match what is returned by https://release-monitoring.org Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/dt-utils/dt-utils.hash | 2 +- package/dt-utils/dt-utils.mk | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/dt-utils/dt-utils.hash b/package/dt-utils/dt-utils.hash index 74819158bb..9fca594db5 100644 --- a/package/dt-utils/dt-utils.hash +++ b/package/dt-utils/dt-utils.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8b29d3a8799170afdb1b077e655528bf4e6afe0c789107b1eec8fff9d4482771 dt-utils-v2021.03.0-br1.tar.gz +sha256 63cf47c70911bb3605bafac38a5a7e19eb753ac1c90de2abceaf2fdefd71be6d dt-utils-2021.03.0.tar.xz sha256 a45932c79317d15116eadbf1c9c6fc59117ec3c4621db3a876066defa723963b COPYING diff --git a/package/dt-utils/dt-utils.mk b/package/dt-utils/dt-utils.mk index bc7fd90631..d264e2cdc9 100644 --- a/package/dt-utils/dt-utils.mk +++ b/package/dt-utils/dt-utils.mk @@ -4,9 +4,9 @@ # ################################################################################ -DT_UTILS_VERSION = v2021.03.0 -DT_UTILS_SITE = https://git.pengutronix.de/git/tools/dt-utils -DT_UTILS_SITE_METHOD = git +DT_UTILS_VERSION = 2021.03.0 +DT_UTILS_SOURCE = dt-utils-$(DT_UTILS_VERSION).tar.xz +DT_UTILS_SITE = https://git.pengutronix.de/cgit/tools/dt-utils/snapshot DT_UTILS_LICENSE = GPL-2.0 DT_UTILS_LICENSE_FILES = COPYING DT_UTILS_DEPENDENCIES = udev From arnout at mind.be Sun Feb 13 15:21:03 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 16:21:03 +0100 Subject: [Buildroot] [git commit] package/libldns: enable dane-verify for OpenSSL Message-ID: <20220213151835.2826382974@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=39aa793c0f6605586ad522267f97a33428f7de85 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Since the bump of libopenssl to 1.1.x support for offline DANE verification can be enabled. Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libldns/libldns.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/package/libldns/libldns.mk b/package/libldns/libldns.mk index 7deca978da..86e7c0eafc 100644 --- a/package/libldns/libldns.mk +++ b/package/libldns/libldns.mk @@ -13,11 +13,9 @@ LIBLDNS_CPE_ID_VENDOR = nlnetlabs LIBLDNS_CPE_ID_PRODUCT = ldns LIBLDNS_INSTALL_STAGING = YES LIBLDNS_DEPENDENCIES = openssl -# --disable-dane-verify can be removed after openssl bump to 1.1.x LIBLDNS_CONF_OPTS = \ --with-ssl=$(STAGING_DIR)/usr \ --enable-dane \ - --disable-dane-verify \ --enable-ecdsa \ --enable-gost \ --enable-sha2 \ @@ -26,6 +24,12 @@ LIBLDNS_CONF_OPTS = \ --without-pyldns \ --without-pyldnsx +ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) +LIBLDNS_CONF_OPTS += --enable-dane-verify +else +LIBLDNS_CONF_OPTS += --disable-dane-verify +endif + ifeq ($(BR2_STATIC_LIBS),y) LIBLDNS_DEPENDENCIES += host-pkgconf # missing -lz breaks configure, add it using pkgconf From arnout at mind.be Sun Feb 13 15:21:03 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 16:21:03 +0100 Subject: [Buildroot] [git commit] package/mpdecimal: fix build without threads Message-ID: <20220213151835.1EC4A8295E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f219cface0b219ae20e149fcf83e643de1793a34 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since bump to version 2.5.1 in commit 995c093d6a3e8042110d6a8d96fdc7ad65a557c4: /home/peko/autobuild/instance-0/output-1/per-package/mpdecimal/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: cannot find -lpthread Fixes: - http://autobuild.buildroot.org/results/b20c090f2ac5ea6d1c761820763037b87bde137a Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/mpdecimal/mpdecimal.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/mpdecimal/mpdecimal.mk b/package/mpdecimal/mpdecimal.mk index 25c12c08b1..aa322df340 100644 --- a/package/mpdecimal/mpdecimal.mk +++ b/package/mpdecimal/mpdecimal.mk @@ -11,6 +11,9 @@ MPDECIMAL_LICENSE = BSD-2-Clause MPDECIMAL_LICENSE_FILES = LICENSE.txt MPDECIMAL_CONF_OPTS = LD="$(TARGET_CC)" +# threads are only needed for tests +MPDECIMAL_MAKE_OPTS = MPD_PTHREAD= + # On i386, by default, mpdecimal tries to uses which is not # available in musl/uclibc. So in this case, we tell mpdecimal to use # the generic 32 bits code, which is anyway the one used on ARM, From arnout at mind.be Sun Feb 13 15:21:03 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 16:21:03 +0100 Subject: [Buildroot] [git commit] package/wayland-protocols: bump to version 1.25 Message-ID: <20220213151835.2FED482983@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bf152e55a33a3cb3e10e26813eb36a8801ebfa97 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patch that is now upstream. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...-wayland-scanner-is-only-needed-for-tests.patch | 42 ---------------------- package/wayland-protocols/wayland-protocols.hash | 8 ++--- package/wayland-protocols/wayland-protocols.mk | 2 +- 3 files changed, 5 insertions(+), 47 deletions(-) diff --git a/package/wayland-protocols/0001-meson.build-wayland-scanner-is-only-needed-for-tests.patch b/package/wayland-protocols/0001-meson.build-wayland-scanner-is-only-needed-for-tests.patch deleted file mode 100644 index ff3ec5719c..0000000000 --- a/package/wayland-protocols/0001-meson.build-wayland-scanner-is-only-needed-for-tests.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 80e97bd00bf6263845aa98b411507baba28be67e Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 19 Sep 2021 11:01:00 +0200 -Subject: [PATCH] meson.build: wayland-scanner is only needed for tests - -wayland-scanner is only needed for tests so don't require it if tests -are disabled - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://gitlab.freedesktop.org/wayland/wayland-protocols/-/commit/80e97bd00bf6263845aa98b411507baba28be67e] ---- - meson.build | 2 -- - tests/meson.build | 1 + - 2 files changed, 1 insertion(+), 2 deletions(-) - -diff --git a/meson.build b/meson.build -index 94b49e7..15dbc37 100644 ---- a/meson.build -+++ b/meson.build -@@ -8,8 +8,6 @@ wayland_protocols_version = meson.project_version() - - fs = import('fs') - --dep_scanner = dependency('wayland-scanner', native: true) -- - stable_protocols = [ - 'presentation-time', - 'viewporter', -diff --git a/tests/meson.build b/tests/meson.build -index 66337e7..74824ae 100644 ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -1,4 +1,5 @@ - prog_scan_sh = find_program('scan.sh') -+dep_scanner = dependency('wayland-scanner', native: true) - prog_scanner = find_program(dep_scanner.get_pkgconfig_variable('wayland_scanner')) - - libwayland = [ --- -GitLab - diff --git a/package/wayland-protocols/wayland-protocols.hash b/package/wayland-protocols/wayland-protocols.hash index b76bafb437..1262f0f9d7 100644 --- a/package/wayland-protocols/wayland-protocols.hash +++ b/package/wayland-protocols/wayland-protocols.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2021-September/041979.html -md5 31a6c469718db37d2688109e548506e4 wayland-protocols-1.23.tar.xz -sha1 8c4ebdce35953b1e2af458c139a432a308af6f50 wayland-protocols-1.23.tar.xz -sha256 6c0af1915f96f615927a6270d025bd973ff1c58e521e4ca1fc9abfc914633f76 wayland-protocols-1.23.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2022-January/042102.html +md5 0c192bf32de09ec30de4a82d1c65329c wayland-protocols-1.25.tar.xz +sha1 275298332d124e40e345aa82bc8f48ef8cad3480 wayland-protocols-1.25.tar.xz +sha256 f1ff0f7199d0a0da337217dd8c99979967808dc37731a1e759e822b75b571460 wayland-protocols-1.25.tar.xz sha256 f1a2b233e8a9a71c40f4aa885be08a0842ac85bb8588703c1dd7e6e6502e3124 COPYING diff --git a/package/wayland-protocols/wayland-protocols.mk b/package/wayland-protocols/wayland-protocols.mk index 41ab1e1c99..746d82e308 100644 --- a/package/wayland-protocols/wayland-protocols.mk +++ b/package/wayland-protocols/wayland-protocols.mk @@ -4,7 +4,7 @@ # ################################################################################ -WAYLAND_PROTOCOLS_VERSION = 1.23 +WAYLAND_PROTOCOLS_VERSION = 1.25 WAYLAND_PROTOCOLS_SITE = https://wayland.freedesktop.org/releases WAYLAND_PROTOCOLS_SOURCE = wayland-protocols-$(WAYLAND_PROTOCOLS_VERSION).tar.xz WAYLAND_PROTOCOLS_LICENSE = MIT From arnout at mind.be Sun Feb 13 15:21:02 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 16:21:02 +0100 Subject: [Buildroot] [git commit] configs/qemu_*: bump kernel version to 5.15.18 Message-ID: <20220213151834.EF27482974@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f540edccb93444408b4280b62e254d9b4fc335b2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master See runtimes test here : https://gitlab.com/davidheng.pw/buildroot/-/pipelines/460019580 Signed-off-by: David HENG Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- configs/qemu_aarch64_sbsa_defconfig | 2 +- configs/qemu_aarch64_virt_defconfig | 2 +- configs/qemu_arm_versatile_defconfig | 2 +- configs/qemu_arm_versatile_nommu_defconfig | 2 +- configs/qemu_arm_vexpress_defconfig | 2 +- configs/qemu_arm_vexpress_tz_defconfig | 2 +- configs/qemu_m68k_mcf5208_defconfig | 2 +- configs/qemu_m68k_q800_defconfig | 2 +- configs/qemu_microblazebe_mmu_defconfig | 2 +- configs/qemu_microblazeel_mmu_defconfig | 2 +- configs/qemu_mips32r2_malta_defconfig | 2 +- configs/qemu_mips32r2el_malta_defconfig | 2 +- configs/qemu_mips32r6_malta_defconfig | 2 +- configs/qemu_mips32r6el_malta_defconfig | 2 +- configs/qemu_mips64_malta_defconfig | 2 +- configs/qemu_mips64el_malta_defconfig | 2 +- configs/qemu_mips64r6_malta_defconfig | 2 +- configs/qemu_mips64r6el_malta_defconfig | 2 +- configs/qemu_nios2_10m50_defconfig | 2 +- configs/qemu_or1k_defconfig | 2 +- configs/qemu_ppc64_e5500_defconfig | 2 +- configs/qemu_ppc64_pseries_defconfig | 2 +- configs/qemu_ppc64le_powernv8_defconfig | 2 +- configs/qemu_ppc64le_pseries_defconfig | 2 +- configs/qemu_ppc_bamboo_defconfig | 2 +- configs/qemu_ppc_e500mc_defconfig | 2 +- configs/qemu_ppc_g3beige_defconfig | 2 +- configs/qemu_ppc_mac99_defconfig | 2 +- configs/qemu_ppc_mpc8544ds_defconfig | 2 +- configs/qemu_riscv32_virt_defconfig | 2 +- configs/qemu_riscv64_virt_defconfig | 2 +- configs/qemu_s390x_defconfig | 2 +- configs/qemu_sh4_r2d_defconfig | 2 +- configs/qemu_sh4eb_r2d_defconfig | 2 +- configs/qemu_sparc64_sun4u_defconfig | 2 +- configs/qemu_sparc_ss10_defconfig | 2 +- configs/qemu_x86_64_defconfig | 2 +- configs/qemu_x86_defconfig | 2 +- configs/qemu_xtensa_lx60_defconfig | 2 +- configs/qemu_xtensa_lx60_nommu_defconfig | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) diff --git a/configs/qemu_aarch64_sbsa_defconfig b/configs/qemu_aarch64_sbsa_defconfig index e7d3bd03ca..2d6134e78c 100644 --- a/configs/qemu_aarch64_sbsa_defconfig +++ b/configs/qemu_aarch64_sbsa_defconfig @@ -25,7 +25,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.18" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_aarch64_virt_defconfig b/configs/qemu_aarch64_virt_defconfig index 9fbf293311..03df0ad9e2 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.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig index 5e399d17de..4f43273a82 100644 --- a/configs/qemu_arm_versatile_defconfig +++ b/configs/qemu_arm_versatile_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.18" BR2_LINUX_KERNEL_DEFCONFIG="versatile" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-versatile/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/configs/qemu_arm_versatile_nommu_defconfig b/configs/qemu_arm_versatile_nommu_defconfig index 1357742703..0c49d1b67d 100644 --- a/configs/qemu_arm_versatile_nommu_defconfig +++ b/configs/qemu_arm_versatile_nommu_defconfig @@ -31,7 +31,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.18" BR2_LINUX_KERNEL_DEFCONFIG="versatile" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-versatile/linux-nommu.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/configs/qemu_arm_vexpress_defconfig b/configs/qemu_arm_vexpress_defconfig index dafcc37bc0..2c813456f4 100644 --- a/configs/qemu_arm_vexpress_defconfig +++ b/configs/qemu_arm_vexpress_defconfig @@ -25,7 +25,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.18" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" diff --git a/configs/qemu_arm_vexpress_tz_defconfig b/configs/qemu_arm_vexpress_tz_defconfig index 327762277b..def11721ae 100644 --- a/configs/qemu_arm_vexpress_tz_defconfig +++ b/configs/qemu_arm_vexpress_tz_defconfig @@ -22,7 +22,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.18" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-vexpress-tz/linux.fragment" diff --git a/configs/qemu_m68k_mcf5208_defconfig b/configs/qemu_m68k_mcf5208_defconfig index 1dcd8272c3..0490b9e29e 100644 --- a/configs/qemu_m68k_mcf5208_defconfig +++ b/configs/qemu_m68k_mcf5208_defconfig @@ -19,7 +19,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-mcf5208/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_m68k_q800_defconfig b/configs/qemu_m68k_q800_defconfig index 7bf8b4061f..30d8982db3 100644 --- a/configs/qemu_m68k_q800_defconfig +++ b/configs/qemu_m68k_q800_defconfig @@ -19,7 +19,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-q800/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_microblazebe_mmu_defconfig b/configs/qemu_microblazebe_mmu_defconfig index 0508f92c36..7bd2ae53b8 100644 --- a/configs/qemu_microblazebe_mmu_defconfig +++ b/configs/qemu_microblazebe_mmu_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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux.config" BR2_LINUX_KERNEL_LINUX_BIN=y diff --git a/configs/qemu_microblazeel_mmu_defconfig b/configs/qemu_microblazeel_mmu_defconfig index 10811e284e..cd8c5a3cb2 100644 --- a/configs/qemu_microblazeel_mmu_defconfig +++ b/configs/qemu_microblazeel_mmu_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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux.config" BR2_LINUX_KERNEL_LINUX_BIN=y diff --git a/configs/qemu_mips32r2_malta_defconfig b/configs/qemu_mips32r2_malta_defconfig index c08ca862c5..49d84c308b 100644 --- a/configs/qemu_mips32r2_malta_defconfig +++ b/configs/qemu_mips32r2_malta_defconfig @@ -19,7 +19,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips32r2el_malta_defconfig b/configs/qemu_mips32r2el_malta_defconfig index 0bb16b9320..5363018c47 100644 --- a/configs/qemu_mips32r2el_malta_defconfig +++ b/configs/qemu_mips32r2el_malta_defconfig @@ -19,7 +19,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips32r6_malta_defconfig b/configs/qemu_mips32r6_malta_defconfig index f7b218c62a..f77feb9b6d 100644 --- a/configs/qemu_mips32r6_malta_defconfig +++ b/configs/qemu_mips32r6_malta_defconfig @@ -19,7 +19,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips32r6el_malta_defconfig b/configs/qemu_mips32r6el_malta_defconfig index d0f118ff90..575034441a 100644 --- a/configs/qemu_mips32r6el_malta_defconfig +++ b/configs/qemu_mips32r6el_malta_defconfig @@ -19,7 +19,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips64_malta_defconfig b/configs/qemu_mips64_malta_defconfig index fe03b911c5..e9438fda1e 100644 --- a/configs/qemu_mips64_malta_defconfig +++ b/configs/qemu_mips64_malta_defconfig @@ -19,7 +19,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips64el_malta_defconfig b/configs/qemu_mips64el_malta_defconfig index c6d428226c..4b1c8e22af 100644 --- a/configs/qemu_mips64el_malta_defconfig +++ b/configs/qemu_mips64el_malta_defconfig @@ -19,7 +19,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips64r6_malta_defconfig b/configs/qemu_mips64r6_malta_defconfig index 9cf651a4ba..87ef7902af 100644 --- a/configs/qemu_mips64r6_malta_defconfig +++ b/configs/qemu_mips64r6_malta_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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips64r6el_malta_defconfig b/configs/qemu_mips64r6el_malta_defconfig index 0d02a5b4df..5774207f65 100644 --- a/configs/qemu_mips64r6el_malta_defconfig +++ b/configs/qemu_mips64r6el_malta_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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_nios2_10m50_defconfig b/configs/qemu_nios2_10m50_defconfig index 44afb928e3..4b9c53e8de 100644 --- a/configs/qemu_nios2_10m50_defconfig +++ b/configs/qemu_nios2_10m50_defconfig @@ -1,7 +1,7 @@ BR2_nios2=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" BR2_LINUX_KERNEL_DEFCONFIG="10m50" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/nios2-10m50/linux.fragment" BR2_TARGET_ROOTFS_INITRAMFS=y diff --git a/configs/qemu_or1k_defconfig b/configs/qemu_or1k_defconfig index 9d55cb3420..b3d9d79156 100644 --- a/configs/qemu_or1k_defconfig +++ b/configs/qemu_or1k_defconfig @@ -15,7 +15,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/or1k/linux.config" diff --git a/configs/qemu_ppc64_e5500_defconfig b/configs/qemu_ppc64_e5500_defconfig index 09aac50252..072240c99c 100644 --- a/configs/qemu_ppc64_e5500_defconfig +++ b/configs/qemu_ppc64_e5500_defconfig @@ -16,7 +16,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.18" BR2_LINUX_KERNEL_DEFCONFIG="corenet64_smp" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc64-e5500/linux.fragment" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_ppc64_pseries_defconfig b/configs/qemu_ppc64_pseries_defconfig index 1a20e2ee0e..ad523ec2ef 100644 --- a/configs/qemu_ppc64_pseries_defconfig +++ b/configs/qemu_ppc64_pseries_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.18" BR2_LINUX_KERNEL_DEFCONFIG="pseries" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc64le_powernv8_defconfig b/configs/qemu_ppc64le_powernv8_defconfig index d8ea6655fc..a784695ddf 100644 --- a/configs/qemu_ppc64le_powernv8_defconfig +++ b/configs/qemu_ppc64le_powernv8_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.18" BR2_LINUX_KERNEL_DEFCONFIG="powernv" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc64le_pseries_defconfig b/configs/qemu_ppc64le_pseries_defconfig index 46f62b8313..f10b0fdf40 100644 --- a/configs/qemu_ppc64le_pseries_defconfig +++ b/configs/qemu_ppc64le_pseries_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.18" BR2_LINUX_KERNEL_DEFCONFIG="pseries_le" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_bamboo_defconfig b/configs/qemu_ppc_bamboo_defconfig index d6abbeb452..6129c4a663 100644 --- a/configs/qemu_ppc_bamboo_defconfig +++ b/configs/qemu_ppc_bamboo_defconfig @@ -19,7 +19,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.18" BR2_LINUX_KERNEL_DEFCONFIG="44x/bamboo" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-bamboo/linux.fragment" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_e500mc_defconfig b/configs/qemu_ppc_e500mc_defconfig index 232bc1f70c..1853e538bb 100644 --- a/configs/qemu_ppc_e500mc_defconfig +++ b/configs/qemu_ppc_e500mc_defconfig @@ -16,7 +16,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.18" BR2_LINUX_KERNEL_DEFCONFIG="corenet32_smp" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-e500mc/linux.fragment" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_ppc_g3beige_defconfig b/configs/qemu_ppc_g3beige_defconfig index 824fe648ab..9bbebede1b 100644 --- a/configs/qemu_ppc_g3beige_defconfig +++ b/configs/qemu_ppc_g3beige_defconfig @@ -19,7 +19,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-g3beige/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_mac99_defconfig b/configs/qemu_ppc_mac99_defconfig index ddeb99465a..e9629ff233 100644 --- a/configs/qemu_ppc_mac99_defconfig +++ b/configs/qemu_ppc_mac99_defconfig @@ -11,7 +11,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.18" BR2_LINUX_KERNEL_DEFCONFIG="pmac32" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-mac99/linux.fragment" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_mpc8544ds_defconfig b/configs/qemu_ppc_mpc8544ds_defconfig index 1a72d81ed5..2b51573da9 100644 --- a/configs/qemu_ppc_mpc8544ds_defconfig +++ b/configs/qemu_ppc_mpc8544ds_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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-mpc8544ds/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_riscv32_virt_defconfig b/configs/qemu_riscv32_virt_defconfig index e2753cfcfd..dff87ef342 100644 --- a/configs/qemu_riscv32_virt_defconfig +++ b/configs/qemu_riscv32_virt_defconfig @@ -19,7 +19,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.18" BR2_LINUX_KERNEL_DEFCONFIG="rv32" BR2_LINUX_KERNEL_IMAGE=y diff --git a/configs/qemu_riscv64_virt_defconfig b/configs/qemu_riscv64_virt_defconfig index 07f20776f0..d67d070185 100644 --- a/configs/qemu_riscv64_virt_defconfig +++ b/configs/qemu_riscv64_virt_defconfig @@ -19,7 +19,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.18" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_IMAGE=y diff --git a/configs/qemu_s390x_defconfig b/configs/qemu_s390x_defconfig index 86ac1fd024..346df04ada 100644 --- a/configs/qemu_s390x_defconfig +++ b/configs/qemu_s390x_defconfig @@ -17,7 +17,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.18" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_sh4_r2d_defconfig b/configs/qemu_sh4_r2d_defconfig index c8177e6096..0f12b7dfe9 100644 --- a/configs/qemu_sh4_r2d_defconfig +++ b/configs/qemu_sh4_r2d_defconfig @@ -20,7 +20,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Linux 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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux.config" BR2_LINUX_KERNEL_ZIMAGE=y diff --git a/configs/qemu_sh4eb_r2d_defconfig b/configs/qemu_sh4eb_r2d_defconfig index f334569779..d5ee371e79 100644 --- a/configs/qemu_sh4eb_r2d_defconfig +++ b/configs/qemu_sh4eb_r2d_defconfig @@ -19,7 +19,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Linux 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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4eb-r2d/linux.config" BR2_LINUX_KERNEL_ZIMAGE=y diff --git a/configs/qemu_sparc64_sun4u_defconfig b/configs/qemu_sparc64_sun4u_defconfig index 941439d338..485b497e71 100644 --- a/configs/qemu_sparc64_sun4u_defconfig +++ b/configs/qemu_sparc64_sun4u_defconfig @@ -19,7 +19,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Linux 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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc64-sun4u/linux.config" diff --git a/configs/qemu_sparc_ss10_defconfig b/configs/qemu_sparc_ss10_defconfig index 62d3acb16b..2ba04c0864 100644 --- a/configs/qemu_sparc_ss10_defconfig +++ b/configs/qemu_sparc_ss10_defconfig @@ -19,7 +19,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Linux 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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc-ss10/linux.config" diff --git a/configs/qemu_x86_64_defconfig b/configs/qemu_x86_64_defconfig index 1bca76df44..cc505a8540 100644 --- a/configs/qemu_x86_64_defconfig +++ b/configs/qemu_x86_64_defconfig @@ -21,7 +21,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux.config" BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig index 54cf8e9794..34b7e2d292 100644 --- a/configs/qemu_x86_defconfig +++ b/configs/qemu_x86_defconfig @@ -22,7 +22,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux.config" diff --git a/configs/qemu_xtensa_lx60_defconfig b/configs/qemu_xtensa_lx60_defconfig index 1db3fd3ce4..cb78106091 100644 --- a/configs/qemu_xtensa_lx60_defconfig +++ b/configs/qemu_xtensa_lx60_defconfig @@ -21,7 +21,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y diff --git a/configs/qemu_xtensa_lx60_nommu_defconfig b/configs/qemu_xtensa_lx60_nommu_defconfig index d4c07b574c..c4473fb32a 100644 --- a/configs/qemu_xtensa_lx60_nommu_defconfig +++ b/configs/qemu_xtensa_lx60_nommu_defconfig @@ -25,7 +25,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux-nommu.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y From arnout at mind.be Sun Feb 13 15:21:04 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 16:21:04 +0100 Subject: [Buildroot] [git commit] package/gerbera: fix build with fmt > 8.0 Message-ID: <20220213151835.539E482983@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c16618959a1097b1d8bc580a29c2fdd96c96e91d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since bump of fmt to version 8.1.1 in commit ec7fd50d08690a383fec40748ac9b78c3f764316: /home/peko/autobuild/instance-0/output-1/host/mips64el-buildroot-linux-uclibc/sysroot/usr/include/fmt/core.h:1728:7: error: static assertion failed: Cannot format an argument. To make type T formattable provide a formatter specialization: https://fmt.dev/latest/api.html#udt formattable, ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/009db44f83c3b02025c910ce4f190bd709c5ab49 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/gerbera/0001-Fix-for-fmt-8-0.patch | 44 ++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/package/gerbera/0001-Fix-for-fmt-8-0.patch b/package/gerbera/0001-Fix-for-fmt-8-0.patch new file mode 100644 index 0000000000..c4419209a5 --- /dev/null +++ b/package/gerbera/0001-Fix-for-fmt-8-0.patch @@ -0,0 +1,44 @@ +From 82d84ac5e62c23e717198fc7b2ef190ff95e70d1 Mon Sep 17 00:00:00 2001 +From: kyak +Date: Wed, 12 Jan 2022 19:41:37 +0300 +Subject: [PATCH] Fix for fmt > 8.0 + +[Retrieved from: +https://github.com/gerbera/gerbera/commit/82d84ac5e62c23e717198fc7b2ef190ff95e70d1] +Signed-off-by: Fabrice Fontaine +--- + src/util/logger.h | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/src/util/logger.h b/src/util/logger.h +index 58696e52f..ba64afa79 100644 +--- a/src/util/logger.h ++++ b/src/util/logger.h +@@ -32,7 +32,9 @@ + #ifndef __LOGGER_H__ + #define __LOGGER_H__ + ++#include + #include ++#include + + #define log_debug SPDLOG_DEBUG + #define log_info SPDLOG_INFO +@@ -40,4 +42,17 @@ + #define log_error SPDLOG_ERROR + #define log_js SPDLOG_INFO + ++#if FMT_VERSION >= 80100 ++template ++struct fmt::formatter, char>> ++ : formatter> { ++ template ++ auto format(const T& value, FormatContext& ctx) -> decltype(ctx.out()) ++ { ++ return fmt::formatter>::format( ++ static_cast>(value), ctx); ++ } ++}; ++#endif ++ + #endif // __LOGGER_H__ From arnout at mind.be Sun Feb 13 15:21:03 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 16:21:03 +0100 Subject: [Buildroot] [git commit] package/weston: bump to version 10.0.0 Message-ID: <20220213151835.390D28295E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f67a6e9b7a7be9adbc405b3126000056120a01af branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patches that are now upstream. Jpeg dependency is now optional. Add new backend compositor options. Add comment indicating fbdev is deprecated(not yet removed). Enable tools to match existing default(all enabled). Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...de-fcntl.h-for-open-O_RDWR-O_CLOEXEC-and-.patch | 48 --- ...0002-libweston-backend-drm-might-need-EGL.patch | 47 --- .../0003-pipewire-add-support-for-0.3-API.patch | 391 --------------------- .../0004-pipewire-fix-null-deref-in-0-3-API.patch | 28 -- package/weston/Config.in | 34 +- package/weston/weston.hash | 10 +- package/weston/weston.mk | 35 +- 7 files changed, 58 insertions(+), 535 deletions(-) diff --git a/package/weston/0001-tests-include-fcntl.h-for-open-O_RDWR-O_CLOEXEC-and-.patch b/package/weston/0001-tests-include-fcntl.h-for-open-O_RDWR-O_CLOEXEC-and-.patch deleted file mode 100644 index 2eb6bd838c..0000000000 --- a/package/weston/0001-tests-include-fcntl.h-for-open-O_RDWR-O_CLOEXEC-and-.patch +++ /dev/null @@ -1,48 +0,0 @@ -From b10c0e843dcb8148bbe869bb15261955b94ac98c Mon Sep 17 00:00:00 2001 -From: Denys Dmytriyenko -Date: Tue, 8 Sep 2020 19:37:42 -0400 -Subject: [PATCH] tests: include fcntl.h for open(), O_RDWR, O_CLOEXEC and - O_CREAT - -musl libc (unlike glibc) requires explicitly incuding fcntl.h to define open(), -O_RDWR, O_CLOEXEC and O_CREAT. Otherwise the build fails with the errors: - -| ../weston-9.0.0/tests/weston-test-fixture-compositor.c: In function 'wait_for_lock': -| ../weston-9.0.0/tests/weston-test-fixture-compositor.c:135:7: warning: implicit declaration of function 'open'; did you mean 'popen'? [-Wimplicit-function-declaration] -| 135 | fd = open(lock_path, O_RDWR | O_CLOEXEC | O_CREAT, 00700); -| | ^~~~ -| | popen -| ../weston-9.0.0/tests/weston-test-fixture-compositor.c:135:23: error: 'O_RDWR' undeclared (first use in this function) -| 135 | fd = open(lock_path, O_RDWR | O_CLOEXEC | O_CREAT, 00700); -| | ^~~~~~ -| ../weston-9.0.0/tests/weston-test-fixture-compositor.c:135:23: note: each undeclared identifier is reported only once for each function it appears in -| ../weston-9.0.0/tests/weston-test-fixture-compositor.c:135:32: error: 'O_CLOEXEC' undeclared (first use in this function) -| 135 | fd = open(lock_path, O_RDWR | O_CLOEXEC | O_CREAT, 00700); -| | ^~~~~~~~~ -| ../weston-9.0.0/tests/weston-test-fixture-compositor.c:135:44: error: 'O_CREAT' undeclared (first use in this function) -| 135 | fd = open(lock_path, O_RDWR | O_CLOEXEC | O_CREAT, 00700); -| | ^~~~~~~ - -Signed-off-by: Denys Dmytriyenko -Signed-off-by: James Hilliard -[james.hilliard1 at gmail.com: backport from upstream commit -b10c0e843dcb8148bbe869bb15261955b94ac98c] ---- - tests/weston-test-fixture-compositor.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tests/weston-test-fixture-compositor.c b/tests/weston-test-fixture-compositor.c -index 1c32959c..c1eb26c4 100644 ---- a/tests/weston-test-fixture-compositor.c -+++ b/tests/weston-test-fixture-compositor.c -@@ -35,6 +35,7 @@ - #include - #include - #include -+#include - - #include "shared/helpers.h" - #include "weston-test-fixture-compositor.h" --- -2.25.1 - diff --git a/package/weston/0002-libweston-backend-drm-might-need-EGL.patch b/package/weston/0002-libweston-backend-drm-might-need-EGL.patch deleted file mode 100644 index f504e1145b..0000000000 --- a/package/weston/0002-libweston-backend-drm-might-need-EGL.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 4b93b71067949cc5efabb9b3d59278a3f362b11c Mon Sep 17 00:00:00 2001 -From: Heiko Thiery -Date: Wed, 21 Oct 2020 13:33:25 +0200 -Subject: [PATCH] libweston/backend/drm: might need EGL - -gbm-drm.c includes gl-renderer.h. When EGL is enabled, that in turns -includes egl.h. As such, dependencies for drm should include EGL if -it is available. - -This condition is modelled after a similar one in libweston/meson.build - -Reported-by: Gary Bisson -Reported-by: Heiko Thiery -Signed-off-by: Yann E. MORIN -Cc: Refik Tuzakli -Cc: Thomas Petazzoni -Signed-off-by: Heiko Thiery ---- -This patch should be a proper fix for the issue discribed in the patch from -Gary [1]. - -Since the MR on weston upstream [2] is not merged now I add this patch -to have working weston with imx in buildroot. - -[1] https://patchwork.ozlabs.org/project/buildroot/patch/20200402130842.918696-3-gary.bisson at boundarydevices.com/ -[2] https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/508 ---- - libweston/backend-drm/meson.build | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/libweston/backend-drm/meson.build b/libweston/backend-drm/meson.build -index 484c2702..e3e5b976 100644 ---- a/libweston/backend-drm/meson.build -+++ b/libweston/backend-drm/meson.build -@@ -53,6 +53,9 @@ if get_option('renderer-gl') - config_h.set('HAVE_GBM_FD_IMPORT', '1') - endif - deps_drm += dep_gbm -+ if dep_egl.found() -+ deps_drm += dep_egl -+ endif - srcs_drm += 'drm-gbm.c' - config_h.set('BUILD_DRM_GBM', '1') - endif --- -2.20.1 - diff --git a/package/weston/0003-pipewire-add-support-for-0.3-API.patch b/package/weston/0003-pipewire-add-support-for-0.3-API.patch deleted file mode 100644 index b486b3de5c..0000000000 --- a/package/weston/0003-pipewire-add-support-for-0.3-API.patch +++ /dev/null @@ -1,391 +0,0 @@ -From cc08737e3fd174ec3c4c208ea4f2a3a6a9e8af3e Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Mon, 6 Jul 2020 00:58:02 -0600 -Subject: [PATCH] pipewire: add support for 0.3 API - -Fixes: #369 - -Signed-off-by: James Hilliard -[james.hilliard1 at gmail.com: backport from upstream commit -80b585f8d2a31e780b4de41fbd187a742bea7e1a] ---- - .gitlab-ci.yml | 2 +- - .gitlab-ci/debian-install.sh | 16 ++++- - pipewire/meson.build | 28 ++++++--- - pipewire/pipewire-plugin.c | 118 ++++++++++++++++++++++++++++++++++- - 4 files changed, 151 insertions(+), 13 deletions(-) - -diff --git a/pipewire/meson.build b/pipewire/meson.build -index 3d3374b8..e30a0b62 100644 ---- a/pipewire/meson.build -+++ b/pipewire/meson.build -@@ -5,17 +5,25 @@ if get_option('pipewire') - error('Attempting to build the pipewire plugin without the required DRM backend. ' + user_hint) - endif - -- depnames = [ -- 'libpipewire-0.2', 'libspa-0.1' -- ] - deps_pipewire = [ dep_libweston_private ] -- foreach depname : depnames -- dep = dependency(depname, required: false) -- if not dep.found() -- error('Pipewire plugin requires @0@ which was not found. '.format(depname) + user_hint) -- endif -- deps_pipewire += dep -- endforeach -+ -+ dep_libpipewire = dependency('libpipewire-0.3', required: false) -+ if not dep_libpipewire.found() -+ dep_libpipewire = dependency('libpipewire-0.2', required: false) -+ endif -+ if not dep_libpipewire.found() -+ error('Pipewire plugin requires libpipewire which was not found. ' + user_hint) -+ endif -+ deps_pipewire += dep_libpipewire -+ -+ dep_libspa = dependency('libspa-0.2', required: false) -+ if not dep_libspa.found() -+ dep_libspa = dependency('libspa-0.1', required: false) -+ endif -+ if not dep_libspa.found() -+ error('Pipewire plugin requires libspa which was not found. ' + user_hint) -+ endif -+ deps_pipewire += dep_libspa - - plugin_pipewire = shared_library( - 'pipewire-plugin', -diff --git a/pipewire/pipewire-plugin.c b/pipewire/pipewire-plugin.c -index 6f892574..ce70ea63 100644 ---- a/pipewire/pipewire-plugin.c -+++ b/pipewire/pipewire-plugin.c -@@ -34,20 +34,27 @@ - #include - #include - -+#include -+ - #include - #include - #include - --#include -+#if PW_CHECK_VERSION(0, 2, 90) -+#include -+#include -+#endif - - #define PROP_RANGE(min, max) 2, (min), (max) - -+#if !PW_CHECK_VERSION(0, 2, 90) - struct type { - struct spa_type_media_type media_type; - struct spa_type_media_subtype media_subtype; - struct spa_type_format_video format_video; - struct spa_type_video_format video_format; - }; -+#endif - - struct weston_pipewire { - struct weston_compositor *compositor; -@@ -60,12 +67,19 @@ struct weston_pipewire { - struct pw_loop *loop; - struct wl_event_source *loop_source; - -+#if PW_CHECK_VERSION(0, 2, 90) -+ struct pw_context *context; -+#endif - struct pw_core *core; - struct pw_type *t; -+#if PW_CHECK_VERSION(0, 2, 90) -+ struct spa_hook core_listener; -+#else - struct type type; - - struct pw_remote *remote; - struct spa_hook remote_listener; -+#endif - }; - - struct pipewire_output { -@@ -100,6 +114,7 @@ struct pipewire_frame_data { - struct wl_event_source *fence_sync_event_source; - }; - -+#if !PW_CHECK_VERSION(0, 2, 90) - static inline void init_type(struct type *type, struct spa_type_map *map) - { - spa_type_media_type_map(map, &type->media_type); -@@ -107,6 +122,7 @@ static inline void init_type(struct type *type, struct spa_type_map *map) - spa_type_format_video_map(map, &type->format_video); - spa_type_video_format_map(map, &type->video_format); - } -+#endif - - static void - pipewire_debug_impl(struct weston_pipewire *pipewire, -@@ -141,6 +157,7 @@ pipewire_debug_impl(struct weston_pipewire *pipewire, - free(logstr); - } - -+#if !PW_CHECK_VERSION(0, 2, 90) - static void - pipewire_debug(struct weston_pipewire *pipewire, const char *fmt, ...) - { -@@ -150,6 +167,7 @@ pipewire_debug(struct weston_pipewire *pipewire, const char *fmt, ...) - pipewire_debug_impl(pipewire, NULL, fmt, ap); - va_end(ap); - } -+#endif - - static void - pipewire_output_debug(struct pipewire_output *output, const char *fmt, ...) -@@ -185,7 +203,9 @@ pipewire_output_handle_frame(struct pipewire_output *output, int fd, - const struct weston_drm_virtual_output_api *api = - output->pipewire->virtual_output_api; - size_t size = output->output->height * stride; -+#if !PW_CHECK_VERSION(0, 2, 90) - struct pw_type *t = output->pipewire->t; -+#endif - struct pw_buffer *buffer; - struct spa_buffer *spa_buffer; - struct spa_meta_header *h; -@@ -203,7 +223,12 @@ pipewire_output_handle_frame(struct pipewire_output *output, int fd, - - spa_buffer = buffer->buffer; - -+#if PW_CHECK_VERSION(0, 2, 90) -+ if ((h = spa_buffer_find_meta_data(spa_buffer, SPA_META_Header, -+ sizeof(struct spa_meta_header)))) { -+#else - if ((h = spa_buffer_find_meta(spa_buffer, t->meta.Header))) { -+#endif - h->pts = -1; - h->flags = 0; - h->seq = output->seq++; -@@ -375,18 +400,40 @@ pipewire_set_dpms(struct weston_output *base_output, enum dpms_enum level) - static int - pipewire_output_connect(struct pipewire_output *output) - { -+#if !PW_CHECK_VERSION(0, 2, 90) - struct weston_pipewire *pipewire = output->pipewire; - struct type *type = &pipewire->type; -+#endif - uint8_t buffer[1024]; - struct spa_pod_builder builder = - SPA_POD_BUILDER_INIT(buffer, sizeof(buffer)); - const struct spa_pod *params[1]; -+#if !PW_CHECK_VERSION(0, 2, 90) - struct pw_type *t = pipewire->t; -+#endif - int frame_rate = output->output->current_mode->refresh / 1000; - int width = output->output->width; - int height = output->output->height; - int ret; - -+#if PW_CHECK_VERSION(0, 2, 90) -+ params[0] = spa_pod_builder_add_object(&builder, -+ SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat, -+ SPA_FORMAT_mediaType, SPA_POD_Id(SPA_MEDIA_TYPE_video), -+ SPA_FORMAT_mediaSubtype, SPA_POD_Id(SPA_MEDIA_SUBTYPE_raw), -+ SPA_FORMAT_VIDEO_format, SPA_POD_Id(SPA_VIDEO_FORMAT_BGRx), -+ SPA_FORMAT_VIDEO_size, SPA_POD_Rectangle(&SPA_RECTANGLE(width, height)), -+ SPA_FORMAT_VIDEO_framerate, SPA_POD_Fraction(&SPA_FRACTION (0, 1)), -+ SPA_FORMAT_VIDEO_maxFramerate, -+ SPA_POD_CHOICE_RANGE_Fraction(&SPA_FRACTION(frame_rate, 1), -+ &SPA_FRACTION(1, 1), -+ &SPA_FRACTION(frame_rate, 1))); -+ -+ ret = pw_stream_connect(output->stream, PW_DIRECTION_OUTPUT, SPA_ID_INVALID, -+ (PW_STREAM_FLAG_DRIVER | -+ PW_STREAM_FLAG_MAP_BUFFERS), -+ params, 1); -+#else - params[0] = spa_pod_builder_object(&builder, - t->param.idEnumFormat, t->spa_format, - "I", type->media_type.video, -@@ -406,6 +453,7 @@ pipewire_output_connect(struct pipewire_output *output) - (PW_STREAM_FLAG_DRIVER | - PW_STREAM_FLAG_MAP_BUFFERS), - params, 1); -+#endif - if (ret != 0) { - weston_log("Failed to connect pipewire stream: %s", - spa_strerror(ret)); -@@ -482,26 +530,42 @@ pipewire_output_stream_state_changed(void *data, enum pw_stream_state old, - } - - static void -+#if PW_CHECK_VERSION(0, 2, 90) -+pipewire_output_stream_param_changed(void *data, uint32_t id, const struct spa_pod *format) -+#else - pipewire_output_stream_format_changed(void *data, const struct spa_pod *format) -+#endif - { - struct pipewire_output *output = data; -+#if !PW_CHECK_VERSION(0, 2, 90) - struct weston_pipewire *pipewire = output->pipewire; -+#endif - uint8_t buffer[1024]; - struct spa_pod_builder builder = - SPA_POD_BUILDER_INIT(buffer, sizeof(buffer)); - const struct spa_pod *params[2]; -+#if !PW_CHECK_VERSION(0, 2, 90) - struct pw_type *t = pipewire->t; -+#endif - int32_t width, height, stride, size; - const int bpp = 4; - - if (!format) { - pipewire_output_debug(output, "format = None"); -+#if PW_CHECK_VERSION(0, 2, 90) -+ pw_stream_update_params(output->stream, NULL, 0); -+#else - pw_stream_finish_format(output->stream, 0, NULL, 0); -+#endif - return; - } - -+#if PW_CHECK_VERSION(0, 2, 90) -+ spa_format_video_raw_parse(format, &output->video_format); -+#else - spa_format_video_raw_parse(format, &output->video_format, - &pipewire->type.format_video); -+#endif - - width = output->video_format.size.width; - height = output->video_format.size.height; -@@ -510,6 +574,21 @@ pipewire_output_stream_format_changed(void *data, const struct spa_pod *format) - - pipewire_output_debug(output, "format = %dx%d", width, height); - -+#if PW_CHECK_VERSION(0, 2, 90) -+ params[0] = spa_pod_builder_add_object(&builder, -+ SPA_TYPE_OBJECT_ParamBuffers, SPA_PARAM_Buffers, -+ SPA_PARAM_BUFFERS_size, SPA_POD_Int(size), -+ SPA_PARAM_BUFFERS_stride, SPA_POD_Int(stride), -+ SPA_PARAM_BUFFERS_buffers, SPA_POD_CHOICE_RANGE_Int(4, 2, 8), -+ SPA_PARAM_BUFFERS_align, SPA_POD_Int(16)); -+ -+ params[1] = spa_pod_builder_add_object(&builder, -+ SPA_TYPE_OBJECT_ParamMeta, SPA_PARAM_Meta, -+ SPA_PARAM_META_type, SPA_POD_Id(SPA_META_Header), -+ SPA_PARAM_META_size, SPA_POD_Int(sizeof(struct spa_meta_header))); -+ -+ pw_stream_update_params(output->stream, params, 2); -+#else - params[0] = spa_pod_builder_object(&builder, - t->param.idBuffers, t->param_buffers.Buffers, - ":", t->param_buffers.size, -@@ -527,12 +606,17 @@ pipewire_output_stream_format_changed(void *data, const struct spa_pod *format) - ":", t->param_meta.size, "i", sizeof(struct spa_meta_header)); - - pw_stream_finish_format(output->stream, 0, params, 2); -+#endif - } - - static const struct pw_stream_events stream_events = { - PW_VERSION_STREAM_EVENTS, - .state_changed = pipewire_output_stream_state_changed, -+#if PW_CHECK_VERSION(0, 2, 90) -+ .param_changed = pipewire_output_stream_param_changed, -+#else - .format_changed = pipewire_output_stream_format_changed, -+#endif - }; - - static struct weston_output * -@@ -560,7 +644,11 @@ pipewire_output_create(struct weston_compositor *c, char *name) - if (!head) - goto err; - -+#if PW_CHECK_VERSION(0, 2, 90) -+ output->stream = pw_stream_new(pipewire->core, name, NULL); -+#else - output->stream = pw_stream_new(pipewire->remote, name, NULL); -+#endif - if (!output->stream) { - weston_log("Cannot initialize pipewire stream\n"); - goto err; -@@ -704,6 +792,14 @@ weston_pipewire_loop_handler(int fd, uint32_t mask, void *data) - return 0; - } - -+#if PW_CHECK_VERSION(0, 2, 90) -+static void -+weston_pipewire_error(void *data, uint32_t id, int seq, int res, -+ const char *error) -+{ -+ weston_log("pipewire remote error: %s\n", error); -+} -+#else - static void - weston_pipewire_state_changed(void *data, enum pw_remote_state old, - enum pw_remote_state state, const char *error) -@@ -725,12 +821,20 @@ weston_pipewire_state_changed(void *data, enum pw_remote_state old, - break; - } - } -+#endif - - -+#if PW_CHECK_VERSION(0, 2, 90) -+static const struct pw_core_events core_events = { -+ PW_VERSION_CORE_EVENTS, -+ .error = weston_pipewire_error, -+}; -+#else - static const struct pw_remote_events remote_events = { - PW_VERSION_REMOTE_EVENTS, - .state_changed = weston_pipewire_state_changed, - }; -+#endif - - static int - weston_pipewire_init(struct weston_pipewire *pipewire) -@@ -745,10 +849,19 @@ weston_pipewire_init(struct weston_pipewire *pipewire) - - pw_loop_enter(pipewire->loop); - -+#if PW_CHECK_VERSION(0, 2, 90) -+ pipewire->context = pw_context_new(pipewire->loop, NULL, 0); -+#else - pipewire->core = pw_core_new(pipewire->loop, NULL); - pipewire->t = pw_core_get_type(pipewire->core); - init_type(&pipewire->type, pipewire->t->map); -+#endif - -+#if PW_CHECK_VERSION(0, 2, 90) -+ pw_core_add_listener(pipewire->core, -+ &pipewire->core_listener, -+ &core_events, pipewire); -+#else - pipewire->remote = pw_remote_new(pipewire->core, NULL, 0); - pw_remote_add_listener(pipewire->remote, - &pipewire->remote_listener, -@@ -777,6 +890,7 @@ weston_pipewire_init(struct weston_pipewire *pipewire) - goto err; - } - } -+#endif - - loop = wl_display_get_event_loop(pipewire->compositor->wl_display); - pipewire->loop_source = -@@ -786,12 +900,14 @@ weston_pipewire_init(struct weston_pipewire *pipewire) - pipewire); - - return 0; -+#if !PW_CHECK_VERSION(0, 2, 90) - err: - if (pipewire->remote) - pw_remote_destroy(pipewire->remote); - pw_loop_leave(pipewire->loop); - pw_loop_destroy(pipewire->loop); - return -1; -+#endif - } - - static const struct weston_pipewire_api pipewire_api = { --- -2.25.1 - diff --git a/package/weston/0004-pipewire-fix-null-deref-in-0-3-API.patch b/package/weston/0004-pipewire-fix-null-deref-in-0-3-API.patch deleted file mode 100644 index f65348e166..0000000000 --- a/package/weston/0004-pipewire-fix-null-deref-in-0-3-API.patch +++ /dev/null @@ -1,28 +0,0 @@ -From a67393c353e0f25b142910a817be5a7754d436c3 Mon Sep 17 00:00:00 2001 -From: Ambareesh Balaji -Date: Sat, 5 Dec 2020 20:49:55 -0500 -Subject: [PATCH] pipewire: fix null deref in 0.3 API - -Signed-off-by: Ambareesh Balaji -[Retrieved from: -https://gitlab.freedesktop.org/wayland/weston/-/commit/a67393c353e0f25b142910a817be5a7754d436c3] -Signed-off-by: Fabrice Fontaine ---- - pipewire/pipewire-plugin.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/pipewire/pipewire-plugin.c b/pipewire/pipewire-plugin.c -index ca5cbfec1..55705acfc 100644 ---- a/pipewire/pipewire-plugin.c -+++ b/pipewire/pipewire-plugin.c -@@ -856,6 +856,7 @@ weston_pipewire_init(struct weston_pipewire *pipewire) - - #if PW_CHECK_VERSION(0, 2, 90) - pipewire->context = pw_context_new(pipewire->loop, NULL, 0); -+ pipewire->core = pw_context_connect(pipewire->context, NULL, 0); - #else - pipewire->core = pw_core_new(pipewire->loop, NULL); - pipewire->t = pw_core_get_type(pipewire->core); --- -GitLab - diff --git a/package/weston/Config.in b/package/weston/Config.in index 8f3dbc7931..d45e50baaa 100644 --- a/package/weston/Config.in +++ b/package/weston/Config.in @@ -35,7 +35,7 @@ choice prompt "default compositor" config BR2_PACKAGE_WESTON_DEFAULT_FBDEV - bool "fbdev" + bool "fbdev (deprecated)" select BR2_PACKAGE_WESTON_FBDEV config BR2_PACKAGE_WESTON_DEFAULT_DRM @@ -46,21 +46,31 @@ config BR2_PACKAGE_WESTON_DEFAULT_DRM comment "drm backend needs mesa3d w/ EGL driver" depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL && !BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL +config BR2_PACKAGE_WESTON_DEFAULT_HEADLESS + bool "headless" + select BR2_PACKAGE_WESTON_HEADLESS + +config BR2_PACKAGE_WESTON_DEFAULT_WAYLAND + bool "wayland (nested)" + select BR2_PACKAGE_WESTON_WAYLAND + config BR2_PACKAGE_WESTON_DEFAULT_X11 - bool "X11" + bool "X11 (nested)" depends on BR2_PACKAGE_XORG7 select BR2_PACKAGE_WESTON_X11 -comment "X11 backend needs X.org" +comment "X11 (nested) backend needs X.org" depends on !BR2_PACKAGE_XORG7 endchoice config BR2_PACKAGE_WESTON_DEFAULT_COMPOSITOR string - default "fbdev" if BR2_PACKAGE_WESTON_DEFAULT_FBDEV - default "drm" if BR2_PACKAGE_WESTON_DEFAULT_DRM - default "x11" if BR2_PACKAGE_WESTON_DEFAULT_X11 + default "fbdev" if BR2_PACKAGE_WESTON_DEFAULT_FBDEV + default "drm" if BR2_PACKAGE_WESTON_DEFAULT_DRM + default "headless" if BR2_PACKAGE_WESTON_DEFAULT_HEADLESS + default "wayland" if BR2_PACKAGE_WESTON_DEFAULT_WAYLAND + default "x11" if BR2_PACKAGE_WESTON_DEFAULT_X11 config BR2_PACKAGE_WESTON_DRM bool "DRM compositor" @@ -71,7 +81,7 @@ comment "DRM compositor needs an OpenGL EGL backend provided by mesa3d" depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL && !BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL config BR2_PACKAGE_WESTON_FBDEV - bool "fbdev compositor" + bool "fbdev compositor (deprecated)" # FreeRDP needs threads and !static, already the case for weston config BR2_PACKAGE_WESTON_RDP @@ -99,13 +109,19 @@ comment "RDP compositor needs a toolchain w/ wchar, C++" depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP +config BR2_PACKAGE_WESTON_HEADLESS + bool "headless (testing) compositor" + +config BR2_PACKAGE_WESTON_WAYLAND + bool "Wayland (nested) compositor" + config BR2_PACKAGE_WESTON_X11 - bool "X11 compositor" + bool "X11 (nested) compositor" depends on BR2_PACKAGE_XORG7 select BR2_PACKAGE_LIBXCB select BR2_PACKAGE_XLIB_LIBX11 -comment "X11 compositor needs X.org enabled" +comment "X11 (nested) compositor needs X.org enabled" depends on !BR2_PACKAGE_XORG7 config BR2_PACKAGE_WESTON_XWAYLAND diff --git a/package/weston/weston.hash b/package/weston/weston.hash index 5a6b38686a..b78a7c7550 100644 --- a/package/weston/weston.hash +++ b/package/weston/weston.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2020-September/041595.html -md5 b406da0fe9139fd39653238fde22a6cf weston-9.0.0.tar.xz -sha1 90b9540a0bd6d6f7a465817f1c696d4d393183c9 weston-9.0.0.tar.xz -sha256 5cf5d6ce192e0eb15c1fc861a436bf21b5bb3b91dbdabbdebe83e1f83aa098fe weston-9.0.0.tar.xz -sha512 ccc263f8279b7b23e5c593b4a8a023de2c3dc178b1b8d6593599171770bcfe97608de9fcb77aa1cab39255451d289d323e51c317dae190c7641282e085b84f90 weston-9.0.0.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2022-February/042103.html +md5 bc4abe2ee6904a4890a0c641c6257f91 weston-10.0.0.tar.xz +sha1 b1a51e3bb7ee1d75bbf728c8071771e07fc97fdd weston-10.0.0.tar.xz +sha256 5c23964112b90238bed39e5dd1e41cd71a79398813cdc3bbb15a9fdc94e547ae weston-10.0.0.tar.xz +sha512 77e05530751e4f743eebf015ab5b78a1fcc66b774713b5e296cfffc488be84e459f811c85ac4280b7b63eebf4ff5c958dd7306376ab343e6b80feae16c8c35a4 weston-10.0.0.tar.xz sha256 fdb65868f65d0fbdb05c2d3b779e10ce9969fa0c4b9262ba4f260e87086ab860 COPYING diff --git a/package/weston/weston.mk b/package/weston/weston.mk index 6dd5439291..a0a18d9358 100644 --- a/package/weston/weston.mk +++ b/package/weston/weston.mk @@ -4,7 +4,7 @@ # ################################################################################ -WESTON_VERSION = 9.0.0 +WESTON_VERSION = 10.0.0 WESTON_SITE = https://wayland.freedesktop.org/releases WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz WESTON_LICENSE = MIT @@ -12,12 +12,14 @@ WESTON_LICENSE_FILES = COPYING WESTON_CPE_ID_VENDOR = wayland WESTON_DEPENDENCIES = host-pkgconf wayland wayland-protocols \ - libxkbcommon pixman libpng jpeg udev cairo libinput libdrm + libxkbcommon pixman libpng udev cairo libinput libdrm WESTON_CONF_OPTS = \ -Dbackend-headless=false \ -Dcolor-management-colord=false \ - -Dremoting=false + -Ddoc=false \ + -Dremoting=false \ + -Dtools=calibrator,debug,info,terminal,touch-calibrator # Uses VIDIOC_EXPBUF, only available from 3.8+ ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_8),y) @@ -33,6 +35,13 @@ else WESTON_CONF_OPTS += -Dlauncher-logind=false endif +ifeq ($(BR2_PACKAGE_JPEG),y) +WESTON_CONF_OPTS += -Dimage-jpeg=true +WESTON_DEPENDENCIES += jpeg +else +WESTON_CONF_OPTS += -Dimage-jpeg=false +endif + ifeq ($(BR2_PACKAGE_WEBP),y) WESTON_CONF_OPTS += -Dimage-webp=true WESTON_DEPENDENCIES += webp @@ -48,10 +57,10 @@ endef define WESTON_USERS - - weston-launch -1 - - - - Weston launcher group endef -WESTON_CONF_OPTS += -Dweston-launch=true +WESTON_CONF_OPTS += -Ddeprecated-weston-launch=true WESTON_DEPENDENCIES += linux-pam else -WESTON_CONF_OPTS += -Dweston-launch=false +WESTON_CONF_OPTS += -Ddeprecated-weston-launch=false endif ifeq ($(BR2_PACKAGE_HAS_LIBEGL_WAYLAND)$(BR2_PACKAGE_HAS_LIBGLES),yy) @@ -77,9 +86,9 @@ WESTON_CONF_OPTS += -Dbackend-rdp=false endif ifeq ($(BR2_PACKAGE_WESTON_FBDEV),y) -WESTON_CONF_OPTS += -Dbackend-fbdev=true +WESTON_CONF_OPTS += -Ddeprecated-backend-fbdev=true else -WESTON_CONF_OPTS += -Dbackend-fbdev=false +WESTON_CONF_OPTS += -Ddeprecated-backend-fbdev=false endif ifeq ($(BR2_PACKAGE_WESTON_DRM),y) @@ -88,6 +97,18 @@ else WESTON_CONF_OPTS += -Dbackend-drm=false endif +ifeq ($(BR2_PACKAGE_WESTON_HEADLESS),y) +WESTON_CONF_OPTS += -Dbackend-headless=true +else +WESTON_CONF_OPTS += -Dbackend-headless=false +endif + +ifeq ($(BR2_PACKAGE_WESTON_WAYLAND),y) +WESTON_CONF_OPTS += -Dbackend-wayland=true +else +WESTON_CONF_OPTS += -Dbackend-wayland=false +endif + ifeq ($(BR2_PACKAGE_WESTON_X11),y) WESTON_CONF_OPTS += -Dbackend-x11=true WESTON_DEPENDENCIES += libxcb xlib_libX11 From arnout at mind.be Sun Feb 13 15:30:28 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 16:30:28 +0100 Subject: [Buildroot] [PATCH] package/libbsd: bump to version 0.11.5 In-Reply-To: <20220207120946.1553618-1-francois.perrad@gadz.org> References: <20220207120946.1553618-1-francois.perrad@gadz.org> Message-ID: On 07/02/2022 13:09, Francois Perrad wrote: > Signed-off-by: Francois Perrad > --- > package/libbsd/libbsd.hash | 8 +++++--- > package/libbsd/libbsd.mk | 2 +- > 2 files changed, 6 insertions(+), 4 deletions(-) > > diff --git a/package/libbsd/libbsd.hash b/package/libbsd/libbsd.hash > index 17bb32e01..435ea5470 100644 > --- a/package/libbsd/libbsd.hash > +++ b/package/libbsd/libbsd.hash > @@ -1,3 +1,5 @@ > -# From https://lists.freedesktop.org/archives/libbsd/2021-February/000305.html > -sha512 a7015ea1ffa3766b1a4690526a25231898ad8275149b31fb6801082450172249997c36165626d101ffce53b59767a46676eebc0806426922fe4e773a0376c1f5 libbsd-0.11.3.tar.xz > -sha256 ff2fdeeb0fe8bcb9045fe91d69e8312a5b477c54db48dffe34dd1c0d730c5864 COPYING > +# From https://lists.freedesktop.org/archives/libbsd/2022-January/000322.html > +sha512 c52c19eddd53630aca14f9f6221f7b84aa9cc798b4bb91e867822b161793313aab872ac1c0350d29312a72fee6e2061f3910ff918b724ec171d8c9de5837c841 libbsd-0.11.5.tar.xz > + > +# License files (locally computed) > +sha256 3761714adb9c45fa588b77b372d6e75dcc9e6822cc2d6baa712007241aec714e COPYING Please explain in the commit message why the license hash changed, and if necessary, update _LICENSE. There's a reason we have these hashes, you know. Patch marked as Changes Requested. Regards, Arnout > diff --git a/package/libbsd/libbsd.mk b/package/libbsd/libbsd.mk > index 86df8a97a..0654bef82 100644 > --- a/package/libbsd/libbsd.mk > +++ b/package/libbsd/libbsd.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBBSD_VERSION = 0.11.3 > +LIBBSD_VERSION = 0.11.5 > 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, \ From arnout at mind.be Sun Feb 13 15:30:58 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 16:30:58 +0100 Subject: [Buildroot] [PATCH] package/zstd: bump to version 1.5.2 In-Reply-To: <20220207122423.1561946-1-francois.perrad@gadz.org> References: <20220207122423.1561946-1-francois.perrad@gadz.org> Message-ID: On 07/02/2022 13:24, Francois Perrad wrote: > Signed-off-by: Francois Perrad Applied to master, thanks. Regards, Arnout > --- > package/zstd/zstd.hash | 4 ++-- > package/zstd/zstd.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/zstd/zstd.hash b/package/zstd/zstd.hash > index d7d8a448f..eca44b89f 100644 > --- a/package/zstd/zstd.hash > +++ b/package/zstd/zstd.hash > @@ -1,5 +1,5 @@ > -# From https://github.com/facebook/zstd/releases/download/v1.5.1/zstd-1.5.1.tar.gz.sha256 > -sha256 e28b2f2ed5710ea0d3a1ecac3f6a947a016b972b9dd30242369010e5f53d7002 zstd-1.5.1.tar.gz > +# From https://github.com/facebook/zstd/releases/download/v1.5.2/zstd-1.5.2.tar.gz.sha256 > +sha256 7c42d56fac126929a6a85dbc73ff1db2411d04f104fae9bdea51305663a83fd0 zstd-1.5.2.tar.gz > > # License files (locally computed) > sha256 2c1a7fa704df8f3a606f6fc010b8b5aaebf403f3aeec339a12048f1ba7331a0b LICENSE > diff --git a/package/zstd/zstd.mk b/package/zstd/zstd.mk > index 476190e9a..a4bbada82 100644 > --- a/package/zstd/zstd.mk > +++ b/package/zstd/zstd.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -ZSTD_VERSION = 1.5.1 > +ZSTD_VERSION = 1.5.2 > ZSTD_SITE = https://github.com/facebook/zstd/releases/download/v$(ZSTD_VERSION) > ZSTD_INSTALL_STAGING = YES > ZSTD_LICENSE = BSD-3-Clause or GPL-2.0 From arnout at mind.be Sun Feb 13 15:31:14 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 16:31:14 +0100 Subject: [Buildroot] [PATCH] package/alfred: bump to version 2022.0 In-Reply-To: <20220207112228.1753927-1-jose.pekkarinen@unikie.com> References: <20220207112228.1753927-1-jose.pekkarinen@unikie.com> Message-ID: On 07/02/2022 12:22, Jos? Pekkarinen wrote: > https://www.open-mesh.org/news/107 > > Signed-off-by: Jos? Pekkarinen Applied to master, thanks. Regards, Arnout > --- > package/alfred/alfred.hash | 6 +++--- > package/alfred/alfred.mk | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/alfred/alfred.hash b/package/alfred/alfred.hash > index 0799071231..2da7eb31c8 100644 > --- a/package/alfred/alfred.hash > +++ b/package/alfred/alfred.hash > @@ -1,5 +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 > +# From https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2022.0.tar.gz.sha1 > +sha1 8e00789d3e1e5c959dd985809861ff624d372694 alfred-2022.0.tar.gz > # Locally computed > -sha256 4c79b6c45de4bcc8cbfe64cba9a0f8b4ef304ca84c194622f2bfa41e01e2cb95 alfred-2021.4.tar.gz > +sha256 abba1dac61eccfcd6329e7331d0555fecc937760fb36c6cf55ce6c1d751cfd98 alfred-2022.0.tar.gz > sha256 cecbf53d1148e13256ac29f8b900655b7fc8dc12d59939a95bc2323ea1747025 LICENSES/preferred/GPL-2.0 > diff --git a/package/alfred/alfred.mk b/package/alfred/alfred.mk > index ed59066393..24b9956b11 100644 > --- a/package/alfred/alfred.mk > +++ b/package/alfred/alfred.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -ALFRED_VERSION = 2021.4 > +ALFRED_VERSION = 2022.0 > ALFRED_SITE = https://downloads.open-mesh.org/batman/stable/sources/alfred > ALFRED_LICENSE = GPL-2.0 > ALFRED_LICENSE_FILES = LICENSES/preferred/GPL-2.0 From arnout at mind.be Sun Feb 13 15:32:17 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 16:32:17 +0100 Subject: [Buildroot] [PATCH] package/harfbuzz: bump to version 3.3.2 In-Reply-To: <20220206225902.3349344-1-giulio.benetti@benettiengineering.com> References: <20220206225902.3349344-1-giulio.benetti@benettiengineering.com> Message-ID: On 06/02/2022 23:59, Giulio Benetti wrote: > Signed-off-by: Giulio Benetti Applied to master, thanks. > --- > This patch superseeds this: > https://patchwork.ozlabs.org/project/buildroot/patch/20220131175341.4091688-1-giulio.benetti at benettiengineering.com/ If you mark it as superseded yourself, there's no real need to say it here. But you should probably have given it a v2. Regards, Arnout > --- > 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..61f2865563 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 1c13bca136c4f66658059853e2c1253f34c88f4b5c5aba6050aba7b5e0ce2503 harfbuzz-3.3.2.tar.xz > sha256 4345e1735f8bc6d812fed5180cabb5a5e88a4109d332652f2a45c13cfa5ee692 COPYING > diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk > index 67eab359c6..1f5dfa8822 100644 > --- a/package/harfbuzz/harfbuzz.mk > +++ b/package/harfbuzz/harfbuzz.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -HARFBUZZ_VERSION = 3.2.0 > +HARFBUZZ_VERSION = 3.3.2 > HARFBUZZ_SITE = https://github.com/harfbuzz/harfbuzz/releases/download/$(HARFBUZZ_VERSION) > HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.xz > HARFBUZZ_LICENSE = MIT, ISC (ucdn library) From arnout at mind.be Sun Feb 13 15:32:36 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 16:32:36 +0100 Subject: [Buildroot] [PATCH] package/libnss: bump to version 3.75 In-Reply-To: <20220206224521.3204040-1-giulio.benetti@benettiengineering.com> References: <20220206224521.3204040-1-giulio.benetti@benettiengineering.com> Message-ID: <6b41c65a-8655-229b-2832-23c2fa7c1c1e@mind.be> On 06/02/2022 23:45, Giulio Benetti wrote: > Signed-off-by: Giulio Benetti Applied to master, thanks. Regards, Arnout > --- > 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 819c272a30..07fb340c33 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_74_RTM/src/SHA256SUMS > -sha256 88928811f9f40f87d42e2eaccdf6e454562e51486067f2ddbe90aa47ea6cd056 nss-3.74.tar.gz > +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_75_RTM/src/SHA256SUMS > +sha256 fd571507827284644f4dd522a032acda2286835f6683ed22a1c2d3878cc58582 nss-3.75.tar.gz > # Locally calculated > sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING > diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk > index 537f6dd9b6..a9549e48dd 100644 > --- a/package/libnss/libnss.mk > +++ b/package/libnss/libnss.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBNSS_VERSION = 3.74 > +LIBNSS_VERSION = 3.75 > 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 arnout at mind.be Sun Feb 13 15:27:42 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 16:27:42 +0100 Subject: [Buildroot] [git commit] package/harfbuzz: bump to version 3.3.2 Message-ID: <20220213152515.A748682974@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=423ef314b480ee62ecbba48424e2d77dd7bff4fc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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..61f2865563 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 1c13bca136c4f66658059853e2c1253f34c88f4b5c5aba6050aba7b5e0ce2503 harfbuzz-3.3.2.tar.xz sha256 4345e1735f8bc6d812fed5180cabb5a5e88a4109d332652f2a45c13cfa5ee692 COPYING diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk index 67eab359c6..1f5dfa8822 100644 --- a/package/harfbuzz/harfbuzz.mk +++ b/package/harfbuzz/harfbuzz.mk @@ -4,7 +4,7 @@ # ################################################################################ -HARFBUZZ_VERSION = 3.2.0 +HARFBUZZ_VERSION = 3.3.2 HARFBUZZ_SITE = https://github.com/harfbuzz/harfbuzz/releases/download/$(HARFBUZZ_VERSION) HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.xz HARFBUZZ_LICENSE = MIT, ISC (ucdn library) From arnout at mind.be Sun Feb 13 15:27:26 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 16:27:26 +0100 Subject: [Buildroot] [git commit] package/libnss: bump to version 3.75 Message-ID: <20220213152515.9AF4B827D4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=039436fca6c06644a16b5cb3ec5a9cd05d43aefa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 819c272a30..07fb340c33 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_74_RTM/src/SHA256SUMS -sha256 88928811f9f40f87d42e2eaccdf6e454562e51486067f2ddbe90aa47ea6cd056 nss-3.74.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_75_RTM/src/SHA256SUMS +sha256 fd571507827284644f4dd522a032acda2286835f6683ed22a1c2d3878cc58582 nss-3.75.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index 537f6dd9b6..a9549e48dd 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.74 +LIBNSS_VERSION = 3.75 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 arnout at mind.be Sun Feb 13 15:29:33 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 16:29:33 +0100 Subject: [Buildroot] [git commit] package/zstd: bump to version 1.5.2 Message-ID: <20220213152515.BC00C827D4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=10ac3455d364b5e1f87d8f2f111ef1a6952e426a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/zstd/zstd.hash | 4 ++-- package/zstd/zstd.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/zstd/zstd.hash b/package/zstd/zstd.hash index d7d8a448ff..eca44b89f0 100644 --- a/package/zstd/zstd.hash +++ b/package/zstd/zstd.hash @@ -1,5 +1,5 @@ -# From https://github.com/facebook/zstd/releases/download/v1.5.1/zstd-1.5.1.tar.gz.sha256 -sha256 e28b2f2ed5710ea0d3a1ecac3f6a947a016b972b9dd30242369010e5f53d7002 zstd-1.5.1.tar.gz +# From https://github.com/facebook/zstd/releases/download/v1.5.2/zstd-1.5.2.tar.gz.sha256 +sha256 7c42d56fac126929a6a85dbc73ff1db2411d04f104fae9bdea51305663a83fd0 zstd-1.5.2.tar.gz # License files (locally computed) sha256 2c1a7fa704df8f3a606f6fc010b8b5aaebf403f3aeec339a12048f1ba7331a0b LICENSE diff --git a/package/zstd/zstd.mk b/package/zstd/zstd.mk index 476190e9ae..a4bbada825 100644 --- a/package/zstd/zstd.mk +++ b/package/zstd/zstd.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZSTD_VERSION = 1.5.1 +ZSTD_VERSION = 1.5.2 ZSTD_SITE = https://github.com/facebook/zstd/releases/download/v$(ZSTD_VERSION) ZSTD_INSTALL_STAGING = YES ZSTD_LICENSE = BSD-3-Clause or GPL-2.0 From arnout at mind.be Sun Feb 13 15:27:50 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 16:27:50 +0100 Subject: [Buildroot] [git commit] package/alfred: bump to version 2022.0 Message-ID: <20220213152515.B0C7482983@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b7e0b0e9a5831d85fcd5bacb2c1c815a26bfa1a0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://www.open-mesh.org/news/107 Signed-off-by: Jos?? Pekkarinen Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/alfred/alfred.hash | 6 +++--- package/alfred/alfred.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/alfred/alfred.hash b/package/alfred/alfred.hash index 0799071231..2da7eb31c8 100644 --- a/package/alfred/alfred.hash +++ b/package/alfred/alfred.hash @@ -1,5 +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 +# From https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2022.0.tar.gz.sha1 +sha1 8e00789d3e1e5c959dd985809861ff624d372694 alfred-2022.0.tar.gz # Locally computed -sha256 4c79b6c45de4bcc8cbfe64cba9a0f8b4ef304ca84c194622f2bfa41e01e2cb95 alfred-2021.4.tar.gz +sha256 abba1dac61eccfcd6329e7331d0555fecc937760fb36c6cf55ce6c1d751cfd98 alfred-2022.0.tar.gz sha256 cecbf53d1148e13256ac29f8b900655b7fc8dc12d59939a95bc2323ea1747025 LICENSES/preferred/GPL-2.0 diff --git a/package/alfred/alfred.mk b/package/alfred/alfred.mk index ed59066393..24b9956b11 100644 --- a/package/alfred/alfred.mk +++ b/package/alfred/alfred.mk @@ -4,7 +4,7 @@ # ################################################################################ -ALFRED_VERSION = 2021.4 +ALFRED_VERSION = 2022.0 ALFRED_SITE = https://downloads.open-mesh.org/batman/stable/sources/alfred ALFRED_LICENSE = GPL-2.0 ALFRED_LICENSE_FILES = LICENSES/preferred/GPL-2.0 From geomatsi at gmail.com Sun Feb 13 15:52:06 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Sun, 13 Feb 2022 18:52:06 +0300 Subject: [Buildroot] [PATCH 0/2] hostapd/wpa_s: fixes after version update Message-ID: <20220213155208.560001-1-geomatsi@gmail.com> Hi all, This patch series provides two fixes for hostapd/wpa_s build issues. The first patch fixes hostapd build regression caused by its version update. New hostapd version requires updated handling of CONFIG_DPP option. I guess I failed to catch this problem because all my random hostapd test configs enabled openssl. So I overlooked basic minimal configuration that did not require openssl. The second patch fixes specific configuration of wpa_supplicant reported by Yegor Yefremov. For now a patch is added. Yegor already posted patch to hostapd mailing list. So some time in the future this problem will be fixed upstream. Regards, Sergey Sergey Matyukevich (2): package/hostapd: update DPP option handling package/wpa_supplicant: fix build for mesh configuration package/hostapd/hostapd.mk | 3 +- .../0001-mesh-enable-HMAC_SHA384_KDF.patch | 30 +++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 package/wpa_supplicant/0001-mesh-enable-HMAC_SHA384_KDF.patch -- 2.35.0 From geomatsi at gmail.com Sun Feb 13 15:52:07 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Sun, 13 Feb 2022 18:52:07 +0300 Subject: [Buildroot] [PATCH 1/2] package/hostapd: update DPP option handling In-Reply-To: <20220213155208.560001-1-geomatsi@gmail.com> References: <20220213155208.560001-1-geomatsi@gmail.com> Message-ID: <20220213155208.560001-2-geomatsi@gmail.com> Makefile hostapd.mk defines different macros for different defconfig options. Options that are not listed in defconfig, can be set using HOSTAPD_CONFIG_SET. Options that are listed in defconfig, can be enabled/disabled using HOSTAPD_CONFIG_ENABLE/HOSTAPD_CONFIG_DISABLE. Starting from hostapd v2.10, option CONFIG_DPP is explicitly listed in defconfig. So it is time to switch to enable/disable macros for this option. Fixes: - http://autobuild.buildroot.net/results/3f8058ee6f3913fda795578f206db895731ba1e6/ Signed-off-by: Sergey Matyukevich --- package/hostapd/hostapd.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk index 075cb2a8d0..2ea6e0312f 100644 --- a/package/hostapd/hostapd.mk +++ b/package/hostapd/hostapd.mk @@ -84,12 +84,13 @@ endif ifeq ($(BR2_PACKAGE_HOSTAPD_WPA3),y) HOSTAPD_CONFIG_SET += \ - CONFIG_DPP \ CONFIG_SAE HOSTAPD_CONFIG_ENABLE += \ + CONFIG_DPP \ CONFIG_OWE else HOSTAPD_CONFIG_DISABLE += \ + CONFIG_DPP \ CONFIG_OWE endif -- 2.35.0 From geomatsi at gmail.com Sun Feb 13 15:52:08 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Sun, 13 Feb 2022 18:52:08 +0300 Subject: [Buildroot] [PATCH 2/2] package/wpa_supplicant: fix mesh configuration build In-Reply-To: <20220213155208.560001-1-geomatsi@gmail.com> References: <20220213155208.560001-1-geomatsi@gmail.com> Message-ID: <20220213155208.560001-3-geomatsi@gmail.com> Consider 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 BR2_PACKAGE_WPA_SUPPLICANT_EAP=y This configuration fails to build with the following error: /path/to/output/build/wpa_supplicant-2.10/build/wpa_supplicant/src/common/sae.o: in function `hkdf_expand': sae.c:(.text+0x3c8): undefined reference to `hmac_sha384_kdf' collect2: error: ld returned 1 exit status make[1]: *** [Makefile:1894: wpa_supplicant] Error 1 Looking into wpa_supplicant Makefile: - CONFIG_MESH for some reason needs SAE, so it enables CONFIG_SAE - CONFIG_SAE enables only HMAC_SHA256_KDF This is apparently not enough. At least HMAC_SHA384_KDF is required for successful build. This commit adds a minimal patch for wpa_supplicant that fixes specified build configuration. Reported-by: Yegor Yefremov Signed-off-by: Sergey Matyukevich --- .../0001-mesh-enable-HMAC_SHA384_KDF.patch | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 package/wpa_supplicant/0001-mesh-enable-HMAC_SHA384_KDF.patch diff --git a/package/wpa_supplicant/0001-mesh-enable-HMAC_SHA384_KDF.patch b/package/wpa_supplicant/0001-mesh-enable-HMAC_SHA384_KDF.patch new file mode 100644 index 0000000000..d765c1dbbc --- /dev/null +++ b/package/wpa_supplicant/0001-mesh-enable-HMAC_SHA384_KDF.patch @@ -0,0 +1,30 @@ +From 08986b7da7e580f5deb570aaa654df38fb23397a Mon Sep 17 00:00:00 2001 +From: Sergey Matyukevich +Date: Sun, 13 Feb 2022 18:26:23 +0300 +Subject: [PATCH] mesh: enable HMAC_SHA384_KDF + +Mesh support CONFIG_MESH needs SAE, so it enables CONFIG_SAE. +In its turn, CONFIG_SAE enables only HMAC_SHA256_KDF option. +This is apparently not enough for successful build. At least +HMAC_SHA384_KDF is required for successful build. + +Signed-off-by: Sergey Matyukevich +--- + wpa_supplicant/Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile +index cb66defac..c8e53a3c9 100644 +--- a/wpa_supplicant/Makefile ++++ b/wpa_supplicant/Makefile +@@ -246,6 +246,7 @@ endif + ifdef CONFIG_MESH + NEED_80211_COMMON=y + NEED_AES_SIV=y ++NEED_HMAC_SHA384_KDF=y + CONFIG_SAE=y + CONFIG_AP=y + CFLAGS += -DCONFIG_MESH +-- +2.35.0 + -- 2.35.0 From ju.o at free.fr Sun Feb 13 16:11:07 2022 From: ju.o at free.fr (Julien Olivain) Date: Sun, 13 Feb 2022 17:11:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/ola: reintroduce package at version 0.10.8 Message-ID: <20220213161107.3138320-1-ju.o@free.fr> The ola package (Open Lighting Architecture) version 0.10.2 was removed in commit e692e1f2b2285c18057e2c70cc1d9d0cfdb15d5e due to an incompatibility with the protobuf version 3.2.0 present in Buildroot at that time. ola was fixed to support newer protobuf version in: https://github.com/OpenLightingProject/ola/pull/1630 This commit reintroduce this package at version 0.10.8. For changelogs since its removal at 0.10.2, see: - https://github.com/OpenLightingProject/ola/releases/tag/0.10.3 - https://github.com/OpenLightingProject/ola/releases/tag/0.10.4 - https://github.com/OpenLightingProject/ola/releases/tag/0.10.5 - https://github.com/OpenLightingProject/ola/releases/tag/0.10.6 - https://github.com/OpenLightingProject/ola/releases/tag/0.10.7 - https://github.com/OpenLightingProject/ola/releases/tag/0.10.8 This commit is based on the previously removed ola package, with the following rework: - Remove the dependency on BR2_HOST_GCC_AT_LEAST_4_5 as host gcc is now guaranteed to be at least 4.8. - Update target gcc dependency to >= 4.8 to reflect protobuf requirement. - Remove the BR2_PACKAGE_OLA_SLP option, which was removed in ola 0.9.4. - Change the "DMX4Linux" plugin option name to "Open DMX" to better reflect the ola option (DMX4Linux is a legacy plugin for 2.6 Kernels). - Update Python support to version 3.x only - Remove patches, as they are no longer needed - Add options for ola plugins: ftdidmx, gpio, karate, openpixelcontrol, renard, spi, uartdmx, usbdmx - Reorder options alphabetically - Update project URL - Add license hashes Signed-off-by: Julien Olivain --- Package tested with: make check-package [...] 0 warnings generated ./utils/test-pkg -a --package ola [...] 45 builds, 6 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed --- DEVELOPERS | 1 + package/Config.in | 1 + package/ola/Config.in | 171 ++++++++++++++++++++++++++++++++ package/ola/ola.hash | 8 ++ package/ola/ola.mk | 223 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 404 insertions(+) create mode 100644 package/ola/Config.in create mode 100644 package/ola/ola.hash create mode 100644 package/ola/ola.mk diff --git a/DEVELOPERS b/DEVELOPERS index ac702d8d0f..91e9060ac5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1610,6 +1610,7 @@ F: configs/zynq_qmtech_defconfig F: package/fluid-soundfont/ F: package/fluidsynth/ F: package/glslsandbox-player/ +F: package/ola/ F: package/ptm2human/ F: package/python-distro/ F: package/python-gnupg/ diff --git a/package/Config.in b/package/Config.in index 10209d84d7..9a8196efe2 100644 --- a/package/Config.in +++ b/package/Config.in @@ -535,6 +535,7 @@ endmenu source "package/nvidia-modprobe/Config.in" source "package/nvme/Config.in" source "package/ofono/Config.in" + source "package/ola/Config.in" source "package/on2-8170-modules/Config.in" source "package/open2300/Config.in" source "package/openfpgaloader/Config.in" diff --git a/package/ola/Config.in b/package/ola/Config.in new file mode 100644 index 0000000000..36b175138f --- /dev/null +++ b/package/ola/Config.in @@ -0,0 +1,171 @@ +comment "ola needs a toolchain w/ C++, threads, dynamic library, gcc >= 4.8" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ + || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS + +menuconfig BR2_PACKAGE_OLA + bool "ola (open lighting architecture)" + depends on BR2_INSTALL_LIBSTDCPP # protobuf + depends on !BR2_STATIC_LIBS # protobuf + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # protobuf + select BR2_PACKAGE_PROTOBUF + select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_LIBUUID + help + Open Lighting Architecture provides applications + with a mechanism to send and receive DMX512 & RDM + commands using hardware devices and DMX over IP protocols. + + https://www.openlighting.org/ola/ + +if BR2_PACKAGE_OLA + +comment "bindings and interface" + +config BR2_PACKAGE_OLA_WEB + bool "http interface" + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt, libmicrohttpd + select BR2_PACKAGE_LIBMICROHTTPD + help + Build OLA with browser interface. + +config BR2_PACKAGE_OLA_PYTHON_BINDINGS + bool "python bindings" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_PROTOBUF + help + Build OLA with support for the Python language. + +comment "tests and examples" + +config BR2_PACKAGE_OLA_EXAMPLES + bool "examples" + select BR2_PACKAGE_NCURSES + help + Build OLA examples. + +config BR2_PACKAGE_OLA_RDM_TESTS + bool "rdm tests" + depends on BR2_PACKAGE_OLA_PYTHON_BINDINGS + depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS + select BR2_PACKAGE_PYTHON_NUMPY + help + Build OLA RDM tests. + +comment "plugin selections" + +config BR2_PACKAGE_OLA_PLUGIN_ARTNET + bool "artnet" + help + Build Artnet plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_DUMMY + bool "dummy" + help + Build Dummy plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_E131 + bool "acn E131" + help + Build ACN E131 plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_ESPNET + bool "espnet" + help + Build EspNet plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_FTDIDMX + bool "ftdidmx" + select BR2_PACKAGE_LIBFTDI1 + help + Build FTDI USB DMX plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_GPIO + bool "GPIO" + help + Build GPIO plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_KARATE + bool "karate" + help + Build Karate plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_KINET + bool "kinet" + help + Build KiNet plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_MILINT + bool "Milford Instruments" + help + Build Milford Instruments 1-463 plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_OPENDMX + bool "Enttec Open DMX" + help + Build Enttec Open DMX plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_OPENPIXELCONTROL + bool "Open Pixel Control" + help + Build Open Pixel Control (OPC) plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_OSC + bool "osc" + select BR2_PACKAGE_LIBLO + help + Build Open Sound Control (OSC) plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_PATHPORT + bool "pathport" + help + Build Pathport plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_RENARD + bool "renard" + help + Build Renard plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_SANDNET + bool "sandnet" + help + Build SandNet plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_SHOWNET + bool "shownet" + help + Build ShowNet plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_SPI + bool "spi" + help + Build SPI plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_STAGEPROFI + bool "stageprofi" + select BR2_PACKAGE_LIBUSB + help + Build StageProfi plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_UARTDMX + bool "uartdmx" + help + Build UART Native DMX plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_USBDMX + bool "usbdmx" + select BR2_PACKAGE_LIBUSB + help + Build USB DMX plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_USBPRO + bool "usbpro" + select BR2_PACKAGE_LIBUSB + help + Build UsbPro plugin for OLA. + +endif diff --git a/package/ola/ola.hash b/package/ola/ola.hash new file mode 100644 index 0000000000..7565adabde --- /dev/null +++ b/package/ola/ola.hash @@ -0,0 +1,8 @@ +# Locally calculated +sha256 102aa3114562a2a71dbf7f77d2a0fb9fc47acc35d6248a70b6e831365ca71b13 ola-0.10.8.tar.gz + +# License files (locally computed) +sha256 e6b95dd336a57abb343e2988ac22b7e21b35c5b86003e6eb9e066ffbeeff9da7 COPYING +sha256 1480a883c87789075ccdead38b8ad9e2d740d6f7eefaaf183f894b50bebd8a25 GPL +sha256 e6b95dd336a57abb343e2988ac22b7e21b35c5b86003e6eb9e066ffbeeff9da7 LGPL +sha256 685ceaf368d37250f69f2861e91a4cbbab069e81af8bf50adce8a498936e02fc LICENCE diff --git a/package/ola/ola.mk b/package/ola/ola.mk new file mode 100644 index 0000000000..5090076175 --- /dev/null +++ b/package/ola/ola.mk @@ -0,0 +1,223 @@ +################################################################################ +# +# ola +# +################################################################################ + +OLA_VERSION = 0.10.8 +OLA_SITE = https://github.com/OpenLightingProject/ola/releases/download/$(OLA_VERSION) +OLA_LICENSE = LGPL-2.1+ (libola, libolacommon, Python bindings), GPL-2.0+ (libolaserver, olad, Python examples and tests) +OLA_LICENSE_FILES = COPYING GPL LGPL LICENCE +OLA_INSTALL_STAGING = YES +OLA_AUTORECONF = YES + +# util-linux provides uuid lib +OLA_DEPENDENCIES = protobuf util-linux host-bison host-flex host-ola + +OLA_CONF_OPTS = \ + ac_cv_have_pymod_google_protobuf=yes \ + --disable-fatal-warnings \ + --disable-gcov \ + --disable-ja-rule \ + --disable-java-libs \ + --disable-root-check \ + --disable-tcmalloc \ + --disable-unittests \ + --with-ola-protoc-plugin=$(HOST_DIR)/usr/bin/ola_protoc_plugin + +HOST_OLA_DEPENDENCIES = host-util-linux host-protobuf + +# When building the host part, disable as much as possible to speed up +# the configure step and avoid missing host dependencies. +HOST_OLA_CONF_OPTS = \ + --disable-all-plugins \ + --disable-osc \ + --disable-uart \ + --disable-libusb \ + --disable-libftdi \ + --disable-http \ + --disable-examples \ + --disable-unittests \ + --disable-doxygen-html \ + --disable-doxygen-doc \ + --disable-fatal-warnings + +# On the host side, we only need ola_protoc_plugin, so build and install this +# only. +HOST_OLA_MAKE_OPTS = protoc/ola_protoc_plugin +define HOST_OLA_INSTALL_CMDS + $(INSTALL) -D -m 0755 $(@D)/protoc/ola_protoc_plugin $(HOST_DIR)/usr/bin/ola_protoc_plugin +endef + +# sets where to find python libs built for target and required by ola +OLA_CONF_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages +OLA_MAKE_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages + +## OLA Bindings and Interface selections + +ifeq ($(BR2_PACKAGE_OLA_WEB),y) +OLA_CONF_OPTS += --enable-http +OLA_DEPENDENCIES += libmicrohttpd +else +OLA_CONF_OPTS += --disable-http +endif + +ifeq ($(BR2_PACKAGE_OLA_PYTHON_BINDINGS),y) +OLA_CONF_OPTS += --enable-python-libs +OLA_DEPENDENCIES += python3 python-protobuf +else +OLA_CONF_OPTS += --disable-python-libs +endif + +## OLA Examples and Tests + +ifeq ($(BR2_PACKAGE_OLA_EXAMPLES),y) +OLA_CONF_OPTS += --enable-examples +OLA_DEPENDENCIES += ncurses +else +OLA_CONF_OPTS += --disable-examples +endif + +ifeq ($(BR2_PACKAGE_OLA_RDM_TESTS),y) +OLA_CONF_OPTS += --enable-rdm-tests +OLA_DEPENDENCIES += python-numpy +# needed as numpy builds some shared libraries and ola checks for +# numpy using a host python test program which fails with 'wrong ELF +# class'. +OLA_CONF_ENV += ac_cv_have_pymod_numpy=yes +else +OLA_CONF_OPTS += --disable-rdm-tests +endif + +## OLA Plugin selections + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_ARTNET),y) +OLA_CONF_OPTS += --enable-artnet +else +OLA_CONF_OPTS += --disable-artnet +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_DUMMY),y) +OLA_CONF_OPTS += --enable-dummy +else +OLA_CONF_OPTS += --disable-dummy +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_E131),y) +OLA_CONF_OPTS += --enable-e131 +else +OLA_CONF_OPTS += --disable-e131 +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_ESPNET),y) +OLA_CONF_OPTS += --enable-espnet +else +OLA_CONF_OPTS += --disable-espnet +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_FTDIDMX),y) +OLA_CONF_OPTS += --enable-ftdidmx +OLA_DEPENDENCIES += libftdi1 +else +OLA_CONF_OPTS += --disable-ftdidmx +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_GPIO),y) +OLA_CONF_OPTS += --enable-gpio +else +OLA_CONF_OPTS += --disable-gpio +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_KARATE),y) +OLA_CONF_OPTS += --enable-karate +else +OLA_CONF_OPTS += --disable-karate +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_KINET),y) +OLA_CONF_OPTS += --enable-kinet +else +OLA_CONF_OPTS += --disable-kinet +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_MILINT),y) +OLA_CONF_OPTS += --enable-milinst +else +OLA_CONF_OPTS += --disable-milinst +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_OPENDMX),y) +OLA_CONF_OPTS += --enable-opendmx +else +OLA_CONF_OPTS += --disable-opendmx +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_OPENPIXELCONTROL),y) +OLA_CONF_OPTS += --enable-openpixelcontrol +else +OLA_CONF_OPTS += --disable-openpixelcontrol +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_OSC),y) +OLA_CONF_OPTS += --enable-osc +OLA_DEPENDENCIES += liblo +else +OLA_CONF_OPTS += --disable-osc +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_PATHPORT),y) +OLA_CONF_OPTS += --enable-pathport +else +OLA_CONF_OPTS += --disable-pathport +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_RENARD),y) +OLA_CONF_OPTS += --enable-renard +else +OLA_CONF_OPTS += --disable-renard +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_SANDNET),y) +OLA_CONF_OPTS += --enable-sandnet +else +OLA_CONF_OPTS += --disable-sandnet +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_SHOWNET),y) +OLA_CONF_OPTS += --enable-shownet +else +OLA_CONF_OPTS += --disable-shownet +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_SPI),y) +OLA_CONF_OPTS += --enable-spi +else +OLA_CONF_OPTS += --disable-spi +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_STAGEPROFI),y) +OLA_CONF_OPTS += --enable-stageprofi --enable-libusb +else +OLA_CONF_OPTS += --disable-stageprofi +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_UARTDMX),y) +OLA_CONF_OPTS += --enable-uartdmx +else +OLA_CONF_OPTS += --disable-uartdmx +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_USBDMX),y) +OLA_CONF_OPTS += --enable-usbdmx --enable-libusb +else +OLA_CONF_OPTS += --disable-usbdmx +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_USBPRO),y) +OLA_CONF_OPTS += --enable-usbpro --enable-libusb +else +OLA_CONF_OPTS += --disable-usbpro +endif + +$(eval $(autotools-package)) +$(eval $(host-autotools-package)) -- 2.35.1 From giulio.benetti at benettiengineering.com Sun Feb 13 16:36:25 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 13 Feb 2022 17:36:25 +0100 Subject: [Buildroot] [PATCH] package/harfbuzz: bump to version 3.3.2 In-Reply-To: References: Message-ID: <3FAB3345-1BDE-4A7C-9B17-7F3C986D5D40@benettiengineering.com> > Il giorno 13 feb 2022, alle ore 16:33, Arnout Vandecappelle ha scritto: > > ? > >> On 06/02/2022 23:59, Giulio Benetti wrote: >> Signed-off-by: Giulio Benetti > > Applied to master, thanks. > >> --- >> This patch superseeds this: >> https://patchwork.ozlabs.org/project/buildroot/patch/20220131175341.4091688-1-giulio.benetti at benettiengineering.com/ > > If you mark it as superseded yourself, there's no real need to say it here. But you should probably have given it a v2. Ah ok, I didn?t think about it, thank you! Giulio > > Regards, > Arnout > >> --- >> 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..61f2865563 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 1c13bca136c4f66658059853e2c1253f34c88f4b5c5aba6050aba7b5e0ce2503 harfbuzz-3.3.2.tar.xz >> sha256 4345e1735f8bc6d812fed5180cabb5a5e88a4109d332652f2a45c13cfa5ee692 COPYING >> diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk >> index 67eab359c6..1f5dfa8822 100644 >> --- a/package/harfbuzz/harfbuzz.mk >> +++ b/package/harfbuzz/harfbuzz.mk >> @@ -4,7 +4,7 @@ >> # >> ################################################################################ >> -HARFBUZZ_VERSION = 3.2.0 >> +HARFBUZZ_VERSION = 3.3.2 >> HARFBUZZ_SITE = https://github.com/harfbuzz/harfbuzz/releases/download/$(HARFBUZZ_VERSION) >> HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.xz >> HARFBUZZ_LICENSE = MIT, ISC (ucdn library) > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From giulio.benetti at benettiengineering.com Sun Feb 13 16:37:52 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 13 Feb 2022 17:37:52 +0100 Subject: [Buildroot] [PATCH] docs/manual: fix "+size = +" latex formatting In-Reply-To: <54fda3e6-1188-f104-4c6d-f1686df77bcd@mind.be> References: <54fda3e6-1188-f104-4c6d-f1686df77bcd@mind.be> Message-ID: <0C0DD5FD-73D1-4DBB-AE31-4D8DE518D00B@benettiengineering.com> > Il giorno 13 feb 2022, alle ore 16:29, Arnout Vandecappelle ha scritto: > > ? > >> On 06/02/2022 10:54, Giulio Benetti wrote: >> Signed-off-by: Giulio Benetti > > Not sure why you say "latex formatting", but OK. :-) Ascii-doc, I was sure manual was written in latex but it?s not. Thanks Giulio > Applied to master, thanks. > > Regards, > Arnout > >> --- >> docs/manual/writing-rules.txt | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> diff --git a/docs/manual/writing-rules.txt b/docs/manual/writing-rules.txt >> index 3eec095d0e..06f87556ed 100644 >> --- a/docs/manual/writing-rules.txt >> +++ b/docs/manual/writing-rules.txt >> @@ -184,7 +184,7 @@ image sdimage.img { >> * Every node(+section+, +partition+, +file+, +subnode+) must have an open >> curly bracket on the same line of the node's name, while the closing one >> must be on a newline and after it a newline must be added except for the >> - last one node. Same goes for its option, for example option +size = +. >> + last one node. Same goes for its option, for example option +size+ +=+. >> * Every +option+(i.e. +image+, +offset+, +size+) must have the +=+ >> assignment one space from it and one space from the value specified. From arnout at mind.be Sun Feb 13 16:39:44 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 17:39:44 +0100 Subject: [Buildroot] [PATCH v6 4/8] package/qt5/qt5base: enable ccache via configure option In-Reply-To: <20220213150621.GD4462@scaer> References: <20220205201837.3324085-1-james.hilliard1@gmail.com> <20220205201837.3324085-4-james.hilliard1@gmail.com> <20220213150621.GD4462@scaer> Message-ID: On 13/02/2022 16:06, Yann E. MORIN wrote: > James, All, > > +Arnout > > On 2022-02-05 13:18 -0700, James Hilliard spake thusly: >> This should be cleaner than editing mkspecs/common/g++-base.conf. > > Is this actually fixing something? Is ccache as we sue it badly handled > by the qt5webengin buildsystem somehow? > > Thomas, Arnout: IIRC some time ago, there were talks about using the > compiler wrapper also for the host compiler. Maybe this would solve this > kind of situations? Yes it would. However, it would be pretty much the only thing handled by that wrapper, so I don't know if it's worth the bother. If we want to do that, it would probably be better to use the symlink approach for ccache, i.e. create a gcc->ccache symlink in HOST_DIR/bin and set HOSTCC to $(HOST_DIR)/bin/gcc. Regards, Arnout > > Regards, > Yann E. MORIN. > >> Signed-off-by: James Hilliard >> --- >> package/qt5/qt5base/qt5base.mk | 7 +++---- >> 1 file changed, 3 insertions(+), 4 deletions(-) >> >> diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk >> index d8a0bf1d16..4b7a2a937d 100644 >> --- a/package/qt5/qt5base/qt5base.mk >> +++ b/package/qt5/qt5base/qt5base.mk >> @@ -289,10 +289,9 @@ endef >> endif >> >> # This allows to use ccache when available >> -define QT5BASE_CONFIGURE_HOSTCC >> - $(SED) 's,^QMAKE_CC\s*=.*,QMAKE_CC = $(HOSTCC),' $(@D)/mkspecs/common/g++-base.conf >> - $(SED) 's,^QMAKE_CXX\s*=.*,QMAKE_CXX = $(HOSTCXX),' $(@D)/mkspecs/common/g++-base.conf >> -endef >> +ifeq ($(BR2_CCACHE),y) >> +QT5BASE_CONFIGURE_OPTS += -ccache >> +endif >> >> # Must be last so can override all options set by Buildroot >> QT5BASE_CONFIGURE_OPTS += $(call qstrip,$(BR2_PACKAGE_QT5BASE_CUSTOM_CONF_OPTS)) >> -- >> 2.25.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > From arnout at mind.be Sun Feb 13 16:42:55 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 17:42:55 +0100 Subject: [Buildroot] [PATCH 2/2] package/wpa_supplicant: fix mesh configuration build In-Reply-To: <20220213155208.560001-3-geomatsi@gmail.com> References: <20220213155208.560001-1-geomatsi@gmail.com> <20220213155208.560001-3-geomatsi@gmail.com> Message-ID: <5cbbc353-0bd4-6bfd-c18a-d2d29d419dd5@mind.be> On 13/02/2022 16:52, Sergey Matyukevich wrote: > Consider 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 > BR2_PACKAGE_WPA_SUPPLICANT_EAP=y > > This configuration fails to build with the following error: > > /path/to/output/build/wpa_supplicant-2.10/build/wpa_supplicant/src/common/sae.o: in function `hkdf_expand': > sae.c:(.text+0x3c8): undefined reference to `hmac_sha384_kdf' > collect2: error: ld returned 1 exit status > make[1]: *** [Makefile:1894: wpa_supplicant] Error 1 > > Looking into wpa_supplicant Makefile: > - CONFIG_MESH for some reason needs SAE, so it enables CONFIG_SAE > - CONFIG_SAE enables only HMAC_SHA256_KDF > > This is apparently not enough. At least HMAC_SHA384_KDF is required > for successful build. This commit adds a minimal patch for > wpa_supplicant that fixes specified build configuration. > > Reported-by: Yegor Yefremov > Signed-off-by: Sergey Matyukevich > --- > .../0001-mesh-enable-HMAC_SHA384_KDF.patch | 30 +++++++++++++++++++ > 1 file changed, 30 insertions(+) > create mode 100644 package/wpa_supplicant/0001-mesh-enable-HMAC_SHA384_KDF.patch > > diff --git a/package/wpa_supplicant/0001-mesh-enable-HMAC_SHA384_KDF.patch b/package/wpa_supplicant/0001-mesh-enable-HMAC_SHA384_KDF.patch > new file mode 100644 > index 0000000000..d765c1dbbc > --- /dev/null > +++ b/package/wpa_supplicant/0001-mesh-enable-HMAC_SHA384_KDF.patch > @@ -0,0 +1,30 @@ > +From 08986b7da7e580f5deb570aaa654df38fb23397a Mon Sep 17 00:00:00 2001 > +From: Sergey Matyukevich > +Date: Sun, 13 Feb 2022 18:26:23 +0300 > +Subject: [PATCH] mesh: enable HMAC_SHA384_KDF > + > +Mesh support CONFIG_MESH needs SAE, so it enables CONFIG_SAE. > +In its turn, CONFIG_SAE enables only HMAC_SHA256_KDF option. > +This is apparently not enough for successful build. At least > +HMAC_SHA384_KDF is required for successful build. > + You said that this patch was sent to hostapd. If that is true, please add a patchwork link for it, like: Upstream: https://patchwork.ozlabs.org/project/hostap/patch/20220130074139.2972-1-yegorslists at googlemail.com/ However, that patch looks a bit different, so you'll need to explain why. Also, you dropped Yegor as an author, that's not very nice... Regards, Arnout > +Signed-off-by: Sergey Matyukevich > +--- > + wpa_supplicant/Makefile | 1 + > + 1 file changed, 1 insertion(+) > + > +diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile > +index cb66defac..c8e53a3c9 100644 > +--- a/wpa_supplicant/Makefile > ++++ b/wpa_supplicant/Makefile > +@@ -246,6 +246,7 @@ endif > + ifdef CONFIG_MESH > + NEED_80211_COMMON=y > + NEED_AES_SIV=y > ++NEED_HMAC_SHA384_KDF=y > + CONFIG_SAE=y > + CONFIG_AP=y > + CFLAGS += -DCONFIG_MESH > +-- > +2.35.0 > + From yann.morin.1998 at free.fr Sun Feb 13 16:50:01 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 13 Feb 2022 17:50:01 +0100 Subject: [Buildroot] [PATCH v6 6/8] package/qt5/qt5webengine-chromium: new package In-Reply-To: <20220205201837.3324085-6-james.hilliard1@gmail.com> References: <20220205201837.3324085-1-james.hilliard1@gmail.com> <20220205201837.3324085-6-james.hilliard1@gmail.com> Message-ID: <20220213165001.GA38097@scaer> James, All, On 2022-02-05 13:18 -0700, James Hilliard spake thusly: > 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. > > Signed-off-by: James Hilliard > --- > package/qt5/Config.in | 1 + > .../0001-Add-python3-build-support.patch | 1858 +++++++++++++++++ This is a very big patch... The commit you are using here, 0ad2814370799a2161057d92231fe3ee00e2fe98, is on the '87-based' branch, which is supposedly not a recent branch, even if the commit itself is not so old (a bit over two months). However, there are more recent branches that already have python3 support, starting from '90-based' onward. Why can't we use those branches, instead of carrying such a beast of a patch? 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 geomatsi at gmail.com Sun Feb 13 16:56:53 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Sun, 13 Feb 2022 19:56:53 +0300 Subject: [Buildroot] [PATCH 2/2] package/wpa_supplicant: fix mesh configuration build In-Reply-To: <5cbbc353-0bd4-6bfd-c18a-d2d29d419dd5@mind.be> References: <20220213155208.560001-1-geomatsi@gmail.com> <20220213155208.560001-3-geomatsi@gmail.com> <5cbbc353-0bd4-6bfd-c18a-d2d29d419dd5@mind.be> Message-ID: Hi Arnout, > > Consider 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 > > BR2_PACKAGE_WPA_SUPPLICANT_EAP=y > > > > This configuration fails to build with the following error: > > > > /path/to/output/build/wpa_supplicant-2.10/build/wpa_supplicant/src/common/sae.o: in function `hkdf_expand': > > sae.c:(.text+0x3c8): undefined reference to `hmac_sha384_kdf' > > collect2: error: ld returned 1 exit status > > make[1]: *** [Makefile:1894: wpa_supplicant] Error 1 > > > > Looking into wpa_supplicant Makefile: > > - CONFIG_MESH for some reason needs SAE, so it enables CONFIG_SAE > > - CONFIG_SAE enables only HMAC_SHA256_KDF > > > > This is apparently not enough. At least HMAC_SHA384_KDF is required > > for successful build. This commit adds a minimal patch for > > wpa_supplicant that fixes specified build configuration. > > > > Reported-by: Yegor Yefremov > > Signed-off-by: Sergey Matyukevich > > --- > > .../0001-mesh-enable-HMAC_SHA384_KDF.patch | 30 +++++++++++++++++++ > > 1 file changed, 30 insertions(+) > > create mode 100644 package/wpa_supplicant/0001-mesh-enable-HMAC_SHA384_KDF.patch > > > > diff --git a/package/wpa_supplicant/0001-mesh-enable-HMAC_SHA384_KDF.patch b/package/wpa_supplicant/0001-mesh-enable-HMAC_SHA384_KDF.patch > > new file mode 100644 > > index 0000000000..d765c1dbbc > > --- /dev/null > > +++ b/package/wpa_supplicant/0001-mesh-enable-HMAC_SHA384_KDF.patch > > @@ -0,0 +1,30 @@ > > +From 08986b7da7e580f5deb570aaa654df38fb23397a Mon Sep 17 00:00:00 2001 > > +From: Sergey Matyukevich > > +Date: Sun, 13 Feb 2022 18:26:23 +0300 > > +Subject: [PATCH] mesh: enable HMAC_SHA384_KDF > > + > > +Mesh support CONFIG_MESH needs SAE, so it enables CONFIG_SAE. > > +In its turn, CONFIG_SAE enables only HMAC_SHA256_KDF option. > > +This is apparently not enough for successful build. At least > > +HMAC_SHA384_KDF is required for successful build. > > + > > You said that this patch was sent to hostapd. If that is true, please add a > patchwork link for it, like: > > Upstream: https://patchwork.ozlabs.org/project/hostap/patch/20220130074139.2972-1-yegorslists at googlemail.com/ > > > However, that patch looks a bit different, so you'll need to explain why. Suggested solution seems the be slightly simpler. > Also, you dropped Yegor as an author, that's not very nice... I didn't. I sent my version of the fix. Communication on hostapd mailing list usually takes a while. As soon as upstream patch is accepted, we will replace this one with the upstream one keeping appropriate authorship. If you still have some concerns, feel free to drop my second patch. We will ask Yegor to send his version. Original discussion: https://patchwork.ozlabs.org/project/buildroot/patch/20220131194818.2084092-1-geomatsi at gmail.com/ Regards, Sergey From peter at korsgaard.com Sun Feb 13 16:59:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Feb 2022 17:59:09 +0100 Subject: [Buildroot] [PATCH v6 3/8] package/icu: don't disable renaming for host build In-Reply-To: <20220213150051.GB4462@scaer> (Yann E. MORIN's message of "Sun, 13 Feb 2022 16:00:51 +0100") References: <20220205201837.3324085-1-james.hilliard1@gmail.com> <20220205201837.3324085-3-james.hilliard1@gmail.com> <20220213150051.GB4462@scaer> Message-ID: <87iltiln36.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > James, All, > On 2022-02-05 13:18 -0700, James Hilliard spake thusly: >> Using a different renaming option for the icu host build can cause >> issues for packages such as qt5webengine which expect target and >> host packages to be built with the same options. > This little hand-waving is not explaning the actual error that those > packages encounter, nor the root cause for that error. > A package that needs both host and target to have the same options is > most probably doing somethig wrong, like linking a host program and > taking the result as valid for the target... > However, our adding the --disable-renaming in the first place in > 3911e67151b (icu: security bump to version 51.2) did not provide any > explanations why it was needed to begin with. > So it is not much uglier to remove it without further explanations > either. > Yet, a reference to the original commit would be nice, like the little > blurb I wrote above maybe... Committed with the commit message extended, thanks. -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Sun Feb 13 16:59:39 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 13 Feb 2022 17:59:39 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/rygel: gobject-introspection is mandatory In-Reply-To: <9e24e8c1-2b12-59c1-82a9-6ef49557132f@mind.be> References: <20220206095359.854435-1-fontaine.fabrice@gmail.com> <9e24e8c1-2b12-59c1-82a9-6ef49557132f@mind.be> Message-ID: Dear Arnout, Le dim. 13 f?vr. 2022 ? 16:18, Arnout Vandecappelle a ?crit : > > > > On 06/02/2022 10:53, Fabrice Fontaine wrote: > > vapi (and gobject-introspection) is mandatory since bump to version > > 0.40.2 in commit 6acdbb81c8d6cdd3ecb476ae24e72fd4547011c3: > > > > valac -C --pkg posix --pkg libxml-2.0 --pkg gmodule-2.0 --pkg gio-2.0 --pkg gssdp-1.2 --pkg gee-0.8 --pkg gupnp-1.2 --target-glib ' 2.56' --pkg glib-2.0 --color=always --directory src/librygel-core/librygel-core-2.6.so.2.0.4.p --basedir ../src/librygel-core --library rygel-core-2.6 --header src/librygel-core/rygel-core.h --vapi ../rygel-core-2.6.vapi --gir ../Rygel-2.6.gir ../src/librygel-core/rygel-build-config.vapi ../src/librygel-core/rygel-connection-manager.vala ../src/librygel-core/rygel-basic-management.vala ../src/librygel-core/rygel-basic-management-test.vala ../src/librygel-core/rygel-basic-management-test-ping.vala ../src/librygel-core/rygel-basic-management-test-nslookup.vala ../src/librygel-core/rygel-basic-management-test-traceroute.vala ../src/librygel-core/rygel-description-file.vala ../src/librygel-core/rygel-dlna-profile.vala ../src/librygel-core/rygel-energy-management.vala ../src/librygel-core/rygel-root-device.vala ../src/librygel-core/rygel-root-device-factory.v > > ala ../src/librygel-core/rygel-dbus-interface.vala ../src/librygel-core/rygel-log-handler.vala ../src/librygel-core/rygel-meta-config.vala ../src/librygel-core/rygel-plugin-loader.vala ../src/librygel-core/rygel-recursive-module-loader.vala ../src/librygel-core/rygel-plugin.vala ../src/librygel-core/rygel-resource-info.vala ../src/librygel-core/rygel-media-device.vala ../src/librygel-core/rygel-configuration.vala ../src/librygel-core/rygel-base-configuration.vala ../src/librygel-core/rygel-cmdline-config.vala ../src/librygel-core/rygel-environment-config.vala ../src/librygel-core/rygel-user-config.vala ../src/librygel-core/rygel-state-machine.vala ../src/librygel-core/rygel-v1-hacks.vala ../src/librygel-core/rygel-icon-info.vala ../src/librygel-core/rygel-xml-utils.vala ../src/librygel-core/rygel-plugin-information.vala > > error: Package `gssdp-1.2' not found in specified Vala API directories or GObject-Introspection GIR directories > > error: Package `gupnp-1.2' not found in specified Vala API directories or GObject-Introspection GIR directories > > > > Depends on BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES instead of selecting > > it to avoid the following recursive dependency: > > > > package/gstreamer1/gstreamer1/Config.in:5:error: recursive dependency detected! > > package/gstreamer1/gstreamer1/Config.in:5: symbol BR2_PACKAGE_GSTREAMER1 is selected by BR2_PACKAGE_RYGEL_MEDIA_ENGINE_GSTREAMER1 > > package/rygel/Config.in:46: symbol BR2_PACKAGE_RYGEL_MEDIA_ENGINE_GSTREAMER1 is part of choice > > package/rygel/Config.in:39: choice contains symbol > > package/rygel/Config.in:39: choice contains symbol BR2_PACKAGE_RYGEL > > package/rygel/Config.in:1: symbol BR2_PACKAGE_RYGEL depends on BR2_PACKAGE_PYTHON3 > > package/python3/Config.in:5: symbol BR2_PACKAGE_PYTHON3 is selected by BR2_PACKAGE_JACK2_DBUS > > package/jack2/Config.in:35: symbol BR2_PACKAGE_JACK2_DBUS depends on BR2_PACKAGE_JACK2 > > package/jack2/Config.in:1: symbol BR2_PACKAGE_JACK2 is selected by BR2_PACKAGE_FLUIDSYNTH_JACK2 > > package/fluidsynth/Config.in:37: symbol BR2_PACKAGE_FLUIDSYNTH_JACK2 depends on BR2_PACKAGE_FLUIDSYNTH > > package/fluidsynth/Config.in:1: symbol BR2_PACKAGE_FLUIDSYNTH is selected by BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FLUIDSYNTH > > package/gstreamer1/gst1-plugins-bad/Config.in:425: symbol BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FLUIDSYNTH depends on BR2_PACKAGE_GSTREAMER1 > > I think that now python2 has been removed, we can select python3 for > gobject-introspection instead of depending on it, and that that would break this > circular dependency. I tried to work around your suggestion but it seems this adds another circular dependency :-( package/python3/Config.in:5:error: recursive dependency detected! package/python3/Config.in:5: symbol BR2_PACKAGE_PYTHON3 is selected by BR2_PACKAGE_GOBJECT_INTROSPECTION package/gobject-introspection/Config.in:6: symbol BR2_PACKAGE_GOBJECT_INTROSPECTION is selected by BR2_PACKAGE_PYTHON_GOBJECT package/python-gobject/Config.in:1: symbol BR2_PACKAGE_PYTHON_GOBJECT is selected by BR2_PACKAGE_PYTHON_BLUEZERO package/python-bluezero/Config.in:1: symbol BR2_PACKAGE_PYTHON_BLUEZERO depends on BR2_PACKAGE_PYTHON3 > > select python3 would also allow us to remove the python3 dependency from all > transitive dependencies of gobject-introspection. > > Regards, > Arnout > > > > > Fixes: > > - http://autobuild.buildroot.org/results/027ce84895fab6fb251dd37cd5cfb7169287a2de > > > > Signed-off-by: Fabrice Fontaine > > --- > > Changes v1 -> v2: > > - Depends on BR2_PACKAGE_{PYTHON3,GSTREAMER1_EDITING_SERVICES} > > > > package/rygel/Config.in | 23 +++++++++++++++++------ > > package/rygel/rygel.mk | 9 ++------- > > 2 files changed, 19 insertions(+), 13 deletions(-) > > > > diff --git a/package/rygel/Config.in b/package/rygel/Config.in > > index df48918833..30e8430537 100644 > > --- a/package/rygel/Config.in > > +++ b/package/rygel/Config.in > > @@ -2,8 +2,14 @@ config BR2_PACKAGE_RYGEL > > bool "rygel" > > depends on BR2_USE_WCHAR # gupnp-av > > depends on BR2_TOOLCHAIN_HAS_THREADS # gupnp-av > > - depends on BR2_USE_MMU # gupnp-av > > + depends on BR2_USE_MMU # gupnp-av, gobject-introspection > > + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS # gobject-introspection > > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # gobject-introspection > > + depends on BR2_HOST_GCC_AT_LEAST_8 # gobject-introspection -> host-qemu > > + depends on BR2_TOOLCHAIN_USES_GLIBC # gobject-introspection > > + depends on BR2_PACKAGE_PYTHON3 # gobject-introspection > > select BR2_PACKAGE_GDK_PIXBUF > > + select BR2_PACKAGE_GOBJECT_INTROSPECTION > > select BR2_PACKAGE_GUPNP_AV > > select BR2_PACKAGE_GUPNP_DLNA > > select BR2_PACKAGE_LIBGEE > > @@ -39,14 +45,19 @@ config BR2_PACKAGE_RYGEL_MEDIA_ENGINE_SIMPLE > > > > config BR2_PACKAGE_RYGEL_MEDIA_ENGINE_GSTREAMER1 > > bool "gstreamer1" > > - select BR2_PACKAGE_GSTREAMER1 > > - select BR2_PACKAGE_GST1_PLUGINS_BASE > > - select BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES > > + depends on BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES > > + > > +comment "gstreamer1 needs gst1-editing-services" > > + depends on !BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES > > > > endchoice > > > > -comment "rygel needs a toolchain w/ wchar, threads" > > +comment "rygel needs a glibc toolchain w/ wchar, threads, gcc >= 4.9, host gcc >= 8" > > depends on BR2_USE_MMU > > - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS > > + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS > > + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ > > + !BR2_TOOLCHAIN_USES_GLIBC || \ > > + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ > > + !BR2_HOST_GCC_AT_LEAST_8 > > > > endif # BR2_PACKAGE_RYGEL > > diff --git a/package/rygel/rygel.mk b/package/rygel/rygel.mk > > index c541cdc0ed..bfcd5df3c6 100644 > > --- a/package/rygel/rygel.mk > > +++ b/package/rygel/rygel.mk > > @@ -12,6 +12,7 @@ RYGEL_LICENSE = LGPL-2.1+, CC-BY-SA-3.0 (logo) > > RYGEL_LICENSE_FILES = COPYING COPYING.logo > > RYGEL_DEPENDENCIES = \ > > gdk-pixbuf \ > > + gobject-introspection \ > > gupnp-av \ > > gupnp-dlna \ > > libgee \ > > @@ -24,16 +25,10 @@ RYGEL_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) > > RYGEL_CONF_OPTS += \ > > -Dapi-docs=false \ > > -Dexamples=false \ > > + -Dintrospection=enabled \ > > -Dtests=false > > RYGEL_PLUGINS = external,lms,mpris,ruih > > > > -ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) > > -RYGEL_CONF_OPTS += -Dintrospection=enabled > > -RYGEL_DEPENDENCIES += gobject-introspection > > -else > > -RYGEL_CONF_OPTS += -Dintrospection=disabled > > -endif > > - > > ifeq ($(BR2_PACKAGE_RYGEL_MEDIA_ENGINE_GSTREAMER1),y) > > RYGEL_CONF_OPTS += \ > > -Dengines=gstreamer \ Best Regards, Fabrice From peter at korsgaard.com Sun Feb 13 16:57:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Feb 2022 17:57:44 +0100 Subject: [Buildroot] [git commit] package/icu: don't disable renaming for host build Message-ID: <20220213165213.6902282297@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f93039e3a6f0177675a4f775d762d665204714c9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Using a different renaming option for the icu host build can cause issues for packages such as qt5webengine which expect target and host packages to be built with the same options. A package that needs both host and target to have the same options is most probably doing somethig wrong, like linking a host program and taking the result as valid for the target. However, our adding the --disable-renaming in the first place in 3911e67151b (icu: security bump to version 51.2) did not provide any explanations why it was needed to begin with, so drop it. Signed-off-by: James Hilliard Reviewed-by: Yann E. MORIN [Peter: extend commit message as suggested by Yann] Signed-off-by: Peter Korsgaard --- package/icu/icu.mk | 3 +-- package/nodejs/nodejs.mk | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/icu/icu.mk b/package/icu/icu.mk index 7e0c96e43a..ebbb1968fc 100644 --- a/package/icu/icu.mk +++ b/package/icu/icu.mk @@ -45,8 +45,7 @@ HOST_ICU_CONF_OPTS = \ --disable-tests \ --disable-extras \ --disable-icuio \ - --disable-layout \ - --disable-renaming + --disable-layout ICU_SUBDIR = source HOST_ICU_SUBDIR = source diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 727af6dc50..2e41c11dbd 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -94,7 +94,7 @@ NODEJS_HOST_TOOLS_V8 = \ NODEJS_HOST_TOOLS_NODE = mkcodecache NODEJS_HOST_TOOLS = $(NODEJS_HOST_TOOLS_V8) $(NODEJS_HOST_TOOLS_NODE) -HOST_NODEJS_CXXFLAGS = $(HOST_CXXFLAGS) -DU_DISABLE_RENAMING=1 +HOST_NODEJS_CXXFLAGS = $(HOST_CXXFLAGS) define HOST_NODEJS_BUILD_CMDS $(HOST_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python3 \ From fontaine.fabrice at gmail.com Sun Feb 13 19:33:36 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 13 Feb 2022 20:33:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/bpftool: needs headers >= 4.12 Message-ID: <20220213193336.1102940-1-fontaine.fabrice@gmail.com> NETLINK_EXT_ACK is only available since kernel 4.12 and https://github.com/torvalds/linux/commit/2d4bc93368f5a0ddb57c8c885cdad9c9b7a10ed5 resulting in the following build failure since addition of the package in commit 3675131e6c654d7536a184db0184fde7a97040e0: net.c: In function 'netlink_open': net.c:110:36: error: 'NETLINK_EXT_ACK' undeclared (first use in this function); did you mean 'NETLINK_CAP_ACK'? 110 | if (setsockopt(sock, SOL_NETLINK, NETLINK_EXT_ACK, | ^~~~~~~~~~~~~~~ | NETLINK_CAP_ACK Fixes: - http://autobuild.buildroot.org/results/c61678e56bd73609838747048f27068818c21150 Signed-off-by: Fabrice Fontaine --- package/bpftool/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/bpftool/Config.in b/package/bpftool/Config.in index 39475aa962..e81d874343 100644 --- a/package/bpftool/Config.in +++ b/package/bpftool/Config.in @@ -5,14 +5,16 @@ config BR2_PACKAGE_BPFTOOL depends on !BR2_STATIC_LIBS # elfutils depends on BR2_TOOLCHAIN_HAS_THREADS # elfutils depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 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" +comment "bpftool needs a uClibc or glibc toolchain w/ wchar, dynamic library, threads, headers >= 4.12" depends on !BR2_nios2 depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \ || !BR2_TOOLCHAIN_HAS_THREADS \ - || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) + || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) \ + || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 -- 2.34.1 From fontaine.fabrice at gmail.com Sun Feb 13 19:41:31 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 13 Feb 2022 20:41:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-psutil: add host variant Message-ID: <20220213194131.1103482-1-fontaine.fabrice@gmail.com> Add host variant to avoid the following build failure with mongodb since drop of python3-psutil in commit aab7bc4a1d499b3f926464290eee3d6459d0e816: make: *** No rule to make target 'host-python-psutil', needed by '/home/buildroot/autobuild/instance-3/output-1/build/mongodb-4.2.18/.stamp_configured'. Stop. Fixes: - http://autobuild.buildroot.org/results/3bce147b6b34d8854e54fc1102a047fcb2c19d01 Signed-off-by: Fabrice Fontaine --- package/python-psutil/python-psutil.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-psutil/python-psutil.mk b/package/python-psutil/python-psutil.mk index 413fc8a391..3a2781c284 100644 --- a/package/python-psutil/python-psutil.mk +++ b/package/python-psutil/python-psutil.mk @@ -14,3 +14,4 @@ PYTHON_PSUTIL_CPE_ID_VENDOR = psutil_project PYTHON_PSUTIL_CPE_ID_PRODUCT = psutil $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.34.1 From peter at korsgaard.com Sun Feb 13 19:51:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Feb 2022 20:51:19 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-psutil: add host variant In-Reply-To: <20220213194131.1103482-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 13 Feb 2022 20:41:31 +0100") References: <20220213194131.1103482-1-fontaine.fabrice@gmail.com> Message-ID: <87ee46lf48.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Add host variant to avoid the following build failure with mongodb since > drop of python3-psutil in commit > aab7bc4a1d499b3f926464290eee3d6459d0e816: > make: *** No rule to make target 'host-python-psutil', needed by > '/home/buildroot/autobuild/instance-3/output-1/build/mongodb-4.2.18/.stamp_configured'. > Stop. > Fixes: > - http://autobuild.buildroot.org/results/3bce147b6b34d8854e54fc1102a047fcb2c19d01 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 13 19:50:48 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Feb 2022 20:50:48 +0100 Subject: [Buildroot] [git commit] package/python-psutil: add host variant Message-ID: <20220213194421.7F3C082582@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=35e2f68c30515598014a9ef4daf7c8f6134aeb74 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add host variant to avoid the following build failure with mongodb since drop of python3-psutil in commit aab7bc4a1d499b3f926464290eee3d6459d0e816: make: *** No rule to make target 'host-python-psutil', needed by '/home/buildroot/autobuild/instance-3/output-1/build/mongodb-4.2.18/.stamp_configured'. Stop. Fixes: - http://autobuild.buildroot.org/results/3bce147b6b34d8854e54fc1102a047fcb2c19d01 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/python-psutil/python-psutil.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-psutil/python-psutil.mk b/package/python-psutil/python-psutil.mk index 413fc8a391..3a2781c284 100644 --- a/package/python-psutil/python-psutil.mk +++ b/package/python-psutil/python-psutil.mk @@ -14,3 +14,4 @@ PYTHON_PSUTIL_CPE_ID_VENDOR = psutil_project PYTHON_PSUTIL_CPE_ID_PRODUCT = psutil $(eval $(python-package)) +$(eval $(host-python-package)) From peter at korsgaard.com Sun Feb 13 19:50:48 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Feb 2022 20:50:48 +0100 Subject: [Buildroot] [git commit] Update for 2022.02-rc1 Message-ID: <20220213194421.91A7C82A50@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5ee6be2bdc8882eb04b5480b61d3c369c06972b8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard --- CHANGES | 68 ++++++++++++++++++++++++++++++++++++++++++++++ Makefile | 4 +-- docs/website/download.html | 22 +++++++-------- docs/website/news.html | 21 ++++++++++++++ 4 files changed, 102 insertions(+), 13 deletions(-) diff --git a/CHANGES b/CHANGES index 4fa4e12b9f..4cc574d928 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,71 @@ +2022.02-rc1, released February 13th, 2022 + + Numerous package updates and many (80) new packages. + + Toolchain: + - glibc: Optional support for compatibility shims for running + on older kernels than what glibc has been built against + - uClibc: Use uClibc-ng 1.0.40 + - External toolchains: Update Bootlin toolchains to 2021.11-1 + version + + Python 2.7 and python 2.x specific packages removed as python + 2.x is EOL since April 2020. Likewise a number of python3 + specific host packages has been renamed (host-python-foo + instead of host-python3-foo) now host-python is always python + 3.x. + + Cargo (Rust) package infrastructure added. Vendoring support + added to golang package infrastructure. + + New defconfigs: FriendlyARM NanoPi R2S, Kontron BL i.MX8M + Mini, Microchip Sama7g7ek, Olimex STMP157 OlinuXino LIME2, + QEMU PPC Bamboo, PPC64 PowerNV, Raspberry Pi Zero 2W, Spike + Riscv64, Xilinx zcu102 + + Removed defconfigs: Synopsys arch38 VDK, aarch64 VDK + + New packages: ace, alchemy, alfred, bat, bento4, bmx7, + bpftool, brcmfmac_sdio-firmware-rpi, cfm, cups-pk-helper, + davinci-bootcount, dbus-cxx, embiggen-disk, freeipmi, + gocryptfs, kodi-pvr-plutotv, kodi-pvr-waipu, ksmbd-tools, + libcamera-apps, libest, libexecinfo, libfutils, libglvnd, + libks, libmd, libopenaptx, libpeas, libshdata, liburing, lilv, + lua-argon2, lua-cffi, lua-inotify, lv2, mali-driver, + moby-buildkit, modsecurity2, networkd-dispatcher, pahole, + php-apcu, php-lua, php-pam, python-argon2-cffi-bindings, + python-cssselect2, python-distro, python-fonttools, + python-gnupg, python-installer, python-memory-profiler, + python-mpd2, python-pep517, python-pydyf, python-pypa-build, + python-pyphen, python-tinycss2, python-tomli, + python-weasyprint, python-zopfli, qoriq-cadence-dp-firmware, + riscv-isa-sim, rockchip-mali, rpi-rgb-led-matrix, sdbus-cpp, + sentry-cli, serd, simple-mail, sord, sratom, + sunxi-mali-utgard, sunxi-mali-utgard-driver, tinifier, ulog, + vulkan-headers, xlib_libxcvt, zabbix, zchunk, zynaddsubfx + + Removed packages: gstreamer1-mm, python, python-backports-abc, + python-backports-functools-lru-cache, + python-backports-shutil-get-terminal-size, + python-backports-ssl-match-hostname, python-configobj, + python-dialog, python-enum, python-enum34, python-functools32, + python-futures, python-id3, python-ipaddr, python-ipaddress, + python-mad, python-nfc, python-pam, python-pathlib2, + python-pycap, python-pyro, python-singledispatch, + python-subprocess32, python-typing, python-yieldfrom, + qt5webkit-examples, rpi-bt-firmware, rpi-wifi-firmware, + sunxi-mali-mainline, sunxi-mali-mainline-driver, zynq-boot-bin + + Issues resolved (http://bugs.uclibc.org): + + #12271: python-iptables runtime dependencies + #13436: PPP 2.4.9 is out + #14351: needs to mount sysfs before mount -a + #14451: nodejs won't build on Fedora 35 + #14471: alsa_utils wrong deployment + #14501: lttng-modules v2.11 package fails to build + #14531: Package EFL - build error + 2021.11.1, released January 29th, 2022 Important / security related fixes. diff --git a/Makefile b/Makefile index 8a4ec4ef85..a4b7db69a7 100644 --- a/Makefile +++ b/Makefile @@ -92,9 +92,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2022.02-git +export BR2_VERSION := 2022.02-rc1 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1638734000 +BR2_VERSION_EPOCH = 1644782000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/docs/website/download.html b/docs/website/download.html index 2d082062a2..3d98fe48ee 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -75,41 +75,41 @@

PGP signature

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

News

    +
  • +
    +
    +
    +

    2022.02-rc1 released

    +

    13 February 2022

    +
    +
    +

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

    + +

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

    +
    +
    +
  • +
  • From arnout at mind.be Sun Feb 13 19:59:12 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 20:59:12 +0100 Subject: [Buildroot] [git commit] package/rygel: gobject-introspection is mandatory Message-ID: <20220213195207.CFFDE82297@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=115ad9c54874dd14fd53ece9ae4ce6858ad743ad branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master vapi (and gobject-introspection) is mandatory since bump to version 0.40.2 in commit 6acdbb81c8d6cdd3ecb476ae24e72fd4547011c3: valac -C --pkg posix --pkg libxml-2.0 --pkg gmodule-2.0 --pkg gio-2.0 --pkg gssdp-1.2 --pkg gee-0.8 --pkg gupnp-1.2 --target-glib ' 2.56' --pkg glib-2.0 --color=always --directory src/librygel-core/librygel-core-2.6.so.2.0.4.p --basedir ../src/librygel-core --library rygel-core-2.6 --header src/librygel-core/rygel-core.h --vapi ../rygel-core-2.6.vapi --gir ../Rygel-2.6.gir ../src/librygel-core/rygel-build-config.vapi ../src/librygel-core/rygel-connection-manager.vala ../src/librygel-core/rygel-basic-management.vala ../src/librygel-core/rygel-basic-management-test.vala ../src/librygel-core/rygel-basic-management-test-ping.vala ../src/librygel-core/rygel-basic-management-test-nslookup.vala ../src/librygel-core/rygel-basic-management-test-traceroute.vala ../src/librygel-core/rygel-description-file.vala ../src/librygel-core/rygel-dlna-profile.vala ../src/librygel-core/rygel-energy-management.vala ../src/librygel-core/rygel-root-device.vala ../src/librygel-core/rygel-root-device-factory.v ala ../src/librygel-core/rygel-dbus-interface.vala ../src/librygel-core/rygel-log-handler.vala ../src/librygel-core/rygel-meta-config.vala ../src/librygel-core/rygel-plugin-loader.vala ../src/librygel-core/rygel-recursive-module-loader.vala ../src/librygel-core/rygel-plugin.vala ../src/librygel-core/rygel-resource-info.vala ../src/librygel-core/rygel-media-device.vala ../src/librygel-core/rygel-configuration.vala ../src/librygel-core/rygel-base-configuration.vala ../src/librygel-core/rygel-cmdline-config.vala ../src/librygel-core/rygel-environment-config.vala ../src/librygel-core/rygel-user-config.vala ../src/librygel-core/rygel-state-machine.vala ../src/librygel-core/rygel-v1-hacks.vala ../src/librygel-core/rygel-icon-info.vala ../src/librygel-core/rygel-xml-utils.vala ../src/librygel-core/rygel-plugin-information.vala error: Package `gssdp-1.2' not found in specified Vala API directories or GObject-Introspection GIR directories error: Package `gupnp-1.2' not found in specified Vala API directories or GObject-Introspection GIR directories Depends on BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES instead of selecting it to avoid the following recursive dependency: package/gstreamer1/gstreamer1/Config.in:5:error: recursive dependency detected! package/gstreamer1/gstreamer1/Config.in:5: symbol BR2_PACKAGE_GSTREAMER1 is selected by BR2_PACKAGE_RYGEL_MEDIA_ENGINE_GSTREAMER1 package/rygel/Config.in:46: symbol BR2_PACKAGE_RYGEL_MEDIA_ENGINE_GSTREAMER1 is part of choice package/rygel/Config.in:39: choice contains symbol package/rygel/Config.in:39: choice contains symbol BR2_PACKAGE_RYGEL package/rygel/Config.in:1: symbol BR2_PACKAGE_RYGEL depends on BR2_PACKAGE_PYTHON3 package/python3/Config.in:5: symbol BR2_PACKAGE_PYTHON3 is selected by BR2_PACKAGE_JACK2_DBUS package/jack2/Config.in:35: symbol BR2_PACKAGE_JACK2_DBUS depends on BR2_PACKAGE_JACK2 package/jack2/Config.in:1: symbol BR2_PACKAGE_JACK2 is selected by BR2_PACKAGE_FLUIDSYNTH_JACK2 package/fluidsynth/Config.in:37: symbol BR2_PACKAGE_FLUIDSYNTH_JACK2 depends on BR2_PACKAGE_FLUIDSYNTH package/fluidsynth/Config.in:1: symbol BR2_PACKAGE_FLUIDSYNTH is selected by BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FLUIDSYNTH package/gstreamer1/gst1-plugins-bad/Config.in:425: symbol BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FLUIDSYNTH depends on BR2_PACKAGE_GSTREAMER1 Fixes: - http://autobuild.buildroot.org/results/027ce84895fab6fb251dd37cd5cfb7169287a2de Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/rygel/Config.in | 23 +++++++++++++++++------ package/rygel/rygel.mk | 9 ++------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/package/rygel/Config.in b/package/rygel/Config.in index df48918833..30e8430537 100644 --- a/package/rygel/Config.in +++ b/package/rygel/Config.in @@ -2,8 +2,14 @@ config BR2_PACKAGE_RYGEL bool "rygel" depends on BR2_USE_WCHAR # gupnp-av depends on BR2_TOOLCHAIN_HAS_THREADS # gupnp-av - depends on BR2_USE_MMU # gupnp-av + depends on BR2_USE_MMU # gupnp-av, gobject-introspection + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS # gobject-introspection + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # gobject-introspection + depends on BR2_HOST_GCC_AT_LEAST_8 # gobject-introspection -> host-qemu + depends on BR2_TOOLCHAIN_USES_GLIBC # gobject-introspection + depends on BR2_PACKAGE_PYTHON3 # gobject-introspection select BR2_PACKAGE_GDK_PIXBUF + select BR2_PACKAGE_GOBJECT_INTROSPECTION select BR2_PACKAGE_GUPNP_AV select BR2_PACKAGE_GUPNP_DLNA select BR2_PACKAGE_LIBGEE @@ -39,14 +45,19 @@ config BR2_PACKAGE_RYGEL_MEDIA_ENGINE_SIMPLE config BR2_PACKAGE_RYGEL_MEDIA_ENGINE_GSTREAMER1 bool "gstreamer1" - select BR2_PACKAGE_GSTREAMER1 - select BR2_PACKAGE_GST1_PLUGINS_BASE - select BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES + depends on BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES + +comment "gstreamer1 needs gst1-editing-services" + depends on !BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES endchoice -comment "rygel needs a toolchain w/ wchar, threads" +comment "rygel needs a glibc toolchain w/ wchar, threads, gcc >= 4.9, host gcc >= 8" depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_USES_GLIBC || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_HOST_GCC_AT_LEAST_8 endif # BR2_PACKAGE_RYGEL diff --git a/package/rygel/rygel.mk b/package/rygel/rygel.mk index c541cdc0ed..bfcd5df3c6 100644 --- a/package/rygel/rygel.mk +++ b/package/rygel/rygel.mk @@ -12,6 +12,7 @@ RYGEL_LICENSE = LGPL-2.1+, CC-BY-SA-3.0 (logo) RYGEL_LICENSE_FILES = COPYING COPYING.logo RYGEL_DEPENDENCIES = \ gdk-pixbuf \ + gobject-introspection \ gupnp-av \ gupnp-dlna \ libgee \ @@ -24,16 +25,10 @@ RYGEL_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) RYGEL_CONF_OPTS += \ -Dapi-docs=false \ -Dexamples=false \ + -Dintrospection=enabled \ -Dtests=false RYGEL_PLUGINS = external,lms,mpris,ruih -ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) -RYGEL_CONF_OPTS += -Dintrospection=enabled -RYGEL_DEPENDENCIES += gobject-introspection -else -RYGEL_CONF_OPTS += -Dintrospection=disabled -endif - ifeq ($(BR2_PACKAGE_RYGEL_MEDIA_ENGINE_GSTREAMER1),y) RYGEL_CONF_OPTS += \ -Dengines=gstreamer \ From arnout at mind.be Sun Feb 13 19:59:47 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 20:59:47 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/rygel: gobject-introspection is mandatory In-Reply-To: References: <20220206095359.854435-1-fontaine.fabrice@gmail.com> <9e24e8c1-2b12-59c1-82a9-6ef49557132f@mind.be> Message-ID: On 13/02/2022 17:59, Fabrice Fontaine wrote: > Dear Arnout, > > Le dim. 13 f?vr. 2022 ? 16:18, Arnout Vandecappelle a ?crit : >> >> >> >> On 06/02/2022 10:53, Fabrice Fontaine wrote: >>> vapi (and gobject-introspection) is mandatory since bump to version >>> 0.40.2 in commit 6acdbb81c8d6cdd3ecb476ae24e72fd4547011c3: >>> >>> valac -C --pkg posix --pkg libxml-2.0 --pkg gmodule-2.0 --pkg gio-2.0 --pkg gssdp-1.2 --pkg gee-0.8 --pkg gupnp-1.2 --target-glib ' 2.56' --pkg glib-2.0 --color=always --directory src/librygel-core/librygel-core-2.6.so.2.0.4.p --basedir ../src/librygel-core --library rygel-core-2.6 --header src/librygel-core/rygel-core.h --vapi ../rygel-core-2.6.vapi --gir ../Rygel-2.6.gir ../src/librygel-core/rygel-build-config.vapi ../src/librygel-core/rygel-connection-manager.vala ../src/librygel-core/rygel-basic-management.vala ../src/librygel-core/rygel-basic-management-test.vala ../src/librygel-core/rygel-basic-management-test-ping.vala ../src/librygel-core/rygel-basic-management-test-nslookup.vala ../src/librygel-core/rygel-basic-management-test-traceroute.vala ../src/librygel-core/rygel-description-file.vala ../src/librygel-core/rygel-dlna-profile.vala ../src/librygel-core/rygel-energy-management.vala ../src/librygel-core/rygel-root-device.vala ../src/librygel-core/rygel-root-device-factory.v >>> ala ../src/librygel-core/rygel-dbus-interface.vala ../src/librygel-core/rygel-log-handler.vala ../src/librygel-core/rygel-meta-config.vala ../src/librygel-core/rygel-plugin-loader.vala ../src/librygel-core/rygel-recursive-module-loader.vala ../src/librygel-core/rygel-plugin.vala ../src/librygel-core/rygel-resource-info.vala ../src/librygel-core/rygel-media-device.vala ../src/librygel-core/rygel-configuration.vala ../src/librygel-core/rygel-base-configuration.vala ../src/librygel-core/rygel-cmdline-config.vala ../src/librygel-core/rygel-environment-config.vala ../src/librygel-core/rygel-user-config.vala ../src/librygel-core/rygel-state-machine.vala ../src/librygel-core/rygel-v1-hacks.vala ../src/librygel-core/rygel-icon-info.vala ../src/librygel-core/rygel-xml-utils.vala ../src/librygel-core/rygel-plugin-information.vala >>> error: Package `gssdp-1.2' not found in specified Vala API directories or GObject-Introspection GIR directories >>> error: Package `gupnp-1.2' not found in specified Vala API directories or GObject-Introspection GIR directories >>> >>> Depends on BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES instead of selecting >>> it to avoid the following recursive dependency: >>> >>> package/gstreamer1/gstreamer1/Config.in:5:error: recursive dependency detected! >>> package/gstreamer1/gstreamer1/Config.in:5: symbol BR2_PACKAGE_GSTREAMER1 is selected by BR2_PACKAGE_RYGEL_MEDIA_ENGINE_GSTREAMER1 >>> package/rygel/Config.in:46: symbol BR2_PACKAGE_RYGEL_MEDIA_ENGINE_GSTREAMER1 is part of choice >>> package/rygel/Config.in:39: choice contains symbol >>> package/rygel/Config.in:39: choice contains symbol BR2_PACKAGE_RYGEL >>> package/rygel/Config.in:1: symbol BR2_PACKAGE_RYGEL depends on BR2_PACKAGE_PYTHON3 >>> package/python3/Config.in:5: symbol BR2_PACKAGE_PYTHON3 is selected by BR2_PACKAGE_JACK2_DBUS >>> package/jack2/Config.in:35: symbol BR2_PACKAGE_JACK2_DBUS depends on BR2_PACKAGE_JACK2 >>> package/jack2/Config.in:1: symbol BR2_PACKAGE_JACK2 is selected by BR2_PACKAGE_FLUIDSYNTH_JACK2 >>> package/fluidsynth/Config.in:37: symbol BR2_PACKAGE_FLUIDSYNTH_JACK2 depends on BR2_PACKAGE_FLUIDSYNTH >>> package/fluidsynth/Config.in:1: symbol BR2_PACKAGE_FLUIDSYNTH is selected by BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FLUIDSYNTH >>> package/gstreamer1/gst1-plugins-bad/Config.in:425: symbol BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FLUIDSYNTH depends on BR2_PACKAGE_GSTREAMER1 >> >> I think that now python2 has been removed, we can select python3 for >> gobject-introspection instead of depending on it, and that that would break this >> circular dependency. > > I tried to work around your suggestion but it seems this adds another > circular dependency :-( > > package/python3/Config.in:5:error: recursive dependency detected! > package/python3/Config.in:5: symbol BR2_PACKAGE_PYTHON3 is selected > by BR2_PACKAGE_GOBJECT_INTROSPECTION > package/gobject-introspection/Config.in:6: symbol > BR2_PACKAGE_GOBJECT_INTROSPECTION is selected by > BR2_PACKAGE_PYTHON_GOBJECT > package/python-gobject/Config.in:1: symbol > BR2_PACKAGE_PYTHON_GOBJECT is selected by BR2_PACKAGE_PYTHON_BLUEZERO > package/python-bluezero/Config.in:1: symbol > BR2_PACKAGE_PYTHON_BLUEZERO depends on BR2_PACKAGE_PYTHON3 Heh. In that case let's keep it as is. Patch applied to master, thanks. Regards, Arnout > >> >> select python3 would also allow us to remove the python3 dependency from all >> transitive dependencies of gobject-introspection. >> >> Regards, >> Arnout >> >>> >>> Fixes: >>> - http://autobuild.buildroot.org/results/027ce84895fab6fb251dd37cd5cfb7169287a2de >>> >>> Signed-off-by: Fabrice Fontaine >>> --- >>> Changes v1 -> v2: >>> - Depends on BR2_PACKAGE_{PYTHON3,GSTREAMER1_EDITING_SERVICES} >>> >>> package/rygel/Config.in | 23 +++++++++++++++++------ >>> package/rygel/rygel.mk | 9 ++------- >>> 2 files changed, 19 insertions(+), 13 deletions(-) >>> >>> diff --git a/package/rygel/Config.in b/package/rygel/Config.in >>> index df48918833..30e8430537 100644 >>> --- a/package/rygel/Config.in >>> +++ b/package/rygel/Config.in >>> @@ -2,8 +2,14 @@ config BR2_PACKAGE_RYGEL >>> bool "rygel" >>> depends on BR2_USE_WCHAR # gupnp-av >>> depends on BR2_TOOLCHAIN_HAS_THREADS # gupnp-av >>> - depends on BR2_USE_MMU # gupnp-av >>> + depends on BR2_USE_MMU # gupnp-av, gobject-introspection >>> + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS # gobject-introspection >>> + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # gobject-introspection >>> + depends on BR2_HOST_GCC_AT_LEAST_8 # gobject-introspection -> host-qemu >>> + depends on BR2_TOOLCHAIN_USES_GLIBC # gobject-introspection >>> + depends on BR2_PACKAGE_PYTHON3 # gobject-introspection >>> select BR2_PACKAGE_GDK_PIXBUF >>> + select BR2_PACKAGE_GOBJECT_INTROSPECTION >>> select BR2_PACKAGE_GUPNP_AV >>> select BR2_PACKAGE_GUPNP_DLNA >>> select BR2_PACKAGE_LIBGEE >>> @@ -39,14 +45,19 @@ config BR2_PACKAGE_RYGEL_MEDIA_ENGINE_SIMPLE >>> >>> config BR2_PACKAGE_RYGEL_MEDIA_ENGINE_GSTREAMER1 >>> bool "gstreamer1" >>> - select BR2_PACKAGE_GSTREAMER1 >>> - select BR2_PACKAGE_GST1_PLUGINS_BASE >>> - select BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES >>> + depends on BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES >>> + >>> +comment "gstreamer1 needs gst1-editing-services" >>> + depends on !BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES >>> >>> endchoice >>> >>> -comment "rygel needs a toolchain w/ wchar, threads" >>> +comment "rygel needs a glibc toolchain w/ wchar, threads, gcc >= 4.9, host gcc >= 8" >>> depends on BR2_USE_MMU >>> - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS >>> + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS >>> + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ >>> + !BR2_TOOLCHAIN_USES_GLIBC || \ >>> + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ >>> + !BR2_HOST_GCC_AT_LEAST_8 >>> >>> endif # BR2_PACKAGE_RYGEL >>> diff --git a/package/rygel/rygel.mk b/package/rygel/rygel.mk >>> index c541cdc0ed..bfcd5df3c6 100644 >>> --- a/package/rygel/rygel.mk >>> +++ b/package/rygel/rygel.mk >>> @@ -12,6 +12,7 @@ RYGEL_LICENSE = LGPL-2.1+, CC-BY-SA-3.0 (logo) >>> RYGEL_LICENSE_FILES = COPYING COPYING.logo >>> RYGEL_DEPENDENCIES = \ >>> gdk-pixbuf \ >>> + gobject-introspection \ >>> gupnp-av \ >>> gupnp-dlna \ >>> libgee \ >>> @@ -24,16 +25,10 @@ RYGEL_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) >>> RYGEL_CONF_OPTS += \ >>> -Dapi-docs=false \ >>> -Dexamples=false \ >>> + -Dintrospection=enabled \ >>> -Dtests=false >>> RYGEL_PLUGINS = external,lms,mpris,ruih >>> >>> -ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) >>> -RYGEL_CONF_OPTS += -Dintrospection=enabled >>> -RYGEL_DEPENDENCIES += gobject-introspection >>> -else >>> -RYGEL_CONF_OPTS += -Dintrospection=disabled >>> -endif >>> - >>> ifeq ($(BR2_PACKAGE_RYGEL_MEDIA_ENGINE_GSTREAMER1),y) >>> RYGEL_CONF_OPTS += \ >>> -Dengines=gstreamer \ > Best Regards, > > Fabrice From fontaine.fabrice at gmail.com Sun Feb 13 20:24:07 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 13 Feb 2022 21:24:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/mariadb: security bump to version 10.3.34 Message-ID: <20220213202407.1205912-1-fontaine.fabrice@gmail.com> Fix CVE-2021-46665, CVE-2021-46664, CVE-2021-46661, CVE-2021-46668, CVE-2021-46663, CVE-2022-24052, CVE-2022-24051, CVE-2022-24050, CVE-2022-24048, CVE-2021-46659, CVE-2021-35604, CVE-2021-46667, CVE-2021-46662, CVE-2021-2372, CVE-2021-2389 and CVE-2021-46658 Update hash of README.md (changes not related to license: https://github.com/MariaDB/server/commit/773a07b65517327add6348c045cee14bdf489fe0) https://mariadb.com/kb/en/mariadb-10334-release-notes/ https://mariadb.com/kb/en/mariadb-10333-release-notes/ https://mariadb.com/kb/en/mariadb-10332-release-notes/ https://mariadb.com/kb/en/mariadb-10331-release-notes/ Signed-off-by: Fabrice Fontaine --- package/mariadb/mariadb.hash | 7 +++---- package/mariadb/mariadb.mk | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/mariadb/mariadb.hash b/package/mariadb/mariadb.hash index 4025be317f..4da26bdf94 100644 --- a/package/mariadb/mariadb.hash +++ b/package/mariadb/mariadb.hash @@ -1,7 +1,6 @@ -# From https://downloads.mariadb.org/mariadb/10.3.30 -sha256 bd8735c65bdb7ebcd5d779fb9d3de3f2fcd319ad6482278d73dfe7301ad4ae1b mariadb-10.3.30.tar.gz -sha512 742c30b3ebc0b6d36b98d4e7a7fb511098142e72d8f42cbfa73a0bdea2059be17e790fbda4732329bbd99e4b50b13cf18e8122964a473e0b62170ab869eca8fc mariadb-10.3.30.tar.gz +# From https://dlm.mariadb.com/2117287/MariaDB/mariadb-10.3.34/source/sha512sums.txt +sha512 46d4575ec1afb68510652a4bb31ca5ce83a2f5f61048a6e9c1487b0ba58f079465a8b72518d44043cd42c631b19ff50b5498584676ac6473705b138fe3300741 mariadb-10.3.34.tar.gz # Hash for license files -sha256 a4665c1189fe31e0bbc27e9b55439df7dad6e99805407fe58d78da7aabe678f8 README.md +sha256 084aa0007efac6dda6aafffb3f3ef8b66b105862dad7ee23f6a4b52813f84464 README.md sha256 240a15a1d0f34d3abca462cdb7e5fb89470967563f16b0e71169e51c1e74cf2b COPYING diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk index db967ca3ed..4eb9c71827 100644 --- a/package/mariadb/mariadb.mk +++ b/package/mariadb/mariadb.mk @@ -4,8 +4,8 @@ # ################################################################################ -MARIADB_VERSION = 10.3.30 -MARIADB_SITE = https://downloads.mariadb.org/interstitial/mariadb-$(MARIADB_VERSION)/source +MARIADB_VERSION = 10.3.34 +MARIADB_SITE = https://dlm.mariadb.com/2117285/MariaDB/mariadb-$(MARIADB_VERSION)/source MARIADB_LICENSE = GPL-2.0 (server), GPL-2.0 with FLOSS exception (GPL client library), LGPL-2.0 (LGPL client library) # Tarball no longer contains LGPL license text # https://jira.mariadb.org/browse/MDEV-12297 -- 2.34.1 From fontaine.fabrice at gmail.com Sun Feb 13 20:32:19 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 13 Feb 2022 21:32:19 +0100 Subject: [Buildroot] [PATCH 1/1] package/zabbix: add ZABBIX_CPE_ID_VENDOR Message-ID: <20220213203219.1206327-1-fontaine.fabrice@gmail.com> cpe:2.3:a:zabbix:zabbix is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Azabbix%3Azabbix Signed-off-by: Fabrice Fontaine --- package/zabbix/zabbix.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk index e72d831b46..e6564e68fd 100644 --- a/package/zabbix/zabbix.mk +++ b/package/zabbix/zabbix.mk @@ -9,6 +9,7 @@ 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_CPE_ID_VENDOR = zabbix ZABBIX_DEPENDENCIES = pcre ZABBIX_CONF_OPTS = \ -- 2.34.1 From thomas.petazzoni at bootlin.com Sun Feb 13 20:38:09 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 13 Feb 2022 21:38:09 +0100 Subject: [Buildroot] [PATCH 1/2] package/hostapd: update DPP option handling In-Reply-To: <20220213155208.560001-2-geomatsi@gmail.com> References: <20220213155208.560001-1-geomatsi@gmail.com> <20220213155208.560001-2-geomatsi@gmail.com> Message-ID: <20220213213809.361f3ea9@windsurf> On Sun, 13 Feb 2022 18:52:07 +0300 Sergey Matyukevich wrote: > Makefile hostapd.mk defines different macros for different defconfig > options. Options that are not listed in defconfig, can be set using > HOSTAPD_CONFIG_SET. Options that are listed in defconfig, can be > enabled/disabled using HOSTAPD_CONFIG_ENABLE/HOSTAPD_CONFIG_DISABLE. > > Starting from hostapd v2.10, option CONFIG_DPP is explicitly listed > in defconfig. So it is time to switch to enable/disable macros for > this option. This seems fragile. Why don't we have a single way of enabling an option, which doesn't depend on whether the option is listed in the hostapd defconfig or not? Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From fontaine.fabrice at gmail.com Sun Feb 13 20:43:27 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 13 Feb 2022 21:43:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-gnupg: add PYTHON_GNUPG_CPE_ID_VENDOR Message-ID: <20220213204327.1206836-1-fontaine.fabrice@gmail.com> cpe:2.3:a:python:python-gnupg is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Apython%3Apython-gnupg Signed-off-by: Fabrice Fontaine --- package/python-gnupg/python-gnupg.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-gnupg/python-gnupg.mk b/package/python-gnupg/python-gnupg.mk index f16910e517..fda264a0ed 100644 --- a/package/python-gnupg/python-gnupg.mk +++ b/package/python-gnupg/python-gnupg.mk @@ -8,6 +8,7 @@ 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_CPE_ID_VENDOR = python PYTHON_GNUPG_SETUP_TYPE = setuptools $(eval $(python-package)) -- 2.34.1 From thomas.petazzoni at bootlin.com Sun Feb 13 20:43:15 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 13 Feb 2022 21:43:15 +0100 Subject: [Buildroot] [PATCH 2/3] package/binutils: remove 2.35.2 In-Reply-To: References: Message-ID: <20220213214315.015c63b5@windsurf> Hello Waldemar, On Sat, 12 Feb 2022 22:52:57 +0100 Waldemar Brodkorb wrote: > Signed-off-by: Waldemar Brodkorb This patch forgets to remove package/binutils/2.35.2/ Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 13 20:45:01 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 13 Feb 2022 21:45:01 +0100 Subject: [Buildroot] [PATCH 1/2] package/binutils: fixes glibc build compiled with -Os on x86 In-Reply-To: References: Message-ID: <20220213214501.29dbc301@windsurf> On Fri, 11 Feb 2022 19:06:51 +0100 Waldemar Brodkorb wrote: > See here: > https://sourceware.org/bugzilla/show_bug.cgi?id=28870 > > Signed-off-by: Waldemar Brodkorb Is this patch also needed for binutils 2.38 ? Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From peter at korsgaard.com Sun Feb 13 20:51:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Feb 2022 21:51:38 +0100 Subject: [Buildroot] Buildroot 2022.02-rc1 released Message-ID: <87a6eulcbp.fsf@dell.be.48ers.dk> Hi, Buildroot 2022.02-rc1 is released - Go download it at: http://buildroot.net/downloads/buildroot-2022.02-rc1.tar.gz or http://buildroot.net/downloads/buildroot-2022.02-rc1.tar.xz Or get it from Git: git://git.buildroot.net/buildroot Please give it a spin and report any problems to the mailing list or bug tracker. Once more, a busy cycle with close to 1800 changes from 143 unique contributors! Of noteworthy new features/changes we have: - Numerous package updates and many (80) new packages. - Toolchain: - glibc: Optional support for compatibility shims for running on older kernels than what glibc has been built against - uClibc: Use uClibc-ng 1.0.40 - External toolchains: Update Bootlin toolchains to 2021.11-1 version - Python 2.7 and python 2.x specific packages removed as python 2.x is EOL since April 2020. Likewise a number of python3 specific host packages has been renamed (host-python-foo instead of host-python3-foo) now host-python is always python 3.x. - Cargo (Rust) package infrastructure added. Vendoring support added to golang package infrastructure. - New defconfigs: FriendlyARM NanoPi R2S, Kontron BL i.MX8M Mini, Microchip Sama7g7ek, Olimex STMP157 OlinuXino LIME2, QEMU PPC Bamboo, PPC64 PowerNV, Raspberry Pi Zero 2W, Spike Riscv64, Xilinx zcu102 - New packages: ace, alchemy, alfred, bat, bento4, bmx7, bpftool, brcmfmac_sdio-firmware-rpi, cfm, cups-pk-helper, davinci-bootcount, dbus-cxx, embiggen-disk, freeipmi, gocryptfs, kodi-pvr-plutotv, kodi-pvr-waipu, ksmbd-tools, libcamera-apps, libest, libexecinfo, libfutils, libglvnd, libks, libmd, libopenaptx, libpeas, libshdata, liburing, lilv, lua-argon2, lua-cffi, lua-inotify, lv2, mali-driver, moby-buildkit, modsecurity2, networkd-dispatcher, pahole, php-apcu, php-lua, php-pam, python-argon2-cffi-bindings, python-cssselect2, python-distro, python-fonttools, python-gnupg, python-installer, python-memory-profiler, python-mpd2, python-pep517, python-pydyf, python-pypa-build, python-pyphen, python-tinycss2, python-tomli, python-weasyprint, python-zopfli, qoriq-cadence-dp-firmware, riscv-isa-sim, rockchip-mali, rpi-rgb-led-matrix, sdbus-cpp, sentry-cli, serd, simple-mail, sord, sratom, sunxi-mali-utgard, sunxi-mali-utgard-driver, tinifier, ulog, vulkan-headers, xlib_libxcvt, zabbix, zchunk, zynaddsubfx And the usual package version updates and bug fixes. See the CHANGES file for details: http://git.buildroot.net/buildroot/plain/CHANGES?id=2022.02-rc1 Many thanks to the people contributing to this release: git shortlog -s -n 2021.11.. 493 Fabrice Fontaine 178 Peter Korsgaard 177 Bernd Kuhls 127 James Hilliard 102 Peter Seiderer 78 Thomas Petazzoni 65 Giulio Benetti 45 Francois Perrad 32 Romain Naour 28 Arnout Vandecappelle (Essensium/Mind) 27 Yann E. MORIN 23 Norbert Lange 21 Adam Duskett 20 Ricardo Martincoski 18 Fabio Estevam 17 Christian Stewart 15 Joachim Wiberg 12 Julien Olivain 11 Adrian Perez de Castro 11 Dario Binacchi 10 Heiko Thiery 10 Michael Nosthoff 10 Sergey Matyukevich 9 Herve Codina 9 Maxim Kochetkov 8 Angelo Compagnucci 6 C?dric Le Goater 6 Eugen Hristev 6 Thomas Claveirole 6 Thomas De Schampheleire 6 Yegor Yefremov 5 Gilles Talis 5 Gwenhael Goavec-Merou 5 Petr Vorel 4 Alexey Brodkin 4 Andreas Ziegler 4 Baruch Siach 4 Guillaume W. Bres 4 Michael Fischer 4 Sergey Kuzminov 4 Thomas Preston 3 Alexander Egorenkov 3 Jos? Pekkarinen 3 Kory Maincent 3 Lothar Felten 3 Maxime Chevallier 3 Michael Walle 3 Miquel Raynal 3 Patrick Havelange 3 Pedro Aguilar 3 S?bastien Szymanski 3 Thomas Devoogdt 3 Uladzimir Bely 3 Vincent Stehl? 3 Waldemar Brodkorb 3 Yunhao Tian 2 Bartosz Bilas 2 Brandon Maier 2 Cl?ment P?ron 2 Cyril Bur 2 Doug Brown 2 Erik Larsson 2 Francis Laniel 2 Horatiu Vultur 2 Jakub Skrzypnik 2 Jan Kraval 2 Jerry Huang 2 John Keeping 2 Joseph Kogut 2 J?rg Krause 2 Marcus Folkesson 2 Markus Mayer 2 Masahiro Yamada 2 Michael Trimarchi 2 Moritz Bitsch 2 Neal Frager 2 Nuno Gon?alves 2 Pierre-Jean Texier 2 Sergey Bobrenok 2 ???????? ?????? 1 Aleksandr Makarov 1 Alexey Lukyanchuk 1 Andre Renaud 1 Andreas Klinger 1 Andrey Nechypurenko 1 Anssi Hannula 1 Asaf Kahlon 1 Ash Charles 1 Christoph Muellner 1 Clayton Shotwell 1 Colin Foster 1 Dagg Stompler 1 Danilo Bargen 1 David HENG 1 David Pierret 1 Doug Kehn 1 Erwan GAUTRON 1 Esben Haabendal 1 Florent AUMAITRE 1 Florian Fainelli 1 Florian La Roche 1 Florian Larysch 1 Frank Hunleth 1 Frank Vanbever 1 Gleb Mazovetskiy 1 Gregory CLEMENT 1 Grzegorz Blach 1 Howard Mitchell 1 Ignacy Gaw?dzki 1 Ismael Luceno 1 Ivan Maidanski 1 Joe Schultz 1 Joel Stanley 1 Jonathan Borne 1 Juergen Stuber 1 Julien Grossholtz 1 Kamel Bouhara 1 Khoa Hoang 1 Kieran Bingham 1 Kyle Harding 1 Lang Daniel 1 Leonid Yuriev 1 Linus Kaschulla 1 Louis Aussedat 1 Matt Weber 1 Max Filippov 1 Michael Nosthoff 1 Michael Opdenacker 1 Mikael Bourhis-Cloarec 1 Paul Soucy 1 Peter Thompson 1 Pieter De Gendt 1 Quentin Schulz 1 Rainer Jonsson 1 Ramon Fried 1 Robert Hancock 1 Santosh Multhalli 1 TIAN Yuanhao 1 Tilman Keskin?z 1 Vyacheslav Bocharov 1 Xiangyu Chen 1 Zoltan Gyarmati 1 ?????? ????? (Leonid Yuriev) And a special thanks to our patch reviewers: git log 2021.11.. | grep -Ei '(reviewed|acked)-by:' | \ sed 's/.*by: //' | sort | uniq -c | sort -n -r 15 Giulio Benetti 6 Petr Vorel 6 Peter Seiderer 5 Joachim Wiberg 5 Alexey Brodkin 5 Adam Duskett 4 Romain Naour 4 Romain Naour 4 Christophe Priouzeau 3 James Hilliard 3 Adrian Perez de Castro 2 Yegor Yefremov 2 Ricardo Martincoski 2 Paul Cercueil 2 Maxim Kochetkov 2 Luca Ceresoli 2 Heiko Thiery 2 Christian Stewart 2 Alistair Francis 1 Yann E. MORIN 1 Ricardo Martincoski 1 Michael Trimarchi 1 Max Filippov 1 Marcin Niestroj 1 Je?re?my Rosen 1 Dick Olsson 1 Bryce Schober We will now create a next branch and start merging new features for 2022.05 already in parallel with the 2022.02 stabilization. -- Bye, Peter Korsgaard From thomas.petazzoni at bootlin.com Sun Feb 13 21:00:53 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 13 Feb 2022 22:00:53 +0100 Subject: [Buildroot] [PATCH 1/2] package/binutils: fixes glibc build compiled with -Os on x86 In-Reply-To: <20220213214501.29dbc301@windsurf> References: <20220213214501.29dbc301@windsurf> Message-ID: <20220213220053.1a27eaed@windsurf> On Sun, 13 Feb 2022 21:45:01 +0100 Thomas Petazzoni wrote: > On Fri, 11 Feb 2022 19:06:51 +0100 > Waldemar Brodkorb wrote: > > > See here: > > https://sourceware.org/bugzilla/show_bug.cgi?id=28870 > > > > Signed-off-by: Waldemar Brodkorb > > Is this patch also needed for binutils 2.38 ? No it isn't: it's part of binutils 2.38. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From fontaine.fabrice at gmail.com Sun Feb 13 21:05:04 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 13 Feb 2022 22:05:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/cryptsetup: set CRYPTSETUP_AUTORECONF Message-ID: <20220213210504.1416861-1-fontaine.fabrice@gmail.com> Commit 683e8387d05cb506c30592ab43a3e7534d7cf56e forgot to set CRYPTSETUP_AUTORECONF resulting in the following build failure: configure: error: You need the gcrypt library. Fixes: - http://autobuild.buildroot.org/results/f6cead0cf1089bbbe52457d379764a0aa9add408 Signed-off-by: Fabrice Fontaine --- package/cryptsetup/cryptsetup.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index 2e06047c56..55cc70576c 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -17,6 +17,8 @@ CRYPTSETUP_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (library) CRYPTSETUP_LICENSE_FILES = COPYING COPYING.LGPL CRYPTSETUP_CPE_ID_VENDOR = cryptsetup_project CRYPTSETUP_INSTALL_STAGING = YES +# We're patching configure.ac +CRYPTSETUP_AUTORECONF = YES CRYPTSETUP_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)" CRYPTSETUP_CONF_OPTS += --enable-blkid --enable-libargon2 -- 2.34.1 From fontaine.fabrice at gmail.com Sun Feb 13 21:29:09 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 13 Feb 2022 22:29:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/cryptsetup: openssl is the default crypto backend Message-ID: <20220213212909.1504992-1-fontaine.fabrice@gmail.com> openssl is the default crypto backend since version 2.1.0 and https://github.com/mbroz/cryptsetup/commit/bc3d0feb5cd33f9181102b418cc7bf44fe112e82 Signed-off-by: Fabrice Fontaine --- package/cryptsetup/cryptsetup.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index 55cc70576c..b50ac698bb 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -22,15 +22,15 @@ CRYPTSETUP_AUTORECONF = YES CRYPTSETUP_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)" CRYPTSETUP_CONF_OPTS += --enable-blkid --enable-libargon2 -# cryptsetup uses libgcrypt by default, but can be configured to use OpenSSL +# cryptsetup uses OpenSSL by default, but can be configured to use libgcrypt # or kernel crypto modules instead -ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) +ifeq ($(BR2_PACKAGE_OPENSSL),y) +CRYPTSETUP_DEPENDENCIES += openssl +CRYPTSETUP_CONF_OPTS += --with-crypto_backend=openssl +else ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) CRYPTSETUP_DEPENDENCIES += libgcrypt CRYPTSETUP_CONF_ENV += LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config CRYPTSETUP_CONF_OPTS += --with-crypto_backend=gcrypt -else ifeq ($(BR2_PACKAGE_OPENSSL),y) -CRYPTSETUP_DEPENDENCIES += openssl -CRYPTSETUP_CONF_OPTS += --with-crypto_backend=openssl else CRYPTSETUP_CONF_OPTS += --with-crypto_backend=kernel endif -- 2.34.1 From fontaine.fabrice at gmail.com Sun Feb 13 21:34:30 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 13 Feb 2022 22:34:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/opentracing-cpp: bump to version 1.6.0 Message-ID: <20220213213430.1506727-1-fontaine.fabrice@gmail.com> Update indentation in hash file (two spaces) https://github.com/opentracing/opentracing-cpp/releases/tag/v1.6.0 Signed-off-by: Fabrice Fontaine --- package/opentracing-cpp/opentracing-cpp.hash | 4 ++-- package/opentracing-cpp/opentracing-cpp.mk | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/opentracing-cpp/opentracing-cpp.hash b/package/opentracing-cpp/opentracing-cpp.hash index 591c0e4a0a..8cfaf5fd47 100644 --- a/package/opentracing-cpp/opentracing-cpp.hash +++ b/package/opentracing-cpp/opentracing-cpp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 015c4187f7a6426a2b5196f0ccd982aa87f010cf61f507ae3ce5c90523f92301 opentracing-cpp-1.5.1.tar.gz -sha256 076d03156735d5ff2df2ea0f8b12351ef65e5e9222b5c8c6a35101dadb41e717 LICENSE +sha256 5b170042da4d1c4c231df6594da120875429d5231e9baa5179822ee8d1054ac3 opentracing-cpp-1.6.0.tar.gz +sha256 076d03156735d5ff2df2ea0f8b12351ef65e5e9222b5c8c6a35101dadb41e717 LICENSE diff --git a/package/opentracing-cpp/opentracing-cpp.mk b/package/opentracing-cpp/opentracing-cpp.mk index 0605cd5d96..12ce40fbed 100644 --- a/package/opentracing-cpp/opentracing-cpp.mk +++ b/package/opentracing-cpp/opentracing-cpp.mk @@ -4,8 +4,9 @@ # ################################################################################ -OPENTRACING_CPP_VERSION = 1.5.1 -OPENTRACING_CPP_SITE = $(call github,opentracing,opentracing-cpp,v$(OPENTRACING_CPP_VERSION)) +OPENTRACING_CPP_VERSION = 1.6.0 +OPENTRACING_CPP_SITE = \ + $(call github,opentracing,opentracing-cpp,v$(OPENTRACING_CPP_VERSION)) OPENTRACING_CPP_LICENSE = Apache-2.0 OPENTRACING_CPP_LICENSE_FILES = LICENSE -- 2.34.1 From fontaine.fabrice at gmail.com Sun Feb 13 21:51:59 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 13 Feb 2022 22:51:59 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/mutt: bump to version 2.2.0 Message-ID: <20220213215159.1533045-1-fontaine.fabrice@gmail.com> libgsasl is an optional dependency since https://gitlab.com/muttmua/mutt/-/commit/68caf9140c8217ecf6c848460c4b4d27996b2922 http://www.mutt.org/relnotes/2.2/ https://gitlab.com/muttmua/mutt/-/blob/mutt-2-2-rel/ChangeLog Signed-off-by: Fabrice Fontaine --- package/mutt/mutt.hash | 2 +- package/mutt/mutt.mk | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/package/mutt/mutt.hash b/package/mutt/mutt.hash index d439b23aa3..bbc9d459b0 100644 --- a/package/mutt/mutt.hash +++ b/package/mutt/mutt.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 92a309e47e363a97d62425bcb71adceae5ab5c4c413dbcac37fa98ed70c12be0 mutt-2.1.5.tar.gz +sha256 e84597f06d03ca82f8ca3b5ec8bc294c150709b43ed2a0177bf479c3e3345314 mutt-2.2.0.tar.gz sha256 732f24b69a6c71cd8e01e4672bb8e12cc1cbb88a50a4665e6ca4fd95000a57ee GPL diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk index 7e9046fe8a..51178ef03d 100644 --- a/package/mutt/mutt.mk +++ b/package/mutt/mutt.mk @@ -4,7 +4,7 @@ # ################################################################################ -MUTT_VERSION = 2.1.5 +MUTT_VERSION = 2.2.0 MUTT_SITE = https://bitbucket.org/mutt/mutt/downloads MUTT_LICENSE = GPL-2.0+ MUTT_LICENSE_FILES = GPL @@ -53,8 +53,15 @@ else MUTT_CONF_OPTS += --disable-pop endif -# SSL support is only used by imap or pop3 module +# SASL and SSL support are only used by imap or pop3 module ifneq ($(BR2_PACKAGE_MUTT_IMAP)$(BR2_PACKAGE_MUTT_POP3),) +ifeq ($(BR2_PACKAGE_LIBGSASL),y) +MUTT_DEPENDENCIES += libgsasl +MUTT_CONF_OPTS += --with-gsasl +else +MUTT_CONF_OPTS += --without-gsasl +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) MUTT_DEPENDENCIES += openssl MUTT_CONF_OPTS += \ @@ -72,6 +79,7 @@ MUTT_CONF_OPTS += \ endif else MUTT_CONF_OPTS += \ + --without-gsasl \ --without-gnutls \ --without-ssl endif -- 2.34.1 From thomas.petazzoni at bootlin.com Sun Feb 13 22:01:15 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 13 Feb 2022 23:01:15 +0100 Subject: [Buildroot] [PATCH] package/gdb: bump 11.x version to 11.2 Message-ID: <20220213220116.144141-1-thomas.petazzoni@bootlin.com> This is a minor corrective release over GDB 11.1, fixing the following issues: PR sim/28302 (gdb fails to build with glibc 2.34) PR build/28318 (std::thread support configure check does not use CXX_DIALECT) PR gdb/28405 (arm-none-eabi: internal-error: ptid_t remote_target::select_thread_for_ambiguous_stop_reply(const target_waitstatus*): Assertion `first_resumed_thread != nullptr' failed) PR tui/28483 ([gdb/tui] breakpoint creation not displayed) PR build/28555 (uclibc compile failure since commit 4655f8509fd44e6efabefa373650d9982ff37fd6) PR rust/28637 (Rust characters will be encoded using DW_ATE_UTF) PR gdb/28758 (GDB 11 doesn't work correctly on binaries with a SHT_RELR (.relr.dyn) section) PR gdb/28785 (Support SHT_RELR (.relr.dyn) section) Drop patch 0006-sim-filter-out-SIGSTKSZ-PR-sim-28302.patch, which was merged upstream as commit 17d6f2152b583cdc7defafa7813b727a304bac5b. Drop patch 0008-Fix-build-on-rhES5.patch, which was merged upstream as commit df9ebc472a162306dee8ba6e02b99963c2babb7c? Drop patch 0009-gdbserver-aarch64-support.patch, which was merged upstream as commit eb79b2318066cafb75ffdce310e3bbd44f7c79e3. Signed-off-by: Thomas Petazzoni --- ...sim-filter-out-SIGSTKSZ-PR-sim-28302.patch | 110 ------ .../gdb/11.1/0008-Fix-build-on-rhES5.patch | 194 ----------- .../11.1/0010-gdbserver-aarch64-support.patch | 320 ------------------ ...e-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch | 0 ...-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch | 0 .../0003-use-asm-sgidefs.h.patch | 0 .../0004-gdbserver-fix-build-for-m68k.patch | 0 ...fork-inferior-include-linux-ptrace.h.patch | 0 ...etrandom-compile-for-uclibc-v1.0.35.patch} | 0 .../0007-fix-musl-build-on-riscv.patch | 0 ...gdbserver-Makefile.in-fix-NLS-build.patch} | 0 package/gdb/Config.in.host | 2 +- package/gdb/gdb.hash | 2 +- 13 files changed, 2 insertions(+), 626 deletions(-) delete mode 100644 package/gdb/11.1/0006-sim-filter-out-SIGSTKSZ-PR-sim-28302.patch delete mode 100644 package/gdb/11.1/0008-Fix-build-on-rhES5.patch delete mode 100644 package/gdb/11.1/0010-gdbserver-aarch64-support.patch rename package/gdb/{11.1 => 11.2}/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch (100%) rename package/gdb/{11.1 => 11.2}/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch (100%) rename package/gdb/{11.1 => 11.2}/0003-use-asm-sgidefs.h.patch (100%) rename package/gdb/{11.1 => 11.2}/0004-gdbserver-fix-build-for-m68k.patch (100%) rename package/gdb/{11.1 => 11.2}/0005-nat-fork-inferior-include-linux-ptrace.h.patch (100%) rename package/gdb/{11.1/0007-Fix-getrandom-compile-for-uclibc-v1.0.35.patch => 11.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch} (100%) rename package/gdb/{11.1 => 11.2}/0007-fix-musl-build-on-riscv.patch (100%) rename package/gdb/{11.1/0009-gdbserver-Makefile.in-fix-NLS-build.patch => 11.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch} (100%) diff --git a/package/gdb/11.1/0006-sim-filter-out-SIGSTKSZ-PR-sim-28302.patch b/package/gdb/11.1/0006-sim-filter-out-SIGSTKSZ-PR-sim-28302.patch deleted file mode 100644 index d969d98831..0000000000 --- a/package/gdb/11.1/0006-sim-filter-out-SIGSTKSZ-PR-sim-28302.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 7b3df9b8938357c2b0dcf2624e599a76fc4edc02 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Sun, 3 Oct 2021 12:02:53 -0400 -Subject: [PATCH] sim: filter out SIGSTKSZ [PR sim/28302] - -We map target signals to host signals so we can propagate signals -between the host & simulated worlds. That means we need to know -the symbolic names & values of all signals that might be sent. - -The tools that generate that list use signal.h and include all -symbols that start with "SIG" so as to automatically include any -new symbols that the C library might add. Unfortunately, this -also picks up "SIGSTKSZ" which is not actually a signal itself, -but a signal related setting -- it's the size of the stack when -a signal is handled. - -By itself this doesn't super matter as we will never see a signal -with that same value (since the range of valid signals tend to be -way less than 1024, and the size of the default signal stack will -never be that small). But with recent glibc changes that make this -into a dynamic value instead of a compile-time constant, some users -see build failures when building the sim. - -As suggested by Adam Sampson, update our scripts to ignore this -symbol to simplify everything and avoid the build failure. - -Bug: https://sourceware.org/PR28302 - -[Upstream: https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=39d53d04357606a15efd400147fa7369d71baf2c] -Signed-off-by: Peter Seiderer ---- - sim/bfin/linux-targ-map.h | 5 +---- - sim/common/gennltvals.py | 6 ++++-- - sim/common/nltvals.def | 1 - - 3 files changed, 5 insertions(+), 7 deletions(-) - -diff --git a/sim/bfin/linux-targ-map.h b/sim/bfin/linux-targ-map.h -index e9c8c8f..0340ed5 100644 ---- a/sim/bfin/linux-targ-map.h -+++ b/sim/bfin/linux-targ-map.h -@@ -30,6 +30,7 @@ echo - # XXX: nothing uses this ? - echo '#include ' | \ - bfin-uclinux-gcc -E -dD -P - | \ -+grep -v SIGSTKSZ | \ - sed -r -n \ - -e '1istatic CB_TARGET_DEFS_MAP cb_linux_signal_map[] = {' \ - -e '$i\ \ { 0, -1, -1 }\n};' \ -@@ -1987,10 +1988,6 @@ static CB_TARGET_DEFS_MAP cb_linux_signal_map[] = - #ifdef SIG_SETMASK - # define TARGET_LINUX_SIG_SETMASK 2 - { "SIG_SETMASK", SIG_SETMASK, TARGET_LINUX_SIG_SETMASK }, --#endif --#ifdef SIGSTKSZ --# define TARGET_LINUX_SIGSTKSZ 8192 -- { "SIGSTKSZ", SIGSTKSZ, TARGET_LINUX_SIGSTKSZ }, - #endif - { 0, -1, -1 } - }; -diff --git a/sim/common/gennltvals.py b/sim/common/gennltvals.py -index b3e558d..bd4d7e9 100755 ---- a/sim/common/gennltvals.py -+++ b/sim/common/gennltvals.py -@@ -67,6 +67,7 @@ FILE_HEADER = f"""\ - def gentvals(output: TextIO, cpp: str, srctype: str, srcdir: Path, - headers: Iterable[str], - pattern: str, -+ filter: str = r'^$', - target: str = None): - """Extract constants from the specified files using a regular expression. - -@@ -94,12 +95,13 @@ def gentvals(output: TextIO, cpp: str, srctype: str, srcdir: Path, - srcfile = ''.join(f'#include <{x}>\n' for x in headers) - syms = set() - define_pattern = re.compile(r'^#\s*define\s+(' + pattern + ')') -+ filter_pattern = re.compile(filter) - for header in headers: - with open(srcdir / header, 'r', encoding='utf-8') as fp: - data = fp.read() - for line in data.splitlines(): - m = define_pattern.match(line) -- if m: -+ if m and not filter_pattern.search(line): - syms.add(m.group(1)) - for sym in sorted(syms): - srcfile += f'#ifdef {sym}\nDEFVAL {{ "{sym}", {sym} }},\n#endif\n' -@@ -129,7 +131,7 @@ def gen_common(output: TextIO, newlib: Path, cpp: str): - ('errno.h', 'sys/errno.h'), 'E[A-Z0-9]*') - - gentvals(output, cpp, 'signal', newlib / 'newlib/libc/include', -- ('signal.h', 'sys/signal.h'), r'SIG[A-Z0-9]*') -+ ('signal.h', 'sys/signal.h'), r'SIG[A-Z0-9]*', filter=r'SIGSTKSZ') - - gentvals(output, cpp, 'open', newlib / 'newlib/libc/include', - ('fcntl.h', 'sys/fcntl.h', 'sys/_default_fcntl.h'), r'O_[A-Z0-9]*') -diff --git a/sim/common/nltvals.def b/sim/common/nltvals.def -index 8ae8839..8bc6ae5 100644 ---- a/sim/common/nltvals.def -+++ b/sim/common/nltvals.def -@@ -116,7 +116,6 @@ - { "SIGPROF", 27 }, - { "SIGQUIT", 3 }, - { "SIGSEGV", 11 }, -- { "SIGSTKSZ", 8192 }, - { "SIGSTOP", 17 }, - { "SIGSYS", 12 }, - { "SIGTERM", 15 }, --- -2.33.1 - diff --git a/package/gdb/11.1/0008-Fix-build-on-rhES5.patch b/package/gdb/11.1/0008-Fix-build-on-rhES5.patch deleted file mode 100644 index 2d4e30ffe1..0000000000 --- a/package/gdb/11.1/0008-Fix-build-on-rhES5.patch +++ /dev/null @@ -1,194 +0,0 @@ -From db3aaeda1d6b156100d969edb8c0e674bca6b201 Mon Sep 17 00:00:00 2001 -From: Tom Tromey -Date: Wed, 12 May 2021 12:39:22 -0600 -Subject: [PATCH] Fix build on rhES5 - -The rhES5 build failed due to an upstream import a while back. The -bug here is that, while the 'personality' function exists, -ADDR_NO_RANDOMIZE is only defined in , not -. - -However, does not declare the 'personality' -function, and and cannot -both be included. - -This patch restores one of the removed configure checks and updates -the code to check it. - -We had this as a local patch at AdaCore, because it seemed like there -was no interest upstream. However, now it turns out that this fixes -PR build/28555, so I'm sending it now. - -[Upstream: https://sourceware.org/git?p=binutils-gdb.git;h=0b03c6f03d51f441d999e0cee92f81af543d9373] -Signed-off-by: Peter Seiderer ---- - gdb/config.in | 4 ++++ - gdb/configure | 16 ++++++++++++++++ - gdb/nat/linux-personality.c | 4 ++++ - gdbserver/config.in | 4 ++++ - gdbserver/configure | 16 ++++++++++++++++ - gdbsupport/common.m4 | 5 +++++ - gdbsupport/config.in | 4 ++++ - gdbsupport/configure | 16 ++++++++++++++++ - 8 files changed, 69 insertions(+) - -diff --git a/gdb/config.in b/gdb/config.in -index 2c30504..776bee9 100644 ---- a/gdb/config.in -+++ b/gdb/config.in -@@ -96,6 +96,10 @@ - /* define if the compiler supports basic C++11 syntax */ - #undef HAVE_CXX11 - -+/* Define to 1 if you have the declaration of `ADDR_NO_RANDOMIZE', and to 0 if -+ you don't. */ -+#undef HAVE_DECL_ADDR_NO_RANDOMIZE -+ - /* Define to 1 if you have the declaration of `asprintf', and to 0 if you - don't. */ - #undef HAVE_DECL_ASPRINTF -diff --git a/gdb/configure b/gdb/configure -index 5d89635..27e3194 100755 ---- a/gdb/configure -+++ b/gdb/configure -@@ -13838,6 +13838,22 @@ fi - done - - -+ # This is needed for RHEL 5 and uclibc-ng < 1.0.39. -+ # These did not define ADDR_NO_RANDOMIZE in sys/personality.h, -+ # only in linux/personality.h. -+ ac_fn_c_check_decl "$LINENO" "ADDR_NO_RANDOMIZE" "ac_cv_have_decl_ADDR_NO_RANDOMIZE" "#include -+" -+if test "x$ac_cv_have_decl_ADDR_NO_RANDOMIZE" = xyes; then : -+ ac_have_decl=1 -+else -+ ac_have_decl=0 -+fi -+ -+cat >>confdefs.h <<_ACEOF -+#define HAVE_DECL_ADDR_NO_RANDOMIZE $ac_have_decl -+_ACEOF -+ -+ - ac_fn_c_check_decl "$LINENO" "strstr" "ac_cv_have_decl_strstr" "$ac_includes_default" - if test "x$ac_cv_have_decl_strstr" = xyes; then : - ac_have_decl=1 -diff --git a/gdb/nat/linux-personality.c b/gdb/nat/linux-personality.c -index 9ce345b..27999fd 100644 ---- a/gdb/nat/linux-personality.c -+++ b/gdb/nat/linux-personality.c -@@ -22,6 +22,10 @@ - - #include - -+# if !HAVE_DECL_ADDR_NO_RANDOMIZE -+# define ADDR_NO_RANDOMIZE 0x0040000 -+# endif /* ! HAVE_DECL_ADDR_NO_RANDOMIZE */ -+ - /* See comment on nat/linux-personality.h. */ - - maybe_disable_address_space_randomization:: -diff --git a/gdbserver/config.in b/gdbserver/config.in -index cf06c56..c9258b3 100644 ---- a/gdbserver/config.in -+++ b/gdbserver/config.in -@@ -31,6 +31,10 @@ - /* define if the compiler supports basic C++11 syntax */ - #undef HAVE_CXX11 - -+/* Define to 1 if you have the declaration of `ADDR_NO_RANDOMIZE', and to 0 if -+ you don't. */ -+#undef HAVE_DECL_ADDR_NO_RANDOMIZE -+ - /* Define to 1 if you have the declaration of `asprintf', and to 0 if you - don't. */ - #undef HAVE_DECL_ASPRINTF -diff --git a/gdbserver/configure b/gdbserver/configure -index b227167..d399d71 100755 ---- a/gdbserver/configure -+++ b/gdbserver/configure -@@ -7131,6 +7131,22 @@ fi - done - - -+ # This is needed for RHEL 5 and uclibc-ng < 1.0.39. -+ # These did not define ADDR_NO_RANDOMIZE in sys/personality.h, -+ # only in linux/personality.h. -+ ac_fn_c_check_decl "$LINENO" "ADDR_NO_RANDOMIZE" "ac_cv_have_decl_ADDR_NO_RANDOMIZE" "#include -+" -+if test "x$ac_cv_have_decl_ADDR_NO_RANDOMIZE" = xyes; then : -+ ac_have_decl=1 -+else -+ ac_have_decl=0 -+fi -+ -+cat >>confdefs.h <<_ACEOF -+#define HAVE_DECL_ADDR_NO_RANDOMIZE $ac_have_decl -+_ACEOF -+ -+ - ac_fn_c_check_decl "$LINENO" "strstr" "ac_cv_have_decl_strstr" "$ac_includes_default" - if test "x$ac_cv_have_decl_strstr" = xyes; then : - ac_have_decl=1 -diff --git a/gdbsupport/common.m4 b/gdbsupport/common.m4 -index 901c454..56a355e 100644 ---- a/gdbsupport/common.m4 -+++ b/gdbsupport/common.m4 -@@ -55,6 +55,11 @@ AC_DEFUN([GDB_AC_COMMON], [ - ptrace64 sbrk setns sigaltstack sigprocmask \ - setpgid setpgrp getrusage getauxval sigtimedwait]) - -+ # This is needed for RHEL 5 and uclibc-ng < 1.0.39. -+ # These did not define ADDR_NO_RANDOMIZE in sys/personality.h, -+ # only in linux/personality.h. -+ AC_CHECK_DECLS([ADDR_NO_RANDOMIZE],,, [#include ]) -+ - AC_CHECK_DECLS([strstr]) - - # ----------------------- # -diff --git a/gdbsupport/config.in b/gdbsupport/config.in -index f46e261..6945a62 100644 ---- a/gdbsupport/config.in -+++ b/gdbsupport/config.in -@@ -28,6 +28,10 @@ - /* define if the compiler supports basic C++11 syntax */ - #undef HAVE_CXX11 - -+/* Define to 1 if you have the declaration of `ADDR_NO_RANDOMIZE', and to 0 if -+ you don't. */ -+#undef HAVE_DECL_ADDR_NO_RANDOMIZE -+ - /* Define to 1 if you have the declaration of `asprintf', and to 0 if you - don't. */ - #undef HAVE_DECL_ASPRINTF -diff --git a/gdbsupport/configure b/gdbsupport/configure -index a9dd02c..243a03f 100755 ---- a/gdbsupport/configure -+++ b/gdbsupport/configure -@@ -8144,6 +8144,22 @@ fi - done - - -+ # This is needed for RHEL 5 and uclibc-ng < 1.0.39. -+ # These did not define ADDR_NO_RANDOMIZE in sys/personality.h, -+ # only in linux/personality.h. -+ ac_fn_c_check_decl "$LINENO" "ADDR_NO_RANDOMIZE" "ac_cv_have_decl_ADDR_NO_RANDOMIZE" "#include -+" -+if test "x$ac_cv_have_decl_ADDR_NO_RANDOMIZE" = xyes; then : -+ ac_have_decl=1 -+else -+ ac_have_decl=0 -+fi -+ -+cat >>confdefs.h <<_ACEOF -+#define HAVE_DECL_ADDR_NO_RANDOMIZE $ac_have_decl -+_ACEOF -+ -+ - ac_fn_c_check_decl "$LINENO" "strstr" "ac_cv_have_decl_strstr" "$ac_includes_default" - if test "x$ac_cv_have_decl_strstr" = xyes; then : - ac_have_decl=1 --- -2.33.1 - diff --git a/package/gdb/11.1/0010-gdbserver-aarch64-support.patch b/package/gdb/11.1/0010-gdbserver-aarch64-support.patch deleted file mode 100644 index 3718b1b6fd..0000000000 --- a/package/gdb/11.1/0010-gdbserver-aarch64-support.patch +++ /dev/null @@ -1,320 +0,0 @@ -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. - -Backported from: eb79b2318066cafb75ffdce310e3bbd44f7c79e3 -Signed-off-by: Joachim Wiberg ---- - 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 - diff --git a/package/gdb/11.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/package/gdb/11.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch similarity index 100% rename from package/gdb/11.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch rename to package/gdb/11.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch diff --git a/package/gdb/11.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch b/package/gdb/11.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch similarity index 100% rename from package/gdb/11.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch rename to package/gdb/11.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch diff --git a/package/gdb/11.1/0003-use-asm-sgidefs.h.patch b/package/gdb/11.2/0003-use-asm-sgidefs.h.patch similarity index 100% rename from package/gdb/11.1/0003-use-asm-sgidefs.h.patch rename to package/gdb/11.2/0003-use-asm-sgidefs.h.patch diff --git a/package/gdb/11.1/0004-gdbserver-fix-build-for-m68k.patch b/package/gdb/11.2/0004-gdbserver-fix-build-for-m68k.patch similarity index 100% rename from package/gdb/11.1/0004-gdbserver-fix-build-for-m68k.patch rename to package/gdb/11.2/0004-gdbserver-fix-build-for-m68k.patch diff --git a/package/gdb/11.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch b/package/gdb/11.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch similarity index 100% rename from package/gdb/11.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch rename to package/gdb/11.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch diff --git a/package/gdb/11.1/0007-Fix-getrandom-compile-for-uclibc-v1.0.35.patch b/package/gdb/11.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch similarity index 100% rename from package/gdb/11.1/0007-Fix-getrandom-compile-for-uclibc-v1.0.35.patch rename to package/gdb/11.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch diff --git a/package/gdb/11.1/0007-fix-musl-build-on-riscv.patch b/package/gdb/11.2/0007-fix-musl-build-on-riscv.patch similarity index 100% rename from package/gdb/11.1/0007-fix-musl-build-on-riscv.patch rename to package/gdb/11.2/0007-fix-musl-build-on-riscv.patch diff --git a/package/gdb/11.1/0009-gdbserver-Makefile.in-fix-NLS-build.patch b/package/gdb/11.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch similarity index 100% rename from package/gdb/11.1/0009-gdbserver-Makefile.in-fix-NLS-build.patch rename to package/gdb/11.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host index 56999fa9e0..d3dea0b0a7 100644 --- a/package/gdb/Config.in.host +++ b/package/gdb/Config.in.host @@ -71,7 +71,7 @@ config BR2_GDB_VERSION default "4ecb98fbc2f94dbe01b69384afbc515107de73df" if BR2_csky default "9.2" if BR2_GDB_VERSION_9_2 default "10.2" if BR2_GDB_VERSION_10 || !BR2_PACKAGE_HOST_GDB - default "11.1" if BR2_GDB_VERSION_11 + default "11.2" if BR2_GDB_VERSION_11 depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB # recent gdb versions (>= 10) have gdbserver moved at the top-level, diff --git a/package/gdb/gdb.hash b/package/gdb/gdb.hash index d3e83af0b9..e7933374f1 100644 --- a/package/gdb/gdb.hash +++ b/package/gdb/gdb.hash @@ -1,7 +1,7 @@ # From ftp://gcc.gnu.org/pub/gdb/releases/sha512.sum sha512 73635f00f343117aa5e2436f1e1597099e2bfb31ef7bb162b273fa1ea282c3fa9b0f52762e70bfc7ad0334addb8d159e9ac7cbe5998ca4f755ea8cf90714d274 gdb-9.2.tar.xz sha512 3653762ac008e065c37cd641653184c9ff7ce51ee2222ade1122bec9d6cc64dffd4fb74888ef11ac1942064a08910e96b7865112ad37f4602eb0a16bed074caa gdb-10.2.tar.xz -sha512 c40bf970e2f7c2107b29c5aa6a7150daa709d75ddadb73ac20742419d4637d158e3063a4c6ff6e47fae8ca8e1d36253973f85ea15445d004be6d5d7a2dd9bd46 gdb-11.1.tar.xz +sha512 07e9026423438049b11f4f784d57401ece4e940570f613bd6958b3714fe7fbc2c048470bcce3e7d7d9f93331cdf3881d30dcc964cb113a071143a02b28e5b127 gdb-11.2.tar.xz # Locally calculated (fetched from Github) sha512 5a2acf2fd33ab2ff589e1037ca40abda54328997dcff26b2b49b874bd3be980be5a63342962254f3c3bda98e32ce7a33af704d37353352833dee193135600458 gdb-arc-2020.09-release-gdb.tar.gz -- 2.34.1 From giulio.benetti at benettiengineering.com Sun Feb 13 22:24:52 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 13 Feb 2022 23:24:52 +0100 Subject: [Buildroot] [PATCH 01/16] board/aarch64-efi/genimage-efi: convert partition-type-uuid to single letter notation In-Reply-To: References: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> <20220206200532.2758493-2-giulio.benetti@benettiengineering.com> <20220206213657.GA457876@scaer> <20220207085517.5c13c097@windsurf> <20220207173751.GA2249818@scaer> Message-ID: <49133c66-0a53-7607-1c52-5e1ad9e8fc7b@benettiengineering.com> Hi Arnout, Yann, Thomas, All, On 13/02/22 16:06, Arnout Vandecappelle wrote: > > > On 07/02/2022 18:37, Yann E. MORIN wrote: >> Thomas, All, >> >> On 2022-02-07 08:55 +0100, Thomas Petazzoni spake thusly: >>> On Sun, 6 Feb 2022 22:36:57 +0100 >>> "Yann E. MORIN" wrote: >>>>> partition root { >>>>> - partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae >>>>> + partition-type-uuid = L >>>> As we discussed on IRC, this is not the same thing. genimage will extend >>>> the 'L' shorthand to the full UUID 0fc63daf-8483-4772-8e79-3d69d8477de4, >>>> which is different. >>> And? Is that really important? >>>> So I don't think uaing the shorthands are correct. >>> Why? >> >> I think that it is important that we do adhere to the expected values; >> see below... >> >>>> The UUID assignments are available on Wikipedia: >>>> https://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs >>>> But the systemd docuemntation has extra UUID definitions: >>>> https://man.archlinux.org/man/systemd-gpt-auto-generator.8 >>> Yes, but how useful are they? >> >> Why would we diverge from the specs? >> >>> Unless these systemd-defined UUID are really relevant, I would prefer >>> that we use the shortcuts provided by genimage wherever possible, and >>> only rely on using the full UUID for special cases, such as the >>> board/sifive/hifive-unleashed/genimage_sdcard.cfg (PATCH 15/16). >> >> There are tools that expect those values, to autodetect partitions. This >> is the case, of course, of systemd-gpt-auto-generator, which will lookup >> the partition UUIDs, but other tools may expect these UUIDs too. > > At least for systemd-gpt-auto-generator, the UUID for rootfs is only relevant > in case systemd is the one mounting the rootfs, i.e. in case of it running from > initramfs and pivoting into a mounted root. > > That is not a scenario that we support in Buildroot, by a long shot. > Therefore, my suggestion would be to use the default Linux partition type for > the rootfs, i.e. L. Since this is actually the default for genimage, I would > even leave it out completely. > > Giulio, that would mean rewriting this series and removing everywhere L is > specified. Do you agree with that? I'm going to rework and remove L, less code we have the better IMHO. Also, this gives less ambiguity on letters, because we're going to end up only having: F => Fat U => Efi(that recalls UEFI(to me at least) even if it's not the same thing as EFI) > >> I am not saying that we would cause trouble by changing our board >> descriptions, but if we want to allow people to just copy them as the >> base for their own development, then diverging from expected behaviour >> is not nice. > > I think the cases where a non-standard (where "standard" means the actual GPT > standard, not the additional stuff that systemd invented) partition type is > relevant are going to be so unusual that the default we put in our genimage.cfg > is going to be of no relevance whatsoever. Yes, I agree too. At least for the moment I would use the genimage letters and if needed we can modify it later. Thank you all! Best regards -- Giulio Benetti Benetti Engineering sas > Regards, > Arnout > > >> >>> This way, it would be pretty clear that we have the "common cases" (boot >>> partition, rootfs partition) and the "odd/special cases". >> >> I think the "common case" would be "adhere to spec, use specified >> values", while the exceptions are "the spec says nothing, use something >> else and comment it". >> >> Regards, >> Yann E. MORIN. >> > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From giulio.benetti at benettiengineering.com Sun Feb 13 22:35:25 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 13 Feb 2022 23:35:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/cryptsetup: set CRYPTSETUP_AUTORECONF In-Reply-To: <20220213210504.1416861-1-fontaine.fabrice@gmail.com> References: <20220213210504.1416861-1-fontaine.fabrice@gmail.com> Message-ID: Hi Fabrice, thanks again, On 13/02/22 22:05, Fabrice Fontaine wrote: > Commit 683e8387d05cb506c30592ab43a3e7534d7cf56e forgot to set > CRYPTSETUP_AUTORECONF resulting in the following build failure: > > configure: error: You need the gcrypt library. > > Fixes: > - http://autobuild.buildroot.org/results/f6cead0cf1089bbbe52457d379764a0aa9add408 > > Signed-off-by: Fabrice Fontaine Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti Now that my patch for DEVELOPER has been committed I will receive the build failure e-mail. Best regards -- Giulio Benetti Benetti Engineering sas > --- > package/cryptsetup/cryptsetup.mk | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk > index 2e06047c56..55cc70576c 100644 > --- a/package/cryptsetup/cryptsetup.mk > +++ b/package/cryptsetup/cryptsetup.mk > @@ -17,6 +17,8 @@ CRYPTSETUP_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (library) > CRYPTSETUP_LICENSE_FILES = COPYING COPYING.LGPL > CRYPTSETUP_CPE_ID_VENDOR = cryptsetup_project > CRYPTSETUP_INSTALL_STAGING = YES > +# We're patching configure.ac > +CRYPTSETUP_AUTORECONF = YES > CRYPTSETUP_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)" > CRYPTSETUP_CONF_OPTS += --enable-blkid --enable-libargon2 > From giulio.benetti at benettiengineering.com Sun Feb 13 22:44:48 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 13 Feb 2022 23:44:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/cryptsetup: openssl is the default crypto backend In-Reply-To: <20220213212909.1504992-1-fontaine.fabrice@gmail.com> References: <20220213212909.1504992-1-fontaine.fabrice@gmail.com> Message-ID: <4145b9b9-a71a-f763-2211-529cf916b91d@benettiengineering.com> Hi Fabrice, thanks a lot! On 13/02/22 22:29, Fabrice Fontaine wrote: > openssl is the default crypto backend since version 2.1.0 and > https://github.com/mbroz/cryptsetup/commit/bc3d0feb5cd33f9181102b418cc7bf44fe112e82 > > Signed-off-by: Fabrice Fontaine Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti Best regards -- Giulio Benetti Benetti Engineering sas > --- > package/cryptsetup/cryptsetup.mk | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk > index 55cc70576c..b50ac698bb 100644 > --- a/package/cryptsetup/cryptsetup.mk > +++ b/package/cryptsetup/cryptsetup.mk > @@ -22,15 +22,15 @@ CRYPTSETUP_AUTORECONF = YES > CRYPTSETUP_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)" > CRYPTSETUP_CONF_OPTS += --enable-blkid --enable-libargon2 > > -# cryptsetup uses libgcrypt by default, but can be configured to use OpenSSL > +# cryptsetup uses OpenSSL by default, but can be configured to use libgcrypt > # or kernel crypto modules instead > -ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) > +ifeq ($(BR2_PACKAGE_OPENSSL),y) > +CRYPTSETUP_DEPENDENCIES += openssl > +CRYPTSETUP_CONF_OPTS += --with-crypto_backend=openssl > +else ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) > CRYPTSETUP_DEPENDENCIES += libgcrypt > CRYPTSETUP_CONF_ENV += LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config > CRYPTSETUP_CONF_OPTS += --with-crypto_backend=gcrypt > -else ifeq ($(BR2_PACKAGE_OPENSSL),y) > -CRYPTSETUP_DEPENDENCIES += openssl > -CRYPTSETUP_CONF_OPTS += --with-crypto_backend=openssl > else > CRYPTSETUP_CONF_OPTS += --with-crypto_backend=kernel > endif From giulio.benetti at benettiengineering.com Sun Feb 13 22:53:35 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 13 Feb 2022 23:53:35 +0100 Subject: [Buildroot] [PATCH v2 01/16] board/aarch64-efi/genimage-efi: convert partition-type-uuid to single letter notation In-Reply-To: <20220213225350.3466696-1-giulio.benetti@benettiengineering.com> References: <49133c66-0a53-7607-1c52-5e1ad9e8fc7b@benettiengineering.com> <20220213225350.3466696-1-giulio.benetti@benettiengineering.com> Message-ID: <20220213225350.3466696-2-giulio.benetti@benettiengineering.com> Note that rootfs doesn't need partition-type-uuid = L since L(rootfs) is the default value. So let's remove it. Signed-off-by: Giulio Benetti --- board/aarch64-efi/genimage-efi.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/board/aarch64-efi/genimage-efi.cfg b/board/aarch64-efi/genimage-efi.cfg index 87e85816bc..3708727c18 100644 --- a/board/aarch64-efi/genimage-efi.cfg +++ b/board/aarch64-efi/genimage-efi.cfg @@ -18,13 +18,12 @@ image disk.img { partition boot { image = "efi-part.vfat" - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + partition-type-uuid = U offset = 32K bootable = true } partition root { - partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae image = "rootfs.ext2" } } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 13 22:53:34 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 13 Feb 2022 23:53:34 +0100 Subject: [Buildroot] [PATCH v2 00/16] Use single letter notation in genimage.cfg files for partition-type-uuid In-Reply-To: <49133c66-0a53-7607-1c52-5e1ad9e8fc7b@benettiengineering.com> References: <49133c66-0a53-7607-1c52-5e1ad9e8fc7b@benettiengineering.com> Message-ID: <20220213225350.3466696-1-giulio.benetti@benettiengineering.com> This patchset convert partition-type-uuid to single letter notation *without* "" and without L(rootfs) since it's the default value for partition-type-uuid if it's not specified. V1->V2: * remove every partition-type-uuid = L as suggested by Arnout Giulio Benetti (16): board/aarch64-efi/genimage-efi: convert partition-type-uuid to single letter notation board/beaglev/genimage-efi: remove partition-type-uuid since its default value is L(rootfs) board/friendlyarm/nanopc-t4/genimage: convert partition-type-uuid to single letter notation board/friendlyarm/nanopi-m4/genimage: convert partition-type-uuid to single letter notation board/orangepi/orangepi-pc-plus/genimage: keep partition-type-uuid without "" for consistency board/orangepi/orangepi-r1/genimage: fix partition-type-uuid for boot partition and remove "" for consistency board/orangepi/orangepi-zero-plus2/genimage: keep partition-type-uuid without "" for consistency board/pc/genimage-efi: convert partition-type-uuid to single letter notation board/pine64/rockpro64/genimage: convert partition-type-uuid to single letter notation board/qemu/aarch64-sbsa/genimage: convert partition-type-uuid to single letter notation board/radxa/rockpi-n4/genimage: convert partition-type-uuid to single letter notation board/radxa/rockpi-n10/genimage: convert partition-type-uuid to single letter notation board/radxa/rockpi-n8/genimage: convert partition-type-uuid to single letter notation board/sifive/hifive-unleashed/genimage_sdcard: remove partition-type-uuid since its default value is L(rootfs) board/sifive/hifive-unleashed/genimage_sdcard: add comments to particular partition-type-uuid parameters board/sifive/hifive-unleashed/genimage_spi-nor: add comments to particular partition-type-uuid parameters board/aarch64-efi/genimage-efi.cfg | 3 +-- board/beaglev/genimage.cfg | 2 +- board/friendlyarm/nanopc-t4/genimage.cfg | 3 +-- board/friendlyarm/nanopi-m4/genimage.cfg | 3 +-- board/orangepi/orangepi-pc-plus/genimage.cfg | 3 +-- board/orangepi/orangepi-r1/genimage.cfg | 3 +-- board/orangepi/orangepi-zero-plus2/genimage.cfg | 3 +-- board/pc/genimage-efi.cfg | 3 +-- board/pine64/rockpro64/genimage.cfg | 3 +-- board/qemu/aarch64-sbsa/genimage.cfg | 3 +-- board/radxa/rockpi-4/genimage.cfg | 3 +-- board/radxa/rockpi-n10/genimage.cfg | 3 +-- board/radxa/rockpi-n8/genimage.cfg | 4 ++-- board/sifive/hifive-unleashed/genimage_sdcard.cfg | 3 ++- board/sifive/hifive-unleashed/genimage_spi-nor.cfg | 2 ++ 15 files changed, 18 insertions(+), 26 deletions(-) -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 13 22:53:37 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 13 Feb 2022 23:53:37 +0100 Subject: [Buildroot] [PATCH v2 03/16] board/friendlyarm/nanopc-t4/genimage: convert partition-type-uuid to single letter notation In-Reply-To: <20220213225350.3466696-1-giulio.benetti@benettiengineering.com> References: <49133c66-0a53-7607-1c52-5e1ad9e8fc7b@benettiengineering.com> <20220213225350.3466696-1-giulio.benetti@benettiengineering.com> Message-ID: <20220213225350.3466696-4-giulio.benetti@benettiengineering.com> Note that rootfs doesn't need partition-type-uuid = L since L(rootfs) is the default value. So let's remove it. Signed-off-by: Giulio Benetti --- board/friendlyarm/nanopc-t4/genimage.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/board/friendlyarm/nanopc-t4/genimage.cfg b/board/friendlyarm/nanopc-t4/genimage.cfg index 98dc2f3892..f966d48f3f 100644 --- a/board/friendlyarm/nanopc-t4/genimage.cfg +++ b/board/friendlyarm/nanopc-t4/genimage.cfg @@ -26,14 +26,13 @@ image sdcard.img { } partition boot { - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + partition-type-uuid = F bootable = "true" image = "boot.vfat" offset = 16M } partition rootfs { - partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae image = "rootfs.ext4" } } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 13 22:53:38 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 13 Feb 2022 23:53:38 +0100 Subject: [Buildroot] [PATCH v2 04/16] board/friendlyarm/nanopi-m4/genimage: convert partition-type-uuid to single letter notation In-Reply-To: <20220213225350.3466696-1-giulio.benetti@benettiengineering.com> References: <49133c66-0a53-7607-1c52-5e1ad9e8fc7b@benettiengineering.com> <20220213225350.3466696-1-giulio.benetti@benettiengineering.com> Message-ID: <20220213225350.3466696-5-giulio.benetti@benettiengineering.com> Note that rootfs doesn't need partition-type-uuid = L since L(rootfs) is the default value. So let's remove it. Signed-off-by: Giulio Benetti --- board/friendlyarm/nanopi-m4/genimage.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/board/friendlyarm/nanopi-m4/genimage.cfg b/board/friendlyarm/nanopi-m4/genimage.cfg index 8d0e6ad13b..db1205bfbf 100644 --- a/board/friendlyarm/nanopi-m4/genimage.cfg +++ b/board/friendlyarm/nanopi-m4/genimage.cfg @@ -26,14 +26,13 @@ image sdcard.img { } partition boot { - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + partition-type-uuid = F bootable = "true" image = "boot.vfat" offset = 16M } partition rootfs { - partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae image = "rootfs.ext4" } } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 13 22:53:36 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 13 Feb 2022 23:53:36 +0100 Subject: [Buildroot] [PATCH v2 02/16] board/beaglev/genimage-efi: remove partition-type-uuid since its default value is L(rootfs) In-Reply-To: <20220213225350.3466696-1-giulio.benetti@benettiengineering.com> References: <49133c66-0a53-7607-1c52-5e1ad9e8fc7b@benettiengineering.com> <20220213225350.3466696-1-giulio.benetti@benettiengineering.com> Message-ID: <20220213225350.3466696-3-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- board/beaglev/genimage.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/beaglev/genimage.cfg b/board/beaglev/genimage.cfg index deefdbc110..54f9118ea9 100644 --- a/board/beaglev/genimage.cfg +++ b/board/beaglev/genimage.cfg @@ -4,7 +4,7 @@ image sdcard.img { } partition rootfs { - partition-type-uuid = 72ec70a6-cf74-40e6-bd49-4bda08e8f224 + partition-type-uuid = L partition-uuid = 0fef845a-c6e1-45bc-82f7-002fa720f958 bootable = "true" image = "rootfs.ext4" -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 13 22:53:39 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 13 Feb 2022 23:53:39 +0100 Subject: [Buildroot] [PATCH v2 05/16] board/orangepi/orangepi-pc-plus/genimage: keep partition-type-uuid without "" for consistency In-Reply-To: <20220213225350.3466696-1-giulio.benetti@benettiengineering.com> References: <49133c66-0a53-7607-1c52-5e1ad9e8fc7b@benettiengineering.com> <20220213225350.3466696-1-giulio.benetti@benettiengineering.com> Message-ID: <20220213225350.3466696-6-giulio.benetti@benettiengineering.com> Note that rootfs doesn't need partition-type-uuid = L since L(rootfs) is the default value, so let's remove it. Signed-off-by: Giulio Benetti --- board/orangepi/orangepi-pc-plus/genimage.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/board/orangepi/orangepi-pc-plus/genimage.cfg b/board/orangepi/orangepi-pc-plus/genimage.cfg index 3812d785d5..2c68b28e10 100644 --- a/board/orangepi/orangepi-pc-plus/genimage.cfg +++ b/board/orangepi/orangepi-pc-plus/genimage.cfg @@ -28,7 +28,7 @@ image sdcard.img { } partition boot { - partition-type-uuid = "F" + partition-type-uuid = F bootable = "true" image = "boot.vfat" } @@ -36,7 +36,6 @@ image sdcard.img { # 'rootfs' will be used as the partition label, used # with root=PARTLABEL=rootfs kernel command line partition rootfs { - partition-type-uuid = "L" image = "rootfs.ext4" size = 512M } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 13 22:53:44 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 13 Feb 2022 23:53:44 +0100 Subject: [Buildroot] [PATCH v2 10/16] board/qemu/aarch64-sbsa/genimage: convert partition-type-uuid to single letter notation In-Reply-To: <20220213225350.3466696-1-giulio.benetti@benettiengineering.com> References: <49133c66-0a53-7607-1c52-5e1ad9e8fc7b@benettiengineering.com> <20220213225350.3466696-1-giulio.benetti@benettiengineering.com> Message-ID: <20220213225350.3466696-11-giulio.benetti@benettiengineering.com> Note that rootfs doesn't need partition-type-uuid = L since L(rootfs) is the default value. So let's remove it. Signed-off-by: Giulio Benetti --- board/qemu/aarch64-sbsa/genimage.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/board/qemu/aarch64-sbsa/genimage.cfg b/board/qemu/aarch64-sbsa/genimage.cfg index bdf8a89d75..8308b58789 100644 --- a/board/qemu/aarch64-sbsa/genimage.cfg +++ b/board/qemu/aarch64-sbsa/genimage.cfg @@ -19,13 +19,12 @@ image disk.img { partition boot { image = "efi-part.vfat" - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + partition-type-uuid = U offset = 32K bootable = true } partition root { - partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae image = "rootfs.ext2" } } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 13 22:53:46 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 13 Feb 2022 23:53:46 +0100 Subject: [Buildroot] [PATCH v2 12/16] board/radxa/rockpi-n10/genimage: convert partition-type-uuid to single letter notation In-Reply-To: <20220213225350.3466696-1-giulio.benetti@benettiengineering.com> References: <49133c66-0a53-7607-1c52-5e1ad9e8fc7b@benettiengineering.com> <20220213225350.3466696-1-giulio.benetti@benettiengineering.com> Message-ID: <20220213225350.3466696-13-giulio.benetti@benettiengineering.com> Note that rootfs doesn't need partition-type-uuid = L since L(rootfs) is the default value. So let's remove it. Signed-off-by: Giulio Benetti --- board/radxa/rockpi-n10/genimage.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/board/radxa/rockpi-n10/genimage.cfg b/board/radxa/rockpi-n10/genimage.cfg index 7f4b639bbc..cd0e3610c2 100644 --- a/board/radxa/rockpi-n10/genimage.cfg +++ b/board/radxa/rockpi-n10/genimage.cfg @@ -26,14 +26,13 @@ image sdcard.img { } partition boot { - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + partition-type-uuid = F bootable = "true" image = "boot.vfat" offset = 16M } partition rootfs { - partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae image = "rootfs.ext4" } } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 13 22:53:47 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 13 Feb 2022 23:53:47 +0100 Subject: [Buildroot] [PATCH v2 13/16] board/radxa/rockpi-n8/genimage: convert partition-type-uuid to single letter notation In-Reply-To: <20220213225350.3466696-1-giulio.benetti@benettiengineering.com> References: <49133c66-0a53-7607-1c52-5e1ad9e8fc7b@benettiengineering.com> <20220213225350.3466696-1-giulio.benetti@benettiengineering.com> Message-ID: <20220213225350.3466696-14-giulio.benetti@benettiengineering.com> Note that rootfs doesn't need partition-type-uuid = L since L(rootfs) is the default value. So let's remove it. Signed-off-by: Giulio Benetti --- board/radxa/rockpi-n8/genimage.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/radxa/rockpi-n8/genimage.cfg b/board/radxa/rockpi-n8/genimage.cfg index 909a646499..3fced4a5d8 100644 --- a/board/radxa/rockpi-n8/genimage.cfg +++ b/board/radxa/rockpi-n8/genimage.cfg @@ -26,14 +26,14 @@ image sdcard.img { } partition boot { - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + partition-type-uuid = F bootable = "true" image = "boot.vfat" offset = 16M } partition rootfs { - partition-type-uuid = 69dad710-2ce4-4e3c-b16c-21a1d49abed3 + partition-type-uuid = L image = "rootfs.ext4" } } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 13 22:53:40 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 13 Feb 2022 23:53:40 +0100 Subject: [Buildroot] [PATCH v2 06/16] board/orangepi/orangepi-r1/genimage: fix partition-type-uuid for boot partition and remove "" for consistency In-Reply-To: <20220213225350.3466696-1-giulio.benetti@benettiengineering.com> References: <49133c66-0a53-7607-1c52-5e1ad9e8fc7b@benettiengineering.com> <20220213225350.3466696-1-giulio.benetti@benettiengineering.com> Message-ID: <20220213225350.3466696-7-giulio.benetti@benettiengineering.com> Note that rootfs doesn't need partition-type-uuid = L since L(rootfs) is the default value. So let's remove it. Signed-off-by: Giulio Benetti --- board/orangepi/orangepi-r1/genimage.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/board/orangepi/orangepi-r1/genimage.cfg b/board/orangepi/orangepi-r1/genimage.cfg index e93e802bd9..da96e4c4b8 100644 --- a/board/orangepi/orangepi-r1/genimage.cfg +++ b/board/orangepi/orangepi-r1/genimage.cfg @@ -28,7 +28,7 @@ image sdcard.img { } partition boot { - partition-type-uuid = "U" + partition-type-uuid = F bootable = "true" image = "boot.vfat" } @@ -36,7 +36,6 @@ image sdcard.img { # 'rootfs' will be used as the partition label, used # with root=PARTLABEL=rootfs kernel command line partition rootfs { - partition-type-uuid = "L" image = "rootfs.ext4" size = 512M } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 13 22:53:41 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 13 Feb 2022 23:53:41 +0100 Subject: [Buildroot] [PATCH v2 07/16] board/orangepi/orangepi-zero-plus2/genimage: keep partition-type-uuid without "" for consistency In-Reply-To: <20220213225350.3466696-1-giulio.benetti@benettiengineering.com> References: <49133c66-0a53-7607-1c52-5e1ad9e8fc7b@benettiengineering.com> <20220213225350.3466696-1-giulio.benetti@benettiengineering.com> Message-ID: <20220213225350.3466696-8-giulio.benetti@benettiengineering.com> Note that rootfs doesn't need partition-type-uuid = L since L(rootfs) is the default value. So let's remove it. Signed-off-by: Giulio Benetti --- board/orangepi/orangepi-zero-plus2/genimage.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/board/orangepi/orangepi-zero-plus2/genimage.cfg b/board/orangepi/orangepi-zero-plus2/genimage.cfg index 5a7ee7707a..0a03384f30 100644 --- a/board/orangepi/orangepi-zero-plus2/genimage.cfg +++ b/board/orangepi/orangepi-zero-plus2/genimage.cfg @@ -26,7 +26,7 @@ image sdcard.img { } partition boot { - partition-type-uuid = "F" + partition-type-uuid = F bootable = "true" image = "boot.vfat" } @@ -34,7 +34,6 @@ image sdcard.img { # 'rootfs' will be used as the partition label, used # with root=PARTLABEL=rootfs kernel command line partition rootfs { - partition-type-uuid = "L" image = "rootfs.ext4" size = 256M } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 13 22:53:42 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 13 Feb 2022 23:53:42 +0100 Subject: [Buildroot] [PATCH v2 08/16] board/pc/genimage-efi: convert partition-type-uuid to single letter notation In-Reply-To: <20220213225350.3466696-1-giulio.benetti@benettiengineering.com> References: <49133c66-0a53-7607-1c52-5e1ad9e8fc7b@benettiengineering.com> <20220213225350.3466696-1-giulio.benetti@benettiengineering.com> Message-ID: <20220213225350.3466696-9-giulio.benetti@benettiengineering.com> Note that rootfs doesn't need partition-type-uuid = L since L(rootfs) is the default value. So let's remove it. Signed-off-by: Giulio Benetti --- board/pc/genimage-efi.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/board/pc/genimage-efi.cfg b/board/pc/genimage-efi.cfg index 035a077a78..68498772a1 100644 --- a/board/pc/genimage-efi.cfg +++ b/board/pc/genimage-efi.cfg @@ -19,13 +19,12 @@ image disk.img { partition boot { image = "efi-part.vfat" - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + partition-type-uuid = U offset = 32K bootable = true } partition root { - partition-type-uuid = 44479540-f297-41b2-9af7-d131d5f0458a partition-uuid = UUID_TMP image = "rootfs.ext2" } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 13 22:53:43 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 13 Feb 2022 23:53:43 +0100 Subject: [Buildroot] [PATCH v2 09/16] board/pine64/rockpro64/genimage: convert partition-type-uuid to single letter notation In-Reply-To: <20220213225350.3466696-1-giulio.benetti@benettiengineering.com> References: <49133c66-0a53-7607-1c52-5e1ad9e8fc7b@benettiengineering.com> <20220213225350.3466696-1-giulio.benetti@benettiengineering.com> Message-ID: <20220213225350.3466696-10-giulio.benetti@benettiengineering.com> Note that rootfs doesn't need partition-type-uuid = L since L(rootfs) is the default value. So let's remove it. Signed-off-by: Giulio Benetti --- board/pine64/rockpro64/genimage.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/board/pine64/rockpro64/genimage.cfg b/board/pine64/rockpro64/genimage.cfg index d3926f2df6..978a77de95 100644 --- a/board/pine64/rockpro64/genimage.cfg +++ b/board/pine64/rockpro64/genimage.cfg @@ -26,14 +26,13 @@ image sdcard.img { } partition boot { - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + partition-type-uuid = F bootable = "true" image = "boot.vfat" offset = 16M } partition rootfs { - partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae image = "rootfs.ext4" } } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 13 22:53:45 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 13 Feb 2022 23:53:45 +0100 Subject: [Buildroot] [PATCH v2 11/16] board/radxa/rockpi-n4/genimage: convert partition-type-uuid to single letter notation In-Reply-To: <20220213225350.3466696-1-giulio.benetti@benettiengineering.com> References: <49133c66-0a53-7607-1c52-5e1ad9e8fc7b@benettiengineering.com> <20220213225350.3466696-1-giulio.benetti@benettiengineering.com> Message-ID: <20220213225350.3466696-12-giulio.benetti@benettiengineering.com> Note that rootfs doesn't need partition-type-uuid = L since L(rootfs) is the default value. So let's remove it. Signed-off-by: Giulio Benetti --- board/radxa/rockpi-4/genimage.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/board/radxa/rockpi-4/genimage.cfg b/board/radxa/rockpi-4/genimage.cfg index 68cc4d61a8..07bee5bf81 100644 --- a/board/radxa/rockpi-4/genimage.cfg +++ b/board/radxa/rockpi-4/genimage.cfg @@ -26,14 +26,13 @@ image sdcard.img { } partition boot { - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + partition-type-uuid = F bootable = "true" image = "boot.vfat" offset = 16M } partition rootfs { - partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae image = "rootfs.ext4" } } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 13 22:54:21 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 13 Feb 2022 23:54:21 +0100 Subject: [Buildroot] [PATCH v2 14/16] board/sifive/hifive-unleashed/genimage_sdcard: remove partition-type-uuid since its default value is L(rootfs) In-Reply-To: <49133c66-0a53-7607-1c52-5e1ad9e8fc7b@benettiengineering.com> References: <49133c66-0a53-7607-1c52-5e1ad9e8fc7b@benettiengineering.com> Message-ID: <20220213225423.3466840-1-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- board/sifive/hifive-unleashed/genimage_sdcard.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/board/sifive/hifive-unleashed/genimage_sdcard.cfg b/board/sifive/hifive-unleashed/genimage_sdcard.cfg index e66f221d73..1e0c800153 100644 --- a/board/sifive/hifive-unleashed/genimage_sdcard.cfg +++ b/board/sifive/hifive-unleashed/genimage_sdcard.cfg @@ -17,7 +17,6 @@ image sdcard.img { partition rootfs { image = "rootfs.ext4" - partition-type-uuid = 0FC63DAF-8483-4772-8E79-3D69D8477DE4 bootable = true } } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 13 22:54:22 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 13 Feb 2022 23:54:22 +0100 Subject: [Buildroot] [PATCH v2 15/16] board/sifive/hifive-unleashed/genimage_sdcard: add comments to particular partition-type-uuid parameters In-Reply-To: <20220213225423.3466840-1-giulio.benetti@benettiengineering.com> References: <49133c66-0a53-7607-1c52-5e1ad9e8fc7b@benettiengineering.com> <20220213225423.3466840-1-giulio.benetti@benettiengineering.com> Message-ID: <20220213225423.3466840-2-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- board/sifive/hifive-unleashed/genimage_sdcard.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/board/sifive/hifive-unleashed/genimage_sdcard.cfg b/board/sifive/hifive-unleashed/genimage_sdcard.cfg index 1e0c800153..e5618fa4c1 100644 --- a/board/sifive/hifive-unleashed/genimage_sdcard.cfg +++ b/board/sifive/hifive-unleashed/genimage_sdcard.cfg @@ -6,12 +6,14 @@ image sdcard.img { partition u-boot-spl { image = "u-boot-spl.bin" offset = 17K + # ZSBL only loads from this type of partition type uuid partition-type-uuid = 5B193300-FC78-40CD-8002-E86C45580B47 } partition u-boot { image = "u-boot.itb" offset = 1041K + # U-Boot expects exactly this partition type uuid partition-type-uuid = 2E54B353-1271-4842-806F-E436D6AF6985 } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 13 22:54:23 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 13 Feb 2022 23:54:23 +0100 Subject: [Buildroot] [PATCH v2 16/16] board/sifive/hifive-unleashed/genimage_spi-nor: add comments to particular partition-type-uuid parameters In-Reply-To: <20220213225423.3466840-1-giulio.benetti@benettiengineering.com> References: <49133c66-0a53-7607-1c52-5e1ad9e8fc7b@benettiengineering.com> <20220213225423.3466840-1-giulio.benetti@benettiengineering.com> Message-ID: <20220213225423.3466840-3-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- board/sifive/hifive-unleashed/genimage_spi-nor.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/board/sifive/hifive-unleashed/genimage_spi-nor.cfg b/board/sifive/hifive-unleashed/genimage_spi-nor.cfg index 903e675a90..f5e8f188e3 100644 --- a/board/sifive/hifive-unleashed/genimage_spi-nor.cfg +++ b/board/sifive/hifive-unleashed/genimage_spi-nor.cfg @@ -8,12 +8,14 @@ image spi-nor.img { partition u-boot-spl { image = "u-boot-spl.bin" offset = 20K + # ZSBL only loads from this type of partition type uuid partition-type-uuid = 5B193300-FC78-40CD-8002-E86C45580B47 } partition u-boot { image = "u-boot.itb" offset = 1044K + # U-Boot expects exactly this partition type uuid partition-type-uuid = 2E54B353-1271-4842-806F-E436D6AF6985 } } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 13 23:35:44 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 14 Feb 2022 00:35:44 +0100 Subject: [Buildroot] [PATCH] manual: board support: add instructions to test defconfig in the official docker In-Reply-To: References: <20220203235438.610277-1-giulio.benetti@benettiengineering.com> Message-ID: <80ba31da-8a8e-12ed-bded-025e47f5cced@benettiengineering.com> Hi Luca, Arnout, Thomas P., On 13/02/22 11:39, Arnout Vandecappelle wrote: > > > On 12/02/2022 23:56, Luca Ceresoli wrote: >> Hi Giulio, >> >> On 04/02/22 00:54, Giulio Benetti wrote: >>> Often new boards have not been tested with official docker so let's add >>> instructions to do it. >> >> Thank you, I think this is a very useful addition to the documentation! >> However I would suggest some changes for it to look more "professional". Always welcome! >>> Signed-off-by: Giulio Benetti >>> --- >>> docs/manual/adding-board-support.txt | 22 ++++++++++++++++++++++ >>> 1 file changed, 22 insertions(+) >>> >>> diff --git a/docs/manual/adding-board-support.txt b/docs/manual/adding-board-support.txt >>> index 33ed709535..f5fb3af371 100644 >>> --- a/docs/manual/adding-board-support.txt >>> +++ b/docs/manual/adding-board-support.txt >>> @@ -46,3 +46,25 @@ create a directory +board/+ and a subdirectory >>> +board//+. You can then store your patches >>> and configurations in these directories, and reference them from the main >>> Buildroot configuration. Refer to xref:customize[] for more details. >>> + >>> +Before submitting patches for new boards it would be better to test it >> >> "it would be better" -> "it is recommended". Ok >>> +by building it using .gitlab-ci.yml specified docker. For example at the >> >> I think this should be reworded in a simpler way: "by building it using >> the docker specified in .gitlab-ci.yml". Yes >> BTW as I am a docker newbie: is it common to say "the docker"? Or would >> "the docker container" be more correct? -- By comparison, I would never >> say "using the virtualbox" but rather "using the virtualbox machine". > > I would say "the container" since you can use it with any container manager > that follows the OCI spec. Ok >> >>> +time of this writing the docker is: >> >> Remove the ':' from this line, or you'll have multiple ':' per line, >> which looks awkward. >> >>> +$CI_REGISTRY/buildroot.org/buildroot/base:20220105.2314 >> >> Hm, this string is already old. Yes :-/ > Actually, this part of the documentation is already superseded since we now > have utils/docker-run that does everything. Oh, I've missed that, just checked and it eases life not few! I have a 120 columns command to start it that I copy and paste everytime. Because also, what I don't take care of here is the -v flag that allows you mount a host folder. >> There's no sane way to keep docs and >> .yml in sync. I wonder whether we should have in the manual a command >> line that always use the current string, such as: >> >> DOCKER_IMAGE=$(cat .gitlab-ci.yml | \ >> sed -n '/^image/s/^.*CI_REGISTRY/registry.gitlab.com/p') >> docker pull $DOCKER_IMAGE >> sudo docker run -it $DOCKER_IMAGE >> >> However I must admit this is not very readable in the docs... :( What >> about adding a simple script (utils/run-docker?) that does the trick and >> just mention that in the docs? utils/docker-run then. Now we know it exists :-) >>> +so: >> >> Add an empty line here, so that the output separates from the next line. Ok >>> +Pull the docker: >>> +-------------------- >>> + $ docker pull registry.gitlab.com/buildroot.org/buildroot/base:20220105.2314 >> >> Missing 'sudo'? > > Docker access is usually managed through the "docker" group rather than sudo. > > And if you use podman as docker replacement, it can even be done in an > unprivileged container. Not that I tried it, but I think so. > > Oh BTW, the pull is in fact not needed, both podman and docker pull > automatically when you start a container. That's the reason the container name > is so convoluted. All new thing I didn't know! >> >>> +-------------------- >> >> Add an empty line here. This has no effect on the output but makes >> source code more readable. >> >>> +Run the docker: >>> +-------------------- >>> + $ sudo docker run -it registry.gitlab.com/buildroot.org/buildroot/base:20220105.2314 /bin/bash >>> +-------------------- >> >> As above, add an empty line here. +1 >>> +Inside the docker hint: >>> +-------------------- >>> + $ git clone git://git.busybox.net/buildroot >>> + $ cd buildroot >>> + $ make +_defconfig+ >>> + $ make >>> +-------------------- >> >> As above, add an empty line here. +1 >>> +Wait until build finishes and eventually add host dependencies. >> >> If I understand what you mean here, it should be "and add host >> dependencies if needed" ("eventually" is not the english translation of >> italian "eventualmente"). "...and possibly add host dependencies", right? >> If my understanding is correct, I don't find >> this sentence very useful: a docker newbie perhaps doesn't know how to >> add a host dependency (and maybe not even how to understand that they >> are missing one). >> >> I would just remove this line, but if you think it is very important I'd >> clarify it, maybe with some examples. > > Yes, I think this is what triggered the addition of this documentation. If you > have e.g. libopenssl-dev installed on your build host, then you usually won't > notice in your test builds that a dependency on host-openssl is needed. So test > builds should be done in a minimal container. Yes, it was because of that. > Unfortunately, the buildroot/base container is not exactly minimal. It's > really what is meant to be used for running CI tests, not exactly what is needed > for build tests. Ideally, we'd have > > - an absolutely minimal container that can be used for build tests - ideally in > a couple of variants for different distros; There is a bunch of dockers like that(more or less) here: https://github.com/aduskett/buildroot-docker-devel I've also contributed to, and at that time Thomas P. in IRC asked why we didn't upstreamed it and I told I would have done like 2/3 years ago and I've never done it :-/ And also modifying autobuilder's script to pick random distro and build to avoid possible host issues. But it's a bunch of stuff to do. > - a container for CI; Do you mean the one we already have but more shrinked? > - a more complete container you could use for development, though I can't > immediately think of extra stuff you'd want in there Is it really worth it? I mean, I've never seen anybody in IRC(even if read few in it) or ML(same) that complain about "I can't have buildroot working because I miss host tools". But I've seen recently gitlab-ci results that took me like 15-16 hours to fix. Does Yocto have something like that? And if yes, does someone can give a feedback if he really uses it? >(but then, I wouldn't use a container for development). Me too, and who would use it? I think nobody, because I don't think a newbie is that skilled to use a docker too(or maybe yes), but my first try would be using it with my distro and probably same goes for other people. But here again, I use Terminator+Midnight Commander as my "IDE", so I won't be happy enough with it. Someone else uses real "IDE" and we can't add Eclipse or VSCode(I hope), so it will be something that is not enough for anybody, thus IMHO useless. ---------------- Going back to this patch: What I can do with this patch is to rewrite it pointing how to use utils/docker-run to check that at least configs/* and board/* patches work. Another solution to my patch is what Thomas P. pointed in IRC: "it is probably easier to ask people to use gitlab CI" But my worry is that lot of people actually fork from github and not from gitlab. Who would really do that(both docker and gitlab-CI solutions)? But also, who would really install docker(if they don't use it) to submit a patch for gitlab-CI build failures? I think that counting the ones who took care about their maintained board gives us an idea, very few. BUT for new boards, and I see not few of them adding in the last period. It could be a way to force them to give a proof of a successfull building with gitlab-CI pipeline log as Thomas P. proposed. So I would modify this patch with instructions to: - fork Buildroot in gitlab - trigger gitlab-CI pipeline for a single defconfig What do you all think? Best regards -- Giulio Benetti Benetti Engineering sas From giulio.benetti at benettiengineering.com Mon Feb 14 00:03:09 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 14 Feb 2022 01:03:09 +0100 Subject: [Buildroot] [PATCH] configs/roc_pc_rk3399_defconfig: expand rootfs size to 120M In-Reply-To: References: <20220202171035.1740791-1-giulio.benetti@benettiengineering.com> <20220202171035.1740791-2-giulio.benetti@benettiengineering.com> Message-ID: Hi Arnout, On 13/02/22 12:35, Arnout Vandecappelle wrote: > > > On 02/02/2022 18:10, Giulio Benetti wrote: >> Default 60M for rootfs are not enough and generate a build failure, so >> let's expand rootfs size to 120M. > > Did you find out _why_ 64M wasn't enough for just the kernel and busybox? Is > it because of all the stupid modules in the default arm64 defconfig? But most > other arm64 defconfigs don't seem to need this... It is because of modules(30M) and linux "Image", it's not compressed, so it's 25M. So only for Linux+modules => 55M, plus the few other stuff(Busybox+libc etc.)1M Also, nothing changed since the beginning, so I don't know how could this happened: # git log --oneline configs/roc_pc_rk3399_defconfig f51cbc33d9 configs/roc_pc_rk3399: fix U-Boot dependencies 80ae1aedcb configs/roc_rk3399_pc: new defconfig # git log --oneline roc-rk3399-pc/ 80ae1aedcb configs/roc_rk3399_pc: new defconfig U-Boot dependencies are host dependencies, so it doesn't impact. # git log --oneline fs/ext2: 5ece6be60b fs/ext2: fir (again) namespace for variables db7d786140 fs/ext2: fix namespace for variables 5631c38024 fs/ext2: pass a default string to filesystem label ... here board has been added So it doesn't seem a ext2 problem too. I can't understand how it could be building in the beginning. We have 2 solutions: - expand rootfs - use a compressed linux Image.gz(25M => 9M), but need target testing Honestly I don't think systems with SoCs like RK3399 have problems with 56M more, so I would go with expanding rootfs to 120M and if maintainer in Cc wants to shrink Linux and target testing it is welcome to send a patch. What do you think? Best regards -- Giulio Benetti Benetti Engineering sas >> >> Signed-off-by: Giulio Benetti >> --- >> configs/roc_pc_rk3399_defconfig | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/configs/roc_pc_rk3399_defconfig b/configs/roc_pc_rk3399_defconfig >> index dfbc5e4f47..ae7cf19a80 100644 >> --- a/configs/roc_pc_rk3399_defconfig >> +++ b/configs/roc_pc_rk3399_defconfig >> @@ -45,7 +45,7 @@ BR2_TARGET_GENERIC_HOSTNAME="roc-rk3399-pc" >> BR2_TARGET_GENERIC_ISSUE="Welcome to ROC-RK3399-PC!" >> BR2_TARGET_ROOTFS_EXT2=y >> BR2_TARGET_ROOTFS_EXT2_4=y >> -BR2_TARGET_ROOTFS_EXT2_SIZE="64M" >> +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" >> BR2_PACKAGE_HOST_DOSFSTOOLS=y >> BR2_PACKAGE_HOST_GENIMAGE=y >> BR2_PACKAGE_HOST_MTOOLS=y > > Unrelated by this patch, but the image doesn't have a FAT partition so > dosfstols and mtools aren't needed. > > Regards, > Arnout > From james.hilliard1 at gmail.com Mon Feb 14 01:11:29 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 13 Feb 2022 18:11:29 -0700 Subject: [Buildroot] [PATCH v6 6/8] package/qt5/qt5webengine-chromium: new package In-Reply-To: <20220213165001.GA38097@scaer> References: <20220205201837.3324085-1-james.hilliard1@gmail.com> <20220205201837.3324085-6-james.hilliard1@gmail.com> <20220213165001.GA38097@scaer> Message-ID: On Sun, Feb 13, 2022 at 9:50 AM Yann E. MORIN wrote: > > James, All, > > On 2022-02-05 13:18 -0700, James Hilliard spake thusly: > > 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. > > > > Signed-off-by: James Hilliard > > --- > > package/qt5/Config.in | 1 + > > .../0001-Add-python3-build-support.patch | 1858 +++++++++++++++++ > > This is a very big patch... > > The commit you are using here, 0ad2814370799a2161057d92231fe3ee00e2fe98, > is on the '87-based' branch, which is supposedly not a recent branch, > even if the commit itself is not so old (a bit over two months). > > However, there are more recent branches that already have python3 > support, starting from '90-based' onward. > > Why can't we use those branches, instead of carrying such a beast of a > patch? I'm using the commit that matches v5.15.8-lts, I think others aren't compatible: https://invent.kde.org/qt/qt/qtwebengine/-/tree/v5.15.8-lts/src > > 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 Feb 14 04:19:25 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 13 Feb 2022 21:19:25 -0700 Subject: [Buildroot] [PATCH v7 1/5] package/qt5/qt5base: enable ccache via configure option Message-ID: <20220214041929.1916468-1-james.hilliard1@gmail.com> This should be cleaner than editing mkspecs/common/g++-base.conf. This should be more reliable with qt5webengine gn build system. Signed-off-by: James Hilliard --- Changes v6 -> v7: - remove QT5BASE_CONFIGURE_HOSTCC variable --- package/qt5/qt5base/qt5base.mk | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index ef38d03253..cce92db81b 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -297,10 +297,9 @@ endef endif # This allows to use ccache when available -define QT5BASE_CONFIGURE_HOSTCC - $(SED) 's,^QMAKE_CC\s*=.*,QMAKE_CC = $(HOSTCC),' $(@D)/mkspecs/common/g++-base.conf - $(SED) 's,^QMAKE_CXX\s*=.*,QMAKE_CXX = $(HOSTCXX),' $(@D)/mkspecs/common/g++-base.conf -endef +ifeq ($(BR2_CCACHE),y) +QT5BASE_CONFIGURE_OPTS += -ccache +endif # Must be last so can override all options set by Buildroot QT5BASE_CONFIGURE_OPTS += $(call qstrip,$(BR2_PACKAGE_QT5BASE_CUSTOM_CONF_OPTS)) @@ -316,7 +315,6 @@ define QT5BASE_CONFIGURE_CMDS touch $(QT5BASE_ARCH_CONFIG_FILE) $(QT5BASE_CONFIGURE_ARCH_CONFIG_LIBATOMIC) $(QT5BASE_CONFIGURE_ARCH_CONFIG_LIBEXECINFO) - $(QT5BASE_CONFIGURE_HOSTCC) (cd $(@D); \ $(TARGET_MAKE_ENV) \ PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ -- 2.25.1 From james.hilliard1 at gmail.com Mon Feb 14 04:19:26 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 13 Feb 2022 21:19:26 -0700 Subject: [Buildroot] [PATCH v7 2/5] package/qt5/qt5webengine-chromium-catapult: new package In-Reply-To: <20220214041929.1916468-1-james.hilliard1@gmail.com> References: <20220214041929.1916468-1-james.hilliard1@gmail.com> Message-ID: <20220214041929.1916468-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 --- 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 Feb 14 04:19:28 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 13 Feb 2022 21:19:28 -0700 Subject: [Buildroot] [PATCH v7 4/5] package/qt5/qt5base: disable broken qmake sysrootify In-Reply-To: <20220214041929.1916468-1-james.hilliard1@gmail.com> References: <20220214041929.1916468-1-james.hilliard1@gmail.com> Message-ID: <20220214041929.1916468-4-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. Improves pkg-config target/host separation. Signed-off-by: James Hilliard --- Changes v5 -> v6: - rebase/rework with qt5webengine bump 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/qt5/qt5base/qt.conf.in | 21 ++++++++++++++++++--- package/qt5/qt5base/qt5base.mk | 5 ++++- 2 files changed, 22 insertions(+), 4 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 cce92db81b..1ef70eb7f6 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -323,12 +323,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)" \ @@ -337,6 +340,6 @@ define QT5BASE_CONFIGURE_CMDS ) endef -QT5BASE_POST_INSTALL_STAGING_HOOKS += QT5_INSTALL_QT_CONF +QT5BASE_PRE_INSTALL_STAGING_HOOKS += QT5_INSTALL_QT_CONF $(eval $(qmake-package)) -- 2.25.1 From james.hilliard1 at gmail.com Mon Feb 14 04:19:29 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 13 Feb 2022 21:19:29 -0700 Subject: [Buildroot] [PATCH v7 5/5] package/qt5/qt5webengine: bump to version 5.15.8 In-Reply-To: <20220214041929.1916468-1-james.hilliard1@gmail.com> References: <20220214041929.1916468-1-james.hilliard1@gmail.com> Message-ID: <20220214041929.1916468-5-james.hilliard1@gmail.com> We need to use the separate package for the chromium submodule which has python3 support patches. We also need to apply a patch to qt5webengine to allow building with python3. Drop a patch which is now upstream. 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. Switch libraries to system libraries instead of bundled when possible. Migrate unsupported WEBENGINE_CONFIG to new config flag option. Override feature detection using config override flags to ensure we get the expected features enabled/disabled as autodetection logic may otherwise disable features without throwing build errors. Signed-off-by: James Hilliard --- Changes v5 -> v6: - switch to python3 - fix up config flags and rebase Changes v3 -> v4: - linker fixes Changes v2 -> v3: - add kconfig entries --- package/qt5/qt5.mk | 1 - .../0002-Add-python3-build-support.patch | 168 +++ ...m-breakpad-fix-build-with-glibc-2.34.patch | 76 -- package/qt5/qt5webengine/Config.in | 13 + .../qt5/qt5webengine/host-python-wrapper.in | 3 + package/qt5/qt5webengine/qt5webengine.hash | 1001 +---------------- package/qt5/qt5webengine/qt5webengine.mk | 157 ++- 7 files changed, 322 insertions(+), 1097 deletions(-) create mode 100644 package/qt5/qt5webengine/0002-Add-python3-build-support.patch delete mode 100644 package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch create mode 100644 package/qt5/qt5webengine/host-python-wrapper.in diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk index 656e3067dc..0706c3548d 100644 --- a/package/qt5/qt5.mk +++ b/package/qt5/qt5.mk @@ -6,7 +6,6 @@ QT5_VERSION_MAJOR = 5.15 QT5_VERSION = $(QT5_VERSION_MAJOR).8 -QT5_SOURCE_TARBALL_PREFIX = everywhere-src QT5_SITE = https://invent.kde.org/qt/qt include $(sort $(wildcard package/qt5/*/*.mk)) diff --git a/package/qt5/qt5webengine/0002-Add-python3-build-support.patch b/package/qt5/qt5webengine/0002-Add-python3-build-support.patch new file mode 100644 index 0000000000..18fc1c1de0 --- /dev/null +++ b/package/qt5/qt5webengine/0002-Add-python3-build-support.patch @@ -0,0 +1,168 @@ +From 1e299a6c9eeb08555208b76623e453d8ab96b6e3 Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Fri, 4 Feb 2022 16:16:35 -0700 +Subject: [PATCH] Add python3 build support + +Adapted from: +https://github.com/archlinux/svntogit-packages/blob/6edf5f1aaea952d046aff89a2e0175258fe77361/trunk/qt5-webengine-python3.patch + +Signed-off-by: James Hilliard +--- + configure.pri | 13 ++++++------- + mkspecs/features/functions.prf | 6 +++--- + src/buildtools/config/support.pri | 10 +++++----- + src/buildtools/configure.json | 18 +++++++++--------- + 4 files changed, 23 insertions(+), 24 deletions(-) + +diff --git a/configure.pri b/configure.pri +index e072961f..6fec7b20 100644 +--- a/configure.pri ++++ b/configure.pri +@@ -13,8 +13,7 @@ defineTest(isPythonVersionSupported) { + python_version = $$split(python_version, ',') + python_major_version = $$first(python_version) + greaterThan(python_major_version, 2) { +- qtLog("Python version 3 is not supported by Chromium.") +- return(false) ++ return(true) + } + python_minor_version = $$member(python_version, 1) + python_patch_version = $$member(python_version, 2) +@@ -52,10 +51,10 @@ defineTest(qtConfReport_jumboBuild) { + qtConfReportPadded($${1}, $$mergeLimit) + } + +-defineTest(qtConfTest_detectPython2) { +- python = $$qtConfFindInPath("python2$$EXE_SUFFIX") ++defineTest(qtConfTest_detectPython) { ++ python = $$qtConfFindInPath("python$$EXE_SUFFIX") + isEmpty(python) { +- qtLog("'python2$$EXE_SUFFIX' not found in PATH. Checking for 'python$$EXE_SUFFIX'.") ++ qtLog("'python$$EXE_SUFFIX' not found in PATH. Checking for 'python$$EXE_SUFFIX'.") + python = $$qtConfFindInPath("python$$EXE_SUFFIX") + } + isEmpty(python) { +@@ -63,11 +62,11 @@ defineTest(qtConfTest_detectPython2) { + return(false) + } + !isPythonVersionSupported($$python) { +- qtLog("A suitable Python 2 executable could not be located.") ++ qtLog("A suitable Python executable could not be located.") + return(false) + } + +- # Make tests.python2.location available in configure.json. ++ # Make tests.python.location available in configure.json. + $${1}.location = $$clean_path($$python) + export($${1}.location) + $${1}.cache += location +diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf +index 2750d707..9fda13d0 100644 +--- a/mkspecs/features/functions.prf ++++ b/mkspecs/features/functions.prf +@@ -39,11 +39,11 @@ defineReplace(which) { + + # Returns the unquoted path to the python executable. + defineReplace(pythonPath) { +- isEmpty(QMAKE_PYTHON2) { ++ isEmpty(QMAKE_PYTHON) { + # Fallback for building QtWebEngine with Qt < 5.8 +- QMAKE_PYTHON2 = python ++ QMAKE_PYTHON = python + } +- return($$QMAKE_PYTHON2) ++ return($$QMAKE_PYTHON) + } + + # Returns the python executable for use with shell / make targets. +diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri +index e7f869a1..1bf2c5d7 100644 +--- a/src/buildtools/config/support.pri ++++ b/src/buildtools/config/support.pri +@@ -21,7 +21,7 @@ defineReplace(qtwebengine_checkWebEngineCoreError) { + !qtwebengine_checkForGperf(QtWebEngine):return(false) + !qtwebengine_checkForBison(QtWebEngine):return(false) + !qtwebengine_checkForFlex(QtWebEngine):return(false) +- !qtwebengine_checkForPython2(QtWebEngine):return(false) ++ !qtwebengine_checkForPython(QtWebEngine):return(false) + !qtwebengine_checkForNodejs(QtWebEngine):return(false) + !qtwebengine_checkForSanitizer(QtWebEngine):return(false) + linux:!qtwebengine_checkForPkgCfg(QtWebEngine):return(false) +@@ -51,7 +51,7 @@ defineReplace(qtwebengine_checkPdfError) { + !qtwebengine_checkForGperf(QtPdf):return(false) + !qtwebengine_checkForBison(QtPdf):return(false) + !qtwebengine_checkForFlex(QtPdf):return(false) +- !qtwebengine_checkForPython2(QtPdf):return(false) ++ !qtwebengine_checkForPython(QtPdf):return(false) + !qtwebengine_checkForSanitizer(QtPdf):return(false) + linux:!qtwebengine_checkForPkgCfg(QtPdf):return(false) + linux:!qtwebengine_checkForHostPkgCfg(QtPdf):return(false) +@@ -143,10 +143,10 @@ defineTest(qtwebengine_checkForFlex) { + return(true) + } + +-defineTest(qtwebengine_checkForPython2) { ++defineTest(qtwebengine_checkForPython) { + module = $$1 +- !qtConfig(webengine-python2) { +- qtwebengine_skipBuild("Python version 2 (2.7.5 or later) is required to build $${module}.") ++ !qtConfig(webengine-python) { ++ qtwebengine_skipBuild("Python is required to build $${module}.") + return(false) + } + return(true) +diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json +index 88d1790c..032aa665 100644 +--- a/src/buildtools/configure.json ++++ b/src/buildtools/configure.json +@@ -295,9 +295,9 @@ + "label": "system ninja", + "type": "detectNinja" + }, +- "webengine-python2": { +- "label": "python2", +- "type": "detectPython2", ++ "webengine-python": { ++ "label": "python", ++ "type": "detectPython", + "log": "location" + }, + "webengine-winversion": { +@@ -374,7 +374,7 @@ + && features.webengine-gperf + && features.webengine-bison + && features.webengine-flex +- && features.webengine-python2 ++ && features.webengine-python + && features.webengine-nodejs + && (!config.sanitizer || features.webengine-sanitizer) + && (!config.linux || features.pkg-config) +@@ -400,7 +400,7 @@ + && features.webengine-gperf + && features.webengine-bison + && features.webengine-flex +- && features.webengine-python2 ++ && features.webengine-python + && (!config.sanitizer || features.webengine-sanitizer) + && (!config.linux || features.pkg-config) + && (!config.linux || features.webengine-host-pkg-config) +@@ -423,12 +423,12 @@ + "autoDetect": "features.private_tests", + "output": [ "privateFeature" ] + }, +- "webengine-python2": { +- "label": "python2", +- "condition": "tests.webengine-python2", ++ "webengine-python": { ++ "label": "python", ++ "condition": "tests.webengine-python", + "output": [ + "privateFeature", +- { "type": "varAssign", "name": "QMAKE_PYTHON2", "value": "tests.webengine-python2.location" } ++ { "type": "varAssign", "name": "QMAKE_PYTHON", "value": "tests.webengine-python.location" } + ] + }, + "webengine-gperf": { +-- +2.25.1 + 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 deleted file mode 100644 index 44a6424c7d..0000000000 --- a/package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch +++ /dev/null @@ -1,76 +0,0 @@ -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/Config.in b/package/qt5/qt5webengine/Config.in index 5d537cdf84..b5ba8c4649 100644 --- a/package/qt5/qt5webengine/Config.in +++ b/package/qt5/qt5webengine/Config.in @@ -32,24 +32,35 @@ 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). # 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_LCMS2 + 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_MINIZIP select BR2_PACKAGE_OPUS + select BR2_PACKAGE_RE2 + select BR2_PACKAGE_SNAPPY 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 @@ -57,9 +68,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/host-python-wrapper.in b/package/qt5/qt5webengine/host-python-wrapper.in new file mode 100644 index 0000000000..3400be1d06 --- /dev/null +++ b/package/qt5/qt5webengine/host-python-wrapper.in @@ -0,0 +1,3 @@ +#!/bin/sh +LD_LIBRARY_PATH="@HOST_DIR@/lib" \ +exec @HOST_DIR@/bin/python "$@" 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 cebd6d0fe2..68eb2e8a1c 100644 --- a/package/qt5/qt5webengine/qt5webengine.mk +++ b/package/qt5/qt5webengine/qt5webengine.mk @@ -4,42 +4,147 @@ # ################################################################################ -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 \ - host-pkgconf host-python +QT5WEBENGINE_VERSION = $(QT5_VERSION) +QT5WEBENGINE_SITE = $(QT5_SITE)/qtwebengine/-/archive/v$(QT5WEBENGINE_VERSION)-lts +QT5WEBENGINE_SOURCE = qtwebengine-v$(QT5WEBENGINE_VERSION)-lts.tar.bz2 +QT5WEBENGINE_DEPENDENCIES = qt5declarative qt5webchannel +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 + +# command line argument separator +QT5WEBENGINE_CONF_OPTS = -- 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 += \ + xlib_libXcomposite \ + xlib_libXcursor \ + xlib_libXi \ + xlib_libxkbfile \ + xlib_libXrandr \ + xlib_libXScrnSaver \ + xlib_libXtst +QT5WEBENGINE_CONF_OPTS += \ + -feature-webengine-ozone \ + -feature-webengine-system-libdrm \ + -feature-webengine-system-x11 \ + -feature-webengine-system-xkbfile \ + -feature-webengine-system-xcomposite \ + -feature-webengine-system-xcursor \ + -feature-webengine-system-xi \ + -feature-webengine-system-xproto-gl \ + -feature-webengine-system-xtst +else +QT5WEBENGINE_CONF_OPTS += \ + -no-feature-webengine-ozone \ + -no-feature-webengine-system-libdrm \ + -no-feature-webengine-system-x11 \ + -no-feature-webengine-system-xkbfile \ + -no-feature-webengine-system-xcomposite \ + -no-feature-webengine-system-xcursor \ + -no-feature-webengine-system-xi \ + -no-feature-webengine-system-xproto-gl \ + -no-feature-webengine-system-xtst endif -QT5WEBENGINE_DEPENDENCIES += host-libpng host-libnss libnss +QT5WEBENGINE_DEPENDENCIES += \ + host-bison \ + host-flex \ + host-freetype \ + host-gperf \ + host-harfbuzz \ + host-icu \ + host-ninja \ + host-nodejs \ + host-pkgconf \ + host-libjpeg \ + host-libnss \ + host-libpng \ + host-python3 \ + host-webp \ + host-zlib \ + ffmpeg \ + freetype \ + jpeg \ + lcms2 \ + libevent \ + libnss \ + libvpx \ + libxml2 \ + libxslt \ + re2 \ + snappy \ + webp -QT5WEBENGINE_CONF_OPTS += WEBENGINE_CONFIG+=use_system_ffmpeg +QT5WEBENGINE_CONF_OPTS += \ + -webengine-embedded-build \ + -webengine-ffmpeg \ + -webengine-icu \ + -webengine-opus \ + -webengine-webchannel \ + -webengine-webp \ + -feature-build-qtwebengine-core \ + -feature-webengine-core-support \ + -feature-webengine-system-dbus \ + -feature-webengine-system-fontconfig \ + -feature-webengine-system-freetype \ + -feature-webengine-system-glib \ + -feature-webengine-system-glibc \ + -feature-webengine-system-harfbuzz \ + -feature-webengine-system-jpeg \ + -feature-webengine-system-khr \ + -feature-webengine-system-lcms2 \ + -feature-webengine-system-libevent \ + -feature-webengine-system-libvpx \ + -feature-webengine-system-libxml2 \ + -feature-webengine-system-ninja \ + -feature-webengine-system-nss \ + -feature-webengine-system-png \ + -feature-webengine-system-re2 \ + -feature-webengine-system-snappy \ + -feature-webengine-system-zlib + +QT5WEBENGINE_CONF_OPTS += \ + -no-webengine-geolocation \ + -no-webengine-kerberos \ + -no-webengine-pepper-plugins \ + -no-webengine-printing-and-pdf \ + -no-webengine-spellchecker \ + -no-webengine-webrtc \ + -no-webengine-webrtc-pipewire \ + -no-feature-webengine-developer-build \ + -no-feature-webengine-full-debug-info \ + -no-feature-webengine-native-spellchecker \ + -no-feature-webengine-noexecstack \ + -no-feature-webengine-system-minizip \ + -no-feature-webengine-system-gn ifeq ($(BR2_PACKAGE_QT5WEBENGINE_PROPRIETARY_CODECS),y) -QT5WEBENGINE_CONF_OPTS += WEBENGINE_CONFIG+=use_proprietary_codecs +QT5WEBENGINE_CONF_OPTS += -webengine-proprietary-codecs +else +QT5WEBENGINE_CONF_OPTS += -no-webengine-proprietary-codecs endif ifeq ($(BR2_PACKAGE_QT5WEBENGINE_ALSA),y) QT5WEBENGINE_DEPENDENCIES += alsa-lib +QT5WEBENGINE_CONF_OPTS += -webengine-alsa else -QT5WEBENGINE_CONF_OPTS += QT_CONFIG-=alsa +QT5WEBENGINE_CONF_OPTS += -no-webengine-alsa +endif + +ifeq ($(BR2_PACKAGE_PULSEAUDIO),y) +QT5WEBENGINE_DEPENDENCIES += pulseaudio +QT5WEBENGINE_CONF_OPTS += -webengine-pulseaudio +else +QT5WEBENGINE_CONF_OPTS += -no-webengine-pulseaudio endif # QtWebengine's build system uses python, but only supports python2. We work @@ -47,21 +152,31 @@ endif # symlink. QT5WEBENGINE_ENV = \ PATH=$(@D)/host-bin:$(BR_PATH) \ - PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig -define QT5WEBENGINE_PYTHON2_SYMLINK + PKG_CONFIG_SYSROOT_DIR="/" +define QT5WEBENGINE_CREATE_HOST_PYTHON_WRAPPER mkdir -p $(@D)/host-bin - ln -sf $(HOST_DIR)/bin/python2 $(@D)/host-bin/python + sed s%@HOST_DIR@%$(HOST_DIR)%g $(QT5WEBENGINE_PKGDIR)/host-python-wrapper.in > $(@D)/host-bin/python + chmod +x $(@D)/host-bin/python endef -QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_PYTHON2_SYMLINK +QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_CREATE_HOST_PYTHON_WRAPPER 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 + mkdir -p $(@D)/host-bin 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 wbx at openadk.org Mon Feb 14 05:14:07 2022 From: wbx at openadk.org (Waldemar Brodkorb) Date: Mon, 14 Feb 2022 06:14:07 +0100 Subject: [Buildroot] [PATCHv2 2/3] package/binutils: remove 2.35.2 Message-ID: Signed-off-by: Waldemar Brodkorb --- v1->v2: remove the patch folder, recognized by Thomas P. --- package/binutils/2.35.2/0001-sh-conf.patch | 48 -- .../0002-poison-system-directories.patch | 306 ----------- ...ith-plt-link-failure-for-local-calls.patch | 59 --- ...elocation-R_OR1K_GOT_AHI16-for-gotha.patch | 256 --------- ...K_GOT16-overflow-failures-in-presenc.patch | 61 --- ...ge-plt_relocs-when-generating-plt-en.patch | 500 ------------------ ...or1k-fix-building-with-gcc-version-5.patch | 50 -- ...tive-relocation-against-dynamic-on-P.patch | 59 --- ...K_GOT16-signed-overflow-by-using-spe.patch | 75 --- ...OT32-relocations-against-ABS-symbols.patch | 46 -- package/binutils/Config.in.host | 8 - package/binutils/binutils.hash | 1 - 12 files changed, 1469 deletions(-) delete mode 100644 package/binutils/2.35.2/0001-sh-conf.patch delete mode 100644 package/binutils/2.35.2/0002-poison-system-directories.patch delete mode 100644 package/binutils/2.35.2/0003-or1k-Fix-issue-with-plt-link-failure-for-local-calls.patch delete mode 100644 package/binutils/2.35.2/0004-or1k-Implement-relocation-R_OR1K_GOT_AHI16-for-gotha.patch delete mode 100644 package/binutils/2.35.2/0005-or1k-Avoid-R_OR1K_GOT16-overflow-failures-in-presenc.patch delete mode 100644 package/binutils/2.35.2/0006-or1k-Support-large-plt_relocs-when-generating-plt-en.patch delete mode 100644 package/binutils/2.35.2/0007-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch delete mode 100644 package/binutils/2.35.2/0008-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch delete mode 100644 package/binutils/2.35.2/0009-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch delete mode 100644 package/binutils/2.35.2/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch diff --git a/package/binutils/2.35.2/0001-sh-conf.patch b/package/binutils/2.35.2/0001-sh-conf.patch deleted file mode 100644 index 44d5f4e89a..0000000000 --- a/package/binutils/2.35.2/0001-sh-conf.patch +++ /dev/null @@ -1,48 +0,0 @@ -From ae50e875f4292c99b859cded1d036e401b6ddaec Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:38:13 +0100 -Subject: [PATCH] sh-conf - -Likewise, binutils has no idea about any of these new targets either, so we -fix that up too.. now we're able to actually build a real toolchain for -sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more -inept targets than that one, really. Go look, I promise). - -[Romain: rebase on top of 2.32] -Signed-off-by: Romain Naour -[Thomas: rebase on top of 2.29, in which sh64 support was removed.] -Signed-off-by: Thomas Petazzoni ---- - configure | 2 +- - configure.ac | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure b/configure -index 54d0339ab9e..c2f51ffcebb 100755 ---- a/configure -+++ b/configure -@@ -3937,7 +3937,7 @@ case "${target}" in - nvptx*-*-*) - noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" - ;; -- sh-*-*) -+ sh*-*-*) - case "${target}" in - sh*-*-elf) - ;; -diff --git a/configure.ac b/configure.ac -index a910c4fd6ba..a93d93c81c3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1178,7 +1178,7 @@ case "${target}" in - nvptx*-*-*) - noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" - ;; -- sh-*-*) -+ sh*-*-*) - case "${target}" in - sh*-*-elf) - ;; --- -2.25.4 - diff --git a/package/binutils/2.35.2/0002-poison-system-directories.patch b/package/binutils/2.35.2/0002-poison-system-directories.patch deleted file mode 100644 index b77a5e1a66..0000000000 --- a/package/binutils/2.35.2/0002-poison-system-directories.patch +++ /dev/null @@ -1,306 +0,0 @@ -From db405d1bc5607892ddb25433354b46d78e23b343 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:45:38 +0100 -Subject: [PATCH] poison-system-directories - -Patch adapted to binutils 2.23.2 and extended to use -BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni. - -[Romain: rebase on top of 2.33.1] -Signed-off-by: Romain Naour -[Gustavo: adapt to binutils 2.25] -Signed-off-by: Thomas Petazzoni -Signed-off-by: Gustavo Zacarias - -Upstream-Status: Inappropriate [distribution: codesourcery] - -Patch originally created by Mark Hatle, forward-ported to -binutils 2.21 by Scott Garman. - -purpose: warn for uses of system directories when cross linking - -Code Merged from Sourcery G++ binutils 2.19 - 4.4-277 - -2008-07-02 Joseph Myers - - ld/ - * ld.h (args_type): Add error_poison_system_directories. - * ld.texinfo (--error-poison-system-directories): Document. - * ldfile.c (ldfile_add_library_path): Check - command_line.error_poison_system_directories. - * ldmain.c (main): Initialize - command_line.error_poison_system_directories. - * lexsup.c (enum option_values): Add - OPTION_ERROR_POISON_SYSTEM_DIRECTORIES. - (ld_options): Add --error-poison-system-directories. - (parse_args): Handle new option. - -2007-06-13 Joseph Myers - - ld/ - * config.in: Regenerate. - * ld.h (args_type): Add poison_system_directories. - * ld.texinfo (--no-poison-system-directories): Document. - * ldfile.c (ldfile_add_library_path): Check - command_line.poison_system_directories. - * ldmain.c (main): Initialize - command_line.poison_system_directories. - * lexsup.c (enum option_values): Add - OPTION_NO_POISON_SYSTEM_DIRECTORIES. - (ld_options): Add --no-poison-system-directories. - (parse_args): Handle new option. - -2007-04-20 Joseph Myers - - Merge from Sourcery G++ binutils 2.17: - - 2007-03-20 Joseph Myers - Based on patch by Mark Hatle . - ld/ - * configure.ac (--enable-poison-system-directories): New option. - * configure, config.in: Regenerate. - * ldfile.c (ldfile_add_library_path): If - ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib, - /usr/lib, /usr/local/lib or /usr/X11R6/lib. - -Signed-off-by: Mark Hatle -Signed-off-by: Scott Garman ---- - ld/config.in | 3 +++ - ld/configure | 14 ++++++++++++++ - ld/configure.ac | 10 ++++++++++ - ld/ld.h | 8 ++++++++ - ld/ld.texi | 12 ++++++++++++ - ld/ldfile.c | 17 +++++++++++++++++ - ld/ldlex.h | 2 ++ - ld/ldmain.c | 2 ++ - ld/lexsup.c | 21 +++++++++++++++++++++ - 9 files changed, 89 insertions(+) - -diff --git a/ld/config.in b/ld/config.in -index 2f4e5ea33e3..8fbb29682b2 100644 ---- a/ld/config.in -+++ b/ld/config.in -@@ -40,6 +40,9 @@ - language is requested. */ - #undef ENABLE_NLS - -+/* Define to warn for use of native system library directories */ -+#undef ENABLE_POISON_SYSTEM_DIRECTORIES -+ - /* Additional extension a shared object might have. */ - #undef EXTRA_SHLIB_EXTENSION - -diff --git a/ld/configure b/ld/configure -index 6be5280621f..d62e7b12382 100755 ---- a/ld/configure -+++ b/ld/configure -@@ -826,6 +826,7 @@ with_lib_path - enable_targets - enable_64_bit_bfd - with_sysroot -+enable_poison_system_directories - enable_gold - enable_got - enable_compressed_debug_sections -@@ -1493,6 +1494,8 @@ Optional Features: - --disable-largefile omit support for large files - --enable-targets alternative target configurations - --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) -+ --enable-poison-system-directories -+ warn for use of native system library directories - --enable-gold[=ARG] build gold [ARG={default,yes,no}] - --enable-got= GOT handling scheme (target, single, negative, - multigot) -@@ -15814,7 +15817,18 @@ else - fi - - -+# Check whether --enable-poison-system-directories was given. -+if test "${enable_poison_system_directories+set}" = set; then : -+ enableval=$enable_poison_system_directories; -+else -+ enable_poison_system_directories=no -+fi -+ -+if test "x${enable_poison_system_directories}" = "xyes"; then - -+$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h -+ -+fi - - # Check whether --enable-got was given. - if test "${enable_got+set}" = set; then : -diff --git a/ld/configure.ac b/ld/configure.ac -index 172398ff847..b77f8510ca6 100644 ---- a/ld/configure.ac -+++ b/ld/configure.ac -@@ -94,6 +94,16 @@ AC_SUBST(use_sysroot) - AC_SUBST(TARGET_SYSTEM_ROOT) - AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) - -+AC_ARG_ENABLE([poison-system-directories], -+ AS_HELP_STRING([--enable-poison-system-directories], -+ [warn for use of native system library directories]),, -+ [enable_poison_system_directories=no]) -+if test "x${enable_poison_system_directories}" = "xyes"; then -+ AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES], -+ [1], -+ [Define to warn for use of native system library directories]) -+fi -+ - dnl Use --enable-gold to decide if this linker should be the default. - dnl "install_as_default" is set to false if gold is the default linker. - dnl "installed_linker" is the installed BFD linker name. -diff --git a/ld/ld.h b/ld/ld.h -index 1790dc81a66..73f832eb169 100644 ---- a/ld/ld.h -+++ b/ld/ld.h -@@ -166,6 +166,14 @@ typedef struct - in the linker script. */ - bfd_boolean force_group_allocation; - -+ /* If TRUE (the default) warn for uses of system directories when -+ cross linking. */ -+ bfd_boolean poison_system_directories; -+ -+ /* If TRUE (default FALSE) give an error for uses of system -+ directories when cross linking instead of a warning. */ -+ bfd_boolean error_poison_system_directories; -+ - /* Big or little endian as set on command line. */ - enum endian_enum endian; - -diff --git a/ld/ld.texi b/ld/ld.texi -index 2a93e9456ac..3eeb70607fd 100644 ---- a/ld/ld.texi -+++ b/ld/ld.texi -@@ -2655,6 +2655,18 @@ string identifying the original linked file does not change. - - Passing @code{none} for @var{style} disables the setting from any - @code{--build-id} options earlier on the command line. -+ -+ at kindex --no-poison-system-directories -+ at item --no-poison-system-directories -+Do not warn for @option{-L} options using system directories such as -+ at file{/usr/lib} when cross linking. This option is intended for use -+in chroot environments when such directories contain the correct -+libraries for the target system rather than the host. -+ -+ at kindex --error-poison-system-directories -+ at item --error-poison-system-directories -+Give an error instead of a warning for @option{-L} options using -+system directories when cross linking. - @end table - - @c man end -diff --git a/ld/ldfile.c b/ld/ldfile.c -index e39170b5d94..fadc248a140 100644 ---- a/ld/ldfile.c -+++ b/ld/ldfile.c -@@ -117,6 +117,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline) - new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); - else - new_dirs->name = xstrdup (name); -+ -+#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES -+ if (command_line.poison_system_directories -+ && ((!strncmp (name, "/lib", 4)) -+ || (!strncmp (name, "/usr/lib", 8)) -+ || (!strncmp (name, "/usr/local/lib", 14)) -+ || (!strncmp (name, "/usr/X11R6/lib", 14)))) -+ { -+ if (command_line.error_poison_system_directories) -+ einfo (_("%X%P: error: library search path \"%s\" is unsafe for " -+ "cross-compilation\n"), name); -+ else -+ einfo (_("%P: warning: library search path \"%s\" is unsafe for " -+ "cross-compilation\n"), name); -+ } -+#endif -+ - } - - /* Try to open a BFD for a lang_input_statement. */ -diff --git a/ld/ldlex.h b/ld/ldlex.h -index 5ea083ebeb3..417f9b858ce 100644 ---- a/ld/ldlex.h -+++ b/ld/ldlex.h -@@ -155,6 +155,8 @@ enum option_values - OPTION_NON_CONTIGUOUS_REGIONS, - OPTION_NON_CONTIGUOUS_REGIONS_WARNINGS, - OPTION_DEPENDENCY_FILE, -+ OPTION_NO_POISON_SYSTEM_DIRECTORIES, -+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, - }; - - /* The initial parser states. */ -diff --git a/ld/ldmain.c b/ld/ldmain.c -index 08be9030cb5..92dc16399eb 100644 ---- a/ld/ldmain.c -+++ b/ld/ldmain.c -@@ -321,6 +321,8 @@ main (int argc, char **argv) - command_line.warn_mismatch = TRUE; - command_line.warn_search_mismatch = TRUE; - command_line.check_section_addresses = -1; -+ command_line.poison_system_directories = TRUE; -+ command_line.error_poison_system_directories = FALSE; - - /* We initialize DEMANGLING based on the environment variable - COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the -diff --git a/ld/lexsup.c b/ld/lexsup.c -index 6cab41cf5df..c497f36b148 100644 ---- a/ld/lexsup.c -+++ b/ld/lexsup.c -@@ -572,6 +572,14 @@ static const struct ld_option ld_options[] = - { {"no-print-map-discarded", no_argument, NULL, OPTION_NO_PRINT_MAP_DISCARDED}, - '\0', NULL, N_("Do not show discarded sections in map file output"), - TWO_DASHES }, -+ { {"no-poison-system-directories", no_argument, NULL, -+ OPTION_NO_POISON_SYSTEM_DIRECTORIES}, -+ '\0', NULL, N_("Do not warn for -L options using system directories"), -+ TWO_DASHES }, -+ { {"error-poison-system-directories", no_argument, NULL, -+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES}, -+ '\0', NULL, N_("Give an error for -L options using system directories"), -+ TWO_DASHES }, - }; - - #define OPTION_COUNT ARRAY_SIZE (ld_options) -@@ -584,6 +592,7 @@ parse_args (unsigned argc, char **argv) - int ingroup = 0; - char *default_dirlist = NULL; - char *shortopts; -+ char *BR_paranoid_env; - struct option *longopts; - struct option *really_longopts; - int last_optind; -@@ -1591,6 +1600,14 @@ parse_args (unsigned argc, char **argv) - } - break; - -+ case OPTION_NO_POISON_SYSTEM_DIRECTORIES: -+ command_line.poison_system_directories = FALSE; -+ break; -+ -+ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: -+ command_line.error_poison_system_directories = TRUE; -+ break; -+ - case OPTION_PUSH_STATE: - input_flags.pushed = xmemdup (&input_flags, - sizeof (input_flags), -@@ -1681,6 +1698,10 @@ parse_args (unsigned argc, char **argv) - command_line.soname = NULL; - } - -+ BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH"); -+ if (BR_paranoid_env && strlen(BR_paranoid_env) > 0) -+ command_line.error_poison_system_directories = TRUE; -+ - while (ingroup) - { - einfo (_("%P: missing --end-group; added as last command line option\n")); --- -2.25.4 - diff --git a/package/binutils/2.35.2/0003-or1k-Fix-issue-with-plt-link-failure-for-local-calls.patch b/package/binutils/2.35.2/0003-or1k-Fix-issue-with-plt-link-failure-for-local-calls.patch deleted file mode 100644 index 81fb6b8518..0000000000 --- a/package/binutils/2.35.2/0003-or1k-Fix-issue-with-plt-link-failure-for-local-calls.patch +++ /dev/null @@ -1,59 +0,0 @@ -From baf313f84b106a5a29f01796afd857e69abf8b08 Mon Sep 17 00:00:00 2001 -From: Stafford Horne -Date: Sun, 2 May 2021 06:02:14 +0900 -Subject: [PATCH] or1k: Fix issue with plt link failure for local calls - -When building protobuf we were seeing the assert failure: - - /home/giuliobenetti/git/upstream/or1k-binutils-2.36.1/host/lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: - BFD (GNU Binutils) 2.36.1 assertion fail elf32-or1k.c:2377 - /home/giuliobenetti/git/upstream/or1k-binutils-2.36.1/host/lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: - BFD (GNU Binutils) 2.36.1 assertion fail elf32-or1k.c:2377 - /home/giuliobenetti/git/upstream/or1k-binutils-2.36.1/host/lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: - BFD (GNU Binutils) 2.36.1 assertion fail elf32-or1k.c:2377 - collect2: error: ld returned 1 exit status - -This failure happens while writing out PLT entries, there is a check -"BFD_ASSERT (h->dynindx != -1)" to confirm all plt entries have dynamic -symbol attributes. This was failing for symbols that were -"forced_local" in previous linking code. - -The fix adds logic to or1k_elf_adjust_dynamic_symbol to identify -"forced_local" symbols and exclude them from the the PLT. - -bfd/ChangeLog: - - PR 27624 - * elf32-or1k.c (or1k_elf_adjust_dynamic_symbol): Change - condition used to cleanup plt entries to cleanup forced local - entries. - -Cc: Giulio Benetti -Signed-off-by: Giulio Benetti ---- - bfd/elf32-or1k.c | 9 ++++----- - 1 file changed, 4 insertions(+), 5 deletions(-) - -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index 7c02d004cc7..bbfa2bfe614 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -2568,11 +2568,10 @@ or1k_elf_adjust_dynamic_symbol (struct bfd_link_info *info, - if (h->type == STT_FUNC - || h->needs_plt) - { -- if (! bfd_link_pic (info) -- && !h->def_dynamic -- && !h->ref_dynamic -- && h->root.type != bfd_link_hash_undefweak -- && h->root.type != bfd_link_hash_undefined) -+ if (h->plt.refcount <= 0 -+ || (SYMBOL_CALLS_LOCAL (info, h) -+ || (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT -+ && h->root.type == bfd_link_hash_undefweak))) - { - /* This case can occur if we saw a PLT reloc in an input - file, but the symbol was never referred to by a dynamic --- -2.25.1 - diff --git a/package/binutils/2.35.2/0004-or1k-Implement-relocation-R_OR1K_GOT_AHI16-for-gotha.patch b/package/binutils/2.35.2/0004-or1k-Implement-relocation-R_OR1K_GOT_AHI16-for-gotha.patch deleted file mode 100644 index a4af57d546..0000000000 --- a/package/binutils/2.35.2/0004-or1k-Implement-relocation-R_OR1K_GOT_AHI16-for-gotha.patch +++ /dev/null @@ -1,256 +0,0 @@ -From c67656e248d6dadaa2729975a17c8dd03afe48d0 Mon Sep 17 00:00:00 2001 -From: Stafford Horne -Date: Sun, 2 May 2021 06:02:15 +0900 -Subject: [PATCH] or1k: Implement relocation R_OR1K_GOT_AHI16 for gotha() - -The gotha() relocation mnemonic will be outputted by OpenRISC GCC when -using the -mcmodel=large option. This relocation is used along with -got() to generate 32-bit GOT offsets. This increases the previous GOT -offset limit from the previous 16-bit (64K) limit. - -This is needed on large binaries where the GOT grows larger than 64k. - -bfd/ChangeLog: - - PR 21464 - * bfd-in2.h: Add BFD_RELOC_OR1K_GOT_AHI16 relocation. - * elf32-or1k.c (or1k_elf_howto_table, or1k_reloc_map): Likewise. - (or1k_final_link_relocate, or1k_elf_relocate_section, - or1k_elf_check_relocs): Likewise. - * libbfd.h (bfd_reloc_code_real_names): Likewise. - * reloc.c: Likewise. - -cpu/ChangeLog: - - PR 21464 - * or1k.opc (or1k_imm16_relocs, parse_reloc): Define parse logic - for gotha() relocation. - -include/ChangeLog: - - PR 21464 - * elf/or1k.h (elf_or1k_reloc_type): Define R_OR1K_GOT_AHI16 number. - -opcodes/ChangeLog: - - PR 21464 - * or1k-asm.c: Regenerate. - -gas/ChangeLog: - - PR 21464 - * testsuite/gas/or1k/reloc-1.s: Add test for new relocation. - * testsuite/gas/or1k/reloc-1.d: Add test result for new - relocation. - -Cc: Giulio Benetti - -fixup reloc, add tests - -Signed-off-by: Giulio Benetti ---- - bfd/bfd-in2.h | 1 + - bfd/elf32-or1k.c | 21 ++++++++++++++++++++- - bfd/libbfd.h | 1 + - bfd/reloc.c | 2 ++ - cpu/or1k.opc | 7 ++++++- - gas/testsuite/gas/or1k/reloc-1.d | 4 +++- - gas/testsuite/gas/or1k/reloc-1.s | 4 ++++ - include/elf/or1k.h | 1 + - opcodes/or1k-asm.c | 7 ++++++- - 9 files changed, 44 insertions(+), 4 deletions(-) - -diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h -index df6f9f45673..ab861395e93 100644 ---- a/bfd/bfd-in2.h -+++ b/bfd/bfd-in2.h -@@ -5041,6 +5041,7 @@ then it may be truncated to 8 bits. */ - BFD_RELOC_OR1K_TLS_TPOFF, - BFD_RELOC_OR1K_TLS_DTPOFF, - BFD_RELOC_OR1K_TLS_DTPMOD, -+ BFD_RELOC_OR1K_GOT_AHI16, - - /* H8 elf Relocations. */ - BFD_RELOC_H8_DIR16A8, -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index bbfa2bfe614..8e395827123 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -808,6 +808,20 @@ static reloc_howto_type or1k_elf_howto_table[] = - 0, /* Source Mask. */ - 0x03ffffff, /* Dest Mask. */ - TRUE), /* PC relative offset? */ -+ -+ HOWTO (R_OR1K_GOT_AHI16, /* type */ -+ 16, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_signed, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_OR1K_GOT_AHI16", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ - }; - - /* Map BFD reloc types to Or1k ELF reloc types. */ -@@ -871,6 +885,7 @@ static const struct or1k_reloc_map or1k_reloc_map[] = - { BFD_RELOC_OR1K_TLS_IE_LO13, R_OR1K_TLS_IE_LO13 }, - { BFD_RELOC_OR1K_SLO13, R_OR1K_SLO13 }, - { BFD_RELOC_OR1K_PLTA26, R_OR1K_PLTA26 }, -+ { BFD_RELOC_OR1K_GOT_AHI16, R_OR1K_GOT_AHI16 }, - }; - - /* tls_type is a mask used to track how each symbol is accessed, -@@ -1113,6 +1128,7 @@ or1k_final_link_relocate (reloc_howto_type *howto, bfd *input_bfd, - switch (howto->type) - { - case R_OR1K_AHI16: -+ case R_OR1K_GOT_AHI16: - case R_OR1K_GOTOFF_AHI16: - case R_OR1K_TLS_IE_AHI16: - case R_OR1K_TLS_LE_AHI16: -@@ -1375,6 +1391,7 @@ or1k_elf_relocate_section (bfd *output_bfd, - } - break; - -+ case R_OR1K_GOT_AHI16: - case R_OR1K_GOT16: - case R_OR1K_GOT_PG21: - case R_OR1K_GOT_LO13: -@@ -1466,7 +1483,8 @@ or1k_elf_relocate_section (bfd *output_bfd, - /* The GOT_PG21 and GOT_LO13 relocs are pc-relative, - while the GOT16 reloc is GOT relative. */ - relocation = got_base + off; -- if (r_type == R_OR1K_GOT16) -+ if (r_type == R_OR1K_GOT16 -+ || r_type == R_OR1K_GOT_AHI16) - relocation -= got_sym_value; - - /* Addend should be zero. */ -@@ -1992,6 +2010,7 @@ or1k_elf_check_relocs (bfd *abfd, - } - break; - -+ case R_OR1K_GOT_AHI16: - case R_OR1K_GOT16: - case R_OR1K_GOT_PG21: - case R_OR1K_GOT_LO13: -diff --git a/bfd/libbfd.h b/bfd/libbfd.h -index b97534fc9fe..795c9b9d27f 100644 ---- a/bfd/libbfd.h -+++ b/bfd/libbfd.h -@@ -2755,6 +2755,7 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@", - "BFD_RELOC_OR1K_TLS_TPOFF", - "BFD_RELOC_OR1K_TLS_DTPOFF", - "BFD_RELOC_OR1K_TLS_DTPMOD", -+ "BFD_RELOC_OR1K_GOT_AHI16", - "BFD_RELOC_H8_DIR16A8", - "BFD_RELOC_H8_DIR16R8", - "BFD_RELOC_H8_DIR24A8", -diff --git a/bfd/reloc.c b/bfd/reloc.c -index 9aba84ca81e..1e021febef2 100644 ---- a/bfd/reloc.c -+++ b/bfd/reloc.c -@@ -6175,6 +6175,8 @@ ENUMX - BFD_RELOC_OR1K_GOTPC_HI16 - ENUMX - BFD_RELOC_OR1K_GOTPC_LO16 -+ENUMX -+ BFD_RELOC_OR1K_GOT_AHI16 - ENUMX - BFD_RELOC_OR1K_GOT16 - ENUMX -diff --git a/cpu/or1k.opc b/cpu/or1k.opc -index f0adcbb00a5..5d20a1f33a7 100644 ---- a/cpu/or1k.opc -+++ b/cpu/or1k.opc -@@ -193,7 +193,7 @@ static const bfd_reloc_code_real_type or1k_imm16_relocs[][6] = { - BFD_RELOC_OR1K_GOT_LO13, - BFD_RELOC_UNUSED, - BFD_RELOC_UNUSED, -- BFD_RELOC_UNUSED }, -+ BFD_RELOC_OR1K_GOT_AHI16 }, - { BFD_RELOC_OR1K_GOTPC_LO16, - BFD_RELOC_UNUSED, - BFD_RELOC_UNUSED, -@@ -296,6 +296,11 @@ parse_reloc (const char **strp) - str += 5; - cls = RCLASS_TPOFF; - } -+ else if (strncasecmp (str, "got", 3) == 0) -+ { -+ str += 3; -+ cls = RCLASS_GOT; -+ } - - if (strncasecmp (str, "hi(", 3) == 0) - { -diff --git a/gas/testsuite/gas/or1k/reloc-1.d b/gas/testsuite/gas/or1k/reloc-1.d -index d1bcf5608bb..3a001c4ed99 100644 ---- a/gas/testsuite/gas/or1k/reloc-1.d -+++ b/gas/testsuite/gas/or1k/reloc-1.d -@@ -68,5 +68,7 @@ OFFSET TYPE VALUE - 000000ec R_OR1K_LO13 x - 000000f0 R_OR1K_GOT_LO13 x - 000000f4 R_OR1K_SLO13 x -- -+000000f8 R_OR1K_GOT_AHI16 x -+000000fc R_OR1K_GOT_AHI16 x -+00000100 R_OR1K_GOT_AHI16 x - -diff --git a/gas/testsuite/gas/or1k/reloc-1.s b/gas/testsuite/gas/or1k/reloc-1.s -index e76abef6532..562609aa869 100644 ---- a/gas/testsuite/gas/or1k/reloc-1.s -+++ b/gas/testsuite/gas/or1k/reloc-1.s -@@ -74,3 +74,7 @@ - l.lbz r5,po(x)(r3) - l.lbz r5,gotpo(x)(r3) - l.sb po(x)(r3),r6 -+ -+ l.movhi r4,gotha(x) -+ l.ori r3,r4,gotha(x) -+ l.addi r3,r4,gotha(x) -diff --git a/include/elf/or1k.h b/include/elf/or1k.h -index a215ef5c17e..dff37d875f2 100644 ---- a/include/elf/or1k.h -+++ b/include/elf/or1k.h -@@ -77,6 +77,7 @@ START_RELOC_NUMBERS (elf_or1k_reloc_type) - RELOC_NUMBER (R_OR1K_TLS_IE_LO13, 51) - RELOC_NUMBER (R_OR1K_SLO13, 52) - RELOC_NUMBER (R_OR1K_PLTA26, 53) -+ RELOC_NUMBER (R_OR1K_GOT_AHI16, 54) - END_RELOC_NUMBERS (R_OR1K_max) - - #define EF_OR1K_NODELAY (1UL << 0) -diff --git a/opcodes/or1k-asm.c b/opcodes/or1k-asm.c -index 5f3c6c74b12..e0c49b3b8cd 100644 ---- a/opcodes/or1k-asm.c -+++ b/opcodes/or1k-asm.c -@@ -177,7 +177,7 @@ static const bfd_reloc_code_real_type or1k_imm16_relocs[][6] = { - BFD_RELOC_OR1K_GOT_LO13, - BFD_RELOC_UNUSED, - BFD_RELOC_UNUSED, -- BFD_RELOC_UNUSED }, -+ BFD_RELOC_OR1K_GOT_AHI16 }, - { BFD_RELOC_OR1K_GOTPC_LO16, - BFD_RELOC_UNUSED, - BFD_RELOC_UNUSED, -@@ -280,6 +280,11 @@ parse_reloc (const char **strp) - str += 5; - cls = RCLASS_TPOFF; - } -+ else if (strncasecmp (str, "got", 3) == 0) -+ { -+ str += 3; -+ cls = RCLASS_GOT; -+ } - - if (strncasecmp (str, "hi(", 3) == 0) - { --- -2.25.1 - diff --git a/package/binutils/2.35.2/0005-or1k-Avoid-R_OR1K_GOT16-overflow-failures-in-presenc.patch b/package/binutils/2.35.2/0005-or1k-Avoid-R_OR1K_GOT16-overflow-failures-in-presenc.patch deleted file mode 100644 index 82198dd373..0000000000 --- a/package/binutils/2.35.2/0005-or1k-Avoid-R_OR1K_GOT16-overflow-failures-in-presenc.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 097b83a1c9c694a14e6081cee034bf24f16875c1 Mon Sep 17 00:00:00 2001 -From: Stafford Horne -Date: Sun, 2 May 2021 06:02:16 +0900 -Subject: [PATCH] or1k: Avoid R_OR1K_GOT16 overflow failures in presence of - R_OR1K_GOT_AHI16 - -Now that we support R_OR1K_GOT_AHI16 we can relax the R_OR1K_GOT16 -overflow validation check if the section has R_OR1K_GOT_AHI16. - -We cannot simple disable R_OR1K_GOT16 overflow validation as there will -still be binaries that will have only R_OR1K_GOT16. The -R_OR1K_GOT_AHI16 relocation will only be added by GCC when building with -the option -mcmodel=large. - -This assumes that R_OR1K_GOT_AHI16 will come before R_OR1K_GOT16, which -is the code pattern that will be emitted by GCC. - -bfd/ChangeLog: - - PR 21464 - * elf32-or1k.c (or1k_elf_relocate_section): Relax R_OR1K_GOT16 - overflow check if we have R_OR1K_GOT_AHI16 followed by - R_OR1K_GOT16. - -Signed-off-by: Giulio Benetti ---- - bfd/elf32-or1k.c | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index 8e395827123..9f315bfda99 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -1280,6 +1280,7 @@ or1k_elf_relocate_section (bfd *output_bfd, - asection *sgot, *splt; - bfd_vma plt_base, got_base, got_sym_value; - bfd_boolean ret_val = TRUE; -+ bfd_boolean saw_gotha = FALSE; - - if (htab == NULL) - return FALSE; -@@ -1487,6 +1488,16 @@ or1k_elf_relocate_section (bfd *output_bfd, - || r_type == R_OR1K_GOT_AHI16) - relocation -= got_sym_value; - -+ if (r_type == R_OR1K_GOT_AHI16) -+ saw_gotha = TRUE; -+ -+ /* If we have a R_OR1K_GOT16 followed by 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. */ -+ if (r_type == R_OR1K_GOT16 && saw_gotha) -+ relocation &= 0xffff; -+ - /* Addend should be zero. */ - if (rel->r_addend != 0) - { --- -2.25.1 - diff --git a/package/binutils/2.35.2/0006-or1k-Support-large-plt_relocs-when-generating-plt-en.patch b/package/binutils/2.35.2/0006-or1k-Support-large-plt_relocs-when-generating-plt-en.patch deleted file mode 100644 index c884ab874d..0000000000 --- a/package/binutils/2.35.2/0006-or1k-Support-large-plt_relocs-when-generating-plt-en.patch +++ /dev/null @@ -1,500 +0,0 @@ -From c87692eb894b4b86eced7b7ba205f9bf27c2c213 Mon Sep 17 00:00:00 2001 -From: Stafford Horne -Date: Sun, 2 May 2021 06:02:17 +0900 -Subject: [PATCH] or1k: Support large plt_relocs when generating plt - entries - -The current PLT generation code will generate invalid code when the PLT -relocation offset exceeds 64k. This fixes the issue by detecting large -plt_reloc offsets and generare code sequences to create larger plt -relocations. - -The "large" plt code needs 2 extra instructions to create 32-bit offsets. - -bfd/ChangeLog: - - PR 27746 - * elf32-or1k.c (PLT_ENTRY_SIZE_LARGE, PLT_MAX_INSN_COUNT, - OR1K_ADD, OR1K_ORI): New macros to help with plt creation. - (elf_or1k_link_hash_table): New field plt_count. - (elf_or1k_link_hash_entry): New field plt_index. - (elf_or1k_plt_entry_size): New function. - (or1k_write_plt_entry): Update to support variable size PLTs. - (or1k_elf_finish_dynamic_sections): Use new or1k_write_plt_entry - API. - (or1k_elf_finish_dynamic_symbol): Update to write large PLTs - when needed. - (allocate_dynrelocs): Use elf_or1k_plt_entry_size to account for - PLT size. - -ld/ChangeLog: - - PR 27746 - testsuite/ld-or1k/or1k.exp (or1kplttests): Add tests for linking - along with gotha() relocations. - testsuite/ld-or1k/gotha1.dd: New file. - testsuite/ld-or1k/gotha1.s: New file. - testsuite/ld-or1k/gotha2.dd: New file. - testsuite/ld-or1k/gotha2.s: New file - testsuite/ld-or1k/pltlib.s (x): Define size to avoid link - failure. - -Signed-off-by: Giulio Benetti ---- - bfd/elf32-or1k.c | 149 ++++++++++++++++++++++++--------- - ld/testsuite/ld-or1k/gotha1.dd | 34 ++++++++ - ld/testsuite/ld-or1k/gotha1.s | 24 ++++++ - ld/testsuite/ld-or1k/gotha2.dd | 21 +++++ - ld/testsuite/ld-or1k/gotha2.s | 22 +++++ - ld/testsuite/ld-or1k/or1k.exp | 8 ++ - ld/testsuite/ld-or1k/pltlib.s | 1 + - 7 files changed, 220 insertions(+), 39 deletions(-) - create mode 100644 ld/testsuite/ld-or1k/gotha1.dd - create mode 100644 ld/testsuite/ld-or1k/gotha1.s - create mode 100644 ld/testsuite/ld-or1k/gotha2.dd - create mode 100644 ld/testsuite/ld-or1k/gotha2.s - -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index 9f315bfda99..7a14eaa3a46 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -30,10 +30,14 @@ - #define N_ONES(X) (((bfd_vma)2 << (X)) - 1) - - #define PLT_ENTRY_SIZE 16 -+#define PLT_ENTRY_SIZE_LARGE (6*4) -+#define PLT_MAX_INSN_COUNT 6 - - #define OR1K_MOVHI(D) (0x18000000 | (D << 21)) - #define OR1K_ADRP(D) (0x08000000 | (D << 21)) - #define OR1K_LWZ(D,A) (0x84000000 | (D << 21) | (A << 16)) -+#define OR1K_ADD(D,A,B) (0xE0000000 | (D << 21) | (A << 16) | (B << 11)) -+#define OR1K_ORI(D,A) (0xA8000000 | (D << 21) | (A << 16)) - #define OR1K_ORI0(D) (0xA8000000 | (D << 21)) - #define OR1K_JR(B) (0x44000000 | (B << 11)) - #define OR1K_NOP 0x15000000 -@@ -907,6 +911,8 @@ struct elf_or1k_link_hash_entry - { - struct elf_link_hash_entry root; - -+ /* For calculating PLT size. */ -+ bfd_vma plt_index; - /* Track type of TLS access. */ - unsigned char tls_type; - }; -@@ -934,9 +940,20 @@ struct elf_or1k_link_hash_table - /* Small local sym to section mapping cache. */ - struct sym_cache sym_sec; - -+ bfd_vma plt_count; - bfd_boolean saw_plta; - }; - -+static size_t -+elf_or1k_plt_entry_size (bfd_vma plt_index) -+{ -+ bfd_vma plt_reloc; -+ -+ plt_reloc = plt_index * sizeof (Elf32_External_Rela); -+ -+ return (plt_reloc > 0xffff) ? PLT_ENTRY_SIZE_LARGE : PLT_ENTRY_SIZE; -+} -+ - /* Get the ELF linker hash table from a link_info structure. */ - #define or1k_elf_hash_table(p) \ - (elf_hash_table_id ((struct elf_link_hash_table *) ((p)->hash)) \ -@@ -2224,33 +2241,46 @@ or1k_elf_check_relocs (bfd *abfd, - } - - static void --or1k_write_plt_entry (bfd *output_bfd, bfd_byte *contents, unsigned insn1, -- unsigned insn2, unsigned insn3, unsigned insnj) -+or1k_write_plt_entry (bfd *output_bfd, bfd_byte *contents, unsigned insnj, -+ unsigned insns[], size_t insn_count) - { - unsigned nodelay = elf_elfheader (output_bfd)->e_flags & EF_OR1K_NODELAY; -- unsigned insn4; -+ unsigned output_insns[PLT_MAX_INSN_COUNT]; -+ -+ /* Copy instructions into the output buffer. */ -+ for (size_t i = 0; i < insn_count; i++) -+ output_insns[i] = insns[i]; - - /* Honor the no-delay-slot setting. */ -- if (insn3 == OR1K_NOP) -+ if (insns[insn_count-1] == OR1K_NOP) - { -- insn4 = insn3; -+ unsigned slot1, slot2; -+ - if (nodelay) -- insn3 = insnj; -+ slot1 = insns[insn_count-2], slot2 = insnj; - else -- insn3 = insn2, insn2 = insnj; -+ slot1 = insnj, slot2 = insns[insn_count-2]; -+ -+ output_insns[insn_count-2] = slot1; -+ output_insns[insn_count-1] = slot2; -+ output_insns[insn_count] = OR1K_NOP; - } - else - { -+ unsigned slot1, slot2; -+ - if (nodelay) -- insn4 = insnj; -+ slot1 = insns[insn_count-1], slot2 = insnj; - else -- insn4 = insn3, insn3 = insnj; -+ slot1 = insnj, slot2 = insns[insn_count-1]; -+ -+ output_insns[insn_count-1] = slot1; -+ output_insns[insn_count] = slot2; - } - -- bfd_put_32 (output_bfd, insn1, contents); -- bfd_put_32 (output_bfd, insn2, contents + 4); -- bfd_put_32 (output_bfd, insn3, contents + 8); -- bfd_put_32 (output_bfd, insn4, contents + 12); -+ /* Write out the output buffer. */ -+ for (size_t i = 0; i < (insn_count+1); i++) -+ bfd_put_32 (output_bfd, output_insns[i], contents + (i*4)); - } - - /* Finish up the dynamic sections. */ -@@ -2317,7 +2347,8 @@ or1k_elf_finish_dynamic_sections (bfd *output_bfd, - splt = htab->root.splt; - if (splt && splt->size > 0) - { -- unsigned plt0, plt1, plt2; -+ unsigned plt[PLT_MAX_INSN_COUNT]; -+ size_t plt_insn_count = 3; - bfd_vma got_addr = sgot->output_section->vma + sgot->output_offset; - - /* Note we force 16 byte alignment on the .got, so that -@@ -2328,27 +2359,27 @@ or1k_elf_finish_dynamic_sections (bfd *output_bfd, - bfd_vma pc = splt->output_section->vma + splt->output_offset; - unsigned pa = ((got_addr >> 13) - (pc >> 13)) & 0x1fffff; - unsigned po = got_addr & 0x1fff; -- plt0 = OR1K_ADRP(12) | pa; -- plt1 = OR1K_LWZ(15,12) | (po + 8); -- plt2 = OR1K_LWZ(12,12) | (po + 4); -+ plt[0] = OR1K_ADRP(12) | pa; -+ plt[1] = OR1K_LWZ(15,12) | (po + 8); -+ plt[2] = OR1K_LWZ(12,12) | (po + 4); - } - else if (bfd_link_pic (info)) - { -- plt0 = OR1K_LWZ(15, 16) | 8; /* .got+8 */ -- plt1 = OR1K_LWZ(12, 16) | 4; /* .got+4 */ -- plt2 = OR1K_NOP; -+ plt[0] = OR1K_LWZ(15, 16) | 8; /* .got+8 */ -+ plt[1] = OR1K_LWZ(12, 16) | 4; /* .got+4 */ -+ plt[2] = OR1K_NOP; - } - else - { - unsigned ha = ((got_addr + 0x8000) >> 16) & 0xffff; - unsigned lo = got_addr & 0xffff; -- plt0 = OR1K_MOVHI(12) | ha; -- plt1 = OR1K_LWZ(15,12) | (lo + 8); -- plt2 = OR1K_LWZ(12,12) | (lo + 4); -+ plt[0] = OR1K_MOVHI(12) | ha; -+ plt[1] = OR1K_LWZ(15,12) | (lo + 8); -+ plt[2] = OR1K_LWZ(12,12) | (lo + 4); - } - -- or1k_write_plt_entry (output_bfd, splt->contents, -- plt0, plt1, plt2, OR1K_JR(15)); -+ or1k_write_plt_entry (output_bfd, splt->contents, OR1K_JR(15), -+ plt, plt_insn_count); - - elf_section_data (splt->output_section)->this_hdr.sh_entsize = 4; - } -@@ -2391,7 +2422,8 @@ or1k_elf_finish_dynamic_symbol (bfd *output_bfd, - - if (h->plt.offset != (bfd_vma) -1) - { -- unsigned int plt0, plt1, plt2; -+ unsigned int plt[PLT_MAX_INSN_COUNT]; -+ size_t plt_insn_count = 3; - asection *splt; - asection *sgot; - asection *srela; -@@ -2403,6 +2435,7 @@ or1k_elf_finish_dynamic_symbol (bfd *output_bfd, - bfd_vma got_offset; - bfd_vma got_addr; - Elf_Internal_Rela rela; -+ bfd_boolean large_plt_entry; - - /* This symbol has an entry in the procedure linkage table. Set - it up. */ -@@ -2420,10 +2453,13 @@ or1k_elf_finish_dynamic_symbol (bfd *output_bfd, - corresponds to this symbol. This is the index of this symbol - in all the symbols for which we are making plt entries. The - first entry in the procedure linkage table is reserved. */ -- plt_index = h->plt.offset / PLT_ENTRY_SIZE - 1; -+ plt_index = ((struct elf_or1k_link_hash_entry *) h)->plt_index; - plt_addr = plt_base_addr + h->plt.offset; - plt_reloc = plt_index * sizeof (Elf32_External_Rela); - -+ large_plt_entry = (elf_or1k_plt_entry_size (plt_index) -+ == PLT_ENTRY_SIZE_LARGE); -+ - /* Get the offset into the .got table of the entry that - corresponds to this function. Each .got entry is 4 bytes. - The first three are reserved. */ -@@ -2435,27 +2471,57 @@ or1k_elf_finish_dynamic_symbol (bfd *output_bfd, - { - unsigned pa = ((got_addr >> 13) - (plt_addr >> 13)) & 0x1fffff; - unsigned po = (got_addr & 0x1fff); -- plt0 = OR1K_ADRP(12) | pa; -- plt1 = OR1K_LWZ(12,12) | po; -- plt2 = OR1K_ORI0(11) | plt_reloc; -+ plt[0] = OR1K_ADRP(12) | pa; -+ plt[1] = OR1K_LWZ(12,12) | po; -+ plt[2] = OR1K_ORI0(11) | plt_reloc; - } - else if (bfd_link_pic (info)) - { -- plt0 = OR1K_LWZ(12,16) | got_offset; -- plt1 = OR1K_ORI0(11) | plt_reloc; -- plt2 = OR1K_NOP; -+ if (large_plt_entry) -+ { -+ unsigned gotha = ((got_offset + 0x8000) >> 16) & 0xffff; -+ unsigned got = got_offset & 0xffff; -+ unsigned pltrelhi = (plt_reloc >> 16) & 0xffff; -+ unsigned pltrello = plt_reloc & 0xffff; -+ -+ plt[0] = OR1K_MOVHI(12) | gotha; -+ plt[1] = OR1K_ADD(12,12,16); -+ plt[2] = OR1K_LWZ(12,12) | got; -+ plt[3] = OR1K_MOVHI(11) | pltrelhi; -+ plt[4] = OR1K_ORI(11,11) | pltrello; -+ plt_insn_count = 5; -+ } -+ else -+ { -+ plt[0] = OR1K_LWZ(12,16) | got_offset; -+ plt[1] = OR1K_ORI0(11) | plt_reloc; -+ plt[2] = OR1K_NOP; -+ } - } - else - { - unsigned ha = ((got_addr + 0x8000) >> 16) & 0xffff; - unsigned lo = got_addr & 0xffff; -- plt0 = OR1K_MOVHI(12) | ha; -- plt1 = OR1K_LWZ(12,12) | lo; -- plt2 = OR1K_ORI0(11) | plt_reloc; -+ plt[0] = OR1K_MOVHI(12) | ha; -+ plt[1] = OR1K_LWZ(12,12) | lo; -+ plt[2] = OR1K_ORI0(11) | plt_reloc; -+ } -+ -+ /* For large code model we fixup the non-PIC PLT relocation instructions -+ here. */ -+ if (large_plt_entry && !bfd_link_pic (info)) -+ { -+ unsigned pltrelhi = (plt_reloc >> 16) & 0xffff; -+ unsigned pltrello = plt_reloc & 0xffff; -+ -+ plt[2] = OR1K_MOVHI(11) | pltrelhi; -+ plt[3] = OR1K_ORI(11,11) | pltrello; -+ plt[4] = OR1K_NOP; -+ plt_insn_count = 5; - } - - or1k_write_plt_entry (output_bfd, splt->contents + h->plt.offset, -- plt0, plt1, plt2, OR1K_JR(12)); -+ OR1K_JR(12), plt, plt_insn_count); - - /* Fill in the entry in the global offset table. We initialize it to - point to the top of the plt. This is done to lazy lookup the actual -@@ -2779,11 +2845,16 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf) - if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, bfd_link_pic (info), h)) - { - asection *splt = htab->root.splt; -+ bfd_vma plt_index; -+ -+ /* Track the index of our plt entry for use in calculating size. */ -+ plt_index = htab->plt_count++; -+ ((struct elf_or1k_link_hash_entry *) h)->plt_index = plt_index; - - /* If this is the first .plt entry, make room for the special - first entry. */ - if (splt->size == 0) -- splt->size = PLT_ENTRY_SIZE; -+ splt->size = elf_or1k_plt_entry_size (plt_index); - - h->plt.offset = splt->size; - -@@ -2800,7 +2871,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf) - } - - /* Make room for this entry. */ -- splt->size += PLT_ENTRY_SIZE; -+ splt->size += elf_or1k_plt_entry_size (plt_index); - - /* We also need to make an entry in the .got.plt section, which - will be placed in the .got section by the linker script. */ -diff --git a/ld/testsuite/ld-or1k/gotha1.dd b/ld/testsuite/ld-or1k/gotha1.dd -new file mode 100644 -index 00000000000..0ad1f8f5399 ---- /dev/null -+++ b/ld/testsuite/ld-or1k/gotha1.dd -@@ -0,0 +1,34 @@ -+ -+.*\.x: file format elf32-or1k -+ -+ -+Disassembly of section \.plt: -+ -+[0-9a-f]+ <\.plt>: -+ +[0-9a-f]+: 19 80 00 00 l\.movhi r12,0x0 -+ +[0-9a-f]+: 85 ec [0-9a-f]+ [0-9a-f]+ l\.lwz r15,[0-9]+\(r12\) -+ +[0-9a-f]+: 44 00 78 00 l\.jr r15 -+ +[0-9a-f]+: 85 8c [0-9a-f]+ [0-9a-f]+ l\.lwz r12,[0-9]+\(r12\) -+ +[0-9a-f]+: 19 80 00 00 l\.movhi r12,0x0 -+ +[0-9a-f]+: 85 8c [0-9a-f]+ [0-9a-f]+ l\.lwz r12,[0-9]+\(r12\) -+ +[0-9a-f]+: 44 00 60 00 l\.jr r12 -+ +[0-9a-f]+: a9 60 00 00 l\.ori r11,r0,0x0 -+ -+Disassembly of section \.text: -+ -+[0-9a-f]+ <_start>: -+ +[0-9a-f]+: 9c 21 ff fc l\.addi r1,r1,-4 -+ +[0-9a-f]+: d4 01 48 00 l\.sw 0\(r1\),r9 -+ +[0-9a-f]+: 04 00 00 02 l\.jal [0-9a-f]+ <_start\+0x10> -+ +[0-9a-f]+: 1a 60 00 00 l\.movhi r19,0x0 -+ +[0-9a-f]+: aa 73 [0-9a-f]+ [0-9a-f]+ l\.ori r19,r19,0x[0-9a-f]+ -+ +[0-9a-f]+: e2 73 48 00 l\.add r19,r19,r9 -+ +[0-9a-f]+: 1a 20 00 00 l\.movhi r17,0x0 -+ +[0-9a-f]+: e2 31 98 00 l\.add r17,r17,r19 -+ +[0-9a-f]+: 86 31 00 10 l\.lwz r17,16\(r17\) -+ +[0-9a-f]+: 84 71 00 00 l\.lwz r3,0\(r17\) -+ +[0-9a-f]+: 07 ff ff f2 l\.jal [0-9a-f]+ <\.plt\+0x10> -+ +[0-9a-f]+: 15 00 00 00 l\.nop 0x0 -+ +[0-9a-f]+: 85 21 00 00 l\.lwz r9,0\(r1\) -+ +[0-9a-f]+: 44 00 48 00 l\.jr r9 -+ +[0-9a-f]+: 9c 21 00 04 l\.addi r1,r1,4 -diff --git a/ld/testsuite/ld-or1k/gotha1.s b/ld/testsuite/ld-or1k/gotha1.s -new file mode 100644 -index 00000000000..42b16db425c ---- /dev/null -+++ b/ld/testsuite/ld-or1k/gotha1.s -@@ -0,0 +1,24 @@ -+ .data -+ .p2align 16 -+ -+ .text -+ .globl _start -+_start: -+ l.addi r1, r1, -4 -+ l.sw 0(r1), r9 -+ -+ l.jal 8 -+ l.movhi r19, gotpchi(_GLOBAL_OFFSET_TABLE_-4) -+ l.ori r19, r19, gotpclo(_GLOBAL_OFFSET_TABLE_+0) -+ l.add r19, r19, r9 -+ -+ l.movhi r17, gotha(x) -+ l.add r17, r17, r19 -+ l.lwz r17, got(x)(r17) -+ l.lwz r3, 0(r17) -+ -+ l.jal plt(func) -+ l.nop -+ l.lwz r9, 0(r1) -+ l.jr r9 -+ l.addi r1, r1, 4 -diff --git a/ld/testsuite/ld-or1k/gotha2.dd b/ld/testsuite/ld-or1k/gotha2.dd -new file mode 100644 -index 00000000000..fe09da5466b ---- /dev/null -+++ b/ld/testsuite/ld-or1k/gotha2.dd -@@ -0,0 +1,21 @@ -+ -+.*\.x: file format elf32-or1k -+ -+ -+Disassembly of section \.text: -+ -+[0-9a-f]+ : -+ +[0-9a-f]+: 9c 21 ff f8 l\.addi r1,r1,-8 -+ +[0-9a-f]+: d4 01 80 00 l\.sw 0\(r1\),r16 -+ +[0-9a-f]+: d4 01 48 04 l\.sw 4\(r1\),r9 -+ +[0-9a-f]+: 04 00 [0-9a-f]+ [0-9a-f]+ l\.jal [0-9a-f]+ -+ +[0-9a-f]+: 1a 00 00 00 l\.movhi r16,0x0 -+ +[0-9a-f]+: aa 10 [0-9a-f]+ [0-9a-f]+ l\.ori r16,r16,0x[0-9a-f]+ -+ +[0-9a-f]+: e2 10 48 00 l\.add r16,r16,r9 -+ +[0-9a-f]+: 1a 20 00 00 l\.movhi r17,0x0 -+ +[0-9a-f]+: e2 31 80 00 l\.add r17,r17,r16 -+ +[0-9a-f]+: 86 31 00 0c l\.lwz r17,12\(r17\) -+ +[0-9a-f]+: 85 21 00 04 l\.lwz r9,4\(r1\) -+ +[0-9a-f]+: 86 01 00 00 l\.lwz r16,0\(r1\) -+ +[0-9a-f]+: 44 00 48 00 l\.jr r9 -+ +[0-9a-f]+: 9c 21 00 08 l\.addi r1,r1,8 -diff --git a/ld/testsuite/ld-or1k/gotha2.s b/ld/testsuite/ld-or1k/gotha2.s -new file mode 100644 -index 00000000000..164b282f2dd ---- /dev/null -+++ b/ld/testsuite/ld-or1k/gotha2.s -@@ -0,0 +1,22 @@ -+ .section .text -+ .align 4 -+ .global test -+ .type test, @function -+test: -+ l.addi r1, r1, -8 -+ l.sw 0(r1), r16 -+ l.sw 4(r1), r9 -+ -+ l.jal 8 -+ l.movhi r16, gotpchi(_GLOBAL_OFFSET_TABLE_-4) -+ l.ori r16, r16, gotpclo(_GLOBAL_OFFSET_TABLE_+0) -+ l.add r16, r16, r9 -+ -+ l.movhi r17, gotha(i) -+ l.add r17, r17, r16 -+ l.lwz r17, got(i)(r17) -+ -+ l.lwz r9, 4(r1) -+ l.lwz r16, 0(r1) -+ l.jr r9 -+ l.addi r1, r1, 8 -diff --git a/ld/testsuite/ld-or1k/or1k.exp b/ld/testsuite/ld-or1k/or1k.exp -index 7592e8307c1..8e19ec6c31a 100644 ---- a/ld/testsuite/ld-or1k/or1k.exp -+++ b/ld/testsuite/ld-or1k/or1k.exp -@@ -53,6 +53,14 @@ set or1kplttests { - "" {plt1.s} - {{objdump -dr plt1.x.dd}} - "plt1.x"} -+ {"gotha exec plt" "tmpdir/libpltlib.so" "" -+ "" {gotha1.s} -+ {{objdump -dr gotha1.dd}} -+ "gotha1.x"} -+ {"gotha -fpic -shared" "-fpic -shared" "" -+ "" {gotha2.s} -+ {{objdump -dr gotha2.dd}} -+ "gotha2.x"} - } - - # Not implemented yet -diff --git a/ld/testsuite/ld-or1k/pltlib.s b/ld/testsuite/ld-or1k/pltlib.s -index baf76ca1af7..8b4d7ba48fd 100644 ---- a/ld/testsuite/ld-or1k/pltlib.s -+++ b/ld/testsuite/ld-or1k/pltlib.s -@@ -1,5 +1,6 @@ - .section .data - .globl x, y -+ .size x, 4 - x: .long 33 - y: .long 44 - --- -2.25.1 - diff --git a/package/binutils/2.35.2/0007-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch b/package/binutils/2.35.2/0007-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch deleted file mode 100644 index c3978e22fa..0000000000 --- a/package/binutils/2.35.2/0007-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch +++ /dev/null @@ -1,50 +0,0 @@ -From c3003947e4bad18faea4337fd2073feeb30ee078 Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Wed, 9 Jun 2021 17:28:27 +0200 -Subject: [PATCH] bfd/elf32-or1k: fix building with gcc version < 5 - -Gcc version >= 5 has standard C mode not set to -std=gnu11, so if we use -an old compiler(i.e. gcc 4.9) build fails on: -``` -elf32-or1k.c:2251:3: error: 'for' loop initial declarations are only allowed in -C99 or C11 mode - for (size_t i = 0; i < insn_count; i++) - ^ -``` - -So let's declare `size_t i` at the top of the function instead of inside -for loop. - -Signed-off-by: Giulio Benetti ---- - bfd/elf32-or1k.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index 4ae7f324d33..32063ab0289 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -2244,9 +2244,10 @@ or1k_write_plt_entry (bfd *output_bfd, bfd_byte *contents, unsigned insnj, - { - unsigned nodelay = elf_elfheader (output_bfd)->e_flags & EF_OR1K_NODELAY; - unsigned output_insns[PLT_MAX_INSN_COUNT]; -+ size_t i; - - /* Copy instructions into the output buffer. */ -- for (size_t i = 0; i < insn_count; i++) -+ for (i = 0; i < insn_count; i++) - output_insns[i] = insns[i]; - - /* Honor the no-delay-slot setting. */ -@@ -2277,7 +2278,7 @@ or1k_write_plt_entry (bfd *output_bfd, bfd_byte *contents, unsigned insnj, - } - - /* Write out the output buffer. */ -- for (size_t i = 0; i < (insn_count+1); i++) -+ for (i = 0; i < (insn_count+1); i++) - bfd_put_32 (output_bfd, output_insns[i], contents + (i*4)); - } - --- -2.25.1 - diff --git a/package/binutils/2.35.2/0008-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch b/package/binutils/2.35.2/0008-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch deleted file mode 100644 index 585b97b2af..0000000000 --- a/package/binutils/2.35.2/0008-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 9af93e143a7fbdb75aa1ed37277f9250eb111628 Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Sat, 10 Jul 2021 17:57:34 +0200 -Subject: [PATCH] or1k: fix pc-relative relocation against dynamic on PC - relative 26 bit relocation - -When building openal we were seeing the assert failure: - -/home/buildroot/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: CMakeFiles/OpenAL.dir/al/source.cpp.o: -pc-relative relocation against dynamic symbol alSourcePausev -/home/buildroot/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: CMakeFiles/OpenAL.dir/al/source.cpp.o: -pc-relative relocation against dynamic symbol alSourceStopv -/home/buildroot/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: CMakeFiles/OpenAL.dir/al/source.cpp.o: -pc-relative relocation against dynamic symbol alSourceRewindv -/home/buildroot/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: CMakeFiles/OpenAL.dir/al/source.cpp.o: -pc-relative relocation against dynamic symbol alSourcePlayv -collect2: error: ld returned 1 exit status - -This happens because in R_OR1K_INSN_REL_26 case we can't reference local -symbol as previously done but we need to make sure that calls to actual -symbol always call the version of current object. - -bfd/Changelog: - - * elf32-or1k.c (or1k_elf_relocate_section): use a separate entry - in switch case R_OR1K_INSN_REL_26 where we need to check for - !SYMBOL_CALLS_LOCAL() instead of !SYMBOL_REFERENCES_LOCAL(). - -Signed-off-by: Giulio Benetti ---- - bfd/elf32-or1k.c | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index 4ae7f324d33..4f9092539f5 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -1543,6 +1543,18 @@ or1k_elf_relocate_section (bfd *output_bfd, - break; - - case R_OR1K_INSN_REL_26: -+ /* For a non-shared link, these will reference plt or call the -+ version of actual object. */ -+ if (bfd_link_pic (info) && !SYMBOL_CALLS_LOCAL (info, h)) -+ { -+ _bfd_error_handler -+ (_("%pB: pc-relative relocation against dynamic symbol %s"), -+ input_bfd, name); -+ ret_val = FALSE; -+ bfd_set_error (bfd_error_bad_value); -+ } -+ break; -+ - case R_OR1K_PCREL_PG21: - case R_OR1K_LO13: - case R_OR1K_SLO13: --- -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 deleted file mode 100644 index e96d49122a..0000000000 --- a/package/binutils/2.35.2/0009-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch +++ /dev/null @@ -1,75 +0,0 @@ -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.35.2/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch b/package/binutils/2.35.2/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch deleted file mode 100644 index e95eb1e7c5..0000000000 --- a/package/binutils/2.35.2/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 30a954525f4e53a9cd50a1a8a6f201c7cf6595c7 Mon Sep 17 00:00:00 2001 -From: "H.J. Lu" -Date: Mon, 7 Feb 2022 15:22:19 -0800 -Subject: [PATCH] i386: Allow GOT32 relocations against ABS symbols - -GOT32 relocations are allowed since absolute value + addend is stored in -the GOT slot. - -Tested on glibc 2.35 build with GCC 11.2 and -Os. - -bfd/ - - PR ld/28870 - * elfxx-x86.c (_bfd_elf_x86_valid_reloc_p): Also allow GOT32 - relocations. - -Signed-off-by: Waldemar Brodkorb - -diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c -index 7ac2411fc80..d00dc45677b 100644 ---- a/bfd/elfxx-x86.c -+++ b/bfd/elfxx-x86.c -@@ -1942,9 +1942,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section, - irel = *rel; - - /* Only allow relocations against absolute symbol, which can be -- resolved as absolute value + addend. GOTPCREL relocations -- are allowed since absolute value + addend is stored in the -- GOT slot. */ -+ resolved as absolute value + addend. GOTPCREL and GOT32 -+ relocations are allowed since absolute value + addend is -+ stored in the GOT slot. */ - if (bed->target_id == X86_64_ELF_DATA) - { - r_type &= ~R_X86_64_converted_reloc_bit; -@@ -1965,7 +1965,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section, - else - valid_p = (r_type == R_386_32 - || r_type == R_386_16 -- || r_type == R_386_8); -+ || r_type == R_386_8 -+ || r_type == R_386_GOT32 -+ || r_type == R_386_GOT32X); - - if (valid_p) - *no_dynreloc_p = true; diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index 17de6e4e41..21b15b5c36 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -16,13 +16,6 @@ config BR2_BINUTILS_VERSION_2_32_X bool "binutils 2.32" depends on !BR2_csky -config BR2_BINUTILS_VERSION_2_35_X - bool "binutils 2.35.2" - depends on !BR2_csky - # https://github.com/uclinux-dev/elf2flt/pull/16 - # https://github.com/uclinux-dev/elf2flt/issues/12 - depends on !BR2_BINFMT_FLAT - config BR2_BINUTILS_VERSION_2_36_X bool "binutils 2.36.1" depends on !BR2_csky @@ -52,7 +45,6 @@ config BR2_BINUTILS_VERSION string default "arc-2020.09-release" if BR2_BINUTILS_VERSION_ARC default "2.32" if BR2_BINUTILS_VERSION_2_32_X - default "2.35.2" if BR2_BINUTILS_VERSION_2_35_X default "2.36.1" if BR2_BINUTILS_VERSION_2_36_X default "2.37" if BR2_BINUTILS_VERSION_2_37_X default "2.38" if BR2_BINUTILS_VERSION_2_38_X diff --git a/package/binutils/binutils.hash b/package/binutils/binutils.hash index fe31b34d40..4141e0c5f2 100644 --- a/package/binutils/binutils.hash +++ b/package/binutils/binutils.hash @@ -1,6 +1,5 @@ # From ftp://gcc.gnu.org/pub/binutils/releases/sha512.sum sha512 d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724afa1e43bd0db45cfc9916b41519b67dfce03232aa4978704492a6994a binutils-2.32.tar.xz -sha512 9974ede5978d32e0d68fef23da48fa00bd06b0bff7ec45b00ca075c126d6bbe0cf2defc03ecc3f17bc6cc85b64271a13009c4049d7ba17de26e84e3a6e2c0348 binutils-2.35.2.tar.xz sha512 cc24590bcead10b90763386b6f96bb027d7594c659c2d95174a6352e8b98465a50ec3e4088d0da038428abe059bbc4ae5f37b269f31a40fc048072c8a234f4e9 binutils-2.36.1.tar.xz sha512 5c11aeef6935860a6819ed3a3c93371f052e52b4bdc5033da36037c1544d013b7f12cb8d561ec954fe7469a68f1b66f1a3cd53d5a3af7293635a90d69edd15e7 binutils-2.37.tar.xz sha512 8bf0b0d193c9c010e0518ee2b2e5a830898af206510992483b427477ed178396cd210235e85fd7bd99a96fc6d5eedbeccbd48317a10f752b7336ada8b2bb826d binutils-2.38.tar.xz -- 2.30.2 From wbx at openadk.org Mon Feb 14 05:15:14 2022 From: wbx at openadk.org (Waldemar Brodkorb) Date: Mon, 14 Feb 2022 06:15:14 +0100 Subject: [Buildroot] [PATCHv2 3/3] package/binutils: make 2.37 the default Message-ID: Signed-off-by: Waldemar Brodkorb --- v1->v2: no changes --- package/binutils/Config.in.host | 2 +- package/binutils/binutils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index 21b15b5c36..e639c67149 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -7,7 +7,7 @@ config BR2_PACKAGE_HOST_BINUTILS_SUPPORTS_CFI choice prompt "Binutils Version" - default BR2_BINUTILS_VERSION_2_36_X if !BR2_arc && !BR2_csky + default BR2_BINUTILS_VERSION_2_37_X if !BR2_arc && !BR2_csky default BR2_BINUTILS_VERSION_ARC if BR2_arc help Select the version of binutils you wish to use. diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index 8c4a1371ca..c94ebe0995 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -11,7 +11,7 @@ ifeq ($(BINUTILS_VERSION),) ifeq ($(BR2_arc),y) BINUTILS_VERSION = arc-2020.09-release else -BINUTILS_VERSION = 2.36.1 +BINUTILS_VERSION = 2.37 endif endif # BINUTILS_VERSION -- 2.30.2 From wbx at openadk.org Mon Feb 14 05:11:03 2022 From: wbx at openadk.org (Waldemar Brodkorb) Date: Mon, 14 Feb 2022 06:11:03 +0100 Subject: [Buildroot] [PATCHv2 1/3] package/binutils: add version 2.38 Message-ID: See: https://sourceware.org/pipermail/binutils/2022-February/119721.html i386-Allow-GOT32-relocations-against-ABS-symbols.patch is not required as it is in release. Signed-off-by: Waldemar Brodkorb --- v1->v2: add a comment about i386 patch --- package/binutils/2.38/0001-sh-conf.patch | 48 +++ .../2.38/0002-poison-system-directories.patch | 306 ++++++++++++++++++ ...or1k-fix-building-with-gcc-version-5.patch | 50 +++ ...K_GOT16-signed-overflow-by-using-spe.patch | 75 +++++ package/binutils/Config.in.host | 7 + package/binutils/binutils.hash | 1 + 6 files changed, 487 insertions(+) create mode 100644 package/binutils/2.38/0001-sh-conf.patch create mode 100644 package/binutils/2.38/0002-poison-system-directories.patch create mode 100644 package/binutils/2.38/0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch create mode 100644 package/binutils/2.38/0004-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch diff --git a/package/binutils/2.38/0001-sh-conf.patch b/package/binutils/2.38/0001-sh-conf.patch new file mode 100644 index 0000000000..fcc597e4d9 --- /dev/null +++ b/package/binutils/2.38/0001-sh-conf.patch @@ -0,0 +1,48 @@ +From 33f3c1f804efc2e4f97849081589efb70cda31e5 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 25 Dec 2015 11:38:13 +0100 +Subject: [PATCH] sh-conf + +Likewise, binutils has no idea about any of these new targets either, so we +fix that up too.. now we're able to actually build a real toolchain for +sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more +inept targets than that one, really. Go look, I promise). + +[Romain: rebase on top of 2.32] +Signed-off-by: Romain Naour +[Thomas: rebase on top of 2.29, in which sh64 support was removed.] +Signed-off-by: Thomas Petazzoni +--- + configure | 2 +- + configure.ac | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 3dd206525a7..6881ce632f5 100755 +--- a/configure ++++ b/configure +@@ -3892,7 +3892,7 @@ case "${target}" in + nvptx*-*-*) + noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" + ;; +- sh-*-*) ++ sh*-*-*) + case "${target}" in + sh*-*-elf) + ;; +diff --git a/configure.ac b/configure.ac +index 797a624621e..1f9256bbf18 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1175,7 +1175,7 @@ case "${target}" in + nvptx*-*-*) + noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" + ;; +- sh-*-*) ++ sh*-*-*) + case "${target}" in + sh*-*-elf) + ;; +-- +2.31.1 + diff --git a/package/binutils/2.38/0002-poison-system-directories.patch b/package/binutils/2.38/0002-poison-system-directories.patch new file mode 100644 index 0000000000..1a5fe46575 --- /dev/null +++ b/package/binutils/2.38/0002-poison-system-directories.patch @@ -0,0 +1,306 @@ +From 4d8705ddb55897e8a74b617ab95736d520d9e1ea Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 25 Dec 2015 11:45:38 +0100 +Subject: [PATCH] poison-system-directories + +Patch adapted to binutils 2.23.2 and extended to use +BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni. + +[Romain: rebase on top of 2.33.1] +Signed-off-by: Romain Naour +[Gustavo: adapt to binutils 2.25] +Signed-off-by: Thomas Petazzoni +Signed-off-by: Gustavo Zacarias + +Upstream-Status: Inappropriate [distribution: codesourcery] + +Patch originally created by Mark Hatle, forward-ported to +binutils 2.21 by Scott Garman. + +purpose: warn for uses of system directories when cross linking + +Code Merged from Sourcery G++ binutils 2.19 - 4.4-277 + +2008-07-02 Joseph Myers + + ld/ + * ld.h (args_type): Add error_poison_system_directories. + * ld.texinfo (--error-poison-system-directories): Document. + * ldfile.c (ldfile_add_library_path): Check + command_line.error_poison_system_directories. + * ldmain.c (main): Initialize + command_line.error_poison_system_directories. + * lexsup.c (enum option_values): Add + OPTION_ERROR_POISON_SYSTEM_DIRECTORIES. + (ld_options): Add --error-poison-system-directories. + (parse_args): Handle new option. + +2007-06-13 Joseph Myers + + ld/ + * config.in: Regenerate. + * ld.h (args_type): Add poison_system_directories. + * ld.texinfo (--no-poison-system-directories): Document. + * ldfile.c (ldfile_add_library_path): Check + command_line.poison_system_directories. + * ldmain.c (main): Initialize + command_line.poison_system_directories. + * lexsup.c (enum option_values): Add + OPTION_NO_POISON_SYSTEM_DIRECTORIES. + (ld_options): Add --no-poison-system-directories. + (parse_args): Handle new option. + +2007-04-20 Joseph Myers + + Merge from Sourcery G++ binutils 2.17: + + 2007-03-20 Joseph Myers + Based on patch by Mark Hatle . + ld/ + * configure.ac (--enable-poison-system-directories): New option. + * configure, config.in: Regenerate. + * ldfile.c (ldfile_add_library_path): If + ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib, + /usr/lib, /usr/local/lib or /usr/X11R6/lib. + +Signed-off-by: Mark Hatle +Signed-off-by: Scott Garman +--- + ld/config.in | 3 +++ + ld/configure | 14 ++++++++++++++ + ld/configure.ac | 10 ++++++++++ + ld/ld.h | 8 ++++++++ + ld/ld.texi | 12 ++++++++++++ + ld/ldfile.c | 17 +++++++++++++++++ + ld/ldlex.h | 2 ++ + ld/ldmain.c | 2 ++ + ld/lexsup.c | 21 +++++++++++++++++++++ + 9 files changed, 89 insertions(+) + +diff --git a/ld/config.in b/ld/config.in +index 26d55a00d47..ffad464783c 100644 +--- a/ld/config.in ++++ b/ld/config.in +@@ -43,6 +43,9 @@ + language is requested. */ + #undef ENABLE_NLS + ++/* Define to warn for use of native system library directories */ ++#undef ENABLE_POISON_SYSTEM_DIRECTORIES ++ + /* Additional extension a shared object might have. */ + #undef EXTRA_SHLIB_EXTENSION + +diff --git a/ld/configure b/ld/configure +index c197aaef3cb..882263aa43f 100755 +--- a/ld/configure ++++ b/ld/configure +@@ -829,6 +829,7 @@ with_lib_path + enable_targets + enable_64_bit_bfd + with_sysroot ++enable_poison_system_directories + enable_gold + enable_got + enable_compressed_debug_sections +@@ -1498,6 +1499,8 @@ Optional Features: + --enable-checking enable run-time checks + --enable-targets alternative target configurations + --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) ++ --enable-poison-system-directories ++ warn for use of native system library directories + --enable-gold[=ARG] build gold [ARG={default,yes,no}] + --enable-got= GOT handling scheme (target, single, negative, + multigot) +@@ -15236,7 +15239,18 @@ else + fi + + ++# Check whether --enable-poison-system-directories was given. ++if test "${enable_poison_system_directories+set}" = set; then : ++ enableval=$enable_poison_system_directories; ++else ++ enable_poison_system_directories=no ++fi ++ ++if test "x${enable_poison_system_directories}" = "xyes"; then + ++$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h ++ ++fi + + # Check whether --enable-got was given. + if test "${enable_got+set}" = set; then : +diff --git a/ld/configure.ac b/ld/configure.ac +index 8ea97c43cd4..0f246db67d8 100644 +--- a/ld/configure.ac ++++ b/ld/configure.ac +@@ -106,6 +106,16 @@ AC_SUBST(use_sysroot) + AC_SUBST(TARGET_SYSTEM_ROOT) + AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) + ++AC_ARG_ENABLE([poison-system-directories], ++ AS_HELP_STRING([--enable-poison-system-directories], ++ [warn for use of native system library directories]),, ++ [enable_poison_system_directories=no]) ++if test "x${enable_poison_system_directories}" = "xyes"; then ++ AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES], ++ [1], ++ [Define to warn for use of native system library directories]) ++fi ++ + dnl Use --enable-gold to decide if this linker should be the default. + dnl "install_as_default" is set to false if gold is the default linker. + dnl "installed_linker" is the installed BFD linker name. +diff --git a/ld/ld.h b/ld/ld.h +index 35fafebfaed..74e66405de6 100644 +--- a/ld/ld.h ++++ b/ld/ld.h +@@ -162,6 +162,14 @@ typedef struct + in the linker script. */ + bool force_group_allocation; + ++ /* If TRUE (the default) warn for uses of system directories when ++ cross linking. */ ++ bool poison_system_directories; ++ ++ /* If TRUE (default FALSE) give an error for uses of system ++ directories when cross linking instead of a warning. */ ++ bool error_poison_system_directories; ++ + /* Big or little endian as set on command line. */ + enum endian_enum endian; + +diff --git a/ld/ld.texi b/ld/ld.texi +index dd8f571d4e4..3ab210b41b9 100644 +--- a/ld/ld.texi ++++ b/ld/ld.texi +@@ -2863,6 +2863,18 @@ string identifying the original linked file does not change. + + Passing @code{none} for @var{style} disables the setting from any + @code{--build-id} options earlier on the command line. ++ ++ at kindex --no-poison-system-directories ++ at item --no-poison-system-directories ++Do not warn for @option{-L} options using system directories such as ++ at file{/usr/lib} when cross linking. This option is intended for use ++in chroot environments when such directories contain the correct ++libraries for the target system rather than the host. ++ ++ at kindex --error-poison-system-directories ++ at item --error-poison-system-directories ++Give an error instead of a warning for @option{-L} options using ++system directories when cross linking. + @end table + + @c man end +diff --git a/ld/ldfile.c b/ld/ldfile.c +index 9d0af06f1f6..7cdd3b1c1b1 100644 +--- a/ld/ldfile.c ++++ b/ld/ldfile.c +@@ -117,6 +117,23 @@ ldfile_add_library_path (const char *name, bool cmdline) + new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); + else + new_dirs->name = xstrdup (name); ++ ++#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES ++ if (command_line.poison_system_directories ++ && ((!strncmp (name, "/lib", 4)) ++ || (!strncmp (name, "/usr/lib", 8)) ++ || (!strncmp (name, "/usr/local/lib", 14)) ++ || (!strncmp (name, "/usr/X11R6/lib", 14)))) ++ { ++ if (command_line.error_poison_system_directories) ++ einfo (_("%X%P: error: library search path \"%s\" is unsafe for " ++ "cross-compilation\n"), name); ++ else ++ einfo (_("%P: warning: library search path \"%s\" is unsafe for " ++ "cross-compilation\n"), name); ++ } ++#endif ++ + } + + /* Try to open a BFD for a lang_input_statement. */ +diff --git a/ld/ldlex.h b/ld/ldlex.h +index 9e8bf5fb835..2f0fadfe0a3 100644 +--- a/ld/ldlex.h ++++ b/ld/ldlex.h +@@ -163,6 +163,8 @@ enum option_values + OPTION_CTF_VARIABLES, + OPTION_NO_CTF_VARIABLES, + OPTION_CTF_SHARE_TYPES, ++ OPTION_NO_POISON_SYSTEM_DIRECTORIES, ++ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, + }; + + /* The initial parser states. */ +diff --git a/ld/ldmain.c b/ld/ldmain.c +index 42660eb9a3c..1aef9387f93 100644 +--- a/ld/ldmain.c ++++ b/ld/ldmain.c +@@ -321,6 +321,8 @@ main (int argc, char **argv) + command_line.warn_mismatch = true; + command_line.warn_search_mismatch = true; + command_line.check_section_addresses = -1; ++ command_line.poison_system_directories = true; ++ command_line.error_poison_system_directories = false; + + /* We initialize DEMANGLING based on the environment variable + COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the +diff --git a/ld/lexsup.c b/ld/lexsup.c +index 00274c500d0..4f23b3a2da2 100644 +--- a/ld/lexsup.c ++++ b/ld/lexsup.c +@@ -595,6 +595,14 @@ static const struct ld_option ld_options[] = + " is: share-unconflicted (default),\n" + " share-duplicated"), + TWO_DASHES }, ++ { {"no-poison-system-directories", no_argument, NULL, ++ OPTION_NO_POISON_SYSTEM_DIRECTORIES}, ++ '\0', NULL, N_("Do not warn for -L options using system directories"), ++ TWO_DASHES }, ++ { {"error-poison-system-directories", no_argument, NULL, ++ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES}, ++ '\0', NULL, N_("Give an error for -L options using system directories"), ++ TWO_DASHES }, + }; + + #define OPTION_COUNT ARRAY_SIZE (ld_options) +@@ -607,6 +615,7 @@ parse_args (unsigned argc, char **argv) + int ingroup = 0; + char *default_dirlist = NULL; + char *shortopts; ++ char *BR_paranoid_env; + struct option *longopts; + struct option *really_longopts; + int last_optind; +@@ -1643,6 +1652,14 @@ parse_args (unsigned argc, char **argv) + } + break; + ++ case OPTION_NO_POISON_SYSTEM_DIRECTORIES: ++ command_line.poison_system_directories = false; ++ break; ++ ++ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: ++ command_line.error_poison_system_directories = true; ++ break; ++ + case OPTION_PUSH_STATE: + input_flags.pushed = xmemdup (&input_flags, + sizeof (input_flags), +@@ -1788,6 +1805,10 @@ parse_args (unsigned argc, char **argv) + command_line.soname = NULL; + } + ++ BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH"); ++ if (BR_paranoid_env && strlen(BR_paranoid_env) > 0) ++ command_line.error_poison_system_directories = true; ++ + while (ingroup) + { + einfo (_("%P: missing --end-group; added as last command line option\n")); +-- +2.31.1 + diff --git a/package/binutils/2.38/0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch b/package/binutils/2.38/0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch new file mode 100644 index 0000000000..bfd531b818 --- /dev/null +++ b/package/binutils/2.38/0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch @@ -0,0 +1,50 @@ +From ef4ba1da823e8366ea4f126f50885a44ebf4dcf0 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Wed, 9 Jun 2021 17:28:27 +0200 +Subject: [PATCH] bfd/elf32-or1k: fix building with gcc version < 5 + +Gcc version >= 5 has standard C mode not set to -std=gnu11, so if we use +an old compiler(i.e. gcc 4.9) build fails on: +``` +elf32-or1k.c:2251:3: error: 'for' loop initial declarations are only allowed in +C99 or C11 mode + for (size_t i = 0; i < insn_count; i++) + ^ +``` + +So let's declare `size_t i` at the top of the function instead of inside +for loop. + +Signed-off-by: Giulio Benetti +--- + bfd/elf32-or1k.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c +index 4ae7f324d33..32063ab0289 100644 +--- a/bfd/elf32-or1k.c ++++ b/bfd/elf32-or1k.c +@@ -2244,9 +2244,10 @@ or1k_write_plt_entry (bfd *output_bfd, bfd_byte *contents, unsigned insnj, + { + unsigned nodelay = elf_elfheader (output_bfd)->e_flags & EF_OR1K_NODELAY; + unsigned output_insns[PLT_MAX_INSN_COUNT]; ++ size_t i; + + /* Copy instructions into the output buffer. */ +- for (size_t i = 0; i < insn_count; i++) ++ for (i = 0; i < insn_count; i++) + output_insns[i] = insns[i]; + + /* Honor the no-delay-slot setting. */ +@@ -2277,7 +2278,7 @@ or1k_write_plt_entry (bfd *output_bfd, bfd_byte *contents, unsigned insnj, + } + + /* Write out the output buffer. */ +- for (size_t i = 0; i < (insn_count+1); i++) ++ for (i = 0; i < (insn_count+1); i++) + bfd_put_32 (output_bfd, output_insns[i], contents + (i*4)); + } + +-- +2.31.1 + diff --git a/package/binutils/2.38/0004-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch b/package/binutils/2.38/0004-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch new file mode 100644 index 0000000000..8609db95b7 --- /dev/null +++ b/package/binutils/2.38/0004-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 + diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index ea1f020989..17de6e4e41 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -36,6 +36,12 @@ config BR2_BINUTILS_VERSION_2_37_X # https://github.com/uclinux-dev/elf2flt/issues/12 depends on !BR2_BINFMT_FLAT +config BR2_BINUTILS_VERSION_2_38_X + bool "binutils 2.38" + # https://github.com/uclinux-dev/elf2flt/pull/16 + # https://github.com/uclinux-dev/elf2flt/issues/12 + depends on !BR2_BINFMT_FLAT + config BR2_BINUTILS_VERSION_ARC bool "binutils arc (2.34.50)" depends on BR2_arc @@ -49,6 +55,7 @@ config BR2_BINUTILS_VERSION default "2.35.2" if BR2_BINUTILS_VERSION_2_35_X default "2.36.1" if BR2_BINUTILS_VERSION_2_36_X default "2.37" if BR2_BINUTILS_VERSION_2_37_X + default "2.38" if BR2_BINUTILS_VERSION_2_38_X config BR2_BINUTILS_ENABLE_LTO bool diff --git a/package/binutils/binutils.hash b/package/binutils/binutils.hash index d1be6cbce8..fe31b34d40 100644 --- a/package/binutils/binutils.hash +++ b/package/binutils/binutils.hash @@ -3,6 +3,7 @@ sha512 d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724a sha512 9974ede5978d32e0d68fef23da48fa00bd06b0bff7ec45b00ca075c126d6bbe0cf2defc03ecc3f17bc6cc85b64271a13009c4049d7ba17de26e84e3a6e2c0348 binutils-2.35.2.tar.xz sha512 cc24590bcead10b90763386b6f96bb027d7594c659c2d95174a6352e8b98465a50ec3e4088d0da038428abe059bbc4ae5f37b269f31a40fc048072c8a234f4e9 binutils-2.36.1.tar.xz sha512 5c11aeef6935860a6819ed3a3c93371f052e52b4bdc5033da36037c1544d013b7f12cb8d561ec954fe7469a68f1b66f1a3cd53d5a3af7293635a90d69edd15e7 binutils-2.37.tar.xz +sha512 8bf0b0d193c9c010e0518ee2b2e5a830898af206510992483b427477ed178396cd210235e85fd7bd99a96fc6d5eedbeccbd48317a10f752b7336ada8b2bb826d binutils-2.38.tar.xz # Locally calculated (fetched from Github) sha512 76a8227a19218435319c660e4983ea17985194b7f496f163e97543e7f6fd3e9249241fdc05a16ba512fba96a1d846c1f7b080983404d821d6215f10e7f11e238 binutils-gdb-arc-2020.09-release.tar.gz -- 2.30.2 From james.hilliard1 at gmail.com Mon Feb 14 04:19:27 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 13 Feb 2022 21:19:27 -0700 Subject: [Buildroot] [PATCH v7 3/5] package/qt5/qt5webengine-chromium: new package In-Reply-To: <20220214041929.1916468-1-james.hilliard1@gmail.com> References: <20220214041929.1916468-1-james.hilliard1@gmail.com> Message-ID: <20220214041929.1916468-3-james.hilliard1@gmail.com> 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. Signed-off-by: James Hilliard --- package/qt5/Config.in | 1 + .../0001-Add-python3-build-support.patch | 1858 +++++++++++++++++ .../0002-Don-t-rebase-sysroot-path.patch | 32 + package/qt5/qt5webengine-chromium/Config.in | 5 + .../qt5webengine-chromium/chromium-latest.inc | 1257 +++++++++++ .../qt5webengine-chromium.hash | 1256 +++++++++++ .../qt5webengine-chromium.mk | 23 + 7 files changed, 4432 insertions(+) create mode 100644 package/qt5/qt5webengine-chromium/0001-Add-python3-build-support.patch create mode 100644 package/qt5/qt5webengine-chromium/0002-Don-t-rebase-sysroot-path.patch 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 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/qt5webengine-chromium/0001-Add-python3-build-support.patch b/package/qt5/qt5webengine-chromium/0001-Add-python3-build-support.patch new file mode 100644 index 0000000000..cc9726418e --- /dev/null +++ b/package/qt5/qt5webengine-chromium/0001-Add-python3-build-support.patch @@ -0,0 +1,1858 @@ +From bf94b834e9beb4e7bc25dbc4c61f5e2db39e7cdc Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Fri, 4 Feb 2022 15:43:35 -0700 +Subject: [PATCH] Add python3 build support + +Adapted from: +https://github.com/archlinux/svntogit-packages/blob/6edf5f1aaea952d046aff89a2e0175258fe77361/trunk/qt5-webengine-chromium-python3.patch + +Signed-off-by: James Hilliard +--- + .../protobufs/binary_proto_generator.py | 8 +- + .../tracing/generate_trace_viewer_grd.py | 2 +- + chromium/mojo/public/tools/bindings/BUILD.gn | 2 + + .../tools/bindings/gen_data_files_list.py | 8 +- + .../generators/mojom_java_generator.py | 4 + + .../tools/mojom/mojom/generate/generator.py | 14 ++-- + .../tools/mojom/mojom/generate/module.py | 3 +- + .../mojom/mojom/generate/template_expander.py | 12 +-- + .../scripts/bind_gen/blink_v8_bridge.py | 6 +- + .../scripts/bind_gen/callback_interface.py | 2 +- + .../bindings/scripts/bind_gen/code_node.py | 10 +-- + .../bindings/scripts/bind_gen/codegen_expr.py | 15 ++-- + .../scripts/bind_gen/codegen_format.py | 2 +- + .../scripts/bind_gen/codegen_utils.py | 2 +- + .../bindings/scripts/bind_gen/dictionary.py | 2 +- + .../bindings/scripts/bind_gen/interface.py | 82 +++++++++++-------- + .../scripts/bind_gen/mako_renderer.py | 2 +- + .../bindings/scripts/bind_gen/style_format.py | 9 +- + .../bindings/scripts/bind_gen/task_queue.py | 5 +- + .../bindings/scripts/code_generator.py | 10 +++ + .../scripts/generate_origin_trial_features.py | 4 +- + .../bindings/scripts/idl_definitions.py | 8 +- + .../renderer/bindings/scripts/idl_reader.py | 4 +- + .../renderer/bindings/scripts/idl_types.py | 2 +- + .../renderer/bindings/scripts/utilities.py | 28 +++---- + .../renderer/bindings/scripts/v8_interface.py | 9 +- + .../renderer/bindings/scripts/v8_methods.py | 4 + + .../renderer/bindings/scripts/v8_utilities.py | 2 +- + .../scripts/web_idl/callback_interface.py | 12 +-- + .../bindings/scripts/web_idl/database.py | 2 +- + .../bindings/scripts/web_idl/exposure.py | 5 +- + .../bindings/scripts/web_idl/function_like.py | 28 +++---- + .../bindings/scripts/web_idl/idl_compiler.py | 21 ++--- + .../bindings/scripts/web_idl/interface.py | 45 +++++----- + .../bindings/scripts/web_idl/ir_builder.py | 29 ++++--- + .../bindings/scripts/web_idl/make_copy.py | 7 ++ + .../bindings/scripts/web_idl/namespace.py | 12 +-- + .../bindings/templates/dictionary_v8.cc.tmpl | 8 +- + .../scripts/core/css/make_style_shorthands.py | 23 +++--- + .../properties/make_css_property_instances.py | 4 +- + .../blink/renderer/build/scripts/gperf.py | 2 +- + .../blink/renderer/build/scripts/in_file.py | 2 +- + .../renderer/build/scripts/in_generator.py | 5 ++ + .../build/scripts/make_runtime_features.py | 2 +- + .../scripts/templates/element_factory.cc.tmpl | 4 +- + .../templates/element_type_helpers.cc.tmpl | 4 +- + .../templates/element_type_helpers.h.tmpl | 2 +- + .../build/scripts/templates/macros.tmpl | 4 +- + .../templates/make_qualified_names.h.tmpl | 4 +- + .../dawn/generator/generator_lib.py | 4 + + .../devtools-frontend/src/BUILD.gn | 2 + + .../scripts/build/build_inspector_overlay.py | 3 +- + .../build/build_release_applications.py | 9 +- + .../scripts/build/generate_devtools_grd.py | 4 +- + .../src/scripts/build/modular_build.py | 6 +- + chromium/third_party/jinja2/tests.py | 2 +- + chromium/tools/metrics/ukm/gen_builders.py | 5 +- + .../ui/ozone/generate_constructor_list.py | 13 ++- + .../ui/ozone/generate_ozone_platform_list.py | 26 ++++-- + 59 files changed, 331 insertions(+), 229 deletions(-) + +diff --git a/chromium/components/resources/protobufs/binary_proto_generator.py b/chromium/components/resources/protobufs/binary_proto_generator.py +index 7422ead9697..16365515f26 100755 +--- a/chromium/components/resources/protobufs/binary_proto_generator.py ++++ b/chromium/components/resources/protobufs/binary_proto_generator.py +@@ -7,7 +7,7 @@ + Converts a given ASCII proto into a binary resource. + + """ +- ++from __future__ import print_function + import abc + import imp + import optparse +@@ -196,12 +196,12 @@ class BinaryProtoGenerator: + self._ImportProtoModules(opts.path) + + if not self.VerifyArgs(opts): +- print "Wrong arguments" ++ print("Wrong arguments") + return 1 + + try: + self._GenerateBinaryProtos(opts) + except Exception as e: +- print "ERROR: Failed to render binary version of %s:\n %s\n%s" % ( +- opts.infile, str(e), traceback.format_exc()) ++ print("ERROR: Failed to render binary version of %s:\n %s\n%s" % ++ (opts.infile, str(e), traceback.format_exc())) + return 1 +diff --git a/chromium/content/browser/tracing/generate_trace_viewer_grd.py b/chromium/content/browser/tracing/generate_trace_viewer_grd.py +index 037f9497dc2..be393d21f90 100755 +--- a/chromium/content/browser/tracing/generate_trace_viewer_grd.py ++++ b/chromium/content/browser/tracing/generate_trace_viewer_grd.py +@@ -74,7 +74,7 @@ def main(argv): + for filename in parsed_args.source_files: + add_file_to_grd(doc, os.path.basename(filename)) + +- with open(parsed_args.output_filename, 'w') as output_file: ++ with open(parsed_args.output_filename, 'wb') as output_file: + output_file.write(doc.toxml(encoding='UTF-8')) + + +diff --git a/chromium/mojo/public/tools/bindings/BUILD.gn b/chromium/mojo/public/tools/bindings/BUILD.gn +index fc04b5dd0b1..708958e438b 100644 +--- a/chromium/mojo/public/tools/bindings/BUILD.gn ++++ b/chromium/mojo/public/tools/bindings/BUILD.gn +@@ -2,9 +2,11 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import("//build/config/python.gni") + import("//mojo/public/tools/bindings/mojom.gni") + import("//third_party/jinja2/jinja2.gni") + ++# TODO(crbug.com/1194274): Investigate nondeterminism in Py3 builds. + action("precompile_templates") { + sources = mojom_generator_sources + sources += [ +diff --git a/chromium/mojo/public/tools/bindings/gen_data_files_list.py b/chromium/mojo/public/tools/bindings/gen_data_files_list.py +index 79c9e50efce..8b78d092418 100644 +--- a/chromium/mojo/public/tools/bindings/gen_data_files_list.py ++++ b/chromium/mojo/public/tools/bindings/gen_data_files_list.py +@@ -18,7 +18,6 @@ import os + import re + import sys + +-from cStringIO import StringIO + from optparse import OptionParser + + sys.path.insert( +@@ -41,12 +40,9 @@ def main(): + pattern = re.compile(options.pattern) + files = [f for f in os.listdir(options.directory) if pattern.match(f)] + +- stream = StringIO() +- for f in files: +- print(f, file=stream) ++ contents = '\n'.join(f for f in files) + '\n' ++ WriteFile(contents, options.output) + +- WriteFile(stream.getvalue(), options.output) +- stream.close() + + if __name__ == '__main__': + sys.exit(main()) +diff --git a/chromium/mojo/public/tools/bindings/generators/mojom_java_generator.py b/chromium/mojo/public/tools/bindings/generators/mojom_java_generator.py +index 96b2fdfae0c..00b9dccd00c 100644 +--- a/chromium/mojo/public/tools/bindings/generators/mojom_java_generator.py ++++ b/chromium/mojo/public/tools/bindings/generators/mojom_java_generator.py +@@ -25,6 +25,10 @@ sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir, + 'build', 'android', 'gyp')) + from util import build_utils + ++# TODO(crbug.com/1174969): Remove this once Python2 is obsoleted. ++if sys.version_info.major != 2: ++ basestring = str ++ long = int + + GENERATOR_PREFIX = 'java' + +diff --git a/chromium/mojo/public/tools/mojom/mojom/generate/generator.py b/chromium/mojo/public/tools/mojom/mojom/generate/generator.py +index de62260a5c9..4a1c73fcf82 100644 +--- a/chromium/mojo/public/tools/mojom/mojom/generate/generator.py ++++ b/chromium/mojo/public/tools/mojom/mojom/generate/generator.py +@@ -136,9 +136,14 @@ class Stylizer(object): + + def WriteFile(contents, full_path): + # If |contents| is same with the file content, we skip updating. ++ if not isinstance(contents, bytes): ++ data = contents.encode('utf8') ++ else: ++ data = contents ++ + if os.path.isfile(full_path): + with open(full_path, 'rb') as destination_file: +- if destination_file.read() == contents: ++ if destination_file.read() == data: + return + + # Make sure the containing directory exists. +@@ -146,11 +151,8 @@ def WriteFile(contents, full_path): + fileutil.EnsureDirectoryExists(full_dir) + + # Dump the data to disk. +- with open(full_path, "wb") as f: +- if not isinstance(contents, bytes): +- f.write(contents.encode('utf-8')) +- else: +- f.write(contents) ++ with open(full_path, 'wb') as f: ++ f.write(data) + + + def AddComputedData(module): +diff --git a/chromium/mojo/public/tools/mojom/mojom/generate/module.py b/chromium/mojo/public/tools/mojom/mojom/generate/module.py +index ebbc9b322ea..3d026429bbc 100644 +--- a/chromium/mojo/public/tools/mojom/mojom/generate/module.py ++++ b/chromium/mojo/public/tools/mojom/mojom/generate/module.py +@@ -398,7 +398,8 @@ class Field(object): + + + class StructField(Field): +- pass ++ def __hash__(self): ++ return super(Field, self).__hash__() + + + class UnionField(Field): +diff --git a/chromium/mojo/public/tools/mojom/mojom/generate/template_expander.py b/chromium/mojo/public/tools/mojom/mojom/generate/template_expander.py +index 7a300560246..8d9e26fb7f6 100644 +--- a/chromium/mojo/public/tools/mojom/mojom/generate/template_expander.py ++++ b/chromium/mojo/public/tools/mojom/mojom/generate/template_expander.py +@@ -75,9 +75,9 @@ def PrecompileTemplates(generator_modules, output_dir): + os.path.dirname(module.__file__), generator.GetTemplatePrefix()) + ])) + jinja_env.filters.update(generator.GetFilters()) +- jinja_env.compile_templates( +- os.path.join(output_dir, "%s.zip" % generator.GetTemplatePrefix()), +- extensions=["tmpl"], +- zip="stored", +- py_compile=True, +- ignore_errors=False) ++ jinja_env.compile_templates(os.path.join( ++ output_dir, "%s.zip" % generator.GetTemplatePrefix()), ++ extensions=["tmpl"], ++ zip="stored", ++ py_compile=sys.version_info.major < 3, ++ ignore_errors=False) +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/blink_v8_bridge.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/blink_v8_bridge.py +index 3225ecca6e4..fc078d31b55 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/blink_v8_bridge.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/blink_v8_bridge.py +@@ -344,7 +344,7 @@ def make_default_value_expr(idl_type, default_value): + """ + assert default_value.is_type_compatible_with(idl_type) + +- class DefaultValueExpr: ++ class DefaultValueExpr(object): + _ALLOWED_SYMBOLS_IN_DEPS = ("isolate") + + def __init__(self, initializer_expr, initializer_deps, +@@ -502,7 +502,7 @@ def make_v8_to_blink_value(blink_var_name, + assert isinstance(blink_var_name, str) + assert isinstance(v8_value_expr, str) + assert isinstance(idl_type, web_idl.IdlType) +- assert (argument_index is None or isinstance(argument_index, (int, long))) ++ assert (argument_index is None or isinstance(argument_index, int)) + assert (default_value is None + or isinstance(default_value, web_idl.LiteralConstant)) + +@@ -622,7 +622,7 @@ def make_v8_to_blink_value_variadic(blink_var_name, v8_array, + """ + assert isinstance(blink_var_name, str) + assert isinstance(v8_array, str) +- assert isinstance(v8_array_start_index, (int, long)) ++ assert isinstance(v8_array_start_index, int) + assert isinstance(idl_type, web_idl.IdlType) + + pattern = ("auto&& ${{{_1}}} = " +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/callback_interface.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/callback_interface.py +index 4a6df513068..8b51f23a409 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/callback_interface.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/callback_interface.py +@@ -177,7 +177,7 @@ def generate_callback_interface(callback_interface_identifier): + prop_install_mode=PropInstallMode.UNCONDITIONAL, + trampoline_var_name=None, + attribute_entries=[], +- constant_entries=filter(is_unconditional, constant_entries), ++ constant_entries=list(filter(is_unconditional, constant_entries)), + exposed_construct_entries=[], + operation_entries=[]) + (install_interface_template_decl, install_interface_template_def, +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/code_node.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/code_node.py +index 52972fefe20..e5ae9d9629e 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/code_node.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/code_node.py +@@ -503,13 +503,13 @@ class CompositeNode(CodeNode): + gensym_kwargs = {} + template_vars = {} + for arg in args: +- assert isinstance(arg, (CodeNode, int, long, str)) ++ assert isinstance(arg, (CodeNode, int, str)) + gensym = CodeNode.gensym() + gensym_args.append("${{{}}}".format(gensym)) + template_vars[gensym] = arg + for key, value in kwargs.items(): +- assert isinstance(key, (int, long, str)) +- assert isinstance(value, (CodeNode, int, long, str)) ++ assert isinstance(key, (int, str)) ++ assert isinstance(value, (CodeNode, int, str)) + gensym = CodeNode.gensym() + gensym_kwargs[key] = "${{{}}}".format(gensym) + template_vars[gensym] = value +@@ -602,7 +602,7 @@ class ListNode(CodeNode): + def insert(self, index, node): + if node is None: + return +- assert isinstance(index, (int, long)) ++ assert isinstance(index, int) + assert isinstance(node, CodeNode) + assert node.outer is None and node.prev is None + +@@ -721,7 +721,7 @@ class SymbolScopeNode(SequenceNode): + if not scope_chains: + return counts + +- self_index = iter(scope_chains).next().index(self) ++ self_index = next(iter(scope_chains)).index(self) + scope_chains = map( + lambda scope_chain: scope_chain[self_index + 1:], scope_chains) + scope_to_likeliness = {} +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_expr.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_expr.py +index a229a6c71c9..5fa288dabf2 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_expr.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_expr.py +@@ -109,7 +109,7 @@ def expr_and(terms): + + if any(term.is_always_false for term in terms): + return _Expr(False) +- terms = filter(lambda x: not x.is_always_true, terms) ++ terms = list(filter(lambda x: not x.is_always_true, terms)) + if not terms: + return _Expr(True) + if len(terms) == 1: +@@ -124,7 +124,7 @@ def expr_or(terms): + + if any(term.is_always_true for term in terms): + return _Expr(True) +- terms = filter(lambda x: not x.is_always_false, terms) ++ terms = list(filter(lambda x: not x.is_always_false, terms)) + if not terms: + return _Expr(False) + if len(terms) == 1: +@@ -222,7 +222,7 @@ def expr_from_exposure(exposure, + elif exposure.only_in_secure_contexts is False: + secure_context_term = _Expr(True) + else: +- terms = map(ref_enabled, exposure.only_in_secure_contexts) ++ terms = list(map(ref_enabled, exposure.only_in_secure_contexts)) + secure_context_term = expr_or( + [_Expr("${is_in_secure_context}"), + expr_not(expr_and(terms))]) +@@ -275,10 +275,11 @@ def expr_from_exposure(exposure, + + # [ContextEnabled] + if exposure.context_enabled_features: +- terms = map( +- lambda feature: _Expr( +- "${{context_feature_settings}}->is{}Enabled()".format( +- feature)), exposure.context_enabled_features) ++ terms = list( ++ map( ++ lambda feature: _Expr( ++ "${{context_feature_settings}}->is{}Enabled()".format( ++ feature)), exposure.context_enabled_features)) + context_enabled_terms.append( + expr_and([_Expr("${context_feature_settings}"), + expr_or(terms)])) +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_format.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_format.py +index 87d26eec3ca..f3e9d38247e 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_format.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_format.py +@@ -23,7 +23,7 @@ class _TemplateFormatter(string.Formatter): + self._template_formatter_indexing_count_ = 0 + + def get_value(self, key, args, kwargs): +- if isinstance(key, (int, long)): ++ if isinstance(key, int): + return args[key] + assert isinstance(key, str) + if not key: +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_utils.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_utils.py +index 2bcc4fed49a..e72282aa696 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_utils.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_utils.py +@@ -116,4 +116,4 @@ def write_code_node_to_file(code_node, filepath): + # stderr=format_result.error_message)) + # + # web_idl.file_io.write_to_file_if_changed(filepath, format_result.contents) +- web_idl.file_io.write_to_file_if_changed(filepath, rendered_text) ++ web_idl.file_io.write_to_file_if_changed(filepath, rendered_text.encode('utf-8')) +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/dictionary.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/dictionary.py +index b39f0100410..4d68202296b 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/dictionary.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/dictionary.py +@@ -993,7 +993,7 @@ def make_dict_trace_func(cg_context): + _2 = _blink_member_name(member).value_var + return TextNode(_format(pattern, _1=_1, _2=_2)) + +- body.extend(map(make_trace_member_node, own_members)) ++ body.extend(list(map(make_trace_member_node, own_members))) + body.append(TextNode("BaseClass::Trace(visitor);")) + + return func_decl, func_def +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py +index 10ff30656ad..bfdf7128aac 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py +@@ -582,7 +582,7 @@ def _make_blink_api_call(code_node, + overriding_args=None): + assert isinstance(code_node, SymbolScopeNode) + assert isinstance(cg_context, CodeGenContext) +- assert num_of_args is None or isinstance(num_of_args, (int, long)) ++ assert num_of_args is None or isinstance(num_of_args, int) + assert (overriding_args is None + or (isinstance(overriding_args, (list, tuple)) + and all(isinstance(arg, str) for arg in overriding_args))) +@@ -1196,8 +1196,10 @@ def make_overload_dispatcher(cg_context): + did_use_break = did_use_break or can_fail + + conditional = expr_or( +- map(lambda item: expr_from_exposure(item.function_like.exposure), +- items)) ++ list( ++ map( ++ lambda item: expr_from_exposure(item.function_like.exposure ++ ), items))) + if not conditional.is_always_true: + node = CxxUnlikelyIfNode(cond=conditional, body=node) + +@@ -4642,7 +4644,7 @@ class _PropEntryConstructorGroup(_PropEntryBase): + def __init__(self, is_context_dependent, exposure_conditional, world, + constructor_group, ctor_callback_name, ctor_func_length): + assert isinstance(ctor_callback_name, str) +- assert isinstance(ctor_func_length, (int, long)) ++ assert isinstance(ctor_func_length, int) + + _PropEntryBase.__init__(self, is_context_dependent, + exposure_conditional, world, constructor_group) +@@ -4670,7 +4672,7 @@ class _PropEntryOperationGroup(_PropEntryBase): + op_func_length, + no_alloc_direct_callback_name=None): + assert isinstance(op_callback_name, str) +- assert isinstance(op_func_length, (int, long)) ++ assert isinstance(op_func_length, int) + + _PropEntryBase.__init__(self, is_context_dependent, + exposure_conditional, world, operation_group) +@@ -5175,9 +5177,9 @@ def make_install_interface_template(cg_context, function_name, class_name, api_c + ]) + + if class_like.identifier == "CSSStyleDeclaration": +- css_properties = filter( +- lambda attr: "CSSProperty" in attr.extended_attributes, +- class_like.attributes) ++ css_properties = list( ++ filter(lambda attr: "CSSProperty" in attr.extended_attributes, ++ class_like.attributes)) + if css_properties: + prop_name_list = "".join( + map(lambda attr: "\"{}\", ".format(attr.identifier), +@@ -5567,8 +5569,8 @@ ${instance_object} = ${v8_context}->Global()->GetPrototype().As();\ + "V8DOMConfiguration::InstallConstants(${isolate}, " + "${interface_template}, ${prototype_template}, " + "kConstantCallbackTable, base::size(kConstantCallbackTable));") +- constant_callback_entries = filter(lambda entry: entry.const_callback_name, +- constant_entries) ++ constant_callback_entries = list(filter(lambda entry: entry.const_callback_name, ++ constant_entries)) + install_properties(table_name, constant_callback_entries, + _make_constant_callback_registration_table, + installer_call_text) +@@ -5584,8 +5586,8 @@ ${instance_object} = ${v8_context}->Global()->GetPrototype().As();\ + "V8DOMConfiguration::InstallConstants(${isolate}, " + "${interface_template}, ${prototype_template}, " + "kConstantValueTable, base::size(kConstantValueTable));") +- constant_value_entries = filter( +- lambda entry: not entry.const_callback_name, constant_entries) ++ constant_value_entries = list(filter( ++ lambda entry: not entry.const_callback_name, constant_entries)) + install_properties(table_name, constant_value_entries, + _make_constant_value_registration_table, + installer_call_text) +@@ -6336,8 +6338,8 @@ def make_v8_context_snapshot_api(cg_context, component, attribute_entries, + assert isinstance(component, web_idl.Component) + + derived_interfaces = cg_context.interface.deriveds +- derived_names = map(lambda interface: interface.identifier, +- derived_interfaces) ++ derived_names = list( ++ map(lambda interface: interface.identifier, derived_interfaces)) + derived_names.append(cg_context.interface.identifier) + if not ("Window" in derived_names or "HTMLDocument" in derived_names): + return None, None +@@ -6411,9 +6413,11 @@ def _make_v8_context_snapshot_get_reference_table_function( + collect_callbacks(named_properties_object_callback_defs) + collect_callbacks(cross_origin_property_callback_defs) + +- entry_nodes = map( +- lambda name: TextNode("reinterpret_cast({}),".format(name)), +- filter(None, callback_names)) ++ entry_nodes = list( ++ map( ++ lambda name: TextNode("reinterpret_cast({}),".format(name ++ )), ++ filter(None, callback_names))) + table_node = ListNode([ + TextNode("using namespace ${class_name}Callbacks;"), + TextNode("static const intptr_t kReferenceTable[] = {"), +@@ -6451,10 +6455,11 @@ def _make_v8_context_snapshot_install_props_per_context_function( + class_name=None, + prop_install_mode=PropInstallMode.V8_CONTEXT_SNAPSHOT, + trampoline_var_name=None, +- attribute_entries=filter(selector, attribute_entries), +- constant_entries=filter(selector, constant_entries), +- exposed_construct_entries=filter(selector, exposed_construct_entries), +- operation_entries=filter(selector, operation_entries)) ++ attribute_entries=list(filter(selector, attribute_entries)), ++ constant_entries=list(filter(selector, constant_entries)), ++ exposed_construct_entries=list( ++ filter(selector, exposed_construct_entries)), ++ operation_entries=list(filter(selector, operation_entries))) + + return func_decl, func_def + +@@ -6810,11 +6815,11 @@ def generate_interface(interface_identifier): + class_name=impl_class_name, + prop_install_mode=PropInstallMode.UNCONDITIONAL, + trampoline_var_name=tp_install_unconditional_props, +- attribute_entries=filter(is_unconditional, attribute_entries), +- constant_entries=filter(is_unconditional, constant_entries), +- exposed_construct_entries=filter(is_unconditional, +- exposed_construct_entries), +- operation_entries=filter(is_unconditional, operation_entries)) ++ attribute_entries=list(filter(is_unconditional, attribute_entries)), ++ constant_entries=list(filter(is_unconditional, constant_entries)), ++ exposed_construct_entries=list( ++ filter(is_unconditional, exposed_construct_entries)), ++ operation_entries=list(filter(is_unconditional, operation_entries))) + (install_context_independent_props_decl, + install_context_independent_props_def, + install_context_independent_props_trampoline) = make_install_properties( +@@ -6823,11 +6828,14 @@ def generate_interface(interface_identifier): + class_name=impl_class_name, + prop_install_mode=PropInstallMode.CONTEXT_INDEPENDENT, + trampoline_var_name=tp_install_context_independent_props, +- attribute_entries=filter(is_context_independent, attribute_entries), +- constant_entries=filter(is_context_independent, constant_entries), +- exposed_construct_entries=filter(is_context_independent, +- exposed_construct_entries), +- operation_entries=filter(is_context_independent, operation_entries)) ++ attribute_entries=list( ++ filter(is_context_independent, attribute_entries)), ++ constant_entries=list(filter(is_context_independent, ++ constant_entries)), ++ exposed_construct_entries=list( ++ filter(is_context_independent, exposed_construct_entries)), ++ operation_entries=list( ++ filter(is_context_independent, operation_entries))) + (install_context_dependent_props_decl, install_context_dependent_props_def, + install_context_dependent_props_trampoline) = make_install_properties( + cg_context, +@@ -6835,11 +6843,13 @@ def generate_interface(interface_identifier): + class_name=impl_class_name, + prop_install_mode=PropInstallMode.CONTEXT_DEPENDENT, + trampoline_var_name=tp_install_context_dependent_props, +- attribute_entries=filter(is_context_dependent, attribute_entries), +- constant_entries=filter(is_context_dependent, constant_entries), +- exposed_construct_entries=filter(is_context_dependent, +- exposed_construct_entries), +- operation_entries=filter(is_context_dependent, operation_entries)) ++ attribute_entries=list(filter(is_context_dependent, ++ attribute_entries)), ++ constant_entries=list(filter(is_context_dependent, constant_entries)), ++ exposed_construct_entries=list( ++ filter(is_context_dependent, exposed_construct_entries)), ++ operation_entries=list(filter(is_context_dependent, ++ operation_entries))) + (install_interface_template_decl, install_interface_template_def, + install_interface_template_trampoline) = make_install_interface_template( + cg_context, +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/mako_renderer.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/mako_renderer.py +index b4c70553863..f3a2fcd772d 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/mako_renderer.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/mako_renderer.py +@@ -105,7 +105,7 @@ class MakoRenderer(object): + on_error = self._caller_stack_on_error + if (len(current) <= len(on_error) + and all(current[i] == on_error[i] +- for i in xrange(len(current)))): ++ for i in range(len(current)))): + pass # Error happened in a deeper caller. + else: + self._caller_stack_on_error = list(self._caller_stack) +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py +index dc3493cc394..017d3d47bb3 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py +@@ -70,8 +70,13 @@ def gn_format(contents, filename=None): + + + def _invoke_format_command(command_line, filename, contents): +- proc = subprocess.Popen( +- command_line, stdin=subprocess.PIPE, stdout=subprocess.PIPE) ++ kwargs = {} ++ if sys.version_info.major != 2: ++ kwargs['encoding'] = 'utf-8' ++ proc = subprocess.Popen(command_line, ++ stdin=subprocess.PIPE, ++ stdout=subprocess.PIPE, ++ **kwargs) + stdout_output, stderr_output = proc.communicate(input=contents) + exit_code = proc.wait() + +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/task_queue.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/task_queue.py +index 0d8f4c0f303..e666a9b668e 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/task_queue.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/task_queue.py +@@ -2,6 +2,7 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import functools + import multiprocessing + + from .package_initializer import package_initializer +@@ -76,7 +77,7 @@ class TaskQueue(object): + if not report_progress: + return + +- done_count = reduce( ++ done_count = functools.reduce( + lambda count, worker_task: count + bool(worker_task.ready()), + self._worker_tasks, 0) + report_progress(len(self._worker_tasks), done_count) +@@ -85,4 +86,4 @@ class TaskQueue(object): + def _task_queue_run_tasks(tasks): + for task in tasks: + func, args, kwargs = task +- apply(func, args, kwargs) ++ func(*args, **kwargs) +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/code_generator.py b/chromium/third_party/blink/renderer/bindings/scripts/code_generator.py +index e8280be7213..e49e6eb965e 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/code_generator.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/code_generator.py +@@ -13,6 +13,7 @@ import re + import sys + + from idl_types import set_ancestors, IdlType ++from itertools import groupby + from v8_globals import includes + from v8_interface import constant_filters + from v8_types import set_component_dirs +@@ -43,6 +44,7 @@ TEMPLATES_DIR = os.path.normpath( + # after path[0] == invoking script dir + sys.path.insert(1, THIRD_PARTY_DIR) + import jinja2 ++from jinja2.filters import make_attrgetter, environmentfilter + + + def generate_indented_conditional(code, conditional): +@@ -88,6 +90,13 @@ def runtime_enabled_if(code, name): + return generate_indented_conditional(code, function) + + ++ at environmentfilter ++def do_stringify_key_group_by(environment, value, attribute): ++ expr = make_attrgetter(environment, attribute) ++ key = lambda item: '' if expr(item) is None else str(expr(item)) ++ return groupby(sorted(value, key=key), expr) ++ ++ + def initialize_jinja_env(cache_dir): + jinja_env = jinja2.Environment( + loader=jinja2.FileSystemLoader(TEMPLATES_DIR), +@@ -117,6 +126,7 @@ def initialize_jinja_env(cache_dir): + }) + jinja_env.filters.update(constant_filters()) + jinja_env.filters.update(method_filters()) ++ jinja_env.filters["stringifykeygroupby"] = do_stringify_key_group_by + return jinja_env + + +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/generate_origin_trial_features.py b/chromium/third_party/blink/renderer/bindings/scripts/generate_origin_trial_features.py +index 130004eae83..04c0fabcef2 100755 +--- a/chromium/third_party/blink/renderer/bindings/scripts/generate_origin_trial_features.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/generate_origin_trial_features.py +@@ -80,7 +80,7 @@ def read_idl_file(reader, idl_filename): + assert len(interfaces) == 1, ( + "Expected one interface in file %r, found %d" % + (idl_filename, len(interfaces))) +- return (interfaces.values()[0], includes) ++ return (list(interfaces.values())[0], includes) + + + def interface_is_global(interface): +@@ -281,7 +281,7 @@ def main(): + + info_provider = create_component_info_provider( + os.path.normpath(options.info_dir), options.target_component) +- idl_filenames = map(str.strip, open(options.idl_files_list)) ++ idl_filenames = list(map(str.strip, open(options.idl_files_list))) + + generate_origin_trial_features(info_provider, options, idl_filenames) + return 0 +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/idl_definitions.py b/chromium/third_party/blink/renderer/bindings/scripts/idl_definitions.py +index 14e6e9d3f87..b027818aef2 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/idl_definitions.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/idl_definitions.py +@@ -394,7 +394,8 @@ class IdlInterface(object): + else: + raise ValueError('Unrecognized node class: %s' % child_class) + +- if len(filter(None, [self.iterable, self.maplike, self.setlike])) > 1: ++ if len(list(filter(None, ++ [self.iterable, self.maplike, self.setlike]))) > 1: + raise ValueError( + 'Interface can only have one of iterable<>, maplike<> and setlike<>.' + ) +@@ -512,6 +513,9 @@ class IdlAttribute(TypedObject): + def accept(self, visitor): + visitor.visit_attribute(self) + ++ def __lt__(self, other): ++ return self.name < other.name ++ + + ################################################################################ + # Constants +@@ -852,7 +856,7 @@ class IdlIncludes(object): + ################################################################################ + + +-class Exposure: ++class Exposure(object): + """An Exposure holds one Exposed or RuntimeEnabled condition. + Each exposure has two properties: exposed and runtime_enabled. + Exposure(e, r) corresponds to [Exposed(e r)]. Exposure(e) corresponds to +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/idl_reader.py b/chromium/third_party/blink/renderer/bindings/scripts/idl_reader.py +index 8d72865a6ca..b80eebdcd61 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/idl_reader.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/idl_reader.py +@@ -55,8 +55,8 @@ def validate_blink_idl_definitions(idl_filename, idl_file_basename, + definitions. There is no filename convention in this case. + - Otherwise, an IDL file is invalid. + """ +- targets = ( +- definitions.interfaces.values() + definitions.dictionaries.values()) ++ targets = (list(definitions.interfaces.values()) + ++ list(definitions.dictionaries.values())) + number_of_targets = len(targets) + if number_of_targets > 1: + raise Exception( +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/idl_types.py b/chromium/third_party/blink/renderer/bindings/scripts/idl_types.py +index cd4f0c3513b..ab95e9c0b08 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/idl_types.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/idl_types.py +@@ -349,7 +349,7 @@ class IdlUnionType(IdlTypeBase): + return True + + def single_matching_member_type(self, predicate): +- matching_types = filter(predicate, self.flattened_member_types) ++ matching_types = list(filter(predicate, self.flattened_member_types)) + if len(matching_types) > 1: + raise ValueError('%s is ambiguous.' % self.name) + return matching_types[0] if matching_types else None +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/utilities.py b/chromium/third_party/blink/renderer/bindings/scripts/utilities.py +index e1677ee7bd6..3c5006f064f 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/utilities.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/utilities.py +@@ -196,8 +196,9 @@ class ComponentInfoProviderModules(ComponentInfoProvider): + + @property + def callback_functions(self): +- return dict(self._component_info_core['callback_functions'].items() + +- self._component_info_modules['callback_functions'].items()) ++ return dict( ++ list(self._component_info_core['callback_functions'].items()) + ++ list(self._component_info_modules['callback_functions'].items())) + + @property + def specifier_for_export(self): +@@ -209,8 +210,8 @@ class ComponentInfoProviderModules(ComponentInfoProvider): + + + def load_interfaces_info_overall_pickle(info_dir): +- with open(os.path.join(info_dir, +- 'interfaces_info.pickle')) as interface_info_file: ++ with open(os.path.join(info_dir, 'interfaces_info.pickle'), ++ mode='rb') as interface_info_file: + return pickle.load(interface_info_file) + + +@@ -236,23 +237,20 @@ def merge_dict_recursively(target, diff): + + def create_component_info_provider_core(info_dir): + interfaces_info = load_interfaces_info_overall_pickle(info_dir) +- with open( +- os.path.join(info_dir, 'core', +- 'component_info_core.pickle')) as component_info_file: ++ with open(os.path.join(info_dir, 'core', 'component_info_core.pickle'), ++ mode='rb') as component_info_file: + component_info = pickle.load(component_info_file) + return ComponentInfoProviderCore(interfaces_info, component_info) + + + def create_component_info_provider_modules(info_dir): + interfaces_info = load_interfaces_info_overall_pickle(info_dir) +- with open( +- os.path.join(info_dir, 'core', +- 'component_info_core.pickle')) as component_info_file: ++ with open(os.path.join(info_dir, 'core', 'component_info_core.pickle'), ++ mode='rb') as component_info_file: + component_info_core = pickle.load(component_info_file) +- with open( +- os.path.join( +- info_dir, 'modules', +- 'component_info_modules.pickle')) as component_info_file: ++ with open(os.path.join(info_dir, 'modules', ++ 'component_info_modules.pickle'), ++ mode='rb') as component_info_file: + component_info_modules = pickle.load(component_info_file) + return ComponentInfoProviderModules(interfaces_info, component_info_core, + component_info_modules) +@@ -356,7 +354,7 @@ def write_pickle_file(pickle_filename, data): + pickle_filename = abs(pickle_filename) + # If |data| is same with the file content, we skip updating. + if os.path.isfile(pickle_filename): +- with open(pickle_filename) as pickle_file: ++ with open(pickle_filename, 'rb') as pickle_file: + try: + if pickle.load(pickle_file) == data: + return +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/v8_interface.py b/chromium/third_party/blink/renderer/bindings/scripts/v8_interface.py +index a43260414db..a85b03abe75 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/v8_interface.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/v8_interface.py +@@ -189,7 +189,7 @@ def context_enabled_features(attributes): + return sorted([ + member for member in members + if member.get(KEY) and not member.get('exposed_test') +- ]) ++ ], key=lambda item: item['name']) + + def member_filter_by_name(members, name): + return [member for member in members if member[KEY] == name] +@@ -612,7 +612,8 @@ def interface_context(interface, interfaces, component_info): + sorted( + origin_trial_features(interface, context['constants'], + context['attributes'], context['methods']) + +- context_enabled_features(context['attributes'])), ++ context_enabled_features(context['attributes']), ++ key=lambda item: item['name']), + }) + if context['optional_features']: + includes.add('platform/bindings/v8_per_context_data.h') +@@ -1356,9 +1357,9 @@ def resolution_tests_methods(effective_overloads): + + # Extract argument and IDL type to simplify accessing these in each loop. + arguments = [method['arguments'][index] for method in methods] +- arguments_methods = zip(arguments, methods) ++ arguments_methods = list(zip(arguments, methods)) + idl_types = [argument['idl_type_object'] for argument in arguments] +- idl_types_methods = zip(idl_types, methods) ++ idl_types_methods = list(zip(idl_types, methods)) + + # We can?t do a single loop through all methods or simply sort them, because + # a method may be listed in multiple steps of the resolution algorithm, and +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/v8_methods.py b/chromium/third_party/blink/renderer/bindings/scripts/v8_methods.py +index 5f1f89a3def..6ee8a407798 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/v8_methods.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/v8_methods.py +@@ -46,6 +46,10 @@ import v8_types + import v8_utilities + from v8_utilities import (has_extended_attribute_value, is_unforgeable) + ++# TODO: Remove this once Python2 is obsoleted. ++if sys.version_info.major != 2: ++ basestring = str ++ + + def method_is_visible(method, interface_is_partial): + if 'overloads' in method: +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/v8_utilities.py b/chromium/third_party/blink/renderer/bindings/scripts/v8_utilities.py +index 2ecd6923320..fcfc48371b1 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/v8_utilities.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/v8_utilities.py +@@ -271,7 +271,7 @@ EXPOSED_WORKERS = set([ + ]) + + +-class ExposureSet: ++class ExposureSet(object): + """An ExposureSet is a collection of Exposure instructions.""" + + def __init__(self, exposures=None): +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/callback_interface.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/callback_interface.py +index 13fb7c7068d..b73b7710687 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/callback_interface.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/callback_interface.py +@@ -91,11 +91,13 @@ class CallbackInterface(UserDefinedType, WithExtendedAttributes, + for operation_ir in ir.operations + ]) + self._operation_groups = tuple([ +- OperationGroup( +- operation_group_ir, +- filter(lambda x: x.identifier == operation_group_ir.identifier, +- self._operations), +- owner=self) for operation_group_ir in ir.operation_groups ++ OperationGroup(operation_group_ir, ++ list( ++ filter( ++ lambda x: x.identifier == operation_group_ir ++ .identifier, self._operations)), ++ owner=self) ++ for operation_group_ir in ir.operation_groups + ]) + + @property +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/database.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/database.py +index c92cf48eb2a..f5d59129449 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/database.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/database.py +@@ -156,4 +156,4 @@ class Database(object): + return self._view_by_kind(Database._Kind.UNION) + + def _view_by_kind(self, kind): +- return self._impl.find_by_kind(kind).values() ++ return list(self._impl.find_by_kind(kind).values()) +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/exposure.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/exposure.py +index abaeef39c30..e36cf7439ae 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/exposure.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/exposure.py +@@ -8,8 +8,11 @@ from .runtime_enabled_features import RuntimeEnabledFeatures + class _Feature(str): + """Represents a runtime-enabled feature.""" + ++ def __new__(cls, value): ++ return str.__new__(cls, value) ++ + def __init__(self, value): +- str.__init__(self, value) ++ str.__init__(self) + self._is_context_dependent = ( + RuntimeEnabledFeatures.is_context_dependent(self)) + +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/function_like.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/function_like.py +index 648c70d803d..1712f19c672 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/function_like.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/function_like.py +@@ -71,8 +71,9 @@ class FunctionLike(WithIdentifier): + def num_of_required_arguments(self): + """Returns the number of required arguments.""" + return len( +- filter(lambda arg: not (arg.is_optional or arg.is_variadic), +- self.arguments)) ++ list( ++ filter(lambda arg: not (arg.is_optional or arg.is_variadic), ++ self.arguments))) + + + class OverloadGroup(WithIdentifier): +@@ -171,8 +172,7 @@ class OverloadGroup(WithIdentifier): + Returns the effective overload set. + https://heycam.github.io/webidl/#compute-the-effective-overload-set + """ +- assert argument_count is None or isinstance(argument_count, +- (int, long)) ++ assert argument_count is None or isinstance(argument_count, int) + + N = argument_count + S = [] +@@ -188,21 +188,21 @@ class OverloadGroup(WithIdentifier): + + S.append( + OverloadGroup.EffectiveOverloadItem( +- X, map(lambda arg: arg.idl_type, X.arguments), +- map(lambda arg: arg.optionality, X.arguments))) ++ X, list(map(lambda arg: arg.idl_type, X.arguments)), ++ list(map(lambda arg: arg.optionality, X.arguments)))) + + if X.is_variadic: +- for i in xrange(n, max(maxarg, N)): +- t = map(lambda arg: arg.idl_type, X.arguments) +- o = map(lambda arg: arg.optionality, X.arguments) +- for _ in xrange(n, i + 1): ++ for i in range(n, max(maxarg, N)): ++ t = list(map(lambda arg: arg.idl_type, X.arguments)) ++ o = list(map(lambda arg: arg.optionality, X.arguments)) ++ for _ in range(n, i + 1): + t.append(X.arguments[-1].idl_type) + o.append(X.arguments[-1].optionality) + S.append(OverloadGroup.EffectiveOverloadItem(X, t, o)) + +- t = map(lambda arg: arg.idl_type, X.arguments) +- o = map(lambda arg: arg.optionality, X.arguments) +- for i in xrange(n - 1, -1, -1): ++ t = list(map(lambda arg: arg.idl_type, X.arguments)) ++ o = list(map(lambda arg: arg.optionality, X.arguments)) ++ for i in range(n - 1, -1, -1): + if X.arguments[i].optionality == IdlType.Optionality.REQUIRED: + break + S.append(OverloadGroup.EffectiveOverloadItem(X, t[:i], o[:i])) +@@ -222,7 +222,7 @@ class OverloadGroup(WithIdentifier): + for item in items) + assert len(items) > 1 + +- for index in xrange(len(items[0].type_list)): ++ for index in range(len(items[0].type_list)): + # Assume that the given items are valid, and we only need to test + # the two types. + if OverloadGroup.are_distinguishable_types( +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/idl_compiler.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/idl_compiler.py +index c5ee2bd8a3d..58315072480 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/idl_compiler.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/idl_compiler.py +@@ -149,8 +149,8 @@ class IdlCompiler(object): + for old_ir in old_irs: + new_ir = make_copy(old_ir) + self._ir_map.add(new_ir) +- new_ir.attributes = filter(not_disabled, new_ir.attributes) +- new_ir.operations = filter(not_disabled, new_ir.operations) ++ new_ir.attributes = list(filter(not_disabled, new_ir.attributes)) ++ new_ir.operations = list(filter(not_disabled, new_ir.operations)) + + def _record_defined_in_partial_and_mixin(self): + old_irs = self._ir_map.irs_of_kinds( +@@ -231,7 +231,7 @@ class IdlCompiler(object): + only_to_members_of_partial_or_mixin=False) + propagate_to_exposure(propagate) + +- map(process_member_like, ir.iter_all_members()) ++ list(map(process_member_like, ir.iter_all_members())) + + def process_member_like(ir): + propagate = functools.partial(propagate_extattr, ir=ir) +@@ -257,7 +257,7 @@ class IdlCompiler(object): + + self._ir_map.move_to_new_phase() + +- map(process_interface_like, old_irs) ++ list(map(process_interface_like, old_irs)) + + def _determine_blink_headers(self): + irs = self._ir_map.irs_of_kinds( +@@ -422,9 +422,9 @@ class IdlCompiler(object): + assert not new_interface.deriveds + derived_set = identifier_to_derived_set.get( + new_interface.identifier, set()) +- new_interface.deriveds = map( +- lambda id_: self._ref_to_idl_def_factory.create(id_), +- sorted(derived_set)) ++ new_interface.deriveds = list( ++ map(lambda id_: self._ref_to_idl_def_factory.create(id_), ++ sorted(derived_set))) + + def _supplement_missing_html_constructor_operation(self): + # Temporary mitigation of misuse of [HTMLConstructor] +@@ -553,7 +553,8 @@ class IdlCompiler(object): + self._ir_map.add(new_ir) + + for group in new_ir.iter_all_overload_groups(): +- exposures = map(lambda overload: overload.exposure, group) ++ exposures = list(map(lambda overload: overload.exposure, ++ group)) + + # [Exposed] + if any(not exposure.global_names_and_features +@@ -653,8 +654,8 @@ class IdlCompiler(object): + constructs = set() + for global_name in global_names: + constructs.update(exposed_map.get(global_name, [])) +- new_ir.exposed_constructs = map( +- self._ref_to_idl_def_factory.create, sorted(constructs)) ++ new_ir.exposed_constructs = list( ++ map(self._ref_to_idl_def_factory.create, sorted(constructs))) + + assert not new_ir.legacy_window_aliases + if new_ir.identifier != 'Window': +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/interface.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/interface.py +index 65d24e529d1..067ef2eb0b2 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/interface.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/interface.py +@@ -180,8 +180,9 @@ class Interface(UserDefinedType, WithExtendedAttributes, WithCodeGeneratorInfo, + self._constructor_groups = tuple([ + ConstructorGroup( + group_ir, +- filter(lambda x: x.identifier == group_ir.identifier, +- self._constructors), ++ list( ++ filter(lambda x: x.identifier == group_ir.identifier, ++ self._constructors)), + owner=self) for group_ir in ir.constructor_groups + ]) + assert len(self._constructor_groups) <= 1 +@@ -192,8 +193,9 @@ class Interface(UserDefinedType, WithExtendedAttributes, WithCodeGeneratorInfo, + self._named_constructor_groups = tuple([ + ConstructorGroup( + group_ir, +- filter(lambda x: x.identifier == group_ir.identifier, +- self._named_constructors), ++ list( ++ filter(lambda x: x.identifier == group_ir.identifier, ++ self._named_constructors)), + owner=self) for group_ir in ir.named_constructor_groups + ]) + self._operations = tuple([ +@@ -203,22 +205,23 @@ class Interface(UserDefinedType, WithExtendedAttributes, WithCodeGeneratorInfo, + self._operation_groups = tuple([ + OperationGroup( + group_ir, +- filter(lambda x: x.identifier == group_ir.identifier, +- self._operations), ++ list( ++ filter(lambda x: x.identifier == group_ir.identifier, ++ self._operations)), + owner=self) for group_ir in ir.operation_groups + ]) + self._exposed_constructs = tuple(ir.exposed_constructs) + self._legacy_window_aliases = tuple(ir.legacy_window_aliases) + self._indexed_and_named_properties = None +- indexed_and_named_property_operations = filter( +- lambda x: x.is_indexed_or_named_property_operation, +- self._operations) ++ indexed_and_named_property_operations = list( ++ filter(lambda x: x.is_indexed_or_named_property_operation, ++ self._operations)) + if indexed_and_named_property_operations: + self._indexed_and_named_properties = IndexedAndNamedProperties( + indexed_and_named_property_operations, owner=self) + self._stringifier = None +- stringifier_operation_irs = filter(lambda x: x.is_stringifier, +- ir.operations) ++ stringifier_operation_irs = list( ++ filter(lambda x: x.is_stringifier, ir.operations)) + if stringifier_operation_irs: + assert len(stringifier_operation_irs) == 1 + op_ir = make_copy(stringifier_operation_irs[0]) +@@ -231,8 +234,9 @@ class Interface(UserDefinedType, WithExtendedAttributes, WithCodeGeneratorInfo, + attribute = None + if operation.stringifier_attribute: + attr_id = operation.stringifier_attribute +- attributes = filter(lambda x: x.identifier == attr_id, +- self._attributes) ++ attributes = list( ++ filter(lambda x: x.identifier == attr_id, ++ self._attributes)) + assert len(attributes) == 1 + attribute = attributes[0] + self._stringifier = Stringifier(operation, attribute, owner=self) +@@ -578,8 +582,9 @@ class Iterable(WithDebugInfo): + self._operation_groups = tuple([ + OperationGroup( + group_ir, +- filter(lambda x: x.identifier == group_ir.identifier, +- self._operations), ++ list( ++ filter(lambda x: x.identifier == group_ir.identifier, ++ self._operations)), + owner=owner) for group_ir in ir.operation_groups + ]) + +@@ -666,8 +671,9 @@ class Maplike(WithDebugInfo): + self._operation_groups = tuple([ + OperationGroup( + group_ir, +- filter(lambda x: x.identifier == group_ir.identifier, +- self._operations), ++ list( ++ filter(lambda x: x.identifier == group_ir.identifier, ++ self._operations)), + owner=owner) for group_ir in ir.operation_groups + ]) + +@@ -755,8 +761,9 @@ class Setlike(WithDebugInfo): + self._operation_groups = tuple([ + OperationGroup( + group_ir, +- filter(lambda x: x.identifier == group_ir.identifier, +- self._operations), ++ list( ++ filter(lambda x: x.identifier == group_ir.identifier, ++ self._operations)), + owner=owner) for group_ir in ir.operation_groups + ]) + +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/ir_builder.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/ir_builder.py +index e9aeff4ab82..d80554d603e 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/ir_builder.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/ir_builder.py +@@ -2,6 +2,8 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import sys ++ + from .argument import Argument + from .ast_group import AstGroup + from .attribute import Attribute +@@ -30,6 +32,11 @@ from .operation import Operation + from .typedef import Typedef + + ++# TODO: Remove this once Python2 is obsoleted. ++if sys.version_info.major != 2: ++ long = int ++ ++ + def load_and_register_idl_definitions(filepaths, register_ir, + create_ref_to_idl_def, idl_type_factory): + """ +@@ -160,7 +167,7 @@ class _IRBuilder(object): + child_nodes = list(node.GetChildren()) + extended_attributes = self._take_extended_attributes(child_nodes) + +- members = map(self._build_interface_member, child_nodes) ++ members = list(map(self._build_interface_member, child_nodes)) + attributes = [] + constants = [] + operations = [] +@@ -302,7 +309,7 @@ class _IRBuilder(object): + child_nodes = list(node.GetChildren()) + inherited = self._take_inheritance(child_nodes) + extended_attributes = self._take_extended_attributes(child_nodes) +- own_members = map(self._build_dictionary_member, child_nodes) ++ own_members = list(map(self._build_dictionary_member, child_nodes)) + + return Dictionary.IR( + identifier=Identifier(node.GetName()), +@@ -336,7 +343,7 @@ class _IRBuilder(object): + + child_nodes = list(node.GetChildren()) + extended_attributes = self._take_extended_attributes(child_nodes) +- members = map(self._build_interface_member, child_nodes) ++ members = list(map(self._build_interface_member, child_nodes)) + constants = [] + operations = [] + for member in members: +@@ -456,8 +463,8 @@ class _IRBuilder(object): + assert len(child_nodes) == 1 + child = child_nodes[0] + if child.GetClass() == 'Arguments': +- arguments = map(build_extattr_argument, +- child.GetChildren()) ++ arguments = list( ++ map(build_extattr_argument, child.GetChildren())) + elif child.GetClass() == 'Call': + assert len(child.GetChildren()) == 1 + grand_child = child.GetChildren()[0] +@@ -486,7 +493,9 @@ class _IRBuilder(object): + + assert node.GetClass() == 'ExtAttributes' + return ExtendedAttributes( +- filter(None, map(build_extended_attribute, node.GetChildren()))) ++ list( ++ filter(None, map(build_extended_attribute, ++ node.GetChildren())))) + + def _build_inheritance(self, node): + assert node.GetClass() == 'Inherit' +@@ -506,7 +515,7 @@ class _IRBuilder(object): + + def _build_iterable(self, node): + assert node.GetClass() == 'Iterable' +- types = map(self._build_type, node.GetChildren()) ++ types = list(map(self._build_type, node.GetChildren())) + assert len(types) == 1 or len(types) == 2 + if len(types) == 1: # value iterator + key_type, value_type = (None, types[0]) +@@ -584,7 +593,7 @@ class _IRBuilder(object): + def _build_maplike(self, node, interface_identifier): + assert node.GetClass() == 'Maplike' + assert isinstance(interface_identifier, Identifier) +- types = map(self._build_type, node.GetChildren()) ++ types = list(map(self._build_type, node.GetChildren())) + assert len(types) == 2 + key_type, value_type = types + is_readonly = bool(node.GetProperty('READONLY')) +@@ -676,7 +685,7 @@ class _IRBuilder(object): + def _build_setlike(self, node, interface_identifier): + assert node.GetClass() == 'Setlike' + assert isinstance(interface_identifier, Identifier) +- types = map(self._build_type, node.GetChildren()) ++ types = list(map(self._build_type, node.GetChildren())) + assert len(types) == 1 + value_type = types[0] + is_readonly = bool(node.GetProperty('READONLY')) +@@ -838,7 +847,7 @@ class _IRBuilder(object): + + def build_union_type(node, extended_attributes): + return self._idl_type_factory.union_type( +- member_types=map(self._build_type, node.GetChildren()), ++ member_types=list(map(self._build_type, node.GetChildren())), + is_optional=is_optional, + extended_attributes=extended_attributes, + debug_info=self._build_debug_info(node)) +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/make_copy.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/make_copy.py +index a7a2b11f3f0..2f6b61300ff 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/make_copy.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/make_copy.py +@@ -3,6 +3,13 @@ + # found in the LICENSE file. + + ++import sys ++ ++# TODO: Remove this once Python2 is obsoleted. ++if sys.version_info.major != 2: ++ long = int ++ basestring = str ++ + def make_copy(obj, memo=None): + """ + Creates a copy of the given object, which should be an IR or part of IR. +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/namespace.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/namespace.py +index eeabef97cbe..bd7e98907f3 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/namespace.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/namespace.py +@@ -107,11 +107,13 @@ class Namespace(UserDefinedType, WithExtendedAttributes, WithCodeGeneratorInfo, + for operation_ir in ir.operations + ]) + self._operation_groups = tuple([ +- OperationGroup( +- operation_group_ir, +- filter(lambda x: x.identifier == operation_group_ir.identifier, +- self._operations), +- owner=self) for operation_group_ir in ir.operation_groups ++ OperationGroup(operation_group_ir, ++ list( ++ filter( ++ lambda x: x.identifier == operation_group_ir ++ .identifier, self._operations)), ++ owner=self) ++ for operation_group_ir in ir.operation_groups + ]) + + @property +diff --git a/chromium/third_party/blink/renderer/bindings/templates/dictionary_v8.cc.tmpl b/chromium/third_party/blink/renderer/bindings/templates/dictionary_v8.cc.tmpl +index 0add9c45a38..dc910f6d227 100644 +--- a/chromium/third_party/blink/renderer/bindings/templates/dictionary_v8.cc.tmpl ++++ b/chromium/third_party/blink/renderer/bindings/templates/dictionary_v8.cc.tmpl +@@ -59,9 +59,9 @@ void {{v8_class}}::ToImpl(v8::Isolate* isolate, v8::Local v8_value, { + DCHECK(executionContext); + {% endif %}{# has_origin_trial_members #} + {% endif %}{# members #} +- {% for origin_trial_test, origin_trial_member_list in members | groupby('origin_trial_feature_name') %} ++ {% for origin_trial_test, origin_trial_member_list in members | stringifykeygroupby('origin_trial_feature_name') %} + {% filter origin_trial_enabled(origin_trial_test, "executionContext") %} +- {% for feature_name, member_list in origin_trial_member_list | groupby('runtime_enabled_feature_name') %} ++ {% for feature_name, member_list in origin_trial_member_list | stringifykeygroupby('runtime_enabled_feature_name') %} + {% filter runtime_enabled(feature_name) %} + {% for member in member_list %} + v8::Local {{member.v8_value}}; +@@ -147,9 +147,9 @@ bool toV8{{cpp_class}}(const {{cpp_class}}* impl, v8::Local dictiona + DCHECK(executionContext); + {% endif %}{# has_origin_trial_members #} + {% endif %}{# members #} +- {% for origin_trial_test, origin_trial_member_list in members | groupby('origin_trial_feature_name') %} ++ {% for origin_trial_test, origin_trial_member_list in members | stringifykeygroupby('origin_trial_feature_name') %} + {% filter origin_trial_enabled(origin_trial_test, "executionContext") %} +- {% for feature_name, member_list in origin_trial_member_list | groupby('runtime_enabled_feature_name') %} ++ {% for feature_name, member_list in origin_trial_member_list | stringifykeygroupby('runtime_enabled_feature_name') %} + {% filter runtime_enabled(feature_name) %} + {% for member in member_list %} + v8::Local {{member.v8_value}}; +diff --git a/chromium/third_party/blink/renderer/build/scripts/core/css/make_style_shorthands.py b/chromium/third_party/blink/renderer/build/scripts/core/css/make_style_shorthands.py +index 1799cd5a153..5f43ffabc26 100755 +--- a/chromium/third_party/blink/renderer/build/scripts/core/css/make_style_shorthands.py ++++ b/chromium/third_party/blink/renderer/build/scripts/core/css/make_style_shorthands.py +@@ -71,7 +71,7 @@ class Expansion(object): + def enabled_longhands(self): + include = lambda longhand: not longhand[ + 'runtime_flag'] or self.is_enabled(longhand['runtime_flag']) +- return filter(include, self._longhands) ++ return list(filter(include, self._longhands)) + + @property + def index(self): +@@ -87,8 +87,9 @@ class Expansion(object): + + def create_expansions(longhands): + flags = collect_runtime_flags(longhands) +- expansions = map(lambda mask: Expansion(longhands, flags, mask), +- range(1 << len(flags))) ++ expansions = list( ++ map(lambda mask: Expansion(longhands, flags, mask), ++ range(1 << len(flags)))) + assert len(expansions) > 0 + # We generate 2^N expansions for N flags, so enforce some limit. + assert len(flags) <= 4, 'Too many runtime flags for a single shorthand' +@@ -114,14 +115,14 @@ class StylePropertyShorthandWriter(json5_generator.Writer): + + self._longhand_dictionary = defaultdict(list) + for property_ in json5_properties.shorthands: +- property_['longhand_enum_keys'] = map(enum_key_for_css_property, +- property_['longhands']) +- property_['longhand_property_ids'] = map(id_for_css_property, +- property_['longhands']) +- +- longhands = map( +- lambda name: json5_properties.properties_by_name[name], +- property_['longhands']) ++ property_['longhand_enum_keys'] = list( ++ map(enum_key_for_css_property, property_['longhands'])) ++ property_['longhand_property_ids'] = list( ++ map(id_for_css_property, property_['longhands'])) ++ ++ longhands = list( ++ map(lambda name: json5_properties.properties_by_name[name], ++ property_['longhands'])) + property_['expansions'] = create_expansions(longhands) + for longhand_enum_key in property_['longhand_enum_keys']: + self._longhand_dictionary[longhand_enum_key].append(property_) +diff --git a/chromium/third_party/blink/renderer/build/scripts/core/css/properties/make_css_property_instances.py b/chromium/third_party/blink/renderer/build/scripts/core/css/properties/make_css_property_instances.py +index 75030ac577e..f72aadee17d 100755 +--- a/chromium/third_party/blink/renderer/build/scripts/core/css/properties/make_css_property_instances.py ++++ b/chromium/third_party/blink/renderer/build/scripts/core/css/properties/make_css_property_instances.py +@@ -42,8 +42,8 @@ class CSSPropertyInstancesWriter(json5_generator.Writer): + aliases = self._css_properties.aliases + + # Lists of PropertyClassData. +- self._property_classes_by_id = map(self.get_class, properties) +- self._alias_classes_by_id = map(self.get_class, aliases) ++ self._property_classes_by_id = list(map(self.get_class, properties)) ++ self._alias_classes_by_id = list(map(self.get_class, aliases)) + + # Sort by enum value. + self._property_classes_by_id.sort(key=lambda t: t.enum_value) +diff --git a/chromium/third_party/blink/renderer/build/scripts/gperf.py b/chromium/third_party/blink/renderer/build/scripts/gperf.py +index 5ee49056be4..db72660d471 100644 +--- a/chromium/third_party/blink/renderer/build/scripts/gperf.py ++++ b/chromium/third_party/blink/renderer/build/scripts/gperf.py +@@ -95,7 +95,7 @@ def main(): + + open(args.output_file, 'wb').write( + generate_gperf(gperf_path, +- open(infile).read(), gperf_args)) ++ open(infile).read(), gperf_args).encode('utf-8')) + + + if __name__ == '__main__': +diff --git a/chromium/third_party/blink/renderer/build/scripts/in_file.py b/chromium/third_party/blink/renderer/build/scripts/in_file.py +index 28adc050f1e..58113483e57 100644 +--- a/chromium/third_party/blink/renderer/build/scripts/in_file.py ++++ b/chromium/third_party/blink/renderer/build/scripts/in_file.py +@@ -66,7 +66,7 @@ class InFile(object): + self._defaults = defaults + self._valid_values = copy.deepcopy( + valid_values if valid_values else {}) +- self._parse(map(str.strip, lines)) ++ self._parse(list(map(str.strip, lines))) + + @classmethod + def load_from_files(self, file_paths, defaults, valid_values, +diff --git a/chromium/third_party/blink/renderer/build/scripts/in_generator.py b/chromium/third_party/blink/renderer/build/scripts/in_generator.py +index e46740a2e85..ab1981ad1e3 100644 +--- a/chromium/third_party/blink/renderer/build/scripts/in_generator.py ++++ b/chromium/third_party/blink/renderer/build/scripts/in_generator.py +@@ -32,10 +32,15 @@ import os + import os.path + import shlex + import shutil ++import sys + import optparse + + from in_file import InFile + ++# TODO: Remove this once Python2 is obsoleted. ++if sys.version_info.major != 2: ++ basestring = str ++ + + ######################################################### + # This is now deprecated - use json5_generator.py instead +diff --git a/chromium/third_party/blink/renderer/build/scripts/make_runtime_features.py b/chromium/third_party/blink/renderer/build/scripts/make_runtime_features.py +index cafe8d94a8e..6925a4fa580 100755 +--- a/chromium/third_party/blink/renderer/build/scripts/make_runtime_features.py ++++ b/chromium/third_party/blink/renderer/build/scripts/make_runtime_features.py +@@ -138,7 +138,7 @@ class RuntimeFeatureWriter(BaseRuntimeFeatureWriter): + except Exception: + # If trouble unpickling, overwrite + pass +- with open(os.path.abspath(file_name), 'w') as pickle_file: ++ with open(os.path.abspath(file_name), 'wb') as pickle_file: + pickle.dump(features_map, pickle_file) + + def _template_inputs(self): +diff --git a/chromium/third_party/blink/renderer/build/scripts/templates/element_factory.cc.tmpl b/chromium/third_party/blink/renderer/build/scripts/templates/element_factory.cc.tmpl +index dc3f44c5b10..3eefcf9f0ee 100644 +--- a/chromium/third_party/blink/renderer/build/scripts/templates/element_factory.cc.tmpl ++++ b/chromium/third_party/blink/renderer/build/scripts/templates/element_factory.cc.tmpl +@@ -26,7 +26,7 @@ using {{namespace}}FunctionMap = HashMapGetExecutionContext())) { +diff --git a/chromium/third_party/blink/renderer/build/scripts/templates/element_type_helpers.h.tmpl b/chromium/third_party/blink/renderer/build/scripts/templates/element_type_helpers.h.tmpl +index 1b5297d52dc..edecc81d9d4 100644 +--- a/chromium/third_party/blink/renderer/build/scripts/templates/element_type_helpers.h.tmpl ++++ b/chromium/third_party/blink/renderer/build/scripts/templates/element_type_helpers.h.tmpl +@@ -15,7 +15,7 @@ namespace blink { + class Document; + + // Type checking. +-{% for tag in tags|sort if not tag.multipleTagNames and not tag.noTypeHelpers %} ++{% for tag in tags|sort(attribute='name') if not tag.multipleTagNames and not tag.noTypeHelpers %} + class {{tag.interface}}; + template <> + inline bool IsElementOfType(const Node& node) { +diff --git a/chromium/third_party/blink/renderer/build/scripts/templates/macros.tmpl b/chromium/third_party/blink/renderer/build/scripts/templates/macros.tmpl +index 0244433af2e..dcdbb02a56c 100644 +--- a/chromium/third_party/blink/renderer/build/scripts/templates/macros.tmpl ++++ b/chromium/third_party/blink/renderer/build/scripts/templates/macros.tmpl +@@ -25,7 +25,7 @@ + + + {% macro trie_leaf(index, object, return_macro, lowercase_data) %} +-{% set name, value = object.items()[0] %} ++{% set name, value = (object.items()|list)[0] %} + {% if name|length %} + if ( + {%- for c in name -%} +@@ -45,7 +45,7 @@ return {{ return_macro(value) }}; + + + {% macro trie_switch(trie, index, return_macro, lowercase_data) %} +-{% if trie|length == 1 and trie.values()[0] is string %} ++{% if trie|length == 1 and (trie.values()|list)[0] is string %} + {{ trie_leaf(index, trie, return_macro, lowercase_data) -}} + {% else %} + {% if lowercase_data %} +diff --git a/chromium/third_party/blink/renderer/build/scripts/templates/make_qualified_names.h.tmpl b/chromium/third_party/blink/renderer/build/scripts/templates/make_qualified_names.h.tmpl +index cb05c6c4315..bd5566b03e7 100644 +--- a/chromium/third_party/blink/renderer/build/scripts/templates/make_qualified_names.h.tmpl ++++ b/chromium/third_party/blink/renderer/build/scripts/templates/make_qualified_names.h.tmpl +@@ -24,12 +24,12 @@ namespace {{cpp_namespace}} { + {{symbol_export}}extern const WTF::AtomicString& {{namespace_prefix}}NamespaceURI; + + // Tags +-{% for tag in tags|sort %} ++{% for tag in tags|sort(attribute='name') %} + {{symbol_export}}extern const blink::{{namespace}}QualifiedName& {{tag|symbol}}Tag; + {% endfor %} + + // Attributes +-{% for attr in attrs|sort %} ++{% for attr in attrs|sort(attribute='name') %} + {{symbol_export}}extern const blink::QualifiedName& {{attr|symbol}}Attr; + {% endfor %} + +diff --git a/chromium/third_party/dawn/generator/generator_lib.py b/chromium/third_party/dawn/generator/generator_lib.py +index 5e3734d7833..e3d46bd194f 100644 +--- a/chromium/third_party/dawn/generator/generator_lib.py ++++ b/chromium/third_party/dawn/generator/generator_lib.py +@@ -201,6 +201,10 @@ def _compute_python_dependencies(root_dir=None): + + paths = set() + for path in module_paths: ++ # Builtin/namespaced modules may return None for the file path. ++ if not path: ++ continue ++ + path = os.path.abspath(path) + + if not path.startswith(root_dir): +diff --git a/chromium/third_party/devtools-frontend/src/BUILD.gn b/chromium/third_party/devtools-frontend/src/BUILD.gn +index cd488e88b60..ea1dc3d9a79 100644 +--- a/chromium/third_party/devtools-frontend/src/BUILD.gn ++++ b/chromium/third_party/devtools-frontend/src/BUILD.gn +@@ -2,6 +2,8 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import("//build/config/python.gni") ++ + import("//third_party/blink/public/public_features.gni") + import("./all_devtools_files.gni") + import("./all_devtools_modules.gni") +diff --git a/chromium/third_party/devtools-frontend/src/scripts/build/build_inspector_overlay.py b/chromium/third_party/devtools-frontend/src/scripts/build/build_inspector_overlay.py +index d6666e8b74f..0f7a661e632 100644 +--- a/chromium/third_party/devtools-frontend/src/scripts/build/build_inspector_overlay.py ++++ b/chromium/third_party/devtools-frontend/src/scripts/build/build_inspector_overlay.py +@@ -45,7 +45,8 @@ def rollup(input_path, output_path, filename, max_size, rollup_plugin): + ['--format', 'iife', '-n', 'InspectorOverlay'] + ['--input', target] + + ['--plugin', rollup_plugin], + stdout=subprocess.PIPE, +- stderr=subprocess.PIPE) ++ stderr=subprocess.PIPE, ++ text=True) + out, error = rollup_process.communicate() + if not out: + raise Exception("rollup failed: " + error) +diff --git a/chromium/third_party/devtools-frontend/src/scripts/build/build_release_applications.py b/chromium/third_party/devtools-frontend/src/scripts/build/build_release_applications.py +index fa8e73d34af..7d0b84b2171 100644 +--- a/chromium/third_party/devtools-frontend/src/scripts/build/build_release_applications.py ++++ b/chromium/third_party/devtools-frontend/src/scripts/build/build_release_applications.py +@@ -10,7 +10,7 @@ Builds applications in release mode: + and?the?application?loader?into?a?single?script. + """ + +-from cStringIO import StringIO ++from io import StringIO + from os import path + from os.path import join + import copy +@@ -145,8 +145,7 @@ class ReleaseBuilder(object): + resource_content = read_file(path.join(self.application_dir, resource_name)) + if not (resource_name.endswith('.html') + or resource_name.endswith('md')): +- resource_content += resource_source_url(resource_name).encode( +- 'utf-8') ++ resource_content += resource_source_url(resource_name) + resource_content = resource_content.replace('\\', '\\\\') + resource_content = resource_content.replace('\n', '\\n') + resource_content = resource_content.replace('"', '\\"') +@@ -173,7 +172,9 @@ class ReleaseBuilder(object): + def _concatenate_application_script(self, output): + output.write('Root.allDescriptors.push(...%s);' % self._release_module_descriptors()) + if self.descriptors.extends: +- output.write('Root.applicationDescriptor.modules.push(...%s);' % json.dumps(self.descriptors.application.values())) ++ output.write( ++ 'Root.applicationDescriptor.modules.push(...%s);' % ++ json.dumps(list(self.descriptors.application.values()))) + else: + output.write('Root.applicationDescriptor = %s;' % self.descriptors.application_json()) + +diff --git a/chromium/third_party/devtools-frontend/src/scripts/build/generate_devtools_grd.py b/chromium/third_party/devtools-frontend/src/scripts/build/generate_devtools_grd.py +index be510c48d76..c6a59c90298 100644 +--- a/chromium/third_party/devtools-frontend/src/scripts/build/generate_devtools_grd.py ++++ b/chromium/third_party/devtools-frontend/src/scripts/build/generate_devtools_grd.py +@@ -123,7 +123,7 @@ def main(argv): + + try: + os.makedirs(path.join(output_directory, 'Images')) +- except OSError, e: ++ except OSError as e: + if e.errno != errno.EEXIST: + raise e + +@@ -147,7 +147,7 @@ def main(argv): + shutil.copy(path.join(dirname, filename), path.join(output_directory, 'Images')) + add_file_to_grd(doc, path.join('Images', filename)) + +- with open(parsed_args.output_filename, 'w') as output_file: ++ with open(parsed_args.output_filename, 'wb') as output_file: + output_file.write(doc.toxml(encoding='UTF-8')) + + +diff --git a/chromium/third_party/devtools-frontend/src/scripts/build/modular_build.py b/chromium/third_party/devtools-frontend/src/scripts/build/modular_build.py +index 0ba695d3810..bb1da2f9f8d 100644 +--- a/chromium/third_party/devtools-frontend/src/scripts/build/modular_build.py ++++ b/chromium/third_party/devtools-frontend/src/scripts/build/modular_build.py +@@ -7,6 +7,8 @@ + Utilities for the modular DevTools build. + """ + ++from __future__ import print_function ++ + import collections + from os import path + import os +@@ -40,7 +42,7 @@ def load_and_parse_json(filename): + try: + return json.loads(read_file(filename)) + except: +- print 'ERROR: Failed to parse %s' % filename ++ print('ERROR: Failed to parse %s' % filename) + raise + + class Descriptors: +@@ -57,7 +59,7 @@ class Descriptors: + + def application_json(self): + result = dict() +- result['modules'] = self.application.values() ++ result['modules'] = list(self.application.values()) + return json.dumps(result) + + def all_compiled_files(self): +diff --git a/chromium/third_party/jinja2/tests.py b/chromium/third_party/jinja2/tests.py +index 0adc3d4dbcb..b14f85ff148 100644 +--- a/chromium/third_party/jinja2/tests.py ++++ b/chromium/third_party/jinja2/tests.py +@@ -10,7 +10,7 @@ + """ + import operator + import re +-from collections import Mapping ++from collections.abc import Mapping + from jinja2.runtime import Undefined + from jinja2._compat import text_type, string_types, integer_types + import decimal +diff --git a/chromium/tools/metrics/ukm/gen_builders.py b/chromium/tools/metrics/ukm/gen_builders.py +index f9f61d90a56..44e46fae8cc 100755 +--- a/chromium/tools/metrics/ukm/gen_builders.py ++++ b/chromium/tools/metrics/ukm/gen_builders.py +@@ -48,9 +48,10 @@ def ReadFilteredData(path): + data = ukm_model.UKM_XML_TYPE.Parse(ukm_file.read()) + event_tag = ukm_model._EVENT_TYPE.tag + metric_tag = ukm_model._METRIC_TYPE.tag +- data[event_tag] = filter(ukm_model.IsNotObsolete, data[event_tag]) ++ data[event_tag] = list(filter(ukm_model.IsNotObsolete, data[event_tag])) + for event in data[event_tag]: +- event[metric_tag] = filter(ukm_model.IsNotObsolete, event[metric_tag]) ++ event[metric_tag] = list( ++ filter(ukm_model.IsNotObsolete, event[metric_tag])) + return data + + +diff --git a/chromium/ui/ozone/generate_constructor_list.py b/chromium/ui/ozone/generate_constructor_list.py +index 8d800636c97..04fa18e93df 100755 +--- a/chromium/ui/ozone/generate_constructor_list.py ++++ b/chromium/ui/ozone/generate_constructor_list.py +@@ -45,12 +45,15 @@ Example Output: ./ui/ozone/generate_constructor_list.py \ + } // namespace ui + """ + ++try: ++ from StringIO import StringIO # for Python 2 ++except ImportError: ++ from io import StringIO # for Python 3 + import optparse + import os + import collections + import re + import sys +-import string + + + def GetTypedefName(typename): +@@ -68,7 +71,7 @@ def GetConstructorName(typename, platform): + This is just "Create" + typename + platform. + """ + +- return 'Create' + typename + string.capitalize(platform) ++ return 'Create' + typename + platform.capitalize() + + + def GenerateConstructorList(out, namespace, export, typenames, platforms, +@@ -163,12 +166,14 @@ def main(argv): + sys.exit(1) + + # Write to standard output or file specified by --output_cc. +- out_cc = sys.stdout ++ out_cc = getattr(sys.stdout, 'buffer', sys.stdout) + if options.output_cc: + out_cc = open(options.output_cc, 'wb') + +- GenerateConstructorList(out_cc, options.namespace, options.export, ++ out_cc_str = StringIO() ++ GenerateConstructorList(out_cc_str, options.namespace, options.export, + typenames, platforms, includes, usings) ++ out_cc.write(out_cc_str.getvalue().encode('utf-8')) + + if options.output_cc: + out_cc.close() +diff --git a/chromium/ui/ozone/generate_ozone_platform_list.py b/chromium/ui/ozone/generate_ozone_platform_list.py +index d47c398259b..2702b68b9bd 100755 +--- a/chromium/ui/ozone/generate_ozone_platform_list.py ++++ b/chromium/ui/ozone/generate_ozone_platform_list.py +@@ -49,12 +49,15 @@ Example Output: ./generate_ozone_platform_list.py --default wayland dri wayland + + """ + ++try: ++ from StringIO import StringIO # for Python 2 ++except ImportError: ++ from io import StringIO # for Python 3 + import optparse + import os + import collections + import re + import sys +-import string + + + def GetConstantName(name): +@@ -63,7 +66,7 @@ def GetConstantName(name): + We just capitalize the platform name and prepend "CreateOzonePlatform". + """ + +- return 'kPlatform' + string.capitalize(name) ++ return 'kPlatform' + name.capitalize() + + + def GeneratePlatformListText(out, platforms): +@@ -149,9 +152,9 @@ def main(argv): + platforms.insert(0, options.default) + + # Write to standard output or file specified by --output_{cc,h}. +- out_cc = sys.stdout +- out_h = sys.stdout +- out_txt = sys.stdout ++ out_cc = getattr(sys.stdout, 'buffer', sys.stdout) ++ out_h = getattr(sys.stdout, 'buffer', sys.stdout) ++ out_txt = getattr(sys.stdout, 'buffer', sys.stdout) + if options.output_cc: + out_cc = open(options.output_cc, 'wb') + if options.output_h: +@@ -159,9 +162,16 @@ def main(argv): + if options.output_txt: + out_txt = open(options.output_txt, 'wb') + +- GeneratePlatformListText(out_txt, platforms) +- GeneratePlatformListHeader(out_h, platforms) +- GeneratePlatformListSource(out_cc, platforms) ++ out_txt_str = StringIO() ++ out_h_str = StringIO() ++ out_cc_str = StringIO() ++ ++ GeneratePlatformListText(out_txt_str, platforms) ++ out_txt.write(out_txt_str.getvalue().encode('utf-8')) ++ GeneratePlatformListHeader(out_h_str, platforms) ++ out_h.write(out_h_str.getvalue().encode('utf-8')) ++ GeneratePlatformListSource(out_cc_str, platforms) ++ out_cc.write(out_cc_str.getvalue().encode('utf-8')) + + if options.output_cc: + out_cc.close() +-- +2.25.1 + diff --git a/package/qt5/qt5webengine-chromium/0002-Don-t-rebase-sysroot-path.patch b/package/qt5/qt5webengine-chromium/0002-Don-t-rebase-sysroot-path.patch new file mode 100644 index 0000000000..c39f008a3d --- /dev/null +++ b/package/qt5/qt5webengine-chromium/0002-Don-t-rebase-sysroot-path.patch @@ -0,0 +1,32 @@ +From bfc520671693587a0b81842018326da35aa97f80 Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Thu, 3 Feb 2022 20:41:08 -0700 +Subject: [PATCH] Don't rebase sysroot path + +Just use the actual sysroot as rebase_path will generate an invalid +sysroot path. + +Fixes: +/home/buildroot/buildroot/output/per-package/qt5webengine/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-buildroot-linux-gnu/10.3.0/../../../../aarch64-buildroot-linux-gnu/bin/ld: cannot find crti.o: No such file or directory + +Signed-off-by: James Hilliard +--- + chromium/build/config/posix/BUILD.gn | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chromium/build/config/posix/BUILD.gn b/chromium/build/config/posix/BUILD.gn +index e61554c5656..dc957225869 100644 +--- a/chromium/build/config/posix/BUILD.gn ++++ b/chromium/build/config/posix/BUILD.gn +@@ -27,7 +27,7 @@ config("runtime_library") { + + if (!is_apple && sysroot != "") { + # Pass the sysroot to all C compiler variants, the assembler, and linker. +- sysroot_flags = [ "--sysroot=" + rebase_path(sysroot, root_build_dir) ] ++ sysroot_flags = [ "--sysroot=" + sysroot ] + if (is_linux || is_chromeos) { + # This is here so that all files get recompiled after a sysroot roll and + # when turning the sysroot on or off. (defines are passed via the command +-- +2.25.1 + 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)) -- 2.25.1 From thomas.petazzoni at bootlin.com Mon Feb 14 07:57:22 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 14 Feb 2022 08:57:22 +0100 Subject: [Buildroot] [PATCH] manual: board support: add instructions to test defconfig in the official docker In-Reply-To: <20220203235438.610277-1-giulio.benetti@benettiengineering.com> References: <20220203235438.610277-1-giulio.benetti@benettiengineering.com> Message-ID: <20220214085722.330337d9@windsurf> Hello, On Fri, 4 Feb 2022 00:54:38 +0100 Giulio Benetti wrote: > +Inside the docker hint: > +-------------------- > + $ git clone git://git.busybox.net/buildroot As mentioned on IRC, I think this is not very useful: if you want to test a new defconfig, or changes to a defconfig, the changes to this defconfig are not yet in the official repo, so simply cloning the official repo within the Docker container will not allow you to test your brand new defconfig. So as they are, those instructions are in fact not very relevant for the indicated purpose. Either the instructions include mounting the local Buildroot copy into the container, or they instead suggest to use Gitlab CI to validate the defconfig. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From geomatsi at gmail.com Mon Feb 14 09:39:37 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Mon, 14 Feb 2022 12:39:37 +0300 Subject: [Buildroot] [PATCH 1/2] package/hostapd: update DPP option handling In-Reply-To: <20220213213809.361f3ea9@windsurf> References: <20220213155208.560001-1-geomatsi@gmail.com> <20220213155208.560001-2-geomatsi@gmail.com> <20220213213809.361f3ea9@windsurf> Message-ID: Hello Thomas, > > Makefile hostapd.mk defines different macros for different defconfig > > options. Options that are not listed in defconfig, can be set using > > HOSTAPD_CONFIG_SET. Options that are listed in defconfig, can be > > enabled/disabled using HOSTAPD_CONFIG_ENABLE/HOSTAPD_CONFIG_DISABLE. > > > > Starting from hostapd v2.10, option CONFIG_DPP is explicitly listed > > in defconfig. So it is time to switch to enable/disable macros for > > this option. > > This seems fragile. Why don't we have a single way of enabling an > option, which doesn't depend on whether the option is listed in the > hostapd defconfig or not? What do you think about removal of HOSTAPD_CONFIG_SET and having something along the following lines for configuration step: @@ -124,9 +124,11 @@ define HOSTAPD_CONFIGURE_CMDS cp $(@D)/hostapd/defconfig $(HOSTAPD_CONFIG) sed -i $(patsubst %,-e 's/^#\(%\)/\1/',$(HOSTAPD_CONFIG_ENABLE)) \ $(patsubst %,-e 's/^\(%\)/#\1/',$(HOSTAPD_CONFIG_DISABLE)) \ - $(patsubst %,-e '1i%=y',$(HOSTAPD_CONFIG_SET)) \ $(patsubst %,-e %,$(HOSTAPD_CONFIG_EDITS)) \ $(HOSTAPD_CONFIG) + for opt in $(HOSTAPD_CONFIG_ENABLE) ; do \ + sed -i -ze "/$${opt}=y/!s/$$/$${opt}=y\n/" $(HOSTAPD_CONFIG) ; \ + done endef This way only HOSTAPD_CONFIG_ENABLED/HOSTAPD_CONFIG_DISABLED macros will remain. Options that are required, but not listed in defconfig, still will be appended. There is a chance that next hostapd releases will introduce some new options for existing functionality, that will require attention. But there will be no need for shuffling existing options between CONFIG_SET and CONFIG_ENABLED. Regards, Sergey From yann.morin.1998 at free.fr Mon Feb 14 10:28:29 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 14 Feb 2022 11:28:29 +0100 Subject: [Buildroot] [PATCH] package/python-cryptography: needs cargo env when downloading Message-ID: <20220214102829.156331-1-yann.morin.1998@free.fr> python-cryptography is a python package, but it internally builds a rust crate. As such, it needs to be vendored at install time. Currently, we only pass the path to the sub-directory where the rust source is in the package tree, but calling cargo needs additional variables, most notably it needs CARGO_HOME to be set in the environment, otherwise it ends up writing in the user's own cargo home, which is by default ~/.cargo/ We do not really know what variables are used at vendor tie, so we pass the full Cargo environment, that we pass when building target packages. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Yegor Yefremov Cc: Asaf Kahlon --- package/python-cryptography/python-cryptography.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk index e642691bc5..a524f729c8 100644 --- a/package/python-cryptography/python-cryptography.mk +++ b/package/python-cryptography/python-cryptography.mk @@ -24,6 +24,7 @@ PYTHON_CRYPTOGRAPHY_ENV = \ PYTHON_CRYPTOGRAPHY_DOWNLOAD_POST_PROCESS = cargo PYTHON_CRYPTOGRAPHY_DOWNLOAD_DEPENDENCIES = host-rustc PYTHON_CRYPTOGRAPHY_DL_ENV = \ + $(PKG_CARGO_ENV) \ BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml $(eval $(python-package)) -- 2.25.1 From fontaine.fabrice at gmail.com Mon Feb 14 10:29:59 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 14 Feb 2022 11:29:59 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/libgee: bump to version 0.20.5 Message-ID: <20220214102959.1740165-1-fontaine.fabrice@gmail.com> Drop patch (already in version) and so autoreconf https://gitlab.gnome.org/GNOME/libgee/-/blob/0.20.5/NEWS Signed-off-by: Fabrice Fontaine --- ...le.am-include-Makefile.introspection.patch | 40 ------------------- package/libgee/libgee.hash | 4 +- package/libgee/libgee.mk | 4 +- 3 files changed, 3 insertions(+), 45 deletions(-) delete mode 100644 package/libgee/0001-gee-Makefile.am-include-Makefile.introspection.patch diff --git a/package/libgee/0001-gee-Makefile.am-include-Makefile.introspection.patch b/package/libgee/0001-gee-Makefile.am-include-Makefile.introspection.patch deleted file mode 100644 index 0906275ae3..0000000000 --- a/package/libgee/0001-gee-Makefile.am-include-Makefile.introspection.patch +++ /dev/null @@ -1,40 +0,0 @@ -From d771e8ddb5e40f234459966e46880d10f34aaa1a Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 20 Nov 2021 23:57:33 +0100 -Subject: [PATCH] gee/Makefile.am: include Makefile.introspection - -Include Makefile.introspection instead of using a custom rule which will -result in the following build failure when cross-compiling on buildroot -because of missing --includedir: - -/home/giuliobenetti/autobuild/run/instance-1/output-1/host/bin/../riscv32-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler -l `/usr/bin/sed -nE "s/^dlname='([A-Za-z0-9.+-]+)'/\1/p" libgee-0.8.la` -o Gee-0.8.typelib Gee-0.8.gir libgee-0.8.la -Could not find GIR file 'GObject-2.0.gir'; check XDG_DATA_DIRS or use --includedir -error parsing file Gee-0.8.gir: Failed to parse included gir GObject-2.0 - -Fixes: - - http://autobuild.buildroot.org/results/884faa0f84c8dc43ed1ca6cde9caf21c731a4b35 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.gnome.org/GNOME/libgee/-/merge_requests/8] ---- - gee/Makefile.am | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/gee/Makefile.am b/gee/Makefile.am -index 5634bcb..e0d950e 100644 ---- a/gee/Makefile.am -+++ b/gee/Makefile.am -@@ -167,7 +167,8 @@ INTROSPECTION_COMPILER_ARGS= \ - -l $(libgee_dlname) - Gee-0.8.gir: libgee_0_8_la_vala.stamp - Gee-0.8.typelib: Gee-0.8.gir libgee-0.8.la -- @INTROSPECTION_COMPILER@ $(INTROSPECTION_COMPILER_ARGS) -o $@ $^ -+ -+-include $(INTROSPECTION_MAKEFILE) - endif - - MOSTLYCLEANFILES = \ --- -2.33.0 - diff --git a/package/libgee/libgee.hash b/package/libgee/libgee.hash index 72d2c21ced..54a46f954c 100644 --- a/package/libgee/libgee.hash +++ b/package/libgee/libgee.hash @@ -1,5 +1,5 @@ -# From http://ftp.acc.umu.se/pub/gnome/sources/libgee/0.20/libgee-0.20.4.sha256sum -sha256 524c1bf390f9cdda4fbd9a47b269980dc64ab5280f0801b53bc69d782c72de0e libgee-0.20.4.tar.xz +# From http://ftp.acc.umu.se/pub/gnome/sources/libgee/0.20/libgee-0.20.5.sha256sum +sha256 31863a8957d5a727f9067495cabf0a0889fa5d3d44626e54094331188d5c1518 libgee-0.20.5.tar.xz # Hash for license file: sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/package/libgee/libgee.mk b/package/libgee/libgee.mk index 64beef30df..7d8d3d4863 100644 --- a/package/libgee/libgee.mk +++ b/package/libgee/libgee.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGEE_VERSION_MAJOR = 0.20 -LIBGEE_VERSION = $(LIBGEE_VERSION_MAJOR).4 +LIBGEE_VERSION = $(LIBGEE_VERSION_MAJOR).5 LIBGEE_SITE = http://ftp.gnome.org/pub/gnome/sources/libgee/$(LIBGEE_VERSION_MAJOR) LIBGEE_SOURCE = libgee-$(LIBGEE_VERSION).tar.xz LIBGEE_DEPENDENCIES = host-pkgconf host-vala libglib2 @@ -13,8 +13,6 @@ LIBGEE_INSTALL_STAGING = YES LIBGEE_LICENSE = LGPL-2.1+ LIBGEE_LICENSE_FILES = COPYING LIBGEE_CPE_ID_VENDOR = gnome -# We're patching gee/Makefile.am -LIBGEE_AUTORECONF = YES ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) LIBGEE_CONF_OPTS += --enable-introspection -- 2.34.1 From fontaine.fabrice at gmail.com Mon Feb 14 11:05:59 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 14 Feb 2022 12:05:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/bluez5_utils: set BLUEZ5_UTILS_AUTORECONF Message-ID: <20220214110559.2176506-1-fontaine.fabrice@gmail.com> Commit 572d08ee4a731b203b2d3aaf720a48f622609371 forgot to set BLUEZ5_UTILS_AUTORECONF resulting in the following build failure: /home/peko/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sh4-buildroot-linux-uclibc/10.3.0/../../../../sh4-buildroot-linux-uclibc/bin/ld: gobex/gobex-packet.o: in function `g_obex_packet_set_data': gobex-packet.c:(.text+0x698): undefined reference to `util_memdup' It should be noted that previous commit didn't fix any build failure with libglib >= 2.69. It only fixes the following warning: profiles/battery/battery.c: In function 'read_initial_battery_level_cb': profiles/battery/battery.c:162:2: warning: 'g_memdup' is deprecated (declared at /home/buildroot/autobuild/instance-0/output-1/host/bin/../arm-buildroot-linux-gnueabi/sysroot/usr/include/glib-2.0/glib/gstrfuncs.h:257): Use 'g_memdup2' instead [-Wdeprecated-declarations] batt->initial_value = g_memdup(value, length); ^ So an other option would be to revert this commit. The 'real' build error that previous commit tried to fix was raised because rand was replaced by getrandom since https://git.kernel.org/pub/scm/bluetooth/bluez.git/log/?qt=grep&q=getrandom but getrandom is not available until glibc 2.25: plugins/autopair.c:20:24: fatal error: sys/random.h: No such file or directory #include ^ Fixes: - http://autobuild.buildroot.org/results/46f7dbfe1d80c7622d670ba1ac957e9e6077eb9f Signed-off-by: Fabrice Fontaine --- package/bluez5_utils/bluez5_utils.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/bluez5_utils/bluez5_utils.mk b/package/bluez5_utils/bluez5_utils.mk index 49f6eaac13..7c2561b864 100644 --- a/package/bluez5_utils/bluez5_utils.mk +++ b/package/bluez5_utils/bluez5_utils.mk @@ -13,6 +13,8 @@ BLUEZ5_UTILS_LICENSE = GPL-2.0+, LGPL-2.1+ BLUEZ5_UTILS_LICENSE_FILES = COPYING COPYING.LIB BLUEZ5_UTILS_CPE_ID_VENDOR = bluez BLUEZ5_UTILS_CPE_ID_PRODUCT = bluez +# We're patching Makefile.am +BLUEZ5_UTILS_AUTORECONF = YES BLUEZ5_UTILS_DEPENDENCIES = \ $(if $(BR2_PACKAGE_BLUEZ5_UTILS_HEADERS),bluez5_utils-headers) \ -- 2.34.1 From fontaine.fabrice at gmail.com Mon Feb 14 11:43:51 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 14 Feb 2022 12:43:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi: add bluetooth dependency comment Message-ID: <20220214114351.2372109-1-fontaine.fabrice@gmail.com> Commit 43122d64e05a2831a96dabcbf149ba199726767f forgot to add bluetooth dependency comment Signed-off-by: Fabrice Fontaine --- package/kodi/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/kodi/Config.in b/package/kodi/Config.in index c7e746fad3..692d562af3 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -135,6 +135,10 @@ config BR2_PACKAGE_KODI_BLUEZ help Enable bluetooth support +comment "bluetooth support needs a toolchain w/ headers >= 3.4" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 + config BR2_PACKAGE_KODI_DBUS bool "dbus" select BR2_PACKAGE_DBUS -- 2.34.1 From yann.morin.1998 at free.fr Mon Feb 14 11:52:21 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 14 Feb 2022 12:52:21 +0100 Subject: [Buildroot] [git commit] package/bluez5_utils: set BLUEZ5_UTILS_AUTORECONF Message-ID: <20220214114500.AB3728199C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=81cb8a853bd2e01dbcb67573fe591474b43040a1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 572d08ee4a731b203b2d3aaf720a48f622609371 forgot to set BLUEZ5_UTILS_AUTORECONF resulting in the following build failure: /home/peko/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sh4-buildroot-linux-uclibc/10.3.0/../../../../sh4-buildroot-linux-uclibc/bin/ld: gobex/gobex-packet.o: in function `g_obex_packet_set_data': gobex-packet.c:(.text+0x698): undefined reference to `util_memdup' It should be noted that previous commit didn't fix any build failure with libglib >= 2.69. It only fixes the following warning: profiles/battery/battery.c: In function 'read_initial_battery_level_cb': profiles/battery/battery.c:162:2: warning: 'g_memdup' is deprecated (declared at /home/buildroot/autobuild/instance-0/output-1/host/bin/../arm-buildroot-linux-gnueabi/sysroot/usr/include/glib-2.0/glib/gstrfuncs.h:257): Use 'g_memdup2' instead [-Wdeprecated-declarations] batt->initial_value = g_memdup(value, length); ^ So an other option would be to revert this commit. The 'real' build error that previous commit tried to fix was raised because rand was replaced by getrandom since https://git.kernel.org/pub/scm/bluetooth/bluez.git/log/?qt=grep&q=getrandom but getrandom is not available until glibc 2.25: plugins/autopair.c:20:24: fatal error: sys/random.h: No such file or directory #include ^ Fixes: - http://autobuild.buildroot.org/results/46f7dbfe1d80c7622d670ba1ac957e9e6077eb9f Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/bluez5_utils/bluez5_utils.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/bluez5_utils/bluez5_utils.mk b/package/bluez5_utils/bluez5_utils.mk index 49f6eaac13..7c2561b864 100644 --- a/package/bluez5_utils/bluez5_utils.mk +++ b/package/bluez5_utils/bluez5_utils.mk @@ -13,6 +13,8 @@ BLUEZ5_UTILS_LICENSE = GPL-2.0+, LGPL-2.1+ BLUEZ5_UTILS_LICENSE_FILES = COPYING COPYING.LIB BLUEZ5_UTILS_CPE_ID_VENDOR = bluez BLUEZ5_UTILS_CPE_ID_PRODUCT = bluez +# We're patching Makefile.am +BLUEZ5_UTILS_AUTORECONF = YES BLUEZ5_UTILS_DEPENDENCIES = \ $(if $(BR2_PACKAGE_BLUEZ5_UTILS_HEADERS),bluez5_utils-headers) \ From yann.morin.1998 at free.fr Mon Feb 14 11:59:02 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 14 Feb 2022 12:59:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/bluez5_utils: set BLUEZ5_UTILS_AUTORECONF In-Reply-To: <20220214110559.2176506-1-fontaine.fabrice@gmail.com> References: <20220214110559.2176506-1-fontaine.fabrice@gmail.com> Message-ID: <20220214115902.GB38097@scaer> Fabrice, All, On 2022-02-14 12:05 +0100, Fabrice Fontaine spake thusly: > Commit 572d08ee4a731b203b2d3aaf720a48f622609371 forgot to set > BLUEZ5_UTILS_AUTORECONF resulting in the following build failure: > > /home/peko/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sh4-buildroot-linux-uclibc/10.3.0/../../../../sh4-buildroot-linux-uclibc/bin/ld: gobex/gobex-packet.o: in function `g_obex_packet_set_data': > gobex-packet.c:(.text+0x698): undefined reference to `util_memdup' > > It should be noted that previous commit didn't fix any build failure > with libglib >= 2.69. It only fixes the following warning: > > profiles/battery/battery.c: In function 'read_initial_battery_level_cb': > profiles/battery/battery.c:162:2: warning: 'g_memdup' is deprecated (declared at /home/buildroot/autobuild/instance-0/output-1/host/bin/../arm-buildroot-linux-gnueabi/sysroot/usr/include/glib-2.0/glib/gstrfuncs.h:257): Use 'g_memdup2' instead [-Wdeprecated-declarations] > batt->initial_value = g_memdup(value, length); > ^ > > So an other option would be to revert this commit. That would have been a possibility, indeed, but I went for keeping it instead. > The 'real' build error that previous commit tried to fix was raised > because rand was replaced by getrandom since > https://git.kernel.org/pub/scm/bluetooth/bluez.git/log/?qt=grep&q=getrandom > but getrandom is not available until glibc 2.25: > > plugins/autopair.c:20:24: fatal error: sys/random.h: No such file or directory > #include > ^ But then this patch of yours does not fix this original issue, does it? > Fixes: > - http://autobuild.buildroot.org/results/46f7dbfe1d80c7622d670ba1ac957e9e6077eb9f > > Signed-off-by: Fabrice Fontaine Applied to master anyway, thanks. Regards, Yann E. MORIN. > --- > package/bluez5_utils/bluez5_utils.mk | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/package/bluez5_utils/bluez5_utils.mk b/package/bluez5_utils/bluez5_utils.mk > index 49f6eaac13..7c2561b864 100644 > --- a/package/bluez5_utils/bluez5_utils.mk > +++ b/package/bluez5_utils/bluez5_utils.mk > @@ -13,6 +13,8 @@ BLUEZ5_UTILS_LICENSE = GPL-2.0+, LGPL-2.1+ > BLUEZ5_UTILS_LICENSE_FILES = COPYING COPYING.LIB > BLUEZ5_UTILS_CPE_ID_VENDOR = bluez > BLUEZ5_UTILS_CPE_ID_PRODUCT = bluez > +# We're patching Makefile.am > +BLUEZ5_UTILS_AUTORECONF = YES > > BLUEZ5_UTILS_DEPENDENCIES = \ > $(if $(BR2_PACKAGE_BLUEZ5_UTILS_HEADERS),bluez5_utils-headers) \ > -- > 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 paul at crapouillou.net Mon Feb 14 11:59:11 2022 From: paul at crapouillou.net (Paul Cercueil) Date: Mon, 14 Feb 2022 11:59:11 +0000 Subject: [Buildroot] [PATCH 024/107] package/libiio: drop python2 support In-Reply-To: <20220209165213.4498-25-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> <20220209165213.4498-25-peter@korsgaard.com> Message-ID: Hi Peter, Le mer., f?vr. 9 2022 at 17:50:50 +0100, Peter Korsgaard a ?crit : > Signed-off-by: Peter Korsgaard Acked-by: Paul Cercueil Cheers, -Paul > --- > package/libiio/Config.in | 2 +- > package/libiio/libiio.mk | 10 +++------- > 2 files changed, 4 insertions(+), 8 deletions(-) > > diff --git a/package/libiio/Config.in b/package/libiio/Config.in > index 0d89331c89..98d663e203 100644 > --- a/package/libiio/Config.in > +++ b/package/libiio/Config.in > @@ -91,7 +91,7 @@ config BR2_PACKAGE_LIBIIO_BINDINGS_CSHARP > > config BR2_PACKAGE_LIBIIO_BINDINGS_PYTHON > bool "Install Python bindings" > - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 > + depends on BR2_PACKAGE_PYTHON3 > help > Install the Python bindings. > > diff --git a/package/libiio/libiio.mk b/package/libiio/libiio.mk > index a4fe0d4541..48e2f385e3 100644 > --- a/package/libiio/libiio.mk > +++ b/package/libiio/libiio.mk > @@ -73,14 +73,10 @@ LIBIIO_CONF_OPTS += -DHAVE_DNS_SD=OFF > 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 > +LIBIIO_CONF_OPTS += \ > + -DPYTHON_BINDINGS=ON > + -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 > else > LIBIIO_CONF_OPTS += -DPYTHON_BINDINGS=OFF > endif > -- > 2.20.1 > From yann.morin.1998 at free.fr Mon Feb 14 12:05:24 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 14 Feb 2022 13:05:24 +0100 Subject: [Buildroot] [git commit] package/kodi: add bluetooth dependency comment Message-ID: <20220214115800.9F5D182582@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=38b5f2069bbe029c62594095a02f915552dc28c2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 43122d64e05a2831a96dabcbf149ba199726767f forgot to add bluetooth dependency comment Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/kodi/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/kodi/Config.in b/package/kodi/Config.in index f436a444d3..6896e85e7b 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -135,6 +135,10 @@ config BR2_PACKAGE_KODI_BLUEZ help Enable bluetooth support +comment "bluetooth support needs a toolchain w/ headers >= 3.4" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 + config BR2_PACKAGE_KODI_DBUS bool "dbus" select BR2_PACKAGE_DBUS From yann.morin.1998 at free.fr Mon Feb 14 12:05:47 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 14 Feb 2022 13:05:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi: add bluetooth dependency comment In-Reply-To: <20220214114351.2372109-1-fontaine.fabrice@gmail.com> References: <20220214114351.2372109-1-fontaine.fabrice@gmail.com> Message-ID: <20220214120547.GC38097@scaer> Fabrice, All, On 2022-02-14 12:43 +0100, Fabrice Fontaine spake thusly: > Commit 43122d64e05a2831a96dabcbf149ba199726767f forgot to add bluetooth > dependency comment > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/kodi/Config.in | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/package/kodi/Config.in b/package/kodi/Config.in > index c7e746fad3..692d562af3 100644 > --- a/package/kodi/Config.in > +++ b/package/kodi/Config.in > @@ -135,6 +135,10 @@ config BR2_PACKAGE_KODI_BLUEZ > help > Enable bluetooth support > > +comment "bluetooth support needs a toolchain w/ headers >= 3.4" > + depends on BR2_TOOLCHAIN_HAS_SYNC_4 > + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 > + > config BR2_PACKAGE_KODI_DBUS > bool "dbus" > select BR2_PACKAGE_DBUS > -- > 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 luca at lucaceresoli.net Mon Feb 14 12:16:27 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Mon, 14 Feb 2022 13:16:27 +0100 Subject: [Buildroot] [PATCH] manual: board support: add instructions to test defconfig in the official docker In-Reply-To: <80ba31da-8a8e-12ed-bded-025e47f5cced@benettiengineering.com> References: <20220203235438.610277-1-giulio.benetti@benettiengineering.com> <80ba31da-8a8e-12ed-bded-025e47f5cced@benettiengineering.com> Message-ID: <2169b106-8ed7-4eaf-1409-6dfe3eb19c0d@lucaceresoli.net> Hi Giulio, On 14/02/22 00:35, Giulio Benetti wrote: > Hi Luca, Arnout, Thomas P., > > On 13/02/22 11:39, Arnout Vandecappelle wrote: >> >> >> On 12/02/2022 23:56, Luca Ceresoli wrote: >>> Hi Giulio, >>> >>> On 04/02/22 00:54, Giulio Benetti wrote: >>>> Often new boards have not been tested with official docker so let's add >>>> instructions to do it. >>> >>> Thank you, I think this is a very useful addition to the documentation! >>> However I would suggest some changes for it to look more "professional". > > Always welcome! > >>>> Signed-off-by: Giulio Benetti >>>> --- >>>> ?? docs/manual/adding-board-support.txt | 22 ++++++++++++++++++++++ >>>> ?? 1 file changed, 22 insertions(+) >>>> >>>> diff --git a/docs/manual/adding-board-support.txt >>>> b/docs/manual/adding-board-support.txt >>>> index 33ed709535..f5fb3af371 100644 >>>> --- a/docs/manual/adding-board-support.txt >>>> +++ b/docs/manual/adding-board-support.txt >>>> @@ -46,3 +46,25 @@ create a directory +board/+ and a >>>> subdirectory >>>> ?? +board//+. You can then store your patches >>>> ?? and configurations in these directories, and reference them from >>>> the main >>>> ?? Buildroot configuration. Refer to xref:customize[] for more details. >>>> + >>>> +Before submitting patches for new boards it would be better to test it >>> >>> "it would be better" -> "it is recommended". > > Ok > >>>> +by building it using .gitlab-ci.yml specified docker. For example >>>> at the >>> >>> I think this should be reworded in a simpler way: "by building it using >>> the docker specified in .gitlab-ci.yml". > > Yes > >>> BTW as I am a docker newbie: is it common to say "the docker"? Or would >>> "the docker container" be more correct? -- By comparison, I would never >>> say "using the virtualbox" but rather "using the virtualbox machine". >> >> ?? I would say "the container" since you can use it with any container >> manager >> that follows the OCI spec. > > Ok > >>> >>>> +time of this writing the docker is: >>> >>> Remove the ':' from this line, or you'll have multiple ':' per line, >>> which looks awkward. >>> >>>> +$CI_REGISTRY/buildroot.org/buildroot/base:20220105.2314 >>> >>> Hm, this string is already old. > > Yes :-/ > >> ?? Actually, this part of the documentation is already superseded >> since we now >> have utils/docker-run that does everything. > > Oh, I've missed that, just checked and it eases life not few! > I have a 120 columns command to start it that I copy and paste > everytime. Because also, what I don't take care of here is the -v flag > that allows you mount a host folder. > >>> There's no sane way to keep docs and >>> .yml in sync. I wonder whether we should have in the manual a command >>> line that always use the current string, such as: >>> >>> DOCKER_IMAGE=$(cat .gitlab-ci.yml | \ >>> ???????????????? sed -n >>> '/^image/s/^.*CI_REGISTRY/registry.gitlab.com/p') >>> docker pull $DOCKER_IMAGE >>> sudo docker run -it? $DOCKER_IMAGE >>> >>> However I must admit this is not very readable in the docs... :( What >>> about adding a simple script (utils/run-docker?) that does the trick and >>> just mention that in the docs? > > utils/docker-run then. Now we know it exists :-) > >>>> +so: >>> >>> Add an empty line here, so that the output separates from the next line. > > Ok > >>>> +Pull the docker: >>>> +-------------------- >>>> + $ docker pull >>>> registry.gitlab.com/buildroot.org/buildroot/base:20220105.2314 >>> >>> Missing 'sudo'? >> >> ?? Docker access is usually managed through the "docker" group rather >> than sudo. >> >> ?? And if you use podman as docker replacement, it can even be done in an >> unprivileged container. Not that I tried it, but I think so. >> >> ?? Oh BTW, the pull is in fact not needed, both podman and docker pull >> automatically when you start a container. That's the reason the >> container name >> is so convoluted. > > All new thing I didn't know! > >>> >>>> +-------------------- >>> >>> Add an empty line here. This has no effect on the output but makes >>> source code more readable. >>> >>>> +Run the docker: >>>> +-------------------- >>>> + $ sudo docker run -it >>>> registry.gitlab.com/buildroot.org/buildroot/base:20220105.2314 >>>> /bin/bash >>>> +-------------------- >>> >>> As above, add an empty line here. > > +1 > >>>> +Inside the docker hint: >>>> +-------------------- >>>> + $ git clone git://git.busybox.net/buildroot >>>> + $ cd buildroot >>>> + $ make +_defconfig+ >>>> + $ make >>>> +-------------------- >>> >>> As above, add an empty line here. > > +1 > >>>> +Wait until build finishes and eventually add host dependencies. >>> >>> If I understand what you mean here, it should be "and add host >>> dependencies if needed" ("eventually" is not the english translation of >>> italian "eventualmente"). > > "...and possibly add host dependencies", right? Better. Even better: "and add any missing host dependencies, if any". >>> If my understanding is correct, I don't find >>> this sentence very useful: a docker newbie perhaps doesn't know how to >>> add a host dependency (and maybe not even how to understand that they >>> are missing one). >>> >>> I would just remove this line, but if you think it is very important I'd >>> clarify it, maybe with some examples. >> >> ?? Yes, I think this is what triggered the addition of this >> documentation. If you >> have e.g. libopenssl-dev installed on your build host, then you >> usually won't >> notice in your test builds that a dependency on host-openssl is >> needed. So test >> builds should be done in a minimal container. > > Yes, it was because of that. > >> ?? Unfortunately, the buildroot/base container is not exactly minimal. >> It's >> really what is meant to be used for running CI tests, not exactly what >> is needed >> for build tests. Ideally, we'd have >> >> - an absolutely minimal container that can be used for build tests - >> ideally in >> a couple of variants for different distros; > > There is a bunch of dockers like that(more or less) here: > https://github.com/aduskett/buildroot-docker-devel > I've also contributed to, and at that time Thomas P. in IRC asked why we > didn't upstreamed it and I told I would have done like 2/3 years ago and > I've never done it :-/ > > And also modifying autobuilder's script to pick random distro and build > to avoid possible host issues. But it's a bunch of stuff to do. > >> - a container for CI; > > Do you mean the one we already have but more shrinked? > >> - a more complete container you could use for development, though I can't >> immediately think of extra stuff you'd want in there > > Is it really worth it? I mean, I've never seen anybody in IRC(even if > read few in it) or ML(same) that complain about "I can't have buildroot > working because I miss host tools". But I've seen recently gitlab-ci > results that took me like 15-16 hours to fix. > > Does Yocto have something like that? And if yes, does someone can give a > feedback if he really uses it? The situation is different with yocto as /usr/bin & co are just not in the PATH. No host tools are accessible unless explicitly listed in the HOSTTOOLS variable, so the problem is mostly solved at the root. >> (but then, I wouldn't use a container for development). > > Me too, and who would use it? I think nobody, because I don't think a > newbie is that skilled to use a docker too(or maybe yes), but my first > try would be using it with my distro and probably same goes for other > people. But here again, I use Terminator+Midnight Commander as my "IDE", > so I won't be happy enough with it. Someone else uses real "IDE" and we > can't add Eclipse or VSCode(I hope), so it will be something that is not > enough for anybody, thus IMHO useless. > > ---------------- > Going back to this patch: > > What I can do with this patch is to rewrite it pointing how to use > utils/docker-run to check that at least configs/* and board/* patches work. > > Another solution to my patch is what Thomas P. pointed in IRC: > "it is probably easier to ask people to use gitlab CI" > > But my worry is that lot of people actually fork from github and not > from gitlab. Who would really do that(both docker and gitlab-CI solutions)? > But also, who would really install docker(if they don't use it) to > submit a patch for gitlab-CI build failures? > > I think that counting the ones who took care about their maintained > board gives us an idea, very few. BUT for new boards, and I see not few > of them adding in the last period. It could be a way to force them to > give a proof of a successfull building with gitlab-CI pipeline log as > Thomas P. proposed. > > So I would modify this patch with instructions to: > - fork Buildroot in gitlab > - trigger gitlab-CI pipeline for a single defconfig > > What do you all think? I think we need simple instructions to ensure that anybody is able to test their config builds without unnoticed host dependencies, before they send a patch. I don't care whether it's docker or gitlab or whatever. But it must be something documented and easy to do in a few commands. -- Luca From fontaine.fabrice at gmail.com Mon Feb 14 12:33:50 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 14 Feb 2022 13:33:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/bluez5_utils: set BLUEZ5_UTILS_AUTORECONF In-Reply-To: <20220214115902.GB38097@scaer> References: <20220214110559.2176506-1-fontaine.fabrice@gmail.com> <20220214115902.GB38097@scaer> Message-ID: Yann, Le lun. 14 f?vr. 2022 ? 12:59, Yann E. MORIN a ?crit : > > Fabrice, All, > > On 2022-02-14 12:05 +0100, Fabrice Fontaine spake thusly: > > Commit 572d08ee4a731b203b2d3aaf720a48f622609371 forgot to set > > BLUEZ5_UTILS_AUTORECONF resulting in the following build failure: > > > > /home/peko/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sh4-buildroot-linux-uclibc/10.3.0/../../../../sh4-buildroot-linux-uclibc/bin/ld: gobex/gobex-packet.o: in function `g_obex_packet_set_data': > > gobex-packet.c:(.text+0x698): undefined reference to `util_memdup' > > > > It should be noted that previous commit didn't fix any build failure > > with libglib >= 2.69. It only fixes the following warning: > > > > profiles/battery/battery.c: In function 'read_initial_battery_level_cb': > > profiles/battery/battery.c:162:2: warning: 'g_memdup' is deprecated (declared at /home/buildroot/autobuild/instance-0/output-1/host/bin/../arm-buildroot-linux-gnueabi/sysroot/usr/include/glib-2.0/glib/gstrfuncs.h:257): Use 'g_memdup2' instead [-Wdeprecated-declarations] > > batt->initial_value = g_memdup(value, length); > > ^ > > > > So an other option would be to revert this commit. > > That would have been a possibility, indeed, but I went for keeping it > instead. > > > The 'real' build error that previous commit tried to fix was raised > > because rand was replaced by getrandom since > > https://git.kernel.org/pub/scm/bluetooth/bluez.git/log/?qt=grep&q=getrandom > > but getrandom is not available until glibc 2.25: > > > > plugins/autopair.c:20:24: fatal error: sys/random.h: No such file or directory > > #include > > ^ > > But then this patch of yours does not fix this original issue, does it? Nope, I'm working on it. > > > Fixes: > > - http://autobuild.buildroot.org/results/46f7dbfe1d80c7622d670ba1ac957e9e6077eb9f > > > > Signed-off-by: Fabrice Fontaine > > Applied to master anyway, thanks. > > Regards, > Yann E. MORIN. > > > --- > > package/bluez5_utils/bluez5_utils.mk | 2 ++ > > 1 file changed, 2 insertions(+) > > > > diff --git a/package/bluez5_utils/bluez5_utils.mk b/package/bluez5_utils/bluez5_utils.mk > > index 49f6eaac13..7c2561b864 100644 > > --- a/package/bluez5_utils/bluez5_utils.mk > > +++ b/package/bluez5_utils/bluez5_utils.mk > > @@ -13,6 +13,8 @@ BLUEZ5_UTILS_LICENSE = GPL-2.0+, LGPL-2.1+ > > BLUEZ5_UTILS_LICENSE_FILES = COPYING COPYING.LIB > > BLUEZ5_UTILS_CPE_ID_VENDOR = bluez > > BLUEZ5_UTILS_CPE_ID_PRODUCT = bluez > > +# We're patching Makefile.am > > +BLUEZ5_UTILS_AUTORECONF = YES > > > > BLUEZ5_UTILS_DEPENDENCIES = \ > > $(if $(BR2_PACKAGE_BLUEZ5_UTILS_HEADERS),bluez5_utils-headers) \ > > -- > > 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. | > '------------------------------^-------^------------------^--------------------' Best Regards, Fabrice From fontaine.fabrice at gmail.com Mon Feb 14 13:29:44 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 14 Feb 2022 14:29:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/dnsmasq: fix build with ubus and without dnssec Message-ID: <20220214132944.2471362-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump to version 2.86 in commit 5b29096f8fcb0acd8890073a56ba9d620b1f911c: rfc1035.c: In function 'report_addresses': rfc1035.c:978:49: error: 'struct dnsmasq_daemon' has no member named 'workspacename' 978 | if (!extract_name(header, len, &p, daemon->workspacename, 1, 0)) | ^~ Fixes: - http://autobuild.buildroot.org/results/51242d4f532373544e3c7ea45036b8d41390b29b Signed-off-by: Fabrice Fontaine --- ...-not-DNSSEC-compile-options-selected.patch | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 package/dnsmasq/0003-Fix-FTBFS-when-CONNTRACK-and-UBUS-but-not-DNSSEC-compile-options-selected.patch diff --git a/package/dnsmasq/0003-Fix-FTBFS-when-CONNTRACK-and-UBUS-but-not-DNSSEC-compile-options-selected.patch b/package/dnsmasq/0003-Fix-FTBFS-when-CONNTRACK-and-UBUS-but-not-DNSSEC-compile-options-selected.patch new file mode 100644 index 0000000000..9c98af2be5 --- /dev/null +++ b/package/dnsmasq/0003-Fix-FTBFS-when-CONNTRACK-and-UBUS-but-not-DNSSEC-compile-options-selected.patch @@ -0,0 +1,34 @@ +From 2c60441239e1c10c4987cb586653b1ea08f703c0 Mon Sep 17 00:00:00 2001 +From: Simon Kelley +Date: Tue, 28 Sep 2021 23:42:15 +0100 +Subject: [PATCH] Fix FTBFS when CONNTRACK and UBUS but not DNSSEC compile + options selected. + +[Retrieved from: +https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=2c60441239e1c10c4987cb586653b1ea08f703c0] +Signed-off-by: Fabrice Fontaine +--- + src/dnsmasq.h | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/dnsmasq.h b/src/dnsmasq.h +index c8a918a..3fdc1b0 100644 +--- a/src/dnsmasq.h ++++ b/src/dnsmasq.h +@@ -1173,9 +1173,12 @@ extern struct daemon { + char *packet; /* packet buffer */ + int packet_buff_sz; /* size of above */ + char *namebuff; /* MAXDNAME size buffer */ ++#if (defined(HAVE_CONNTRACK) && defined(HAVE_UBUS)) || defined(HAVE_DNSSEC) ++ /* CONNTRACK UBUS code uses this buffer, as well as DNSSEC code. */ ++ char *workspacename; ++#endif + #ifdef HAVE_DNSSEC + char *keyname; /* MAXDNAME size buffer */ +- char *workspacename; /* ditto */ + unsigned long *rr_status; /* ceiling in TTL from DNSSEC or zero for insecure */ + int rr_status_sz; + int dnssec_no_time_check; +-- +2.20.1 + -- 2.34.1 From fontaine.fabrice at gmail.com Mon Feb 14 13:33:48 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 14 Feb 2022 14:33:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/bluez5_utils: fix build with glibc < 2.25 Message-ID: <20220214133348.2473221-1-fontaine.fabrice@gmail.com> Fix the following build failure with glibc < 2.25 raised since bump to version 5.63 in commit d4c6cf4b1fc0f34e72ff047e76de53d3634f5184: plugins/autopair.c:20:24: fatal error: sys/random.h: No such file or directory #include ^ Fixes: - http://autobuild.buildroot.org/results/6b8870d12e0804d6154230a7322c49416c1dc0e2 Signed-off-by: Fabrice Fontaine --- .../0005-fix-build-with-glibc-2.25.patch | 285 ++++++++++++++++++ 1 file changed, 285 insertions(+) create mode 100644 package/bluez5_utils/0005-fix-build-with-glibc-2.25.patch diff --git a/package/bluez5_utils/0005-fix-build-with-glibc-2.25.patch b/package/bluez5_utils/0005-fix-build-with-glibc-2.25.patch new file mode 100644 index 0000000000..13d0d4de4c --- /dev/null +++ b/package/bluez5_utils/0005-fix-build-with-glibc-2.25.patch @@ -0,0 +1,285 @@ +From a90d20109b605e073ae686d54596b68584a7d7fc Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 14 Feb 2022 13:37:45 +0100 +Subject: [PATCH] fix build with glibc < 2.25 + +getrandom and sys/random.h are only available since glibc 2.25: +https://www.gnu.org/software/gnulib/manual/html_node/sys_002frandom_002eh.html +resulting in the following build failures since version 5.63 and +https://git.kernel.org/pub/scm/bluetooth/bluez.git/log/?qt=grep&q=getrandom +so put back rand() as a fallback: + +plugins/autopair.c:20:24: fatal error: sys/random.h: No such file or directory + #include + ^ + +Fixes: + - http://autobuild.buildroot.org/results/6b8870d12e0804d6154230a7322c49416c1dc0e2 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://patchwork.kernel.org/project/bluetooth/patch/20220214131451.2397549-1-fontaine.fabrice at gmail.com] +--- + configure.ac | 2 ++ + emulator/le.c | 7 +++++++ + emulator/phy.c | 7 +++++++ + peripheral/main.c | 10 ++++++++++ + plugins/autopair.c | 6 ++++++ + profiles/health/hdp.c | 11 +++++++++++ + profiles/health/mcap.c | 10 ++++++++++ + tools/btgatt-server.c | 6 ++++++ + 8 files changed, 59 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 07d068a4d..cdd693da3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -54,6 +54,8 @@ AC_ARG_ENABLE(threads, AS_HELP_STRING([--enable-threads], + + AC_CHECK_FUNCS(explicit_bzero) + ++AC_CHECK_FUNCS(getrandom) ++ + AC_CHECK_FUNCS(rawmemchr) + + AC_CHECK_FUNC(signalfd, dummy=yes, +diff --git a/emulator/le.c b/emulator/le.c +index f8f313f2c..9ef0636d0 100644 +--- a/emulator/le.c ++++ b/emulator/le.c +@@ -20,7 +20,9 @@ + #include + #include + #include ++#ifdef HAVE_GETRANDOM + #include ++#endif + #include + + #include "lib/bluetooth.h" +@@ -509,10 +511,15 @@ static unsigned int get_adv_delay(void) + /* The advertising delay is a pseudo-random value with a range + * of 0 ms to 10 ms generated for each advertising event. + */ ++#ifdef HAVE_GETRANDOM + if (getrandom(&val, sizeof(val), 0) < 0) { + /* If it fails to get the random number, use a static value */ + val = 5; + } ++#else ++ srand(time(NULL)); ++ val = rand(); ++#endif + + return (val % 11); + } +diff --git a/emulator/phy.c b/emulator/phy.c +index 44cace438..e41aaf9c2 100644 +--- a/emulator/phy.c ++++ b/emulator/phy.c +@@ -19,7 +19,9 @@ + #include + #include + #include ++#ifdef HAVE_GETRANDOM + #include ++#endif + #include + #include + #include +@@ -174,6 +176,7 @@ struct bt_phy *bt_phy_new(void) + mainloop_add_fd(phy->rx_fd, EPOLLIN, phy_rx_callback, phy, NULL); + + if (!get_random_bytes(&phy->id, sizeof(phy->id))) { ++#ifdef GAVE_GETRANDOM + if (getrandom(&phy->id, sizeof(phy->id), 0) < 0) { + mainloop_remove_fd(phy->rx_fd); + close(phy->tx_fd); +@@ -181,6 +184,10 @@ struct bt_phy *bt_phy_new(void) + free(phy); + return NULL; + } ++#else ++ srandom(time(NULL)); ++ phy->id = random(); ++#endif + } + + bt_phy_send(phy, BT_PHY_PKT_NULL, NULL, 0); +diff --git a/peripheral/main.c b/peripheral/main.c +index 91adb45fc..542adc330 100644 +--- a/peripheral/main.c ++++ b/peripheral/main.c +@@ -25,7 +25,9 @@ + #include + #include + #include ++#ifdef HAVE_GETRANDOM + #include ++#endif + + #ifndef WAIT_ANY + #define WAIT_ANY (-1) +@@ -192,10 +194,18 @@ int main(int argc, char *argv[]) + addr, 6) < 0) { + printf("Generating new persistent static address\n"); + ++#ifdef HAVE_GETRANDOM + if (getrandom(addr, sizeof(addr), 0) < 0) { + perror("Failed to get random static address"); + return EXIT_FAILURE; + } ++#else ++ addr[0] = rand(); ++ addr[1] = rand(); ++ addr[2] = rand(); ++ addr[3] = 0x34; ++ addr[4] = 0x12; ++#endif + /* Overwrite the MSB to make it a static address */ + addr[5] = 0xc0; + +diff --git a/plugins/autopair.c b/plugins/autopair.c +index a75ecebe4..59d65807c 100644 +--- a/plugins/autopair.c ++++ b/plugins/autopair.c +@@ -17,7 +17,9 @@ + #include + #include + #include ++#ifdef HAVE_GETRANDOM + #include ++#endif + + #include + +@@ -131,10 +133,14 @@ static ssize_t autopair_pincb(struct btd_adapter *adapter, + if (attempt >= 4) + return 0; + ++#ifdef HAVE_GETRANDOM + if (getrandom(&val, sizeof(val), 0) < 0) { + error("Failed to get a random pincode"); + return 0; + } ++#else ++ val = rand(); ++#endif + snprintf(pinstr, sizeof(pinstr), "%06u", + val % 1000000); + *display = true; +diff --git a/profiles/health/hdp.c b/profiles/health/hdp.c +index 9d9d1e824..ca59be3e8 100644 +--- a/profiles/health/hdp.c ++++ b/profiles/health/hdp.c +@@ -16,7 +16,9 @@ + #include + #include + #include ++#ifdef HAVE_GETRANDOM + #include ++#endif + + #include + +@@ -1485,15 +1487,24 @@ static void destroy_create_dc_data(gpointer data) + static void *generate_echo_packet(void) + { + uint8_t *buf; ++#ifndef HAVE_GETRANDOM ++ int i; ++#endif + + buf = g_malloc(HDP_ECHO_LEN); + if (!buf) + return NULL; + ++#ifdef HAVE_GETRANDOM + if (getrandom(buf, HDP_ECHO_LEN, 0) < 0) { + g_free(buf); + return NULL; + } ++#else ++ srand(time(NULL)); ++ for(i = 0; i < HDP_ECHO_LEN; i++) ++ buf[i] = rand() % UINT8_MAX; ++#endif + + return buf; + } +diff --git a/profiles/health/mcap.c b/profiles/health/mcap.c +index aad0a08a3..9bd994fda 100644 +--- a/profiles/health/mcap.c ++++ b/profiles/health/mcap.c +@@ -19,7 +19,9 @@ + #include + #include + #include ++#ifdef HAVE_GETRANDOM + #include ++#endif + + #include + +@@ -1905,11 +1907,15 @@ gboolean mcap_create_mcl(struct mcap_instance *mi, + mcl->state = MCL_IDLE; + bacpy(&mcl->addr, addr); + set_default_cb(mcl); ++#ifdef HAVE_GETRANDOM + if (getrandom(&val, sizeof(val), 0) < 0) { + mcap_instance_unref(mcl->mi); + g_free(mcl); + return FALSE; + } ++#else ++ val = rand(); ++#endif + mcl->next_mdl = (val % MCAP_MDLID_FINAL) + 1; + } + +@@ -2049,11 +2055,15 @@ static void connect_mcl_event_cb(GIOChannel *chan, GError *gerr, + mcl->mi = mcap_instance_ref(mi); + bacpy(&mcl->addr, &dst); + set_default_cb(mcl); ++#ifdef HAVE_GETRANDOM + if (getrandom(&val, sizeof(val), 0) < 0) { + mcap_instance_unref(mcl->mi); + g_free(mcl); + goto drop; + } ++#else ++ val = rand(); ++#endif + mcl->next_mdl = (val % MCAP_MDLID_FINAL) + 1; + } + +diff --git a/tools/btgatt-server.c b/tools/btgatt-server.c +index 15d49a464..6367ccd9d 100644 +--- a/tools/btgatt-server.c ++++ b/tools/btgatt-server.c +@@ -20,7 +20,9 @@ + #include + #include + #include ++#ifdef HAVE_GETRANDOM + #include ++#endif + + #include "lib/bluetooth.h" + #include "lib/hci.h" +@@ -287,8 +289,12 @@ static bool hr_msrmt_cb(void *user_data) + uint32_t cur_ee; + uint32_t val; + ++#ifdef HAVE_GETRANDOM + if (getrandom(&val, sizeof(val), 0) < 0) + return false; ++#else ++ val = rand(); ++#endif + + pdu[0] = 0x06; + pdu[1] = 90 + (val % 40); +-- +2.34.1 + -- 2.34.1 From hsiangkao at aol.com Mon Feb 14 15:24:50 2022 From: hsiangkao at aol.com (Gao Xiang) Date: Mon, 14 Feb 2022 23:24:50 +0800 Subject: [Buildroot] [PATCH] package/erofs-utils: bump version to 1.4 References: <20220214152450.319583-1-hsiangkao.ref@aol.com> Message-ID: <20220214152450.319583-1-hsiangkao@aol.com> - new upstream version; - add 0001-erofs-utils-dump-fix-de-nid-issues.patch [1]; - add 0002-fsck-main.c-add-missing-include.patch [2]; - add 0003-erofs-utils-lib-fix-blobdev-without-Eforce-chunk-ind.patch [3]; - add 0004-erofs-utils-fix-Makefile-for-fsck.erofs-manpage.patch [4]. [1] https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/commit/?id=17eb5c417bd56be4b2f7627c2d6879fbad6a86d6 [2] https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/commit/?id=1ca453ee89894b1669ac78d7f216bda172783e8d [3] https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/commit/?id=eb255afa101b52096bd3e5e48f990576190f03bd [4] https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/commit/?id=534eda7f8678e5b8fc8ca0f5cf0d9d7a932e0d48 Signed-off-by: Gao Xiang --- ...1-erofs-utils-dump-fix-de-nid-issues.patch | 134 ++++++++++++++++++ ...age-only-install-erofsfuse.1-with-th.patch | 32 ----- ...0002-fsck-main.c-add-missing-include.patch | 31 ++++ ...fix-blobdev-without-Eforce-chunk-ind.patch | 40 ++++++ ...-fix-Makefile-for-fsck.erofs-manpage.patch | 29 ++++ package/erofs-utils/erofs-utils.hash | 2 +- package/erofs-utils/erofs-utils.mk | 2 +- 7 files changed, 236 insertions(+), 34 deletions(-) create mode 100644 package/erofs-utils/0001-erofs-utils-dump-fix-de-nid-issues.patch delete mode 100644 package/erofs-utils/0001-erofs-utils-manpage-only-install-erofsfuse.1-with-th.patch create mode 100644 package/erofs-utils/0002-fsck-main.c-add-missing-include.patch create mode 100644 package/erofs-utils/0003-erofs-utils-lib-fix-blobdev-without-Eforce-chunk-ind.patch create mode 100644 package/erofs-utils/0004-erofs-utils-fix-Makefile-for-fsck.erofs-manpage.patch diff --git a/package/erofs-utils/0001-erofs-utils-dump-fix-de-nid-issues.patch b/package/erofs-utils/0001-erofs-utils-dump-fix-de-nid-issues.patch new file mode 100644 index 000000000000..493ce5917722 --- /dev/null +++ b/package/erofs-utils/0001-erofs-utils-dump-fix-de-nid-issues.patch @@ -0,0 +1,134 @@ +From 17eb5c417bd56be4b2f7627c2d6879fbad6a86d6 Mon Sep 17 00:00:00 2001 +From: Gao Xiang +Date: Mon, 22 Nov 2021 07:48:48 +0800 +Subject: [PATCH] erofs-utils: dump: fix de->nid issues + +As David Michael reported, " + In file included from main.c:11: + main.c: In function 'erofs_checkdirent': + ../include/erofs/print.h:68:25: error: format '%llu' expects argument of type 'long long unsigned int', but argument 3 has type '__le64' {aka 'long unsigned int'} [-Werror=format=] + 68 | " " PR_FMT_FUNC_LINE(fmt), \ + | ^~~~~~ + main.c:264:17: note: in expansion of macro 'erofs_err' + 264 | erofs_err("invalid file type %llu", de->nid); + | ^~~~~~~~~ + main.c: In function 'erofs_read_dirent': + ../include/erofs/print.h:68:25: error: format '%llu' expects argument of type 'long long unsigned int', but argument 3 has type '__le64' {aka 'long unsigned int'} [-Werror=format=] + 68 | " " PR_FMT_FUNC_LINE(fmt), \ + | ^~~~~~ + main.c:303:25: note: in expansion of macro 'erofs_err' + 303 | erofs_err("parse dir nid %llu error occurred\n", + | ^~~~~~~~~ + cc1: all warnings being treated as errors +" + +Also there are many de->nid lacking of endianness handling. +Should fix them together. + +Link: https://lore.kernel.org/r/20211121234848.12663-1-xiang at kernel.org +Fixes: cf8be8a4352a ("erofs-utils: dump: add feature for collecting filesystem statistics") +Cc: Wang Qi +Cc: Guo Xuenan +Reported-by: David Michael +Signed-off-by: Gao Xiang +--- + dump/main.c | 31 ++++++++++++++++--------------- + 1 file changed, 16 insertions(+), 15 deletions(-) + +diff --git a/dump/main.c b/dump/main.c +index b7560eca1080..f85903b059d2 100644 +--- a/dump/main.c ++++ b/dump/main.c +@@ -242,11 +242,12 @@ static inline int erofs_checkdirent(struct erofs_dirent *de, + { + int dname_len; + unsigned int nameoff = le16_to_cpu(de->nameoff); ++ erofs_nid_t nid = le64_to_cpu(de->nid); + + if (nameoff < sizeof(struct erofs_dirent) || + nameoff >= PAGE_SIZE) { + erofs_err("invalid de[0].nameoff %u @ nid %llu", +- nameoff, de->nid | 0ULL); ++ nameoff, nid | 0ULL); + return -EFSCORRUPTED; + } + +@@ -255,13 +256,12 @@ static inline int erofs_checkdirent(struct erofs_dirent *de, + /* a corrupted entry is found */ + if (nameoff + dname_len > maxsize || + dname_len > EROFS_NAME_LEN) { +- erofs_err("bogus dirent @ nid %llu", +- le64_to_cpu(de->nid) | 0ULL); ++ erofs_err("bogus dirent @ nid %llu", nid | 0ULL); + DBG_BUGON(1); + return -EFSCORRUPTED; + } + if (de->file_type >= EROFS_FT_MAX) { +- erofs_err("invalid file type %llu", de->nid); ++ erofs_err("invalid file type %llu", nid | 0ULL); + return -EFSCORRUPTED; + } + return dname_len; +@@ -273,7 +273,7 @@ static int erofs_read_dirent(struct erofs_dirent *de, + { + int err; + erofs_off_t occupied_size = 0; +- struct erofs_inode inode = { .nid = de->nid }; ++ struct erofs_inode inode = { .nid = le64_to_cpu(de->nid) }; + + stats.files++; + stats.file_category_stat[de->file_type]++; +@@ -296,12 +296,12 @@ static int erofs_read_dirent(struct erofs_dirent *de, + update_file_size_statatics(occupied_size, inode.i_size); + } + +- if ((de->file_type == EROFS_FT_DIR) +- && de->nid != nid && de->nid != parent_nid) { +- err = erofs_read_dir(de->nid, nid); ++ if (de->file_type == EROFS_FT_DIR && inode.nid != nid && ++ inode.nid != parent_nid) { ++ err = erofs_read_dir(inode.nid, nid); + if (err) { + erofs_err("parse dir nid %llu error occurred\n", +- de->nid); ++ inode.nid | 0ULL); + return err; + } + } +@@ -338,7 +338,8 @@ static int erofs_read_dir(erofs_nid_t nid, erofs_nid_t parent_nid) + int ret; + + /* skip "." and ".." dentry */ +- if (de->nid == nid || de->nid == parent_nid) { ++ if (le64_to_cpu(de->nid) == nid || ++ le64_to_cpu(de->nid) == parent_nid) { + de++; + continue; + } +@@ -399,18 +400,18 @@ static int erofs_get_pathname(erofs_nid_t nid, erofs_nid_t parent_nid, + if (len < 0) + return len; + +- if (de->nid == target) { ++ if (le64_to_cpu(de->nid) == target) { + memcpy(path + pos, dname, len); + path[pos + len] = '\0'; + return 0; + } + + if (de->file_type == EROFS_FT_DIR && +- de->nid != parent_nid && +- de->nid != nid) { ++ le64_to_cpu(de->nid) != parent_nid && ++ le64_to_cpu(de->nid) != nid) { + memcpy(path + pos, dname, len); +- err = erofs_get_pathname(de->nid, nid, +- target, path, pos + len); ++ err = erofs_get_pathname(le64_to_cpu(de->nid), ++ nid, target, path, pos + len); + if (!err) + return 0; + memset(path + pos, 0, len); +-- +2.30.2 + diff --git a/package/erofs-utils/0001-erofs-utils-manpage-only-install-erofsfuse.1-with-th.patch b/package/erofs-utils/0001-erofs-utils-manpage-only-install-erofsfuse.1-with-th.patch deleted file mode 100644 index 0aa99d5324d0..000000000000 --- a/package/erofs-utils/0001-erofs-utils-manpage-only-install-erofsfuse.1-with-th.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 7ab34000c672adca90388a8fcb1f70a7d391d35c Mon Sep 17 00:00:00 2001 -From: David Michael -Date: Thu, 3 Jun 2021 16:18:57 -0400 -Subject: [PATCH] erofs-utils: manpage: only install erofsfuse.1 with the - command - -Link: https://lore.kernel.org/r/87lf7q3dn2.fsf at gmail.com -Reviewed-by: Gao Xiang -Signed-off-by: David Michael -Signed-off-by: Gao Xiang ---- - man/Makefile.am | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/man/Makefile.am b/man/Makefile.am -index ffcf6f81c255..0df947b6fbf7 100644 ---- a/man/Makefile.am -+++ b/man/Makefile.am -@@ -1,5 +1,9 @@ - # SPDX-License-Identifier: GPL-2.0+ - # Makefile.am - --dist_man_MANS = mkfs.erofs.1 erofsfuse.1 -+dist_man_MANS = mkfs.erofs.1 - -+EXTRA_DIST = erofsfuse.1 -+if ENABLE_FUSE -+man_MANS = erofsfuse.1 -+endif --- -2.20.1 - diff --git a/package/erofs-utils/0002-fsck-main.c-add-missing-include.patch b/package/erofs-utils/0002-fsck-main.c-add-missing-include.patch new file mode 100644 index 000000000000..c4fe71c9e6cd --- /dev/null +++ b/package/erofs-utils/0002-fsck-main.c-add-missing-include.patch @@ -0,0 +1,31 @@ +From 1ca453ee89894b1669ac78d7f216bda172783e8d Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Mon, 6 Dec 2021 20:14:03 +0100 +Subject: [PATCH] fsck/main.c: add missing include + +Otherwise musl C library builds fail with missing S_IFMT/S_IFDIR +definitions. + +Link: https://lore.kernel.org/r/20211206191403.1435229-1-alex at linutronix.de +Reviewed-by: Gao Xiang +Signed-off-by: Alexander Kanavin +Signed-off-by: Gao Xiang +--- + fsck/main.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/fsck/main.c b/fsck/main.c +index aefa881f740a..ad48e35f587b 100644 +--- a/fsck/main.c ++++ b/fsck/main.c +@@ -6,6 +6,7 @@ + #include + #include + #include ++#include + #include "erofs/print.h" + #include "erofs/io.h" + #include "erofs/decompress.h" +-- +2.30.2 + diff --git a/package/erofs-utils/0003-erofs-utils-lib-fix-blobdev-without-Eforce-chunk-ind.patch b/package/erofs-utils/0003-erofs-utils-lib-fix-blobdev-without-Eforce-chunk-ind.patch new file mode 100644 index 000000000000..88979eb28fe3 --- /dev/null +++ b/package/erofs-utils/0003-erofs-utils-lib-fix-blobdev-without-Eforce-chunk-ind.patch @@ -0,0 +1,40 @@ +From eb255afa101b52096bd3e5e48f990576190f03bd Mon Sep 17 00:00:00 2001 +From: Gao Xiang +Date: Thu, 23 Dec 2021 16:49:07 +0800 +Subject: [PATCH] erofs-utils: lib: fix --blobdev without -Eforce-chunk-indexes + +blockmap is used by default, chunk indexes should be switched +instead if --blobdev is specified. + +Link: https://lore.kernel.org/r/20211223084907.93020-1-hsiangkao at linux.alibaba.com +Fixes: 016bd812be1e ("erofs-utils: mkfs: enable block map chunk format") +Signed-off-by: Gao Xiang +--- + lib/blobchunk.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/lib/blobchunk.c b/lib/blobchunk.c +index 5e9a88a30af3..a145be917b4a 100644 +--- a/lib/blobchunk.c ++++ b/lib/blobchunk.c +@@ -113,7 +113,7 @@ int erofs_blob_write_chunk_indexes(struct erofs_inode *inode, + + if (multidev) { + idx.device_id = 1; +- inode->u.chunkformat |= EROFS_CHUNK_FORMAT_INDEXES; ++ DBG_BUGON(!(inode->u.chunkformat & EROFS_CHUNK_FORMAT_INDEXES)); + } else { + base_blkaddr = remapped_base; + } +@@ -171,6 +171,8 @@ int erofs_blob_write_chunked_file(struct erofs_inode *inode) + int fd, ret; + + inode->u.chunkformat |= inode->u.chunkbits - LOG_BLOCK_SIZE; ++ if (multidev) ++ inode->u.chunkformat |= EROFS_CHUNK_FORMAT_INDEXES; + + if (inode->u.chunkformat & EROFS_CHUNK_FORMAT_INDEXES) + unit = sizeof(struct erofs_inode_chunk_index); +-- +2.30.2 + diff --git a/package/erofs-utils/0004-erofs-utils-fix-Makefile-for-fsck.erofs-manpage.patch b/package/erofs-utils/0004-erofs-utils-fix-Makefile-for-fsck.erofs-manpage.patch new file mode 100644 index 000000000000..27832d1e32b9 --- /dev/null +++ b/package/erofs-utils/0004-erofs-utils-fix-Makefile-for-fsck.erofs-manpage.patch @@ -0,0 +1,29 @@ +From 534eda7f8678e5b8fc8ca0f5cf0d9d7a932e0d48 Mon Sep 17 00:00:00 2001 +From: Gao Xiang +Date: Mon, 22 Nov 2021 07:58:40 +0800 +Subject: [PATCH] erofs-utils: fix Makefile for fsck.erofs manpage + +Add the missing dependency for fsck.erofs manpage. + +Link: https://lore.kernel.org/r/20211121235840.17600-1-xiang at kernel.org +Fixes: f44043561491 ("erofs-utils: introduce fsck.erofs") +Signed-off-by: Gao Xiang +--- + man/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/man/Makefile.am b/man/Makefile.am +index 769b5578a175..4628b85df2ef 100644 +--- a/man/Makefile.am ++++ b/man/Makefile.am +@@ -1,6 +1,6 @@ + # SPDX-License-Identifier: GPL-2.0+ + +-dist_man_MANS = mkfs.erofs.1 dump.erofs.1 ++dist_man_MANS = mkfs.erofs.1 dump.erofs.1 fsck.erofs.1 + + EXTRA_DIST = erofsfuse.1 + if ENABLE_FUSE +-- +2.30.2 + diff --git a/package/erofs-utils/erofs-utils.hash b/package/erofs-utils/erofs-utils.hash index 8bbb0885689b..aca5677d17e4 100644 --- a/package/erofs-utils/erofs-utils.hash +++ b/package/erofs-utils/erofs-utils.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 132635740039bbe76d743aea72378bfae30dbf034e123929f5d794198d4c0b12 erofs-utils-1.3.tar.gz +sha256 67702b1fc5da05719d95ddb7c107e334b04365f5161a9717479d2831fca85a98 erofs-utils-1.4.tar.gz sha256 feee3b3157dcdf78d4f50edefbd5dd7adf8b6d52c11bfaaa746a85a373256713 COPYING diff --git a/package/erofs-utils/erofs-utils.mk b/package/erofs-utils/erofs-utils.mk index e35470b02edc..03df2be3668a 100644 --- a/package/erofs-utils/erofs-utils.mk +++ b/package/erofs-utils/erofs-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -EROFS_UTILS_VERSION = 1.3 +EROFS_UTILS_VERSION = 1.4 EROFS_UTILS_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot EROFS_UTILS_LICENSE = GPL-2.0+ EROFS_UTILS_LICENSE_FILES = COPYING -- 2.30.2 From ps.report at gmx.net Mon Feb 14 15:49:25 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Mon, 14 Feb 2022 16:49:25 +0100 Subject: [Buildroot] [PATCH v1] package/util-linux: bump version to 2.37.4 (fixes CVE-2022-0563) Message-ID: <20220214154925.6014-1-ps.report@gmx.net> For details see [1] and [2]. [1] https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.37/v2.37.4-ChangeLog [2] https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.37/v2.37.4-ReleaseNotes 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 9c10a42dca..748a36e0be 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 634e6916ad913366c3536b6468e7844769549b99a7b2bf80314de78ab5655b83 util-linux-2.37.4.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 a25b69d910..891c17d1d9 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).4 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 luca at lucaceresoli.net Mon Feb 14 16:24:13 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Mon, 14 Feb 2022 17:24:13 +0100 Subject: [Buildroot] [PATCH 2/2] utils/docker-run: allow interactive use In-Reply-To: <20220214162413.17301-1-luca@lucaceresoli.net> References: <20220214162413.17301-1-luca@lucaceresoli.net> Message-ID: <20220214162413.17301-2-luca@lucaceresoli.net> Without -i, the container cannot be used interactively. Allow using it as in: $ ./utils/docker-run + exec docker run -v /home/ceresoli/devel/buildroot:/home/br-user -it registry.gitlab.com/buildroot.org/buildroot/base:20220206.1756 br-user at 1e9508a4ccbb:~$ ls arch board boot CHANGES Config.in Config.in.legacy configs COPYING DEVELOPERS docs fs linux Makefile Makefile.legacy output package README support system toolchain utils br-user at 1e9508a4ccbb:~$ Signed-off-by: Luca Ceresoli --- utils/docker-run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/docker-run b/utils/docker-run index 979aec69b946..9fb895bcc628 100755 --- a/utils/docker-run +++ b/utils/docker-run @@ -7,4 +7,4 @@ IMAGE=$(grep ^image: "${MAIN_DIR}/.gitlab-ci.yml" | \ sed -e 's,^image: ,,g' | sed -e 's,\$CI_REGISTRY,registry.gitlab.com,g') set -x -exec docker run -v "${MAIN_DIR}:/home/br-user" -t "${IMAGE}" "$@" +exec docker run -v "${MAIN_DIR}:/home/br-user" -it "${IMAGE}" "$@" -- 2.35.1 From luca at lucaceresoli.net Mon Feb 14 16:24:12 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Mon, 14 Feb 2022 17:24:12 +0100 Subject: [Buildroot] [PATCH 1/2] utils/docker-run: use portable bash shebang Message-ID: <20220214162413.17301-1-luca@lucaceresoli.net> /usr/bin/bash does not exist on Ubuntu 2018.04. Use the more portable alternative /bin/bash. Note that currently "/usr/bin/bash" does not appear anywhere in the Buildroot source code, while "/bin/bash" is used by many scripts. Signed-off-by: Luca Ceresoli Fixes: 242e9d72e7d2 ("utils/docker-run: new script") --- utils/docker-run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/docker-run b/utils/docker-run index 0614f1325d78..979aec69b946 100755 --- a/utils/docker-run +++ b/utils/docker-run @@ -1,4 +1,4 @@ -#!/usr/bin/bash +#!/bin/bash set -o errexit -o pipefail DIR=$(dirname "${0}") MAIN_DIR=$(readlink -f "${DIR}/..") -- 2.35.1 From giulio.benetti at benettiengineering.com Mon Feb 14 16:28:10 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 14 Feb 2022 17:28:10 +0100 Subject: [Buildroot] [PATCH 2/2] utils/docker-run: allow interactive use In-Reply-To: <20220214162413.17301-2-luca@lucaceresoli.net> References: <20220214162413.17301-1-luca@lucaceresoli.net> <20220214162413.17301-2-luca@lucaceresoli.net> Message-ID: <26f4f710-d8d3-b4a9-faa9-6bd329dfba8c@benettiengineering.com> Hi Luca, On 14/02/22 17:24, Luca Ceresoli wrote: > Without -i, the container cannot be used interactively. Allow using it as > in: > > $ ./utils/docker-run > + exec docker run -v /home/ceresoli/devel/buildroot:/home/br-user -it registry.gitlab.com/buildroot.org/buildroot/base:20220206.1756 > br-user at 1e9508a4ccbb:~$ ls > arch board boot CHANGES Config.in Config.in.legacy configs COPYING DEVELOPERS docs fs linux Makefile Makefile.legacy output package README support system toolchain utils > br-user at 1e9508a4ccbb:~$ > > Signed-off-by: Luca Ceresoli > --- > utils/docker-run | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/utils/docker-run b/utils/docker-run > index 979aec69b946..9fb895bcc628 100755 > --- a/utils/docker-run > +++ b/utils/docker-run > @@ -7,4 +7,4 @@ IMAGE=$(grep ^image: "${MAIN_DIR}/.gitlab-ci.yml" | \ > sed -e 's,^image: ,,g' | sed -e 's,\$CI_REGISTRY,registry.gitlab.com,g') > > set -x > -exec docker run -v "${MAIN_DIR}:/home/br-user" -t "${IMAGE}" "$@" > +exec docker run -v "${MAIN_DIR}:/home/br-user" -it "${IMAGE}" "$@" Can you please also add --rm option too to avoid having a lot of exited containers? It should go into another patch. Thank you! Best regards -- Giulio Benetti Benetti Engineering sas From yann.morin.1998 at free.fr Mon Feb 14 16:36:09 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 14 Feb 2022 17:36:09 +0100 Subject: [Buildroot] [PATCH 1/2] utils/docker-run: use portable bash shebang In-Reply-To: <20220214162413.17301-1-luca@lucaceresoli.net> References: <20220214162413.17301-1-luca@lucaceresoli.net> Message-ID: <20220214163609.GD38097@scaer> Luca, All, On 2022-02-14 17:24 +0100, Luca Ceresoli spake thusly: > /usr/bin/bash does not exist on Ubuntu 2018.04. Use the more portable > alternative /bin/bash. > > Note that currently "/usr/bin/bash" does not appear anywhere in the > Buildroot source code, while "/bin/bash" is used by many scripts. The real portable solution is to use /usr/bin/env, which is mandated by POSIX: #!/usr/bin/env bash and which we already use quite a bit: $ git grep 'env bash' |wc -l 34 (No need to respin, it can be fixed when applying, I guess...) Regards, Yann E. MORIN. > Signed-off-by: Luca Ceresoli > Fixes: 242e9d72e7d2 ("utils/docker-run: new script") > --- > utils/docker-run | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/utils/docker-run b/utils/docker-run > index 0614f1325d78..979aec69b946 100755 > --- a/utils/docker-run > +++ b/utils/docker-run > @@ -1,4 +1,4 @@ > -#!/usr/bin/bash > +#!/bin/bash > set -o errexit -o pipefail > DIR=$(dirname "${0}") > MAIN_DIR=$(readlink -f "${DIR}/..") > -- > 2.35.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 Mon Feb 14 16:45:16 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 14 Feb 2022 17:45:16 +0100 Subject: [Buildroot] [git commit] utils/docker-run: use portable bash shebang Message-ID: <20220214164932.0C93A81E89@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=61912cc89a0ee391fdb1d79203fbf027822fa97d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master /usr/bin/bash does not exist on Ubuntu 2018.04. Use the more portable alternative "#!/usr/bin/env bash" which we are already using in quite a few scripts. Signed-off-by: Luca Ceresoli Fixes: 242e9d72e7d2 ("utils/docker-run: new script") [yann.morin.1998 at free.fr: use "#!/usr/bin/env bash", not "@!/bin/bash"] Signed-off-by: Yann E. MORIN --- utils/docker-run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/docker-run b/utils/docker-run index 0614f1325d..35153199a1 100755 --- a/utils/docker-run +++ b/utils/docker-run @@ -1,4 +1,4 @@ -#!/usr/bin/bash +#!/usr/bin/env bash set -o errexit -o pipefail DIR=$(dirname "${0}") MAIN_DIR=$(readlink -f "${DIR}/..") From yann.morin.1998 at free.fr Mon Feb 14 16:56:49 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 14 Feb 2022 17:56:49 +0100 Subject: [Buildroot] [git commit] utils/docker-run: allow interactive use Message-ID: <20220214164932.15E6382AA4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cef07c93587b186f68c42b8748a4db81c81ec7dc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Without -i, the container cannot be used interactively. Allow using it as in: $ ./utils/docker-run + exec docker run -v /home/ceresoli/devel/buildroot:/home/br-user -it registry.gitlab.com/buildroot.org/buildroot/base:20220206.1756 br-user at 1e9508a4ccbb:~$ ls arch board boot CHANGES Config.in Config.in.legacy configs COPYING DEVELOPERS docs fs linux Makefile Makefile.legacy output package README support system toolchain utils br-user at 1e9508a4ccbb:~$ Signed-off-by: Luca Ceresoli Signed-off-by: Yann E. MORIN --- utils/docker-run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/docker-run b/utils/docker-run index 35153199a1..2bca8d8e3a 100755 --- a/utils/docker-run +++ b/utils/docker-run @@ -7,4 +7,4 @@ IMAGE=$(grep ^image: "${MAIN_DIR}/.gitlab-ci.yml" | \ sed -e 's,^image: ,,g' | sed -e 's,\$CI_REGISTRY,registry.gitlab.com,g') set -x -exec docker run -v "${MAIN_DIR}:/home/br-user" -t "${IMAGE}" "$@" +exec docker run -v "${MAIN_DIR}:/home/br-user" -it "${IMAGE}" "$@" From yann.morin.1998 at free.fr Mon Feb 14 17:04:56 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 14 Feb 2022 18:04:56 +0100 Subject: [Buildroot] [PATCH 1/2] utils/docker-run: use portable bash shebang In-Reply-To: <20220214162413.17301-1-luca@lucaceresoli.net> References: <20220214162413.17301-1-luca@lucaceresoli.net> Message-ID: <20220214170456.GE38097@scaer> Luca, All, Series of two applied to master, thanks. As Giulio requested, an additional patch to use --rm would be nice. And now there is something that strikes me: we bind-mount the Buildroot tree as the home of the br-user, so we don't have any file from the br-user avvailable at all, so we can as well run the container with the local user, by running with: --user $(id -u):$(id -g) This way, there wil no longer be any issue with file acccess rights. There would however be the issue that the paths in the container would not be the same as on the host, but we can also alleviate that isue by doing the bind-mount in the same location (Docker creates the montpoint if it does not exists prior do doing the mount), and change the cwd: exec docker run \ -it --rm \ --workdir "${MAIN_DIR}" \ --mount "type=bind,src=${MAIN_DIR},dst=${MAIN_DIR}" \ "${IMAGE}" \ "$@" Et voil?, that's much more interesting now! :-] Care to send a patch please? ;-) Regards, Yann E. MORIN. On 2022-02-14 17:24 +0100, Luca Ceresoli spake thusly: > /usr/bin/bash does not exist on Ubuntu 2018.04. Use the more portable > alternative /bin/bash. > > Note that currently "/usr/bin/bash" does not appear anywhere in the > Buildroot source code, while "/bin/bash" is used by many scripts. > > Signed-off-by: Luca Ceresoli > Fixes: 242e9d72e7d2 ("utils/docker-run: new script") > --- > utils/docker-run | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/utils/docker-run b/utils/docker-run > index 0614f1325d78..979aec69b946 100755 > --- a/utils/docker-run > +++ b/utils/docker-run > @@ -1,4 +1,4 @@ > -#!/usr/bin/bash > +#!/bin/bash > set -o errexit -o pipefail > DIR=$(dirname "${0}") > MAIN_DIR=$(readlink -f "${DIR}/..") > -- > 2.35.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From giulio.benetti at benettiengineering.com Mon Feb 14 17:38:55 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 14 Feb 2022 18:38:55 +0100 Subject: [Buildroot] [PATCH] utils/docker-run: hide docker run command Message-ID: <20220214173855.4071040-1-giulio.benetti@benettiengineering.com> Since this is a helper script I don't find the reason to show the command we're issuing, so let's remove 'set -x' before running docker. Signed-off-by: Giulio Benetti --- utils/docker-run | 1 - 1 file changed, 1 deletion(-) diff --git a/utils/docker-run b/utils/docker-run index 0614f1325d..55dafd22a3 100755 --- a/utils/docker-run +++ b/utils/docker-run @@ -6,5 +6,4 @@ 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 exec docker run -v "${MAIN_DIR}:/home/br-user" -t "${IMAGE}" "$@" -- 2.25.1 From fontaine.fabrice at gmail.com Mon Feb 14 19:39:39 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 14 Feb 2022 20:39:39 +0100 Subject: [Buildroot] [PATCH 1/2] package/weston: drop GBM dependency from DRM option Message-ID: <20220214193940.3615904-1-fontaine.fabrice@gmail.com> upstream advocated that DRM backend can be built without GBM: https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/791 so drop dependencies on BR2_PACKAGE_MESA3D_OPENGL_EGL || BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL to allow DRM to be the default backend when fbdev will be removed in the follow-up patch Signed-off-by: Fabrice Fontaine --- package/weston/Config.in | 9 --------- 1 file changed, 9 deletions(-) diff --git a/package/weston/Config.in b/package/weston/Config.in index d45e50baaa..073a3ae567 100644 --- a/package/weston/Config.in +++ b/package/weston/Config.in @@ -40,12 +40,8 @@ config BR2_PACKAGE_WESTON_DEFAULT_FBDEV config BR2_PACKAGE_WESTON_DEFAULT_DRM bool "drm" - depends on BR2_PACKAGE_MESA3D_OPENGL_EGL || BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL select BR2_PACKAGE_WESTON_DRM -comment "drm backend needs mesa3d w/ EGL driver" - depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL && !BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL - config BR2_PACKAGE_WESTON_DEFAULT_HEADLESS bool "headless" select BR2_PACKAGE_WESTON_HEADLESS @@ -74,11 +70,6 @@ config BR2_PACKAGE_WESTON_DEFAULT_COMPOSITOR config BR2_PACKAGE_WESTON_DRM bool "DRM compositor" - depends on BR2_PACKAGE_MESA3D_OPENGL_EGL || BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL - -# Uses libgbm from mesa3d -comment "DRM compositor needs an OpenGL EGL backend provided by mesa3d" - depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL && !BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL config BR2_PACKAGE_WESTON_FBDEV bool "fbdev compositor (deprecated)" -- 2.34.1 From fontaine.fabrice at gmail.com Mon Feb 14 19:39:40 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 14 Feb 2022 20:39:40 +0100 Subject: [Buildroot] [PATCH 2/2] package/weston: drop fbdev In-Reply-To: <20220214193940.3615904-1-fontaine.fabrice@gmail.com> References: <20220214193940.3615904-1-fontaine.fabrice@gmail.com> Message-ID: <20220214193940.3615904-2-fontaine.fabrice@gmail.com> fbdev raises the following build failure since bump to version 10.0.0 in commit f67a6e9b7a7be9adbc405b3126000056120a01af and https://gitlab.freedesktop.org/wayland/weston/-/commit/6338dbd5816689b2f08f48b359a972e16ff038d8: ../output-1/build/weston-10.0.0/meson.build:133:7: ERROR: Tried to access unknown option 'backend-fbdev'. Drop fbdev to avoid this build failure as upstream is reluctant to properly fix this issue by renaming the fbdev option in stable release: https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/791 Fixes: - http://autobuild.buildroot.org/results/e669a6237c19783c627169c819d7372e20daaf54 Signed-off-by: Fabrice Fontaine --- Config.in.legacy | 12 ++++++++++++ package/weston/Config.in | 8 -------- package/weston/weston.mk | 6 ------ 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index aefb0ba6ea..b90b9dbcbc 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,18 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_WESTON_DEFAULT_FBDEV + bool "weston fbdev removed" + select BR2_LEGACY + help + fbdev was deprecated in weston 10.0.0. + +config BR2_PACKAGE_WESTON_FBDEV + bool "weston fbdev compositor removed" + select BR2_LEGACY + help + fbdev compositor was deprecated in weston 10.0.0. + config BR2_PACKAGE_LINUX_TOOLS_BPFTOOL bool "bpftool was moved" select BR2_LEGACY diff --git a/package/weston/Config.in b/package/weston/Config.in index 073a3ae567..6ad8241caa 100644 --- a/package/weston/Config.in +++ b/package/weston/Config.in @@ -34,10 +34,6 @@ if BR2_PACKAGE_WESTON choice prompt "default compositor" -config BR2_PACKAGE_WESTON_DEFAULT_FBDEV - bool "fbdev (deprecated)" - select BR2_PACKAGE_WESTON_FBDEV - config BR2_PACKAGE_WESTON_DEFAULT_DRM bool "drm" select BR2_PACKAGE_WESTON_DRM @@ -62,7 +58,6 @@ endchoice config BR2_PACKAGE_WESTON_DEFAULT_COMPOSITOR string - default "fbdev" if BR2_PACKAGE_WESTON_DEFAULT_FBDEV default "drm" if BR2_PACKAGE_WESTON_DEFAULT_DRM default "headless" if BR2_PACKAGE_WESTON_DEFAULT_HEADLESS default "wayland" if BR2_PACKAGE_WESTON_DEFAULT_WAYLAND @@ -71,9 +66,6 @@ config BR2_PACKAGE_WESTON_DEFAULT_COMPOSITOR config BR2_PACKAGE_WESTON_DRM bool "DRM compositor" -config BR2_PACKAGE_WESTON_FBDEV - bool "fbdev compositor (deprecated)" - # FreeRDP needs threads and !static, already the case for weston config BR2_PACKAGE_WESTON_RDP bool "RDP compositor" diff --git a/package/weston/weston.mk b/package/weston/weston.mk index a0a18d9358..90cf160688 100644 --- a/package/weston/weston.mk +++ b/package/weston/weston.mk @@ -85,12 +85,6 @@ else WESTON_CONF_OPTS += -Dbackend-rdp=false endif -ifeq ($(BR2_PACKAGE_WESTON_FBDEV),y) -WESTON_CONF_OPTS += -Ddeprecated-backend-fbdev=true -else -WESTON_CONF_OPTS += -Ddeprecated-backend-fbdev=false -endif - ifeq ($(BR2_PACKAGE_WESTON_DRM),y) WESTON_CONF_OPTS += -Dbackend-drm=true else -- 2.34.1 From arnout at mind.be Mon Feb 14 20:01:02 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 14 Feb 2022 21:01:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/guile: fix build with glibc 2.34 In-Reply-To: <20220206195106.2520033-1-fontaine.fabrice@gmail.com> References: <20220206195106.2520033-1-fontaine.fabrice@gmail.com> Message-ID: On 06/02/2022 20:51, Fabrice Fontaine wrote: > Fix the following build failure with glibc 2.34 raised since bump to > version 3.0.7 in commit d8bee3950aa851620d6a954aebad1f984caa105a: > > In file included from regexec.c:1368, > from regex.c:74: > ./malloc/dynarray-skeleton.c:195:24: error: expected declaration specifiers or '...' before '(' token > 195 | __attribute_nonnull__ ((1)) > | ^ > > https://lists.gnu.org/archive/html/bug-guile/2021-08/msg00003.html > > Fixes: > - http://autobuild.buildroot.org/results/27a2a69e1177f15daec65eca035b99ea5355c34b > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Pity about the huge patch, but it is what it is. Regards, Arnout From arnout at mind.be Mon Feb 14 20:01:28 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 14 Feb 2022 21:01:28 +0100 Subject: [Buildroot] [PATCH] configs/pcengines_apu2_defconfig: linux needs host libelf In-Reply-To: <20220202171035.1740791-1-giulio.benetti@benettiengineering.com> References: <20220202171035.1740791-1-giulio.benetti@benettiengineering.com> Message-ID: On 02/02/2022 18:10, Giulio Benetti wrote: > Signed-off-by: Giulio Benetti Applied to master, thanks. Regards, Arnout > --- > configs/pcengines_apu2_defconfig | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/configs/pcengines_apu2_defconfig b/configs/pcengines_apu2_defconfig > index 0792c93c19..a85808554c 100644 > --- a/configs/pcengines_apu2_defconfig > +++ b/configs/pcengines_apu2_defconfig > @@ -8,6 +8,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION=y > 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" > +BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y > > # Default hostname and TTY > BR2_TARGET_GENERIC_HOSTNAME="apu2" From arnout at mind.be Mon Feb 14 19:56:51 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Feb 2022 20:56:51 +0100 Subject: [Buildroot] [git commit] configs/pcengines_apu2_defconfig: linux needs host libelf Message-ID: <20220214195402.43E188142B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fd78150e89abf972d957edd255f2824803d76121 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- configs/pcengines_apu2_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/pcengines_apu2_defconfig b/configs/pcengines_apu2_defconfig index 0792c93c19..a85808554c 100644 --- a/configs/pcengines_apu2_defconfig +++ b/configs/pcengines_apu2_defconfig @@ -8,6 +8,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION=y 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" +BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y # Default hostname and TTY BR2_TARGET_GENERIC_HOSTNAME="apu2" From arnout at mind.be Mon Feb 14 19:57:56 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Feb 2022 20:57:56 +0100 Subject: [Buildroot] [git commit] package/guile: fix build with glibc 2.34 Message-ID: <20220214195402.6211C8142B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3e4d43911365653e0f9e2423d473fef85d347e32 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with glibc 2.34 raised since bump to version 3.0.7 in commit d8bee3950aa851620d6a954aebad1f984caa105a: In file included from regexec.c:1368, from regex.c:74: ./malloc/dynarray-skeleton.c:195:24: error: expected declaration specifiers or '...' before '(' token 195 | __attribute_nonnull__ ((1)) | ^ https://lists.gnu.org/archive/html/bug-guile/2021-08/msg00003.html Fixes: - http://autobuild.buildroot.org/results/27a2a69e1177f15daec65eca035b99ea5355c34b Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...-8f4538a53d64054ae2fc8b86c0f87c418c6176e6.patch | 13930 +++++++++++++++++++ package/guile/guile.mk | 7 +- 2 files changed, 13935 insertions(+), 2 deletions(-) Patch is too large, so refusing to show it From arnout at mind.be Mon Feb 14 20:13:33 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 14 Feb 2022 21:13:33 +0100 Subject: [Buildroot] [PATCH] configs/roc_pc_rk3399_defconfig: expand rootfs size to 120M In-Reply-To: References: <20220202171035.1740791-1-giulio.benetti@benettiengineering.com> <20220202171035.1740791-2-giulio.benetti@benettiengineering.com> Message-ID: <6edcbc6d-c9bb-e802-48f1-d4866a698aa9@mind.be> On 14/02/2022 01:03, Giulio Benetti wrote: > Hi Arnout, > > On 13/02/22 12:35, Arnout Vandecappelle wrote: >> >> >> On 02/02/2022 18:10, Giulio Benetti wrote: >>> Default 60M for rootfs are not enough and generate a build failure, so >>> let's expand rootfs size to 120M. >> >> ?? Did you find out _why_ 64M wasn't enough for just the kernel and busybox? Is >> it because of all the stupid modules in the default arm64 defconfig? But most >> other arm64 defconfigs don't seem to need this... > > It is because of modules(30M) and linux "Image", it's not compressed, so it's > 25M. So only for Linux+modules => 55M, plus the few other stuff(Busybox+libc > etc.)1M Yeah those giant aarch64 default configs are mightily annoying... I'm thinking, perhaps we should just bite the bullet and move the default ext2 size to 120M... Peter, Yann, what do you think? Regards, Arnout > > Also, nothing changed since the beginning, so I don't know how could this happened: > # git log --oneline configs/roc_pc_rk3399_defconfig > f51cbc33d9 configs/roc_pc_rk3399: fix U-Boot dependencies > 80ae1aedcb configs/roc_rk3399_pc: new defconfig > # git log --oneline roc-rk3399-pc/ > 80ae1aedcb configs/roc_rk3399_pc: new defconfig > > U-Boot dependencies are host dependencies, so it doesn't impact. > > # git log --oneline fs/ext2: > 5ece6be60b fs/ext2: fir (again) namespace for variables > db7d786140 fs/ext2: fix namespace for variables > 5631c38024 fs/ext2: pass a default string to filesystem label > ... > here board has been added > > So it doesn't seem a ext2 problem too. > I can't understand how it could be building in the beginning. > > We have 2 solutions: > - expand rootfs > - use a compressed linux Image.gz(25M => 9M), but need target testing > > Honestly I don't think systems with SoCs like RK3399 have problems with 56M > more, so I would go with expanding rootfs to 120M and if maintainer in Cc wants > to shrink Linux and target testing it is welcome to send a patch. > > What do you think? > > Best regards From arnout at mind.be Mon Feb 14 20:13:51 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 14 Feb 2022 21:13:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/resiprocate: fix build of rend with gcc 11 In-Reply-To: <20220208182929.3976984-1-fontaine.fabrice@gmail.com> References: <20220208182929.3976984-1-fontaine.fabrice@gmail.com> Message-ID: <77e919af-fe0e-2878-4f79-826b486c911a@mind.be> On 08/02/2022 19:29, Fabrice Fontaine wrote: > Fix the following build failure of rend with gcc 11: > > /home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/riscv32-buildroot-linux-gnu/include/c++/11.2.0/bits/stl_tree.h:770:15: error: static assertion failed: comparison object must be invocable as const > 770 | is_invocable_v, > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/ad9d89fefe1a667daa123397a072bf130bfa03a7 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...e-issue-compiling-with-Visual-Studio.patch | 95 +++++++++++++++++++ > 1 file changed, 95 insertions(+) > create mode 100644 package/resiprocate/0001-Fix-some-issue-compiling-with-Visual-Studio.patch > > diff --git a/package/resiprocate/0001-Fix-some-issue-compiling-with-Visual-Studio.patch b/package/resiprocate/0001-Fix-some-issue-compiling-with-Visual-Studio.patch > new file mode 100644 > index 0000000000..826774ce8d > --- /dev/null > +++ b/package/resiprocate/0001-Fix-some-issue-compiling-with-Visual-Studio.patch > @@ -0,0 +1,95 @@ > +From be76b10a50749e2e11dce8dcc38b414a7f9d8747 Mon Sep 17 00:00:00 2001 > +From: Ben Walden > +Date: Sat, 22 Aug 2020 23:14:11 +0100 > +Subject: [PATCH] Fix some issue compiling with Visual Studio 16.7.0 and tidy > + up Visual Studio 16 project files > + > +[Retrieved (and updated to keep only RendKa.cxx update) from: > +https://github.com/resiprocate/resiprocate/commit/be76b10a50749e2e11dce8dcc38b414a7f9d8747] > +SIgned-off-by: Fabrice Fontaine > +--- > + VisualStudioReadme.htm | 65 + > + contrib/GeoIP/GeoIP_12_0.vcxproj | 550 ------- > + contrib/GeoIP/GeoIP_16_0.vcxproj | 93 +- > + .../db/build_windows/db_static_12_0.vcxproj | 1260 ----------------- > + .../db/build_windows/db_static_16_0.vcxproj | 696 +-------- > + contrib/db/dbinc/atomic.h | 4 +- > + contrib/db/mp/mp_fget.c | 4 +- > + contrib/db/mp/mp_mvcc.c | 4 +- > + contrib/db/mp/mp_region.c | 4 +- > + contrib/db/mutex/mut_method.c | 2 +- > + contrib/pcre/pcre_12_0.vcxproj | 466 ------ > + contrib/pcre/pcre_16_0.vcxproj | 159 +-- > + contrib/popt/popt_12_0.vcxproj | 394 ------ > + contrib/popt/popt_16_0.vcxproj | 120 +- > + reSIProcate_16_0.sln | 58 +- > + .../queuetostream_12_0.vcxproj | 582 -------- > + .../queuetostream_16_0.vcxproj | 207 ++- > + repro/repro_12_0.vcxproj | 825 ----------- > + repro/repro_12_0.vcxproj.filters | 47 - > + repro/repro_16_0.vcxproj | 159 ++- > + repro/reprocmd/reprocmd_12_0.vcxproj | 597 -------- > + repro/reprocmd/reprocmd_16_0.vcxproj | 139 +- > + repro/reprolib_12_0.vcxproj | 596 -------- > + repro/reprolib_12_0.vcxproj.filters | 136 -- > + repro/reprolib_16_0.vcxproj | 132 +- > + resip/dum/dum_12_0.vcxproj | 615 -------- > + resip/dum/dum_16_0.vcxproj | 124 +- > + resip/dum/test/basicCall_12_0.vcxproj | 621 -------- > + resip/dum/test/basicCall_16_0.vcxproj | 145 +- > + resip/dum/test/basicClient_12_0.vcxproj | 653 --------- > + resip/dum/test/basicClient_16_0.vcxproj | 158 +-- > + resip/dum/test/basicMessage_12_0.vcxproj | 615 -------- > + resip/dum/test/basicMessage_16_0.vcxproj | 141 +- > + resip/dum/test/basicRegister_12_0.vcxproj | 615 -------- > + resip/dum/test/basicRegister_16_0.vcxproj | 137 +- > + resip/rend/RendKa.cxx | 2 +- > + resip/rend/rend_12_0.vcxproj | 352 ----- > + resip/rend/rend_16_0.vcxproj | 89 +- > + resip/stack/resiprocate_12_0.vcxproj | 873 ------------ > + resip/stack/resiprocate_12_0.vcxproj.filters | 351 ----- > + resip/stack/resiprocate_16_0.vcxproj | 165 ++- > + resip/stack/test/test_12_0.vcxproj | 627 -------- > + resip/stack/test/test_16_0.vcxproj | 171 ++- > + rutil/dns/ares/ares_12_0.vcxproj | 488 ------- > + rutil/dns/ares/ares_12_0.vcxproj.filters | 34 - > + rutil/dns/ares/ares_16_0.vcxproj | 159 +-- > + rutil/rutil_12_0.vcxproj | 604 -------- > + rutil/rutil_16_0.vcxproj | 153 +- > + 48 files changed, 1409 insertions(+), 13782 deletions(-) > + delete mode 100644 contrib/GeoIP/GeoIP_12_0.vcxproj > + delete mode 100644 contrib/db/build_windows/db_static_12_0.vcxproj > + delete mode 100644 contrib/pcre/pcre_12_0.vcxproj > + delete mode 100644 contrib/popt/popt_12_0.vcxproj > + delete mode 100644 repro/accountingconsumers/queuetostream_12_0.vcxproj > + delete mode 100644 repro/repro_12_0.vcxproj > + delete mode 100644 repro/repro_12_0.vcxproj.filters > + delete mode 100644 repro/reprocmd/reprocmd_12_0.vcxproj > + delete mode 100644 repro/reprolib_12_0.vcxproj > + delete mode 100644 repro/reprolib_12_0.vcxproj.filters > + delete mode 100644 resip/dum/dum_12_0.vcxproj > + delete mode 100644 resip/dum/test/basicCall_12_0.vcxproj > + delete mode 100644 resip/dum/test/basicClient_12_0.vcxproj > + delete mode 100644 resip/dum/test/basicMessage_12_0.vcxproj > + delete mode 100644 resip/dum/test/basicRegister_12_0.vcxproj > + delete mode 100644 resip/rend/rend_12_0.vcxproj > + delete mode 100644 resip/stack/resiprocate_12_0.vcxproj > + delete mode 100644 resip/stack/resiprocate_12_0.vcxproj.filters > + delete mode 100644 resip/stack/test/test_12_0.vcxproj > + delete mode 100644 rutil/dns/ares/ares_12_0.vcxproj > + delete mode 100644 rutil/dns/ares/ares_12_0.vcxproj.filters > + delete mode 100644 rutil/rutil_12_0.vcxproj > + > +diff --git a/resip/rend/RendKa.cxx b/resip/rend/RendKa.cxx > +index 8645f17636..8321ada1ee 100644 > +--- a/resip/rend/RendKa.cxx > ++++ b/resip/rend/RendKa.cxx > +@@ -66,7 +66,7 @@ bool operator<(const RendKaAssoc& a, const RendKaAssoc& b) > + > + struct RendKaConn > + { > +- bool operator() (const RendKaAssocPtr& a, const RendKaAssocPtr& b) > ++ bool operator()(const RendKaAssocPtr& a, const RendKaAssocPtr& b) const > + { > + return *a < *b; > + } From arnout at mind.be Mon Feb 14 20:14:09 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 14 Feb 2022 21:14:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/neon: fix ssl build without threads In-Reply-To: <20220208182636.3976618-1-fontaine.fabrice@gmail.com> References: <20220208182636.3976618-1-fontaine.fabrice@gmail.com> Message-ID: <902d8e5c-8b16-682e-a199-3352b22529b9@mind.be> On 08/02/2022 19:26, Fabrice Fontaine wrote: > Fix the following ssl build failure without threads raised since bump to > version 0.32.2 in commit 029a6dc3e3320984c6369747e0b79060f13b2afc and > https://github.com/notroj/neon/commit/281c84fc3996c757efdf6e9b3f906d7a1fc08b1d: > > ne_openssl.c:43:10: fatal error: pthread.h: No such file or directory > 43 | #include > | ^~~~~~~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/da995ef26001357e51a5907de9c6111b9ff89bdf > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...se-TS_SSL-feature-with-OpenSSL-1.1.0.patch | 76 +++++++++++++++++++ > .../0002-configure.ac-fix-autoreconf.patch | 28 +++++++ > package/neon/neon.mk | 2 + > 3 files changed, 106 insertions(+) > create mode 100644 package/neon/0001-Revert-Advertise-TS_SSL-feature-with-OpenSSL-1.1.0.patch > create mode 100644 package/neon/0002-configure.ac-fix-autoreconf.patch > > diff --git a/package/neon/0001-Revert-Advertise-TS_SSL-feature-with-OpenSSL-1.1.0.patch b/package/neon/0001-Revert-Advertise-TS_SSL-feature-with-OpenSSL-1.1.0.patch > new file mode 100644 > index 0000000000..02088bfe02 > --- /dev/null > +++ b/package/neon/0001-Revert-Advertise-TS_SSL-feature-with-OpenSSL-1.1.0.patch > @@ -0,0 +1,76 @@ > +From 8f9e110b391f065536780d19c2257ad7afd83522 Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Mon, 31 Jan 2022 23:42:13 +0100 > +Subject: [PATCH] Revert "Advertise TS_SSL feature with OpenSSL >= 1.1.0." > + > +This reverts commit 281c84fc3996c757efdf6e9b3f906d7a1fc08b1d. > + > +Indeed openssl can be built on toolchains without threads support which > +will result in the following build failure: > + > +ne_openssl.c:43:10: fatal error: pthread.h: No such file or directory > + 43 | #include > + | ^~~~~~~~~~~ > + > +Fixes: > + - http://autobuild.buildroot.org/results/da995ef26001357e51a5907de9c6111b9ff89bdf > + > +Signed-off-by: Fabrice Fontaine > +[Upstream status: https://github.com/notroj/neon/pull/71] > +--- > + macros/neon.m4 | 15 ++++----------- > + src/ne_openssl.c | 4 ++-- > + 2 files changed, 6 insertions(+), 13 deletions(-) > + > +diff --git a/macros/neon.m4 b/macros/neon.m4 > +index 129d4ac..5a5fb1b 100644 > +--- a/macros/neon.m4 > ++++ b/macros/neon.m4 > +@@ -960,13 +960,9 @@ yes|openssl) > + AC_CHECK_HEADERS(openssl/ssl.h openssl/opensslv.h,, > + [AC_MSG_ERROR([OpenSSL headers not found, cannot enable SSL support])]) > + > ++ # Enable EGD support if using 0.9.7 or newer > + NE_CHECK_OPENSSLVER(ne_cv_lib_ssl097, 0.9.7, 0x00907000L) > +- NE_CHECK_OPENSSLVER(ne_cv_lib_ssl110, 1.1.0, 0x10100000L) > +- if test "$ne_cv_lib_ssl110" = "yes"; then > +- NE_ENABLE_SUPPORT(SSL, [SSL support enabled, using OpenSSL $NE_SSL_VERSION]) > +- AC_DEFINE(HAVE_OPENSSL11, 1, [Enable OpenSSL 1.1 support]) > +- elif test "$ne_cv_lib_ssl097" = "yes"; then > +- # Enable EGD support if using 0.9.7 or newer > ++ if test "$ne_cv_lib_ssl097" = "yes"; then > + AC_MSG_NOTICE([OpenSSL >= 0.9.7; EGD support not needed in neon]) > + NE_ENABLE_SUPPORT(SSL, [SSL support enabled, using OpenSSL $NE_SSL_VERSION]) > + NE_CHECK_FUNCS(CRYPTO_set_idptr_callback SSL_SESSION_cmp) > +@@ -1074,11 +1070,8 @@ CC/CFLAGS/LIBS must be used to make the POSIX library interfaces > + available]),, > + enable_threadsafe_ssl=no) > + > +-case ${enable_threadsafe_ssl}X${ne_cv_lib_ssl110} in > +-*Xyes) > +- NE_ENABLE_SUPPORT(TS_SSL, [OpenSSL is natively thread-safe]) > +- ;; > +-posixX*|yesX*) > ++case $enable_threadsafe_ssl in > ++posix|yes) > + ne_pthr_ok=yes > + AC_CHECK_FUNCS([pthread_mutex_init pthread_mutex_lock],,[ne_pthr_ok=no]) > + if test "${ne_pthr_ok}" = "no"; then > +diff --git a/src/ne_openssl.c b/src/ne_openssl.c > +index 41a5c05..96c768e 100644 > +--- a/src/ne_openssl.c > ++++ b/src/ne_openssl.c > +@@ -1194,8 +1194,8 @@ char *ne_vstrhash(unsigned int flags, va_list ap) > + return ne__strhash2hex(v, vlen, flags); > + } > + > +-#if defined(NE_HAVE_TS_SSL) && OPENSSL_VERSION_NUMBER < 0x10100000L > +-/* From OpenSSL 1.1.0 locking callbacks are no longer needed. */ > ++#if defined(NE_HAVE_TS_SSL) && OPENSSL_VERSION_NUMBER < 0x10101000L > ++/* For OpenSSL 1.1.1 locking callbacks are no longer need at all. */ > + #define WITH_OPENSSL_LOCKING (1) > + > + /* Implementation of locking callbacks to make OpenSSL thread-safe. > +-- > +2.34.1 > + > diff --git a/package/neon/0002-configure.ac-fix-autoreconf.patch b/package/neon/0002-configure.ac-fix-autoreconf.patch > new file mode 100644 > index 0000000000..cd63d1ed41 > --- /dev/null > +++ b/package/neon/0002-configure.ac-fix-autoreconf.patch > @@ -0,0 +1,28 @@ > +From cf779609a5dd38f0a8fdb3c4539371f13fd3a24a Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Tue, 8 Feb 2022 18:34:25 +0100 > +Subject: [PATCH] configure.ac: fix autoreconf > + > +Add AC_CONFIG_MACRO_DIR(macros) to fix autoreconf > + > +Signed-off-by: Fabrice Fontaine > +[Upstream status: not sent yet] > +--- > + configure.ac | 2 ++ > + 1 file changed, 2 insertions(+) > + > +diff --git a/configure.ac b/configure.ac > +index 37b14ec..122151d 100644 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -1,5 +1,7 @@ > + AC_PREREQ(2.58) dnl 2.58 required for AS_HELP_STRING > + > ++AC_CONFIG_MACRO_DIR(macros) > ++ > + dnl Extract the version (sans LF) from .version, created at release-time. > + m4_define(ne_version, [m4_translit(m4_include(.version), [ > + ])]) > +-- > +2.34.1 > + > diff --git a/package/neon/neon.mk b/package/neon/neon.mk > index 3bbd12561f..eae6bfbad6 100644 > --- a/package/neon/neon.mk > +++ b/package/neon/neon.mk > @@ -10,6 +10,8 @@ NEON_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (manual and tests) > NEON_LICENSE_FILES = src/COPYING.LIB test/COPYING README.md > NEON_CPE_ID_VENDOR = webdav > NEON_INSTALL_STAGING = YES > +# We're patching configure.ac > +NEON_AUTORECONF = YES > NEON_CONF_OPTS = --without-gssapi --disable-rpath > NEON_CONFIG_SCRIPTS = neon-config > NEON_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES) From arnout at mind.be Mon Feb 14 20:04:40 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Feb 2022 21:04:40 +0100 Subject: [Buildroot] [git commit] package/neon: fix ssl build without threads Message-ID: <20220214200642.29DA181734@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6d5061c711fe0e64c0fef466f1221aa8e6202608 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following ssl build failure without threads raised since bump to version 0.32.2 in commit 029a6dc3e3320984c6369747e0b79060f13b2afc and https://github.com/notroj/neon/commit/281c84fc3996c757efdf6e9b3f906d7a1fc08b1d: ne_openssl.c:43:10: fatal error: pthread.h: No such file or directory 43 | #include | ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/da995ef26001357e51a5907de9c6111b9ff89bdf Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...vertise-TS_SSL-feature-with-OpenSSL-1.1.0.patch | 76 ++++++++++++++++++++++ .../neon/0002-configure.ac-fix-autoreconf.patch | 28 ++++++++ package/neon/neon.mk | 2 + 3 files changed, 106 insertions(+) diff --git a/package/neon/0001-Revert-Advertise-TS_SSL-feature-with-OpenSSL-1.1.0.patch b/package/neon/0001-Revert-Advertise-TS_SSL-feature-with-OpenSSL-1.1.0.patch new file mode 100644 index 0000000000..02088bfe02 --- /dev/null +++ b/package/neon/0001-Revert-Advertise-TS_SSL-feature-with-OpenSSL-1.1.0.patch @@ -0,0 +1,76 @@ +From 8f9e110b391f065536780d19c2257ad7afd83522 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 31 Jan 2022 23:42:13 +0100 +Subject: [PATCH] Revert "Advertise TS_SSL feature with OpenSSL >= 1.1.0." + +This reverts commit 281c84fc3996c757efdf6e9b3f906d7a1fc08b1d. + +Indeed openssl can be built on toolchains without threads support which +will result in the following build failure: + +ne_openssl.c:43:10: fatal error: pthread.h: No such file or directory + 43 | #include + | ^~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/da995ef26001357e51a5907de9c6111b9ff89bdf + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/notroj/neon/pull/71] +--- + macros/neon.m4 | 15 ++++----------- + src/ne_openssl.c | 4 ++-- + 2 files changed, 6 insertions(+), 13 deletions(-) + +diff --git a/macros/neon.m4 b/macros/neon.m4 +index 129d4ac..5a5fb1b 100644 +--- a/macros/neon.m4 ++++ b/macros/neon.m4 +@@ -960,13 +960,9 @@ yes|openssl) + AC_CHECK_HEADERS(openssl/ssl.h openssl/opensslv.h,, + [AC_MSG_ERROR([OpenSSL headers not found, cannot enable SSL support])]) + ++ # Enable EGD support if using 0.9.7 or newer + NE_CHECK_OPENSSLVER(ne_cv_lib_ssl097, 0.9.7, 0x00907000L) +- NE_CHECK_OPENSSLVER(ne_cv_lib_ssl110, 1.1.0, 0x10100000L) +- if test "$ne_cv_lib_ssl110" = "yes"; then +- NE_ENABLE_SUPPORT(SSL, [SSL support enabled, using OpenSSL $NE_SSL_VERSION]) +- AC_DEFINE(HAVE_OPENSSL11, 1, [Enable OpenSSL 1.1 support]) +- elif test "$ne_cv_lib_ssl097" = "yes"; then +- # Enable EGD support if using 0.9.7 or newer ++ if test "$ne_cv_lib_ssl097" = "yes"; then + AC_MSG_NOTICE([OpenSSL >= 0.9.7; EGD support not needed in neon]) + NE_ENABLE_SUPPORT(SSL, [SSL support enabled, using OpenSSL $NE_SSL_VERSION]) + NE_CHECK_FUNCS(CRYPTO_set_idptr_callback SSL_SESSION_cmp) +@@ -1074,11 +1070,8 @@ CC/CFLAGS/LIBS must be used to make the POSIX library interfaces + available]),, + enable_threadsafe_ssl=no) + +-case ${enable_threadsafe_ssl}X${ne_cv_lib_ssl110} in +-*Xyes) +- NE_ENABLE_SUPPORT(TS_SSL, [OpenSSL is natively thread-safe]) +- ;; +-posixX*|yesX*) ++case $enable_threadsafe_ssl in ++posix|yes) + ne_pthr_ok=yes + AC_CHECK_FUNCS([pthread_mutex_init pthread_mutex_lock],,[ne_pthr_ok=no]) + if test "${ne_pthr_ok}" = "no"; then +diff --git a/src/ne_openssl.c b/src/ne_openssl.c +index 41a5c05..96c768e 100644 +--- a/src/ne_openssl.c ++++ b/src/ne_openssl.c +@@ -1194,8 +1194,8 @@ char *ne_vstrhash(unsigned int flags, va_list ap) + return ne__strhash2hex(v, vlen, flags); + } + +-#if defined(NE_HAVE_TS_SSL) && OPENSSL_VERSION_NUMBER < 0x10100000L +-/* From OpenSSL 1.1.0 locking callbacks are no longer needed. */ ++#if defined(NE_HAVE_TS_SSL) && OPENSSL_VERSION_NUMBER < 0x10101000L ++/* For OpenSSL 1.1.1 locking callbacks are no longer need at all. */ + #define WITH_OPENSSL_LOCKING (1) + + /* Implementation of locking callbacks to make OpenSSL thread-safe. +-- +2.34.1 + diff --git a/package/neon/0002-configure.ac-fix-autoreconf.patch b/package/neon/0002-configure.ac-fix-autoreconf.patch new file mode 100644 index 0000000000..cd63d1ed41 --- /dev/null +++ b/package/neon/0002-configure.ac-fix-autoreconf.patch @@ -0,0 +1,28 @@ +From cf779609a5dd38f0a8fdb3c4539371f13fd3a24a Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 8 Feb 2022 18:34:25 +0100 +Subject: [PATCH] configure.ac: fix autoreconf + +Add AC_CONFIG_MACRO_DIR(macros) to fix autoreconf + +Signed-off-by: Fabrice Fontaine +[Upstream status: not sent yet] +--- + configure.ac | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 37b14ec..122151d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1,5 +1,7 @@ + AC_PREREQ(2.58) dnl 2.58 required for AS_HELP_STRING + ++AC_CONFIG_MACRO_DIR(macros) ++ + dnl Extract the version (sans LF) from .version, created at release-time. + m4_define(ne_version, [m4_translit(m4_include(.version), [ + ])]) +-- +2.34.1 + diff --git a/package/neon/neon.mk b/package/neon/neon.mk index 3bbd12561f..eae6bfbad6 100644 --- a/package/neon/neon.mk +++ b/package/neon/neon.mk @@ -10,6 +10,8 @@ NEON_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (manual and tests) NEON_LICENSE_FILES = src/COPYING.LIB test/COPYING README.md NEON_CPE_ID_VENDOR = webdav NEON_INSTALL_STAGING = YES +# We're patching configure.ac +NEON_AUTORECONF = YES NEON_CONF_OPTS = --without-gssapi --disable-rpath NEON_CONFIG_SCRIPTS = neon-config NEON_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES) From arnout at mind.be Mon Feb 14 20:09:37 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Feb 2022 21:09:37 +0100 Subject: [Buildroot] [git commit] package/resiprocate: fix build of rend with gcc 11 Message-ID: <20220214200642.3326582AD4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a715593d944ac4f64e56a6d5778374e7388af23d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure of rend with gcc 11: /home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/riscv32-buildroot-linux-gnu/include/c++/11.2.0/bits/stl_tree.h:770:15: error: static assertion failed: comparison object must be invocable as const 770 | is_invocable_v, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/ad9d89fefe1a667daa123397a072bf130bfa03a7 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...x-some-issue-compiling-with-Visual-Studio.patch | 95 ++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/package/resiprocate/0001-Fix-some-issue-compiling-with-Visual-Studio.patch b/package/resiprocate/0001-Fix-some-issue-compiling-with-Visual-Studio.patch new file mode 100644 index 0000000000..0efe0d9cfb --- /dev/null +++ b/package/resiprocate/0001-Fix-some-issue-compiling-with-Visual-Studio.patch @@ -0,0 +1,95 @@ +From be76b10a50749e2e11dce8dcc38b414a7f9d8747 Mon Sep 17 00:00:00 2001 +From: Ben Walden +Date: Sat, 22 Aug 2020 23:14:11 +0100 +Subject: [PATCH] Fix some issue compiling with Visual Studio 16.7.0 and tidy + up Visual Studio 16 project files + +[Retrieved (and updated to keep only RendKa.cxx update) from: +https://github.com/resiprocate/resiprocate/commit/be76b10a50749e2e11dce8dcc38b414a7f9d8747] +Signed-off-by: Fabrice Fontaine +--- + VisualStudioReadme.htm | 65 + + contrib/GeoIP/GeoIP_12_0.vcxproj | 550 ------- + contrib/GeoIP/GeoIP_16_0.vcxproj | 93 +- + .../db/build_windows/db_static_12_0.vcxproj | 1260 ----------------- + .../db/build_windows/db_static_16_0.vcxproj | 696 +-------- + contrib/db/dbinc/atomic.h | 4 +- + contrib/db/mp/mp_fget.c | 4 +- + contrib/db/mp/mp_mvcc.c | 4 +- + contrib/db/mp/mp_region.c | 4 +- + contrib/db/mutex/mut_method.c | 2 +- + contrib/pcre/pcre_12_0.vcxproj | 466 ------ + contrib/pcre/pcre_16_0.vcxproj | 159 +-- + contrib/popt/popt_12_0.vcxproj | 394 ------ + contrib/popt/popt_16_0.vcxproj | 120 +- + reSIProcate_16_0.sln | 58 +- + .../queuetostream_12_0.vcxproj | 582 -------- + .../queuetostream_16_0.vcxproj | 207 ++- + repro/repro_12_0.vcxproj | 825 ----------- + repro/repro_12_0.vcxproj.filters | 47 - + repro/repro_16_0.vcxproj | 159 ++- + repro/reprocmd/reprocmd_12_0.vcxproj | 597 -------- + repro/reprocmd/reprocmd_16_0.vcxproj | 139 +- + repro/reprolib_12_0.vcxproj | 596 -------- + repro/reprolib_12_0.vcxproj.filters | 136 -- + repro/reprolib_16_0.vcxproj | 132 +- + resip/dum/dum_12_0.vcxproj | 615 -------- + resip/dum/dum_16_0.vcxproj | 124 +- + resip/dum/test/basicCall_12_0.vcxproj | 621 -------- + resip/dum/test/basicCall_16_0.vcxproj | 145 +- + resip/dum/test/basicClient_12_0.vcxproj | 653 --------- + resip/dum/test/basicClient_16_0.vcxproj | 158 +-- + resip/dum/test/basicMessage_12_0.vcxproj | 615 -------- + resip/dum/test/basicMessage_16_0.vcxproj | 141 +- + resip/dum/test/basicRegister_12_0.vcxproj | 615 -------- + resip/dum/test/basicRegister_16_0.vcxproj | 137 +- + resip/rend/RendKa.cxx | 2 +- + resip/rend/rend_12_0.vcxproj | 352 ----- + resip/rend/rend_16_0.vcxproj | 89 +- + resip/stack/resiprocate_12_0.vcxproj | 873 ------------ + resip/stack/resiprocate_12_0.vcxproj.filters | 351 ----- + resip/stack/resiprocate_16_0.vcxproj | 165 ++- + resip/stack/test/test_12_0.vcxproj | 627 -------- + resip/stack/test/test_16_0.vcxproj | 171 ++- + rutil/dns/ares/ares_12_0.vcxproj | 488 ------- + rutil/dns/ares/ares_12_0.vcxproj.filters | 34 - + rutil/dns/ares/ares_16_0.vcxproj | 159 +-- + rutil/rutil_12_0.vcxproj | 604 -------- + rutil/rutil_16_0.vcxproj | 153 +- + 48 files changed, 1409 insertions(+), 13782 deletions(-) + delete mode 100644 contrib/GeoIP/GeoIP_12_0.vcxproj + delete mode 100644 contrib/db/build_windows/db_static_12_0.vcxproj + delete mode 100644 contrib/pcre/pcre_12_0.vcxproj + delete mode 100644 contrib/popt/popt_12_0.vcxproj + delete mode 100644 repro/accountingconsumers/queuetostream_12_0.vcxproj + delete mode 100644 repro/repro_12_0.vcxproj + delete mode 100644 repro/repro_12_0.vcxproj.filters + delete mode 100644 repro/reprocmd/reprocmd_12_0.vcxproj + delete mode 100644 repro/reprolib_12_0.vcxproj + delete mode 100644 repro/reprolib_12_0.vcxproj.filters + delete mode 100644 resip/dum/dum_12_0.vcxproj + delete mode 100644 resip/dum/test/basicCall_12_0.vcxproj + delete mode 100644 resip/dum/test/basicClient_12_0.vcxproj + delete mode 100644 resip/dum/test/basicMessage_12_0.vcxproj + delete mode 100644 resip/dum/test/basicRegister_12_0.vcxproj + delete mode 100644 resip/rend/rend_12_0.vcxproj + delete mode 100644 resip/stack/resiprocate_12_0.vcxproj + delete mode 100644 resip/stack/resiprocate_12_0.vcxproj.filters + delete mode 100644 resip/stack/test/test_12_0.vcxproj + delete mode 100644 rutil/dns/ares/ares_12_0.vcxproj + delete mode 100644 rutil/dns/ares/ares_12_0.vcxproj.filters + delete mode 100644 rutil/rutil_12_0.vcxproj + +diff --git a/resip/rend/RendKa.cxx b/resip/rend/RendKa.cxx +index 8645f17636..8321ada1ee 100644 +--- a/resip/rend/RendKa.cxx ++++ b/resip/rend/RendKa.cxx +@@ -66,7 +66,7 @@ bool operator<(const RendKaAssoc& a, const RendKaAssoc& b) + + struct RendKaConn + { +- bool operator() (const RendKaAssocPtr& a, const RendKaAssocPtr& b) ++ bool operator()(const RendKaAssocPtr& a, const RendKaAssocPtr& b) const + { + return *a < *b; + } From bugzilla at busybox.net Mon Feb 14 20:35:36 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Mon, 14 Feb 2022 20:35:36 +0000 Subject: [Buildroot] [Bug 14581] qemu-system-ppc -M mac99 does not boot for glibc system In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14581 --- Comment #1 from romain.naour at gmail.com --- Hi Waldemar, Thanks for the report! I can reproduce it easily with gcc-10 and gcc-11 but not with gcc-9. The powerpc 7400 support has been broken since the beginning of gcc-10 development. After the commit [1] removing -many from the options passed by default to the assembler, the build of this defconfig fail with assembler errors: arch/powerpc/perf/bhrb.S: Assembler messages: arch/powerpc/perf/bhrb.S:22: Error: unrecognized opcode: `cmpldi' arch/powerpc/perf/bhrb.S:24: Error: unrecognized opcode: `ld' arch/powerpc/perf/bhrb.S:25: Error: unrecognized opcode: `sldi' It was fixed later by the commit [2] before the gcc-10 release but glibc segfault at runtime since then. The Buildroot gitlab-ci testing only test with uClibc-ng libc but I try sometime with Glibc... but I missed this issue. This issue should be reported to gcc. [1] https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=e154242724b084380e3221df7c08fcdbd8460674 [2] https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=66711279083121b07d909ac0fc2f3a744ac7c937 Best regards, Romain -- You are receiving this mail because: You are on the CC list for the bug. From yann.morin.1998 at free.fr Mon Feb 14 20:36:24 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 14 Feb 2022 21:36:24 +0100 Subject: [Buildroot] [PATCH] configs/roc_pc_rk3399_defconfig: expand rootfs size to 120M In-Reply-To: <6edcbc6d-c9bb-e802-48f1-d4866a698aa9@mind.be> References: <20220202171035.1740791-1-giulio.benetti@benettiengineering.com> <20220202171035.1740791-2-giulio.benetti@benettiengineering.com> <6edcbc6d-c9bb-e802-48f1-d4866a698aa9@mind.be> Message-ID: <20220214203624.GA248243@scaer> Arnout, All, On 2022-02-14 21:13 +0100, Arnout Vandecappelle spake thusly: > On 14/02/2022 01:03, Giulio Benetti wrote: [--SNIP--] > >It is because of modules(30M) and linux "Image", it's not compressed, so > >it's 25M. So only for Linux+modules => 55M, plus the few other > >stuff(Busybox+libc etc.)1M > Yeah those giant aarch64 default configs are mightily annoying... > I'm thinking, perhaps we should just bite the bullet and move the default > ext2 size to 120M... > Peter, Yann, what do you think? ACK. 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 Mon Feb 14 20:36:37 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 14 Feb 2022 21:36:37 +0100 Subject: [Buildroot] [PATCH v2, 2/2] package/keepalived: fix build with gcc < 4.9 In-Reply-To: <20220208192157.4058193-2-fontaine.fabrice@gmail.com> References: <20220208192157.4058193-1-fontaine.fabrice@gmail.com> <20220208192157.4058193-2-fontaine.fabrice@gmail.com> Message-ID: <78553604-4270-93db-de3b-638dea64867c@mind.be> On 08/02/2022 20:21, Fabrice Fontaine wrote: > Disable track-process to avoid the following build failure with > gcc < 4.9 raised since bump to version 2.2.7 in commit > 79f631000fe6846e72f44810452bb764c228ad44 as suggested by upstream in > https://github.com/acassen/keepalived/issues/2094: > > In file included from ../../lib/rbtree.h:24:0, > from ../../lib/rbtree_ka.h:26, > from ../../lib/scheduler.h:40, > from ../../lib/notify.h:31, > from ../../keepalived/include/vrrp.h:41, > from ../../keepalived/include/track_process.h:31, > from track_process.c:50: > ../../lib/rbtree_types.h:31:25: error: initializer element is not constant > #define RB_ROOT (struct rb_root) { NULL, } I expect that they'll introduce more things that require GCC 4.9 over time, so this is probably just a stop-gap solution. Still, for the time being it works, so both applied to master, thanks. Regards, Arnout > ^ > > Fixes: > - http://autobuild.buildroot.org/results/2132570fb0407abc0e70146d771471e13ef10237 > > Signed-off-by: Fabrice Fontaine > --- > package/keepalived/keepalived.mk | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/package/keepalived/keepalived.mk b/package/keepalived/keepalived.mk > index c7e8c3e2ec..5d6cf174e3 100644 > --- a/package/keepalived/keepalived.mk > +++ b/package/keepalived/keepalived.mk > @@ -56,4 +56,8 @@ else > KEEPALIVED_CONF_OPTS += --disable-nftables > endif > > +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_9),) > +KEEPALIVED_CONF_OPTS += --disable-track-process > +endif > + > $(eval $(autotools-package)) From arnout at mind.be Mon Feb 14 20:15:24 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Feb 2022 21:15:24 +0100 Subject: [Buildroot] [git commit] package/keepalived: fix build with gcc < 4.9 Message-ID: <20220214202910.58A8A82AD4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9b0d3b12438db46565824da437958e526a7c4d71 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Disable track-process to avoid the following build failure with gcc < 4.9 raised since bump to version 2.2.7 in commit 79f631000fe6846e72f44810452bb764c228ad44 as suggested by upstream in https://github.com/acassen/keepalived/issues/2094: In file included from ../../lib/rbtree.h:24:0, from ../../lib/rbtree_ka.h:26, from ../../lib/scheduler.h:40, from ../../lib/notify.h:31, from ../../keepalived/include/vrrp.h:41, from ../../keepalived/include/track_process.h:31, from track_process.c:50: ../../lib/rbtree_types.h:31:25: error: initializer element is not constant #define RB_ROOT (struct rb_root) { NULL, } ^ Fixes: - http://autobuild.buildroot.org/results/2132570fb0407abc0e70146d771471e13ef10237 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/keepalived/keepalived.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/keepalived/keepalived.mk b/package/keepalived/keepalived.mk index c7e8c3e2ec..5d6cf174e3 100644 --- a/package/keepalived/keepalived.mk +++ b/package/keepalived/keepalived.mk @@ -56,4 +56,8 @@ else KEEPALIVED_CONF_OPTS += --disable-nftables endif +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_9),) +KEEPALIVED_CONF_OPTS += --disable-track-process +endif + $(eval $(autotools-package)) From arnout at mind.be Mon Feb 14 20:14:27 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Feb 2022 21:14:27 +0100 Subject: [Buildroot] [git commit] package/keepalived: fix build with kernel < 3.14 Message-ID: <20220214202910.508FD82621@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=53b790631e57b049551230b48707a82a90541942 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with kernel < 3.14 raised since bump to version 2.27 in commit 79f631000fe6846e72f44810452bb764c228ad44: vrrp_nftables.c: In function 'setup_rule_move_igmp': vrrp_nftables.c:1226:15: error: 'NFT_META_L4PROTO' undeclared (first use in this function) add_meta(r, NFT_META_L4PROTO, NFT_REG_1); ^ Fixes: - http://autobuild.buildroot.org/results/2132570fb0407abc0e70146d771471e13ef10237 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...n-t-support-meta-l4proro-until-Linux-3-14.patch | 76 ++++++++++++++++++++++ ...n-t-support-meta-l4proro-until-Linux-3-14.patch | 40 ++++++++++++ package/keepalived/keepalived.mk | 2 + 3 files changed, 118 insertions(+) diff --git a/package/keepalived/0001-vrrp-nft-didn-t-support-meta-l4proro-until-Linux-3-14.patch b/package/keepalived/0001-vrrp-nft-didn-t-support-meta-l4proro-until-Linux-3-14.patch new file mode 100644 index 0000000000..9d5f3f7905 --- /dev/null +++ b/package/keepalived/0001-vrrp-nft-didn-t-support-meta-l4proro-until-Linux-3-14.patch @@ -0,0 +1,76 @@ +From edc71b19c619fdc1d71df10a2d0e8f5822965d69 Mon Sep 17 00:00:00 2001 +From: Quentin Armitage +Date: Tue, 8 Feb 2022 14:58:49 +0000 +Subject: [PATCH] vrrp: nft didn't support meta l4proro until Linux 3.14 + +For Linux 3.13 (first version to support nftables), we instead specify: + at nh,48,8 58 + +Signed-off-by: Quentin Armitage + +[Retrieved (and updated to drop update of README.kernel_versions) from: +https://github.com/acassen/keepalived/commit/edc71b19c619fdc1d71df10a2d0e8f5822965d69] +Signed-off-by: Fabrice Fontaine +--- + README.kernel_versions | 1 + + configure.ac | 5 +++++ + keepalived/vrrp/vrrp_nftables.c | 16 ++++++++++++++-- + 3 files changed, 20 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 350a9f4e9..bc643dbf1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1754,6 +1754,11 @@ if test .${enable_nftables} != .no; then + ],[ + AC_MSG_RESULT(no) + ]) ++ ++ # nft l4proto from Linux 3.14 ++ AC_CHECK_DECLS([NFT_META_L4PROTO], [], [], ++ [#include ]) ++ + # nft dup from Linux 4.3 + AC_CHECK_DECLS([NFTA_DUP_MAX], [], [], + [#include ]) +diff --git a/keepalived/vrrp/vrrp_nftables.c b/keepalived/vrrp/vrrp_nftables.c +index d3ea39db3..8b5095ad4 100644 +--- a/keepalived/vrrp/vrrp_nftables.c ++++ b/keepalived/vrrp/vrrp_nftables.c +@@ -1191,6 +1191,8 @@ setup_rule_move_igmp(uint8_t family, const char *table, + otherwise: + nft add rule ip keepalived out ip protocol igmp [meta oifkind macvlan] oif @vmac_set drop + nft add rule ip6 keepalived out icmpv6 type mld2-listener-report [meta oifkind macvlan] oif @vmac_set drop ++ * ++ * Note: on 3.13 kernels, icmpv6 is specified as @nh,48,8 58 + */ + struct nftnl_rule *r = NULL; + uint64_t handle_num; +@@ -1223,7 +1225,12 @@ setup_rule_move_igmp(uint8_t family, const char *table, + offsetof(struct iphdr, daddr), sizeof(struct in_addr)); + #endif + } else { +- add_meta(r, NFT_META_L4PROTO, NFT_REG_1); ++#if HAVE_DECL_NFT_META_L4PROTO ++ add_meta(r, NFT_META_L4PROTO, NFT_REG_1); /* From Linux 3.14 */ ++#else ++ add_payload(r, NFT_PAYLOAD_NETWORK_HEADER, NFT_REG_1, ++ offsetof(struct ip6_hdr, ip6_nxt), sizeof(((struct ip6_hdr *)NULL)->ip6_nxt)); ++#endif + protocol = IPPROTO_ICMPV6; + add_cmp(r, NFT_REG_1, NFT_CMP_EQ, &protocol, sizeof(protocol)); + add_payload(r, NFT_PAYLOAD_TRANSPORT_HEADER, NFT_REG_1, +@@ -1279,7 +1286,12 @@ setup_rule_drop_router_solicit(const char *table, const char *chain, + nftnl_rule_set_u64(r, NFTNL_RULE_POSITION, handle_num); + } + +- add_meta(r, NFT_META_L4PROTO, NFT_REG_1); ++#if HAVE_DECL_NFT_META_L4PROTO ++ add_meta(r, NFT_META_L4PROTO, NFT_REG_1); /* From Linux 3.14 */ ++#else ++ add_payload(r, NFT_PAYLOAD_NETWORK_HEADER, NFT_REG_1, ++ offsetof(struct ip6_hdr, ip6_nxt), sizeof(((struct ip6_hdr *)NULL)->ip6_nxt)); ++#endif + protocol = IPPROTO_ICMPV6; + add_cmp(r, NFT_REG_1, NFT_CMP_EQ, &protocol, sizeof(protocol)); + add_payload(r, NFT_PAYLOAD_TRANSPORT_HEADER, NFT_REG_1, diff --git a/package/keepalived/0002-ipvs-nft-didn-t-support-meta-l4proro-until-Linux-3-14.patch b/package/keepalived/0002-ipvs-nft-didn-t-support-meta-l4proro-until-Linux-3-14.patch new file mode 100644 index 0000000000..3713de37c2 --- /dev/null +++ b/package/keepalived/0002-ipvs-nft-didn-t-support-meta-l4proro-until-Linux-3-14.patch @@ -0,0 +1,40 @@ +From 50e8a8d56cd5a3d7184b035708865302bbc7ef69 Mon Sep 17 00:00:00 2001 +From: Quentin Armitage +Date: Tue, 8 Feb 2022 17:43:49 +0000 +Subject: [PATCH] ipvs: nft didn't support meta l4proro until Linux 3.14 + +For Linux 3.13 (first version to support nftables), we instead specify: +ipv4: @nh,72,8 PROTO +ipv6: @nh,48,8 PROTO + +Signed-off-by: Quentin Armitage + +[Retrieved from: +https://github.com/acassen/keepalived/commit/50e8a8d56cd5a3d7184b035708865302bbc7ef69] +Signed-off-by: Fabrice Fontaine +--- + keepalived/check/check_nftables.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/keepalived/check/check_nftables.c b/keepalived/check/check_nftables.c +index 2d163ac14..45831203b 100644 +--- a/keepalived/check/check_nftables.c ++++ b/keepalived/check/check_nftables.c +@@ -150,7 +150,16 @@ setup_rule_set_mark(uint8_t family, const char *table, + nftnl_rule_set_u64(r, NFTNL_RULE_POSITION, handle_num); + } + +- add_meta(r, NFT_META_L4PROTO, NFT_REG_1); ++#if HAVE_DECL_NFT_META_L4PROTO ++ add_meta(r, NFT_META_L4PROTO, NFT_REG_1); /* From Linux 3.14 */ ++#else ++ if (family == NFPROTO_IPV4) ++ add_payload(r, NFT_PAYLOAD_NETWORK_HEADER, NFT_REG_1, ++ offsetof(struct iphdr, protocol), sizeof(((struct iphdr *)NULL)->protocol)); ++ else ++ add_payload(r, NFT_PAYLOAD_NETWORK_HEADER, NFT_REG_1, ++ offsetof(struct ip6_hdr, ip6_nxt), sizeof(((struct ip6_hdr *)NULL)->ip6_nxt)); ++#endif + add_cmp(r, NFT_REG_1, NFT_CMP_EQ, &l4_protocol, sizeof(l4_protocol)); + if (family == NFPROTO_IPV4) + add_payload(r, NFT_PAYLOAD_NETWORK_HEADER, NFT_REG_1, diff --git a/package/keepalived/keepalived.mk b/package/keepalived/keepalived.mk index 7a1123b4dd..c7e8c3e2ec 100644 --- a/package/keepalived/keepalived.mk +++ b/package/keepalived/keepalived.mk @@ -11,6 +11,8 @@ KEEPALIVED_LICENSE = GPL-2.0+ KEEPALIVED_LICENSE_FILES = COPYING KEEPALIVED_CPE_ID_VENDOR = keepalived KEEPALIVED_CONF_OPTS = --disable-hardening +# We're patching configure.ac +KEEPALIVED_AUTORECONF = YES ifeq ($(BR2_PACKAGE_JSON_C),y) KEEPALIVED_DEPENDENCIES += json-c From yann.morin.1998 at free.fr Mon Feb 14 20:39:09 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 14 Feb 2022 21:39:09 +0100 Subject: [Buildroot] [PATCH] utils/docker-run: improve user experience Message-ID: <20220214203909.251924-1-yann.morin.1998@free.fr> Currently, the docker-run script starts a container based on the reference image, in which the user has UID:GID set to 1000:1000, which may or may not be the same as local user uses, which may prevent the commands in the container from creating files, which foils the plan of using the container to run a build... Additionally, the paths in the container differ from the paths the user expects, as the current Buildroot tree is mounted over the in-container user home directory. This is a bit confusing... Finally, the container is left hanging around after the command finishes, and thus there are as many lingering containers as the user runs docker-run. This is not very nice... We fix all of that (yeah, should be different patches, but meh): - we use --mount instead of -v, which allows us to bind-mount the Buildroot tree at the same place in the container, as Docker will create the destination if it does not exist, while -v seems to expect it to exist [0]. - as a consequence, we can also set the working directory as the Buildroot top-directory; - use --user to force the same UID:GID in the container as the local user, so that files created in the container belong to the local user, and so that files from the local user are accessible from the container; - use --rm do remove the container once it terminates; starting a new container is very quick anyway, so it is as good as re-using a previous container. [0] the documentation is not clear about that. It clearly states that the host directory (i.e. the origin, the source) is created if missing, but it says nothing of the destination: https://docs.docker.com/engine/reference/commandline/run/#mount-volume--v---read-only Signed-off-by: Yann E. MORIN Cc: Luca Ceresoli Cc: Giulio Benetti Cc: Arnout Vandecappelle (Essensium/Mind) --- utils/docker-run | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/utils/docker-run b/utils/docker-run index 2bca8d8e3a..bdbc979264 100755 --- a/utils/docker-run +++ b/utils/docker-run @@ -7,4 +7,8 @@ IMAGE=$(grep ^image: "${MAIN_DIR}/.gitlab-ci.yml" | \ sed -e 's,^image: ,,g' | sed -e 's,\$CI_REGISTRY,registry.gitlab.com,g') set -x -exec docker run -v "${MAIN_DIR}:/home/br-user" -it "${IMAGE}" "$@" +exec docker run -it --rm \ + --user $(id -u):$(id -g) \ + --mount "type=bind,src=${MAIN_DIR},dst=${MAIN_DIR}" \ + --workdir "${MAIN_DIR}" \ + "${IMAGE}" "${@}" -- 2.25.1 From arnout at mind.be Mon Feb 14 20:41:03 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 14 Feb 2022 21:41:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/libuhttpd: depends on gcc >= 4.9 In-Reply-To: <20220208210644.16926-1-fontaine.fabrice@gmail.com> References: <20220208210644.16926-1-fontaine.fabrice@gmail.com> Message-ID: <31b52468-98ef-bfa7-c59e-12130d4ecdf9@mind.be> On 08/02/2022 22:06, Fabrice Fontaine wrote: > Add a dependency on gcc >= 4.9 to avoid the following build failure > with gcc 4.8.3 raised since bump to version 3.14.1 in commit > 61797c52f5deef2cb67e60cf075ca243078c8855 and > https://github.com/zhaojh329/libuhttpd/commit/ffdf7de3a4a1f5a62aa3814ac96e889958a30840: > > /home/peko/autobuild/instance-1/output-1/build/libuhttpd-3.14.1/src/cgi.c:41:5: error: initializer element is not a constant expression [-Werror] > {"accept", strlen("accept"), "HTTP_ACCEPT"}, > ^ > > It should be noted that upstream rejected a patch to remove -Werror: > https://github.com/zhaojh329/libuhttpd/pull/12 > > Fixes: > - http://autobuild.buildroot.org/results/a3a970a6398dcb0e4e03f4277f1a50c6b5eff7bd > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/libuhttpd/Config.in | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/package/libuhttpd/Config.in b/package/libuhttpd/Config.in > index 52bbd313bc..97fc984ea0 100644 > --- a/package/libuhttpd/Config.in > +++ b/package/libuhttpd/Config.in > @@ -1,6 +1,7 @@ > config BR2_PACKAGE_LIBUHTTPD > bool "libuhttpd" > depends on BR2_USE_MMU # fork() > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 > select BR2_PACKAGE_LIBEV > select BR2_PACKAGE_WOLFSSL_ALL if BR2_PACKAGE_WOLFSSL > help > @@ -8,3 +9,7 @@ config BR2_PACKAGE_LIBUHTTPD > library based on libev > > https://github.com/zhaojh329/libuhttpd > + > +comment "libuhttpd needs a toolchain w/ gcc >= 4.9" > + depends on BR2_USE_MMU > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 From arnout at mind.be Mon Feb 14 20:41:19 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 14 Feb 2022 21:41:19 +0100 Subject: [Buildroot] [PATCH 1/1] package/libusb: add -latomic to libusb-1.0.pc if needed In-Reply-To: <20220207172500.3041019-1-fontaine.fabrice@gmail.com> References: <20220207172500.3041019-1-fontaine.fabrice@gmail.com> Message-ID: On 07/02/2022 18:25, Fabrice Fontaine wrote: > libusb unconditionally uses atomic since version 1.0.25 and > https://github.com/libusb/libusb/commit/1a08aa84d96397a3840a75abe66051f5360c2c84 > resulting in the following build failure with pcsc-lite or openocd since > commit aad609936fc83acfe1eac6ffc86d29ac35dcf54e: > > checking for libusb_init... configure: error: libusb not found, use ./configure LIBUSB_LIBS=... > > /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: /home/buildroot/autobuild/instance-0/output-1/host/sparc-buildroot-linux-uclibc/sysroot/usr/lib/libusb-1.0.so: undefined reference to `__atomic_fetch_add_4' > collect2: error: ld returned 1 exit status > > Fixes: > - http://autobuild.buildroot.org/results/4a27a769bb3cdf78643c3049b87d792178d6512c > - http://autobuild.buildroot.org/results/b59b30cbe0e27399db5c7586f369104e68a1589a > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...igure.ac-link-with-latomic-if-needed.patch | 39 +++++++++++++++++++ > package/libusb/libusb.mk | 2 + > 2 files changed, 41 insertions(+) > create mode 100644 package/libusb/0001-configure.ac-link-with-latomic-if-needed.patch > > diff --git a/package/libusb/0001-configure.ac-link-with-latomic-if-needed.patch b/package/libusb/0001-configure.ac-link-with-latomic-if-needed.patch > new file mode 100644 > index 0000000000..5f6c88e57d > --- /dev/null > +++ b/package/libusb/0001-configure.ac-link-with-latomic-if-needed.patch > @@ -0,0 +1,39 @@ > +From 0b857081d687f7ee41483a3d7e9846af44a5ba7d Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Mon, 7 Feb 2022 11:55:54 +0100 > +Subject: [PATCH] configure.ac: link with -latomic if needed > + > +libusb unconditionally uses atomic_fetch_add since version 1.0.25 and > +https://github.com/libusb/libusb/commit/1a08aa84d96397a3840a75abe66051f5360c2c84 > +https://github.com/libusb/libusb/commit/eed8a371ea53939096ba94d44001e0637d042572 > +but some architectures (e.g. sparc) needs to link with -latomic to be > +able to use it. So check if -latomic is needed and update libusb-1.0.pc > +accordingly to avoid the following build failure with openocd: > + > +/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: /home/buildroot/autobuild/instance-0/output-1/host/sparc-buildroot-linux-uclibc/sysroot/usr/lib/libusb-1.0.so: undefined reference to `__atomic_fetch_add_4' > +collect2: error: ld returned 1 exit status > + > +Fixes: > + - http://autobuild.buildroot.org/results/4a27a769bb3cdf78643c3049b87d792178d6512c > + > +Signed-off-by: Fabrice Fontaine > +[Upstream status: https://github.com/libusb/libusb/pull/1064] > +--- > + configure.ac | 1 + > + 1 file changed, 1 insertion(+) > + > +diff --git a/configure.ac b/configure.ac > +index f6cf2f9..002bcf6 100644 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -152,6 +152,7 @@ if test "x$platform" = xposix; then > + AC_SEARCH_LIBS([pthread_create], [pthread], > + [test "x$ac_cv_search_pthread_create" != "xnone required" && AC_SUBST(THREAD_LIBS, [-lpthread])], > + [], []) > ++ AC_SEARCH_LIBS([__atomic_fetch_add_4], [atomic]) > + elif test "x$platform" = xwindows; then > + AC_DEFINE([PLATFORM_WINDOWS], [1], [Define to 1 if compiling for a Windows platform.]) > + else > +-- > +2.34.1 > + > diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk > index 1e82cb9a85..aa306e295d 100644 > --- a/package/libusb/libusb.mk > +++ b/package/libusb/libusb.mk > @@ -13,6 +13,8 @@ LIBUSB_LICENSE_FILES = COPYING > LIBUSB_CPE_ID_VENDOR = libusb > LIBUSB_DEPENDENCIES = host-pkgconf > LIBUSB_INSTALL_STAGING = YES > +# We're patching configure.ac > +LIBUSB_AUTORECONF = YES > > # Avoid the discovery of udev for the host variant > HOST_LIBUSB_CONF_OPTS = --disable-udev From arnout at mind.be Mon Feb 14 20:41:38 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 14 Feb 2022 21:41:38 +0100 Subject: [Buildroot] [PATCH] toolchain: fix gcc bug 99140 condition In-Reply-To: <20220206142403.1644118-1-giulio.benetti@benettiengineering.com> References: <2fec6210-3811-197d-45a7-1ece869f49e0@benettiengineering.com> <20220206142403.1644118-1-giulio.benetti@benettiengineering.com> Message-ID: <96afee8b-4875-666f-a28b-841a990e8fb3@mind.be> On 06/02/2022 15:24, Giulio Benetti wrote: > Gcc bug 99140 exhibits with gcc versions: > - up to 7.x > - 9.x > - 10.x > and doesn't show up with gcc versions: > - 8.x > - 11.x > then moving BR2_TOOLCHAIN_GCC_AT_LEAST_9 to BR2_TOOLCHAIN_GCC_AT_LEAST_10 > makes gcc version 9 set as working but it's not. So let's back substitute > BR2_TOOLCHAIN_GCC_AT_LEAST_10 with BR2_TOOLCHAIN_GCC_AT_LEAST_9. > > Signed-off-by: Giulio Benetti Applied to master, thanks. Regards, Arnout > --- > toolchain/Config.in | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/toolchain/Config.in b/toolchain/Config.in > index aed8f393a3..db3f451f45 100644 > --- a/toolchain/Config.in > +++ b/toolchain/Config.in > @@ -189,7 +189,7 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_93847 > config BR2_TOOLCHAIN_HAS_GCC_BUG_99140 > bool > default y if !BR2_TOOLCHAIN_GCC_AT_LEAST_8 > - default y if BR2_TOOLCHAIN_GCC_AT_LEAST_10 && !BR2_TOOLCHAIN_GCC_AT_LEAST_11 > + default y if BR2_TOOLCHAIN_GCC_AT_LEAST_9 && !BR2_TOOLCHAIN_GCC_AT_LEAST_11 > depends on BR2_nios2 > > # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101737 From arnout at mind.be Mon Feb 14 20:42:10 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 14 Feb 2022 21:42:10 +0100 Subject: [Buildroot] [PATCH v2] package/systemd: don't treat ld warnings as errors In-Reply-To: <20220206104120.1580819-1-giulio.benetti@benettiengineering.com> References: <20220206104120.1580819-1-giulio.benetti@benettiengineering.com> Message-ID: On 06/02/2022 11:41, Giulio Benetti wrote: > Nios2 ld emits warnings like: > ' > /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/nios2-linux-gnu/7.3.1/../../../../nios2-linux-gnu/bin/ld: FDE encoding in /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/nios2-linux-gnu/7.3.1/libgcc.a(_umoddi3.o)(.eh_frame) prevents .eh_frame_hdr table being created. > ' > Since '-Wl,--fatal-warnings' is passed by default, build fails, so don't > treat warnings as errors by appending "-Wl,--no-fatal-warnings" to > SYSTEMD_LDFLAGS the same way I've done for Microblaze in commit: > https://git.buildroot.net/buildroot/commit/?id=cc53d5357d84ff9b78d76e45ce216061df8a37c1 > > Fixes: > http://autobuild.buildroot.net/results/5fc884e11e46ab165ea21c8e8f2901516d79ff80/ > > Signed-off-by: Giulio Benetti Applied to master, thanks. Regards, Arnout > --- > V1->V2: > * renamed BR2_nios to BR2_nios2 > --- > package/systemd/systemd.mk | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > index 5626b54e8e..b07fac27d4 100644 > --- a/package/systemd/systemd.mk > +++ b/package/systemd/systemd.mk > @@ -90,6 +90,11 @@ SYSTEMD_CONF_OPTS += \ > -Dumount-path=/usr/bin/umount \ > -Dutmp=false > > +ifeq ($(BR2_nios2),y) > +# Nios2 ld emits warnings, make warnings not to be treated as errors > +SYSTEMD_LDFLAGS = $(TARGET_LDFLAGS) -Wl,--no-fatal-warnings > +endif > + > ifeq ($(BR2_PACKAGE_ACL),y) > SYSTEMD_DEPENDENCIES += acl > SYSTEMD_CONF_OPTS += -Dacl=true From arnout at mind.be Mon Feb 14 20:42:28 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 14 Feb 2022 21:42:28 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-regex: fix license In-Reply-To: <20220206220814.2580975-1-fontaine.fabrice@gmail.com> References: <20220206220814.2580975-1-fontaine.fabrice@gmail.com> Message-ID: <767362e6-ba7e-ff9f-81ef-787f325067e7@mind.be> On 06/02/2022 23:08, Fabrice Fontaine wrote: > License is Apache-2.0 since bump to version 2021.4.4 in commit > d973fac7ca2e7c0c4864e8045e5205764e84c45b and > https://github.com/mrabarnett/mrab-regex/commit/b693a1fba731a9aa0dc6ae37b441267d4b7b0419 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/python-regex/python-regex.hash | 2 ++ > package/python-regex/python-regex.mk | 3 ++- > package/python3-regex/python3-regex.mk | 3 ++- > 3 files changed, 6 insertions(+), 2 deletions(-) > > diff --git a/package/python-regex/python-regex.hash b/package/python-regex/python-regex.hash > index 4749cd6167..b0f5bb05da 100644 > --- a/package/python-regex/python-regex.hash > +++ b/package/python-regex/python-regex.hash > @@ -1,3 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/regex/json > md5 cd206281327b4c087bb20bf93cee4ab9 regex-2021.4.4.tar.gz > sha256 52ba3d3f9b942c49d7e4bc105bb28551c44065f139a65062ab7912bef10c9afb regex-2021.4.4.tar.gz > +# Locally computed sha256 checksums > +sha256 bff55ef4cdcc8c14ce259f8e8ab60e264418440d6335f4dc138273fbd506144d LICENSE.txt > diff --git a/package/python-regex/python-regex.mk b/package/python-regex/python-regex.mk > index c46c4d1614..4019bcdd3e 100644 > --- a/package/python-regex/python-regex.mk > +++ b/package/python-regex/python-regex.mk > @@ -9,6 +9,7 @@ PYTHON_REGEX_VERSION = 2021.4.4 > PYTHON_REGEX_SOURCE = regex-$(PYTHON_REGEX_VERSION).tar.gz > PYTHON_REGEX_SITE = https://files.pythonhosted.org/packages/38/3f/4c42a98c9ad7d08c16e7d23b2194a0e4f3b2914662da8bc88986e4e6de1f > PYTHON_REGEX_SETUP_TYPE = setuptools > -PYTHON_REGEX_LICENSE = CNRI-Python > +PYTHON_REGEX_LICENSE = Apache-2.0 > +PYTHON_REGEX_LICENSE_FILES = LICENSE.txt > > $(eval $(python-package)) > diff --git a/package/python3-regex/python3-regex.mk b/package/python3-regex/python3-regex.mk > index 0b71768e9d..5c08338437 100644 > --- a/package/python3-regex/python3-regex.mk > +++ b/package/python3-regex/python3-regex.mk > @@ -9,7 +9,8 @@ PYTHON3_REGEX_VERSION = 2021.4.4 > PYTHON3_REGEX_SOURCE = regex-$(PYTHON3_REGEX_VERSION).tar.gz > PYTHON3_REGEX_SITE = https://files.pythonhosted.org/packages/38/3f/4c42a98c9ad7d08c16e7d23b2194a0e4f3b2914662da8bc88986e4e6de1f > PYTHON3_REGEX_SETUP_TYPE = setuptools > -PYTHON3_REGEX_LICENSE = CNRI-Python > +PYTHON3_REGEX_LICENSE = Apache-2.0 > +PYTHON3_REGEX_LICENSE_FILES = LICENSE.txt > HOST_PYTHON3_REGEX_DL_SUBDIR = python-regex > HOST_PYTHON3_REGEX_NEEDS_HOST_PYTHON = python3 > From arnout at mind.be Mon Feb 14 20:38:43 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Feb 2022 21:38:43 +0100 Subject: [Buildroot] [git commit] package/libusb: add -latomic to libusb-1.0.pc if needed Message-ID: <20220214203507.22FEA82BDB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d661740201405970f65c16c39a79f4148705af30 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master libusb unconditionally uses atomic since version 1.0.25 and https://github.com/libusb/libusb/commit/1a08aa84d96397a3840a75abe66051f5360c2c84 resulting in the following build failure with pcsc-lite or openocd since commit aad609936fc83acfe1eac6ffc86d29ac35dcf54e: checking for libusb_init... configure: error: libusb not found, use ./configure LIBUSB_LIBS=... /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: /home/buildroot/autobuild/instance-0/output-1/host/sparc-buildroot-linux-uclibc/sysroot/usr/lib/libusb-1.0.so: undefined reference to `__atomic_fetch_add_4' collect2: error: ld returned 1 exit status Fixes: - http://autobuild.buildroot.org/results/4a27a769bb3cdf78643c3049b87d792178d6512c - http://autobuild.buildroot.org/results/b59b30cbe0e27399db5c7586f369104e68a1589a Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...-configure.ac-link-with-latomic-if-needed.patch | 39 ++++++++++++++++++++++ package/libusb/libusb.mk | 2 ++ 2 files changed, 41 insertions(+) diff --git a/package/libusb/0001-configure.ac-link-with-latomic-if-needed.patch b/package/libusb/0001-configure.ac-link-with-latomic-if-needed.patch new file mode 100644 index 0000000000..5f6c88e57d --- /dev/null +++ b/package/libusb/0001-configure.ac-link-with-latomic-if-needed.patch @@ -0,0 +1,39 @@ +From 0b857081d687f7ee41483a3d7e9846af44a5ba7d Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 7 Feb 2022 11:55:54 +0100 +Subject: [PATCH] configure.ac: link with -latomic if needed + +libusb unconditionally uses atomic_fetch_add since version 1.0.25 and +https://github.com/libusb/libusb/commit/1a08aa84d96397a3840a75abe66051f5360c2c84 +https://github.com/libusb/libusb/commit/eed8a371ea53939096ba94d44001e0637d042572 +but some architectures (e.g. sparc) needs to link with -latomic to be +able to use it. So check if -latomic is needed and update libusb-1.0.pc +accordingly to avoid the following build failure with openocd: + +/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: /home/buildroot/autobuild/instance-0/output-1/host/sparc-buildroot-linux-uclibc/sysroot/usr/lib/libusb-1.0.so: undefined reference to `__atomic_fetch_add_4' +collect2: error: ld returned 1 exit status + +Fixes: + - http://autobuild.buildroot.org/results/4a27a769bb3cdf78643c3049b87d792178d6512c + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/libusb/libusb/pull/1064] +--- + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure.ac b/configure.ac +index f6cf2f9..002bcf6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -152,6 +152,7 @@ if test "x$platform" = xposix; then + AC_SEARCH_LIBS([pthread_create], [pthread], + [test "x$ac_cv_search_pthread_create" != "xnone required" && AC_SUBST(THREAD_LIBS, [-lpthread])], + [], []) ++ AC_SEARCH_LIBS([__atomic_fetch_add_4], [atomic]) + elif test "x$platform" = xwindows; then + AC_DEFINE([PLATFORM_WINDOWS], [1], [Define to 1 if compiling for a Windows platform.]) + else +-- +2.34.1 + diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk index 1e82cb9a85..aa306e295d 100644 --- a/package/libusb/libusb.mk +++ b/package/libusb/libusb.mk @@ -13,6 +13,8 @@ LIBUSB_LICENSE_FILES = COPYING LIBUSB_CPE_ID_VENDOR = libusb LIBUSB_DEPENDENCIES = host-pkgconf LIBUSB_INSTALL_STAGING = YES +# We're patching configure.ac +LIBUSB_AUTORECONF = YES # Avoid the discovery of udev for the host variant HOST_LIBUSB_CONF_OPTS = --disable-udev From arnout at mind.be Mon Feb 14 20:38:22 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Feb 2022 21:38:22 +0100 Subject: [Buildroot] [git commit] package/systemd: don't treat ld warnings as errors Message-ID: <20220214203507.0B70F82BDC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=132eec5c47f5f9542d0c2e93d12341d624627de0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Nios2 ld emits warnings like: ' /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/nios2-linux-gnu/7.3.1/../../../../nios2-linux-gnu/bin/ld: FDE encoding in /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/nios2-linux-gnu/7.3.1/libgcc.a(_umoddi3.o)(.eh_frame) prevents .eh_frame_hdr table being created. ' Since '-Wl,--fatal-warnings' is passed by default, build fails, so don't treat warnings as errors by appending "-Wl,--no-fatal-warnings" to SYSTEMD_LDFLAGS the same way I've done for Microblaze in commit: https://git.buildroot.net/buildroot/commit/?id=cc53d5357d84ff9b78d76e45ce216061df8a37c1 Fixes: http://autobuild.buildroot.net/results/5fc884e11e46ab165ea21c8e8f2901516d79ff80/ Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/systemd/systemd.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 5626b54e8e..b07fac27d4 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -90,6 +90,11 @@ SYSTEMD_CONF_OPTS += \ -Dumount-path=/usr/bin/umount \ -Dutmp=false +ifeq ($(BR2_nios2),y) +# Nios2 ld emits warnings, make warnings not to be treated as errors +SYSTEMD_LDFLAGS = $(TARGET_LDFLAGS) -Wl,--no-fatal-warnings +endif + ifeq ($(BR2_PACKAGE_ACL),y) SYSTEMD_DEPENDENCIES += acl SYSTEMD_CONF_OPTS += -Dacl=true From arnout at mind.be Mon Feb 14 20:39:58 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Feb 2022 21:39:58 +0100 Subject: [Buildroot] [git commit] package/libuhttpd: depends on gcc >= 4.9 Message-ID: <20220214203507.2E57882BDC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8679f6a7e7c0e6245ebdea47ea2257bfaccc7d37 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add a dependency on gcc >= 4.9 to avoid the following build failure with gcc 4.8.3 raised since bump to version 3.14.1 in commit 61797c52f5deef2cb67e60cf075ca243078c8855 and https://github.com/zhaojh329/libuhttpd/commit/ffdf7de3a4a1f5a62aa3814ac96e889958a30840: /home/peko/autobuild/instance-1/output-1/build/libuhttpd-3.14.1/src/cgi.c:41:5: error: initializer element is not a constant expression [-Werror] {"accept", strlen("accept"), "HTTP_ACCEPT"}, ^ It should be noted that upstream rejected a patch to remove -Werror: https://github.com/zhaojh329/libuhttpd/pull/12 Fixes: - http://autobuild.buildroot.org/results/a3a970a6398dcb0e4e03f4277f1a50c6b5eff7bd Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libuhttpd/Config.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/libuhttpd/Config.in b/package/libuhttpd/Config.in index 52bbd313bc..97fc984ea0 100644 --- a/package/libuhttpd/Config.in +++ b/package/libuhttpd/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_LIBUHTTPD bool "libuhttpd" depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 select BR2_PACKAGE_LIBEV select BR2_PACKAGE_WOLFSSL_ALL if BR2_PACKAGE_WOLFSSL help @@ -8,3 +9,7 @@ config BR2_PACKAGE_LIBUHTTPD library based on libev https://github.com/zhaojh329/libuhttpd + +comment "libuhttpd needs a toolchain w/ gcc >= 4.9" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 From arnout at mind.be Mon Feb 14 20:38:27 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Feb 2022 21:38:27 +0100 Subject: [Buildroot] [git commit] toolchain: fix gcc bug 99140 condition Message-ID: <20220214203507.15C8582CFC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=33ea4d7887b15ccb3e11d1390c697eee531af565 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Gcc bug 99140 exhibits with gcc versions: - up to 7.x - 9.x - 10.x and doesn't show up with gcc versions: - 8.x - 11.x then moving BR2_TOOLCHAIN_GCC_AT_LEAST_9 to BR2_TOOLCHAIN_GCC_AT_LEAST_10 makes gcc version 9 set as working but it's not. So let's back substitute BR2_TOOLCHAIN_GCC_AT_LEAST_10 with BR2_TOOLCHAIN_GCC_AT_LEAST_9. Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- toolchain/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchain/Config.in b/toolchain/Config.in index 53d2046379..d2c81217c8 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -189,7 +189,7 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_93847 config BR2_TOOLCHAIN_HAS_GCC_BUG_99140 bool default y if !BR2_TOOLCHAIN_GCC_AT_LEAST_8 - default y if BR2_TOOLCHAIN_GCC_AT_LEAST_10 && !BR2_TOOLCHAIN_GCC_AT_LEAST_11 + default y if BR2_TOOLCHAIN_GCC_AT_LEAST_9 && !BR2_TOOLCHAIN_GCC_AT_LEAST_11 depends on BR2_nios2 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101737 From arnout at mind.be Mon Feb 14 20:37:43 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Feb 2022 21:37:43 +0100 Subject: [Buildroot] [git commit] package/python-regex: fix license Message-ID: <20220214203507.0043C82BDB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=261bb9a17a21439e9688b07de1b8edf89f8eae31 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master License is Apache-2.0 since bump to version 2021.4.4 in commit d973fac7ca2e7c0c4864e8045e5205764e84c45b and https://github.com/mrabarnett/mrab-regex/commit/b693a1fba731a9aa0dc6ae37b441267d4b7b0419 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-regex/python-regex.hash | 2 ++ package/python-regex/python-regex.mk | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/package/python-regex/python-regex.hash b/package/python-regex/python-regex.hash index 4749cd6167..b0f5bb05da 100644 --- a/package/python-regex/python-regex.hash +++ b/package/python-regex/python-regex.hash @@ -1,3 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/regex/json md5 cd206281327b4c087bb20bf93cee4ab9 regex-2021.4.4.tar.gz sha256 52ba3d3f9b942c49d7e4bc105bb28551c44065f139a65062ab7912bef10c9afb regex-2021.4.4.tar.gz +# Locally computed sha256 checksums +sha256 bff55ef4cdcc8c14ce259f8e8ab60e264418440d6335f4dc138273fbd506144d LICENSE.txt diff --git a/package/python-regex/python-regex.mk b/package/python-regex/python-regex.mk index b93607e40f..bb8fdf3e48 100644 --- a/package/python-regex/python-regex.mk +++ b/package/python-regex/python-regex.mk @@ -8,7 +8,8 @@ PYTHON_REGEX_VERSION = 2021.4.4 PYTHON_REGEX_SOURCE = regex-$(PYTHON_REGEX_VERSION).tar.gz PYTHON_REGEX_SITE = https://files.pythonhosted.org/packages/38/3f/4c42a98c9ad7d08c16e7d23b2194a0e4f3b2914662da8bc88986e4e6de1f PYTHON_REGEX_SETUP_TYPE = setuptools -PYTHON_REGEX_LICENSE = CNRI-Python +PYTHON_REGEX_LICENSE = Apache-2.0 +PYTHON_REGEX_LICENSE_FILES = LICENSE.txt $(eval $(python-package)) $(eval $(host-python-package)) From arnout at mind.be Mon Feb 14 20:46:38 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 14 Feb 2022 21:46:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/mongrel2: fix build with gcc 4.8 In-Reply-To: <20220209192048.319559-1-fontaine.fabrice@gmail.com> References: <20220209192048.319559-1-fontaine.fabrice@gmail.com> Message-ID: <234a1e78-f2cc-9ac1-55b9-9817d51acc89@mind.be> On 09/02/2022 20:20, Fabrice Fontaine wrote: > Fix the following build failure raised since bump to version 1.13.0 in > commit b0a7bffad9e041d9920171802621b67903f9389e: > > arm-none-linux-gnueabi-gcc: error: unrecognized command line option '-Wimplicit-fallthrough=0' > > Fixes: > - http://autobuild.buildroot.org/results/de324b733e09057c87352220069fe65f6e535eb8 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > .../0003-fix-build-with-gcc-4.8.patch | 60 +++++++++++++++++++ > 1 file changed, 60 insertions(+) > create mode 100644 package/mongrel2/0003-fix-build-with-gcc-4.8.patch > > diff --git a/package/mongrel2/0003-fix-build-with-gcc-4.8.patch b/package/mongrel2/0003-fix-build-with-gcc-4.8.patch > new file mode 100644 > index 0000000000..eebfce0487 > --- /dev/null > +++ b/package/mongrel2/0003-fix-build-with-gcc-4.8.patch > @@ -0,0 +1,60 @@ > +From cc2dd3995dc9a9e6f0e705e11e791f3f3c7d7326 Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Tue, 18 Jan 2022 22:41:36 +0100 > +Subject: [PATCH] fix build with gcc 4.8 > + > +Drop "-Wno-unused-const-variable -Wimplicit-fallthrough=0" as > +"-Wno-implicit-fallthrough -Wno-unused-const-variable" is already set in > +CFLAGS. This will avoid the following build failure with gcc 4.8 raised > +since version 1.13.0 and > +https://github.com/mongrel2/mongrel2/commit/725209578599bd7784753d86aee34f6441ff78a5: > + > +arm-none-linux-gnueabi-gcc: error: unrecognized command line option '-Wimplicit-fallthrough=0' > + > +Fixes: > + - http://autobuild.buildroot.org/results/de324b733e09057c87352220069fe65f6e535eb8 > + > +Signed-off-by: Fabrice Fontaine > +[Upstream status: https://github.com/mongrel2/mongrel2/pull/354] > +--- > + Makefile | 1 - > + tools/m2sh/Makefile | 4 ++-- > + 2 files changed, 2 insertions(+), 3 deletions(-) > + > +diff --git a/Makefile b/Makefile > +index f6627ed..fb8d028 100644 > +--- a/Makefile > ++++ b/Makefile > +@@ -22,7 +22,6 @@ all: bin/mongrel2 tests m2sh procer > + > + ${OBJECTS_NOEXT}: CFLAGS += ${NOEXTCFLAGS} > + ${OBJECTS}: | builddirs > +-$(RAGEL_OBJECTS): CFLAGS += -Wno-unused-const-variable -Wimplicit-fallthrough=0 > + > + .PHONY: builddirs > + builddirs: > +diff --git a/tools/m2sh/Makefile b/tools/m2sh/Makefile > +index 83e7ae4..86364af 100644 > +--- a/tools/m2sh/Makefile > ++++ b/tools/m2sh/Makefile > +@@ -10,7 +10,7 @@ LIB_SRC=$(filter-out src/m2sh.c,${SOURCES}) > + LIB_OBJ=$(filter-out src/m2sh.o,${OBJECTS}) > + RAGEL_OBJECTS=src/lexer.o src/cli.o > + > +-$(RAGEL_OBJECTS): CFLAGS += -Wno-unused-const-variable -Wimplicit-fallthrough=0 -Wno-unused-parameter > ++$(RAGEL_OBJECTS): CFLAGS += -Wno-unused-parameter > + > + all: ../lemon/lemon tests build/m2sh > + > +@@ -20,7 +20,7 @@ dev: all > + install: build/m2sh > + install build/m2sh ${DESTDIR}${PREFIX}/bin > + > +-src/parser.o: CFLAGS += -Wno-unused-const-variable -Wno-unused-parameter > ++src/parser.o: CFLAGS += -Wno-unused-parameter > + > + build/libm2sh.a: ${LIB_OBJ} > + mkdir -p build > +-- > +2.34.1 > + From arnout at mind.be Mon Feb 14 20:48:54 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 14 Feb 2022 21:48:54 +0100 Subject: [Buildroot] [PATCH v1] package/libv4l: v4l-utils needs C++11 support In-Reply-To: <20220211134906.18280-1-ps.report@gmx.net> References: <20220211134906.18280-1-ps.report@gmx.net> Message-ID: <069d7a4e-63d0-ee43-80b8-222eee4b43e9@mind.be> On 11/02/2022 14:49, Peter Seiderer wrote: > Fixes: > > - http://autobuild.buildroot.net/results/cacd73e08cfb359d608bca807189b7bd3c5c79bd > > v4l2-ctl.cpp:53:2: warning: identifier 'nullptr' is a keyword in C++11 [-Wc++0x-compat] > v4l2-ctl.cpp:53:37: error: 'nullptr' was not declared in this scope > [...] > v4l2-ctl-tuner.cpp: In function 'void parse_freq_seek(char*, v4l2_hw_freq_seek&)': > v4l2-ctl-tuner.cpp:160:10: error: 'constexpr' does not name a type > static constexpr const char *subopts[] = { > ^ > v4l2-ctl-tuner.cpp:160:10: note: C++11 'constexpr' only available with -std=c++11 or -std=gnu++11 > > Signed-off-by: Peter Seiderer > --- > package/libv4l/Config.in | 4 ++++ > package/libv4l/libv4l.mk | 6 ++++-- > 2 files changed, 8 insertions(+), 2 deletions(-) > > diff --git a/package/libv4l/Config.in b/package/libv4l/Config.in > index 57ddde1dfb..c88f280c3b 100644 > --- a/package/libv4l/Config.in > +++ b/package/libv4l/Config.in > @@ -20,6 +20,7 @@ comment "libv4l JPEG support not enabled" > > config BR2_PACKAGE_LIBV4L_UTILS > bool "v4l-utils tools" > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 > help > v4l-utils is a collection of various video4linux and DVB > utilities. > @@ -35,6 +36,9 @@ config BR2_PACKAGE_LIBV4L_UTILS > - rds-ctl > - qv4l2 (if Qt is enabled) > > +comment "v4l-utils tools needs a toolchain w/ C++11" > + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 > + > endif > > comment "libv4l needs a toolchain w/ threads, C++ and headers >= 3.0" > diff --git a/package/libv4l/libv4l.mk b/package/libv4l/libv4l.mk > index 4dc0f15f94..ee5a1f2241 100644 > --- a/package/libv4l/libv4l.mk > +++ b/package/libv4l/libv4l.mk > @@ -59,6 +59,10 @@ ifeq ($(BR2_PACKAGE_LIBV4L_UTILS),y) > LIBV4L_CONF_OPTS += --enable-v4l-utils > LIBV4L_DEPENDENCIES += $(TARGET_NLS_DEPENDENCIES) > > +# v4l2-ctl needs c++11, qt5 needs c++11 (since qt-5.7)/use gnu++11 for > +# typeof support This no longer makes sense. The "use gnu++11" part is there because libv4l uses 'typeof', which is a GNU extension, and -std=c++XX disables GNU extensions. qt5 needs -std=c++11, not -std=gnu++11. Since libv4l itself now requires c++11, the qt5 reference is no longer relevant. So I removed the qt5 part and applied to master, thanks. Regards, Arnout > +LIBV4L_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=gnu++11" > + > # IR BPF decoder support needs toolchain with linux-headers >= 3.18 > # libelf and clang support > LIBV4L_CONF_OPTS += --disable-bpf > @@ -71,8 +75,6 @@ LIBV4L_CONF_ENV += \ > ac_cv_prog_MOC=$(HOST_DIR)/bin/moc \ > ac_cv_prog_RCC=$(HOST_DIR)/bin/rcc \ > ac_cv_prog_UIC=$(HOST_DIR)/bin/uic > -# qt5 needs c++11 (since qt-5.7)/use gnu++11 for typeof support > -LIBV4L_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=gnu++11" > else > LIBV4L_CONF_OPTS += --disable-qv4l2 > endif From arnout at mind.be Mon Feb 14 20:46:13 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Feb 2022 21:46:13 +0100 Subject: [Buildroot] [git commit] package/libv4l: v4l-utils needs C++11 support Message-ID: <20220214204133.20B2582BDB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=184ce3ced3ccb39f43369482292b09730e6ab8e2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: - http://autobuild.buildroot.net/results/cacd73e08cfb359d608bca807189b7bd3c5c79bd v4l2-ctl.cpp:53:2: warning: identifier 'nullptr' is a keyword in C++11 [-Wc++0x-compat] v4l2-ctl.cpp:53:37: error: 'nullptr' was not declared in this scope [...] v4l2-ctl-tuner.cpp: In function 'void parse_freq_seek(char*, v4l2_hw_freq_seek&)': v4l2-ctl-tuner.cpp:160:10: error: 'constexpr' does not name a type static constexpr const char *subopts[] = { ^ v4l2-ctl-tuner.cpp:160:10: note: C++11 'constexpr' only available with -std=c++11 or -std=gnu++11 Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libv4l/Config.in | 4 ++++ package/libv4l/libv4l.mk | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/package/libv4l/Config.in b/package/libv4l/Config.in index 57ddde1dfb..c88f280c3b 100644 --- a/package/libv4l/Config.in +++ b/package/libv4l/Config.in @@ -20,6 +20,7 @@ comment "libv4l JPEG support not enabled" config BR2_PACKAGE_LIBV4L_UTILS bool "v4l-utils tools" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 help v4l-utils is a collection of various video4linux and DVB utilities. @@ -35,6 +36,9 @@ config BR2_PACKAGE_LIBV4L_UTILS - rds-ctl - qv4l2 (if Qt is enabled) +comment "v4l-utils tools needs a toolchain w/ C++11" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + endif comment "libv4l needs a toolchain w/ threads, C++ and headers >= 3.0" diff --git a/package/libv4l/libv4l.mk b/package/libv4l/libv4l.mk index 4dc0f15f94..8300f5c970 100644 --- a/package/libv4l/libv4l.mk +++ b/package/libv4l/libv4l.mk @@ -59,6 +59,9 @@ ifeq ($(BR2_PACKAGE_LIBV4L_UTILS),y) LIBV4L_CONF_OPTS += --enable-v4l-utils LIBV4L_DEPENDENCIES += $(TARGET_NLS_DEPENDENCIES) +# v4l2-ctl needs c++11, use gnu++11 for typeof support +LIBV4L_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=gnu++11" + # IR BPF decoder support needs toolchain with linux-headers >= 3.18 # libelf and clang support LIBV4L_CONF_OPTS += --disable-bpf @@ -71,8 +74,6 @@ LIBV4L_CONF_ENV += \ ac_cv_prog_MOC=$(HOST_DIR)/bin/moc \ ac_cv_prog_RCC=$(HOST_DIR)/bin/rcc \ ac_cv_prog_UIC=$(HOST_DIR)/bin/uic -# qt5 needs c++11 (since qt-5.7)/use gnu++11 for typeof support -LIBV4L_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=gnu++11" else LIBV4L_CONF_OPTS += --disable-qv4l2 endif From arnout at mind.be Mon Feb 14 20:43:11 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Feb 2022 21:43:11 +0100 Subject: [Buildroot] [git commit] package/mongrel2: fix build with gcc 4.8 Message-ID: <20220214204133.1403582AD1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a738ecbce4979db46bcb8b960531f573e08c0e32 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since bump to version 1.13.0 in commit b0a7bffad9e041d9920171802621b67903f9389e: arm-none-linux-gnueabi-gcc: error: unrecognized command line option '-Wimplicit-fallthrough=0' Fixes: - http://autobuild.buildroot.org/results/de324b733e09057c87352220069fe65f6e535eb8 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/mongrel2/0003-fix-build-with-gcc-4.8.patch | 60 ++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/package/mongrel2/0003-fix-build-with-gcc-4.8.patch b/package/mongrel2/0003-fix-build-with-gcc-4.8.patch new file mode 100644 index 0000000000..eebfce0487 --- /dev/null +++ b/package/mongrel2/0003-fix-build-with-gcc-4.8.patch @@ -0,0 +1,60 @@ +From cc2dd3995dc9a9e6f0e705e11e791f3f3c7d7326 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 18 Jan 2022 22:41:36 +0100 +Subject: [PATCH] fix build with gcc 4.8 + +Drop "-Wno-unused-const-variable -Wimplicit-fallthrough=0" as +"-Wno-implicit-fallthrough -Wno-unused-const-variable" is already set in +CFLAGS. This will avoid the following build failure with gcc 4.8 raised +since version 1.13.0 and +https://github.com/mongrel2/mongrel2/commit/725209578599bd7784753d86aee34f6441ff78a5: + +arm-none-linux-gnueabi-gcc: error: unrecognized command line option '-Wimplicit-fallthrough=0' + +Fixes: + - http://autobuild.buildroot.org/results/de324b733e09057c87352220069fe65f6e535eb8 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/mongrel2/mongrel2/pull/354] +--- + Makefile | 1 - + tools/m2sh/Makefile | 4 ++-- + 2 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index f6627ed..fb8d028 100644 +--- a/Makefile ++++ b/Makefile +@@ -22,7 +22,6 @@ all: bin/mongrel2 tests m2sh procer + + ${OBJECTS_NOEXT}: CFLAGS += ${NOEXTCFLAGS} + ${OBJECTS}: | builddirs +-$(RAGEL_OBJECTS): CFLAGS += -Wno-unused-const-variable -Wimplicit-fallthrough=0 + + .PHONY: builddirs + builddirs: +diff --git a/tools/m2sh/Makefile b/tools/m2sh/Makefile +index 83e7ae4..86364af 100644 +--- a/tools/m2sh/Makefile ++++ b/tools/m2sh/Makefile +@@ -10,7 +10,7 @@ LIB_SRC=$(filter-out src/m2sh.c,${SOURCES}) + LIB_OBJ=$(filter-out src/m2sh.o,${OBJECTS}) + RAGEL_OBJECTS=src/lexer.o src/cli.o + +-$(RAGEL_OBJECTS): CFLAGS += -Wno-unused-const-variable -Wimplicit-fallthrough=0 -Wno-unused-parameter ++$(RAGEL_OBJECTS): CFLAGS += -Wno-unused-parameter + + all: ../lemon/lemon tests build/m2sh + +@@ -20,7 +20,7 @@ dev: all + install: build/m2sh + install build/m2sh ${DESTDIR}${PREFIX}/bin + +-src/parser.o: CFLAGS += -Wno-unused-const-variable -Wno-unused-parameter ++src/parser.o: CFLAGS += -Wno-unused-parameter + + build/libm2sh.a: ${LIB_OBJ} + mkdir -p build +-- +2.34.1 + From fontaine.fabrice at gmail.com Mon Feb 14 20:53:38 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 14 Feb 2022 21:53:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/ghostscript: add tesseract-ocr optional dependency Message-ID: <20220214205338.4142074-1-fontaine.fabrice@gmail.com> tesseract-ocr is an optional dependency which is enabled by default since version 9.53.0 and https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=7322ef87546c55b29056c1d96d8bdbb7f3ba53ef Since version 9.55.0 and https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=5459f7aca1ded3b7cf96c339a2419f418aa406c7, ghostscript expects that tesseract-ocr is disabled if threads are not available resulting in the following build failure since commit 7a4944569ce83b0b7b0cabd6e8aa184b8cb72a22: configure: error: Threading disabled or not available. Tesseract OCR relies on threading. Rerun configure with "--without-tesseract" to exclude OCR from the build Fixes: - http://autobuild.buildroot.org/results/fd35a47b2a77cf57c243ec1c88802b53ddca8f52 Signed-off-by: Fabrice Fontaine --- package/ghostscript/ghostscript.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/ghostscript/ghostscript.mk b/package/ghostscript/ghostscript.mk index 24a0c489a8..e869e804ce 100644 --- a/package/ghostscript/ghostscript.mk +++ b/package/ghostscript/ghostscript.mk @@ -76,6 +76,13 @@ else GHOSTSCRIPT_CONF_OPTS += --disable-cups endif +ifeq ($(BR2_PACKAGE_TESSERACT_OCR),y) +GHOSTSCRIPT_DEPENDENCIES += tesseract-ocr +GHOSTSCRIPT_CONF_OPTS += --with-tesseract +else +GHOSTSCRIPT_CONF_OPTS += --without-tesseract +endif + ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y) GHOSTSCRIPT_DEPENDENCIES += xlib_libX11 GHOSTSCRIPT_CONF_OPTS += --with-x -- 2.34.1 From arnout at mind.be Mon Feb 14 20:56:52 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 14 Feb 2022 21:56:52 +0100 Subject: [Buildroot] [PATCH] configs/roc_pc_rk3399_defconfig: expand rootfs size to 120M In-Reply-To: <20220202171035.1740791-2-giulio.benetti@benettiengineering.com> References: <20220202171035.1740791-1-giulio.benetti@benettiengineering.com> <20220202171035.1740791-2-giulio.benetti@benettiengineering.com> Message-ID: On 02/02/2022 18:10, Giulio Benetti wrote: > Default 60M for rootfs are not enough and generate a build failure, so > let's expand rootfs size to 120M. > > Signed-off-by: Giulio Benetti > --- > configs/roc_pc_rk3399_defconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/configs/roc_pc_rk3399_defconfig b/configs/roc_pc_rk3399_defconfig > index dfbc5e4f47..ae7cf19a80 100644 > --- a/configs/roc_pc_rk3399_defconfig > +++ b/configs/roc_pc_rk3399_defconfig > @@ -45,7 +45,7 @@ BR2_TARGET_GENERIC_HOSTNAME="roc-rk3399-pc" > BR2_TARGET_GENERIC_ISSUE="Welcome to ROC-RK3399-PC!" > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > -BR2_TARGET_ROOTFS_EXT2_SIZE="64M" > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" Even though I proposed to move the default to 120M, that's for next anyway, and this defconfig should be fixed on master, so applied to master, thanks. Regards, Arnout > BR2_PACKAGE_HOST_DOSFSTOOLS=y > BR2_PACKAGE_HOST_GENIMAGE=y > BR2_PACKAGE_HOST_MTOOLS=y From arnout at mind.be Mon Feb 14 20:57:10 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Feb 2022 21:57:10 +0100 Subject: [Buildroot] [git commit] configs/roc_pc_rk3399_defconfig: expand rootfs size to 120M Message-ID: <20220214205051.930AD8179A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5194113331b04c5fee1a773e1751b40bff6fdd18 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Default 60M for rootfs are not enough and generate a build failure, so let's expand rootfs size to 120M. Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- configs/roc_pc_rk3399_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/roc_pc_rk3399_defconfig b/configs/roc_pc_rk3399_defconfig index dfbc5e4f47..ae7cf19a80 100644 --- a/configs/roc_pc_rk3399_defconfig +++ b/configs/roc_pc_rk3399_defconfig @@ -45,7 +45,7 @@ BR2_TARGET_GENERIC_HOSTNAME="roc-rk3399-pc" BR2_TARGET_GENERIC_ISSUE="Welcome to ROC-RK3399-PC!" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="64M" +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y From arnout at mind.be Mon Feb 14 21:01:36 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Feb 2022 22:01:36 +0100 Subject: [Buildroot] [git commit] package/binutils: fixes glibc build compiled with -Os on x86 Message-ID: <20220214205821.A320A82A4E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=91f241b8e967d114076cd4e5533213b8f2fb27ce branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master See here: https://sourceware.org/bugzilla/show_bug.cgi?id=28870 Signed-off-by: Waldemar Brodkorb Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...low-GOT32-relocations-against-ABS-symbols.patch | 46 +++++++++++++++++++ ...low-GOT32-relocations-against-ABS-symbols.patch | 53 ++++++++++++++++++++++ ...low-GOT32-relocations-against-ABS-symbols.patch | 47 +++++++++++++++++++ 3 files changed, 146 insertions(+) diff --git a/package/binutils/2.35.2/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch b/package/binutils/2.35.2/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch new file mode 100644 index 0000000000..e95eb1e7c5 --- /dev/null +++ b/package/binutils/2.35.2/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch @@ -0,0 +1,46 @@ +From 30a954525f4e53a9cd50a1a8a6f201c7cf6595c7 Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" +Date: Mon, 7 Feb 2022 15:22:19 -0800 +Subject: [PATCH] i386: Allow GOT32 relocations against ABS symbols + +GOT32 relocations are allowed since absolute value + addend is stored in +the GOT slot. + +Tested on glibc 2.35 build with GCC 11.2 and -Os. + +bfd/ + + PR ld/28870 + * elfxx-x86.c (_bfd_elf_x86_valid_reloc_p): Also allow GOT32 + relocations. + +Signed-off-by: Waldemar Brodkorb + +diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c +index 7ac2411fc80..d00dc45677b 100644 +--- a/bfd/elfxx-x86.c ++++ b/bfd/elfxx-x86.c +@@ -1942,9 +1942,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section, + irel = *rel; + + /* Only allow relocations against absolute symbol, which can be +- resolved as absolute value + addend. GOTPCREL relocations +- are allowed since absolute value + addend is stored in the +- GOT slot. */ ++ resolved as absolute value + addend. GOTPCREL and GOT32 ++ relocations are allowed since absolute value + addend is ++ stored in the GOT slot. */ + if (bed->target_id == X86_64_ELF_DATA) + { + r_type &= ~R_X86_64_converted_reloc_bit; +@@ -1965,7 +1965,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section, + else + valid_p = (r_type == R_386_32 + || r_type == R_386_16 +- || r_type == R_386_8); ++ || r_type == R_386_8 ++ || r_type == R_386_GOT32 ++ || r_type == R_386_GOT32X); + + if (valid_p) + *no_dynreloc_p = true; diff --git a/package/binutils/2.36.1/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch b/package/binutils/2.36.1/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch new file mode 100644 index 0000000000..af96f1a0f0 --- /dev/null +++ b/package/binutils/2.36.1/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch @@ -0,0 +1,53 @@ +From 30a954525f4e53a9cd50a1a8a6f201c7cf6595c7 Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" +Date: Mon, 7 Feb 2022 15:22:19 -0800 +Subject: [PATCH] i386: Allow GOT32 relocations against ABS symbols + +GOT32 relocations are allowed since absolute value + addend is stored in +the GOT slot. + +Tested on glibc 2.35 build with GCC 11.2 and -Os. + +bfd/ + + PR ld/28870 + * elfxx-x86.c (_bfd_elf_x86_valid_reloc_p): Also allow GOT32 + relocations. + +ld/ + + PR ld/28870 + * testsuite/ld-i386/i386.exp: Run pr28870. + * testsuite/ld-i386/pr28870.d: New file. + * testsuite/ld-i386/pr28870.s: Likewise. + +Signed-off-by: Waldemar Brodkorb + +diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c +index 7ac2411fc80..d00dc45677b 100644 +--- a/bfd/elfxx-x86.c ++++ b/bfd/elfxx-x86.c +@@ -1942,9 +1942,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section, + irel = *rel; + + /* Only allow relocations against absolute symbol, which can be +- resolved as absolute value + addend. GOTPCREL relocations +- are allowed since absolute value + addend is stored in the +- GOT slot. */ ++ resolved as absolute value + addend. GOTPCREL and GOT32 ++ relocations are allowed since absolute value + addend is ++ stored in the GOT slot. */ + if (bed->target_id == X86_64_ELF_DATA) + { + r_type &= ~R_X86_64_converted_reloc_bit; +@@ -1965,7 +1965,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section, + else + valid_p = (r_type == R_386_32 + || r_type == R_386_16 +- || r_type == R_386_8); ++ || r_type == R_386_8 ++ || r_type == R_386_GOT32 ++ || r_type == R_386_GOT32X); + + if (valid_p) + *no_dynreloc_p = true; diff --git a/package/binutils/2.37/0007-i386-Allow-GOT32-relocations-against-ABS-symbols.patch b/package/binutils/2.37/0007-i386-Allow-GOT32-relocations-against-ABS-symbols.patch new file mode 100644 index 0000000000..3e29282261 --- /dev/null +++ b/package/binutils/2.37/0007-i386-Allow-GOT32-relocations-against-ABS-symbols.patch @@ -0,0 +1,47 @@ +From 30a954525f4e53a9cd50a1a8a6f201c7cf6595c7 Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" +Date: Mon, 7 Feb 2022 15:22:19 -0800 +Subject: [PATCH] i386: Allow GOT32 relocations against ABS symbols + +GOT32 relocations are allowed since absolute value + addend is stored in +the GOT slot. + +Tested on glibc 2.35 build with GCC 11.2 and -Os. + +bfd/ + + PR ld/28870 + * elfxx-x86.c (_bfd_elf_x86_valid_reloc_p): Also allow GOT32 + relocations. + + +Signed-off-by: Waldemar Brodkorb + +diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c +index 7ac2411fc80..d00dc45677b 100644 +--- a/bfd/elfxx-x86.c ++++ b/bfd/elfxx-x86.c +@@ -1942,9 +1942,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section, + irel = *rel; + + /* Only allow relocations against absolute symbol, which can be +- resolved as absolute value + addend. GOTPCREL relocations +- are allowed since absolute value + addend is stored in the +- GOT slot. */ ++ resolved as absolute value + addend. GOTPCREL and GOT32 ++ relocations are allowed since absolute value + addend is ++ stored in the GOT slot. */ + if (bed->target_id == X86_64_ELF_DATA) + { + r_type &= ~R_X86_64_converted_reloc_bit; +@@ -1965,7 +1965,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section, + else + valid_p = (r_type == R_386_32 + || r_type == R_386_16 +- || r_type == R_386_8); ++ || r_type == R_386_8 ++ || r_type == R_386_GOT32 ++ || r_type == R_386_GOT32X); + + if (valid_p) + *no_dynreloc_p = true; From arnout at mind.be Mon Feb 14 21:06:46 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 14 Feb 2022 22:06:46 +0100 Subject: [Buildroot] [PATCH 1/2] package/binutils: fixes glibc build compiled with -Os on x86 In-Reply-To: References: Message-ID: On 11/02/2022 19:06, Waldemar Brodkorb wrote: > See here: > https://sourceware.org/bugzilla/show_bug.cgi?id=28870 > > Signed-off-by: Waldemar Brodkorb Applied to master, thanks. Regards, Arnout > --- > ...OT32-relocations-against-ABS-symbols.patch | 46 ++++++++++++++++ > ...OT32-relocations-against-ABS-symbols.patch | 53 +++++++++++++++++++ > ...OT32-relocations-against-ABS-symbols.patch | 47 ++++++++++++++++ > 3 files changed, 146 insertions(+) > create mode 100644 package/binutils/2.35.2/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch > create mode 100644 package/binutils/2.36.1/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch > create mode 100644 package/binutils/2.37/0007-i386-Allow-GOT32-relocations-against-ABS-symbols.patch > > diff --git a/package/binutils/2.35.2/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch b/package/binutils/2.35.2/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch > new file mode 100644 > index 0000000000..e95eb1e7c5 > --- /dev/null > +++ b/package/binutils/2.35.2/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch > @@ -0,0 +1,46 @@ > +From 30a954525f4e53a9cd50a1a8a6f201c7cf6595c7 Mon Sep 17 00:00:00 2001 > +From: "H.J. Lu" > +Date: Mon, 7 Feb 2022 15:22:19 -0800 > +Subject: [PATCH] i386: Allow GOT32 relocations against ABS symbols > + > +GOT32 relocations are allowed since absolute value + addend is stored in > +the GOT slot. > + > +Tested on glibc 2.35 build with GCC 11.2 and -Os. > + > +bfd/ > + > + PR ld/28870 > + * elfxx-x86.c (_bfd_elf_x86_valid_reloc_p): Also allow GOT32 > + relocations. > + > +Signed-off-by: Waldemar Brodkorb > + > +diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c > +index 7ac2411fc80..d00dc45677b 100644 > +--- a/bfd/elfxx-x86.c > ++++ b/bfd/elfxx-x86.c > +@@ -1942,9 +1942,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section, > + irel = *rel; > + > + /* Only allow relocations against absolute symbol, which can be > +- resolved as absolute value + addend. GOTPCREL relocations > +- are allowed since absolute value + addend is stored in the > +- GOT slot. */ > ++ resolved as absolute value + addend. GOTPCREL and GOT32 > ++ relocations are allowed since absolute value + addend is > ++ stored in the GOT slot. */ > + if (bed->target_id == X86_64_ELF_DATA) > + { > + r_type &= ~R_X86_64_converted_reloc_bit; > +@@ -1965,7 +1965,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section, > + else > + valid_p = (r_type == R_386_32 > + || r_type == R_386_16 > +- || r_type == R_386_8); > ++ || r_type == R_386_8 > ++ || r_type == R_386_GOT32 > ++ || r_type == R_386_GOT32X); > + > + if (valid_p) > + *no_dynreloc_p = true; > diff --git a/package/binutils/2.36.1/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch b/package/binutils/2.36.1/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch > new file mode 100644 > index 0000000000..af96f1a0f0 > --- /dev/null > +++ b/package/binutils/2.36.1/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch > @@ -0,0 +1,53 @@ > +From 30a954525f4e53a9cd50a1a8a6f201c7cf6595c7 Mon Sep 17 00:00:00 2001 > +From: "H.J. Lu" > +Date: Mon, 7 Feb 2022 15:22:19 -0800 > +Subject: [PATCH] i386: Allow GOT32 relocations against ABS symbols > + > +GOT32 relocations are allowed since absolute value + addend is stored in > +the GOT slot. > + > +Tested on glibc 2.35 build with GCC 11.2 and -Os. > + > +bfd/ > + > + PR ld/28870 > + * elfxx-x86.c (_bfd_elf_x86_valid_reloc_p): Also allow GOT32 > + relocations. > + > +ld/ > + > + PR ld/28870 > + * testsuite/ld-i386/i386.exp: Run pr28870. > + * testsuite/ld-i386/pr28870.d: New file. > + * testsuite/ld-i386/pr28870.s: Likewise. > + > +Signed-off-by: Waldemar Brodkorb > + > +diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c > +index 7ac2411fc80..d00dc45677b 100644 > +--- a/bfd/elfxx-x86.c > ++++ b/bfd/elfxx-x86.c > +@@ -1942,9 +1942,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section, > + irel = *rel; > + > + /* Only allow relocations against absolute symbol, which can be > +- resolved as absolute value + addend. GOTPCREL relocations > +- are allowed since absolute value + addend is stored in the > +- GOT slot. */ > ++ resolved as absolute value + addend. GOTPCREL and GOT32 > ++ relocations are allowed since absolute value + addend is > ++ stored in the GOT slot. */ > + if (bed->target_id == X86_64_ELF_DATA) > + { > + r_type &= ~R_X86_64_converted_reloc_bit; > +@@ -1965,7 +1965,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section, > + else > + valid_p = (r_type == R_386_32 > + || r_type == R_386_16 > +- || r_type == R_386_8); > ++ || r_type == R_386_8 > ++ || r_type == R_386_GOT32 > ++ || r_type == R_386_GOT32X); > + > + if (valid_p) > + *no_dynreloc_p = true; > diff --git a/package/binutils/2.37/0007-i386-Allow-GOT32-relocations-against-ABS-symbols.patch b/package/binutils/2.37/0007-i386-Allow-GOT32-relocations-against-ABS-symbols.patch > new file mode 100644 > index 0000000000..3e29282261 > --- /dev/null > +++ b/package/binutils/2.37/0007-i386-Allow-GOT32-relocations-against-ABS-symbols.patch > @@ -0,0 +1,47 @@ > +From 30a954525f4e53a9cd50a1a8a6f201c7cf6595c7 Mon Sep 17 00:00:00 2001 > +From: "H.J. Lu" > +Date: Mon, 7 Feb 2022 15:22:19 -0800 > +Subject: [PATCH] i386: Allow GOT32 relocations against ABS symbols > + > +GOT32 relocations are allowed since absolute value + addend is stored in > +the GOT slot. > + > +Tested on glibc 2.35 build with GCC 11.2 and -Os. > + > +bfd/ > + > + PR ld/28870 > + * elfxx-x86.c (_bfd_elf_x86_valid_reloc_p): Also allow GOT32 > + relocations. > + > + > +Signed-off-by: Waldemar Brodkorb > + > +diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c > +index 7ac2411fc80..d00dc45677b 100644 > +--- a/bfd/elfxx-x86.c > ++++ b/bfd/elfxx-x86.c > +@@ -1942,9 +1942,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section, > + irel = *rel; > + > + /* Only allow relocations against absolute symbol, which can be > +- resolved as absolute value + addend. GOTPCREL relocations > +- are allowed since absolute value + addend is stored in the > +- GOT slot. */ > ++ resolved as absolute value + addend. GOTPCREL and GOT32 > ++ relocations are allowed since absolute value + addend is > ++ stored in the GOT slot. */ > + if (bed->target_id == X86_64_ELF_DATA) > + { > + r_type &= ~R_X86_64_converted_reloc_bit; > +@@ -1965,7 +1965,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section, > + else > + valid_p = (r_type == R_386_32 > + || r_type == R_386_16 > +- || r_type == R_386_8); > ++ || r_type == R_386_8 > ++ || r_type == R_386_GOT32 > ++ || r_type == R_386_GOT32X); > + > + if (valid_p) > + *no_dynreloc_p = true; From ps.report at gmx.net Mon Feb 14 21:10:50 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Mon, 14 Feb 2022 22:10:50 +0100 Subject: [Buildroot] [PATCH v1 1/2] package/ell: bump version to 0.48 Message-ID: <20220214211051.22421-1-ps.report@gmx.net> - Changelog (since 0.47, from [1]): ver 0.48: Fix issue with memory leaking from ICMPv6 RA. [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 cd724eae2d..4bde1ab677 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 4901a0baac4eb24163ceafb44fd448430361d25d8f17d89ff29f8b0b162b3eb9 ell-0.47.tar.xz +sha256 9894943042a5d6165d3e5cc354f92274fb1304004d02b4bee682ab6067cdbbd5 ell-0.48.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/ell/ell.mk b/package/ell/ell.mk index 3ce64b6f2f..267b44e5f0 100644 --- a/package/ell/ell.mk +++ b/package/ell/ell.mk @@ -4,7 +4,7 @@ # ################################################################################ -ELL_VERSION = 0.47 +ELL_VERSION = 0.48 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 Feb 14 21:10:51 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Mon, 14 Feb 2022 22:10:51 +0100 Subject: [Buildroot] [PATCH v1 2/2] package/iwd: bump version to 1.24 In-Reply-To: <20220214211051.22421-1-ps.report@gmx.net> References: <20220214211051.22421-1-ps.report@gmx.net> Message-ID: <20220214211051.22421-2-ps.report@gmx.net> - remove 001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch (upstream applied [1]) - Changelog (since 1.21, from [2]): ver 1.24: Fix issue with handshake and missing rekeying support. Fix issue with BSS ranking and zero signal strength. Fix issue with setting OWE IE length correctly. ver 1.23: Fix issue with handling handshake offloading. Fix issue with at_console and D-Bus policy. ver 1.22: Fix issue with handling periodic scanning. Fix issue with handling scanning completion. Fix issue with handling scanning for OWE auto-connect. Add support for additional DPP features. [1] https://git.kernel.org/pub/scm/network/wireless/iwd.git/commit/?id=6ce41f621154eff0145dab41308bc145c0440f16 [2] https://git.kernel.org/pub/scm/network/wireless/iwd.git/tree/ChangeLog Signed-off-by: Peter Seiderer --- ...-declaration-of-function-explicit_bz.patch | 41 ------------------- package/iwd/iwd.hash | 2 +- package/iwd/iwd.mk | 2 +- 3 files changed, 2 insertions(+), 43 deletions(-) delete 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 deleted file mode 100644 index 3e808deb88..0000000000 --- a/package/iwd/0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 6ce41f621154eff0145dab41308bc145c0440f16 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Mon, 10 Jan 2022 22:32:18 +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); - | ^~~~~~~~~~~~~~ - -[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 8e34d2983f..1a58ec88e8 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 bac891df91c605271e91b73cf0015e1ba86ff784347e53fc67601366859b3851 iwd-1.21.tar.xz +sha256 61b5e48380cd3a6d0529f725eb6974157f1410af165f5d266b87add0bf395224 iwd-1.24.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/iwd/iwd.mk b/package/iwd/iwd.mk index a70da86ecc..548b508edb 100644 --- a/package/iwd/iwd.mk +++ b/package/iwd/iwd.mk @@ -4,7 +4,7 @@ # ################################################################################ -IWD_VERSION = 1.21 +IWD_VERSION = 1.24 IWD_SOURCE = iwd-$(IWD_VERSION).tar.xz IWD_SITE = $(BR2_KERNEL_MIRROR)/linux/network/wireless IWD_LICENSE = LGPL-2.1+ -- 2.34.1 From arnout at mind.be Mon Feb 14 21:16:19 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 14 Feb 2022 22:16:19 +0100 Subject: [Buildroot] [PATCH 2/2] package/{glibc, localedef}: update to 2.35 In-Reply-To: References: Message-ID: <1b0d866f-fc09-f23d-3fae-068858ab5304@mind.be> On 11/02/2022 19:08, Waldemar Brodkorb wrote: > https://sourceware.org/pipermail/libc-alpha/2022-February/136040.html > > - allow to use optimization CFLAGS (not CPPFLAGS) which are nowadays > supported by upstream (except nios2) > - enable support for or1k, which is now included upstream > - runtime tested with qemu-system for aarch64/arm/microblaze/mips/mips64/nios2/ > or1k/powerpc/powerpc64/powerpc64le/riscv32/riscv64/s390x/sh4/sparc64/x86/x86_64 > > Signed-off-by: Waldemar Brodkorb > --- > ...v-linux-microblaze-pselect32.c-add-m.patch | 85 ------------------- > .../glibc.hash | 2 +- > package/glibc/glibc.mk | 16 ++-- > ...ACK-only-build-and-install-localedef.patch | 0 > ...y-on-GCC-to-4.8-and-binutils-to-2.24.patch | 0 > .../localedef.hash | 2 +- > package/localedef/localedef.mk | 2 +- > toolchain/toolchain-buildroot/Config.in | 3 +- > 8 files changed, 15 insertions(+), 95 deletions(-) > delete mode 100644 package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch > rename package/glibc/{2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c => 2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586}/glibc.hash (70%) > rename package/localedef/{2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c => 2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586}/0001-HACK-only-build-and-install-localedef.patch (100%) > rename package/localedef/{2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c => 2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586}/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch (100%) > rename package/localedef/{2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c => 2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586}/localedef.hash (70%) with the removal of the csky fork in commit ebc6c7e, there's no longer a need to version the patches, so perhaps you could take this opportunity to move them out of the directory. [snip] > diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk > index 2702994c6b..f258f33c96 100644 > --- a/package/glibc/glibc.mk > +++ b/package/glibc/glibc.mk > @@ -7,7 +7,7 @@ > # Generate version string using: > # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- > # When updating the version, please also update localedef > -GLIBC_VERSION = 2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c > +GLIBC_VERSION = 2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586 > # Upstream doesn't officially provide an https download link. > # There is one (https://sourceware.org/git/glibc.git) but it's not reliable, > # sometimes the connection times out. So use an unofficial github mirror. > @@ -110,16 +110,20 @@ endif > # > # 2. We have to execute the configure script with bash and not sh. > # > -# Note that as mentionned in > -# http://patches.openembedded.org/patch/38849/, glibc must be > -# built with -O2, so we pass our own CFLAGS and CXXFLAGS below. > +# Glibc nowadays can be build with optimization flags f.e. -Os > + > +# crash in qemu-system-nios2 with -Os > +ifeq ($(BR2_nios2),y) > +TARGET_FCFLAGS := -O2 You're overriding the global TARGET_FCFLAGS here, that's not allowed. Instead, you should use GLIBC_CFLAGS = $(TARGET_CFLAGS) # crash in qemu-system-nios2 with -Os ifeq ($(BR2_nios2),y) GLIBC_CFLAGS += -O2 endif (I'm not sure if += is OK here, if not, just use =) And to make the below simpler, you can use GLIBC_CFLAGS += $(GLIBC_EXTRA_CFLAGS) Alternatively, if += is OK for nios, you can use ifeq ($(BR2_nios2),y) GLIBC_EXTRA_CFLAGS += -O2 endif ... CFLAGS="$(TARGET_CFLAGS) $(GLIBC_EXTRA_CFLAGS)" \ > +endif > + > define GLIBC_CONFIGURE_CMDS > mkdir -p $(@D)/build > # Do the configuration > (cd $(@D)/build; \ > $(TARGET_CONFIGURE_OPTS) \ > - CFLAGS="-O2 $(GLIBC_EXTRA_CFLAGS)" CPPFLAGS="" \ > - CXXFLAGS="-O2 $(GLIBC_EXTRA_CFLAGS)" \ > + CFLAGS="$(TARGET_FCFLAGS) $(GLIBC_EXTRA_CFLAGS)" CPPFLAGS="" \ FCFLAGS stands for Fortran Compilation flags. You should use TARGET_CFLAGS here. Why is CPPFLAGS not set? Marked as Changes Requested. Regards, Arnout > + CXXFLAGS="$(TARGET_FCFLAGS) $(GLIBC_EXTRA_CFLAGS)" \ > $(GLIBC_CONF_ENV) \ > $(SHELL) $(@D)/configure \ > --target=$(GNU_TARGET_NAME) \ > diff --git a/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-HACK-only-build-and-install-localedef.patch b/package/localedef/2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586/0001-HACK-only-build-and-install-localedef.patch > similarity index 100% > rename from package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-HACK-only-build-and-install-localedef.patch > rename to package/localedef/2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586/0001-HACK-only-build-and-install-localedef.patch > diff --git a/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch b/package/localedef/2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch > similarity index 100% > rename from package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch > rename to package/localedef/2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch > diff --git a/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/localedef.hash b/package/localedef/2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586/localedef.hash > similarity index 70% > rename from package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/localedef.hash > rename to package/localedef/2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586/localedef.hash > index dfd939020f..f28c15c2a3 100644 > --- a/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/localedef.hash > +++ b/package/localedef/2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586/localedef.hash > @@ -1,5 +1,5 @@ > # Locally calculated (fetched from Github) > -sha256 3c299a21468a80356b848ca341f45551616c4928a6c871e6d45cee942e8b0f24 glibc-2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c.tar.gz > +sha256 0ca43b2a6cd74609519554303a16e350abdac0e66943c5d98d91228233c826a0 glibc-2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586.tar.gz > > # Hashes for license files > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > diff --git a/package/localedef/localedef.mk b/package/localedef/localedef.mk > index f8f0b42984..fb5edde0c2 100644 > --- a/package/localedef/localedef.mk > +++ b/package/localedef/localedef.mk > @@ -7,7 +7,7 @@ > # Use the same VERSION and SITE as target glibc > # As in glibc.mk, generate version string using: > # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- > -LOCALEDEF_VERSION = 2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c > +LOCALEDEF_VERSION = 2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586 > LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION).tar.gz > LOCALEDEF_SITE = $(call github,bminor,glibc,$(LOCALEDEF_VERSION)) > HOST_LOCALEDEF_DL_SUBDIR = glibc > diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in > index 4004c0edf8..437daafa74 100644 > --- a/toolchain/toolchain-buildroot/Config.in > +++ b/toolchain/toolchain-buildroot/Config.in > @@ -49,7 +49,8 @@ config BR2_TOOLCHAIN_BUILDROOT_GLIBC > BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le || \ > BR2_riscv || BR2_s390x || BR2_sh || \ > BR2_sparc64 || BR2_x86_64 || BR2_microblaze || \ > - BR2_nios2 || (BR2_arc && BR2_ARC_ATOMIC_EXT) || BR2_csky > + BR2_nios2 || (BR2_arc && BR2_ARC_ATOMIC_EXT) || \ > + BR2_csky || BR2_or1k > depends on BR2_USE_MMU > depends on !BR2_STATIC_LIBS > depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 From arnout at mind.be Mon Feb 14 21:16:48 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 14 Feb 2022 22:16:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/rng-tools: bump to version 6.15 In-Reply-To: <20220209192436.319769-1-fontaine.fabrice@gmail.com> References: <20220209192436.319769-1-fontaine.fabrice@gmail.com> Message-ID: <285e485d-146e-6199-3eb7-1b1dcaccfdea@mind.be> On 09/02/2022 20:24, Fabrice Fontaine wrote: > Drop patches (already in version) > > https://github.com/nhorman/rng-tools/releases/tag/v6.15 > > Signed-off-by: Fabrice Fontaine Applied to next, thanks. Regards, Arnout > --- > ...ct-non-posix-extensions-for-pthreads.patch | 43 ---------------- > ...-either-pthread-affinity-set-methods.patch | 49 ------------------- > package/rng-tools/rng-tools.hash | 2 +- > package/rng-tools/rng-tools.mk | 2 +- > 4 files changed, 2 insertions(+), 94 deletions(-) > delete mode 100644 package/rng-tools/0001-Adding-ability-to-detect-non-posix-extensions-for-pthreads.patch > delete mode 100644 package/rng-tools/0002-Allow-for-use-of-either-pthread-affinity-set-methods.patch > > 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 > deleted file mode 100644 > index ba6cf63d7c..0000000000 > --- a/package/rng-tools/0001-Adding-ability-to-detect-non-posix-extensions-for-pthreads.patch > +++ /dev/null > @@ -1,43 +0,0 @@ > -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 > deleted file mode 100644 > index 17285baa6a..0000000000 > --- a/package/rng-tools/0002-Allow-for-use-of-either-pthread-affinity-set-methods.patch > +++ /dev/null > @@ -1,49 +0,0 @@ > -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; > - } > diff --git a/package/rng-tools/rng-tools.hash b/package/rng-tools/rng-tools.hash > index 6806a99fc6..be2ee13969 100644 > --- a/package/rng-tools/rng-tools.hash > +++ b/package/rng-tools/rng-tools.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 4dd86f6ae37d917a8489f44070d39d7feddcc622429b95efd7aa85a1f3cfdf81 rng-tools-6.14.tar.gz > +sha256 bff0c58dff90ec10bd61f672e48618e045155eabd60b32d63a9c4ffbdad05f3a rng-tools-6.15.tar.gz > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > diff --git a/package/rng-tools/rng-tools.mk b/package/rng-tools/rng-tools.mk > index 8db97569d4..8b195ea875 100644 > --- a/package/rng-tools/rng-tools.mk > +++ b/package/rng-tools/rng-tools.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -RNG_TOOLS_VERSION = 6.14 > +RNG_TOOLS_VERSION = 6.15 > RNG_TOOLS_SITE = $(call github,nhorman,$(RNG_TOOLS_NAME),v$(RNG_TOOLS_VERSION)) > RNG_TOOLS_LICENSE = GPL-2.0 > RNG_TOOLS_LICENSE_FILES = COPYING From arnout at mind.be Mon Feb 14 21:17:07 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 14 Feb 2022 22:17:07 +0100 Subject: [Buildroot] [PATCHv2] package/poke: bump to version 2.1 In-Reply-To: <20220209002308.137832-1-romain.naour@gmail.com> References: <20220209002308.137832-1-romain.naour@gmail.com> Message-ID: On 09/02/2022 01:23, Romain Naour wrote: > Tested locally with poke testsuite on aarch64 with Qemu: > > === poke Summary === > # of expected passes 6320 > # of unsupported tests 7 > > Build tested with test-pkg: > https://gitlab.com/kubu93/buildroot/-/pipelines/466516470 > > See: > http://www.jemarch.net/poke-2.0-relnotes.html > http://www.jemarch.net/poke-2.1-relnotes.html > > Signed-off-by: Romain Naour Applied to next, thanks. Regards, Arnout > --- > test-pkg config: > BR2_PACKAGE_POKE=y > BR2_PACKAGE_JSON_C=y > > v2: poke 2.0 had a issue with minimal-threading on > several architectures (not only ARM thumb2), this feature > is now disabled by default with poke 2.1. > --- > ...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..c30713b91c 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 cd528e6c1bbc540c3b629c2b4f36b784b30a026b005a38b99283422599442670 poke-2.1.tar.gz > sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING > sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 jitter/COPYING > diff --git a/package/poke/poke.mk b/package/poke/poke.mk > index ddd03ae3b0..2852673548 100644 > --- a/package/poke/poke.mk > +++ b/package/poke/poke.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -POKE_VERSION = 1.4 > +POKE_VERSION = 2.1 > 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) From arnout at mind.be Mon Feb 14 21:17:26 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 14 Feb 2022 22:17:26 +0100 Subject: [Buildroot] [PATCH v1] package/libxkbcommon: bump version to 1.4.0 In-Reply-To: <20220208222024.24167-1-ps.report@gmx.net> References: <20220208222024.24167-1-ps.report@gmx.net> Message-ID: <9d793689-0558-b9b7-e109-593e3723d066@mind.be> On 08/02/2022 23:20, Peter Seiderer wrote: > - bump version to 1.4.0 > > - add new option to select some tools for the target (xkbcli, > xkbcli-compile-keymap, xkbcli-how-to-type, xkbcli-interactive-evdev, > xkbcli-interactive-x11, xkbcli-interactive-wayland > > For details see [1]. > > [1] https://lists.freedesktop.org/archives/wayland-devel/2022-February/042104.html > > Signed-off-by: Peter Seiderer Applied to master, thanks. Regards, Arnout > --- > package/libxkbcommon/Config.in | 11 +++++++++++ > package/libxkbcommon/libxkbcommon.hash | 4 ++-- > package/libxkbcommon/libxkbcommon.mk | 8 +++++++- > 3 files changed, 20 insertions(+), 3 deletions(-) > > diff --git a/package/libxkbcommon/Config.in b/package/libxkbcommon/Config.in > index 4e73a24abb..e9f61227a0 100644 > --- a/package/libxkbcommon/Config.in > +++ b/package/libxkbcommon/Config.in > @@ -7,3 +7,14 @@ config BR2_PACKAGE_LIBXKBCOMMON > specification. > > https://xkbcommon.org > + > +if BR2_PACKAGE_LIBXKBCOMMON > + > +config BR2_PACKAGE_LIBXKBCOMMON_TOOLS > + bool "tools" > + help > + Tools: xkbcli, xkbcli-compile-keymap, xkbcli-how-to-type, > + xkbcli-interactive-evdev, xkbcli-interactive-x11, > + xkbcli-interactive-wayland > + > +endif > diff --git a/package/libxkbcommon/libxkbcommon.hash b/package/libxkbcommon/libxkbcommon.hash > index c00fffe706..fff2b7a943 100644 > --- a/package/libxkbcommon/libxkbcommon.hash > +++ b/package/libxkbcommon/libxkbcommon.hash > @@ -1,5 +1,5 @@ > -# From https://lists.freedesktop.org/archives/wayland-devel/2021-September/041976.html > -sha256 b3c710d27a2630054e1e1399c85b7f330ef03359b460f0c1b3b587fd01fe9234 libxkbcommon-1.3.1.tar.xz > +# From https://lists.freedesktop.org/archives/wayland-devel/2022-February/042104.html > +sha256 106cec5263f9100a7e79b5f7220f889bc78e7d7ffc55d2b6fdb1efefb8024031 libxkbcommon-1.4.0.tar.xz > > # License file: > sha256 086caee279449369d41c1157911ec7696e707b93feba7280de757d3c470b2dfb LICENSE > diff --git a/package/libxkbcommon/libxkbcommon.mk b/package/libxkbcommon/libxkbcommon.mk > index ee2bc1ee99..f2c49cc700 100644 > --- a/package/libxkbcommon/libxkbcommon.mk > +++ b/package/libxkbcommon/libxkbcommon.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBXKBCOMMON_VERSION = 1.3.1 > +LIBXKBCOMMON_VERSION = 1.4.0 > LIBXKBCOMMON_SITE = https://xkbcommon.org/download > LIBXKBCOMMON_SOURCE = libxkbcommon-$(LIBXKBCOMMON_VERSION).tar.xz > LIBXKBCOMMON_LICENSE = MIT/X11 > @@ -23,4 +23,10 @@ else > LIBXKBCOMMON_CONF_OPTS += -Denable-x11=false > endif > > +ifeq ($(BR2_PACKAGE_LIBXKBCOMMON_TOOLS),y) > +LIBXKBCOMMON_CONF_OPTS += -Denable-tools=true > +else > +LIBXKBCOMMON_CONF_OPTS += -Denable-tools=false > +endif > + > $(eval $(meson-package)) From arnout at mind.be Mon Feb 14 21:17:41 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 14 Feb 2022 22:17:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/liquid-dsp: bump version to 1.4.0 In-Reply-To: <20220208121928.28519-1-guillaume.bressaix@gmail.com> References: <20220208121928.28519-1-guillaume.bressaix@gmail.com> Message-ID: <1fbce0dc-9ab5-cb94-bd17-29c18200f20b@mind.be> On 08/02/2022 13:19, Guillaume W. Bres wrote: > Signed-off-by: Guillaume W. Bres Applied to master, thanks. Regards, Arnout > --- > package/liquid-dsp/liquid-dsp.hash | 4 ++-- > package/liquid-dsp/liquid-dsp.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/liquid-dsp/liquid-dsp.hash b/package/liquid-dsp/liquid-dsp.hash > index 31bcd68767..7e5de6b259 100644 > --- a/package/liquid-dsp/liquid-dsp.hash > +++ b/package/liquid-dsp/liquid-dsp.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 85093624ef9cb90ead64c836d2f42690197edace1a86257d6524c4e4dc870483 liquid-dsp-1.3.2.tar.gz > -sha256 4df7126196efba1283deb99e3269418dde4ab0ad1fde80a55051153451eb4df2 LICENSE > +sha256 66f38d509aa8f6207d2035bae5ee081a3d9df0f2cab516bc2118b5b1c6ce3333 liquid-dsp-1.4.0.tar.gz > +sha256 4df7126196efba1283deb99e3269418dde4ab0ad1fde80a55051153451eb4df2 LICENSE > diff --git a/package/liquid-dsp/liquid-dsp.mk b/package/liquid-dsp/liquid-dsp.mk > index 9745893b7c..fcdf572532 100644 > --- a/package/liquid-dsp/liquid-dsp.mk > +++ b/package/liquid-dsp/liquid-dsp.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIQUID_DSP_VERSION = 1.3.2 > +LIQUID_DSP_VERSION = 1.4.0 > LIQUID_DSP_SITE = $(call github,jgaeddert,liquid-dsp,v$(LIQUID_DSP_VERSION)) > LIQUID_DSP_LICENSE = MIT > LIQUID_DSP_LICENSE_FILES = LICENSE From arnout at mind.be Mon Feb 14 21:01:57 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Feb 2022 22:01:57 +0100 Subject: [Buildroot] [git commit branch/next] package/libxkbcommon: bump version to 1.4.0 Message-ID: <20220214211017.1657C82BDB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=948050c0f9096953555ed7f84835c5297a415a6d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - bump version to 1.4.0 - add new option to select some tools for the target (xkbcli, xkbcli-compile-keymap, xkbcli-how-to-type, xkbcli-interactive-evdev, xkbcli-interactive-x11, xkbcli-interactive-wayland For details see [1]. [1] https://lists.freedesktop.org/archives/wayland-devel/2022-February/042104.html Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libxkbcommon/Config.in | 11 +++++++++++ package/libxkbcommon/libxkbcommon.hash | 4 ++-- package/libxkbcommon/libxkbcommon.mk | 8 +++++++- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/package/libxkbcommon/Config.in b/package/libxkbcommon/Config.in index 4e73a24abb..e9f61227a0 100644 --- a/package/libxkbcommon/Config.in +++ b/package/libxkbcommon/Config.in @@ -7,3 +7,14 @@ config BR2_PACKAGE_LIBXKBCOMMON specification. https://xkbcommon.org + +if BR2_PACKAGE_LIBXKBCOMMON + +config BR2_PACKAGE_LIBXKBCOMMON_TOOLS + bool "tools" + help + Tools: xkbcli, xkbcli-compile-keymap, xkbcli-how-to-type, + xkbcli-interactive-evdev, xkbcli-interactive-x11, + xkbcli-interactive-wayland + +endif diff --git a/package/libxkbcommon/libxkbcommon.hash b/package/libxkbcommon/libxkbcommon.hash index c00fffe706..fff2b7a943 100644 --- a/package/libxkbcommon/libxkbcommon.hash +++ b/package/libxkbcommon/libxkbcommon.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2021-September/041976.html -sha256 b3c710d27a2630054e1e1399c85b7f330ef03359b460f0c1b3b587fd01fe9234 libxkbcommon-1.3.1.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2022-February/042104.html +sha256 106cec5263f9100a7e79b5f7220f889bc78e7d7ffc55d2b6fdb1efefb8024031 libxkbcommon-1.4.0.tar.xz # License file: sha256 086caee279449369d41c1157911ec7696e707b93feba7280de757d3c470b2dfb LICENSE diff --git a/package/libxkbcommon/libxkbcommon.mk b/package/libxkbcommon/libxkbcommon.mk index ee2bc1ee99..f2c49cc700 100644 --- a/package/libxkbcommon/libxkbcommon.mk +++ b/package/libxkbcommon/libxkbcommon.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBXKBCOMMON_VERSION = 1.3.1 +LIBXKBCOMMON_VERSION = 1.4.0 LIBXKBCOMMON_SITE = https://xkbcommon.org/download LIBXKBCOMMON_SOURCE = libxkbcommon-$(LIBXKBCOMMON_VERSION).tar.xz LIBXKBCOMMON_LICENSE = MIT/X11 @@ -23,4 +23,10 @@ else LIBXKBCOMMON_CONF_OPTS += -Denable-x11=false endif +ifeq ($(BR2_PACKAGE_LIBXKBCOMMON_TOOLS),y) +LIBXKBCOMMON_CONF_OPTS += -Denable-tools=true +else +LIBXKBCOMMON_CONF_OPTS += -Denable-tools=false +endif + $(eval $(meson-package)) From arnout at mind.be Mon Feb 14 21:01:55 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Feb 2022 22:01:55 +0100 Subject: [Buildroot] [git commit branch/next] package/liquid-dsp: bump version to 1.4.0 Message-ID: <20220214211017.0D35982A50@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2f7f8f381394207bfb029ec395f5ced5695a0a2e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Guillaume W. Bres Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/liquid-dsp/liquid-dsp.hash | 4 ++-- package/liquid-dsp/liquid-dsp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/liquid-dsp/liquid-dsp.hash b/package/liquid-dsp/liquid-dsp.hash index 31bcd68767..7e5de6b259 100644 --- a/package/liquid-dsp/liquid-dsp.hash +++ b/package/liquid-dsp/liquid-dsp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 85093624ef9cb90ead64c836d2f42690197edace1a86257d6524c4e4dc870483 liquid-dsp-1.3.2.tar.gz -sha256 4df7126196efba1283deb99e3269418dde4ab0ad1fde80a55051153451eb4df2 LICENSE +sha256 66f38d509aa8f6207d2035bae5ee081a3d9df0f2cab516bc2118b5b1c6ce3333 liquid-dsp-1.4.0.tar.gz +sha256 4df7126196efba1283deb99e3269418dde4ab0ad1fde80a55051153451eb4df2 LICENSE diff --git a/package/liquid-dsp/liquid-dsp.mk b/package/liquid-dsp/liquid-dsp.mk index 9745893b7c..fcdf572532 100644 --- a/package/liquid-dsp/liquid-dsp.mk +++ b/package/liquid-dsp/liquid-dsp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIQUID_DSP_VERSION = 1.3.2 +LIQUID_DSP_VERSION = 1.4.0 LIQUID_DSP_SITE = $(call github,jgaeddert,liquid-dsp,v$(LIQUID_DSP_VERSION)) LIQUID_DSP_LICENSE = MIT LIQUID_DSP_LICENSE_FILES = LICENSE From arnout at mind.be Mon Feb 14 21:02:03 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Feb 2022 22:02:03 +0100 Subject: [Buildroot] [git commit branch/next] package/rng-tools: bump to version 6.15 Message-ID: <20220214211017.2A18A82A50@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=91cc129d72cf972c906829b1085c96797e41efd0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop patches (already in version) https://github.com/nhorman/rng-tools/releases/tag/v6.15 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...-detect-non-posix-extensions-for-pthreads.patch | 43 ------------------- ...se-of-either-pthread-affinity-set-methods.patch | 49 ---------------------- package/rng-tools/rng-tools.hash | 2 +- package/rng-tools/rng-tools.mk | 2 +- 4 files changed, 2 insertions(+), 94 deletions(-) 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 deleted file mode 100644 index ba6cf63d7c..0000000000 --- a/package/rng-tools/0001-Adding-ability-to-detect-non-posix-extensions-for-pthreads.patch +++ /dev/null @@ -1,43 +0,0 @@ -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 deleted file mode 100644 index 17285baa6a..0000000000 --- a/package/rng-tools/0002-Allow-for-use-of-either-pthread-affinity-set-methods.patch +++ /dev/null @@ -1,49 +0,0 @@ -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; - } diff --git a/package/rng-tools/rng-tools.hash b/package/rng-tools/rng-tools.hash index 6806a99fc6..be2ee13969 100644 --- a/package/rng-tools/rng-tools.hash +++ b/package/rng-tools/rng-tools.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4dd86f6ae37d917a8489f44070d39d7feddcc622429b95efd7aa85a1f3cfdf81 rng-tools-6.14.tar.gz +sha256 bff0c58dff90ec10bd61f672e48618e045155eabd60b32d63a9c4ffbdad05f3a rng-tools-6.15.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/rng-tools/rng-tools.mk b/package/rng-tools/rng-tools.mk index 8db97569d4..8b195ea875 100644 --- a/package/rng-tools/rng-tools.mk +++ b/package/rng-tools/rng-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -RNG_TOOLS_VERSION = 6.14 +RNG_TOOLS_VERSION = 6.15 RNG_TOOLS_SITE = $(call github,nhorman,$(RNG_TOOLS_NAME),v$(RNG_TOOLS_VERSION)) RNG_TOOLS_LICENSE = GPL-2.0 RNG_TOOLS_LICENSE_FILES = COPYING From arnout at mind.be Mon Feb 14 21:02:00 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Feb 2022 22:02:00 +0100 Subject: [Buildroot] [git commit branch/next] package/poke: bump to version 2.1 Message-ID: <20220214211017.204BA82BDC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0fc614345f1b8389df46b8f2d64cb3ae5a209b6d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Tested locally with poke testsuite on aarch64 with Qemu: === poke Summary === # of expected passes 6320 # of unsupported tests 7 Build tested with test-pkg: https://gitlab.com/kubu93/buildroot/-/pipelines/466516470 See: http://www.jemarch.net/poke-2.0-relnotes.html http://www.jemarch.net/poke-2.1-relnotes.html Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...c-HELP2MAN-replace-by-true-when-cross-com.patch | 6 ++--- ...-getrandom.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..c30713b91c 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 cd528e6c1bbc540c3b629c2b4f36b784b30a026b005a38b99283422599442670 poke-2.1.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 jitter/COPYING diff --git a/package/poke/poke.mk b/package/poke/poke.mk index ddd03ae3b0..2852673548 100644 --- a/package/poke/poke.mk +++ b/package/poke/poke.mk @@ -4,7 +4,7 @@ # ################################################################################ -POKE_VERSION = 1.4 +POKE_VERSION = 2.1 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) From judge.packham at gmail.com Mon Feb 14 21:19:26 2022 From: judge.packham at gmail.com (Chris Packham) Date: Tue, 15 Feb 2022 10:19:26 +1300 Subject: [Buildroot] [PATCH 1/2] syslog-ng: Bump version to 3.35.1 Message-ID: <20220214211927.3673441-1-judge.packham@gmail.com> Signed-off-by: Chris Packham --- package/syslog-ng/syslog-ng.conf | 2 +- package/syslog-ng/syslog-ng.hash | 2 +- package/syslog-ng/syslog-ng.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/syslog-ng/syslog-ng.conf b/package/syslog-ng/syslog-ng.conf index 55d01501cb..64ff980593 100644 --- a/package/syslog-ng/syslog-ng.conf +++ b/package/syslog-ng/syslog-ng.conf @@ -1,4 +1,4 @@ - at version: 3.34 + at version: 3.35 source s_sys { file("/proc/kmsg" program_override("kernel")); diff --git a/package/syslog-ng/syslog-ng.hash b/package/syslog-ng/syslog-ng.hash index 99ed363eca..ab643627e8 100644 --- a/package/syslog-ng/syslog-ng.hash +++ b/package/syslog-ng/syslog-ng.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 cece39ec1c68c88d493705e0a528b83d038da384e89d4838393ccc75f62a2d4c syslog-ng-3.34.1.tar.gz +sha256 1d0238b06b3e5987c859e5b529ecee738f75bacff04b149398b1fe8cbb121e53 syslog-ng-3.35.1.tar.gz sha256 e912cf1e1c09b81d61c0154eb6c179588622c31ad07bfb4a90c612d07ff09d9b COPYING sha256 ce3324c9f22299cfc7c281e5a6ab40fbe9c2ea1a67cee87226cb8cd39db1e1d2 GPL.txt sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LGPL.txt diff --git a/package/syslog-ng/syslog-ng.mk b/package/syslog-ng/syslog-ng.mk index c05ec9785c..fc57a56820 100644 --- a/package/syslog-ng/syslog-ng.mk +++ b/package/syslog-ng/syslog-ng.mk @@ -6,7 +6,7 @@ # When updating the version, please check at runtime if the version in # syslog-ng.conf header needs to be updated -SYSLOG_NG_VERSION = 3.34.1 +SYSLOG_NG_VERSION = 3.35.1 SYSLOG_NG_SITE = https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$(SYSLOG_NG_VERSION) SYSLOG_NG_LICENSE = LGPL-2.1+ (syslog-ng core), GPL-2.0+ (modules) SYSLOG_NG_LICENSE_FILES = COPYING GPL.txt LGPL.txt -- 2.35.1 From judge.packham at gmail.com Mon Feb 14 21:19:27 2022 From: judge.packham at gmail.com (Chris Packham) Date: Tue, 15 Feb 2022 10:19:27 +1300 Subject: [Buildroot] [PATCH 2/2] micropython: Bump version to 1.18 In-Reply-To: <20220214211927.3673441-1-judge.packham@gmail.com> References: <20220214211927.3673441-1-judge.packham@gmail.com> Message-ID: <20220214211927.3673441-2-judge.packham@gmail.com> LICENSE hash is update due to change in copyright year. Signed-off-by: Chris Packham --- package/micropython/micropython.hash | 4 ++-- package/micropython/micropython.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/micropython/micropython.hash b/package/micropython/micropython.hash index d5045e8f27..6beea78bc7 100644 --- a/package/micropython/micropython.hash +++ b/package/micropython/micropython.hash @@ -1,3 +1,3 @@ #locally computed -sha256 c21dbf8144237b3dbe3847c9ad5264cd0f3104eb078c810b3986004cce8fcd70 micropython-1.17.tar.gz -sha256 59b1f0947a87c90d0d29dbe2c8deb3d1f8263bbbd2fb5ebcc79a649cff6dfcba LICENSE +sha256 d804a422872c6fe283c6e4fd392698472035b34b5a683ac26adbd5c7582267f9 micropython-1.18.tar.gz +sha256 0f678c2abd7fe2cfca36693630506bbcbdfc219bd04bf4a02fe3b094ae4c666f LICENSE diff --git a/package/micropython/micropython.mk b/package/micropython/micropython.mk index 55c00ba08a..d8ba5ac0c0 100644 --- a/package/micropython/micropython.mk +++ b/package/micropython/micropython.mk @@ -4,7 +4,7 @@ # ################################################################################ -MICROPYTHON_VERSION = 1.17 +MICROPYTHON_VERSION = 1.18 MICROPYTHON_SITE = $(call github,micropython,micropython,v$(MICROPYTHON_VERSION)) # Micropython has a lot of code copied from other projects, and also a number # of submodules for various libs. However, we don't even clone the submodules, -- 2.35.1 From fontaine.fabrice at gmail.com Mon Feb 14 21:23:01 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 14 Feb 2022 22:23:01 +0100 Subject: [Buildroot] [PATCH v2,1/1] package/ghostscript: disable tesseract Message-ID: <20220214212301.4142823-1-fontaine.fabrice@gmail.com> ghostscript embeds a local copy of tesseract-ocr which is enabled by default since version 9.53.0 and https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=7322ef87546c55b29056c1d96d8bdbb7f3ba53ef Since version 9.55.0 and https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=5459f7aca1ded3b7cf96c339a2419f418aa406c7, ghostscript expects that tesseract is disabled if threads are not available resulting in the following build failure since commit 7a4944569ce83b0b7b0cabd6e8aa184b8cb72a22: configure: error: Threading disabled or not available. Tesseract OCR relies on threading. Rerun configure with "--without-tesseract" to exclude OCR from the build So disable tesseract as there is no way to tell ghostscript to use a system provided tesseract-ocr package Fixes: - http://autobuild.buildroot.org/results/fd35a47b2a77cf57c243ec1c88802b53ddca8f52 Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2: - Unconditionally disable tesseract package/ghostscript/ghostscript.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/ghostscript/ghostscript.mk b/package/ghostscript/ghostscript.mk index 24a0c489a8..b2e5fe16bb 100644 --- a/package/ghostscript/ghostscript.mk +++ b/package/ghostscript/ghostscript.mk @@ -44,6 +44,7 @@ GHOSTSCRIPT_CONF_OPTS = \ --disable-gtk \ --without-libpaper \ --without-pdf \ + --without-tesseract \ --with-system-libtiff ifeq ($(BR2_PACKAGE_JBIG2DEC),y) -- 2.34.1 From fontaine.fabrice at gmail.com Mon Feb 14 21:32:26 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 14 Feb 2022 22:32:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5webkit: needs execinfo.h Message-ID: <20220214213226.4143188-1-fontaine.fabrice@gmail.com> qt5webkit needs execinfo.h since bump to version 5.212.0-alpha4 in commit df0b0fe6919c0d0f3750f439a3cfa765232bd569: /tmp/instance-1/output-1/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp:54:10: fatal error: execinfo.h: No such file or directory 54 | #include | ^~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/351529f7d928e28fa2db22c6297dc70d21db562b Signed-off-by: Fabrice Fontaine --- package/qt5/qt5webkit/Config.in | 1 + package/qt5/qt5webkit/qt5webkit.mk | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in index 68b679dfcd..ed87efca95 100644 --- a/package/qt5/qt5webkit/Config.in +++ b/package/qt5/qt5webkit/Config.in @@ -21,6 +21,7 @@ config BR2_PACKAGE_QT5WEBKIT select BR2_PACKAGE_QT5LOCATION select BR2_PACKAGE_QT5SENSORS select BR2_PACKAGE_QT5WEBCHANNEL + select BR2_PACKAGE_LIBEXECINFO if !BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_LIBXSLT select BR2_PACKAGE_SQLITE diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk index 565c57e813..2084f3af52 100644 --- a/package/qt5/qt5webkit/qt5webkit.mk +++ b/package/qt5/qt5webkit/qt5webkit.mk @@ -10,7 +10,8 @@ QT5WEBKIT_SOURCE = qtwebkit-$(QT5WEBKIT_VERSION).tar.xz QT5WEBKIT_DEPENDENCIES = \ 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 + qt5sensors qt5webchannel sqlite webp woff2 \ + $(if $(BR2_PACKAGE_LIBEXECINFO),libexecinfo) QT5WEBKIT_INSTALL_STAGING = YES QT5WEBKIT_LICENSE_FILES = Source/WebCore/LICENSE-LGPL-2 Source/WebCore/LICENSE-LGPL-2.1 -- 2.34.1 From giulio.benetti at benettiengineering.com Tue Feb 15 00:45:21 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 15 Feb 2022 01:45:21 +0100 Subject: [Buildroot] [PATCH] utils/docker-run: improve user experience In-Reply-To: <20220214203909.251924-1-yann.morin.1998@free.fr> References: <20220214203909.251924-1-yann.morin.1998@free.fr> Message-ID: <14f61987-4c17-533d-97d3-d04dd5ea1949@benettiengineering.com> Hi Yann, Luca, All, On 14/02/22 21:39, Yann E. MORIN wrote: > Currently, the docker-run script starts a container based on the > reference image, in which the user has UID:GID set to 1000:1000, > which may or may not be the same as local user uses, which may > prevent the commands in the container from creating files, which > foils the plan of using the container to run a build... > > Additionally, the paths in the container differ from the paths > the user expects, as the current Buildroot tree is mounted over > the in-container user home directory. This is a bit confusing... > > Finally, the container is left hanging around after the command > finishes, and thus there are as many lingering containers as the > user runs docker-run. This is not very nice... > > We fix all of that (yeah, should be different patches, but meh): > > - we use --mount instead of -v, which allows us to bind-mount > the Buildroot tree at the same place in the container, as > Docker will create the destination if it does not exist, while > -v seems to expect it to exist [0]. > > - as a consequence, we can also set the working directory as the > Buildroot top-directory; > > - use --user to force the same UID:GID in the container as the > local user, so that files created in the container belong to > the local user, and so that files from the local user are > accessible from the container; > > - use --rm do remove the container once it terminates; starting typo s/do/to > a new container is very quick anyway, so it is as good as > re-using a previous container. > > [0] the documentation is not clear about that. It clearly states > that the host directory (i.e. the origin, the source) is created > if missing, but it says nothing of the destination: > https://docs.docker.com/engine/reference/commandline/run/#mount-volume--v---read-only > > Signed-off-by: Yann E. MORIN > Cc: Luca Ceresoli > Cc: Giulio Benetti > Cc: Arnout Vandecappelle (Essensium/Mind) > --- > utils/docker-run | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/utils/docker-run b/utils/docker-run > index 2bca8d8e3a..bdbc979264 100755 > --- a/utils/docker-run > +++ b/utils/docker-run > @@ -7,4 +7,8 @@ IMAGE=$(grep ^image: "${MAIN_DIR}/.gitlab-ci.yml" | \ > sed -e 's,^image: ,,g' | sed -e 's,\$CI_REGISTRY,registry.gitlab.com,g') > > set -x > -exec docker run -v "${MAIN_DIR}:/home/br-user" -it "${IMAGE}" "$@" > +exec docker run -it --rm \ > + --user $(id -u):$(id -g) \ > + --mount "type=bind,src=${MAIN_DIR},dst=${MAIN_DIR}" \ > + --workdir "${MAIN_DIR}" \ > + "${IMAGE}" "${@}" I've tested without UID:GID != 1000, but it works perfectly, so: Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti Best regards -- Giulio Benetti Benetti Engineering sas From giulio.benetti at benettiengineering.com Tue Feb 15 00:49:56 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 15 Feb 2022 01:49:56 +0100 Subject: [Buildroot] [PATCH] manual: board support: add instructions to test defconfig in the official docker In-Reply-To: <2169b106-8ed7-4eaf-1409-6dfe3eb19c0d@lucaceresoli.net> References: <20220203235438.610277-1-giulio.benetti@benettiengineering.com> <80ba31da-8a8e-12ed-bded-025e47f5cced@benettiengineering.com> <2169b106-8ed7-4eaf-1409-6dfe3eb19c0d@lucaceresoli.net> Message-ID: <9c579246-5466-58c8-8831-e8282041d952@benettiengineering.com> Hi Luca, On 14/02/22 13:16, Luca Ceresoli wrote: > Hi Giulio, > > On 14/02/22 00:35, Giulio Benetti wrote: >> Hi Luca, Arnout, Thomas P., >> >> On 13/02/22 11:39, Arnout Vandecappelle wrote: >>> >>> >>> On 12/02/2022 23:56, Luca Ceresoli wrote: >>>> Hi Giulio, >>>> >>>> On 04/02/22 00:54, Giulio Benetti wrote: >>>>> Often new boards have not been tested with official docker so let's add >>>>> instructions to do it. >>>> >>>> Thank you, I think this is a very useful addition to the documentation! >>>> However I would suggest some changes for it to look more "professional". >> >> Always welcome! >> >>>>> Signed-off-by: Giulio Benetti >>>>> --- >>>>> ?? docs/manual/adding-board-support.txt | 22 ++++++++++++++++++++++ >>>>> ?? 1 file changed, 22 insertions(+) >>>>> >>>>> diff --git a/docs/manual/adding-board-support.txt >>>>> b/docs/manual/adding-board-support.txt >>>>> index 33ed709535..f5fb3af371 100644 >>>>> --- a/docs/manual/adding-board-support.txt >>>>> +++ b/docs/manual/adding-board-support.txt >>>>> @@ -46,3 +46,25 @@ create a directory +board/+ and a >>>>> subdirectory >>>>> ?? +board//+. You can then store your patches >>>>> ?? and configurations in these directories, and reference them from >>>>> the main >>>>> ?? Buildroot configuration. Refer to xref:customize[] for more details. >>>>> + >>>>> +Before submitting patches for new boards it would be better to test it >>>> >>>> "it would be better" -> "it is recommended". >> >> Ok >> >>>>> +by building it using .gitlab-ci.yml specified docker. For example >>>>> at the >>>> >>>> I think this should be reworded in a simpler way: "by building it using >>>> the docker specified in .gitlab-ci.yml". >> >> Yes >> >>>> BTW as I am a docker newbie: is it common to say "the docker"? Or would >>>> "the docker container" be more correct? -- By comparison, I would never >>>> say "using the virtualbox" but rather "using the virtualbox machine". >>> >>> ?? I would say "the container" since you can use it with any container >>> manager >>> that follows the OCI spec. >> >> Ok >> >>>> >>>>> +time of this writing the docker is: >>>> >>>> Remove the ':' from this line, or you'll have multiple ':' per line, >>>> which looks awkward. >>>> >>>>> +$CI_REGISTRY/buildroot.org/buildroot/base:20220105.2314 >>>> >>>> Hm, this string is already old. >> >> Yes :-/ >> >>> ?? Actually, this part of the documentation is already superseded >>> since we now >>> have utils/docker-run that does everything. >> >> Oh, I've missed that, just checked and it eases life not few! >> I have a 120 columns command to start it that I copy and paste >> everytime. Because also, what I don't take care of here is the -v flag >> that allows you mount a host folder. >> >>>> There's no sane way to keep docs and >>>> .yml in sync. I wonder whether we should have in the manual a command >>>> line that always use the current string, such as: >>>> >>>> DOCKER_IMAGE=$(cat .gitlab-ci.yml | \ >>>> ???????????????? sed -n >>>> '/^image/s/^.*CI_REGISTRY/registry.gitlab.com/p') >>>> docker pull $DOCKER_IMAGE >>>> sudo docker run -it? $DOCKER_IMAGE >>>> >>>> However I must admit this is not very readable in the docs... :( What >>>> about adding a simple script (utils/run-docker?) that does the trick and >>>> just mention that in the docs? >> >> utils/docker-run then. Now we know it exists :-) >> >>>>> +so: >>>> >>>> Add an empty line here, so that the output separates from the next line. >> >> Ok >> >>>>> +Pull the docker: >>>>> +-------------------- >>>>> + $ docker pull >>>>> registry.gitlab.com/buildroot.org/buildroot/base:20220105.2314 >>>> >>>> Missing 'sudo'? >>> >>> ?? Docker access is usually managed through the "docker" group rather >>> than sudo. >>> >>> ?? And if you use podman as docker replacement, it can even be done in an >>> unprivileged container. Not that I tried it, but I think so. >>> >>> ?? Oh BTW, the pull is in fact not needed, both podman and docker pull >>> automatically when you start a container. That's the reason the >>> container name >>> is so convoluted. >> >> All new thing I didn't know! >> >>>> >>>>> +-------------------- >>>> >>>> Add an empty line here. This has no effect on the output but makes >>>> source code more readable. >>>> >>>>> +Run the docker: >>>>> +-------------------- >>>>> + $ sudo docker run -it >>>>> registry.gitlab.com/buildroot.org/buildroot/base:20220105.2314 >>>>> /bin/bash >>>>> +-------------------- >>>> >>>> As above, add an empty line here. >> >> +1 >> >>>>> +Inside the docker hint: >>>>> +-------------------- >>>>> + $ git clone git://git.busybox.net/buildroot >>>>> + $ cd buildroot >>>>> + $ make +_defconfig+ >>>>> + $ make >>>>> +-------------------- >>>> >>>> As above, add an empty line here. >> >> +1 >> >>>>> +Wait until build finishes and eventually add host dependencies. >>>> >>>> If I understand what you mean here, it should be "and add host >>>> dependencies if needed" ("eventually" is not the english translation of >>>> italian "eventualmente"). >> >> "...and possibly add host dependencies", right? > > Better. > > Even better: "and add any missing host dependencies, if any". Ah yes, thank you! >>>> If my understanding is correct, I don't find >>>> this sentence very useful: a docker newbie perhaps doesn't know how to >>>> add a host dependency (and maybe not even how to understand that they >>>> are missing one). >>>> >>>> I would just remove this line, but if you think it is very important I'd >>>> clarify it, maybe with some examples. >>> >>> ?? Yes, I think this is what triggered the addition of this >>> documentation. If you >>> have e.g. libopenssl-dev installed on your build host, then you >>> usually won't >>> notice in your test builds that a dependency on host-openssl is >>> needed. So test >>> builds should be done in a minimal container. >> >> Yes, it was because of that. >> >>> ?? Unfortunately, the buildroot/base container is not exactly minimal. >>> It's >>> really what is meant to be used for running CI tests, not exactly what >>> is needed >>> for build tests. Ideally, we'd have >>> >>> - an absolutely minimal container that can be used for build tests - >>> ideally in >>> a couple of variants for different distros; >> >> There is a bunch of dockers like that(more or less) here: >> https://github.com/aduskett/buildroot-docker-devel >> I've also contributed to, and at that time Thomas P. in IRC asked why we >> didn't upstreamed it and I told I would have done like 2/3 years ago and >> I've never done it :-/ >> >> And also modifying autobuilder's script to pick random distro and build >> to avoid possible host issues. But it's a bunch of stuff to do. >> >>> - a container for CI; >> >> Do you mean the one we already have but more shrinked? >> >>> - a more complete container you could use for development, though I can't >>> immediately think of extra stuff you'd want in there >> >> Is it really worth it? I mean, I've never seen anybody in IRC(even if >> read few in it) or ML(same) that complain about "I can't have buildroot >> working because I miss host tools". But I've seen recently gitlab-ci >> results that took me like 15-16 hours to fix. >> >> Does Yocto have something like that? And if yes, does someone can give a >> feedback if he really uses it? > > The situation is different with yocto as /usr/bin & co are just not in > the PATH. No host tools are accessible unless explicitly listed in the > HOSTTOOLS variable, so the problem is mostly solved at the root. Ah ok, thank for the explanation! >>> (but then, I wouldn't use a container for development). >> >> Me too, and who would use it? I think nobody, because I don't think a >> newbie is that skilled to use a docker too(or maybe yes), but my first >> try would be using it with my distro and probably same goes for other >> people. But here again, I use Terminator+Midnight Commander as my "IDE", >> so I won't be happy enough with it. Someone else uses real "IDE" and we >> can't add Eclipse or VSCode(I hope), so it will be something that is not >> enough for anybody, thus IMHO useless. >> >> ---------------- >> Going back to this patch: >> >> What I can do with this patch is to rewrite it pointing how to use >> utils/docker-run to check that at least configs/* and board/* patches work. >> >> Another solution to my patch is what Thomas P. pointed in IRC: >> "it is probably easier to ask people to use gitlab CI" >> >> But my worry is that lot of people actually fork from github and not >> from gitlab. Who would really do that(both docker and gitlab-CI solutions)? >> But also, who would really install docker(if they don't use it) to >> submit a patch for gitlab-CI build failures? >> >> I think that counting the ones who took care about their maintained >> board gives us an idea, very few. BUT for new boards, and I see not few >> of them adding in the last period. It could be a way to force them to >> give a proof of a successfull building with gitlab-CI pipeline log as >> Thomas P. proposed. >> >> So I would modify this patch with instructions to: >> - fork Buildroot in gitlab >> - trigger gitlab-CI pipeline for a single defconfig >> >> What do you all think? > > I think we need simple instructions to ensure that anybody is able to > test their config builds without unnoticed host dependencies, before > they send a patch. I don't care whether it's docker or gitlab or > whatever. But it must be something documented and easy to do in a few > commands. > At this point, once this patch [1] is upstreamed I will modify this patch and point to utils/docker-run. Thank you! Best regards -- Giulio Benetti Benetti Engineering sas From james.hilliard1 at gmail.com Tue Feb 15 01:53:03 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 14 Feb 2022 18:53:03 -0700 Subject: [Buildroot] [PATCH v8 1/5] package/qt5/qt5base: enable ccache via configure option Message-ID: <20220215015307.855341-1-james.hilliard1@gmail.com> This should be cleaner than editing mkspecs/common/g++-base.conf. This should be more reliable with qt5webengine gn build system. Signed-off-by: James Hilliard --- Changes v6 -> v7: - remove QT5BASE_CONFIGURE_HOSTCC variable --- package/qt5/qt5base/qt5base.mk | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index ef38d03253..cce92db81b 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -297,10 +297,9 @@ endef endif # This allows to use ccache when available -define QT5BASE_CONFIGURE_HOSTCC - $(SED) 's,^QMAKE_CC\s*=.*,QMAKE_CC = $(HOSTCC),' $(@D)/mkspecs/common/g++-base.conf - $(SED) 's,^QMAKE_CXX\s*=.*,QMAKE_CXX = $(HOSTCXX),' $(@D)/mkspecs/common/g++-base.conf -endef +ifeq ($(BR2_CCACHE),y) +QT5BASE_CONFIGURE_OPTS += -ccache +endif # Must be last so can override all options set by Buildroot QT5BASE_CONFIGURE_OPTS += $(call qstrip,$(BR2_PACKAGE_QT5BASE_CUSTOM_CONF_OPTS)) @@ -316,7 +315,6 @@ define QT5BASE_CONFIGURE_CMDS touch $(QT5BASE_ARCH_CONFIG_FILE) $(QT5BASE_CONFIGURE_ARCH_CONFIG_LIBATOMIC) $(QT5BASE_CONFIGURE_ARCH_CONFIG_LIBEXECINFO) - $(QT5BASE_CONFIGURE_HOSTCC) (cd $(@D); \ $(TARGET_MAKE_ENV) \ PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ -- 2.25.1 From james.hilliard1 at gmail.com Tue Feb 15 01:53:04 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 14 Feb 2022 18:53:04 -0700 Subject: [Buildroot] [PATCH v8 2/5] package/qt5/qt5webengine-chromium-catapult: new package In-Reply-To: <20220215015307.855341-1-james.hilliard1@gmail.com> References: <20220215015307.855341-1-james.hilliard1@gmail.com> Message-ID: <20220215015307.855341-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 --- 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 Tue Feb 15 01:53:06 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 14 Feb 2022 18:53:06 -0700 Subject: [Buildroot] [PATCH v8 4/5] package/qt5/qt5base: disable broken qmake sysrootify In-Reply-To: <20220215015307.855341-1-james.hilliard1@gmail.com> References: <20220215015307.855341-1-james.hilliard1@gmail.com> Message-ID: <20220215015307.855341-4-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. Improves pkg-config target/host separation. Signed-off-by: James Hilliard --- Changes v5 -> v6: - rebase/rework with qt5webengine bump 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/qt5/qt5base/qt.conf.in | 21 ++++++++++++++++++--- package/qt5/qt5base/qt5base.mk | 5 ++++- 2 files changed, 22 insertions(+), 4 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 cce92db81b..1ef70eb7f6 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -323,12 +323,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)" \ @@ -337,6 +340,6 @@ define QT5BASE_CONFIGURE_CMDS ) endef -QT5BASE_POST_INSTALL_STAGING_HOOKS += QT5_INSTALL_QT_CONF +QT5BASE_PRE_INSTALL_STAGING_HOOKS += QT5_INSTALL_QT_CONF $(eval $(qmake-package)) -- 2.25.1 From james.hilliard1 at gmail.com Tue Feb 15 01:53:07 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 14 Feb 2022 18:53:07 -0700 Subject: [Buildroot] [PATCH v8 5/5] package/qt5/qt5webengine: bump to version 5.15.8 In-Reply-To: <20220215015307.855341-1-james.hilliard1@gmail.com> References: <20220215015307.855341-1-james.hilliard1@gmail.com> Message-ID: <20220215015307.855341-5-james.hilliard1@gmail.com> We need to use the separate package for the chromium submodule which has python3 support patches. We also need to apply a patch to qt5webengine to allow building with python3. Drop a patch which is now upstream. 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. Switch libraries to system libraries instead of bundled when possible. Migrate unsupported WEBENGINE_CONFIG to new config flag option. Override feature detection using config override flags to ensure we get the expected features enabled/disabled as autodetection logic may otherwise disable features without throwing build errors. Signed-off-by: James Hilliard --- Changes v7 -> v8: - add missing BR2_PACKAGE_QT5BASE_HARFBUZZ select Changes v5 -> v6: - switch to python3 - fix up config flags and rebase Changes v3 -> v4: - linker fixes Changes v2 -> v3: - add kconfig entries --- package/qt5/qt5.mk | 1 - .../0002-Add-python3-build-support.patch | 168 +++ ...m-breakpad-fix-build-with-glibc-2.34.patch | 76 -- package/qt5/qt5webengine/Config.in | 14 + .../qt5/qt5webengine/host-python-wrapper.in | 3 + package/qt5/qt5webengine/qt5webengine.hash | 1001 +---------------- package/qt5/qt5webengine/qt5webengine.mk | 160 ++- 7 files changed, 323 insertions(+), 1100 deletions(-) create mode 100644 package/qt5/qt5webengine/0002-Add-python3-build-support.patch delete mode 100644 package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch create mode 100644 package/qt5/qt5webengine/host-python-wrapper.in diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk index 656e3067dc..0706c3548d 100644 --- a/package/qt5/qt5.mk +++ b/package/qt5/qt5.mk @@ -6,7 +6,6 @@ QT5_VERSION_MAJOR = 5.15 QT5_VERSION = $(QT5_VERSION_MAJOR).8 -QT5_SOURCE_TARBALL_PREFIX = everywhere-src QT5_SITE = https://invent.kde.org/qt/qt include $(sort $(wildcard package/qt5/*/*.mk)) diff --git a/package/qt5/qt5webengine/0002-Add-python3-build-support.patch b/package/qt5/qt5webengine/0002-Add-python3-build-support.patch new file mode 100644 index 0000000000..18fc1c1de0 --- /dev/null +++ b/package/qt5/qt5webengine/0002-Add-python3-build-support.patch @@ -0,0 +1,168 @@ +From 1e299a6c9eeb08555208b76623e453d8ab96b6e3 Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Fri, 4 Feb 2022 16:16:35 -0700 +Subject: [PATCH] Add python3 build support + +Adapted from: +https://github.com/archlinux/svntogit-packages/blob/6edf5f1aaea952d046aff89a2e0175258fe77361/trunk/qt5-webengine-python3.patch + +Signed-off-by: James Hilliard +--- + configure.pri | 13 ++++++------- + mkspecs/features/functions.prf | 6 +++--- + src/buildtools/config/support.pri | 10 +++++----- + src/buildtools/configure.json | 18 +++++++++--------- + 4 files changed, 23 insertions(+), 24 deletions(-) + +diff --git a/configure.pri b/configure.pri +index e072961f..6fec7b20 100644 +--- a/configure.pri ++++ b/configure.pri +@@ -13,8 +13,7 @@ defineTest(isPythonVersionSupported) { + python_version = $$split(python_version, ',') + python_major_version = $$first(python_version) + greaterThan(python_major_version, 2) { +- qtLog("Python version 3 is not supported by Chromium.") +- return(false) ++ return(true) + } + python_minor_version = $$member(python_version, 1) + python_patch_version = $$member(python_version, 2) +@@ -52,10 +51,10 @@ defineTest(qtConfReport_jumboBuild) { + qtConfReportPadded($${1}, $$mergeLimit) + } + +-defineTest(qtConfTest_detectPython2) { +- python = $$qtConfFindInPath("python2$$EXE_SUFFIX") ++defineTest(qtConfTest_detectPython) { ++ python = $$qtConfFindInPath("python$$EXE_SUFFIX") + isEmpty(python) { +- qtLog("'python2$$EXE_SUFFIX' not found in PATH. Checking for 'python$$EXE_SUFFIX'.") ++ qtLog("'python$$EXE_SUFFIX' not found in PATH. Checking for 'python$$EXE_SUFFIX'.") + python = $$qtConfFindInPath("python$$EXE_SUFFIX") + } + isEmpty(python) { +@@ -63,11 +62,11 @@ defineTest(qtConfTest_detectPython2) { + return(false) + } + !isPythonVersionSupported($$python) { +- qtLog("A suitable Python 2 executable could not be located.") ++ qtLog("A suitable Python executable could not be located.") + return(false) + } + +- # Make tests.python2.location available in configure.json. ++ # Make tests.python.location available in configure.json. + $${1}.location = $$clean_path($$python) + export($${1}.location) + $${1}.cache += location +diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf +index 2750d707..9fda13d0 100644 +--- a/mkspecs/features/functions.prf ++++ b/mkspecs/features/functions.prf +@@ -39,11 +39,11 @@ defineReplace(which) { + + # Returns the unquoted path to the python executable. + defineReplace(pythonPath) { +- isEmpty(QMAKE_PYTHON2) { ++ isEmpty(QMAKE_PYTHON) { + # Fallback for building QtWebEngine with Qt < 5.8 +- QMAKE_PYTHON2 = python ++ QMAKE_PYTHON = python + } +- return($$QMAKE_PYTHON2) ++ return($$QMAKE_PYTHON) + } + + # Returns the python executable for use with shell / make targets. +diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri +index e7f869a1..1bf2c5d7 100644 +--- a/src/buildtools/config/support.pri ++++ b/src/buildtools/config/support.pri +@@ -21,7 +21,7 @@ defineReplace(qtwebengine_checkWebEngineCoreError) { + !qtwebengine_checkForGperf(QtWebEngine):return(false) + !qtwebengine_checkForBison(QtWebEngine):return(false) + !qtwebengine_checkForFlex(QtWebEngine):return(false) +- !qtwebengine_checkForPython2(QtWebEngine):return(false) ++ !qtwebengine_checkForPython(QtWebEngine):return(false) + !qtwebengine_checkForNodejs(QtWebEngine):return(false) + !qtwebengine_checkForSanitizer(QtWebEngine):return(false) + linux:!qtwebengine_checkForPkgCfg(QtWebEngine):return(false) +@@ -51,7 +51,7 @@ defineReplace(qtwebengine_checkPdfError) { + !qtwebengine_checkForGperf(QtPdf):return(false) + !qtwebengine_checkForBison(QtPdf):return(false) + !qtwebengine_checkForFlex(QtPdf):return(false) +- !qtwebengine_checkForPython2(QtPdf):return(false) ++ !qtwebengine_checkForPython(QtPdf):return(false) + !qtwebengine_checkForSanitizer(QtPdf):return(false) + linux:!qtwebengine_checkForPkgCfg(QtPdf):return(false) + linux:!qtwebengine_checkForHostPkgCfg(QtPdf):return(false) +@@ -143,10 +143,10 @@ defineTest(qtwebengine_checkForFlex) { + return(true) + } + +-defineTest(qtwebengine_checkForPython2) { ++defineTest(qtwebengine_checkForPython) { + module = $$1 +- !qtConfig(webengine-python2) { +- qtwebengine_skipBuild("Python version 2 (2.7.5 or later) is required to build $${module}.") ++ !qtConfig(webengine-python) { ++ qtwebengine_skipBuild("Python is required to build $${module}.") + return(false) + } + return(true) +diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json +index 88d1790c..032aa665 100644 +--- a/src/buildtools/configure.json ++++ b/src/buildtools/configure.json +@@ -295,9 +295,9 @@ + "label": "system ninja", + "type": "detectNinja" + }, +- "webengine-python2": { +- "label": "python2", +- "type": "detectPython2", ++ "webengine-python": { ++ "label": "python", ++ "type": "detectPython", + "log": "location" + }, + "webengine-winversion": { +@@ -374,7 +374,7 @@ + && features.webengine-gperf + && features.webengine-bison + && features.webengine-flex +- && features.webengine-python2 ++ && features.webengine-python + && features.webengine-nodejs + && (!config.sanitizer || features.webengine-sanitizer) + && (!config.linux || features.pkg-config) +@@ -400,7 +400,7 @@ + && features.webengine-gperf + && features.webengine-bison + && features.webengine-flex +- && features.webengine-python2 ++ && features.webengine-python + && (!config.sanitizer || features.webengine-sanitizer) + && (!config.linux || features.pkg-config) + && (!config.linux || features.webengine-host-pkg-config) +@@ -423,12 +423,12 @@ + "autoDetect": "features.private_tests", + "output": [ "privateFeature" ] + }, +- "webengine-python2": { +- "label": "python2", +- "condition": "tests.webengine-python2", ++ "webengine-python": { ++ "label": "python", ++ "condition": "tests.webengine-python", + "output": [ + "privateFeature", +- { "type": "varAssign", "name": "QMAKE_PYTHON2", "value": "tests.webengine-python2.location" } ++ { "type": "varAssign", "name": "QMAKE_PYTHON", "value": "tests.webengine-python.location" } + ] + }, + "webengine-gperf": { +-- +2.25.1 + 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 deleted file mode 100644 index 44a6424c7d..0000000000 --- a/package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch +++ /dev/null @@ -1,76 +0,0 @@ -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/Config.in b/package/qt5/qt5webengine/Config.in index 5d537cdf84..542f212dfc 100644 --- a/package/qt5/qt5webengine/Config.in +++ b/package/qt5/qt5webengine/Config.in @@ -32,24 +32,36 @@ 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). # 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_LCMS2 + 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_MINIZIP select BR2_PACKAGE_OPUS + select BR2_PACKAGE_RE2 + select BR2_PACKAGE_SNAPPY 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_HARFBUZZ + 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 @@ -57,9 +69,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/host-python-wrapper.in b/package/qt5/qt5webengine/host-python-wrapper.in new file mode 100644 index 0000000000..3400be1d06 --- /dev/null +++ b/package/qt5/qt5webengine/host-python-wrapper.in @@ -0,0 +1,3 @@ +#!/bin/sh +LD_LIBRARY_PATH="@HOST_DIR@/lib" \ +exec @HOST_DIR@/bin/python "$@" 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 cebd6d0fe2..836ba62189 100644 --- a/package/qt5/qt5webengine/qt5webengine.mk +++ b/package/qt5/qt5webengine/qt5webengine.mk @@ -4,64 +4,176 @@ # ################################################################################ -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 \ - host-pkgconf host-python +QT5WEBENGINE_VERSION = $(QT5_VERSION) +QT5WEBENGINE_SITE = $(QT5_SITE)/qtwebengine/-/archive/v$(QT5WEBENGINE_VERSION)-lts +QT5WEBENGINE_SOURCE = qtwebengine-v$(QT5WEBENGINE_VERSION)-lts.tar.bz2 +QT5WEBENGINE_DEPENDENCIES = qt5declarative qt5webchannel +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 + +# command line argument separator +QT5WEBENGINE_CONF_OPTS = -- 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 += \ + xlib_libXcomposite \ + xlib_libXcursor \ + xlib_libXi \ + xlib_libxkbfile \ + xlib_libXrandr \ + xlib_libXScrnSaver \ + xlib_libXtst +QT5WEBENGINE_CONF_OPTS += \ + -feature-webengine-ozone \ + -feature-webengine-system-libdrm \ + -feature-webengine-system-x11 \ + -feature-webengine-system-xkbfile \ + -feature-webengine-system-xcomposite \ + -feature-webengine-system-xcursor \ + -feature-webengine-system-xi \ + -feature-webengine-system-xproto-gl \ + -feature-webengine-system-xtst +else +QT5WEBENGINE_CONF_OPTS += \ + -no-feature-webengine-ozone \ + -no-feature-webengine-system-libdrm \ + -no-feature-webengine-system-x11 \ + -no-feature-webengine-system-xkbfile \ + -no-feature-webengine-system-xcomposite \ + -no-feature-webengine-system-xcursor \ + -no-feature-webengine-system-xi \ + -no-feature-webengine-system-xproto-gl \ + -no-feature-webengine-system-xtst endif -QT5WEBENGINE_DEPENDENCIES += host-libpng host-libnss libnss +QT5WEBENGINE_DEPENDENCIES += \ + host-bison \ + host-flex \ + host-freetype \ + host-gperf \ + host-harfbuzz \ + host-icu \ + host-ninja \ + host-nodejs \ + host-pkgconf \ + host-libjpeg \ + host-libnss \ + host-libpng \ + host-python3 \ + host-webp \ + host-zlib \ + ffmpeg \ + freetype \ + jpeg \ + lcms2 \ + libevent \ + libnss \ + libvpx \ + libxml2 \ + libxslt \ + re2 \ + snappy \ + webp -QT5WEBENGINE_CONF_OPTS += WEBENGINE_CONFIG+=use_system_ffmpeg +QT5WEBENGINE_CONF_OPTS += \ + -webengine-embedded-build \ + -webengine-ffmpeg \ + -webengine-icu \ + -webengine-opus \ + -webengine-webchannel \ + -webengine-webp \ + -feature-build-qtwebengine-core \ + -feature-webengine-core-support \ + -feature-webengine-system-dbus \ + -feature-webengine-system-fontconfig \ + -feature-webengine-system-freetype \ + -feature-webengine-system-glib \ + -feature-webengine-system-glibc \ + -feature-webengine-system-harfbuzz \ + -feature-webengine-system-jpeg \ + -feature-webengine-system-khr \ + -feature-webengine-system-lcms2 \ + -feature-webengine-system-libevent \ + -feature-webengine-system-libvpx \ + -feature-webengine-system-libxml2 \ + -feature-webengine-system-ninja \ + -feature-webengine-system-nss \ + -feature-webengine-system-png \ + -feature-webengine-system-re2 \ + -feature-webengine-system-snappy \ + -feature-webengine-system-zlib + +QT5WEBENGINE_CONF_OPTS += \ + -no-webengine-geolocation \ + -no-webengine-kerberos \ + -no-webengine-pepper-plugins \ + -no-webengine-printing-and-pdf \ + -no-webengine-spellchecker \ + -no-webengine-webrtc \ + -no-webengine-webrtc-pipewire \ + -no-feature-webengine-developer-build \ + -no-feature-webengine-full-debug-info \ + -no-feature-webengine-native-spellchecker \ + -no-feature-webengine-noexecstack \ + -no-feature-webengine-system-minizip \ + -no-feature-webengine-system-gn ifeq ($(BR2_PACKAGE_QT5WEBENGINE_PROPRIETARY_CODECS),y) -QT5WEBENGINE_CONF_OPTS += WEBENGINE_CONFIG+=use_proprietary_codecs +QT5WEBENGINE_CONF_OPTS += -webengine-proprietary-codecs +else +QT5WEBENGINE_CONF_OPTS += -no-webengine-proprietary-codecs endif ifeq ($(BR2_PACKAGE_QT5WEBENGINE_ALSA),y) QT5WEBENGINE_DEPENDENCIES += alsa-lib +QT5WEBENGINE_CONF_OPTS += -webengine-alsa else -QT5WEBENGINE_CONF_OPTS += QT_CONFIG-=alsa +QT5WEBENGINE_CONF_OPTS += -no-webengine-alsa +endif + +ifeq ($(BR2_PACKAGE_PULSEAUDIO),y) +QT5WEBENGINE_DEPENDENCIES += pulseaudio +QT5WEBENGINE_CONF_OPTS += -webengine-pulseaudio +else +QT5WEBENGINE_CONF_OPTS += -no-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) \ - PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig -define QT5WEBENGINE_PYTHON2_SYMLINK + PKG_CONFIG_SYSROOT_DIR="/" +define QT5WEBENGINE_CREATE_HOST_PYTHON_WRAPPER mkdir -p $(@D)/host-bin - ln -sf $(HOST_DIR)/bin/python2 $(@D)/host-bin/python + sed s%@HOST_DIR@%$(HOST_DIR)%g $(QT5WEBENGINE_PKGDIR)/host-python-wrapper.in > $(@D)/host-bin/python + chmod +x $(@D)/host-bin/python endef -QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_PYTHON2_SYMLINK +QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_CREATE_HOST_PYTHON_WRAPPER 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 + mkdir -p $(@D)/host-bin 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 peterlin at andestech.com Tue Feb 15 02:13:20 2022 From: peterlin at andestech.com (Yu Chien Peter Lin) Date: Tue, 15 Feb 2022 10:13:20 +0800 Subject: [Buildroot] [PATCH v2 3/3] DEVELOPERS: add Yu-Chien Lin to board/andes In-Reply-To: <674c1c83-4bcf-3740-8f79-184c1a86cda3@benettiengineering.com> References: <20220125054956.27492-1-peterlin@andestech.com> <20220125054956.27492-3-peterlin@andestech.com> <674c1c83-4bcf-3740-8f79-184c1a86cda3@benettiengineering.com> Message-ID: Hi Giulio, Thanks for your comments. > On Thu, Feb 10, 2022 at 12:39:07AM +0100, Giulio Benetti wrote: > > Hi Peter, > > > > I review it now, > > > > On 25/01/22 06:49, 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 > ... > > > 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 > > > > Would it be possible for you to upstream these patches? I mean, do you > > maintain the uboot, opensbi repositories so you can do that? > > If yes it would be great having no patches at all here. We have a plan to upstream some of them if the patch is platform specific. I'll remove them when the u-boot bumps to the future version. > > > index 0000000000..5e5d70ab25 > > > --- /dev/null > > > +++ b/board/andes/ae350/ae350.dts > ... > > It's a bit out of topic, but with this .dts ^^^ you define and entire > > SoC+board, shouldn't it be like a .dtsi file for SoC and a .dts file for > > board? We would like to remain in this form until new board is available. Thanks. Regards, Yu-Chien Peter Lin From giulio.benetti at benettiengineering.com Tue Feb 15 02:17:00 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 15 Feb 2022 03:17:00 +0100 Subject: [Buildroot] [PATCH] manual: board support: add instructions to test defconfig in the official docker In-Reply-To: <9c579246-5466-58c8-8831-e8282041d952@benettiengineering.com> References: <20220203235438.610277-1-giulio.benetti@benettiengineering.com> <80ba31da-8a8e-12ed-bded-025e47f5cced@benettiengineering.com> <2169b106-8ed7-4eaf-1409-6dfe3eb19c0d@lucaceresoli.net> <9c579246-5466-58c8-8831-e8282041d952@benettiengineering.com> Message-ID: On 15/02/22 01:49, Giulio Benetti wrote: >> I think we need simple instructions to ensure that anybody is able to >> test their config builds without unnoticed host dependencies, before >> they send a patch. I don't care whether it's docker or gitlab or >> whatever. But it must be something documented and easy to do in a few >> commands. >> > > At this point, once this patch [1] is upstreamed I will modify this > patch and point to utils/docker-run. [1]: https://lists.buildroot.org/pipermail/buildroot/2022-February/637017.html -- Giulio Benetti Benetti Engineering sas From giulio.benetti at benettiengineering.com Tue Feb 15 02:22:14 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 15 Feb 2022 03:22:14 +0100 Subject: [Buildroot] [PATCH v2 3/3] DEVELOPERS: add Yu-Chien Lin to board/andes In-Reply-To: References: <20220125054956.27492-1-peterlin@andestech.com> <20220125054956.27492-3-peterlin@andestech.com> <674c1c83-4bcf-3740-8f79-184c1a86cda3@benettiengineering.com> Message-ID: <9907aa64-1f54-cbf4-074a-a73c2233ab97@benettiengineering.com> Hi Peter, On 15/02/22 03:13, Yu Chien Peter Lin wrote: > Hi Giulio, > > Thanks for your comments. > >> On Thu, Feb 10, 2022 at 12:39:07AM +0100, Giulio Benetti wrote: >>> Hi Peter, >>> >>> I review it now, >>> >>> On 25/01/22 06:49, 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 >> ... >>>> 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 >>> >>> Would it be possible for you to upstream these patches? I mean, do you >>> maintain the uboot, opensbi repositories so you can do that? >>> If yes it would be great having no patches at all here. > > We have a plan to upstream some of them if the patch is platform specific. This sounds good > I'll remove them when the u-boot bumps to the future version. That's ok >>>> index 0000000000..5e5d70ab25 >>>> --- /dev/null >>>> +++ b/board/andes/ae350/ae350.dts >> ... >>> It's a bit out of topic, but with this .dts ^^^ you define and entire >>> SoC+board, shouldn't it be like a .dtsi file for SoC and a .dts file for >>> board? > > We would like to remain in this form until new board is available. Thanks. Ok, with some new board on the horizon it makes sense to me. Best regards -- Giulio Benetti Benetti Engineering sas From peterlin at andestech.com Tue Feb 15 02:32:00 2022 From: peterlin at andestech.com (Yu Chien Peter Lin) Date: Tue, 15 Feb 2022 10:32:00 +0800 Subject: [Buildroot] [PATCH 1/3] board/andes: rearrange nds32 folder structure Message-ID: <20220215023202.1188-1-peterlin@andestech.com> Rearrange nds32 folder structure to add AE350 platform. Signed-off-by: Yu Chien Peter Lin Signed-off-by: Alan Kao --- .../patches/linux/0001-nds32-Fix-boot-messages-garbled.patch | 0 ...2-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch | 0 board/andes/{ => ae3xx}/readme.txt | 0 configs/andes_ae3xx_defconfig | 2 +- 4 files changed, 1 insertion(+), 1 deletion(-) rename board/andes/{ => ae3xx}/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch (100%) rename board/andes/{ => ae3xx}/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.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/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch b/board/andes/ae3xx/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch similarity index 100% rename from board/andes/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch rename to board/andes/ae3xx/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.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.25.1 From peterlin at andestech.com Tue Feb 15 02:32:01 2022 From: peterlin at andestech.com (Yu Chien Peter Lin) Date: Tue, 15 Feb 2022 10:32:01 +0800 Subject: [Buildroot] [PATCH 2/3] board/andes/ae350: add support for Andes AE350 In-Reply-To: <20220215023202.1188-1-peterlin@andestech.com> References: <20220215023202.1188-1-peterlin@andestech.com> Message-ID: <20220215023202.1188-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 --- Changes V1->V2: * move linux source code and its patches to AndesTech Github repo * rename ae350_andestar45_defconfig to andes_ae350_45_defconfig * change C library to uClibc * remove OpenSSL package * remove rootfs.cpio and rootfs.tar * update DEVELOPERS V2->V3: * specifiy branch to download from AndesTech linux repo * change boot.cmd to extlinux.conf * add post-build.sh for extlinux.conf to retrieve Image and DTB * fix format and update genimage_sdcard.cfg * update readme.txt * add packages (python3, pylibfdt and openssl) for u-boot binman * reorder item in DEVELOPERS board/andes/ae350/ae350.dts | 274 ++++++++++++++++++ board/andes/ae350/genimage_sdcard.cfg | 26 ++ ...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/post-build.sh | 3 + board/andes/ae350/readme.txt | 65 +++++ .../boot/extlinux/extlinux.conf | 4 + board/andes/ae350/uboot.config.fragment | 5 + configs/andes_ae350_45_defconfig | 43 +++ 13 files changed, 579 insertions(+) create mode 100755 board/andes/ae350/ae350.dts 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 100755 board/andes/ae350/post-build.sh create mode 100644 board/andes/ae350/readme.txt create mode 100644 board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf 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/genimage_sdcard.cfg b/board/andes/ae350/genimage_sdcard.cfg new file mode 100644 index 0000000000..b8b9fe6a62 --- /dev/null +++ b/board/andes/ae350/genimage_sdcard.cfg @@ -0,0 +1,26 @@ +image boot.vfat { + vfat { + files = { + "u-boot-spl.bin", + "u-boot.itb", + "ae350.dtb", + } + } + size = 2M +} + +image sdcard.img { + hdimage { + } + + partition boot { + partition-type = 0xC + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + bootable = true + 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/post-build.sh b/board/andes/ae350/post-build.sh new file mode 100755 index 0000000000..0e6ce228f4 --- /dev/null +++ b/board/andes/ae350/post-build.sh @@ -0,0 +1,3 @@ +#!/bin/sh +cp $BINARIES_DIR/Image $TARGET_DIR/boot +cp $BINARIES_DIR/ae350.dtb $TARGET_DIR/boot diff --git a/board/andes/ae350/readme.txt b/board/andes/ae350/readme.txt new file mode 100644 index 0000000000..6825468d50 --- /dev/null +++ b/board/andes/ae350/readme.txt @@ -0,0 +1,65 @@ +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/ + |-- ae350.dtb + |-- boot.vfat + |-- fw_dynamic.bin + |-- fw_dynamic.elf + |-- fw_jump.bin + |-- fw_jump.elf + |-- Image + |-- 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 + $ sudo sync + +Your SD card partition should be: + + Disk /dev/sdb: 14.48 GiB, 15552479232 bytes, 30375936 sectors + Disk model: Multi-Card + Units: sectors of 1 * 512 = 512 bytes + Sector size (logical/physical): 512 bytes / 512 bytes + I/O size (minimum/optimal): 512 bytes / 512 bytes + Disklabel type: dos + Disk identifier: 0x00000000 + + Device Boot Start End Sectors Size Id Type + /dev/sdb1 1 4096 4096 2M c W95 FAT32 (LBA) + /dev/sdb2 * 4097 126976 122880 60M 83 Linux + +Insert SD card and reset the board, it should boot Linux from mmc. diff --git a/board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf b/board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf new file mode 100644 index 0000000000..549eb93abc --- /dev/null +++ b/board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +label linux + kernel /boot/Image + fdt /boot/ae350.dtb + append earlycon=sbi root=/dev/mmcblk0p2 rootwait 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..a35ddd06ba --- /dev/null +++ b/configs/andes_ae350_45_defconfig @@ -0,0 +1,43 @@ +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_OVERLAY="board/andes/ae350/rootfs_overlay" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/andes/ae350/post-build.sh" +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_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/andestech/linux.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.10.84-ae350_45" +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_PYTHON3=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y +# BR2_TARGET_UBOOT_FORMAT_BIN is not set +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.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 -- 2.25.1 From peterlin at andestech.com Tue Feb 15 02:32:02 2022 From: peterlin at andestech.com (Yu Chien Peter Lin) Date: Tue, 15 Feb 2022 10:32:02 +0800 Subject: [Buildroot] [PATCH 3/3] DEVELOPERS: add Yu-Chien Lin to board/andes In-Reply-To: <20220215023202.1188-1-peterlin@andestech.com> References: <20220215023202.1188-1-peterlin@andestech.com> Message-ID: <20220215023202.1188-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 ac702d8d0f..8848d6a9a7 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2146,9 +2146,10 @@ 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_ae350_45_defconfig F: configs/andes_ae3xx_defconfig F: toolchain/toolchain-external/toolchain-external-andes-nds32/ -- 2.25.1 From peterlin at andestech.com Tue Feb 15 05:14:44 2022 From: peterlin at andestech.com (Yu Chien Peter Lin) Date: Tue, 15 Feb 2022 13:14:44 +0800 Subject: [Buildroot] [PATCH 2/3] board/andes/ae350: add support for Andes AE350 In-Reply-To: <20220215023202.1188-2-peterlin@andestech.com> References: <20220215023202.1188-1-peterlin@andestech.com> <20220215023202.1188-2-peterlin@andestech.com> Message-ID: > On Tue, Feb 15, 2022 at 10:32:01AM +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 > > --- > > Changes > > V1->V2: > > * move linux source code and its patches to AndesTech Github repo > > * rename ae350_andestar45_defconfig to andes_ae350_45_defconfig > > * change C library to uClibc > > * remove OpenSSL package > > * remove rootfs.cpio and rootfs.tar > > * update DEVELOPERS > > V2->V3: > > * specifiy branch to download from AndesTech linux repo > > * change boot.cmd to extlinux.conf > > * add post-build.sh for extlinux.conf to retrieve Image and DTB > > * fix format and update genimage_sdcard.cfg > > * update readme.txt > > * add packages (python3, pylibfdt and openssl) for u-boot binman > > * reorder item in DEVELOPERS > > Sorry, I missed versioning for this revision. I'll resend it and fix changelog format. Regards, Yu-Chien Peter Lin From peterlin at andestech.com Tue Feb 15 05:33:25 2022 From: peterlin at andestech.com (Yu Chien Peter Lin) Date: Tue, 15 Feb 2022 13:33:25 +0800 Subject: [Buildroot] [PATCH v3 1/3] board/andes: rearrange nds32 folder structure Message-ID: <20220215053327.4046-1-peterlin@andestech.com> Rearrange nds32 folder structure to add AE350 platform. Signed-off-by: Yu Chien Peter Lin Signed-off-by: Alan Kao --- .../patches/linux/0001-nds32-Fix-boot-messages-garbled.patch | 0 ...2-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch | 0 board/andes/{ => ae3xx}/readme.txt | 0 configs/andes_ae3xx_defconfig | 2 +- 4 files changed, 1 insertion(+), 1 deletion(-) rename board/andes/{ => ae3xx}/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch (100%) rename board/andes/{ => ae3xx}/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.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/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch b/board/andes/ae3xx/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch similarity index 100% rename from board/andes/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch rename to board/andes/ae3xx/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.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.25.1 From peterlin at andestech.com Tue Feb 15 05:33:27 2022 From: peterlin at andestech.com (Yu Chien Peter Lin) Date: Tue, 15 Feb 2022 13:33:27 +0800 Subject: [Buildroot] [PATCH v3 3/3] DEVELOPERS: add Yu-Chien Lin to board/andes In-Reply-To: <20220215053327.4046-1-peterlin@andestech.com> References: <20220215053327.4046-1-peterlin@andestech.com> Message-ID: <20220215053327.4046-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 ac702d8d0f..8848d6a9a7 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2146,9 +2146,10 @@ 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_ae350_45_defconfig F: configs/andes_ae3xx_defconfig F: toolchain/toolchain-external/toolchain-external-andes-nds32/ -- 2.25.1 From peterlin at andestech.com Tue Feb 15 05:33:26 2022 From: peterlin at andestech.com (Yu Chien Peter Lin) Date: Tue, 15 Feb 2022 13:33:26 +0800 Subject: [Buildroot] [PATCH v3 2/3] board/andes/ae350: add support for Andes AE350 In-Reply-To: <20220215053327.4046-1-peterlin@andestech.com> References: <20220215053327.4046-1-peterlin@andestech.com> Message-ID: <20220215053327.4046-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 --- Changes v1 -> v2: - move linux source code and its patches to AndesTech Github repo - rename ae350_andestar45_defconfig to andes_ae350_45_defconfig - change C library to uClibc - remove OpenSSL package - remove rootfs.cpio and rootfs.tar - update DEVELOPERS Changes v2 -> v3: - specifiy branch to download from AndesTech linux repo - change boot.cmd to extlinux.conf - add post-build.sh for extlinux.conf to retrieve Image and DTB - fix format and update genimage_sdcard.cfg - update readme.txt - add packages (python3, pylibfdt and openssl) for u-boot binman - reorder item in DEVELOPERS --- board/andes/ae350/ae350.dts | 274 ++++++++++++++++++ board/andes/ae350/genimage_sdcard.cfg | 26 ++ ...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/post-build.sh | 3 + board/andes/ae350/readme.txt | 65 +++++ .../boot/extlinux/extlinux.conf | 4 + board/andes/ae350/uboot.config.fragment | 5 + configs/andes_ae350_45_defconfig | 43 +++ 13 files changed, 579 insertions(+) create mode 100755 board/andes/ae350/ae350.dts 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 100755 board/andes/ae350/post-build.sh create mode 100644 board/andes/ae350/readme.txt create mode 100644 board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf 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/genimage_sdcard.cfg b/board/andes/ae350/genimage_sdcard.cfg new file mode 100644 index 0000000000..b8b9fe6a62 --- /dev/null +++ b/board/andes/ae350/genimage_sdcard.cfg @@ -0,0 +1,26 @@ +image boot.vfat { + vfat { + files = { + "u-boot-spl.bin", + "u-boot.itb", + "ae350.dtb", + } + } + size = 2M +} + +image sdcard.img { + hdimage { + } + + partition boot { + partition-type = 0xC + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + bootable = true + 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/post-build.sh b/board/andes/ae350/post-build.sh new file mode 100755 index 0000000000..0e6ce228f4 --- /dev/null +++ b/board/andes/ae350/post-build.sh @@ -0,0 +1,3 @@ +#!/bin/sh +cp $BINARIES_DIR/Image $TARGET_DIR/boot +cp $BINARIES_DIR/ae350.dtb $TARGET_DIR/boot diff --git a/board/andes/ae350/readme.txt b/board/andes/ae350/readme.txt new file mode 100644 index 0000000000..6825468d50 --- /dev/null +++ b/board/andes/ae350/readme.txt @@ -0,0 +1,65 @@ +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/ + |-- ae350.dtb + |-- boot.vfat + |-- fw_dynamic.bin + |-- fw_dynamic.elf + |-- fw_jump.bin + |-- fw_jump.elf + |-- Image + |-- 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 + $ sudo sync + +Your SD card partition should be: + + Disk /dev/sdb: 14.48 GiB, 15552479232 bytes, 30375936 sectors + Disk model: Multi-Card + Units: sectors of 1 * 512 = 512 bytes + Sector size (logical/physical): 512 bytes / 512 bytes + I/O size (minimum/optimal): 512 bytes / 512 bytes + Disklabel type: dos + Disk identifier: 0x00000000 + + Device Boot Start End Sectors Size Id Type + /dev/sdb1 1 4096 4096 2M c W95 FAT32 (LBA) + /dev/sdb2 * 4097 126976 122880 60M 83 Linux + +Insert SD card and reset the board, it should boot Linux from mmc. diff --git a/board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf b/board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf new file mode 100644 index 0000000000..549eb93abc --- /dev/null +++ b/board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +label linux + kernel /boot/Image + fdt /boot/ae350.dtb + append earlycon=sbi root=/dev/mmcblk0p2 rootwait 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..a35ddd06ba --- /dev/null +++ b/configs/andes_ae350_45_defconfig @@ -0,0 +1,43 @@ +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_OVERLAY="board/andes/ae350/rootfs_overlay" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/andes/ae350/post-build.sh" +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_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/andestech/linux.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.10.84-ae350_45" +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_PYTHON3=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y +# BR2_TARGET_UBOOT_FORMAT_BIN is not set +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.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 -- 2.25.1 From fperrad at gmail.com Tue Feb 15 07:07:38 2022 From: fperrad at gmail.com (Francois Perrad) Date: Tue, 15 Feb 2022 08:07:38 +0100 Subject: [Buildroot] [PATCH 1/2] package/perl-gd: bump to version 2.76 Message-ID: <20220215070739.2199760-1-francois.perrad@gadz.org> remove upstreamed patch Signed-off-by: Francois Perrad --- ...-fix-cross-compilation-with-gdlib.pc.patch | 34 ------------------- package/perl-gd/perl-gd.hash | 4 +-- package/perl-gd/perl-gd.mk | 2 +- 3 files changed, 3 insertions(+), 37 deletions(-) delete mode 100644 package/perl-gd/0001-Makefile.PL-fix-cross-compilation-with-gdlib.pc.patch diff --git a/package/perl-gd/0001-Makefile.PL-fix-cross-compilation-with-gdlib.pc.patch b/package/perl-gd/0001-Makefile.PL-fix-cross-compilation-with-gdlib.pc.patch deleted file mode 100644 index af053c560..000000000 --- a/package/perl-gd/0001-Makefile.PL-fix-cross-compilation-with-gdlib.pc.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 11dc017e902397c452331425eb6101b3315572fa Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 24 Jan 2021 10:59:31 +0100 -Subject: [PATCH] Makefile.PL: fix cross-compilation with gdlib.pc - -Cross-compilation will fail if gdlib.pc does not contain any cflags. -Indeed, if cflags is empty, Makefile.PL will use the default value for -INC (i.e. -I/usr/include -I/usr/include/gd) - -It should be noted that gdlib-config has been dropped from gd since -version 2.3.0 - -Signed-off-by: Fabrice Fontaine -[Upstream status: probably not upstreamable] ---- - Makefile.PL | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.PL b/Makefile.PL -index 25f2f93..7da3651 100644 ---- a/Makefile.PL -+++ b/Makefile.PL -@@ -47,7 +47,7 @@ If you want to try to compile anyway, please rerun this script with the option - - END - } - -- at INC = qw(-I/usr/include -I/usr/include/gd) unless @INC; -+#@INC = qw(-I/usr/include -I/usr/include/gd) unless @INC; - @LIBPATH = qw(-L/usr/lib/X11 -L/usr/X11R6/lib -L/usr/X11/lib -L/usr/lib) unless @LIBPATH; - @LIBS = qw(-lgd) unless @LIBS; - --- -2.29.2 - diff --git a/package/perl-gd/perl-gd.hash b/package/perl-gd/perl-gd.hash index 780b1d1e2..97f1da821 100644 --- a/package/perl-gd/perl-gd.hash +++ b/package/perl-gd/perl-gd.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 c2bf1ca56d15e33d2432e4d8ba5aeadf GD-2.73.tar.gz -sha256 491c9e73238522e2987e66725a20935f4268a3864202ecbaf4659a1691ba322b GD-2.73.tar.gz +md5 fb4bacab10ed4f28d52c2aabdaf866bb GD-2.76.tar.gz +sha256 693d9e3d709e9188a682cb9090a77b70aac12a04e84128677577b94e4331775b GD-2.76.tar.gz # computed by scancpan sha256 1e2250289d6df4ba1c24f7550982d7ffaff2c97cd02e847659406e1afd28e83f LICENSE diff --git a/package/perl-gd/perl-gd.mk b/package/perl-gd/perl-gd.mk index b402dfff4..9787cc12f 100644 --- a/package/perl-gd/perl-gd.mk +++ b/package/perl-gd/perl-gd.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_GD_VERSION = 2.73 +PERL_GD_VERSION = 2.76 PERL_GD_SOURCE = GD-$(PERL_GD_VERSION).tar.gz PERL_GD_SITE = $(BR2_CPAN_MIRROR)/authors/id/R/RU/RURBAN PERL_GD_DEPENDENCIES = host-perl-extutils-pkgconfig zlib gd -- 2.32.0 From fperrad at gmail.com Tue Feb 15 07:07:39 2022 From: fperrad at gmail.com (Francois Perrad) Date: Tue, 15 Feb 2022 08:07:39 +0100 Subject: [Buildroot] [PATCH 2/2] package/perl-gd: add webp support In-Reply-To: <20220215070739.2199760-1-francois.perrad@gadz.org> References: <20220215070739.2199760-1-francois.perrad@gadz.org> Message-ID: <20220215070739.2199760-2-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/perl-gd/perl-gd.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/perl-gd/perl-gd.mk b/package/perl-gd/perl-gd.mk index 9787cc12f..cd32c7fb8 100644 --- a/package/perl-gd/perl-gd.mk +++ b/package/perl-gd/perl-gd.mk @@ -40,6 +40,12 @@ PERL_GD_OPTIONS += PNG PERL_GD_CONF_OPTS += -lib_png_path=$(STAGING_DIR)/usr endif +ifeq ($(BR2_PACKAGE_WEBP),y) +PERL_GD_DEPENDENCIES += webp +PERL_GD_OPTIONS += WEBP +PERL_GD_CONF_OPTS += -lib_webp_path=$(STAGING_DIR)/usr +endif + ifeq ($(BR2_PACKAGE_XLIB_LIBXPM),y) PERL_GD_DEPENDENCIES += xlib_libXpm PERL_GD_OPTIONS += XPM -- 2.32.0 From thomas.petazzoni at bootlin.com Tue Feb 15 07:23:31 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 15 Feb 2022 07:23:31 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-02-14 Message-ID: <20220215072336.EF8444026C@smtp4.osuosl.org> Hello, Autobuild statistics for 2022-02-14 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 46 | 10 | 0 | 56 | 2021.11.x | 9 | 2 | 0 | 11 | master | 45 | 36 | 0 | 81 | Classification of failures by reason for master ----------------------------------------------- bluez5_utils-5.63 | 9 host-libselinux-3.3 | 5 bpftool-a7f0e7f057283ae8af3... | 2 python-greenlet-1.1.2 | 2 rtorrent-0.9.8 | 2 unknown | 2 bat-0.19.0 | 1 dnsmasq-2.86 | 1 frr-8.1 | 1 gdb-10.2 | 1 ghostscript-9.55.0 | 1 kismet-2021-08-R1 | 1 libusb-1.0.25 | 1 mesa3d-21.3.5 | 1 mongodb-4.2.18 | 1 qt5webkit-5.212.0-alpha4 | 1 target-finalize | 1 tovid-87c676f4aadb7303d2cd9... | 1 wavemon-0.9.4 | 1 weston-10.0.0 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | bat-0.19.0 | NOK | http://autobuild.buildroot.net/results/b489ded8e2df5ccaee68b8653a6f8c973d9f277f | sh4 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/46f7dbfe1d80c7622d670ba1ac957e9e6077eb9f | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/1e7a0d5b5cdd899b31592c1b4eefa56fb63ea516 | nios2 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/103d8f9704b2b320b9e28f89f74009121691b1be | arc | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/207e13be0afe6b9ececee1ca93a07cd0d171ccfe | mips64el | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/04c2567b5613b9fd7cfae50f629ee104fdefe277 | arc | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/50022775b7f0534629c945d0383eec0408b27f69 | mips64el | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/7fb21ef2eb1a12fe7d28e3e0bc57a5ef381a018c | i686 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/6a8f998896f874d3a669151d1487ca572691db6d | arc | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/a9a4004f52c9d80047b1d86b82b60fb0696ed88e | powerpc64le | bpftool-a7f0e7f057283ae8af3... | NOK | http://autobuild.buildroot.net/results/390b70b66ce21ed2cfc69658c5bf88610b091f6b | mipsel | bpftool-a7f0e7f057283ae8af3... | NOK | http://autobuild.buildroot.net/results/302d69b5cba13934ca8f7cc4890ede61c7a3a741 | powerpc | dnsmasq-2.86 | NOK | http://autobuild.buildroot.net/results/9714d33f0679aa75d4add03087ac066f8b961b9e | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/e055d47e807e106ed8613de5eebfbb383d4d23cb | xtensa | gdb-10.2 | NOK | http://autobuild.buildroot.net/results/091f6ea9da11c095dff7d49c3916afa30b9e7ddb | ORPH arm | ghostscript-9.55.0 | NOK | http://autobuild.buildroot.net/results/fd35a47b2a77cf57c243ec1c88802b53ddca8f52 | nios2 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/f950b15ad0d87e50ff3935d9e4e4356804474fc3 | mips64el | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/4f822a0de9457aced04563952238524ff9720390 | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/fe4297556655eb15d0e7f9fd9d972033c092e144 | microblazeel | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/d7cdcbf921af462591e4e80d02506d6919984e3a | mips64el | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/72b36a7125826bdbb0451da3361a0fe0f2fb7f11 | sparc | kismet-2021-08-R1 | NOK | http://autobuild.buildroot.net/results/1b1da700a9b875ed8cb019c8974edd02f969d1c5 | ORPH sparc | libusb-1.0.25 | NOK | http://autobuild.buildroot.net/results/8b79c58e4d28281c020eb10515d1c16b72dadd42 | sh4 | mesa3d-21.3.5 | NOK | http://autobuild.buildroot.net/results/a53ca83cac36346d31d89edf481e10424e917379 | aarch64 | mongodb-4.2.18 | NOK | http://autobuild.buildroot.net/results/1a1dabae447feeee32ec34cc96563f088c0b4cd6 | riscv64 | python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/cdcf19168ea5aa82c57c36358ebec9c28201e2ea | mips64el | python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/6a91bec4336c147e1682880784af87a757b3d48a | arm | qt5webkit-5.212.0-alpha4 | NOK | http://autobuild.buildroot.net/results/af5b8baf4dc3de3b266debe99d1392e965cbe5fe | x86_64 | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/8d3a6ca73dfe1a4d878b299ee7e9761336e3caa0 | ORPH i686 | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/7082c83ec56177a9d83ddb607fd24e91cb201100 | ORPH m68k | target-finalize | NOK | http://autobuild.buildroot.net/results/8d7b0c23472abffc9447e4a6de273bdd04486d39 | arc | tovid-87c676f4aadb7303d2cd9... | NOK | http://autobuild.buildroot.net/results/9717c424bbef39c7603556e01e6dcaf5bf513855 | mipsel | unknown | NOK | http://autobuild.buildroot.net/results/c5e5e937c68a50eebee38b0f7a98c34575a966db | aarch64 | unknown | NOK | http://autobuild.buildroot.net/results/d0f5eee53f6e93998096f3927f5a378a7beef6c1 | nios2 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/930ef990ecf804f872fcb25ec4ec544e33567c04 | arc | weston-10.0.0 | NOK | http://autobuild.buildroot.net/results/e669a6237c19783c627169c819d7372e20daaf54 | Classification of failures by reason for 2021.02.x -------------------------------------------------- zeromq-4.3.4 | 3 rocksdb-6.13.3 | 2 unknown | 2 host-sentry-cli-1.57.0 | 1 ndisc6-1.0.4 | 1 openldap-2.4.59 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/993cabc3cb3a64dcf632f2d1ef1efd48030177d5 | arm | ndisc6-1.0.4 | NOK | http://autobuild.buildroot.net/results/b1451075d49a02a5fa9318b700dc227543868545 | ORPH riscv32 | openldap-2.4.59 | NOK | http://autobuild.buildroot.net/results/0ca955cc1adf21c8275def251c1d7b59688a555c | arm | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/36681a8c949f74ec16918cabd5cf94a73f24dcc8 | m68k | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/fa7b80702bb204f12b04cd86d8e8c86a6483bf4e | arm | unknown | NOK | http://autobuild.buildroot.net/results/39c2aaf5a12ff24bc17e67020e812c48a56cddf5 | i686 | unknown | NOK | http://autobuild.buildroot.net/results/94dc981b95e84cd51816ce0f9152c2c23ae9f781 | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/7e8c0ab0006d68f23661e08f5ed15a0f3b2c6428 | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/e7fa50228728210b5d8d39f41a7218b33fdf05fe | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/734b8b506b310cfe29ed4494ae74c0e1c0dabed3 | Classification of failures by reason for 2021.11.x -------------------------------------------------- wavemon-0.9.4 | 2 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arc | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/ddcef7e036147e50acb39af3b7e7c98fbe98eebf | mips64el | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/3384ab0fcb9a8554dbeb22d4262d31fc42338a17 | Gitlab CI results for 2022-02-14 ================================ Detail of defconfig failures for 2022.02-rc1 -------------------------------------------- defconfig | link to the job | orph? ----------------------------------+---------------------------------------------------------------+------ qemu_ppc64le_pseries | https://gitlab.com/buildroot.org/buildroot/-/jobs/2087852289 | qemu_s390x | https://gitlab.com/buildroot.org/buildroot/-/jobs/2087852300 | Detail of runtime-test failures for 2022.02-rc1 ----------------------------------------------- runtime-test | link to the job | orph? --------------------------+---------------------------------------------------------------+------ TestIPythonPy3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2087852418 | ORPH TestLuaLuasyslog | https://gitlab.com/buildroot.org/buildroot/-/jobs/2087852492 | ORPH TestLxc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2087852495 | ORPH TestPerlLWPProtocolhttps | https://gitlab.com/buildroot.org/buildroot/-/jobs/2087852520 | ORPH TestPythonPy3Cryptography | https://gitlab.com/buildroot.org/buildroot/-/jobs/2087852572 | ORPH TestPythonPy3Pyyaml | https://gitlab.com/buildroot.org/buildroot/-/jobs/2087852603 | ORPH TestRust | https://gitlab.com/buildroot.org/buildroot/-/jobs/2087852624 | ORPH TestRustBin | https://gitlab.com/buildroot.org/buildroot/-/jobs/2087852627 | ORPH Detail of runtime-test failures for master ------------------------------------------ runtime-test | link to the job | orph? --------------------------+---------------------------------------------------------------+------ TestCrudiniPy3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2088683760 | ORPH TestIPythonPy3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2088683795 | ORPH TestLuaLuasyslog | https://gitlab.com/buildroot.org/buildroot/-/jobs/2088683903 | ORPH TestLxc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2088683908 | ORPH TestPythonPy3Pyyaml | https://gitlab.com/buildroot.org/buildroot/-/jobs/2088684091 | ORPH TestRust | https://gitlab.com/buildroot.org/buildroot/-/jobs/2088684137 | ORPH TestRustBin | https://gitlab.com/buildroot.org/buildroot/-/jobs/2088684141 | ORPH -- http://autobuild.buildroot.net From james.hilliard1 at gmail.com Tue Feb 15 01:53:05 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 14 Feb 2022 18:53:05 -0700 Subject: [Buildroot] [PATCH v8 3/5] package/qt5/qt5webengine-chromium: new package In-Reply-To: <20220215015307.855341-1-james.hilliard1@gmail.com> References: <20220215015307.855341-1-james.hilliard1@gmail.com> Message-ID: <20220215015307.855341-3-james.hilliard1@gmail.com> 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. Signed-off-by: James Hilliard --- package/qt5/Config.in | 1 + .../0001-Add-python3-build-support.patch | 1858 +++++++++++++++++ .../0002-Don-t-rebase-sysroot-path.patch | 32 + package/qt5/qt5webengine-chromium/Config.in | 5 + .../qt5webengine-chromium/chromium-latest.inc | 1257 +++++++++++ .../qt5webengine-chromium.hash | 1256 +++++++++++ .../qt5webengine-chromium.mk | 23 + 7 files changed, 4432 insertions(+) create mode 100644 package/qt5/qt5webengine-chromium/0001-Add-python3-build-support.patch create mode 100644 package/qt5/qt5webengine-chromium/0002-Don-t-rebase-sysroot-path.patch 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 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/qt5webengine-chromium/0001-Add-python3-build-support.patch b/package/qt5/qt5webengine-chromium/0001-Add-python3-build-support.patch new file mode 100644 index 0000000000..cc9726418e --- /dev/null +++ b/package/qt5/qt5webengine-chromium/0001-Add-python3-build-support.patch @@ -0,0 +1,1858 @@ +From bf94b834e9beb4e7bc25dbc4c61f5e2db39e7cdc Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Fri, 4 Feb 2022 15:43:35 -0700 +Subject: [PATCH] Add python3 build support + +Adapted from: +https://github.com/archlinux/svntogit-packages/blob/6edf5f1aaea952d046aff89a2e0175258fe77361/trunk/qt5-webengine-chromium-python3.patch + +Signed-off-by: James Hilliard +--- + .../protobufs/binary_proto_generator.py | 8 +- + .../tracing/generate_trace_viewer_grd.py | 2 +- + chromium/mojo/public/tools/bindings/BUILD.gn | 2 + + .../tools/bindings/gen_data_files_list.py | 8 +- + .../generators/mojom_java_generator.py | 4 + + .../tools/mojom/mojom/generate/generator.py | 14 ++-- + .../tools/mojom/mojom/generate/module.py | 3 +- + .../mojom/mojom/generate/template_expander.py | 12 +-- + .../scripts/bind_gen/blink_v8_bridge.py | 6 +- + .../scripts/bind_gen/callback_interface.py | 2 +- + .../bindings/scripts/bind_gen/code_node.py | 10 +-- + .../bindings/scripts/bind_gen/codegen_expr.py | 15 ++-- + .../scripts/bind_gen/codegen_format.py | 2 +- + .../scripts/bind_gen/codegen_utils.py | 2 +- + .../bindings/scripts/bind_gen/dictionary.py | 2 +- + .../bindings/scripts/bind_gen/interface.py | 82 +++++++++++-------- + .../scripts/bind_gen/mako_renderer.py | 2 +- + .../bindings/scripts/bind_gen/style_format.py | 9 +- + .../bindings/scripts/bind_gen/task_queue.py | 5 +- + .../bindings/scripts/code_generator.py | 10 +++ + .../scripts/generate_origin_trial_features.py | 4 +- + .../bindings/scripts/idl_definitions.py | 8 +- + .../renderer/bindings/scripts/idl_reader.py | 4 +- + .../renderer/bindings/scripts/idl_types.py | 2 +- + .../renderer/bindings/scripts/utilities.py | 28 +++---- + .../renderer/bindings/scripts/v8_interface.py | 9 +- + .../renderer/bindings/scripts/v8_methods.py | 4 + + .../renderer/bindings/scripts/v8_utilities.py | 2 +- + .../scripts/web_idl/callback_interface.py | 12 +-- + .../bindings/scripts/web_idl/database.py | 2 +- + .../bindings/scripts/web_idl/exposure.py | 5 +- + .../bindings/scripts/web_idl/function_like.py | 28 +++---- + .../bindings/scripts/web_idl/idl_compiler.py | 21 ++--- + .../bindings/scripts/web_idl/interface.py | 45 +++++----- + .../bindings/scripts/web_idl/ir_builder.py | 29 ++++--- + .../bindings/scripts/web_idl/make_copy.py | 7 ++ + .../bindings/scripts/web_idl/namespace.py | 12 +-- + .../bindings/templates/dictionary_v8.cc.tmpl | 8 +- + .../scripts/core/css/make_style_shorthands.py | 23 +++--- + .../properties/make_css_property_instances.py | 4 +- + .../blink/renderer/build/scripts/gperf.py | 2 +- + .../blink/renderer/build/scripts/in_file.py | 2 +- + .../renderer/build/scripts/in_generator.py | 5 ++ + .../build/scripts/make_runtime_features.py | 2 +- + .../scripts/templates/element_factory.cc.tmpl | 4 +- + .../templates/element_type_helpers.cc.tmpl | 4 +- + .../templates/element_type_helpers.h.tmpl | 2 +- + .../build/scripts/templates/macros.tmpl | 4 +- + .../templates/make_qualified_names.h.tmpl | 4 +- + .../dawn/generator/generator_lib.py | 4 + + .../devtools-frontend/src/BUILD.gn | 2 + + .../scripts/build/build_inspector_overlay.py | 3 +- + .../build/build_release_applications.py | 9 +- + .../scripts/build/generate_devtools_grd.py | 4 +- + .../src/scripts/build/modular_build.py | 6 +- + chromium/third_party/jinja2/tests.py | 2 +- + chromium/tools/metrics/ukm/gen_builders.py | 5 +- + .../ui/ozone/generate_constructor_list.py | 13 ++- + .../ui/ozone/generate_ozone_platform_list.py | 26 ++++-- + 59 files changed, 331 insertions(+), 229 deletions(-) + +diff --git a/chromium/components/resources/protobufs/binary_proto_generator.py b/chromium/components/resources/protobufs/binary_proto_generator.py +index 7422ead9697..16365515f26 100755 +--- a/chromium/components/resources/protobufs/binary_proto_generator.py ++++ b/chromium/components/resources/protobufs/binary_proto_generator.py +@@ -7,7 +7,7 @@ + Converts a given ASCII proto into a binary resource. + + """ +- ++from __future__ import print_function + import abc + import imp + import optparse +@@ -196,12 +196,12 @@ class BinaryProtoGenerator: + self._ImportProtoModules(opts.path) + + if not self.VerifyArgs(opts): +- print "Wrong arguments" ++ print("Wrong arguments") + return 1 + + try: + self._GenerateBinaryProtos(opts) + except Exception as e: +- print "ERROR: Failed to render binary version of %s:\n %s\n%s" % ( +- opts.infile, str(e), traceback.format_exc()) ++ print("ERROR: Failed to render binary version of %s:\n %s\n%s" % ++ (opts.infile, str(e), traceback.format_exc())) + return 1 +diff --git a/chromium/content/browser/tracing/generate_trace_viewer_grd.py b/chromium/content/browser/tracing/generate_trace_viewer_grd.py +index 037f9497dc2..be393d21f90 100755 +--- a/chromium/content/browser/tracing/generate_trace_viewer_grd.py ++++ b/chromium/content/browser/tracing/generate_trace_viewer_grd.py +@@ -74,7 +74,7 @@ def main(argv): + for filename in parsed_args.source_files: + add_file_to_grd(doc, os.path.basename(filename)) + +- with open(parsed_args.output_filename, 'w') as output_file: ++ with open(parsed_args.output_filename, 'wb') as output_file: + output_file.write(doc.toxml(encoding='UTF-8')) + + +diff --git a/chromium/mojo/public/tools/bindings/BUILD.gn b/chromium/mojo/public/tools/bindings/BUILD.gn +index fc04b5dd0b1..708958e438b 100644 +--- a/chromium/mojo/public/tools/bindings/BUILD.gn ++++ b/chromium/mojo/public/tools/bindings/BUILD.gn +@@ -2,9 +2,11 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import("//build/config/python.gni") + import("//mojo/public/tools/bindings/mojom.gni") + import("//third_party/jinja2/jinja2.gni") + ++# TODO(crbug.com/1194274): Investigate nondeterminism in Py3 builds. + action("precompile_templates") { + sources = mojom_generator_sources + sources += [ +diff --git a/chromium/mojo/public/tools/bindings/gen_data_files_list.py b/chromium/mojo/public/tools/bindings/gen_data_files_list.py +index 79c9e50efce..8b78d092418 100644 +--- a/chromium/mojo/public/tools/bindings/gen_data_files_list.py ++++ b/chromium/mojo/public/tools/bindings/gen_data_files_list.py +@@ -18,7 +18,6 @@ import os + import re + import sys + +-from cStringIO import StringIO + from optparse import OptionParser + + sys.path.insert( +@@ -41,12 +40,9 @@ def main(): + pattern = re.compile(options.pattern) + files = [f for f in os.listdir(options.directory) if pattern.match(f)] + +- stream = StringIO() +- for f in files: +- print(f, file=stream) ++ contents = '\n'.join(f for f in files) + '\n' ++ WriteFile(contents, options.output) + +- WriteFile(stream.getvalue(), options.output) +- stream.close() + + if __name__ == '__main__': + sys.exit(main()) +diff --git a/chromium/mojo/public/tools/bindings/generators/mojom_java_generator.py b/chromium/mojo/public/tools/bindings/generators/mojom_java_generator.py +index 96b2fdfae0c..00b9dccd00c 100644 +--- a/chromium/mojo/public/tools/bindings/generators/mojom_java_generator.py ++++ b/chromium/mojo/public/tools/bindings/generators/mojom_java_generator.py +@@ -25,6 +25,10 @@ sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir, + 'build', 'android', 'gyp')) + from util import build_utils + ++# TODO(crbug.com/1174969): Remove this once Python2 is obsoleted. ++if sys.version_info.major != 2: ++ basestring = str ++ long = int + + GENERATOR_PREFIX = 'java' + +diff --git a/chromium/mojo/public/tools/mojom/mojom/generate/generator.py b/chromium/mojo/public/tools/mojom/mojom/generate/generator.py +index de62260a5c9..4a1c73fcf82 100644 +--- a/chromium/mojo/public/tools/mojom/mojom/generate/generator.py ++++ b/chromium/mojo/public/tools/mojom/mojom/generate/generator.py +@@ -136,9 +136,14 @@ class Stylizer(object): + + def WriteFile(contents, full_path): + # If |contents| is same with the file content, we skip updating. ++ if not isinstance(contents, bytes): ++ data = contents.encode('utf8') ++ else: ++ data = contents ++ + if os.path.isfile(full_path): + with open(full_path, 'rb') as destination_file: +- if destination_file.read() == contents: ++ if destination_file.read() == data: + return + + # Make sure the containing directory exists. +@@ -146,11 +151,8 @@ def WriteFile(contents, full_path): + fileutil.EnsureDirectoryExists(full_dir) + + # Dump the data to disk. +- with open(full_path, "wb") as f: +- if not isinstance(contents, bytes): +- f.write(contents.encode('utf-8')) +- else: +- f.write(contents) ++ with open(full_path, 'wb') as f: ++ f.write(data) + + + def AddComputedData(module): +diff --git a/chromium/mojo/public/tools/mojom/mojom/generate/module.py b/chromium/mojo/public/tools/mojom/mojom/generate/module.py +index ebbc9b322ea..3d026429bbc 100644 +--- a/chromium/mojo/public/tools/mojom/mojom/generate/module.py ++++ b/chromium/mojo/public/tools/mojom/mojom/generate/module.py +@@ -398,7 +398,8 @@ class Field(object): + + + class StructField(Field): +- pass ++ def __hash__(self): ++ return super(Field, self).__hash__() + + + class UnionField(Field): +diff --git a/chromium/mojo/public/tools/mojom/mojom/generate/template_expander.py b/chromium/mojo/public/tools/mojom/mojom/generate/template_expander.py +index 7a300560246..8d9e26fb7f6 100644 +--- a/chromium/mojo/public/tools/mojom/mojom/generate/template_expander.py ++++ b/chromium/mojo/public/tools/mojom/mojom/generate/template_expander.py +@@ -75,9 +75,9 @@ def PrecompileTemplates(generator_modules, output_dir): + os.path.dirname(module.__file__), generator.GetTemplatePrefix()) + ])) + jinja_env.filters.update(generator.GetFilters()) +- jinja_env.compile_templates( +- os.path.join(output_dir, "%s.zip" % generator.GetTemplatePrefix()), +- extensions=["tmpl"], +- zip="stored", +- py_compile=True, +- ignore_errors=False) ++ jinja_env.compile_templates(os.path.join( ++ output_dir, "%s.zip" % generator.GetTemplatePrefix()), ++ extensions=["tmpl"], ++ zip="stored", ++ py_compile=sys.version_info.major < 3, ++ ignore_errors=False) +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/blink_v8_bridge.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/blink_v8_bridge.py +index 3225ecca6e4..fc078d31b55 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/blink_v8_bridge.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/blink_v8_bridge.py +@@ -344,7 +344,7 @@ def make_default_value_expr(idl_type, default_value): + """ + assert default_value.is_type_compatible_with(idl_type) + +- class DefaultValueExpr: ++ class DefaultValueExpr(object): + _ALLOWED_SYMBOLS_IN_DEPS = ("isolate") + + def __init__(self, initializer_expr, initializer_deps, +@@ -502,7 +502,7 @@ def make_v8_to_blink_value(blink_var_name, + assert isinstance(blink_var_name, str) + assert isinstance(v8_value_expr, str) + assert isinstance(idl_type, web_idl.IdlType) +- assert (argument_index is None or isinstance(argument_index, (int, long))) ++ assert (argument_index is None or isinstance(argument_index, int)) + assert (default_value is None + or isinstance(default_value, web_idl.LiteralConstant)) + +@@ -622,7 +622,7 @@ def make_v8_to_blink_value_variadic(blink_var_name, v8_array, + """ + assert isinstance(blink_var_name, str) + assert isinstance(v8_array, str) +- assert isinstance(v8_array_start_index, (int, long)) ++ assert isinstance(v8_array_start_index, int) + assert isinstance(idl_type, web_idl.IdlType) + + pattern = ("auto&& ${{{_1}}} = " +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/callback_interface.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/callback_interface.py +index 4a6df513068..8b51f23a409 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/callback_interface.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/callback_interface.py +@@ -177,7 +177,7 @@ def generate_callback_interface(callback_interface_identifier): + prop_install_mode=PropInstallMode.UNCONDITIONAL, + trampoline_var_name=None, + attribute_entries=[], +- constant_entries=filter(is_unconditional, constant_entries), ++ constant_entries=list(filter(is_unconditional, constant_entries)), + exposed_construct_entries=[], + operation_entries=[]) + (install_interface_template_decl, install_interface_template_def, +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/code_node.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/code_node.py +index 52972fefe20..e5ae9d9629e 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/code_node.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/code_node.py +@@ -503,13 +503,13 @@ class CompositeNode(CodeNode): + gensym_kwargs = {} + template_vars = {} + for arg in args: +- assert isinstance(arg, (CodeNode, int, long, str)) ++ assert isinstance(arg, (CodeNode, int, str)) + gensym = CodeNode.gensym() + gensym_args.append("${{{}}}".format(gensym)) + template_vars[gensym] = arg + for key, value in kwargs.items(): +- assert isinstance(key, (int, long, str)) +- assert isinstance(value, (CodeNode, int, long, str)) ++ assert isinstance(key, (int, str)) ++ assert isinstance(value, (CodeNode, int, str)) + gensym = CodeNode.gensym() + gensym_kwargs[key] = "${{{}}}".format(gensym) + template_vars[gensym] = value +@@ -602,7 +602,7 @@ class ListNode(CodeNode): + def insert(self, index, node): + if node is None: + return +- assert isinstance(index, (int, long)) ++ assert isinstance(index, int) + assert isinstance(node, CodeNode) + assert node.outer is None and node.prev is None + +@@ -721,7 +721,7 @@ class SymbolScopeNode(SequenceNode): + if not scope_chains: + return counts + +- self_index = iter(scope_chains).next().index(self) ++ self_index = next(iter(scope_chains)).index(self) + scope_chains = map( + lambda scope_chain: scope_chain[self_index + 1:], scope_chains) + scope_to_likeliness = {} +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_expr.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_expr.py +index a229a6c71c9..5fa288dabf2 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_expr.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_expr.py +@@ -109,7 +109,7 @@ def expr_and(terms): + + if any(term.is_always_false for term in terms): + return _Expr(False) +- terms = filter(lambda x: not x.is_always_true, terms) ++ terms = list(filter(lambda x: not x.is_always_true, terms)) + if not terms: + return _Expr(True) + if len(terms) == 1: +@@ -124,7 +124,7 @@ def expr_or(terms): + + if any(term.is_always_true for term in terms): + return _Expr(True) +- terms = filter(lambda x: not x.is_always_false, terms) ++ terms = list(filter(lambda x: not x.is_always_false, terms)) + if not terms: + return _Expr(False) + if len(terms) == 1: +@@ -222,7 +222,7 @@ def expr_from_exposure(exposure, + elif exposure.only_in_secure_contexts is False: + secure_context_term = _Expr(True) + else: +- terms = map(ref_enabled, exposure.only_in_secure_contexts) ++ terms = list(map(ref_enabled, exposure.only_in_secure_contexts)) + secure_context_term = expr_or( + [_Expr("${is_in_secure_context}"), + expr_not(expr_and(terms))]) +@@ -275,10 +275,11 @@ def expr_from_exposure(exposure, + + # [ContextEnabled] + if exposure.context_enabled_features: +- terms = map( +- lambda feature: _Expr( +- "${{context_feature_settings}}->is{}Enabled()".format( +- feature)), exposure.context_enabled_features) ++ terms = list( ++ map( ++ lambda feature: _Expr( ++ "${{context_feature_settings}}->is{}Enabled()".format( ++ feature)), exposure.context_enabled_features)) + context_enabled_terms.append( + expr_and([_Expr("${context_feature_settings}"), + expr_or(terms)])) +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_format.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_format.py +index 87d26eec3ca..f3e9d38247e 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_format.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_format.py +@@ -23,7 +23,7 @@ class _TemplateFormatter(string.Formatter): + self._template_formatter_indexing_count_ = 0 + + def get_value(self, key, args, kwargs): +- if isinstance(key, (int, long)): ++ if isinstance(key, int): + return args[key] + assert isinstance(key, str) + if not key: +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_utils.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_utils.py +index 2bcc4fed49a..e72282aa696 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_utils.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_utils.py +@@ -116,4 +116,4 @@ def write_code_node_to_file(code_node, filepath): + # stderr=format_result.error_message)) + # + # web_idl.file_io.write_to_file_if_changed(filepath, format_result.contents) +- web_idl.file_io.write_to_file_if_changed(filepath, rendered_text) ++ web_idl.file_io.write_to_file_if_changed(filepath, rendered_text.encode('utf-8')) +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/dictionary.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/dictionary.py +index b39f0100410..4d68202296b 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/dictionary.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/dictionary.py +@@ -993,7 +993,7 @@ def make_dict_trace_func(cg_context): + _2 = _blink_member_name(member).value_var + return TextNode(_format(pattern, _1=_1, _2=_2)) + +- body.extend(map(make_trace_member_node, own_members)) ++ body.extend(list(map(make_trace_member_node, own_members))) + body.append(TextNode("BaseClass::Trace(visitor);")) + + return func_decl, func_def +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py +index 10ff30656ad..bfdf7128aac 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py +@@ -582,7 +582,7 @@ def _make_blink_api_call(code_node, + overriding_args=None): + assert isinstance(code_node, SymbolScopeNode) + assert isinstance(cg_context, CodeGenContext) +- assert num_of_args is None or isinstance(num_of_args, (int, long)) ++ assert num_of_args is None or isinstance(num_of_args, int) + assert (overriding_args is None + or (isinstance(overriding_args, (list, tuple)) + and all(isinstance(arg, str) for arg in overriding_args))) +@@ -1196,8 +1196,10 @@ def make_overload_dispatcher(cg_context): + did_use_break = did_use_break or can_fail + + conditional = expr_or( +- map(lambda item: expr_from_exposure(item.function_like.exposure), +- items)) ++ list( ++ map( ++ lambda item: expr_from_exposure(item.function_like.exposure ++ ), items))) + if not conditional.is_always_true: + node = CxxUnlikelyIfNode(cond=conditional, body=node) + +@@ -4642,7 +4644,7 @@ class _PropEntryConstructorGroup(_PropEntryBase): + def __init__(self, is_context_dependent, exposure_conditional, world, + constructor_group, ctor_callback_name, ctor_func_length): + assert isinstance(ctor_callback_name, str) +- assert isinstance(ctor_func_length, (int, long)) ++ assert isinstance(ctor_func_length, int) + + _PropEntryBase.__init__(self, is_context_dependent, + exposure_conditional, world, constructor_group) +@@ -4670,7 +4672,7 @@ class _PropEntryOperationGroup(_PropEntryBase): + op_func_length, + no_alloc_direct_callback_name=None): + assert isinstance(op_callback_name, str) +- assert isinstance(op_func_length, (int, long)) ++ assert isinstance(op_func_length, int) + + _PropEntryBase.__init__(self, is_context_dependent, + exposure_conditional, world, operation_group) +@@ -5175,9 +5177,9 @@ def make_install_interface_template(cg_context, function_name, class_name, api_c + ]) + + if class_like.identifier == "CSSStyleDeclaration": +- css_properties = filter( +- lambda attr: "CSSProperty" in attr.extended_attributes, +- class_like.attributes) ++ css_properties = list( ++ filter(lambda attr: "CSSProperty" in attr.extended_attributes, ++ class_like.attributes)) + if css_properties: + prop_name_list = "".join( + map(lambda attr: "\"{}\", ".format(attr.identifier), +@@ -5567,8 +5569,8 @@ ${instance_object} = ${v8_context}->Global()->GetPrototype().As();\ + "V8DOMConfiguration::InstallConstants(${isolate}, " + "${interface_template}, ${prototype_template}, " + "kConstantCallbackTable, base::size(kConstantCallbackTable));") +- constant_callback_entries = filter(lambda entry: entry.const_callback_name, +- constant_entries) ++ constant_callback_entries = list(filter(lambda entry: entry.const_callback_name, ++ constant_entries)) + install_properties(table_name, constant_callback_entries, + _make_constant_callback_registration_table, + installer_call_text) +@@ -5584,8 +5586,8 @@ ${instance_object} = ${v8_context}->Global()->GetPrototype().As();\ + "V8DOMConfiguration::InstallConstants(${isolate}, " + "${interface_template}, ${prototype_template}, " + "kConstantValueTable, base::size(kConstantValueTable));") +- constant_value_entries = filter( +- lambda entry: not entry.const_callback_name, constant_entries) ++ constant_value_entries = list(filter( ++ lambda entry: not entry.const_callback_name, constant_entries)) + install_properties(table_name, constant_value_entries, + _make_constant_value_registration_table, + installer_call_text) +@@ -6336,8 +6338,8 @@ def make_v8_context_snapshot_api(cg_context, component, attribute_entries, + assert isinstance(component, web_idl.Component) + + derived_interfaces = cg_context.interface.deriveds +- derived_names = map(lambda interface: interface.identifier, +- derived_interfaces) ++ derived_names = list( ++ map(lambda interface: interface.identifier, derived_interfaces)) + derived_names.append(cg_context.interface.identifier) + if not ("Window" in derived_names or "HTMLDocument" in derived_names): + return None, None +@@ -6411,9 +6413,11 @@ def _make_v8_context_snapshot_get_reference_table_function( + collect_callbacks(named_properties_object_callback_defs) + collect_callbacks(cross_origin_property_callback_defs) + +- entry_nodes = map( +- lambda name: TextNode("reinterpret_cast({}),".format(name)), +- filter(None, callback_names)) ++ entry_nodes = list( ++ map( ++ lambda name: TextNode("reinterpret_cast({}),".format(name ++ )), ++ filter(None, callback_names))) + table_node = ListNode([ + TextNode("using namespace ${class_name}Callbacks;"), + TextNode("static const intptr_t kReferenceTable[] = {"), +@@ -6451,10 +6455,11 @@ def _make_v8_context_snapshot_install_props_per_context_function( + class_name=None, + prop_install_mode=PropInstallMode.V8_CONTEXT_SNAPSHOT, + trampoline_var_name=None, +- attribute_entries=filter(selector, attribute_entries), +- constant_entries=filter(selector, constant_entries), +- exposed_construct_entries=filter(selector, exposed_construct_entries), +- operation_entries=filter(selector, operation_entries)) ++ attribute_entries=list(filter(selector, attribute_entries)), ++ constant_entries=list(filter(selector, constant_entries)), ++ exposed_construct_entries=list( ++ filter(selector, exposed_construct_entries)), ++ operation_entries=list(filter(selector, operation_entries))) + + return func_decl, func_def + +@@ -6810,11 +6815,11 @@ def generate_interface(interface_identifier): + class_name=impl_class_name, + prop_install_mode=PropInstallMode.UNCONDITIONAL, + trampoline_var_name=tp_install_unconditional_props, +- attribute_entries=filter(is_unconditional, attribute_entries), +- constant_entries=filter(is_unconditional, constant_entries), +- exposed_construct_entries=filter(is_unconditional, +- exposed_construct_entries), +- operation_entries=filter(is_unconditional, operation_entries)) ++ attribute_entries=list(filter(is_unconditional, attribute_entries)), ++ constant_entries=list(filter(is_unconditional, constant_entries)), ++ exposed_construct_entries=list( ++ filter(is_unconditional, exposed_construct_entries)), ++ operation_entries=list(filter(is_unconditional, operation_entries))) + (install_context_independent_props_decl, + install_context_independent_props_def, + install_context_independent_props_trampoline) = make_install_properties( +@@ -6823,11 +6828,14 @@ def generate_interface(interface_identifier): + class_name=impl_class_name, + prop_install_mode=PropInstallMode.CONTEXT_INDEPENDENT, + trampoline_var_name=tp_install_context_independent_props, +- attribute_entries=filter(is_context_independent, attribute_entries), +- constant_entries=filter(is_context_independent, constant_entries), +- exposed_construct_entries=filter(is_context_independent, +- exposed_construct_entries), +- operation_entries=filter(is_context_independent, operation_entries)) ++ attribute_entries=list( ++ filter(is_context_independent, attribute_entries)), ++ constant_entries=list(filter(is_context_independent, ++ constant_entries)), ++ exposed_construct_entries=list( ++ filter(is_context_independent, exposed_construct_entries)), ++ operation_entries=list( ++ filter(is_context_independent, operation_entries))) + (install_context_dependent_props_decl, install_context_dependent_props_def, + install_context_dependent_props_trampoline) = make_install_properties( + cg_context, +@@ -6835,11 +6843,13 @@ def generate_interface(interface_identifier): + class_name=impl_class_name, + prop_install_mode=PropInstallMode.CONTEXT_DEPENDENT, + trampoline_var_name=tp_install_context_dependent_props, +- attribute_entries=filter(is_context_dependent, attribute_entries), +- constant_entries=filter(is_context_dependent, constant_entries), +- exposed_construct_entries=filter(is_context_dependent, +- exposed_construct_entries), +- operation_entries=filter(is_context_dependent, operation_entries)) ++ attribute_entries=list(filter(is_context_dependent, ++ attribute_entries)), ++ constant_entries=list(filter(is_context_dependent, constant_entries)), ++ exposed_construct_entries=list( ++ filter(is_context_dependent, exposed_construct_entries)), ++ operation_entries=list(filter(is_context_dependent, ++ operation_entries))) + (install_interface_template_decl, install_interface_template_def, + install_interface_template_trampoline) = make_install_interface_template( + cg_context, +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/mako_renderer.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/mako_renderer.py +index b4c70553863..f3a2fcd772d 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/mako_renderer.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/mako_renderer.py +@@ -105,7 +105,7 @@ class MakoRenderer(object): + on_error = self._caller_stack_on_error + if (len(current) <= len(on_error) + and all(current[i] == on_error[i] +- for i in xrange(len(current)))): ++ for i in range(len(current)))): + pass # Error happened in a deeper caller. + else: + self._caller_stack_on_error = list(self._caller_stack) +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py +index dc3493cc394..017d3d47bb3 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py +@@ -70,8 +70,13 @@ def gn_format(contents, filename=None): + + + def _invoke_format_command(command_line, filename, contents): +- proc = subprocess.Popen( +- command_line, stdin=subprocess.PIPE, stdout=subprocess.PIPE) ++ kwargs = {} ++ if sys.version_info.major != 2: ++ kwargs['encoding'] = 'utf-8' ++ proc = subprocess.Popen(command_line, ++ stdin=subprocess.PIPE, ++ stdout=subprocess.PIPE, ++ **kwargs) + stdout_output, stderr_output = proc.communicate(input=contents) + exit_code = proc.wait() + +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/task_queue.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/task_queue.py +index 0d8f4c0f303..e666a9b668e 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/task_queue.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/task_queue.py +@@ -2,6 +2,7 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import functools + import multiprocessing + + from .package_initializer import package_initializer +@@ -76,7 +77,7 @@ class TaskQueue(object): + if not report_progress: + return + +- done_count = reduce( ++ done_count = functools.reduce( + lambda count, worker_task: count + bool(worker_task.ready()), + self._worker_tasks, 0) + report_progress(len(self._worker_tasks), done_count) +@@ -85,4 +86,4 @@ class TaskQueue(object): + def _task_queue_run_tasks(tasks): + for task in tasks: + func, args, kwargs = task +- apply(func, args, kwargs) ++ func(*args, **kwargs) +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/code_generator.py b/chromium/third_party/blink/renderer/bindings/scripts/code_generator.py +index e8280be7213..e49e6eb965e 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/code_generator.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/code_generator.py +@@ -13,6 +13,7 @@ import re + import sys + + from idl_types import set_ancestors, IdlType ++from itertools import groupby + from v8_globals import includes + from v8_interface import constant_filters + from v8_types import set_component_dirs +@@ -43,6 +44,7 @@ TEMPLATES_DIR = os.path.normpath( + # after path[0] == invoking script dir + sys.path.insert(1, THIRD_PARTY_DIR) + import jinja2 ++from jinja2.filters import make_attrgetter, environmentfilter + + + def generate_indented_conditional(code, conditional): +@@ -88,6 +90,13 @@ def runtime_enabled_if(code, name): + return generate_indented_conditional(code, function) + + ++ at environmentfilter ++def do_stringify_key_group_by(environment, value, attribute): ++ expr = make_attrgetter(environment, attribute) ++ key = lambda item: '' if expr(item) is None else str(expr(item)) ++ return groupby(sorted(value, key=key), expr) ++ ++ + def initialize_jinja_env(cache_dir): + jinja_env = jinja2.Environment( + loader=jinja2.FileSystemLoader(TEMPLATES_DIR), +@@ -117,6 +126,7 @@ def initialize_jinja_env(cache_dir): + }) + jinja_env.filters.update(constant_filters()) + jinja_env.filters.update(method_filters()) ++ jinja_env.filters["stringifykeygroupby"] = do_stringify_key_group_by + return jinja_env + + +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/generate_origin_trial_features.py b/chromium/third_party/blink/renderer/bindings/scripts/generate_origin_trial_features.py +index 130004eae83..04c0fabcef2 100755 +--- a/chromium/third_party/blink/renderer/bindings/scripts/generate_origin_trial_features.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/generate_origin_trial_features.py +@@ -80,7 +80,7 @@ def read_idl_file(reader, idl_filename): + assert len(interfaces) == 1, ( + "Expected one interface in file %r, found %d" % + (idl_filename, len(interfaces))) +- return (interfaces.values()[0], includes) ++ return (list(interfaces.values())[0], includes) + + + def interface_is_global(interface): +@@ -281,7 +281,7 @@ def main(): + + info_provider = create_component_info_provider( + os.path.normpath(options.info_dir), options.target_component) +- idl_filenames = map(str.strip, open(options.idl_files_list)) ++ idl_filenames = list(map(str.strip, open(options.idl_files_list))) + + generate_origin_trial_features(info_provider, options, idl_filenames) + return 0 +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/idl_definitions.py b/chromium/third_party/blink/renderer/bindings/scripts/idl_definitions.py +index 14e6e9d3f87..b027818aef2 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/idl_definitions.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/idl_definitions.py +@@ -394,7 +394,8 @@ class IdlInterface(object): + else: + raise ValueError('Unrecognized node class: %s' % child_class) + +- if len(filter(None, [self.iterable, self.maplike, self.setlike])) > 1: ++ if len(list(filter(None, ++ [self.iterable, self.maplike, self.setlike]))) > 1: + raise ValueError( + 'Interface can only have one of iterable<>, maplike<> and setlike<>.' + ) +@@ -512,6 +513,9 @@ class IdlAttribute(TypedObject): + def accept(self, visitor): + visitor.visit_attribute(self) + ++ def __lt__(self, other): ++ return self.name < other.name ++ + + ################################################################################ + # Constants +@@ -852,7 +856,7 @@ class IdlIncludes(object): + ################################################################################ + + +-class Exposure: ++class Exposure(object): + """An Exposure holds one Exposed or RuntimeEnabled condition. + Each exposure has two properties: exposed and runtime_enabled. + Exposure(e, r) corresponds to [Exposed(e r)]. Exposure(e) corresponds to +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/idl_reader.py b/chromium/third_party/blink/renderer/bindings/scripts/idl_reader.py +index 8d72865a6ca..b80eebdcd61 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/idl_reader.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/idl_reader.py +@@ -55,8 +55,8 @@ def validate_blink_idl_definitions(idl_filename, idl_file_basename, + definitions. There is no filename convention in this case. + - Otherwise, an IDL file is invalid. + """ +- targets = ( +- definitions.interfaces.values() + definitions.dictionaries.values()) ++ targets = (list(definitions.interfaces.values()) + ++ list(definitions.dictionaries.values())) + number_of_targets = len(targets) + if number_of_targets > 1: + raise Exception( +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/idl_types.py b/chromium/third_party/blink/renderer/bindings/scripts/idl_types.py +index cd4f0c3513b..ab95e9c0b08 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/idl_types.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/idl_types.py +@@ -349,7 +349,7 @@ class IdlUnionType(IdlTypeBase): + return True + + def single_matching_member_type(self, predicate): +- matching_types = filter(predicate, self.flattened_member_types) ++ matching_types = list(filter(predicate, self.flattened_member_types)) + if len(matching_types) > 1: + raise ValueError('%s is ambiguous.' % self.name) + return matching_types[0] if matching_types else None +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/utilities.py b/chromium/third_party/blink/renderer/bindings/scripts/utilities.py +index e1677ee7bd6..3c5006f064f 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/utilities.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/utilities.py +@@ -196,8 +196,9 @@ class ComponentInfoProviderModules(ComponentInfoProvider): + + @property + def callback_functions(self): +- return dict(self._component_info_core['callback_functions'].items() + +- self._component_info_modules['callback_functions'].items()) ++ return dict( ++ list(self._component_info_core['callback_functions'].items()) + ++ list(self._component_info_modules['callback_functions'].items())) + + @property + def specifier_for_export(self): +@@ -209,8 +210,8 @@ class ComponentInfoProviderModules(ComponentInfoProvider): + + + def load_interfaces_info_overall_pickle(info_dir): +- with open(os.path.join(info_dir, +- 'interfaces_info.pickle')) as interface_info_file: ++ with open(os.path.join(info_dir, 'interfaces_info.pickle'), ++ mode='rb') as interface_info_file: + return pickle.load(interface_info_file) + + +@@ -236,23 +237,20 @@ def merge_dict_recursively(target, diff): + + def create_component_info_provider_core(info_dir): + interfaces_info = load_interfaces_info_overall_pickle(info_dir) +- with open( +- os.path.join(info_dir, 'core', +- 'component_info_core.pickle')) as component_info_file: ++ with open(os.path.join(info_dir, 'core', 'component_info_core.pickle'), ++ mode='rb') as component_info_file: + component_info = pickle.load(component_info_file) + return ComponentInfoProviderCore(interfaces_info, component_info) + + + def create_component_info_provider_modules(info_dir): + interfaces_info = load_interfaces_info_overall_pickle(info_dir) +- with open( +- os.path.join(info_dir, 'core', +- 'component_info_core.pickle')) as component_info_file: ++ with open(os.path.join(info_dir, 'core', 'component_info_core.pickle'), ++ mode='rb') as component_info_file: + component_info_core = pickle.load(component_info_file) +- with open( +- os.path.join( +- info_dir, 'modules', +- 'component_info_modules.pickle')) as component_info_file: ++ with open(os.path.join(info_dir, 'modules', ++ 'component_info_modules.pickle'), ++ mode='rb') as component_info_file: + component_info_modules = pickle.load(component_info_file) + return ComponentInfoProviderModules(interfaces_info, component_info_core, + component_info_modules) +@@ -356,7 +354,7 @@ def write_pickle_file(pickle_filename, data): + pickle_filename = abs(pickle_filename) + # If |data| is same with the file content, we skip updating. + if os.path.isfile(pickle_filename): +- with open(pickle_filename) as pickle_file: ++ with open(pickle_filename, 'rb') as pickle_file: + try: + if pickle.load(pickle_file) == data: + return +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/v8_interface.py b/chromium/third_party/blink/renderer/bindings/scripts/v8_interface.py +index a43260414db..a85b03abe75 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/v8_interface.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/v8_interface.py +@@ -189,7 +189,7 @@ def context_enabled_features(attributes): + return sorted([ + member for member in members + if member.get(KEY) and not member.get('exposed_test') +- ]) ++ ], key=lambda item: item['name']) + + def member_filter_by_name(members, name): + return [member for member in members if member[KEY] == name] +@@ -612,7 +612,8 @@ def interface_context(interface, interfaces, component_info): + sorted( + origin_trial_features(interface, context['constants'], + context['attributes'], context['methods']) + +- context_enabled_features(context['attributes'])), ++ context_enabled_features(context['attributes']), ++ key=lambda item: item['name']), + }) + if context['optional_features']: + includes.add('platform/bindings/v8_per_context_data.h') +@@ -1356,9 +1357,9 @@ def resolution_tests_methods(effective_overloads): + + # Extract argument and IDL type to simplify accessing these in each loop. + arguments = [method['arguments'][index] for method in methods] +- arguments_methods = zip(arguments, methods) ++ arguments_methods = list(zip(arguments, methods)) + idl_types = [argument['idl_type_object'] for argument in arguments] +- idl_types_methods = zip(idl_types, methods) ++ idl_types_methods = list(zip(idl_types, methods)) + + # We can?t do a single loop through all methods or simply sort them, because + # a method may be listed in multiple steps of the resolution algorithm, and +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/v8_methods.py b/chromium/third_party/blink/renderer/bindings/scripts/v8_methods.py +index 5f1f89a3def..6ee8a407798 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/v8_methods.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/v8_methods.py +@@ -46,6 +46,10 @@ import v8_types + import v8_utilities + from v8_utilities import (has_extended_attribute_value, is_unforgeable) + ++# TODO: Remove this once Python2 is obsoleted. ++if sys.version_info.major != 2: ++ basestring = str ++ + + def method_is_visible(method, interface_is_partial): + if 'overloads' in method: +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/v8_utilities.py b/chromium/third_party/blink/renderer/bindings/scripts/v8_utilities.py +index 2ecd6923320..fcfc48371b1 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/v8_utilities.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/v8_utilities.py +@@ -271,7 +271,7 @@ EXPOSED_WORKERS = set([ + ]) + + +-class ExposureSet: ++class ExposureSet(object): + """An ExposureSet is a collection of Exposure instructions.""" + + def __init__(self, exposures=None): +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/callback_interface.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/callback_interface.py +index 13fb7c7068d..b73b7710687 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/callback_interface.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/callback_interface.py +@@ -91,11 +91,13 @@ class CallbackInterface(UserDefinedType, WithExtendedAttributes, + for operation_ir in ir.operations + ]) + self._operation_groups = tuple([ +- OperationGroup( +- operation_group_ir, +- filter(lambda x: x.identifier == operation_group_ir.identifier, +- self._operations), +- owner=self) for operation_group_ir in ir.operation_groups ++ OperationGroup(operation_group_ir, ++ list( ++ filter( ++ lambda x: x.identifier == operation_group_ir ++ .identifier, self._operations)), ++ owner=self) ++ for operation_group_ir in ir.operation_groups + ]) + + @property +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/database.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/database.py +index c92cf48eb2a..f5d59129449 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/database.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/database.py +@@ -156,4 +156,4 @@ class Database(object): + return self._view_by_kind(Database._Kind.UNION) + + def _view_by_kind(self, kind): +- return self._impl.find_by_kind(kind).values() ++ return list(self._impl.find_by_kind(kind).values()) +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/exposure.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/exposure.py +index abaeef39c30..e36cf7439ae 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/exposure.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/exposure.py +@@ -8,8 +8,11 @@ from .runtime_enabled_features import RuntimeEnabledFeatures + class _Feature(str): + """Represents a runtime-enabled feature.""" + ++ def __new__(cls, value): ++ return str.__new__(cls, value) ++ + def __init__(self, value): +- str.__init__(self, value) ++ str.__init__(self) + self._is_context_dependent = ( + RuntimeEnabledFeatures.is_context_dependent(self)) + +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/function_like.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/function_like.py +index 648c70d803d..1712f19c672 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/function_like.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/function_like.py +@@ -71,8 +71,9 @@ class FunctionLike(WithIdentifier): + def num_of_required_arguments(self): + """Returns the number of required arguments.""" + return len( +- filter(lambda arg: not (arg.is_optional or arg.is_variadic), +- self.arguments)) ++ list( ++ filter(lambda arg: not (arg.is_optional or arg.is_variadic), ++ self.arguments))) + + + class OverloadGroup(WithIdentifier): +@@ -171,8 +172,7 @@ class OverloadGroup(WithIdentifier): + Returns the effective overload set. + https://heycam.github.io/webidl/#compute-the-effective-overload-set + """ +- assert argument_count is None or isinstance(argument_count, +- (int, long)) ++ assert argument_count is None or isinstance(argument_count, int) + + N = argument_count + S = [] +@@ -188,21 +188,21 @@ class OverloadGroup(WithIdentifier): + + S.append( + OverloadGroup.EffectiveOverloadItem( +- X, map(lambda arg: arg.idl_type, X.arguments), +- map(lambda arg: arg.optionality, X.arguments))) ++ X, list(map(lambda arg: arg.idl_type, X.arguments)), ++ list(map(lambda arg: arg.optionality, X.arguments)))) + + if X.is_variadic: +- for i in xrange(n, max(maxarg, N)): +- t = map(lambda arg: arg.idl_type, X.arguments) +- o = map(lambda arg: arg.optionality, X.arguments) +- for _ in xrange(n, i + 1): ++ for i in range(n, max(maxarg, N)): ++ t = list(map(lambda arg: arg.idl_type, X.arguments)) ++ o = list(map(lambda arg: arg.optionality, X.arguments)) ++ for _ in range(n, i + 1): + t.append(X.arguments[-1].idl_type) + o.append(X.arguments[-1].optionality) + S.append(OverloadGroup.EffectiveOverloadItem(X, t, o)) + +- t = map(lambda arg: arg.idl_type, X.arguments) +- o = map(lambda arg: arg.optionality, X.arguments) +- for i in xrange(n - 1, -1, -1): ++ t = list(map(lambda arg: arg.idl_type, X.arguments)) ++ o = list(map(lambda arg: arg.optionality, X.arguments)) ++ for i in range(n - 1, -1, -1): + if X.arguments[i].optionality == IdlType.Optionality.REQUIRED: + break + S.append(OverloadGroup.EffectiveOverloadItem(X, t[:i], o[:i])) +@@ -222,7 +222,7 @@ class OverloadGroup(WithIdentifier): + for item in items) + assert len(items) > 1 + +- for index in xrange(len(items[0].type_list)): ++ for index in range(len(items[0].type_list)): + # Assume that the given items are valid, and we only need to test + # the two types. + if OverloadGroup.are_distinguishable_types( +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/idl_compiler.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/idl_compiler.py +index c5ee2bd8a3d..58315072480 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/idl_compiler.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/idl_compiler.py +@@ -149,8 +149,8 @@ class IdlCompiler(object): + for old_ir in old_irs: + new_ir = make_copy(old_ir) + self._ir_map.add(new_ir) +- new_ir.attributes = filter(not_disabled, new_ir.attributes) +- new_ir.operations = filter(not_disabled, new_ir.operations) ++ new_ir.attributes = list(filter(not_disabled, new_ir.attributes)) ++ new_ir.operations = list(filter(not_disabled, new_ir.operations)) + + def _record_defined_in_partial_and_mixin(self): + old_irs = self._ir_map.irs_of_kinds( +@@ -231,7 +231,7 @@ class IdlCompiler(object): + only_to_members_of_partial_or_mixin=False) + propagate_to_exposure(propagate) + +- map(process_member_like, ir.iter_all_members()) ++ list(map(process_member_like, ir.iter_all_members())) + + def process_member_like(ir): + propagate = functools.partial(propagate_extattr, ir=ir) +@@ -257,7 +257,7 @@ class IdlCompiler(object): + + self._ir_map.move_to_new_phase() + +- map(process_interface_like, old_irs) ++ list(map(process_interface_like, old_irs)) + + def _determine_blink_headers(self): + irs = self._ir_map.irs_of_kinds( +@@ -422,9 +422,9 @@ class IdlCompiler(object): + assert not new_interface.deriveds + derived_set = identifier_to_derived_set.get( + new_interface.identifier, set()) +- new_interface.deriveds = map( +- lambda id_: self._ref_to_idl_def_factory.create(id_), +- sorted(derived_set)) ++ new_interface.deriveds = list( ++ map(lambda id_: self._ref_to_idl_def_factory.create(id_), ++ sorted(derived_set))) + + def _supplement_missing_html_constructor_operation(self): + # Temporary mitigation of misuse of [HTMLConstructor] +@@ -553,7 +553,8 @@ class IdlCompiler(object): + self._ir_map.add(new_ir) + + for group in new_ir.iter_all_overload_groups(): +- exposures = map(lambda overload: overload.exposure, group) ++ exposures = list(map(lambda overload: overload.exposure, ++ group)) + + # [Exposed] + if any(not exposure.global_names_and_features +@@ -653,8 +654,8 @@ class IdlCompiler(object): + constructs = set() + for global_name in global_names: + constructs.update(exposed_map.get(global_name, [])) +- new_ir.exposed_constructs = map( +- self._ref_to_idl_def_factory.create, sorted(constructs)) ++ new_ir.exposed_constructs = list( ++ map(self._ref_to_idl_def_factory.create, sorted(constructs))) + + assert not new_ir.legacy_window_aliases + if new_ir.identifier != 'Window': +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/interface.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/interface.py +index 65d24e529d1..067ef2eb0b2 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/interface.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/interface.py +@@ -180,8 +180,9 @@ class Interface(UserDefinedType, WithExtendedAttributes, WithCodeGeneratorInfo, + self._constructor_groups = tuple([ + ConstructorGroup( + group_ir, +- filter(lambda x: x.identifier == group_ir.identifier, +- self._constructors), ++ list( ++ filter(lambda x: x.identifier == group_ir.identifier, ++ self._constructors)), + owner=self) for group_ir in ir.constructor_groups + ]) + assert len(self._constructor_groups) <= 1 +@@ -192,8 +193,9 @@ class Interface(UserDefinedType, WithExtendedAttributes, WithCodeGeneratorInfo, + self._named_constructor_groups = tuple([ + ConstructorGroup( + group_ir, +- filter(lambda x: x.identifier == group_ir.identifier, +- self._named_constructors), ++ list( ++ filter(lambda x: x.identifier == group_ir.identifier, ++ self._named_constructors)), + owner=self) for group_ir in ir.named_constructor_groups + ]) + self._operations = tuple([ +@@ -203,22 +205,23 @@ class Interface(UserDefinedType, WithExtendedAttributes, WithCodeGeneratorInfo, + self._operation_groups = tuple([ + OperationGroup( + group_ir, +- filter(lambda x: x.identifier == group_ir.identifier, +- self._operations), ++ list( ++ filter(lambda x: x.identifier == group_ir.identifier, ++ self._operations)), + owner=self) for group_ir in ir.operation_groups + ]) + self._exposed_constructs = tuple(ir.exposed_constructs) + self._legacy_window_aliases = tuple(ir.legacy_window_aliases) + self._indexed_and_named_properties = None +- indexed_and_named_property_operations = filter( +- lambda x: x.is_indexed_or_named_property_operation, +- self._operations) ++ indexed_and_named_property_operations = list( ++ filter(lambda x: x.is_indexed_or_named_property_operation, ++ self._operations)) + if indexed_and_named_property_operations: + self._indexed_and_named_properties = IndexedAndNamedProperties( + indexed_and_named_property_operations, owner=self) + self._stringifier = None +- stringifier_operation_irs = filter(lambda x: x.is_stringifier, +- ir.operations) ++ stringifier_operation_irs = list( ++ filter(lambda x: x.is_stringifier, ir.operations)) + if stringifier_operation_irs: + assert len(stringifier_operation_irs) == 1 + op_ir = make_copy(stringifier_operation_irs[0]) +@@ -231,8 +234,9 @@ class Interface(UserDefinedType, WithExtendedAttributes, WithCodeGeneratorInfo, + attribute = None + if operation.stringifier_attribute: + attr_id = operation.stringifier_attribute +- attributes = filter(lambda x: x.identifier == attr_id, +- self._attributes) ++ attributes = list( ++ filter(lambda x: x.identifier == attr_id, ++ self._attributes)) + assert len(attributes) == 1 + attribute = attributes[0] + self._stringifier = Stringifier(operation, attribute, owner=self) +@@ -578,8 +582,9 @@ class Iterable(WithDebugInfo): + self._operation_groups = tuple([ + OperationGroup( + group_ir, +- filter(lambda x: x.identifier == group_ir.identifier, +- self._operations), ++ list( ++ filter(lambda x: x.identifier == group_ir.identifier, ++ self._operations)), + owner=owner) for group_ir in ir.operation_groups + ]) + +@@ -666,8 +671,9 @@ class Maplike(WithDebugInfo): + self._operation_groups = tuple([ + OperationGroup( + group_ir, +- filter(lambda x: x.identifier == group_ir.identifier, +- self._operations), ++ list( ++ filter(lambda x: x.identifier == group_ir.identifier, ++ self._operations)), + owner=owner) for group_ir in ir.operation_groups + ]) + +@@ -755,8 +761,9 @@ class Setlike(WithDebugInfo): + self._operation_groups = tuple([ + OperationGroup( + group_ir, +- filter(lambda x: x.identifier == group_ir.identifier, +- self._operations), ++ list( ++ filter(lambda x: x.identifier == group_ir.identifier, ++ self._operations)), + owner=owner) for group_ir in ir.operation_groups + ]) + +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/ir_builder.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/ir_builder.py +index e9aeff4ab82..d80554d603e 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/ir_builder.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/ir_builder.py +@@ -2,6 +2,8 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import sys ++ + from .argument import Argument + from .ast_group import AstGroup + from .attribute import Attribute +@@ -30,6 +32,11 @@ from .operation import Operation + from .typedef import Typedef + + ++# TODO: Remove this once Python2 is obsoleted. ++if sys.version_info.major != 2: ++ long = int ++ ++ + def load_and_register_idl_definitions(filepaths, register_ir, + create_ref_to_idl_def, idl_type_factory): + """ +@@ -160,7 +167,7 @@ class _IRBuilder(object): + child_nodes = list(node.GetChildren()) + extended_attributes = self._take_extended_attributes(child_nodes) + +- members = map(self._build_interface_member, child_nodes) ++ members = list(map(self._build_interface_member, child_nodes)) + attributes = [] + constants = [] + operations = [] +@@ -302,7 +309,7 @@ class _IRBuilder(object): + child_nodes = list(node.GetChildren()) + inherited = self._take_inheritance(child_nodes) + extended_attributes = self._take_extended_attributes(child_nodes) +- own_members = map(self._build_dictionary_member, child_nodes) ++ own_members = list(map(self._build_dictionary_member, child_nodes)) + + return Dictionary.IR( + identifier=Identifier(node.GetName()), +@@ -336,7 +343,7 @@ class _IRBuilder(object): + + child_nodes = list(node.GetChildren()) + extended_attributes = self._take_extended_attributes(child_nodes) +- members = map(self._build_interface_member, child_nodes) ++ members = list(map(self._build_interface_member, child_nodes)) + constants = [] + operations = [] + for member in members: +@@ -456,8 +463,8 @@ class _IRBuilder(object): + assert len(child_nodes) == 1 + child = child_nodes[0] + if child.GetClass() == 'Arguments': +- arguments = map(build_extattr_argument, +- child.GetChildren()) ++ arguments = list( ++ map(build_extattr_argument, child.GetChildren())) + elif child.GetClass() == 'Call': + assert len(child.GetChildren()) == 1 + grand_child = child.GetChildren()[0] +@@ -486,7 +493,9 @@ class _IRBuilder(object): + + assert node.GetClass() == 'ExtAttributes' + return ExtendedAttributes( +- filter(None, map(build_extended_attribute, node.GetChildren()))) ++ list( ++ filter(None, map(build_extended_attribute, ++ node.GetChildren())))) + + def _build_inheritance(self, node): + assert node.GetClass() == 'Inherit' +@@ -506,7 +515,7 @@ class _IRBuilder(object): + + def _build_iterable(self, node): + assert node.GetClass() == 'Iterable' +- types = map(self._build_type, node.GetChildren()) ++ types = list(map(self._build_type, node.GetChildren())) + assert len(types) == 1 or len(types) == 2 + if len(types) == 1: # value iterator + key_type, value_type = (None, types[0]) +@@ -584,7 +593,7 @@ class _IRBuilder(object): + def _build_maplike(self, node, interface_identifier): + assert node.GetClass() == 'Maplike' + assert isinstance(interface_identifier, Identifier) +- types = map(self._build_type, node.GetChildren()) ++ types = list(map(self._build_type, node.GetChildren())) + assert len(types) == 2 + key_type, value_type = types + is_readonly = bool(node.GetProperty('READONLY')) +@@ -676,7 +685,7 @@ class _IRBuilder(object): + def _build_setlike(self, node, interface_identifier): + assert node.GetClass() == 'Setlike' + assert isinstance(interface_identifier, Identifier) +- types = map(self._build_type, node.GetChildren()) ++ types = list(map(self._build_type, node.GetChildren())) + assert len(types) == 1 + value_type = types[0] + is_readonly = bool(node.GetProperty('READONLY')) +@@ -838,7 +847,7 @@ class _IRBuilder(object): + + def build_union_type(node, extended_attributes): + return self._idl_type_factory.union_type( +- member_types=map(self._build_type, node.GetChildren()), ++ member_types=list(map(self._build_type, node.GetChildren())), + is_optional=is_optional, + extended_attributes=extended_attributes, + debug_info=self._build_debug_info(node)) +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/make_copy.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/make_copy.py +index a7a2b11f3f0..2f6b61300ff 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/make_copy.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/make_copy.py +@@ -3,6 +3,13 @@ + # found in the LICENSE file. + + ++import sys ++ ++# TODO: Remove this once Python2 is obsoleted. ++if sys.version_info.major != 2: ++ long = int ++ basestring = str ++ + def make_copy(obj, memo=None): + """ + Creates a copy of the given object, which should be an IR or part of IR. +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/namespace.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/namespace.py +index eeabef97cbe..bd7e98907f3 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/namespace.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/namespace.py +@@ -107,11 +107,13 @@ class Namespace(UserDefinedType, WithExtendedAttributes, WithCodeGeneratorInfo, + for operation_ir in ir.operations + ]) + self._operation_groups = tuple([ +- OperationGroup( +- operation_group_ir, +- filter(lambda x: x.identifier == operation_group_ir.identifier, +- self._operations), +- owner=self) for operation_group_ir in ir.operation_groups ++ OperationGroup(operation_group_ir, ++ list( ++ filter( ++ lambda x: x.identifier == operation_group_ir ++ .identifier, self._operations)), ++ owner=self) ++ for operation_group_ir in ir.operation_groups + ]) + + @property +diff --git a/chromium/third_party/blink/renderer/bindings/templates/dictionary_v8.cc.tmpl b/chromium/third_party/blink/renderer/bindings/templates/dictionary_v8.cc.tmpl +index 0add9c45a38..dc910f6d227 100644 +--- a/chromium/third_party/blink/renderer/bindings/templates/dictionary_v8.cc.tmpl ++++ b/chromium/third_party/blink/renderer/bindings/templates/dictionary_v8.cc.tmpl +@@ -59,9 +59,9 @@ void {{v8_class}}::ToImpl(v8::Isolate* isolate, v8::Local v8_value, { + DCHECK(executionContext); + {% endif %}{# has_origin_trial_members #} + {% endif %}{# members #} +- {% for origin_trial_test, origin_trial_member_list in members | groupby('origin_trial_feature_name') %} ++ {% for origin_trial_test, origin_trial_member_list in members | stringifykeygroupby('origin_trial_feature_name') %} + {% filter origin_trial_enabled(origin_trial_test, "executionContext") %} +- {% for feature_name, member_list in origin_trial_member_list | groupby('runtime_enabled_feature_name') %} ++ {% for feature_name, member_list in origin_trial_member_list | stringifykeygroupby('runtime_enabled_feature_name') %} + {% filter runtime_enabled(feature_name) %} + {% for member in member_list %} + v8::Local {{member.v8_value}}; +@@ -147,9 +147,9 @@ bool toV8{{cpp_class}}(const {{cpp_class}}* impl, v8::Local dictiona + DCHECK(executionContext); + {% endif %}{# has_origin_trial_members #} + {% endif %}{# members #} +- {% for origin_trial_test, origin_trial_member_list in members | groupby('origin_trial_feature_name') %} ++ {% for origin_trial_test, origin_trial_member_list in members | stringifykeygroupby('origin_trial_feature_name') %} + {% filter origin_trial_enabled(origin_trial_test, "executionContext") %} +- {% for feature_name, member_list in origin_trial_member_list | groupby('runtime_enabled_feature_name') %} ++ {% for feature_name, member_list in origin_trial_member_list | stringifykeygroupby('runtime_enabled_feature_name') %} + {% filter runtime_enabled(feature_name) %} + {% for member in member_list %} + v8::Local {{member.v8_value}}; +diff --git a/chromium/third_party/blink/renderer/build/scripts/core/css/make_style_shorthands.py b/chromium/third_party/blink/renderer/build/scripts/core/css/make_style_shorthands.py +index 1799cd5a153..5f43ffabc26 100755 +--- a/chromium/third_party/blink/renderer/build/scripts/core/css/make_style_shorthands.py ++++ b/chromium/third_party/blink/renderer/build/scripts/core/css/make_style_shorthands.py +@@ -71,7 +71,7 @@ class Expansion(object): + def enabled_longhands(self): + include = lambda longhand: not longhand[ + 'runtime_flag'] or self.is_enabled(longhand['runtime_flag']) +- return filter(include, self._longhands) ++ return list(filter(include, self._longhands)) + + @property + def index(self): +@@ -87,8 +87,9 @@ class Expansion(object): + + def create_expansions(longhands): + flags = collect_runtime_flags(longhands) +- expansions = map(lambda mask: Expansion(longhands, flags, mask), +- range(1 << len(flags))) ++ expansions = list( ++ map(lambda mask: Expansion(longhands, flags, mask), ++ range(1 << len(flags)))) + assert len(expansions) > 0 + # We generate 2^N expansions for N flags, so enforce some limit. + assert len(flags) <= 4, 'Too many runtime flags for a single shorthand' +@@ -114,14 +115,14 @@ class StylePropertyShorthandWriter(json5_generator.Writer): + + self._longhand_dictionary = defaultdict(list) + for property_ in json5_properties.shorthands: +- property_['longhand_enum_keys'] = map(enum_key_for_css_property, +- property_['longhands']) +- property_['longhand_property_ids'] = map(id_for_css_property, +- property_['longhands']) +- +- longhands = map( +- lambda name: json5_properties.properties_by_name[name], +- property_['longhands']) ++ property_['longhand_enum_keys'] = list( ++ map(enum_key_for_css_property, property_['longhands'])) ++ property_['longhand_property_ids'] = list( ++ map(id_for_css_property, property_['longhands'])) ++ ++ longhands = list( ++ map(lambda name: json5_properties.properties_by_name[name], ++ property_['longhands'])) + property_['expansions'] = create_expansions(longhands) + for longhand_enum_key in property_['longhand_enum_keys']: + self._longhand_dictionary[longhand_enum_key].append(property_) +diff --git a/chromium/third_party/blink/renderer/build/scripts/core/css/properties/make_css_property_instances.py b/chromium/third_party/blink/renderer/build/scripts/core/css/properties/make_css_property_instances.py +index 75030ac577e..f72aadee17d 100755 +--- a/chromium/third_party/blink/renderer/build/scripts/core/css/properties/make_css_property_instances.py ++++ b/chromium/third_party/blink/renderer/build/scripts/core/css/properties/make_css_property_instances.py +@@ -42,8 +42,8 @@ class CSSPropertyInstancesWriter(json5_generator.Writer): + aliases = self._css_properties.aliases + + # Lists of PropertyClassData. +- self._property_classes_by_id = map(self.get_class, properties) +- self._alias_classes_by_id = map(self.get_class, aliases) ++ self._property_classes_by_id = list(map(self.get_class, properties)) ++ self._alias_classes_by_id = list(map(self.get_class, aliases)) + + # Sort by enum value. + self._property_classes_by_id.sort(key=lambda t: t.enum_value) +diff --git a/chromium/third_party/blink/renderer/build/scripts/gperf.py b/chromium/third_party/blink/renderer/build/scripts/gperf.py +index 5ee49056be4..db72660d471 100644 +--- a/chromium/third_party/blink/renderer/build/scripts/gperf.py ++++ b/chromium/third_party/blink/renderer/build/scripts/gperf.py +@@ -95,7 +95,7 @@ def main(): + + open(args.output_file, 'wb').write( + generate_gperf(gperf_path, +- open(infile).read(), gperf_args)) ++ open(infile).read(), gperf_args).encode('utf-8')) + + + if __name__ == '__main__': +diff --git a/chromium/third_party/blink/renderer/build/scripts/in_file.py b/chromium/third_party/blink/renderer/build/scripts/in_file.py +index 28adc050f1e..58113483e57 100644 +--- a/chromium/third_party/blink/renderer/build/scripts/in_file.py ++++ b/chromium/third_party/blink/renderer/build/scripts/in_file.py +@@ -66,7 +66,7 @@ class InFile(object): + self._defaults = defaults + self._valid_values = copy.deepcopy( + valid_values if valid_values else {}) +- self._parse(map(str.strip, lines)) ++ self._parse(list(map(str.strip, lines))) + + @classmethod + def load_from_files(self, file_paths, defaults, valid_values, +diff --git a/chromium/third_party/blink/renderer/build/scripts/in_generator.py b/chromium/third_party/blink/renderer/build/scripts/in_generator.py +index e46740a2e85..ab1981ad1e3 100644 +--- a/chromium/third_party/blink/renderer/build/scripts/in_generator.py ++++ b/chromium/third_party/blink/renderer/build/scripts/in_generator.py +@@ -32,10 +32,15 @@ import os + import os.path + import shlex + import shutil ++import sys + import optparse + + from in_file import InFile + ++# TODO: Remove this once Python2 is obsoleted. ++if sys.version_info.major != 2: ++ basestring = str ++ + + ######################################################### + # This is now deprecated - use json5_generator.py instead +diff --git a/chromium/third_party/blink/renderer/build/scripts/make_runtime_features.py b/chromium/third_party/blink/renderer/build/scripts/make_runtime_features.py +index cafe8d94a8e..6925a4fa580 100755 +--- a/chromium/third_party/blink/renderer/build/scripts/make_runtime_features.py ++++ b/chromium/third_party/blink/renderer/build/scripts/make_runtime_features.py +@@ -138,7 +138,7 @@ class RuntimeFeatureWriter(BaseRuntimeFeatureWriter): + except Exception: + # If trouble unpickling, overwrite + pass +- with open(os.path.abspath(file_name), 'w') as pickle_file: ++ with open(os.path.abspath(file_name), 'wb') as pickle_file: + pickle.dump(features_map, pickle_file) + + def _template_inputs(self): +diff --git a/chromium/third_party/blink/renderer/build/scripts/templates/element_factory.cc.tmpl b/chromium/third_party/blink/renderer/build/scripts/templates/element_factory.cc.tmpl +index dc3f44c5b10..3eefcf9f0ee 100644 +--- a/chromium/third_party/blink/renderer/build/scripts/templates/element_factory.cc.tmpl ++++ b/chromium/third_party/blink/renderer/build/scripts/templates/element_factory.cc.tmpl +@@ -26,7 +26,7 @@ using {{namespace}}FunctionMap = HashMapGetExecutionContext())) { +diff --git a/chromium/third_party/blink/renderer/build/scripts/templates/element_type_helpers.h.tmpl b/chromium/third_party/blink/renderer/build/scripts/templates/element_type_helpers.h.tmpl +index 1b5297d52dc..edecc81d9d4 100644 +--- a/chromium/third_party/blink/renderer/build/scripts/templates/element_type_helpers.h.tmpl ++++ b/chromium/third_party/blink/renderer/build/scripts/templates/element_type_helpers.h.tmpl +@@ -15,7 +15,7 @@ namespace blink { + class Document; + + // Type checking. +-{% for tag in tags|sort if not tag.multipleTagNames and not tag.noTypeHelpers %} ++{% for tag in tags|sort(attribute='name') if not tag.multipleTagNames and not tag.noTypeHelpers %} + class {{tag.interface}}; + template <> + inline bool IsElementOfType(const Node& node) { +diff --git a/chromium/third_party/blink/renderer/build/scripts/templates/macros.tmpl b/chromium/third_party/blink/renderer/build/scripts/templates/macros.tmpl +index 0244433af2e..dcdbb02a56c 100644 +--- a/chromium/third_party/blink/renderer/build/scripts/templates/macros.tmpl ++++ b/chromium/third_party/blink/renderer/build/scripts/templates/macros.tmpl +@@ -25,7 +25,7 @@ + + + {% macro trie_leaf(index, object, return_macro, lowercase_data) %} +-{% set name, value = object.items()[0] %} ++{% set name, value = (object.items()|list)[0] %} + {% if name|length %} + if ( + {%- for c in name -%} +@@ -45,7 +45,7 @@ return {{ return_macro(value) }}; + + + {% macro trie_switch(trie, index, return_macro, lowercase_data) %} +-{% if trie|length == 1 and trie.values()[0] is string %} ++{% if trie|length == 1 and (trie.values()|list)[0] is string %} + {{ trie_leaf(index, trie, return_macro, lowercase_data) -}} + {% else %} + {% if lowercase_data %} +diff --git a/chromium/third_party/blink/renderer/build/scripts/templates/make_qualified_names.h.tmpl b/chromium/third_party/blink/renderer/build/scripts/templates/make_qualified_names.h.tmpl +index cb05c6c4315..bd5566b03e7 100644 +--- a/chromium/third_party/blink/renderer/build/scripts/templates/make_qualified_names.h.tmpl ++++ b/chromium/third_party/blink/renderer/build/scripts/templates/make_qualified_names.h.tmpl +@@ -24,12 +24,12 @@ namespace {{cpp_namespace}} { + {{symbol_export}}extern const WTF::AtomicString& {{namespace_prefix}}NamespaceURI; + + // Tags +-{% for tag in tags|sort %} ++{% for tag in tags|sort(attribute='name') %} + {{symbol_export}}extern const blink::{{namespace}}QualifiedName& {{tag|symbol}}Tag; + {% endfor %} + + // Attributes +-{% for attr in attrs|sort %} ++{% for attr in attrs|sort(attribute='name') %} + {{symbol_export}}extern const blink::QualifiedName& {{attr|symbol}}Attr; + {% endfor %} + +diff --git a/chromium/third_party/dawn/generator/generator_lib.py b/chromium/third_party/dawn/generator/generator_lib.py +index 5e3734d7833..e3d46bd194f 100644 +--- a/chromium/third_party/dawn/generator/generator_lib.py ++++ b/chromium/third_party/dawn/generator/generator_lib.py +@@ -201,6 +201,10 @@ def _compute_python_dependencies(root_dir=None): + + paths = set() + for path in module_paths: ++ # Builtin/namespaced modules may return None for the file path. ++ if not path: ++ continue ++ + path = os.path.abspath(path) + + if not path.startswith(root_dir): +diff --git a/chromium/third_party/devtools-frontend/src/BUILD.gn b/chromium/third_party/devtools-frontend/src/BUILD.gn +index cd488e88b60..ea1dc3d9a79 100644 +--- a/chromium/third_party/devtools-frontend/src/BUILD.gn ++++ b/chromium/third_party/devtools-frontend/src/BUILD.gn +@@ -2,6 +2,8 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import("//build/config/python.gni") ++ + import("//third_party/blink/public/public_features.gni") + import("./all_devtools_files.gni") + import("./all_devtools_modules.gni") +diff --git a/chromium/third_party/devtools-frontend/src/scripts/build/build_inspector_overlay.py b/chromium/third_party/devtools-frontend/src/scripts/build/build_inspector_overlay.py +index d6666e8b74f..0f7a661e632 100644 +--- a/chromium/third_party/devtools-frontend/src/scripts/build/build_inspector_overlay.py ++++ b/chromium/third_party/devtools-frontend/src/scripts/build/build_inspector_overlay.py +@@ -45,7 +45,8 @@ def rollup(input_path, output_path, filename, max_size, rollup_plugin): + ['--format', 'iife', '-n', 'InspectorOverlay'] + ['--input', target] + + ['--plugin', rollup_plugin], + stdout=subprocess.PIPE, +- stderr=subprocess.PIPE) ++ stderr=subprocess.PIPE, ++ text=True) + out, error = rollup_process.communicate() + if not out: + raise Exception("rollup failed: " + error) +diff --git a/chromium/third_party/devtools-frontend/src/scripts/build/build_release_applications.py b/chromium/third_party/devtools-frontend/src/scripts/build/build_release_applications.py +index fa8e73d34af..7d0b84b2171 100644 +--- a/chromium/third_party/devtools-frontend/src/scripts/build/build_release_applications.py ++++ b/chromium/third_party/devtools-frontend/src/scripts/build/build_release_applications.py +@@ -10,7 +10,7 @@ Builds applications in release mode: + and?the?application?loader?into?a?single?script. + """ + +-from cStringIO import StringIO ++from io import StringIO + from os import path + from os.path import join + import copy +@@ -145,8 +145,7 @@ class ReleaseBuilder(object): + resource_content = read_file(path.join(self.application_dir, resource_name)) + if not (resource_name.endswith('.html') + or resource_name.endswith('md')): +- resource_content += resource_source_url(resource_name).encode( +- 'utf-8') ++ resource_content += resource_source_url(resource_name) + resource_content = resource_content.replace('\\', '\\\\') + resource_content = resource_content.replace('\n', '\\n') + resource_content = resource_content.replace('"', '\\"') +@@ -173,7 +172,9 @@ class ReleaseBuilder(object): + def _concatenate_application_script(self, output): + output.write('Root.allDescriptors.push(...%s);' % self._release_module_descriptors()) + if self.descriptors.extends: +- output.write('Root.applicationDescriptor.modules.push(...%s);' % json.dumps(self.descriptors.application.values())) ++ output.write( ++ 'Root.applicationDescriptor.modules.push(...%s);' % ++ json.dumps(list(self.descriptors.application.values()))) + else: + output.write('Root.applicationDescriptor = %s;' % self.descriptors.application_json()) + +diff --git a/chromium/third_party/devtools-frontend/src/scripts/build/generate_devtools_grd.py b/chromium/third_party/devtools-frontend/src/scripts/build/generate_devtools_grd.py +index be510c48d76..c6a59c90298 100644 +--- a/chromium/third_party/devtools-frontend/src/scripts/build/generate_devtools_grd.py ++++ b/chromium/third_party/devtools-frontend/src/scripts/build/generate_devtools_grd.py +@@ -123,7 +123,7 @@ def main(argv): + + try: + os.makedirs(path.join(output_directory, 'Images')) +- except OSError, e: ++ except OSError as e: + if e.errno != errno.EEXIST: + raise e + +@@ -147,7 +147,7 @@ def main(argv): + shutil.copy(path.join(dirname, filename), path.join(output_directory, 'Images')) + add_file_to_grd(doc, path.join('Images', filename)) + +- with open(parsed_args.output_filename, 'w') as output_file: ++ with open(parsed_args.output_filename, 'wb') as output_file: + output_file.write(doc.toxml(encoding='UTF-8')) + + +diff --git a/chromium/third_party/devtools-frontend/src/scripts/build/modular_build.py b/chromium/third_party/devtools-frontend/src/scripts/build/modular_build.py +index 0ba695d3810..bb1da2f9f8d 100644 +--- a/chromium/third_party/devtools-frontend/src/scripts/build/modular_build.py ++++ b/chromium/third_party/devtools-frontend/src/scripts/build/modular_build.py +@@ -7,6 +7,8 @@ + Utilities for the modular DevTools build. + """ + ++from __future__ import print_function ++ + import collections + from os import path + import os +@@ -40,7 +42,7 @@ def load_and_parse_json(filename): + try: + return json.loads(read_file(filename)) + except: +- print 'ERROR: Failed to parse %s' % filename ++ print('ERROR: Failed to parse %s' % filename) + raise + + class Descriptors: +@@ -57,7 +59,7 @@ class Descriptors: + + def application_json(self): + result = dict() +- result['modules'] = self.application.values() ++ result['modules'] = list(self.application.values()) + return json.dumps(result) + + def all_compiled_files(self): +diff --git a/chromium/third_party/jinja2/tests.py b/chromium/third_party/jinja2/tests.py +index 0adc3d4dbcb..b14f85ff148 100644 +--- a/chromium/third_party/jinja2/tests.py ++++ b/chromium/third_party/jinja2/tests.py +@@ -10,7 +10,7 @@ + """ + import operator + import re +-from collections import Mapping ++from collections.abc import Mapping + from jinja2.runtime import Undefined + from jinja2._compat import text_type, string_types, integer_types + import decimal +diff --git a/chromium/tools/metrics/ukm/gen_builders.py b/chromium/tools/metrics/ukm/gen_builders.py +index f9f61d90a56..44e46fae8cc 100755 +--- a/chromium/tools/metrics/ukm/gen_builders.py ++++ b/chromium/tools/metrics/ukm/gen_builders.py +@@ -48,9 +48,10 @@ def ReadFilteredData(path): + data = ukm_model.UKM_XML_TYPE.Parse(ukm_file.read()) + event_tag = ukm_model._EVENT_TYPE.tag + metric_tag = ukm_model._METRIC_TYPE.tag +- data[event_tag] = filter(ukm_model.IsNotObsolete, data[event_tag]) ++ data[event_tag] = list(filter(ukm_model.IsNotObsolete, data[event_tag])) + for event in data[event_tag]: +- event[metric_tag] = filter(ukm_model.IsNotObsolete, event[metric_tag]) ++ event[metric_tag] = list( ++ filter(ukm_model.IsNotObsolete, event[metric_tag])) + return data + + +diff --git a/chromium/ui/ozone/generate_constructor_list.py b/chromium/ui/ozone/generate_constructor_list.py +index 8d800636c97..04fa18e93df 100755 +--- a/chromium/ui/ozone/generate_constructor_list.py ++++ b/chromium/ui/ozone/generate_constructor_list.py +@@ -45,12 +45,15 @@ Example Output: ./ui/ozone/generate_constructor_list.py \ + } // namespace ui + """ + ++try: ++ from StringIO import StringIO # for Python 2 ++except ImportError: ++ from io import StringIO # for Python 3 + import optparse + import os + import collections + import re + import sys +-import string + + + def GetTypedefName(typename): +@@ -68,7 +71,7 @@ def GetConstructorName(typename, platform): + This is just "Create" + typename + platform. + """ + +- return 'Create' + typename + string.capitalize(platform) ++ return 'Create' + typename + platform.capitalize() + + + def GenerateConstructorList(out, namespace, export, typenames, platforms, +@@ -163,12 +166,14 @@ def main(argv): + sys.exit(1) + + # Write to standard output or file specified by --output_cc. +- out_cc = sys.stdout ++ out_cc = getattr(sys.stdout, 'buffer', sys.stdout) + if options.output_cc: + out_cc = open(options.output_cc, 'wb') + +- GenerateConstructorList(out_cc, options.namespace, options.export, ++ out_cc_str = StringIO() ++ GenerateConstructorList(out_cc_str, options.namespace, options.export, + typenames, platforms, includes, usings) ++ out_cc.write(out_cc_str.getvalue().encode('utf-8')) + + if options.output_cc: + out_cc.close() +diff --git a/chromium/ui/ozone/generate_ozone_platform_list.py b/chromium/ui/ozone/generate_ozone_platform_list.py +index d47c398259b..2702b68b9bd 100755 +--- a/chromium/ui/ozone/generate_ozone_platform_list.py ++++ b/chromium/ui/ozone/generate_ozone_platform_list.py +@@ -49,12 +49,15 @@ Example Output: ./generate_ozone_platform_list.py --default wayland dri wayland + + """ + ++try: ++ from StringIO import StringIO # for Python 2 ++except ImportError: ++ from io import StringIO # for Python 3 + import optparse + import os + import collections + import re + import sys +-import string + + + def GetConstantName(name): +@@ -63,7 +66,7 @@ def GetConstantName(name): + We just capitalize the platform name and prepend "CreateOzonePlatform". + """ + +- return 'kPlatform' + string.capitalize(name) ++ return 'kPlatform' + name.capitalize() + + + def GeneratePlatformListText(out, platforms): +@@ -149,9 +152,9 @@ def main(argv): + platforms.insert(0, options.default) + + # Write to standard output or file specified by --output_{cc,h}. +- out_cc = sys.stdout +- out_h = sys.stdout +- out_txt = sys.stdout ++ out_cc = getattr(sys.stdout, 'buffer', sys.stdout) ++ out_h = getattr(sys.stdout, 'buffer', sys.stdout) ++ out_txt = getattr(sys.stdout, 'buffer', sys.stdout) + if options.output_cc: + out_cc = open(options.output_cc, 'wb') + if options.output_h: +@@ -159,9 +162,16 @@ def main(argv): + if options.output_txt: + out_txt = open(options.output_txt, 'wb') + +- GeneratePlatformListText(out_txt, platforms) +- GeneratePlatformListHeader(out_h, platforms) +- GeneratePlatformListSource(out_cc, platforms) ++ out_txt_str = StringIO() ++ out_h_str = StringIO() ++ out_cc_str = StringIO() ++ ++ GeneratePlatformListText(out_txt_str, platforms) ++ out_txt.write(out_txt_str.getvalue().encode('utf-8')) ++ GeneratePlatformListHeader(out_h_str, platforms) ++ out_h.write(out_h_str.getvalue().encode('utf-8')) ++ GeneratePlatformListSource(out_cc_str, platforms) ++ out_cc.write(out_cc_str.getvalue().encode('utf-8')) + + if options.output_cc: + out_cc.close() +-- +2.25.1 + diff --git a/package/qt5/qt5webengine-chromium/0002-Don-t-rebase-sysroot-path.patch b/package/qt5/qt5webengine-chromium/0002-Don-t-rebase-sysroot-path.patch new file mode 100644 index 0000000000..c39f008a3d --- /dev/null +++ b/package/qt5/qt5webengine-chromium/0002-Don-t-rebase-sysroot-path.patch @@ -0,0 +1,32 @@ +From bfc520671693587a0b81842018326da35aa97f80 Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Thu, 3 Feb 2022 20:41:08 -0700 +Subject: [PATCH] Don't rebase sysroot path + +Just use the actual sysroot as rebase_path will generate an invalid +sysroot path. + +Fixes: +/home/buildroot/buildroot/output/per-package/qt5webengine/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-buildroot-linux-gnu/10.3.0/../../../../aarch64-buildroot-linux-gnu/bin/ld: cannot find crti.o: No such file or directory + +Signed-off-by: James Hilliard +--- + chromium/build/config/posix/BUILD.gn | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chromium/build/config/posix/BUILD.gn b/chromium/build/config/posix/BUILD.gn +index e61554c5656..dc957225869 100644 +--- a/chromium/build/config/posix/BUILD.gn ++++ b/chromium/build/config/posix/BUILD.gn +@@ -27,7 +27,7 @@ config("runtime_library") { + + if (!is_apple && sysroot != "") { + # Pass the sysroot to all C compiler variants, the assembler, and linker. +- sysroot_flags = [ "--sysroot=" + rebase_path(sysroot, root_build_dir) ] ++ sysroot_flags = [ "--sysroot=" + sysroot ] + if (is_linux || is_chromeos) { + # This is here so that all files get recompiled after a sysroot roll and + # when turning the sysroot on or off. (defines are passed via the command +-- +2.25.1 + 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)) -- 2.25.1 From peter at korsgaard.com Tue Feb 15 08:15:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 15 Feb 2022 09:15:43 +0100 Subject: [Buildroot] [PATCH] configs/roc_pc_rk3399_defconfig: expand rootfs size to 120M In-Reply-To: <6edcbc6d-c9bb-e802-48f1-d4866a698aa9@mind.be> (Arnout Vandecappelle's message of "Mon, 14 Feb 2022 21:13:33 +0100") References: <20220202171035.1740791-1-giulio.benetti@benettiengineering.com> <20220202171035.1740791-2-giulio.benetti@benettiengineering.com> <6edcbc6d-c9bb-e802-48f1-d4866a698aa9@mind.be> Message-ID: <87czjok0k0.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle writes: >> It is because of modules(30M) and linux "Image", it's not >> compressed, so it's 25M. So only for Linux+modules => 55M, plus the >> few other stuff(Busybox+libc etc.)1M > Yeah those giant aarch64 default configs are mightily annoying... > I'm thinking, perhaps we should just bite the bullet and move the > default ext2 size to 120M... > Peter, Yann, what do you think? Fine by me. -- Bye, Peter Korsgaard From buildroot at busybox.net Tue Feb 15 08:21:39 2022 From: buildroot at busybox.net (buildroot at busybox.net) Date: 15 Feb 2022 00:21:39 -0800 Subject: [Buildroot] Waiting for the payment 2/15/2022 12:21:39 a.m. Message-ID: <20220215002139.5FEBC05E5429E579@busybox.net> An HTML attachment was scrubbed... URL: From luca at lucaceresoli.net Tue Feb 15 08:48:40 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Tue, 15 Feb 2022 09:48:40 +0100 Subject: [Buildroot] [PATCH] utils/docker-run: improve user experience In-Reply-To: <20220214203909.251924-1-yann.morin.1998@free.fr> References: <20220214203909.251924-1-yann.morin.1998@free.fr> Message-ID: Hi Yann, On 14/02/22 21:39, Yann E. MORIN wrote: > Currently, the docker-run script starts a container based on the > reference image, in which the user has UID:GID set to 1000:1000, > which may or may not be the same as local user uses, which may > prevent the commands in the container from creating files, which > foils the plan of using the container to run a build... > > Additionally, the paths in the container differ from the paths > the user expects, as the current Buildroot tree is mounted over > the in-container user home directory. This is a bit confusing... > > Finally, the container is left hanging around after the command > finishes, and thus there are as many lingering containers as the > user runs docker-run. This is not very nice... > > We fix all of that (yeah, should be different patches, but meh): > > - we use --mount instead of -v, which allows us to bind-mount > the Buildroot tree at the same place in the container, as > Docker will create the destination if it does not exist, while > -v seems to expect it to exist [0]. > > - as a consequence, we can also set the working directory as the > Buildroot top-directory; > > - use --user to force the same UID:GID in the container as the > local user, so that files created in the container belong to > the local user, and so that files from the local user are > accessible from the container; > > - use --rm do remove the container once it terminates; starting > a new container is very quick anyway, so it is as good as > re-using a previous container. > > [0] the documentation is not clear about that. It clearly states > that the host directory (i.e. the origin, the source) is created > if missing, but it says nothing of the destination: > https://docs.docker.com/engine/reference/commandline/run/#mount-volume--v---read-only > > Signed-off-by: Yann E. MORIN > Cc: Luca Ceresoli > Cc: Giulio Benetti > Cc: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: Luca Ceresoli -- Luca From wbx at openadk.org Tue Feb 15 10:06:42 2022 From: wbx at openadk.org (Waldemar Brodkorb) Date: Tue, 15 Feb 2022 11:06:42 +0100 Subject: [Buildroot] [PATCH 2/2] package/{glibc, localedef}: update to 2.35 In-Reply-To: <1b0d866f-fc09-f23d-3fae-068858ab5304@mind.be> References: <1b0d866f-fc09-f23d-3fae-068858ab5304@mind.be> Message-ID: Hi Arnout, Arnout Vandecappelle wrote, > On 11/02/2022 19:08, Waldemar Brodkorb wrote: > > https://sourceware.org/pipermail/libc-alpha/2022-February/136040.html > > > > - allow to use optimization CFLAGS (not CPPFLAGS) which are nowadays > > supported by upstream (except nios2) > > - enable support for or1k, which is now included upstream > > - runtime tested with qemu-system for aarch64/arm/microblaze/mips/mips64/nios2/ > > or1k/powerpc/powerpc64/powerpc64le/riscv32/riscv64/s390x/sh4/sparc64/x86/x86_64 > > > > Signed-off-by: Waldemar Brodkorb > > --- > > ...v-linux-microblaze-pselect32.c-add-m.patch | 85 ------------------- > > .../glibc.hash | 2 +- > > package/glibc/glibc.mk | 16 ++-- > > ...ACK-only-build-and-install-localedef.patch | 0 > > ...y-on-GCC-to-4.8-and-binutils-to-2.24.patch | 0 > > .../localedef.hash | 2 +- > > package/localedef/localedef.mk | 2 +- > > toolchain/toolchain-buildroot/Config.in | 3 +- > > 8 files changed, 15 insertions(+), 95 deletions(-) > > delete mode 100644 package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch > > rename package/glibc/{2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c => 2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586}/glibc.hash (70%) > > rename package/localedef/{2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c => 2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586}/0001-HACK-only-build-and-install-localedef.patch (100%) > > rename package/localedef/{2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c => 2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586}/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch (100%) > > rename package/localedef/{2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c => 2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586}/localedef.hash (70%) > > with the removal of the csky fork in commit ebc6c7e, there's no longer a > need to version the patches, so perhaps you could take this opportunity to > move them out of the directory. Okay. > [snip] > > diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk > > index 2702994c6b..f258f33c96 100644 > > --- a/package/glibc/glibc.mk > > +++ b/package/glibc/glibc.mk > > @@ -7,7 +7,7 @@ > > # Generate version string using: > > # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- > > # When updating the version, please also update localedef > > -GLIBC_VERSION = 2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c > > +GLIBC_VERSION = 2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586 > > # Upstream doesn't officially provide an https download link. > > # There is one (https://sourceware.org/git/glibc.git) but it's not reliable, > > # sometimes the connection times out. So use an unofficial github mirror. > > @@ -110,16 +110,20 @@ endif > > # > > # 2. We have to execute the configure script with bash and not sh. > > # > > -# Note that as mentionned in > > -# http://patches.openembedded.org/patch/38849/, glibc must be > > -# built with -O2, so we pass our own CFLAGS and CXXFLAGS below. > > +# Glibc nowadays can be build with optimization flags f.e. -Os > > + > > +# crash in qemu-system-nios2 with -Os > > +ifeq ($(BR2_nios2),y) > > +TARGET_FCFLAGS := -O2 > > You're overriding the global TARGET_FCFLAGS here, that's not allowed. > > Instead, you should use > > GLIBC_CFLAGS = $(TARGET_CFLAGS) > # crash in qemu-system-nios2 with -Os > ifeq ($(BR2_nios2),y) > GLIBC_CFLAGS += -O2 > endif > > (I'm not sure if += is OK here, if not, just use =) > > And to make the below simpler, you can use > > GLIBC_CFLAGS += $(GLIBC_EXTRA_CFLAGS) > > Alternatively, if += is OK for nios, you can use > > ifeq ($(BR2_nios2),y) > GLIBC_EXTRA_CFLAGS += -O2 > endif > ... > CFLAGS="$(TARGET_CFLAGS) $(GLIBC_EXTRA_CFLAGS)" \ > > > > +endif > > + > > define GLIBC_CONFIGURE_CMDS > > mkdir -p $(@D)/build > > # Do the configuration > > (cd $(@D)/build; \ > > $(TARGET_CONFIGURE_OPTS) \ > > - CFLAGS="-O2 $(GLIBC_EXTRA_CFLAGS)" CPPFLAGS="" \ > > - CXXFLAGS="-O2 $(GLIBC_EXTRA_CFLAGS)" \ > > + CFLAGS="$(TARGET_FCFLAGS) $(GLIBC_EXTRA_CFLAGS)" CPPFLAGS="" \ > > FCFLAGS stands for Fortran Compilation flags. You should use TARGET_CFLAGS here. > > Why is CPPFLAGS not set? Glibc does not compile with the existing TARGET_CPPFLAGS which are added to TARGET_CFLAGS so I can not use TARGET_CFLAGS to optimize the build. I will use TARGET_OPTIMIZATION if that is okay. best regards Waldemar From quentin.schulz at theobroma-systems.com Tue Feb 15 10:11:02 2022 From: quentin.schulz at theobroma-systems.com (Quentin Schulz) Date: Tue, 15 Feb 2022 11:11:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/strongswan: security bump to version 5.9.5 In-Reply-To: <20220213113332.1056370-1-fontaine.fabrice@gmail.com> References: <20220213113332.1056370-1-fontaine.fabrice@gmail.com> Message-ID: Hi Fabrice, On 2/13/22 12:33, Fabrice Fontaine wrote: > Fixed a vulnerability in the EAP client implementation that was caused > by incorrectly handling early EAP-Success messages. It may allow to > bypass the client and in some scenarios even the server authentication, > or could lead to a denial-of-service attack. This vulnerability has been > registered as CVE-2021-45079: > https://urldefense.proofpoint.com/v2/url?u=https-3A__www.strongswan.org_blog_2022_01_24_strongswan-2Dvulnerability-2D-28cve-2D2021-2D45079-29.html&d=DwICAg&c=_sEr5x9kUWhuk4_nFwjJtA&r=LYjLexDn7rXIzVmkNPvw5ymA1XTSqHGq8yBP6m6qZZ4njZguQhZhkI_-172IIy1t&m=Xw8Wse_xivKp-F2KsLaYN07aQNQFV9AOg9nJURWQjmPZhznmWAC7LZTawLVpqOwW&s=qVIfoIBmT6GmL9xoC3go3t3Hu45ZtCsAWTeU0X0HBPU&e= > > https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_strongswan_strongswan_releases_tag_5.9.5&d=DwICAg&c=_sEr5x9kUWhuk4_nFwjJtA&r=LYjLexDn7rXIzVmkNPvw5ymA1XTSqHGq8yBP6m6qZZ4njZguQhZhkI_-172IIy1t&m=Xw8Wse_xivKp-F2KsLaYN07aQNQFV9AOg9nJURWQjmPZhznmWAC7LZTawLVpqOwW&s=UEX186sLiKBzRnvlExvfzMtE4KjZS-Rd7CfD8fNRV0E&e= > > Signed-off-by: Fabrice Fontaine Missed your patch and was about to send one :) Reviewed-by: Quentin Schulz Needs to be backported to currently maintained branches too, so Cc'ing Peter on this :) Thanks! Quentin From fontaine.fabrice at gmail.com Tue Feb 15 10:53:40 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 15 Feb 2022 11:53:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pycli: drop package Message-ID: <20220215105340.1919699-1-fontaine.fabrice@gmail.com> python-pycli raises the following build failure since bump of python3 to version 3.10.1 in commit 25b1fc2898d68ddf2674b14c738045875fc5a2dc due to the new "Multiple Exception types without parentheses" exception (https://docs.python.org/3/whatsnew/3.10.html) error: File "/usr/lib/python3.10/site-packages/cli/app.py", line 242 except Exception, e: ^^^^^^^^^^^^ SyntaxError: multiple exception types must be parenthesized So drop the package as the last release was made 10 years ago. Fixes: - http://autobuild.buildroot.org/results/8d7b0c23472abffc9447e4a6de273bdd04486d39 Signed-off-by: Fabrice Fontaine --- Config.in.legacy | 7 +++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/python-pycli/Config.in | 7 ------- package/python-pycli/python-pycli.hash | 5 ----- package/python-pycli/python-pycli.mk | 14 -------------- 6 files changed, 7 insertions(+), 28 deletions(-) delete mode 100644 package/python-pycli/Config.in delete mode 100644 package/python-pycli/python-pycli.hash delete mode 100644 package/python-pycli/python-pycli.mk diff --git a/Config.in.legacy b/Config.in.legacy index aefb0ba6ea..99459c7ad3 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_PYCLI + bool "python-pycli removed" + select BR2_LEGACY + help + Package was removed because it is not compatible with python + 3.10 and is not maintained anymore (no release since 2012). + config BR2_PACKAGE_LINUX_TOOLS_BPFTOOL bool "bpftool was moved" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 3e7c753836..6208df974d 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1065,7 +1065,6 @@ N: Geoff Levand F: package/flannel/ N: Geoffrey Ragot -F: package/python-pycli/ F: package/python-pyyaml/ N: Gerome Burlats diff --git a/package/Config.in b/package/Config.in index 3213c4a9b4..ed7d9555b2 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1144,7 +1144,6 @@ menu "External python modules" source "package/python-pybind/Config.in" source "package/python-pycairo/Config.in" source "package/python-pycares/Config.in" - source "package/python-pycli/Config.in" source "package/python-pycparser/Config.in" source "package/python-pycryptodomex/Config.in" source "package/python-pycups/Config.in" diff --git a/package/python-pycli/Config.in b/package/python-pycli/Config.in deleted file mode 100644 index e1ce3b99a6..0000000000 --- a/package/python-pycli/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYCLI - bool "python-pycli" - help - The cli package is a framework for making simple, correct - command line applications in Python. - - https://pythonhosted.org/pyCLI/ diff --git a/package/python-pycli/python-pycli.hash b/package/python-pycli/python-pycli.hash deleted file mode 100644 index f0890e83a9..0000000000 --- a/package/python-pycli/python-pycli.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5 from https://pypi.python.org/pypi/pycli/json -md5 89c487e7c8068ce05d63394d2ae7ebad pyCLI-2.0.3.tar.gz -# Locally computed -sha256 bc53e6c5db031ae1c05d131641f153d22a201c5e82cc8c9324a945752efbb622 pyCLI-2.0.3.tar.gz -sha256 591490b2ef462a4ad2be1aae5dd47738cb17e191c82d3ba38c3ae906d288e6ba lib/cli/__init__.py diff --git a/package/python-pycli/python-pycli.mk b/package/python-pycli/python-pycli.mk deleted file mode 100644 index 7aff1c6200..0000000000 --- a/package/python-pycli/python-pycli.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-pycli -# -################################################################################ - -PYTHON_PYCLI_VERSION = 2.0.3 -PYTHON_PYCLI_SOURCE = pyCLI-$(PYTHON_PYCLI_VERSION).tar.gz -PYTHON_PYCLI_SITE = https://pypi.python.org/packages/95/fc/b2d86a5fbdac4072bcf70b01674b612e1a13026f54962c878fe3eca36fd1 -PYTHON_PYCLI_LICENSE = ISC-like -PYTHON_PYCLI_LICENSE_FILES = lib/cli/__init__.py -PYTHON_PYCLI_SETUP_TYPE = setuptools - -$(eval $(python-package)) -- 2.34.1 From wbx at openadk.org Tue Feb 15 11:18:02 2022 From: wbx at openadk.org (Waldemar Brodkorb) Date: Tue, 15 Feb 2022 12:18:02 +0100 Subject: [Buildroot] [PATCH v2] package/{glibc, localedef}: update to 2.35 Message-ID: https://sourceware.org/pipermail/libc-alpha/2022-February/136040.html - allow to use optimization CFLAGS (not CPPFLAGS) which are nowadays supported by upstream (except nios2) - enable support for or1k, which is now included upstream - runtime tested with qemu-system for aarch64/arm/microblaze/mips/mips64/nios2/ or1k/powerpc/powerpc64/powerpc64le/riscv32/riscv64/s390x/sh4/sparc64/x86/x86_64 Signed-off-by: Waldemar Brodkorb --- v1->v2: - remove subdirs for patches/hash file no longer required, sugested by Arnout - use TARGET_OPTIMIZATION instead of TARGET_FCFLAGS requested by Arnout --- ...v-linux-microblaze-pselect32.c-add-m.patch | 85 ------------------- .../glibc.hash | 7 -- package/glibc/glibc.hash | 9 +- package/glibc/glibc.mk | 17 ++-- ...ACK-only-build-and-install-localedef.patch | 0 ...y-on-GCC-to-4.8-and-binutils-to-2.24.patch | 0 .../localedef.hash | 7 -- package/localedef/localedef.hash | 9 +- package/localedef/localedef.mk | 2 +- toolchain/toolchain-buildroot/Config.in | 3 +- 10 files changed, 28 insertions(+), 111 deletions(-) delete mode 100644 package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch delete mode 100644 package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/glibc.hash rename package/localedef/{2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c => }/0001-HACK-only-build-and-install-localedef.patch (100%) rename package/localedef/{2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c => }/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch (100%) delete mode 100644 package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/localedef.hash diff --git a/package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch b/package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch deleted file mode 100644 index 3597cd6a11..0000000000 --- a/package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch +++ /dev/null @@ -1,85 +0,0 @@ -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 - diff --git a/package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/glibc.hash b/package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/glibc.hash deleted file mode 100644 index dfd939020f..0000000000 --- a/package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/glibc.hash +++ /dev/null @@ -1,7 +0,0 @@ -# Locally calculated (fetched from Github) -sha256 3c299a21468a80356b848ca341f45551616c4928a6c871e6d45cee942e8b0f24 glibc-2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c.tar.gz - -# Hashes for license files -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB -sha256 b33d0bd9f685b46853548814893a6135e74430d12f6d94ab3eba42fc591f83bc LICENSES diff --git a/package/glibc/glibc.hash b/package/glibc/glibc.hash index 5316f03b10..f28c15c2a3 100644 --- a/package/glibc/glibc.hash +++ b/package/glibc/glibc.hash @@ -1,2 +1,7 @@ -# This hash file is not used; instead, update the -# hash files in the per-version sub-directories. +# Locally calculated (fetched from Github) +sha256 0ca43b2a6cd74609519554303a16e350abdac0e66943c5d98d91228233c826a0 glibc-2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586.tar.gz + +# Hashes for license files +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB +sha256 b33d0bd9f685b46853548814893a6135e74430d12f6d94ab3eba42fc591f83bc LICENSES diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index 2702994c6b..7b46ad42c3 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -7,7 +7,7 @@ # Generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- # When updating the version, please also update localedef -GLIBC_VERSION = 2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c +GLIBC_VERSION = 2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586 # Upstream doesn't officially provide an https download link. # There is one (https://sourceware.org/git/glibc.git) but it's not reliable, # sometimes the connection times out. So use an unofficial github mirror. @@ -110,16 +110,21 @@ endif # # 2. We have to execute the configure script with bash and not sh. # -# Note that as mentionned in -# http://patches.openembedded.org/patch/38849/, glibc must be -# built with -O2, so we pass our own CFLAGS and CXXFLAGS below. +# Glibc nowadays can be build with optimization flags f.e. -Os + +GLIBC_CFLAGS = $(TARGET_OPTIMIZATION) +# crash in qemu-system-nios2 with -Os +ifeq ($(BR2_nios2),y) +GLIBC_CFLAGS += -O2 +endif + define GLIBC_CONFIGURE_CMDS mkdir -p $(@D)/build # Do the configuration (cd $(@D)/build; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="-O2 $(GLIBC_EXTRA_CFLAGS)" CPPFLAGS="" \ - CXXFLAGS="-O2 $(GLIBC_EXTRA_CFLAGS)" \ + CFLAGS="$(GLIBC_CFLAGS) $(GLIBC_EXTRA_CFLAGS)" CPPFLAGS="" \ + CXXFLAGS="$(GLIBC_CFLAGS) $(GLIBC_EXTRA_CFLAGS)" \ $(GLIBC_CONF_ENV) \ $(SHELL) $(@D)/configure \ --target=$(GNU_TARGET_NAME) \ diff --git a/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-HACK-only-build-and-install-localedef.patch b/package/localedef/0001-HACK-only-build-and-install-localedef.patch similarity index 100% rename from package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-HACK-only-build-and-install-localedef.patch rename to package/localedef/0001-HACK-only-build-and-install-localedef.patch diff --git a/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch b/package/localedef/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch similarity index 100% rename from package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch rename to package/localedef/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch diff --git a/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/localedef.hash b/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/localedef.hash deleted file mode 100644 index dfd939020f..0000000000 --- a/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/localedef.hash +++ /dev/null @@ -1,7 +0,0 @@ -# Locally calculated (fetched from Github) -sha256 3c299a21468a80356b848ca341f45551616c4928a6c871e6d45cee942e8b0f24 glibc-2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c.tar.gz - -# Hashes for license files -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB -sha256 b33d0bd9f685b46853548814893a6135e74430d12f6d94ab3eba42fc591f83bc LICENSES diff --git a/package/localedef/localedef.hash b/package/localedef/localedef.hash index 5316f03b10..f28c15c2a3 100644 --- a/package/localedef/localedef.hash +++ b/package/localedef/localedef.hash @@ -1,2 +1,7 @@ -# This hash file is not used; instead, update the -# hash files in the per-version sub-directories. +# Locally calculated (fetched from Github) +sha256 0ca43b2a6cd74609519554303a16e350abdac0e66943c5d98d91228233c826a0 glibc-2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586.tar.gz + +# Hashes for license files +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB +sha256 b33d0bd9f685b46853548814893a6135e74430d12f6d94ab3eba42fc591f83bc LICENSES diff --git a/package/localedef/localedef.mk b/package/localedef/localedef.mk index f8f0b42984..fb5edde0c2 100644 --- a/package/localedef/localedef.mk +++ b/package/localedef/localedef.mk @@ -7,7 +7,7 @@ # Use the same VERSION and SITE as target glibc # As in glibc.mk, generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- -LOCALEDEF_VERSION = 2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c +LOCALEDEF_VERSION = 2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586 LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION).tar.gz LOCALEDEF_SITE = $(call github,bminor,glibc,$(LOCALEDEF_VERSION)) HOST_LOCALEDEF_DL_SUBDIR = glibc diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in index 4004c0edf8..437daafa74 100644 --- a/toolchain/toolchain-buildroot/Config.in +++ b/toolchain/toolchain-buildroot/Config.in @@ -49,7 +49,8 @@ config BR2_TOOLCHAIN_BUILDROOT_GLIBC BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le || \ BR2_riscv || BR2_s390x || BR2_sh || \ BR2_sparc64 || BR2_x86_64 || BR2_microblaze || \ - BR2_nios2 || (BR2_arc && BR2_ARC_ATOMIC_EXT) || BR2_csky + BR2_nios2 || (BR2_arc && BR2_ARC_ATOMIC_EXT) || \ + BR2_csky || BR2_or1k depends on BR2_USE_MMU depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 -- 2.30.2 From nolange79 at gmail.com Tue Feb 15 12:46:17 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Tue, 15 Feb 2022 13:46:17 +0100 Subject: [Buildroot] [PATCH 1/2] toolchain: support mismatched merged usr Message-ID: <20220215124619.563502-1-nolange79@gmail.com> Look at the case where the source toolchain has non-merged usr, yet the target will have merged usr. sysroot/lib/ld-musl-x86_64.so.1 -> ../usr/lib/libc.so sysroot/usr/lib/libc.so What happens is that buildroot copies the ld-*so* symlink into usr/lib, at which point it becomes broken. We now detect these broken symlinks, then try to find the target binary in the library directories and fix the link. Fix the case where the lib directory is a symlink, and no ld-*so* is installed by adding -H to find. Also use `cp -t` instead of some rarely used xargs tricks. Signed-off-by: Norbert Lange --- toolchain/helpers.mk | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk index ef8e9a5f64..aaf2aecd80 100644 --- a/toolchain/helpers.mk +++ b/toolchain/helpers.mk @@ -135,8 +135,17 @@ copy_toolchain_sysroot = \ $(call simplify_symlink,$$i,$(STAGING_DIR)) ; \ done ; \ fi ; \ - if [[ ! $$(find $(STAGING_DIR)/lib -name 'ld*.so.*' -print -quit) ]]; then \ - find $${ARCH_SYSROOT_DIR}/lib -name 'ld*.so.*' -print0 | xargs -0 -I % cp % $(STAGING_DIR)/lib/; \ + for i in $$(find -H $(STAGING_DIR)/lib -name 'ld*.so.*' -xtype l); do \ + LINKTARGET=`readlink $$i`; \ + rm $$i; \ + NEWLINKTARGET=$$(find -H $(STAGING_DIR)/$${ARCH_LIB_DIR} $(STAGING_DIR)/lib $(STAGING_DIR)/usr/$${ARCH_LIB_DIR} $(STAGING_DIR)/usr/lib -name "`basename $${LINKTARGET}`" -print -quit); \ + if [ -n "$${NEWLINKTARGET}" -a -e "$${NEWLINKTARGET}" ]; then \ + ln -sr $${NEWLINKTARGET} $$i; \ + echo "Symlinking $$i -> `readlink $$i`" ; \ + fi; \ + done; \ + if [[ ! $$(find -H $(STAGING_DIR)/lib -name 'ld*.so.*' -print -quit) ]]; then \ + find $${ARCH_SYSROOT_DIR}/lib -name 'ld*.so.*' -print0 | xargs -0 cp -t $(STAGING_DIR)/lib/; \ fi ; \ if [ `readlink -f $${SYSROOT_DIR}` != `readlink -f $${ARCH_SYSROOT_DIR}` ] ; then \ if [ ! -d $${ARCH_SYSROOT_DIR}/usr/include ] ; then \ -- 2.34.1 From nolange79 at gmail.com Tue Feb 15 12:46:18 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Tue, 15 Feb 2022 13:46:18 +0100 Subject: [Buildroot] [PATCH 2/2] toolchain: prevent infinite loop in copy_toolchain_lib_root In-Reply-To: <20220215124619.563502-1-nolange79@gmail.com> References: <20220215124619.563502-1-nolange79@gmail.com> Message-ID: <20220215124619.563502-2-nolange79@gmail.com> This can happen when there are broken symlinks. Signed-off-by: Norbert Lange --- toolchain/helpers.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk index aaf2aecd80..7623d68123 100644 --- a/toolchain/helpers.mk +++ b/toolchain/helpers.mk @@ -20,6 +20,7 @@ copy_toolchain_lib_root = \ if test -h $${LIBPATH} ; then \ cp -d $${LIBPATH} $(TARGET_DIR)/$${DESTDIR}/$${LIBNAME}; \ LIBPATH="`readlink -f $${LIBPATH}`"; \ + [ -n "$${LIBPATH}" ] || break; \ elif test -f $${LIBPATH}; then \ $(INSTALL) -D -m0755 $${LIBPATH} $(TARGET_DIR)/$${DESTDIR}/$${LIBNAME}; \ break ; \ -- 2.34.1 From giulio.benetti at benettiengineering.com Tue Feb 15 13:00:36 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 15 Feb 2022 14:00:36 +0100 Subject: [Buildroot] [PATCH 2/3] board/andes/ae350: add support for Andes AE350 In-Reply-To: References: Message-ID: Hi Peter, > Il giorno 15 feb 2022, alle ore 06:16, Yu Chien Peter Lin ha scritto: > > ? >> >>> On Tue, Feb 15, 2022 at 10:32:01AM +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 >>> --- >>> Changes >>> V1->V2: >>> * move linux source code and its patches to AndesTech Github repo >>> * rename ae350_andestar45_defconfig to andes_ae350_45_defconfig >>> * change C library to uClibc >>> * remove OpenSSL package >>> * remove rootfs.cpio and rootfs.tar >>> * update DEVELOPERS >>> V2->V3: >>> * specifiy branch to download from AndesTech linux repo >>> * change boot.cmd to extlinux.conf >>> * add post-build.sh for extlinux.conf to retrieve Image and DTB >>> * fix format and update genimage_sdcard.cfg >>> * update readme.txt >>> * add packages (python3, pylibfdt and openssl) for u-boot binman >>> * reorder item in DEVELOPERS >>> > > Sorry, I missed versioning for this revision. > I'll resend it and fix changelog format. Can you please subscribe to patchwork[1] and tag your patches without V3 prefix as rejected? [1]: https://patchwork.ozlabs.org/project/buildroot/list/ Thank you! Giulio > > Regards, > Yu-Chien Peter Lin > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -------------- next part -------------- An HTML attachment was scrubbed... URL: From fontaine.fabrice at gmail.com Tue Feb 15 13:29:09 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 15 Feb 2022 14:29:09 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/python-pycli: fix build with python >= 3.10 Message-ID: <20220215132909.2360674-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump of python3 to version 3.10.1 in commit 25b1fc2898d68ddf2674b14c738045875fc5a2dc due to the new "Multiple Exception types without parentheses" exception (https://docs.python.org/3/whatsnew/3.10.html) error: File "/usr/lib/python3.10/site-packages/cli/app.py", line 242 except Exception, e: ^^^^^^^^^^^^ SyntaxError: multiple exception types must be parenthesized Fixes: - http://autobuild.buildroot.org/results/8d7b0c23472abffc9447e4a6de273bdd04486d39 Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2: - Add upstream commits instead of dropping package (even if repository has been archived) ...aise-exceptions-in-wrapped-functions.patch | 26 ++++++++++++ ...pt-statement-changed-slightly-in-2-6.patch | 41 +++++++++++++++++++ 2 files changed, 67 insertions(+) create mode 100644 package/python-pycli/0001-Fix-problem-with-re-raise-exceptions-in-wrapped-functions.patch create mode 100644 package/python-pycli/0002-except-statement-changed-slightly-in-2-6.patch diff --git a/package/python-pycli/0001-Fix-problem-with-re-raise-exceptions-in-wrapped-functions.patch b/package/python-pycli/0001-Fix-problem-with-re-raise-exceptions-in-wrapped-functions.patch new file mode 100644 index 0000000000..7ac9d7af9f --- /dev/null +++ b/package/python-pycli/0001-Fix-problem-with-re-raise-exceptions-in-wrapped-functions.patch @@ -0,0 +1,26 @@ +From 57c563f8b47a56feefc0a8bcbef05f4b54280549 Mon Sep 17 00:00:00 2001 +From: mmbutter +Date: Tue, 9 Jun 2020 11:50:41 -0500 +Subject: [PATCH] Fix problem with re-raise exceptions in wrapped functions. + +[Retrieved from: +https://github.com/whilp/cli/commit/57c563f8b47a56feefc0a8bcbef05f4b54280549] +Signed-off-by: Fabrice Fontaine +--- + lib/cli/app.py | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/lib/cli/app.py b/lib/cli/app.py +index 7b6db52..f487ab4 100644 +--- a/lib/cli/app.py ++++ b/lib/cli/app.py +@@ -240,6 +240,9 @@ def run(self): + try: + returned = self.main(*args) + except Exception, e: ++ elif isinstance(e, self.reraise): ++ # raising the last exception preserves traceback ++ raise + returned = e + + return self.post_run(returned) diff --git a/package/python-pycli/0002-except-statement-changed-slightly-in-2-6.patch b/package/python-pycli/0002-except-statement-changed-slightly-in-2-6.patch new file mode 100644 index 0000000000..75869d6d23 --- /dev/null +++ b/package/python-pycli/0002-except-statement-changed-slightly-in-2-6.patch @@ -0,0 +1,41 @@ +From 2af95cff5609142ec14efdf13b394f9b0121ab2e Mon Sep 17 00:00:00 2001 +From: mmbutter +Date: Thu, 11 Jun 2020 15:50:03 -0500 +Subject: [PATCH] except statement changed slightly in 2.6. This could cause + problems in newer versions. Updated to the new format. + +[Retrieved from: +https://github.com/whilp/cli/commit/2af95cff5609142ec14efdf13b394f9b0121ab2e] +Signed-off-by: Fabrice Fontaine +--- + lib/cli/app.py | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/lib/cli/app.py b/lib/cli/app.py +index f487ab4..45256b8 100644 +--- a/lib/cli/app.py ++++ b/lib/cli/app.py +@@ -239,10 +239,10 @@ def run(self): + args = () + try: + returned = self.main(*args) +- except Exception, e: +- elif isinstance(e, self.reraise): +- # raising the last exception preserves traceback +- raise ++ except self.reraise: ++ # raising the last exception preserves traceback ++ raise ++ except Exception as e: + returned = e + + return self.post_run(returned) +@@ -420,7 +420,7 @@ def pre_run(self): + """ + try: + ns = self.argparser.parse_args() +- except SystemExit, e: ++ except SystemExit as e: + if self.exit_after_main: + raise + else: -- 2.34.1 From fontaine.fabrice at gmail.com Tue Feb 15 13:41:10 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 15 Feb 2022 14:41:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5webkit: disable sampling profiler on musl Message-ID: <20220215134110.2365539-1-fontaine.fabrice@gmail.com> Disable sampling profiler on musl to avoid the following build falure raised since bump to version 5.212.0-alpha4 in commit df0b0fe6919c0d0f3750f439a3cfa765232bd569: /home/buildroot/autobuild/instance-0/output-1/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/heap/MachineStackMarker.cpp:686:2: error: #error Need a way to get the frame pointer for another thread on this platform 686 | #error Need a way to get the frame pointer for another thread on this platform | ^~~~~ Fixes: - http://autobuild.buildroot.org/results/87f52db7f8ebefa4c1ae3dd70d4a7a460f9aca35 Signed-off-by: Fabrice Fontaine --- package/qt5/qt5webkit/qt5webkit.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk index 2084f3af52..024184e267 100644 --- a/package/qt5/qt5webkit/qt5webkit.mk +++ b/package/qt5/qt5webkit/qt5webkit.mk @@ -39,6 +39,10 @@ ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5WEBKIT_DEPENDENCIES += qt5declarative endif +ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) +QT5WEBKIT_CONF_OPTS += -DENABLE_SAMPLING_PROFILER=OFF +endif + QT5WEBKIT_CONF_OPTS += \ -DENABLE_TOOLS=OFF \ -DPORT=Qt \ -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 15 21:34:29 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 15 Feb 2022 14:34:29 -0700 Subject: [Buildroot] [PATCH 1/1] package/bpftool: bump to version 51d4a12c69c7339f60813b04fc9d0fd6154792a6 Message-ID: <20220215213429.1778225-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/bpftool/bpftool.hash | 2 +- package/bpftool/bpftool.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/bpftool/bpftool.hash b/package/bpftool/bpftool.hash index c7d4ae250e..9cb03ae332 100644 --- a/package/bpftool/bpftool.hash +++ b/package/bpftool/bpftool.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 c868cb85bf44195ec6cd20649c3db4f7aff64a38d950a1c2911d981fb2d7042c bpftool-a7f0e7f057283ae8af3de4578bcb8b7ee80b7144-br1.tar.gz +sha256 97a91701f0924152eb506d549b46f5df8ce80e738f175c32c364aa8da90ab746 bpftool-51d4a12c69c7339f60813b04fc9d0fd6154792a6-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 index 4276f91958..66f8932b6d 100644 --- a/package/bpftool/bpftool.mk +++ b/package/bpftool/bpftool.mk @@ -4,7 +4,7 @@ # ################################################################################ -BPFTOOL_VERSION = a7f0e7f057283ae8af3de4578bcb8b7ee80b7144 +BPFTOOL_VERSION = 51d4a12c69c7339f60813b04fc9d0fd6154792a6 BPFTOOL_SITE = https://github.com/libbpf/bpftool BPFTOOL_SITE_METHOD = git BPFTOOL_GIT_SUBMODULES = YES -- 2.25.1 From ps.report at gmx.net Tue Feb 15 21:41:25 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 15 Feb 2022 22:41:25 +0100 Subject: [Buildroot] [PATCH v1] package/assimp: bump version to 5.2.1 Message-ID: <20220215214125.20412-1-ps.report@gmx.net> For details see [1]. [1] https://github.com/assimp/assimp/releases/tag/v5.2.1 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 50f0b3e6d6..a778b79132 100644 --- a/package/assimp/assimp.hash +++ b/package/assimp/assimp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 52ad3a3776ce320c8add531dbcb2d3b93f2e1f10fcff5ac30178b09ba934d084 assimp-5.1.6.tar.gz +sha256 c9cbbc8589639cd8c13f65e94a90422a70454e8fa150cf899b6038ba86e9ecff assimp-5.2.1.tar.gz sha256 147874443d242b4e2bae97036e26ec9d6b37f706174c1bd5ecfcc8c1294cef51 LICENSE diff --git a/package/assimp/assimp.mk b/package/assimp/assimp.mk index 766b2c9b5a..42440f0fa9 100644 --- a/package/assimp/assimp.mk +++ b/package/assimp/assimp.mk @@ -4,7 +4,7 @@ # ################################################################################ -ASSIMP_VERSION = 5.1.6 +ASSIMP_VERSION = 5.2.1 ASSIMP_SITE = $(call github,assimp,assimp,v$(ASSIMP_VERSION)) ASSIMP_LICENSE = BSD-3-Clause ASSIMP_LICENSE_FILES = LICENSE -- 2.34.1 From peter at korsgaard.com Tue Feb 15 22:10:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 15 Feb 2022 23:10:23 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/binutils: add upstream patch for v2.37 fixing linking of thin archives Message-ID: <20220215220331.6CEBB82931@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=94c3c2fa49e26b956f229ee40fa1580d863dc9eb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 40f7b0bb6b91400b9e1fc60f410c9cdcbd1998ab) Signed-off-by: Peter Korsgaard --- ...he-file-descriptor-if-there-is-no-archive.patch | 236 +++++++++++++++++++++ 1 file changed, 236 insertions(+) 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 + From peter at korsgaard.com Tue Feb 15 22:11:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 15 Feb 2022 23:11:35 +0100 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> (Peter Seiderer's message of "Wed, 26 Jan 2022 20:34:31 +0100") References: <20220126193431.17777-1-ps.report@gmx.net> Message-ID: <8735kjkcfc.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > 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 Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From james.hilliard1 at gmail.com Tue Feb 15 22:24:22 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 15 Feb 2022 15:24:22 -0700 Subject: [Buildroot] [PATCH 1/1] package/libbpf: bump to version 0.7.0 Message-ID: <20220215222422.1865613-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/libbpf/libbpf.hash | 2 +- package/libbpf/libbpf.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libbpf/libbpf.hash b/package/libbpf/libbpf.hash index 27e22be9e9..06adc09885 100644 --- a/package/libbpf/libbpf.hash +++ b/package/libbpf/libbpf.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 ce3a8eb32d85ac48490256597736d8b27e0a5e947a0731613b7aba6b4ae43ac0 libbpf-0.6.1.tar.gz +sha256 5083588ce5a3a620e395ee1e596af77b4ec5771ffc71cff2af49dfee38c06361 libbpf-0.7.0.tar.gz sha256 847f4addbd56e2d5be20c4ea0845e972672fc07b755fadaae5f7abd35d71e349 LICENSE sha256 6313108c23efffa36948f8b2cff1560a5935373b527b0e1a837cc77e6ed1bacd LICENSE.BSD-2-Clause sha256 0b9a4febcdee6de55872501d5c1a8f5d8b0d1650cd4d5351995ceb22e889f8ca LICENSE.LGPL-2.1 diff --git a/package/libbpf/libbpf.mk b/package/libbpf/libbpf.mk index 6750b063c0..ff018f5c24 100644 --- a/package/libbpf/libbpf.mk +++ b/package/libbpf/libbpf.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBBPF_VERSION = 0.6.1 +LIBBPF_VERSION = 0.7.0 LIBBPF_SITE = $(call github,libbpf,libbpf,v$(LIBBPF_VERSION)) LIBBPF_LICENSE = GPL-2.0, LGPL-2.1, BSD-2-Clause LIBBPF_LICENSE_FILES = LICENSE LICENSE.BSD-2-Clause LICENSE.LGPL-2.1 -- 2.25.1 From fontaine.fabrice at gmail.com Tue Feb 15 22:40:39 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 15 Feb 2022 23:40:39 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/bluez5_utils: fix build with glibc < 2.25 Message-ID: <20220215224039.3567741-1-fontaine.fabrice@gmail.com> Fix the following build failure with glibc < 2.25 raised since bump to version 5.63 in commit d4c6cf4b1fc0f34e72ff047e76de53d3634f5184: plugins/autopair.c:20:24: fatal error: sys/random.h: No such file or directory #include ^ Fixes: - http://autobuild.buildroot.org/results/6b8870d12e0804d6154230a7322c49416c1dc0e2 Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2: - Use upstream patch ...005-build-Fix-errors-with-glibc-2-25.patch | 312 ++++++++++++++++++ 1 file changed, 312 insertions(+) create mode 100644 package/bluez5_utils/0005-build-Fix-errors-with-glibc-2-25.patch diff --git a/package/bluez5_utils/0005-build-Fix-errors-with-glibc-2-25.patch b/package/bluez5_utils/0005-build-Fix-errors-with-glibc-2-25.patch new file mode 100644 index 0000000000..13033da7b2 --- /dev/null +++ b/package/bluez5_utils/0005-build-Fix-errors-with-glibc-2-25.patch @@ -0,0 +1,312 @@ +From fb57ad9b9d107856e5f1c8135da04ffa2f7a11ac Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 14 Feb 2022 21:17:39 +0100 +Subject: build: Fix errors with glibc < 2.25 + +getrandom and sys/random.h are only available since glibc 2.25: +https://www.gnu.org/software/gnulib/manual/html_node/sys_002frandom_002eh.html +resulting in the following build failures since version 5.63 and +https://git.kernel.org/pub/scm/bluetooth/bluez.git/log/?qt=grep&q=getrandom: + +plugins/autopair.c:20:24: fatal error: sys/random.h: No such file or directory + #include + ^ + +To fix this build failure, add util_getrandom and a fallback (borrowed +from pipewire and licensed under MIT): +https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/master/src/pipewire/utils.c + +Fixes: + - http://autobuild.buildroot.org/results/6b8870d12e0804d6154230a7322c49416c1dc0e2 + +[Retrieved from: +https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=fb57ad9b9d107856e5f1c8135da04ffa2f7a11ac] +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 4 +++- + emulator/le.c | 3 +-- + emulator/phy.c | 3 +-- + peripheral/main.c | 4 ++-- + plugins/autopair.c | 4 ++-- + profiles/health/hdp.c | 4 ++-- + profiles/health/mcap.c | 6 +++--- + src/shared/util.c | 25 +++++++++++++++++++++++++ + src/shared/util.h | 2 ++ + tools/btgatt-server.c | 3 +-- + 10 files changed, 42 insertions(+), 16 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 07d068a4d..441bd5f29 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -54,6 +54,8 @@ AC_ARG_ENABLE(threads, AS_HELP_STRING([--enable-threads], + + AC_CHECK_FUNCS(explicit_bzero) + ++AC_CHECK_FUNCS(getrandom) ++ + AC_CHECK_FUNCS(rawmemchr) + + AC_CHECK_FUNC(signalfd, dummy=yes, +@@ -68,7 +70,7 @@ AC_CHECK_LIB(pthread, pthread_create, dummy=yes, + AC_CHECK_LIB(dl, dlopen, dummy=yes, + AC_MSG_ERROR(dynamic linking loader is required)) + +-AC_CHECK_HEADERS(linux/types.h linux/if_alg.h linux/uinput.h linux/uhid.h) ++AC_CHECK_HEADERS(linux/types.h linux/if_alg.h linux/uinput.h linux/uhid.h sys/random.h) + + PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.28, dummy=yes, + AC_MSG_ERROR(GLib >= 2.28 is required)) +diff --git a/emulator/le.c b/emulator/le.c +index f8f313f2c..7656a657c 100644 +--- a/emulator/le.c ++++ b/emulator/le.c +@@ -20,7 +20,6 @@ + #include + #include + #include +-#include + #include + + #include "lib/bluetooth.h" +@@ -509,7 +508,7 @@ static unsigned int get_adv_delay(void) + /* The advertising delay is a pseudo-random value with a range + * of 0 ms to 10 ms generated for each advertising event. + */ +- if (getrandom(&val, sizeof(val), 0) < 0) { ++ if (util_getrandom(&val, sizeof(val), 0) < 0) { + /* If it fails to get the random number, use a static value */ + val = 5; + } +diff --git a/emulator/phy.c b/emulator/phy.c +index 44cace438..7de85fb05 100644 +--- a/emulator/phy.c ++++ b/emulator/phy.c +@@ -19,7 +19,6 @@ + #include + #include + #include +-#include + #include + #include + #include +@@ -174,7 +173,7 @@ struct bt_phy *bt_phy_new(void) + mainloop_add_fd(phy->rx_fd, EPOLLIN, phy_rx_callback, phy, NULL); + + if (!get_random_bytes(&phy->id, sizeof(phy->id))) { +- if (getrandom(&phy->id, sizeof(phy->id), 0) < 0) { ++ if (util_getrandom(&phy->id, sizeof(phy->id), 0) < 0) { + mainloop_remove_fd(phy->rx_fd); + close(phy->tx_fd); + close(phy->rx_fd); +diff --git a/peripheral/main.c b/peripheral/main.c +index 91adb45fc..b82d7caf6 100644 +--- a/peripheral/main.c ++++ b/peripheral/main.c +@@ -25,13 +25,13 @@ + #include + #include + #include +-#include + + #ifndef WAIT_ANY + #define WAIT_ANY (-1) + #endif + + #include "src/shared/mainloop.h" ++#include "src/shared/util.h" + #include "peripheral/efivars.h" + #include "peripheral/attach.h" + #include "peripheral/gap.h" +@@ -192,7 +192,7 @@ int main(int argc, char *argv[]) + addr, 6) < 0) { + printf("Generating new persistent static address\n"); + +- if (getrandom(addr, sizeof(addr), 0) < 0) { ++ if (util_getrandom(addr, sizeof(addr), 0) < 0) { + perror("Failed to get random static address"); + return EXIT_FAILURE; + } +diff --git a/plugins/autopair.c b/plugins/autopair.c +index a75ecebe4..0b09e893f 100644 +--- a/plugins/autopair.c ++++ b/plugins/autopair.c +@@ -17,7 +17,6 @@ + #include + #include + #include +-#include + + #include + +@@ -29,6 +28,7 @@ + #include "src/device.h" + #include "src/log.h" + #include "src/storage.h" ++#include "src/shared/util.h" + + /* + * Plugin to handle automatic pairing of devices with reduced user +@@ -131,7 +131,7 @@ static ssize_t autopair_pincb(struct btd_adapter *adapter, + if (attempt >= 4) + return 0; + +- if (getrandom(&val, sizeof(val), 0) < 0) { ++ if (util_getrandom(&val, sizeof(val), 0) < 0) { + error("Failed to get a random pincode"); + return 0; + } +diff --git a/profiles/health/hdp.c b/profiles/health/hdp.c +index 9d9d1e824..b6590cd3a 100644 +--- a/profiles/health/hdp.c ++++ b/profiles/health/hdp.c +@@ -16,7 +16,6 @@ + #include + #include + #include +-#include + + #include + +@@ -33,6 +32,7 @@ + #include "src/device.h" + #include "src/sdpd.h" + #include "src/shared/timeout.h" ++#include "src/shared/util.h" + #include "btio/btio.h" + + #include "hdp_types.h" +@@ -1490,7 +1490,7 @@ static void *generate_echo_packet(void) + if (!buf) + return NULL; + +- if (getrandom(buf, HDP_ECHO_LEN, 0) < 0) { ++ if (util_getrandom(buf, HDP_ECHO_LEN, 0) < 0) { + g_free(buf); + return NULL; + } +diff --git a/profiles/health/mcap.c b/profiles/health/mcap.c +index aad0a08a3..5d2bac3d9 100644 +--- a/profiles/health/mcap.c ++++ b/profiles/health/mcap.c +@@ -19,7 +19,6 @@ + #include + #include + #include +-#include + + #include + +@@ -28,6 +27,7 @@ + #include "btio/btio.h" + #include "src/log.h" + #include "src/shared/timeout.h" ++#include "src/shared/util.h" + + #include "mcap.h" + +@@ -1905,7 +1905,7 @@ gboolean mcap_create_mcl(struct mcap_instance *mi, + mcl->state = MCL_IDLE; + bacpy(&mcl->addr, addr); + set_default_cb(mcl); +- if (getrandom(&val, sizeof(val), 0) < 0) { ++ if (util_getrandom(&val, sizeof(val), 0) < 0) { + mcap_instance_unref(mcl->mi); + g_free(mcl); + return FALSE; +@@ -2049,7 +2049,7 @@ static void connect_mcl_event_cb(GIOChannel *chan, GError *gerr, + mcl->mi = mcap_instance_ref(mi); + bacpy(&mcl->addr, &dst); + set_default_cb(mcl); +- if (getrandom(&val, sizeof(val), 0) < 0) { ++ if (util_getrandom(&val, sizeof(val), 0) < 0) { + mcap_instance_unref(mcl->mi); + g_free(mcl); + goto drop; +diff --git a/src/shared/util.c b/src/shared/util.c +index 6e1c83057..33196bf8b 100644 +--- a/src/shared/util.c ++++ b/src/shared/util.c +@@ -13,6 +13,7 @@ + #endif + + #define _GNU_SOURCE ++#include + #include + #include + #include +@@ -23,6 +24,10 @@ + #include + #include + ++#ifdef HAVE_SYS_RANDOM_H ++#include ++#endif ++ + #include "src/shared/util.h" + + void *util_malloc(size_t size) +@@ -138,6 +143,26 @@ unsigned char util_get_dt(const char *parent, const char *name) + return DT_UNKNOWN; + } + ++/* Helper for getting a random in case getrandom unavailable (glibc < 2.25) */ ++ssize_t util_getrandom(void *buf, size_t buflen, unsigned int flags) ++{ ++#ifdef HAVE_GETRANDOM ++ return getrandom(buf, buflen, flags); ++#else ++ int fd; ++ ssize_t bytes; ++ ++ fd = open("/dev/urandom", O_CLOEXEC); ++ if (fd < 0) ++ return -1; ++ ++ bytes = read(fd, buf, buflen); ++ close(fd); ++ ++ return bytes; ++#endif ++} ++ + /* Helpers for bitfield operations */ + + /* Find unique id in range from 1 to max but no bigger than 64. */ +diff --git a/src/shared/util.h b/src/shared/util.h +index 8ef6132c4..c01eccf8a 100644 +--- a/src/shared/util.h ++++ b/src/shared/util.h +@@ -103,6 +103,8 @@ void util_hexdump(const char dir, const unsigned char *buf, size_t len, + + unsigned char util_get_dt(const char *parent, const char *name); + ++ssize_t util_getrandom(void *buf, size_t buflen, unsigned int flags); ++ + uint8_t util_get_uid(uint64_t *bitmap, uint8_t max); + void util_clear_uid(uint64_t *bitmap, uint8_t id); + +diff --git a/tools/btgatt-server.c b/tools/btgatt-server.c +index 15d49a464..4a5d2b720 100644 +--- a/tools/btgatt-server.c ++++ b/tools/btgatt-server.c +@@ -20,7 +20,6 @@ + #include + #include + #include +-#include + + #include "lib/bluetooth.h" + #include "lib/hci.h" +@@ -287,7 +286,7 @@ static bool hr_msrmt_cb(void *user_data) + uint32_t cur_ee; + uint32_t val; + +- if (getrandom(&val, sizeof(val), 0) < 0) ++ if (util_getrandom(&val, sizeof(val), 0) < 0) + return false; + + pdu[0] = 0x06; +-- +cgit + -- 2.34.1 From Damien.LeMoal at wdc.com Tue Feb 15 23:37:27 2022 From: Damien.LeMoal at wdc.com (Damien Le Moal) Date: Tue, 15 Feb 2022 23:37:27 +0000 Subject: [Buildroot] [PATCH v5 05/10] board: Add Sipeed MAIX-bit support In-Reply-To: <20220103162520.07b40bf0@windsurf> References: <20211026071728.954356-1-damien.lemoal@wdc.com> <20211026071728.954356-6-damien.lemoal@wdc.com> <20211230212742.030be8c5@windsurf> <20220103162520.07b40bf0@windsurf> Message-ID: <0a4ee945d9de8406fc1887ac2ae23037851f56f1.camel@wdc.com> On Mon, 2022-01-03 at 16:25 +0100, Thomas Petazzoni wrote: > 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. Update: I think the elf2flt stability problem was sorted. It seems to have been related to gcc arch isa options that were not set correctly. With that done, we stumbled upon some bugs in u-boot that prevented clean boots. We have finally found fixes for all the problems now. We will be sending patches to uboot & kernel and update the buildroot series once that is done. Cheers. > > > > - 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 -- Damien Le Moal Western Digital Research From peterlin at andestech.com Wed Feb 16 00:52:13 2022 From: peterlin at andestech.com (Yu Chien Peter Lin) Date: Wed, 16 Feb 2022 08:52:13 +0800 Subject: [Buildroot] [PATCH 2/3] board/andes/ae350: add support for Andes AE350 In-Reply-To: References: Message-ID: Hi Giulio, > On Tue, Feb 15, 2022 at 02:00:36PM +0100, Giulio Benetti wrote: > > Hi Peter, > > > > > Il giorno 15 feb 2022, alle ore 06:16, Yu Chien Peter Lin ha scritto: > > > > > > ? > > >> > > >>> On Tue, Feb 15, 2022 at 10:32:01AM +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 > > >>> --- > > >>> Changes > > >>> V1->V2: > > >>> * move linux source code and its patches to AndesTech Github repo > > >>> * rename ae350_andestar45_defconfig to andes_ae350_45_defconfig > > >>> * change C library to uClibc > > >>> * remove OpenSSL package > > >>> * remove rootfs.cpio and rootfs.tar > > >>> * update DEVELOPERS > > >>> V2->V3: > > >>> * specifiy branch to download from AndesTech linux repo > > >>> * change boot.cmd to extlinux.conf > > >>> * add post-build.sh for extlinux.conf to retrieve Image and DTB > > >>> * fix format and update genimage_sdcard.cfg > > >>> * update readme.txt > > >>> * add packages (python3, pylibfdt and openssl) for u-boot binman > > >>> * reorder item in DEVELOPERS > > >>> > > > > > > Sorry, I missed versioning for this revision. > > > I'll resend it and fix changelog format. > > > > Can you please subscribe to patchwork[1] and tag your patches without V3 prefix as rejected? > > > > [1]: https://patchwork.ozlabs.org/project/buildroot/list/ > > > > Thank you! > > Giulio Sure, I've updated. Sorry about that. Yu-Chien Peter Lin From Noreply at busybox.net Wed Feb 16 01:14:22 2022 From: Noreply at busybox.net (Noreply at busybox.net) Date: 16 Feb 2022 02:14:22 +0100 Subject: [Buildroot] buildroot@busybox.net Received AWB Documents via WeTransfer Message-ID: <20220216021422.C34405EEAD50AAE7@busybox.net> An HTML attachment was scrubbed... URL: From giulio.benetti at benettiengineering.com Wed Feb 16 01:52:37 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 16 Feb 2022 02:52:37 +0100 Subject: [Buildroot] [PATCH 2/3] board/andes/ae350: add support for Andes AE350 In-Reply-To: References: Message-ID: <40D75C1A-19A7-4E03-8B69-976F680BE842@benettiengineering.com> > Il giorno 16 feb 2022, alle ore 01:53, Yu Chien Peter Lin ha scritto: > > ?Hi Giulio, > >>> On Tue, Feb 15, 2022 at 02:00:36PM +0100, Giulio Benetti wrote: >>> Hi Peter, >>> >>>> Il giorno 15 feb 2022, alle ore 06:16, Yu Chien Peter Lin ha scritto: >>>> >>>> ? >>>>> >>>>>> On Tue, Feb 15, 2022 at 10:32:01AM +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 >>>>>> --- >>>>>> Changes >>>>>> V1->V2: >>>>>> * move linux source code and its patches to AndesTech Github repo >>>>>> * rename ae350_andestar45_defconfig to andes_ae350_45_defconfig >>>>>> * change C library to uClibc >>>>>> * remove OpenSSL package >>>>>> * remove rootfs.cpio and rootfs.tar >>>>>> * update DEVELOPERS >>>>>> V2->V3: >>>>>> * specifiy branch to download from AndesTech linux repo >>>>>> * change boot.cmd to extlinux.conf >>>>>> * add post-build.sh for extlinux.conf to retrieve Image and DTB >>>>>> * fix format and update genimage_sdcard.cfg >>>>>> * update readme.txt >>>>>> * add packages (python3, pylibfdt and openssl) for u-boot binman >>>>>> * reorder item in DEVELOPERS >>>>>> >>>> >>>> Sorry, I missed versioning for this revision. >>>> I'll resend it and fix changelog format. >>> >>> Can you please subscribe to patchwork[1] and tag your patches without V3 prefix as rejected? >>> >>> [1]: https://patchwork.ozlabs.org/project/buildroot/list/ >>> >>> Thank you! >>> Giulio > > Sure, I've updated. Sorry about that. No problem, please also the v2 version. You can filter by your name and check your patches. Thank you! Best regards Giulio > > Yu-Chien Peter Lin > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From peter at korsgaard.com Wed Feb 16 07:18:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 08:18:42 +0100 Subject: [Buildroot] [PATCH] package/prosody: security bump to 0.11.13 In-Reply-To: <20220131144734.1199549-1-francois.perrad@gadz.org> (Francois Perrad's message of "Mon, 31 Jan 2022 15:47:34 +0100") References: <20220131144734.1199549-1-francois.perrad@gadz.org> Message-ID: <87y22bi8j1.fsf@dell.be.48ers.dk> >>>>> "Francois" == Francois Perrad writes: > see https://prosody.im/doc/release/0.11.13 > Signed-off-by: Francois Perrad Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 16 07:19:48 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 08:19:48 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/expat: security bump to 2.4.4 Message-ID: <20220216071213.05420831C4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=91a66a566b9f89c1aaf95715ab9dd7b3a8937084 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x fix CVE-2022-23852, CVE-2022-23990 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard (cherry picked from commit ab71ac15ddd7ed6a8ca83cbc23ea0b0cbb343f0f) Signed-off-by: Peter Korsgaard --- 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 0853c3c76d..3129801668 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 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 From peter at korsgaard.com Wed Feb 16 07:17:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 08:17:51 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/prosody: security bump to 0.11.13 Message-ID: <20220216071212.EFF0082B34@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f1341cecb497e8b0f0e6bf5ce4a2b17e4614b1de branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x see https://prosody.im/doc/release/0.11.13 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard (cherry picked from commit 800e53cf7e3ec71c3830e8a125b0a5546786d44f) 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 b6fa6532a5..3a3a363a4b 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 d697c85568..62ba073b9e 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 From peter at korsgaard.com Wed Feb 16 07:19:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 08:19:40 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/expat: security bump to 2.4.4 Message-ID: <20220216071217.2AE70831C4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4676734c0c19aca6656191f17f0e10c697eef097 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x fix CVE-2022-23852, CVE-2022-23990 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard (cherry picked from commit ab71ac15ddd7ed6a8ca83cbc23ea0b0cbb343f0f) Signed-off-by: Peter Korsgaard --- 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 0853c3c76d..3129801668 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 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 From peter at korsgaard.com Wed Feb 16 07:18:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 08:18:27 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/prosody: security bump to 0.11.13 Message-ID: <20220216071217.22A8B82B34@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5424a1320a574278e2d72dbf43813ce9fa03cd21 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x see https://prosody.im/doc/release/0.11.13 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard (cherry picked from commit 800e53cf7e3ec71c3830e8a125b0a5546786d44f) 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 b6fa6532a5..3a3a363a4b 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 d697c85568..62ba073b9e 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 From peter at korsgaard.com Wed Feb 16 07:20:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 08:20:01 +0100 Subject: [Buildroot] [PATCH] package/expat: security bump to 2.4.4 In-Reply-To: <20220131145825.1206899-1-francois.perrad@gadz.org> (Francois Perrad's message of "Mon, 31 Jan 2022 15:58:25 +0100") References: <20220131145825.1206899-1-francois.perrad@gadz.org> Message-ID: <87tuczi8gu.fsf@dell.be.48ers.dk> >>>>> "Francois" == Francois Perrad writes: > fix CVE-2022-23852, CVE-2022-23990 > Signed-off-by: Francois Perrad Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From thomas.petazzoni at bootlin.com Wed Feb 16 07:32:06 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 16 Feb 2022 07:32:06 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-02-15 Message-ID: <20220216073211.A30B360B4D@smtp3.osuosl.org> Hello, Autobuild statistics for 2022-02-15 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 41 | 11 | 1 | 53 | 2021.11.x | 21 | 1 | 0 | 22 | master | 54 | 27 | 0 | 81 | Classification of failures by reason for master ----------------------------------------------- bpftool-a7f0e7f057283ae8af3... | 4 frr-8.1 | 4 cryptsetup-2.4.3 | 3 host-libselinux-3.3 | 3 wpa_supplicant-2.10 | 3 unknown | 2 bluez5_utils-5.63 | 1 librtlsdr-ed0317e6a58c09887... | 1 protozero-1.7.1 | 1 python-greenlet-1.1.2 | 1 qt5webkit-5.212.0-alpha4 | 1 target-finalize | 1 tinifier-3.4.0 | 1 wavemon-0.9.4 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/9216c677cc8789dc8dd0fbfe1b6a1d8f878716f1 | x86_64 | bpftool-a7f0e7f057283ae8af3... | NOK | http://autobuild.buildroot.net/results/82f5809f0fc05ce814fe67078b9d622fbfdd0324 | powerpc | bpftool-a7f0e7f057283ae8af3... | NOK | http://autobuild.buildroot.net/results/278f73fb745f97e61c27c6ba776003329b5a016c | arm | bpftool-a7f0e7f057283ae8af3... | NOK | http://autobuild.buildroot.net/results/c08b40d4af432072959aacf0298e0e282254df01 | arm | bpftool-a7f0e7f057283ae8af3... | NOK | http://autobuild.buildroot.net/results/6bbad051ee9c8d3ddf11ea2a536bc7a8cf9e4867 | riscv64 | cryptsetup-2.4.3 | NOK | http://autobuild.buildroot.net/results/0887f4f8fb4c4a2006ba711028b2a37f3fa5fa46 | aarch64 | cryptsetup-2.4.3 | NOK | http://autobuild.buildroot.net/results/7b016b7170aacbab34757194e88fce95fc7edac3 | mips64el | cryptsetup-2.4.3 | NOK | http://autobuild.buildroot.net/results/70a839430158717f520973f60458e4e80ff469b2 | xtensa | frr-8.1 | NOK | http://autobuild.buildroot.net/results/694cc65478a82ec93d2074252892036855cdc49d | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/1bb288cd7f8536e6c374d33b257e8ad1587502e9 | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/0b38841d4b0bba1b1e24fcbe9db68b745054943d | mips64el | frr-8.1 | NOK | http://autobuild.buildroot.net/results/456528190fbd95e23d6d24cc75b5e01499ffe032 | riscv64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/4019c8db0d5979e0ec2276ab5625a31b9e9985e2 | arc | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/6fbbbd2ef6261f57b1405edc93f81f4c29205e3b | powerpc64le | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/cbab90ac0ca89b5a52635b54d2b4051f0bbcc8cc | xtensa | librtlsdr-ed0317e6a58c09887... | NOK | http://autobuild.buildroot.net/results/a366ae8d1713e60e82f26a27f2146bc16ae54d25 | i686 | protozero-1.7.1 | NOK | http://autobuild.buildroot.net/results/c3ae3b5caf79eb30c8a1786f58abea4f2b41a26e | arm | python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/ed896fb6b7a451faecad76bee0e9e113f60cf409 | i586 | qt5webkit-5.212.0-alpha4 | NOK | http://autobuild.buildroot.net/results/87f52db7f8ebefa4c1ae3dd70d4a7a460f9aca35 | nios2 | target-finalize | NOK | http://autobuild.buildroot.net/results/5d8d7913dd595932fc832b9cd690f0ceab69c735 | aarch64 | tinifier-3.4.0 | NOK | http://autobuild.buildroot.net/results/d6eae4cf0c00330366130dd4623c5db245bf4c47 | m68k | unknown | NOK | http://autobuild.buildroot.net/results/6eb1c45dab2ec3cb1bc577325318556a9d82ed23 | aarch64 | unknown | NOK | http://autobuild.buildroot.net/results/3dff4ba9c6e8981d1aacaf82fe43d685c3837189 | arc | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/07a1f872056f993317b2101402567f85643cc0d9 | arc | wpa_supplicant-2.10 | NOK | http://autobuild.buildroot.net/results/001981339f3b895ecd9208a747a0e47d07c9583a | arc | wpa_supplicant-2.10 | NOK | http://autobuild.buildroot.net/results/1dc4ea7d73cf6234012e38290cf7c8eb67bdaf84 | x86_64 | wpa_supplicant-2.10 | NOK | http://autobuild.buildroot.net/results/758ad18658c61586a2c60b69074a729f2add3f9f | Classification of failures by reason for 2021.02.x -------------------------------------------------- mesa3d-20.3.5 | 2 zeromq-4.3.4 | 2 erlang-jiffy-1.0.6 | 1 host-nodejs-12.22.9 | 1 host-sentry-cli-1.57.0 | 1 libtheora-1.1.1 | 1 monkey-f54856ce250c4e257354... | 1 openldap-2.4.59 | 1 sunxi-cedarx | 1 unknown | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mipsel | erlang-jiffy-1.0.6 | NOK | http://autobuild.buildroot.net/results/bd9af5a3238c3832f17ed9948047b755908991c2 | x86_64 | host-nodejs-12.22.9 | NOK | http://autobuild.buildroot.net/results/c1e1d1de23aed9359ece120174bf0e7dd3cc3e4a | aarch64 | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/e7b8435858f34e3d359d435e716a2c4e08ebf53d | or1k | libtheora-1.1.1 | NOK | http://autobuild.buildroot.net/results/66b929a0c68ca1b0bcb04a1a6d6db503f27e757a | ORPH arm | mesa3d-20.3.5 | NOK | http://autobuild.buildroot.net/results/bdd367e2ee4f294f9ced3bfd46658702d63e669f | arm | mesa3d-20.3.5 | NOK | http://autobuild.buildroot.net/results/79d652c295b61dfd913abd47cb8417a8b67db513 | mips64el | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/d5abe7732a5c59d47b9a52acdad9daf02fc069bf | riscv32 | openldap-2.4.59 | NOK | http://autobuild.buildroot.net/results/9f6e9d33f43ad96f3a1705184e031841ea9d73d4 | arm | sunxi-cedarx | TIM | http://autobuild.buildroot.net/results/8ba0758c59f8c509db91d8c0b6841dc224e2a5d1 | aarch64 | unknown | NOK | http://autobuild.buildroot.net/results/2917820ea84e5497d9cf334b3a45d9159dbdd3b5 | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/ec0580315c5fb2ee88dc99413c05d7373f2147d5 | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/ad864a532b758a3c11cc0243630d71a3a74996dc | 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? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- i686 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/f0c5c48f92e88a7ca7654f77ef00506ab68ddfae | -- http://autobuild.buildroot.net From thomas.petazzoni at bootlin.com Wed Feb 16 07:54:18 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 16 Feb 2022 08:54:18 +0100 Subject: [Buildroot] [PATCH v5 05/10] board: Add Sipeed MAIX-bit support In-Reply-To: <0a4ee945d9de8406fc1887ac2ae23037851f56f1.camel@wdc.com> References: <20211026071728.954356-1-damien.lemoal@wdc.com> <20211026071728.954356-6-damien.lemoal@wdc.com> <20211230212742.030be8c5@windsurf> <20220103162520.07b40bf0@windsurf> <0a4ee945d9de8406fc1887ac2ae23037851f56f1.camel@wdc.com> Message-ID: <20220216085418.03a39653@windsurf> On Tue, 15 Feb 2022 23:37:27 +0000 Damien Le Moal wrote: > > 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. > > Update: I think the elf2flt stability problem was sorted. It seems to have been > related to gcc arch isa options that were not set correctly. With that done, we > stumbled upon some bugs in u-boot that prevented clean boots. We have finally > found fixes for all the problems now. We will be sending patches to uboot & > kernel and update the buildroot series once that is done. Excellent, thanks for the news! Looking forward to the next iteration of the series. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From peter at korsgaard.com Wed Feb 16 08:22:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 09:22:39 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/gensio: add avahi optional dependency In-Reply-To: <2b31f3d9-12bb-dc7a-61ba-9e6981985cc0@mind.be> (Arnout Vandecappelle's message of "Thu, 3 Feb 2022 21:38:09 +0100") References: <20220113232903.318853-1-fontaine.fabrice@gmail.com> <2b31f3d9-12bb-dc7a-61ba-9e6981985cc0@mind.be> Message-ID: <87pmnni5kg.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle writes: > On 14/01/2022 00:29, 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 Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 16 08:22:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 09:22:26 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gensio: add avahi optional dependency Message-ID: <20220216081915.2680681EB3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0b420b8e2133bcb06808e9c39c20996f6b33671e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit f0a1d47f6fe6bda3b18b3fcfca37757b37695dbb) Signed-off-by: Peter Korsgaard --- package/gensio/gensio.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/gensio/gensio.mk b/package/gensio/gensio.mk index 2094c756fe..408e75b720 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 \ From peter at korsgaard.com Wed Feb 16 08:22:12 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 09:22:12 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gensio: add avahi optional dependency Message-ID: <20220216081920.D308881EB3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=168f8e4358e73037f6670e92640c0079a952a6c4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit f0a1d47f6fe6bda3b18b3fcfca37757b37695dbb) Signed-off-by: Peter Korsgaard --- 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 \ From peter at korsgaard.com Wed Feb 16 08:29:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 09:29:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/kf5/kf5-extra-cmake-modules: do not build documentation In-Reply-To: <56d88177-6e09-dba3-6b27-2119cd55db52@mind.be> (Arnout Vandecappelle's message of "Thu, 3 Feb 2022 21:39:53 +0100") References: <20220113233758.110264-1-aperez@igalia.com> <56d88177-6e09-dba3-6b27-2119cd55db52@mind.be> Message-ID: <87leybi58g.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle writes: > On 14/01/2022 00:37, Adrian Perez de Castro wrote: >> 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 > Applied to master, thanks. > (AFAICS the v2 was in fact identical) Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 16 13:14:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 14:14:17 +0100 Subject: [Buildroot] [git commit] package/qt5/qt5location: remove unused qt5location-mapboxgl Message-ID: <20220216130655.D2780821A9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8bb2db8cb1ec1ad4580ccd939dfa62bd84fa3011 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This was only needed when the mapboxgl submodule was a separate package(was never included in buildroot only a patch series). Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/qt5/qt5location/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/qt5/qt5location/Config.in b/package/qt5/qt5location/Config.in index b811f9a590..3d91adaf1f 100644 --- a/package/qt5/qt5location/Config.in +++ b/package/qt5/qt5location/Config.in @@ -1,7 +1,6 @@ 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++. From peter at korsgaard.com Wed Feb 16 13:14:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 14:14:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5location: remove unused qt5location-mapboxgl In-Reply-To: <20220206215734.3853337-1-james.hilliard1@gmail.com> (James Hilliard's message of "Sun, 6 Feb 2022 14:57:34 -0700") References: <20220206215734.3853337-1-james.hilliard1@gmail.com> Message-ID: <87fsojhs1m.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > This was only needed when the mapboxgl submodule was a separate > package(was never included in buildroot only a patch series). > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From yegorslists at googlemail.com Wed Feb 16 13:31:40 2022 From: yegorslists at googlemail.com (yegorslists at googlemail.com) Date: Wed, 16 Feb 2022 14:31:40 +0100 Subject: [Buildroot] [PATCH] package/libusb: fix maybe-uninitialized error Message-ID: <20220216133140.14668-1-yegorslists@googlemail.com> From: Yegor Yefremov Initialize active_config to an invalid value to avoid the following compilation error: os/linux_usbfs.c: In function ?op_get_configuration?: os/linux_usbfs.c:1452:12: error: ?active_config? may be used uninitialized in this function [-Werror=maybe-uninitialized] 1452 | *config = (uint8_t)active_config; Upstream URL: https://github.com/libusb/libusb/pull/1062 Signed-off-by: Yegor Yefremov --- ..._usbfs-fix-maybe-uninitialized-error.patch | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 package/libusb/0002-linux_usbfs-fix-maybe-uninitialized-error.patch diff --git a/package/libusb/0002-linux_usbfs-fix-maybe-uninitialized-error.patch b/package/libusb/0002-linux_usbfs-fix-maybe-uninitialized-error.patch new file mode 100644 index 0000000000..192172e9eb --- /dev/null +++ b/package/libusb/0002-linux_usbfs-fix-maybe-uninitialized-error.patch @@ -0,0 +1,36 @@ +From bea5891591402f14940a607eafbdcd169ff8827f Mon Sep 17 00:00:00 2001 +From: Yegor Yefremov +Date: Sun, 6 Feb 2022 07:12:14 +0100 +Subject: [PATCH 2/2] linux_usbfs: fix maybe-uninitialized error +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Initialize active_config to an invalid value to avoid the following +compilation error: + +os/linux_usbfs.c: In function ?op_get_configuration?: +os/linux_usbfs.c:1452:12: error: ?active_config? may be used uninitialized in this function [-Werror=maybe-uninitialized] + 1452 | *config = (uint8_t)active_config; + +Signed-off-by: Yegor Yefremov +--- + libusb/os/linux_usbfs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libusb/os/linux_usbfs.c b/libusb/os/linux_usbfs.c +index c300675..285d9ca 100644 +--- a/libusb/os/linux_usbfs.c ++++ b/libusb/os/linux_usbfs.c +@@ -1429,7 +1429,7 @@ static int op_get_configuration(struct libusb_device_handle *handle, + uint8_t *config) + { + struct linux_device_priv *priv = usbi_get_device_priv(handle->dev); +- int active_config; ++ int active_config = -1; /* to please compiler */ + int r; + + if (priv->sysfs_dir) { +-- +2.17.0 + -- 2.17.0 From peter at korsgaard.com Wed Feb 16 08:29:14 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 09:29:14 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/kf5/kf5-extra-cmake-modules: do not build documentation Message-ID: <20220216133230.ACC5D82D5B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0a395e2a6912ae5e1c11634b2c83deb6919fb78e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit b341f0c91f658484f90c5addd553c579b8d210c1) Signed-off-by: Peter Korsgaard --- package/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)) From fontaine.fabrice at gmail.com Wed Feb 16 14:22:13 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 16 Feb 2022 15:22:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/frr: set FRR_XREF_NO_NOTE Message-ID: <20220216142213.1472039-1-fontaine.fabrice@gmail.com> Set FRR_XREF_NO_NOTE to avoid the following build failures with microblazeel, nds32 and xtensa raised since bump to version 8.1 in commit ca2753fd47d47e5ad0eec16ea62f7b7f096331b6: _clippy.ELFAccessError: virtual address (538157256) not found in program headers [...] /tmp/ccFGv94v.s:13: Error: can't resolve `__start_xref_array' {*UND* section} - `L0' {.note.FRR section} /tmp/ccFGv94v.s:14: Error: can't resolve `__stop_xref_array' {*UND* section} - `L0' {.note.FRR section} Here is an extract of https://github.com/FRRouting/frr/blob/7347a4859d4b984cea0aef769a16622d3f02e44f/lib/xref.h: "FRR itself does not need this note to operate correctly, so if you have some build issue with it just add -DFRR_XREF_NO_NOTE to your build flags to disable it." Fixes: - http://autobuild.buildroot.org/results/3cdb50f5e5a1b3f37a6edcd4276fcbf015e28828 - http://autobuild.buildroot.org/results/a3cc0b5090a1faa2bca9c8dfe0fec9b6a918ba4d - http://autobuild.buildroot.org/results/694cc65478a82ec93d2074252892036855cdc49d Signed-off-by: Fabrice Fontaine --- package/frr/frr.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/frr/frr.mk b/package/frr/frr.mk index cc83016f9f..0e6ab7a815 100644 --- a/package/frr/frr.mk +++ b/package/frr/frr.mk @@ -17,7 +17,9 @@ FRR_DEPENDENCIES = host-frr readline json-c libyang libnl \ HOST_FRR_DEPENDENCIES = host-flex host-bison host-elfutils host-python3 -FRR_CONF_ENV = ac_cv_lib_cunit_CU_initialize_registry=no +FRR_CONF_ENV = \ + ac_cv_lib_cunit_CU_initialize_registry=no \ + CFLAGS="$(TARGET_CFLAGS) -DFRR_XREF_NO_NOTE" FRR_CONF_OPTS = --with-clippy=$(HOST_DIR)/bin/clippy \ --sysconfdir=/etc/frr \ -- 2.34.1 From br015 at umbiko.net Wed Feb 16 15:49:10 2022 From: br015 at umbiko.net (Andreas Ziegler) Date: Wed, 16 Feb 2022 16:49:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/mpd: add option for async file access using io_uring Message-ID: <20220216154910.8627-1-br015@umbiko.net> In version 0.22 mpd added an option to use the io_uring kernel interface for asynchronous access to local files. Buildroot added the necessary library (package/liburing) in commit 03ca6f4e39874583060317e7e15e9e360220877e. Add an option for mpd to optionally enable asynchronous file access using io_uring (via liburing). Signed-off-by: Andreas Ziegler --- package/mpd/Config.in | 10 ++++++++++ package/mpd/mpd.mk | 7 +++++++ 2 files changed, 17 insertions(+) diff --git a/package/mpd/Config.in b/package/mpd/Config.in index fc0f409448..c5a50898e2 100644 --- a/package/mpd/Config.in +++ b/package/mpd/Config.in @@ -347,6 +347,16 @@ config BR2_PACKAGE_MPD_AVAHI_SUPPORT comment "avahi support needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS +config BR2_PACKAGE_MPD_IO_URING + bool "io_uring" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1 + select BR2_PACKAGE_LIBURING + help + Asynchronous I/O using kernel io_uring subsystem + +comment "io_uring needs at least kernel version 5.1" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1 + config BR2_PACKAGE_MPD_LIBMPDCLIENT bool "libmpdclient" select BR2_PACKAGE_LIBMPDCLIENT diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index a55e4adde2..a0cebedc64 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -119,6 +119,13 @@ else MPD_CONF_OPTS += -Did3tag=disabled endif +ifeq ($(BR2_PACKAGE_MPD_IO_URING),y) +MPD_DEPENDENCIES += liburing +MPD_CONF_OPTS += -Dio_uring=enabled +else +MPD_CONF_OPTS += -Dio_uring=disabled +endif + ifeq ($(BR2_PACKAGE_MPD_JACK2),y) MPD_DEPENDENCIES += jack2 MPD_CONF_OPTS += -Djack=enabled -- 2.34.1 From bugzilla at busybox.net Wed Feb 16 16:47:59 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 16 Feb 2022 16:47:59 +0000 Subject: [Buildroot] [Bug 14596] New: package dialog is outdated and contains a bug Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14596 Bug ID: 14596 Summary: package dialog is outdated and contains a bug Product: buildroot Version: 2021.11.1 Hardware: All OS: Linux Status: NEW Severity: normal Priority: P5 Component: Outdated package Assignee: unassigned at buildroot.uclibc.org Reporter: roman.geile at meyton.eu CC: buildroot at uclibc.org Target Milestone: --- Created attachment 9231 --> https://bugs.busybox.net/attachment.cgi?id=9231&action=edit updated package files Buildroot 2021.11.1 contains version 1.3-20200327 of the "dialog" package. This version of the package is outdated and contains a bug in the "--pause" command line parameter. There are newer versions of dialog available which fix this bug. The current version is 1.3-20220117. Please update the package to the current version. I included an updated version of dialog.mk and dialog.hash in the attachment. -- You are receiving this mail because: You are on the CC list for the bug. From bernd.kuhls at t-online.de Wed Feb 16 18:01:28 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Wed, 16 Feb 2022 19:01:28 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/libdrm: bump version to 2.4.110 Message-ID: <20220216180128.49268-1-bernd.kuhls@t-online.de> Release notes: https://lists.freedesktop.org/archives/dri-devel/2022-February/342405.html Signed-off-by: Bernd Kuhls --- package/libdrm/libdrm.hash | 6 +++--- package/libdrm/libdrm.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libdrm/libdrm.hash b/package/libdrm/libdrm.hash index ca7332dd76..e0fac3a4d1 100644 --- a/package/libdrm/libdrm.hash +++ b/package/libdrm/libdrm.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/dri-devel/2021-November/332386.html -sha256 629352e08c1fe84862ca046598d8a08ce14d26ab25ee1f4704f993d074cb7f26 libdrm-2.4.109.tar.xz -sha512 45194bb28207421afcff3e247930d2eeab77a5fea58e6be22f67525f2e0aab2f410a9ae0ab315b55ef56b80c481bba40b1660468b7cda539758b2bbb8e814fd8 libdrm-2.4.109.tar.xz +# From https://lists.freedesktop.org/archives/dri-devel/2022-February/342405.html +sha256 eecee4c4b47ed6d6ce1a9be3d6d92102548ea35e442282216d47d05293cf9737 libdrm-2.4.110.tar.xz +sha512 52f92ef1fe4c218a1d7dba53ef43334dbfca80e3209afe59f3a32c4bf67473126534e990df07a931a12d46a3b997c21ef17c1c4d8a0c88d44d5c6c040e3b6be3 libdrm-2.4.110.tar.xz # Hash for license file sha256 d0a616a9020dc0271e36e6dd4bad174b4e2c2a42636f13785f8e18dd5f85fd83 data/meson.build diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk index 9b614bf421..b64db06931 100644 --- a/package/libdrm/libdrm.mk +++ b/package/libdrm/libdrm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBDRM_VERSION = 2.4.109 +LIBDRM_VERSION = 2.4.110 LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.xz LIBDRM_SITE = https://dri.freedesktop.org/libdrm LIBDRM_LICENSE = MIT -- 2.30.2 From arnout at mind.be Wed Feb 16 19:19:14 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 16 Feb 2022 20:19:14 +0100 Subject: [Buildroot] [PATCH 1/3] package/mender: bump to version 3.2.1 In-Reply-To: <20220207190238.73906-1-aduskett@gmail.com> References: <20220207190238.73906-1-aduskett@gmail.com> Message-ID: <09ad0e46-cc60-c9d7-e792-e9f7d647ad02@mind.be> On 07/02/2022 20:02, Adam Duskett wrote: > Other changes: > - Updated license hashes due to year changes, removals, and additions. I'm sorry Adam, but that's not enough. When you say "update license hashes due to removals and additions" it sounds like there were clauses removed to or added to the license - which would mean the license has changed. Did you mean the following? Update license hashes due to year changes. Remove license files of vendored dependencies that are no longer used. Add license files for new vendored dependencies. Also, did you check if MENDER_LICENSE needs to be updated due to the added or removed vendored dependencies? Regards, Arnout > > 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..3a7a675341 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 8dd04f963f1816350c5406312969f5b11d45c772274a8c32f7a9da8b2cc36561 3.2.1.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..33b4611a5f 100644 > --- a/package/mender/mender.mk > +++ b/package/mender/mender.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -MENDER_VERSION = 3.1.0 > +MENDER_VERSION = 3.2.1 > 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 From arnout at mind.be Wed Feb 16 19:39:11 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 16 Feb 2022 20:39:11 +0100 Subject: [Buildroot] [PATCH 1/1] package/{libuv, uvw}: bump to versions 1.43.0, 2.11.0_libuv_v1.43 In-Reply-To: <20220202073338.106855-1-asafka7@gmail.com> References: <20220202073338.106855-1-asafka7@gmail.com> Message-ID: <606bd490-3941-c9ff-e591-ae4f6abe61ef@mind.be> On 02/02/2022 08:33, Asaf Kahlon wrote: > Signed-off-by: Asaf Kahlon Applied to next, thanks. Regards, Arnout > --- > package/libuv/libuv.hash | 2 +- > package/libuv/libuv.mk | 2 +- > package/uvw/uvw.hash | 2 +- > package/uvw/uvw.mk | 2 +- > 4 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/libuv/libuv.hash b/package/libuv/libuv.hash > index 172ef1f168..1874aa344c 100644 > --- a/package/libuv/libuv.hash > +++ b/package/libuv/libuv.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 371e5419708f6aaeb8656671f89400b92a9bba6443369af1bb70bcd6e4b3c764 libuv-1.42.0.tar.gz > +sha256 9e27825a55279de69a7c43e42d509fd1337c9bece2547c761e91a1592e91cc4d libuv-1.43.0.tar.gz > sha256 6d20216ae022fbeed23916f48508fd807ece3d8464992330643b0e64e5c0c24b LICENSE > diff --git a/package/libuv/libuv.mk b/package/libuv/libuv.mk > index 9fe775951d..ed51fc92f9 100644 > --- a/package/libuv/libuv.mk > +++ b/package/libuv/libuv.mk > @@ -6,7 +6,7 @@ > > # When bumping libuv, check if a new version of uvw is available > # and bump it too. > -LIBUV_VERSION = 1.42.0 > +LIBUV_VERSION = 1.43.0 > LIBUV_SITE = $(call github,libuv,libuv,v$(LIBUV_VERSION)) > LIBUV_DEPENDENCIES = host-pkgconf > LIBUV_INSTALL_STAGING = YES > diff --git a/package/uvw/uvw.hash b/package/uvw/uvw.hash > index 5f7521c8b3..564c0980f3 100644 > --- a/package/uvw/uvw.hash > +++ b/package/uvw/uvw.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 30b0ba97a94d5e652490c6b1b32c95e608263f21cf3bc606308d09b3e3a114bf uvw-2.10.0_libuv_v1.42.tar.gz > +sha256 3af4efa2842299490ec764f2148f85f4426dfb4f8d8aa436cc2d049db2b7b514 uvw-2.11.0_libuv_v1.43.tar.gz > sha256 5de32af2469480cf3261c9781962e0887366666ba8ee1f4a32c386c77fc50c88 LICENSE > diff --git a/package/uvw/uvw.mk b/package/uvw/uvw.mk > index 9c15d536cb..161c40849d 100644 > --- a/package/uvw/uvw.mk > +++ b/package/uvw/uvw.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -UVW_VERSION = 2.10.0_libuv_v1.42 > +UVW_VERSION = 2.11.0_libuv_v1.43 > UVW_SITE = $(call github,skypjack,uvw,v$(UVW_VERSION)) > UVW_INSTALL_STAGING = YES > UVW_INSTALL_TARGET = NO From arnout at mind.be Wed Feb 16 19:39:27 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 16 Feb 2022 20:39:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/xmrig: bump version to 6.16.4 In-Reply-To: <20220212062220.611561-1-bernd.kuhls@t-online.de> References: <20220212062220.611561-1-bernd.kuhls@t-online.de> Message-ID: <7f4c3239-890c-0954-8f71-a460200532b6@mind.be> On 12/02/2022 07:22, Bernd Kuhls wrote: > Signed-off-by: Bernd Kuhls Applied to next, thanks. Regards, Arnout > --- > 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 36b0c8c8a1..ff5f80a67b 100644 > --- a/package/xmrig/xmrig.hash > +++ b/package/xmrig/xmrig.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 d413b6a20a0ce30410388d330e1056715333e0863165369668dda596766e9d5b xmrig-6.16.3.tar.gz > +sha256 245ba47a6b8ae8e9a9df1c055e90f22f944a7d1219416cb30268881d0c0d377b xmrig-6.16.4.tar.gz > sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE > diff --git a/package/xmrig/xmrig.mk b/package/xmrig/xmrig.mk > index 7fa638a54c..1feab499fc 100644 > --- a/package/xmrig/xmrig.mk > +++ b/package/xmrig/xmrig.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -XMRIG_VERSION = 6.16.3 > +XMRIG_VERSION = 6.16.4 > XMRIG_SITE = $(call github,xmrig,xmrig,v$(XMRIG_VERSION)) > XMRIG_LICENSE = GPL-3.0+ > XMRIG_LICENSE_FILES = LICENSE From arnout at mind.be Wed Feb 16 19:39:52 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 16 Feb 2022 20:39:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-setuptools: bump to version 60.8.2 In-Reply-To: <20220212111843.1210441-1-james.hilliard1@gmail.com> References: <20220212111843.1210441-1-james.hilliard1@gmail.com> Message-ID: On 12/02/2022 12:18, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to next, thanks. Regards, Arnout > --- > package/python-setuptools/python-setuptools.hash | 4 ++-- > package/python-setuptools/python-setuptools.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-setuptools/python-setuptools.hash b/package/python-setuptools/python-setuptools.hash > index 8df7155d4c..e04235e041 100644 > --- a/package/python-setuptools/python-setuptools.hash > +++ b/package/python-setuptools/python-setuptools.hash > @@ -1,4 +1,4 @@ > # From https://pypi.org/pypi/setuptools/json > -md5 082637e8fbc2e1fd9c637665d8fcccd8 setuptools-60.7.0.tar.gz > -sha256 b83cf328a4f6a987c95610e76b29a30778db05174eef71f771776c48f8f25d1b setuptools-60.7.0.tar.gz > +md5 f47a5750f6084cce3418f213a9d97785 setuptools-60.8.2.tar.gz > +sha256 66b8598da112b8dc8cd941d54cf63ef91d3b50657b374457eda5851f3ff6a899 setuptools-60.8.2.tar.gz > sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE > diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk > index 584f83f7a0..8653c42259 100644 > --- a/package/python-setuptools/python-setuptools.mk > +++ b/package/python-setuptools/python-setuptools.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_SETUPTOOLS_VERSION = 60.7.0 > +PYTHON_SETUPTOOLS_VERSION = 60.8.2 > PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).tar.gz > -PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/29/dd/48d662bb93e5e51e72265ef612f869947d4ae4126328d7156824cd50d440 > +PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/ae/0b/e458b0d07dced3d7fa2d21d828e708f374ef82040f2012c05d35f47f9af3 > PYTHON_SETUPTOOLS_LICENSE = MIT > PYTHON_SETUPTOOLS_LICENSE_FILES = LICENSE > PYTHON_SETUPTOOLS_CPE_ID_VENDOR = python From arnout at mind.be Wed Feb 16 19:50:14 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 16 Feb 2022 20:50:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/{mesa3d, mesa3d-headers}: bump version to 21.3.6 In-Reply-To: <20220213091532.1260695-1-bernd.kuhls@t-online.de> References: <20220213091532.1260695-1-bernd.kuhls@t-online.de> Message-ID: <24177320-70c0-38ad-e15f-59d813fa0525@mind.be> On 13/02/2022 10:15, Bernd Kuhls wrote: > Release notes: > https://lists.freedesktop.org/archives/mesa-announce/2022-February/000663.html > > Signed-off-by: Bernd Kuhls Applied to next, thanks. Regards, Arnout > --- > 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 871cf2f495..c8573fafad 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.5 > +MESA3D_HEADERS_VERSION = 21.3.6 > 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 e36d798e21..d64b833100 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/000660.html > -sha256 d93b2a9d2464ee856d7637a07dff6b7cd950f295ad58518bb959f76882cf4a4c mesa-21.3.5.tar.xz > -sha512 417d1787f8177567f0c547dde3e24212f7497f2fe7cdaa945fe998cd61ec0e9eb9388feb444e377c4fd8794b056af02aac28d1bbfb9527844391ba49e6893933 mesa-21.3.5.tar.xz > +# From https://lists.freedesktop.org/archives/mesa-announce/2022-February/000663.html > +sha256 96bb761fd546e9aa41d025fcc025225c5668443839dae21e3731959beb096736 mesa-21.3.6.tar.xz > +sha512 8c930e04eade29f689384ee7d6e2f178acbbf30fa6c9fdf132281279658c3c221ec7f9b1318e3c0a654c6136f925a5c0a35eaf849b65db7674641127c71e8a4f mesa-21.3.6.tar.xz > > # License > sha256 998437f3f75f0c542046f83c1cb349408122268168fb13eb4ae6967aa18b7d98 docs/license.rst > diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk > index 5f080ff5fc..95618b2072 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.5 > +MESA3D_VERSION = 21.3.6 > MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz > MESA3D_SITE = https://archive.mesa3d.org > MESA3D_LICENSE = MIT, SGI, Khronos From arnout at mind.be Wed Feb 16 19:50:29 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 16 Feb 2022 20:50:29 +0100 Subject: [Buildroot] [PATCH] boot/barebox: bump version to 2022.01.0 In-Reply-To: <20220213120258.601369-1-b.bilas@grinn-global.com> References: <20220213120258.601369-1-b.bilas@grinn-global.com> Message-ID: <1f101fba-478b-3881-5195-3be61cb4d8c6@mind.be> On 13/02/2022 13:02, Bartosz Bilas wrote: > Signed-off-by: Bartosz Bilas Applied to next, thanks. Regards, Arnout > --- > boot/barebox/Config.in | 4 ++-- > boot/barebox/barebox.hash | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in > index 23f8a5ac8a..c16fea3cea 100644 > --- a/boot/barebox/Config.in > +++ b/boot/barebox/Config.in > @@ -12,7 +12,7 @@ choice > Select the specific Barebox version you want to use > > config BR2_TARGET_BAREBOX_LATEST_VERSION > - bool "2021.12.0" > + bool "2022.01.0" > > config BR2_TARGET_BAREBOX_CUSTOM_VERSION > bool "Custom version" > @@ -40,7 +40,7 @@ endif > > config BR2_TARGET_BAREBOX_VERSION > string > - default "2021.12.0" if BR2_TARGET_BAREBOX_LATEST_VERSION > + default "2022.01.0" if BR2_TARGET_BAREBOX_LATEST_VERSION > default BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE if BR2_TARGET_BAREBOX_CUSTOM_VERSION > default "custom" if BR2_TARGET_BAREBOX_CUSTOM_TARBALL > default BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT > diff --git a/boot/barebox/barebox.hash b/boot/barebox/barebox.hash > index 0a853866b5..3d52d40beb 100644 > --- a/boot/barebox/barebox.hash > +++ b/boot/barebox/barebox.hash > @@ -1,8 +1,8 @@ > # From https://www.barebox.org/download/barebox-2021.12.0.tar.bz2.md5 > -md5 199b6d7ff3441cec2062ab18a52454dc barebox-2021.12.0.tar.bz2 > +md5 753ba533ced54f4113f9e97846c13fc1 barebox-2022.01.0.tar.bz2 > > # Locally calculated > -sha256 555569fe9e71524e0bf927eaa2c1aa2e81ee2c34dd71e39fe21620db6ccc8aa6 barebox-2021.12.0.tar.bz2 > +sha256 ddf7898075bec05e4865ce0f7a2ac19c2b1efaaa0d066eba1939494e25711d28 barebox-2022.01.0.tar.bz2 > > # License files, locally computed > sha256 ab1122aa9f9073ad1ec824edcd970b16a6a7881a34a18fd56c080debb2dca5d4 COPYING From arnout at mind.be Wed Feb 16 19:51:50 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 16 Feb 2022 20:51:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/unbound: bump version to 1.15.0 In-Reply-To: <20220213135540.49983-1-kyle@balena.io> References: <20220213135540.49983-1-kyle@balena.io> Message-ID: On 13/02/2022 14:55, Kyle Harding via buildroot wrote: > Signed-off-by: Kyle Harding Applied to next, thanks. Regards, Arnout > --- > package/unbound/unbound.hash | 4 ++-- > package/unbound/unbound.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/unbound/unbound.hash b/package/unbound/unbound.hash > index ca6fe174e0..99caf7dd3d 100644 > --- a/package/unbound/unbound.hash > +++ b/package/unbound/unbound.hash > @@ -1,5 +1,5 @@ > -# From https://nlnetlabs.nl/downloads/unbound/unbound-1.14.0.tar.gz.sha256 > -sha256 6ef91cbf02d5299eab39328c0857393de7b4885a2fe7233ddfe3c124ff5a89c8 unbound-1.14.0.tar.gz > +# From https://nlnetlabs.nl/downloads/unbound/unbound-1.15.0.tar.gz.sha256 > +sha256 a480dc6c8937447b98d161fe911ffc76cfaffa2da18788781314e81339f1126f unbound-1.15.0.tar.gz > > # Locally calculated > sha256 8eb9a16cbfb8703090bbfa3a2028fd46bb351509a2f90dc1001e51fbe6fd45db LICENSE > diff --git a/package/unbound/unbound.mk b/package/unbound/unbound.mk > index 61fdc5389b..1e6e0d99d7 100644 > --- a/package/unbound/unbound.mk > +++ b/package/unbound/unbound.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -UNBOUND_VERSION = 1.14.0 > +UNBOUND_VERSION = 1.15.0 > UNBOUND_SITE = https://www.unbound.net/downloads > UNBOUND_DEPENDENCIES = host-pkgconf expat libevent openssl > UNBOUND_LICENSE = BSD-3-Clause From arnout at mind.be Wed Feb 16 19:52:41 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 16 Feb 2022 20:52:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/ola: reintroduce package at version 0.10.8 In-Reply-To: <20220213161107.3138320-1-ju.o@free.fr> References: <20220213161107.3138320-1-ju.o@free.fr> Message-ID: <70a734bc-47f2-e4b5-fc90-45d7793a5757@mind.be> On 13/02/2022 17:11, Julien Olivain wrote: > The ola package (Open Lighting Architecture) version 0.10.2 was > removed in commit e692e1f2b2285c18057e2c70cc1d9d0cfdb15d5e due to an > incompatibility with the protobuf version 3.2.0 present in Buildroot > at that time. > > ola was fixed to support newer protobuf version in: > https://github.com/OpenLightingProject/ola/pull/1630 > > This commit reintroduce this package at version 0.10.8. > For changelogs since its removal at 0.10.2, see: > - https://github.com/OpenLightingProject/ola/releases/tag/0.10.3 > - https://github.com/OpenLightingProject/ola/releases/tag/0.10.4 > - https://github.com/OpenLightingProject/ola/releases/tag/0.10.5 > - https://github.com/OpenLightingProject/ola/releases/tag/0.10.6 > - https://github.com/OpenLightingProject/ola/releases/tag/0.10.7 > - https://github.com/OpenLightingProject/ola/releases/tag/0.10.8 > > This commit is based on the previously removed ola package, with the > following rework: > - Remove the dependency on BR2_HOST_GCC_AT_LEAST_4_5 as host gcc is > now guaranteed to be at least 4.8. > - Update target gcc dependency to >= 4.8 to reflect protobuf > requirement. > - Remove the BR2_PACKAGE_OLA_SLP option, which was removed in > ola 0.9.4. > - Change the "DMX4Linux" plugin option name to "Open DMX" to better > reflect the ola option (DMX4Linux is a legacy plugin for 2.6 > Kernels). > - Update Python support to version 3.x only > - Remove patches, as they are no longer needed > - Add options for ola plugins: ftdidmx, gpio, karate, > openpixelcontrol, renard, spi, uartdmx, usbdmx > - Reorder options alphabetically > - Update project URL > - Add license hashes > > Signed-off-by: Julien Olivain Applied to next, thanks. What an absolutely marvelous commit! Regards, Arnout > --- > Package tested with: > > make check-package > [...] > 0 warnings generated > > ./utils/test-pkg -a --package ola > [...] > 45 builds, 6 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed [snip] From arnout at mind.be Wed Feb 16 19:53:00 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 16 Feb 2022 20:53:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/opentracing-cpp: bump to version 1.6.0 In-Reply-To: <20220213213430.1506727-1-fontaine.fabrice@gmail.com> References: <20220213213430.1506727-1-fontaine.fabrice@gmail.com> Message-ID: <425ff588-4a09-7a64-3926-039c2dcd57b4@mind.be> On 13/02/2022 22:34, Fabrice Fontaine wrote: > Update indentation in hash file (two spaces) > > https://github.com/opentracing/opentracing-cpp/releases/tag/v1.6.0 > > Signed-off-by: Fabrice Fontaine Applied to next, thanks. Regards, Arnout > --- > package/opentracing-cpp/opentracing-cpp.hash | 4 ++-- > package/opentracing-cpp/opentracing-cpp.mk | 5 +++-- > 2 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/package/opentracing-cpp/opentracing-cpp.hash b/package/opentracing-cpp/opentracing-cpp.hash > index 591c0e4a0a..8cfaf5fd47 100644 > --- a/package/opentracing-cpp/opentracing-cpp.hash > +++ b/package/opentracing-cpp/opentracing-cpp.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 015c4187f7a6426a2b5196f0ccd982aa87f010cf61f507ae3ce5c90523f92301 opentracing-cpp-1.5.1.tar.gz > -sha256 076d03156735d5ff2df2ea0f8b12351ef65e5e9222b5c8c6a35101dadb41e717 LICENSE > +sha256 5b170042da4d1c4c231df6594da120875429d5231e9baa5179822ee8d1054ac3 opentracing-cpp-1.6.0.tar.gz > +sha256 076d03156735d5ff2df2ea0f8b12351ef65e5e9222b5c8c6a35101dadb41e717 LICENSE > diff --git a/package/opentracing-cpp/opentracing-cpp.mk b/package/opentracing-cpp/opentracing-cpp.mk > index 0605cd5d96..12ce40fbed 100644 > --- a/package/opentracing-cpp/opentracing-cpp.mk > +++ b/package/opentracing-cpp/opentracing-cpp.mk > @@ -4,8 +4,9 @@ > # > ################################################################################ > > -OPENTRACING_CPP_VERSION = 1.5.1 > -OPENTRACING_CPP_SITE = $(call github,opentracing,opentracing-cpp,v$(OPENTRACING_CPP_VERSION)) > +OPENTRACING_CPP_VERSION = 1.6.0 > +OPENTRACING_CPP_SITE = \ > + $(call github,opentracing,opentracing-cpp,v$(OPENTRACING_CPP_VERSION)) > OPENTRACING_CPP_LICENSE = Apache-2.0 > OPENTRACING_CPP_LICENSE_FILES = LICENSE > From arnout at mind.be Wed Feb 16 19:53:15 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 16 Feb 2022 20:53:15 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/mutt: bump to version 2.2.0 In-Reply-To: <20220213215159.1533045-1-fontaine.fabrice@gmail.com> References: <20220213215159.1533045-1-fontaine.fabrice@gmail.com> Message-ID: <82c196f4-b147-ad0b-d20d-addc721c5c30@mind.be> On 13/02/2022 22:51, Fabrice Fontaine wrote: > libgsasl is an optional dependency since > https://gitlab.com/muttmua/mutt/-/commit/68caf9140c8217ecf6c848460c4b4d27996b2922 > > http://www.mutt.org/relnotes/2.2/ > https://gitlab.com/muttmua/mutt/-/blob/mutt-2-2-rel/ChangeLog > > Signed-off-by: Fabrice Fontaine Applied to next, thanks. Regards, Arnout > --- > package/mutt/mutt.hash | 2 +- > package/mutt/mutt.mk | 12 ++++++++++-- > 2 files changed, 11 insertions(+), 3 deletions(-) > > diff --git a/package/mutt/mutt.hash b/package/mutt/mutt.hash > index d439b23aa3..bbc9d459b0 100644 > --- a/package/mutt/mutt.hash > +++ b/package/mutt/mutt.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 92a309e47e363a97d62425bcb71adceae5ab5c4c413dbcac37fa98ed70c12be0 mutt-2.1.5.tar.gz > +sha256 e84597f06d03ca82f8ca3b5ec8bc294c150709b43ed2a0177bf479c3e3345314 mutt-2.2.0.tar.gz > sha256 732f24b69a6c71cd8e01e4672bb8e12cc1cbb88a50a4665e6ca4fd95000a57ee GPL > diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk > index 7e9046fe8a..51178ef03d 100644 > --- a/package/mutt/mutt.mk > +++ b/package/mutt/mutt.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -MUTT_VERSION = 2.1.5 > +MUTT_VERSION = 2.2.0 > MUTT_SITE = https://bitbucket.org/mutt/mutt/downloads > MUTT_LICENSE = GPL-2.0+ > MUTT_LICENSE_FILES = GPL > @@ -53,8 +53,15 @@ else > MUTT_CONF_OPTS += --disable-pop > endif > > -# SSL support is only used by imap or pop3 module > +# SASL and SSL support are only used by imap or pop3 module > ifneq ($(BR2_PACKAGE_MUTT_IMAP)$(BR2_PACKAGE_MUTT_POP3),) > +ifeq ($(BR2_PACKAGE_LIBGSASL),y) > +MUTT_DEPENDENCIES += libgsasl > +MUTT_CONF_OPTS += --with-gsasl > +else > +MUTT_CONF_OPTS += --without-gsasl > +endif > + > ifeq ($(BR2_PACKAGE_OPENSSL),y) > MUTT_DEPENDENCIES += openssl > MUTT_CONF_OPTS += \ > @@ -72,6 +79,7 @@ MUTT_CONF_OPTS += \ > endif > else > MUTT_CONF_OPTS += \ > + --without-gsasl \ > --without-gnutls \ > --without-ssl > endif From arnout at mind.be Wed Feb 16 19:07:18 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 16 Feb 2022 20:07:18 +0100 Subject: [Buildroot] [git commit branch/next] package/{libuv, uvw}: bump to versions 1.43.0, 2.11.0_libuv_v1.43 Message-ID: <20220216194559.177918359E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=80f480381b3b307079c761f14508458782772111 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Asaf Kahlon Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libuv/libuv.hash | 2 +- package/libuv/libuv.mk | 2 +- package/uvw/uvw.hash | 2 +- package/uvw/uvw.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libuv/libuv.hash b/package/libuv/libuv.hash index 172ef1f168..1874aa344c 100644 --- a/package/libuv/libuv.hash +++ b/package/libuv/libuv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 371e5419708f6aaeb8656671f89400b92a9bba6443369af1bb70bcd6e4b3c764 libuv-1.42.0.tar.gz +sha256 9e27825a55279de69a7c43e42d509fd1337c9bece2547c761e91a1592e91cc4d libuv-1.43.0.tar.gz sha256 6d20216ae022fbeed23916f48508fd807ece3d8464992330643b0e64e5c0c24b LICENSE diff --git a/package/libuv/libuv.mk b/package/libuv/libuv.mk index 9fe775951d..ed51fc92f9 100644 --- a/package/libuv/libuv.mk +++ b/package/libuv/libuv.mk @@ -6,7 +6,7 @@ # When bumping libuv, check if a new version of uvw is available # and bump it too. -LIBUV_VERSION = 1.42.0 +LIBUV_VERSION = 1.43.0 LIBUV_SITE = $(call github,libuv,libuv,v$(LIBUV_VERSION)) LIBUV_DEPENDENCIES = host-pkgconf LIBUV_INSTALL_STAGING = YES diff --git a/package/uvw/uvw.hash b/package/uvw/uvw.hash index 5f7521c8b3..564c0980f3 100644 --- a/package/uvw/uvw.hash +++ b/package/uvw/uvw.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 30b0ba97a94d5e652490c6b1b32c95e608263f21cf3bc606308d09b3e3a114bf uvw-2.10.0_libuv_v1.42.tar.gz +sha256 3af4efa2842299490ec764f2148f85f4426dfb4f8d8aa436cc2d049db2b7b514 uvw-2.11.0_libuv_v1.43.tar.gz sha256 5de32af2469480cf3261c9781962e0887366666ba8ee1f4a32c386c77fc50c88 LICENSE diff --git a/package/uvw/uvw.mk b/package/uvw/uvw.mk index 9c15d536cb..161c40849d 100644 --- a/package/uvw/uvw.mk +++ b/package/uvw/uvw.mk @@ -4,7 +4,7 @@ # ################################################################################ -UVW_VERSION = 2.10.0_libuv_v1.42 +UVW_VERSION = 2.11.0_libuv_v1.43 UVW_SITE = $(call github,skypjack,uvw,v$(UVW_VERSION)) UVW_INSTALL_STAGING = YES UVW_INSTALL_TARGET = NO From arnout at mind.be Wed Feb 16 19:25:20 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 16 Feb 2022 20:25:20 +0100 Subject: [Buildroot] [git commit branch/next] package/python-setuptools: bump to version 60.8.2 Message-ID: <20220216194559.2A0C3835A7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=795c473cfdedc71b6dcf5b691cec729d2845da0b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-setuptools/python-setuptools.hash | 4 ++-- package/python-setuptools/python-setuptools.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-setuptools/python-setuptools.hash b/package/python-setuptools/python-setuptools.hash index 8df7155d4c..e04235e041 100644 --- a/package/python-setuptools/python-setuptools.hash +++ b/package/python-setuptools/python-setuptools.hash @@ -1,4 +1,4 @@ # From https://pypi.org/pypi/setuptools/json -md5 082637e8fbc2e1fd9c637665d8fcccd8 setuptools-60.7.0.tar.gz -sha256 b83cf328a4f6a987c95610e76b29a30778db05174eef71f771776c48f8f25d1b setuptools-60.7.0.tar.gz +md5 f47a5750f6084cce3418f213a9d97785 setuptools-60.8.2.tar.gz +sha256 66b8598da112b8dc8cd941d54cf63ef91d3b50657b374457eda5851f3ff6a899 setuptools-60.8.2.tar.gz sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk index 584f83f7a0..8653c42259 100644 --- a/package/python-setuptools/python-setuptools.mk +++ b/package/python-setuptools/python-setuptools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SETUPTOOLS_VERSION = 60.7.0 +PYTHON_SETUPTOOLS_VERSION = 60.8.2 PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).tar.gz -PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/29/dd/48d662bb93e5e51e72265ef612f869947d4ae4126328d7156824cd50d440 +PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/ae/0b/e458b0d07dced3d7fa2d21d828e708f374ef82040f2012c05d35f47f9af3 PYTHON_SETUPTOOLS_LICENSE = MIT PYTHON_SETUPTOOLS_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_CPE_ID_VENDOR = python From arnout at mind.be Wed Feb 16 19:49:46 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 16 Feb 2022 20:49:46 +0100 Subject: [Buildroot] [git commit branch/next] boot/barebox: bump version to 2022.01.0 Message-ID: <20220216194559.3B95F8359E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9a2beaf778d3649ab395c2a931a3935f69191585 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bartosz Bilas Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- boot/barebox/Config.in | 4 ++-- boot/barebox/barebox.hash | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in index 23f8a5ac8a..c16fea3cea 100644 --- a/boot/barebox/Config.in +++ b/boot/barebox/Config.in @@ -12,7 +12,7 @@ choice Select the specific Barebox version you want to use config BR2_TARGET_BAREBOX_LATEST_VERSION - bool "2021.12.0" + bool "2022.01.0" config BR2_TARGET_BAREBOX_CUSTOM_VERSION bool "Custom version" @@ -40,7 +40,7 @@ endif config BR2_TARGET_BAREBOX_VERSION string - default "2021.12.0" if BR2_TARGET_BAREBOX_LATEST_VERSION + default "2022.01.0" if BR2_TARGET_BAREBOX_LATEST_VERSION default BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE if BR2_TARGET_BAREBOX_CUSTOM_VERSION default "custom" if BR2_TARGET_BAREBOX_CUSTOM_TARBALL default BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT diff --git a/boot/barebox/barebox.hash b/boot/barebox/barebox.hash index 0a853866b5..3d52d40beb 100644 --- a/boot/barebox/barebox.hash +++ b/boot/barebox/barebox.hash @@ -1,8 +1,8 @@ # From https://www.barebox.org/download/barebox-2021.12.0.tar.bz2.md5 -md5 199b6d7ff3441cec2062ab18a52454dc barebox-2021.12.0.tar.bz2 +md5 753ba533ced54f4113f9e97846c13fc1 barebox-2022.01.0.tar.bz2 # Locally calculated -sha256 555569fe9e71524e0bf927eaa2c1aa2e81ee2c34dd71e39fe21620db6ccc8aa6 barebox-2021.12.0.tar.bz2 +sha256 ddf7898075bec05e4865ce0f7a2ac19c2b1efaaa0d066eba1939494e25711d28 barebox-2022.01.0.tar.bz2 # License files, locally computed sha256 ab1122aa9f9073ad1ec824edcd970b16a6a7881a34a18fd56c080debb2dca5d4 COPYING From arnout at mind.be Wed Feb 16 19:25:20 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 16 Feb 2022 20:25:20 +0100 Subject: [Buildroot] [git commit branch/next] package/xmrig: bump version to 6.16.4 Message-ID: <20220216194559.1FF417FC08@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7b969c8c8cd30a97a47f7197c114e37c9d12d80b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 36b0c8c8a1..ff5f80a67b 100644 --- a/package/xmrig/xmrig.hash +++ b/package/xmrig/xmrig.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d413b6a20a0ce30410388d330e1056715333e0863165369668dda596766e9d5b xmrig-6.16.3.tar.gz +sha256 245ba47a6b8ae8e9a9df1c055e90f22f944a7d1219416cb30268881d0c0d377b xmrig-6.16.4.tar.gz sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE diff --git a/package/xmrig/xmrig.mk b/package/xmrig/xmrig.mk index 7fa638a54c..1feab499fc 100644 --- a/package/xmrig/xmrig.mk +++ b/package/xmrig/xmrig.mk @@ -4,7 +4,7 @@ # ################################################################################ -XMRIG_VERSION = 6.16.3 +XMRIG_VERSION = 6.16.4 XMRIG_SITE = $(call github,xmrig,xmrig,v$(XMRIG_VERSION)) XMRIG_LICENSE = GPL-3.0+ XMRIG_LICENSE_FILES = LICENSE From arnout at mind.be Wed Feb 16 19:49:46 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 16 Feb 2022 20:49:46 +0100 Subject: [Buildroot] [git commit branch/next] package/{mesa3d, mesa3d-headers}: bump version to 21.3.6 Message-ID: <20220216194559.33617835A2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6aca97d6e51a006187bcd3319cb7ff1a92380c66 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://lists.freedesktop.org/archives/mesa-announce/2022-February/000663.html Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 871cf2f495..c8573fafad 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.5 +MESA3D_HEADERS_VERSION = 21.3.6 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 e36d798e21..d64b833100 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/000660.html -sha256 d93b2a9d2464ee856d7637a07dff6b7cd950f295ad58518bb959f76882cf4a4c mesa-21.3.5.tar.xz -sha512 417d1787f8177567f0c547dde3e24212f7497f2fe7cdaa945fe998cd61ec0e9eb9388feb444e377c4fd8794b056af02aac28d1bbfb9527844391ba49e6893933 mesa-21.3.5.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2022-February/000663.html +sha256 96bb761fd546e9aa41d025fcc025225c5668443839dae21e3731959beb096736 mesa-21.3.6.tar.xz +sha512 8c930e04eade29f689384ee7d6e2f178acbbf30fa6c9fdf132281279658c3c221ec7f9b1318e3c0a654c6136f925a5c0a35eaf849b65db7674641127c71e8a4f mesa-21.3.6.tar.xz # License sha256 998437f3f75f0c542046f83c1cb349408122268168fb13eb4ae6967aa18b7d98 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 5f080ff5fc..95618b2072 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.5 +MESA3D_VERSION = 21.3.6 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos From arnout at mind.be Wed Feb 16 19:49:46 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 16 Feb 2022 20:49:46 +0100 Subject: [Buildroot] [git commit branch/next] package/unbound: bump version to 1.15.0 Message-ID: <20220216194559.444CE835A7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fad0f7a096ce29b3626e4ac41e5dbea0ff3e7ae0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Kyle Harding Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/unbound/unbound.hash | 4 ++-- package/unbound/unbound.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/unbound/unbound.hash b/package/unbound/unbound.hash index ca6fe174e0..99caf7dd3d 100644 --- a/package/unbound/unbound.hash +++ b/package/unbound/unbound.hash @@ -1,5 +1,5 @@ -# From https://nlnetlabs.nl/downloads/unbound/unbound-1.14.0.tar.gz.sha256 -sha256 6ef91cbf02d5299eab39328c0857393de7b4885a2fe7233ddfe3c124ff5a89c8 unbound-1.14.0.tar.gz +# From https://nlnetlabs.nl/downloads/unbound/unbound-1.15.0.tar.gz.sha256 +sha256 a480dc6c8937447b98d161fe911ffc76cfaffa2da18788781314e81339f1126f unbound-1.15.0.tar.gz # Locally calculated sha256 8eb9a16cbfb8703090bbfa3a2028fd46bb351509a2f90dc1001e51fbe6fd45db LICENSE diff --git a/package/unbound/unbound.mk b/package/unbound/unbound.mk index 61fdc5389b..1e6e0d99d7 100644 --- a/package/unbound/unbound.mk +++ b/package/unbound/unbound.mk @@ -4,7 +4,7 @@ # ################################################################################ -UNBOUND_VERSION = 1.14.0 +UNBOUND_VERSION = 1.15.0 UNBOUND_SITE = https://www.unbound.net/downloads UNBOUND_DEPENDENCIES = host-pkgconf expat libevent openssl UNBOUND_LICENSE = BSD-3-Clause From arnout at mind.be Wed Feb 16 19:49:46 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 16 Feb 2022 20:49:46 +0100 Subject: [Buildroot] [git commit branch/next] package/opentracing-cpp: bump to version 1.6.0 Message-ID: <20220216194559.588838359E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f5a8485963dc0112c0201e712d599d31f0081035 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Update indentation in hash file (two spaces) https://github.com/opentracing/opentracing-cpp/releases/tag/v1.6.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/opentracing-cpp/opentracing-cpp.hash | 4 ++-- package/opentracing-cpp/opentracing-cpp.mk | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/opentracing-cpp/opentracing-cpp.hash b/package/opentracing-cpp/opentracing-cpp.hash index 591c0e4a0a..8cfaf5fd47 100644 --- a/package/opentracing-cpp/opentracing-cpp.hash +++ b/package/opentracing-cpp/opentracing-cpp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 015c4187f7a6426a2b5196f0ccd982aa87f010cf61f507ae3ce5c90523f92301 opentracing-cpp-1.5.1.tar.gz -sha256 076d03156735d5ff2df2ea0f8b12351ef65e5e9222b5c8c6a35101dadb41e717 LICENSE +sha256 5b170042da4d1c4c231df6594da120875429d5231e9baa5179822ee8d1054ac3 opentracing-cpp-1.6.0.tar.gz +sha256 076d03156735d5ff2df2ea0f8b12351ef65e5e9222b5c8c6a35101dadb41e717 LICENSE diff --git a/package/opentracing-cpp/opentracing-cpp.mk b/package/opentracing-cpp/opentracing-cpp.mk index 0605cd5d96..12ce40fbed 100644 --- a/package/opentracing-cpp/opentracing-cpp.mk +++ b/package/opentracing-cpp/opentracing-cpp.mk @@ -4,8 +4,9 @@ # ################################################################################ -OPENTRACING_CPP_VERSION = 1.5.1 -OPENTRACING_CPP_SITE = $(call github,opentracing,opentracing-cpp,v$(OPENTRACING_CPP_VERSION)) +OPENTRACING_CPP_VERSION = 1.6.0 +OPENTRACING_CPP_SITE = \ + $(call github,opentracing,opentracing-cpp,v$(OPENTRACING_CPP_VERSION)) OPENTRACING_CPP_LICENSE = Apache-2.0 OPENTRACING_CPP_LICENSE_FILES = LICENSE From arnout at mind.be Wed Feb 16 19:49:46 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 16 Feb 2022 20:49:46 +0100 Subject: [Buildroot] [git commit branch/next] package/ola: reintroduce package at version 0.10.8 Message-ID: <20220216194559.500C48359E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=16ff948444c3978d63f483344a3d92d994c64312 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The ola package (Open Lighting Architecture) version 0.10.2 was removed in commit e692e1f2b2285c18057e2c70cc1d9d0cfdb15d5e due to an incompatibility with the protobuf version 3.2.0 present in Buildroot at that time. ola was fixed to support newer protobuf version in: https://github.com/OpenLightingProject/ola/pull/1630 This commit reintroduce this package at version 0.10.8. For changelogs since its removal at 0.10.2, see: - https://github.com/OpenLightingProject/ola/releases/tag/0.10.3 - https://github.com/OpenLightingProject/ola/releases/tag/0.10.4 - https://github.com/OpenLightingProject/ola/releases/tag/0.10.5 - https://github.com/OpenLightingProject/ola/releases/tag/0.10.6 - https://github.com/OpenLightingProject/ola/releases/tag/0.10.7 - https://github.com/OpenLightingProject/ola/releases/tag/0.10.8 This commit is based on the previously removed ola package, with the following rework: - Remove the dependency on BR2_HOST_GCC_AT_LEAST_4_5 as host gcc is now guaranteed to be at least 4.8. - Update target gcc dependency to >= 4.8 to reflect protobuf requirement. - Remove the BR2_PACKAGE_OLA_SLP option, which was removed in ola 0.9.4. - Change the "DMX4Linux" plugin option name to "Open DMX" to better reflect the ola option (DMX4Linux is a legacy plugin for 2.6 Kernels). - Update Python support to version 3.x only - Remove patches, as they are no longer needed - Add options for ola plugins: ftdidmx, gpio, karate, openpixelcontrol, renard, spi, uartdmx, usbdmx - Reorder options alphabetically - Update project URL - Add license hashes Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 1 + package/Config.in | 1 + package/ola/Config.in | 171 ++++++++++++++++++++++++++++++++++++++ package/ola/ola.hash | 8 ++ package/ola/ola.mk | 223 ++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 404 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index ac702d8d0f..91e9060ac5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1610,6 +1610,7 @@ F: configs/zynq_qmtech_defconfig F: package/fluid-soundfont/ F: package/fluidsynth/ F: package/glslsandbox-player/ +F: package/ola/ F: package/ptm2human/ F: package/python-distro/ F: package/python-gnupg/ diff --git a/package/Config.in b/package/Config.in index 10209d84d7..9a8196efe2 100644 --- a/package/Config.in +++ b/package/Config.in @@ -535,6 +535,7 @@ endmenu source "package/nvidia-modprobe/Config.in" source "package/nvme/Config.in" source "package/ofono/Config.in" + source "package/ola/Config.in" source "package/on2-8170-modules/Config.in" source "package/open2300/Config.in" source "package/openfpgaloader/Config.in" diff --git a/package/ola/Config.in b/package/ola/Config.in new file mode 100644 index 0000000000..36b175138f --- /dev/null +++ b/package/ola/Config.in @@ -0,0 +1,171 @@ +comment "ola needs a toolchain w/ C++, threads, dynamic library, gcc >= 4.8" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ + || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS + +menuconfig BR2_PACKAGE_OLA + bool "ola (open lighting architecture)" + depends on BR2_INSTALL_LIBSTDCPP # protobuf + depends on !BR2_STATIC_LIBS # protobuf + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # protobuf + select BR2_PACKAGE_PROTOBUF + select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_LIBUUID + help + Open Lighting Architecture provides applications + with a mechanism to send and receive DMX512 & RDM + commands using hardware devices and DMX over IP protocols. + + https://www.openlighting.org/ola/ + +if BR2_PACKAGE_OLA + +comment "bindings and interface" + +config BR2_PACKAGE_OLA_WEB + bool "http interface" + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt, libmicrohttpd + select BR2_PACKAGE_LIBMICROHTTPD + help + Build OLA with browser interface. + +config BR2_PACKAGE_OLA_PYTHON_BINDINGS + bool "python bindings" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_PROTOBUF + help + Build OLA with support for the Python language. + +comment "tests and examples" + +config BR2_PACKAGE_OLA_EXAMPLES + bool "examples" + select BR2_PACKAGE_NCURSES + help + Build OLA examples. + +config BR2_PACKAGE_OLA_RDM_TESTS + bool "rdm tests" + depends on BR2_PACKAGE_OLA_PYTHON_BINDINGS + depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS + select BR2_PACKAGE_PYTHON_NUMPY + help + Build OLA RDM tests. + +comment "plugin selections" + +config BR2_PACKAGE_OLA_PLUGIN_ARTNET + bool "artnet" + help + Build Artnet plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_DUMMY + bool "dummy" + help + Build Dummy plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_E131 + bool "acn E131" + help + Build ACN E131 plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_ESPNET + bool "espnet" + help + Build EspNet plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_FTDIDMX + bool "ftdidmx" + select BR2_PACKAGE_LIBFTDI1 + help + Build FTDI USB DMX plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_GPIO + bool "GPIO" + help + Build GPIO plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_KARATE + bool "karate" + help + Build Karate plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_KINET + bool "kinet" + help + Build KiNet plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_MILINT + bool "Milford Instruments" + help + Build Milford Instruments 1-463 plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_OPENDMX + bool "Enttec Open DMX" + help + Build Enttec Open DMX plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_OPENPIXELCONTROL + bool "Open Pixel Control" + help + Build Open Pixel Control (OPC) plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_OSC + bool "osc" + select BR2_PACKAGE_LIBLO + help + Build Open Sound Control (OSC) plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_PATHPORT + bool "pathport" + help + Build Pathport plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_RENARD + bool "renard" + help + Build Renard plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_SANDNET + bool "sandnet" + help + Build SandNet plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_SHOWNET + bool "shownet" + help + Build ShowNet plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_SPI + bool "spi" + help + Build SPI plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_STAGEPROFI + bool "stageprofi" + select BR2_PACKAGE_LIBUSB + help + Build StageProfi plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_UARTDMX + bool "uartdmx" + help + Build UART Native DMX plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_USBDMX + bool "usbdmx" + select BR2_PACKAGE_LIBUSB + help + Build USB DMX plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_USBPRO + bool "usbpro" + select BR2_PACKAGE_LIBUSB + help + Build UsbPro plugin for OLA. + +endif diff --git a/package/ola/ola.hash b/package/ola/ola.hash new file mode 100644 index 0000000000..7565adabde --- /dev/null +++ b/package/ola/ola.hash @@ -0,0 +1,8 @@ +# Locally calculated +sha256 102aa3114562a2a71dbf7f77d2a0fb9fc47acc35d6248a70b6e831365ca71b13 ola-0.10.8.tar.gz + +# License files (locally computed) +sha256 e6b95dd336a57abb343e2988ac22b7e21b35c5b86003e6eb9e066ffbeeff9da7 COPYING +sha256 1480a883c87789075ccdead38b8ad9e2d740d6f7eefaaf183f894b50bebd8a25 GPL +sha256 e6b95dd336a57abb343e2988ac22b7e21b35c5b86003e6eb9e066ffbeeff9da7 LGPL +sha256 685ceaf368d37250f69f2861e91a4cbbab069e81af8bf50adce8a498936e02fc LICENCE diff --git a/package/ola/ola.mk b/package/ola/ola.mk new file mode 100644 index 0000000000..5090076175 --- /dev/null +++ b/package/ola/ola.mk @@ -0,0 +1,223 @@ +################################################################################ +# +# ola +# +################################################################################ + +OLA_VERSION = 0.10.8 +OLA_SITE = https://github.com/OpenLightingProject/ola/releases/download/$(OLA_VERSION) +OLA_LICENSE = LGPL-2.1+ (libola, libolacommon, Python bindings), GPL-2.0+ (libolaserver, olad, Python examples and tests) +OLA_LICENSE_FILES = COPYING GPL LGPL LICENCE +OLA_INSTALL_STAGING = YES +OLA_AUTORECONF = YES + +# util-linux provides uuid lib +OLA_DEPENDENCIES = protobuf util-linux host-bison host-flex host-ola + +OLA_CONF_OPTS = \ + ac_cv_have_pymod_google_protobuf=yes \ + --disable-fatal-warnings \ + --disable-gcov \ + --disable-ja-rule \ + --disable-java-libs \ + --disable-root-check \ + --disable-tcmalloc \ + --disable-unittests \ + --with-ola-protoc-plugin=$(HOST_DIR)/usr/bin/ola_protoc_plugin + +HOST_OLA_DEPENDENCIES = host-util-linux host-protobuf + +# When building the host part, disable as much as possible to speed up +# the configure step and avoid missing host dependencies. +HOST_OLA_CONF_OPTS = \ + --disable-all-plugins \ + --disable-osc \ + --disable-uart \ + --disable-libusb \ + --disable-libftdi \ + --disable-http \ + --disable-examples \ + --disable-unittests \ + --disable-doxygen-html \ + --disable-doxygen-doc \ + --disable-fatal-warnings + +# On the host side, we only need ola_protoc_plugin, so build and install this +# only. +HOST_OLA_MAKE_OPTS = protoc/ola_protoc_plugin +define HOST_OLA_INSTALL_CMDS + $(INSTALL) -D -m 0755 $(@D)/protoc/ola_protoc_plugin $(HOST_DIR)/usr/bin/ola_protoc_plugin +endef + +# sets where to find python libs built for target and required by ola +OLA_CONF_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages +OLA_MAKE_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages + +## OLA Bindings and Interface selections + +ifeq ($(BR2_PACKAGE_OLA_WEB),y) +OLA_CONF_OPTS += --enable-http +OLA_DEPENDENCIES += libmicrohttpd +else +OLA_CONF_OPTS += --disable-http +endif + +ifeq ($(BR2_PACKAGE_OLA_PYTHON_BINDINGS),y) +OLA_CONF_OPTS += --enable-python-libs +OLA_DEPENDENCIES += python3 python-protobuf +else +OLA_CONF_OPTS += --disable-python-libs +endif + +## OLA Examples and Tests + +ifeq ($(BR2_PACKAGE_OLA_EXAMPLES),y) +OLA_CONF_OPTS += --enable-examples +OLA_DEPENDENCIES += ncurses +else +OLA_CONF_OPTS += --disable-examples +endif + +ifeq ($(BR2_PACKAGE_OLA_RDM_TESTS),y) +OLA_CONF_OPTS += --enable-rdm-tests +OLA_DEPENDENCIES += python-numpy +# needed as numpy builds some shared libraries and ola checks for +# numpy using a host python test program which fails with 'wrong ELF +# class'. +OLA_CONF_ENV += ac_cv_have_pymod_numpy=yes +else +OLA_CONF_OPTS += --disable-rdm-tests +endif + +## OLA Plugin selections + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_ARTNET),y) +OLA_CONF_OPTS += --enable-artnet +else +OLA_CONF_OPTS += --disable-artnet +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_DUMMY),y) +OLA_CONF_OPTS += --enable-dummy +else +OLA_CONF_OPTS += --disable-dummy +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_E131),y) +OLA_CONF_OPTS += --enable-e131 +else +OLA_CONF_OPTS += --disable-e131 +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_ESPNET),y) +OLA_CONF_OPTS += --enable-espnet +else +OLA_CONF_OPTS += --disable-espnet +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_FTDIDMX),y) +OLA_CONF_OPTS += --enable-ftdidmx +OLA_DEPENDENCIES += libftdi1 +else +OLA_CONF_OPTS += --disable-ftdidmx +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_GPIO),y) +OLA_CONF_OPTS += --enable-gpio +else +OLA_CONF_OPTS += --disable-gpio +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_KARATE),y) +OLA_CONF_OPTS += --enable-karate +else +OLA_CONF_OPTS += --disable-karate +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_KINET),y) +OLA_CONF_OPTS += --enable-kinet +else +OLA_CONF_OPTS += --disable-kinet +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_MILINT),y) +OLA_CONF_OPTS += --enable-milinst +else +OLA_CONF_OPTS += --disable-milinst +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_OPENDMX),y) +OLA_CONF_OPTS += --enable-opendmx +else +OLA_CONF_OPTS += --disable-opendmx +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_OPENPIXELCONTROL),y) +OLA_CONF_OPTS += --enable-openpixelcontrol +else +OLA_CONF_OPTS += --disable-openpixelcontrol +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_OSC),y) +OLA_CONF_OPTS += --enable-osc +OLA_DEPENDENCIES += liblo +else +OLA_CONF_OPTS += --disable-osc +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_PATHPORT),y) +OLA_CONF_OPTS += --enable-pathport +else +OLA_CONF_OPTS += --disable-pathport +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_RENARD),y) +OLA_CONF_OPTS += --enable-renard +else +OLA_CONF_OPTS += --disable-renard +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_SANDNET),y) +OLA_CONF_OPTS += --enable-sandnet +else +OLA_CONF_OPTS += --disable-sandnet +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_SHOWNET),y) +OLA_CONF_OPTS += --enable-shownet +else +OLA_CONF_OPTS += --disable-shownet +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_SPI),y) +OLA_CONF_OPTS += --enable-spi +else +OLA_CONF_OPTS += --disable-spi +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_STAGEPROFI),y) +OLA_CONF_OPTS += --enable-stageprofi --enable-libusb +else +OLA_CONF_OPTS += --disable-stageprofi +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_UARTDMX),y) +OLA_CONF_OPTS += --enable-uartdmx +else +OLA_CONF_OPTS += --disable-uartdmx +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_USBDMX),y) +OLA_CONF_OPTS += --enable-usbdmx --enable-libusb +else +OLA_CONF_OPTS += --disable-usbdmx +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_USBPRO),y) +OLA_CONF_OPTS += --enable-usbpro --enable-libusb +else +OLA_CONF_OPTS += --disable-usbpro +endif + +$(eval $(autotools-package)) +$(eval $(host-autotools-package)) From arnout at mind.be Wed Feb 16 19:49:47 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 16 Feb 2022 20:49:47 +0100 Subject: [Buildroot] [git commit branch/next] package/mutt: bump to version 2.2.0 Message-ID: <20220216194559.60FC3835A2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d1ca33e81230eaa5fe41c4945075c62821128a8b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next libgsasl is an optional dependency since https://gitlab.com/muttmua/mutt/-/commit/68caf9140c8217ecf6c848460c4b4d27996b2922 http://www.mutt.org/relnotes/2.2/ https://gitlab.com/muttmua/mutt/-/blob/mutt-2-2-rel/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/mutt/mutt.hash | 2 +- package/mutt/mutt.mk | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/package/mutt/mutt.hash b/package/mutt/mutt.hash index d439b23aa3..bbc9d459b0 100644 --- a/package/mutt/mutt.hash +++ b/package/mutt/mutt.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 92a309e47e363a97d62425bcb71adceae5ab5c4c413dbcac37fa98ed70c12be0 mutt-2.1.5.tar.gz +sha256 e84597f06d03ca82f8ca3b5ec8bc294c150709b43ed2a0177bf479c3e3345314 mutt-2.2.0.tar.gz sha256 732f24b69a6c71cd8e01e4672bb8e12cc1cbb88a50a4665e6ca4fd95000a57ee GPL diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk index 7e9046fe8a..51178ef03d 100644 --- a/package/mutt/mutt.mk +++ b/package/mutt/mutt.mk @@ -4,7 +4,7 @@ # ################################################################################ -MUTT_VERSION = 2.1.5 +MUTT_VERSION = 2.2.0 MUTT_SITE = https://bitbucket.org/mutt/mutt/downloads MUTT_LICENSE = GPL-2.0+ MUTT_LICENSE_FILES = GPL @@ -53,8 +53,15 @@ else MUTT_CONF_OPTS += --disable-pop endif -# SSL support is only used by imap or pop3 module +# SASL and SSL support are only used by imap or pop3 module ifneq ($(BR2_PACKAGE_MUTT_IMAP)$(BR2_PACKAGE_MUTT_POP3),) +ifeq ($(BR2_PACKAGE_LIBGSASL),y) +MUTT_DEPENDENCIES += libgsasl +MUTT_CONF_OPTS += --with-gsasl +else +MUTT_CONF_OPTS += --without-gsasl +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) MUTT_DEPENDENCIES += openssl MUTT_CONF_OPTS += \ @@ -72,6 +79,7 @@ MUTT_CONF_OPTS += \ endif else MUTT_CONF_OPTS += \ + --without-gsasl \ --without-gnutls \ --without-ssl endif From Eugen.Hristev at microchip.com Wed Feb 16 20:08:41 2022 From: Eugen.Hristev at microchip.com (Eugen.Hristev at microchip.com) Date: Wed, 16 Feb 2022 20:08:41 +0000 Subject: [Buildroot] [PATCH] package/libusb: fix maybe-uninitialized error In-Reply-To: <20220216133140.14668-1-yegorslists@googlemail.com> References: <20220216133140.14668-1-yegorslists@googlemail.com> Message-ID: <33f86c18-a0e2-9d21-8c89-046a6edf7693@microchip.com> On 2/16/22 3:31 PM, yegorslists--- via buildroot wrote: > From: Yegor Yefremov > > Initialize active_config to an invalid value to avoid the following > compilation error: > > os/linux_usbfs.c: In function ?op_get_configuration?: > os/linux_usbfs.c:1452:12: error: ?active_config? may be used uninitialized in this function [-Werror=maybe-uninitialized] > 1452 | *config = (uint8_t)active_config; > > Upstream URL: https://github.com/libusb/libusb/pull/1062 > > Signed-off-by: Yegor Yefremov > --- This problem also affects my build, but with the patch, it works fine: Tested-by: Eugen Hristev From peter at korsgaard.com Wed Feb 16 20:30:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:30:21 +0100 Subject: [Buildroot] [PATCH 1/2] package/rtl8723bu: bump to version 19b4bdc05483a1e79a4f955a80f8f72cdd5dedc3 In-Reply-To: <20220114050734.497034-1-doug@schmorgal.com> (Doug Brown via buildroot's message of "Thu, 13 Jan 2022 21:07:33 -0800") References: <20220114050734.497034-1-doug@schmorgal.com> Message-ID: <87bkz6img2.fsf@dell.be.48ers.dk> >>>>> "Doug" == Doug Brown via buildroot writes: > This version fixes a bug that prevents the user from switching from one > access point to another. > Signed-off-by: Doug Brown Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 16 20:30:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:30:26 +0100 Subject: [Buildroot] [PATCH 2/2] package/rtl8723bu: fix firmware install path In-Reply-To: <20220114050734.497034-2-doug@schmorgal.com> (Doug Brown via buildroot's message of "Thu, 13 Jan 2022 21:07:34 -0800") References: <20220114050734.497034-1-doug@schmorgal.com> <20220114050734.497034-2-doug@schmorgal.com> Message-ID: <877d9uimfx.fsf@dell.be.48ers.dk> >>>>> "Doug" == Doug Brown via buildroot writes: > 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 Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 16 20:35:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:35:30 +0100 Subject: [Buildroot] [PATCH] linux: clarify BR2_LINUX_KERNEL_CUSTOM_DTS_PATH description In-Reply-To: <20220114093049.2380117-1-michael.opdenacker@bootlin.com> (Michael Opdenacker's message of "Fri, 14 Jan 2022 10:30:49 +0100") References: <20220114093049.2380117-1-michael.opdenacker@bootlin.com> Message-ID: <8735kiim7h.fsf@dell.be.48ers.dk> >>>>> "Michael" == Michael Opdenacker writes: > 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 Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 16 20:40:14 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:40:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/gdb: backport fix for gdbserver 11.1 on aarch64 In-Reply-To: <20220128084244.2258811-1-troglobit@gmail.com> (Joachim Wiberg's message of "Fri, 28 Jan 2022 09:42:44 +0100") References: <20220128084244.2258811-1-troglobit@gmail.com> Message-ID: <87y22ah7f5.fsf@dell.be.48ers.dk> >>>>> "Joachim" == Joachim Wiberg writes: > 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 Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 16 20:42:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:42:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/php: bump version to 8.0.15 In-Reply-To: <20220128094827.2705597-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Fri, 28 Jan 2022 10:48:27 +0100") References: <20220128094827.2705597-1-bernd.kuhls@t-online.de> Message-ID: <87tucyh7bg.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Changelog: https://www.php.net/ChangeLog-8.php#8.0.15 > Signed-off-by: Bernd Kuhls Committed to 2021.11.x, thanks. > --- > 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 > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 16 20:45:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:45:21 +0100 Subject: [Buildroot] [git commit] package/{glibc, localedef}: security bump for additional post-2.34.x fixes In-Reply-To: <20220205124414.D529182293@busybox.osuosl.org> (Peter Korsgaard's message of "Sat, 5 Feb 2022 13:51:09 +0100") References: <20220205124414.D529182293@busybox.osuosl.org> Message-ID: <87pmnmh76m.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > commit: https://git.buildroot.net/buildroot/commit/?id=1983d2e6a30fb6ca1d81f47798467bb0ac4401e6 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Fixes the following security issues: > CVE-2022-23219: Passing an overlong file name to the clnt_create > legacy function could result in a stack-based buffer overflow when > using the "unix" protocol. Reported by Martin Sebor. > CVE-2022-23218: Passing an overlong file name to the svcunix_create > legacy function could result in a stack-based buffer overflow. > CVE-2021-3998: Passing a path longer than PATH_MAX to the realpath > function could result in a memory leak and potential access of > uninitialized memory. Reported by Qualys. > CVE-2021-3999: Passing a buffer of size exactly 1 byte to the getcwd > function may result in an off-by-one buffer underflow and overflow > when the current working directory is longer than PATH_MAX and also > corresponds to the / directory through an unprivileged mount > namespace. Reported by Qualys. > Signed-off-by: Peter Korsgaard > Reviewed-by: Romain Naour > Signed-off-by: Peter Korsgaard Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Wed Feb 16 20:45:38 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 16 Feb 2022 21:45:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/dialog: bump to version 1.3-20220117 Message-ID: <20220216204538.2450673-1-fontaine.fabrice@gmail.com> https://invisible-mirror.net/dialog/CHANGES.html#index-t20220117 Fixes: - https://bugs.buildroot.org/show_bug.cgi?id=14596 Signed-off-by: Fabrice Fontaine --- package/dialog/dialog.hash | 2 +- package/dialog/dialog.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dialog/dialog.hash b/package/dialog/dialog.hash index 2286590b66..3136d18b2b 100644 --- a/package/dialog/dialog.hash +++ b/package/dialog/dialog.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 466163e8b97c2b7709d00389199add3156bd813f60ccb0335d0a30f2d4a17f99 dialog-1.3-20200327.tgz +sha256 754cb6bf7dc6a9ac5c1f80c13caa4d976e30a5a6e8b46f17b3bb9b080c31041f dialog-1.3-20220117.tgz # Locally computed sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/dialog/dialog.mk b/package/dialog/dialog.mk index 1c98d354e3..681f8ec9fe 100644 --- a/package/dialog/dialog.mk +++ b/package/dialog/dialog.mk @@ -4,7 +4,7 @@ # ################################################################################ -DIALOG_VERSION = 1.3-20200327 +DIALOG_VERSION = 1.3-20220117 DIALOG_SOURCE = dialog-$(DIALOG_VERSION).tgz DIALOG_SITE = https://invisible-mirror.net/archives/dialog DIALOG_CONF_OPTS = --with-ncurses --with-curses-dir=$(STAGING_DIR)/usr \ -- 2.34.1 From peter at korsgaard.com Wed Feb 16 20:46:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:46:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/tor: bump version to 0.4.6.10 In-Reply-To: <20220205090943.4012391-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sat, 5 Feb 2022 10:09:43 +0100") References: <20220205090943.4012391-1-bernd.kuhls@t-online.de> Message-ID: <87leyah74l.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Release notes: > https://gitlab.torproject.org/tpo/core/tor/-/raw/release-0.4.6/ReleaseNotes > Signed-off-by: Bernd Kuhls Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 16 20:28:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:28:09 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/rtl8723bu: fix firmware install path Message-ID: <20220216204039.38BA9835CD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=749175affa7916e523f524c39b20aa6314e05afe branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x 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. It was like that since the very first version that was added to Buildroot. Signed-off-by: Doug Brown Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 657d9731cf52dd7e9a2564ba68ce19e675c1eaee) Signed-off-by: Peter Korsgaard --- 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)) From peter at korsgaard.com Wed Feb 16 20:34:57 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:34:57 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] linux: clarify BR2_LINUX_KERNEL_CUSTOM_DTS_PATH description Message-ID: <20220216204039.4226E835CE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=09b168c7edfe0fe51604d5e7d8bfd5bf9f1c3816 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 8ef413b59a870b6a593eb9f1a71caef30c1848c3) Signed-off-by: Peter Korsgaard --- linux/Config.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index e7addf1810..3f796b252b 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 the .dts files will + be compiled from there. config BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME bool "Keep the directory name of the Device Tree" From peter at korsgaard.com Wed Feb 16 20:28:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:28:00 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/rtl8723bu: bump to version 19b4bdc05483a1e79a4f955a80f8f72cdd5dedc3 Message-ID: <20220216204039.30805835CC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6306bed7f5bffd16ca3627671ae3ddf1d850e3e3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x This version fixes a bug that prevents the user from switching from one access point to another. Signed-off-by: Doug Brown Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 89211450c68df76f3b850c651733c86fb02b40d6) Signed-off-by: Peter Korsgaard --- 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) From peter at korsgaard.com Wed Feb 16 20:33:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:33:42 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] linux: clarify BR2_LINUX_KERNEL_CUSTOM_DTS_PATH description Message-ID: <20220216204044.09893835E8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=73c8fbe2a84934778c869edac72a9d2f410ce737 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 8ef413b59a870b6a593eb9f1a71caef30c1848c3) Signed-off-by: Peter Korsgaard --- linux/Config.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 264cbde98e..0d7464d1da 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 the .dts files will + be compiled from there. config BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME bool "Keep the directory name of the Device Tree" From peter at korsgaard.com Wed Feb 16 20:28:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:28:20 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/rtl8723bu: fix firmware install path Message-ID: <20220216204044.010DB835EE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=32181572eba91a6a58fdfff0cf92df940be99b97 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x 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. It was like that since the very first version that was added to Buildroot. Signed-off-by: Doug Brown Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 657d9731cf52dd7e9a2564ba68ce19e675c1eaee) Signed-off-by: Peter Korsgaard --- 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)) From peter at korsgaard.com Wed Feb 16 08:27:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 09:27:47 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/kf5/kf5-extra-cmake-modules: do not build documentation Message-ID: <20220216204043.E243F835E8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7c20887e1f465ad8b2ebab995ad0fab22ecac0a8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit b341f0c91f658484f90c5addd553c579b8d210c1) Signed-off-by: Peter Korsgaard --- package/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)) From peter at korsgaard.com Wed Feb 16 20:45:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:45:55 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/tor: bump version to 0.4.6.10 Message-ID: <20220216204044.310D1835E8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5f24db1f9681f13343bc9c8d6fbfc434838480c8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Release notes: https://gitlab.torproject.org/tpo/core/tor/-/raw/release-0.4.6/ReleaseNotes Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit b3058f39b86993996d17c8f38f0bfd83d654b5a7) 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 63d47d7fa6..16e01c80a9 100644 --- a/package/tor/tor.hash +++ b/package/tor/tor.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c7e93380988ce20b82aa19c06cdb2f10302b72cfebec7c15b5b96bcfc94ca9a9 tor-0.4.6.9.tar.gz +sha256 94ccd60e04e558f33be73032bc84ea241660f92f58cfb88789bda6893739e31c tor-0.4.6.10.tar.gz sha256 47b54ed17e8fdcab3c44729a1789a09b208f9a63a845a7e50def9df729eebad0 LICENSE diff --git a/package/tor/tor.mk b/package/tor/tor.mk index fc1db6da6b..d16b3541eb 100644 --- a/package/tor/tor.mk +++ b/package/tor/tor.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOR_VERSION = 0.4.6.9 +TOR_VERSION = 0.4.6.10 TOR_SITE = https://dist.torproject.org TOR_LICENSE = BSD-3-Clause TOR_LICENSE_FILES = LICENSE From peter at korsgaard.com Wed Feb 16 20:42:14 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:42:14 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/php: bump version to 8.0.15 Message-ID: <20220216204044.1E803835E8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0d32c53ee75c2f53f4e50522bf229d1a399a4090 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Changelog: https://www.php.net/ChangeLog-8.php#8.0.15 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit b784733f9cfd661f013dde1b0aa5347e825a4187) 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 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 From peter at korsgaard.com Wed Feb 16 20:39:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:39:37 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gdb: backport fix for gdbserver 11.1 on aarch64 Message-ID: <20220216204044.12585835EC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0139ab83d612b125a4eeeb68b08a9e32e1865837 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x 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 [yann.morin.1998 at free.fr: add SoB in patch, provided live on IRC] Signed-off-by: Yann E. MORIN (cherry picked from commit 4353c716466fb8860dea265985829e9fae58e016) Signed-off-by: Peter Korsgaard --- .../gdb/11.1/0010-gdbserver-aarch64-support.patch | 320 +++++++++++++++++++++ 1 file changed, 320 insertions(+) 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..3718b1b6fd --- /dev/null +++ b/package/gdb/11.1/0010-gdbserver-aarch64-support.patch @@ -0,0 +1,320 @@ +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. + +Backported from: eb79b2318066cafb75ffdce310e3bbd44f7c79e3 +Signed-off-by: Joachim Wiberg +--- + 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 peter at korsgaard.com Wed Feb 16 20:43:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:43:08 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/{glibc, localedef}: security bump for additional post-2.34.x fixes Message-ID: <20220216204044.284EE835E8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d6b61411a3f63355b5b7c5689dea98c724f2b2d8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fixes the following security issues: CVE-2022-23219: Passing an overlong file name to the clnt_create legacy function could result in a stack-based buffer overflow when using the "unix" protocol. Reported by Martin Sebor. CVE-2022-23218: Passing an overlong file name to the svcunix_create legacy function could result in a stack-based buffer overflow. CVE-2021-3998: Passing a path longer than PATH_MAX to the realpath function could result in a memory leak and potential access of uninitialized memory. Reported by Qualys. CVE-2021-3999: Passing a buffer of size exactly 1 byte to the getcwd function may result in an off-by-one buffer underflow and overflow when the current working directory is longer than PATH_MAX and also corresponds to the / directory through an unprivileged mount namespace. Reported by Qualys. Signed-off-by: Peter Korsgaard Reviewed-by: Romain Naour Signed-off-by: Peter Korsgaard (cherry picked from commit 1983d2e6a30fb6ca1d81f47798467bb0ac4401e6) Signed-off-by: Peter Korsgaard --- .../0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch | 0 .../glibc.hash | 2 +- package/glibc/glibc.mk | 2 +- .../0001-HACK-only-build-and-install-localedef.patch | 0 .../0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch | 0 .../localedef.hash | 2 +- package/localedef/localedef.mk | 2 +- 7 files changed, 4 insertions(+), 4 deletions(-) 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-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch similarity index 100% rename from package/glibc/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch rename to package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch diff --git a/package/glibc/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/glibc.hash b/package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/glibc.hash similarity index 70% rename from package/glibc/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/glibc.hash rename to package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/glibc.hash index 595de95a58..dfd939020f 100644 --- a/package/glibc/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/glibc.hash +++ b/package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/glibc.hash @@ -1,5 +1,5 @@ # Locally calculated (fetched from Github) -sha256 1c7ed0f69ed268bd66f9754d0cb8fb65e0dafc1f9a1048ea50d1e96d60399686 glibc-2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4.tar.gz +sha256 3c299a21468a80356b848ca341f45551616c4928a6c871e6d45cee942e8b0f24 glibc-2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c.tar.gz # Hashes for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index 3862e0624b..f8950c166b 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -7,7 +7,7 @@ # Generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- # When updating the version, please also update localedef -GLIBC_VERSION = 2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4 +GLIBC_VERSION = 2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c # Upstream doesn't officially provide an https download link. # There is one (https://sourceware.org/git/glibc.git) but it's not reliable, # sometimes the connection times out. So use an unofficial github mirror. diff --git a/package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0001-HACK-only-build-and-install-localedef.patch b/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-HACK-only-build-and-install-localedef.patch similarity index 100% rename from package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0001-HACK-only-build-and-install-localedef.patch rename to package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-HACK-only-build-and-install-localedef.patch diff --git a/package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch b/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch similarity index 100% rename from package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch rename to package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch diff --git a/package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/localedef.hash b/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/localedef.hash similarity index 70% rename from package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/localedef.hash rename to package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/localedef.hash index 595de95a58..dfd939020f 100644 --- a/package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/localedef.hash +++ b/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/localedef.hash @@ -1,5 +1,5 @@ # Locally calculated (fetched from Github) -sha256 1c7ed0f69ed268bd66f9754d0cb8fb65e0dafc1f9a1048ea50d1e96d60399686 glibc-2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4.tar.gz +sha256 3c299a21468a80356b848ca341f45551616c4928a6c871e6d45cee942e8b0f24 glibc-2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c.tar.gz # Hashes for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/localedef/localedef.mk b/package/localedef/localedef.mk index 87d921cffe..f8f0b42984 100644 --- a/package/localedef/localedef.mk +++ b/package/localedef/localedef.mk @@ -7,7 +7,7 @@ # Use the same VERSION and SITE as target glibc # As in glibc.mk, generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- -LOCALEDEF_VERSION = 2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4 +LOCALEDEF_VERSION = 2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION).tar.gz LOCALEDEF_SITE = $(call github,bminor,glibc,$(LOCALEDEF_VERSION)) HOST_LOCALEDEF_DL_SUBDIR = glibc From peter at korsgaard.com Wed Feb 16 20:28:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:28:16 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/rtl8723bu: bump to version 19b4bdc05483a1e79a4f955a80f8f72cdd5dedc3 Message-ID: <20220216204043.EC5FF835EC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6dc71469625aef182eabd413ffd0dd4d90940631 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x This version fixes a bug that prevents the user from switching from one access point to another. Signed-off-by: Doug Brown Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 89211450c68df76f3b850c651733c86fb02b40d6) Signed-off-by: Peter Korsgaard --- 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) From peter at korsgaard.com Wed Feb 16 20:50:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:50:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-django: bump to version 4.0.2 In-Reply-To: <20220204193215.167521-1-aduskett@gmail.com> (Adam Duskett's message of "Fri, 4 Feb 2022 11:32:15 -0800") References: <20220204193215.167521-1-aduskett@gmail.com> Message-ID: <87h78yh6xt.fsf@dell.be.48ers.dk> >>>>> "Adam" == Adam Duskett writes: > Tested with: > support/testing/run-tests tests.package.test_python_django.TestPythonPy3Django > Signed-off-by: Adam Duskett This fixes a number of security issues. It would have been good if you could have mentioned that: https://www.djangoproject.com/weblog/2022/feb/01/security-releases/ For 2021.02.x / 2021.11.x I will instead bump to 3.2.12. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 16 20:55:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:55:15 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/python-django: security bump to version 3.2.12 Message-ID: <20220216204749.F3C1D835F4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a26e9e5b08532f72cc709c8ff8dfadda2bd1dd59 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fixes the following security issues: - CVE-2022-22818: Possible XSS via {% debug %} template tag The {% debug %} template tag didn't properly encode the current context, posing an XSS attack vector. In order to avoid this vulnerability, {% debug %} no longer outputs information when the DEBUG setting is False, and it ensures all context variables are correctly escaped when the DEBUG setting is True. - CVE-2022-23833: Denial-of-service possibility in file uploads Passing certain inputs to multipart forms could result in an infinite loop when parsing files. 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 89bc5ffb19..a54c22a101 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 6c4a53d2ccb464bc3dd772c6f2f07df9 Django-3.2.11.tar.gz -sha256 69c94abe5d6b1b088bf475e09b7b74403f943e34da107e798465d2045da27e75 Django-3.2.11.tar.gz +md5 1847b2f286930a9d84e820a757e3a7ec Django-3.2.12.tar.gz +sha256 9772e6935703e59e993960832d66a614cf0233a1c5123bc6224ecc6ad69e41e2 Django-3.2.12.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 25a645823b..676aa780c3 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 3.2.11 +PYTHON_DJANGO_VERSION = 3.2.12 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/20/86/e4348aac45bc83fc8e9dda2cfd81004b007c65b68c1499a4233acabdaa3b +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/83/d9/7f28811ff78ce1903dc9a32ac439e4e6c98298cd2e99cb01f528e51dd796 PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE From peter at korsgaard.com Wed Feb 16 20:54:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:54:00 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/python-django: security bump to version 3.2.12 Message-ID: <20220216204754.E59F38360A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2fbfb5271e3e7b93fa57ef13de14e54e265e9136 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fixes the following security issues: - CVE-2022-22818: Possible XSS via {% debug %} template tag The {% debug %} template tag didn't properly encode the current context, posing an XSS attack vector. In order to avoid this vulnerability, {% debug %} no longer outputs information when the DEBUG setting is False, and it ensures all context variables are correctly escaped when the DEBUG setting is True. - CVE-2022-23833: Denial-of-service possibility in file uploads Passing certain inputs to multipart forms could result in an infinite loop when parsing files. 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 89bc5ffb19..a54c22a101 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 6c4a53d2ccb464bc3dd772c6f2f07df9 Django-3.2.11.tar.gz -sha256 69c94abe5d6b1b088bf475e09b7b74403f943e34da107e798465d2045da27e75 Django-3.2.11.tar.gz +md5 1847b2f286930a9d84e820a757e3a7ec Django-3.2.12.tar.gz +sha256 9772e6935703e59e993960832d66a614cf0233a1c5123bc6224ecc6ad69e41e2 Django-3.2.12.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 25a645823b..676aa780c3 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 3.2.11 +PYTHON_DJANGO_VERSION = 3.2.12 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/20/86/e4348aac45bc83fc8e9dda2cfd81004b007c65b68c1499a4233acabdaa3b +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/83/d9/7f28811ff78ce1903dc9a32ac439e4e6c98298cd2e99cb01f528e51dd796 PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Wed Feb 16 20:56:31 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Feb 2022 21:56:31 +0100 Subject: [Buildroot] [git commit] package/libusb: fix maybe-uninitialized error Message-ID: <20220216204910.979A383612@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d06737b27b4f01ecb69b69ef3dcc44ca4fd7eec6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Initialize active_config to an invalid value to avoid the following compilation error: os/linux_usbfs.c: In function ???op_get_configuration???: os/linux_usbfs.c:1452:12: error: ???active_config??? may be used uninitialized in this function [-Werror=maybe-uninitialized] 1452 | *config = (uint8_t)active_config; Signed-off-by: Yegor Yefremov Tested-by: Eugen Hristev Signed-off-by: Yann E. MORIN --- ...linux_usbfs-fix-maybe-uninitialized-error.patch | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/package/libusb/0002-linux_usbfs-fix-maybe-uninitialized-error.patch b/package/libusb/0002-linux_usbfs-fix-maybe-uninitialized-error.patch new file mode 100644 index 0000000000..e6020f466e --- /dev/null +++ b/package/libusb/0002-linux_usbfs-fix-maybe-uninitialized-error.patch @@ -0,0 +1,37 @@ +From bea5891591402f14940a607eafbdcd169ff8827f Mon Sep 17 00:00:00 2001 +From: Yegor Yefremov +Date: Sun, 6 Feb 2022 07:12:14 +0100 +Subject: [PATCH 2/2] linux_usbfs: fix maybe-uninitialized error +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Initialize active_config to an invalid value to avoid the following +compilation error: + +os/linux_usbfs.c: In function ???op_get_configuration???: +os/linux_usbfs.c:1452:12: error: ???active_config??? may be used uninitialized in this function [-Werror=maybe-uninitialized] + 1452 | *config = (uint8_t)active_config; + +Signed-off-by: Yegor Yefremov +Upstream: https://github.com/libusb/libusb/pull/1062 +--- + libusb/os/linux_usbfs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libusb/os/linux_usbfs.c b/libusb/os/linux_usbfs.c +index c300675..285d9ca 100644 +--- a/libusb/os/linux_usbfs.c ++++ b/libusb/os/linux_usbfs.c +@@ -1429,7 +1429,7 @@ static int op_get_configuration(struct libusb_device_handle *handle, + uint8_t *config) + { + struct linux_device_priv *priv = usbi_get_device_priv(handle->dev); +- int active_config; ++ int active_config = -1; /* to please compiler */ + int r; + + if (priv->sysfs_dir) { +-- +2.17.0 + From yann.morin.1998 at free.fr Wed Feb 16 20:59:02 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Feb 2022 21:59:02 +0100 Subject: [Buildroot] [PATCH] package/libusb: fix maybe-uninitialized error In-Reply-To: <20220216133140.14668-1-yegorslists@googlemail.com> References: <20220216133140.14668-1-yegorslists@googlemail.com> Message-ID: <20220216205902.GA522310@scaer> Yegor, All, On 2022-02-16 14:31 +0100, yegorslists--- via buildroot spake thusly: > From: Yegor Yefremov > > Initialize active_config to an invalid value to avoid the following > compilation error: > > os/linux_usbfs.c: In function ?op_get_configuration?: > os/linux_usbfs.c:1452:12: error: ?active_config? may be used uninitialized in this function [-Werror=maybe-uninitialized] > 1452 | *config = (uint8_t)active_config; > > Upstream URL: https://github.com/libusb/libusb/pull/1062 I've moved that into the patch itself, as it is either to find when we update the version and have to check if the patch has to be removed or rebased. Applied to master, thanks. Regards, Yann E. MORIN. > Signed-off-by: Yegor Yefremov > --- > ..._usbfs-fix-maybe-uninitialized-error.patch | 36 +++++++++++++++++++ > 1 file changed, 36 insertions(+) > create mode 100644 package/libusb/0002-linux_usbfs-fix-maybe-uninitialized-error.patch > > diff --git a/package/libusb/0002-linux_usbfs-fix-maybe-uninitialized-error.patch b/package/libusb/0002-linux_usbfs-fix-maybe-uninitialized-error.patch > new file mode 100644 > index 0000000000..192172e9eb > --- /dev/null > +++ b/package/libusb/0002-linux_usbfs-fix-maybe-uninitialized-error.patch > @@ -0,0 +1,36 @@ > +From bea5891591402f14940a607eafbdcd169ff8827f Mon Sep 17 00:00:00 2001 > +From: Yegor Yefremov > +Date: Sun, 6 Feb 2022 07:12:14 +0100 > +Subject: [PATCH 2/2] linux_usbfs: fix maybe-uninitialized error > +MIME-Version: 1.0 > +Content-Type: text/plain; charset=UTF-8 > +Content-Transfer-Encoding: 8bit > + > +Initialize active_config to an invalid value to avoid the following > +compilation error: > + > +os/linux_usbfs.c: In function ?op_get_configuration?: > +os/linux_usbfs.c:1452:12: error: ?active_config? may be used uninitialized in this function [-Werror=maybe-uninitialized] > + 1452 | *config = (uint8_t)active_config; > + > +Signed-off-by: Yegor Yefremov > +--- > + libusb/os/linux_usbfs.c | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/libusb/os/linux_usbfs.c b/libusb/os/linux_usbfs.c > +index c300675..285d9ca 100644 > +--- a/libusb/os/linux_usbfs.c > ++++ b/libusb/os/linux_usbfs.c > +@@ -1429,7 +1429,7 @@ static int op_get_configuration(struct libusb_device_handle *handle, > + uint8_t *config) > + { > + struct linux_device_priv *priv = usbi_get_device_priv(handle->dev); > +- int active_config; > ++ int active_config = -1; /* to please compiler */ > + int r; > + > + if (priv->sysfs_dir) { > +-- > +2.17.0 > + > -- > 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 peter at korsgaard.com Wed Feb 16 21:00:11 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 22:00:11 +0100 Subject: [Buildroot] [PATCH v1 00/12] package/gstreamer1/*: bump version to 1.18.6 In-Reply-To: <20220204154631.17814-1-ps.report@gmx.net> (Peter Seiderer's message of "Fri, 4 Feb 2022 16:46:19 +0100") References: <20220204154631.17814-1-ps.report@gmx.net> Message-ID: <87czjmh6hw.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > For details see [1] and [2]. > [1] https://lists.freedesktop.org/archives/gstreamer-devel/2022-February/079533.html > [2] https://gstreamer.freedesktop.org/releases/1.18/#1.18.6 > Peter Seiderer (12): > package/gstreamer1: bump version to 1.18.6 > package/gst1-plugins-base: bump version to 1.18.6 > package/gst1-plugins-good: bump version to 1.18.6 > package/gst1-plugins-bad: bump version to 1.18.6 > package/gst1-plugins-ugly: bump version to 1.18.6 > package/gst1-devtools: bump version to 1.18.6 > package/gst1-libav: bump version to 1.18.6 > package/gst1-vaapi: bump version to 1.18.6 > package/gst1-rtsp-server: bump version to 1.18.6 > package/gstreamer1-editing-services: bump version to 1.18.6 > package/gst-omx: bump version to 1.18.6 > package/gst1-python: bump version to 1.18.6 Committed series to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 16 20:56:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:56:38 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gst1-plugins-good: bump version to 1.18.6 Message-ID: <20220216205241.B01258365F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=563d6ff419cb247bdb3eab9aa71ebbe220655ae0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit 8741ac0e502bacad8c81c9b02e116d9ce00fee03) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash | 4 ++-- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash index ea9f43bfd2..e342bd133e 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.5.tar.xz.sha256sum -sha256 3aaeeea7765fbf8801acce4a503a9b05f73f04e8a35352e9d00232cfd555796b gst-plugins-good-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.6.tar.xz.sha256sum +sha256 26723ac01fcb360ade1f41d168c7c322d8af4ceb7e55c8c12ed2690d06a76eed gst-plugins-good-1.18.6.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk index 44da3c3c30..e0ca29c5fd 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_GOOD_VERSION = 1.18.5 +GST1_PLUGINS_GOOD_VERSION = 1.18.6 GST1_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST1_PLUGINS_GOOD_VERSION).tar.xz GST1_PLUGINS_GOOD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-good GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING From peter at korsgaard.com Wed Feb 16 20:56:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:56:51 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gst1-plugins-ugly: bump version to 1.18.6 Message-ID: <20220216205241.C58128365D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3052258b900f2694e2990c090bd41804f68e264b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit 4d02d512f380a51097026ab33241aa466c33ee07) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash | 4 ++-- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash index 93945cdecd..26fd0fd9ac 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.18.5.tar.xz.sha256sum -sha256 df32803e98f8a9979373fa2ca7e05e62f977b1097576d3a80619d9f5c69f66d9 gst-plugins-ugly-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.18.6.tar.xz.sha256sum +sha256 4969c409cb6a88317d2108b8577108e18623b2333d7b587ae3f39459c70e3a7f gst-plugins-ugly-1.18.6.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk index a25110264e..7f483deb81 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_UGLY_VERSION = 1.18.5 +GST1_PLUGINS_UGLY_VERSION = 1.18.6 GST1_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST1_PLUGINS_UGLY_VERSION).tar.xz GST1_PLUGINS_UGLY_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-ugly GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING From peter at korsgaard.com Wed Feb 16 20:56:29 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:56:29 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gst1-plugins-base: bump version to 1.18.6 Message-ID: <20220216205241.A68F1835F3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=31a9d8797184be43bab960ff38279952e2b865d5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x - removed 0001-gst-libs-gst-video-gstvideoaggregator.c-fix-build-wi.patch (upstream accepted [1], [2]) [1] https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/974 [2] https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/commit/d86cf6314f8f178c59600f55321ce73d4ca95d97.patch Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit ecdc76a39c89d37a90c2b87ecf62db09de710beb) Signed-off-by: Peter Korsgaard --- ...t-video-gstvideoaggregator.c-fix-build-wi.patch | 45 ---------------------- .../gst1-plugins-base/gst1-plugins-base.hash | 4 +- .../gst1-plugins-base/gst1-plugins-base.mk | 2 +- 3 files changed, 3 insertions(+), 48 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-base/0001-gst-libs-gst-video-gstvideoaggregator.c-fix-build-wi.patch b/package/gstreamer1/gst1-plugins-base/0001-gst-libs-gst-video-gstvideoaggregator.c-fix-build-wi.patch deleted file mode 100644 index 87cd6493f5..0000000000 --- a/package/gstreamer1/gst1-plugins-base/0001-gst-libs-gst-video-gstvideoaggregator.c-fix-build-wi.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 012ca1bcd234ee02f576dd58b1f09baba18b89b0 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 14 Dec 2020 07:42:55 +0100 -Subject: [PATCH] gst-libs/gst/video/gstvideoaggregator.c: fix build with gcc - 4.8 - -Fix the following build failure with gcc 4.8 which has been added with -https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/commit/d268c193ad39fb970351ed62898be806ebd0a71e: - -../gst-libs/gst/video/gstvideoaggregator.c: In function 'gst_video_aggregator_init': -../gst-libs/gst/video/gstvideoaggregator.c:2762:3: error: 'for' loop initial declarations are only allowed in C99 mode - for (gint i = 0; i < gst_caps_get_size (src_template); i++) { - ^ - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/974] ---- - gst-libs/gst/video/gstvideoaggregator.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/gst-libs/gst/video/gstvideoaggregator.c b/gst-libs/gst/video/gstvideoaggregator.c -index 2e3d813be..04dad6563 100644 ---- a/gst-libs/gst/video/gstvideoaggregator.c -+++ b/gst-libs/gst/video/gstvideoaggregator.c -@@ -2786,6 +2786,7 @@ gst_video_aggregator_init (GstVideoAggregator * vagg, - { - GstCaps *src_template; - GstPadTemplate *pad_template; -+ gint i; - - vagg->priv = gst_video_aggregator_get_instance_private (vagg); - vagg->priv->current_caps = NULL; -@@ -2800,7 +2801,7 @@ gst_video_aggregator_init (GstVideoAggregator * vagg, - pad_template = - gst_element_class_get_pad_template (GST_ELEMENT_CLASS (klass), "src"); - src_template = gst_pad_template_get_caps (pad_template); -- for (gint i = 0; i < gst_caps_get_size (src_template); i++) { -+ for (i = 0; i < gst_caps_get_size (src_template); i++) { - const GValue *v = - gst_structure_get_value (gst_caps_get_structure (src_template, i), - "format"); --- -2.29.2 - diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash index 200ba0fe5d..081dc6f213 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.18.5.tar.xz.sha256sum -sha256 960b7af4585700db0fdd5b843554e11e2564fed9e061f591fae88a7be6446fa3 gst-plugins-base-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.18.6.tar.xz.sha256sum +sha256 56a9ff2fe9e6603b9e658cf6897d412a173d2180829fe01e92568549c6bd0f5b gst-plugins-base-1.18.6.tar.xz sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk index 76757fd6a8..c99eeb6c59 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BASE_VERSION = 1.18.5 +GST1_PLUGINS_BASE_VERSION = 1.18.6 GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz GST1_PLUGINS_BASE_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-base GST1_PLUGINS_BASE_INSTALL_STAGING = YES From peter at korsgaard.com Wed Feb 16 20:56:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:56:21 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gstreamer1: bump version to 1.18.6 Message-ID: <20220216205241.9D1B88365C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2d2664cbecfa10807ca6a1bbd322b1cf6252a339 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit 58be19b0280e803ebe710c591cd4780cdd037a5e) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gstreamer1/gstreamer1.hash | 4 ++-- package/gstreamer1/gstreamer1/gstreamer1.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gstreamer1/gstreamer1.hash b/package/gstreamer1/gstreamer1/gstreamer1.hash index c6282454ca..1202bf2c50 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.hash +++ b/package/gstreamer1/gstreamer1/gstreamer1.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.18.5.tar.xz.sha256sum -sha256 55862232a63459bbf56abebde3085ca9aec211b478e891dacea4d6df8cafe80a gstreamer-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.18.6.tar.xz.sha256sum +sha256 4ec816010dd4d3a93cf470ad0a6f25315f52b204eb1d71dfa70ab8a1c3bd06e6 gstreamer-1.18.6.tar.xz sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk index 1aab035e05..27745f3bf9 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_VERSION = 1.18.5 +GSTREAMER1_VERSION = 1.18.6 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer GSTREAMER1_INSTALL_STAGING = YES From peter at korsgaard.com Wed Feb 16 20:56:57 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:56:57 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gst1-devtools: bump version to 1.18.6 Message-ID: <20220216205241.CE5118365F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4784486c0de48e04f068ece5b125f86e3f717ecb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit efd9eac4d7579808caa23ee52a0d9661c8f987be) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-devtools/gst1-devtools.hash | 4 ++-- package/gstreamer1/gst1-devtools/gst1-devtools.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.hash b/package/gstreamer1/gst1-devtools/gst1-devtools.hash index c19254c195..011385e757 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.hash +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.18.5.tar.xz.sha256sum -sha256 fecffc86447daf5c2a06843c757a991d745caa2069446a0d746e99b13f7cb079 gst-devtools-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.18.6.tar.xz.sha256sum +sha256 3725622c740a635452e54b79d065f963ab7706ca2403de6c43072ae7610a0de4 gst-devtools-1.18.6.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 validate/COPYING diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.mk b/package/gstreamer1/gst1-devtools/gst1-devtools.mk index 1c25823953..66b509ae2c 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.mk +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_DEVTOOLS_VERSION = 1.18.5 +GST1_DEVTOOLS_VERSION = 1.18.6 GST1_DEVTOOLS_SOURCE = gst-devtools-$(GST1_DEVTOOLS_VERSION).tar.xz GST1_DEVTOOLS_SITE = https://gstreamer.freedesktop.org/src/gst-devtools GST1_DEVTOOLS_LICENSE = LGPL-2.1+ From peter at korsgaard.com Wed Feb 16 20:56:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:56:44 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gst1-plugins-bad: bump version to 1.18.6 Message-ID: <20220216205241.BB65D8365C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3284ec865dd3d3758e60436b7bd70e38378c4a48 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit ed2f427fd240f539e833919c6ef832c58eb86959) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash | 4 ++-- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash index cbb2729dab..d31a78981e 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.5.tar.xz.sha256sum -sha256 a164923b94f0d08578a6fcaeaac6e0c05da788a46903a1086870e9ca45ad678e gst-plugins-bad-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.6.tar.xz.sha256sum +sha256 0b1b50ac6311f0c510248b6cd64d6d3c94369344828baa602db85ded5bc70ec9 gst-plugins-bad-1.18.6.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index d3f089bfed..8100272bba 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BAD_VERSION = 1.18.5 +GST1_PLUGINS_BAD_VERSION = 1.18.6 GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz GST1_PLUGINS_BAD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-bad GST1_PLUGINS_BAD_INSTALL_STAGING = YES From peter at korsgaard.com Wed Feb 16 20:57:29 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:57:29 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gstreamer1-editing-services: bump version to 1.18.6 Message-ID: <20220216205242.001B98365D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b17c6fa090b4539bd3b97ba17455b122efd68191 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit aa87c2e1689b920052ee4a802e24ca342d8f9651) Signed-off-by: Peter Korsgaard --- .../gstreamer1-editing-services/gstreamer1-editing-services.hash | 4 ++-- .../gstreamer1-editing-services/gstreamer1-editing-services.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash index daaf729c70..e29dc112ce 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash @@ -1,5 +1,5 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.18.5.tar.xz.sha256sum -sha256 8af4a8394d051f3e18280686db49a6efaccc95c0c59a17f0f564e32000590df5 gst-editing-services-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.18.6.tar.xz.sha256sum +sha256 fe10d14ef896aa21038317f6f81e1158ccc6caaed9b0d5a29ae5bdd63074582c gst-editing-services-1.18.6.tar.xz # Hashes for license files: sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk index d3de79c5f6..a3722cbbca 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_EDITING_SERVICES_VERSION = 1.18.5 +GSTREAMER1_EDITING_SERVICES_VERSION = 1.18.6 GSTREAMER1_EDITING_SERVICES_SOURCE = gst-editing-services-$(GSTREAMER1_EDITING_SERVICES_VERSION).tar.xz GSTREAMER1_EDITING_SERVICES_SITE = https://gstreamer.freedesktop.org/src/gstreamer-editing-services GSTREAMER1_EDITING_SERVICES_LICENSE = LGPL-2.0+ From peter at korsgaard.com Wed Feb 16 20:57:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:57:03 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gst1-libav: bump version to 1.18.6 Message-ID: <20220216205241.D799E8365C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5e7abb7d73527f99fbdb36a4d7b561100f2a29e7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit 8de78f3da0cdbc139b876bdeb34079302ce02934) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-libav/gst1-libav.hash | 4 ++-- package/gstreamer1/gst1-libav/gst1-libav.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-libav/gst1-libav.hash b/package/gstreamer1/gst1-libav/gst1-libav.hash index 040a6e33f3..5fb39a0b3e 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.hash +++ b/package/gstreamer1/gst1-libav/gst1-libav.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.18.5.tar.xz.sha256sum -sha256 822e008a910e9dd13aedbdd8dc63fedef4040c0ee2e927bab3112e9de693a548 gst-libav-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.18.6.tar.xz.sha256sum +sha256 e4e50dcd5a29441ae34de60d2221057e8064ed824bb6ca4dc0fd9ee88fbe9b81 gst-libav-1.18.6.tar.xz sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gst1-libav/gst1-libav.mk b/package/gstreamer1/gst1-libav/gst1-libav.mk index 01ec4d2c98..55c6e06e0e 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.mk +++ b/package/gstreamer1/gst1-libav/gst1-libav.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_LIBAV_VERSION = 1.18.5 +GST1_LIBAV_VERSION = 1.18.6 GST1_LIBAV_SOURCE = gst-libav-$(GST1_LIBAV_VERSION).tar.xz GST1_LIBAV_SITE = https://gstreamer.freedesktop.org/src/gst-libav GST1_LIBAV_LICENSE = LGPL-2.0+ From peter at korsgaard.com Wed Feb 16 20:57:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:57:35 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gst-omx: bump version to 1.18.6 Message-ID: <20220216205242.085508365C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=720b465a6f90f5f3f66fde0d557e6348f81f3b43 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit ce4bc450007910aa673d0f8356e99c421d20af89) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst-omx/gst-omx.hash | 4 ++-- package/gstreamer1/gst-omx/gst-omx.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst-omx/gst-omx.hash b/package/gstreamer1/gst-omx/gst-omx.hash index 9040393506..47f7cb5893 100644 --- a/package/gstreamer1/gst-omx/gst-omx.hash +++ b/package/gstreamer1/gst-omx/gst-omx.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.18.5.tar.xz.sha256sum -sha256 2cd457c1e8deb1a9b39608048fb36a44f6c9a864a6b6115b1453a32e7be93b42 gst-omx-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.18.6.tar.xz.sha256sum +sha256 b5281c938e959fd2418e989cfb6065fdd9fe5f6f87ee86236c9427166e708163 gst-omx-1.18.6.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst-omx/gst-omx.mk b/package/gstreamer1/gst-omx/gst-omx.mk index f7be1d59ef..dc65509244 100644 --- a/package/gstreamer1/gst-omx/gst-omx.mk +++ b/package/gstreamer1/gst-omx/gst-omx.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST_OMX_VERSION = 1.18.5 +GST_OMX_VERSION = 1.18.6 GST_OMX_SOURCE = gst-omx-$(GST_OMX_VERSION).tar.xz GST_OMX_SITE = https://gstreamer.freedesktop.org/src/gst-omx From peter at korsgaard.com Wed Feb 16 20:57:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:57:15 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gst1-vaapi: bump version to 1.18.6 Message-ID: <20220216205241.E0BA68365C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=07264fc142d037d9b86f449ab5764e8070adfbda branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit aef9027773543fede0cbfa3405f5919e38671dbf) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-vaapi/gst1-vaapi.hash | 4 ++-- package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash index b0c19fc600..7e22774c11 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.18.5.tar.xz.sha256sum -sha256 4a460fb95559f41444eb24864ad2d9e37922b6eea941510310319fc3e0ba727b gstreamer-vaapi-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.18.6.tar.xz.sha256sum +sha256 ab6270f1e5e4546fbe6f5ea246d86ca3d196282eb863d46e6cdcc96f867449e0 gstreamer-vaapi-1.18.6.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk index 9810b12cf7..6af851602f 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_VAAPI_VERSION = 1.18.5 +GST1_VAAPI_VERSION = 1.18.6 GST1_VAAPI_SITE = https://gstreamer.freedesktop.org/src/gstreamer-vaapi GST1_VAAPI_SOURCE = gstreamer-vaapi-$(GST1_VAAPI_VERSION).tar.xz GST1_VAAPI_LICENSE = LGPL-2.1+ From peter at korsgaard.com Wed Feb 16 20:57:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:57:44 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gst1-python: bump version to 1.18.6 Message-ID: <20220216205242.10F4C8365F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=61f8a7e79129ade522c871f10a74cad10e385dca branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit dc66c5901cbc912941f26275aac0f4b3fe6cf596) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-python/gst1-python.hash | 4 ++-- package/gstreamer1/gst1-python/gst1-python.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-python/gst1-python.hash b/package/gstreamer1/gst1-python/gst1-python.hash index 2035c81fea..a760e53e7d 100644 --- a/package/gstreamer1/gst1-python/gst1-python.hash +++ b/package/gstreamer1/gst1-python/gst1-python.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.18.5.tar.xz.sha256sum -sha256 533685871305959d6db89507f3b3aa6c765c2f2b0dacdc32c5a6543e72e5bc52 gst-python-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.18.6.tar.xz.sha256sum +sha256 bdc0ea22fbd7335ad9decc151561aacc53c51206a9735b81eac700ce5b0bbd4a gst-python-1.18.6.tar.xz sha256 ea3ad127610e5ded2210b3a86a46314f2b3b28e438eccffdae19a4d6fbcdb0c2 COPYING diff --git a/package/gstreamer1/gst1-python/gst1-python.mk b/package/gstreamer1/gst1-python/gst1-python.mk index 614cb22396..7faab752cd 100644 --- a/package/gstreamer1/gst1-python/gst1-python.mk +++ b/package/gstreamer1/gst1-python/gst1-python.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PYTHON_VERSION = 1.18.5 +GST1_PYTHON_VERSION = 1.18.6 GST1_PYTHON_SOURCE = gst-python-$(GST1_PYTHON_VERSION).tar.xz GST1_PYTHON_SITE = https://gstreamer.freedesktop.org/src/gst-python GST1_PYTHON_INSTALL_STAGING = YES From peter at korsgaard.com Wed Feb 16 20:57:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:57:22 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gst1-rtsp-server: bump version to 1.18.6 Message-ID: <20220216205241.E9DF18365D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eec18355b708f68bb4e842441de170c6a03479e5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit 56c0d7b8867228bb44e76f4bf296e27202d10f13) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash | 4 ++-- package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash index 627a451d04..fadef41351 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash @@ -1,4 +1,4 @@ -# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.18.5.tar.xz.sha256sum -sha256 04d63bf48816c6f41c73f6de0f912a7cef0aab39c44162a7bcece1923dfc9d1f gst-rtsp-server-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.18.6.tar.xz.sha256sum +sha256 826f32afbcf94b823541efcac4a0dacdb62f6145ef58f363095749f440262be9 gst-rtsp-server-1.18.6.tar.xz sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING.LIB diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk index 37942423a5..55403754f3 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_RTSP_SERVER_VERSION = 1.18.5 +GST1_RTSP_SERVER_VERSION = 1.18.6 GST1_RTSP_SERVER_SOURCE = gst-rtsp-server-$(GST1_RTSP_SERVER_VERSION).tar.xz GST1_RTSP_SERVER_SITE = http://gstreamer.freedesktop.org/src/gst-rtsp-server GST1_RTSP_SERVER_LICENSE = LGPL-2.0+ From peter at korsgaard.com Wed Feb 16 20:58:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:58:27 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gstreamer1: bump version to 1.18.6 Message-ID: <20220216205312.3D73B836A6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5806baf9fef22463d0eb218db0d8b424bb5c3cab branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit 58be19b0280e803ebe710c591cd4780cdd037a5e) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gstreamer1/gstreamer1.hash | 4 ++-- package/gstreamer1/gstreamer1/gstreamer1.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gstreamer1/gstreamer1.hash b/package/gstreamer1/gstreamer1/gstreamer1.hash index c6282454ca..1202bf2c50 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.hash +++ b/package/gstreamer1/gstreamer1/gstreamer1.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.18.5.tar.xz.sha256sum -sha256 55862232a63459bbf56abebde3085ca9aec211b478e891dacea4d6df8cafe80a gstreamer-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.18.6.tar.xz.sha256sum +sha256 4ec816010dd4d3a93cf470ad0a6f25315f52b204eb1d71dfa70ab8a1c3bd06e6 gstreamer-1.18.6.tar.xz sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk index 1aab035e05..27745f3bf9 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_VERSION = 1.18.5 +GSTREAMER1_VERSION = 1.18.6 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer GSTREAMER1_INSTALL_STAGING = YES From peter at korsgaard.com Wed Feb 16 20:58:29 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:58:29 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gst1-plugins-bad: bump version to 1.18.6 Message-ID: <20220216205312.5868B836A6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=521a8184e707662a937f653ad65f1347b3f58ab8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit ed2f427fd240f539e833919c6ef832c58eb86959) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash | 4 ++-- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash index cbb2729dab..d31a78981e 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.5.tar.xz.sha256sum -sha256 a164923b94f0d08578a6fcaeaac6e0c05da788a46903a1086870e9ca45ad678e gst-plugins-bad-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.6.tar.xz.sha256sum +sha256 0b1b50ac6311f0c510248b6cd64d6d3c94369344828baa602db85ded5bc70ec9 gst-plugins-bad-1.18.6.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index d3f089bfed..8100272bba 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BAD_VERSION = 1.18.5 +GST1_PLUGINS_BAD_VERSION = 1.18.6 GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz GST1_PLUGINS_BAD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-bad GST1_PLUGINS_BAD_INSTALL_STAGING = YES From peter at korsgaard.com Wed Feb 16 20:58:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:58:30 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gst1-plugins-ugly: bump version to 1.18.6 Message-ID: <20220216205312.611A0836A7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=086cb593228d23e4bbe0de5bcf437c0975bc8ef4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit 4d02d512f380a51097026ab33241aa466c33ee07) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash | 4 ++-- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash index 93945cdecd..26fd0fd9ac 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.18.5.tar.xz.sha256sum -sha256 df32803e98f8a9979373fa2ca7e05e62f977b1097576d3a80619d9f5c69f66d9 gst-plugins-ugly-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.18.6.tar.xz.sha256sum +sha256 4969c409cb6a88317d2108b8577108e18623b2333d7b587ae3f39459c70e3a7f gst-plugins-ugly-1.18.6.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk index a25110264e..7f483deb81 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_UGLY_VERSION = 1.18.5 +GST1_PLUGINS_UGLY_VERSION = 1.18.6 GST1_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST1_PLUGINS_UGLY_VERSION).tar.xz GST1_PLUGINS_UGLY_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-ugly GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING From peter at korsgaard.com Wed Feb 16 20:58:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:58:28 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gst1-plugins-base: bump version to 1.18.6 Message-ID: <20220216205312.45FB0836A7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=374b496efb8ed629367d3d46a48e8de6c35f23d9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x - removed 0001-gst-libs-gst-video-gstvideoaggregator.c-fix-build-wi.patch (upstream accepted [1], [2]) [1] https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/974 [2] https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/commit/d86cf6314f8f178c59600f55321ce73d4ca95d97.patch Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit ecdc76a39c89d37a90c2b87ecf62db09de710beb) Signed-off-by: Peter Korsgaard --- ...t-video-gstvideoaggregator.c-fix-build-wi.patch | 45 ---------------------- .../gst1-plugins-base/gst1-plugins-base.hash | 4 +- .../gst1-plugins-base/gst1-plugins-base.mk | 2 +- 3 files changed, 3 insertions(+), 48 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-base/0001-gst-libs-gst-video-gstvideoaggregator.c-fix-build-wi.patch b/package/gstreamer1/gst1-plugins-base/0001-gst-libs-gst-video-gstvideoaggregator.c-fix-build-wi.patch deleted file mode 100644 index 87cd6493f5..0000000000 --- a/package/gstreamer1/gst1-plugins-base/0001-gst-libs-gst-video-gstvideoaggregator.c-fix-build-wi.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 012ca1bcd234ee02f576dd58b1f09baba18b89b0 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 14 Dec 2020 07:42:55 +0100 -Subject: [PATCH] gst-libs/gst/video/gstvideoaggregator.c: fix build with gcc - 4.8 - -Fix the following build failure with gcc 4.8 which has been added with -https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/commit/d268c193ad39fb970351ed62898be806ebd0a71e: - -../gst-libs/gst/video/gstvideoaggregator.c: In function 'gst_video_aggregator_init': -../gst-libs/gst/video/gstvideoaggregator.c:2762:3: error: 'for' loop initial declarations are only allowed in C99 mode - for (gint i = 0; i < gst_caps_get_size (src_template); i++) { - ^ - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/974] ---- - gst-libs/gst/video/gstvideoaggregator.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/gst-libs/gst/video/gstvideoaggregator.c b/gst-libs/gst/video/gstvideoaggregator.c -index 2e3d813be..04dad6563 100644 ---- a/gst-libs/gst/video/gstvideoaggregator.c -+++ b/gst-libs/gst/video/gstvideoaggregator.c -@@ -2786,6 +2786,7 @@ gst_video_aggregator_init (GstVideoAggregator * vagg, - { - GstCaps *src_template; - GstPadTemplate *pad_template; -+ gint i; - - vagg->priv = gst_video_aggregator_get_instance_private (vagg); - vagg->priv->current_caps = NULL; -@@ -2800,7 +2801,7 @@ gst_video_aggregator_init (GstVideoAggregator * vagg, - pad_template = - gst_element_class_get_pad_template (GST_ELEMENT_CLASS (klass), "src"); - src_template = gst_pad_template_get_caps (pad_template); -- for (gint i = 0; i < gst_caps_get_size (src_template); i++) { -+ for (i = 0; i < gst_caps_get_size (src_template); i++) { - const GValue *v = - gst_structure_get_value (gst_caps_get_structure (src_template, i), - "format"); --- -2.29.2 - diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash index 200ba0fe5d..081dc6f213 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.18.5.tar.xz.sha256sum -sha256 960b7af4585700db0fdd5b843554e11e2564fed9e061f591fae88a7be6446fa3 gst-plugins-base-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.18.6.tar.xz.sha256sum +sha256 56a9ff2fe9e6603b9e658cf6897d412a173d2180829fe01e92568549c6bd0f5b gst-plugins-base-1.18.6.tar.xz sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk index 76757fd6a8..c99eeb6c59 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BASE_VERSION = 1.18.5 +GST1_PLUGINS_BASE_VERSION = 1.18.6 GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz GST1_PLUGINS_BASE_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-base GST1_PLUGINS_BASE_INSTALL_STAGING = YES From peter at korsgaard.com Wed Feb 16 20:58:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:58:28 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gst1-plugins-good: bump version to 1.18.6 Message-ID: <20220216205312.4F648836AF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8c378d9c7109f034771d4b96621781730dad8ad0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit 8741ac0e502bacad8c81c9b02e116d9ce00fee03) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash | 4 ++-- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash index ea9f43bfd2..e342bd133e 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.5.tar.xz.sha256sum -sha256 3aaeeea7765fbf8801acce4a503a9b05f73f04e8a35352e9d00232cfd555796b gst-plugins-good-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.6.tar.xz.sha256sum +sha256 26723ac01fcb360ade1f41d168c7c322d8af4ceb7e55c8c12ed2690d06a76eed gst-plugins-good-1.18.6.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk index 44da3c3c30..e0ca29c5fd 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_GOOD_VERSION = 1.18.5 +GST1_PLUGINS_GOOD_VERSION = 1.18.6 GST1_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST1_PLUGINS_GOOD_VERSION).tar.xz GST1_PLUGINS_GOOD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-good GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING From peter at korsgaard.com Wed Feb 16 20:58:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:58:32 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gst1-vaapi: bump version to 1.18.6 Message-ID: <20220216205312.7B461836A6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dc58180087bed78041f4d11575afaa73c84e139e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit aef9027773543fede0cbfa3405f5919e38671dbf) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-vaapi/gst1-vaapi.hash | 4 ++-- package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash index b0c19fc600..7e22774c11 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.18.5.tar.xz.sha256sum -sha256 4a460fb95559f41444eb24864ad2d9e37922b6eea941510310319fc3e0ba727b gstreamer-vaapi-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.18.6.tar.xz.sha256sum +sha256 ab6270f1e5e4546fbe6f5ea246d86ca3d196282eb863d46e6cdcc96f867449e0 gstreamer-vaapi-1.18.6.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk index 9810b12cf7..6af851602f 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_VAAPI_VERSION = 1.18.5 +GST1_VAAPI_VERSION = 1.18.6 GST1_VAAPI_SITE = https://gstreamer.freedesktop.org/src/gstreamer-vaapi GST1_VAAPI_SOURCE = gstreamer-vaapi-$(GST1_VAAPI_VERSION).tar.xz GST1_VAAPI_LICENSE = LGPL-2.1+ From peter at korsgaard.com Wed Feb 16 20:58:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:58:31 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gst1-libav: bump version to 1.18.6 Message-ID: <20220216205312.727A0836AF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=72673613aa0ee9ee678e1c654fdfe48fddaa1562 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit 8de78f3da0cdbc139b876bdeb34079302ce02934) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-libav/gst1-libav.hash | 4 ++-- package/gstreamer1/gst1-libav/gst1-libav.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-libav/gst1-libav.hash b/package/gstreamer1/gst1-libav/gst1-libav.hash index 040a6e33f3..5fb39a0b3e 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.hash +++ b/package/gstreamer1/gst1-libav/gst1-libav.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.18.5.tar.xz.sha256sum -sha256 822e008a910e9dd13aedbdd8dc63fedef4040c0ee2e927bab3112e9de693a548 gst-libav-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.18.6.tar.xz.sha256sum +sha256 e4e50dcd5a29441ae34de60d2221057e8064ed824bb6ca4dc0fd9ee88fbe9b81 gst-libav-1.18.6.tar.xz sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gst1-libav/gst1-libav.mk b/package/gstreamer1/gst1-libav/gst1-libav.mk index 01ec4d2c98..55c6e06e0e 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.mk +++ b/package/gstreamer1/gst1-libav/gst1-libav.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_LIBAV_VERSION = 1.18.5 +GST1_LIBAV_VERSION = 1.18.6 GST1_LIBAV_SOURCE = gst-libav-$(GST1_LIBAV_VERSION).tar.xz GST1_LIBAV_SITE = https://gstreamer.freedesktop.org/src/gst-libav GST1_LIBAV_LICENSE = LGPL-2.0+ From peter at korsgaard.com Wed Feb 16 20:58:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:58:31 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gst1-devtools: bump version to 1.18.6 Message-ID: <20220216205312.6A24A836A6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e293b10d1cf2260fc610e7b2f2179d6fd74a2f7e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit efd9eac4d7579808caa23ee52a0d9661c8f987be) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-devtools/gst1-devtools.hash | 4 ++-- package/gstreamer1/gst1-devtools/gst1-devtools.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.hash b/package/gstreamer1/gst1-devtools/gst1-devtools.hash index c19254c195..011385e757 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.hash +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.18.5.tar.xz.sha256sum -sha256 fecffc86447daf5c2a06843c757a991d745caa2069446a0d746e99b13f7cb079 gst-devtools-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.18.6.tar.xz.sha256sum +sha256 3725622c740a635452e54b79d065f963ab7706ca2403de6c43072ae7610a0de4 gst-devtools-1.18.6.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 validate/COPYING diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.mk b/package/gstreamer1/gst1-devtools/gst1-devtools.mk index 1c25823953..66b509ae2c 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.mk +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_DEVTOOLS_VERSION = 1.18.5 +GST1_DEVTOOLS_VERSION = 1.18.6 GST1_DEVTOOLS_SOURCE = gst-devtools-$(GST1_DEVTOOLS_VERSION).tar.xz GST1_DEVTOOLS_SITE = https://gstreamer.freedesktop.org/src/gst-devtools GST1_DEVTOOLS_LICENSE = LGPL-2.1+ From peter at korsgaard.com Wed Feb 16 20:58:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:58:35 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gst-omx: bump version to 1.18.6 Message-ID: <20220216205312.9529B836A7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0903ad64eb5e031e0b4b28df7b4af4a446f3e4a1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit ce4bc450007910aa673d0f8356e99c421d20af89) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst-omx/gst-omx.hash | 4 ++-- package/gstreamer1/gst-omx/gst-omx.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst-omx/gst-omx.hash b/package/gstreamer1/gst-omx/gst-omx.hash index 9040393506..47f7cb5893 100644 --- a/package/gstreamer1/gst-omx/gst-omx.hash +++ b/package/gstreamer1/gst-omx/gst-omx.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.18.5.tar.xz.sha256sum -sha256 2cd457c1e8deb1a9b39608048fb36a44f6c9a864a6b6115b1453a32e7be93b42 gst-omx-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.18.6.tar.xz.sha256sum +sha256 b5281c938e959fd2418e989cfb6065fdd9fe5f6f87ee86236c9427166e708163 gst-omx-1.18.6.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst-omx/gst-omx.mk b/package/gstreamer1/gst-omx/gst-omx.mk index f7be1d59ef..dc65509244 100644 --- a/package/gstreamer1/gst-omx/gst-omx.mk +++ b/package/gstreamer1/gst-omx/gst-omx.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST_OMX_VERSION = 1.18.5 +GST_OMX_VERSION = 1.18.6 GST_OMX_SOURCE = gst-omx-$(GST_OMX_VERSION).tar.xz GST_OMX_SITE = https://gstreamer.freedesktop.org/src/gst-omx From peter at korsgaard.com Wed Feb 16 20:58:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:58:34 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gstreamer1-editing-services: bump version to 1.18.6 Message-ID: <20220216205312.8CBCB836A6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=79c424facdecd47972afbd26310d1f76b58aaf50 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit aa87c2e1689b920052ee4a802e24ca342d8f9651) Signed-off-by: Peter Korsgaard --- .../gstreamer1-editing-services/gstreamer1-editing-services.hash | 4 ++-- .../gstreamer1-editing-services/gstreamer1-editing-services.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash index daaf729c70..e29dc112ce 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash @@ -1,5 +1,5 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.18.5.tar.xz.sha256sum -sha256 8af4a8394d051f3e18280686db49a6efaccc95c0c59a17f0f564e32000590df5 gst-editing-services-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.18.6.tar.xz.sha256sum +sha256 fe10d14ef896aa21038317f6f81e1158ccc6caaed9b0d5a29ae5bdd63074582c gst-editing-services-1.18.6.tar.xz # Hashes for license files: sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk index d3de79c5f6..a3722cbbca 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_EDITING_SERVICES_VERSION = 1.18.5 +GSTREAMER1_EDITING_SERVICES_VERSION = 1.18.6 GSTREAMER1_EDITING_SERVICES_SOURCE = gst-editing-services-$(GSTREAMER1_EDITING_SERVICES_VERSION).tar.xz GSTREAMER1_EDITING_SERVICES_SITE = https://gstreamer.freedesktop.org/src/gstreamer-editing-services GSTREAMER1_EDITING_SERVICES_LICENSE = LGPL-2.0+ From peter at korsgaard.com Wed Feb 16 20:58:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:58:35 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gst1-python: bump version to 1.18.6 Message-ID: <20220216205312.9EBF583607@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=257b355bba4750c84e8b4ccf4e590f1b18f0bbfb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit dc66c5901cbc912941f26275aac0f4b3fe6cf596) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-python/gst1-python.hash | 4 ++-- package/gstreamer1/gst1-python/gst1-python.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-python/gst1-python.hash b/package/gstreamer1/gst1-python/gst1-python.hash index 2035c81fea..a760e53e7d 100644 --- a/package/gstreamer1/gst1-python/gst1-python.hash +++ b/package/gstreamer1/gst1-python/gst1-python.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.18.5.tar.xz.sha256sum -sha256 533685871305959d6db89507f3b3aa6c765c2f2b0dacdc32c5a6543e72e5bc52 gst-python-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.18.6.tar.xz.sha256sum +sha256 bdc0ea22fbd7335ad9decc151561aacc53c51206a9735b81eac700ce5b0bbd4a gst-python-1.18.6.tar.xz sha256 ea3ad127610e5ded2210b3a86a46314f2b3b28e438eccffdae19a4d6fbcdb0c2 COPYING diff --git a/package/gstreamer1/gst1-python/gst1-python.mk b/package/gstreamer1/gst1-python/gst1-python.mk index 614cb22396..7faab752cd 100644 --- a/package/gstreamer1/gst1-python/gst1-python.mk +++ b/package/gstreamer1/gst1-python/gst1-python.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PYTHON_VERSION = 1.18.5 +GST1_PYTHON_VERSION = 1.18.6 GST1_PYTHON_SOURCE = gst-python-$(GST1_PYTHON_VERSION).tar.xz GST1_PYTHON_SITE = https://gstreamer.freedesktop.org/src/gst-python GST1_PYTHON_INSTALL_STAGING = YES From peter at korsgaard.com Wed Feb 16 20:58:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:58:33 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gst1-rtsp-server: bump version to 1.18.6 Message-ID: <20220216205312.844CE836A6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8af5c11205753ea37838eeec20c354a2952747e8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit 56c0d7b8867228bb44e76f4bf296e27202d10f13) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash | 4 ++-- package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash index 627a451d04..fadef41351 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash @@ -1,4 +1,4 @@ -# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.18.5.tar.xz.sha256sum -sha256 04d63bf48816c6f41c73f6de0f912a7cef0aab39c44162a7bcece1923dfc9d1f gst-rtsp-server-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.18.6.tar.xz.sha256sum +sha256 826f32afbcf94b823541efcac4a0dacdb62f6145ef58f363095749f440262be9 gst-rtsp-server-1.18.6.tar.xz sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING.LIB diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk index 37942423a5..55403754f3 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_RTSP_SERVER_VERSION = 1.18.5 +GST1_RTSP_SERVER_VERSION = 1.18.6 GST1_RTSP_SERVER_SOURCE = gst-rtsp-server-$(GST1_RTSP_SERVER_VERSION).tar.xz GST1_RTSP_SERVER_SITE = http://gstreamer.freedesktop.org/src/gst-rtsp-server GST1_RTSP_SERVER_LICENSE = LGPL-2.0+ From yann.morin.1998 at free.fr Wed Feb 16 21:02:17 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Feb 2022 22:02:17 +0100 Subject: [Buildroot] [git commit] package/python-pycli: fix build with python >= 3.10 Message-ID: <20220216205442.EC426836B5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b2e6e376a2d7551ccf146855ec4e99a65c35bd16 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 due to the new "Multiple Exception types without parentheses" exception (https://docs.python.org/3/whatsnew/3.10.html) error: File "/usr/lib/python3.10/site-packages/cli/app.py", line 242 except Exception, e: ^^^^^^^^^^^^ SyntaxError: multiple exception types must be parenthesized Fixes: - http://autobuild.buildroot.org/results/8d7b0c23472abffc9447e4a6de273bdd04486d39 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...-re-raise-exceptions-in-wrapped-functions.patch | 26 ++++++++++++++ ...-except-statement-changed-slightly-in-2-6.patch | 41 ++++++++++++++++++++++ 2 files changed, 67 insertions(+) diff --git a/package/python-pycli/0001-Fix-problem-with-re-raise-exceptions-in-wrapped-functions.patch b/package/python-pycli/0001-Fix-problem-with-re-raise-exceptions-in-wrapped-functions.patch new file mode 100644 index 0000000000..7ac9d7af9f --- /dev/null +++ b/package/python-pycli/0001-Fix-problem-with-re-raise-exceptions-in-wrapped-functions.patch @@ -0,0 +1,26 @@ +From 57c563f8b47a56feefc0a8bcbef05f4b54280549 Mon Sep 17 00:00:00 2001 +From: mmbutter +Date: Tue, 9 Jun 2020 11:50:41 -0500 +Subject: [PATCH] Fix problem with re-raise exceptions in wrapped functions. + +[Retrieved from: +https://github.com/whilp/cli/commit/57c563f8b47a56feefc0a8bcbef05f4b54280549] +Signed-off-by: Fabrice Fontaine +--- + lib/cli/app.py | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/lib/cli/app.py b/lib/cli/app.py +index 7b6db52..f487ab4 100644 +--- a/lib/cli/app.py ++++ b/lib/cli/app.py +@@ -240,6 +240,9 @@ def run(self): + try: + returned = self.main(*args) + except Exception, e: ++ elif isinstance(e, self.reraise): ++ # raising the last exception preserves traceback ++ raise + returned = e + + return self.post_run(returned) diff --git a/package/python-pycli/0002-except-statement-changed-slightly-in-2-6.patch b/package/python-pycli/0002-except-statement-changed-slightly-in-2-6.patch new file mode 100644 index 0000000000..75869d6d23 --- /dev/null +++ b/package/python-pycli/0002-except-statement-changed-slightly-in-2-6.patch @@ -0,0 +1,41 @@ +From 2af95cff5609142ec14efdf13b394f9b0121ab2e Mon Sep 17 00:00:00 2001 +From: mmbutter +Date: Thu, 11 Jun 2020 15:50:03 -0500 +Subject: [PATCH] except statement changed slightly in 2.6. This could cause + problems in newer versions. Updated to the new format. + +[Retrieved from: +https://github.com/whilp/cli/commit/2af95cff5609142ec14efdf13b394f9b0121ab2e] +Signed-off-by: Fabrice Fontaine +--- + lib/cli/app.py | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/lib/cli/app.py b/lib/cli/app.py +index f487ab4..45256b8 100644 +--- a/lib/cli/app.py ++++ b/lib/cli/app.py +@@ -239,10 +239,10 @@ def run(self): + args = () + try: + returned = self.main(*args) +- except Exception, e: +- elif isinstance(e, self.reraise): +- # raising the last exception preserves traceback +- raise ++ except self.reraise: ++ # raising the last exception preserves traceback ++ raise ++ except Exception as e: + returned = e + + return self.post_run(returned) +@@ -420,7 +420,7 @@ def pre_run(self): + """ + try: + ns = self.argparser.parse_args() +- except SystemExit, e: ++ except SystemExit as e: + if self.exit_after_main: + raise + else: From peter at korsgaard.com Wed Feb 16 21:02:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 22:02:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/tiff: fix CVE-2022-22844 In-Reply-To: <20220205141448.420553-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 5 Feb 2022 15:14:48 +0100") References: <20220205141448.420553-1-fontaine.fabrice@gmail.com> Message-ID: <878ruah6e9.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > LibTIFF 4.3.0 has an out-of-bounds read in _TIFFmemcpy in tif_unix.c in > certain situations involving a custom tag and 0x0200 as the second word > of the DE field. > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 16 21:02:11 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 22:02:11 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/tiff: fix CVE-2022-22844 Message-ID: <20220216205448.D2118836BA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=faa5ad2c438c63245f4e01830388b27e99c3bc0e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x LibTIFF 4.3.0 has an out-of-bounds read in _TIFFmemcpy in tif_unix.c in certain situations involving a custom tag and 0x0200 as the second word of the DE field. Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 7ec5f99b3a00a1ec4dd6677a0ee6418267ffba25) Signed-off-by: Peter Korsgaard --- ...fix-global-buffer-overflow-for-ASCII-tags.patch | 43 ++++++++++++++++++++++ package/tiff/tiff.mk | 4 ++ 2 files changed, 47 insertions(+) diff --git a/package/tiff/0001-tiffset-fix-global-buffer-overflow-for-ASCII-tags.patch b/package/tiff/0001-tiffset-fix-global-buffer-overflow-for-ASCII-tags.patch new file mode 100644 index 0000000000..ba1487782e --- /dev/null +++ b/package/tiff/0001-tiffset-fix-global-buffer-overflow-for-ASCII-tags.patch @@ -0,0 +1,43 @@ +From 03047a26952a82daaa0792957ce211e0aa51bc64 Mon Sep 17 00:00:00 2001 +From: 4ugustus +Date: Tue, 25 Jan 2022 16:25:28 +0000 +Subject: [PATCH] tiffset: fix global-buffer-overflow for ASCII tags where + count is required (fixes #355) + +[Retrieved from: +https://gitlab.com/libtiff/libtiff/-/commit/03047a26952a82daaa0792957ce211e0aa51bc64] +Signed-off-by: Fabrice Fontaine +--- + tools/tiffset.c | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) + +diff --git a/tools/tiffset.c b/tools/tiffset.c +index 8c9e23c5..e7a88c09 100644 +--- a/tools/tiffset.c ++++ b/tools/tiffset.c +@@ -146,9 +146,19 @@ main(int argc, char* argv[]) + + arg_index++; + if (TIFFFieldDataType(fip) == TIFF_ASCII) { +- if (TIFFSetField(tiff, TIFFFieldTag(fip), argv[arg_index]) != 1) +- fprintf( stderr, "Failed to set %s=%s\n", +- TIFFFieldName(fip), argv[arg_index] ); ++ if(TIFFFieldPassCount( fip )) { ++ size_t len; ++ len = strlen(argv[arg_index]) + 1; ++ if (len > UINT16_MAX || TIFFSetField(tiff, TIFFFieldTag(fip), ++ (uint16_t)len, argv[arg_index]) != 1) ++ fprintf( stderr, "Failed to set %s=%s\n", ++ TIFFFieldName(fip), argv[arg_index] ); ++ } else { ++ if (TIFFSetField(tiff, TIFFFieldTag(fip), ++ argv[arg_index]) != 1) ++ fprintf( stderr, "Failed to set %s=%s\n", ++ TIFFFieldName(fip), argv[arg_index] ); ++ } + } else if (TIFFFieldWriteCount(fip) > 0 + || TIFFFieldWriteCount(fip) == TIFF_VARIABLE) { + int ret = 1; +-- +GitLab + diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index f6c6de12c5..f80ab7ac55 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -11,6 +11,10 @@ TIFF_LICENSE_FILES = COPYRIGHT TIFF_CPE_ID_VENDOR = libtiff TIFF_CPE_ID_PRODUCT = libtiff TIFF_INSTALL_STAGING = YES + +# 0001-tiffset-fix-global-buffer-overflow-for-ASCII-tags.patch +TIFF_IGNORE_CVES += CVE-2022-22844 + TIFF_CONF_OPTS = \ --disable-cxx \ --without-x From peter at korsgaard.com Wed Feb 16 21:02:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 22:02:06 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/tiff: bump to version 4.3.0 Message-ID: <20220216205448.C645B836BD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=33169da5d5b81da72a4eccd23fa6b1a2b5955895 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Update indentation in hash file (two spaces) https://gitlab.com/libtiff/libtiff/-/blob/v4.3.0/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 29b5fe6895dcf38eea51bc68baf7310950c4d401) Signed-off-by: Peter Korsgaard --- package/tiff/tiff.hash | 4 ++-- package/tiff/tiff.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/tiff/tiff.hash b/package/tiff/tiff.hash index 472ec40e55..ea08a1fc92 100644 --- a/package/tiff/tiff.hash +++ b/package/tiff/tiff.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 eb0484e568ead8fa23b513e9b0041df7e327f4ee2d22db5a533929dfc19633cb tiff-4.2.0.tar.gz -sha256 fbd6fed7938541d2c809c0826225fc85e551fdbfa8732b10f0c87e0847acafd7 COPYRIGHT +sha256 0e46e5acb087ce7d1ac53cf4f56a09b221537fc86dfc5daaad1c2e89e1b37ac8 tiff-4.3.0.tar.gz +sha256 fbd6fed7938541d2c809c0826225fc85e551fdbfa8732b10f0c87e0847acafd7 COPYRIGHT diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index c3d8045144..f6c6de12c5 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIFF_VERSION = 4.2.0 +TIFF_VERSION = 4.3.0 TIFF_SITE = http://download.osgeo.org/libtiff TIFF_LICENSE = tiff license TIFF_LICENSE_FILES = COPYRIGHT From peter at korsgaard.com Wed Feb 16 21:01:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 22:01:24 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/tiff: fix CVE-2022-22844 Message-ID: <20220216205502.0CD22836CA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1e25ae6943e9d62819f690bee46ccba24081f8b8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x LibTIFF 4.3.0 has an out-of-bounds read in _TIFFmemcpy in tif_unix.c in certain situations involving a custom tag and 0x0200 as the second word of the DE field. Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 7ec5f99b3a00a1ec4dd6677a0ee6418267ffba25) Signed-off-by: Peter Korsgaard --- ...fix-global-buffer-overflow-for-ASCII-tags.patch | 43 ++++++++++++++++++++++ package/tiff/tiff.mk | 4 ++ 2 files changed, 47 insertions(+) diff --git a/package/tiff/0001-tiffset-fix-global-buffer-overflow-for-ASCII-tags.patch b/package/tiff/0001-tiffset-fix-global-buffer-overflow-for-ASCII-tags.patch new file mode 100644 index 0000000000..ba1487782e --- /dev/null +++ b/package/tiff/0001-tiffset-fix-global-buffer-overflow-for-ASCII-tags.patch @@ -0,0 +1,43 @@ +From 03047a26952a82daaa0792957ce211e0aa51bc64 Mon Sep 17 00:00:00 2001 +From: 4ugustus +Date: Tue, 25 Jan 2022 16:25:28 +0000 +Subject: [PATCH] tiffset: fix global-buffer-overflow for ASCII tags where + count is required (fixes #355) + +[Retrieved from: +https://gitlab.com/libtiff/libtiff/-/commit/03047a26952a82daaa0792957ce211e0aa51bc64] +Signed-off-by: Fabrice Fontaine +--- + tools/tiffset.c | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) + +diff --git a/tools/tiffset.c b/tools/tiffset.c +index 8c9e23c5..e7a88c09 100644 +--- a/tools/tiffset.c ++++ b/tools/tiffset.c +@@ -146,9 +146,19 @@ main(int argc, char* argv[]) + + arg_index++; + if (TIFFFieldDataType(fip) == TIFF_ASCII) { +- if (TIFFSetField(tiff, TIFFFieldTag(fip), argv[arg_index]) != 1) +- fprintf( stderr, "Failed to set %s=%s\n", +- TIFFFieldName(fip), argv[arg_index] ); ++ if(TIFFFieldPassCount( fip )) { ++ size_t len; ++ len = strlen(argv[arg_index]) + 1; ++ if (len > UINT16_MAX || TIFFSetField(tiff, TIFFFieldTag(fip), ++ (uint16_t)len, argv[arg_index]) != 1) ++ fprintf( stderr, "Failed to set %s=%s\n", ++ TIFFFieldName(fip), argv[arg_index] ); ++ } else { ++ if (TIFFSetField(tiff, TIFFFieldTag(fip), ++ argv[arg_index]) != 1) ++ fprintf( stderr, "Failed to set %s=%s\n", ++ TIFFFieldName(fip), argv[arg_index] ); ++ } + } else if (TIFFFieldWriteCount(fip) > 0 + || TIFFFieldWriteCount(fip) == TIFF_VARIABLE) { + int ret = 1; +-- +GitLab + diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index f6c6de12c5..f80ab7ac55 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -11,6 +11,10 @@ TIFF_LICENSE_FILES = COPYRIGHT TIFF_CPE_ID_VENDOR = libtiff TIFF_CPE_ID_PRODUCT = libtiff TIFF_INSTALL_STAGING = YES + +# 0001-tiffset-fix-global-buffer-overflow-for-ASCII-tags.patch +TIFF_IGNORE_CVES += CVE-2022-22844 + TIFF_CONF_OPTS = \ --disable-cxx \ --without-x From yann.morin.1998 at free.fr Wed Feb 16 21:02:51 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Feb 2022 22:02:51 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/python-pycli: fix build with python >= 3.10 In-Reply-To: <20220215132909.2360674-1-fontaine.fabrice@gmail.com> References: <20220215132909.2360674-1-fontaine.fabrice@gmail.com> Message-ID: <20220216210251.GB522310@scaer> Fabrice, All, On 2022-02-15 14:29 +0100, Fabrice Fontaine spake thusly: > Fix the following build failure raised since bump of python3 to version > 3.10.1 in commit 25b1fc2898d68ddf2674b14c738045875fc5a2dc due to the new > "Multiple Exception types without parentheses" exception > (https://docs.python.org/3/whatsnew/3.10.html) > > error: File "/usr/lib/python3.10/site-packages/cli/app.py", line 242 > except Exception, e: > ^^^^^^^^^^^^ > SyntaxError: multiple exception types must be parenthesized > > Fixes: > - http://autobuild.buildroot.org/results/8d7b0c23472abffc9447e4a6de273bdd04486d39 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > Changes v1 -> v2: > - Add upstream commits instead of dropping package (even if repository > has been archived) > > ...aise-exceptions-in-wrapped-functions.patch | 26 ++++++++++++ > ...pt-statement-changed-slightly-in-2-6.patch | 41 +++++++++++++++++++ > 2 files changed, 67 insertions(+) > create mode 100644 package/python-pycli/0001-Fix-problem-with-re-raise-exceptions-in-wrapped-functions.patch > create mode 100644 package/python-pycli/0002-except-statement-changed-slightly-in-2-6.patch > > diff --git a/package/python-pycli/0001-Fix-problem-with-re-raise-exceptions-in-wrapped-functions.patch b/package/python-pycli/0001-Fix-problem-with-re-raise-exceptions-in-wrapped-functions.patch > new file mode 100644 > index 0000000000..7ac9d7af9f > --- /dev/null > +++ b/package/python-pycli/0001-Fix-problem-with-re-raise-exceptions-in-wrapped-functions.patch > @@ -0,0 +1,26 @@ > +From 57c563f8b47a56feefc0a8bcbef05f4b54280549 Mon Sep 17 00:00:00 2001 > +From: mmbutter > +Date: Tue, 9 Jun 2020 11:50:41 -0500 > +Subject: [PATCH] Fix problem with re-raise exceptions in wrapped functions. > + > +[Retrieved from: > +https://github.com/whilp/cli/commit/57c563f8b47a56feefc0a8bcbef05f4b54280549] > +Signed-off-by: Fabrice Fontaine > +--- > + lib/cli/app.py | 3 +++ > + 1 file changed, 3 insertions(+) > + > +diff --git a/lib/cli/app.py b/lib/cli/app.py > +index 7b6db52..f487ab4 100644 > +--- a/lib/cli/app.py > ++++ b/lib/cli/app.py > +@@ -240,6 +240,9 @@ def run(self): > + try: > + returned = self.main(*args) > + except Exception, e: > ++ elif isinstance(e, self.reraise): > ++ # raising the last exception preserves traceback > ++ raise > + returned = e > + > + return self.post_run(returned) > diff --git a/package/python-pycli/0002-except-statement-changed-slightly-in-2-6.patch b/package/python-pycli/0002-except-statement-changed-slightly-in-2-6.patch > new file mode 100644 > index 0000000000..75869d6d23 > --- /dev/null > +++ b/package/python-pycli/0002-except-statement-changed-slightly-in-2-6.patch > @@ -0,0 +1,41 @@ > +From 2af95cff5609142ec14efdf13b394f9b0121ab2e Mon Sep 17 00:00:00 2001 > +From: mmbutter > +Date: Thu, 11 Jun 2020 15:50:03 -0500 > +Subject: [PATCH] except statement changed slightly in 2.6. This could cause > + problems in newer versions. Updated to the new format. > + > +[Retrieved from: > +https://github.com/whilp/cli/commit/2af95cff5609142ec14efdf13b394f9b0121ab2e] > +Signed-off-by: Fabrice Fontaine > +--- > + lib/cli/app.py | 10 +++++----- > + 1 file changed, 5 insertions(+), 5 deletions(-) > + > +diff --git a/lib/cli/app.py b/lib/cli/app.py > +index f487ab4..45256b8 100644 > +--- a/lib/cli/app.py > ++++ b/lib/cli/app.py > +@@ -239,10 +239,10 @@ def run(self): > + args = () > + try: > + returned = self.main(*args) > +- except Exception, e: > +- elif isinstance(e, self.reraise): > +- # raising the last exception preserves traceback > +- raise > ++ except self.reraise: > ++ # raising the last exception preserves traceback > ++ raise > ++ except Exception as e: > + returned = e > + > + return self.post_run(returned) > +@@ -420,7 +420,7 @@ def pre_run(self): > + """ > + try: > + ns = self.argparser.parse_args() > +- except SystemExit, e: > ++ except SystemExit as e: > + if self.exit_after_main: > + raise > + else: > -- > 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 Wed Feb 16 21:03:57 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 22:03:57 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/vim: security bump to version 8.2.4301 Message-ID: <20220216205622.5B1D7836D1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1db408a3512719b3cb6da649be539de9a047b462 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix CVE-2022-0393: Out-of-bounds Read in GitHub repository vim/vim prior to 8.2. Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 18a19c985f3363510d8ae317e66d53680475db26) 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 49056b31cd..fa3ca53cc8 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 8770c6308a6c0b0f8b93a4d7202451d195b4efad17787c0306f0be60947732c4 vim-8.2.4224.tar.gz +sha256 b40b4e341de6b65cdeacd4c816dea8fe5e3b385ee5e17af73fc69c00bd7c440b vim-8.2.4301.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index 74ab1ec584..98a5f153a8 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 8.2.4224 +VIM_VERSION = 8.2.4301 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src From peter at korsgaard.com Wed Feb 16 21:03:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 22:03:35 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/vim: security bump to version 8.2.4301 Message-ID: <20220216205626.B7ADB836D7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1c5f3083c71764bb1f6997deb5e98ebf298c8e2d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix CVE-2022-0393: Out-of-bounds Read in GitHub repository vim/vim prior to 8.2. Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 18a19c985f3363510d8ae317e66d53680475db26) 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 49056b31cd..fa3ca53cc8 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 8770c6308a6c0b0f8b93a4d7202451d195b4efad17787c0306f0be60947732c4 vim-8.2.4224.tar.gz +sha256 b40b4e341de6b65cdeacd4c816dea8fe5e3b385ee5e17af73fc69c00bd7c440b vim-8.2.4301.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index 74ab1ec584..98a5f153a8 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 8.2.4224 +VIM_VERSION = 8.2.4301 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src From peter at korsgaard.com Wed Feb 16 21:04:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 22:04:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/vim: security bump to version 8.2.4301 In-Reply-To: <20220205145716.459582-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 5 Feb 2022 15:57:16 +0100") References: <20220205145716.459582-1-fontaine.fabrice@gmail.com> Message-ID: <874k4yh6b2.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2022-0393: Out-of-bounds Read in GitHub repository vim/vim prior > to 8.2. > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 16 21:04:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 22:04:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/vim: security bump to version 8.2.4301 In-Reply-To: <874k4yh6b2.fsf@dell.be.48ers.dk> (Peter Korsgaard's message of "Wed, 16 Feb 2022 22:04:17 +0100") References: <20220205145716.459582-1-fontaine.fabrice@gmail.com> <874k4yh6b2.fsf@dell.be.48ers.dk> Message-ID: <87zgmqfrpz.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: >>>>> "Fabrice" == Fabrice Fontaine writes: >> Fix CVE-2022-0393: Out-of-bounds Read in GitHub repository vim/vim prior >> to 8.2. >> Signed-off-by: Fabrice Fontaine > Committed to 2021.02.x and 2021.11.x, thanks. (v2 that is). -- Bye, Peter Korsgaard From yann.morin.1998 at free.fr Wed Feb 16 21:05:54 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Feb 2022 22:05:54 +0100 Subject: [Buildroot] [git commit] package/qt5/qt5webkit: needs execinfo.h Message-ID: <20220216205835.D733E836E6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c7d3f5cd9f39caead1ae4aedda42a48343571b57 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master qt5webkit needs execinfo.h since bump to version 5.212.0-alpha4 in commit df0b0fe6919c0d0f3750f439a3cfa765232bd569: /tmp/instance-1/output-1/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp:54:10: fatal error: execinfo.h: No such file or directory 54 | #include | ^~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/351529f7d928e28fa2db22c6297dc70d21db562b Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/qt5/qt5webkit/Config.in | 1 + package/qt5/qt5webkit/qt5webkit.mk | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in index 68b679dfcd..ed87efca95 100644 --- a/package/qt5/qt5webkit/Config.in +++ b/package/qt5/qt5webkit/Config.in @@ -21,6 +21,7 @@ config BR2_PACKAGE_QT5WEBKIT select BR2_PACKAGE_QT5LOCATION select BR2_PACKAGE_QT5SENSORS select BR2_PACKAGE_QT5WEBCHANNEL + select BR2_PACKAGE_LIBEXECINFO if !BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_LIBXSLT select BR2_PACKAGE_SQLITE diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk index 565c57e813..2e96acc00f 100644 --- a/package/qt5/qt5webkit/qt5webkit.mk +++ b/package/qt5/qt5webkit/qt5webkit.mk @@ -38,6 +38,10 @@ ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5WEBKIT_DEPENDENCIES += qt5declarative endif +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +QT5WEBKIT_DEPENDENCIES += libexecinfo +endif + QT5WEBKIT_CONF_OPTS += \ -DENABLE_TOOLS=OFF \ -DPORT=Qt \ From yann.morin.1998 at free.fr Wed Feb 16 21:07:32 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Feb 2022 22:07:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5webkit: needs execinfo.h In-Reply-To: <20220214213226.4143188-1-fontaine.fabrice@gmail.com> References: <20220214213226.4143188-1-fontaine.fabrice@gmail.com> Message-ID: <20220216210732.GC522310@scaer> Fabrice, All, On 2022-02-14 22:32 +0100, Fabrice Fontaine spake thusly: > qt5webkit needs execinfo.h since bump to version 5.212.0-alpha4 in > commit df0b0fe6919c0d0f3750f439a3cfa765232bd569: > > /tmp/instance-1/output-1/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp:54:10: fatal error: execinfo.h: No such file or directory > 54 | #include > | ^~~~~~~~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/351529f7d928e28fa2db22c6297dc70d21db562b > > Signed-off-by: Fabrice Fontaine > --- > package/qt5/qt5webkit/Config.in | 1 + > package/qt5/qt5webkit/qt5webkit.mk | 3 ++- > 2 files changed, 3 insertions(+), 1 deletion(-) > > diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in > index 68b679dfcd..ed87efca95 100644 > --- a/package/qt5/qt5webkit/Config.in > +++ b/package/qt5/qt5webkit/Config.in > @@ -21,6 +21,7 @@ config BR2_PACKAGE_QT5WEBKIT > select BR2_PACKAGE_QT5LOCATION > select BR2_PACKAGE_QT5SENSORS > select BR2_PACKAGE_QT5WEBCHANNEL > + select BR2_PACKAGE_LIBEXECINFO if !BR2_TOOLCHAIN_USES_GLIBC > select BR2_PACKAGE_LIBXML2 > select BR2_PACKAGE_LIBXSLT > select BR2_PACKAGE_SQLITE > diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk > index 565c57e813..2084f3af52 100644 > --- a/package/qt5/qt5webkit/qt5webkit.mk > +++ b/package/qt5/qt5webkit/qt5webkit.mk > @@ -10,7 +10,8 @@ QT5WEBKIT_SOURCE = qtwebkit-$(QT5WEBKIT_VERSION).tar.xz > QT5WEBKIT_DEPENDENCIES = \ > 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 > + qt5sensors qt5webchannel sqlite webp woff2 \ > + $(if $(BR2_PACKAGE_LIBEXECINFO),libexecinfo) There already are optional dependencies that are handled as a conditional block, further down the file, so I changed this new dependency to match the existing style. Applied to master, thanks. Regards, Yann E. MORIN. > QT5WEBKIT_INSTALL_STAGING = YES > > QT5WEBKIT_LICENSE_FILES = Source/WebCore/LICENSE-LGPL-2 Source/WebCore/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 Feb 16 21:11:45 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Feb 2022 22:11:45 +0100 Subject: [Buildroot] [git commit] package/dnsmasq: fix build with ubus and without dnssec Message-ID: <20220216210442.6CE8C836ED@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6f0e2e567f7245705445a922b1529ea4f7b6b4a5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since bump to version 2.86 in commit 5b29096f8fcb0acd8890073a56ba9d620b1f911c: rfc1035.c: In function 'report_addresses': rfc1035.c:978:49: error: 'struct dnsmasq_daemon' has no member named 'workspacename' 978 | if (!extract_name(header, len, &p, daemon->workspacename, 1, 0)) | ^~ Fixes: - http://autobuild.buildroot.org/results/51242d4f532373544e3c7ea45036b8d41390b29b Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...S-but-not-DNSSEC-compile-options-selected.patch | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/package/dnsmasq/0003-Fix-FTBFS-when-CONNTRACK-and-UBUS-but-not-DNSSEC-compile-options-selected.patch b/package/dnsmasq/0003-Fix-FTBFS-when-CONNTRACK-and-UBUS-but-not-DNSSEC-compile-options-selected.patch new file mode 100644 index 0000000000..9c98af2be5 --- /dev/null +++ b/package/dnsmasq/0003-Fix-FTBFS-when-CONNTRACK-and-UBUS-but-not-DNSSEC-compile-options-selected.patch @@ -0,0 +1,34 @@ +From 2c60441239e1c10c4987cb586653b1ea08f703c0 Mon Sep 17 00:00:00 2001 +From: Simon Kelley +Date: Tue, 28 Sep 2021 23:42:15 +0100 +Subject: [PATCH] Fix FTBFS when CONNTRACK and UBUS but not DNSSEC compile + options selected. + +[Retrieved from: +https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=2c60441239e1c10c4987cb586653b1ea08f703c0] +Signed-off-by: Fabrice Fontaine +--- + src/dnsmasq.h | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/dnsmasq.h b/src/dnsmasq.h +index c8a918a..3fdc1b0 100644 +--- a/src/dnsmasq.h ++++ b/src/dnsmasq.h +@@ -1173,9 +1173,12 @@ extern struct daemon { + char *packet; /* packet buffer */ + int packet_buff_sz; /* size of above */ + char *namebuff; /* MAXDNAME size buffer */ ++#if (defined(HAVE_CONNTRACK) && defined(HAVE_UBUS)) || defined(HAVE_DNSSEC) ++ /* CONNTRACK UBUS code uses this buffer, as well as DNSSEC code. */ ++ char *workspacename; ++#endif + #ifdef HAVE_DNSSEC + char *keyname; /* MAXDNAME size buffer */ +- char *workspacename; /* ditto */ + unsigned long *rr_status; /* ceiling in TTL from DNSSEC or zero for insecure */ + int rr_status_sz; + int dnssec_no_time_check; +-- +2.20.1 + From yann.morin.1998 at free.fr Wed Feb 16 21:13:44 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Feb 2022 22:13:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/dnsmasq: fix build with ubus and without dnssec In-Reply-To: <20220214132944.2471362-1-fontaine.fabrice@gmail.com> References: <20220214132944.2471362-1-fontaine.fabrice@gmail.com> Message-ID: <20220216211344.GD522310@scaer> Fabrice, All, On 2022-02-14 14:29 +0100, Fabrice Fontaine spake thusly: > Fix the following build failure raised since bump to version 2.86 in > commit 5b29096f8fcb0acd8890073a56ba9d620b1f911c: > > rfc1035.c: In function 'report_addresses': > rfc1035.c:978:49: error: 'struct dnsmasq_daemon' has no member named 'workspacename' > 978 | if (!extract_name(header, len, &p, daemon->workspacename, 1, 0)) > | ^~ > > Fixes: > - http://autobuild.buildroot.org/results/51242d4f532373544e3c7ea45036b8d41390b29b > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...-not-DNSSEC-compile-options-selected.patch | 34 +++++++++++++++++++ > 1 file changed, 34 insertions(+) > create mode 100644 package/dnsmasq/0003-Fix-FTBFS-when-CONNTRACK-and-UBUS-but-not-DNSSEC-compile-options-selected.patch > > diff --git a/package/dnsmasq/0003-Fix-FTBFS-when-CONNTRACK-and-UBUS-but-not-DNSSEC-compile-options-selected.patch b/package/dnsmasq/0003-Fix-FTBFS-when-CONNTRACK-and-UBUS-but-not-DNSSEC-compile-options-selected.patch > new file mode 100644 > index 0000000000..9c98af2be5 > --- /dev/null > +++ b/package/dnsmasq/0003-Fix-FTBFS-when-CONNTRACK-and-UBUS-but-not-DNSSEC-compile-options-selected.patch > @@ -0,0 +1,34 @@ > +From 2c60441239e1c10c4987cb586653b1ea08f703c0 Mon Sep 17 00:00:00 2001 > +From: Simon Kelley > +Date: Tue, 28 Sep 2021 23:42:15 +0100 > +Subject: [PATCH] Fix FTBFS when CONNTRACK and UBUS but not DNSSEC compile > + options selected. > + > +[Retrieved from: > +https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=2c60441239e1c10c4987cb586653b1ea08f703c0] > +Signed-off-by: Fabrice Fontaine > +--- > + src/dnsmasq.h | 5 ++++- > + 1 file changed, 4 insertions(+), 1 deletion(-) > + > +diff --git a/src/dnsmasq.h b/src/dnsmasq.h > +index c8a918a..3fdc1b0 100644 > +--- a/src/dnsmasq.h > ++++ b/src/dnsmasq.h > +@@ -1173,9 +1173,12 @@ extern struct daemon { > + char *packet; /* packet buffer */ > + int packet_buff_sz; /* size of above */ > + char *namebuff; /* MAXDNAME size buffer */ > ++#if (defined(HAVE_CONNTRACK) && defined(HAVE_UBUS)) || defined(HAVE_DNSSEC) > ++ /* CONNTRACK UBUS code uses this buffer, as well as DNSSEC code. */ > ++ char *workspacename; > ++#endif > + #ifdef HAVE_DNSSEC > + char *keyname; /* MAXDNAME size buffer */ > +- char *workspacename; /* ditto */ > + unsigned long *rr_status; /* ceiling in TTL from DNSSEC or zero for insecure */ > + int rr_status_sz; > + int dnssec_no_time_check; > +-- > +2.20.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 arnout at mind.be Wed Feb 16 21:22:46 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 16 Feb 2022 22:22:46 +0100 Subject: [Buildroot] [PATCH v3 1/2] package/python-flit-core: new package/infrastructure In-Reply-To: <20220212113407.1213446-1-james.hilliard1@gmail.com> References: <20220212113407.1213446-1-james.hilliard1@gmail.com> Message-ID: <65664f13-83f9-a0d5-a67d-f27ed09af323@mind.be> Hi James, Both applied to next, but with modifications. On 12/02/2022 12:34, James Hilliard wrote: > 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. The installer script is not super nice. We could instead use host-python-pip, but this works as well, so OK. > We also need to add a patch fixing the version parser in flit-core. > > Signed-off-by: James Hilliard > --- > Changes v1 -> v2: > - rebase on master > --- > 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 bf0649fc9c..d574bfa2b0 100644 > --- a/package/pkg-python.mk > +++ b/package/pkg-python.mk > @@ -94,6 +94,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)" \ Indentation is with tab, not spaces. check-package doesn't warn about it because there are some remaining spaces for indenting conditions. > + PATH=$(BR_PATH) \ > + $(TARGET_CONFIGURE_OPTS) \ > + PYTHONPATH="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_PATH),$(PYTHON_PATH))" \ With the removal of python2, PYTHON_PATH should no longer be used. And this setup type is anyway python3 only. > + 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 > @@ -143,6 +184,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 = No need to define empty variables. > +$(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'") This should be extended with the new types. > endif > @@ -163,6 +217,12 @@ endif # ($(4),target) > # > ifeq ($$($(2)_SETUP_TYPE),setuptools) > $(2)_DEPENDENCIES += $$(if $$(filter host-python-setuptools,$(1)),,host-python-setuptools) > +else ifneq ($$(filter flit pep517,$$($(2)_SETUP_TYPE)),) > +$(2)_DEPENDENCIES += $$(if $$(filter host-python-pypa-build,$(1)),,host-python-pypa-build) No need for this filtering. It's there for setuptools because setuptools uses setup type setuptools itself, so it creates a circular dependency. pypa-build, installer and flit-core don't have that issue. > +$(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. > @@ -174,6 +234,15 @@ $(2)_PYTHON_INTERPRETER = $$(HOST_DIR)/bin/python > # 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)) Repeating the build commands completely defeats the purpose of those variables. Therefore, I've added an additional preparatory commit that moves the "-m build -n" part into the _BUILD_TGT variable. Check the git history to see how it's done. > +endef > +else > define $(2)_BUILD_CMDS > (cd $$($$(PKG)_BUILDDIR)/; \ > $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ > @@ -182,12 +251,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/* \ I haven't changed this, but shouldn't this be dist/*.whl just to be safe? > + $$($$(PKG)_BASE_INSTALL_OPTS) $$($$(PKG)_INSTALL_OPTS)) > +endef > +else > define $(2)_INSTALL_CMDS > (cd $$($$(PKG)_BUILDDIR)/; \ > $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ [snip] > 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 No longer exists. > +HOST_PYTHON_FLIT_CORE_DEPENDENCIES = host-python-pypa-build This is now added automatically by the infra. Regards, Arnout > + > +$(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", > + ) This is a bit more generic than what we need, which makes me think you copied it from somewhere. If that is the case, you should include a copyright notice at the beginning of the file, including (very important) and SPDX license header. If you created it completely yourself, it's OK. Regards, Arnout > + > + 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() From arnout at mind.be Wed Feb 16 21:22:34 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 16 Feb 2022 22:22:34 +0100 Subject: [Buildroot] [git commit branch/next] package/python-tinycss2: bump to version 1.1.1 Message-ID: <20220216211511.4B0E48372A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cc60c732a19548cfbd3543d3521324ef5faaa116 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This update drops distutils support and requires flit package infrastructure. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 a34717e002..4d6dcca663 100644 --- a/package/python-tinycss2/Config.in +++ b/package/python-tinycss2/Config.in @@ -3,3 +3,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 From arnout at mind.be Wed Feb 16 20:32:58 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 16 Feb 2022 21:32:58 +0100 Subject: [Buildroot] [git commit branch/next] package/pkg-python.mk: refactor build/install opts Message-ID: <20220216211511.38A8B83724@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c3810c131761922ae8c046840c78430c4125f16e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The python package infrastructure defines a number of helper variables that are used to construct the build and install commands. However, there are still a few parts (setup.py and its argument) that are set explicitly in _BUILD_CMDS and _INSTALL_CMDS. This creates problems if we want to add another setup type that does not use setup.py. Therefore, move the setup.py part into the helper variables as well. Since this means that the variable becomes a full command rather than just options, rename them to _BUILD_CMD and _INSTALL_CMD. While we're at it, also clean up the whitespace in the definition of these variables. They were aligned on = at some point, but that alignment was already broken. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/pkg-python.mk | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 02df061a19..61f0dd6ec2 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -130,27 +130,27 @@ endif # Distutils ifeq ($$($(2)_SETUP_TYPE),distutils) ifeq ($(4),target) -$(2)_BASE_ENV = $$(PKG_PYTHON_DISTUTILS_ENV) -$(2)_BASE_BUILD_TGT = build -$(2)_BASE_BUILD_OPTS = $$(PKG_PYTHON_DISTUTILS_BUILD_OPTS) -$(2)_BASE_INSTALL_TARGET_OPTS = $$(PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS) -$(2)_BASE_INSTALL_STAGING_OPTS = $$(PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS) +$(2)_BASE_ENV = $$(PKG_PYTHON_DISTUTILS_ENV) +$(2)_BASE_BUILD_CMD = setup.py build +$(2)_BASE_BUILD_OPTS = $$(PKG_PYTHON_DISTUTILS_BUILD_OPTS) +$(2)_BASE_INSTALL_TARGET_CMD = setup.py install --no-compile $$(PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS) +$(2)_BASE_INSTALL_STAGING_CMD = setup.py install $$(PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS) else $(2)_BASE_ENV = $$(HOST_PKG_PYTHON_DISTUTILS_ENV) -$(2)_BASE_BUILD_TGT = build -$(2)_BASE_INSTALL_OPTS = $$(HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS) +$(2)_BASE_BUILD_CMD = setup.py build +$(2)_BASE_INSTALL_CMD = setup.py install $$(HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS) endif # Setuptools else ifeq ($$($(2)_SETUP_TYPE),setuptools) ifeq ($(4),target) -$(2)_BASE_ENV = $$(PKG_PYTHON_SETUPTOOLS_ENV) -$(2)_BASE_BUILD_TGT = build -$(2)_BASE_INSTALL_TARGET_OPTS = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS) -$(2)_BASE_INSTALL_STAGING_OPTS = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS) +$(2)_BASE_ENV = $$(PKG_PYTHON_SETUPTOOLS_ENV) +$(2)_BASE_BUILD_CMD = setup.py build +$(2)_BASE_INSTALL_TARGET_CMD = setup.py install --no-compile $$(PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS) +$(2)_BASE_INSTALL_STAGING_CMD = setup.py install $$(PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS) else -$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_SETUPTOOLS_ENV) -$(2)_BASE_BUILD_TGT = build -$(2)_BASE_INSTALL_OPTS = $$(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) +$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_SETUPTOOLS_ENV) +$(2)_BASE_BUILD_CMD = setup.py build +$(2)_BASE_INSTALL_CMD = setup.py install $$(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) endif else $$(error "Invalid $(2)_SETUP_TYPE. Valid options are 'distutils' or 'setuptools'") @@ -186,8 +186,8 @@ ifndef $(2)_BUILD_CMDS define $(2)_BUILD_CMDS (cd $$($$(PKG)_BUILDDIR)/; \ $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ - $$($(2)_PYTHON_INTERPRETER) setup.py \ - $$($$(PKG)_BASE_BUILD_TGT) \ + $$($(2)_PYTHON_INTERPRETER) \ + $$($$(PKG)_BASE_BUILD_CMD) \ $$($$(PKG)_BASE_BUILD_OPTS) $$($$(PKG)_BUILD_OPTS)) endef endif @@ -200,8 +200,9 @@ ifndef $(2)_INSTALL_CMDS define $(2)_INSTALL_CMDS (cd $$($$(PKG)_BUILDDIR)/; \ $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ - $$($(2)_PYTHON_INTERPRETER) setup.py install \ - $$($$(PKG)_BASE_INSTALL_OPTS) $$($$(PKG)_INSTALL_OPTS)) + $$($(2)_PYTHON_INTERPRETER) \ + $$($$(PKG)_BASE_INSTALL_CMD) \ + $$($$(PKG)_INSTALL_OPTS)) endef endif @@ -213,8 +214,8 @@ ifndef $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS (cd $$($$(PKG)_BUILDDIR)/; \ $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ - $$($(2)_PYTHON_INTERPRETER) setup.py install --no-compile \ - $$($$(PKG)_BASE_INSTALL_TARGET_OPTS) \ + $$($(2)_PYTHON_INTERPRETER) \ + $$($$(PKG)_BASE_INSTALL_TARGET_CMD) \ $$($$(PKG)_INSTALL_TARGET_OPTS)) endef endif @@ -227,8 +228,8 @@ ifndef $(2)_INSTALL_STAGING_CMDS define $(2)_INSTALL_STAGING_CMDS (cd $$($$(PKG)_BUILDDIR)/; \ $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ - $$($(2)_PYTHON_INTERPRETER) setup.py install \ - $$($$(PKG)_BASE_INSTALL_STAGING_OPTS) \ + $$($(2)_PYTHON_INTERPRETER) \ + $$($$(PKG)_BASE_INSTALL_STAGING_CMD) \ $$($$(PKG)_INSTALL_STAGING_OPTS)) endef endif From arnout at mind.be Wed Feb 16 21:16:43 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 16 Feb 2022 22:16:43 +0100 Subject: [Buildroot] [git commit branch/next] package/python-flit-core: new package/infrastructure Message-ID: <20220216211511.417578359D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=29a12eb86aee706082f344a25d2e563984b9aa1a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next 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 [Arnout: - fix indentation in pkg-python.mk (tabs, not spaces); - use the new _CMD variables instead of duplicating the entire _CMDS definitions; - no need to filter dependencies (they're not self-referencing); - _NEEDS_HOST_PYTHON no longer exists; - host-python-pypa-build gets added to DEPENDENCIES automatically. ] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/pkg-python.mk | 59 +++++++++++++++- ...t-version-parser-for-multiple-assignments.patch | 80 ++++++++++++++++++++++ package/python-flit-core/python-flit-core.hash | 3 + package/python-flit-core/python-flit-core.mk | 13 ++++ support/scripts/pyinstaller.py | 69 +++++++++++++++++++ 5 files changed, 223 insertions(+), 1 deletion(-) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 61f0dd6ec2..0c5577362f 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -103,6 +103,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="$(PYTHON3_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 @@ -152,8 +193,19 @@ $(2)_BASE_ENV = $$(HOST_PKG_PYTHON_SETUPTOOLS_ENV) $(2)_BASE_BUILD_CMD = setup.py build $(2)_BASE_INSTALL_CMD = setup.py install $$(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_CMD = -m build -n -w +$(2)_BASE_INSTALL_TARGET_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS) +$(2)_BASE_INSTALL_STAGING_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS) +else +$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_PEP517_ENV) +$(2)_BASE_BUILD_CMD = -m build -n -w +$(2)_BASE_INSTALL_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(HOST_PKG_PYTHON_PEP517_INSTALL_OPTS) +endif else -$$(error "Invalid $(2)_SETUP_TYPE. Valid options are 'distutils' or 'setuptools'") +$$(error "Invalid $(2)_SETUP_TYPE. Valid options are 'distutils', 'setuptools', 'pep517' or 'flit'.") endif # Target packages need both the python interpreter on the target (for @@ -172,6 +224,11 @@ endif # ($(4),target) # ifeq ($$($(2)_SETUP_TYPE),setuptools) $(2)_DEPENDENCIES += $$(if $$(filter host-python-setuptools,$(1)),,host-python-setuptools) +else ifneq ($$(filter flit pep517,$$($(2)_SETUP_TYPE)),) +$(2)_DEPENDENCIES += host-python-pypa-build host-python-installer +ifeq ($$($(2)_SETUP_TYPE),flit) +$(2)_DEPENDENCIES += host-python-flit-core +endif endif # SETUP_TYPE # Python interpreter to use for building the package. 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..8971223d1f --- /dev/null +++ b/package/python-flit-core/python-flit-core.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# 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_LICENSE = BSD-3-Clause +PYTHON_FLIT_CORE_SETUP_TYPE = pep517 + +$(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() From arnout at mind.be Wed Feb 16 21:27:24 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 16 Feb 2022 22:27:24 +0100 Subject: [Buildroot] [git commit] utils/docker-run: improve user experience Message-ID: <20220216212132.72E8783731@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7f2020f9040fe2378c2797bfa256f77d118be372 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Currently, the docker-run script starts a container based on the reference image, in which the user has UID:GID set to 1000:1000, which may or may not be the same as local user uses, which may prevent the commands in the container from creating files, which foils the plan of using the container to run a build... Additionally, the paths in the container differ from the paths the user expects, as the current Buildroot tree is mounted over the in-container user home directory. This is a bit confusing... Finally, the container is left hanging around after the command finishes, and thus there are as many lingering containers as the user runs docker-run. This is not very nice... We fix all of that (yeah, should be different patches, but meh): - we use --mount instead of -v, which allows us to bind-mount the Buildroot tree at the same place in the container, as Docker will create the destination if it does not exist, while -v seems to expect it to exist [0]. - as a consequence, we can also set the working directory as the Buildroot top-directory; - use --user to force the same UID:GID in the container as the local user, so that files created in the container belong to the local user, and so that files from the local user are accessible from the container; - use --rm to remove the container once it terminates; starting a new container is very quick anyway, so it is as good as re-using a previous container. [0] the documentation is not clear about that. It clearly states that the host directory (i.e. the origin, the source) is created if missing, but it says nothing of the destination: https://docs.docker.com/engine/reference/commandline/run/#mount-volume--v---read-only Signed-off-by: Yann E. MORIN Cc: Luca Ceresoli Cc: Giulio Benetti Cc: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti Reviewed-by: Luca Ceresoli Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- utils/docker-run | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/utils/docker-run b/utils/docker-run index 2bca8d8e3a..bdbc979264 100755 --- a/utils/docker-run +++ b/utils/docker-run @@ -7,4 +7,8 @@ IMAGE=$(grep ^image: "${MAIN_DIR}/.gitlab-ci.yml" | \ sed -e 's,^image: ,,g' | sed -e 's,\$CI_REGISTRY,registry.gitlab.com,g') set -x -exec docker run -v "${MAIN_DIR}:/home/br-user" -it "${IMAGE}" "$@" +exec docker run -it --rm \ + --user $(id -u):$(id -g) \ + --mount "type=bind,src=${MAIN_DIR},dst=${MAIN_DIR}" \ + --workdir "${MAIN_DIR}" \ + "${IMAGE}" "${@}" From arnout at mind.be Wed Feb 16 21:33:40 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 16 Feb 2022 22:33:40 +0100 Subject: [Buildroot] [PATCH] utils/docker-run: improve user experience In-Reply-To: <20220214203909.251924-1-yann.morin.1998@free.fr> References: <20220214203909.251924-1-yann.morin.1998@free.fr> Message-ID: <560f93f2-ed19-309b-7d90-84213a3b75ed@mind.be> On 14/02/2022 21:39, Yann E. MORIN wrote: > Currently, the docker-run script starts a container based on the > reference image, in which the user has UID:GID set to 1000:1000, > which may or may not be the same as local user uses, which may > prevent the commands in the container from creating files, which > foils the plan of using the container to run a build... > > Additionally, the paths in the container differ from the paths > the user expects, as the current Buildroot tree is mounted over > the in-container user home directory. This is a bit confusing... > > Finally, the container is left hanging around after the command > finishes, and thus there are as many lingering containers as the > user runs docker-run. This is not very nice... > > We fix all of that (yeah, should be different patches, but meh): > > - we use --mount instead of -v, which allows us to bind-mount > the Buildroot tree at the same place in the container, as > Docker will create the destination if it does not exist, while > -v seems to expect it to exist [0]. > > - as a consequence, we can also set the working directory as the > Buildroot top-directory; > > - use --user to force the same UID:GID in the container as the > local user, so that files created in the container belong to > the local user, and so that files from the local user are > accessible from the container; > > - use --rm do remove the container once it terminates; starting > a new container is very quick anyway, so it is as good as > re-using a previous container. > > [0] the documentation is not clear about that. It clearly states > that the host directory (i.e. the origin, the source) is created > if missing, but it says nothing of the destination: > https://docs.docker.com/engine/reference/commandline/run/#mount-volume--v---read-only > > Signed-off-by: Yann E. MORIN > Cc: Luca Ceresoli > Cc: Giulio Benetti > Cc: Arnout Vandecappelle (Essensium/Mind) Applied to master with the typo fixed, thanks. Regards, Arnout > --- > utils/docker-run | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/utils/docker-run b/utils/docker-run > index 2bca8d8e3a..bdbc979264 100755 > --- a/utils/docker-run > +++ b/utils/docker-run > @@ -7,4 +7,8 @@ IMAGE=$(grep ^image: "${MAIN_DIR}/.gitlab-ci.yml" | \ > sed -e 's,^image: ,,g' | sed -e 's,\$CI_REGISTRY,registry.gitlab.com,g') > > set -x > -exec docker run -v "${MAIN_DIR}:/home/br-user" -it "${IMAGE}" "$@" > +exec docker run -it --rm \ > + --user $(id -u):$(id -g) \ > + --mount "type=bind,src=${MAIN_DIR},dst=${MAIN_DIR}" \ > + --workdir "${MAIN_DIR}" \ > + "${IMAGE}" "${@}" From arnout at mind.be Wed Feb 16 21:45:49 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 16 Feb 2022 22:45:49 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/kodi: fix build with python-3.10 In-Reply-To: <20220213114721.2738803-1-bernd.kuhls@t-online.de> References: <20220213114721.2738803-1-bernd.kuhls@t-online.de> Message-ID: <19383fee-9cb4-8a75-2d65-79b5796bc5a1@mind.be> On 13/02/2022 12:47, Bernd Kuhls wrote: > Fixes build error: > > CMake Error at /usr/share/cmake-3.18/Modules/FindPackageHandleStandardArgs.cmake:165 (message): > Could NOT find PythonLibs (missing: PYTHON_LIBRARIES) (found suitable > version "3.10.2", minimum required is "3.5") > > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Arnout > --- > v2: fixed typo in PYTHON_EXECUTABLE configure option (usr/bin/ -> bin/) > > package/kodi/0002-cmake-findpython.patch | 135 ++++++++++++++++++ > ...-cmake-search-for-python-interpreter.patch | 48 +++++++ > ...-allow-to-override-PYTHON_EXECUTABLE.patch | 39 +++++ > package/kodi/kodi.mk | 4 + > 4 files changed, 226 insertions(+) > create mode 100644 package/kodi/0002-cmake-findpython.patch > create mode 100644 package/kodi/0003-cmake-search-for-python-interpreter.patch > create mode 100644 package/kodi/0004-cmake-allow-to-override-PYTHON_EXECUTABLE.patch > > diff --git a/package/kodi/0002-cmake-findpython.patch b/package/kodi/0002-cmake-findpython.patch > new file mode 100644 > index 0000000000..60728aa465 > --- /dev/null > +++ b/package/kodi/0002-cmake-findpython.patch > @@ -0,0 +1,135 @@ > +From 52f44ec5c7b728a6afaca867e8d815fced2012ec Mon Sep 17 00:00:00 2001 > +From: fuzzard > +Date: Sat, 31 Jul 2021 19:22:08 +1000 > +Subject: [PATCH] [cmake] findpython > + > +use cmakes (3.12+) FindPython3 module. > +Provide cmake vars for user to overide specific version, and search path > + > +Backport of https://github.com/xbmc/xbmc/pull/20045 > + > +Patch sent upstream: https://github.com/xbmc/xbmc/pull/20989 > + > +Signed-off-by: Bernd Kuhls > +--- > + CMakeLists.txt | 4 +- > + cmake/modules/FindPython.cmake | 71 ++++++++++++++++++++++++++-------- > + 2 files changed, 56 insertions(+), 19 deletions(-) > + > +diff --git a/CMakeLists.txt b/CMakeLists.txt > +index 2d5369798d..9bed54ef40 100644 > +--- a/CMakeLists.txt > ++++ b/CMakeLists.txt > +@@ -1,4 +1,4 @@ > +-cmake_minimum_required(VERSION 3.4) > ++cmake_minimum_required(VERSION 3.12) > + if(WIN32) > + # Version 3.15 is required to use "PREPEND" for dependencies > + cmake_minimum_required(VERSION 3.15) > +@@ -187,8 +187,6 @@ core_require_dep(${required_deps}) > + find_package(TexturePacker REQUIRED) > + find_package(JsonSchemaBuilder REQUIRED) > + > +-SET(PYTHON_VERSION 3.8) > +- > + if(ENABLE_MARIADBCLIENT AND NOT ENABLE_MARIADBCLIENT STREQUAL AUTO AND ENABLE_MYSQLCLIENT AND NOT ENABLE_MYSQLCLIENT STREQUAL AUTO) > + MESSAGE(FATAL_ERROR "You can not use MySql and MariaDB at the same time. Disable one by adding -DENABLE_MYSQLCLIENT=OFF or -DENABLE_MARIADBCLIENT=OFF.") > + elseif(ENABLE_MYSQLCLIENT AND NOT ENABLE_MYSQLCLIENT STREQUAL AUTO) > +diff --git a/cmake/modules/FindPython.cmake b/cmake/modules/FindPython.cmake > +index c40e12d551..35220b5426 100644 > +--- a/cmake/modules/FindPython.cmake > ++++ b/cmake/modules/FindPython.cmake > +@@ -1,17 +1,56 @@ > +-# - Try to find python > +-# Once done this will define > ++# FindPython > ++# -------- > ++# Finds Python3 libraries > ++# > ++# This module will search for the required python libraries on the system > ++# If multiple versions are found, the highest version will be used. > ++# > ++# -------- > ++# > ++# the following variables influence behaviour: > ++# > ++# PYTHON_PATH - use external python not found in system paths > ++# usage: -DPYTHON_PATH=/path/to/python/lib > ++# PYTHON_VER - use exact python version, fail if not found > ++# usage: -DPYTHON_VER=3.8 > ++# > ++# -------- > ++# > ++# This module will define the following variables: > + # > + # PYTHON_FOUND - system has PYTHON > ++# PYTHON_VERSION - Python version number (Major.Minor) > + # PYTHON_INCLUDE_DIRS - the python include directory > + # PYTHON_LIBRARIES - The python libraries > ++# PYTHON_LDFLAGS - Python provided link options > ++# > ++# -------- > ++# > ++ > ++# for Depends builds, set search root dir to depends path > ++if(KODI_DEPENDSBUILD) > ++ set(Python3_USE_STATIC_LIBS TRUE) > ++ set(Python3_ROOT_DIR ${DEPENDS_PATH}/lib) > ++endif() > ++ > ++# Provide root dir to search for Python if provided > ++if(PYTHON_PATH) > ++ set(Python3_ROOT_DIR ${PYTHON_PATH}) > ++ > ++ # unset cache var so we can generate again with a different dir (or none) if desired > ++ unset(PYTHON_PATH CACHE) > ++endif() > ++ > ++# Set specific version of Python to find if provided > ++if(PYTHON_VER) > ++ set(VERSION ${PYTHON_VER}) > ++ set(EXACT_VER "EXACT") > + > +-if(PKG_CONFIG_FOUND) > +- pkg_check_modules(PC_PYTHON python3>=3.5 QUIET) > ++ # unset cache var so we can generate again with a different ver (or none) if desired > ++ unset(PYTHON_VER CACHE) > + endif() > + > +-find_program(PYTHON_EXECUTABLE python3 ONLY_CMAKE_FIND_ROOT_PATH) > +-find_library(PYTHON_LIBRARY NAMES python3.9 python3.8 python3.7 python3.6 python3.5 PATHS ${PC_PYTHON_LIBDIR}) > +-find_path(PYTHON_INCLUDE_DIR NAMES Python.h PATHS ${PC_PYTHON_INCLUDE_DIRS} PATH_SUFFIXES python3.9 python3.8 python3.7 python3.6 python3.5) > ++find_package(Python3 ${VERSION} ${EXACT_VER} COMPONENTS Development) > + > + if(KODI_DEPENDSBUILD) > + find_library(FFI_LIBRARY ffi REQUIRED) > +@@ -27,17 +66,17 @@ if(KODI_DEPENDSBUILD) > + endif() > + endif() > + > +- set(PYTHON_LIBRARIES ${PYTHON_LIBRARY} ${FFI_LIBRARY} ${EXPAT_LIBRARY} ${INTL_LIBRARY} ${GMP_LIBRARY} ${PYTHON_DEP_LIBRARIES}) > +-else() > +- find_package(PythonLibs 3.5 REQUIRED) > +- list(APPEND PYTHON_LIBRARIES ${PC_PYTHON_STATIC_LIBRARIES}) > ++ list(APPEND Python3_LIBRARIES ${FFI_LIBRARY} ${EXPAT_LIBRARY} ${INTL_LIBRARY} ${GMP_LIBRARY} ${PYTHON_DEP_LIBRARIES}) > + endif() > + > +-include(FindPackageHandleStandardArgs) > +-find_package_handle_standard_args(Python REQUIRED_VARS PYTHON_INCLUDE_DIR PYTHON_LIBRARY PYTHON_LIBRARIES) > +-if(PYTHON_FOUND) > +- set(PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_DIR}) > ++if(Python3_FOUND) > + list(APPEND PYTHON_DEFINITIONS -DHAS_PYTHON=1) > ++ # These are all set for easy integration with the rest of our build system > ++ set(PYTHON_FOUND ${Python3_FOUND}) > ++ set(PYTHON_INCLUDE_DIRS ${Python3_INCLUDE_DIRS}) > ++ set(PYTHON_LIBRARIES ${Python3_LIBRARIES}) > ++ set(PYTHON_VERSION "${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}" CACHE INTERNAL "" FORCE) > ++ set(PYTHON_LDFLAGS ${Python3_LINK_OPTIONS}) > + endif() > + > +-mark_as_advanced(PYTHON_EXECUTABLE PYTHON_INCLUDE_DIRS PYTHON_INCLUDE_DIR PYTHON_LIBRARY PYTHON_LIBRARIES PYTHON_LDFLAGS FFI_LIBRARY EXPAT_LIBRARY INTL_LIBRARY GMP_LIBRARY) > ++mark_as_advanced(PYTHON_EXECUTABLE PYTHON_VERSION PYTHON_INCLUDE_DIRS PYTHON_LDFLAGS FFI_LIBRARY EXPAT_LIBRARY INTL_LIBRARY GMP_LIBRARY) > +-- > +2.30.2 > + > diff --git a/package/kodi/0003-cmake-search-for-python-interpreter.patch b/package/kodi/0003-cmake-search-for-python-interpreter.patch > new file mode 100644 > index 0000000000..158345a212 > --- /dev/null > +++ b/package/kodi/0003-cmake-search-for-python-interpreter.patch > @@ -0,0 +1,48 @@ > +From 6bb112e585f2ffd10e5af70ca28159dd235d063b Mon Sep 17 00:00:00 2001 > +From: wsnipex > +Date: Thu, 19 Aug 2021 08:50:05 +0200 > +Subject: [PATCH] [cmake] search for python interpreter fixes installing > + eventclients on linux > + > +Backport of https://github.com/xbmc/xbmc/pull/20058 > + > +Patch sent upstream: https://github.com/xbmc/xbmc/pull/20989 > + > +Signed-off-by: Bernd Kuhls > +--- > + cmake/modules/FindPython.cmake | 5 +++++ > + 1 file changed, 5 insertions(+) > + > +diff --git a/cmake/modules/FindPython.cmake b/cmake/modules/FindPython.cmake > +index 35220b5426..c469ed9fb6 100644 > +--- a/cmake/modules/FindPython.cmake > ++++ b/cmake/modules/FindPython.cmake > +@@ -20,6 +20,7 @@ > + # > + # PYTHON_FOUND - system has PYTHON > + # PYTHON_VERSION - Python version number (Major.Minor) > ++# PYTHON_EXECUTABLE - Python interpreter binary > + # PYTHON_INCLUDE_DIRS - the python include directory > + # PYTHON_LIBRARIES - The python libraries > + # PYTHON_LDFLAGS - Python provided link options > +@@ -51,6 +52,9 @@ if(PYTHON_VER) > + endif() > + > + find_package(Python3 ${VERSION} ${EXACT_VER} COMPONENTS Development) > ++if(CORE_SYSTEM_NAME STREQUAL linux) > ++ find_package(Python3 ${VERSION} ${EXACT_VER} COMPONENTS Interpreter) > ++endif() > + > + if(KODI_DEPENDSBUILD) > + find_library(FFI_LIBRARY ffi REQUIRED) > +@@ -73,6 +77,7 @@ if(Python3_FOUND) > + list(APPEND PYTHON_DEFINITIONS -DHAS_PYTHON=1) > + # These are all set for easy integration with the rest of our build system > + set(PYTHON_FOUND ${Python3_FOUND}) > ++ set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE} CACHE FILEPATH "Python interpreter" FORCE) > + set(PYTHON_INCLUDE_DIRS ${Python3_INCLUDE_DIRS}) > + set(PYTHON_LIBRARIES ${Python3_LIBRARIES}) > + set(PYTHON_VERSION "${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}" CACHE INTERNAL "" FORCE) > +-- > +2.30.2 > + > diff --git a/package/kodi/0004-cmake-allow-to-override-PYTHON_EXECUTABLE.patch b/package/kodi/0004-cmake-allow-to-override-PYTHON_EXECUTABLE.patch > new file mode 100644 > index 0000000000..d1e9b3f25f > --- /dev/null > +++ b/package/kodi/0004-cmake-allow-to-override-PYTHON_EXECUTABLE.patch > @@ -0,0 +1,39 @@ > +From 25681d8adde4a90d5da02051e30f6a3a27322136 Mon Sep 17 00:00:00 2001 > +From: Jernej Skrabec > +Date: Sat, 25 Sep 2021 07:41:10 +0200 > +Subject: [PATCH] [cmake] allow to override PYTHON_EXECUTABLE > + > +If Kodi is being build for distro which has different python version > +than host, PYTHON_EXECUTABLE must be overriden and point to distro > +version. Otherwise, eventclients will be installed in wrong location and > +be thus unusable. > + > +Use case: Cross compiling Kodi for LibreELEC > + > +Backport of https://github.com/xbmc/xbmc/pull/20171 > + > +Patch sent upstream: https://github.com/xbmc/xbmc/pull/20989 > + > +Signed-off-by: Bernd Kuhls > +--- > + cmake/modules/FindPython.cmake | 4 +++- > + 1 file changed, 3 insertions(+), 1 deletion(-) > + > +diff --git a/cmake/modules/FindPython.cmake b/cmake/modules/FindPython.cmake > +index c469ed9fb6..87b8368705 100644 > +--- a/cmake/modules/FindPython.cmake > ++++ b/cmake/modules/FindPython.cmake > +@@ -77,7 +77,9 @@ if(Python3_FOUND) > + list(APPEND PYTHON_DEFINITIONS -DHAS_PYTHON=1) > + # These are all set for easy integration with the rest of our build system > + set(PYTHON_FOUND ${Python3_FOUND}) > +- set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE} CACHE FILEPATH "Python interpreter" FORCE) > ++ if(NOT PYTHON_EXECUTABLE) > ++ set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE} CACHE FILEPATH "Python interpreter" FORCE) > ++ endif() > + set(PYTHON_INCLUDE_DIRS ${Python3_INCLUDE_DIRS}) > + set(PYTHON_LIBRARIES ${Python3_LIBRARIES}) > + set(PYTHON_VERSION "${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}" CACHE INTERNAL "" FORCE) > +-- > +2.30.2 > + > diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk > index 646c6e0ab4..56e901fa17 100644 > --- a/package/kodi/kodi.mk > +++ b/package/kodi/kodi.mk > @@ -76,6 +76,10 @@ KODI_CONF_OPTS += \ > -DNATIVEPREFIX=$(HOST_DIR) \ > -DDEPENDS_PATH=$(STAGING_DIR)/usr \ > -DENABLE_TESTING=OFF \ > + -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python \ > + -DPYTHON_INCLUDE_DIRS=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ > + -DPYTHON_PATH=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR) \ > + -DPYTHON_VER=$(PYTHON3_VERSION_MAJOR) \ > -DWITH_JSONSCHEMABUILDER=$(HOST_DIR)/bin/JsonSchemaBuilder \ > -DWITH_TEXTUREPACKER=$(HOST_DIR)/bin/TexturePacker \ > -DLIBDVDCSS_URL=$(KODI_DL_DIR)/kodi-libdvdcss-$(KODI_LIBDVDCSS_VERSION).tar.gz \ From arnout at mind.be Wed Feb 16 21:46:09 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 16 Feb 2022 22:46:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/libbpf: add LIBBPF_CPE_ID_VENDOR In-Reply-To: <20220213114214.1057171-1-fontaine.fabrice@gmail.com> References: <20220213114214.1057171-1-fontaine.fabrice@gmail.com> Message-ID: <1f433a35-86f3-adad-564b-81660ecd6c06@mind.be> On 13/02/2022 12:42, Fabrice Fontaine wrote: > cpe:2.3:a:libbpf_project:libbpf is a valid CPE identifier for this > package: > > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Alibbpf_project%3Alibbpf > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/libbpf/libbpf.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/libbpf/libbpf.mk b/package/libbpf/libbpf.mk > index 6750b063c0..06f3f3475a 100644 > --- a/package/libbpf/libbpf.mk > +++ b/package/libbpf/libbpf.mk > @@ -8,6 +8,7 @@ LIBBPF_VERSION = 0.6.1 > LIBBPF_SITE = $(call github,libbpf,libbpf,v$(LIBBPF_VERSION)) > LIBBPF_LICENSE = GPL-2.0, LGPL-2.1, BSD-2-Clause > LIBBPF_LICENSE_FILES = LICENSE LICENSE.BSD-2-Clause LICENSE.LGPL-2.1 > +LIBBPF_CPE_ID_VENDOR = libbpf_project > LIBBPF_DEPENDENCIES = host-bison host-flex host-pkgconf elfutils zlib > LIBBPF_INSTALL_STAGING = YES > From arnout at mind.be Wed Feb 16 21:47:09 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 16 Feb 2022 22:47:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/strongswan: security bump to version 5.9.5 In-Reply-To: <20220213113332.1056370-1-fontaine.fabrice@gmail.com> References: <20220213113332.1056370-1-fontaine.fabrice@gmail.com> Message-ID: <97333186-45ec-e81f-8562-266da9fe3230@mind.be> On 13/02/2022 12:33, Fabrice Fontaine wrote: > Fixed a vulnerability in the EAP client implementation that was caused > by incorrectly handling early EAP-Success messages. It may allow to > bypass the client and in some scenarios even the server authentication, > or could lead to a denial-of-service attack. This vulnerability has been > registered as CVE-2021-45079: > https://www.strongswan.org/blog/2022/01/24/strongswan-vulnerability-(cve-2021-45079).html > > https://github.com/strongswan/strongswan/releases/tag/5.9.5 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/strongswan/strongswan.hash | 6 +++--- > package/strongswan/strongswan.mk | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/strongswan/strongswan.hash b/package/strongswan/strongswan.hash > index 69b3547f91..aca7ddf5cd 100644 > --- a/package/strongswan/strongswan.hash > +++ b/package/strongswan/strongswan.hash > @@ -1,7 +1,7 @@ > -# From http://download.strongswan.org/strongswan-5.9.4.tar.bz2.md5 > -md5 9c387eb77f0159fdefbcf7e81c905c35 strongswan-5.9.4.tar.bz2 > +# From http://download.strongswan.org/strongswan-5.9.5.tar.bz2.md5 > +md5 53005324e3cba8592f1fb958b1c2d0e5 strongswan-5.9.5.tar.bz2 > # Calculated based on the hash above > -sha256 45fdf1a4c2af086d8ff5b76fd7b21d3b6f0890f365f83bf4c9a75dda26887518 strongswan-5.9.4.tar.bz2 > +sha256 983e4ef4a4c6c9d69f5fe6707c7fe0b2b9a9291943bbf4e008faab6bf91c0bdd strongswan-5.9.5.tar.bz2 > # Locally calculated > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > sha256 2292e21797754548dccdef9eef6aee7584e552fbd890fa914e1de8d3577d23f0 LICENSE > diff --git a/package/strongswan/strongswan.mk b/package/strongswan/strongswan.mk > index 2891e5aa5e..95079aceb3 100644 > --- a/package/strongswan/strongswan.mk > +++ b/package/strongswan/strongswan.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -STRONGSWAN_VERSION = 5.9.4 > +STRONGSWAN_VERSION = 5.9.5 > STRONGSWAN_SOURCE = strongswan-$(STRONGSWAN_VERSION).tar.bz2 > STRONGSWAN_SITE = http://download.strongswan.org > STRONGSWAN_LICENSE = GPL-2.0+ From arnout at mind.be Wed Feb 16 21:47:22 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 16 Feb 2022 22:47:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/safeclib: fix build with gcc 4.8 In-Reply-To: <20220213112025.979418-1-fontaine.fabrice@gmail.com> References: <20220213112025.979418-1-fontaine.fabrice@gmail.com> Message-ID: <155125a2-2bad-5ebc-e080-276729f1a179@mind.be> On 13/02/2022 12:20, Fabrice Fontaine wrote: > Add -std=c99 to fix the following build failure with gcc 4.8 raised > since bump to version 3.7.1 in commit > cc27267ae41bf44276c63b1e86042c4fae4adf50: > > In file included from abort_handler_s.c:35:0: > safeclib_private.h:167:18: error: anonymous variadic macros were introduced in C99 [-Werror=variadic-macros] > #define slprintf(...) fprintf(stderr, __VA_ARGS__) > ^ > > Fixes: > - http://autobuild.buildroot.org/results/5c3468585942879b47331e05058d25d324c8cc23 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/safeclib/safeclib.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/safeclib/safeclib.mk b/package/safeclib/safeclib.mk > index 91b3e26c68..bc58c1a38c 100644 > --- a/package/safeclib/safeclib.mk > +++ b/package/safeclib/safeclib.mk > @@ -11,6 +11,7 @@ SAFECLIB_SOURCE = safeclib-$(SAFECLIB_VERSION).tar.xz > SAFECLIB_LICENSE = MIT > SAFECLIB_LICENSE_FILES = COPYING > SAFECLIB_INSTALL_STAGING = YES > +SAFECLIB_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=c99" > # -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 From arnout at mind.be Wed Feb 16 21:47:39 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 16 Feb 2022 22:47:39 +0100 Subject: [Buildroot] [PATCH] support/pkg-stats: fix regression after cleanup in show-info In-Reply-To: <20220212184155.4188927-1-yann.morin.1998@free.fr> References: <20220212184155.4188927-1-yann.morin.1998@free.fr> Message-ID: On 12/02/2022 19:41, Yann E. MORIN wrote: > Commit 471ecea5eeb0 (core/show-info: 'name' only applies to packages) > removed the 'name' field for rootfs (really, for non-package) entries, > thus breaking the pkg-stats processing. > > We fix that by excluding any entry that has no 'name', on the assumption > that if it has no name, it is not a package. > > Reported-by: Xogium on IRC > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni Applied to master, thanks. Regards, Arnout > --- > support/scripts/pkg-stats | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats > index abd36a3dd5..c235d99407 100755 > --- a/support/scripts/pkg-stats > +++ b/support/scripts/pkg-stats > @@ -371,7 +371,7 @@ def get_pkglist(npackages, package_list): > def get_config_packages(): > cmd = ["make", "--no-print-directory", "show-info"] > js = json.loads(subprocess.check_output(cmd)) > - return set([v["name"] for v in js.values()]) > + return set([v["name"] for v in js.values() if 'name' in v]) > > > def package_init_make_info(): From arnout at mind.be Wed Feb 16 21:48:07 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 16 Feb 2022 22:48:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/gstreamer1/gst1-plugins-base: fix build with gcc 4.8 In-Reply-To: <20220211211207.762485-1-fontaine.fabrice@gmail.com> References: <20220211211207.762485-1-fontaine.fabrice@gmail.com> Message-ID: <56cdb416-0228-67f6-0690-65800a6b230f@mind.be> On 11/02/2022 22:12, Fabrice Fontaine wrote: > Fix the following build failure with gcc 4.8 raised since bump to > version 1.20.0 in commit 801131157dcef2c97e947a1d3e8c9bfa7aa3d870: > > ../gst-libs/gst/video/video-converter.c: In function 'convert_I420_v210': > ../gst-libs/gst/video/video-converter.c:3771:7: error: 'for' loop initial declarations are only allowed in C99 mode > for (int j = width * 4 - 1; j >= 0; j--) { > ^ > > Fixes: > - http://autobuild.buildroot.org/results/c4b1449f35debcbabff7e42abe239695d4ad4d21 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk > index 68281738fa..08aac850cd 100644 > --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk > +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk > @@ -11,6 +11,8 @@ GST1_PLUGINS_BASE_INSTALL_STAGING = YES > GST1_PLUGINS_BASE_LICENSE_FILES = COPYING > GST1_PLUGINS_BASE_LICENSE = LGPL-2.1+ > > +GST1_PLUGINS_BASE_CFLAGS = $(TARGET_CFLAGS) -std=gnu99 > + > GST1_PLUGINS_BASE_CONF_OPTS = \ > -Dexamples=disabled \ > -Dtests=disabled \ From arnout at mind.be Wed Feb 16 21:48:38 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 16 Feb 2022 22:48:38 +0100 Subject: [Buildroot] [PATCH 1/3] package/sdl2_ttf: drop FREETYPE_CONFIG In-Reply-To: <20220209191329.201362-1-fontaine.fabrice@gmail.com> References: <20220209191329.201362-1-fontaine.fabrice@gmail.com> Message-ID: <1b5cf8df-9b0e-42ba-5048-65e37368e2a9@mind.be> On 09/02/2022 20:13, Fabrice Fontaine wrote: > FREETYPE_CONFIG is not used since version 2.0.15 and > https://github.com/libsdl-org/SDL_ttf/commit/50d72e55315e25d34f4209824275e3b1cbe6c6f8 > > Signed-off-by: Fabrice Fontaine All 3 applied to master, thanks. Regards, Arnout > --- > package/sdl2_ttf/sdl2_ttf.mk | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/package/sdl2_ttf/sdl2_ttf.mk b/package/sdl2_ttf/sdl2_ttf.mk > index 1fe7c0a075..3b2b35e157 100644 > --- a/package/sdl2_ttf/sdl2_ttf.mk > +++ b/package/sdl2_ttf/sdl2_ttf.mk > @@ -12,9 +12,6 @@ SDL2_TTF_LICENSE_FILES = COPYING.txt > SDL2_TTF_INSTALL_STAGING = YES > SDL2_TTF_DEPENDENCIES = sdl2 freetype host-pkgconf > > -SDL2_TTF_CONF_ENV = \ > - FREETYPE_CONFIG=$(STAGING_DIR)/usr/bin/freetype-config > - > # x-includes and x-libraries must be set for cross-compiling > # By default x_includes and x_libraries contains unsafe paths. > # (/usr/include and /usr/lib) From arnout at mind.be Wed Feb 16 21:48:54 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 16 Feb 2022 22:48:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/sudo: drop openssl workaround In-Reply-To: <20220208205232.16362-1-fontaine.fabrice@gmail.com> References: <20220208205232.16362-1-fontaine.fabrice@gmail.com> Message-ID: On 08/02/2022 21:52, Fabrice Fontaine wrote: > Drop workaround added by commit bf899e50d89439b1a1bdf22bc933075958ffc108 > because sudo natively supports pkg-config for searching openssl (which > is enabled by default) since version 1.9.2 and > https://github.com/sudo-project/sudo/commit/4cadd549513ef35d4d740e941576294f4491d13d > > As a side-effect, this will fix the following build failure when openssl > is not installed on host (as LIBS is set before AX_PROG_CC_FOR_BUILD): > > configure:8162: checking whether the C compiler works > configure:8184: /usr/bin/gcc -O2 -I/home/buildroot/autobuild/instance-2/output-1/host/include -I/home/buildroot/autobuild/instance-2/output-1/host/include -L/home/buildroot/autobuild/instance-2/output-1/host/lib -Wl,-rpath,/home/buildroot/autobuild/instance-2/output-1/host/lib conftest.c -L/home/buildroot/autobuild/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib -lssl -L/home/buildroot/autobuild/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib -pthread -latomic -lcrypto -pthread -latomic >&5 > /usr/bin/ld: skipping incompatible /home/buildroot/autobuild/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libssl.a when searching for -lssl > /usr/bin/ld: skipping incompatible /home/buildroot/autobuild/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libssl.a when searching for -lssl > /usr/bin/ld: cannot find -lssl > > Fixes: > - http://autobuild.buildroot.org/results/7a5d4dd22343be46a5ddd1c1a1a8e1799517d564 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/sudo/sudo.mk | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk > index f2c074e55f..a752217123 100644 > --- a/package/sudo/sudo.mk > +++ b/package/sudo/sudo.mk > @@ -45,17 +45,17 @@ endif > ifeq ($(BR2_PACKAGE_OPENLDAP),y) > SUDO_DEPENDENCIES += openldap > SUDO_CONF_OPTS += --with-ldap > -# If we are building sudo statically and openldap was linked with openssl, then > -# when we link sudo with openldap we need to specify the openssl libs, otherwise > -# it will fail with "undefined reference" errors. > -ifeq ($(BR2_STATIC_LIBS)$(BR2_PACKAGE_OPENSSL),yy) > -SUDO_DEPENDENCIES += host-pkgconf > -SUDO_CONF_ENV += LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs libssl libcrypto`" > -endif > else > SUDO_CONF_OPTS += --without-ldap > endif > > +ifeq ($(BR2_PACKAGE_OPENSSL),y) > +SUDO_DEPENDENCIES += host-pkgconf openssl > +SUDO_CONF_OPTS += --enable-openssl > +else > +SUDO_CONF_OPTS += --disable-openssl > +endif > + > # mksigname/mksiglist needs to run on build host to generate source files > define SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST > $(MAKE) $(HOST_CONFIGURE_OPTS) \ From arnout at mind.be Wed Feb 16 21:38:01 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 16 Feb 2022 22:38:01 +0100 Subject: [Buildroot] [git commit] package/sdl2_ttf: disable builtin freetype2 Message-ID: <20220216214135.3D37983778@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=81636b1ea14a423eac3145413dcf7200a8f1edd7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Disable builtin freetype2 which is enabled by default since bump to version 2.0.18 in commit f4da031a77f200515bcc5b2e0fe665a7b4f2a780 and https://github.com/libsdl-org/SDL_ttf/commit/834ec54127dc9c2a12928f5fe32cf110ec4c7a7f Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/sdl2_ttf/sdl2_ttf.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/sdl2_ttf/sdl2_ttf.mk b/package/sdl2_ttf/sdl2_ttf.mk index 3b2b35e157..e9397d8505 100644 --- a/package/sdl2_ttf/sdl2_ttf.mk +++ b/package/sdl2_ttf/sdl2_ttf.mk @@ -11,6 +11,7 @@ SDL2_TTF_LICENSE = Zlib SDL2_TTF_LICENSE_FILES = COPYING.txt SDL2_TTF_INSTALL_STAGING = YES SDL2_TTF_DEPENDENCIES = sdl2 freetype host-pkgconf +SDL2_TTF_CONF_OPTS = --disable-freetype-builtin # x-includes and x-libraries must be set for cross-compiling # By default x_includes and x_libraries contains unsafe paths. From arnout at mind.be Wed Feb 16 21:37:56 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 16 Feb 2022 22:37:56 +0100 Subject: [Buildroot] [git commit] package/sudo: drop openssl workaround Message-ID: <20220216214135.2BF0B83776@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=afe11e84576e4ac15589159d181e1ff5d78942b6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop workaround added by commit bf899e50d89439b1a1bdf22bc933075958ffc108 because sudo natively supports pkg-config for searching openssl (which is enabled by default) since version 1.9.2 and https://github.com/sudo-project/sudo/commit/4cadd549513ef35d4d740e941576294f4491d13d As a side-effect, this will fix the following build failure when openssl is not installed on host (as LIBS is set before AX_PROG_CC_FOR_BUILD): configure:8162: checking whether the C compiler works configure:8184: /usr/bin/gcc -O2 -I/home/buildroot/autobuild/instance-2/output-1/host/include -I/home/buildroot/autobuild/instance-2/output-1/host/include -L/home/buildroot/autobuild/instance-2/output-1/host/lib -Wl,-rpath,/home/buildroot/autobuild/instance-2/output-1/host/lib conftest.c -L/home/buildroot/autobuild/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib -lssl -L/home/buildroot/autobuild/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib -pthread -latomic -lcrypto -pthread -latomic >&5 /usr/bin/ld: skipping incompatible /home/buildroot/autobuild/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libssl.a when searching for -lssl /usr/bin/ld: skipping incompatible /home/buildroot/autobuild/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libssl.a when searching for -lssl /usr/bin/ld: cannot find -lssl Fixes: - http://autobuild.buildroot.org/results/7a5d4dd22343be46a5ddd1c1a1a8e1799517d564 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/sudo/sudo.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index f2c074e55f..a752217123 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -45,17 +45,17 @@ endif ifeq ($(BR2_PACKAGE_OPENLDAP),y) SUDO_DEPENDENCIES += openldap SUDO_CONF_OPTS += --with-ldap -# If we are building sudo statically and openldap was linked with openssl, then -# when we link sudo with openldap we need to specify the openssl libs, otherwise -# it will fail with "undefined reference" errors. -ifeq ($(BR2_STATIC_LIBS)$(BR2_PACKAGE_OPENSSL),yy) -SUDO_DEPENDENCIES += host-pkgconf -SUDO_CONF_ENV += LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs libssl libcrypto`" -endif else SUDO_CONF_OPTS += --without-ldap endif +ifeq ($(BR2_PACKAGE_OPENSSL),y) +SUDO_DEPENDENCIES += host-pkgconf openssl +SUDO_CONF_OPTS += --enable-openssl +else +SUDO_CONF_OPTS += --disable-openssl +endif + # mksigname/mksiglist needs to run on build host to generate source files define SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST $(MAKE) $(HOST_CONFIGURE_OPTS) \ From arnout at mind.be Wed Feb 16 21:38:12 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 16 Feb 2022 22:38:12 +0100 Subject: [Buildroot] [git commit] package/safeclib: fix build with gcc 4.8 Message-ID: <20220216214135.611D783778@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=63f40a109b8281283c66870f623382268130953a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add -std=c99 to fix the following build failure with gcc 4.8 raised since bump to version 3.7.1 in commit cc27267ae41bf44276c63b1e86042c4fae4adf50: In file included from abort_handler_s.c:35:0: safeclib_private.h:167:18: error: anonymous variadic macros were introduced in C99 [-Werror=variadic-macros] #define slprintf(...) fprintf(stderr, __VA_ARGS__) ^ Fixes: - http://autobuild.buildroot.org/results/5c3468585942879b47331e05058d25d324c8cc23 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/safeclib/safeclib.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/safeclib/safeclib.mk b/package/safeclib/safeclib.mk index 91b3e26c68..bc58c1a38c 100644 --- a/package/safeclib/safeclib.mk +++ b/package/safeclib/safeclib.mk @@ -11,6 +11,7 @@ SAFECLIB_SOURCE = safeclib-$(SAFECLIB_VERSION).tar.xz SAFECLIB_LICENSE = MIT SAFECLIB_LICENSE_FILES = COPYING SAFECLIB_INSTALL_STAGING = YES +SAFECLIB_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=c99" # -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 From arnout at mind.be Wed Feb 16 21:37:58 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 16 Feb 2022 22:37:58 +0100 Subject: [Buildroot] [git commit] package/sdl2_ttf: drop FREETYPE_CONFIG Message-ID: <20220216214135.3489C83777@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=997cd389eb3b0ab2e472f3b857dd6d0ac486388c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master FREETYPE_CONFIG is not used since version 2.0.15 and https://github.com/libsdl-org/SDL_ttf/commit/50d72e55315e25d34f4209824275e3b1cbe6c6f8 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/sdl2_ttf/sdl2_ttf.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/sdl2_ttf/sdl2_ttf.mk b/package/sdl2_ttf/sdl2_ttf.mk index 1fe7c0a075..3b2b35e157 100644 --- a/package/sdl2_ttf/sdl2_ttf.mk +++ b/package/sdl2_ttf/sdl2_ttf.mk @@ -12,9 +12,6 @@ SDL2_TTF_LICENSE_FILES = COPYING.txt SDL2_TTF_INSTALL_STAGING = YES SDL2_TTF_DEPENDENCIES = sdl2 freetype host-pkgconf -SDL2_TTF_CONF_ENV = \ - FREETYPE_CONFIG=$(STAGING_DIR)/usr/bin/freetype-config - # x-includes and x-libraries must be set for cross-compiling # By default x_includes and x_libraries contains unsafe paths. # (/usr/include and /usr/lib) From arnout at mind.be Wed Feb 16 21:38:17 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 16 Feb 2022 22:38:17 +0100 Subject: [Buildroot] [git commit] package/libbpf: add LIBBPF_CPE_ID_VENDOR Message-ID: <20220216214135.7218083776@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d08583faedb39aaf8245afc6730dc2056ad63bf7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:libbpf_project:libbpf is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Alibbpf_project%3Alibbpf Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libbpf/libbpf.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libbpf/libbpf.mk b/package/libbpf/libbpf.mk index 6750b063c0..06f3f3475a 100644 --- a/package/libbpf/libbpf.mk +++ b/package/libbpf/libbpf.mk @@ -8,6 +8,7 @@ LIBBPF_VERSION = 0.6.1 LIBBPF_SITE = $(call github,libbpf,libbpf,v$(LIBBPF_VERSION)) LIBBPF_LICENSE = GPL-2.0, LGPL-2.1, BSD-2-Clause LIBBPF_LICENSE_FILES = LICENSE LICENSE.BSD-2-Clause LICENSE.LGPL-2.1 +LIBBPF_CPE_ID_VENDOR = libbpf_project LIBBPF_DEPENDENCIES = host-bison host-flex host-pkgconf elfutils zlib LIBBPF_INSTALL_STAGING = YES From arnout at mind.be Wed Feb 16 21:38:09 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 16 Feb 2022 22:38:09 +0100 Subject: [Buildroot] [git commit] support/pkg-stats: fix regression after cleanup in show-info Message-ID: <20220216214135.5963183776@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0319170f50c043e86a79d151b23008f6d639b06d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 471ecea5eeb0 (core/show-info: 'name' only applies to packages) removed the 'name' field for rootfs (really, for non-package) entries, thus breaking the pkg-stats processing. We fix that by excluding any entry that has no 'name', on the assumption that if it has no name, it is not a package. Reported-by: Xogium on IRC Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- support/scripts/pkg-stats | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index abd36a3dd5..c235d99407 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -371,7 +371,7 @@ def get_pkglist(npackages, package_list): def get_config_packages(): cmd = ["make", "--no-print-directory", "show-info"] js = json.loads(subprocess.check_output(cmd)) - return set([v["name"] for v in js.values()]) + return set([v["name"] for v in js.values() if 'name' in v]) def package_init_make_info(): From arnout at mind.be Wed Feb 16 21:38:15 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 16 Feb 2022 22:38:15 +0100 Subject: [Buildroot] [git commit] package/strongswan: security bump to version 5.9.5 Message-ID: <20220216214135.69B4683777@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a8379379733ddeb02ec0b42ee68f8f5182bcb3e4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixed a vulnerability in the EAP client implementation that was caused by incorrectly handling early EAP-Success messages. It may allow to bypass the client and in some scenarios even the server authentication, or could lead to a denial-of-service attack. This vulnerability has been registered as CVE-2021-45079: https://www.strongswan.org/blog/2022/01/24/strongswan-vulnerability-(cve-2021-45079).html https://github.com/strongswan/strongswan/releases/tag/5.9.5 Signed-off-by: Fabrice Fontaine Reviewed-by: Quentin Schulz Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/strongswan/strongswan.hash | 6 +++--- package/strongswan/strongswan.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/strongswan/strongswan.hash b/package/strongswan/strongswan.hash index 69b3547f91..aca7ddf5cd 100644 --- a/package/strongswan/strongswan.hash +++ b/package/strongswan/strongswan.hash @@ -1,7 +1,7 @@ -# From http://download.strongswan.org/strongswan-5.9.4.tar.bz2.md5 -md5 9c387eb77f0159fdefbcf7e81c905c35 strongswan-5.9.4.tar.bz2 +# From http://download.strongswan.org/strongswan-5.9.5.tar.bz2.md5 +md5 53005324e3cba8592f1fb958b1c2d0e5 strongswan-5.9.5.tar.bz2 # Calculated based on the hash above -sha256 45fdf1a4c2af086d8ff5b76fd7b21d3b6f0890f365f83bf4c9a75dda26887518 strongswan-5.9.4.tar.bz2 +sha256 983e4ef4a4c6c9d69f5fe6707c7fe0b2b9a9291943bbf4e008faab6bf91c0bdd strongswan-5.9.5.tar.bz2 # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 2292e21797754548dccdef9eef6aee7584e552fbd890fa914e1de8d3577d23f0 LICENSE diff --git a/package/strongswan/strongswan.mk b/package/strongswan/strongswan.mk index 2891e5aa5e..95079aceb3 100644 --- a/package/strongswan/strongswan.mk +++ b/package/strongswan/strongswan.mk @@ -4,7 +4,7 @@ # ################################################################################ -STRONGSWAN_VERSION = 5.9.4 +STRONGSWAN_VERSION = 5.9.5 STRONGSWAN_SOURCE = strongswan-$(STRONGSWAN_VERSION).tar.bz2 STRONGSWAN_SITE = http://download.strongswan.org STRONGSWAN_LICENSE = GPL-2.0+ From arnout at mind.be Wed Feb 16 21:38:04 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 16 Feb 2022 22:38:04 +0100 Subject: [Buildroot] [git commit] package/sdl2_ttf: add harfbuzz optional dependency Message-ID: <20220216214135.4627583776@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e253e41ce2e50d3af689a40b4dd0f5c615985787 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master harfbuzz is an optional dependency (which is enabled by default) since version 2.0.18 and https://github.com/libsdl-org/SDL_ttf/commit/328bbed78db496ff36720e8a809661ffb236e673 If harfbuzz is not disabled and not found, builtin harfbuzz is enabled resulting in the following build failure without C++ since commit f4da031a77f200515bcc5b2e0fe665a7b4f2a780 and https://github.com/libsdl-org/SDL_ttf/commit/9a7ef3fb640a1f086d9b02954c3b4bbfb3578871: configure: error: *** A compiler with support for C++11 language features is required. Fixes: - http://autobuild.buildroot.org/results/3fecb96a8063b1a28703682e9373714c1c9cfa24 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/sdl2_ttf/sdl2_ttf.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/sdl2_ttf/sdl2_ttf.mk b/package/sdl2_ttf/sdl2_ttf.mk index e9397d8505..54e76815f1 100644 --- a/package/sdl2_ttf/sdl2_ttf.mk +++ b/package/sdl2_ttf/sdl2_ttf.mk @@ -13,6 +13,13 @@ SDL2_TTF_INSTALL_STAGING = YES SDL2_TTF_DEPENDENCIES = sdl2 freetype host-pkgconf SDL2_TTF_CONF_OPTS = --disable-freetype-builtin +ifeq ($(BR2_PACKAGE_HARFBUZZ),y) +SDL2_TTF_DEPENDENCIES += harfbuzz +SDL2_TTF_CONF_OPTS += --enable-harfbuzz +else +SDL2_TTF_CONF_OPTS += --disable-harfbuzz +endif + # x-includes and x-libraries must be set for cross-compiling # By default x_includes and x_libraries contains unsafe paths. # (/usr/include and /usr/lib) From arnout at mind.be Wed Feb 16 21:38:21 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 16 Feb 2022 22:38:21 +0100 Subject: [Buildroot] [git commit] package/kodi: fix build with python-3.10 Message-ID: <20220216214135.7EF5883777@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a14a68a57dee2d8636e616916f48a2f721bd51fe branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes build error: CMake Error at /usr/share/cmake-3.18/Modules/FindPackageHandleStandardArgs.cmake:165 (message): Could NOT find PythonLibs (missing: PYTHON_LIBRARIES) (found suitable version "3.10.2", minimum required is "3.5") Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/kodi/0002-cmake-findpython.patch | 135 +++++++++++++++++++++ .../0003-cmake-search-for-python-interpreter.patch | 48 ++++++++ ...cmake-allow-to-override-PYTHON_EXECUTABLE.patch | 39 ++++++ package/kodi/kodi.mk | 4 + 4 files changed, 226 insertions(+) diff --git a/package/kodi/0002-cmake-findpython.patch b/package/kodi/0002-cmake-findpython.patch new file mode 100644 index 0000000000..60728aa465 --- /dev/null +++ b/package/kodi/0002-cmake-findpython.patch @@ -0,0 +1,135 @@ +From 52f44ec5c7b728a6afaca867e8d815fced2012ec Mon Sep 17 00:00:00 2001 +From: fuzzard +Date: Sat, 31 Jul 2021 19:22:08 +1000 +Subject: [PATCH] [cmake] findpython + +use cmakes (3.12+) FindPython3 module. +Provide cmake vars for user to overide specific version, and search path + +Backport of https://github.com/xbmc/xbmc/pull/20045 + +Patch sent upstream: https://github.com/xbmc/xbmc/pull/20989 + +Signed-off-by: Bernd Kuhls +--- + CMakeLists.txt | 4 +- + cmake/modules/FindPython.cmake | 71 ++++++++++++++++++++++++++-------- + 2 files changed, 56 insertions(+), 19 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2d5369798d..9bed54ef40 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.4) ++cmake_minimum_required(VERSION 3.12) + if(WIN32) + # Version 3.15 is required to use "PREPEND" for dependencies + cmake_minimum_required(VERSION 3.15) +@@ -187,8 +187,6 @@ core_require_dep(${required_deps}) + find_package(TexturePacker REQUIRED) + find_package(JsonSchemaBuilder REQUIRED) + +-SET(PYTHON_VERSION 3.8) +- + if(ENABLE_MARIADBCLIENT AND NOT ENABLE_MARIADBCLIENT STREQUAL AUTO AND ENABLE_MYSQLCLIENT AND NOT ENABLE_MYSQLCLIENT STREQUAL AUTO) + MESSAGE(FATAL_ERROR "You can not use MySql and MariaDB at the same time. Disable one by adding -DENABLE_MYSQLCLIENT=OFF or -DENABLE_MARIADBCLIENT=OFF.") + elseif(ENABLE_MYSQLCLIENT AND NOT ENABLE_MYSQLCLIENT STREQUAL AUTO) +diff --git a/cmake/modules/FindPython.cmake b/cmake/modules/FindPython.cmake +index c40e12d551..35220b5426 100644 +--- a/cmake/modules/FindPython.cmake ++++ b/cmake/modules/FindPython.cmake +@@ -1,17 +1,56 @@ +-# - Try to find python +-# Once done this will define ++# FindPython ++# -------- ++# Finds Python3 libraries ++# ++# This module will search for the required python libraries on the system ++# If multiple versions are found, the highest version will be used. ++# ++# -------- ++# ++# the following variables influence behaviour: ++# ++# PYTHON_PATH - use external python not found in system paths ++# usage: -DPYTHON_PATH=/path/to/python/lib ++# PYTHON_VER - use exact python version, fail if not found ++# usage: -DPYTHON_VER=3.8 ++# ++# -------- ++# ++# This module will define the following variables: + # + # PYTHON_FOUND - system has PYTHON ++# PYTHON_VERSION - Python version number (Major.Minor) + # PYTHON_INCLUDE_DIRS - the python include directory + # PYTHON_LIBRARIES - The python libraries ++# PYTHON_LDFLAGS - Python provided link options ++# ++# -------- ++# ++ ++# for Depends builds, set search root dir to depends path ++if(KODI_DEPENDSBUILD) ++ set(Python3_USE_STATIC_LIBS TRUE) ++ set(Python3_ROOT_DIR ${DEPENDS_PATH}/lib) ++endif() ++ ++# Provide root dir to search for Python if provided ++if(PYTHON_PATH) ++ set(Python3_ROOT_DIR ${PYTHON_PATH}) ++ ++ # unset cache var so we can generate again with a different dir (or none) if desired ++ unset(PYTHON_PATH CACHE) ++endif() ++ ++# Set specific version of Python to find if provided ++if(PYTHON_VER) ++ set(VERSION ${PYTHON_VER}) ++ set(EXACT_VER "EXACT") + +-if(PKG_CONFIG_FOUND) +- pkg_check_modules(PC_PYTHON python3>=3.5 QUIET) ++ # unset cache var so we can generate again with a different ver (or none) if desired ++ unset(PYTHON_VER CACHE) + endif() + +-find_program(PYTHON_EXECUTABLE python3 ONLY_CMAKE_FIND_ROOT_PATH) +-find_library(PYTHON_LIBRARY NAMES python3.9 python3.8 python3.7 python3.6 python3.5 PATHS ${PC_PYTHON_LIBDIR}) +-find_path(PYTHON_INCLUDE_DIR NAMES Python.h PATHS ${PC_PYTHON_INCLUDE_DIRS} PATH_SUFFIXES python3.9 python3.8 python3.7 python3.6 python3.5) ++find_package(Python3 ${VERSION} ${EXACT_VER} COMPONENTS Development) + + if(KODI_DEPENDSBUILD) + find_library(FFI_LIBRARY ffi REQUIRED) +@@ -27,17 +66,17 @@ if(KODI_DEPENDSBUILD) + endif() + endif() + +- set(PYTHON_LIBRARIES ${PYTHON_LIBRARY} ${FFI_LIBRARY} ${EXPAT_LIBRARY} ${INTL_LIBRARY} ${GMP_LIBRARY} ${PYTHON_DEP_LIBRARIES}) +-else() +- find_package(PythonLibs 3.5 REQUIRED) +- list(APPEND PYTHON_LIBRARIES ${PC_PYTHON_STATIC_LIBRARIES}) ++ list(APPEND Python3_LIBRARIES ${FFI_LIBRARY} ${EXPAT_LIBRARY} ${INTL_LIBRARY} ${GMP_LIBRARY} ${PYTHON_DEP_LIBRARIES}) + endif() + +-include(FindPackageHandleStandardArgs) +-find_package_handle_standard_args(Python REQUIRED_VARS PYTHON_INCLUDE_DIR PYTHON_LIBRARY PYTHON_LIBRARIES) +-if(PYTHON_FOUND) +- set(PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_DIR}) ++if(Python3_FOUND) + list(APPEND PYTHON_DEFINITIONS -DHAS_PYTHON=1) ++ # These are all set for easy integration with the rest of our build system ++ set(PYTHON_FOUND ${Python3_FOUND}) ++ set(PYTHON_INCLUDE_DIRS ${Python3_INCLUDE_DIRS}) ++ set(PYTHON_LIBRARIES ${Python3_LIBRARIES}) ++ set(PYTHON_VERSION "${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}" CACHE INTERNAL "" FORCE) ++ set(PYTHON_LDFLAGS ${Python3_LINK_OPTIONS}) + endif() + +-mark_as_advanced(PYTHON_EXECUTABLE PYTHON_INCLUDE_DIRS PYTHON_INCLUDE_DIR PYTHON_LIBRARY PYTHON_LIBRARIES PYTHON_LDFLAGS FFI_LIBRARY EXPAT_LIBRARY INTL_LIBRARY GMP_LIBRARY) ++mark_as_advanced(PYTHON_EXECUTABLE PYTHON_VERSION PYTHON_INCLUDE_DIRS PYTHON_LDFLAGS FFI_LIBRARY EXPAT_LIBRARY INTL_LIBRARY GMP_LIBRARY) +-- +2.30.2 + diff --git a/package/kodi/0003-cmake-search-for-python-interpreter.patch b/package/kodi/0003-cmake-search-for-python-interpreter.patch new file mode 100644 index 0000000000..158345a212 --- /dev/null +++ b/package/kodi/0003-cmake-search-for-python-interpreter.patch @@ -0,0 +1,48 @@ +From 6bb112e585f2ffd10e5af70ca28159dd235d063b Mon Sep 17 00:00:00 2001 +From: wsnipex +Date: Thu, 19 Aug 2021 08:50:05 +0200 +Subject: [PATCH] [cmake] search for python interpreter fixes installing + eventclients on linux + +Backport of https://github.com/xbmc/xbmc/pull/20058 + +Patch sent upstream: https://github.com/xbmc/xbmc/pull/20989 + +Signed-off-by: Bernd Kuhls +--- + cmake/modules/FindPython.cmake | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/cmake/modules/FindPython.cmake b/cmake/modules/FindPython.cmake +index 35220b5426..c469ed9fb6 100644 +--- a/cmake/modules/FindPython.cmake ++++ b/cmake/modules/FindPython.cmake +@@ -20,6 +20,7 @@ + # + # PYTHON_FOUND - system has PYTHON + # PYTHON_VERSION - Python version number (Major.Minor) ++# PYTHON_EXECUTABLE - Python interpreter binary + # PYTHON_INCLUDE_DIRS - the python include directory + # PYTHON_LIBRARIES - The python libraries + # PYTHON_LDFLAGS - Python provided link options +@@ -51,6 +52,9 @@ if(PYTHON_VER) + endif() + + find_package(Python3 ${VERSION} ${EXACT_VER} COMPONENTS Development) ++if(CORE_SYSTEM_NAME STREQUAL linux) ++ find_package(Python3 ${VERSION} ${EXACT_VER} COMPONENTS Interpreter) ++endif() + + if(KODI_DEPENDSBUILD) + find_library(FFI_LIBRARY ffi REQUIRED) +@@ -73,6 +77,7 @@ if(Python3_FOUND) + list(APPEND PYTHON_DEFINITIONS -DHAS_PYTHON=1) + # These are all set for easy integration with the rest of our build system + set(PYTHON_FOUND ${Python3_FOUND}) ++ set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE} CACHE FILEPATH "Python interpreter" FORCE) + set(PYTHON_INCLUDE_DIRS ${Python3_INCLUDE_DIRS}) + set(PYTHON_LIBRARIES ${Python3_LIBRARIES}) + set(PYTHON_VERSION "${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}" CACHE INTERNAL "" FORCE) +-- +2.30.2 + diff --git a/package/kodi/0004-cmake-allow-to-override-PYTHON_EXECUTABLE.patch b/package/kodi/0004-cmake-allow-to-override-PYTHON_EXECUTABLE.patch new file mode 100644 index 0000000000..d1e9b3f25f --- /dev/null +++ b/package/kodi/0004-cmake-allow-to-override-PYTHON_EXECUTABLE.patch @@ -0,0 +1,39 @@ +From 25681d8adde4a90d5da02051e30f6a3a27322136 Mon Sep 17 00:00:00 2001 +From: Jernej Skrabec +Date: Sat, 25 Sep 2021 07:41:10 +0200 +Subject: [PATCH] [cmake] allow to override PYTHON_EXECUTABLE + +If Kodi is being build for distro which has different python version +than host, PYTHON_EXECUTABLE must be overriden and point to distro +version. Otherwise, eventclients will be installed in wrong location and +be thus unusable. + +Use case: Cross compiling Kodi for LibreELEC + +Backport of https://github.com/xbmc/xbmc/pull/20171 + +Patch sent upstream: https://github.com/xbmc/xbmc/pull/20989 + +Signed-off-by: Bernd Kuhls +--- + cmake/modules/FindPython.cmake | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/cmake/modules/FindPython.cmake b/cmake/modules/FindPython.cmake +index c469ed9fb6..87b8368705 100644 +--- a/cmake/modules/FindPython.cmake ++++ b/cmake/modules/FindPython.cmake +@@ -77,7 +77,9 @@ if(Python3_FOUND) + list(APPEND PYTHON_DEFINITIONS -DHAS_PYTHON=1) + # These are all set for easy integration with the rest of our build system + set(PYTHON_FOUND ${Python3_FOUND}) +- set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE} CACHE FILEPATH "Python interpreter" FORCE) ++ if(NOT PYTHON_EXECUTABLE) ++ set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE} CACHE FILEPATH "Python interpreter" FORCE) ++ endif() + set(PYTHON_INCLUDE_DIRS ${Python3_INCLUDE_DIRS}) + set(PYTHON_LIBRARIES ${Python3_LIBRARIES}) + set(PYTHON_VERSION "${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}" CACHE INTERNAL "" FORCE) +-- +2.30.2 + diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index a2c42b64c9..58ad115475 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -76,6 +76,10 @@ KODI_CONF_OPTS += \ -DNATIVEPREFIX=$(HOST_DIR) \ -DDEPENDS_PATH=$(STAGING_DIR)/usr \ -DENABLE_TESTING=OFF \ + -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python \ + -DPYTHON_INCLUDE_DIRS=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ + -DPYTHON_PATH=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR) \ + -DPYTHON_VER=$(PYTHON3_VERSION_MAJOR) \ -DWITH_JSONSCHEMABUILDER=$(HOST_DIR)/bin/JsonSchemaBuilder \ -DWITH_TEXTUREPACKER=$(HOST_DIR)/bin/TexturePacker \ -DLIBDVDCSS_URL=$(KODI_DL_DIR)/kodi-libdvdcss-$(KODI_LIBDVDCSS_VERSION).tar.gz \ From arnout at mind.be Wed Feb 16 21:38:07 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 16 Feb 2022 22:38:07 +0100 Subject: [Buildroot] [git commit] package/gstreamer1/gst1-plugins-base: fix build with gcc 4.8 Message-ID: <20220216214135.506F983777@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d7b999e947fae16ddbe8857640c7e87433a1d54b 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 1.20.0 in commit 801131157dcef2c97e947a1d3e8c9bfa7aa3d870: ../gst-libs/gst/video/video-converter.c: In function 'convert_I420_v210': ../gst-libs/gst/video/video-converter.c:3771:7: error: 'for' loop initial declarations are only allowed in C99 mode for (int j = width * 4 - 1; j >= 0; j--) { ^ Fixes: - http://autobuild.buildroot.org/results/c4b1449f35debcbabff7e42abe239695d4ad4d21 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk index 68281738fa..08aac850cd 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk @@ -11,6 +11,8 @@ GST1_PLUGINS_BASE_INSTALL_STAGING = YES GST1_PLUGINS_BASE_LICENSE_FILES = COPYING GST1_PLUGINS_BASE_LICENSE = LGPL-2.1+ +GST1_PLUGINS_BASE_CFLAGS = $(TARGET_CFLAGS) -std=gnu99 + GST1_PLUGINS_BASE_CONF_OPTS = \ -Dexamples=disabled \ -Dtests=disabled \ From arnout at mind.be Wed Feb 16 21:54:35 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 16 Feb 2022 22:54:35 +0100 Subject: [Buildroot] [git commit] package/libusb/0002-linux_usbfs-fix-maybe-uninitialized-error.patch: remove N/M Message-ID: <20220216214708.56C268377B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=892834535cdf27c6290a1d45fa8e03b3e1908f35 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Found by check-package: package/libusb/0002-linux_usbfs-fix-maybe-uninitialized-error.patch:4: generate your patches with 'git format-patch -N' Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libusb/0002-linux_usbfs-fix-maybe-uninitialized-error.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libusb/0002-linux_usbfs-fix-maybe-uninitialized-error.patch b/package/libusb/0002-linux_usbfs-fix-maybe-uninitialized-error.patch index e6020f466e..ea299081aa 100644 --- a/package/libusb/0002-linux_usbfs-fix-maybe-uninitialized-error.patch +++ b/package/libusb/0002-linux_usbfs-fix-maybe-uninitialized-error.patch @@ -1,7 +1,7 @@ From bea5891591402f14940a607eafbdcd169ff8827f Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Sun, 6 Feb 2022 07:12:14 +0100 -Subject: [PATCH 2/2] linux_usbfs: fix maybe-uninitialized error +Subject: [PATCH] linux_usbfs: fix maybe-uninitialized error MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From yann.morin.1998 at free.fr Wed Feb 16 21:55:15 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Feb 2022 22:55:15 +0100 Subject: [Buildroot] [git commit] utils/docker-run: hide docker run command Message-ID: <20220216214805.EB9378377F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cc9470c2d8134106792a5a0179fbd0c6ca4d37af branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Since this is a helper script there is not much reason to show the command that's been issued. Furthermore, the incantation has been slightly extended since the script was introduced. The only interesting reason to print the command is to know what image it is being spawned into. However, this is prominently displayed by docker the first time the script is run, as it can't find the image locally and has to fetch it first. Afterwards, users can still use 'docker image ls' to see what images they have locally. So let's remove 'set -x' before running docker. Signed-off-by: Giulio Benetti [yann.morin.1998 at free.fr: reword and expand commit log] Signed-off-by: Yann E. MORIN --- utils/docker-run | 1 - 1 file changed, 1 deletion(-) diff --git a/utils/docker-run b/utils/docker-run index bdbc979264..5653764254 100755 --- a/utils/docker-run +++ b/utils/docker-run @@ -6,7 +6,6 @@ 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 exec docker run -it --rm \ --user $(id -u):$(id -g) \ --mount "type=bind,src=${MAIN_DIR},dst=${MAIN_DIR}" \ From yann.morin.1998 at free.fr Wed Feb 16 21:56:52 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Feb 2022 22:56:52 +0100 Subject: [Buildroot] [PATCH] utils/docker-run: hide docker run command In-Reply-To: <20220214173855.4071040-1-giulio.benetti@benettiengineering.com> References: <20220214173855.4071040-1-giulio.benetti@benettiengineering.com> Message-ID: <20220216215652.GE522310@scaer> Giulio, All, On 2022-02-14 18:38 +0100, Giulio Benetti spake thusly: > Since this is a helper script I don't find the reason to show the command > we're issuing, so let's remove 'set -x' before running docker. > > Signed-off-by: Giulio Benetti Applied to master with a reworded and expanded commit log, thanks. Regards, Yann E. MORIN. > --- > utils/docker-run | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/utils/docker-run b/utils/docker-run > index 0614f1325d..55dafd22a3 100755 > --- a/utils/docker-run > +++ b/utils/docker-run > @@ -6,5 +6,4 @@ 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 > exec docker run -v "${MAIN_DIR}:/home/br-user" -t "${IMAGE}" "$@" > -- > 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 peter at korsgaard.com Wed Feb 16 22:18:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 23:18:44 +0100 Subject: [Buildroot] [PATCH 1/2] package/python-sqliteschema: drop python-six dependency In-Reply-To: <20220125213242.301404-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 25 Jan 2022 22:32:41 +0100") References: <20220125213242.301404-1-fontaine.fabrice@gmail.com> Message-ID: <87v8xefoaj.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > 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 Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 16 22:17:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 23:17:53 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/python-sqliteschema: drop python-six dependency Message-ID: <20220216221116.BA78C83785@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c060023e10786641e7d9d9994ddc65ac88e756a2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 66192c66b9421b95f6cc45a46264c0193a873c58) Signed-off-by: Peter Korsgaard --- 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 From peter at korsgaard.com Wed Feb 16 22:18:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 23:18:26 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/python-sqliteschema: bump to version 1.2.1 Message-ID: <20220216221116.C2EC683787@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8d79accf96a135bef77875949a3e33e8c92a8033 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x https://github.com/thombashi/sqliteschema/releases/tag/v1.2.1 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 5eff46a6c97203e7874edc931c4180f606f08275) Signed-off-by: Peter Korsgaard --- 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 From peter at korsgaard.com Wed Feb 16 22:19:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 23:19:07 +0100 Subject: [Buildroot] [PATCH 2/2] package/python-sqliteschema: bump to version 1.2.1 In-Reply-To: <20220125213242.301404-2-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 25 Jan 2022 22:32:42 +0100") References: <20220125213242.301404-1-fontaine.fabrice@gmail.com> <20220125213242.301404-2-fontaine.fabrice@gmail.com> Message-ID: <87r182fo9w.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://github.com/thombashi/sqliteschema/releases/tag/v1.2.1 > Signed-off-by: Fabrice Fontaine Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 16 22:23:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 23:23:05 +0100 Subject: [Buildroot] [PATCH] package/xen: security bump to version 4.14.4 In-Reply-To: <20220205135132.3007-1-peter@korsgaard.com> (Peter Korsgaard's message of "Sat, 5 Feb 2022 14:51:30 +0100") References: <20220205135132.3007-1-peter@korsgaard.com> Message-ID: <87mtiqfo3a.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Includes a number of bugfixes and the security fixes up to xsa-395: > https://xenproject.org/downloads/xen-project-archives/xen-project-4-14-series/xen-project-4-14-4/ > Drop the now upstream xsa38* patches. > Signed-off-by: Peter Korsgaard Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 16 22:22:48 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 23:22:48 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/xen: security bump to version 4.14.4 Message-ID: <20220216221530.45F8A8378B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=245a2838267334e2d6e2d62a749f6b386f82a1ba branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Includes a number of bugfixes and the security fixes up to xsa-395: https://xenproject.org/downloads/xen-project-archives/xen-project-4-14-series/xen-project-4-14-4/ Drop the now upstream xsa38* patches. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit 7d3845f10ccc0810243036439b955cd9f49d3da4) Signed-off-by: Peter Korsgaard --- package/xen/xen.hash | 11 +---------- package/xen/xen.mk | 19 +------------------ 2 files changed, 2 insertions(+), 28 deletions(-) diff --git a/package/xen/xen.hash b/package/xen/xen.hash index 10a778053a..a81d05e3f7 100644 --- a/package/xen/xen.hash +++ b/package/xen/xen.hash @@ -1,12 +1,3 @@ # Locally computed -sha256 a3dad76a772393a1875e8f44a6059a95fea4bde40f97b800966969ac6f3a498d xen-4.14.3.tar.gz +sha256 e76d56dfcdabf5d80aa06819f44472de49526a518dbb483eb08e7ff9aec2c669 xen-4.14.4.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 cfc166dc4c..03341d4275 100644 --- a/package/xen/xen.mk +++ b/package/xen/xen.mk @@ -4,30 +4,13 @@ # ################################################################################ -XEN_VERSION = 4.14.3 +XEN_VERSION = 4.14.4 XEN_SITE = https://downloads.xenproject.org/release/xen/$(XEN_VERSION) XEN_LICENSE = GPL-2.0 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 Wed Feb 16 22:22:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 23:22:30 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/xen: security bump to version 4.14.4 Message-ID: <20220216221536.64E0E83794@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1a9431d52d43461fb8b844fd2e7d426624cb85c8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Includes a number of bugfixes and the security fixes up to xsa-395: https://xenproject.org/downloads/xen-project-archives/xen-project-4-14-series/xen-project-4-14-4/ Drop the now upstream xsa38* patches. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit 7d3845f10ccc0810243036439b955cd9f49d3da4) Signed-off-by: Peter Korsgaard --- package/xen/xen.hash | 11 +---------- package/xen/xen.mk | 19 +------------------ 2 files changed, 2 insertions(+), 28 deletions(-) diff --git a/package/xen/xen.hash b/package/xen/xen.hash index 10a778053a..a81d05e3f7 100644 --- a/package/xen/xen.hash +++ b/package/xen/xen.hash @@ -1,12 +1,3 @@ # Locally computed -sha256 a3dad76a772393a1875e8f44a6059a95fea4bde40f97b800966969ac6f3a498d xen-4.14.3.tar.gz +sha256 e76d56dfcdabf5d80aa06819f44472de49526a518dbb483eb08e7ff9aec2c669 xen-4.14.4.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 cfc166dc4c..03341d4275 100644 --- a/package/xen/xen.mk +++ b/package/xen/xen.mk @@ -4,30 +4,13 @@ # ################################################################################ -XEN_VERSION = 4.14.3 +XEN_VERSION = 4.14.4 XEN_SITE = https://downloads.xenproject.org/release/xen/$(XEN_VERSION) XEN_LICENSE = GPL-2.0 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 fontaine.fabrice at gmail.com Wed Feb 16 22:33:49 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 16 Feb 2022 23:33:49 +0100 Subject: [Buildroot] [PATCH 1/1] package/luasyslog: fix build with Lua 5.4 Message-ID: <20220216223349.2531296-1-fontaine.fabrice@gmail.com> Fix the following build failure with Lua 5.4 raised since commit 4f9a5659023c66fc166de28fd39a6c97a9490667: In file included from lsyslog.c:11: compat-5.3.h:402:4: error: #error "unsupported Lua version (i.e. not Lua 5.1, 5.2, or 5.3)" 402 | # error "unsupported Lua version (i.e. not Lua 5.1, 5.2, or 5.3)" | ^~~~~ Fixes: - http://autobuild.buildroot.org/results/df2aabcf2ae07cad66b869ec4ac76702d2c32dc5 Signed-off-by: Fabrice Fontaine --- ...002-compat-5.3.h-add-Lua-5.4-support.patch | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 package/luasyslog/0002-compat-5.3.h-add-Lua-5.4-support.patch diff --git a/package/luasyslog/0002-compat-5.3.h-add-Lua-5.4-support.patch b/package/luasyslog/0002-compat-5.3.h-add-Lua-5.4-support.patch new file mode 100644 index 0000000000..72f337967c --- /dev/null +++ b/package/luasyslog/0002-compat-5.3.h-add-Lua-5.4-support.patch @@ -0,0 +1,43 @@ +From 0ec19dad98a18653ea58fbeae058288cf95d3e4a Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 16 Feb 2022 23:31:15 +0100 +Subject: [PATCH] compat-5.3.h: add Lua 5.4 support + +Fix the following build failure with Lua 5.4: + +In file included from lsyslog.c:11: +compat-5.3.h:402:4: error: #error "unsupported Lua version (i.e. not Lua 5.1, 5.2, or 5.3)" + 402 | # error "unsupported Lua version (i.e. not Lua 5.1, 5.2, or 5.3)" + | ^~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/df2aabcf2ae07cad66b869ec4ac76702d2c32dc5 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/ntd/luasyslog/pull/3] +--- + compat-5.3.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/compat-5.3.h b/compat-5.3.h +index 8e10893..4f8e58e 100644 +--- a/compat-5.3.h ++++ b/compat-5.3.h +@@ -397,11 +397,11 @@ COMPAT53_API void luaL_requiref (lua_State *L, const char *modname, + + + /* other Lua versions */ +-#if !defined(LUA_VERSION_NUM) || LUA_VERSION_NUM < 501 || LUA_VERSION_NUM > 503 ++#if !defined(LUA_VERSION_NUM) || LUA_VERSION_NUM < 501 || LUA_VERSION_NUM > 504 + +-# error "unsupported Lua version (i.e. not Lua 5.1, 5.2, or 5.3)" ++# error "unsupported Lua version (i.e. not Lua 5.1, 5.2, 5.3 or 5.4)" + +-#endif /* other Lua versions except 5.1, 5.2, and 5.3 */ ++#endif /* other Lua versions except 5.1, 5.2, 5.3 and 5.4 */ + + + +-- +2.34.1 + -- 2.34.1 From james.hilliard1 at gmail.com Thu Feb 17 00:53:44 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 16 Feb 2022 17:53:44 -0700 Subject: [Buildroot] [PATCH 1/1] package/bpftool: bump to version 6.7.0 Message-ID: <20220217005344.2357385-1-james.hilliard1@gmail.com> Fixes: http://autobuild.buildroot.net/results/8bf/8bfc2abe3ab7a0b53aa717c800a4c7a3c964f426 Signed-off-by: James Hilliard --- package/bpftool/bpftool.hash | 2 +- package/bpftool/bpftool.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/bpftool/bpftool.hash b/package/bpftool/bpftool.hash index c7d4ae250e..2e414b8eb8 100644 --- a/package/bpftool/bpftool.hash +++ b/package/bpftool/bpftool.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 c868cb85bf44195ec6cd20649c3db4f7aff64a38d950a1c2911d981fb2d7042c bpftool-a7f0e7f057283ae8af3de4578bcb8b7ee80b7144-br1.tar.gz +sha256 e4ce219d3b87dd70d8dbfb8f02bd356f70c010f739f17baca1c8912199a8a72b bpftool-v6.7.0-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 index 4276f91958..8742917253 100644 --- a/package/bpftool/bpftool.mk +++ b/package/bpftool/bpftool.mk @@ -4,7 +4,7 @@ # ################################################################################ -BPFTOOL_VERSION = a7f0e7f057283ae8af3de4578bcb8b7ee80b7144 +BPFTOOL_VERSION = v6.7.0 BPFTOOL_SITE = https://github.com/libbpf/bpftool BPFTOOL_SITE_METHOD = git BPFTOOL_GIT_SUBMODULES = YES -- 2.25.1 From thomas.petazzoni at bootlin.com Thu Feb 17 07:13:34 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 17 Feb 2022 07:13:34 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-02-16 Message-ID: <20220217071338.DD9E841632@smtp4.osuosl.org> Hello, Autobuild statistics for 2022-02-16 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 40 | 5 | 0 | 45 | 2021.11.x | 21 | 2 | 0 | 23 | master | 47 | 35 | 1 | 83 | Classification of failures by reason for master ----------------------------------------------- bpftool-a7f0e7f057283ae8af3... | 5 cryptsetup-2.4.3 | 5 host-libselinux-3.3 | 5 bluez5_utils-5.63 | 3 tovid-87c676f4aadb7303d2cd9... | 2 unknown | 2 wavemon-0.9.4 | 2 adwaita-icon-theme-3.37.2 | 1 bird-2.0.8 | 1 frr | 1 frr-8.1 | 1 luasyslog-2.2.0 | 1 mongodb-4.2.18 | 1 protozero-1.7.1 | 1 python-greenlet-1.1.2 | 1 qt5base-53a047c212af7fbded6... | 1 sdl2_ttf-2.0.18 | 1 target-finalize | 1 ulog-0389d243352255f6182326... | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- xtensa | adwaita-icon-theme-3.37.2 | NOK | http://autobuild.buildroot.net/results/5aadabaf26a92ab96332bb09f4343bbfd5341786 | mips64el | bird-2.0.8 | NOK | http://autobuild.buildroot.net/results/09f42973cfee21754e4f6d6782567cf897bd8dfd | mips64el | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/ac6792d046c6c1eae9f233621da1e01e4a4fbdd3 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/ea83e269e479f8bfa4e39f7376f111db6843e999 | mips64el | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/af177e9fa52b55149d7fb50759dc0d26b97c3732 | mipsel | bpftool-a7f0e7f057283ae8af3... | NOK | http://autobuild.buildroot.net/results/8bfc2abe3ab7a0b53aa717c800a4c7a3c964f426 | microblazeel | bpftool-a7f0e7f057283ae8af3... | NOK | http://autobuild.buildroot.net/results/90945e38d8cd15e73ab97b5796aa7dda0fb88e8b | i686 | bpftool-a7f0e7f057283ae8af3... | NOK | http://autobuild.buildroot.net/results/8ea69cd0942114218c0e68441d5100be02fd1eb0 | mips64el | bpftool-a7f0e7f057283ae8af3... | NOK | http://autobuild.buildroot.net/results/7955d2fe892611c4b2cf3af08aa7bf9eb9431017 | mips64el | bpftool-a7f0e7f057283ae8af3... | NOK | http://autobuild.buildroot.net/results/cb68a0a498f6c7d493e191b0e190ab7d3209d0e1 | arm | cryptsetup-2.4.3 | NOK | http://autobuild.buildroot.net/results/5b1ba16fad1ae337f894bcfb3d5070179f4c02d5 | aarch64 | cryptsetup-2.4.3 | NOK | http://autobuild.buildroot.net/results/4bb616907192f0a836eab716960ad2856dc2342c | powerpc | cryptsetup-2.4.3 | NOK | http://autobuild.buildroot.net/results/325c3d7e1085c6bef88fc4467139b181eac009e9 | arm | cryptsetup-2.4.3 | NOK | http://autobuild.buildroot.net/results/d520132c758080a455ee5f5a49eabfbd338964b7 | mips | cryptsetup-2.4.3 | NOK | http://autobuild.buildroot.net/results/9b741530fae2b42157d80d599cacd8af86c8ecd0 | arc | frr | TIM | http://autobuild.buildroot.net/results/1e7a8c284a09bbc8544ca28b563bb6051815cf76 | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/9cf63046779e2572fe96c2429c18e8970ef9dd1d | riscv64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/1d7857f7d084b70e539e3027019896bcfcd3c8fb | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/c9638aee4c00fb20a6d4949eeff91546e0148596 | mipsel | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/25f0f8eff63ffab9bb79554a1eb994b9b64519d7 | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/4f0b29d3e2d8a423112bfc8c9081b44cb3aaee80 | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/267af119a7014227d0b74c61bc7ff7feda85a459 | arm | luasyslog-2.2.0 | NOK | http://autobuild.buildroot.net/results/24495d12812c81cc603e6c369b77726ba3ddc81a | arm | mongodb-4.2.18 | NOK | http://autobuild.buildroot.net/results/2db2c77ec9c0cd2020c4f83883d5cad3be9a20fe | arc | protozero-1.7.1 | NOK | http://autobuild.buildroot.net/results/8cbddfcde6adc201300cbfc7413f6e87aee27bd7 | arm | python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/10ca98b0f48f824b95691705eb14124273ea1c9a | riscv32 | qt5base-53a047c212af7fbded6... | NOK | http://autobuild.buildroot.net/results/4325dd43fa1480925a10602d82b8dfaf35e8624c | arm | sdl2_ttf-2.0.18 | NOK | http://autobuild.buildroot.net/results/cba34c431f8d1315e9ca9159274421a8219a701e | s390x | target-finalize | NOK | http://autobuild.buildroot.net/results/b287fc499cca5b1b6a46b04a368ae2af77cbacb3 | powerpc | tovid-87c676f4aadb7303d2cd9... | NOK | http://autobuild.buildroot.net/results/e4a89213aeb6336c86f9b85c43ef266004ac97b1 | xtensa | tovid-87c676f4aadb7303d2cd9... | NOK | http://autobuild.buildroot.net/results/84b2dc4ad2baac6a3bff86fdccfa8e8fb62bc23a | arc | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/3acd0250db862e4c3ff241262d075fae386123ed | arc | unknown | NOK | http://autobuild.buildroot.net/results/4e4560e8cfc4b3968bdc15d2263c56c1e9f33f11 | powerpc | unknown | NOK | http://autobuild.buildroot.net/results/c3944c8bee21c685663e6c1785d37a39bd5ff7d4 | m68k | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/621bd326e9eaac3dbb1f53ead7722dd0e0f36a08 | mips64el | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/6daa27af2c5b93c5cd4df17fd8cf5db952c57491 | Classification of failures by reason for 2021.02.x -------------------------------------------------- monkey-f54856ce250c4e257354... | 2 apitrace-9.0 | 1 cutelyst-2.11.0 | 1 host-sentry-cli-1.57.0 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- m68k | apitrace-9.0 | NOK | http://autobuild.buildroot.net/results/55cc3859985548ee6a1b7c66341477a17dcc2aeb | mips64el | cutelyst-2.11.0 | NOK | http://autobuild.buildroot.net/results/7622eea4419d1cae298fc2133c549af59cde33ab | m68k | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/a316d6dd18291fe6f16e64780aa073cab2f57e8b | aarch64_be | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/38f1f3c23f829c6ee6498690bdcdc37a716f4291 | aarch64_be | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/69a5fe12c0a1a65822b5713227f0a437b01d99b8 | Classification of failures by reason for 2021.11.x -------------------------------------------------- mtd-2.1.3 | 1 unknown | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64el | mtd-2.1.3 | NOK | http://autobuild.buildroot.net/results/dcac657a96b8f7f77504eac5067de26fb16cda84 | s390x | unknown | NOK | http://autobuild.buildroot.net/results/c630552d7721ed1b6f5526682fa3ca74c9b8836a | Gitlab CI results for 2022-02-16 ================================ Detail of runtime-test failures for 2022.02-rc1 ----------------------------------------------- runtime-test | link to the job | orph? --------------------------+---------------------------------------------------------------+------ TestIPythonPy3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2087852418 | ORPH TestLuaLuasyslog | https://gitlab.com/buildroot.org/buildroot/-/jobs/2087852492 | ORPH TestLxc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2087852495 | ORPH TestPerlLWPProtocolhttps | https://gitlab.com/buildroot.org/buildroot/-/jobs/2087852520 | ORPH TestPythonPy3Cryptography | https://gitlab.com/buildroot.org/buildroot/-/jobs/2087852572 | ORPH TestPythonPy3Pyyaml | https://gitlab.com/buildroot.org/buildroot/-/jobs/2087852603 | ORPH TestRust | https://gitlab.com/buildroot.org/buildroot/-/jobs/2087852624 | ORPH TestRustBin | https://gitlab.com/buildroot.org/buildroot/-/jobs/2087852627 | ORPH -- http://autobuild.buildroot.net From moritz at h6t.eu Thu Feb 17 07:43:38 2022 From: moritz at h6t.eu (moritz at h6t.eu) Date: Thu, 17 Feb 2022 08:43:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/cryptsetup: fix build failure with libgcrypt Message-ID: <20220217074338.147889-1-moritz@h6t.eu> From: Moritz Bitsch The patch 0001-Add-check-program-for-symver-attribute.patch touches a autoconf relevant file which causes a configure --recheck in the make step without proper CONF_ENV. Running autoreconf prevents this. Signed-off-by: Moritz Bitsch --- package/cryptsetup/cryptsetup.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index 2e06047c56..8373f0ab74 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -19,6 +19,7 @@ CRYPTSETUP_CPE_ID_VENDOR = cryptsetup_project CRYPTSETUP_INSTALL_STAGING = YES CRYPTSETUP_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)" CRYPTSETUP_CONF_OPTS += --enable-blkid --enable-libargon2 +CRYPTSETUP_AUTORECONF = YES # cryptsetup uses libgcrypt by default, but can be configured to use OpenSSL # or kernel crypto modules instead -- 2.35.1 From buildroot at heine.tech Thu Feb 17 09:38:17 2022 From: buildroot at heine.tech (Michael Nosthoff) Date: Thu, 17 Feb 2022 10:38:17 +0100 Subject: [Buildroot] =?utf-8?b?d3BhX3N1cHBsaWNhbnQ/PT0/dXRmLTg/cT8gMi4x?= =?utf-8?q?0=3A_ignored_build_options?= Message-ID: <3f79-620e1780-1-7f8ee50@116634595> Hi Sergey, all, @Sergey: I put you on the list of recipients since you provided the version bump to buildroot. Since hostapd 2.10 the wpa_supplicant build ignores the two options CONFIG_BUILD_WPA_CLIENT_SO and CONFIG_NO_WPA_PASSPHRASE. This leads to the following build error in buildroot when BR2_PACKAGE_WPA_SUPPLICANT_WPA_CLIENT_SO is selected: /usr/bin/install: cannot stat '/buildroot/build/build/wpa_supplicant-2.10/wpa_supplicant/libwpa_client.so': No such file or directory The Bug was probably introduced with commit [0] which reworked the .config parsing. The two mentioned options are now evaluated before the .config file is parsed an thus ignored. I'm not familiar enough with the wpa_supplicant build to come up with a proper patch. But maybe someone is willing to take a look at this. Regards, Michael [0] https://w1.fi/cgit/hostap/commit/wpa_supplicant/Makefile?id=a41a29192e5d196444fc8859100762b04ff0d1c2 From fontaine.fabrice at gmail.com Thu Feb 17 09:40:48 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 17 Feb 2022 10:40:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/luasyslog: bump to version 2.2.1 Message-ID: <20220217094048.2756293-1-fontaine.fabrice@gmail.com> This bump contains a single commit which fixes the following build failure with Lua 5.4 raised since commit 4f9a5659023c66fc166de28fd39a6c97a9490667: In file included from lsyslog.c:11: compat-5.3.h:402:4: error: #error "unsupported Lua version (i.e. not Lua 5.1, 5.2, or 5.3)" 402 | # error "unsupported Lua version (i.e. not Lua 5.1, 5.2, or 5.3)" | ^~~~~ Also update indentation in hash file (two spaces) Fixes: - http://autobuild.buildroot.org/results/df2aabcf2ae07cad66b869ec4ac76702d2c32dc5 Signed-off-by: Fabrice Fontaine --- package/luasyslog/luasyslog.hash | 4 ++-- package/luasyslog/luasyslog.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/luasyslog/luasyslog.hash b/package/luasyslog/luasyslog.hash index bcb6a7e025..1e2a5ddec5 100644 --- a/package/luasyslog/luasyslog.hash +++ b/package/luasyslog/luasyslog.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7f7dad64117407f2484ff5b53e90804f923a99fcbde5872e54f6aba53f482da0 luasyslog-2.2.0.tar.gz -sha256 833457938f5155e65dabda12a5c9d4b6fd7fb92dd7ead584c1c30cfb0c84adf4 COPYING +sha256 b1b19ca142130f93c3f8f2e85303ff50cc6f4ed4aa52b8569176ae56e3dc3f43 luasyslog-2.2.1.tar.gz +sha256 833457938f5155e65dabda12a5c9d4b6fd7fb92dd7ead584c1c30cfb0c84adf4 COPYING diff --git a/package/luasyslog/luasyslog.mk b/package/luasyslog/luasyslog.mk index 049e068a13..972d4c5a7d 100644 --- a/package/luasyslog/luasyslog.mk +++ b/package/luasyslog/luasyslog.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUASYSLOG_VERSION = 2.2.0 +LUASYSLOG_VERSION = 2.2.1 LUASYSLOG_SITE = $(call github,ntd,luasyslog,$(LUASYSLOG_VERSION)) LUASYSLOG_DEPENDENCIES = host-luarocks luainterpreter LUASYSLOG_LICENSE = MIT -- 2.34.1 From dopsi at dopsi.ch Thu Feb 17 08:34:40 2022 From: dopsi at dopsi.ch (Simon Doppler) Date: Thu, 17 Feb 2022 09:34:40 +0100 Subject: [Buildroot] Dependency detection issue in external tree Message-ID: <18f64b226c55f9ff8c0bdc109793dc9a0e0657ce.camel@dopsi.ch> Hello, I am currently working on debugging early boot on a STM32MP1 based board and I would like to use stm32wrapper4dbg to wrap the FSBL. Since we use a fixed version of Buildroot, I have would like to keep the packages in an external tree (we will work on upstreaming them in the future). In the external.mk file, when adding an extra dependency with ARM_TRUSTED_FIRMWARE_DEPENDENCIES += host-stm32wrapper4dbg the dependency shows up in the dependency graph, in the `make arm- trusted-firmware-show-depends` output but not in `make arm-trusted- firmware-show-build-order` output. It does also not build the host-stm32wrapper4dbg package before the arm-trusted-firmware package. The hook that wraps the FSBL does however work when I build host- stm32wrapper4dbg before building the rest of the system. Is what I want to do actually supported (adding a dependency in an external.mk file)? Do you have any idea, when I should look to fix this dependency issue? I have set up a minimal example here: https://gitlab.com/dopsi/mve-br2-external-dep (look at the README.md for details). Best regards Simon Doppler From aperez at igalia.com Thu Feb 17 12:36:20 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Thu, 17 Feb 2022 13:36:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/wpewebkit: bump version to 2.34.2 In-Reply-To: <20220124161611.GB162969@momiji> References: <20211124205607.3021277-1-aperez@igalia.com> <87mtjlwlvo.fsf@dell.be.48ers.dk> <20220124161611.GB162969@momiji> Message-ID: <20220217133620.GB757559@momiji> Hello again, On Mon, 24 Jan 2022 16:16:11 +0200 Adrian Perez de Castro wrote: > 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 Here we go: https://bugs.webkit.org/show_bug.cgi?id=236770 ? turns out the build was broken in the development branch as well, and I plan to backport the patch to 2.34.x. > Also I just submitted some moments ago a small patch to update the WPE WebKit > package to 2.34.4 as well. I am releasing 2.34.6 this week, which will include the patch mentioned above, so I will submit directly an update to 2.34.6 once it has been published. 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 geomatsi at gmail.com Thu Feb 17 12:56:15 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Thu, 17 Feb 2022 15:56:15 +0300 Subject: [Buildroot] wpa_supplicant 2.10: ignored build options In-Reply-To: <3f79-620e1780-1-7f8ee50@116634595> References: <3f79-620e1780-1-7f8ee50@116634595> Message-ID: Hi Michael, > Hi Sergey, all, > > @Sergey: I put you on the list of recipients since you provided the version bump to buildroot. > > Since hostapd 2.10 the wpa_supplicant build ignores the two options CONFIG_BUILD_WPA_CLIENT_SO and CONFIG_NO_WPA_PASSPHRASE. > > This leads to the following build error in buildroot when BR2_PACKAGE_WPA_SUPPLICANT_WPA_CLIENT_SO is selected: > > /usr/bin/install: cannot stat '/buildroot/build/build/wpa_supplicant-2.10/wpa_supplicant/libwpa_client.so': No such file or directory > > The Bug was probably introduced with commit [0] which reworked the .config parsing. > The two mentioned options are now evaluated before the .config file is parsed an thus ignored. > > I'm not familiar enough with the wpa_supplicant build to come up with a proper patch. But maybe someone is willing to take a look at this. > > Regards, > Michael > > [0] https://w1.fi/cgit/hostap/commit/wpa_supplicant/Makefile?id=a41a29192e5d196444fc8859100762b04ff0d1c2 Thanks for heads-up ! Buildroot CI has already reported this problem: http://autobuild.buildroot.net/results/001981339f3b895ecd9208a747a0e47d07c9583a/ I plan take a look at hostapd/wpa_s failures over the weekend. Regards, Sergey From peter at korsgaard.com Thu Feb 17 13:12:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Feb 2022 14:12:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/wpewebkit: bump version to 2.34.2 In-Reply-To: <20220217133620.GB757559@momiji> (Adrian Perez de Castro's message of "Thu, 17 Feb 2022 13:36:20 +0100") References: <20211124205607.3021277-1-aperez@igalia.com> <87mtjlwlvo.fsf@dell.be.48ers.dk> <20220124161611.GB162969@momiji> <20220217133620.GB757559@momiji> Message-ID: <87a6epfxi3.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 > Here we go: https://bugs.webkit.org/show_bug.cgi?id=236770 ? turns out the > build was broken in the development branch as well, and I plan to backport > the patch to 2.34.x. >> Also I just submitted some moments ago a small patch to update the WPE WebKit >> package to 2.34.4 as well. > I am releasing 2.34.6 this week, which will include the patch mentioned > above, so I will submit directly an update to 2.34.6 once it has been > published. Ok. Even though we are post-rc1, I think it still makes sense to include this on master for 2022.02. -- Bye, Peter Korsgaard From giulio.benetti at benettiengineering.com Thu Feb 17 13:29:11 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 17 Feb 2022 14:29:11 +0100 Subject: [Buildroot] [PATCH 1/1] package/cryptsetup: fix build failure with libgcrypt In-Reply-To: <20220217074338.147889-1-moritz@h6t.eu> References: <20220217074338.147889-1-moritz@h6t.eu> Message-ID: <1544B961-F072-436D-9887-4EC3CFDC4CD3@benettiengineering.com> Hi Moritz, > Il giorno 17 feb 2022, alle ore 08:55, Moritz Bitsch via buildroot ha scritto: > > ?From: Moritz Bitsch > > The patch 0001-Add-check-program-for-symver-attribute.patch touches > a autoconf relevant file which causes a configure --recheck in the > make step without proper CONF_ENV. Running autoreconf prevents this. Thank you for the contribution, but Fabrice already sent a patch for that: https://patchwork.ozlabs.org/project/buildroot/patch/20220213210504.1416861-1-fontaine.fabrice at gmail.com/ I suggest you to always check patchwork before working on a patch. (Yes, it happened to me too some time :-)). Best regards Giulio > > Signed-off-by: Moritz Bitsch > --- > package/cryptsetup/cryptsetup.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk > index 2e06047c56..8373f0ab74 100644 > --- a/package/cryptsetup/cryptsetup.mk > +++ b/package/cryptsetup/cryptsetup.mk > @@ -19,6 +19,7 @@ CRYPTSETUP_CPE_ID_VENDOR = cryptsetup_project > CRYPTSETUP_INSTALL_STAGING = YES > CRYPTSETUP_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)" > CRYPTSETUP_CONF_OPTS += --enable-blkid --enable-libargon2 > +CRYPTSETUP_AUTORECONF = YES > > # cryptsetup uses libgcrypt by default, but can be configured to use OpenSSL > # or kernel crypto modules instead > -- > 2.35.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -------------- next part -------------- An HTML attachment was scrubbed... URL: From fontaine.fabrice at gmail.com Thu Feb 17 13:46:37 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 17 Feb 2022 14:46:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5base: put back riscv32 patch Message-ID: <20220217134637.3728619-1-fontaine.fabrice@gmail.com> Commit 5770a645a3a49a3f0f02972131a4ff5283b4c11e wrongly removed riscv32 patch resulting in the following build failure: In file included from thread/qmutex_linux.cpp:45, from thread/qmutex.cpp:806: 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 Fixes: - http://autobuild.buildroot.org/results/ff90bc7680acf1487ed58e5e25cf1a5f13dfaedb Signed-off-by: Fabrice Fontaine --- .../qt5base/0007-Fix-build-on-riscv32.patch | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 package/qt5/qt5base/0007-Fix-build-on-riscv32.patch diff --git a/package/qt5/qt5base/0007-Fix-build-on-riscv32.patch b/package/qt5/qt5base/0007-Fix-build-on-riscv32.patch new file mode 100644 index 0000000000..5561acb9ae --- /dev/null +++ b/package/qt5/qt5base/0007-Fix-build-on-riscv32.patch @@ -0,0 +1,46 @@ +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] +Signed-off-by: Fabrice Fontaine +--- + 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 + -- 2.34.1 From peter at korsgaard.com Thu Feb 17 13:48:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Feb 2022 14:48:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/cgilua: add CGILUA_CPE_ID_VENDOR In-Reply-To: <20220131220240.127249-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 31 Jan 2022 23:02:40 +0100") References: <20220131220240.127249-1-fontaine.fabrice@gmail.com> Message-ID: <874k4xfvtc.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > 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 Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 17 13:48:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Feb 2022 14:48:06 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/cgilua: add CGILUA_CPE_ID_VENDOR Message-ID: <20220217134157.6B4A983776@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5b46038f99d4a8d0492c2b25b72ed15e0e24c206 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x 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 Signed-off-by: Thomas Petazzoni (cherry picked from commit 755116460b8de88cb833ab4bf37649a7fb26728d) Signed-off-by: Peter Korsgaard --- package/cgilua/cgilua.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/cgilua/cgilua.mk b/package/cgilua/cgilua.mk index cd78841fdb..5994dfc838 100644 --- a/package/cgilua/cgilua.mk +++ b/package/cgilua/cgilua.mk @@ -7,5 +7,6 @@ CGILUA_VERSION = 5.2.1-1 CGILUA_LICENSE = MIT CGILUA_LICENSE_FILES = $(CGILUA_SUBDIR)/doc/us/license.html +CGILUA_CPE_ID_VENDOR = keplerproject $(eval $(luarocks-package)) From peter at korsgaard.com Thu Feb 17 13:53:48 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Feb 2022 14:53:48 +0100 Subject: [Buildroot] [PATCH v1] DEVELOPERS: Add packages guile and bdwgc to Pedro Aguilar In-Reply-To: <20220206092048.1901703-1-paguilar@paguilar.org> (Pedro Aguilar's message of "Sun, 6 Feb 2022 10:20:48 +0100") References: <20220206092048.1901703-1-paguilar@paguilar.org> Message-ID: <87zgmpeh03.fsf@dell.be.48ers.dk> >>>>> "Pedro" == Pedro Aguilar writes: > Signed-off-by: Pedro Aguilar Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 17 13:53:25 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Feb 2022 14:53:25 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] DEVELOPERS: add guile and bdwgc packages to Pedro Aguilar Message-ID: <20220217134615.DC23882792@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b96f2215394e378835188f7551ba3c05d47f6782 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Pedro Aguilar Signed-off-by: Thomas Petazzoni (cherry picked from commit 437543c7d907943a159870a4b04efa88e36cc460) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 7ec36e2185..bd8c99a229 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2000,6 +2000,8 @@ F: package/lightning/ F: package/umtprd/ N: Pedro Aguilar +F: package/bdwgc/ +F: package/guile/ F: package/libunistring/ N: Peter Korsgaard From fontaine.fabrice at gmail.com Thu Feb 17 13:55:39 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 17 Feb 2022 14:55:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/safeclib: disable tests Message-ID: <20220217135539.3784058-1-fontaine.fabrice@gmail.com> Disable tests to avoid the following build failure raised since bump to version 3.7.1 in commit cc27267ae41bf44276c63b1e86042c4fae4adf50 and https://github.com/rurban/safeclib/commit/b90c52b1691fe82ce0a0681a503e1d45584f0162: In file included from perf_memcpy32_s.c:7: perf_private.h: In function 'rdtsc': perf_private.h:72:3: error: 'asm' undeclared (first use in this function) 72 | asm volatile("mrc p15, 0, %0, c9, c14, 0" : "=r"(pmuseren)); | ^~~ Fixes: - http://autobuild.buildroot.org/results/ceb13c071b1461eb6d73f5940d6b010095127f41 Signed-off-by: Fabrice Fontaine --- .../0001-Add-an-option-to-disable-tests.patch | 66 +++++++++++++++++++ package/safeclib/safeclib.mk | 4 +- 2 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 package/safeclib/0001-Add-an-option-to-disable-tests.patch diff --git a/package/safeclib/0001-Add-an-option-to-disable-tests.patch b/package/safeclib/0001-Add-an-option-to-disable-tests.patch new file mode 100644 index 0000000000..420578fe2e --- /dev/null +++ b/package/safeclib/0001-Add-an-option-to-disable-tests.patch @@ -0,0 +1,66 @@ +From 55b861a098434843f5614adcaab469defed95321 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 17 Feb 2022 14:36:51 +0100 +Subject: [PATCH] Add an option to disable tests + +Add an option to disable tests which are not always needed (e.g. on +embedded systems) and can raise the following build failure on some +architectures such as ARM cortex-a9: + +In file included from perf_memcpy32_s.c:7: +perf_private.h: In function 'rdtsc': +perf_private.h:72:3: error: 'asm' undeclared (first use in this function) + 72 | asm volatile("mrc p15, 0, %0, c9, c14, 0" : "=r"(pmuseren)); + | ^~~ + +Fixes: + - http://autobuild.buildroot.org/results/ceb13c071b1461eb6d73f5940d6b010095127f41 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/rurban/safeclib/pull/115] +--- + Makefile.am | 6 +++++- + configure.ac | 10 ++++++++++ + 2 files changed, 15 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 429a84b2..7d14afb6 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -34,7 +34,11 @@ + ACLOCAL_AMFLAGS = -I m4 --install ${ACLOCAL_FLAGS} + + # Sub-directories to preform recursive make in +-SUBDIRS = src tests ++SUBDIRS = src ++ ++if ENABLE_TESTS ++SUBDIRS += tests ++endif + + # Library header files + pkginclude_HEADERS = \ +diff --git a/configure.ac b/configure.ac +index b7fd03e9..8c8fbee7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -360,6 +360,16 @@ AC_ARG_ENABLE(doc, + esac], [enable_doc=true]) + AM_CONDITIONAL(ENABLE_DOC, test "x$enable_doc" = "xtrue") + ++AC_ARG_ENABLE(tests, ++ AS_HELP_STRING([--disable-tests], ++ [disable tests @<:@default=no@:>@]), ++ [case "${enableval}" in ++ yes) enable_tests=true ;; ++ no) enable_tests=false ;; ++ *) AC_MSG_ERROR([bad value ${enableval} for --enable-tests]) ;; ++ esac], [enable_tests=true]) ++AM_CONDITIONAL(ENABLE_TESTS, test "x$enable_tests" = "xtrue") ++ + dnl for windows dllimport. checking pic_flag DLL_EXPORT would be better, + dnl but this is only enabled for the shared objs, and we need it in the config + dnl for our tests. +-- +2.34.1 + diff --git a/package/safeclib/safeclib.mk b/package/safeclib/safeclib.mk index bc58c1a38c..8f909f729b 100644 --- a/package/safeclib/safeclib.mk +++ b/package/safeclib/safeclib.mk @@ -11,9 +11,11 @@ SAFECLIB_SOURCE = safeclib-$(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_ENV = CFLAGS="$(TARGET_CFLAGS) -std=c99" # -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 +SAFECLIB_CONF_OPTS = --disable-hardening --disable-tests $(eval $(autotools-package)) -- 2.34.1 From peter at korsgaard.com Thu Feb 17 13:53:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Feb 2022 14:53:17 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] DEVELOPERS: add guile and bdwgc packages to Pedro Aguilar Message-ID: <20220217134828.B34E88377F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=59f0bb204f8b6b5873f758ca3f9d00cf029c8b08 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Pedro Aguilar Signed-off-by: Thomas Petazzoni (cherry picked from commit 437543c7d907943a159870a4b04efa88e36cc460) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 2f202e1f19..2cc5a12ef9 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2098,6 +2098,8 @@ F: package/lightning/ F: package/umtprd/ N: Pedro Aguilar +F: package/bdwgc/ +F: package/guile/ F: package/libunistring/ N: Peter Korsgaard From peter at korsgaard.com Thu Feb 17 13:48:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Feb 2022 14:48:00 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/cgilua: add CGILUA_CPE_ID_VENDOR Message-ID: <20220217134828.A5FBF8377B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f7d2453564c7aff2b9eefe91b7d188d888a8d03e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x 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 Signed-off-by: Thomas Petazzoni (cherry picked from commit 755116460b8de88cb833ab4bf37649a7fb26728d) Signed-off-by: Peter Korsgaard --- 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)) From marcus.hoffmann at othermo.de Thu Feb 17 14:21:19 2022 From: marcus.hoffmann at othermo.de (Marcus Hoffmann) Date: Thu, 17 Feb 2022 15:21:19 +0100 Subject: [Buildroot] [PATCH] package/rauc: add option to enable gpt support Message-ID: <20220217142120.576220-1-marcus.hoffmann@othermo.de> GPT support was disabled by default before. Signed-off-by: Marcus Hoffmann --- package/rauc/Config.in | 6 ++++++ package/rauc/rauc.mk | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/package/rauc/Config.in b/package/rauc/Config.in index b4f7b81948..2ea51f5bad 100644 --- a/package/rauc/Config.in +++ b/package/rauc/Config.in @@ -25,6 +25,12 @@ config BR2_PACKAGE_RAUC_DBUS This option enables support for controlling rauc through D-Bus. +config BR2_PACKAGE_RAUC_GPT + bool "GPT support" + select BR2_PACKAGE_UTIL_LINUX_LIBFDISK + help + This option enables support for GPT partition tables. + config BR2_PACKAGE_RAUC_NETWORK bool "network support" select BR2_PACKAGE_LIBCURL diff --git a/package/rauc/rauc.mk b/package/rauc/rauc.mk index 39f5255812..0a631c4092 100644 --- a/package/rauc/rauc.mk +++ b/package/rauc/rauc.mk @@ -19,6 +19,13 @@ else RAUC_CONF_OPTS += --disable-service endif +ifeq ($(BR2_PACKAGE_RAUC_GPT),y) +RAUC_CONF_OPTS += --enable-gpt +RAUC_DEPENDENCIES += util-linux-libs +else +RAUC_CONF_OPTS += --disable-gpt +endif + ifeq ($(BR2_PACKAGE_RAUC_NETWORK),y) RAUC_CONF_OPTS += --enable-network RAUC_DEPENDENCIES += libcurl -- 2.25.1 From aperez at igalia.com Thu Feb 17 15:09:35 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Thu, 17 Feb 2022 16:09:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/wpewebkit: bump version to 2.34.2 In-Reply-To: <87a6epfxi3.fsf@dell.be.48ers.dk> References: <20211124205607.3021277-1-aperez@igalia.com> <87mtjlwlvo.fsf@dell.be.48ers.dk> <20220124161611.GB162969@momiji> <20220217133620.GB757559@momiji> <87a6epfxi3.fsf@dell.be.48ers.dk> Message-ID: <20220217160935.GB804216@momiji> On Thu, 17 Feb 2022 14:12:04 +0100 Peter Korsgaard wrote: > >>>>> "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 > > > Here we go: https://bugs.webkit.org/show_bug.cgi?id=236770 ? turns out the > > build was broken in the development branch as well, and I plan to backport > > the patch to 2.34.x. > > >> Also I just submitted some moments ago a small patch to update the WPE WebKit > >> package to 2.34.4 as well. > > > I am releasing 2.34.6 this week, which will include the patch mentioned > > above, so I will submit directly an update to 2.34.6 once it has been > > published. > > Ok. Even though we are post-rc1, I think it still makes sense to include > this on master for 2022.02. Yay, good to know we can look into having the latest stable there. The releases are now done: https://wpewebkit.org/release/wpewebkit-2.34.6.html https://webkitgtk.org/2022/02/17/webkitgtk2.34.6-released.html We still don't have the corresponding advisory published (there is a security fix included which has a CVE number), but I am starting right now to prepare the patches to update the Buildroot packages =) 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 marcus.hoffmann at othermo.de Thu Feb 17 15:10:54 2022 From: marcus.hoffmann at othermo.de (Marcus Hoffmann) Date: Thu, 17 Feb 2022 16:10:54 +0100 Subject: [Buildroot] [PATCH 2/2] board/orangepi/orangepi-rk3399/genimage: fix partition types for gpt In-Reply-To: <20220217151054.865073-1-marcus.hoffmann@othermo.de> References: <20220217151054.865073-1-marcus.hoffmann@othermo.de> Message-ID: <20220217151054.865073-3-marcus.hoffmann@othermo.de> Fixes: ERROR: hdimage(sdcard.img): part boot: 'partition-type' is only valid for mbr and hybrid partition-table-type Signed-off-by: Marcus Hoffmann --- board/orangepi/orangepi-rk3399/genimage.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/board/orangepi/orangepi-rk3399/genimage.cfg b/board/orangepi/orangepi-rk3399/genimage.cfg index c94e0bc7cc..a02166172f 100644 --- a/board/orangepi/orangepi-rk3399/genimage.cfg +++ b/board/orangepi/orangepi-rk3399/genimage.cfg @@ -26,14 +26,13 @@ image sdcard.img { } partition boot { - partition-type = 0xC + partition-type-uuid = F bootable = "true" image = "boot.vfat" offset = 16M } partition rootfs { - partition-type = 0x83 image = "rootfs.ext4" } } -- 2.25.1 From marcus.hoffmann at othermo.de Thu Feb 17 15:10:52 2022 From: marcus.hoffmann at othermo.de (Marcus Hoffmann) Date: Thu, 17 Feb 2022 16:10:52 +0100 Subject: [Buildroot] [PATCH 0/2] defconfig fixes Message-ID: <20220217151054.865073-1-marcus.hoffmann@othermo.de> I was looking at some of the defconfigs and found these two easy to fix issues. I don't have those boards, so these are not tested besides being able to compile them again. Marcus Hoffmann (2): configs/friendlyarm_nanopi_r2s_defconfig: uboot needs openssl board/orangepi/orangepi-rk3399/genimage: fix partition types for gpt board/orangepi/orangepi-rk3399/genimage.cfg | 3 +-- configs/friendlyarm_nanopi_r2s_defconfig | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.25.1 From marcus.hoffmann at othermo.de Thu Feb 17 15:10:53 2022 From: marcus.hoffmann at othermo.de (Marcus Hoffmann) Date: Thu, 17 Feb 2022 16:10:53 +0100 Subject: [Buildroot] [PATCH 1/2] configs/friendlyarm_nanopi_r2s_defconfig: uboot needs openssl In-Reply-To: <20220217151054.865073-1-marcus.hoffmann@othermo.de> References: <20220217151054.865073-1-marcus.hoffmann@othermo.de> Message-ID: <20220217151054.865073-2-marcus.hoffmann@othermo.de> Fixes the following compile error: In file included from include/bootm.h:10, from tools/image-host.c:12: include/image.h:1178:12: fatal error: openssl/evp.h: No such file or directory 1178 | # include | ^~~~~~~~~~~~~~~ compilation terminated. Signed-off-by: Marcus Hoffmann --- configs/friendlyarm_nanopi_r2s_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/friendlyarm_nanopi_r2s_defconfig b/configs/friendlyarm_nanopi_r2s_defconfig index 818c847f4b..ce252a5d76 100644 --- a/configs/friendlyarm_nanopi_r2s_defconfig +++ b/configs/friendlyarm_nanopi_r2s_defconfig @@ -30,6 +30,7 @@ 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_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -- 2.25.1 From giulio.benetti at benettiengineering.com Thu Feb 17 15:20:59 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 17 Feb 2022 16:20:59 +0100 Subject: [Buildroot] [PATCH 1/2] configs/friendlyarm_nanopi_r2s_defconfig: uboot needs openssl In-Reply-To: <20220217151054.865073-2-marcus.hoffmann@othermo.de> References: <20220217151054.865073-2-marcus.hoffmann@othermo.de> Message-ID: <2B25121E-F5E4-4E61-BEA4-627E5689E813@benettiengineering.com> Hi Marcus, > Il giorno 17 feb 2022, alle ore 16:11, Marcus Hoffmann ha scritto: > > ?Fixes the following compile error: > > In file included from include/bootm.h:10, > from tools/image-host.c:12: > include/image.h:1178:12: fatal error: openssl/evp.h: No such file or directory > 1178 | # include > | ^~~~~~~~~~~~~~~ > compilation terminated. > > Signed-off-by: Marcus Hoffmann > --- > configs/friendlyarm_nanopi_r2s_defconfig | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/configs/friendlyarm_nanopi_r2s_defconfig b/configs/friendlyarm_nanopi_r2s_defconfig > index 818c847f4b..ce252a5d76 100644 > --- a/configs/friendlyarm_nanopi_r2s_defconfig > +++ b/configs/friendlyarm_nanopi_r2s_defconfig > @@ -30,6 +30,7 @@ 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_PYLIBFDT=y > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y > BR2_TARGET_UBOOT_FORMAT_CUSTOM=y Thank you for the patch, have you verified it?s enough by building it using utils/docker-run? Best regards Giulio > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From marcus.hoffmann at othermo.de Thu Feb 17 15:22:25 2022 From: marcus.hoffmann at othermo.de (Marcus Hoffmann) Date: Thu, 17 Feb 2022 16:22:25 +0100 Subject: [Buildroot] [PATCH 1/2] configs/friendlyarm_nanopi_r2s_defconfig: uboot needs openssl In-Reply-To: <2B25121E-F5E4-4E61-BEA4-627E5689E813@benettiengineering.com> References: <20220217151054.865073-2-marcus.hoffmann@othermo.de> <2B25121E-F5E4-4E61-BEA4-627E5689E813@benettiengineering.com> Message-ID: <6a7a1291-9bdd-74f6-e836-ff2426965762@othermo.de> Hi Gulio, On 17.02.22 16:20, Giulio Benetti wrote: > Hi Marcus, > >> Il giorno 17 feb 2022, alle ore 16:11, Marcus Hoffmann ha scritto: >> >> ?Fixes the following compile error: >> >> In file included from include/bootm.h:10, >> from tools/image-host.c:12: >> include/image.h:1178:12: fatal error: openssl/evp.h: No such file or directory >> 1178 | # include >> | ^~~~~~~~~~~~~~~ >> compilation terminated. >> >> Signed-off-by: Marcus Hoffmann >> --- >> configs/friendlyarm_nanopi_r2s_defconfig | 1 + >> 1 file changed, 1 insertion(+) >> >> diff --git a/configs/friendlyarm_nanopi_r2s_defconfig b/configs/friendlyarm_nanopi_r2s_defconfig >> index 818c847f4b..ce252a5d76 100644 >> --- a/configs/friendlyarm_nanopi_r2s_defconfig >> +++ b/configs/friendlyarm_nanopi_r2s_defconfig >> @@ -30,6 +30,7 @@ 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_PYLIBFDT=y >> +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y >> BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y >> BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y >> BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > > Thank you for the patch, have you verified it?s enough by building it using utils/docker-run? Yes, this fixes the build with docker-run. (same for the other defconfig) Marcus > > Best regards > Giulio > >> -- >> 2.25.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > From giulio.benetti at benettiengineering.com Thu Feb 17 15:27:12 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 17 Feb 2022 16:27:12 +0100 Subject: [Buildroot] [PATCH 2/2] board/orangepi/orangepi-rk3399/genimage: fix partition types for gpt In-Reply-To: <20220217151054.865073-3-marcus.hoffmann@othermo.de> References: <20220217151054.865073-3-marcus.hoffmann@othermo.de> Message-ID: <964BF830-917A-4CFE-A8BE-DD8DCA18A9F8@benettiengineering.com> Hi Marcus, > Il giorno 17 feb 2022, alle ore 16:11, Marcus Hoffmann ha scritto: > > ?Fixes: > ERROR: hdimage(sdcard.img): part boot: 'partition-type' is only valid > for mbr and hybrid partition-table-type Here you should add: Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2103784375 Thank you Best regards > Signed-off-by: Marcus Hoffmann > --- > board/orangepi/orangepi-rk3399/genimage.cfg | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/board/orangepi/orangepi-rk3399/genimage.cfg b/board/orangepi/orangepi-rk3399/genimage.cfg > index c94e0bc7cc..a02166172f 100644 > --- a/board/orangepi/orangepi-rk3399/genimage.cfg > +++ b/board/orangepi/orangepi-rk3399/genimage.cfg > @@ -26,14 +26,13 @@ image sdcard.img { > } > > partition boot { > - partition-type = 0xC > + partition-type-uuid = F > bootable = "true" > image = "boot.vfat" > offset = 16M > } > > partition rootfs { > - partition-type = 0x83 > image = "rootfs.ext4" > } > } > -- > 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 giulio.benetti at benettiengineering.com Thu Feb 17 15:32:43 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 17 Feb 2022 16:32:43 +0100 Subject: [Buildroot] [PATCH 1/2] configs/friendlyarm_nanopi_r2s_defconfig: uboot needs openssl In-Reply-To: <6a7a1291-9bdd-74f6-e836-ff2426965762@othermo.de> References: <20220217151054.865073-2-marcus.hoffmann@othermo.de> <2B25121E-F5E4-4E61-BEA4-627E5689E813@benettiengineering.com> <6a7a1291-9bdd-74f6-e836-ff2426965762@othermo.de> Message-ID: <71ed8019-6b60-7365-6405-b65286a98ad0@benettiengineering.com> On 17/02/22 16:22, Marcus Hoffmann wrote: > Hi Gulio, > > On 17.02.22 16:20, Giulio Benetti wrote: >> Hi Marcus, >> >>> Il giorno 17 feb 2022, alle ore 16:11, Marcus Hoffmann ha scritto: >>> >>> ?Fixes the following compile error: >>> >>> In file included from include/bootm.h:10, >>> from tools/image-host.c:12: >>> include/image.h:1178:12: fatal error: openssl/evp.h: No such file or directory >>> 1178 | # include >>> | ^~~~~~~~~~~~~~~ >>> compilation terminated. >>> >>> Signed-off-by: Marcus Hoffmann >>> --- >>> configs/friendlyarm_nanopi_r2s_defconfig | 1 + >>> 1 file changed, 1 insertion(+) >>> >>> diff --git a/configs/friendlyarm_nanopi_r2s_defconfig b/configs/friendlyarm_nanopi_r2s_defconfig >>> index 818c847f4b..ce252a5d76 100644 >>> --- a/configs/friendlyarm_nanopi_r2s_defconfig >>> +++ b/configs/friendlyarm_nanopi_r2s_defconfig >>> @@ -30,6 +30,7 @@ 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_PYLIBFDT=y >>> +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y >>> BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y >>> BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y >>> BR2_TARGET_UBOOT_FORMAT_CUSTOM=y >> >> Thank you for the patch, have you verified it?s enough by building it using utils/docker-run? > > Yes, this fixes the build with docker-run. (same for the other defconfig) Perfect, can you re-send both patches with: "Fixes:" in commit log? tag? Thank you! Best regards -- Giulio Benetti Benetti Engineering sas > Marcus > >> >> Best regards >> Giulio >> >>> -- >>> 2.25.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 giulio.benetti at benettiengineering.com Thu Feb 17 15:45:06 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 17 Feb 2022 16:45:06 +0100 Subject: [Buildroot] [PATCH v3 3/3] DEVELOPERS: add Yu-Chien Lin to board/andes In-Reply-To: <20220215053327.4046-3-peterlin@andestech.com> References: <20220215053327.4046-1-peterlin@andestech.com> <20220215053327.4046-3-peterlin@andestech.com> Message-ID: <40c0d4fa-1dd3-c41b-09a7-61a031e76880@benettiengineering.com> Hi Peter, On 15/02/22 06:33, Yu Chien Peter Lin wrote: > Nylon is no longer at Andes. > > Signed-off-by: Yu Chien Peter Lin > Signed-off-by: Alan Kao Reviewed-by: Giulio Benetti Best regards -- Giulio Benetti Benetti Engineering sas > --- > DEVELOPERS | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/DEVELOPERS b/DEVELOPERS > index ac702d8d0f..8848d6a9a7 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -2146,9 +2146,10 @@ 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_ae350_45_defconfig > F: configs/andes_ae3xx_defconfig > F: toolchain/toolchain-external/toolchain-external-andes-nds32/ > From giulio.benetti at benettiengineering.com Thu Feb 17 15:55:49 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 17 Feb 2022 16:55:49 +0100 Subject: [Buildroot] [PATCH v3 1/3] board/andes: rearrange nds32 folder structure In-Reply-To: <20220215053327.4046-1-peterlin@andestech.com> References: <20220215053327.4046-1-peterlin@andestech.com> Message-ID: Hi Peter, On 15/02/22 06:33, Yu Chien Peter Lin wrote: > Rearrange nds32 folder structure to add AE350 platform. > > Signed-off-by: Yu Chien Peter Lin > Signed-off-by: Alan Kao > --- > .../patches/linux/0001-nds32-Fix-boot-messages-garbled.patch | 0 > ...2-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch | 0 > board/andes/{ => ae3xx}/readme.txt | 0 > configs/andes_ae3xx_defconfig | 2 +- > 4 files changed, 1 insertion(+), 1 deletion(-) > rename board/andes/{ => ae3xx}/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch (100%) > rename board/andes/{ => ae3xx}/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch (100%) > rename board/andes/{ => ae3xx}/readme.txt (100%) Here we have both: board/andes/ae3xx and board/andes/ae350 ae3xx should be use for every ae3xx family(ae350 included), but for ae350 you use a specific folder. What I see digging into ae3xx is that it is for FPGA demonstration, so I would move ae3xx directory to be name as ae3xx-fpga. Otherwise I would expect ae350(and newer parts) to be part of ae3xx. Same goes for the defconfig, I would name it like: andes_ae3xx_fpga_defconfig This way we can divide the 2 typologies: - fpga demonostration for ae3xx - ae3xx SoC family Otherwise you should provide a single family folder(ae3xx) compatible for both fpgas and SoCs. Thank you Best regards -- Giulio Benetti Benetti Engineering sas > 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/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch b/board/andes/ae3xx/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch > similarity index 100% > rename from board/andes/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch > rename to board/andes/ae3xx/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.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 From marcus.hoffmann at othermo.de Thu Feb 17 15:55:47 2022 From: marcus.hoffmann at othermo.de (Marcus Hoffmann) Date: Thu, 17 Feb 2022 16:55:47 +0100 Subject: [Buildroot] [PATCH v2 0/2] defconfig fixes Message-ID: <20220217155549.1084829-1-marcus.hoffmann@othermo.de> I was looking at some of the defconfigs and found these two easy to fix issues. I don't have those boards, so these are not tested besides being able to compile them again. Changes v1 -> v2: - Add references to gitlab CI's defconfig run failures (Giulio Benetti) Marcus Hoffmann (2): configs/friendlyarm_nanopi_r2s_defconfig: uboot needs openssl board/orangepi/orangepi-rk3399/genimage: fix partition types for gpt board/orangepi/orangepi-rk3399/genimage.cfg | 3 +-- configs/friendlyarm_nanopi_r2s_defconfig | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.25.1 From marcus.hoffmann at othermo.de Thu Feb 17 15:55:49 2022 From: marcus.hoffmann at othermo.de (Marcus Hoffmann) Date: Thu, 17 Feb 2022 16:55:49 +0100 Subject: [Buildroot] [PATCH v2 2/2] board/orangepi/orangepi-rk3399/genimage: fix partition types for gpt In-Reply-To: <20220217155549.1084829-1-marcus.hoffmann@othermo.de> References: <20220217155549.1084829-1-marcus.hoffmann@othermo.de> Message-ID: <20220217155549.1084829-3-marcus.hoffmann@othermo.de> Fixes the following error during image generation: ERROR: hdimage(sdcard.img): part boot: 'partition-type' is only valid for mbr and hybrid partition-table-type Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2103784375 Signed-off-by: Marcus Hoffmann --- board/orangepi/orangepi-rk3399/genimage.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/board/orangepi/orangepi-rk3399/genimage.cfg b/board/orangepi/orangepi-rk3399/genimage.cfg index c94e0bc7cc..a02166172f 100644 --- a/board/orangepi/orangepi-rk3399/genimage.cfg +++ b/board/orangepi/orangepi-rk3399/genimage.cfg @@ -26,14 +26,13 @@ image sdcard.img { } partition boot { - partition-type = 0xC + partition-type-uuid = F bootable = "true" image = "boot.vfat" offset = 16M } partition rootfs { - partition-type = 0x83 image = "rootfs.ext4" } } -- 2.25.1 From marcus.hoffmann at othermo.de Thu Feb 17 15:55:48 2022 From: marcus.hoffmann at othermo.de (Marcus Hoffmann) Date: Thu, 17 Feb 2022 16:55:48 +0100 Subject: [Buildroot] [PATCH v2 1/2] configs/friendlyarm_nanopi_r2s_defconfig: uboot needs openssl In-Reply-To: <20220217155549.1084829-1-marcus.hoffmann@othermo.de> References: <20220217155549.1084829-1-marcus.hoffmann@othermo.de> Message-ID: <20220217155549.1084829-2-marcus.hoffmann@othermo.de> Fixes the following compile error: In file included from include/bootm.h:10, from tools/image-host.c:12: include/image.h:1178:12: fatal error: openssl/evp.h: No such file or directory 1178 | # include | ^~~~~~~~~~~~~~~ compilation terminated. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2103784200 Signed-off-by: Marcus Hoffmann --- configs/friendlyarm_nanopi_r2s_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/friendlyarm_nanopi_r2s_defconfig b/configs/friendlyarm_nanopi_r2s_defconfig index 818c847f4b..ce252a5d76 100644 --- a/configs/friendlyarm_nanopi_r2s_defconfig +++ b/configs/friendlyarm_nanopi_r2s_defconfig @@ -30,6 +30,7 @@ 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_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -- 2.25.1 From giulio.benetti at benettiengineering.com Thu Feb 17 15:58:28 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 17 Feb 2022 16:58:28 +0100 Subject: [Buildroot] [PATCH v2 1/2] configs/friendlyarm_nanopi_r2s_defconfig: uboot needs openssl In-Reply-To: <20220217155549.1084829-2-marcus.hoffmann@othermo.de> References: <20220217155549.1084829-1-marcus.hoffmann@othermo.de> <20220217155549.1084829-2-marcus.hoffmann@othermo.de> Message-ID: On 17/02/22 16:55, Marcus Hoffmann wrote: > Fixes the following compile error: > > In file included from include/bootm.h:10, > from tools/image-host.c:12: > include/image.h:1178:12: fatal error: openssl/evp.h: No such file or directory > 1178 | # include > | ^~~~~~~~~~~~~~~ > compilation terminated. > > Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2103784200 > > Signed-off-by: Marcus Hoffmann Reviewed-by: Giulio Benetti Best regards -- Giulio Benetti Benetti Engineering sas > --- > configs/friendlyarm_nanopi_r2s_defconfig | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/configs/friendlyarm_nanopi_r2s_defconfig b/configs/friendlyarm_nanopi_r2s_defconfig > index 818c847f4b..ce252a5d76 100644 > --- a/configs/friendlyarm_nanopi_r2s_defconfig > +++ b/configs/friendlyarm_nanopi_r2s_defconfig > @@ -30,6 +30,7 @@ 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_PYLIBFDT=y > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y > BR2_TARGET_UBOOT_FORMAT_CUSTOM=y From giulio.benetti at benettiengineering.com Thu Feb 17 15:58:47 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 17 Feb 2022 16:58:47 +0100 Subject: [Buildroot] [PATCH v2 2/2] board/orangepi/orangepi-rk3399/genimage: fix partition types for gpt In-Reply-To: <20220217155549.1084829-3-marcus.hoffmann@othermo.de> References: <20220217155549.1084829-1-marcus.hoffmann@othermo.de> <20220217155549.1084829-3-marcus.hoffmann@othermo.de> Message-ID: <918b0f89-7e30-bb9e-1d33-118001bb2846@benettiengineering.com> On 17/02/22 16:55, Marcus Hoffmann wrote: > Fixes the following error during image generation: > ERROR: hdimage(sdcard.img): part boot: 'partition-type' is only valid > for mbr and hybrid partition-table-type > > Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2103784375 > > Signed-off-by: Marcus Hoffmann Reviewed-by: Giulio Benetti Best regards -- Giulio Benetti Benetti Engineering sas > --- > board/orangepi/orangepi-rk3399/genimage.cfg | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/board/orangepi/orangepi-rk3399/genimage.cfg b/board/orangepi/orangepi-rk3399/genimage.cfg > index c94e0bc7cc..a02166172f 100644 > --- a/board/orangepi/orangepi-rk3399/genimage.cfg > +++ b/board/orangepi/orangepi-rk3399/genimage.cfg > @@ -26,14 +26,13 @@ image sdcard.img { > } > > partition boot { > - partition-type = 0xC > + partition-type-uuid = F > bootable = "true" > image = "boot.vfat" > offset = 16M > } > > partition rootfs { > - partition-type = 0x83 > image = "rootfs.ext4" > } > } From giulio.benetti at benettiengineering.com Thu Feb 17 16:01:26 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 17 Feb 2022 17:01:26 +0100 Subject: [Buildroot] [PATCH v3 2/3] board/andes/ae350: add support for Andes AE350 In-Reply-To: <20220215053327.4046-2-peterlin@andestech.com> References: <20220215053327.4046-1-peterlin@andestech.com> <20220215053327.4046-2-peterlin@andestech.com> Message-ID: <4710f7ce-7af1-f544-c038-cf7e6139f172@benettiengineering.com> Hi Peter, On 15/02/22 06:33, 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 > --- > Changes v1 -> v2: > - move linux source code and its patches to AndesTech Github repo > - rename ae350_andestar45_defconfig to andes_ae350_45_defconfig > - change C library to uClibc > - remove OpenSSL package > - remove rootfs.cpio and rootfs.tar > - update DEVELOPERS > Changes v2 -> v3: > - specifiy branch to download from AndesTech linux repo > - change boot.cmd to extlinux.conf > - add post-build.sh for extlinux.conf to retrieve Image and DTB > - fix format and update genimage_sdcard.cfg > - update readme.txt > - add packages (python3, pylibfdt and openssl) for u-boot binman > - reorder item in DEVELOPERS > --- > board/andes/ae350/ae350.dts | 274 ++++++++++++++++++ > board/andes/ae350/genimage_sdcard.cfg | 26 ++ > ...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/post-build.sh | 3 + > board/andes/ae350/readme.txt | 65 +++++ > .../boot/extlinux/extlinux.conf | 4 + > board/andes/ae350/uboot.config.fragment | 5 + > configs/andes_ae350_45_defconfig | 43 +++ > 13 files changed, 579 insertions(+) > create mode 100755 board/andes/ae350/ae350.dts > 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 100755 board/andes/ae350/post-build.sh > create mode 100644 board/andes/ae350/readme.txt > create mode 100644 board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf > 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/genimage_sdcard.cfg b/board/andes/ae350/genimage_sdcard.cfg > new file mode 100644 > index 0000000000..b8b9fe6a62 > --- /dev/null > +++ b/board/andes/ae350/genimage_sdcard.cfg > @@ -0,0 +1,26 @@ > +image boot.vfat { > + vfat { > + files = { > + "u-boot-spl.bin", > + "u-boot.itb", > + "ae350.dtb", > + } > + } > + size = 2M > +} > + > +image sdcard.img { > + hdimage { > + } > + > + partition boot { > + partition-type = 0xC > + image = "boot.vfat" > + } > + > + partition rootfs { > + partition-type = 0x83 > + bootable = true > + 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/post-build.sh b/board/andes/ae350/post-build.sh > new file mode 100755 > index 0000000000..0e6ce228f4 > --- /dev/null > +++ b/board/andes/ae350/post-build.sh > @@ -0,0 +1,3 @@ > +#!/bin/sh > +cp $BINARIES_DIR/Image $TARGET_DIR/boot > +cp $BINARIES_DIR/ae350.dtb $TARGET_DIR/boot > diff --git a/board/andes/ae350/readme.txt b/board/andes/ae350/readme.txt > new file mode 100644 > index 0000000000..6825468d50 > --- /dev/null > +++ b/board/andes/ae350/readme.txt > @@ -0,0 +1,65 @@ > +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/ > + |-- ae350.dtb > + |-- boot.vfat > + |-- fw_dynamic.bin > + |-- fw_dynamic.elf > + |-- fw_jump.bin > + |-- fw_jump.elf > + |-- Image > + |-- 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 > + $ sudo sync > + > +Your SD card partition should be: > + > + Disk /dev/sdb: 14.48 GiB, 15552479232 bytes, 30375936 sectors > + Disk model: Multi-Card > + Units: sectors of 1 * 512 = 512 bytes > + Sector size (logical/physical): 512 bytes / 512 bytes > + I/O size (minimum/optimal): 512 bytes / 512 bytes > + Disklabel type: dos > + Disk identifier: 0x00000000 > + > + Device Boot Start End Sectors Size Id Type > + /dev/sdb1 1 4096 4096 2M c W95 FAT32 (LBA) > + /dev/sdb2 * 4097 126976 122880 60M 83 Linux > + > +Insert SD card and reset the board, it should boot Linux from mmc. > diff --git a/board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf b/board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf > new file mode 100644 > index 0000000000..549eb93abc > --- /dev/null > +++ b/board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf > @@ -0,0 +1,4 @@ > +label linux > + kernel /boot/Image > + fdt /boot/ae350.dtb > + append earlycon=sbi root=/dev/mmcblk0p2 rootwait > 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..a35ddd06ba > --- /dev/null > +++ b/configs/andes_ae350_45_defconfig > @@ -0,0 +1,43 @@ > +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_OVERLAY="board/andes/ae350/rootfs_overlay" > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/andes/ae350/post-build.sh" > +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_GIT=y > +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/andestech/linux.git" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.10.84-ae350_45" > +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_PYTHON3=y > +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y > +# BR2_TARGET_UBOOT_FORMAT_BIN is not set > +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.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 This builds correctly in gitlab-CI container and looks good for me. Reviewed-by: Giulio Benetti Best regards -- Giulio Benetti Benetti Engineering sas From peter at korsgaard.com Thu Feb 17 16:34:12 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Feb 2022 17:34:12 +0100 Subject: [Buildroot] [PATCH] package/nfs-utils: nfsiostat used python3, not python2 In-Reply-To: <87tudcw0zg.fsf@dell.be.48ers.dk> (Peter Korsgaard's message of "Sun, 06 Feb 2022 14:58:27 +0100") References: <20220206131758.28001-1-peter@korsgaard.com> <87tudcw0zg.fsf@dell.be.48ers.dk> Message-ID: <87sfshe9kr.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: >>>>> "Peter" == Peter Korsgaard writes: > s/used/uses/ in the subject naturally. >> nfsiostat is a python3 script, so keep it if python3 is enabled and not >> python2: >> head -n 1 target/usr/sbin/nfsiostat >> #!/usr/bin/python3 >> Signed-off-by: Peter Korsgaard Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 17 16:35:18 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Feb 2022 17:35:18 +0100 Subject: [Buildroot] [PATCH 1/1] docs/manual: add section on start script recommendations In-Reply-To: (Arnout Vandecappelle's message of "Sun, 6 Feb 2022 16:37:09 +0100") References: <20211205102010.2834942-1-troglobit@gmail.com> Message-ID: <87o835e9ix.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle writes: > On 05/12/2021 11:20, Joachim Wiberg wrote: >> Signed-off-by: Joachim Wiberg >> --- >> docs/manual/adding-packages-directory.txt | 96 +++++++++++++++++++++++ >> docs/manual/configure.txt | 1 + >> 2 files changed, 97 insertions(+) >> >> diff --git a/docs/manual/adding-packages-directory.txt b/docs/manual/adding-packages-directory.txt >> index 4ceb3fd772..72e8dac5ff 100644 >> --- a/docs/manual/adding-packages-directory.txt >> +++ b/docs/manual/adding-packages-directory.txt >> @@ -554,3 +554,99 @@ over time. Such patches should not be downloaded, and instead be added >> locally to the package folder. >> If the +.hash+ file is missing, then no check is done at all. >> + >> +[[adding-packages-start-script]] >> +=== The +SNNfood+ start script >> + >> +Packages that provide a system daemon usually need to be started somehow >> +at boot. Buildroot comes with support for several init systems, some >> +are considered tier one (see xref:init-system[]), while others are also >> +available but do not have the same level of integration. The >> +recommended one in Buildroot is the BusyBox init. > I think the intention is that systemd is at the same level as busybox > init. And we generally don't distinguish between busybox init and SysV > init. > I made a few other small changes to the text and applied to master, thanks. Committed to 2021.02.x and 2021.11.x with the same changes, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 17 16:32:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Feb 2022 17:32:28 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/nfs-utils: nfsiostat uses python3, not python2 Message-ID: <20220217162844.B0A1A82210@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8e734ee44396fda79dc5c61e7d30e73b100730f9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x nfsiostat is a python3 script, so keep it if python3 is enabled and not python2: head -n 1 target/usr/sbin/nfsiostat #!/usr/bin/python3 Signed-off-by: Peter Korsgaard Reviewed-by: Petr Vorel Signed-off-by: Peter Korsgaard (cherry picked from commit cee035e4391417851fbbf41a1d4eb0c4d2ad60d4) Signed-off-by: Peter Korsgaard --- package/nfs-utils/nfs-utils.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk index 07b44b5a93..519d6cad3e 100644 --- a/package/nfs-utils/nfs-utils.mk +++ b/package/nfs-utils/nfs-utils.mk @@ -114,7 +114,7 @@ define NFS_UTILS_REMOVE_NFSIOSTAT endef # nfsiostat is interpreted python, so remove it unless it's in the target -NFS_UTILS_POST_INSTALL_TARGET_HOOKS += $(if $(BR2_PACKAGE_PYTHON),,NFS_UTILS_REMOVE_NFSIOSTAT) +NFS_UTILS_POST_INSTALL_TARGET_HOOKS += $(if $(BR2_PACKAGE_PYTHON3),,NFS_UTILS_REMOVE_NFSIOSTAT) define HOST_NFS_UTILS_BUILD_CMDS $(MAKE) -C $(@D)/tools/rpcgen From peter at korsgaard.com Thu Feb 17 16:23:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Feb 2022 17:23:21 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] toolchain: update gcc bug 99410 Message-ID: <20220217162844.A6DD6836E4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9d63e24e6a933e98670b486d623e0fa84f7d7fe5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Gcc bug 99410 reappeared in gcc 10.x while building belle-sip, but it's fixed on gcc 11.x, so let's update bug conditions. Fixes: http://autobuild.buildroot.net/results/846597f3573d3b0d52e80627a9577d14b9348547/ Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni (cherry picked from commit 88f79aead8fa750bc0e93ef8798751a4b463e9d9) Signed-off-by: Peter Korsgaard --- toolchain/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/toolchain/Config.in b/toolchain/Config.in index 140d07ca38..f63aec6735 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -191,11 +191,11 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_93847 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=99410 # Error: branch offset out of range on Nios II. This bug # no longer exists in gcc 8.x but reappeared on gcc 9.x and has been -# fixed on gcc 10.x. +# fixed on gcc 11.x. config BR2_TOOLCHAIN_HAS_GCC_BUG_99140 bool default y if !BR2_TOOLCHAIN_GCC_AT_LEAST_8 - default y if BR2_TOOLCHAIN_GCC_AT_LEAST_9 && !BR2_TOOLCHAIN_GCC_AT_LEAST_10 + default y if BR2_TOOLCHAIN_GCC_AT_LEAST_10 && !BR2_TOOLCHAIN_GCC_AT_LEAST_11 depends on BR2_nios2 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101737 From peter at korsgaard.com Thu Feb 17 16:34:52 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Feb 2022 17:34:52 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] docs/manual: add section on start script recommendations Message-ID: <20220217162844.BAEFC83797@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f4b18f72c93a4987bde541850fbef7ce1f2a06fc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Joachim Wiberg Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 4fe33a1b47ba9c1e90c2c794cefb13962ea89b99) Signed-off-by: Peter Korsgaard --- docs/manual/adding-packages-directory.txt | 96 +++++++++++++++++++++++++++++++ docs/manual/configure.txt | 1 + 2 files changed, 97 insertions(+) diff --git a/docs/manual/adding-packages-directory.txt b/docs/manual/adding-packages-directory.txt index 54d96451fe..23bd293a6c 100644 --- a/docs/manual/adding-packages-directory.txt +++ b/docs/manual/adding-packages-directory.txt @@ -554,3 +554,99 @@ over time. Such patches should not be downloaded, and instead be added locally to the package folder. If the +.hash+ file is missing, then no check is done at all. + +[[adding-packages-start-script]] +=== The +SNNfoo+ start script + +Packages that provide a system daemon usually need to be started somehow +at boot. Buildroot comes with support for several init systems, some +are considered tier one (see xref:init-system[]), while others are also +available but do not have the same level of integration. Ideally, all +packages providing a system daemon should provide a start script for +BusyBox/SysV init and a systemd unit file. + +For consistency, the start script must follow the style and composition +as shown in the reference: +package/busybox/S01syslogd+. An annotated +example of this style is shown below. There is no specific coding style +for systemd unit files, but if a package comes with its own unit file, +that is preferred over a buildroot specific one, if it is compatible +with buildroot. + +The name of the start script is composed of the +SNN+ and the daemon +name. The +NN+ is the start order number which needs to be carefully +chosen. For example, a program that requires networking to be up should +not start before +S40network+. The scripts are started in alphabetical +order, so +S01syslogd+ starts before +S01watchdogd+, and +S02sysctl+ +start thereafter. + +------------------------------ +01: #!/bin/sh +02: +03: DAEMON="syslogd" +04: PIDFILE="/var/run/$DAEMON.pid" +05: +06: SYSLOGD_ARGS="" +07: +08: # shellcheck source=/dev/null +09: [ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" +10: +11: # BusyBox' syslogd does not create a pidfile, so pass "-n" in the command line +12: # and use "-m" to instruct start-stop-daemon to create one. +13: start() { +14: printf 'Starting %s: ' "$DAEMON" +15: # shellcheck disable=SC2086 # we need the word splitting +16: start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/sbin/$DAEMON" \ +17: -- -n $SYSLOGD_ARGS +18: status=$? +19: if [ "$status" -eq 0 ]; then +20: echo "OK" +21: else +22: echo "FAIL" +23: fi +24: return "$status" +25: } +26: +27: stop() { +28: printf 'Stopping %s: ' "$DAEMON" +29: start-stop-daemon -K -q -p "$PIDFILE" +30: status=$? +31: if [ "$status" -eq 0 ]; then +32: rm -f "$PIDFILE" +33: echo "OK" +34: else +35: echo "FAIL" +36: fi +37: return "$status" +38: } +39: +40: restart() { +41: stop +42: sleep 1 +43: start +44: } +45: +46: case "$1" in +47: start|stop|restart) +48: "$1";; +49: reload) +50: # Restart, since there is no true "reload" feature. +51: restart;; +52: *) +53: echo "Usage: $0 {start|stop|restart|reload}" +54: exit 1 +55: esac +------------------------------ + +*Note:* programs that support reloading their configuration in some +fashion (+SIGHUP+) should provide a +reload()+ function similar to ++stop()+. The +start-stop-daemon+ supports +-K -s HUP+ for this. +It is recommended to always append +-x "/sbin/$DAEMON"+ to all the ++start-stop-daemon+ commands to ensure signals are set to a PID that +matches +$DAEMON+. + +Both start scripts and unit files can source command line arguments from ++/etc/default/foo+, in general, if such a file does not exist it should +not block the start of the daemon, unless there is some site specirfic +command line argument the daemon requires to start. For start scripts a ++FOO_ARGS="-s -o -m -e -args"+ can be defined to a default value in and +the user can override this from +/etc/default/foo+. diff --git a/docs/manual/configure.txt b/docs/manual/configure.txt index c9eef567f4..60860d2c71 100644 --- a/docs/manual/configure.txt +++ b/docs/manual/configure.txt @@ -377,6 +377,7 @@ good solution. Note that if +systemd+ is chosen as init system, /dev management will be performed by the +udev+ program provided by +systemd+. +[[init-system]] === init system The _init_ program is the first userspace program started by the From peter at korsgaard.com Thu Feb 17 16:33:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Feb 2022 17:33:51 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/nfs-utils: nfsiostat uses python3, not python2 Message-ID: <20220217162852.8C6F2836E4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c8d709529f0fff956032cadf5de68b517b3b38bd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x nfsiostat is a python3 script, so keep it if python3 is enabled and not python2: head -n 1 target/usr/sbin/nfsiostat #!/usr/bin/python3 Signed-off-by: Peter Korsgaard Reviewed-by: Petr Vorel Signed-off-by: Peter Korsgaard (cherry picked from commit cee035e4391417851fbbf41a1d4eb0c4d2ad60d4) Signed-off-by: Peter Korsgaard --- package/nfs-utils/nfs-utils.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk index ed0a23e151..f5d29ab535 100644 --- a/package/nfs-utils/nfs-utils.mk +++ b/package/nfs-utils/nfs-utils.mk @@ -93,7 +93,7 @@ define NFS_UTILS_REMOVE_NFSIOSTAT endef # nfsiostat is interpreted python, so remove it unless it's in the target -NFS_UTILS_POST_INSTALL_TARGET_HOOKS += $(if $(BR2_PACKAGE_PYTHON),,NFS_UTILS_REMOVE_NFSIOSTAT) +NFS_UTILS_POST_INSTALL_TARGET_HOOKS += $(if $(BR2_PACKAGE_PYTHON3),,NFS_UTILS_REMOVE_NFSIOSTAT) define HOST_NFS_UTILS_BUILD_CMDS $(MAKE) -C $(@D)/tools/rpcgen From peter at korsgaard.com Thu Feb 17 16:34:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Feb 2022 17:34:46 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] docs/manual: add section on start script recommendations Message-ID: <20220217162852.952A08378F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a0ccc8d268eafa07f654c27684eb3354c25c510c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Joachim Wiberg Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 4fe33a1b47ba9c1e90c2c794cefb13962ea89b99) Signed-off-by: Peter Korsgaard --- docs/manual/adding-packages-directory.txt | 96 +++++++++++++++++++++++++++++++ docs/manual/configure.txt | 1 + 2 files changed, 97 insertions(+) diff --git a/docs/manual/adding-packages-directory.txt b/docs/manual/adding-packages-directory.txt index 54d96451fe..23bd293a6c 100644 --- a/docs/manual/adding-packages-directory.txt +++ b/docs/manual/adding-packages-directory.txt @@ -554,3 +554,99 @@ over time. Such patches should not be downloaded, and instead be added locally to the package folder. If the +.hash+ file is missing, then no check is done at all. + +[[adding-packages-start-script]] +=== The +SNNfoo+ start script + +Packages that provide a system daemon usually need to be started somehow +at boot. Buildroot comes with support for several init systems, some +are considered tier one (see xref:init-system[]), while others are also +available but do not have the same level of integration. Ideally, all +packages providing a system daemon should provide a start script for +BusyBox/SysV init and a systemd unit file. + +For consistency, the start script must follow the style and composition +as shown in the reference: +package/busybox/S01syslogd+. An annotated +example of this style is shown below. There is no specific coding style +for systemd unit files, but if a package comes with its own unit file, +that is preferred over a buildroot specific one, if it is compatible +with buildroot. + +The name of the start script is composed of the +SNN+ and the daemon +name. The +NN+ is the start order number which needs to be carefully +chosen. For example, a program that requires networking to be up should +not start before +S40network+. The scripts are started in alphabetical +order, so +S01syslogd+ starts before +S01watchdogd+, and +S02sysctl+ +start thereafter. + +------------------------------ +01: #!/bin/sh +02: +03: DAEMON="syslogd" +04: PIDFILE="/var/run/$DAEMON.pid" +05: +06: SYSLOGD_ARGS="" +07: +08: # shellcheck source=/dev/null +09: [ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" +10: +11: # BusyBox' syslogd does not create a pidfile, so pass "-n" in the command line +12: # and use "-m" to instruct start-stop-daemon to create one. +13: start() { +14: printf 'Starting %s: ' "$DAEMON" +15: # shellcheck disable=SC2086 # we need the word splitting +16: start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/sbin/$DAEMON" \ +17: -- -n $SYSLOGD_ARGS +18: status=$? +19: if [ "$status" -eq 0 ]; then +20: echo "OK" +21: else +22: echo "FAIL" +23: fi +24: return "$status" +25: } +26: +27: stop() { +28: printf 'Stopping %s: ' "$DAEMON" +29: start-stop-daemon -K -q -p "$PIDFILE" +30: status=$? +31: if [ "$status" -eq 0 ]; then +32: rm -f "$PIDFILE" +33: echo "OK" +34: else +35: echo "FAIL" +36: fi +37: return "$status" +38: } +39: +40: restart() { +41: stop +42: sleep 1 +43: start +44: } +45: +46: case "$1" in +47: start|stop|restart) +48: "$1";; +49: reload) +50: # Restart, since there is no true "reload" feature. +51: restart;; +52: *) +53: echo "Usage: $0 {start|stop|restart|reload}" +54: exit 1 +55: esac +------------------------------ + +*Note:* programs that support reloading their configuration in some +fashion (+SIGHUP+) should provide a +reload()+ function similar to ++stop()+. The +start-stop-daemon+ supports +-K -s HUP+ for this. +It is recommended to always append +-x "/sbin/$DAEMON"+ to all the ++start-stop-daemon+ commands to ensure signals are set to a PID that +matches +$DAEMON+. + +Both start scripts and unit files can source command line arguments from ++/etc/default/foo+, in general, if such a file does not exist it should +not block the start of the daemon, unless there is some site specirfic +command line argument the daemon requires to start. For start scripts a ++FOO_ARGS="-s -o -m -e -args"+ can be defined to a default value in and +the user can override this from +/etc/default/foo+. diff --git a/docs/manual/configure.txt b/docs/manual/configure.txt index c9eef567f4..60860d2c71 100644 --- a/docs/manual/configure.txt +++ b/docs/manual/configure.txt @@ -377,6 +377,7 @@ good solution. Note that if +systemd+ is chosen as init system, /dev management will be performed by the +udev+ program provided by +systemd+. +[[init-system]] === init system The _init_ program is the first userspace program started by the From fontaine.fabrice at gmail.com Thu Feb 17 16:36:54 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 17 Feb 2022 17:36:54 +0100 Subject: [Buildroot] [PATCH 1/2] package/kf5/kf5-kcoreaddons: add python3 optional dependency Message-ID: <20220217163655.221545-1-fontaine.fabrice@gmail.com> python3 is an optional dependency since the addition of the package in commit bf48bf86295bc4628bcd14fd4ca415d6971c8ab8 Signed-off-by: Fabrice Fontaine --- package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk b/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk index 76be8876cc..9a034ba763 100644 --- a/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk +++ b/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk @@ -10,7 +10,10 @@ KF5_KCOREADDONS_SOURCE = kcoreaddons-$(KF5_KCOREADDONS_VERSION).tar.xz KF5_KCOREADDONS_LICENSE = LGPL-2.1 KF5_KCOREADDONS_LICENSE_FILES = COPYING.LIB -KF5_KCOREADDONS_DEPENDENCIES = kf5-extra-cmake-modules qt5tools +KF5_KCOREADDONS_DEPENDENCIES = \ + kf5-extra-cmake-modules \ + qt5tools \ + $(if $(BR2_PACKAGE_PYTHON3),python3) KF5_KCOREADDONS_INSTALL_STAGING = YES KF5_KCOREADDONS_CXXFLAGS = $(TARGET_CXXFLAGS) -- 2.34.1 From fontaine.fabrice at gmail.com Thu Feb 17 16:36:55 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 17 Feb 2022 17:36:55 +0100 Subject: [Buildroot] [PATCH 2/2] package/kf5: bump to version 5.91 In-Reply-To: <20220217163655.221545-1-fontaine.fabrice@gmail.com> References: <20220217163655.221545-1-fontaine.fabrice@gmail.com> Message-ID: <20220217163655.221545-2-fontaine.fabrice@gmail.com> This bump will fix the following build failure of kf5-kcoreaddons with python 3.10 raised since commit 25b1fc2898d68ddf2674b14c738045875fc5a2dc: CMake Error at /home/giuliobenetti/autobuild/run/instance-1/output-1/host/riscv32-buildroot-linux-gnu/sysroot/usr/share/ECM/find-modules/FindPythonModuleGeneration.cmake:149 (message): The max python version in PythonModuleGeneration must be updated. Call Stack (most recent call first): src/lib/CMakeLists.txt:208 (find_package) It will also fix the following build failure of kf5-kcoreaddons raised since commit 5770a645a3a49a3f0f02972131a4ff5283b4c11e: In file included from /home/peko/autobuild/instance-0/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/qt5/QtCore/qchar.h:43, from /home/peko/autobuild/instance-0/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/qt5/QtCore/qstring.h:49, from /home/peko/autobuild/instance-0/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/qt5/QtCore/QString:1, from /home/peko/autobuild/instance-0/output-1/build/kf5-kcoreaddons-5.47.0/src/lib/randomness/krandom.h:27, from /home/peko/autobuild/instance-0/output-1/build/kf5-kcoreaddons-5.47.0/src/lib/randomness/krandom.cpp:22: /home/peko/autobuild/instance-0/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/qt5/QtCore/qglobal.h:1274:80: note: declared here 1274 | Q_CORE_EXPORT QT_DEPRECATED_VERSION_X_5_15("use QRandomGenerator instead") int qrand(); | ^~~~~ /home/peko/autobuild/instance-0/output-1/build/kf5-kcoreaddons-5.47.0/src/lib/randomness/krandom.cpp: In function 'QString KRandom::randomString(int)': /home/peko/autobuild/instance-0/output-1/build/kf5-kcoreaddons-5.47.0/src/lib/randomness/krandom.cpp:76:27: error: use of deleted function 'QCharRef& QCharRef::operator=(char)' 76 | str[i++] = char(r); | ^ - Update indentation in hash file (two spaces) - Update licenses due to https://invent.kde.org/frameworks/kcoreaddons/-/commit/93480398b551aee572f9f1a0ee48ed45a8476580 https://invent.kde.org/frameworks/modemmanager-qt/-/commit/8ad494d957cab343a60a61a2163f1ca23e9e3511 https://invent.kde.org/frameworks/networkmanager-qt/-/commit/fa9ef0d84898ad5e1f28857307bd5fcb8eb38e20 Fixes: - http://autobuild.buildroot.org/results/0267ff54ee82d853476ff7d6b14edb4aba308aa2 - http://autobuild.buildroot.org/results/694a2322d9161b55f5db66d1ace57d836360ed84 Signed-off-by: Fabrice Fontaine --- .../kf5-extra-cmake-modules.hash | 4 ++-- .../kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash | 17 ++++++++++++++-- .../kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk | 20 +++++++++++++++++-- .../kf5-modemmanager-qt.hash | 11 ++++++++-- .../kf5-modemmanager-qt.mk | 13 ++++++++++-- .../kf5-networkmanager-qt.hash | 11 ++++++++-- .../kf5-networkmanager-qt.mk | 12 +++++++++-- package/kf5/kf5.mk | 2 +- 8 files changed, 75 insertions(+), 15 deletions(-) diff --git a/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.hash b/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.hash index 733e267fdb..70b776b5d7 100644 --- a/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.hash +++ b/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 976d8bd15a0b929376bfaef34602a0fb9614229851c46fac3c4b28938f682195 extra-cmake-modules-5.47.0.tar.xz -sha256 46cde7dc11e64c78d650b4851b88f6704b4665ff60f22a1caf68ceb15e217e5b COPYING-CMAKE-SCRIPTS +sha256 9717885e30aadf184fa71511930409cabbf08eb6627ea8b051de8804fbcec54c extra-cmake-modules-5.91.0.tar.xz +sha256 46cde7dc11e64c78d650b4851b88f6704b4665ff60f22a1caf68ceb15e217e5b COPYING-CMAKE-SCRIPTS diff --git a/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash b/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash index 0cd8dcfc15..e4ebf2bb39 100644 --- a/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash +++ b/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash @@ -1,3 +1,16 @@ # Locally calculated -sha256 40ff04757e4ac19bc8448940fe18886c894a2069865966cc865fc55ff67b0b46 kcoreaddons-5.47.0.tar.xz -sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB +sha256 dfe3da03260e0153f9f6ced1fc7464eaaf0ed1fb692fc6c2b2d968b629ad719b kcoreaddons-5.91.0.tar.xz + +# Hash for license files +sha256 d1cf0896da7045d841fe45b0991cf35540bac1a17b5d11f4afcf8fcb950246b5 LICENSES/GPL-2.0-only.txt +sha256 606aa26338f69ce178f1cbc648b7574aec4b5bbaeb20f4df36ff49010cb8fbbd LICENSES/GPL-2.0-or-later.txt +sha256 2ca9503d76d1ffab14f599b4741382eec11face60ad1f0d7a41897809003a286 LICENSES/GPL-3.0-only.txt +sha256 de588a8b1c41fe73ffe1201f9d12c718a988ed8e1302929625a6e7c2bced7461 LICENSES/LGPL-2.0-only.txt +sha256 de588a8b1c41fe73ffe1201f9d12c718a988ed8e1302929625a6e7c2bced7461 LICENSES/LGPL-2.0-or-later.txt +sha256 211f1b738d1b864bab2648bee9b55becd39fd2d6aa49c1196e7d87b41db4bc07 LICENSES/LGPL-2.1-only.txt +sha256 476b03829862ab7e3ed920f87fad3de3c995f7dd93c26476eb40f0117de43fdc LICENSES/LGPL-3.0-only.txt +sha256 ef839531eb65b0168f9aed14047c84be13e9ea38801a73bc18abe24dc93e6ac9 LICENSES/LicenseRef-KDE-Accepted-GPL.txt +sha256 d9f25707d20e804f15005be46527366b0604bd739754d144a83d3983d94a9a6a LICENSES/LicenseRef-KDE-Accepted-LGPL.txt +sha256 272bc0fa06a23d3c807375f95f8d6ccd98541321d2882732668ab139c16f9bf4 LICENSES/LicenseRef-Qt-Commercial.txt +sha256 a3b538a7d81c4935d185056479d12fd43042bb9f3a21c9cbb4a8500fab8e5880 LICENSES/MPL-1.1.txt +sha256 7dea3adab58690d8ee14775da755cd30a52649a47704ff78ae85197ae0d37c60 LICENSES/Qt-LGPL-exception-1.1.txt diff --git a/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk b/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk index 9a034ba763..e2f67f15b2 100644 --- a/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk +++ b/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk @@ -7,8 +7,24 @@ KF5_KCOREADDONS_VERSION = $(KF5_VERSION) KF5_KCOREADDONS_SITE = $(KF5_SITE) KF5_KCOREADDONS_SOURCE = kcoreaddons-$(KF5_KCOREADDONS_VERSION).tar.xz -KF5_KCOREADDONS_LICENSE = LGPL-2.1 -KF5_KCOREADDONS_LICENSE_FILES = COPYING.LIB +KF5_KCOREADDONS_LICENSE = \ + LGPL-2.0+, LGPL-2.1 or LGPL-3.0 or LicenseRef-KDE-Accepted-LGPL (library), \ + MPL.1.1 or GPL-2.0+ or LGPL-2.1+ (posix_fallocate_mac.h), \ + LGPL-2.1 with Qt-LGPL-exception-1.1 or LicenseRef-Qt-Commercial (kprocesslist), \ + GPL-2.0 or GPL-3.0 or LicenseRef-KDE-Accepted-GPL (autotests) +KF5_KCOREADDONS_LICENSE_FILES = \ + LICENSES/GPL-2.0-only.txt \ + LICENSES/GPL-2.0-or-later.txt \ + LICENSES/GPL-3.0-only.txt \ + LICENSES/LGPL-2.0-only.txt \ + LICENSES/LGPL-2.0-or-later.txt \ + LICENSES/LGPL-2.1-only.txt \ + LICENSES/LGPL-3.0-only.txt \ + LICENSES/LicenseRef-KDE-Accepted-GPL.txt \ + LICENSES/LicenseRef-KDE-Accepted-LGPL.txt \ + LICENSES/LicenseRef-Qt-Commercial.txt \ + LICENSES/MPL-1.1.txt \ + LICENSES/Qt-LGPL-exception-1.1.txt KF5_KCOREADDONS_DEPENDENCIES = \ kf5-extra-cmake-modules \ diff --git a/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.hash b/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.hash index 408eb0c0b0..4b6c03a3bb 100644 --- a/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.hash +++ b/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.hash @@ -1,3 +1,10 @@ # Locally calculated -sha256 8b6ab15ce82b7a30b26814178ac33380056ec4398707481aa5ce95cf09d39d03 modemmanager-qt-5.47.0.tar.xz -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB +sha256 a2673f18c7866d39c9cedca2f86540c56baf966a2491a86ca06a5a0427358496 modemmanager-qt-5.91.0.tar.xz + +# Hash for license files +sha256 d1cf0896da7045d841fe45b0991cf35540bac1a17b5d11f4afcf8fcb950246b5 LICENSES/GPL-2.0-only.txt +sha256 2ca9503d76d1ffab14f599b4741382eec11face60ad1f0d7a41897809003a286 LICENSES/GPL-3.0-only.txt +sha256 211f1b738d1b864bab2648bee9b55becd39fd2d6aa49c1196e7d87b41db4bc07 LICENSES/LGPL-2.1-only.txt +sha256 476b03829862ab7e3ed920f87fad3de3c995f7dd93c26476eb40f0117de43fdc LICENSES/LGPL-3.0-only.txt +sha256 ef839531eb65b0168f9aed14047c84be13e9ea38801a73bc18abe24dc93e6ac9 LICENSES/LicenseRef-KDE-Accepted-GPL.txt +sha256 d9f25707d20e804f15005be46527366b0604bd739754d144a83d3983d94a9a6a LICENSES/LicenseRef-KDE-Accepted-LGPL.txt diff --git a/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk b/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk index 81617492c0..38c80d3da8 100644 --- a/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk +++ b/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk @@ -7,8 +7,17 @@ KF5_MODEMMANAGER_QT_VERSION = $(KF5_VERSION) KF5_MODEMMANAGER_QT_SITE = $(KF5_SITE) KF5_MODEMMANAGER_QT_SOURCE = modemmanager-qt-$(KF5_MODEMMANAGER_QT_VERSION).tar.xz -KF5_MODEMMANAGER_QT_LICENSE = LGPL-2.1+ -KF5_MODEMMANAGER_QT_LICENSE_FILES = COPYING.LIB +KF5_MODEMMANAGER_QT_LICENSE = \ + LGPL-2.1 or LGPL-3.0 or LicenseRef-KDE-Accepted-LGPL (library), \ + GPL-2.0 or GPL-3.0 or LicenseRef-KDE-Accepted-GPL (autotests, examples) + +KF5_MODEMMANAGER_QT_LICENSE_FILES = \ + LICENSES/GPL-2.0-only.txt \ + LICENSES/GPL-3.0-only.txt \ + LICENSES/LGPL-2.1-only.txt \ + LICENSES/LGPL-3.0-only.txt \ + LICENSES/LicenseRef-KDE-Accepted-GPL.txt \ + LICENSES/LicenseRef-KDE-Accepted-LGPL.txt KF5_MODEMMANAGER_QT_DEPENDENCIES = kf5-extra-cmake-modules modem-manager qt5base KF5_MODEMMANAGER_QT_INSTALL_STAGING = YES diff --git a/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.hash b/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.hash index 8ccada455e..de4504064f 100644 --- a/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.hash +++ b/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.hash @@ -1,3 +1,10 @@ # Locally calculated -sha256 d0b377500ee4cf4f029f4d04d6844bcf3d2d6734982b511a5fffab5165688209 networkmanager-qt-5.47.0.tar.xz -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB +sha256 2e20ffd995ce64a90b1133b594bab2b2292be54e538f62633e78e8296cc44738 networkmanager-qt-5.91.0.tar.xz + +# Hash for license files +sha256 d1cf0896da7045d841fe45b0991cf35540bac1a17b5d11f4afcf8fcb950246b5 LICENSES/GPL-2.0-only.txt +sha256 2ca9503d76d1ffab14f599b4741382eec11face60ad1f0d7a41897809003a286 LICENSES/GPL-3.0-only.txt +sha256 211f1b738d1b864bab2648bee9b55becd39fd2d6aa49c1196e7d87b41db4bc07 LICENSES/LGPL-2.1-only.txt +sha256 476b03829862ab7e3ed920f87fad3de3c995f7dd93c26476eb40f0117de43fdc LICENSES/LGPL-3.0-only.txt +sha256 ef839531eb65b0168f9aed14047c84be13e9ea38801a73bc18abe24dc93e6ac9 LICENSES/LicenseRef-KDE-Accepted-GPL.txt +sha256 d9f25707d20e804f15005be46527366b0604bd739754d144a83d3983d94a9a6a LICENSES/LicenseRef-KDE-Accepted-LGPL.txt diff --git a/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.mk b/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.mk index c383f98e9b..7adff2deb7 100644 --- a/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.mk +++ b/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.mk @@ -7,8 +7,16 @@ KF5_NETWORKMANAGER_QT_VERSION = $(KF5_VERSION) KF5_NETWORKMANAGER_QT_SITE = $(KF5_SITE) KF5_NETWORKMANAGER_QT_SOURCE = networkmanager-qt-$(KF5_NETWORKMANAGER_QT_VERSION).tar.xz -KF5_NETWORKMANAGER_QT_LICENSE = LGPL-2.1+ -KF5_NETWORKMANAGER_QT_LICENSE_FILES = COPYING.LIB +KF5_NETWORKMANAGER_QT_LICENSE = \ + LGPL-2.1 or LGPL-3.0 or LicenseRef-KDE-Accepted-LGPL (library), \ + GPL-2.0 or GPL-3.0 or LicenseRef-KDE-Accepted-GPL (autotests, examples) +KF5_NETWORKMANAGER_QT_LICENSE_FILES = \ + LICENSES/GPL-2.0-only.txt \ + LICENSES/GPL-3.0-only.txt \ + LICENSES/LGPL-2.1-only.txt \ + LICENSES/LGPL-3.0-only.txt \ + LICENSES/LicenseRef-KDE-Accepted-GPL.txt \ + LICENSES/LicenseRef-KDE-Accepted-LGPL.txt KF5_NETWORKMANAGER_QT_DEPENDENCIES = kf5-extra-cmake-modules network-manager qt5base KF5_NETWORKMANAGER_QT_INSTALL_STAGING = YES diff --git a/package/kf5/kf5.mk b/package/kf5/kf5.mk index 8360fc9b63..64b08bae4f 100644 --- a/package/kf5/kf5.mk +++ b/package/kf5/kf5.mk @@ -4,7 +4,7 @@ # ################################################################################ -KF5_VERSION_MAJOR = 5.47 +KF5_VERSION_MAJOR = 5.91 KF5_VERSION = $(KF5_VERSION_MAJOR).0 KF5_SITE = https://download.kde.org/stable/frameworks/$(KF5_VERSION_MAJOR) -- 2.34.1 From fontaine.fabrice at gmail.com Thu Feb 17 17:19:06 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 17 Feb 2022 18:19:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/libglvnd: fix LIBGLVND_CONF_OPTS Message-ID: <20220217171906.552326-1-fontaine.fabrice@gmail.com> LIBGLVND_CONF_OPTS are wrongly overridden in conditionals since the addition of the package in commit 0378e2e5d9ce9d5676975dfbff501360094fdc1a Signed-off-by: Fabrice Fontaine --- package/libglvnd/libglvnd.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libglvnd/libglvnd.mk b/package/libglvnd/libglvnd.mk index 3df609f6eb..3bac4b31e2 100644 --- a/package/libglvnd/libglvnd.mk +++ b/package/libglvnd/libglvnd.mk @@ -37,17 +37,17 @@ LIBGLVND_CONF_OPTS += -Dglx=disabled endif ifeq ($(BR2_PACKAGE_LIBGLVND_DISPATCH_EGL),y) -LIBGLVND_CONF_OPTS = -Degl=true +LIBGLVND_CONF_OPTS += -Degl=true LIBGLVND_PROVIDES += libegl else -LIBGLVND_CONF_OPTS = -Degl=false +LIBGLVND_CONF_OPTS += -Degl=false endif ifeq ($(BR2_PACKAGE_LIBGLVND_DISPATCH_GLES),y) -LIBGLVND_CONF_OPTS = -Dgles1=true -Dgles2=true +LIBGLVND_CONF_OPTS += -Dgles1=true -Dgles2=true LIBGLVND_PROVIDES += libgles else -LIBGLVND_CONF_OPTS = -Dgles1=false -Dgles2=false +LIBGLVND_CONF_OPTS += -Dgles1=false -Dgles2=false endif $(eval $(meson-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Thu Feb 17 17:26:08 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 17 Feb 2022 18:26:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/psmisc: don't override PSMISC_CONF_OPTS Message-ID: <20220217172608.552983-1-fontaine.fabrice@gmail.com> PSMISC_CONF_OPTS is overridden in a conditional since commit 953b0f4de8ebcb5b42c8da760c025873ce82550d Signed-off-by: Fabrice Fontaine --- package/psmisc/psmisc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/psmisc/psmisc.mk b/package/psmisc/psmisc.mk index 3d0d2c5367..8b92be11e8 100644 --- a/package/psmisc/psmisc.mk +++ b/package/psmisc/psmisc.mk @@ -13,7 +13,7 @@ PSMISC_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) ifeq ($(BR2_TOOLCHAIN_HAS_SSP),) # Don't force -fstack-protector when SSP is not available in toolchain -PSMISC_CONF_OPTS = --disable-harden-flags +PSMISC_CONF_OPTS += --disable-harden-flags endif $(eval $(autotools-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Thu Feb 17 17:26:39 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 17 Feb 2022 18:26:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/libgsasl: don't override LIBGSASL_CONF_OPTS Message-ID: <20220217172639.553025-1-fontaine.fabrice@gmail.com> LIBGSASL_CONF_OPTS is wrongly overridden in a conditional since commit c4ff6bf2272df54e8d4594a19fb76fe33e980da2 Signed-off-by: Fabrice Fontaine --- package/libgsasl/libgsasl.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libgsasl/libgsasl.mk b/package/libgsasl/libgsasl.mk index e813a354a1..b1981dea3b 100644 --- a/package/libgsasl/libgsasl.mk +++ b/package/libgsasl/libgsasl.mk @@ -11,10 +11,10 @@ LIBGSASL_LICENSE_FILES = README COPYING.LIB COPYING LIBGSASL_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) -LIBGSASL_CONF_OPTS = --with-libgcrypt-prefix=$(STAGING_DIR)/usr +LIBGSASL_CONF_OPTS += --with-libgcrypt-prefix=$(STAGING_DIR)/usr LIBGSASL_DEPENDENCIES += libgcrypt else -LIBGSASL_CONF_OPTS = --without-libgcrypt +LIBGSASL_CONF_OPTS += --without-libgcrypt endif ifeq ($(BR2_PACKAGE_LIBIDN),y) -- 2.34.1 From fontaine.fabrice at gmail.com Thu Feb 17 17:33:37 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 17 Feb 2022 18:33:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/xz: don't override XZ_CONF_OPTS Message-ID: <20220217173337.553661-1-fontaine.fabrice@gmail.com> XZ_CONF_OPTS is wrongly overridden in a conditional since commit 0dbc17abcb5c254d60a8d59e1ae0d715c2db4324 Signed-off-by: Fabrice Fontaine --- package/xz/xz.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/xz/xz.mk b/package/xz/xz.mk index ffbae4c873..af611975a0 100644 --- a/package/xz/xz.mk +++ b/package/xz/xz.mk @@ -14,9 +14,9 @@ XZ_LICENSE_FILES = COPYING COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1 XZ_CPE_ID_VENDOR = tukaani ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -XZ_CONF_OPTS = --enable-threads +XZ_CONF_OPTS += --enable-threads else -XZ_CONF_OPTS = --disable-threads +XZ_CONF_OPTS += --disable-threads endif # we are built before ccache -- 2.34.1 From fontaine.fabrice at gmail.com Thu Feb 17 17:36:26 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 17 Feb 2022 18:36:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/urg: don't override URG_CONF_OPTS Message-ID: <20220217173626.553951-1-fontaine.fabrice@gmail.com> URG_CONF_OPTS is wrongly overridden in a conditional since commit d0433603e3c7de5a0d7d6a434b4cb45ef5e5b533 Signed-off-by: Fabrice Fontaine --- package/urg/urg.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/urg/urg.mk b/package/urg/urg.mk index 86b7ec2c17..476f36299f 100644 --- a/package/urg/urg.mk +++ b/package/urg/urg.mk @@ -18,7 +18,7 @@ URG_CONF_OPTS += \ --with-sdl-prefix=$(STAGING_DIR)/usr \ --with-sdl-exec-prefix=$(STAGING_DIR)/usr else -URG_CONF_OPTS = --without-sdl +URG_CONF_OPTS += --without-sdl URG_CONF_ENV += ac_cv_path_SDL_CONFIG="" endif -- 2.34.1 From fontaine.fabrice at gmail.com Thu Feb 17 17:38:54 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 17 Feb 2022 18:38:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/libiconv: don't override LIBICONV_CONF_OPTS Message-ID: <20220217173854.554177-1-fontaine.fabrice@gmail.com> LIBICONV_CONF_OPTS is wrongly overridden in a conditional since commit 0d711a64d4753c0efa4158519907cca7ec284573 Signed-off-by: Fabrice Fontaine --- package/libiconv/libiconv.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libiconv/libiconv.mk b/package/libiconv/libiconv.mk index ec79a5d735..40763a92f8 100644 --- a/package/libiconv/libiconv.mk +++ b/package/libiconv/libiconv.mk @@ -11,7 +11,7 @@ LIBICONV_LICENSE = GPL-3.0+ (iconv program), LGPL-2.0+ (library) LIBICONV_LICENSE_FILES = COPYING COPYING.LIB ifeq ($(BR2_PACKAGE_LIBICONV_EXTRA_ENCODINGS),y) -LIBICONV_CONF_OPTS = --enable-extra-encodings +LIBICONV_CONF_OPTS += --enable-extra-encodings endif # Don't build the preloadable library, as we don't need it (it's only -- 2.34.1 From peter at korsgaard.com Thu Feb 17 18:21:59 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Feb 2022 19:21:59 +0100 Subject: [Buildroot] [PATCH] package/pkg-python.mk: drop references to PYTHON_{PATH, DIR} Message-ID: <20220217182202.11640-1-peter@korsgaard.com> With python 2.x support dropped these variables no longer exist, so unconditionally use the python3 variant. 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 02df061a19..b8dc9cd9e5 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -38,10 +38,10 @@ PKG_PYTHON_DISTUTILS_ENV = \ PATH=$(BR_PATH) \ $(TARGET_CONFIGURE_OPTS) \ LDSHARED="$(TARGET_CROSS)gcc -shared" \ - PYTHONPATH="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_PATH),$(PYTHON_PATH))" \ + PYTHONPATH="$(PYTHON3_PATH)" \ PYTHONNOUSERSITE=1 \ _PYTHON_HOST_PLATFORM="$(PKG_PYTHON_HOST_PLATFORM)" \ - _PYTHON_PROJECT_BASE="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_DIR),$(PYTHON_DIR))" \ + _PYTHON_PROJECT_BASE="$(PYTHON3_DIR)" \ _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ _python_sysroot=$(STAGING_DIR) \ _python_prefix=/usr \ @@ -70,11 +70,11 @@ HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \ # Target setuptools-based packages PKG_PYTHON_SETUPTOOLS_ENV = \ _PYTHON_HOST_PLATFORM="$(PKG_PYTHON_HOST_PLATFORM)" \ - _PYTHON_PROJECT_BASE="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_DIR),$(PYTHON_DIR))" \ + _PYTHON_PROJECT_BASE="$(PYTHON3_DIR)" \ _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ PATH=$(BR_PATH) \ $(TARGET_CONFIGURE_OPTS) \ - PYTHONPATH="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_PATH),$(PYTHON_PATH))" \ + PYTHONPATH="$(PYTHON3_PATH)" \ PYTHONNOUSERSITE=1 \ _python_sysroot=$(STAGING_DIR) \ _python_prefix=/usr \ -- 2.20.1 From bernd.kuhls at t-online.de Thu Feb 17 18:35:53 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Thu, 17 Feb 2022 19:35:53 +0100 Subject: [Buildroot] [PATCH/next 2/2] package/intel-mediasdk: bump version to 22.2.1 In-Reply-To: <20220217183553.210835-1-bernd.kuhls@t-online.de> References: <20220217183553.210835-1-bernd.kuhls@t-online.de> Message-ID: <20220217183553.210835-2-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/intel-mediasdk/intel-mediasdk.hash | 2 +- package/intel-mediasdk/intel-mediasdk.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-mediasdk/intel-mediasdk.hash b/package/intel-mediasdk/intel-mediasdk.hash index 7cd61fe9b8..ee4f317242 100644 --- a/package/intel-mediasdk/intel-mediasdk.hash +++ b/package/intel-mediasdk/intel-mediasdk.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5ed1d22b5c5a05d3e848e43caa2b3966dbfb7f74281a646e6d0774a0621a9b8b intel-mediasdk-22.1.0.tar.gz +sha256 ae56d4fe69856ff4e184a2863f23d0e861a16add225fd3e159a5440774d5c80a intel-mediasdk-22.2.1.tar.gz sha256 dfd67773578903698f9ff4a61eb8f2d84810cbecd56f3f3cee8c649f813b6ea6 LICENSE diff --git a/package/intel-mediasdk/intel-mediasdk.mk b/package/intel-mediasdk/intel-mediasdk.mk index 7d57e0e928..7589ff9737 100644 --- a/package/intel-mediasdk/intel-mediasdk.mk +++ b/package/intel-mediasdk/intel-mediasdk.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_MEDIASDK_VERSION = 22.1.0 +INTEL_MEDIASDK_VERSION = 22.2.1 INTEL_MEDIASDK_SITE = https://github.com/Intel-Media-SDK/MediaSDK/archive INTEL_MEDIASDK_LICENSE = MIT INTEL_MEDIASDK_LICENSE_FILES = LICENSE -- 2.30.2 From bernd.kuhls at t-online.de Thu Feb 17 18:35:52 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Thu, 17 Feb 2022 19:35:52 +0100 Subject: [Buildroot] [PATCH/next 1/2] package/intel-mediadriver: bump version to 22.2.1 Message-ID: <20220217183553.210835-1-bernd.kuhls@t-online.de> Removed patch which was applied upstream: https://github.com/intel/media-driver/commit/8eab97af6e1c41fc7b9d72999ecb1c22d9e52db6 Signed-off-by: Bernd Kuhls --- ...001-Add-MEDIA-BUILD-HARDENING-option.patch | 106 ------------------ .../intel-mediadriver/intel-mediadriver.hash | 2 +- .../intel-mediadriver/intel-mediadriver.mk | 2 +- 3 files changed, 2 insertions(+), 108 deletions(-) delete mode 100644 package/intel-mediadriver/0001-Add-MEDIA-BUILD-HARDENING-option.patch diff --git a/package/intel-mediadriver/0001-Add-MEDIA-BUILD-HARDENING-option.patch b/package/intel-mediadriver/0001-Add-MEDIA-BUILD-HARDENING-option.patch deleted file mode 100644 index 968445759a..0000000000 --- a/package/intel-mediadriver/0001-Add-MEDIA-BUILD-HARDENING-option.patch +++ /dev/null @@ -1,106 +0,0 @@ -From 103c00c8d74a1cd87686850212bd93c0e4d59fc9 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 11 Aug 2021 21:34:59 +0200 -Subject: [PATCH] Add MEDIA_BUILD_HARDENING option - -Add MEDIA_BUILD_HARDENING option to allow the user to disable hardening -options such as stack-protector-all or FORTIFY SOURCE 2 which are not -always available (e.g. fortify source 2 is only available on glibc >= 6 -and not musl/uclibc-ng) - -Patch sent upstream: https://github.com/intel/media-driver/pull/1242 - -Signed-off-by: Fabrice Fontaine -Signed-off-by: Bernd Kuhls -[Bernd: rebased for version 21.4.1] ---- - cmrtlib/linux/CMakeLists.txt | 14 ++++++++++---- - .../cmake/linux/media_compile_flags_linux.cmake | 12 ++++++++++-- - media_driver/media_top_cmake.cmake | 8 +++++++- - 3 files changed, 27 insertions(+), 7 deletions(-) - -diff --git a/cmrtlib/linux/CMakeLists.txt b/cmrtlib/linux/CMakeLists.txt -index 65f71ceef..b066138d9 100644 ---- a/cmrtlib/linux/CMakeLists.txt -+++ b/cmrtlib/linux/CMakeLists.txt -@@ -32,12 +32,18 @@ else() - endif() - - # Set up compile options that will be used for the Linux build --set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive -fstack-protector-all") --set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-strict-aliasing -D_FORTIFY_SOURCE=2") -+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive") -+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-strict-aliasing") - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -D__DEBUG -O0") --set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive -fstack-protector-all") --set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-strict-aliasing -D_FORTIFY_SOURCE=2") -+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive") -+set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-strict-aliasing") - set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG -D__DEBUG -O0") -+if(MEDIA_BUILD_HARDENING) -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS} -fstack-protector-all") -+ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -D_FORTIFY_SOURCE=2") -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS} -fstack-protector-all") -+ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -D_FORTIFY_SOURCE=2") -+endif() - if(MEDIA_BUILD_FATAL_WARNINGS) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS} -Werror") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS} -Werror") -diff --git a/media_driver/cmake/linux/media_compile_flags_linux.cmake b/media_driver/cmake/linux/media_compile_flags_linux.cmake -index 7a2bd64b6..98896b131 100755 ---- a/media_driver/cmake/linux/media_compile_flags_linux.cmake -+++ b/media_driver/cmake/linux/media_compile_flags_linux.cmake -@@ -47,7 +47,6 @@ set(MEDIA_COMPILER_FLAGS_COMMON - # Other common flags - -fmessage-length=0 - -fvisibility=hidden -- -fstack-protector - -fdata-sections - -ffunction-sections - -Wl,--gc-sections -@@ -64,6 +63,11 @@ set(MEDIA_COMPILER_FLAGS_COMMON - -g - ) - -+if(MEDIA_BUILD_HARDENING) -+ set(MEDIA_COMPILER_FLAGS_COMMON -+ ${MEDIA_COMPILER_FLAGS_COMMON} -+ -fstack-protector) -+endif() - - if(${UFO_MARCH} STREQUAL "slm") - set(MEDIA_COMPILER_FLAGS_COMMON -@@ -119,9 +123,13 @@ if(${UFO_VARIANT} STREQUAL "default") - set(MEDIA_COMPILER_FLAGS_RELEASE - ${MEDIA_COMPILER_FLAGS_RELEASE} - -O2 -- -D_FORTIFY_SOURCE=2 - -fno-omit-frame-pointer - ) -+ if(MEDIA_BUILD_HARDENING) -+ set(MEDIA_COMPILER_FLAGS_RELEASE -+ ${MEDIA_COMPILER_FLAGS_RELEASE} -+ -D_FORTIFY_SOURCE=2) -+ endif() - endif() - - if(NOT ${PLATFORM} STREQUAL "android") -diff --git a/media_driver/media_top_cmake.cmake b/media_driver/media_top_cmake.cmake -index f089ea45f..b0b428914 100755 ---- a/media_driver/media_top_cmake.cmake -+++ b/media_driver/media_top_cmake.cmake -@@ -113,7 +113,13 @@ if(MEDIA_BUILD_FATAL_WARNINGS) - set_target_properties(${LIB_NAME_OBJ} PROPERTIES COMPILE_FLAGS "-Werror") - endif() - --set_target_properties(${LIB_NAME} PROPERTIES LINK_FLAGS "-Wl,--no-as-needed -Wl,--gc-sections -z relro -z now -fstack-protector -fPIC") -+set(MEDIA_LINK_FLAGS "-Wl,--no-as-needed -Wl,--gc-sections -z relro -z now -fPIC") -+option(MEDIA_BUILD_HARDENING "Enable hardening (stack-protector, fortify source)" ON) -+if(MEDIA_BUILD_HARDENING) -+ set(MEDIA_LINK_FLAGS "${MEDIA_LINK_FLAGS} -fstack-protector") -+endif() -+set_target_properties(${LIB_NAME} PROPERTIES LINK_FLAGS ${MEDIA_LINK_FLAGS}) -+ - set_target_properties(${LIB_NAME} PROPERTIES PREFIX "") - set_target_properties(${LIB_NAME_STATIC} PROPERTIES PREFIX "") - diff --git a/package/intel-mediadriver/intel-mediadriver.hash b/package/intel-mediadriver/intel-mediadriver.hash index ceafa20e80..7c615620ae 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6eaa4a9caf58faa8934b253adb4b0ece1c7d5de6f084167d5138b4e3ba423683 intel-media-22.1.1.tar.gz +sha256 1a0277306d7bb3a1e20c7693ff090fa4ae5c0b68981aa13452ed1c6df9062854 intel-media-22.2.1.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index d8820379e7..4895c1535d 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.1 +INTEL_MEDIADRIVER_VERSION = 22.2.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 kuzminov.sergey81 at gmail.com Thu Feb 17 18:42:09 2022 From: kuzminov.sergey81 at gmail.com (Sergey Kuzminov) Date: Thu, 17 Feb 2022 21:42:09 +0300 Subject: [Buildroot] [PATCH] configs/orangepi_pc_defconfig: switch to extlinux Message-ID: <20220217184209.16736-1-kuzminov.sergey81@gmail.com> Changes: * Switch to common scenarios for multiple boards to create an SD image: board/orangepi/common. * Exclude FAT partition, it is no longer needed for U-Boot. * Switch SD image from MBR to GPT for partition-uuid to work. * Switch to extlinux, this is convenient for debugging. Signed-off-by: Sergey Kuzminov --- board/orangepi/orangepi-pc/boot.cmd | 8 ------ board/orangepi/orangepi-pc/genimage.cfg | 37 ------------------------- configs/orangepi_pc_defconfig | 9 ++---- 3 files changed, 3 insertions(+), 51 deletions(-) delete mode 100644 board/orangepi/orangepi-pc/boot.cmd delete mode 100644 board/orangepi/orangepi-pc/genimage.cfg diff --git a/board/orangepi/orangepi-pc/boot.cmd b/board/orangepi/orangepi-pc/boot.cmd deleted file mode 100644 index 9da625c803..0000000000 --- a/board/orangepi/orangepi-pc/boot.cmd +++ /dev/null @@ -1,8 +0,0 @@ -setenv fdt_high ffffffff - -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun8i-h3-orangepi-pc.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/orangepi/orangepi-pc/genimage.cfg b/board/orangepi/orangepi-pc/genimage.cfg deleted file mode 100644 index 14e326cc56..0000000000 --- a/board/orangepi/orangepi-pc/genimage.cfg +++ /dev/null @@ -1,37 +0,0 @@ -# Minimal SD card image for the OrangePi PC -# -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h3-orangepi-pc.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_pc_defconfig b/configs/orangepi_pc_defconfig index 44ea9b95c4..fd0f64e0e6 100644 --- a/configs/orangepi_pc_defconfig +++ b/configs/orangepi_pc_defconfig @@ -5,8 +5,9 @@ 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" BR2_SYSTEM_DHCP="eth0" +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-pc/genimage.cfg" +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.10.9" @@ -14,6 +15,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-pc/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-pc" +BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set @@ -27,9 +29,4 @@ BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-pc/boot.cmd" -BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -- 2.34.1 From bernd.kuhls at t-online.de Thu Feb 17 18:48:36 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Thu, 17 Feb 2022 19:48:36 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/tvheadend: bump version Message-ID: <20220217184836.418858-1-bernd.kuhls@t-online.de> Removed patch which was applied upstream: https://github.com/tvheadend/tvheadend/commit/fb7b24114685a7e38d842168dce4c613360cd330 Signed-off-by: Bernd Kuhls --- .../0002-configure-add-execinfo-option.patch | 55 ------------------- package/tvheadend/tvheadend.hash | 2 +- package/tvheadend/tvheadend.mk | 2 +- 3 files changed, 2 insertions(+), 57 deletions(-) delete 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 deleted file mode 100644 index c55d127d58..0000000000 --- a/package/tvheadend/0002-configure-add-execinfo-option.patch +++ /dev/null @@ -1,55 +0,0 @@ -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.hash b/package/tvheadend/tvheadend.hash index db06af53b7..44ff745221 100644 --- a/package/tvheadend/tvheadend.hash +++ b/package/tvheadend/tvheadend.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 11eeca461e74fbe8306916933cab96d35a99fa89d81e26126e194875c41b6fad tvheadend-b8710206eb073c72b142bce95846b77a0ffa34a6.tar.gz +sha256 10b8e8387cf341a8c639b3ecbab17dd245dc109afd6c99ca6b7fc3f2b5efc50e tvheadend-1295dd2be863f5beb764290fce9317b24193dfc0.tar.gz sha256 54dc3cbc00bf126bcba43e2af7f3ad1dc00f335985da1409fa943c7b7256d942 LICENSE.md diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk index 58ebdcb054..d2547b8746 100644 --- a/package/tvheadend/tvheadend.mk +++ b/package/tvheadend/tvheadend.mk @@ -4,7 +4,7 @@ # ################################################################################ -TVHEADEND_VERSION = b8710206eb073c72b142bce95846b77a0ffa34a6 +TVHEADEND_VERSION = 1295dd2be863f5beb764290fce9317b24193dfc0 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION)) TVHEADEND_LICENSE = GPL-3.0+ TVHEADEND_LICENSE_FILES = LICENSE.md -- 2.30.2 From giulio.benetti at benettiengineering.com Thu Feb 17 19:41:52 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 17 Feb 2022 20:41:52 +0100 Subject: [Buildroot] [PATCH] configs/orangepi_pc_defconfig: switch to extlinux In-Reply-To: <20220217184209.16736-1-kuzminov.sergey81@gmail.com> References: <20220217184209.16736-1-kuzminov.sergey81@gmail.com> Message-ID: <8d64f47c-9040-ab00-975c-6d9d0af11ef9@benettiengineering.com> Hi Sergey, On 17/02/22 19:42, Sergey Kuzminov wrote: > Changes: > * Switch to common scenarios for multiple boards to create an SD image: board/orangepi/common. ^^^ * Switch to common orangepi scenario for multiple boards(board/orangepi/common) to create an SD image. > * Exclude FAT partition, it is no longer needed for U-Boot. > * Switch SD image from MBR to GPT for partition-uuid to work. > * Switch to extlinux, this is convenient for debugging. > > Signed-off-by: Sergey Kuzminov Except that reword: Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti [Giulio: built only] Best regards -- Giulio Benetti Benetti Engineering sas > --- > board/orangepi/orangepi-pc/boot.cmd | 8 ------ > board/orangepi/orangepi-pc/genimage.cfg | 37 ------------------------- > configs/orangepi_pc_defconfig | 9 ++---- > 3 files changed, 3 insertions(+), 51 deletions(-) > delete mode 100644 board/orangepi/orangepi-pc/boot.cmd > delete mode 100644 board/orangepi/orangepi-pc/genimage.cfg > > diff --git a/board/orangepi/orangepi-pc/boot.cmd b/board/orangepi/orangepi-pc/boot.cmd > deleted file mode 100644 > index 9da625c803..0000000000 > --- a/board/orangepi/orangepi-pc/boot.cmd > +++ /dev/null > @@ -1,8 +0,0 @@ > -setenv fdt_high ffffffff > - > -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait > - > -fatload mmc 0 $kernel_addr_r zImage > -fatload mmc 0 $fdt_addr_r sun8i-h3-orangepi-pc.dtb > - > -bootz $kernel_addr_r - $fdt_addr_r > diff --git a/board/orangepi/orangepi-pc/genimage.cfg b/board/orangepi/orangepi-pc/genimage.cfg > deleted file mode 100644 > index 14e326cc56..0000000000 > --- a/board/orangepi/orangepi-pc/genimage.cfg > +++ /dev/null > @@ -1,37 +0,0 @@ > -# Minimal SD card image for the OrangePi PC > -# > -image boot.vfat { > - vfat { > - files = { > - "zImage", > - "sun8i-h3-orangepi-pc.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_pc_defconfig b/configs/orangepi_pc_defconfig > index 44ea9b95c4..fd0f64e0e6 100644 > --- a/configs/orangepi_pc_defconfig > +++ b/configs/orangepi_pc_defconfig > @@ -5,8 +5,9 @@ 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" > BR2_SYSTEM_DHCP="eth0" > +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-pc/genimage.cfg" > +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.10.9" > @@ -14,6 +15,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="sunxi" > BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-pc/linux.fragment" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-pc" > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > # BR2_TARGET_ROOTFS_TAR is not set > @@ -27,9 +29,4 @@ BR2_TARGET_UBOOT_NEEDS_PYTHON3=y > BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" > -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-pc/boot.cmd" > -BR2_PACKAGE_HOST_DOSFSTOOLS=y > BR2_PACKAGE_HOST_GENIMAGE=y > -BR2_PACKAGE_HOST_MTOOLS=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS=y From ps.report at gmx.net Thu Feb 17 20:04:43 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 17 Feb 2022 21:04:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5base: put back riscv32 patch In-Reply-To: <20220217134637.3728619-1-fontaine.fabrice@gmail.com> References: <20220217134637.3728619-1-fontaine.fabrice@gmail.com> Message-ID: <20220217210443.6994b57c@gmx.net> Hello Fabrice, On Thu, 17 Feb 2022 14:46:37 +0100, Fabrice Fontaine wrote: > Commit 5770a645a3a49a3f0f02972131a4ff5283b4c11e wrongly removed riscv32 > patch resulting in the following build failure: > > In file included from thread/qmutex_linux.cpp:45, > from thread/qmutex.cpp:806: > 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 > > Fixes: > - http://autobuild.buildroot.org/results/ff90bc7680acf1487ed58e5e25cf1a5f13dfaedb > > Signed-off-by: Fabrice Fontaine Reviewed-by: Peter Seiderer Regards, Peter > --- > .../qt5base/0007-Fix-build-on-riscv32.patch | 46 +++++++++++++++++++ > 1 file changed, 46 insertions(+) > create mode 100644 package/qt5/qt5base/0007-Fix-build-on-riscv32.patch > > diff --git a/package/qt5/qt5base/0007-Fix-build-on-riscv32.patch b/package/qt5/qt5base/0007-Fix-build-on-riscv32.patch > new file mode 100644 > index 0000000000..5561acb9ae > --- /dev/null > +++ b/package/qt5/qt5base/0007-Fix-build-on-riscv32.patch > @@ -0,0 +1,46 @@ > +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] > +Signed-off-by: Fabrice Fontaine > +--- > + 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 > + From giulio.benetti at benettiengineering.com Thu Feb 17 20:10:01 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 17 Feb 2022 21:10:01 +0100 Subject: [Buildroot] [PATCH] configs/kontron_bl_imx8mm_defconfig: U-Boot requires OpenSSL Message-ID: <20220217201001.1859113-1-giulio.benetti@benettiengineering.com> Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2103784267 Signed-off-by: Giulio Benetti --- configs/kontron_bl_imx8mm_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/kontron_bl_imx8mm_defconfig b/configs/kontron_bl_imx8mm_defconfig index 57e7e9683d..2b7e121e25 100644 --- a/configs/kontron_bl_imx8mm_defconfig +++ b/configs/kontron_bl_imx8mm_defconfig @@ -45,6 +45,7 @@ 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_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN=y BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y -- 2.25.1 From yann.morin.1998 at free.fr Thu Feb 17 20:29:12 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 17 Feb 2022 21:29:12 +0100 Subject: [Buildroot] [git commit] package/psmisc: don't override PSMISC_CONF_OPTS Message-ID: <20220217202156.A30E88377E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=862db5f610eb847fa859e247755db9d7dcbc0d23 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master PSMISC_CONF_OPTS is overridden in a conditional since commit 953b0f4de8ebcb5b42c8da760c025873ce82550d Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/psmisc/psmisc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/psmisc/psmisc.mk b/package/psmisc/psmisc.mk index 3d0d2c5367..8b92be11e8 100644 --- a/package/psmisc/psmisc.mk +++ b/package/psmisc/psmisc.mk @@ -13,7 +13,7 @@ PSMISC_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) ifeq ($(BR2_TOOLCHAIN_HAS_SSP),) # Don't force -fstack-protector when SSP is not available in toolchain -PSMISC_CONF_OPTS = --disable-harden-flags +PSMISC_CONF_OPTS += --disable-harden-flags endif $(eval $(autotools-package)) From yann.morin.1998 at free.fr Thu Feb 17 20:29:10 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 17 Feb 2022 21:29:10 +0100 Subject: [Buildroot] [git commit] package/libglvnd: fix LIBGLVND_CONF_OPTS Message-ID: <20220217202156.9A04B83785@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=09a1511abd3ba0f3e20a1e93f36830d344dd1ce3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master LIBGLVND_CONF_OPTS are wrongly overridden in conditionals since the addition of the package in commit 0378e2e5d9ce9d5676975dfbff501360094fdc1a Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libglvnd/libglvnd.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libglvnd/libglvnd.mk b/package/libglvnd/libglvnd.mk index 3df609f6eb..3bac4b31e2 100644 --- a/package/libglvnd/libglvnd.mk +++ b/package/libglvnd/libglvnd.mk @@ -37,17 +37,17 @@ LIBGLVND_CONF_OPTS += -Dglx=disabled endif ifeq ($(BR2_PACKAGE_LIBGLVND_DISPATCH_EGL),y) -LIBGLVND_CONF_OPTS = -Degl=true +LIBGLVND_CONF_OPTS += -Degl=true LIBGLVND_PROVIDES += libegl else -LIBGLVND_CONF_OPTS = -Degl=false +LIBGLVND_CONF_OPTS += -Degl=false endif ifeq ($(BR2_PACKAGE_LIBGLVND_DISPATCH_GLES),y) -LIBGLVND_CONF_OPTS = -Dgles1=true -Dgles2=true +LIBGLVND_CONF_OPTS += -Dgles1=true -Dgles2=true LIBGLVND_PROVIDES += libgles else -LIBGLVND_CONF_OPTS = -Dgles1=false -Dgles2=false +LIBGLVND_CONF_OPTS += -Dgles1=false -Dgles2=false endif $(eval $(meson-package)) From yann.morin.1998 at free.fr Thu Feb 17 20:29:21 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 17 Feb 2022 21:29:21 +0100 Subject: [Buildroot] [git commit] package/libiconv: don't override LIBICONV_CONF_OPTS Message-ID: <20220217202156.C63588379E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3f5843cd07df37fbef2b421a5857b1f86d098eb6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master LIBICONV_CONF_OPTS is wrongly overridden in a conditional since commit 0d711a64d4753c0efa4158519907cca7ec284573 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libiconv/libiconv.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libiconv/libiconv.mk b/package/libiconv/libiconv.mk index ec79a5d735..40763a92f8 100644 --- a/package/libiconv/libiconv.mk +++ b/package/libiconv/libiconv.mk @@ -11,7 +11,7 @@ LIBICONV_LICENSE = GPL-3.0+ (iconv program), LGPL-2.0+ (library) LIBICONV_LICENSE_FILES = COPYING COPYING.LIB ifeq ($(BR2_PACKAGE_LIBICONV_EXTRA_ENCODINGS),y) -LIBICONV_CONF_OPTS = --enable-extra-encodings +LIBICONV_CONF_OPTS += --enable-extra-encodings endif # Don't build the preloadable library, as we don't need it (it's only From yann.morin.1998 at free.fr Thu Feb 17 20:29:15 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 17 Feb 2022 21:29:15 +0100 Subject: [Buildroot] [git commit] package/libgsasl: don't override LIBGSASL_CONF_OPTS Message-ID: <20220217202156.ABD588379E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=83f9f0b881fa401b67f2523faa4d68d20ca7cc17 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master LIBGSASL_CONF_OPTS is wrongly overridden in a conditional since commit c4ff6bf2272df54e8d4594a19fb76fe33e980da2 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libgsasl/libgsasl.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libgsasl/libgsasl.mk b/package/libgsasl/libgsasl.mk index e813a354a1..b1981dea3b 100644 --- a/package/libgsasl/libgsasl.mk +++ b/package/libgsasl/libgsasl.mk @@ -11,10 +11,10 @@ LIBGSASL_LICENSE_FILES = README COPYING.LIB COPYING LIBGSASL_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) -LIBGSASL_CONF_OPTS = --with-libgcrypt-prefix=$(STAGING_DIR)/usr +LIBGSASL_CONF_OPTS += --with-libgcrypt-prefix=$(STAGING_DIR)/usr LIBGSASL_DEPENDENCIES += libgcrypt else -LIBGSASL_CONF_OPTS = --without-libgcrypt +LIBGSASL_CONF_OPTS += --without-libgcrypt endif ifeq ($(BR2_PACKAGE_LIBIDN),y) From yann.morin.1998 at free.fr Thu Feb 17 20:29:17 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 17 Feb 2022 21:29:17 +0100 Subject: [Buildroot] [git commit] package/xz: don't override XZ_CONF_OPTS Message-ID: <20220217202156.B517B83785@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e389bf186f732729f9e5b3ec84aedd1f925b4fe9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master XZ_CONF_OPTS is wrongly overridden in a conditional since commit 0dbc17abcb5c254d60a8d59e1ae0d715c2db4324 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/xz/xz.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/xz/xz.mk b/package/xz/xz.mk index ffbae4c873..af611975a0 100644 --- a/package/xz/xz.mk +++ b/package/xz/xz.mk @@ -14,9 +14,9 @@ XZ_LICENSE_FILES = COPYING COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1 XZ_CPE_ID_VENDOR = tukaani ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -XZ_CONF_OPTS = --enable-threads +XZ_CONF_OPTS += --enable-threads else -XZ_CONF_OPTS = --disable-threads +XZ_CONF_OPTS += --disable-threads endif # we are built before ccache From yann.morin.1998 at free.fr Thu Feb 17 20:29:19 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 17 Feb 2022 21:29:19 +0100 Subject: [Buildroot] [git commit] package/urg: don't override URG_CONF_OPTS Message-ID: <20220217202156.BD9CE8379D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=293d8f727a0858b647479013be72be2da565667f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master URG_CONF_OPTS is wrongly overridden in a conditional since commit d0433603e3c7de5a0d7d6a434b4cb45ef5e5b533 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/urg/urg.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/urg/urg.mk b/package/urg/urg.mk index 86b7ec2c17..476f36299f 100644 --- a/package/urg/urg.mk +++ b/package/urg/urg.mk @@ -18,7 +18,7 @@ URG_CONF_OPTS += \ --with-sdl-prefix=$(STAGING_DIR)/usr \ --with-sdl-exec-prefix=$(STAGING_DIR)/usr else -URG_CONF_OPTS = --without-sdl +URG_CONF_OPTS += --without-sdl URG_CONF_ENV += ac_cv_path_SDL_CONFIG="" endif From yann.morin.1998 at free.fr Thu Feb 17 20:30:57 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 17 Feb 2022 21:30:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/libglvnd: fix LIBGLVND_CONF_OPTS In-Reply-To: <20220217171906.552326-1-fontaine.fabrice@gmail.com> References: <20220217171906.552326-1-fontaine.fabrice@gmail.com> Message-ID: <20220217203057.GF522310@scaer> Fabrice, All, On 2022-02-17 18:19 +0100, Fabrice Fontaine spake thusly: > LIBGLVND_CONF_OPTS are wrongly overridden in conditionals since the > addition of the package in commit > 0378e2e5d9ce9d5676975dfbff501360094fdc1a > > Signed-off-by: Fabrice Fontaine This, and the following 5 similar changes, applied to master, thanks. Regards, Yann E. MORIN. > --- > package/libglvnd/libglvnd.mk | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/libglvnd/libglvnd.mk b/package/libglvnd/libglvnd.mk > index 3df609f6eb..3bac4b31e2 100644 > --- a/package/libglvnd/libglvnd.mk > +++ b/package/libglvnd/libglvnd.mk > @@ -37,17 +37,17 @@ LIBGLVND_CONF_OPTS += -Dglx=disabled > endif > > ifeq ($(BR2_PACKAGE_LIBGLVND_DISPATCH_EGL),y) > -LIBGLVND_CONF_OPTS = -Degl=true > +LIBGLVND_CONF_OPTS += -Degl=true > LIBGLVND_PROVIDES += libegl > else > -LIBGLVND_CONF_OPTS = -Degl=false > +LIBGLVND_CONF_OPTS += -Degl=false > endif > > ifeq ($(BR2_PACKAGE_LIBGLVND_DISPATCH_GLES),y) > -LIBGLVND_CONF_OPTS = -Dgles1=true -Dgles2=true > +LIBGLVND_CONF_OPTS += -Dgles1=true -Dgles2=true > LIBGLVND_PROVIDES += libgles > else > -LIBGLVND_CONF_OPTS = -Dgles1=false -Dgles2=false > +LIBGLVND_CONF_OPTS += -Dgles1=false -Dgles2=false > endif > > $(eval $(meson-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 Thu Feb 17 20:32:42 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 17 Feb 2022 21:32:42 +0100 Subject: [Buildroot] [git commit] package/pkg-python.mk: drop references to PYTHON_{PATH, DIR} Message-ID: <20220217202558.7E84E83797@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=908e514de4919dfcde6891cb2395232e4f2846be branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master With python 2.x support dropped these variables no longer exist, so unconditionally use the python3 variant. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- 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 02df061a19..b8dc9cd9e5 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -38,10 +38,10 @@ PKG_PYTHON_DISTUTILS_ENV = \ PATH=$(BR_PATH) \ $(TARGET_CONFIGURE_OPTS) \ LDSHARED="$(TARGET_CROSS)gcc -shared" \ - PYTHONPATH="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_PATH),$(PYTHON_PATH))" \ + PYTHONPATH="$(PYTHON3_PATH)" \ PYTHONNOUSERSITE=1 \ _PYTHON_HOST_PLATFORM="$(PKG_PYTHON_HOST_PLATFORM)" \ - _PYTHON_PROJECT_BASE="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_DIR),$(PYTHON_DIR))" \ + _PYTHON_PROJECT_BASE="$(PYTHON3_DIR)" \ _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ _python_sysroot=$(STAGING_DIR) \ _python_prefix=/usr \ @@ -70,11 +70,11 @@ HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \ # Target setuptools-based packages PKG_PYTHON_SETUPTOOLS_ENV = \ _PYTHON_HOST_PLATFORM="$(PKG_PYTHON_HOST_PLATFORM)" \ - _PYTHON_PROJECT_BASE="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_DIR),$(PYTHON_DIR))" \ + _PYTHON_PROJECT_BASE="$(PYTHON3_DIR)" \ _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ PATH=$(BR_PATH) \ $(TARGET_CONFIGURE_OPTS) \ - PYTHONPATH="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_PATH),$(PYTHON_PATH))" \ + PYTHONPATH="$(PYTHON3_PATH)" \ PYTHONNOUSERSITE=1 \ _python_sysroot=$(STAGING_DIR) \ _python_prefix=/usr \ From yann.morin.1998 at free.fr Thu Feb 17 20:33:35 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 17 Feb 2022 21:33:35 +0100 Subject: [Buildroot] [PATCH] package/pkg-python.mk: drop references to PYTHON_{PATH, DIR} In-Reply-To: <20220217182202.11640-1-peter@korsgaard.com> References: <20220217182202.11640-1-peter@korsgaard.com> Message-ID: <20220217203335.GG522310@scaer> Peter, All, On 2022-02-17 19:21 +0100, Peter Korsgaard spake thusly: > With python 2.x support dropped these variables no longer exist, so > unconditionally use the python3 variant. > > Signed-off-by: Peter Korsgaard Applied to master, thanks. Regards, Yann E. MORIN. > --- > 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 02df061a19..b8dc9cd9e5 100644 > --- a/package/pkg-python.mk > +++ b/package/pkg-python.mk > @@ -38,10 +38,10 @@ PKG_PYTHON_DISTUTILS_ENV = \ > PATH=$(BR_PATH) \ > $(TARGET_CONFIGURE_OPTS) \ > LDSHARED="$(TARGET_CROSS)gcc -shared" \ > - PYTHONPATH="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_PATH),$(PYTHON_PATH))" \ > + PYTHONPATH="$(PYTHON3_PATH)" \ > PYTHONNOUSERSITE=1 \ > _PYTHON_HOST_PLATFORM="$(PKG_PYTHON_HOST_PLATFORM)" \ > - _PYTHON_PROJECT_BASE="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_DIR),$(PYTHON_DIR))" \ > + _PYTHON_PROJECT_BASE="$(PYTHON3_DIR)" \ > _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ > _python_sysroot=$(STAGING_DIR) \ > _python_prefix=/usr \ > @@ -70,11 +70,11 @@ HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \ > # Target setuptools-based packages > PKG_PYTHON_SETUPTOOLS_ENV = \ > _PYTHON_HOST_PLATFORM="$(PKG_PYTHON_HOST_PLATFORM)" \ > - _PYTHON_PROJECT_BASE="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_DIR),$(PYTHON_DIR))" \ > + _PYTHON_PROJECT_BASE="$(PYTHON3_DIR)" \ > _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ > PATH=$(BR_PATH) \ > $(TARGET_CONFIGURE_OPTS) \ > - PYTHONPATH="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_PATH),$(PYTHON_PATH))" \ > + PYTHONPATH="$(PYTHON3_PATH)" \ > PYTHONNOUSERSITE=1 \ > _python_sysroot=$(STAGING_DIR) \ > _python_prefix=/usr \ > -- > 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 Feb 17 20:39:05 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 17 Feb 2022 21:39:05 +0100 Subject: [Buildroot] [git commit] package/cryptsetup: fix build failure with libgcrypt Message-ID: <20220217203208.E1C76837A1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9badf18d97485724fc99421ab28eddd512a675c7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The patch 0001-Add-check-program-for-symver-attribute.patch, introduced in 683e8387d05c, touches a autoconf relevant file which causes a configure --recheck in the make step without proper CONF_ENV. Running autoreconf prevents this. Signed-off-by: Moritz Bitsch [yann.morin.1998 at free.fr: add comment, add commit reference] Signed-off-by: Yann E. MORIN --- package/cryptsetup/cryptsetup.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index 2e06047c56..bd8681d5ff 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -17,6 +17,10 @@ CRYPTSETUP_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (library) CRYPTSETUP_LICENSE_FILES = COPYING COPYING.LGPL CRYPTSETUP_CPE_ID_VENDOR = cryptsetup_project CRYPTSETUP_INSTALL_STAGING = YES + +# 0001-Add-check-program-for-symver-attribute.patch +CRYPTSETUP_AUTORECONF = YES + CRYPTSETUP_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)" CRYPTSETUP_CONF_OPTS += --enable-blkid --enable-libargon2 From yann.morin.1998 at free.fr Thu Feb 17 20:41:18 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 17 Feb 2022 21:41:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/cryptsetup: fix build failure with libgcrypt In-Reply-To: <20220217074338.147889-1-moritz@h6t.eu> References: <20220217074338.147889-1-moritz@h6t.eu> Message-ID: <20220217204118.GH522310@scaer> Moritz, All, On 2022-02-17 08:43 +0100, Moritz Bitsch via buildroot spake thusly: > From: Moritz Bitsch > > The patch 0001-Add-check-program-for-symver-attribute.patch touches > a autoconf relevant file which causes a configure --recheck in the > make step without proper CONF_ENV. Running autoreconf prevents this. I've added a reference to the commit sha1 that introduced the issue, as the patch by Fabrice did (as pointed out by Giulio). > Signed-off-by: Moritz Bitsch > --- > package/cryptsetup/cryptsetup.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk > index 2e06047c56..8373f0ab74 100644 > --- a/package/cryptsetup/cryptsetup.mk > +++ b/package/cryptsetup/cryptsetup.mk > @@ -19,6 +19,7 @@ CRYPTSETUP_CPE_ID_VENDOR = cryptsetup_project > CRYPTSETUP_INSTALL_STAGING = YES > CRYPTSETUP_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)" > CRYPTSETUP_CONF_OPTS += --enable-blkid --enable-libargon2 > +CRYPTSETUP_AUTORECONF = YES We also like to add a small comment to explain why autoreconf is needed, in this case just the name of the patch is suficient. Applied to master, thanks. Regards, Yann E. MORIN. > # cryptsetup uses libgcrypt by default, but can be configured to use OpenSSL > # or kernel crypto modules instead > -- > 2.35.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 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 Feb 17 20:43:39 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 17 Feb 2022 21:43:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/cryptsetup: fix build failure with libgcrypt In-Reply-To: <1544B961-F072-436D-9887-4EC3CFDC4CD3@benettiengineering.com> References: <20220217074338.147889-1-moritz@h6t.eu> <1544B961-F072-436D-9887-4EC3CFDC4CD3@benettiengineering.com> Message-ID: <20220217204339.GI522310@scaer> Giulio, All, On 2022-02-17 14:29 +0100, Giulio Benetti spake thusly: > > Il giorno 17 feb 2022, alle ore 08:55, Moritz Bitsch via buildroot ha scritto: > > The patch 0001-Add-check-program-for-symver-attribute.patch touches > > a autoconf relevant file which causes a configure --recheck in the > > make step without proper CONF_ENV. Running autoreconf prevents this. > Thank you for the contribution, but Fabrice already sent a patch for that: > https://patchwork.ozlabs.org/project/buildroot/patch/20220213210504.1416861-1-fontaine.fabrice at gmail.com/ Yep, but in this case, I applied Moritz' patch, because Fabrice has waaaayyyy too many commits in his name already! ;-] 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 Thu Feb 17 20:45:06 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 17 Feb 2022 21:45:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/cryptsetup: set CRYPTSETUP_AUTORECONF In-Reply-To: <20220213210504.1416861-1-fontaine.fabrice@gmail.com> References: <20220213210504.1416861-1-fontaine.fabrice@gmail.com> Message-ID: <20220217204506.GJ522310@scaer> Fabrice, All, On 2022-02-13 22:05 +0100, Fabrice Fontaine spake thusly: > Commit 683e8387d05cb506c30592ab43a3e7534d7cf56e forgot to set > CRYPTSETUP_AUTORECONF resulting in the following build failure: > > configure: error: You need the gcrypt library. > > Fixes: > - http://autobuild.buildroot.org/results/f6cead0cf1089bbbe52457d379764a0aa9add408 > > Signed-off-by: Fabrice Fontaine Sorry but I applied another patch (I cc-ed you on the reply). Thanks! :-) Regards, Yann E. MORIN. > --- > package/cryptsetup/cryptsetup.mk | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk > index 2e06047c56..55cc70576c 100644 > --- a/package/cryptsetup/cryptsetup.mk > +++ b/package/cryptsetup/cryptsetup.mk > @@ -17,6 +17,8 @@ CRYPTSETUP_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (library) > CRYPTSETUP_LICENSE_FILES = COPYING COPYING.LGPL > CRYPTSETUP_CPE_ID_VENDOR = cryptsetup_project > CRYPTSETUP_INSTALL_STAGING = YES > +# We're patching configure.ac > +CRYPTSETUP_AUTORECONF = YES > CRYPTSETUP_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)" > CRYPTSETUP_CONF_OPTS += --enable-blkid --enable-libargon2 > > -- > 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 Feb 17 20:49:30 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 17 Feb 2022 21:49:30 +0100 Subject: [Buildroot] [git commit branch/next] package/cryptsetup: openssl is the default crypto backend Message-ID: <20220217204203.8B00C83721@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0ce909afa98223bbd6bb1b2c65dec6cc8982ad31 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next openssl is the default crypto backend since version 2.1.0 and https://github.com/mbroz/cryptsetup/commit/bc3d0feb5cd33f9181102b418cc7bf44fe112e82 Signed-off-by: Fabrice Fontaine Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti Signed-off-by: Yann E. MORIN --- package/cryptsetup/cryptsetup.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index 2e06047c56..bad31cec8a 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -20,15 +20,15 @@ CRYPTSETUP_INSTALL_STAGING = YES CRYPTSETUP_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)" CRYPTSETUP_CONF_OPTS += --enable-blkid --enable-libargon2 -# cryptsetup uses libgcrypt by default, but can be configured to use OpenSSL +# cryptsetup uses OpenSSL by default, but can be configured to use libgcrypt # or kernel crypto modules instead -ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) +ifeq ($(BR2_PACKAGE_OPENSSL),y) +CRYPTSETUP_DEPENDENCIES += openssl +CRYPTSETUP_CONF_OPTS += --with-crypto_backend=openssl +else ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) CRYPTSETUP_DEPENDENCIES += libgcrypt CRYPTSETUP_CONF_ENV += LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config CRYPTSETUP_CONF_OPTS += --with-crypto_backend=gcrypt -else ifeq ($(BR2_PACKAGE_OPENSSL),y) -CRYPTSETUP_DEPENDENCIES += openssl -CRYPTSETUP_CONF_OPTS += --with-crypto_backend=openssl else CRYPTSETUP_CONF_OPTS += --with-crypto_backend=kernel endif From yann.morin.1998 at free.fr Thu Feb 17 20:50:04 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 17 Feb 2022 21:50:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/cryptsetup: openssl is the default crypto backend In-Reply-To: <20220213212909.1504992-1-fontaine.fabrice@gmail.com> References: <20220213212909.1504992-1-fontaine.fabrice@gmail.com> Message-ID: <20220217205004.GK522310@scaer> Fabrice, All, On 2022-02-13 22:29 +0100, Fabrice Fontaine spake thusly: > openssl is the default crypto backend since version 2.1.0 and > https://github.com/mbroz/cryptsetup/commit/bc3d0feb5cd33f9181102b418cc7bf44fe112e82 > > Signed-off-by: Fabrice Fontaine Applied to next, thanks. Regards, Yann E. MORIN. > --- > package/cryptsetup/cryptsetup.mk | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk > index 55cc70576c..b50ac698bb 100644 > --- a/package/cryptsetup/cryptsetup.mk > +++ b/package/cryptsetup/cryptsetup.mk > @@ -22,15 +22,15 @@ CRYPTSETUP_AUTORECONF = YES > CRYPTSETUP_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)" > CRYPTSETUP_CONF_OPTS += --enable-blkid --enable-libargon2 > > -# cryptsetup uses libgcrypt by default, but can be configured to use OpenSSL > +# cryptsetup uses OpenSSL by default, but can be configured to use libgcrypt > # or kernel crypto modules instead > -ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) > +ifeq ($(BR2_PACKAGE_OPENSSL),y) > +CRYPTSETUP_DEPENDENCIES += openssl > +CRYPTSETUP_CONF_OPTS += --with-crypto_backend=openssl > +else ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) > CRYPTSETUP_DEPENDENCIES += libgcrypt > CRYPTSETUP_CONF_ENV += LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config > CRYPTSETUP_CONF_OPTS += --with-crypto_backend=gcrypt > -else ifeq ($(BR2_PACKAGE_OPENSSL),y) > -CRYPTSETUP_DEPENDENCIES += openssl > -CRYPTSETUP_CONF_OPTS += --with-crypto_backend=openssl > else > CRYPTSETUP_CONF_OPTS += --with-crypto_backend=kernel > 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 giulio.benetti at benettiengineering.com Thu Feb 17 20:52:07 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 17 Feb 2022 21:52:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/cryptsetup: fix build failure with libgcrypt In-Reply-To: <20220217204339.GI522310@scaer> References: <20220217204339.GI522310@scaer> Message-ID: <72EB6D19-6401-4EF9-B07C-85CC767E3FA3@benettiengineering.com> Hi Yann, Moritz, > Il giorno 17 feb 2022, alle ore 21:44, Yann E. MORIN ha scritto: > > ?Giulio, All, > > On 2022-02-17 14:29 +0100, Giulio Benetti spake thusly: >>>> Il giorno 17 feb 2022, alle ore 08:55, Moritz Bitsch via buildroot ha scritto: >>> The patch 0001-Add-check-program-for-symver-attribute.patch touches >>> a autoconf relevant file which causes a configure --recheck in the >>> make step without proper CONF_ENV. Running autoreconf prevents this. >> Thank you for the contribution, but Fabrice already sent a patch for that: >> https://patchwork.ozlabs.org/project/buildroot/patch/20220213210504.1416861-1-fontaine.fabrice at gmail.com/ > > Yep, but in this case, I applied Moritz' patch, because Fabrice has > waaaayyyy too many commits in his name already! ;-] Yes, Moritz, feel free to send patches for other build failures you can find here in autobuilder: http://autobuild.buildroot.net/ They are more than welcome! Kind regards Giulio > > 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. | > '------------------------------^-------^------------------^--------------------' > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -------------- next part -------------- An HTML attachment was scrubbed... URL: From marcus.hoffmann at othermo.de Thu Feb 17 20:54:54 2022 From: marcus.hoffmann at othermo.de (Marcus Hoffmann) Date: Thu, 17 Feb 2022 21:54:54 +0100 Subject: [Buildroot] [PATCH] configs/kontron_bl_imx8mm_defconfig: U-Boot requires OpenSSL In-Reply-To: <20220217201001.1859113-1-giulio.benetti@benettiengineering.com> References: <20220217201001.1859113-1-giulio.benetti@benettiengineering.com> Message-ID: <09bdaefa-5364-c7cb-b001-47fa5af72a11@othermo.de> On 17.02.22 21:10, Giulio Benetti wrote: > Fixes: > https://gitlab.com/buildroot.org/buildroot/-/jobs/2103784267 > > Signed-off-by: Giulio Benetti Reviewed-by: Marcus Hoffmann > --- > configs/kontron_bl_imx8mm_defconfig | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/configs/kontron_bl_imx8mm_defconfig b/configs/kontron_bl_imx8mm_defconfig > index 57e7e9683d..2b7e121e25 100644 > --- a/configs/kontron_bl_imx8mm_defconfig > +++ b/configs/kontron_bl_imx8mm_defconfig > @@ -45,6 +45,7 @@ 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_OPENSSL=y > BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN=y > BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y From geomatsi at gmail.com Thu Feb 17 21:18:23 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Fri, 18 Feb 2022 00:18:23 +0300 Subject: [Buildroot] [PATCH v2 1/1] package/{hostapd, wpa_s}: modify config options handling Message-ID: <20220217211823.402414-1-geomatsi@gmail.com> Makefiles hostapd.mk and wpa_supplicant.mk define different macros for different defconfig options. Options that are not listed in defconfig, can be set using CONFIG_SET. Options that are listed in defconfig, can be enabled or disabled using CONFIG_ENABLE or CONFIG_DISABLE. Starting from hostapd v2.10, option CONFIG_DPP is explicitly listed in defconfig. So it would be time to switch to enable/disable macros for this option. On the other hand, this approach looks fragile: we have to track 'promoted' defconfig options for each hostapd/wpa_s update. This patch removes CONFIG_SET macros, keeping only CONFIG_ENABLED/CONFIG_DISABLED. CONFIG_SET is replaced by the additional pass over enabled options. All such options that are not listed in defconfig, will be appended to the configuration file. Fixes: - http://autobuild.buildroot.net/results/3f8058ee6f3913fda795578f206db895731ba1e6/ Signed-off-by: Sergey Matyukevich --- v1 -> v2: - drop patch for mesh fix - remove CONFIG_SET macro as per suggestion by Thomas package/hostapd/hostapd.mk | 20 +++++++++++++------- package/wpa_supplicant/wpa_supplicant.mk | 9 +++++++-- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk index 075cb2a8d0..99f0cdf1b8 100644 --- a/package/hostapd/hostapd.mk +++ b/package/hostapd/hostapd.mk @@ -15,7 +15,6 @@ HOSTAPD_LICENSE_FILES = README HOSTAPD_CPE_ID_VENDOR = w1.fi HOSTAPD_SELINUX_MODULES = hostapd -HOSTAPD_CONFIG_SET = HOSTAPD_CONFIG_ENABLE = \ CONFIG_INTERNAL_LIBTOMMATH \ @@ -83,13 +82,14 @@ HOSTAPD_CONFIG_ENABLE += CONFIG_WPS endif ifeq ($(BR2_PACKAGE_HOSTAPD_WPA3),y) -HOSTAPD_CONFIG_SET += \ - CONFIG_DPP \ - CONFIG_SAE HOSTAPD_CONFIG_ENABLE += \ + CONFIG_DPP \ + CONFIG_SAE \ CONFIG_OWE else HOSTAPD_CONFIG_DISABLE += \ + CONFIG_DPP \ + CONFIG_SAE \ CONFIG_OWE endif @@ -98,8 +98,9 @@ HOSTAPD_CONFIG_ENABLE += CONFIG_NO_VLAN endif ifeq ($(BR2_PACKAGE_HOSTAPD_VLAN_DYNAMIC),y) -HOSTAPD_CONFIG_ENABLE += CONFIG_FULL_DYNAMIC_VLAN -HOSTAPD_CONFIG_SET += NEED_LINUX_IOCTL +HOSTAPD_CONFIG_ENABLE += \ + CONFIG_FULL_DYNAMIC_VLAN \ + NEED_LINUX_IOCTL endif ifeq ($(BR2_PACKAGE_HOSTAPD_VLAN_NETLINK),y) @@ -123,9 +124,14 @@ define HOSTAPD_CONFIGURE_CMDS cp $(@D)/hostapd/defconfig $(HOSTAPD_CONFIG) sed -i $(patsubst %,-e 's/^#\(%\)/\1/',$(HOSTAPD_CONFIG_ENABLE)) \ $(patsubst %,-e 's/^\(%\)/#\1/',$(HOSTAPD_CONFIG_DISABLE)) \ - $(patsubst %,-e '1i%=y',$(HOSTAPD_CONFIG_SET)) \ $(patsubst %,-e %,$(HOSTAPD_CONFIG_EDITS)) \ $(HOSTAPD_CONFIG) + # set requested configuration options not listed in hostapd defconfig + for s in $(HOSTAPD_CONFIG_ENABLE) ; do \ + if ! grep -q "^$${s}" $(HOSTAPD_CONFIG); then \ + echo "$${s}=y" >> $(HOSTAPD_CONFIG) ; \ + fi \ + done endef define HOSTAPD_BUILD_CMDS diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk index b414144774..f0eb36e083 100644 --- a/package/wpa_supplicant/wpa_supplicant.mk +++ b/package/wpa_supplicant/wpa_supplicant.mk @@ -164,7 +164,7 @@ WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_READLINE endif ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_WPA_CLIENT_SO),y) -WPA_SUPPLICANT_CONFIG_SET += CONFIG_BUILD_WPA_CLIENT_SO +WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_BUILD_WPA_CLIENT_SO define WPA_SUPPLICANT_INSTALL_WPA_CLIENT_SO $(INSTALL) -m 0644 -D $(@D)/$(WPA_SUPPLICANT_SUBDIR)/libwpa_client.so \ $(TARGET_DIR)/usr/lib/libwpa_client.so @@ -183,9 +183,14 @@ define WPA_SUPPLICANT_CONFIGURE_CMDS cp $(@D)/wpa_supplicant/defconfig $(WPA_SUPPLICANT_CONFIG) sed -i $(patsubst %,-e 's/^#\(%\)/\1/',$(WPA_SUPPLICANT_CONFIG_ENABLE)) \ $(patsubst %,-e 's/^\(%\)/#\1/',$(WPA_SUPPLICANT_CONFIG_DISABLE)) \ - $(patsubst %,-e '1i%=y',$(WPA_SUPPLICANT_CONFIG_SET)) \ $(patsubst %,-e %,$(WPA_SUPPLICANT_CONFIG_EDITS)) \ $(WPA_SUPPLICANT_CONFIG) + # set requested configuration options not listed in wpa_s defconfig + for s in $(WPA_SUPPLICANT_CONFIG_ENABLE) ; do \ + if ! grep -q "^$${s}" $(WPA_SUPPLICANT_CONFIG); then \ + echo "$${s}=y" >> $(WPA_SUPPLICANT_CONFIG) ; \ + fi \ + done endef # LIBS for wpa_supplicant, LIBS_c for wpa_cli, LIBS_p for wpa_passphrase -- 2.35.0 From yann.morin.1998 at free.fr Thu Feb 17 21:40:20 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 17 Feb 2022 22:40:20 +0100 Subject: [Buildroot] [git commit] configs/kontron_bl_imx8mm_defconfig: U-Boot requires OpenSSL Message-ID: <20220217213507.AB5FC83796@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0711e9149820ba609edfcebfba2db95beb92ed32 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2103784267 Signed-off-by: Giulio Benetti Reviewed-by: Marcus Hoffmann Signed-off-by: Yann E. MORIN --- configs/kontron_bl_imx8mm_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/kontron_bl_imx8mm_defconfig b/configs/kontron_bl_imx8mm_defconfig index 57e7e9683d..2b7e121e25 100644 --- a/configs/kontron_bl_imx8mm_defconfig +++ b/configs/kontron_bl_imx8mm_defconfig @@ -45,6 +45,7 @@ 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_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN=y BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y From yann.morin.1998 at free.fr Thu Feb 17 21:40:27 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 17 Feb 2022 22:40:27 +0100 Subject: [Buildroot] [git commit] configs/friendlyarm_nanopi_r2s_defconfig: uboot needs openssl Message-ID: <20220217213507.B5767837B9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1f1e32f6d7e66e37e8ea79da08c91eff590078b3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes the following compile error: In file included from include/bootm.h:10, from tools/image-host.c:12: include/image.h:1178:12: fatal error: openssl/evp.h: No such file or directory 1178 | # include | ^~~~~~~~~~~~~~~ compilation terminated. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2103784200 Signed-off-by: Marcus Hoffmann Reviewed-by: Giulio Benetti Signed-off-by: Yann E. MORIN --- configs/friendlyarm_nanopi_r2s_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/friendlyarm_nanopi_r2s_defconfig b/configs/friendlyarm_nanopi_r2s_defconfig index 818c847f4b..ce252a5d76 100644 --- a/configs/friendlyarm_nanopi_r2s_defconfig +++ b/configs/friendlyarm_nanopi_r2s_defconfig @@ -30,6 +30,7 @@ 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_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y From yann.morin.1998 at free.fr Thu Feb 17 21:43:14 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 17 Feb 2022 22:43:14 +0100 Subject: [Buildroot] [PATCH v2 1/2] configs/friendlyarm_nanopi_r2s_defconfig: uboot needs openssl In-Reply-To: <20220217155549.1084829-2-marcus.hoffmann@othermo.de> References: <20220217155549.1084829-1-marcus.hoffmann@othermo.de> <20220217155549.1084829-2-marcus.hoffmann@othermo.de> Message-ID: <20220217214314.GL522310@scaer> Marcus, All On 2022-02-17 16:55 +0100, Marcus Hoffmann spake thusly: > Fixes the following compile error: > > In file included from include/bootm.h:10, > from tools/image-host.c:12: > include/image.h:1178:12: fatal error: openssl/evp.h: No such file or directory > 1178 | # include > | ^~~~~~~~~~~~~~~ > compilation terminated. > > Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2103784200 > > Signed-off-by: Marcus Hoffmann Applied to master, thanks. Regards, Yann E. MORIN. > --- > configs/friendlyarm_nanopi_r2s_defconfig | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/configs/friendlyarm_nanopi_r2s_defconfig b/configs/friendlyarm_nanopi_r2s_defconfig > index 818c847f4b..ce252a5d76 100644 > --- a/configs/friendlyarm_nanopi_r2s_defconfig > +++ b/configs/friendlyarm_nanopi_r2s_defconfig > @@ -30,6 +30,7 @@ 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_PYLIBFDT=y > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y > BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > -- > 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 Feb 17 21:43:31 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 17 Feb 2022 22:43:31 +0100 Subject: [Buildroot] [PATCH] configs/kontron_bl_imx8mm_defconfig: U-Boot requires OpenSSL In-Reply-To: <20220217201001.1859113-1-giulio.benetti@benettiengineering.com> References: <20220217201001.1859113-1-giulio.benetti@benettiengineering.com> Message-ID: <20220217214331.GM522310@scaer> Giulio, All, On 2022-02-17 21:10 +0100, Giulio Benetti spake thusly: > Fixes: > https://gitlab.com/buildroot.org/buildroot/-/jobs/2103784267 > > Signed-off-by: Giulio Benetti Applied to master, thanks. Regards, Yann E. MORIN. > --- > configs/kontron_bl_imx8mm_defconfig | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/configs/kontron_bl_imx8mm_defconfig b/configs/kontron_bl_imx8mm_defconfig > index 57e7e9683d..2b7e121e25 100644 > --- a/configs/kontron_bl_imx8mm_defconfig > +++ b/configs/kontron_bl_imx8mm_defconfig > @@ -45,6 +45,7 @@ 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_OPENSSL=y > BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN=y > BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=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 Thu Feb 17 21:44:43 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 17 Feb 2022 22:44:43 +0100 Subject: [Buildroot] [PATCH v2 2/2] board/orangepi/orangepi-rk3399/genimage: fix partition types for gpt In-Reply-To: <20220217155549.1084829-3-marcus.hoffmann@othermo.de> References: <20220217155549.1084829-1-marcus.hoffmann@othermo.de> <20220217155549.1084829-3-marcus.hoffmann@othermo.de> Message-ID: <20220217214443.GN522310@scaer> Marcus, All, On 2022-02-17 16:55 +0100, Marcus Hoffmann spake thusly: > Fixes the following error during image generation: > ERROR: hdimage(sdcard.img): part boot: 'partition-type' is only valid > for mbr and hybrid partition-table-type > > Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2103784375 > > Signed-off-by: Marcus Hoffmann > --- > board/orangepi/orangepi-rk3399/genimage.cfg | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/board/orangepi/orangepi-rk3399/genimage.cfg b/board/orangepi/orangepi-rk3399/genimage.cfg > index c94e0bc7cc..a02166172f 100644 > --- a/board/orangepi/orangepi-rk3399/genimage.cfg > +++ b/board/orangepi/orangepi-rk3399/genimage.cfg > @@ -26,14 +26,13 @@ image sdcard.img { > } > > partition boot { > - partition-type = 0xC > + partition-type-uuid = F > bootable = "true" > image = "boot.vfat" > offset = 16M > } > > partition rootfs { > - partition-type = 0x83 Why don't you also switch this one to partition-type-uuid? Regards, Yann E. MORIN. > image = "rootfs.ext4" > } > } > -- > 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 Thu Feb 17 21:44:59 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 17 Feb 2022 22:44:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/pcre: don't override PCRE_CONF_OPTS Message-ID: <20220217214459.555586-1-fontaine.fabrice@gmail.com> PCRE_CONF_OPTS is wrongly overridden in a conditional since commit 9b28d48012c33b37d33101991fa042f9fc9d76eb Signed-off-by: Fabrice Fontaine --- package/pcre/pcre.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pcre/pcre.mk b/package/pcre/pcre.mk index c85f6717db..59750c28e7 100644 --- a/package/pcre/pcre.mk +++ b/package/pcre/pcre.mk @@ -18,7 +18,7 @@ HOST_PCRE_CONF_OPTS = --enable-unicode-properties ifneq ($(BR2_INSTALL_LIBSTDCPP),y) # pcre will use the host g++ if a cross version isn't available -PCRE_CONF_OPTS = --disable-cpp +PCRE_CONF_OPTS += --disable-cpp endif PCRE_CONF_OPTS += --enable-pcre8 -- 2.34.1 From fontaine.fabrice at gmail.com Thu Feb 17 21:45:36 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 17 Feb 2022 22:45:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/arp-scan: don't override ARP_SCAN_CONF_OPTS Message-ID: <20220217214536.555637-1-fontaine.fabrice@gmail.com> ARP_SCAN_CONF_OPTS is wrongly overriden in a conditional since commit df578c86eddfb5d115195d3650d5ecba5431e8fc Signed-off-by: Fabrice Fontaine --- package/arp-scan/arp-scan.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/arp-scan/arp-scan.mk b/package/arp-scan/arp-scan.mk index cc1efe84a7..3fdbd463c2 100644 --- a/package/arp-scan/arp-scan.mk +++ b/package/arp-scan/arp-scan.mk @@ -12,7 +12,7 @@ ARP_SCAN_DEPENDENCIES = libpcap ARP_SCAN_AUTORECONF = YES ifeq ($(BR2_STATIC_LIBS),y) -ARP_SCAN_CONF_OPTS = LIBS="`$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs`" +ARP_SCAN_CONF_OPTS += LIBS="`$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs`" endif ARP_SCAN_CONF_ENV = pgac_cv_snprintf_long_long_int_format='%lld' -- 2.34.1 From fontaine.fabrice at gmail.com Thu Feb 17 21:46:12 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 17 Feb 2022 22:46:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/perl-netaddr-ip: don't override PERL_NETADDR_IP_CONF_OPTS Message-ID: <20220217214612.555680-1-fontaine.fabrice@gmail.com> PERL_NETADDR_IP_CONF_OPTS is wrongly overridden in a conditional since commit 86658b0b18719c93fca359be65904ff366be9985 Signed-off-by: Fabrice Fontaine --- package/perl-netaddr-ip/perl-netaddr-ip.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/perl-netaddr-ip/perl-netaddr-ip.mk b/package/perl-netaddr-ip/perl-netaddr-ip.mk index 4824b4e9ee..c4885715b4 100644 --- a/package/perl-netaddr-ip/perl-netaddr-ip.mk +++ b/package/perl-netaddr-ip/perl-netaddr-ip.mk @@ -12,7 +12,7 @@ PERL_NETADDR_IP_LICENSE_FILES = Artistic Copying PERL_NETADDR_IP_DISTNAME = NetAddr-IP ifeq ($(BR2_STATIC_LIBS),y) -PERL_NETADDR_IP_CONF_OPTS = -noxs +PERL_NETADDR_IP_CONF_OPTS += -noxs endif $(eval $(perl-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Thu Feb 17 21:46:45 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 17 Feb 2022 22:46:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/socketcand: don't override SOCKETCAND_CONF_OPTS Message-ID: <20220217214645.555727-1-fontaine.fabrice@gmail.com> SOCKETCAND_CONF_OPTS is wrongly overridden in a conditional since commit 53e498da2f2ebfc87c3de0fe18bc9132e94b4fcb Signed-off-by: Fabrice Fontaine --- package/socketcand/socketcand.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/socketcand/socketcand.mk b/package/socketcand/socketcand.mk index dbf859d3f9..1755d3ae56 100644 --- a/package/socketcand/socketcand.mk +++ b/package/socketcand/socketcand.mk @@ -13,7 +13,7 @@ SOCKETCAND_LICENSE_FILES = socketcand.c ifeq ($(BR2_PACKAGE_LIBCONFIG),y) SOCKETCAND_DEPENDENCIES += libconfig else -SOCKETCAND_CONF_OPTS = --without-config +SOCKETCAND_CONF_OPTS += --without-config endif $(eval $(autotools-package)) -- 2.34.1 From marcus.hoffmann at othermo.de Thu Feb 17 21:47:27 2022 From: marcus.hoffmann at othermo.de (Marcus Hoffmann) Date: Thu, 17 Feb 2022 22:47:27 +0100 Subject: [Buildroot] [PATCH v2 2/2] board/orangepi/orangepi-rk3399/genimage: fix partition types for gpt In-Reply-To: <20220217214443.GN522310@scaer> References: <20220217155549.1084829-1-marcus.hoffmann@othermo.de> <20220217155549.1084829-3-marcus.hoffmann@othermo.de> <20220217214443.GN522310@scaer> Message-ID: Hi Yann, On 17.02.22 22:44, Yann E. MORIN wrote: > Marcus, All, > > On 2022-02-17 16:55 +0100, Marcus Hoffmann spake thusly: >> Fixes the following error during image generation: >> ERROR: hdimage(sdcard.img): part boot: 'partition-type' is only valid >> for mbr and hybrid partition-table-type >> >> Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2103784375 >> >> Signed-off-by: Marcus Hoffmann >> --- >> board/orangepi/orangepi-rk3399/genimage.cfg | 3 +-- >> 1 file changed, 1 insertion(+), 2 deletions(-) >> >> diff --git a/board/orangepi/orangepi-rk3399/genimage.cfg b/board/orangepi/orangepi-rk3399/genimage.cfg >> index c94e0bc7cc..a02166172f 100644 >> --- a/board/orangepi/orangepi-rk3399/genimage.cfg >> +++ b/board/orangepi/orangepi-rk3399/genimage.cfg >> @@ -26,14 +26,13 @@ image sdcard.img { >> } >> >> partition boot { >> - partition-type = 0xC >> + partition-type-uuid = F >> bootable = "true" >> image = "boot.vfat" >> offset = 16M >> } >> >> partition rootfs { >> - partition-type = 0x83 > > Why don't you also switch this one to partition-type-uuid? The replacement for this would be "partition-type-uuid = L", which is the default. I believe I saw a patch recently that removed those default entries, which is why I didn't include it. Best, Marcus > > Regards, > Yann E. MORIN. > >> image = "rootfs.ext4" >> } >> } >> -- >> 2.25.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > From giulio.benetti at benettiengineering.com Thu Feb 17 21:50:32 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 17 Feb 2022 22:50:32 +0100 Subject: [Buildroot] [PATCH v2 2/2] board/orangepi/orangepi-rk3399/genimage: fix partition types for gpt In-Reply-To: <20220217214443.GN522310@scaer> References: <20220217155549.1084829-1-marcus.hoffmann@othermo.de> <20220217155549.1084829-3-marcus.hoffmann@othermo.de> <20220217214443.GN522310@scaer> Message-ID: Hi Yann, On 17/02/22 22:44, Yann E. MORIN wrote: > Marcus, All, > > On 2022-02-17 16:55 +0100, Marcus Hoffmann spake thusly: >> Fixes the following error during image generation: >> ERROR: hdimage(sdcard.img): part boot: 'partition-type' is only valid >> for mbr and hybrid partition-table-type >> >> Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2103784375 >> >> Signed-off-by: Marcus Hoffmann >> --- >> board/orangepi/orangepi-rk3399/genimage.cfg | 3 +-- >> 1 file changed, 1 insertion(+), 2 deletions(-) >> >> diff --git a/board/orangepi/orangepi-rk3399/genimage.cfg b/board/orangepi/orangepi-rk3399/genimage.cfg >> index c94e0bc7cc..a02166172f 100644 >> --- a/board/orangepi/orangepi-rk3399/genimage.cfg >> +++ b/board/orangepi/orangepi-rk3399/genimage.cfg >> @@ -26,14 +26,13 @@ image sdcard.img { >> } >> >> partition boot { >> - partition-type = 0xC >> + partition-type-uuid = F >> bootable = "true" >> image = "boot.vfat" >> offset = 16M >> } >> >> partition rootfs { >> - partition-type = 0x83 > > Why don't you also switch this one to partition-type-uuid? I've been asked by Arnout to drop L since it's the default: https://lists.buildroot.org/pipermail/buildroot/2022-February/636945.html I see both Thomas and Arnout seem to go for single letters intead of extended specific partition-type-uuid. That's why I didn't comment on this point that only removes partition-type. Best regards -- Giulio Benetti Benetti Engineering sas > > Regards, > Yann E. MORIN. > >> image = "rootfs.ext4" >> } >> } >> -- >> 2.25.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > From fontaine.fabrice at gmail.com Thu Feb 17 21:50:49 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 17 Feb 2022 22:50:49 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xdriver_xf86-video-mga: don't override XDRIVER_XF86_VIDEO_MGA_CONF_OPTS Message-ID: <20220217215049.556036-1-fontaine.fabrice@gmail.com> XDRIVER_XF86_VIDEO_MGA_CONF_OPTS is wrongly overridden in a conditional since commit 105c7c7573ee2c7771db49c3e0dc168bc0eee84b Signed-off-by: Fabrice Fontaine --- package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk index 2720848a17..3c668a5c98 100644 --- a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk +++ b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk @@ -13,7 +13,7 @@ XDRIVER_XF86_VIDEO_MGA_AUTORECONF = YES XDRIVER_XF86_VIDEO_MGA_DEPENDENCIES = xserver_xorg-server libdrm xorgproto ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) -XDRIVER_XF86_VIDEO_MGA_CONF_OPTS = --disable-dri +XDRIVER_XF86_VIDEO_MGA_CONF_OPTS += --disable-dri endif $(eval $(autotools-package)) -- 2.34.1 From yann.morin.1998 at free.fr Thu Feb 17 21:47:41 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 17 Feb 2022 22:47:41 +0100 Subject: [Buildroot] [git commit] package/pcre: don't override PCRE_CONF_OPTS Message-ID: <20220217214408.52D248379E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e3c1efd5d2e60435f4863b8c2b5a97dc21756810 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master PCRE_CONF_OPTS is wrongly overridden in a conditional since commit 9b28d48012c33b37d33101991fa042f9fc9d76eb Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/pcre/pcre.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pcre/pcre.mk b/package/pcre/pcre.mk index c85f6717db..59750c28e7 100644 --- a/package/pcre/pcre.mk +++ b/package/pcre/pcre.mk @@ -18,7 +18,7 @@ HOST_PCRE_CONF_OPTS = --enable-unicode-properties ifneq ($(BR2_INSTALL_LIBSTDCPP),y) # pcre will use the host g++ if a cross version isn't available -PCRE_CONF_OPTS = --disable-cpp +PCRE_CONF_OPTS += --disable-cpp endif PCRE_CONF_OPTS += --enable-pcre8 From yann.morin.1998 at free.fr Thu Feb 17 21:47:43 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 17 Feb 2022 22:47:43 +0100 Subject: [Buildroot] [git commit] package/arp-scan: don't override ARP_SCAN_CONF_OPTS Message-ID: <20220217214408.5D9497F8A8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=37ba37d516772ade08abf00badc5a6592222972c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master ARP_SCAN_CONF_OPTS is wrongly overriden in a conditional since commit df578c86eddfb5d115195d3650d5ecba5431e8fc Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/arp-scan/arp-scan.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/arp-scan/arp-scan.mk b/package/arp-scan/arp-scan.mk index cc1efe84a7..3fdbd463c2 100644 --- a/package/arp-scan/arp-scan.mk +++ b/package/arp-scan/arp-scan.mk @@ -12,7 +12,7 @@ ARP_SCAN_DEPENDENCIES = libpcap ARP_SCAN_AUTORECONF = YES ifeq ($(BR2_STATIC_LIBS),y) -ARP_SCAN_CONF_OPTS = LIBS="`$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs`" +ARP_SCAN_CONF_OPTS += LIBS="`$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs`" endif ARP_SCAN_CONF_ENV = pgac_cv_snprintf_long_long_int_format='%lld' From yann.morin.1998 at free.fr Thu Feb 17 21:47:45 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 17 Feb 2022 22:47:45 +0100 Subject: [Buildroot] [git commit] package/perl-netaddr-ip: don't override PERL_NETADDR_IP_CONF_OPTS Message-ID: <20220217214408.671BD837BA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9f96c4be57d1edb2c89d542e9d1d894c5a20b7c2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master PERL_NETADDR_IP_CONF_OPTS is wrongly overridden in a conditional since commit 86658b0b18719c93fca359be65904ff366be9985 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/perl-netaddr-ip/perl-netaddr-ip.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/perl-netaddr-ip/perl-netaddr-ip.mk b/package/perl-netaddr-ip/perl-netaddr-ip.mk index 4824b4e9ee..c4885715b4 100644 --- a/package/perl-netaddr-ip/perl-netaddr-ip.mk +++ b/package/perl-netaddr-ip/perl-netaddr-ip.mk @@ -12,7 +12,7 @@ PERL_NETADDR_IP_LICENSE_FILES = Artistic Copying PERL_NETADDR_IP_DISTNAME = NetAddr-IP ifeq ($(BR2_STATIC_LIBS),y) -PERL_NETADDR_IP_CONF_OPTS = -noxs +PERL_NETADDR_IP_CONF_OPTS += -noxs endif $(eval $(perl-package)) From yann.morin.1998 at free.fr Thu Feb 17 21:47:47 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 17 Feb 2022 22:47:47 +0100 Subject: [Buildroot] [git commit] package/socketcand: don't override SOCKETCAND_CONF_OPTS Message-ID: <20220217214408.709A3837B9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=becc4814601336f1df72e0e0306b11529bb91246 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master SOCKETCAND_CONF_OPTS is wrongly overridden in a conditional since commit 53e498da2f2ebfc87c3de0fe18bc9132e94b4fcb Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/socketcand/socketcand.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/socketcand/socketcand.mk b/package/socketcand/socketcand.mk index dbf859d3f9..1755d3ae56 100644 --- a/package/socketcand/socketcand.mk +++ b/package/socketcand/socketcand.mk @@ -13,7 +13,7 @@ SOCKETCAND_LICENSE_FILES = socketcand.c ifeq ($(BR2_PACKAGE_LIBCONFIG),y) SOCKETCAND_DEPENDENCIES += libconfig else -SOCKETCAND_CONF_OPTS = --without-config +SOCKETCAND_CONF_OPTS += --without-config endif $(eval $(autotools-package)) From yann.morin.1998 at free.fr Thu Feb 17 21:53:11 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 17 Feb 2022 22:53:11 +0100 Subject: [Buildroot] [git commit] package/x11r7/xdriver_xf86-video-mga: don't override XDRIVER_XF86_VIDEO_MGA_CONF_OPTS Message-ID: <20220217214544.8F57482578@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=43e2a5e11f07d6fabd15f530ba98f7bbee73dac2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master XDRIVER_XF86_VIDEO_MGA_CONF_OPTS is wrongly overridden in a conditional since commit 105c7c7573ee2c7771db49c3e0dc168bc0eee84b Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk index 2720848a17..3c668a5c98 100644 --- a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk +++ b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk @@ -13,7 +13,7 @@ XDRIVER_XF86_VIDEO_MGA_AUTORECONF = YES XDRIVER_XF86_VIDEO_MGA_DEPENDENCIES = xserver_xorg-server libdrm xorgproto ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) -XDRIVER_XF86_VIDEO_MGA_CONF_OPTS = --disable-dri +XDRIVER_XF86_VIDEO_MGA_CONF_OPTS += --disable-dri endif $(eval $(autotools-package)) From fontaine.fabrice at gmail.com Thu Feb 17 21:54:13 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 17 Feb 2022 22:54:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xdriver_xf86-video-ati: don't override XDRIVER_XF86_VIDEO_ATI_CONF_OPTS Message-ID: <20220217215413.556297-1-fontaine.fabrice@gmail.com> XDRIVER_XF86_VIDEO_ATI_CONF_OPTS is wrongly overridden in a conditional since commit daa433bff6d2d9934705feacd3619a7618d13ae5 Signed-off-by: Fabrice Fontaine --- .../x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk index f7aeba8ba6..edb8b11add 100644 --- a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk +++ b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk @@ -16,9 +16,9 @@ XDRIVER_XF86_VIDEO_ATI_DEPENDENCIES = \ xserver_xorg-server ifeq ($(BR2_PACKAGE_HAS_LIBEGL)$(BR2_PACKAGE_HAS_LIBGL)$(BR2_PACKAGE_LIBEPOXY),yyy) -XDRIVER_XF86_VIDEO_ATI_CONF_OPTS = --enable-glamor +XDRIVER_XF86_VIDEO_ATI_CONF_OPTS += --enable-glamor else -XDRIVER_XF86_VIDEO_ATI_CONF_OPTS = --disable-glamor +XDRIVER_XF86_VIDEO_ATI_CONF_OPTS += --disable-glamor endif # xdriver_xf86-video-ati requires O_CLOEXEC -- 2.34.1 From yann.morin.1998 at free.fr Thu Feb 17 22:07:14 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 17 Feb 2022 23:07:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/pcre: don't override PCRE_CONF_OPTS In-Reply-To: <20220217214459.555586-1-fontaine.fabrice@gmail.com> References: <20220217214459.555586-1-fontaine.fabrice@gmail.com> Message-ID: <20220217220714.GO522310@scaer> Fabrice, All, On 2022-02-17 22:44 +0100, Fabrice Fontaine spake thusly: > PCRE_CONF_OPTS is wrongly overridden in a conditional since commit > 9b28d48012c33b37d33101991fa042f9fc9d76eb > > Signed-off-by: Fabrice Fontaine Applied to master, alogn with your four following similar changes, thanks. Note that some of them are not really overrides, as the variables are not previously set, but for consistency sake, and for robustness agaisnt future evolutions in those files, this is still better (and correct!) to use the append assignment in conditional blocks. Thanks! Regards, Yann E. MORIN. > --- > package/pcre/pcre.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/pcre/pcre.mk b/package/pcre/pcre.mk > index c85f6717db..59750c28e7 100644 > --- a/package/pcre/pcre.mk > +++ b/package/pcre/pcre.mk > @@ -18,7 +18,7 @@ HOST_PCRE_CONF_OPTS = --enable-unicode-properties > > ifneq ($(BR2_INSTALL_LIBSTDCPP),y) > # pcre will use the host g++ if a cross version isn't available > -PCRE_CONF_OPTS = --disable-cpp > +PCRE_CONF_OPTS += --disable-cpp > endif > > PCRE_CONF_OPTS += --enable-pcre8 > -- > 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 moritz at h6t.eu Thu Feb 17 23:06:38 2022 From: moritz at h6t.eu (moritz at h6t.eu) Date: Fri, 18 Feb 2022 00:06:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/pkg-cargo.mk: fix building cargo packages on 32bit arm Message-ID: <20220217230638.98748-1-moritz@h6t.eu> From: Moritz Bitsch there are duplicated symbols between rustc and gcc. Specifying --allow-multiple-definition to the linker as workaround until rustc is fixed. rust-lang issue: https://github.com/rust-lang/compiler-builtins/issues/420 Fixes: http://autobuild.buildroot.net/results/53f/53f5598b8e520caaa135fb4923c09da382dab329 Signed-off-by: Moritz Bitsch --- package/pkg-cargo.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index e74a8358bc..71d695d926 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -46,6 +46,14 @@ PKG_CARGO_ENV = \ CARGO_BUILD_TARGET="$(RUSTC_TARGET_NAME)" \ CARGO_TARGET_$(call UPPERCASE,$(RUSTC_TARGET_NAME))_LINKER=$(notdir $(TARGET_CROSS))gcc +# +# This is a workaround for https://github.com/rust-lang/compiler-builtins/issues/420 +# and should be removed when fixed upstream +# +ifeq ($(NORMALIZED_ARCH),arm) + PKG_CARGO_ENV += RUSTFLAGS="-Clink-arg=-Wl,--allow-multiple-definition" +endif + HOST_PKG_CARGO_ENV = \ $(PKG_COMMON_CARGO_ENV) -- 2.35.1 From aperez at igalia.com Thu Feb 17 23:09:07 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Fri, 18 Feb 2022 01:09:07 +0200 Subject: [Buildroot] [PATCH 1/2] package/webkitgtk: security bump to 2.34.6 Message-ID: <20220217230908.1532564-1-aperez@igalia.com> Update to a new major release which brings in improvements, a number of new features, and security fixes. Release notes: https://webkitgtk.org/2021/09/22/webkitgtk2.34.0-released.html https://webkitgtk.org/2021/10/21/webkitgtk2.34.1-released.html https://webkitgtk.org/2021/11/24/webkitgtk2.34.2-released.html https://webkitgtk.org/2021/12/20/webkitgtk2.34.3-released.html https://webkitgtk.org/2022/01/21/webkitgtk2.34.4-released.html https://webkitgtk.org/2022/02/09/webkitgtk2.34.5-released.html https://webkitgtk.org/2022/02/17/webkitgtk2.34.6-released.html Security advisories: https://webkitgtk.org/security/WSA-2021-0007.html https://webkitgtk.org/security/WSA-2022-0001.html https://webkitgtk.org/security/WSA-2022-0002.html https://webkitgtk.org/security/WSA-2022-0003.html Some of the new features require additional dependencies: HTTP/2 requires libsoup3, which is not yet packaged in Buildroot, and disabled at the moment (with -DUSE_SOUP2=ON, to keep using libsoup2); and the color management support needs LCMS2 (which will be enabled in a follow-up patch.) Options SILENCE_CROSS_COMPILATION_NOTICES and ENABLE_GRAPHICS_CONTEXT_GL do not exist anymore, and their usage is dropped. Signed-off-by: Adrian Perez de Castro --- package/webkitgtk/webkitgtk.hash | 8 ++++---- package/webkitgtk/webkitgtk.mk | 14 +++++--------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index 7cb6c90b21..82c210c8f9 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,7 +1,7 @@ -# From https://webkitgtk.org/releases/webkitgtk-2.32.4.tar.xz.sums -md5 51a167e5d03bacf30c5c588e6aa23143 webkitgtk-2.32.4.tar.xz -sha1 f7255ffb488e727e9e250e0dae9f192266f50f01 webkitgtk-2.32.4.tar.xz -sha256 00ce2d3f798d7bc5e9039d9059f0c3c974d51de38c8b716f00e94452a177d3fd webkitgtk-2.32.4.tar.xz +# From https://webkitgtk.org/releases/webkitgtk-2.34.6.tar.xz.sums +md5 a5eeedd02f5b4bba8bd891b92dc743d4 webkitgtk-2.34.6.tar.xz +sha1 bb82517289baf9c858fa406d1d845274f81e25cb webkitgtk-2.34.6.tar.xz +sha256 6bc8fd034aad0432a2459ce4fc7ee25ad65a4924c618bf8d93b52b0c1a84c1f6 webkitgtk-2.34.6.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index 16b925fe71..f4fc1e7838 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.32.4 +WEBKITGTK_VERSION = 2.34.6 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES @@ -24,10 +24,11 @@ WEBKITGTK_CONF_OPTS = \ -DENABLE_MINIBROWSER=ON \ -DENABLE_SPELLCHECK=ON \ -DPORT=GTK \ - -DSILENCE_CROSS_COMPILATION_NOTICES=ON \ + -DUSE_LCMS=OFF \ -DUSE_LIBNOTIFY=OFF \ -DUSE_LIBHYPHEN=OFF \ -DUSE_OPENJPEG=ON \ + -DUSE_SOUP2=ON \ -DUSE_WOFF2=ON ifeq ($(BR2_PACKAGE_WEBKITGTK_SANDBOX),y) @@ -73,7 +74,6 @@ ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) WEBKITGTK_CONF_OPTS += \ -DENABLE_ACCELERATED_2D_CANVAS=ON \ -DENABLE_GLES2=OFF \ - -DENABLE_GRAPHICS_CONTEXT_GL=ON \ -DENABLE_X11_TARGET=ON WEBKITGTK_DEPENDENCIES += libgl \ xlib_libXcomposite xlib_libXdamage xlib_libXrender xlib_libXt @@ -89,15 +89,11 @@ else # !X11 WEBKITGTK_DEPENDENCIES += libegl # GLESv2 support is optional though ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) -WEBKITGTK_CONF_OPTS += \ - -DENABLE_GLES2=ON \ - -DENABLE_GRAPHICS_CONTEXT_GL=ON +WEBKITGTK_CONF_OPTS += -DENABLE_GLES2=ON WEBKITGTK_DEPENDENCIES += libgles else # Disable general OpenGL (shading) if there's no GLESv2 -WEBKITGTK_CONF_OPTS += \ - -DENABLE_GLES2=OFF \ - -DENABLE_GRAPHICS_CONTEXT_GL=OFF +WEBKITGTK_CONF_OPTS += -DENABLE_GLES2=OFF endif # We must explicitly state the wayland target ifeq ($(BR2_PACKAGE_LIBGTK3_WAYLAND),y) -- 2.35.1 From aperez at igalia.com Thu Feb 17 23:09:08 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Fri, 18 Feb 2022 01:09:08 +0200 Subject: [Buildroot] [PATCH 2/2] package/webkitgtk: use lcms2 if available In-Reply-To: <20220217230908.1532564-1-aperez@igalia.com> References: <20220217230908.1532564-1-aperez@igalia.com> Message-ID: <20220217230908.1532564-2-aperez@igalia.com> Make webkitgtk enable color management support if the lcms2 package has been selected. Signed-off-by: Adrian Perez de Castro --- package/webkitgtk/webkitgtk.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index f4fc1e7838..b3dc2b2fa5 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -24,7 +24,6 @@ WEBKITGTK_CONF_OPTS = \ -DENABLE_MINIBROWSER=ON \ -DENABLE_SPELLCHECK=ON \ -DPORT=GTK \ - -DUSE_LCMS=OFF \ -DUSE_LIBNOTIFY=OFF \ -DUSE_LIBHYPHEN=OFF \ -DUSE_OPENJPEG=ON \ @@ -58,6 +57,13 @@ else WEBKITGTK_CONF_OPTS += -DENABLE_WEBDRIVER=OFF endif +ifeq ($(BR2_PACKAGE_LCMS2),y) +WEBKITGTK_CONF_OPTS += -DUSE_LCMS=ON +WEBKITGTK_DEPENDENCIES += lcms2 +else +WEBKITGTK_CONF_OPTS += -DUSE_LCMS=OFF +endif + ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) WEBKITGTK_CONF_OPTS += -DENABLE_INTROSPECTION=ON WEBKITGTK_DEPENDENCIES += gobject-introspection -- 2.35.1 From aperez at igalia.com Thu Feb 17 23:21:13 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Fri, 18 Feb 2022 01:21:13 +0200 Subject: [Buildroot] [PATCH 1/1] package/wpewebkit: security bump to version 2.34.6 Message-ID: <20220217232113.1598433-1-aperez@igalia.com> This brings the package two minor releases forward, which provides fixes for CVE-2022-22589, CVE-2022-22590, CVE-2022-22592, and CVE-2022-22620. Release notes can be found at: https://wpewebkit.org/release/wpewebkit-2.34.5.html https://wpewebkit.org/release/wpewebkit-2.34.6.html The security advisories covering this update are available at: https://wpewebkit.org/security/WSA-2022-0002.html https://wpewebkit.org/security/WSA-2022-0003.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 b863a0d705..231bbc447d 100644 --- a/package/wpewebkit/wpewebkit.hash +++ b/package/wpewebkit/wpewebkit.hash @@ -1,7 +1,7 @@ -# 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 +# From https://wpewebkit.org/releases/wpewebkit-2.34.6.tar.xz.sums +md5 c9705270b342474cca28cf51632ccbbe wpewebkit-2.34.6.tar.xz +sha1 44ae95de1b5ebf0a2b0ea3630b3677153c597402 wpewebkit-2.34.6.tar.xz +sha256 301e895c8ed08ce7dccef3192b972f2ccfc2020463244c64069a636f2b05265f wpewebkit-2.34.6.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 8d564d8223..aa04e78623 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.34.4 +WPEWEBKIT_VERSION = 2.34.6 WPEWEBKIT_SITE = http://www.wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES -- 2.35.1 From kuzminov.sergey81 at gmail.com Fri Feb 18 03:51:41 2022 From: kuzminov.sergey81 at gmail.com (Sergey Kuzminov) Date: Fri, 18 Feb 2022 06:51:41 +0300 Subject: [Buildroot] [PATCH v2] configs/orangepi_pc_defconfig: switch to extlinux Message-ID: <20220218035141.6914-1-kuzminov.sergey81@gmail.com> Changes: * Switch to common orangepi scenario for multiple boards (board/orangepi/common) to create an SD image. * Exclude FAT partition, it is no longer needed for U-Boot. * Switch SD image from MBR to GPT for partition-uuid to work. * Switch to extlinux, this is convenient for debugging. Signed-off-by: Sergey Kuzminov --- V1->V2: * improved commit log --- board/orangepi/orangepi-pc/boot.cmd | 8 ------ board/orangepi/orangepi-pc/genimage.cfg | 37 ------------------------- configs/orangepi_pc_defconfig | 9 ++---- 3 files changed, 3 insertions(+), 51 deletions(-) delete mode 100644 board/orangepi/orangepi-pc/boot.cmd delete mode 100644 board/orangepi/orangepi-pc/genimage.cfg diff --git a/board/orangepi/orangepi-pc/boot.cmd b/board/orangepi/orangepi-pc/boot.cmd deleted file mode 100644 index 9da625c803..0000000000 --- a/board/orangepi/orangepi-pc/boot.cmd +++ /dev/null @@ -1,8 +0,0 @@ -setenv fdt_high ffffffff - -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun8i-h3-orangepi-pc.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/orangepi/orangepi-pc/genimage.cfg b/board/orangepi/orangepi-pc/genimage.cfg deleted file mode 100644 index 14e326cc56..0000000000 --- a/board/orangepi/orangepi-pc/genimage.cfg +++ /dev/null @@ -1,37 +0,0 @@ -# Minimal SD card image for the OrangePi PC -# -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h3-orangepi-pc.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_pc_defconfig b/configs/orangepi_pc_defconfig index 44ea9b95c4..fd0f64e0e6 100644 --- a/configs/orangepi_pc_defconfig +++ b/configs/orangepi_pc_defconfig @@ -5,8 +5,9 @@ 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" BR2_SYSTEM_DHCP="eth0" +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-pc/genimage.cfg" +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.10.9" @@ -14,6 +15,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-pc/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-pc" +BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set @@ -27,9 +29,4 @@ BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-pc/boot.cmd" -BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -- 2.34.1 From giulio.benetti at benettiengineering.com Fri Feb 18 06:55:50 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 18 Feb 2022 07:55:50 +0100 Subject: [Buildroot] [PATCH v2] configs/orangepi_pc_defconfig: switch to extlinux In-Reply-To: <20220218035141.6914-1-kuzminov.sergey81@gmail.com> References: <20220218035141.6914-1-kuzminov.sergey81@gmail.com> Message-ID: <0A7D37AA-66D8-4772-A9F7-3CF9CED514F3@benettiengineering.com> Hi Sergey, > Il giorno 18 feb 2022, alle ore 04:59, Sergey Kuzminov ha scritto: > > ?Changes: > * Switch to common orangepi scenario for multiple boards (board/orangepi/common) to create an SD image. > * Exclude FAT partition, it is no longer needed for U-Boot. > * Switch SD image from MBR to GPT for partition-uuid to work. > * Switch to extlinux, this is convenient for debugging. > > Signed-off-by: Sergey Kuzminov Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti [Giulio: built only] Best regards Giulio > --- > V1->V2: > * improved commit log > --- > board/orangepi/orangepi-pc/boot.cmd | 8 ------ > board/orangepi/orangepi-pc/genimage.cfg | 37 ------------------------- > configs/orangepi_pc_defconfig | 9 ++---- > 3 files changed, 3 insertions(+), 51 deletions(-) > delete mode 100644 board/orangepi/orangepi-pc/boot.cmd > delete mode 100644 board/orangepi/orangepi-pc/genimage.cfg > > diff --git a/board/orangepi/orangepi-pc/boot.cmd b/board/orangepi/orangepi-pc/boot.cmd > deleted file mode 100644 > index 9da625c803..0000000000 > --- a/board/orangepi/orangepi-pc/boot.cmd > +++ /dev/null > @@ -1,8 +0,0 @@ > -setenv fdt_high ffffffff > - > -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait > - > -fatload mmc 0 $kernel_addr_r zImage > -fatload mmc 0 $fdt_addr_r sun8i-h3-orangepi-pc.dtb > - > -bootz $kernel_addr_r - $fdt_addr_r > diff --git a/board/orangepi/orangepi-pc/genimage.cfg b/board/orangepi/orangepi-pc/genimage.cfg > deleted file mode 100644 > index 14e326cc56..0000000000 > --- a/board/orangepi/orangepi-pc/genimage.cfg > +++ /dev/null > @@ -1,37 +0,0 @@ > -# Minimal SD card image for the OrangePi PC > -# > -image boot.vfat { > - vfat { > - files = { > - "zImage", > - "sun8i-h3-orangepi-pc.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_pc_defconfig b/configs/orangepi_pc_defconfig > index 44ea9b95c4..fd0f64e0e6 100644 > --- a/configs/orangepi_pc_defconfig > +++ b/configs/orangepi_pc_defconfig > @@ -5,8 +5,9 @@ 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" > BR2_SYSTEM_DHCP="eth0" > +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-pc/genimage.cfg" > +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.10.9" > @@ -14,6 +15,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="sunxi" > BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-pc/linux.fragment" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-pc" > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > # BR2_TARGET_ROOTFS_TAR is not set > @@ -27,9 +29,4 @@ BR2_TARGET_UBOOT_NEEDS_PYTHON3=y > BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" > -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-pc/boot.cmd" > -BR2_PACKAGE_HOST_DOSFSTOOLS=y > BR2_PACKAGE_HOST_GENIMAGE=y > -BR2_PACKAGE_HOST_MTOOLS=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS=y > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From fontaine.fabrice at gmail.com Fri Feb 18 09:05:33 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 18 Feb 2022 10:05:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/pulseview: fix build with glibmm 2.68 Message-ID: <20220218090533.645612-1-fontaine.fabrice@gmail.com> Fixes: - http://autobuild.buildroot.org/results/ebb73892fd7471de4f0c109554dfdc65b93d3dcf Signed-off-by: Fabrice Fontaine --- .../pulseview/0003-Support-glibmm-2.68.patch | 89 +++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100644 package/pulseview/0003-Support-glibmm-2.68.patch diff --git a/package/pulseview/0003-Support-glibmm-2.68.patch b/package/pulseview/0003-Support-glibmm-2.68.patch new file mode 100644 index 0000000000..00e4e696d9 --- /dev/null +++ b/package/pulseview/0003-Support-glibmm-2.68.patch @@ -0,0 +1,89 @@ +From a97d5a060a534a3c658578e7f14ab43556db93ca Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 30 Dec 2021 16:19:46 +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 + +C++17 support is mandatory with glibmm 2.68 + +Signed-off-by: Fabrice Fontaine +[Upstream status: not sent yet] +--- + CMakeLists.txt | 23 +++++++++++++++++++---- + INSTALL | 2 +- + 2 files changed, 20 insertions(+), 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7791b1b1..58a9cf92 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -75,7 +75,14 @@ add_subdirectory(manual) + #------------------------------------------------------------------------------- + + list(APPEND PKGDEPS glib-2.0>=2.28.0) +-list(APPEND PKGDEPS glibmm-2.4>=2.28.0) ++ ++set(LIBSR_GLIBMM "glibmm-2.4>=2.28.0") ++find_package(PkgConfig) ++pkg_check_modules(LIBSRGLIBMM24 ${LIBSR_GLIBMM}) ++if(NOT LIBSRGLIBMM24_FOUND) ++ set(LIBSR_GLIBMM "glibmm-2.68>=2.68.0") ++endif() ++list(APPEND PKGDEPS ${LIBSR_GLIBMM}) + + if(ENABLE_FLOW) + list(APPEND PKGDEPS gstreamermm-1.0>=1.8.0) +@@ -93,7 +100,6 @@ if(ANDROID) + list(APPEND PKGDEPS libsigrokandroidutils>=0.1.0) + endif() + +-find_package(PkgConfig) + pkg_check_modules(LIBSRCXX ${LIBSR_CXX_BINDING}) + if(NOT LIBSRCXX_FOUND OR NOT LIBSRCXX_VERSION) + message(FATAL_ERROR "libsigrok C++ bindings missing, check libsigrok's 'configure' output (missing dependencies?)") +@@ -225,7 +231,11 @@ memaccess_check_unaligned_le(HAVE_UNALIGNED_LITTLE_ENDIAN_ACCESS) + set(PV_TITLE PulseView) + set(PV_VERSION_STRING "0.5.0") + +-set(PV_GLIBMM_VERSION ${PKGDEPS_glibmm-2.4_VERSION}) ++if(LIBSRGLIBMM24_FOUND) ++ set(PV_GLIBMM_VERSION ${PKGDEPS_glibmm-2.4_VERSION}) ++else() ++ set(PV_GLIBMM_VERSION ${PKGDEPS_glibmm-2.68_VERSION}) ++endif() + + include(GetGitRevisionDescription) + +@@ -486,7 +496,12 @@ qt5_add_resources(pulseview_RESOURCES_RCC ${CMAKE_BINARY_DIR}/translations.qrc) + add_definitions(-DQT_NO_KEYWORDS) + add_definitions(-D__STDC_LIMIT_MACROS) + add_definitions(-Wall -Wextra) +-add_definitions(-std=c++11) ++if(LIBSRGLIBMM24_FOUND) ++ add_definitions(-std=c++11) ++else() ++ # glibmm-2.68 reuires c++17 ++ add_definitions(-std=c++17) ++endif() + add_definitions(-DBOOST_MATH_DISABLE_FLOAT128=1) + if(WIN32) + add_definitions(-Wa,-mbig-obj -O3) +diff --git a/INSTALL b/INSTALL +index da89be8d..8003fcfb 100644 +--- a/INSTALL ++++ b/INSTALL +@@ -14,7 +14,7 @@ Requirements + - pkg-config >= 0.22 + - cmake >= 2.8.12 + - libglib >= 2.28.0 +- - glibmm-2.4 (>= 2.28.0) ++ - glibmm-2.4 (>= 2.28.0) or glibmm-2.68 (>= 2.68.0) + - Qt5 (>= 5.3), including the following components: + - Qt5Core, Qt5Gui, Qt5Widgets, Qt5Svg, Qt5LinguistTools + - Qt translation package (optional; needed at runtime, not build time) +-- +2.34.1 + -- 2.34.1 From fontaine.fabrice at gmail.com Fri Feb 18 10:07:09 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 18 Feb 2022 11:07:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/zfs: replace PYTHON_VERSION_MAJOR Message-ID: <20220218100709.677205-1-fontaine.fabrice@gmail.com> Replace PYTHON_VERSION_MAJOR by PYTHON3_VERSION_MAJOR now that python2 has been dropped. It should be noted that PYTHON_SITE_PKG was wrongly set since the addition of the package in commit 4470bc9914d730383db86f58bc86fb09739622dc Signed-off-by: Fabrice Fontaine --- package/zfs/zfs.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zfs/zfs.mk b/package/zfs/zfs.mk index 6b542f5c05..dbda8aceb4 100644 --- a/package/zfs/zfs.mk +++ b/package/zfs/zfs.mk @@ -44,7 +44,7 @@ ZFS_CONF_ENV += \ PYTHON_CPPFLAGS="`$(STAGING_DIR)/usr/bin/python3-config --includes`" \ PYTHON_LIBS="`$(STAGING_DIR)/usr/bin/python3-config --ldflags`" \ PYTHON_EXTRA_LIBS="`$(STAGING_DIR)/usr/bin/python3-config --libs --embed`" \ - PYTHON_SITE_PKG="/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages" + PYTHON_SITE_PKG="/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages" ZFS_CONF_OPTS += --enable-pyzfs else ZFS_CONF_OPTS += --disable-pyzfs --without-python -- 2.34.1 From fontaine.fabrice at gmail.com Fri Feb 18 10:08:53 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 18 Feb 2022 11:08:53 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pygame: replace PYTHON_VERSION_MAJOR Message-ID: <20220218100853.677373-1-fontaine.fabrice@gmail.com> Replace PYTHON_VERSION_MAJOR by PYTHON3_VERSION_MAJOR now that python2 has been dropped Signed-off-by: Fabrice Fontaine --- package/python-pygame/python-pygame.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-pygame/python-pygame.mk b/package/python-pygame/python-pygame.mk index 8deb42a90c..600dd9e743 100644 --- a/package/python-pygame/python-pygame.mk +++ b/package/python-pygame/python-pygame.mk @@ -103,7 +103,7 @@ PYTHON_PYGAME_POST_INSTALL_TARGET_HOOKS += PYTHON_PYGAME_REMOVE_TESTS ifneq ($(BR2_PACKAGE_PYTHON_PYGAME_EXAMPLES),y) define PYTHON_PYGAME_REMOVE_EXAMPLES - rm -rf $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages/pygame/examples + rm -rf $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/pygame/examples endef PYTHON_PYGAME_POST_INSTALL_TARGET_HOOKS += PYTHON_PYGAME_REMOVE_EXAMPLES endif -- 2.34.1 From fontaine.fabrice at gmail.com Fri Feb 18 10:27:19 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 18 Feb 2022 11:27:19 +0100 Subject: [Buildroot] [PATCH 1/1] package/pkg-python: fix headers install Message-ID: <20220218102719.693274-1-fontaine.fabrice@gmail.com> For an unknown reason, installation of headers is broken since commit 7c1bb5c2bfdc9d726c41a66b30b7aa8e759c6596 which sets _PYTHON_PROJECT_BASE As _PYTHON_PROJECT_BASE value seems correct and fix its own build failures, use --install-headers to set install path for headers and avoid the following build failure with python-greenlet or python-pygame: python-greenlet: installs files in /home/peko/autobuild/instance-0/output-1/target//home/peko/autobuild/instance-0/output-1 python-pygame: installs files in /home/peko/autobuild/instance-1/output-1/target//home/peko/autobuild/instance-1/output-1 Fixes: - http://autobuild.buildroot.org/results/f5b52dee7e72f0a1f72b9f87723bc585743c7b31 - http://autobuild.buildroot.org/results/9eb2685d32756864000e1b38f8a183b57f6ea528 Signed-off-by: Fabrice Fontaine --- package/pkg-python.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index b8dc9cd9e5..c4e590bd70 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -51,10 +51,12 @@ PKG_PYTHON_DISTUTILS_BUILD_OPTS = \ --executable=/usr/bin/python PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS = \ + --install-headers=/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --prefix=/usr \ --root=$(TARGET_DIR) PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS = \ + --install-headers=/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --prefix=/usr \ --root=$(STAGING_DIR) @@ -81,12 +83,14 @@ PKG_PYTHON_SETUPTOOLS_ENV = \ _python_exec_prefix=/usr PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS = \ + --install-headers=/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --prefix=/usr \ --executable=/usr/bin/python \ --single-version-externally-managed \ --root=$(TARGET_DIR) PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS = \ + --install-headers=/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --prefix=/usr \ --executable=/usr/bin/python \ --single-version-externally-managed \ -- 2.34.1 From fontaine.fabrice at gmail.com Fri Feb 18 10:55:57 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 18 Feb 2022 11:55:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-twisted: security bump to version 22.1.0 Message-ID: <20220218105557.705926-1-fontaine.fabrice@gmail.com> Fix CVE-2022-21712: twisted is an event-driven networking engine written in Python. In affected versions twisted exposes cookies and authorization headers when following cross-origin redirects. This issue is present in the `twited.web.RedirectAgent` and `twisted.web. BrowserLikeRedirectAgent` functions. Users are advised to upgrade. There are no known workarounds. Update hash of license file (author added and update in year: https://github.com/twisted/twisted/commit/13aa59746a73769b05a51c2198b28f5602dd382f https://github.com/twisted/twisted/commit/adfdf23477abfcd09a867347993fc1d207cfb4dd https://github.com/twisted/twisted/commit/7e65fbeed3d74a4eb1c40d7a6df5651782becbc8) https://github.com/twisted/twisted/security/advisories/GHSA-92x2-jw7w-xvvx https://github.com/twisted/twisted/releases/tag/twisted-22.1.0 Signed-off-by: Fabrice Fontaine --- package/python-twisted/python-twisted.hash | 6 +++--- package/python-twisted/python-twisted.mk | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-twisted/python-twisted.hash b/package/python-twisted/python-twisted.hash index c633112e9d..8f0935e4f0 100644 --- a/package/python-twisted/python-twisted.hash +++ b/package/python-twisted/python-twisted.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/twisted/json -md5 fc16d575730db7d0cddd09fc35af3eea Twisted-20.3.0.tar.bz2 -sha256 d72c55b5d56e176563b91d11952d13b01af8725c623e498db5507b6614fc1e10 Twisted-20.3.0.tar.bz2 +md5 c818cb1ab241dc249517442e5a0e0412 Twisted-22.1.0.tar.gz +sha256 b7971ec9805b0f80e1dcb1a3721d7bfad636d5f909de687430ce373979d67b61 Twisted-22.1.0.tar.gz # Locally computed sha256 -sha256 98426fd47315df70098e0d85efbb5d7dd8001c9c536386937354640d6d8d75b9 LICENSE +sha256 686f6426a775450eb3afd00bc3a5c2621f305ddb9c8478ee9bf28a368ef2dece LICENSE diff --git a/package/python-twisted/python-twisted.mk b/package/python-twisted/python-twisted.mk index 49d97af097..8e867cfb58 100644 --- a/package/python-twisted/python-twisted.mk +++ b/package/python-twisted/python-twisted.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TWISTED_VERSION = 20.3.0 -PYTHON_TWISTED_SOURCE = Twisted-$(PYTHON_TWISTED_VERSION).tar.bz2 -PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/4a/b4/4973c7ccb5be2ec0abc779b7d5f9d5f24b17b0349e23240cfc9dc3bd83cc +PYTHON_TWISTED_VERSION = 22.1.0 +PYTHON_TWISTED_SOURCE = Twisted-$(PYTHON_TWISTED_VERSION).tar.gz +PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/77/b8/8108806ebf2b33654989fd1511281dc94a49fa7e03326d84fe5498ecfae4 PYTHON_TWISTED_SETUP_TYPE = setuptools PYTHON_TWISTED_LICENSE = MIT PYTHON_TWISTED_LICENSE_FILES = LICENSE -- 2.34.1 From fontaine.fabrice at gmail.com Fri Feb 18 10:59:24 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 18 Feb 2022 11:59:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/lxc: bump to version 4.0.12 Message-ID: <20220218105924.738666-1-fontaine.fabrice@gmail.com> https://discuss.linuxcontainers.org/t/lxc-4-0-12-has-been-released 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 2b58df2f1d..d460bc6a01 100644 --- a/package/lxc/lxc.hash +++ b/package/lxc/lxc.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 afa481e17ca9a9cf9fd3d2d7a04e42a8f6bfe60b323909326c968e852cd9f02c lxc-4.0.11.tar.gz +sha256 db242f8366fc63e8c7588bb2017b354173cf3c4b20abc18780debdc48b14d3ef lxc-4.0.12.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk index 08f64bcec7..9311dc8775 100644 --- a/package/lxc/lxc.mk +++ b/package/lxc/lxc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LXC_VERSION = 4.0.11 +LXC_VERSION = 4.0.12 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.34.1 From giulio.benetti at benettiengineering.com Fri Feb 18 11:09:14 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 18 Feb 2022 12:09:14 +0100 Subject: [Buildroot] [PATCH] configs/microchip_sam9x60ek_mmc_dev_defconfig: fix build failure due to previous wrong commit Message-ID: <20220218110914.3098061-1-giulio.benetti@benettiengineering.com> Commit 616ba9c90b014637dc9925fa442a0af4a11f04b8 extended rootfs size, but the option was listed in the wrong place. Options must be set in the order they are specified by Config.in files. So let's move BR2_TARGET_ROOTFS_EXT2_SIZE="120M" right after BR2_TARGET_ROOTFS_EXT2_4=y as it should be. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2103784289 Signed-off-by: Giulio Benetti --- configs/microchip_sam9x60ek_mmc_dev_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/microchip_sam9x60ek_mmc_dev_defconfig b/configs/microchip_sam9x60ek_mmc_dev_defconfig index 00ccd784b5..06e03967c4 100644 --- a/configs/microchip_sam9x60ek_mmc_dev_defconfig +++ b/configs/microchip_sam9x60ek_mmc_dev_defconfig @@ -7,7 +7,6 @@ BR2_TARGET_GENERIC_HOSTNAME="sam9x60ek" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/microchip/sam9x60ek_mmc/genimage.cfg" -BR2_TARGET_ROOTFS_EXT2_SIZE=120M BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,linux4microchip-2021.10)/linux-linux4microchip-2021.10.tar.gz" @@ -67,6 +66,7 @@ BR2_PACKAGE_HTOP=y BR2_PACKAGE_VIM=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v4.0.1)/at91bootstrap-v4.0.1.tar.gz" -- 2.25.1 From peter at korsgaard.com Fri Feb 18 13:30:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 18 Feb 2022 14:30:55 +0100 Subject: [Buildroot] [PATCH] package/zsh: security bump to version 5.8.1 Message-ID: <20220218133057.2426-1-peter@korsgaard.com> Fixes the following security issue: - CVE-2021-45444: In zsh before 5.8.1, an attacker can achieve code execution if they control a command output inside the prompt, as demonstrated by a %F argument. This occurs because of recursive PROMPT_SUBST expansion. The 5.8.1 release is not listed in MD5SUM, so drop the md5 hash. Signed-off-by: Peter Korsgaard --- package/zsh/zsh.hash | 6 +----- package/zsh/zsh.mk | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/package/zsh/zsh.hash b/package/zsh/zsh.hash index 2df409c946..5c661ded25 100644 --- a/package/zsh/zsh.hash +++ b/package/zsh/zsh.hash @@ -1,7 +1,3 @@ -# From http://www.zsh.org/pub/MD5SUM -md5 e02a5428620b3dd268800c7843b3dd4d zsh-5.8.tar.xz -# Calculated based on the hash above and after checking signature -# http://www.zsh.org/pub/zsh-5.8.tar.xz.asc -sha256 dcc4b54cc5565670a65581760261c163d720991f0d06486da61f8d839b52de27 zsh-5.8.tar.xz # Locally calculated +sha256 b6973520bace600b4779200269b1e5d79e5f505ac4952058c11ad5bbf0dd9919 zsh-5.8.1.tar.xz sha256 d06fdf3ef9b1ec69d6b9e170b0a9516fbad3523261ff1668bde3bfea6e0ef5f5 LICENCE diff --git a/package/zsh/zsh.mk b/package/zsh/zsh.mk index 1a04833211..c5ab7c2fae 100644 --- a/package/zsh/zsh.mk +++ b/package/zsh/zsh.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZSH_VERSION = 5.8 +ZSH_VERSION = 5.8.1 ZSH_SITE = http://www.zsh.org/pub ZSH_SOURCE = zsh-$(ZSH_VERSION).tar.xz ZSH_DEPENDENCIES = ncurses -- 2.20.1 From giulio.benetti at benettiengineering.com Fri Feb 18 17:36:12 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 18 Feb 2022 18:36:12 +0100 Subject: [Buildroot] [PATCH] package/harfbuzz: bump to version 3.4.0 Message-ID: <20220218173613.315794-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 61f2865563..e4674afa87 100644 --- a/package/harfbuzz/harfbuzz.hash +++ b/package/harfbuzz/harfbuzz.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1c13bca136c4f66658059853e2c1253f34c88f4b5c5aba6050aba7b5e0ce2503 harfbuzz-3.3.2.tar.xz +sha256 7158a87c4db82521fc506711f0c8864115f0292d95f7136c8812c11811cdf952 harfbuzz-3.4.0.tar.xz sha256 4345e1735f8bc6d812fed5180cabb5a5e88a4109d332652f2a45c13cfa5ee692 COPYING diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk index 1f5dfa8822..331b35c530 100644 --- a/package/harfbuzz/harfbuzz.mk +++ b/package/harfbuzz/harfbuzz.mk @@ -4,7 +4,7 @@ # ################################################################################ -HARFBUZZ_VERSION = 3.3.2 +HARFBUZZ_VERSION = 3.4.0 HARFBUZZ_SITE = https://github.com/harfbuzz/harfbuzz/releases/download/$(HARFBUZZ_VERSION) HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.xz HARFBUZZ_LICENSE = MIT, ISC (ucdn library) -- 2.25.1 From giulio.benetti at benettiengineering.com Fri Feb 18 17:36:13 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 18 Feb 2022 18:36:13 +0100 Subject: [Buildroot] [PATCH] package/trace-cmd: bump to version 2.9.7 In-Reply-To: <20220218173613.315794-1-giulio.benetti@benettiengineering.com> References: <20220218173613.315794-1-giulio.benetti@benettiengineering.com> Message-ID: <20220218173613.315794-2-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- package/trace-cmd/trace-cmd.hash | 2 +- package/trace-cmd/trace-cmd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/trace-cmd/trace-cmd.hash b/package/trace-cmd/trace-cmd.hash index 00cecc7828..4d39e4d5ea 100644 --- a/package/trace-cmd/trace-cmd.hash +++ b/package/trace-cmd/trace-cmd.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 45924a763376a700221f64b4034f87263e4038ec88b120a0abfb5743d051d068 trace-cmd-v2.9.6.tar.gz +sha256 a74d9ade2633b88d0ad199360d51996427e23f4835594133e456cd6e3bd3a651 trace-cmd-v2.9.7.tar.gz sha256 b1d04b850c1c7471b0f0896f6c6f0fcfc9f07e2dd183a5f5826af269fe9e88fb COPYING sha256 70f297763149e72306919c924e164f83041d5e512868d4c8c1826c171b3e49f9 COPYING.LIB sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 LICENSES/GPL-2.0 diff --git a/package/trace-cmd/trace-cmd.mk b/package/trace-cmd/trace-cmd.mk index fe0cd71ec4..52bb99036c 100644 --- a/package/trace-cmd/trace-cmd.mk +++ b/package/trace-cmd/trace-cmd.mk @@ -4,7 +4,7 @@ # ################################################################################ -TRACE_CMD_VERSION = 2.9.6 +TRACE_CMD_VERSION = 2.9.7 TRACE_CMD_SOURCE = trace-cmd-v$(TRACE_CMD_VERSION).tar.gz TRACE_CMD_SITE = \ https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot -- 2.25.1 From bernd.kuhls at t-online.de Fri Feb 18 19:02:33 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Fri, 18 Feb 2022 20:02:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/php: security bump version to 8.0.16 Message-ID: <20220218190233.473109-1-bernd.kuhls@t-online.de> Changelog: https://www.php.net/ChangeLog-8.php#8.0.16 Fixes CVE-2021-21708. 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 e78385cbe7..2753f9a0eb 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 5f33544061d37d805a2a9ce791f081ef08a7155bd7ba2362e69bba2d06b0f8b2 php-8.0.15.tar.xz +sha256 f27a2f25259e8c51e42dfd74e24a546ee521438ad7d9f6c6e794aa91f38bab0a php-8.0.16.tar.xz # License file sha256 a188db807d711536f71e27b7d36879d63480f7994dc18adc08e624b3c5430fff LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index c9de8c2c76..5b29692d94 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.0.15 +PHP_VERSION = 8.0.16 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 Feb 18 19:04:03 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Fri, 18 Feb 2022 20:04:03 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/kodi-pvr-zattoo: bump version to 19.7.11-Matrix Message-ID: <20220218190403.475643-1-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash | 2 +- package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash index ac4960df92..0b88d5c747 100644 --- a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash +++ b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8cc02c4627b5108e39bb7b6a6f56f7ba5debbb1adf982c4f23395944aa7d2c8e kodi-pvr-zattoo-19.7.10-Matrix.tar.gz +sha256 07d96b1b0c3b464c0bf02279fa8cab9ccdf675344129f3a970b14bafce225fb4 kodi-pvr-zattoo-19.7.11-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk index 7a3b230e8b..95c5de0925 100644 --- a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk +++ b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_ZATTOO_VERSION = 19.7.10-Matrix +KODI_PVR_ZATTOO_VERSION = 19.7.11-Matrix KODI_PVR_ZATTOO_SITE = $(call github,rbuehlma,pvr.zattoo,$(KODI_PVR_ZATTOO_VERSION)) KODI_PVR_ZATTOO_LICENSE = GPL-2.0+ KODI_PVR_ZATTOO_LICENSE_FILES = LICENSE.md -- 2.30.2 From egorenar at linux.ibm.com Fri Feb 18 21:14:58 2022 From: egorenar at linux.ibm.com (Alexander Egorenkov) Date: Fri, 18 Feb 2022 22:14:58 +0100 Subject: [Buildroot] [PATCH 1/1] package/s390-tools: bump to version 2.20.0 Message-ID: <20220218211458.197332-1-egorenar@linux.ibm.com> Fixes: - https://release-monitoring.org/project/10714/ Signed-off-by: Alexander Egorenkov --- package/s390-tools/s390-tools.hash | 2 +- package/s390-tools/s390-tools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/s390-tools/s390-tools.hash b/package/s390-tools/s390-tools.hash index 13c68fbf52f4..6ea8f7ea2076 100644 --- a/package/s390-tools/s390-tools.hash +++ b/package/s390-tools/s390-tools.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 17dc163e6a1e940f895c64955c130058600e1df834e1ab134410be7266ef724a s390-tools-2.19.0.tar.gz +sha256 6fa6add92e896541c0ef74885a4084474fc0d77049e8ac7372872a70a46ddd74 s390-tools-2.20.0.tar.gz sha256 cca17a9a944ebec769adee4aebd805c912c357785ff2705a99ffe68563021f75 LICENSE diff --git a/package/s390-tools/s390-tools.mk b/package/s390-tools/s390-tools.mk index 328986bcb37c..3c386af6fd10 100644 --- a/package/s390-tools/s390-tools.mk +++ b/package/s390-tools/s390-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -S390_TOOLS_VERSION = 2.19.0 +S390_TOOLS_VERSION = 2.20.0 S390_TOOLS_SITE = $(call github,ibm-s390-linux,s390-tools,v$(S390_TOOLS_VERSION)) S390_TOOLS_LICENSE = MIT S390_TOOLS_LICENSE_FILES = LICENSE -- 2.34.1 From giulio.benetti at benettiengineering.com Fri Feb 18 21:41:23 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 18 Feb 2022 22:41:23 +0100 Subject: [Buildroot] Buildroot Failure 2022-02-16 02:25:21 In-Reply-To: References: Message-ID: Hi Peter, I add ML in Cc, > Il giorno 18 feb 2022, alle ore 20:03, Peter Thompson ha scritto: > > ? > Hi Giulio > > Whew - that was fast - I am back asking questions already :).... > > My bump of sdl2_ttf-2.0.15 to sdl2_ttf-2.0.18 caused an autobuilder failure 2022-02-16 02:25:21. The log indicates the problem is pthread.h missing when harfbuzz is specified. See log below... Here can you please provide me the link like below? http://autobuild.buildroot.net/results/cba/cba34c431f8d1315e9ca9159274421a8219a701e// > > Not sure why sdl2_ttf-2.0.15 worked before..... It seems like that between 2.0.15 to 2.0.18(maybe) sdl2_ttf only uses harfbuzz provided by sdl2_ttf itself. This means it?s skipping the one provided from Buildroot that is already patched for harfbuzz pthread.h issue. > Anyways, I planned to add > SDL2_TTF_DEPENDENCIES += pthread > right under > SDL2_TTF_DEPENDENCIES += harfbuzz I would instead try to make sdl2_ttf to choose external harfbuzz instead of using the internal one. And also, we?re not sure that phtread.h is not provided at all. Sometimes build systems fail to recognize headers and libs(the way they check if a library does exist or not). > > But I am having trouble testing. When I submit > ./autobuild 91f241b8e96 ( I assume SHA1 is the git id = commit id) > I get > 404 Error Cannot get configuration for build 91f/91f241b8 > Suggestions? Here you need to pass this sha1: cba34c431f8d1315e9ca9159274421a8219a701e that is the autobuilder sha1 and not the git sha1. Take care to download the right script: http://git.buildroot.net/buildroot-test/plain/utils/br-reproduce-build Then to: $ chmod a+x br-reproduce-build Open it and adjust Buildroot path. Then execute it with: $ ./br-reproduce-build cba34c431f8d1315e9ca9159274421a8219a701e Also remember that if it fails you can: $ cd cba34c431f8d1315e9ca9159274421a8219a701e/output $ make sdl2_ttf or to rebuild package only: $ make sdl2_ttf-dirclean sdl2_ttf > > --- ALTERNATE IDEA --- > > A better way to fix this issue might be to fix package/harfbuzz. It is that dependency which needs pthread and which is causing sdl2_ttf to fail AFAIK. If look closer the build failure you will see that it?s not Buildroot harfbuzz that fails but a harfbuzz embedded into sdl2_ttf. So what I should to is to try to make sdl2_ttf drop its internal harfbuzz and use the Buildroot one. > I see harfbuzz is maintained by you so you are an excellent person to ask. > > I checked harfbuzz and there is > 0001-meson.build-check-for-pthread.h.patch > from Nov 2020 by Fabrice Fontaine. Not sure if that patch was applied or if it fixes my issue. That is applied and actually fixes harfbuzz build failure. But as explained above you?re dealing with the one embedded into sdl2_ttf package. > > Should I have copied the mailing list with these questions? I am never sure. If you?re in doubt put it in Cc :-) > Anyway - thanks for being there and helping. It is appreciated. You?re welcome! Best regards Giulio > > Peter > > > In file included from external/harfbuzz-2.8.0/src/hb.hh:470, > from external/harfbuzz-2.8.0/src/hb-aat-layout.cc:28: > external/harfbuzz-2.8.0/src/hb-mutex.hh:53:10: fatal error: pthread.h: No such file or directory > 53 | #include > | ^~~~~~~~~~~ > compilation terminated. > -------------- next part -------------- An HTML attachment was scrubbed... URL: From mdurrant at arcturusnetworks.com Fri Feb 18 22:09:05 2022 From: mdurrant at arcturusnetworks.com (Michael Durrant) Date: Fri, 18 Feb 2022 17:09:05 -0500 Subject: [Buildroot] [PATCH v4] board/arcturus/aarch64-ucls1012a: bump u-boot and kernel version Message-ID: <20220218220905.87503-1-mdurrant@arcturusnetworks.com> - Bump Linux to version 5.4.137 - Bump U-Boot to add new targets, version remains the same - Drop BR2_ROOTFS_OVERLAY and remove S09modload script because it was only used by PFE and now PFE is loaded directly by the kernel - Use Image.gz instead of Image to have a compressed kernel - Rename ucls1012a.its to br2-ucls1012a.its since post-build.sh and post-image.sh use different name. This fixes the bug that didn't allow the creation of the part0-000000.itb file. Signed-off-by: Oleksandr Zhadan Signed-off-by: Michael Durrant --- V1->V2: - Bump the kernel to "Linux version 5.4.137" - Bootloader version is still "U-Boot 2019.10" but new targets added. - Remove the /etc/init.d/S09modload script to load the pfe firmware module because now the pfe firmware module is loaded by the kernel - New compressed Image.gz is used V2->V3: - Moved SoB to top of patch - The use of Image.gz replace Image to force use of compression. - Our scripts use br2-ucls1012a.its in error ucls1012a.its was used in original readme. - Removing extra newline - The NXP Packet Forward Engine (PFE) firmware loader was the only file used in the overlay. As the PFE is now loaded directly by the kernel the BR2_ROOTFS_OVERLAY script has been removed. V3->V4: - Improved commit log by listing all the changed as suggested by Giulio. - Updated header version comment in defconfig to reflect 5.4 series. --- board/arcturus/aarch64-ucls1012a/post-build.sh | 1 - board/arcturus/aarch64-ucls1012a/readme.txt | 4 ++-- .../rootfs_overlay/etc/init.d/S09modload | 14 -------------- configs/arcturus_ucls1012a_defconfig | 10 +++++----- 4 files changed, 7 insertions(+), 22 deletions(-) delete mode 100755 board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload diff --git a/board/arcturus/aarch64-ucls1012a/post-build.sh b/board/arcturus/aarch64-ucls1012a/post-build.sh index f8ba78095f..372df59c61 100755 --- a/board/arcturus/aarch64-ucls1012a/post-build.sh +++ b/board/arcturus/aarch64-ucls1012a/post-build.sh @@ -1,5 +1,4 @@ #!/bin/sh mkdir -p ${TARGET_DIR}/lib/firmware -cp -f ${BUILD_DIR}/linux-custom/firmware/ppfe/* ${TARGET_DIR}/lib/firmware/ cp -f ${BUILD_DIR}/linux-custom/br2-ucls1012a.its ${BINARIES_DIR}/ diff --git a/board/arcturus/aarch64-ucls1012a/readme.txt b/board/arcturus/aarch64-ucls1012a/readme.txt index 483d5e9aef..b486ecebc7 100644 --- a/board/arcturus/aarch64-ucls1012a/readme.txt +++ b/board/arcturus/aarch64-ucls1012a/readme.txt @@ -24,13 +24,13 @@ After building, you should obtain this tree: output/images/ +-- arc-ucls1012a.dtb - +-- Image + +-- Image.gz +-- part0-000000.itb +-- rootfs.cpio +-- rootfs.cpio.gz +-- rootfs.tar +-- u-boot.bin - +-- ucls1012a.its + +-- br2-ucls1012a.its Flashing -------- diff --git a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload b/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload deleted file mode 100755 index c87ffda14f..0000000000 --- a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -# -case "$1" in - start) - modprobe pfe - ;; - stop) - ;; - restart|reload) - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac diff --git a/configs/arcturus_ucls1012a_defconfig b/configs/arcturus_ucls1012a_defconfig index fd33ebf1f6..124cc3ff94 100644 --- a/configs/arcturus_ucls1012a_defconfig +++ b/configs/arcturus_ucls1012a_defconfig @@ -1,22 +1,22 @@ # Architecture BR2_aarch64=y -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # System settings BR2_TARGET_GENERIC_HOSTNAME="ucls1012a" BR2_TARGET_GENERIC_ISSUE="Welcome to uCLS1012A-SOM" BR2_SYSTEM_DHCP="eth0" -BR2_ROOTFS_OVERLAY="board/arcturus/aarch64-ucls1012a/rootfs_overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="board/arcturus/aarch64-ucls1012a/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/arcturus/aarch64-ucls1012a/post-image.sh" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-kernel,v.20.31)/linux-v.20.31.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-kernel,v.22.06)/linux-v.22.06.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="ucls1012a" +BR2_LINUX_KERNEL_IMAGEGZ=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="arcturus/arc-ucls1012a" @@ -28,7 +28,7 @@ BR2_TARGET_ROOTFS_CPIO_GZIP=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-uboot,v.20.31)/uboot-v.20.31.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-uboot,v.22.06)/uboot-v.22.06.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="UCLS1012A_QSPI128" # Tools -- 2.26.2 From yann.morin.1998 at free.fr Sat Feb 19 09:01:59 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 19 Feb 2022 10:01:59 +0100 Subject: [Buildroot] Buildroot Failure 2022-02-16 02:25:21 In-Reply-To: References: Message-ID: <20220219090159.GA822323@scaer> Giulio, Peter, All, On 2022-02-18 22:41 +0100, Giulio Benetti spake thusly: > > Il giorno 18 feb 2022, alle ore 20:03, Peter Thompson ha scritto: > > My bump of sdl2_ttf-2.0.15 to sdl2_ttf-2.0.18 caused an autobuilder failure 2022-02-16 02:25:21. The log indicates the problem is pthread.h missing when harfbuzz is specified. See log below... > > Not sure why sdl2_ttf-2.0.15 worked before..... > It seems like that between 2.0.15 to 2.0.18(maybe) > sdl2_ttf only uses harfbuzz provided by sdl2_ttf itself. > This means it?s skipping the one provided from Buildroot that is already patched for harfbuzz pthread.h issue. [--SNIP--] > If look closer the build failure you will see that it?s not Buildroot harfbuzz that fails but a harfbuzz embedded into sdl2_ttf. > So what I should to is to try to make sdl2_ttf drop its internal harfbuzz and use the Buildroot one. I think ths might have been fixed with commit e253e41ce2e5 (package/sdl2_ttf: add harfbuzz optional dependency) 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 Sat Feb 19 09:20:41 2022 From: romain.naour at gmail.com (Romain Naour) Date: Sat, 19 Feb 2022 10:20:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/lxc: bump to version 4.0.11 In-Reply-To: <114f25cd-b392-fbde-ce20-eef87447f1c0@gmail.com> References: <20220101225906.2341845-1-fontaine.fabrice@gmail.com> <87bl0t1a9o.fsf@gmail.com> <114f25cd-b392-fbde-ce20-eef87447f1c0@gmail.com> Message-ID: Hello, Le 30/01/2022 ? 17:36, Romain Naour a ?crit?: > 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? ping. Best regards, Romain > > 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 guillaume.bressaix at gmail.com Sat Feb 19 10:23:09 2022 From: guillaume.bressaix at gmail.com (Guillaume W. Bres) Date: Sat, 19 Feb 2022 11:23:09 +0100 Subject: [Buildroot] [PATCH] package/libxcrypt: bump to version 4.4.28 Message-ID: <20220219102309.15465-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 99ddf62be0..bdda6b47c0 100644 --- a/package/libxcrypt/libxcrypt.hash +++ b/package/libxcrypt/libxcrypt.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 e4ff47b7fa5370fa08e27258f8a0de5cb7e9b09c297ec7ab56a8a82e229a1c84 libxcrypt-4.4.27.tar.gz +sha256 db7e37901969cb1d1e8020cb73a991ef81e48e31ea5b76a101862c806426b457 libxcrypt-4.4.28.tar.gz sha256 f9b48b0bc67a92b752780710aa774cf08b62ec2ebaa3f4aebd00069fba6effd2 LICENSING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/libxcrypt/libxcrypt.mk b/package/libxcrypt/libxcrypt.mk index 65efa2bab9..f7a0fd4308 100644 --- a/package/libxcrypt/libxcrypt.mk +++ b/package/libxcrypt/libxcrypt.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBXCRYPT_VERSION = 4.4.27 +LIBXCRYPT_VERSION = 4.4.28 LIBXCRYPT_SITE = $(call github,besser82,libxcrypt,v$(LIBXCRYPT_VERSION)) LIBXCRYPT_LICENSE = LGPL-2.1+ LIBXCRYPT_LICENSE_FILES = LICENSING COPYING.LIB -- 2.20.1 From ps.report at gmx.net Sat Feb 19 10:24:51 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Sat, 19 Feb 2022 11:24:51 +0100 Subject: [Buildroot] [PATCH v1] package/wireless-regdb: bump version to 2022.02.18 Message-ID: <20220219102451.25602-1-ps.report@gmx.net> Changelog (since 2021.08.28, [1]): e061299 wireless-regdb: Raise DFS TX power limit to 250 mW (24 dBm) for the US 2ce78ed wireless-regdb: Update regulatory rules for Croatia (HR) on 6GHz 0d39f4c wireless-regdb: Update regulatory rules for South Korea (KR) acad231 wireless-regdb: Update regulatory rules for France (FR) on 6 and 60 GHz ea83a82 wireless-regdb: add support for US S1G channels 4408149 wireless-regdb: add 802.11ah bands to world regulatory domain 5f3cadc wireless-regdb: Update regulatory rules for Spain (ES) on 6GHz e0ac69b Revert "wireless-regdb: Update regulatory rules for South Korea (KR)" 40e5e80 wireless-regdb: Update regulatory rules for South Korea (KR) e427ff2 wireless-regdb: Update regulatory rules for China (CN) 0970116 wireless-regdb: Update regulatory rules for the Netherlands (NL) on 6GHz 4dac44b wireless-regdb: update regulatory database based on preceding changes [1] https://lore.kernel.org/linux-wireless/YhBCKWNw3IMfGs0L at ubuntu-x1/ Signed-off-by: Peter Seiderer --- package/wireless-regdb/wireless-regdb.hash | 2 +- package/wireless-regdb/wireless-regdb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/wireless-regdb/wireless-regdb.hash b/package/wireless-regdb/wireless-regdb.hash index abe8f6b000..91fcb320d2 100644 --- a/package/wireless-regdb/wireless-regdb.hash +++ b/package/wireless-regdb/wireless-regdb.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/software/network/wireless-regdb/sha256sums.asc -sha256 cff370c410d1e6d316ae0a7fa8ac6278fdf1efca5d3d664aca7cfd2aafa54446 wireless-regdb-2021.08.28.tar.xz +sha256 8828c25a4ee25020044004f57374bb9deac852809fad70f8d3d01770bf9ac97f wireless-regdb-2022.02.18.tar.xz # Locally computed sha256 678b0df753c86198fc496d1f1033429bbd57f101472132ee7eaaf9f5e0a7fae1 LICENSE diff --git a/package/wireless-regdb/wireless-regdb.mk b/package/wireless-regdb/wireless-regdb.mk index 9e01283c01..35a8c6686d 100644 --- a/package/wireless-regdb/wireless-regdb.mk +++ b/package/wireless-regdb/wireless-regdb.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRELESS_REGDB_VERSION = 2021.08.28 +WIRELESS_REGDB_VERSION = 2022.02.18 WIRELESS_REGDB_SOURCE = wireless-regdb-$(WIRELESS_REGDB_VERSION).tar.xz WIRELESS_REGDB_SITE = $(BR2_KERNEL_MIRROR)/software/network/wireless-regdb WIRELESS_REGDB_LICENSE = ISC -- 2.35.1 From guillaume.bressaix at gmail.com Sat Feb 19 10:35:07 2022 From: guillaume.bressaix at gmail.com (Guillaume W. Bres) Date: Sat, 19 Feb 2022 11:35:07 +0100 Subject: [Buildroot] [PATCH] package/libnids: bump version to 1.26 Message-ID: <20220219103507.29176-1-guillaume.bressaix@gmail.com> Change repo source to official github.com repository which is actively maintained. Previous sourceforge.net sources remained untouched since 2010. Signed-off-by: Guillaume W. Bres --- package/libnids/libnids.hash | 4 ++-- package/libnids/libnids.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libnids/libnids.hash b/package/libnids/libnids.hash index 4a2949c39d..e51dbf151c 100644 --- a/package/libnids/libnids.hash +++ b/package/libnids/libnids.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 314b4793e0902fbf1fdb7fb659af37a3c1306ed1aad5d1c84de6c931b351d359 libnids-1.24.tar.gz -sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING +sha256 3f3e9f99a83cd37bc74af83d415c5e3a7505f5b190dfaf456b0849e0054f6733 libnids-1.26.tar.gz +sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING diff --git a/package/libnids/libnids.mk b/package/libnids/libnids.mk index 3e36838c40..57e68654dc 100644 --- a/package/libnids/libnids.mk +++ b/package/libnids/libnids.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBNIDS_VERSION = 1.24 -LIBNIDS_SITE = https://sourceforge.net/projects/libnids/files/libnids/$(LIBNIDS_VERSION) +LIBNIDS_VERSION = 1.26 +LIBNIDS_SITE = $(call github,MITRECND,libnids,$(LIBNIDS_VERSION),$(LIBNIDS_VERSION).tar.gz) LIBNIDS_LICENSE = GPL-2.0 LIBNIDS_LICENSE_FILES = COPYING LIBNIDS_CPE_ID_VENDOR = libnids_project -- 2.20.1 From giulio.benetti at benettiengineering.com Sat Feb 19 11:53:27 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 19 Feb 2022 12:53:27 +0100 Subject: [Buildroot] Buildroot Failure 2022-02-16 02:25:21 In-Reply-To: <20220219090159.GA822323@scaer> References: <20220219090159.GA822323@scaer> Message-ID: Hi Yann, Peter, All, > Il giorno 19 feb 2022, alle ore 10:02, Yann E. MORIN ha scritto: > > ?Giulio, Peter, All, > > On 2022-02-18 22:41 +0100, Giulio Benetti spake thusly: >>>> Il giorno 18 feb 2022, alle ore 20:03, Peter Thompson ha scritto: >>> My bump of sdl2_ttf-2.0.15 to sdl2_ttf-2.0.18 caused an autobuilder failure 2022-02-16 02:25:21. The log indicates the problem is pthread.h missing when harfbuzz is specified. See log below... >>> Not sure why sdl2_ttf-2.0.15 worked before..... >> It seems like that between 2.0.15 to 2.0.18(maybe) >> sdl2_ttf only uses harfbuzz provided by sdl2_ttf itself. >> This means it?s skipping the one provided from Buildroot that is already patched for harfbuzz pthread.h issue. > [--SNIP--] >> If look closer the build failure you will see that it?s not Buildroot harfbuzz that fails but a harfbuzz embedded into sdl2_ttf. >> So what I should to is to try to make sdl2_ttf drop its internal harfbuzz and use the Buildroot one. > > I think ths might have been fixed with commit e253e41ce2e5 (package/sdl2_ttf: > add harfbuzz optional dependency) Peter this is why when you check for autobuilder failure you need to pull Buildroot to latest version :-). Also, before going to work on something, always check Buildroot patchwork if someone else has already done it. And last but not least, check the package git repository itself for a fix, like a commit or a pending PR/MR or an issue with a solution explained. Best regards Giulio > > 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. | > '------------------------------^-------^------------------^--------------------' > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From fontaine.fabrice at gmail.com Sat Feb 19 12:25:25 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 19 Feb 2022 13:25:25 +0100 Subject: [Buildroot] [PATCH 1/2] package/gdk-pixbuf: enable relocatable option Message-ID: <20220219122526.2954354-1-fontaine.fabrice@gmail.com> Enable relocatable option to fix the following PPD build failure of adwaita-icon-theme raised since commit b06294e9897e90862656416e8b67fdace15488d7 which now correctly updates loaders.cache: Can't load file: Unrecognized image file format Fixes: - http://autobuild.buildroot.org/results/0e00059b09b4445eaaec1030997883187c6a80d6 Signed-off-by: Fabrice Fontaine --- package/gdk-pixbuf/gdk-pixbuf.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk index cd30d450d5..7b9c9cdbda 100644 --- a/package/gdk-pixbuf/gdk-pixbuf.mk +++ b/package/gdk-pixbuf/gdk-pixbuf.mk @@ -20,12 +20,14 @@ HOST_GDK_PIXBUF_DEPENDENCIES = host-libpng host-pkgconf host-libglib2 GDK_PIXBUF_CONF_OPTS = \ -Dgio_sniffing=false \ -Dinstalled_tests=false \ + -Drelocatable=true \ -Dman=false HOST_GDK_PIXBUF_CONF_OPTS = \ -Dgio_sniffing=false \ -Dinstalled_tests=false \ -Dintrospection=disabled \ + -Drelocatable=true \ -Dman=false ifeq ($(BR2_STATIC_LIBS),y) -- 2.34.1 From fontaine.fabrice at gmail.com Sat Feb 19 12:25:26 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 19 Feb 2022 13:25:26 +0100 Subject: [Buildroot] [PATCH 2/2] package/librsvg: fix loaders.cache In-Reply-To: <20220219122526.2954354-1-fontaine.fabrice@gmail.com> References: <20220219122526.2954354-1-fontaine.fabrice@gmail.com> Message-ID: <20220219122526.2954354-2-fontaine.fabrice@gmail.com> Set GDK_PIXBUF_MODULEDIR to gdk_pixbuf_moduledir before calling gdk-pixbuf-query-loaders to build a correct loaders.cache and fix the following PPD build failure of adwaita-icon-theme raised since commit b06294e9897e90862656416e8b67fdace15488d7 which now correctly updates loaders.cache: Can't load file: Unrecognized image file format Fixes: - http://autobuild.buildroot.org/results/0e00059b09b4445eaaec1030997883187c6a80d6 Signed-off-by: Fabrice Fontaine --- ...r-Makefile.am-set-GDK_PIXBUF_MODULED.patch | 39 +++++++++++++++++++ package/librsvg/librsvg.mk | 2 + 2 files changed, 41 insertions(+) create mode 100644 package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch diff --git a/package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch b/package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch new file mode 100644 index 0000000000..94db8eb143 --- /dev/null +++ b/package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch @@ -0,0 +1,39 @@ +From 2c472bf55289ccbd7f305aa3e98d6fd70be4e3ab Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 19 Feb 2022 12:02:10 +0100 +Subject: [PATCH] gdk-pixbuf-loader/Makefile.am: set GDK_PIXBUF_MODULEDIR + +Set GDK_PIXBUF_MODULEDIR to gdk_pixbuf_moduledir before calling +gdk-pixbuf-query-loaders to build a correct gdk_pixbuf_cache_file and +gdk-pixbuf.loaders on 'exotic' systems + +Signed-off-by: Fabrice Fontaine +--- + gdk-pixbuf-loader/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gdk-pixbuf-loader/Makefile.am b/gdk-pixbuf-loader/Makefile.am +index c3493736..de1f9641 100644 +--- a/gdk-pixbuf-loader/Makefile.am ++++ b/gdk-pixbuf-loader/Makefile.am +@@ -49,7 +49,7 @@ rsvg_loader_LDADD = \ + EXTRA_rsvg_loader_DEPENDENCIES = libpixbufloader-svg.la gdk-pixbuf-loaders + + gdk-pixbuf-loaders: Makefile +- $(AM_V_GEN) ( $(GDK_PIXBUF_QUERYLOADERS) ./libpixbufloader-svg.la && $(GDK_PIXBUF_QUERYLOADERS)) > gdk-pixbuf.loaders 2>/dev/null ++ $(AM_V_GEN) ( $(GDK_PIXBUF_QUERYLOADERS) ./libpixbufloader-svg.la && GDK_PIXBUF_MODULEDIR=$(gdk_pixbuf_moduledir) $(GDK_PIXBUF_QUERYLOADERS)) > gdk-pixbuf.loaders 2>/dev/null + + if CROSS_COMPILING + RUN_QUERY_LOADER_TEST=false +@@ -68,7 +68,7 @@ endif + install-data-hook: + @if $(RUN_QUERY_LOADER_TEST) ; then \ + $(mkinstalldirs) $(DESTDIR)$(gdk_pixbuf_binarydir) ; \ +- $(GDK_PIXBUF_QUERYLOADERS) > $(DESTDIR)$(gdk_pixbuf_cache_file) ; \ ++ GDK_PIXBUF_MODULEDIR=$(gdk_pixbuf_moduledir) $(GDK_PIXBUF_QUERYLOADERS) > $(DESTDIR)$(gdk_pixbuf_cache_file) ; \ + else \ + echo "***" ; \ + echo "*** Warning: loaders.cache not built" ; \ +-- +2.34.1 + diff --git a/package/librsvg/librsvg.mk b/package/librsvg/librsvg.mk index e4b1942b79..07a14b4366 100644 --- a/package/librsvg/librsvg.mk +++ b/package/librsvg/librsvg.mk @@ -20,6 +20,8 @@ HOST_LIBRSVG_DEPENDENCIES = host-cairo host-gdk-pixbuf host-libglib2 host-libxml LIBRSVG_LICENSE = LGPL-2.1+ LIBRSVG_LICENSE_FILES = COPYING.LIB LIBRSVG_CPE_ID_VENDOR = gnome +# We're patching gdk-pixbuf-loader/Makefile.am +LIBRSVG_AUTORECONF = YES ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) LIBRSVG_CONF_OPTS += --enable-introspection -- 2.34.1 From fontaine.fabrice at gmail.com Sat Feb 19 12:28:30 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 19 Feb 2022 13:28:30 +0100 Subject: [Buildroot] [PATCH 1/2] package/expat: fix tarball sha256 Message-ID: <20220219122831.2961097-1-fontaine.fabrice@gmail.com> Commit ab71ac15ddd7ed6a8ca83cbc23ea0b0cbb343f0f forgot to update sha256 Signed-off-by: Fabrice Fontaine --- package/expat/expat.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index 3129801668..a6f43af291 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -3,5 +3,5 @@ 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 b1f9f1b1a5ebb0acaa88c9ff79bfa4e145823b78aa5185e5c5d85f060824778a expat-2.4.4.tar.xz sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec COPYING -- 2.34.1 From fontaine.fabrice at gmail.com Sat Feb 19 12:28:31 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 19 Feb 2022 13:28:31 +0100 Subject: [Buildroot] [PATCH 2/2] package/expat: security bump to version 2.4.5 In-Reply-To: <20220219122831.2961097-1-fontaine.fabrice@gmail.com> References: <20220219122831.2961097-1-fontaine.fabrice@gmail.com> Message-ID: <20220219122831.2961097-2-fontaine.fabrice@gmail.com> Security fixes: #562 CVE-2022-25235 -- Passing malformed 2- and 3-byte UTF-8 sequences (e.g. from start tag names) to the XML processing application on top of Expat can cause arbitrary damage (e.g. code execution) depending on how invalid UTF-8 is handled inside the XML processor; validation was not their job but Expat's. Exploits with code execution are known to exist. #561 CVE-2022-25236 -- Passing (one or more) namespace separator characters in "xmlns[:prefix]" attribute values made Expat send malformed tag names to the XML processor on top of Expat which can cause arbitrary damage (e.g. code execution) depending on such unexpectable cases are handled inside the XML processor; validation was not their job but Expat's. Exploits with code execution are known to exist. #558 CVE-2022-25313 -- Fix stack exhaustion in doctype parsing that could be triggered by e.g. a 2 megabytes file with a large number of opening braces. Expected impact is denial of service or potentially arbitrary code execution. #560 CVE-2022-25314 -- Fix integer overflow in function copyString; only affects the encoding name parameter at parser creation time which is often hardcoded (rather than user input), takes a value in the gigabytes to trigger, and a 64-bit machine. Expected impact is denial of service. #559 CVE-2022-25315 -- Fix integer overflow in function storeRawNames; needs input in the gigabytes and a 64-bit machine. Expected impact is denial of service or potentially arbitrary code execution. https://blog.hartwork.org/posts/expat-2-4-5-released/ https://github.com/libexpat/libexpat/blob/R_2_4_5/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 a6f43af291..cd2e8c7fb9 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.4/ -md5 a712d23b7afb32e7527cf0b3fd8f12ac expat-2.4.4.tar.xz -sha1 6028b04d3505fc519c4c7c6bd67e1ad1a08cd7b6 expat-2.4.4.tar.xz +# From https://sourceforge.net/projects/expat/files/expat/2.4.5/ +md5 9dc183e6c1eebc1b658c1e71be0885e1 expat-2.4.5.tar.xz +sha1 360a49b55c442e91cb7b328bc0335083909ddf4f expat-2.4.5.tar.xz # Locally calculated -sha256 b1f9f1b1a5ebb0acaa88c9ff79bfa4e145823b78aa5185e5c5d85f060824778a expat-2.4.4.tar.xz +sha256 f2af8fc7cdc63a87920da38cd6d12cb113c3c3a3f437495b1b6541e0cff32579 expat-2.4.5.tar.xz sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec COPYING diff --git a/package/expat/expat.mk b/package/expat/expat.mk index 250600c25e..7815d61027 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.4.4 +EXPAT_VERSION = 2.4.5 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 Sat Feb 19 13:41:04 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 19 Feb 2022 14:41:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/dovecot-pigeonhole: drop DOVECOT_PIGEONHOLE_FIXUP_DOVECOT_CONFIG Message-ID: <20220219134104.3403344-1-fontaine.fabrice@gmail.com> Drop DOVECOT_PIGEONHOLE_FIXUP_DOVECOT_CONFIG added by commit 0901355c11f051846744a12f9b2044a751faa47a which is not needed since the addition of PPD_FIXUP_PATHS in commit b06294e9897e90862656416e8b67fdace15488d Signed-off-by: Fabrice Fontaine --- package/dovecot-pigeonhole/dovecot-pigeonhole.mk | 8 -------- 1 file changed, 8 deletions(-) diff --git a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk index dd533977f4..62d9909cf5 100644 --- a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk +++ b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk @@ -15,12 +15,4 @@ DOVECOT_PIGEONHOLE_DEPENDENCIES = dovecot DOVECOT_PIGEONHOLE_CONF_OPTS = --with-dovecot=$(STAGING_DIR)/usr/lib -ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) -define DOVECOT_PIGEONHOLE_FIXUP_DOVECOT_CONFIG - $(SED) 's,$(PER_PACKAGE_DIR)/dovecot/,$(PER_PACKAGE_DIR)/dovecot-pigeonhole/,g' \ - $(STAGING_DIR)/usr/lib/dovecot-config -endef -DOVECOT_PIGEONHOLE_PRE_CONFIGURE_HOOKS = DOVECOT_PIGEONHOLE_FIXUP_DOVECOT_CONFIG -endif - $(eval $(autotools-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Sat Feb 19 14:19:22 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 19 Feb 2022 15:19:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/apparmor: drop APPARMOR_FIXUP_APXS Message-ID: <20220219141922.3753289-1-fontaine.fabrice@gmail.com> Drop APPARMOR_FIXUP_APXS which was added by commit 3c836e54203b16015c9c52cbe007adc92d293a0d but is not needed since the addition of PPD_FIXUP_PATHS in commit b06294e9897e90862656416e8b67fdace15488d7 Signed-off-by: Fabrice Fontaine --- package/apparmor/apparmor.mk | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/package/apparmor/apparmor.mk b/package/apparmor/apparmor.mk index 6f0e59224d..43bfa05308 100644 --- a/package/apparmor/apparmor.mk +++ b/package/apparmor/apparmor.mk @@ -54,16 +54,6 @@ ifeq ($(BR2_PACKAGE_APACHE),y) APPARMOR_DEPENDENCIES += apache APPARMOR_TOOLS += changehat/mod_apparmor APPARMOR_MAKE_OPTS += APXS=$(STAGING_DIR)/usr/bin/apxs - -ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) -define APPARMOR_FIXUP_APXS - $(SED) "s@$(PER_PACKAGE_DIR)/[^/]\+/@$(PER_PACKAGE_DIR)/apparmor/@g" \ - $(STAGING_DIR)/usr/bin/apxs \ - $(STAGING_DIR)/usr/build/config_vars.mk \ - $(STAGING_DIR)/usr/build-1/libtool -endef -APPARMOR_POST_CONFIGURE_HOOKS += APPARMOR_FIXUP_APXS -endif endif define APPARMOR_BUILD_CMDS -- 2.34.1 From fontaine.fabrice at gmail.com Sat Feb 19 14:20:27 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 19 Feb 2022 15:20:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/apache: drop APACHE_FIXUP_APR_LIBTOOL Message-ID: <20220219142027.3753330-1-fontaine.fabrice@gmail.com> Drop APACHE_FIXUP_APR_LIBTOOL which was added by commit b747c29c4e8eb89b7b99658dfd34f4a6b6b0744d but is not needed since the addition of PPD_FIXUP_PATHS in commit b06294e9897e90862656416e8b67fdace15488d7 Signed-off-by: Fabrice Fontaine --- package/apache/apache.mk | 8 -------- 1 file changed, 8 deletions(-) diff --git a/package/apache/apache.mk b/package/apache/apache.mk index 5fcb887fbc..b280d4dc3a 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -19,14 +19,6 @@ APACHE_INSTALL_STAGING = YES APACHE_AUTORECONF = YES APACHE_DEPENDENCIES = apr apr-util pcre -ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) -define APACHE_FIXUP_APR_LIBTOOL - $(SED) "s@$(PER_PACKAGE_DIR)/[^/]\+/@$(PER_PACKAGE_DIR)/apache/@g" \ - $(STAGING_DIR)/usr/build-1/libtool -endef -APACHE_POST_PREPARE_HOOKS += APACHE_FIXUP_APR_LIBTOOL -endif - APACHE_CONF_ENV= \ ap_cv_void_ptr_lt_long=no \ PCRE_CONFIG=$(STAGING_DIR)/usr/bin/pcre-config -- 2.34.1 From fontaine.fabrice at gmail.com Sat Feb 19 14:21:04 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 19 Feb 2022 15:21:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/apr-util: drop APR_UTIL_FIX_{LIBTOOL, RULES_MK} Message-ID: <20220219142104.3753374-1-fontaine.fabrice@gmail.com> Drop APR_UTIL_FIX_{LIBTOOL,RULES_MK} which were added by commit 84b4c19e551288911a230c2b73e96bc6e2ed12f9 but is not needed since the addition of PPD_FIXUP_PATHS in commit b06294e9897e90862656416e8b67fdace15488d7 Signed-off-by: Fabrice Fontaine --- package/apr-util/apr-util.mk | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/package/apr-util/apr-util.mk b/package/apr-util/apr-util.mk index f6ce7ac064..cf8407ced0 100644 --- a/package/apr-util/apr-util.mk +++ b/package/apr-util/apr-util.mk @@ -17,20 +17,6 @@ APR_UTIL_CONF_OPTS = \ --with-apr=$(STAGING_DIR)/usr/bin/apr-1-config APR_UTIL_CONFIG_SCRIPTS = apu-1-config -ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) -define APR_UTIL_FIX_LIBTOOL - $(SED) 's,$(PER_PACKAGE_DIR)/apr/,$(PER_PACKAGE_DIR)/apr-util/,g' \ - $(STAGING_DIR)/usr/build-1/libtool -endef -APR_UTIL_POST_PREPARE_HOOKS += APR_UTIL_FIX_LIBTOOL - -define APR_UTIL_FIX_RULES_MK - $(SED) 's,$(PER_PACKAGE_DIR)/apr/,$(PER_PACKAGE_DIR)/apr-util/,g' \ - $(@D)/build/rules.mk -endef -APR_UTIL_POST_CONFIGURE_HOOKS += APR_UTIL_FIX_RULES_MK -endif - # When iconv is available, then use it to provide charset conversion # features. APR_UTIL_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv) -- 2.34.1 From fontaine.fabrice at gmail.com Sat Feb 19 15:20:03 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 19 Feb 2022 16:20:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/lxc: bump to version 4.0.11 In-Reply-To: References: <20220101225906.2341845-1-fontaine.fabrice@gmail.com> <87bl0t1a9o.fsf@gmail.com> <114f25cd-b392-fbde-ce20-eef87447f1c0@gmail.com> Message-ID: Hello, Le sam. 19 f?vr. 2022 ? 10:20, Romain Naour a ?crit : > > Hello, > > Le 30/01/2022 ? 17:36, Romain Naour a ?crit : > > 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? > > ping. How can I reproduce the problem locally so I can open a bug on https://github.com/lxc/lxc/issues? I tried to launch run-tests from current master but it is "stuck" in "Building done": ./support/testing/run-tests -o test-output/ -d test-dl/ -k --timeout-multiplier 10 tests.package.test_lxc.TestLxc 15:36:35 TestLxc Starting 15:36:35 TestLxc Building 15:51:04 TestLxc Building done So I opened test-output/TestLxc-run.log and found out a kernel panic: Kernel panic - not syncing: No working init found. Try passing init= option to kernel. See Linux Documentation/admin-guide/init.rst for guidance I assume that qemu is not able to start the kernel. Do you have some advice on what could go wrong? > > Best regards, > Romain > > > > > 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 > >> > > > Best Regards, Fabrice From john at metanate.com Sat Feb 19 15:43:50 2022 From: john at metanate.com (John Keeping) Date: Sat, 19 Feb 2022 15:43:50 +0000 Subject: [Buildroot] [PATCH] package/gdb: fix when gmp is installed on the host machine Message-ID: <20220219154350.1552021-1-john@metanate.com> gdb's AC_LIB_HAVE_LINKFLAGS macro hardcodes a search starting with /usr/lib/ which can lead to libgmp from the wrong architecture with the result that the test fails. Even if a libgmp is found there it is now the one that should be used. This is the same macro used for expat and lzma for which there are already specific CONF_OPTS flags added here. Add the same flag for libgmp and move the handling down so that it is logically grouped with the other similar options. Note that there is no --with(out)-gmp flag to configure, as the dependency is mandatory, so only the --with-libgmp-prefix option is specified. Signed-off-by: John Keeping --- package/gdb/gdb.mk | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk index 05de3c14d1..9bde2beea1 100644 --- a/package/gdb/gdb.mk +++ b/package/gdb/gdb.mk @@ -77,14 +77,6 @@ ifeq ($(BR2_GDB_VERSION_11),y) HOST_GDB_DEPENDENCIES += host-gmp endif -# When BR2_GDB_VERSION_11=y (because it's enabled for the host) and -# we're building the full gdb for the target, we need gmp as a -# dependency. For now the default gdb version in Buildroot doesn't -# require gmp. -ifeq ($(BR2_GDB_VERSION_11)$(BR2_PACKAGE_GDB_DEBUGGER),yy) -GDB_DEPENDENCIES += gmp -endif - # When gdb sources are fetched from the binutils-gdb repository, they # also contain the binutils sources, but binutils shouldn't be built, # so we disable it (additionally the option --disable-install-libbfd @@ -169,6 +161,16 @@ GDB_CONF_OPTS += \ --without-curses endif +# When BR2_GDB_VERSION_11=y (because it's enabled for the host) and +# we're building the full gdb for the target, we need gmp as a +# dependency. For now the default gdb version in Buildroot doesn't +# require gmp. +ifeq ($(BR2_GDB_VERSION_11)$(BR2_PACKAGE_GDB_DEBUGGER),yy) +GDB_CONF_OPTS += \ + --with-libgmp-prefix=$(STAGING_DIR)/usr +GDB_DEPENDENCIES += gmp +endif + ifeq ($(BR2_PACKAGE_GDB_SERVER),y) GDB_CONF_OPTS += --enable-gdbserver GDB_DEPENDENCIES += $(TARGET_NLS_DEPENDENCIES) -- 2.35.1 From peter.macleod.thompson at gmail.com Sat Feb 19 15:45:44 2022 From: peter.macleod.thompson at gmail.com (Peter Thompson) Date: Sat, 19 Feb 2022 08:45:44 -0700 Subject: [Buildroot] Buildroot Failure 2022-02-16 02:25:21 In-Reply-To: <20220219090159.GA822323@scaer> References: <20220219090159.GA822323@scaer> Message-ID: > I think this might have been fixed with commit e253e41ce2e5 (package/sdl2_ttf: add harfbuzz optional dependency) Yes - I was just noticing that it was already fixed.... thanks Yann Peter On Sat, Feb 19, 2022 at 2:02 AM Yann E. MORIN wrote: > Giulio, Peter, All, > > On 2022-02-18 22:41 +0100, Giulio Benetti spake thusly: > > > Il giorno 18 feb 2022, alle ore 20:03, Peter Thompson < > peter.macleod.thompson at gmail.com> ha scritto: > > > My bump of sdl2_ttf-2.0.15 to sdl2_ttf-2.0.18 caused an autobuilder > failure 2022-02-16 02:25:21. The log indicates the problem is > pthread.h missing when harfbuzz is specified. See log below... > > > Not sure why sdl2_ttf-2.0.15 worked before..... > > It seems like that between 2.0.15 to 2.0.18(maybe) > > sdl2_ttf only uses harfbuzz provided by sdl2_ttf itself. > > This means it?s skipping the one provided from Buildroot that is already > patched for harfbuzz pthread.h issue. > [--SNIP--] > > If look closer the build failure you will see that it?s not Buildroot > harfbuzz that fails but a harfbuzz embedded into sdl2_ttf. > > So what I should to is to try to make sdl2_ttf drop its internal > harfbuzz and use the Buildroot one. > > I think ths might have been fixed with commit e253e41ce2e5 > (package/sdl2_ttf: > add harfbuzz optional dependency) > > 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. | > > '------------------------------^-------^------------------^--------------------' > -------------- next part -------------- An HTML attachment was scrubbed... URL: From romain.naour at gmail.com Sat Feb 19 16:43:48 2022 From: romain.naour at gmail.com (Romain Naour) Date: Sat, 19 Feb 2022 17:43:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/lxc: bump to version 4.0.11 In-Reply-To: References: <20220101225906.2341845-1-fontaine.fabrice@gmail.com> <87bl0t1a9o.fsf@gmail.com> <114f25cd-b392-fbde-ce20-eef87447f1c0@gmail.com> Message-ID: <4429b2e9-f78b-30e6-849a-c1567ea83e12@gmail.com> Hello Fabrice, Le 19/02/2022 ? 16:20, Fabrice Fontaine a ?crit?: > Hello, > > Le sam. 19 f?vr. 2022 ? 10:20, Romain Naour a ?crit : >> >> Hello, >> >> Le 30/01/2022 ? 17:36, Romain Naour a ?crit : >>> 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? >> >> ping. > How can I reproduce the problem locally so I can open a bug on > https://github.com/lxc/lxc/issues? > I tried to launch run-tests from current master but it is "stuck" in > "Building done": > > ./support/testing/run-tests -o test-output/ -d test-dl/ -k > --timeout-multiplier 10 tests.package.test_lxc.TestLxc > 15:36:35 TestLxc Starting > 15:36:35 TestLxc Building > 15:51:04 TestLxc Building done > > So I opened test-output/TestLxc-run.log and found out a kernel panic: > > Kernel panic - not syncing: No working init found. Try passing init= > option to kernel. See Linux Documentation/admin-guide/init.rst for > guidance > > I assume that qemu is not able to start the kernel. > Do you have some advice on what could go wrong? Weird, can you check your qemu version ? I'm using qemu 6.1.0 from Fedora 35 and also tested qemu 5.2.0 from Debian 11. If it still not working, you should be able to reproduce using the Docker image used in gitlab-ci. See utils/docker-run. Best regards, Romain >> >> Best regards, >> Romain >> >>> >>> 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 >>>> >>> >> > Best Regards, > > Fabrice From guillaume.bressaix at gmail.com Sat Feb 19 16:53:08 2022 From: guillaume.bressaix at gmail.com (Guillaume W. Bres) Date: Sat, 19 Feb 2022 17:53:08 +0100 Subject: [Buildroot] [PATCH v2] package/python-gast: new host-only package Message-ID: <20220219165311.9775-1-guillaume.bressaix@gmail.com> From: "Arnout Vandecappelle (Essensium/Mind)" Generated with scanpypi and converted to host. It is a dependency of python-beniget and python-pythran. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Guillaume W. Bres --- 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.20.1 From guillaume.bressaix at gmail.com Sat Feb 19 16:53:09 2022 From: guillaume.bressaix at gmail.com (Guillaume W. Bres) Date: Sat, 19 Feb 2022 17:53:09 +0100 Subject: [Buildroot] [PATCH v2] package/python-beniget: new host-only package In-Reply-To: <20220219165311.9775-1-guillaume.bressaix@gmail.com> References: <20220219165311.9775-1-guillaume.bressaix@gmail.com> Message-ID: <20220219165311.9775-2-guillaume.bressaix@gmail.com> From: "Arnout Vandecappelle (Essensium/Mind)" Generated with scanpypi and converted to host. It is a dependency of python-pythran. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Guillaume W. Bres --- 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.20.1 From guillaume.bressaix at gmail.com Sat Feb 19 16:53:10 2022 From: guillaume.bressaix at gmail.com (Guillaume W. Bres) Date: Sat, 19 Feb 2022 17:53:10 +0100 Subject: [Buildroot] [PATCH v2] package/python-pythran: new host-only package In-Reply-To: <20220219165311.9775-1-guillaume.bressaix@gmail.com> References: <20220219165311.9775-1-guillaume.bressaix@gmail.com> Message-ID: <20220219165311.9775-3-guillaume.bressaix@gmail.com> From: "Arnout Vandecappelle (Essensium/Mind)" Generated with scanpypi and converted to host. It is a dependency of python-scipy. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Guillaume W. Bres --- 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.20.1 From guillaume.bressaix at gmail.com Sat Feb 19 16:53:11 2022 From: guillaume.bressaix at gmail.com (Guillaume W. Bres) Date: Sat, 19 Feb 2022 17:53:11 +0100 Subject: [Buildroot] [PATCH v2] package/python-scipy: new package In-Reply-To: <20220219165311.9775-1-guillaume.bressaix@gmail.com> References: <20220219165311.9775-1-guillaume.bressaix@gmail.com> Message-ID: <20220219165311.9775-4-guillaume.bressaix@gmail.com> 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) [Guillaume: - -lnpymath: npymath.ini localization problem - -lnpyrandom resolution problem ] Signed-off-by: Guillaume W. Bres --- Hello Arnout, the current patch serie winds up in "numpy.distutils.npy_pkg_config.PkgNotFound: Could not find file(s) ['npymath.ini']" I managed to have setuptools locate npymath.ini by pointing to its parent folder like this. I noticed your python-numpy.mk rework puts a double "//" in npymath.ini path, but that does not seem to impact negatively. Then, build almost passes, but fails when -lnpyrandom gets used, producing errors like: arm-buildroot-linux-gnueabihf/bin/ld: output/host/lib/python3.10/site-packages/numpy/random/lib/libnpyrandom.a: error adding symbols: file format not recognized -lnpyrandom resolves to /host/lib instead of /staging/usr/lib, which I 'solve' by prepending the correct location to the LDPATH so it gets picked up first. Signed-off-by: Guillaume W. Bres --- 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 | 62 ++++++++++++++++++++++++++ 5 files changed, 104 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 ac702d8d0f..c8766c872e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1149,6 +1149,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 @@ -1280,6 +1281,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 10209d84d7..0edde1c919 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1209,6 +1209,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..2fbd4316f3 --- /dev/null +++ b/package/python-scipy/python-scipy.mk @@ -0,0 +1,62 @@ +################################################################################ +# +# 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 + +# -lnpymath npymath.ini localization +PYTHON_SCIPY_NPY_PKG_CONFIG_PATH = \ + $(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/numpy/core/lib/npy-pkg-config + +PYTHON_SCIPY_LDFLAGS = $(TARGET_LDFLAGS) -shared \ + -L$(PYTHON3_PATH)/site-packages/numpy/core/lib +# -lnpyrandom localization +PYTHON_SCIPY_LDFLAGS += \ + -L$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/numpy/random/lib + +PYTHON_SCIPY_ENV = \ + F90=$(TARGET_FC) \ + NPY_PKG_CONFIG_PATH=$(PYTHON_SCIPY_NPY_PKG_CONFIG_PATH) \ + LDFLAGS="$(PYTHON_SCIPY_LDFLAGS)" + +# 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.20.1 From guillaume.bressaix at gmail.com Sat Feb 19 17:02:07 2022 From: guillaume.bressaix at gmail.com (Guillaume W. Bres) Date: Sat, 19 Feb 2022 18:02:07 +0100 Subject: [Buildroot] [PATCH v2 1/4] package/python-gast: new host-only package Message-ID: <20220219170210.11691-1-guillaume.bressaix@gmail.com> From: "Arnout Vandecappelle (Essensium/Mind)" Generated with scanpypi and converted to host. It is a dependency of python-beniget and python-pythran. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Guillaume W. Bres --- 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.20.1 From guillaume.bressaix at gmail.com Sat Feb 19 17:02:08 2022 From: guillaume.bressaix at gmail.com (Guillaume W. Bres) Date: Sat, 19 Feb 2022 18:02:08 +0100 Subject: [Buildroot] [PATCH v2 2/4] package/python-beniget: new host-only package In-Reply-To: <20220219170210.11691-1-guillaume.bressaix@gmail.com> References: <20220219170210.11691-1-guillaume.bressaix@gmail.com> Message-ID: <20220219170210.11691-2-guillaume.bressaix@gmail.com> From: "Arnout Vandecappelle (Essensium/Mind)" Generated with scanpypi and converted to host. It is a dependency of python-pythran. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Guillaume W. Bres --- 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.20.1 From guillaume.bressaix at gmail.com Sat Feb 19 17:02:09 2022 From: guillaume.bressaix at gmail.com (Guillaume W. Bres) Date: Sat, 19 Feb 2022 18:02:09 +0100 Subject: [Buildroot] [PATCH v2 3/4] package/python-pythran: new host-only package In-Reply-To: <20220219170210.11691-1-guillaume.bressaix@gmail.com> References: <20220219170210.11691-1-guillaume.bressaix@gmail.com> Message-ID: <20220219170210.11691-3-guillaume.bressaix@gmail.com> From: "Arnout Vandecappelle (Essensium/Mind)" Generated with scanpypi and converted to host. It is a dependency of python-scipy. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Guillaume W. Bres --- 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.20.1 From guillaume.bressaix at gmail.com Sat Feb 19 17:02:10 2022 From: guillaume.bressaix at gmail.com (Guillaume W. Bres) Date: Sat, 19 Feb 2022 18:02:10 +0100 Subject: [Buildroot] [PATCH v2 4/4] package/python-scipy: new package In-Reply-To: <20220219170210.11691-1-guillaume.bressaix@gmail.com> References: <20220219170210.11691-1-guillaume.bressaix@gmail.com> Message-ID: <20220219170210.11691-4-guillaume.bressaix@gmail.com> 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) [Guillaume: - -lnpymath: npymath.ini localization problem - -lnpyrandom resolution problem ] Signed-off-by: Guillaume W. Bres --- Hello Arnout, the current patch serie winds up in "numpy.distutils.npy_pkg_config.PkgNotFound: Could not find file(s) ['npymath.ini']" I managed to have setuptools locate npymath.ini by pointing to its parent folder like this. I noticed your python-numpy.mk rework puts a double "//" in npymath.ini path, but that does not seem to impact negatively. Then, build almost passes, but fails when -lnpyrandom gets used, producing errors like: arm-buildroot-linux-gnueabihf/bin/ld: output/host/lib/python3.10/site-packages/numpy/random/lib/libnpyrandom.a: error adding symbols: file format not recognized it looks like -lnpyrandom points to /host/lib instead of /staging/usr/lib, which I 'solve' by prepending the correct location to the LDPATH so it gets picked up first. Signed-off-by: Guillaume W. Bres --- 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 | 62 ++++++++++++++++++++++++++ 5 files changed, 104 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 ac702d8d0f..c8766c872e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1149,6 +1149,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 @@ -1280,6 +1281,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 10209d84d7..0edde1c919 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1209,6 +1209,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..2fbd4316f3 --- /dev/null +++ b/package/python-scipy/python-scipy.mk @@ -0,0 +1,62 @@ +################################################################################ +# +# 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 + +# -lnpymath npymath.ini localization +PYTHON_SCIPY_NPY_PKG_CONFIG_PATH = \ + $(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/numpy/core/lib/npy-pkg-config + +PYTHON_SCIPY_LDFLAGS = $(TARGET_LDFLAGS) -shared \ + -L$(PYTHON3_PATH)/site-packages/numpy/core/lib +# -lnpyrandom localization +PYTHON_SCIPY_LDFLAGS += \ + -L$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/numpy/random/lib + +PYTHON_SCIPY_ENV = \ + F90=$(TARGET_FC) \ + NPY_PKG_CONFIG_PATH=$(PYTHON_SCIPY_NPY_PKG_CONFIG_PATH) \ + LDFLAGS="$(PYTHON_SCIPY_LDFLAGS)" + +# 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.20.1 From fontaine.fabrice at gmail.com Sat Feb 19 17:05:09 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 19 Feb 2022 18:05:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/lxc: bump to version 4.0.11 In-Reply-To: <4429b2e9-f78b-30e6-849a-c1567ea83e12@gmail.com> References: <20220101225906.2341845-1-fontaine.fabrice@gmail.com> <87bl0t1a9o.fsf@gmail.com> <114f25cd-b392-fbde-ce20-eef87447f1c0@gmail.com> <4429b2e9-f78b-30e6-849a-c1567ea83e12@gmail.com> Message-ID: Le sam. 19 f?vr. 2022 ? 17:43, Romain Naour a ?crit : > > Hello Fabrice, > > Le 19/02/2022 ? 16:20, Fabrice Fontaine a ?crit : > > Hello, > > > > Le sam. 19 f?vr. 2022 ? 10:20, Romain Naour a ?crit : > >> > >> Hello, > >> > >> Le 30/01/2022 ? 17:36, Romain Naour a ?crit : > >>> 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? > >> > >> ping. > > How can I reproduce the problem locally so I can open a bug on > > https://github.com/lxc/lxc/issues? > > I tried to launch run-tests from current master but it is "stuck" in > > "Building done": > > > > ./support/testing/run-tests -o test-output/ -d test-dl/ -k > > --timeout-multiplier 10 tests.package.test_lxc.TestLxc > > 15:36:35 TestLxc Starting > > 15:36:35 TestLxc Building > > 15:51:04 TestLxc Building done > > > > So I opened test-output/TestLxc-run.log and found out a kernel panic: > > > > Kernel panic - not syncing: No working init found. Try passing init= > > option to kernel. See Linux Documentation/admin-guide/init.rst for > > guidance > > > > I assume that qemu is not able to start the kernel. > > Do you have some advice on what could go wrong? > > Weird, can you check your qemu version ? I'm on qemu 6.2.0. > > I'm using qemu 6.1.0 from Fedora 35 and also tested qemu 5.2.0 from Debian 11. > > If it still not working, you should be able to reproduce using the Docker image > used in gitlab-ci. See utils/docker-run. OK, I'll try it. > > Best regards, > Romain > > > >> > >> Best regards, > >> Romain > >> > >>> > >>> 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 > >>>> > >>> > >> > > Best Regards, > > > > Fabrice > Best Regards, Fabrice From guillaume.bressaix at gmail.com Sat Feb 19 18:15:54 2022 From: guillaume.bressaix at gmail.com (Guillaume W. Bres) Date: Sat, 19 Feb 2022 19:15:54 +0100 Subject: [Buildroot] [PATCH] package/python-joblib: new host-only package Message-ID: <20220219181554.32204-1-guillaume.bressaix@gmail.com> Joblib is a set of tools to provide lightweight pipelining in Python Signed-off-by: Guillaume W. Bres --- host-python-joblib is a requirement of python-scikitlearn, which first requires the current python-scipy work to be merged. --- DEVELOPERS | 1 + package/python-joblib/python-joblib.hash | 3 +++ package/python-joblib/python-joblib.mk | 13 +++++++++++++ 3 files changed, 17 insertions(+) create mode 100644 package/python-joblib/python-joblib.hash create mode 100644 package/python-joblib/python-joblib.mk diff --git a/DEVELOPERS b/DEVELOPERS index ac702d8d0f..ca2e6e81e7 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1148,6 +1148,7 @@ F: package/libnids/ F: package/libxcrypt/ F: package/liquid-dsp/ F: package/pixiewps/ +F: package/python-joblib/ F: package/python-pybind/ F: package/reaver/ F: support/testing/tests/package/br2-external/python-pybind diff --git a/package/python-joblib/python-joblib.hash b/package/python-joblib/python-joblib.hash new file mode 100644 index 0000000000..5023ba872c --- /dev/null +++ b/package/python-joblib/python-joblib.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 4cda464ca712a4814849c9477d7551b696ce215dc05d79fc516460814ef48f4f python-joblib-1.1.0.tar.gz +sha256 42612911c1872c5e4b43f6ae0e8ee59467cd350332241cf72ce90640264fae6a LICENSE.txt diff --git a/package/python-joblib/python-joblib.mk b/package/python-joblib/python-joblib.mk new file mode 100644 index 0000000000..27289a0a2e --- /dev/null +++ b/package/python-joblib/python-joblib.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# python-joblib +# +################################################################################ + +PYTHON_JOBLIB_VERSION = 1.1.0 +PYTHON_JOBLIB_SITE = $(call github,joblib,joblib,$(PYTHON_JOBLIB_VERSION)) +PYTHON_JOBLIB_LICENSE = BSD-3-Clause +PYTHON_JOBLIB_LICENSE_FILES = LICENSE.txt +PYTHON_JOBLIB_SETUP_TYPE = setuptools + +$(eval $(host-python-package)) -- 2.20.1 From guillaume.bressaix at gmail.com Sat Feb 19 18:22:24 2022 From: guillaume.bressaix at gmail.com (Guillaume W. Bres) Date: Sat, 19 Feb 2022 19:22:24 +0100 Subject: [Buildroot] [PATCH] package/python-threadpoolctl: new host-only package Message-ID: <20220219182224.3397-1-guillaume.bressaix@gmail.com> Tool to limit the number of threads used in the threadpool-backed of common native libraries used for scientific computing (e.g. BLAS and OpenMP). Signed-off-by: Guillaume W. Bres --- host-python-threadpoolctl is a requirement for python-scikitlearn, which first requires the current python-scipy work to be merged Signed-off-by: Guillaume W. Bres --- DEVELOPERS | 1 + .../python-threadpoolctl.hash | 3 +++ .../python-threadpoolctl.mk | 22 +++++++++++++++++++ 3 files changed, 26 insertions(+) create mode 100644 package/python-threadpoolctl/python-threadpoolctl.hash create mode 100644 package/python-threadpoolctl/python-threadpoolctl.mk diff --git a/DEVELOPERS b/DEVELOPERS index ac702d8d0f..53ebdbe760 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1149,6 +1149,7 @@ F: package/libxcrypt/ F: package/liquid-dsp/ F: package/pixiewps/ F: package/python-pybind/ +F: package/python-threadpoolctl/ F: package/reaver/ F: support/testing/tests/package/br2-external/python-pybind F: support/testing/tests/package/sample_python_pybind.py diff --git a/package/python-threadpoolctl/python-threadpoolctl.hash b/package/python-threadpoolctl/python-threadpoolctl.hash new file mode 100644 index 0000000000..6b6fa72443 --- /dev/null +++ b/package/python-threadpoolctl/python-threadpoolctl.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 449b806f9147a3cf28ed7ec6389dbff9c450331d695873ab75dea79fe661f1e7 python-threadpoolctl-3.1.0.tar.gz +sha256 81ac619075248b06e53660b652d10e485f4675f5d0ae0f97ea22370da1f7e23b LICENSE diff --git a/package/python-threadpoolctl/python-threadpoolctl.mk b/package/python-threadpoolctl/python-threadpoolctl.mk new file mode 100644 index 0000000000..fc1305ad86 --- /dev/null +++ b/package/python-threadpoolctl/python-threadpoolctl.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# python-threadpoolctl +# +################################################################################ + +PYTHON_THREADPOOLCTL_VERSION = 3.1.0 +PYTHON_THREADPOOLCTL_SITE = $(call github,joblib,threadpoolctl,$(PYTHON_THREADPOOLCTL_VERSION),$(PYTHON_THREADPOOLCTL_VERSION).tar.gz) +PYTHON_THREADPOOLCTL_LICENSE = BSD-3-Clause +PYTHON_THREADPOOLCTL_LICENSE_FILES = LICENSE + +# threadpoolctl is originally built using 'flit' which +# simply symlinks $(@)/threadpoolctl.py to site-packages +define PYTHON_THREADPOOLCTL_BUILD_CMDS +endef + +define PYTHON_THREADPOOLCTL_INSTALL_CMDS + ln -sf $(@)/threadpoolctl.py \ + $(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/threadpoolctl.py +endef + +$(eval $(host-generic-package)) -- 2.20.1 From giulio.benetti at benettiengineering.com Sat Feb 19 21:01:51 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 19 Feb 2022 22:01:51 +0100 Subject: [Buildroot] Buildroot Failure 2022-02-16 02:25:21 In-Reply-To: References: Message-ID: Hi Peter, +Cc BR ML, On 19/02/22 17:01, Peter Thompson wrote: > Hi Giulio, > > When I compared the most recent buildroot via "git clone" and compared > it to the "build in cba34..." I noticed the difference in > package/sdl2_ttf/ sdl2_ttf.mk . ? But I could not > find the commit in https://patchwork.ozlabs.org/project/buildroot/ > where that was > changed. Pathchwork deals with patches, while you find commits in the git Repository: https://git.buildroot.net/buildroot/log/ > ? I looked for the title package/sdl2_ttf and did not see it? > > Is there an easy way to search patchwork without going through line by > line???? I do not have pwclient installed - should I? You can still use patchwork itself: 1) click on "Show patches with:" 2) use package name as "Search", so sdl2_ttf 3) set State as "any" 4) set Archived as Both That way you will see all the patches, the New, Accepted, Superseded and Reject. Another method would be by checking Buildroot Repository itself. You can: $ cd buildroot/ $ git log --grep=sdl2_ttf or since you already know the package: $ git log package/sdl2_ttf or also: $ gitk package/sdl2_ttf That will give you the idea of what is really applied. Or yes, you can use pwclient, but that and patchwork are really patch oriented. Here what you need is to check if the fix is already committed, so I(at least) would go for using git most of all. Best regards -- Giulio Benetti Benetti Engineering sas > Thanks so much for your patience and help. > > Peter > > > On Sat, Feb 19, 2022 at 4:54 AM Giulio Benetti > > wrote: > > Yes, but probably has been already fixed. > Anyway now you know the entire workflow! > > Giulio > > Inviato da iPhone > >> Il giorno 19 feb 2022, alle ore 03:14, Peter Thompson >> > > ha scritto: >> >> ? >> Lots for me to work on!!!!?? Thanks so much for your help!! >> I will let you know when I have success. >> Peter >> >> On Fri, Feb 18, 2022 at 2:41 PM Giulio Benetti >> > > wrote: >> >> Hi Peter, >> >> I add ML in Cc, >> >>> Il giorno 18 feb 2022, alle ore 20:03, Peter Thompson >>> >> > ha scritto: >>> >>> ? >>> Hi? Giulio >>> >>> Whew - that was fast - I am back asking questions already :).... >>> >>> My bump of sdl2_ttf-2.0.15 to sdl2_ttf-2.0.18? caused an >>> autobuilder failure? 2022-02-16 02:25:21.????? The log >>> indicates the problem is? pthread.h missing when harfbuzz is >>> specified.??? See log below... >> >> Here can you please provide me the link like below? >> http://autobuild.buildroot.net/results/cba/cba34c431f8d1315e9ca9159274421a8219a701e// >> >> >>> >>> Not sure why sdl2_ttf-2.0.15 worked before..... >> >> It seems like that between 2.0.15 to 2.0.18(maybe) >> sdl2_ttf only uses harfbuzz provided by sdl2_ttf itself. >> This means it?s skipping the one provided from Buildroot that >> is already patched for harfbuzz pthread.h issue. >> >>> Anyways, I planned to add >>> SDL2_TTF_DEPENDENCIES +=? pthread >>> right under >>> SDL2_TTF_DEPENDENCIES +=? harfbuzz >> >> I would instead try to make sdl2_ttf to choose external >> harfbuzz instead of using the internal one. And also, we?re >> not sure that phtread.h is not provided at all. >> Sometimes build systems fail to recognize headers and libs(the >> way they check if a library does exist or not). >> >>> >>> But I am having trouble testing. ? When I submit >>> ?./autobuild ? 91f241b8e96?? ( I assume SHA1 is the git id = >>> commit id) >>> I get >>> 404 Error Cannot get configuration for build 91f/91f241b8 >>> Suggestions? >> >> Here you need to pass this sha1: >> cba34c431f8d1315e9ca9159274421a8219a701e >> that is the autobuilder sha1 and not the git sha1. >> >> Take care to download the right script: >> http://git.buildroot.net/buildroot-test/plain/utils/br-reproduce-build >> >> >> Then to: >> $ chmod a+x br-reproduce-build >> Open it and adjust Buildroot path. >> Then execute it with: >> $ ./br-reproduce-build cba34c431f8d1315e9ca9159274421a8219a701e >> >> Also remember that if it fails you can: >> $ cd cba34c431f8d1315e9ca9159274421a8219a701e/output >> $ make sdl2_ttf >> or to rebuild package only: >> $ make sdl2_ttf-dirclean sdl2_ttf >> >>> >>> --- ALTERNATE IDEA --- >>> >>> A better way to fix this issue might be to fix >>> package/harfbuzz. ? It is that dependency which needs pthread >>> and which is causing sdl2_ttf to fail AFAIK. >> >> If look closer the build failure you will see that it?s not >> Buildroot harfbuzz that fails but a harfbuzz embedded into >> sdl2_ttf. >> So what I should to is to try to make sdl2_ttf drop its >> internal harfbuzz and use the Buildroot one. >> >>> I see harfbuzz is maintained by you so you are an excellent >>> person to ask. >>> >>> I checked harfbuzz and there is >>> 0001-meson.build-check-for-pthread.h.patch >>> from Nov 2020 by Fabrice Fontaine.?? Not sure if that patch >>> was applied or if it fixes my issue. >> >> That is applied and actually fixes harfbuzz build failure. But >> as explained above you?re dealing with the one embedded into >> sdl2_ttf package. >> >>> >>> Should I have copied the mailing list with these questions? >>> I am never sure. >> >> If you?re in doubt put it in Cc :-) >> >>> Anyway - thanks for being there and helping.??? It is >>> appreciated. >> >> You?re welcome! >> >> Best regards >> >> Giulio >> >>> >>> Peter >>> >>> >>> In file included from external/harfbuzz-2.8.0/src/hb.hh:470, >>> from external/harfbuzz-2.8.0/src/hb-aat-layout.cc:28: >>> external/harfbuzz-2.8.0/src/hb-mutex.hh:53:10: fatal error: pthread.h: No such file or directory >>> 53 | #include >>> | ^~~~~~~~~~~ >>> compilation terminated. >>> From giulio.benetti at benettiengineering.com Sat Feb 19 21:06:57 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 19 Feb 2022 22:06:57 +0100 Subject: [Buildroot] [PATCH v4] board/arcturus/aarch64-ucls1012a: bump u-boot and kernel version In-Reply-To: <20220218220905.87503-1-mdurrant@arcturusnetworks.com> References: <20220218220905.87503-1-mdurrant@arcturusnetworks.com> Message-ID: Hi Michael, On 18/02/22 23:09, Michael Durrant wrote: > - Bump Linux to version 5.4.137 > - Bump U-Boot to add new targets, version remains the same > - Drop BR2_ROOTFS_OVERLAY and remove S09modload script because it was only used by PFE and now PFE is loaded directly by the kernel > - Use Image.gz instead of Image to have a compressed kernel > - Rename ucls1012a.its to br2-ucls1012a.its since post-build.sh and post-image.sh use different name. This fixes the bug that didn't allow the creation of the part0-000000.itb file. Please wrap your commit log at 72th column. Give a try by auto-sending the patch to yourself and download it so you can verify commit log wraps at 72. > Signed-off-by: Oleksandr Zhadan > Signed-off-by: Michael Durrant I've built the defconfig successfully using the gitlab-CI docker and except commit log carriage return: Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti [Giulio: build tested] So please send a V5 with above correction including my tags ^^^ after your SoBs. Thank you! Best regards -- Giulio Benetti Benetti Engineering sas > --- > V1->V2: > - Bump the kernel to "Linux version 5.4.137" > - Bootloader version is still "U-Boot 2019.10" but new targets added. > - Remove the /etc/init.d/S09modload script to load the pfe firmware > module because now the pfe firmware module is loaded by the kernel > - New compressed Image.gz is used > V2->V3: > - Moved SoB to top of patch > - The use of Image.gz replace Image to force use of compression. > - Our scripts use br2-ucls1012a.its in error ucls1012a.its was used > in original readme. > - Removing extra newline > - The NXP Packet Forward Engine (PFE) firmware loader was the only > file used in the overlay. As the PFE is now loaded directly by > the kernel the BR2_ROOTFS_OVERLAY script has been removed. > V3->V4: > - Improved commit log by listing all the changed as suggested by Giulio. > - Updated header version comment in defconfig to reflect 5.4 series. > --- > board/arcturus/aarch64-ucls1012a/post-build.sh | 1 - > board/arcturus/aarch64-ucls1012a/readme.txt | 4 ++-- > .../rootfs_overlay/etc/init.d/S09modload | 14 -------------- > configs/arcturus_ucls1012a_defconfig | 10 +++++----- > 4 files changed, 7 insertions(+), 22 deletions(-) > delete mode 100755 board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload > > diff --git a/board/arcturus/aarch64-ucls1012a/post-build.sh b/board/arcturus/aarch64-ucls1012a/post-build.sh > index f8ba78095f..372df59c61 100755 > --- a/board/arcturus/aarch64-ucls1012a/post-build.sh > +++ b/board/arcturus/aarch64-ucls1012a/post-build.sh > @@ -1,5 +1,4 @@ > #!/bin/sh > > mkdir -p ${TARGET_DIR}/lib/firmware > -cp -f ${BUILD_DIR}/linux-custom/firmware/ppfe/* ${TARGET_DIR}/lib/firmware/ > cp -f ${BUILD_DIR}/linux-custom/br2-ucls1012a.its ${BINARIES_DIR}/ > diff --git a/board/arcturus/aarch64-ucls1012a/readme.txt b/board/arcturus/aarch64-ucls1012a/readme.txt > index 483d5e9aef..b486ecebc7 100644 > --- a/board/arcturus/aarch64-ucls1012a/readme.txt > +++ b/board/arcturus/aarch64-ucls1012a/readme.txt > @@ -24,13 +24,13 @@ After building, you should obtain this tree: > > output/images/ > +-- arc-ucls1012a.dtb > - +-- Image > + +-- Image.gz > +-- part0-000000.itb > +-- rootfs.cpio > +-- rootfs.cpio.gz > +-- rootfs.tar > +-- u-boot.bin > - +-- ucls1012a.its > + +-- br2-ucls1012a.its > > Flashing > -------- > diff --git a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload b/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload > deleted file mode 100755 > index c87ffda14f..0000000000 > --- a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload > +++ /dev/null > @@ -1,14 +0,0 @@ > -#!/bin/sh > -# > -case "$1" in > - start) > - modprobe pfe > - ;; > - stop) > - ;; > - restart|reload) > - ;; > - *) > - echo "Usage: $0 {start|stop|restart}" > - exit 1 > -esac > diff --git a/configs/arcturus_ucls1012a_defconfig b/configs/arcturus_ucls1012a_defconfig > index fd33ebf1f6..124cc3ff94 100644 > --- a/configs/arcturus_ucls1012a_defconfig > +++ b/configs/arcturus_ucls1012a_defconfig > @@ -1,22 +1,22 @@ > # Architecture > BR2_aarch64=y > > -# Linux headers same as kernel, a 4.14 series > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y > +# Linux headers same as kernel, a 5.4 series > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y > > # System settings > BR2_TARGET_GENERIC_HOSTNAME="ucls1012a" > BR2_TARGET_GENERIC_ISSUE="Welcome to uCLS1012A-SOM" > BR2_SYSTEM_DHCP="eth0" > -BR2_ROOTFS_OVERLAY="board/arcturus/aarch64-ucls1012a/rootfs_overlay" > BR2_ROOTFS_POST_BUILD_SCRIPT="board/arcturus/aarch64-ucls1012a/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/arcturus/aarch64-ucls1012a/post-image.sh" > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-kernel,v.20.31)/linux-v.20.31.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-kernel,v.22.06)/linux-v.22.06.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="ucls1012a" > +BR2_LINUX_KERNEL_IMAGEGZ=y > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="arcturus/arc-ucls1012a" > > @@ -28,7 +28,7 @@ BR2_TARGET_ROOTFS_CPIO_GZIP=y > BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > BR2_TARGET_UBOOT_CUSTOM_TARBALL=y > -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-uboot,v.20.31)/uboot-v.20.31.tar.gz" > +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-uboot,v.22.06)/uboot-v.22.06.tar.gz" > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="UCLS1012A_QSPI128" > > # Tools From giulio.benetti at benettiengineering.com Sat Feb 19 21:22:11 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 19 Feb 2022 22:22:11 +0100 Subject: [Buildroot] [PATCH v2] manual: board support: add instructions to test defconfig in the official docker Message-ID: <20220219212211.1304441-1-giulio.benetti@benettiengineering.com> Sometimes new boards have not been tested with official docker so let's add instructions to do it with utils/docker-run. Cc: Luca Ceresoli Signed-off-by: Giulio Benetti --- V1->V2: * use the available utils/docker-run * improve explanation as suggested by Luca Ceresoli --- docs/manual/adding-board-support.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/manual/adding-board-support.txt b/docs/manual/adding-board-support.txt index 33ed709535..074bab7a00 100644 --- a/docs/manual/adding-board-support.txt +++ b/docs/manual/adding-board-support.txt @@ -46,3 +46,11 @@ create a directory +board/+ and a subdirectory +board//+. You can then store your patches and configurations in these directories, and reference them from the main Buildroot configuration. Refer to xref:customize[] for more details. + +Before submitting patches for new boards it is recommended to test it by +building it using latest gitlab-CI docker container. To do this use +utils/docker-run script and inside it hint: +-------------------- + $ make +_defconfig+ + $ make +-------------------- -- 2.25.1 From Noreply at busybox.net Sun Feb 20 09:31:11 2022 From: Noreply at busybox.net (Noreply at busybox.net) Date: 20 Feb 2022 10:31:11 +0100 Subject: [Buildroot] ACCOUNT WARNING: Undelivered mails buildroot@busybox.net Kindly rectify Message-ID: <20220220103111.5E6E1013DC71A87C@busybox.net> An HTML attachment was scrubbed... URL: From yann.morin.1998 at free.fr Sun Feb 20 09:52:44 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 20 Feb 2022 10:52:44 +0100 Subject: [Buildroot] [git commit] package/expat: fix tarball sha256 Message-ID: <20220220094533.624C9812FE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=59a813d2a884c2eb247d9695089375b56751b6d5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit ab71ac15ddd7ed6a8ca83cbc23ea0b0cbb343f0f forgot to update sha256 Signed-off-by: Fabrice Fontaine [yann.morin.1998 at free.fr: update hash for real ;-)] Signed-off-by: Yann E. MORIN --- package/expat/expat.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index 3129801668..10e13206d0 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -3,5 +3,5 @@ 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 From yann.morin.1998 at free.fr Sun Feb 20 09:54:58 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 20 Feb 2022 10:54:58 +0100 Subject: [Buildroot] [PATCH 1/2] package/expat: fix tarball sha256 In-Reply-To: <20220219122831.2961097-1-fontaine.fabrice@gmail.com> References: <20220219122831.2961097-1-fontaine.fabrice@gmail.com> Message-ID: <20220220095458.GP522310@scaer> Fabrice, All, On 2022-02-19 13:28 +0100, Fabrice Fontaine spake thusly: > Commit ab71ac15ddd7ed6a8ca83cbc23ea0b0cbb343f0f forgot to update sha256 > > Signed-off-by: Fabrice Fontaine > --- > package/expat/expat.hash | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/expat/expat.hash b/package/expat/expat.hash > index 3129801668..a6f43af291 100644 > --- a/package/expat/expat.hash > +++ b/package/expat/expat.hash > @@ -3,5 +3,5 @@ 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 b1f9f1b1a5ebb0acaa88c9ff79bfa4e145823b78aa5185e5c5d85f060824778a expat-2.4.4.tar.xz ... and so it seems you akso forgot to update the hash. ;-) Applied to master with the hash fixed for real, thanks. Regards, Yann E. MORIN. > sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec 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 Sun Feb 20 09:54:38 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 20 Feb 2022 10:54:38 +0100 Subject: [Buildroot] [git commit] package/expat: security bump to version 2.4.5 Message-ID: <20220220094754.DBB0B82DFB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=21c07c0aaa7e43b8f676c564f173a510d345a77a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Security fixes: #562 CVE-2022-25235 -- Passing malformed 2- and 3-byte UTF-8 sequences (e.g. from start tag names) to the XML processing application on top of Expat can cause arbitrary damage (e.g. code execution) depending on how invalid UTF-8 is handled inside the XML processor; validation was not their job but Expat's. Exploits with code execution are known to exist. #561 CVE-2022-25236 -- Passing (one or more) namespace separator characters in "xmlns[:prefix]" attribute values made Expat send malformed tag names to the XML processor on top of Expat which can cause arbitrary damage (e.g. code execution) depending on such unexpectable cases are handled inside the XML processor; validation was not their job but Expat's. Exploits with code execution are known to exist. #558 CVE-2022-25313 -- Fix stack exhaustion in doctype parsing that could be triggered by e.g. a 2 megabytes file with a large number of opening braces. Expected impact is denial of service or potentially arbitrary code execution. #560 CVE-2022-25314 -- Fix integer overflow in function copyString; only affects the encoding name parameter at parser creation time which is often hardcoded (rather than user input), takes a value in the gigabytes to trigger, and a 64-bit machine. Expected impact is denial of service. #559 CVE-2022-25315 -- Fix integer overflow in function storeRawNames; needs input in the gigabytes and a 64-bit machine. Expected impact is denial of service or potentially arbitrary code execution. https://blog.hartwork.org/posts/expat-2-4-5-released/ https://github.com/libexpat/libexpat/blob/R_2_4_5/expat/Changes Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- 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 10e13206d0..cd2e8c7fb9 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.4/ -md5 a712d23b7afb32e7527cf0b3fd8f12ac expat-2.4.4.tar.xz -sha1 6028b04d3505fc519c4c7c6bd67e1ad1a08cd7b6 expat-2.4.4.tar.xz +# From https://sourceforge.net/projects/expat/files/expat/2.4.5/ +md5 9dc183e6c1eebc1b658c1e71be0885e1 expat-2.4.5.tar.xz +sha1 360a49b55c442e91cb7b328bc0335083909ddf4f expat-2.4.5.tar.xz # Locally calculated -sha256 b5d25d6e373351c2ed19b562b4732d01d2589ac8c8e9e7962d8df1207cc311b8 expat-2.4.4.tar.xz +sha256 f2af8fc7cdc63a87920da38cd6d12cb113c3c3a3f437495b1b6541e0cff32579 expat-2.4.5.tar.xz sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec COPYING diff --git a/package/expat/expat.mk b/package/expat/expat.mk index 250600c25e..7815d61027 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.4.4 +EXPAT_VERSION = 2.4.5 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz EXPAT_INSTALL_STAGING = YES From yann.morin.1998 at free.fr Sun Feb 20 09:55:54 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 20 Feb 2022 10:55:54 +0100 Subject: [Buildroot] [PATCH 2/2] package/expat: security bump to version 2.4.5 In-Reply-To: <20220219122831.2961097-2-fontaine.fabrice@gmail.com> References: <20220219122831.2961097-1-fontaine.fabrice@gmail.com> <20220219122831.2961097-2-fontaine.fabrice@gmail.com> Message-ID: <20220220095554.GQ522310@scaer> Fabrice, All, On 2022-02-19 13:28 +0100, Fabrice Fontaine spake thusly: > Security fixes: > #562 CVE-2022-25235 -- Passing malformed 2- and 3-byte UTF-8 > sequences (e.g. from start tag names) to the XML > processing application on top of Expat can cause > arbitrary damage (e.g. code execution) depending > on how invalid UTF-8 is handled inside the XML > processor; validation was not their job but Expat's. > Exploits with code execution are known to exist. > #561 CVE-2022-25236 -- Passing (one or more) namespace separator > characters in "xmlns[:prefix]" attribute values > made Expat send malformed tag names to the XML > processor on top of Expat which can cause > arbitrary damage (e.g. code execution) depending > on such unexpectable cases are handled inside the XML > processor; validation was not their job but Expat's. > Exploits with code execution are known to exist. > #558 CVE-2022-25313 -- Fix stack exhaustion in doctype parsing > that could be triggered by e.g. a 2 megabytes > file with a large number of opening braces. > Expected impact is denial of service or potentially > arbitrary code execution. > #560 CVE-2022-25314 -- Fix integer overflow in function copyString; > only affects the encoding name parameter at parser creation > time which is often hardcoded (rather than user input), > takes a value in the gigabytes to trigger, and a 64-bit > machine. Expected impact is denial of service. > #559 CVE-2022-25315 -- Fix integer overflow in function storeRawNames; > needs input in the gigabytes and a 64-bit machine. > Expected impact is denial of service or potentially > arbitrary code execution. > > https://blog.hartwork.org/posts/expat-2-4-5-released/ > https://github.com/libexpat/libexpat/blob/R_2_4_5/expat/Changes > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > 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 a6f43af291..cd2e8c7fb9 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.4/ > -md5 a712d23b7afb32e7527cf0b3fd8f12ac expat-2.4.4.tar.xz > -sha1 6028b04d3505fc519c4c7c6bd67e1ad1a08cd7b6 expat-2.4.4.tar.xz > +# From https://sourceforge.net/projects/expat/files/expat/2.4.5/ > +md5 9dc183e6c1eebc1b658c1e71be0885e1 expat-2.4.5.tar.xz > +sha1 360a49b55c442e91cb7b328bc0335083909ddf4f expat-2.4.5.tar.xz > > # Locally calculated > -sha256 b1f9f1b1a5ebb0acaa88c9ff79bfa4e145823b78aa5185e5c5d85f060824778a expat-2.4.4.tar.xz > +sha256 f2af8fc7cdc63a87920da38cd6d12cb113c3c3a3f437495b1b6541e0cff32579 expat-2.4.5.tar.xz > sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec COPYING > diff --git a/package/expat/expat.mk b/package/expat/expat.mk > index 250600c25e..7815d61027 100644 > --- a/package/expat/expat.mk > +++ b/package/expat/expat.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -EXPAT_VERSION = 2.4.4 > +EXPAT_VERSION = 2.4.5 > 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 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Feb 20 09:59:17 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 20 Feb 2022 10:59:17 +0100 Subject: [Buildroot] [git commit] package/dovecot-pigeonhole: drop DOVECOT_PIGEONHOLE_FIXUP_DOVECOT_CONFIG Message-ID: <20220220095315.3102781DD5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e0a0b8d233b86a7c1a197345936d37fce1ea22e8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop DOVECOT_PIGEONHOLE_FIXUP_DOVECOT_CONFIG added by commit 0901355c11f051846744a12f9b2044a751faa47a which is not needed since the addition of PPD_FIXUP_PATHS in commit b06294e9897e90862656416e8b67fdace15488d Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/dovecot-pigeonhole/dovecot-pigeonhole.mk | 8 -------- 1 file changed, 8 deletions(-) diff --git a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk index dd533977f4..62d9909cf5 100644 --- a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk +++ b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk @@ -15,12 +15,4 @@ DOVECOT_PIGEONHOLE_DEPENDENCIES = dovecot DOVECOT_PIGEONHOLE_CONF_OPTS = --with-dovecot=$(STAGING_DIR)/usr/lib -ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) -define DOVECOT_PIGEONHOLE_FIXUP_DOVECOT_CONFIG - $(SED) 's,$(PER_PACKAGE_DIR)/dovecot/,$(PER_PACKAGE_DIR)/dovecot-pigeonhole/,g' \ - $(STAGING_DIR)/usr/lib/dovecot-config -endef -DOVECOT_PIGEONHOLE_PRE_CONFIGURE_HOOKS = DOVECOT_PIGEONHOLE_FIXUP_DOVECOT_CONFIG -endif - $(eval $(autotools-package)) From yann.morin.1998 at free.fr Sun Feb 20 09:59:22 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 20 Feb 2022 10:59:22 +0100 Subject: [Buildroot] [git commit] package/apache: drop APACHE_FIXUP_APR_LIBTOOL Message-ID: <20220220095315.497F6833C9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0b7c22970d4fb4cf4db30e77a291ea841e2a235e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop APACHE_FIXUP_APR_LIBTOOL which was added by commit b747c29c4e8eb89b7b99658dfd34f4a6b6b0744d but is not needed since the addition of PPD_FIXUP_PATHS in commit b06294e9897e90862656416e8b67fdace15488d7 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/apache/apache.mk | 8 -------- 1 file changed, 8 deletions(-) diff --git a/package/apache/apache.mk b/package/apache/apache.mk index 5fcb887fbc..b280d4dc3a 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -19,14 +19,6 @@ APACHE_INSTALL_STAGING = YES APACHE_AUTORECONF = YES APACHE_DEPENDENCIES = apr apr-util pcre -ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) -define APACHE_FIXUP_APR_LIBTOOL - $(SED) "s@$(PER_PACKAGE_DIR)/[^/]\+/@$(PER_PACKAGE_DIR)/apache/@g" \ - $(STAGING_DIR)/usr/build-1/libtool -endef -APACHE_POST_PREPARE_HOOKS += APACHE_FIXUP_APR_LIBTOOL -endif - APACHE_CONF_ENV= \ ap_cv_void_ptr_lt_long=no \ PCRE_CONFIG=$(STAGING_DIR)/usr/bin/pcre-config From yann.morin.1998 at free.fr Sun Feb 20 09:59:20 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 20 Feb 2022 10:59:20 +0100 Subject: [Buildroot] [git commit] package/apparmor: drop APPARMOR_FIXUP_APXS Message-ID: <20220220095315.3DD3883241@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e0da90512c04f5cfcdcbe1c4a8f32e559828e0c9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop APPARMOR_FIXUP_APXS which was added by commit 3c836e54203b16015c9c52cbe007adc92d293a0d but is not needed since the addition of PPD_FIXUP_PATHS in commit b06294e9897e90862656416e8b67fdace15488d7 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/apparmor/apparmor.mk | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/package/apparmor/apparmor.mk b/package/apparmor/apparmor.mk index 6f0e59224d..43bfa05308 100644 --- a/package/apparmor/apparmor.mk +++ b/package/apparmor/apparmor.mk @@ -54,16 +54,6 @@ ifeq ($(BR2_PACKAGE_APACHE),y) APPARMOR_DEPENDENCIES += apache APPARMOR_TOOLS += changehat/mod_apparmor APPARMOR_MAKE_OPTS += APXS=$(STAGING_DIR)/usr/bin/apxs - -ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) -define APPARMOR_FIXUP_APXS - $(SED) "s@$(PER_PACKAGE_DIR)/[^/]\+/@$(PER_PACKAGE_DIR)/apparmor/@g" \ - $(STAGING_DIR)/usr/bin/apxs \ - $(STAGING_DIR)/usr/build/config_vars.mk \ - $(STAGING_DIR)/usr/build-1/libtool -endef -APPARMOR_POST_CONFIGURE_HOOKS += APPARMOR_FIXUP_APXS -endif endif define APPARMOR_BUILD_CMDS From yann.morin.1998 at free.fr Sun Feb 20 09:59:25 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 20 Feb 2022 10:59:25 +0100 Subject: [Buildroot] [git commit] package/apr-util: drop APR_UTIL_FIX_{LIBTOOL, RULES_MK} Message-ID: <20220220095315.56A2281DD5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a50c9f16edfe36c9ef4a210621b062493fdd09fd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop APR_UTIL_FIX_{LIBTOOL,RULES_MK} which were added by commit 84b4c19e551288911a230c2b73e96bc6e2ed12f9 but is not needed since the addition of PPD_FIXUP_PATHS in commit b06294e9897e90862656416e8b67fdace15488d7 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/apr-util/apr-util.mk | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/package/apr-util/apr-util.mk b/package/apr-util/apr-util.mk index f6ce7ac064..cf8407ced0 100644 --- a/package/apr-util/apr-util.mk +++ b/package/apr-util/apr-util.mk @@ -17,20 +17,6 @@ APR_UTIL_CONF_OPTS = \ --with-apr=$(STAGING_DIR)/usr/bin/apr-1-config APR_UTIL_CONFIG_SCRIPTS = apu-1-config -ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) -define APR_UTIL_FIX_LIBTOOL - $(SED) 's,$(PER_PACKAGE_DIR)/apr/,$(PER_PACKAGE_DIR)/apr-util/,g' \ - $(STAGING_DIR)/usr/build-1/libtool -endef -APR_UTIL_POST_PREPARE_HOOKS += APR_UTIL_FIX_LIBTOOL - -define APR_UTIL_FIX_RULES_MK - $(SED) 's,$(PER_PACKAGE_DIR)/apr/,$(PER_PACKAGE_DIR)/apr-util/,g' \ - $(@D)/build/rules.mk -endef -APR_UTIL_POST_CONFIGURE_HOOKS += APR_UTIL_FIX_RULES_MK -endif - # When iconv is available, then use it to provide charset conversion # features. APR_UTIL_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv) From yann.morin.1998 at free.fr Sun Feb 20 10:01:40 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 20 Feb 2022 11:01:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/dovecot-pigeonhole: drop DOVECOT_PIGEONHOLE_FIXUP_DOVECOT_CONFIG In-Reply-To: <20220219134104.3403344-1-fontaine.fabrice@gmail.com> References: <20220219134104.3403344-1-fontaine.fabrice@gmail.com> Message-ID: <20220220100140.GR522310@scaer> Fabrice, All, On 2022-02-19 14:41 +0100, Fabrice Fontaine spake thusly: > Drop DOVECOT_PIGEONHOLE_FIXUP_DOVECOT_CONFIG added by commit > 0901355c11f051846744a12f9b2044a751faa47a which is not needed since the > addition of PPD_FIXUP_PATHS in commit > b06294e9897e90862656416e8b67fdace15488d > > Signed-off-by: Fabrice Fontaine Thanks for this further cleanup! :-) Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/dovecot-pigeonhole/dovecot-pigeonhole.mk | 8 -------- > 1 file changed, 8 deletions(-) > > diff --git a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk > index dd533977f4..62d9909cf5 100644 > --- a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk > +++ b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk > @@ -15,12 +15,4 @@ DOVECOT_PIGEONHOLE_DEPENDENCIES = dovecot > > DOVECOT_PIGEONHOLE_CONF_OPTS = --with-dovecot=$(STAGING_DIR)/usr/lib > > -ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) > -define DOVECOT_PIGEONHOLE_FIXUP_DOVECOT_CONFIG > - $(SED) 's,$(PER_PACKAGE_DIR)/dovecot/,$(PER_PACKAGE_DIR)/dovecot-pigeonhole/,g' \ > - $(STAGING_DIR)/usr/lib/dovecot-config > -endef > -DOVECOT_PIGEONHOLE_PRE_CONFIGURE_HOOKS = DOVECOT_PIGEONHOLE_FIXUP_DOVECOT_CONFIG > -endif > - > $(eval $(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 Sun Feb 20 10:01:54 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 20 Feb 2022 11:01:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/apparmor: drop APPARMOR_FIXUP_APXS In-Reply-To: <20220219141922.3753289-1-fontaine.fabrice@gmail.com> References: <20220219141922.3753289-1-fontaine.fabrice@gmail.com> Message-ID: <20220220100154.GS522310@scaer> Fabrice, All, On 2022-02-19 15:19 +0100, Fabrice Fontaine spake thusly: > Drop APPARMOR_FIXUP_APXS which was added by commit > 3c836e54203b16015c9c52cbe007adc92d293a0d but is not needed since the > addition of PPD_FIXUP_PATHS in commit > b06294e9897e90862656416e8b67fdace15488d7 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/apparmor/apparmor.mk | 10 ---------- > 1 file changed, 10 deletions(-) > > diff --git a/package/apparmor/apparmor.mk b/package/apparmor/apparmor.mk > index 6f0e59224d..43bfa05308 100644 > --- a/package/apparmor/apparmor.mk > +++ b/package/apparmor/apparmor.mk > @@ -54,16 +54,6 @@ ifeq ($(BR2_PACKAGE_APACHE),y) > APPARMOR_DEPENDENCIES += apache > APPARMOR_TOOLS += changehat/mod_apparmor > APPARMOR_MAKE_OPTS += APXS=$(STAGING_DIR)/usr/bin/apxs > - > -ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) > -define APPARMOR_FIXUP_APXS > - $(SED) "s@$(PER_PACKAGE_DIR)/[^/]\+/@$(PER_PACKAGE_DIR)/apparmor/@g" \ > - $(STAGING_DIR)/usr/bin/apxs \ > - $(STAGING_DIR)/usr/build/config_vars.mk \ > - $(STAGING_DIR)/usr/build-1/libtool > -endef > -APPARMOR_POST_CONFIGURE_HOOKS += APPARMOR_FIXUP_APXS > -endif > endif > > define APPARMOR_BUILD_CMDS > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Feb 20 10:02:06 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 20 Feb 2022 11:02:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/apache: drop APACHE_FIXUP_APR_LIBTOOL In-Reply-To: <20220219142027.3753330-1-fontaine.fabrice@gmail.com> References: <20220219142027.3753330-1-fontaine.fabrice@gmail.com> Message-ID: <20220220100206.GT522310@scaer> Fabrice, All, On 2022-02-19 15:20 +0100, Fabrice Fontaine spake thusly: > Drop APACHE_FIXUP_APR_LIBTOOL which was added by commit > b747c29c4e8eb89b7b99658dfd34f4a6b6b0744d but is not needed since the > addition of PPD_FIXUP_PATHS in commit > b06294e9897e90862656416e8b67fdace15488d7 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/apache/apache.mk | 8 -------- > 1 file changed, 8 deletions(-) > > diff --git a/package/apache/apache.mk b/package/apache/apache.mk > index 5fcb887fbc..b280d4dc3a 100644 > --- a/package/apache/apache.mk > +++ b/package/apache/apache.mk > @@ -19,14 +19,6 @@ APACHE_INSTALL_STAGING = YES > APACHE_AUTORECONF = YES > APACHE_DEPENDENCIES = apr apr-util pcre > > -ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) > -define APACHE_FIXUP_APR_LIBTOOL > - $(SED) "s@$(PER_PACKAGE_DIR)/[^/]\+/@$(PER_PACKAGE_DIR)/apache/@g" \ > - $(STAGING_DIR)/usr/build-1/libtool > -endef > -APACHE_POST_PREPARE_HOOKS += APACHE_FIXUP_APR_LIBTOOL > -endif > - > APACHE_CONF_ENV= \ > ap_cv_void_ptr_lt_long=no \ > PCRE_CONFIG=$(STAGING_DIR)/usr/bin/pcre-config > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Feb 20 10:08:46 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 20 Feb 2022 11:08:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/apr-util: drop APR_UTIL_FIX_{LIBTOOL, RULES_MK} In-Reply-To: <20220219142104.3753374-1-fontaine.fabrice@gmail.com> References: <20220219142104.3753374-1-fontaine.fabrice@gmail.com> Message-ID: <20220220100846.GU522310@scaer> Fabrice, All, On 2022-02-19 15:21 +0100, Fabrice Fontaine spake thusly: > Drop APR_UTIL_FIX_{LIBTOOL,RULES_MK} which were added by commit > 84b4c19e551288911a230c2b73e96bc6e2ed12f9 but is not needed since the > addition of PPD_FIXUP_PATHS in commit > b06294e9897e90862656416e8b67fdace15488d7 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. There is still one occurence of a similar construct in qt5: 14 # The file "qt.conf" can be used to override the hard-coded paths that are 15 # compiled into the Qt library. We need it to make "qmake" relocatable and 16 # tweak the per-package install pathes 17 define QT5_INSTALL_QT_CONF 18 ? rm -f $(HOST_DIR)/bin/qt.conf 19 ? sed -e "s|@@HOST_DIR@@|$(HOST_DIR)|" -e "s|@@STAGING_DIR@@|$(STAGING_DIR)|" \ 20 ? ? $(QT5BASE_PKGDIR)/qt.conf.in > $(HOST_DIR)/bin/qt.conf 21 endef 22 23 ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) 24 define QT5_QT_CONF_FIXUP 25 ? $(QT5_INSTALL_QT_CONF) 26 endef 27 endif The generic fixup scans $(HOST_DIR), so it should hit this file too, no? QT5_QT_CONF_FIXUP is used in two locations: - pkg-qmake.mk -> as a post-preapare hook, which is exactly where the generic fixup runs too, so QT5_QT_CONF_FIXUP should be a no-op (well, it does run before the generic one). - python-pyqt5.mk -> as a pre-configure hook, which is incorrect becaused it will assign that file to that package, and anyway the generic fixup hook has already been run anyway, so this should be a no-op. Care tp have a look, please? Regards, Yann E. MORIN. > --- > package/apr-util/apr-util.mk | 14 -------------- > 1 file changed, 14 deletions(-) > > diff --git a/package/apr-util/apr-util.mk b/package/apr-util/apr-util.mk > index f6ce7ac064..cf8407ced0 100644 > --- a/package/apr-util/apr-util.mk > +++ b/package/apr-util/apr-util.mk > @@ -17,20 +17,6 @@ APR_UTIL_CONF_OPTS = \ > --with-apr=$(STAGING_DIR)/usr/bin/apr-1-config > APR_UTIL_CONFIG_SCRIPTS = apu-1-config > > -ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) > -define APR_UTIL_FIX_LIBTOOL > - $(SED) 's,$(PER_PACKAGE_DIR)/apr/,$(PER_PACKAGE_DIR)/apr-util/,g' \ > - $(STAGING_DIR)/usr/build-1/libtool > -endef > -APR_UTIL_POST_PREPARE_HOOKS += APR_UTIL_FIX_LIBTOOL > - > -define APR_UTIL_FIX_RULES_MK > - $(SED) 's,$(PER_PACKAGE_DIR)/apr/,$(PER_PACKAGE_DIR)/apr-util/,g' \ > - $(@D)/build/rules.mk > -endef > -APR_UTIL_POST_CONFIGURE_HOOKS += APR_UTIL_FIX_RULES_MK > -endif > - > # When iconv is available, then use it to provide charset conversion > # features. > APR_UTIL_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv) > -- > 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 mohd.faiz.rohani at gmail.com Sun Feb 20 10:57:20 2022 From: mohd.faiz.rohani at gmail.com (Mohd Faiz Rohani) Date: Sun, 20 Feb 2022 18:57:20 +0800 Subject: [Buildroot] Issue with login Message-ID: Hi guys, I managed to compile with success the Uboot(U-Boot 2019.04), Linux kernel(4.4.155)and root file system(systemd 249) using the Buildroot-2021.11.1. It was able to boot successfully until the login prompt. However, it seems like there is an error with the login prompt it does not want to enter, just looping around the login prompt after I have entered the login name (not showing the password prompt). Did anyone know about this? Thanks. -------------- next part -------------- An HTML attachment was scrubbed... URL: From yann.morin.1998 at free.fr Sun Feb 20 11:03:58 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 20 Feb 2022 12:03:58 +0100 Subject: [Buildroot] [PATCH 1/2] package/gdk-pixbuf: enable relocatable option In-Reply-To: <20220219122526.2954354-1-fontaine.fabrice@gmail.com> References: <20220219122526.2954354-1-fontaine.fabrice@gmail.com> Message-ID: <20220220110358.GV522310@scaer> Fabrice, All, On 2022-02-19 13:25 +0100, Fabrice Fontaine spake thusly: > Enable relocatable option to fix the following PPD build failure of > adwaita-icon-theme raised since commit > b06294e9897e90862656416e8b67fdace15488d7 which now correctly updates > loaders.cache: > > Can't load file: Unrecognized image file format You probably need to explain a bit more what is going here. > Fixes: > - http://autobuild.buildroot.org/results/0e00059b09b4445eaaec1030997883187c6a80d6 > > Signed-off-by: Fabrice Fontaine > --- > package/gdk-pixbuf/gdk-pixbuf.mk | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk > index cd30d450d5..7b9c9cdbda 100644 > --- a/package/gdk-pixbuf/gdk-pixbuf.mk > +++ b/package/gdk-pixbuf/gdk-pixbuf.mk > @@ -20,12 +20,14 @@ HOST_GDK_PIXBUF_DEPENDENCIES = host-libpng host-pkgconf host-libglib2 > GDK_PIXBUF_CONF_OPTS = \ > -Dgio_sniffing=false \ > -Dinstalled_tests=false \ > + -Drelocatable=true \ As far as I can understand, we do not care about the relocation for the target build, only for the host build, no? Regards, Yann E. MORIN. > -Dman=false > > HOST_GDK_PIXBUF_CONF_OPTS = \ > -Dgio_sniffing=false \ > -Dinstalled_tests=false \ > -Dintrospection=disabled \ > + -Drelocatable=true \ > -Dman=false > > ifeq ($(BR2_STATIC_LIBS),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 Feb 20 11:27:01 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 20 Feb 2022 12:27:01 +0100 Subject: [Buildroot] [PATCH 2/2] package/librsvg: fix loaders.cache In-Reply-To: <20220219122526.2954354-2-fontaine.fabrice@gmail.com> References: <20220219122526.2954354-1-fontaine.fabrice@gmail.com> <20220219122526.2954354-2-fontaine.fabrice@gmail.com> Message-ID: <20220220112701.GW522310@scaer> On 2022-02-19 13:25 +0100, Fabrice Fontaine spake thusly: > Set GDK_PIXBUF_MODULEDIR to gdk_pixbuf_moduledir before calling > gdk-pixbuf-query-loaders to build a correct loaders.cache and fix the > following PPD build failure of adwaita-icon-theme raised since commit > b06294e9897e90862656416e8b67fdace15488d7 which now correctly updates > loaders.cache: > > Can't load file: Unrecognized image file format I had a bit parsing the above... So, what you really are doing here is not "Set GDK_PIXBUF_MODULEDIR to gdk_pixbuf_moduledir", but really "Set GDK_PIXBUF_MODULEDIR to the path returned by the gdk_pixbuf_moduledir utility". And this does not explain why this is needed. Sorry for the rant to come... So, a commit log should not describe what is going on. WE can (most of the time) understand the code. Instead, a commit log should explain what the problem is, then explain why it happens, and finally explain how it is fixed. So, let's try to have a go at such a commit log (this is littered with wild guesses, adat appropriately)... package/librsvg: fix loaders.cache with per-package directories librsvg invokes the gdk-pixbuf-queryloaders, which generates a description of all the gdk-pixbuf modules; that includes paths to dlopen()ed shared libs. Those paths are absolute, so with PPD, they point to the location where the gdk-pixbuf package or where a module-provider, like librsvg, was installed. Later on, when a third-party package needs to call gdk-pibxbuf tools that need any of those modules, tose moduels won't be found because the description where they get installed will be wrong. We fix that by telling the gdk-pixbuf-queryloaders hwere to look for modules, both at configure and install time. At configure time, it tells the package to use modules from its own PPD rather tahn directly from where they were installed by gdk-pixbuf, and at install time, it [to be comp0leted, I have not been able to really understand why and what...] Could you please rework your patches with more details, especially when the fix is not obvious? Still, I'd like to thank you for this hard work; finding the issue and how to fix it was probably not very easy. So hat-off to you! ? Regards, Yann E. MORIN. > Fixes: > - http://autobuild.buildroot.org/results/0e00059b09b4445eaaec1030997883187c6a80d6 > > Signed-off-by: Fabrice Fontaine > --- > ...r-Makefile.am-set-GDK_PIXBUF_MODULED.patch | 39 +++++++++++++++++++ > package/librsvg/librsvg.mk | 2 + > 2 files changed, 41 insertions(+) > create mode 100644 package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch > > diff --git a/package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch b/package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch > new file mode 100644 > index 0000000000..94db8eb143 > --- /dev/null > +++ b/package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch > @@ -0,0 +1,39 @@ > +From 2c472bf55289ccbd7f305aa3e98d6fd70be4e3ab Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Sat, 19 Feb 2022 12:02:10 +0100 > +Subject: [PATCH] gdk-pixbuf-loader/Makefile.am: set GDK_PIXBUF_MODULEDIR > + > +Set GDK_PIXBUF_MODULEDIR to gdk_pixbuf_moduledir before calling > +gdk-pixbuf-query-loaders to build a correct gdk_pixbuf_cache_file and > +gdk-pixbuf.loaders on 'exotic' systems > + > +Signed-off-by: Fabrice Fontaine > +--- > + gdk-pixbuf-loader/Makefile.am | 4 ++-- > + 1 file changed, 2 insertions(+), 2 deletions(-) > + > +diff --git a/gdk-pixbuf-loader/Makefile.am b/gdk-pixbuf-loader/Makefile.am > +index c3493736..de1f9641 100644 > +--- a/gdk-pixbuf-loader/Makefile.am > ++++ b/gdk-pixbuf-loader/Makefile.am > +@@ -49,7 +49,7 @@ rsvg_loader_LDADD = \ > + EXTRA_rsvg_loader_DEPENDENCIES = libpixbufloader-svg.la gdk-pixbuf-loaders > + > + gdk-pixbuf-loaders: Makefile > +- $(AM_V_GEN) ( $(GDK_PIXBUF_QUERYLOADERS) ./libpixbufloader-svg.la && $(GDK_PIXBUF_QUERYLOADERS)) > gdk-pixbuf.loaders 2>/dev/null > ++ $(AM_V_GEN) ( $(GDK_PIXBUF_QUERYLOADERS) ./libpixbufloader-svg.la && GDK_PIXBUF_MODULEDIR=$(gdk_pixbuf_moduledir) $(GDK_PIXBUF_QUERYLOADERS)) > gdk-pixbuf.loaders 2>/dev/null > + > + if CROSS_COMPILING > + RUN_QUERY_LOADER_TEST=false > +@@ -68,7 +68,7 @@ endif > + install-data-hook: > + @if $(RUN_QUERY_LOADER_TEST) ; then \ > + $(mkinstalldirs) $(DESTDIR)$(gdk_pixbuf_binarydir) ; \ > +- $(GDK_PIXBUF_QUERYLOADERS) > $(DESTDIR)$(gdk_pixbuf_cache_file) ; \ > ++ GDK_PIXBUF_MODULEDIR=$(gdk_pixbuf_moduledir) $(GDK_PIXBUF_QUERYLOADERS) > $(DESTDIR)$(gdk_pixbuf_cache_file) ; \ > + else \ > + echo "***" ; \ > + echo "*** Warning: loaders.cache not built" ; \ > +-- > +2.34.1 > + > diff --git a/package/librsvg/librsvg.mk b/package/librsvg/librsvg.mk > index e4b1942b79..07a14b4366 100644 > --- a/package/librsvg/librsvg.mk > +++ b/package/librsvg/librsvg.mk > @@ -20,6 +20,8 @@ HOST_LIBRSVG_DEPENDENCIES = host-cairo host-gdk-pixbuf host-libglib2 host-libxml > LIBRSVG_LICENSE = LGPL-2.1+ > LIBRSVG_LICENSE_FILES = COPYING.LIB > LIBRSVG_CPE_ID_VENDOR = gnome > +# We're patching gdk-pixbuf-loader/Makefile.am > +LIBRSVG_AUTORECONF = YES > > ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) > LIBRSVG_CONF_OPTS += --enable-introspection > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From giulio.benetti at benettiengineering.com Sun Feb 20 11:43:31 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 20 Feb 2022 12:43:31 +0100 Subject: [Buildroot] Issue with login In-Reply-To: References: Message-ID: <893D1C4B-6F6D-4F58-A77C-C71AFED67270@benettiengineering.com> Hi Mohd, have you used root as user? Or did you provide a user table? Giulio Inviato da iPhone > Il giorno 20 feb 2022, alle ore 11:57, Mohd Faiz Rohani ha scritto: > > ? > Hi guys, > > I managed to compile with success the Uboot(U-Boot 2019.04), Linux kernel(4.4.155)and root file system(systemd 249) using the Buildroot-2021.11.1. It was able to boot successfully until the login prompt. However, it seems like there is an error with the login prompt it does not want to enter, just looping around the login prompt after I have entered the login name (not showing the password prompt). Did anyone know about this? > > Thanks. > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From fontaine.fabrice at gmail.com Sun Feb 20 12:16:36 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 20 Feb 2022 13:16:36 +0100 Subject: [Buildroot] [PATCH v2, 1/2] package/gdk-pixbuf: enable relocatable option Message-ID: <20220220121637.200393-1-fontaine.fabrice@gmail.com> Enable relocatable option to fix the following PPD build failure of adwaita-icon-theme: Can't load file: Unrecognized image file format This failure is raised because the SVG library is not found by gtk-encode-symbolic-svg. To find the SVG library, gtk-encode-symbolic-svg depends on libgtk_pixbuf library which reads the loaders.cache file using: - a hardcoded path (which points to host-gdk-pixbuf per-package directory) if relocatable is disabled. The loaders.cache in this directory doesn't declare SVG support because it has not yet been updated by host-librsvg - or a dynamic path corresponding to the binary location if relocatable is enabled. So obviously, we need to set relocatable to true. Fixes: - http://autobuild.buildroot.org/results/0e00059b09b4445eaaec1030997883187c6a80d6 Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2 (after review of Yann E. Morin): - Drop relocatable from target - Enhance commit message package/gdk-pixbuf/gdk-pixbuf.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk index cd30d450d5..b22e9568c9 100644 --- a/package/gdk-pixbuf/gdk-pixbuf.mk +++ b/package/gdk-pixbuf/gdk-pixbuf.mk @@ -26,6 +26,7 @@ HOST_GDK_PIXBUF_CONF_OPTS = \ -Dgio_sniffing=false \ -Dinstalled_tests=false \ -Dintrospection=disabled \ + -Drelocatable=true \ -Dman=false ifeq ($(BR2_STATIC_LIBS),y) -- 2.34.1 From fontaine.fabrice at gmail.com Sun Feb 20 12:16:37 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 20 Feb 2022 13:16:37 +0100 Subject: [Buildroot] [PATCH v2, 2/2] package/librsvg: fix loaders.cache with with per-package directories In-Reply-To: <20220220121637.200393-1-fontaine.fabrice@gmail.com> References: <20220220121637.200393-1-fontaine.fabrice@gmail.com> Message-ID: <20220220121637.200393-2-fontaine.fabrice@gmail.com> host-librsvg invokes the gdk-pixbuf-queryloaders to update loaders.cache (which is originally built by host-gdk-pixbuf). loaders.cache contains the list of all the gdk-pixbuf modules; that includes paths to dlopen()ed shared libs. host-librsvg must update this file to add the path to its SVG shared library. By default, gdk-pixbuf-queryloaders uses a hardcoded path to find the installed shared libs and this path will point to the location of the host-gdk-pixbuf per-package directory. Obviously, this is wrong, the SVG library installed by host-librsvg is installed in its own per-package directory. So set GDK_PIXBUF_MODULEDIR to gdk_pixbuf_moduledir before calling gdk-pixbuf-query-loaders to build a correct loaders.cache. gdk_pixbuf_moduledir is already retrieved from host-pkgconfig in configure.ac and so will point to the correct location (thanks to PPD_FIXUP_PATHS). After this update, the loaders.cache will be correctly updated in host-librsvg per-package directory and so the loaders.cache installed in adwaita-icon-theme per-package directory will also be correct (thanks to PPD_FIXUP_PATHS). This will fix the following PPD build failure of adwaita-icon-theme: Can't load file: Unrecognized image file format Fixes: - http://autobuild.buildroot.org/results/0e00059b09b4445eaaec1030997883187c6a80d6 Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2 (after review of Yann E. Morin): - Enhance commit message - Add patch upstream status ...r-Makefile.am-set-GDK_PIXBUF_MODULED.patch | 41 +++++++++++++++++++ package/librsvg/librsvg.mk | 2 + 2 files changed, 43 insertions(+) create mode 100644 package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch diff --git a/package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch b/package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch new file mode 100644 index 0000000000..761ff92605 --- /dev/null +++ b/package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch @@ -0,0 +1,41 @@ +From 2c472bf55289ccbd7f305aa3e98d6fd70be4e3ab Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 19 Feb 2022 12:02:10 +0100 +Subject: [PATCH] gdk-pixbuf-loader/Makefile.am: set GDK_PIXBUF_MODULEDIR + +Set GDK_PIXBUF_MODULEDIR to gdk_pixbuf_moduledir before calling +gdk-pixbuf-query-loaders to build a correct gdk_pixbuf_cache_file and +gdk-pixbuf.loaders on 'exotic' systems + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/668] +--- + gdk-pixbuf-loader/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gdk-pixbuf-loader/Makefile.am b/gdk-pixbuf-loader/Makefile.am +index c3493736..de1f9641 100644 +--- a/gdk-pixbuf-loader/Makefile.am ++++ b/gdk-pixbuf-loader/Makefile.am +@@ -49,7 +49,7 @@ rsvg_loader_LDADD = \ + EXTRA_rsvg_loader_DEPENDENCIES = libpixbufloader-svg.la gdk-pixbuf-loaders + + gdk-pixbuf-loaders: Makefile +- $(AM_V_GEN) ( $(GDK_PIXBUF_QUERYLOADERS) ./libpixbufloader-svg.la && $(GDK_PIXBUF_QUERYLOADERS)) > gdk-pixbuf.loaders 2>/dev/null ++ $(AM_V_GEN) ( $(GDK_PIXBUF_QUERYLOADERS) ./libpixbufloader-svg.la && GDK_PIXBUF_MODULEDIR=$(gdk_pixbuf_moduledir) $(GDK_PIXBUF_QUERYLOADERS)) > gdk-pixbuf.loaders 2>/dev/null + + if CROSS_COMPILING + RUN_QUERY_LOADER_TEST=false +@@ -68,7 +68,7 @@ endif + install-data-hook: + @if $(RUN_QUERY_LOADER_TEST) ; then \ + $(mkinstalldirs) $(DESTDIR)$(gdk_pixbuf_binarydir) ; \ +- $(GDK_PIXBUF_QUERYLOADERS) > $(DESTDIR)$(gdk_pixbuf_cache_file) ; \ ++ GDK_PIXBUF_MODULEDIR=$(gdk_pixbuf_moduledir) $(GDK_PIXBUF_QUERYLOADERS) > $(DESTDIR)$(gdk_pixbuf_cache_file) ; \ + else \ + echo "***" ; \ + echo "*** Warning: loaders.cache not built" ; \ +-- +2.34.1 + diff --git a/package/librsvg/librsvg.mk b/package/librsvg/librsvg.mk index e4b1942b79..07a14b4366 100644 --- a/package/librsvg/librsvg.mk +++ b/package/librsvg/librsvg.mk @@ -20,6 +20,8 @@ HOST_LIBRSVG_DEPENDENCIES = host-cairo host-gdk-pixbuf host-libglib2 host-libxml LIBRSVG_LICENSE = LGPL-2.1+ LIBRSVG_LICENSE_FILES = COPYING.LIB LIBRSVG_CPE_ID_VENDOR = gnome +# We're patching gdk-pixbuf-loader/Makefile.am +LIBRSVG_AUTORECONF = YES ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) LIBRSVG_CONF_OPTS += --enable-introspection -- 2.34.1 From mohd.faiz.rohani at gmail.com Sun Feb 20 12:45:34 2022 From: mohd.faiz.rohani at gmail.com (Mohd Faiz Rohani) Date: Sun, 20 Feb 2022 20:45:34 +0800 Subject: [Buildroot] Issue with login In-Reply-To: <893D1C4B-6F6D-4F58-A77C-C71AFED67270@benettiengineering.com> References: <893D1C4B-6F6D-4F58-A77C-C71AFED67270@benettiengineering.com> Message-ID: Hi Giulio, Yes I have used root as a user. unfortunately i didn't set the path to the users tables. Could this be a problem? If so, where to set them? I understand that the users list are kept in paswd file correct? Thanks On Sun, Feb 20, 2022 at 7:43 PM Giulio Benetti < giulio.benetti at benettiengineering.com> wrote: > Hi Mohd, > > have you used root as user? Or did you provide a user table? > > Giulio > > Inviato da iPhone > > > Il giorno 20 feb 2022, alle ore 11:57, Mohd Faiz Rohani < > mohd.faiz.rohani at gmail.com> ha scritto: > > > > ? > > Hi guys, > > > > I managed to compile with success the Uboot(U-Boot 2019.04), Linux > kernel(4.4.155)and root file system(systemd 249) using the > Buildroot-2021.11.1. It was able to boot successfully until the login > prompt. However, it seems like there is an error with the login prompt it > does not want to enter, just looping around the login prompt after I have > entered the login name (not showing the password prompt). Did anyone know > about this? > > > > Thanks. > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From giulio.benetti at benettiengineering.com Sun Feb 20 12:55:19 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 20 Feb 2022 13:55:19 +0100 Subject: [Buildroot] Issue with login In-Reply-To: References: Message-ID: Hi Mohd, > Il giorno 20 feb 2022, alle ore 13:46, Mohd Faiz Rohani ha scritto: > > ? > Hi Giulio, > > Yes I have used root as a user. unfortunately i didn't set the path to the users tables. Could this be a problem? If so, where to set them? I understand that the users list are kept in paswd file correct? Before getting to users table let?s check why root doesn?t work. Have you tried issuing: root And no password at all and press ?enter? key? It?s pretty strange it doesn?t work Giulio > > Thanks > >> On Sun, Feb 20, 2022 at 7:43 PM Giulio Benetti wrote: >> Hi Mohd, >> >> have you used root as user? Or did you provide a user table? >> >> Giulio >> >> Inviato da iPhone >> >> > Il giorno 20 feb 2022, alle ore 11:57, Mohd Faiz Rohani ha scritto: >> > >> > ? >> > Hi guys, >> > >> > I managed to compile with success the Uboot(U-Boot 2019.04), Linux kernel(4.4.155)and root file system(systemd 249) using the Buildroot-2021.11.1. It was able to boot successfully until the login prompt. However, it seems like there is an error with the login prompt it does not want to enter, just looping around the login prompt after I have entered the login name (not showing the password prompt). Did anyone know about this? >> > >> > Thanks. >> > _______________________________________________ >> > buildroot mailing list >> > buildroot at buildroot.org >> > https://lists.buildroot.org/mailman/listinfo/buildroot >> -------------- next part -------------- An HTML attachment was scrubbed... URL: From mohd.faiz.rohani at gmail.com Sun Feb 20 13:08:03 2022 From: mohd.faiz.rohani at gmail.com (Mohd Faiz Rohani) Date: Sun, 20 Feb 2022 21:08:03 +0800 Subject: [Buildroot] Issue with login In-Reply-To: References: Message-ID: Yes I have tried putting root as the login, but still not working. I have tried both conditions, with password set as well as no password set in the Buildroot menuconfig and recompile. But the results are the same. I even disabled the login prompt options, but when I running the board login prompt keep coming. Fyi i have used the gcc-linaro-7.5.0-2019 toolchain in ubuntu 20.04. On Sun, Feb 20, 2022, 8:55 PM Giulio Benetti < giulio.benetti at benettiengineering.com> wrote: > Hi Mohd, > > Il giorno 20 feb 2022, alle ore 13:46, Mohd Faiz Rohani < > mohd.faiz.rohani at gmail.com> ha scritto: > > ? > Hi Giulio, > > Yes I have used root as a user. unfortunately i didn't set the path to the > users tables. Could this be a problem? If so, where to set them? I > understand that the users list are kept in paswd file correct? > > > Before getting to users table let?s check why root doesn?t work. > > Have you tried issuing: > root > And no password at all and press ?enter? key? > > It?s pretty strange it doesn?t work > > Giulio > > > Thanks > > On Sun, Feb 20, 2022 at 7:43 PM Giulio Benetti < > giulio.benetti at benettiengineering.com> wrote: > >> Hi Mohd, >> >> have you used root as user? Or did you provide a user table? >> >> Giulio >> >> Inviato da iPhone >> >> > Il giorno 20 feb 2022, alle ore 11:57, Mohd Faiz Rohani < >> mohd.faiz.rohani at gmail.com> ha scritto: >> > >> > ? >> > Hi guys, >> > >> > I managed to compile with success the Uboot(U-Boot 2019.04), Linux >> kernel(4.4.155)and root file system(systemd 249) using the >> Buildroot-2021.11.1. It was able to boot successfully until the login >> prompt. However, it seems like there is an error with the login prompt it >> does not want to enter, just looping around the login prompt after I have >> entered the login name (not showing the password prompt). Did anyone know >> about this? >> > >> > Thanks. >> > _______________________________________________ >> > buildroot mailing list >> > buildroot at buildroot.org >> > https://lists.buildroot.org/mailman/listinfo/buildroot >> >> -------------- next part -------------- An HTML attachment was scrubbed... URL: From giulio.benetti at benettiengineering.com Sun Feb 20 13:25:34 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 20 Feb 2022 14:25:34 +0100 Subject: [Buildroot] Issue with login In-Reply-To: References: Message-ID: <186B6238-5452-4211-BD9D-29A3C921DE42@benettiengineering.com> > Il giorno 20 feb 2022, alle ore 14:08, Mohd Faiz Rohani ha scritto: > > ? > > Yes I have tried putting root as the login, but still not working. I have tried both conditions, with password set as well as no password set in the Buildroot menuconfig and recompile. But the results are the same. I even disabled the login prompt options, but when I running the board login prompt keep coming. Fyi i have used the gcc-linaro-7.5.0-2019 toolchain in ubuntu 20.04. Mmh, can you provide your defconfig? Please create it with: $ make savedefconfig you should find a defconfig in your Buildroot folder and pastebin it so we can reproduce it(maybe). By the way, why are you using such old toolchain? And AFAIK Buildroot 2021.11.1 shouldn?t provide it as external toolchain, so this means you have provided it and its specific options, so maybe there some mistake there. Have you instead tried building using the Buildroot toolchain? Linux 4.4.* should work ok with more recent toolchain versions. Best regards Giulio > > >> On Sun, Feb 20, 2022, 8:55 PM Giulio Benetti wrote: >> Hi Mohd, >> >>>> Il giorno 20 feb 2022, alle ore 13:46, Mohd Faiz Rohani ha scritto: >>>> >>> ? >>> Hi Giulio, >>> >>> Yes I have used root as a user. unfortunately i didn't set the path to the users tables. Could this be a problem? If so, where to set them? I understand that the users list are kept in paswd file correct? >> >> Before getting to users table let?s check why root doesn?t work. >> >> Have you tried issuing: >> root >> And no password at all and press ?enter? key? >> >> It?s pretty strange it doesn?t work >> >> Giulio >> >>> >>> Thanks >>> >>>> On Sun, Feb 20, 2022 at 7:43 PM Giulio Benetti wrote: >>>> Hi Mohd, >>>> >>>> have you used root as user? Or did you provide a user table? >>>> >>>> Giulio >>>> >>>> Inviato da iPhone >>>> >>>> > Il giorno 20 feb 2022, alle ore 11:57, Mohd Faiz Rohani ha scritto: >>>> > >>>> > ? >>>> > Hi guys, >>>> > >>>> > I managed to compile with success the Uboot(U-Boot 2019.04), Linux kernel(4.4.155)and root file system(systemd 249) using the Buildroot-2021.11.1. It was able to boot successfully until the login prompt. However, it seems like there is an error with the login prompt it does not want to enter, just looping around the login prompt after I have entered the login name (not showing the password prompt). Did anyone know about this? >>>> > >>>> > Thanks. >>>> > _______________________________________________ >>>> > buildroot mailing list >>>> > buildroot at buildroot.org >>>> > https://lists.buildroot.org/mailman/listinfo/buildroot >>>> -------------- next part -------------- An HTML attachment was scrubbed... URL: From mohd.faiz.rohani at gmail.com Sun Feb 20 14:01:35 2022 From: mohd.faiz.rohani at gmail.com (Mohd Faiz Rohani) Date: Sun, 20 Feb 2022 22:01:35 +0800 Subject: [Buildroot] Issue with login In-Reply-To: <186B6238-5452-4211-BD9D-29A3C921DE42@benettiengineering.com> References: <186B6238-5452-4211-BD9D-29A3C921DE42@benettiengineering.com> Message-ID: kindly please find the attached. I'm having a problem downloading the new version from the Linaro website so I just used the version that I have. Basically I'm new to Buildroot and learning it for the moment through Udemy. I will try the Buildroot toolchain now to see if the same problem arises. Thanks On Sun, Feb 20, 2022 at 9:25 PM Giulio Benetti < giulio.benetti at benettiengineering.com> wrote: > > Il giorno 20 feb 2022, alle ore 14:08, Mohd Faiz Rohani < > mohd.faiz.rohani at gmail.com> ha scritto: > > ? > > Yes I have tried putting root as the login, but still not working. I have > tried both conditions, with password set as well as no password set in the > Buildroot menuconfig and recompile. But the results are the same. I even > disabled the login prompt options, but when I running the board login > prompt keep coming. Fyi i have used the gcc-linaro-7.5.0-2019 toolchain in > ubuntu 20.04. > > > Mmh, can you provide your defconfig? > Please create it with: > $ make savedefconfig > you should find a defconfig in your Buildroot folder and pastebin it so we > can reproduce it(maybe). > > By the way, why are you using such old toolchain? > And AFAIK Buildroot 2021.11.1 shouldn?t provide it as external toolchain, > so this means you have provided it and its specific options, so maybe there > some mistake there. > Have you instead tried building using the Buildroot toolchain? > > Linux 4.4.* should work ok with more recent toolchain versions. > > Best regards > Giulio > > > > On Sun, Feb 20, 2022, 8:55 PM Giulio Benetti < > giulio.benetti at benettiengineering.com> wrote: > >> Hi Mohd, >> >> Il giorno 20 feb 2022, alle ore 13:46, Mohd Faiz Rohani < >> mohd.faiz.rohani at gmail.com> ha scritto: >> >> ? >> Hi Giulio, >> >> Yes I have used root as a user. unfortunately i didn't set the path to >> the users tables. Could this be a problem? If so, where to set them? I >> understand that the users list are kept in paswd file correct? >> >> >> Before getting to users table let?s check why root doesn?t work. >> >> Have you tried issuing: >> root >> And no password at all and press ?enter? key? >> >> It?s pretty strange it doesn?t work >> >> Giulio >> >> >> Thanks >> >> On Sun, Feb 20, 2022 at 7:43 PM Giulio Benetti < >> giulio.benetti at benettiengineering.com> wrote: >> >>> Hi Mohd, >>> >>> have you used root as user? Or did you provide a user table? >>> >>> Giulio >>> >>> Inviato da iPhone >>> >>> > Il giorno 20 feb 2022, alle ore 11:57, Mohd Faiz Rohani < >>> mohd.faiz.rohani at gmail.com> ha scritto: >>> > >>> > ? >>> > Hi guys, >>> > >>> > I managed to compile with success the Uboot(U-Boot 2019.04), Linux >>> kernel(4.4.155)and root file system(systemd 249) using the >>> Buildroot-2021.11.1. It was able to boot successfully until the login >>> prompt. However, it seems like there is an error with the login prompt it >>> does not want to enter, just looping around the login prompt after I have >>> entered the login name (not showing the password prompt). Did anyone know >>> about this? >>> > >>> > Thanks. >>> > _______________________________________________ >>> > buildroot mailing list >>> > buildroot at buildroot.org >>> > https://lists.buildroot.org/mailman/listinfo/buildroot >>> >>> -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: config Type: application/octet-stream Size: 109845 bytes Desc: not available URL: From havran.jan at email.cz Sun Feb 20 14:08:11 2022 From: havran.jan at email.cz (Jan Havran) Date: Sun, 20 Feb 2022 15:08:11 +0100 Subject: [Buildroot] [PATCH 1/1] package/rtklib: new package Message-ID: RTKLIB is an open source program package for standard and precise positioning with GNSS. Version used here is from rtkexplorer, which is better optimized and more frequently updated than original version by Tomoji Takasu. Signed-off-by: Jan Havran --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/rtklib/Config.in | 38 ++++++++++++++++++++++++++++++++++++++ package/rtklib/rtklib.hash | 3 +++ package/rtklib/rtklib.mk | 31 +++++++++++++++++++++++++++++++ 5 files changed, 76 insertions(+) create mode 100644 package/rtklib/Config.in create mode 100644 package/rtklib/rtklib.hash create mode 100644 package/rtklib/rtklib.mk diff --git a/DEVELOPERS b/DEVELOPERS index 91e9060ac5..8d7eb2c268 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1356,6 +1356,9 @@ F: package/pangomm/ F: package/rpm/ F: package/yad/ +N: Jan Havran +F: package/rtklib/ + N: Jan Heylen F: package/opentracing-cpp/ diff --git a/package/Config.in b/package/Config.in index 9a8196efe2..b38c33d543 100644 --- a/package/Config.in +++ b/package/Config.in @@ -561,6 +561,7 @@ endmenu source "package/rpi-userland/Config.in" source "package/rs485conf/Config.in" source "package/rtc-tools/Config.in" + source "package/rtklib/Config.in" source "package/rtl8188eu/Config.in" source "package/rtl8189es/Config.in" source "package/rtl8189fs/Config.in" diff --git a/package/rtklib/Config.in b/package/rtklib/Config.in new file mode 100644 index 0000000000..dc694d6b7d --- /dev/null +++ b/package/rtklib/Config.in @@ -0,0 +1,38 @@ +comment "rtklib needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS + +config BR2_PACKAGE_RTKLIB + bool "rtklib" + depends on BR2_TOOLCHAIN_HAS_THREADS + help + RTKLIB is an open source program package for standard and + precise positioning with GNSS (global navigation satellite + system). + + This is a version of RTKLIB optimized for single and dual + frequency low cost GPS receivers, especially u-blox receivers. + + https://rtkexplorer.com/ + +if BR2_PACKAGE_RTKLIB + +config BR2_PACKAGE_RTKLIB_CONVBIN + bool "convbin" + +config BR2_PACKAGE_RTKLIB_POS2KML + bool "pos2kml" + +comment "rnx2rtkp needs Fortran" + depends on !BR2_TOOLCHAIN_HAS_FORTRAN + +config BR2_PACKAGE_RTKLIB_RNX2RTKP + bool "rnx2rtkp" + depends on BR2_TOOLCHAIN_HAS_FORTRAN + +config BR2_PACKAGE_RTKLIB_RTKRCV + bool "rtkrcv" + +config BR2_PACKAGE_RTKLIB_STR2STR + bool "str2str" + +endif diff --git a/package/rtklib/rtklib.hash b/package/rtklib/rtklib.hash new file mode 100644 index 0000000000..faed92243b --- /dev/null +++ b/package/rtklib/rtklib.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 735d43939ae08b0da64d75afe5750bc983032144c5622e620eee987508946fc5 rtklib-b34e.tar.gz +sha256 219747832d49ee958457b2934080ab8d94bd9d8e45fcb1c36f89776fd2c5ed8a license.txt diff --git a/package/rtklib/rtklib.mk b/package/rtklib/rtklib.mk new file mode 100644 index 0000000000..421cdddfcd --- /dev/null +++ b/package/rtklib/rtklib.mk @@ -0,0 +1,31 @@ +################################################################################ +# +# rtklib +# +################################################################################ + +RTKLIB_VERSION = b34e +RTKLIB_SITE = $(call github,rtklibexplorer,RTKLIB,$(RTKLIB_VERSION)) +RTKLIB_LICENSE = BSD-2-Clause +RTKLIB_LICENSE_FILES = license.txt + +RTKLIB_APPS += $(if $(BR2_PACKAGE_RTKLIB_CONVBIN),convbin,) +RTKLIB_APPS += $(if $(BR2_PACKAGE_RTKLIB_POS2KML),pos2kml,) +RTKLIB_APPS += $(if $(BR2_PACKAGE_RTKLIB_RNX2RTKP),rnx2rtkp,) +RTKLIB_APPS += $(if $(BR2_PACKAGE_RTKLIB_RTKRCV),rtkrcv,) +RTKLIB_APPS += $(if $(BR2_PACKAGE_RTKLIB_STR2STR),str2str,) + +define RTKLIB_BUILD_CMDS + for APP in $(RTKLIB_APPS); do \ + cd $(@D)/app/consapp/$$APP/gcc ; \ + $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" CCFLAGS="$(TARGET_CFLAGS) $(TARGET_LDFLAGS)" ; \ + done +endef + +define RTKLIB_INSTALL_TARGET_CMDS + for APP in $(RTKLIB_APPS); do \ + $(INSTALL) -m 0755 $(@D)/app/consapp/$$APP/gcc/$$APP $(TARGET_DIR)/usr/bin/$$APP ; \ + done +endef + +$(eval $(generic-package)) -- 2.35.1 From fontaine.fabrice at gmail.com Sun Feb 20 14:38:45 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 20 Feb 2022 15:38:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/apr-util: drop APR_UTIL_FIX_{LIBTOOL, RULES_MK} In-Reply-To: <20220220100846.GU522310@scaer> References: <20220219142104.3753374-1-fontaine.fabrice@gmail.com> <20220220100846.GU522310@scaer> Message-ID: Hi Yann, Le dim. 20 f?vr. 2022 ? 11:08, Yann E. MORIN a ?crit : > > Fabrice, All, > > On 2022-02-19 15:21 +0100, Fabrice Fontaine spake thusly: > > Drop APR_UTIL_FIX_{LIBTOOL,RULES_MK} which were added by commit > > 84b4c19e551288911a230c2b73e96bc6e2ed12f9 but is not needed since the > > addition of PPD_FIXUP_PATHS in commit > > b06294e9897e90862656416e8b67fdace15488d7 > > > > Signed-off-by: Fabrice Fontaine > > Applied to master, thanks. > > There is still one occurence of a similar construct in qt5: > > 14 # The file "qt.conf" can be used to override the hard-coded paths that are > 15 # compiled into the Qt library. We need it to make "qmake" relocatable and > 16 # tweak the per-package install pathes > 17 define QT5_INSTALL_QT_CONF > 18 ? rm -f $(HOST_DIR)/bin/qt.conf > 19 ? sed -e "s|@@HOST_DIR@@|$(HOST_DIR)|" -e "s|@@STAGING_DIR@@|$(STAGING_DIR)|" \ > 20 ? ? $(QT5BASE_PKGDIR)/qt.conf.in > $(HOST_DIR)/bin/qt.conf > 21 endef > 22 > 23 ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) > 24 define QT5_QT_CONF_FIXUP > 25 ? $(QT5_INSTALL_QT_CONF) > 26 endef > 27 endif > > The generic fixup scans $(HOST_DIR), so it should hit this file too, no? > > QT5_QT_CONF_FIXUP is used in two locations: > > - pkg-qmake.mk -> as a post-preapare hook, which is exactly where the > generic fixup runs too, so QT5_QT_CONF_FIXUP should be a no-op > (well, it does run before the generic one). > > - python-pyqt5.mk -> as a pre-configure hook, which is incorrect > becaused it will assign that file to that package, and anyway the > generic fixup hook has already been run anyway, so this should be a > no-op. > > Care tp have a look, please? I don't really master Qt but if I understand well commit 60e3a09693703f0c923322d39ce1210baf154983, QT5_INSTALL_QT_CONF is also used to make qmake "relocatable" in qt5base.mk. So, reverting commit 60e3a09693703f0c923322d39ce1210baf154983 is probably ok. However I assume that we should keep a QT5BASE_INSTALL_QT_CONF that creates a qt.conf. Someone with better Qt knowledge could probably confirm this assumption. > > Regards, > Yann E. MORIN. > > > --- > > package/apr-util/apr-util.mk | 14 -------------- > > 1 file changed, 14 deletions(-) > > > > diff --git a/package/apr-util/apr-util.mk b/package/apr-util/apr-util.mk > > index f6ce7ac064..cf8407ced0 100644 > > --- a/package/apr-util/apr-util.mk > > +++ b/package/apr-util/apr-util.mk > > @@ -17,20 +17,6 @@ APR_UTIL_CONF_OPTS = \ > > --with-apr=$(STAGING_DIR)/usr/bin/apr-1-config > > APR_UTIL_CONFIG_SCRIPTS = apu-1-config > > > > -ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) > > -define APR_UTIL_FIX_LIBTOOL > > - $(SED) 's,$(PER_PACKAGE_DIR)/apr/,$(PER_PACKAGE_DIR)/apr-util/,g' \ > > - $(STAGING_DIR)/usr/build-1/libtool > > -endef > > -APR_UTIL_POST_PREPARE_HOOKS += APR_UTIL_FIX_LIBTOOL > > - > > -define APR_UTIL_FIX_RULES_MK > > - $(SED) 's,$(PER_PACKAGE_DIR)/apr/,$(PER_PACKAGE_DIR)/apr-util/,g' \ > > - $(@D)/build/rules.mk > > -endef > > -APR_UTIL_POST_CONFIGURE_HOOKS += APR_UTIL_FIX_RULES_MK > > -endif > > - > > # When iconv is available, then use it to provide charset conversion > > # features. > > APR_UTIL_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv) > > -- > > 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. | > '------------------------------^-------^------------------^--------------------' Best Regards, Fabrice From romain.naour at gmail.com Sun Feb 20 15:10:30 2022 From: romain.naour at gmail.com (Romain Naour) Date: Sun, 20 Feb 2022 16:10:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/luasyslog: bump to version 2.2.1 In-Reply-To: <20220217094048.2756293-1-fontaine.fabrice@gmail.com> References: <20220217094048.2756293-1-fontaine.fabrice@gmail.com> Message-ID: <9e895f60-6a7d-c40b-3106-56d8f4aa3946@gmail.com> Hello Fabrice, Le 17/02/2022 ? 10:40, Fabrice Fontaine a ?crit?: > This bump contains a single commit which fixes the following build > failure with Lua 5.4 raised since commit > 4f9a5659023c66fc166de28fd39a6c97a9490667: > > In file included from lsyslog.c:11: > compat-5.3.h:402:4: error: #error "unsupported Lua version (i.e. not Lua 5.1, 5.2, or 5.3)" > 402 | # error "unsupported Lua version (i.e. not Lua 5.1, 5.2, or 5.3)" > | ^~~~~ > > Also update indentation in hash file (two spaces) > > Fixes: > - http://autobuild.buildroot.org/results/df2aabcf2ae07cad66b869ec4ac76702d2c32dc5 It also fixes the luasyslog test: https://gitlab.com/buildroot.org/buildroot/-/jobs/2088683903 runtime tested with tests.package.test_luasyslog.TestLuaLuasyslog Reviewed-by: Romain Naour Tested-by: Romain Naour Best regards, Romain > > Signed-off-by: Fabrice Fontaine > --- > package/luasyslog/luasyslog.hash | 4 ++-- > package/luasyslog/luasyslog.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/luasyslog/luasyslog.hash b/package/luasyslog/luasyslog.hash > index bcb6a7e025..1e2a5ddec5 100644 > --- a/package/luasyslog/luasyslog.hash > +++ b/package/luasyslog/luasyslog.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 7f7dad64117407f2484ff5b53e90804f923a99fcbde5872e54f6aba53f482da0 luasyslog-2.2.0.tar.gz > -sha256 833457938f5155e65dabda12a5c9d4b6fd7fb92dd7ead584c1c30cfb0c84adf4 COPYING > +sha256 b1b19ca142130f93c3f8f2e85303ff50cc6f4ed4aa52b8569176ae56e3dc3f43 luasyslog-2.2.1.tar.gz > +sha256 833457938f5155e65dabda12a5c9d4b6fd7fb92dd7ead584c1c30cfb0c84adf4 COPYING > diff --git a/package/luasyslog/luasyslog.mk b/package/luasyslog/luasyslog.mk > index 049e068a13..972d4c5a7d 100644 > --- a/package/luasyslog/luasyslog.mk > +++ b/package/luasyslog/luasyslog.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LUASYSLOG_VERSION = 2.2.0 > +LUASYSLOG_VERSION = 2.2.1 > LUASYSLOG_SITE = $(call github,ntd,luasyslog,$(LUASYSLOG_VERSION)) > LUASYSLOG_DEPENDENCIES = host-luarocks luainterpreter > LUASYSLOG_LICENSE = MIT From fontaine.fabrice at gmail.com Sun Feb 20 15:19:44 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 20 Feb 2022 16:19:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/connman: fix build with libexecinfo Message-ID: <20220220151944.653455-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/peko/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-uclibc/10.3.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: src/backtrace.o: in function `print_backtrace': backtrace.c:(.text+0x37): undefined reference to `backtrace' Fixes: - http://autobuild.buildroot.org/results/74da4f4deab5f0ae9405d063ad52a5d4904a964d Signed-off-by: Fabrice Fontaine --- package/connman/connman.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/connman/connman.mk b/package/connman/connman.mk index 61851bd2dc..1b6fd611f5 100644 --- a/package/connman/connman.mk +++ b/package/connman/connman.mk @@ -109,4 +109,9 @@ else CONNMAN_CONF_OPTS += --disable-client endif +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +CONNMAN_DEPENDENCIES += libexecinfo +CONNMAN_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -lexecinfo" +endif + $(eval $(autotools-package)) -- 2.34.1 From peter at korsgaard.com Sun Feb 20 15:36:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 16:36:10 +0100 Subject: [Buildroot] [git commit] package/php: security bump version to 8.0.16 Message-ID: <20220220152828.6E6888345C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4c4d28922942deb0fc41d11d4057b7fedd25cab1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog: https://www.php.net/ChangeLog-8.php#8.0.16 Fixes CVE-2021-21708. Signed-off-by: Bernd Kuhls 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 e78385cbe7..2753f9a0eb 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 5f33544061d37d805a2a9ce791f081ef08a7155bd7ba2362e69bba2d06b0f8b2 php-8.0.15.tar.xz +sha256 f27a2f25259e8c51e42dfd74e24a546ee521438ad7d9f6c6e794aa91f38bab0a php-8.0.16.tar.xz # License file sha256 a188db807d711536f71e27b7d36879d63480f7994dc18adc08e624b3c5430fff LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index c9de8c2c76..5b29692d94 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.0.15 +PHP_VERSION = 8.0.16 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From peter at korsgaard.com Sun Feb 20 15:36:18 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 16:36:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/php: security bump version to 8.0.16 In-Reply-To: <20220218190233.473109-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Fri, 18 Feb 2022 20:02:33 +0100") References: <20220218190233.473109-1-bernd.kuhls@t-online.de> Message-ID: <87k0dpble5.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Changelog: https://www.php.net/ChangeLog-8.php#8.0.16 > Fixes CVE-2021-21708. > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 20 15:37:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 16:37:06 +0100 Subject: [Buildroot] [PATCH v1] package/wireless-regdb: bump version to 2022.02.18 In-Reply-To: <20220219102451.25602-1-ps.report@gmx.net> (Peter Seiderer's message of "Sat, 19 Feb 2022 11:24:51 +0100") References: <20220219102451.25602-1-ps.report@gmx.net> Message-ID: <87fsodblct.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > Changelog (since 2021.08.28, [1]): > e061299 wireless-regdb: Raise DFS TX power limit to 250 mW (24 dBm) for the US > 2ce78ed wireless-regdb: Update regulatory rules for Croatia (HR) on 6GHz > 0d39f4c wireless-regdb: Update regulatory rules for South Korea (KR) > acad231 wireless-regdb: Update regulatory rules for France (FR) on 6 and 60 GHz > ea83a82 wireless-regdb: add support for US S1G channels > 4408149 wireless-regdb: add 802.11ah bands to world regulatory domain > 5f3cadc wireless-regdb: Update regulatory rules for Spain (ES) on 6GHz > e0ac69b Revert "wireless-regdb: Update regulatory rules for South Korea (KR)" > 40e5e80 wireless-regdb: Update regulatory rules for South Korea (KR) > e427ff2 wireless-regdb: Update regulatory rules for China (CN) > 0970116 wireless-regdb: Update regulatory rules for the Netherlands (NL) on 6GHz > 4dac44b wireless-regdb: update regulatory database based on preceding changes > [1] https://lore.kernel.org/linux-wireless/YhBCKWNw3IMfGs0L at ubuntu-x1/ > Signed-off-by: Peter Seiderer Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 20 15:36:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 16:36:45 +0100 Subject: [Buildroot] [git commit] package/wireless-regdb: bump version to 2022.02.18 Message-ID: <20220220152923.5A26182A79@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=324f0552526d169c24cd75e9dadf67641f2beef0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog (since 2021.08.28, [1]): e061299 wireless-regdb: Raise DFS TX power limit to 250 mW (24 dBm) for the US 2ce78ed wireless-regdb: Update regulatory rules for Croatia (HR) on 6GHz 0d39f4c wireless-regdb: Update regulatory rules for South Korea (KR) acad231 wireless-regdb: Update regulatory rules for France (FR) on 6 and 60 GHz ea83a82 wireless-regdb: add support for US S1G channels 4408149 wireless-regdb: add 802.11ah bands to world regulatory domain 5f3cadc wireless-regdb: Update regulatory rules for Spain (ES) on 6GHz e0ac69b Revert "wireless-regdb: Update regulatory rules for South Korea (KR)" 40e5e80 wireless-regdb: Update regulatory rules for South Korea (KR) e427ff2 wireless-regdb: Update regulatory rules for China (CN) 0970116 wireless-regdb: Update regulatory rules for the Netherlands (NL) on 6GHz 4dac44b wireless-regdb: update regulatory database based on preceding changes [1] https://lore.kernel.org/linux-wireless/YhBCKWNw3IMfGs0L at ubuntu-x1/ Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/wireless-regdb/wireless-regdb.hash | 2 +- package/wireless-regdb/wireless-regdb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/wireless-regdb/wireless-regdb.hash b/package/wireless-regdb/wireless-regdb.hash index abe8f6b000..91fcb320d2 100644 --- a/package/wireless-regdb/wireless-regdb.hash +++ b/package/wireless-regdb/wireless-regdb.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/software/network/wireless-regdb/sha256sums.asc -sha256 cff370c410d1e6d316ae0a7fa8ac6278fdf1efca5d3d664aca7cfd2aafa54446 wireless-regdb-2021.08.28.tar.xz +sha256 8828c25a4ee25020044004f57374bb9deac852809fad70f8d3d01770bf9ac97f wireless-regdb-2022.02.18.tar.xz # Locally computed sha256 678b0df753c86198fc496d1f1033429bbd57f101472132ee7eaaf9f5e0a7fae1 LICENSE diff --git a/package/wireless-regdb/wireless-regdb.mk b/package/wireless-regdb/wireless-regdb.mk index 9e01283c01..35a8c6686d 100644 --- a/package/wireless-regdb/wireless-regdb.mk +++ b/package/wireless-regdb/wireless-regdb.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRELESS_REGDB_VERSION = 2021.08.28 +WIRELESS_REGDB_VERSION = 2022.02.18 WIRELESS_REGDB_SOURCE = wireless-regdb-$(WIRELESS_REGDB_VERSION).tar.xz WIRELESS_REGDB_SITE = $(BR2_KERNEL_MIRROR)/software/network/wireless-regdb WIRELESS_REGDB_LICENSE = ISC From luca at lucaceresoli.net Sun Feb 20 15:40:10 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Sun, 20 Feb 2022 16:40:10 +0100 Subject: [Buildroot] [PATCH v2] manual: board support: add instructions to test defconfig in the official docker In-Reply-To: <20220219212211.1304441-1-giulio.benetti@benettiengineering.com> References: <20220219212211.1304441-1-giulio.benetti@benettiengineering.com> Message-ID: <2003d2f6-6938-83b3-fd21-966fecf7e37b@lucaceresoli.net> Hi Giulio, On 19/02/22 22:22, Giulio Benetti wrote: > Sometimes new boards have not been tested with official docker so let's add > instructions to do it with utils/docker-run. > > Cc: Luca Ceresoli > Signed-off-by: Giulio Benetti > --- > V1->V2: > * use the available utils/docker-run > * improve explanation as suggested by Luca Ceresoli > --- > docs/manual/adding-board-support.txt | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/docs/manual/adding-board-support.txt b/docs/manual/adding-board-support.txt > index 33ed709535..074bab7a00 100644 > --- a/docs/manual/adding-board-support.txt > +++ b/docs/manual/adding-board-support.txt > @@ -46,3 +46,11 @@ create a directory +board/+ and a subdirectory > +board//+. You can then store your patches > and configurations in these directories, and reference them from the main > Buildroot configuration. Refer to xref:customize[] for more details. > + > +Before submitting patches for new boards it is recommended to test it by > +building it using latest gitlab-CI docker container. To do this use > +utils/docker-run script and inside it hint: Not sure the verb 'hint' is the correct one. I would expect "type" or "issue these commands" or similar. > +-------------------- > + $ make +_defconfig+ > + $ make > +-------------------- With that fixed: Reviewed-by: Luca Ceresoli -- Luca From thomas.petazzoni at bootlin.com Sun Feb 20 16:02:22 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Feb 2022 17:02:22 +0100 Subject: [Buildroot] Analysis of runtime test failures Message-ID: <20220220170222.06d88b45@windsurf> Hello, Six of our runtime tests are failing, so I went ahead and quickly look at the error messages. Here is my summary: === tests.package.test_ipython.TestIPythonPy3 === https://gitlab.com/buildroot.org/buildroot/-/jobs/2088684091 Error is: # ipython -c 'import math; math.floor(12.3)' -sh: ipython: not found === tests.package.test_python_pyyaml.TestPythonPy3Pyyaml === https://gitlab.com/buildroot.org/buildroot/-/jobs/2088684091 Error is: # python sample_python_pyyaml_dec.py Traceback (most recent call last): File "/root/sample_python_pyyaml_dec.py", line 5, in data = yaml.load(serialized) TypeError: load() missing 1 required positional argument: 'Loader' === tests.package.test_luasyslog.TestLuaLuasyslog === https://gitlab.com/buildroot.org/buildroot/-/jobs/2088683903 Error is: >>> luasyslog 2.2.0 Building PATH="/builds/buildroot.org/buildroot/test-output/TestLuaLuasyslog/host/bin:/builds/buildroot.org/buildroot/test-output/TestLuaLuasyslog/host/sbin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" /usr/bin/make -j33 -C /builds/buildroot.org/buildroot/test-output/TestLuaLuasyslog/build/luasyslog-2.2.0/ /usr/bin/make all-am CC lsyslog.lo CC compat-5.3.lo In file included from lsyslog.c:11: compat-5.3.h:402:4: error: #error "unsupported Lua version (i.e. not Lua 5.1, 5.2, or 5.3)" # error "unsupported Lua version (i.e. not Lua 5.1, 5.2, or 5.3)" ^~~~~ In file included from compat-5.3.c:7: compat-5.3.h:402:4: error: #error "unsupported Lua version (i.e. not Lua 5.1, 5.2, or 5.3)" # error "unsupported Lua version (i.e. not Lua 5.1, 5.2, or 5.3)" ^~~~~ make[3]: *** [Makefile:710: lsyslog.lo] Error 1 === tests.package.test_lxc.TestLxc === https://gitlab.com/buildroot.org/buildroot/-/jobs/2088683908 Error is: # lxc-start -l trace -n lxc_iperf3 -o /tmp/lxc.log -L /tmp/lxc.console.log lxc-start: lxc_iperf3: lxccontainer.c: wait_on_daemonized_start: 868 Received container state "ABORTING" instead of "RUNNING" lxc-start: lxc_iperf3: tools/lxc_start.c: main: 306 The container failed to start lxc-start: lxc_iperf3: tools/lxc_start.c: main: 309 To get more details, run the container in foreground mode lxc-start: lxc_iperf3: tools/lxc_start.c: main: 312 Additional information can be obtained by setting the --logfile and --logpriority options # echo $? === tests.package.test_rust.TestRustBin === https://gitlab.com/buildroot.org/buildroot/-/pipelines/470182758/failures Build issue while building the example Rust application: /usr/bin/ld: /tmp/tmpdggplkto-br2-testing-rust/hello-world/target/armv7-unknown-linux-gnueabihf/debug/deps/hello_world-e03f93fef10567c3.1ajq7aud2z9fxhe5.rcgu.o: error adding symbols: file in wrong format collect2: error: ld returned 1 exit status Could https://patchwork.ozlabs.org/project/buildroot/patch/20220217230638.98748-1-moritz at h6t.eu/ be related ? === tests.package.test_rust.TestRust === Same error as above. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From romain.naour at gmail.com Sun Feb 20 16:25:04 2022 From: romain.naour at gmail.com (Romain Naour) Date: Sun, 20 Feb 2022 17:25:04 +0100 Subject: [Buildroot] Analysis of runtime test failures In-Reply-To: <20220220170222.06d88b45@windsurf> References: <20220220170222.06d88b45@windsurf> Message-ID: <842a7d9b-e991-149e-c6a6-9a36b29e9ff3@gmail.com> Hello Thomas, Le 20/02/2022 ? 17:02, Thomas Petazzoni via buildroot a ?crit?: > Hello, > > Six of our runtime tests are failing, so I went ahead and quickly look > at the error messages. Here is my summary: > > === tests.package.test_ipython.TestIPythonPy3 === > > https://gitlab.com/buildroot.org/buildroot/-/jobs/2088684091 > > Error is: > > # ipython -c 'import math; math.floor(12.3)' > -sh: ipython: not found ipython use a wrong shebang on the target: # head -n 1 /usr/bin/ipython #!/home/kubu/buildroot/testsuite-master/TestIPythonPy3/host/bin/python The issue come from python3-setuptools 60.0.0 that changed SETUPTOOLS_USE_DISTUTILS [1]. This is actually a "breaking" change [2]. We have to override SETUPTOOLS_USE_DISTUTILS to the previous value "stdlib" to fixes the issue. [1] https://github.com/pypa/setuptools/commit/b6fcbbd00cb6d5607c9272dec452a50457bdb292 [2] https://github.com/pypa/setuptools/blob/v60.0.0/CHANGES.rst#breaking-changes > > === tests.package.test_python_pyyaml.TestPythonPy3Pyyaml === > > https://gitlab.com/buildroot.org/buildroot/-/jobs/2088684091 > > Error is: > > # python sample_python_pyyaml_dec.py > Traceback (most recent call last): > File "/root/sample_python_pyyaml_dec.py", line 5, in > data = yaml.load(serialized) > TypeError: load() missing 1 required positional argument: 'Loader' "PyYAML 6.0 load() function requires Loader argument" https://github.com/yaml/pyyaml/issues/576 "Warning: It is not safe to call yaml.load with any data received from an untrusted source! yaml.load is as powerful as pickle.load and so may call any Python function. Check the yaml.safe_load function though." https://pyyaml.org/wiki/PyYAMLDocumentation We can simply fixes the issue by using yaml.safe_load(serialized) > > === tests.package.test_luasyslog.TestLuaLuasyslog === > > https://gitlab.com/buildroot.org/buildroot/-/jobs/2088683903 > > Error is: > >>>> luasyslog 2.2.0 Building > PATH="/builds/buildroot.org/buildroot/test-output/TestLuaLuasyslog/host/bin:/builds/buildroot.org/buildroot/test-output/TestLuaLuasyslog/host/sbin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" /usr/bin/make -j33 -C /builds/buildroot.org/buildroot/test-output/TestLuaLuasyslog/build/luasyslog-2.2.0/ > /usr/bin/make all-am > CC lsyslog.lo > CC compat-5.3.lo > In file included from lsyslog.c:11: > compat-5.3.h:402:4: error: #error "unsupported Lua version (i.e. not Lua 5.1, 5.2, or 5.3)" > # error "unsupported Lua version (i.e. not Lua 5.1, 5.2, or 5.3)" > ^~~~~ > In file included from compat-5.3.c:7: > compat-5.3.h:402:4: error: #error "unsupported Lua version (i.e. not Lua 5.1, 5.2, or 5.3)" > # error "unsupported Lua version (i.e. not Lua 5.1, 5.2, or 5.3)" > ^~~~~ > make[3]: *** [Makefile:710: lsyslog.lo] Error 1 Fixed by: http://patchwork.ozlabs.org/project/buildroot/patch/20220217094048.2756293-1-fontaine.fabrice at gmail.com/ > > === tests.package.test_lxc.TestLxc === > > https://gitlab.com/buildroot.org/buildroot/-/jobs/2088683908 > > Error is: > > # lxc-start -l trace -n lxc_iperf3 -o /tmp/lxc.log -L /tmp/lxc.console.log > lxc-start: lxc_iperf3: lxccontainer.c: wait_on_daemonized_start: 868 Received container state "ABORTING" instead of "RUNNING" > lxc-start: lxc_iperf3: tools/lxc_start.c: main: 306 The container failed to start > lxc-start: lxc_iperf3: tools/lxc_start.c: main: 309 To get more details, run the container in foreground mode > lxc-start: lxc_iperf3: tools/lxc_start.c: main: 312 Additional information can be obtained by setting the --logfile and --logpriority options > # echo $? See: http://lists.busybox.net/pipermail/buildroot/2022-January/635251.html We can upgrade the kernel used by the test but upstream added a regression while adding features in the stable branch 4.0.x https://github.com/lxc/lxc/commit/be606e16fd0fa967219d890745a425625eafe251 > > === tests.package.test_rust.TestRustBin === > > https://gitlab.com/buildroot.org/buildroot/-/pipelines/470182758/failures > > Build issue while building the example Rust application: > > /usr/bin/ld: /tmp/tmpdggplkto-br2-testing-rust/hello-world/target/armv7-unknown-linux-gnueabihf/debug/deps/hello_world-e03f93fef10567c3.1ajq7aud2z9fxhe5.rcgu.o: error adding symbols: file in wrong format > collect2: error: ld returned 1 exit status > > Could > https://patchwork.ozlabs.org/project/buildroot/patch/20220217230638.98748-1-moritz at h6t.eu/ > be related ? I'm not sure, but the test doesn't use the cargo package infrastructure. I suggest to rework the test to use bat or ripgrep package. Best regards, Romain > > === tests.package.test_rust.TestRust === > > Same error as above. > > Best regards, > > Thomas From bonet at grenoble.cnrs.fr Sun Feb 20 16:18:58 2022 From: bonet at grenoble.cnrs.fr (Edgar Bonet) Date: Sun, 20 Feb 2022 17:18:58 +0100 Subject: [Buildroot] Issue with login In-Reply-To: References: <186B6238-5452-4211-BD9D-29A3C921DE42@benettiengineering.com> Message-ID: <469c0dbc-6101-be6c-7272-400ac4512b86@grenoble.cnrs.fr> Hi! In his config file, Mohd wrote: > BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_10=y > BR2_LINUX_KERNEL_VERSION="4.4.155" This may cause problems. C.f. docs/manual/configure.txt: If you use kernel headers that are more recent than the Linux kernel you run on your embedded system, then the C library might be using interfaces that are not provided by your Linux kernel. In the same config file, there is: > # BR2_PACKAGE_BUSYBOX is not set When disabling busybox, you should have seen the message: You may need to enable other packages to get a working system You better know what you're doing! And then: > # BR2_PACKAGE_SYSTEMD_LOGIND is not set > # BR2_PACKAGE_UTIL_LINUX_LOGIN is not set Looks like there is no `login' program to let you in. You are probably only seeing the "login" prompt from getty, but then getty cannot spawn login. Regards, Edgar Bonet. From michael at amarulasolutions.com Sun Feb 20 17:05:07 2022 From: michael at amarulasolutions.com (Michael Nazzareno Trimarchi) Date: Sun, 20 Feb 2022 18:05:07 +0100 Subject: [Buildroot] imx8 common script problem Message-ID: HI all I found that in order to generate a correct flash.bin image, the script at the moment are broken at least for imx8mn. It works only with this change ${HOST_DIR}/bin/mkimage_imx8 -fit -loader ${BINARIES_DIR}/u-boot-spl-ddr.bin 0x7E1000 -second_loader ${BIN ARIES_DIR}/u-boot.itb 0x40200000 0x60000 -out ${BINARIES_DIR}/imx8-boot-sd.bin elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN=y$" ${BR2_CONFIG}; then - cat ${BINARIES_DIR}/u-boot-spl.bin ${BINARIES_DIR}/ddr_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin + dd if=${BINARIES_DIR}/u-boot-spl.bin of=${BINARIES_DIR}/u-boot-spl-pad.bin bs=4 conv=sync + cat ${BINARIES_DIR}/u-boot-spl-pad.bin ${BINARIES_DIR}/ddr_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot-nodtb.bin ATF_LOAD_ADDR=0x00960000 ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its ${HOST_DIR}/bin/mkimage -E -p 0x3000 -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb - rm -f ${BINARIES_DIR}/u-boot.its + #rm -f ${BINARIES_DIR}/u-boot.its The padding seems correct even in the origina soc.mk of imx tools. Can anyone comment? Michael -- 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 Sun Feb 20 17:21:59 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 20 Feb 2022 18:21:59 +0100 Subject: [Buildroot] Issue with login In-Reply-To: References: <186B6238-5452-4211-BD9D-29A3C921DE42@benettiengineering.com> Message-ID: Hi Mohd, On 20/02/22 15:01, Mohd Faiz Rohani wrote: > kindly please find the attached. Next time please use https://pastebin.com/ > I'm having a problem downloading the > new version from the Linaro website so I just used the version that I > have. It's still available here: https://releases.linaro.org/components/toolchain/binaries/latest-7/arm-linux-gnueabihf/ > Basically I'm new to Buildroot and learning it for the moment > through Udemy. I don't know which course you're following, but as I can understand from your defconfig is that you're using a beaglebone board. /media/faiz/LinuxData/Documents/BBB1/buildroot-2021.11.1/configs/beaglebone_defconfig > I will try the Buildroot toolchain now to see if the same > problem arises. Yes, please. Below you've mentioned you're using systemd as Init System, but it's not true, you're using Busybox: BR2_INIT_BUSYBOX=y What I can suggest you is to begin from scratch by using the already present beaglebone_defconfig or beaglebone_qt5_defconfig, those are maintained and should work out of the shelf. And from there on I would try to tweak buildroot. I don't have a beaglebone board here, so I can't test it, but I've managed to build your defconfig successfully. But it's difficult to help for me :-/ The point is, do you really need to use that specific defconfig or can you go with the configs/beaglebone_defconfig? That way you could also help us to update those very old linux/uboot versions by sending patches for all beagleboard defconfigs. What about becoming a Buildroot contributor? :-) Best regards -- Giulio Benetti Benetti Engineering sas > Thanks > > On Sun, Feb 20, 2022 at 9:25 PM Giulio Benetti > > wrote: > > >> Il giorno 20 feb 2022, alle ore 14:08, Mohd Faiz Rohani >> > >> ha scritto: >> >> ? >> >> Yes I have tried putting root as the login, but still not >> working.? I have tried both conditions, with password set as well >> as no password set in the Buildroot menuconfig and recompile. But >> the results are the same. I even disabled the login prompt >> options, but when I running the board login prompt keep coming. >> Fyi? i have used the gcc-linaro-7.5.0-2019 toolchain in ubuntu 20.04. > > Mmh, can you provide your defconfig? > Please create it with: > $ make savedefconfig > you should find a defconfig in your Buildroot folder and pastebin it > so we can reproduce it(maybe). > > By the way, why are you using such old toolchain? > And AFAIK Buildroot 2021.11.1 shouldn?t provide it as external > toolchain, so this means you have provided it and its specific > options, so maybe there some mistake there. > Have you instead tried building using the Buildroot toolchain? > > Linux 4.4.* should work ok with more recent toolchain versions. > > Best regards > Giulio > >> >> >> On Sun, Feb 20, 2022, 8:55 PM Giulio Benetti >> > > wrote: >> >> Hi Mohd, >> >>> Il giorno 20 feb 2022, alle ore 13:46, Mohd Faiz Rohani >>> >> > ha scritto: >>> >>> ? >>> Hi?Giulio, >>> >>> Yes I have used root as a user. unfortunately i didn't?set >>> the path to the users tables. Could this be a problem? If so, >>> where to set them? I understand that the users list are kept >>> in paswd?file correct? >> >> Before getting to users table let?s check why root doesn?t work. >> >> Have you tried issuing: >> root >> And no password at all and press ?enter? key? >> >> It?s pretty strange it doesn?t work >> >> Giulio >> >>> >>> Thanks >>> >>> On Sun, Feb 20, 2022 at 7:43 PM Giulio Benetti >>> >> > wrote: >>> >>> Hi Mohd, >>> >>> have you used root as user? Or did you provide a user table? >>> >>> Giulio >>> >>> Inviato da iPhone >>> >>> > Il giorno 20 feb 2022, alle ore 11:57, Mohd Faiz Rohani >>> >> > ha scritto: >>> > >>> > ? >>> > Hi guys, >>> > >>> > I managed to compile with success the Uboot(U-Boot >>> 2019.04), Linux kernel(4.4.155)and root file >>> system(systemd 249) using the Buildroot-2021.11.1. It was >>> able to boot successfully until the login prompt. >>> However, it seems like there is an error with the login >>> prompt it does not want to enter, just looping around the >>> login prompt after I have entered the login name (not >>> showing the password prompt). Did anyone know about this? >>> > >>> > Thanks. >>> > _______________________________________________ >>> > buildroot mailing list >>> > buildroot at buildroot.org >>> > https://lists.buildroot.org/mailman/listinfo/buildroot >>> >>> From giulio.benetti at benettiengineering.com Sun Feb 20 17:36:48 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 20 Feb 2022 18:36:48 +0100 Subject: [Buildroot] imx8 common script problem In-Reply-To: References: Message-ID: <1d826e4c-b6ee-0caf-901a-97cd9755e188@benettiengineering.com> Hi Michael, Stephan, All, On 20/02/22 18:05, Michael Nazzareno Trimarchi wrote: > HI all > > I found that in order to generate a correct flash.bin image, the > script at the moment are broken at least for imx8mn. It works only > with this change > > ${HOST_DIR}/bin/mkimage_imx8 -fit -loader > ${BINARIES_DIR}/u-boot-spl-ddr.bin 0x7E1000 -second_loader ${BIN > ARIES_DIR}/u-boot.itb 0x40200000 0x60000 -out ${BINARIES_DIR}/imx8-boot-sd.bin > elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN=y$" > ${BR2_CONFIG}; then > - cat ${BINARIES_DIR}/u-boot-spl.bin > ${BINARIES_DIR}/ddr_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin > + dd if=${BINARIES_DIR}/u-boot-spl.bin > of=${BINARIES_DIR}/u-boot-spl-pad.bin bs=4 conv=sync > + cat ${BINARIES_DIR}/u-boot-spl-pad.bin > ${BINARIES_DIR}/ddr_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin > BL31=${BINARIES_DIR}/bl31.bin > BL33=${BINARIES_DIR}/u-boot-nodtb.bin ATF_LOAD_ADDR=0x00960000 > ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > > ${BINARIES_DIR}/u-boot.its > ${HOST_DIR}/bin/mkimage -E -p 0x3000 -f > ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb > - rm -f ${BINARIES_DIR}/u-boot.its > + #rm -f ${BINARIES_DIR}/u-boot.its > > > The padding seems correct even in the origina soc.mk of imx tools. Can > anyone comment? I think the correct person to ask is Stephan that added support for: board/freescale/imx8mnevk/ configs/freescale_imx8mnevk_defconfig and he maintains him as you can find in DEVELOPERS file. Michael, can you please send a patch --in-reply= to this e-mail with these changes putting in Cc all people I've listed here? So it's easier to review it. Especially for Stephan or who else owns a board with this SoC. Unfortunately I don't have such hardware :-/ Best regards -- Giulio Benetti Benetti Engineering sas From giulio.benetti at benettiengineering.com Sun Feb 20 17:56:24 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 20 Feb 2022 18:56:24 +0100 Subject: [Buildroot] Issue with login In-Reply-To: <469c0dbc-6101-be6c-7272-400ac4512b86@grenoble.cnrs.fr> References: <186B6238-5452-4211-BD9D-29A3C921DE42@benettiengineering.com> <469c0dbc-6101-be6c-7272-400ac4512b86@grenoble.cnrs.fr> Message-ID: <4d8f6289-f16f-9602-a458-2b5836a817e6@benettiengineering.com> Hi Edgar, please reply to all in Mailing List, I add Mohd in Cc, On 20/02/22 17:18, Edgar Bonet wrote: > Hi! > > In his config file, Mohd wrote: >> BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_10=y >> BR2_LINUX_KERNEL_VERSION="4.4.155" > > This may cause problems. C.f. docs/manual/configure.txt: > > If you use kernel headers that are more recent than the Linux > kernel you run on your embedded system, then the C library might > be using interfaces that are not provided by your Linux kernel. Good catch Edgar! So Mohd, what you need here is a toolchain with older libc. https://buildroot.org/downloads/manual/manual.html#_cross_compilation_toolchain But again, do you really need to use so such old versions instead of try to use buildroot's beaglebone_defconfig? > In the same config file, there is: >> # BR2_PACKAGE_BUSYBOX is not set > > When disabling busybox, you should have seen the message: > > You may need to enable other packages to get a working system > You better know what you're doing! Despite of what I've written on my previous e-mail(my test was wrong), he has BR2_INIT_SYSTEMD=y that works as Init System, so that's ok. > And then: >> # BR2_PACKAGE_SYSTEMD_LOGIND is not set Good catch again Edgar! This ^^^ should be the point. Because it's exactly the systemd login dameon. >> # BR2_PACKAGE_UTIL_LINUX_LOGIN is not set This ^^^ is not selected by systemd, so I expect BR2_PACKAGE_SYSTEMD_LOGIND to do the job(even if I'm not a systemd expoert at all). But as Edgar pointed linux headers don't match so you have 3 choices: 1) find a toolchain with linux-headers <= 4.4.* 2) update linux version 3) start from scratch using buildroot beaglebone_defconfig Best regards -- Giulio Benetti Benetti Engineering sas From mohd.faiz.rohani at gmail.com Sun Feb 20 18:33:45 2022 From: mohd.faiz.rohani at gmail.com (Mohd Faiz Rohani) Date: Mon, 21 Feb 2022 02:33:45 +0800 Subject: [Buildroot] Issue with login In-Reply-To: <4d8f6289-f16f-9602-a458-2b5836a817e6@benettiengineering.com> References: <186B6238-5452-4211-BD9D-29A3C921DE42@benettiengineering.com> <469c0dbc-6101-be6c-7272-400ac4512b86@grenoble.cnrs.fr> <4d8f6289-f16f-9602-a458-2b5836a817e6@benettiengineering.com> Message-ID: Thanks, I'll check them out. Will update the outcome once the installation is done. Thank you. On Mon, Feb 21, 2022, 1:56 AM Giulio Benetti < giulio.benetti at benettiengineering.com> wrote: > Hi Edgar, > > please reply to all in Mailing List, I add Mohd in Cc, > > On 20/02/22 17:18, Edgar Bonet wrote: > > Hi! > > > > In his config file, Mohd wrote: > >> BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_10=y > >> BR2_LINUX_KERNEL_VERSION="4.4.155" > > > > This may cause problems. C.f. docs/manual/configure.txt: > > > > If you use kernel headers that are more recent than the Linux > > kernel you run on your embedded system, then the C library might > > be using interfaces that are not provided by your Linux kernel. > > Good catch Edgar! > So Mohd, what you need here is a toolchain with older libc. > > https://buildroot.org/downloads/manual/manual.html#_cross_compilation_toolchain > > But again, do you really need to use so such old versions instead of try > to use buildroot's beaglebone_defconfig? > > > In the same config file, there is: > >> # BR2_PACKAGE_BUSYBOX is not set > > > > When disabling busybox, you should have seen the message: > > > > You may need to enable other packages to get a working system > > You better know what you're doing! > > Despite of what I've written on my previous e-mail(my test was wrong), > he has BR2_INIT_SYSTEMD=y that works as Init System, so that's ok. > > > And then: > >> # BR2_PACKAGE_SYSTEMD_LOGIND is not set > > Good catch again Edgar! This ^^^ should be the point. Because it's > exactly the systemd login dameon. > > >> # BR2_PACKAGE_UTIL_LINUX_LOGIN is not set > > This ^^^ is not selected by systemd, so I expect > BR2_PACKAGE_SYSTEMD_LOGIND to do the job(even if I'm not a systemd > expoert at all). > > But as Edgar pointed linux headers don't match so you have 3 choices: > 1) find a toolchain with linux-headers <= 4.4.* > 2) update linux version > 3) start from scratch using buildroot beaglebone_defconfig > > Best regards > -- > Giulio Benetti > Benetti Engineering sas > -------------- next part -------------- An HTML attachment was scrubbed... URL: From peter at korsgaard.com Sun Feb 20 19:17:57 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 20:17:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/connman: fix build with libexecinfo In-Reply-To: <20220220151944.653455-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 20 Feb 2022 16:19:44 +0100") References: <20220220151944.653455-1-fontaine.fabrice@gmail.com> Message-ID: <87a6elbb4q.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure raised on uclibc and musl since the > addition of libexecinfo package in commit > eea8ba446c10701a273432552108d80fb2224ef4: > /home/peko/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-uclibc/10.3.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: > src/backtrace.o: in function `print_backtrace': > backtrace.c:(.text+0x37): undefined reference to `backtrace' > Fixes: > - http://autobuild.buildroot.org/results/74da4f4deab5f0ae9405d063ad52a5d4904a964d > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 20 19:15:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 20:15:26 +0100 Subject: [Buildroot] [git commit] package/connman: fix build with libexecinfo Message-ID: <20220220191100.9BA59827FE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=20c5569f9c2415364a1d873bc5089dc0ff0f8a35 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/peko/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-uclibc/10.3.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: src/backtrace.o: in function `print_backtrace': backtrace.c:(.text+0x37): undefined reference to `backtrace' Fixes: - http://autobuild.buildroot.org/results/74da4f4deab5f0ae9405d063ad52a5d4904a964d Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/connman/connman.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/connman/connman.mk b/package/connman/connman.mk index 61851bd2dc..1b6fd611f5 100644 --- a/package/connman/connman.mk +++ b/package/connman/connman.mk @@ -109,4 +109,9 @@ else CONNMAN_CONF_OPTS += --disable-client endif +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +CONNMAN_DEPENDENCIES += libexecinfo +CONNMAN_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -lexecinfo" +endif + $(eval $(autotools-package)) From peter at korsgaard.com Sun Feb 20 19:22:29 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 20:22:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/luasyslog: bump to version 2.2.1 In-Reply-To: <20220217094048.2756293-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 17 Feb 2022 10:40:48 +0100") References: <20220217094048.2756293-1-fontaine.fabrice@gmail.com> Message-ID: <875yp9bax6.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > This bump contains a single commit which fixes the following build > failure with Lua 5.4 raised since commit > 4f9a5659023c66fc166de28fd39a6c97a9490667: > In file included from lsyslog.c:11: > compat-5.3.h:402:4: error: #error "unsupported Lua version (i.e. not Lua 5.1, 5.2, or 5.3)" > 402 | # error "unsupported Lua version (i.e. not Lua 5.1, 5.2, or 5.3)" > | ^~~~~ > Also update indentation in hash file (two spaces) > Fixes: > - http://autobuild.buildroot.org/results/df2aabcf2ae07cad66b869ec4ac76702d2c32dc5 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 20 19:22:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 20:22:53 +0100 Subject: [Buildroot] [PATCH] package/zsh: security bump to version 5.8.1 In-Reply-To: <20220218133057.2426-1-peter@korsgaard.com> (Peter Korsgaard's message of "Fri, 18 Feb 2022 14:30:55 +0100") References: <20220218133057.2426-1-peter@korsgaard.com> Message-ID: <871qzxbawi.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Fixes the following security issue: > - CVE-2021-45444: In zsh before 5.8.1, an attacker can achieve code > execution if they control a command output inside the prompt, as > demonstrated by a %F argument. This occurs because of recursive > PROMPT_SUBST expansion. > The 5.8.1 release is not listed in MD5SUM, so drop the md5 hash. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 20 19:22:11 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 20:22:11 +0100 Subject: [Buildroot] [git commit] package/luasyslog: bump to version 2.2.1 Message-ID: <20220220191524.37DE582BCF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=25fc617963b4ae28b20e9bc07863500f62c0862d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This bump contains a single commit which fixes the following build failure with Lua 5.4 raised since commit 4f9a5659023c66fc166de28fd39a6c97a9490667: In file included from lsyslog.c:11: compat-5.3.h:402:4: error: #error "unsupported Lua version (i.e. not Lua 5.1, 5.2, or 5.3)" 402 | # error "unsupported Lua version (i.e. not Lua 5.1, 5.2, or 5.3)" | ^~~~~ Also update indentation in hash file (two spaces) Fixes: - http://autobuild.buildroot.org/results/df2aabcf2ae07cad66b869ec4ac76702d2c32dc5 Signed-off-by: Fabrice Fontaine Reviewed-by: Romain Naour Tested-by: Romain Naour Signed-off-by: Peter Korsgaard --- package/luasyslog/luasyslog.hash | 4 ++-- package/luasyslog/luasyslog.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/luasyslog/luasyslog.hash b/package/luasyslog/luasyslog.hash index bcb6a7e025..1e2a5ddec5 100644 --- a/package/luasyslog/luasyslog.hash +++ b/package/luasyslog/luasyslog.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7f7dad64117407f2484ff5b53e90804f923a99fcbde5872e54f6aba53f482da0 luasyslog-2.2.0.tar.gz -sha256 833457938f5155e65dabda12a5c9d4b6fd7fb92dd7ead584c1c30cfb0c84adf4 COPYING +sha256 b1b19ca142130f93c3f8f2e85303ff50cc6f4ed4aa52b8569176ae56e3dc3f43 luasyslog-2.2.1.tar.gz +sha256 833457938f5155e65dabda12a5c9d4b6fd7fb92dd7ead584c1c30cfb0c84adf4 COPYING diff --git a/package/luasyslog/luasyslog.mk b/package/luasyslog/luasyslog.mk index 049e068a13..972d4c5a7d 100644 --- a/package/luasyslog/luasyslog.mk +++ b/package/luasyslog/luasyslog.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUASYSLOG_VERSION = 2.2.0 +LUASYSLOG_VERSION = 2.2.1 LUASYSLOG_SITE = $(call github,ntd,luasyslog,$(LUASYSLOG_VERSION)) LUASYSLOG_DEPENDENCIES = host-luarocks luainterpreter LUASYSLOG_LICENSE = MIT From peter at korsgaard.com Sun Feb 20 19:23:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 20:23:03 +0100 Subject: [Buildroot] [git commit] package/zsh: security bump to version 5.8.1 Message-ID: <20220220191524.402D07FF78@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ca6c2ee3da7be5e4af478e779b49248b89e6514d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes the following security issue: - CVE-2021-45444: In zsh before 5.8.1, an attacker can achieve code execution if they control a command output inside the prompt, as demonstrated by a %F argument. This occurs because of recursive PROMPT_SUBST expansion. The 5.8.1 release is not listed in MD5SUM, so drop the md5 hash. Signed-off-by: Peter Korsgaard --- package/zsh/zsh.hash | 6 +----- package/zsh/zsh.mk | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/package/zsh/zsh.hash b/package/zsh/zsh.hash index 2df409c946..5c661ded25 100644 --- a/package/zsh/zsh.hash +++ b/package/zsh/zsh.hash @@ -1,7 +1,3 @@ -# From http://www.zsh.org/pub/MD5SUM -md5 e02a5428620b3dd268800c7843b3dd4d zsh-5.8.tar.xz -# Calculated based on the hash above and after checking signature -# http://www.zsh.org/pub/zsh-5.8.tar.xz.asc -sha256 dcc4b54cc5565670a65581760261c163d720991f0d06486da61f8d839b52de27 zsh-5.8.tar.xz # Locally calculated +sha256 b6973520bace600b4779200269b1e5d79e5f505ac4952058c11ad5bbf0dd9919 zsh-5.8.1.tar.xz sha256 d06fdf3ef9b1ec69d6b9e170b0a9516fbad3523261ff1668bde3bfea6e0ef5f5 LICENCE diff --git a/package/zsh/zsh.mk b/package/zsh/zsh.mk index 1a04833211..c5ab7c2fae 100644 --- a/package/zsh/zsh.mk +++ b/package/zsh/zsh.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZSH_VERSION = 5.8 +ZSH_VERSION = 5.8.1 ZSH_SITE = http://www.zsh.org/pub ZSH_SOURCE = zsh-$(ZSH_VERSION).tar.xz ZSH_DEPENDENCIES = ncurses From peter at korsgaard.com Sun Feb 20 19:35:52 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 20:35:52 +0100 Subject: [Buildroot] Analysis of runtime test failures In-Reply-To: <842a7d9b-e991-149e-c6a6-9a36b29e9ff3@gmail.com> (Romain Naour's message of "Sun, 20 Feb 2022 17:25:04 +0100") References: <20220220170222.06d88b45@windsurf> <842a7d9b-e991-149e-c6a6-9a36b29e9ff3@gmail.com> Message-ID: <87wnhp9vqf.fsf@dell.be.48ers.dk> >>>>> "Romain" == Romain Naour writes: > Hello Thomas, > Le 20/02/2022 ? 17:02, Thomas Petazzoni via buildroot a ?crit?: >> Hello, >> >> Six of our runtime tests are failing, so I went ahead and quickly look >> at the error messages. Here is my summary: >> >> === tests.package.test_ipython.TestIPythonPy3 === >> >> https://gitlab.com/buildroot.org/buildroot/-/jobs/2088684091 >> >> Error is: >> >> # ipython -c 'import math; math.floor(12.3)' >> -sh: ipython: not found > ipython use a wrong shebang on the target: > # head -n 1 /usr/bin/ipython > #!/home/kubu/buildroot/testsuite-master/TestIPythonPy3/host/bin/python > The issue come from python3-setuptools 60.0.0 that changed > SETUPTOOLS_USE_DISTUTILS [1]. This is actually a "breaking" change [2]. > We have to override SETUPTOOLS_USE_DISTUTILS to the previous value "stdlib" to > fixes the issue. > [1] > https://github.com/pypa/setuptools/commit/b6fcbbd00cb6d5607c9272dec452a50457bdb292 > [2] https://github.com/pypa/setuptools/blob/v60.0.0/CHANGES.rst#breaking-changes This is then presumably something we want to do globally then? James, what do you say? -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 20 19:36:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 20:36:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/wpewebkit: security bump to version 2.34.6 In-Reply-To: <20220217232113.1598433-1-aperez@igalia.com> (Adrian Perez de Castro's message of "Fri, 18 Feb 2022 01:21:13 +0200") References: <20220217232113.1598433-1-aperez@igalia.com> Message-ID: <87sfsd9vpa.fsf@dell.be.48ers.dk> >>>>> "Adrian" == Adrian Perez de Castro writes: > This brings the package two minor releases forward, which provides fixes > for CVE-2022-22589, CVE-2022-22590, CVE-2022-22592, and CVE-2022-22620. > Release notes can be found at: > https://wpewebkit.org/release/wpewebkit-2.34.5.html > https://wpewebkit.org/release/wpewebkit-2.34.6.html > The security advisories covering this update are available at: > https://wpewebkit.org/security/WSA-2022-0002.html > https://wpewebkit.org/security/WSA-2022-0003.html > Signed-off-by: Adrian Perez de Castro Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 20 19:36:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 20:36:20 +0100 Subject: [Buildroot] [git commit] package/wpewebkit: security bump to version 2.34.6 Message-ID: <20220220192905.15E6F82A9D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ffeeb7f3d36df58121ec9876432950bb0ac3a5fb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This brings the package two minor releases forward, which provides fixes for CVE-2022-22589, CVE-2022-22590, CVE-2022-22592, and CVE-2022-22620. Release notes can be found at: https://wpewebkit.org/release/wpewebkit-2.34.5.html https://wpewebkit.org/release/wpewebkit-2.34.6.html The security advisories covering this update are available at: https://wpewebkit.org/security/WSA-2022-0002.html https://wpewebkit.org/security/WSA-2022-0003.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard --- 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 b863a0d705..231bbc447d 100644 --- a/package/wpewebkit/wpewebkit.hash +++ b/package/wpewebkit/wpewebkit.hash @@ -1,7 +1,7 @@ -# 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 +# From https://wpewebkit.org/releases/wpewebkit-2.34.6.tar.xz.sums +md5 c9705270b342474cca28cf51632ccbbe wpewebkit-2.34.6.tar.xz +sha1 44ae95de1b5ebf0a2b0ea3630b3677153c597402 wpewebkit-2.34.6.tar.xz +sha256 301e895c8ed08ce7dccef3192b972f2ccfc2020463244c64069a636f2b05265f wpewebkit-2.34.6.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 8d564d8223..aa04e78623 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.34.4 +WPEWEBKIT_VERSION = 2.34.6 WPEWEBKIT_SITE = http://www.wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES From yann.morin.1998 at free.fr Sun Feb 20 20:07:07 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 20 Feb 2022 21:07:07 +0100 Subject: [Buildroot] [git commit] package/gdk-pixbuf: fix run with per-package directory Message-ID: <20220220201459.ABBEE832DB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=75361a9aba042799040591fb84192802b137fc3a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master gdk-pixbuf is based on plugins (modules in gdk-pixbuf parlance) that are provided either by the gdk-pixbuf package itself, or be installed by third-party packages, like librsvg. At runtime, those plugins get loaded by helper function in the gdk-pixbuf library. The location where to find those modules is currently hard-coded at build time, to the location where gdb-pixbuf is installed.. This means that host-packages that install image-conversion utilities will try to look in the path where gdk-pixbuf was installed. With per-package directories, this fails to find any module that was installed bu a third-party package. For example, the module for loading an SVG provided by librsvg, so it is not present in the PPD of gdk-pixbuf, and thus loading an SVG (e.g. to convert it to another format, like adwaita-icon-theme does) will fail with: Can't load file: Unrecognized image file format However, gdk-pixbuf can be configured so as to look for the modules relative to where the program is run from, rather than hard-coding the location at build time. This is exactly what we need in the PPD case Additionally, even without PPD, this would fail in a similar manner in the SDK, as that can be relocated too. So we unconditionally enable the relocatable option, but only for the host variant (there is no reason to enable it for the target, as it is not going to be relocated). Fixes: - http://autobuild.buildroot.org/results/0e00059b09b4445eaaec1030997883187c6a80d6 Signed-off-by: Fabrice Fontaine [yann.morin.1998 at free.fr: reword the already-good commit log] Signed-off-by: Yann E. MORIN --- package/gdk-pixbuf/gdk-pixbuf.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk index cd30d450d5..b22e9568c9 100644 --- a/package/gdk-pixbuf/gdk-pixbuf.mk +++ b/package/gdk-pixbuf/gdk-pixbuf.mk @@ -26,6 +26,7 @@ HOST_GDK_PIXBUF_CONF_OPTS = \ -Dgio_sniffing=false \ -Dinstalled_tests=false \ -Dintrospection=disabled \ + -Drelocatable=true \ -Dman=false ifeq ($(BR2_STATIC_LIBS),y) From yann.morin.1998 at free.fr Sun Feb 20 20:24:35 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 20 Feb 2022 21:24:35 +0100 Subject: [Buildroot] [PATCH v2, 1/2] package/gdk-pixbuf: enable relocatable option In-Reply-To: <20220220121637.200393-1-fontaine.fabrice@gmail.com> References: <20220220121637.200393-1-fontaine.fabrice@gmail.com> Message-ID: <20220220202435.GZ522310@scaer> Fabrice, All, On 2022-02-20 13:16 +0100, Fabrice Fontaine spake thusly: > Enable relocatable option to fix the following PPD build failure of > adwaita-icon-theme: > > Can't load file: Unrecognized image file format > > This failure is raised because the SVG library is not found by > gtk-encode-symbolic-svg. To find the SVG library, > gtk-encode-symbolic-svg depends on libgtk_pixbuf library which reads the > loaders.cache file using: > - a hardcoded path (which points to host-gdk-pixbuf per-package > directory) if relocatable is disabled. The loaders.cache in this > directory doesn't declare SVG support because it has not yet been > updated by host-librsvg > - or a dynamic path corresponding to the binary location if relocatable > is enabled. > > So obviously, we need to set relocatable to true. > > Fixes: > - http://autobuild.buildroot.org/results/0e00059b09b4445eaaec1030997883187c6a80d6 Thanks for providing more details, this is much better indeed, thanks! :-) I've still felt the need to extend the commit log, because I found that it left out some information adn explanations that may b needed in the future. Applied to master, thanks! :-) Regards, Yann E. MORIN. > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2 (after review of Yann E. Morin): > - Drop relocatable from target > - Enhance commit message > > package/gdk-pixbuf/gdk-pixbuf.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk > index cd30d450d5..b22e9568c9 100644 > --- a/package/gdk-pixbuf/gdk-pixbuf.mk > +++ b/package/gdk-pixbuf/gdk-pixbuf.mk > @@ -26,6 +26,7 @@ HOST_GDK_PIXBUF_CONF_OPTS = \ > -Dgio_sniffing=false \ > -Dinstalled_tests=false \ > -Dintrospection=disabled \ > + -Drelocatable=true \ > -Dman=false > > ifeq ($(BR2_STATIC_LIBS),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 peter at korsgaard.com Sun Feb 20 20:32:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 21:32:24 +0100 Subject: [Buildroot] [PATCH 1/2] package/webkitgtk: security bump to 2.34.6 In-Reply-To: <20220217230908.1532564-1-aperez@igalia.com> (Adrian Perez de Castro's message of "Fri, 18 Feb 2022 01:09:07 +0200") References: <20220217230908.1532564-1-aperez@igalia.com> Message-ID: <87o8319t47.fsf@dell.be.48ers.dk> >>>>> "Adrian" == Adrian Perez de Castro writes: > Update to a new major release which brings in improvements, a number of > new features, and security fixes. Release notes: > https://webkitgtk.org/2021/09/22/webkitgtk2.34.0-released.html > https://webkitgtk.org/2021/10/21/webkitgtk2.34.1-released.html > https://webkitgtk.org/2021/11/24/webkitgtk2.34.2-released.html > https://webkitgtk.org/2021/12/20/webkitgtk2.34.3-released.html > https://webkitgtk.org/2022/01/21/webkitgtk2.34.4-released.html > https://webkitgtk.org/2022/02/09/webkitgtk2.34.5-released.html > https://webkitgtk.org/2022/02/17/webkitgtk2.34.6-released.html > Security advisories: > https://webkitgtk.org/security/WSA-2021-0007.html > https://webkitgtk.org/security/WSA-2022-0001.html > https://webkitgtk.org/security/WSA-2022-0002.html > https://webkitgtk.org/security/WSA-2022-0003.html > Some of the new features require additional dependencies: HTTP/2 > requires libsoup3, which is not yet packaged in Buildroot, and > disabled at the moment (with -DUSE_SOUP2=ON, to keep using libsoup2); > and the color management support needs LCMS2 (which will be enabled > in a follow-up patch.) > Options SILENCE_CROSS_COMPILATION_NOTICES and ENABLE_GRAPHICS_CONTEXT_GL > do not exist anymore, and their usage is dropped. > Signed-off-by: Adrian Perez de Castro > --- > package/webkitgtk/webkitgtk.hash | 8 ++++---- > package/webkitgtk/webkitgtk.mk | 14 +++++--------- > 2 files changed, 9 insertions(+), 13 deletions(-) > diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash > index 7cb6c90b21..82c210c8f9 100644 > --- a/package/webkitgtk/webkitgtk.hash > +++ b/package/webkitgtk/webkitgtk.hash > @@ -1,7 +1,7 @@ > -# From https://webkitgtk.org/releases/webkitgtk-2.32.4.tar.xz.sums > -md5 51a167e5d03bacf30c5c588e6aa23143 webkitgtk-2.32.4.tar.xz > -sha1 f7255ffb488e727e9e250e0dae9f192266f50f01 webkitgtk-2.32.4.tar.xz > -sha256 00ce2d3f798d7bc5e9039d9059f0c3c974d51de38c8b716f00e94452a177d3fd webkitgtk-2.32.4.tar.xz > +# From https://webkitgtk.org/releases/webkitgtk-2.34.6.tar.xz.sums > +md5 a5eeedd02f5b4bba8bd891b92dc743d4 webkitgtk-2.34.6.tar.xz > +sha1 bb82517289baf9c858fa406d1d845274f81e25cb webkitgtk-2.34.6.tar.xz > +sha256 6bc8fd034aad0432a2459ce4fc7ee25ad65a4924c618bf8d93b52b0c1a84c1f6 webkitgtk-2.34.6.tar.xz > # Hashes for license files: > sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE > diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk > index 16b925fe71..f4fc1e7838 100644 > --- a/package/webkitgtk/webkitgtk.mk > +++ b/package/webkitgtk/webkitgtk.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > -WEBKITGTK_VERSION = 2.32.4 > +WEBKITGTK_VERSION = 2.34.6 > WEBKITGTK_SITE = https://www.webkitgtk.org/releases > WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz > WEBKITGTK_INSTALL_STAGING = YES > @@ -24,10 +24,11 @@ WEBKITGTK_CONF_OPTS = \ > -DENABLE_MINIBROWSER=ON \ > -DENABLE_SPELLCHECK=ON \ > -DPORT=GTK \ > - -DSILENCE_CROSS_COMPILATION_NOTICES=ON \ > + -DUSE_LCMS=OFF \ > -DUSE_LIBNOTIFY=OFF \ > -DUSE_LIBHYPHEN=OFF \ > -DUSE_OPENJPEG=ON \ > + -DUSE_SOUP2=ON \ > -DUSE_WOFF2=ON This is apparently not against master, as master has -DUSE_WPE_RENDERER=OFF here since your commit 38b740ec6f44b4 (package/webkitgtk: bump to version 2.26.0)? Please send patches against current git. Committed to master after fixing that up, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 20 20:33:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 21:33:10 +0100 Subject: [Buildroot] [PATCH 2/2] package/webkitgtk: use lcms2 if available In-Reply-To: <20220217230908.1532564-2-aperez@igalia.com> (Adrian Perez de Castro's message of "Fri, 18 Feb 2022 01:09:08 +0200") References: <20220217230908.1532564-1-aperez@igalia.com> <20220217230908.1532564-2-aperez@igalia.com> Message-ID: <87k0dp9t2x.fsf@dell.be.48ers.dk> >>>>> "Adrian" == Adrian Perez de Castro writes: > Make webkitgtk enable color management support if the lcms2 package has > been selected. > Signed-off-by: Adrian Perez de Castro Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 20 20:35:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 21:35:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-twisted: security bump to version 22.1.0 In-Reply-To: <20220218105557.705926-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 18 Feb 2022 11:55:57 +0100") References: <20220218105557.705926-1-fontaine.fabrice@gmail.com> Message-ID: <87fsod9szu.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2022-21712: twisted is an event-driven networking engine written > in Python. In affected versions twisted exposes cookies and > authorization headers when following cross-origin redirects. This issue > is present in the `twited.web.RedirectAgent` and `twisted.web. > BrowserLikeRedirectAgent` functions. Users are advised to upgrade. There > are no known workarounds. > Update hash of license file (author added and update in year: > https://github.com/twisted/twisted/commit/13aa59746a73769b05a51c2198b28f5602dd382f > https://github.com/twisted/twisted/commit/adfdf23477abfcd09a867347993fc1d207cfb4dd > https://github.com/twisted/twisted/commit/7e65fbeed3d74a4eb1c40d7a6df5651782becbc8) > https://github.com/twisted/twisted/security/advisories/GHSA-92x2-jw7w-xvvx > https://github.com/twisted/twisted/releases/tag/twisted-22.1.0 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Sun Feb 20 20:47:22 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 20 Feb 2022 21:47:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/expat: bump to version 2.4.6 Message-ID: <20220220204722.1737731-1-fontaine.fabrice@gmail.com> This release fixes a regression introduced by one of the security fixes in 2.4.5. https://blog.hartwork.org/posts/expat-2-4-6-released https://github.com/libexpat/libexpat/blob/R_2_4_6/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 cd2e8c7fb9..0d9f60931f 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.5/ -md5 9dc183e6c1eebc1b658c1e71be0885e1 expat-2.4.5.tar.xz -sha1 360a49b55c442e91cb7b328bc0335083909ddf4f expat-2.4.5.tar.xz +# From https://sourceforge.net/projects/expat/files/expat/2.4.6/ +md5 22a30c888752fdda9f8dd1b7281c54b0 expat-2.4.6.tar.xz +sha1 26e223c4795c242814b0e3299a5027c22b9dc733 expat-2.4.6.tar.xz # Locally calculated -sha256 f2af8fc7cdc63a87920da38cd6d12cb113c3c3a3f437495b1b6541e0cff32579 expat-2.4.5.tar.xz +sha256 de55794b7a9bc214852fdc075beaaecd854efe1361597e6268ee87946951289b expat-2.4.6.tar.xz sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec COPYING diff --git a/package/expat/expat.mk b/package/expat/expat.mk index 7815d61027..c481b5c225 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.4.5 +EXPAT_VERSION = 2.4.6 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 peter at korsgaard.com Sun Feb 20 20:52:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 21:52:28 +0100 Subject: [Buildroot] [git commit] package/webkitgtk: use lcms2 if available Message-ID: <20220220204447.705B183489@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5663f3679dbeef791d3e0dcf8c8695b2312044db branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Make webkitgtk enable color management support if the lcms2 package has been selected. Signed-off-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard --- package/webkitgtk/webkitgtk.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index eaf98900ef..36e4b8943b 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -24,7 +24,6 @@ WEBKITGTK_CONF_OPTS = \ -DENABLE_MINIBROWSER=ON \ -DENABLE_SPELLCHECK=ON \ -DPORT=GTK \ - -DUSE_LCMS=OFF \ -DUSE_LIBNOTIFY=OFF \ -DUSE_LIBHYPHEN=OFF \ -DUSE_OPENJPEG=ON \ @@ -59,6 +58,13 @@ else WEBKITGTK_CONF_OPTS += -DENABLE_WEBDRIVER=OFF endif +ifeq ($(BR2_PACKAGE_LCMS2),y) +WEBKITGTK_CONF_OPTS += -DUSE_LCMS=ON +WEBKITGTK_DEPENDENCIES += lcms2 +else +WEBKITGTK_CONF_OPTS += -DUSE_LCMS=OFF +endif + ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) WEBKITGTK_CONF_OPTS += -DENABLE_INTROSPECTION=ON WEBKITGTK_DEPENDENCIES += gobject-introspection From peter at korsgaard.com Sun Feb 20 20:52:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 21:52:27 +0100 Subject: [Buildroot] [git commit] package/webkitgtk: security bump to 2.34.6 Message-ID: <20220220204447.67ABF83483@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=057e89c9c596cb876379757cb530fdb8a8d42bf3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update to a new major release which brings in improvements, a number of new features, and security fixes. Release notes: https://webkitgtk.org/2021/09/22/webkitgtk2.34.0-released.html https://webkitgtk.org/2021/10/21/webkitgtk2.34.1-released.html https://webkitgtk.org/2021/11/24/webkitgtk2.34.2-released.html https://webkitgtk.org/2021/12/20/webkitgtk2.34.3-released.html https://webkitgtk.org/2022/01/21/webkitgtk2.34.4-released.html https://webkitgtk.org/2022/02/09/webkitgtk2.34.5-released.html https://webkitgtk.org/2022/02/17/webkitgtk2.34.6-released.html Security advisories: https://webkitgtk.org/security/WSA-2021-0007.html https://webkitgtk.org/security/WSA-2022-0001.html https://webkitgtk.org/security/WSA-2022-0002.html https://webkitgtk.org/security/WSA-2022-0003.html Some of the new features require additional dependencies: HTTP/2 requires libsoup3, which is not yet packaged in Buildroot, and disabled at the moment (with -DUSE_SOUP2=ON, to keep using libsoup2); and the color management support needs LCMS2 (which will be enabled in a follow-up patch.) Options SILENCE_CROSS_COMPILATION_NOTICES and ENABLE_GRAPHICS_CONTEXT_GL do not exist anymore, and their usage is dropped. Signed-off-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard --- package/webkitgtk/webkitgtk.hash | 8 ++++---- package/webkitgtk/webkitgtk.mk | 14 +++++--------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index 7cb6c90b21..82c210c8f9 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,7 +1,7 @@ -# From https://webkitgtk.org/releases/webkitgtk-2.32.4.tar.xz.sums -md5 51a167e5d03bacf30c5c588e6aa23143 webkitgtk-2.32.4.tar.xz -sha1 f7255ffb488e727e9e250e0dae9f192266f50f01 webkitgtk-2.32.4.tar.xz -sha256 00ce2d3f798d7bc5e9039d9059f0c3c974d51de38c8b716f00e94452a177d3fd webkitgtk-2.32.4.tar.xz +# From https://webkitgtk.org/releases/webkitgtk-2.34.6.tar.xz.sums +md5 a5eeedd02f5b4bba8bd891b92dc743d4 webkitgtk-2.34.6.tar.xz +sha1 bb82517289baf9c858fa406d1d845274f81e25cb webkitgtk-2.34.6.tar.xz +sha256 6bc8fd034aad0432a2459ce4fc7ee25ad65a4924c618bf8d93b52b0c1a84c1f6 webkitgtk-2.34.6.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index 4d5d0b89e2..eaf98900ef 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.32.4 +WEBKITGTK_VERSION = 2.34.6 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES @@ -24,10 +24,11 @@ WEBKITGTK_CONF_OPTS = \ -DENABLE_MINIBROWSER=ON \ -DENABLE_SPELLCHECK=ON \ -DPORT=GTK \ - -DSILENCE_CROSS_COMPILATION_NOTICES=ON \ + -DUSE_LCMS=OFF \ -DUSE_LIBNOTIFY=OFF \ -DUSE_LIBHYPHEN=OFF \ -DUSE_OPENJPEG=ON \ + -DUSE_SOUP2=ON \ -DUSE_WOFF2=ON \ -DUSE_WPE_RENDERER=OFF @@ -74,7 +75,6 @@ ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) WEBKITGTK_CONF_OPTS += \ -DENABLE_ACCELERATED_2D_CANVAS=ON \ -DENABLE_GLES2=OFF \ - -DENABLE_GRAPHICS_CONTEXT_GL=ON \ -DENABLE_X11_TARGET=ON WEBKITGTK_DEPENDENCIES += libgl \ xlib_libXcomposite xlib_libXdamage xlib_libXrender xlib_libXt @@ -90,15 +90,11 @@ else # !X11 WEBKITGTK_DEPENDENCIES += libegl # GLESv2 support is optional though ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) -WEBKITGTK_CONF_OPTS += \ - -DENABLE_GLES2=ON \ - -DENABLE_GRAPHICS_CONTEXT_GL=ON +WEBKITGTK_CONF_OPTS += -DENABLE_GLES2=ON WEBKITGTK_DEPENDENCIES += libgles else # Disable general OpenGL (shading) if there's no GLESv2 -WEBKITGTK_CONF_OPTS += \ - -DENABLE_GLES2=OFF \ - -DENABLE_GRAPHICS_CONTEXT_GL=OFF +WEBKITGTK_CONF_OPTS += -DENABLE_GLES2=OFF endif # We must explicitly state the wayland target ifeq ($(BR2_PACKAGE_LIBGTK3_WAYLAND),y) From peter at korsgaard.com Sun Feb 20 20:52:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 21:52:28 +0100 Subject: [Buildroot] [git commit] package/python-twisted: security bump to version 22.1.0 Message-ID: <20220220204447.7A7A88348A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=af37e96f3d85a687503c85e7d2e37cfbd791dd18 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2022-21712: twisted is an event-driven networking engine written in Python. In affected versions twisted exposes cookies and authorization headers when following cross-origin redirects. This issue is present in the `twited.web.RedirectAgent` and `twisted.web. BrowserLikeRedirectAgent` functions. Users are advised to upgrade. There are no known workarounds. Update hash of license file (author added and update in year: https://github.com/twisted/twisted/commit/13aa59746a73769b05a51c2198b28f5602dd382f https://github.com/twisted/twisted/commit/adfdf23477abfcd09a867347993fc1d207cfb4dd https://github.com/twisted/twisted/commit/7e65fbeed3d74a4eb1c40d7a6df5651782becbc8) https://github.com/twisted/twisted/security/advisories/GHSA-92x2-jw7w-xvvx https://github.com/twisted/twisted/releases/tag/twisted-22.1.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/python-twisted/python-twisted.hash | 6 +++--- package/python-twisted/python-twisted.mk | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-twisted/python-twisted.hash b/package/python-twisted/python-twisted.hash index c633112e9d..8f0935e4f0 100644 --- a/package/python-twisted/python-twisted.hash +++ b/package/python-twisted/python-twisted.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/twisted/json -md5 fc16d575730db7d0cddd09fc35af3eea Twisted-20.3.0.tar.bz2 -sha256 d72c55b5d56e176563b91d11952d13b01af8725c623e498db5507b6614fc1e10 Twisted-20.3.0.tar.bz2 +md5 c818cb1ab241dc249517442e5a0e0412 Twisted-22.1.0.tar.gz +sha256 b7971ec9805b0f80e1dcb1a3721d7bfad636d5f909de687430ce373979d67b61 Twisted-22.1.0.tar.gz # Locally computed sha256 -sha256 98426fd47315df70098e0d85efbb5d7dd8001c9c536386937354640d6d8d75b9 LICENSE +sha256 686f6426a775450eb3afd00bc3a5c2621f305ddb9c8478ee9bf28a368ef2dece LICENSE diff --git a/package/python-twisted/python-twisted.mk b/package/python-twisted/python-twisted.mk index 49d97af097..8e867cfb58 100644 --- a/package/python-twisted/python-twisted.mk +++ b/package/python-twisted/python-twisted.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TWISTED_VERSION = 20.3.0 -PYTHON_TWISTED_SOURCE = Twisted-$(PYTHON_TWISTED_VERSION).tar.bz2 -PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/4a/b4/4973c7ccb5be2ec0abc779b7d5f9d5f24b17b0349e23240cfc9dc3bd83cc +PYTHON_TWISTED_VERSION = 22.1.0 +PYTHON_TWISTED_SOURCE = Twisted-$(PYTHON_TWISTED_VERSION).tar.gz +PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/77/b8/8108806ebf2b33654989fd1511281dc94a49fa7e03326d84fe5498ecfae4 PYTHON_TWISTED_SETUP_TYPE = setuptools PYTHON_TWISTED_LICENSE = MIT PYTHON_TWISTED_LICENSE_FILES = LICENSE From peter at korsgaard.com Sun Feb 20 21:10:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 22:10:54 +0100 Subject: [Buildroot] [PATCH] support/testing/../sample_python_pyyaml_dec.py: unbreak after move to pyaml 6.0 Message-ID: <20220220211055.1273368-1-peter@korsgaard.com> Fixes https://gitlab.com/buildroot.org/buildroot/-/jobs/2088684091 python sample_python_pyyaml_dec.py Traceback (most recent call last): File "/root/sample_python_pyyaml_dec.py", line 5, in data = yaml.load(serialized) TypeError: load() missing 1 required positional argument: 'Loader' yaml.load() requires a loader argument since the move to version 6.0: https://github.com/yaml/pyyaml/pull/561 The test does not need the extra functionality of load(), so instead move to the recommended safe_load(). Signed-off-by: Peter Korsgaard --- support/testing/tests/package/sample_python_pyyaml_dec.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/package/sample_python_pyyaml_dec.py b/support/testing/tests/package/sample_python_pyyaml_dec.py index 9ab8931197..bb90934f26 100644 --- a/support/testing/tests/package/sample_python_pyyaml_dec.py +++ b/support/testing/tests/package/sample_python_pyyaml_dec.py @@ -2,7 +2,7 @@ import yaml with open("/tmp/data.yml", "rb") as f: serialized = f.read() -data = yaml.load(serialized) +data = yaml.safe_load(serialized) print(data) assert(data["name"] == "python-pyyaml") assert(data["versions"] == ["1", "2"]) -- 2.30.2 From peter at korsgaard.com Sun Feb 20 21:26:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 22:26:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/expat: bump to version 2.4.6 In-Reply-To: <20220220204722.1737731-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 20 Feb 2022 21:47:22 +0100") References: <20220220204722.1737731-1-fontaine.fabrice@gmail.com> Message-ID: <87bkz19qly.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > This release fixes a regression introduced by one of the security fixes > in 2.4.5. > https://blog.hartwork.org/posts/expat-2-4-6-released > https://github.com/libexpat/libexpat/blob/R_2_4_6/expat/Changes > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 20 21:26:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 22:26:26 +0100 Subject: [Buildroot] [git commit] package/expat: bump to version 2.4.6 Message-ID: <20220220211853.AA05A821A5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=46390b3a7c47420b7523b8f18276f3ccd49940c7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This release fixes a regression introduced by one of the security fixes in 2.4.5. https://blog.hartwork.org/posts/expat-2-4-6-released https://github.com/libexpat/libexpat/blob/R_2_4_6/expat/Changes Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/expat/expat.hash | 8 ++++---- package/expat/expat.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index cd2e8c7fb9..0d9f60931f 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.5/ -md5 9dc183e6c1eebc1b658c1e71be0885e1 expat-2.4.5.tar.xz -sha1 360a49b55c442e91cb7b328bc0335083909ddf4f expat-2.4.5.tar.xz +# From https://sourceforge.net/projects/expat/files/expat/2.4.6/ +md5 22a30c888752fdda9f8dd1b7281c54b0 expat-2.4.6.tar.xz +sha1 26e223c4795c242814b0e3299a5027c22b9dc733 expat-2.4.6.tar.xz # Locally calculated -sha256 f2af8fc7cdc63a87920da38cd6d12cb113c3c3a3f437495b1b6541e0cff32579 expat-2.4.5.tar.xz +sha256 de55794b7a9bc214852fdc075beaaecd854efe1361597e6268ee87946951289b expat-2.4.6.tar.xz sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec COPYING diff --git a/package/expat/expat.mk b/package/expat/expat.mk index 7815d61027..c481b5c225 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.4.5 +EXPAT_VERSION = 2.4.6 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 Sun Feb 20 21:27:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 22:27:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/zfs: replace PYTHON_VERSION_MAJOR In-Reply-To: <20220218100709.677205-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 18 Feb 2022 11:07:09 +0100") References: <20220218100709.677205-1-fontaine.fabrice@gmail.com> Message-ID: <877d9p9qjw.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Replace PYTHON_VERSION_MAJOR by PYTHON3_VERSION_MAJOR now that python2 > has been dropped. It should be noted that PYTHON_SITE_PKG was wrongly > set since the addition of the package in commit > 4470bc9914d730383db86f58bc86fb09739622dc > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 20 21:27:52 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 22:27:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pygame: replace PYTHON_VERSION_MAJOR In-Reply-To: <20220218100853.677373-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 18 Feb 2022 11:08:53 +0100") References: <20220218100853.677373-1-fontaine.fabrice@gmail.com> Message-ID: <8735kd9qjr.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Replace PYTHON_VERSION_MAJOR by PYTHON3_VERSION_MAJOR now that python2 > has been dropped > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 20 21:29:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 22:29:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xdriver_xf86-video-ati: don't override XDRIVER_XF86_VIDEO_ATI_CONF_OPTS In-Reply-To: <20220217215413.556297-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 17 Feb 2022 22:54:13 +0100") References: <20220217215413.556297-1-fontaine.fabrice@gmail.com> Message-ID: <87y2258bxe.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > XDRIVER_XF86_VIDEO_ATI_CONF_OPTS is wrongly overridden in a conditional > since commit daa433bff6d2d9934705feacd3619a7618d13ae5 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 20 21:27:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 22:27:23 +0100 Subject: [Buildroot] [git commit] package/zfs: replace PYTHON_VERSION_MAJOR Message-ID: <20220220212127.3CA33821A5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3c10bb052d94cb9d96881344d149a29a6bfb73b5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Replace PYTHON_VERSION_MAJOR by PYTHON3_VERSION_MAJOR now that python2 has been dropped. It should be noted that PYTHON_SITE_PKG was wrongly set since the addition of the package in commit 4470bc9914d730383db86f58bc86fb09739622dc Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/zfs/zfs.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zfs/zfs.mk b/package/zfs/zfs.mk index 6b542f5c05..dbda8aceb4 100644 --- a/package/zfs/zfs.mk +++ b/package/zfs/zfs.mk @@ -44,7 +44,7 @@ ZFS_CONF_ENV += \ PYTHON_CPPFLAGS="`$(STAGING_DIR)/usr/bin/python3-config --includes`" \ PYTHON_LIBS="`$(STAGING_DIR)/usr/bin/python3-config --ldflags`" \ PYTHON_EXTRA_LIBS="`$(STAGING_DIR)/usr/bin/python3-config --libs --embed`" \ - PYTHON_SITE_PKG="/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages" + PYTHON_SITE_PKG="/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages" ZFS_CONF_OPTS += --enable-pyzfs else ZFS_CONF_OPTS += --disable-pyzfs --without-python From peter at korsgaard.com Sun Feb 20 21:27:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 22:27:40 +0100 Subject: [Buildroot] [git commit] package/python-pygame: replace PYTHON_VERSION_MAJOR Message-ID: <20220220212127.491E283483@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=70980a154b18c5fe6db940faf36f07ee20e27a70 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Replace PYTHON_VERSION_MAJOR by PYTHON3_VERSION_MAJOR now that python2 has been dropped Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/python-pygame/python-pygame.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-pygame/python-pygame.mk b/package/python-pygame/python-pygame.mk index 8deb42a90c..600dd9e743 100644 --- a/package/python-pygame/python-pygame.mk +++ b/package/python-pygame/python-pygame.mk @@ -103,7 +103,7 @@ PYTHON_PYGAME_POST_INSTALL_TARGET_HOOKS += PYTHON_PYGAME_REMOVE_TESTS ifneq ($(BR2_PACKAGE_PYTHON_PYGAME_EXAMPLES),y) define PYTHON_PYGAME_REMOVE_EXAMPLES - rm -rf $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages/pygame/examples + rm -rf $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/pygame/examples endef PYTHON_PYGAME_POST_INSTALL_TARGET_HOOKS += PYTHON_PYGAME_REMOVE_EXAMPLES endif From peter at korsgaard.com Sun Feb 20 21:28:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 22:28:54 +0100 Subject: [Buildroot] [git commit] package/x11r7/xdriver_xf86-video-ati: don't override XDRIVER_XF86_VIDEO_ATI_CONF_OPTS Message-ID: <20220220212127.567BA821A5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f6009ac821abf096ea8cb1010e3ed1e11f010b64 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master XDRIVER_XF86_VIDEO_ATI_CONF_OPTS is wrongly overridden in a conditional since commit daa433bff6d2d9934705feacd3619a7618d13ae5 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk index f7aeba8ba6..edb8b11add 100644 --- a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk +++ b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk @@ -16,9 +16,9 @@ XDRIVER_XF86_VIDEO_ATI_DEPENDENCIES = \ xserver_xorg-server ifeq ($(BR2_PACKAGE_HAS_LIBEGL)$(BR2_PACKAGE_HAS_LIBGL)$(BR2_PACKAGE_LIBEPOXY),yyy) -XDRIVER_XF86_VIDEO_ATI_CONF_OPTS = --enable-glamor +XDRIVER_XF86_VIDEO_ATI_CONF_OPTS += --enable-glamor else -XDRIVER_XF86_VIDEO_ATI_CONF_OPTS = --disable-glamor +XDRIVER_XF86_VIDEO_ATI_CONF_OPTS += --disable-glamor endif # xdriver_xf86-video-ati requires O_CLOEXEC From fontaine.fabrice at gmail.com Sun Feb 20 21:42:03 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 20 Feb 2022 22:42:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xdriver_xf86-video-mach64: don't override XDRIVER_XF86_VIDEO_MACH64_CONF_OPTS Message-ID: <20220220214203.1739006-1-fontaine.fabrice@gmail.com> XDRIVER_XF86_VIDEO_MACH64_CONF_OPTS is wrongly overridden in a conditional since commit cf26ae7dd14f35dd917811f5a23c54a19ea6ed07 Signed-off-by: Fabrice Fontaine --- .../xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk b/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk index e6f8d7471c..eee8fec2e8 100644 --- a/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk +++ b/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk @@ -13,7 +13,7 @@ XDRIVER_XF86_VIDEO_MACH64_AUTORECONF = YES XDRIVER_XF86_VIDEO_MACH64_DEPENDENCIES = xserver_xorg-server xorgproto ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) -XDRIVER_XF86_VIDEO_MACH64_CONF_OPTS = --disable-dri +XDRIVER_XF86_VIDEO_MACH64_CONF_OPTS += --disable-dri endif $(eval $(autotools-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Sun Feb 20 21:42:36 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 20 Feb 2022 22:42:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xdriver_xf86-video-r128: don't override XDRIVER_XF86_VIDEO_R128_CONF_OPTS Message-ID: <20220220214236.1739049-1-fontaine.fabrice@gmail.com> XDRIVER_XF86_VIDEO_R128_CONF_OPTS is wrongly overridden in a conditional since commit 082b65319c90ea5c9a89ff4ffed12af3a3e952b6 Signed-off-by: Fabrice Fontaine --- .../x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk b/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk index 455cfbad86..690041d4c6 100644 --- a/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk +++ b/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk @@ -12,7 +12,7 @@ XDRIVER_XF86_VIDEO_R128_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_R128_DEPENDENCIES = xserver_xorg-server xorgproto ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) -XDRIVER_XF86_VIDEO_R128_CONF_OPTS = --disable-dri +XDRIVER_XF86_VIDEO_R128_CONF_OPTS += --disable-dri endif $(eval $(autotools-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Sun Feb 20 21:43:02 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 20 Feb 2022 22:43:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xdriver_xf86-video-savage: don't override XDRIVER_XF86_VIDEO_SAVAGE_CONF_OPTS Message-ID: <20220220214302.1739087-1-fontaine.fabrice@gmail.com> XDRIVER_XF86_VIDEO_SAVAGE_CONF_OPTS is wrongly overridden in a conditional since commit c38103f2fe793ea5257d3f5b8413ece7a5c60538 Signed-off-by: Fabrice Fontaine --- .../xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk index d7311aa918..102aa2c48e 100644 --- a/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk +++ b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk @@ -13,7 +13,7 @@ XDRIVER_XF86_VIDEO_SAVAGE_AUTORECONF = YES XDRIVER_XF86_VIDEO_SAVAGE_DEPENDENCIES = xserver_xorg-server libdrm xorgproto ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) -XDRIVER_XF86_VIDEO_SAVAGE_CONF_OPTS = --disable-dri +XDRIVER_XF86_VIDEO_SAVAGE_CONF_OPTS += --disable-dri endif $(eval $(autotools-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Sun Feb 20 21:43:28 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 20 Feb 2022 22:43:28 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xdriver_xf86-video-tdfx: don't override XDRIVER_XF86_VIDEO_TDFX_CONF_OPTS Message-ID: <20220220214328.1739123-1-fontaine.fabrice@gmail.com> XDRIVER_XF86_VIDEO_TDFX_CONF_OPTS is wrongly overridden in a conditional since commit 7614ca037b2f82ac8e7cca1db3bf173d3655e0e2 Signed-off-by: Fabrice Fontaine --- .../x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk index 8975334f90..14c40e4d89 100644 --- a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk +++ b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk @@ -16,7 +16,7 @@ XDRIVER_XF86_VIDEO_TDFX_DEPENDENCIES = \ xserver_xorg-server ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) -XDRIVER_XF86_VIDEO_TDFX_CONF_OPTS = --disable-dri +XDRIVER_XF86_VIDEO_TDFX_CONF_OPTS += --disable-dri endif $(eval $(autotools-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Sun Feb 20 21:54:09 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 20 Feb 2022 22:54:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-ipython: security bump to version 7.31.1 Message-ID: <20220220215409.1740105-1-fontaine.fabrice@gmail.com> Fix CVE-2022-21699: IPython (Interactive Python) is a command shell for interactive computing in multiple programming languages, originally developed for the Python programming language. Affected versions are subject to an arbitrary code execution vulnerability achieved by not properly managing cross user temporary files. This vulnerability allows one user to run code as another on the same machine. All users are advised to upgrade. Also update indentation in hash file (two spaces) https://github.com/ipython/ipython/security/advisories/GHSA-pq7m-3gw7-gq5x Signed-off-by: Fabrice Fontaine --- package/python-ipython/python-ipython.hash | 8 ++++---- package/python-ipython/python-ipython.mk | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-ipython/python-ipython.hash b/package/python-ipython/python-ipython.hash index 5f591129a4..cd18c3d125 100644 --- a/package/python-ipython/python-ipython.hash +++ b/package/python-ipython/python-ipython.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/ipython/json -md5 f733048322cd34ce392ec5404813540b ipython-7.28.0.tar.gz -sha256 2097be5c814d1b974aea57673176a924c4c8c9583890e7a5f082f547b9975b11 ipython-7.28.0.tar.gz +md5 6907b67691ba697173a3befb2c35f7ac ipython-7.31.1.tar.gz +sha256 b5548ec5329a4bcf054a5deed5099b0f9622eb9ea51aaa7104d215fece201d8c ipython-7.31.1.tar.gz # Locally computed sha256 checksums -sha256 341afcbd729887b7046fe7b98fc4f4edff3aed8d38f06eefd9b30670f043df17 COPYING.rst -sha256 e0e390748ed440ab893ca1f135a88a920aaf5409dbb90a5b427c75c5e51268fb LICENSE +sha256 341afcbd729887b7046fe7b98fc4f4edff3aed8d38f06eefd9b30670f043df17 COPYING.rst +sha256 e0e390748ed440ab893ca1f135a88a920aaf5409dbb90a5b427c75c5e51268fb LICENSE diff --git a/package/python-ipython/python-ipython.mk b/package/python-ipython/python-ipython.mk index c669dd1b92..389ebfa897 100644 --- a/package/python-ipython/python-ipython.mk +++ b/package/python-ipython/python-ipython.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_IPYTHON_VERSION = 7.28.0 +PYTHON_IPYTHON_VERSION = 7.31.1 PYTHON_IPYTHON_SOURCE = ipython-$(PYTHON_IPYTHON_VERSION).tar.gz -PYTHON_IPYTHON_SITE = https://files.pythonhosted.org/packages/e2/c8/7046d0409a90e31263d5bbaa708347d522ac584a1140c01a951d9deb1792 +PYTHON_IPYTHON_SITE = https://files.pythonhosted.org/packages/fb/39/c1947dc1bb993a35469ca474535cb3214c91f5f9a7752a1fcbd9b6b37dde PYTHON_IPYTHON_LICENSE = BSD-3-Clause PYTHON_IPYTHON_LICENSE_FILES = COPYING.rst LICENSE PYTHON_IPYTHON_CPE_ID_VENDOR = ipython -- 2.34.1 From yann.morin.1998 at free.fr Sun Feb 20 21:36:35 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 20 Feb 2022 22:36:35 +0100 Subject: [Buildroot] [git commit] package/librsvg: fix loaders.cache with with per-package directories Message-ID: <20220220215908.0F6D3812C3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=63b780f5e96e2f9282fb48b2846bab1c0f4f9455 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master host-librsvg install a gdk-pixbuf module (aka plugin). As such, it needs to update [0] the modules cache (a kind of registry of which modules are installed and what the can handle). To that effect, it calls the utility gdk-pixbuf-queryloaders, which generates the cache of existing modules. gdk-pixbuf-queryloaders, from the gdk-pixbuf package, has been configured to be relocatable. However, it still embeds the path to where it was instaled, and thus where to look modules from. If it is run from its install location, then gdk-pixbuf-queryloaders looks modules in that location, and generates a modules cache with relative paths; otherwise, it still looks at that location, but generates a cache with absolute paths. In the later case, it will miss the modules that have not been installed by gdk-pixbuf itself. In the case of host-librsvg, that will miss the fact that librsvg just happened to have installed a module. Further down the road, packages that depend on host-librsvg, will get their PPD prepared, the path fixup hook run, so that the cache properly points to the current package's PPD, but the cache will not include the SVG module, which causes failures to load CVG images: Can't load file: Unrecognized image file format So, we need to tell gdk-pixbuf-queryloaders where the module path is, which restores the relativity of the paths it reports, by specifying the modules path pointing to the current package's PPD, passed in the environement variable GDK_PIXBUF_MODULEDIR. We need to do that at install time, so that the SVG module is properly listed in the cache, so that dependees can use it. A temporary cache is also generated at build time, but its usefullness is dubious; it seem to only be used by the test tool, which we do not run. However, for consistency-sake, we also fix that. Fixes: - http://autobuild.buildroot.org/results/0e00059b09b4445eaaec1030997883187c6a80d6 [0] This will trigger file-overwrite detection in the future... But we currently do not have infrastructure to properly handle such a cache. Signed-off-by: Fabrice Fontaine [yann.morin.1998 at free.fr: reword and extend an already-good commit log] Signed-off-by: Yann E. MORIN --- ...loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch | 41 ++++++++++++++++++++++ package/librsvg/librsvg.mk | 2 ++ 2 files changed, 43 insertions(+) diff --git a/package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch b/package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch new file mode 100644 index 0000000000..761ff92605 --- /dev/null +++ b/package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch @@ -0,0 +1,41 @@ +From 2c472bf55289ccbd7f305aa3e98d6fd70be4e3ab Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 19 Feb 2022 12:02:10 +0100 +Subject: [PATCH] gdk-pixbuf-loader/Makefile.am: set GDK_PIXBUF_MODULEDIR + +Set GDK_PIXBUF_MODULEDIR to gdk_pixbuf_moduledir before calling +gdk-pixbuf-query-loaders to build a correct gdk_pixbuf_cache_file and +gdk-pixbuf.loaders on 'exotic' systems + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/668] +--- + gdk-pixbuf-loader/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gdk-pixbuf-loader/Makefile.am b/gdk-pixbuf-loader/Makefile.am +index c3493736..de1f9641 100644 +--- a/gdk-pixbuf-loader/Makefile.am ++++ b/gdk-pixbuf-loader/Makefile.am +@@ -49,7 +49,7 @@ rsvg_loader_LDADD = \ + EXTRA_rsvg_loader_DEPENDENCIES = libpixbufloader-svg.la gdk-pixbuf-loaders + + gdk-pixbuf-loaders: Makefile +- $(AM_V_GEN) ( $(GDK_PIXBUF_QUERYLOADERS) ./libpixbufloader-svg.la && $(GDK_PIXBUF_QUERYLOADERS)) > gdk-pixbuf.loaders 2>/dev/null ++ $(AM_V_GEN) ( $(GDK_PIXBUF_QUERYLOADERS) ./libpixbufloader-svg.la && GDK_PIXBUF_MODULEDIR=$(gdk_pixbuf_moduledir) $(GDK_PIXBUF_QUERYLOADERS)) > gdk-pixbuf.loaders 2>/dev/null + + if CROSS_COMPILING + RUN_QUERY_LOADER_TEST=false +@@ -68,7 +68,7 @@ endif + install-data-hook: + @if $(RUN_QUERY_LOADER_TEST) ; then \ + $(mkinstalldirs) $(DESTDIR)$(gdk_pixbuf_binarydir) ; \ +- $(GDK_PIXBUF_QUERYLOADERS) > $(DESTDIR)$(gdk_pixbuf_cache_file) ; \ ++ GDK_PIXBUF_MODULEDIR=$(gdk_pixbuf_moduledir) $(GDK_PIXBUF_QUERYLOADERS) > $(DESTDIR)$(gdk_pixbuf_cache_file) ; \ + else \ + echo "***" ; \ + echo "*** Warning: loaders.cache not built" ; \ +-- +2.34.1 + diff --git a/package/librsvg/librsvg.mk b/package/librsvg/librsvg.mk index e4b1942b79..07a14b4366 100644 --- a/package/librsvg/librsvg.mk +++ b/package/librsvg/librsvg.mk @@ -20,6 +20,8 @@ HOST_LIBRSVG_DEPENDENCIES = host-cairo host-gdk-pixbuf host-libglib2 host-libxml LIBRSVG_LICENSE = LGPL-2.1+ LIBRSVG_LICENSE_FILES = COPYING.LIB LIBRSVG_CPE_ID_VENDOR = gnome +# We're patching gdk-pixbuf-loader/Makefile.am +LIBRSVG_AUTORECONF = YES ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) LIBRSVG_CONF_OPTS += --enable-introspection From yann.morin.1998 at free.fr Sun Feb 20 22:11:20 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 20 Feb 2022 23:11:20 +0100 Subject: [Buildroot] [PATCH v2, 2/2] package/librsvg: fix loaders.cache with with per-package directories In-Reply-To: <20220220121637.200393-2-fontaine.fabrice@gmail.com> References: <20220220121637.200393-1-fontaine.fabrice@gmail.com> <20220220121637.200393-2-fontaine.fabrice@gmail.com> Message-ID: <20220220221120.GA522310@scaer> Fabrice, All, On 2022-02-20 13:16 +0100, Fabrice Fontaine spake thusly: > host-librsvg invokes the gdk-pixbuf-queryloaders to update loaders.cache > (which is originally built by host-gdk-pixbuf). loaders.cache contains > the list of all the gdk-pixbuf modules; that includes paths to > dlopen()ed shared libs. host-librsvg must update this file to add the > path to its SVG shared library. > > By default, gdk-pixbuf-queryloaders uses a hardcoded path to find the > installed shared libs and this path will point to the location of the > host-gdk-pixbuf per-package directory. Obviously, this is wrong, the SVG > library installed by host-librsvg is installed in its own per-package > directory. > > So set GDK_PIXBUF_MODULEDIR to gdk_pixbuf_moduledir before calling > gdk-pixbuf-query-loaders to build a correct loaders.cache. > gdk_pixbuf_moduledir is already retrieved from host-pkgconfig in > configure.ac and so will point to the correct location (thanks to > PPD_FIXUP_PATHS). > > After this update, the loaders.cache will be correctly updated in > host-librsvg per-package directory and so the loaders.cache installed in > adwaita-icon-theme per-package directory will also be correct (thanks to > PPD_FIXUP_PATHS). > > This will fix the following PPD build failure of adwaita-icon-theme: > > Can't load file: Unrecognized image file format > > Fixes: > - http://autobuild.buildroot.org/results/0e00059b09b4445eaaec1030997883187c6a80d6 > > Signed-off-by: Fabrice Fontaine Thank you very much for expanding on your previous commit log. It indeed helps a lot to explain what is happening. Still, I felt I needed to understand a bit more about the issue: why did we have to fix it at build time for a file that is never isntalled? Also, since we now configure gdk-pixbuf in a relocatable way, why was the issue still happening? So I investigated a bit, and substancially rewrote the commit log with my findings. Still, I must say that your second commit log was already very good, and it really helped me understand the overall issue. Thanks for that! :-) Applied to master, thanks. Regards, Yann E. MORIN. > --- > Changes v1 -> v2 (after review of Yann E. Morin): > - Enhance commit message > - Add patch upstream status > > ...r-Makefile.am-set-GDK_PIXBUF_MODULED.patch | 41 +++++++++++++++++++ > package/librsvg/librsvg.mk | 2 + > 2 files changed, 43 insertions(+) > create mode 100644 package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch > > diff --git a/package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch b/package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch > new file mode 100644 > index 0000000000..761ff92605 > --- /dev/null > +++ b/package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch > @@ -0,0 +1,41 @@ > +From 2c472bf55289ccbd7f305aa3e98d6fd70be4e3ab Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Sat, 19 Feb 2022 12:02:10 +0100 > +Subject: [PATCH] gdk-pixbuf-loader/Makefile.am: set GDK_PIXBUF_MODULEDIR > + > +Set GDK_PIXBUF_MODULEDIR to gdk_pixbuf_moduledir before calling > +gdk-pixbuf-query-loaders to build a correct gdk_pixbuf_cache_file and > +gdk-pixbuf.loaders on 'exotic' systems > + > +Signed-off-by: Fabrice Fontaine > +[Upstream status: > +https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/668] > +--- > + gdk-pixbuf-loader/Makefile.am | 4 ++-- > + 1 file changed, 2 insertions(+), 2 deletions(-) > + > +diff --git a/gdk-pixbuf-loader/Makefile.am b/gdk-pixbuf-loader/Makefile.am > +index c3493736..de1f9641 100644 > +--- a/gdk-pixbuf-loader/Makefile.am > ++++ b/gdk-pixbuf-loader/Makefile.am > +@@ -49,7 +49,7 @@ rsvg_loader_LDADD = \ > + EXTRA_rsvg_loader_DEPENDENCIES = libpixbufloader-svg.la gdk-pixbuf-loaders > + > + gdk-pixbuf-loaders: Makefile > +- $(AM_V_GEN) ( $(GDK_PIXBUF_QUERYLOADERS) ./libpixbufloader-svg.la && $(GDK_PIXBUF_QUERYLOADERS)) > gdk-pixbuf.loaders 2>/dev/null > ++ $(AM_V_GEN) ( $(GDK_PIXBUF_QUERYLOADERS) ./libpixbufloader-svg.la && GDK_PIXBUF_MODULEDIR=$(gdk_pixbuf_moduledir) $(GDK_PIXBUF_QUERYLOADERS)) > gdk-pixbuf.loaders 2>/dev/null > + > + if CROSS_COMPILING > + RUN_QUERY_LOADER_TEST=false > +@@ -68,7 +68,7 @@ endif > + install-data-hook: > + @if $(RUN_QUERY_LOADER_TEST) ; then \ > + $(mkinstalldirs) $(DESTDIR)$(gdk_pixbuf_binarydir) ; \ > +- $(GDK_PIXBUF_QUERYLOADERS) > $(DESTDIR)$(gdk_pixbuf_cache_file) ; \ > ++ GDK_PIXBUF_MODULEDIR=$(gdk_pixbuf_moduledir) $(GDK_PIXBUF_QUERYLOADERS) > $(DESTDIR)$(gdk_pixbuf_cache_file) ; \ > + else \ > + echo "***" ; \ > + echo "*** Warning: loaders.cache not built" ; \ > +-- > +2.34.1 > + > diff --git a/package/librsvg/librsvg.mk b/package/librsvg/librsvg.mk > index e4b1942b79..07a14b4366 100644 > --- a/package/librsvg/librsvg.mk > +++ b/package/librsvg/librsvg.mk > @@ -20,6 +20,8 @@ HOST_LIBRSVG_DEPENDENCIES = host-cairo host-gdk-pixbuf host-libglib2 host-libxml > LIBRSVG_LICENSE = LGPL-2.1+ > LIBRSVG_LICENSE_FILES = COPYING.LIB > LIBRSVG_CPE_ID_VENDOR = gnome > +# We're patching gdk-pixbuf-loader/Makefile.am > +LIBRSVG_AUTORECONF = YES > > ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) > LIBRSVG_CONF_OPTS += --enable-introspection > -- > 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 Feb 20 22:18:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 23:18:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-ipython: security bump to version 7.31.1 In-Reply-To: <20220220215409.1740105-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 20 Feb 2022 22:54:09 +0100") References: <20220220215409.1740105-1-fontaine.fabrice@gmail.com> Message-ID: <87tuct89mu.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2022-21699: IPython (Interactive Python) is a command shell for > interactive computing in multiple programming languages, originally > developed for the Python programming language. Affected versions are > subject to an arbitrary code execution vulnerability achieved by not > properly managing cross user temporary files. This vulnerability allows > one user to run code as another on the same machine. All users are > advised to upgrade. > Also update indentation in hash file (two spaces) > https://github.com/ipython/ipython/security/advisories/GHSA-pq7m-3gw7-gq5x > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 20 22:18:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 23:18:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xdriver_xf86-video-mach64: don't override XDRIVER_XF86_VIDEO_MACH64_CONF_OPTS In-Reply-To: <20220220214203.1739006-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 20 Feb 2022 22:42:03 +0100") References: <20220220214203.1739006-1-fontaine.fabrice@gmail.com> Message-ID: <87pmnh89mc.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > XDRIVER_XF86_VIDEO_MACH64_CONF_OPTS is wrongly overridden in a > conditional since commit cf26ae7dd14f35dd917811f5a23c54a19ea6ed07 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 20 22:19:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 23:19:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xdriver_xf86-video-r128: don't override XDRIVER_XF86_VIDEO_R128_CONF_OPTS In-Reply-To: <20220220214236.1739049-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 20 Feb 2022 22:42:36 +0100") References: <20220220214236.1739049-1-fontaine.fabrice@gmail.com> Message-ID: <87ley589lv.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > XDRIVER_XF86_VIDEO_R128_CONF_OPTS is wrongly overridden in a conditional > since commit 082b65319c90ea5c9a89ff4ffed12af3a3e952b6 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 20 22:19:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 23:19:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xdriver_xf86-video-savage: don't override XDRIVER_XF86_VIDEO_SAVAGE_CONF_OPTS In-Reply-To: <20220220214302.1739087-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 20 Feb 2022 22:43:02 +0100") References: <20220220214302.1739087-1-fontaine.fabrice@gmail.com> Message-ID: <87h78t89l0.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > XDRIVER_XF86_VIDEO_SAVAGE_CONF_OPTS is wrongly overridden in a > conditional since commit c38103f2fe793ea5257d3f5b8413ece7a5c60538 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 20 22:19:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 23:19:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xdriver_xf86-video-tdfx: don't override XDRIVER_XF86_VIDEO_TDFX_CONF_OPTS In-Reply-To: <20220220214328.1739123-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 20 Feb 2022 22:43:28 +0100") References: <20220220214328.1739123-1-fontaine.fabrice@gmail.com> Message-ID: <87czjh89kv.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > XDRIVER_XF86_VIDEO_TDFX_CONF_OPTS is wrongly overridden in a conditional > since commit 7614ca037b2f82ac8e7cca1db3bf173d3655e0e2 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 20 22:18:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 23:18:45 +0100 Subject: [Buildroot] [git commit] package/x11r7/xdriver_xf86-video-mach64: don't override XDRIVER_XF86_VIDEO_MACH64_CONF_OPTS Message-ID: <20220220221236.738C78348D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3780409bfdb59dae2573f36293f53139132aa5e3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master XDRIVER_XF86_VIDEO_MACH64_CONF_OPTS is wrongly overridden in a conditional since commit cf26ae7dd14f35dd917811f5a23c54a19ea6ed07 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk b/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk index e6f8d7471c..eee8fec2e8 100644 --- a/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk +++ b/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk @@ -13,7 +13,7 @@ XDRIVER_XF86_VIDEO_MACH64_AUTORECONF = YES XDRIVER_XF86_VIDEO_MACH64_DEPENDENCIES = xserver_xorg-server xorgproto ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) -XDRIVER_XF86_VIDEO_MACH64_CONF_OPTS = --disable-dri +XDRIVER_XF86_VIDEO_MACH64_CONF_OPTS += --disable-dri endif $(eval $(autotools-package)) From peter at korsgaard.com Sun Feb 20 22:19:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 23:19:35 +0100 Subject: [Buildroot] [git commit] package/x11r7/xdriver_xf86-video-tdfx: don't override XDRIVER_XF86_VIDEO_TDFX_CONF_OPTS Message-ID: <20220220221236.90D798348D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=41feca427fdb91b50b442a5c540ba824755ea76b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master XDRIVER_XF86_VIDEO_TDFX_CONF_OPTS is wrongly overridden in a conditional since commit 7614ca037b2f82ac8e7cca1db3bf173d3655e0e2 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk index 8975334f90..14c40e4d89 100644 --- a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk +++ b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk @@ -16,7 +16,7 @@ XDRIVER_XF86_VIDEO_TDFX_DEPENDENCIES = \ xserver_xorg-server ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) -XDRIVER_XF86_VIDEO_TDFX_CONF_OPTS = --disable-dri +XDRIVER_XF86_VIDEO_TDFX_CONF_OPTS += --disable-dri endif $(eval $(autotools-package)) From peter at korsgaard.com Sun Feb 20 22:19:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 23:19:17 +0100 Subject: [Buildroot] [git commit] package/x11r7/xdriver_xf86-video-savage: don't override XDRIVER_XF86_VIDEO_SAVAGE_CONF_OPTS Message-ID: <20220220221236.877A98343E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e0a3e6a9219fe9969547244c85bdcf593e0a3941 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master XDRIVER_XF86_VIDEO_SAVAGE_CONF_OPTS is wrongly overridden in a conditional since commit c38103f2fe793ea5257d3f5b8413ece7a5c60538 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk index d7311aa918..102aa2c48e 100644 --- a/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk +++ b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk @@ -13,7 +13,7 @@ XDRIVER_XF86_VIDEO_SAVAGE_AUTORECONF = YES XDRIVER_XF86_VIDEO_SAVAGE_DEPENDENCIES = xserver_xorg-server libdrm xorgproto ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) -XDRIVER_XF86_VIDEO_SAVAGE_CONF_OPTS = --disable-dri +XDRIVER_XF86_VIDEO_SAVAGE_CONF_OPTS += --disable-dri endif $(eval $(autotools-package)) From peter at korsgaard.com Sun Feb 20 22:18:59 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 23:18:59 +0100 Subject: [Buildroot] [git commit] package/x11r7/xdriver_xf86-video-r128: don't override XDRIVER_XF86_VIDEO_R128_CONF_OPTS Message-ID: <20220220221236.7CD478348E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e08bfe2f9cb2d5e90ef1bc4af078fbd93e08ccf6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master XDRIVER_XF86_VIDEO_R128_CONF_OPTS is wrongly overridden in a conditional since commit 082b65319c90ea5c9a89ff4ffed12af3a3e952b6 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk b/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk index 455cfbad86..690041d4c6 100644 --- a/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk +++ b/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk @@ -12,7 +12,7 @@ XDRIVER_XF86_VIDEO_R128_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_R128_DEPENDENCIES = xserver_xorg-server xorgproto ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) -XDRIVER_XF86_VIDEO_R128_CONF_OPTS = --disable-dri +XDRIVER_XF86_VIDEO_R128_CONF_OPTS += --disable-dri endif $(eval $(autotools-package)) From peter at korsgaard.com Sun Feb 20 22:18:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 23:18:24 +0100 Subject: [Buildroot] [git commit] package/python-ipython: security bump to version 7.31.1 Message-ID: <20220220221236.690398343E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=aeb138911e773cf4011b81fc4fcec0037f366bb1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2022-21699: IPython (Interactive Python) is a command shell for interactive computing in multiple programming languages, originally developed for the Python programming language. Affected versions are subject to an arbitrary code execution vulnerability achieved by not properly managing cross user temporary files. This vulnerability allows one user to run code as another on the same machine. All users are advised to upgrade. Also update indentation in hash file (two spaces) https://github.com/ipython/ipython/security/advisories/GHSA-pq7m-3gw7-gq5x Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/python-ipython/python-ipython.hash | 8 ++++---- package/python-ipython/python-ipython.mk | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-ipython/python-ipython.hash b/package/python-ipython/python-ipython.hash index 5f591129a4..cd18c3d125 100644 --- a/package/python-ipython/python-ipython.hash +++ b/package/python-ipython/python-ipython.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/ipython/json -md5 f733048322cd34ce392ec5404813540b ipython-7.28.0.tar.gz -sha256 2097be5c814d1b974aea57673176a924c4c8c9583890e7a5f082f547b9975b11 ipython-7.28.0.tar.gz +md5 6907b67691ba697173a3befb2c35f7ac ipython-7.31.1.tar.gz +sha256 b5548ec5329a4bcf054a5deed5099b0f9622eb9ea51aaa7104d215fece201d8c ipython-7.31.1.tar.gz # Locally computed sha256 checksums -sha256 341afcbd729887b7046fe7b98fc4f4edff3aed8d38f06eefd9b30670f043df17 COPYING.rst -sha256 e0e390748ed440ab893ca1f135a88a920aaf5409dbb90a5b427c75c5e51268fb LICENSE +sha256 341afcbd729887b7046fe7b98fc4f4edff3aed8d38f06eefd9b30670f043df17 COPYING.rst +sha256 e0e390748ed440ab893ca1f135a88a920aaf5409dbb90a5b427c75c5e51268fb LICENSE diff --git a/package/python-ipython/python-ipython.mk b/package/python-ipython/python-ipython.mk index c669dd1b92..389ebfa897 100644 --- a/package/python-ipython/python-ipython.mk +++ b/package/python-ipython/python-ipython.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_IPYTHON_VERSION = 7.28.0 +PYTHON_IPYTHON_VERSION = 7.31.1 PYTHON_IPYTHON_SOURCE = ipython-$(PYTHON_IPYTHON_VERSION).tar.gz -PYTHON_IPYTHON_SITE = https://files.pythonhosted.org/packages/e2/c8/7046d0409a90e31263d5bbaa708347d522ac584a1140c01a951d9deb1792 +PYTHON_IPYTHON_SITE = https://files.pythonhosted.org/packages/fb/39/c1947dc1bb993a35469ca474535cb3214c91f5f9a7752a1fcbd9b6b37dde PYTHON_IPYTHON_LICENSE = BSD-3-Clause PYTHON_IPYTHON_LICENSE_FILES = COPYING.rst LICENSE PYTHON_IPYTHON_CPE_ID_VENDOR = ipython From peter at korsgaard.com Sun Feb 20 22:24:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 23:24:46 +0100 Subject: [Buildroot] [git commit] Update for 2022.02-rc2 Message-ID: <20220220221731.41DA082302@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f3d0d7e6ff1d1c723c3ab0c338d4ddf1ae415e69 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard --- CHANGES | 21 +++++++++++++++++++++ Makefile | 4 ++-- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 21 +++++++++++++++++++++ 4 files changed, 53 insertions(+), 11 deletions(-) diff --git a/CHANGES b/CHANGES index 4cc574d928..31315cad34 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,24 @@ +2022.02-rc2, released February 20th, 2022 + + Fixes all over the tree. + + Defconfigs: Friendlyarm Nanopi R2S: Fix U-Boot build, Kontron + BL i.MX8M Mini: Fix U-Boot build, PC Engines APU2: Fix Linux + build, ROC-RK3399-PC: Bump rootfs size to fix build + + Updated/fixed packages: apache, apparmor, apr-util, arp-scan, + binutils, bluez5_utils, connman, cryptsetup, dnsmasq, + dovecot-pigeonhole, expat, gdk-pixbuf, gst1-plugins-base, + guile, keepalived, kodi, libbpf, libglvnd, libgsasl, libiconv, + librsvg, libuhttpd, libusb, libv4l, luasyslog, mongrel2, neon, + pcre, perl-netaddr-ip, php, psmisc, python-ipython, + python-pycli, python-pygame, python-regex, python-twisted, + qt5location, qt5webkit, resiprocate, rygel, safeclib, + sdl2_ttf, socketcand, strongswan, sudo, systemd, toolchain, + urg, webkitgtk, wireless-regdb, wpewebkit, + xdriver_xf86-video-{ati,mach64,mga,r128,savage,tdfx}, xz, zfs, + zsh + 2022.02-rc1, released February 13th, 2022 Numerous package updates and many (80) new packages. diff --git a/Makefile b/Makefile index a4b7db69a7..d92438166f 100644 --- a/Makefile +++ b/Makefile @@ -92,9 +92,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2022.02-rc1 +export BR2_VERSION := 2022.02-rc2 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1644782000 +BR2_VERSION_EPOCH = 1645395000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/docs/website/download.html b/docs/website/download.html index 3d98fe48ee..7d9fad4d9f 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -76,37 +76,37 @@
    -

    Latest release candidate: 2022.02-rc1

    +

    Latest release candidate: 2022.02-rc2

    diff --git a/docs/website/news.html b/docs/website/news.html index 109dcb60f5..e571c86a2e 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,27 @@

    News

      +
    • +
      +
      +
      +

      2022.02-rc2 released

      +

      20 February 2022

      +
      +
      +

      2022.02-rc2 has been released with more cleanups and build fixes. See the + CHANGES + file for details.

      + +

      Head to the downloads page to pick up the + 2022.02-rc2 + release candidate, and report any problems found to the + mailing list or + bug tracker.

      +
      +
      +
    • +
    • From peter at korsgaard.com Sun Feb 20 22:30:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 23:30:47 +0100 Subject: [Buildroot] Buildroot 2022.02-rc2 released Message-ID: <878ru5892g.fsf@dell.be.48ers.dk> Hi, Buildroot 2022.02-rc2 is released - Go download it at: http://buildroot.net/downloads/buildroot-2022.02-rc2.tar.gz or http://buildroot.net/downloads/buildroot-2022.02-rc2.tar.xz Or get it from Git: git://git.buildroot.net/buildroot Another week, another release candidate. Please give it a spin and report any problems to the mailing list or bug tracker. Many thanks to the people contributing to this release: git shortlog -sn 2022.02-rc1.. 54 Fabrice Fontaine 6 Giulio Benetti 3 Adrian Perez de Castro 3 Peter Korsgaard 2 Bernd Kuhls 2 Luca Ceresoli 2 Peter Seiderer 2 Yann E. MORIN 1 Arnout Vandecappelle (Essensium/Mind) 1 James Hilliard 1 Marcus Hoffmann 1 Moritz Bitsch 1 Waldemar Brodkorb For more details, see the CHANGES file: http://git.buildroot.net/buildroot/plain/CHANGES?id=2022.02-rc2 -- Bye, Peter Korsgaard From peterlin at andestech.com Mon Feb 21 03:37:26 2022 From: peterlin at andestech.com (Yu Chien Peter Lin) Date: Mon, 21 Feb 2022 11:37:26 +0800 Subject: [Buildroot] [PATCH v3 1/3] board/andes: rearrange nds32 folder structure In-Reply-To: References: <20220215053327.4046-1-peterlin@andestech.com> Message-ID: Hi Giulio, On Thu, Feb 17, 2022 at 04:55:49PM +0100, Giulio Benetti wrote: > Hi Peter, > > On 15/02/22 06:33, Yu Chien Peter Lin wrote: > > Rearrange nds32 folder structure to add AE350 platform. > > > > Signed-off-by: Yu Chien Peter Lin > > Signed-off-by: Alan Kao > > --- > > .../patches/linux/0001-nds32-Fix-boot-messages-garbled.patch | 0 > > ...2-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch | 0 > > board/andes/{ => ae3xx}/readme.txt | 0 > > configs/andes_ae3xx_defconfig | 2 +- > > 4 files changed, 1 insertion(+), 1 deletion(-) > > rename board/andes/{ => ae3xx}/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch (100%) > > rename board/andes/{ => ae3xx}/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch (100%) > > rename board/andes/{ => ae3xx}/readme.txt (100%) > > Here we have both: > board/andes/ae3xx > and > board/andes/ae350 > > ae3xx should be use for every ae3xx family(ae350 included), but for ae350 > you use a specific folder. > What I see digging into ae3xx is that it is for FPGA demonstration, so I > would move ae3xx directory to be name as ae3xx-fpga. Otherwise I would > expect ae350(and newer parts) to be part of ae3xx. > > Same goes for the defconfig, I would name it like: > andes_ae3xx_fpga_defconfig > > This way we can divide the 2 typologies: > - fpga demonostration for ae3xx > - ae3xx SoC family > > Otherwise you should provide a single family folder(ae3xx) compatible for > both fpgas and SoCs. > > Thank you > > Best regards > -- > Giulio Benetti > Benetti Engineering sas For this naming issue, we decide to make ae3xx explicit to have these two platform residing in its own folder. So it would be: board/andes/ |- {ae3xx => ae300}/ `- ae350/ If this make sense to you, I will submit PATCH v4. Thanks, Yu Chien Peter Lin From mohd.faiz.rohani at gmail.com Mon Feb 21 05:16:45 2022 From: mohd.faiz.rohani at gmail.com (Mohd Faiz Rohani) Date: Mon, 21 Feb 2022 13:16:45 +0800 Subject: [Buildroot] Issue with login In-Reply-To: References: <186B6238-5452-4211-BD9D-29A3C921DE42@benettiengineering.com> <469c0dbc-6101-be6c-7272-400ac4512b86@grenoble.cnrs.fr> <4d8f6289-f16f-9602-a458-2b5836a817e6@benettiengineering.com> Message-ID: Hi guys, Thank you for your help.I have overlooked the required setting as normally I will leave the setting to the default, as I assume Buildroot has selected the required settings. Anyway I have managed to login successfully now. I have turned on BR2_PACKAGE_SYSTEMD_LOGIND and BR2_PACKAGE_UTIL_LINUX_LOGIN settings, while the rest does not change. Fyi, I have tried the newer versions of Linux Kernel (5.15) and Uboot (v2022.01) with the Linaro 7.5 toolchain, but got an error during the booting process where the RFS cannot be mounted. It may be my fault through the settings though, that is why I am trying the old version and it worked. I am planning to use Buildroot for my future development and keen to contribute wherever I can. Still lots to learn though. Thank you again guys. Regards. Faiz On Mon, Feb 21, 2022 at 2:33 AM Mohd Faiz Rohani wrote: > Thanks, I'll check them out. Will update the outcome once the installation > is done. > > Thank you. > > On Mon, Feb 21, 2022, 1:56 AM Giulio Benetti < > giulio.benetti at benettiengineering.com> wrote: > >> Hi Edgar, >> >> please reply to all in Mailing List, I add Mohd in Cc, >> >> On 20/02/22 17:18, Edgar Bonet wrote: >> > Hi! >> > >> > In his config file, Mohd wrote: >> >> BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_10=y >> >> BR2_LINUX_KERNEL_VERSION="4.4.155" >> > >> > This may cause problems. C.f. docs/manual/configure.txt: >> > >> > If you use kernel headers that are more recent than the Linux >> > kernel you run on your embedded system, then the C library might >> > be using interfaces that are not provided by your Linux kernel. >> >> Good catch Edgar! >> So Mohd, what you need here is a toolchain with older libc. >> >> https://buildroot.org/downloads/manual/manual.html#_cross_compilation_toolchain >> >> But again, do you really need to use so such old versions instead of try >> to use buildroot's beaglebone_defconfig? >> >> > In the same config file, there is: >> >> # BR2_PACKAGE_BUSYBOX is not set >> > >> > When disabling busybox, you should have seen the message: >> > >> > You may need to enable other packages to get a working system >> > You better know what you're doing! >> >> Despite of what I've written on my previous e-mail(my test was wrong), >> he has BR2_INIT_SYSTEMD=y that works as Init System, so that's ok. >> >> > And then: >> >> # BR2_PACKAGE_SYSTEMD_LOGIND is not set >> >> Good catch again Edgar! This ^^^ should be the point. Because it's >> exactly the systemd login dameon. >> >> >> # BR2_PACKAGE_UTIL_LINUX_LOGIN is not set >> >> This ^^^ is not selected by systemd, so I expect >> BR2_PACKAGE_SYSTEMD_LOGIND to do the job(even if I'm not a systemd >> expoert at all). >> >> But as Edgar pointed linux headers don't match so you have 3 choices: >> 1) find a toolchain with linux-headers <= 4.4.* >> 2) update linux version >> 3) start from scratch using buildroot beaglebone_defconfig >> >> Best regards >> -- >> Giulio Benetti >> Benetti Engineering sas >> > -------------- next part -------------- An HTML attachment was scrubbed... URL: From thomas.petazzoni at bootlin.com Mon Feb 21 07:05:34 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 21 Feb 2022 07:05:34 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-02-20 Message-ID: <20220221070541.E547A60BB1@smtp3.osuosl.org> Hello, Autobuild statistics for 2022-02-20 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 47 | 50 | 0 | 97 | 2021.11.x | 10 | 44 | 0 | 54 | master | 37 | 303 | 1 | 341 | Classification of failures by reason for master ----------------------------------------------- host-cmake-3.16.9 | 46 host-ncurses-6.1 | 46 host-gcc-initial-10.3.0 | 20 host-gettext-gnu-0.20.1 | 18 host-m4-1.4.19 | 15 host-python3-3.10.2 | 15 unknown | 15 host-libselinux-3.3 | 12 host-bison-3.8.2 | 7 host-flex-2.6.4 | 6 alsa-lib-1.2.6 | 5 host-binutils-2.36.1 | 5 acpica-20200717 | 4 bpftool-a7f0e7f057283ae8af3... | 4 host-gcc-initial-11.2.0 | 4 host-gcc-initial-arc-2020.0... | 4 agentpp-4.3.1 | 3 host-libtextstyle-0.20.1 | 3 host-mpfr-4.1.0 | 3 host-pkgconf-1.6.3 | 3 libopenssl-1.1.1m | 3 ncurses-6.1 | 3 berkeleydb-5.3.28 | 2 bluez5_utils-5.63 | 2 busybox-1.35.0 | 2 frr-8.1 | 2 host-attr-2.5.1 | 2 host-autoconf-2.71 | 2 host-libxml2-2.9.12 | 2 libzlib-1.2.11 | 2 acpid-2.0.33 | 1 acsccid-1.1.8 | 1 argp-standalone-1.3 | 1 atf-0.21 | 1 audit-3.0.7 | 1 axel-2.17.11 | 1 bird-2.0.8 | 1 civetweb-1.15 | 1 clamav-0.103.5 | 1 connman-1.41 | 1 dieharder-3.31.1 | 1 elfutils-0.186 | 1 gd-2.3.3 | 1 gstd-0.13.0 | 1 host-fakeroot-1.26 | 1 host-gettext-tiny-0.3.2 | 1 host-gmp-6.2.1 | 1 host-icu-70-1 | 1 host-libffi-3.4.2 | 1 host-libtool-2.4.6 | 1 host-mpc-1.2.1 | 1 host-pcre-8.45 | 1 host-swig-4.0.2 | 1 host-util-linux-2.37.3 | 1 host-xz-5.2.5 | 1 libiconv-1.15 | 1 libnl-3.5.0 | 1 librtlsdr-ed0317e6a58c09887... | 1 libsamplerate-0.1.9 | 1 libtirpc-1.3.2 | 1 libusb-1.0.25 | 1 libuwsc | 1 linux-pam-1.5.2 | 1 openjpeg-2.4.0 | 1 osm2pgsql-1.6.0 | 1 pcsc-lite-1.9.5 | 1 pulseview-0.4.2 | 1 python-greenlet-1.1.2 | 1 python-pygame-d61ea8eabd56 | 1 ruby-3.1.0 | 1 snmppp-3.4.2 | 1 sqlite-3.37.2 | 1 toolchain-external-codesour... | 1 wavemon-0.9.4 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- nios2 | acpica-20200717 | NOK | http://autobuild.buildroot.net/results/3530201460e591148e72d68a11109ab8350eeade | m68k | acpica-20200717 | NOK | http://autobuild.buildroot.net/results/08f8f216ca4b33eb0b10e255d45591419de9e822 | arm | acpica-20200717 | NOK | http://autobuild.buildroot.net/results/1671322f56e65086d99ac4f314b0af5c7f0e6c3c | sh4 | acpica-20200717 | NOK | http://autobuild.buildroot.net/results/666756f2a11b55822e5755ee73ba55dff6aa6bef | mips | acpid-2.0.33 | NOK | http://autobuild.buildroot.net/results/edfda442c3a36ce9646fc88f91c1fd022448f57a | ORPH x86_64 | acsccid-1.1.8 | NOK | http://autobuild.buildroot.net/results/f8dfbf86ba69fe19279765243509d4dc37c0562c | aarch64 | agentpp-4.3.1 | NOK | http://autobuild.buildroot.net/results/8f53b3767de4b716c5dc024b5745896483fa3cc0 | arc | agentpp-4.3.1 | NOK | http://autobuild.buildroot.net/results/2016a2b8d0a9352c7a91711daaebfcd17b11e60e | i586 | agentpp-4.3.1 | NOK | http://autobuild.buildroot.net/results/25368602e193dfa47ee7efa10f436227da2a7828 | mips64el | alsa-lib-1.2.6 | NOK | http://autobuild.buildroot.net/results/9a248dba32248a1b134539df8bdfea58708ac0fc | microblazeel | alsa-lib-1.2.6 | NOK | http://autobuild.buildroot.net/results/c4ce54e3e8a1c2647f770b02ca493fac29ea18ba | x86_64 | alsa-lib-1.2.6 | NOK | http://autobuild.buildroot.net/results/28c914e8c1a507860ced9d31d385e98430c5b1bf | sparc | alsa-lib-1.2.6 | NOK | http://autobuild.buildroot.net/results/c85ca51d1fbbe3470bafb16b8f0859af67a445ae | powerpc64le | alsa-lib-1.2.6 | NOK | http://autobuild.buildroot.net/results/8c6b41922a5d7f6a0f4f6925f5510ff0b1991e16 | i686 | argp-standalone-1.3 | NOK | http://autobuild.buildroot.net/results/2e071593928689257e9342c3a1acbf527a053063 | arm | atf-0.21 | NOK | http://autobuild.buildroot.net/results/a46e3b508e95bc15a5b1f07174281a5414aebe69 | ORPH arm | audit-3.0.7 | NOK | http://autobuild.buildroot.net/results/8b19480650c923644ee0abf455ec5c2e1a133700 | arm | axel-2.17.11 | NOK | http://autobuild.buildroot.net/results/d5ee8bcac65413b5396853e93083c7cf73ba2b32 | mipsel | berkeleydb-5.3.28 | NOK | http://autobuild.buildroot.net/results/8ba71c470bafe8b0b65cdfc5b3b06b06014477e2 | ORPH x86_64 | berkeleydb-5.3.28 | NOK | http://autobuild.buildroot.net/results/869ef5f0f87da0b16553e2175ec365627610412c | ORPH arm | bird-2.0.8 | NOK | http://autobuild.buildroot.net/results/cd18354044450426616761a120c842f8e8a6d25d | mips64el | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/408fe05c60cfd227c67588fb99d95e26546f1e62 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/20688b309f32d1025f6a54141d5ed6dcb27abd0f | or1k | bpftool-a7f0e7f057283ae8af3... | NOK | http://autobuild.buildroot.net/results/dea546184521b22b7ecf4c506b95b88adf4f4566 | m68k | bpftool-a7f0e7f057283ae8af3... | NOK | http://autobuild.buildroot.net/results/951fb47b67501b90a36b635351c60c5376313a12 | arm | bpftool-a7f0e7f057283ae8af3... | NOK | http://autobuild.buildroot.net/results/a62ee58c5cabaa0355b99471e54dec55984fe31c | or1k | bpftool-a7f0e7f057283ae8af3... | NOK | http://autobuild.buildroot.net/results/673a4b1b599335aa93582d2e51c03805bd8508b5 | x86_64 | busybox-1.35.0 | NOK | http://autobuild.buildroot.net/results/63da2d2e4b23a9345497b1349f50c1abbd58e9cb | ORPH mips64el | busybox-1.35.0 | NOK | http://autobuild.buildroot.net/results/26d13876229871ec0917ee5ece1431ef15e2fee7 | ORPH mips64el | civetweb-1.15 | NOK | http://autobuild.buildroot.net/results/93a848d2e44675ee977b90563b585dd111afe915 | ORPH i686 | clamav-0.103.5 | NOK | http://autobuild.buildroot.net/results/df925655dabd7e72e0cecaea353a1a6b45b9e9db | x86_64 | connman-1.41 | NOK | http://autobuild.buildroot.net/results/74da4f4deab5f0ae9405d063ad52a5d4904a964d | powerpc64le | dieharder-3.31.1 | NOK | http://autobuild.buildroot.net/results/90798958f1d8f01ea511d865fd39b2d237f79594 | sparc | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/1dc3245ef598237f58929a5d8de1b67e294002a1 | ORPH xtensa | frr-8.1 | NOK | http://autobuild.buildroot.net/results/0c66628bf6a9266f58f916923cb9f83aeb9012ab | xtensa | frr-8.1 | NOK | http://autobuild.buildroot.net/results/c382f75d78ad7f23c10a1c8049c8382205f8d90e | i686 | gd-2.3.3 | NOK | http://autobuild.buildroot.net/results/c4fc4ec0a9b77406a70ae069654169ffa7759b6b | ORPH mips64el | gstd-0.13.0 | NOK | http://autobuild.buildroot.net/results/69c5388e0e0e838de20ac694069129b5cc0f3f12 | ORPH arm | host-attr-2.5.1 | NOK | http://autobuild.buildroot.net/results/308a72134f32db06b84d3afabcd3ce8a50cca3f1 | powerpc | host-attr-2.5.1 | NOK | http://autobuild.buildroot.net/results/851f64d219cc9c65caf9617f59b71564b704b564 | arc | host-autoconf-2.71 | NOK | http://autobuild.buildroot.net/results/25f9f0eef3cff74595acbd4c927ac7e532bc91b4 | ORPH riscv64 | host-autoconf-2.71 | NOK | http://autobuild.buildroot.net/results/a68b364af47f5382bf45036106df6a98c1f45646 | ORPH arm | host-binutils-2.36.1 | NOK | http://autobuild.buildroot.net/results/8658c28049138196352dad5da62f4ca710481a27 | xtensa | host-binutils-2.36.1 | NOK | http://autobuild.buildroot.net/results/da70e5ebe34d2d74bd92c95540822ab9fe9e8488 | arm | host-binutils-2.36.1 | NOK | http://autobuild.buildroot.net/results/1752d86d85aba10168a7911eb4c9ed1d199cdf2d | s390x | host-binutils-2.36.1 | NOK | http://autobuild.buildroot.net/results/54a9bc94bb6fe159b631bd7acc17a96ac67adf08 | microblazeel | host-binutils-2.36.1 | NOK | http://autobuild.buildroot.net/results/cc5407e4cef852225e34e16eda5f912bd0b524f2 | powerpc | host-bison-3.8.2 | NOK | http://autobuild.buildroot.net/results/2a2e6b0eec7683d930b4e5a17689a68d5b94dc01 | ORPH arm | host-bison-3.8.2 | NOK | http://autobuild.buildroot.net/results/853366b37ea980d55f36650be606f830c0024e85 | ORPH powerpc | host-bison-3.8.2 | NOK | http://autobuild.buildroot.net/results/03d2cc88c92d60fb56ee61a08f0bb4028255e3c7 | ORPH nds32le | host-bison-3.8.2 | NOK | http://autobuild.buildroot.net/results/686c01548258315d275af7643156fd3679b1e3dc | ORPH microblazeel | host-bison-3.8.2 | NOK | http://autobuild.buildroot.net/results/532186e97e61c2095449aaaf01880badfc07ba02 | ORPH arm | host-bison-3.8.2 | NOK | http://autobuild.buildroot.net/results/f0df4a936554a8453e4d63fe68622a03369a4dac | ORPH sparc | host-bison-3.8.2 | NOK | http://autobuild.buildroot.net/results/d5d4b1a150567f57aaff71869785ad11f6b93c08 | ORPH arm | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/3ce0133f3eb7e112715bf32d86c2362e5a93f64d | m68k | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/9bdbfdd94f0f1bf5c4d9b53cbb8e5702b4f9a3c7 | arm | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/7775f6418f12a78f1050f2c5504069295eff9a90 | arm | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/57ef5a8f72710748b7b2c3645fbc2efed6eb6221 | riscv64 | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/7cd462669bbc9239bedf9f74ec090f85849ffd9e | arm | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/9dc290c02d771e39bb02e68a662cddf68184e58f | arm | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/708656c912a1079c55862603b49fc7ccd843822c | arm | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/0237a52b594003a5548a01934324d2fecf35d1af | x86_64 | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/ff3815907bf2d5ab1189bc8112fc6abefaf7d5ce | x86_64 | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/2639a567c20f0b27faa6a731656016833b5516fc | powerpc64 | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/bbd310e08a2a2b372832a334fa3cce5abdf8e139 | x86_64 | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/f9b5d752b18e6b75ff6c2b6641edf1d55881311f | riscv64 | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/93e5da8a0f049cc3ea6ca5fa8868cff962698367 | powerpc | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/022ddccd7a6be9ebe7487132bce2b2c48b603a6a | x86_64 | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/018dee9cd7ddf5d7722fff72ac198d1a6e4db2b7 | powerpc | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/09dacbbca0eda2ef4e4985a158c881b9fe47aee0 | microblazeel | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/f098e324116d156a77f73a1aa8437f8a54294855 | riscv32 | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/a006f43a4b48bb8e1a71b27e54c07b5c6daa6074 | arm | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/0f4ece5fa0b0441fe087e04a14485cf2fa38b654 | x86_64 | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/9352536ff40d9de24d0f984c3f14b4de3d3e046c | x86_64 | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/66caf505b5ce7aaaca8d0bc8cbab06cc72758342 | x86_64 | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/f53c017f4896aa421982d97c8b59b921f62d4d97 | arm | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/2df41004d2d96f1f701a10055c211172d895df98 | arm | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/12da101ba5431880cc409d4bfd4700c6e39f7ffa | riscv64 | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/4cdc0f1c1c1dba14be259266ee881f7b57e3188f | arm | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/8dd449889294bac649b628e9bad3919ca07cf6dd | sparc | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/53903c80b04d8eedecb91972b6c8e2b7db0c1861 | x86_64 | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/d05e8c284178c44bac5eff7294def1572c6dcf1e | nds32le | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/900ddd6e93bb964d512434c3654bff7b9a56cf63 | arm | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/5fe0dabcb0fd58b11a6eab3a198e24f1b7a95526 | m68k | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/26cb9fcc36b42efae9b42081a67518c7e8bd2a5b | microblazeel | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/4abfebf29884584a3836a9d29c0fa8e5e30029de | nds32le | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/46a4e18d4526e0fb1e9065f277381ab95fe1b00f | arm | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/e80a60b6bb60fd962a326c3f8041d625b4c08f03 | mips64el | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/3eb7d1e8349139d08ddc8001286ea54636c593c3 | mips64el | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/5e73023d69304ea072615eb50b38f5667a987fe9 | sh4 | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/51ec75473ccd78c76b371ae7d98e434a726f6b32 | mips64el | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/10a5271ebcf7a5ed739916c7b30b9c7b9cd3e681 | nios2 | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/ea100dc10189981ce013a6e808965567b2861dde | mips64el | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/2d954650b56d49eca72ede76f811410ae6310e8c | arm | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/c1aa9db62135726b52aec68eb81e40d073e0d557 | powerpc | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/12d2f441c07b639c5fbdf1041462c12d560ea402 | nios2 | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/db3651195838ddef846a5b3ee33e430929bd6727 | nios2 | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/d1a635558d7ded24acd0bfe0d6d88e2f58a35536 | xtensa | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/49e470356d98be2bb872dc227c8e6f5f93773013 | arm | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/f020f100b5c3e345d14fdab3091bb7e19a416975 | arm | host-fakeroot-1.26 | NOK | http://autobuild.buildroot.net/results/75085a7ca278df438f277153e99a997d0381f1f9 | ORPH arm | host-flex-2.6.4 | NOK | http://autobuild.buildroot.net/results/e2f78cc61c8f0e731ea63108558246bb2b2c39b5 | ORPH arm | host-flex-2.6.4 | NOK | http://autobuild.buildroot.net/results/ba9391abf6841fcd9f6f62f48573de3301e2de2b | ORPH arm | host-flex-2.6.4 | NOK | http://autobuild.buildroot.net/results/78240849717e7a6931f9c30580b7a496b920dd02 | ORPH mipsel | host-flex-2.6.4 | NOK | http://autobuild.buildroot.net/results/1d1b5c83e1f4b714afcafa12a476ad922e344241 | ORPH x86_64 | host-flex-2.6.4 | NOK | http://autobuild.buildroot.net/results/e313446a0b597968118f617a7c1a1ac13fd17ac5 | ORPH m68k | host-flex-2.6.4 | NOK | http://autobuild.buildroot.net/results/8f575694d0e46cb8346948585c8065144d84082d | ORPH s390x | host-gcc-initial-10.3.0 | NOK | http://autobuild.buildroot.net/results/f03039af210d65a333a14e028ade1fab48084736 | powerpc | host-gcc-initial-10.3.0 | NOK | http://autobuild.buildroot.net/results/a80bccc0ccde7a43c1722dd6660679057c9233ef | xtensa | host-gcc-initial-10.3.0 | NOK | http://autobuild.buildroot.net/results/f559bba0e87529f7ee42ea5c30c7a15665f32a46 | arm | host-gcc-initial-10.3.0 | NOK | http://autobuild.buildroot.net/results/d60b16617d53cf676244bbcb8fec3e996ef8720f | powerpc | host-gcc-initial-10.3.0 | NOK | http://autobuild.buildroot.net/results/1c184af067464020285ac5da18bd9c6d188064d0 | arm | host-gcc-initial-10.3.0 | NOK | http://autobuild.buildroot.net/results/55a8782bcc4bcbda6e1c5b6c91195b45966f4d89 | powerpc | host-gcc-initial-10.3.0 | NOK | http://autobuild.buildroot.net/results/c3d2f0069dd5c6de57d96519c128181dd6f0ea69 | powerpc | host-gcc-initial-10.3.0 | NOK | http://autobuild.buildroot.net/results/7d0e49b78cb47d9b1b9190cf3c759a33706011b2 | s390x | host-gcc-initial-10.3.0 | NOK | http://autobuild.buildroot.net/results/b9957d5ca0708bdf6b277136bbb10b9cee509b45 | microblazeel | host-gcc-initial-10.3.0 | NOK | http://autobuild.buildroot.net/results/dcbaabe423977126311a009c0c10ddd3bd0182e3 | riscv64 | host-gcc-initial-10.3.0 | NOK | http://autobuild.buildroot.net/results/a0940c528ff3bb52761e5e9c7114072dc52bae34 | s390x | host-gcc-initial-10.3.0 | NOK | http://autobuild.buildroot.net/results/d24a0f6468af9f6b219b2ea87eb995423d20955b | powerpc | host-gcc-initial-10.3.0 | NOK | http://autobuild.buildroot.net/results/d96a99c5fa00404b7d8aa92a127b46a9f68bcb48 | microblazeel | host-gcc-initial-10.3.0 | NOK | http://autobuild.buildroot.net/results/e7ed2dcb7cb42b05be15713aeb26818742941508 | riscv64 | host-gcc-initial-10.3.0 | NOK | http://autobuild.buildroot.net/results/694e7db77d388cbb191554e2e8106d2fd730b913 | arm | host-gcc-initial-10.3.0 | NOK | http://autobuild.buildroot.net/results/114aafc637d3d2b5570eb0a793974d0246a91579 | riscv64 | host-gcc-initial-10.3.0 | NOK | http://autobuild.buildroot.net/results/532fd659b51321742b2529b301426b5cae24a36b | microblazeel | host-gcc-initial-10.3.0 | NOK | http://autobuild.buildroot.net/results/e6b90734968eb443a1d1ae3d9ad075f73a20176b | riscv64 | host-gcc-initial-10.3.0 | NOK | http://autobuild.buildroot.net/results/c46213c5eef048637a2cdba3d595823490f6635a | arm | host-gcc-initial-10.3.0 | NOK | http://autobuild.buildroot.net/results/28751bc7ac4c2ecd25ad689e74a1cdec304af830 | arm | host-gcc-initial-11.2.0 | NOK | http://autobuild.buildroot.net/results/2152ec1ec6a8d1f0364256c12003bb32d2827275 | arm | host-gcc-initial-11.2.0 | NOK | http://autobuild.buildroot.net/results/5ae09dbf90637d62056ab11f8ea9580db99d66e8 | arm | host-gcc-initial-11.2.0 | NOK | http://autobuild.buildroot.net/results/4a2e2bcc6bc29d860658f974b82688536dac1de2 | arm | host-gcc-initial-11.2.0 | NOK | http://autobuild.buildroot.net/results/39688e1f711145176bde1919c687ebd1dca65d65 | arc | host-gcc-initial-arc-2020.0... | NOK | http://autobuild.buildroot.net/results/2cd5947c6248d425b78658fa2911b3ca103991a0 | arc | host-gcc-initial-arc-2020.0... | NOK | http://autobuild.buildroot.net/results/f9f0b45488226e55464d90330ea350f4c91739c5 | arc | host-gcc-initial-arc-2020.0... | NOK | http://autobuild.buildroot.net/results/127224d67cde1070d4a0fb98b060f789633bceff | arc | host-gcc-initial-arc-2020.0... | NOK | http://autobuild.buildroot.net/results/7d0dda8152d68fa3a23f9f3c651bad6c34e3f0e6 | m68k | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/870c711031349cbd608cea516ae4710a2a4e5034 | ORPH arm | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/11f67a38914289d52d85472994a64c73376d7de9 | ORPH riscv64 | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/aae1869566641dbeb74f011d0d8d4607d8fd2f0b | ORPH arm | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/a7b44d4d9b7ab83701f0cfc1df38bead07ab9f18 | ORPH sparc64 | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/f463868207adbd6e15f66c737d9da025055fc845 | ORPH nios2 | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/41f79cfef1564f4dc50b4d10b15ebe4da9f5f68c | ORPH x86_64 | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/2a58ac9efdef6093c3be56dc2fffe906a9bce586 | ORPH powerpc64le | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/115bdb135a03c2b04ea49df3568d89125917d02d | ORPH arm | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/0c46607f8faa54618dabc0f7e35a9716836b4ee7 | ORPH or1k | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/cf1de1c70df9995b89eb29dd194553b014e91acf | ORPH arc | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/6f213cd1fea751fe13845f1a57290c0846e976be | ORPH mips64el | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/db6a930295a519333eb197ac6051e9526baa5fd6 | ORPH mipsel | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/368c7b3be0c72ef6619b6ee1c61fbd85504bd691 | ORPH nios2 | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/d2520277c123ec9c83fc1aa016ad77bce50fc80b | ORPH riscv64 | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/4a30df93e278ff0d0373c05d81a71e091fce764d | ORPH mips64el | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/e0c0b4955539e416dc9d22e25b33d9e5f559a46c | ORPH xtensa | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/684ee467247154b0ca835ca9997e78c6bddaeac8 | ORPH arm | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/f3f0555e14c7c285bb14d56d613f7301fb55268e | ORPH mips64el | host-gettext-tiny-0.3.2 | NOK | http://autobuild.buildroot.net/results/80d6d56964d97bb40888cff574a768655625ee46 | arm | host-gmp-6.2.1 | NOK | http://autobuild.buildroot.net/results/72d2470dffcaf8091206e7d81368ea20ee57d314 | ORPH microblazeel | host-icu-70-1 | NOK | http://autobuild.buildroot.net/results/748667c39567469876f527ff036a89b6b66067e7 | ORPH aarch64 | host-libffi-3.4.2 | NOK | http://autobuild.buildroot.net/results/cee32154aa5be2804ddfdcc487a53a65e1d7aef8 | arc | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/a83a7550b892a54a64ea3e93e3ba47b8e1bb1e28 | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/f87e35538909da714d433c1f680b0c3976b76577 | sparc64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/f1803776147652c46abddb26b7851c7d8f8ef772 | sh4 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/286ab3c6bcb1766aa9dac3f75d1b9f673277c6b8 | i686 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/c4dbf7cf6d82d7b206efcd0bd821130a45817adb | arc | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/72d8181857460c7b9a177fd7334d8ce543751080 | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/9bd944e514735af80da0c20cfdd91c7e6211039c | mips64el | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/ff81f72c42aa5d4282d6c30f506348784688d82e | sparc | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/8a8aa929f27c3518dcf0871ad62c6ada218ce1a3 | mips64el | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/3992d8c99a2ebc333b038e6fca832e56e060278d | sh4 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/b4d16477833e7865b080bb431586cb678eb75e5c | microblazeel | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/c2f0ba52c1c0a0c5394107fb57bb473409aad60c | i686 | host-libtextstyle-0.20.1 | NOK | http://autobuild.buildroot.net/results/ea79ff2e65789874ea0e5cbd8ed9e6e930d27e2d | ORPH arm | host-libtextstyle-0.20.1 | NOK | http://autobuild.buildroot.net/results/7f492852b71a12aa87243f1024f39baead627f54 | ORPH powerpc64le | host-libtextstyle-0.20.1 | NOK | http://autobuild.buildroot.net/results/4a4790b46eea9a4c8a926f909f47280a1d31adfd | ORPH arm | host-libtool-2.4.6 | NOK | http://autobuild.buildroot.net/results/d5f25920ddf38ee12858dbb99976b54ccb3276ca | ORPH x86_64 | host-libxml2-2.9.12 | NOK | http://autobuild.buildroot.net/results/25a2bf49e972c76780c73a0b9c4f3d5be65d8152 | or1k | host-libxml2-2.9.12 | NOK | http://autobuild.buildroot.net/results/ee4e4ec1d546244b522ff7693cdeb16725f5e712 | sparc | host-m4-1.4.19 | NOK | http://autobuild.buildroot.net/results/620b1055e34139f4d747de01949d8e9ce49179fe | ORPH mipsel | host-m4-1.4.19 | NOK | http://autobuild.buildroot.net/results/bbf0af7ce3f4bce936a760c7d7605f830b10ae61 | ORPH x86_64 | host-m4-1.4.19 | NOK | http://autobuild.buildroot.net/results/7f89ac9e3925bea56272745332147fb1b331a326 | ORPH mips64el | host-m4-1.4.19 | NOK | http://autobuild.buildroot.net/results/53b36952c6d179d069570cea312d2b4054c933e0 | ORPH mipsel | host-m4-1.4.19 | NOK | http://autobuild.buildroot.net/results/30c80c7a5c0dcacba357272c1fcf73b7801c3afc | ORPH x86_64 | host-m4-1.4.19 | NOK | http://autobuild.buildroot.net/results/8ad62acbc96c02f943b0305560d0cec3b8449d76 | ORPH arm | host-m4-1.4.19 | NOK | http://autobuild.buildroot.net/results/3b1a102e3eb9b6e24c6abf6a7644e8c4f24504de | ORPH mips64el | host-m4-1.4.19 | NOK | http://autobuild.buildroot.net/results/c420b5da0a5c9dd143de4a42e15187c4b84e0809 | ORPH mips64el | host-m4-1.4.19 | NOK | http://autobuild.buildroot.net/results/d2e5c11b4b6fe262d36e66ac96916fea2569fefb | ORPH mips64el | host-m4-1.4.19 | NOK | http://autobuild.buildroot.net/results/33775b6bda4e5e7ff833b6e2c4dc54813ead8e82 | ORPH riscv64 | host-m4-1.4.19 | NOK | http://autobuild.buildroot.net/results/101c5e893d1750cbc61fc99650c1bfe2ccb90f78 | ORPH nds32le | host-m4-1.4.19 | NOK | http://autobuild.buildroot.net/results/b557a6910dda6282c5054692552263dd6d0aff9b | ORPH powerpc64le | host-m4-1.4.19 | NOK | http://autobuild.buildroot.net/results/7d39e7e2f669ca41b44ac4dbfef3843eb68b70c1 | ORPH arm | host-m4-1.4.19 | NOK | http://autobuild.buildroot.net/results/22d92b7c2bc076f327b3f02873d3a4ebeb3660ec | ORPH sparc | host-m4-1.4.19 | NOK | http://autobuild.buildroot.net/results/8573a1aa6de3c5b88c3ac045ad8f6f3558e3f841 | ORPH s390x | host-mpc-1.2.1 | NOK | http://autobuild.buildroot.net/results/a4f726bacc0a9866105f80fbb92cd436ffa36749 | ORPH arc | host-mpfr-4.1.0 | NOK | http://autobuild.buildroot.net/results/8d93e3429e6e48ddb14a53f91028aae96ae3cf63 | ORPH arc | host-mpfr-4.1.0 | NOK | http://autobuild.buildroot.net/results/d08709fef7acbc500a27bba50c9dcc78434e6b6e | ORPH riscv64 | host-mpfr-4.1.0 | NOK | http://autobuild.buildroot.net/results/690199ae1abd82af15b29c94f016ada124c74e49 | ORPH mipsel | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/a04f2c354fe48511ae7a15e8d935f2988e7b6038 | ORPH arc | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/dbc3474989c221555a5cf72cbe624cb58b473165 | ORPH x86_64 | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/aa0ea01295cd1e137de786d8656ef013b9e1e499 | ORPH riscv64 | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/8cc8fd9c711db6926468f8016016044afc6afb67 | ORPH mips | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/0d5eff0831a2cfb2d3f80a268971cb4e0c27c14a | ORPH m68k | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/ff3faab487ef49f2fada151f0a0c6dc5ec4e6d1f | ORPH microblazeel | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/53566f29c98238e843f507518202e5c47d560f57 | ORPH x86_64 | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/fca5f4054ccdb00e0fdfdc3cdb4e35306b862104 | ORPH xtensa | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/3fa2f66b82974976baef8dd7c44f3cdde1032bde | ORPH nios2 | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/196fc2932c6a9d831d84846a2a7edb931ed12fb0 | ORPH i686 | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/657c7e3c05c53e6fd0b40a4e8882d39039471347 | ORPH mips64el | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/ee5eb267d46a03f64a04047f398f76e7aa24291b | ORPH sh4 | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/2c180d8ebce140d2f4a851fb043884df9a31f76f | ORPH powerpc | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/7f3bdcbf4750cd7f2b63c1ebad471dab76ff5d9c | ORPH i586 | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/1c770956544f0030eac2a655bc86d8ccaa4f7e0a | ORPH mipsel | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/a67cebe85b39e936aca53107f48fe723c62f39a5 | ORPH arc | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/ed3c67d49eed7a16421bbc48ca9c506447da5532 | ORPH arm | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/753458ab9edc5d37d4ff89ade77dd22624ff3b2d | ORPH i586 | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/009c4ed6b390c12205a815185f7d3e9607add74c | ORPH arm | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/e617016acdd42f6785e947a7f1635faa4de20467 | ORPH mips64el | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/a6942b87fe7d27baacf13924df36fe6a8bd534c2 | ORPH sparc | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/f8ff6399b092ed76ed8e820ebe11ca071f5693f9 | ORPH mips | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/d451ca99d3d472fdd581f30ddd12332f4ccf35b4 | ORPH mips64el | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/7aae9826558894d4122cf25ffe159fa653a36a7f | ORPH arm | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/b388297f5ff86075926d9c19348d00ceecec669f | ORPH mipsel | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/e577e59e3405d24843d4b16d57c0a18ff57af546 | ORPH arm | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/e9f7d59e036844b5df2a0098fb9c0d77391c46c9 | ORPH arm | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/382585ec23743a330da057f094e764761a1cdfc2 | ORPH arm | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/cce84296ecb8a2aa06c417486c4ffa5d825a951d | ORPH x86_64 | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/5590a501d2bdcd73ceaf85d2ea79ae7ffe7b3ba2 | ORPH arm | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/da7d5bffbedcea4d8d33f8212cc2ab35556976ba | ORPH arm | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/867a3826dd86bcf89779f58a58ce313d5a8fc335 | ORPH i686 | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/f5d3113f6b1acbcb8230cc2992125415bc6bf549 | ORPH xtensa | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/a752b6368dadf00e6f0b11504c799eeda30313d1 | ORPH arm | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/b4a268fa72693e516494c223a762f38a0620cff6 | ORPH arm | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/0b606b53e55c87a44b288eb8ce58734b7f1cc70b | ORPH arm | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/af11e7c2c95ef8c911988443338a8cca56d03aab | ORPH mips64el | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/fb810c0694706997cf1d4fdbf818d54b7f03622e | ORPH arm | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/683aac9f140a20e6f7933fb04de68ead8d5a7520 | ORPH aarch64 | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/8fb79c0d6475908c207fab7bac7e33a73bba95a0 | ORPH riscv32 | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/66b9a81f1a9b960a96fcf6bb19331b72c693a310 | ORPH microblazeel | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/9a07fa6792545c48988fb8055b7d004a4dccfd67 | ORPH i686 | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/2793bfbeb4399ddbb8f2c35695476517995cfe11 | ORPH or1k | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/fe4a702f2fd5da58a40145a2f7a6acb9d6571a20 | ORPH or1k | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/586b4b31cdd7561c848728ceae022b15c05b107f | ORPH riscv32 | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/087e10d1022f298dac8b6b11052e6f18860b482c | ORPH xtensa | host-pcre-8.45 | NOK | http://autobuild.buildroot.net/results/db772a46ee0d0e2a19fc6bba3c0e4cd16e686ba3 | ORPH i586 | host-pkgconf-1.6.3 | NOK | http://autobuild.buildroot.net/results/10815078a3e060ac73be31c7611ce32f80c0dca7 | ORPH arm | host-pkgconf-1.6.3 | NOK | http://autobuild.buildroot.net/results/6f7de6528764f9536ac73ca7344268b7f4f82847 | ORPH mips64el | host-pkgconf-1.6.3 | NOK | http://autobuild.buildroot.net/results/534a1fa059b26a845eaaf93bfc7abdb6eb494bd0 | ORPH powerpc | host-python3-3.10.2 | NOK | http://autobuild.buildroot.net/results/4e977ae94e768f8f45e49989fc20d35fc7ba0367 | arm | host-python3-3.10.2 | NOK | http://autobuild.buildroot.net/results/ab88a869b2688430f6abe79878faea013362549a | riscv32 | host-python3-3.10.2 | NOK | http://autobuild.buildroot.net/results/71df7ed82d7e9fb3bfb89b5a4dedfba439c938a1 | mipsel | host-python3-3.10.2 | NOK | http://autobuild.buildroot.net/results/e6cf2dd1a289e98b89d6623b1d872c5b8f2544a9 | nios2 | host-python3-3.10.2 | NOK | http://autobuild.buildroot.net/results/6d273a836655b08a74b953a15523d43de0ed9e5c | mipsel | host-python3-3.10.2 | NOK | http://autobuild.buildroot.net/results/ff18371dd9c13af9c057b3bf06835eb8f16efb94 | riscv32 | host-python3-3.10.2 | NOK | http://autobuild.buildroot.net/results/5eccf195e624369957b09164bdabb56ea1f4f3fd | mips64el | host-python3-3.10.2 | NOK | http://autobuild.buildroot.net/results/ac88d0fba46fc9da3d49c182f01edbc9d20d94ab | nios2 | host-python3-3.10.2 | NOK | http://autobuild.buildroot.net/results/7db43790cb8cdc51533a1fd0fd3add6082fe1a69 | sparc64 | host-python3-3.10.2 | NOK | http://autobuild.buildroot.net/results/725a4e0e8b6f3f256ce3754ea4ba1a68e69d1654 | mipsel | host-python3-3.10.2 | NOK | http://autobuild.buildroot.net/results/052678b50a0c422c35e996dae8c8a757b3e6fd1f | m68k | host-python3-3.10.2 | NOK | http://autobuild.buildroot.net/results/fb8802683a18fc30a7a96cca4f054f17f2d98fcd | m68k | host-python3-3.10.2 | NOK | http://autobuild.buildroot.net/results/0ac0d153b602c12e21584894ae9a3f542255de89 | arm | host-python3-3.10.2 | NOK | http://autobuild.buildroot.net/results/d7cfa0eacf8894e9472e67741352c9840a7d3702 | x86_64 | host-python3-3.10.2 | NOK | http://autobuild.buildroot.net/results/649e07a9d51ae798152cf63b7f1ca2ddbc26d467 | m68k | host-swig-4.0.2 | NOK | http://autobuild.buildroot.net/results/1e25675fcc4dc770496614318e203b642ce9cb3c | nios2 | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/b3b57f88321c7f6710a5b93270296fd3895f0423 | ORPH arm | host-xz-5.2.5 | NOK | http://autobuild.buildroot.net/results/b0eabc30b4dc51ed29628d27f991732a1872085a | ORPH arm | libiconv-1.15 | NOK | http://autobuild.buildroot.net/results/cfa52189d9778e55386bd8470dc9c68360624d53 | ORPH sh4 | libnl-3.5.0 | NOK | http://autobuild.buildroot.net/results/3e776dc204d9a599041a52902eb2b25af68b2e14 | ORPH powerpc64le | libopenssl-1.1.1m | NOK | http://autobuild.buildroot.net/results/550fff194b12f7c1531c74177ab7fafe45c36932 | arm | libopenssl-1.1.1m | NOK | http://autobuild.buildroot.net/results/b8317fbcf5a97c7a95c2c205e5fefd3ceec7b1b8 | or1k | libopenssl-1.1.1m | NOK | http://autobuild.buildroot.net/results/534d5bce5c2a3ebf2b156f000da0eea3a3bdb250 | arc | librtlsdr-ed0317e6a58c09887... | NOK | http://autobuild.buildroot.net/results/fb34753d0b2191c73f0418f28c08ef1a9bc19ba7 | i586 | libsamplerate-0.1.9 | NOK | http://autobuild.buildroot.net/results/b74e4a5dcffa15ddf370db759e9803a1ccf27591 | ORPH powerpc | libtirpc-1.3.2 | NOK | http://autobuild.buildroot.net/results/e9e982e5439b6f4fbf425cfe233477eef393ac48 | powerpc64 | libusb-1.0.25 | NOK | http://autobuild.buildroot.net/results/94fcf202db66760ef448f148de01cfc3e406e653 | arm | libuwsc | TIM | http://autobuild.buildroot.net/results/0cdc8095062ad980da9c75ea23e93d3b672200df | arc | libzlib-1.2.11 | NOK | http://autobuild.buildroot.net/results/ef1b9f540ea8abe1a5fdf1820478c8e0e3e5e515 | ORPH mips | libzlib-1.2.11 | NOK | http://autobuild.buildroot.net/results/266b14b0446f96acd4623a0cb6cb6d1e476a7875 | ORPH mips64el | linux-pam-1.5.2 | NOK | http://autobuild.buildroot.net/results/4d5a5adc9a9148ade9a239a93db7e9880ca18923 | ORPH arm | ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/cfc11637305598516dbd8cabb0dc9710bbae506e | ORPH i686 | ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/83cab5f79ea923050484b2c10787344511f6fa91 | ORPH x86_64 | ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/c1ac13e97a0b8a4b74f2d35f571899309b81ae28 | ORPH x86_64 | openjpeg-2.4.0 | NOK | http://autobuild.buildroot.net/results/9130ebdbd227902d2836aeeb33de1b37ac47f4c4 | powerpc | osm2pgsql-1.6.0 | NOK | http://autobuild.buildroot.net/results/e9394aa3b785b09a491f27a1b69dc946a1523333 | riscv64 | pcsc-lite-1.9.5 | NOK | http://autobuild.buildroot.net/results/6c04e50a544ee7efea0ef80cada19acf6c6b1a85 | ORPH arm | pulseview-0.4.2 | NOK | http://autobuild.buildroot.net/results/032f69d67b2fc996349347ff86b02d794df882f4 | arm | python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/98c61da822599a4af6a4adda60e7eabe3616f928 | powerpc | python-pygame-d61ea8eabd56 | NOK | http://autobuild.buildroot.net/results/1b81851b0c7f039296bbe01ca19e831926f96945 | riscv64 | ruby-3.1.0 | NOK | http://autobuild.buildroot.net/results/877f26a006cebf531fcf71d06abdc931f570b5b7 | microblazeel | snmppp-3.4.2 | NOK | http://autobuild.buildroot.net/results/93bfa52af6f0d448f2f5697222b1dd6c53b5e74c | arm | sqlite-3.37.2 | NOK | http://autobuild.buildroot.net/results/995270afbd20931b43bc5b638ad0c137c0426d42 | arm | toolchain-external-codesour... | NOK | http://autobuild.buildroot.net/results/e64f613c617dda3828ca21dd3b7eda2b7f8800e2 | ORPH arm | unknown | NOK | http://autobuild.buildroot.net/results/2c3a3fe2c69fa1bb4c11eef8397c1cfc0cf83c87 | arm | unknown | NOK | http://autobuild.buildroot.net/results/bad306bab8de44c08f80779fb1b0fcbba6a29bea | arm | unknown | NOK | http://autobuild.buildroot.net/results/51494266d2d636fec7c8fb604690e39719272326 | riscv64 | unknown | NOK | http://autobuild.buildroot.net/results/9fc411081b02f0808ac0aa35542ab1cbe33a5d71 | i686 | unknown | NOK | http://autobuild.buildroot.net/results/830e8b954b78c43901c9e6228a6e14709686b04b | arm | unknown | NOK | http://autobuild.buildroot.net/results/e27eb187a037e800a5e06eb6780bed66330781bd | nds32le | unknown | NOK | http://autobuild.buildroot.net/results/f51596e45f41750c7e2d3501d54703837e8b84de | arm | unknown | NOK | http://autobuild.buildroot.net/results/0b67ac70254589cf8085dce4be531b743f242990 | arm | unknown | NOK | http://autobuild.buildroot.net/results/e0e395bdc31e5fa013a922faf7d4aeb2b572a3a7 | xtensa | unknown | NOK | http://autobuild.buildroot.net/results/1d392c260820faea3a469afdb5aa698deda2c233 | arc | unknown | NOK | http://autobuild.buildroot.net/results/74ab5cd320a415fe949d84bb3b0ce326697ed52c | arc | unknown | NOK | http://autobuild.buildroot.net/results/43c8034dc85983c7bb3f51d812984d9cba53da80 | riscv64 | unknown | NOK | http://autobuild.buildroot.net/results/c1ed54003841728bc2ed9c4572a758080f827cbe | nios2 | unknown | NOK | http://autobuild.buildroot.net/results/f58bbd2bbad6608be6df83601f0be4d5dc2e996a | mipsel | unknown | NOK | http://autobuild.buildroot.net/results/400c6cd7dccab27eae65a3663084c460895fe18c | arm | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/0eaf0b392463297ed3cde3f74d53aa337517b247 | Classification of failures by reason for 2021.02.x -------------------------------------------------- host-ncurses-6.1 | 12 host-cmake-3.15.5 | 8 host-gcc-initial-9.4.0 | 6 host-gettext-gnu-0.20.1 | 5 alsa-lib-1.2.4 | 4 host-bison-3.7.1 | 3 host-flex-2.6.4 | 2 acl-2.2.53 | 1 bluez5_utils-5.62 | 1 busybox-1.33.2 | 1 host-autoconf-2.69 | 1 host-gcc-initial-arc-2020.0... | 1 host-m4-1.4.18 | 1 host-python3-3.9.9 | 1 ncurses-6.1 | 1 rocksdb-6.13.3 | 1 unknown | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | acl-2.2.53 | NOK | http://autobuild.buildroot.net/results/57d89025010766ac8b774c2b054d6d1cc5604846 | arm | alsa-lib-1.2.4 | NOK | http://autobuild.buildroot.net/results/3e9db1da6d3b185f4a9adfa3673fe302129faa48 | aarch64 | alsa-lib-1.2.4 | NOK | http://autobuild.buildroot.net/results/fd6b7b90b904ef2b6066bbc3f57d6ba8a17f9572 | aarch64 | alsa-lib-1.2.4 | NOK | http://autobuild.buildroot.net/results/37e385276909657caba765fc686be73f6c5434dc | powerpc | alsa-lib-1.2.4 | NOK | http://autobuild.buildroot.net/results/c8c20ef74329e6da01e5372da9b474a445c8827d | nios2 | bluez5_utils-5.62 | NOK | http://autobuild.buildroot.net/results/c1103f421e14eb3810a00b1f05c71d85a72bdc13 | aarch64 | busybox-1.33.2 | NOK | http://autobuild.buildroot.net/results/41aed9996699ce944503af88ab247d10a37563a2 | ORPH arm | host-autoconf-2.69 | NOK | http://autobuild.buildroot.net/results/12b93650cc31769ae1c9b85f7dea0c9edb908512 | ORPH riscv64 | host-bison-3.7.1 | NOK | http://autobuild.buildroot.net/results/3db18f89666e4703e95d68605b986a1bfa7e7e42 | ORPH m68k | host-bison-3.7.1 | NOK | http://autobuild.buildroot.net/results/ded26d3cea53a2d6ea30bc5797cc4bca9afcd31a | ORPH powerpc | host-bison-3.7.1 | NOK | http://autobuild.buildroot.net/results/343ed7fe555824498ae443ffbd3c2b054d859713 | ORPH aarch64 | host-cmake-3.15.5 | NOK | http://autobuild.buildroot.net/results/87594a0bd50f85fff7aad7c63260a52ec44ab10b | mipsel | host-cmake-3.15.5 | NOK | http://autobuild.buildroot.net/results/74963d4b93d94720b0105df2c095e20bde4e16e3 | aarch64 | host-cmake-3.15.5 | NOK | http://autobuild.buildroot.net/results/a80f8016aee3306272de66bea7b590d1011a7fb4 | nios2 | host-cmake-3.15.5 | NOK | http://autobuild.buildroot.net/results/952cafc12bfae80a29fa09e62db4ff4923c834c1 | mips | host-cmake-3.15.5 | NOK | http://autobuild.buildroot.net/results/988ab1c20ec6afe594f9eedb020f63b32df9de78 | arm | host-cmake-3.15.5 | NOK | http://autobuild.buildroot.net/results/446bced66e6d41a17553f51008290acf16de278c | m68k | host-cmake-3.15.5 | NOK | http://autobuild.buildroot.net/results/85af99cc6a46055ccd6d0bf5b3213a7bab03bc7e | sparc | host-cmake-3.15.5 | NOK | http://autobuild.buildroot.net/results/5531459d268263ee848fa901f74f31c7bfa6f447 | riscv64 | host-flex-2.6.4 | NOK | http://autobuild.buildroot.net/results/5d03915d7127d106a3ef97fb72fb8e1fa8e9ff67 | ORPH riscv64 | host-flex-2.6.4 | NOK | http://autobuild.buildroot.net/results/6b8db27c5716107f36778214e57448dace48f2ea | ORPH xtensa | host-gcc-initial-9.4.0 | NOK | http://autobuild.buildroot.net/results/088e3eadd204a3beaedc9fdcbb0118441adc24ba | arm | host-gcc-initial-9.4.0 | NOK | http://autobuild.buildroot.net/results/5da0ae2824258713d9a0d7935bd390a7cebdc601 | arm | host-gcc-initial-9.4.0 | NOK | http://autobuild.buildroot.net/results/0d84bcc1a843e31eeafe76276df8852852f0ff44 | arm | host-gcc-initial-9.4.0 | NOK | http://autobuild.buildroot.net/results/b52f8ee6c37ed5b3e5df0a47bd3a7950be1d0d9c | riscv64 | host-gcc-initial-9.4.0 | NOK | http://autobuild.buildroot.net/results/e8a60c7c5ce0737f70e9d6a7e5f97ccdce44c009 | arm | host-gcc-initial-9.4.0 | NOK | http://autobuild.buildroot.net/results/f90dcda46f624bf528ceb3da9666a932ade8aa5c | arc | host-gcc-initial-arc-2020.0... | NOK | http://autobuild.buildroot.net/results/9ae55331c43bdf82a755fe8d3001369814afe509 | arm | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/1f9b9b37317e98269b81a511fc027ff9d5228cbd | ORPH arm | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/b9292e0a3f780b3fd980d7f1ad4cd7b54190ac54 | ORPH arm | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/0ae6d19b915c7166a660c51d94297c5fce38eee8 | ORPH i586 | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/9ee3795ccbdb8c33f6fd25a3a4740d030ee1192c | ORPH nds32le | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/530c15ef5553a5797c55594b89c068dc445e1cc8 | ORPH arm | host-m4-1.4.18 | NOK | http://autobuild.buildroot.net/results/a266d1c18d907e0259ee6929b2133239b4384637 | ORPH aarch64 | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/3ab5eb00373a92634fc4dc92a13a2064a67462f2 | ORPH m68k | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/3d1785032146b39054137edc31c979c91c8f64b6 | ORPH microblazeel | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/72d1128ece4ceaaafb926f07edaf2034a364cf1e | ORPH aarch64 | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/75706e47e808d5d9fd8ea4303aba3fd133ca4f9d | ORPH powerpc | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/e7d392f9a921e154461ac5560d7d04b0b712187b | ORPH x86_64 | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/84464b7592277f1ad6cfb0dd04979a2fa5f7764b | ORPH sparc64 | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/7d21f92fcb8e66e913343a4072dd07b735b7b62d | ORPH or1k | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/d67461a4e3726751e1eb9cfb1c6a2221c82da620 | ORPH arm | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/f14155349a473450572f6de4e55ec42af10fa199 | ORPH arm | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/facdc94d27e857d35e2cc2cf945a0bea01718ca4 | ORPH powerpc | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/fcdcf487aa6c4b1dbbacf00195532788e0f910b0 | ORPH m68k | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/2d5a5e03fffc70fe9cc143788aca7ca3a81289e8 | ORPH mips | host-python3-3.9.9 | NOK | http://autobuild.buildroot.net/results/4c1a4332193529fa2fe53a551de8910e01d2d79c | arm | ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/9099255c88836c7998326c8b2a435698f4dbbb0b | ORPH m68k | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/445d6869cffdc75da80351abeb1a5587f848386e | arc | unknown | NOK | http://autobuild.buildroot.net/results/469a8e4a78ef627fe64c60af3fe8d1c3128dda17 | Classification of failures by reason for 2021.11.x -------------------------------------------------- host-cmake-3.16.9 | 6 host-ncurses-6.1 | 6 host-gcc-initial-10.3.0 | 5 host-gettext-gnu-0.20.1 | 5 host-m4-1.4.19 | 3 host-binutils-2.36.1 | 2 host-python3-3.9.9 | 2 acl-2.3.1 | 1 busybox-1.34.1 | 1 flex-2.6.4 | 1 host-bison-3.8.2 | 1 host-gmp-6.2.1 | 1 host-libffi-3.4.2 | 1 host-mpfr-4.1.0 | 1 host-python-2.7.18 | 1 libgpiod-1.6.3 | 1 libiconv-1.15 | 1 libvorbis-1.3.7 | 1 mpfr-4.1.0 | 1 ncurses-6.1 | 1 openal-1.21.1 | 1 unknown | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64el | acl-2.3.1 | NOK | http://autobuild.buildroot.net/results/e04187f1d55d4e457cebab61beec4838d67d1391 | xtensa | busybox-1.34.1 | NOK | http://autobuild.buildroot.net/results/c4afb1b48f388b21a3ef65b4e5d90e17d8606887 | ORPH mips64el | flex-2.6.4 | NOK | http://autobuild.buildroot.net/results/6791b65bb4e30bde9098de7ffe299854703a2ec3 | ORPH powerpc | host-binutils-2.36.1 | NOK | http://autobuild.buildroot.net/results/7b63718702d23e054d8ca59fa93db98e5ad76311 | microblazeel | host-binutils-2.36.1 | NOK | http://autobuild.buildroot.net/results/690ca4d5b6897160589f57eb37c15869a4acd9c3 | s390x | host-bison-3.8.2 | NOK | http://autobuild.buildroot.net/results/371868f35d95503fd08e61c487ae92170aa71376 | ORPH arm | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/fa037470ca7bc6b817ea80dd327e2a03521ec546 | x86_64 | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/c9420a37ce29d3bbf2de3f2c24e6d7f3b8a6ec9d | arm | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/186f2eca9d9dade52070712e7075362a9b435ff2 | nds32le | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/e036723739a437c93e95d8c2034ef4dd3ae1531a | mipsel | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/08cf12e4abda470660ef1cf6ec1b866bc87bbbec | nios2 | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/d700240e81c2a177646c48593aec654135aeaee7 | microblazeel | host-gcc-initial-10.3.0 | NOK | http://autobuild.buildroot.net/results/5b44c69db1244ef0a9903b030b3a6ec2a010a632 | powerpc | host-gcc-initial-10.3.0 | NOK | http://autobuild.buildroot.net/results/a484a2888c552ff01754657633098e45ab5fc718 | powerpc | host-gcc-initial-10.3.0 | NOK | http://autobuild.buildroot.net/results/c9c8b5ac15cb789196a3942351de802a346a44ce | arm | host-gcc-initial-10.3.0 | NOK | http://autobuild.buildroot.net/results/55dbd731ba0517387693e6417c425e29860ef0a9 | powerpc | host-gcc-initial-10.3.0 | NOK | http://autobuild.buildroot.net/results/e5a739805e087019facbe9164c3959831f7a770b | i586 | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/1700e4fe273f8b2c62ed8aaf0b9deb4121be2d7e | ORPH nios2 | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/750cda121e5cfb72c2cce55fbc6493f257dde799 | ORPH x86_64 | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/85f15d58e8588f37711656a94ccd19e7b2e9a16c | ORPH mipsel | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/96beeb980a07970fd128b38bb2d83e1b9ef17015 | ORPH x86_64 | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/7b5a4c33d212712db29b27cab185e51c1ffeb381 | ORPH arm | host-gmp-6.2.1 | NOK | http://autobuild.buildroot.net/results/06636ae6085527259dbc7c1384400b46a545652d | ORPH powerpc | host-libffi-3.4.2 | NOK | http://autobuild.buildroot.net/results/8534661cac8ecb474dd789165a354fa9225d3cbc | nios2 | host-m4-1.4.19 | NOK | http://autobuild.buildroot.net/results/96fe66be74a3ac540fff3e745d4bd76744fcf5c3 | ORPH nios2 | host-m4-1.4.19 | NOK | http://autobuild.buildroot.net/results/f1de38389f75e5e7cacd55c5cd4040c621443e8e | ORPH x86_64 | host-m4-1.4.19 | NOK | http://autobuild.buildroot.net/results/482587a7a91855fec06c8de41950cd8f46157e9f | ORPH powerpc | host-mpfr-4.1.0 | NOK | http://autobuild.buildroot.net/results/a46d4867accbe2a7b5738afde0afe4fca045fecc | ORPH or1k | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/6d1a99e9c0ec95cea334639d8df7a2e461ec9440 | ORPH m68k | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/74f3e8ce4f41710c36c5ecb8f67a0bec671d0729 | ORPH powerpc64le | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/3f492d9c39f505bb5a04b9a07c049409a361647e | ORPH arm | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/f0640891ae75e5590b9a7c4f7dfb06afd14bbe71 | ORPH arm | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/1a729cfd9de579c7a692bb53e29ac1a4738638de | ORPH riscv32 | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/a2c8074dd5f06137ff922821ec76ad1f25b967af | ORPH arm | host-python-2.7.18 | NOK | http://autobuild.buildroot.net/results/1ecebba8e9f0dfe247b3ce1426356b92cc89bc68 | m68k | host-python3-3.9.9 | NOK | http://autobuild.buildroot.net/results/ee5cf72ef37eb9e42d204d7b9ac767ae612ca7d7 | mips64el | host-python3-3.9.9 | NOK | http://autobuild.buildroot.net/results/ccdc58cb3f6e46189ca8b8bc371834c9c7e9b009 | powerpc | libgpiod-1.6.3 | NOK | http://autobuild.buildroot.net/results/bd75d187d9b92b11eeafed4fd62eae71fbf6df1c | powerpc | libiconv-1.15 | NOK | http://autobuild.buildroot.net/results/6377402a3264bd7a8604a6dc2f7785591c702bbc | ORPH nds32le | libvorbis-1.3.7 | NOK | http://autobuild.buildroot.net/results/b0047fc3292f06dd8e5229556c6b6e2f4d2c1d4b | nds32le | mpfr-4.1.0 | NOK | http://autobuild.buildroot.net/results/06a5a82d39393b736978bfeb0545b15b8d09c388 | ORPH arm | ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/93c88483823dace7dce0f3a682e8e9c2affea917 | ORPH or1k | openal-1.21.1 | NOK | http://autobuild.buildroot.net/results/8d0a7b4206668d4f1c6ae17c201b51f9734f7077 | mips | unknown | NOK | http://autobuild.buildroot.net/results/b93b9409610fdcebf7e88b7048c4960a50da55ac | Gitlab CI results for 2022-02-20 ================================ Detail of runtime-test failures for master ------------------------------------------ runtime-test | link to the job | orph? --------------------------+---------------------------------------------------------------+------ TestIPythonPy3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2088683795 | ORPH TestLuaLuasyslog | https://gitlab.com/buildroot.org/buildroot/-/jobs/2088683903 | ORPH TestLxc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2088683908 | ORPH TestPythonPy3Pyyaml | https://gitlab.com/buildroot.org/buildroot/-/jobs/2088684091 | ORPH TestRust | https://gitlab.com/buildroot.org/buildroot/-/jobs/2088684137 | ORPH TestRustBin | https://gitlab.com/buildroot.org/buildroot/-/jobs/2088684141 | ORPH Packages having a newer version =============================== name | found by | link to release-monitoring.org | version | upstream | orph? -------------------------------+----------+----------------------------------------------+--------------+--------------+------- ace | DISTRO | https://release-monitoring.org/project/242395 | 7.0.1 | 7.0.6 | 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.3 | 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_r32 | apparmor | DISTRO | https://release-monitoring.org/project/94819 | 3.0.3 | 3.0.4 | armadillo | DISTRO | https://release-monitoring.org/project/07006 | 9.900.2 | 10.8.2 | assimp | DISTRO | https://release-monitoring.org/project/06988 | 5.1.6 | 5.2.1 | asterisk | DISTRO | https://release-monitoring.org/project/09838 | 16.21.1 | 19.2.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 | autoconf-archive | DISTRO | https://release-monitoring.org/project/00142 | 2021.02.19 | 2022.02.11 | 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 batctl | DISTRO | https://release-monitoring.org/project/14740 | 2021.0 | 2022.0 | batman-adv | DISTRO | https://release-monitoring.org/project/19529 | 2021.4 | 2022.0 | 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.1.2 | ORPH bdwgc | DISTRO | https://release-monitoring.org/project/17108 | 8.0.6 | 8.2.0 | belle-sip | DISTRO | https://release-monitoring.org/project/14378 | 4.4.8 | 5.1.2 | belr | DISTRO | https://release-monitoring.org/project/80042 | 4.4.8 | 5.1.2 | 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.18.0 | ORPH binutils | DISTRO | https://release-monitoring.org/project/07981 | 2.36.1 | 2.38 | bird | DISTRO | https://release-monitoring.org/project/00192 | 2.0.8 | 2.0.9 | 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.2 | 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.5.0 | ORPH chartjs | DISTRO | https://release-monitoring.org/project/85785 | 2.9.4 | 3.7.1 | 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.5 | 0.104.2 | clang | DISTRO | https://release-monitoring.org/project/11811 | 9.0.1 | 13.0.1 | cmake | DISTRO | https://release-monitoring.org/project/00306 | 3.16.9 | 3.22.2 | cog | DISTRO | https://release-monitoring.org/project/21333 | 0.12.0 | 0.13.3 | containerd | DISTRO | https://release-monitoring.org/project/16460 | 1.5.9 | 1.6.0 | cups | DISTRO | https://release-monitoring.org/project/00380 | 2.4.0 | 2.4.1 | cups-filters | DISTRO | https://release-monitoring.org/project/05541 | 1.28.10 | 1.28.12 | 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 | daq3 | DISTRO | https://release-monitoring.org/project/212345 | 3.0.5 | 3.0.6 | 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.2 | 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.7 | ORPH delve | DISTRO | https://release-monitoring.org/project/40149 | 1.8.0 | 1.8.1 | dialog | DISTRO | https://release-monitoring.org/project/00431 | 1.3-20200327 | 1.3-20220117 | ORPH docker-compose | DISTRO | https://release-monitoring.org/project/06185 | 1.24.1 | 2.2.3 | dovecot | DISTRO | https://release-monitoring.org/project/00456 | 2.3.17.1 | 2.3.18 | drbd-utils | DISTRO | https://release-monitoring.org/project/00462 | 9.19.0 | 9.20.2 | dt | DISTRO | https://release-monitoring.org/project/21844 | 18.32 | 21.27 | ORPH duktape | DISTRO | https://release-monitoring.org/project/21345 | 2.6.0 | 2.7.0 | ed | DISTRO | https://release-monitoring.org/project/00659 | 1.17 | 1.18 | 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.1 | 1.26.2 | 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.3 | ell | DISTRO | https://release-monitoring.org/project/17781 | 0.47 | 0.48 | enlightenment | DISTRO | https://release-monitoring.org/project/00698 | 0.25.1 | 0.25.3 | erlang | DISTRO | https://release-monitoring.org/project/00707 | 22.3.4.22 | 24.2.1 | 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 | exempi | DISTRO | https://release-monitoring.org/project/00767 | 2.5.2 | 2.6.1 | fakeroot | DISTRO | https://release-monitoring.org/project/12048 | 1.26 | 1.27 | ORPH 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.27 | 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.3 | flare-engine | DISTRO | https://release-monitoring.org/project/21433 | 1.12 | 1.13.04 | flare-game | DISTRO | https://release-monitoring.org/project/21434 | 1.12 | 1.13.04 | 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 | 6.0.0 | ORPH fontconfig | DISTRO | https://release-monitoring.org/project/00827 | 2.13.1 | 2.13.96 | ORPH fuse-overlayfs | DISTRO | https://release-monitoring.org/project/101220 | 1.5.0 | 1.8.2 | fwts | DISTRO | https://release-monitoring.org/project/17383 | 21.11.00 | 22.01.00 | gauche | DISTRO | https://release-monitoring.org/project/00873 | 0.9.9 | 0.9.11 | gcr | DISTRO | https://release-monitoring.org/project/11801 | 3.40.0 | 3.41.0 | ORPH gdbm | DISTRO | https://release-monitoring.org/project/00882 | 1.22 | 1.23 | 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.6 | gettext-gnu | DISTRO | https://release-monitoring.org/project/00898 | 0.20.1 | 0.21 | ORPH git | DISTRO | https://release-monitoring.org/project/05350 | 2.31.1 | 2.35.1 | glib-networking | DISTRO | https://release-monitoring.org/project/21353 | 2.70.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.1.1 | gnutls | DISTRO | https://release-monitoring.org/project/01221 | 3.7.2 | 3.7.3 | gobject-introspection | DISTRO | https://release-monitoring.org/project/01223 | 1.70.0 | 1.71.0 | ORPH gqrx | DISTRO | https://release-monitoring.org/project/09771 | 2.14.4 | 2.15.8 | granite | DISTRO | https://release-monitoring.org/project/05410 | 6.0.0 | 6.2.0 | ORPH grpc | DISTRO | https://release-monitoring.org/project/19117 | 1.43.0 | 1.44.0 | 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 gst1-imx | DISTRO | https://release-monitoring.org/project/21846 | 0.13.1 | 2.0.0 | 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.6.0 | gtksourceview | DISTRO | https://release-monitoring.org/project/07724 | 3.24.7 | 5.3.2 | guile | DISTRO | https://release-monitoring.org/project/01277 | 3.0.7 | 3.0.8 | 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.90 | 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.3 | harfbuzz | DISTRO | https://release-monitoring.org/project/01299 | 3.3.2 | 3.4.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.355 | 0.356 | ORPH i2pd | DISTRO | https://release-monitoring.org/project/21355 | 2.40.0 | 2.41.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.37 | ORPH imagemagick | DISTRO | https://release-monitoring.org/project/01372 | 7.1.0-19 | 7.1.0-25 | ORPH imlib2 | DISTRO | https://release-monitoring.org/project/21676 | 1.7.3 | 1.8.0 | inotify-tools | DISTRO | https://release-monitoring.org/project/08864 | 3.20.2.2 | 3.22.1.0 | ORPH intel-mediadriver | DISTRO | https://release-monitoring.org/project/20341 | 22.1.1 | 22.2.1 | intel-mediasdk | DISTRO | https://release-monitoring.org/project/21814 | 22.1.0 | 22.2.1 | intel-microcode | DISTRO | https://release-monitoring.org/project/20614 | 20210608 | 20220207 | ORPH iperf3 | DISTRO | https://release-monitoring.org/project/01389 | 3.10.1 | 3.11 | 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.21 | 1.24 | 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 | janet | DISTRO | https://release-monitoring.org/project/155612 | 1.19.2 | 1.20.0 | janus-gateway | DISTRO | https://release-monitoring.org/project/15715 | 0.11.6 | 0.11.8 | jasper | DISTRO | https://release-monitoring.org/project/01421 | 2.0.33 | 3.0.2 | jquery-datetimepicker | DISTRO | https://release-monitoring.org/project/13910 | 2.4.5 | 2.5.20 | jquery-keyboard | DISTRO | https://release-monitoring.org/project/21681 | 1.18.12 | 1.30.4 | ORPH jquery-mobile | DISTRO | https://release-monitoring.org/project/59395 | 1.4.3 | 1.4.5 | ORPH jquery-ui | DISTRO | https://release-monitoring.org/project/21815 | 1.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 | kf5-extra-cmake-modules | DISTRO | https://release-monitoring.org/project/08762 | 5.47.0 | 5.91.0 | kf5-kcoreaddons | DISTRO | https://release-monitoring.org/project/08762 | 5.47.0 | 5.91.0 | kf5-modemmanager-qt | DISTRO | https://release-monitoring.org/project/08762 | 5.47.0 | 5.91.0 | kf5-networkmanager-qt | DISTRO | https://release-monitoring.org/project/08762 | 5.47.0 | 5.91.0 | kismet | DISTRO | https://release-monitoring.org/project/06966 | 2021-08-R1 | 2022-02-R1 | 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.3-Ma... | 20.1.2-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.1-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.6-Ma... | 20.2.2-Nexus | kodi-pvr-iptvsimple | DISTRO | https://release-monitoring.org/project/21782 | 19.1.0-Ma... | 20.3.0-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.7-Ma... | 20.2.4-Nexus | kodi-pvr-nextpvr | DISTRO | https://release-monitoring.org/project/21779 | 19.0.3-Ma... | 20.2.2-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.2-Ma... | 20.2.1-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 | lcms2 | DISTRO | https://release-monitoring.org/project/09815 | 2.13 | 2.13.1 | 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 libapparmor | DISTRO | https://release-monitoring.org/project/94819 | 3.0.3 | 3.0.4 | libarchive | DISTRO | https://release-monitoring.org/project/01558 | 3.5.3 | 3.6.0 | libblockdev | DISTRO | https://release-monitoring.org/project/09397 | 2.26 | 2.26-1 | ORPH libbpf | DISTRO | https://release-monitoring.org/project/141355 | 0.6.1 | 0.7.0 | libbsd | DISTRO | https://release-monitoring.org/project/01567 | 0.11.3 | 0.11.5 | libcap | DISTRO | https://release-monitoring.org/project/01569 | 2.62 | 2.63 | 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 | libdrm | DISTRO | https://release-monitoring.org/project/01596 | 2.4.109 | 2.4.110 | libfreeglut | DISTRO | https://release-monitoring.org/project/00846 | 3.2.1 | 3.2.2 | libfuse | GUESS | https://release-monitoring.org/project/00861 | 2.9.9 | 3.10.5 | ORPH libgcrypt | DISTRO | https://release-monitoring.org/project/01623 | 1.9.4 | 1.10.0 | ORPH libgdiplus | DISTRO | https://release-monitoring.org/project/06440 | 6.0.5 | 6.1 | libgee | DISTRO | https://release-monitoring.org/project/01625 | 0.20.4 | 0.20.5 | libgit2 | DISTRO | https://release-monitoring.org/project/01627 | 1.3.0 | 1.4.1 | libglade | DISTRO | https://release-monitoring.org/project/01174 | 2.6.4 | 3.38.2 | ORPH libglib2 | DISTRO | https://release-monitoring.org/project/10024 | 2.70.0 | 2.70.4 | 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.44 | ORPH libgpgme | DISTRO | https://release-monitoring.org/project/01239 | 1.16.0 | 1.17.0 | 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.1 | libgudev | DISTRO | https://release-monitoring.org/project/07735 | 236 | 237 | libiberty | DISTRO | https://release-monitoring.org/project/07981 | 2.32 | 2.38 | libical | DISTRO | https://release-monitoring.org/project/01637 | 1.0.1 | 3.0.14 | 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 | libinput | DISTRO | https://release-monitoring.org/project/05781 | 1.19.3 | 1.20.0 | libkcapi | DISTRO | https://release-monitoring.org/project/16828 | 1.1.5 | 1.3.1 | ORPH libks | DISTRO | https://release-monitoring.org/project/241898 | 1.7.0 | 1.8.0 | 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 | libnetfilter_conntrack | DISTRO | https://release-monitoring.org/project/01675 | 1.0.8 | 1.0.9 | libnfs | DISTRO | https://release-monitoring.org/project/07325 | 4.0.0 | 5.0.1 | ORPH 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.3 | 2.18.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 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 | libqmi | DISTRO | https://release-monitoring.org/project/07307 | 1.30.2 | 1.30.4 | librsvg | DISTRO | https://release-monitoring.org/project/05420 | 2.50.7 | 2.52.6 | librtas | DISTRO | https://release-monitoring.org/project/10717 | 2.0.2 | 2.0.3 | ORPH libscrypt | DISTRO | https://release-monitoring.org/project/07380 | 1.21 | 1.22 | libsemanage | DISTRO | https://release-monitoring.org/project/01718 | 3.3 | 20200710 | libsepol | DISTRO | https://release-monitoring.org/project/01719 | 3.3 | 20200710 | libsigc | DISTRO | https://release-monitoring.org/project/07961 | 3.0.7 | 3.2.0 | ORPH 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 | 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 | libva-utils | DISTRO | https://release-monitoring.org/project/16334 | 2.13.0 | 2.14.0 | libvips | DISTRO | https://release-monitoring.org/project/05097 | 8.10.6 | 8.12.2 | 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 | libxcrypt | DISTRO | https://release-monitoring.org/project/16436 | 4.4.27 | 4.4.28 | libxkbcommon | DISTRO | https://release-monitoring.org/project/01780 | 1.3.1 | 1.4.0 | libxml2 | DISTRO | https://release-monitoring.org/project/01783 | 2.9.12 | 2.9.13 | libxmlrpc | DISTRO | https://release-monitoring.org/project/09024 | r3119 | 1.51.07 | linphone | DISTRO | https://release-monitoring.org/project/01823 | 4.4.8 | 5.1.2 | ORPH linux-firmware | DISTRO | https://release-monitoring.org/project/141464 | 20211216 | 20220209 | liquid-dsp | DISTRO | https://release-monitoring.org/project/14535 | 1.3.2 | 1.4.0 | live555 | DISTRO | https://release-monitoring.org/project/12414 | 2021.05.03 | 2022.02.07 | ORPH lld | DISTRO | https://release-monitoring.org/project/01830 | 9.0.1 | 13.0.1 | 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.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 | lttng-tools | DISTRO | https://release-monitoring.org/project/07136 | 2.13.2 | 2.13.4 | lua | DISTRO | https://release-monitoring.org/project/01847 | 5.1.5 | 5.4.4 | lua-resty-http | DISTRO | https://release-monitoring.org/project/13887 | 0.15-0 | 0.16.1 | luv | DISTRO | https://release-monitoring.org/project/21510 | 1.42.0-1 | 1.43.0-0 | luvi | DISTRO | https://release-monitoring.org/project/21512 | 2.12.0 | 2.13.0 | lvm2 | DISTRO | https://release-monitoring.org/project/05354 | 2.03.14 | 2.03.15 | ORPH lxc | DISTRO | https://release-monitoring.org/project/01860 | 4.0.11 | 4.0.12 | 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.8.2 | 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.1.2 | ORPH memcached | DISTRO | https://release-monitoring.org/project/01965 | 1.6.12 | 1.6.14 | 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 | mender | DISTRO | https://release-monitoring.org/project/20629 | 3.1.0 | 3.2.1 | mesa3d | DISTRO | https://release-monitoring.org/project/01970 | 21.3.5 | 21.3.6 | mesa3d-headers | DISTRO | https://release-monitoring.org/project/01970 | 21.3.5 | 21.3.6 | meson | DISTRO | https://release-monitoring.org/project/06472 | 0.61.1 | 0.61.2 | 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 | minetest | DISTRO | https://release-monitoring.org/project/01978 | 5.4.1 | 5.5.0 | minetest-game | DISTRO | https://release-monitoring.org/project/21522 | 5.4.1 | 5.5.0 | moarvm | DISTRO | https://release-monitoring.org/project/21100 | 2021.10 | 2022.02 | 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.6 | mongodb | DISTRO | https://release-monitoring.org/project/02008 | 4.2.18 | 5.2.1 | mongoose | DISTRO | https://release-monitoring.org/project/07603 | 7.2 | 7.6 | monit | DISTRO | https://release-monitoring.org/project/05483 | 5.26.0 | 5.31.0 | mono | DISTRO | https://release-monitoring.org/project/06360 | 6.12.0.90 | 6.12.0.173 | 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.1.0 | 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 | 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 | mutt | DISTRO | https://release-monitoring.org/project/02035 | 2.1.5 | 2.2.1 | nano | DISTRO | https://release-monitoring.org/project/02046 | 6.0 | 6.2 | ORPH nbd | DISTRO | https://release-monitoring.org/project/02052 | 3.21 | 3.23 | ncdu | DISTRO | https://release-monitoring.org/project/06045 | 1.16 | 2.1 | ncurses | DISTRO | https://release-monitoring.org/project/02057 | 6.1 | 6.3-20220219 | ORPH netdata | DISTRO | https://release-monitoring.org/project/11046 | 1.21.1 | 1.33.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.6 | nodejs | DISTRO | https://release-monitoring.org/project/08251 | 14.18.3 | 17.5.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.54 | 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 | ogre | DISTRO | https://release-monitoring.org/project/33334 | v1.12.12 | 13.3.1 | open62541 | DISTRO | https://release-monitoring.org/project/16896 | v1.2.2 | 1.2.4 | ORPH openblas | DISTRO | https://release-monitoring.org/project/02540 | 0.3.18 | 0.3.20 | 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+10 | 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 | optee-benchmark | DISTRO | https://release-monitoring.org/project/21555 | 3.15.0 | 3.16.0 | optee-client | DISTRO | https://release-monitoring.org/project/21556 | 3.15.0 | 3.16.0 | optee-examples | DISTRO | https://release-monitoring.org/project/21557 | 3.15.0 | 3.16.0 | optee-test | DISTRO | https://release-monitoring.org/project/21558 | 3.15.0 | 3.16.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.1.2 | ORPH pango | DISTRO | https://release-monitoring.org/project/11783 | 1.50.3 | 1.50.4 | 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 | 202201 | 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.15 | 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.76 | perl-http-daemon | DISTRO | https://release-monitoring.org/project/02975 | 6.12 | 6.13 | 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.16 | 8.1.3 | 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.3 | 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 pipewire | DISTRO | https://release-monitoring.org/project/57357 | 0.3.45 | 0.3.47 | 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 | poke | DISTRO | https://release-monitoring.org/project/179926 | 1.4 | 2.1 | ORPH policycoreutils | DISTRO | https://release-monitoring.org/project/03680 | 3.2 | 20200710 | poppler | DISTRO | https://release-monitoring.org/project/03686 | 21.12.0 | 22.02.0 | postgis | DISTRO | https://release-monitoring.org/project/03694 | 3.2.0 | 3.2.1 | 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.4 | proxychains-ng | DISTRO | https://release-monitoring.org/project/06499 | 4.14 | 4.16 | ORPH ptpd | GUESS | https://release-monitoring.org/project/03726 | 1.1.0 | 2.3.1 | ORPH pugixml | DISTRO | https://release-monitoring.org/project/03728 | 1.11.4 | 1.12.1 | 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-aioconsole | DISTRO | https://release-monitoring.org/project/21244 | 0.4.0 | 0.4.1 | 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.2 | python-asgiref | DISTRO | https://release-monitoring.org/project/18462 | 3.3.4 | 3.5.0 | 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.2 | python-boto3 | DISTRO | https://release-monitoring.org/project/08778 | 1.19.2 | 1.21.3 | python-botocore | DISTRO | https://release-monitoring.org/project/08748 | 1.22.2 | 1.24.3 | python-can | DISTRO | https://release-monitoring.org/project/17873 | 3.3.4 | 4.0.0 | python-canopen | DISTRO | https://release-monitoring.org/project/23230 | 1.0.0 | 2.0.0b1 | 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.11 | 2.0.12 | 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.4 | 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-crossbar | DISTRO | https://release-monitoring.org/project/21696 | 21.3.1 | 22.1.1 | python-cython | DISTRO | https://release-monitoring.org/project/12679 | 0.29.27 | 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-decorator | DISTRO | https://release-monitoring.org/project/03819 | 5.1.0 | 5.1.1 | python-dialog3 | DISTRO | https://release-monitoring.org/project/03823 | 3.5.1 | 3.5.3 | python-distro | DISTRO | https://release-monitoring.org/project/12202 | 1.6.0 | 1.7.0 | 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-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-entrypoints | DISTRO | https://release-monitoring.org/project/12081 | 0.3 | 0.4 | python-filelock | DISTRO | https://release-monitoring.org/project/11739 | 3.3.0 | 3.6.0 | python-flask | DISTRO | https://release-monitoring.org/project/03867 | 1.1.2 | 2.0.3 | 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-git | DISTRO | https://release-monitoring.org/project/06459 | 3.1.24 | 3.1.27 | 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.4 | python-humanize | DISTRO | https://release-monitoring.org/project/19799 | 3.11.0 | 4.0.0 | python-installer | DISTRO | https://release-monitoring.org/project/197662 | 0.4.0 | 0.5.0 | python-ipython | DISTRO | https://release-monitoring.org/project/01399 | 7.31.1 | 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 | 2.0.1 | 2.1.0 | python-iwlib | DISTRO | https://release-monitoring.org/project/51611 | 1.5 | 1.7.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-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-libusb1 | DISTRO | https://release-monitoring.org/project/12301 | 2.0.1 | 3.0.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-markupsafe | DISTRO | https://release-monitoring.org/project/03918 | 2.0.1 | 2.1.0 | 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-networkmanager | DISTRO | https://release-monitoring.org/project/12909 | 2.1 | 2.2 | python-numpy | DISTRO | https://release-monitoring.org/project/02509 | 1.21.2 | 1.22.2 | python-oauthlib | DISTRO | https://release-monitoring.org/project/05377 | 3.1.1 | 3.2.0 | 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-paramiko | DISTRO | https://release-monitoring.org/project/03954 | 2.7.2 | 2.9.2 | 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.1 | python-pillow | DISTRO | https://release-monitoring.org/project/07974 | 9.0.0 | 9.0.1 | python-pip | DISTRO | https://release-monitoring.org/project/06529 | 21.2.4 | 22.0.3 | 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.28 | python-protobuf | DISTRO | https://release-monitoring.org/project/03715 | 3.19.1 | 3.19.4 | 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-pybind | DISTRO | https://release-monitoring.org/project/13384 | 2.9.0 | 2.9.1 | python-pycairo | DISTRO | https://release-monitoring.org/project/13166 | 1.19.1 | 1.20.1 | python-pycryptodomex | DISTRO | https://release-monitoring.org/project/36851 | 3.14.0 | 3.14.1 | python-pydal | DISTRO | https://release-monitoring.org/project/21582 | 20210626.3 | 20220213.2 | python-pydantic | DISTRO | https://release-monitoring.org/project/29768 | 1.8.2 | 1.9.0 | python-pyelftools | DISTRO | https://release-monitoring.org/project/16219 | 0.27 | 0.28 | 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.1 | python-pylibftdi | DISTRO | https://release-monitoring.org/project/21583 | 0.18.1 | 0.20.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.5 | python-pyopenssl | DISTRO | https://release-monitoring.org/project/05535 | 21.0.0 | 22.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-pyroute2 | DISTRO | https://release-monitoring.org/project/20081 | 0.5.7 | 0.6.6 | 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 | DISTRO | https://release-monitoring.org/project/03765 | 6.2.5 | 7.0.1 | python-pytest-asyncio | DISTRO | https://release-monitoring.org/project/07273 | 0.15.1 | 0.18.1 | python-pyudev | DISTRO | https://release-monitoring.org/project/08485 | 0.22.0 | 0.23.2 | 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.4 | python-reentry | DISTRO | https://release-monitoring.org/project/21596 | 1.3.2 | 1.3.3 | python-regex | DISTRO | https://release-monitoring.org/project/05548 | 2021.4.4 | 2022.1.18 | python-requests-oauthlib | DISTRO | https://release-monitoring.org/project/11803 | 1.3.0 | 1.3.1 | python-rpi-gpio | DISTRO | https://release-monitoring.org/project/12026 | 0.7.0 | 0.7.1 | python-rpi-ws281x | DISTRO | https://release-monitoring.org/project/21898 | 4.3.0 | 4.3.2 | 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-s3transfer | DISTRO | https://release-monitoring.org/project/10428 | 0.5.0 | 0.5.1 | python-secretstorage | DISTRO | https://release-monitoring.org/project/04020 | 3.1.2 | 3.3.1 | python-semantic-version | DISTRO | https://release-monitoring.org/project/06514 | 2.8.5 | 2.9.0 | python-sentry-sdk | DISTRO | https://release-monitoring.org/project/21603 | 1.4.3 | 1.5.5 | 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 | 60.7.0 | 60.9.3 | 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-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.2 | 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.1 | 1.3.0 | 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.1 | 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-tomli | DISTRO | https://release-monitoring.org/project/207408 | 1.2.0 | 2.0.1 | 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 | 22.2.0 | python-typing-extensions | DISTRO | https://release-monitoring.org/project/19755 | 3.10.0.2 | 4.1.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-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.1 | python-web2py | DISTRO | https://release-monitoring.org/project/20617 | 2.21.1 | 2.22.3 | 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.3 | 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-yarl | DISTRO | https://release-monitoring.org/project/12895 | 1.7.2 | 1.8.0 | python-zeroconf | DISTRO | https://release-monitoring.org/project/12681 | 0.29.0 | 0.38.3 | qpdf | DISTRO | https://release-monitoring.org/project/05542 | 10.5.0 | 10.6.2 | qpid-proton | DISTRO | https://release-monitoring.org/project/15198 | 0.35.0 | 0.36.0 | qt5coap | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.3 | qt5knx | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.3 | qt5mqtt | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.3 | qt5opcua | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.3 | qt5webengine | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.3 | 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 rng-tools | DISTRO | https://release-monitoring.org/project/04202 | 6.14 | 6.15 | rocksdb | DISTRO | https://release-monitoring.org/project/15560 | 6.20.3 | 6.29.3 | rsyslog | DISTRO | https://release-monitoring.org/project/04218 | 8.2010.0 | 8.2202.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 | rygel | DISTRO | https://release-monitoring.org/project/04751 | 0.40.2 | 0.40.3 | s390-tools | DISTRO | https://release-monitoring.org/project/10714 | 2.19.0 | 2.20.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.2 | 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 | safeclib | DISTRO | https://release-monitoring.org/project/21385 | 3.7.1 | 01022022 | samba4 | DISTRO | https://release-monitoring.org/project/04758 | 4.15.4 | 4.15.5 | 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 | screen | DISTRO | https://release-monitoring.org/project/04772 | 4.8.0 | 4.9.0 | ORPH 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.2 | sentry-native | DISTRO | https://release-monitoring.org/project/135639 | 0.4.1 | 0.4.15 | 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 shim | DISTRO | https://release-monitoring.org/project/10719 | 15.4 | 15.5 | 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.9 | snort3 | DISTRO | https://release-monitoring.org/project/13263 | 3.1.18.0 | 3.1.23.0 | sofia-sip | DISTRO | https://release-monitoring.org/project/10509 | 1.13.6-41... | 1.13.7 | 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 | sphinxbase | DISTRO | https://release-monitoring.org/project/20548 | 5prealpha | 0.8 | spice-protocol | DISTRO | https://release-monitoring.org/project/14892 | 0.14.3 | 0.14.4 | squid | DISTRO | https://release-monitoring.org/project/04880 | 5.3 | 5.4.1 | 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.62 | sudo | DISTRO | https://release-monitoring.org/project/04906 | 1.9.8p2 | 1.9.9 | ORPH 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 | tcpreplay | DISTRO | https://release-monitoring.org/project/13716 | 4.3.4 | 4.4.1 | ORPH thrift | DISTRO | https://release-monitoring.org/project/05581 | 0.14.1 | 0.16.0 | ORPH timescaledb | DISTRO | https://release-monitoring.org/project/17545 | 2.5.1 | 2.5.2 | 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 tio | DISTRO | https://release-monitoring.org/project/20587 | 1.32 | 1.35 | 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 | tpm2-tss | DISTRO | https://release-monitoring.org/project/12683 | 3.1.0 | 3.2.0 | ORPH trace-cmd | DISTRO | https://release-monitoring.org/project/07873 | 2.9.6 | 2.9.7 | tree | DISTRO | https://release-monitoring.org/project/05006 | 1.8.0 | 2.0.2 | 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 | unbound | DISTRO | https://release-monitoring.org/project/05042 | 1.14.0 | 1.15.0 | 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 | 6.1.3 | 6.1.4 | ORPH upmpdcli | DISTRO | https://release-monitoring.org/project/15848 | 1.5.12 | 1.5.13 | upower | DISTRO | https://release-monitoring.org/project/05056 | 0.99.11 | 0.99.15 | util-linux | DISTRO | https://release-monitoring.org/project/08179 | 2.37.3 | 2.37.4 | ORPH util-linux-libs | DISTRO | https://release-monitoring.org/project/08179 | 2.37.3 | 2.37.4 | ORPH 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.3 | ORPH valijson | DISTRO | https://release-monitoring.org/project/18452 | 0.3 | 0.6 | vim | DISTRO | https://release-monitoring.org/project/05092 | 8.2.4301 | 8.2.4424 | ORPH vnstat | DISTRO | https://release-monitoring.org/project/07283 | 2.8 | 2.9 | 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.31 | vulkan-headers | DISTRO | https://release-monitoring.org/project/88835 | 1.2.203 | 1.3.206 | ORPH 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 | waylandpp | DISTRO | https://release-monitoring.org/project/16969 | 0.2.8 | 0.2.9 | 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 wilc1000-firmware | DISTRO | https://release-monitoring.org/project/65598 | 14.1 | 15.6 | wine | DISTRO | https://release-monitoring.org/project/05134 | 6.0 | 7.2 | 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.8 | ORPH wireshark | DISTRO | https://release-monitoring.org/project/05137 | 3.4.11 | 3.6.2 | ORPH wlroots | DISTRO | https://release-monitoring.org/project/18357 | 0.14.1 | 0.15.1 | 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.6 | 2.35.1 | xapp_luit | DISTRO | https://release-monitoring.org/project/15047 | 1.1.1 | 20220111 | xdg-dbus-proxy | DISTRO | https://release-monitoring.org/project/58434 | 0.1.2 | 0.1.3 | xdotool | DISTRO | https://release-monitoring.org/project/08648 | 3.20160805.1 | 3.20211022.1 | xdriver_xf86-input-libinput | DISTRO | https://release-monitoring.org/project/05782 | 1.2.0 | 1.2.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.4 | 4.16.0 | xinetd | DISTRO | https://release-monitoring.org/project/06382 | 2.3.15 | 2.3.15.4 | xkeyboard-config | DISTRO | https://release-monitoring.org/project/05191 | 2.34 | 2.35.1 | xmrig | DISTRO | https://release-monitoring.org/project/17499 | 6.16.3 | 6.16.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.19 | ORPH xterm | DISTRO | https://release-monitoring.org/project/05272 | 367 | 370 | ORPH yaml-cpp | DISTRO | https://release-monitoring.org/project/05284 | 0.6.3 | 0.7.0 | ORPH zabbix | DISTRO | https://release-monitoring.org/project/05492 | 5.4.9 | 6.0.0 | zfs | DISTRO | https://release-monitoring.org/project/11706 | 2.0.5 | 2.1.2 | 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 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 libbpf | CVE-2021-45940 | https://security-tracker.debian.org/tracker/CVE-2021-45940 libbpf | CVE-2021-45941 | https://security-tracker.debian.org/tracker/CVE-2021-45941 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 libpjsip | CVE-2021-37706 | https://security-tracker.debian.org/tracker/CVE-2021-37706 libpjsip | CVE-2021-41141 | https://security-tracker.debian.org/tracker/CVE-2021-41141 libpjsip | CVE-2021-43804 | https://security-tracker.debian.org/tracker/CVE-2021-43804 libpjsip | CVE-2021-43845 | https://security-tracker.debian.org/tracker/CVE-2021-43845 libpjsip | CVE-2022-21722 | https://security-tracker.debian.org/tracker/CVE-2022-21722 libpjsip | CVE-2022-21723 | https://security-tracker.debian.org/tracker/CVE-2022-21723 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 mariadb | CVE-2021-46658 | https://security-tracker.debian.org/tracker/CVE-2021-46658 mariadb | CVE-2021-46659 | https://security-tracker.debian.org/tracker/CVE-2021-46659 mariadb | CVE-2021-46661 | https://security-tracker.debian.org/tracker/CVE-2021-46661 mariadb | CVE-2021-46662 | https://security-tracker.debian.org/tracker/CVE-2021-46662 mariadb | CVE-2021-46663 | https://security-tracker.debian.org/tracker/CVE-2021-46663 mariadb | CVE-2021-46664 | https://security-tracker.debian.org/tracker/CVE-2021-46664 mariadb | CVE-2021-46665 | https://security-tracker.debian.org/tracker/CVE-2021-46665 mariadb | CVE-2021-46667 | https://security-tracker.debian.org/tracker/CVE-2021-46667 mariadb | CVE-2021-46668 | https://security-tracker.debian.org/tracker/CVE-2021-46668 mariadb | CVE-2021-46669 | https://security-tracker.debian.org/tracker/CVE-2021-46669 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 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 polkit | CVE-2021-4034 | https://security-tracker.debian.org/tracker/CVE-2021-4034 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-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-4145 | https://security-tracker.debian.org/tracker/CVE-2021-4145 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-0561 | https://security-tracker.debian.org/tracker/CVE-2022-0561 tiff | CVE-2022-0562 | https://security-tracker.debian.org/tracker/CVE-2022-0562 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 unzip | CVE-2022-0529 | https://security-tracker.debian.org/tracker/CVE-2022-0529 unzip | CVE-2022-0530 | https://security-tracker.debian.org/tracker/CVE-2022-0530 vim | CVE-2022-0554 | https://security-tracker.debian.org/tracker/CVE-2022-0554 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-28707 | https://security-tracker.debian.org/tracker/CVE-2021-28707 xen | CVE-2021-28708 | https://security-tracker.debian.org/tracker/CVE-2021-28708 xen | CVE-2021-28711 | https://security-tracker.debian.org/tracker/CVE-2021-28711 xen | CVE-2021-28712 | https://security-tracker.debian.org/tracker/CVE-2021-28712 xen | CVE-2021-28713 | https://security-tracker.debian.org/tracker/CVE-2021-28713 xen | CVE-2022-23033 | https://security-tracker.debian.org/tracker/CVE-2022-23033 xen | CVE-2022-23035 | https://security-tracker.debian.org/tracker/CVE-2022-23035 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 xterm | CVE-2022-24130 | https://security-tracker.debian.org/tracker/CVE-2022-24130 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 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 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 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-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 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 go | CVE-2022-23772 | https://security-tracker.debian.org/tracker/CVE-2022-23772 go | CVE-2022-23773 | https://security-tracker.debian.org/tracker/CVE-2022-23773 go | CVE-2022-23806 | https://security-tracker.debian.org/tracker/CVE-2022-23806 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 hostapd | CVE-2022-23303 | https://security-tracker.debian.org/tracker/CVE-2022-23303 hostapd | CVE-2022-23304 | https://security-tracker.debian.org/tracker/CVE-2022-23304 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 libldns | CVE-2020-19860 | https://security-tracker.debian.org/tracker/CVE-2020-19860 libldns | CVE-2020-19861 | https://security-tracker.debian.org/tracker/CVE-2020-19861 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 libpjsip | CVE-2021-37706 | https://security-tracker.debian.org/tracker/CVE-2021-37706 libpjsip | CVE-2021-41141 | https://security-tracker.debian.org/tracker/CVE-2021-41141 libpjsip | CVE-2021-43804 | https://security-tracker.debian.org/tracker/CVE-2021-43804 libpjsip | CVE-2021-43845 | https://security-tracker.debian.org/tracker/CVE-2021-43845 libpjsip | CVE-2022-21722 | https://security-tracker.debian.org/tracker/CVE-2022-21722 libpjsip | CVE-2022-21723 | https://security-tracker.debian.org/tracker/CVE-2022-21723 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 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 mariadb | CVE-2021-46658 | https://security-tracker.debian.org/tracker/CVE-2021-46658 mariadb | CVE-2021-46659 | https://security-tracker.debian.org/tracker/CVE-2021-46659 mariadb | CVE-2021-46661 | https://security-tracker.debian.org/tracker/CVE-2021-46661 mariadb | CVE-2021-46662 | https://security-tracker.debian.org/tracker/CVE-2021-46662 mariadb | CVE-2021-46663 | https://security-tracker.debian.org/tracker/CVE-2021-46663 mariadb | CVE-2021-46664 | https://security-tracker.debian.org/tracker/CVE-2021-46664 mariadb | CVE-2021-46665 | https://security-tracker.debian.org/tracker/CVE-2021-46665 mariadb | CVE-2021-46667 | https://security-tracker.debian.org/tracker/CVE-2021-46667 mariadb | CVE-2021-46668 | https://security-tracker.debian.org/tracker/CVE-2021-46668 mariadb | CVE-2021-46669 | https://security-tracker.debian.org/tracker/CVE-2021-46669 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 minetest | CVE-2022-24300 | https://security-tracker.debian.org/tracker/CVE-2022-24300 minetest | CVE-2022-24301 | https://security-tracker.debian.org/tracker/CVE-2022-24301 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 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 polkit | CVE-2021-4034 | https://security-tracker.debian.org/tracker/CVE-2021-4034 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 protobuf | CVE-2021-22570 | https://security-tracker.debian.org/tracker/CVE-2021-22570 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 | CVE-2022-0391 | https://security-tracker.debian.org/tracker/CVE-2022-0391 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-ipython | CVE-2022-21699 | https://security-tracker.debian.org/tracker/CVE-2022-21699 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 python-twisted | CVE-2022-21712 | https://security-tracker.debian.org/tracker/CVE-2022-21712 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 qemu | CVE-2021-4145 | https://security-tracker.debian.org/tracker/CVE-2021-4145 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 rust | CVE-2022-21658 | https://security-tracker.debian.org/tracker/CVE-2022-21658 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 strongswan | CVE-2021-45079 | https://security-tracker.debian.org/tracker/CVE-2021-45079 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 tiff | CVE-2022-0561 | https://security-tracker.debian.org/tracker/CVE-2022-0561 tiff | CVE-2022-0562 | https://security-tracker.debian.org/tracker/CVE-2022-0562 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 unzip | CVE-2022-0529 | https://security-tracker.debian.org/tracker/CVE-2022-0529 unzip | CVE-2022-0530 | https://security-tracker.debian.org/tracker/CVE-2022-0530 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-2022-0554 | https://security-tracker.debian.org/tracker/CVE-2022-0554 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 wpa_supplicant | CVE-2022-23303 | https://security-tracker.debian.org/tracker/CVE-2022-23303 wpa_supplicant | CVE-2022-23304 | https://security-tracker.debian.org/tracker/CVE-2022-23304 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-28707 | https://security-tracker.debian.org/tracker/CVE-2021-28707 xen | CVE-2021-28708 | https://security-tracker.debian.org/tracker/CVE-2021-28708 xen | CVE-2021-28711 | https://security-tracker.debian.org/tracker/CVE-2021-28711 xen | CVE-2021-28712 | https://security-tracker.debian.org/tracker/CVE-2021-28712 xen | CVE-2021-28713 | https://security-tracker.debian.org/tracker/CVE-2021-28713 xen | CVE-2022-23033 | https://security-tracker.debian.org/tracker/CVE-2022-23033 xen | CVE-2022-23035 | https://security-tracker.debian.org/tracker/CVE-2022-23035 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 xterm | CVE-2022-24130 | https://security-tracker.debian.org/tracker/CVE-2022-24130 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 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 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 go | CVE-2022-23772 | https://security-tracker.debian.org/tracker/CVE-2022-23772 go | CVE-2022-23773 | https://security-tracker.debian.org/tracker/CVE-2022-23773 go | CVE-2022-23806 | https://security-tracker.debian.org/tracker/CVE-2022-23806 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 hostapd | CVE-2022-23303 | https://security-tracker.debian.org/tracker/CVE-2022-23303 hostapd | CVE-2022-23304 | https://security-tracker.debian.org/tracker/CVE-2022-23304 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 libldns | CVE-2020-19860 | https://security-tracker.debian.org/tracker/CVE-2020-19860 libldns | CVE-2020-19861 | https://security-tracker.debian.org/tracker/CVE-2020-19861 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libpjsip | CVE-2021-37706 | https://security-tracker.debian.org/tracker/CVE-2021-37706 libpjsip | CVE-2021-41141 | https://security-tracker.debian.org/tracker/CVE-2021-41141 libpjsip | CVE-2021-43804 | https://security-tracker.debian.org/tracker/CVE-2021-43804 libpjsip | CVE-2021-43845 | https://security-tracker.debian.org/tracker/CVE-2021-43845 libpjsip | CVE-2022-21722 | https://security-tracker.debian.org/tracker/CVE-2022-21722 libpjsip | CVE-2022-21723 | https://security-tracker.debian.org/tracker/CVE-2022-21723 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 mariadb | CVE-2021-46658 | https://security-tracker.debian.org/tracker/CVE-2021-46658 mariadb | CVE-2021-46659 | https://security-tracker.debian.org/tracker/CVE-2021-46659 mariadb | CVE-2021-46661 | https://security-tracker.debian.org/tracker/CVE-2021-46661 mariadb | CVE-2021-46662 | https://security-tracker.debian.org/tracker/CVE-2021-46662 mariadb | CVE-2021-46663 | https://security-tracker.debian.org/tracker/CVE-2021-46663 mariadb | CVE-2021-46664 | https://security-tracker.debian.org/tracker/CVE-2021-46664 mariadb | CVE-2021-46665 | https://security-tracker.debian.org/tracker/CVE-2021-46665 mariadb | CVE-2021-46667 | https://security-tracker.debian.org/tracker/CVE-2021-46667 mariadb | CVE-2021-46668 | https://security-tracker.debian.org/tracker/CVE-2021-46668 mariadb | CVE-2021-46669 | https://security-tracker.debian.org/tracker/CVE-2021-46669 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 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 polkit | CVE-2021-4034 | https://security-tracker.debian.org/tracker/CVE-2021-4034 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 | CVE-2022-0391 | https://security-tracker.debian.org/tracker/CVE-2022-0391 python-ipython | CVE-2022-21699 | https://security-tracker.debian.org/tracker/CVE-2022-21699 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 python-twisted | CVE-2022-21712 | https://security-tracker.debian.org/tracker/CVE-2022-21712 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 qemu | CVE-2021-4145 | https://security-tracker.debian.org/tracker/CVE-2021-4145 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 rust | CVE-2022-21658 | https://security-tracker.debian.org/tracker/CVE-2022-21658 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 strongswan | CVE-2021-45079 | https://security-tracker.debian.org/tracker/CVE-2021-45079 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-0561 | https://security-tracker.debian.org/tracker/CVE-2022-0561 tiff | CVE-2022-0562 | https://security-tracker.debian.org/tracker/CVE-2022-0562 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 unzip | CVE-2022-0529 | https://security-tracker.debian.org/tracker/CVE-2022-0529 unzip | CVE-2022-0530 | https://security-tracker.debian.org/tracker/CVE-2022-0530 vim | CVE-2022-0554 | https://security-tracker.debian.org/tracker/CVE-2022-0554 webkitgtk | CVE-2021-42762 | https://security-tracker.debian.org/tracker/CVE-2021-42762 wpa_supplicant | CVE-2022-23303 | https://security-tracker.debian.org/tracker/CVE-2022-23303 wpa_supplicant | CVE-2022-23304 | https://security-tracker.debian.org/tracker/CVE-2022-23304 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-28707 | https://security-tracker.debian.org/tracker/CVE-2021-28707 xen | CVE-2021-28708 | https://security-tracker.debian.org/tracker/CVE-2021-28708 xen | CVE-2021-28711 | https://security-tracker.debian.org/tracker/CVE-2021-28711 xen | CVE-2021-28712 | https://security-tracker.debian.org/tracker/CVE-2021-28712 xen | CVE-2021-28713 | https://security-tracker.debian.org/tracker/CVE-2021-28713 xen | CVE-2022-23033 | https://security-tracker.debian.org/tracker/CVE-2022-23033 xen | CVE-2022-23035 | https://security-tracker.debian.org/tracker/CVE-2022-23035 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 xterm | CVE-2022-24130 | https://security-tracker.debian.org/tracker/CVE-2022-24130 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 -- http://autobuild.buildroot.net From buildroot at heine.tech Mon Feb 21 08:27:18 2022 From: buildroot at heine.tech (Michael Nosthoff) Date: Mon, 21 Feb 2022 09:27:18 +0100 Subject: [Buildroot] [PATCH/next] package/grpc: bump to version 1.44.0 Message-ID: <20220221082724.2744765-1-buildroot@heine.tech> Signed-off-by: Michael Nosthoff --- package/grpc/grpc.hash | 2 +- package/grpc/grpc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/grpc/grpc.hash b/package/grpc/grpc.hash index 3da1d9a323..6db2acd759 100644 --- a/package/grpc/grpc.hash +++ b/package/grpc/grpc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 9647220c699cea4dafa92ec0917c25c7812be51a18143af047e20f3fb05adddc grpc-1.43.0.tar.gz +sha256 8c05641b9f91cbc92f51cc4a5b3a226788d7a63f20af4ca7aaca50d92cc94a0d grpc-1.44.0.tar.gz sha256 277adcc1dcef8359b1efb48e628635f88b40be8fbd64e82fd0169930d135d7a5 LICENSE diff --git a/package/grpc/grpc.mk b/package/grpc/grpc.mk index 5d8201f12f..23b92f1750 100644 --- a/package/grpc/grpc.mk +++ b/package/grpc/grpc.mk @@ -4,7 +4,7 @@ # ################################################################################ -GRPC_VERSION = 1.43.0 +GRPC_VERSION = 1.44.0 GRPC_SITE = $(call github,grpc,grpc,v$(GRPC_VERSION)) GRPC_LICENSE = Apache-2.0, BSD-3-Clause (third_party code), MPL-2.0 (etc/roots.pem) GRPC_LICENSE_FILES = LICENSE -- 2.25.1 From giulio.benetti at benettiengineering.com Mon Feb 21 08:44:30 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 21 Feb 2022 09:44:30 +0100 Subject: [Buildroot] Issue with login In-Reply-To: References: <186B6238-5452-4211-BD9D-29A3C921DE42@benettiengineering.com> <469c0dbc-6101-be6c-7272-400ac4512b86@grenoble.cnrs.fr> <4d8f6289-f16f-9602-a458-2b5836a817e6@benettiengineering.com> Message-ID: <71b0c2b1-0b71-9aca-5209-33ea3a6cacf1@benettiengineering.com> Hi Mohd, On 21/02/22 06:16, Mohd Faiz Rohani wrote: > Hi guys, > > Thank you for your?help.I have overlooked the required setting as > normally I will leave the setting?to the default, as I assume Buildroot > has selected?the required settings. Anyway I have managed to login > successfully?now. > > I have turned on BR2_PACKAGE_SYSTEMD_LOGIND and > BR2_PACKAGE_UTIL_LINUX_LOGIN settings, while the rest does not change. Perfect, team working with Edgar worked :-) > Fyi, I have tried the newer versions of Linux Kernel (5.15) and Uboot > (v2022.01) with the Linaro 7.5 toolchain, but got an error during the > booting process where the RFS cannot be mounted. It may be my fault > through the settings though, that is why I am trying the old version and > it worked. I would avoid using gcc 7.5 on such new kernel/uboot. Maybe if you try to rebuild using an external prebuilt toolchain like the Bootlin one, or you build a Buildroot toolchain with latest versions, like gcc 10.x you could obtain different results. > I am planning to use Buildroot for my future development and keen to > contribute wherever?I can. Still lots to learn though. Well! > Thank you again guys. You're welcome Best regards -- Giulio Benetti Benetti Engineering sas > Regards. > Faiz > > > > > On Mon, Feb 21, 2022 at 2:33 AM Mohd Faiz Rohani > > wrote: > > Thanks, I'll check them out. Will update the outcome once the > installation is done. > > Thank?you. > > On Mon, Feb 21, 2022, 1:56 AM Giulio Benetti > > wrote: > > Hi Edgar, > > please reply to all in Mailing List, I add Mohd in Cc, > > On 20/02/22 17:18, Edgar Bonet wrote: > > Hi! > > > > In his config file, Mohd wrote: > >> BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_10=y > >> BR2_LINUX_KERNEL_VERSION="4.4.155" > > > > This may cause problems. C.f. docs/manual/configure.txt: > > > >? ? ? If you use kernel headers that are more recent than the > Linux > >? ? ? kernel you run on your embedded system, then the C > library might > >? ? ? be using interfaces that are not provided by your Linux > kernel. > > Good catch Edgar! > So Mohd, what you need here is a toolchain with older libc. > https://buildroot.org/downloads/manual/manual.html#_cross_compilation_toolchain > > > But again, do you really need to use so such old versions > instead of try > to use buildroot's beaglebone_defconfig? > > > In the same config file, there is: > >> # BR2_PACKAGE_BUSYBOX is not set > > > > When disabling busybox, you should have seen the message: > > > >? ? ? You may need to enable other packages to get a working > system > >? ? ? You better know what you're doing! > > Despite of what I've written on my previous e-mail(my test was > wrong), > he has BR2_INIT_SYSTEMD=y that works as Init System, so that's ok. > > > And then: > >> # BR2_PACKAGE_SYSTEMD_LOGIND is not set > > Good catch again Edgar! This ^^^ should be the point. Because it's > exactly the systemd login dameon. > > >> # BR2_PACKAGE_UTIL_LINUX_LOGIN is not set > > This ^^^ is not selected by systemd, so I expect > BR2_PACKAGE_SYSTEMD_LOGIND to do the job(even if I'm not a systemd > expoert at all). > > But as Edgar pointed linux headers don't match so you have 3 > choices: > 1) find a toolchain with linux-headers <= 4.4.* > 2) update linux version > 3) start from scratch using buildroot beaglebone_defconfig > > Best regards > -- > Giulio Benetti > Benetti Engineering sas > From giulio.benetti at benettiengineering.com Mon Feb 21 09:07:26 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 21 Feb 2022 10:07:26 +0100 Subject: [Buildroot] [PATCH v3 1/3] board/andes: rearrange nds32 folder structure In-Reply-To: References: <20220215053327.4046-1-peterlin@andestech.com> Message-ID: <1c7b8b85-7b50-0832-24e8-174100f5a6f5@benettiengineering.com> Hi Peter, Alan, On 21/02/22 04:37, Yu Chien Peter Lin wrote: > Hi Giulio, > > On Thu, Feb 17, 2022 at 04:55:49PM +0100, Giulio Benetti wrote: >> Hi Peter, >> >> On 15/02/22 06:33, Yu Chien Peter Lin wrote: >>> Rearrange nds32 folder structure to add AE350 platform. >>> >>> Signed-off-by: Yu Chien Peter Lin >>> Signed-off-by: Alan Kao >>> --- >>> .../patches/linux/0001-nds32-Fix-boot-messages-garbled.patch | 0 >>> ...2-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch | 0 >>> board/andes/{ => ae3xx}/readme.txt | 0 >>> configs/andes_ae3xx_defconfig | 2 +- >>> 4 files changed, 1 insertion(+), 1 deletion(-) >>> rename board/andes/{ => ae3xx}/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch (100%) >>> rename board/andes/{ => ae3xx}/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch (100%) >>> rename board/andes/{ => ae3xx}/readme.txt (100%) >> >> Here we have both: >> board/andes/ae3xx >> and >> board/andes/ae350 >> >> ae3xx should be use for every ae3xx family(ae350 included), but for ae350 >> you use a specific folder. >> What I see digging into ae3xx is that it is for FPGA demonstration, so I >> would move ae3xx directory to be name as ae3xx-fpga. Otherwise I would >> expect ae350(and newer parts) to be part of ae3xx. >> >> Same goes for the defconfig, I would name it like: >> andes_ae3xx_fpga_defconfig >> >> This way we can divide the 2 typologies: >> - fpga demonostration for ae3xx >> - ae3xx SoC family >> >> Otherwise you should provide a single family folder(ae3xx) compatible for >> both fpgas and SoCs. >> >> Thank you >> >> Best regards >> -- >> Giulio Benetti >> Benetti Engineering sas > > For this naming issue, we decide to make ae3xx > explicit to have these two platform residing > in its own folder. So it would be: > > board/andes/ > |- {ae3xx => ae300}/ > `- ae350/ > > If this make sense to you, I will submit PATCH v4. It works for me. I've checked your website and I see: http://www.andestech.com/en/products-solutions/andeshape-platforms/ where you have: AE300: http://www.andestech.com/en/products-solutions/andeshape-platforms/ae300/ and AE350: http://www.andestech.com/en/products-solutions/andeshape-platforms/ae350-axi-based-platform-pre-integrated-with-n25f-nx25f-a25-ax25/ so your solution fits perfectly since they are two very distinct platforms. So yes please send V4 with that change. Thank you! Best regards -- Giulio Benetti Benetti Engineering sas From mohd.faiz.rohani at gmail.com Mon Feb 21 09:33:01 2022 From: mohd.faiz.rohani at gmail.com (Mohd Faiz Rohani) Date: Mon, 21 Feb 2022 17:33:01 +0800 Subject: [Buildroot] Issue with login In-Reply-To: <71b0c2b1-0b71-9aca-5209-33ea3a6cacf1@benettiengineering.com> References: <186B6238-5452-4211-BD9D-29A3C921DE42@benettiengineering.com> <469c0dbc-6101-be6c-7272-400ac4512b86@grenoble.cnrs.fr> <4d8f6289-f16f-9602-a458-2b5836a817e6@benettiengineering.com> <71b0c2b1-0b71-9aca-5209-33ea3a6cacf1@benettiengineering.com> Message-ID: Btw, is the mailing list correct platform for Buildroot Q&A? Do you have any related forum for the purpose? Thanks On Mon, Feb 21, 2022, 4:44 PM Giulio Benetti < giulio.benetti at benettiengineering.com> wrote: > Hi Mohd, > > On 21/02/22 06:16, Mohd Faiz Rohani wrote: > > Hi guys, > > > > Thank you for your help.I have overlooked the required setting as > > normally I will leave the setting to the default, as I assume Buildroot > > has selected the required settings. Anyway I have managed to login > > successfully now. > > > > I have turned on BR2_PACKAGE_SYSTEMD_LOGIND and > > BR2_PACKAGE_UTIL_LINUX_LOGIN settings, while the rest does not change. > > Perfect, team working with Edgar worked :-) > > > Fyi, I have tried the newer versions of Linux Kernel (5.15) and Uboot > > (v2022.01) with the Linaro 7.5 toolchain, but got an error during the > > booting process where the RFS cannot be mounted. It may be my fault > > through the settings though, that is why I am trying the old version and > > it worked. > > I would avoid using gcc 7.5 on such new kernel/uboot. Maybe if you try > to rebuild using an external prebuilt toolchain like the Bootlin one, or > you build a Buildroot toolchain with latest versions, like gcc 10.x you > could obtain different results. > > > I am planning to use Buildroot for my future development and keen to > > contribute wherever I can. Still lots to learn though. > > Well! > > > Thank you again guys. > > You're welcome > > Best regards > -- > Giulio Benetti > Benetti Engineering sas > > > Regards. > > Faiz > > > > > > > > > > On Mon, Feb 21, 2022 at 2:33 AM Mohd Faiz Rohani > > > wrote: > > > > Thanks, I'll check them out. Will update the outcome once the > > installation is done. > > > > Thank you. > > > > On Mon, Feb 21, 2022, 1:56 AM Giulio Benetti > > > > wrote: > > > > Hi Edgar, > > > > please reply to all in Mailing List, I add Mohd in Cc, > > > > On 20/02/22 17:18, Edgar Bonet wrote: > > > Hi! > > > > > > In his config file, Mohd wrote: > > >> BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_10=y > > >> BR2_LINUX_KERNEL_VERSION="4.4.155" > > > > > > This may cause problems. C.f. docs/manual/configure.txt: > > > > > > If you use kernel headers that are more recent than the > > Linux > > > kernel you run on your embedded system, then the C > > library might > > > be using interfaces that are not provided by your Linux > > kernel. > > > > Good catch Edgar! > > So Mohd, what you need here is a toolchain with older libc. > > > https://buildroot.org/downloads/manual/manual.html#_cross_compilation_toolchain > > < > https://buildroot.org/downloads/manual/manual.html#_cross_compilation_toolchain > > > > > > But again, do you really need to use so such old versions > > instead of try > > to use buildroot's beaglebone_defconfig? > > > > > In the same config file, there is: > > >> # BR2_PACKAGE_BUSYBOX is not set > > > > > > When disabling busybox, you should have seen the message: > > > > > > You may need to enable other packages to get a working > > system > > > You better know what you're doing! > > > > Despite of what I've written on my previous e-mail(my test was > > wrong), > > he has BR2_INIT_SYSTEMD=y that works as Init System, so that's > ok. > > > > > And then: > > >> # BR2_PACKAGE_SYSTEMD_LOGIND is not set > > > > Good catch again Edgar! This ^^^ should be the point. Because > it's > > exactly the systemd login dameon. > > > > >> # BR2_PACKAGE_UTIL_LINUX_LOGIN is not set > > > > This ^^^ is not selected by systemd, so I expect > > BR2_PACKAGE_SYSTEMD_LOGIND to do the job(even if I'm not a > systemd > > expoert at all). > > > > But as Edgar pointed linux headers don't match so you have 3 > > choices: > > 1) find a toolchain with linux-headers <= 4.4.* > > 2) update linux version > > 3) start from scratch using buildroot beaglebone_defconfig > > > > Best regards > > -- > > Giulio Benetti > > Benetti Engineering sas > > > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From giulio.benetti at benettiengineering.com Mon Feb 21 09:43:46 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 21 Feb 2022 10:43:46 +0100 Subject: [Buildroot] Issue with login In-Reply-To: References: Message-ID: <843DF5BA-BFB7-4EEF-BF74-0CB8894652B7@benettiengineering.com> > Il giorno 21 feb 2022, alle ore 10:33, Mohd Faiz Rohani ha scritto: > > ? > Btw, is the mailing list correct platform for Buildroot Q&A? Do you have any related forum for the purpose? Thanks It?s one of its purpose, but I suggest you to also join IRC #buildroot channel. Best regards Giulio > >> On Mon, Feb 21, 2022, 4:44 PM Giulio Benetti wrote: >> Hi Mohd, >> >> On 21/02/22 06:16, Mohd Faiz Rohani wrote: >> > Hi guys, >> > >> > Thank you for your help.I have overlooked the required setting as >> > normally I will leave the setting to the default, as I assume Buildroot >> > has selected the required settings. Anyway I have managed to login >> > successfully now. >> > >> > I have turned on BR2_PACKAGE_SYSTEMD_LOGIND and >> > BR2_PACKAGE_UTIL_LINUX_LOGIN settings, while the rest does not change. >> >> Perfect, team working with Edgar worked :-) >> >> > Fyi, I have tried the newer versions of Linux Kernel (5.15) and Uboot >> > (v2022.01) with the Linaro 7.5 toolchain, but got an error during the >> > booting process where the RFS cannot be mounted. It may be my fault >> > through the settings though, that is why I am trying the old version and >> > it worked. >> >> I would avoid using gcc 7.5 on such new kernel/uboot. Maybe if you try >> to rebuild using an external prebuilt toolchain like the Bootlin one, or >> you build a Buildroot toolchain with latest versions, like gcc 10.x you >> could obtain different results. >> >> > I am planning to use Buildroot for my future development and keen to >> > contribute wherever I can. Still lots to learn though. >> >> Well! >> >> > Thank you again guys. >> >> You're welcome >> >> Best regards >> -- >> Giulio Benetti >> Benetti Engineering sas >> >> > Regards. >> > Faiz >> > >> > >> > >> > >> > On Mon, Feb 21, 2022 at 2:33 AM Mohd Faiz Rohani >> > > wrote: >> > >> > Thanks, I'll check them out. Will update the outcome once the >> > installation is done. >> > >> > Thank you. >> > >> > On Mon, Feb 21, 2022, 1:56 AM Giulio Benetti >> > > > > wrote: >> > >> > Hi Edgar, >> > >> > please reply to all in Mailing List, I add Mohd in Cc, >> > >> > On 20/02/22 17:18, Edgar Bonet wrote: >> > > Hi! >> > > >> > > In his config file, Mohd wrote: >> > >> BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_10=y >> > >> BR2_LINUX_KERNEL_VERSION="4.4.155" >> > > >> > > This may cause problems. C.f. docs/manual/configure.txt: >> > > >> > > If you use kernel headers that are more recent than the >> > Linux >> > > kernel you run on your embedded system, then the C >> > library might >> > > be using interfaces that are not provided by your Linux >> > kernel. >> > >> > Good catch Edgar! >> > So Mohd, what you need here is a toolchain with older libc. >> > https://buildroot.org/downloads/manual/manual.html#_cross_compilation_toolchain >> > >> > >> > But again, do you really need to use so such old versions >> > instead of try >> > to use buildroot's beaglebone_defconfig? >> > >> > > In the same config file, there is: >> > >> # BR2_PACKAGE_BUSYBOX is not set >> > > >> > > When disabling busybox, you should have seen the message: >> > > >> > > You may need to enable other packages to get a working >> > system >> > > You better know what you're doing! >> > >> > Despite of what I've written on my previous e-mail(my test was >> > wrong), >> > he has BR2_INIT_SYSTEMD=y that works as Init System, so that's ok. >> > >> > > And then: >> > >> # BR2_PACKAGE_SYSTEMD_LOGIND is not set >> > >> > Good catch again Edgar! This ^^^ should be the point. Because it's >> > exactly the systemd login dameon. >> > >> > >> # BR2_PACKAGE_UTIL_LINUX_LOGIN is not set >> > >> > This ^^^ is not selected by systemd, so I expect >> > BR2_PACKAGE_SYSTEMD_LOGIND to do the job(even if I'm not a systemd >> > expoert at all). >> > >> > But as Edgar pointed linux headers don't match so you have 3 >> > choices: >> > 1) find a toolchain with linux-headers <= 4.4.* >> > 2) update linux version >> > 3) start from scratch using buildroot beaglebone_defconfig >> > >> > Best regards >> > -- >> > Giulio Benetti >> > Benetti Engineering sas >> > >> > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -------------- next part -------------- An HTML attachment was scrubbed... URL: From mohd.faiz.rohani at gmail.com Mon Feb 21 09:46:40 2022 From: mohd.faiz.rohani at gmail.com (Mohd Faiz Rohani) Date: Mon, 21 Feb 2022 17:46:40 +0800 Subject: [Buildroot] Issue with login In-Reply-To: <843DF5BA-BFB7-4EEF-BF74-0CB8894652B7@benettiengineering.com> References: <843DF5BA-BFB7-4EEF-BF74-0CB8894652B7@benettiengineering.com> Message-ID: Yes I will, even though I'm not in IRC for quite some time now. :). Thanks a lot Giulio! On Mon, Feb 21, 2022 at 5:43 PM Giulio Benetti < giulio.benetti at benettiengineering.com> wrote: > > Il giorno 21 feb 2022, alle ore 10:33, Mohd Faiz Rohani < > mohd.faiz.rohani at gmail.com> ha scritto: > > ? > Btw, is the mailing list correct platform for Buildroot Q&A? Do you have > any related forum for the purpose? Thanks > > > It?s one of its purpose, but I suggest you to also join IRC #buildroot > channel. > > Best regards > Giulio > > > On Mon, Feb 21, 2022, 4:44 PM Giulio Benetti < > giulio.benetti at benettiengineering.com> wrote: > >> Hi Mohd, >> >> On 21/02/22 06:16, Mohd Faiz Rohani wrote: >> > Hi guys, >> > >> > Thank you for your help.I have overlooked the required setting as >> > normally I will leave the setting to the default, as I assume Buildroot >> > has selected the required settings. Anyway I have managed to login >> > successfully now. >> > >> > I have turned on BR2_PACKAGE_SYSTEMD_LOGIND and >> > BR2_PACKAGE_UTIL_LINUX_LOGIN settings, while the rest does not change. >> >> Perfect, team working with Edgar worked :-) >> >> > Fyi, I have tried the newer versions of Linux Kernel (5.15) and Uboot >> > (v2022.01) with the Linaro 7.5 toolchain, but got an error during the >> > booting process where the RFS cannot be mounted. It may be my fault >> > through the settings though, that is why I am trying the old version >> and >> > it worked. >> >> I would avoid using gcc 7.5 on such new kernel/uboot. Maybe if you try >> to rebuild using an external prebuilt toolchain like the Bootlin one, or >> you build a Buildroot toolchain with latest versions, like gcc 10.x you >> could obtain different results. >> >> > I am planning to use Buildroot for my future development and keen to >> > contribute wherever I can. Still lots to learn though. >> >> Well! >> >> > Thank you again guys. >> >> You're welcome >> >> Best regards >> -- >> Giulio Benetti >> Benetti Engineering sas >> >> > Regards. >> > Faiz >> > >> > >> > >> > >> > On Mon, Feb 21, 2022 at 2:33 AM Mohd Faiz Rohani >> > > wrote: >> > >> > Thanks, I'll check them out. Will update the outcome once the >> > installation is done. >> > >> > Thank you. >> > >> > On Mon, Feb 21, 2022, 1:56 AM Giulio Benetti >> > > > > wrote: >> > >> > Hi Edgar, >> > >> > please reply to all in Mailing List, I add Mohd in Cc, >> > >> > On 20/02/22 17:18, Edgar Bonet wrote: >> > > Hi! >> > > >> > > In his config file, Mohd wrote: >> > >> BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_10=y >> > >> BR2_LINUX_KERNEL_VERSION="4.4.155" >> > > >> > > This may cause problems. C.f. docs/manual/configure.txt: >> > > >> > > If you use kernel headers that are more recent than the >> > Linux >> > > kernel you run on your embedded system, then the C >> > library might >> > > be using interfaces that are not provided by your Linux >> > kernel. >> > >> > Good catch Edgar! >> > So Mohd, what you need here is a toolchain with older libc. >> > >> https://buildroot.org/downloads/manual/manual.html#_cross_compilation_toolchain >> > < >> https://buildroot.org/downloads/manual/manual.html#_cross_compilation_toolchain >> > >> > >> > But again, do you really need to use so such old versions >> > instead of try >> > to use buildroot's beaglebone_defconfig? >> > >> > > In the same config file, there is: >> > >> # BR2_PACKAGE_BUSYBOX is not set >> > > >> > > When disabling busybox, you should have seen the message: >> > > >> > > You may need to enable other packages to get a working >> > system >> > > You better know what you're doing! >> > >> > Despite of what I've written on my previous e-mail(my test was >> > wrong), >> > he has BR2_INIT_SYSTEMD=y that works as Init System, so that's >> ok. >> > >> > > And then: >> > >> # BR2_PACKAGE_SYSTEMD_LOGIND is not set >> > >> > Good catch again Edgar! This ^^^ should be the point. Because >> it's >> > exactly the systemd login dameon. >> > >> > >> # BR2_PACKAGE_UTIL_LINUX_LOGIN is not set >> > >> > This ^^^ is not selected by systemd, so I expect >> > BR2_PACKAGE_SYSTEMD_LOGIND to do the job(even if I'm not a >> systemd >> > expoert at all). >> > >> > But as Edgar pointed linux headers don't match so you have 3 >> > choices: >> > 1) find a toolchain with linux-headers <= 4.4.* >> > 2) update linux version >> > 3) start from scratch using buildroot beaglebone_defconfig >> > >> > Best regards >> > -- >> > Giulio Benetti >> > Benetti Engineering sas >> > >> >> _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From vahidrezaei1371 at gmail.com Mon Feb 21 10:48:55 2022 From: vahidrezaei1371 at gmail.com (Rezaei Vahid) Date: Mon, 21 Feb 2022 02:48:55 -0800 Subject: [Buildroot] building uclibc based toolchain with buildroot Message-ID: hi I want to compile a C++17 library for my board. the toolchain that comes with my board SDK does not support C++17. I want to build a uclibc based toolchain with buildroot. I am following this tutorial https://www.uclibc.org/toolchains.html the old toolchain configuration. arch arm mcpu cortex-a7 mfloat-abi softfp mfpu neon_vfpv4 no_aggrasive_loop_optimizations kernel 3.18.20 uclibc 0.9.33.2 gcc 4.9.2 ----(which I want to upgrade to a version that supports C++17 ) which I have Uclibc rootfs (uclibc 0.9.33.2), I have to build toolchain with uclibc 0.9.33 how can I specify the version of uclibc of the toolchain? best regards -------------- next part -------------- An HTML attachment was scrubbed... URL: From tianyuanhao3 at 163.com Mon Feb 21 12:06:57 2022 From: tianyuanhao3 at 163.com (TIAN Yuanhao) Date: Mon, 21 Feb 2022 04:06:57 -0800 Subject: [Buildroot] [PATCH 1/1] package/docker-engine: remove unused sqlite Message-ID: <20220221120657.4095013-1-tianyuanhao3@163.com> Dependency on sqlite has been removed since v17.04.0-ce. See: https://github.com/moby/moby/pull/30208 Signed-off-by: TIAN Yuanhao --- package/docker-engine/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in index 911cbfe428..1f0efb8fcc 100644 --- a/package/docker-engine/Config.in +++ b/package/docker-engine/Config.in @@ -9,7 +9,6 @@ config BR2_PACKAGE_DOCKER_ENGINE select BR2_PACKAGE_CONTAINERD # runtime dependency select BR2_PACKAGE_DOCKER_PROXY # runtime dependency select BR2_PACKAGE_IPTABLES # runtime dependency - select BR2_PACKAGE_SQLITE # runtime dependency help Docker is a platform to build, ship, and run applications as lightweight containers. -- 2.25.1 From christian at paral.in Mon Feb 21 12:14:16 2022 From: christian at paral.in (Christian Stewart) Date: Mon, 21 Feb 2022 04:14:16 -0800 Subject: [Buildroot] [PATCH 1/1] package/docker-engine: remove unused sqlite In-Reply-To: <20220221120657.4095013-1-tianyuanhao3@163.com> References: <20220221120657.4095013-1-tianyuanhao3@163.com> Message-ID: Hi all, On Mon, Feb 21, 2022 at 4:07 AM TIAN Yuanhao wrote: > > Dependency on sqlite has been removed since v17.04.0-ce. > > See: https://github.com/moby/moby/pull/30208 > > Signed-off-by: TIAN Yuanhao > --- > package/docker-engine/Config.in | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in > index 911cbfe428..1f0efb8fcc 100644 > --- a/package/docker-engine/Config.in > +++ b/package/docker-engine/Config.in > @@ -9,7 +9,6 @@ config BR2_PACKAGE_DOCKER_ENGINE > select BR2_PACKAGE_CONTAINERD # runtime dependency > select BR2_PACKAGE_DOCKER_PROXY # runtime dependency > select BR2_PACKAGE_IPTABLES # runtime dependency > - select BR2_PACKAGE_SQLITE # runtime dependency > help > Docker is a platform to build, ship, > and run applications as lightweight containers. Reviewed-by: Christian Stewart Thanks, Christian From Alexey.Brodkin at synopsys.com Mon Feb 21 14:06:28 2022 From: Alexey.Brodkin at synopsys.com (Alexey Brodkin) Date: Mon, 21 Feb 2022 17:06:28 +0300 Subject: [Buildroot] [PATCH] package/qt5: enable for ARC Message-ID: <20220221140628.2295-1-abrodkin@synopsys.com> Double-conversion got pulled-in Qt's sources from the upstream project quite some time ago [1], so now Qt5 is buildable for ARC perfectly fine. This reverts the last part of [2], commit e453fb9e3280 (qt5: disable qt-5.8.0 support for arc, nios2 and xtensa). [1] https://invent.kde.org/qt/qt/qtbase/-/commit/425df43d7fed19866fc7ceb3d26b6cc4190523f5 [2] https://git.buildroot.net/buildroot/commit/?id=e453fb9e3280a1a1ce6180e165aab9c4f1642555 Signed-off-by: Alexey Brodkin Cc: Thomas Petazzoni Cc: Peter Seiderer --- package/qt5/Config.in | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/qt5/Config.in b/package/qt5/Config.in index 8557fd1000..cbb2e06a21 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -13,7 +13,6 @@ config BR2_PACKAGE_QT5_JSCORE_AVAILABLE comment "Qt5 needs host g++ >= 5.0, and a toolchain w/ gcc >= 5.0, wchar, NPTL, C++, dynamic library" depends on !BR2_ARM_CPU_ARMV4 - depends on !BR2_arc depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS || \ !BR2_HOST_GCC_AT_LEAST_5 || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 @@ -26,8 +25,6 @@ menuconfig BR2_PACKAGE_QT5 depends on BR2_HOST_GCC_AT_LEAST_5 # Full C++11 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++11, GCC_BUG_57694 depends on !BR2_ARM_CPU_ARMV4 # needs ARMv5+ - # no built-in double-conversion support - depends on !BR2_arc depends on !BR2_STATIC_LIBS select BR2_PACKAGE_QT5BASE help -- 2.25.1 From mohd.faiz.rohani at gmail.com Mon Feb 21 14:15:34 2022 From: mohd.faiz.rohani at gmail.com (Mohd Faiz Rohani) Date: Mon, 21 Feb 2022 22:15:34 +0800 Subject: [Buildroot] Issue with login In-Reply-To: References: <843DF5BA-BFB7-4EEF-BF74-0CB8894652B7@benettiengineering.com> Message-ID: Hi Giulio, Update: I have tried the latest kernel (5.15) with buildroot toolchain. result is same, RFS mounting error (refer attached) On Mon, Feb 21, 2022 at 5:46 PM Mohd Faiz Rohani wrote: > Yes I will, even though I'm not in IRC for quite some time now. :). Thanks > a lot Giulio! > > On Mon, Feb 21, 2022 at 5:43 PM Giulio Benetti < > giulio.benetti at benettiengineering.com> wrote: > >> >> Il giorno 21 feb 2022, alle ore 10:33, Mohd Faiz Rohani < >> mohd.faiz.rohani at gmail.com> ha scritto: >> >> ? >> Btw, is the mailing list correct platform for Buildroot Q&A? Do you have >> any related forum for the purpose? Thanks >> >> >> It?s one of its purpose, but I suggest you to also join IRC #buildroot >> channel. >> >> Best regards >> Giulio >> >> >> On Mon, Feb 21, 2022, 4:44 PM Giulio Benetti < >> giulio.benetti at benettiengineering.com> wrote: >> >>> Hi Mohd, >>> >>> On 21/02/22 06:16, Mohd Faiz Rohani wrote: >>> > Hi guys, >>> > >>> > Thank you for your help.I have overlooked the required setting as >>> > normally I will leave the setting to the default, as I assume >>> Buildroot >>> > has selected the required settings. Anyway I have managed to login >>> > successfully now. >>> > >>> > I have turned on BR2_PACKAGE_SYSTEMD_LOGIND and >>> > BR2_PACKAGE_UTIL_LINUX_LOGIN settings, while the rest does not change. >>> >>> Perfect, team working with Edgar worked :-) >>> >>> > Fyi, I have tried the newer versions of Linux Kernel (5.15) and Uboot >>> > (v2022.01) with the Linaro 7.5 toolchain, but got an error during the >>> > booting process where the RFS cannot be mounted. It may be my fault >>> > through the settings though, that is why I am trying the old version >>> and >>> > it worked. >>> >>> I would avoid using gcc 7.5 on such new kernel/uboot. Maybe if you try >>> to rebuild using an external prebuilt toolchain like the Bootlin one, or >>> you build a Buildroot toolchain with latest versions, like gcc 10.x you >>> could obtain different results. >>> >>> > I am planning to use Buildroot for my future development and keen to >>> > contribute wherever I can. Still lots to learn though. >>> >>> Well! >>> >>> > Thank you again guys. >>> >>> You're welcome >>> >>> Best regards >>> -- >>> Giulio Benetti >>> Benetti Engineering sas >>> >>> > Regards. >>> > Faiz >>> > >>> > >>> > >>> > >>> > On Mon, Feb 21, 2022 at 2:33 AM Mohd Faiz Rohani >>> > > >>> wrote: >>> > >>> > Thanks, I'll check them out. Will update the outcome once the >>> > installation is done. >>> > >>> > Thank you. >>> > >>> > On Mon, Feb 21, 2022, 1:56 AM Giulio Benetti >>> > >> > > wrote: >>> > >>> > Hi Edgar, >>> > >>> > please reply to all in Mailing List, I add Mohd in Cc, >>> > >>> > On 20/02/22 17:18, Edgar Bonet wrote: >>> > > Hi! >>> > > >>> > > In his config file, Mohd wrote: >>> > >> BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_10=y >>> > >> BR2_LINUX_KERNEL_VERSION="4.4.155" >>> > > >>> > > This may cause problems. C.f. docs/manual/configure.txt: >>> > > >>> > > If you use kernel headers that are more recent than the >>> > Linux >>> > > kernel you run on your embedded system, then the C >>> > library might >>> > > be using interfaces that are not provided by your Linux >>> > kernel. >>> > >>> > Good catch Edgar! >>> > So Mohd, what you need here is a toolchain with older libc. >>> > >>> https://buildroot.org/downloads/manual/manual.html#_cross_compilation_toolchain >>> > < >>> https://buildroot.org/downloads/manual/manual.html#_cross_compilation_toolchain >>> > >>> > >>> > But again, do you really need to use so such old versions >>> > instead of try >>> > to use buildroot's beaglebone_defconfig? >>> > >>> > > In the same config file, there is: >>> > >> # BR2_PACKAGE_BUSYBOX is not set >>> > > >>> > > When disabling busybox, you should have seen the message: >>> > > >>> > > You may need to enable other packages to get a working >>> > system >>> > > You better know what you're doing! >>> > >>> > Despite of what I've written on my previous e-mail(my test was >>> > wrong), >>> > he has BR2_INIT_SYSTEMD=y that works as Init System, so that's >>> ok. >>> > >>> > > And then: >>> > >> # BR2_PACKAGE_SYSTEMD_LOGIND is not set >>> > >>> > Good catch again Edgar! This ^^^ should be the point. Because >>> it's >>> > exactly the systemd login dameon. >>> > >>> > >> # BR2_PACKAGE_UTIL_LINUX_LOGIN is not set >>> > >>> > This ^^^ is not selected by systemd, so I expect >>> > BR2_PACKAGE_SYSTEMD_LOGIND to do the job(even if I'm not a >>> systemd >>> > expoert at all). >>> > >>> > But as Edgar pointed linux headers don't match so you have 3 >>> > choices: >>> > 1) find a toolchain with linux-headers <= 4.4.* >>> > 2) update linux version >>> > 3) start from scratch using buildroot beaglebone_defconfig >>> > >>> > Best regards >>> > -- >>> > Giulio Benetti >>> > Benetti Engineering sas >>> > >>> >>> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot >> >> -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: 20220221_211831.jpg Type: image/jpeg Size: 150206 bytes Desc: not available URL: From aperez at igalia.com Mon Feb 21 15:16:48 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Mon, 21 Feb 2022 16:16:48 +0100 Subject: [Buildroot] [PATCH 1/2] package/webkitgtk: security bump to 2.34.6 In-Reply-To: <87o8319t47.fsf@dell.be.48ers.dk> References: <20220217230908.1532564-1-aperez@igalia.com> <87o8319t47.fsf@dell.be.48ers.dk> Message-ID: <20220221161648.GB1133490@momiji> Hi Peter, all, On Sun, 20 Feb 2022 21:32:24 +0100 Peter Korsgaard wrote: > >>>>> "Adrian" == Adrian Perez de Castro writes: > > > Update to a new major release which brings in improvements, a number of > > new features, and security fixes. Release notes: > > > https://webkitgtk.org/2021/09/22/webkitgtk2.34.0-released.html > > https://webkitgtk.org/2021/10/21/webkitgtk2.34.1-released.html > > https://webkitgtk.org/2021/11/24/webkitgtk2.34.2-released.html > > https://webkitgtk.org/2021/12/20/webkitgtk2.34.3-released.html > > https://webkitgtk.org/2022/01/21/webkitgtk2.34.4-released.html > > https://webkitgtk.org/2022/02/09/webkitgtk2.34.5-released.html > > https://webkitgtk.org/2022/02/17/webkitgtk2.34.6-released.html > > > Security advisories: > > > https://webkitgtk.org/security/WSA-2021-0007.html > > https://webkitgtk.org/security/WSA-2022-0001.html > > https://webkitgtk.org/security/WSA-2022-0002.html > > https://webkitgtk.org/security/WSA-2022-0003.html > > > Some of the new features require additional dependencies: HTTP/2 > > requires libsoup3, which is not yet packaged in Buildroot, and > > disabled at the moment (with -DUSE_SOUP2=ON, to keep using libsoup2); > > and the color management support needs LCMS2 (which will be enabled > > in a follow-up patch.) > > > Options SILENCE_CROSS_COMPILATION_NOTICES and ENABLE_GRAPHICS_CONTEXT_GL > > do not exist anymore, and their usage is dropped. > > > Signed-off-by: Adrian Perez de Castro > > --- > > package/webkitgtk/webkitgtk.hash | 8 ++++---- > > package/webkitgtk/webkitgtk.mk | 14 +++++--------- > > 2 files changed, 9 insertions(+), 13 deletions(-) > > > diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash > > index 7cb6c90b21..82c210c8f9 100644 > > --- a/package/webkitgtk/webkitgtk.hash > > +++ b/package/webkitgtk/webkitgtk.hash > > @@ -1,7 +1,7 @@ > > -# From https://webkitgtk.org/releases/webkitgtk-2.32.4.tar.xz.sums > > -md5 51a167e5d03bacf30c5c588e6aa23143 webkitgtk-2.32.4.tar.xz > > -sha1 f7255ffb488e727e9e250e0dae9f192266f50f01 webkitgtk-2.32.4.tar.xz > > -sha256 00ce2d3f798d7bc5e9039d9059f0c3c974d51de38c8b716f00e94452a177d3fd webkitgtk-2.32.4.tar.xz > > +# From https://webkitgtk.org/releases/webkitgtk-2.34.6.tar.xz.sums > > +md5 a5eeedd02f5b4bba8bd891b92dc743d4 webkitgtk-2.34.6.tar.xz > > +sha1 bb82517289baf9c858fa406d1d845274f81e25cb webkitgtk-2.34.6.tar.xz > > +sha256 6bc8fd034aad0432a2459ce4fc7ee25ad65a4924c618bf8d93b52b0c1a84c1f6 webkitgtk-2.34.6.tar.xz > > > # Hashes for license files: > > sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE > > diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk > > index 16b925fe71..f4fc1e7838 100644 > > --- a/package/webkitgtk/webkitgtk.mk > > +++ b/package/webkitgtk/webkitgtk.mk > > @@ -4,7 +4,7 @@ > > # > > ################################################################################ > > > -WEBKITGTK_VERSION = 2.32.4 > > +WEBKITGTK_VERSION = 2.34.6 > > WEBKITGTK_SITE = https://www.webkitgtk.org/releases > > WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz > > WEBKITGTK_INSTALL_STAGING = YES > > @@ -24,10 +24,11 @@ WEBKITGTK_CONF_OPTS = \ > > -DENABLE_MINIBROWSER=ON \ > > -DENABLE_SPELLCHECK=ON \ > > -DPORT=GTK \ > > - -DSILENCE_CROSS_COMPILATION_NOTICES=ON \ > > + -DUSE_LCMS=OFF \ > > -DUSE_LIBNOTIFY=OFF \ > > -DUSE_LIBHYPHEN=OFF \ > > -DUSE_OPENJPEG=ON \ > > + -DUSE_SOUP2=ON \ > > -DUSE_WOFF2=ON > > > This is apparently not against master, as master has > -DUSE_WPE_RENDERER=OFF here since your commit 38b740ec6f44b4 > (package/webkitgtk: bump to version 2.26.0)? > > Please send patches against current git. > > Committed to master after fixing that up, thanks. Ah, sorry about this, and thanks for fixing up my mistake -- I did have an additional commit in local work branch, which I planned to submit separately and I should have reordered my commits beforehand to make the two patches needed for the 2.34 update apply cleanly ? 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 angelo at amarulasolutions.com Mon Feb 21 15:31:51 2022 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Mon, 21 Feb 2022 16:31:51 +0100 Subject: [Buildroot] [PATCH] package/apparmor: bump to version 3.0.4 Message-ID: <20220221153151.1780107-1-angelo@amarulasolutions.com> Updating also the companion libapparmor library and removing upstreamed patch. Signed-off-by: Angelo Compagnucci --- package/apparmor/apparmor.hash | 2 +- package/apparmor/apparmor.mk | 2 +- ...deprecated-distutils-with-setuptools.patch | 244 ------------------ package/libapparmor/libapparmor.hash | 2 +- package/libapparmor/libapparmor.mk | 2 +- 5 files changed, 4 insertions(+), 248 deletions(-) delete mode 100644 package/libapparmor/0001-replace-deprecated-distutils-with-setuptools.patch diff --git a/package/apparmor/apparmor.hash b/package/apparmor/apparmor.hash index 88280cbfcf..497491b6c9 100644 --- a/package/apparmor/apparmor.hash +++ b/package/apparmor/apparmor.hash @@ -1,5 +1,5 @@ # From: https://gitlab.com/apparmor/apparmor/-/wikis/home#userspace -sha256 153db05d8f491e0596022663c19fb1166806cb473b3c6f0a7279feda2ec25a59 apparmor-3.0.3.tar.gz +sha256 09bf48d7a171f9790c39a1404bad105a788934cfe77b7490c7f5c63c2576b725 apparmor-3.0.4.tar.gz # locally computed sha256 a7e0cdcbea5c14927cedfc600d46526bdcbb1eb0a4d951e2ea53c2a6de159cb4 LICENSE diff --git a/package/apparmor/apparmor.mk b/package/apparmor/apparmor.mk index 43bfa05308..76c9f2cafe 100644 --- a/package/apparmor/apparmor.mk +++ b/package/apparmor/apparmor.mk @@ -6,7 +6,7 @@ # When updating the version here, please also update the libapparmor package APPARMOR_VERSION_MAJOR = 3.0 -APPARMOR_VERSION = $(APPARMOR_VERSION_MAJOR).3 +APPARMOR_VERSION = $(APPARMOR_VERSION_MAJOR).4 APPARMOR_SITE = https://launchpad.net/apparmor/$(APPARMOR_VERSION_MAJOR)/$(APPARMOR_VERSION)/+download APPARMOR_DL_SUBDIR = libapparmor APPARMOR_LICENSE = GPL-2.0 diff --git a/package/libapparmor/0001-replace-deprecated-distutils-with-setuptools.patch b/package/libapparmor/0001-replace-deprecated-distutils-with-setuptools.patch deleted file mode 100644 index 5aed31d0b5..0000000000 --- a/package/libapparmor/0001-replace-deprecated-distutils-with-setuptools.patch +++ /dev/null @@ -1,244 +0,0 @@ -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.hash b/package/libapparmor/libapparmor.hash index 6a19aef77a..9fbfe3b92e 100644 --- a/package/libapparmor/libapparmor.hash +++ b/package/libapparmor/libapparmor.hash @@ -1,5 +1,5 @@ # From: https://gitlab.com/apparmor/apparmor/-/wikis/home#userspace -sha256 153db05d8f491e0596022663c19fb1166806cb473b3c6f0a7279feda2ec25a59 apparmor-3.0.3.tar.gz +sha256 09bf48d7a171f9790c39a1404bad105a788934cfe77b7490c7f5c63c2576b725 apparmor-3.0.4.tar.gz # locally computed sha256 a7e0cdcbea5c14927cedfc600d46526bdcbb1eb0a4d951e2ea53c2a6de159cb4 LICENSE diff --git a/package/libapparmor/libapparmor.mk b/package/libapparmor/libapparmor.mk index 7bb849ab94..fcd3a4389b 100644 --- a/package/libapparmor/libapparmor.mk +++ b/package/libapparmor/libapparmor.mk @@ -6,7 +6,7 @@ # When updating the version here, please also update the apparmor package LIBAPPARMOR_VERSION_MAJOR = 3.0 -LIBAPPARMOR_VERSION = $(LIBAPPARMOR_VERSION_MAJOR).3 +LIBAPPARMOR_VERSION = $(LIBAPPARMOR_VERSION_MAJOR).4 LIBAPPARMOR_SOURCE = apparmor-$(LIBAPPARMOR_VERSION).tar.gz LIBAPPARMOR_SITE = https://launchpad.net/apparmor/$(LIBAPPARMOR_VERSION_MAJOR)/$(LIBAPPARMOR_VERSION)/+download LIBAPPARMOR_LICENSE = LGPL-2.1 -- 2.25.1 From andrei.gherghescu at protonmail.com Mon Feb 21 16:06:24 2022 From: andrei.gherghescu at protonmail.com (Andrei Gherghescu) Date: Mon, 21 Feb 2022 16:06:24 +0000 Subject: [Buildroot] [PATCH 1/1] package/dialog: bump to version 1.3-20220117 Message-ID: <20220221160549.20554-1-andrei.gherghescu@protonmail.com> Signed-off-by: Andrei Gherghescu --- package/dialog/dialog.hash | 2 +- package/dialog/dialog.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dialog/dialog.hash b/package/dialog/dialog.hash index 2286590b66..3136d18b2b 100644 --- a/package/dialog/dialog.hash +++ b/package/dialog/dialog.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 466163e8b97c2b7709d00389199add3156bd813f60ccb0335d0a30f2d4a17f99 dialog-1.3-20200327.tgz +sha256 754cb6bf7dc6a9ac5c1f80c13caa4d976e30a5a6e8b46f17b3bb9b080c31041f dialog-1.3-20220117.tgz # Locally computed sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/dialog/dialog.mk b/package/dialog/dialog.mk index 1c98d354e3..681f8ec9fe 100644 --- a/package/dialog/dialog.mk +++ b/package/dialog/dialog.mk @@ -4,7 +4,7 @@ # ################################################################################ -DIALOG_VERSION = 1.3-20200327 +DIALOG_VERSION = 1.3-20220117 DIALOG_SOURCE = dialog-$(DIALOG_VERSION).tgz DIALOG_SITE = https://invisible-mirror.net/archives/dialog DIALOG_CONF_OPTS = --with-ncurses --with-curses-dir=$(STAGING_DIR)/usr \ -- 2.35.1 From fontaine.fabrice at gmail.com Mon Feb 21 17:26:21 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 21 Feb 2022 18:26:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/flac: security bump to version 1.3.4 Message-ID: <20220221172621.1937610-1-fontaine.fabrice@gmail.com> This release mostly fixes (security related) bugs including: - Fix 12 decoder bugs found by oss-fuzz, including CVE-2020-0499 - Fix encoder bug CVE-2021-0561 Also: - Replace first patch which was reverted by https://github.com/xiph/flac/commit/4fbb6d4f2ecf2a96c17ea9880108409f852c08a9 - Disable stack protection (enabled by default since https://github.com/xiph/flac/commit/f706f2832270a0b7851cdffe62ad37acda9423fe) - Drop md5 which is not provided anymore - Update indentation in hash file (two spaces) https://github.com/xiph/flac/releases/tag/1.3.4 Signed-off-by: Fabrice Fontaine --- ...ck-for-sys-auxv.h-before-defining-FL.patch | 36 ------------------- package/flac/flac.hash | 12 +++---- package/flac/flac.mk | 5 +-- 3 files changed, 8 insertions(+), 45 deletions(-) delete mode 100644 package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch diff --git a/package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch b/package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch deleted file mode 100644 index d1398d4b3e..0000000000 --- a/package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 14a0713389fbfef59225d027ea466ebb478a8c6b Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 19 Sep 2019 21:18:04 +0200 -Subject: [PATCH] configure.ac: check for sys/auxv.h before defining FLAC__CPU_PPC - -Upstream: https://github.com/xiph/flac/pull/142 -Signed-off-by: Peter Seiderer ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 0228a12..64cb3f2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -144,7 +144,7 @@ case "$host_cpu" in - powerpc64|powerpc64le) - cpu_ppc64=true - cpu_ppc=true -- AC_DEFINE(FLAC__CPU_PPC) -+ AC_CHECK_HEADER(sys/auxv.h, AC_DEFINE(FLAC__CPU_PPC)) - AH_TEMPLATE(FLAC__CPU_PPC, [define if building for PowerPC]) - AC_DEFINE(FLAC__CPU_PPC64) - AH_TEMPLATE(FLAC__CPU_PPC64, [define if building for PowerPC64]) -@@ -152,7 +152,7 @@ case "$host_cpu" in - ;; - powerpc|powerpcle) - cpu_ppc=true -- AC_DEFINE(FLAC__CPU_PPC) -+ AC_CHECK_HEADER(sys/auxv.h, AC_DEFINE(FLAC__CPU_PPC)) - AH_TEMPLATE(FLAC__CPU_PPC, [define if building for PowerPC]) - asm_optimisation=$asm_opt - ;; --- -2.23.0 - diff --git a/package/flac/flac.hash b/package/flac/flac.hash index df7c2d1b95..2444535e0f 100644 --- a/package/flac/flac.hash +++ b/package/flac/flac.hash @@ -1,10 +1,8 @@ -# From https://ftp.osuosl.org/pub/xiph/releases/flac/MD5SUMS -md5 26703ed2858c1fc9ffc05136d13daa69 flac-1.3.3.tar.xz # From https://ftp.osuosl.org/pub/xiph/releases/flac/SHA1SUMS -sha1 6ac2e8f1dd18c9b0214c4d81bd70cdc1e943cffe flac-1.3.3.tar.xz +sha1 99c28482a8b2d81deaf740639e4cb55658427420 flac-1.3.4.tar.xz # From http://downloads.xiph.org/releases/flac/SHA256SUMS.txt -sha256 213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748 flac-1.3.3.tar.xz +sha256 8ff0607e75a322dd7cd6ec48f4f225471404ae2730d0ea945127b1355155e737 flac-1.3.4.tar.xz # Locally computed -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LGPL -sha256 fa27cb11f13f97b0c5f3ff363b1e2610c6efe87ed175779cb2a78e44eb19d34c COPYING.Xiph +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LGPL +sha256 fa27cb11f13f97b0c5f3ff363b1e2610c6efe87ed175779cb2a78e44eb19d34c COPYING.Xiph diff --git a/package/flac/flac.mk b/package/flac/flac.mk index 9aa00b7ffd..2ff048b6e6 100644 --- a/package/flac/flac.mk +++ b/package/flac/flac.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLAC_VERSION = 1.3.3 +FLAC_VERSION = 1.3.4 FLAC_SITE = http://downloads.xiph.org/releases/flac FLAC_SOURCE = flac-$(FLAC_VERSION).tar.xz FLAC_INSTALL_STAGING = YES @@ -19,7 +19,8 @@ FLAC_AUTORECONF = YES FLAC_CONF_OPTS = \ $(if $(BR2_INSTALL_LIBSTDCPP),--enable-cpplibs,--disable-cpplibs) \ --disable-xmms-plugin \ - --disable-altivec + --disable-altivec \ + --disable-stack-smash-protection ifeq ($(BR2_PACKAGE_LIBOGG),y) FLAC_CONF_OPTS += --with-ogg=$(STAGING_DIR)/usr -- 2.34.1 From fontaine.fabrice at gmail.com Mon Feb 21 17:29:00 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 21 Feb 2022 18:29:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/re2: fix build with gcc <= 5 Message-ID: <20220221172900.1937856-1-fontaine.fabrice@gmail.com> Fix the following build failure with gcc <= 5 raised since bump to version 2022-02-01 in commit d2cf91e0c6a082261cc7ebb06dfdbd7bc2c2956f and https://github.com/google/re2/commit/a022cc0c55b0519629d64d775e7a5195af34a477 ./re2/sparse_array.h:266:37: warning: defaulted and deleted functions only available with -std=c++11 or -std=gnu++11 SparseArray::SparseArray() = default; ^ ./re2/sparse_array.h: In copy constructor 're2::SparseArray::SparseArray(const re2::SparseArray&)': ./re2/sparse_array.h:273:3: error: 'copy_n' is not a member of 'std' std::copy_n(src.sparse_.data(), src.max_size(), sparse_.data()); ^ Fixes: - http://autobuild.buildroot.org/results/8ebbac67f32fe24416a1f72aad0afd42b567b403 Signed-off-by: Fabrice Fontaine --- package/re2/re2.mk | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/package/re2/re2.mk b/package/re2/re2.mk index 41392cb179..cc5fed71fa 100644 --- a/package/re2/re2.mk +++ b/package/re2/re2.mk @@ -10,20 +10,25 @@ RE2_LICENSE = BSD-3-Clause RE2_LICENSE_FILES = LICENSE RE2_INSTALL_STAGING = YES +RE2_MAKE_OPTS = \ + $(TARGET_CONFIGURE_OPTS) \ + CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" \ + prefix=/usr + define RE2_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_MAKE_ENV) $(MAKE) $(RE2_MAKE_OPTS) \ -C $(@D) $(if $(BR2_STATIC_LIBS),static) endef define RE2_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ - DESTDIR="$(STAGING_DIR)" prefix=/usr -C $(@D) \ + $(TARGET_MAKE_ENV) $(MAKE) $(RE2_MAKE_OPTS) \ + DESTDIR="$(STAGING_DIR)" -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) \ + $(TARGET_MAKE_ENV) $(MAKE) $(RE2_MAKE_OPTS) \ + DESTDIR="$(TARGET_DIR)" -C $(@D) \ $(if $(BR2_STATIC_LIBS),static-install,install) endef -- 2.34.1 From giulio.benetti at benettiengineering.com Mon Feb 21 19:09:52 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 21 Feb 2022 20:09:52 +0100 Subject: [Buildroot] [PATCH v3 1/3] board/andes: rearrange nds32 folder structure In-Reply-To: <1c7b8b85-7b50-0832-24e8-174100f5a6f5@benettiengineering.com> References: <20220215053327.4046-1-peterlin@andestech.com> <1c7b8b85-7b50-0832-24e8-174100f5a6f5@benettiengineering.com> Message-ID: Ah, forgotten to mention, On 21/02/22 10:07, Giulio Benetti wrote: > Hi Peter, Alan, > > On 21/02/22 04:37, Yu Chien Peter Lin wrote: >> Hi Giulio, >> >> On Thu, Feb 17, 2022 at 04:55:49PM +0100, Giulio Benetti wrote: >>> Hi Peter, >>> >>> On 15/02/22 06:33, Yu Chien Peter Lin wrote: >>>> Rearrange nds32 folder structure to add AE350 platform. Please explain here that AE300 and AE350 are 2 different platform by also pointing the URL I've pointed you below. Thank you -- Giulio Benetti Benetti Engineering sas >>>> Signed-off-by: Yu Chien Peter Lin >>>> Signed-off-by: Alan Kao >>>> --- >>>> .../patches/linux/0001-nds32-Fix-boot-messages-garbled.patch | 0 >>>> ...2-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch | 0 >>>> board/andes/{ => ae3xx}/readme.txt | 0 >>>> configs/andes_ae3xx_defconfig | 2 +- >>>> 4 files changed, 1 insertion(+), 1 deletion(-) >>>> rename board/andes/{ => ae3xx}/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch (100%) >>>> rename board/andes/{ => ae3xx}/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch (100%) >>>> rename board/andes/{ => ae3xx}/readme.txt (100%) >>> >>> Here we have both: >>> board/andes/ae3xx >>> and >>> board/andes/ae350 >>> >>> ae3xx should be use for every ae3xx family(ae350 included), but for ae350 >>> you use a specific folder. >>> What I see digging into ae3xx is that it is for FPGA demonstration, so I >>> would move ae3xx directory to be name as ae3xx-fpga. Otherwise I would >>> expect ae350(and newer parts) to be part of ae3xx. >>> >>> Same goes for the defconfig, I would name it like: >>> andes_ae3xx_fpga_defconfig >>> >>> This way we can divide the 2 typologies: >>> - fpga demonostration for ae3xx >>> - ae3xx SoC family >>> >>> Otherwise you should provide a single family folder(ae3xx) compatible for >>> both fpgas and SoCs. >>> >>> Thank you >>> >>> Best regards >>> -- >>> Giulio Benetti >>> Benetti Engineering sas >> >> For this naming issue, we decide to make ae3xx >> explicit to have these two platform residing >> in its own folder. So it would be: >> >> board/andes/ >> |- {ae3xx => ae300}/ >> `- ae350/ >> >> If this make sense to you, I will submit PATCH v4. > > It works for me. > I've checked your website and I see: > http://www.andestech.com/en/products-solutions/andeshape-platforms/ > > where you have: > AE300: > http://www.andestech.com/en/products-solutions/andeshape-platforms/ae300/ > > and AE350: > http://www.andestech.com/en/products-solutions/andeshape-platforms/ae350-axi-based-platform-pre-integrated-with-n25f-nx25f-a25-ax25/ > > so your solution fits perfectly since they are two very distinct platforms. > > So yes please send V4 with that change. > > Thank you! > > Best regards From giulio.benetti at benettiengineering.com Mon Feb 21 19:10:59 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 21 Feb 2022 20:10:59 +0100 Subject: [Buildroot] [PATCH 2/3] board/andes/ae350: add support for Andes AE350 In-Reply-To: <20220215023202.1188-2-peterlin@andestech.com> References: <20220215023202.1188-1-peterlin@andestech.com> <20220215023202.1188-2-peterlin@andestech.com> Message-ID: <174939a7-02dc-7fee-8ac5-0c9b18478a7d@benettiengineering.com> Hi Peter, Alan, On 15/02/22 03:32, Yu Chien Peter Lin wrote: > This patch provides defconfig and basic support for the Andes > 45 series RISC-V architecture. Please add the board or SoC URL website here. Thank you! Best regards -- Giulio Benetti Benetti Engineering sas > Signed-off-by: Yu Chien Peter Lin > Signed-off-by: Alan Kao > --- > Changes > V1->V2: > * move linux source code and its patches to AndesTech Github repo > * rename ae350_andestar45_defconfig to andes_ae350_45_defconfig > * change C library to uClibc > * remove OpenSSL package > * remove rootfs.cpio and rootfs.tar > * update DEVELOPERS > V2->V3: > * specifiy branch to download from AndesTech linux repo > * change boot.cmd to extlinux.conf > * add post-build.sh for extlinux.conf to retrieve Image and DTB > * fix format and update genimage_sdcard.cfg > * update readme.txt > * add packages (python3, pylibfdt and openssl) for u-boot binman > * reorder item in DEVELOPERS > > board/andes/ae350/ae350.dts | 274 ++++++++++++++++++ > board/andes/ae350/genimage_sdcard.cfg | 26 ++ > ...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/post-build.sh | 3 + > board/andes/ae350/readme.txt | 65 +++++ > .../boot/extlinux/extlinux.conf | 4 + > board/andes/ae350/uboot.config.fragment | 5 + > configs/andes_ae350_45_defconfig | 43 +++ > 13 files changed, 579 insertions(+) > create mode 100755 board/andes/ae350/ae350.dts > 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 100755 board/andes/ae350/post-build.sh > create mode 100644 board/andes/ae350/readme.txt > create mode 100644 board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf > 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/genimage_sdcard.cfg b/board/andes/ae350/genimage_sdcard.cfg > new file mode 100644 > index 0000000000..b8b9fe6a62 > --- /dev/null > +++ b/board/andes/ae350/genimage_sdcard.cfg > @@ -0,0 +1,26 @@ > +image boot.vfat { > + vfat { > + files = { > + "u-boot-spl.bin", > + "u-boot.itb", > + "ae350.dtb", > + } > + } > + size = 2M > +} > + > +image sdcard.img { > + hdimage { > + } > + > + partition boot { > + partition-type = 0xC > + image = "boot.vfat" > + } > + > + partition rootfs { > + partition-type = 0x83 > + bootable = true > + 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/post-build.sh b/board/andes/ae350/post-build.sh > new file mode 100755 > index 0000000000..0e6ce228f4 > --- /dev/null > +++ b/board/andes/ae350/post-build.sh > @@ -0,0 +1,3 @@ > +#!/bin/sh > +cp $BINARIES_DIR/Image $TARGET_DIR/boot > +cp $BINARIES_DIR/ae350.dtb $TARGET_DIR/boot > diff --git a/board/andes/ae350/readme.txt b/board/andes/ae350/readme.txt > new file mode 100644 > index 0000000000..6825468d50 > --- /dev/null > +++ b/board/andes/ae350/readme.txt > @@ -0,0 +1,65 @@ > +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/ > + |-- ae350.dtb > + |-- boot.vfat > + |-- fw_dynamic.bin > + |-- fw_dynamic.elf > + |-- fw_jump.bin > + |-- fw_jump.elf > + |-- Image > + |-- 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 > + $ sudo sync > + > +Your SD card partition should be: > + > + Disk /dev/sdb: 14.48 GiB, 15552479232 bytes, 30375936 sectors > + Disk model: Multi-Card > + Units: sectors of 1 * 512 = 512 bytes > + Sector size (logical/physical): 512 bytes / 512 bytes > + I/O size (minimum/optimal): 512 bytes / 512 bytes > + Disklabel type: dos > + Disk identifier: 0x00000000 > + > + Device Boot Start End Sectors Size Id Type > + /dev/sdb1 1 4096 4096 2M c W95 FAT32 (LBA) > + /dev/sdb2 * 4097 126976 122880 60M 83 Linux > + > +Insert SD card and reset the board, it should boot Linux from mmc. > diff --git a/board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf b/board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf > new file mode 100644 > index 0000000000..549eb93abc > --- /dev/null > +++ b/board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf > @@ -0,0 +1,4 @@ > +label linux > + kernel /boot/Image > + fdt /boot/ae350.dtb > + append earlycon=sbi root=/dev/mmcblk0p2 rootwait > 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..a35ddd06ba > --- /dev/null > +++ b/configs/andes_ae350_45_defconfig > @@ -0,0 +1,43 @@ > +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_OVERLAY="board/andes/ae350/rootfs_overlay" > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/andes/ae350/post-build.sh" > +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_GIT=y > +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/andestech/linux.git" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.10.84-ae350_45" > +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_PYTHON3=y > +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y > +# BR2_TARGET_UBOOT_FORMAT_BIN is not set > +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.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 From petr.vorel at gmail.com Mon Feb 21 19:21:26 2022 From: petr.vorel at gmail.com (Petr Vorel) Date: Mon, 21 Feb 2022 20:21:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/libqmi: bump version to 1.30.4 Message-ID: <20220221192126.30231-1-petr.vorel@gmail.com> Remove 0001-build-add-an-option-to-not-build-man-pages.patch as release contains very similar commit which does autodetection: 1a474db ("build: add an option to not build man pages") Signed-off-by: Petr Vorel --- 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 andes-nds32 [ 1/45]: FAILED (not related to this change) 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]: OK 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]: OK 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]: SKIPPED 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]: SKIPPED br-powerpc64-power7-glibc [36/45]: OK linaro-aarch64-be [37/45]: OK linaro-aarch64 [38/45]: OK linaro-arm [39/45]: OK sourcery-arm-armv4t [40/45]: 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]: OK ...add-an-option-to-not-build-man-pages.patch | 65 ------------------- package/libqmi/libqmi.hash | 2 +- package/libqmi/libqmi.mk | 2 +- 3 files changed, 2 insertions(+), 67 deletions(-) delete mode 100644 package/libqmi/0001-build-add-an-option-to-not-build-man-pages.patch 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 deleted file mode 100644 index d9053de537..0000000000 --- a/package/libqmi/0001-build-add-an-option-to-not-build-man-pages.patch +++ /dev/null @@ -1,65 +0,0 @@ -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.hash b/package/libqmi/libqmi.hash index 1f2da45ac0..ef2da77a2a 100644 --- a/package/libqmi/libqmi.hash +++ b/package/libqmi/libqmi.hash @@ -1,4 +1,4 @@ # Locally computed: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB -sha256 2eb7c7971b91a64ad830643b0170cff692a69bf0f093ca61d72d3f466a0272d4 libqmi-1.30.2.tar.gz +sha256 82ddd3f77c602b1e0c11d3e41d0563ede11f95036ebfcf929bc89157b13928e6 libqmi-1.30.4.tar.gz diff --git a/package/libqmi/libqmi.mk b/package/libqmi/libqmi.mk index a4839f1efb..b33e2fdc47 100644 --- a/package/libqmi/libqmi.mk +++ b/package/libqmi/libqmi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBQMI_VERSION = 1.30.2 +LIBQMI_VERSION = 1.30.4 LIBQMI_SITE = https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/archive/$(LIBQMI_VERSION) LIBQMI_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (programs) LIBQMI_LICENSE_FILES = COPYING COPYING.LIB -- 2.35.1 From petr.vorel at gmail.com Mon Feb 21 19:23:02 2022 From: petr.vorel at gmail.com (Petr Vorel) Date: Mon, 21 Feb 2022 20:23:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/modem-manager: bump version to 1.16.10 Message-ID: <20220221192302.20698-1-petr.vorel@gmail.com> Signed-off-by: Petr Vorel --- 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]: FAILED # not related to this change 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 package/modem-manager/modem-manager.hash | 2 +- package/modem-manager/modem-manager.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/modem-manager/modem-manager.hash b/package/modem-manager/modem-manager.hash index 14597215df..ea91f42fe0 100644 --- a/package/modem-manager/modem-manager.hash +++ b/package/modem-manager/modem-manager.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 2ccf1f716c2d121e8e6709bcf8af29ee86971a90adacca2e8d6288b30278862e ModemManager-1.16.10.tar.xz +sha256 d4f804b31cf504239c5f1d4973c62095c00cba1ee9abb503718dac6d146a470a ModemManager-1.18.6.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk index a881edc272..d7e2c55bf8 100644 --- a/package/modem-manager/modem-manager.mk +++ b/package/modem-manager/modem-manager.mk @@ -4,7 +4,7 @@ # ################################################################################ -MODEM_MANAGER_VERSION = 1.16.10 +MODEM_MANAGER_VERSION = 1.18.6 MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.xz MODEM_MANAGER_SITE = http://www.freedesktop.org/software/ModemManager MODEM_MANAGER_LICENSE = GPL-2.0+ (programs, plugins), LGPL-2.0+ (libmm-glib) -- 2.35.1 From giulio.benetti at benettiengineering.com Mon Feb 21 19:32:48 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 21 Feb 2022 20:32:48 +0100 Subject: [Buildroot] Issue with login In-Reply-To: References: Message-ID: <6EA7F8E4-B66D-419E-884D-9F7B69357C5D@benettiengineering.com> Hi Mohd, > Il giorno 21 feb 2022, alle ore 15:16, Mohd Faiz Rohani ha scritto: > > ? > Hi Giulio, > > Update: I have tried the latest kernel (5.15) with buildroot toolchain. result is same, RFS mounting error (refer attached) Please use https://pasteboard.co/ for images, but it would be definitely better to have a pastebin. As I see it fails to mount mmc0blk0p2. But are you trying to boot from sd-card or eMMC? If from sd-card make sure you have partition 2 with fdisk. Same goes for eMMC, you need to check the partitions. Maybe simply rootfs is on partition 1?!? And so you only need to pass a different rootfs argument to bootargs. What happens if instead you build Buildroot beaglebone_defconfig? Can you give a go with that and use its instructions found in board/beaglebone/readme.txt please? If that works at least we know the HE is alive. Thank you Giulio > > >> On Mon, Feb 21, 2022 at 5:46 PM Mohd Faiz Rohani wrote: >> Yes I will, even though I'm not in IRC for quite some time now. :). Thanks a lot Giulio! >> >>> On Mon, Feb 21, 2022 at 5:43 PM Giulio Benetti wrote: >>> >>>>> Il giorno 21 feb 2022, alle ore 10:33, Mohd Faiz Rohani ha scritto: >>>>> >>>> ? >>>> Btw, is the mailing list correct platform for Buildroot Q&A? Do you have any related forum for the purpose? Thanks >>> >>> It?s one of its purpose, but I suggest you to also join IRC #buildroot channel. >>> >>> Best regards >>> Giulio >>> >>>> >>>>> On Mon, Feb 21, 2022, 4:44 PM Giulio Benetti wrote: >>>>> Hi Mohd, >>>>> >>>>> On 21/02/22 06:16, Mohd Faiz Rohani wrote: >>>>> > Hi guys, >>>>> > >>>>> > Thank you for your help.I have overlooked the required setting as >>>>> > normally I will leave the setting to the default, as I assume Buildroot >>>>> > has selected the required settings. Anyway I have managed to login >>>>> > successfully now. >>>>> > >>>>> > I have turned on BR2_PACKAGE_SYSTEMD_LOGIND and >>>>> > BR2_PACKAGE_UTIL_LINUX_LOGIN settings, while the rest does not change. >>>>> >>>>> Perfect, team working with Edgar worked :-) >>>>> >>>>> > Fyi, I have tried the newer versions of Linux Kernel (5.15) and Uboot >>>>> > (v2022.01) with the Linaro 7.5 toolchain, but got an error during the >>>>> > booting process where the RFS cannot be mounted. It may be my fault >>>>> > through the settings though, that is why I am trying the old version and >>>>> > it worked. >>>>> >>>>> I would avoid using gcc 7.5 on such new kernel/uboot. Maybe if you try >>>>> to rebuild using an external prebuilt toolchain like the Bootlin one, or >>>>> you build a Buildroot toolchain with latest versions, like gcc 10.x you >>>>> could obtain different results. >>>>> >>>>> > I am planning to use Buildroot for my future development and keen to >>>>> > contribute wherever I can. Still lots to learn though. >>>>> >>>>> Well! >>>>> >>>>> > Thank you again guys. >>>>> >>>>> You're welcome >>>>> >>>>> Best regards >>>>> -- >>>>> Giulio Benetti >>>>> Benetti Engineering sas >>>>> >>>>> > Regards. >>>>> > Faiz >>>>> > >>>>> > >>>>> > >>>>> > >>>>> > On Mon, Feb 21, 2022 at 2:33 AM Mohd Faiz Rohani >>>>> > > wrote: >>>>> > >>>>> > Thanks, I'll check them out. Will update the outcome once the >>>>> > installation is done. >>>>> > >>>>> > Thank you. >>>>> > >>>>> > On Mon, Feb 21, 2022, 1:56 AM Giulio Benetti >>>>> > >>>> > > wrote: >>>>> > >>>>> > Hi Edgar, >>>>> > >>>>> > please reply to all in Mailing List, I add Mohd in Cc, >>>>> > >>>>> > On 20/02/22 17:18, Edgar Bonet wrote: >>>>> > > Hi! >>>>> > > >>>>> > > In his config file, Mohd wrote: >>>>> > >> BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_10=y >>>>> > >> BR2_LINUX_KERNEL_VERSION="4.4.155" >>>>> > > >>>>> > > This may cause problems. C.f. docs/manual/configure.txt: >>>>> > > >>>>> > > If you use kernel headers that are more recent than the >>>>> > Linux >>>>> > > kernel you run on your embedded system, then the C >>>>> > library might >>>>> > > be using interfaces that are not provided by your Linux >>>>> > kernel. >>>>> > >>>>> > Good catch Edgar! >>>>> > So Mohd, what you need here is a toolchain with older libc. >>>>> > https://buildroot.org/downloads/manual/manual.html#_cross_compilation_toolchain >>>>> > >>>>> > >>>>> > But again, do you really need to use so such old versions >>>>> > instead of try >>>>> > to use buildroot's beaglebone_defconfig? >>>>> > >>>>> > > In the same config file, there is: >>>>> > >> # BR2_PACKAGE_BUSYBOX is not set >>>>> > > >>>>> > > When disabling busybox, you should have seen the message: >>>>> > > >>>>> > > You may need to enable other packages to get a working >>>>> > system >>>>> > > You better know what you're doing! >>>>> > >>>>> > Despite of what I've written on my previous e-mail(my test was >>>>> > wrong), >>>>> > he has BR2_INIT_SYSTEMD=y that works as Init System, so that's ok. >>>>> > >>>>> > > And then: >>>>> > >> # BR2_PACKAGE_SYSTEMD_LOGIND is not set >>>>> > >>>>> > Good catch again Edgar! This ^^^ should be the point. Because it's >>>>> > exactly the systemd login dameon. >>>>> > >>>>> > >> # BR2_PACKAGE_UTIL_LINUX_LOGIN is not set >>>>> > >>>>> > This ^^^ is not selected by systemd, so I expect >>>>> > BR2_PACKAGE_SYSTEMD_LOGIND to do the job(even if I'm not a systemd >>>>> > expoert at all). >>>>> > >>>>> > But as Edgar pointed linux headers don't match so you have 3 >>>>> > choices: >>>>> > 1) find a toolchain with linux-headers <= 4.4.* >>>>> > 2) update linux version >>>>> > 3) start from scratch using buildroot beaglebone_defconfig >>>>> > >>>>> > Best regards >>>>> > -- >>>>> > Giulio Benetti >>>>> > Benetti Engineering sas >>>>> > >>>>> >>>> _______________________________________________ >>>> buildroot mailing list >>>> buildroot at buildroot.org >>>> https://lists.buildroot.org/mailman/listinfo/buildroot -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: 20220221_211831.jpg Type: image/jpeg Size: 150206 bytes Desc: not available URL: From yann.morin.1998 at free.fr Mon Feb 21 20:00:44 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 21 Feb 2022 21:00:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/re2: fix build with gcc <= 5 In-Reply-To: <20220221172900.1937856-1-fontaine.fabrice@gmail.com> References: <20220221172900.1937856-1-fontaine.fabrice@gmail.com> Message-ID: <20220221200044.GA2166282@scaer> Fabrice, All, On 2022-02-21 18:29 +0100, Fabrice Fontaine spake thusly: > Fix the following build failure with gcc <= 5 raised since bump to > version 2022-02-01 in commit d2cf91e0c6a082261cc7ebb06dfdbd7bc2c2956f > and > https://github.com/google/re2/commit/a022cc0c55b0519629d64d775e7a5195af34a477 > > ./re2/sparse_array.h:266:37: warning: defaulted and deleted functions only available with -std=c++11 or -std=gnu++11 > SparseArray::SparseArray() = default; > ^ > ./re2/sparse_array.h: In copy constructor 're2::SparseArray::SparseArray(const re2::SparseArray&)': > ./re2/sparse_array.h:273:3: error: 'copy_n' is not a member of 'std' > std::copy_n(src.sparse_.data(), src.max_size(), sparse_.data()); > ^ > > Fixes: > - http://autobuild.buildroot.org/results/8ebbac67f32fe24416a1f72aad0afd42b567b403 > > Signed-off-by: Fabrice Fontaine > --- > package/re2/re2.mk | 15 ++++++++++----- > 1 file changed, 10 insertions(+), 5 deletions(-) > > diff --git a/package/re2/re2.mk b/package/re2/re2.mk > index 41392cb179..cc5fed71fa 100644 > --- a/package/re2/re2.mk > +++ b/package/re2/re2.mk > @@ -10,20 +10,25 @@ RE2_LICENSE = BSD-3-Clause > RE2_LICENSE_FILES = LICENSE > RE2_INSTALL_STAGING = YES > > +RE2_MAKE_OPTS = \ > + $(TARGET_CONFIGURE_OPTS) \ > + CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" \ > + prefix=/usr Is there a reason to have 'prefix' be set during the build, instead of just the install steps? Regards, Yann E. MORIN. > define RE2_BUILD_CMDS > - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ > + $(TARGET_MAKE_ENV) $(MAKE) $(RE2_MAKE_OPTS) \ > -C $(@D) $(if $(BR2_STATIC_LIBS),static) > endef > > define RE2_INSTALL_STAGING_CMDS > - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ > - DESTDIR="$(STAGING_DIR)" prefix=/usr -C $(@D) \ > + $(TARGET_MAKE_ENV) $(MAKE) $(RE2_MAKE_OPTS) \ > + DESTDIR="$(STAGING_DIR)" -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) \ > + $(TARGET_MAKE_ENV) $(MAKE) $(RE2_MAKE_OPTS) \ > + DESTDIR="$(TARGET_DIR)" -C $(@D) \ > $(if $(BR2_STATIC_LIBS),static-install,install) > endef > > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From arnout at mind.be Mon Feb 21 20:02:30 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 21 Feb 2022 21:02:30 +0100 Subject: [Buildroot] building uclibc based toolchain with buildroot In-Reply-To: References: Message-ID: On 21/02/2022 11:48, Rezaei Vahid wrote: > hi > I want to compile a C++17 library for my board. > the toolchain that comes with my board SDK does not support C++17. > I want to build a uclibc based toolchain with buildroot. > I am following this tutorial > https://www.uclibc.org/toolchains.html > the old toolchain configuration. > arch? ? ? ? ? ?arm > mcpu? ? ? ? ? cortex-a7 > mfloat-abi? ?softfp > mfpu? ? ? ? ? ?neon_vfpv4 > no_aggrasive_loop_optimizations > > kernel? 3.18.20 > uclibc? 0.9.33.2 > > gcc 4.9.2 ----(which I want to upgrade to a version that supports C++17 ) > > which? I have Uclibc rootfs (uclibc 0.9.33.2), I have to build toolchain with > uclibc 0.9.33 how can I specify the version of uclibc of the toolchain? It is not possible with Buildroot to specify an old version of uClibc, the latest uClibc-NG release is always used. Since uClibc has no ABI stability guarantee, there's no way to compile a program against one version of uClibc and run it with a different uClibc. It may work, but it may also fail to work in weird and hard-to-debug ways. So your options are: - Build a complete rootfs with Buildroot. - Create an SDK that includes your library and build it for static linking only. - Put your library in a "container" image that includes uClibc and other libraries you want to link agains. It doesn't need to be an actual container, you just need to bind-mount /proc and /sys and chroot into it. Regards, Arnout From yegorslists at googlemail.com Mon Feb 21 20:11:59 2022 From: yegorslists at googlemail.com (Yegor Yefremov) Date: Mon, 21 Feb 2022 21:11:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/modem-manager: bump version to 1.16.10 In-Reply-To: <20220221192302.20698-1-petr.vorel@gmail.com> References: <20220221192302.20698-1-petr.vorel@gmail.com> Message-ID: Hi Petr, On Mon, Feb 21, 2022 at 8:23 PM Petr Vorel wrote: > > Signed-off-by: Petr Vorel > --- > 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]: FAILED # not related to this change > 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 > > package/modem-manager/modem-manager.hash | 2 +- > package/modem-manager/modem-manager.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/modem-manager/modem-manager.hash b/package/modem-manager/modem-manager.hash > index 14597215df..ea91f42fe0 100644 > --- a/package/modem-manager/modem-manager.hash > +++ b/package/modem-manager/modem-manager.hash > @@ -1,4 +1,4 @@ > # Locally computed > -sha256 2ccf1f716c2d121e8e6709bcf8af29ee86971a90adacca2e8d6288b30278862e ModemManager-1.16.10.tar.xz > +sha256 d4f804b31cf504239c5f1d4973c62095c00cba1ee9abb503718dac6d146a470a ModemManager-1.18.6.tar.xz > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB > diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk > index a881edc272..d7e2c55bf8 100644 > --- a/package/modem-manager/modem-manager.mk > +++ b/package/modem-manager/modem-manager.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -MODEM_MANAGER_VERSION = 1.16.10 > +MODEM_MANAGER_VERSION = 1.18.6 > MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.xz > MODEM_MANAGER_SITE = http://www.freedesktop.org/software/ModemManager > MODEM_MANAGER_LICENSE = GPL-2.0+ (programs, plugins), LGPL-2.0+ (libmm-glib) > -- > 2.35.1 The patch title should be about version 1.18.6 and not 1.16.10. Yegor From yann.morin.1998 at free.fr Mon Feb 21 20:42:35 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 21 Feb 2022 21:42:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/flac: security bump to version 1.3.4 In-Reply-To: <20220221172621.1937610-1-fontaine.fabrice@gmail.com> References: <20220221172621.1937610-1-fontaine.fabrice@gmail.com> Message-ID: <20220221204235.GB2166282@scaer> Fabrice, All, On 2022-02-21 18:26 +0100, Fabrice Fontaine spake thusly: > This release mostly fixes (security related) bugs including: > - Fix 12 decoder bugs found by oss-fuzz, including CVE-2020-0499 > - Fix encoder bug CVE-2021-0561 > > Also: > - Replace first patch which was reverted by > https://github.com/xiph/flac/commit/4fbb6d4f2ecf2a96c17ea9880108409f852c08a9 You removed that patch entirely, but forgot to drop FLAC_AUTORECONF=YES. I had a look at that upstream commit, and I was wondering how they got to fix that build issue if they reverted the patch. And indeed it is not fixed and still happens: cpu.c:58:10: fatal error: sys/auxv.h: No such file or directory #include ^~~~~~~~~~~~ compilation terminated. make[6]: *** [Makefile:739: cpu.lo] Error 1 make[5]: *** [Makefile:796: all-recursive] Error 1 make[4]: *** [Makefile:435: all-recursive] Error 1 make[3]: *** [Makefile:500: all-recursive] Error 1 make[2]: *** [Makefile:432: all] Error 2 So we need to adapt that patch instead of dropping it (and thus we need to keep AUTORECONF=YES, of course). Regards, Yann E. MORIN. > - Disable stack protection (enabled by default since > https://github.com/xiph/flac/commit/f706f2832270a0b7851cdffe62ad37acda9423fe) > - Drop md5 which is not provided anymore > - Update indentation in hash file (two spaces) > > https://github.com/xiph/flac/releases/tag/1.3.4 > > Signed-off-by: Fabrice Fontaine > --- > ...ck-for-sys-auxv.h-before-defining-FL.patch | 36 ------------------- > package/flac/flac.hash | 12 +++---- > package/flac/flac.mk | 5 +-- > 3 files changed, 8 insertions(+), 45 deletions(-) > delete mode 100644 package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch > > diff --git a/package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch b/package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch > deleted file mode 100644 > index d1398d4b3e..0000000000 > --- a/package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch > +++ /dev/null > @@ -1,36 +0,0 @@ > -From 14a0713389fbfef59225d027ea466ebb478a8c6b Mon Sep 17 00:00:00 2001 > -From: Peter Seiderer > -Date: Thu, 19 Sep 2019 21:18:04 +0200 > -Subject: [PATCH] configure.ac: check for sys/auxv.h before defining FLAC__CPU_PPC > - > -Upstream: https://github.com/xiph/flac/pull/142 > -Signed-off-by: Peter Seiderer > ---- > - configure.ac | 4 ++-- > - 1 file changed, 2 insertions(+), 2 deletions(-) > - > -diff --git a/configure.ac b/configure.ac > -index 0228a12..64cb3f2 100644 > ---- a/configure.ac > -+++ b/configure.ac > -@@ -144,7 +144,7 @@ case "$host_cpu" in > - powerpc64|powerpc64le) > - cpu_ppc64=true > - cpu_ppc=true > -- AC_DEFINE(FLAC__CPU_PPC) > -+ AC_CHECK_HEADER(sys/auxv.h, AC_DEFINE(FLAC__CPU_PPC)) > - AH_TEMPLATE(FLAC__CPU_PPC, [define if building for PowerPC]) > - AC_DEFINE(FLAC__CPU_PPC64) > - AH_TEMPLATE(FLAC__CPU_PPC64, [define if building for PowerPC64]) > -@@ -152,7 +152,7 @@ case "$host_cpu" in > - ;; > - powerpc|powerpcle) > - cpu_ppc=true > -- AC_DEFINE(FLAC__CPU_PPC) > -+ AC_CHECK_HEADER(sys/auxv.h, AC_DEFINE(FLAC__CPU_PPC)) > - AH_TEMPLATE(FLAC__CPU_PPC, [define if building for PowerPC]) > - asm_optimisation=$asm_opt > - ;; > --- > -2.23.0 > - > diff --git a/package/flac/flac.hash b/package/flac/flac.hash > index df7c2d1b95..2444535e0f 100644 > --- a/package/flac/flac.hash > +++ b/package/flac/flac.hash > @@ -1,10 +1,8 @@ > -# From https://ftp.osuosl.org/pub/xiph/releases/flac/MD5SUMS > -md5 26703ed2858c1fc9ffc05136d13daa69 flac-1.3.3.tar.xz > # From https://ftp.osuosl.org/pub/xiph/releases/flac/SHA1SUMS > -sha1 6ac2e8f1dd18c9b0214c4d81bd70cdc1e943cffe flac-1.3.3.tar.xz > +sha1 99c28482a8b2d81deaf740639e4cb55658427420 flac-1.3.4.tar.xz > # From http://downloads.xiph.org/releases/flac/SHA256SUMS.txt > -sha256 213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748 flac-1.3.3.tar.xz > +sha256 8ff0607e75a322dd7cd6ec48f4f225471404ae2730d0ea945127b1355155e737 flac-1.3.4.tar.xz > # Locally computed > -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL > -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LGPL > -sha256 fa27cb11f13f97b0c5f3ff363b1e2610c6efe87ed175779cb2a78e44eb19d34c COPYING.Xiph > +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL > +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LGPL > +sha256 fa27cb11f13f97b0c5f3ff363b1e2610c6efe87ed175779cb2a78e44eb19d34c COPYING.Xiph > diff --git a/package/flac/flac.mk b/package/flac/flac.mk > index 9aa00b7ffd..2ff048b6e6 100644 > --- a/package/flac/flac.mk > +++ b/package/flac/flac.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -FLAC_VERSION = 1.3.3 > +FLAC_VERSION = 1.3.4 > FLAC_SITE = http://downloads.xiph.org/releases/flac > FLAC_SOURCE = flac-$(FLAC_VERSION).tar.xz > FLAC_INSTALL_STAGING = YES > @@ -19,7 +19,8 @@ FLAC_AUTORECONF = YES > FLAC_CONF_OPTS = \ > $(if $(BR2_INSTALL_LIBSTDCPP),--enable-cpplibs,--disable-cpplibs) \ > --disable-xmms-plugin \ > - --disable-altivec > + --disable-altivec \ > + --disable-stack-smash-protection > > ifeq ($(BR2_PACKAGE_LIBOGG),y) > FLAC_CONF_OPTS += --with-ogg=$(STAGING_DIR)/usr > -- > 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 Mon Feb 21 20:49:41 2022 From: romain.naour at gmail.com (Romain Naour) Date: Mon, 21 Feb 2022 21:49:41 +0100 Subject: [Buildroot] [PATCH] support/testing/../sample_python_pyyaml_dec.py: unbreak after move to pyaml 6.0 In-Reply-To: <20220220211055.1273368-1-peter@korsgaard.com> References: <20220220211055.1273368-1-peter@korsgaard.com> Message-ID: <57f6d974-4c01-908a-3895-e64a64ef67f8@gmail.com> Hi Peter, Le 20/02/2022 ? 22:10, Peter Korsgaard a ?crit?: > Fixes https://gitlab.com/buildroot.org/buildroot/-/jobs/2088684091 > > python sample_python_pyyaml_dec.py > Traceback (most recent call last): > File "/root/sample_python_pyyaml_dec.py", line 5, in > data = yaml.load(serialized) > TypeError: load() missing 1 required positional argument: 'Loader' > > yaml.load() requires a loader argument since the move to version 6.0: > https://github.com/yaml/pyyaml/pull/561 > > The test does not need the extra functionality of load(), so instead move to > the recommended safe_load(). > > Signed-off-by: Peter Korsgaard I did the same change while investigating this issue before replying to: http://lists.busybox.net/pipermail/buildroot/2022-February/637414.html Tested-by: Romain Naour Best regards, Romain > --- > support/testing/tests/package/sample_python_pyyaml_dec.py | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/support/testing/tests/package/sample_python_pyyaml_dec.py b/support/testing/tests/package/sample_python_pyyaml_dec.py > index 9ab8931197..bb90934f26 100644 > --- a/support/testing/tests/package/sample_python_pyyaml_dec.py > +++ b/support/testing/tests/package/sample_python_pyyaml_dec.py > @@ -2,7 +2,7 @@ import yaml > > with open("/tmp/data.yml", "rb") as f: > serialized = f.read() > -data = yaml.load(serialized) > +data = yaml.safe_load(serialized) > print(data) > assert(data["name"] == "python-pyyaml") > assert(data["versions"] == ["1", "2"]) From peter at korsgaard.com Mon Feb 21 20:56:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Feb 2022 21:56:40 +0100 Subject: [Buildroot] [PATCH] support/testing/../sample_python_pyyaml_dec.py: unbreak after move to pyaml 6.0 In-Reply-To: <20220220211055.1273368-1-peter@korsgaard.com> (Peter Korsgaard's message of "Sun, 20 Feb 2022 22:10:54 +0100") References: <20220220211055.1273368-1-peter@korsgaard.com> Message-ID: <8735kc7xbr.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Fixes https://gitlab.com/buildroot.org/buildroot/-/jobs/2088684091 > python sample_python_pyyaml_dec.py > Traceback (most recent call last): > File "/root/sample_python_pyyaml_dec.py", line 5, in > data = yaml.load(serialized) > TypeError: load() missing 1 required positional argument: 'Loader' > yaml.load() requires a loader argument since the move to version 6.0: > https://github.com/yaml/pyyaml/pull/561 > The test does not need the extra functionality of load(), so instead move to > the recommended safe_load(). > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 21 20:56:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Feb 2022 21:56:34 +0100 Subject: [Buildroot] [git commit] support/testing/../sample_python_pyyaml_dec.py: unbreak after move to pyaml 6.0 Message-ID: <20220221204906.BB0BA8110D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a83177aac627764fb7ab5dc6bd87646586598934 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes https://gitlab.com/buildroot.org/buildroot/-/jobs/2088684091 python sample_python_pyyaml_dec.py Traceback (most recent call last): File "/root/sample_python_pyyaml_dec.py", line 5, in data = yaml.load(serialized) TypeError: load() missing 1 required positional argument: 'Loader' yaml.load() requires a loader argument since the move to version 6.0: https://github.com/yaml/pyyaml/pull/561 The test does not need the extra functionality of load(), so instead move to the recommended safe_load(). Signed-off-by: Peter Korsgaard Tested-by: Romain Naour Signed-off-by: Peter Korsgaard --- support/testing/tests/package/sample_python_pyyaml_dec.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/package/sample_python_pyyaml_dec.py b/support/testing/tests/package/sample_python_pyyaml_dec.py index 9ab8931197..bb90934f26 100644 --- a/support/testing/tests/package/sample_python_pyyaml_dec.py +++ b/support/testing/tests/package/sample_python_pyyaml_dec.py @@ -2,7 +2,7 @@ import yaml with open("/tmp/data.yml", "rb") as f: serialized = f.read() -data = yaml.load(serialized) +data = yaml.safe_load(serialized) print(data) assert(data["name"] == "python-pyyaml") assert(data["versions"] == ["1", "2"]) From ps.report at gmx.net Mon Feb 21 21:07:45 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Mon, 21 Feb 2022 22:07:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/flac: security bump to version 1.3.4 In-Reply-To: <20220221204235.GB2166282@scaer> References: <20220221172621.1937610-1-fontaine.fabrice@gmail.com> <20220221204235.GB2166282@scaer> Message-ID: <20220221220745.3fb583e5@gmx.net> Hello Fabice, Yann, On Mon, 21 Feb 2022 21:42:35 +0100, "Yann E. MORIN" wrote: > Fabrice, All, > > On 2022-02-21 18:26 +0100, Fabrice Fontaine spake thusly: > > This release mostly fixes (security related) bugs including: > > - Fix 12 decoder bugs found by oss-fuzz, including CVE-2020-0499 > > - Fix encoder bug CVE-2021-0561 > > > > Also: > > - Replace first patch which was reverted by > > https://github.com/xiph/flac/commit/4fbb6d4f2ecf2a96c17ea9880108409f852c08a9 > > You removed that patch entirely, but forgot to drop FLAC_AUTORECONF=YES. > > I had a look at that upstream commit, and I was wondering how they got > to fix that build issue if they reverted the patch. And indeed it is not > fixed and still happens: > > cpu.c:58:10: fatal error: sys/auxv.h: No such file or directory > #include > ^~~~~~~~~~~~ > compilation terminated. > make[6]: *** [Makefile:739: cpu.lo] Error 1 > make[5]: *** [Makefile:796: all-recursive] Error 1 > make[4]: *** [Makefile:435: all-recursive] Error 1 > make[3]: *** [Makefile:500: all-recursive] Error 1 > make[2]: *** [Makefile:432: all] Error 2 > > So we need to adapt that patch instead of dropping it (and thus we need > to keep AUTORECONF=YES, of course). Same conclusion/test from my side..., just keeping the patch (and autoreconf) works... Regards, Peter > > Regards, > Yann E. MORIN. > > > - Disable stack protection (enabled by default since > > https://github.com/xiph/flac/commit/f706f2832270a0b7851cdffe62ad37acda9423fe) > > - Drop md5 which is not provided anymore > > - Update indentation in hash file (two spaces) > > > > https://github.com/xiph/flac/releases/tag/1.3.4 > > > > Signed-off-by: Fabrice Fontaine > > --- > > ...ck-for-sys-auxv.h-before-defining-FL.patch | 36 ------------------- > > package/flac/flac.hash | 12 +++---- > > package/flac/flac.mk | 5 +-- > > 3 files changed, 8 insertions(+), 45 deletions(-) > > delete mode 100644 package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch > > > > diff --git a/package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch b/package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch > > deleted file mode 100644 > > index d1398d4b3e..0000000000 > > --- a/package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch > > +++ /dev/null > > @@ -1,36 +0,0 @@ > > -From 14a0713389fbfef59225d027ea466ebb478a8c6b Mon Sep 17 00:00:00 2001 > > -From: Peter Seiderer > > -Date: Thu, 19 Sep 2019 21:18:04 +0200 > > -Subject: [PATCH] configure.ac: check for sys/auxv.h before defining FLAC__CPU_PPC > > - > > -Upstream: https://github.com/xiph/flac/pull/142 > > -Signed-off-by: Peter Seiderer > > ---- > > - configure.ac | 4 ++-- > > - 1 file changed, 2 insertions(+), 2 deletions(-) > > - > > -diff --git a/configure.ac b/configure.ac > > -index 0228a12..64cb3f2 100644 > > ---- a/configure.ac > > -+++ b/configure.ac > > -@@ -144,7 +144,7 @@ case "$host_cpu" in > > - powerpc64|powerpc64le) > > - cpu_ppc64=true > > - cpu_ppc=true > > -- AC_DEFINE(FLAC__CPU_PPC) > > -+ AC_CHECK_HEADER(sys/auxv.h, AC_DEFINE(FLAC__CPU_PPC)) > > - AH_TEMPLATE(FLAC__CPU_PPC, [define if building for PowerPC]) > > - AC_DEFINE(FLAC__CPU_PPC64) > > - AH_TEMPLATE(FLAC__CPU_PPC64, [define if building for PowerPC64]) > > -@@ -152,7 +152,7 @@ case "$host_cpu" in > > - ;; > > - powerpc|powerpcle) > > - cpu_ppc=true > > -- AC_DEFINE(FLAC__CPU_PPC) > > -+ AC_CHECK_HEADER(sys/auxv.h, AC_DEFINE(FLAC__CPU_PPC)) > > - AH_TEMPLATE(FLAC__CPU_PPC, [define if building for PowerPC]) > > - asm_optimisation=$asm_opt > > - ;; > > --- > > -2.23.0 > > - > > diff --git a/package/flac/flac.hash b/package/flac/flac.hash > > index df7c2d1b95..2444535e0f 100644 > > --- a/package/flac/flac.hash > > +++ b/package/flac/flac.hash > > @@ -1,10 +1,8 @@ > > -# From https://ftp.osuosl.org/pub/xiph/releases/flac/MD5SUMS > > -md5 26703ed2858c1fc9ffc05136d13daa69 flac-1.3.3.tar.xz > > # From https://ftp.osuosl.org/pub/xiph/releases/flac/SHA1SUMS > > -sha1 6ac2e8f1dd18c9b0214c4d81bd70cdc1e943cffe flac-1.3.3.tar.xz > > +sha1 99c28482a8b2d81deaf740639e4cb55658427420 flac-1.3.4.tar.xz > > # From http://downloads.xiph.org/releases/flac/SHA256SUMS.txt > > -sha256 213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748 flac-1.3.3.tar.xz > > +sha256 8ff0607e75a322dd7cd6ec48f4f225471404ae2730d0ea945127b1355155e737 flac-1.3.4.tar.xz > > # Locally computed > > -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL > > -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LGPL > > -sha256 fa27cb11f13f97b0c5f3ff363b1e2610c6efe87ed175779cb2a78e44eb19d34c COPYING.Xiph > > +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL > > +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LGPL > > +sha256 fa27cb11f13f97b0c5f3ff363b1e2610c6efe87ed175779cb2a78e44eb19d34c COPYING.Xiph > > diff --git a/package/flac/flac.mk b/package/flac/flac.mk > > index 9aa00b7ffd..2ff048b6e6 100644 > > --- a/package/flac/flac.mk > > +++ b/package/flac/flac.mk > > @@ -4,7 +4,7 @@ > > # > > ################################################################################ > > > > -FLAC_VERSION = 1.3.3 > > +FLAC_VERSION = 1.3.4 > > FLAC_SITE = http://downloads.xiph.org/releases/flac > > FLAC_SOURCE = flac-$(FLAC_VERSION).tar.xz > > FLAC_INSTALL_STAGING = YES > > @@ -19,7 +19,8 @@ FLAC_AUTORECONF = YES > > FLAC_CONF_OPTS = \ > > $(if $(BR2_INSTALL_LIBSTDCPP),--enable-cpplibs,--disable-cpplibs) \ > > --disable-xmms-plugin \ > > - --disable-altivec > > + --disable-altivec \ > > + --disable-stack-smash-protection > > > > ifeq ($(BR2_PACKAGE_LIBOGG),y) > > FLAC_CONF_OPTS += --with-ogg=$(STAGING_DIR)/usr > > -- > > 2.34.1 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > From ps.report at gmx.net Mon Feb 21 21:39:33 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Mon, 21 Feb 2022 22:39:33 +0100 Subject: [Buildroot] [PATCH v1] package/libinput: bump version to 1.20.0 Message-ID: <20220221213933.457-1-ps.report@gmx.net> - change site URL to new gitlab.freedesktop.org location - change hash from upstream provided to locally computed (and drop sha512) For details see [1] and [2]. [1] https://lists.freedesktop.org/archives/wayland-devel/2022-February/042111.html [2] https://gitlab.freedesktop.org/libinput/libinput/-/releases/1.20.0 Signed-off-by: Peter Seiderer --- package/libinput/libinput.hash | 5 ++--- package/libinput/libinput.mk | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/libinput/libinput.hash b/package/libinput/libinput.hash index f18a727810..d1c7cfb104 100644 --- a/package/libinput/libinput.hash +++ b/package/libinput/libinput.hash @@ -1,6 +1,5 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2021-December/042068.html -sha256 3cae78ccde19d7d0f387e58bc734d4d17ab5f6426f54a9e8b728c90b17baa068 libinput-1.19.3.tar.xz -sha512 f4b776d0da78c687ba21b430a04941ac6b43f68970c82ec9f7360358fdea5ed6a873948ce66a25bcdd64d4b95fa4bf705cc24dbc25c7c0f5fd2d0efbd763f298 libinput-1.19.3.tar.xz +# Locally computed +sha256 6c1f97892a7d599f97349e5e7c1239901fe00edcd4f6289f410034d5dc06cc85 libinput-1.20.0.tar.bz2 # License files sha256 80de50b2022a840db044c56db804ca3565600a692c0714babface587acc6d1b0 COPYING diff --git a/package/libinput/libinput.mk b/package/libinput/libinput.mk index 2f9c639c22..b814e3416d 100644 --- a/package/libinput/libinput.mk +++ b/package/libinput/libinput.mk @@ -4,9 +4,9 @@ # ################################################################################ -LIBINPUT_VERSION = 1.19.3 -LIBINPUT_SOURCE = libinput-$(LIBINPUT_VERSION).tar.xz -LIBINPUT_SITE = http://www.freedesktop.org/software/libinput +LIBINPUT_VERSION = 1.20.0 +LIBINPUT_SOURCE = libinput-$(LIBINPUT_VERSION).tar.bz2 +LIBINPUT_SITE = https://gitlab.freedesktop.org/libinput/libinput/-/archive/$(LIBINPUT_VERSION) LIBINPUT_DEPENDENCIES = host-pkgconf libevdev mtdev udev LIBINPUT_INSTALL_STAGING = YES LIBINPUT_LICENSE = MIT -- 2.35.1 From romain.naour at gmail.com Mon Feb 21 21:57:02 2022 From: romain.naour at gmail.com (Romain Naour) Date: Mon, 21 Feb 2022 22:57:02 +0100 Subject: [Buildroot] [PATCH] package/python-twisted: add missing python typing extensions runtime dependency Message-ID: <20220221215702.8461-1-romain.naour@gmail.com> # python sample_python_txtorcon.py Traceback (most recent call last): File "/root/sample_python_txtorcon.py", line 1, in import txtorcon # noqa File "/usr/lib/python3.10/site-packages/txtorcon/__init__.py", line 11, in File "/usr/lib/python3.10/site-packages/txtorcon/router.py", line 10, in File "/usr/lib/python3.10/site-packages/txtorcon/util.py", line 17, in File "/usr/lib/python3.10/site-packages/twisted/internet/defer.py", line 42, in ModuleNotFoundError: No module named 'typing_extensions' python typing_extensions is required since python-twisted 22.1.0 [1] Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202537 [1] https://github.com/twisted/twisted/commit/6e768da0a10c8ab42a57a1c0fa505ebe2d8bfb30 Signed-off-by: Romain Naour --- package/python-twisted/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-twisted/Config.in b/package/python-twisted/Config.in index 49a21c4204..8596025e9c 100644 --- a/package/python-twisted/Config.in +++ b/package/python-twisted/Config.in @@ -7,6 +7,7 @@ config BR2_PACKAGE_PYTHON_TWISTED select BR2_PACKAGE_PYTHON_HYPERLINK # runtime select BR2_PACKAGE_PYTHON_PYHAMCREST # runtime select BR2_PACKAGE_PYTHON_ZOPE_INTERFACE # runtime + select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime help Twisted is an event-driven networking engine written in Python. -- 2.35.1 From fontaine.fabrice at gmail.com Mon Feb 21 21:58:20 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 21 Feb 2022 22:58:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/flac: security bump to version 1.3.4 In-Reply-To: <20220221220745.3fb583e5@gmx.net> References: <20220221172621.1937610-1-fontaine.fabrice@gmail.com> <20220221204235.GB2166282@scaer> <20220221220745.3fb583e5@gmx.net> Message-ID: Hello, Le lun. 21 f?vr. 2022 ? 22:07, Peter Seiderer a ?crit : > > Hello Fabice, Yann, > > On Mon, 21 Feb 2022 21:42:35 +0100, "Yann E. MORIN" wrote: > > > Fabrice, All, > > > > On 2022-02-21 18:26 +0100, Fabrice Fontaine spake thusly: > > > This release mostly fixes (security related) bugs including: > > > - Fix 12 decoder bugs found by oss-fuzz, including CVE-2020-0499 > > > - Fix encoder bug CVE-2021-0561 > > > > > > Also: > > > - Replace first patch which was reverted by > > > https://github.com/xiph/flac/commit/4fbb6d4f2ecf2a96c17ea9880108409f852c08a9 > > > > You removed that patch entirely, but forgot to drop FLAC_AUTORECONF=YES. > > > > I had a look at that upstream commit, and I was wondering how they got > > to fix that build issue if they reverted the patch. And indeed it is not > > fixed and still happens: > > > > cpu.c:58:10: fatal error: sys/auxv.h: No such file or directory > > #include > > ^~~~~~~~~~~~ > > compilation terminated. > > make[6]: *** [Makefile:739: cpu.lo] Error 1 > > make[5]: *** [Makefile:796: all-recursive] Error 1 > > make[4]: *** [Makefile:435: all-recursive] Error 1 > > make[3]: *** [Makefile:500: all-recursive] Error 1 > > make[2]: *** [Makefile:432: all] Error 2 > > > > So we need to adapt that patch instead of dropping it (and thus we need > > to keep AUTORECONF=YES, of course). > > Same conclusion/test from my side..., just keeping the patch (and autoreconf) works... I forgot to add my own patch. I'll send a v2. > > Regards, > Peter > > > > > > Regards, > > Yann E. MORIN. > > > > > - Disable stack protection (enabled by default since > > > https://github.com/xiph/flac/commit/f706f2832270a0b7851cdffe62ad37acda9423fe) > > > - Drop md5 which is not provided anymore > > > - Update indentation in hash file (two spaces) > > > > > > https://github.com/xiph/flac/releases/tag/1.3.4 > > > > > > Signed-off-by: Fabrice Fontaine > > > --- > > > ...ck-for-sys-auxv.h-before-defining-FL.patch | 36 ------------------- > > > package/flac/flac.hash | 12 +++---- > > > package/flac/flac.mk | 5 +-- > > > 3 files changed, 8 insertions(+), 45 deletions(-) > > > delete mode 100644 package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch > > > > > > diff --git a/package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch b/package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch > > > deleted file mode 100644 > > > index d1398d4b3e..0000000000 > > > --- a/package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch > > > +++ /dev/null > > > @@ -1,36 +0,0 @@ > > > -From 14a0713389fbfef59225d027ea466ebb478a8c6b Mon Sep 17 00:00:00 2001 > > > -From: Peter Seiderer > > > -Date: Thu, 19 Sep 2019 21:18:04 +0200 > > > -Subject: [PATCH] configure.ac: check for sys/auxv.h before defining FLAC__CPU_PPC > > > - > > > -Upstream: https://github.com/xiph/flac/pull/142 > > > -Signed-off-by: Peter Seiderer > > > ---- > > > - configure.ac | 4 ++-- > > > - 1 file changed, 2 insertions(+), 2 deletions(-) > > > - > > > -diff --git a/configure.ac b/configure.ac > > > -index 0228a12..64cb3f2 100644 > > > ---- a/configure.ac > > > -+++ b/configure.ac > > > -@@ -144,7 +144,7 @@ case "$host_cpu" in > > > - powerpc64|powerpc64le) > > > - cpu_ppc64=true > > > - cpu_ppc=true > > > -- AC_DEFINE(FLAC__CPU_PPC) > > > -+ AC_CHECK_HEADER(sys/auxv.h, AC_DEFINE(FLAC__CPU_PPC)) > > > - AH_TEMPLATE(FLAC__CPU_PPC, [define if building for PowerPC]) > > > - AC_DEFINE(FLAC__CPU_PPC64) > > > - AH_TEMPLATE(FLAC__CPU_PPC64, [define if building for PowerPC64]) > > > -@@ -152,7 +152,7 @@ case "$host_cpu" in > > > - ;; > > > - powerpc|powerpcle) > > > - cpu_ppc=true > > > -- AC_DEFINE(FLAC__CPU_PPC) > > > -+ AC_CHECK_HEADER(sys/auxv.h, AC_DEFINE(FLAC__CPU_PPC)) > > > - AH_TEMPLATE(FLAC__CPU_PPC, [define if building for PowerPC]) > > > - asm_optimisation=$asm_opt > > > - ;; > > > --- > > > -2.23.0 > > > - > > > diff --git a/package/flac/flac.hash b/package/flac/flac.hash > > > index df7c2d1b95..2444535e0f 100644 > > > --- a/package/flac/flac.hash > > > +++ b/package/flac/flac.hash > > > @@ -1,10 +1,8 @@ > > > -# From https://ftp.osuosl.org/pub/xiph/releases/flac/MD5SUMS > > > -md5 26703ed2858c1fc9ffc05136d13daa69 flac-1.3.3.tar.xz > > > # From https://ftp.osuosl.org/pub/xiph/releases/flac/SHA1SUMS > > > -sha1 6ac2e8f1dd18c9b0214c4d81bd70cdc1e943cffe flac-1.3.3.tar.xz > > > +sha1 99c28482a8b2d81deaf740639e4cb55658427420 flac-1.3.4.tar.xz > > > # From http://downloads.xiph.org/releases/flac/SHA256SUMS.txt > > > -sha256 213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748 flac-1.3.3.tar.xz > > > +sha256 8ff0607e75a322dd7cd6ec48f4f225471404ae2730d0ea945127b1355155e737 flac-1.3.4.tar.xz > > > # Locally computed > > > -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL > > > -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LGPL > > > -sha256 fa27cb11f13f97b0c5f3ff363b1e2610c6efe87ed175779cb2a78e44eb19d34c COPYING.Xiph > > > +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL > > > +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LGPL > > > +sha256 fa27cb11f13f97b0c5f3ff363b1e2610c6efe87ed175779cb2a78e44eb19d34c COPYING.Xiph > > > diff --git a/package/flac/flac.mk b/package/flac/flac.mk > > > index 9aa00b7ffd..2ff048b6e6 100644 > > > --- a/package/flac/flac.mk > > > +++ b/package/flac/flac.mk > > > @@ -4,7 +4,7 @@ > > > # > > > ################################################################################ > > > > > > -FLAC_VERSION = 1.3.3 > > > +FLAC_VERSION = 1.3.4 > > > FLAC_SITE = http://downloads.xiph.org/releases/flac > > > FLAC_SOURCE = flac-$(FLAC_VERSION).tar.xz > > > FLAC_INSTALL_STAGING = YES > > > @@ -19,7 +19,8 @@ FLAC_AUTORECONF = YES > > > FLAC_CONF_OPTS = \ > > > $(if $(BR2_INSTALL_LIBSTDCPP),--enable-cpplibs,--disable-cpplibs) \ > > > --disable-xmms-plugin \ > > > - --disable-altivec > > > + --disable-altivec \ > > > + --disable-stack-smash-protection > > > > > > ifeq ($(BR2_PACKAGE_LIBOGG),y) > > > FLAC_CONF_OPTS += --with-ogg=$(STAGING_DIR)/usr > > > -- > > > 2.34.1 > > > > > > _______________________________________________ > > > buildroot mailing list > > > buildroot at buildroot.org > > > https://lists.buildroot.org/mailman/listinfo/buildroot > > > Best Regards, Fabrice From fontaine.fabrice at gmail.com Mon Feb 21 22:00:25 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 21 Feb 2022 23:00:25 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/flac: security bump to version 1.3.4 Message-ID: <20220221220025.2198034-1-fontaine.fabrice@gmail.com> This release mostly fixes (security related) bugs including: - Fix 12 decoder bugs found by oss-fuzz, including CVE-2020-0499 - Fix encoder bug CVE-2021-0561 Also: - Replace first patch which was reverted by https://github.com/xiph/flac/commit/4fbb6d4f2ecf2a96c17ea9880108409f852c08a9 - Disable stack protection (enabled by default since https://github.com/xiph/flac/commit/f706f2832270a0b7851cdffe62ad37acda9423fe) - Drop md5 which is not provided anymore - Update indentation in hash file (two spaces) https://github.com/xiph/flac/releases/tag/1.3.4 Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2 (after review of Yann E. Morin and Peter Seiderer): - Add upstream patch package/flac/0001-Fix-uclibc-build.patch | 81 +++++++++++++++++++ ...ck-for-sys-auxv.h-before-defining-FL.patch | 36 --------- package/flac/flac.hash | 12 ++- package/flac/flac.mk | 5 +- 4 files changed, 89 insertions(+), 45 deletions(-) create mode 100644 package/flac/0001-Fix-uclibc-build.patch delete mode 100644 package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch diff --git a/package/flac/0001-Fix-uclibc-build.patch b/package/flac/0001-Fix-uclibc-build.patch new file mode 100644 index 0000000000..fcba670fae --- /dev/null +++ b/package/flac/0001-Fix-uclibc-build.patch @@ -0,0 +1,81 @@ +From 4c62082f64132bfcbcb6569aa914c5ec283303f9 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 21 Feb 2022 18:21:11 +0100 +Subject: [PATCH] Fix uclibc build + +Commit 4fbb6d4f2ecf2a96c17ea9880108409f852c08a9 reverted commit +44036c9a9b45d03373fe90e9c112852bfc054c51 and so broke again the build on +uclibc + +So put back the sys/auxv.h check as well as a getauxval check in a way +that doesn't break iOS + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/xiph/flac/pull/292] +--- + configure.ac | 5 ++++- + src/libFLAC/cpu.c | 9 ++++----- + 2 files changed, 8 insertions(+), 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 4d7dc2e4..6f32fa45 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -69,7 +69,7 @@ AC_C_INLINE + AC_C_VARARRAYS + AC_C_TYPEOF + +-AC_CHECK_HEADERS([stdint.h inttypes.h byteswap.h sys/param.h sys/ioctl.h termios.h x86intrin.h cpuid.h]) ++AC_CHECK_HEADERS([stdint.h inttypes.h byteswap.h sys/auxv.h sys/param.h sys/ioctl.h termios.h x86intrin.h cpuid.h]) + + XIPH_C_BSWAP32 + XIPH_C_BSWAP16 +@@ -101,6 +101,9 @@ fi + # For the XMMS plugin. + AC_CHECK_TYPES(socklen_t, [], []) + ++dnl check for getauxval in standard library ++AC_CHECK_FUNCS(getauxval) ++ + dnl check for getopt in standard library + dnl AC_CHECK_FUNCS(getopt_long , , [LIBOBJS="$LIBOBJS getopt.o getopt1.o"] ) + AC_CHECK_FUNCS(getopt_long, [], []) +diff --git a/src/libFLAC/cpu.c b/src/libFLAC/cpu.c +index 8b92f4c7..64c6acad 100644 +--- a/src/libFLAC/cpu.c ++++ b/src/libFLAC/cpu.c +@@ -53,11 +53,9 @@ + #define dfprintf(file, format, ...) + #endif + +-#if defined FLAC__CPU_PPC +-#if defined(__linux__) || (defined(__FreeBSD__) && (__FreeBSD__ >= 12)) ++#if defined(HAVE_SYS_AUXV_H) + #include + #endif +-#endif + + #if (defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64) && (defined FLAC__HAS_NASM || FLAC__HAS_X86INTRIN) && !defined FLAC__NO_ASM + +@@ -247,7 +245,7 @@ ppc_cpu_info (FLAC__CPUInfo *info) + #define PPC_FEATURE2_ARCH_2_07 0x80000000 + #endif + +-#ifdef __linux__ ++#if defined (__linux__) && defined(HAVE_GETAUXVAL) + if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_3_00) { + info->ppc.arch_3_00 = true; + } else if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07) { +@@ -267,7 +265,8 @@ ppc_cpu_info (FLAC__CPUInfo *info) + info->ppc.arch_2_07 = false; + info->ppc.arch_3_00 = false; + #else +-#error Unsupported platform! Please add support for reading ppc hwcaps. ++ info->ppc.arch_2_07 = false; ++ info->ppc.arch_3_00 = false; + #endif + + #else +-- +2.34.1 + diff --git a/package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch b/package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch deleted file mode 100644 index d1398d4b3e..0000000000 --- a/package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 14a0713389fbfef59225d027ea466ebb478a8c6b Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 19 Sep 2019 21:18:04 +0200 -Subject: [PATCH] configure.ac: check for sys/auxv.h before defining FLAC__CPU_PPC - -Upstream: https://github.com/xiph/flac/pull/142 -Signed-off-by: Peter Seiderer ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 0228a12..64cb3f2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -144,7 +144,7 @@ case "$host_cpu" in - powerpc64|powerpc64le) - cpu_ppc64=true - cpu_ppc=true -- AC_DEFINE(FLAC__CPU_PPC) -+ AC_CHECK_HEADER(sys/auxv.h, AC_DEFINE(FLAC__CPU_PPC)) - AH_TEMPLATE(FLAC__CPU_PPC, [define if building for PowerPC]) - AC_DEFINE(FLAC__CPU_PPC64) - AH_TEMPLATE(FLAC__CPU_PPC64, [define if building for PowerPC64]) -@@ -152,7 +152,7 @@ case "$host_cpu" in - ;; - powerpc|powerpcle) - cpu_ppc=true -- AC_DEFINE(FLAC__CPU_PPC) -+ AC_CHECK_HEADER(sys/auxv.h, AC_DEFINE(FLAC__CPU_PPC)) - AH_TEMPLATE(FLAC__CPU_PPC, [define if building for PowerPC]) - asm_optimisation=$asm_opt - ;; --- -2.23.0 - diff --git a/package/flac/flac.hash b/package/flac/flac.hash index df7c2d1b95..2444535e0f 100644 --- a/package/flac/flac.hash +++ b/package/flac/flac.hash @@ -1,10 +1,8 @@ -# From https://ftp.osuosl.org/pub/xiph/releases/flac/MD5SUMS -md5 26703ed2858c1fc9ffc05136d13daa69 flac-1.3.3.tar.xz # From https://ftp.osuosl.org/pub/xiph/releases/flac/SHA1SUMS -sha1 6ac2e8f1dd18c9b0214c4d81bd70cdc1e943cffe flac-1.3.3.tar.xz +sha1 99c28482a8b2d81deaf740639e4cb55658427420 flac-1.3.4.tar.xz # From http://downloads.xiph.org/releases/flac/SHA256SUMS.txt -sha256 213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748 flac-1.3.3.tar.xz +sha256 8ff0607e75a322dd7cd6ec48f4f225471404ae2730d0ea945127b1355155e737 flac-1.3.4.tar.xz # Locally computed -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LGPL -sha256 fa27cb11f13f97b0c5f3ff363b1e2610c6efe87ed175779cb2a78e44eb19d34c COPYING.Xiph +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LGPL +sha256 fa27cb11f13f97b0c5f3ff363b1e2610c6efe87ed175779cb2a78e44eb19d34c COPYING.Xiph diff --git a/package/flac/flac.mk b/package/flac/flac.mk index 9aa00b7ffd..2ff048b6e6 100644 --- a/package/flac/flac.mk +++ b/package/flac/flac.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLAC_VERSION = 1.3.3 +FLAC_VERSION = 1.3.4 FLAC_SITE = http://downloads.xiph.org/releases/flac FLAC_SOURCE = flac-$(FLAC_VERSION).tar.xz FLAC_INSTALL_STAGING = YES @@ -19,7 +19,8 @@ FLAC_AUTORECONF = YES FLAC_CONF_OPTS = \ $(if $(BR2_INSTALL_LIBSTDCPP),--enable-cpplibs,--disable-cpplibs) \ --disable-xmms-plugin \ - --disable-altivec + --disable-altivec \ + --disable-stack-smash-protection ifeq ($(BR2_PACKAGE_LIBOGG),y) FLAC_CONF_OPTS += --with-ogg=$(STAGING_DIR)/usr -- 2.34.1 From fontaine.fabrice at gmail.com Mon Feb 21 22:05:02 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 21 Feb 2022 23:05:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/re2: fix build with gcc <= 5 In-Reply-To: <20220221200044.GA2166282@scaer> References: <20220221172900.1937856-1-fontaine.fabrice@gmail.com> <20220221200044.GA2166282@scaer> Message-ID: Yann, Le lun. 21 f?vr. 2022 ? 21:00, Yann E. MORIN a ?crit : > > Fabrice, All, > > On 2022-02-21 18:29 +0100, Fabrice Fontaine spake thusly: > > Fix the following build failure with gcc <= 5 raised since bump to > > version 2022-02-01 in commit d2cf91e0c6a082261cc7ebb06dfdbd7bc2c2956f > > and > > https://github.com/google/re2/commit/a022cc0c55b0519629d64d775e7a5195af34a477 > > > > ./re2/sparse_array.h:266:37: warning: defaulted and deleted functions only available with -std=c++11 or -std=gnu++11 > > SparseArray::SparseArray() = default; > > ^ > > ./re2/sparse_array.h: In copy constructor 're2::SparseArray::SparseArray(const re2::SparseArray&)': > > ./re2/sparse_array.h:273:3: error: 'copy_n' is not a member of 'std' > > std::copy_n(src.sparse_.data(), src.max_size(), sparse_.data()); > > ^ > > > > Fixes: > > - http://autobuild.buildroot.org/results/8ebbac67f32fe24416a1f72aad0afd42b567b403 > > > > Signed-off-by: Fabrice Fontaine > > --- > > package/re2/re2.mk | 15 ++++++++++----- > > 1 file changed, 10 insertions(+), 5 deletions(-) > > > > diff --git a/package/re2/re2.mk b/package/re2/re2.mk > > index 41392cb179..cc5fed71fa 100644 > > --- a/package/re2/re2.mk > > +++ b/package/re2/re2.mk > > @@ -10,20 +10,25 @@ RE2_LICENSE = BSD-3-Clause > > RE2_LICENSE_FILES = LICENSE > > RE2_INSTALL_STAGING = YES > > > > +RE2_MAKE_OPTS = \ > > + $(TARGET_CONFIGURE_OPTS) \ > > + CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" \ > > + prefix=/usr > > Is there a reason to have 'prefix' be set during the build, instead of > just the install steps? I thought it was better to have it in a single place but I'll send a v2. > > Regards, > Yann E. MORIN. > > > define RE2_BUILD_CMDS > > - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ > > + $(TARGET_MAKE_ENV) $(MAKE) $(RE2_MAKE_OPTS) \ > > -C $(@D) $(if $(BR2_STATIC_LIBS),static) > > endef > > > > define RE2_INSTALL_STAGING_CMDS > > - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ > > - DESTDIR="$(STAGING_DIR)" prefix=/usr -C $(@D) \ > > + $(TARGET_MAKE_ENV) $(MAKE) $(RE2_MAKE_OPTS) \ > > + DESTDIR="$(STAGING_DIR)" -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) \ > > + $(TARGET_MAKE_ENV) $(MAKE) $(RE2_MAKE_OPTS) \ > > + DESTDIR="$(TARGET_DIR)" -C $(@D) \ > > $(if $(BR2_STATIC_LIBS),static-install,install) > > endef > > > > -- > > 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. | > '------------------------------^-------^------------------^--------------------' Best Regards, Fabrice From fontaine.fabrice at gmail.com Mon Feb 21 22:07:03 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 21 Feb 2022 23:07:03 +0100 Subject: [Buildroot] [PATCH v2,1/1] package/re2: fix build with gcc <= 5 Message-ID: <20220221220703.2198424-1-fontaine.fabrice@gmail.com> Fix the following build failure with gcc <= 5 raised since bump to version 2022-02-01 in commit d2cf91e0c6a082261cc7ebb06dfdbd7bc2c2956f and https://github.com/google/re2/commit/a022cc0c55b0519629d64d775e7a5195af34a477 ./re2/sparse_array.h:266:37: warning: defaulted and deleted functions only available with -std=c++11 or -std=gnu++11 SparseArray::SparseArray() = default; ^ ./re2/sparse_array.h: In copy constructor 're2::SparseArray::SparseArray(const re2::SparseArray&)': ./re2/sparse_array.h:273:3: error: 'copy_n' is not a member of 'std' std::copy_n(src.sparse_.data(), src.max_size(), sparse_.data()); ^ Fixes: - http://autobuild.buildroot.org/results/8ebbac67f32fe24416a1f72aad0afd42b567b403 Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2 (after review of Yann E. Morin): - Don't set prefix in build step package/re2/re2.mk | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/package/re2/re2.mk b/package/re2/re2.mk index 41392cb179..30791a68e5 100644 --- a/package/re2/re2.mk +++ b/package/re2/re2.mk @@ -10,19 +10,23 @@ RE2_LICENSE = BSD-3-Clause RE2_LICENSE_FILES = LICENSE RE2_INSTALL_STAGING = YES +RE2_MAKE_OPTS = \ + $(TARGET_CONFIGURE_OPTS) \ + CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" + define RE2_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_MAKE_ENV) $(MAKE) $(RE2_MAKE_OPTS) \ -C $(@D) $(if $(BR2_STATIC_LIBS),static) endef define RE2_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_MAKE_ENV) $(MAKE) $(RE2_MAKE_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) \ + $(TARGET_MAKE_ENV) $(MAKE) $(RE2_MAKE_OPTS) \ DESTDIR="$(TARGET_DIR)" prefix=/usr -C $(@D) \ $(if $(BR2_STATIC_LIBS),static-install,install) endef -- 2.34.1 From romain.naour at gmail.com Mon Feb 21 22:38:08 2022 From: romain.naour at gmail.com (Romain Naour) Date: Mon, 21 Feb 2022 23:38:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-twisted: security bump to version 22.1.0 In-Reply-To: <87fsod9szu.fsf@dell.be.48ers.dk> References: <20220218105557.705926-1-fontaine.fabrice@gmail.com> <87fsod9szu.fsf@dell.be.48ers.dk> Message-ID: <150ef1b3-4d5e-37b3-881c-9a15e95a456b@gmail.com> Le 20/02/2022 ? 21:35, Peter Korsgaard a ?crit?: >>>>>> "Fabrice" == Fabrice Fontaine writes: > > > Fix CVE-2022-21712: twisted is an event-driven networking engine written > > in Python. In affected versions twisted exposes cookies and > > authorization headers when following cross-origin redirects. This issue > > is present in the `twited.web.RedirectAgent` and `twisted.web. > > BrowserLikeRedirectAgent` functions. Users are advised to upgrade. There > > are no known workarounds. > > > Update hash of license file (author added and update in year: > > https://github.com/twisted/twisted/commit/13aa59746a73769b05a51c2198b28f5602dd382f > > https://github.com/twisted/twisted/commit/adfdf23477abfcd09a867347993fc1d207cfb4dd > > https://github.com/twisted/twisted/commit/7e65fbeed3d74a4eb1c40d7a6df5651782becbc8) > > > https://github.com/twisted/twisted/security/advisories/GHSA-92x2-jw7w-xvvx > > https://github.com/twisted/twisted/releases/tag/twisted-22.1.0 > > > Signed-off-by: Fabrice Fontaine > > Committed, thanks. > I'm not familiar with python-twisted but it seems that python-twisted and python-treq must use the same version because its the same project: https://github.com/twisted/twisted https://github.com/twisted/treq We have to update python-treq to version 22.2.0 [1] otherwise we have a runtime issue: # python sample_python_treq.py Traceback (most recent call last): File "/root/sample_python_treq.py", line 2, in import treq File "/usr/lib/python3.10/site-packages/treq/__init__.py", line 5, in File "/usr/lib/python3.10/site-packages/treq/api.py", line 5, in File "/usr/lib/python3.10/site-packages/treq/client.py", line 11, in ImportError: cannot import name '_PY3' from 'twisted.python.compat' (unknown location) https://github.com/twisted/treq/releases/tag/release-22.2.0 Best regards, Romain From fontaine.fabrice at gmail.com Mon Feb 21 22:38:42 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 21 Feb 2022 23:38:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/osm2pgsql: disable external fmt Message-ID: <20220221223842.2201966-1-fontaine.fabrice@gmail.com> osm2pgsql doesn't support fmt > 8.0 yet resulting in the following build failure since bump of fmt to version 8.1.1 in commit ec7fd50d08690a383fec40748ac9b78c3f764316: /home/buildroot/autobuild/instance-0/output-1/host/aarch64-buildroot-linux-gnu/sysroot/usr/include/fmt/core.h:1728:7: error: static assertion failed: Cannot format an argument. To make type T formattable provide a formatter specialization: https://fmt.dev/latest/api.html#udt 1728 | formattable, | ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/5af1a0ea176559a5dc787ba945a3a83823f5b1bb Signed-off-by: Fabrice Fontaine --- package/osm2pgsql/Config.in | 5 ++--- package/osm2pgsql/osm2pgsql.mk | 5 +++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/osm2pgsql/Config.in b/package/osm2pgsql/Config.in index 315f496d8e..e903e92c49 100644 --- a/package/osm2pgsql/Config.in +++ b/package/osm2pgsql/Config.in @@ -1,17 +1,16 @@ config BR2_PACKAGE_OSM2PGSQL bool "osm2pgsql" - depends on BR2_INSTALL_LIBSTDCPP # boost, fmt, libosmium, protozero + depends on BR2_INSTALL_LIBSTDCPP # boost, libosmium, protozero depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 depends on BR2_TOOLCHAIN_HAS_THREADS # boost, libosmium depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-filesystem - depends on BR2_USE_WCHAR # boost, fmt, libosmium + depends on BR2_USE_WCHAR # boost, libosmium depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::future select BR2_PACKAGE_BOOST select BR2_PACKAGE_BOOST_SYSTEM select BR2_PACKAGE_BOOST_FILESYSTEM select BR2_PACKAGE_BZIP2 select BR2_PACKAGE_EXPAT - select BR2_PACKAGE_FMT select BR2_PACKAGE_LIBOSMIUM select BR2_PACKAGE_PROTOZERO select BR2_PACKAGE_ZLIB diff --git a/package/osm2pgsql/osm2pgsql.mk b/package/osm2pgsql/osm2pgsql.mk index b00976d28b..d389fff590 100644 --- a/package/osm2pgsql/osm2pgsql.mk +++ b/package/osm2pgsql/osm2pgsql.mk @@ -10,12 +10,13 @@ OSM2PGSQL_LICENSE = GPL-2.0+ OSM2PGSQL_LICENSE_FILES = COPYING OSM2PGSQL_SUPPORTS_IN_SOURCE_BUILD = NO -OSM2PGSQL_DEPENDENCIES = boost bzip2 expat fmt libosmium postgresql protozero zlib +OSM2PGSQL_DEPENDENCIES = boost bzip2 expat libosmium postgresql protozero zlib +# fmt > 8.0 is not yet supported OSM2PGSQL_CONF_OPTS = \ -DBUILD_TESTS=OFF \ -DBUILD_COVERAGE=OFF \ - -DEXTERNAL_FMT=ON \ + -DEXTERNAL_FMT=OFF \ -DEXTERNAL_LIBOSMIUM=ON \ -DEXTERNAL_PROTOZERO=ON -- 2.34.1 From fontaine.fabrice at gmail.com Mon Feb 21 23:06:40 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 22 Feb 2022 00:06:40 +0100 Subject: [Buildroot] [PATCH 1/2] package/python-treq: fix dependencies Message-ID: <20220221230640.2203877-1-fontaine.fabrice@gmail.com> python-treq needs TLS support in twisted so select BR2_PACKAGE_PYTHON_TWISTED_TLS moreover it doesn't depend directly on service_identity and pyOpenSSL since version 17.3.0 and https://github.com/twisted/treq/commit/ef2ac7ea2b74774adb9fef7675facc6017bfda89 Finally, python-idna was never a direct dependency of python-treq Signed-off-by: Fabrice Fontaine --- package/python-treq/Config.in | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/package/python-treq/Config.in b/package/python-treq/Config.in index f781b37305..7c02a35638 100644 --- a/package/python-treq/Config.in +++ b/package/python-treq/Config.in @@ -1,16 +1,13 @@ config BR2_PACKAGE_PYTHON_TREQ bool "python-treq" - # python-pyopenssl -> python-cryptography + # twisted TLS -> python-{pyopenssl,service-identity} depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS - # python-idna, python-pyopenssl -> python-cryptography select BR2_PACKAGE_PYTHON_ATTRS # runtime - select BR2_PACKAGE_PYTHON_IDNA # runtime select BR2_PACKAGE_PYTHON_INCREMENTAL # runtime - select BR2_PACKAGE_PYTHON_PYOPENSSL # runtime select BR2_PACKAGE_PYTHON_REQUESTS # runtime - select BR2_PACKAGE_PYTHON_SERVICE_IDENTITY # runtime select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_TWISTED # runtime + select BR2_PACKAGE_PYTHON_TWISTED_TLS # runtime help treq is an HTTP library inspired by requests but written on top of Twisted's Agents. It provides a simple, higher level -- 2.34.1 From fontaine.fabrice at gmail.com Mon Feb 21 23:08:15 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 22 Feb 2022 00:08:15 +0100 Subject: [Buildroot] [PATCH 2/2] package/python-treq: bump to version 22.2.0 Message-ID: <20220221230815.2203955-1-fontaine.fabrice@gmail.com> - hyperlink is a dependency since version 20.4.0 and https://github.com/twisted/treq/commit/5475def96f3ec93075ff95709fec4acd154e6fed - six is not a dependency since version 21.5.0 and https://github.com/twisted/treq/commit/22bdb399a03b0eebaa93023b80d348f584f567d5 Signed-off-by: Fabrice Fontaine --- package/python-treq/Config.in | 2 +- package/python-treq/python-treq.hash | 4 ++-- package/python-treq/python-treq.mk | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-treq/Config.in b/package/python-treq/Config.in index 7c02a35638..5d76a5cdd6 100644 --- a/package/python-treq/Config.in +++ b/package/python-treq/Config.in @@ -3,9 +3,9 @@ config BR2_PACKAGE_PYTHON_TREQ # twisted TLS -> python-{pyopenssl,service-identity} depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS select BR2_PACKAGE_PYTHON_ATTRS # runtime + select BR2_PACKAGE_PYTHON_HYPERLINK # runtime select BR2_PACKAGE_PYTHON_INCREMENTAL # runtime select BR2_PACKAGE_PYTHON_REQUESTS # runtime - select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_TWISTED # runtime select BR2_PACKAGE_PYTHON_TWISTED_TLS # runtime help diff --git a/package/python-treq/python-treq.hash b/package/python-treq/python-treq.hash index 288279cbd8..aecf71aad8 100644 --- a/package/python-treq/python-treq.hash +++ b/package/python-treq/python-treq.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/treq/json -md5 b75f6c89fd481989a9cfdec8d61a6d84 treq-20.3.0.tar.gz -sha256 a72d7587d6f81c7a32620b00175825b4334bafbde73d37098d139ac7b11dca98 treq-20.3.0.tar.gz +md5 43892086d556e7596392134f1e10bdef treq-22.2.0.tar.gz +sha256 df757e3f141fc782ede076a604521194ffcb40fa2645cf48e5a37060307f52ec treq-22.2.0.tar.gz # Locally computed sha256 checksums sha256 7cc1b65e1937b1cc07052bb864ec96d8e5fd413400c0842e5b89a8201a600293 LICENSE diff --git a/package/python-treq/python-treq.mk b/package/python-treq/python-treq.mk index 320f57b6f2..57dc50ee74 100644 --- a/package/python-treq/python-treq.mk +++ b/package/python-treq/python-treq.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TREQ_VERSION = 20.3.0 +PYTHON_TREQ_VERSION = 22.2.0 PYTHON_TREQ_SOURCE = treq-$(PYTHON_TREQ_VERSION).tar.gz -PYTHON_TREQ_SITE = https://files.pythonhosted.org/packages/98/09/25064d7224efde9fd51e8865353d516c53306e476eab27ab21fb258cf7d4 +PYTHON_TREQ_SITE = https://files.pythonhosted.org/packages/cd/c8/b68ab17d994133baf6edbcb5551ba81e1494bdc6d5e21a9d4f3bc4315140 PYTHON_TREQ_LICENSE = MIT PYTHON_TREQ_LICENSE_FILES = LICENSE PYTHON_TREQ_SETUP_TYPE = setuptools -- 2.34.1 From fontaine.fabrice at gmail.com Mon Feb 21 23:09:23 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 22 Feb 2022 00:09:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-twisted: security bump to version 22.1.0 In-Reply-To: <150ef1b3-4d5e-37b3-881c-9a15e95a456b@gmail.com> References: <20220218105557.705926-1-fontaine.fabrice@gmail.com> <87fsod9szu.fsf@dell.be.48ers.dk> <150ef1b3-4d5e-37b3-881c-9a15e95a456b@gmail.com> Message-ID: Le lun. 21 f?vr. 2022 ? 23:38, Romain Naour a ?crit : > > Le 20/02/2022 ? 21:35, Peter Korsgaard a ?crit : > >>>>>> "Fabrice" == Fabrice Fontaine writes: > > > > > Fix CVE-2022-21712: twisted is an event-driven networking engine written > > > in Python. In affected versions twisted exposes cookies and > > > authorization headers when following cross-origin redirects. This issue > > > is present in the `twited.web.RedirectAgent` and `twisted.web. > > > BrowserLikeRedirectAgent` functions. Users are advised to upgrade. There > > > are no known workarounds. > > > > > Update hash of license file (author added and update in year: > > > https://github.com/twisted/twisted/commit/13aa59746a73769b05a51c2198b28f5602dd382f > > > https://github.com/twisted/twisted/commit/adfdf23477abfcd09a867347993fc1d207cfb4dd > > > https://github.com/twisted/twisted/commit/7e65fbeed3d74a4eb1c40d7a6df5651782becbc8) > > > > > https://github.com/twisted/twisted/security/advisories/GHSA-92x2-jw7w-xvvx > > > https://github.com/twisted/twisted/releases/tag/twisted-22.1.0 > > > > > Signed-off-by: Fabrice Fontaine > > > > Committed, thanks. > > > > I'm not familiar with python-twisted but it seems that python-twisted and > python-treq must use the same version because its the same project: > > https://github.com/twisted/twisted > https://github.com/twisted/treq > > We have to update python-treq to version 22.2.0 [1] otherwise we have a runtime > issue: > > # python sample_python_treq.py > Traceback (most recent call last): > File "/root/sample_python_treq.py", line 2, in > import treq > File "/usr/lib/python3.10/site-packages/treq/__init__.py", line 5, in > File "/usr/lib/python3.10/site-packages/treq/api.py", line 5, in > File "/usr/lib/python3.10/site-packages/treq/client.py", line 11, in > ImportError: cannot import name '_PY3' from 'twisted.python.compat' (unknown > location) > > https://github.com/twisted/treq/releases/tag/release-22.2.0 Thanks for spotting this issue, I sent a patch serie. > > Best regards, > Romain Best Regards, Fabrice From aperez at igalia.com Mon Feb 21 23:37:45 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Tue, 22 Feb 2022 01:37:45 +0200 Subject: [Buildroot] [PATCH 1/1] package/xdg-dbus-proxy: bump to version 0.1.3 Message-ID: <20220221233745.520318-1-aperez@igalia.com> This is a minor maintenance release. The release incorporates "0001-Fix-musl-compilation-by-adding-TEMP_FAILURE_RETRY.patch", which can now be removed. Release notes: https://github.com/flatpak/xdg-dbus-proxy/releases/tag/0.1.3 Signed-off-by: Adrian Perez de Castro --- ...ilation-by-adding-TEMP_FAILURE_RETRY.patch | 36 ------------------- package/xdg-dbus-proxy/xdg-dbus-proxy.hash | 4 +-- package/xdg-dbus-proxy/xdg-dbus-proxy.mk | 2 +- 3 files changed, 3 insertions(+), 39 deletions(-) delete mode 100644 package/xdg-dbus-proxy/0001-Fix-musl-compilation-by-adding-TEMP_FAILURE_RETRY.patch diff --git a/package/xdg-dbus-proxy/0001-Fix-musl-compilation-by-adding-TEMP_FAILURE_RETRY.patch b/package/xdg-dbus-proxy/0001-Fix-musl-compilation-by-adding-TEMP_FAILURE_RETRY.patch deleted file mode 100644 index e531f58923..0000000000 --- a/package/xdg-dbus-proxy/0001-Fix-musl-compilation-by-adding-TEMP_FAILURE_RETRY.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 645c45f0334bb1d6e31b5927cece5e446f129cbb Mon Sep 17 00:00:00 2001 -From: Danilo Spinella -Date: Sat, 7 Dec 2019 00:05:21 +0100 -Subject: [PATCH] Fix musl compilation by adding TEMP_FAILURE_RETRY - -Fetch from: https://github.com/flatpak/xdg-dbus-proxy/pull/13 -Upstream-Status: Accepted -Signed-off-by: Adrian Perez de Castro - ---- - dbus-proxy.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/dbus-proxy.c b/dbus-proxy.c -index 163df21..4b07931 100644 ---- a/dbus-proxy.c -+++ b/dbus-proxy.c -@@ -30,6 +30,15 @@ - #include - - #include "flatpak-proxy.h" -+// Taken from glibc unistd.h -+#ifndef TEMP_FAILURE_RETRY -+# define TEMP_FAILURE_RETRY(expression) \ -+ (__extension__ \ -+ ({ long int __result; \ -+ do __result = (long int) (expression); \ -+ while (__result == -1L && errno == EINTR); \ -+ __result; })) -+#endif - - static const char *argv0; - static GList *proxies; --- -2.24.1 - diff --git a/package/xdg-dbus-proxy/xdg-dbus-proxy.hash b/package/xdg-dbus-proxy/xdg-dbus-proxy.hash index 37bda78436..a2d46ca82f 100644 --- a/package/xdg-dbus-proxy/xdg-dbus-proxy.hash +++ b/package/xdg-dbus-proxy/xdg-dbus-proxy.hash @@ -1,5 +1,5 @@ -# From https://github.com/flatpak/xdg-dbus-proxy/releases/tag/0.1.2 -sha256 1749d6f9f46dcc9edc87725641cf56cf91dcad1b01707891ea0850c1000c520f xdg-dbus-proxy-0.1.2.tar.xz +# From https://github.com/flatpak/xdg-dbus-proxy/releases/tag/0.1.3 +sha256 03b5d28ca879253ddbbce31098909becca1495ea811a6377a492e28f16c09b9b xdg-dbus-proxy-0.1.3.tar.xz # Hash for license files: sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/xdg-dbus-proxy/xdg-dbus-proxy.mk b/package/xdg-dbus-proxy/xdg-dbus-proxy.mk index 1b056c36f0..9c4449c7bb 100644 --- a/package/xdg-dbus-proxy/xdg-dbus-proxy.mk +++ b/package/xdg-dbus-proxy/xdg-dbus-proxy.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDG_DBUS_PROXY_VERSION = 0.1.2 +XDG_DBUS_PROXY_VERSION = 0.1.3 XDG_DBUS_PROXY_SITE = https://github.com/flatpak/xdg-dbus-proxy/releases/download/$(XDG_DBUS_PROXY_VERSION) XDG_DBUS_PROXY_SOURCE = xdg-dbus-proxy-$(XDG_DBUS_PROXY_VERSION).tar.xz XDG_DBUS_PROXY_DEPENDENCIES = host-pkgconf libglib2 -- 2.35.1 From mohd.faiz.rohani at gmail.com Tue Feb 22 01:34:29 2022 From: mohd.faiz.rohani at gmail.com (Mohd Faiz Rohani) Date: Tue, 22 Feb 2022 09:34:29 +0800 Subject: [Buildroot] Issue with login In-Reply-To: <6EA7F8E4-B66D-419E-884D-9F7B69357C5D@benettiengineering.com> References: <6EA7F8E4-B66D-419E-884D-9F7B69357C5D@benettiengineering.com> Message-ID: Im booting through the sd card. If I am using the same partitions and uenv.txt configurations (with old kernel version such as 4.4.155) i have no problem booting up. However with the new 5.15 kernel i got this message. Could it be a setting issue (buildroot)? I have tried using the pastebin, but it seems its only allowed text correct? Thanks On Tue, Feb 22, 2022, 3:32 AM Giulio Benetti < giulio.benetti at benettiengineering.com> wrote: > Hi Mohd, > > Il giorno 21 feb 2022, alle ore 15:16, Mohd Faiz Rohani < > mohd.faiz.rohani at gmail.com> ha scritto: > > ? > Hi Giulio, > > Update: I have tried the latest kernel (5.15) with buildroot toolchain. > result is same, RFS mounting error (refer attached) > > > Please use https://pasteboard.co/ for images, but it would be definitely > better to have a pastebin. > > As I see it fails to mount mmc0blk0p2. But are you trying to boot from > sd-card or eMMC? > > If from sd-card make sure you have partition 2 with fdisk. > Same goes for eMMC, you need to check the partitions. > > Maybe simply rootfs is on partition 1?!? > And so you only need to pass a different rootfs argument to bootargs. > > What happens if instead you build Buildroot beaglebone_defconfig? > > Can you give a go with that and use its instructions found in > board/beaglebone/readme.txt please? > > If that works at least we know the HE is alive. > > Thank you > Giulio > > > > On Mon, Feb 21, 2022 at 5:46 PM Mohd Faiz Rohani < > mohd.faiz.rohani at gmail.com> wrote: > >> Yes I will, even though I'm not in IRC for quite some time now. :). >> Thanks a lot Giulio! >> >> On Mon, Feb 21, 2022 at 5:43 PM Giulio Benetti < >> giulio.benetti at benettiengineering.com> wrote: >> >>> >>> Il giorno 21 feb 2022, alle ore 10:33, Mohd Faiz Rohani < >>> mohd.faiz.rohani at gmail.com> ha scritto: >>> >>> ? >>> Btw, is the mailing list correct platform for Buildroot Q&A? Do you have >>> any related forum for the purpose? Thanks >>> >>> >>> It?s one of its purpose, but I suggest you to also join IRC #buildroot >>> channel. >>> >>> Best regards >>> Giulio >>> >>> >>> On Mon, Feb 21, 2022, 4:44 PM Giulio Benetti < >>> giulio.benetti at benettiengineering.com> wrote: >>> >>>> Hi Mohd, >>>> >>>> On 21/02/22 06:16, Mohd Faiz Rohani wrote: >>>> > Hi guys, >>>> > >>>> > Thank you for your help.I have overlooked the required setting as >>>> > normally I will leave the setting to the default, as I assume >>>> Buildroot >>>> > has selected the required settings. Anyway I have managed to login >>>> > successfully now. >>>> > >>>> > I have turned on BR2_PACKAGE_SYSTEMD_LOGIND and >>>> > BR2_PACKAGE_UTIL_LINUX_LOGIN settings, while the rest does not change. >>>> >>>> Perfect, team working with Edgar worked :-) >>>> >>>> > Fyi, I have tried the newer versions of Linux Kernel (5.15) and Uboot >>>> > (v2022.01) with the Linaro 7.5 toolchain, but got an error during the >>>> > booting process where the RFS cannot be mounted. It may be my fault >>>> > through the settings though, that is why I am trying the old version >>>> and >>>> > it worked. >>>> >>>> I would avoid using gcc 7.5 on such new kernel/uboot. Maybe if you try >>>> to rebuild using an external prebuilt toolchain like the Bootlin one, >>>> or >>>> you build a Buildroot toolchain with latest versions, like gcc 10.x you >>>> could obtain different results. >>>> >>>> > I am planning to use Buildroot for my future development and keen to >>>> > contribute wherever I can. Still lots to learn though. >>>> >>>> Well! >>>> >>>> > Thank you again guys. >>>> >>>> You're welcome >>>> >>>> Best regards >>>> -- >>>> Giulio Benetti >>>> Benetti Engineering sas >>>> >>>> > Regards. >>>> > Faiz >>>> > >>>> > >>>> > >>>> > >>>> > On Mon, Feb 21, 2022 at 2:33 AM Mohd Faiz Rohani >>>> > > >>>> wrote: >>>> > >>>> > Thanks, I'll check them out. Will update the outcome once the >>>> > installation is done. >>>> > >>>> > Thank you. >>>> > >>>> > On Mon, Feb 21, 2022, 1:56 AM Giulio Benetti >>>> > >>> > > wrote: >>>> > >>>> > Hi Edgar, >>>> > >>>> > please reply to all in Mailing List, I add Mohd in Cc, >>>> > >>>> > On 20/02/22 17:18, Edgar Bonet wrote: >>>> > > Hi! >>>> > > >>>> > > In his config file, Mohd wrote: >>>> > >> BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_10=y >>>> > >> BR2_LINUX_KERNEL_VERSION="4.4.155" >>>> > > >>>> > > This may cause problems. C.f. docs/manual/configure.txt: >>>> > > >>>> > > If you use kernel headers that are more recent than >>>> the >>>> > Linux >>>> > > kernel you run on your embedded system, then the C >>>> > library might >>>> > > be using interfaces that are not provided by your >>>> Linux >>>> > kernel. >>>> > >>>> > Good catch Edgar! >>>> > So Mohd, what you need here is a toolchain with older libc. >>>> > >>>> https://buildroot.org/downloads/manual/manual.html#_cross_compilation_toolchain >>>> > < >>>> https://buildroot.org/downloads/manual/manual.html#_cross_compilation_toolchain >>>> > >>>> > >>>> > But again, do you really need to use so such old versions >>>> > instead of try >>>> > to use buildroot's beaglebone_defconfig? >>>> > >>>> > > In the same config file, there is: >>>> > >> # BR2_PACKAGE_BUSYBOX is not set >>>> > > >>>> > > When disabling busybox, you should have seen the message: >>>> > > >>>> > > You may need to enable other packages to get a working >>>> > system >>>> > > You better know what you're doing! >>>> > >>>> > Despite of what I've written on my previous e-mail(my test was >>>> > wrong), >>>> > he has BR2_INIT_SYSTEMD=y that works as Init System, so >>>> that's ok. >>>> > >>>> > > And then: >>>> > >> # BR2_PACKAGE_SYSTEMD_LOGIND is not set >>>> > >>>> > Good catch again Edgar! This ^^^ should be the point. Because >>>> it's >>>> > exactly the systemd login dameon. >>>> > >>>> > >> # BR2_PACKAGE_UTIL_LINUX_LOGIN is not set >>>> > >>>> > This ^^^ is not selected by systemd, so I expect >>>> > BR2_PACKAGE_SYSTEMD_LOGIND to do the job(even if I'm not a >>>> systemd >>>> > expoert at all). >>>> > >>>> > But as Edgar pointed linux headers don't match so you have 3 >>>> > choices: >>>> > 1) find a toolchain with linux-headers <= 4.4.* >>>> > 2) update linux version >>>> > 3) start from scratch using buildroot beaglebone_defconfig >>>> > >>>> > Best regards >>>> > -- >>>> > Giulio Benetti >>>> > Benetti Engineering sas >>>> > >>>> >>>> _______________________________________________ >>> buildroot mailing list >>> buildroot at buildroot.org >>> https://lists.buildroot.org/mailman/listinfo/buildroot >>> >>> -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: 20220221_211831.jpg Type: image/jpeg Size: 150206 bytes Desc: not available URL: From giulio.benetti at benettiengineering.com Tue Feb 22 02:18:21 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 22 Feb 2022 03:18:21 +0100 Subject: [Buildroot] Issue with login In-Reply-To: References: Message-ID: <869ECE13-88E6-482B-96AB-F183EE271D98@benettiengineering.com> Hi Mohd, please don?t top-post but answer inline as I?ve done on the previous emails, > Il giorno 22 feb 2022, alle ore 02:35, Mohd Faiz Rohani ha scritto: > > ? > Im booting through the sd card. If I am using the same partitions and uenv.txt configurations (with old kernel version such as 4.4.155) i have no problem booting up. Ok, so the first problem you had not showing the login has gone. Right? > However with the new 5.15 kernel i got this message. Could it be a setting issue (buildroot)? It depends, you should read carefully the kernel log. What could fail is sd-card dts entry in Linux for example. You should check in kernel log if sd-card peripheral is detected correctly. I see some error in your picture of the log, so maybe sd-card is not recognized by Linux too. > > I have tried using the pastebin, but it seems its only allowed text correct? On pastebin yes, text only, but I?ve pointed you below pasteboard too and that can be used for images. Anyway the best thing you can do is to redirect console to serial, like ttyS0(or another node depending on which peripheral you?re using). That way you can connect with a usb to serial adapter and use minicom for example to have the serial terminal and copy and paste the kernel log. Anyway I still don?t understand if you?re using buildroot?s beaglebone defconfig or the one you?ve used in the beginning tweaked. Which one are using? Best regards Giulio > > Thanks > > >> On Tue, Feb 22, 2022, 3:32 AM Giulio Benetti wrote: >> Hi Mohd, >> >>>> Il giorno 21 feb 2022, alle ore 15:16, Mohd Faiz Rohani ha scritto: >>>> >>> ? >>> Hi Giulio, >>> >>> Update: I have tried the latest kernel (5.15) with buildroot toolchain. result is same, RFS mounting error (refer attached) >> >> Please use https://pasteboard.co/ for images, but it would be definitely better to have a pastebin. >> >> As I see it fails to mount mmc0blk0p2. But are you trying to boot from sd-card or eMMC? >> >> If from sd-card make sure you have partition 2 with fdisk. >> Same goes for eMMC, you need to check the partitions. >> >> Maybe simply rootfs is on partition 1?!? >> And so you only need to pass a different rootfs argument to bootargs. >> >> What happens if instead you build Buildroot beaglebone_defconfig? >> >> Can you give a go with that and use its instructions found in board/beaglebone/readme.txt please? >> >> If that works at least we know the HE is alive. >> >> Thank you >> Giulio >> >>> >>> >>>> On Mon, Feb 21, 2022 at 5:46 PM Mohd Faiz Rohani wrote: >>>> Yes I will, even though I'm not in IRC for quite some time now. :). Thanks a lot Giulio! >>>> >>>>> On Mon, Feb 21, 2022 at 5:43 PM Giulio Benetti wrote: >>>>> >>>>>>> Il giorno 21 feb 2022, alle ore 10:33, Mohd Faiz Rohani ha scritto: >>>>>>> >>>>>> ? >>>>>> Btw, is the mailing list correct platform for Buildroot Q&A? Do you have any related forum for the purpose? Thanks >>>>> >>>>> It?s one of its purpose, but I suggest you to also join IRC #buildroot channel. >>>>> >>>>> Best regards >>>>> Giulio >>>>> >>>>>> >>>>>>> On Mon, Feb 21, 2022, 4:44 PM Giulio Benetti wrote: >>>>>>> Hi Mohd, >>>>>>> >>>>>>> On 21/02/22 06:16, Mohd Faiz Rohani wrote: >>>>>>> > Hi guys, >>>>>>> > >>>>>>> > Thank you for your help.I have overlooked the required setting as >>>>>>> > normally I will leave the setting to the default, as I assume Buildroot >>>>>>> > has selected the required settings. Anyway I have managed to login >>>>>>> > successfully now. >>>>>>> > >>>>>>> > I have turned on BR2_PACKAGE_SYSTEMD_LOGIND and >>>>>>> > BR2_PACKAGE_UTIL_LINUX_LOGIN settings, while the rest does not change. >>>>>>> >>>>>>> Perfect, team working with Edgar worked :-) >>>>>>> >>>>>>> > Fyi, I have tried the newer versions of Linux Kernel (5.15) and Uboot >>>>>>> > (v2022.01) with the Linaro 7.5 toolchain, but got an error during the >>>>>>> > booting process where the RFS cannot be mounted. It may be my fault >>>>>>> > through the settings though, that is why I am trying the old version and >>>>>>> > it worked. >>>>>>> >>>>>>> I would avoid using gcc 7.5 on such new kernel/uboot. Maybe if you try >>>>>>> to rebuild using an external prebuilt toolchain like the Bootlin one, or >>>>>>> you build a Buildroot toolchain with latest versions, like gcc 10.x you >>>>>>> could obtain different results. >>>>>>> >>>>>>> > I am planning to use Buildroot for my future development and keen to >>>>>>> > contribute wherever I can. Still lots to learn though. >>>>>>> >>>>>>> Well! >>>>>>> >>>>>>> > Thank you again guys. >>>>>>> >>>>>>> You're welcome >>>>>>> >>>>>>> Best regards >>>>>>> -- >>>>>>> Giulio Benetti >>>>>>> Benetti Engineering sas >>>>>>> >>>>>>> > Regards. >>>>>>> > Faiz >>>>>>> > >>>>>>> > >>>>>>> > >>>>>>> > >>>>>>> > On Mon, Feb 21, 2022 at 2:33 AM Mohd Faiz Rohani >>>>>>> > > wrote: >>>>>>> > >>>>>>> > Thanks, I'll check them out. Will update the outcome once the >>>>>>> > installation is done. >>>>>>> > >>>>>>> > Thank you. >>>>>>> > >>>>>>> > On Mon, Feb 21, 2022, 1:56 AM Giulio Benetti >>>>>>> > >>>>>> > > wrote: >>>>>>> > >>>>>>> > Hi Edgar, >>>>>>> > >>>>>>> > please reply to all in Mailing List, I add Mohd in Cc, >>>>>>> > >>>>>>> > On 20/02/22 17:18, Edgar Bonet wrote: >>>>>>> > > Hi! >>>>>>> > > >>>>>>> > > In his config file, Mohd wrote: >>>>>>> > >> BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_10=y >>>>>>> > >> BR2_LINUX_KERNEL_VERSION="4.4.155" >>>>>>> > > >>>>>>> > > This may cause problems. C.f. docs/manual/configure.txt: >>>>>>> > > >>>>>>> > > If you use kernel headers that are more recent than the >>>>>>> > Linux >>>>>>> > > kernel you run on your embedded system, then the C >>>>>>> > library might >>>>>>> > > be using interfaces that are not provided by your Linux >>>>>>> > kernel. >>>>>>> > >>>>>>> > Good catch Edgar! >>>>>>> > So Mohd, what you need here is a toolchain with older libc. >>>>>>> > https://buildroot.org/downloads/manual/manual.html#_cross_compilation_toolchain >>>>>>> > >>>>>>> > >>>>>>> > But again, do you really need to use so such old versions >>>>>>> > instead of try >>>>>>> > to use buildroot's beaglebone_defconfig? >>>>>>> > >>>>>>> > > In the same config file, there is: >>>>>>> > >> # BR2_PACKAGE_BUSYBOX is not set >>>>>>> > > >>>>>>> > > When disabling busybox, you should have seen the message: >>>>>>> > > >>>>>>> > > You may need to enable other packages to get a working >>>>>>> > system >>>>>>> > > You better know what you're doing! >>>>>>> > >>>>>>> > Despite of what I've written on my previous e-mail(my test was >>>>>>> > wrong), >>>>>>> > he has BR2_INIT_SYSTEMD=y that works as Init System, so that's ok. >>>>>>> > >>>>>>> > > And then: >>>>>>> > >> # BR2_PACKAGE_SYSTEMD_LOGIND is not set >>>>>>> > >>>>>>> > Good catch again Edgar! This ^^^ should be the point. Because it's >>>>>>> > exactly the systemd login dameon. >>>>>>> > >>>>>>> > >> # BR2_PACKAGE_UTIL_LINUX_LOGIN is not set >>>>>>> > >>>>>>> > This ^^^ is not selected by systemd, so I expect >>>>>>> > BR2_PACKAGE_SYSTEMD_LOGIND to do the job(even if I'm not a systemd >>>>>>> > expoert at all). >>>>>>> > >>>>>>> > But as Edgar pointed linux headers don't match so you have 3 >>>>>>> > choices: >>>>>>> > 1) find a toolchain with linux-headers <= 4.4.* >>>>>>> > 2) update linux version >>>>>>> > 3) start from scratch using buildroot beaglebone_defconfig >>>>>>> > >>>>>>> > Best regards >>>>>>> > -- >>>>>>> > Giulio Benetti >>>>>>> > Benetti Engineering sas >>>>>>> > >>>>>>> >>>>>> _______________________________________________ >>>>>> buildroot mailing list >>>>>> buildroot at buildroot.org >>>>>> https://lists.buildroot.org/mailman/listinfo/buildroot -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: 20220221_211831.jpg Type: image/jpeg Size: 150206 bytes Desc: not available URL: From christian at paral.in Tue Feb 22 05:21:16 2022 From: christian at paral.in (Christian Stewart) Date: Mon, 21 Feb 2022 21:21:16 -0800 Subject: [Buildroot] package/expat: please backport to 2021.11.x Message-ID: Hi all, Expat v2.4.4 (vulnerable) download has been removed from sourceforge. So 2021.11.x build is broken with the older expat. Please backport the expat security fixes to 2021.11.x. Thanks & best, Christian Stewart -------------- next part -------------- An HTML attachment was scrubbed... URL: From fido_max at inbox.ru Tue Feb 22 05:36:29 2022 From: fido_max at inbox.ru (Maxim Kochetkov) Date: Tue, 22 Feb 2022 08:36:29 +0300 Subject: [Buildroot] [PATCH 1/1] package/osm2pgsql: disable external fmt In-Reply-To: <20220221223842.2201966-1-fontaine.fabrice@gmail.com> References: <20220221223842.2201966-1-fontaine.fabrice@gmail.com> Message-ID: On 22.02.2022 01:38, Fabrice Fontaine wrote: > osm2pgsql doesn't support fmt > 8.0 yet resulting in the following build > failure since bump of fmt to version 8.1.1 in commit > ec7fd50d08690a383fec40748ac9b78c3f764316: > > /home/buildroot/autobuild/instance-0/output-1/host/aarch64-buildroot-linux-gnu/sysroot/usr/include/fmt/core.h:1728:7: error: static assertion failed: Cannot format an argument. To make type T formattable provide a formatter specialization: https://fmt.dev/latest/api.html#udt > 1728 | formattable, > | ^~~~~~~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/5af1a0ea176559a5dc787ba945a3a83823f5b1bb > > Signed-off-by: Fabrice Fontaine Reviewed-by: Maxim Kochetkov From thomas.petazzoni at bootlin.com Tue Feb 22 07:12:34 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 22 Feb 2022 07:12:34 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-02-21 Message-ID: <20220222071242.498B14091E@smtp4.osuosl.org> Hello, Autobuild statistics for 2022-02-21 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 42 | 10 | 1 | 53 | 2021.11.x | 15 | 2 | 0 | 17 | master | 38 | 34 | 0 | 72 | Classification of failures by reason for master ----------------------------------------------- bluez5_utils-5.63 | 7 host-libselinux-3.3 | 7 bpftool-a7f0e7f057283ae8af3... | 2 host-go-1.17.7 | 2 python-greenlet-1.1.2 | 2 re2-2022-02-01 | 2 safeclib-3.7.1 | 2 tovid-87c676f4aadb7303d2cd9... | 2 frr-8.1 | 1 hostapd-2.10 | 1 kvm-unit-tests-kvm-unit-tes... | 1 linux-pam-1.5.2 | 1 mesa3d-21.3.5 | 1 osm2pgsql-1.6.0 | 1 python-pygame-d61ea8eabd56 | 1 sord-0.16.8 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/845feb257c8ba37bce2447b99b3fb4ab97ccc86c | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/8693754a0932c2316c8512bda896974b386005e8 | mips | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/05e9dafb55fb575db91e62611ceed71b9fe24b26 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/17d5f8ce421ac19c970aedb1ddf81db76161e022 | mips | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/a8e2290345be14a2c3d11a879cb6103adad4973c | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/b7fd96676f3d100166e1a0cad87f97ea00667d31 | mips64el | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/eb23b1f0ec9ec68ead4617124b380966df2b87c7 | mips64el | bpftool-a7f0e7f057283ae8af3... | NOK | http://autobuild.buildroot.net/results/9b71da40a873a9bec1759a333e7266e793d16d9b | mipsel | bpftool-a7f0e7f057283ae8af3... | NOK | http://autobuild.buildroot.net/results/b51a8ceb1745cabbeb2f92c0a035f5db84c41f86 | xtensa | frr-8.1 | NOK | http://autobuild.buildroot.net/results/f991d30674ca25f0e6374e000a34e1f07190ef69 | mips64el | host-go-1.17.7 | NOK | http://autobuild.buildroot.net/results/e2770d1b2a7f04f157bffb4cd817e705fb9f5ead | mips64el | host-go-1.17.7 | NOK | http://autobuild.buildroot.net/results/d59509d6402b2bae0e650d63995b886dd8d2abb1 | microblazeel | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/a84b0d6b43271ca81b1b4c7e8f696e013dbc83d5 | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/3158f442a9540f300b1ba70cb7d503a58f7e3dcd | s390x | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/8ed49c0fc904b011d919aaec5a6cc2a7c556b21e | riscv64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/3be1191b11c3807e3dd534396a921bc5b11ece83 | nios2 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/8667a2ed97d0740ccc41fbe8f012660614b1e032 | x86_64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/d07b4d8107f854e91f30478fad36b99ed83f35a5 | x86_64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/488b01124b60492ba6c28394aadc7fff48771643 | arc | hostapd-2.10 | NOK | http://autobuild.buildroot.net/results/00bb075a71ba8382f49f1383ab49f0b9b4fbbc66 | powerpc64le | kvm-unit-tests-kvm-unit-tes... | NOK | http://autobuild.buildroot.net/results/5ffced2811194591a74506f4fa783f84baba72c6 | arm | linux-pam-1.5.2 | NOK | http://autobuild.buildroot.net/results/4d99609a94c35029839c2a2030bc17ef9f68f4c2 | ORPH mips64el | mesa3d-21.3.5 | NOK | http://autobuild.buildroot.net/results/d24a17ffeea6cd76d8879163e4cec7993bae39a4 | aarch64 | osm2pgsql-1.6.0 | NOK | http://autobuild.buildroot.net/results/5af1a0ea176559a5dc787ba945a3a83823f5b1bb | x86_64 | python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/6595d90a1c26b2e74afea15fcc19bdceda1999a1 | arm | python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/a4b91d8c715910ea8c4743024437745832736cd7 | aarch64 | python-pygame-d61ea8eabd56 | NOK | http://autobuild.buildroot.net/results/99c71022328f023eb287ee7415a3252e9f8a8549 | mips64el | re2-2022-02-01 | NOK | http://autobuild.buildroot.net/results/8ebbac67f32fe24416a1f72aad0afd42b567b403 | arm | re2-2022-02-01 | NOK | http://autobuild.buildroot.net/results/4bccc24ff3121b804f0e6b3f7e5a28111f7bdf7f | sparc | safeclib-3.7.1 | NOK | http://autobuild.buildroot.net/results/40a42e6d9021401faf336818bdeada8b85e4f068 | sparc | safeclib-3.7.1 | NOK | http://autobuild.buildroot.net/results/651dd437ebcd892b1cc678e813e979edc92da590 | arm | sord-0.16.8 | NOK | http://autobuild.buildroot.net/results/170d0114987b39a2b9ea173df7a5e806bd270fd8 | riscv64 | tovid-87c676f4aadb7303d2cd9... | NOK | http://autobuild.buildroot.net/results/b205845c2bb2a965aabc095ba497f0a862ef6e1c | arm | tovid-87c676f4aadb7303d2cd9... | NOK | http://autobuild.buildroot.net/results/1836542d7a0574a12f1ab84d577fea374fe0c4d1 | Classification of failures by reason for 2021.02.x -------------------------------------------------- rocksdb-6.13.3 | 2 zeromq-4.3.4 | 2 gobject-introspection-1.64.1 | 1 host-nodejs-12.22.9 | 1 libkrb5-1.18.4 | 1 monkey-f54856ce250c4e257354... | 1 python-lxml | 1 python-pybind-2.6.1 | 1 unknown | 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/0bacddd9b9342933c8922d51297d23dd70dac1a4 | ORPH arm | host-nodejs-12.22.9 | NOK | http://autobuild.buildroot.net/results/a83fe8621f05dd788bf46a1df9f6fae1bf6bcfbc | riscv32 | libkrb5-1.18.4 | NOK | http://autobuild.buildroot.net/results/1ac6ad4ddac5fd82222d076530bf94cdbba7f491 | arm | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/9c57c468f46e448e7a865358692c3efa0f8d749d | m68k | python-lxml | TIM | http://autobuild.buildroot.net/results/0bc64a5d1933dd731f623e6ffa88cb256cf912b1 | nios2 | python-pybind-2.6.1 | NOK | http://autobuild.buildroot.net/results/268fafedf2525a22932f945e0681d397b790c8cd | m68k | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/c8d4a627057190a142d08b22a961cec6f4fbe476 | m68k | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/4c5925f0e707865201b9ef287db93025247d770b | powerpc | unknown | NOK | http://autobuild.buildroot.net/results/4cb56565aef679124928e1b8ad5ae30e0a871752 | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/da365eaee525bb36267f74e30424e13ff68fdb03 | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/a16c379c05f1e6e27ac27b9e97728bca5efc4b9f | Classification of failures by reason for 2021.11.x -------------------------------------------------- ruby-3.0.3 | 1 waffle-1.6.1 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- nios2 | ruby-3.0.3 | NOK | http://autobuild.buildroot.net/results/f8e79f3ab3d7e33e7d25dcd0ba506e53185ee6fd | arm | waffle-1.6.1 | NOK | http://autobuild.buildroot.net/results/332331d5806cbd40096d523d27d56e71d7703bc8 | Gitlab CI results for 2022-02-21 ================================ Detail of runtime-test failures for 2022.02-rc2 ----------------------------------------------- runtime-test | link to the job | orph? --------------------------+---------------------------------------------------------------+------ TestIPythonPy3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2115531405 | ORPH TestLxc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2115531472 | ORPH TestPythonPy3Crossbar | https://gitlab.com/buildroot.org/buildroot/-/jobs/2115531519 | ORPH TestPythonPy3Pyyaml | https://gitlab.com/buildroot.org/buildroot/-/jobs/2115531541 | ORPH TestPythonPy3Treq | https://gitlab.com/buildroot.org/buildroot/-/jobs/2115531547 | ORPH TestPythonPy3Twisted | https://gitlab.com/buildroot.org/buildroot/-/jobs/2115531548 | ORPH TestPythonPy3Txtorcon | https://gitlab.com/buildroot.org/buildroot/-/jobs/2115531550 | ORPH TestRust | https://gitlab.com/buildroot.org/buildroot/-/jobs/2115531556 | ORPH TestRustBin | https://gitlab.com/buildroot.org/buildroot/-/jobs/2115531557 | ORPH TestSudo | https://gitlab.com/buildroot.org/buildroot/-/jobs/2115531562 | ORPH Detail of runtime-test failures for master ------------------------------------------ runtime-test | link to the job | orph? --------------------------+---------------------------------------------------------------+------ TestIPythonPy3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202335 | ORPH TestLxc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202405 | ORPH TestPythonPy3Crossbar | https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202484 | ORPH TestPythonPy3Pyyaml | https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202526 | ORPH TestPythonPy3Treq | https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202533 | ORPH TestPythonPy3Twisted | https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202535 | ORPH TestPythonPy3Txtorcon | https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202537 | ORPH TestRust | https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202544 | ORPH TestRustBin | https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202545 | ORPH -- http://autobuild.buildroot.net From thomas.petazzoni at bootlin.com Tue Feb 22 08:32:46 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 22 Feb 2022 09:32:46 +0100 Subject: [Buildroot] package/expat: please backport to 2021.11.x In-Reply-To: References: Message-ID: <20220222093246.57ab1b0d@windsurf> On Mon, 21 Feb 2022 21:21:16 -0800 Christian Stewart wrote: > Expat v2.4.4 (vulnerable) download has been removed from sourceforge. > > So 2021.11.x build is broken with the older expat. This is strange: if the expat tarball is no longer available from sourceforge, Buildroot should fallback to sources.buildroot.net, which contains the expat-2.4.4.tar.xz tarball, at http://sources.buildroot.net/expat/. Of course, it is better to update since there is a security issue in 2.4.4, but I'm wondering why you're saying that the build is broken: it should not. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From christian at paral.in Tue Feb 22 08:48:26 2022 From: christian at paral.in (Christian Stewart) Date: Tue, 22 Feb 2022 00:48:26 -0800 Subject: [Buildroot] package/expat: please backport to 2021.11.x In-Reply-To: <20220222093246.57ab1b0d@windsurf> References: <20220222093246.57ab1b0d@windsurf> Message-ID: Hi Thomas, On Tue, Feb 22, 2022 at 12:33 AM Thomas Petazzoni wrote: > On Mon, 21 Feb 2022 21:21:16 -0800 > Christian Stewart wrote: > > > Expat v2.4.4 (vulnerable) download has been removed from sourceforge. > > > > So 2021.11.x build is broken with the older expat. > > This is strange: if the expat tarball is no longer available from > sourceforge, Buildroot should fallback to sources.buildroot.net, which > contains the expat-2.4.4.tar.xz tarball, at > http://sources.buildroot.net/expat/. It does, my mistake, I had an alternate mirror configured. > Of course, it is better to update since there is a security issue in > 2.4.4, Best regards, Christian From angelo at amarulasolutions.com Tue Feb 22 09:49:13 2022 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 22 Feb 2022 10:49:13 +0100 Subject: [Buildroot] [PATCH] package/cups: bump to version 2.4.1 Message-ID: <20220222094913.2217366-1-angelo@amarulasolutions.com> NOTICE hash is changed due to a copyright year update. Signed-off-by: Angelo Compagnucci --- package/cups/cups.hash | 4 ++-- package/cups/cups.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/cups/cups.hash b/package/cups/cups.hash index b0e3654b3d..8308b7b803 100644 --- a/package/cups/cups.hash +++ b/package/cups/cups.hash @@ -1,4 +1,4 @@ # Locally calculated: -sha256 9abecec128ca6847c5bb2d3e3d30c87b782c0697b9acf284d16fa38f80a3a6de cups-2.4.0-source.tar.gz +sha256 c7339f75f8d4f2dec50c673341a45fc06b6885bb6d4366d6bf59a4e6c10ae178 cups-2.4.1-source.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE -sha256 a2a46d024e4d78dd2475d89f2f3d905578edfeca7dcb041e1d0ba079d9a87b48 NOTICE +sha256 7a7bd639e3a8457ae40b0dcfb74ea3cc6a8132b06c726142e993625d33eb6de5 NOTICE diff --git a/package/cups/cups.mk b/package/cups/cups.mk index e406d3bc64..298a6ed879 100644 --- a/package/cups/cups.mk +++ b/package/cups/cups.mk @@ -4,7 +4,7 @@ # ################################################################################ -CUPS_VERSION = 2.4.0 +CUPS_VERSION = 2.4.1 CUPS_SOURCE = cups-$(CUPS_VERSION)-source.tar.gz CUPS_SITE = https://github.com/OpenPrinting/cups/releases/download/v$(CUPS_VERSION) CUPS_LICENSE = Apache-2.0 with GPL-2.0/LGPL-2.0 exception -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 22 09:49:23 2022 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 22 Feb 2022 10:49:23 +0100 Subject: [Buildroot] [PATCH] package/cups-filters: bump to version 1.28.12 Message-ID: <20220222094923.2220294-1-angelo@amarulasolutions.com> Signed-off-by: Angelo Compagnucci --- package/cups-filters/cups-filters.hash | 2 +- package/cups-filters/cups-filters.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cups-filters/cups-filters.hash b/package/cups-filters/cups-filters.hash index aefb67f651..5a95b998eb 100644 --- a/package/cups-filters/cups-filters.hash +++ b/package/cups-filters/cups-filters.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 8cb40355287d65ea03e90dfa7e2d34f0d46752957c8a6d4e96ab6fe6c581e5d2 cups-filters-1.28.10.tar.gz +sha256 3265017d2369e1130e732090165d6b4e3c0838d7ca9aa60978b087bee12247ff cups-filters-1.28.12.tar.gz sha256 38192ffdaca98b718f78b2d4abc38bb087f0bbcc9a16d212c98b903b985f900f COPYING diff --git a/package/cups-filters/cups-filters.mk b/package/cups-filters/cups-filters.mk index c8f2dd0aae..f8ff42f0f4 100644 --- a/package/cups-filters/cups-filters.mk +++ b/package/cups-filters/cups-filters.mk @@ -4,7 +4,7 @@ # ################################################################################ -CUPS_FILTERS_VERSION = 1.28.10 +CUPS_FILTERS_VERSION = 1.28.12 CUPS_FILTERS_SITE = http://openprinting.org/download/cups-filters CUPS_FILTERS_LICENSE = GPL-2.0, GPL-2.0+, GPL-3.0, GPL-3.0+, LGPL-2, LGPL-2.1+, MIT, BSD-4-Clause CUPS_FILTERS_LICENSE_FILES = COPYING -- 2.25.1 From bugzilla at busybox.net Tue Feb 22 09:52:01 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Tue, 22 Feb 2022 09:52:01 +0000 Subject: [Buildroot] [Bug 14596] package dialog is outdated and contains a bug In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14596 --- Comment #1 from Andrei Gherghescu --- I have submitted a patch with your attachment. -- You are receiving this mail because: You are on the CC list for the bug. From nicolas.cavallari at green-communications.fr Tue Feb 22 09:53:40 2022 From: nicolas.cavallari at green-communications.fr (Nicolas Cavallari) Date: Tue, 22 Feb 2022 10:53:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/libgit2: bump version to 1.4.1 Message-ID: <20220222095340.29327-1-nicolas.cavallari@green-communications.fr> Licence changes mostly concern vendored dependencies (that buildroot does not use) and a new bundled PRNG used to reimplement mkstemp() Some buildsystem options also changed: - THREADSAFE is now USE_THREADS - BUILD_CLAR is now BUILD_TESTS, which the cmake infra already give. Signed-off-by: Nicolas Cavallari --- package/libgit2/libgit2.hash | 4 ++-- package/libgit2/libgit2.mk | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/libgit2/libgit2.hash b/package/libgit2/libgit2.hash index 07b1a260a4..a6b5ecff1a 100644 --- a/package/libgit2/libgit2.hash +++ b/package/libgit2/libgit2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 192eeff84596ff09efb6b01835a066f2df7cd7985e0991c79595688e6b36444e libgit2-1.3.0.tar.gz -sha256 8b7e4f54f8bf210c8fe010a49571a1ee57463ef020cc43f051d4d3fbb74942af COPYING +sha256 fccd371a271133e29d002dd207490d22a0c9b06992b874b8edb8366532a94f54 libgit2-1.4.1.tar.gz +sha256 0092f24acc306ee3287dc05b5e85cb9e0e48cd3f11c60c4625b1a673a5912616 COPYING diff --git a/package/libgit2/libgit2.mk b/package/libgit2/libgit2.mk index 6cc0f1ea74..47cb0cbcd8 100644 --- a/package/libgit2/libgit2.mk +++ b/package/libgit2/libgit2.mk @@ -4,21 +4,20 @@ # ################################################################################ -LIBGIT2_VERSION = 1.3.0 +LIBGIT2_VERSION = 1.4.1 LIBGIT2_SITE = $(call github,libgit2,libgit2,v$(LIBGIT2_VERSION)) -LIBGIT2_LICENSE = GPL-2.0 with linking exception, MIT (sha1), wildmatch license (wildmatch) +LIBGIT2_LICENSE = GPL-2.0 with linking exception, MIT (sha1), wildmatch license (wildmatch), CC0-1.0 (xoroshiro256) LIBGIT2_LICENSE_FILES = COPYING LIBGIT2_CPE_ID_VENDOR = libgit2_project LIBGIT2_INSTALL_STAGING = YES LIBGIT2_CONF_OPTS = \ -DUSE_GSSAPI=OFF \ - -DBUILD_CLAR=OFF \ -DUSE_ICONV=ON \ -DREGEX_BACKEND=regcomp \ -DUSE_HTTP_PARSER=system \ -DUSE_NTLMCLIENT=OFF \ - -DTHREADSAFE=$(if $(BR2_TOOLCHAIN_HAS_THREADS),ON,OFF) + -DUSE_THREADS=$(if $(BR2_TOOLCHAIN_HAS_THREADS),ON,OFF) LIBGIT2_DEPENDENCIES = zlib libhttpparser -- 2.35.1 From peter at korsgaard.com Tue Feb 22 10:10:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Feb 2022 11:10:16 +0100 Subject: [Buildroot] [PATCH] package/python-twisted: add missing python typing extensions runtime dependency In-Reply-To: <20220221215702.8461-1-romain.naour@gmail.com> (Romain Naour's message of "Mon, 21 Feb 2022 22:57:02 +0100") References: <20220221215702.8461-1-romain.naour@gmail.com> Message-ID: <87y2236wl3.fsf@dell.be.48ers.dk> >>>>> "Romain" == Romain Naour writes: > # python sample_python_txtorcon.py > Traceback (most recent call last): > File "/root/sample_python_txtorcon.py", line 1, in > import txtorcon # noqa > File "/usr/lib/python3.10/site-packages/txtorcon/__init__.py", line 11, in > File "/usr/lib/python3.10/site-packages/txtorcon/router.py", line 10, in > File "/usr/lib/python3.10/site-packages/txtorcon/util.py", line 17, in > File "/usr/lib/python3.10/site-packages/twisted/internet/defer.py", line 42, in > ModuleNotFoundError: No module named 'typing_extensions' > python typing_extensions is required since python-twisted 22.1.0 [1] > Fixes: > https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202537 > [1] https://github.com/twisted/twisted/commit/6e768da0a10c8ab42a57a1c0fa505ebe2d8bfb30 > Signed-off-by: Romain Naour Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 22 10:12:13 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Feb 2022 11:12:13 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/flac: security bump to version 1.3.4 In-Reply-To: <20220221220025.2198034-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 21 Feb 2022 23:00:25 +0100") References: <20220221220025.2198034-1-fontaine.fabrice@gmail.com> Message-ID: <87tucr6whu.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > This release mostly fixes (security related) bugs including: > - Fix 12 decoder bugs found by oss-fuzz, including CVE-2020-0499 > - Fix encoder bug CVE-2021-0561 > Also: > - Replace first patch which was reverted by > https://github.com/xiph/flac/commit/4fbb6d4f2ecf2a96c17ea9880108409f852c08a9 > - Disable stack protection (enabled by default since > https://github.com/xiph/flac/commit/f706f2832270a0b7851cdffe62ad37acda9423fe) > - Drop md5 which is not provided anymore > - Update indentation in hash file (two spaces) > https://github.com/xiph/flac/releases/tag/1.3.4 > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2 (after review of Yann E. Morin and Peter Seiderer): > - Add upstream patch Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 22 10:10:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Feb 2022 11:10:03 +0100 Subject: [Buildroot] [git commit] package/python-twisted: add missing python typing extensions runtime dependency Message-ID: <20220222100500.7CC428379E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b43ba475cf3dbf2b3990144758d5b1d4b74862c0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master # python sample_python_txtorcon.py Traceback (most recent call last): File "/root/sample_python_txtorcon.py", line 1, in import txtorcon # noqa File "/usr/lib/python3.10/site-packages/txtorcon/__init__.py", line 11, in File "/usr/lib/python3.10/site-packages/txtorcon/router.py", line 10, in File "/usr/lib/python3.10/site-packages/txtorcon/util.py", line 17, in File "/usr/lib/python3.10/site-packages/twisted/internet/defer.py", line 42, in ModuleNotFoundError: No module named 'typing_extensions' python typing_extensions is required since python-twisted 22.1.0 [1] Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202537 [1] https://github.com/twisted/twisted/commit/6e768da0a10c8ab42a57a1c0fa505ebe2d8bfb30 Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- package/python-twisted/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-twisted/Config.in b/package/python-twisted/Config.in index 49a21c4204..8596025e9c 100644 --- a/package/python-twisted/Config.in +++ b/package/python-twisted/Config.in @@ -7,6 +7,7 @@ config BR2_PACKAGE_PYTHON_TWISTED select BR2_PACKAGE_PYTHON_HYPERLINK # runtime select BR2_PACKAGE_PYTHON_PYHAMCREST # runtime select BR2_PACKAGE_PYTHON_ZOPE_INTERFACE # runtime + select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime help Twisted is an event-driven networking engine written in Python. From peter at korsgaard.com Tue Feb 22 10:10:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Feb 2022 11:10:28 +0100 Subject: [Buildroot] [git commit] package/flac: security bump to version 1.3.4 Message-ID: <20220222100500.8555B802B2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4c7e250c699b23051a64bc0c2ef3e3f2bd020b3d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This release mostly fixes (security related) bugs including: - Fix 12 decoder bugs found by oss-fuzz, including CVE-2020-0499 - Fix encoder bug CVE-2021-0561 Also: - Replace first patch which was reverted by https://github.com/xiph/flac/commit/4fbb6d4f2ecf2a96c17ea9880108409f852c08a9 - Disable stack protection (enabled by default since https://github.com/xiph/flac/commit/f706f2832270a0b7851cdffe62ad37acda9423fe) - Drop md5 which is not provided anymore - Update indentation in hash file (two spaces) https://github.com/xiph/flac/releases/tag/1.3.4 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/flac/0001-Fix-uclibc-build.patch | 81 ++++++++++++++++++++++ ...c-check-for-sys-auxv.h-before-defining-FL.patch | 36 ---------- package/flac/flac.hash | 12 ++-- package/flac/flac.mk | 5 +- 4 files changed, 89 insertions(+), 45 deletions(-) diff --git a/package/flac/0001-Fix-uclibc-build.patch b/package/flac/0001-Fix-uclibc-build.patch new file mode 100644 index 0000000000..fcba670fae --- /dev/null +++ b/package/flac/0001-Fix-uclibc-build.patch @@ -0,0 +1,81 @@ +From 4c62082f64132bfcbcb6569aa914c5ec283303f9 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 21 Feb 2022 18:21:11 +0100 +Subject: [PATCH] Fix uclibc build + +Commit 4fbb6d4f2ecf2a96c17ea9880108409f852c08a9 reverted commit +44036c9a9b45d03373fe90e9c112852bfc054c51 and so broke again the build on +uclibc + +So put back the sys/auxv.h check as well as a getauxval check in a way +that doesn't break iOS + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/xiph/flac/pull/292] +--- + configure.ac | 5 ++++- + src/libFLAC/cpu.c | 9 ++++----- + 2 files changed, 8 insertions(+), 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 4d7dc2e4..6f32fa45 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -69,7 +69,7 @@ AC_C_INLINE + AC_C_VARARRAYS + AC_C_TYPEOF + +-AC_CHECK_HEADERS([stdint.h inttypes.h byteswap.h sys/param.h sys/ioctl.h termios.h x86intrin.h cpuid.h]) ++AC_CHECK_HEADERS([stdint.h inttypes.h byteswap.h sys/auxv.h sys/param.h sys/ioctl.h termios.h x86intrin.h cpuid.h]) + + XIPH_C_BSWAP32 + XIPH_C_BSWAP16 +@@ -101,6 +101,9 @@ fi + # For the XMMS plugin. + AC_CHECK_TYPES(socklen_t, [], []) + ++dnl check for getauxval in standard library ++AC_CHECK_FUNCS(getauxval) ++ + dnl check for getopt in standard library + dnl AC_CHECK_FUNCS(getopt_long , , [LIBOBJS="$LIBOBJS getopt.o getopt1.o"] ) + AC_CHECK_FUNCS(getopt_long, [], []) +diff --git a/src/libFLAC/cpu.c b/src/libFLAC/cpu.c +index 8b92f4c7..64c6acad 100644 +--- a/src/libFLAC/cpu.c ++++ b/src/libFLAC/cpu.c +@@ -53,11 +53,9 @@ + #define dfprintf(file, format, ...) + #endif + +-#if defined FLAC__CPU_PPC +-#if defined(__linux__) || (defined(__FreeBSD__) && (__FreeBSD__ >= 12)) ++#if defined(HAVE_SYS_AUXV_H) + #include + #endif +-#endif + + #if (defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64) && (defined FLAC__HAS_NASM || FLAC__HAS_X86INTRIN) && !defined FLAC__NO_ASM + +@@ -247,7 +245,7 @@ ppc_cpu_info (FLAC__CPUInfo *info) + #define PPC_FEATURE2_ARCH_2_07 0x80000000 + #endif + +-#ifdef __linux__ ++#if defined (__linux__) && defined(HAVE_GETAUXVAL) + if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_3_00) { + info->ppc.arch_3_00 = true; + } else if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07) { +@@ -267,7 +265,8 @@ ppc_cpu_info (FLAC__CPUInfo *info) + info->ppc.arch_2_07 = false; + info->ppc.arch_3_00 = false; + #else +-#error Unsupported platform! Please add support for reading ppc hwcaps. ++ info->ppc.arch_2_07 = false; ++ info->ppc.arch_3_00 = false; + #endif + + #else +-- +2.34.1 + diff --git a/package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch b/package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch deleted file mode 100644 index d1398d4b3e..0000000000 --- a/package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 14a0713389fbfef59225d027ea466ebb478a8c6b Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 19 Sep 2019 21:18:04 +0200 -Subject: [PATCH] configure.ac: check for sys/auxv.h before defining FLAC__CPU_PPC - -Upstream: https://github.com/xiph/flac/pull/142 -Signed-off-by: Peter Seiderer ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 0228a12..64cb3f2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -144,7 +144,7 @@ case "$host_cpu" in - powerpc64|powerpc64le) - cpu_ppc64=true - cpu_ppc=true -- AC_DEFINE(FLAC__CPU_PPC) -+ AC_CHECK_HEADER(sys/auxv.h, AC_DEFINE(FLAC__CPU_PPC)) - AH_TEMPLATE(FLAC__CPU_PPC, [define if building for PowerPC]) - AC_DEFINE(FLAC__CPU_PPC64) - AH_TEMPLATE(FLAC__CPU_PPC64, [define if building for PowerPC64]) -@@ -152,7 +152,7 @@ case "$host_cpu" in - ;; - powerpc|powerpcle) - cpu_ppc=true -- AC_DEFINE(FLAC__CPU_PPC) -+ AC_CHECK_HEADER(sys/auxv.h, AC_DEFINE(FLAC__CPU_PPC)) - AH_TEMPLATE(FLAC__CPU_PPC, [define if building for PowerPC]) - asm_optimisation=$asm_opt - ;; --- -2.23.0 - diff --git a/package/flac/flac.hash b/package/flac/flac.hash index df7c2d1b95..2444535e0f 100644 --- a/package/flac/flac.hash +++ b/package/flac/flac.hash @@ -1,10 +1,8 @@ -# From https://ftp.osuosl.org/pub/xiph/releases/flac/MD5SUMS -md5 26703ed2858c1fc9ffc05136d13daa69 flac-1.3.3.tar.xz # From https://ftp.osuosl.org/pub/xiph/releases/flac/SHA1SUMS -sha1 6ac2e8f1dd18c9b0214c4d81bd70cdc1e943cffe flac-1.3.3.tar.xz +sha1 99c28482a8b2d81deaf740639e4cb55658427420 flac-1.3.4.tar.xz # From http://downloads.xiph.org/releases/flac/SHA256SUMS.txt -sha256 213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748 flac-1.3.3.tar.xz +sha256 8ff0607e75a322dd7cd6ec48f4f225471404ae2730d0ea945127b1355155e737 flac-1.3.4.tar.xz # Locally computed -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LGPL -sha256 fa27cb11f13f97b0c5f3ff363b1e2610c6efe87ed175779cb2a78e44eb19d34c COPYING.Xiph +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LGPL +sha256 fa27cb11f13f97b0c5f3ff363b1e2610c6efe87ed175779cb2a78e44eb19d34c COPYING.Xiph diff --git a/package/flac/flac.mk b/package/flac/flac.mk index 9aa00b7ffd..2ff048b6e6 100644 --- a/package/flac/flac.mk +++ b/package/flac/flac.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLAC_VERSION = 1.3.3 +FLAC_VERSION = 1.3.4 FLAC_SITE = http://downloads.xiph.org/releases/flac FLAC_SOURCE = flac-$(FLAC_VERSION).tar.xz FLAC_INSTALL_STAGING = YES @@ -19,7 +19,8 @@ FLAC_AUTORECONF = YES FLAC_CONF_OPTS = \ $(if $(BR2_INSTALL_LIBSTDCPP),--enable-cpplibs,--disable-cpplibs) \ --disable-xmms-plugin \ - --disable-altivec + --disable-altivec \ + --disable-stack-smash-protection ifeq ($(BR2_PACKAGE_LIBOGG),y) FLAC_CONF_OPTS += --with-ogg=$(STAGING_DIR)/usr From nolange79 at gmail.com Tue Feb 22 10:22:03 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Tue, 22 Feb 2022 11:22:03 +0100 Subject: [Buildroot] Patch series Message-ID: <20220222102211.74573-1-nolange79@gmail.com> As is was suggested I pulled my patches in a series, this should combine most of my open work. It does *not* contain: - toolchain: support mismatched merged usr [1] recent enough - package/dbus-broker: new package [2] recent enough - package/openssh: improve integration for systemd [3] outdated, no time to fix it Patch 1 and 2 set the runstatedir for CMake and Autotools (new patches) Patch 3 and 4 are rebased and adopted to feedback. Patch 5 contains a better commit message Patch 6 and 7 are new [PATCH v3 1/7] package/pkg-cmake.mk: use /run as runtime path [PATCH v3 2/7] pkg-autotools: optimistically set runstatedir [PATCH v3 3/7] package/systemd: use current tool for generating HWDB [PATCH v3 4/7] package/systemd: remove hwdb-update service [PATCH v3 5/7] Makefile: remove /usr/lib/rpm directory on target [PATCH v3 6/7] package/zsh: Enable dynamic modules [PATCH v3 7/7] package/zsh: enable static regex module [1] - https://lists.buildroot.org/pipermail/buildroot/2022-February/637079.html [2] - https://patchwork.ozlabs.org/project/buildroot/patch/20220109221650.777610-1-nolange79 at gmail.com/ [3] - https://patchwork.ozlabs.org/project/buildroot/patch/20200611091407.12688-2-nolange79 at gmail.com/ From nolange79 at gmail.com Tue Feb 22 10:22:04 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Tue, 22 Feb 2022 11:22:04 +0100 Subject: [Buildroot] [PATCH v3 1/7] package/pkg-cmake.mk: use /run as runtime path In-Reply-To: <20220222102211.74573-1-nolange79@gmail.com> References: <20220222102211.74573-1-nolange79@gmail.com> Message-ID: <20220222102211.74573-2-nolange79@gmail.com> Buildroot prefers /run as runstate directory, make this the default. Signed-off-by: Norbert Lange --- package/pkg-cmake.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index 3b1db35fb6..081960b5bf 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -90,6 +90,7 @@ define $(2)_CONFIGURE_CMDS $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ -DCMAKE_TOOLCHAIN_FILE="$$(HOST_DIR)/share/buildroot/toolchainfile.cmake" \ -DCMAKE_INSTALL_PREFIX="/usr" \ + -DCMAKE_INSTALL_RUNSTATEDIR="/run" \ -DCMAKE_COLOR_MAKEFILE=OFF \ -DBUILD_DOC=OFF \ -DBUILD_DOCS=OFF \ -- 2.34.1 From nolange79 at gmail.com Tue Feb 22 10:22:05 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Tue, 22 Feb 2022 11:22:05 +0100 Subject: [Buildroot] [PATCH v3 2/7] pkg-autotools: optimistically set runstatedir In-Reply-To: <20220222102211.74573-1-nolange79@gmail.com> References: <20220222102211.74573-1-nolange79@gmail.com> Message-ID: <20220222102211.74573-3-nolange79@gmail.com> since Autotools 2.70 there is an option to set the runstatedir. To support configure scripts using older version, the variable is set directly instead of using the --runstatedir argument. Signed-off-by: Norbert Lange --- package/pkg-autotools.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk index 717ff81593..b6224b349d 100644 --- a/package/pkg-autotools.mk +++ b/package/pkg-autotools.mk @@ -187,6 +187,7 @@ define $(2)_CONFIGURE_CMDS --exec-prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ + runstatedir=/run \ --program-prefix="" \ --disable-gtk-doc \ --disable-gtk-doc-html \ -- 2.34.1 From nolange79 at gmail.com Tue Feb 22 10:22:06 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Tue, 22 Feb 2022 11:22:06 +0100 Subject: [Buildroot] [PATCH v3 3/7] package/systemd: use current tool for generating HWDB In-Reply-To: <20220222102211.74573-1-nolange79@gmail.com> References: <20220222102211.74573-1-nolange79@gmail.com> Message-ID: <20220222102211.74573-4-nolange79@gmail.com> udevadm has been deprecated for a while (for building the DB), systemd-hwdb should be used in its place. this tool further has a switch to generate the database in /usr which is a better place for a one-time created file than the default /etc/udev. The HWDB source files have drop-in directories, which means even if disabled in this package, other packages or users could drop in stuff. So always delete those Signed-off-by: Norbert Lange --- v1 -> v2 - fix removal of service v2 -> v3 - see https://lists.buildroot.org/pipermail/buildroot/2020-July/286310.html - use systemd-hwdb with --strict option - split removal of service in separate patch - improve commit message - always delete de HWDB source directories --- package/systemd/systemd.mk | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index b07fac27d4..d2c28b5b60 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -307,13 +307,9 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_HWDB),y) SYSTEMD_CONF_OPTS += -Dhwdb=true define SYSTEMD_BUILD_HWDB - $(HOST_DIR)/bin/udevadm hwdb --update --root $(TARGET_DIR) + $(HOST_DIR)/bin/systemd-hwdb update --root $(TARGET_DIR) --strict --usr endef SYSTEMD_TARGET_FINALIZE_HOOKS += SYSTEMD_BUILD_HWDB -define SYSTEMD_RM_HWDB_SRV - rm -rf $(TARGET_DIR)/$(HOST_EUDEV_SYSCONFDIR)/udev/hwdb.d/ -endef -SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_RM_HWDB_SRV else SYSTEMD_CONF_OPTS += -Dhwdb=false endif @@ -725,6 +721,11 @@ endef SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_UPDATE_CATALOGS endif +define SYSTEMD_RM_HWDB_DATA + rm -rf $(TARGET_DIR)/usr/lib/udev/hwdb.d/ $(TARGET_DIR)/etc/udev/hwdb.d/ +endef +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_RM_HWDB_DATA + 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 \ @@ -814,7 +815,7 @@ HOST_SYSTEMD_CONF_OPTS = \ -Dsysusers=false \ -Dtmpfiles=true \ -Dimportd=false \ - -Dhwdb=false \ + -Dhwdb=true \ -Drfkill=false \ -Dman=false \ -Dhtml=false \ -- 2.34.1 From nolange79 at gmail.com Tue Feb 22 10:22:07 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Tue, 22 Feb 2022 11:22:07 +0100 Subject: [Buildroot] [PATCH v3 4/7] package/systemd: remove hwdb-update service In-Reply-To: <20220222102211.74573-1-nolange79@gmail.com> References: <20220222102211.74573-1-nolange79@gmail.com> Message-ID: <20220222102211.74573-5-nolange79@gmail.com> since the source HWDB files are already removed from the target system, it makes little sense to keep the service around. If accidently triggered it could create an empty database. The service is installed in both staging and host directory, so a user could craft his own solutions if its necessary to update the database. Signed-off-by: Norbert Lange --- package/systemd/systemd.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index d2c28b5b60..44297875f6 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -310,6 +310,12 @@ define SYSTEMD_BUILD_HWDB $(HOST_DIR)/bin/systemd-hwdb update --root $(TARGET_DIR) --strict --usr endef SYSTEMD_TARGET_FINALIZE_HOOKS += SYSTEMD_BUILD_HWDB +define SYSTEMD_RM_HWBD_UPDATE_SERVICE + rm -rf $(TARGET_DIR)/usr/lib/systemd/system/systemd-hwdb-update.service \ + $(TARGET_DIR)/usr/lib/systemd/system/*/systemd-hwdb-update.service \ + $(TARGET_DIR)/usr/bin/systemd-hwdb +endef +SYSTEMD_POST_INSTALL_TARGET_HOOKS += SYSTEMD_RM_HWBD_UPDATE_SERVICE else SYSTEMD_CONF_OPTS += -Dhwdb=false endif -- 2.34.1 From nolange79 at gmail.com Tue Feb 22 10:22:08 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Tue, 22 Feb 2022 11:22:08 +0100 Subject: [Buildroot] [PATCH v3 5/7] Makefile: remove /usr/lib/rpm directory on target In-Reply-To: <20220222102211.74573-1-nolange79@gmail.com> References: <20220222102211.74573-1-nolange79@gmail.com> Message-ID: <20220222102211.74573-6-nolange79@gmail.com> this directory is used by the rpm package manager, and packages like systemd will install "macros" for this system. It should be deleted just like the similar /usr/share/aclocal directory from Autoconf. Signed-off-by: Norbert Lange --- v1 -> v2 - see https://lists.buildroot.org/pipermail/buildroot/2020-June/284213.html - improved commit message Signed-off-by: Norbert Lange --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d92438166f..4953b382ca 100644 --- a/Makefile +++ b/Makefile @@ -734,7 +734,7 @@ target-finalize: $(PACKAGES) $(TARGET_DIR) host-finalize rm -rf $(TARGET_DIR)/usr/include $(TARGET_DIR)/usr/share/aclocal \ $(TARGET_DIR)/usr/lib/pkgconfig $(TARGET_DIR)/usr/share/pkgconfig \ $(TARGET_DIR)/usr/lib/cmake $(TARGET_DIR)/usr/share/cmake \ - $(TARGET_DIR)/usr/doc + $(TARGET_DIR)/usr/lib/rpm $(TARGET_DIR)/usr/doc find $(TARGET_DIR)/usr/{lib,share}/ -name '*.cmake' -print0 | xargs -0 rm -f find $(TARGET_DIR)/lib/ $(TARGET_DIR)/usr/lib/ $(TARGET_DIR)/usr/libexec/ \ \( -name '*.a' -o -name '*.la' -o -name '*.prl' \) -print0 | xargs -0 rm -f -- 2.34.1 From nolange79 at gmail.com Tue Feb 22 10:22:09 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Tue, 22 Feb 2022 11:22:09 +0100 Subject: [Buildroot] [PATCH v3 6/7] package/zsh: Enable dynamic modules In-Reply-To: <20220222102211.74573-1-nolange79@gmail.com> References: <20220222102211.74573-1-nolange79@gmail.com> Message-ID: <20220222102211.74573-7-nolange79@gmail.com> The autoconf scripts seem to assume that no dynamic loader is available if crosscompiling. This results in only a small set of modules being enabled and linked statically. For comparison, debian patches the fallback to enable dynamic modules (unconditionally). This commit enables modules if shared libraries are enabled. Signed-off-by: Norbert Lange --- v1: - so far only tested with glibc --- package/zsh/zsh.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/zsh/zsh.mk b/package/zsh/zsh.mk index c5ab7c2fae..c26a00c430 100644 --- a/package/zsh/zsh.mk +++ b/package/zsh/zsh.mk @@ -36,6 +36,14 @@ else ZSH_CONF_OPTS += --disable-pcre endif +ifneq ($(BR2_STATIC_LIBS),y) +# zsh assumes shared libs to be not available when crosscompiling +ZSH_CONF_OPTS += zsh_cv_shared_environ=yes zsh_cv_shared_tgetent=yes \ + zsh_cv_shared_tigetstr=yes zsh_cv_sys_dynamic_clash_ok=yes \ + zsh_cv_sys_dynamic_rtld_global=yes zsh_cv_sys_dynamic_execsyms=yes \ + zsh_cv_sys_dynamic_strip_exe=yes zsh_cv_sys_dynamic_strip_lib=yes +endif + # Add /bin/zsh to /etc/shells otherwise some login tools like dropbear # can reject the user connection. See man shells. define ZSH_ADD_ZSH_TO_SHELLS -- 2.34.1 From nolange79 at gmail.com Tue Feb 22 10:22:10 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Tue, 22 Feb 2022 11:22:10 +0100 Subject: [Buildroot] [PATCH v3 7/7] package/zsh: enable static regex module In-Reply-To: <20220222102211.74573-1-nolange79@gmail.com> References: <20220222102211.74573-1-nolange79@gmail.com> Message-ID: <20220222102211.74573-8-nolange79@gmail.com> the builtin string =~ regexp operator needs to load the regex module. This operator is readily used in zsh scripts, so always enable it. Signed-off-by: Norbert Lange --- package/zsh/zsh.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/zsh/zsh.mk b/package/zsh/zsh.mk index c26a00c430..85c214372a 100644 --- a/package/zsh/zsh.mk +++ b/package/zsh/zsh.mk @@ -44,6 +44,12 @@ ZSH_CONF_OPTS += zsh_cv_shared_environ=yes zsh_cv_shared_tgetent=yes \ zsh_cv_sys_dynamic_strip_exe=yes zsh_cv_sys_dynamic_strip_lib=yes endif +# regex is commonly used by completion scripts, link it statically +define ZSH_USE_STATIC_REGEX_MODULE + $(SED) 's,echo dynamic,echo static,' $(@D)/Src/Modules/regex.mdd +endef +ZSH_POST_PATCH_HOOKS += ZSH_USE_STATIC_REGEX_MODULE + # Add /bin/zsh to /etc/shells otherwise some login tools like dropbear # can reject the user connection. See man shells. define ZSH_ADD_ZSH_TO_SHELLS -- 2.34.1 From peter at korsgaard.com Tue Feb 22 10:36:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Feb 2022 11:36:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/xdg-dbus-proxy: bump to version 0.1.3 In-Reply-To: <20220221233745.520318-1-aperez@igalia.com> (Adrian Perez de Castro's message of "Tue, 22 Feb 2022 01:37:45 +0200") References: <20220221233745.520318-1-aperez@igalia.com> Message-ID: <87pmnf6vdd.fsf@dell.be.48ers.dk> >>>>> "Adrian" == Adrian Perez de Castro writes: > This is a minor maintenance release. The release incorporates > "0001-Fix-musl-compilation-by-adding-TEMP_FAILURE_RETRY.patch", which > can now be removed. > Release notes: > https://github.com/flatpak/xdg-dbus-proxy/releases/tag/0.1.3 > Signed-off-by: Adrian Perez de Castro Committed to master given the small amount of changes, thanks. > +++ b/package/xdg-dbus-proxy/xdg-dbus-proxy.hash > @@ -1,5 +1,5 @@ > -# From https://github.com/flatpak/xdg-dbus-proxy/releases/tag/0.1.2 > -sha256 1749d6f9f46dcc9edc87725641cf56cf91dcad1b01707891ea0850c1000c520f xdg-dbus-proxy-0.1.2.tar.xz > +# From https://github.com/flatpak/xdg-dbus-proxy/releases/tag/0.1.3 > +sha256 03b5d28ca879253ddbbce31098909becca1495ea811a6377a492e28f16c09b9b xdg-dbus-proxy-0.1.3.tar.xz The "new" agreement is two spaces - And check-package complains about, so I've fixed that while applying. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 22 10:36:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Feb 2022 11:36:42 +0100 Subject: [Buildroot] [git commit] package/xdg-dbus-proxy: bump to version 0.1.3 Message-ID: <20220222102907.DDFDC837C4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1a0d90d8aba6862060ba6e839ebd75436f671acf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This is a minor maintenance release. The release incorporates "0001-Fix-musl-compilation-by-adding-TEMP_FAILURE_RETRY.patch", which can now be removed. Release notes: https://github.com/flatpak/xdg-dbus-proxy/releases/tag/0.1.3 Signed-off-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard --- ...-compilation-by-adding-TEMP_FAILURE_RETRY.patch | 36 ---------------------- package/xdg-dbus-proxy/xdg-dbus-proxy.hash | 6 ++-- package/xdg-dbus-proxy/xdg-dbus-proxy.mk | 2 +- 3 files changed, 4 insertions(+), 40 deletions(-) diff --git a/package/xdg-dbus-proxy/0001-Fix-musl-compilation-by-adding-TEMP_FAILURE_RETRY.patch b/package/xdg-dbus-proxy/0001-Fix-musl-compilation-by-adding-TEMP_FAILURE_RETRY.patch deleted file mode 100644 index e531f58923..0000000000 --- a/package/xdg-dbus-proxy/0001-Fix-musl-compilation-by-adding-TEMP_FAILURE_RETRY.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 645c45f0334bb1d6e31b5927cece5e446f129cbb Mon Sep 17 00:00:00 2001 -From: Danilo Spinella -Date: Sat, 7 Dec 2019 00:05:21 +0100 -Subject: [PATCH] Fix musl compilation by adding TEMP_FAILURE_RETRY - -Fetch from: https://github.com/flatpak/xdg-dbus-proxy/pull/13 -Upstream-Status: Accepted -Signed-off-by: Adrian Perez de Castro - ---- - dbus-proxy.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/dbus-proxy.c b/dbus-proxy.c -index 163df21..4b07931 100644 ---- a/dbus-proxy.c -+++ b/dbus-proxy.c -@@ -30,6 +30,15 @@ - #include - - #include "flatpak-proxy.h" -+// Taken from glibc unistd.h -+#ifndef TEMP_FAILURE_RETRY -+# define TEMP_FAILURE_RETRY(expression) \ -+ (__extension__ \ -+ ({ long int __result; \ -+ do __result = (long int) (expression); \ -+ while (__result == -1L && errno == EINTR); \ -+ __result; })) -+#endif - - static const char *argv0; - static GList *proxies; --- -2.24.1 - diff --git a/package/xdg-dbus-proxy/xdg-dbus-proxy.hash b/package/xdg-dbus-proxy/xdg-dbus-proxy.hash index 37bda78436..b7aa9ac701 100644 --- a/package/xdg-dbus-proxy/xdg-dbus-proxy.hash +++ b/package/xdg-dbus-proxy/xdg-dbus-proxy.hash @@ -1,5 +1,5 @@ -# From https://github.com/flatpak/xdg-dbus-proxy/releases/tag/0.1.2 -sha256 1749d6f9f46dcc9edc87725641cf56cf91dcad1b01707891ea0850c1000c520f xdg-dbus-proxy-0.1.2.tar.xz +# From https://github.com/flatpak/xdg-dbus-proxy/releases/tag/0.1.3 +sha256 03b5d28ca879253ddbbce31098909becca1495ea811a6377a492e28f16c09b9b xdg-dbus-proxy-0.1.3.tar.xz # Hash for license files: -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/xdg-dbus-proxy/xdg-dbus-proxy.mk b/package/xdg-dbus-proxy/xdg-dbus-proxy.mk index 1b056c36f0..9c4449c7bb 100644 --- a/package/xdg-dbus-proxy/xdg-dbus-proxy.mk +++ b/package/xdg-dbus-proxy/xdg-dbus-proxy.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDG_DBUS_PROXY_VERSION = 0.1.2 +XDG_DBUS_PROXY_VERSION = 0.1.3 XDG_DBUS_PROXY_SITE = https://github.com/flatpak/xdg-dbus-proxy/releases/download/$(XDG_DBUS_PROXY_VERSION) XDG_DBUS_PROXY_SOURCE = xdg-dbus-proxy-$(XDG_DBUS_PROXY_VERSION).tar.xz XDG_DBUS_PROXY_DEPENDENCIES = host-pkgconf libglib2 From romain.naour at gmail.com Tue Feb 22 10:41:41 2022 From: romain.naour at gmail.com (Romain Naour) Date: Tue, 22 Feb 2022 11:41:41 +0100 Subject: [Buildroot] [PATCH 1/2] package/python-treq: fix dependencies In-Reply-To: <20220221230640.2203877-1-fontaine.fabrice@gmail.com> References: <20220221230640.2203877-1-fontaine.fabrice@gmail.com> Message-ID: <8785e132-e840-c571-7258-943c9da77a7c@gmail.com> Hello Fabrice, Le 22/02/2022 ? 00:06, Fabrice Fontaine a ?crit?: > python-treq needs TLS support in twisted so select > BR2_PACKAGE_PYTHON_TWISTED_TLS moreover it doesn't depend directly on > service_identity and pyOpenSSL since version 17.3.0 and > https://github.com/twisted/treq/commit/ef2ac7ea2b74774adb9fef7675facc6017bfda89 > > Finally, python-idna was never a direct dependency of python-treq > > Signed-off-by: Fabrice Fontaine Reviewed-by: Romain Naour Best regards, Romain > --- > package/python-treq/Config.in | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > > diff --git a/package/python-treq/Config.in b/package/python-treq/Config.in > index f781b37305..7c02a35638 100644 > --- a/package/python-treq/Config.in > +++ b/package/python-treq/Config.in > @@ -1,16 +1,13 @@ > config BR2_PACKAGE_PYTHON_TREQ > bool "python-treq" > - # python-pyopenssl -> python-cryptography > + # twisted TLS -> python-{pyopenssl,service-identity} > depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS > - # python-idna, python-pyopenssl -> python-cryptography > select BR2_PACKAGE_PYTHON_ATTRS # runtime > - select BR2_PACKAGE_PYTHON_IDNA # runtime > select BR2_PACKAGE_PYTHON_INCREMENTAL # runtime > - select BR2_PACKAGE_PYTHON_PYOPENSSL # runtime > select BR2_PACKAGE_PYTHON_REQUESTS # runtime > - select BR2_PACKAGE_PYTHON_SERVICE_IDENTITY # runtime > select BR2_PACKAGE_PYTHON_SIX # runtime > select BR2_PACKAGE_PYTHON_TWISTED # runtime > + select BR2_PACKAGE_PYTHON_TWISTED_TLS # runtime > help > treq is an HTTP library inspired by requests but written on > top of Twisted's Agents. It provides a simple, higher level From romain.naour at gmail.com Tue Feb 22 10:46:55 2022 From: romain.naour at gmail.com (Romain Naour) Date: Tue, 22 Feb 2022 11:46:55 +0100 Subject: [Buildroot] [PATCH 2/2] package/python-treq: bump to version 22.2.0 In-Reply-To: <20220221230815.2203955-1-fontaine.fabrice@gmail.com> References: <20220221230815.2203955-1-fontaine.fabrice@gmail.com> Message-ID: Hello Fabrice, Le 22/02/2022 ? 00:08, Fabrice Fontaine a ?crit?: > - hyperlink is a dependency since version 20.4.0 and > https://github.com/twisted/treq/commit/5475def96f3ec93075ff95709fec4acd154e6fed > - six is not a dependency since version 21.5.0 and > https://github.com/twisted/treq/commit/22bdb399a03b0eebaa93023b80d348f584f567d5 > > Signed-off-by: Fabrice Fontaine Reviewed-by: Romain Naour Best regards, Romain > --- > package/python-treq/Config.in | 2 +- > package/python-treq/python-treq.hash | 4 ++-- > package/python-treq/python-treq.mk | 4 ++-- > 3 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/python-treq/Config.in b/package/python-treq/Config.in > index 7c02a35638..5d76a5cdd6 100644 > --- a/package/python-treq/Config.in > +++ b/package/python-treq/Config.in > @@ -3,9 +3,9 @@ config BR2_PACKAGE_PYTHON_TREQ > # twisted TLS -> python-{pyopenssl,service-identity} > depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS > select BR2_PACKAGE_PYTHON_ATTRS # runtime > + select BR2_PACKAGE_PYTHON_HYPERLINK # runtime > select BR2_PACKAGE_PYTHON_INCREMENTAL # runtime > select BR2_PACKAGE_PYTHON_REQUESTS # runtime > - select BR2_PACKAGE_PYTHON_SIX # runtime > select BR2_PACKAGE_PYTHON_TWISTED # runtime > select BR2_PACKAGE_PYTHON_TWISTED_TLS # runtime > help > diff --git a/package/python-treq/python-treq.hash b/package/python-treq/python-treq.hash > index 288279cbd8..aecf71aad8 100644 > --- a/package/python-treq/python-treq.hash > +++ b/package/python-treq/python-treq.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/treq/json > -md5 b75f6c89fd481989a9cfdec8d61a6d84 treq-20.3.0.tar.gz > -sha256 a72d7587d6f81c7a32620b00175825b4334bafbde73d37098d139ac7b11dca98 treq-20.3.0.tar.gz > +md5 43892086d556e7596392134f1e10bdef treq-22.2.0.tar.gz > +sha256 df757e3f141fc782ede076a604521194ffcb40fa2645cf48e5a37060307f52ec treq-22.2.0.tar.gz > # Locally computed sha256 checksums > sha256 7cc1b65e1937b1cc07052bb864ec96d8e5fd413400c0842e5b89a8201a600293 LICENSE > diff --git a/package/python-treq/python-treq.mk b/package/python-treq/python-treq.mk > index 320f57b6f2..57dc50ee74 100644 > --- a/package/python-treq/python-treq.mk > +++ b/package/python-treq/python-treq.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_TREQ_VERSION = 20.3.0 > +PYTHON_TREQ_VERSION = 22.2.0 I would suggest to add a comment about the requirement to keep the version in sync with python-twisted version. Add the same comment on python-twisted.mk Best regards, Romain > PYTHON_TREQ_SOURCE = treq-$(PYTHON_TREQ_VERSION).tar.gz > -PYTHON_TREQ_SITE = https://files.pythonhosted.org/packages/98/09/25064d7224efde9fd51e8865353d516c53306e476eab27ab21fb258cf7d4 > +PYTHON_TREQ_SITE = https://files.pythonhosted.org/packages/cd/c8/b68ab17d994133baf6edbcb5551ba81e1494bdc6d5e21a9d4f3bc4315140 > PYTHON_TREQ_LICENSE = MIT > PYTHON_TREQ_LICENSE_FILES = LICENSE > PYTHON_TREQ_SETUP_TYPE = setuptools From angelo at amarulasolutions.com Tue Feb 22 10:55:31 2022 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 22 Feb 2022 11:55:31 +0100 Subject: [Buildroot] [PATCH] package/mender: bump to version 3.2.1 Message-ID: <20220222105531.2498422-1-angelo@amarulasolutions.com> Main LICENSE file hash is changed due to a copyright year update. Signed-off-by: Angelo Compagnucci --- 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..3a7a675341 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 8dd04f963f1816350c5406312969f5b11d45c772274a8c32f7a9da8b2cc36561 3.2.1.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..33b4611a5f 100644 --- a/package/mender/mender.mk +++ b/package/mender/mender.mk @@ -4,7 +4,7 @@ # ################################################################################ -MENDER_VERSION = 3.1.0 +MENDER_VERSION = 3.2.1 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.25.1 From angelo at amarulasolutions.com Tue Feb 22 10:55:56 2022 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 22 Feb 2022 11:55:56 +0100 Subject: [Buildroot] [PATCH] package/mender-artifact: bump to version 3.7.0 Message-ID: <20220222105556.2498717-1-angelo@amarulasolutions.com> Signed-off-by: Angelo Compagnucci --- 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.25.1 From angelo at amarulasolutions.com Tue Feb 22 11:33:26 2022 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 22 Feb 2022 12:33:26 +0100 Subject: [Buildroot] [PATCH] package/python-can: bump to version 4.0.0 Message-ID: <20220222113326.2608582-1-angelo@amarulasolutions.com> Signed-off-by: Angelo Compagnucci --- package/python-can/python-can.hash | 2 +- package/python-can/python-can.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-can/python-can.hash b/package/python-can/python-can.hash index 5330e5899c..91b685cc17 100644 --- a/package/python-can/python-can.hash +++ b/package/python-can/python-can.hash @@ -1,4 +1,4 @@ # sha256 from https://pypi.org/pypi/python-can -sha256 2d3c223b7adc4dd46ce258d4a33b7e0dbb6c339e002faa40ee4a69d5fdce9449 python-can-3.3.4.tar.gz +sha256 59d92846ffb981e634e9e0f2d14a6b4967a875e3869bd2ba168c92c4db6b8b5d python-can-4.0.0.tar.gz # Locally computed sha256 checksums sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.txt diff --git a/package/python-can/python-can.mk b/package/python-can/python-can.mk index 1ab813e2c9..9284a9cf99 100644 --- a/package/python-can/python-can.mk +++ b/package/python-can/python-can.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_CAN_VERSION = 3.3.4 -PYTHON_CAN_SITE = https://files.pythonhosted.org/packages/97/dd/5e5ae96db41ba57dde127e0600c3d324239ed692e167296c5fdb992cbf41 +PYTHON_CAN_VERSION = 4.0.0 +PYTHON_CAN_SITE = https://files.pythonhosted.org/packages/1f/f7/a643cba269d59e108fe4c1854a8e71d5cdadadd4de1b9c8862b190171122 PYTHON_CAN_SETUP_TYPE = setuptools PYTHON_CAN_LICENSE = LGPL-3.0 PYTHON_CAN_LICENSE_FILES = LICENSE.txt -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 22 11:33:36 2022 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 22 Feb 2022 12:33:36 +0100 Subject: [Buildroot] [PATCH] package/python-pillow: bump to version 9.0.1 Message-ID: <20220222113336.2608916-1-angelo@amarulasolutions.com> Signed-off-by: Angelo Compagnucci --- package/python-pillow/python-pillow.hash | 4 ++-- package/python-pillow/python-pillow.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pillow/python-pillow.hash b/package/python-pillow/python-pillow.hash index f3ca8e6014..88a5d7cada 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 c5af6e413d2fe9247cf16ce25c816b14 Pillow-9.0.0.tar.gz -sha256 ee6e2963e92762923956fe5d3479b1fdc3b76c83f290aad131a2f98c3df0593e Pillow-9.0.0.tar.gz +md5 8deffccb4f402df154fd2fd504d8487c Pillow-9.0.1.tar.gz +sha256 6c8bc8238a7dfdaf7a75f5ec5a663f4173f8c367e5a39f87e720495e1eed75fa Pillow-9.0.1.tar.gz # Locally computed sha256 checksums sha256 a6554cb737ba6c9b47d3301f78de03b4ed0d3f08d6cf9400714f3d4c894f6943 LICENSE diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk index 2f2e817882..901876e0ee 100644 --- a/package/python-pillow/python-pillow.mk +++ b/package/python-pillow/python-pillow.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_PILLOW_VERSION = 9.0.0 -PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/b0/43/3e286c93b9fa20e233d53532cc419b5aad8a468d91065dbef4c846058834 +PYTHON_PILLOW_VERSION = 9.0.1 +PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/03/a3/f61a9a7ff7969cdef2a6e0383a346eb327495d20d25a2de5a088dbb543a6 PYTHON_PILLOW_SOURCE = Pillow-$(PYTHON_PILLOW_VERSION).tar.gz PYTHON_PILLOW_LICENSE = HPND PYTHON_PILLOW_LICENSE_FILES = LICENSE -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 22 11:33:54 2022 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 22 Feb 2022 12:33:54 +0100 Subject: [Buildroot] [PATCH] package/python-pydal: bump to version 20220213.2 Message-ID: <20220222113354.2609277-1-angelo@amarulasolutions.com> Signed-off-by: Angelo Compagnucci --- package/python-pydal/python-pydal.hash | 2 +- package/python-pydal/python-pydal.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/python-pydal/python-pydal.hash b/package/python-pydal/python-pydal.hash index eef00030bd..46271dfd91 100644 --- a/package/python-pydal/python-pydal.hash +++ b/package/python-pydal/python-pydal.hash @@ -1,3 +1,3 @@ # sha256 locally computed -sha256 9634f34a31d4411588b73825c8acc7f73ca69ba8a665bb00d0a9b5baff69498b python-pydal-20210626.3.tar.gz +sha256 40a2cafb5aa830d51ababfe34a8f8a0e3b630bc4f931f04db75ed84c3f55ea38 python-pydal-20220213.2.tar.gz sha256 1f711e93f1e0c2eec576e2e60597dc2ed6f0a661e4749c6b8a39f0d4a72be468 LICENSE.txt diff --git a/package/python-pydal/python-pydal.mk b/package/python-pydal/python-pydal.mk index 428999f5c1..c3be683dda 100644 --- a/package/python-pydal/python-pydal.mk +++ b/package/python-pydal/python-pydal.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_PYDAL_VERSION = 20210626.3 +PYTHON_PYDAL_VERSION = 20220213.2 PYTHON_PYDAL_SITE = $(call github,web2py,pydal,v$(PYTHON_PYDAL_VERSION)) PYTHON_PYDAL_LICENSE = BSD-3-Clause PYTHON_PYDAL_LICENSE_FILES = LICENSE.txt -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 22 11:34:04 2022 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 22 Feb 2022 12:34:04 +0100 Subject: [Buildroot] [PATCH] package/python-web2py: bump to version 2.22.3 Message-ID: <20220222113404.2609626-1-angelo@amarulasolutions.com> Signed-off-by: Angelo Compagnucci --- package/python-web2py/python-web2py.hash | 2 +- package/python-web2py/python-web2py.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/python-web2py/python-web2py.hash b/package/python-web2py/python-web2py.hash index 2ef52b0a5c..5830b71701 100644 --- a/package/python-web2py/python-web2py.hash +++ b/package/python-web2py/python-web2py.hash @@ -1,3 +1,3 @@ # sha256 locally computed -sha256 44556376468139de874e9c29c9ef56e60ecd5f7536c7bee46d74b1f9d4178825 python-web2py-2.21.1.tar.gz +sha256 a779adc5626999c854e9abc976296c2c1059bf6988a421c0bfba923f9b08d8cb python-web2py-2.22.3.tar.gz sha256 2aae96826184a492bc799add49aed7b29036e7aba2d2294fb65053bd30fe55fe LICENSE diff --git a/package/python-web2py/python-web2py.mk b/package/python-web2py/python-web2py.mk index 3e453282a9..b1897978af 100644 --- a/package/python-web2py/python-web2py.mk +++ b/package/python-web2py/python-web2py.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_WEB2PY_VERSION = 2.21.1 +PYTHON_WEB2PY_VERSION = 2.22.3 PYTHON_WEB2PY_SITE = $(call github,web2py,web2py,v$(PYTHON_WEB2PY_VERSION)) PYTHON_WEB2PY_LICENSE = LGPL-3.0 PYTHON_WEB2PY_LICENSE_FILES = LICENSE -- 2.25.1 From aperez at igalia.com Tue Feb 22 12:00:34 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Tue, 22 Feb 2022 14:00:34 +0200 Subject: [Buildroot] [PATCH 1/1] package/glib-networking: security bump to version 2.70.1 Message-ID: <20220222120034.1748652-1-aperez@igalia.com> This is a minor release which fixes a couple of crashes and an incorrect case of TLS certificate velidation when built with the OpenSSL backend. Release notes: https://gitlab.gnome.org/GNOME/glib-networking/-/blob/b0d45b17f745088256c9ad1ae9a7e2467dec6286/NEWS Signed-off-by: Adrian Perez de Castro --- package/glib-networking/glib-networking.hash | 4 ++-- package/glib-networking/glib-networking.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/glib-networking/glib-networking.hash b/package/glib-networking/glib-networking.hash index 6a53b436b0..347ef6777c 100644 --- a/package/glib-networking/glib-networking.hash +++ b/package/glib-networking/glib-networking.hash @@ -1,3 +1,3 @@ -# From http://ftp.gnome.org/pub/gnome/sources/glib-networking/2.70/glib-networking-2.70.0.sha256sum -sha256 66b408e7afa86c582fe38963db56133869ab4b57d34e48ec56aba621940d6f35 glib-networking-2.70.0.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/glib-networking/2.70/glib-networking-2.70.1.sha256sum +sha256 2a16bfc2d271ccd3266e3fb462bc8a4103c02e81bbb339aa92d6fb060592d7bc glib-networking-2.70.1.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/glib-networking/glib-networking.mk b/package/glib-networking/glib-networking.mk index 53280700bc..f74e520d31 100644 --- a/package/glib-networking/glib-networking.mk +++ b/package/glib-networking/glib-networking.mk @@ -5,7 +5,7 @@ ################################################################################ GLIB_NETWORKING_VERSION_MAJOR = 2.70 -GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_VERSION_MAJOR).0 +GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_VERSION_MAJOR).1 GLIB_NETWORKING_SITE = http://ftp.gnome.org/pub/gnome/sources/glib-networking/$(GLIB_NETWORKING_VERSION_MAJOR) GLIB_NETWORKING_SOURCE = glib-networking-$(GLIB_NETWORKING_VERSION).tar.xz GLIB_NETWORKING_INSTALL_STAGING = YES -- 2.35.1 From guillaume.bressaix at gmail.com Tue Feb 22 12:48:47 2022 From: guillaume.bressaix at gmail.com (Guillaume W. Bres) Date: Tue, 22 Feb 2022 13:48:47 +0100 Subject: [Buildroot] [PATCH v3 1/4] package/python-gast: new host-only package Message-ID: <20220222124850.6050-1-guillaume.bressaix@gmail.com> From: "Arnout Vandecappelle (Essensium/Mind)" Generated with scanpypi and converted to host. It is a dependency of python-beniget and python-pythran. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Guillaume W. Bres --- 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.20.1 From guillaume.bressaix at gmail.com Tue Feb 22 12:48:48 2022 From: guillaume.bressaix at gmail.com (Guillaume W. Bres) Date: Tue, 22 Feb 2022 13:48:48 +0100 Subject: [Buildroot] [PATCH v3 2/4] package/python-beniget: new host-only package In-Reply-To: <20220222124850.6050-1-guillaume.bressaix@gmail.com> References: <20220222124850.6050-1-guillaume.bressaix@gmail.com> Message-ID: <20220222124850.6050-2-guillaume.bressaix@gmail.com> From: "Arnout Vandecappelle (Essensium/Mind)" Generated with scanpypi and converted to host. It is a dependency of python-pythran. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Guillaume W. Bres --- 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.20.1 From guillaume.bressaix at gmail.com Tue Feb 22 12:48:49 2022 From: guillaume.bressaix at gmail.com (Guillaume W. Bres) Date: Tue, 22 Feb 2022 13:48:49 +0100 Subject: [Buildroot] [PATCH v3 3/4] package/python-pythran: new host-only package In-Reply-To: <20220222124850.6050-1-guillaume.bressaix@gmail.com> References: <20220222124850.6050-1-guillaume.bressaix@gmail.com> Message-ID: <20220222124850.6050-3-guillaume.bressaix@gmail.com> From: "Arnout Vandecappelle (Essensium/Mind)" Generated with scanpypi and converted to host. It is a dependency of python-scipy. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Guillaume W. Bres --- 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.20.1 From guillaume.bressaix at gmail.com Tue Feb 22 12:48:50 2022 From: guillaume.bressaix at gmail.com (Guillaume W. Bres) Date: Tue, 22 Feb 2022 13:48:50 +0100 Subject: [Buildroot] [PATCH v3 4/4] package/python-scipy: new package In-Reply-To: <20220222124850.6050-1-guillaume.bressaix@gmail.com> References: <20220222124850.6050-1-guillaume.bressaix@gmail.com> Message-ID: <20220222124850.6050-4-guillaume.bressaix@gmail.com> 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) [Guillaume: - -lnpymath: npymath.ini localization problem - -lnpyrandom resolution problem - fix legal-info for latest version LICENSE.txt - zlib is a scipy::io module runtime requirement ] --- v2: -lnpymath is not able to locate npymath.ini, I 'fix' it with an -L flag. -lnpyrandom seems to point to host/usr and not staging/usr I 'fix' it with an -L flag. v3: fix legal-info zlib is a scipy::io module runtime requirement run "python -c 'import scipy; scipy.test();'" to test this package Signed-off-by: Guillaume W. Bres --- 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 | 63 ++++++++++++++++++++++++++ 5 files changed, 105 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 ac702d8d0f..c8766c872e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1149,6 +1149,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 @@ -1280,6 +1281,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 10209d84d7..0edde1c919 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1209,6 +1209,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..6f9011516c --- /dev/null +++ b/package/python-scipy/python-scipy.hash @@ -0,0 +1,9 @@ +# Locally generated +sha256 4042211bed8e6c658b9e2a4ca829806f0b33437faa7878c8dc6d6f72845b1694 scipy-1.7.3.tar.xz +sha256 32b2f41fb8c1193a066c1686bb3237e79f918685bf545cb6dfcb68753ac35152 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..0491a73753 --- /dev/null +++ b/package/python-scipy/python-scipy.mk @@ -0,0 +1,63 @@ +################################################################################ +# +# 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 \ + zlib \ + lapack \ + openblas \ + python-numpy \ + python-pybind +PYTHON_SCIPY_INSTALL_STAGING = YES + +PYTHON_SCIPY_SETUP_TYPE = setuptools +PYTHON_SCIPY_BUILD_OPTS = config_fc --fcompiler=gnu95 + +# -lnpymath npymath.ini localization +PYTHON_SCIPY_NPY_PKG_CONFIG_PATH = \ + $(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/numpy/core/lib/npy-pkg-config + +PYTHON_SCIPY_LDFLAGS = $(TARGET_LDFLAGS) -shared \ + -L$(PYTHON3_PATH)/site-packages/numpy/core/lib +# -lnpyrandom localization +PYTHON_SCIPY_LDFLAGS += \ + -L$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/numpy/random/lib + +PYTHON_SCIPY_ENV = \ + F90=$(TARGET_FC) \ + NPY_PKG_CONFIG_PATH=$(PYTHON_SCIPY_NPY_PKG_CONFIG_PATH) \ + LDFLAGS="$(PYTHON_SCIPY_LDFLAGS)" + +# 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.20.1 From guillaume.bressaix at gmail.com Tue Feb 22 12:57:21 2022 From: guillaume.bressaix at gmail.com (Guillaume W. Bres) Date: Tue, 22 Feb 2022 13:57:21 +0100 Subject: [Buildroot] [PATCH v4 1/4] package/python-gast: new host-only package Message-ID: <20220222125724.11079-1-guillaume.bressaix@gmail.com> From: "Arnout Vandecappelle (Essensium/Mind)" Generated with scanpypi and converted to host. It is a dependency of python-beniget and python-pythran. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Guillaume W. Bres --- 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.20.1 From guillaume.bressaix at gmail.com Tue Feb 22 12:57:22 2022 From: guillaume.bressaix at gmail.com (Guillaume W. Bres) Date: Tue, 22 Feb 2022 13:57:22 +0100 Subject: [Buildroot] [PATCH v4 2/4] package/python-beniget: new host-only package In-Reply-To: <20220222125724.11079-1-guillaume.bressaix@gmail.com> References: <20220222125724.11079-1-guillaume.bressaix@gmail.com> Message-ID: <20220222125724.11079-2-guillaume.bressaix@gmail.com> From: "Arnout Vandecappelle (Essensium/Mind)" Generated with scanpypi and converted to host. It is a dependency of python-pythran. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Guillaume W. Bres --- 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.20.1 From guillaume.bressaix at gmail.com Tue Feb 22 12:57:23 2022 From: guillaume.bressaix at gmail.com (Guillaume W. Bres) Date: Tue, 22 Feb 2022 13:57:23 +0100 Subject: [Buildroot] [PATCH v4 3/4] package/python-pythran: new host-only package In-Reply-To: <20220222125724.11079-1-guillaume.bressaix@gmail.com> References: <20220222125724.11079-1-guillaume.bressaix@gmail.com> Message-ID: <20220222125724.11079-3-guillaume.bressaix@gmail.com> From: "Arnout Vandecappelle (Essensium/Mind)" Generated with scanpypi and converted to host. It is a dependency of python-scipy. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Guillaume W. Bres --- 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.20.1 From guillaume.bressaix at gmail.com Tue Feb 22 12:57:24 2022 From: guillaume.bressaix at gmail.com (Guillaume W. Bres) Date: Tue, 22 Feb 2022 13:57:24 +0100 Subject: [Buildroot] [PATCH v4 4/4] package/python-scipy: new package In-Reply-To: <20220222125724.11079-1-guillaume.bressaix@gmail.com> References: <20220222125724.11079-1-guillaume.bressaix@gmail.com> Message-ID: <20220222125724.11079-4-guillaume.bressaix@gmail.com> 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) [Guillaume: - -lnpymath: npymath.ini localization problem - -lnpyrandom resolution problem - fix legal-info for latest version LICENSE.txt - zlib is a scipy::io module runtime requirement ] Signed-off-by: Guillaume W. Bres --- v2: -lnpymath not able to localize npymath.ini -lnpyrandom points to /host/usr instead of /staging/usr v3: - fix legal-info (LICENSE.txt was outdated) - zlib is a scipy::io module runtime requirement v4: - zlib runtime selection missing in Config.in - fixed previous commit format Signed-off-by: Guillaume W. Bres --- DEVELOPERS | 3 ++ package/Config.in | 1 + package/python-scipy/Config.in | 30 ++++++++++++ package/python-scipy/python-scipy.hash | 9 ++++ package/python-scipy/python-scipy.mk | 63 ++++++++++++++++++++++++++ 5 files changed, 106 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 ac702d8d0f..c8766c872e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1149,6 +1149,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 @@ -1280,6 +1281,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 10209d84d7..0edde1c919 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1209,6 +1209,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..a016d411af --- /dev/null +++ b/package/python-scipy/Config.in @@ -0,0 +1,30 @@ +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_ZLIB # runtime scipy::io + 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..6f9011516c --- /dev/null +++ b/package/python-scipy/python-scipy.hash @@ -0,0 +1,9 @@ +# Locally generated +sha256 4042211bed8e6c658b9e2a4ca829806f0b33437faa7878c8dc6d6f72845b1694 scipy-1.7.3.tar.xz +sha256 32b2f41fb8c1193a066c1686bb3237e79f918685bf545cb6dfcb68753ac35152 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..0491a73753 --- /dev/null +++ b/package/python-scipy/python-scipy.mk @@ -0,0 +1,63 @@ +################################################################################ +# +# 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 \ + zlib \ + lapack \ + openblas \ + python-numpy \ + python-pybind +PYTHON_SCIPY_INSTALL_STAGING = YES + +PYTHON_SCIPY_SETUP_TYPE = setuptools +PYTHON_SCIPY_BUILD_OPTS = config_fc --fcompiler=gnu95 + +# -lnpymath npymath.ini localization +PYTHON_SCIPY_NPY_PKG_CONFIG_PATH = \ + $(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/numpy/core/lib/npy-pkg-config + +PYTHON_SCIPY_LDFLAGS = $(TARGET_LDFLAGS) -shared \ + -L$(PYTHON3_PATH)/site-packages/numpy/core/lib +# -lnpyrandom localization +PYTHON_SCIPY_LDFLAGS += \ + -L$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/numpy/random/lib + +PYTHON_SCIPY_ENV = \ + F90=$(TARGET_FC) \ + NPY_PKG_CONFIG_PATH=$(PYTHON_SCIPY_NPY_PKG_CONFIG_PATH) \ + LDFLAGS="$(PYTHON_SCIPY_LDFLAGS)" + +# 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.20.1 From bugzilla at busybox.net Tue Feb 22 13:25:17 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Tue, 22 Feb 2022 13:25:17 +0000 Subject: [Buildroot] [Bug 14596] package dialog is outdated and contains a bug In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14596 --- Comment #2 from Roman Geile --- (In reply to Andrei Gherghescu from comment #1) Thank you! -- You are receiving this mail because: You are on the CC list for the bug. From mdurrant at arcturusnetworks.com Tue Feb 22 15:37:41 2022 From: mdurrant at arcturusnetworks.com (Michael Durrant) Date: Tue, 22 Feb 2022 10:37:41 -0500 Subject: [Buildroot] [PATCH v5] board/arcturus/aarch64-ucls1012a: bump u-boot and kernel version Message-ID: <20220222153741.15815-1-mdurrant@arcturusnetworks.com> - Bump Linux to version 5.4.137 - Bump U-Boot to add new targets, version remains the same - Drop BR2_ROOTFS_OVERLAY and remove S09modload script because it was only used by PFE and now PFE is loaded directly by the kernel - Use Image.gz instead of Image to have a compressed kernel - Rename ucls1012a.its to br2-ucls1012a.its since post-build.sh and post-image.sh use different name. This fixes the bug that didn't allow the creation of the part0-000000.itb file. Signed-off-by: Oleksandr Zhadan Signed-off-by: Michael Durrant Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti --- V1->V2: - Bump the kernel to "Linux version 5.4.137" - Bootloader version is still "U-Boot 2019.10" but new targets added. - Remove the /etc/init.d/S09modload script to load the pfe firmware module because now the pfe firmware module is loaded by the kernel - New compressed Image.gz is used V2->V3: - Moved SoB to top of patch - The use of Image.gz replace Image to force use of compression. - Our scripts use br2-ucls1012a.its in error ucls1012a.its was used in original readme. - Removing extra newline - The NXP Packet Forward Engine (PFE) firmware loader was the only file used in the overlay. As the PFE is now loaded directly by the kernel the BR2_ROOTFS_OVERLAY script has been removed. V3->V4: - Improved commit log by listing all the changed as suggested by Giulio. - Updated header version comment in defconfig to reflect 5.4 series. V4->V5: - Adding Reviewed-by & Tested-by by Giulio. - Wrapping commit log. --- board/arcturus/aarch64-ucls1012a/post-build.sh | 1 - board/arcturus/aarch64-ucls1012a/readme.txt | 4 ++-- .../rootfs_overlay/etc/init.d/S09modload | 14 -------------- configs/arcturus_ucls1012a_defconfig | 10 +++++----- 4 files changed, 7 insertions(+), 22 deletions(-) delete mode 100755 board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload diff --git a/board/arcturus/aarch64-ucls1012a/post-build.sh b/board/arcturus/aarch64-ucls1012a/post-build.sh index f8ba78095f..372df59c61 100755 --- a/board/arcturus/aarch64-ucls1012a/post-build.sh +++ b/board/arcturus/aarch64-ucls1012a/post-build.sh @@ -1,5 +1,4 @@ #!/bin/sh mkdir -p ${TARGET_DIR}/lib/firmware -cp -f ${BUILD_DIR}/linux-custom/firmware/ppfe/* ${TARGET_DIR}/lib/firmware/ cp -f ${BUILD_DIR}/linux-custom/br2-ucls1012a.its ${BINARIES_DIR}/ diff --git a/board/arcturus/aarch64-ucls1012a/readme.txt b/board/arcturus/aarch64-ucls1012a/readme.txt index 483d5e9aef..b486ecebc7 100644 --- a/board/arcturus/aarch64-ucls1012a/readme.txt +++ b/board/arcturus/aarch64-ucls1012a/readme.txt @@ -24,13 +24,13 @@ After building, you should obtain this tree: output/images/ +-- arc-ucls1012a.dtb - +-- Image + +-- Image.gz +-- part0-000000.itb +-- rootfs.cpio +-- rootfs.cpio.gz +-- rootfs.tar +-- u-boot.bin - +-- ucls1012a.its + +-- br2-ucls1012a.its Flashing -------- diff --git a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload b/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload deleted file mode 100755 index c87ffda14f..0000000000 --- a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -# -case "$1" in - start) - modprobe pfe - ;; - stop) - ;; - restart|reload) - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac diff --git a/configs/arcturus_ucls1012a_defconfig b/configs/arcturus_ucls1012a_defconfig index fd33ebf1f6..124cc3ff94 100644 --- a/configs/arcturus_ucls1012a_defconfig +++ b/configs/arcturus_ucls1012a_defconfig @@ -1,22 +1,22 @@ # Architecture BR2_aarch64=y -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # System settings BR2_TARGET_GENERIC_HOSTNAME="ucls1012a" BR2_TARGET_GENERIC_ISSUE="Welcome to uCLS1012A-SOM" BR2_SYSTEM_DHCP="eth0" -BR2_ROOTFS_OVERLAY="board/arcturus/aarch64-ucls1012a/rootfs_overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="board/arcturus/aarch64-ucls1012a/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/arcturus/aarch64-ucls1012a/post-image.sh" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-kernel,v.20.31)/linux-v.20.31.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-kernel,v.22.06)/linux-v.22.06.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="ucls1012a" +BR2_LINUX_KERNEL_IMAGEGZ=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="arcturus/arc-ucls1012a" @@ -28,7 +28,7 @@ BR2_TARGET_ROOTFS_CPIO_GZIP=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-uboot,v.20.31)/uboot-v.20.31.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-uboot,v.22.06)/uboot-v.22.06.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="UCLS1012A_QSPI128" # Tools -- 2.26.2 From peter at korsgaard.com Tue Feb 22 16:41:25 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Feb 2022 17:41:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/lm-sensors: update LM_SENSORS_VERSION In-Reply-To: <20220206145108.1757971-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 6 Feb 2022 15:51:08 +0100") References: <20220206145108.1757971-1-fontaine.fabrice@gmail.com> Message-ID: <87ley27t1m.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Update LM_SENSORS_VERSION to make it match what is returned by > https://release-monitoring.org > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 22 16:42:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Feb 2022 17:42:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/jack1: drop celt comment In-Reply-To: <20220206143112.1752984-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 6 Feb 2022 15:31:12 +0100") References: <20220206143112.1752984-1-fontaine.fabrice@gmail.com> Message-ID: <87h78q7szg.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Drop celt comment which is not needed since removal of celt051 in commit > b32efbdb0354557db48852478b99080705ba315b > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 22 16:46:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Feb 2022 17:46:19 +0100 Subject: [Buildroot] [git commit] linux/linux.mk: correct LINUX_ARCH_PATH for sparc64 In-Reply-To: <20220208202150.3CF6A82B8F@busybox.osuosl.org> (Arnout Vandecappelle's message of "Tue, 8 Feb 2022 21:24:41 +0100") References: <20220208202150.3CF6A82B8F@busybox.osuosl.org> Message-ID: <87czje7stg.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) writes: > commit: https://git.buildroot.net/buildroot/commit/?id=0ecfdc093227c37ed1083e43404b748e8ee8a323 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > 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 > 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 Tue Feb 22 16:47:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Feb 2022 17:47:50 +0100 Subject: [Buildroot] [git commit] package/python-pyzmq: drop python2 dependency for comment In-Reply-To: <20220209202625.6067482B8F@busybox.osuosl.org> (Yann E. MORIN's message of "Wed, 9 Feb 2022 21:31:36 +0100") References: <20220209202625.6067482B8F@busybox.osuosl.org> Message-ID: <878ru27sqx.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > commit: https://git.buildroot.net/buildroot/commit/?id=6e9ecaa0c9d9aea41212566a58ffab5e25e52bda > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > The package was updated to support python3 in commit 4a8bedc51d9 > (python-pyzmq: enable PyZMQ for Python 3), but the comment dependency was > missed. > Signed-off-by: Peter Korsgaard > Signed-off-by: Yann E. MORIN Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 22 16:45:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Feb 2022 17:45:56 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] linux/linux.mk: correct LINUX_ARCH_PATH for sparc64 Message-ID: <20220222164020.94A5F8380B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=199aa46d67c069bdbc326fcd130401ee6d3c07ec branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 0ecfdc093227c37ed1083e43404b748e8ee8a323) Signed-off-by: Peter Korsgaard --- linux/linux.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/linux/linux.mk b/linux/linux.mk index 7114c8d20c..adde7a2c1d 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -237,6 +237,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 From peter at korsgaard.com Tue Feb 22 16:42:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Feb 2022 17:42:27 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/jack1: drop celt comment Message-ID: <20220222164020.8C3D57FCA2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5ea5466832baee7444e36f4defc2444cadf97af3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Drop celt comment which is not needed since removal of celt051 in commit b32efbdb0354557db48852478b99080705ba315b Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit c6e200383cdf738f58fe1c6e42d3d5a10f7c1a62) Signed-off-by: Peter Korsgaard --- package/jack1/jack1.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/jack1/jack1.mk b/package/jack1/jack1.mk index 2f97434ebe..311f7c9ba0 100644 --- a/package/jack1/jack1.mk +++ b/package/jack1/jack1.mk @@ -11,8 +11,6 @@ JACK1_LICENSE = GPL-2.0+ (jack server), LGPL-2.1+ (jack library) JACK1_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL JACK1_INSTALL_STAGING = YES -# Dependency to celt can't be met: jack1 requires celt >= 0.8.0 but we -# only have 0.5.1.3 and we cannot upgrade. JACK1_DEPENDENCIES = host-pkgconf alsa-lib berkeleydb libsamplerate libsndfile ifeq ($(BR2_PACKAGE_READLINE),y) From peter at korsgaard.com Tue Feb 22 16:47:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Feb 2022 17:47:39 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/python-pyzmq: drop python2 dependency for comment Message-ID: <20220222164020.9CB85837EA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=674f2f0d451192ceb497f2f92bdecc67100b52d9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x The package was updated to support python3 in commit 4a8bedc51d9 (python-pyzmq: enable PyZMQ for Python 3), but the comment dependency was missed. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 6e9ecaa0c9d9aea41212566a58ffab5e25e52bda) Signed-off-by: Peter Korsgaard --- package/python-pyzmq/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/python-pyzmq/Config.in b/package/python-pyzmq/Config.in index 8f33a635c8..f8ce52f844 100644 --- a/package/python-pyzmq/Config.in +++ b/package/python-pyzmq/Config.in @@ -9,5 +9,4 @@ config BR2_PACKAGE_PYTHON_PYZMQ http://zeromq.org/bindings:python comment "python-pyzmq needs a toolchain w/ C++, threads" - depends on BR2_PACKAGE_PYTHON depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS) From peter at korsgaard.com Tue Feb 22 16:39:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Feb 2022 17:39:17 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/lm-sensors: update LM_SENSORS_VERSION Message-ID: <20220222164020.84412837EA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=64f79776487a8573192e7477b96ff95655e1a097 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Update LM_SENSORS_VERSION to make it match what is returned by https://release-monitoring.org Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 521afeab9b7c0b07a849355e8b1c1fde0965c84f) Signed-off-by: Peter Korsgaard --- package/lm-sensors/lm-sensors.hash | 2 +- package/lm-sensors/lm-sensors.mk | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/lm-sensors/lm-sensors.hash b/package/lm-sensors/lm-sensors.hash index 0ca07b7e69..c941043343 100644 --- a/package/lm-sensors/lm-sensors.hash +++ b/package/lm-sensors/lm-sensors.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 0591f9fa0339f0d15e75326d0365871c2d4e2ed8aa1ff759b3a55d3734b7d197 lm-sensors-3-6-0.tar.gz +sha256 0591f9fa0339f0d15e75326d0365871c2d4e2ed8aa1ff759b3a55d3734b7d197 lm-sensors-3.6.0.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL diff --git a/package/lm-sensors/lm-sensors.mk b/package/lm-sensors/lm-sensors.mk index 8975efaffa..1bf27fc25a 100644 --- a/package/lm-sensors/lm-sensors.mk +++ b/package/lm-sensors/lm-sensors.mk @@ -4,8 +4,9 @@ # ################################################################################ -LM_SENSORS_VERSION = 3-6-0 -LM_SENSORS_SITE = $(call github,lm-sensors,lm-sensors,V$(LM_SENSORS_VERSION)) +LM_SENSORS_VERSION = 3.6.0 +LM_SENSORS_SITE = \ + $(call github,lm-sensors,lm-sensors,V$(subst .,-,$(LM_SENSORS_VERSION))) LM_SENSORS_INSTALL_STAGING = YES LM_SENSORS_DEPENDENCIES = host-bison host-flex LM_SENSORS_LICENSE = LGPL-2.1+ (libsensors), GPL-2.0+ (programs) From peter at korsgaard.com Tue Feb 22 16:42:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Feb 2022 17:42:22 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/jack1: drop celt comment Message-ID: <20220222164312.0F9F583827@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2e2990954a6d90115eedc34e892c269f0bd6e6c8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Drop celt comment which is not needed since removal of celt051 in commit b32efbdb0354557db48852478b99080705ba315b Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit c6e200383cdf738f58fe1c6e42d3d5a10f7c1a62) Signed-off-by: Peter Korsgaard --- package/jack1/jack1.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/jack1/jack1.mk b/package/jack1/jack1.mk index 2f97434ebe..311f7c9ba0 100644 --- a/package/jack1/jack1.mk +++ b/package/jack1/jack1.mk @@ -11,8 +11,6 @@ JACK1_LICENSE = GPL-2.0+ (jack server), LGPL-2.1+ (jack library) JACK1_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL JACK1_INSTALL_STAGING = YES -# Dependency to celt can't be met: jack1 requires celt >= 0.8.0 but we -# only have 0.5.1.3 and we cannot upgrade. JACK1_DEPENDENCIES = host-pkgconf alsa-lib berkeleydb libsamplerate libsndfile ifeq ($(BR2_PACKAGE_READLINE),y) From peter at korsgaard.com Tue Feb 22 16:40:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Feb 2022 17:40:49 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/lm-sensors: update LM_SENSORS_VERSION Message-ID: <20220222164312.052F883817@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f487a0e33d3d104197c3690d0c8324122f26db91 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Update LM_SENSORS_VERSION to make it match what is returned by https://release-monitoring.org Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 521afeab9b7c0b07a849355e8b1c1fde0965c84f) Signed-off-by: Peter Korsgaard --- package/lm-sensors/lm-sensors.hash | 2 +- package/lm-sensors/lm-sensors.mk | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/lm-sensors/lm-sensors.hash b/package/lm-sensors/lm-sensors.hash index 0ca07b7e69..c941043343 100644 --- a/package/lm-sensors/lm-sensors.hash +++ b/package/lm-sensors/lm-sensors.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 0591f9fa0339f0d15e75326d0365871c2d4e2ed8aa1ff759b3a55d3734b7d197 lm-sensors-3-6-0.tar.gz +sha256 0591f9fa0339f0d15e75326d0365871c2d4e2ed8aa1ff759b3a55d3734b7d197 lm-sensors-3.6.0.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL diff --git a/package/lm-sensors/lm-sensors.mk b/package/lm-sensors/lm-sensors.mk index 8975efaffa..1bf27fc25a 100644 --- a/package/lm-sensors/lm-sensors.mk +++ b/package/lm-sensors/lm-sensors.mk @@ -4,8 +4,9 @@ # ################################################################################ -LM_SENSORS_VERSION = 3-6-0 -LM_SENSORS_SITE = $(call github,lm-sensors,lm-sensors,V$(LM_SENSORS_VERSION)) +LM_SENSORS_VERSION = 3.6.0 +LM_SENSORS_SITE = \ + $(call github,lm-sensors,lm-sensors,V$(subst .,-,$(LM_SENSORS_VERSION))) LM_SENSORS_INSTALL_STAGING = YES LM_SENSORS_DEPENDENCIES = host-bison host-flex LM_SENSORS_LICENSE = LGPL-2.1+ (libsensors), GPL-2.0+ (programs) From peter at korsgaard.com Tue Feb 22 16:46:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Feb 2022 17:46:03 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] linux/linux.mk: correct LINUX_ARCH_PATH for sparc64 Message-ID: <20220222164312.1AFF883828@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d0b10e44733bae48dcb35c388ea324750c5df8a3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 0ecfdc093227c37ed1083e43404b748e8ee8a323) Signed-off-by: Peter Korsgaard --- linux/linux.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/linux/linux.mk b/linux/linux.mk index 61fdc0c76c..b047061c3d 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -231,6 +231,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 From peter at korsgaard.com Tue Feb 22 16:47:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Feb 2022 17:47:04 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/python-pyzmq: drop python2 dependency for comment Message-ID: <20220222164312.2593083486@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=16a75a76af63147a94c7df1c38e5568eb0ab8609 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x The package was updated to support python3 in commit 4a8bedc51d9 (python-pyzmq: enable PyZMQ for Python 3), but the comment dependency was missed. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 6e9ecaa0c9d9aea41212566a58ffab5e25e52bda) Signed-off-by: Peter Korsgaard --- package/python-pyzmq/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/python-pyzmq/Config.in b/package/python-pyzmq/Config.in index 8f33a635c8..f8ce52f844 100644 --- a/package/python-pyzmq/Config.in +++ b/package/python-pyzmq/Config.in @@ -9,5 +9,4 @@ config BR2_PACKAGE_PYTHON_PYZMQ http://zeromq.org/bindings:python comment "python-pyzmq needs a toolchain w/ C++, threads" - depends on BR2_PACKAGE_PYTHON depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS) From peter at korsgaard.com Tue Feb 22 16:53:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Feb 2022 17:53:20 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libarchive: security bump to version 3.5.3 Message-ID: <20220222164534.EC45B83829@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f3da0a3fce561e961c47a436838b1ffe9ac41b5e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Libarchive 3.5.3 is a security release Security Fixes: - extended fix for following symlinks when processing the fixup list (CVE-2021-31566) - fix invalid memory access and out of bounds read in RAR5 reader (CVE-2021-36976) https://github.com/libarchive/libarchive/releases/tag/v3.5.3 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 99d3d6afe7a5df12552d0d305743f64abdd155c4) Signed-off-by: Peter Korsgaard --- package/libarchive/libarchive.hash | 2 +- package/libarchive/libarchive.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libarchive/libarchive.hash b/package/libarchive/libarchive.hash index d31e9f55f4..5dd8e5c167 100644 --- a/package/libarchive/libarchive.hash +++ b/package/libarchive/libarchive.hash @@ -1,4 +1,4 @@ # From https://www.libarchive.de/downloads/sha256sums -sha256 f0b19ff39c3c9a5898a219497ababbadab99d8178acc980155c7e1271089b5a0 libarchive-3.5.2.tar.xz +sha256 5cac725dd4be31c4a10b65d30f29dc957ea29ef3d758df6e46e8ae90a996a19a libarchive-3.5.3.tar.xz # Locally computed: sha256 b2cdf763345de2de34cebf54394df3c61a105c3b71288603c251f2fa638200ba COPYING diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk index eec256ba75..cf16c27e67 100644 --- a/package/libarchive/libarchive.mk +++ b/package/libarchive/libarchive.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBARCHIVE_VERSION = 3.5.2 +LIBARCHIVE_VERSION = 3.5.3 LIBARCHIVE_SOURCE = libarchive-$(LIBARCHIVE_VERSION).tar.xz LIBARCHIVE_SITE = https://www.libarchive.de/downloads LIBARCHIVE_INSTALL_STAGING = YES From peter at korsgaard.com Tue Feb 22 16:54:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Feb 2022 17:54:04 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/libarchive: security bump to version 3.5.3 Message-ID: <20220222164613.BBFC38382E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c61c94a84e0afeb48a9b672153bece6b49a70a28 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Libarchive 3.5.3 is a security release Security Fixes: - extended fix for following symlinks when processing the fixup list (CVE-2021-31566) - fix invalid memory access and out of bounds read in RAR5 reader (CVE-2021-36976) https://github.com/libarchive/libarchive/releases/tag/v3.5.3 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 99d3d6afe7a5df12552d0d305743f64abdd155c4) Signed-off-by: Peter Korsgaard --- package/libarchive/libarchive.hash | 2 +- package/libarchive/libarchive.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libarchive/libarchive.hash b/package/libarchive/libarchive.hash index d31e9f55f4..5dd8e5c167 100644 --- a/package/libarchive/libarchive.hash +++ b/package/libarchive/libarchive.hash @@ -1,4 +1,4 @@ # From https://www.libarchive.de/downloads/sha256sums -sha256 f0b19ff39c3c9a5898a219497ababbadab99d8178acc980155c7e1271089b5a0 libarchive-3.5.2.tar.xz +sha256 5cac725dd4be31c4a10b65d30f29dc957ea29ef3d758df6e46e8ae90a996a19a libarchive-3.5.3.tar.xz # Locally computed: sha256 b2cdf763345de2de34cebf54394df3c61a105c3b71288603c251f2fa638200ba COPYING diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk index eec256ba75..cf16c27e67 100644 --- a/package/libarchive/libarchive.mk +++ b/package/libarchive/libarchive.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBARCHIVE_VERSION = 3.5.2 +LIBARCHIVE_VERSION = 3.5.3 LIBARCHIVE_SOURCE = libarchive-$(LIBARCHIVE_VERSION).tar.xz LIBARCHIVE_SITE = https://www.libarchive.de/downloads LIBARCHIVE_INSTALL_STAGING = YES From peter at korsgaard.com Tue Feb 22 16:54:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Feb 2022 17:54:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/libarchive: security bump to version 3.5.3 In-Reply-To: <20220209193614.330861-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 9 Feb 2022 20:36:14 +0100") References: <20220209193614.330861-1-fontaine.fabrice@gmail.com> Message-ID: <874k4q7sgd.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Libarchive 3.5.3 is a security release > Security Fixes: > - extended fix for following symlinks when processing the fixup list > (CVE-2021-31566) > - fix invalid memory access and out of bounds read in RAR5 reader > (CVE-2021-36976) > https://github.com/libarchive/libarchive/releases/tag/v3.5.3 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 22 16:55:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Feb 2022 17:55:08 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gauche: drop autoreconf Message-ID: <20220222164718.9944183831@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2521b5bbb9e0e07ef0ae906f710af5044ae13df6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Commit 11cb72be570409be77d4bb49c17b4a2feef31be7 forgot to drop autoreconf Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 5f703276e0713b746f2c937c4c4fc02ef6ad1d77) Signed-off-by: Peter Korsgaard --- package/gauche/gauche.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/gauche/gauche.mk b/package/gauche/gauche.mk index 2520379369..fe0a613a9d 100644 --- a/package/gauche/gauche.mk +++ b/package/gauche/gauche.mk @@ -10,8 +10,6 @@ GAUCHE_SITE = http://downloads.sourceforge.net/project/gauche/Gauche GAUCHE_LICENSE = BSD-3-Clause, Boehm-gc, SRFI (srfi-11.scm), reload (reload.scm) GAUCHE_LICENSE_FILES = COPYING GAUCHE_DEPENDENCIES = host-gauche -# We're patching configure.ac -GAUCHE_AUTORECONF = YES HOST_GAUCHE_CONF_OPTS = --without-zlib GAUCHE_CONF_OPTS = --without-libatomic-ops From peter at korsgaard.com Tue Feb 22 16:55:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Feb 2022 17:55:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/gauche: drop autoreconf In-Reply-To: <20220209201444.352250-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 9 Feb 2022 21:14:44 +0100") References: <20220209201444.352250-1-fontaine.fabrice@gmail.com> Message-ID: <87zgmi6dtv.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Commit 11cb72be570409be77d4bb49c17b4a2feef31be7 forgot to drop > autoreconf > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Tue Feb 22 17:49:57 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 22 Feb 2022 18:49:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pycli: drop package Message-ID: <20220222174957.3086493-1-fontaine.fabrice@gmail.com> Even with the two upstream patches added in commit b2e6e376a2d7551ccf146855ec4e99a65c35bd16, python-pycli still raises the following build failure since bump of python3 to version 3.10.1 in commit 25b1fc2898d68ddf2674b14c738045875fc5a2dc due to the new "Multiple Exception types without parentheses" exception (https://docs.python.org/3/whatsnew/3.10.html): error: File "/usr/lib/python3.10/site-packages/cli/test.py", line 142 except raises, e: ^^^^^^^^^ SyntaxError: multiple exception types must be parenthesized So drop the package as the last release was made 10 years ago. Fixes: - http://autobuild.buildroot.org/results/6112e1830ce608abcea4a26b659c10e5ff09a66a Signed-off-by: Fabrice Fontaine --- Config.in.legacy | 7 ++++ DEVELOPERS | 1 - package/Config.in | 1 - ...aise-exceptions-in-wrapped-functions.patch | 26 ------------ ...pt-statement-changed-slightly-in-2-6.patch | 41 ------------------- package/python-pycli/Config.in | 7 ---- package/python-pycli/python-pycli.hash | 5 --- package/python-pycli/python-pycli.mk | 14 ------- 8 files changed, 7 insertions(+), 95 deletions(-) delete mode 100644 package/python-pycli/0001-Fix-problem-with-re-raise-exceptions-in-wrapped-functions.patch delete mode 100644 package/python-pycli/0002-except-statement-changed-slightly-in-2-6.patch delete mode 100644 package/python-pycli/Config.in delete mode 100644 package/python-pycli/python-pycli.hash delete mode 100644 package/python-pycli/python-pycli.mk diff --git a/Config.in.legacy b/Config.in.legacy index aefb0ba6ea..99459c7ad3 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_PYCLI + bool "python-pycli removed" + select BR2_LEGACY + help + Package was removed because it is not compatible with python + 3.10 and is not maintained anymore (no release since 2012). + config BR2_PACKAGE_LINUX_TOOLS_BPFTOOL bool "bpftool was moved" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 3e7c753836..6208df974d 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1065,7 +1065,6 @@ N: Geoff Levand F: package/flannel/ N: Geoffrey Ragot -F: package/python-pycli/ F: package/python-pyyaml/ N: Gerome Burlats diff --git a/package/Config.in b/package/Config.in index 3213c4a9b4..ed7d9555b2 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1144,7 +1144,6 @@ menu "External python modules" source "package/python-pybind/Config.in" source "package/python-pycairo/Config.in" source "package/python-pycares/Config.in" - source "package/python-pycli/Config.in" source "package/python-pycparser/Config.in" source "package/python-pycryptodomex/Config.in" source "package/python-pycups/Config.in" diff --git a/package/python-pycli/0001-Fix-problem-with-re-raise-exceptions-in-wrapped-functions.patch b/package/python-pycli/0001-Fix-problem-with-re-raise-exceptions-in-wrapped-functions.patch deleted file mode 100644 index 7ac9d7af9f..0000000000 --- a/package/python-pycli/0001-Fix-problem-with-re-raise-exceptions-in-wrapped-functions.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 57c563f8b47a56feefc0a8bcbef05f4b54280549 Mon Sep 17 00:00:00 2001 -From: mmbutter -Date: Tue, 9 Jun 2020 11:50:41 -0500 -Subject: [PATCH] Fix problem with re-raise exceptions in wrapped functions. - -[Retrieved from: -https://github.com/whilp/cli/commit/57c563f8b47a56feefc0a8bcbef05f4b54280549] -Signed-off-by: Fabrice Fontaine ---- - lib/cli/app.py | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/lib/cli/app.py b/lib/cli/app.py -index 7b6db52..f487ab4 100644 ---- a/lib/cli/app.py -+++ b/lib/cli/app.py -@@ -240,6 +240,9 @@ def run(self): - try: - returned = self.main(*args) - except Exception, e: -+ elif isinstance(e, self.reraise): -+ # raising the last exception preserves traceback -+ raise - returned = e - - return self.post_run(returned) diff --git a/package/python-pycli/0002-except-statement-changed-slightly-in-2-6.patch b/package/python-pycli/0002-except-statement-changed-slightly-in-2-6.patch deleted file mode 100644 index 75869d6d23..0000000000 --- a/package/python-pycli/0002-except-statement-changed-slightly-in-2-6.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 2af95cff5609142ec14efdf13b394f9b0121ab2e Mon Sep 17 00:00:00 2001 -From: mmbutter -Date: Thu, 11 Jun 2020 15:50:03 -0500 -Subject: [PATCH] except statement changed slightly in 2.6. This could cause - problems in newer versions. Updated to the new format. - -[Retrieved from: -https://github.com/whilp/cli/commit/2af95cff5609142ec14efdf13b394f9b0121ab2e] -Signed-off-by: Fabrice Fontaine ---- - lib/cli/app.py | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/lib/cli/app.py b/lib/cli/app.py -index f487ab4..45256b8 100644 ---- a/lib/cli/app.py -+++ b/lib/cli/app.py -@@ -239,10 +239,10 @@ def run(self): - args = () - try: - returned = self.main(*args) -- except Exception, e: -- elif isinstance(e, self.reraise): -- # raising the last exception preserves traceback -- raise -+ except self.reraise: -+ # raising the last exception preserves traceback -+ raise -+ except Exception as e: - returned = e - - return self.post_run(returned) -@@ -420,7 +420,7 @@ def pre_run(self): - """ - try: - ns = self.argparser.parse_args() -- except SystemExit, e: -+ except SystemExit as e: - if self.exit_after_main: - raise - else: diff --git a/package/python-pycli/Config.in b/package/python-pycli/Config.in deleted file mode 100644 index e1ce3b99a6..0000000000 --- a/package/python-pycli/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYCLI - bool "python-pycli" - help - The cli package is a framework for making simple, correct - command line applications in Python. - - https://pythonhosted.org/pyCLI/ diff --git a/package/python-pycli/python-pycli.hash b/package/python-pycli/python-pycli.hash deleted file mode 100644 index f0890e83a9..0000000000 --- a/package/python-pycli/python-pycli.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5 from https://pypi.python.org/pypi/pycli/json -md5 89c487e7c8068ce05d63394d2ae7ebad pyCLI-2.0.3.tar.gz -# Locally computed -sha256 bc53e6c5db031ae1c05d131641f153d22a201c5e82cc8c9324a945752efbb622 pyCLI-2.0.3.tar.gz -sha256 591490b2ef462a4ad2be1aae5dd47738cb17e191c82d3ba38c3ae906d288e6ba lib/cli/__init__.py diff --git a/package/python-pycli/python-pycli.mk b/package/python-pycli/python-pycli.mk deleted file mode 100644 index 7aff1c6200..0000000000 --- a/package/python-pycli/python-pycli.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-pycli -# -################################################################################ - -PYTHON_PYCLI_VERSION = 2.0.3 -PYTHON_PYCLI_SOURCE = pyCLI-$(PYTHON_PYCLI_VERSION).tar.gz -PYTHON_PYCLI_SITE = https://pypi.python.org/packages/95/fc/b2d86a5fbdac4072bcf70b01674b612e1a13026f54962c878fe3eca36fd1 -PYTHON_PYCLI_LICENSE = ISC-like -PYTHON_PYCLI_LICENSE_FILES = lib/cli/__init__.py -PYTHON_PYCLI_SETUP_TYPE = setuptools - -$(eval $(python-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Tue Feb 22 17:52:26 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 22 Feb 2022 18:52:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/sconeserver: fix build with gcc 4.8 Message-ID: <20220222175226.3086883-1-fontaine.fabrice@gmail.com> Fix the following build failure with gcc 4.8 raised since the addition of -std=c++11 in commit b9eca021594470341bec2876edc0a27251f3f9b2: sconex.cpp: In function 'scx::Date& scx::build_time()': sconex.cpp:52:36: error: unable to find string literal operator 'operator"" __TIME__' static Date s_build_time(__DATE__" "__TIME__,true); ^ Fixes: - http://autobuild.buildroot.org/results/83ecf772965b4586eaea2682871a85732df7d62f Signed-off-by: Fabrice Fontaine --- package/sconeserver/0002-CMake-ify.patch | 173 +++++++++++++++++++++++ 1 file changed, 173 insertions(+) create mode 100644 package/sconeserver/0002-CMake-ify.patch diff --git a/package/sconeserver/0002-CMake-ify.patch b/package/sconeserver/0002-CMake-ify.patch new file mode 100644 index 0000000000..810c803469 --- /dev/null +++ b/package/sconeserver/0002-CMake-ify.patch @@ -0,0 +1,173 @@ +From 0cb655721d7f8aa5d6d14fc1dfce18c518ce2419 Mon Sep 17 00:00:00 2001 +From: Andrew Wedgbury +Date: Mon, 19 Aug 2019 21:12:59 +0000 +Subject: [PATCH] CMake-ify + +[Retrieve (and updated to only keep fix on sconex.cpp) from: +https://github.com/sconemad/sconeserver/commit/0cb655721d7f8aa5d6d14fc1dfce18c518ce2419] +Signed-off-by: Fabrice Fontaine +--- + .gitignore | 5 + + CMakeLists.txt | 52 ++++ + Makefile.am | 58 ---- + autogen.sh | 8 - + bluetooth/CMakeLists.txt | 16 + + bluetooth/Makefile.am | 22 -- + config.h.in | 335 +-------------------- + configure.in | 451 ---------------------------- + debian/rules | 10 +- + debian/sconeserver-base.install | 2 +- + debian/sconeserver-dev.install | 4 +- + examples/Makefile.am | 4 - + examples/rot13/CMakeLists.txt | 9 + + examples/rot13/Makefile.am | 24 -- + examples/tuesdayonly/CMakeLists.txt | 7 + + examples/tuesdayonly/Makefile.am | 18 -- + exec/CMakeLists.txt | 9 + + exec/Makefile.am | 24 -- + forward/CMakeLists.txt | 8 + + forward/Makefile.am | 19 -- + http/CMakeLists.txt | 51 ++++ + http/Makefile.am | 58 ---- + image/CMakeLists.txt | 12 + + image/Makefile.am | 20 -- + ip/CMakeLists.txt | 9 + + ip/Makefile.am | 21 -- + ip6/CMakeLists.txt | 9 + + ip6/Makefile.am | 21 -- + local/CMakeLists.txt | 9 + + local/Makefile.am | 21 -- + location/CMakeLists.txt | 11 + + location/Makefile.am | 18 -- + main.cpp | 4 +- + markdown/CMakeLists.txt | 20 ++ + markdown/Makefile.am | 21 -- + maths/CMakeLists.txt | 32 ++ + maths/Makefile.am | 33 -- + mime/CMakeLists.txt | 8 + + mime/Makefile.am | 19 -- + mysql/CMakeLists.txt | 16 + + mysql/Makefile.am | 25 -- + rss/CMakeLists.txt | 15 + + rss/Makefile.am | 23 -- + sconeserver.cmake | 31 ++ + sconesite/CMakeLists.txt | 42 +++ + sconesite/Makefile.am | 79 ----- + sconex/Base64.cpp | 2 +- + sconex/CMakeLists.txt | 97 ++++++ + sconex/Database.cpp | 2 +- + sconex/FileDir.h | 4 +- + sconex/Makefile.am | 156 ---------- + sconex/ModuleLoader.cpp | 2 +- + sconex/Process.cpp | 8 - + sconex/RegExp.cpp | 4 - + sconex/RegExp.h | 4 +- + sconex/ScriptContext.cpp | 7 +- + sconex/ScriptTypes.cpp | 2 +- + sconex/TermBuffer.cpp | 7 +- + sconex/sconex.cpp | 4 +- + sconex/sconex.h | 176 +++-------- + sconex/utils.cpp | 4 - + server/CMakeLists.txt | 19 ++ + server/Makefile.am | 26 -- + simple/CMakeLists.txt | 15 + + simple/Makefile.am | 21 -- + smtp/CMakeLists.txt | 15 + + smtp/Makefile.am | 21 -- + sqlite/CMakeLists.txt | 23 ++ + sqlite/Makefile.am | 25 -- + ssl/CMakeLists.txt | 23 ++ + ssl/Makefile.am | 30 -- + stat/CMakeLists.txt | 17 ++ + stat/Makefile.am | 23 -- + test/CMakeLists.txt | 13 + + test/Makefile.am | 53 ---- + testbuilder/CMakeLists.txt | 23 ++ + testbuilder/Makefile.am | 36 --- + tftp/CMakeLists.txt | 17 ++ + tftp/Makefile.am | 23 -- + upstart | 13 - + 80 files changed, 695 insertions(+), 1933 deletions(-) + create mode 100644 CMakeLists.txt + delete mode 100644 Makefile.am + delete mode 100755 autogen.sh + create mode 100644 bluetooth/CMakeLists.txt + delete mode 100644 bluetooth/Makefile.am + delete mode 100644 configure.in + delete mode 100644 examples/Makefile.am + create mode 100644 examples/rot13/CMakeLists.txt + delete mode 100644 examples/rot13/Makefile.am + create mode 100644 examples/tuesdayonly/CMakeLists.txt + delete mode 100644 examples/tuesdayonly/Makefile.am + create mode 100644 exec/CMakeLists.txt + delete mode 100644 exec/Makefile.am + create mode 100644 forward/CMakeLists.txt + delete mode 100644 forward/Makefile.am + create mode 100644 http/CMakeLists.txt + delete mode 100644 http/Makefile.am + create mode 100644 image/CMakeLists.txt + delete mode 100644 image/Makefile.am + create mode 100644 ip/CMakeLists.txt + delete mode 100644 ip/Makefile.am + create mode 100644 ip6/CMakeLists.txt + delete mode 100644 ip6/Makefile.am + create mode 100644 local/CMakeLists.txt + delete mode 100644 local/Makefile.am + create mode 100644 location/CMakeLists.txt + delete mode 100644 location/Makefile.am + create mode 100644 markdown/CMakeLists.txt + delete mode 100644 markdown/Makefile.am + create mode 100644 maths/CMakeLists.txt + delete mode 100644 maths/Makefile.am + create mode 100644 mime/CMakeLists.txt + delete mode 100644 mime/Makefile.am + create mode 100644 mysql/CMakeLists.txt + delete mode 100644 mysql/Makefile.am + create mode 100644 rss/CMakeLists.txt + delete mode 100644 rss/Makefile.am + create mode 100644 sconeserver.cmake + create mode 100644 sconesite/CMakeLists.txt + delete mode 100644 sconesite/Makefile.am + create mode 100644 sconex/CMakeLists.txt + delete mode 100644 sconex/Makefile.am + create mode 100644 server/CMakeLists.txt + delete mode 100644 server/Makefile.am + create mode 100644 simple/CMakeLists.txt + delete mode 100644 simple/Makefile.am + create mode 100644 smtp/CMakeLists.txt + delete mode 100644 smtp/Makefile.am + create mode 100644 sqlite/CMakeLists.txt + delete mode 100644 sqlite/Makefile.am + create mode 100644 ssl/CMakeLists.txt + delete mode 100644 ssl/Makefile.am + create mode 100644 stat/CMakeLists.txt + delete mode 100644 stat/Makefile.am + create mode 100644 test/CMakeLists.txt + delete mode 100644 test/Makefile.am + create mode 100644 testbuilder/CMakeLists.txt + delete mode 100644 testbuilder/Makefile.am + create mode 100644 tftp/CMakeLists.txt + delete mode 100644 tftp/Makefile.am + delete mode 100644 upstart + +diff --git a/sconex/sconex.cpp b/sconex/sconex.cpp +index 1b9fc97..a0ba8c1 100644 +--- a/sconex/sconex.cpp ++++ b/sconex/sconex.cpp +@@ -35,7 +35,7 @@ VersionTag& version() + const std::string& sconex_copyright() + { + static std::string s_copyright = +- "Copyright (c) 2000-2017 Andrew Wedgbury "; ++ "Copyright (c) 2000-2018 Andrew Wedgbury "; + return s_copyright; + } + +@@ -49,7 +49,7 @@ const std::string& build_type() + //========================================================================= + Date& build_time() + { +- static Date s_build_time(__DATE__" "__TIME__,true); ++ static Date s_build_time( __DATE__ " " __TIME__ ,true); + return s_build_time; + } -- 2.34.1 From fperrad at gmail.com Mon Feb 21 04:30:31 2022 From: fperrad at gmail.com (Francois Perrad) Date: Mon, 21 Feb 2022 05:30:31 +0100 Subject: [Buildroot] [PATCH 0/3] portable services: another use case of BR Message-ID: <20220221043034.2736010-1-francois.perrad@gadz.org> This series allows to build a rootfs suitable for portable services with systemd. A new value of "Init system" is introduced : BR2_INIT_PORTABLE. BR2_INIT_PORTABLE is like BR2_INIT_NONE, but with all FOO_INSTALL_INIT_SYSTEMD executed. A new type of skeleton is required : BR2_PACKAGE_SKELETON_INIT_PORTABLE. see https://systemd.io/PORTABLE_SERVICES/ Francois Perrad (3): package/skeleton-init-portable: new skeleton portable: new init system portable: tweak some default values DEVELOPERS | 1 + fs/squashfs/Config.in | 1 + package/Config.in | 1 + package/ifupdown-scripts/Config.in | 2 +- package/pkg-generic.mk | 2 ++ package/skeleton-init-portable/Config.in | 7 ++++++ .../skeleton-init-portable.mk | 23 +++++++++++++++++++ system/Config.in | 18 +++++++++++---- 8 files changed, 50 insertions(+), 5 deletions(-) create mode 100644 package/skeleton-init-portable/Config.in create mode 100644 package/skeleton-init-portable/skeleton-init-portable.mk -- 2.32.0 From fperrad at gmail.com Mon Feb 21 04:30:32 2022 From: fperrad at gmail.com (Francois Perrad) Date: Mon, 21 Feb 2022 05:30:32 +0100 Subject: [Buildroot] [PATCH 1/3] package/skeleton-init-portable: new skeleton In-Reply-To: <20220221043034.2736010-1-francois.perrad@gadz.org> References: <20220221043034.2736010-1-francois.perrad@gadz.org> Message-ID: <20220221043034.2736010-2-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- DEVELOPERS | 1 + package/Config.in | 1 + package/skeleton-init-portable/Config.in | 7 ++++++ .../skeleton-init-portable.mk | 23 +++++++++++++++++++ 4 files changed, 32 insertions(+) create mode 100644 package/skeleton-init-portable/Config.in create mode 100644 package/skeleton-init-portable/skeleton-init-portable.mk diff --git a/DEVELOPERS b/DEVELOPERS index ac702d8d0..7cafd6c95 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1010,6 +1010,7 @@ F: package/pkg-perl.mk F: package/pkg-luarocks.mk F: package/quickjs/ F: package/rings/ +F: package/skeleton-init-portable F: package/tekui/ F: package/wpebackend-fdo/ F: package/wpewebkit/ diff --git a/package/Config.in b/package/Config.in index 10209d84d..0b947f682 100644 --- a/package/Config.in +++ b/package/Config.in @@ -6,6 +6,7 @@ menu "Target packages" source "package/skeleton-init-common/Config.in" source "package/skeleton-init-none/Config.in" source "package/skeleton-init-openrc/Config.in" + source "package/skeleton-init-portable/Config.in" source "package/skeleton-init-systemd/Config.in" source "package/skeleton-init-sysv/Config.in" diff --git a/package/skeleton-init-portable/Config.in b/package/skeleton-init-portable/Config.in new file mode 100644 index 000000000..ca434451c --- /dev/null +++ b/package/skeleton-init-portable/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_SKELETON_INIT_PORTABLE + bool + select BR2_PACKAGE_HAS_SKELETON + select BR2_PACKAGE_SKELETON_INIT_COMMON + +config BR2_PACKAGE_PROVIDES_SKELETON + default "skeleton-init-portable" if BR2_PACKAGE_SKELETON_INIT_PORTABLE diff --git a/package/skeleton-init-portable/skeleton-init-portable.mk b/package/skeleton-init-portable/skeleton-init-portable.mk new file mode 100644 index 000000000..8174a5d82 --- /dev/null +++ b/package/skeleton-init-portable/skeleton-init-portable.mk @@ -0,0 +1,23 @@ +################################################################################ +# +# skeleton-init-portable +# +################################################################################ + +# The skeleton can't depend on the toolchain, since all packages depends on the +# skeleton and the toolchain is a target package, as is skeleton. +# Hence, skeleton would depends on the toolchain and the toolchain would depend +# on skeleton. +SKELETON_INIT_PORTABLE_ADD_TOOLCHAIN_DEPENDENCY = NO +SKELETON_INIT_PORTABLE_ADD_SKELETON_DEPENDENCY = NO + +SKELETON_INIT_PORTABLE_DEPENDENCIES = skeleton-init-common + +SKELETON_INIT_PORTABLE_PROVIDES = skeleton + +define SKELETON_INIT_PORTABLE_INSTALL_TARGET_CMDS + touch $(TARGET_DIR)/etc/machine-id + mkdir -p $(TARGET_DIR)/var/tmp +endef + +$(eval $(generic-package)) -- 2.32.0 From fperrad at gmail.com Mon Feb 21 04:30:33 2022 From: fperrad at gmail.com (Francois Perrad) Date: Mon, 21 Feb 2022 05:30:33 +0100 Subject: [Buildroot] [PATCH 2/3] portable: new init system In-Reply-To: <20220221043034.2736010-1-francois.perrad@gadz.org> References: <20220221043034.2736010-1-francois.perrad@gadz.org> Message-ID: <20220221043034.2736010-3-francois.perrad@gadz.org> see https://systemd.io/PORTABLE_SERVICES/ Signed-off-by: Francois Perrad --- package/pkg-generic.mk | 2 ++ system/Config.in | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index b3a7e1d60..e62e7aada 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -383,6 +383,8 @@ $(BUILD_DIR)/%/.stamp_target_installed: +$($(PKG)_INSTALL_TARGET_CMDS) $(if $(BR2_INIT_SYSTEMD),\ $($(PKG)_INSTALL_INIT_SYSTEMD)) + $(if $(BR2_INIT_PORTABLE),\ + $($(PKG)_INSTALL_INIT_SYSTEMD)) $(if $(BR2_INIT_SYSV)$(BR2_INIT_BUSYBOX),\ $($(PKG)_INSTALL_INIT_SYSV)) $(if $(BR2_INIT_OPENRC), \ diff --git a/system/Config.in b/system/Config.in index a4ffbfa18..e71e57915 100644 --- a/system/Config.in +++ b/system/Config.in @@ -141,6 +141,15 @@ comment "systemd needs a glibc toolchain w/ SSP, headers >= 3.10, host and targe !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \ !BR2_HOST_GCC_AT_LEAST_5 +config BR2_INIT_PORTABLE + bool "portable" + select BR2_ROOTFS_MERGED_USR + select BR2_PACKAGE_SKELETON_INIT_PORTABLE if BR2_ROOTFS_SKELETON_DEFAULT + help + portable services with systemd + + https://systemd.io/PORTABLE_SERVICES/ + config BR2_INIT_NONE bool "None" select BR2_PACKAGE_SKELETON_INIT_NONE if BR2_ROOTFS_SKELETON_DEFAULT -- 2.32.0 From fperrad at gmail.com Mon Feb 21 04:30:34 2022 From: fperrad at gmail.com (Francois Perrad) Date: Mon, 21 Feb 2022 05:30:34 +0100 Subject: [Buildroot] [PATCH 3/3] portable: tweak some default values In-Reply-To: <20220221043034.2736010-1-francois.perrad@gadz.org> References: <20220221043034.2736010-1-francois.perrad@gadz.org> Message-ID: <20220221043034.2736010-4-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- fs/squashfs/Config.in | 1 + package/ifupdown-scripts/Config.in | 2 +- system/Config.in | 9 +++++---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/fs/squashfs/Config.in b/fs/squashfs/Config.in index 70d4a20cf..ad27470aa 100644 --- a/fs/squashfs/Config.in +++ b/fs/squashfs/Config.in @@ -1,5 +1,6 @@ config BR2_TARGET_ROOTFS_SQUASHFS bool "squashfs root filesystem" + default y if BR2_INIT_PORTABLE help Build a squashfs root filesystem diff --git a/package/ifupdown-scripts/Config.in b/package/ifupdown-scripts/Config.in index 166094c51..1607fa696 100644 --- a/package/ifupdown-scripts/Config.in +++ b/package/ifupdown-scripts/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_IFUPDOWN_SCRIPTS bool "ifupdown scripts" - default y if BR2_ROOTFS_SKELETON_DEFAULT + default y if BR2_ROOTFS_SKELETON_DEFAULT && !BR2_PACKAGE_SKELETON_INIT_PORTABLE depends on !BR2_PACKAGE_SYSTEMD_NETWORKD && !BR2_PACKAGE_NETIFRC help Set of scripts used by ifupdown (either the standalone one, diff --git a/system/Config.in b/system/Config.in index e71e57915..3e90e94cd 100644 --- a/system/Config.in +++ b/system/Config.in @@ -238,7 +238,7 @@ if BR2_ROOTFS_SKELETON_DEFAULT config BR2_TARGET_ENABLE_ROOT_LOGIN bool "Enable root login with password" - default y + default y if !BR2_INIT_PORTABLE select BR2_PACKAGE_HOST_MKPASSWD if BR2_TARGET_GENERIC_ROOT_PASSWD != "" help Allow root to log in with a password. @@ -280,7 +280,8 @@ config BR2_TARGET_GENERIC_ROOT_PASSWD choice bool "/bin/sh" - default BR2_SYSTEM_BIN_SH_DASH if !BR2_PACKAGE_BUSYBOX + default BR2_SYSTEM_BIN_SH_DASH if !BR2_PACKAGE_BUSYBOX && !BR2_INIT_PORTABLE + default BR2_SYSTEM_BIN_SH_NONE if BR2_INIT_PORTABLE help Select which shell will provide /bin/sh. @@ -330,7 +331,7 @@ config BR2_SYSTEM_BIN_SH menuconfig BR2_TARGET_GENERIC_GETTY bool "Run a getty (login prompt) after boot" - default y + default y if !BR2_INIT_PORTABLE if BR2_TARGET_GENERIC_GETTY config BR2_TARGET_GENERIC_GETTY_PORT @@ -388,7 +389,7 @@ endif config BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW bool "remount root filesystem read-write during boot" - default y + default y if !BR2_INIT_PORTABLE help The root filesystem is typically mounted read-only at boot. By default, buildroot remounts it in read-write mode early -- 2.32.0 From ju.o at free.fr Tue Feb 22 18:52:06 2022 From: ju.o at free.fr (Julien Olivain) Date: Tue, 22 Feb 2022 19:52:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-distro: bump to version 1.7.0 Message-ID: <20220222185206.230318-1-ju.o@free.fr> For change log since 1.6.0, see: - https://github.com/python-distro/distro/releases/tag/v1.7.0 Signed-off-by: Julien Olivain --- Tested with: support/testing/run-tests \ -d dl -o output_folder -k \ tests.package.test_python_distro.TestPythonPy3Distro --- package/python-distro/python-distro.hash | 2 +- package/python-distro/python-distro.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-distro/python-distro.hash b/package/python-distro/python-distro.hash index e2b3c0a444..8f09197156 100644 --- a/package/python-distro/python-distro.hash +++ b/package/python-distro/python-distro.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 83f5e5a09f9c5f68f60173de572930effbcc0287bb84fdc4426cb4168c088424 distro-1.6.0.tar.gz +sha256 151aeccf60c216402932b52e40ee477a939f8d58898927378a02abbe852c1c39 distro-1.7.0.tar.gz sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE diff --git a/package/python-distro/python-distro.mk b/package/python-distro/python-distro.mk index 753e74d020..c69849b7ac 100644 --- a/package/python-distro/python-distro.mk +++ b/package/python-distro/python-distro.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_DISTRO_VERSION = 1.6.0 -PYTHON_DISTRO_SITE = https://files.pythonhosted.org/packages/a5/26/256fa167fe1bf8b97130b4609464be20331af8a3af190fb636a8a7efd7a2 +PYTHON_DISTRO_VERSION = 1.7.0 +PYTHON_DISTRO_SITE = https://files.pythonhosted.org/packages/b5/7e/ddfbd640ac9a82e60718558a3de7d5988a7d4648385cf00318f60a8b073a PYTHON_DISTRO_SOURCE = distro-$(PYTHON_DISTRO_VERSION).tar.gz PYTHON_DISTRO_LICENSE = Apache-2.0 PYTHON_DISTRO_LICENSE_FILES = LICENSE -- 2.35.1 From petr.vorel at gmail.com Tue Feb 22 19:29:05 2022 From: petr.vorel at gmail.com (Petr Vorel) Date: Tue, 22 Feb 2022 20:29:05 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/modem-manager: bump version to 1.18.6 Message-ID: <20220222192905.20456-1-petr.vorel@gmail.com> Signed-off-by: Petr Vorel --- Changes v1->v2: * fix version in commit message subject (Yegor Yefremov) package/modem-manager/modem-manager.hash | 2 +- package/modem-manager/modem-manager.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/modem-manager/modem-manager.hash b/package/modem-manager/modem-manager.hash index 14597215df..ea91f42fe0 100644 --- a/package/modem-manager/modem-manager.hash +++ b/package/modem-manager/modem-manager.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 2ccf1f716c2d121e8e6709bcf8af29ee86971a90adacca2e8d6288b30278862e ModemManager-1.16.10.tar.xz +sha256 d4f804b31cf504239c5f1d4973c62095c00cba1ee9abb503718dac6d146a470a ModemManager-1.18.6.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk index a881edc272..d7e2c55bf8 100644 --- a/package/modem-manager/modem-manager.mk +++ b/package/modem-manager/modem-manager.mk @@ -4,7 +4,7 @@ # ################################################################################ -MODEM_MANAGER_VERSION = 1.16.10 +MODEM_MANAGER_VERSION = 1.18.6 MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.xz MODEM_MANAGER_SITE = http://www.freedesktop.org/software/ModemManager MODEM_MANAGER_LICENSE = GPL-2.0+ (programs, plugins), LGPL-2.0+ (libmm-glib) -- 2.35.1 From Alexey.Brodkin at synopsys.com Tue Feb 22 19:58:54 2022 From: Alexey.Brodkin at synopsys.com (Alexey Brodkin) Date: Tue, 22 Feb 2022 22:58:54 +0300 Subject: [Buildroot] [PATCH] package/qt5/qt5webkit: needs OpenSSL Message-ID: <20220222195854.11842-1-abrodkin@synopsys.com> W/o OpenSSL QT5Webkit fails to build that way: -------------------------------->8----------------------------- .../build/qt5webkit-5.212.0-alpha4/Source/WebCore/platform/network/qt/ResourceRequestQt.cpp: In static member function ?static bool WebCore::ResourceRequest::alpnIsSupported()?: .../build/qt5webkit-5.212.0-alpha4/Source/WebCore/platform/network/qt/ResourceRequestQt.cpp:68:12: error: ?QSslSocket? has not been declared 68 | return QSslSocket::sslLibraryVersionNumber() > 0x10002000L && | ^~~~~~~~~~ .../build/qt5webkit-5.212.0-alpha4/Source/WebCore/platform/network/qt/ResourceRequestQt.cpp:69:9: error: ?QSslSocket? has not been declared 69 | QSslSocket::sslLibraryVersionString().startsWith(QLatin1String("OpenSSL")); | ^~~~~~~~~~ -------------------------------->8----------------------------- Signed-off-by: Alexey Brodkin Cc: Fabrice Fontaine Cc: James Hilliard Cc: Peter Seiderer Cc: Yann E. MORIN --- 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 ed87efca95..26c3897d1d 100644 --- a/package/qt5/qt5webkit/Config.in +++ b/package/qt5/qt5webkit/Config.in @@ -15,6 +15,7 @@ config BR2_PACKAGE_QT5WEBKIT select BR2_PACKAGE_JPEG select BR2_PACKAGE_LEVELDB select BR2_PACKAGE_LIBPNG + select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_QT5BASE_ICU select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_QT5BASE_WIDGETS -- 2.25.1 From fontaine.fabrice at gmail.com Tue Feb 22 20:14:18 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 22 Feb 2022 21:14:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5webkit: disable JIT with mips32r6 Message-ID: <20220222201418.3087618-1-fontaine.fabrice@gmail.com> Disable JIT with mips32r6 to avoid the following build failure raised since bump to version 5.212.0-alpha4 in commit df0b0fe6919c0d0f3750f439a3cfa765232bd569: /tmp/ccHw2rHQ.s:18: Error: opcode not supported on this processor: mips32r6 (mips32r6) `addi $a0,$sp,-8' Fixes: - http://autobuild.buildroot.org/results/5191600b463cda078203eeffae880ed989f8ac0f Signed-off-by: Fabrice Fontaine --- package/qt5/qt5webkit/qt5webkit.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk index 2e96acc00f..6f8714140a 100644 --- a/package/qt5/qt5webkit/qt5webkit.mk +++ b/package/qt5/qt5webkit/qt5webkit.mk @@ -20,6 +20,10 @@ QT5WEBKIT_LICENSE = LGPL-2.1+, BSD-3-Clause, BSD-2-Clause # in the archive. QT5WEBKIT_LICENSE_FILES += LICENSE.LGPLv21 +ifeq ($(BR2_MIPS_CPU_MIPS32R6),y) +QT5WEBKIT_CONF_OPTS += -DENABLE_JIT=OFF +endif + ifeq ($(BR2_PACKAGE_QT5BASE_OPENGL),y) QT5WEBKIT_CONF_OPTS += \ -DENABLE_OPENGL=ON \ -- 2.34.1 From fontaine.fabrice at gmail.com Tue Feb 22 20:37:46 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 22 Feb 2022 21:37:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/sord: fix build without threads Message-ID: <20220222203746.3139075-1-fontaine.fabrice@gmail.com> Fix the following build failure without threads raised since the addition of the package in commit 0d4c8ce8a2f26989e0e2d95b977d60e450c090a9: /home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: cannot find -lpthread Fixes: - http://autobuild.buildroot.org/results/170d0114987b39a2b9ea173df7a5e806bd270fd8 Signed-off-by: Fabrice Fontaine --- .../0001-wscript-add-no-threads-option.patch | 59 +++++++++++++++++++ package/sord/sord.mk | 4 ++ 2 files changed, 63 insertions(+) create mode 100644 package/sord/0001-wscript-add-no-threads-option.patch diff --git a/package/sord/0001-wscript-add-no-threads-option.patch b/package/sord/0001-wscript-add-no-threads-option.patch new file mode 100644 index 0000000000..750ea8f4ad --- /dev/null +++ b/package/sord/0001-wscript-add-no-threads-option.patch @@ -0,0 +1,59 @@ +From 82ab045a45c06187dca5e9d2a9a4003fcfbfa830 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 22 Feb 2022 21:22:31 +0100 +Subject: [PATCH] wscript: add -no-threads option + +Add -no-threads options to avoid the following build failure on embedded +toolchains without threads support: + +/home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: cannot find -lpthread + +Fixes: + - http://autobuild.buildroot.org/results/170d0114987b39a2b9ea173df7a5e806bd270fd8 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/drobilla/sord/pull/3] +--- + wscript | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/wscript b/wscript +index fd8578e..d71d78c 100644 +--- a/wscript ++++ b/wscript +@@ -35,6 +35,7 @@ def options(ctx): + {'no-utils': 'do not build command line utilities', + 'static': 'build static library', + 'no-shared': 'do not build shared library', ++ 'no-threads': 'disable threads', + 'static-progs': 'build programs as static binaries'}) + + opt.add_option('--dump', type='string', default='', dest='dump', +@@ -55,6 +56,7 @@ def configure(conf): + + conf.env.BUILD_UTILS = not Options.options.no_utils + conf.env.BUILD_SHARED = not Options.options.no_shared ++ conf.env.ENABLE_THREADS = not Options.options.no_threads + conf.env.STATIC_PROGS = Options.options.static_progs + conf.env.BUILD_STATIC = (Options.options.static or + Options.options.static_progs) +@@ -124,7 +126,7 @@ def configure(conf): + conf.check_pkg('serd-0 >= 0.30.0', uselib_store='SERD') + conf.check_pkg('libpcre', uselib_store='PCRE', mandatory=False) + +- if conf.env.HAVE_PCRE: ++ if conf.env.HAVE_PCRE and conf.env.ENABLE_THREADS: + if conf.check(cflags=['-pthread'], mandatory=False): + conf.env.PTHREAD_CFLAGS = ['-pthread'] + if conf.env.CC_NAME != 'clang': +@@ -160,6 +162,7 @@ def configure(conf): + conf, + {'Static library': bool(conf.env.BUILD_STATIC), + 'Shared library': bool(conf.env.BUILD_SHARED), ++ 'Threads': bool(conf.env.ENABLE_THREADS), + 'Utilities': bool(conf.env.BUILD_UTILS), + 'Unit tests': bool(conf.env.BUILD_TESTS), + 'Debug dumping': dump}) +-- +2.34.1 + diff --git a/package/sord/sord.mk b/package/sord/sord.mk index f805805e9d..c06ef9c55c 100644 --- a/package/sord/sord.mk +++ b/package/sord/sord.mk @@ -22,4 +22,8 @@ ifeq ($(BR2_STATIC_LIBS),y) SORD_CONF_OPTS += --static --no-shared --static-progs endif +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) +SORD_CONF_OPTS += --no-threads +endif + $(eval $(waf-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Tue Feb 22 20:40:34 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 22 Feb 2022 21:40:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/freerdp: security bump to version 2.6.0 Message-ID: <20220222204034.3139362-1-fontaine.fabrice@gmail.com> 2.6.0 is an maintenance and security release. https://github.com/FreeRDP/FreeRDP/releases/tag/2.6.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 e31b8d5b96..780061bdbb 100644 --- a/package/freerdp/freerdp.hash +++ b/package/freerdp/freerdp.hash @@ -1,5 +1,5 @@ -# From https://pub.freerdp.com/releases/freerdp-2.5.0.tar.gz.sha256 -sha256 0fd9396068cda8e6d884d063a4993001f140f46c36464ccae261b9475050cd2b freerdp-2.5.0.tar.gz +# From https://pub.freerdp.com/releases/freerdp-2.6.0.tar.gz.sha256 +sha256 a4ba0a75e30ed25fffc4cd4e89d0eb92e66894caeb6c78dc5e23b6b7c04f60fe freerdp-2.6.0.tar.gz # Locally calculated sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk index c536f6cb1c..edbfb6801a 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREERDP_VERSION = 2.5.0 +FREERDP_VERSION = 2.6.0 FREERDP_SITE = https://pub.freerdp.com/releases FREERDP_DEPENDENCIES = libglib2 openssl zlib FREERDP_LICENSE = Apache-2.0 -- 2.34.1 From fontaine.fabrice at gmail.com Tue Feb 22 20:46:01 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 22 Feb 2022 21:46:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/haproxy: bump to version 2.4.13 Message-ID: <20220222204601.3150365-1-fontaine.fabrice@gmail.com> https://www.mail-archive.com/haproxy at formilux.org/msg41834.html https://www.mail-archive.com/haproxy at formilux.org/msg41698.html https://www.mail-archive.com/haproxy at formilux.org/msg41685.html https://www.mail-archive.com/haproxy at formilux.org/msg41618.html https://www.mail-archive.com/haproxy at formilux.org/msg41512.html Signed-off-by: Fabrice Fontaine --- package/haproxy/haproxy.hash | 4 ++-- package/haproxy/haproxy.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/haproxy/haproxy.hash b/package/haproxy/haproxy.hash index c29857cd9c..e3120b521f 100644 --- a/package/haproxy/haproxy.hash +++ b/package/haproxy/haproxy.hash @@ -1,5 +1,5 @@ -# From: http://www.haproxy.org/download/2.4/src/haproxy-2.4.8.tar.gz.sha256 -sha256 e3e4c1ad293bc25e8d8790cc5e45133213dda008bfd0228bf3077259b32ebaa5 haproxy-2.4.8.tar.gz +# From: http://www.haproxy.org/download/2.4/src/haproxy-2.4.13.tar.gz.sha256 +sha256 4788fe975fe7e521746f826c25e80bc95cd15983e2bafa33e43bff23a3fe5ba1 haproxy-2.4.13.tar.gz # Locally computed: sha256 0717ca51fceaa25ac9e5ccc62e0c727dcf27796057201fb5fded56a25ff6ca28 LICENSE sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a doc/lgpl.txt diff --git a/package/haproxy/haproxy.mk b/package/haproxy/haproxy.mk index d79d6e9c9c..c162a4c3f4 100644 --- a/package/haproxy/haproxy.mk +++ b/package/haproxy/haproxy.mk @@ -5,7 +5,7 @@ ################################################################################ HAPROXY_VERSION_MAJOR = 2.4 -HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).8 +HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).13 HAPROXY_SITE = http://www.haproxy.org/download/$(HAPROXY_VERSION_MAJOR)/src HAPROXY_LICENSE = GPL-2.0+ and LGPL-2.1+ with exceptions HAPROXY_LICENSE_FILES = LICENSE doc/lgpl.txt doc/gpl.txt -- 2.34.1 From yann.morin.1998 at free.fr Tue Feb 22 20:51:56 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 22 Feb 2022 21:51:56 +0100 Subject: [Buildroot] [PATCH] package/qt5/qt5webkit: needs OpenSSL In-Reply-To: <20220222195854.11842-1-abrodkin@synopsys.com> References: <20220222195854.11842-1-abrodkin@synopsys.com> Message-ID: <20220222205156.GA50412@scaer> Alexey, All, On 2022-02-22 22:58 +0300, Alexey Brodkin spake thusly: > W/o OpenSSL QT5Webkit fails to build that way: > -------------------------------->8----------------------------- > .../build/qt5webkit-5.212.0-alpha4/Source/WebCore/platform/network/qt/ResourceRequestQt.cpp: In static member function ?static bool WebCore::ResourceRequest::alpnIsSupported()?: > .../build/qt5webkit-5.212.0-alpha4/Source/WebCore/platform/network/qt/ResourceRequestQt.cpp:68:12: error: ?QSslSocket? has not been declared > 68 | return QSslSocket::sslLibraryVersionNumber() > 0x10002000L && > | ^~~~~~~~~~ > .../build/qt5webkit-5.212.0-alpha4/Source/WebCore/platform/network/qt/ResourceRequestQt.cpp:69:9: error: ?QSslSocket? has not been declared > 69 | QSslSocket::sslLibraryVersionString().startsWith(QLatin1String("OpenSSL")); > | ^~~~~~~~~~ > -------------------------------->8----------------------------- > > Signed-off-by: Alexey Brodkin > Cc: Fabrice Fontaine > Cc: James Hilliard > Cc: Peter Seiderer > Cc: Yann E. MORIN > --- > 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 ed87efca95..26c3897d1d 100644 > --- a/package/qt5/qt5webkit/Config.in > +++ b/package/qt5/qt5webkit/Config.in > @@ -15,6 +15,7 @@ config BR2_PACKAGE_QT5WEBKIT > select BR2_PACKAGE_JPEG > select BR2_PACKAGE_LEVELDB > select BR2_PACKAGE_LIBPNG > + select BR2_PACKAGE_OPENSSL You forgot to add it to QT5WEBKIT_DEPENDENCIES... Regards, Yann E. MORIN. > select BR2_PACKAGE_QT5BASE_ICU > select BR2_PACKAGE_QT5BASE_GUI > select BR2_PACKAGE_QT5BASE_WIDGETS > -- > 2.25.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 Tue Feb 22 20:53:17 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 22 Feb 2022 21:53:17 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/libnetfilter_conntrack: bump to version 1.0.9 Message-ID: <20220222205317.3161653-1-fontaine.fabrice@gmail.com> Drop patch (already in version) Signed-off-by: Fabrice Fontaine --- ...ntrack.pc.in-add-LIBMNL_LIBS-to-Libs.patch | 38 ------------------- .../libnetfilter_conntrack.hash | 4 +- .../libnetfilter_conntrack.mk | 2 +- 3 files changed, 3 insertions(+), 41 deletions(-) delete mode 100644 package/libnetfilter_conntrack/0001-libnetfilter_conntrack.pc.in-add-LIBMNL_LIBS-to-Libs.patch diff --git a/package/libnetfilter_conntrack/0001-libnetfilter_conntrack.pc.in-add-LIBMNL_LIBS-to-Libs.patch b/package/libnetfilter_conntrack/0001-libnetfilter_conntrack.pc.in-add-LIBMNL_LIBS-to-Libs.patch deleted file mode 100644 index 0b373d9261..0000000000 --- a/package/libnetfilter_conntrack/0001-libnetfilter_conntrack.pc.in-add-LIBMNL_LIBS-to-Libs.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 93bbd7e56cefc8488a61892b3bf5df63a175d20d Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 12 Apr 2020 14:05:15 +0200 -Subject: [PATCH] libnetfilter_conntrack.pc.in: add LIBMNL_LIBS to Libs.Private - -Since version 1.0.8 and commit -c1c0f16c1fedb46547c2e104beeaaeac5933b214, libnetfilter_conntrack depends -on libmnl so add it to Libs.Private. - -Otherwise, applications such as dnsmasq will fail to link on: - -/home/buildroot/autobuild/instance-0/output-1/host/bin/arm-linux-gcc -Wl,-elf2flt -static -o dnsmasq cache.o rfc1035.o util.o option.o forward.o network.o dnsmasq.o dhcp.o lease.o rfc2131.o netlink.o dbus.o bpf.o helper.o tftp.o log.o conntrack.o dhcp6.o rfc3315.o dhcp-common.o outpacket.o radv.o slaac.o auth.o ipset.o domain.o dnssec.o blockdata.o tables.o loop.o inotify.o poll.o rrfilter.o edns0.o arp.o crypto.o dump.o ubus.o metrics.o -L/home/buildroot/autobuild/instance-0/output-1/host/bin/../arm-buildroot-uclinux-uclibcgnueabi/sysroot/usr/lib -lnetfilter_conntrack -L/home/buildroot/autobuild/instance-0/output-1/host/bin/../arm-buildroot-uclinux-uclibcgnueabi/sysroot/usr/lib -lnfnetlink -/home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/arm-buildroot-uclinux-uclibcgnueabi/bin/ld.real: /home/buildroot/autobuild/instance-0/output-1/host/bin/../arm-buildroot-uclinux-uclibcgnueabi/sysroot/usr/lib/libnetfilter_conntrack.a(api.o): in function `nfct_fill_hdr.constprop.4': -api.c:(.text+0x34): undefined reference to `mnl_nlmsg_put_header' - -Fixes: - - http://autobuild.buildroot.org/results/3fdc2cba20162eb86eaa5c49a056fb40fb18a392 - -Signed-off-by: Fabrice Fontaine -[Upstream status: commit e94172f09e4d] ---- - libnetfilter_conntrack.pc.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libnetfilter_conntrack.pc.in b/libnetfilter_conntrack.pc.in -index 857f993..fbd7132 100644 ---- a/libnetfilter_conntrack.pc.in -+++ b/libnetfilter_conntrack.pc.in -@@ -12,5 +12,5 @@ Version: @VERSION@ - Requires: libnfnetlink - Conflicts: - Libs: -L${libdir} -lnetfilter_conntrack --Libs.private: @LIBNFNETLINK_LIBS@ -+Libs.private: @LIBNFNETLINK_LIBS@ @LIBMNL_LIBS@ - Cflags: -I${includedir} --- -2.25.1 - diff --git a/package/libnetfilter_conntrack/libnetfilter_conntrack.hash b/package/libnetfilter_conntrack/libnetfilter_conntrack.hash index 19520aa3f0..205eecf1f3 100644 --- a/package/libnetfilter_conntrack/libnetfilter_conntrack.hash +++ b/package/libnetfilter_conntrack/libnetfilter_conntrack.hash @@ -1,5 +1,5 @@ -# From ftp://ftp.netfilter.org/pub/libnetfilter_conntrack/libnetfilter_conntrack-1.0.8.tar.bz2.sha256sum -sha256 0cd13be008923528687af6c6b860f35392d49251c04ee0648282d36b1faec1cf libnetfilter_conntrack-1.0.8.tar.bz2 +# From https://www.netfilter.org/pub/libnetfilter_conntrack/libnetfilter_conntrack-1.0.9.tar.bz2.sha256sum +sha256 67bd9df49fe34e8b82144f6dfb93b320f384a8ea59727e92ff8d18b5f4b579a8 libnetfilter_conntrack-1.0.9.tar.bz2 # Hash for license file: sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING diff --git a/package/libnetfilter_conntrack/libnetfilter_conntrack.mk b/package/libnetfilter_conntrack/libnetfilter_conntrack.mk index 0a5a94be8f..e10bdd02e9 100644 --- a/package/libnetfilter_conntrack/libnetfilter_conntrack.mk +++ b/package/libnetfilter_conntrack/libnetfilter_conntrack.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNETFILTER_CONNTRACK_VERSION = 1.0.8 +LIBNETFILTER_CONNTRACK_VERSION = 1.0.9 LIBNETFILTER_CONNTRACK_SOURCE = libnetfilter_conntrack-$(LIBNETFILTER_CONNTRACK_VERSION).tar.bz2 LIBNETFILTER_CONNTRACK_SITE = http://www.netfilter.org/projects/libnetfilter_conntrack/files LIBNETFILTER_CONNTRACK_INSTALL_STAGING = YES -- 2.34.1 From Alexey.Brodkin at synopsys.com Tue Feb 22 21:00:24 2022 From: Alexey.Brodkin at synopsys.com (Alexey Brodkin) Date: Wed, 23 Feb 2022 00:00:24 +0300 Subject: [Buildroot] [PATCH v2] package/qt5/qt5webkit: needs OpenSSL Message-ID: <20220222210024.6013-1-abrodkin@synopsys.com> W/o OpenSSL QT5Webkit fails to build that way: -------------------------------->8----------------------------- .../build/qt5webkit-5.212.0-alpha4/Source/WebCore/platform/network/qt/ResourceRequestQt.cpp: In static member function ?static bool WebCore::ResourceRequest::alpnIsSupported()?: .../build/qt5webkit-5.212.0-alpha4/Source/WebCore/platform/network/qt/ResourceRequestQt.cpp:68:12: error: ?QSslSocket? has not been declared 68 | return QSslSocket::sslLibraryVersionNumber() > 0x10002000L && | ^~~~~~~~~~ .../build/qt5webkit-5.212.0-alpha4/Source/WebCore/platform/network/qt/ResourceRequestQt.cpp:69:9: error: ?QSslSocket? has not been declared 69 | QSslSocket::sslLibraryVersionString().startsWith(QLatin1String("OpenSSL")); | ^~~~~~~~~~ -------------------------------->8----------------------------- Signed-off-by: Alexey Brodkin Cc: Fabrice Fontaine Cc: James Hilliard Cc: Peter Seiderer Cc: Yann E. MORIN --- Changes v1 -> v2: * Added "openssl" to QT5WEBKIT_DEPENDENCIES, thanks Yann for spotting this one. Note that I interntionally added "openssl" not following alphabetic order because: 1. Existing dependencies are already a bit shufffled 2. I wanted to keep this diff as small as possible, w/o re-shuffling multiple lines. If really needed we may do reordering in a separate patch. --- package/qt5/qt5webkit/Config.in | 1 + package/qt5/qt5webkit/qt5webkit.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in index ed87efca95..26c3897d1d 100644 --- a/package/qt5/qt5webkit/Config.in +++ b/package/qt5/qt5webkit/Config.in @@ -15,6 +15,7 @@ config BR2_PACKAGE_QT5WEBKIT select BR2_PACKAGE_JPEG select BR2_PACKAGE_LEVELDB select BR2_PACKAGE_LIBPNG + select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_QT5BASE_ICU select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_QT5BASE_WIDGETS diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk index 2e96acc00f..c9b354e725 100644 --- a/package/qt5/qt5webkit/qt5webkit.mk +++ b/package/qt5/qt5webkit/qt5webkit.mk @@ -10,7 +10,7 @@ QT5WEBKIT_SOURCE = qtwebkit-$(QT5WEBKIT_VERSION).tar.xz QT5WEBKIT_DEPENDENCIES = \ 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 + openssl qt5sensors qt5webchannel sqlite webp woff2 QT5WEBKIT_INSTALL_STAGING = YES QT5WEBKIT_LICENSE_FILES = Source/WebCore/LICENSE-LGPL-2 Source/WebCore/LICENSE-LGPL-2.1 -- 2.25.1 From ju.o at free.fr Tue Feb 22 21:32:02 2022 From: ju.o at free.fr (Julien Olivain) Date: Tue, 22 Feb 2022 22:32:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/mariadb: fix mysql.service failing to create log directory Message-ID: <20220222213202.642708-1-ju.o@free.fr> When enabling MariaDB (BR2_PACKAGE_MARIADB=y) and systemd (BR2_INIT_SYSTEMD=y) in buildroot, the mysqld.service fail to start with a permission error. See output of command: journalctl --unit=mysqld Which shows: systemd[1]: Starting MySQL database server... install[102]: install: can't create directory '/var/log/mysql': Permission denied systemd[1]: mysqld.service: Control process exited, code=exited, status=1/FAILURE Since the service file includes the "User=mysql" directive, the "ExecStartPre=" is executed as this user, which does not have permission to create a directory in "/var/log". This commit fixes this issue by adding the "!" prefix, which will execute the command with full privileges. See the systemd.service manual page entry for "ExecStart=", table "Special executable prefixes": https://www.freedesktop.org/software/systemd/man/systemd.service.html#ExecStart= or https://github.com/systemd/systemd/blob/v250/man/systemd.service.xml#L339 Moreover, the "mysql_install_db" invocation does not need this special prefix, as the "/var/lib/mysql" directory on target is already owned by the "mysql" user. The "chown" command is also useless and is removed in this commit. Reported-by: Gilles Talis Signed-off-by: Julien Olivain --- package/mariadb/mysqld.service | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mariadb/mysqld.service b/package/mariadb/mysqld.service index d9ea74ebc3..537430e9a2 100644 --- a/package/mariadb/mysqld.service +++ b/package/mariadb/mysqld.service @@ -2,8 +2,8 @@ Description=MySQL database server [Service] -ExecStartPre=/bin/sh -c 'test "`ls -1 /var/lib/mysql | wc -l`" != "0" || mysql_install_db --basedir=/usr --datadir=/var/lib/mysql && chown -R mysql:mysql /var/lib/mysql' -ExecStartPre=install -d -o mysql -g root -m 0755 /var/log/mysql +ExecStartPre=/bin/sh -c 'test "`ls -1 /var/lib/mysql | wc -l`" != "0" || mysql_install_db --basedir=/usr --datadir=/var/lib/mysql' +ExecStartPre=!install -d -o mysql -g root -m 0755 /var/log/mysql ExecStart=/usr/bin/mysqld_safe --log-error=/var/log/mysql/mysqld.log Restart=always User=mysql -- 2.35.1 From peter at korsgaard.com Tue Feb 22 16:55:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Feb 2022 17:55:03 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gauche: drop autoreconf Message-ID: <20220222212515.1DD3883837@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ec034ba9dee122c51cb59703c85df839dc973a54 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Commit 11cb72be570409be77d4bb49c17b4a2feef31be7 forgot to drop autoreconf Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 5f703276e0713b746f2c937c4c4fc02ef6ad1d77) Signed-off-by: Peter Korsgaard --- package/gauche/gauche.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/gauche/gauche.mk b/package/gauche/gauche.mk index 2520379369..fe0a613a9d 100644 --- a/package/gauche/gauche.mk +++ b/package/gauche/gauche.mk @@ -10,8 +10,6 @@ GAUCHE_SITE = http://downloads.sourceforge.net/project/gauche/Gauche GAUCHE_LICENSE = BSD-3-Clause, Boehm-gc, SRFI (srfi-11.scm), reload (reload.scm) GAUCHE_LICENSE_FILES = COPYING GAUCHE_DEPENDENCIES = host-gauche -# We're patching configure.ac -GAUCHE_AUTORECONF = YES HOST_GAUCHE_CONF_OPTS = --without-zlib GAUCHE_CONF_OPTS = --without-libatomic-ops From bernd.kuhls at t-online.de Tue Feb 22 21:41:14 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Tue, 22 Feb 2022 22:41:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/samba4: security bump version to 4.15.5 Message-ID: <20220222214114.374855-1-bernd.kuhls@t-online.de> Release notes: https://www.samba.org/samba/history/samba-4.15.5.html Fixes CVE-2021-44141, CVE-2021-44142 & CVE-2022-0336. 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 130b628e32..503ec2ce37 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.4.tar.asc -sha256 499065a589b7b9ffb8e3eb6efa8575985919a2999972afc469520a47322aec11 samba-4.15.4.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.15.5.tar.asc +sha256 69115e33831937ba5151be0247943147765aece658ba743f44741672ad68d17f samba-4.15.5.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 1d4b985437..0ad3c2f742 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.15.4 +SAMBA4_VERSION = 4.15.5 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES -- 2.30.2 From fontaine.fabrice at gmail.com Tue Feb 22 21:42:47 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 22 Feb 2022 22:42:47 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/duktape: bump to version 2.7.0 Message-ID: <20220222214247.3163690-1-fontaine.fabrice@gmail.com> Update hash of license file (update in year: https://github.com/svaarala/duktape/commit/03d4d728f8365021de6955c649e6dcd05dcca99f) Signed-off-by: Fabrice Fontaine --- package/duktape/duktape.hash | 4 ++-- package/duktape/duktape.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/duktape/duktape.hash b/package/duktape/duktape.hash index 4c55e39888..ef6f55aa9d 100644 --- a/package/duktape/duktape.hash +++ b/package/duktape/duktape.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 96f4a05a6c84590e53b18c59bb776aaba80a205afbbd92b82be609ba7fe75fa7 duktape-2.6.0.tar.xz -sha256 5b42d02dbd084fd6d7e61d93f52e02b596f25400e54e0f86d5780045e5b754c8 LICENSE.txt +sha256 90f8d2fa8b5567c6899830ddef2c03f3c27960b11aca222fa17aa7ac613c2890 duktape-2.7.0.tar.xz +sha256 c6b6659630ca6cb837afe982ecc79511bfca878b56296d628b02eb6f18789c29 LICENSE.txt diff --git a/package/duktape/duktape.mk b/package/duktape/duktape.mk index 89a6e451f5..674c5e9323 100644 --- a/package/duktape/duktape.mk +++ b/package/duktape/duktape.mk @@ -4,7 +4,7 @@ # ################################################################################ -DUKTAPE_VERSION = 2.6.0 +DUKTAPE_VERSION = 2.7.0 DUKTAPE_SOURCE = duktape-$(DUKTAPE_VERSION).tar.xz DUKTAPE_SITE = \ https://github.com/svaarala/duktape/releases/download/v$(DUKTAPE_VERSION) -- 2.34.1 From bernd.kuhls at t-online.de Tue Feb 22 21:49:31 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Tue, 22 Feb 2022 22:49:31 +0100 Subject: [Buildroot] [PATCH/next 1/1] Revert "heimdal: disable parallel make" Message-ID: <20220222214931.447344-1-bernd.kuhls@t-online.de> This reverts commit f6980126f26c63421d04a32b6710d9e3a380476a. Parallel make was disabled back in 2017: https://git.buildroot.net/buildroot/commit/?id=f6980126f26c63421d04a32b6710d9e3a380476a Build-test with -j99 was successful. Signed-off-by: Bernd Kuhls --- package/heimdal/heimdal.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/heimdal/heimdal.mk b/package/heimdal/heimdal.mk index ce509c7afa..a8d87531ec 100644 --- a/package/heimdal/heimdal.mk +++ b/package/heimdal/heimdal.mk @@ -8,7 +8,6 @@ HEIMDAL_VERSION = 7.7.0 HEIMDAL_SITE = https://github.com/heimdal/heimdal/releases/download/heimdal-$(HEIMDAL_VERSION) HOST_HEIMDAL_DEPENDENCIES = host-e2fsprogs host-ncurses host-pkgconf HEIMDAL_INSTALL_STAGING = YES -HEIMDAL_MAKE = $(MAKE1) # static because of -fPIC issues with e2fsprogs on x86_64 host HOST_HEIMDAL_CONF_OPTS = \ --disable-shared \ -- 2.30.2 From petr.vorel at gmail.com Tue Feb 22 22:02:55 2022 From: petr.vorel at gmail.com (Petr Vorel) Date: Tue, 22 Feb 2022 23:02:55 +0100 Subject: [Buildroot] [RFC][PATCH 1/1] package/bind: bump to version 9.16.26 Message-ID: <20220222220255.22327-1-petr.vorel@gmail.com> BIND 9.11 EOL in March, 2022. BIND 9.16 is current Stable/ESV version. Changes: * libuv (new dependency) * openssl is now mandatory * zlib must be detected with PKG_CONFIG_PATH (specifying zlib installation path is not supported) * bind9-config and isc-config.sh removed * updated COPYRIGHT hash Signed-off-by: Petr Vorel --- Hi, time to move on to 9.16. Tested only local build as I don't use bind. I'll also verify builds with utils/test-pkg. But it'd be great if anybody could also test running bind. Kind regards, Petr package/bind/Config.in | 12 +++++++++++- package/bind/bind.hash | 6 +++--- package/bind/bind.mk | 15 +++++++-------- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/package/bind/Config.in b/package/bind/Config.in index db10ceb304..9887403ed9 100644 --- a/package/bind/Config.in +++ b/package/bind/Config.in @@ -1,6 +1,11 @@ config BR2_PACKAGE_BIND bool "bind" - depends on BR2_USE_MMU # fork() + depends on BR2_USE_MMU # fork(), libuv + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv + depends on !BR2_STATIC_LIBS # libuv + select BR2_PACKAGE_LIBUV + select BR2_PACKAGE_OPENSSL help BIND (Berkeley Internet Name Domain) is an implementation of the Domain Name System (DNS) protocols @@ -24,6 +29,11 @@ config BR2_PACKAGE_BIND https://www.isc.org/bind/ +comment "bind needs a toolchain w/ NPTL, dynamic library" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS + if BR2_PACKAGE_BIND config BR2_PACKAGE_BIND_SERVER diff --git a/package/bind/bind.hash b/package/bind/bind.hash index 70299f1677..401e389e49 100644 --- a/package/bind/bind.hash +++ b/package/bind/bind.hash @@ -1,4 +1,4 @@ -# Verified from https://ftp.isc.org/isc/bind9/9.11.36/bind-9.11.36.tar.gz.asc +# Verified from https://ftp.isc.org/isc/bind9/9.16.26/bind-9.16.26.tar.xz.asc # with key AADBBA5074F1402F7B69D56BC5B4EE931A9F9DFD -sha256 c953fcb6703b395aaa53e65ff8b2869b69a5303dd60507cba2201305e1811681 bind-9.11.36.tar.gz -sha256 cad49daa42654bc241762cd998630168a2542c8fd6fad3881e2eac1510bb6fcd COPYRIGHT +sha256 70b39a5eb71650358ec9ba41da3050d32aeac0aeb4a466684b23f35affa7fb45 bind-9.16.26.tar.xz +sha256 daf6f1eddf5983ed664a2d125b619e56e2e93917c19d0d41c7586ea153ba2155 COPYRIGHT diff --git a/package/bind/bind.mk b/package/bind/bind.mk index e329c803a3..5b4c60b14c 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -4,12 +4,12 @@ # ################################################################################ -BIND_VERSION = 9.11.36 +BIND_VERSION = 9.16.26 +BIND_SOURCE= bind-$(BIND_VERSION).tar.xz BIND_SITE = https://ftp.isc.org/isc/bind9/$(BIND_VERSION) # bind does not support parallel builds. BIND_MAKE = $(MAKE1) BIND_INSTALL_STAGING = YES -BIND_CONFIG_SCRIPTS = bind9-config isc-config.sh BIND_LICENSE = MPL-2.0 BIND_LICENSE_FILES = COPYRIGHT BIND_CPE_ID_VENDOR = isc @@ -32,15 +32,18 @@ BIND_CONF_ENV = \ BIND_CONF_OPTS = \ $(if $(BR2_TOOLCHAIN_HAS_THREADS),--enable-threads,--disable-threads) \ --without-lmdb \ - --with-libjson=no \ + --with-json-c=no \ --with-randomdev=/dev/urandom \ --enable-epoll \ --enable-filter-aaaa \ --disable-backtrace +BIND_DEPENDENCIES = libuv + ifeq ($(BR2_PACKAGE_ZLIB),y) -BIND_CONF_OPTS += --with-zlib=$(STAGING_DIR)/usr +BIND_CONF_OPTS += --with-zlib BIND_DEPENDENCIES += zlib +BIND_DEPENDENCIES += host-pkgconf zlib else BIND_CONF_OPTS += --without-zlib endif @@ -66,7 +69,6 @@ else BIND_CONF_OPTS += --with-libxml2=no endif -ifeq ($(BR2_PACKAGE_OPENSSL),y) BIND_DEPENDENCIES += host-pkgconf openssl BIND_CONF_OPTS += \ --with-openssl=$(STAGING_DIR)/usr \ @@ -80,9 +82,6 @@ BIND_CONF_OPTS += --with-gost=yes else BIND_CONF_OPTS += --with-gost=no endif -else -BIND_CONF_OPTS += --with-openssl=no -endif # Used by dnssec-keymgr ifeq ($(BR2_PACKAGE_PYTHON_PLY),y) -- 2.35.1 From petr.vorel at gmail.com Tue Feb 22 22:06:50 2022 From: petr.vorel at gmail.com (Petr Vorel) Date: Tue, 22 Feb 2022 23:06:50 +0100 Subject: [Buildroot] [RFC PATCH 0/3] make: support: use `command -v' instead of `which' *second try* In-Reply-To: <20211011220025.7998-1-petr.vorel@gmail.com> References: <20211011220025.7998-1-petr.vorel@gmail.com> Message-ID: Hi all, could anybody test this patchset please? Kind regards, Petr > Hi all, > this is a second attempt to introduce command -v. > Changes v1->v2: > * reproduced original issue and fixed by not relying to > $(shell command -v ...) but shell with: > $(shell $(SHELL) -c "command -v ..."). > * quote variables > Tested only with make defconfig && make help >/dev/null > Petr Vorel (3): > make: support: use `command -v' instead of `which' > make: Drop `type -p ...' fallback > support/dependencies: don't check for `which' > Makefile | 22 +++++++++---------- > package/Makefile.in | 8 +++---- > support/dependencies/check-host-bison-flex.mk | 4 ++-- > support/dependencies/check-host-cmake.sh | 2 +- > support/dependencies/check-host-gzip.sh | 2 +- > support/dependencies/check-host-lzip.sh | 4 ++-- > support/dependencies/check-host-python3.sh | 2 +- > support/dependencies/check-host-tar.sh | 4 ++-- > support/dependencies/check-host-xzcat.sh | 4 ++-- > support/dependencies/dependencies.sh | 18 +++++++-------- > .../pkg-toolchain-external.mk | 2 +- > 11 files changed, 35 insertions(+), 37 deletions(-) From fontaine.fabrice at gmail.com Tue Feb 22 22:43:02 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 22 Feb 2022 23:43:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/vim: security bump to version 8.2.4450 Message-ID: <20220222224302.3185944-1-fontaine.fabrice@gmail.com> Fix CVE-2022-0554: Use of Out-of-range Pointer Offset in GitHub repository vim/vim prior to 8.2. 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 fa3ca53cc8..8b60b7461f 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 b40b4e341de6b65cdeacd4c816dea8fe5e3b385ee5e17af73fc69c00bd7c440b vim-8.2.4301.tar.gz +sha256 b0a5acbe83bbdd4b1412abd9dc2ae2e3593c6cff8ff11c551fda3e6e2a87ec81 vim-8.2.4450.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index 98a5f153a8..28fd33c8ef 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 8.2.4301 +VIM_VERSION = 8.2.4450 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src -- 2.34.1 From tambewilliam at gmail.com Tue Feb 22 23:41:45 2022 From: tambewilliam at gmail.com (William Tambe) Date: Tue, 22 Feb 2022 17:41:45 -0600 Subject: [Buildroot] STAGING_DIR does not contain executables found in TARGET_DIR Message-ID: Please help determining why STAGING_DIR does not contain executables found in TARGET_DIR ? I am expecting to find debug version of all executables in TARGET_DIR, but executables such as /bin/busybox are missing from STAGING_DIR . I am using 2021.08.3 Full config is as follow ``` BR2_pu32=y BR2_ENABLE_DEBUG=y BR2_DEBUG_3=y BR2_STATIC_LIBS=y BR2_FORTIFY_SOURCE_NONE=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_PATH="/opt/pu32-toolchain/" BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="$(ARCH)-elf" BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_5=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y # BR2_TOOLCHAIN_EXTERNAL_HAS_SSP is not set # BR2_TOOLCHAIN_EXTERNAL_INET_RPC is not set BR2_TOOLCHAIN_EXTERNAL_CXX=y BR2_TARGET_GENERIC_ISSUE="" BR2_ROOTFS_MERGED_USR=y BR2_TARGET_GENERIC_ROOT_PASSWD="root" BR2_SYSTEM_BIN_SH_BASH=y BR2_TARGET_GENERIC_GETTY_TERM="linux" BR2_TARGET_GENERIC_GETTY_OPTIONS="-n -l /bin/-bash" BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y BR2_PACKAGE_GDB=y BR2_PACKAGE_ZLIB=y BR2_PACKAGE_ZLIB_NG=y BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP_CLIENT=y BR2_PACKAGE_IPROUTE2=y BR2_PACKAGE_LRZSZ=y BR2_PACKAGE_SOCAT=y BR2_PACKAGE_HTOP=y BR2_PACKAGE_NANO=y # BR2_PACKAGE_NANO_TINY is not set BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="64M" # BR2_TARGET_ROOTFS_TAR is not set ``` From ckhardin at gmail.com Wed Feb 23 04:33:20 2022 From: ckhardin at gmail.com (Charles Hardin) Date: Tue, 22 Feb 2022 20:33:20 -0800 Subject: [Buildroot] [PATCH 1/1] package/alsa-plugins: bump to version 1.2.6 Message-ID: <20220223043320.25753-1-ckhardin@gmail.com> https://github.com/alsa-project/alsa-plugins/releases/tag/v1.2.6 Signed-off-by: Charles Hardin --- package/alsa-plugins/alsa-plugins.hash | 2 +- package/alsa-plugins/alsa-plugins.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/alsa-plugins/alsa-plugins.hash b/package/alsa-plugins/alsa-plugins.hash index 8ecbd19965..2582a0d639 100644 --- a/package/alsa-plugins/alsa-plugins.hash +++ b/package/alsa-plugins/alsa-plugins.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 42eef98433d2c8d11f1deeeb459643619215a75aa5a5bbdd06a794e4c413df20 alsa-plugins-1.2.5.tar.bz2 +sha256 068818a4b55d8c029daa00015d853d45113f56b224b7c64e1e117988c825b2a0 alsa-plugins-1.2.6.tar.bz2 sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING.GPL diff --git a/package/alsa-plugins/alsa-plugins.mk b/package/alsa-plugins/alsa-plugins.mk index 396f47adaf..b8819151ef 100644 --- a/package/alsa-plugins/alsa-plugins.mk +++ b/package/alsa-plugins/alsa-plugins.mk @@ -4,7 +4,7 @@ # ################################################################################ -ALSA_PLUGINS_VERSION = 1.2.5 +ALSA_PLUGINS_VERSION = 1.2.6 ALSA_PLUGINS_SOURCE = alsa-plugins-$(ALSA_PLUGINS_VERSION).tar.bz2 ALSA_PLUGINS_SITE = https://www.alsa-project.org/files/pub/plugins ALSA_PLUGINS_LICENSE = LGPL-2.1+ -- 2.24.3 (Apple Git-128) From thomas.petazzoni at bootlin.com Wed Feb 23 07:09:31 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 23 Feb 2022 07:09:31 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-02-22 Message-ID: <20220223070936.00DB281379@smtp1.osuosl.org> Hello, Autobuild statistics for 2022-02-22 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 51 | 5 | 0 | 56 | 2021.11.x | 21 | 1 | 0 | 22 | master | 48 | 38 | 0 | 86 | Classification of failures by reason for master ----------------------------------------------- host-libselinux-3.3 | 9 frr-8.1 | 6 bpftool-a7f0e7f057283ae8af3... | 3 python-greenlet-1.1.2 | 2 python-pygame-d61ea8eabd56 | 2 android-tools-4.2.2+git2013... | 1 bat-0.19.0 | 1 bluez5_utils-5.63 | 1 gocryptfs-2.2.1 | 1 google-breakpad-7515ab13768... | 1 gstd-0.13.0 | 1 hostapd-2.10 | 1 Makefile:733: target-finalize | 1 ndisc6-1.0.5 | 1 qt5webkit-5.212.0-alpha4 | 1 safeclib-3.7.1 | 1 sconeserver-6b932d7d8dbb700... | 1 target-finalize | 1 tovid-87c676f4aadb7303d2cd9... | 1 vlc-3.0.16 | 1 wpa_supplicant-2.10 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- powerpc64 | android-tools-4.2.2+git2013... | NOK | http://autobuild.buildroot.net/results/401cd7b23542ada9964967223e691497909acb8e | arm | bat-0.19.0 | NOK | http://autobuild.buildroot.net/results/6b2885d31972e3dbaab19a44261fb39dd0f74ae9 | mips | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/d323cbea5acdf95b2d1fab2f3e8c288fc240247d | mips64el | bpftool-a7f0e7f057283ae8af3... | NOK | http://autobuild.buildroot.net/results/c5ad46e33e59cb44c717591ead71228b9316dd7f | sparc64 | bpftool-a7f0e7f057283ae8af3... | NOK | http://autobuild.buildroot.net/results/9333c1adad2a092c5ebf2114f89d65c8d888b867 | powerpc64le | bpftool-a7f0e7f057283ae8af3... | NOK | http://autobuild.buildroot.net/results/70457d39dfcdc098c35b8371fb13ed6a015ba85f | microblazeel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/121ac2cd087dd09e12538e444556d35f77e5e5fc | xtensa | frr-8.1 | NOK | http://autobuild.buildroot.net/results/013afc7bdadef2b7a8e8a17fac30e5c930afe3ee | mips64el | frr-8.1 | NOK | http://autobuild.buildroot.net/results/6a02d29db5d53c52a529f6ee85872d40b5aaf6a8 | nios2 | frr-8.1 | NOK | http://autobuild.buildroot.net/results/4ea830db8c9c0c891db342c3e363afd98ee3808c | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/1da1bc313eb6df3fcb35f17673a3cf6db8e1b310 | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/2f998c586df820c0388e82d7462403108380ed1b | i586 | gocryptfs-2.2.1 | NOK | http://autobuild.buildroot.net/results/5a75b1613f4ae528d901acef723b184a46a5a963 | mipsel | google-breakpad-7515ab13768... | NOK | http://autobuild.buildroot.net/results/976266955282494bc032ec4de0cecaf953e2f0a1 | mips64el | gstd-0.13.0 | NOK | http://autobuild.buildroot.net/results/196b102d0b8bbd72bfd584ac201687ca44e78c3a | ORPH s390x | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/c7e702d27480c75100063690e74cbb7c1aa48e05 | arc | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/8f29d20c39431c4a957465396820653d5d363cee | sparc | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/f2a91b5751c2dc47169640f33fc1d41180b4b499 | arc | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/0a5f4ec1bb0d7f5f37d11ed10c1f12b41b817c82 | x86_64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/f98cb35628ebb0dbfc33d1e8c9b2683e326a0e56 | or1k | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/f01ade768a188bea472efbc93caf7fa6ec3f8971 | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/17d99d58e5ba33f3a3c4ab2fa329471532f8a041 | arc | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/61b7f18372e8a350a9fe2e48cce05b412930fbbb | microblazeel | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/677a90d49cd14af1032e2bab200ae949840ee714 | nds32le | hostapd-2.10 | NOK | http://autobuild.buildroot.net/results/b33dc422fe3d775ee88753af1fe9016c38aa71ea | arm | Makefile:733: target-finalize | NOK | http://autobuild.buildroot.net/results/6112e1830ce608abcea4a26b659c10e5ff09a66a | arm | ndisc6-1.0.5 | NOK | http://autobuild.buildroot.net/results/1bb5eda1985ce51da9dac5be008fc588b0f2efaa | ORPH aarch64 | python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/9856fb75e08fdda0a08e47f0326df97000a11547 | arm | python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/5b9b5f55e57d6f5de6bb88488dd229975c649c8d | arc | python-pygame-d61ea8eabd56 | NOK | http://autobuild.buildroot.net/results/7c50a40db75709af4e7ab8033e02ab1e7f831e71 | riscv64 | python-pygame-d61ea8eabd56 | NOK | http://autobuild.buildroot.net/results/fd4d8de9849df2baf47864b2dec7037ce286005c | mipsel | qt5webkit-5.212.0-alpha4 | NOK | http://autobuild.buildroot.net/results/5191600b463cda078203eeffae880ed989f8ac0f | sparc64 | safeclib-3.7.1 | NOK | http://autobuild.buildroot.net/results/af24e1541c01261343c5fe0c7369ce9020dde09b | arm | sconeserver-6b932d7d8dbb700... | NOK | http://autobuild.buildroot.net/results/83ecf772965b4586eaea2682871a85732df7d62f | i686 | target-finalize | NOK | http://autobuild.buildroot.net/results/fc82ccf1fdbdd9a3cd51ab9c06c57c01a88955a8 | xtensa | tovid-87c676f4aadb7303d2cd9... | NOK | http://autobuild.buildroot.net/results/67f3a0263870558ae1ff3f5c66db248d5c1bf3d7 | riscv64 | vlc-3.0.16 | NOK | http://autobuild.buildroot.net/results/0a757c5ffb8af9d6d2589c72956f7d65bc40693d | arm | wpa_supplicant-2.10 | NOK | http://autobuild.buildroot.net/results/318f9ecd4060d34cc8385891b56d0a0e6275f2c9 | Classification of failures by reason for 2021.02.x -------------------------------------------------- haproxy-2.2.17 | 1 rauc-1.5.1 | 1 rocksdb-6.13.3 | 1 unknown | 1 zeromq-4.3.4 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sh4 | haproxy-2.2.17 | NOK | http://autobuild.buildroot.net/results/47acc25a1f47ce4f3570b8b54730120420267286 | riscv32 | rauc-1.5.1 | NOK | http://autobuild.buildroot.net/results/04d5b7f8d86cbb7fe3946269a7d9145dcd1a6a5e | m68k | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/5e0b1bdecdf8009344eedec86bd382c65de9fb34 | arm | unknown | NOK | http://autobuild.buildroot.net/results/5260cd671d0ec0a8e1440b84959f1187321e2060 | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/f8f4a9d6d1de4f7b2f482a29c1f7e13feae76a57 | Classification of failures by reason for 2021.11.x -------------------------------------------------- zeromq-4.3.4 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/8a6e751bdde880037f53f312f7fdcff413810a92 | -- http://autobuild.buildroot.net From peterlin at andestech.com Wed Feb 23 07:10:47 2022 From: peterlin at andestech.com (Yu Chien Peter Lin) Date: Wed, 23 Feb 2022 15:10:47 +0800 Subject: [Buildroot] [PATCH v4 1/3] board/andes: rearrange andes folder structure Message-ID: <20220223071049.21153-1-peterlin@andestech.com> Rename ae3xx to ae300 for nds32 architecture and add ae350 platform. AE300 (NDS32): - http://www.andestech.com/en/products-solutions/andeshape-platforms/ae300/ AE350 (RISC-V): - http://www.andestech.com/en/products-solutions/andeshape-platforms/ae350-axi-based-platform-pre-integrated-with-n25f-nx25f-a25-ax25/ Signed-off-by: Yu Chien Peter Lin Signed-off-by: Alan Kao --- Changes v1 -> v2: - move linux source code and its patches to AndesTech Github repo - rename ae350_andestar45_defconfig to andes_ae350_45_defconfig - change C library to uClibc - remove OpenSSL package - remove rootfs.cpio and rootfs.tar - update DEVELOPERS Changes v2 -> v3: - specifiy branch to download from AndesTech linux repo - change boot.cmd to extlinux.conf - add post-build.sh for extlinux.conf to retrieve Image and DTB - fix format and update genimage_sdcard.cfg - update readme.txt - add packages (python3, pylibfdt and openssl) for u-boot binman - reorder item in DEVELOPERS Changes v3 -> v4: - rename ae3xx folder to ae300 - rename andes_ae3xx_defconfig to andes_ae300_defconfig - update readme.txt and item in DEVELOPERS --- .../{ae3xx/ae3xx.fragment => ae300/ae300.fragment} | 0 .../linux/0001-nds32-Fix-boot-messages-garbled.patch | 0 ...-dtc-Remove-redundant-YYLOC-global-declaratio.patch | 0 board/andes/{ => ae300}/readme.txt | 10 +++++----- .../{andes_ae3xx_defconfig => andes_ae300_defconfig} | 4 ++-- .../toolchain-external-andes-nds32/Config.in | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) rename board/andes/{ae3xx/ae3xx.fragment => ae300/ae300.fragment} (100%) rename board/andes/{ => ae300}/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch (100%) rename board/andes/{ => ae300}/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch (100%) rename board/andes/{ => ae300}/readme.txt (71%) rename configs/{andes_ae3xx_defconfig => andes_ae300_defconfig} (69%) diff --git a/board/andes/ae3xx/ae3xx.fragment b/board/andes/ae300/ae300.fragment similarity index 100% rename from board/andes/ae3xx/ae3xx.fragment rename to board/andes/ae300/ae300.fragment diff --git a/board/andes/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch b/board/andes/ae300/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/ae300/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch diff --git a/board/andes/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch b/board/andes/ae300/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch similarity index 100% rename from board/andes/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch rename to board/andes/ae300/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch diff --git a/board/andes/readme.txt b/board/andes/ae300/readme.txt similarity index 71% rename from board/andes/readme.txt rename to board/andes/ae300/readme.txt index 0f95c65549..51c05c9235 100644 --- a/board/andes/readme.txt +++ b/board/andes/ae300/readme.txt @@ -1,10 +1,10 @@ Intro ===== -Andestech(nds32) AE3XX Platform +Andestech(nds32) AE300 Platform -The AE3XX prototype demonstrates the AE3XX example platform on the FPGA. -It is composed of one Andestech(nds32) processor and AE3XX. +The AE300 prototype demonstrates the AE300 example platform on the FPGA. +It is composed of one Andestech(nds32) processor and AE300. How to build it =============== @@ -12,10 +12,10 @@ How to build it Configure Buildroot ------------------- -The andes_ae3xx_defconfig configuration is a sample configuration with +The andes_ae300_defconfig configuration is a sample configuration with all that is required to bring the FPGA Development Board: - $ make andes_ae3xx_defconfig + $ make andes_ae300_defconfig Build everything ---------------- diff --git a/configs/andes_ae3xx_defconfig b/configs/andes_ae300_defconfig similarity index 69% rename from configs/andes_ae3xx_defconfig rename to configs/andes_ae300_defconfig index 52634caa50..ffcb4d7d38 100644 --- a/configs/andes_ae3xx_defconfig +++ b/configs/andes_ae300_defconfig @@ -1,10 +1,10 @@ BR2_nds32=y -BR2_GLOBAL_PATCH_DIR="board/andes/patches/" +BR2_GLOBAL_PATCH_DIR="board/andes/ae300/patches" BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_ANDES_NDS32=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/andes/ae3xx/ae3xx.fragment" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/andes/ae300/ae300.fragment" BR2_TARGET_ROOTFS_INITRAMFS=y diff --git a/toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in b/toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in index 9c937b8c44..ecd50cc805 100644 --- a/toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in +++ b/toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in @@ -12,4 +12,4 @@ config BR2_TOOLCHAIN_EXTERNAL_ANDES_NDS32 help nds32 toolchain for the nds32 architecture. It uses GCC 8.2.1, GDB 8.1.1, glibc 2.28, Binutils 2.30. It generates - code that runs on ae3xx platform + code that runs on ae300 platform -- 2.17.1 From peterlin at andestech.com Wed Feb 23 07:10:48 2022 From: peterlin at andestech.com (Yu Chien Peter Lin) Date: Wed, 23 Feb 2022 15:10:48 +0800 Subject: [Buildroot] [PATCH v4 2/3] board/andes/ae350: add support for Andes AE350 In-Reply-To: <20220223071049.21153-1-peterlin@andestech.com> References: <20220223071049.21153-1-peterlin@andestech.com> Message-ID: <20220223071049.21153-2-peterlin@andestech.com> This patch provides defconfig and basic support for Andes 45 series RISC-V architecture on AE350 platform. http://www.andestech.com/en/products-solutions/andeshape-platforms/ae350-axi-based-platform-pre-integrated-with-n25f-nx25f-a25-ax25/ Signed-off-by: Yu Chien Peter Lin Signed-off-by: Alan Kao Reviewed-by: Giulio Benetti --- board/andes/ae350/ae350.dts | 274 ++++++++++++++++++ board/andes/ae350/genimage_sdcard.cfg | 26 ++ ...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/post-build.sh | 3 + board/andes/ae350/readme.txt | 65 +++++ .../boot/extlinux/extlinux.conf | 4 + board/andes/ae350/uboot.config.fragment | 5 + configs/andes_ae350_45_defconfig | 43 +++ 13 files changed, 579 insertions(+) create mode 100755 board/andes/ae350/ae350.dts 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 100755 board/andes/ae350/post-build.sh create mode 100644 board/andes/ae350/readme.txt create mode 100644 board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf 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/genimage_sdcard.cfg b/board/andes/ae350/genimage_sdcard.cfg new file mode 100644 index 0000000000..b8b9fe6a62 --- /dev/null +++ b/board/andes/ae350/genimage_sdcard.cfg @@ -0,0 +1,26 @@ +image boot.vfat { + vfat { + files = { + "u-boot-spl.bin", + "u-boot.itb", + "ae350.dtb", + } + } + size = 2M +} + +image sdcard.img { + hdimage { + } + + partition boot { + partition-type = 0xC + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + bootable = true + 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/post-build.sh b/board/andes/ae350/post-build.sh new file mode 100755 index 0000000000..0e6ce228f4 --- /dev/null +++ b/board/andes/ae350/post-build.sh @@ -0,0 +1,3 @@ +#!/bin/sh +cp $BINARIES_DIR/Image $TARGET_DIR/boot +cp $BINARIES_DIR/ae350.dtb $TARGET_DIR/boot diff --git a/board/andes/ae350/readme.txt b/board/andes/ae350/readme.txt new file mode 100644 index 0000000000..6825468d50 --- /dev/null +++ b/board/andes/ae350/readme.txt @@ -0,0 +1,65 @@ +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/ + |-- ae350.dtb + |-- boot.vfat + |-- fw_dynamic.bin + |-- fw_dynamic.elf + |-- fw_jump.bin + |-- fw_jump.elf + |-- Image + |-- 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 + $ sudo sync + +Your SD card partition should be: + + Disk /dev/sdb: 14.48 GiB, 15552479232 bytes, 30375936 sectors + Disk model: Multi-Card + Units: sectors of 1 * 512 = 512 bytes + Sector size (logical/physical): 512 bytes / 512 bytes + I/O size (minimum/optimal): 512 bytes / 512 bytes + Disklabel type: dos + Disk identifier: 0x00000000 + + Device Boot Start End Sectors Size Id Type + /dev/sdb1 1 4096 4096 2M c W95 FAT32 (LBA) + /dev/sdb2 * 4097 126976 122880 60M 83 Linux + +Insert SD card and reset the board, it should boot Linux from mmc. diff --git a/board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf b/board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf new file mode 100644 index 0000000000..549eb93abc --- /dev/null +++ b/board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +label linux + kernel /boot/Image + fdt /boot/ae350.dtb + append earlycon=sbi root=/dev/mmcblk0p2 rootwait 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..a35ddd06ba --- /dev/null +++ b/configs/andes_ae350_45_defconfig @@ -0,0 +1,43 @@ +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_OVERLAY="board/andes/ae350/rootfs_overlay" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/andes/ae350/post-build.sh" +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_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/andestech/linux.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.10.84-ae350_45" +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_PYTHON3=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y +# BR2_TARGET_UBOOT_FORMAT_BIN is not set +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.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 -- 2.17.1 From peterlin at andestech.com Wed Feb 23 07:10:49 2022 From: peterlin at andestech.com (Yu Chien Peter Lin) Date: Wed, 23 Feb 2022 15:10:49 +0800 Subject: [Buildroot] [PATCH v4 3/3] DEVELOPERS: add Yu-Chien Lin to board/andes In-Reply-To: <20220223071049.21153-1-peterlin@andestech.com> References: <20220223071049.21153-1-peterlin@andestech.com> Message-ID: <20220223071049.21153-3-peterlin@andestech.com> Nylon is no longer at Andes. Signed-off-by: Yu Chien Peter Lin Signed-off-by: Alan Kao Reviewed-by: Giulio Benetti --- DEVELOPERS | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index ac702d8d0f..cd64159867 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2146,10 +2146,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_ae300_defconfig +F: configs/andes_ae350_45_defconfig F: toolchain/toolchain-external/toolchain-external-andes-nds32/ N: Olaf Rempel -- 2.17.1 From angelo at amarulasolutions.com Wed Feb 23 07:53:22 2022 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Wed, 23 Feb 2022 08:53:22 +0100 Subject: [Buildroot] [PATCH] package/mono: bump to version 6.12.0.122 Message-ID: <20220223075322.3044754-1-angelo@amarulasolutions.com> Signed-off-by: Angelo Compagnucci --- package/mono/mono.hash | 2 +- package/mono/mono.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mono/mono.hash b/package/mono/mono.hash index 2477e9231c..ad070bf102 100644 --- a/package/mono/mono.hash +++ b/package/mono/mono.hash @@ -1,5 +1,5 @@ # sha256 locally computed -sha256 51de5c02ad511333f93ff585bca54c8784de35af4ff27b759d16b46c4402cdac mono-6.12.0.90.tar.xz +sha256 29c277660fc5e7513107aee1cbf8c5057c9370a4cdfeda2fc781be6986d89d23 mono-6.12.0.122.tar.xz sha256 923c7053ad0d430cd9b0b69a0ccf3abb7170a1ce50ecbf01915b565a35823d10 LICENSE sha256 fc488f3ec9f36856bea8cce5cdde1449176341ef93a3962b691970f8981799f4 mcs/COPYING sha256 2c3c3ef532828bcd42bb3127349625a25291ff5ae7e6f8d42e0fe9b5be836a99 external/Newtonsoft.Json/Tools/7-zip/copying.txt diff --git a/package/mono/mono.mk b/package/mono/mono.mk index 27f7886224..219effc5d3 100644 --- a/package/mono/mono.mk +++ b/package/mono/mono.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONO_VERSION = 6.12.0.90 +MONO_VERSION = 6.12.0.122 MONO_SITE = http://download.mono-project.com/sources/mono MONO_SOURCE = mono-$(MONO_VERSION).tar.xz MONO_LICENSE = GPL-2.0 or MIT (compiler, tools), MIT (libs) or commercial -- 2.25.1 From bugzilla at busybox.net Wed Feb 23 08:20:07 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 23 Feb 2022 08:20:07 +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 --- Comment #4 from Jens Maus --- I just checked the latest 2022.02-rc2 version and there the issue with not being able to compile nodejs v14+ on an ubuntu host still exists as outlined here. However, taking the workaround mentioned in https://gitlab.com/qemu-project/qemu/-/issues/857 I could workout a patch that seems to fix the issue: --- buildroot/package/nodejs/v8-qemu-wrapper.in.orig +++ buildroot/package/nodejs/v8-qemu-wrapper.in @@ -5,5 +5,6 @@ exec @QEMU_USER@ -r @TOOLCHAIN_HEADERS_VERSION@ \ @QEMU_USERMODE_ARGS@ \ -L "${STAGING_DIR}/" \ + -E LD_LIBRARY_PATH="/lib/" \ "$@" With this patch nodejs v14+ seems to compile fine on an ubuntu 20.04 LTS host. -- You are receiving this mail because: You are on the CC list for the bug. From David.Laight at ACULAB.COM Wed Feb 23 08:48:57 2022 From: David.Laight at ACULAB.COM (David Laight) Date: Wed, 23 Feb 2022 08:48:57 +0000 Subject: [Buildroot] [Bug 14366] Nodejs fails with "version `GLIBC_2.34' not found" on Ubuntu 20.04 In-Reply-To: References: Message-ID: > -----Original Message----- > From: buildroot On Behalf Of bugzilla at busybox.net > Sent: 23 February 2022 08:20 > To: buildroot at uclibc.org > Subject: [Buildroot] [Bug 14366] Nodejs fails with "version `GLIBC_2.34' not found" on Ubuntu 20.04 > > https://bugs.busybox.net/show_bug.cgi?id=14366 > > --- Comment #4 from Jens Maus --- > I just checked the latest 2022.02-rc2 version and there the issue with not > being able to compile nodejs v14+ on an ubuntu host still exists as outlined > here. > > However, taking the workaround mentioned in > https://gitlab.com/qemu-project/qemu/-/issues/857 I could workout a patch that > seems to fix the issue: > > --- buildroot/package/nodejs/v8-qemu-wrapper.in.orig > +++ buildroot/package/nodejs/v8-qemu-wrapper.in > @@ -5,5 +5,6 @@ > exec @QEMU_USER@ -r @TOOLCHAIN_HEADERS_VERSION@ \ > @QEMU_USERMODE_ARGS@ \ > -L "${STAGING_DIR}/" \ > + -E LD_LIBRARY_PATH="/lib/" \ > "$@" Except that isn't really what LD_LIBRARY_PATH path should be used for. David > > > With this patch nodejs v14+ seems to compile fine on an ubuntu 20.04 LTS host. > > -- > You are receiving this mail because: > You are on the CC list for the bug. > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot - Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales) From giulio.benetti at benettiengineering.com Wed Feb 23 09:19:08 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 23 Feb 2022 10:19:08 +0100 Subject: [Buildroot] [PATCH v4 1/3] board/andes: rearrange andes folder structure In-Reply-To: <20220223071049.21153-1-peterlin@andestech.com> References: <20220223071049.21153-1-peterlin@andestech.com> Message-ID: <84e159d2-0123-e5b1-c42e-99b70c99f43c@benettiengineering.com> Hi Peter, On 23/02/22 08:10, Yu Chien Peter Lin wrote: > Rename ae3xx to ae300 for nds32 architecture and add ae350 platform. > > AE300 (NDS32): > - http://www.andestech.com/en/products-solutions/andeshape-platforms/ae300/ > AE350 (RISC-V): > - http://www.andestech.com/en/products-solutions/andeshape-platforms/ae350-axi-based-platform-pre-integrated-with-n25f-nx25f-a25-ax25/ > > Signed-off-by: Yu Chien Peter Lin > Signed-off-by: Alan Kao > --- > Changes v1 -> v2: > - move linux source code and its patches to AndesTech Github repo > - rename ae350_andestar45_defconfig to andes_ae350_45_defconfig > - change C library to uClibc > - remove OpenSSL package > - remove rootfs.cpio and rootfs.tar > - update DEVELOPERS > Changes v2 -> v3: > - specifiy branch to download from AndesTech linux repo > - change boot.cmd to extlinux.conf > - add post-build.sh for extlinux.conf to retrieve Image and DTB > - fix format and update genimage_sdcard.cfg > - update readme.txt > - add packages (python3, pylibfdt and openssl) for u-boot binman > - reorder item in DEVELOPERS > Changes v3 -> v4: > - rename ae3xx folder to ae300 > - rename andes_ae3xx_defconfig to andes_ae300_defconfig > - update readme.txt and item in DEVELOPERS Some of these change ^^^ must have been moved to the single patch, like DEVELOPERS is updated in patch 3/3. I've also forgotten to point you to add a --cover-letter, so keep in mind both points for next time. I've built tested both defconfig successfully, so: Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti [Giulio: build tested only] And the other patches of this series is all reviewed, so to me it's ready to be committed, but this will happen after Buildroot 2022.02 is released, since between rc1 to the release Maintainers only accept fixes. Another possibility is that they will commit these patches to next branch. Please remember to tag V3. Thank you for your effort! Best regards -- Giulio Benetti Benetti Engineering sas > --- > .../{ae3xx/ae3xx.fragment => ae300/ae300.fragment} | 0 > .../linux/0001-nds32-Fix-boot-messages-garbled.patch | 0 > ...-dtc-Remove-redundant-YYLOC-global-declaratio.patch | 0 > board/andes/{ => ae300}/readme.txt | 10 +++++----- > .../{andes_ae3xx_defconfig => andes_ae300_defconfig} | 4 ++-- > .../toolchain-external-andes-nds32/Config.in | 2 +- > 6 files changed, 8 insertions(+), 8 deletions(-) > rename board/andes/{ae3xx/ae3xx.fragment => ae300/ae300.fragment} (100%) > rename board/andes/{ => ae300}/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch (100%) > rename board/andes/{ => ae300}/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch (100%) > rename board/andes/{ => ae300}/readme.txt (71%) > rename configs/{andes_ae3xx_defconfig => andes_ae300_defconfig} (69%) > > diff --git a/board/andes/ae3xx/ae3xx.fragment b/board/andes/ae300/ae300.fragment > similarity index 100% > rename from board/andes/ae3xx/ae3xx.fragment > rename to board/andes/ae300/ae300.fragment > diff --git a/board/andes/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch b/board/andes/ae300/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/ae300/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch > diff --git a/board/andes/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch b/board/andes/ae300/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch > similarity index 100% > rename from board/andes/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch > rename to board/andes/ae300/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch > diff --git a/board/andes/readme.txt b/board/andes/ae300/readme.txt > similarity index 71% > rename from board/andes/readme.txt > rename to board/andes/ae300/readme.txt > index 0f95c65549..51c05c9235 100644 > --- a/board/andes/readme.txt > +++ b/board/andes/ae300/readme.txt > @@ -1,10 +1,10 @@ > Intro > ===== > > -Andestech(nds32) AE3XX Platform > +Andestech(nds32) AE300 Platform > > -The AE3XX prototype demonstrates the AE3XX example platform on the FPGA. > -It is composed of one Andestech(nds32) processor and AE3XX. > +The AE300 prototype demonstrates the AE300 example platform on the FPGA. > +It is composed of one Andestech(nds32) processor and AE300. > > How to build it > =============== > @@ -12,10 +12,10 @@ How to build it > Configure Buildroot > ------------------- > > -The andes_ae3xx_defconfig configuration is a sample configuration with > +The andes_ae300_defconfig configuration is a sample configuration with > all that is required to bring the FPGA Development Board: > > - $ make andes_ae3xx_defconfig > + $ make andes_ae300_defconfig > > Build everything > ---------------- > diff --git a/configs/andes_ae3xx_defconfig b/configs/andes_ae300_defconfig > similarity index 69% > rename from configs/andes_ae3xx_defconfig > rename to configs/andes_ae300_defconfig > index 52634caa50..ffcb4d7d38 100644 > --- a/configs/andes_ae3xx_defconfig > +++ b/configs/andes_ae300_defconfig > @@ -1,10 +1,10 @@ > BR2_nds32=y > -BR2_GLOBAL_PATCH_DIR="board/andes/patches/" > +BR2_GLOBAL_PATCH_DIR="board/andes/ae300/patches" > BR2_TOOLCHAIN_EXTERNAL=y > BR2_TOOLCHAIN_EXTERNAL_ANDES_NDS32=y > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17" > BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/andes/ae3xx/ae3xx.fragment" > +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/andes/ae300/ae300.fragment" > BR2_TARGET_ROOTFS_INITRAMFS=y > diff --git a/toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in b/toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in > index 9c937b8c44..ecd50cc805 100644 > --- a/toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in > +++ b/toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in > @@ -12,4 +12,4 @@ config BR2_TOOLCHAIN_EXTERNAL_ANDES_NDS32 > help > nds32 toolchain for the nds32 architecture. It uses GCC > 8.2.1, GDB 8.1.1, glibc 2.28, Binutils 2.30. It generates > - code that runs on ae3xx platform > + code that runs on ae300 platform From peter at korsgaard.com Wed Feb 23 10:04:52 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Feb 2022 11:04:52 +0100 Subject: [Buildroot] [PATCH v6 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <87pmnsnquv.fsf@dell.be.48ers.dk> (Peter Korsgaard's message of "Sat, 12 Feb 2022 14:42:32 +0100") References: <20220211144402.1626443-1-neal.frager@xilinx.com> <87pmnsnquv.fsf@dell.be.48ers.dk> Message-ID: <87sfs96gqj.fsf@dell.be.48ers.dk> Hi, >>>>> "Neal" == Neal Frager writes: >> This patch: >> - bumps ATF to Xilinx v2.6: mainline v2.6 requires patch to build >> - bumps U-Boot to Xilinx 2022.01: important drivers not in mainline >> - bumps Linux to Xilinx 5.15: important drivers not in mainline >> - deletes board/zynqmp/patches directory: patches already in mainline >> - modifies board/zynqmp/genimage.cfg: U-Boot 2022.01 uses u-boot.itb format >> - adds extlinux.conf to vfat bootfs >> - modifies U-Boot to unified xilinx_zynqmp_virt_defconfig (supports all boards) >> - adds support for SPL pm_cfg_obj.c loading to PMU firmware >> - enables support for host machines without OpenSSL required by U-Boot and Linux >> Signed-off-by: Neal Frager >> Reviewed-by: Giulio Benetti >> Tested-by: Giulio Benetti >> [Giulio: only build tested] >> +++ b/configs/zynqmp_zcu106_defconfig >> @@ -1,34 +1,39 @@ >> BR2_aarch64=y >> -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" >> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y >> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y >> +BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" >> BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" >> BR2_LINUX_KERNEL=y >> BR2_LINUX_KERNEL_CUSTOM_GIT=y >> BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" >> -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" >> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="966124532656bc95d781abf57531e4cd4f962237" > The git hashes do not make it directly clear what version this is, so I > changed it to use the output of describe --abbrev=40 which adds > a prefix like v5.15-930-g in front, directly making it clear that this > is based on upstream 5.15 with 930 patches on top. > I've done it for ATF and U-Boot as well and committed, thanks. Hmm, did you test this on a zcu106 board? I just got access to a zcu106 rev 1.0 board and gave it a try here, and see nothing on either of the serial ports. Looking at the u-boot configuration I see that xilinx_zynqmp_virt_defconfig sets: CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu100-revC" Which seems to have a different uart and pinmuxing setup. Changing that to zynqmp-zcu106-revA it does boot (but complains here and there). This is the first time I use a zcu106, so maybe I am missing something, but I don't understand how it can work for you with the zcu100 DTB? Are the kernel BUG splashes expected? Boot log: U-Boot SPL 2022.01 (Feb 23 2022 - 10:35:14 +0100) PMUFW: v1.1 Loading new PMUFW cfg obj (2032 bytes) Silicon version: 3 EL Level: EL3 Chip ID: zu7e Multiboot: 0 Trying to boot from MMC2 spl: could not initialize mmc. error: -19 Trying to boot from MMC1 spl_load_image_fat_os: error reading image u-boot.bin, err - -2 NOTICE: BL31: v2.6(release):2022.02-rc2-4-g1a0d90d8ab NOTICE: BL31: Built : 10:05:33, Feb 23 2022 U-Boot 2022.01 (Feb 23 2022 - 10:06:21 +0100) CPU: ZynqMP Silicon: v3 Model: ZynqMP ZCU106 RevA Board: Xilinx ZynqMP DRAM: 4 GiB PMUFW: v1.1 Xilinx I2C Legacy format at nvmem0: Board name: zcu106 Board rev: 1.0 Board SN: 921730071832-88916 EL Level: EL2 Chip ID: zu7e NAND: 0 MiB MMC: mmc at ff170000: 0 Loading Environment from FAT... *** Error - No Valid Environment Area found *** Warning - bad env area, using default environment In: serial Out: serial Err: serial Bootmode: LVL_SHFT_SD_MODE1 Reset reason: EXTERNAL Net: ZYNQ GEM: ff0e0000, mdio bus ff0e0000, phyaddr 12, interface rgmii-id zynq_gem ethernet at ff0e0000: Failed to read eth PHY id, err: -2 Warning: ethernet at ff0e0000 (eth0) using random MAC address - 8a:9d:6d:13:b4:42 eth0: ethernet at ff0e0000 scanning bus for devices... SATA link 0 timeout. SATA link 1 timeout. AHCI 0001.0301 32 slots 2 ports 6 Gbps 0x3 impl SATA mode flags: 64bit ncq pm clo only pmp fbss pio slum part ccc apst starting USB... Bus usb at fe200000: Register 2000440 NbrPorts 2 Starting the controller USB XHCI 1.00 scanning bus usb at fe200000 for devices... 1 USB Device(s) found scanning usb for storage devices... 0 Storage Device(s) found Hit any key to stop autoboot: 0 switch to partitions #0, OK mmc0 is current device Scanning mmc 0:1... Found /extlinux/extlinux.conf Retrieving file: /extlinux/extlinux.conf 1: linux Retrieving file: /Image append: console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait Retrieving file: /system.dtb ## Flattened Device Tree blob at 40000000 Booting using the fdt blob at 0x40000000 Loading Device Tree to 000000007bdf4000, end 000000007be00998 ... OK Starting kernel ... [ 0.000000] Booting Linux on physical CPU 0x0000000000 [0x410fd034] [ 0.000000] Linux version 5.15.0 (peko at dell) (aarch64-buildroot-linux-uclibc-gcc.br_real (Buildroot 2022.02-rc2-4-g1a0d90d8ab) 10.3.0, GNU ld (GNU Binutils) 2.36.1) #1 SMP Wed Feb 23 10:07:13 CET 2022 [ 0.000000] Machine model: ZynqMP ZCU106 RevA [ 0.000000] efi: UEFI not found. [ 0.000000] Zone ranges: [ 0.000000] DMA32 [mem 0x0000000000000000-0x00000000ffffffff] [ 0.000000] Normal [mem 0x0000000100000000-0x000000087fffffff] [ 0.000000] Movable zone start for each node [ 0.000000] Early memory node ranges [ 0.000000] node 0: [mem 0x0000000000000000-0x000000007fffffff] [ 0.000000] node 0: [mem 0x0000000800000000-0x000000087fffffff] [ 0.000000] Initmem setup node 0 [mem 0x0000000000000000-0x000000087fffffff] [ 0.000000] cma: Reserved 256 MiB at 0x000000006bc00000 [ 0.000000] psci: probing for conduit method from DT. [ 0.000000] psci: PSCIv1.1 detected in firmware. [ 0.000000] psci: Using standard PSCI v0.2 function IDs [ 0.000000] psci: MIGRATE_INFO_TYPE not supported. [ 0.000000] psci: SMC Calling Convention v1.2 [ 0.000000] percpu: Embedded 18 pages/cpu s33048 r8192 d32488 u73728 [ 0.000000] Detected VIPT I-cache on CPU0 [ 0.000000] CPU features: detected: ARM erratum 845719 [ 0.000000] Built 1 zonelists, mobility grouping on. Total pages: 1034240 [ 0.000000] Kernel command line: console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait [ 0.000000] Dentry cache hash table entries: 524288 (order: 10, 4194304 bytes, linear) [ 0.000000] Inode-cache hash table entries: 262144 (order: 9, 2097152 bytes, linear) [ 0.000000] mem auto-init: stack:off, heap alloc:off, heap free:off [ 0.000000] software IO TLB: mapped [mem 0x000000007c000000-0x0000000080000000] (64MB) [ 0.000000] Memory: 3772724K/4194304K available (13632K kernel code, 908K rwdata, 3872K rodata, 1984K init, 307K bss, 159436K reserved, 262144K cma-reserved) [ 0.000000] rcu: Hierarchical RCU implementation. [ 0.000000] rcu: RCU event tracing is enabled. [ 0.000000] rcu: RCU calculated value of scheduler-enlistment delay is 25 jiffies. [ 0.000000] NR_IRQS: 64, nr_irqs: 64, preallocated irqs: 0 [ 0.000000] GIC: Adjusting CPU interface base to 0x00000000f902f000 [ 0.000000] Root IRQ handler: gic_handle_irq [ 0.000000] GIC: Using split EOI/Deactivate mode [ 0.000000] random: get_random_bytes called from start_kernel+0x470/0x6f8 with crng_init=0 [ 0.000000] arch_timer: cp15 timer(s) running at 100.00MHz (phys). [ 0.000000] clocksource: arch_sys_counter: mask: 0xffffffffffffff max_cycles: 0x171024e7e0, max_idle_ns: 440795205315 ns [ 0.000000] sched_clock: 56 bits at 100MHz, resolution 10ns, wraps every 4398046511100ns [ 0.000288] Console: colour dummy device 80x25 [ 0.000321] Calibrating delay loop (skipped), value calculated using timer frequency.. 200.00 BogoMIPS (lpj=400000) [ 0.000332] pid_max: default: 32768 minimum: 301 [ 0.000438] Mount-cache hash table entries: 8192 (order: 4, 65536 bytes, linear) [ 0.000457] Mountpoint-cache hash table entries: 8192 (order: 4, 65536 bytes, linear) [ 0.001273] rcu: Hierarchical SRCU implementation. [ 0.001528] EFI services will not be available. [ 0.001653] smp: Bringing up secondary CPUs ... [ 0.001990] Detected VIPT I-cache on CPU1 [ 0.002027] CPU1: Booted secondary processor 0x0000000001 [0x410fd034] [ 0.002403] Detected VIPT I-cache on CPU2 [ 0.002427] CPU2: Booted secondary processor 0x0000000002 [0x410fd034] [ 0.002769] Detected VIPT I-cache on CPU3 [ 0.002792] CPU3: Booted secondary processor 0x0000000003 [0x410fd034] [ 0.002835] smp: Brought up 1 node, 4 CPUs [ 0.002852] SMP: Total of 4 processors activated. [ 0.002857] CPU features: detected: 32-bit EL0 Support [ 0.002862] CPU features: detected: CRC32 instructions [ 0.002902] CPU: All CPU(s) started at EL2 [ 0.002918] alternatives: patching kernel code [ 0.003960] devtmpfs: initialized [ 0.009544] clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 7645041785100000 ns [ 0.009562] futex hash table entries: 1024 (order: 4, 65536 bytes, linear) [ 0.017810] pinctrl core: initialized pinctrl subsystem [ 0.018441] NET: Registered PF_NETLINK/PF_ROUTE protocol family [ 0.019418] DMA: preallocated 512 KiB GFP_KERNEL pool for atomic allocations [ 0.019518] DMA: preallocated 512 KiB GFP_KERNEL|GFP_DMA32 pool for atomic allocations [ 0.019556] audit: initializing netlink subsys (disabled) [ 0.019631] audit: type=2000 audit(0.016:1): state=initialized audit_enabled=0 res=1 [ 0.019926] hw-breakpoint: found 6 breakpoint and 4 watchpoint registers. [ 0.020003] ASID allocator initialised with 65536 entries [ 0.037264] HugeTLB registered 1.00 GiB page size, pre-allocated 0 pages [ 0.037277] HugeTLB registered 32.0 MiB page size, pre-allocated 0 pages [ 0.037284] HugeTLB registered 2.00 MiB page size, pre-allocated 0 pages [ 0.037290] HugeTLB registered 64.0 KiB page size, pre-allocated 0 pages [ 1.101889] DRBG: Continuing without Jitter RNG [ 1.204745] raid6: neonx8 gen() 2143 MB/s [ 1.272796] raid6: neonx8 xor() 1594 MB/s [ 1.340859] raid6: neonx4 gen() 2184 MB/s [ 1.408910] raid6: neonx4 xor() 1577 MB/s [ 1.476970] raid6: neonx2 gen() 2069 MB/s [ 1.545023] raid6: neonx2 xor() 1453 MB/s [ 1.613092] raid6: neonx1 gen() 1802 MB/s [ 1.681135] raid6: neonx1 xor() 1240 MB/s [ 1.749185] raid6: int64x8 gen() 1471 MB/s [ 1.817242] raid6: int64x8 xor() 785 MB/s [ 1.885301] raid6: int64x4 gen() 1582 MB/s [ 1.953353] raid6: int64x4 xor() 841 MB/s [ 2.021426] raid6: int64x2 gen() 1397 MB/s [ 2.089481] raid6: int64x2 xor() 750 MB/s [ 2.157554] raid6: int64x1 gen() 1187 MB/s [ 2.225592] raid6: int64x1 xor() 596 MB/s [ 2.225598] raid6: using algorithm neonx4 gen() 2184 MB/s [ 2.225603] raid6: .... xor() 1577 MB/s, rmw enabled [ 2.225608] raid6: using neon recovery algorithm [ 2.225975] iommu: Default domain type: Translated [ 2.225982] iommu: DMA domain TLB invalidation policy: strict mode [ 2.226202] SCSI subsystem initialized [ 2.226349] usbcore: registered new interface driver usbfs [ 2.226377] usbcore: registered new interface driver hub [ 2.226400] usbcore: registered new device driver usb [ 2.226454] mc: Linux media interface: v0.10 [ 2.226473] videodev: Linux video capture interface: v2.00 [ 2.226509] pps_core: LinuxPPS API ver. 1 registered [ 2.226514] pps_core: Software ver. 5.3.6 - Copyright 2005-2007 Rodolfo Giometti [ 2.226526] PTP clock support registered [ 2.226553] EDAC MC: Ver: 3.0.0 [ 2.226836] zynqmp-ipi-mbox mailbox at ff990400: Registered ZynqMP IPI mbox with TX/RX channels. [ 2.227024] FPGA manager framework [ 2.227145] Advanced Linux Sound Architecture Driver Initialized. [ 2.227429] Bluetooth: Core ver 2.22 [ 2.227453] NET: Registered PF_BLUETOOTH protocol family [ 2.227459] Bluetooth: HCI device and connection manager initialized [ 2.227467] Bluetooth: HCI socket layer initialized [ 2.227474] Bluetooth: L2CAP socket layer initialized [ 2.227485] Bluetooth: SCO socket layer initialized [ 2.227775] clocksource: Switched to clocksource arch_sys_counter [ 2.227873] VFS: Disk quotas dquot_6.6.0 [ 2.227912] VFS: Dquot-cache hash table entries: 512 (order 0, 4096 bytes) [ 2.231825] NET: Registered PF_INET protocol family [ 2.231947] IP idents hash table entries: 65536 (order: 7, 524288 bytes, linear) [ 2.233469] tcp_listen_portaddr_hash hash table entries: 2048 (order: 3, 32768 bytes, linear) [ 2.233516] TCP established hash table entries: 32768 (order: 6, 262144 bytes, linear) [ 2.233722] TCP bind hash table entries: 32768 (order: 7, 524288 bytes, linear) [ 2.234105] TCP: Hash tables configured (established 32768 bind 32768) [ 2.234173] UDP hash table entries: 2048 (order: 4, 65536 bytes, linear) [ 2.234250] UDP-Lite hash table entries: 2048 (order: 4, 65536 bytes, linear) [ 2.234400] NET: Registered PF_UNIX/PF_LOCAL protocol family [ 2.234694] RPC: Registered named UNIX socket transport module. [ 2.234702] RPC: Registered udp transport module. [ 2.234706] RPC: Registered tcp transport module. [ 2.234710] RPC: Registered tcp NFSv4.1 backchannel transport module. [ 2.235296] PCI: CLS 0 bytes, default 64 [ 2.235581] armv8-pmu pmu: hw perfevents: no interrupt-affinity property, guessing. [ 2.235746] hw perfevents: enabled with armv8_pmuv3 PMU driver, 7 counters available [ 2.236515] Initialise system trusted keyrings [ 2.236595] workingset: timestamp_bits=62 max_order=20 bucket_order=0 [ 2.237148] NFS: Registering the id_resolver key type [ 2.237162] Key type id_resolver registered [ 2.237167] Key type id_legacy registered [ 2.237184] nfs4filelayout_init: NFSv4 File Layout Driver Registering... [ 2.237190] nfs4flexfilelayout_init: NFSv4 Flexfile Layout Driver Registering... [ 2.237207] jffs2: version 2.2. (NAND) ? 2001-2006 Red Hat, Inc. [ 2.273154] NET: Registered PF_ALG protocol family [ 2.273167] xor: measuring software checksum speed [ 2.277216] 8regs : 2438 MB/sec [ 2.280739] 32regs : 2800 MB/sec [ 2.285008] arm64_neon : 2309 MB/sec [ 2.285014] xor: using function: 32regs (2800 MB/sec) [ 2.285021] Key type asymmetric registered [ 2.285026] Asymmetric key parser 'x509' registered [ 2.285062] Block layer SCSI generic (bsg) driver version 0.4 loaded (major 245) [ 2.285069] io scheduler mq-deadline registered [ 2.285075] io scheduler kyber registered [ 2.309548] Serial: 8250/16550 driver, 4 ports, IRQ sharing disabled [ 2.312677] cacheinfo: Unable to detect cache hierarchy for CPU 0 [ 2.316619] brd: module loaded [ 2.319780] loop: module loaded [ 2.320496] mtdoops: mtd device (mtddev=name/number) must be supplied [ 2.321724] libphy: Fixed MDIO Bus: probed [ 2.322824] tun: Universal TUN/TAP device driver, 1.6 [ 2.322904] CAN device driver interface [ 2.323561] usbcore: registered new interface driver asix [ 2.323600] usbcore: registered new interface driver ax88179_178a [ 2.323625] usbcore: registered new interface driver cdc_ether [ 2.323647] usbcore: registered new interface driver net1080 [ 2.323669] usbcore: registered new interface driver cdc_subset [ 2.323692] usbcore: registered new interface driver zaurus [ 2.323724] usbcore: registered new interface driver cdc_ncm [ 2.324408] usbcore: registered new interface driver uas [ 2.324440] usbcore: registered new interface driver usb-storage [ 2.325070] rtc_zynqmp ffa60000.rtc: registered as rtc0 [ 2.325087] rtc_zynqmp ffa60000.rtc: setting system clock to 2021-01-18T20:15:26 UTC (1611000926) [ 2.325153] i2c_dev: i2c /dev entries driver [ 2.326567] usbcore: registered new interface driver uvcvideo [ 2.327362] Bluetooth: HCI UART driver ver 2.3 [ 2.327370] Bluetooth: HCI UART protocol H4 registered [ 2.327376] Bluetooth: HCI UART protocol BCSP registered [ 2.327394] Bluetooth: HCI UART protocol LL registered [ 2.327400] Bluetooth: HCI UART protocol ATH3K registered [ 2.327416] Bluetooth: HCI UART protocol Three-wire (H5) registered [ 2.327453] Bluetooth: HCI UART protocol Intel registered [ 2.327470] Bluetooth: HCI UART protocol QCA registered [ 2.327499] usbcore: registered new interface driver bcm203x [ 2.327525] usbcore: registered new interface driver bpa10x [ 2.327550] usbcore: registered new interface driver bfusb [ 2.327576] usbcore: registered new interface driver btusb [ 2.327616] usbcore: registered new interface driver ath3k [ 2.327688] EDAC MC: ECC not enabled [ 2.327829] EDAC DEVICE0: Giving out device to module edac controller cache_err: DEV edac (POLLED) [ 2.327977] EDAC DEVICE1: Giving out device to module zynqmp-ocm-edac controller zynqmp_ocm: DEV ff960000.memory-controller (INTERRUPT) [ 2.328309] sdhci: Secure Digital Host Controller Interface driver [ 2.328315] sdhci: Copyright(c) Pierre Ossman [ 2.328319] sdhci-pltfm: SDHCI platform and OF driver helper [ 2.328645] ledtrig-cpu: registered to indicate activity on CPUs [ 2.328735] SMCCC: SOC_ID: ARCH_SOC_ID not implemented, skipping .... [ 2.328772] zynqmp_firmware_probe Platform Management API v1.1 [ 2.328780] zynqmp_firmware_probe Trustzone version v1.0 [ 2.358985] securefw securefw: securefw probed [ 2.359229] alg: No test for xilinx-zynqmp-aes (zynqmp-aes) [ 2.359249] zynqmp_aes firmware:zynqmp-firmware:zynqmp-aes: AES Successfully Registered [ 2.359423] alg: No test for xilinx-keccak-384 (zynqmp-keccak-384) [ 2.359595] alg: No test for xilinx-zynqmp-rsa (zynqmp-rsa) [ 2.359737] usbcore: registered new interface driver usbhid [ 2.359744] usbhid: USB HID core driver [ 2.361013] fpga_manager fpga0: Xilinx ZynqMP FPGA Manager registered [ 2.361338] usbcore: registered new interface driver snd-usb-audio [ 2.362114] pktgen: Packet Generator for packet performance testing. Version: 2.75 [ 2.362489] Initializing XFRM netlink socket [ 2.362565] NET: Registered PF_INET6 protocol family [ 2.363069] Segment Routing with IPv6 [ 2.363087] In-situ OAM (IOAM) with IPv6 [ 2.363138] sit: IPv6, IPv4 and MPLS over IPv4 tunneling driver [ 2.363447] NET: Registered PF_PACKET protocol family [ 2.363462] NET: Registered PF_KEY protocol family [ 2.363482] can: controller area network core [ 2.363508] NET: Registered PF_CAN protocol family [ 2.363514] can: raw protocol [ 2.363520] can: broadcast manager protocol [ 2.363527] can: netlink gateway - max_hops=1 [ 2.363619] Bluetooth: RFCOMM TTY layer initialized [ 2.363632] Bluetooth: RFCOMM socket layer initialized [ 2.363647] Bluetooth: RFCOMM ver 1.11 [ 2.363656] Bluetooth: BNEP (Ethernet Emulation) ver 1.3 [ 2.363662] Bluetooth: BNEP filters: protocol multicast [ 2.363669] Bluetooth: BNEP socket layer initialized [ 2.363674] Bluetooth: HIDP (Human Interface Emulation) ver 1.2 [ 2.363681] Bluetooth: HIDP socket layer initialized [ 2.363819] 9pnet: Installing 9P2000 support [ 2.363839] Key type dns_resolver registered [ 2.363942] registered taskstats version 1 [ 2.363948] Loading compiled-in X.509 certificates [ 2.364918] Btrfs loaded, crc32c=crc32c-generic, zoned=no, fsverity=no [ 2.373064] ff000000.serial: ttyPS0 at MMIO 0xff000000 (irq = 42, base_baud = 6249999) is a xuartps [ 3.672506] printk: console [ttyPS0] enabled [ 3.677493] ff010000.serial: ttyPS1 at MMIO 0xff010000 (irq = 43, base_baud = 6249999) is a xuartps [ 3.686810] of-fpga-region fpga-full: FPGA Region probed [ 3.693554] xilinx-zynqmp-dma fd500000.dma-controller: ZynqMP DMA driver Probe success [ 3.701632] xilinx-zynqmp-dma fd510000.dma-controller: ZynqMP DMA driver Probe success [ 3.709702] xilinx-zynqmp-dma fd520000.dma-controller: ZynqMP DMA driver Probe success [ 3.717776] xilinx-zynqmp-dma fd530000.dma-controller: ZynqMP DMA driver Probe success [ 3.725847] xilinx-zynqmp-dma fd540000.dma-controller: ZynqMP DMA driver Probe success [ 3.733921] xilinx-zynqmp-dma fd550000.dma-controller: ZynqMP DMA driver Probe success [ 3.741994] xilinx-zynqmp-dma fd560000.dma-controller: ZynqMP DMA driver Probe success [ 3.750063] xilinx-zynqmp-dma fd570000.dma-controller: ZynqMP DMA driver Probe success [ 3.758379] xilinx-zynqmp-dpdma fd4c0000.dma-controller: Xilinx DPDMA engine is probed [ 3.767022] spi-nor spi0.0: found mt25qu512a, expected m25p80 [ 3.773292] spi-nor spi0.0: mt25qu512a (131072 Kbytes) [ 3.778451] 4 fixed-partitions partitions found on MTD device spi0.0 [ 3.784796] Creating 4 MTD partitions on "spi0.0": [ 3.789581] 0x000000000000-0x000000100000 : "qspi-fsbl-uboot" [ 3.796118] 0x000000100000-0x000000600000 : "qspi-linux" [ 3.802113] 0x000000600000-0x000000620000 : "qspi-device-tree" [ 3.808615] 0x000000620000-0x000000c00000 : "qspi-rootfs" [ 3.817419] macb ff0e0000.ethernet: Not enabling partial store and forward [ 3.824936] libphy: MACB_mii_bus: probed [ 3.829496] macb ff0e0000.ethernet eth0: Cadence GEM rev 0x50070106 at 0xff0e0000 irq 30 (8a:9d:6d:13:b4:42) [ 3.839620] xilinx-axipmon ffa00000.perf-monitor: Probed Xilinx APM [ 3.846207] xilinx-axipmon fd0b0000.perf-monitor: Probed Xilinx APM [ 3.852698] xilinx-axipmon fd490000.perf-monitor: Probed Xilinx APM [ 3.859192] xilinx-axipmon ffa10000.perf-monitor: Probed Xilinx APM [ 3.866522] pca953x 0-0020: supply vcc not found, using dummy regulator [ 3.873218] pca953x 0-0020: using no AI [ 3.877724] pca953x 0-0021: supply vcc not found, using dummy regulator [ 3.884395] pca953x 0-0021: using no AI [ 3.897104] i2c i2c-0: Added multiplexed i2c bus 2 [ 3.908338] i2c i2c-0: Added multiplexed i2c bus 3 [ 3.924679] random: fast init done [ 3.966097] i2c i2c-0: Added multiplexed i2c bus 4 [ 3.970999] i2c i2c-0: Added multiplexed i2c bus 5 [ 3.975789] pca954x 0-0075: registered 4 multiplexed busses for I2C mux pca9544 [ 3.983147] cdns-i2c ff020000.i2c: 400 kHz mmio ff020000 irq 32 [ 3.990509] at24 6-0054: supply vcc not found, using dummy regulator [ 3.997388] at24 6-0054: 1024 byte 24c08 EEPROM, writable, 1 bytes/write [ 4.004128] i2c i2c-1: Added multiplexed i2c bus 6 [ 4.009450] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out [ 4.016760] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out [ 4.024061] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out [ 4.031362] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out [ 4.038661] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out [ 4.045961] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out [ 4.054383] si5341 7-0036: Chip: 5341 Grade: 1 Rev: 1 [ 4.093288] i2c i2c-1: Added multiplexed i2c bus 7 [ 4.100897] si570 8-005d: registered, current frequency 300000000 Hz [ 4.107281] i2c i2c-1: Added multiplexed i2c bus 8 [ 4.127003] si570 9-005d: registered, current frequency 148500000 Hz [ 4.133390] i2c i2c-1: Added multiplexed i2c bus 9 [ 4.138387] si5324 10-0069: si5328 probed [ 4.204331] si5324 10-0069: si5328 probe successful [ 4.209248] i2c i2c-1: Added multiplexed i2c bus 10 [ 4.215324] i2c i2c-1: Added multiplexed i2c bus 11 [ 4.220315] i2c i2c-1: Added multiplexed i2c bus 12 [ 4.225302] i2c i2c-1: Added multiplexed i2c bus 13 [ 4.230182] pca954x 1-0074: registered 8 multiplexed busses for I2C switch pca9548 [ 4.238109] i2c i2c-1: Added multiplexed i2c bus 14 [ 4.243110] i2c i2c-1: Added multiplexed i2c bus 15 [ 4.248106] i2c i2c-1: Added multiplexed i2c bus 16 [ 4.253107] i2c i2c-1: Added multiplexed i2c bus 17 [ 4.258115] i2c i2c-1: Added multiplexed i2c bus 18 [ 4.263114] i2c i2c-1: Added multiplexed i2c bus 19 [ 4.268112] i2c i2c-1: Added multiplexed i2c bus 20 [ 4.273124] i2c i2c-1: Added multiplexed i2c bus 21 [ 4.278000] pca954x 1-0075: registered 8 multiplexed busses for I2C switch pca9548 [ 4.285597] cdns-i2c ff030000.i2c: 400 kHz mmio ff030000 irq 33 [ 4.295393] cdns-wdt fd4d0000.watchdog: Xilinx Watchdog Timer with timeout 60s [ 4.304764] zynqmp-display fd4a0000.display: vtc bridge property not present [ 4.313211] ------------[ cut here ]------------ [ 4.317834] More than allowed devices are using the vpll_int, which is forbidden [ 4.325263] WARNING: CPU: 0 PID: 7 at drivers/clk/zynqmp/pll.c:200 zynqmp_pll_set_rate+0x198/0x200 [ 4.334227] Modules linked in: [ 4.337274] CPU: 0 PID: 7 Comm: kworker/u8:0 Not tainted 5.15.0 #1 [ 4.343444] Hardware name: ZynqMP ZCU106 RevA (DT) [ 4.348229] Workqueue: events_unbound deferred_probe_work_func [ 4.354061] pstate: 60000005 (nZCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 4.361012] pc : zynqmp_pll_set_rate+0x198/0x200 [ 4.365622] lr : zynqmp_pll_set_rate+0x198/0x200 [ 4.370231] sp : ffffffc0114f3660 [ 4.373538] x29: ffffffc0114f3660 x28: ffffff887f7f6458 x27: ffffff88003ec410 [ 4.380673] x26: 000000000000b61b x25: ffffff88014e4880 x24: 0000000000000060 [ 4.387808] x23: 0000000001fca055 x22: ffffff88014e4880 x21: ffffff88014e4900 [ 4.394943] x20: 000000000169cfa1 x19: 0000000059682ef1 x18: 0000000000000030 [ 4.402078] x17: 6962726f66207369 x16: 206863696877202c x15: 746e695f6c6c7076 [ 4.409212] x14: 2065687420676e69 x13: 6e6564646962726f x12: ffffffc01133b230 [ 4.416348] x11: 0000000000000136 x10: 6c6c707620656874 x9 : 00000000fffff7ff [ 4.423483] x8 : ffffffc011367230 x7 : 000000000000bfe8 x6 : 80000000fffff800 [ 4.430617] x5 : 0000000000000000 x4 : 0000000000000000 x3 : 0000000000000000 [ 4.437744] x2 : 0000000000000000 x1 : 0000000000000000 x0 : ffffff880009ad80 [ 4.444879] Call trace: [ 4.447319] zynqmp_pll_set_rate+0x198/0x200 [ 4.451580] clk_change_rate+0x148/0x2c0 [ 4.455495] clk_core_set_rate_nolock+0x154/0x240 [ 4.460190] clk_set_rate+0x38/0x150 [ 4.463758] xilinx_dp_codec_probe+0xac/0x1c0 [ 4.468107] platform_probe+0x68/0xe0 [ 4.471761] really_probe.part.0+0x9c/0x310 [ 4.475936] __driver_probe_device+0x98/0x150 [ 4.480285] driver_probe_device+0x44/0x120 [ 4.484460] __device_attach_driver+0xb4/0x120 [ 4.488895] bus_for_each_drv+0x78/0xd0 [ 4.492723] __device_attach+0xdc/0x190 [ 4.496551] device_initial_probe+0x14/0x20 [ 4.500726] bus_probe_device+0x9c/0xb0 [ 4.504554] device_add+0x36c/0x860 [ 4.508034] of_device_add+0x58/0x70 [ 4.511602] of_platform_device_create_pdata+0xc0/0x100 [ 4.516819] of_platform_bus_create+0x178/0x390 [ 4.521341] of_platform_populate+0x58/0xf0 [ 4.525516] zynqmp_dpsub_probe+0xe8/0x170 [ 4.529604] platform_probe+0x68/0xe0 [ 4.533259] really_probe.part.0+0x9c/0x310 [ 4.537434] __driver_probe_device+0x98/0x150 [ 4.541782] driver_probe_device+0x44/0x120 [ 4.545957] __device_attach_driver+0xb4/0x120 [ 4.550393] bus_for_each_drv+0x78/0xd0 [ 4.554221] __device_attach+0xdc/0x190 [ 4.558049] device_initial_probe+0x14/0x20 [ 4.562224] bus_probe_device+0x9c/0xb0 [ 4.566052] deferred_probe_work_func+0x88/0xc0 [ 4.570574] process_one_work+0x1d4/0x390 [ 4.574585] worker_thread+0x298/0x4e0 [ 4.578325] kthread+0x120/0x130 [ 4.581545] ret_from_fork+0x10/0x20 [ 4.585113] ---[ end trace 59c0d1ba4e758fd6 ]--- [ 4.591486] ------------[ cut here ]------------ [ 4.596107] More than allowed devices are using the vpll_int, which is forbidden [ 4.603220] mmc0: SDHCI controller on ff170000.mmc [ff170000.mmc] using ADMA 64-bit [ 4.603529] WARNING: CPU: 0 PID: 7 at drivers/clk/zynqmp/pll.c:200 zynqmp_pll_set_rate+0x198/0x200 [ 4.620067] Modules linked in: [ 4.623115] CPU: 0 PID: 7 Comm: kworker/u8:0 Tainted: G W 5.15.0 #1 [ 4.630674] Hardware name: ZynqMP ZCU106 RevA (DT) [ 4.635458] Workqueue: events_unbound deferred_probe_work_func [ 4.641282] pstate: 60000005 (nZCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 4.648234] pc : zynqmp_pll_set_rate+0x198/0x200 [ 4.652843] lr : zynqmp_pll_set_rate+0x198/0x200 [ 4.657452] sp : ffffffc0114f3660 [ 4.660759] x29: ffffffc0114f3660 x28: ffffff887f7f6458 x27: ffffff88003ec410 [ 4.667894] x26: 0000000000000fc2 x25: ffffff88014e4880 x24: 0000000000000060 [ 4.675029] x23: 0000000001fca055 x22: ffffff88014e4880 x21: ffffff88014e4900 [ 4.682164] x20: 00000000001f4ed6 x19: 000000005b64cf46 x18: 0000000000000030 [ 4.689299] x17: 6962726f66207369 x16: 206863696877202c x15: 746e695f6c6c7076 [ 4.696434] x14: 2065687420676e69 x13: 6e6564646962726f x12: 6620736920686369 [ 4.703569] x11: 6877202c746e695f x10: 6c6c707620656874 x9 : 7375206572612073 [ 4.710704] x8 : 6563697665642064 x7 : 205d373031363935 x6 : 352e34202020205b [ 4.717839] x5 : ffffffc01140b1a7 x4 : 0000000000000000 x3 : 0000000000000000 [ 4.724974] x2 : 0000000000000000 x1 : 0000000000000000 x0 : ffffff880009ad80 [ 4.732109] Call trace: [ 4.734548] zynqmp_pll_set_rate+0x198/0x200 [ 4.738810] clk_change_rate+0x148/0x2c0 [ 4.742724] clk_core_set_rate_nolock+0x154/0x240 [ 4.747421] clk_set_rate+0x38/0x150 [ 4.750988] xilinx_dp_codec_probe+0xac/0x1c0 [ 4.755337] platform_probe+0x68/0xe0 [ 4.758991] really_probe.part.0+0x9c/0x310 [ 4.763166] __driver_probe_device+0x98/0x150 [ 4.767515] driver_probe_device+0x44/0x120 [ 4.771690] __device_attach_driver+0xb4/0x120 [ 4.776125] bus_for_each_drv+0x78/0xd0 [ 4.779953] __device_attach+0xdc/0x190 [ 4.783781] device_initial_probe+0x14/0x20 [ 4.787956] bus_probe_device+0x9c/0xb0 [ 4.791784] device_add+0x36c/0x860 [ 4.795265] of_device_add+0x58/0x70 [ 4.798832] of_platform_device_create_pdata+0xc0/0x100 [ 4.804049] of_platform_bus_create+0x178/0x390 [ 4.808571] of_platform_populate+0x58/0xf0 [ 4.812746] zynqmp_dpsub_probe+0xe8/0x170 [ 4.816834] platform_probe+0x68/0xe0 [ 4.820488] really_probe.part.0+0x9c/0x310 [ 4.824664] __driver_probe_device+0x98/0x150 [ 4.829012] driver_probe_device+0x44/0x120 [ 4.833187] __device_attach_driver+0xb4/0x120 [ 4.837623] bus_for_each_drv+0x78/0xd0 [ 4.841451] __device_attach+0xdc/0x190 [ 4.845279] device_initial_probe+0x14/0x20 [ 4.849454] bus_probe_device+0x9c/0xb0 [ 4.853281] deferred_probe_work_func+0x88/0xc0 [ 4.857804] process_one_work+0x1d4/0x390 [ 4.861805] worker_thread+0x298/0x4e0 [ 4.865547] kthread+0x120/0x130 [ 4.868766] ret_from_fork+0x10/0x20 [ 4.872334] ---[ end trace 59c0d1ba4e758fd7 ]--- [ 4.877097] zynqmp_clk_divider_set_rate() set divider failed for dp_audio_ref_div1, ret = -22 [ 4.885950] xilinx-dp-snd-codec fd4a0000.display:zynqmp_dp_snd_codec0: Failed to get required clock freq [ 4.895486] xilinx-dp-snd-codec: probe of fd4a0000.display:zynqmp_dp_snd_codec0 failed with error -22 [ 4.904966] xilinx-dp-snd-pcm zynqmp_dp_snd_pcm0: Xilinx DisplayPort Sound PCM probed [ 4.913026] xilinx-dp-snd-pcm zynqmp_dp_snd_pcm1: Xilinx DisplayPort Sound PCM probed [ 4.921168] OF: graph: no port node found in /axi/display at fd4a0000 [ 4.927790] xlnx-drm xlnx-drm.0: bound fd4a0000.display (ops 0xffffffc010e27fa0) [ 4.935422] [drm] Initialized xlnx 1.0.0 20130509 for fd4a0000.display on minor 0 [ 4.942943] zynqmp-display fd4a0000.display: ZynqMP DisplayPort Subsystem driver probed [ 4.951187] ahci-ceva fd0c0000.ahci: supply ahci not found, using dummy regulator [ 4.958754] ahci-ceva fd0c0000.ahci: supply phy not found, using dummy regulator [ 4.966228] ahci-ceva fd0c0000.ahci: supply target not found, using dummy regulator [ 4.973784] mmc0: new high speed SDHC card at address aaaa [ 4.974229] ahci-ceva fd0c0000.ahci: AHCI 0001.0301 32 slots 2 ports 6 Gbps 0x3 impl platform mode [ 4.979720] mmcblk0: mmc0:aaaa SL16G 14.8 GiB [ 4.988316] ahci-ceva fd0c0000.ahci: flags: 64bit ncq sntf pm clo only pmp fbs pio slum part ccc sds apst [ 4.997985] mmcblk0: p1 p2 [ 5.006099] scsi host0: ahci-ceva [ 5.009746] scsi host1: ahci-ceva [ 5.013170] ata1: SATA max UDMA/133 mmio [mem 0xfd0c0000-0xfd0c1fff] port 0x100 irq 40 [ 5.021098] ata2: SATA max UDMA/133 mmio [mem 0xfd0c0000-0xfd0c1fff] port 0x180 irq 40 [ 5.052537] xhci-hcd xhci-hcd.1.auto: xHCI Host Controller [ 5.058041] xhci-hcd xhci-hcd.1.auto: new USB bus registered, assigned bus number 1 [ 5.065816] xhci-hcd xhci-hcd.1.auto: hcc params 0x0238f625 hci version 0x100 quirks 0x0000000002010810 [ 5.075249] xhci-hcd xhci-hcd.1.auto: irq 47, io mem 0xfe200000 [ 5.081274] xhci-hcd xhci-hcd.1.auto: xHCI Host Controller [ 5.086764] xhci-hcd xhci-hcd.1.auto: new USB bus registered, assigned bus number 2 [ 5.094430] xhci-hcd xhci-hcd.1.auto: Host supports USB 3.0 SuperSpeed [ 5.101065] usb usb1: New USB device found, idVendor=1d6b, idProduct=0002, bcdDevice= 5.15 [ 5.109340] usb usb1: New USB device strings: Mfr=3, Product=2, SerialNumber=1 [ 5.116570] usb usb1: Product: xHCI Host Controller [ 5.121456] usb usb1: Manufacturer: Linux 5.15.0 xhci-hcd [ 5.126864] usb usb1: SerialNumber: xhci-hcd.1.auto [ 5.132072] hub 1-0:1.0: USB hub found [ 5.135849] hub 1-0:1.0: 1 port detected [ 5.140065] usb usb2: New USB device found, idVendor=1d6b, idProduct=0003, bcdDevice= 5.15 [ 5.148336] usb usb2: New USB device strings: Mfr=3, Product=2, SerialNumber=1 [ 5.155565] usb usb2: Product: xHCI Host Controller [ 5.160445] usb usb2: Manufacturer: Linux 5.15.0 xhci-hcd [ 5.165848] usb usb2: SerialNumber: xhci-hcd.1.auto [ 5.170997] hub 2-0:1.0: USB hub found [ 5.174764] hub 2-0:1.0: 1 port detected [ 5.181995] input: gpio-keys as /devices/platform/gpio-keys/input/input0 [ 5.189088] of_cfs_init [ 5.191542] of_cfs_init: OK [ 5.194474] cfg80211: Loading compiled-in X.509 certificates for regulatory database [ 5.329319] cfg80211: Loaded X.509 cert 'sforshee: 00b28ddf47aef9cea7' [ 5.336076] zynqmp_pll_disable() clock disable failed for dpll_int, ret = -13 [ 5.344450] platform regulatory.0: Direct firmware load for regulatory.db failed with error -2 [ 5.346219] ata1: SATA link down (SStatus 0 SControl 330) [ 5.353079] cfg80211: failed to load regulatory.db [ 5.358514] ata2: SATA link down (SStatus 0 SControl 330) [ 5.360288] ALSA device list: [ 5.360292] No soundcards found. [ 5.401013] EXT4-fs (mmcblk0p2): mounted filesystem with ordered data mode. Opts: (null). Quota mode: none. [ 5.410785] VFS: Mounted root (ext4 filesystem) on device 179:2. [ 5.421140] devtmpfs: mounted [ 5.424643] Freeing unused kernel memory: 1984K [ 5.429281] Run /sbin/init as init process [ 5.501582] EXT4-fs (mmcblk0p2): re-mounted. Opts: (null). Quota mode: none. Starting syslogd: OK Starting klogd: OK Running sysctl: OK Initializing random number generator: OK Saving random seed: [ 5.564409] random: dd: uninitialized urandom read (512 bytes read) OK Starting network: OK Welcome to Buildroot buildroot login: -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 23 10:05:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Feb 2022 11:05:19 +0100 Subject: [Buildroot] [PATCH v6 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <87bkzcnqpx.fsf@dell.be.48ers.dk> (Peter Korsgaard's message of "Sat, 12 Feb 2022 14:45:30 +0100") References: <20220211144402.1626443-1-neal.frager@xilinx.com> <69189572-6eba-ed26-52dd-08a8b098f124@lucaceresoli.net> <87bkzcnqpx.fsf@dell.be.48ers.dk> Message-ID: <87o82x6gps.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: >>> +#endif >>> +{ >>> + /**********************************************************************/ >>> + /* HEADER */ >>> + 2, /* Number of remaining words in the header */ >>> + 8, /* Number of sections included in config object */ >>> + 1U, /* Type of config object as base */ >> Here's where you have manually replaced "PM_CONFIG_OBJECT_TYPE_BASE" -> >> "1U", right? Well, it should be well noted in the commit message. This >> file is supposed to be generated by Vitis and used untouched, any manual >> edits whould be documented. >> Or, even better, use the U-Boot patch I sent (see other e-mail I just >> wrote) and use an unmodified pm_cfg_obj.c > Ups, I applied the series before seeing this comment. Lets handle it as > a followup patch for zcu102/106. Neal, will you send a followup patch for this? -- Bye, Peter Korsgaard From peterlin at andestech.com Wed Feb 23 10:09:08 2022 From: peterlin at andestech.com (Yu Chien Peter Lin) Date: Wed, 23 Feb 2022 18:09:08 +0800 Subject: [Buildroot] [PATCH v4 1/3] board/andes: rearrange andes folder structure In-Reply-To: <84e159d2-0123-e5b1-c42e-99b70c99f43c@benettiengineering.com> References: <20220223071049.21153-1-peterlin@andestech.com> <84e159d2-0123-e5b1-c42e-99b70c99f43c@benettiengineering.com> Message-ID: Hi Giulio, > On Wed, Feb 23, 2022 at 10:19:08AM +0100, Giulio Benetti wrote: > > Hi Peter, > > > > On 23/02/22 08:10, Yu Chien Peter Lin wrote: > > > Rename ae3xx to ae300 for nds32 architecture and add ae350 platform. > > > > > > AE300 (NDS32): > > > - http://www.andestech.com/en/products-solutions/andeshape-platforms/ae300/ > > > AE350 (RISC-V): > > > - http://www.andestech.com/en/products-solutions/andeshape-platforms/ae350-axi-based-platform-pre-integrated-with-n25f-nx25f-a25-ax25/ > > > > > > Signed-off-by: Yu Chien Peter Lin > > > Signed-off-by: Alan Kao > > > --- > > > Changes v1 -> v2: > > > - move linux source code and its patches to AndesTech Github repo > > > - rename ae350_andestar45_defconfig to andes_ae350_45_defconfig > > > - change C library to uClibc > > > - remove OpenSSL package > > > - remove rootfs.cpio and rootfs.tar > > > - update DEVELOPERS > > > Changes v2 -> v3: > > > - specifiy branch to download from AndesTech linux repo > > > - change boot.cmd to extlinux.conf > > > - add post-build.sh for extlinux.conf to retrieve Image and DTB > > > - fix format and update genimage_sdcard.cfg > > > - update readme.txt > > > - add packages (python3, pylibfdt and openssl) for u-boot binman > > > - reorder item in DEVELOPERS > > > Changes v3 -> v4: > > > - rename ae3xx folder to ae300 > > > - rename andes_ae3xx_defconfig to andes_ae300_defconfig > > > - update readme.txt and item in DEVELOPERS > > > > Some of these change ^^^ must have been moved to the single patch, like > > DEVELOPERS is updated in patch 3/3. I've also forgotten to point you to add > > a --cover-letter, so keep in mind both points for next time. > > > > I've built tested both defconfig successfully, so: > > Reviewed-by: Giulio Benetti > > Tested-by: Giulio Benetti > > [Giulio: build tested only] > > > > And the other patches of this series is all reviewed, so to me it's ready to > > be committed, but this will happen after Buildroot 2022.02 is released, > > since between rc1 to the release Maintainers only accept fixes. Another > > possibility is that they will commit these patches to next branch. > > > > Please remember to tag V3. > > > > Thank you for your effort! > > > > Best regards > > -- > > Giulio Benetti > > Benetti Engineering sas Thanks for reviewing my patches and the guidance. I will make a new patch for the Config.in, The last question, is it tag V5 for the next submission? Regards, Yu Chien Peter Lin From giulio.benetti at benettiengineering.com Wed Feb 23 10:45:12 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 23 Feb 2022 11:45:12 +0100 Subject: [Buildroot] [PATCH v4 1/3] board/andes: rearrange andes folder structure In-Reply-To: References: <20220223071049.21153-1-peterlin@andestech.com> <84e159d2-0123-e5b1-c42e-99b70c99f43c@benettiengineering.com> Message-ID: Hi Peter, On 23/02/22 11:09, Yu Chien Peter Lin wrote: > Hi Giulio, > >> On Wed, Feb 23, 2022 at 10:19:08AM +0100, Giulio Benetti wrote: >>> Hi Peter, >>> >>> On 23/02/22 08:10, Yu Chien Peter Lin wrote: >>>> Rename ae3xx to ae300 for nds32 architecture and add ae350 platform. >>>> >>>> AE300 (NDS32): >>>> - http://www.andestech.com/en/products-solutions/andeshape-platforms/ae300/ >>>> AE350 (RISC-V): >>>> - http://www.andestech.com/en/products-solutions/andeshape-platforms/ae350-axi-based-platform-pre-integrated-with-n25f-nx25f-a25-ax25/ >>>> >>>> Signed-off-by: Yu Chien Peter Lin >>>> Signed-off-by: Alan Kao >>>> --- >>>> Changes v1 -> v2: >>>> - move linux source code and its patches to AndesTech Github repo >>>> - rename ae350_andestar45_defconfig to andes_ae350_45_defconfig >>>> - change C library to uClibc >>>> - remove OpenSSL package >>>> - remove rootfs.cpio and rootfs.tar >>>> - update DEVELOPERS >>>> Changes v2 -> v3: >>>> - specifiy branch to download from AndesTech linux repo >>>> - change boot.cmd to extlinux.conf >>>> - add post-build.sh for extlinux.conf to retrieve Image and DTB >>>> - fix format and update genimage_sdcard.cfg >>>> - update readme.txt >>>> - add packages (python3, pylibfdt and openssl) for u-boot binman >>>> - reorder item in DEVELOPERS >>>> Changes v3 -> v4: >>>> - rename ae3xx folder to ae300 >>>> - rename andes_ae3xx_defconfig to andes_ae300_defconfig >>>> - update readme.txt and item in DEVELOPERS >>> >>> Some of these change ^^^ must have been moved to the single patch, like >>> DEVELOPERS is updated in patch 3/3. I've also forgotten to point you to add >>> a --cover-letter, so keep in mind both points for next time. >>> >>> I've built tested both defconfig successfully, so: >>> Reviewed-by: Giulio Benetti >>> Tested-by: Giulio Benetti >>> [Giulio: build tested only] >>> >>> And the other patches of this series is all reviewed, so to me it's ready to >>> be committed, but this will happen after Buildroot 2022.02 is released, >>> since between rc1 to the release Maintainers only accept fixes. Another >>> possibility is that they will commit these patches to next branch. >>> >>> Please remember to tag V3. >>> >>> Thank you for your effort! >>> >>> Best regards >>> -- >>> Giulio Benetti >>> Benetti Engineering sas > > Thanks for reviewing my patches and the guidance. You're welcome. > I will make a new patch for the Config.in, Which one? I only see: toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in Do you mean you will add an entry in DEVELOPERS for it? > The last question, is it tag V5 for the next submission? It depends if you need to modify these patches. Or if you add a new patch that depends on these patches, then yes, please send a V5 with all changes moved to the different patches, including adding the patch if this is your goal. Best regards -- Giulio Benetti Benetti Engineering sas From nealf at xilinx.com Wed Feb 23 11:02:24 2022 From: nealf at xilinx.com (Neal Frager) Date: Wed, 23 Feb 2022 11:02:24 +0000 Subject: [Buildroot] [PATCH v6 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <87sfs96gqj.fsf@dell.be.48ers.dk> References: <20220211144402.1626443-1-neal.frager@xilinx.com> <87pmnsnquv.fsf@dell.be.48ers.dk> <87sfs96gqj.fsf@dell.be.48ers.dk> Message-ID: Hi Peter, > Hmm, did you test this on a zcu106 board? > I just got access to a zcu106 rev 1.0 board and gave it a try here, and see nothing on either of the serial ports. > Looking at the u-boot configuration I see that xilinx_zynqmp_virt_defconfig sets: > CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu100-revC" > Which seems to have a different uart and pinmuxing setup. Changing that to zynqmp-zcu106-revA it does boot (but complains here and there). > This is the first time I use a zcu106, so maybe I am missing something, but I don't understand how it can work for you with the zcu100 DTB? Thank you for catching this. I will take care of getting this corrected with a follow up patch. The way zynqmp_virt_defconfig works is described on our wiki page below: https://xilinx-wiki.atlassian.net/wiki/spaces/A/pages/18841973/Build+U-Boot The reason why this was working for me is because I had the DEVICE_TREE environment variable set when building. make distclean make xilinx_zynqmp_virt_defconfig export DEVICE_TREE="zynqmp-zcu106-revA" make What is the proper way for setting an environment variable with buildroot? Should I add this as a pre-build script in each defconfig? Best regards, Neal Frager Xilinx From nealf at xilinx.com Wed Feb 23 11:07:45 2022 From: nealf at xilinx.com (Neal Frager) Date: Wed, 23 Feb 2022 11:07:45 +0000 Subject: [Buildroot] [PATCH v6 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <87sfs96gqj.fsf@dell.be.48ers.dk> References: <20220211144402.1626443-1-neal.frager@xilinx.com> <87pmnsnquv.fsf@dell.be.48ers.dk> <87sfs96gqj.fsf@dell.be.48ers.dk> Message-ID: Hi Michal, Could you respond to Peter's concern about the error messages that are printed during the boot log? Is there something we can do to avoid seeing these error messages? Below is an example boot log for the zcu106: U-Boot SPL 2022.01 (Feb 23 2022 - 10:35:14 +0100) PMUFW: v1.1 Loading new PMUFW cfg obj (2032 bytes) Silicon version: 3 EL Level: EL3 Chip ID: zu7e Multiboot: 0 Trying to boot from MMC2 spl: could not initialize mmc. error: -19 Trying to boot from MMC1 spl_load_image_fat_os: error reading image u-boot.bin, err - -2 NOTICE: BL31: v2.6(release):2022.02-rc2-4-g1a0d90d8ab NOTICE: BL31: Built : 10:05:33, Feb 23 2022 U-Boot 2022.01 (Feb 23 2022 - 10:06:21 +0100) CPU: ZynqMP Silicon: v3 Model: ZynqMP ZCU106 RevA Board: Xilinx ZynqMP DRAM: 4 GiB PMUFW: v1.1 Xilinx I2C Legacy format at nvmem0: Board name: zcu106 Board rev: 1.0 Board SN: 921730071832-88916 EL Level: EL2 Chip ID: zu7e NAND: 0 MiB MMC: mmc at ff170000: 0 Loading Environment from FAT... *** Error - No Valid Environment Area found *** Warning - bad env area, using default environment In: serial Out: serial Err: serial Bootmode: LVL_SHFT_SD_MODE1 Reset reason: EXTERNAL Net: ZYNQ GEM: ff0e0000, mdio bus ff0e0000, phyaddr 12, interface rgmii-id zynq_gem ethernet at ff0e0000: Failed to read eth PHY id, err: -2 Warning: ethernet at ff0e0000 (eth0) using random MAC address - 8a:9d:6d:13:b4:42 eth0: ethernet at ff0e0000 scanning bus for devices... SATA link 0 timeout. SATA link 1 timeout. AHCI 0001.0301 32 slots 2 ports 6 Gbps 0x3 impl SATA mode flags: 64bit ncq pm clo only pmp fbss pio slum part ccc apst starting USB... Bus usb at fe200000: Register 2000440 NbrPorts 2 Starting the controller USB XHCI 1.00 scanning bus usb at fe200000 for devices... 1 USB Device(s) found scanning usb for storage devices... 0 Storage Device(s) found Hit any key to stop autoboot: 0 switch to partitions #0, OK mmc0 is current device Scanning mmc 0:1... Found /extlinux/extlinux.conf Retrieving file: /extlinux/extlinux.conf 1: linux Retrieving file: /Image append: console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait Retrieving file: /system.dtb ## Flattened Device Tree blob at 40000000 Booting using the fdt blob at 0x40000000 Loading Device Tree to 000000007bdf4000, end 000000007be00998 ... OK Starting kernel ... [ 0.000000] Booting Linux on physical CPU 0x0000000000 [0x410fd034] [ 0.000000] Linux version 5.15.0 (peko at dell) (aarch64-buildroot-linux-uclibc-gcc.br_real (Buildroot 2022.02-rc2-4-g1a0d90d8ab) 10.3.0, GNU ld (GNU Binutils) 2.36.1) #1 SMP Wed Feb 23 10:07:13 CET 2022 [ 0.000000] Machine model: ZynqMP ZCU106 RevA [ 0.000000] efi: UEFI not found. [ 0.000000] Zone ranges: [ 0.000000] DMA32 [mem 0x0000000000000000-0x00000000ffffffff] [ 0.000000] Normal [mem 0x0000000100000000-0x000000087fffffff] [ 0.000000] Movable zone start for each node [ 0.000000] Early memory node ranges [ 0.000000] node 0: [mem 0x0000000000000000-0x000000007fffffff] [ 0.000000] node 0: [mem 0x0000000800000000-0x000000087fffffff] [ 0.000000] Initmem setup node 0 [mem 0x0000000000000000-0x000000087fffffff] [ 0.000000] cma: Reserved 256 MiB at 0x000000006bc00000 [ 0.000000] psci: probing for conduit method from DT. [ 0.000000] psci: PSCIv1.1 detected in firmware. [ 0.000000] psci: Using standard PSCI v0.2 function IDs [ 0.000000] psci: MIGRATE_INFO_TYPE not supported. [ 0.000000] psci: SMC Calling Convention v1.2 [ 0.000000] percpu: Embedded 18 pages/cpu s33048 r8192 d32488 u73728 [ 0.000000] Detected VIPT I-cache on CPU0 [ 0.000000] CPU features: detected: ARM erratum 845719 [ 0.000000] Built 1 zonelists, mobility grouping on. Total pages: 1034240 [ 0.000000] Kernel command line: console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait [ 0.000000] Dentry cache hash table entries: 524288 (order: 10, 4194304 bytes, linear) [ 0.000000] Inode-cache hash table entries: 262144 (order: 9, 2097152 bytes, linear) [ 0.000000] mem auto-init: stack:off, heap alloc:off, heap free:off [ 0.000000] software IO TLB: mapped [mem 0x000000007c000000-0x0000000080000000] (64MB) [ 0.000000] Memory: 3772724K/4194304K available (13632K kernel code, 908K rwdata, 3872K rodata, 1984K init, 307K bss, 159436K reserved, 262144K cma-reserved) [ 0.000000] rcu: Hierarchical RCU implementation. [ 0.000000] rcu: RCU event tracing is enabled. [ 0.000000] rcu: RCU calculated value of scheduler-enlistment delay is 25 jiffies. [ 0.000000] NR_IRQS: 64, nr_irqs: 64, preallocated irqs: 0 [ 0.000000] GIC: Adjusting CPU interface base to 0x00000000f902f000 [ 0.000000] Root IRQ handler: gic_handle_irq [ 0.000000] GIC: Using split EOI/Deactivate mode [ 0.000000] random: get_random_bytes called from start_kernel+0x470/0x6f8 with crng_init=0 [ 0.000000] arch_timer: cp15 timer(s) running at 100.00MHz (phys). [ 0.000000] clocksource: arch_sys_counter: mask: 0xffffffffffffff max_cycles: 0x171024e7e0, max_idle_ns: 440795205315 ns [ 0.000000] sched_clock: 56 bits at 100MHz, resolution 10ns, wraps every 4398046511100ns [ 0.000288] Console: colour dummy device 80x25 [ 0.000321] Calibrating delay loop (skipped), value calculated using timer frequency.. 200.00 BogoMIPS (lpj=400000) [ 0.000332] pid_max: default: 32768 minimum: 301 [ 0.000438] Mount-cache hash table entries: 8192 (order: 4, 65536 bytes, linear) [ 0.000457] Mountpoint-cache hash table entries: 8192 (order: 4, 65536 bytes, linear) [ 0.001273] rcu: Hierarchical SRCU implementation. [ 0.001528] EFI services will not be available. [ 0.001653] smp: Bringing up secondary CPUs ... [ 0.001990] Detected VIPT I-cache on CPU1 [ 0.002027] CPU1: Booted secondary processor 0x0000000001 [0x410fd034] [ 0.002403] Detected VIPT I-cache on CPU2 [ 0.002427] CPU2: Booted secondary processor 0x0000000002 [0x410fd034] [ 0.002769] Detected VIPT I-cache on CPU3 [ 0.002792] CPU3: Booted secondary processor 0x0000000003 [0x410fd034] [ 0.002835] smp: Brought up 1 node, 4 CPUs [ 0.002852] SMP: Total of 4 processors activated. [ 0.002857] CPU features: detected: 32-bit EL0 Support [ 0.002862] CPU features: detected: CRC32 instructions [ 0.002902] CPU: All CPU(s) started at EL2 [ 0.002918] alternatives: patching kernel code [ 0.003960] devtmpfs: initialized [ 0.009544] clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 7645041785100000 ns [ 0.009562] futex hash table entries: 1024 (order: 4, 65536 bytes, linear) [ 0.017810] pinctrl core: initialized pinctrl subsystem [ 0.018441] NET: Registered PF_NETLINK/PF_ROUTE protocol family [ 0.019418] DMA: preallocated 512 KiB GFP_KERNEL pool for atomic allocations [ 0.019518] DMA: preallocated 512 KiB GFP_KERNEL|GFP_DMA32 pool for atomic allocations [ 0.019556] audit: initializing netlink subsys (disabled) [ 0.019631] audit: type=2000 audit(0.016:1): state=initialized audit_enabled=0 res=1 [ 0.019926] hw-breakpoint: found 6 breakpoint and 4 watchpoint registers. [ 0.020003] ASID allocator initialised with 65536 entries [ 0.037264] HugeTLB registered 1.00 GiB page size, pre-allocated 0 pages [ 0.037277] HugeTLB registered 32.0 MiB page size, pre-allocated 0 pages [ 0.037284] HugeTLB registered 2.00 MiB page size, pre-allocated 0 pages [ 0.037290] HugeTLB registered 64.0 KiB page size, pre-allocated 0 pages [ 1.101889] DRBG: Continuing without Jitter RNG [ 1.204745] raid6: neonx8 gen() 2143 MB/s [ 1.272796] raid6: neonx8 xor() 1594 MB/s [ 1.340859] raid6: neonx4 gen() 2184 MB/s [ 1.408910] raid6: neonx4 xor() 1577 MB/s [ 1.476970] raid6: neonx2 gen() 2069 MB/s [ 1.545023] raid6: neonx2 xor() 1453 MB/s [ 1.613092] raid6: neonx1 gen() 1802 MB/s [ 1.681135] raid6: neonx1 xor() 1240 MB/s [ 1.749185] raid6: int64x8 gen() 1471 MB/s [ 1.817242] raid6: int64x8 xor() 785 MB/s [ 1.885301] raid6: int64x4 gen() 1582 MB/s [ 1.953353] raid6: int64x4 xor() 841 MB/s [ 2.021426] raid6: int64x2 gen() 1397 MB/s [ 2.089481] raid6: int64x2 xor() 750 MB/s [ 2.157554] raid6: int64x1 gen() 1187 MB/s [ 2.225592] raid6: int64x1 xor() 596 MB/s [ 2.225598] raid6: using algorithm neonx4 gen() 2184 MB/s [ 2.225603] raid6: .... xor() 1577 MB/s, rmw enabled [ 2.225608] raid6: using neon recovery algorithm [ 2.225975] iommu: Default domain type: Translated [ 2.225982] iommu: DMA domain TLB invalidation policy: strict mode [ 2.226202] SCSI subsystem initialized [ 2.226349] usbcore: registered new interface driver usbfs [ 2.226377] usbcore: registered new interface driver hub [ 2.226400] usbcore: registered new device driver usb [ 2.226454] mc: Linux media interface: v0.10 [ 2.226473] videodev: Linux video capture interface: v2.00 [ 2.226509] pps_core: LinuxPPS API ver. 1 registered [ 2.226514] pps_core: Software ver. 5.3.6 - Copyright 2005-2007 Rodolfo Giometti [ 2.226526] PTP clock support registered [ 2.226553] EDAC MC: Ver: 3.0.0 [ 2.226836] zynqmp-ipi-mbox mailbox at ff990400: Registered ZynqMP IPI mbox with TX/RX channels. [ 2.227024] FPGA manager framework [ 2.227145] Advanced Linux Sound Architecture Driver Initialized. [ 2.227429] Bluetooth: Core ver 2.22 [ 2.227453] NET: Registered PF_BLUETOOTH protocol family [ 2.227459] Bluetooth: HCI device and connection manager initialized [ 2.227467] Bluetooth: HCI socket layer initialized [ 2.227474] Bluetooth: L2CAP socket layer initialized [ 2.227485] Bluetooth: SCO socket layer initialized [ 2.227775] clocksource: Switched to clocksource arch_sys_counter [ 2.227873] VFS: Disk quotas dquot_6.6.0 [ 2.227912] VFS: Dquot-cache hash table entries: 512 (order 0, 4096 bytes) [ 2.231825] NET: Registered PF_INET protocol family [ 2.231947] IP idents hash table entries: 65536 (order: 7, 524288 bytes, linear) [ 2.233469] tcp_listen_portaddr_hash hash table entries: 2048 (order: 3, 32768 bytes, linear) [ 2.233516] TCP established hash table entries: 32768 (order: 6, 262144 bytes, linear) [ 2.233722] TCP bind hash table entries: 32768 (order: 7, 524288 bytes, linear) [ 2.234105] TCP: Hash tables configured (established 32768 bind 32768) [ 2.234173] UDP hash table entries: 2048 (order: 4, 65536 bytes, linear) [ 2.234250] UDP-Lite hash table entries: 2048 (order: 4, 65536 bytes, linear) [ 2.234400] NET: Registered PF_UNIX/PF_LOCAL protocol family [ 2.234694] RPC: Registered named UNIX socket transport module. [ 2.234702] RPC: Registered udp transport module. [ 2.234706] RPC: Registered tcp transport module. [ 2.234710] RPC: Registered tcp NFSv4.1 backchannel transport module. [ 2.235296] PCI: CLS 0 bytes, default 64 [ 2.235581] armv8-pmu pmu: hw perfevents: no interrupt-affinity property, guessing. [ 2.235746] hw perfevents: enabled with armv8_pmuv3 PMU driver, 7 counters available [ 2.236515] Initialise system trusted keyrings [ 2.236595] workingset: timestamp_bits=62 max_order=20 bucket_order=0 [ 2.237148] NFS: Registering the id_resolver key type [ 2.237162] Key type id_resolver registered [ 2.237167] Key type id_legacy registered [ 2.237184] nfs4filelayout_init: NFSv4 File Layout Driver Registering... [ 2.237190] nfs4flexfilelayout_init: NFSv4 Flexfile Layout Driver Registering... [ 2.237207] jffs2: version 2.2. (NAND) ? 2001-2006 Red Hat, Inc. [ 2.273154] NET: Registered PF_ALG protocol family [ 2.273167] xor: measuring software checksum speed [ 2.277216] 8regs : 2438 MB/sec [ 2.280739] 32regs : 2800 MB/sec [ 2.285008] arm64_neon : 2309 MB/sec [ 2.285014] xor: using function: 32regs (2800 MB/sec) [ 2.285021] Key type asymmetric registered [ 2.285026] Asymmetric key parser 'x509' registered [ 2.285062] Block layer SCSI generic (bsg) driver version 0.4 loaded (major 245) [ 2.285069] io scheduler mq-deadline registered [ 2.285075] io scheduler kyber registered [ 2.309548] Serial: 8250/16550 driver, 4 ports, IRQ sharing disabled [ 2.312677] cacheinfo: Unable to detect cache hierarchy for CPU 0 [ 2.316619] brd: module loaded [ 2.319780] loop: module loaded [ 2.320496] mtdoops: mtd device (mtddev=name/number) must be supplied [ 2.321724] libphy: Fixed MDIO Bus: probed [ 2.322824] tun: Universal TUN/TAP device driver, 1.6 [ 2.322904] CAN device driver interface [ 2.323561] usbcore: registered new interface driver asix [ 2.323600] usbcore: registered new interface driver ax88179_178a [ 2.323625] usbcore: registered new interface driver cdc_ether [ 2.323647] usbcore: registered new interface driver net1080 [ 2.323669] usbcore: registered new interface driver cdc_subset [ 2.323692] usbcore: registered new interface driver zaurus [ 2.323724] usbcore: registered new interface driver cdc_ncm [ 2.324408] usbcore: registered new interface driver uas [ 2.324440] usbcore: registered new interface driver usb-storage [ 2.325070] rtc_zynqmp ffa60000.rtc: registered as rtc0 [ 2.325087] rtc_zynqmp ffa60000.rtc: setting system clock to 2021-01-18T20:15:26 UTC (1611000926) [ 2.325153] i2c_dev: i2c /dev entries driver [ 2.326567] usbcore: registered new interface driver uvcvideo [ 2.327362] Bluetooth: HCI UART driver ver 2.3 [ 2.327370] Bluetooth: HCI UART protocol H4 registered [ 2.327376] Bluetooth: HCI UART protocol BCSP registered [ 2.327394] Bluetooth: HCI UART protocol LL registered [ 2.327400] Bluetooth: HCI UART protocol ATH3K registered [ 2.327416] Bluetooth: HCI UART protocol Three-wire (H5) registered [ 2.327453] Bluetooth: HCI UART protocol Intel registered [ 2.327470] Bluetooth: HCI UART protocol QCA registered [ 2.327499] usbcore: registered new interface driver bcm203x [ 2.327525] usbcore: registered new interface driver bpa10x [ 2.327550] usbcore: registered new interface driver bfusb [ 2.327576] usbcore: registered new interface driver btusb [ 2.327616] usbcore: registered new interface driver ath3k [ 2.327688] EDAC MC: ECC not enabled [ 2.327829] EDAC DEVICE0: Giving out device to module edac controller cache_err: DEV edac (POLLED) [ 2.327977] EDAC DEVICE1: Giving out device to module zynqmp-ocm-edac controller zynqmp_ocm: DEV ff960000.memory-controller (INTERRUPT) [ 2.328309] sdhci: Secure Digital Host Controller Interface driver [ 2.328315] sdhci: Copyright(c) Pierre Ossman [ 2.328319] sdhci-pltfm: SDHCI platform and OF driver helper [ 2.328645] ledtrig-cpu: registered to indicate activity on CPUs [ 2.328735] SMCCC: SOC_ID: ARCH_SOC_ID not implemented, skipping .... [ 2.328772] zynqmp_firmware_probe Platform Management API v1.1 [ 2.328780] zynqmp_firmware_probe Trustzone version v1.0 [ 2.358985] securefw securefw: securefw probed [ 2.359229] alg: No test for xilinx-zynqmp-aes (zynqmp-aes) [ 2.359249] zynqmp_aes firmware:zynqmp-firmware:zynqmp-aes: AES Successfully Registered [ 2.359423] alg: No test for xilinx-keccak-384 (zynqmp-keccak-384) [ 2.359595] alg: No test for xilinx-zynqmp-rsa (zynqmp-rsa) [ 2.359737] usbcore: registered new interface driver usbhid [ 2.359744] usbhid: USB HID core driver [ 2.361013] fpga_manager fpga0: Xilinx ZynqMP FPGA Manager registered [ 2.361338] usbcore: registered new interface driver snd-usb-audio [ 2.362114] pktgen: Packet Generator for packet performance testing. Version: 2.75 [ 2.362489] Initializing XFRM netlink socket [ 2.362565] NET: Registered PF_INET6 protocol family [ 2.363069] Segment Routing with IPv6 [ 2.363087] In-situ OAM (IOAM) with IPv6 [ 2.363138] sit: IPv6, IPv4 and MPLS over IPv4 tunneling driver [ 2.363447] NET: Registered PF_PACKET protocol family [ 2.363462] NET: Registered PF_KEY protocol family [ 2.363482] can: controller area network core [ 2.363508] NET: Registered PF_CAN protocol family [ 2.363514] can: raw protocol [ 2.363520] can: broadcast manager protocol [ 2.363527] can: netlink gateway - max_hops=1 [ 2.363619] Bluetooth: RFCOMM TTY layer initialized [ 2.363632] Bluetooth: RFCOMM socket layer initialized [ 2.363647] Bluetooth: RFCOMM ver 1.11 [ 2.363656] Bluetooth: BNEP (Ethernet Emulation) ver 1.3 [ 2.363662] Bluetooth: BNEP filters: protocol multicast [ 2.363669] Bluetooth: BNEP socket layer initialized [ 2.363674] Bluetooth: HIDP (Human Interface Emulation) ver 1.2 [ 2.363681] Bluetooth: HIDP socket layer initialized [ 2.363819] 9pnet: Installing 9P2000 support [ 2.363839] Key type dns_resolver registered [ 2.363942] registered taskstats version 1 [ 2.363948] Loading compiled-in X.509 certificates [ 2.364918] Btrfs loaded, crc32c=crc32c-generic, zoned=no, fsverity=no [ 2.373064] ff000000.serial: ttyPS0 at MMIO 0xff000000 (irq = 42, base_baud = 6249999) is a xuartps [ 3.672506] printk: console [ttyPS0] enabled [ 3.677493] ff010000.serial: ttyPS1 at MMIO 0xff010000 (irq = 43, base_baud = 6249999) is a xuartps [ 3.686810] of-fpga-region fpga-full: FPGA Region probed [ 3.693554] xilinx-zynqmp-dma fd500000.dma-controller: ZynqMP DMA driver Probe success [ 3.701632] xilinx-zynqmp-dma fd510000.dma-controller: ZynqMP DMA driver Probe success [ 3.709702] xilinx-zynqmp-dma fd520000.dma-controller: ZynqMP DMA driver Probe success [ 3.717776] xilinx-zynqmp-dma fd530000.dma-controller: ZynqMP DMA driver Probe success [ 3.725847] xilinx-zynqmp-dma fd540000.dma-controller: ZynqMP DMA driver Probe success [ 3.733921] xilinx-zynqmp-dma fd550000.dma-controller: ZynqMP DMA driver Probe success [ 3.741994] xilinx-zynqmp-dma fd560000.dma-controller: ZynqMP DMA driver Probe success [ 3.750063] xilinx-zynqmp-dma fd570000.dma-controller: ZynqMP DMA driver Probe success [ 3.758379] xilinx-zynqmp-dpdma fd4c0000.dma-controller: Xilinx DPDMA engine is probed [ 3.767022] spi-nor spi0.0: found mt25qu512a, expected m25p80 [ 3.773292] spi-nor spi0.0: mt25qu512a (131072 Kbytes) [ 3.778451] 4 fixed-partitions partitions found on MTD device spi0.0 [ 3.784796] Creating 4 MTD partitions on "spi0.0": [ 3.789581] 0x000000000000-0x000000100000 : "qspi-fsbl-uboot" [ 3.796118] 0x000000100000-0x000000600000 : "qspi-linux" [ 3.802113] 0x000000600000-0x000000620000 : "qspi-device-tree" [ 3.808615] 0x000000620000-0x000000c00000 : "qspi-rootfs" [ 3.817419] macb ff0e0000.ethernet: Not enabling partial store and forward [ 3.824936] libphy: MACB_mii_bus: probed [ 3.829496] macb ff0e0000.ethernet eth0: Cadence GEM rev 0x50070106 at 0xff0e0000 irq 30 (8a:9d:6d:13:b4:42) [ 3.839620] xilinx-axipmon ffa00000.perf-monitor: Probed Xilinx APM [ 3.846207] xilinx-axipmon fd0b0000.perf-monitor: Probed Xilinx APM [ 3.852698] xilinx-axipmon fd490000.perf-monitor: Probed Xilinx APM [ 3.859192] xilinx-axipmon ffa10000.perf-monitor: Probed Xilinx APM [ 3.866522] pca953x 0-0020: supply vcc not found, using dummy regulator [ 3.873218] pca953x 0-0020: using no AI [ 3.877724] pca953x 0-0021: supply vcc not found, using dummy regulator [ 3.884395] pca953x 0-0021: using no AI [ 3.897104] i2c i2c-0: Added multiplexed i2c bus 2 [ 3.908338] i2c i2c-0: Added multiplexed i2c bus 3 [ 3.924679] random: fast init done [ 3.966097] i2c i2c-0: Added multiplexed i2c bus 4 [ 3.970999] i2c i2c-0: Added multiplexed i2c bus 5 [ 3.975789] pca954x 0-0075: registered 4 multiplexed busses for I2C mux pca9544 [ 3.983147] cdns-i2c ff020000.i2c: 400 kHz mmio ff020000 irq 32 [ 3.990509] at24 6-0054: supply vcc not found, using dummy regulator [ 3.997388] at24 6-0054: 1024 byte 24c08 EEPROM, writable, 1 bytes/write [ 4.004128] i2c i2c-1: Added multiplexed i2c bus 6 [ 4.009450] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out [ 4.016760] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out [ 4.024061] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out [ 4.031362] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out [ 4.038661] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out [ 4.045961] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out [ 4.054383] si5341 7-0036: Chip: 5341 Grade: 1 Rev: 1 [ 4.093288] i2c i2c-1: Added multiplexed i2c bus 7 [ 4.100897] si570 8-005d: registered, current frequency 300000000 Hz [ 4.107281] i2c i2c-1: Added multiplexed i2c bus 8 [ 4.127003] si570 9-005d: registered, current frequency 148500000 Hz [ 4.133390] i2c i2c-1: Added multiplexed i2c bus 9 [ 4.138387] si5324 10-0069: si5328 probed [ 4.204331] si5324 10-0069: si5328 probe successful [ 4.209248] i2c i2c-1: Added multiplexed i2c bus 10 [ 4.215324] i2c i2c-1: Added multiplexed i2c bus 11 [ 4.220315] i2c i2c-1: Added multiplexed i2c bus 12 [ 4.225302] i2c i2c-1: Added multiplexed i2c bus 13 [ 4.230182] pca954x 1-0074: registered 8 multiplexed busses for I2C switch pca9548 [ 4.238109] i2c i2c-1: Added multiplexed i2c bus 14 [ 4.243110] i2c i2c-1: Added multiplexed i2c bus 15 [ 4.248106] i2c i2c-1: Added multiplexed i2c bus 16 [ 4.253107] i2c i2c-1: Added multiplexed i2c bus 17 [ 4.258115] i2c i2c-1: Added multiplexed i2c bus 18 [ 4.263114] i2c i2c-1: Added multiplexed i2c bus 19 [ 4.268112] i2c i2c-1: Added multiplexed i2c bus 20 [ 4.273124] i2c i2c-1: Added multiplexed i2c bus 21 [ 4.278000] pca954x 1-0075: registered 8 multiplexed busses for I2C switch pca9548 [ 4.285597] cdns-i2c ff030000.i2c: 400 kHz mmio ff030000 irq 33 [ 4.295393] cdns-wdt fd4d0000.watchdog: Xilinx Watchdog Timer with timeout 60s [ 4.304764] zynqmp-display fd4a0000.display: vtc bridge property not present [ 4.313211] ------------[ cut here ]------------ [ 4.317834] More than allowed devices are using the vpll_int, which is forbidden [ 4.325263] WARNING: CPU: 0 PID: 7 at drivers/clk/zynqmp/pll.c:200 zynqmp_pll_set_rate+0x198/0x200 [ 4.334227] Modules linked in: [ 4.337274] CPU: 0 PID: 7 Comm: kworker/u8:0 Not tainted 5.15.0 #1 [ 4.343444] Hardware name: ZynqMP ZCU106 RevA (DT) [ 4.348229] Workqueue: events_unbound deferred_probe_work_func [ 4.354061] pstate: 60000005 (nZCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 4.361012] pc : zynqmp_pll_set_rate+0x198/0x200 [ 4.365622] lr : zynqmp_pll_set_rate+0x198/0x200 [ 4.370231] sp : ffffffc0114f3660 [ 4.373538] x29: ffffffc0114f3660 x28: ffffff887f7f6458 x27: ffffff88003ec410 [ 4.380673] x26: 000000000000b61b x25: ffffff88014e4880 x24: 0000000000000060 [ 4.387808] x23: 0000000001fca055 x22: ffffff88014e4880 x21: ffffff88014e4900 [ 4.394943] x20: 000000000169cfa1 x19: 0000000059682ef1 x18: 0000000000000030 [ 4.402078] x17: 6962726f66207369 x16: 206863696877202c x15: 746e695f6c6c7076 [ 4.409212] x14: 2065687420676e69 x13: 6e6564646962726f x12: ffffffc01133b230 [ 4.416348] x11: 0000000000000136 x10: 6c6c707620656874 x9 : 00000000fffff7ff [ 4.423483] x8 : ffffffc011367230 x7 : 000000000000bfe8 x6 : 80000000fffff800 [ 4.430617] x5 : 0000000000000000 x4 : 0000000000000000 x3 : 0000000000000000 [ 4.437744] x2 : 0000000000000000 x1 : 0000000000000000 x0 : ffffff880009ad80 [ 4.444879] Call trace: [ 4.447319] zynqmp_pll_set_rate+0x198/0x200 [ 4.451580] clk_change_rate+0x148/0x2c0 [ 4.455495] clk_core_set_rate_nolock+0x154/0x240 [ 4.460190] clk_set_rate+0x38/0x150 [ 4.463758] xilinx_dp_codec_probe+0xac/0x1c0 [ 4.468107] platform_probe+0x68/0xe0 [ 4.471761] really_probe.part.0+0x9c/0x310 [ 4.475936] __driver_probe_device+0x98/0x150 [ 4.480285] driver_probe_device+0x44/0x120 [ 4.484460] __device_attach_driver+0xb4/0x120 [ 4.488895] bus_for_each_drv+0x78/0xd0 [ 4.492723] __device_attach+0xdc/0x190 [ 4.496551] device_initial_probe+0x14/0x20 [ 4.500726] bus_probe_device+0x9c/0xb0 [ 4.504554] device_add+0x36c/0x860 [ 4.508034] of_device_add+0x58/0x70 [ 4.511602] of_platform_device_create_pdata+0xc0/0x100 [ 4.516819] of_platform_bus_create+0x178/0x390 [ 4.521341] of_platform_populate+0x58/0xf0 [ 4.525516] zynqmp_dpsub_probe+0xe8/0x170 [ 4.529604] platform_probe+0x68/0xe0 [ 4.533259] really_probe.part.0+0x9c/0x310 [ 4.537434] __driver_probe_device+0x98/0x150 [ 4.541782] driver_probe_device+0x44/0x120 [ 4.545957] __device_attach_driver+0xb4/0x120 [ 4.550393] bus_for_each_drv+0x78/0xd0 [ 4.554221] __device_attach+0xdc/0x190 [ 4.558049] device_initial_probe+0x14/0x20 [ 4.562224] bus_probe_device+0x9c/0xb0 [ 4.566052] deferred_probe_work_func+0x88/0xc0 [ 4.570574] process_one_work+0x1d4/0x390 [ 4.574585] worker_thread+0x298/0x4e0 [ 4.578325] kthread+0x120/0x130 [ 4.581545] ret_from_fork+0x10/0x20 [ 4.585113] ---[ end trace 59c0d1ba4e758fd6 ]--- [ 4.591486] ------------[ cut here ]------------ [ 4.596107] More than allowed devices are using the vpll_int, which is forbidden [ 4.603220] mmc0: SDHCI controller on ff170000.mmc [ff170000.mmc] using ADMA 64-bit [ 4.603529] WARNING: CPU: 0 PID: 7 at drivers/clk/zynqmp/pll.c:200 zynqmp_pll_set_rate+0x198/0x200 [ 4.620067] Modules linked in: [ 4.623115] CPU: 0 PID: 7 Comm: kworker/u8:0 Tainted: G W 5.15.0 #1 [ 4.630674] Hardware name: ZynqMP ZCU106 RevA (DT) [ 4.635458] Workqueue: events_unbound deferred_probe_work_func [ 4.641282] pstate: 60000005 (nZCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 4.648234] pc : zynqmp_pll_set_rate+0x198/0x200 [ 4.652843] lr : zynqmp_pll_set_rate+0x198/0x200 [ 4.657452] sp : ffffffc0114f3660 [ 4.660759] x29: ffffffc0114f3660 x28: ffffff887f7f6458 x27: ffffff88003ec410 [ 4.667894] x26: 0000000000000fc2 x25: ffffff88014e4880 x24: 0000000000000060 [ 4.675029] x23: 0000000001fca055 x22: ffffff88014e4880 x21: ffffff88014e4900 [ 4.682164] x20: 00000000001f4ed6 x19: 000000005b64cf46 x18: 0000000000000030 [ 4.689299] x17: 6962726f66207369 x16: 206863696877202c x15: 746e695f6c6c7076 [ 4.696434] x14: 2065687420676e69 x13: 6e6564646962726f x12: 6620736920686369 [ 4.703569] x11: 6877202c746e695f x10: 6c6c707620656874 x9 : 7375206572612073 [ 4.710704] x8 : 6563697665642064 x7 : 205d373031363935 x6 : 352e34202020205b [ 4.717839] x5 : ffffffc01140b1a7 x4 : 0000000000000000 x3 : 0000000000000000 [ 4.724974] x2 : 0000000000000000 x1 : 0000000000000000 x0 : ffffff880009ad80 [ 4.732109] Call trace: [ 4.734548] zynqmp_pll_set_rate+0x198/0x200 [ 4.738810] clk_change_rate+0x148/0x2c0 [ 4.742724] clk_core_set_rate_nolock+0x154/0x240 [ 4.747421] clk_set_rate+0x38/0x150 [ 4.750988] xilinx_dp_codec_probe+0xac/0x1c0 [ 4.755337] platform_probe+0x68/0xe0 [ 4.758991] really_probe.part.0+0x9c/0x310 [ 4.763166] __driver_probe_device+0x98/0x150 [ 4.767515] driver_probe_device+0x44/0x120 [ 4.771690] __device_attach_driver+0xb4/0x120 [ 4.776125] bus_for_each_drv+0x78/0xd0 [ 4.779953] __device_attach+0xdc/0x190 [ 4.783781] device_initial_probe+0x14/0x20 [ 4.787956] bus_probe_device+0x9c/0xb0 [ 4.791784] device_add+0x36c/0x860 [ 4.795265] of_device_add+0x58/0x70 [ 4.798832] of_platform_device_create_pdata+0xc0/0x100 [ 4.804049] of_platform_bus_create+0x178/0x390 [ 4.808571] of_platform_populate+0x58/0xf0 [ 4.812746] zynqmp_dpsub_probe+0xe8/0x170 [ 4.816834] platform_probe+0x68/0xe0 [ 4.820488] really_probe.part.0+0x9c/0x310 [ 4.824664] __driver_probe_device+0x98/0x150 [ 4.829012] driver_probe_device+0x44/0x120 [ 4.833187] __device_attach_driver+0xb4/0x120 [ 4.837623] bus_for_each_drv+0x78/0xd0 [ 4.841451] __device_attach+0xdc/0x190 [ 4.845279] device_initial_probe+0x14/0x20 [ 4.849454] bus_probe_device+0x9c/0xb0 [ 4.853281] deferred_probe_work_func+0x88/0xc0 [ 4.857804] process_one_work+0x1d4/0x390 [ 4.861805] worker_thread+0x298/0x4e0 [ 4.865547] kthread+0x120/0x130 [ 4.868766] ret_from_fork+0x10/0x20 [ 4.872334] ---[ end trace 59c0d1ba4e758fd7 ]--- [ 4.877097] zynqmp_clk_divider_set_rate() set divider failed for dp_audio_ref_div1, ret = -22 [ 4.885950] xilinx-dp-snd-codec fd4a0000.display:zynqmp_dp_snd_codec0: Failed to get required clock freq [ 4.895486] xilinx-dp-snd-codec: probe of fd4a0000.display:zynqmp_dp_snd_codec0 failed with error -22 [ 4.904966] xilinx-dp-snd-pcm zynqmp_dp_snd_pcm0: Xilinx DisplayPort Sound PCM probed [ 4.913026] xilinx-dp-snd-pcm zynqmp_dp_snd_pcm1: Xilinx DisplayPort Sound PCM probed [ 4.921168] OF: graph: no port node found in /axi/display at fd4a0000 [ 4.927790] xlnx-drm xlnx-drm.0: bound fd4a0000.display (ops 0xffffffc010e27fa0) [ 4.935422] [drm] Initialized xlnx 1.0.0 20130509 for fd4a0000.display on minor 0 [ 4.942943] zynqmp-display fd4a0000.display: ZynqMP DisplayPort Subsystem driver probed [ 4.951187] ahci-ceva fd0c0000.ahci: supply ahci not found, using dummy regulator [ 4.958754] ahci-ceva fd0c0000.ahci: supply phy not found, using dummy regulator [ 4.966228] ahci-ceva fd0c0000.ahci: supply target not found, using dummy regulator [ 4.973784] mmc0: new high speed SDHC card at address aaaa [ 4.974229] ahci-ceva fd0c0000.ahci: AHCI 0001.0301 32 slots 2 ports 6 Gbps 0x3 impl platform mode [ 4.979720] mmcblk0: mmc0:aaaa SL16G 14.8 GiB [ 4.988316] ahci-ceva fd0c0000.ahci: flags: 64bit ncq sntf pm clo only pmp fbs pio slum part ccc sds apst [ 4.997985] mmcblk0: p1 p2 [ 5.006099] scsi host0: ahci-ceva [ 5.009746] scsi host1: ahci-ceva [ 5.013170] ata1: SATA max UDMA/133 mmio [mem 0xfd0c0000-0xfd0c1fff] port 0x100 irq 40 [ 5.021098] ata2: SATA max UDMA/133 mmio [mem 0xfd0c0000-0xfd0c1fff] port 0x180 irq 40 [ 5.052537] xhci-hcd xhci-hcd.1.auto: xHCI Host Controller [ 5.058041] xhci-hcd xhci-hcd.1.auto: new USB bus registered, assigned bus number 1 [ 5.065816] xhci-hcd xhci-hcd.1.auto: hcc params 0x0238f625 hci version 0x100 quirks 0x0000000002010810 [ 5.075249] xhci-hcd xhci-hcd.1.auto: irq 47, io mem 0xfe200000 [ 5.081274] xhci-hcd xhci-hcd.1.auto: xHCI Host Controller [ 5.086764] xhci-hcd xhci-hcd.1.auto: new USB bus registered, assigned bus number 2 [ 5.094430] xhci-hcd xhci-hcd.1.auto: Host supports USB 3.0 SuperSpeed [ 5.101065] usb usb1: New USB device found, idVendor=1d6b, idProduct=0002, bcdDevice= 5.15 [ 5.109340] usb usb1: New USB device strings: Mfr=3, Product=2, SerialNumber=1 [ 5.116570] usb usb1: Product: xHCI Host Controller [ 5.121456] usb usb1: Manufacturer: Linux 5.15.0 xhci-hcd [ 5.126864] usb usb1: SerialNumber: xhci-hcd.1.auto [ 5.132072] hub 1-0:1.0: USB hub found [ 5.135849] hub 1-0:1.0: 1 port detected [ 5.140065] usb usb2: New USB device found, idVendor=1d6b, idProduct=0003, bcdDevice= 5.15 [ 5.148336] usb usb2: New USB device strings: Mfr=3, Product=2, SerialNumber=1 [ 5.155565] usb usb2: Product: xHCI Host Controller [ 5.160445] usb usb2: Manufacturer: Linux 5.15.0 xhci-hcd [ 5.165848] usb usb2: SerialNumber: xhci-hcd.1.auto [ 5.170997] hub 2-0:1.0: USB hub found [ 5.174764] hub 2-0:1.0: 1 port detected [ 5.181995] input: gpio-keys as /devices/platform/gpio-keys/input/input0 [ 5.189088] of_cfs_init [ 5.191542] of_cfs_init: OK [ 5.194474] cfg80211: Loading compiled-in X.509 certificates for regulatory database [ 5.329319] cfg80211: Loaded X.509 cert 'sforshee: 00b28ddf47aef9cea7' [ 5.336076] zynqmp_pll_disable() clock disable failed for dpll_int, ret = -13 [ 5.344450] platform regulatory.0: Direct firmware load for regulatory.db failed with error -2 [ 5.346219] ata1: SATA link down (SStatus 0 SControl 330) [ 5.353079] cfg80211: failed to load regulatory.db [ 5.358514] ata2: SATA link down (SStatus 0 SControl 330) [ 5.360288] ALSA device list: [ 5.360292] No soundcards found. [ 5.401013] EXT4-fs (mmcblk0p2): mounted filesystem with ordered data mode. Opts: (null). Quota mode: none. [ 5.410785] VFS: Mounted root (ext4 filesystem) on device 179:2. [ 5.421140] devtmpfs: mounted [ 5.424643] Freeing unused kernel memory: 1984K [ 5.429281] Run /sbin/init as init process [ 5.501582] EXT4-fs (mmcblk0p2): re-mounted. Opts: (null). Quota mode: none. Starting syslogd: OK Starting klogd: OK Running sysctl: OK Initializing random number generator: OK Saving random seed: [ 5.564409] random: dd: uninitialized urandom read (512 bytes read) OK Starting network: OK Welcome to Buildroot buildroot login: Best regards, Neal Frager Xilinx From peter at korsgaard.com Wed Feb 23 11:18:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Feb 2022 12:18:17 +0100 Subject: [Buildroot] [PATCH v6 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: (Neal Frager's message of "Wed, 23 Feb 2022 11:02:24 +0000") References: <20220211144402.1626443-1-neal.frager@xilinx.com> <87pmnsnquv.fsf@dell.be.48ers.dk> <87sfs96gqj.fsf@dell.be.48ers.dk> Message-ID: <87fso96dc6.fsf@dell.be.48ers.dk> >>>>> "Neal" == Neal Frager writes: Hi, > The reason why this was working for me is because I had the DEVICE_TREE environment variable set when building. > make distclean > make xilinx_zynqmp_virt_defconfig > export DEVICE_TREE="zynqmp-zcu106-revA" I wasn't aware that U-Boot uses the value of this environment variable over what is speficied in the configuration file. I think we should clear this environment variable in Buildroot similar to how we do for E.G. CROSS_COMPILE in the top level Makefile. I'll send a patch for that. -- Bye, Peter Korsgaard From nealf at xilinx.com Wed Feb 23 11:27:29 2022 From: nealf at xilinx.com (Neal Frager) Date: Wed, 23 Feb 2022 11:27:29 +0000 Subject: [Buildroot] [PATCH v6 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <87fso96dc6.fsf@dell.be.48ers.dk> References: <20220211144402.1626443-1-neal.frager@xilinx.com> <87pmnsnquv.fsf@dell.be.48ers.dk> <87sfs96gqj.fsf@dell.be.48ers.dk> <87fso96dc6.fsf@dell.be.48ers.dk> Message-ID: Hi Peter, > I wasn't aware that U-Boot uses the value of this environment variable over what is speficied in the configuration file. I think we should clear this environment variable in Buildroot similar to how we do for E.G. CROSS_COMPILE in the top level ? Makefile. I'll send a patch for that. Great, thanks! Best regards, Neal Frager Xilinx From nealf at xilinx.com Wed Feb 23 11:29:30 2022 From: nealf at xilinx.com (Neal Frager) Date: Wed, 23 Feb 2022 11:29:30 +0000 Subject: [Buildroot] [PATCH v6 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <87k0dl6dn7.fsf@dell.be.48ers.dk> References: <20220211144402.1626443-1-neal.frager@xilinx.com> <87pmnsnquv.fsf@dell.be.48ers.dk> <87sfs96gqj.fsf@dell.be.48ers.dk> <87k0dl6dn7.fsf@dell.be.48ers.dk> Message-ID: Hi Peter, > Instead of working with an environment variable, I think it would be nicer to tweak the zynqmp_virt_defconfig file with a configuration fragment with the > CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu106-revA" > Line. > This can be done with the BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES option. Yes, this looks like a better solution. I will create a uboot-fragment.config file for each board in my follow up patch. Thanks for the idea! Best regards, Neal Frager Xilinx From br015 at umbiko.net Wed Feb 23 11:30:40 2022 From: br015 at umbiko.net (Andreas Ziegler) Date: Wed, 23 Feb 2022 11:30:40 +0000 Subject: [Buildroot] STAGING_DIR does not contain executables found in TARGET_DIR In-Reply-To: References: Message-ID: <256f0da3b8d983a84ea84de250c56bb0@umbiko.net> Hi William, On 2022-02-23 07:11, William Tambe wrote: > Please help determining why STAGING_DIR does not contain executables > found in TARGET_DIR ? > > I am expecting to find debug version of all executables in TARGET_DIR, > but executables such as /bin/busybox are missing from STAGING_DIR . If you look at your packages' definition (.mk) files, you will find a few with *_INSTALL_STAGING = YES. This is responsible for the (additional) installation in STAGING_DIR. The reason for this is that some packages need to provide information during the build process, that is not needed later for operation on the target. To save space on the target system, a two-stage approach is used. Example: your configuration includes zlib-ng: the library itself is present both in STAGING_DIR and in TARGET_DIR, header and ldconfig-related files will be found in STAGING_DIR only. On the other hand, Busybox is not referenced by other packages (it does not export any interfaces), so it does not have an installation in STAGING_DIR. Your target binaries will be stripped of symbols, unless you prevent this via BR2_STRIP_EXCLUDE_{FILE, DIRS} ... Remote debugging has less impact on your target installation. For this you would need BR2_PACKAGE_HOST_GDB and BR2_PACKAGE_GDB_SERVER [1]. Kind regards, Andreas > I am using 2021.08.3 > > Full config is as follow > ``` > BR2_pu32=y > BR2_ENABLE_DEBUG=y > BR2_DEBUG_3=y > BR2_STATIC_LIBS=y > BR2_FORTIFY_SOURCE_NONE=y > BR2_TOOLCHAIN_EXTERNAL=y > BR2_TOOLCHAIN_EXTERNAL_PATH="/opt/pu32-toolchain/" > BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="$(ARCH)-elf" > BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_5=y > BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y > # BR2_TOOLCHAIN_EXTERNAL_HAS_SSP is not set > # BR2_TOOLCHAIN_EXTERNAL_INET_RPC is not set > BR2_TOOLCHAIN_EXTERNAL_CXX=y > BR2_TARGET_GENERIC_ISSUE="" > BR2_ROOTFS_MERGED_USR=y > BR2_TARGET_GENERIC_ROOT_PASSWD="root" > BR2_SYSTEM_BIN_SH_BASH=y > BR2_TARGET_GENERIC_GETTY_TERM="linux" > BR2_TARGET_GENERIC_GETTY_OPTIONS="-n -l /bin/-bash" > BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y > BR2_PACKAGE_GDB=y > BR2_PACKAGE_ZLIB=y > BR2_PACKAGE_ZLIB_NG=y > BR2_PACKAGE_DHCP=y > BR2_PACKAGE_DHCP_CLIENT=y > BR2_PACKAGE_IPROUTE2=y > BR2_PACKAGE_LRZSZ=y > BR2_PACKAGE_SOCAT=y > BR2_PACKAGE_HTOP=y > BR2_PACKAGE_NANO=y > # BR2_PACKAGE_NANO_TINY is not set > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > BR2_TARGET_ROOTFS_EXT2_SIZE="64M" > # BR2_TARGET_ROOTFS_TAR is not set > ``` [1] https://sourceware.org/gdb/current/onlinedocs/gdb/Server.html#Server From peter at korsgaard.com Wed Feb 23 11:11:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Feb 2022 12:11:40 +0100 Subject: [Buildroot] [PATCH v6 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: (Neal Frager's message of "Wed, 23 Feb 2022 11:02:24 +0000") References: <20220211144402.1626443-1-neal.frager@xilinx.com> <87pmnsnquv.fsf@dell.be.48ers.dk> <87sfs96gqj.fsf@dell.be.48ers.dk> Message-ID: <87k0dl6dn7.fsf@dell.be.48ers.dk> >>>>> "Neal" == Neal Frager writes: > Hi Peter, >> Hmm, did you test this on a zcu106 board? >> I just got access to a zcu106 rev 1.0 board and gave it a try here, and see nothing on either of the serial ports. >> Looking at the u-boot configuration I see that xilinx_zynqmp_virt_defconfig sets: >> CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu100-revC" >> Which seems to have a different uart and pinmuxing setup. Changing >> that to zynqmp-zcu106-revA it does boot (but complains here and >> there). >> This is the first time I use a zcu106, so maybe I am missing >> something, but I don't understand how it can work for you with the >> zcu100 DTB? > Thank you for catching this. I will take care of getting this corrected with a follow up patch. > The way zynqmp_virt_defconfig works is described on our wiki page below: > https://xilinx-wiki.atlassian.net/wiki/spaces/A/pages/18841973/Build+U-Boot > The reason why this was working for me is because I had the DEVICE_TREE environment variable set when building. > make distclean > make xilinx_zynqmp_virt_defconfig > export DEVICE_TREE="zynqmp-zcu106-revA" > make > What is the proper way for setting an environment variable with > buildroot? Should I add this as a pre-build script in each defconfig? Instead of working with an environment variable, I think it would be nicer to tweak the zynqmp_virt_defconfig file with a configuration fragment with the CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu106-revA" Line. This can be done with the BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES option. -- Bye, Peter Korsgaard From john at metanate.com Wed Feb 23 11:55:06 2022 From: john at metanate.com (John Keeping) Date: Wed, 23 Feb 2022 11:55:06 +0000 Subject: [Buildroot] [RFC PATCH] package/libiberty: use the same version as binutils Message-ID: <20220223115506.1191031-1-john@metanate.com> libiberty is built from the binutils source but this package has languished on version 2.32 while the binutils package now uses 2.36.1 by default. Even between the 2.32 version and GDB 10.2 which is the default (and where host-libiberty is used instead of a version bundled in the GDB source) there are memory leak fixes and several improvements to demangling. Update the libiberty package to simply use the same version as binutils so that there is no need to remember to update this package in the future. Replace the .hash file with a symlink so that the binutils hashes are used automatically. Signed-off-by: John Keeping --- I'm not sure if this is this is the best way to improve the situation here - it's the smallest change to get something a bit more modern (in most circumstances), but I wonder if libiberty should use the GDB source instead as that's the one package we know both bundles libiberty source and will use host-libiberty in preference. package/libiberty/libiberty.hash | 6 +----- package/libiberty/libiberty.mk | 4 ++-- 2 files changed, 3 insertions(+), 7 deletions(-) mode change 100644 => 120000 package/libiberty/libiberty.hash diff --git a/package/libiberty/libiberty.hash b/package/libiberty/libiberty.hash deleted file mode 100644 index 0dafcea520..0000000000 --- a/package/libiberty/libiberty.hash +++ /dev/null @@ -1,5 +0,0 @@ -# From ftp://gcc.gnu.org/pub/binutils/releases/sha512.sum -sha512 d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724afa1e43bd0db45cfc9916b41519b67dfce03232aa4978704492a6994a binutils-2.32.tar.xz - -# Locally computed, same as binutils.hash -sha256 56bdea73b6145ef6ac5259b3da390b981d840c24cb03b8e1cbc678de7ecfa18d COPYING.LIB diff --git a/package/libiberty/libiberty.hash b/package/libiberty/libiberty.hash new file mode 120000 index 0000000000..e0655d3af3 --- /dev/null +++ b/package/libiberty/libiberty.hash @@ -0,0 +1 @@ +../binutils/binutils.hash \ No newline at end of file diff --git a/package/libiberty/libiberty.mk b/package/libiberty/libiberty.mk index 6235a8b956..d0847bf298 100644 --- a/package/libiberty/libiberty.mk +++ b/package/libiberty/libiberty.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBIBERTY_VERSION = 2.32 -LIBIBERTY_SOURCE = binutils-$(LIBIBERTY_VERSION).tar.xz +LIBIBERTY_VERSION = $(BINUTILS_VERSION) +LIBIBERTY_SOURCE = $(BINUTILS_SOURCE) LIBIBERTY_SITE = $(BR2_GNU_MIRROR)/binutils HOST_LIBIBERTY_DL_SUBDIR = binutils -- 2.35.1 From neal.frager at xilinx.com Wed Feb 23 12:51:18 2022 From: neal.frager at xilinx.com (Neal Frager) Date: Wed, 23 Feb 2022 05:51:18 -0700 Subject: [Buildroot] [PATCH v1 1/1] configs/zynqmp_zcu10x: fix U-Boot dts config Message-ID: <20220223125118.2325363-1-neal.frager@xilinx.com> This patch: - fixes U-Boot issue when DEVICE_TREE environment variable undefined - bumps U-Boot to Xilinx 2022.01-171 - bumps Linux to Xilinx 5.15-945 Signed-off-by: Neal Frager --- board/zynqmp/zcu102/uboot-fragment.config | 2 ++ board/zynqmp/zcu106/uboot-fragment.config | 2 ++ configs/zynqmp_zcu102_defconfig | 5 +++-- configs/zynqmp_zcu106_defconfig | 5 +++-- 4 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 board/zynqmp/zcu102/uboot-fragment.config create mode 100644 board/zynqmp/zcu106/uboot-fragment.config diff --git a/board/zynqmp/zcu102/uboot-fragment.config b/board/zynqmp/zcu102/uboot-fragment.config new file mode 100644 index 0000000000..51b4f3c96a --- /dev/null +++ b/board/zynqmp/zcu102/uboot-fragment.config @@ -0,0 +1,2 @@ +CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu102-rev1.0" + diff --git a/board/zynqmp/zcu106/uboot-fragment.config b/board/zynqmp/zcu106/uboot-fragment.config new file mode 100644 index 0000000000..bdb0fafea7 --- /dev/null +++ b/board/zynqmp/zcu106/uboot-fragment.config @@ -0,0 +1,2 @@ +CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu106-revA" + diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig index 298ce2388c..0c12b9c0e9 100644 --- a/configs/zynqmp_zcu102_defconfig +++ b/configs/zynqmp_zcu102_defconfig @@ -5,7 +5,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.15-930-g966124532656bc95d781abf57531e4cd4f962237" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.15-945-gbf3378b260738e3193470858df7996871cbb8389" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" @@ -23,8 +23,9 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2022.01-165-g667001319cbe511ce6353195fb4910ae5cb041ce" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2022.01-171-g61a294ab1b89e2078aa87ad78926d5f46a6af74c" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/zcu102/uboot-fragment.config" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index 3e51cbfaab..9bb75d1624 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -5,7 +5,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.15-930-g966124532656bc95d781abf57531e4cd4f962237" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.15-945-gbf3378b260738e3193470858df7996871cbb8389" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" @@ -23,8 +23,9 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2022.01-165-g667001319cbe511ce6353195fb4910ae5cb041ce" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2022.01-171-g61a294ab1b89e2078aa87ad78926d5f46a6af74c" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/zcu106/uboot-fragment.config" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y -- 2.17.1 From nealf at xilinx.com Wed Feb 23 12:55:25 2022 From: nealf at xilinx.com (Neal Frager) Date: Wed, 23 Feb 2022 12:55:25 +0000 Subject: [Buildroot] [PATCH v6 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <87o82x6gps.fsf@dell.be.48ers.dk> References: <20220211144402.1626443-1-neal.frager@xilinx.com> <69189572-6eba-ed26-52dd-08a8b098f124@lucaceresoli.net> <87bkzcnqpx.fsf@dell.be.48ers.dk> <87o82x6gps.fsf@dell.be.48ers.dk> Message-ID: Hi Peter, > Neal, will you send a followup patch for this? A follow up patch has been submitted. Best regards, Neal Frager Xilinx From peter at korsgaard.com Wed Feb 23 12:41:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Feb 2022 13:41:08 +0100 Subject: [Buildroot] [PATCH] Makefile: unexport 'DEVICE_TREE' environment variable Message-ID: <20220223124109.2370215-1-peter@korsgaard.com> U-Boot looks for the environment variable DEVICE_TREE and uses its value if set instead of the CONFIG_DEFAULT_DEVICE_TREE configuration option since v2021.01, more specifically commit c0f1ebe9c1b9745e (binman: Allow selecting default FIT configuration) - So unexport it like we do for other "troublesome" environment variables to ensure consistent behaviour. Reported-by: Neal Frager Signed-off-by: Peter Korsgaard --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index d92438166f..0ed93e600d 100644 --- a/Makefile +++ b/Makefile @@ -426,6 +426,7 @@ unexport O unexport GCC_COLORS unexport PLATFORM unexport OS +unexport DEVICE_TREE GNU_HOST_NAME := $(shell support/gnuconfig/config.guess) -- 2.30.2 From yann.morin.1998 at free.fr Wed Feb 23 14:03:18 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 23 Feb 2022 15:03:18 +0100 Subject: [Buildroot] [git commit] Makefile: unexport 'DEVICE_TREE' environment variable Message-ID: <20220223135658.66C7883845@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d3910057c6ae38e2cf72e8c86cd84756fffba2ac branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master U-Boot looks for the environment variable DEVICE_TREE and uses its value if set instead of the CONFIG_DEFAULT_DEVICE_TREE configuration option since v2021.01, more specifically commit c0f1ebe9c1b9745e (binman: Allow selecting default FIT configuration) - So unexport it like we do for other "troublesome" environment variables to ensure consistent behaviour. Reported-by: Neal Frager Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index d92438166f..0ed93e600d 100644 --- a/Makefile +++ b/Makefile @@ -426,6 +426,7 @@ unexport O unexport GCC_COLORS unexport PLATFORM unexport OS +unexport DEVICE_TREE GNU_HOST_NAME := $(shell support/gnuconfig/config.guess) From yann.morin.1998 at free.fr Wed Feb 23 14:05:45 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 23 Feb 2022 15:05:45 +0100 Subject: [Buildroot] [PATCH] Makefile: unexport 'DEVICE_TREE' environment variable In-Reply-To: <20220223124109.2370215-1-peter@korsgaard.com> References: <20220223124109.2370215-1-peter@korsgaard.com> Message-ID: <20220223140545.GA179822@scaer> Peter, All, On 2022-02-23 13:41 +0100, Peter Korsgaard spake thusly: > U-Boot looks for the environment variable DEVICE_TREE and uses its value if > set instead of the CONFIG_DEFAULT_DEVICE_TREE configuration option since > v2021.01, more specifically commit c0f1ebe9c1b9745e (binman: Allow selecting > default FIT configuration) - So unexport it like we do for other > "troublesome" environment variables to ensure consistent behaviour. > > Reported-by: Neal Frager > Signed-off-by: Peter Korsgaard Applied to master, thanks. Regards, Yann E. MORIN. > --- > Makefile | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/Makefile b/Makefile > index d92438166f..0ed93e600d 100644 > --- a/Makefile > +++ b/Makefile > @@ -426,6 +426,7 @@ unexport O > unexport GCC_COLORS > unexport PLATFORM > unexport OS > +unexport DEVICE_TREE > > GNU_HOST_NAME := $(shell support/gnuconfig/config.guess) > > -- > 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 bugzilla at busybox.net Wed Feb 23 14:23:23 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 23 Feb 2022 14:23:23 +0000 Subject: [Buildroot] [Bug 14601] New: Python build fails on 2022.02-rc2 Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14601 Bug ID: 14601 Summary: Python build fails on 2022.02-rc2 Product: buildroot Version: unspecified Hardware: All OS: Linux Status: NEW Severity: critical Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: info at hifiberry.com CC: buildroot at uclibc.org Target Milestone: --- Just trying the 2022.02 release. When building Python the install step fails: python3: installs files in /home/matuschd/buildroot-4/target//home/matuschd/buildroot-4 make[1]: *** [package/pkg-generic.mk:389: /home/matuschd/buildroot-4/build/python3-3.10.2/.stamp_target_installed] Error 1 It seems that the install path isn't handled correctly - probably when using the O= build option -- You are receiving this mail because: You are on the CC list for the bug. From yann.morin.1998 at free.fr Wed Feb 23 14:27:31 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 23 Feb 2022 15:27:31 +0100 Subject: [Buildroot] [RFC PATCH] package/libiberty: use the same version as binutils In-Reply-To: <20220223115506.1191031-1-john@metanate.com> References: <20220223115506.1191031-1-john@metanate.com> Message-ID: <20220223142731.GA189337@scaer> John, All, On 2022-02-23 11:55 +0000, John Keeping spake thusly: > libiberty is built from the binutils source but this package has > languished on version 2.32 while the binutils package now uses 2.36.1 by > default. > > Even between the 2.32 version and GDB 10.2 which is the default (and > where host-libiberty is used instead of a version bundled in the GDB > source) there are memory leak fixes and several improvements to > demangling. > > Update the libiberty package to simply use the same version as binutils > so that there is no need to remember to update this package in the > future. Replace the .hash file with a symlink so that the binutils > hashes are used automatically. > > Signed-off-by: John Keeping > --- > I'm not sure if this is this is the best way to improve the situation > here - it's the smallest change to get something a bit more modern (in > most circumstances), but I wonder if libiberty should use the GDB source > instead as that's the one package we know both bundles libiberty source > and will use host-libiberty in preference. > > package/libiberty/libiberty.hash | 6 +----- > package/libiberty/libiberty.mk | 4 ++-- > 2 files changed, 3 insertions(+), 7 deletions(-) > mode change 100644 => 120000 package/libiberty/libiberty.hash > > diff --git a/package/libiberty/libiberty.hash b/package/libiberty/libiberty.hash > deleted file mode 100644 > index 0dafcea520..0000000000 > --- a/package/libiberty/libiberty.hash > +++ /dev/null > @@ -1,5 +0,0 @@ > -# From ftp://gcc.gnu.org/pub/binutils/releases/sha512.sum > -sha512 d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724afa1e43bd0db45cfc9916b41519b67dfce03232aa4978704492a6994a binutils-2.32.tar.xz > - > -# Locally computed, same as binutils.hash > -sha256 56bdea73b6145ef6ac5259b3da390b981d840c24cb03b8e1cbc678de7ecfa18d COPYING.LIB > diff --git a/package/libiberty/libiberty.hash b/package/libiberty/libiberty.hash > new file mode 120000 > index 0000000000..e0655d3af3 > --- /dev/null > +++ b/package/libiberty/libiberty.hash > @@ -0,0 +1 @@ > +../binutils/binutils.hash > \ No newline at end of file > diff --git a/package/libiberty/libiberty.mk b/package/libiberty/libiberty.mk > index 6235a8b956..d0847bf298 100644 > --- a/package/libiberty/libiberty.mk > +++ b/package/libiberty/libiberty.mk > @@ -4,8 +4,8 @@ > # > ################################################################################ > > -LIBIBERTY_VERSION = 2.32 > -LIBIBERTY_SOURCE = binutils-$(LIBIBERTY_VERSION).tar.xz > +LIBIBERTY_VERSION = $(BINUTILS_VERSION) > +LIBIBERTY_SOURCE = $(BINUTILS_SOURCE) Although this works, this is by pure chance: binutils is included before libiberty, so BINUTILS_VERSION is defined. But we try and avoid such a situation, unless we explicitly guarantee the include ordering (eg. gcc, fftw, util-linux, or previously, qt5). Instead, in such a case, we prefer that the version strin is duplicated, and a comment added above to note that both shoujld be updated in sync. See for example bluez5_utils and bluez5_utils-headers, mesa3d and mesa3d-headers. Regards, Yann E. MORIN. > LIBIBERTY_SITE = $(BR2_GNU_MIRROR)/binutils > HOST_LIBIBERTY_DL_SUBDIR = binutils > > -- > 2.35.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 nealf at xilinx.com Wed Feb 23 14:30:58 2022 From: nealf at xilinx.com (Neal Frager) Date: Wed, 23 Feb 2022 14:30:58 +0000 Subject: [Buildroot] [PATCH v1 1/1] configs/zynqmp_zcu10x: fix U-Boot dts config In-Reply-To: <20220223125118.2325363-1-neal.frager@xilinx.com> References: <20220223125118.2325363-1-neal.frager@xilinx.com> Message-ID: Hi Peter, +++ b/board/zynqmp/zcu106/uboot-fragment.config @@ -0,0 +1,2 @@ +CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu106-revA" + I tried your method of creating a uboot fragment config that just modifies the CONFIG_DEFAULT_DEVICE_TREE. However, when I build, I get the following error: Device Tree Source (arch/arm/dts/unset.dtb) is not correctly specified. Please define 'CONFIG_DEFAULT_DEVICE_TREE' or build with 'DEVICE_TREE=' argument I can see that the U-Boot .config is correctly modified with CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu106-revA" But it does not build. How did you get this to build on your side? Best regards, Neal Frager Xilinx From nealf at xilinx.com Wed Feb 23 14:46:31 2022 From: nealf at xilinx.com (Neal Frager) Date: Wed, 23 Feb 2022 14:46:31 +0000 Subject: [Buildroot] [PATCH v1 1/1] configs/zynqmp_zcu10x: fix U-Boot dts config In-Reply-To: References: <20220223125118.2325363-1-neal.frager@xilinx.com> Message-ID: Hi Peter, > +++ b/board/zynqmp/zcu106/uboot-fragment.config > @@ -0,0 +1,2 @@ > +CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu106-revA" > + > I tried your method of creating a uboot fragment config that just modifies the CONFIG_DEFAULT_DEVICE_TREE. > However, when I build, I get the following error: > Device Tree Source (arch/arm/dts/unset.dtb) is not correctly specified. > Please define 'CONFIG_DEFAULT_DEVICE_TREE' > or build with 'DEVICE_TREE=' argument > I can see that the U-Boot .config is correctly modified with CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu106-revA" > But it does not build. How did you get this to build on your side? If I add DEVICE_TREE=zynqmp-zcu106-revA to my environment, then everything builds and runs without any other changes. But if I do not have DEVICE_TREE defined, I still get the following error, even if I have the following in my u-boot .config. CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu106-revA" Any ideas? Thank you for your help! Best regards, Neal Frager Xilinx From thomas.petazzoni at bootlin.com Wed Feb 23 14:51:41 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 23 Feb 2022 15:51:41 +0100 Subject: [Buildroot] [RFC PATCH] package/libiberty: use the same version as binutils In-Reply-To: <20220223142731.GA189337@scaer> References: <20220223115506.1191031-1-john@metanate.com> <20220223142731.GA189337@scaer> Message-ID: <20220223155141.0223462b@windsurf> On Wed, 23 Feb 2022 15:27:31 +0100 "Yann E. MORIN" wrote: > Although this works, this is by pure chance: binutils is included before > libiberty, so BINUTILS_VERSION is defined. But we try and avoid such a > situation, unless we explicitly guarantee the include ordering (eg. gcc, > fftw, util-linux, or previously, qt5). > > Instead, in such a case, we prefer that the version strin is duplicated, > and a comment added above to note that both shoujld be updated in sync. > See for example bluez5_utils and bluez5_utils-headers, mesa3d and > mesa3d-headers. libiberty/binutils is different than mesa3d or bluez5_utils, as the version is user-selectable, or even different depending on the selected CPU architecture. So we would have to replicate all the version selection logic (like we admittedly do for linux vs. linux-headers). Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From yann.morin.1998 at free.fr Wed Feb 23 15:17:32 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 23 Feb 2022 16:17:32 +0100 Subject: [Buildroot] [RFC PATCH] package/libiberty: use the same version as binutils In-Reply-To: <20220223155141.0223462b@windsurf> References: <20220223115506.1191031-1-john@metanate.com> <20220223142731.GA189337@scaer> <20220223155141.0223462b@windsurf> Message-ID: <20220223151732.GB189337@scaer> Thomas, All, On 2022-02-23 15:51 +0100, Thomas Petazzoni spake thusly: > On Wed, 23 Feb 2022 15:27:31 +0100 > "Yann E. MORIN" wrote: > > Although this works, this is by pure chance: binutils is included before > > libiberty, so BINUTILS_VERSION is defined. But we try and avoid such a > > situation, unless we explicitly guarantee the include ordering (eg. gcc, > > fftw, util-linux, or previously, qt5). > > Instead, in such a case, we prefer that the version strin is duplicated, > > and a comment added above to note that both shoujld be updated in sync. > > See for example bluez5_utils and bluez5_utils-headers, mesa3d and > > mesa3d-headers. > libiberty/binutils is different than mesa3d or bluez5_utils, as the > version is user-selectable, or even different depending on the selected > CPU architecture. Right, I forgot about that... But still, I don't like that we rely on the implied include order here, as we try and avoid that elsewhere... > So we would have to replicate all the version selection logic (like we > admittedly do for linux vs. linux-headers). That would not be very convenient and maintainable in the long run, as we update binutils to newer versions with various arch support changes: indeed, as we can see here, we'd eventually forget to update libibert in sync. Unless we move libiberty as a sub-directory in pacage/binutils/libiberty/ (like for util-linux-libs) to make it obvious that we need to share the version... That'd be my favourite option. 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 Wed Feb 23 15:20:39 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Wed, 23 Feb 2022 16:20:39 +0100 Subject: [Buildroot] [PATCH/next 1/2] package/libva: bump version to 2.14.0 Message-ID: <20220223152040.188210-1-bernd.kuhls@t-online.de> Release notes: https://github.com/intel/libva/releases/tag/2.14.0 Signed-off-by: Bernd Kuhls --- package/libva/libva.hash | 6 +++--- package/libva/libva.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libva/libva.hash b/package/libva/libva.hash index 7b66a7709d..4646a816bb 100644 --- a/package/libva/libva.hash +++ b/package/libva/libva.hash @@ -1,5 +1,5 @@ -# From https://github.com/intel/libva/releases/download/2.13.0/libva-2.13.0.tar.bz2.sha1sum -sha1 2adb2c023371dd68fe0d23e58afcf0b072b79828 libva-2.13.0.tar.bz2 +# From https://github.com/intel/libva/releases/download/2.14.0/libva-2.14.0.tar.bz2.sha1sum +sha1 36b482ec8c361a6c3a6198f4777409b136f2713c libva-2.14.0.tar.bz2 # Locally computed -sha256 fad383f39f36115814bd0eda1496a4cc01761643bd962635400df2d4470ad460 libva-2.13.0.tar.bz2 +sha256 511e9a74d1ccfb548bc192290603082c11074ac59b17aadfd5d56a3f93e58454 libva-2.14.0.tar.bz2 sha256 c86a782ee845b52472dae9b9d79fb915d333628ac0efe49cdce63644814931de COPYING diff --git a/package/libva/libva.mk b/package/libva/libva.mk index 6ac5386540..db1cfd29be 100644 --- a/package/libva/libva.mk +++ b/package/libva/libva.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVA_VERSION = 2.13.0 +LIBVA_VERSION = 2.14.0 LIBVA_SOURCE = libva-$(LIBVA_VERSION).tar.bz2 LIBVA_SITE = https://github.com/intel/libva/releases/download/$(LIBVA_VERSION) LIBVA_LICENSE = MIT -- 2.30.2 From bernd.kuhls at t-online.de Wed Feb 23 15:20:40 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Wed, 23 Feb 2022 16:20:40 +0100 Subject: [Buildroot] [PATCH/next 2/2] package/libva-utils: bump version to 2.14.0 In-Reply-To: <20220223152040.188210-1-bernd.kuhls@t-online.de> References: <20220223152040.188210-1-bernd.kuhls@t-online.de> Message-ID: <20220223152040.188210-2-bernd.kuhls@t-online.de> Release notes: https://github.com/intel/libva-utils/releases/tag/2.14.0 Upstream does not provide a tarball so switch to github helper. Switch build system to meson to avoid autoreconf. Signed-off-by: Bernd Kuhls --- package/libva-utils/libva-utils.hash | 4 +--- package/libva-utils/libva-utils.mk | 7 +++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/package/libva-utils/libva-utils.hash b/package/libva-utils/libva-utils.hash index 18a078dc1c..5f21af800e 100644 --- a/package/libva-utils/libva-utils.hash +++ b/package/libva-utils/libva-utils.hash @@ -1,5 +1,3 @@ -# From https://github.com/intel/libva-utils/releases/download/2.13.0/libva-utils-2.13.0.tar.bz2.sha1sum -sha1 7ab945cf232387f762891f9e4f7a6cb41e0766e8 libva-utils-2.13.0.tar.bz2 # Locally computed -sha256 db3ae0bd63c2a3f6ef498450c29ffc99c387ce611e1eb5db6a8da1f88845d612 libva-utils-2.13.0.tar.bz2 +sha256 0ad6410aaa27d7b15dadee0f4d775d54d6394b582bf315353a4657b49c78ac31 libva-utils-2.14.0.tar.gz sha256 c6220c9f87832c27abcb8a32eafdd2823e13ce146b3ea63d5deae2a76798ef50 COPYING diff --git a/package/libva-utils/libva-utils.mk b/package/libva-utils/libva-utils.mk index e6e31df8bd..4c527a748c 100644 --- a/package/libva-utils/libva-utils.mk +++ b/package/libva-utils/libva-utils.mk @@ -4,11 +4,10 @@ # ################################################################################ -LIBVA_UTILS_VERSION = 2.13.0 -LIBVA_UTILS_SOURCE = libva-utils-$(LIBVA_UTILS_VERSION).tar.bz2 -LIBVA_UTILS_SITE = https://github.com/intel/libva-utils/releases/download/$(LIBVA_UTILS_VERSION) +LIBVA_UTILS_VERSION = 2.14.0 +LIBVA_UTILS_SITE = $(call github,intel,libva-utils,$(LIBVA_UTILS_VERSION)) LIBVA_UTILS_LICENSE = MIT LIBVA_UTILS_LICENSE_FILES = COPYING LIBVA_UTILS_DEPENDENCIES = host-pkgconf libva -$(eval $(autotools-package)) +$(eval $(meson-package)) -- 2.30.2 From bernd.kuhls at t-online.de Wed Feb 23 15:51:28 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Wed, 23 Feb 2022 16:51:28 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xdriver_xf86-video-mach64: fix build error Message-ID: <20220223155128.818822-1-bernd.kuhls@t-online.de> Add upstream commit to fix build with xorg-server 21.1 which was bumped with commit d9185c6ba38430a017ed996c4180e141881ba570. Fixes: http://autobuild.buildroot.net/results/f0a/f0a0224a2b368c11236fcc7d14db5175c0a829d1/ Signed-off-by: Bernd Kuhls --- ...me-bool-to-boolean-for-OptionInfoRec.patch | 84 +++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 package/x11r7/xdriver_xf86-video-mach64/0002-Rename-bool-to-boolean-for-OptionInfoRec.patch diff --git a/package/x11r7/xdriver_xf86-video-mach64/0002-Rename-bool-to-boolean-for-OptionInfoRec.patch b/package/x11r7/xdriver_xf86-video-mach64/0002-Rename-bool-to-boolean-for-OptionInfoRec.patch new file mode 100644 index 0000000000..fe3e21f8c2 --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-mach64/0002-Rename-bool-to-boolean-for-OptionInfoRec.patch @@ -0,0 +1,84 @@ +From 3ab2c144ef34199ceaf95115538a67f932e76f7d Mon Sep 17 00:00:00 2001 +From: Josselin Poiret +Date: Thu, 18 Nov 2021 13:18:25 +0000 +Subject: [PATCH] Rename bool to boolean for OptionInfoRec. + +* src/aticonfig.c: Change uses of .value.bool to .value.boolean + +Downloaded from upstream commit +https://gitlab.freedesktop.org/xorg/driver/xf86-video-mach64/-/commit/3ab2c144ef34199ceaf95115538a67f932e76f7d + +Signed-off-by: Bernd Kuhls +--- + src/aticonfig.c | 38 +++++++++++++++++++------------------- + 1 file changed, 19 insertions(+), 19 deletions(-) + +diff --git a/src/aticonfig.c b/src/aticonfig.c +index bad6474..6995b9a 100644 +--- a/src/aticonfig.c ++++ b/src/aticonfig.c +@@ -311,42 +311,42 @@ ATIProcessOptions + + (void)memcpy(PublicOption, ATIPublicOptions, ATIPublicOptionSize); + +-# define ProbeSparse PublicOption[ATI_OPTION_PROBE_SPARSE].value.bool +-# define Accel PublicOption[ATI_OPTION_ACCEL].value.bool +-# define BIOSDisplay PrivateOption[ATI_OPTION_BIOS_DISPLAY].value.bool +-# define Blend PrivateOption[ATI_OPTION_BLEND].value.bool +-# define CRTDisplay PublicOption[ATI_OPTION_CRT_DISPLAY].value.bool +-# define CRTScreen PrivateOption[ATI_OPTION_CRT_SCREEN].value.bool +-# define CSync PublicOption[ATI_OPTION_CSYNC].value.bool +-# define Devel PrivateOption[ATI_OPTION_DEVEL].value.bool +-# define HWCursor PublicOption[ATI_OPTION_HWCURSOR].value.bool ++# define ProbeSparse PublicOption[ATI_OPTION_PROBE_SPARSE].value.boolean ++# define Accel PublicOption[ATI_OPTION_ACCEL].value.boolean ++# define BIOSDisplay PrivateOption[ATI_OPTION_BIOS_DISPLAY].value.boolean ++# define Blend PrivateOption[ATI_OPTION_BLEND].value.boolean ++# define CRTDisplay PublicOption[ATI_OPTION_CRT_DISPLAY].value.boolean ++# define CRTScreen PrivateOption[ATI_OPTION_CRT_SCREEN].value.boolean ++# define CSync PublicOption[ATI_OPTION_CSYNC].value.boolean ++# define Devel PrivateOption[ATI_OPTION_DEVEL].value.boolean ++# define HWCursor PublicOption[ATI_OPTION_HWCURSOR].value.boolean + + #ifdef XF86DRI_DEVEL + +-# define IsPCI PublicOption[ATI_OPTION_IS_PCI].value.bool ++# define IsPCI PublicOption[ATI_OPTION_IS_PCI].value.boolean + # define DMAMode PublicOption[ATI_OPTION_DMA_MODE].value.str + # define AGPMode PublicOption[ATI_OPTION_AGP_MODE].value.num + # define AGPSize PublicOption[ATI_OPTION_AGP_SIZE].value.num +-# define LocalTex PublicOption[ATI_OPTION_LOCAL_TEXTURES].value.bool ++# define LocalTex PublicOption[ATI_OPTION_LOCAL_TEXTURES].value.boolean + # define BufferSize PublicOption[ATI_OPTION_BUFFER_SIZE].value.num + + #endif /* XF86DRI_DEVEL */ + + #ifdef TV_OUT + +-# define TvOut PublicOption[ATI_OPTION_TV_OUT].value.bool ++# define TvOut PublicOption[ATI_OPTION_TV_OUT].value.boolean + # define TvStd PublicOption[ATI_OPTION_TV_STD].value.str + + #endif /* TV_OUT */ + +-# define CacheMMIO PublicOption[ATI_OPTION_MMIO_CACHE].value.bool +-# define TestCacheMMIO PublicOption[ATI_OPTION_TEST_MMIO_CACHE].value.bool +-# define PanelDisplay PublicOption[ATI_OPTION_PANEL_DISPLAY].value.bool +-# define ShadowFB PublicOption[ATI_OPTION_SHADOW_FB].value.bool +-# define SWCursor PublicOption[ATI_OPTION_SWCURSOR].value.bool ++# define CacheMMIO PublicOption[ATI_OPTION_MMIO_CACHE].value.boolean ++# define TestCacheMMIO PublicOption[ATI_OPTION_TEST_MMIO_CACHE].value.boolean ++# define PanelDisplay PublicOption[ATI_OPTION_PANEL_DISPLAY].value.boolean ++# define ShadowFB PublicOption[ATI_OPTION_SHADOW_FB].value.boolean ++# define SWCursor PublicOption[ATI_OPTION_SWCURSOR].value.boolean + # define AccelMethod PublicOption[ATI_OPTION_ACCELMETHOD].value.str +-# define RenderAccel PublicOption[ATI_OPTION_RENDER_ACCEL].value.bool +-# define LCDSync PrivateOption[ATI_OPTION_LCDSYNC].value.bool ++# define RenderAccel PublicOption[ATI_OPTION_RENDER_ACCEL].value.boolean ++# define LCDSync PrivateOption[ATI_OPTION_LCDSYNC].value.boolean + + # define ReferenceClock \ + PublicOption[ATI_OPTION_REFERENCE_CLOCK].value.freq.freq +-- +GitLab + -- 2.30.2 From bernd.kuhls at t-online.de Wed Feb 23 15:59:42 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Wed, 23 Feb 2022 16:59:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xdriver_xf86-video-nouveau: fix build error Message-ID: <20220223155942.831349-1-bernd.kuhls@t-online.de> Add upstream commit to fix build with xorg-server 21.1 which was bumped with commit d9185c6ba38430a017ed996c4180e141881ba570. No autobuild errors found yet. Signed-off-by: Bernd Kuhls --- ...au-fixup-driver-for-new-X-server-ABI.patch | 68 +++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 package/x11r7/xdriver_xf86-video-nouveau/0001-nouveau-fixup-driver-for-new-X-server-ABI.patch diff --git a/package/x11r7/xdriver_xf86-video-nouveau/0001-nouveau-fixup-driver-for-new-X-server-ABI.patch b/package/x11r7/xdriver_xf86-video-nouveau/0001-nouveau-fixup-driver-for-new-X-server-ABI.patch new file mode 100644 index 0000000000..96be4909e7 --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-nouveau/0001-nouveau-fixup-driver-for-new-X-server-ABI.patch @@ -0,0 +1,68 @@ +From e80e73ced69b15662103d0fd6837db4ce6c6eb5b Mon Sep 17 00:00:00 2001 +From: Dave Airlie +Date: Mon, 13 Jul 2020 09:20:15 +1000 +Subject: [PATCH] nouveau: fixup driver for new X server ABI + +Downloaded from upstream commit +https://gitlab.freedesktop.org/xorg/driver/xf86-video-nouveau/-/commit/e80e73ced69b15662103d0fd6837db4ce6c6eb5b + +Signed-off-by: Bernd Kuhls +--- + src/compat-api.h | 4 ++++ + src/nouveau_exa.c | 2 +- + src/nv_driver.c | 6 +++--- + 3 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/src/compat-api.h b/src/compat-api.h +index fde2f4b..8a1fcf9 100644 +--- a/src/compat-api.h ++++ b/src/compat-api.h +@@ -102,4 +102,8 @@ + + #endif + ++#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(25, 2) ++#define secondary_dst slave_dst ++#endif ++ + #endif +diff --git a/src/nouveau_exa.c b/src/nouveau_exa.c +index 55df6f8..db3b112 100644 +--- a/src/nouveau_exa.c ++++ b/src/nouveau_exa.c +@@ -157,7 +157,7 @@ nouveau_exa_destroy_pixmap(ScreenPtr pScreen, void *priv) + + #ifdef NOUVEAU_PIXMAP_SHARING + static Bool +-nouveau_exa_share_pixmap_backing(PixmapPtr ppix, ScreenPtr slave, void **handle_p) ++nouveau_exa_share_pixmap_backing(PixmapPtr ppix, ScreenPtr secondary, void **handle_p) + { + struct nouveau_bo *bo = nouveau_pixmap_bo(ppix); + struct nouveau_pixmap *nvpix = nouveau_pixmap(ppix); +diff --git a/src/nv_driver.c b/src/nv_driver.c +index e72a6b6..f9ab4af 100644 +--- a/src/nv_driver.c ++++ b/src/nv_driver.c +@@ -559,16 +559,16 @@ redisplay_dirty(ScreenPtr screen, PixmapDirtyUpdatePtr dirty) + { + RegionRec pixregion; + +- PixmapRegionInit(&pixregion, dirty->slave_dst); ++ PixmapRegionInit(&pixregion, dirty->secondary_dst); + +- DamageRegionAppend(&dirty->slave_dst->drawable, &pixregion); ++ DamageRegionAppend(&dirty->secondary_dst->drawable, &pixregion); + #ifdef HAS_DIRTYTRACKING_ROTATION + PixmapSyncDirtyHelper(dirty); + #else + PixmapSyncDirtyHelper(dirty, &pixregion); + #endif + +- DamageRegionProcessPending(&dirty->slave_dst->drawable); ++ DamageRegionProcessPending(&dirty->secondary_dst->drawable); + RegionUninit(&pixregion); + } + +-- +GitLab + -- 2.30.2 From bernd.kuhls at t-online.de Wed Feb 23 16:06:30 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Wed, 23 Feb 2022 17:06:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xdriver_xf86-video-qxl: fix build error Message-ID: <20220223160630.835866-1-bernd.kuhls@t-online.de> Add upstream commit to fix build with xorg-server 21.1 which was bumped with commit d9185c6ba38430a017ed996c4180e141881ba570. No autobuild errors found yet. Signed-off-by: Bernd Kuhls --- ...1-Fix-a-build-error-with-Xorg-master.patch | 106 ++++++++++++++++++ 1 file changed, 106 insertions(+) create mode 100644 package/x11r7/xdriver_xf86-video-qxl/0001-Fix-a-build-error-with-Xorg-master.patch diff --git a/package/x11r7/xdriver_xf86-video-qxl/0001-Fix-a-build-error-with-Xorg-master.patch b/package/x11r7/xdriver_xf86-video-qxl/0001-Fix-a-build-error-with-Xorg-master.patch new file mode 100644 index 0000000000..d3257fba20 --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-qxl/0001-Fix-a-build-error-with-Xorg-master.patch @@ -0,0 +1,106 @@ +From 4e1963a812f2c1777ba5d56ea9e939a3e40a0496 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zolt=C3=A1n=20B=C3=B6sz=C3=B6rm=C3=A9nyi?= + +Date: Sat, 28 Aug 2021 15:38:40 +0200 +Subject: [PATCH] Fix a build error with Xorg master +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Use xf86ReturnOptValBool() in get_bool_option() instead of +options[option_index].value.bool to fix a compiler error with +current Xorg xserver master branch. + +Also use xf86GetOptValInteger() in get_int_option() and +xf86GetOptValString() in get_str_option() for consistency. + +The change causes a slight performance drop during option parsing +because the passed-in index_value is no longer used as an index +into the options array. + +Instead, it's used as a token now for the standard option getter +functions which works since the index_value to the get_*_option() +functions are identical to the value of options[n].token in the +passed-in OptionInfoRec array. + +Also rename "int option_index" to "int token" for clarity in all +three functions. + +Signed-off-by: Zolt?n B?sz?rm?nyi + +Downloaded from upstream commit +https://gitlab.freedesktop.org/xorg/driver/xf86-video-qxl/-/commit/4e1963a812f2c1777ba5d56ea9e939a3e40a0496 + +Signed-off-by: Bernd Kuhls +--- + src/qxl_option_helpers.c | 13 +++++++------ + src/qxl_option_helpers.h | 6 +++--- + 2 files changed, 10 insertions(+), 9 deletions(-) + +diff --git a/src/qxl_option_helpers.c b/src/qxl_option_helpers.c +index 2aba677..7707b7c 100644 +--- a/src/qxl_option_helpers.c ++++ b/src/qxl_option_helpers.c +@@ -10,31 +10,32 @@ + + #include "qxl_option_helpers.h" + +-int get_int_option(OptionInfoPtr options, int option_index, ++int get_int_option(OptionInfoPtr options, int token, + const char *env_name) + { ++ int value; + if (env_name && getenv(env_name)) { + return atoi(getenv(env_name)); + } +- return options[option_index].value.num; ++ return xf86GetOptValInteger(options, token, &value) ? value : 0; + } + +-const char *get_str_option(OptionInfoPtr options, int option_index, ++const char *get_str_option(OptionInfoPtr options, int token, + const char *env_name) + { + if (getenv(env_name)) { + return getenv(env_name); + } +- return options[option_index].value.str; ++ return xf86GetOptValString(options, token); + } + +-int get_bool_option(OptionInfoPtr options, int option_index, ++int get_bool_option(OptionInfoPtr options, int token, + const char *env_name) + { + const char* value = getenv(env_name); + + if (!value) { +- return options[option_index].value.bool; ++ return xf86ReturnOptValBool(options, token, FALSE); + } + if (strcmp(value, "0") == 0 || + strcasecmp(value, "off") == 0 || +diff --git a/src/qxl_option_helpers.h b/src/qxl_option_helpers.h +index 7c54c72..66d0a17 100644 +--- a/src/qxl_option_helpers.h ++++ b/src/qxl_option_helpers.h +@@ -4,13 +4,13 @@ + #include + #include + +-int get_int_option(OptionInfoPtr options, int option_index, ++int get_int_option(OptionInfoPtr options, int token, + const char *env_name); + +-const char *get_str_option(OptionInfoPtr options, int option_index, ++const char *get_str_option(OptionInfoPtr options, int token, + const char *env_name); + +-int get_bool_option(OptionInfoPtr options, int option_index, ++int get_bool_option(OptionInfoPtr options, int token, + const char *env_name); + + #endif // OPTION_HELPERS_H +-- +GitLab + -- 2.30.2 From john at metanate.com Wed Feb 23 16:39:15 2022 From: john at metanate.com (John Keeping) Date: Wed, 23 Feb 2022 16:39:15 +0000 Subject: [Buildroot] [RFC PATCH] package/libiberty: use the same version as binutils In-Reply-To: <20220223151732.GB189337@scaer> References: <20220223115506.1191031-1-john@metanate.com> <20220223142731.GA189337@scaer> <20220223155141.0223462b@windsurf> <20220223151732.GB189337@scaer> Message-ID: On Wed, Feb 23, 2022 at 04:17:32PM +0100, Yann E. MORIN wrote: > Thomas, All, > > On 2022-02-23 15:51 +0100, Thomas Petazzoni spake thusly: > > On Wed, 23 Feb 2022 15:27:31 +0100 > > "Yann E. MORIN" wrote: > > > Although this works, this is by pure chance: binutils is included before > > > libiberty, so BINUTILS_VERSION is defined. But we try and avoid such a > > > situation, unless we explicitly guarantee the include ordering (eg. gcc, > > > fftw, util-linux, or previously, qt5). > > > Instead, in such a case, we prefer that the version strin is duplicated, > > > and a comment added above to note that both shoujld be updated in sync. > > > See for example bluez5_utils and bluez5_utils-headers, mesa3d and > > > mesa3d-headers. > > libiberty/binutils is different than mesa3d or bluez5_utils, as the > > version is user-selectable, or even different depending on the selected > > CPU architecture. > > Right, I forgot about that... But still, I don't like that we rely on > the implied include order here, as we try and avoid that elsewhere... > > > So we would have to replicate all the version selection logic (like we > > admittedly do for linux vs. linux-headers). > > That would not be very convenient and maintainable in the long run, as > we update binutils to newer versions with various arch support changes: > indeed, as we can see here, we'd eventually forget to update libibert in > sync. > > Unless we move libiberty as a sub-directory in pacage/binutils/libiberty/ > (like for util-linux-libs) to make it obvious that we need to share the > version... That'd be my favourite option. If we're doing that, should it be in gdb instead of binutils? The gdb and binutils source all comes from the same repository but gdb is the one package for which we actually use host-libiberty so tying this in to the gdb version seems more sensible than using the binutils version. For example, given the default versions of binutils and gdb gives: $ git log --left-right --oneline binutils-2_36_1...gdb-10.2-release -- libiberty/ > f42f69f6f38 libiberty: Support the new ("v0") mangling scheme in rust-demangle < d750c713c9a Update libiberty with latest sources from gcc mainline < f9a6a8f09dc PR27116, Spelling errors found by Debian style checker < 250d07de5cf Update year range in copyright notice of binutils files < d7b477c541b Sync libiberty and include with GCC for get_DW_UT_name. so the GDB branch has a new feature (not included in the binutils branch) whereas binutils has some updates not included for GDB. It's a bit of a mess, but given where we need libiberty (for prelink-cross) and what uses the package version (host-gdb) it looks like it would make more sense to move this to the gdb package source. What do you think? John From luca at lucaceresoli.net Wed Feb 23 16:54:56 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Wed, 23 Feb 2022 17:54:56 +0100 Subject: [Buildroot] [PATCH v1 1/1] configs/zynqmp_zcu10x: fix U-Boot dts config In-Reply-To: <20220223125118.2325363-1-neal.frager@xilinx.com> References: <20220223125118.2325363-1-neal.frager@xilinx.com> Message-ID: Hi Neal, On 23/02/22 13:51, Neal Frager wrote: > This patch: > - fixes U-Boot issue when DEVICE_TREE environment variable undefined This appears unrelated from the version bumps. Please send separate patches. > - bumps U-Boot to Xilinx 2022.01-171 > - bumps Linux to Xilinx 5.15-945 > > Signed-off-by: Neal Frager > --- > board/zynqmp/zcu102/uboot-fragment.config | 2 ++ > board/zynqmp/zcu106/uboot-fragment.config | 2 ++ > configs/zynqmp_zcu102_defconfig | 5 +++-- > configs/zynqmp_zcu106_defconfig | 5 +++-- > 4 files changed, 10 insertions(+), 4 deletions(-) > create mode 100644 board/zynqmp/zcu102/uboot-fragment.config > create mode 100644 board/zynqmp/zcu106/uboot-fragment.config > > diff --git a/board/zynqmp/zcu102/uboot-fragment.config b/board/zynqmp/zcu102/uboot-fragment.config > new file mode 100644 > index 0000000000..51b4f3c96a > --- /dev/null > +++ b/board/zynqmp/zcu102/uboot-fragment.config > @@ -0,0 +1,2 @@ > +CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu102-rev1.0" > + Avoid trailing empty lines. > diff --git a/board/zynqmp/zcu106/uboot-fragment.config b/board/zynqmp/zcu106/uboot-fragment.config > new file mode 100644 > index 0000000000..bdb0fafea7 > --- /dev/null > +++ b/board/zynqmp/zcu106/uboot-fragment.config > @@ -0,0 +1,2 @@ > +CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu106-revA" > + Here too. -- Luca From luca at lucaceresoli.net Wed Feb 23 17:03:42 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Wed, 23 Feb 2022 18:03:42 +0100 Subject: [Buildroot] [PATCH v1 1/1] configs/zynqmp_zcu10x: fix U-Boot dts config In-Reply-To: References: <20220223125118.2325363-1-neal.frager@xilinx.com> Message-ID: <3795ba01-3742-acce-9eeb-8c34a00bd941@lucaceresoli.net> Hi Neal, On 23/02/22 15:30, Neal Frager wrote: > Hi Peter, > > +++ b/board/zynqmp/zcu106/uboot-fragment.config > @@ -0,0 +1,2 @@ > +CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu106-revA" > + > > I tried your method of creating a uboot fragment config that just modifies the CONFIG_DEFAULT_DEVICE_TREE. > > However, when I build, I get the following error: > > Device Tree Source (arch/arm/dts/unset.dtb) is not correctly specified. > Please define 'CONFIG_DEFAULT_DEVICE_TREE' > or build with 'DEVICE_TREE=' argument Strange, I just run a build with current master + your patch and it succeeded. > I can see that the U-Boot .config is correctly modified with > CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu106-revA" Here too. Maybe try a completely clean build. What I usually do is git clean -xdf # similar to 'make clean' but faster make zynqmp_zcu106_defconfig make And why not, do it in docker. -- Luca From peter at korsgaard.com Wed Feb 23 17:05:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Feb 2022 18:05:22 +0100 Subject: [Buildroot] [PATCH v1 1/1] configs/zynqmp_zcu10x: fix U-Boot dts config In-Reply-To: (Neal Frager's message of "Wed, 23 Feb 2022 14:30:58 +0000") References: <20220223125118.2325363-1-neal.frager@xilinx.com> Message-ID: <878ru15x9p.fsf@dell.be.48ers.dk> >>>>> "Neal" == Neal Frager writes: > Hi Peter, > +++ b/board/zynqmp/zcu106/uboot-fragment.config > @@ -0,0 +1,2 @@ > +CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu106-revA" > + > I tried your method of creating a uboot fragment config that just modifies the CONFIG_DEFAULT_DEVICE_TREE. > However, when I build, I get the following error: > Device Tree Source (arch/arm/dts/unset.dtb) is not correctly specified. > Please define 'CONFIG_DEFAULT_DEVICE_TREE' > or build with 'DEVICE_TREE=' argument > I can see that the U-Boot .config is correctly modified with > CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu106-revA" > But it does not build. How did you get this to build on your side? Are you sure you are using a clean Buildroot tree? It works here with your patch applied. Easiest way to check is to just do something like: make O=output-test zynqmp_zcu106_defconfig make O=output-test uboot-menuconfig And then scroll down to 'Device Tree Control' and verify that you have: (zynqmp-zcu106-revA) Default Device Tree for DT control -- Bye, Peter Korsgaard From giulio.benetti at benettiengineering.com Wed Feb 23 17:17:04 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 23 Feb 2022 18:17:04 +0100 Subject: [Buildroot] [PATCH v1 1/1] configs/zynqmp_zcu10x: fix U-Boot dts config In-Reply-To: <3795ba01-3742-acce-9eeb-8c34a00bd941@lucaceresoli.net> References: <3795ba01-3742-acce-9eeb-8c34a00bd941@lucaceresoli.net> Message-ID: <60963250-0364-4F7B-9B0C-51265261991E@benettiengineering.com> Hi Neal, Luca, > Il giorno 23 feb 2022, alle ore 18:04, Luca Ceresoli ha scritto: > > ?Hi Neal, > >> On 23/02/22 15:30, Neal Frager wrote: >> Hi Peter, >> >> +++ b/board/zynqmp/zcu106/uboot-fragment.config >> @@ -0,0 +1,2 @@ >> +CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu106-revA" >> + >> >> I tried your method of creating a uboot fragment config that just modifies the CONFIG_DEFAULT_DEVICE_TREE. >> >> However, when I build, I get the following error: >> >> Device Tree Source (arch/arm/dts/unset.dtb) is not correctly specified. >> Please define 'CONFIG_DEFAULT_DEVICE_TREE' >> or build with 'DEVICE_TREE=' argument > > Strange, I just run a build with current master + your patch and it > succeeded. > >> I can see that the U-Boot .config is correctly modified with >> CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu106-revA" > > Here too. > > Maybe try a completely clean build. What I usually do is > > git clean -xdf # similar to 'make clean' but faster > make zynqmp_zcu106_defconfig > make > > And why not, do it in docker. You can also do: $ make O=../output-zynqmp-zcu106 $ cd ../output-zynqmp-zcu106 $ make This way you keep the build folder separated from the buildroot source code. I always do that way because it?s easier to search in buildroot folder then without the need to filter out the output directory. Maybe we should implement this in utils/docker-run by passing an argument, so we don?t pollute buildroot folder. What about that Luca and All? Best regards Giulio > > -- > Luca > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From nealf at xilinx.com Wed Feb 23 17:17:37 2022 From: nealf at xilinx.com (Neal Frager) Date: Wed, 23 Feb 2022 17:17:37 +0000 Subject: [Buildroot] [PATCH v1 1/1] configs/zynqmp_zcu10x: fix U-Boot dts config In-Reply-To: <878ru15x9p.fsf@dell.be.48ers.dk> References: <20220223125118.2325363-1-neal.frager@xilinx.com> <878ru15x9p.fsf@dell.be.48ers.dk> Message-ID: Hi Peter, Luca, > Are you sure you are using a clean Buildroot tree? It works here with your patch applied. > Easiest way to check is to just do something like: > make O=output-test zynqmp_zcu106_defconfig make O=output-test uboot-menuconfig > And then scroll down to 'Device Tree Control' and verify that you have: > (zynqmp-zcu106-revA) Default Device Tree for DT control That is good news that it works on your end. I have just started a fully clean build to verify. Once complete, I will submit a second version of the patch removing the version bumps and unnecessary blank lines. Best regards, Neal Frager Xilinx From fperrad at gmail.com Wed Feb 23 17:28:17 2022 From: fperrad at gmail.com (Francois Perrad) Date: Wed, 23 Feb 2022 18:28:17 +0100 Subject: [Buildroot] [PATCH] package/gnutls: security bump to version 3.7.3 Message-ID: <20220223172817.3002782-1-francois.perrad@gadz.org> see https://www.gnutls.org/security-new.html#GNUTLS-SA-2022-01-17 Signed-off-by: Francois Perrad --- package/gnutls/gnutls.hash | 4 ++-- package/gnutls/gnutls.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gnutls/gnutls.hash b/package/gnutls/gnutls.hash index 5d4fd1a0d..2ffc6c1b4 100644 --- a/package/gnutls/gnutls.hash +++ b/package/gnutls/gnutls.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/gnutls-3.7.2.tar.xz.sig -sha256 646e6c5a9a185faa4cea796d378a1ba8e1148dbb197ca6605f95986a25af2752 gnutls-3.7.2.tar.xz +# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/gnutls-3.7.3.tar.xz.sig +sha256 fc59c43bc31ab20a6977ff083029277a31935b8355ce387b634fa433f8f6c49a gnutls-3.7.3.tar.xz # Locally calculated sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b doc/COPYING sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 doc/COPYING.LESSER diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index dbf759385..7317a3bb1 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -5,7 +5,7 @@ ################################################################################ GNUTLS_VERSION_MAJOR = 3.7 -GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).2 +GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).3 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz GNUTLS_SITE = https://www.gnupg.org/ftp/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR) GNUTLS_LICENSE = LGPL-2.1+ (core library) -- 2.32.0 From neal.frager at xilinx.com Wed Feb 23 17:39:38 2022 From: neal.frager at xilinx.com (Neal Frager) Date: Wed, 23 Feb 2022 10:39:38 -0700 Subject: [Buildroot] [PATCH v2 1/1] configs/zynqmp_zcu10x: fix U-Boot dts config Message-ID: <20220223173938.3307529-1-neal.frager@xilinx.com> This patch: - fixes U-Boot issue when DEVICE_TREE environment variable is not defined Signed-off-by: Neal Frager Reviewed-by: Peter Korsgaard Reviewed-by: Luca Ceresoli Tested-by: Peter Korsgaard --- V1->V2: - removed version bumps from patch - removed unnecessary blank lines from uboot-fragment.config files --- --- board/zynqmp/zcu102/uboot-fragment.config | 1 + board/zynqmp/zcu106/uboot-fragment.config | 1 + configs/zynqmp_zcu102_defconfig | 1 + configs/zynqmp_zcu106_defconfig | 1 + 4 files changed, 4 insertions(+) create mode 100644 board/zynqmp/zcu102/uboot-fragment.config create mode 100644 board/zynqmp/zcu106/uboot-fragment.config diff --git a/board/zynqmp/zcu102/uboot-fragment.config b/board/zynqmp/zcu102/uboot-fragment.config new file mode 100644 index 0000000000..52d6d9dff8 --- /dev/null +++ b/board/zynqmp/zcu102/uboot-fragment.config @@ -0,0 +1 @@ +CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu102-rev1.0" diff --git a/board/zynqmp/zcu106/uboot-fragment.config b/board/zynqmp/zcu106/uboot-fragment.config new file mode 100644 index 0000000000..cd571171ac --- /dev/null +++ b/board/zynqmp/zcu106/uboot-fragment.config @@ -0,0 +1 @@ +CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu106-revA" diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig index 298ce2388c..88e84fe791 100644 --- a/configs/zynqmp_zcu102_defconfig +++ b/configs/zynqmp_zcu102_defconfig @@ -25,6 +25,7 @@ BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2022.01-165-g667001319cbe511ce6353195fb4910ae5cb041ce" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/zcu102/uboot-fragment.config" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index 3e51cbfaab..836e050df4 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -25,6 +25,7 @@ BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2022.01-165-g667001319cbe511ce6353195fb4910ae5cb041ce" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/zcu102/uboot-fragment.config" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y -- 2.17.1 From nealf at xilinx.com Wed Feb 23 17:43:48 2022 From: nealf at xilinx.com (Neal Frager) Date: Wed, 23 Feb 2022 17:43:48 +0000 Subject: [Buildroot] [PATCH v2 1/1] configs/zynqmp_zcu10x: fix U-Boot dts config In-Reply-To: <20220223173938.3307529-1-neal.frager@xilinx.com> References: <20220223173938.3307529-1-neal.frager@xilinx.com> Message-ID: I just noticed a typo on the zynqmp_zcu106_defconfig. I will fix this with v3. From guillaume.bressaix at gmail.com Wed Feb 23 17:51:59 2022 From: guillaume.bressaix at gmail.com (Guillaume Bres) Date: Wed, 23 Feb 2022 18:51:59 +0100 Subject: [Buildroot] [v3] package/ntpsec: new package Message-ID: Hello Peter, sorry for the delayed test, the usual "busy on too many things". Today I ran the current patch serie on "zedboard_defconfig": everything works fine but SYNC is never fully acquired. The estimated "offsets" from the pool is close to 2^32 (limit?), jitter is large, delay is realistic, but those values never get averaged out. What do you think is going on? I don't think it's related to our work but to the demon itself. v1_2_1 is fairly old, I hope they provide a new tag soon because a lot of a work has been accomplished in the meantime. At work we use our custom fork (for custom encryption), I rebased to master last week, I have never experienced such behavior. Guillaume W. Bres Software engineer -------------- next part -------------- An HTML attachment was scrubbed... URL: From neal.frager at xilinx.com Wed Feb 23 17:54:06 2022 From: neal.frager at xilinx.com (Neal Frager) Date: Wed, 23 Feb 2022 10:54:06 -0700 Subject: [Buildroot] [PATCH v3 1/1] configs/zynqmp_zcu10x: fix U-Boot dts config Message-ID: <20220223175406.3347267-1-neal.frager@xilinx.com> Signed-off-by: Neal Frager --- board/zynqmp/zcu102/uboot-fragment.config | 1 + board/zynqmp/zcu106/uboot-fragment.config | 1 + configs/zynqmp_zcu102_defconfig | 1 + configs/zynqmp_zcu106_defconfig | 1 + 4 files changed, 4 insertions(+) create mode 100644 board/zynqmp/zcu102/uboot-fragment.config create mode 100644 board/zynqmp/zcu106/uboot-fragment.config diff --git a/board/zynqmp/zcu102/uboot-fragment.config b/board/zynqmp/zcu102/uboot-fragment.config new file mode 100644 index 0000000000..52d6d9dff8 --- /dev/null +++ b/board/zynqmp/zcu102/uboot-fragment.config @@ -0,0 +1 @@ +CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu102-rev1.0" diff --git a/board/zynqmp/zcu106/uboot-fragment.config b/board/zynqmp/zcu106/uboot-fragment.config new file mode 100644 index 0000000000..cd571171ac --- /dev/null +++ b/board/zynqmp/zcu106/uboot-fragment.config @@ -0,0 +1 @@ +CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu106-revA" diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig index 298ce2388c..88e84fe791 100644 --- a/configs/zynqmp_zcu102_defconfig +++ b/configs/zynqmp_zcu102_defconfig @@ -25,6 +25,7 @@ BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2022.01-165-g667001319cbe511ce6353195fb4910ae5cb041ce" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/zcu102/uboot-fragment.config" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index 3e51cbfaab..81f625a73b 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -25,6 +25,7 @@ BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2022.01-165-g667001319cbe511ce6353195fb4910ae5cb041ce" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/zcu106/uboot-fragment.config" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y -- 2.17.1 From wbx at openadk.org Wed Feb 23 17:55:35 2022 From: wbx at openadk.org (Waldemar Brodkorb) Date: Wed, 23 Feb 2022 18:55:35 +0100 Subject: [Buildroot] [PATCHv3 1/3] package/binutils: add version 2.38 Message-ID: See: https://sourceware.org/pipermail/binutils/2022-February/119721.html i386-Allow-GOT32-relocations-against-ABS-symbols.patch is not required as it is in release. Signed-off-by: Waldemar Brodkorb --- v1->v2: add a comment about i386 patch v2->v3: add ppc patch from binutils-2.38 branch fixing kernel compile --- package/binutils/2.38/0001-sh-conf.patch | 48 +++ .../2.38/0002-poison-system-directories.patch | 306 ++++++++++++++++++ ...or1k-fix-building-with-gcc-version-5.patch | 50 +++ ...K_GOT16-signed-overflow-by-using-spe.patch | 75 +++++ ...binutils-2.38-vs.-ppc32-linux-kernel.patch | 55 ++++ package/binutils/Config.in.host | 7 + package/binutils/binutils.hash | 1 + 7 files changed, 542 insertions(+) create mode 100644 package/binutils/2.38/0001-sh-conf.patch create mode 100644 package/binutils/2.38/0002-poison-system-directories.patch create mode 100644 package/binutils/2.38/0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch create mode 100644 package/binutils/2.38/0004-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch create mode 100644 package/binutils/2.38/0005-binutils-2.38-vs.-ppc32-linux-kernel.patch diff --git a/package/binutils/2.38/0001-sh-conf.patch b/package/binutils/2.38/0001-sh-conf.patch new file mode 100644 index 0000000000..fcc597e4d9 --- /dev/null +++ b/package/binutils/2.38/0001-sh-conf.patch @@ -0,0 +1,48 @@ +From 33f3c1f804efc2e4f97849081589efb70cda31e5 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 25 Dec 2015 11:38:13 +0100 +Subject: [PATCH] sh-conf + +Likewise, binutils has no idea about any of these new targets either, so we +fix that up too.. now we're able to actually build a real toolchain for +sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more +inept targets than that one, really. Go look, I promise). + +[Romain: rebase on top of 2.32] +Signed-off-by: Romain Naour +[Thomas: rebase on top of 2.29, in which sh64 support was removed.] +Signed-off-by: Thomas Petazzoni +--- + configure | 2 +- + configure.ac | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 3dd206525a7..6881ce632f5 100755 +--- a/configure ++++ b/configure +@@ -3892,7 +3892,7 @@ case "${target}" in + nvptx*-*-*) + noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" + ;; +- sh-*-*) ++ sh*-*-*) + case "${target}" in + sh*-*-elf) + ;; +diff --git a/configure.ac b/configure.ac +index 797a624621e..1f9256bbf18 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1175,7 +1175,7 @@ case "${target}" in + nvptx*-*-*) + noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" + ;; +- sh-*-*) ++ sh*-*-*) + case "${target}" in + sh*-*-elf) + ;; +-- +2.31.1 + diff --git a/package/binutils/2.38/0002-poison-system-directories.patch b/package/binutils/2.38/0002-poison-system-directories.patch new file mode 100644 index 0000000000..1a5fe46575 --- /dev/null +++ b/package/binutils/2.38/0002-poison-system-directories.patch @@ -0,0 +1,306 @@ +From 4d8705ddb55897e8a74b617ab95736d520d9e1ea Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 25 Dec 2015 11:45:38 +0100 +Subject: [PATCH] poison-system-directories + +Patch adapted to binutils 2.23.2 and extended to use +BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni. + +[Romain: rebase on top of 2.33.1] +Signed-off-by: Romain Naour +[Gustavo: adapt to binutils 2.25] +Signed-off-by: Thomas Petazzoni +Signed-off-by: Gustavo Zacarias + +Upstream-Status: Inappropriate [distribution: codesourcery] + +Patch originally created by Mark Hatle, forward-ported to +binutils 2.21 by Scott Garman. + +purpose: warn for uses of system directories when cross linking + +Code Merged from Sourcery G++ binutils 2.19 - 4.4-277 + +2008-07-02 Joseph Myers + + ld/ + * ld.h (args_type): Add error_poison_system_directories. + * ld.texinfo (--error-poison-system-directories): Document. + * ldfile.c (ldfile_add_library_path): Check + command_line.error_poison_system_directories. + * ldmain.c (main): Initialize + command_line.error_poison_system_directories. + * lexsup.c (enum option_values): Add + OPTION_ERROR_POISON_SYSTEM_DIRECTORIES. + (ld_options): Add --error-poison-system-directories. + (parse_args): Handle new option. + +2007-06-13 Joseph Myers + + ld/ + * config.in: Regenerate. + * ld.h (args_type): Add poison_system_directories. + * ld.texinfo (--no-poison-system-directories): Document. + * ldfile.c (ldfile_add_library_path): Check + command_line.poison_system_directories. + * ldmain.c (main): Initialize + command_line.poison_system_directories. + * lexsup.c (enum option_values): Add + OPTION_NO_POISON_SYSTEM_DIRECTORIES. + (ld_options): Add --no-poison-system-directories. + (parse_args): Handle new option. + +2007-04-20 Joseph Myers + + Merge from Sourcery G++ binutils 2.17: + + 2007-03-20 Joseph Myers + Based on patch by Mark Hatle . + ld/ + * configure.ac (--enable-poison-system-directories): New option. + * configure, config.in: Regenerate. + * ldfile.c (ldfile_add_library_path): If + ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib, + /usr/lib, /usr/local/lib or /usr/X11R6/lib. + +Signed-off-by: Mark Hatle +Signed-off-by: Scott Garman +--- + ld/config.in | 3 +++ + ld/configure | 14 ++++++++++++++ + ld/configure.ac | 10 ++++++++++ + ld/ld.h | 8 ++++++++ + ld/ld.texi | 12 ++++++++++++ + ld/ldfile.c | 17 +++++++++++++++++ + ld/ldlex.h | 2 ++ + ld/ldmain.c | 2 ++ + ld/lexsup.c | 21 +++++++++++++++++++++ + 9 files changed, 89 insertions(+) + +diff --git a/ld/config.in b/ld/config.in +index 26d55a00d47..ffad464783c 100644 +--- a/ld/config.in ++++ b/ld/config.in +@@ -43,6 +43,9 @@ + language is requested. */ + #undef ENABLE_NLS + ++/* Define to warn for use of native system library directories */ ++#undef ENABLE_POISON_SYSTEM_DIRECTORIES ++ + /* Additional extension a shared object might have. */ + #undef EXTRA_SHLIB_EXTENSION + +diff --git a/ld/configure b/ld/configure +index c197aaef3cb..882263aa43f 100755 +--- a/ld/configure ++++ b/ld/configure +@@ -829,6 +829,7 @@ with_lib_path + enable_targets + enable_64_bit_bfd + with_sysroot ++enable_poison_system_directories + enable_gold + enable_got + enable_compressed_debug_sections +@@ -1498,6 +1499,8 @@ Optional Features: + --enable-checking enable run-time checks + --enable-targets alternative target configurations + --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) ++ --enable-poison-system-directories ++ warn for use of native system library directories + --enable-gold[=ARG] build gold [ARG={default,yes,no}] + --enable-got= GOT handling scheme (target, single, negative, + multigot) +@@ -15236,7 +15239,18 @@ else + fi + + ++# Check whether --enable-poison-system-directories was given. ++if test "${enable_poison_system_directories+set}" = set; then : ++ enableval=$enable_poison_system_directories; ++else ++ enable_poison_system_directories=no ++fi ++ ++if test "x${enable_poison_system_directories}" = "xyes"; then + ++$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h ++ ++fi + + # Check whether --enable-got was given. + if test "${enable_got+set}" = set; then : +diff --git a/ld/configure.ac b/ld/configure.ac +index 8ea97c43cd4..0f246db67d8 100644 +--- a/ld/configure.ac ++++ b/ld/configure.ac +@@ -106,6 +106,16 @@ AC_SUBST(use_sysroot) + AC_SUBST(TARGET_SYSTEM_ROOT) + AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) + ++AC_ARG_ENABLE([poison-system-directories], ++ AS_HELP_STRING([--enable-poison-system-directories], ++ [warn for use of native system library directories]),, ++ [enable_poison_system_directories=no]) ++if test "x${enable_poison_system_directories}" = "xyes"; then ++ AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES], ++ [1], ++ [Define to warn for use of native system library directories]) ++fi ++ + dnl Use --enable-gold to decide if this linker should be the default. + dnl "install_as_default" is set to false if gold is the default linker. + dnl "installed_linker" is the installed BFD linker name. +diff --git a/ld/ld.h b/ld/ld.h +index 35fafebfaed..74e66405de6 100644 +--- a/ld/ld.h ++++ b/ld/ld.h +@@ -162,6 +162,14 @@ typedef struct + in the linker script. */ + bool force_group_allocation; + ++ /* If TRUE (the default) warn for uses of system directories when ++ cross linking. */ ++ bool poison_system_directories; ++ ++ /* If TRUE (default FALSE) give an error for uses of system ++ directories when cross linking instead of a warning. */ ++ bool error_poison_system_directories; ++ + /* Big or little endian as set on command line. */ + enum endian_enum endian; + +diff --git a/ld/ld.texi b/ld/ld.texi +index dd8f571d4e4..3ab210b41b9 100644 +--- a/ld/ld.texi ++++ b/ld/ld.texi +@@ -2863,6 +2863,18 @@ string identifying the original linked file does not change. + + Passing @code{none} for @var{style} disables the setting from any + @code{--build-id} options earlier on the command line. ++ ++ at kindex --no-poison-system-directories ++ at item --no-poison-system-directories ++Do not warn for @option{-L} options using system directories such as ++ at file{/usr/lib} when cross linking. This option is intended for use ++in chroot environments when such directories contain the correct ++libraries for the target system rather than the host. ++ ++ at kindex --error-poison-system-directories ++ at item --error-poison-system-directories ++Give an error instead of a warning for @option{-L} options using ++system directories when cross linking. + @end table + + @c man end +diff --git a/ld/ldfile.c b/ld/ldfile.c +index 9d0af06f1f6..7cdd3b1c1b1 100644 +--- a/ld/ldfile.c ++++ b/ld/ldfile.c +@@ -117,6 +117,23 @@ ldfile_add_library_path (const char *name, bool cmdline) + new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); + else + new_dirs->name = xstrdup (name); ++ ++#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES ++ if (command_line.poison_system_directories ++ && ((!strncmp (name, "/lib", 4)) ++ || (!strncmp (name, "/usr/lib", 8)) ++ || (!strncmp (name, "/usr/local/lib", 14)) ++ || (!strncmp (name, "/usr/X11R6/lib", 14)))) ++ { ++ if (command_line.error_poison_system_directories) ++ einfo (_("%X%P: error: library search path \"%s\" is unsafe for " ++ "cross-compilation\n"), name); ++ else ++ einfo (_("%P: warning: library search path \"%s\" is unsafe for " ++ "cross-compilation\n"), name); ++ } ++#endif ++ + } + + /* Try to open a BFD for a lang_input_statement. */ +diff --git a/ld/ldlex.h b/ld/ldlex.h +index 9e8bf5fb835..2f0fadfe0a3 100644 +--- a/ld/ldlex.h ++++ b/ld/ldlex.h +@@ -163,6 +163,8 @@ enum option_values + OPTION_CTF_VARIABLES, + OPTION_NO_CTF_VARIABLES, + OPTION_CTF_SHARE_TYPES, ++ OPTION_NO_POISON_SYSTEM_DIRECTORIES, ++ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, + }; + + /* The initial parser states. */ +diff --git a/ld/ldmain.c b/ld/ldmain.c +index 42660eb9a3c..1aef9387f93 100644 +--- a/ld/ldmain.c ++++ b/ld/ldmain.c +@@ -321,6 +321,8 @@ main (int argc, char **argv) + command_line.warn_mismatch = true; + command_line.warn_search_mismatch = true; + command_line.check_section_addresses = -1; ++ command_line.poison_system_directories = true; ++ command_line.error_poison_system_directories = false; + + /* We initialize DEMANGLING based on the environment variable + COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the +diff --git a/ld/lexsup.c b/ld/lexsup.c +index 00274c500d0..4f23b3a2da2 100644 +--- a/ld/lexsup.c ++++ b/ld/lexsup.c +@@ -595,6 +595,14 @@ static const struct ld_option ld_options[] = + " is: share-unconflicted (default),\n" + " share-duplicated"), + TWO_DASHES }, ++ { {"no-poison-system-directories", no_argument, NULL, ++ OPTION_NO_POISON_SYSTEM_DIRECTORIES}, ++ '\0', NULL, N_("Do not warn for -L options using system directories"), ++ TWO_DASHES }, ++ { {"error-poison-system-directories", no_argument, NULL, ++ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES}, ++ '\0', NULL, N_("Give an error for -L options using system directories"), ++ TWO_DASHES }, + }; + + #define OPTION_COUNT ARRAY_SIZE (ld_options) +@@ -607,6 +615,7 @@ parse_args (unsigned argc, char **argv) + int ingroup = 0; + char *default_dirlist = NULL; + char *shortopts; ++ char *BR_paranoid_env; + struct option *longopts; + struct option *really_longopts; + int last_optind; +@@ -1643,6 +1652,14 @@ parse_args (unsigned argc, char **argv) + } + break; + ++ case OPTION_NO_POISON_SYSTEM_DIRECTORIES: ++ command_line.poison_system_directories = false; ++ break; ++ ++ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: ++ command_line.error_poison_system_directories = true; ++ break; ++ + case OPTION_PUSH_STATE: + input_flags.pushed = xmemdup (&input_flags, + sizeof (input_flags), +@@ -1788,6 +1805,10 @@ parse_args (unsigned argc, char **argv) + command_line.soname = NULL; + } + ++ BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH"); ++ if (BR_paranoid_env && strlen(BR_paranoid_env) > 0) ++ command_line.error_poison_system_directories = true; ++ + while (ingroup) + { + einfo (_("%P: missing --end-group; added as last command line option\n")); +-- +2.31.1 + diff --git a/package/binutils/2.38/0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch b/package/binutils/2.38/0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch new file mode 100644 index 0000000000..bfd531b818 --- /dev/null +++ b/package/binutils/2.38/0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch @@ -0,0 +1,50 @@ +From ef4ba1da823e8366ea4f126f50885a44ebf4dcf0 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Wed, 9 Jun 2021 17:28:27 +0200 +Subject: [PATCH] bfd/elf32-or1k: fix building with gcc version < 5 + +Gcc version >= 5 has standard C mode not set to -std=gnu11, so if we use +an old compiler(i.e. gcc 4.9) build fails on: +``` +elf32-or1k.c:2251:3: error: 'for' loop initial declarations are only allowed in +C99 or C11 mode + for (size_t i = 0; i < insn_count; i++) + ^ +``` + +So let's declare `size_t i` at the top of the function instead of inside +for loop. + +Signed-off-by: Giulio Benetti +--- + bfd/elf32-or1k.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c +index 4ae7f324d33..32063ab0289 100644 +--- a/bfd/elf32-or1k.c ++++ b/bfd/elf32-or1k.c +@@ -2244,9 +2244,10 @@ or1k_write_plt_entry (bfd *output_bfd, bfd_byte *contents, unsigned insnj, + { + unsigned nodelay = elf_elfheader (output_bfd)->e_flags & EF_OR1K_NODELAY; + unsigned output_insns[PLT_MAX_INSN_COUNT]; ++ size_t i; + + /* Copy instructions into the output buffer. */ +- for (size_t i = 0; i < insn_count; i++) ++ for (i = 0; i < insn_count; i++) + output_insns[i] = insns[i]; + + /* Honor the no-delay-slot setting. */ +@@ -2277,7 +2278,7 @@ or1k_write_plt_entry (bfd *output_bfd, bfd_byte *contents, unsigned insnj, + } + + /* Write out the output buffer. */ +- for (size_t i = 0; i < (insn_count+1); i++) ++ for (i = 0; i < (insn_count+1); i++) + bfd_put_32 (output_bfd, output_insns[i], contents + (i*4)); + } + +-- +2.31.1 + diff --git a/package/binutils/2.38/0004-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch b/package/binutils/2.38/0004-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch new file mode 100644 index 0000000000..8609db95b7 --- /dev/null +++ b/package/binutils/2.38/0004-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 + diff --git a/package/binutils/2.38/0005-binutils-2.38-vs.-ppc32-linux-kernel.patch b/package/binutils/2.38/0005-binutils-2.38-vs.-ppc32-linux-kernel.patch new file mode 100644 index 0000000000..c62652c95f --- /dev/null +++ b/package/binutils/2.38/0005-binutils-2.38-vs.-ppc32-linux-kernel.patch @@ -0,0 +1,55 @@ +From ed9b2e40ebffec835d63473367da8dd8f80d7d5b Mon Sep 17 00:00:00 2001 +From: Alan Modra +Date: Mon, 21 Feb 2022 10:58:57 +1030 +Subject: [PATCH] binutils 2.38 vs. ppc32 linux kernel + +Commit b25f942e18d6 made .machine more strict. Weaken it again. + + * config/tc-ppc.c (ppc_machine): Treat an early .machine specially, + keeping sticky options to work around gcc bugs. + +(cherry picked from commit cebc89b9328eab994f6b0314c263f94e7949a553) +Signed-off-by: Waldemar Brodkorb +--- + gas/config/tc-ppc.c | 25 ++++++++++++++++++++++++- + 1 file changed, 24 insertions(+), 1 deletion(-) + +diff --git a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c +index 054f9c72161..89bc7d3f9b9 100644 +--- a/gas/config/tc-ppc.c ++++ b/gas/config/tc-ppc.c +@@ -5965,7 +5965,30 @@ ppc_machine (int ignore ATTRIBUTE_UNUSED) + options do not count as a new machine, instead they add + to currently selected opcodes. */ + ppc_cpu_t machine_sticky = 0; +- new_cpu = ppc_parse_cpu (ppc_cpu, &machine_sticky, cpu_string); ++ /* Unfortunately, some versions of gcc emit a .machine ++ directive very near the start of the compiler's assembly ++ output file. This is bad because it overrides user -Wa ++ cpu selection. Worse, there are versions of gcc that ++ emit the *wrong* cpu, not even respecting the -mcpu given ++ to gcc. See gcc pr101393. And to compound the problem, ++ as of 20220222 gcc doesn't pass the correct cpu option to ++ gas on the command line. See gcc pr59828. Hack around ++ this by keeping sticky options for an early .machine. */ ++ asection *sec; ++ for (sec = stdoutput->sections; sec != NULL; sec = sec->next) ++ { ++ segment_info_type *info = seg_info (sec); ++ /* Are the frags for this section perturbed from their ++ initial state? Even .align will count here. */ ++ if (info != NULL ++ && (info->frchainP->frch_root != info->frchainP->frch_last ++ || info->frchainP->frch_root->fr_type != rs_fill ++ || info->frchainP->frch_root->fr_fix != 0)) ++ break; ++ } ++ new_cpu = ppc_parse_cpu (ppc_cpu, ++ sec == NULL ? &sticky : &machine_sticky, ++ cpu_string); + if (new_cpu != 0) + ppc_cpu = new_cpu; + else +-- +2.30.2 + diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index ea1f020989..17de6e4e41 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -36,6 +36,12 @@ config BR2_BINUTILS_VERSION_2_37_X # https://github.com/uclinux-dev/elf2flt/issues/12 depends on !BR2_BINFMT_FLAT +config BR2_BINUTILS_VERSION_2_38_X + bool "binutils 2.38" + # https://github.com/uclinux-dev/elf2flt/pull/16 + # https://github.com/uclinux-dev/elf2flt/issues/12 + depends on !BR2_BINFMT_FLAT + config BR2_BINUTILS_VERSION_ARC bool "binutils arc (2.34.50)" depends on BR2_arc @@ -49,6 +55,7 @@ config BR2_BINUTILS_VERSION default "2.35.2" if BR2_BINUTILS_VERSION_2_35_X default "2.36.1" if BR2_BINUTILS_VERSION_2_36_X default "2.37" if BR2_BINUTILS_VERSION_2_37_X + default "2.38" if BR2_BINUTILS_VERSION_2_38_X config BR2_BINUTILS_ENABLE_LTO bool diff --git a/package/binutils/binutils.hash b/package/binutils/binutils.hash index d1be6cbce8..fe31b34d40 100644 --- a/package/binutils/binutils.hash +++ b/package/binutils/binutils.hash @@ -3,6 +3,7 @@ sha512 d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724a sha512 9974ede5978d32e0d68fef23da48fa00bd06b0bff7ec45b00ca075c126d6bbe0cf2defc03ecc3f17bc6cc85b64271a13009c4049d7ba17de26e84e3a6e2c0348 binutils-2.35.2.tar.xz sha512 cc24590bcead10b90763386b6f96bb027d7594c659c2d95174a6352e8b98465a50ec3e4088d0da038428abe059bbc4ae5f37b269f31a40fc048072c8a234f4e9 binutils-2.36.1.tar.xz sha512 5c11aeef6935860a6819ed3a3c93371f052e52b4bdc5033da36037c1544d013b7f12cb8d561ec954fe7469a68f1b66f1a3cd53d5a3af7293635a90d69edd15e7 binutils-2.37.tar.xz +sha512 8bf0b0d193c9c010e0518ee2b2e5a830898af206510992483b427477ed178396cd210235e85fd7bd99a96fc6d5eedbeccbd48317a10f752b7336ada8b2bb826d binutils-2.38.tar.xz # Locally calculated (fetched from Github) sha512 76a8227a19218435319c660e4983ea17985194b7f496f163e97543e7f6fd3e9249241fdc05a16ba512fba96a1d846c1f7b080983404d821d6215f10e7f11e238 binutils-gdb-arc-2020.09-release.tar.gz -- 2.30.2 From wbx at openadk.org Wed Feb 23 17:58:17 2022 From: wbx at openadk.org (Waldemar Brodkorb) Date: Wed, 23 Feb 2022 18:58:17 +0100 Subject: [Buildroot] [PATCHv3 2/3] package/binutils: remove 2.35.2 Message-ID: Signed-off-by: Waldemar Brodkorb --- v1->v2: remove the patch folder, recognized by Thomas P. v2->v3: no change --- package/binutils/2.35.2/0001-sh-conf.patch | 48 -- .../0002-poison-system-directories.patch | 306 ----------- ...ith-plt-link-failure-for-local-calls.patch | 59 --- ...elocation-R_OR1K_GOT_AHI16-for-gotha.patch | 256 --------- ...K_GOT16-overflow-failures-in-presenc.patch | 61 --- ...ge-plt_relocs-when-generating-plt-en.patch | 500 ------------------ ...or1k-fix-building-with-gcc-version-5.patch | 50 -- ...tive-relocation-against-dynamic-on-P.patch | 59 --- ...K_GOT16-signed-overflow-by-using-spe.patch | 75 --- ...OT32-relocations-against-ABS-symbols.patch | 46 -- package/binutils/Config.in.host | 8 - package/binutils/binutils.hash | 1 - 12 files changed, 1469 deletions(-) delete mode 100644 package/binutils/2.35.2/0001-sh-conf.patch delete mode 100644 package/binutils/2.35.2/0002-poison-system-directories.patch delete mode 100644 package/binutils/2.35.2/0003-or1k-Fix-issue-with-plt-link-failure-for-local-calls.patch delete mode 100644 package/binutils/2.35.2/0004-or1k-Implement-relocation-R_OR1K_GOT_AHI16-for-gotha.patch delete mode 100644 package/binutils/2.35.2/0005-or1k-Avoid-R_OR1K_GOT16-overflow-failures-in-presenc.patch delete mode 100644 package/binutils/2.35.2/0006-or1k-Support-large-plt_relocs-when-generating-plt-en.patch delete mode 100644 package/binutils/2.35.2/0007-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch delete mode 100644 package/binutils/2.35.2/0008-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch delete mode 100644 package/binutils/2.35.2/0009-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch delete mode 100644 package/binutils/2.35.2/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch diff --git a/package/binutils/2.35.2/0001-sh-conf.patch b/package/binutils/2.35.2/0001-sh-conf.patch deleted file mode 100644 index 44d5f4e89a..0000000000 --- a/package/binutils/2.35.2/0001-sh-conf.patch +++ /dev/null @@ -1,48 +0,0 @@ -From ae50e875f4292c99b859cded1d036e401b6ddaec Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:38:13 +0100 -Subject: [PATCH] sh-conf - -Likewise, binutils has no idea about any of these new targets either, so we -fix that up too.. now we're able to actually build a real toolchain for -sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more -inept targets than that one, really. Go look, I promise). - -[Romain: rebase on top of 2.32] -Signed-off-by: Romain Naour -[Thomas: rebase on top of 2.29, in which sh64 support was removed.] -Signed-off-by: Thomas Petazzoni ---- - configure | 2 +- - configure.ac | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure b/configure -index 54d0339ab9e..c2f51ffcebb 100755 ---- a/configure -+++ b/configure -@@ -3937,7 +3937,7 @@ case "${target}" in - nvptx*-*-*) - noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" - ;; -- sh-*-*) -+ sh*-*-*) - case "${target}" in - sh*-*-elf) - ;; -diff --git a/configure.ac b/configure.ac -index a910c4fd6ba..a93d93c81c3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1178,7 +1178,7 @@ case "${target}" in - nvptx*-*-*) - noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" - ;; -- sh-*-*) -+ sh*-*-*) - case "${target}" in - sh*-*-elf) - ;; --- -2.25.4 - diff --git a/package/binutils/2.35.2/0002-poison-system-directories.patch b/package/binutils/2.35.2/0002-poison-system-directories.patch deleted file mode 100644 index b77a5e1a66..0000000000 --- a/package/binutils/2.35.2/0002-poison-system-directories.patch +++ /dev/null @@ -1,306 +0,0 @@ -From db405d1bc5607892ddb25433354b46d78e23b343 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:45:38 +0100 -Subject: [PATCH] poison-system-directories - -Patch adapted to binutils 2.23.2 and extended to use -BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni. - -[Romain: rebase on top of 2.33.1] -Signed-off-by: Romain Naour -[Gustavo: adapt to binutils 2.25] -Signed-off-by: Thomas Petazzoni -Signed-off-by: Gustavo Zacarias - -Upstream-Status: Inappropriate [distribution: codesourcery] - -Patch originally created by Mark Hatle, forward-ported to -binutils 2.21 by Scott Garman. - -purpose: warn for uses of system directories when cross linking - -Code Merged from Sourcery G++ binutils 2.19 - 4.4-277 - -2008-07-02 Joseph Myers - - ld/ - * ld.h (args_type): Add error_poison_system_directories. - * ld.texinfo (--error-poison-system-directories): Document. - * ldfile.c (ldfile_add_library_path): Check - command_line.error_poison_system_directories. - * ldmain.c (main): Initialize - command_line.error_poison_system_directories. - * lexsup.c (enum option_values): Add - OPTION_ERROR_POISON_SYSTEM_DIRECTORIES. - (ld_options): Add --error-poison-system-directories. - (parse_args): Handle new option. - -2007-06-13 Joseph Myers - - ld/ - * config.in: Regenerate. - * ld.h (args_type): Add poison_system_directories. - * ld.texinfo (--no-poison-system-directories): Document. - * ldfile.c (ldfile_add_library_path): Check - command_line.poison_system_directories. - * ldmain.c (main): Initialize - command_line.poison_system_directories. - * lexsup.c (enum option_values): Add - OPTION_NO_POISON_SYSTEM_DIRECTORIES. - (ld_options): Add --no-poison-system-directories. - (parse_args): Handle new option. - -2007-04-20 Joseph Myers - - Merge from Sourcery G++ binutils 2.17: - - 2007-03-20 Joseph Myers - Based on patch by Mark Hatle . - ld/ - * configure.ac (--enable-poison-system-directories): New option. - * configure, config.in: Regenerate. - * ldfile.c (ldfile_add_library_path): If - ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib, - /usr/lib, /usr/local/lib or /usr/X11R6/lib. - -Signed-off-by: Mark Hatle -Signed-off-by: Scott Garman ---- - ld/config.in | 3 +++ - ld/configure | 14 ++++++++++++++ - ld/configure.ac | 10 ++++++++++ - ld/ld.h | 8 ++++++++ - ld/ld.texi | 12 ++++++++++++ - ld/ldfile.c | 17 +++++++++++++++++ - ld/ldlex.h | 2 ++ - ld/ldmain.c | 2 ++ - ld/lexsup.c | 21 +++++++++++++++++++++ - 9 files changed, 89 insertions(+) - -diff --git a/ld/config.in b/ld/config.in -index 2f4e5ea33e3..8fbb29682b2 100644 ---- a/ld/config.in -+++ b/ld/config.in -@@ -40,6 +40,9 @@ - language is requested. */ - #undef ENABLE_NLS - -+/* Define to warn for use of native system library directories */ -+#undef ENABLE_POISON_SYSTEM_DIRECTORIES -+ - /* Additional extension a shared object might have. */ - #undef EXTRA_SHLIB_EXTENSION - -diff --git a/ld/configure b/ld/configure -index 6be5280621f..d62e7b12382 100755 ---- a/ld/configure -+++ b/ld/configure -@@ -826,6 +826,7 @@ with_lib_path - enable_targets - enable_64_bit_bfd - with_sysroot -+enable_poison_system_directories - enable_gold - enable_got - enable_compressed_debug_sections -@@ -1493,6 +1494,8 @@ Optional Features: - --disable-largefile omit support for large files - --enable-targets alternative target configurations - --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) -+ --enable-poison-system-directories -+ warn for use of native system library directories - --enable-gold[=ARG] build gold [ARG={default,yes,no}] - --enable-got= GOT handling scheme (target, single, negative, - multigot) -@@ -15814,7 +15817,18 @@ else - fi - - -+# Check whether --enable-poison-system-directories was given. -+if test "${enable_poison_system_directories+set}" = set; then : -+ enableval=$enable_poison_system_directories; -+else -+ enable_poison_system_directories=no -+fi -+ -+if test "x${enable_poison_system_directories}" = "xyes"; then - -+$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h -+ -+fi - - # Check whether --enable-got was given. - if test "${enable_got+set}" = set; then : -diff --git a/ld/configure.ac b/ld/configure.ac -index 172398ff847..b77f8510ca6 100644 ---- a/ld/configure.ac -+++ b/ld/configure.ac -@@ -94,6 +94,16 @@ AC_SUBST(use_sysroot) - AC_SUBST(TARGET_SYSTEM_ROOT) - AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) - -+AC_ARG_ENABLE([poison-system-directories], -+ AS_HELP_STRING([--enable-poison-system-directories], -+ [warn for use of native system library directories]),, -+ [enable_poison_system_directories=no]) -+if test "x${enable_poison_system_directories}" = "xyes"; then -+ AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES], -+ [1], -+ [Define to warn for use of native system library directories]) -+fi -+ - dnl Use --enable-gold to decide if this linker should be the default. - dnl "install_as_default" is set to false if gold is the default linker. - dnl "installed_linker" is the installed BFD linker name. -diff --git a/ld/ld.h b/ld/ld.h -index 1790dc81a66..73f832eb169 100644 ---- a/ld/ld.h -+++ b/ld/ld.h -@@ -166,6 +166,14 @@ typedef struct - in the linker script. */ - bfd_boolean force_group_allocation; - -+ /* If TRUE (the default) warn for uses of system directories when -+ cross linking. */ -+ bfd_boolean poison_system_directories; -+ -+ /* If TRUE (default FALSE) give an error for uses of system -+ directories when cross linking instead of a warning. */ -+ bfd_boolean error_poison_system_directories; -+ - /* Big or little endian as set on command line. */ - enum endian_enum endian; - -diff --git a/ld/ld.texi b/ld/ld.texi -index 2a93e9456ac..3eeb70607fd 100644 ---- a/ld/ld.texi -+++ b/ld/ld.texi -@@ -2655,6 +2655,18 @@ string identifying the original linked file does not change. - - Passing @code{none} for @var{style} disables the setting from any - @code{--build-id} options earlier on the command line. -+ -+ at kindex --no-poison-system-directories -+ at item --no-poison-system-directories -+Do not warn for @option{-L} options using system directories such as -+ at file{/usr/lib} when cross linking. This option is intended for use -+in chroot environments when such directories contain the correct -+libraries for the target system rather than the host. -+ -+ at kindex --error-poison-system-directories -+ at item --error-poison-system-directories -+Give an error instead of a warning for @option{-L} options using -+system directories when cross linking. - @end table - - @c man end -diff --git a/ld/ldfile.c b/ld/ldfile.c -index e39170b5d94..fadc248a140 100644 ---- a/ld/ldfile.c -+++ b/ld/ldfile.c -@@ -117,6 +117,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline) - new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); - else - new_dirs->name = xstrdup (name); -+ -+#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES -+ if (command_line.poison_system_directories -+ && ((!strncmp (name, "/lib", 4)) -+ || (!strncmp (name, "/usr/lib", 8)) -+ || (!strncmp (name, "/usr/local/lib", 14)) -+ || (!strncmp (name, "/usr/X11R6/lib", 14)))) -+ { -+ if (command_line.error_poison_system_directories) -+ einfo (_("%X%P: error: library search path \"%s\" is unsafe for " -+ "cross-compilation\n"), name); -+ else -+ einfo (_("%P: warning: library search path \"%s\" is unsafe for " -+ "cross-compilation\n"), name); -+ } -+#endif -+ - } - - /* Try to open a BFD for a lang_input_statement. */ -diff --git a/ld/ldlex.h b/ld/ldlex.h -index 5ea083ebeb3..417f9b858ce 100644 ---- a/ld/ldlex.h -+++ b/ld/ldlex.h -@@ -155,6 +155,8 @@ enum option_values - OPTION_NON_CONTIGUOUS_REGIONS, - OPTION_NON_CONTIGUOUS_REGIONS_WARNINGS, - OPTION_DEPENDENCY_FILE, -+ OPTION_NO_POISON_SYSTEM_DIRECTORIES, -+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, - }; - - /* The initial parser states. */ -diff --git a/ld/ldmain.c b/ld/ldmain.c -index 08be9030cb5..92dc16399eb 100644 ---- a/ld/ldmain.c -+++ b/ld/ldmain.c -@@ -321,6 +321,8 @@ main (int argc, char **argv) - command_line.warn_mismatch = TRUE; - command_line.warn_search_mismatch = TRUE; - command_line.check_section_addresses = -1; -+ command_line.poison_system_directories = TRUE; -+ command_line.error_poison_system_directories = FALSE; - - /* We initialize DEMANGLING based on the environment variable - COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the -diff --git a/ld/lexsup.c b/ld/lexsup.c -index 6cab41cf5df..c497f36b148 100644 ---- a/ld/lexsup.c -+++ b/ld/lexsup.c -@@ -572,6 +572,14 @@ static const struct ld_option ld_options[] = - { {"no-print-map-discarded", no_argument, NULL, OPTION_NO_PRINT_MAP_DISCARDED}, - '\0', NULL, N_("Do not show discarded sections in map file output"), - TWO_DASHES }, -+ { {"no-poison-system-directories", no_argument, NULL, -+ OPTION_NO_POISON_SYSTEM_DIRECTORIES}, -+ '\0', NULL, N_("Do not warn for -L options using system directories"), -+ TWO_DASHES }, -+ { {"error-poison-system-directories", no_argument, NULL, -+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES}, -+ '\0', NULL, N_("Give an error for -L options using system directories"), -+ TWO_DASHES }, - }; - - #define OPTION_COUNT ARRAY_SIZE (ld_options) -@@ -584,6 +592,7 @@ parse_args (unsigned argc, char **argv) - int ingroup = 0; - char *default_dirlist = NULL; - char *shortopts; -+ char *BR_paranoid_env; - struct option *longopts; - struct option *really_longopts; - int last_optind; -@@ -1591,6 +1600,14 @@ parse_args (unsigned argc, char **argv) - } - break; - -+ case OPTION_NO_POISON_SYSTEM_DIRECTORIES: -+ command_line.poison_system_directories = FALSE; -+ break; -+ -+ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: -+ command_line.error_poison_system_directories = TRUE; -+ break; -+ - case OPTION_PUSH_STATE: - input_flags.pushed = xmemdup (&input_flags, - sizeof (input_flags), -@@ -1681,6 +1698,10 @@ parse_args (unsigned argc, char **argv) - command_line.soname = NULL; - } - -+ BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH"); -+ if (BR_paranoid_env && strlen(BR_paranoid_env) > 0) -+ command_line.error_poison_system_directories = TRUE; -+ - while (ingroup) - { - einfo (_("%P: missing --end-group; added as last command line option\n")); --- -2.25.4 - diff --git a/package/binutils/2.35.2/0003-or1k-Fix-issue-with-plt-link-failure-for-local-calls.patch b/package/binutils/2.35.2/0003-or1k-Fix-issue-with-plt-link-failure-for-local-calls.patch deleted file mode 100644 index 81fb6b8518..0000000000 --- a/package/binutils/2.35.2/0003-or1k-Fix-issue-with-plt-link-failure-for-local-calls.patch +++ /dev/null @@ -1,59 +0,0 @@ -From baf313f84b106a5a29f01796afd857e69abf8b08 Mon Sep 17 00:00:00 2001 -From: Stafford Horne -Date: Sun, 2 May 2021 06:02:14 +0900 -Subject: [PATCH] or1k: Fix issue with plt link failure for local calls - -When building protobuf we were seeing the assert failure: - - /home/giuliobenetti/git/upstream/or1k-binutils-2.36.1/host/lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: - BFD (GNU Binutils) 2.36.1 assertion fail elf32-or1k.c:2377 - /home/giuliobenetti/git/upstream/or1k-binutils-2.36.1/host/lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: - BFD (GNU Binutils) 2.36.1 assertion fail elf32-or1k.c:2377 - /home/giuliobenetti/git/upstream/or1k-binutils-2.36.1/host/lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: - BFD (GNU Binutils) 2.36.1 assertion fail elf32-or1k.c:2377 - collect2: error: ld returned 1 exit status - -This failure happens while writing out PLT entries, there is a check -"BFD_ASSERT (h->dynindx != -1)" to confirm all plt entries have dynamic -symbol attributes. This was failing for symbols that were -"forced_local" in previous linking code. - -The fix adds logic to or1k_elf_adjust_dynamic_symbol to identify -"forced_local" symbols and exclude them from the the PLT. - -bfd/ChangeLog: - - PR 27624 - * elf32-or1k.c (or1k_elf_adjust_dynamic_symbol): Change - condition used to cleanup plt entries to cleanup forced local - entries. - -Cc: Giulio Benetti -Signed-off-by: Giulio Benetti ---- - bfd/elf32-or1k.c | 9 ++++----- - 1 file changed, 4 insertions(+), 5 deletions(-) - -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index 7c02d004cc7..bbfa2bfe614 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -2568,11 +2568,10 @@ or1k_elf_adjust_dynamic_symbol (struct bfd_link_info *info, - if (h->type == STT_FUNC - || h->needs_plt) - { -- if (! bfd_link_pic (info) -- && !h->def_dynamic -- && !h->ref_dynamic -- && h->root.type != bfd_link_hash_undefweak -- && h->root.type != bfd_link_hash_undefined) -+ if (h->plt.refcount <= 0 -+ || (SYMBOL_CALLS_LOCAL (info, h) -+ || (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT -+ && h->root.type == bfd_link_hash_undefweak))) - { - /* This case can occur if we saw a PLT reloc in an input - file, but the symbol was never referred to by a dynamic --- -2.25.1 - diff --git a/package/binutils/2.35.2/0004-or1k-Implement-relocation-R_OR1K_GOT_AHI16-for-gotha.patch b/package/binutils/2.35.2/0004-or1k-Implement-relocation-R_OR1K_GOT_AHI16-for-gotha.patch deleted file mode 100644 index a4af57d546..0000000000 --- a/package/binutils/2.35.2/0004-or1k-Implement-relocation-R_OR1K_GOT_AHI16-for-gotha.patch +++ /dev/null @@ -1,256 +0,0 @@ -From c67656e248d6dadaa2729975a17c8dd03afe48d0 Mon Sep 17 00:00:00 2001 -From: Stafford Horne -Date: Sun, 2 May 2021 06:02:15 +0900 -Subject: [PATCH] or1k: Implement relocation R_OR1K_GOT_AHI16 for gotha() - -The gotha() relocation mnemonic will be outputted by OpenRISC GCC when -using the -mcmodel=large option. This relocation is used along with -got() to generate 32-bit GOT offsets. This increases the previous GOT -offset limit from the previous 16-bit (64K) limit. - -This is needed on large binaries where the GOT grows larger than 64k. - -bfd/ChangeLog: - - PR 21464 - * bfd-in2.h: Add BFD_RELOC_OR1K_GOT_AHI16 relocation. - * elf32-or1k.c (or1k_elf_howto_table, or1k_reloc_map): Likewise. - (or1k_final_link_relocate, or1k_elf_relocate_section, - or1k_elf_check_relocs): Likewise. - * libbfd.h (bfd_reloc_code_real_names): Likewise. - * reloc.c: Likewise. - -cpu/ChangeLog: - - PR 21464 - * or1k.opc (or1k_imm16_relocs, parse_reloc): Define parse logic - for gotha() relocation. - -include/ChangeLog: - - PR 21464 - * elf/or1k.h (elf_or1k_reloc_type): Define R_OR1K_GOT_AHI16 number. - -opcodes/ChangeLog: - - PR 21464 - * or1k-asm.c: Regenerate. - -gas/ChangeLog: - - PR 21464 - * testsuite/gas/or1k/reloc-1.s: Add test for new relocation. - * testsuite/gas/or1k/reloc-1.d: Add test result for new - relocation. - -Cc: Giulio Benetti - -fixup reloc, add tests - -Signed-off-by: Giulio Benetti ---- - bfd/bfd-in2.h | 1 + - bfd/elf32-or1k.c | 21 ++++++++++++++++++++- - bfd/libbfd.h | 1 + - bfd/reloc.c | 2 ++ - cpu/or1k.opc | 7 ++++++- - gas/testsuite/gas/or1k/reloc-1.d | 4 +++- - gas/testsuite/gas/or1k/reloc-1.s | 4 ++++ - include/elf/or1k.h | 1 + - opcodes/or1k-asm.c | 7 ++++++- - 9 files changed, 44 insertions(+), 4 deletions(-) - -diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h -index df6f9f45673..ab861395e93 100644 ---- a/bfd/bfd-in2.h -+++ b/bfd/bfd-in2.h -@@ -5041,6 +5041,7 @@ then it may be truncated to 8 bits. */ - BFD_RELOC_OR1K_TLS_TPOFF, - BFD_RELOC_OR1K_TLS_DTPOFF, - BFD_RELOC_OR1K_TLS_DTPMOD, -+ BFD_RELOC_OR1K_GOT_AHI16, - - /* H8 elf Relocations. */ - BFD_RELOC_H8_DIR16A8, -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index bbfa2bfe614..8e395827123 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -808,6 +808,20 @@ static reloc_howto_type or1k_elf_howto_table[] = - 0, /* Source Mask. */ - 0x03ffffff, /* Dest Mask. */ - TRUE), /* PC relative offset? */ -+ -+ HOWTO (R_OR1K_GOT_AHI16, /* type */ -+ 16, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_signed, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_OR1K_GOT_AHI16", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ - }; - - /* Map BFD reloc types to Or1k ELF reloc types. */ -@@ -871,6 +885,7 @@ static const struct or1k_reloc_map or1k_reloc_map[] = - { BFD_RELOC_OR1K_TLS_IE_LO13, R_OR1K_TLS_IE_LO13 }, - { BFD_RELOC_OR1K_SLO13, R_OR1K_SLO13 }, - { BFD_RELOC_OR1K_PLTA26, R_OR1K_PLTA26 }, -+ { BFD_RELOC_OR1K_GOT_AHI16, R_OR1K_GOT_AHI16 }, - }; - - /* tls_type is a mask used to track how each symbol is accessed, -@@ -1113,6 +1128,7 @@ or1k_final_link_relocate (reloc_howto_type *howto, bfd *input_bfd, - switch (howto->type) - { - case R_OR1K_AHI16: -+ case R_OR1K_GOT_AHI16: - case R_OR1K_GOTOFF_AHI16: - case R_OR1K_TLS_IE_AHI16: - case R_OR1K_TLS_LE_AHI16: -@@ -1375,6 +1391,7 @@ or1k_elf_relocate_section (bfd *output_bfd, - } - break; - -+ case R_OR1K_GOT_AHI16: - case R_OR1K_GOT16: - case R_OR1K_GOT_PG21: - case R_OR1K_GOT_LO13: -@@ -1466,7 +1483,8 @@ or1k_elf_relocate_section (bfd *output_bfd, - /* The GOT_PG21 and GOT_LO13 relocs are pc-relative, - while the GOT16 reloc is GOT relative. */ - relocation = got_base + off; -- if (r_type == R_OR1K_GOT16) -+ if (r_type == R_OR1K_GOT16 -+ || r_type == R_OR1K_GOT_AHI16) - relocation -= got_sym_value; - - /* Addend should be zero. */ -@@ -1992,6 +2010,7 @@ or1k_elf_check_relocs (bfd *abfd, - } - break; - -+ case R_OR1K_GOT_AHI16: - case R_OR1K_GOT16: - case R_OR1K_GOT_PG21: - case R_OR1K_GOT_LO13: -diff --git a/bfd/libbfd.h b/bfd/libbfd.h -index b97534fc9fe..795c9b9d27f 100644 ---- a/bfd/libbfd.h -+++ b/bfd/libbfd.h -@@ -2755,6 +2755,7 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@", - "BFD_RELOC_OR1K_TLS_TPOFF", - "BFD_RELOC_OR1K_TLS_DTPOFF", - "BFD_RELOC_OR1K_TLS_DTPMOD", -+ "BFD_RELOC_OR1K_GOT_AHI16", - "BFD_RELOC_H8_DIR16A8", - "BFD_RELOC_H8_DIR16R8", - "BFD_RELOC_H8_DIR24A8", -diff --git a/bfd/reloc.c b/bfd/reloc.c -index 9aba84ca81e..1e021febef2 100644 ---- a/bfd/reloc.c -+++ b/bfd/reloc.c -@@ -6175,6 +6175,8 @@ ENUMX - BFD_RELOC_OR1K_GOTPC_HI16 - ENUMX - BFD_RELOC_OR1K_GOTPC_LO16 -+ENUMX -+ BFD_RELOC_OR1K_GOT_AHI16 - ENUMX - BFD_RELOC_OR1K_GOT16 - ENUMX -diff --git a/cpu/or1k.opc b/cpu/or1k.opc -index f0adcbb00a5..5d20a1f33a7 100644 ---- a/cpu/or1k.opc -+++ b/cpu/or1k.opc -@@ -193,7 +193,7 @@ static const bfd_reloc_code_real_type or1k_imm16_relocs[][6] = { - BFD_RELOC_OR1K_GOT_LO13, - BFD_RELOC_UNUSED, - BFD_RELOC_UNUSED, -- BFD_RELOC_UNUSED }, -+ BFD_RELOC_OR1K_GOT_AHI16 }, - { BFD_RELOC_OR1K_GOTPC_LO16, - BFD_RELOC_UNUSED, - BFD_RELOC_UNUSED, -@@ -296,6 +296,11 @@ parse_reloc (const char **strp) - str += 5; - cls = RCLASS_TPOFF; - } -+ else if (strncasecmp (str, "got", 3) == 0) -+ { -+ str += 3; -+ cls = RCLASS_GOT; -+ } - - if (strncasecmp (str, "hi(", 3) == 0) - { -diff --git a/gas/testsuite/gas/or1k/reloc-1.d b/gas/testsuite/gas/or1k/reloc-1.d -index d1bcf5608bb..3a001c4ed99 100644 ---- a/gas/testsuite/gas/or1k/reloc-1.d -+++ b/gas/testsuite/gas/or1k/reloc-1.d -@@ -68,5 +68,7 @@ OFFSET TYPE VALUE - 000000ec R_OR1K_LO13 x - 000000f0 R_OR1K_GOT_LO13 x - 000000f4 R_OR1K_SLO13 x -- -+000000f8 R_OR1K_GOT_AHI16 x -+000000fc R_OR1K_GOT_AHI16 x -+00000100 R_OR1K_GOT_AHI16 x - -diff --git a/gas/testsuite/gas/or1k/reloc-1.s b/gas/testsuite/gas/or1k/reloc-1.s -index e76abef6532..562609aa869 100644 ---- a/gas/testsuite/gas/or1k/reloc-1.s -+++ b/gas/testsuite/gas/or1k/reloc-1.s -@@ -74,3 +74,7 @@ - l.lbz r5,po(x)(r3) - l.lbz r5,gotpo(x)(r3) - l.sb po(x)(r3),r6 -+ -+ l.movhi r4,gotha(x) -+ l.ori r3,r4,gotha(x) -+ l.addi r3,r4,gotha(x) -diff --git a/include/elf/or1k.h b/include/elf/or1k.h -index a215ef5c17e..dff37d875f2 100644 ---- a/include/elf/or1k.h -+++ b/include/elf/or1k.h -@@ -77,6 +77,7 @@ START_RELOC_NUMBERS (elf_or1k_reloc_type) - RELOC_NUMBER (R_OR1K_TLS_IE_LO13, 51) - RELOC_NUMBER (R_OR1K_SLO13, 52) - RELOC_NUMBER (R_OR1K_PLTA26, 53) -+ RELOC_NUMBER (R_OR1K_GOT_AHI16, 54) - END_RELOC_NUMBERS (R_OR1K_max) - - #define EF_OR1K_NODELAY (1UL << 0) -diff --git a/opcodes/or1k-asm.c b/opcodes/or1k-asm.c -index 5f3c6c74b12..e0c49b3b8cd 100644 ---- a/opcodes/or1k-asm.c -+++ b/opcodes/or1k-asm.c -@@ -177,7 +177,7 @@ static const bfd_reloc_code_real_type or1k_imm16_relocs[][6] = { - BFD_RELOC_OR1K_GOT_LO13, - BFD_RELOC_UNUSED, - BFD_RELOC_UNUSED, -- BFD_RELOC_UNUSED }, -+ BFD_RELOC_OR1K_GOT_AHI16 }, - { BFD_RELOC_OR1K_GOTPC_LO16, - BFD_RELOC_UNUSED, - BFD_RELOC_UNUSED, -@@ -280,6 +280,11 @@ parse_reloc (const char **strp) - str += 5; - cls = RCLASS_TPOFF; - } -+ else if (strncasecmp (str, "got", 3) == 0) -+ { -+ str += 3; -+ cls = RCLASS_GOT; -+ } - - if (strncasecmp (str, "hi(", 3) == 0) - { --- -2.25.1 - diff --git a/package/binutils/2.35.2/0005-or1k-Avoid-R_OR1K_GOT16-overflow-failures-in-presenc.patch b/package/binutils/2.35.2/0005-or1k-Avoid-R_OR1K_GOT16-overflow-failures-in-presenc.patch deleted file mode 100644 index 82198dd373..0000000000 --- a/package/binutils/2.35.2/0005-or1k-Avoid-R_OR1K_GOT16-overflow-failures-in-presenc.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 097b83a1c9c694a14e6081cee034bf24f16875c1 Mon Sep 17 00:00:00 2001 -From: Stafford Horne -Date: Sun, 2 May 2021 06:02:16 +0900 -Subject: [PATCH] or1k: Avoid R_OR1K_GOT16 overflow failures in presence of - R_OR1K_GOT_AHI16 - -Now that we support R_OR1K_GOT_AHI16 we can relax the R_OR1K_GOT16 -overflow validation check if the section has R_OR1K_GOT_AHI16. - -We cannot simple disable R_OR1K_GOT16 overflow validation as there will -still be binaries that will have only R_OR1K_GOT16. The -R_OR1K_GOT_AHI16 relocation will only be added by GCC when building with -the option -mcmodel=large. - -This assumes that R_OR1K_GOT_AHI16 will come before R_OR1K_GOT16, which -is the code pattern that will be emitted by GCC. - -bfd/ChangeLog: - - PR 21464 - * elf32-or1k.c (or1k_elf_relocate_section): Relax R_OR1K_GOT16 - overflow check if we have R_OR1K_GOT_AHI16 followed by - R_OR1K_GOT16. - -Signed-off-by: Giulio Benetti ---- - bfd/elf32-or1k.c | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index 8e395827123..9f315bfda99 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -1280,6 +1280,7 @@ or1k_elf_relocate_section (bfd *output_bfd, - asection *sgot, *splt; - bfd_vma plt_base, got_base, got_sym_value; - bfd_boolean ret_val = TRUE; -+ bfd_boolean saw_gotha = FALSE; - - if (htab == NULL) - return FALSE; -@@ -1487,6 +1488,16 @@ or1k_elf_relocate_section (bfd *output_bfd, - || r_type == R_OR1K_GOT_AHI16) - relocation -= got_sym_value; - -+ if (r_type == R_OR1K_GOT_AHI16) -+ saw_gotha = TRUE; -+ -+ /* If we have a R_OR1K_GOT16 followed by 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. */ -+ if (r_type == R_OR1K_GOT16 && saw_gotha) -+ relocation &= 0xffff; -+ - /* Addend should be zero. */ - if (rel->r_addend != 0) - { --- -2.25.1 - diff --git a/package/binutils/2.35.2/0006-or1k-Support-large-plt_relocs-when-generating-plt-en.patch b/package/binutils/2.35.2/0006-or1k-Support-large-plt_relocs-when-generating-plt-en.patch deleted file mode 100644 index c884ab874d..0000000000 --- a/package/binutils/2.35.2/0006-or1k-Support-large-plt_relocs-when-generating-plt-en.patch +++ /dev/null @@ -1,500 +0,0 @@ -From c87692eb894b4b86eced7b7ba205f9bf27c2c213 Mon Sep 17 00:00:00 2001 -From: Stafford Horne -Date: Sun, 2 May 2021 06:02:17 +0900 -Subject: [PATCH] or1k: Support large plt_relocs when generating plt - entries - -The current PLT generation code will generate invalid code when the PLT -relocation offset exceeds 64k. This fixes the issue by detecting large -plt_reloc offsets and generare code sequences to create larger plt -relocations. - -The "large" plt code needs 2 extra instructions to create 32-bit offsets. - -bfd/ChangeLog: - - PR 27746 - * elf32-or1k.c (PLT_ENTRY_SIZE_LARGE, PLT_MAX_INSN_COUNT, - OR1K_ADD, OR1K_ORI): New macros to help with plt creation. - (elf_or1k_link_hash_table): New field plt_count. - (elf_or1k_link_hash_entry): New field plt_index. - (elf_or1k_plt_entry_size): New function. - (or1k_write_plt_entry): Update to support variable size PLTs. - (or1k_elf_finish_dynamic_sections): Use new or1k_write_plt_entry - API. - (or1k_elf_finish_dynamic_symbol): Update to write large PLTs - when needed. - (allocate_dynrelocs): Use elf_or1k_plt_entry_size to account for - PLT size. - -ld/ChangeLog: - - PR 27746 - testsuite/ld-or1k/or1k.exp (or1kplttests): Add tests for linking - along with gotha() relocations. - testsuite/ld-or1k/gotha1.dd: New file. - testsuite/ld-or1k/gotha1.s: New file. - testsuite/ld-or1k/gotha2.dd: New file. - testsuite/ld-or1k/gotha2.s: New file - testsuite/ld-or1k/pltlib.s (x): Define size to avoid link - failure. - -Signed-off-by: Giulio Benetti ---- - bfd/elf32-or1k.c | 149 ++++++++++++++++++++++++--------- - ld/testsuite/ld-or1k/gotha1.dd | 34 ++++++++ - ld/testsuite/ld-or1k/gotha1.s | 24 ++++++ - ld/testsuite/ld-or1k/gotha2.dd | 21 +++++ - ld/testsuite/ld-or1k/gotha2.s | 22 +++++ - ld/testsuite/ld-or1k/or1k.exp | 8 ++ - ld/testsuite/ld-or1k/pltlib.s | 1 + - 7 files changed, 220 insertions(+), 39 deletions(-) - create mode 100644 ld/testsuite/ld-or1k/gotha1.dd - create mode 100644 ld/testsuite/ld-or1k/gotha1.s - create mode 100644 ld/testsuite/ld-or1k/gotha2.dd - create mode 100644 ld/testsuite/ld-or1k/gotha2.s - -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index 9f315bfda99..7a14eaa3a46 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -30,10 +30,14 @@ - #define N_ONES(X) (((bfd_vma)2 << (X)) - 1) - - #define PLT_ENTRY_SIZE 16 -+#define PLT_ENTRY_SIZE_LARGE (6*4) -+#define PLT_MAX_INSN_COUNT 6 - - #define OR1K_MOVHI(D) (0x18000000 | (D << 21)) - #define OR1K_ADRP(D) (0x08000000 | (D << 21)) - #define OR1K_LWZ(D,A) (0x84000000 | (D << 21) | (A << 16)) -+#define OR1K_ADD(D,A,B) (0xE0000000 | (D << 21) | (A << 16) | (B << 11)) -+#define OR1K_ORI(D,A) (0xA8000000 | (D << 21) | (A << 16)) - #define OR1K_ORI0(D) (0xA8000000 | (D << 21)) - #define OR1K_JR(B) (0x44000000 | (B << 11)) - #define OR1K_NOP 0x15000000 -@@ -907,6 +911,8 @@ struct elf_or1k_link_hash_entry - { - struct elf_link_hash_entry root; - -+ /* For calculating PLT size. */ -+ bfd_vma plt_index; - /* Track type of TLS access. */ - unsigned char tls_type; - }; -@@ -934,9 +940,20 @@ struct elf_or1k_link_hash_table - /* Small local sym to section mapping cache. */ - struct sym_cache sym_sec; - -+ bfd_vma plt_count; - bfd_boolean saw_plta; - }; - -+static size_t -+elf_or1k_plt_entry_size (bfd_vma plt_index) -+{ -+ bfd_vma plt_reloc; -+ -+ plt_reloc = plt_index * sizeof (Elf32_External_Rela); -+ -+ return (plt_reloc > 0xffff) ? PLT_ENTRY_SIZE_LARGE : PLT_ENTRY_SIZE; -+} -+ - /* Get the ELF linker hash table from a link_info structure. */ - #define or1k_elf_hash_table(p) \ - (elf_hash_table_id ((struct elf_link_hash_table *) ((p)->hash)) \ -@@ -2224,33 +2241,46 @@ or1k_elf_check_relocs (bfd *abfd, - } - - static void --or1k_write_plt_entry (bfd *output_bfd, bfd_byte *contents, unsigned insn1, -- unsigned insn2, unsigned insn3, unsigned insnj) -+or1k_write_plt_entry (bfd *output_bfd, bfd_byte *contents, unsigned insnj, -+ unsigned insns[], size_t insn_count) - { - unsigned nodelay = elf_elfheader (output_bfd)->e_flags & EF_OR1K_NODELAY; -- unsigned insn4; -+ unsigned output_insns[PLT_MAX_INSN_COUNT]; -+ -+ /* Copy instructions into the output buffer. */ -+ for (size_t i = 0; i < insn_count; i++) -+ output_insns[i] = insns[i]; - - /* Honor the no-delay-slot setting. */ -- if (insn3 == OR1K_NOP) -+ if (insns[insn_count-1] == OR1K_NOP) - { -- insn4 = insn3; -+ unsigned slot1, slot2; -+ - if (nodelay) -- insn3 = insnj; -+ slot1 = insns[insn_count-2], slot2 = insnj; - else -- insn3 = insn2, insn2 = insnj; -+ slot1 = insnj, slot2 = insns[insn_count-2]; -+ -+ output_insns[insn_count-2] = slot1; -+ output_insns[insn_count-1] = slot2; -+ output_insns[insn_count] = OR1K_NOP; - } - else - { -+ unsigned slot1, slot2; -+ - if (nodelay) -- insn4 = insnj; -+ slot1 = insns[insn_count-1], slot2 = insnj; - else -- insn4 = insn3, insn3 = insnj; -+ slot1 = insnj, slot2 = insns[insn_count-1]; -+ -+ output_insns[insn_count-1] = slot1; -+ output_insns[insn_count] = slot2; - } - -- bfd_put_32 (output_bfd, insn1, contents); -- bfd_put_32 (output_bfd, insn2, contents + 4); -- bfd_put_32 (output_bfd, insn3, contents + 8); -- bfd_put_32 (output_bfd, insn4, contents + 12); -+ /* Write out the output buffer. */ -+ for (size_t i = 0; i < (insn_count+1); i++) -+ bfd_put_32 (output_bfd, output_insns[i], contents + (i*4)); - } - - /* Finish up the dynamic sections. */ -@@ -2317,7 +2347,8 @@ or1k_elf_finish_dynamic_sections (bfd *output_bfd, - splt = htab->root.splt; - if (splt && splt->size > 0) - { -- unsigned plt0, plt1, plt2; -+ unsigned plt[PLT_MAX_INSN_COUNT]; -+ size_t plt_insn_count = 3; - bfd_vma got_addr = sgot->output_section->vma + sgot->output_offset; - - /* Note we force 16 byte alignment on the .got, so that -@@ -2328,27 +2359,27 @@ or1k_elf_finish_dynamic_sections (bfd *output_bfd, - bfd_vma pc = splt->output_section->vma + splt->output_offset; - unsigned pa = ((got_addr >> 13) - (pc >> 13)) & 0x1fffff; - unsigned po = got_addr & 0x1fff; -- plt0 = OR1K_ADRP(12) | pa; -- plt1 = OR1K_LWZ(15,12) | (po + 8); -- plt2 = OR1K_LWZ(12,12) | (po + 4); -+ plt[0] = OR1K_ADRP(12) | pa; -+ plt[1] = OR1K_LWZ(15,12) | (po + 8); -+ plt[2] = OR1K_LWZ(12,12) | (po + 4); - } - else if (bfd_link_pic (info)) - { -- plt0 = OR1K_LWZ(15, 16) | 8; /* .got+8 */ -- plt1 = OR1K_LWZ(12, 16) | 4; /* .got+4 */ -- plt2 = OR1K_NOP; -+ plt[0] = OR1K_LWZ(15, 16) | 8; /* .got+8 */ -+ plt[1] = OR1K_LWZ(12, 16) | 4; /* .got+4 */ -+ plt[2] = OR1K_NOP; - } - else - { - unsigned ha = ((got_addr + 0x8000) >> 16) & 0xffff; - unsigned lo = got_addr & 0xffff; -- plt0 = OR1K_MOVHI(12) | ha; -- plt1 = OR1K_LWZ(15,12) | (lo + 8); -- plt2 = OR1K_LWZ(12,12) | (lo + 4); -+ plt[0] = OR1K_MOVHI(12) | ha; -+ plt[1] = OR1K_LWZ(15,12) | (lo + 8); -+ plt[2] = OR1K_LWZ(12,12) | (lo + 4); - } - -- or1k_write_plt_entry (output_bfd, splt->contents, -- plt0, plt1, plt2, OR1K_JR(15)); -+ or1k_write_plt_entry (output_bfd, splt->contents, OR1K_JR(15), -+ plt, plt_insn_count); - - elf_section_data (splt->output_section)->this_hdr.sh_entsize = 4; - } -@@ -2391,7 +2422,8 @@ or1k_elf_finish_dynamic_symbol (bfd *output_bfd, - - if (h->plt.offset != (bfd_vma) -1) - { -- unsigned int plt0, plt1, plt2; -+ unsigned int plt[PLT_MAX_INSN_COUNT]; -+ size_t plt_insn_count = 3; - asection *splt; - asection *sgot; - asection *srela; -@@ -2403,6 +2435,7 @@ or1k_elf_finish_dynamic_symbol (bfd *output_bfd, - bfd_vma got_offset; - bfd_vma got_addr; - Elf_Internal_Rela rela; -+ bfd_boolean large_plt_entry; - - /* This symbol has an entry in the procedure linkage table. Set - it up. */ -@@ -2420,10 +2453,13 @@ or1k_elf_finish_dynamic_symbol (bfd *output_bfd, - corresponds to this symbol. This is the index of this symbol - in all the symbols for which we are making plt entries. The - first entry in the procedure linkage table is reserved. */ -- plt_index = h->plt.offset / PLT_ENTRY_SIZE - 1; -+ plt_index = ((struct elf_or1k_link_hash_entry *) h)->plt_index; - plt_addr = plt_base_addr + h->plt.offset; - plt_reloc = plt_index * sizeof (Elf32_External_Rela); - -+ large_plt_entry = (elf_or1k_plt_entry_size (plt_index) -+ == PLT_ENTRY_SIZE_LARGE); -+ - /* Get the offset into the .got table of the entry that - corresponds to this function. Each .got entry is 4 bytes. - The first three are reserved. */ -@@ -2435,27 +2471,57 @@ or1k_elf_finish_dynamic_symbol (bfd *output_bfd, - { - unsigned pa = ((got_addr >> 13) - (plt_addr >> 13)) & 0x1fffff; - unsigned po = (got_addr & 0x1fff); -- plt0 = OR1K_ADRP(12) | pa; -- plt1 = OR1K_LWZ(12,12) | po; -- plt2 = OR1K_ORI0(11) | plt_reloc; -+ plt[0] = OR1K_ADRP(12) | pa; -+ plt[1] = OR1K_LWZ(12,12) | po; -+ plt[2] = OR1K_ORI0(11) | plt_reloc; - } - else if (bfd_link_pic (info)) - { -- plt0 = OR1K_LWZ(12,16) | got_offset; -- plt1 = OR1K_ORI0(11) | plt_reloc; -- plt2 = OR1K_NOP; -+ if (large_plt_entry) -+ { -+ unsigned gotha = ((got_offset + 0x8000) >> 16) & 0xffff; -+ unsigned got = got_offset & 0xffff; -+ unsigned pltrelhi = (plt_reloc >> 16) & 0xffff; -+ unsigned pltrello = plt_reloc & 0xffff; -+ -+ plt[0] = OR1K_MOVHI(12) | gotha; -+ plt[1] = OR1K_ADD(12,12,16); -+ plt[2] = OR1K_LWZ(12,12) | got; -+ plt[3] = OR1K_MOVHI(11) | pltrelhi; -+ plt[4] = OR1K_ORI(11,11) | pltrello; -+ plt_insn_count = 5; -+ } -+ else -+ { -+ plt[0] = OR1K_LWZ(12,16) | got_offset; -+ plt[1] = OR1K_ORI0(11) | plt_reloc; -+ plt[2] = OR1K_NOP; -+ } - } - else - { - unsigned ha = ((got_addr + 0x8000) >> 16) & 0xffff; - unsigned lo = got_addr & 0xffff; -- plt0 = OR1K_MOVHI(12) | ha; -- plt1 = OR1K_LWZ(12,12) | lo; -- plt2 = OR1K_ORI0(11) | plt_reloc; -+ plt[0] = OR1K_MOVHI(12) | ha; -+ plt[1] = OR1K_LWZ(12,12) | lo; -+ plt[2] = OR1K_ORI0(11) | plt_reloc; -+ } -+ -+ /* For large code model we fixup the non-PIC PLT relocation instructions -+ here. */ -+ if (large_plt_entry && !bfd_link_pic (info)) -+ { -+ unsigned pltrelhi = (plt_reloc >> 16) & 0xffff; -+ unsigned pltrello = plt_reloc & 0xffff; -+ -+ plt[2] = OR1K_MOVHI(11) | pltrelhi; -+ plt[3] = OR1K_ORI(11,11) | pltrello; -+ plt[4] = OR1K_NOP; -+ plt_insn_count = 5; - } - - or1k_write_plt_entry (output_bfd, splt->contents + h->plt.offset, -- plt0, plt1, plt2, OR1K_JR(12)); -+ OR1K_JR(12), plt, plt_insn_count); - - /* Fill in the entry in the global offset table. We initialize it to - point to the top of the plt. This is done to lazy lookup the actual -@@ -2779,11 +2845,16 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf) - if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, bfd_link_pic (info), h)) - { - asection *splt = htab->root.splt; -+ bfd_vma plt_index; -+ -+ /* Track the index of our plt entry for use in calculating size. */ -+ plt_index = htab->plt_count++; -+ ((struct elf_or1k_link_hash_entry *) h)->plt_index = plt_index; - - /* If this is the first .plt entry, make room for the special - first entry. */ - if (splt->size == 0) -- splt->size = PLT_ENTRY_SIZE; -+ splt->size = elf_or1k_plt_entry_size (plt_index); - - h->plt.offset = splt->size; - -@@ -2800,7 +2871,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf) - } - - /* Make room for this entry. */ -- splt->size += PLT_ENTRY_SIZE; -+ splt->size += elf_or1k_plt_entry_size (plt_index); - - /* We also need to make an entry in the .got.plt section, which - will be placed in the .got section by the linker script. */ -diff --git a/ld/testsuite/ld-or1k/gotha1.dd b/ld/testsuite/ld-or1k/gotha1.dd -new file mode 100644 -index 00000000000..0ad1f8f5399 ---- /dev/null -+++ b/ld/testsuite/ld-or1k/gotha1.dd -@@ -0,0 +1,34 @@ -+ -+.*\.x: file format elf32-or1k -+ -+ -+Disassembly of section \.plt: -+ -+[0-9a-f]+ <\.plt>: -+ +[0-9a-f]+: 19 80 00 00 l\.movhi r12,0x0 -+ +[0-9a-f]+: 85 ec [0-9a-f]+ [0-9a-f]+ l\.lwz r15,[0-9]+\(r12\) -+ +[0-9a-f]+: 44 00 78 00 l\.jr r15 -+ +[0-9a-f]+: 85 8c [0-9a-f]+ [0-9a-f]+ l\.lwz r12,[0-9]+\(r12\) -+ +[0-9a-f]+: 19 80 00 00 l\.movhi r12,0x0 -+ +[0-9a-f]+: 85 8c [0-9a-f]+ [0-9a-f]+ l\.lwz r12,[0-9]+\(r12\) -+ +[0-9a-f]+: 44 00 60 00 l\.jr r12 -+ +[0-9a-f]+: a9 60 00 00 l\.ori r11,r0,0x0 -+ -+Disassembly of section \.text: -+ -+[0-9a-f]+ <_start>: -+ +[0-9a-f]+: 9c 21 ff fc l\.addi r1,r1,-4 -+ +[0-9a-f]+: d4 01 48 00 l\.sw 0\(r1\),r9 -+ +[0-9a-f]+: 04 00 00 02 l\.jal [0-9a-f]+ <_start\+0x10> -+ +[0-9a-f]+: 1a 60 00 00 l\.movhi r19,0x0 -+ +[0-9a-f]+: aa 73 [0-9a-f]+ [0-9a-f]+ l\.ori r19,r19,0x[0-9a-f]+ -+ +[0-9a-f]+: e2 73 48 00 l\.add r19,r19,r9 -+ +[0-9a-f]+: 1a 20 00 00 l\.movhi r17,0x0 -+ +[0-9a-f]+: e2 31 98 00 l\.add r17,r17,r19 -+ +[0-9a-f]+: 86 31 00 10 l\.lwz r17,16\(r17\) -+ +[0-9a-f]+: 84 71 00 00 l\.lwz r3,0\(r17\) -+ +[0-9a-f]+: 07 ff ff f2 l\.jal [0-9a-f]+ <\.plt\+0x10> -+ +[0-9a-f]+: 15 00 00 00 l\.nop 0x0 -+ +[0-9a-f]+: 85 21 00 00 l\.lwz r9,0\(r1\) -+ +[0-9a-f]+: 44 00 48 00 l\.jr r9 -+ +[0-9a-f]+: 9c 21 00 04 l\.addi r1,r1,4 -diff --git a/ld/testsuite/ld-or1k/gotha1.s b/ld/testsuite/ld-or1k/gotha1.s -new file mode 100644 -index 00000000000..42b16db425c ---- /dev/null -+++ b/ld/testsuite/ld-or1k/gotha1.s -@@ -0,0 +1,24 @@ -+ .data -+ .p2align 16 -+ -+ .text -+ .globl _start -+_start: -+ l.addi r1, r1, -4 -+ l.sw 0(r1), r9 -+ -+ l.jal 8 -+ l.movhi r19, gotpchi(_GLOBAL_OFFSET_TABLE_-4) -+ l.ori r19, r19, gotpclo(_GLOBAL_OFFSET_TABLE_+0) -+ l.add r19, r19, r9 -+ -+ l.movhi r17, gotha(x) -+ l.add r17, r17, r19 -+ l.lwz r17, got(x)(r17) -+ l.lwz r3, 0(r17) -+ -+ l.jal plt(func) -+ l.nop -+ l.lwz r9, 0(r1) -+ l.jr r9 -+ l.addi r1, r1, 4 -diff --git a/ld/testsuite/ld-or1k/gotha2.dd b/ld/testsuite/ld-or1k/gotha2.dd -new file mode 100644 -index 00000000000..fe09da5466b ---- /dev/null -+++ b/ld/testsuite/ld-or1k/gotha2.dd -@@ -0,0 +1,21 @@ -+ -+.*\.x: file format elf32-or1k -+ -+ -+Disassembly of section \.text: -+ -+[0-9a-f]+ : -+ +[0-9a-f]+: 9c 21 ff f8 l\.addi r1,r1,-8 -+ +[0-9a-f]+: d4 01 80 00 l\.sw 0\(r1\),r16 -+ +[0-9a-f]+: d4 01 48 04 l\.sw 4\(r1\),r9 -+ +[0-9a-f]+: 04 00 [0-9a-f]+ [0-9a-f]+ l\.jal [0-9a-f]+ -+ +[0-9a-f]+: 1a 00 00 00 l\.movhi r16,0x0 -+ +[0-9a-f]+: aa 10 [0-9a-f]+ [0-9a-f]+ l\.ori r16,r16,0x[0-9a-f]+ -+ +[0-9a-f]+: e2 10 48 00 l\.add r16,r16,r9 -+ +[0-9a-f]+: 1a 20 00 00 l\.movhi r17,0x0 -+ +[0-9a-f]+: e2 31 80 00 l\.add r17,r17,r16 -+ +[0-9a-f]+: 86 31 00 0c l\.lwz r17,12\(r17\) -+ +[0-9a-f]+: 85 21 00 04 l\.lwz r9,4\(r1\) -+ +[0-9a-f]+: 86 01 00 00 l\.lwz r16,0\(r1\) -+ +[0-9a-f]+: 44 00 48 00 l\.jr r9 -+ +[0-9a-f]+: 9c 21 00 08 l\.addi r1,r1,8 -diff --git a/ld/testsuite/ld-or1k/gotha2.s b/ld/testsuite/ld-or1k/gotha2.s -new file mode 100644 -index 00000000000..164b282f2dd ---- /dev/null -+++ b/ld/testsuite/ld-or1k/gotha2.s -@@ -0,0 +1,22 @@ -+ .section .text -+ .align 4 -+ .global test -+ .type test, @function -+test: -+ l.addi r1, r1, -8 -+ l.sw 0(r1), r16 -+ l.sw 4(r1), r9 -+ -+ l.jal 8 -+ l.movhi r16, gotpchi(_GLOBAL_OFFSET_TABLE_-4) -+ l.ori r16, r16, gotpclo(_GLOBAL_OFFSET_TABLE_+0) -+ l.add r16, r16, r9 -+ -+ l.movhi r17, gotha(i) -+ l.add r17, r17, r16 -+ l.lwz r17, got(i)(r17) -+ -+ l.lwz r9, 4(r1) -+ l.lwz r16, 0(r1) -+ l.jr r9 -+ l.addi r1, r1, 8 -diff --git a/ld/testsuite/ld-or1k/or1k.exp b/ld/testsuite/ld-or1k/or1k.exp -index 7592e8307c1..8e19ec6c31a 100644 ---- a/ld/testsuite/ld-or1k/or1k.exp -+++ b/ld/testsuite/ld-or1k/or1k.exp -@@ -53,6 +53,14 @@ set or1kplttests { - "" {plt1.s} - {{objdump -dr plt1.x.dd}} - "plt1.x"} -+ {"gotha exec plt" "tmpdir/libpltlib.so" "" -+ "" {gotha1.s} -+ {{objdump -dr gotha1.dd}} -+ "gotha1.x"} -+ {"gotha -fpic -shared" "-fpic -shared" "" -+ "" {gotha2.s} -+ {{objdump -dr gotha2.dd}} -+ "gotha2.x"} - } - - # Not implemented yet -diff --git a/ld/testsuite/ld-or1k/pltlib.s b/ld/testsuite/ld-or1k/pltlib.s -index baf76ca1af7..8b4d7ba48fd 100644 ---- a/ld/testsuite/ld-or1k/pltlib.s -+++ b/ld/testsuite/ld-or1k/pltlib.s -@@ -1,5 +1,6 @@ - .section .data - .globl x, y -+ .size x, 4 - x: .long 33 - y: .long 44 - --- -2.25.1 - diff --git a/package/binutils/2.35.2/0007-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch b/package/binutils/2.35.2/0007-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch deleted file mode 100644 index c3978e22fa..0000000000 --- a/package/binutils/2.35.2/0007-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch +++ /dev/null @@ -1,50 +0,0 @@ -From c3003947e4bad18faea4337fd2073feeb30ee078 Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Wed, 9 Jun 2021 17:28:27 +0200 -Subject: [PATCH] bfd/elf32-or1k: fix building with gcc version < 5 - -Gcc version >= 5 has standard C mode not set to -std=gnu11, so if we use -an old compiler(i.e. gcc 4.9) build fails on: -``` -elf32-or1k.c:2251:3: error: 'for' loop initial declarations are only allowed in -C99 or C11 mode - for (size_t i = 0; i < insn_count; i++) - ^ -``` - -So let's declare `size_t i` at the top of the function instead of inside -for loop. - -Signed-off-by: Giulio Benetti ---- - bfd/elf32-or1k.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index 4ae7f324d33..32063ab0289 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -2244,9 +2244,10 @@ or1k_write_plt_entry (bfd *output_bfd, bfd_byte *contents, unsigned insnj, - { - unsigned nodelay = elf_elfheader (output_bfd)->e_flags & EF_OR1K_NODELAY; - unsigned output_insns[PLT_MAX_INSN_COUNT]; -+ size_t i; - - /* Copy instructions into the output buffer. */ -- for (size_t i = 0; i < insn_count; i++) -+ for (i = 0; i < insn_count; i++) - output_insns[i] = insns[i]; - - /* Honor the no-delay-slot setting. */ -@@ -2277,7 +2278,7 @@ or1k_write_plt_entry (bfd *output_bfd, bfd_byte *contents, unsigned insnj, - } - - /* Write out the output buffer. */ -- for (size_t i = 0; i < (insn_count+1); i++) -+ for (i = 0; i < (insn_count+1); i++) - bfd_put_32 (output_bfd, output_insns[i], contents + (i*4)); - } - --- -2.25.1 - diff --git a/package/binutils/2.35.2/0008-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch b/package/binutils/2.35.2/0008-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch deleted file mode 100644 index 585b97b2af..0000000000 --- a/package/binutils/2.35.2/0008-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 9af93e143a7fbdb75aa1ed37277f9250eb111628 Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Sat, 10 Jul 2021 17:57:34 +0200 -Subject: [PATCH] or1k: fix pc-relative relocation against dynamic on PC - relative 26 bit relocation - -When building openal we were seeing the assert failure: - -/home/buildroot/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: CMakeFiles/OpenAL.dir/al/source.cpp.o: -pc-relative relocation against dynamic symbol alSourcePausev -/home/buildroot/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: CMakeFiles/OpenAL.dir/al/source.cpp.o: -pc-relative relocation against dynamic symbol alSourceStopv -/home/buildroot/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: CMakeFiles/OpenAL.dir/al/source.cpp.o: -pc-relative relocation against dynamic symbol alSourceRewindv -/home/buildroot/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: CMakeFiles/OpenAL.dir/al/source.cpp.o: -pc-relative relocation against dynamic symbol alSourcePlayv -collect2: error: ld returned 1 exit status - -This happens because in R_OR1K_INSN_REL_26 case we can't reference local -symbol as previously done but we need to make sure that calls to actual -symbol always call the version of current object. - -bfd/Changelog: - - * elf32-or1k.c (or1k_elf_relocate_section): use a separate entry - in switch case R_OR1K_INSN_REL_26 where we need to check for - !SYMBOL_CALLS_LOCAL() instead of !SYMBOL_REFERENCES_LOCAL(). - -Signed-off-by: Giulio Benetti ---- - bfd/elf32-or1k.c | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index 4ae7f324d33..4f9092539f5 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -1543,6 +1543,18 @@ or1k_elf_relocate_section (bfd *output_bfd, - break; - - case R_OR1K_INSN_REL_26: -+ /* For a non-shared link, these will reference plt or call the -+ version of actual object. */ -+ if (bfd_link_pic (info) && !SYMBOL_CALLS_LOCAL (info, h)) -+ { -+ _bfd_error_handler -+ (_("%pB: pc-relative relocation against dynamic symbol %s"), -+ input_bfd, name); -+ ret_val = FALSE; -+ bfd_set_error (bfd_error_bad_value); -+ } -+ break; -+ - case R_OR1K_PCREL_PG21: - case R_OR1K_LO13: - case R_OR1K_SLO13: --- -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 deleted file mode 100644 index e96d49122a..0000000000 --- a/package/binutils/2.35.2/0009-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch +++ /dev/null @@ -1,75 +0,0 @@ -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.35.2/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch b/package/binutils/2.35.2/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch deleted file mode 100644 index e95eb1e7c5..0000000000 --- a/package/binutils/2.35.2/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 30a954525f4e53a9cd50a1a8a6f201c7cf6595c7 Mon Sep 17 00:00:00 2001 -From: "H.J. Lu" -Date: Mon, 7 Feb 2022 15:22:19 -0800 -Subject: [PATCH] i386: Allow GOT32 relocations against ABS symbols - -GOT32 relocations are allowed since absolute value + addend is stored in -the GOT slot. - -Tested on glibc 2.35 build with GCC 11.2 and -Os. - -bfd/ - - PR ld/28870 - * elfxx-x86.c (_bfd_elf_x86_valid_reloc_p): Also allow GOT32 - relocations. - -Signed-off-by: Waldemar Brodkorb - -diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c -index 7ac2411fc80..d00dc45677b 100644 ---- a/bfd/elfxx-x86.c -+++ b/bfd/elfxx-x86.c -@@ -1942,9 +1942,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section, - irel = *rel; - - /* Only allow relocations against absolute symbol, which can be -- resolved as absolute value + addend. GOTPCREL relocations -- are allowed since absolute value + addend is stored in the -- GOT slot. */ -+ resolved as absolute value + addend. GOTPCREL and GOT32 -+ relocations are allowed since absolute value + addend is -+ stored in the GOT slot. */ - if (bed->target_id == X86_64_ELF_DATA) - { - r_type &= ~R_X86_64_converted_reloc_bit; -@@ -1965,7 +1965,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section, - else - valid_p = (r_type == R_386_32 - || r_type == R_386_16 -- || r_type == R_386_8); -+ || r_type == R_386_8 -+ || r_type == R_386_GOT32 -+ || r_type == R_386_GOT32X); - - if (valid_p) - *no_dynreloc_p = true; diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index 17de6e4e41..21b15b5c36 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -16,13 +16,6 @@ config BR2_BINUTILS_VERSION_2_32_X bool "binutils 2.32" depends on !BR2_csky -config BR2_BINUTILS_VERSION_2_35_X - bool "binutils 2.35.2" - depends on !BR2_csky - # https://github.com/uclinux-dev/elf2flt/pull/16 - # https://github.com/uclinux-dev/elf2flt/issues/12 - depends on !BR2_BINFMT_FLAT - config BR2_BINUTILS_VERSION_2_36_X bool "binutils 2.36.1" depends on !BR2_csky @@ -52,7 +45,6 @@ config BR2_BINUTILS_VERSION string default "arc-2020.09-release" if BR2_BINUTILS_VERSION_ARC default "2.32" if BR2_BINUTILS_VERSION_2_32_X - default "2.35.2" if BR2_BINUTILS_VERSION_2_35_X default "2.36.1" if BR2_BINUTILS_VERSION_2_36_X default "2.37" if BR2_BINUTILS_VERSION_2_37_X default "2.38" if BR2_BINUTILS_VERSION_2_38_X diff --git a/package/binutils/binutils.hash b/package/binutils/binutils.hash index fe31b34d40..4141e0c5f2 100644 --- a/package/binutils/binutils.hash +++ b/package/binutils/binutils.hash @@ -1,6 +1,5 @@ # From ftp://gcc.gnu.org/pub/binutils/releases/sha512.sum sha512 d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724afa1e43bd0db45cfc9916b41519b67dfce03232aa4978704492a6994a binutils-2.32.tar.xz -sha512 9974ede5978d32e0d68fef23da48fa00bd06b0bff7ec45b00ca075c126d6bbe0cf2defc03ecc3f17bc6cc85b64271a13009c4049d7ba17de26e84e3a6e2c0348 binutils-2.35.2.tar.xz sha512 cc24590bcead10b90763386b6f96bb027d7594c659c2d95174a6352e8b98465a50ec3e4088d0da038428abe059bbc4ae5f37b269f31a40fc048072c8a234f4e9 binutils-2.36.1.tar.xz sha512 5c11aeef6935860a6819ed3a3c93371f052e52b4bdc5033da36037c1544d013b7f12cb8d561ec954fe7469a68f1b66f1a3cd53d5a3af7293635a90d69edd15e7 binutils-2.37.tar.xz sha512 8bf0b0d193c9c010e0518ee2b2e5a830898af206510992483b427477ed178396cd210235e85fd7bd99a96fc6d5eedbeccbd48317a10f752b7336ada8b2bb826d binutils-2.38.tar.xz -- 2.30.2 From wbx at openadk.org Wed Feb 23 17:59:36 2022 From: wbx at openadk.org (Waldemar Brodkorb) Date: Wed, 23 Feb 2022 18:59:36 +0100 Subject: [Buildroot] [PATCHv3 3/3] package/binutils: make 2.37 the default Message-ID: Signed-off-by: Waldemar Brodkorb --- v1->v2: no changes v2->v3: no changes --- package/binutils/Config.in.host | 2 +- package/binutils/binutils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index 21b15b5c36..e639c67149 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -7,7 +7,7 @@ config BR2_PACKAGE_HOST_BINUTILS_SUPPORTS_CFI choice prompt "Binutils Version" - default BR2_BINUTILS_VERSION_2_36_X if !BR2_arc && !BR2_csky + default BR2_BINUTILS_VERSION_2_37_X if !BR2_arc && !BR2_csky default BR2_BINUTILS_VERSION_ARC if BR2_arc help Select the version of binutils you wish to use. diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index 8c4a1371ca..c94ebe0995 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -11,7 +11,7 @@ ifeq ($(BINUTILS_VERSION),) ifeq ($(BR2_arc),y) BINUTILS_VERSION = arc-2020.09-release else -BINUTILS_VERSION = 2.36.1 +BINUTILS_VERSION = 2.37 endif endif # BINUTILS_VERSION -- 2.30.2 From neal.frager at xilinx.com Wed Feb 23 18:03:36 2022 From: neal.frager at xilinx.com (Neal Frager) Date: Wed, 23 Feb 2022 11:03:36 -0700 Subject: [Buildroot] [PATCH v4 1/1] configs/zynqmp_zcu10x: fix U-Boot dts config Message-ID: <20220223180336.3372352-1-neal.frager@xilinx.com> This patch: - fixes U-Boot issue when DEVICE_TREE environment variable is not defined Signed-off-by: Neal Frager Reviewed-by: Peter Korsgaard Reviewed-by: Luca Ceresoli Tested-by: Peter Korsgaard --- V1->V2: - removed version bumps from patch - removed unnecessary blank lines from uboot-fragment.config files V2->V3: - fixed typo in zynqmp_zcu106_defconfig V3->V4: - re-added patch notes --- board/zynqmp/zcu102/uboot-fragment.config | 1 + board/zynqmp/zcu106/uboot-fragment.config | 1 + configs/zynqmp_zcu102_defconfig | 1 + configs/zynqmp_zcu106_defconfig | 1 + 4 files changed, 4 insertions(+) create mode 100644 board/zynqmp/zcu102/uboot-fragment.config create mode 100644 board/zynqmp/zcu106/uboot-fragment.config diff --git a/board/zynqmp/zcu102/uboot-fragment.config b/board/zynqmp/zcu102/uboot-fragment.config new file mode 100644 index 0000000000..52d6d9dff8 --- /dev/null +++ b/board/zynqmp/zcu102/uboot-fragment.config @@ -0,0 +1 @@ +CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu102-rev1.0" diff --git a/board/zynqmp/zcu106/uboot-fragment.config b/board/zynqmp/zcu106/uboot-fragment.config new file mode 100644 index 0000000000..cd571171ac --- /dev/null +++ b/board/zynqmp/zcu106/uboot-fragment.config @@ -0,0 +1 @@ +CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu106-revA" diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig index 298ce2388c..88e84fe791 100644 --- a/configs/zynqmp_zcu102_defconfig +++ b/configs/zynqmp_zcu102_defconfig @@ -25,6 +25,7 @@ BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2022.01-165-g667001319cbe511ce6353195fb4910ae5cb041ce" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/zcu102/uboot-fragment.config" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index 3e51cbfaab..81f625a73b 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -25,6 +25,7 @@ BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2022.01-165-g667001319cbe511ce6353195fb4910ae5cb041ce" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/zcu106/uboot-fragment.config" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y -- 2.17.1 From luca at lucaceresoli.net Wed Feb 23 18:25:44 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Wed, 23 Feb 2022 19:25:44 +0100 Subject: [Buildroot] [PATCH v4 1/1] configs/zynqmp_zcu10x: fix U-Boot dts config In-Reply-To: <20220223180336.3372352-1-neal.frager@xilinx.com> References: <20220223180336.3372352-1-neal.frager@xilinx.com> Message-ID: <67b712f3-91f0-d726-d7e3-3b6363f6fe94@lucaceresoli.net> Hi Neal, On 23/02/22 19:03, Neal Frager wrote: > This patch: > - fixes U-Boot issue when DEVICE_TREE environment variable is not defined > > Signed-off-by: Neal Frager > Reviewed-by: Peter Korsgaard > Reviewed-by: Luca Ceresoli > Tested-by: Peter Korsgaard These are probably copy-paste errors, we did not write these tags. :) > > --- > V1->V2: > - removed version bumps from patch > - removed unnecessary blank lines from uboot-fragment.config files > V2->V3: > - fixed typo in zynqmp_zcu106_defconfig > V3->V4: > - re-added patch notes In case it helps, here's how I manage these changelogs and the review tags in patches minimizing the above kind of problems. In my local commits I do keep them in the commit message: $ git show commit bb20b3e1faded47201f4d6a7758b5826eb3139e8 Author: Luca Ceresoli Date: Mon Oct 4 16:24:00 2021 +0200 title line.... more info... even more info... Signed-off-by: Luca Ceresoli Reviewed-by: Some Body <...email...> Acked-by: Somebody Else <...email...> --- Changes in v2: - improved this - added comments When reworking the patch I add to the changelog and the tag list using 'git commit --amend' or 'git rebase --interactive' to reword the message. When sending a patch with 'git format-patch' / 'git send-email' they appear in the e-mail and the changelog will be removed when applying the patch because it is after the '---' line. Of course it is how I do manage patches, you might do in whatever way suits you. I just started a build, let's see whether it works. -- Luca From tambewilliam at gmail.com Wed Feb 23 18:29:44 2022 From: tambewilliam at gmail.com (William Tambe) Date: Wed, 23 Feb 2022 12:29:44 -0600 Subject: [Buildroot] STAGING_DIR does not contain executables found in TARGET_DIR In-Reply-To: <256f0da3b8d983a84ea84de250c56bb0@umbiko.net> References: <256f0da3b8d983a84ea84de250c56bb0@umbiko.net> Message-ID: On Wed, Feb 23, 2022 at 5:30 AM Andreas Ziegler wrote: > > Hi William, > > On 2022-02-23 07:11, William Tambe wrote: > > > Please help determining why STAGING_DIR does not contain executables > > found in TARGET_DIR ? > > > > I am expecting to find debug version of all executables in TARGET_DIR, > > but executables such as /bin/busybox are missing from STAGING_DIR . > > If you look at your packages' definition (.mk) files, you will find a > few with *_INSTALL_STAGING = YES. This is responsible for the > (additional) installation in STAGING_DIR. The reason for this is that > some packages need to provide information during the build process, that > is not needed later for operation on the target. To save space on the > target system, a two-stage approach is used. > > Example: your configuration includes zlib-ng: the library itself is > present both in STAGING_DIR and in TARGET_DIR, header and > ldconfig-related files will be found in STAGING_DIR only. On the other > hand, Busybox is not referenced by other packages (it does not export > any interfaces), so it does not have an installation in STAGING_DIR. > Is there a temporary hack I could use to have a `bin/busybox` in STAGING_DIR ? > Your target binaries will be stripped of symbols, unless you prevent > this via BR2_STRIP_EXCLUDE_{FILE, DIRS} ... > > Remote debugging has less impact on your target installation. For this > you would need BR2_PACKAGE_HOST_GDB and BR2_PACKAGE_GDB_SERVER [1]. > > Kind regards, > Andreas > > > I am using 2021.08.3 > > > > Full config is as follow > > ``` > > BR2_pu32=y > > BR2_ENABLE_DEBUG=y > > BR2_DEBUG_3=y > > BR2_STATIC_LIBS=y > > BR2_FORTIFY_SOURCE_NONE=y > > BR2_TOOLCHAIN_EXTERNAL=y > > BR2_TOOLCHAIN_EXTERNAL_PATH="/opt/pu32-toolchain/" > > BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="$(ARCH)-elf" > > BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_5=y > > BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y > > # BR2_TOOLCHAIN_EXTERNAL_HAS_SSP is not set > > # BR2_TOOLCHAIN_EXTERNAL_INET_RPC is not set > > BR2_TOOLCHAIN_EXTERNAL_CXX=y > > BR2_TARGET_GENERIC_ISSUE="" > > BR2_ROOTFS_MERGED_USR=y > > BR2_TARGET_GENERIC_ROOT_PASSWD="root" > > BR2_SYSTEM_BIN_SH_BASH=y > > BR2_TARGET_GENERIC_GETTY_TERM="linux" > > BR2_TARGET_GENERIC_GETTY_OPTIONS="-n -l /bin/-bash" > > BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y > > BR2_PACKAGE_GDB=y > > BR2_PACKAGE_ZLIB=y > > BR2_PACKAGE_ZLIB_NG=y > > BR2_PACKAGE_DHCP=y > > BR2_PACKAGE_DHCP_CLIENT=y > > BR2_PACKAGE_IPROUTE2=y > > BR2_PACKAGE_LRZSZ=y > > BR2_PACKAGE_SOCAT=y > > BR2_PACKAGE_HTOP=y > > BR2_PACKAGE_NANO=y > > # BR2_PACKAGE_NANO_TINY is not set > > BR2_TARGET_ROOTFS_EXT2=y > > BR2_TARGET_ROOTFS_EXT2_4=y > > BR2_TARGET_ROOTFS_EXT2_SIZE="64M" > > # BR2_TARGET_ROOTFS_TAR is not set > > ``` > > [1] https://sourceware.org/gdb/current/onlinedocs/gdb/Server.html#Server From arnout at mind.be Wed Feb 23 18:51:20 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 23 Feb 2022 19:51:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/re2: fix build with gcc <= 5 In-Reply-To: References: <20220221172900.1937856-1-fontaine.fabrice@gmail.com> <20220221200044.GA2166282@scaer> Message-ID: On 21/02/2022 23:05, Fabrice Fontaine wrote: > Yann, > > Le lun. 21 f?vr. 2022 ? 21:00, Yann E. MORIN a ?crit : >> >> Fabrice, All, >> >> On 2022-02-21 18:29 +0100, Fabrice Fontaine spake thusly: >>> Fix the following build failure with gcc <= 5 raised since bump to >>> version 2022-02-01 in commit d2cf91e0c6a082261cc7ebb06dfdbd7bc2c2956f >>> and >>> https://github.com/google/re2/commit/a022cc0c55b0519629d64d775e7a5195af34a477 >>> >>> ./re2/sparse_array.h:266:37: warning: defaulted and deleted functions only available with -std=c++11 or -std=gnu++11 >>> SparseArray::SparseArray() = default; >>> ^ >>> ./re2/sparse_array.h: In copy constructor 're2::SparseArray::SparseArray(const re2::SparseArray&)': >>> ./re2/sparse_array.h:273:3: error: 'copy_n' is not a member of 'std' >>> std::copy_n(src.sparse_.data(), src.max_size(), sparse_.data()); >>> ^ >>> >>> Fixes: >>> - http://autobuild.buildroot.org/results/8ebbac67f32fe24416a1f72aad0afd42b567b403 >>> >>> Signed-off-by: Fabrice Fontaine >>> --- >>> package/re2/re2.mk | 15 ++++++++++----- >>> 1 file changed, 10 insertions(+), 5 deletions(-) >>> >>> diff --git a/package/re2/re2.mk b/package/re2/re2.mk >>> index 41392cb179..cc5fed71fa 100644 >>> --- a/package/re2/re2.mk >>> +++ b/package/re2/re2.mk >>> @@ -10,20 +10,25 @@ RE2_LICENSE = BSD-3-Clause >>> RE2_LICENSE_FILES = LICENSE >>> RE2_INSTALL_STAGING = YES >>> >>> +RE2_MAKE_OPTS = \ >>> + $(TARGET_CONFIGURE_OPTS) \ >>> + CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" \ >>> + prefix=/usr >> >> Is there a reason to have 'prefix' be set during the build, instead of >> just the install steps? > I thought it was better to have it in a single place but I'll send a v2. Actually, in general it is possible that the prefix is used during the build to hardcode some paths. Not in this case I think, but it's good practice to keep these options identical during the build and install steps. The only one that should not be there in build is DESTDIR. Regards, Arnout >> >> Regards, >> Yann E. MORIN. >> >>> define RE2_BUILD_CMDS >>> - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ >>> + $(TARGET_MAKE_ENV) $(MAKE) $(RE2_MAKE_OPTS) \ >>> -C $(@D) $(if $(BR2_STATIC_LIBS),static) >>> endef >>> >>> define RE2_INSTALL_STAGING_CMDS >>> - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ >>> - DESTDIR="$(STAGING_DIR)" prefix=/usr -C $(@D) \ >>> + $(TARGET_MAKE_ENV) $(MAKE) $(RE2_MAKE_OPTS) \ >>> + DESTDIR="$(STAGING_DIR)" -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) \ >>> + $(TARGET_MAKE_ENV) $(MAKE) $(RE2_MAKE_OPTS) \ >>> + DESTDIR="$(TARGET_DIR)" -C $(@D) \ >>> $(if $(BR2_STATIC_LIBS),static-install,install) >>> endef >>> >>> -- >>> 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. | >> '------------------------------^-------^------------------^--------------------' > Best Regards, > > Fabrice > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From br015 at umbiko.net Wed Feb 23 19:02:46 2022 From: br015 at umbiko.net (Andreas Ziegler) Date: Wed, 23 Feb 2022 19:02:46 +0000 Subject: [Buildroot] STAGING_DIR does not contain executables found in TARGET_DIR In-Reply-To: References: <256f0da3b8d983a84ea84de250c56bb0@umbiko.net> Message-ID: <5ecd33a2418e1a181df7444064c8050b@umbiko.net> On 2022-02-23 18:29, William Tambe wrote: > On Wed, Feb 23, 2022 at 5:30 AM Andreas Ziegler > wrote: >> >> Hi William, >> >> On 2022-02-23 07:11, William Tambe wrote: >> >> > Please help determining why STAGING_DIR does not contain executables >> > found in TARGET_DIR ? >> > >> > I am expecting to find debug version of all executables in TARGET_DIR, >> > but executables such as /bin/busybox are missing from STAGING_DIR . >> >> If you look at your packages' definition (.mk) files, you will find a >> few with *_INSTALL_STAGING = YES. This is responsible for the >> (additional) installation in STAGING_DIR. The reason for this is that >> some packages need to provide information during the build process, >> that >> is not needed later for operation on the target. To save space on the >> target system, a two-stage approach is used. >> >> Example: your configuration includes zlib-ng: the library itself is >> present both in STAGING_DIR and in TARGET_DIR, header and >> ldconfig-related files will be found in STAGING_DIR only. On the >> other >> hand, Busybox is not referenced by other packages (it does not export >> any interfaces), so it does not have an installation in STAGING_DIR. >> > > Is there a temporary hack I could use to have a `bin/busybox` in > STAGING_DIR ? You might try to just enable BUSYBOX_INSTALL_STAGING = YES, but it will probably also need definition of BUSYBOX_INSTALL_STAGING_CMDS. Another option would be a post-install hook: define BUSYBOX_INSTALL_STAGING $(INSTALL) -m 0755 &(@D)/busybox_unstripped $(STAGING_DIR)/bin/busybox endef BUSYBOX_POST_INSTALL_TARGET_HOOKS += BUSYBOX_INSTALL_STAGING >> Your target binaries will be stripped of symbols, unless you prevent >> this via BR2_STRIP_EXCLUDE_{FILE, DIRS} ... >> >> Remote debugging has less impact on your target installation. For this >> you would need BR2_PACKAGE_HOST_GDB and BR2_PACKAGE_GDB_SERVER [1]. >> >> Kind regards, >> Andreas >> >> > I am using 2021.08.3 >> > >> > Full config is as follow >> > ``` >> > BR2_pu32=y >> > BR2_ENABLE_DEBUG=y >> > BR2_DEBUG_3=y >> > BR2_STATIC_LIBS=y >> > BR2_FORTIFY_SOURCE_NONE=y >> > BR2_TOOLCHAIN_EXTERNAL=y >> > BR2_TOOLCHAIN_EXTERNAL_PATH="/opt/pu32-toolchain/" >> > BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="$(ARCH)-elf" >> > BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_5=y >> > BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y >> > # BR2_TOOLCHAIN_EXTERNAL_HAS_SSP is not set >> > # BR2_TOOLCHAIN_EXTERNAL_INET_RPC is not set >> > BR2_TOOLCHAIN_EXTERNAL_CXX=y >> > BR2_TARGET_GENERIC_ISSUE="" >> > BR2_ROOTFS_MERGED_USR=y >> > BR2_TARGET_GENERIC_ROOT_PASSWD="root" >> > BR2_SYSTEM_BIN_SH_BASH=y >> > BR2_TARGET_GENERIC_GETTY_TERM="linux" >> > BR2_TARGET_GENERIC_GETTY_OPTIONS="-n -l /bin/-bash" >> > BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y >> > BR2_PACKAGE_GDB=y >> > BR2_PACKAGE_ZLIB=y >> > BR2_PACKAGE_ZLIB_NG=y >> > BR2_PACKAGE_DHCP=y >> > BR2_PACKAGE_DHCP_CLIENT=y >> > BR2_PACKAGE_IPROUTE2=y >> > BR2_PACKAGE_LRZSZ=y >> > BR2_PACKAGE_SOCAT=y >> > BR2_PACKAGE_HTOP=y >> > BR2_PACKAGE_NANO=y >> > # BR2_PACKAGE_NANO_TINY is not set >> > BR2_TARGET_ROOTFS_EXT2=y >> > BR2_TARGET_ROOTFS_EXT2_4=y >> > BR2_TARGET_ROOTFS_EXT2_SIZE="64M" >> > # BR2_TARGET_ROOTFS_TAR is not set >> > ``` >> >> [1] >> https://sourceware.org/gdb/current/onlinedocs/gdb/Server.html#Server From geomatsi at gmail.com Wed Feb 23 19:14:32 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Wed, 23 Feb 2022 22:14:32 +0300 Subject: [Buildroot] [PATCH 0/4] orangepi: convert more boards to extlinux Message-ID: <20220223191436.3045255-1-geomatsi@gmail.com> Hi all, Recently extlinux infrastructure has been added for orangepi boards by Sergey Kuzminov: see commit c0312f71cc89 ("configs/orangepi_zero_defconfig: switch to extlinux"). This patch series converts to extlinux some of the boards that I have at my disposal: - orangepi-zero-plus2 - orangepi-pc-plus - orangepi-one All these changes have been build- and boot- tested. Also I added orangepi-zero-plus2 to my list in DEVELOPERS file to keep an eye on its build failures. Regards, Sergey Sergey Matyukevich (4): board/orangepi/orangepi-zero-plus2: switch to extlinux board/orangepi/orangepi-pc-plus: switch to extlinux board/orangepi/orangepi-one: switch to extlinux DEVELOPERS: add myself for orangepi-zero-plus2 DEVELOPERS | 2 + board/orangepi/orangepi-one/boot.cmd | 8 ---- board/orangepi/orangepi-one/genimage.cfg | 37 ---------------- board/orangepi/orangepi-pc-plus/boot.cmd | 8 ---- board/orangepi/orangepi-pc-plus/genimage.cfg | 43 ------------------- board/orangepi/orangepi-zero-plus2/boot.cmd | 6 --- .../orangepi/orangepi-zero-plus2/genimage.cfg | 41 ------------------ configs/orangepi_one_defconfig | 9 ++-- configs/orangepi_pc_plus_defconfig | 9 ++-- configs/orangepi_zero_plus2_defconfig | 14 +++--- 10 files changed, 16 insertions(+), 161 deletions(-) delete mode 100644 board/orangepi/orangepi-one/boot.cmd delete mode 100644 board/orangepi/orangepi-one/genimage.cfg delete mode 100644 board/orangepi/orangepi-pc-plus/boot.cmd delete mode 100644 board/orangepi/orangepi-pc-plus/genimage.cfg delete mode 100644 board/orangepi/orangepi-zero-plus2/boot.cmd delete mode 100644 board/orangepi/orangepi-zero-plus2/genimage.cfg -- 2.35.1 From geomatsi at gmail.com Wed Feb 23 19:14:33 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Wed, 23 Feb 2022 22:14:33 +0300 Subject: [Buildroot] [PATCH 1/4] board/orangepi/orangepi-zero-plus2: switch to extlinux In-Reply-To: <20220223191436.3045255-1-geomatsi@gmail.com> References: <20220223191436.3045255-1-geomatsi@gmail.com> Message-ID: <20220223191436.3045255-2-geomatsi@gmail.com> Switch to extlinux instead of U-Boot boot script. Drop custom boot script and genimage config. Instead use common orangepi files from board/orangepi/common. Signed-off-by: Sergey Matyukevich --- board/orangepi/orangepi-zero-plus2/boot.cmd | 6 --- .../orangepi/orangepi-zero-plus2/genimage.cfg | 41 ------------------- configs/orangepi_zero_plus2_defconfig | 14 ++++--- 3 files changed, 8 insertions(+), 53 deletions(-) delete mode 100644 board/orangepi/orangepi-zero-plus2/boot.cmd delete mode 100644 board/orangepi/orangepi-zero-plus2/genimage.cfg diff --git a/board/orangepi/orangepi-zero-plus2/boot.cmd b/board/orangepi/orangepi-zero-plus2/boot.cmd deleted file mode 100644 index aa5162004b..0000000000 --- a/board/orangepi/orangepi-zero-plus2/boot.cmd +++ /dev/null @@ -1,6 +0,0 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=PARTLABEL=rootfs rootwait - -fatload mmc 0 $kernel_addr_r Image -fatload mmc 0 $fdt_addr_r sun50i-h5-orangepi-zero-plus2.dtb - -booti $kernel_addr_r - $fdt_addr_r diff --git a/board/orangepi/orangepi-zero-plus2/genimage.cfg b/board/orangepi/orangepi-zero-plus2/genimage.cfg deleted file mode 100644 index 5a7ee7707a..0000000000 --- a/board/orangepi/orangepi-zero-plus2/genimage.cfg +++ /dev/null @@ -1,41 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "sun50i-h5-orangepi-zero-plus2.dtb", - "boot.scr" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - # for root=PARTLABEL support - partition-table-type = "gpt" - # default GPT location conflicts with bootloaders, move it after - gpt-location = 1M - } - - partition spl { - in-partition-table = "no" - image = "u-boot-sunxi-with-spl.bin" - offset = 8K - size = 1016K # 1MB - 8KB - } - - partition boot { - partition-type-uuid = "F" - bootable = "true" - image = "boot.vfat" - } - - # 'rootfs' will be used as the partition label, used - # with root=PARTLABEL=rootfs kernel command line - partition rootfs { - partition-type-uuid = "L" - image = "rootfs.ext4" - size = 256M - } -} diff --git a/configs/orangepi_zero_plus2_defconfig b/configs/orangepi_zero_plus2_defconfig index 9d88b37ac9..ef171c3ad3 100644 --- a/configs/orangepi_zero_plus2_defconfig +++ b/configs/orangepi_zero_plus2_defconfig @@ -27,9 +27,6 @@ BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null" -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-plus2/boot.cmd" # Kernel BR2_LINUX_KERNEL=y @@ -40,6 +37,8 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-zero-plus2" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero-plus2/linux-extras.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y # wireless firmware BR2_PACKAGE_LINUX_FIRMWARE=y @@ -58,8 +57,11 @@ 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 + +# host tools BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y + +# image scripts +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-plus2/genimage.cfg" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" -- 2.35.1 From geomatsi at gmail.com Wed Feb 23 19:14:34 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Wed, 23 Feb 2022 22:14:34 +0300 Subject: [Buildroot] [PATCH 2/4] board/orangepi/orangepi-pc-plus: switch to extlinux In-Reply-To: <20220223191436.3045255-1-geomatsi@gmail.com> References: <20220223191436.3045255-1-geomatsi@gmail.com> Message-ID: <20220223191436.3045255-3-geomatsi@gmail.com> Switch to extlinux instead of U-Boot boot script. Drop custom boot script and genimage config. Instead use common orangepi files from board/orangepi/common. Signed-off-by: Sergey Matyukevich --- board/orangepi/orangepi-pc-plus/boot.cmd | 8 ---- board/orangepi/orangepi-pc-plus/genimage.cfg | 43 -------------------- configs/orangepi_pc_plus_defconfig | 9 ++-- 3 files changed, 3 insertions(+), 57 deletions(-) delete mode 100644 board/orangepi/orangepi-pc-plus/boot.cmd delete mode 100644 board/orangepi/orangepi-pc-plus/genimage.cfg diff --git a/board/orangepi/orangepi-pc-plus/boot.cmd b/board/orangepi/orangepi-pc-plus/boot.cmd deleted file mode 100644 index c91f77942f..0000000000 --- a/board/orangepi/orangepi-pc-plus/boot.cmd +++ /dev/null @@ -1,8 +0,0 @@ -setenv fdt_high ffffffff - -setenv bootargs console=ttyS0,115200 earlyprintk root=PARTLABEL=rootfs rootwait - -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun8i-h3-orangepi-pc-plus.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/orangepi/orangepi-pc-plus/genimage.cfg b/board/orangepi/orangepi-pc-plus/genimage.cfg deleted file mode 100644 index 3812d785d5..0000000000 --- a/board/orangepi/orangepi-pc-plus/genimage.cfg +++ /dev/null @@ -1,43 +0,0 @@ -# Minimal SD card image for the OrangePi PC Plus -# -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h3-orangepi-pc-plus.dtb", - "boot.scr" - } - } - - size = 10M -} - -image sdcard.img { - hdimage { - # for root=PARTLABEL support - partition-table-type = "gpt" - # default GPT location conflicts with bootloaders, move it after - gpt-location = 1M - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot-sunxi-with-spl.bin" - offset = 8K - size = 1016K # 1MB - 8KB - } - - partition boot { - partition-type-uuid = "F" - bootable = "true" - image = "boot.vfat" - } - - # 'rootfs' will be used as the partition label, used - # with root=PARTLABEL=rootfs kernel command line - partition rootfs { - partition-type-uuid = "L" - image = "rootfs.ext4" - size = 512M - } -} diff --git a/configs/orangepi_pc_plus_defconfig b/configs/orangepi_pc_plus_defconfig index c3ff8bc417..ba946e5285 100644 --- a/configs/orangepi_pc_plus_defconfig +++ b/configs/orangepi_pc_plus_defconfig @@ -14,6 +14,7 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-pc-plus" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-pc-plus/linux-extras.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set @@ -27,14 +28,10 @@ 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_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-pc-plus/boot.cmd" -BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y +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-pc-plus/genimage.cfg" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" # wireless driver and firmware BR2_PACKAGE_RTL8189FS=y -- 2.35.1 From geomatsi at gmail.com Wed Feb 23 19:14:35 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Wed, 23 Feb 2022 22:14:35 +0300 Subject: [Buildroot] [PATCH 3/4] board/orangepi/orangepi-one: switch to extlinux In-Reply-To: <20220223191436.3045255-1-geomatsi@gmail.com> References: <20220223191436.3045255-1-geomatsi@gmail.com> Message-ID: <20220223191436.3045255-4-geomatsi@gmail.com> Switch to extlinux instead of U-Boot boot script. Drop custom boot script and genimage config. Instead use common orangepi files from board/orangepi/common. Signed-off-by: Sergey Matyukevich --- board/orangepi/orangepi-one/boot.cmd | 8 ----- board/orangepi/orangepi-one/genimage.cfg | 37 ------------------------ configs/orangepi_one_defconfig | 9 ++---- 3 files changed, 3 insertions(+), 51 deletions(-) delete mode 100644 board/orangepi/orangepi-one/boot.cmd delete mode 100644 board/orangepi/orangepi-one/genimage.cfg diff --git a/board/orangepi/orangepi-one/boot.cmd b/board/orangepi/orangepi-one/boot.cmd deleted file mode 100644 index ab616e6ac9..0000000000 --- a/board/orangepi/orangepi-one/boot.cmd +++ /dev/null @@ -1,8 +0,0 @@ -setenv fdt_high ffffffff - -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun8i-h3-orangepi-one.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/orangepi/orangepi-one/genimage.cfg b/board/orangepi/orangepi-one/genimage.cfg deleted file mode 100644 index 2a14dcdec2..0000000000 --- a/board/orangepi/orangepi-one/genimage.cfg +++ /dev/null @@ -1,37 +0,0 @@ -# Minimal SD card image for the OrangePi PC -# -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h3-orangepi-one.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_one_defconfig b/configs/orangepi_one_defconfig index 1a2772a307..ba128424a0 100644 --- a/configs/orangepi_one_defconfig +++ b/configs/orangepi_one_defconfig @@ -12,6 +12,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-one" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set @@ -25,11 +26,7 @@ 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-one/boot.cmd" -BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y +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-one/genimage.cfg" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" -- 2.35.1 From geomatsi at gmail.com Wed Feb 23 19:14:36 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Wed, 23 Feb 2022 22:14:36 +0300 Subject: [Buildroot] [PATCH 4/4] DEVELOPERS: add myself for orangepi-zero-plus2 In-Reply-To: <20220223191436.3045255-1-geomatsi@gmail.com> References: <20220223191436.3045255-1-geomatsi@gmail.com> Message-ID: <20220223191436.3045255-5-geomatsi@gmail.com> Signed-off-by: Sergey Matyukevich --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index ac702d8d0f..f29e889c52 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2545,10 +2545,12 @@ F: board/linksprite/pcduino F: board/orangepi/orangepi-zero F: board/orangepi/orangepi-one F: board/orangepi/orangepi-pc-plus/ +F: board/orangepi/orangepi-zero-plus2/ F: configs/linksprite_pcduino_defconfig F: configs/orangepi_one_defconfig F: configs/orangepi_pc_plus_defconfig F: configs/orangepi_zero_defconfig +F: configs/orangepi_zero_plus2_defconfig F: package/armbian-firmware/ F: package/hostapd/ F: package/rtl8189fs/ -- 2.35.1 From bugzilla at busybox.net Wed Feb 23 19:23:10 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 23 Feb 2022 19:23:10 +0000 Subject: [Buildroot] [Bug 14601] Python build fails on 2022.02-rc2 In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14601 --- Comment #1 from Arnout Vandecappelle --- I used this defconfig: BR2_aarch64=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_PACKAGE_PYTHON3=y and make O=/var/tmp/python finishes without error. This is with current master, but there are no relevant changes since 2022.02-rc2. -- You are receiving this mail because: You are on the CC list for the bug. From giulio.benetti at benettiengineering.com Wed Feb 23 19:40:41 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 23 Feb 2022 20:40:41 +0100 Subject: [Buildroot] [PATCH 4/4] DEVELOPERS: add myself for orangepi-zero-plus2 In-Reply-To: <20220223191436.3045255-5-geomatsi@gmail.com> References: <20220223191436.3045255-1-geomatsi@gmail.com> <20220223191436.3045255-5-geomatsi@gmail.com> Message-ID: Hi Sergey, please change the subject into: 'DEVELOPERS: add Sergey Matyukevich for orangepi-zero-plus2' because if you issue: $ git log --oneline you can't know who has been added. So please send a V2. Thank you! -- Giulio Benetti Benetti Engineering sas On 23/02/22 20:14, Sergey Matyukevich wrote: > Signed-off-by: Sergey Matyukevich > --- > DEVELOPERS | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/DEVELOPERS b/DEVELOPERS > index ac702d8d0f..f29e889c52 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -2545,10 +2545,12 @@ F: board/linksprite/pcduino > F: board/orangepi/orangepi-zero > F: board/orangepi/orangepi-one > F: board/orangepi/orangepi-pc-plus/ > +F: board/orangepi/orangepi-zero-plus2/ > F: configs/linksprite_pcduino_defconfig > F: configs/orangepi_one_defconfig > F: configs/orangepi_pc_plus_defconfig > F: configs/orangepi_zero_defconfig > +F: configs/orangepi_zero_plus2_defconfig > F: package/armbian-firmware/ > F: package/hostapd/ > F: package/rtl8189fs/ From giulio.benetti at benettiengineering.com Wed Feb 23 19:48:10 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 23 Feb 2022 20:48:10 +0100 Subject: [Buildroot] [PATCH 1/4] board/orangepi/orangepi-zero-plus2: switch to extlinux In-Reply-To: <20220223191436.3045255-2-geomatsi@gmail.com> References: <20220223191436.3045255-1-geomatsi@gmail.com> <20220223191436.3045255-2-geomatsi@gmail.com> Message-ID: <02e3f0e4-8ca3-a8f4-f281-0c419e4db62b@benettiengineering.com> Hi Sergey, On 23/02/22 20:14, Sergey Matyukevich wrote: > Switch to extlinux instead of U-Boot boot script. Drop custom > boot script and genimage config. Instead use common orangepi > files from board/orangepi/common. Commit log in this patch must be improved since you do more things than in patches 2-3/4, check below > Signed-off-by: Sergey Matyukevich > --- > board/orangepi/orangepi-zero-plus2/boot.cmd | 6 --- > .../orangepi/orangepi-zero-plus2/genimage.cfg | 41 ------------------- > configs/orangepi_zero_plus2_defconfig | 14 ++++--- > 3 files changed, 8 insertions(+), 53 deletions(-) > delete mode 100644 board/orangepi/orangepi-zero-plus2/boot.cmd > delete mode 100644 board/orangepi/orangepi-zero-plus2/genimage.cfg > > diff --git a/board/orangepi/orangepi-zero-plus2/boot.cmd b/board/orangepi/orangepi-zero-plus2/boot.cmd > deleted file mode 100644 > index aa5162004b..0000000000 > --- a/board/orangepi/orangepi-zero-plus2/boot.cmd > +++ /dev/null > @@ -1,6 +0,0 @@ > -setenv bootargs console=ttyS0,115200 earlyprintk root=PARTLABEL=rootfs rootwait > - > -fatload mmc 0 $kernel_addr_r Image > -fatload mmc 0 $fdt_addr_r sun50i-h5-orangepi-zero-plus2.dtb > - > -booti $kernel_addr_r - $fdt_addr_r > diff --git a/board/orangepi/orangepi-zero-plus2/genimage.cfg b/board/orangepi/orangepi-zero-plus2/genimage.cfg > deleted file mode 100644 > index 5a7ee7707a..0000000000 > --- a/board/orangepi/orangepi-zero-plus2/genimage.cfg > +++ /dev/null > @@ -1,41 +0,0 @@ > -image boot.vfat { > - vfat { > - files = { > - "Image", > - "sun50i-h5-orangepi-zero-plus2.dtb", > - "boot.scr" > - } > - } > - > - size = 64M > -} > - > -image sdcard.img { > - hdimage { > - # for root=PARTLABEL support > - partition-table-type = "gpt" > - # default GPT location conflicts with bootloaders, move it after > - gpt-location = 1M > - } > - > - partition spl { > - in-partition-table = "no" > - image = "u-boot-sunxi-with-spl.bin" > - offset = 8K > - size = 1016K # 1MB - 8KB > - } > - > - partition boot { > - partition-type-uuid = "F" > - bootable = "true" > - image = "boot.vfat" > - } > - > - # 'rootfs' will be used as the partition label, used > - # with root=PARTLABEL=rootfs kernel command line > - partition rootfs { > - partition-type-uuid = "L" > - image = "rootfs.ext4" > - size = 256M > - } > -} > diff --git a/configs/orangepi_zero_plus2_defconfig b/configs/orangepi_zero_plus2_defconfig > index 9d88b37ac9..ef171c3ad3 100644 > --- a/configs/orangepi_zero_plus2_defconfig > +++ b/configs/orangepi_zero_plus2_defconfig > @@ -27,9 +27,6 @@ BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > BR2_TARGET_UBOOT_SPL=y > BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" > BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null" > -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-plus2/boot.cmd" > > # Kernel > BR2_LINUX_KERNEL=y > @@ -40,6 +37,8 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-zero-plus2" > BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero-plus2/linux-extras.config" > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y Is this ^^^ needed only for this board? Because on the others there is not > # wireless firmware > BR2_PACKAGE_LINUX_FIRMWARE=y > @@ -58,8 +57,11 @@ 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 > + > +# host tools Here you beautify > BR2_PACKAGE_HOST_GENIMAGE=y > -BR2_PACKAGE_HOST_MTOOLS=y > + > +# image scripts Ditto, so worth mention it in commit log > +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-plus2/genimage.cfg" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" Best regards -- Giulio Benetti Benetti Engineering sas From peter at korsgaard.com Wed Feb 23 19:54:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Feb 2022 20:54:00 +0100 Subject: [Buildroot] [PATCH v1 1/1] configs/zynqmp_zcu10x: fix U-Boot dts config In-Reply-To: (Luca Ceresoli's message of "Wed, 23 Feb 2022 17:54:56 +0100") References: <20220223125118.2325363-1-neal.frager@xilinx.com> Message-ID: <871qzt5pgn.fsf@dell.be.48ers.dk> >>>>> "Luca" == Luca Ceresoli writes: > Hi Neal, > On 23/02/22 13:51, Neal Frager wrote: >> This patch: >> - fixes U-Boot issue when DEVICE_TREE environment variable undefined > This appears unrelated from the version bumps. Please send separate patches. >> - bumps U-Boot to Xilinx 2022.01-171 >> - bumps Linux to Xilinx 5.15-945 I don't have the zcu106 here anymore, but this new kernel didn't boot here (no output after 'Starting Linux'). Does it boot for you? -- Bye, Peter Korsgaard From arnout at mind.be Wed Feb 23 20:03:02 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 23 Feb 2022 21:03:02 +0100 Subject: [Buildroot] [PATCH 2/2] package/weston: drop fbdev In-Reply-To: <20220214193940.3615904-2-fontaine.fabrice@gmail.com> References: <20220214193940.3615904-1-fontaine.fabrice@gmail.com> <20220214193940.3615904-2-fontaine.fabrice@gmail.com> Message-ID: <8040cc3b-bb83-1a50-335e-3bdc4c1b32ef@mind.be> On 14/02/2022 20:39, Fabrice Fontaine wrote: > fbdev raises the following build failure since bump to version 10.0.0 in > commit f67a6e9b7a7be9adbc405b3126000056120a01af and > https://gitlab.freedesktop.org/wayland/weston/-/commit/6338dbd5816689b2f08f48b359a972e16ff038d8: > > ../output-1/build/weston-10.0.0/meson.build:133:7: ERROR: Tried to access unknown option 'backend-fbdev'. > > Drop fbdev to avoid this build failure as upstream is reluctant to > properly fix this issue by renaming the fbdev option in stable release: > https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/791 Reading that, it seems that only the option BR2_PACKAGE_WESTON_DEFAULT_FBDEV is broken and we could keep BR2_PACKAGE_WESTON_FBDEV. However, it makes sense to remove this deprecated option anyway, so applied both to master, thanks. Regards, Arnout > > Fixes: > - http://autobuild.buildroot.org/results/e669a6237c19783c627169c819d7372e20daaf54 > > Signed-off-by: Fabrice Fontaine > --- > Config.in.legacy | 12 ++++++++++++ > package/weston/Config.in | 8 -------- > package/weston/weston.mk | 6 ------ > 3 files changed, 12 insertions(+), 14 deletions(-) > > diff --git a/Config.in.legacy b/Config.in.legacy > index aefb0ba6ea..b90b9dbcbc 100644 > --- a/Config.in.legacy > +++ b/Config.in.legacy > @@ -146,6 +146,18 @@ endif > > comment "Legacy options removed in 2022.02" > > +config BR2_PACKAGE_WESTON_DEFAULT_FBDEV > + bool "weston fbdev removed" > + select BR2_LEGACY > + help > + fbdev was deprecated in weston 10.0.0. > + > +config BR2_PACKAGE_WESTON_FBDEV > + bool "weston fbdev compositor removed" > + select BR2_LEGACY > + help > + fbdev compositor was deprecated in weston 10.0.0. > + > config BR2_PACKAGE_LINUX_TOOLS_BPFTOOL > bool "bpftool was moved" > select BR2_LEGACY > diff --git a/package/weston/Config.in b/package/weston/Config.in > index 073a3ae567..6ad8241caa 100644 > --- a/package/weston/Config.in > +++ b/package/weston/Config.in > @@ -34,10 +34,6 @@ if BR2_PACKAGE_WESTON > choice > prompt "default compositor" > > -config BR2_PACKAGE_WESTON_DEFAULT_FBDEV > - bool "fbdev (deprecated)" > - select BR2_PACKAGE_WESTON_FBDEV > - > config BR2_PACKAGE_WESTON_DEFAULT_DRM > bool "drm" > select BR2_PACKAGE_WESTON_DRM > @@ -62,7 +58,6 @@ endchoice > > config BR2_PACKAGE_WESTON_DEFAULT_COMPOSITOR > string > - default "fbdev" if BR2_PACKAGE_WESTON_DEFAULT_FBDEV > default "drm" if BR2_PACKAGE_WESTON_DEFAULT_DRM > default "headless" if BR2_PACKAGE_WESTON_DEFAULT_HEADLESS > default "wayland" if BR2_PACKAGE_WESTON_DEFAULT_WAYLAND > @@ -71,9 +66,6 @@ config BR2_PACKAGE_WESTON_DEFAULT_COMPOSITOR > config BR2_PACKAGE_WESTON_DRM > bool "DRM compositor" > > -config BR2_PACKAGE_WESTON_FBDEV > - bool "fbdev compositor (deprecated)" > - > # FreeRDP needs threads and !static, already the case for weston > config BR2_PACKAGE_WESTON_RDP > bool "RDP compositor" > diff --git a/package/weston/weston.mk b/package/weston/weston.mk > index a0a18d9358..90cf160688 100644 > --- a/package/weston/weston.mk > +++ b/package/weston/weston.mk > @@ -85,12 +85,6 @@ else > WESTON_CONF_OPTS += -Dbackend-rdp=false > endif > > -ifeq ($(BR2_PACKAGE_WESTON_FBDEV),y) > -WESTON_CONF_OPTS += -Ddeprecated-backend-fbdev=true > -else > -WESTON_CONF_OPTS += -Ddeprecated-backend-fbdev=false > -endif > - > ifeq ($(BR2_PACKAGE_WESTON_DRM),y) > WESTON_CONF_OPTS += -Dbackend-drm=true > else From arnout at mind.be Wed Feb 23 19:59:05 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 23 Feb 2022 20:59:05 +0100 Subject: [Buildroot] [git commit] package/weston: drop GBM dependency from DRM option Message-ID: <20220223195526.449A383878@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=833f79fdeff1433396b7fa680fb6cbd6f1c65f36 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master upstream advocated that DRM backend can be built without GBM: https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/791 so drop dependencies on BR2_PACKAGE_MESA3D_OPENGL_EGL || BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL to allow DRM to be the default backend when fbdev will be removed in the follow-up patch Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/weston/Config.in | 9 --------- 1 file changed, 9 deletions(-) diff --git a/package/weston/Config.in b/package/weston/Config.in index d45e50baaa..073a3ae567 100644 --- a/package/weston/Config.in +++ b/package/weston/Config.in @@ -40,12 +40,8 @@ config BR2_PACKAGE_WESTON_DEFAULT_FBDEV config BR2_PACKAGE_WESTON_DEFAULT_DRM bool "drm" - depends on BR2_PACKAGE_MESA3D_OPENGL_EGL || BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL select BR2_PACKAGE_WESTON_DRM -comment "drm backend needs mesa3d w/ EGL driver" - depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL && !BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL - config BR2_PACKAGE_WESTON_DEFAULT_HEADLESS bool "headless" select BR2_PACKAGE_WESTON_HEADLESS @@ -74,11 +70,6 @@ config BR2_PACKAGE_WESTON_DEFAULT_COMPOSITOR config BR2_PACKAGE_WESTON_DRM bool "DRM compositor" - depends on BR2_PACKAGE_MESA3D_OPENGL_EGL || BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL - -# Uses libgbm from mesa3d -comment "DRM compositor needs an OpenGL EGL backend provided by mesa3d" - depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL && !BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL config BR2_PACKAGE_WESTON_FBDEV bool "fbdev compositor (deprecated)" From arnout at mind.be Wed Feb 23 19:59:59 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 23 Feb 2022 20:59:59 +0100 Subject: [Buildroot] [git commit] package/weston: drop fbdev Message-ID: <20220223195526.5059C83879@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=72021742574acd4d43ee1977cd2af3133245787a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master fbdev raises the following build failure since bump to version 10.0.0 in commit f67a6e9b7a7be9adbc405b3126000056120a01af and https://gitlab.freedesktop.org/wayland/weston/-/commit/6338dbd5816689b2f08f48b359a972e16ff038d8: ../output-1/build/weston-10.0.0/meson.build:133:7: ERROR: Tried to access unknown option 'backend-fbdev'. Drop fbdev to avoid this build failure as upstream is reluctant to properly fix this issue by renaming the fbdev option in stable release: https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/791 Fixes: - http://autobuild.buildroot.org/results/e669a6237c19783c627169c819d7372e20daaf54 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- Config.in.legacy | 12 ++++++++++++ package/weston/Config.in | 8 -------- package/weston/weston.mk | 6 ------ 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index aefb0ba6ea..b90b9dbcbc 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,18 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_WESTON_DEFAULT_FBDEV + bool "weston fbdev removed" + select BR2_LEGACY + help + fbdev was deprecated in weston 10.0.0. + +config BR2_PACKAGE_WESTON_FBDEV + bool "weston fbdev compositor removed" + select BR2_LEGACY + help + fbdev compositor was deprecated in weston 10.0.0. + config BR2_PACKAGE_LINUX_TOOLS_BPFTOOL bool "bpftool was moved" select BR2_LEGACY diff --git a/package/weston/Config.in b/package/weston/Config.in index 073a3ae567..6ad8241caa 100644 --- a/package/weston/Config.in +++ b/package/weston/Config.in @@ -34,10 +34,6 @@ if BR2_PACKAGE_WESTON choice prompt "default compositor" -config BR2_PACKAGE_WESTON_DEFAULT_FBDEV - bool "fbdev (deprecated)" - select BR2_PACKAGE_WESTON_FBDEV - config BR2_PACKAGE_WESTON_DEFAULT_DRM bool "drm" select BR2_PACKAGE_WESTON_DRM @@ -62,7 +58,6 @@ endchoice config BR2_PACKAGE_WESTON_DEFAULT_COMPOSITOR string - default "fbdev" if BR2_PACKAGE_WESTON_DEFAULT_FBDEV default "drm" if BR2_PACKAGE_WESTON_DEFAULT_DRM default "headless" if BR2_PACKAGE_WESTON_DEFAULT_HEADLESS default "wayland" if BR2_PACKAGE_WESTON_DEFAULT_WAYLAND @@ -71,9 +66,6 @@ config BR2_PACKAGE_WESTON_DEFAULT_COMPOSITOR config BR2_PACKAGE_WESTON_DRM bool "DRM compositor" -config BR2_PACKAGE_WESTON_FBDEV - bool "fbdev compositor (deprecated)" - # FreeRDP needs threads and !static, already the case for weston config BR2_PACKAGE_WESTON_RDP bool "RDP compositor" diff --git a/package/weston/weston.mk b/package/weston/weston.mk index a0a18d9358..90cf160688 100644 --- a/package/weston/weston.mk +++ b/package/weston/weston.mk @@ -85,12 +85,6 @@ else WESTON_CONF_OPTS += -Dbackend-rdp=false endif -ifeq ($(BR2_PACKAGE_WESTON_FBDEV),y) -WESTON_CONF_OPTS += -Ddeprecated-backend-fbdev=true -else -WESTON_CONF_OPTS += -Ddeprecated-backend-fbdev=false -endif - ifeq ($(BR2_PACKAGE_WESTON_DRM),y) WESTON_CONF_OPTS += -Dbackend-drm=true else From arnout at mind.be Wed Feb 23 20:05:42 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 23 Feb 2022 21:05:42 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/ghostscript: disable tesseract In-Reply-To: <20220214212301.4142823-1-fontaine.fabrice@gmail.com> References: <20220214212301.4142823-1-fontaine.fabrice@gmail.com> Message-ID: On 14/02/2022 22:23, Fabrice Fontaine wrote: > ghostscript embeds a local copy of tesseract-ocr which is enabled by > default since version 9.53.0 and > https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=7322ef87546c55b29056c1d96d8bdbb7f3ba53ef > > Since version 9.55.0 and > https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=5459f7aca1ded3b7cf96c339a2419f418aa406c7, > ghostscript expects that tesseract is disabled if threads are not > available resulting in the following build failure since commit > 7a4944569ce83b0b7b0cabd6e8aa184b8cb72a22: > > configure: error: Threading disabled or not available. Tesseract OCR relies on threading. Rerun configure with "--without-tesseract" to exclude OCR from the build > > So disable tesseract as there is no way to tell ghostscript to use a > system provided tesseract-ocr package I understand that v1 of this patch was not OK for that reason. However, we can't we keep on using the bundled tesseract in a build with threads? Regards, Arnout > > Fixes: > - http://autobuild.buildroot.org/results/fd35a47b2a77cf57c243ec1c88802b53ddca8f52 > > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2: > - Unconditionally disable tesseract > > package/ghostscript/ghostscript.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/ghostscript/ghostscript.mk b/package/ghostscript/ghostscript.mk > index 24a0c489a8..b2e5fe16bb 100644 > --- a/package/ghostscript/ghostscript.mk > +++ b/package/ghostscript/ghostscript.mk > @@ -44,6 +44,7 @@ GHOSTSCRIPT_CONF_OPTS = \ > --disable-gtk \ > --without-libpaper \ > --without-pdf \ > + --without-tesseract \ > --with-system-libtiff > > ifeq ($(BR2_PACKAGE_JBIG2DEC),y) From peter at korsgaard.com Wed Feb 23 20:06:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Feb 2022 21:06:39 +0100 Subject: [Buildroot] [PATCH v4 1/1] configs/zynqmp_zcu10x: fix U-Boot dts config In-Reply-To: <20220223180336.3372352-1-neal.frager@xilinx.com> (Neal Frager's message of "Wed, 23 Feb 2022 11:03:36 -0700") References: <20220223180336.3372352-1-neal.frager@xilinx.com> Message-ID: <87wnhl4ab4.fsf@dell.be.48ers.dk> >>>>> "Neal" == Neal Frager writes: > This patch: > - fixes U-Boot issue when DEVICE_TREE environment variable is not defined > Signed-off-by: Neal Frager > Reviewed-by: Peter Korsgaard > Reviewed-by: Luca Ceresoli > Tested-by: Peter Korsgaard > --- V1-> V2: > - removed version bumps from patch > - removed unnecessary blank lines from uboot-fragment.config files V2-> V3: > - fixed typo in zynqmp_zcu106_defconfig V3-> V4: > - re-added patch notes > --- > board/zynqmp/zcu102/uboot-fragment.config | 1 + > board/zynqmp/zcu106/uboot-fragment.config | 1 + Most (but not all) fragment files are using the .fragment suffix, so I renamed these to uboot.fragment. I dropped the reviewed-by and reworded the commit text a bit and committed - Thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 23 20:07:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Feb 2022 21:07:20 +0100 Subject: [Buildroot] [git commit] configs/zynqmp_zcu10x: fix U-Boot dts config Message-ID: <20220223200101.63F7383888@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=14b9a100eff6ee58d57b9b7b4c0da9a648a7e1bf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add a U-Boot config fragment to set the correct control device tree file for each board, rather than using the default (zcu100). Signed-off-by: Neal Frager Tested-by: Peter Korsgaard [Peter: reword commit message, rename fragment files] Signed-off-by: Peter Korsgaard --- board/zynqmp/zcu102/uboot.fragment | 1 + board/zynqmp/zcu106/uboot.fragment | 1 + configs/zynqmp_zcu102_defconfig | 1 + configs/zynqmp_zcu106_defconfig | 1 + 4 files changed, 4 insertions(+) diff --git a/board/zynqmp/zcu102/uboot.fragment b/board/zynqmp/zcu102/uboot.fragment new file mode 100644 index 0000000000..52d6d9dff8 --- /dev/null +++ b/board/zynqmp/zcu102/uboot.fragment @@ -0,0 +1 @@ +CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu102-rev1.0" diff --git a/board/zynqmp/zcu106/uboot.fragment b/board/zynqmp/zcu106/uboot.fragment new file mode 100644 index 0000000000..cd571171ac --- /dev/null +++ b/board/zynqmp/zcu106/uboot.fragment @@ -0,0 +1 @@ +CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu106-revA" diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig index 298ce2388c..4e96489179 100644 --- a/configs/zynqmp_zcu102_defconfig +++ b/configs/zynqmp_zcu102_defconfig @@ -25,6 +25,7 @@ BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2022.01-165-g667001319cbe511ce6353195fb4910ae5cb041ce" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/zcu102/uboot.fragment" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index 3e51cbfaab..0a97975aa0 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -25,6 +25,7 @@ BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2022.01-165-g667001319cbe511ce6353195fb4910ae5cb041ce" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/zcu106/uboot.fragment" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y From arnout at mind.be Wed Feb 23 20:09:27 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 23 Feb 2022 21:09:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5webkit: disable sampling profiler on musl In-Reply-To: <20220215134110.2365539-1-fontaine.fabrice@gmail.com> References: <20220215134110.2365539-1-fontaine.fabrice@gmail.com> Message-ID: <0517cc72-6918-18ec-f046-bfc2ec85da38@mind.be> On 15/02/2022 14:41, Fabrice Fontaine wrote: > Disable sampling profiler on musl to avoid the following build falure > raised since bump to version 5.212.0-alpha4 in commit > df0b0fe6919c0d0f3750f439a3cfa765232bd569: > > /home/buildroot/autobuild/instance-0/output-1/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/heap/MachineStackMarker.cpp:686:2: error: #error Need a way to get the frame pointer for another thread on this platform > 686 | #error Need a way to get the frame pointer for another thread on this platform > | ^~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/87f52db7f8ebefa4c1ae3dd70d4a7a460f9aca35 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/qt5/qt5webkit/qt5webkit.mk | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk > index 2084f3af52..024184e267 100644 > --- a/package/qt5/qt5webkit/qt5webkit.mk > +++ b/package/qt5/qt5webkit/qt5webkit.mk > @@ -39,6 +39,10 @@ ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) > QT5WEBKIT_DEPENDENCIES += qt5declarative > endif > > +ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) > +QT5WEBKIT_CONF_OPTS += -DENABLE_SAMPLING_PROFILER=OFF > +endif > + > QT5WEBKIT_CONF_OPTS += \ > -DENABLE_TOOLS=OFF \ > -DPORT=Qt \ From fontaine.fabrice at gmail.com Wed Feb 23 20:10:04 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 23 Feb 2022 21:10:04 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/ghostscript: disable tesseract In-Reply-To: References: <20220214212301.4142823-1-fontaine.fabrice@gmail.com> Message-ID: Le mer. 23 f?vr. 2022 ? 21:05, Arnout Vandecappelle a ?crit : > > > > On 14/02/2022 22:23, Fabrice Fontaine wrote: > > ghostscript embeds a local copy of tesseract-ocr which is enabled by > > default since version 9.53.0 and > > https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=7322ef87546c55b29056c1d96d8bdbb7f3ba53ef > > > > Since version 9.55.0 and > > https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=5459f7aca1ded3b7cf96c339a2419f418aa406c7, > > ghostscript expects that tesseract is disabled if threads are not > > available resulting in the following build failure since commit > > 7a4944569ce83b0b7b0cabd6e8aa184b8cb72a22: > > > > configure: error: Threading disabled or not available. Tesseract OCR relies on threading. Rerun configure with "--without-tesseract" to exclude OCR from the build > > > > So disable tesseract as there is no way to tell ghostscript to use a > > system provided tesseract-ocr package > > I understand that v1 of this patch was not OK for that reason. However, we > can't we keep on using the bundled tesseract in a build with threads? Why not, I'll send a v3. > > Regards, > Arnout > > > > > Fixes: > > - http://autobuild.buildroot.org/results/fd35a47b2a77cf57c243ec1c88802b53ddca8f52 > > > > Signed-off-by: Fabrice Fontaine > > --- > > Changes v1 -> v2: > > - Unconditionally disable tesseract > > > > package/ghostscript/ghostscript.mk | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/package/ghostscript/ghostscript.mk b/package/ghostscript/ghostscript.mk > > index 24a0c489a8..b2e5fe16bb 100644 > > --- a/package/ghostscript/ghostscript.mk > > +++ b/package/ghostscript/ghostscript.mk > > @@ -44,6 +44,7 @@ GHOSTSCRIPT_CONF_OPTS = \ > > --disable-gtk \ > > --without-libpaper \ > > --without-pdf \ > > + --without-tesseract \ > > --with-system-libtiff > > > > ifeq ($(BR2_PACKAGE_JBIG2DEC),y) Best Regards, Fabrice From arnout at mind.be Wed Feb 23 20:09:59 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 23 Feb 2022 21:09:59 +0100 Subject: [Buildroot] [git commit] package/qt5/qt5webkit: disable sampling profiler on musl Message-ID: <20220223200227.48F9183893@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1636f604bd61aa9ddd804ce174a51ee41db7e9d6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Disable sampling profiler on musl to avoid the following build falure raised since bump to version 5.212.0-alpha4 in commit df0b0fe6919c0d0f3750f439a3cfa765232bd569: /home/buildroot/autobuild/instance-0/output-1/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/heap/MachineStackMarker.cpp:686:2: error: #error Need a way to get the frame pointer for another thread on this platform 686 | #error Need a way to get the frame pointer for another thread on this platform | ^~~~~ Fixes: - http://autobuild.buildroot.org/results/87f52db7f8ebefa4c1ae3dd70d4a7a460f9aca35 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/qt5/qt5webkit/qt5webkit.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk index 2e96acc00f..6401c39d3d 100644 --- a/package/qt5/qt5webkit/qt5webkit.mk +++ b/package/qt5/qt5webkit/qt5webkit.mk @@ -42,6 +42,10 @@ ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) QT5WEBKIT_DEPENDENCIES += libexecinfo endif +ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) +QT5WEBKIT_CONF_OPTS += -DENABLE_SAMPLING_PROFILER=OFF +endif + QT5WEBKIT_CONF_OPTS += \ -DENABLE_TOOLS=OFF \ -DPORT=Qt \ From arnout at mind.be Wed Feb 23 20:13:46 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 23 Feb 2022 21:13:46 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/bluez5_utils: fix build with glibc < 2.25 In-Reply-To: <20220215224039.3567741-1-fontaine.fabrice@gmail.com> References: <20220215224039.3567741-1-fontaine.fabrice@gmail.com> Message-ID: On 15/02/2022 23:40, Fabrice Fontaine wrote: > Fix the following build failure with glibc < 2.25 raised since bump to > version 5.63 in commit d4c6cf4b1fc0f34e72ff047e76de53d3634f5184: > > plugins/autopair.c:20:24: fatal error: sys/random.h: No such file or directory > #include > ^ > > Fixes: > - http://autobuild.buildroot.org/results/6b8870d12e0804d6154230a7322c49416c1dc0e2 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. I've also updated the comment about AUTORECONF to say that both Makefile.am and configure.ac are patched. Regards, Arnout > --- > Changes v1 -> v2: > - Use upstream patch > > ...005-build-Fix-errors-with-glibc-2-25.patch | 312 ++++++++++++++++++ > 1 file changed, 312 insertions(+) > create mode 100644 package/bluez5_utils/0005-build-Fix-errors-with-glibc-2-25.patch > > diff --git a/package/bluez5_utils/0005-build-Fix-errors-with-glibc-2-25.patch b/package/bluez5_utils/0005-build-Fix-errors-with-glibc-2-25.patch > new file mode 100644 > index 0000000000..13033da7b2 > --- /dev/null > +++ b/package/bluez5_utils/0005-build-Fix-errors-with-glibc-2-25.patch > @@ -0,0 +1,312 @@ > +From fb57ad9b9d107856e5f1c8135da04ffa2f7a11ac Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Mon, 14 Feb 2022 21:17:39 +0100 > +Subject: build: Fix errors with glibc < 2.25 > + > +getrandom and sys/random.h are only available since glibc 2.25: > +https://www.gnu.org/software/gnulib/manual/html_node/sys_002frandom_002eh.html > +resulting in the following build failures since version 5.63 and > +https://git.kernel.org/pub/scm/bluetooth/bluez.git/log/?qt=grep&q=getrandom: > + > +plugins/autopair.c:20:24: fatal error: sys/random.h: No such file or directory > + #include > + ^ > + > +To fix this build failure, add util_getrandom and a fallback (borrowed > +from pipewire and licensed under MIT): > +https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/master/src/pipewire/utils.c > + > +Fixes: > + - http://autobuild.buildroot.org/results/6b8870d12e0804d6154230a7322c49416c1dc0e2 > + > +[Retrieved from: > +https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=fb57ad9b9d107856e5f1c8135da04ffa2f7a11ac] > +Signed-off-by: Fabrice Fontaine > +--- > + configure.ac | 4 +++- > + emulator/le.c | 3 +-- > + emulator/phy.c | 3 +-- > + peripheral/main.c | 4 ++-- > + plugins/autopair.c | 4 ++-- > + profiles/health/hdp.c | 4 ++-- > + profiles/health/mcap.c | 6 +++--- > + src/shared/util.c | 25 +++++++++++++++++++++++++ > + src/shared/util.h | 2 ++ > + tools/btgatt-server.c | 3 +-- > + 10 files changed, 42 insertions(+), 16 deletions(-) > + > +diff --git a/configure.ac b/configure.ac > +index 07d068a4d..441bd5f29 100644 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -54,6 +54,8 @@ AC_ARG_ENABLE(threads, AS_HELP_STRING([--enable-threads], > + > + AC_CHECK_FUNCS(explicit_bzero) > + > ++AC_CHECK_FUNCS(getrandom) > ++ > + AC_CHECK_FUNCS(rawmemchr) > + > + AC_CHECK_FUNC(signalfd, dummy=yes, > +@@ -68,7 +70,7 @@ AC_CHECK_LIB(pthread, pthread_create, dummy=yes, > + AC_CHECK_LIB(dl, dlopen, dummy=yes, > + AC_MSG_ERROR(dynamic linking loader is required)) > + > +-AC_CHECK_HEADERS(linux/types.h linux/if_alg.h linux/uinput.h linux/uhid.h) > ++AC_CHECK_HEADERS(linux/types.h linux/if_alg.h linux/uinput.h linux/uhid.h sys/random.h) > + > + PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.28, dummy=yes, > + AC_MSG_ERROR(GLib >= 2.28 is required)) > +diff --git a/emulator/le.c b/emulator/le.c > +index f8f313f2c..7656a657c 100644 > +--- a/emulator/le.c > ++++ b/emulator/le.c > +@@ -20,7 +20,6 @@ > + #include > + #include > + #include > +-#include > + #include > + > + #include "lib/bluetooth.h" > +@@ -509,7 +508,7 @@ static unsigned int get_adv_delay(void) > + /* The advertising delay is a pseudo-random value with a range > + * of 0 ms to 10 ms generated for each advertising event. > + */ > +- if (getrandom(&val, sizeof(val), 0) < 0) { > ++ if (util_getrandom(&val, sizeof(val), 0) < 0) { > + /* If it fails to get the random number, use a static value */ > + val = 5; > + } > +diff --git a/emulator/phy.c b/emulator/phy.c > +index 44cace438..7de85fb05 100644 > +--- a/emulator/phy.c > ++++ b/emulator/phy.c > +@@ -19,7 +19,6 @@ > + #include > + #include > + #include > +-#include > + #include > + #include > + #include > +@@ -174,7 +173,7 @@ struct bt_phy *bt_phy_new(void) > + mainloop_add_fd(phy->rx_fd, EPOLLIN, phy_rx_callback, phy, NULL); > + > + if (!get_random_bytes(&phy->id, sizeof(phy->id))) { > +- if (getrandom(&phy->id, sizeof(phy->id), 0) < 0) { > ++ if (util_getrandom(&phy->id, sizeof(phy->id), 0) < 0) { > + mainloop_remove_fd(phy->rx_fd); > + close(phy->tx_fd); > + close(phy->rx_fd); > +diff --git a/peripheral/main.c b/peripheral/main.c > +index 91adb45fc..b82d7caf6 100644 > +--- a/peripheral/main.c > ++++ b/peripheral/main.c > +@@ -25,13 +25,13 @@ > + #include > + #include > + #include > +-#include > + > + #ifndef WAIT_ANY > + #define WAIT_ANY (-1) > + #endif > + > + #include "src/shared/mainloop.h" > ++#include "src/shared/util.h" > + #include "peripheral/efivars.h" > + #include "peripheral/attach.h" > + #include "peripheral/gap.h" > +@@ -192,7 +192,7 @@ int main(int argc, char *argv[]) > + addr, 6) < 0) { > + printf("Generating new persistent static address\n"); > + > +- if (getrandom(addr, sizeof(addr), 0) < 0) { > ++ if (util_getrandom(addr, sizeof(addr), 0) < 0) { > + perror("Failed to get random static address"); > + return EXIT_FAILURE; > + } > +diff --git a/plugins/autopair.c b/plugins/autopair.c > +index a75ecebe4..0b09e893f 100644 > +--- a/plugins/autopair.c > ++++ b/plugins/autopair.c > +@@ -17,7 +17,6 @@ > + #include > + #include > + #include > +-#include > + > + #include > + > +@@ -29,6 +28,7 @@ > + #include "src/device.h" > + #include "src/log.h" > + #include "src/storage.h" > ++#include "src/shared/util.h" > + > + /* > + * Plugin to handle automatic pairing of devices with reduced user > +@@ -131,7 +131,7 @@ static ssize_t autopair_pincb(struct btd_adapter *adapter, > + if (attempt >= 4) > + return 0; > + > +- if (getrandom(&val, sizeof(val), 0) < 0) { > ++ if (util_getrandom(&val, sizeof(val), 0) < 0) { > + error("Failed to get a random pincode"); > + return 0; > + } > +diff --git a/profiles/health/hdp.c b/profiles/health/hdp.c > +index 9d9d1e824..b6590cd3a 100644 > +--- a/profiles/health/hdp.c > ++++ b/profiles/health/hdp.c > +@@ -16,7 +16,6 @@ > + #include > + #include > + #include > +-#include > + > + #include > + > +@@ -33,6 +32,7 @@ > + #include "src/device.h" > + #include "src/sdpd.h" > + #include "src/shared/timeout.h" > ++#include "src/shared/util.h" > + #include "btio/btio.h" > + > + #include "hdp_types.h" > +@@ -1490,7 +1490,7 @@ static void *generate_echo_packet(void) > + if (!buf) > + return NULL; > + > +- if (getrandom(buf, HDP_ECHO_LEN, 0) < 0) { > ++ if (util_getrandom(buf, HDP_ECHO_LEN, 0) < 0) { > + g_free(buf); > + return NULL; > + } > +diff --git a/profiles/health/mcap.c b/profiles/health/mcap.c > +index aad0a08a3..5d2bac3d9 100644 > +--- a/profiles/health/mcap.c > ++++ b/profiles/health/mcap.c > +@@ -19,7 +19,6 @@ > + #include > + #include > + #include > +-#include > + > + #include > + > +@@ -28,6 +27,7 @@ > + #include "btio/btio.h" > + #include "src/log.h" > + #include "src/shared/timeout.h" > ++#include "src/shared/util.h" > + > + #include "mcap.h" > + > +@@ -1905,7 +1905,7 @@ gboolean mcap_create_mcl(struct mcap_instance *mi, > + mcl->state = MCL_IDLE; > + bacpy(&mcl->addr, addr); > + set_default_cb(mcl); > +- if (getrandom(&val, sizeof(val), 0) < 0) { > ++ if (util_getrandom(&val, sizeof(val), 0) < 0) { > + mcap_instance_unref(mcl->mi); > + g_free(mcl); > + return FALSE; > +@@ -2049,7 +2049,7 @@ static void connect_mcl_event_cb(GIOChannel *chan, GError *gerr, > + mcl->mi = mcap_instance_ref(mi); > + bacpy(&mcl->addr, &dst); > + set_default_cb(mcl); > +- if (getrandom(&val, sizeof(val), 0) < 0) { > ++ if (util_getrandom(&val, sizeof(val), 0) < 0) { > + mcap_instance_unref(mcl->mi); > + g_free(mcl); > + goto drop; > +diff --git a/src/shared/util.c b/src/shared/util.c > +index 6e1c83057..33196bf8b 100644 > +--- a/src/shared/util.c > ++++ b/src/shared/util.c > +@@ -13,6 +13,7 @@ > + #endif > + > + #define _GNU_SOURCE > ++#include > + #include > + #include > + #include > +@@ -23,6 +24,10 @@ > + #include > + #include > + > ++#ifdef HAVE_SYS_RANDOM_H > ++#include > ++#endif > ++ > + #include "src/shared/util.h" > + > + void *util_malloc(size_t size) > +@@ -138,6 +143,26 @@ unsigned char util_get_dt(const char *parent, const char *name) > + return DT_UNKNOWN; > + } > + > ++/* Helper for getting a random in case getrandom unavailable (glibc < 2.25) */ > ++ssize_t util_getrandom(void *buf, size_t buflen, unsigned int flags) > ++{ > ++#ifdef HAVE_GETRANDOM > ++ return getrandom(buf, buflen, flags); > ++#else > ++ int fd; > ++ ssize_t bytes; > ++ > ++ fd = open("/dev/urandom", O_CLOEXEC); > ++ if (fd < 0) > ++ return -1; > ++ > ++ bytes = read(fd, buf, buflen); > ++ close(fd); > ++ > ++ return bytes; > ++#endif > ++} > ++ > + /* Helpers for bitfield operations */ > + > + /* Find unique id in range from 1 to max but no bigger than 64. */ > +diff --git a/src/shared/util.h b/src/shared/util.h > +index 8ef6132c4..c01eccf8a 100644 > +--- a/src/shared/util.h > ++++ b/src/shared/util.h > +@@ -103,6 +103,8 @@ void util_hexdump(const char dir, const unsigned char *buf, size_t len, > + > + unsigned char util_get_dt(const char *parent, const char *name); > + > ++ssize_t util_getrandom(void *buf, size_t buflen, unsigned int flags); > ++ > + uint8_t util_get_uid(uint64_t *bitmap, uint8_t max); > + void util_clear_uid(uint64_t *bitmap, uint8_t id); > + > +diff --git a/tools/btgatt-server.c b/tools/btgatt-server.c > +index 15d49a464..4a5d2b720 100644 > +--- a/tools/btgatt-server.c > ++++ b/tools/btgatt-server.c > +@@ -20,7 +20,6 @@ > + #include > + #include > + #include > +-#include > + > + #include "lib/bluetooth.h" > + #include "lib/hci.h" > +@@ -287,7 +286,7 @@ static bool hr_msrmt_cb(void *user_data) > + uint32_t cur_ee; > + uint32_t val; > + > +- if (getrandom(&val, sizeof(val), 0) < 0) > ++ if (util_getrandom(&val, sizeof(val), 0) < 0) > + return false; > + > + pdu[0] = 0x06; > +-- > +cgit > + From arnout at mind.be Wed Feb 23 20:12:40 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 23 Feb 2022 21:12:40 +0100 Subject: [Buildroot] [git commit] package/bluez5_utils: fix build with glibc < 2.25 Message-ID: <20220223200600.3BB998389E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6fc5c8e92c1d7997e48b207187d2d3c7ad42819c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with glibc < 2.25 raised since bump to version 5.63 in commit d4c6cf4b1fc0f34e72ff047e76de53d3634f5184: plugins/autopair.c:20:24: fatal error: sys/random.h: No such file or directory #include ^ Fixes: - http://autobuild.buildroot.org/results/6b8870d12e0804d6154230a7322c49416c1dc0e2 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../0005-build-Fix-errors-with-glibc-2-25.patch | 312 +++++++++++++++++++++ package/bluez5_utils/bluez5_utils.mk | 2 +- 2 files changed, 313 insertions(+), 1 deletion(-) diff --git a/package/bluez5_utils/0005-build-Fix-errors-with-glibc-2-25.patch b/package/bluez5_utils/0005-build-Fix-errors-with-glibc-2-25.patch new file mode 100644 index 0000000000..13033da7b2 --- /dev/null +++ b/package/bluez5_utils/0005-build-Fix-errors-with-glibc-2-25.patch @@ -0,0 +1,312 @@ +From fb57ad9b9d107856e5f1c8135da04ffa2f7a11ac Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 14 Feb 2022 21:17:39 +0100 +Subject: build: Fix errors with glibc < 2.25 + +getrandom and sys/random.h are only available since glibc 2.25: +https://www.gnu.org/software/gnulib/manual/html_node/sys_002frandom_002eh.html +resulting in the following build failures since version 5.63 and +https://git.kernel.org/pub/scm/bluetooth/bluez.git/log/?qt=grep&q=getrandom: + +plugins/autopair.c:20:24: fatal error: sys/random.h: No such file or directory + #include + ^ + +To fix this build failure, add util_getrandom and a fallback (borrowed +from pipewire and licensed under MIT): +https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/master/src/pipewire/utils.c + +Fixes: + - http://autobuild.buildroot.org/results/6b8870d12e0804d6154230a7322c49416c1dc0e2 + +[Retrieved from: +https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=fb57ad9b9d107856e5f1c8135da04ffa2f7a11ac] +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 4 +++- + emulator/le.c | 3 +-- + emulator/phy.c | 3 +-- + peripheral/main.c | 4 ++-- + plugins/autopair.c | 4 ++-- + profiles/health/hdp.c | 4 ++-- + profiles/health/mcap.c | 6 +++--- + src/shared/util.c | 25 +++++++++++++++++++++++++ + src/shared/util.h | 2 ++ + tools/btgatt-server.c | 3 +-- + 10 files changed, 42 insertions(+), 16 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 07d068a4d..441bd5f29 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -54,6 +54,8 @@ AC_ARG_ENABLE(threads, AS_HELP_STRING([--enable-threads], + + AC_CHECK_FUNCS(explicit_bzero) + ++AC_CHECK_FUNCS(getrandom) ++ + AC_CHECK_FUNCS(rawmemchr) + + AC_CHECK_FUNC(signalfd, dummy=yes, +@@ -68,7 +70,7 @@ AC_CHECK_LIB(pthread, pthread_create, dummy=yes, + AC_CHECK_LIB(dl, dlopen, dummy=yes, + AC_MSG_ERROR(dynamic linking loader is required)) + +-AC_CHECK_HEADERS(linux/types.h linux/if_alg.h linux/uinput.h linux/uhid.h) ++AC_CHECK_HEADERS(linux/types.h linux/if_alg.h linux/uinput.h linux/uhid.h sys/random.h) + + PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.28, dummy=yes, + AC_MSG_ERROR(GLib >= 2.28 is required)) +diff --git a/emulator/le.c b/emulator/le.c +index f8f313f2c..7656a657c 100644 +--- a/emulator/le.c ++++ b/emulator/le.c +@@ -20,7 +20,6 @@ + #include + #include + #include +-#include + #include + + #include "lib/bluetooth.h" +@@ -509,7 +508,7 @@ static unsigned int get_adv_delay(void) + /* The advertising delay is a pseudo-random value with a range + * of 0 ms to 10 ms generated for each advertising event. + */ +- if (getrandom(&val, sizeof(val), 0) < 0) { ++ if (util_getrandom(&val, sizeof(val), 0) < 0) { + /* If it fails to get the random number, use a static value */ + val = 5; + } +diff --git a/emulator/phy.c b/emulator/phy.c +index 44cace438..7de85fb05 100644 +--- a/emulator/phy.c ++++ b/emulator/phy.c +@@ -19,7 +19,6 @@ + #include + #include + #include +-#include + #include + #include + #include +@@ -174,7 +173,7 @@ struct bt_phy *bt_phy_new(void) + mainloop_add_fd(phy->rx_fd, EPOLLIN, phy_rx_callback, phy, NULL); + + if (!get_random_bytes(&phy->id, sizeof(phy->id))) { +- if (getrandom(&phy->id, sizeof(phy->id), 0) < 0) { ++ if (util_getrandom(&phy->id, sizeof(phy->id), 0) < 0) { + mainloop_remove_fd(phy->rx_fd); + close(phy->tx_fd); + close(phy->rx_fd); +diff --git a/peripheral/main.c b/peripheral/main.c +index 91adb45fc..b82d7caf6 100644 +--- a/peripheral/main.c ++++ b/peripheral/main.c +@@ -25,13 +25,13 @@ + #include + #include + #include +-#include + + #ifndef WAIT_ANY + #define WAIT_ANY (-1) + #endif + + #include "src/shared/mainloop.h" ++#include "src/shared/util.h" + #include "peripheral/efivars.h" + #include "peripheral/attach.h" + #include "peripheral/gap.h" +@@ -192,7 +192,7 @@ int main(int argc, char *argv[]) + addr, 6) < 0) { + printf("Generating new persistent static address\n"); + +- if (getrandom(addr, sizeof(addr), 0) < 0) { ++ if (util_getrandom(addr, sizeof(addr), 0) < 0) { + perror("Failed to get random static address"); + return EXIT_FAILURE; + } +diff --git a/plugins/autopair.c b/plugins/autopair.c +index a75ecebe4..0b09e893f 100644 +--- a/plugins/autopair.c ++++ b/plugins/autopair.c +@@ -17,7 +17,6 @@ + #include + #include + #include +-#include + + #include + +@@ -29,6 +28,7 @@ + #include "src/device.h" + #include "src/log.h" + #include "src/storage.h" ++#include "src/shared/util.h" + + /* + * Plugin to handle automatic pairing of devices with reduced user +@@ -131,7 +131,7 @@ static ssize_t autopair_pincb(struct btd_adapter *adapter, + if (attempt >= 4) + return 0; + +- if (getrandom(&val, sizeof(val), 0) < 0) { ++ if (util_getrandom(&val, sizeof(val), 0) < 0) { + error("Failed to get a random pincode"); + return 0; + } +diff --git a/profiles/health/hdp.c b/profiles/health/hdp.c +index 9d9d1e824..b6590cd3a 100644 +--- a/profiles/health/hdp.c ++++ b/profiles/health/hdp.c +@@ -16,7 +16,6 @@ + #include + #include + #include +-#include + + #include + +@@ -33,6 +32,7 @@ + #include "src/device.h" + #include "src/sdpd.h" + #include "src/shared/timeout.h" ++#include "src/shared/util.h" + #include "btio/btio.h" + + #include "hdp_types.h" +@@ -1490,7 +1490,7 @@ static void *generate_echo_packet(void) + if (!buf) + return NULL; + +- if (getrandom(buf, HDP_ECHO_LEN, 0) < 0) { ++ if (util_getrandom(buf, HDP_ECHO_LEN, 0) < 0) { + g_free(buf); + return NULL; + } +diff --git a/profiles/health/mcap.c b/profiles/health/mcap.c +index aad0a08a3..5d2bac3d9 100644 +--- a/profiles/health/mcap.c ++++ b/profiles/health/mcap.c +@@ -19,7 +19,6 @@ + #include + #include + #include +-#include + + #include + +@@ -28,6 +27,7 @@ + #include "btio/btio.h" + #include "src/log.h" + #include "src/shared/timeout.h" ++#include "src/shared/util.h" + + #include "mcap.h" + +@@ -1905,7 +1905,7 @@ gboolean mcap_create_mcl(struct mcap_instance *mi, + mcl->state = MCL_IDLE; + bacpy(&mcl->addr, addr); + set_default_cb(mcl); +- if (getrandom(&val, sizeof(val), 0) < 0) { ++ if (util_getrandom(&val, sizeof(val), 0) < 0) { + mcap_instance_unref(mcl->mi); + g_free(mcl); + return FALSE; +@@ -2049,7 +2049,7 @@ static void connect_mcl_event_cb(GIOChannel *chan, GError *gerr, + mcl->mi = mcap_instance_ref(mi); + bacpy(&mcl->addr, &dst); + set_default_cb(mcl); +- if (getrandom(&val, sizeof(val), 0) < 0) { ++ if (util_getrandom(&val, sizeof(val), 0) < 0) { + mcap_instance_unref(mcl->mi); + g_free(mcl); + goto drop; +diff --git a/src/shared/util.c b/src/shared/util.c +index 6e1c83057..33196bf8b 100644 +--- a/src/shared/util.c ++++ b/src/shared/util.c +@@ -13,6 +13,7 @@ + #endif + + #define _GNU_SOURCE ++#include + #include + #include + #include +@@ -23,6 +24,10 @@ + #include + #include + ++#ifdef HAVE_SYS_RANDOM_H ++#include ++#endif ++ + #include "src/shared/util.h" + + void *util_malloc(size_t size) +@@ -138,6 +143,26 @@ unsigned char util_get_dt(const char *parent, const char *name) + return DT_UNKNOWN; + } + ++/* Helper for getting a random in case getrandom unavailable (glibc < 2.25) */ ++ssize_t util_getrandom(void *buf, size_t buflen, unsigned int flags) ++{ ++#ifdef HAVE_GETRANDOM ++ return getrandom(buf, buflen, flags); ++#else ++ int fd; ++ ssize_t bytes; ++ ++ fd = open("/dev/urandom", O_CLOEXEC); ++ if (fd < 0) ++ return -1; ++ ++ bytes = read(fd, buf, buflen); ++ close(fd); ++ ++ return bytes; ++#endif ++} ++ + /* Helpers for bitfield operations */ + + /* Find unique id in range from 1 to max but no bigger than 64. */ +diff --git a/src/shared/util.h b/src/shared/util.h +index 8ef6132c4..c01eccf8a 100644 +--- a/src/shared/util.h ++++ b/src/shared/util.h +@@ -103,6 +103,8 @@ void util_hexdump(const char dir, const unsigned char *buf, size_t len, + + unsigned char util_get_dt(const char *parent, const char *name); + ++ssize_t util_getrandom(void *buf, size_t buflen, unsigned int flags); ++ + uint8_t util_get_uid(uint64_t *bitmap, uint8_t max); + void util_clear_uid(uint64_t *bitmap, uint8_t id); + +diff --git a/tools/btgatt-server.c b/tools/btgatt-server.c +index 15d49a464..4a5d2b720 100644 +--- a/tools/btgatt-server.c ++++ b/tools/btgatt-server.c +@@ -20,7 +20,6 @@ + #include + #include + #include +-#include + + #include "lib/bluetooth.h" + #include "lib/hci.h" +@@ -287,7 +286,7 @@ static bool hr_msrmt_cb(void *user_data) + uint32_t cur_ee; + uint32_t val; + +- if (getrandom(&val, sizeof(val), 0) < 0) ++ if (util_getrandom(&val, sizeof(val), 0) < 0) + return false; + + pdu[0] = 0x06; +-- +cgit + diff --git a/package/bluez5_utils/bluez5_utils.mk b/package/bluez5_utils/bluez5_utils.mk index 7c2561b864..3d76cfb7dc 100644 --- a/package/bluez5_utils/bluez5_utils.mk +++ b/package/bluez5_utils/bluez5_utils.mk @@ -13,7 +13,7 @@ BLUEZ5_UTILS_LICENSE = GPL-2.0+, LGPL-2.1+ BLUEZ5_UTILS_LICENSE_FILES = COPYING COPYING.LIB BLUEZ5_UTILS_CPE_ID_VENDOR = bluez BLUEZ5_UTILS_CPE_ID_PRODUCT = bluez -# We're patching Makefile.am +# We're patching Makefile.am and configure.ac BLUEZ5_UTILS_AUTORECONF = YES BLUEZ5_UTILS_DEPENDENCIES = \ From arnout at mind.be Wed Feb 23 20:20:29 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 23 Feb 2022 21:20:29 +0100 Subject: [Buildroot] [git commit] package/frr: set FRR_XREF_NO_NOTE Message-ID: <20220223201530.265CB838A7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a7062df3272be4a012e0b8288f17bb7e0220bbdb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Set FRR_XREF_NO_NOTE to avoid the following build failures with microblazeel, nds32 and xtensa raised since bump to version 8.1 in commit ca2753fd47d47e5ad0eec16ea62f7b7f096331b6: _clippy.ELFAccessError: virtual address (538157256) not found in program headers [...] /tmp/ccFGv94v.s:13: Error: can't resolve `__start_xref_array' {*UND* section} - `L0' {.note.FRR section} /tmp/ccFGv94v.s:14: Error: can't resolve `__stop_xref_array' {*UND* section} - `L0' {.note.FRR section} Here is an extract of https://github.com/FRRouting/frr/blob/7347a4859d4b984cea0aef769a16622d3f02e44f/lib/xref.h: "the following blurb emits an ELF note indicating start and end of the xref array in the binary. This is technically the "correct" entry point for external tools reading xrefs out of an ELF shared library or executable. ... FRR itself does not need this note to operate correctly, so if you have some build issue with it just add -DFRR_XREF_NO_NOTE to your build flags to disable it." In other words, this is only *possibly* needed for another package that wants to extracts the xrefs. We currently don't have anything that depends on frr in-tree, and it's not even installed in staging, so it's hard to check, but it seems pretty unlikely that this is really needed. Fixes: - http://autobuild.buildroot.org/results/3cdb50f5e5a1b3f37a6edcd4276fcbf015e28828 - http://autobuild.buildroot.org/results/a3cc0b5090a1faa2bca9c8dfe0fec9b6a918ba4d - http://autobuild.buildroot.org/results/694cc65478a82ec93d2074252892036855cdc49d Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/frr/frr.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/frr/frr.mk b/package/frr/frr.mk index cc83016f9f..0e6ab7a815 100644 --- a/package/frr/frr.mk +++ b/package/frr/frr.mk @@ -17,7 +17,9 @@ FRR_DEPENDENCIES = host-frr readline json-c libyang libnl \ HOST_FRR_DEPENDENCIES = host-flex host-bison host-elfutils host-python3 -FRR_CONF_ENV = ac_cv_lib_cunit_CU_initialize_registry=no +FRR_CONF_ENV = \ + ac_cv_lib_cunit_CU_initialize_registry=no \ + CFLAGS="$(TARGET_CFLAGS) -DFRR_XREF_NO_NOTE" FRR_CONF_OPTS = --with-clippy=$(HOST_DIR)/bin/clippy \ --sysconfdir=/etc/frr \ From arnout at mind.be Wed Feb 23 20:24:54 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 23 Feb 2022 21:24:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/frr: set FRR_XREF_NO_NOTE In-Reply-To: <20220216142213.1472039-1-fontaine.fabrice@gmail.com> References: <20220216142213.1472039-1-fontaine.fabrice@gmail.com> Message-ID: <4ed0a044-0d93-8dca-8a13-312c85a5be79@mind.be> On 16/02/2022 15:22, Fabrice Fontaine wrote: > Set FRR_XREF_NO_NOTE to avoid the following build failures with > microblazeel, nds32 and xtensa raised since bump to version 8.1 in > commit ca2753fd47d47e5ad0eec16ea62f7b7f096331b6: > > _clippy.ELFAccessError: virtual address (538157256) not found in program headers > > [...] > > /tmp/ccFGv94v.s:13: Error: can't resolve `__start_xref_array' {*UND* section} - `L0' {.note.FRR section} > /tmp/ccFGv94v.s:14: Error: can't resolve `__stop_xref_array' {*UND* section} - `L0' {.note.FRR section} > > Here is an extract of > https://github.com/FRRouting/frr/blob/7347a4859d4b984cea0aef769a16622d3f02e44f/lib/xref.h: > "FRR itself does not need this note to operate correctly, so if you have > some build issue with it just add -DFRR_XREF_NO_NOTE to your build flags > to disable it." There's some more text a bit higher up that says that it actually *is* needed for "external tools reading xrefs out of an ELF shared library or executable". But it seems pretty unlikely that this is going to be an issue in Buildroot context. So I just extended the commit message with that and applied to master, thanks. Regards, Arnout > > Fixes: > - http://autobuild.buildroot.org/results/3cdb50f5e5a1b3f37a6edcd4276fcbf015e28828 > - http://autobuild.buildroot.org/results/a3cc0b5090a1faa2bca9c8dfe0fec9b6a918ba4d > - http://autobuild.buildroot.org/results/694cc65478a82ec93d2074252892036855cdc49d > > Signed-off-by: Fabrice Fontaine > --- > package/frr/frr.mk | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/package/frr/frr.mk b/package/frr/frr.mk > index cc83016f9f..0e6ab7a815 100644 > --- a/package/frr/frr.mk > +++ b/package/frr/frr.mk > @@ -17,7 +17,9 @@ FRR_DEPENDENCIES = host-frr readline json-c libyang libnl \ > > HOST_FRR_DEPENDENCIES = host-flex host-bison host-elfutils host-python3 > > -FRR_CONF_ENV = ac_cv_lib_cunit_CU_initialize_registry=no > +FRR_CONF_ENV = \ > + ac_cv_lib_cunit_CU_initialize_registry=no \ > + CFLAGS="$(TARGET_CFLAGS) -DFRR_XREF_NO_NOTE" > > FRR_CONF_OPTS = --with-clippy=$(HOST_DIR)/bin/clippy \ > --sysconfdir=/etc/frr \ From fontaine.fabrice at gmail.com Wed Feb 23 20:26:48 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 23 Feb 2022 21:26:48 +0100 Subject: [Buildroot] [PATCH v3, 1/1] package/ghostscript: disable tesseract without threads Message-ID: <20220223202648.3398307-1-fontaine.fabrice@gmail.com> ghostscript embeds a local copy of tesseract-ocr which is enabled by default since version 9.53.0 and https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=7322ef87546c55b29056c1d96d8bdbb7f3ba53ef Since version 9.55.0 and https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=5459f7aca1ded3b7cf96c339a2419f418aa406c7, ghostscript expects that tesseract is disabled if threads are not available resulting in the following build failure since commit 7a4944569ce83b0b7b0cabd6e8aa184b8cb72a22: configure: error: Threading disabled or not available. Tesseract OCR relies on threading. Rerun configure with "--without-tesseract" to exclude OCR from the build So disable tesseract if threads are not available. It should be noted that there is no way to tell ghostscript to use a system provided tesseract-ocr package. Fixes: - http://autobuild.buildroot.org/results/fd35a47b2a77cf57c243ec1c88802b53ddca8f52 Signed-off-by: Fabrice Fontaine --- Changes v2 -> v3 (after review of Arnout Vandecappelle): - Only disable tesseract without threads Changes v1 -> v2: - Unconditionally disable tesseract package/ghostscript/ghostscript.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/ghostscript/ghostscript.mk b/package/ghostscript/ghostscript.mk index 24a0c489a8..02cb35fcfc 100644 --- a/package/ghostscript/ghostscript.mk +++ b/package/ghostscript/ghostscript.mk @@ -83,4 +83,8 @@ else GHOSTSCRIPT_CONF_OPTS += --without-x endif +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) +GHOSTSCRIPT_CONF_OPTS += --without-tesseract +endif + $(eval $(autotools-package)) -- 2.34.1 From arnout at mind.be Wed Feb 23 20:27:57 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 23 Feb 2022 21:27:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/dialog: bump to version 1.3-20220117 In-Reply-To: <20220216204538.2450673-1-fontaine.fabrice@gmail.com> References: <20220216204538.2450673-1-fontaine.fabrice@gmail.com> Message-ID: On 16/02/2022 21:45, Fabrice Fontaine wrote: > https://invisible-mirror.net/dialog/CHANGES.html#index-t20220117 > > Fixes: > - https://bugs.buildroot.org/show_bug.cgi?id=14596 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/dialog/dialog.hash | 2 +- > package/dialog/dialog.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/dialog/dialog.hash b/package/dialog/dialog.hash > index 2286590b66..3136d18b2b 100644 > --- a/package/dialog/dialog.hash > +++ b/package/dialog/dialog.hash > @@ -1,4 +1,4 @@ > # Locally calculated after checking pgp signature > -sha256 466163e8b97c2b7709d00389199add3156bd813f60ccb0335d0a30f2d4a17f99 dialog-1.3-20200327.tgz > +sha256 754cb6bf7dc6a9ac5c1f80c13caa4d976e30a5a6e8b46f17b3bb9b080c31041f dialog-1.3-20220117.tgz > # Locally computed > sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING > diff --git a/package/dialog/dialog.mk b/package/dialog/dialog.mk > index 1c98d354e3..681f8ec9fe 100644 > --- a/package/dialog/dialog.mk > +++ b/package/dialog/dialog.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -DIALOG_VERSION = 1.3-20200327 > +DIALOG_VERSION = 1.3-20220117 > DIALOG_SOURCE = dialog-$(DIALOG_VERSION).tgz > DIALOG_SITE = https://invisible-mirror.net/archives/dialog > DIALOG_CONF_OPTS = --with-ncurses --with-curses-dir=$(STAGING_DIR)/usr \ From arnout at mind.be Wed Feb 23 20:27:25 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 23 Feb 2022 21:27:25 +0100 Subject: [Buildroot] [git commit branch/next] package/dialog: bump to version 1.3-20220117 Message-ID: <20220223202010.4AFB1838B0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1868f372c02760e324f91ebcf5685323855351f1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://invisible-mirror.net/dialog/CHANGES.html#index-t20220117 Fixes: - https://bugs.buildroot.org/show_bug.cgi?id=14596 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/dialog/dialog.hash | 2 +- package/dialog/dialog.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dialog/dialog.hash b/package/dialog/dialog.hash index 2286590b66..3136d18b2b 100644 --- a/package/dialog/dialog.hash +++ b/package/dialog/dialog.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 466163e8b97c2b7709d00389199add3156bd813f60ccb0335d0a30f2d4a17f99 dialog-1.3-20200327.tgz +sha256 754cb6bf7dc6a9ac5c1f80c13caa4d976e30a5a6e8b46f17b3bb9b080c31041f dialog-1.3-20220117.tgz # Locally computed sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/dialog/dialog.mk b/package/dialog/dialog.mk index 1c98d354e3..681f8ec9fe 100644 --- a/package/dialog/dialog.mk +++ b/package/dialog/dialog.mk @@ -4,7 +4,7 @@ # ################################################################################ -DIALOG_VERSION = 1.3-20200327 +DIALOG_VERSION = 1.3-20220117 DIALOG_SOURCE = dialog-$(DIALOG_VERSION).tgz DIALOG_SITE = https://invisible-mirror.net/archives/dialog DIALOG_CONF_OPTS = --with-ncurses --with-curses-dir=$(STAGING_DIR)/usr \ From arnout at mind.be Wed Feb 23 20:28:31 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 23 Feb 2022 21:28:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/dialog: bump to version 1.3-20220117 In-Reply-To: <20220221160549.20554-1-andrei.gherghescu@protonmail.com> References: <20220221160549.20554-1-andrei.gherghescu@protonmail.com> Message-ID: <9ecde339-7f79-adb9-bac1-dfbdd5bb4e24@mind.be> On 21/02/2022 17:06, Andrei Gherghescu via buildroot wrote: > Signed-off-by: Andrei Gherghescu Fabrice already submitted an identical patch the week before, so I applied that one instead. Regards, Arnout > --- > package/dialog/dialog.hash | 2 +- > package/dialog/dialog.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/dialog/dialog.hash b/package/dialog/dialog.hash > index 2286590b66..3136d18b2b 100644 > --- a/package/dialog/dialog.hash > +++ b/package/dialog/dialog.hash > @@ -1,4 +1,4 @@ > # Locally calculated after checking pgp signature > -sha256 466163e8b97c2b7709d00389199add3156bd813f60ccb0335d0a30f2d4a17f99 dialog-1.3-20200327.tgz > +sha256 754cb6bf7dc6a9ac5c1f80c13caa4d976e30a5a6e8b46f17b3bb9b080c31041f dialog-1.3-20220117.tgz > # Locally computed > sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING > diff --git a/package/dialog/dialog.mk b/package/dialog/dialog.mk > index 1c98d354e3..681f8ec9fe 100644 > --- a/package/dialog/dialog.mk > +++ b/package/dialog/dialog.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -DIALOG_VERSION = 1.3-20200327 > +DIALOG_VERSION = 1.3-20220117 > DIALOG_SOURCE = dialog-$(DIALOG_VERSION).tgz > DIALOG_SITE = https://invisible-mirror.net/archives/dialog > DIALOG_CONF_OPTS = --with-ncurses --with-curses-dir=$(STAGING_DIR)/usr \ > -- > 2.35.1 > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From arnout at mind.be Wed Feb 23 20:28:48 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 23 Feb 2022 21:28:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/dialog: bump to version 1.3-20220117 In-Reply-To: References: <20220216204538.2450673-1-fontaine.fabrice@gmail.com> Message-ID: On 23/02/2022 21:27, Arnout Vandecappelle wrote: > > > On 16/02/2022 21:45, Fabrice Fontaine wrote: >> https://invisible-mirror.net/dialog/CHANGES.html#index-t20220117 >> >> Fixes: >> ? - https://bugs.buildroot.org/show_bug.cgi?id=14596 >> >> Signed-off-by: Fabrice Fontaine > > ?Applied to master, thanks. ?I mean next! ?Regards, ?Arnout > > ?Regards, > ?Arnout > >> --- >> ? package/dialog/dialog.hash | 2 +- >> ? package/dialog/dialog.mk?? | 2 +- >> ? 2 files changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/package/dialog/dialog.hash b/package/dialog/dialog.hash >> index 2286590b66..3136d18b2b 100644 >> --- a/package/dialog/dialog.hash >> +++ b/package/dialog/dialog.hash >> @@ -1,4 +1,4 @@ >> ? # Locally calculated after checking pgp signature >> -sha256 466163e8b97c2b7709d00389199add3156bd813f60ccb0335d0a30f2d4a17f99 >> dialog-1.3-20200327.tgz >> +sha256 754cb6bf7dc6a9ac5c1f80c13caa4d976e30a5a6e8b46f17b3bb9b080c31041f >> dialog-1.3-20220117.tgz >> ? # Locally computed >> ? sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 >> COPYING >> diff --git a/package/dialog/dialog.mk b/package/dialog/dialog.mk >> index 1c98d354e3..681f8ec9fe 100644 >> --- a/package/dialog/dialog.mk >> +++ b/package/dialog/dialog.mk >> @@ -4,7 +4,7 @@ >> ? # >> ################################################################################ >> ? -DIALOG_VERSION = 1.3-20200327 >> +DIALOG_VERSION = 1.3-20220117 >> ? DIALOG_SOURCE = dialog-$(DIALOG_VERSION).tgz >> ? DIALOG_SITE = https://invisible-mirror.net/archives/dialog >> ? DIALOG_CONF_OPTS = --with-ncurses --with-curses-dir=$(STAGING_DIR)/usr \ From bugzilla at busybox.net Wed Feb 23 20:30:15 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 23 Feb 2022 20:30:15 +0000 Subject: [Buildroot] [Bug 14596] package dialog is outdated and contains a bug In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14596 Arnout Vandecappelle changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #3 from Arnout Vandecappelle --- Dialog is updated in the 'next' branch. The changes are a bit to much to still apply it in the master branch, since we're in the stabilisation period for 2022.02. -- You are receiving this mail because: You are on the CC list for the bug. From arnout at mind.be Wed Feb 23 20:32:38 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 23 Feb 2022 21:32:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/bpftool: bump to version 6.7.0 In-Reply-To: <20220217005344.2357385-1-james.hilliard1@gmail.com> References: <20220217005344.2357385-1-james.hilliard1@gmail.com> Message-ID: <716c6a20-b60f-fda6-3e0e-06f97aab4b68@mind.be> On 17/02/2022 01:53, James Hilliard wrote: > Fixes: > http://autobuild.buildroot.net/results/8bf/8bfc2abe3ab7a0b53aa717c800a4c7a3c964f426 > > Signed-off-by: James Hilliard We normally wouldn't be taking a version bump in master any more, but this is anyway a new package, and it goes from a random commit to a tagged one, so applied to master, thanks. Regards, Arnout > --- > package/bpftool/bpftool.hash | 2 +- > package/bpftool/bpftool.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/bpftool/bpftool.hash b/package/bpftool/bpftool.hash > index c7d4ae250e..2e414b8eb8 100644 > --- a/package/bpftool/bpftool.hash > +++ b/package/bpftool/bpftool.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 c868cb85bf44195ec6cd20649c3db4f7aff64a38d950a1c2911d981fb2d7042c bpftool-a7f0e7f057283ae8af3de4578bcb8b7ee80b7144-br1.tar.gz > +sha256 e4ce219d3b87dd70d8dbfb8f02bd356f70c010f739f17baca1c8912199a8a72b bpftool-v6.7.0-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 > index 4276f91958..8742917253 100644 > --- a/package/bpftool/bpftool.mk > +++ b/package/bpftool/bpftool.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -BPFTOOL_VERSION = a7f0e7f057283ae8af3de4578bcb8b7ee80b7144 > +BPFTOOL_VERSION = v6.7.0 > BPFTOOL_SITE = https://github.com/libbpf/bpftool > BPFTOOL_SITE_METHOD = git > BPFTOOL_GIT_SUBMODULES = YES From arnout at mind.be Wed Feb 23 20:31:33 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 23 Feb 2022 21:31:33 +0100 Subject: [Buildroot] [git commit] package/bpftool: bump to version 6.7.0 Message-ID: <20220223202449.45521838B8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a14268d1385831038b5972430a28fee08c6ae33f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: http://autobuild.buildroot.net/results/8bf/8bfc2abe3ab7a0b53aa717c800a4c7a3c964f426 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/bpftool/bpftool.hash | 2 +- package/bpftool/bpftool.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/bpftool/bpftool.hash b/package/bpftool/bpftool.hash index c7d4ae250e..2e414b8eb8 100644 --- a/package/bpftool/bpftool.hash +++ b/package/bpftool/bpftool.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 c868cb85bf44195ec6cd20649c3db4f7aff64a38d950a1c2911d981fb2d7042c bpftool-a7f0e7f057283ae8af3de4578bcb8b7ee80b7144-br1.tar.gz +sha256 e4ce219d3b87dd70d8dbfb8f02bd356f70c010f739f17baca1c8912199a8a72b bpftool-v6.7.0-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 index 4276f91958..8742917253 100644 --- a/package/bpftool/bpftool.mk +++ b/package/bpftool/bpftool.mk @@ -4,7 +4,7 @@ # ################################################################################ -BPFTOOL_VERSION = a7f0e7f057283ae8af3de4578bcb8b7ee80b7144 +BPFTOOL_VERSION = v6.7.0 BPFTOOL_SITE = https://github.com/libbpf/bpftool BPFTOOL_SITE_METHOD = git BPFTOOL_GIT_SUBMODULES = YES From fontaine.fabrice at gmail.com Wed Feb 23 20:36:31 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 23 Feb 2022 21:36:31 +0100 Subject: [Buildroot] [PATCH 1/1] utils/checkpackagelib/lib_mk.py: check CONF_OPTS Message-ID: <20220223203631.3398950-1-fontaine.fabrice@gmail.com> As already done for {FOO}_DEPENDENCIES in commit 4910a175b3f1f4b55ff257a75945d8ffb14a4ceb, check that {FOO}_CONF_OPTS are never overridden in a conditional Signed-off-by: Fabrice Fontaine --- utils/checkpackagelib/lib_mk.py | 1 + 1 file changed, 1 insertion(+) diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py index 153754b6f1..b50a19ac62 100644 --- a/utils/checkpackagelib/lib_mk.py +++ b/utils/checkpackagelib/lib_mk.py @@ -90,6 +90,7 @@ class OverriddenVariable(_CheckFunction): r"_SOURCE\s*=\s*", r"_VERSION\s*=\s*"]))) FORBIDDEN_OVERRIDDEN = re.compile(r"^[A-Z0-9_]+({})".format("|".join([ + r"_CONF_OPTS\s*=\s*", r"_DEPENDENCIES\s*=\s*"]))) def before(self): -- 2.34.1 From fabien.marteau at armadeus.com Wed Feb 23 14:59:57 2022 From: fabien.marteau at armadeus.com (Fabien Marteau) Date: Wed, 23 Feb 2022 15:59:57 +0100 Subject: [Buildroot] zynq_zc706_defconfig target works on zc702 board Message-ID: <872b9dab-c446-adca-905c-1d5481c00a3b@armadeus.com> Hello, I just tryied to compile buildroot for ZC702?board using target zynq_zc706_defconfig (ZC706). With last buildroot git : make zynq_zc706_defconfig sudo dd if=output/images/sdcard.img of=/dev/mmcblk0 Booting the board with SDCard freshly formatted : Debug uart enabled U-Boot SPL 2018.01 (Feb 23 2022 - 11:43:15) mmc boot Trying to boot from MMC1 spl_load_image_fat: error reading image fpga.bin, err - -2 spl: error reading image fpga.bin, err - 1 spl_load_image_fat_os: error reading image system.dtb, err - -2 reading u-boot.img reading u-boot.img U-Boot 2018.01 (Feb 23 2022 - 11:43:15 +0100) Xilinx Zynq ZC706 Model: Zynq ZC706 Development Board Board: Xilinx Zynq Silicon: v0.0 I2C: ready DRAM: ECC disabled 1 GiB MMC: sdhci at e0100000: 0 (SD) SF: Detected n25q128a with page size 512 Bytes, erase size 128 KiB, total 32 MiB *** Warning - bad CRC, using default environment In: serial at e0001000 Out: serial at e0001000 Err: serial at e0001000 Net: ZYNQ GEM: e000b000, phyaddr 7, interface rgmii-id eth0: ethernet at e000b000 Hit any key to stop autoboot: 0 Zynq> Then booting Linux : Zynq> boot Device: sdhci at e0100000 Manufacturer ID: 27 OEM: 5048 Name: SD16G Tran Speed: 50000000 Rd Block Len: 512 SD version 3.0 High Capacity: Yes Capacity: 14.4 GiB Bus Width: 4-bit Erase Group Size: 512 Bytes ** Unable to read file uEnv.txt ** Copying Linux from SD to RAM... reading uImage 3732256 bytes read in 212 ms (16.8 MiB/s) reading devicetree.dtb 13667 bytes read in 14 ms (953.1 KiB/s) reading uramdisk.image.gz 951488 bytes read in 65 ms (14 MiB/s) ## Booting kernel from Legacy Image at 02080000 ... Image Name: Linux-4.9.0-xilinx Image Type: ARM Linux Kernel Image (uncompressed) Data Size: 3732192 Bytes = 3.6 MiB Load Address: 00008000 Entry Point: 00008000 Verifying Checksum ... OK ## Loading init Ramdisk from Legacy Image at 04000000 ... Image Name: Image Type: ARM Linux RAMDisk Image (uncompressed) Data Size: 951424 Bytes = 929.1 KiB Load Address: 00000000 Entry Point: 00000000 Verifying Checksum ... OK ## Flattened Device Tree blob at 02000000 Booting using the fdt blob at 0x2000000 Loading Kernel Image ... OK Loading Ramdisk to 1ff17000, end 1ffff480 ... OK Loading Device Tree to 1ff10000, end 1ff16562 ... OK Starting kernel ... Booting Linux on physical CPU 0x0 [...] Starting network: OK Welcome to Buildroot buildroot login: It works as is \o/ Do I have to make a patch to add the target? Best regards, Fabien Marteau Armadeus System From fontaine.fabrice at gmail.com Wed Feb 23 21:12:02 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 23 Feb 2022 22:12:02 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/kismet: bump to version 2022-02-R1 Message-ID: <20220223211202.3412693-1-fontaine.fabrice@gmail.com> Linking with -latomic is handled by configure.ac since version 2022-01-R3 and https://github.com/kismetwireless/kismet/commit/bbdfd21e2b41bf69513ded5ae5ab5a89f22a9912 https://www.kismetwireless.net/release/kismet-2022-02-R1 https://www.kismetwireless.net/release/kismet-2022-01-R3 https://www.kismetwireless.net/release/kismet-2022-01-R2 https://www.kismetwireless.net/release/kismet-2022-01-R1 Signed-off-by: Fabrice Fontaine --- package/kismet/kismet.hash | 2 +- package/kismet/kismet.mk | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/package/kismet/kismet.hash b/package/kismet/kismet.hash index 9a9d2260b9..fc5f854b7e 100644 --- a/package/kismet/kismet.hash +++ b/package/kismet/kismet.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1c8e31b1babdb0fc93ac38fd0772a24d4b40f865fbc292fa8ec7f4a18ced0135 kismet-2021-08-R1.tar.xz +sha256 aaae4747f14734a73f601af013c0eee26e13680f5e3675dfce09b7de2e68b8a8 kismet-2022-02-R1.tar.xz sha256 93c7f0d7e356b0abfb6f494ff3ea37f96abc84e9a5619b25d4e43f7553a55739 LICENSE diff --git a/package/kismet/kismet.mk b/package/kismet/kismet.mk index 819ed510d7..3992a392f8 100644 --- a/package/kismet/kismet.mk +++ b/package/kismet/kismet.mk @@ -4,7 +4,7 @@ # ################################################################################ -KISMET_VERSION = 2021-08-R1 +KISMET_VERSION = 2022-02-R1 KISMET_SOURCE = kismet-$(KISMET_VERSION).tar.xz KISMET_SITE = http://www.kismetwireless.net/code KISMET_DEPENDENCIES = \ @@ -29,10 +29,6 @@ endif KISMET_CONF_ENV += CXXFLAGS="$(KISMET_CXXFLAGS)" -ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -KISMET_CONF_ENV += LIBS=-latomic -endif - ifeq ($(BR2_PACKAGE_LIBCAP),y) KISMET_DEPENDENCIES += libcap KISMET_CONF_OPTS += --enable-libcap -- 2.34.1 From giulio.benetti at benettiengineering.com Wed Feb 23 21:22:23 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 23 Feb 2022 22:22:23 +0100 Subject: [Buildroot] zynq_zc706_defconfig target works on zc702 board In-Reply-To: <872b9dab-c446-adca-905c-1d5481c00a3b@armadeus.com> References: <872b9dab-c446-adca-905c-1d5481c00a3b@armadeus.com> Message-ID: <9C91AA22-A5B2-433B-AD37-7000F7D5EB20@benettiengineering.com> Hi Fabien, > Il giorno 23 feb 2022, alle ore 21:59, Fabien Marteau ha scritto: > > ?Hello, > > I just tryied to compile buildroot for ZC702 board using target zynq_zc706_defconfig (ZC706). > > With last buildroot git : > > make zynq_zc706_defconfig > sudo dd if=output/images/sdcard.img of=/dev/mmcblk0 > > Booting the board with SDCard freshly formatted : > > Debug uart enabled > > U-Boot SPL 2018.01 (Feb 23 2022 - 11:43:15) > mmc boot > Trying to boot from MMC1 > spl_load_image_fat: error reading image fpga.bin, err - -2 > spl: error reading image fpga.bin, err - 1 > spl_load_image_fat_os: error reading image system.dtb, err - -2 > reading u-boot.img > reading u-boot.img > > > U-Boot 2018.01 (Feb 23 2022 - 11:43:15 +0100) Xilinx Zynq ZC706 > > Model: Zynq ZC706 Development Board > Board: Xilinx Zynq > Silicon: v0.0 > I2C: ready > DRAM: ECC disabled 1 GiB > MMC: sdhci at e0100000: 0 (SD) > SF: Detected n25q128a with page size 512 Bytes, erase size 128 KiB, total 32 MiB > *** Warning - bad CRC, using default environment > > In: serial at e0001000 > Out: serial at e0001000 > Err: serial at e0001000 > Net: ZYNQ GEM: e000b000, phyaddr 7, interface rgmii-id > eth0: ethernet at e000b000 > Hit any key to stop autoboot: 0 > Zynq> > > Then booting Linux : > > Zynq> boot > Device: sdhci at e0100000 > Manufacturer ID: 27 > OEM: 5048 > Name: SD16G > Tran Speed: 50000000 > Rd Block Len: 512 > SD version 3.0 > High Capacity: Yes > Capacity: 14.4 GiB > Bus Width: 4-bit > Erase Group Size: 512 Bytes > ** Unable to read file uEnv.txt ** > Copying Linux from SD to RAM... > reading uImage > 3732256 bytes read in 212 ms (16.8 MiB/s) > reading devicetree.dtb > 13667 bytes read in 14 ms (953.1 KiB/s) > reading uramdisk.image.gz > 951488 bytes read in 65 ms (14 MiB/s) > ## Booting kernel from Legacy Image at 02080000 ... > Image Name: Linux-4.9.0-xilinx > Image Type: ARM Linux Kernel Image (uncompressed) > Data Size: 3732192 Bytes = 3.6 MiB > Load Address: 00008000 > Entry Point: 00008000 > Verifying Checksum ... OK > ## Loading init Ramdisk from Legacy Image at 04000000 ... > Image Name: > Image Type: ARM Linux RAMDisk Image (uncompressed) > Data Size: 951424 Bytes = 929.1 KiB > Load Address: 00000000 > Entry Point: 00000000 > Verifying Checksum ... OK > ## Flattened Device Tree blob at 02000000 > Booting using the fdt blob at 0x2000000 > Loading Kernel Image ... OK > Loading Ramdisk to 1ff17000, end 1ffff480 ... OK > Loading Device Tree to 1ff10000, end 1ff16562 ... OK > > Starting kernel ... > > Booting Linux on physical CPU 0x0 > > [...] > > Starting network: OK > > Welcome to Buildroot > buildroot login: > > > It works as is \o/ > > Do I have to make a patch to add the target? Sure, you can do that and add an entry in DEVELOPERS with you to maintain it. But here I think we need specific tag names, dts files etc for zc702. And possibly bump all the versions for uboot and Linux. Can you do that? Best regards Giulio > > Best regards, > Fabien Marteau > Armadeus System > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From petr.vorel at gmail.com Wed Feb 23 21:27:17 2022 From: petr.vorel at gmail.com (Petr Vorel) Date: Wed, 23 Feb 2022 22:27:17 +0100 Subject: [Buildroot] [RFC][PATCH 1/1] package/bind: bump to version 9.16.26 In-Reply-To: <20220222220255.22327-1-petr.vorel@gmail.com> References: <20220222220255.22327-1-petr.vorel@gmail.com> Message-ID: Hi, Build 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]: SKIPPED sourcery-arm [6/6]: OK 6 builds, 2 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]: OK 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]: SKIPPED 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]: OK 45 builds, 5 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed Kind regards, Petr From fontaine.fabrice at gmail.com Wed Feb 23 22:13:58 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 23 Feb 2022 23:13:58 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/screen: bump to version 4.9.0 Message-ID: <20220223221358.4097881-1-fontaine.fabrice@gmail.com> - Drop latest patch (already in version) - Update indentation in hash file (two spaces) https://lists.gnu.org/archive/html/screen-users/2022-02/msg00000.html Signed-off-by: Fabrice Fontaine --- package/screen/0008-CVE-2021-26937.patch | 68 ------------------------ package/screen/screen.hash | 6 +-- package/screen/screen.mk | 5 +- 3 files changed, 4 insertions(+), 75 deletions(-) delete mode 100644 package/screen/0008-CVE-2021-26937.patch diff --git a/package/screen/0008-CVE-2021-26937.patch b/package/screen/0008-CVE-2021-26937.patch deleted file mode 100644 index df7efa0294..0000000000 --- a/package/screen/0008-CVE-2021-26937.patch +++ /dev/null @@ -1,68 +0,0 @@ -Description: [CVE-2021-26937] Fix out of bounds array access -Author: Michael Schr?der -Bug-Debian: https://bugs.debian.org/982435 -Bug: https://savannah.gnu.org/bugs/?60030 -Bug: https://lists.gnu.org/archive/html/screen-devel/2021-02/msg00000.html -Bug-OSS-Security: https://www.openwall.com/lists/oss-security/2021/02/09/3 -Origin: https://lists.gnu.org/archive/html/screen-devel/2021-02/msg00010.html - -Downloaded from Debian: -https://sources.debian.org/data/main/s/screen/4.8.0-5/debian/patches/99_CVE-2021-26937.patch - -Signed-off-by: Peter Korsgaard ---- a/encoding.c -+++ b/encoding.c -@@ -43,7 +43,7 @@ - # ifdef UTF8 - static int recode_char __P((int, int, int)); - static int recode_char_to_encoding __P((int, int)); --static void comb_tofront __P((int, int)); -+static void comb_tofront __P((int)); - # ifdef DW_CHARS - static int recode_char_dw __P((int, int *, int, int)); - static int recode_char_dw_to_encoding __P((int, int *, int)); -@@ -1263,6 +1263,8 @@ - {0x30000, 0x3FFFD}, - }; - -+ if (c >= 0xdf00 && c <= 0xdfff) -+ return 1; /* dw combining sequence */ - return ((bisearch(c, wide, sizeof(wide) / sizeof(struct interval) - 1)) || - (cjkwidth && - bisearch(c, ambiguous, -@@ -1330,11 +1332,12 @@ - } - - static void --comb_tofront(root, i) --int root, i; -+comb_tofront(i) -+int i; - { - for (;;) - { -+ int root = i >= 0x700 ? 0x801 : 0x800; - debug1("bring to front: %x\n", i); - combchars[combchars[i]->prev]->next = combchars[i]->next; - combchars[combchars[i]->next]->prev = combchars[i]->prev; -@@ -1396,9 +1399,9 @@ - { - /* full, recycle old entry */ - if (c1 >= 0xd800 && c1 < 0xe000) -- comb_tofront(root, c1 - 0xd800); -+ comb_tofront(c1 - 0xd800); - i = combchars[root]->prev; -- if (c1 == i + 0xd800) -+ if (i == 0x800 || i == 0x801 || c1 == i + 0xd800) - { - /* completely full, can't recycle */ - debug("utf8_handle_comp: completely full!\n"); -@@ -1422,7 +1425,7 @@ - mc->font = (i >> 8) + 0xd8; - mc->fontx = 0; - debug3("combinig char %x %x -> %x\n", c1, c, i + 0xd800); -- comb_tofront(root, i); -+ comb_tofront(i); - } - - #else /* !UTF8 */ diff --git a/package/screen/screen.hash b/package/screen/screen.hash index ca74ba8913..a261d3100d 100644 --- a/package/screen/screen.hash +++ b/package/screen/screen.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/screen/screen-4.8.0.tar.gz.sig -sha256 6e11b13d8489925fde25dfb0935bf6ed71f9eb47eff233a181e078fde5655aa1 screen-4.8.0.tar.gz +# https://ftp.gnu.org/gnu/screen/screen-4.9.0.tar.gz.sig +sha256 f9335281bb4d1538ed078df78a20c2f39d3af9a4e91c57d084271e0289c730f4 screen-4.9.0.tar.gz # Locally calculated -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/screen/screen.mk b/package/screen/screen.mk index 843c71fc2a..3239a1c1f3 100644 --- a/package/screen/screen.mk +++ b/package/screen/screen.mk @@ -4,7 +4,7 @@ # ################################################################################ -SCREEN_VERSION = 4.8.0 +SCREEN_VERSION = 4.9.0 SCREEN_SITE = $(BR2_GNU_MIRROR)/screen SCREEN_LICENSE = GPL-3.0+ SCREEN_LICENSE_FILES = COPYING @@ -16,9 +16,6 @@ SCREEN_CONF_ENV = CFLAGS="$(TARGET_CFLAGS)" SCREEN_CONF_OPTS = --enable-colors256 SCREEN_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) SCREEN=screen install_bin -# 0008_CVE-2021-26937.patch -SCREEN_IGNORE_CVES += CVE-2021-26937 - ifeq ($(BR2_PACKAGE_LINUX_PAM),y) SCREEN_DEPENDENCIES += linux-pam SCREEN_CONF_OPTS += --enable-pam -- 2.34.1 From luca at lucaceresoli.net Wed Feb 23 22:29:50 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Wed, 23 Feb 2022 23:29:50 +0100 Subject: [Buildroot] [PATCH v1 1/1] configs/zynqmp_zcu10x: fix U-Boot dts config In-Reply-To: <871qzt5pgn.fsf@dell.be.48ers.dk> References: <20220223125118.2325363-1-neal.frager@xilinx.com> <871qzt5pgn.fsf@dell.be.48ers.dk> Message-ID: <4f6c5422-e10a-f99b-4f3a-1118e026b8d8@lucaceresoli.net> Hi Peter, On 23/02/22 20:54, Peter Korsgaard wrote: >>>>>> "Luca" == Luca Ceresoli writes: > > > Hi Neal, > > On 23/02/22 13:51, Neal Frager wrote: > >> This patch: > >> - fixes U-Boot issue when DEVICE_TREE environment variable undefined > > > This appears unrelated from the version bumps. Please send separate patches. > > >> - bumps U-Boot to Xilinx 2022.01-171 > >> - bumps Linux to Xilinx 5.15-945 > > I don't have the zcu106 here anymore, but this new kernel didn't boot > here (no output after 'Starting Linux'). Does it boot for you? I'll try to test tomorrow. Anyway IIRC I have an Engineering Sample silicon, not sure whether this can prevent booting. -- Luca From romain.naour at gmail.com Thu Feb 24 00:14:55 2022 From: romain.naour at gmail.com (Romain Naour) Date: Thu, 24 Feb 2022 01:14:55 +0100 Subject: [Buildroot] [PATCH] support/testing: TestRust{Bin} use ripgrep package for testing Message-ID: <20220224001455.206249-1-romain.naour@gmail.com> TestRust and TestRustBin has been introduced at the time when there was no cargo package infrastructure or any package using rust compiler (Buildroot 2018.02). Since then the ripgrep package has been introduced, initially using the generic package infrastructure and converted later to the cargo package infrastructure. Due a recent change in rust/cargo removing the cargo config file [1] the test TestRust and TestRustBin now fail to compile since they build an hello-world crate outside of the cargo package infrastructure without the correct environment for cross-compiling. Replace the 'hello-world' crate by ripgrep package and check if it can run properly in Qemu. Fixes tests.package.test_rust.TestRustBin: https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202545 But doesn't fixes tests.package.test_rust.TestRust due another bug: https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202544 [1] b6378631c2609742382984f6f7b93c1d9d2cdb78 Signed-off-by: Romain Naour --- Using ripgrep or bat package trigger an issue while using rustc: error[E0514]: found crate `core` compiled by an incompatible version of rustc | = help: please recompile that crate using this compiler (rustc 1.58.1) (consider running `cargo clean` first) = note: the following crate versions were found: crate `core` compiled by rustc 1.58.1 (db9d1b20b 2022-01-20): TestRust/host/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcore-6cfcec236d576603.rlib error[E0514]: found crate `std` compiled by an incompatible version of rustc The problem is not really a cross-compilation issue (we are building for an armv7 on x86_64 host) but a problem with rustc libraries (rlib). We can notice that "rustc 1.58.1 (db9d1b20b 2022-01-20)" is the same version as the prebuilt rustc: TestRust/host/bin/rustc --version rustc 1.58.1 TestRustBin/host/bin/rustc --version rustc 1.58.1 (db9d1b20b 2022-01-20) Indeed we are using host-rust-bin to bootstrap the host-rust compiler package built by Buildroot. The problem is that the libcore-6cfcec236d576603.rlib file come from host-rust-bin and is not removed before installing host-rust built by Buildroot. We notice that host-rust can't override libcore-6cfcec236d576603.rlib because it use another hash libcore-79e5699dd357edbd.rlib To fixes the ripgrep build we have to copy manually (for now) all rlib files from TestRust/build/tmp/tarball/rust-std/x86_64-unknown-linux-gnu/image/lib/rustlib/x86_64-unknown-linux-gnu/lib to TestRust/host/lib/rustlib/x86_64-unknown-linux-gnu/lib (Indeed we spent a lot of time to build host-rust and some important libraries are not installed to HOST_DIR) When Buildroot build its rust compiler we probably need to avoid installing in HOST_DIR the rust compiler used to bootstrap. --- support/testing/tests/package/test_rust.py | 48 ++-------------------- 1 file changed, 4 insertions(+), 44 deletions(-) diff --git a/support/testing/tests/package/test_rust.py b/support/testing/tests/package/test_rust.py index 884b40a4a3..a1abd20c09 100644 --- a/support/testing/tests/package/test_rust.py +++ b/support/testing/tests/package/test_rust.py @@ -8,9 +8,6 @@ import infra.basetest class TestRustBase(infra.basetest.BRTest): - target = 'armv7-unknown-linux-gnueabihf' - crate = 'hello-world' - def login(self): img = os.path.join(self.builddir, "images", "rootfs.cpio") self.emulator.boot(arch="armv7", @@ -18,43 +15,6 @@ class TestRustBase(infra.basetest.BRTest): options=["-initrd", img]) self.emulator.login() - def build_test_prog(self): - hostdir = os.path.join(self.builddir, 'host') - env = os.environ.copy() - env["USER"] = "br-user" - env["PATH"] = "{}:".format(os.path.join(hostdir, 'bin')) + env["PATH"] - env["CARGO_HOME"] = os.path.join(hostdir, 'usr', 'share', 'cargo') - env["RUST_TARGET_PATH"] = os.path.join(hostdir, 'etc', 'rustc') - cargo = os.path.join(hostdir, 'bin', 'cargo') - workdir = os.path.join(tempfile.mkdtemp(suffix='-br2-testing-rust'), - self.crate) - manifest = os.path.join(workdir, 'Cargo.toml') - prog = os.path.join(workdir, 'target', self.target, 'debug', self.crate) - - cmd = [cargo, 'init', '--bin', '--vcs', 'none', '-vv', workdir] - ret = subprocess.call(cmd, - stdout=self.b.logfile, - stderr=self.b.logfile, - env=env) - if ret != 0: - raise SystemError("Cargo init failed") - - cmd = [ - cargo, 'build', '-vv', '--target', self.target, - '--manifest-path', manifest - ] - ret = subprocess.call(cmd, - stdout=self.b.logfile, - stderr=self.b.logfile, - env=env) - if ret != 0: - raise SystemError("Cargo build failed") - - shutil.copy(prog, os.path.join(self.builddir, 'target', 'usr', 'bin')) - self.b.build() - shutil.rmtree(workdir) - - class TestRustBin(TestRustBase): config = \ """ @@ -68,12 +28,12 @@ class TestRustBin(TestRustBase): BR2_TARGET_ROOTFS_CPIO=y # BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_RUSTC=y + BR2_PACKAGE_RIPGREP=y """ def test_run(self): - self.build_test_prog() self.login() - self.assertRunOk(self.crate) + self.assertRunOk("rg Buildroot /etc/issue") class TestRust(TestRustBase): @@ -90,9 +50,9 @@ class TestRust(TestRustBase): # BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_RUSTC=y BR2_PACKAGE_HOST_RUST=y + BR2_PACKAGE_RIPGREP=y """ def test_run(self): - self.build_test_prog() self.login() - self.assertRunOk(self.crate) + self.assertRunOk("rg Buildroot /etc/issue") -- 2.35.1 From bugzilla at busybox.net Thu Feb 24 01:44:58 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Thu, 24 Feb 2022 01:44:58 +0000 Subject: [Buildroot] [Bug 14606] New: Updated qt5webkit issue in 2022.02-rc2 Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14606 Bug ID: 14606 Summary: Updated qt5webkit issue in 2022.02-rc2 Product: buildroot Version: unspecified Hardware: All OS: Linux Status: NEW Severity: normal Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: brock at cottonwoodcomputer.com CC: buildroot at uclibc.org Target Milestone: --- Testing my build against 2022.02-rc2 and qmake fails to build our Qt project: Project ERROR: Unknown module(s) in QT: webkit Digging into it a bit, the updated qt5webkit package appears to be installing the mkspecs into the target instead of the host. Also the mkspecs have hardcoded library and include paths instead of using $$QT_MODULE_INCLUDE_BASE etc like the other Qt packages -- You are receiving this mail because: You are on the CC list for the bug. From peterlin at andestech.com Thu Feb 24 02:41:37 2022 From: peterlin at andestech.com (Yu Chien Peter Lin) Date: Thu, 24 Feb 2022 10:41:37 +0800 Subject: [Buildroot] [PATCH v4 1/3] board/andes: rearrange andes folder structure In-Reply-To: References: <20220223071049.21153-1-peterlin@andestech.com> <84e159d2-0123-e5b1-c42e-99b70c99f43c@benettiengineering.com> Message-ID: Hi Giulio, > > > > > > Changes v3 -> v4: > > > > > > - rename ae3xx folder to ae300 > > > > > > - rename andes_ae3xx_defconfig to andes_ae300_defconfig > > > > > > - update readme.txt and item in DEVELOPERS > > > > > > > > > > Some of these change ^^^ must have been moved to the single patch, like > > > > > DEVELOPERS is updated in patch 3/3. I've also forgotten to point you to add > > > > > a --cover-letter, so keep in mind both points for next time. > > > > > > > > > > I've built tested both defconfig successfully, so: > > > > > Reviewed-by: Giulio Benetti > > > > > Tested-by: Giulio Benetti > > > > > [Giulio: build tested only] > > > > > > > > > > And the other patches of this series is all reviewed, so to me it's ready to > > > > > be committed, but this will happen after Buildroot 2022.02 is released, > > > > > since between rc1 to the release Maintainers only accept fixes. Another > > > > > possibility is that they will commit these patches to next branch. > > > > > > > > > > Please remember to tag V3. Oh, I thought you were refering to format-patch with v3, sorry. I will mark the patch on patchwork to rejected state except the latest patch version. > > > > > Thank you for your effort! > > > > > > > > > > Best regards > > > > > -- > > > > > Giulio Benetti > > > > > Benetti Engineering sas > > > > > > Thanks for reviewing my patches and the guidance. > > > > You're welcome. > > > > > I will make a new patch for the Config.in, > > > > Which one? I only see: > > toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in > > > > Do you mean you will add an entry in DEVELOPERS for it? I found the modifications on these files in Git history, usually have its own patch. So in PATCH v5, I will split [PATCH 1/3] to [PATCH 1/4] and [PATCH 2/4] for toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in other patches remain the same, and attach [PATCH 0/4] cover letter. > > > The last question, is it tag V5 for the next submission? > > > > It depends if you need to modify these patches. Or if you add a new patch > > that depends on these patches, then yes, please send a V5 with all changes > > moved to the different patches, including adding the patch if this is your > > goal. > > > > Best regards > > -- > > Giulio Benetti > > Benetti Engineering sas Is there any the new comment? Again, thanks for your help. :) Best regards, Yu Chien Peter Lin From bugzilla at busybox.net Thu Feb 24 06:35:11 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Thu, 24 Feb 2022 06:35:11 +0000 Subject: [Buildroot] [Bug 14601] Python build fails on 2022.02-rc2 In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14601 --- Comment #2 from HiFiBerry (Daniel) --- Might not have to do with the -O option (that was just a guess), but the install path is clearly incorrect. My config here is quite complex and uses lots of additional stuff. However, it was working fine up to 2021.11 Any recommendation how to go on debugging this? -- You are receiving this mail because: You are on the CC list for the bug. From nealf at xilinx.com Thu Feb 24 06:54:35 2022 From: nealf at xilinx.com (Neal Frager) Date: Thu, 24 Feb 2022 06:54:35 +0000 Subject: [Buildroot] [PATCH v4 1/1] configs/zynqmp_zcu10x: fix U-Boot dts config In-Reply-To: <87wnhl4ab4.fsf@dell.be.48ers.dk> References: <20220223180336.3372352-1-neal.frager@xilinx.com> <87wnhl4ab4.fsf@dell.be.48ers.dk> Message-ID: Hi Peter, > Most (but not all) fragment files are using the .fragment suffix, so I renamed these to uboot.fragment. I dropped the reviewed-by and reworded the commit text a bit and committed - Thanks. Thank you for this update and commit. I have tested the clean build with this patch this morning, and I confirm that it works as expected. I am not sure why I had a build issue yesterday. Starting from a new clean build worked correctly. Also, I confirm that I ran my test with the environment variable DEVICE_TREE undefined. With this new patch, there are no requirements for environment definitions. Have you tested this patch on your ZCU106 yet? Best regards, Neal Frager Xilinx From peter at korsgaard.com Thu Feb 24 07:35:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 24 Feb 2022 08:35:42 +0100 Subject: [Buildroot] [PATCH v4 1/1] configs/zynqmp_zcu10x: fix U-Boot dts config In-Reply-To: (Neal Frager's message of "Thu, 24 Feb 2022 06:54:35 +0000") References: <20220223180336.3372352-1-neal.frager@xilinx.com> <87wnhl4ab4.fsf@dell.be.48ers.dk> Message-ID: <87sfs84sz5.fsf@dell.be.48ers.dk> >>>>> "Neal" == Neal Frager writes: > Hi Peter, >> Most (but not all) fragment files are using the .fragment suffix, so > I renamed these to uboot.fragment. I dropped the reviewed-by and > reworded the commit text a bit and committed - Thanks. > Thank you for this update and commit. I have tested the clean build > with this patch this morning, and I confirm that it works as expected. > I am not sure why I had a build issue yesterday. Starting from a new clean build worked correctly. > Also, I confirm that I ran my test with the environment variable > DEVICE_TREE undefined. With this new patch, there are no requirements > for environment definitions. > Have you tested this patch on your ZCU106 yet? Yes, I was successfully able to build and boot it (without the kernel bump) here. -- Bye, Peter Korsgaard From luca at lucaceresoli.net Thu Feb 24 08:02:52 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Thu, 24 Feb 2022 09:02:52 +0100 Subject: [Buildroot] [PATCH v4 1/1] configs/zynqmp_zcu10x: fix U-Boot dts config In-Reply-To: <87sfs84sz5.fsf@dell.be.48ers.dk> References: <20220223180336.3372352-1-neal.frager@xilinx.com> <87wnhl4ab4.fsf@dell.be.48ers.dk> <87sfs84sz5.fsf@dell.be.48ers.dk> Message-ID: <158816b4-5b1e-1fe6-0e7b-6b289dd42c15@lucaceresoli.net> Hi, On 24/02/22 08:35, Peter Korsgaard wrote: >>>>>> "Neal" == Neal Frager writes: > > > Hi Peter, > >> Most (but not all) fragment files are using the .fragment suffix, so > > I renamed these to uboot.fragment. I dropped the reviewed-by and > > reworded the commit text a bit and committed - Thanks. > > > Thank you for this update and commit. I have tested the clean build > > with this patch this morning, and I confirm that it works as expected. > > > I am not sure why I had a build issue yesterday. Starting from a new clean build worked correctly. > > > Also, I confirm that I ran my test with the environment variable > > DEVICE_TREE undefined. With this new patch, there are no requirements > > for environment definitions. > > > Have you tested this patch on your ZCU106 yet? > > Yes, I was successfully able to build and boot it (without the kernel > bump) here. ...and here too. Thank you both! -- Luca From nealf at xilinx.com Thu Feb 24 08:55:31 2022 From: nealf at xilinx.com (Neal Frager) Date: Thu, 24 Feb 2022 08:55:31 +0000 Subject: [Buildroot] [PATCH v4 1/1] configs/zynqmp_zcu10x: fix U-Boot dts config In-Reply-To: <87sfs84sz5.fsf@dell.be.48ers.dk> References: <20220223180336.3372352-1-neal.frager@xilinx.com> <87wnhl4ab4.fsf@dell.be.48ers.dk> <87sfs84sz5.fsf@dell.be.48ers.dk> Message-ID: Hi Peter, > Yes, I was successfully able to build and boot it (without the kernel > bump) here. I will hold off on my next version bump patch until Xilinx releases version 2022.1 in April. The next bump will move from sha repos to the 2022.1 tag repos for U-Boot, ATF and Linux. Thanks for confirming that we at least have a working version in buildroot now! Best regards, Neal Frager Xilinx From nealf at xilinx.com Thu Feb 24 08:56:40 2022 From: nealf at xilinx.com (Neal Frager) Date: Thu, 24 Feb 2022 08:56:40 +0000 Subject: [Buildroot] [PATCH v4 1/1] configs/zynqmp_zcu10x: fix U-Boot dts config In-Reply-To: <158816b4-5b1e-1fe6-0e7b-6b289dd42c15@lucaceresoli.net> References: <20220223180336.3372352-1-neal.frager@xilinx.com> <87wnhl4ab4.fsf@dell.be.48ers.dk> <87sfs84sz5.fsf@dell.be.48ers.dk> <158816b4-5b1e-1fe6-0e7b-6b289dd42c15@lucaceresoli.net> Message-ID: Hi Luca, > ...and here too. > Thank you both! I am glad to hear that your pre-production ZCU106 board works with the latest software. Best regards, Neal Frager Xilinx From bugzilla at busybox.net Thu Feb 24 09:28:52 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Thu, 24 Feb 2022 09:28:52 +0000 Subject: [Buildroot] [Bug 14611] New: 2022.02-rc2: Build of BR2_x86_64 with BR2_LINUX_KERNEL_LATEST_VERSION=y broken Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14611 Bug ID: 14611 Summary: 2022.02-rc2: Build of BR2_x86_64 with BR2_LINUX_KERNEL_LATEST_VERSION=y broken Product: buildroot Version: unspecified Hardware: PC OS: Linux Status: NEW Severity: blocker Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: f.rogall at gmx.de CC: buildroot at uclibc.org Target Milestone: --- The building of BR2_x86_64 with BR2_LINUX_KERNEL_LATEST_VERSION=y on Buildroot 2022.02-rc2 does not work. >>> linux-headers 5.15.13 Building >>> linux-headers 5.15.13 Installing to staging directory (cd /home/fr/work/egate/x/egate/build/linux-headers-5.15.13; PATH="/home/fr/work/egate/x/egate/host/bin:/home/fr/work/egate/x/egate/host/sbin:/home/fr/bin:/home/fr/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin" /usr/bin/make -j9 ARCH=x86_64 HOSTCC="/usr/bin/gcc" HOSTCFLAGS="" HOSTCXX="/usr/bin/g++" INSTALL_HDR_PATH=/home/fr/work/egate/x/egate/host/x86_64-buildroot-linux-gnu/sysroot/usr headers_install) INSTALL /home/fr/work/egate/x/egate/host/x86_64-buildroot-linux-gnu/sysroot/usr/include if ! support/scripts/check-kernel-headers.sh /home/fr/work/egate/x/egate/build /home/fr/work/egate/x/egate/host/x86_64-buildroot-linux-gnu/sysroot 5.16 loose; then exit 1; fi Incorrect selection of kernel headers: expected 5.16.x, got 5.15.x make[1]: *** [package/pkg-generic.mk:332: /home/fr/work/egate/x/egate/build/linux-headers-5.15.13/.stamp_staging_installed] Error 1 make: *** [Makefile:84: _all] Error 2 -- You are receiving this mail because: You are on the CC list for the bug. From thomas.petazzoni at bootlin.com Thu Feb 24 09:55:21 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 24 Feb 2022 09:55:21 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-02-23 Message-ID: <20220224095527.35780825D3@smtp1.osuosl.org> Hello, Autobuild statistics for 2022-02-23 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 50 | 8 | 0 | 58 | 2021.11.x | 11 | 0 | 0 | 11 | master | 64 | 38 | 0 | 102 | Classification of failures by reason for master ----------------------------------------------- host-libselinux-3.3 | 13 python-greenlet-1.1.2 | 3 target-finalize | 3 unknown | 3 bpftool-a7f0e7f057283ae8af3... | 2 frr-8.1 | 2 suricata-6.0.4 | 2 bat-0.19.0 | 1 bluez5_utils-5.63 | 1 efl-1.26.1 | 1 ffmpeg-4.4.1 | 1 ghostscript-9.55.0 | 1 google-breakpad-7515ab13768... | 1 opencv4-4.5.5 | 1 qt5webkit-5.212.0-alpha4 | 1 safeclib-3.7.1 | 1 weston-10.0.0 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | bat-0.19.0 | NOK | http://autobuild.buildroot.net/results/c7367643f2ca3ebf2aeed453ee210434b0f6a1d7 | mips64el | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/76beed20c7b218b1bca7bbe0274add6dd701b8ee | sparc64 | bpftool-a7f0e7f057283ae8af3... | NOK | http://autobuild.buildroot.net/results/b8a63bba0d75fd3cfed53ebede47a5c4464c6145 | arm | bpftool-a7f0e7f057283ae8af3... | NOK | http://autobuild.buildroot.net/results/62244f13564e745d702a217b0a67cd0768fe840a | x86_64 | efl-1.26.1 | NOK | http://autobuild.buildroot.net/results/ee8e650e28a1dcebee36c8e1fdbbe3926b56a92d | arm | ffmpeg-4.4.1 | NOK | http://autobuild.buildroot.net/results/476ee51a6e8a819cfdb61965e7827e6e053301dc | microblazeel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/4e1f1ef763567ec1cd415055916d25284a18e6c2 | microblazeel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/7bde2f954214cf286d4561b01b45a07301b8260a | arm | ghostscript-9.55.0 | NOK | http://autobuild.buildroot.net/results/74044a08ace770ea63b9a86f897c6ec2626aca40 | mipsel | google-breakpad-7515ab13768... | NOK | http://autobuild.buildroot.net/results/ebb8b3bc0e656fafdfaf2ef34fa32c8c3f7143b9 | powerpc | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/0cfafc65f4dde41c709e8e3e25845dbbc8d458d7 | xtensa | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/e3e4712d835ea744d58949760e6b562b88d40711 | riscv64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/1e52d191e18cb1d2015bf63f5eeb7995b14727cf | sh4 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/abebcadcab55a0b73b9462e20fd04c18cdcc2e39 | riscv32 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/ce93d336d2b011c4697c90a5f0e1eb6c076b26b5 | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/84758d4ca7d846e3c7a9601c2d487415eca34918 | mips64el | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/fd01a3405888b72da1d7aa11292269e12f9c30cf | riscv64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/60a8a107c4d3b4e2b6568ef0036d8c5cdfa2dc41 | x86_64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/6a328a22b07cff68472ce997e7de7371e60276c0 | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/2aeca17751a7cdeb5dfbc5909187464ba1a227ee | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/254d84c4e9fa35dff6436612d2d41c9bf97d62ac | powerpc64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/2f4001271125341adfde293a83a74020dff31314 | nios2 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/c75e3209f9ccaef3ab86c4d7da40fda830157374 | xtensa | opencv4-4.5.5 | NOK | http://autobuild.buildroot.net/results/c94a18a0810e449fe92c9b5c30ecc6c10b864ef3 | powerpc | python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/04449db582f8c258244f29897ed27bf334199f46 | mips64el | python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/7d7b70b77588bd1a212edce05c19e1869692d693 | x86_64 | python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/7c9e6dd6217b735f465acf0c5a365756feea06e8 | arm | qt5webkit-5.212.0-alpha4 | NOK | http://autobuild.buildroot.net/results/0364a1e2cbd0f47914d287716f846e770ccf4dfb | arm | safeclib-3.7.1 | NOK | http://autobuild.buildroot.net/results/e66e0669129eede2f10d81994249f2d2d6453875 | arm | suricata-6.0.4 | NOK | http://autobuild.buildroot.net/results/82df49727cb359905359524520fb7b64e50fdf34 | arm | suricata-6.0.4 | NOK | http://autobuild.buildroot.net/results/d21d2f887f845b2605bf642184b47c35707c29b0 | s390x | target-finalize | NOK | http://autobuild.buildroot.net/results/9bf6dcbc67ff75977b55ba9d5ecb0c39e3044d92 | arm | target-finalize | NOK | http://autobuild.buildroot.net/results/78ee9b31978bf199321651312e6cc4e1684f3e0f | nios2 | target-finalize | NOK | http://autobuild.buildroot.net/results/bd8d32bcb01a1a5419eb018e76f9ef3d2b0c238b | arm | unknown | NOK | http://autobuild.buildroot.net/results/0b22ae831003fad27d31768e25b3f0b1c1e7f19d | arm | unknown | NOK | http://autobuild.buildroot.net/results/a2a979382652fcee7847e41360a310c2edcd2825 | arm | unknown | NOK | http://autobuild.buildroot.net/results/e5067885b0072a4327737270cbf192e6ddd4821e | sparc | weston-10.0.0 | NOK | http://autobuild.buildroot.net/results/3095e15e129c15b2bccb56e8841b6b2d285cc572 | Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 3 gdb-9.2 | 1 mesa3d-20.3.5 | 1 monkey-f54856ce250c4e257354... | 1 rocksdb-6.13.3 | 1 zeromq-4.3.4 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- aarch64 | gdb-9.2 | NOK | http://autobuild.buildroot.net/results/72407799606c5a34894938ae8418e3c9a8442aa7 | ORPH arm | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/d4c8d95ae421cc600e703f2b9ec9d78565b31131 | xtensa | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/d8ba9306b0a7484d74c4ee7357ff850cd1be86b0 | arm | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/85d6fbe1757dde8470cb1f374d5a25b02b045673 | mips64el | mesa3d-20.3.5 | NOK | http://autobuild.buildroot.net/results/a8eb04e4a155fe43e05fa9fc50584bc2283b5fb7 | mips64el | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/c69edb7d4cb1af59ff289630fbc604307d1972a7 | powerpc | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/fabbd8f745c6b863277f4a72a487d7263dd5725f | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/557a844678bea226d39204bd4daf7e9644de3dd8 | -- http://autobuild.buildroot.net From angelo at amarulasolutions.com Thu Feb 24 11:37:34 2022 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Thu, 24 Feb 2022 12:37:34 +0100 Subject: [Buildroot] [PATCH 1/2] linux: bump CIP kernel to version 5.10.100-cip2 Message-ID: <20220224113735.4088631-1-angelo@amarulasolutions.com> Signed-off-by: Angelo Compagnucci --- linux/Config.in | 4 ++-- linux/linux.hash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 13d99bd09d..c454a89fba 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -31,7 +31,7 @@ config BR2_LINUX_KERNEL_LATEST_VERSION bool "Latest version (5.15)" config BR2_LINUX_KERNEL_LATEST_CIP_VERSION - bool "Latest CIP SLTS version (5.10.83-cip1)" + bool "Latest CIP SLTS version (5.10.100-cip2)" help CIP launched in the spring of 2016 to address the needs of organizations in industries such as power generation and @@ -126,7 +126,7 @@ endif config BR2_LINUX_KERNEL_VERSION string 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.100-cip2" 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 \ if BR2_LINUX_KERNEL_CUSTOM_VERSION diff --git a/linux/linux.hash b/linux/linux.hash index d0813e5db4..8b689f122b 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -9,7 +9,7 @@ sha256 fd4bdbc8be3472d6324fa0f5f57a17f5c3f509d5f5b4fa4f1a9797d982d0bca8 linux- 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 e90e8100bf44cdd6714bca3b9b1f78694c99bfa9bdff761de06b192dfb230831 linux-cip-5.10.100-cip2.tar.gz sha256 2395443c5f960e5c6343f70480209d2530da27aa6f0299412e0f4b7128fccb7c linux-cip-5.10.83-cip1-rt1.tar.gz # Licenses hashes -- 2.25.1 From angelo at amarulasolutions.com Thu Feb 24 11:37:35 2022 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Thu, 24 Feb 2022 12:37:35 +0100 Subject: [Buildroot] [PATCH 2/2] linux: bump CIP RT kernel to version 5.10.100-cip2-rt2 In-Reply-To: <20220224113735.4088631-1-angelo@amarulasolutions.com> References: <20220224113735.4088631-1-angelo@amarulasolutions.com> Message-ID: <20220224113735.4088631-2-angelo@amarulasolutions.com> Signed-off-by: Angelo Compagnucci --- linux/Config.in | 4 ++-- linux/linux.hash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index c454a89fba..eb602eb505 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -50,7 +50,7 @@ config BR2_LINUX_KERNEL_LATEST_CIP_VERSION https://www.cip-project.org config BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION - bool "Latest CIP RT SLTS version (5.10.83-cip1-rt1)" + bool "Latest CIP RT SLTS version (5.10.100-cip2-rt2)" help Same as the CIP version, but this is the PREEMPT_RT realtime variant. @@ -127,7 +127,7 @@ config BR2_LINUX_KERNEL_VERSION string default "5.15.13" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.100-cip2" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION - default "5.10.83-cip1-rt1" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION + default "5.10.100-cip2-rt2" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL diff --git a/linux/linux.hash b/linux/linux.hash index 8b689f122b..a47ec9ca6f 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -10,7 +10,7 @@ sha256 bffaaa4c93ab4ed1de61f804c26c92b82dd80f92793e20194b62497d7b8b4723 linux- sha256 01ccfc3413c3bb305653ceb0aa528aba0caa61b326e43709bf1f8b624f211031 linux-4.19.224.tar.xz # Locally computed sha256 e90e8100bf44cdd6714bca3b9b1f78694c99bfa9bdff761de06b192dfb230831 linux-cip-5.10.100-cip2.tar.gz -sha256 2395443c5f960e5c6343f70480209d2530da27aa6f0299412e0f4b7128fccb7c linux-cip-5.10.83-cip1-rt1.tar.gz +sha256 945b63f280c5bd9aad66016ef6fbed57612864192bc0f54f6800562f56cfd518 linux-cip-5.10.100-cip2-rt2.tar.gz # Licenses hashes sha256 fb5a425bd3b3cd6071a3a9aff9909a859e7c1158d54d32e07658398cd67eb6a0 COPYING -- 2.25.1 From marcus.hoffmann at othermo.de Thu Feb 24 14:07:59 2022 From: marcus.hoffmann at othermo.de (Marcus Hoffmann) Date: Thu, 24 Feb 2022 15:07:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/docker-engine: remove unused sqlite In-Reply-To: <20220221120657.4095013-1-tianyuanhao3@163.com> References: <20220221120657.4095013-1-tianyuanhao3@163.com> Message-ID: <9f038ee9-b8c4-3c56-36eb-971690a40b8c@othermo.de> On 21.02.22 13:06, TIAN Yuanhao wrote: > Dependency on sqlite has been removed since v17.04.0-ce. > > See: https://github.com/moby/moby/pull/30208 > > Signed-off-by: TIAN Yuanhao Tested to work on arm64, various docker functionality still works fine. Tested-by: Marcus Hoffmann > --- > package/docker-engine/Config.in | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in > index 911cbfe428..1f0efb8fcc 100644 > --- a/package/docker-engine/Config.in > +++ b/package/docker-engine/Config.in > @@ -9,7 +9,6 @@ config BR2_PACKAGE_DOCKER_ENGINE > select BR2_PACKAGE_CONTAINERD # runtime dependency > select BR2_PACKAGE_DOCKER_PROXY # runtime dependency > select BR2_PACKAGE_IPTABLES # runtime dependency > - select BR2_PACKAGE_SQLITE # runtime dependency > help > Docker is a platform to build, ship, > and run applications as lightweight containers. From giulio.benetti at benettiengineering.com Thu Feb 24 15:12:10 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 24 Feb 2022 16:12:10 +0100 Subject: [Buildroot] [PATCH v4 1/3] board/andes: rearrange andes folder structure In-Reply-To: References: <20220223071049.21153-1-peterlin@andestech.com> <84e159d2-0123-e5b1-c42e-99b70c99f43c@benettiengineering.com> Message-ID: <111a4578-2489-09db-909c-774017800746@benettiengineering.com> Hi Peter, On 24/02/22 03:41, Yu Chien Peter Lin wrote: > Hi Giulio, > >>>>>>> Changes v3 -> v4: >>>>>>> - rename ae3xx folder to ae300 >>>>>>> - rename andes_ae3xx_defconfig to andes_ae300_defconfig >>>>>>> - update readme.txt and item in DEVELOPERS >>>>>> >>>>>> Some of these change ^^^ must have been moved to the single patch, like >>>>>> DEVELOPERS is updated in patch 3/3. I've also forgotten to point you to add >>>>>> a --cover-letter, so keep in mind both points for next time. >>>>>> >>>>>> I've built tested both defconfig successfully, so: >>>>>> Reviewed-by: Giulio Benetti >>>>>> Tested-by: Giulio Benetti >>>>>> [Giulio: build tested only] >>>>>> >>>>>> And the other patches of this series is all reviewed, so to me it's ready to >>>>>> be committed, but this will happen after Buildroot 2022.02 is released, >>>>>> since between rc1 to the release Maintainers only accept fixes. Another >>>>>> possibility is that they will commit these patches to next branch. >>>>>> >>>>>> Please remember to tag V3. > > Oh, I thought you were refering to format-patch with v3, sorry. > I will mark the patch on patchwork to rejected state except the latest > patch version. Ok, V3 it's still tagged as new in patchwork for the moment. >>>>>> Thank you for your effort! >>>>>> >>>>>> Best regards >>>>>> -- >>>>>> Giulio Benetti >>>>>> Benetti Engineering sas >>>> >>>> Thanks for reviewing my patches and the guidance. >>> >>> You're welcome. >>> >>>> I will make a new patch for the Config.in, >>> >>> Which one? I only see: >>> toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in >>> >>> Do you mean you will add an entry in DEVELOPERS for it? > > I found the modifications on these files in Git history, usually have > its own patch. No, maybe you mean there is a cover-letter that summarize the changes of all patches in patchset and then in every patch you list the changes of on that patch. > So in PATCH v5, I will split [PATCH 1/3] to [PATCH 1/4] > and [PATCH 2/4] for > toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in > other patches remain the same, No, wait. I've meant you only need to split: --- Changes v1->v2: * * [..] --- for every patch. So, don't summarize all the changes on patch [1/3], because those changes are related to different patches. For example in V1->V2 you state: - update DEVELOPERS but you do it in patch [3/3], so you only have to move the changes into the right patch, that's all. > and attach [PATCH 0/4] cover letter. And yes please, add a cover letter that briefly explain what patchset does and that's it. >>>> The last question, is it tag V5 for the next submission? >>> >>> It depends if you need to modify these patches. Or if you add a new patch >>> that depends on these patches, then yes, please send a V5 with all changes >>> moved to the different patches, including adding the patch if this is your >>> goal. >>> >>> Best regards >>> -- >>> Giulio Benetti >>> Benetti Engineering sas > > Is there any the new comment? > Again, thanks for your help. :) For the moment I don't see anything wrong except the changelog. Thank you! Best regards -- Giulio Benetti Benetti Engineering sas From giulio.benetti at benettiengineering.com Thu Feb 24 15:23:39 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 24 Feb 2022 16:23:39 +0100 Subject: [Buildroot] [PATCH] package/erlang-jiffy: bump version to 1.1.1 Message-ID: <20220224152339.442421-1-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- package/erlang-jiffy/erlang-jiffy.hash | 2 +- package/erlang-jiffy/erlang-jiffy.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/erlang-jiffy/erlang-jiffy.hash b/package/erlang-jiffy/erlang-jiffy.hash index 93c5e1f8c8..f172d1476e 100644 --- a/package/erlang-jiffy/erlang-jiffy.hash +++ b/package/erlang-jiffy/erlang-jiffy.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 45c224afe0ea2d3ece39e227f01f5585ad53b8b91d2d6924f9f50548874ae879 erlang-jiffy-1.0.9.tar.gz +sha256 a999351d956d3ed10c33a6dd7e9435e674e519b5b82a46d60361afdb83062fd8 erlang-jiffy-1.1.1.tar.gz sha256 0fa8afad2f02c08850a16e36fe55376ee19732b3a116a0207f2a73c857777a49 LICENSE diff --git a/package/erlang-jiffy/erlang-jiffy.mk b/package/erlang-jiffy/erlang-jiffy.mk index cd94632962..de2e4749fb 100644 --- a/package/erlang-jiffy/erlang-jiffy.mk +++ b/package/erlang-jiffy/erlang-jiffy.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_JIFFY_VERSION = 1.0.9 +ERLANG_JIFFY_VERSION = 1.1.1 ERLANG_JIFFY_SITE = $(call github,davisp,jiffy,$(ERLANG_JIFFY_VERSION)) ERLANG_JIFFY_LICENSE = MIT (core), \ BSD-3-Clause (Google double conversion library), \ -- 2.25.1 From romain.naour at gmail.com Thu Feb 24 15:41:18 2022 From: romain.naour at gmail.com (Romain Naour) Date: Thu, 24 Feb 2022 16:41:18 +0100 Subject: [Buildroot] [PATCH] package/pkg-python: use SETUPTOOLS_USE_DISTUTILS=stdlib Message-ID: <20220224154118.220408-1-romain.naour@gmail.com> -sh: ipython: not found ipython use a wrong shebang on the target: # head -n 1 /usr/bin/ipython #!/home/kubu/buildroot/testsuite-master/TestIPythonPy3/host/bin/python The issue come from python3-setuptools 60.0.0 that changed SETUPTOOLS_USE_DISTUTILS default value from stdlib to local [1] to use its local copy of distutils. This is actually a "breaking" change [2]. We have to override SETUPTOOLS_USE_DISTUTILS to the previous value "stdlib" to fixes the issue. While at it, use distutils from stdlib for the host. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2088684091 [1] https://github.com/pypa/setuptools/commit/b6fcbbd00cb6d5607c9272dec452a50457bdb292 [2] https://github.com/pypa/setuptools/blob/v60.0.0/CHANGES.rst#breaking-changes Signed-off-by: Romain Naour Cc: James Hilliard --- package/pkg-python.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index b8dc9cd9e5..e81a1a3102 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -40,6 +40,7 @@ PKG_PYTHON_DISTUTILS_ENV = \ LDSHARED="$(TARGET_CROSS)gcc -shared" \ PYTHONPATH="$(PYTHON3_PATH)" \ PYTHONNOUSERSITE=1 \ + SETUPTOOLS_USE_DISTUTILS=stdlib \ _PYTHON_HOST_PLATFORM="$(PKG_PYTHON_HOST_PLATFORM)" \ _PYTHON_PROJECT_BASE="$(PYTHON3_DIR)" \ _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ @@ -62,6 +63,7 @@ PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS = \ HOST_PKG_PYTHON_DISTUTILS_ENV = \ PATH=$(BR_PATH) \ PYTHONNOUSERSITE=1 \ + SETUPTOOLS_USE_DISTUTILS=stdlib \ $(HOST_CONFIGURE_OPTS) HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \ @@ -76,6 +78,7 @@ PKG_PYTHON_SETUPTOOLS_ENV = \ $(TARGET_CONFIGURE_OPTS) \ PYTHONPATH="$(PYTHON3_PATH)" \ PYTHONNOUSERSITE=1 \ + SETUPTOOLS_USE_DISTUTILS=stdlib \ _python_sysroot=$(STAGING_DIR) \ _python_prefix=/usr \ _python_exec_prefix=/usr @@ -96,6 +99,7 @@ PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS = \ HOST_PKG_PYTHON_SETUPTOOLS_ENV = \ PATH=$(BR_PATH) \ PYTHONNOUSERSITE=1 \ + SETUPTOOLS_USE_DISTUTILS=stdlib \ $(HOST_CONFIGURE_OPTS) HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ -- 2.35.1 From romain.naour at gmail.com Thu Feb 24 15:45:12 2022 From: romain.naour at gmail.com (Romain Naour) Date: Thu, 24 Feb 2022 16:45:12 +0100 Subject: [Buildroot] [PATCHv2 1/2] support/testing: TestRust{Bin} use ripgrep package for testing Message-ID: <20220224154513.220976-1-romain.naour@gmail.com> TestRust and TestRustBin has been introduced at the time when there was no cargo package infrastructure or any package using rust compiler (Buildroot 2018.02). Since then the ripgrep package has been introduced, initially using the generic package infrastructure and converted later to the cargo package infrastructure. Due a recent change in rust/cargo removing the cargo config file [1] the test TestRust and TestRustBin now fail to compile since they build an hello-world crate outside of the cargo package infrastructure without the correct environment for cross-compiling. Replace the 'hello-world' crate by ripgrep package and check if it can run properly in Qemu. Fixes tests.package.test_rust.TestRustBin: https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202545 But doesn't fixes tests.package.test_rust.TestRust due another bug: https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202544 [1] b6378631c2609742382984f6f7b93c1d9d2cdb78 Signed-off-by: Romain Naour Cc: Eric Le Bihan --- v2: no changes --- support/testing/tests/package/test_rust.py | 48 ++-------------------- 1 file changed, 4 insertions(+), 44 deletions(-) diff --git a/support/testing/tests/package/test_rust.py b/support/testing/tests/package/test_rust.py index 884b40a4a3..a1abd20c09 100644 --- a/support/testing/tests/package/test_rust.py +++ b/support/testing/tests/package/test_rust.py @@ -8,9 +8,6 @@ import infra.basetest class TestRustBase(infra.basetest.BRTest): - target = 'armv7-unknown-linux-gnueabihf' - crate = 'hello-world' - def login(self): img = os.path.join(self.builddir, "images", "rootfs.cpio") self.emulator.boot(arch="armv7", @@ -18,43 +15,6 @@ class TestRustBase(infra.basetest.BRTest): options=["-initrd", img]) self.emulator.login() - def build_test_prog(self): - hostdir = os.path.join(self.builddir, 'host') - env = os.environ.copy() - env["USER"] = "br-user" - env["PATH"] = "{}:".format(os.path.join(hostdir, 'bin')) + env["PATH"] - env["CARGO_HOME"] = os.path.join(hostdir, 'usr', 'share', 'cargo') - env["RUST_TARGET_PATH"] = os.path.join(hostdir, 'etc', 'rustc') - cargo = os.path.join(hostdir, 'bin', 'cargo') - workdir = os.path.join(tempfile.mkdtemp(suffix='-br2-testing-rust'), - self.crate) - manifest = os.path.join(workdir, 'Cargo.toml') - prog = os.path.join(workdir, 'target', self.target, 'debug', self.crate) - - cmd = [cargo, 'init', '--bin', '--vcs', 'none', '-vv', workdir] - ret = subprocess.call(cmd, - stdout=self.b.logfile, - stderr=self.b.logfile, - env=env) - if ret != 0: - raise SystemError("Cargo init failed") - - cmd = [ - cargo, 'build', '-vv', '--target', self.target, - '--manifest-path', manifest - ] - ret = subprocess.call(cmd, - stdout=self.b.logfile, - stderr=self.b.logfile, - env=env) - if ret != 0: - raise SystemError("Cargo build failed") - - shutil.copy(prog, os.path.join(self.builddir, 'target', 'usr', 'bin')) - self.b.build() - shutil.rmtree(workdir) - - class TestRustBin(TestRustBase): config = \ """ @@ -68,12 +28,12 @@ class TestRustBin(TestRustBase): BR2_TARGET_ROOTFS_CPIO=y # BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_RUSTC=y + BR2_PACKAGE_RIPGREP=y """ def test_run(self): - self.build_test_prog() self.login() - self.assertRunOk(self.crate) + self.assertRunOk("rg Buildroot /etc/issue") class TestRust(TestRustBase): @@ -90,9 +50,9 @@ class TestRust(TestRustBase): # BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_RUSTC=y BR2_PACKAGE_HOST_RUST=y + BR2_PACKAGE_RIPGREP=y """ def test_run(self): - self.build_test_prog() self.login() - self.assertRunOk(self.crate) + self.assertRunOk("rg Buildroot /etc/issue") -- 2.35.1 From romain.naour at gmail.com Thu Feb 24 15:45:13 2022 From: romain.naour at gmail.com (Romain Naour) Date: Thu, 24 Feb 2022 16:45:13 +0100 Subject: [Buildroot] [PATCHv2 2/2] package/rust: install rustc and rust-std built by Buildroot In-Reply-To: <20220224154513.220976-1-romain.naour@gmail.com> References: <20220224154513.220976-1-romain.naour@gmail.com> Message-ID: <20220224154513.220976-2-romain.naour@gmail.com> The test TestRust is currently broken with ripgrep package with the following error: error[E0514]: found crate `core` compiled by an incompatible version of rustc | = help: please recompile that crate using this compiler (rustc 1.58.1) (consider running `cargo clean` first) = note: the following crate versions were found: crate `core` compiled by rustc 1.58.1 (db9d1b20b 2022-01-20): TestRust/host/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcore-6cfcec236d576603.rlib error[E0514]: found crate `std` compiled by an incompatible version of rustc The problem is not really a cross-compilation issue (we are building for an armv7 target on x86_64 host) but a problem with rust-std libraries (rlib). We can notice that "rustc 1.58.1 (db9d1b20b 2022-01-20)" is the same version as the prebuilt rustc used to bootstrap the build: TestRust/host/bin/rustc --version rustc 1.58.1 TestRustBin/host/bin/rustc --version rustc 1.58.1 (db9d1b20b 2022-01-20) Indeed we are using host-rust-bin to bootstrap the host-rust compiler package built by Buildroot. The problem is that the libcore-6cfcec236d576603.rlib file come from host-rust-bin (rust-std) and is not removed before installing host-rust built by Buildroot. We actually spent a lot of time to build host-rust with rust-std and forget to install this important library HOST_DIR. Looking at the host-rust build directory we can notice two installer script "install.sh" (the same scripts used to install host-rust-bin): TestRust/build/host-rust-1.58.1/build/tmp/tarball/rust/x86_64-unknown-linux-gnu/rust-1.58.1-x86_64-unknown-linux-gnu/install.sh TestRust/build/host-rust-1.58.1/build/tmp/tarball/rust-std/armv7-unknown-linux-gnueabihf/rust-std-1.58.1-armv7-unknown-linux-gnueabihf/install.sh The "tarball" directory is generated by the "python x.py dist" during the install step, we have to keep it. Replace "python x.py install" by theses two install scripts. Installing rust-std with the install.sh script replace the rust-std libraries installed by host-rust-bin. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202544 Signed-off-by: Romain Naour Cc: Eric Le Bihan --- package/rust/rust.mk | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/package/rust/rust.mk b/package/rust/rust.mk index 46487fe4b7..4a6b04dc8c 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -67,9 +67,30 @@ define HOST_RUST_BUILD_CMDS cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py build endef +HOST_RUST_INSTALL_COMMON_OPTS = \ + --prefix=$(HOST_DIR) \ + --disable-ldconfig + +HOST_RUST_INSTALL_OPTS = \ + $(HOST_RUST_INSTALL_COMMON_OPTS) \ + --components=rustc,cargo,rust-std-$(RUSTC_HOST_NAME) + +define HOST_RUST_INSTALL_RUSTC + (cd $(@D)/build/tmp/tarball/rust/$(RUSTC_HOST_NAME)/rust-$(RUST_VERSION)-$(RUSTC_HOST_NAME); \ + ./install.sh $(HOST_RUST_INSTALL_OPTS)) +endef + +ifeq ($(BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS),y) +define HOST_RUST_INSTALL_LIBSTD_TARGET + (cd $(@D)/build/tmp/tarball/rust-std/$(RUSTC_TARGET_NAME)/rust-std-$(RUST_VERSION)-$(RUSTC_TARGET_NAME); \ + ./install.sh $(HOST_RUST_INSTALL_COMMON_OPTS)) +endef +endif + define HOST_RUST_INSTALL_CMDS cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py dist - cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py install + $(HOST_RUST_INSTALL_RUSTC) + $(HOST_RUST_INSTALL_LIBSTD_TARGET) endef $(eval $(host-generic-package)) -- 2.35.1 From romain.naour at gmail.com Thu Feb 24 16:25:16 2022 From: romain.naour at gmail.com (Romain Naour) Date: Thu, 24 Feb 2022 17:25:16 +0100 Subject: [Buildroot] [PATCHv2 1/2] package/efl: rework eeze handling in Kconfig Message-ID: <20220224162517.222437-1-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. [1] e026c3bdb8f493b3fc21de7c45e3edbc47e03128 Signed-off-by: Romain Naour --- v2: simplify the commit log Remove the "eeze" between parenthesis --- package/efl/Config.in | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/package/efl/Config.in b/package/efl/Config.in index eb9c7aebd9..4c78bef7c8 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 # efl-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. @@ -125,8 +126,8 @@ config BR2_PACKAGE_EFL_UTIL_LINUX_LIBMOUNT devices etc... and disabling this will hurt support for Enlightenment and its filemanager. -comment "efl's libmount support needs udev /dev management (eeze)" - depends on !BR2_PACKAGE_EFL_EEZE +comment "efl's libmount support needs udev /dev management " + depends on !BR2_PACKAGE_HAS_UDEV config BR2_PACKAGE_EFL_HAS_RECOMMENDED_CONFIG bool @@ -173,16 +174,16 @@ 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, efl-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 select BR2_PACKAGE_WAYLAND_PROTOCOLS -comment "Wayland support needs udev /dev management (eeze), OpenGL ES w/ EGL, threads, locales" +comment "Wayland support needs udev /dev management, 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 # efl-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 @@ -230,9 +232,9 @@ config BR2_PACKAGE_EFL_DRM etc) to handle interfacing with libinput without having to duplicate the code in each subsystem. -comment "Evas DRM Engine needs udev /dev management (eeze), mesa3d w/ EGL support, threads" +comment "Evas DRM Engine needs udev /dev management, 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.35.1 From romain.naour at gmail.com Thu Feb 24 16:25:17 2022 From: romain.naour at gmail.com (Romain Naour) Date: Thu, 24 Feb 2022 17:25:17 +0100 Subject: [Buildroot] [PATCHv2 2/2] package/efl: handle input option In-Reply-To: <20220224162517.222437-1-romain.naour@gmail.com> References: <20220224162517.222437-1-romain.naour@gmail.com> Message-ID: <20220224162517.222437-2-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: Rename BR2_PACKAGE_EFL_LIBINPUT to BR2_PACKAGE_EFL_ELPUT to match the upstream name. use BR2_PACKAGE_EFL_ELPUT for BR2_PACKAGE_EFL_DRM remove duplicate libxkbcommon in EFL_DEPENDENCIES] Signed-off-by: Romain Naour --- v2: rework BR2_PACKAGE_EFL_DRM --- package/efl/Config.in | 19 +++++++++++++++---- package/efl/efl.mk | 9 +++++++-- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/package/efl/Config.in b/package/efl/Config.in index 4c78bef7c8..c4f82b92e3 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_ELPUT + bool "Enable elput support (recommended)" + default y + depends on BR2_PACKAGE_HAS_UDEV # libinput, efl-eeze + select BR2_PACKAGE_EFL_EEZE + select BR2_PACKAGE_LIBINPUT + select BR2_PACKAGE_LIBXKBCOMMON + help + Eplut is used to support gesture recognition. + +comment "elput needs udev /dev management" + 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 # efl-eeze + depends on BR2_PACKAGE_HAS_UDEV # efl-elput, efl-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_ELPUT 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..bb0bd3f76d 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_ELPUT),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 @@ -204,8 +211,6 @@ else EFL_CONF_OPTS += -Dwl=false endif -EFL_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBXKBCOMMON),libxkbcommon) - # json evas loader is disabled by default by upstream. # Disable libspectre (ps). # Keep all other evas loader enabled or handled below. -- 2.35.1 From fontaine.fabrice at gmail.com Thu Feb 24 17:36:15 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 24 Feb 2022 18:36:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/bluez5_utils: fix musl build Message-ID: <20220224173615.486414-1-fontaine.fabrice@gmail.com> Fix the following musl build failure raised since commit 6fc5c8e92c1d7997e48b207187d2d3c7ad42819: In file included from src/shared/queue.c:15: ./src/shared/util.h:106:1: error: unknown type name 'ssize_t'; did you mean 'size_t'? 106 | ssize_t util_getrandom(void *buf, size_t buflen, unsigned int flags); | ^~~~~~~ | size_t Fixes: - http://autobuild.buildroot.org/results/83eaeb3863040645409f5787fdbdde79385c5257 Signed-off-by: Fabrice Fontaine --- ...rc-shared-util.h-include-sys-types.h.patch | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 package/bluez5_utils/0006-src-shared-util.h-include-sys-types.h.patch diff --git a/package/bluez5_utils/0006-src-shared-util.h-include-sys-types.h.patch b/package/bluez5_utils/0006-src-shared-util.h-include-sys-types.h.patch new file mode 100644 index 0000000000..8a5bd64d43 --- /dev/null +++ b/package/bluez5_utils/0006-src-shared-util.h-include-sys-types.h.patch @@ -0,0 +1,39 @@ +From 1d21878d84f16e28e16c61b36799a62e22732d97 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 24 Feb 2022 18:19:33 +0100 +Subject: [PATCH] src/shared/util.h: include sys/types.h + +Include sys/types.h to avoid the following build failure on musl raised +since commit fb57ad9b9d107856e5f1c8135da04ffa2f7a11ac: + +In file included from src/shared/queue.c:15: +./src/shared/util.h:106:1: error: unknown type name 'ssize_t'; did you mean 'size_t'? + 106 | ssize_t util_getrandom(void *buf, size_t buflen, unsigned int flags); + | ^~~~~~~ + | size_t + +Fixes: + - http://autobuild.buildroot.org/results/83eaeb3863040645409f5787fdbdde79385c5257 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://patchwork.kernel.org/project/bluetooth/patch/20220224173104.479809-1-fontaine.fabrice at gmail.com] +--- + src/shared/util.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/shared/util.h b/src/shared/util.h +index c01eccf8a..554481e1e 100644 +--- a/src/shared/util.h ++++ b/src/shared/util.h +@@ -14,6 +14,7 @@ + #include + #include + #include ++#include + + #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) + #define BIT(n) (1 << (n)) +-- +2.34.1 + -- 2.34.1 From fontaine.fabrice at gmail.com Thu Feb 24 17:51:19 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 24 Feb 2022 18:51:19 +0100 Subject: [Buildroot] [PATCH 1/1] package/bpftool: add BR2_PACKAGE_BPFTOOL_ARCH_SUPPORTS Message-ID: <20220224175119.487040-1-fontaine.fabrice@gmail.com> bpftool uses its own local copy of libbpf so add BR2_PACKAGE_BPFTOOL_ARCH_SUPPORTS to avoid the following build failure on ARM: btf.c: In function 'btf_type_by_id': btf.c:461:14: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] if (type_id < btf->start_id) ^ bpf.c:62:4: error: #error __NR_bpf not defined. libbpf does not support your arch. # error __NR_bpf not defined. libbpf does not support your arch. ^ Fixes: - http://autobuild.buildroot.org/results/aae772f1cfb16516a57f310c4f022e80a2a8d65e Signed-off-by: Fabrice Fontaine --- package/bpftool/Config.in | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/package/bpftool/Config.in b/package/bpftool/Config.in index e81d874343..a1ef3843e6 100644 --- a/package/bpftool/Config.in +++ b/package/bpftool/Config.in @@ -1,5 +1,15 @@ +config BR2_PACKAGE_BPFTOOL_ARCH_SUPPORTS + bool + # see libbpf/src/bpf.c + default y if BR2_arc + default y if BR2_aarch64 || BR2_aarch64_be + default y if BR2_i386 || BR2_x86_64 + default y if BR2_sparc || BR2_sparc64 + default y if BR2_s390x + config BR2_PACKAGE_BPFTOOL bool "bpftool" + depends on BR2_PACKAGE_BPFTOOL_ARCH_SUPPORTS depends on !BR2_nios2 # binutils depends on BR2_USE_WCHAR # binutils, elfutils depends on !BR2_STATIC_LIBS # elfutils @@ -13,6 +23,7 @@ config BR2_PACKAGE_BPFTOOL of eBPF programs and maps. comment "bpftool needs a uClibc or glibc toolchain w/ wchar, dynamic library, threads, headers >= 4.12" + depends on BR2_PACKAGE_BPFTOOL_ARCH_SUPPORTS depends on !BR2_nios2 depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \ || !BR2_TOOLCHAIN_HAS_THREADS \ -- 2.34.1 From bugzilla at busybox.net Thu Feb 24 21:20:54 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Thu, 24 Feb 2022 21:20:54 +0000 Subject: [Buildroot] [Bug 14601] Python build fails on 2022.02-rc2 In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14601 --- Comment #3 from Peter Seiderer --- (In reply to HiFiBerry (Daniel) from comment #2) Identify the files installed under '/home/matuschd/buildroot-4/target//home/matuschd/buildroot-4'... Provide a config or defconfig (best a minimal one) reproducing the failure against a plain buildroot version (or git master)... Does it happen only in case of an complete build or does $ make clean; make python3 show the same failure? Anything special about your build host? -- You are receiving this mail because: You are on the CC list for the bug. From andrei.gherghescu at protonmail.com Thu Feb 24 21:28:13 2022 From: andrei.gherghescu at protonmail.com (Andrei Gherghescu) Date: Thu, 24 Feb 2022 21:28:13 +0000 Subject: [Buildroot] [PATCH 1/1] directfb: change upstream site Message-ID: <20220224212755.4856-1-andrei.gherghescu@protonmail.com> The http://www.directfb.org/ has been down since 2015. Use the Buildroot backup download site. Fixes: - https://bugs.busybox.net/show_bug.cgi?id=13731 Signed-off-by: Andrei Gherghescu --- package/directfb-examples/Config.in | 6 ++++-- package/directfb-examples/directfb-examples.mk | 2 +- package/directfb/directfb.mk | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/directfb-examples/Config.in b/package/directfb-examples/Config.in index 216e036577..4d5de03068 100644 --- a/package/directfb-examples/Config.in +++ b/package/directfb-examples/Config.in @@ -4,6 +4,8 @@ config BR2_PACKAGE_DIRECTFB_EXAMPLES help The DirectFB-examples package contains a set of simple DirectFB applications that can be used to test and demonstrate - various DirectFB features. + various DirectFB features. As of 4 October 2015, DirectFB's + website http://www.directfb.org/ is down. See alternative site + listed below. - http://directfb.org/downloads/Extras/README.DirectFB-examples + http://elinux.org/DirectFB diff --git a/package/directfb-examples/directfb-examples.mk b/package/directfb-examples/directfb-examples.mk index 46263da733..c8d09b3e33 100644 --- a/package/directfb-examples/directfb-examples.mk +++ b/package/directfb-examples/directfb-examples.mk @@ -5,7 +5,7 @@ ################################################################################ DIRECTFB_EXAMPLES_VERSION = 1.7.0 -DIRECTFB_EXAMPLES_SITE = http://www.directfb.org/downloads/Extras +DIRECTFB_EXAMPLES_SITE = http://sources.buildroot.net/directfb-examples DIRECTFB_EXAMPLES_SOURCE = DirectFB-examples-$(DIRECTFB_EXAMPLES_VERSION).tar.gz DIRECTFB_EXAMPLES_LICENSE = MIT DIRECTFB_EXAMPLES_LICENSE_FILES = COPYING diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk index 0b32162d8f..56a396ab99 100644 --- a/package/directfb/directfb.mk +++ b/package/directfb/directfb.mk @@ -6,7 +6,7 @@ DIRECTFB_VERSION_MAJOR = 1.7 DIRECTFB_VERSION = $(DIRECTFB_VERSION_MAJOR).7 -DIRECTFB_SITE = http://www.directfb.org/downloads/Core/DirectFB-$(DIRECTFB_VERSION_MAJOR) +DIRECTFB_SITE = http://sources.buildroot.net/directfb DIRECTFB_SOURCE = DirectFB-$(DIRECTFB_VERSION).tar.gz DIRECTFB_LICENSE = LGPL-2.1+ DIRECTFB_LICENSE_FILES = COPYING -- 2.35.1 From andrei.gherghescu at protonmail.com Thu Feb 24 21:36:33 2022 From: andrei.gherghescu at protonmail.com (Andrei Gherghescu) Date: Thu, 24 Feb 2022 21:36:33 +0000 Subject: [Buildroot] [PATCH 1/1] package/directfb: change upstream site Message-ID: <20220224213620.5899-1-andrei.gherghescu@protonmail.com> The http://www.directfb.org/ has been down since 2015. Use the Buildroot backup download site. Fixes: - https://bugs.busybox.net/show_bug.cgi?id=13731 Signed-off-by: Andrei Gherghescu --- package/directfb-examples/Config.in | 6 ++++-- package/directfb-examples/directfb-examples.mk | 2 +- package/directfb/directfb.mk | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/directfb-examples/Config.in b/package/directfb-examples/Config.in index 216e036577..4d5de03068 100644 --- a/package/directfb-examples/Config.in +++ b/package/directfb-examples/Config.in @@ -4,6 +4,8 @@ config BR2_PACKAGE_DIRECTFB_EXAMPLES help The DirectFB-examples package contains a set of simple DirectFB applications that can be used to test and demonstrate - various DirectFB features. + various DirectFB features. As of 4 October 2015, DirectFB's + website http://www.directfb.org/ is down. See alternative site + listed below. - http://directfb.org/downloads/Extras/README.DirectFB-examples + http://elinux.org/DirectFB diff --git a/package/directfb-examples/directfb-examples.mk b/package/directfb-examples/directfb-examples.mk index 46263da733..c8d09b3e33 100644 --- a/package/directfb-examples/directfb-examples.mk +++ b/package/directfb-examples/directfb-examples.mk @@ -5,7 +5,7 @@ ################################################################################ DIRECTFB_EXAMPLES_VERSION = 1.7.0 -DIRECTFB_EXAMPLES_SITE = http://www.directfb.org/downloads/Extras +DIRECTFB_EXAMPLES_SITE = http://sources.buildroot.net/directfb-examples DIRECTFB_EXAMPLES_SOURCE = DirectFB-examples-$(DIRECTFB_EXAMPLES_VERSION).tar.gz DIRECTFB_EXAMPLES_LICENSE = MIT DIRECTFB_EXAMPLES_LICENSE_FILES = COPYING diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk index 0b32162d8f..56a396ab99 100644 --- a/package/directfb/directfb.mk +++ b/package/directfb/directfb.mk @@ -6,7 +6,7 @@ DIRECTFB_VERSION_MAJOR = 1.7 DIRECTFB_VERSION = $(DIRECTFB_VERSION_MAJOR).7 -DIRECTFB_SITE = http://www.directfb.org/downloads/Core/DirectFB-$(DIRECTFB_VERSION_MAJOR) +DIRECTFB_SITE = http://sources.buildroot.net/directfb DIRECTFB_SOURCE = DirectFB-$(DIRECTFB_VERSION).tar.gz DIRECTFB_LICENSE = LGPL-2.1+ DIRECTFB_LICENSE_FILES = COPYING -- 2.35.1 From ps.report at gmx.net Thu Feb 24 22:07:44 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 24 Feb 2022 23:07:44 +0100 Subject: [Buildroot] [v3] package/ntpsec: new package In-Reply-To: References: Message-ID: <20220224230744.1306f790@gmx.net> Hello Guillaume, On Wed, 23 Feb 2022 18:51:59 +0100, Guillaume Bres wrote: > Hello Peter, > > sorry for the delayed test, the usual "busy on too many things". > > Today I ran the current patch serie on "zedboard_defconfig": everything > works fine but SYNC is never fully acquired. The estimated "offsets" from > the pool is close to 2^32 (limit?), jitter is large, delay is realistic, > but those values never get averaged out. Do you mean 'zynq_zed_defconfig' or do you work on an legacy buildroot version? Can spot nothing special in the defconfig despite an ancient linux kernel/headers version (4.16, or 3.18 in legacy zedboard_defconfig)... Anything special in the config file? > What do you think is going on? I don't think it's related to our work but > to the demon itself. Maybe better ask at ntpsec mailing list/bugtracker ([1])? > v1_2_1 is fairly old, I hope they provide a new tag soon because a lot of a > work has been accomplished in the meantime. New release seems to be scheduled for end of this month [2]... > > At work we use our custom fork (for custom encryption), I rebased to master > last week, I have never experienced such behavior. Did only test/run on raspberry pi 3/4 (both 32 and 64 bit, glibc, uclibc)... Regards, Peter [1] https://www.ntpsec.org/channels.html [2] https://lists.ntpsec.org/pipermail/devel/2022-February/009961.html > > Guillaume W. Bres > Software engineer > From aperez at igalia.com Thu Feb 24 23:16:09 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Fri, 25 Feb 2022 01:16:09 +0200 Subject: [Buildroot] [PATCH/next 2/2] package/bubblewrap: switch to the meson build system In-Reply-To: <20220224231609.1097793-1-aperez@igalia.com> References: <20220224231609.1097793-1-aperez@igalia.com> Message-ID: <20220224231609.1097793-2-aperez@igalia.com> Version 0.6.0 introduced a Meson build system, and upstream seems to have the intention to abandon the previous autotools based one. Switch to Meson for future proofing. Signed-off-by: Adrian Perez de Castro --- package/bubblewrap/bubblewrap.mk | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/package/bubblewrap/bubblewrap.mk b/package/bubblewrap/bubblewrap.mk index 4d6593576e..6b00dfe7f9 100644 --- a/package/bubblewrap/bubblewrap.mk +++ b/package/bubblewrap/bubblewrap.mk @@ -14,22 +14,24 @@ BUBBLEWRAP_LICENSE_FILES = COPYING BUBBLEWRAP_CPE_ID_VENDOR = projectatomic BUBBLEWRAP_CONF_OPTS = \ - --enable-require-userns=no \ - --disable-man \ - --disable-sudo \ - --with-priv-mode=none + -Dzsh_completion=disabled \ + -Dman=disabled \ + -Dpython=$(HOST_DIR)/bin/python \ + -Drequire_userns=false ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y) -BUBBLEWRAP_CONF_OPTS += --with-bash-completion-dir=/usr/share/bash-completion/completions +BUBBLEWRAP_CONF_OPTS += \ + -Dbash_completion=enabled \ + -Dbash_completion_dir=/usr/share/bash-completion/completions else -BUBBLEWRAP_CONF_OPTS += --without-bash-completion-dir +BUBBLEWRAP_CONF_OPTS += -Dbash_completion=disabled endif ifeq ($(BR2_PACKAGE_LIBSELINUX),y) -BUBBLEWRAP_CONF_OPTS += --enable-selinux +BUBBLEWRAP_CONF_OPTS += -Dselinux=enabled BUBBLEWRAP_DEPENDENCIES += libselinux else -BUBBLEWRAP_CONF_OPTS += --disable-selinux +BUBBLEWRAP_CONF_OPTS += -Dselinux=disabled endif # We need to mark bwrap as setuid, in case the kernel @@ -38,4 +40,4 @@ define BUBBLEWRAP_PERMISSIONS /usr/bin/bwrap f 1755 0 0 - - - - - endef -$(eval $(autotools-package)) +$(eval $(meson-package)) -- 2.35.1 From aperez at igalia.com Thu Feb 24 23:16:08 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Fri, 25 Feb 2022 01:16:08 +0200 Subject: [Buildroot] [PATCH/next 1/2] package/bubblewrap: bump to version 0.6.0 Message-ID: <20220224231609.1097793-1-aperez@igalia.com> This version includes a new feature which allows specifying multiple seccomp filters. There is now a Meson-based build system as well, but for the moment the build recipe keeps using the autotools based one. Release notes can be found at: https://github.com/containers/bubblewrap/releases/tag/v0.6.0 Signed-off-by: Adrian Perez de Castro --- package/bubblewrap/bubblewrap.hash | 4 ++-- package/bubblewrap/bubblewrap.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/bubblewrap/bubblewrap.hash b/package/bubblewrap/bubblewrap.hash index 88aba150cd..b756271ecf 100644 --- a/package/bubblewrap/bubblewrap.hash +++ b/package/bubblewrap/bubblewrap.hash @@ -1,5 +1,5 @@ -# From https://github.com/containers/bubblewrap/releases/tag/v0.5.0 -sha256 16fdaf33799d63104e347e0133f909196fe90d0c50515d010bcb422eb5a00818 bubblewrap-0.5.0.tar.xz +# From https://github.com/containers/bubblewrap/releases/tag/v0.6.0 +sha256 11393cf2058f22e6a6c6e9cca3c85ff4c4239806cb28fee657c62a544df35693 bubblewrap-0.6.0.tar.xz # Hash for license files: sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/bubblewrap/bubblewrap.mk b/package/bubblewrap/bubblewrap.mk index 5f3d95e826..4d6593576e 100644 --- a/package/bubblewrap/bubblewrap.mk +++ b/package/bubblewrap/bubblewrap.mk @@ -4,7 +4,7 @@ # ################################################################################ -BUBBLEWRAP_VERSION = 0.5.0 +BUBBLEWRAP_VERSION = 0.6.0 BUBBLEWRAP_SITE = https://github.com/containers/bubblewrap/releases/download/v$(BUBBLEWRAP_VERSION) BUBBLEWRAP_SOURCE = bubblewrap-$(BUBBLEWRAP_VERSION).tar.xz BUBBLEWRAP_DEPENDENCIES = host-pkgconf libcap -- 2.35.1 From aperez at igalia.com Thu Feb 24 23:21:59 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Fri, 25 Feb 2022 01:21:59 +0200 Subject: [Buildroot] [PATCH 1/1] package/cog: bump to version 0.12.1 Message-ID: <20220224232159.1103756-1-aperez@igalia.com> This is a minor release which fixes an installation path and a crash with certain Wayland compositors. Release notes can be found at: https://wpewebkit.org/release/cog-0.12.1.html Signed-off-by: Adrian Perez de Castro --- package/cog/cog.hash | 8 ++++---- package/cog/cog.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/cog/cog.hash b/package/cog/cog.hash index 6a9af1845d..839b12e619 100644 --- a/package/cog/cog.hash +++ b/package/cog/cog.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/cog-0.12.0.tar.xz.sums -md5 30d6f68914af0ba5c32ac14df504215a cog-0.12.0.tar.xz -sha1 de367b33fb45a1bca9e443ca5c1d6cae3833d759 cog-0.12.0.tar.xz -sha256 aad413a8aaf15d400d70f9c909a28b92b138f7b0c0d825978de8788d0d75208a cog-0.12.0.tar.xz +# From https://wpewebkit.org/releases/cog-0.12.1.tar.xz.sums +md5 25a80a5a8a52b8873933a128151b8928 cog-0.12.1.tar.xz +sha1 3b9f67bc23cd9e3db2221366d6cde4ca0b06b811 cog-0.12.1.tar.xz +sha256 23caaafa2ef5c2f6a97d467fcce908ea71087ad03b72deb9280225c0dd561c91 cog-0.12.1.tar.xz # Hashes for license files: sha256 e6c42d93c68b292bcccf6d2ec3e13da85df90b718ba27c2c2a01053a9d009252 COPYING diff --git a/package/cog/cog.mk b/package/cog/cog.mk index 606374d9c3..2f6ef402fb 100644 --- a/package/cog/cog.mk +++ b/package/cog/cog.mk @@ -4,7 +4,7 @@ # ################################################################################ -COG_VERSION = 0.12.0 +COG_VERSION = 0.12.1 COG_SITE = https://wpewebkit.org/releases COG_SOURCE = cog-$(COG_VERSION).tar.xz COG_INSTALL_STAGING = YES -- 2.35.1 From aperez at igalia.com Thu Feb 24 23:26:44 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Fri, 25 Feb 2022 00:26:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/cog: bump to version 0.12.1 In-Reply-To: <20220224232159.1103756-1-aperez@igalia.com> References: <20220224232159.1103756-1-aperez@igalia.com> Message-ID: <20220225002644.GB1672112@momiji> Hi, On Fri, 25 Feb 2022 01:21:59 +0200 Adrian Perez de Castro wrote: > This is a minor release which fixes an installation path and a crash > with certain Wayland compositors. Release notes can be found at: > > https://wpewebkit.org/release/cog-0.12.1.html > > Signed-off-by: Adrian Perez de Castro > --- > package/cog/cog.hash | 8 ++++---- > package/cog/cog.mk | 2 +- > 2 files changed, 5 insertions(+), 5 deletions(-) JFTR, this release has only a couple of fixes and that's the reason I didn't set the subject prefix to "PATCH/next": I think it's worth including in the next stable version even if we might be a bit late in the development cycle (I am well aware there are already release candidates!) If others think it's better to merge this in "next", that'll be okay, but then at least we would want to include a workaround for the plug-in installation path (should be a one-line patch, if we go end up going this way). 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 geomatsi at gmail.com Fri Feb 25 07:26:16 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Fri, 25 Feb 2022 10:26:16 +0300 Subject: [Buildroot] [PATCH v2 0/6] orangepi/linksprite: convert more allwinner boards to extlinux Message-ID: <20220225072622.3584480-1-geomatsi@gmail.com> Hi all, Recently extlinux infrastructure has been added for orangepi boards by Sergey Kuzminov: see commit c0312f71cc89 ("configs/orangepi_zero_defconfig: switch to extlinux"). This patch series converts to extlinux some of the boards that I have at my disposal: - orangepi-zero-plus2 - orangepi-pc-plus - orangepi-one - linksprite-pcduino All these changes have been build- and boot- tested. Also I added orangepi-zero-plus2 to my list in DEVELOPERS file to keep an eye on its build failures. Regards, Sergey v1 -> v2 - add linksprite-pcduino changes - update commit messages according to Giulio Benetti comments Sergey Matyukevich (6): board/orangepi/orangepi-zero-plus2: switch to extlinux board/orangepi/orangepi-pc-plus: switch to extlinux board/orangepi/orangepi-one: switch to extlinux board/linksprite/pcduino: switch to extlinux configs/linksprite_pcduino_defconfig: update Linux/U-Boot versions DEVELOPERS: add Sergey Matyukevich for orangepi-zero-plus2 DEVELOPERS | 2 + board/linksprite/pcduino/boot.cmd | 8 ---- board/linksprite/pcduino/genimage.cfg | 43 ------------------- board/linksprite/pcduino/post-build.sh | 11 ----- board/linksprite/pcduino/post-image.sh | 16 ------- board/orangepi/orangepi-one/boot.cmd | 8 ---- board/orangepi/orangepi-one/genimage.cfg | 37 ---------------- board/orangepi/orangepi-pc-plus/boot.cmd | 8 ---- board/orangepi/orangepi-pc-plus/genimage.cfg | 43 ------------------- board/orangepi/orangepi-zero-plus2/boot.cmd | 6 --- .../orangepi/orangepi-zero-plus2/genimage.cfg | 41 ------------------ configs/linksprite_pcduino_defconfig | 18 ++++---- configs/orangepi_one_defconfig | 9 ++-- configs/orangepi_pc_plus_defconfig | 9 ++-- configs/orangepi_zero_plus2_defconfig | 14 +++--- 15 files changed, 24 insertions(+), 249 deletions(-) delete mode 100644 board/linksprite/pcduino/boot.cmd delete mode 100644 board/linksprite/pcduino/genimage.cfg delete mode 100755 board/linksprite/pcduino/post-build.sh delete mode 100755 board/linksprite/pcduino/post-image.sh delete mode 100644 board/orangepi/orangepi-one/boot.cmd delete mode 100644 board/orangepi/orangepi-one/genimage.cfg delete mode 100644 board/orangepi/orangepi-pc-plus/boot.cmd delete mode 100644 board/orangepi/orangepi-pc-plus/genimage.cfg delete mode 100644 board/orangepi/orangepi-zero-plus2/boot.cmd delete mode 100644 board/orangepi/orangepi-zero-plus2/genimage.cfg -- 2.35.1 From geomatsi at gmail.com Fri Feb 25 07:26:17 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Fri, 25 Feb 2022 10:26:17 +0300 Subject: [Buildroot] [PATCH v2 1/6] board/orangepi/orangepi-zero-plus2: switch to extlinux In-Reply-To: <20220225072622.3584480-1-geomatsi@gmail.com> References: <20220225072622.3584480-1-geomatsi@gmail.com> Message-ID: <20220225072622.3584480-2-geomatsi@gmail.com> Switch to extlinux instead of U-Boot boot script. Drop custom boot script and genimage config. Instead use common orangepi files from board/orangepi/common. To help extlinux to find DTB without U-Boot environment changes, do not strip arm64 board specific directory from DTB name when installing it in /boot directory. For this purpose use BR2_KERNEL_DTB_KEEP_DIRNAME config option. Finally, tidy up configuration file adding section names. Signed-off-by: Sergey Matyukevich --- board/orangepi/orangepi-zero-plus2/boot.cmd | 6 --- .../orangepi/orangepi-zero-plus2/genimage.cfg | 41 ------------------- configs/orangepi_zero_plus2_defconfig | 14 ++++--- 3 files changed, 8 insertions(+), 53 deletions(-) delete mode 100644 board/orangepi/orangepi-zero-plus2/boot.cmd delete mode 100644 board/orangepi/orangepi-zero-plus2/genimage.cfg diff --git a/board/orangepi/orangepi-zero-plus2/boot.cmd b/board/orangepi/orangepi-zero-plus2/boot.cmd deleted file mode 100644 index aa5162004b..0000000000 --- a/board/orangepi/orangepi-zero-plus2/boot.cmd +++ /dev/null @@ -1,6 +0,0 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=PARTLABEL=rootfs rootwait - -fatload mmc 0 $kernel_addr_r Image -fatload mmc 0 $fdt_addr_r sun50i-h5-orangepi-zero-plus2.dtb - -booti $kernel_addr_r - $fdt_addr_r diff --git a/board/orangepi/orangepi-zero-plus2/genimage.cfg b/board/orangepi/orangepi-zero-plus2/genimage.cfg deleted file mode 100644 index 5a7ee7707a..0000000000 --- a/board/orangepi/orangepi-zero-plus2/genimage.cfg +++ /dev/null @@ -1,41 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "sun50i-h5-orangepi-zero-plus2.dtb", - "boot.scr" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - # for root=PARTLABEL support - partition-table-type = "gpt" - # default GPT location conflicts with bootloaders, move it after - gpt-location = 1M - } - - partition spl { - in-partition-table = "no" - image = "u-boot-sunxi-with-spl.bin" - offset = 8K - size = 1016K # 1MB - 8KB - } - - partition boot { - partition-type-uuid = "F" - bootable = "true" - image = "boot.vfat" - } - - # 'rootfs' will be used as the partition label, used - # with root=PARTLABEL=rootfs kernel command line - partition rootfs { - partition-type-uuid = "L" - image = "rootfs.ext4" - size = 256M - } -} diff --git a/configs/orangepi_zero_plus2_defconfig b/configs/orangepi_zero_plus2_defconfig index 9d88b37ac9..ef171c3ad3 100644 --- a/configs/orangepi_zero_plus2_defconfig +++ b/configs/orangepi_zero_plus2_defconfig @@ -27,9 +27,6 @@ BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null" -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-plus2/boot.cmd" # Kernel BR2_LINUX_KERNEL=y @@ -40,6 +37,8 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-zero-plus2" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero-plus2/linux-extras.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y # wireless firmware BR2_PACKAGE_LINUX_FIRMWARE=y @@ -58,8 +57,11 @@ 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 + +# host tools BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y + +# image scripts +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-plus2/genimage.cfg" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" -- 2.35.1 From geomatsi at gmail.com Fri Feb 25 07:26:18 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Fri, 25 Feb 2022 10:26:18 +0300 Subject: [Buildroot] [PATCH v2 2/6] board/orangepi/orangepi-pc-plus: switch to extlinux In-Reply-To: <20220225072622.3584480-1-geomatsi@gmail.com> References: <20220225072622.3584480-1-geomatsi@gmail.com> Message-ID: <20220225072622.3584480-3-geomatsi@gmail.com> Switch to extlinux instead of U-Boot boot script. Drop custom boot script and genimage config. Instead use common orangepi files from board/orangepi/common. Signed-off-by: Sergey Matyukevich --- board/orangepi/orangepi-pc-plus/boot.cmd | 8 ---- board/orangepi/orangepi-pc-plus/genimage.cfg | 43 -------------------- configs/orangepi_pc_plus_defconfig | 9 ++-- 3 files changed, 3 insertions(+), 57 deletions(-) delete mode 100644 board/orangepi/orangepi-pc-plus/boot.cmd delete mode 100644 board/orangepi/orangepi-pc-plus/genimage.cfg diff --git a/board/orangepi/orangepi-pc-plus/boot.cmd b/board/orangepi/orangepi-pc-plus/boot.cmd deleted file mode 100644 index c91f77942f..0000000000 --- a/board/orangepi/orangepi-pc-plus/boot.cmd +++ /dev/null @@ -1,8 +0,0 @@ -setenv fdt_high ffffffff - -setenv bootargs console=ttyS0,115200 earlyprintk root=PARTLABEL=rootfs rootwait - -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun8i-h3-orangepi-pc-plus.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/orangepi/orangepi-pc-plus/genimage.cfg b/board/orangepi/orangepi-pc-plus/genimage.cfg deleted file mode 100644 index 3812d785d5..0000000000 --- a/board/orangepi/orangepi-pc-plus/genimage.cfg +++ /dev/null @@ -1,43 +0,0 @@ -# Minimal SD card image for the OrangePi PC Plus -# -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h3-orangepi-pc-plus.dtb", - "boot.scr" - } - } - - size = 10M -} - -image sdcard.img { - hdimage { - # for root=PARTLABEL support - partition-table-type = "gpt" - # default GPT location conflicts with bootloaders, move it after - gpt-location = 1M - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot-sunxi-with-spl.bin" - offset = 8K - size = 1016K # 1MB - 8KB - } - - partition boot { - partition-type-uuid = "F" - bootable = "true" - image = "boot.vfat" - } - - # 'rootfs' will be used as the partition label, used - # with root=PARTLABEL=rootfs kernel command line - partition rootfs { - partition-type-uuid = "L" - image = "rootfs.ext4" - size = 512M - } -} diff --git a/configs/orangepi_pc_plus_defconfig b/configs/orangepi_pc_plus_defconfig index c3ff8bc417..ba946e5285 100644 --- a/configs/orangepi_pc_plus_defconfig +++ b/configs/orangepi_pc_plus_defconfig @@ -14,6 +14,7 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-pc-plus" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-pc-plus/linux-extras.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set @@ -27,14 +28,10 @@ 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_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-pc-plus/boot.cmd" -BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y +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-pc-plus/genimage.cfg" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" # wireless driver and firmware BR2_PACKAGE_RTL8189FS=y -- 2.35.1 From geomatsi at gmail.com Fri Feb 25 07:26:19 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Fri, 25 Feb 2022 10:26:19 +0300 Subject: [Buildroot] [PATCH v2 3/6] board/orangepi/orangepi-one: switch to extlinux In-Reply-To: <20220225072622.3584480-1-geomatsi@gmail.com> References: <20220225072622.3584480-1-geomatsi@gmail.com> Message-ID: <20220225072622.3584480-4-geomatsi@gmail.com> Switch to extlinux instead of U-Boot boot script. Drop custom boot script and genimage config. Instead use common orangepi files from board/orangepi/common. Signed-off-by: Sergey Matyukevich --- board/orangepi/orangepi-one/boot.cmd | 8 ----- board/orangepi/orangepi-one/genimage.cfg | 37 ------------------------ configs/orangepi_one_defconfig | 9 ++---- 3 files changed, 3 insertions(+), 51 deletions(-) delete mode 100644 board/orangepi/orangepi-one/boot.cmd delete mode 100644 board/orangepi/orangepi-one/genimage.cfg diff --git a/board/orangepi/orangepi-one/boot.cmd b/board/orangepi/orangepi-one/boot.cmd deleted file mode 100644 index ab616e6ac9..0000000000 --- a/board/orangepi/orangepi-one/boot.cmd +++ /dev/null @@ -1,8 +0,0 @@ -setenv fdt_high ffffffff - -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun8i-h3-orangepi-one.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/orangepi/orangepi-one/genimage.cfg b/board/orangepi/orangepi-one/genimage.cfg deleted file mode 100644 index 2a14dcdec2..0000000000 --- a/board/orangepi/orangepi-one/genimage.cfg +++ /dev/null @@ -1,37 +0,0 @@ -# Minimal SD card image for the OrangePi PC -# -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h3-orangepi-one.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_one_defconfig b/configs/orangepi_one_defconfig index 1a2772a307..ba128424a0 100644 --- a/configs/orangepi_one_defconfig +++ b/configs/orangepi_one_defconfig @@ -12,6 +12,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-one" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set @@ -25,11 +26,7 @@ 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-one/boot.cmd" -BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y +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-one/genimage.cfg" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" -- 2.35.1 From geomatsi at gmail.com Fri Feb 25 07:26:20 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Fri, 25 Feb 2022 10:26:20 +0300 Subject: [Buildroot] [PATCH v2 4/6] board/linksprite/pcduino: switch to extlinux In-Reply-To: <20220225072622.3584480-1-geomatsi@gmail.com> References: <20220225072622.3584480-1-geomatsi@gmail.com> Message-ID: <20220225072622.3584480-5-geomatsi@gmail.com> Switch to extlinux instead of U-Boot boot script. Drop custom boot script and genimage config. Instead use common orangepi files from board/orangepi/common. Signed-off-by: Sergey Matyukevich --- board/linksprite/pcduino/boot.cmd | 8 ----- board/linksprite/pcduino/genimage.cfg | 43 -------------------------- board/linksprite/pcduino/post-build.sh | 11 ------- board/linksprite/pcduino/post-image.sh | 16 ---------- configs/linksprite_pcduino_defconfig | 9 +++--- 5 files changed, 4 insertions(+), 83 deletions(-) delete mode 100644 board/linksprite/pcduino/boot.cmd delete mode 100644 board/linksprite/pcduino/genimage.cfg delete mode 100755 board/linksprite/pcduino/post-build.sh delete mode 100755 board/linksprite/pcduino/post-image.sh diff --git a/board/linksprite/pcduino/boot.cmd b/board/linksprite/pcduino/boot.cmd deleted file mode 100644 index 0db8363599..0000000000 --- a/board/linksprite/pcduino/boot.cmd +++ /dev/null @@ -1,8 +0,0 @@ -setenv fdt_high ffffffff - -setenv bootargs console=ttyS0,115200 console=tty1 earlyprintk root=/dev/mmcblk0p2 rootwait panic=10 ${extra} - -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun4i-a10-pcduino.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/linksprite/pcduino/genimage.cfg b/board/linksprite/pcduino/genimage.cfg deleted file mode 100644 index db33322118..0000000000 --- a/board/linksprite/pcduino/genimage.cfg +++ /dev/null @@ -1,43 +0,0 @@ -# -# Minimal SD card image for the pcDuino -# - -image boot.vfat { - vfat { - files = { - "zImage", - "sun4i-a10-pcduino.dtb", - "boot.scr" - } - } - - size = 16M -} - -# -# Note: u-boot environment is stored between u-boot and boot partitions -# - -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" - offset = 1M - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/board/linksprite/pcduino/post-build.sh b/board/linksprite/pcduino/post-build.sh deleted file mode 100755 index e1e1877671..0000000000 --- a/board/linksprite/pcduino/post-build.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -# post-build.sh for pcDuino taken from OrangePi post-build.sh -# 2013, Carlo Caione - -BOARD_DIR="$(dirname $0)" -MKIMAGE=$HOST_DIR/bin/mkimage -BOOT_CMD=$BOARD_DIR/boot.cmd -BOOT_CMD_H=$BINARIES_DIR/boot.scr - -# U-Boot script -$MKIMAGE -C none -A arm -T script -d $BOOT_CMD $BOOT_CMD_H diff --git a/board/linksprite/pcduino/post-image.sh b/board/linksprite/pcduino/post-image.sh deleted file mode 100755 index c82b189f9c..0000000000 --- a/board/linksprite/pcduino/post-image.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -BOARD_DIR="$(dirname $0)" -GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" -GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" - -rm -rf "${GENIMAGE_TMP}" - -genimage \ - --rootpath "${TARGET_DIR}" \ - --tmppath "${GENIMAGE_TMP}" \ - --inputpath "${BINARIES_DIR}" \ - --outputpath "${BINARIES_DIR}" \ - --config "${GENIMAGE_CFG}" - -exit $? diff --git a/configs/linksprite_pcduino_defconfig b/configs/linksprite_pcduino_defconfig index b58f970493..05b25aede4 100644 --- a/configs/linksprite_pcduino_defconfig +++ b/configs/linksprite_pcduino_defconfig @@ -11,8 +11,9 @@ BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" # SD image scripts -BR2_ROOTFS_POST_BUILD_SCRIPT="board/linksprite/pcduino/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/linksprite/pcduino/post-image.sh" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" # For kernel modules autoloading BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y @@ -29,6 +30,7 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun4i-a10-pcduino" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/linksprite/pcduino/linux-extras.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y # Filesystem BR2_TARGET_ROOTFS_EXT2=y @@ -49,10 +51,7 @@ BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" # Host packages -BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y # Target packages: wireless support for pcduino-lite-wifi BR2_PACKAGE_IW=y -- 2.35.1 From geomatsi at gmail.com Fri Feb 25 07:26:21 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Fri, 25 Feb 2022 10:26:21 +0300 Subject: [Buildroot] [PATCH v2 5/6] configs/linksprite_pcduino_defconfig: update Linux/U-Boot versions In-Reply-To: <20220225072622.3584480-1-geomatsi@gmail.com> References: <20220225072622.3584480-1-geomatsi@gmail.com> Message-ID: <20220225072622.3584480-6-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. Drop redundant U-Boot options. Signed-off-by: Sergey Matyukevich --- configs/linksprite_pcduino_defconfig | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/configs/linksprite_pcduino_defconfig b/configs/linksprite_pcduino_defconfig index 05b25aede4..806c4f0697 100644 --- a/configs/linksprite_pcduino_defconfig +++ b/configs/linksprite_pcduino_defconfig @@ -19,12 +19,12 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y # Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.10" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16.1" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun4i-a10-pcduino" @@ -40,13 +40,12 @@ 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="2020.10" -BR2_TARGET_UBOOT_USE_DEFCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Linksprite_pcDuino" 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_FORMAT_BIN=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" -- 2.35.1 From geomatsi at gmail.com Fri Feb 25 07:26:22 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Fri, 25 Feb 2022 10:26:22 +0300 Subject: [Buildroot] [PATCH v2 6/6] DEVELOPERS: add Sergey Matyukevich for orangepi-zero-plus2 In-Reply-To: <20220225072622.3584480-1-geomatsi@gmail.com> References: <20220225072622.3584480-1-geomatsi@gmail.com> Message-ID: <20220225072622.3584480-7-geomatsi@gmail.com> Signed-off-by: Sergey Matyukevich --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index ac702d8d0f..f29e889c52 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2545,10 +2545,12 @@ F: board/linksprite/pcduino F: board/orangepi/orangepi-zero F: board/orangepi/orangepi-one F: board/orangepi/orangepi-pc-plus/ +F: board/orangepi/orangepi-zero-plus2/ F: configs/linksprite_pcduino_defconfig F: configs/orangepi_one_defconfig F: configs/orangepi_pc_plus_defconfig F: configs/orangepi_zero_defconfig +F: configs/orangepi_zero_plus2_defconfig F: package/armbian-firmware/ F: package/hostapd/ F: package/rtl8189fs/ -- 2.35.1 From peterlin at andestech.com Fri Feb 25 08:05:10 2022 From: peterlin at andestech.com (Yu Chien Peter Lin) Date: Fri, 25 Feb 2022 16:05:10 +0800 Subject: [Buildroot] [PATCH v4 1/3] board/andes: rearrange andes folder structure In-Reply-To: <111a4578-2489-09db-909c-774017800746@benettiengineering.com> References: <20220223071049.21153-1-peterlin@andestech.com> <84e159d2-0123-e5b1-c42e-99b70c99f43c@benettiengineering.com> <111a4578-2489-09db-909c-774017800746@benettiengineering.com> Message-ID: Hi Giulio, On Thu, Feb 24, 2022 at 04:12:10PM +0100, Giulio Benetti wrote: > Hi Peter, > > On 24/02/22 03:41, Yu Chien Peter Lin wrote: > > Hi Giulio, > > > > > > > > > > Changes v3 -> v4: > > > > > > > > - rename ae3xx folder to ae300 > > > > > > > > - rename andes_ae3xx_defconfig to andes_ae300_defconfig > > > > > > > > - update readme.txt and item in DEVELOPERS > > > > > > > > > > > > > > Some of these change ^^^ must have been moved to the single patch, like > > > > > > > DEVELOPERS is updated in patch 3/3. I've also forgotten to point you to add > > > > > > > a --cover-letter, so keep in mind both points for next time. > > > > > > > > > > > > > > I've built tested both defconfig successfully, so: > > > > > > > Reviewed-by: Giulio Benetti > > > > > > > Tested-by: Giulio Benetti > > > > > > > [Giulio: build tested only] > > > > > > > > > > > > > > And the other patches of this series is all reviewed, so to me it's ready to > > > > > > > be committed, but this will happen after Buildroot 2022.02 is released, > > > > > > > since between rc1 to the release Maintainers only accept fixes. Another > > > > > > > possibility is that they will commit these patches to next branch. > > > > > > > > > > > > > > Please remember to tag V3. > > > > Oh, I thought you were refering to format-patch with v3, sorry. > > I will mark the patch on patchwork to rejected state except the latest > > patch version. > > Ok, V3 it's still tagged as new in patchwork for the moment. Updated to rejected state. > > > > > > > Thank you for your effort! > > > > > > > > > > > > > > Best regards > > > > > > > -- > > > > > > > Giulio Benetti > > > > > > > Benetti Engineering sas > > > > > > > > > > Thanks for reviewing my patches and the guidance. > > > > > > > > You're welcome. > > > > > > > > > I will make a new patch for the Config.in, > > > > > > > > Which one? I only see: > > > > toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in > > > > > > > > Do you mean you will add an entry in DEVELOPERS for it? > > > > I found the modifications on these files in Git history, usually have > > its own patch. > > No, maybe you mean there is a cover-letter that summarize the changes of all > patches in patchset and then in every patch you list the changes of on that > patch. > > > So in PATCH v5, I will split [PATCH 1/3] to [PATCH 1/4] > > and [PATCH 2/4] for > > toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in > > other patches remain the same, > > No, wait. I've meant you only need to split: > --- > Changes v1->v2: > * > * > [..] > --- > for every patch. So, don't summarize all the changes on patch [1/3], because > those changes are related to different patches. For example in V1->V2 you > state: > - update DEVELOPERS > but you do it in patch [3/3], so you only have to move the changes into the > right patch, that's all. > > > and attach [PATCH 0/4] cover letter. > > And yes please, add a cover letter that briefly explain what patchset does > and that's it. > > > > > > The last question, is it tag V5 for the next submission? > > > > > > > > It depends if you need to modify these patches. Or if you add a new patch > > > > that depends on these patches, then yes, please send a V5 with all changes > > > > moved to the different patches, including adding the patch if this is your > > > > goal. > > > > > > > > Best regards > > > > -- > > > > Giulio Benetti > > > > Benetti Engineering sas > > > > Is there any the new comment? > > Again, thanks for your help. :) > > For the moment I don't see anything wrong except the changelog. > > Thank you! > > Best regards > -- > Giulio Benetti > Benetti Engineering sas Thanks for clarification. Best regards, Yu Chien Peter Lin From romain.naour at gmail.com Fri Feb 25 08:30:37 2022 From: romain.naour at gmail.com (Romain Naour) Date: Fri, 25 Feb 2022 09:30:37 +0100 Subject: [Buildroot] [PATCH] package/rust: set musl-root for musl toolchains Message-ID: <20220225083037.229109-1-romain.naour@gmail.com> Without musl-root in config.toml the build stop with the following error: thread 'main' panicked at 'couldn't find libc.a in musl libdir: output/host/arm-buildroot-linux-musleabihf/sysroot/lib/lib', src/bootstrap/sanity.rs:192:25 musl-root is needed to provide the path to libc.a and libunwind.a because rust link them statically into the standard library and liblibc [1]. For other libc, musl-root is not used and ignored [2]. [1] https://github.com/rust-lang/rust/commit/cd980b3bee5bd48e8a6cd4c0d7c8e0fb0fdb64dd [2] https://github.com/rust-lang/rust/blob/1.58.1/src/bootstrap/sanity.rs#L181 Signed-off-by: Romain Naour --- Runtime tested with TestRust with ripgrep and bat packages. --- package/rust/rust.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/rust/rust.mk b/package/rust/rust.mk index 4a6b04dc8c..c2e0a361dd 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -56,6 +56,7 @@ define HOST_RUST_CONFIGURE_CMDS echo 'sysconfdir = "$(HOST_DIR)/etc"'; \ echo '[rust]'; \ echo 'channel = "stable"'; \ + echo 'musl-root = "$(STAGING_DIR)"' ; \ echo '[target.$(RUSTC_TARGET_NAME)]'; \ echo 'cc = "$(TARGET_CROSS)gcc"'; \ echo '[llvm]'; \ -- 2.35.1 From peterlin at andestech.com Fri Feb 25 09:25:06 2022 From: peterlin at andestech.com (Yu Chien Peter Lin) Date: Fri, 25 Feb 2022 17:25:06 +0800 Subject: [Buildroot] [PATCH v5 0/3] Add andes ae350 support Message-ID: <20220225092509.16478-1-peterlin@andestech.com> This patchset - renames andes/ae3xx and its defconfig to ae300 for nds32 architecture. - adds ae350 platform support and andes_ae350_45_defconfig. Yu Chien Peter Lin (3): board/andes: rearrange andes folder structure board/andes/ae350: add support for Andes AE350 DEVELOPERS: add Yu-Chien Lin to board/andes DEVELOPERS | 5 +- .../ae3xx.fragment => ae300/ae300.fragment} | 0 ...0001-nds32-Fix-boot-messages-garbled.patch | 0 ...ve-redundant-YYLOC-global-declaratio.patch | 0 board/andes/{ => ae300}/readme.txt | 10 +- board/andes/ae350/ae350.dts | 274 ++++++++++++++++++ board/andes/ae350/genimage_sdcard.cfg | 26 ++ ...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/post-build.sh | 3 + board/andes/ae350/readme.txt | 65 +++++ .../boot/extlinux/extlinux.conf | 4 + board/andes/ae350/uboot.config.fragment | 5 + ..._ae3xx_defconfig => andes_ae300_defconfig} | 4 +- configs/andes_ae350_45_defconfig | 43 +++ .../toolchain-external-andes-nds32/Config.in | 2 +- 20 files changed, 590 insertions(+), 10 deletions(-) rename board/andes/{ae3xx/ae3xx.fragment => ae300/ae300.fragment} (100%) rename board/andes/{ => ae300}/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch (100%) rename board/andes/{ => ae300}/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch (100%) rename board/andes/{ => ae300}/readme.txt (71%) create mode 100755 board/andes/ae350/ae350.dts 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 100755 board/andes/ae350/post-build.sh create mode 100644 board/andes/ae350/readme.txt create mode 100644 board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf create mode 100644 board/andes/ae350/uboot.config.fragment rename configs/{andes_ae3xx_defconfig => andes_ae300_defconfig} (69%) create mode 100644 configs/andes_ae350_45_defconfig -- 2.17.1 From peterlin at andestech.com Fri Feb 25 09:25:07 2022 From: peterlin at andestech.com (Yu Chien Peter Lin) Date: Fri, 25 Feb 2022 17:25:07 +0800 Subject: [Buildroot] [PATCH v5 1/3] board/andes: rearrange andes folder structure In-Reply-To: <20220225092509.16478-1-peterlin@andestech.com> References: <20220225092509.16478-1-peterlin@andestech.com> Message-ID: <20220225092509.16478-2-peterlin@andestech.com> In order to add ae350 RISC-V platform, rename ae3xx to ae300 for NDS32 architecture. AE300 (NDS32): - http://www.andestech.com/en/products-solutions/andeshape-platforms/ae300/ AE350 (RISC-V): - http://www.andestech.com/en/products-solutions/andeshape-platforms/ae350-axi-based-platform-pre-integrated-with-n25f-nx25f-a25-ax25/ Signed-off-by: Yu Chien Peter Lin Signed-off-by: Alan Kao Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti --- Changes v3 -> v4: - rename ae3xx folder to ae300 - rename andes_ae3xx_defconfig to andes_ae300_defconfig - update readme.txt - update help message in toolchain-external-andes-nds32/Config.in --- .../{ae3xx/ae3xx.fragment => ae300/ae300.fragment} | 0 .../linux/0001-nds32-Fix-boot-messages-garbled.patch | 0 ...-dtc-Remove-redundant-YYLOC-global-declaratio.patch | 0 board/andes/{ => ae300}/readme.txt | 10 +++++----- .../{andes_ae3xx_defconfig => andes_ae300_defconfig} | 4 ++-- .../toolchain-external-andes-nds32/Config.in | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) rename board/andes/{ae3xx/ae3xx.fragment => ae300/ae300.fragment} (100%) rename board/andes/{ => ae300}/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch (100%) rename board/andes/{ => ae300}/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch (100%) rename board/andes/{ => ae300}/readme.txt (71%) rename configs/{andes_ae3xx_defconfig => andes_ae300_defconfig} (69%) diff --git a/board/andes/ae3xx/ae3xx.fragment b/board/andes/ae300/ae300.fragment similarity index 100% rename from board/andes/ae3xx/ae3xx.fragment rename to board/andes/ae300/ae300.fragment diff --git a/board/andes/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch b/board/andes/ae300/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/ae300/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch diff --git a/board/andes/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch b/board/andes/ae300/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch similarity index 100% rename from board/andes/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch rename to board/andes/ae300/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch diff --git a/board/andes/readme.txt b/board/andes/ae300/readme.txt similarity index 71% rename from board/andes/readme.txt rename to board/andes/ae300/readme.txt index 0f95c65549..51c05c9235 100644 --- a/board/andes/readme.txt +++ b/board/andes/ae300/readme.txt @@ -1,10 +1,10 @@ Intro ===== -Andestech(nds32) AE3XX Platform +Andestech(nds32) AE300 Platform -The AE3XX prototype demonstrates the AE3XX example platform on the FPGA. -It is composed of one Andestech(nds32) processor and AE3XX. +The AE300 prototype demonstrates the AE300 example platform on the FPGA. +It is composed of one Andestech(nds32) processor and AE300. How to build it =============== @@ -12,10 +12,10 @@ How to build it Configure Buildroot ------------------- -The andes_ae3xx_defconfig configuration is a sample configuration with +The andes_ae300_defconfig configuration is a sample configuration with all that is required to bring the FPGA Development Board: - $ make andes_ae3xx_defconfig + $ make andes_ae300_defconfig Build everything ---------------- diff --git a/configs/andes_ae3xx_defconfig b/configs/andes_ae300_defconfig similarity index 69% rename from configs/andes_ae3xx_defconfig rename to configs/andes_ae300_defconfig index 52634caa50..ffcb4d7d38 100644 --- a/configs/andes_ae3xx_defconfig +++ b/configs/andes_ae300_defconfig @@ -1,10 +1,10 @@ BR2_nds32=y -BR2_GLOBAL_PATCH_DIR="board/andes/patches/" +BR2_GLOBAL_PATCH_DIR="board/andes/ae300/patches" BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_ANDES_NDS32=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/andes/ae3xx/ae3xx.fragment" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/andes/ae300/ae300.fragment" BR2_TARGET_ROOTFS_INITRAMFS=y diff --git a/toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in b/toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in index 9c937b8c44..ecd50cc805 100644 --- a/toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in +++ b/toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in @@ -12,4 +12,4 @@ config BR2_TOOLCHAIN_EXTERNAL_ANDES_NDS32 help nds32 toolchain for the nds32 architecture. It uses GCC 8.2.1, GDB 8.1.1, glibc 2.28, Binutils 2.30. It generates - code that runs on ae3xx platform + code that runs on ae300 platform -- 2.17.1 From peterlin at andestech.com Fri Feb 25 09:25:08 2022 From: peterlin at andestech.com (Yu Chien Peter Lin) Date: Fri, 25 Feb 2022 17:25:08 +0800 Subject: [Buildroot] [PATCH v5 2/3] board/andes/ae350: add support for Andes AE350 In-Reply-To: <20220225092509.16478-1-peterlin@andestech.com> References: <20220225092509.16478-1-peterlin@andestech.com> Message-ID: <20220225092509.16478-3-peterlin@andestech.com> This patch provides defconfig and basic support for Andes 45 series RISC-V architecture on AE350 platform. http://www.andestech.com/en/products-solutions/andeshape-platforms/ae350-axi-based-platform-pre-integrated-with-n25f-nx25f-a25-ax25/ Signed-off-by: Yu Chien Peter Lin Signed-off-by: Alan Kao Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti --- Changes v1 -> v2: - move linux source code and its patches to AndesTech Github repo - rename ae350_andestar45_defconfig to andes_ae350_45_defconfig - change C library to uClibc - remove OpenSSL package - remove rootfs.cpio and rootfs.tar Changes v2 -> v3: - specifiy branch to download from AndesTech linux repo - change boot.cmd to extlinux.conf - add post-build.sh for extlinux.conf to retrieve Image and DTB - fix format and update genimage_sdcard.cfg - update ae350/readme.txt - add packages (python3, pylibfdt and openssl) for u-boot binman --- board/andes/ae350/ae350.dts | 274 ++++++++++++++++++ board/andes/ae350/genimage_sdcard.cfg | 26 ++ ...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/post-build.sh | 3 + board/andes/ae350/readme.txt | 65 +++++ .../boot/extlinux/extlinux.conf | 4 + board/andes/ae350/uboot.config.fragment | 5 + configs/andes_ae350_45_defconfig | 43 +++ 13 files changed, 579 insertions(+) create mode 100755 board/andes/ae350/ae350.dts 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 100755 board/andes/ae350/post-build.sh create mode 100644 board/andes/ae350/readme.txt create mode 100644 board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf 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/genimage_sdcard.cfg b/board/andes/ae350/genimage_sdcard.cfg new file mode 100644 index 0000000000..b8b9fe6a62 --- /dev/null +++ b/board/andes/ae350/genimage_sdcard.cfg @@ -0,0 +1,26 @@ +image boot.vfat { + vfat { + files = { + "u-boot-spl.bin", + "u-boot.itb", + "ae350.dtb", + } + } + size = 2M +} + +image sdcard.img { + hdimage { + } + + partition boot { + partition-type = 0xC + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + bootable = true + 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/post-build.sh b/board/andes/ae350/post-build.sh new file mode 100755 index 0000000000..0e6ce228f4 --- /dev/null +++ b/board/andes/ae350/post-build.sh @@ -0,0 +1,3 @@ +#!/bin/sh +cp $BINARIES_DIR/Image $TARGET_DIR/boot +cp $BINARIES_DIR/ae350.dtb $TARGET_DIR/boot diff --git a/board/andes/ae350/readme.txt b/board/andes/ae350/readme.txt new file mode 100644 index 0000000000..6825468d50 --- /dev/null +++ b/board/andes/ae350/readme.txt @@ -0,0 +1,65 @@ +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/ + |-- ae350.dtb + |-- boot.vfat + |-- fw_dynamic.bin + |-- fw_dynamic.elf + |-- fw_jump.bin + |-- fw_jump.elf + |-- Image + |-- 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 + $ sudo sync + +Your SD card partition should be: + + Disk /dev/sdb: 14.48 GiB, 15552479232 bytes, 30375936 sectors + Disk model: Multi-Card + Units: sectors of 1 * 512 = 512 bytes + Sector size (logical/physical): 512 bytes / 512 bytes + I/O size (minimum/optimal): 512 bytes / 512 bytes + Disklabel type: dos + Disk identifier: 0x00000000 + + Device Boot Start End Sectors Size Id Type + /dev/sdb1 1 4096 4096 2M c W95 FAT32 (LBA) + /dev/sdb2 * 4097 126976 122880 60M 83 Linux + +Insert SD card and reset the board, it should boot Linux from mmc. diff --git a/board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf b/board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf new file mode 100644 index 0000000000..549eb93abc --- /dev/null +++ b/board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +label linux + kernel /boot/Image + fdt /boot/ae350.dtb + append earlycon=sbi root=/dev/mmcblk0p2 rootwait 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..a35ddd06ba --- /dev/null +++ b/configs/andes_ae350_45_defconfig @@ -0,0 +1,43 @@ +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_OVERLAY="board/andes/ae350/rootfs_overlay" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/andes/ae350/post-build.sh" +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_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/andestech/linux.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.10.84-ae350_45" +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_PYTHON3=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y +# BR2_TARGET_UBOOT_FORMAT_BIN is not set +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.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 -- 2.17.1 From peterlin at andestech.com Fri Feb 25 09:25:09 2022 From: peterlin at andestech.com (Yu Chien Peter Lin) Date: Fri, 25 Feb 2022 17:25:09 +0800 Subject: [Buildroot] [PATCH v5 3/3] DEVELOPERS: add Yu-Chien Lin to board/andes In-Reply-To: <20220225092509.16478-1-peterlin@andestech.com> References: <20220225092509.16478-1-peterlin@andestech.com> Message-ID: <20220225092509.16478-4-peterlin@andestech.com> Nylon is no longer at Andes. Signed-off-by: Yu Chien Peter Lin Signed-off-by: Alan Kao Reviewed-by: Giulio Benetti --- Changes v1 -> v2: - update owner to Yu-Chien Lin Changes v2 -> v3: - reorder andes entries Changes v3 -> v4: - reorder andes entries --- DEVELOPERS | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index ac702d8d0f..cd64159867 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2146,10 +2146,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_ae300_defconfig +F: configs/andes_ae350_45_defconfig F: toolchain/toolchain-external/toolchain-external-andes-nds32/ N: Olaf Rempel -- 2.17.1 From thomas.petazzoni at bootlin.com Fri Feb 25 09:29:29 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 25 Feb 2022 09:29:29 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-02-24 Message-ID: <20220225092934.348C660B57@smtp3.osuosl.org> Hello, Autobuild statistics for 2022-02-24 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 44 | 2 | 1 | 47 | 2021.11.x | 11 | 1 | 0 | 12 | master | 40 | 29 | 1 | 70 | Classification of failures by reason for master ----------------------------------------------- host-libselinux-3.3 | 10 frr-8.1 | 4 bluez5_utils-5.63 | 2 bpftool-v6.7.0 | 2 unknown | 2 bat-0.19.0 | 1 frr | 1 gocryptfs-2.2.1 | 1 pulseview-0.4.2 | 1 python-greenlet-1.1.2 | 1 safeclib-3.7.1 | 1 sconeserver-6b932d7d8dbb700... | 1 sg3_utils-1.47 | 1 tovid-87c676f4aadb7303d2cd9... | 1 wpa_supplicant-2.10 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | bat-0.19.0 | NOK | http://autobuild.buildroot.net/results/89a5355369b2dbcecca5542e3bea7f22d6844d35 | i586 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/8075d14919639b89337d04ee5a324b4c69d2e079 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/83eaeb3863040645409f5787fdbdde79385c5257 | arm | bpftool-v6.7.0 | NOK | http://autobuild.buildroot.net/results/aae772f1cfb16516a57f310c4f022e80a2a8d65e | arm | bpftool-v6.7.0 | NOK | http://autobuild.buildroot.net/results/4ce51ced26783c52766a002ac75b42262eace45e | arc | frr | TIM | http://autobuild.buildroot.net/results/6fb124cad6c753170b6e8a3d495158f1ce864e6e | nios2 | frr-8.1 | NOK | http://autobuild.buildroot.net/results/6c0ff16d28db81384efdd6cde90346fe5511bdb9 | riscv64 | frr-8.1 | NOK | http://autobuild.buildroot.net/results/42856dfc5119f00e04872eb8893a96431c300ced | powerpc64 | frr-8.1 | NOK | http://autobuild.buildroot.net/results/8c5ef3b81e313dcfa82750ae9e9d6eae8e8755aa | nds32le | frr-8.1 | NOK | http://autobuild.buildroot.net/results/daf373b337b64e72c2b94d3f4a5059d07ac7a5ac | i586 | gocryptfs-2.2.1 | NOK | http://autobuild.buildroot.net/results/310216a1b034138796c488565ca754247f04465f | mipsel | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/0d18af8c87dd6f1b38cdaa4e9df934d72c257b15 | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/6c06ffef722b526cc80fdda4b5e3ef360d4fe063 | m68k | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/79e12d8bacfcae8e371b966d33bd86549566f82c | xtensa | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/be35833e5be937803b52c3114c7ffa30651b99ba | arc | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/641837bfd850c703f560adb30db6dd29cb55667f | riscv64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/5ce41a0aded979623b15ecdde86a5326464039a3 | microblazeel | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/dc6362d21593a01baca3d3a0cead41bb260bb28e | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/0162060ee082f7a17c98db61b0cbc7d870151bf0 | riscv32 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/974a739b1cd40e867d9d2598d8037d43127f7fe1 | powerpc | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/8a196826b35913d1fb005dfc5191a83c38cac286 | x86_64 | pulseview-0.4.2 | NOK | http://autobuild.buildroot.net/results/a439a56a1e78cd6eef3f18ac277e4125ebd0ce05 | x86_64 | python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/151e338b009b3b560a259449f962b00df075e003 | sparc | safeclib-3.7.1 | NOK | http://autobuild.buildroot.net/results/6c2685460fdc311f5a65476d7e4e5e57a9044c0c | arm | sconeserver-6b932d7d8dbb700... | NOK | http://autobuild.buildroot.net/results/e4f0cfac09027dd59adf133d61d9952ebe266373 | m68k | sg3_utils-1.47 | NOK | http://autobuild.buildroot.net/results/4d5a001e6eaf099c55e3926c62bc790c6af9c419 | mips64el | tovid-87c676f4aadb7303d2cd9... | NOK | http://autobuild.buildroot.net/results/c5e4a7e2e290ad0d3dd9153398c30f3298fcbcc5 | xtensa | unknown | NOK | http://autobuild.buildroot.net/results/96d4d9c9047c36ada6b335848e931143c5939c6b | mips64el | unknown | NOK | http://autobuild.buildroot.net/results/938519241d02227df4989a159fd467fb0e3794b6 | arm | wpa_supplicant-2.10 | NOK | http://autobuild.buildroot.net/results/12b757e64fea5bfb0859fcbb35110a6225364c78 | Classification of failures by reason for 2021.02.x -------------------------------------------------- gobject-introspection-1.64.1 | 1 host-sentry-cli-1.57.0 | 1 python-lxml | 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/ee65c707ad9e0f5a4c77f364491ddab3ad81ce91 | ORPH aarch64 | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/ed2482fb399f37066781d97306650fee894ec5f6 | m68k | python-lxml | TIM | http://autobuild.buildroot.net/results/f3790e8b9d37bb913df5d3dbf1b1d268541096bd | 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? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- powerpc64 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/b852b28a56209dd81a0385e83af1ac5500a8cd6d | -- http://autobuild.buildroot.net From kamel.bouhara at bootlin.com Fri Feb 25 11:33:56 2022 From: kamel.bouhara at bootlin.com (Kamel Bouhara) Date: Fri, 25 Feb 2022 12:33:56 +0100 Subject: [Buildroot] [PATCH 0/4] Add odb host variant and fix gcc-11 build Message-ID: <20220225113400.802049-1-kamel.bouhara@bootlin.com> Hello, Here is a short patch series that fix odb build issue with gcc-11 and add a host variant of the libodb package required by the host-odb compiler. The host-libodb-boost variant is only required when boost package is enabled. Kamel Bouhara (1): package/libodb-boost: add host variant Thomas Petazzoni (3): package/odb: backport more upstream commits to fix build with gcc 11.x package/odb: add dependency on host-libodb package/libodb: add host variant package/libodb-boost/libodb-boost.mk | 5 +- package/libodb/libodb.mk | 2 + .../0012-Adjust-to-changes-in-GCC-11.patch | 50 ++++++++++++++ ...kup-ambiguity-causing-error-with-GCC.patch | 68 +++++++++++++++++++ package/odb/odb.mk | 8 ++- 5 files changed, 131 insertions(+), 2 deletions(-) create mode 100644 package/odb/0012-Adjust-to-changes-in-GCC-11.patch create mode 100644 package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch -- 2.25.1 From kamel.bouhara at bootlin.com Fri Feb 25 11:33:57 2022 From: kamel.bouhara at bootlin.com (Kamel Bouhara) Date: Fri, 25 Feb 2022 12:33:57 +0100 Subject: [Buildroot] [PATCH 1/4] package/odb: backport more upstream commits to fix build with gcc 11.x In-Reply-To: <20220225113400.802049-1-kamel.bouhara@bootlin.com> References: <20220225113400.802049-1-kamel.bouhara@bootlin.com> Message-ID: <20220225113400.802049-2-kamel.bouhara@bootlin.com> From: Thomas Petazzoni Commit ac9855e761443dee4f9d461b83e12443d37e8678 ("package/odb: fix build with gcc 11") already fixed some gcc 11.x issues, but not all of them. This commit backports two upstream patches fixing the remaining issues, ensuring host-odb can be built on a gcc 11.x machine. Fixes: http://autobuild.buildroot.net/results/d37c4271e66d923f7af6a4e3dbad603fcd1c8119/ Signed-off-by: Thomas Petazzoni --- Note: the above autobuilder issue has stopped appearing after September 29, 2021, which initially sounded odd. However, on October 3, we started rejecting build results from Xogium's autobuilder (for other reasons), and all those issues were coming from Xogium's autobuilder. And this is pretty logical: Xogium's autobuilder was known to be running a very recent Arch Linux, and therefore was the only autobuild machine running gcc 11.x as the host compiler. --- .../0012-Adjust-to-changes-in-GCC-11.patch | 50 ++++++++++++++ ...kup-ambiguity-causing-error-with-GCC.patch | 68 +++++++++++++++++++ 2 files changed, 118 insertions(+) create mode 100644 package/odb/0012-Adjust-to-changes-in-GCC-11.patch create mode 100644 package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch diff --git a/package/odb/0012-Adjust-to-changes-in-GCC-11.patch b/package/odb/0012-Adjust-to-changes-in-GCC-11.patch new file mode 100644 index 0000000000..2959a71dea --- /dev/null +++ b/package/odb/0012-Adjust-to-changes-in-GCC-11.patch @@ -0,0 +1,50 @@ +From 5a5656920c6b49902ae0da6a0da84efe6e5a66f0 Mon Sep 17 00:00:00 2001 +From: Boris Kolpackov +Date: Wed, 31 Mar 2021 10:45:21 +0200 +Subject: [PATCH] Adjust to changes in GCC 11 + +[Upstream: 61d80f051293a7449a09081f60f48b8377bfbbad] +Signed-off-by: Thomas Petazzoni +--- + odb/gcc.hxx | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +diff --git a/odb/gcc.hxx b/odb/gcc.hxx +index fb6a1bf..d8ad590 100644 +--- a/odb/gcc.hxx ++++ b/odb/gcc.hxx +@@ -164,6 +164,7 @@ gcc_tree_code_name (gcc_tree_code_type tc) {return tree_code_name[tc];} + // In GCC 9: + // + // INCLUDED_FROM Became linemap_included_from_linemap(). ++// + // LAST_SOURCE_LINE Was removed apparently as no longer used. Studying + // the line-map.h diff from 8.3 suggests that the old + // implementation should still work. +@@ -193,4 +194,23 @@ LAST_SOURCE_LINE (const line_map_ordinary* map) + + #endif + ++// In GCC 11: ++// ++// lookup_qualified_name() has a new interface. ++// ++// DECL_IS_BUILTIN became DECL_IS_UNDECLARED_BUILTIN. ++// ++#if BUILDING_GCC_MAJOR >= 11 ++ ++inline tree ++lookup_qualified_name (tree scope, tree name, bool type, bool complain) ++{ ++ return lookup_qualified_name ( ++ scope, name, (type ? LOOK_want::TYPE : LOOK_want::NORMAL), complain); ++} ++ ++#define DECL_IS_BUILTIN(decl) DECL_IS_UNDECLARED_BUILTIN(decl) ++ ++#endif ++ + #endif // ODB_GCC_HXX +-- +2.34.1 + diff --git a/package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch b/package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch new file mode 100644 index 0000000000..79c3d982fa --- /dev/null +++ b/package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch @@ -0,0 +1,68 @@ +From 60460df2a6d7b43a860a8f8b614c049ec0127ea8 Mon Sep 17 00:00:00 2001 +From: Boris Kolpackov +Date: Wed, 7 Jul 2021 09:26:57 +0200 +Subject: [PATCH] Resolve name lookup ambiguity causing error with GCC 11 + +[Upstream: 47035c0f72efd99a2210cd45db6e42423fb74533] +Signed-off-by: Thomas Petazzoni +--- + odb/relational/header.hxx | 2 ++ + odb/relational/source.hxx | 8 ++++++++ + 2 files changed, 10 insertions(+) + +diff --git a/odb/relational/header.hxx b/odb/relational/header.hxx +index 63dea09..d7f78fa 100644 +--- a/odb/relational/header.hxx ++++ b/odb/relational/header.hxx +@@ -50,6 +50,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual bool + pre (member_info& mi) + { +diff --git a/odb/relational/source.hxx b/odb/relational/source.hxx +index 716aa10..7da25fc 100644 +--- a/odb/relational/source.hxx ++++ b/odb/relational/source.hxx +@@ -1360,6 +1360,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual bool + pre (member_info& mi) + { +@@ -1744,6 +1746,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual bool + pre (member_info& mi) + { +@@ -2007,6 +2011,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual void + set_null (member_info&) = 0; + +@@ -2458,6 +2464,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual void + get_null (string const& var) const = 0; + +-- +2.34.1 + -- 2.25.1 From kamel.bouhara at bootlin.com Fri Feb 25 11:33:59 2022 From: kamel.bouhara at bootlin.com (Kamel Bouhara) Date: Fri, 25 Feb 2022 12:33:59 +0100 Subject: [Buildroot] [PATCH 3/4] package/libodb: add host variant In-Reply-To: <20220225113400.802049-1-kamel.bouhara@bootlin.com> References: <20220225113400.802049-1-kamel.bouhara@bootlin.com> Message-ID: <20220225113400.802049-4-kamel.bouhara@bootlin.com> From: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- package/libodb/libodb.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libodb/libodb.mk b/package/libodb/libodb.mk index 11ca9de866..b25e8ac501 100644 --- a/package/libodb/libodb.mk +++ b/package/libodb/libodb.mk @@ -12,5 +12,7 @@ LIBODB_INSTALL_STAGING = YES LIBODB_LICENSE = GPL-2.0 LIBODB_LICENSE_FILES = LICENSE LIBODB_CONF_ENV = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" +HOST_LIBODB_CONF_ENV = CXXFLAGS="$(HOST_CXXFLAGS) -std=c++11" $(eval $(autotools-package)) +$(eval $(host-autotools-package)) -- 2.25.1 From kamel.bouhara at bootlin.com Fri Feb 25 11:34:00 2022 From: kamel.bouhara at bootlin.com (Kamel Bouhara) Date: Fri, 25 Feb 2022 12:34:00 +0100 Subject: [Buildroot] [PATCH 4/4] package/libodb-boost: add host variant In-Reply-To: <20220225113400.802049-1-kamel.bouhara@bootlin.com> References: <20220225113400.802049-1-kamel.bouhara@bootlin.com> Message-ID: <20220225113400.802049-5-kamel.bouhara@bootlin.com> Add host variant of libodb-boost required by host-odb package. Signed-off-by: Kamel Bouhara --- package/libodb-boost/libodb-boost.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/libodb-boost/libodb-boost.mk b/package/libodb-boost/libodb-boost.mk index bac5f1e78f..7f2ad1fe72 100644 --- a/package/libodb-boost/libodb-boost.mk +++ b/package/libodb-boost/libodb-boost.mk @@ -11,7 +11,10 @@ LIBODB_BOOST_SITE = https://www.codesynthesis.com/download/odb/$(LIBODB_BOOST_VE LIBODB_BOOST_INSTALL_STAGING = YES LIBODB_BOOST_LICENSE = GPL-2.0 LIBODB_BOOST_LICENSE_FILES = LICENSE -LIBODB_BOOST_DEPENDENCIES = boost libodb +LIBODB_BOOST_DEPENDENCIES = boost libodb \ + host-boost \ + host-libodb LIBODB_BOOST_CONF_ENV = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" $(eval $(autotools-package)) +$(eval $(host-autotools-package)) -- 2.25.1 From kamel.bouhara at bootlin.com Fri Feb 25 11:33:58 2022 From: kamel.bouhara at bootlin.com (Kamel Bouhara) Date: Fri, 25 Feb 2022 12:33:58 +0100 Subject: [Buildroot] [PATCH 2/4] package/odb: add dependency on host-libodb In-Reply-To: <20220225113400.802049-1-kamel.bouhara@bootlin.com> References: <20220225113400.802049-1-kamel.bouhara@bootlin.com> Message-ID: <20220225113400.802049-3-kamel.bouhara@bootlin.com> From: Thomas Petazzoni host-odb installs the ODB compiler, which when executed at runtime, needs access to the libodb headers. In order to have them installed, add a dependency on host-libodb. Signed-off-by: Thomas Petazzoni [Kamel: Add optional host-libodb-boost dependency] --- package/odb/odb.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/odb/odb.mk b/package/odb/odb.mk index 85c7ccb8bb..e7ba1fd48b 100644 --- a/package/odb/odb.mk +++ b/package/odb/odb.mk @@ -10,7 +10,13 @@ ODB_SOURCE = odb-$(ODB_VERSION).tar.bz2 ODB_SITE = https://www.codesynthesis.com/download/odb/$(ODB_VERSION_MAJOR) ODB_LICENSE = GPL-3.0 ODB_LICENSE_FILES = LICENSE -HOST_ODB_DEPENDENCIES = host-libcutl +# host-libodb is not needed to build host-odb, but it is needed to use +# the ODB compiler, as it install header files that are needed at +# runtime by the odb compiler. +HOST_ODB_DEPENDENCIES = host-libcutl host-libodb +ifeq ($(BR2_PACKAGE_BOOST),y) +HOST_ODB_DEPENDENCIES += host-boost host-libodb-boost +endif HOST_ODB_CONF_ENV = CXXFLAGS="$(HOST_CXXFLAGS) -std=c++11" # Prevent odb from trying to install the gcc plugin into the hosts -- 2.25.1 From romain.naour at gmail.com Fri Feb 25 17:11:48 2022 From: romain.naour at gmail.com (Romain Naour) Date: Fri, 25 Feb 2022 18:11:48 +0100 Subject: [Buildroot] [PATCH] package/Makefile.in: year2038 makes time_t 64-bit for glibc toolchains Message-ID: <20220225171148.701977-1-romain.naour@gmail.com> To use time_t 64-bit for glibc >= 2.34 toolchains we have to set both _FILE_OFFSET_BITS=64 and _TIME_BITS=64 for glibc toolchains. Buildroot already define _FILE_OFFSET_BITS=64 since 2008 [1] before the first release tag 2009.02. _TIME_BITS is not needed for musl libc since it already year2038 ready [2]. The uclibc-ng libc only support time_t 32-bit (long int) so it will be affected by the year2038 issue [3]. Fixes (in French, chapter Buildroot 2022 and GlibC): https://www.blaess.fr/christophe/2038 Runtime tested with qemu_arm_vexpress_defconfig and the Bootlin glibc bleeding-edge 2021.11-1 toolchain. Before: # date Tue Jan 19 03:14:07 UTC 2038 # date Thu Jan 1 00:00:00 UTC 1970 After: # date Tue Jan 19 03:14:07 UTC 2038 # date Tue Jan 19 03:14:08 UTC 2038 # date Tue Jan 19 03:14:09 UTC 2038 [1] 60b5eee76edfa153ef118d2788c74ac8da1497a0 [2] https://git.musl-libc.org/cgit/musl/tree/include/alltypes.h.in?h=v1.2.2#n3 [3] https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/tree/include/time.h?h=v1.0.40#n75 https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/tree/libc/sysdeps/linux/common/bits/types.h?h=v1.0.40#n106 Signed-off-by: Romain Naour Cc: Christophe Blaess --- package/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/Makefile.in b/package/Makefile.in index 508ea7c366..cde050ca82 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -167,7 +167,7 @@ else ifeq ($(BR2_FORTIFY_SOURCE_2),y) TARGET_HARDENED += -D_FORTIFY_SOURCE=2 endif -TARGET_CPPFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 +TARGET_CPPFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 TARGET_CFLAGS = $(TARGET_CPPFLAGS) $(TARGET_ABI) $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) $(TARGET_HARDENED) TARGET_CXXFLAGS = $(TARGET_CFLAGS) TARGET_FCFLAGS = $(TARGET_ABI) $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) -- 2.35.1 From fontaine.fabrice at gmail.com Fri Feb 25 18:52:04 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 25 Feb 2022 19:52:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/rpi-userland: fix build with libexecinfo Message-ID: <20220225185204.1043277-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/peko/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: ../../build/lib/libvcos.so: undefined reference to `backtrace_symbols' Fixes: - http://autobuild.buildroot.org/results/93d3b8cc2ac5dfa9d4b44946c0b4d8171e8f52a1 Signed-off-by: Fabrice Fontaine --- ...on-t-override-CMAKE_EXE_LINKER_FLAGS.patch | 58 +++++++++++++++++++ package/rpi-userland/rpi-userland.mk | 5 ++ 2 files changed, 63 insertions(+) create mode 100644 package/rpi-userland/0006-don-t-override-CMAKE_EXE_LINKER_FLAGS.patch diff --git a/package/rpi-userland/0006-don-t-override-CMAKE_EXE_LINKER_FLAGS.patch b/package/rpi-userland/0006-don-t-override-CMAKE_EXE_LINKER_FLAGS.patch new file mode 100644 index 0000000000..bf2a9eb6ea --- /dev/null +++ b/package/rpi-userland/0006-don-t-override-CMAKE_EXE_LINKER_FLAGS.patch @@ -0,0 +1,58 @@ +From 87febf8b7b1c0a6d0ea1d26770d3665008d66fd2 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 25 Feb 2022 19:21:06 +0100 +Subject: [PATCH] don't override CMAKE_EXE_LINKER_FLAGS + +Don't override CMAKE_EXE_LINKER_FLAGS as it could be used by the user to +pass additional flags such as -lexecinfo on musl and uclibc-ng + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/raspberrypi/userland/pull/719] +--- + host_applications/android/apps/vidtex/CMakeLists.txt | 2 +- + host_applications/linux/apps/raspicam/CMakeLists.txt | 2 +- + makefiles/cmake/arm-linux.cmake | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/host_applications/android/apps/vidtex/CMakeLists.txt b/host_applications/android/apps/vidtex/CMakeLists.txt +index e7206cc..16c64db 100644 +--- a/host_applications/android/apps/vidtex/CMakeLists.txt ++++ b/host_applications/android/apps/vidtex/CMakeLists.txt +@@ -5,7 +5,7 @@ SET(COMPILE_DEFINITIONS -Werror -Wall) + # Set --no-as-needed to stop the linker discarding mmal_vc_client + # as it can't see that the constructor registers a load of functionality + # with the MMAL core. +-SET( CMAKE_EXE_LINKER_FLAGS "-Wl,--no-as-needed" ) ++SET( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-as-needed" ) + + include_directories(${PROJECT_SOURCE_DIR}/host_applications/linux/libs/bcm_host/include) + +diff --git a/host_applications/linux/apps/raspicam/CMakeLists.txt b/host_applications/linux/apps/raspicam/CMakeLists.txt +index e6bd373..2f72eb2 100644 +--- a/host_applications/linux/apps/raspicam/CMakeLists.txt ++++ b/host_applications/linux/apps/raspicam/CMakeLists.txt +@@ -6,7 +6,7 @@ SET(COMPILE_DEFINITIONS -Werror) + # Set --no-as-needed to stop the linker discarding mmal_vc_client + # as it can't see that the constructor registers a load of functionality + # with the MMAL core. +-SET( CMAKE_EXE_LINKER_FLAGS "-Wl,--no-as-needed" ) ++SET( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-as-needed" ) + + include_directories(${PROJECT_SOURCE_DIR}/host_applications/linux/libs/bcm_host/include) + include_directories(${PROJECT_SOURCE_DIR}/host_applications/linux/apps/raspicam/) +diff --git a/makefiles/cmake/arm-linux.cmake b/makefiles/cmake/arm-linux.cmake +index 957846a..e172282 100644 +--- a/makefiles/cmake/arm-linux.cmake ++++ b/makefiles/cmake/arm-linux.cmake +@@ -93,7 +93,7 @@ if(ANDROID) + set(CMAKE_SHARED_LINKER_FLAGS "-nostdlib ${ANDROID_CRTBEGIN} -Wl,-Bdynamic -Wl,-T${ANDROID_LDSCRIPTS}/armelf.x") + + link_directories(${ANDROID_LIBS}) +- set(CMAKE_EXE_LINKER_FLAGS "-nostdlib ${ANDROID_CRTBEGIN} -nostdlib -Wl,-z,noexecstack") ++ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -nostdlib ${ANDROID_CRTBEGIN} -nostdlib -Wl,-z,noexecstack") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-dynamic-linker,/system/bin/linker -Wl,-rpath,${CMAKE_INSTALL_PREFIX}/lib") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-T${ANDROID_LDSCRIPTS}/armelf.x -Wl,--gc-sections") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,nocopyreloc -Wl,-z,noexecstack -Wl,--fix-cortex-a8 -Wl,--no-undefined") +-- +2.34.1 + diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk index 84050b6df3..3564ec0703 100644 --- a/package/rpi-userland/rpi-userland.mk +++ b/package/rpi-userland/rpi-userland.mk @@ -13,6 +13,11 @@ RPI_USERLAND_CONF_OPTS = -DVMCS_INSTALL_PREFIX=/usr RPI_USERLAND_PROVIDES = libegl libgles libopenmax libopenvg +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +RPI_USERLAND_DEPENDENCIES += libexecinfo +RPI_USERLAND_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-lexecinfo +endif + ifeq ($(BR2_PACKAGE_RPI_USERLAND_HELLO),y) RPI_USERLAND_CONF_OPTS += -DALL_APPS=ON -- 2.34.1 From romain.naour at gmail.com Fri Feb 25 21:52:45 2022 From: romain.naour at gmail.com (Romain Naour) Date: Fri, 25 Feb 2022 22:52:45 +0100 Subject: [Buildroot] [PATCH] package/pkg-python: use SETUPTOOLS_USE_DISTUTILS=stdlib In-Reply-To: <20220224154118.220408-1-romain.naour@gmail.com> References: <20220224154118.220408-1-romain.naour@gmail.com> Message-ID: Le 24/02/2022 ? 16:41, Romain Naour a ?crit?: > -sh: ipython: not found > > ipython use a wrong shebang on the target: > > # head -n 1 /usr/bin/ipython > #!/home/kubu/buildroot/testsuite-master/TestIPythonPy3/host/bin/python > > The issue come from python3-setuptools 60.0.0 that changed > SETUPTOOLS_USE_DISTUTILS default value from stdlib to local [1] to use > its local copy of distutils. This is actually a "breaking" change [2]. > > We have to override SETUPTOOLS_USE_DISTUTILS to the previous value > "stdlib" to fixes the issue. > > While at it, use distutils from stdlib for the host. > > Fixes: > https://gitlab.com/buildroot.org/buildroot/-/jobs/2088684091 > > [1] https://github.com/pypa/setuptools/commit/b6fcbbd00cb6d5607c9272dec452a50457bdb292 > [2] https://github.com/pypa/setuptools/blob/v60.0.0/CHANGES.rst#breaking-changes I noticed that Qemu included a workaround for setuptools >= 60: https://git.qemu.org/?p=qemu.git;a=commitdiff;h=762c280d5f3c17a239204a73855d8778f6dc2113 Best regards, Romain > > Signed-off-by: Romain Naour > Cc: James Hilliard > --- > package/pkg-python.mk | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/package/pkg-python.mk b/package/pkg-python.mk > index b8dc9cd9e5..e81a1a3102 100644 > --- a/package/pkg-python.mk > +++ b/package/pkg-python.mk > @@ -40,6 +40,7 @@ PKG_PYTHON_DISTUTILS_ENV = \ > LDSHARED="$(TARGET_CROSS)gcc -shared" \ > PYTHONPATH="$(PYTHON3_PATH)" \ > PYTHONNOUSERSITE=1 \ > + SETUPTOOLS_USE_DISTUTILS=stdlib \ > _PYTHON_HOST_PLATFORM="$(PKG_PYTHON_HOST_PLATFORM)" \ > _PYTHON_PROJECT_BASE="$(PYTHON3_DIR)" \ > _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ > @@ -62,6 +63,7 @@ PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS = \ > HOST_PKG_PYTHON_DISTUTILS_ENV = \ > PATH=$(BR_PATH) \ > PYTHONNOUSERSITE=1 \ > + SETUPTOOLS_USE_DISTUTILS=stdlib \ > $(HOST_CONFIGURE_OPTS) > > HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \ > @@ -76,6 +78,7 @@ PKG_PYTHON_SETUPTOOLS_ENV = \ > $(TARGET_CONFIGURE_OPTS) \ > PYTHONPATH="$(PYTHON3_PATH)" \ > PYTHONNOUSERSITE=1 \ > + SETUPTOOLS_USE_DISTUTILS=stdlib \ > _python_sysroot=$(STAGING_DIR) \ > _python_prefix=/usr \ > _python_exec_prefix=/usr > @@ -96,6 +99,7 @@ PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS = \ > HOST_PKG_PYTHON_SETUPTOOLS_ENV = \ > PATH=$(BR_PATH) \ > PYTHONNOUSERSITE=1 \ > + SETUPTOOLS_USE_DISTUTILS=stdlib \ > $(HOST_CONFIGURE_OPTS) > > HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ From fontaine.fabrice at gmail.com Fri Feb 25 23:05:18 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 26 Feb 2022 00:05:18 +0100 Subject: [Buildroot] [PATCH 1/2] package/zabbix: fix shared netsnmp build Message-ID: <20220225230519.1584174-1-fontaine.fabrice@gmail.com> Fix the following shared build failure with netsnmp raised since the addition of the package in commit 42382a171277ead59e365f5920e757f01c04ac77: configure: error: "libnetsnmp.a static library was not found in /home/buildroot/autobuild/instance-0/output-1/host/powerpc64le-buildroot-linux-gnu/sysroot/usr/bin/../../usr/lib" Fixes: - http://autobuild.buildroot.org/results/0f541e45d1fa27b3302968683bf64949131ec1c9 Signed-off-by: Fabrice Fontaine --- ...-netsnmp.m4-fix-shared-netsnmp-build.patch | 44 +++++++++++++++++++ package/zabbix/zabbix.mk | 2 + 2 files changed, 46 insertions(+) create mode 100644 package/zabbix/0001-m4-netsnmp.m4-fix-shared-netsnmp-build.patch diff --git a/package/zabbix/0001-m4-netsnmp.m4-fix-shared-netsnmp-build.patch b/package/zabbix/0001-m4-netsnmp.m4-fix-shared-netsnmp-build.patch new file mode 100644 index 0000000000..ffb1f54ba2 --- /dev/null +++ b/package/zabbix/0001-m4-netsnmp.m4-fix-shared-netsnmp-build.patch @@ -0,0 +1,44 @@ +From 3e810c0804ec40ad6e111a9791cdb2033ecdad71 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 25 Feb 2022 23:30:19 +0100 +Subject: [PATCH] m4/netsnmp.m4: fix shared netsnmp build + +Since commit fe391e8689c523d3c7ea6b173d25aa5dba3a6902, the build fails +with the following error if the user provides the path of +net-snmp-config through the --with-net-snmp option: + +configure: error: "libnetsnmp.a static library was not found in /home/buildroot/autobuild/instance-0/output-1/host/powerpc64le-buildroot-linux-gnu/sysroot/usr/bin/../../usr/lib" + +However, the assumption that a static library will be provided by the +system is just plain wrong so replace AC_MSG_ERROR by AC_MSG_WARN + +Fixes: + - http://autobuild.buildroot.org/results/0f541e45d1fa27b3302968683bf64949131ec1c9 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/zabbix/zabbix/pull/61] +--- + m4/netsnmp.m4 | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/m4/netsnmp.m4 b/m4/netsnmp.m4 +index 5e84d84303..87e21a67e6 100644 +--- a/m4/netsnmp.m4 ++++ b/m4/netsnmp.m4 +@@ -140,8 +140,11 @@ AC_HELP_STRING([--with-net-snmp@<:@=ARG@:>@], + test [ "x$static_linking_support" = "xno" -o -z "$static_linking_support" ] -a -z "$_libsnmp_dir_lib" && AC_MSG_ERROR(["Compiler not support statically linked libs from default folders"]) + + if test "x$static_linking_support" = "xno" -o -z "$static_linking_support"; then +- test -f $_libsnmp_dir_lib/libnetsnmp.a || AC_MSG_ERROR(["libnetsnmp.a static library was not found in $_libsnmp_dir_lib"]) +- SNMP_LIBS=`echo "$SNMP_LIBS"|sed "s|-lnetsnmp|$_libsnmp_dir_lib/libnetsnmp.a|g"` ++ if test -f $_libsnmp_dir_lib/libnetsnmp.a; then ++ SNMP_LIBS=`echo "$SNMP_LIBS"|sed "s|-lnetsnmp|$_libsnmp_dir_lib/libnetsnmp.a|g"` ++ else ++ AC_MSG_WARN(["libnetsnmp.a static library was not found in $_libsnmp_dir_lib"]) ++ fi + else + SNMP_LIBS=`echo "$SNMP_LIBS"|sed "s/-lnetsnmp/${static_linking_support}static -lnetsnmp ${static_linking_support}dynamic/g"` + fi +-- +2.34.1 + diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk index e6564e68fd..a8ecbb42db 100644 --- a/package/zabbix/zabbix.mk +++ b/package/zabbix/zabbix.mk @@ -10,6 +10,8 @@ ZABBIX_SITE = https://cdn.zabbix.com/zabbix/sources/stable/$(ZABBIX_VERSION_MAJO ZABBIX_LICENSE = GPL-2.0+ ZABBIX_LICENSE_FILES = README COPYING ZABBIX_CPE_ID_VENDOR = zabbix +# We're patching m4/netsnmp.m4 +ZABBIX_AUTORECONF = YES ZABBIX_DEPENDENCIES = pcre ZABBIX_CONF_OPTS = \ -- 2.34.1 From fontaine.fabrice at gmail.com Fri Feb 25 23:05:19 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 26 Feb 2022 00:05:19 +0100 Subject: [Buildroot] [PATCH 2/2] package/zabbix: netsnmp needs mib In-Reply-To: <20220225230519.1584174-1-fontaine.fabrice@gmail.com> References: <20220225230519.1584174-1-fontaine.fabrice@gmail.com> Message-ID: <20220225230519.1584174-2-fontaine.fabrice@gmail.com> netsnmp support needs mib to avoid the following build failure raised since the addition of the package in commit 42382a171277ead59e365f5920e757f01c04ac77: checks_snmp.c: In function ?zbx_snmp_get_octet_string?: checks_snmp.c:694:35: error: invalid use of undefined type ?struct tree? 694 | hint = (NULL != subtree ? subtree->hint : NULL); | ^~ Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine --- package/zabbix/zabbix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk index a8ecbb42db..adc54028ad 100644 --- a/package/zabbix/zabbix.mk +++ b/package/zabbix/zabbix.mk @@ -55,7 +55,7 @@ else ZABBIX_CONF_OPTS += --without-libxml2 endif -ifeq ($(BR2_PACKAGE_NETSNMP),y) +ifeq ($(BR2_PACKAGE_NETSNMP_ENABLE_MIBS),y) ZABBIX_CONF_OPTS += --with-net-snmp=$(STAGING_DIR)/usr/bin/net-snmp-config ZABBIX_DEPENDENCIES += netsnmp else -- 2.34.1 From fontaine.fabrice at gmail.com Fri Feb 25 23:18:16 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 26 Feb 2022 00:18:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/openssh: security bump to version 8.9p1 Message-ID: <20220225231816.1648877-1-fontaine.fabrice@gmail.com> Security Near Miss ================== * sshd(8): fix an integer overflow in the user authentication path that, in conjunction with other logic errors, could have yielded unauthenticated access under difficult to exploit conditions. This situation is not exploitable because of independent checks in the privilege separation monitor. Privilege separation has been enabled by default in since openssh-3.2.2 (released in 2002) and has been mandatory since openssh-7.5 (released in 2017). Moreover, portable OpenSSH has used toolchain features available in most modern compilers to abort on signed integer overflow since openssh-6.5 (released in 2014). Update license (md5crypt removed, bcrypt relicensed to BSD-3-Clause: https://github.com/openssh/openssh-portable/commit/a5ab4882348d26addc9830a44e053238dfa2cb58 https://github.com/openssh/openssh-portable/commit/158bf854e2a22cf09064305f4a4e442670562685 https://github.com/openssh/openssh-portable/commit/c0459588b8d00b73e506c6095958ecfe62a4a7ba) https://www.openssh.com/txt/release-8.9 Signed-off-by: Fabrice Fontaine --- package/openssh/openssh.hash | 6 +++--- package/openssh/openssh.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/openssh/openssh.hash b/package/openssh/openssh.hash index aab3dba09c..dd123c1bb6 100644 --- a/package/openssh/openssh.hash +++ b/package/openssh/openssh.hash @@ -1,4 +1,4 @@ -# From https://www.openssh.com/txt/release-8.8 (base64 encoded) -sha256 4590890ea9bb9ace4f71ae331785a3a5823232435161960ed5fc86588f331fe9 openssh-8.8p1.tar.gz +# From https://www.openssh.com/txt/release-8.9 (base64 encoded) +sha256 fd497654b7ab1686dac672fb83dfb4ba4096e8b5ffcdaccd262380ae58bec5e7 openssh-8.9p1.tar.gz # Locally calculated -sha256 432abf7480fb31473a6706627212913fc70032e3fb71b90fecb28ae26a2d741d LICENCE +sha256 d6807e99f3d159145c659060f57c3fa74e109faa39326dbfc38674cb550fd104 LICENCE diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index 4145bfd8dc..0e0d59e6ab 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -4,13 +4,13 @@ # ################################################################################ -OPENSSH_VERSION_MAJOR = 8.8 +OPENSSH_VERSION_MAJOR = 8.9 OPENSSH_VERSION_MINOR = p1 OPENSSH_VERSION = $(OPENSSH_VERSION_MAJOR)$(OPENSSH_VERSION_MINOR) OPENSSH_CPE_ID_VERSION = $(OPENSSH_VERSION_MAJOR) OPENSSH_CPE_ID_UPDATE = $(OPENSSH_VERSION_MINOR) OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable -OPENSSH_LICENSE = BSD-4-Clause, BSD-3-Clause, BSD-2-Clause, Public Domain +OPENSSH_LICENSE = BSD-3-Clause, BSD-2-Clause, Public Domain OPENSSH_LICENSE_FILES = LICENCE OPENSSH_CONF_ENV = \ LD="$(TARGET_CC)" \ -- 2.34.1 From thomas.petazzoni at bootlin.com Sat Feb 26 07:10:09 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 26 Feb 2022 07:10:09 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-02-25 Message-ID: <20220226071014.9D09E400D7@smtp2.osuosl.org> Hello, Autobuild statistics for 2022-02-25 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 38 | 9 | 0 | 47 | 2021.11.x | 8 | 1 | 0 | 9 | master | 46 | 20 | 0 | 66 | Classification of failures by reason for master ----------------------------------------------- host-libselinux-3.3 | 8 bluez5_utils-5.63 | 2 frr-8.1 | 2 bpftool-v6.7.0 | 1 host-go-1.17.7 | 1 mongodb-4.2.18 | 1 python-greenlet-1.1.2 | 1 rpi-userland-14b90ff9d9f031... | 1 safeclib-3.7.1 | 1 unknown | 1 zabbix-5.4.9 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- riscv64 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/15ba9902c04c4c84dbaee60dcc4414a696c7ece5 | riscv64 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/f8b503b6883c720d09090cb2008e16db0084b5e9 | mips64el | bpftool-v6.7.0 | NOK | http://autobuild.buildroot.net/results/a7922ec37a9e05786ede3017510b44113654f927 | powerpc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/b4bb0da9b401a705830b77826c6850725cb62d02 | microblazeel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/479ba2dcc6dfc314b4622ffbb4063289e22f42b1 | mips64el | host-go-1.17.7 | NOK | http://autobuild.buildroot.net/results/49f804b3b35ba8df0ed5c23653c5e9e086fbde74 | riscv32 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/fe12e7e97d8815da1c9129b95f017037a92788da | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/9833b73141508eef27db00409248115cadde9ce6 | riscv64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/6923ad7079e021c92abbcc7ca5e22dc4b01d303d | arc | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/e5ce889b16b9471f7c7572fd87c55fc75e955745 | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/0c941e5b1adecba3e5e7cef21d9dffe7d9179793 | powerpc | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/0b030f3c672b42ad4a7cdaaf4dd9c5cc106a0c94 | arc | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/0619e77bc8e9e19e0263243ec0e3468795987f88 | sparc | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/6060631050e50bf5d28605c1709d167d3b52c7d7 | x86_64 | mongodb-4.2.18 | NOK | http://autobuild.buildroot.net/results/1030178eb64f57b89d891b6e6327e2b718a91083 | arm | python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/554aae1ba9019d81226c29d3d6f46ecfc4772fdb | arm | rpi-userland-14b90ff9d9f031... | NOK | http://autobuild.buildroot.net/results/93d3b8cc2ac5dfa9d4b44946c0b4d8171e8f52a1 | aarch64 | safeclib-3.7.1 | NOK | http://autobuild.buildroot.net/results/30d0085edf0bfa1c1047ba0f4b4edc6804c00ff4 | aarch64 | unknown | NOK | http://autobuild.buildroot.net/results/9d2a8c58eaad3250ab6ea1f277fe92518800f9fc | powerpc64le | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/0f541e45d1fa27b3302968683bf64949131ec1c9 | Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 2 gstreamer1-mm-1.10.0 | 1 mesa3d-20.3.5 | 1 monkey-f54856ce250c4e257354... | 1 netatalk-3.1.12 | 1 rocksdb-6.13.3 | 1 sphinxbase-5prealpha | 1 unknown | 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/1f19aa2777151b6cb8c8022bc51d1d5ad682f5c7 | ORPH m68k | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/3ab387ede80634241997603574a399b1074d9089 | arm | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/e20145ef18ea9240916098f8329ece97e79d8f74 | mips | mesa3d-20.3.5 | NOK | http://autobuild.buildroot.net/results/819a47bea8c86105dba6e1cc78a7730eb3939a87 | x86_64 | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/aa83829885e5fb0b53d2d5c31c97f1a09ee00baf | riscv32 | netatalk-3.1.12 | NOK | http://autobuild.buildroot.net/results/e26284c60787d7693de5dd85e940769ca604d823 | ORPH m68k | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/23872a71a7c6b8e5ef325ba08ac86d9745458964 | nds32le | sphinxbase-5prealpha | NOK | http://autobuild.buildroot.net/results/697d71740041abefe40064646c65f452f1ffd22f | arm | unknown | NOK | http://autobuild.buildroot.net/results/9b691643113bd4c557c276509eb9d4f7895c111c | Classification of failures by reason for 2021.11.x -------------------------------------------------- unknown | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arc | unknown | NOK | http://autobuild.buildroot.net/results/8038a02d37fd769b47159e3341781b0195888a10 | Gitlab CI results for 2022-02-25 ================================ Detail of defconfig failures for master --------------------------------------- defconfig | link to the job | orph? ----------------------------------+---------------------------------------------------------------+------ amarula_a64_relic | https://gitlab.com/buildroot.org/buildroot/-/jobs/2131158364 | bananapi_m1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2131158422 | bananapi_m1_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/2131158424 | bananapi_m2_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/2131158425 | bananapro | https://gitlab.com/buildroot.org/buildroot/-/jobs/2131158430 | csky_gx6605s | https://gitlab.com/buildroot.org/buildroot/-/jobs/2131158442 | freescale_imx8mqevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/2131158478 | friendlyarm_nanopi_m1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2131158488 | ORPH friendlyarm_nanopi_m1_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/2131158489 | ORPH friendlyarm_nanopi_neo | https://gitlab.com/buildroot.org/buildroot/-/jobs/2131158493 | friendlyarm_nanopi_neo_plus2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2131158494 | friendlyarm_nanopi_r1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2131158495 | galileo | https://gitlab.com/buildroot.org/buildroot/-/jobs/2131158497 | imx8mmpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/2131158513 | imx8mpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/2131158514 | licheepi_zero | https://gitlab.com/buildroot.org/buildroot/-/jobs/2131158522 | microchip_sam9x60ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2131158528 | orangepi_one_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/2131158573 | orangepi_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/2131158577 | ORPH orangepi_rk3399 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2131158581 | orangepi_win | https://gitlab.com/buildroot.org/buildroot/-/jobs/2131158584 | raspberrypi3_qt5we | https://gitlab.com/buildroot.org/buildroot/-/jobs/2131158669 | -- http://autobuild.buildroot.net From giulio.benetti at benettiengineering.com Sat Feb 26 10:19:59 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 26 Feb 2022 11:19:59 +0100 Subject: [Buildroot] [PATCH] board/intel/galileo: fix build failure with host gcc 10 In-Reply-To: <42058D10-AAA9-41FE-91E3-1D5153134FCA@benettiengineering.com> References: <42058D10-AAA9-41FE-91E3-1D5153134FCA@benettiengineering.com> Message-ID: <3D49BD64-4189-4E96-BE05-B39A4D75C04B@benettiengineering.com> Hi All, Nicholas will take care about bumping uboot and Linux in a couple of weeks. He?s written me privately. Best regards Giulio > Il giorno 13 feb 2022, alle ore 13:56, Giulio Benetti ha scritto: > > ?Hi Nicolas, > > sorry for html but I?m mobile. > > My patch for fixing the build failure for Galileo has been upstream, but Linux version is very old, > I?ve added a local patch from 2014 as pointed Arnout below. > I don?t have a Galileo board and you are the maintainer, can you please update uboot and Linux versions and send a patch for that after testing please? > > Thank you! > ?- > Giulio Benetti > Benetti Engineering sas > >> Il giorno 13 feb 2022, alle ore 12:46, Arnout Vandecappelle ha scritto: >> >> ? >> >>>> On 02/02/2022 22:43, Giulio Benetti wrote: >>> Building galileo_defconfig throws error: >>> ``` >>> /usr/bin/ld: arch/x86/tools/relocs_64.o:(.bss+0x0): multiple definition of `per_cpu_load_addr'; arch/x86/tools/relocs_32.o:(.bss+0x0): first defined here >>> ``` >>> To fix this let's add an upstreamed patch[1] and add BR2_GLOBAL_PATCH_DIR >>> to galileo_defconfig to point to where patch is. >>> [1]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=eeeda4cd06e828b331b15741a204ff9f5874d28d.patch >>> Fixes: >>> https://gitlab.com/ymorin/buildroot/-/jobs/2035821039 >>> Signed-off-by: Giulio Benetti >> >> You can't imagine how much joy it gives me to see a patch from 2014 applied here... >> >> >> Applied to master, thanks. >> >> Regards, >> Arnout >> >>> --- >>> ...relocs-Make-per_cpu_load_addr-static.patch | 39 +++++++++++++++++++ >>> configs/galileo_defconfig | 1 + >>> 2 files changed, 40 insertions(+) >>> create mode 100644 board/intel/galileo/patches/linux/0001-x86-relocs-Make-per_cpu_load_addr-static.patch >>> diff --git a/board/intel/galileo/patches/linux/0001-x86-relocs-Make-per_cpu_load_addr-static.patch b/board/intel/galileo/patches/linux/0001-x86-relocs-Make-per_cpu_load_addr-static.patch >>> new file mode 100644 >>> index 0000000000..1d206cc6d1 >>> --- /dev/null >>> +++ b/board/intel/galileo/patches/linux/0001-x86-relocs-Make-per_cpu_load_addr-static.patch >>> @@ -0,0 +1,39 @@ >>> +From eeeda4cd06e828b331b15741a204ff9f5874d28d Mon Sep 17 00:00:00 2001 >>> +From: Ben Hutchings >>> +Date: Wed, 24 Sep 2014 13:30:12 +0100 >>> +Subject: [PATCH] x86/relocs: Make per_cpu_load_addr static >>> + >>> +per_cpu_load_addr is only used for 64-bit relocations, but is >>> +declared in both configurations of relocs.c - with different >>> +types. This has undefined behaviour in general. GNU ld is >>> +documented to use the larger size in this case, but other tools >>> +may differ and some warn about this. >>> + >>> +References: https://bugs.debian.org/748577 >>> +Reported-by: Michael Tautschnig >>> +Signed-off-by: Ben Hutchings >>> +Cc: 748577 at bugs.debian.org >>> +Cc: Linus Torvalds >>> +Link: http://lkml.kernel.org/r/1411561812.3659.23.camel at decadent.org.uk >>> +Signed-off-by: Ingo Molnar >>> +Signed-off-by: Giulio Benetti >>> +--- >>> + arch/x86/tools/relocs.c | 2 +- >>> + 1 file changed, 1 insertion(+), 1 deletion(-) >>> + >>> +diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c >>> +index bbb1d2259ecf..a5efb21d5228 100644 >>> +--- a/arch/x86/tools/relocs.c >>> ++++ b/arch/x86/tools/relocs.c >>> +@@ -695,7 +695,7 @@ static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel, >>> + * >>> + */ >>> + static int per_cpu_shndx = -1; >>> +-Elf_Addr per_cpu_load_addr; >>> ++static Elf_Addr per_cpu_load_addr; >>> + >>> + static void percpu_init(void) >>> + { >>> +-- >>> +2.25.1 >>> + >>> diff --git a/configs/galileo_defconfig b/configs/galileo_defconfig >>> index 03ca23f414..a8fd0a6dcc 100644 >>> --- a/configs/galileo_defconfig >>> +++ b/configs/galileo_defconfig >>> @@ -1,4 +1,5 @@ >>> BR2_x86_x1000=y >>> +BR2_GLOBAL_PATCH_DIR=board/intel/galileo/patches >>> # Needed for TARGET_GRUB2 >>> BR2_TOOLCHAIN_BUILDROOT_WCHAR=y >>> # Linux headers same as kernel, a 3.14 series >> _______________________________________________ >> 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 thomas.petazzoni at bootlin.com Sat Feb 26 10:32:18 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 26 Feb 2022 11:32:18 +0100 Subject: [Buildroot] [PATCH 2/4] package/odb: add dependency on host-libodb In-Reply-To: <20220225113400.802049-3-kamel.bouhara@bootlin.com> References: <20220225113400.802049-1-kamel.bouhara@bootlin.com> <20220225113400.802049-3-kamel.bouhara@bootlin.com> Message-ID: <20220226113218.23e288ed@windsurf> Hello Kamel, On Fri, 25 Feb 2022 12:33:58 +0100 Kamel Bouhara via buildroot wrote: > +# host-libodb is not needed to build host-odb, but it is needed to use > +# the ODB compiler, as it install header files that are needed at > +# runtime by the odb compiler. > +HOST_ODB_DEPENDENCIES = host-libcutl host-libodb You're in PATCH 2/4, and you're using host-libodb, which is only added in PATCH 3/4. There is a patch ordering issue in your series. > +ifeq ($(BR2_PACKAGE_BOOST),y) > +HOST_ODB_DEPENDENCIES += host-boost host-libodb-boost You're in PATCH 2/4, and you're using host-libodb-boost, which is only added in PATCH 4/4, so there's another ordering issue in your series. Also, the host-boost dependency here seems useless to me, as it's implied by the host-libodb-boost dependency. Also, why do you use ifeq ($(BR2_PACKAGE_BOOST),y) ? I think it would be much more logical to use ifeq ($(BR2_PACKAGE_LIBODB_BOOST),y), no ? 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 Feb 26 10:32:59 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 26 Feb 2022 11:32:59 +0100 Subject: [Buildroot] [PATCH 3/4] package/libodb: add host variant In-Reply-To: <20220225113400.802049-4-kamel.bouhara@bootlin.com> References: <20220225113400.802049-1-kamel.bouhara@bootlin.com> <20220225113400.802049-4-kamel.bouhara@bootlin.com> Message-ID: <20220226113259.6e11ec54@windsurf> On Fri, 25 Feb 2022 12:33:59 +0100 Kamel Bouhara via buildroot wrote: > From: Thomas Petazzoni > > Signed-off-by: Thomas Petazzoni I know this commit is originally from me in a local tree, but it needs a commit description. And your Signed-off-by. 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 Feb 26 10:33:44 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 26 Feb 2022 11:33:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/libtorrent: fix build with libexecinfo Message-ID: <20220226103344.1850433-1-fontaine.fabrice@gmail.com> Fix the folllowing build failure on rtorrent raised on uclibc and musl since the addition of libexecinfo package in commit eea8ba446c10701a273432552108d80fb2224ef4: /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/libtorrent.so: undefined reference to `backtrace_symbols' Fixes: - http://autobuild.buildroot.org/results/6cb4ba56fc0a3a8bd02b246ab9bc82edaa552ad9 Signed-off-by: Fabrice Fontaine --- package/libtorrent/libtorrent.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/libtorrent/libtorrent.mk b/package/libtorrent/libtorrent.mk index c8310cab65..b966a72788 100644 --- a/package/libtorrent/libtorrent.mk +++ b/package/libtorrent/libtorrent.mk @@ -14,6 +14,11 @@ LIBTORRENT_INSTALL_STAGING = YES LIBTORRENT_LICENSE = GPL-2.0 LIBTORRENT_LICENSE_FILES = COPYING +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +LIBTORRENT_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -lexecinfo" +LIBTORRENT_DEPENDENCIES += libexecinfo +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) LIBTORRENT_CONF_OPTS += --enable-openssl LIBTORRENT_DEPENDENCIES += openssl -- 2.34.1 From thomas.petazzoni at bootlin.com Sat Feb 26 10:35:38 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 26 Feb 2022 11:35:38 +0100 Subject: [Buildroot] [PATCH 4/4] package/libodb-boost: add host variant In-Reply-To: <20220225113400.802049-5-kamel.bouhara@bootlin.com> References: <20220225113400.802049-1-kamel.bouhara@bootlin.com> <20220225113400.802049-5-kamel.bouhara@bootlin.com> Message-ID: <20220226113538.6def80d0@windsurf> On Fri, 25 Feb 2022 12:34:00 +0100 Kamel Bouhara via buildroot wrote: > Add host variant of libodb-boost required by host-odb package. This is a bit short, and I think just like PATCH 3/4, it needs a more extensive explanation that the ODB compiler needs the libodb-boost headers at compile time, and therefore installed in $(HOST_DIR). > diff --git a/package/libodb-boost/libodb-boost.mk b/package/libodb-boost/libodb-boost.mk > index bac5f1e78f..7f2ad1fe72 100644 > --- a/package/libodb-boost/libodb-boost.mk > +++ b/package/libodb-boost/libodb-boost.mk > @@ -11,7 +11,10 @@ LIBODB_BOOST_SITE = https://www.codesynthesis.com/download/odb/$(LIBODB_BOOST_VE > LIBODB_BOOST_INSTALL_STAGING = YES > LIBODB_BOOST_LICENSE = GPL-2.0 > LIBODB_BOOST_LICENSE_FILES = LICENSE > -LIBODB_BOOST_DEPENDENCIES = boost libodb > +LIBODB_BOOST_DEPENDENCIES = boost libodb \ > + host-boost \ > + host-libodb This seems wrong. Why is libodb-boost depending on host-libodb-boost. At least, this makes the dependencies added in your PATCH 2/4 a bit irrelevant. I guess what you need to do instead is: HOST_LIBODB_BOOST_DEPENDENCIES = hoost-boost host-libodb And rely on the logic in odb.mk to pull in host-libodb-boost when BR2_PACKAGE_LIBODB_BOOST=y. Could you fix your patch series, and send a new iteration? Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From tianyuanhao3 at 163.com Sat Feb 26 10:24:18 2022 From: tianyuanhao3 at 163.com (TIAN Yuanhao) Date: Sat, 26 Feb 2022 02:24:18 -0800 Subject: [Buildroot] [PATCH/next 1/1] package/balena-engine: bump to version 20.10.12 Message-ID: <20220226102418.943851-1-tianyuanhao3@163.com> Also: - drop unused dependencies - drop invalid tags - drop the autogen step - simplify kconfigs just to run hello-world https://github.com/balena-os/balena-engine/blob/v20.10.12/CHANGELOG.md Signed-off-by: TIAN Yuanhao --- package/balena-engine/Config.in | 1 - package/balena-engine/balena-engine.hash | 2 +- package/balena-engine/balena-engine.mk | 42 +++++------------------- 3 files changed, 9 insertions(+), 36 deletions(-) diff --git a/package/balena-engine/Config.in b/package/balena-engine/Config.in index f48f361dc2..02f694515e 100644 --- a/package/balena-engine/Config.in +++ b/package/balena-engine/Config.in @@ -6,7 +6,6 @@ config BR2_PACKAGE_BALENA_ENGINE depends on BR2_USE_MMU # util-linux select BR2_PACKAGE_CGROUPFS_MOUNT if !BR2_PACKAGE_SYSTEMD # runtime select BR2_PACKAGE_IPTABLES # runtime - select BR2_PACKAGE_SQLITE # runtime select BR2_PACKAGE_UTIL_LINUX # runtime select BR2_PACKAGE_UTIL_LINUX_BINARIES # runtime select BR2_PACKAGE_UTIL_LINUX_MOUNT # runtime diff --git a/package/balena-engine/balena-engine.hash b/package/balena-engine/balena-engine.hash index 3f632ef381..ef590881f5 100644 --- a/package/balena-engine/balena-engine.hash +++ b/package/balena-engine/balena-engine.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 389282706562118608b6ac580e7beacd6a43f0bb3481c69fb1856bed9ac49b85 balena-engine-19.03.14.tar.gz +sha256 43f4c985b855a4f731a5cdac214f1adf6c4cc2021cbad3f93856009df246d61c balena-engine-20.10.12.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/balena-engine/balena-engine.mk b/package/balena-engine/balena-engine.mk index b3eb2ca75b..0afcea3d7e 100644 --- a/package/balena-engine/balena-engine.mk +++ b/package/balena-engine/balena-engine.mk @@ -4,34 +4,33 @@ # ################################################################################ -BALENA_ENGINE_VERSION = 19.03.14 +BALENA_ENGINE_VERSION = 20.10.12 BALENA_ENGINE_SITE = $(call github,balena-os,balena-engine,v$(BALENA_ENGINE_VERSION)) BALENA_ENGINE_LICENSE = Apache-2.0 BALENA_ENGINE_LICENSE_FILES = LICENSE -BALENA_ENGINE_DEPENDENCIES = host-pkgconf BALENA_ENGINE_GOMOD = github.com/docker/docker BALENA_ENGINE_LDFLAGS = \ - -X github.com/docker/cli/cli/version.Version=N/A \ - -X github.com/docker/cli/cli/version.GitCommit= \ - -X github.com/docker/cli/cli/version.BuildTime= \ + -X $(BALENA_ENGINE_GOMOD)/dockerversion.GitCommit= \ + -X $(BALENA_ENGINE_GOMOD)/dockerversion.Version=$(BALENA_ENGINE_VERSION) \ -X github.com/containerd/containerd/version.Version=N/A \ + -X github.com/docker/cli/cli/version.BuildTime= \ + -X github.com/docker/cli/cli/version.GitCommit= \ + -X github.com/docker/cli/cli/version.Version=N/A \ -X github.com/opencontainers/runc.version=N/A BALENA_ENGINE_TAGS = \ cgo \ - exclude_graphdriver_zfs \ - autogen \ - no_buildkit \ no_btrfs \ no_cri \ no_devmapper \ no_zfs \ exclude_disk_quota \ exclude_graphdriver_btrfs \ - exclude_graphdriver_devicemapper + exclude_graphdriver_devicemapper \ + exclude_graphdriver_zfs BALENA_ENGINE_BUILD_TARGETS = cmd/balena-engine @@ -40,16 +39,6 @@ BALENA_ENGINE_DEPENDENCIES += systemd BALENA_ENGINE_TAGS += journald endif -define BALENA_ENGINE_RUN_AUTOGEN - cd $(@D) && \ - VERSION=$(BALENA_ENGINE_VERSION) \ - PKG_CONFIG=$(PKG_CONFIG_HOST_BINARY) \ - $(TARGET_MAKE_ENV) \ - $(SHELL) hack/make/.go-autogen -endef - -BALENA_ENGINE_POST_CONFIGURE_HOOKS += BALENA_ENGINE_RUN_AUTOGEN - define BALENA_ENGINE_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 $(@D)/contrib/init/systemd/balena-engine.service \ $(TARGET_DIR)/usr/lib/systemd/system/balena-engine.service @@ -64,35 +53,20 @@ endef define BALENA_ENGINE_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_POSIX_MQUEUE) $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUPS) - $(call KCONFIG_ENABLE_OPT,CONFIG_MEMCG) - $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_SCHED) - $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_FREEZER) - $(call KCONFIG_ENABLE_OPT,CONFIG_CPUSETS) - $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_DEVICE) - $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_CPUACCT) $(call KCONFIG_ENABLE_OPT,CONFIG_NAMESPACES) $(call KCONFIG_ENABLE_OPT,CONFIG_UTS_NS) $(call KCONFIG_ENABLE_OPT,CONFIG_IPC_NS) $(call KCONFIG_ENABLE_OPT,CONFIG_PID_NS) $(call KCONFIG_ENABLE_OPT,CONFIG_NET_NS) $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER) - $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_ADVANCED) - $(call KCONFIG_ENABLE_OPT,CONFIG_BRIDGE_NETFILTER) $(call KCONFIG_ENABLE_OPT,CONFIG_NF_CONNTRACK) $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_ADDRTYPE) $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_CONNTRACK) - $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_IPVS) $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_IPTABLES) $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_FILTER) $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_NAT) - $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_TARGET_MASQUERADE) $(call KCONFIG_ENABLE_OPT,CONFIG_BRIDGE) - $(call KCONFIG_ENABLE_OPT,CONFIG_DUMMY) - $(call KCONFIG_ENABLE_OPT,CONFIG_MACVLAN) - $(call KCONFIG_ENABLE_OPT,CONFIG_VXLAN) $(call KCONFIG_ENABLE_OPT,CONFIG_VETH) - $(call KCONFIG_ENABLE_OPT,CONFIG_OVERLAY_FS) - $(call KCONFIG_ENABLE_OPT,CONFIG_KEYS) endef define BALENA_ENGINE_INSTALL_SYMLINK -- 2.25.1 From giulio.benetti at benettiengineering.com Sat Feb 26 10:52:26 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 26 Feb 2022 11:52:26 +0100 Subject: [Buildroot] [PATCH v2 1/6] board/orangepi/orangepi-zero-plus2: switch to extlinux In-Reply-To: <20220225072622.3584480-2-geomatsi@gmail.com> References: <20220225072622.3584480-1-geomatsi@gmail.com> <20220225072622.3584480-2-geomatsi@gmail.com> Message-ID: Hi Sergey, On 25/02/22 08:26, Sergey Matyukevich wrote: > Switch to extlinux instead of U-Boot boot script. Drop custom boot > script and genimage config. Instead use common orangepi files from > board/orangepi/common. To help extlinux to find DTB without U-Boot > environment changes, do not strip arm64 board specific directory > from DTB name when installing it in /boot directory. For this > purpose use BR2_KERNEL_DTB_KEEP_DIRNAME config option. Finally, > tidy up configuration file adding section names. > > Signed-off-by: Sergey Matyukevich Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti [Giulio: build tested only] Best regards -- Giulio Benetti Benetti Engineering sas > --- > board/orangepi/orangepi-zero-plus2/boot.cmd | 6 --- > .../orangepi/orangepi-zero-plus2/genimage.cfg | 41 ------------------- > configs/orangepi_zero_plus2_defconfig | 14 ++++--- > 3 files changed, 8 insertions(+), 53 deletions(-) > delete mode 100644 board/orangepi/orangepi-zero-plus2/boot.cmd > delete mode 100644 board/orangepi/orangepi-zero-plus2/genimage.cfg > > diff --git a/board/orangepi/orangepi-zero-plus2/boot.cmd b/board/orangepi/orangepi-zero-plus2/boot.cmd > deleted file mode 100644 > index aa5162004b..0000000000 > --- a/board/orangepi/orangepi-zero-plus2/boot.cmd > +++ /dev/null > @@ -1,6 +0,0 @@ > -setenv bootargs console=ttyS0,115200 earlyprintk root=PARTLABEL=rootfs rootwait > - > -fatload mmc 0 $kernel_addr_r Image > -fatload mmc 0 $fdt_addr_r sun50i-h5-orangepi-zero-plus2.dtb > - > -booti $kernel_addr_r - $fdt_addr_r > diff --git a/board/orangepi/orangepi-zero-plus2/genimage.cfg b/board/orangepi/orangepi-zero-plus2/genimage.cfg > deleted file mode 100644 > index 5a7ee7707a..0000000000 > --- a/board/orangepi/orangepi-zero-plus2/genimage.cfg > +++ /dev/null > @@ -1,41 +0,0 @@ > -image boot.vfat { > - vfat { > - files = { > - "Image", > - "sun50i-h5-orangepi-zero-plus2.dtb", > - "boot.scr" > - } > - } > - > - size = 64M > -} > - > -image sdcard.img { > - hdimage { > - # for root=PARTLABEL support > - partition-table-type = "gpt" > - # default GPT location conflicts with bootloaders, move it after > - gpt-location = 1M > - } > - > - partition spl { > - in-partition-table = "no" > - image = "u-boot-sunxi-with-spl.bin" > - offset = 8K > - size = 1016K # 1MB - 8KB > - } > - > - partition boot { > - partition-type-uuid = "F" > - bootable = "true" > - image = "boot.vfat" > - } > - > - # 'rootfs' will be used as the partition label, used > - # with root=PARTLABEL=rootfs kernel command line > - partition rootfs { > - partition-type-uuid = "L" > - image = "rootfs.ext4" > - size = 256M > - } > -} > diff --git a/configs/orangepi_zero_plus2_defconfig b/configs/orangepi_zero_plus2_defconfig > index 9d88b37ac9..ef171c3ad3 100644 > --- a/configs/orangepi_zero_plus2_defconfig > +++ b/configs/orangepi_zero_plus2_defconfig > @@ -27,9 +27,6 @@ BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > BR2_TARGET_UBOOT_SPL=y > BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" > BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null" > -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-plus2/boot.cmd" > > # Kernel > BR2_LINUX_KERNEL=y > @@ -40,6 +37,8 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-zero-plus2" > BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero-plus2/linux-extras.config" > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y > > # wireless firmware > BR2_PACKAGE_LINUX_FIRMWARE=y > @@ -58,8 +57,11 @@ 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 > + > +# host tools > BR2_PACKAGE_HOST_GENIMAGE=y > -BR2_PACKAGE_HOST_MTOOLS=y > + > +# image scripts > +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-plus2/genimage.cfg" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" From giulio.benetti at benettiengineering.com Sat Feb 26 10:52:48 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 26 Feb 2022 11:52:48 +0100 Subject: [Buildroot] [PATCH v2 2/6] board/orangepi/orangepi-pc-plus: switch to extlinux In-Reply-To: <20220225072622.3584480-3-geomatsi@gmail.com> References: <20220225072622.3584480-1-geomatsi@gmail.com> <20220225072622.3584480-3-geomatsi@gmail.com> Message-ID: Hi Sergey, On 25/02/22 08:26, Sergey Matyukevich wrote: > Switch to extlinux instead of U-Boot boot script. Drop custom > boot script and genimage config. Instead use common orangepi > files from board/orangepi/common. > > Signed-off-by: Sergey Matyukevich Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti [Giulio: build tested only] Best regards -- Giulio Benetti Benetti Engineering sas > --- > board/orangepi/orangepi-pc-plus/boot.cmd | 8 ---- > board/orangepi/orangepi-pc-plus/genimage.cfg | 43 -------------------- > configs/orangepi_pc_plus_defconfig | 9 ++-- > 3 files changed, 3 insertions(+), 57 deletions(-) > delete mode 100644 board/orangepi/orangepi-pc-plus/boot.cmd > delete mode 100644 board/orangepi/orangepi-pc-plus/genimage.cfg > > diff --git a/board/orangepi/orangepi-pc-plus/boot.cmd b/board/orangepi/orangepi-pc-plus/boot.cmd > deleted file mode 100644 > index c91f77942f..0000000000 > --- a/board/orangepi/orangepi-pc-plus/boot.cmd > +++ /dev/null > @@ -1,8 +0,0 @@ > -setenv fdt_high ffffffff > - > -setenv bootargs console=ttyS0,115200 earlyprintk root=PARTLABEL=rootfs rootwait > - > -fatload mmc 0 $kernel_addr_r zImage > -fatload mmc 0 $fdt_addr_r sun8i-h3-orangepi-pc-plus.dtb > - > -bootz $kernel_addr_r - $fdt_addr_r > diff --git a/board/orangepi/orangepi-pc-plus/genimage.cfg b/board/orangepi/orangepi-pc-plus/genimage.cfg > deleted file mode 100644 > index 3812d785d5..0000000000 > --- a/board/orangepi/orangepi-pc-plus/genimage.cfg > +++ /dev/null > @@ -1,43 +0,0 @@ > -# Minimal SD card image for the OrangePi PC Plus > -# > -image boot.vfat { > - vfat { > - files = { > - "zImage", > - "sun8i-h3-orangepi-pc-plus.dtb", > - "boot.scr" > - } > - } > - > - size = 10M > -} > - > -image sdcard.img { > - hdimage { > - # for root=PARTLABEL support > - partition-table-type = "gpt" > - # default GPT location conflicts with bootloaders, move it after > - gpt-location = 1M > - } > - > - partition u-boot { > - in-partition-table = "no" > - image = "u-boot-sunxi-with-spl.bin" > - offset = 8K > - size = 1016K # 1MB - 8KB > - } > - > - partition boot { > - partition-type-uuid = "F" > - bootable = "true" > - image = "boot.vfat" > - } > - > - # 'rootfs' will be used as the partition label, used > - # with root=PARTLABEL=rootfs kernel command line > - partition rootfs { > - partition-type-uuid = "L" > - image = "rootfs.ext4" > - size = 512M > - } > -} > diff --git a/configs/orangepi_pc_plus_defconfig b/configs/orangepi_pc_plus_defconfig > index c3ff8bc417..ba946e5285 100644 > --- a/configs/orangepi_pc_plus_defconfig > +++ b/configs/orangepi_pc_plus_defconfig > @@ -14,6 +14,7 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-pc-plus" > BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-pc-plus/linux-extras.config" > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > # BR2_TARGET_ROOTFS_TAR is not set > @@ -27,14 +28,10 @@ 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_BOOT_SCRIPT=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-pc-plus/boot.cmd" > -BR2_PACKAGE_HOST_DOSFSTOOLS=y > BR2_PACKAGE_HOST_GENIMAGE=y > -BR2_PACKAGE_HOST_MTOOLS=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS=y > +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-pc-plus/genimage.cfg" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" > > # wireless driver and firmware > BR2_PACKAGE_RTL8189FS=y From giulio.benetti at benettiengineering.com Sat Feb 26 10:53:01 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 26 Feb 2022 11:53:01 +0100 Subject: [Buildroot] [PATCH v2 3/6] board/orangepi/orangepi-one: switch to extlinux In-Reply-To: <20220225072622.3584480-4-geomatsi@gmail.com> References: <20220225072622.3584480-1-geomatsi@gmail.com> <20220225072622.3584480-4-geomatsi@gmail.com> Message-ID: Hi Sergey, On 25/02/22 08:26, Sergey Matyukevich wrote: > Switch to extlinux instead of U-Boot boot script. Drop custom > boot script and genimage config. Instead use common orangepi > files from board/orangepi/common. > > Signed-off-by: Sergey Matyukevich Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti [Giulio: build tested only] Best regards -- Giulio Benetti Benetti Engineering sas > --- > board/orangepi/orangepi-one/boot.cmd | 8 ----- > board/orangepi/orangepi-one/genimage.cfg | 37 ------------------------ > configs/orangepi_one_defconfig | 9 ++---- > 3 files changed, 3 insertions(+), 51 deletions(-) > delete mode 100644 board/orangepi/orangepi-one/boot.cmd > delete mode 100644 board/orangepi/orangepi-one/genimage.cfg > > diff --git a/board/orangepi/orangepi-one/boot.cmd b/board/orangepi/orangepi-one/boot.cmd > deleted file mode 100644 > index ab616e6ac9..0000000000 > --- a/board/orangepi/orangepi-one/boot.cmd > +++ /dev/null > @@ -1,8 +0,0 @@ > -setenv fdt_high ffffffff > - > -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait > - > -fatload mmc 0 $kernel_addr_r zImage > -fatload mmc 0 $fdt_addr_r sun8i-h3-orangepi-one.dtb > - > -bootz $kernel_addr_r - $fdt_addr_r > diff --git a/board/orangepi/orangepi-one/genimage.cfg b/board/orangepi/orangepi-one/genimage.cfg > deleted file mode 100644 > index 2a14dcdec2..0000000000 > --- a/board/orangepi/orangepi-one/genimage.cfg > +++ /dev/null > @@ -1,37 +0,0 @@ > -# Minimal SD card image for the OrangePi PC > -# > -image boot.vfat { > - vfat { > - files = { > - "zImage", > - "sun8i-h3-orangepi-one.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_one_defconfig b/configs/orangepi_one_defconfig > index 1a2772a307..ba128424a0 100644 > --- a/configs/orangepi_one_defconfig > +++ b/configs/orangepi_one_defconfig > @@ -12,6 +12,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="sunxi" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-one" > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > # BR2_TARGET_ROOTFS_TAR is not set > @@ -25,11 +26,7 @@ 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-one/boot.cmd" > -BR2_PACKAGE_HOST_DOSFSTOOLS=y > BR2_PACKAGE_HOST_GENIMAGE=y > -BR2_PACKAGE_HOST_MTOOLS=y > +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-one/genimage.cfg" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" From giulio.benetti at benettiengineering.com Sat Feb 26 10:53:12 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 26 Feb 2022 11:53:12 +0100 Subject: [Buildroot] [PATCH v2 4/6] board/linksprite/pcduino: switch to extlinux In-Reply-To: <20220225072622.3584480-5-geomatsi@gmail.com> References: <20220225072622.3584480-1-geomatsi@gmail.com> <20220225072622.3584480-5-geomatsi@gmail.com> Message-ID: <740a0d74-bbfd-d8a6-bd60-b92cc5005c6d@benettiengineering.com> Hi Sergey, On 25/02/22 08:26, Sergey Matyukevich wrote: > Switch to extlinux instead of U-Boot boot script. Drop custom > boot script and genimage config. Instead use common orangepi > files from board/orangepi/common. > > Signed-off-by: Sergey Matyukevich Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti [Giulio: build tested only] Best regards -- Giulio Benetti Benetti Engineering sas > --- > board/linksprite/pcduino/boot.cmd | 8 ----- > board/linksprite/pcduino/genimage.cfg | 43 -------------------------- > board/linksprite/pcduino/post-build.sh | 11 ------- > board/linksprite/pcduino/post-image.sh | 16 ---------- > configs/linksprite_pcduino_defconfig | 9 +++--- > 5 files changed, 4 insertions(+), 83 deletions(-) > delete mode 100644 board/linksprite/pcduino/boot.cmd > delete mode 100644 board/linksprite/pcduino/genimage.cfg > delete mode 100755 board/linksprite/pcduino/post-build.sh > delete mode 100755 board/linksprite/pcduino/post-image.sh > > diff --git a/board/linksprite/pcduino/boot.cmd b/board/linksprite/pcduino/boot.cmd > deleted file mode 100644 > index 0db8363599..0000000000 > --- a/board/linksprite/pcduino/boot.cmd > +++ /dev/null > @@ -1,8 +0,0 @@ > -setenv fdt_high ffffffff > - > -setenv bootargs console=ttyS0,115200 console=tty1 earlyprintk root=/dev/mmcblk0p2 rootwait panic=10 ${extra} > - > -fatload mmc 0 $kernel_addr_r zImage > -fatload mmc 0 $fdt_addr_r sun4i-a10-pcduino.dtb > - > -bootz $kernel_addr_r - $fdt_addr_r > diff --git a/board/linksprite/pcduino/genimage.cfg b/board/linksprite/pcduino/genimage.cfg > deleted file mode 100644 > index db33322118..0000000000 > --- a/board/linksprite/pcduino/genimage.cfg > +++ /dev/null > @@ -1,43 +0,0 @@ > -# > -# Minimal SD card image for the pcDuino > -# > - > -image boot.vfat { > - vfat { > - files = { > - "zImage", > - "sun4i-a10-pcduino.dtb", > - "boot.scr" > - } > - } > - > - size = 16M > -} > - > -# > -# Note: u-boot environment is stored between u-boot and boot partitions > -# > - > -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" > - offset = 1M > - } > - > - partition rootfs { > - partition-type = 0x83 > - image = "rootfs.ext4" > - } > -} > diff --git a/board/linksprite/pcduino/post-build.sh b/board/linksprite/pcduino/post-build.sh > deleted file mode 100755 > index e1e1877671..0000000000 > --- a/board/linksprite/pcduino/post-build.sh > +++ /dev/null > @@ -1,11 +0,0 @@ > -#!/bin/sh > -# post-build.sh for pcDuino taken from OrangePi post-build.sh > -# 2013, Carlo Caione > - > -BOARD_DIR="$(dirname $0)" > -MKIMAGE=$HOST_DIR/bin/mkimage > -BOOT_CMD=$BOARD_DIR/boot.cmd > -BOOT_CMD_H=$BINARIES_DIR/boot.scr > - > -# U-Boot script > -$MKIMAGE -C none -A arm -T script -d $BOOT_CMD $BOOT_CMD_H > diff --git a/board/linksprite/pcduino/post-image.sh b/board/linksprite/pcduino/post-image.sh > deleted file mode 100755 > index c82b189f9c..0000000000 > --- a/board/linksprite/pcduino/post-image.sh > +++ /dev/null > @@ -1,16 +0,0 @@ > -#!/bin/sh > - > -BOARD_DIR="$(dirname $0)" > -GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" > -GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" > - > -rm -rf "${GENIMAGE_TMP}" > - > -genimage \ > - --rootpath "${TARGET_DIR}" \ > - --tmppath "${GENIMAGE_TMP}" \ > - --inputpath "${BINARIES_DIR}" \ > - --outputpath "${BINARIES_DIR}" \ > - --config "${GENIMAGE_CFG}" > - > -exit $? > diff --git a/configs/linksprite_pcduino_defconfig b/configs/linksprite_pcduino_defconfig > index b58f970493..05b25aede4 100644 > --- a/configs/linksprite_pcduino_defconfig > +++ b/configs/linksprite_pcduino_defconfig > @@ -11,8 +11,9 @@ BR2_TARGET_GENERIC_GETTY=y > BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" > > # SD image scripts > -BR2_ROOTFS_POST_BUILD_SCRIPT="board/linksprite/pcduino/post-build.sh" > -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/linksprite/pcduino/post-image.sh" > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" > > # For kernel modules autoloading > BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y > @@ -29,6 +30,7 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun4i-a10-pcduino" > BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/linksprite/pcduino/linux-extras.config" > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > > # Filesystem > BR2_TARGET_ROOTFS_EXT2=y > @@ -49,10 +51,7 @@ BR2_TARGET_UBOOT_SPL=y > BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" > > # Host packages > -BR2_PACKAGE_HOST_DOSFSTOOLS=y > BR2_PACKAGE_HOST_GENIMAGE=y > -BR2_PACKAGE_HOST_MTOOLS=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS=y > > # Target packages: wireless support for pcduino-lite-wifi > BR2_PACKAGE_IW=y From giulio.benetti at benettiengineering.com Sat Feb 26 10:53:28 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 26 Feb 2022 11:53:28 +0100 Subject: [Buildroot] [PATCH v2 5/6] configs/linksprite_pcduino_defconfig: update Linux/U-Boot versions In-Reply-To: <20220225072622.3584480-6-geomatsi@gmail.com> References: <20220225072622.3584480-1-geomatsi@gmail.com> <20220225072622.3584480-6-geomatsi@gmail.com> Message-ID: <9e70bc4b-875c-a01a-1931-a5de940b18df@benettiengineering.com> Hi Sergey, On 25/02/22 08:26, Sergey Matyukevich wrote: > 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. > Drop redundant U-Boot options. > > Signed-off-by: Sergey Matyukevich Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti [Giulio: build tested only] Best regards -- Giulio Benetti Benetti Engineering sas > --- > configs/linksprite_pcduino_defconfig | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/configs/linksprite_pcduino_defconfig b/configs/linksprite_pcduino_defconfig > index 05b25aede4..806c4f0697 100644 > --- a/configs/linksprite_pcduino_defconfig > +++ b/configs/linksprite_pcduino_defconfig > @@ -19,12 +19,12 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" > BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y > > # Linux headers same as kernel, a 5.10 series > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.10" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16.1" > BR2_LINUX_KERNEL_DEFCONFIG="sunxi" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun4i-a10-pcduino" > @@ -40,13 +40,12 @@ 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="2020.10" > -BR2_TARGET_UBOOT_USE_DEFCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Linksprite_pcDuino" > 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_FORMAT_BIN=y > BR2_TARGET_UBOOT_SPL=y > BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" > From gilles.talis at gmail.com Sat Feb 26 14:04:52 2022 From: gilles.talis at gmail.com (Gilles Talis) Date: Sat, 26 Feb 2022 15:04:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/mariadb: fix mysql.service failing to create log directory In-Reply-To: <20220222213202.642708-1-ju.o@free.fr> References: <20220222213202.642708-1-ju.o@free.fr> Message-ID: Hi Julien, all, Le mar. 22 f?vr. 2022 ? 22:32, Julien Olivain a ?crit : > > When enabling MariaDB (BR2_PACKAGE_MARIADB=y) and systemd > (BR2_INIT_SYSTEMD=y) in buildroot, the mysqld.service fail to start > with a permission error. See output of command: > > journalctl --unit=mysqld > > Which shows: > > systemd[1]: Starting MySQL database server... > install[102]: install: can't create directory '/var/log/mysql': Permission denied > systemd[1]: mysqld.service: Control process exited, code=exited, status=1/FAILURE > > Since the service file includes the "User=mysql" directive, the > "ExecStartPre=" is executed as this user, which does not have > permission to create a directory in "/var/log". > > This commit fixes this issue by adding the "!" prefix, which will > execute the command with full privileges. See the systemd.service manual > page entry for "ExecStart=", table "Special executable prefixes": > https://www.freedesktop.org/software/systemd/man/systemd.service.html#ExecStart= > or https://github.com/systemd/systemd/blob/v250/man/systemd.service.xml#L339 > > Moreover, the "mysql_install_db" invocation does not need this special > prefix, as the "/var/lib/mysql" directory on target is already owned > by the "mysql" user. The "chown" command is also useless and is > removed in this commit. > > Reported-by: Gilles Talis > Signed-off-by: Julien Olivain > --- > package/mariadb/mysqld.service | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/mariadb/mysqld.service b/package/mariadb/mysqld.service > index d9ea74ebc3..537430e9a2 100644 > --- a/package/mariadb/mysqld.service > +++ b/package/mariadb/mysqld.service > @@ -2,8 +2,8 @@ > Description=MySQL database server > > [Service] > -ExecStartPre=/bin/sh -c 'test "`ls -1 /var/lib/mysql | wc -l`" != "0" || mysql_install_db --basedir=/usr --datadir=/var/lib/mysql && chown -R mysql:mysql /var/lib/mysql' > -ExecStartPre=install -d -o mysql -g root -m 0755 /var/log/mysql > +ExecStartPre=/bin/sh -c 'test "`ls -1 /var/lib/mysql | wc -l`" != "0" || mysql_install_db --basedir=/usr --datadir=/var/lib/mysql' > +ExecStartPre=!install -d -o mysql -g root -m 0755 /var/log/mysql > ExecStart=/usr/bin/mysqld_safe --log-error=/var/log/mysql/mysqld.log > Restart=always > User=mysql > -- > 2.35.1 > Thanks for the patch. Successfully tested on an aarch64 system. So, Tested-By: Gilles Talis thanks Gilles. From fontaine.fabrice at gmail.com Sat Feb 26 15:52:33 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 26 Feb 2022 16:52:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/frr: fix elf_py TLS section handling Message-ID: <20220226155233.2605318-1-fontaine.fabrice@gmail.com> Fix the following build failure raised on mipsel, or1k, powerpc raised since bump to version 8.1 in commit ca2753fd47d47e5ad0eec16ea62f7b7f096331b6: struct.error: unpack requires a buffer of 20 bytes Fixes: - http://autobuild.buildroot.org/results/74f39c6f14e3f60babdcabceb5e42656f69cdaa7 Signed-off-by: Fabrice Fontaine --- ...-lib-fix-elf_py-TLS-section-handling.patch | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 package/frr/0002-lib-fix-elf_py-TLS-section-handling.patch diff --git a/package/frr/0002-lib-fix-elf_py-TLS-section-handling.patch b/package/frr/0002-lib-fix-elf_py-TLS-section-handling.patch new file mode 100644 index 0000000000..d491cb1a7d --- /dev/null +++ b/package/frr/0002-lib-fix-elf_py-TLS-section-handling.patch @@ -0,0 +1,31 @@ +From 3942ee1f7bc754dd0dd9ae79f89d0f2635be334f Mon Sep 17 00:00:00 2001 +From: David Lamparter +Date: Wed, 10 Nov 2021 15:30:07 +0100 +Subject: [PATCH] lib: fix elf_py TLS section handling + +... need to ignore TLS sections, their address is effectively +meaningless but can overlap other sections we actually need to access. + +Signed-off-by: David Lamparter + +[Retrieved from: +https://github.com/FRRouting/frr/commit/3942ee1f7bc754dd0dd9ae79f89d0f2635be334f] +Signed-off-by: Fabrice Fontaine +--- + lib/elf_py.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/lib/elf_py.c b/lib/elf_py.c +index 1c306893ad8..f230add6957 100644 +--- a/lib/elf_py.c ++++ b/lib/elf_py.c +@@ -636,6 +636,9 @@ static Elf_Scn *elf_find_addr(struct elffile *ef, uint64_t addr, size_t *idx) + Elf_Scn *scn = elf_getscn(ef->elf, i); + GElf_Shdr _shdr, *shdr = gelf_getshdr(scn, &_shdr); + ++ /* virtual address is kinda meaningless for TLS sections */ ++ if (shdr->sh_flags & SHF_TLS) ++ continue; + if (addr < shdr->sh_addr || + addr >= shdr->sh_addr + shdr->sh_size) + continue; -- 2.34.1 From fontaine.fabrice at gmail.com Sat Feb 26 16:05:03 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 26 Feb 2022 17:05:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/libpjsip: security bump to version 2.12 Message-ID: <20220226160503.2703879-1-fontaine.fabrice@gmail.com> Fix the following security issues (i.e. CVE-2021-37706, CVE-2021-41141, CVE-2021-43804, CVE-2021-43845, CVE-2022-21722 and CVE-2022-21723): - Potential integer underflow upon receiving STUN message (GHSA-2qpg-f6wf-w984) - Use after free of dialog set (GHSA-ffff-m5fm-qm62) - Missing unreleased of locks in failure cases (GHSA-8fmx-hqw7-6gmc) - Potential out-of-bounds read when parsing RTCP BYE message (GHSA-3qx3-cg72-wrh9) - Prevent OOB read for RTCP XR block (GHSA-r374-qrwv-86hh) - Potential buffer overflow in pjsua_player_create(), pjsua_recorder_create(), pjmedia_wav_player_create(), and pjsua_call_dump() (GHSA-qcvw-h34v-c7r9) - Potential out-of-bound read during RTP/RTCP parsing (GHSA-m66q-q64c-hv36) - Prevent OOB read in multipart parsing (GHSA-7fw8-54cv-r7pm) - Use after free of dialog set (GHSA-ffff-m5fm-qm62) https://github.com/pjsip/pjproject/releases/tag/2.12 Signed-off-by: Fabrice Fontaine --- package/libpjsip/libpjsip.hash | 2 +- package/libpjsip/libpjsip.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libpjsip/libpjsip.hash b/package/libpjsip/libpjsip.hash index f39ebf4060..74331ab6fb 100644 --- a/package/libpjsip/libpjsip.hash +++ b/package/libpjsip/libpjsip.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 45f6604372df3f49293749cd7c0b42cb21c4fb666c66f8ed9765de004d1eae38 pjproject-2.11.1.tar.gz +sha256 b3b94d9be4aba8f6d2d1cb164603e81b0a6ee17352f9e2ba5b58e325e610ca5a pjproject-2.12.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk index b05cc31a83..32cfa8c53c 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -4,10 +4,10 @@ # ################################################################################ -LIBPJSIP_VERSION = 2.11.1 +LIBPJSIP_VERSION = 2.12 LIBPJSIP_SOURCE = pjproject-$(LIBPJSIP_VERSION).tar.gz LIBPJSIP_SITE = $(call github,pjsip,pjproject,$(LIBPJSIP_VERSION)) -# https://github.com/pjsip/pjproject/archive/2.11.1.tar.gz +# https://github.com/pjsip/pjproject/archive/2.12.tar.gz LIBPJSIP_DEPENDENCIES = libsrtp LIBPJSIP_LICENSE = GPL-2.0+ -- 2.34.1 From aperez at igalia.com Sat Feb 26 16:14:43 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Sat, 26 Feb 2022 18:14:43 +0200 Subject: [Buildroot] [PATCH/next v2 1/2] package/bubblewrap: bump to version 0.6.1 In-Reply-To: <20220224231609.1097793-1-aperez@igalia.com> References: <20220224231609.1097793-1-aperez@igalia.com> Message-ID: <20220226161444.2221042-1-aperez@igalia.com> This version includes a new feature which allows specifying multiple seccomp filters. There is now a Meson-based build system as well, but for the moment the build recipe keeps using the autotools based one. Release notes can be found at: https://github.com/containers/bubblewrap/releases/tag/v0.6.0 https://github.com/containers/bubblewrap/releases/tag/v0.6.1 Signed-off-by: Adrian Perez de Castro --- package/bubblewrap/bubblewrap.hash | 4 ++-- package/bubblewrap/bubblewrap.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/bubblewrap/bubblewrap.hash b/package/bubblewrap/bubblewrap.hash index 88aba150cd..c3bf4d8212 100644 --- a/package/bubblewrap/bubblewrap.hash +++ b/package/bubblewrap/bubblewrap.hash @@ -1,5 +1,5 @@ -# From https://github.com/containers/bubblewrap/releases/tag/v0.5.0 -sha256 16fdaf33799d63104e347e0133f909196fe90d0c50515d010bcb422eb5a00818 bubblewrap-0.5.0.tar.xz +# From https://github.com/containers/bubblewrap/releases/tag/v0.6.1 +sha256 9609c7dc162bc68abc29abfab566934fdca37520a15ed01b675adcf3a4303282 bubblewrap-0.6.1.tar.xz # Hash for license files: sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/bubblewrap/bubblewrap.mk b/package/bubblewrap/bubblewrap.mk index 5f3d95e826..1ca2029700 100644 --- a/package/bubblewrap/bubblewrap.mk +++ b/package/bubblewrap/bubblewrap.mk @@ -4,7 +4,7 @@ # ################################################################################ -BUBBLEWRAP_VERSION = 0.5.0 +BUBBLEWRAP_VERSION = 0.6.1 BUBBLEWRAP_SITE = https://github.com/containers/bubblewrap/releases/download/v$(BUBBLEWRAP_VERSION) BUBBLEWRAP_SOURCE = bubblewrap-$(BUBBLEWRAP_VERSION).tar.xz BUBBLEWRAP_DEPENDENCIES = host-pkgconf libcap -- 2.35.1 From aperez at igalia.com Sat Feb 26 16:14:44 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Sat, 26 Feb 2022 18:14:44 +0200 Subject: [Buildroot] [PATCH/next v2 2/2] package/bubblewrap: switch to the meson build system In-Reply-To: <20220224231609.1097793-1-aperez@igalia.com> References: <20220224231609.1097793-1-aperez@igalia.com> Message-ID: <20220226161444.2221042-2-aperez@igalia.com> Version 0.6.0 introduced a Meson build system, and upstream seems to have the intention to abandon the previous autotools based one. Switch to Meson for future proofing. Signed-off-by: Adrian Perez de Castro --- package/bubblewrap/bubblewrap.mk | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/package/bubblewrap/bubblewrap.mk b/package/bubblewrap/bubblewrap.mk index 1ca2029700..5875b0d6e2 100644 --- a/package/bubblewrap/bubblewrap.mk +++ b/package/bubblewrap/bubblewrap.mk @@ -14,22 +14,24 @@ BUBBLEWRAP_LICENSE_FILES = COPYING BUBBLEWRAP_CPE_ID_VENDOR = projectatomic BUBBLEWRAP_CONF_OPTS = \ - --enable-require-userns=no \ - --disable-man \ - --disable-sudo \ - --with-priv-mode=none + -Dzsh_completion=disabled \ + -Dman=disabled \ + -Dpython=$(HOST_DIR)/bin/python \ + -Drequire_userns=false ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y) -BUBBLEWRAP_CONF_OPTS += --with-bash-completion-dir=/usr/share/bash-completion/completions +BUBBLEWRAP_CONF_OPTS += \ + -Dbash_completion=enabled \ + -Dbash_completion_dir=/usr/share/bash-completion/completions else -BUBBLEWRAP_CONF_OPTS += --without-bash-completion-dir +BUBBLEWRAP_CONF_OPTS += -Dbash_completion=disabled endif ifeq ($(BR2_PACKAGE_LIBSELINUX),y) -BUBBLEWRAP_CONF_OPTS += --enable-selinux +BUBBLEWRAP_CONF_OPTS += -Dselinux=enabled BUBBLEWRAP_DEPENDENCIES += libselinux else -BUBBLEWRAP_CONF_OPTS += --disable-selinux +BUBBLEWRAP_CONF_OPTS += -Dselinux=disabled endif # We need to mark bwrap as setuid, in case the kernel @@ -38,4 +40,4 @@ define BUBBLEWRAP_PERMISSIONS /usr/bin/bwrap f 1755 0 0 - - - - - endef -$(eval $(autotools-package)) +$(eval $(meson-package)) -- 2.35.1 From fontaine.fabrice at gmail.com Sat Feb 26 18:10:45 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 26 Feb 2022 19:10:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/wireshark: security bump to version 3.4.12 Message-ID: <20220226181045.2922875-1-fontaine.fabrice@gmail.com> Fix CVE-2021-4190, CVE-2022-0581, CVE-2022-0582, CVE-2022-0583, CVE-2022-0585 and CVE-2022-0586 https://www.wireshark.org/security/wnpa-sec-2021-22.html https://www.wireshark.org/security/wnpa-sec-2022-01.html https://www.wireshark.org/security/wnpa-sec-2022-02.html https://www.wireshark.org/security/wnpa-sec-2022-03.html https://www.wireshark.org/security/wnpa-sec-2022-04.html https://www.wireshark.org/security/wnpa-sec-2022-05.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 7b67e316ed..db1f71e9ef 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.11.txt -sha1 b656d8709b8b0b3d2a94665af6bec88495ad994c wireshark-3.4.11.tar.xz -sha256 a0e227bce2cc3a51ef3301891a0243231990b52a39b68a84a6e32f69c4e75279 wireshark-3.4.11.tar.xz +# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.4.12.txt +sha1 91ca69b0029e58b9c824266237ab392a62f0a248 wireshark-3.4.12.tar.xz +sha256 881a13303e263b7dc7fe337534c8a541d4914552287879bed30bbe76c5bf68ca wireshark-3.4.12.tar.xz # Locally calculated sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf COPYING diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index 0361d0bb64..a5ca4b1f73 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 3.4.11 +WIRESHARK_VERSION = 3.4.12 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 fontaine.fabrice at gmail.com Sat Feb 26 18:15:08 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 26 Feb 2022 19:15:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/xterm: security bump to version 371 Message-ID: <20220226181508.3011361-1-fontaine.fabrice@gmail.com> Fix CVE-2022-24130: xterm through Patch 370, when Sixel support is enabled, allows attackers to trigger a buffer overflow in set_sixel in graphics_sixel.c via crafted text. Update hash of COPYING (update in year) https://invisible-island.net/xterm/xterm.log.html#xterm_371 Signed-off-by: Fabrice Fontaine --- package/xterm/xterm.hash | 4 ++-- package/xterm/xterm.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/xterm/xterm.hash b/package/xterm/xterm.hash index d6d80ad977..3f6ec765ce 100644 --- a/package/xterm/xterm.hash +++ b/package/xterm/xterm.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 27f1a8b1c756e269fd5684e60802b545f0be9b36b8b5d6bdbc840c6b000dc51f xterm-367.tgz +sha256 32f888277b19e28ebc0a3112bff000607c07bed0679caa0beebb36f9cad484f5 xterm-371.tgz # Locally calculated -sha256 dfb668cc977e24649500f3cc54de3e2b793928d210715a445ab1227930b07ba6 COPYING +sha256 9521ef761474cd31ea406f56a751646a7b42a9287cdc6f2f8e52ed4c4d2a73e7 COPYING diff --git a/package/xterm/xterm.mk b/package/xterm/xterm.mk index e09d350a7d..95984f1cf9 100644 --- a/package/xterm/xterm.mk +++ b/package/xterm/xterm.mk @@ -4,7 +4,7 @@ # ################################################################################ -XTERM_VERSION = 367 +XTERM_VERSION = 371 XTERM_SOURCE = xterm-$(XTERM_VERSION).tgz XTERM_SITE = http://invisible-mirror.net/archives/xterm XTERM_DEPENDENCIES = ncurses xlib_libXaw host-pkgconf -- 2.34.1 From fontaine.fabrice at gmail.com Sat Feb 26 18:17:47 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 26 Feb 2022 19:17:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/dbus: bump to version 1.12.22 Message-ID: <20220226181747.3033483-1-fontaine.fabrice@gmail.com> https://gitlab.freedesktop.org/dbus/dbus/-/blob/dbus-1.12.22/NEWS Signed-off-by: Fabrice Fontaine --- package/dbus/dbus.hash | 4 ++-- package/dbus/dbus.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/dbus/dbus.hash b/package/dbus/dbus.hash index 06512e5656..176396fe2f 100644 --- a/package/dbus/dbus.hash +++ b/package/dbus/dbus.hash @@ -1,7 +1,7 @@ # Locally calculated after checking pgp signature -# https://dbus.freedesktop.org/releases/dbus/dbus-1.12.20.tar.gz.asc +# https://dbus.freedesktop.org/releases/dbus/dbus-1.12.22.tar.gz.asc # using key 36EC5A6448A4F5EF79BEFE98E05AE1478F814C4F -sha256 f77620140ecb4cdc67f37fb444f8a6bea70b5b6461f12f1cbe2cec60fa7de5fe dbus-1.12.20.tar.gz +sha256 8d25785c798ec4f892e6f9d177fb0ceeb8b29867b119798f9d5228561d3ad474 dbus-1.12.22.tar.gz # Locally calculated sha256 0e46f54efb12d04ab5c33713bacd0e140c9a35b57ae29e03c853203266e8f3a1 COPYING diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index d78e102427..de447d8680 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -4,7 +4,7 @@ # ################################################################################ -DBUS_VERSION = 1.12.20 +DBUS_VERSION = 1.12.22 DBUS_SITE = https://dbus.freedesktop.org/releases/dbus DBUS_LICENSE = AFL-2.1 or GPL-2.0+ (library, tools), GPL-2.0+ (tools) DBUS_LICENSE_FILES = COPYING -- 2.34.1 From fontaine.fabrice at gmail.com Sat Feb 26 18:23:56 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 26 Feb 2022 19:23:56 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/cukinia: bump to version 0.6.0 Message-ID: <20220226182356.3035297-1-fontaine.fabrice@gmail.com> https://github.com/savoirfairelinux/cukinia/compare/v0.5.1...v0.6.0 Signed-off-by: Fabrice Fontaine --- package/cukinia/cukinia.hash | 2 +- package/cukinia/cukinia.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cukinia/cukinia.hash b/package/cukinia/cukinia.hash index e6ae602011..6e76a6ab88 100644 --- a/package/cukinia/cukinia.hash +++ b/package/cukinia/cukinia.hash @@ -1,4 +1,4 @@ # locally computed -sha256 b867ec63e448e7fa0a9276f6844a8b3a8f92d99e63e8518fe24e9debd32679b5 cukinia-0.5.1.tar.gz +sha256 79dc77c7b9f2784e7d22d961dd2c4ad9c78deebbc6e8f39df4fa214118682b40 cukinia-0.6.0.tar.gz sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPLv3 diff --git a/package/cukinia/cukinia.mk b/package/cukinia/cukinia.mk index 84d4e60ea8..798c199b67 100644 --- a/package/cukinia/cukinia.mk +++ b/package/cukinia/cukinia.mk @@ -4,7 +4,7 @@ # ################################################################################ -CUKINIA_VERSION = 0.5.1 +CUKINIA_VERSION = 0.6.0 CUKINIA_SITE = $(call github,savoirfairelinux,cukinia,v$(CUKINIA_VERSION)) CUKINIA_LICENSE = Apache-2.0 or GPL-3.0 CUKINIA_LICENSE_FILES = LICENSE LICENSE.GPLv3 -- 2.34.1 From fontaine.fabrice at gmail.com Sat Feb 26 18:34:23 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 26 Feb 2022 19:34:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/exempi: security bump to version 2.6.1 Message-ID: <20220226183423.3086505-1-fontaine.fabrice@gmail.com> Extract from NEWS: - Changes in v2021.08 - Security Fixes - Changes in v2021.07 - Security Fixes https://gitlab.freedesktop.org/libopenraw/exempi/-/blob/2.6.1/NEWS Signed-off-by: Fabrice Fontaine --- package/exempi/exempi.hash | 2 +- package/exempi/exempi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/exempi/exempi.hash b/package/exempi/exempi.hash index 5ea9683053..5df610de17 100644 --- a/package/exempi/exempi.hash +++ b/package/exempi/exempi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 52f54314aefd45945d47a6ecf4bd21f362e6467fa5d0538b0d45a06bc6eaaed5 exempi-2.5.2.tar.bz2 +sha256 072451ac1e0dc97ed69a2e5bfc235fd94fe093d837f65584d0e3581af5db18cd exempi-2.6.1.tar.bz2 sha256 3d3c3593c15e0d35bdae0df7c642106250f6be3adc61477419413900f23ae607 COPYING diff --git a/package/exempi/exempi.mk b/package/exempi/exempi.mk index f481469d2c..56fbe20379 100644 --- a/package/exempi/exempi.mk +++ b/package/exempi/exempi.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXEMPI_VERSION = 2.5.2 +EXEMPI_VERSION = 2.6.1 EXEMPI_SOURCE = exempi-$(EXEMPI_VERSION).tar.bz2 EXEMPI_SITE = https://libopenraw.freedesktop.org/download EXEMPI_INSTALL_STAGING = YES -- 2.34.1 From fontaine.fabrice at gmail.com Sat Feb 26 18:50:33 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 26 Feb 2022 19:50:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/wolfssl: security bump to version 5.2.0 Message-ID: <20220226185033.3097401-1-fontaine.fabrice@gmail.com> Fix CVE-2021-44718, CVE-2022-23408, CVE-2022-25638 and CVE-2022-25640 https://www.wolfssl.com/docs/security-vulnerabilities https://github.com/wolfSSL/wolfssl/blob/v5.2.0-stable/ChangeLog.md Signed-off-by: Fabrice Fontaine --- package/wolfssl/wolfssl.hash | 2 +- package/wolfssl/wolfssl.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/wolfssl/wolfssl.hash b/package/wolfssl/wolfssl.hash index 9896713ca7..63eebf93bb 100644 --- a/package/wolfssl/wolfssl.hash +++ b/package/wolfssl/wolfssl.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 50db45f348f47e00c93dd244c24108220120cb3cc9d01434789229c32937c444 wolfssl-4.8.1-stable.tar.gz +sha256 409b4646c5f54f642de0e9f3544c3b83de7238134f5b1ff93fb44527bf119d05 wolfssl-5.2.0.tar.gz # Hash for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/wolfssl/wolfssl.mk b/package/wolfssl/wolfssl.mk index d3dce0a401..bfb54445e4 100644 --- a/package/wolfssl/wolfssl.mk +++ b/package/wolfssl/wolfssl.mk @@ -4,8 +4,8 @@ # ################################################################################ -WOLFSSL_VERSION = 4.8.1-stable -WOLFSSL_SITE = $(call github,wolfSSL,wolfssl,v$(WOLFSSL_VERSION)) +WOLFSSL_VERSION = 5.2.0 +WOLFSSL_SITE = $(call github,wolfSSL,wolfssl,v$(WOLFSSL_VERSION)-stable) WOLFSSL_INSTALL_STAGING = YES WOLFSSL_LICENSE = GPL-2.0+ -- 2.34.1 From christian at paral.in Sat Feb 26 21:24:43 2022 From: christian at paral.in (Christian Stewart) Date: Sat, 26 Feb 2022 13:24:43 -0800 Subject: [Buildroot] [PATCH/next 1/1] package/balena-engine: bump to version 20.10.12 In-Reply-To: <20220226102418.943851-1-tianyuanhao3@163.com> References: <20220226102418.943851-1-tianyuanhao3@163.com> Message-ID: All, On Sat, Feb 26, 2022 at 2:26 AM TIAN Yuanhao wrote: > > Also: > - drop unused dependencies > - drop invalid tags > - drop the autogen step > - simplify kconfigs just to run hello-world > > https://github.com/balena-os/balena-engine/blob/v20.10.12/CHANGELOG.md > > Signed-off-by: TIAN Yuanhao > --- > package/balena-engine/Config.in | 1 - > package/balena-engine/balena-engine.hash | 2 +- > package/balena-engine/balena-engine.mk | 42 +++++------------------- > 3 files changed, 9 insertions(+), 36 deletions(-) > > diff --git a/package/balena-engine/Config.in b/package/balena-engine/Config.in > index f48f361dc2..02f694515e 100644 > --- a/package/balena-engine/Config.in > +++ b/package/balena-engine/Config.in > @@ -6,7 +6,6 @@ config BR2_PACKAGE_BALENA_ENGINE > depends on BR2_USE_MMU # util-linux > select BR2_PACKAGE_CGROUPFS_MOUNT if !BR2_PACKAGE_SYSTEMD # runtime > select BR2_PACKAGE_IPTABLES # runtime > - select BR2_PACKAGE_SQLITE # runtime > select BR2_PACKAGE_UTIL_LINUX # runtime > select BR2_PACKAGE_UTIL_LINUX_BINARIES # runtime > select BR2_PACKAGE_UTIL_LINUX_MOUNT # runtime > diff --git a/package/balena-engine/balena-engine.hash b/package/balena-engine/balena-engine.hash > index 3f632ef381..ef590881f5 100644 > --- a/package/balena-engine/balena-engine.hash > +++ b/package/balena-engine/balena-engine.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 389282706562118608b6ac580e7beacd6a43f0bb3481c69fb1856bed9ac49b85 balena-engine-19.03.14.tar.gz > +sha256 43f4c985b855a4f731a5cdac214f1adf6c4cc2021cbad3f93856009df246d61c balena-engine-20.10.12.tar.gz \ > $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_ADDRTYPE) > $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_CONNTRACK) > - $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_IPVS) > $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_IPTABLES) > $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_FILTER) > $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_NAT) > - $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_TARGET_MASQUERADE) > $(call KCONFIG_ENABLE_OPT,CONFIG_BRIDGE) > - $(call KCONFIG_ENABLE_OPT,CONFIG_DUMMY) > - $(call KCONFIG_ENABLE_OPT,CONFIG_MACVLAN) > - $(call KCONFIG_ENABLE_OPT,CONFIG_VXLAN) > $(call KCONFIG_ENABLE_OPT,CONFIG_VETH) > - $(call KCONFIG_ENABLE_OPT,CONFIG_OVERLAY_FS) > - $(call KCONFIG_ENABLE_OPT,CONFIG_KEYS) > endef > > define BALENA_ENGINE_INSTALL_SYMLINK > -- > 2.25.1 Reviewed-by: Christian Stewart Thanks! From fontaine.fabrice at gmail.com Sun Feb 27 09:11:40 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 27 Feb 2022 10:11:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/freerdp: fix build with libexecinfo Message-ID: <20220227091140.3643535-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-0/output-1/host/lib/gcc/riscv64-buildroot-linux-uclibc/10.3.0/../../../../riscv64-buildroot-linux-uclibc/bin/ld: ../../libwinpr/libwinpr2.so.2.5.0: undefined reference to `backtrace_symbols_fd' Fixes: - http://autobuild.buildroot.org/results/095c33098a6e59ff664080e03baf1a3c92b4265f Signed-off-by: Fabrice Fontaine --- package/freerdp/freerdp.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk index c536f6cb1c..5f6ae56d1d 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -43,6 +43,11 @@ else FREERDP_CONF_OPTS += -DWITH_ALSA=OFF endif +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +FREERDP_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-lexecinfo +FREERDP_DEPENDENCIES += libexecinfo +endif + ifeq ($(BR2_PACKAGE_LIBUSB),y) FREERDP_CONF_OPTS += -DCHANNEL_URBDRC=ON FREERDP_DEPENDENCIES += libusb -- 2.34.1 From fontaine.fabrice at gmail.com Sun Feb 27 09:15:33 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 27 Feb 2022 10:15:33 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/botan: bump to version 2.19.1 Message-ID: <20220227091533.3645027-1-fontaine.fabrice@gmail.com> - Drop patch (not needed since https://github.com/randombit/botan/commit/97483f93bdcfcb2cc86bcb103802be55c24ad633) - Update hash of license file (update in year: https://github.com/randombit/botan/commit/ff62a51ac2ed2e265edaf51b532d32eed5864d4b) https://github.com/randombit/botan/blob/2.19.1/news.rst Signed-off-by: Fabrice Fontaine --- ...d-a-miscompilation-issue-in-clang-12.patch | 144 ------------------ package/botan/botan.hash | 4 +- package/botan/botan.mk | 2 +- 3 files changed, 3 insertions(+), 147 deletions(-) delete mode 100644 package/botan/0001-Revert-workaround-a-miscompilation-issue-in-clang-12.patch diff --git a/package/botan/0001-Revert-workaround-a-miscompilation-issue-in-clang-12.patch b/package/botan/0001-Revert-workaround-a-miscompilation-issue-in-clang-12.patch deleted file mode 100644 index b43aeafe13..0000000000 --- a/package/botan/0001-Revert-workaround-a-miscompilation-issue-in-clang-12.patch +++ /dev/null @@ -1,144 +0,0 @@ -From 372bdf0348fb86d671e73baab19daa34bd0cf73d Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 9 Nov 2021 19:01:20 +0100 -Subject: [PATCH] Revert "workaround a miscompilation issue in clang 12 - (XCode 13)" - -This reverts commit 219329f8e777af54d785ae7259f8be32a714b751. - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/randombit/botan/issues/2845] ---- - src/lib/hash/sha3/sha3.cpp | 46 ++++++----------------- - src/lib/hash/sha3/sha3_bmi2/sha3_bmi2.cpp | 46 ++++++----------------- - 2 files changed, 22 insertions(+), 70 deletions(-) - -diff --git a/src/lib/hash/sha3/sha3.cpp b/src/lib/hash/sha3/sha3.cpp -index 289e451ff..690c2b264 100644 ---- a/src/lib/hash/sha3/sha3.cpp -+++ b/src/lib/hash/sha3/sha3.cpp -@@ -11,47 +11,23 @@ - #include - #include - --#include -- - namespace Botan { - - namespace { - --// This is a workaround for a suspected bug in clang 12 (and XCode 13) --// that caused a miscompile of the SHA3 implementation for optimization --// level -O2 and higher. --// --// For details, see: https://github.com/randombit/botan/issues/2802 --#if defined(__clang__) && \ -- (( defined(__apple_build_version__) && __clang_major__ == 13) || \ -- (!defined(__apple_build_version__) && __clang_major__ == 12)) --#define BOTAN_WORKAROUND_MAYBE_INLINE __attribute__((noinline)) --#else --#define BOTAN_WORKAROUND_MAYBE_INLINE inline --#endif -- --BOTAN_WORKAROUND_MAYBE_INLINE std::tuple -- xor_CNs(const uint64_t A[25]) -- { -- return { -- A[0] ^ A[5] ^ A[10] ^ A[15] ^ A[20], -- A[1] ^ A[6] ^ A[11] ^ A[16] ^ A[21], -- A[2] ^ A[7] ^ A[12] ^ A[17] ^ A[22], -- A[3] ^ A[8] ^ A[13] ^ A[18] ^ A[23], -- A[4] ^ A[9] ^ A[14] ^ A[19] ^ A[24]}; -- } -- --#undef BOTAN_WORKAROUND_MAYBE_INLINE -- - inline void SHA3_round(uint64_t T[25], const uint64_t A[25], uint64_t RC) - { -- const auto Cs = xor_CNs(A); -- -- const uint64_t D0 = rotl<1>(std::get<0>(Cs)) ^ std::get<3>(Cs); -- const uint64_t D1 = rotl<1>(std::get<1>(Cs)) ^ std::get<4>(Cs); -- const uint64_t D2 = rotl<1>(std::get<2>(Cs)) ^ std::get<0>(Cs); -- const uint64_t D3 = rotl<1>(std::get<3>(Cs)) ^ std::get<1>(Cs); -- const uint64_t D4 = rotl<1>(std::get<4>(Cs)) ^ std::get<2>(Cs); -+ const uint64_t C0 = A[0] ^ A[5] ^ A[10] ^ A[15] ^ A[20]; -+ const uint64_t C1 = A[1] ^ A[6] ^ A[11] ^ A[16] ^ A[21]; -+ const uint64_t C2 = A[2] ^ A[7] ^ A[12] ^ A[17] ^ A[22]; -+ const uint64_t C3 = A[3] ^ A[8] ^ A[13] ^ A[18] ^ A[23]; -+ const uint64_t C4 = A[4] ^ A[9] ^ A[14] ^ A[19] ^ A[24]; -+ -+ const uint64_t D0 = rotl<1>(C0) ^ C3; -+ const uint64_t D1 = rotl<1>(C1) ^ C4; -+ const uint64_t D2 = rotl<1>(C2) ^ C0; -+ const uint64_t D3 = rotl<1>(C3) ^ C1; -+ const uint64_t D4 = rotl<1>(C4) ^ C2; - - const uint64_t B00 = A[ 0] ^ D1; - const uint64_t B01 = rotl<44>(A[ 6] ^ D2); -diff --git a/src/lib/hash/sha3/sha3_bmi2/sha3_bmi2.cpp b/src/lib/hash/sha3/sha3_bmi2/sha3_bmi2.cpp -index c7f1914a3..a9650ad9d 100644 ---- a/src/lib/hash/sha3/sha3_bmi2/sha3_bmi2.cpp -+++ b/src/lib/hash/sha3/sha3_bmi2/sha3_bmi2.cpp -@@ -8,47 +8,23 @@ - #include - #include - --#include -- - namespace Botan { - - namespace { - --// This is a workaround for a suspected bug in clang 12 (and XCode 13) --// that caused a miscompile of the SHA3 implementation for optimization --// level -O2 and higher. --// --// For details, see: https://github.com/randombit/botan/issues/2802 --#if defined(__clang__) && \ -- (( defined(__apple_build_version__) && __clang_major__ == 13) || \ -- (!defined(__apple_build_version__) && __clang_major__ == 12)) --#define BOTAN_WORKAROUND_MAYBE_INLINE __attribute__((noinline)) --#else --#define BOTAN_WORKAROUND_MAYBE_INLINE inline --#endif -- --BOTAN_WORKAROUND_MAYBE_INLINE std::tuple -- xor_CNs(const uint64_t A[25]) -- { -- return { -- A[0] ^ A[5] ^ A[10] ^ A[15] ^ A[20], -- A[1] ^ A[6] ^ A[11] ^ A[16] ^ A[21], -- A[2] ^ A[7] ^ A[12] ^ A[17] ^ A[22], -- A[3] ^ A[8] ^ A[13] ^ A[18] ^ A[23], -- A[4] ^ A[9] ^ A[14] ^ A[19] ^ A[24]}; -- } -- --#undef BOTAN_WORKAROUND_MAYBE_INLINE -- - inline void SHA3_BMI2_round(uint64_t T[25], const uint64_t A[25], uint64_t RC) - { -- const auto Cs = xor_CNs(A); -- -- const uint64_t D0 = rotl<1>(std::get<0>(Cs)) ^ std::get<3>(Cs); -- const uint64_t D1 = rotl<1>(std::get<1>(Cs)) ^ std::get<4>(Cs); -- const uint64_t D2 = rotl<1>(std::get<2>(Cs)) ^ std::get<0>(Cs); -- const uint64_t D3 = rotl<1>(std::get<3>(Cs)) ^ std::get<1>(Cs); -- const uint64_t D4 = rotl<1>(std::get<4>(Cs)) ^ std::get<2>(Cs); -+ const uint64_t C0 = A[0] ^ A[5] ^ A[10] ^ A[15] ^ A[20]; -+ const uint64_t C1 = A[1] ^ A[6] ^ A[11] ^ A[16] ^ A[21]; -+ const uint64_t C2 = A[2] ^ A[7] ^ A[12] ^ A[17] ^ A[22]; -+ const uint64_t C3 = A[3] ^ A[8] ^ A[13] ^ A[18] ^ A[23]; -+ const uint64_t C4 = A[4] ^ A[9] ^ A[14] ^ A[19] ^ A[24]; -+ -+ const uint64_t D0 = rotl<1>(C0) ^ C3; -+ const uint64_t D1 = rotl<1>(C1) ^ C4; -+ const uint64_t D2 = rotl<1>(C2) ^ C0; -+ const uint64_t D3 = rotl<1>(C3) ^ C1; -+ const uint64_t D4 = rotl<1>(C4) ^ C2; - - const uint64_t B00 = A[ 0] ^ D1; - const uint64_t B01 = rotl<44>(A[ 6] ^ D2); --- -2.33.0 - diff --git a/package/botan/botan.hash b/package/botan/botan.hash index 91e1bf741a..2729cb493f 100644 --- a/package/botan/botan.hash +++ b/package/botan/botan.hash @@ -1,4 +1,4 @@ # From https://botan.randombit.net/releases/sha256sums.txt -sha256 541a3b13f1b9d30f977c6c1ae4c7bfdfda763cda6e44de807369dce79f42307e Botan-2.18.2.tar.xz +sha256 e26e00cfefda64082afdd540d3c537924f645d6a674afed2cd171005deff5560 Botan-2.19.1.tar.xz # Locally computed -sha256 fb7f0322d36fba55ca17d77bc203a9f09a40daa8a249b75cf8887aba36cec9d0 license.txt +sha256 472faf6d2231130382779f96de506be19296473750356449fc426ddc9cb03b50 license.txt diff --git a/package/botan/botan.mk b/package/botan/botan.mk index ebff1343b1..f9ebcf8d0a 100644 --- a/package/botan/botan.mk +++ b/package/botan/botan.mk @@ -4,7 +4,7 @@ # ################################################################################ -BOTAN_VERSION = 2.18.2 +BOTAN_VERSION = 2.19.1 BOTAN_SOURCE = Botan-$(BOTAN_VERSION).tar.xz BOTAN_SITE = http://botan.randombit.net/releases BOTAN_LICENSE = BSD-2-Clause -- 2.34.1 From fontaine.fabrice at gmail.com Sun Feb 27 10:01:04 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 27 Feb 2022 11:01:04 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/libsecret: bump to version 0.20.5 Message-ID: <20220227100104.3694504-1-fontaine.fabrice@gmail.com> - Switch to meson-package - Add bash-completion and tpm2-tss optional dependencies https://gitlab.gnome.org/GNOME/libsecret/-/tags/0.20.5 Signed-off-by: Fabrice Fontaine --- package/libsecret/libsecret.hash | 4 ++-- package/libsecret/libsecret.mk | 36 +++++++++++++++++++++----------- 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/package/libsecret/libsecret.hash b/package/libsecret/libsecret.hash index 792ec838e3..4eb3d9b95c 100644 --- a/package/libsecret/libsecret.hash +++ b/package/libsecret/libsecret.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/libsecret/0.20/libsecret-0.20.4.sha256sum -sha256 325a4c54db320c406711bf2b55e5cb5b6c29823426aa82596a907595abb39d28 libsecret-0.20.4.tar.xz +# From https://download.gnome.org/sources/libsecret/0.20/libsecret-0.20.5.sha256sum +sha256 3fb3ce340fcd7db54d87c893e69bfc2b1f6e4d4b279065ffe66dac9f0fd12b4d libsecret-0.20.5.tar.xz # Hash for license file: sha256 a1a33180d02960ab1c5de36cf20b1a2f0fe9888d83826ad263da5db52f1b183b COPYING diff --git a/package/libsecret/libsecret.mk b/package/libsecret/libsecret.mk index 4d14c231d7..82fe38ac1a 100644 --- a/package/libsecret/libsecret.mk +++ b/package/libsecret/libsecret.mk @@ -5,33 +5,45 @@ ################################################################################ LIBSECRET_VERSION_MAJOR = 0.20 -LIBSECRET_VERSION = $(LIBSECRET_VERSION_MAJOR).4 +LIBSECRET_VERSION = $(LIBSECRET_VERSION_MAJOR).5 LIBSECRET_SITE = http://ftp.gnome.org/pub/GNOME/sources/libsecret/$(LIBSECRET_VERSION_MAJOR) LIBSECRET_SOURCE = libsecret-$(LIBSECRET_VERSION).tar.xz LIBSECRET_INSTALL_STAGING = YES LIBSECRET_DEPENDENCIES = libglib2 $(TARGET_NLS_DEPENDENCIES) -LIBSECRET_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) +LIBSECRET_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) LIBSECRET_CONF_OPTS = \ - --disable-manpages \ - --disable-strict \ - --disable-coverage \ - --enable-vala=no + -Dgtk_doc=false \ + -Dmanpage=false \ + -Dvapi=false LIBSECRET_LICENSE = LGPL-2.1+ LIBSECRET_LICENSE_FILES = COPYING +ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y) +LIBSECRET_CONF_OPTS += -Dbash_completion=enabled +LIBSECRET_DEPENDENCIES += bash-completion +else +LIBSECRET_CONF_OPTS += -Dbash_completion=disabled +endif + ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) -LIBSECRET_CONF_OPTS += --enable-introspection=yes +LIBSECRET_CONF_OPTS += -Dintrospection=true LIBSECRET_DEPENDENCIES += gobject-introspection else -LIBSECRET_CONF_OPTS += --enable-introspection=no +LIBSECRET_CONF_OPTS += -Dintrospection=false endif ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) LIBSECRET_DEPENDENCIES += libgcrypt -LIBSECRET_CONF_OPTS += --enable-gcrypt \ - --with-libgcrypt-prefix=$(STAGING_DIR)/usr +LIBSECRET_CONF_OPTS += -Dgcrypt=true +else +LIBSECRET_CONF_OPTS += -Dgcrypt=false +endif + +ifeq ($(BR2_PACKAGE_TPM2_TSS),y) +LIBSECRET_CONF_OPTS += -Dtpm2=true +LIBSECRET_DEPENDENCIES += tpm2-tss else -LIBSECRET_CONF_OPTS += --disable-gcrypt +LIBSECRET_CONF_OPTS += -Dtpm2=false endif -$(eval $(autotools-package)) +$(eval $(meson-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Sun Feb 27 10:10:03 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 27 Feb 2022 11:10:03 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/ocrad: bump to version 0.28 Message-ID: <20220227101003.3702134-1-fontaine.fabrice@gmail.com> - Add libpng mandatory dependency - Update indentation in hash file (two spaces) Signed-off-by: Fabrice Fontaine --- package/ocrad/Config.in | 1 + package/ocrad/ocrad.hash | 4 ++-- package/ocrad/ocrad.mk | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/ocrad/Config.in b/package/ocrad/Config.in index 38d37c612a..b6c4300f86 100644 --- a/package/ocrad/Config.in +++ b/package/ocrad/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_OCRAD bool "ocrad" depends on BR2_INSTALL_LIBSTDCPP + select BR2_PACKAGE_LIBPNG help GNU Ocrad is an OCR (Optical Character Recognition) program based on a feature extraction method. diff --git a/package/ocrad/ocrad.hash b/package/ocrad/ocrad.hash index 7ae38c30e8..cd5b0039ea 100644 --- a/package/ocrad/ocrad.hash +++ b/package/ocrad/ocrad.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 a9bfe67e9a040907aff5640dca56392476b6a89e48e37dc94ba846c5b6733b36 ocrad-0.27.tar.lz -sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef COPYING +sha256 34ccea576dbdadaa5979e6202344c3ff68737d829ca7b66f71c8497d36bbbf2e ocrad-0.28.tar.lz +sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef COPYING diff --git a/package/ocrad/ocrad.mk b/package/ocrad/ocrad.mk index e037a08195..982bb002c9 100644 --- a/package/ocrad/ocrad.mk +++ b/package/ocrad/ocrad.mk @@ -4,12 +4,13 @@ # ################################################################################ -OCRAD_VERSION = 0.27 +OCRAD_VERSION = 0.28 OCRAD_SOURCE = ocrad-$(OCRAD_VERSION).tar.lz OCRAD_SITE = $(BR2_GNU_MIRROR)/ocrad OCRAD_LICENSE = GPL-3.0+ OCRAD_LICENSE_FILES = COPYING OCRAD_INSTALL_STAGING = YES +OCRAD_DEPENDENCIES = libpng # This is not a true autotools package. define OCRAD_CONFIGURE_CMDS -- 2.34.1 From fontaine.fabrice at gmail.com Sun Feb 27 10:35:27 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 27 Feb 2022 11:35:27 +0100 Subject: [Buildroot] [PATCH/next 1/2] package/valijson: drop boost dependency Message-ID: <20220227103528.3888282-1-fontaine.fabrice@gmail.com> boost is not mandatory since the deactivation of tests when bumping to version 0.2.0 in commit d8e2876104be3f9f01613b17d3e60120883be1a1 and https://github.com/tristanpenman/valijson/commit/1844241d2a2379bca79a0d654f4b007209b10883 Signed-off-by: Fabrice Fontaine --- package/valijson/Config.in | 8 ++------ package/valijson/valijson.mk | 1 - 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/package/valijson/Config.in b/package/valijson/Config.in index 10721b3703..07706cd963 100644 --- a/package/valijson/Config.in +++ b/package/valijson/Config.in @@ -1,10 +1,6 @@ config BR2_PACKAGE_VALIJSON bool "valijson" - depends on BR2_USE_WCHAR depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_BOOST - select BR2_PACKAGE_BOOST_REGEX help Valijson is a header-only JSON Schema Validation library for C++. Valijson provides a simple validation API that allows @@ -14,5 +10,5 @@ config BR2_PACKAGE_VALIJSON https://github.com/tristanpenman/valijson -comment "valijson needs a toolchain w/ C++, threads, wchar support" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR +comment "valijson needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/valijson/valijson.mk b/package/valijson/valijson.mk index e425757d26..71c5b05f2b 100644 --- a/package/valijson/valijson.mk +++ b/package/valijson/valijson.mk @@ -11,7 +11,6 @@ VALIJSON_LICENSE_FILES = LICENSE VALIJSON_CPE_ID_VENDOR = valijson_project VALIJSON_INSTALL_STAGING = YES VALIJSON_INSTALL_TARGET = NO -VALIJSON_DEPENDENCIES = boost VALIJSON_CONF_OPTS = -Dvalijson_INSTALL_HEADERS=TRUE -Dvalijson_BUILD_TESTS=FALSE $(eval $(cmake-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Sun Feb 27 10:35:28 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 27 Feb 2022 11:35:28 +0100 Subject: [Buildroot] [PATCH/next 2/2] package/valijson: bump to version 0.6 In-Reply-To: <20220227103528.3888282-1-fontaine.fabrice@gmail.com> References: <20220227103528.3888282-1-fontaine.fabrice@gmail.com> Message-ID: <20220227103528.3888282-2-fontaine.fabrice@gmail.com> https://github.com/tristanpenman/valijson/releases/tag/v0.6 https://github.com/tristanpenman/valijson/releases/tag/v0.5 https://github.com/tristanpenman/valijson/releases/tag/v0.4 Signed-off-by: Fabrice Fontaine --- package/valijson/valijson.hash | 2 +- package/valijson/valijson.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/valijson/valijson.hash b/package/valijson/valijson.hash index e184ccb7c0..0aab93dd2a 100644 --- a/package/valijson/valijson.hash +++ b/package/valijson/valijson.hash @@ -1,3 +1,3 @@ # Locally Computed: -sha256 2ac881a36f90810b41b66511502dea1e7886137ad31bcfb4e917d929c5028c35 valijson-0.3.tar.gz +sha256 e06bf78fc1d26d4956fabc182408ebbbc47e3a6699778cda4aa439c2a6110b09 valijson-0.6.tar.gz sha256 1a0f99926a2dbec30eba3db820236d9953fbe3048976923ac24980e655fbe991 LICENSE diff --git a/package/valijson/valijson.mk b/package/valijson/valijson.mk index 71c5b05f2b..4b1f722f77 100644 --- a/package/valijson/valijson.mk +++ b/package/valijson/valijson.mk @@ -4,7 +4,7 @@ # ################################################################################ -VALIJSON_VERSION = 0.3 +VALIJSON_VERSION = 0.6 VALIJSON_SITE = $(call github,tristanpenman,valijson,v$(VALIJSON_VERSION)) VALIJSON_LICENSE = BSD-2-Clause VALIJSON_LICENSE_FILES = LICENSE -- 2.34.1 From peter at korsgaard.com Sun Feb 27 17:28:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 18:28:42 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/go: security bump to 1.17.7 Message-ID: <20220227172057.3F81382DF0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=beb91a11f70421218930c31cffb801d25a9a266a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x go1.17.7 includes security fixes to the crypto/elliptic, math/big packages and to the go command, as well as bug fixes to the compiler, linker, runtime, the go command, and the debug/macho, debug/pe, and net/http/httptest packages. https://github.com/golang/go/issues?q=milestone%3AGo1.17.7+label%3ACherryPickApproved Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard (cherry picked from commit 362b2822eea66b0775d9eba94d22c85939d2c8c9) 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 9111c8c9aa..fdf342e602 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://golang.org/dl/ -sha256 4dc1bbf3ff61f0c1ff2b19355e6d88151a70126268a47c761477686ef94748c8 go1.17.6.src.tar.gz +sha256 c108cd33b73b1911a02b697741df3dea43e01a5c4e08e409e8b3a0e3745d2b4d go1.17.7.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 062bec378c..56a21dfe55 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.17.6 +GO_VERSION = 1.17.7 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From peter at korsgaard.com Sun Feb 27 17:33:18 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 18:33:18 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/go: security bump to 1.16.14 Message-ID: <20220227172612.C6A4B82E00@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b7ed73bcda079346fb1858d4f8e8e5c193b5d517 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x go1.16.14 includes security fixes to the crypto/elliptic, math/big packages and to the go command, as well as bug fixes to the compiler, linker, runtime, the go command, and the debug/macho, debug/pe, net/http/httptest, and testing packages. 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 7071fcd99d..b4d4e05e3c 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://golang.org/dl/ -sha256 b0926654eaeb01ef43816638f42d7b1681f2d3f41b9559f07735522b7afad41a go1.16.13.src.tar.gz +sha256 467898cd3a216de54dcb9014f541efe77e9b79a7154dbc1fd2dd778b0c63fb56 go1.16.14.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index cac83c65ff..cc57d0d86d 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.16.13 +GO_VERSION = 1.16.14 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From peter at korsgaard.com Sun Feb 27 17:35:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 18:35:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/go: security bump to 1.17.7 In-Reply-To: <877da1sr8x.fsf@dell.be.48ers.dk> (Peter Korsgaard's message of "Fri, 11 Feb 2022 10:10:38 +0100") References: <20220210235906.23355-1-christian@paral.in> <877da1sr8x.fsf@dell.be.48ers.dk> Message-ID: <87czj843i1.fsf@dell.be.48ers.dk> >>>>> "Christian" == Christian Stewart writes: >> go1.17.7 includes security fixes to the crypto/elliptic, math/big packages and >> to the go command, as well as bug fixes to the compiler, linker, runtime, the go >> command, and the debug/macho, debug/pe, and net/http/httptest packages. >> https://github.com/golang/go/issues?q=milestone%3AGo1.17.7+label%3ACherryPickApproved >> Signed-off-by: Christian Stewart Committed to 2021.11.x, thanks. For 2021.02.x I will instead bump to 1.16.14. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 27 17:37:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 18:37:49 +0100 Subject: [Buildroot] [PATCH] docs/manual/adding-packages-generic: remove useless carriage return In-Reply-To: <20220211052629.2289507-1-giulio.benetti@benettiengineering.com> (Giulio Benetti's message of "Fri, 11 Feb 2022 06:26:29 +0100") References: <20220211052629.2289507-1-giulio.benetti@benettiengineering.com> Message-ID: <878rtw43de.fsf@dell.be.48ers.dk> >>>>> "Giulio" == Giulio Benetti writes: > Signed-off-by: Giulio Benetti Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 27 17:41:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 18:41:10 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/casync: fix zstd dependency to correct package name Message-ID: <20220227173324.80EBE813A8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1b949740731be09fba6c1c5a90a07ecf68ede60e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Nuno Goncalves Signed-off-by: Peter Korsgaard (cherry picked from commit 807bf505f42997f98f8acb7c7046ca5f97df08bb) Signed-off-by: Peter Korsgaard --- package/casync/casync.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/casync/casync.mk b/package/casync/casync.mk index d74cb1bfe8..bb9bd8ccac 100644 --- a/package/casync/casync.mk +++ b/package/casync/casync.mk @@ -40,8 +40,8 @@ else CASYNC_CONF_OPTS += -Dudev=false endif -ifeq ($(BR2_PACKAGE_LIBZSTD),y) -CASYNC_DEPENDENCIES += libzstd +ifeq ($(BR2_PACKAGE_ZSTD),y) +CASYNC_DEPENDENCIES += zstd CASYNC_CONF_OPTS += -Dlibzstd=enabled else CASYNC_CONF_OPTS += -Dlibzstd=disabled From peter at korsgaard.com Sun Feb 27 17:37:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 18:37:19 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] docs/manual/adding-packages-generic: remove useless carriage return Message-ID: <20220227173324.78B7C83235@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b52ed0eaf493393d1646756f5b1ace27c18f9df6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard (cherry picked from commit a3529b8020a8c8b61d9eadc455f38ce892a7c6f3) Signed-off-by: Peter Korsgaard --- docs/manual/adding-packages-generic.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt index 2201d4385e..0ae401de98 100644 --- a/docs/manual/adding-packages-generic.txt +++ b/docs/manual/adding-packages-generic.txt @@ -314,8 +314,7 @@ not and can not work as people would expect it should: 13:45+01" see "man cvs" for further details). ** +git+ for retrieving source code from a Git repository. Used by default when +LIBFOO_SITE+ begins with +git://+. The downloaded - source code is cached as with the +svn+ - method. + source code is cached as with the +svn+ method. ** +hg+ for retrieving source code from a Mercurial repository. One 'must' specify +LIBFOO_SITE_METHOD=hg+ when +LIBFOO_SITE+ contains a Mercurial repository URL. The downloaded source code From peter at korsgaard.com Sun Feb 27 17:41:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 18:41:24 +0100 Subject: [Buildroot] [PATCH] package/casync: fix zstd dependency to correct package name In-Reply-To: ("Nuno =?utf-8?Q?Gon=C3=A7alves=22's?= message of "Fri, 11 Feb 2022 18:22:03 +0000") References: Message-ID: <874k4k437f.fsf@dell.be.48ers.dk> >>>>> "Nuno" == Nuno Gon?alves writes: > Signed-off-by: Nuno Goncalves Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 27 17:40:59 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 18:40:59 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/casync: fix zstd dependency to correct package name Message-ID: <20220227173329.39530832D1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=953e0595f8f1e6a1c94d612dcde0027f89014692 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Nuno Goncalves Signed-off-by: Peter Korsgaard (cherry picked from commit 807bf505f42997f98f8acb7c7046ca5f97df08bb) Signed-off-by: Peter Korsgaard --- package/casync/casync.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/casync/casync.mk b/package/casync/casync.mk index d74cb1bfe8..bb9bd8ccac 100644 --- a/package/casync/casync.mk +++ b/package/casync/casync.mk @@ -40,8 +40,8 @@ else CASYNC_CONF_OPTS += -Dudev=false endif -ifeq ($(BR2_PACKAGE_LIBZSTD),y) -CASYNC_DEPENDENCIES += libzstd +ifeq ($(BR2_PACKAGE_ZSTD),y) +CASYNC_DEPENDENCIES += zstd CASYNC_CONF_OPTS += -Dlibzstd=enabled else CASYNC_CONF_OPTS += -Dlibzstd=disabled From peter at korsgaard.com Sun Feb 27 17:37:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 18:37:26 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] docs/manual/adding-packages-generic: remove useless carriage return Message-ID: <20220227173329.2D6D583235@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=49d3d2eea1238c369574e7f15d84698e7328f4fe branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard (cherry picked from commit a3529b8020a8c8b61d9eadc455f38ce892a7c6f3) Signed-off-by: Peter Korsgaard --- docs/manual/adding-packages-generic.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt index 2d8a1a71ce..1416aaa75b 100644 --- a/docs/manual/adding-packages-generic.txt +++ b/docs/manual/adding-packages-generic.txt @@ -314,8 +314,7 @@ not and can not work as people would expect it should: 13:45+01" see "man cvs" for further details). ** +git+ for retrieving source code from a Git repository. Used by default when +LIBFOO_SITE+ begins with +git://+. The downloaded - source code is cached as with the +svn+ - method. + source code is cached as with the +svn+ method. ** +hg+ for retrieving source code from a Mercurial repository. One 'must' specify +LIBFOO_SITE_METHOD=hg+ when +LIBFOO_SITE+ contains a Mercurial repository URL. The downloaded source code From peter at korsgaard.com Sun Feb 27 17:51:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 18:51:34 +0100 Subject: [Buildroot] [PATCH 1/2] package/thermald: update URL in the docs In-Reply-To: <20220131024451.2580165-1-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 30 Jan 2022 23:44:50 -0300") References: <20220131024451.2580165-1-ricardo.martincoski@gmail.com> Message-ID: <87zgmc2o61.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Old project homepage was removed, so switch to github, already in use to > download the sources. > Signed-off-by: Ricardo Martincoski > --- > This commit can be backported to maintenance branches Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 27 17:51:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 18:51:07 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/thermald: update URL in the docs Message-ID: <20220227174413.EC86382DFE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1a3eb64243d45ab457d3a1a44ed30517125f260c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Old project homepage was removed, so switch to github, already in use to download the sources. Signed-off-by: Ricardo Martincoski Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 1ddced072abefa001a10df56b9820e96db1b2b6f) Signed-off-by: Peter Korsgaard --- package/thermald/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/thermald/Config.in b/package/thermald/Config.in index f32a4b274e..8950e939b3 100644 --- a/package/thermald/Config.in +++ b/package/thermald/Config.in @@ -14,7 +14,7 @@ config BR2_PACKAGE_THERMALD reaches a certain threshold, the Linux daemon activates various cooling methods to try to cool the system. - https://01.org/linux-thermal-daemon + https://github.com/intel/thermal_daemon comment "thermald needs a toolchain w/ C++, wchar, threads" depends on BR2_i386 || BR2_x86_64 From peter at korsgaard.com Sun Feb 27 17:50:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 18:50:56 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/thermald: update URL in the docs Message-ID: <20220227174419.A74D182DFE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d5658ab951023d3f2a9a8bdd34de19a41e087bd1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Old project homepage was removed, so switch to github, already in use to download the sources. Signed-off-by: Ricardo Martincoski Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 1ddced072abefa001a10df56b9820e96db1b2b6f) Signed-off-by: Peter Korsgaard --- package/thermald/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/thermald/Config.in b/package/thermald/Config.in index f32a4b274e..8950e939b3 100644 --- a/package/thermald/Config.in +++ b/package/thermald/Config.in @@ -14,7 +14,7 @@ config BR2_PACKAGE_THERMALD reaches a certain threshold, the Linux daemon activates various cooling methods to try to cool the system. - https://01.org/linux-thermal-daemon + https://github.com/intel/thermal_daemon comment "thermald needs a toolchain w/ C++, wchar, threads" depends on BR2_i386 || BR2_x86_64 From peter at korsgaard.com Sun Feb 27 19:16:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:16:51 +0100 Subject: [Buildroot] [PATCH 1/1] linux: build after wireless-regdb if enabled for early loading support In-Reply-To: <20220131202151.937124-1-joerg.krause@embedded.rocks> (=?utf-8?Q?=22J=C3=B6rg?= Krause"'s message of "Mon, 31 Jan 2022 20:21:51 +0000") References: <20220131202151.937124-1-joerg.krause@embedded.rocks> Message-ID: <87v8x02k7w.fsf@dell.be.48ers.dk> >>>>> "J?rg" == J?rg Krause writes: > 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 Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 27 19:24:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:24:33 +0100 Subject: [Buildroot] [PATCH 1/2 v2] boot/uboot: fix build with host-gcc 10+ In-Reply-To: <79dd83642a7b1964ed69d74c4b0f93eada940a4e.1643665029.git.yann.morin.1998@free.fr> (Yann E. MORIN's message of "Mon, 31 Jan 2022 22:38:08 +0100") References: <79dd83642a7b1964ed69d74c4b0f93eada940a4e.1643665029.git.yann.morin.1998@free.fr> Message-ID: <87r17o2jv2.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > 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) Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 27 19:24:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:24:39 +0100 Subject: [Buildroot] [PATCH 2/2 v2] linux: fix build with host-gcc 10+ In-Reply-To: (Yann E. MORIN's message of "Mon, 31 Jan 2022 22:38:09 +0100") References: Message-ID: <87mtic2juw.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > 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) Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 27 19:19:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:19:38 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] linux: build after wireless-regdb if enabled for early loading support Message-ID: <20220227191953.DAA8B82E00@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=56ad2d9976da18da554eef71580417a08a62615f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x 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. The dependency is harmless if CONFIG_EXTRA_FIRMWARE isn't actually set. Signed-off-by: J??rg Krause Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit de0f5ba17a15a87bc16a6d6aa318104510c38f9d) Signed-off-by: Peter Korsgaard --- linux/linux.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/linux/linux.mk b/linux/linux.mk index adde7a2c1d..db0c311adf 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -78,7 +78,8 @@ LINUX_MAKE_ENV = \ LINUX_INSTALL_IMAGES = YES LINUX_DEPENDENCIES = host-kmod \ - $(if $(BR2_PACKAGE_INTEL_MICROCODE),intel-microcode) + $(if $(BR2_PACKAGE_INTEL_MICROCODE),intel-microcode) \ + $(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 From peter at korsgaard.com Sun Feb 27 19:22:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:22:26 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] linux: fix build with host-gcc 10+ Message-ID: <20220227191953.EA8E5835F9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2b3e41c8e3163f3ce5c6589283c19a5e3aea28ec branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x 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 Linux 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) Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 9b41b54be07711c10ad13ce157be272ed1cf402e) Signed-off-by: Peter Korsgaard --- linux/linux.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/linux/linux.mk b/linux/linux.mk index db0c311adf..490f87ee66 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -266,6 +266,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 peter at korsgaard.com Sun Feb 27 19:22:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:22:22 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] boot/uboot: fix build with host-gcc 10+ Message-ID: <20220227191953.E1F9181D49@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6db9ca0c34bdfcd33b5921c363b57cec0f465893 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x 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) Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 3b3859cc7df8edce10e5b4dad9005bd05342c8c3) Signed-off-by: Peter Korsgaard --- boot/uboot/uboot.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index ec2114c584..9f409583ab 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -209,6 +209,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) From peter at korsgaard.com Sun Feb 27 19:16:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:16:39 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] linux: build after wireless-regdb if enabled for early loading support Message-ID: <20220227192002.6D9888212C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e91440b904a6bae850a503f0938f833a5691d951 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x 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. The dependency is harmless if CONFIG_EXTRA_FIRMWARE isn't actually set. Signed-off-by: J??rg Krause Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit de0f5ba17a15a87bc16a6d6aa318104510c38f9d) Signed-off-by: Peter Korsgaard --- linux/linux.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/linux/linux.mk b/linux/linux.mk index b047061c3d..960a4ebd63 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 From peter at korsgaard.com Sun Feb 27 19:22:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:22:15 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] linux: fix build with host-gcc 10+ Message-ID: <20220227192002.7D577835F9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9ca49fba1a45ca1f7d9aa22ec005f6056d1d9af5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x 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 Linux 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) Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 9b41b54be07711c10ad13ce157be272ed1cf402e) Signed-off-by: Peter Korsgaard --- linux/linux.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/linux/linux.mk b/linux/linux.mk index 960a4ebd63..7eacb22998 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -260,6 +260,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 peter at korsgaard.com Sun Feb 27 19:22:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:22:05 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] boot/uboot: fix build with host-gcc 10+ Message-ID: <20220227192002.755708349D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=701ce0ad69580854076df85eaa1b8db3da51e20f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x 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) Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 3b3859cc7df8edce10e5b4dad9005bd05342c8c3) Signed-off-by: Peter Korsgaard --- boot/uboot/uboot.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 9661f901ea..0765e66c4a 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -238,6 +238,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) From peter at korsgaard.com Sun Feb 27 19:45:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:45:20 +0100 Subject: [Buildroot] [git commit] package/util-linux: improve host build failure fix In-Reply-To: <20220212215455.A6588825B3@busybox.osuosl.org> (Arnout Vandecappelle's message of "Sat, 12 Feb 2022 23:01:45 +0100") References: <20220212215455.A6588825B3@busybox.osuosl.org> Message-ID: <87ilt02iwf.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) writes: > commit: https://git.buildroot.net/buildroot/commit/?id=498117df1261c582ca70851c8a4f58db95632f2c > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > As suggested by Peter Seiderer package util-linux doesn't need raw support > when built for host, so let's remove: > HOST_UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE > in favor of: > HOST_UTIL_LINUX_CONF_OPTS += --disable-raw > This is a better approach than my commit: > https://git.buildroot.net/buildroot/commit/?id=d895bd973b35fde10d3dd7db530d9e4782926497 > Suggested-by: Peter Seiderer > Tested-by: Peter Seiderer > Reviewed-by: Peter Seiderer > Signed-off-by: Giulio Benetti > 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 Sun Feb 27 19:34:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:34:38 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/util-linux/util-linux-libs: add a missing patch Message-ID: <20220227193728.3DABF83611@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b7179080ca9b0d9c7f8933050325bb4a5d13123b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.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 Sun Feb 27 19:34:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:34:00 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/util-linux: fix build with headers < 3.14 Message-ID: <20220227193728.2B4E1836B3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=67d948e4a21126e0321bad8b2713e0db255b330d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix the following build failure raised since bump to version 2.37.2 in commit 27a46793b1a0c6c13c00b07d07bd5743e2c9c7b6 and the addition of uclampset in https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/commit/?id=9dd95bea42a3b467c1f773fd2e781cc9f0d88847: checking for syscall sched_setattr... no configure: WARNING: Unable to detect syscall sched_setattr. checking for syscall sched_setattr... (cached) no configure: WARNING: Unable to detect syscall sched_setattr. configure: error: uclampset selected but sched_setattr syscall not found Fix this build failure by adding a dependency on headers >= 3.14 for scheduling utilities: https://github.com/torvalds/linux/commit/e6cfc0295c7d51b008999a8b13a44fb43f8685ea Fixes: - http://autobuild.buildroot.org/results/9fe26ab98c93b67f937293f28625843da7ccb77f Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 2033992ac079c38ed3c2d38eb693d345fb0d5c89) Signed-off-by: Peter Korsgaard --- package/linux-tools/Config.in | 6 ++++-- package/util-linux/Config.in | 6 +++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/package/linux-tools/Config.in b/package/linux-tools/Config.in index ceb58c668a..f459b41762 100644 --- a/package/linux-tools/Config.in +++ b/package/linux-tools/Config.in @@ -83,6 +83,7 @@ config BR2_PACKAGE_LINUX_TOOLS_SELFTESTS depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # bash depends on BR2_USE_MMU # bash depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 # util-linux schedutils select BR2_PACKAGE_LINUX_TOOLS select BR2_PACKAGE_BASH # runtime select BR2_PACKAGE_NCURSES @@ -104,9 +105,10 @@ config BR2_PACKAGE_LINUX_TOOLS_SELFTESTS This is very much a use at your risk option and may not work for every setup or every architecture. -comment "selftests needs BR2_PACKAGE_BUSYBOX_SHOW_OTHERS and a toolchain w/ dynamic library" +comment "selftests needs BR2_PACKAGE_BUSYBOX_SHOW_OTHERS and a toolchain w/ dynamic library and headers >= 3.14" depends on BR2_USE_MMU - depends on !BR2_PACKAGE_BUSYBOX_SHOW_OTHERS || BR2_STATIC_LIBS + depends on !BR2_PACKAGE_BUSYBOX_SHOW_OTHERS || \ + BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 config BR2_PACKAGE_LINUX_TOOLS_TMON bool "tmon" diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in index 1f33eb5514..1dc00d21d9 100644 --- a/package/util-linux/Config.in +++ b/package/util-linux/Config.in @@ -326,8 +326,12 @@ comment "runuser needs a uClibc or glibc toolchain w/ wchar, locale, dynamic lib config BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS bool "scheduling utilities" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 help - Scheduling utilities (chrt, ionice, taskset) + Scheduling utilities (chrt, ionice, taskset, uclampset) + +comment "scheduling utilities need a toolchain w/ headers >= 3.14" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 config BR2_PACKAGE_UTIL_LINUX_SETPRIV bool "setpriv" From peter at korsgaard.com Sun Feb 27 19:34:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:34:50 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/util-linux: bump version to 2.37.3 (fixes CVE-2021-3996, CVE-2021-3995) Message-ID: <20220227193728.45A23836B3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=307f91968d2b7e7c6f005326e23664939e1600df branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x - add 'touch' workaround for missing disk-utils/raw.8 file ([1], [2]) in util-linux-2.37.3 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 [Arnout: put fix in POST_PATCH instead of PRE_COMPILE hook] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit b292f1d41a8734b6cdcbcf2ae726b51f9e1338a9) Signed-off-by: Peter Korsgaard --- 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..e59ef7dadc 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) @@ -35,6 +35,13 @@ UTIL_LINUX_CONF_OPTS += \ UTIL_LINUX_LINK_LIBS = $(TARGET_NLS_LIBS) +# workaround missing disk-utils/raw.8 file in util-linux-2.37.3 +# release download package +define UTIL_LINUX_FIX_DISK_UTILS_COMPILE + touch $(@D)/disk-utils/raw.8 +endef +UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE + HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf # We also don't want the host-python dependency From peter at korsgaard.com Sun Feb 27 19:33:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:33:22 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/util-linux: fix libuuid build Message-ID: <20220227193728.21FFE83611@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=757a02e0498f349f9bb5bd1be274c9599418c402 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix the following build failure raised since bump to version 2.37.2 in commit 27a46793b1a0c6c13c00b07d07bd5743e2c9c7b6 and https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/commit/?id=33b09aebf505acfbbb2137319093fbb9ed7eea7d libuuid/src/unparse.c:42:73: error: expected ';', ',' or ')' before 'fmt' static void uuid_fmt(const uuid_t uuid, char *buf, char const *restrict fmt) ^ Fixes: - http://autobuild.buildroot.org/results/b931a34a47e5faf8ae48fce079747dea0db2563a Signed-off-by: Fabrice Fontaine [yann.morin.1998 at free.fr: use symlink for util-linux-libs patch] Signed-off-by: Yann E. MORIN (cherry picked from commit 1b4fc24d656e157b03bd9ef844320ea99494bafe) Signed-off-by: Peter Korsgaard --- ...uid-include-c-h-to-cover-restrict-keyword.patch | 30 ++++++++++++++++++++++ ...uid-include-c-h-to-cover-restrict-keyword.patch | 1 + 2 files changed, 31 insertions(+) diff --git a/package/util-linux/0001-libuuid-include-c-h-to-cover-restrict-keyword.patch b/package/util-linux/0001-libuuid-include-c-h-to-cover-restrict-keyword.patch new file mode 100644 index 0000000000..3b4f510920 --- /dev/null +++ b/package/util-linux/0001-libuuid-include-c-h-to-cover-restrict-keyword.patch @@ -0,0 +1,30 @@ +From 5f9b88f43ba7f98f81bde3538d5f4e5cd1a6c01c Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Thu, 5 Aug 2021 09:46:21 +0200 +Subject: libuuid: include c.h to cover restrict keyword + +References: https://github.com/karelzak/util-linux/issues/1405 +Signed-off-by: Karel Zak + +[Retrieved from: +https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/commit/?id=5f9b88f43ba7f98f81bde3538d5f4e5cd1a6c01c] +Signed-off-by: Fabrice Fontaine +--- + libuuid/src/unparse.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libuuid/src/unparse.c b/libuuid/src/unparse.c +index f9a5e4315..ffeed2ed6 100644 +--- a/libuuid/src/unparse.c ++++ b/libuuid/src/unparse.c +@@ -33,6 +33,7 @@ + */ + + #include ++#include "c.h" + + #include "uuidP.h" + +-- +cgit 1.2.3-1.el7 + diff --git a/package/util-linux/util-linux-libs/0001-libuuid-include-c-h-to-cover-restrict-keyword.patch b/package/util-linux/util-linux-libs/0001-libuuid-include-c-h-to-cover-restrict-keyword.patch new file mode 120000 index 0000000000..beecc3a48f --- /dev/null +++ b/package/util-linux/util-linux-libs/0001-libuuid-include-c-h-to-cover-restrict-keyword.patch @@ -0,0 +1 @@ +../0001-libuuid-include-c-h-to-cover-restrict-keyword.patch \ No newline at end of file From peter at korsgaard.com Sun Feb 27 19:31:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:31:56 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/util-linux: bump to version 2.37.2 Message-ID: <20220227193728.18A84827CC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b5db0f1921c6bd722e8ad0e66b050bedab7167c9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fixes CVE-2021-37600 (although the CVE is disputed). Signed-off-by: Adam Duskett [yann.morin.1998 at free.fr: add reference to the CVE] Signed-off-by: Yann E. MORIN (cherry picked from commit 27a46793b1a0c6c13c00b07d07bd5743e2c9c7b6) Signed-off-by: Peter Korsgaard --- package/util-linux/util-linux.hash | 4 ++-- package/util-linux/util-linux.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/util-linux/util-linux.hash b/package/util-linux/util-linux.hash index 3f9fe39818..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.36/sha256sums.asc -sha256 f7516ba9d8689343594356f0e5e1a5f0da34adfbc89023437735872bb5024c5f util-linux-2.36.2.tar.xz +# From https://www.kernel.org/pub/linux/utils/util-linux/v2.37/sha256sums.asc +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 4bc7a11294..cf0fee409b 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -7,7 +7,7 @@ # When making changes to this file, please check if # util-linux-libs/util-linux-libs.mk needs to be updated accordingly as well. -UTIL_LINUX_VERSION_MAJOR = 2.36 +UTIL_LINUX_VERSION_MAJOR = 2.37 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 peter at korsgaard.com Sun Feb 27 19:35:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:35:00 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/util-linux: fix host build failure Message-ID: <20220227193728.4E7F3827CC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=af705b14a91b2c025d36e77f2f876abc3602835d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x The UTIL_LINUX_FIX_DISK_UTILS_COMPILE workaround is needed for host building too. So let's add it to HOST_UTIL_LINUX_POST_PATCH_HOOKS. host-util-linux is used a lot, so this patch fixes a lot of future builds. Fixes: http://autobuild.buildroot.net/results/b8c/b8cb40efc036a01802c914544cd4fc29dfd67af6// Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit d895bd973b35fde10d3dd7db530d9e4782926497) Signed-off-by: Peter Korsgaard --- package/util-linux/util-linux.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index e59ef7dadc..5a4ff64d01 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -41,6 +41,7 @@ define UTIL_LINUX_FIX_DISK_UTILS_COMPILE touch $(@D)/disk-utils/raw.8 endef UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE +HOST_UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf From peter at korsgaard.com Sun Feb 27 19:35:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:35:08 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/util-linux: improve host build failure fix Message-ID: <20220227193728.56241827CC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=baf475e84743d2f97b657e220f9bff10f3ee4c70 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x As suggested by Peter Seiderer package util-linux doesn't need raw support when built for host, so let's remove: HOST_UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE in favor of: HOST_UTIL_LINUX_CONF_OPTS += --disable-raw This is a better approach than my commit: https://git.buildroot.net/buildroot/commit/?id=d895bd973b35fde10d3dd7db530d9e4782926497 Suggested-by: Peter Seiderer Tested-by: Peter Seiderer Reviewed-by: Peter Seiderer Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 498117df1261c582ca70851c8a4f58db95632f2c) Signed-off-by: Peter Korsgaard --- package/util-linux/util-linux.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 5a4ff64d01..40fd518a58 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -41,7 +41,6 @@ define UTIL_LINUX_FIX_DISK_UTILS_COMPILE touch $(@D)/disk-utils/raw.8 endef UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE -HOST_UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf @@ -202,6 +201,11 @@ HOST_UTIL_LINUX_CONF_OPTS += \ --without-ncursesw \ --without-tinfo +# Disable raw command since starting from version 2.37 needs a +# work-around to build but in the end we don't need at all. +HOST_UTIL_LINUX_CONF_OPTS += \ + --disable-raw + ifeq ($(BR2_PACKAGE_HOST_UTIL_LINUX),y) HOST_UTIL_LINUX_CONF_OPTS += --disable-makeinstall-chown # disable commands that have ncurses dependency, as well as From peter at korsgaard.com Sun Feb 27 19:34:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:34:24 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/util-linux: fix mount -a Message-ID: <20220227193728.34582827CC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=477fa607517c892e21e5d667457276a250d12819 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fixes: - https://bugs.buildroot.org/show_bug.cgi?id=14351 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 2f5068640161f7b267099e28b69d4c2280b4ded3) Signed-off-by: Peter Korsgaard --- ...mark-cache-as-probed-if-sys-not-available.patch | 141 +++++++++++++++++++++ 1 file changed, 141 insertions(+) diff --git a/package/util-linux/0002-libblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch b/package/util-linux/0002-libblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch new file mode 100644 index 0000000000..bfc8f60834 --- /dev/null +++ b/package/util-linux/0002-libblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch @@ -0,0 +1,141 @@ +From 84d38ae3eca523ef990cb848563cc63de25266e6 Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Fri, 19 Nov 2021 14:19:03 +0100 +Subject: [PATCH] libblkid: don't mark cache as "probed" if /sys not available + +For "mount --all" we need to read the cache more than once in a short +time. The library checks the delay between probes, and if the delay is +too short, it does not read devices. This is a problem on boot when there +are no /sys, and the cache is empty. In this case, we need to check +for /sys until it's available constantly. + +https://github.com/util-linux/util-linux/issues/1492 +Signed-off-by: Karel Zak + +[Retrieved from: +https://github.com/util-linux/util-linux/commit/84d38ae3eca523ef990cb848563cc63de25266e6] +Signed-off-by: Fabrice Fontaine +--- + libblkid/src/devname.c | 26 +++++++++++++++++--------- + libblkid/src/resolve.c | 2 +- + libblkid/src/tag.c | 8 +++++--- + 3 files changed, 23 insertions(+), 13 deletions(-) + +diff --git a/libblkid/src/devname.c b/libblkid/src/devname.c +index 90a8245fc9..9a173e3489 100644 +--- a/libblkid/src/devname.c ++++ b/libblkid/src/devname.c +@@ -429,6 +429,8 @@ sysfs_probe_all(blkid_cache cache, int only_if_new, int only_removable) + if (!sysfs) + return -BLKID_ERR_SYSFS; + ++ DBG(DEVNAME, ul_debug(" probe /sys/block")); ++ + /* scan /sys/block */ + while ((dev = xreaddir(sysfs))) { + DIR *dir = NULL; +@@ -533,14 +535,18 @@ sysfs_probe_all(blkid_cache cache, int only_if_new, int only_removable) + /* + * Read the device data for all available block devices in the system. + */ +-static int probe_all(blkid_cache cache, int only_if_new) ++static int probe_all(blkid_cache cache, int only_if_new, int update_interval) + { ++ int rc; ++ + if (!cache) + return -BLKID_ERR_PARAM; + + if (cache->bic_flags & BLKID_BIC_FL_PROBED && +- time(NULL) - cache->bic_time < BLKID_PROBE_INTERVAL) ++ time(NULL) - cache->bic_time < BLKID_PROBE_INTERVAL) { ++ DBG(PROBE, ul_debug("don't re-probe [delay < %d]", BLKID_PROBE_INTERVAL)); + return 0; ++ } + + blkid_read_cache(cache); + #ifdef VG_DIR +@@ -548,7 +554,13 @@ static int probe_all(blkid_cache cache, int only_if_new) + #endif + ubi_probe_all(cache, only_if_new); + +- sysfs_probe_all(cache, only_if_new, 0); ++ rc = sysfs_probe_all(cache, only_if_new, 0); ++ ++ /* Don't mark the change as "probed" if /sys not avalable */ ++ if (update_interval && rc == 0) { ++ cache->bic_time = time(NULL); ++ cache->bic_flags |= BLKID_BIC_FL_PROBED; ++ } + + blkid_flush_cache(cache); + return 0; +@@ -567,11 +579,7 @@ int blkid_probe_all(blkid_cache cache) + int ret; + + DBG(PROBE, ul_debug("Begin blkid_probe_all()")); +- ret = probe_all(cache, 0); +- if (ret == 0) { +- cache->bic_time = time(NULL); +- cache->bic_flags |= BLKID_BIC_FL_PROBED; +- } ++ ret = probe_all(cache, 0, 1); + DBG(PROBE, ul_debug("End blkid_probe_all() [rc=%d]", ret)); + return ret; + } +@@ -589,7 +597,7 @@ int blkid_probe_all_new(blkid_cache cache) + int ret; + + DBG(PROBE, ul_debug("Begin blkid_probe_all_new()")); +- ret = probe_all(cache, 1); ++ ret = probe_all(cache, 1, 0); + DBG(PROBE, ul_debug("End blkid_probe_all_new() [rc=%d]", ret)); + return ret; + } +diff --git a/libblkid/src/resolve.c b/libblkid/src/resolve.c +index 641b022860..16653fa8e1 100644 +--- a/libblkid/src/resolve.c ++++ b/libblkid/src/resolve.c +@@ -32,7 +32,7 @@ char *blkid_get_tag_value(blkid_cache cache, const char *tagname, + blkid_cache c = cache; + char *ret = NULL; + +- DBG(TAG, ul_debug("looking for %s on %s", tagname, devname)); ++ DBG(TAG, ul_debug("looking for tag %s on %s device", tagname, devname)); + + if (!devname) + return NULL; +diff --git a/libblkid/src/tag.c b/libblkid/src/tag.c +index 390a648648..178336505f 100644 +--- a/libblkid/src/tag.c ++++ b/libblkid/src/tag.c +@@ -326,14 +326,14 @@ blkid_dev blkid_find_dev_with_tag(blkid_cache cache, + blkid_dev dev; + int pri; + struct list_head *p; +- int probe_new = 0; ++ int probe_new = 0, probe_all = 0; + + if (!cache || !type || !value) + return NULL; + + blkid_read_cache(cache); + +- DBG(TAG, ul_debug("looking for %s=%s in cache", type, value)); ++ DBG(TAG, ul_debug("looking for tag %s=%s in cache", type, value)); + + try_again: + pri = -1; +@@ -366,9 +366,11 @@ blkid_dev blkid_find_dev_with_tag(blkid_cache cache, + goto try_again; + } + +- if (!dev && !(cache->bic_flags & BLKID_BIC_FL_PROBED)) { ++ if (!dev && !probe_all ++ && !(cache->bic_flags & BLKID_BIC_FL_PROBED)) { + if (blkid_probe_all(cache) < 0) + return NULL; ++ probe_all++; + goto try_again; + } + return dev; From peter at korsgaard.com Sun Feb 27 19:29:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:29:58 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/util-linux: fix host build failure Message-ID: <20220227193733.4787283611@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f34fcc03cf5e401f8f8ccd7a433e87e0e875880a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x The UTIL_LINUX_FIX_DISK_UTILS_COMPILE workaround is needed for host building too. So let's add it to HOST_UTIL_LINUX_POST_PATCH_HOOKS. host-util-linux is used a lot, so this patch fixes a lot of future builds. Fixes: http://autobuild.buildroot.net/results/b8c/b8cb40efc036a01802c914544cd4fc29dfd67af6// Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit d895bd973b35fde10d3dd7db530d9e4782926497) Signed-off-by: Peter Korsgaard --- package/util-linux/util-linux.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index e59ef7dadc..5a4ff64d01 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -41,6 +41,7 @@ define UTIL_LINUX_FIX_DISK_UTILS_COMPILE touch $(@D)/disk-utils/raw.8 endef UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE +HOST_UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf From peter at korsgaard.com Sun Feb 27 19:29:48 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:29:48 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/util-linux: bump version to 2.37.3 (fixes CVE-2021-3996, CVE-2021-3995) Message-ID: <20220227193733.3F9B5827CC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8c97451ab93a90313ca97b87183632d22b00ffae branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x - add 'touch' workaround for missing disk-utils/raw.8 file ([1], [2]) in util-linux-2.37.3 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 [Arnout: put fix in POST_PATCH instead of PRE_COMPILE hook] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit b292f1d41a8734b6cdcbcf2ae726b51f9e1338a9) Signed-off-by: Peter Korsgaard --- 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..e59ef7dadc 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) @@ -35,6 +35,13 @@ UTIL_LINUX_CONF_OPTS += \ UTIL_LINUX_LINK_LIBS = $(TARGET_NLS_LIBS) +# workaround missing disk-utils/raw.8 file in util-linux-2.37.3 +# release download package +define UTIL_LINUX_FIX_DISK_UTILS_COMPILE + touch $(@D)/disk-utils/raw.8 +endef +UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE + HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf # We also don't want the host-python dependency From peter at korsgaard.com Sun Feb 27 19:30:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:30:07 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/util-linux: improve host build failure fix Message-ID: <20220227193733.4F566836B3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3e7238e9d132cc8e048dea3e31744a044836f128 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x As suggested by Peter Seiderer package util-linux doesn't need raw support when built for host, so let's remove: HOST_UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE in favor of: HOST_UTIL_LINUX_CONF_OPTS += --disable-raw This is a better approach than my commit: https://git.buildroot.net/buildroot/commit/?id=d895bd973b35fde10d3dd7db530d9e4782926497 Suggested-by: Peter Seiderer Tested-by: Peter Seiderer Reviewed-by: Peter Seiderer Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 498117df1261c582ca70851c8a4f58db95632f2c) Signed-off-by: Peter Korsgaard --- package/util-linux/util-linux.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 5a4ff64d01..40fd518a58 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -41,7 +41,6 @@ define UTIL_LINUX_FIX_DISK_UTILS_COMPILE touch $(@D)/disk-utils/raw.8 endef UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE -HOST_UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf @@ -202,6 +201,11 @@ HOST_UTIL_LINUX_CONF_OPTS += \ --without-ncursesw \ --without-tinfo +# Disable raw command since starting from version 2.37 needs a +# work-around to build but in the end we don't need at all. +HOST_UTIL_LINUX_CONF_OPTS += \ + --disable-raw + ifeq ($(BR2_PACKAGE_HOST_UTIL_LINUX),y) HOST_UTIL_LINUX_CONF_OPTS += --disable-makeinstall-chown # disable commands that have ncurses dependency, as well as From peter at korsgaard.com Sun Feb 27 19:52:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:52:36 +0100 Subject: [Buildroot] [PATCH 2/2] DEVELOPERS: add Giulio Benetti to cryptsetup package In-Reply-To: <20220201173352.160244-2-giulio.benetti@benettiengineering.com> (Giulio Benetti's message of "Tue, 1 Feb 2022 18:33:52 +0100") References: <20220201173352.160244-1-giulio.benetti@benettiengineering.com> <20220201173352.160244-2-giulio.benetti@benettiengineering.com> Message-ID: <87ee3o2ikb.fsf@dell.be.48ers.dk> >>>>> "Giulio" == Giulio Benetti writes: > Signed-off-by: Giulio Benetti Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 27 19:53:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:53:24 +0100 Subject: [Buildroot] [PATCH] DEVELOPERS: remove Martin Hicks from file In-Reply-To: <20220201174202.286878-1-giulio.benetti@benettiengineering.com> (Giulio Benetti's message of "Tue, 1 Feb 2022 18:42:02 +0100") References: <20220201174202.286878-1-giulio.benetti@benettiengineering.com> Message-ID: <87a6ec2iiz.fsf@dell.be.48ers.dk> >>>>> "Giulio" == Giulio Benetti writes: > Martin Hicks asked to not maintain cryptsetup anymore: > https://lists.buildroot.org/pipermail/buildroot/2022-February/635413.html > Also he doesn't mantain any other package, so let's remove him from this > file. > Signed-off-by: Giulio Benetti Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From nunojpg at gmail.com Sun Feb 27 19:54:14 2022 From: nunojpg at gmail.com (=?UTF-8?Q?Nuno_Gon=C3=A7alves?=) Date: Sun, 27 Feb 2022 19:54:14 +0000 Subject: [Buildroot] [PATCH] package/rauc: only install systemd service if built with dbus/service support Message-ID: The systemd service will try to call rauc in service mode, so it is useless and will fail if rauc does not have such support Signed-off-by: Nuno Gon?alves --- package/rauc/rauc.mk | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/package/rauc/rauc.mk b/package/rauc/rauc.mk index 39f5255812..d29ef66046 100644 --- a/package/rauc/rauc.mk +++ b/package/rauc/rauc.mk @@ -15,6 +15,15 @@ RAUC_DEPENDENCIES = host-pkgconf openssl libglib2 ifeq ($(BR2_PACKAGE_RAUC_DBUS),y) RAUC_CONF_OPTS += --enable-service RAUC_DEPENDENCIES += dbus +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +# configure uses pkg-config --variable=systemdsystemunitdir systemd +RAUC_DEPENDENCIES += systemd +define RAUC_INSTALL_INIT_SYSTEMD + mkdir -p $(TARGET_DIR)/usr/lib/systemd/system/rauc.service.d + printf '[Install]\nWantedBy=multi-user.target\n' \ + >$(TARGET_DIR)/usr/lib/systemd/system/rauc.service.d/buildroot-enable.conf +endef +endif else RAUC_CONF_OPTS += --disable-service endif @@ -33,17 +42,6 @@ else RAUC_CONF_OPTS += --disable-json endif -ifeq ($(BR2_PACKAGE_SYSTEMD),y) -# configure uses pkg-config --variable=systemdsystemunitdir systemd -RAUC_DEPENDENCIES += systemd -endif - -define RAUC_INSTALL_INIT_SYSTEMD - mkdir -p $(TARGET_DIR)/usr/lib/systemd/system/rauc.service.d - printf '[Install]\nWantedBy=multi-user.target\n' \ - >$(TARGET_DIR)/usr/lib/systemd/system/rauc.service.d/buildroot-enable.conf -endef - HOST_RAUC_DEPENDENCIES = \ host-pkgconf \ host-openssl \ -- 2.32.0 From peter at korsgaard.com Sun Feb 27 19:58:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:58:24 +0100 Subject: [Buildroot] [PATCH] board/intel/galileo: fix build failure with host gcc 10 In-Reply-To: <20220202214357.2640301-1-giulio.benetti@benettiengineering.com> (Giulio Benetti's message of "Wed, 2 Feb 2022 22:43:57 +0100") References: <20220202214357.2640301-1-giulio.benetti@benettiengineering.com> Message-ID: <875yp02ian.fsf@dell.be.48ers.dk> >>>>> "Giulio" == Giulio Benetti writes: > Building galileo_defconfig throws error: > ``` > /usr/bin/ld: arch/x86/tools/relocs_64.o:(.bss+0x0): multiple > definition of `per_cpu_load_addr'; > arch/x86/tools/relocs_32.o:(.bss+0x0): first defined here > ``` > To fix this let's add an upstreamed patch[1] and add BR2_GLOBAL_PATCH_DIR > to galileo_defconfig to point to where patch is. > [1]: > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=eeeda4cd06e828b331b15741a204ff9f5874d28d.patch > Fixes: > https://gitlab.com/ymorin/buildroot/-/jobs/2035821039 > Signed-off-by: Giulio Benetti Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 27 20:02:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 21:02:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/mpd: ignore CVE-2020-746[56] intended for FreeBSD PPP daemon In-Reply-To: <20220203094746.22715-1-br015@umbiko.net> (Andreas Ziegler's message of "Thu, 3 Feb 2022 10:47:46 +0100") References: <20220203094746.22715-1-br015@umbiko.net> Message-ID: <871qzo2i3z.fsf@dell.be.48ers.dk> >>>>> "Andreas" == Andreas Ziegler writes: > cpe:2.3:a:mpd_project:mpd:*:*:*:*:*:*:*:* is not a valid CPE > identifier for mpd (musicpd.org); this string refers to > MPD /FreeBSD PPP daemon (sourceforge.net/projects/mpd) > Since mpd does not have entries in the CVE database, put these > two CVE identifiers on the mpd ignore list: > https://nvd.nist.gov/vuln/detail/CVE-2020-7465 > https://nvd.nist.gov/vuln/detail/CVE-2020-7466 > Signed-off-by: Andreas Ziegler Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 27 19:53:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:53:03 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] DEVELOPERS: remove Martin Hicks from file Message-ID: <20220227195637.1849B83611@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=af251fb0e9c7d67c196bcd121814fcd275190f1f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Martin Hicks asked to not maintain cryptsetup anymore: https://lists.buildroot.org/pipermail/buildroot/2022-February/635413.html Also he doesn't mantain any other package, so let's remove him from this file. Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit d06bf4a9d73e7a05e651e737e26abac86080878e) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 3 --- 1 file changed, 3 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 0a7845a155..1370495a84 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1691,9 +1691,6 @@ F: package/rpi-wifi-firmware/ F: package/tzdata/ F: package/zic/ -N: Martin Hicks -F: package/cryptsetup/ - N: Martin Kepplinger F: package/tslib/ F: package/x11r7/xdriver_xf86-input-tslib/ From peter at korsgaard.com Sun Feb 27 19:52:29 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:52:29 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] DEVELOPERS: add Giulio Benetti to cryptsetup package Message-ID: <20220227195637.0F4DB82B3F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2a9bd16cbf946b71aaca3ca99ba811ec97d117f7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit a5e72ca9e7e490c2f94c574b29f34d17cc79d816) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index bd8c99a229..0a7845a155 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1024,6 +1024,7 @@ F: configs/asus_tinker_rk3288_defconfig F: configs/olimex_a* F: package/at/ F: package/binutils/ +F: package/cryptsetup/ F: package/erlang-jiffy/ F: package/gcc/ F: package/harfbuzz/ From peter at korsgaard.com Sun Feb 27 19:58:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:58:10 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] board/intel/galileo: fix build failure with host gcc 10 Message-ID: <20220227195637.2027B836B3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=358b9a9a0b5900ee2e76dbecb2937cd5b04eea12 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Building galileo_defconfig throws error: ``` /usr/bin/ld: arch/x86/tools/relocs_64.o:(.bss+0x0): multiple definition of `per_cpu_load_addr'; arch/x86/tools/relocs_32.o:(.bss+0x0): first defined here ``` To fix this let's add an upstreamed patch[1] and add BR2_GLOBAL_PATCH_DIR to galileo_defconfig to point to where patch is. [1]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=eeeda4cd06e828b331b15741a204ff9f5874d28d.patch Fixes: https://gitlab.com/ymorin/buildroot/-/jobs/2035821039 Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 9dd5382d791c3d5197b9ef401a0d103ad1457d5d) Signed-off-by: Peter Korsgaard --- ...-x86-relocs-Make-per_cpu_load_addr-static.patch | 39 ++++++++++++++++++++++ configs/galileo_defconfig | 1 + 2 files changed, 40 insertions(+) diff --git a/board/intel/galileo/patches/linux/0001-x86-relocs-Make-per_cpu_load_addr-static.patch b/board/intel/galileo/patches/linux/0001-x86-relocs-Make-per_cpu_load_addr-static.patch new file mode 100644 index 0000000000..1d206cc6d1 --- /dev/null +++ b/board/intel/galileo/patches/linux/0001-x86-relocs-Make-per_cpu_load_addr-static.patch @@ -0,0 +1,39 @@ +From eeeda4cd06e828b331b15741a204ff9f5874d28d Mon Sep 17 00:00:00 2001 +From: Ben Hutchings +Date: Wed, 24 Sep 2014 13:30:12 +0100 +Subject: [PATCH] x86/relocs: Make per_cpu_load_addr static + +per_cpu_load_addr is only used for 64-bit relocations, but is +declared in both configurations of relocs.c - with different +types. This has undefined behaviour in general. GNU ld is +documented to use the larger size in this case, but other tools +may differ and some warn about this. + +References: https://bugs.debian.org/748577 +Reported-by: Michael Tautschnig +Signed-off-by: Ben Hutchings +Cc: 748577 at bugs.debian.org +Cc: Linus Torvalds +Link: http://lkml.kernel.org/r/1411561812.3659.23.camel at decadent.org.uk +Signed-off-by: Ingo Molnar +Signed-off-by: Giulio Benetti +--- + arch/x86/tools/relocs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c +index bbb1d2259ecf..a5efb21d5228 100644 +--- a/arch/x86/tools/relocs.c ++++ b/arch/x86/tools/relocs.c +@@ -695,7 +695,7 @@ static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel, + * + */ + static int per_cpu_shndx = -1; +-Elf_Addr per_cpu_load_addr; ++static Elf_Addr per_cpu_load_addr; + + static void percpu_init(void) + { +-- +2.25.1 + diff --git a/configs/galileo_defconfig b/configs/galileo_defconfig index 03ca23f414..a8fd0a6dcc 100644 --- a/configs/galileo_defconfig +++ b/configs/galileo_defconfig @@ -1,4 +1,5 @@ BR2_x86_x1000=y +BR2_GLOBAL_PATCH_DIR=board/intel/galileo/patches # Needed for TARGET_GRUB2 BR2_TOOLCHAIN_BUILDROOT_WCHAR=y # Linux headers same as kernel, a 3.14 series From peter at korsgaard.com Sun Feb 27 20:02:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 21:02:09 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/mpd: ignore CVE-2020-746[56] intended for FreeBSD PPP daemon Message-ID: <20220227195637.2A36982B3F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1eb88d25b1ee3ca890da9965fa15ec4e473144cf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x cpe:2.3:a:mpd_project:mpd:*:*:*:*:*:*:*:* is not a valid CPE identifier for mpd (musicpd.org); this string refers to MPD /FreeBSD PPP daemon (sourceforge.net/projects/mpd) Since mpd does not have entries in the CVE database, put these two CVE identifiers on the mpd ignore list: https://nvd.nist.gov/vuln/detail/CVE-2020-7465 https://nvd.nist.gov/vuln/detail/CVE-2020-7466 Signed-off-by: Andreas Ziegler Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 210e6bd55991497c45eb3a6baf9ed0c20a88067c) Signed-off-by: Peter Korsgaard --- package/mpd/mpd.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index 06dc7e15d7..05aa7153b5 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -11,6 +11,8 @@ MPD_SITE = http://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR) MPD_DEPENDENCIES = host-pkgconf boost MPD_LICENSE = GPL-2.0+ MPD_LICENSE_FILES = COPYING +# these refer to the FreeBSD PPP daemon +MPD_IGNORE_CVES = CVE-2020-7465 CVE-2020-7466 MPD_CONF_OPTS = \ -Daudiofile=disabled \ -Ddocumentation=disabled From peter at korsgaard.com Sun Feb 27 19:52:25 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:52:25 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] DEVELOPERS: add Giulio Benetti to cryptsetup package Message-ID: <20220227195643.9569D82B3F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9d48687bb245c5c120b5f9df82ea471b80a62997 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit a5e72ca9e7e490c2f94c574b29f34d17cc79d816) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 2cc5a12ef9..5b34f93d22 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1056,6 +1056,7 @@ F: configs/asus_tinker_rk3288_defconfig F: configs/olimex_a* F: package/at/ F: package/binutils/ +F: package/cryptsetup/ F: package/erlang-jiffy/ F: package/gcc/ F: package/harfbuzz/ From peter at korsgaard.com Sun Feb 27 20:01:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 21:01:28 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/mpd: ignore CVE-2020-746[56] intended for FreeBSD PPP daemon Message-ID: <20220227195643.B49B7811CF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8ab26921c23da19f38a7f1e40a7e758546b5e58b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x cpe:2.3:a:mpd_project:mpd:*:*:*:*:*:*:*:* is not a valid CPE identifier for mpd (musicpd.org); this string refers to MPD /FreeBSD PPP daemon (sourceforge.net/projects/mpd) Since mpd does not have entries in the CVE database, put these two CVE identifiers on the mpd ignore list: https://nvd.nist.gov/vuln/detail/CVE-2020-7465 https://nvd.nist.gov/vuln/detail/CVE-2020-7466 Signed-off-by: Andreas Ziegler Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 210e6bd55991497c45eb3a6baf9ed0c20a88067c) Signed-off-by: Peter Korsgaard --- package/mpd/mpd.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index e105352b80..0902c02809 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -11,6 +11,8 @@ MPD_SITE = http://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR) MPD_DEPENDENCIES = host-pkgconf boost MPD_LICENSE = GPL-2.0+ MPD_LICENSE_FILES = COPYING +# these refer to the FreeBSD PPP daemon +MPD_IGNORE_CVES = CVE-2020-7465 CVE-2020-7466 MPD_SELINUX_MODULES = mpd MPD_CONF_OPTS = \ -Daudiofile=disabled \ From peter at korsgaard.com Sun Feb 27 19:53:12 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:53:12 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] DEVELOPERS: remove Martin Hicks from file Message-ID: <20220227195643.9F5D683611@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3a1d44dfa0580ae203aa0ce19c613f7a8a610160 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Martin Hicks asked to not maintain cryptsetup anymore: https://lists.buildroot.org/pipermail/buildroot/2022-February/635413.html Also he doesn't mantain any other package, so let's remove him from this file. Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit d06bf4a9d73e7a05e651e737e26abac86080878e) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 3 --- 1 file changed, 3 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 5b34f93d22..8422fad579 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1757,9 +1757,6 @@ F: package/rpi-wifi-firmware/ F: package/tzdata/ F: package/zic/ -N: Martin Hicks -F: package/cryptsetup/ - N: Martin Kepplinger F: package/tslib/ F: package/x11r7/xdriver_xf86-input-tslib/ From peter at korsgaard.com Sun Feb 27 19:58:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:58:15 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] board/intel/galileo: fix build failure with host gcc 10 Message-ID: <20220227195643.A883F82B3F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0cc9eed5d452fe1f083203447d7869ecf8d9f927 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Building galileo_defconfig throws error: ``` /usr/bin/ld: arch/x86/tools/relocs_64.o:(.bss+0x0): multiple definition of `per_cpu_load_addr'; arch/x86/tools/relocs_32.o:(.bss+0x0): first defined here ``` To fix this let's add an upstreamed patch[1] and add BR2_GLOBAL_PATCH_DIR to galileo_defconfig to point to where patch is. [1]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=eeeda4cd06e828b331b15741a204ff9f5874d28d.patch Fixes: https://gitlab.com/ymorin/buildroot/-/jobs/2035821039 Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 9dd5382d791c3d5197b9ef401a0d103ad1457d5d) Signed-off-by: Peter Korsgaard --- ...-x86-relocs-Make-per_cpu_load_addr-static.patch | 39 ++++++++++++++++++++++ configs/galileo_defconfig | 1 + 2 files changed, 40 insertions(+) diff --git a/board/intel/galileo/patches/linux/0001-x86-relocs-Make-per_cpu_load_addr-static.patch b/board/intel/galileo/patches/linux/0001-x86-relocs-Make-per_cpu_load_addr-static.patch new file mode 100644 index 0000000000..1d206cc6d1 --- /dev/null +++ b/board/intel/galileo/patches/linux/0001-x86-relocs-Make-per_cpu_load_addr-static.patch @@ -0,0 +1,39 @@ +From eeeda4cd06e828b331b15741a204ff9f5874d28d Mon Sep 17 00:00:00 2001 +From: Ben Hutchings +Date: Wed, 24 Sep 2014 13:30:12 +0100 +Subject: [PATCH] x86/relocs: Make per_cpu_load_addr static + +per_cpu_load_addr is only used for 64-bit relocations, but is +declared in both configurations of relocs.c - with different +types. This has undefined behaviour in general. GNU ld is +documented to use the larger size in this case, but other tools +may differ and some warn about this. + +References: https://bugs.debian.org/748577 +Reported-by: Michael Tautschnig +Signed-off-by: Ben Hutchings +Cc: 748577 at bugs.debian.org +Cc: Linus Torvalds +Link: http://lkml.kernel.org/r/1411561812.3659.23.camel at decadent.org.uk +Signed-off-by: Ingo Molnar +Signed-off-by: Giulio Benetti +--- + arch/x86/tools/relocs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c +index bbb1d2259ecf..a5efb21d5228 100644 +--- a/arch/x86/tools/relocs.c ++++ b/arch/x86/tools/relocs.c +@@ -695,7 +695,7 @@ static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel, + * + */ + static int per_cpu_shndx = -1; +-Elf_Addr per_cpu_load_addr; ++static Elf_Addr per_cpu_load_addr; + + static void percpu_init(void) + { +-- +2.25.1 + diff --git a/configs/galileo_defconfig b/configs/galileo_defconfig index 03ca23f414..a8fd0a6dcc 100644 --- a/configs/galileo_defconfig +++ b/configs/galileo_defconfig @@ -1,4 +1,5 @@ BR2_x86_x1000=y +BR2_GLOBAL_PATCH_DIR=board/intel/galileo/patches # Needed for TARGET_GRUB2 BR2_TOOLCHAIN_BUILDROOT_WCHAR=y # Linux headers same as kernel, a 3.14 series From peter at korsgaard.com Sun Feb 27 20:13:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 21:13:54 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] docs/manual: fix "+size = +" latex formatting Message-ID: <20220227201037.C2C958275A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e3fdd722744ba0403e2faafbd34038ba0a6eb7b9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 46beca0656505e9a9d4d5d17d22f40550ac487c6) Signed-off-by: Peter Korsgaard --- docs/manual/writing-rules.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/manual/writing-rules.txt b/docs/manual/writing-rules.txt index 28cb0fe4f1..7e2b5f909c 100644 --- a/docs/manual/writing-rules.txt +++ b/docs/manual/writing-rules.txt @@ -184,7 +184,7 @@ image sdimage.img { * Every node(+section+, +partition+, +file+, +subnode+) must have an open curly bracket on the same line of the node's name, while the closing one must be on a newline and after it a newline must be added except for the - last one node. Same goes for its option, for example option +size = +. + last one node. Same goes for its option, for example option +size+ +=+. * Every +option+(i.e. +image+, +offset+, +size+) must have the +=+ assignment one space from it and one space from the value specified. From peter at korsgaard.com Sun Feb 27 20:24:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 21:24:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/resiprocate: fix build of rend with gcc 11 In-Reply-To: <20220208182929.3976984-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 8 Feb 2022 19:29:29 +0100") References: <20220208182929.3976984-1-fontaine.fabrice@gmail.com> Message-ID: <87wnhg12jc.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure of rend with gcc 11: > /home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/riscv32-buildroot-linux-gnu/include/c++/11.2.0/bits/stl_tree.h:770:15: error: static assertion failed: comparison object must be invocable as const > 770 | is_invocable_v, > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > Fixes: > - http://autobuild.buildroot.org/results/ad9d89fefe1a667daa123397a072bf130bfa03a7 > Signed-off-by: Fabrice Fontaine Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 27 20:26:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 21:26:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-regex: fix license In-Reply-To: <20220206220814.2580975-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 6 Feb 2022 23:08:14 +0100") References: <20220206220814.2580975-1-fontaine.fabrice@gmail.com> Message-ID: <87sfs412fs.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > License is Apache-2.0 since bump to version 2021.4.4 in commit > d973fac7ca2e7c0c4864e8045e5205764e84c45b and > https://github.com/mrabarnett/mrab-regex/commit/b693a1fba731a9aa0dc6ae37b441267d4b7b0419 > Signed-off-by: Fabrice Fontaine Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 27 20:25:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 21:25:46 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/python-regex: fix license Message-ID: <20220227201849.CD6D0836B3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=57fb6f520180cbe458fbf2c2b95efe2b7bec7d04 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x License is Apache-2.0 since bump to version 2021.4.4 in commit d973fac7ca2e7c0c4864e8045e5205764e84c45b and https://github.com/mrabarnett/mrab-regex/commit/b693a1fba731a9aa0dc6ae37b441267d4b7b0419 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 261bb9a17a21439e9688b07de1b8edf89f8eae31) Signed-off-by: Peter Korsgaard --- package/python-regex/python-regex.hash | 2 ++ package/python-regex/python-regex.mk | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/package/python-regex/python-regex.hash b/package/python-regex/python-regex.hash index 4749cd6167..b0f5bb05da 100644 --- a/package/python-regex/python-regex.hash +++ b/package/python-regex/python-regex.hash @@ -1,3 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/regex/json md5 cd206281327b4c087bb20bf93cee4ab9 regex-2021.4.4.tar.gz sha256 52ba3d3f9b942c49d7e4bc105bb28551c44065f139a65062ab7912bef10c9afb regex-2021.4.4.tar.gz +# Locally computed sha256 checksums +sha256 bff55ef4cdcc8c14ce259f8e8ab60e264418440d6335f4dc138273fbd506144d LICENSE.txt diff --git a/package/python-regex/python-regex.mk b/package/python-regex/python-regex.mk index c46c4d1614..4019bcdd3e 100644 --- a/package/python-regex/python-regex.mk +++ b/package/python-regex/python-regex.mk @@ -9,6 +9,7 @@ PYTHON_REGEX_VERSION = 2021.4.4 PYTHON_REGEX_SOURCE = regex-$(PYTHON_REGEX_VERSION).tar.gz PYTHON_REGEX_SITE = https://files.pythonhosted.org/packages/38/3f/4c42a98c9ad7d08c16e7d23b2194a0e4f3b2914662da8bc88986e4e6de1f PYTHON_REGEX_SETUP_TYPE = setuptools -PYTHON_REGEX_LICENSE = CNRI-Python +PYTHON_REGEX_LICENSE = Apache-2.0 +PYTHON_REGEX_LICENSE_FILES = LICENSE.txt $(eval $(python-package)) From peter at korsgaard.com Sun Feb 27 20:20:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 21:20:49 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/kodi: add bluetooth dependency comment Message-ID: <20220227201849.BC4AE826D4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eb84d088075262610b321cbcbee9498f6d46cf98 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Commit 43122d64e05a2831a96dabcbf149ba199726767f forgot to add bluetooth dependency comment Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 38b5f2069bbe029c62594095a02f915552dc28c2) Signed-off-by: Peter Korsgaard --- package/kodi/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/kodi/Config.in b/package/kodi/Config.in index af7604428e..c81868cd85 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -134,6 +134,10 @@ config BR2_PACKAGE_KODI_BLUEZ help Enable bluetooth support +comment "bluetooth support needs a toolchain w/ headers >= 3.4" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 + config BR2_PACKAGE_KODI_DBUS bool "dbus" select BR2_PACKAGE_DBUS From peter at korsgaard.com Sun Feb 27 20:23:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 21:23:55 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/resiprocate: fix build of rend with gcc 11 Message-ID: <20220227201849.C53C083611@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b8caff2cf25d7c92785e7d50348eb9577cf63d20 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix the following build failure of rend with gcc 11: /home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/riscv32-buildroot-linux-gnu/include/c++/11.2.0/bits/stl_tree.h:770:15: error: static assertion failed: comparison object must be invocable as const 770 | is_invocable_v, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/ad9d89fefe1a667daa123397a072bf130bfa03a7 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit a715593d944ac4f64e56a6d5778374e7388af23d) Signed-off-by: Peter Korsgaard --- ...x-some-issue-compiling-with-Visual-Studio.patch | 95 ++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/package/resiprocate/0001-Fix-some-issue-compiling-with-Visual-Studio.patch b/package/resiprocate/0001-Fix-some-issue-compiling-with-Visual-Studio.patch new file mode 100644 index 0000000000..0efe0d9cfb --- /dev/null +++ b/package/resiprocate/0001-Fix-some-issue-compiling-with-Visual-Studio.patch @@ -0,0 +1,95 @@ +From be76b10a50749e2e11dce8dcc38b414a7f9d8747 Mon Sep 17 00:00:00 2001 +From: Ben Walden +Date: Sat, 22 Aug 2020 23:14:11 +0100 +Subject: [PATCH] Fix some issue compiling with Visual Studio 16.7.0 and tidy + up Visual Studio 16 project files + +[Retrieved (and updated to keep only RendKa.cxx update) from: +https://github.com/resiprocate/resiprocate/commit/be76b10a50749e2e11dce8dcc38b414a7f9d8747] +Signed-off-by: Fabrice Fontaine +--- + VisualStudioReadme.htm | 65 + + contrib/GeoIP/GeoIP_12_0.vcxproj | 550 ------- + contrib/GeoIP/GeoIP_16_0.vcxproj | 93 +- + .../db/build_windows/db_static_12_0.vcxproj | 1260 ----------------- + .../db/build_windows/db_static_16_0.vcxproj | 696 +-------- + contrib/db/dbinc/atomic.h | 4 +- + contrib/db/mp/mp_fget.c | 4 +- + contrib/db/mp/mp_mvcc.c | 4 +- + contrib/db/mp/mp_region.c | 4 +- + contrib/db/mutex/mut_method.c | 2 +- + contrib/pcre/pcre_12_0.vcxproj | 466 ------ + contrib/pcre/pcre_16_0.vcxproj | 159 +-- + contrib/popt/popt_12_0.vcxproj | 394 ------ + contrib/popt/popt_16_0.vcxproj | 120 +- + reSIProcate_16_0.sln | 58 +- + .../queuetostream_12_0.vcxproj | 582 -------- + .../queuetostream_16_0.vcxproj | 207 ++- + repro/repro_12_0.vcxproj | 825 ----------- + repro/repro_12_0.vcxproj.filters | 47 - + repro/repro_16_0.vcxproj | 159 ++- + repro/reprocmd/reprocmd_12_0.vcxproj | 597 -------- + repro/reprocmd/reprocmd_16_0.vcxproj | 139 +- + repro/reprolib_12_0.vcxproj | 596 -------- + repro/reprolib_12_0.vcxproj.filters | 136 -- + repro/reprolib_16_0.vcxproj | 132 +- + resip/dum/dum_12_0.vcxproj | 615 -------- + resip/dum/dum_16_0.vcxproj | 124 +- + resip/dum/test/basicCall_12_0.vcxproj | 621 -------- + resip/dum/test/basicCall_16_0.vcxproj | 145 +- + resip/dum/test/basicClient_12_0.vcxproj | 653 --------- + resip/dum/test/basicClient_16_0.vcxproj | 158 +-- + resip/dum/test/basicMessage_12_0.vcxproj | 615 -------- + resip/dum/test/basicMessage_16_0.vcxproj | 141 +- + resip/dum/test/basicRegister_12_0.vcxproj | 615 -------- + resip/dum/test/basicRegister_16_0.vcxproj | 137 +- + resip/rend/RendKa.cxx | 2 +- + resip/rend/rend_12_0.vcxproj | 352 ----- + resip/rend/rend_16_0.vcxproj | 89 +- + resip/stack/resiprocate_12_0.vcxproj | 873 ------------ + resip/stack/resiprocate_12_0.vcxproj.filters | 351 ----- + resip/stack/resiprocate_16_0.vcxproj | 165 ++- + resip/stack/test/test_12_0.vcxproj | 627 -------- + resip/stack/test/test_16_0.vcxproj | 171 ++- + rutil/dns/ares/ares_12_0.vcxproj | 488 ------- + rutil/dns/ares/ares_12_0.vcxproj.filters | 34 - + rutil/dns/ares/ares_16_0.vcxproj | 159 +-- + rutil/rutil_12_0.vcxproj | 604 -------- + rutil/rutil_16_0.vcxproj | 153 +- + 48 files changed, 1409 insertions(+), 13782 deletions(-) + delete mode 100644 contrib/GeoIP/GeoIP_12_0.vcxproj + delete mode 100644 contrib/db/build_windows/db_static_12_0.vcxproj + delete mode 100644 contrib/pcre/pcre_12_0.vcxproj + delete mode 100644 contrib/popt/popt_12_0.vcxproj + delete mode 100644 repro/accountingconsumers/queuetostream_12_0.vcxproj + delete mode 100644 repro/repro_12_0.vcxproj + delete mode 100644 repro/repro_12_0.vcxproj.filters + delete mode 100644 repro/reprocmd/reprocmd_12_0.vcxproj + delete mode 100644 repro/reprolib_12_0.vcxproj + delete mode 100644 repro/reprolib_12_0.vcxproj.filters + delete mode 100644 resip/dum/dum_12_0.vcxproj + delete mode 100644 resip/dum/test/basicCall_12_0.vcxproj + delete mode 100644 resip/dum/test/basicClient_12_0.vcxproj + delete mode 100644 resip/dum/test/basicMessage_12_0.vcxproj + delete mode 100644 resip/dum/test/basicRegister_12_0.vcxproj + delete mode 100644 resip/rend/rend_12_0.vcxproj + delete mode 100644 resip/stack/resiprocate_12_0.vcxproj + delete mode 100644 resip/stack/resiprocate_12_0.vcxproj.filters + delete mode 100644 resip/stack/test/test_12_0.vcxproj + delete mode 100644 rutil/dns/ares/ares_12_0.vcxproj + delete mode 100644 rutil/dns/ares/ares_12_0.vcxproj.filters + delete mode 100644 rutil/rutil_12_0.vcxproj + +diff --git a/resip/rend/RendKa.cxx b/resip/rend/RendKa.cxx +index 8645f17636..8321ada1ee 100644 +--- a/resip/rend/RendKa.cxx ++++ b/resip/rend/RendKa.cxx +@@ -66,7 +66,7 @@ bool operator<(const RendKaAssoc& a, const RendKaAssoc& b) + + struct RendKaConn + { +- bool operator() (const RendKaAssocPtr& a, const RendKaAssocPtr& b) ++ bool operator()(const RendKaAssocPtr& a, const RendKaAssocPtr& b) const + { + return *a < *b; + } From peter at korsgaard.com Sun Feb 27 20:21:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 21:21:03 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/kodi: add bluetooth dependency comment Message-ID: <20220227201858.29601826D4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=73c19ff97adcd7166bf8658928608104503dff5c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Commit 43122d64e05a2831a96dabcbf149ba199726767f forgot to add bluetooth dependency comment Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 38b5f2069bbe029c62594095a02f915552dc28c2) Signed-off-by: Peter Korsgaard --- package/kodi/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/kodi/Config.in b/package/kodi/Config.in index 72cdbabf89..b7fd85ab33 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -140,6 +140,10 @@ config BR2_PACKAGE_KODI_BLUEZ help Enable bluetooth support +comment "bluetooth support needs a toolchain w/ headers >= 3.4" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 + config BR2_PACKAGE_KODI_DBUS bool "dbus" select BR2_PACKAGE_DBUS From peter at korsgaard.com Sun Feb 27 20:33:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 21:33:27 +0100 Subject: [Buildroot] [PATCH] toolchain: fix gcc bug 99140 condition In-Reply-To: <20220206142403.1644118-1-giulio.benetti@benettiengineering.com> (Giulio Benetti's message of "Sun, 6 Feb 2022 15:24:03 +0100") References: <2fec6210-3811-197d-45a7-1ece869f49e0@benettiengineering.com> <20220206142403.1644118-1-giulio.benetti@benettiengineering.com> Message-ID: <87o82s123s.fsf@dell.be.48ers.dk> >>>>> "Giulio" == Giulio Benetti writes: > Gcc bug 99140 exhibits with gcc versions: > - up to 7.x > - 9.x > - 10.x > and doesn't show up with gcc versions: > - 8.x > - 11.x > then moving BR2_TOOLCHAIN_GCC_AT_LEAST_9 to BR2_TOOLCHAIN_GCC_AT_LEAST_10 > makes gcc version 9 set as working but it's not. So let's back substitute > BR2_TOOLCHAIN_GCC_AT_LEAST_10 with BR2_TOOLCHAIN_GCC_AT_LEAST_9. > Signed-off-by: Giulio Benetti Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 27 20:32:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 21:32:51 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] toolchain: fix gcc bug 99140 condition Message-ID: <20220227202625.3DEE6831CB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bec884cf3b507753a88c55dc1417da7693fd8e06 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Gcc bug 99140 exhibits with gcc versions: - up to 7.x - 9.x - 10.x and doesn't show up with gcc versions: - 8.x - 11.x then moving BR2_TOOLCHAIN_GCC_AT_LEAST_9 to BR2_TOOLCHAIN_GCC_AT_LEAST_10 makes gcc version 9 set as working but it's not. So let's back substitute BR2_TOOLCHAIN_GCC_AT_LEAST_10 with BR2_TOOLCHAIN_GCC_AT_LEAST_9. Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 33ea4d7887b15ccb3e11d1390c697eee531af565) Signed-off-by: Peter Korsgaard --- toolchain/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchain/Config.in b/toolchain/Config.in index f63aec6735..1792070720 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -195,7 +195,7 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_93847 config BR2_TOOLCHAIN_HAS_GCC_BUG_99140 bool default y if !BR2_TOOLCHAIN_GCC_AT_LEAST_8 - default y if BR2_TOOLCHAIN_GCC_AT_LEAST_10 && !BR2_TOOLCHAIN_GCC_AT_LEAST_11 + default y if BR2_TOOLCHAIN_GCC_AT_LEAST_9 && !BR2_TOOLCHAIN_GCC_AT_LEAST_11 depends on BR2_nios2 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101737 From peter at korsgaard.com Sun Feb 27 20:38:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 21:38:40 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] configs/roc_pc_rk3399_defconfig: expand rootfs size to 120M Message-ID: <20220227203936.3E26F822E8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a7b963628662d275fec86fe240071c204c377044 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Default 60M for rootfs are not enough and generate a build failure, so let's expand rootfs size to 120M. Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 5194113331b04c5fee1a773e1751b40bff6fdd18) Signed-off-by: Peter Korsgaard --- configs/roc_pc_rk3399_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/roc_pc_rk3399_defconfig b/configs/roc_pc_rk3399_defconfig index dfbc5e4f47..ae7cf19a80 100644 --- a/configs/roc_pc_rk3399_defconfig +++ b/configs/roc_pc_rk3399_defconfig @@ -45,7 +45,7 @@ BR2_TARGET_GENERIC_HOSTNAME="roc-rk3399-pc" BR2_TARGET_GENERIC_ISSUE="Welcome to ROC-RK3399-PC!" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="64M" +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y From peter at korsgaard.com Sun Feb 27 20:38:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 21:38:50 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] configs/roc_pc_rk3399_defconfig: expand rootfs size to 120M Message-ID: <20220227203951.82E53822E8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=48cea1d9be4d9193eb4571aa2143c68a7012bb29 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Default 60M for rootfs are not enough and generate a build failure, so let's expand rootfs size to 120M. Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 5194113331b04c5fee1a773e1751b40bff6fdd18) Signed-off-by: Peter Korsgaard --- configs/roc_pc_rk3399_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/roc_pc_rk3399_defconfig b/configs/roc_pc_rk3399_defconfig index dfbc5e4f47..ae7cf19a80 100644 --- a/configs/roc_pc_rk3399_defconfig +++ b/configs/roc_pc_rk3399_defconfig @@ -45,7 +45,7 @@ BR2_TARGET_GENERIC_HOSTNAME="roc-rk3399-pc" BR2_TARGET_GENERIC_ISSUE="Welcome to ROC-RK3399-PC!" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="64M" +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y From t123yh.xyz at gmail.com Mon Feb 28 02:28:40 2022 From: t123yh.xyz at gmail.com (Yunhao Tian) Date: Mon, 28 Feb 2022 10:28:40 +0800 Subject: [Buildroot] [PATCH] package/shairport-sync: install dbus policy file to target Message-ID: <20220228022840.2140908-1-t123yh.xyz@gmail.com> This adds two extra commands to install dbus policy config to target if dbus option is enabled. Signed-off-by: Yunhao Tian --- package/shairport-sync/shairport-sync.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package/shairport-sync/shairport-sync.mk b/package/shairport-sync/shairport-sync.mk index 487e0c05e5..ab67da3964 100644 --- a/package/shairport-sync/shairport-sync.mk +++ b/package/shairport-sync/shairport-sync.mk @@ -59,6 +59,14 @@ endif ifeq ($(BR2_PACKAGE_SHAIRPORT_SYNC_DBUS),y) SHAIRPORT_SYNC_DEPENDENCIES += libglib2 SHAIRPORT_SYNC_CONF_OPTS += --with-dbus-interface --with-mpris-interface +define SHAIRPORT_SYNC_INSTALL_DBUS + $(INSTALL) -m 0644 -D \ + $(@D)/scripts/shairport-sync-dbus-policy.conf \ + $(TARGET_DIR)/etc/dbus-1/system.d/shairport-sync-dbus.conf + $(INSTALL) -m 0644 -D \ + $(@D)/scripts/shairport-sync-mpris-policy.conf \ + $(TARGET_DIR)/etc/dbus-1/system.d/shairport-sync-mpris.conf +endef else SHAIRPORT_SYNC_CONF_OPTS += --without-dbus-interface --without-mpris-interface endif @@ -77,11 +85,13 @@ else SHAIRPORT_SYNC_CONF_OPTS += --without-mqtt-client endif + define SHAIRPORT_SYNC_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0755 $(@D)/shairport-sync \ $(TARGET_DIR)/usr/bin/shairport-sync $(INSTALL) -D -m 0644 $(@D)/scripts/shairport-sync.conf \ $(TARGET_DIR)/etc/shairport-sync.conf + $(SHAIRPORT_SYNC_INSTALL_DBUS) endef define SHAIRPORT_SYNC_INSTALL_INIT_SYSV -- 2.25.1 From thomas.petazzoni at bootlin.com Mon Feb 28 07:18:40 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 28 Feb 2022 07:18:40 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-02-27 Message-ID: <20220228071848.C6A53605AE@smtp3.osuosl.org> Hello, Autobuild statistics for 2022-02-27 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 46 | 2 | 0 | 48 | 2021.11.x | 19 | 0 | 0 | 19 | master | 47 | 35 | 0 | 82 | Classification of failures by reason for master ----------------------------------------------- host-libselinux-3.3 | 7 frr-8.1 | 5 python-greenlet-1.1.2 | 4 bpftool-v6.7.0 | 3 tovid-87c676f4aadb7303d2cd9... | 3 bluez5_utils-5.63 | 2 wavemon-0.9.4 | 2 boinc-7.18.1 | 1 linux-pam-1.5.2 | 1 mongodb-4.2.18 | 1 ndisc6-1.0.5 | 1 safeclib-3.7.1 | 1 sconeserver-6b932d7d8dbb700... | 1 target-finalize | 1 unknown | 1 wpa_supplicant-2.10 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/2be1b97d0497c626bf6b51495eb1c64747a18390 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/127860f924fcd63e5bb989fa883856e5e15711df | arm | boinc-7.18.1 | NOK | http://autobuild.buildroot.net/results/232dae62570ed7927a10864d83dccaf9b6214500 | i686 | bpftool-v6.7.0 | NOK | http://autobuild.buildroot.net/results/d4335bbed4379591e34fc8f901267ad84f69bc02 | arm | bpftool-v6.7.0 | NOK | http://autobuild.buildroot.net/results/226ff089d3c4f67f4d18f1f8984c4b44ae624ee6 | sparc | bpftool-v6.7.0 | NOK | http://autobuild.buildroot.net/results/f5ac0401e96c16ab3ad26a4854130fd79d2b9e03 | microblazeel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/b620485e70f87fca5ced87bba7ae07bcf361ebd4 | aarch64 | frr-8.1 | NOK | http://autobuild.buildroot.net/results/c0754fea1a77fce6e560f368b57763c32f1cebad | xtensa | frr-8.1 | NOK | http://autobuild.buildroot.net/results/f05d377869240d0c0a7d71ca59c3401afdec2a0b | mips64el | frr-8.1 | NOK | http://autobuild.buildroot.net/results/107c26957b01d27cc6565dd4dee6f6e6b2d409eb | aarch64 | frr-8.1 | NOK | http://autobuild.buildroot.net/results/9db98bf667ff7cab59b3d82cc95c340e2ee2d7e5 | nios2 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/a0fdbc1ad057281a172b4729c6725bc766c9d92e | m68k | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/3ae7258b21884a18250754151db8cb6b50020ae6 | i686 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/4b5eb069216145f3940fc2286075e94ca8acb64f | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/89a7b6e159d3b0767b3cb8d29224d2f0e6563ac1 | aarch64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/8badb1e985cef3821f1aac13f3af1294bd26b1ed | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/5ed207ae64eeefc5c2d88359a60482fe2671be61 | mips64el | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/02e7a50ce24cd0d1294811aa6714f4dbf8f730dd | m68k | linux-pam-1.5.2 | NOK | http://autobuild.buildroot.net/results/0cc90c6d1f7632b4afac8092738430ed2d565b57 | ORPH arm | mongodb-4.2.18 | NOK | http://autobuild.buildroot.net/results/93423e820dd892d28f73746b28f9d0e575a22a69 | arm | ndisc6-1.0.5 | NOK | http://autobuild.buildroot.net/results/eb5caa42e102a2587e233d0bc91cb740cfe713be | ORPH riscv64 | python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/15b5a000617aa08c3609d6db937f55ffe3d2a86d | mipsel | python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/ebdcecd37f42ff594f3d1729b54fa5b3cfeee26e | arm | python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/3cd2d7195fd8a9590de1c9a81f3d99632d609388 | mipsel | python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/8ca663b8a2ba2325056660f660ab3e0c330c79b5 | sparc64 | safeclib-3.7.1 | NOK | http://autobuild.buildroot.net/results/375db9453cc89e7fa1ffdd1021569b5979ea691c | arm | sconeserver-6b932d7d8dbb700... | NOK | http://autobuild.buildroot.net/results/aee07c870b03733bf6a7ff4090bf7761f709af92 | arm | target-finalize | NOK | http://autobuild.buildroot.net/results/ded1e60c54976e59364ca63c4410c12b187d2931 | sparc64 | tovid-87c676f4aadb7303d2cd9... | NOK | http://autobuild.buildroot.net/results/8ca015ffbdf8b74391456c21d0b838b37bfd7ce9 | arm | tovid-87c676f4aadb7303d2cd9... | NOK | http://autobuild.buildroot.net/results/7cfc8c90aea8b9268c1812456a5af4cba3263f28 | riscv32 | tovid-87c676f4aadb7303d2cd9... | NOK | http://autobuild.buildroot.net/results/1c163cc5a90a966d8e8493df7cf911add6cd235d | arm | unknown | NOK | http://autobuild.buildroot.net/results/2617b2b889cf646dda1e181645ae45a26cb76485 | mips64el | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/bf794755b49a948d5aacb13c623619aeeb3d2ce9 | arm | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/19a171641a7992ae7be9de5621b0456144344ea2 | arm | wpa_supplicant-2.10 | NOK | http://autobuild.buildroot.net/results/22e179165804cb64644a53fc22e7d17f9fadf433 | Classification of failures by reason for 2021.02.x -------------------------------------------------- httping-2.5 | 1 rocksdb-6.13.3 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- xtensa | httping-2.5 | NOK | http://autobuild.buildroot.net/results/18682858ca3eb3623e9198341574933833f32040 | powerpc | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/7a880f087656ca7a93d215236641dc31805f496b | Packages having a newer version =============================== name | found by | link to release-monitoring.org | version | upstream | orph? -------------------------------+----------+----------------------------------------------+--------------+--------------+------- ace | DISTRO | https://release-monitoring.org/project/242395 | 7.0.1 | 7.0.6 | 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.3 | 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_r32 | apparmor | DISTRO | https://release-monitoring.org/project/94819 | 3.0.3 | 3.0.4 | armadillo | DISTRO | https://release-monitoring.org/project/07006 | 9.900.2 | 10.8.2 | assimp | DISTRO | https://release-monitoring.org/project/06988 | 5.1.6 | 5.2.2 | asterisk | DISTRO | https://release-monitoring.org/project/09838 | 16.21.1 | 19.2.0 | at | DISTRO | https://release-monitoring.org/project/00127 | 3.2.4 | 3.2.5 | 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 | autoconf-archive | DISTRO | https://release-monitoring.org/project/00142 | 2021.02.19 | 2022.02.11 | 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.12 | ORPH bat | DISTRO | https://release-monitoring.org/project/241901 | 0.19.0 | 0.20.0 | batctl | DISTRO | https://release-monitoring.org/project/14740 | 2021.0 | 2022.0 | batman-adv | DISTRO | https://release-monitoring.org/project/19529 | 2021.4 | 2022.0 | bats-core | DISTRO | https://release-monitoring.org/project/10587 | 1.4.1 | 1.6.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.1.3 | ORPH bdwgc | DISTRO | https://release-monitoring.org/project/17108 | 8.0.6 | 8.2.0 | belle-sip | DISTRO | https://release-monitoring.org/project/14378 | 4.4.8 | 5.1.3 | belr | DISTRO | https://release-monitoring.org/project/80042 | 4.4.8 | 5.1.3 | 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.18.0 | ORPH binutils | DISTRO | https://release-monitoring.org/project/07981 | 2.36.1 | 2.38 | bird | DISTRO | https://release-monitoring.org/project/00192 | 2.0.8 | 2.0.9 | 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.2 | ORPH bubblewrap | DISTRO | https://release-monitoring.org/project/10937 | 0.5.0 | 0.6.1 | 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.5.0 | ORPH chartjs | DISTRO | https://release-monitoring.org/project/85785 | 2.9.4 | 3.7.1 | 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.5 | 0.104.2 | clang | DISTRO | https://release-monitoring.org/project/11811 | 9.0.1 | 13.0.1 | cmake | DISTRO | https://release-monitoring.org/project/00306 | 3.16.9 | 3.22.2 | cog | DISTRO | https://release-monitoring.org/project/21333 | 0.12.0 | 0.13.3 | containerd | DISTRO | https://release-monitoring.org/project/16460 | 1.5.9 | 1.6.0 | cukinia | DISTRO | https://release-monitoring.org/project/138119 | 0.5.1 | 0.6.0 | cups | DISTRO | https://release-monitoring.org/project/00380 | 2.4.0 | 2.4.1 | cups-filters | DISTRO | https://release-monitoring.org/project/05541 | 1.28.10 | 1.28.12 | 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 | daq3 | DISTRO | https://release-monitoring.org/project/212345 | 3.0.5 | 3.0.6 | 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.2 | datatables-responsive | DISTRO | https://release-monitoring.org/project/141591 | 2.2.3 | 2.2.9 | dbus | DISTRO | https://release-monitoring.org/project/05356 | 1.12.20 | 1.12.22 | ORPH 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.7 | ORPH delve | DISTRO | https://release-monitoring.org/project/40149 | 1.8.0 | 1.8.1 | dialog | DISTRO | https://release-monitoring.org/project/00431 | 1.3-20200327 | 1.3-20220117 | ORPH docker-compose | DISTRO | https://release-monitoring.org/project/06185 | 1.24.1 | 2.2.3 | dovecot | DISTRO | https://release-monitoring.org/project/00456 | 2.3.17.1 | 2.3.18 | drbd-utils | DISTRO | https://release-monitoring.org/project/00462 | 9.19.0 | 9.20.2 | dt | DISTRO | https://release-monitoring.org/project/21844 | 18.32 | 21.27 | ORPH duktape | DISTRO | https://release-monitoring.org/project/21345 | 2.6.0 | 2.7.0 | ed | DISTRO | https://release-monitoring.org/project/00659 | 1.17 | 1.18 | ORPH edk2 | DISTRO | https://release-monitoring.org/project/125953 | edk2-stab... | 202202 | efivar | DISTRO | https://release-monitoring.org/project/00664 | 37 | 38 | efl | DISTRO | https://release-monitoring.org/project/06128 | 1.26.1 | 1.26.2 | 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.3 | ell | DISTRO | https://release-monitoring.org/project/17781 | 0.47 | 0.49 | enlightenment | DISTRO | https://release-monitoring.org/project/00698 | 0.25.1 | 0.25.3 | erlang | DISTRO | https://release-monitoring.org/project/00707 | 22.3.4.22 | 24.2.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-jiffy | DISTRO | https://release-monitoring.org/project/09323 | 1.0.9 | 1.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.18 | 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 | exempi | DISTRO | https://release-monitoring.org/project/00767 | 2.5.2 | 2.6.1 | fakeroot | DISTRO | https://release-monitoring.org/project/12048 | 1.26 | 1.27 | ORPH 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.27 | 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.3 | flare-engine | DISTRO | https://release-monitoring.org/project/21433 | 1.12 | 1.13.04 | flare-game | DISTRO | https://release-monitoring.org/project/21434 | 1.12 | 1.13.04 | 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 | 6.0.0 | ORPH fontconfig | DISTRO | https://release-monitoring.org/project/00827 | 2.13.1 | 2.13.96 | ORPH freerdp | DISTRO | https://release-monitoring.org/project/10442 | 2.5.0 | 2.6.0 | fuse-overlayfs | DISTRO | https://release-monitoring.org/project/101220 | 1.5.0 | 1.8.2 | fwts | DISTRO | https://release-monitoring.org/project/17383 | 21.11.00 | 22.01.00 | gauche | DISTRO | https://release-monitoring.org/project/00873 | 0.9.9 | 0.9.11 | gcr | DISTRO | https://release-monitoring.org/project/11801 | 3.40.0 | 3.41.0 | ORPH gdbm | DISTRO | https://release-monitoring.org/project/00882 | 1.22 | 1.23 | 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.6 | gerbera | DISTRO | https://release-monitoring.org/project/18420 | 1.9.2 | 1.10.0 | gettext-gnu | DISTRO | https://release-monitoring.org/project/00898 | 0.20.1 | 0.21 | ORPH git | DISTRO | https://release-monitoring.org/project/05350 | 2.31.1 | 2.35.1 | glib-networking | DISTRO | https://release-monitoring.org/project/21353 | 2.70.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.1.1 | gnutls | DISTRO | https://release-monitoring.org/project/01221 | 3.7.2 | 3.7.3 | gobject-introspection | DISTRO | https://release-monitoring.org/project/01223 | 1.70.0 | 1.71.0 | ORPH gqrx | DISTRO | https://release-monitoring.org/project/09771 | 2.14.4 | 2.15.8 | granite | DISTRO | https://release-monitoring.org/project/05410 | 6.0.0 | 6.2.0 | ORPH grpc | DISTRO | https://release-monitoring.org/project/19117 | 1.43.0 | 1.44.0 | 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 gst1-imx | DISTRO | https://release-monitoring.org/project/21846 | 0.13.1 | 2.0.0 | gst1-shark | DISTRO | https://release-monitoring.org/project/21854 | v0.7.3 | 0.7.5 | 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.6.0 | gtksourceview | DISTRO | https://release-monitoring.org/project/07724 | 3.24.7 | 5.3.2 | guile | DISTRO | https://release-monitoring.org/project/01277 | 3.0.7 | 3.0.8 | 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.90 | 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.4 | harfbuzz | DISTRO | https://release-monitoring.org/project/01299 | 3.3.2 | 3.4.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.355 | 0.356 | ORPH i2pd | DISTRO | https://release-monitoring.org/project/21355 | 2.40.0 | 2.41.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.37 | ORPH imagemagick | DISTRO | https://release-monitoring.org/project/01372 | 7.1.0-19 | 7.1.0-26 | ORPH imlib2 | DISTRO | https://release-monitoring.org/project/21676 | 1.7.3 | 1.8.0 | inotify-tools | DISTRO | https://release-monitoring.org/project/08864 | 3.20.2.2 | 3.22.1.0 | ORPH intel-mediadriver | DISTRO | https://release-monitoring.org/project/20341 | 22.1.1 | 22.2.1 | intel-mediasdk | DISTRO | https://release-monitoring.org/project/21814 | 22.1.0 | 22.2.1 | intel-microcode | DISTRO | https://release-monitoring.org/project/20614 | 20210608 | 20220207 | ORPH iperf3 | DISTRO | https://release-monitoring.org/project/01389 | 3.10.1 | 3.11 | 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.21 | 1.25 | 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 | janet | DISTRO | https://release-monitoring.org/project/155612 | 1.19.2 | 1.20.0 | janus-gateway | DISTRO | https://release-monitoring.org/project/15715 | 0.11.6 | 0.11.8 | jasper | DISTRO | https://release-monitoring.org/project/01421 | 2.0.33 | 3.0.2 | jpeg-turbo | DISTRO | https://release-monitoring.org/project/01648 | 2.1.2 | 2.1.3 | jquery-datetimepicker | DISTRO | https://release-monitoring.org/project/13910 | 2.4.5 | 2.5.20 | jquery-keyboard | DISTRO | https://release-monitoring.org/project/21681 | 1.18.12 | 1.30.4 | ORPH jquery-mobile | DISTRO | https://release-monitoring.org/project/59395 | 1.4.3 | 1.4.5 | ORPH jquery-ui | DISTRO | https://release-monitoring.org/project/21815 | 1.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 | kf5-extra-cmake-modules | DISTRO | https://release-monitoring.org/project/08762 | 5.47.0 | 5.91.0 | kf5-kcoreaddons | DISTRO | https://release-monitoring.org/project/08762 | 5.47.0 | 5.91.0 | kf5-modemmanager-qt | DISTRO | https://release-monitoring.org/project/08762 | 5.47.0 | 5.91.0 | kf5-networkmanager-qt | DISTRO | https://release-monitoring.org/project/08762 | 5.47.0 | 5.91.0 | kismet | DISTRO | https://release-monitoring.org/project/06966 | 2021-08-R1 | 2022-02-R1 | 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.3-Ma... | 20.1.2-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.1-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.6-Ma... | 20.2.2-Nexus | kodi-pvr-iptvsimple | DISTRO | https://release-monitoring.org/project/21782 | 19.1.0-Ma... | 20.3.0-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.7-Ma... | 20.2.4-Nexus | kodi-pvr-nextpvr | DISTRO | https://release-monitoring.org/project/21779 | 19.0.3-Ma... | 20.2.2-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.2-Ma... | 20.2.1-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 | lcms2 | DISTRO | https://release-monitoring.org/project/09815 | 2.13 | 2.13.1 | lensfun | DISTRO | https://release-monitoring.org/project/01548 | 0.3.2 | 0.3.95 | libaacs | DISTRO | https://release-monitoring.org/project/05562 | 0.11.0 | 0.11.1 | libao | DISTRO | https://release-monitoring.org/project/07629 | 1.2.0 | 1.2.2 | ORPH libapparmor | DISTRO | https://release-monitoring.org/project/94819 | 3.0.3 | 3.0.4 | libarchive | DISTRO | https://release-monitoring.org/project/01558 | 3.5.3 | 3.6.0 | libblockdev | DISTRO | https://release-monitoring.org/project/09397 | 2.26 | 2.26-1 | ORPH libbpf | DISTRO | https://release-monitoring.org/project/141355 | 0.6.1 | 0.7.0 | libbsd | DISTRO | https://release-monitoring.org/project/01567 | 0.11.3 | 0.11.5 | libcap | DISTRO | https://release-monitoring.org/project/01569 | 2.62 | 2.63 | 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 | libdrm | DISTRO | https://release-monitoring.org/project/01596 | 2.4.109 | 2.4.110 | libfreeglut | DISTRO | https://release-monitoring.org/project/00846 | 3.2.1 | 3.2.2 | libfuse | GUESS | https://release-monitoring.org/project/00861 | 2.9.9 | 3.10.5 | ORPH libgcrypt | DISTRO | https://release-monitoring.org/project/01623 | 1.9.4 | 1.10.0 | ORPH libgdiplus | DISTRO | https://release-monitoring.org/project/06440 | 6.0.5 | 6.1 | libgee | DISTRO | https://release-monitoring.org/project/01625 | 0.20.4 | 0.20.5 | libgit2 | DISTRO | https://release-monitoring.org/project/01627 | 1.3.0 | 1.4.2 | libglade | DISTRO | https://release-monitoring.org/project/01174 | 2.6.4 | 3.38.2 | ORPH libglib2 | DISTRO | https://release-monitoring.org/project/10024 | 2.70.0 | 2.70.4 | 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.44 | ORPH libgpgme | DISTRO | https://release-monitoring.org/project/01239 | 1.16.0 | 1.17.0 | 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.1 | libgudev | DISTRO | https://release-monitoring.org/project/07735 | 236 | 237 | libiberty | DISTRO | https://release-monitoring.org/project/07981 | 2.32 | 2.38 | libical | DISTRO | https://release-monitoring.org/project/01637 | 1.0.1 | 3.0.14 | 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 | libinput | DISTRO | https://release-monitoring.org/project/05781 | 1.19.3 | 1.20.0 | libkcapi | DISTRO | https://release-monitoring.org/project/16828 | 1.1.5 | 1.4.0 | ORPH libks | DISTRO | https://release-monitoring.org/project/241898 | 1.7.0 | 1.8.0 | libmdbx | DISTRO | https://release-monitoring.org/project/141559 | 0.11.4 | 0.11.5 | 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 | libnetfilter_conntrack | DISTRO | https://release-monitoring.org/project/01675 | 1.0.8 | 1.0.9 | libnfs | DISTRO | https://release-monitoring.org/project/07325 | 4.0.0 | 5.0.1 | ORPH 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.3 | 2.18.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.11.1 | 2.12 | 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 | libqmi | DISTRO | https://release-monitoring.org/project/07307 | 1.30.2 | 1.30.4 | libressl | DISTRO | https://release-monitoring.org/project/12102 | 3.4.2 | 3.5.0 | ORPH librsvg | DISTRO | https://release-monitoring.org/project/05420 | 2.50.7 | 2.52.6 | librtas | DISTRO | https://release-monitoring.org/project/10717 | 2.0.2 | 2.0.3 | ORPH libscrypt | DISTRO | https://release-monitoring.org/project/07380 | 1.21 | 1.22 | libsecret | DISTRO | https://release-monitoring.org/project/13150 | 0.20.4 | 0.20.5 | ORPH libsemanage | DISTRO | https://release-monitoring.org/project/01718 | 3.3 | 20200710 | libsepol | DISTRO | https://release-monitoring.org/project/01719 | 3.3 | 20200710 | libsigc | DISTRO | https://release-monitoring.org/project/07961 | 3.0.7 | 3.2.0 | ORPH 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 | 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 | libva | DISTRO | https://release-monitoring.org/project/01752 | 2.13.0 | 2.14.0 | libva-utils | DISTRO | https://release-monitoring.org/project/16334 | 2.13.0 | 2.14.0 | libvips | DISTRO | https://release-monitoring.org/project/05097 | 8.10.6 | 8.12.2 | 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 | libxcrypt | DISTRO | https://release-monitoring.org/project/16436 | 4.4.27 | 4.4.28 | libxkbcommon | DISTRO | https://release-monitoring.org/project/01780 | 1.3.1 | 1.4.0 | libxml2 | DISTRO | https://release-monitoring.org/project/01783 | 2.9.12 | 2.9.13 | libxmlrpc | DISTRO | https://release-monitoring.org/project/09024 | r3119 | 1.51.07 | linphone | DISTRO | https://release-monitoring.org/project/01823 | 4.4.8 | 5.1.3 | ORPH linux-firmware | DISTRO | https://release-monitoring.org/project/141464 | 20211216 | 20220209 | liquid-dsp | DISTRO | https://release-monitoring.org/project/14535 | 1.3.2 | 1.4.0 | live555 | DISTRO | https://release-monitoring.org/project/12414 | 2021.05.03 | 2022.02.07 | ORPH lld | DISTRO | https://release-monitoring.org/project/01830 | 9.0.1 | 13.0.1 | 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.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 | lrzip | DISTRO | https://release-monitoring.org/project/01842 | 0.641 | 0.650 | 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-tools | DISTRO | https://release-monitoring.org/project/07136 | 2.13.2 | 2.13.4 | lua | DISTRO | https://release-monitoring.org/project/01847 | 5.1.5 | 5.4.4 | lua-resty-http | DISTRO | https://release-monitoring.org/project/13887 | 0.15-0 | 0.16.1 | luv | DISTRO | https://release-monitoring.org/project/21510 | 1.42.0-1 | 1.43.0-0 | luvi | DISTRO | https://release-monitoring.org/project/21512 | 2.12.0 | 2.13.0 | lvm2 | DISTRO | https://release-monitoring.org/project/05354 | 2.03.14 | 2.03.15 | ORPH lxc | DISTRO | https://release-monitoring.org/project/01860 | 4.0.11 | 4.0.12 | 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.8.2 | 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.1.3 | ORPH memcached | DISTRO | https://release-monitoring.org/project/01965 | 1.6.12 | 1.6.14 | 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 | mender | DISTRO | https://release-monitoring.org/project/20629 | 3.1.0 | 3.2.1 | mesa3d | DISTRO | https://release-monitoring.org/project/01970 | 21.3.5 | 21.3.7 | mesa3d-headers | DISTRO | https://release-monitoring.org/project/01970 | 21.3.5 | 21.3.7 | meson | DISTRO | https://release-monitoring.org/project/06472 | 0.61.1 | 0.61.2 | 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 | minetest | DISTRO | https://release-monitoring.org/project/01978 | 5.4.1 | 5.5.0 | minetest-game | DISTRO | https://release-monitoring.org/project/21522 | 5.4.1 | 5.5.0 | moarvm | DISTRO | https://release-monitoring.org/project/21100 | 2021.10 | 2022.02 | 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.6 | mongodb | DISTRO | https://release-monitoring.org/project/02008 | 4.2.18 | 5.2.1 | mongoose | DISTRO | https://release-monitoring.org/project/07603 | 7.2 | 7.6 | monit | DISTRO | https://release-monitoring.org/project/05483 | 5.26.0 | 5.31.0 | mono | DISTRO | https://release-monitoring.org/project/06360 | 6.12.0.90 | 6.12.0.173 | 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.1.0 | 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 | mtr | DISTRO | https://release-monitoring.org/project/02029 | 0.94 | 0.95 | ORPH multipath-tools | DISTRO | https://release-monitoring.org/project/00424 | 0.8.8 | 0.8.9 | mupdf | DISTRO | https://release-monitoring.org/project/02034 | 1.18.0 | 1.19.0 | mutt | DISTRO | https://release-monitoring.org/project/02035 | 2.1.5 | 2.2.1 | nano | DISTRO | https://release-monitoring.org/project/02046 | 6.0 | 6.2 | ORPH nbd | DISTRO | https://release-monitoring.org/project/02052 | 3.21 | 3.23 | ncdu | DISTRO | https://release-monitoring.org/project/06045 | 1.16 | 2.1 | ncurses | DISTRO | https://release-monitoring.org/project/02057 | 6.1 | 6.3-20220226 | ORPH netdata | DISTRO | https://release-monitoring.org/project/11046 | 1.21.1 | 1.33.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.34.0 | 1.36.0 | 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.1 | 1.0.2 | nghttp2 | DISTRO | https://release-monitoring.org/project/08651 | 1.41.0 | 1.47.0 | nginx | DISTRO | https://release-monitoring.org/project/05413 | 1.20.1 | 1.21.6 | nodejs | DISTRO | https://release-monitoring.org/project/08251 | 14.18.3 | 17.6.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.54 | 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 | ogre | DISTRO | https://release-monitoring.org/project/33334 | v1.12.12 | 13.3.1 | open62541 | DISTRO | https://release-monitoring.org/project/16896 | v1.2.2 | 1.2.4 | ORPH openblas | DISTRO | https://release-monitoring.org/project/02540 | 0.3.18 | 0.3.20 | 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+11 | openlayers | DISTRO | https://release-monitoring.org/project/06847 | 6.12.0 | 6.13.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 | openssh | DISTRO | https://release-monitoring.org/project/02565 | 8.8p1 | 8.9p1 | ORPH 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 | optee-benchmark | DISTRO | https://release-monitoring.org/project/21555 | 3.15.0 | 3.16.0 | optee-client | DISTRO | https://release-monitoring.org/project/21556 | 3.15.0 | 3.16.0 | optee-examples | DISTRO | https://release-monitoring.org/project/21557 | 3.15.0 | 3.16.0 | optee-test | DISTRO | https://release-monitoring.org/project/21558 | 3.15.0 | 3.16.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.1.3 | ORPH pango | DISTRO | https://release-monitoring.org/project/11783 | 1.50.3 | 1.50.4 | 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.5 | 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 | 202201 | 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.15 | 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.76 | perl-http-daemon | DISTRO | https://release-monitoring.org/project/02975 | 6.12 | 6.13 | 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-package-stash | DISTRO | https://release-monitoring.org/project/11885 | 0.39 | 0.40 | 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.16 | 8.1.3 | 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.3 | 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 pipewire | DISTRO | https://release-monitoring.org/project/57357 | 0.3.45 | 0.3.47 | 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 | poke | DISTRO | https://release-monitoring.org/project/179926 | 1.4 | 2.1 | ORPH policycoreutils | DISTRO | https://release-monitoring.org/project/03680 | 3.2 | 20200710 | poppler | DISTRO | https://release-monitoring.org/project/03686 | 21.12.0 | 22.02.0 | postgis | DISTRO | https://release-monitoring.org/project/03694 | 3.2.0 | 3.2.1 | 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.4 | proxychains-ng | DISTRO | https://release-monitoring.org/project/06499 | 4.14 | 4.16 | ORPH ptpd | GUESS | https://release-monitoring.org/project/03726 | 1.1.0 | 2.3.1 | ORPH pugixml | DISTRO | https://release-monitoring.org/project/03728 | 1.11.4 | 1.12.1 | 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-aioconsole | DISTRO | https://release-monitoring.org/project/21244 | 0.4.0 | 0.4.1 | 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.2 | python-asgiref | DISTRO | https://release-monitoring.org/project/18462 | 3.3.4 | 3.5.0 | python-autobahn | DISTRO | https://release-monitoring.org/project/07015 | 22.1.1 | 22.2.2 | 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.2 | python-boto3 | DISTRO | https://release-monitoring.org/project/08778 | 1.19.2 | 1.21.8 | python-botocore | DISTRO | https://release-monitoring.org/project/08748 | 1.22.2 | 1.24.8 | python-can | DISTRO | https://release-monitoring.org/project/17873 | 3.3.4 | 4.0.0 | python-canopen | DISTRO | https://release-monitoring.org/project/23230 | 1.0.0 | 2.0.0b1 | 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.11 | 2.0.12 | 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.4 | 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-crossbar | DISTRO | https://release-monitoring.org/project/21696 | 21.3.1 | 22.2.1 | python-cssselect2 | DISTRO | https://release-monitoring.org/project/86109 | 0.4.1 | 0.5.0 | python-cssutils | DISTRO | https://release-monitoring.org/project/13259 | 2.3.0 | 2.4.0 | python-cython | DISTRO | https://release-monitoring.org/project/12679 | 0.29.27 | 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-decorator | DISTRO | https://release-monitoring.org/project/03819 | 5.1.0 | 5.1.1 | python-dialog3 | DISTRO | https://release-monitoring.org/project/03823 | 3.5.1 | 3.5.3 | python-distro | DISTRO | https://release-monitoring.org/project/12202 | 1.6.0 | 1.7.0 | 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-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-entrypoints | DISTRO | https://release-monitoring.org/project/12081 | 0.3 | 0.4 | python-filelock | DISTRO | https://release-monitoring.org/project/11739 | 3.3.0 | 3.6.0 | python-flask | DISTRO | https://release-monitoring.org/project/03867 | 1.1.2 | 2.0.3 | 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-git | DISTRO | https://release-monitoring.org/project/06459 | 3.1.24 | 3.1.27 | 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.4 | python-humanize | DISTRO | https://release-monitoring.org/project/19799 | 3.11.0 | 4.0.0 | python-installer | DISTRO | https://release-monitoring.org/project/197662 | 0.4.0 | 0.5.0 | python-ipython | DISTRO | https://release-monitoring.org/project/01399 | 7.31.1 | 8.1.0 | python-iso8601 | DISTRO | https://release-monitoring.org/project/17228 | 0.1.14 | 1.0.2 | python-itsdangerous | DISTRO | https://release-monitoring.org/project/03892 | 2.0.1 | 2.1.0 | python-iwlib | DISTRO | https://release-monitoring.org/project/51611 | 1.5 | 1.7.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-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-libusb1 | DISTRO | https://release-monitoring.org/project/12301 | 2.0.1 | 3.0.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-markupsafe | DISTRO | https://release-monitoring.org/project/03918 | 2.0.1 | 2.1.0 | 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-networkmanager | DISTRO | https://release-monitoring.org/project/12909 | 2.1 | 2.2 | python-numpy | DISTRO | https://release-monitoring.org/project/02509 | 1.21.2 | 1.22.2 | python-oauthlib | DISTRO | https://release-monitoring.org/project/05377 | 3.1.1 | 3.2.0 | 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-paramiko | DISTRO | https://release-monitoring.org/project/03954 | 2.7.2 | 2.9.2 | 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.1 | python-pillow | DISTRO | https://release-monitoring.org/project/07974 | 9.0.0 | 9.0.1 | python-pip | DISTRO | https://release-monitoring.org/project/06529 | 21.2.4 | 22.0.3 | 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.28 | python-protobuf | DISTRO | https://release-monitoring.org/project/03715 | 3.19.1 | 3.19.4 | 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-pybind | DISTRO | https://release-monitoring.org/project/13384 | 2.9.0 | 2.9.1 | python-pycairo | DISTRO | https://release-monitoring.org/project/13166 | 1.19.1 | 1.20.1 | python-pycryptodomex | DISTRO | https://release-monitoring.org/project/36851 | 3.14.0 | 3.14.1 | python-pydal | DISTRO | https://release-monitoring.org/project/21582 | 20210626.3 | 20220213.2 | python-pydantic | DISTRO | https://release-monitoring.org/project/29768 | 1.8.2 | 1.9.0 | python-pyelftools | DISTRO | https://release-monitoring.org/project/16219 | 0.27 | 0.28 | 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.1 | python-pylibftdi | DISTRO | https://release-monitoring.org/project/21583 | 0.18.1 | 0.20.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.5 | python-pyopenssl | DISTRO | https://release-monitoring.org/project/05535 | 21.0.0 | 22.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-pyroute2 | DISTRO | https://release-monitoring.org/project/20081 | 0.5.7 | 0.6.7 | python-pytablereader | DISTRO | https://release-monitoring.org/project/21592 | 0.26.1 | 0.31.3 | python-pytablewriter | DISTRO | https://release-monitoring.org/project/21593 | 0.46.1 | 0.64.1 | python-pytest | DISTRO | https://release-monitoring.org/project/03765 | 6.2.5 | 7.0.1 | python-pytest-asyncio | DISTRO | https://release-monitoring.org/project/07273 | 0.15.1 | 0.18.1 | python-pyudev | DISTRO | https://release-monitoring.org/project/08485 | 0.22.0 | 0.23.2 | 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.4 | python-reentry | DISTRO | https://release-monitoring.org/project/21596 | 1.3.2 | 1.3.3 | python-regex | DISTRO | https://release-monitoring.org/project/05548 | 2021.4.4 | 2022.1.18 | python-requests-oauthlib | DISTRO | https://release-monitoring.org/project/11803 | 1.3.0 | 1.3.1 | python-rpi-gpio | DISTRO | https://release-monitoring.org/project/12026 | 0.7.0 | 0.7.1 | python-rpi-ws281x | DISTRO | https://release-monitoring.org/project/21898 | 4.3.0 | 4.3.2 | 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-s3transfer | DISTRO | https://release-monitoring.org/project/10428 | 0.5.0 | 0.5.2 | python-secretstorage | DISTRO | https://release-monitoring.org/project/04020 | 3.1.2 | 3.3.1 | python-semantic-version | DISTRO | https://release-monitoring.org/project/06514 | 2.8.5 | 2.9.0 | python-sentry-sdk | DISTRO | https://release-monitoring.org/project/21603 | 1.4.3 | 1.5.6 | 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 | 60.7.0 | 60.9.3 | 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-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.1 | python-socketio | DISTRO | https://release-monitoring.org/project/21611 | 5.4.0 | 5.5.2 | 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.1 | 1.3.0 | 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.1 | 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-tomli | DISTRO | https://release-monitoring.org/project/207408 | 1.2.0 | 2.0.1 | 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 | 22.2.0 | python-txaio | DISTRO | https://release-monitoring.org/project/07202 | 21.2.1 | 22.2.1 | python-typing-extensions | DISTRO | https://release-monitoring.org/project/19755 | 3.10.0.2 | 4.1.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-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.2 | python-web2py | DISTRO | https://release-monitoring.org/project/20617 | 2.21.1 | 2.22.3 | 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.3.1 | python-websockets | DISTRO | https://release-monitoring.org/project/08100 | 10.0 | 10.2 | python-werkzeug | DISTRO | https://release-monitoring.org/project/04092 | 1.0.1 | 2.0.3 | 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.3 | python-yarl | DISTRO | https://release-monitoring.org/project/12895 | 1.7.2 | 1.8.0 | python-zeroconf | DISTRO | https://release-monitoring.org/project/12681 | 0.29.0 | 0.38.3 | qpdf | DISTRO | https://release-monitoring.org/project/05542 | 10.5.0 | 10.6.2 | qpid-proton | DISTRO | https://release-monitoring.org/project/15198 | 0.35.0 | 0.36.0 | qt5coap | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.3 | qt5knx | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.3 | qt5mqtt | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.3 | qt5opcua | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.3 | qt5webengine | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.3 | 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 rng-tools | DISTRO | https://release-monitoring.org/project/04202 | 6.14 | 6.15 | rocksdb | DISTRO | https://release-monitoring.org/project/15560 | 6.20.3 | 6.29.3 | rsyslog | DISTRO | https://release-monitoring.org/project/04218 | 8.2010.0 | 8.2202.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.58.1 | 1.59.0 | rust-bin | DISTRO | https://release-monitoring.org/project/07635 | 1.58.1 | 1.59.0 | rygel | DISTRO | https://release-monitoring.org/project/04751 | 0.40.2 | 0.40.3 | s390-tools | DISTRO | https://release-monitoring.org/project/10714 | 2.19.0 | 2.20.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.2 | 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 | safeclib | DISTRO | https://release-monitoring.org/project/21385 | 3.7.1 | 01022022 | samba4 | DISTRO | https://release-monitoring.org/project/04758 | 4.15.4 | 4.15.5 | 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 | screen | DISTRO | https://release-monitoring.org/project/04772 | 4.8.0 | 4.9.0 | ORPH 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 | seatd | DISTRO | https://release-monitoring.org/project/234932 | 0.6.3 | 0.6.4 | ORPH 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.73.0 | sentry-native | DISTRO | https://release-monitoring.org/project/135639 | 0.4.1 | 0.4.15 | 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 shim | DISTRO | https://release-monitoring.org/project/10719 | 15.4 | 15.5 | 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.9 | snort3 | DISTRO | https://release-monitoring.org/project/13263 | 3.1.18.0 | 3.1.24.0 | sofia-sip | DISTRO | https://release-monitoring.org/project/10509 | 1.13.6-41... | 1.13.7 | 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 | sphinxbase | DISTRO | https://release-monitoring.org/project/20548 | 5prealpha | 0.8 | spice-protocol | DISTRO | https://release-monitoring.org/project/14892 | 0.14.3 | 0.14.4 | sqlite | DISTRO | https://release-monitoring.org/project/04877 | 3.37.2 | 3.38.0 | squid | DISTRO | https://release-monitoring.org/project/04880 | 5.3 | 5.4.1 | 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.62 | sudo | DISTRO | https://release-monitoring.org/project/04906 | 1.9.8p2 | 1.9.9 | ORPH 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 system-config-printer | DISTRO | https://release-monitoring.org/project/08855 | 1.5.15 | 1.5.16 | 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 | tcpreplay | DISTRO | https://release-monitoring.org/project/13716 | 4.3.4 | 4.4.1 | ORPH thrift | DISTRO | https://release-monitoring.org/project/05581 | 0.14.1 | 0.16.0 | ORPH timescaledb | DISTRO | https://release-monitoring.org/project/17545 | 2.5.1 | 2.6.0 | tinyssh | DISTRO | https://release-monitoring.org/project/14678 | 20210601 | 20220222 | tinyxml | DISTRO | https://release-monitoring.org/project/10162 | 2.6.2_2 | 2.6.2 | ORPH tio | DISTRO | https://release-monitoring.org/project/20587 | 1.32 | 1.35 | 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 | tpm2-tss | DISTRO | https://release-monitoring.org/project/12683 | 3.1.0 | 3.2.0 | ORPH trace-cmd | DISTRO | https://release-monitoring.org/project/07873 | 2.9.6 | 2.9.7 | tree | DISTRO | https://release-monitoring.org/project/05006 | 1.8.0 | 2.0.2 | 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 | unbound | DISTRO | https://release-monitoring.org/project/05042 | 1.14.0 | 1.15.0 | 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 | 6.1.3 | 6.1.5 | ORPH upmpdcli | DISTRO | https://release-monitoring.org/project/15848 | 1.5.12 | 1.5.13 | upower | DISTRO | https://release-monitoring.org/project/05056 | 0.99.11 | 0.99.16 | usbguard | DISTRO | https://release-monitoring.org/project/11151 | 1.0.0 | 1.1.0 | util-linux | DISTRO | https://release-monitoring.org/project/08179 | 2.37.3 | 2.37.4 | ORPH util-linux-libs | DISTRO | https://release-monitoring.org/project/08179 | 2.37.3 | 2.37.4 | ORPH 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.90 | ORPH valijson | DISTRO | https://release-monitoring.org/project/18452 | 0.3 | 0.6 | vim | DISTRO | https://release-monitoring.org/project/05092 | 8.2.4301 | 8.2.4478 | ORPH vlc | DISTRO | https://release-monitoring.org/project/06504 | 3.0.16 | 3.0.17-1 | vnstat | DISTRO | https://release-monitoring.org/project/07283 | 2.8 | 2.9 | 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.31 | vulkan-headers | DISTRO | https://release-monitoring.org/project/88835 | 1.2.203 | 1.3.206 | ORPH 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 | waylandpp | DISTRO | https://release-monitoring.org/project/16969 | 0.2.8 | 0.2.9 | 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 wget | DISTRO | https://release-monitoring.org/project/05124 | 1.21.2 | 1.21.3 | ORPH wilc1000-firmware | DISTRO | https://release-monitoring.org/project/65598 | 14.1 | 15.6 | wine | DISTRO | https://release-monitoring.org/project/05134 | 6.0 | 7.3 | 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.8 | ORPH wireshark | DISTRO | https://release-monitoring.org/project/05137 | 3.4.11 | 3.6.2 | ORPH wlroots | DISTRO | https://release-monitoring.org/project/18357 | 0.14.1 | 0.15.1 | wolfssl | DISTRO | https://release-monitoring.org/project/21631 | 4.8.1-stable | 5.2.0 | wpewebkit | DISTRO | https://release-monitoring.org/project/17557 | 2.34.6 | 2.35.90 | 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-input-libinput | DISTRO | https://release-monitoring.org/project/05782 | 1.2.0 | 1.2.1 | xdriver_xf86-video-amdgpu | DISTRO | https://release-monitoring.org/project/15900 | 19.1.0 | 22.0.0 | xen | DISTRO | https://release-monitoring.org/project/05181 | 4.14.4 | 4.16.0 | xinetd | DISTRO | https://release-monitoring.org/project/06382 | 2.3.15 | 2.3.15.4 | xkeyboard-config | DISTRO | https://release-monitoring.org/project/05191 | 2.34 | 2.35.1 | xmrig | DISTRO | https://release-monitoring.org/project/17499 | 6.16.3 | 6.16.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.19 | ORPH xterm | DISTRO | https://release-monitoring.org/project/05272 | 367 | 371 | ORPH yaml-cpp | DISTRO | https://release-monitoring.org/project/05284 | 0.6.3 | 0.7.0 | ORPH zabbix | DISTRO | https://release-monitoring.org/project/05492 | 5.4.9 | 6.0.0 | zchunk | DISTRO | https://release-monitoring.org/project/178035 | 1.1.16 | 1.2.0 | zfs | DISTRO | https://release-monitoring.org/project/11706 | 2.0.5 | 2.1.2 | 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 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 git | CVE-2022-24975 | https://security-tracker.debian.org/tracker/CVE-2022-24975 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 libbpf | CVE-2021-45940 | https://security-tracker.debian.org/tracker/CVE-2021-45940 libbpf | CVE-2021-45941 | https://security-tracker.debian.org/tracker/CVE-2021-45941 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 libpjsip | CVE-2021-37706 | https://security-tracker.debian.org/tracker/CVE-2021-37706 libpjsip | CVE-2021-41141 | https://security-tracker.debian.org/tracker/CVE-2021-41141 libpjsip | CVE-2021-43299 | https://security-tracker.debian.org/tracker/CVE-2021-43299 libpjsip | CVE-2021-43300 | https://security-tracker.debian.org/tracker/CVE-2021-43300 libpjsip | CVE-2021-43301 | https://security-tracker.debian.org/tracker/CVE-2021-43301 libpjsip | CVE-2021-43302 | https://security-tracker.debian.org/tracker/CVE-2021-43302 libpjsip | CVE-2021-43303 | https://security-tracker.debian.org/tracker/CVE-2021-43303 libpjsip | CVE-2021-43804 | https://security-tracker.debian.org/tracker/CVE-2021-43804 libpjsip | CVE-2021-43845 | https://security-tracker.debian.org/tracker/CVE-2021-43845 libpjsip | CVE-2022-21722 | https://security-tracker.debian.org/tracker/CVE-2022-21722 libpjsip | CVE-2022-21723 | https://security-tracker.debian.org/tracker/CVE-2022-21723 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 mariadb | CVE-2021-46658 | https://security-tracker.debian.org/tracker/CVE-2021-46658 mariadb | CVE-2021-46659 | https://security-tracker.debian.org/tracker/CVE-2021-46659 mariadb | CVE-2021-46661 | https://security-tracker.debian.org/tracker/CVE-2021-46661 mariadb | CVE-2021-46662 | https://security-tracker.debian.org/tracker/CVE-2021-46662 mariadb | CVE-2021-46663 | https://security-tracker.debian.org/tracker/CVE-2021-46663 mariadb | CVE-2021-46664 | https://security-tracker.debian.org/tracker/CVE-2021-46664 mariadb | CVE-2021-46665 | https://security-tracker.debian.org/tracker/CVE-2021-46665 mariadb | CVE-2021-46667 | https://security-tracker.debian.org/tracker/CVE-2021-46667 mariadb | CVE-2021-46668 | https://security-tracker.debian.org/tracker/CVE-2021-46668 mariadb | CVE-2021-46669 | https://security-tracker.debian.org/tracker/CVE-2021-46669 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 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 polkit | CVE-2021-4034 | https://security-tracker.debian.org/tracker/CVE-2021-4034 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-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-4145 | https://security-tracker.debian.org/tracker/CVE-2021-4145 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 samba4 | CVE-2021-44141 | https://security-tracker.debian.org/tracker/CVE-2021-44141 samba4 | CVE-2021-44142 | https://security-tracker.debian.org/tracker/CVE-2021-44142 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-0561 | https://security-tracker.debian.org/tracker/CVE-2022-0561 tiff | CVE-2022-0562 | https://security-tracker.debian.org/tracker/CVE-2022-0562 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 unzip | CVE-2022-0529 | https://security-tracker.debian.org/tracker/CVE-2022-0529 unzip | CVE-2022-0530 | https://security-tracker.debian.org/tracker/CVE-2022-0530 vim | CVE-2022-0554 | https://security-tracker.debian.org/tracker/CVE-2022-0554 vim | CVE-2022-0572 | https://security-tracker.debian.org/tracker/CVE-2022-0572 vim | CVE-2022-0629 | https://security-tracker.debian.org/tracker/CVE-2022-0629 wireshark | CVE-2022-0581 | https://security-tracker.debian.org/tracker/CVE-2022-0581 wireshark | CVE-2022-0582 | https://security-tracker.debian.org/tracker/CVE-2022-0582 wireshark | CVE-2022-0583 | https://security-tracker.debian.org/tracker/CVE-2022-0583 wireshark | CVE-2022-0585 | https://security-tracker.debian.org/tracker/CVE-2022-0585 wireshark | CVE-2022-0586 | https://security-tracker.debian.org/tracker/CVE-2022-0586 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-28707 | https://security-tracker.debian.org/tracker/CVE-2021-28707 xen | CVE-2021-28708 | https://security-tracker.debian.org/tracker/CVE-2021-28708 xen | CVE-2021-28711 | https://security-tracker.debian.org/tracker/CVE-2021-28711 xen | CVE-2021-28712 | https://security-tracker.debian.org/tracker/CVE-2021-28712 xen | CVE-2021-28713 | https://security-tracker.debian.org/tracker/CVE-2021-28713 xen | CVE-2022-23033 | https://security-tracker.debian.org/tracker/CVE-2022-23033 xen | CVE-2022-23035 | https://security-tracker.debian.org/tracker/CVE-2022-23035 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 xterm | CVE-2022-24130 | https://security-tracker.debian.org/tracker/CVE-2022-24130 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 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-2022-25235 | https://security-tracker.debian.org/tracker/CVE-2022-25235 expat | CVE-2022-25236 | https://security-tracker.debian.org/tracker/CVE-2022-25236 expat | CVE-2022-25313 | https://security-tracker.debian.org/tracker/CVE-2022-25313 expat | CVE-2022-25314 | https://security-tracker.debian.org/tracker/CVE-2022-25314 expat | CVE-2022-25315 | https://security-tracker.debian.org/tracker/CVE-2022-25315 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 git | CVE-2022-24975 | https://security-tracker.debian.org/tracker/CVE-2022-24975 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-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 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 hostapd | CVE-2022-23303 | https://security-tracker.debian.org/tracker/CVE-2022-23303 hostapd | CVE-2022-23304 | https://security-tracker.debian.org/tracker/CVE-2022-23304 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 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 libldns | CVE-2020-19860 | https://security-tracker.debian.org/tracker/CVE-2020-19860 libldns | CVE-2020-19861 | https://security-tracker.debian.org/tracker/CVE-2020-19861 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 libpjsip | CVE-2021-37706 | https://security-tracker.debian.org/tracker/CVE-2021-37706 libpjsip | CVE-2021-41141 | https://security-tracker.debian.org/tracker/CVE-2021-41141 libpjsip | CVE-2021-43299 | https://security-tracker.debian.org/tracker/CVE-2021-43299 libpjsip | CVE-2021-43300 | https://security-tracker.debian.org/tracker/CVE-2021-43300 libpjsip | CVE-2021-43301 | https://security-tracker.debian.org/tracker/CVE-2021-43301 libpjsip | CVE-2021-43302 | https://security-tracker.debian.org/tracker/CVE-2021-43302 libpjsip | CVE-2021-43303 | https://security-tracker.debian.org/tracker/CVE-2021-43303 libpjsip | CVE-2021-43804 | https://security-tracker.debian.org/tracker/CVE-2021-43804 libpjsip | CVE-2021-43845 | https://security-tracker.debian.org/tracker/CVE-2021-43845 libpjsip | CVE-2022-21722 | https://security-tracker.debian.org/tracker/CVE-2022-21722 libpjsip | CVE-2022-21723 | https://security-tracker.debian.org/tracker/CVE-2022-21723 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 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 mariadb | CVE-2021-46658 | https://security-tracker.debian.org/tracker/CVE-2021-46658 mariadb | CVE-2021-46659 | https://security-tracker.debian.org/tracker/CVE-2021-46659 mariadb | CVE-2021-46661 | https://security-tracker.debian.org/tracker/CVE-2021-46661 mariadb | CVE-2021-46662 | https://security-tracker.debian.org/tracker/CVE-2021-46662 mariadb | CVE-2021-46663 | https://security-tracker.debian.org/tracker/CVE-2021-46663 mariadb | CVE-2021-46664 | https://security-tracker.debian.org/tracker/CVE-2021-46664 mariadb | CVE-2021-46665 | https://security-tracker.debian.org/tracker/CVE-2021-46665 mariadb | CVE-2021-46667 | https://security-tracker.debian.org/tracker/CVE-2021-46667 mariadb | CVE-2021-46668 | https://security-tracker.debian.org/tracker/CVE-2021-46668 mariadb | CVE-2021-46669 | https://security-tracker.debian.org/tracker/CVE-2021-46669 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 minetest | CVE-2022-24300 | https://security-tracker.debian.org/tracker/CVE-2022-24300 minetest | CVE-2022-24301 | https://security-tracker.debian.org/tracker/CVE-2022-24301 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 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 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 polkit | CVE-2021-4034 | https://security-tracker.debian.org/tracker/CVE-2021-4034 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 protobuf | CVE-2021-22570 | https://security-tracker.debian.org/tracker/CVE-2021-22570 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 | CVE-2022-0391 | https://security-tracker.debian.org/tracker/CVE-2022-0391 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-ipython | CVE-2022-21699 | https://security-tracker.debian.org/tracker/CVE-2022-21699 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 python-twisted | CVE-2022-21712 | https://security-tracker.debian.org/tracker/CVE-2022-21712 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 qemu | CVE-2021-4145 | https://security-tracker.debian.org/tracker/CVE-2021-4145 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 rust | CVE-2022-21658 | https://security-tracker.debian.org/tracker/CVE-2022-21658 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 samba4 | CVE-2021-44141 | https://security-tracker.debian.org/tracker/CVE-2021-44141 samba4 | CVE-2021-44142 | https://security-tracker.debian.org/tracker/CVE-2021-44142 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 strongswan | CVE-2021-45079 | https://security-tracker.debian.org/tracker/CVE-2021-45079 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 tiff | CVE-2022-0561 | https://security-tracker.debian.org/tracker/CVE-2022-0561 tiff | CVE-2022-0562 | https://security-tracker.debian.org/tracker/CVE-2022-0562 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 unzip | CVE-2022-0529 | https://security-tracker.debian.org/tracker/CVE-2022-0529 unzip | CVE-2022-0530 | https://security-tracker.debian.org/tracker/CVE-2022-0530 vim | CVE-2022-0554 | https://security-tracker.debian.org/tracker/CVE-2022-0554 vim | CVE-2022-0572 | https://security-tracker.debian.org/tracker/CVE-2022-0572 vim | CVE-2022-0629 | https://security-tracker.debian.org/tracker/CVE-2022-0629 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-2022-0581 | https://security-tracker.debian.org/tracker/CVE-2022-0581 wireshark | CVE-2022-0582 | https://security-tracker.debian.org/tracker/CVE-2022-0582 wireshark | CVE-2022-0583 | https://security-tracker.debian.org/tracker/CVE-2022-0583 wireshark | CVE-2022-0585 | https://security-tracker.debian.org/tracker/CVE-2022-0585 wireshark | CVE-2022-0586 | https://security-tracker.debian.org/tracker/CVE-2022-0586 wpa_supplicant | CVE-2022-23303 | https://security-tracker.debian.org/tracker/CVE-2022-23303 wpa_supplicant | CVE-2022-23304 | https://security-tracker.debian.org/tracker/CVE-2022-23304 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-28707 | https://security-tracker.debian.org/tracker/CVE-2021-28707 xen | CVE-2021-28708 | https://security-tracker.debian.org/tracker/CVE-2021-28708 xen | CVE-2021-28711 | https://security-tracker.debian.org/tracker/CVE-2021-28711 xen | CVE-2021-28712 | https://security-tracker.debian.org/tracker/CVE-2021-28712 xen | CVE-2021-28713 | https://security-tracker.debian.org/tracker/CVE-2021-28713 xen | CVE-2022-23033 | https://security-tracker.debian.org/tracker/CVE-2022-23033 xen | CVE-2022-23035 | https://security-tracker.debian.org/tracker/CVE-2022-23035 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 xterm | CVE-2022-24130 | https://security-tracker.debian.org/tracker/CVE-2022-24130 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 zsh | CVE-2021-45444 | https://security-tracker.debian.org/tracker/CVE-2021-45444 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 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-2022-25235 | https://security-tracker.debian.org/tracker/CVE-2022-25235 expat | CVE-2022-25236 | https://security-tracker.debian.org/tracker/CVE-2022-25236 expat | CVE-2022-25313 | https://security-tracker.debian.org/tracker/CVE-2022-25313 expat | CVE-2022-25314 | https://security-tracker.debian.org/tracker/CVE-2022-25314 expat | CVE-2022-25315 | https://security-tracker.debian.org/tracker/CVE-2022-25315 ffmpeg | CVE-2021-38291 | https://security-tracker.debian.org/tracker/CVE-2021-38291 git | CVE-2022-24975 | https://security-tracker.debian.org/tracker/CVE-2022-24975 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 hostapd | CVE-2022-23303 | https://security-tracker.debian.org/tracker/CVE-2022-23303 hostapd | CVE-2022-23304 | https://security-tracker.debian.org/tracker/CVE-2022-23304 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 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 libldns | CVE-2020-19860 | https://security-tracker.debian.org/tracker/CVE-2020-19860 libldns | CVE-2020-19861 | https://security-tracker.debian.org/tracker/CVE-2020-19861 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libpjsip | CVE-2021-37706 | https://security-tracker.debian.org/tracker/CVE-2021-37706 libpjsip | CVE-2021-41141 | https://security-tracker.debian.org/tracker/CVE-2021-41141 libpjsip | CVE-2021-43299 | https://security-tracker.debian.org/tracker/CVE-2021-43299 libpjsip | CVE-2021-43300 | https://security-tracker.debian.org/tracker/CVE-2021-43300 libpjsip | CVE-2021-43301 | https://security-tracker.debian.org/tracker/CVE-2021-43301 libpjsip | CVE-2021-43302 | https://security-tracker.debian.org/tracker/CVE-2021-43302 libpjsip | CVE-2021-43303 | https://security-tracker.debian.org/tracker/CVE-2021-43303 libpjsip | CVE-2021-43804 | https://security-tracker.debian.org/tracker/CVE-2021-43804 libpjsip | CVE-2021-43845 | https://security-tracker.debian.org/tracker/CVE-2021-43845 libpjsip | CVE-2022-21722 | https://security-tracker.debian.org/tracker/CVE-2022-21722 libpjsip | CVE-2022-21723 | https://security-tracker.debian.org/tracker/CVE-2022-21723 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 mariadb | CVE-2021-46658 | https://security-tracker.debian.org/tracker/CVE-2021-46658 mariadb | CVE-2021-46659 | https://security-tracker.debian.org/tracker/CVE-2021-46659 mariadb | CVE-2021-46661 | https://security-tracker.debian.org/tracker/CVE-2021-46661 mariadb | CVE-2021-46662 | https://security-tracker.debian.org/tracker/CVE-2021-46662 mariadb | CVE-2021-46663 | https://security-tracker.debian.org/tracker/CVE-2021-46663 mariadb | CVE-2021-46664 | https://security-tracker.debian.org/tracker/CVE-2021-46664 mariadb | CVE-2021-46665 | https://security-tracker.debian.org/tracker/CVE-2021-46665 mariadb | CVE-2021-46667 | https://security-tracker.debian.org/tracker/CVE-2021-46667 mariadb | CVE-2021-46668 | https://security-tracker.debian.org/tracker/CVE-2021-46668 mariadb | CVE-2021-46669 | https://security-tracker.debian.org/tracker/CVE-2021-46669 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 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 polkit | CVE-2021-4034 | https://security-tracker.debian.org/tracker/CVE-2021-4034 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 | CVE-2022-0391 | https://security-tracker.debian.org/tracker/CVE-2022-0391 python-ipython | CVE-2022-21699 | https://security-tracker.debian.org/tracker/CVE-2022-21699 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 python-twisted | CVE-2022-21712 | https://security-tracker.debian.org/tracker/CVE-2022-21712 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 qemu | CVE-2021-4145 | https://security-tracker.debian.org/tracker/CVE-2021-4145 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 rust | CVE-2022-21658 | https://security-tracker.debian.org/tracker/CVE-2022-21658 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 samba4 | CVE-2021-44141 | https://security-tracker.debian.org/tracker/CVE-2021-44141 samba4 | CVE-2021-44142 | https://security-tracker.debian.org/tracker/CVE-2021-44142 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 strongswan | CVE-2021-45079 | https://security-tracker.debian.org/tracker/CVE-2021-45079 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-0561 | https://security-tracker.debian.org/tracker/CVE-2022-0561 tiff | CVE-2022-0562 | https://security-tracker.debian.org/tracker/CVE-2022-0562 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 unzip | CVE-2022-0529 | https://security-tracker.debian.org/tracker/CVE-2022-0529 unzip | CVE-2022-0530 | https://security-tracker.debian.org/tracker/CVE-2022-0530 vim | CVE-2022-0554 | https://security-tracker.debian.org/tracker/CVE-2022-0554 vim | CVE-2022-0572 | https://security-tracker.debian.org/tracker/CVE-2022-0572 vim | CVE-2022-0629 | https://security-tracker.debian.org/tracker/CVE-2022-0629 webkitgtk | CVE-2021-42762 | https://security-tracker.debian.org/tracker/CVE-2021-42762 wireshark | CVE-2022-0581 | https://security-tracker.debian.org/tracker/CVE-2022-0581 wireshark | CVE-2022-0582 | https://security-tracker.debian.org/tracker/CVE-2022-0582 wireshark | CVE-2022-0583 | https://security-tracker.debian.org/tracker/CVE-2022-0583 wireshark | CVE-2022-0585 | https://security-tracker.debian.org/tracker/CVE-2022-0585 wireshark | CVE-2022-0586 | https://security-tracker.debian.org/tracker/CVE-2022-0586 wpa_supplicant | CVE-2022-23303 | https://security-tracker.debian.org/tracker/CVE-2022-23303 wpa_supplicant | CVE-2022-23304 | https://security-tracker.debian.org/tracker/CVE-2022-23304 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-28707 | https://security-tracker.debian.org/tracker/CVE-2021-28707 xen | CVE-2021-28708 | https://security-tracker.debian.org/tracker/CVE-2021-28708 xen | CVE-2021-28711 | https://security-tracker.debian.org/tracker/CVE-2021-28711 xen | CVE-2021-28712 | https://security-tracker.debian.org/tracker/CVE-2021-28712 xen | CVE-2021-28713 | https://security-tracker.debian.org/tracker/CVE-2021-28713 xen | CVE-2022-23033 | https://security-tracker.debian.org/tracker/CVE-2022-23033 xen | CVE-2022-23035 | https://security-tracker.debian.org/tracker/CVE-2022-23035 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 xterm | CVE-2022-24130 | https://security-tracker.debian.org/tracker/CVE-2022-24130 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 zsh | CVE-2021-45444 | https://security-tracker.debian.org/tracker/CVE-2021-45444 -- http://autobuild.buildroot.net From nicolas.cavallari at green-communications.fr Mon Feb 28 08:57:00 2022 From: nicolas.cavallari at green-communications.fr (Nicolas Cavallari) Date: Mon, 28 Feb 2022 09:57:00 +0100 Subject: [Buildroot] [PATCH next v2 1/1] package/libgit2: bump version to 1.4.2 In-Reply-To: <20220222095340.29327-1-nicolas.cavallari@green-communications.fr> References: <20220222095340.29327-1-nicolas.cavallari@green-communications.fr> Message-ID: <20220228085659.17489-1-nicolas.cavallari@green-communications.fr> Licence changes mostly concern vendored dependencies (that buildroot does not use) and a new bundled PRNG used to reimplement mkstemp() Some buildsystem options also changed: - THREADSAFE is now USE_THREADS - BUILD_CLAR is now BUILD_TESTS, which the cmake infra already give. Signed-off-by: Nicolas Cavallari --- package/libgit2/libgit2.hash | 4 ++-- package/libgit2/libgit2.mk | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) v2: bump to 1.4.2 instead of 1.4.1 diff --git a/package/libgit2/libgit2.hash b/package/libgit2/libgit2.hash index 07b1a260a4..ada411ea22 100644 --- a/package/libgit2/libgit2.hash +++ b/package/libgit2/libgit2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 192eeff84596ff09efb6b01835a066f2df7cd7985e0991c79595688e6b36444e libgit2-1.3.0.tar.gz -sha256 8b7e4f54f8bf210c8fe010a49571a1ee57463ef020cc43f051d4d3fbb74942af COPYING +sha256 901c2b4492976b86477569502a41c31b274b69adc177149c02099ea88404ef19 libgit2-1.4.2.tar.gz +sha256 0092f24acc306ee3287dc05b5e85cb9e0e48cd3f11c60c4625b1a673a5912616 COPYING diff --git a/package/libgit2/libgit2.mk b/package/libgit2/libgit2.mk index 6cc0f1ea74..e94dd9c370 100644 --- a/package/libgit2/libgit2.mk +++ b/package/libgit2/libgit2.mk @@ -4,21 +4,20 @@ # ################################################################################ -LIBGIT2_VERSION = 1.3.0 +LIBGIT2_VERSION = 1.4.2 LIBGIT2_SITE = $(call github,libgit2,libgit2,v$(LIBGIT2_VERSION)) -LIBGIT2_LICENSE = GPL-2.0 with linking exception, MIT (sha1), wildmatch license (wildmatch) +LIBGIT2_LICENSE = GPL-2.0 with linking exception, MIT (sha1), wildmatch license (wildmatch), CC0-1.0 (xoroshiro256) LIBGIT2_LICENSE_FILES = COPYING LIBGIT2_CPE_ID_VENDOR = libgit2_project LIBGIT2_INSTALL_STAGING = YES LIBGIT2_CONF_OPTS = \ -DUSE_GSSAPI=OFF \ - -DBUILD_CLAR=OFF \ -DUSE_ICONV=ON \ -DREGEX_BACKEND=regcomp \ -DUSE_HTTP_PARSER=system \ -DUSE_NTLMCLIENT=OFF \ - -DTHREADSAFE=$(if $(BR2_TOOLCHAIN_HAS_THREADS),ON,OFF) + -DUSE_THREADS=$(if $(BR2_TOOLCHAIN_HAS_THREADS),ON,OFF) LIBGIT2_DEPENDENCIES = zlib libhttpparser -- 2.35.1 From jose.pekkarinen at unikie.com Mon Feb 28 10:18:40 2022 From: jose.pekkarinen at unikie.com (=?UTF-8?Q?Jos=C3=A9_Pekkarinen?=) Date: Mon, 28 Feb 2022 12:18:40 +0200 Subject: [Buildroot] [PATCH v4] package/opensc: new package In-Reply-To: <20220114070852.481719-1-jose.pekkarinen@unikie.com> References: <20220114070852.481719-1-jose.pekkarinen@unikie.com> Message-ID: Hi, Any comments to this patch? Thanks! Jos?. On Fri, Jan 14, 2022 at 9:08 AM Jos? Pekkarinen wrote: > > 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 > -- Jos?. From giulio.benetti at benettiengineering.com Mon Feb 28 12:02:43 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 28 Feb 2022 13:02:43 +0100 Subject: [Buildroot] [PATCH] package/at: bump version to 3.2.5 Message-ID: <20220228120243.3361127-1-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- package/at/at.hash | 2 +- package/at/at.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/at/at.hash b/package/at/at.hash index d4ad9aa436..be3e82f9f0 100644 --- a/package/at/at.hash +++ b/package/at/at.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 76990cbb6f4b9bfedb926637904fdcc0d4fa20b6596b9c932117a49a0624c684 at_3.2.4.orig.tar.gz +sha256 bb066b389d7c9bb9d84a35738032b85c30cba7d949f758192adc72c9477fd3b8 at_3.2.5.orig.tar.gz sha256 01dccc0975aa9ba1a9f83e7c5e04f16077353d3c72a0a759b8846ee7a5b2b616 Copyright sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 COPYING diff --git a/package/at/at.mk b/package/at/at.mk index 26c44f5287..ed38def337 100644 --- a/package/at/at.mk +++ b/package/at/at.mk @@ -4,7 +4,7 @@ # ################################################################################ -AT_VERSION = 3.2.4 +AT_VERSION = 3.2.5 AT_SOURCE = at_$(AT_VERSION).orig.tar.gz AT_SITE = http://software.calhariz.com/at AT_DEPENDENCIES = $(if $(BR2_PACKAGE_FLEX),flex) host-bison host-flex -- 2.25.1 From buildroot at uclibc.org Mon Feb 28 12:21:03 2022 From: buildroot at uclibc.org (buildroot) Date: Mon, 28 Feb 2022 20:21:03 +0800 Subject: [Buildroot] =?utf-8?q?wholesale_old_mobile_phones_at_cheap_price?= =?utf-8?q?s?= Message-ID: <20220228122106.868AC40275@smtp2.osuosl.org> An HTML attachment was scrubbed... URL: From buildroot at busybox.net Mon Feb 28 12:31:54 2022 From: buildroot at busybox.net (buildroot) Date: Mon, 28 Feb 2022 20:31:54 +0800 Subject: [Buildroot] =?utf-8?q?wholesale_old_mobile_phones_at_cheap_price?= =?utf-8?q?s?= Message-ID: <20220228123156.A9AFF81A92@smtp1.osuosl.org> An HTML attachment was scrubbed... URL: From buildroot at uclibc.org Mon Feb 28 12:31:54 2022 From: buildroot at uclibc.org (buildroot) Date: Mon, 28 Feb 2022 20:31:54 +0800 Subject: [Buildroot] =?utf-8?q?wholesale_old_mobile_phones_at_cheap_price?= =?utf-8?q?s?= Message-ID: <20220228123157.05AA54014B@smtp2.osuosl.org> An HTML attachment was scrubbed... URL: From buildroot at uclibc.org Mon Feb 28 12:35:26 2022 From: buildroot at uclibc.org (buildroot) Date: Mon, 28 Feb 2022 20:35:26 +0800 Subject: [Buildroot] =?utf-8?q?wholesale_old_mobile_phones_at_cheap_price?= =?utf-8?q?s?= Message-ID: <20220228123532.AC6AA60B3A@smtp3.osuosl.org> An HTML attachment was scrubbed... URL: From buildroot at uclibc.org Mon Feb 28 14:06:10 2022 From: buildroot at uclibc.org (buildroot) Date: Mon, 28 Feb 2022 22:06:10 +0800 Subject: [Buildroot] =?utf-8?q?wholesale_old_mobile_phones_at_cheap_price?= =?utf-8?q?s?= Message-ID: <20220228140613.E6B0C60BA4@smtp3.osuosl.org> An HTML attachment was scrubbed... URL: From buildroot at busybox.net Mon Feb 28 14:06:34 2022 From: buildroot at busybox.net (buildroot) Date: Mon, 28 Feb 2022 22:06:34 +0800 Subject: [Buildroot] =?utf-8?q?wholesale_old_mobile_phones_at_cheap_price?= =?utf-8?q?s?= Message-ID: <20220228140636.EEF8D81ADE@smtp1.osuosl.org> An HTML attachment was scrubbed... URL: From theo.lebrun at bootlin.com Mon Feb 28 16:13:45 2022 From: theo.lebrun at bootlin.com (=?UTF-8?q?Th=C3=A9o=20Lebrun?=) Date: Mon, 28 Feb 2022 17:13:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/wireplumber: bump version to 0.4.8 Message-ID: <20220228161345.378966-1-theo.lebrun@bootlin.com> Changelog: https://gitlab.freedesktop.org/pipewire/wireplumber/-/blob/e14bb72dcc85e2130d0ea96768e5ae3b375a041e/NEWS.rst Signed-off-by: Th?o Lebrun --- package/wireplumber/wireplumber.hash | 2 +- package/wireplumber/wireplumber.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/wireplumber/wireplumber.hash b/package/wireplumber/wireplumber.hash index 561fcc2e5e..206d7d15af 100644 --- a/package/wireplumber/wireplumber.hash +++ b/package/wireplumber/wireplumber.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 41f174eaae5a630e195001fdd580918fa5143a71edceb050b320f85a8e65e53b wireplumber-0.4.2.tar.bz2 +sha256 6429e8a95e355ce21b4c4f1a5ebc769f037e8dbeec51905ad909ce609a38d0ce wireplumber-0.4.8.tar.bz2 sha256 ff2eb9af5b05d92ac3a38cffcad27582ef555a31ff1781e1c1d4e087f77c9c81 LICENSE diff --git a/package/wireplumber/wireplumber.mk b/package/wireplumber/wireplumber.mk index 2dab6042ea..3bf7cece45 100644 --- a/package/wireplumber/wireplumber.mk +++ b/package/wireplumber/wireplumber.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIREPLUMBER_VERSION = 0.4.2 +WIREPLUMBER_VERSION = 0.4.8 WIREPLUMBER_SOURCE = wireplumber-$(WIREPLUMBER_VERSION).tar.bz2 WIREPLUMBER_SITE = https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/$(WIREPLUMBER_VERSION) WIREPLUMBER_LICENSE = MIT -- 2.35.1 From remi.duraffort at linaro.org Mon Feb 28 16:26:32 2022 From: remi.duraffort at linaro.org (=?UTF-8?q?R=C3=A9mi=20Duraffort?=) Date: Mon, 28 Feb 2022 17:26:32 +0100 Subject: [Buildroot] [PATCH 1/1] linux: fix kernel image format for aarch64 BE Message-ID: <20220228162632.2777188-1-remi.duraffort@linaro.org> Signed-off-by: R?mi Duraffort --- linux/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 13d99bd09d..1f2a8db545 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -261,11 +261,11 @@ config BR2_LINUX_KERNEL_SIMPLEIMAGE config BR2_LINUX_KERNEL_IMAGE bool "Image" - depends on BR2_aarch64 || BR2_riscv + depends on BR2_aarch64 || BR2_riscv || BR2_aarch64_be config BR2_LINUX_KERNEL_IMAGEGZ bool "Image.gz" - depends on BR2_aarch64 || BR2_riscv + depends on BR2_aarch64 || BR2_riscv || BR2_aarch64_be config BR2_LINUX_KERNEL_LINUX_BIN bool "linux.bin" -- 2.34.1 From theo.lebrun at bootlin.com Mon Feb 28 16:32:38 2022 From: theo.lebrun at bootlin.com (=?UTF-8?q?Th=C3=A9o=20Lebrun?=) Date: Mon, 28 Feb 2022 17:32:38 +0100 Subject: [Buildroot] [PATCH 2/2] docs: fix links to AsciiDoc Message-ID: <20220228163238.405627-1-theo.lebrun@bootlin.com> Links were aimed at the methods.co.nz domain, which is now returning 404s. The current situation of AsciiDoc is unclear to me: the Fedora package points to this website, they own asciidoc.org, Wikipedia points to this project as well but their Git repo's README includes the following paragraph: > AsciiDoc.py is a legacy processor for this syntax, handling an older > rendition of AsciiDoc. As such, this will not properly handle the > current AsciiDoc specification. It is suggested that unless you > specifically require the AsciiDoc.py toolchain, you should find a > processor that handles the modern AsciiDoc syntax. --- https://github.com/asciidoc-py/asciidoc-py/blob/10.1.3/README.md "AsciiDoc specification" pointing towards: https://projects.eclipse.org/projects/asciidoc.asciidoc-lang Signed-off-by: Th?o Lebrun --- docs/conf/asciidoc-text.conf | 2 +- docs/manual/writing-rules.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/conf/asciidoc-text.conf b/docs/conf/asciidoc-text.conf index 470bdecfc2..bb614b9d85 100644 --- a/docs/conf/asciidoc-text.conf +++ b/docs/conf/asciidoc-text.conf @@ -1,5 +1,5 @@ # Refer to following asciidoc documentation: -# http://www.methods.co.nz/asciidoc/userguide.html +# https://asciidoc-py.github.io/userguide.html # In particular sections "Macros" and "Attribute References" # # For hyperlinks, show 'link text [URL]' (if link text provided) or 'URL' diff --git a/docs/manual/writing-rules.txt b/docs/manual/writing-rules.txt index 57ba61bdb1..84d8f76431 100644 --- a/docs/manual/writing-rules.txt +++ b/docs/manual/writing-rules.txt @@ -207,10 +207,10 @@ https://github.com/pengutronix/genimage/blob/master/README.rst[]. === The documentation The documentation uses the -http://www.methods.co.nz/asciidoc/[asciidoc] format. +https://asciidoc-py.github.io/[asciidoc] format. For further details about the asciidoc syntax, refer to -http://www.methods.co.nz/asciidoc/userguide.html[]. +https://asciidoc-py.github.io/userguide.html[]. === Support scripts -- 2.35.1 From fontaine.fabrice at gmail.com Mon Feb 28 17:52:45 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 28 Feb 2022 18:52:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/libxml2: security bump to version 2.9.13 Message-ID: <20220228175245.1585-1-fontaine.fabrice@gmail.com> Fix the following security issues: - [CVE-2022-23308] Use-after-free of ID and IDREF attributes - Use-after-free in xmlXIncludeCopyRange - Fix Null-deref-in-xmlSchemaGetComponentTargetNs - Fix memory leak in xmlXPathCompNodeTest - Fix null pointer deref in xmlStringGetNodeList - Fix several memory leaks found by Coverity https://gitlab.gnome.org/GNOME/libxml2/-/tags/v2.9.13 Signed-off-by: Fabrice Fontaine --- package/libxml2/libxml2.hash | 4 ++-- package/libxml2/libxml2.mk | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/package/libxml2/libxml2.hash b/package/libxml2/libxml2.hash index ce6c3c4825..81ac3e3f31 100644 --- a/package/libxml2/libxml2.hash +++ b/package/libxml2/libxml2.hash @@ -1,4 +1,4 @@ -# Locally calculated after checking pgp signature -sha256 c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92 libxml2-2.9.12.tar.gz +# From http://ftp.acc.umu.se/pub/gnome/sources/libxml2/2.9/libxml2-2.9.13.sha256sum +sha256 276130602d12fe484ecc03447ee5e759d0465558fbc9d6bd144e3745306ebf0e libxml2-2.9.13.tar.xz # License files, locally calculated sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd COPYING diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk index 023a461472..5382f28ec4 100644 --- a/package/libxml2/libxml2.mk +++ b/package/libxml2/libxml2.mk @@ -4,8 +4,11 @@ # ################################################################################ -LIBXML2_VERSION = 2.9.12 -LIBXML2_SITE = http://xmlsoft.org/sources +LIBXML2_VERSION_MAJOR = 2.9 +LIBXML2_VERSION = $(LIBXML2_VERSION_MAJOR).13 +LIBXML2_SOURCE = libxml2-$(LIBXML2_VERSION).tar.xz +LIBXML2_SITE = \ + http://ftp.gnome.org/pub/gnome/sources/libxml2/$(LIBXML2_VERSION_MAJOR) LIBXML2_INSTALL_STAGING = YES LIBXML2_LICENSE = MIT LIBXML2_LICENSE_FILES = COPYING -- 2.34.1 From peter at korsgaard.com Mon Feb 28 18:37:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 19:37:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/wireshark: security bump to version 3.4.12 In-Reply-To: <20220226181045.2922875-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 26 Feb 2022 19:10:45 +0100") References: <20220226181045.2922875-1-fontaine.fabrice@gmail.com> Message-ID: <87ilsy25y6.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2021-4190, CVE-2022-0581, CVE-2022-0582, CVE-2022-0583, > CVE-2022-0585 and CVE-2022-0586 > https://www.wireshark.org/security/wnpa-sec-2021-22.html > https://www.wireshark.org/security/wnpa-sec-2022-01.html > https://www.wireshark.org/security/wnpa-sec-2022-02.html > https://www.wireshark.org/security/wnpa-sec-2022-03.html > https://www.wireshark.org/security/wnpa-sec-2022-04.html > https://www.wireshark.org/security/wnpa-sec-2022-05.html > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 28 18:37:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 19:37:28 +0100 Subject: [Buildroot] [PATCH 1/1] package/xterm: security bump to version 371 In-Reply-To: <20220226181508.3011361-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 26 Feb 2022 19:15:08 +0100") References: <20220226181508.3011361-1-fontaine.fabrice@gmail.com> Message-ID: <87ee3m25xz.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2022-24130: xterm through Patch 370, when Sixel support is > enabled, allows attackers to trigger a buffer overflow in set_sixel in > graphics_sixel.c via crafted text. > Update hash of COPYING (update in year) > https://invisible-island.net/xterm/xterm.log.html#xterm_371 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 28 18:42:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 19:42:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/wolfssl: security bump to version 5.2.0 In-Reply-To: <20220226185033.3097401-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 26 Feb 2022 19:50:33 +0100") References: <20220226185033.3097401-1-fontaine.fabrice@gmail.com> Message-ID: <875yoy25pc.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2021-44718, CVE-2022-23408, CVE-2022-25638 and CVE-2022-25640 > https://www.wolfssl.com/docs/security-vulnerabilities > https://github.com/wolfSSL/wolfssl/blob/v5.2.0-stable/ChangeLog.md > Signed-off-by: Fabrice Fontaine A bit annoying that this is only available together with new features, but OK. Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 28 18:43:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 19:43:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/freerdp: fix build with libexecinfo In-Reply-To: <20220227091140.3643535-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 27 Feb 2022 10:11:40 +0100") References: <20220227091140.3643535-1-fontaine.fabrice@gmail.com> Message-ID: <871qzm25o5.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure raised on uclibc and musl since the > addition of libexecinfo package in commit > eea8ba446c10701a273432552108d80fb2224ef4: > /home/buildroot/autobuild/instance-0/output-1/host/lib/gcc/riscv64-buildroot-linux-uclibc/10.3.0/../../../../riscv64-buildroot-linux-uclibc/bin/ld: > ../../libwinpr/libwinpr2.so.2.5.0: undefined reference to > `backtrace_symbols_fd' > Fixes: > - http://autobuild.buildroot.org/results/095c33098a6e59ff664080e03baf1a3c92b4265f > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 28 18:44:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 19:44:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/libxml2: security bump to version 2.9.13 In-Reply-To: <20220228175245.1585-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 28 Feb 2022 18:52:45 +0100") References: <20220228175245.1585-1-fontaine.fabrice@gmail.com> Message-ID: <87wnhezv93.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following security issues: > - [CVE-2022-23308] Use-after-free of ID and IDREF attributes > - Use-after-free in xmlXIncludeCopyRange > - Fix Null-deref-in-xmlSchemaGetComponentTargetNs > - Fix memory leak in xmlXPathCompNodeTest > - Fix null pointer deref in xmlStringGetNodeList > - Fix several memory leaks found by Coverity > https://gitlab.gnome.org/GNOME/libxml2/-/tags/v2.9.13 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 28 18:39:12 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 19:39:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/exempi: security bump to version 2.6.1 In-Reply-To: <20220226183423.3086505-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 26 Feb 2022 19:34:23 +0100") References: <20220226183423.3086505-1-fontaine.fabrice@gmail.com> Message-ID: <87a6ea25v3.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Extract from NEWS: > - Changes in v2021.08 > - Security Fixes > - Changes in v2021.07 > - Security Fixes > https://gitlab.freedesktop.org/libopenraw/exempi/-/blob/2.6.1/NEWS > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 28 18:46:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 19:46:19 +0100 Subject: [Buildroot] [PATCH 1/1] package/libpjsip: security bump to version 2.12 In-Reply-To: <20220226160503.2703879-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 26 Feb 2022 17:05:03 +0100") References: <20220226160503.2703879-1-fontaine.fabrice@gmail.com> Message-ID: <87sfs2zv5w.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following security issues (i.e. CVE-2021-37706, CVE-2021-41141, > CVE-2021-43804, CVE-2021-43845, CVE-2022-21722 and CVE-2022-21723): > - Potential integer underflow upon receiving STUN message > (GHSA-2qpg-f6wf-w984) > - Use after free of dialog set (GHSA-ffff-m5fm-qm62) > - Missing unreleased of locks in failure cases (GHSA-8fmx-hqw7-6gmc) > - Potential out-of-bounds read when parsing RTCP BYE message > (GHSA-3qx3-cg72-wrh9) > - Prevent OOB read for RTCP XR block (GHSA-r374-qrwv-86hh) > - Potential buffer overflow in pjsua_player_create(), > pjsua_recorder_create(), pjmedia_wav_player_create(), and > pjsua_call_dump() (GHSA-qcvw-h34v-c7r9) > - Potential out-of-bound read during RTP/RTCP parsing > (GHSA-m66q-q64c-hv36) > - Prevent OOB read in multipart parsing (GHSA-7fw8-54cv-r7pm) > - Use after free of dialog set (GHSA-ffff-m5fm-qm62) > https://github.com/pjsip/pjproject/releases/tag/2.12 > Signed-off-by: Fabrice Fontaine > --- > package/libpjsip/libpjsip.hash | 2 +- > package/libpjsip/libpjsip.mk | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > diff --git a/package/libpjsip/libpjsip.hash b/package/libpjsip/libpjsip.hash > index f39ebf4060..74331ab6fb 100644 > --- a/package/libpjsip/libpjsip.hash > +++ b/package/libpjsip/libpjsip.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 45f6604372df3f49293749cd7c0b42cb21c4fb666c66f8ed9765de004d1eae38 pjproject-2.11.1.tar.gz > +sha256 b3b94d9be4aba8f6d2d1cb164603e81b0a6ee17352f9e2ba5b58e325e610ca5a pjproject-2.12.tar.gz > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk > index b05cc31a83..32cfa8c53c 100644 > --- a/package/libpjsip/libpjsip.mk > +++ b/package/libpjsip/libpjsip.mk > @@ -4,10 +4,10 @@ > # > ################################################################################ > -LIBPJSIP_VERSION = 2.11.1 > +LIBPJSIP_VERSION = 2.12 > LIBPJSIP_SOURCE = pjproject-$(LIBPJSIP_VERSION).tar.gz > LIBPJSIP_SITE = $(call github,pjsip,pjproject,$(LIBPJSIP_VERSION)) > -# https://github.com/pjsip/pjproject/archive/2.11.1.tar.gz > +# https://github.com/pjsip/pjproject/archive/2.12.tar.gz That comment doesn't look very useful. Oh well - Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 28 18:36:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 19:36:37 +0100 Subject: [Buildroot] [git commit] package/wireshark: security bump to version 3.4.12 Message-ID: <20220228184000.8BC6D83611@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=db0f8006c1c8685dc98446b5b9e768e52d2f2591 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2021-4190, CVE-2022-0581, CVE-2022-0582, CVE-2022-0583, CVE-2022-0585 and CVE-2022-0586 https://www.wireshark.org/security/wnpa-sec-2021-22.html https://www.wireshark.org/security/wnpa-sec-2022-01.html https://www.wireshark.org/security/wnpa-sec-2022-02.html https://www.wireshark.org/security/wnpa-sec-2022-03.html https://www.wireshark.org/security/wnpa-sec-2022-04.html https://www.wireshark.org/security/wnpa-sec-2022-05.html Signed-off-by: Fabrice Fontaine 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 7b67e316ed..db1f71e9ef 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.11.txt -sha1 b656d8709b8b0b3d2a94665af6bec88495ad994c wireshark-3.4.11.tar.xz -sha256 a0e227bce2cc3a51ef3301891a0243231990b52a39b68a84a6e32f69c4e75279 wireshark-3.4.11.tar.xz +# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.4.12.txt +sha1 91ca69b0029e58b9c824266237ab392a62f0a248 wireshark-3.4.12.tar.xz +sha256 881a13303e263b7dc7fe337534c8a541d4914552287879bed30bbe76c5bf68ca wireshark-3.4.12.tar.xz # Locally calculated sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf COPYING diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index 0361d0bb64..a5ca4b1f73 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 3.4.11 +WIRESHARK_VERSION = 3.4.12 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 Mon Feb 28 18:39:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 19:39:01 +0100 Subject: [Buildroot] [git commit] package/exempi: security bump to version 2.6.1 Message-ID: <20220228184000.9DF65837AA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=55f1d0a3592253df2a356c195e5131a970eade9b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Extract from NEWS: - Changes in v2021.08 - Security Fixes - Changes in v2021.07 - Security Fixes https://gitlab.freedesktop.org/libopenraw/exempi/-/blob/2.6.1/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/exempi/exempi.hash | 2 +- package/exempi/exempi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/exempi/exempi.hash b/package/exempi/exempi.hash index 5ea9683053..5df610de17 100644 --- a/package/exempi/exempi.hash +++ b/package/exempi/exempi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 52f54314aefd45945d47a6ecf4bd21f362e6467fa5d0538b0d45a06bc6eaaed5 exempi-2.5.2.tar.bz2 +sha256 072451ac1e0dc97ed69a2e5bfc235fd94fe093d837f65584d0e3581af5db18cd exempi-2.6.1.tar.bz2 sha256 3d3c3593c15e0d35bdae0df7c642106250f6be3adc61477419413900f23ae607 COPYING diff --git a/package/exempi/exempi.mk b/package/exempi/exempi.mk index f481469d2c..56fbe20379 100644 --- a/package/exempi/exempi.mk +++ b/package/exempi/exempi.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXEMPI_VERSION = 2.5.2 +EXEMPI_VERSION = 2.6.1 EXEMPI_SOURCE = exempi-$(EXEMPI_VERSION).tar.bz2 EXEMPI_SITE = https://libopenraw.freedesktop.org/download EXEMPI_INSTALL_STAGING = YES From peter at korsgaard.com Mon Feb 28 18:36:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 19:36:50 +0100 Subject: [Buildroot] [git commit] package/xterm: security bump to version 371 Message-ID: <20220228184000.94BFF823A2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2de5cd85423083662eb0625978ef6da7577d76c6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2022-24130: xterm through Patch 370, when Sixel support is enabled, allows attackers to trigger a buffer overflow in set_sixel in graphics_sixel.c via crafted text. Update hash of COPYING (update in year) https://invisible-island.net/xterm/xterm.log.html#xterm_371 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/xterm/xterm.hash | 4 ++-- package/xterm/xterm.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/xterm/xterm.hash b/package/xterm/xterm.hash index d6d80ad977..3f6ec765ce 100644 --- a/package/xterm/xterm.hash +++ b/package/xterm/xterm.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 27f1a8b1c756e269fd5684e60802b545f0be9b36b8b5d6bdbc840c6b000dc51f xterm-367.tgz +sha256 32f888277b19e28ebc0a3112bff000607c07bed0679caa0beebb36f9cad484f5 xterm-371.tgz # Locally calculated -sha256 dfb668cc977e24649500f3cc54de3e2b793928d210715a445ab1227930b07ba6 COPYING +sha256 9521ef761474cd31ea406f56a751646a7b42a9287cdc6f2f8e52ed4c4d2a73e7 COPYING diff --git a/package/xterm/xterm.mk b/package/xterm/xterm.mk index e09d350a7d..95984f1cf9 100644 --- a/package/xterm/xterm.mk +++ b/package/xterm/xterm.mk @@ -4,7 +4,7 @@ # ################################################################################ -XTERM_VERSION = 367 +XTERM_VERSION = 371 XTERM_SOURCE = xterm-$(XTERM_VERSION).tgz XTERM_SITE = http://invisible-mirror.net/archives/xterm XTERM_DEPENDENCIES = ncurses xlib_libXaw host-pkgconf From peter at korsgaard.com Mon Feb 28 18:45:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 19:45:24 +0100 Subject: [Buildroot] [git commit] package/libpjsip: security bump to version 2.12 Message-ID: <20220228184000.C460583611@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5ed26bb378c02f2ce7f7377481853b12ad55d808 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following security issues (i.e. CVE-2021-37706, CVE-2021-41141, CVE-2021-43804, CVE-2021-43845, CVE-2022-21722 and CVE-2022-21723): - Potential integer underflow upon receiving STUN message (GHSA-2qpg-f6wf-w984) - Use after free of dialog set (GHSA-ffff-m5fm-qm62) - Missing unreleased of locks in failure cases (GHSA-8fmx-hqw7-6gmc) - Potential out-of-bounds read when parsing RTCP BYE message (GHSA-3qx3-cg72-wrh9) - Prevent OOB read for RTCP XR block (GHSA-r374-qrwv-86hh) - Potential buffer overflow in pjsua_player_create(), pjsua_recorder_create(), pjmedia_wav_player_create(), and pjsua_call_dump() (GHSA-qcvw-h34v-c7r9) - Potential out-of-bound read during RTP/RTCP parsing (GHSA-m66q-q64c-hv36) - Prevent OOB read in multipart parsing (GHSA-7fw8-54cv-r7pm) - Use after free of dialog set (GHSA-ffff-m5fm-qm62) https://github.com/pjsip/pjproject/releases/tag/2.12 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libpjsip/libpjsip.hash | 2 +- package/libpjsip/libpjsip.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libpjsip/libpjsip.hash b/package/libpjsip/libpjsip.hash index f39ebf4060..74331ab6fb 100644 --- a/package/libpjsip/libpjsip.hash +++ b/package/libpjsip/libpjsip.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 45f6604372df3f49293749cd7c0b42cb21c4fb666c66f8ed9765de004d1eae38 pjproject-2.11.1.tar.gz +sha256 b3b94d9be4aba8f6d2d1cb164603e81b0a6ee17352f9e2ba5b58e325e610ca5a pjproject-2.12.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk index b05cc31a83..32cfa8c53c 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -4,10 +4,10 @@ # ################################################################################ -LIBPJSIP_VERSION = 2.11.1 +LIBPJSIP_VERSION = 2.12 LIBPJSIP_SOURCE = pjproject-$(LIBPJSIP_VERSION).tar.gz LIBPJSIP_SITE = $(call github,pjsip,pjproject,$(LIBPJSIP_VERSION)) -# https://github.com/pjsip/pjproject/archive/2.11.1.tar.gz +# https://github.com/pjsip/pjproject/archive/2.12.tar.gz LIBPJSIP_DEPENDENCIES = libsrtp LIBPJSIP_LICENSE = GPL-2.0+ From peter at korsgaard.com Mon Feb 28 18:41:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 19:41:42 +0100 Subject: [Buildroot] [git commit] package/wolfssl: security bump to version 5.2.0 Message-ID: <20220228184000.A7BEF83611@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=14e0c4de719a0d63192cc5de66a608f75297f37d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2021-44718, CVE-2022-23408, CVE-2022-25638 and CVE-2022-25640 https://www.wolfssl.com/docs/security-vulnerabilities https://github.com/wolfSSL/wolfssl/blob/v5.2.0-stable/ChangeLog.md Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/wolfssl/wolfssl.hash | 2 +- package/wolfssl/wolfssl.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/wolfssl/wolfssl.hash b/package/wolfssl/wolfssl.hash index 9896713ca7..63eebf93bb 100644 --- a/package/wolfssl/wolfssl.hash +++ b/package/wolfssl/wolfssl.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 50db45f348f47e00c93dd244c24108220120cb3cc9d01434789229c32937c444 wolfssl-4.8.1-stable.tar.gz +sha256 409b4646c5f54f642de0e9f3544c3b83de7238134f5b1ff93fb44527bf119d05 wolfssl-5.2.0.tar.gz # Hash for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/wolfssl/wolfssl.mk b/package/wolfssl/wolfssl.mk index d3dce0a401..bfb54445e4 100644 --- a/package/wolfssl/wolfssl.mk +++ b/package/wolfssl/wolfssl.mk @@ -4,8 +4,8 @@ # ################################################################################ -WOLFSSL_VERSION = 4.8.1-stable -WOLFSSL_SITE = $(call github,wolfSSL,wolfssl,v$(WOLFSSL_VERSION)) +WOLFSSL_VERSION = 5.2.0 +WOLFSSL_SITE = $(call github,wolfSSL,wolfssl,v$(WOLFSSL_VERSION)-stable) WOLFSSL_INSTALL_STAGING = YES WOLFSSL_LICENSE = GPL-2.0+ From peter at korsgaard.com Mon Feb 28 18:43:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 19:43:53 +0100 Subject: [Buildroot] [git commit] package/libxml2: security bump to version 2.9.13 Message-ID: <20220228184000.BA97E837AA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4b6703847376838d0b091acd9b0e0193b6439657 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following security issues: - [CVE-2022-23308] Use-after-free of ID and IDREF attributes - Use-after-free in xmlXIncludeCopyRange - Fix Null-deref-in-xmlSchemaGetComponentTargetNs - Fix memory leak in xmlXPathCompNodeTest - Fix null pointer deref in xmlStringGetNodeList - Fix several memory leaks found by Coverity https://gitlab.gnome.org/GNOME/libxml2/-/tags/v2.9.13 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libxml2/libxml2.hash | 4 ++-- package/libxml2/libxml2.mk | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/package/libxml2/libxml2.hash b/package/libxml2/libxml2.hash index ce6c3c4825..81ac3e3f31 100644 --- a/package/libxml2/libxml2.hash +++ b/package/libxml2/libxml2.hash @@ -1,4 +1,4 @@ -# Locally calculated after checking pgp signature -sha256 c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92 libxml2-2.9.12.tar.gz +# From http://ftp.acc.umu.se/pub/gnome/sources/libxml2/2.9/libxml2-2.9.13.sha256sum +sha256 276130602d12fe484ecc03447ee5e759d0465558fbc9d6bd144e3745306ebf0e libxml2-2.9.13.tar.xz # License files, locally calculated sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd COPYING diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk index 023a461472..5382f28ec4 100644 --- a/package/libxml2/libxml2.mk +++ b/package/libxml2/libxml2.mk @@ -4,8 +4,11 @@ # ################################################################################ -LIBXML2_VERSION = 2.9.12 -LIBXML2_SITE = http://xmlsoft.org/sources +LIBXML2_VERSION_MAJOR = 2.9 +LIBXML2_VERSION = $(LIBXML2_VERSION_MAJOR).13 +LIBXML2_SOURCE = libxml2-$(LIBXML2_VERSION).tar.xz +LIBXML2_SITE = \ + http://ftp.gnome.org/pub/gnome/sources/libxml2/$(LIBXML2_VERSION_MAJOR) LIBXML2_INSTALL_STAGING = YES LIBXML2_LICENSE = MIT LIBXML2_LICENSE_FILES = COPYING From peter at korsgaard.com Mon Feb 28 18:43:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 19:43:17 +0100 Subject: [Buildroot] [git commit] package/freerdp: fix build with libexecinfo Message-ID: <20220228184000.B1B5B836D7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=96cb2d5c0c55b7f68810e1e1b5a3344521df4db7 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-0/output-1/host/lib/gcc/riscv64-buildroot-linux-uclibc/10.3.0/../../../../riscv64-buildroot-linux-uclibc/bin/ld: ../../libwinpr/libwinpr2.so.2.5.0: undefined reference to `backtrace_symbols_fd' Fixes: - http://autobuild.buildroot.org/results/095c33098a6e59ff664080e03baf1a3c92b4265f Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/freerdp/freerdp.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk index c536f6cb1c..5f6ae56d1d 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -43,6 +43,11 @@ else FREERDP_CONF_OPTS += -DWITH_ALSA=OFF endif +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +FREERDP_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-lexecinfo +FREERDP_DEPENDENCIES += libexecinfo +endif + ifeq ($(BR2_PACKAGE_LIBUSB),y) FREERDP_CONF_OPTS += -DCHANNEL_URBDRC=ON FREERDP_DEPENDENCIES += libusb From peter at korsgaard.com Mon Feb 28 18:51:25 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 19:51:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/mariadb: security bump to version 10.3.34 In-Reply-To: <20220213202407.1205912-1-fontaine.fabrice@gmail.com> References: <20220213202407.1205912-1-fontaine.fabrice@gmail.com> Message-ID: Hi, On 13/02/2022 21.24, Fabrice Fontaine wrote: > Fix CVE-2021-46665, CVE-2021-46664, CVE-2021-46661, CVE-2021-46668, > CVE-2021-46663, CVE-2022-24052, CVE-2022-24051, CVE-2022-24050, > CVE-2022-24048, CVE-2021-46659, CVE-2021-35604, CVE-2021-46667, > CVE-2021-46662, CVE-2021-2372, CVE-2021-2389 and CVE-2021-46658 > > Update hash of README.md (changes not related to license: > https://github.com/MariaDB/server/commit/773a07b65517327add6348c045cee14bdf489fe0) > > https://mariadb.com/kb/en/mariadb-10334-release-notes/ > https://mariadb.com/kb/en/mariadb-10333-release-notes/ > https://mariadb.com/kb/en/mariadb-10332-release-notes/ > https://mariadb.com/kb/en/mariadb-10331-release-notes/ > > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 28 18:48:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 19:48:32 +0100 Subject: [Buildroot] [git commit] package/mariadb: security bump to version 10.3.34 Message-ID: <20220228184330.D9105821E8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e7a9a1bce4b081a721799ff62ee5fff8456203ce branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2021-46665, CVE-2021-46664, CVE-2021-46661, CVE-2021-46668, CVE-2021-46663, CVE-2022-24052, CVE-2022-24051, CVE-2022-24050, CVE-2022-24048, CVE-2021-46659, CVE-2021-35604, CVE-2021-46667, CVE-2021-46662, CVE-2021-2372, CVE-2021-2389 and CVE-2021-46658 Update hash of README.md (changes not related to license: https://github.com/MariaDB/server/commit/773a07b65517327add6348c045cee14bdf489fe0) https://mariadb.com/kb/en/mariadb-10334-release-notes/ https://mariadb.com/kb/en/mariadb-10333-release-notes/ https://mariadb.com/kb/en/mariadb-10332-release-notes/ https://mariadb.com/kb/en/mariadb-10331-release-notes/ Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/mariadb/mariadb.hash | 7 +++---- package/mariadb/mariadb.mk | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/mariadb/mariadb.hash b/package/mariadb/mariadb.hash index 4025be317f..4da26bdf94 100644 --- a/package/mariadb/mariadb.hash +++ b/package/mariadb/mariadb.hash @@ -1,7 +1,6 @@ -# From https://downloads.mariadb.org/mariadb/10.3.30 -sha256 bd8735c65bdb7ebcd5d779fb9d3de3f2fcd319ad6482278d73dfe7301ad4ae1b mariadb-10.3.30.tar.gz -sha512 742c30b3ebc0b6d36b98d4e7a7fb511098142e72d8f42cbfa73a0bdea2059be17e790fbda4732329bbd99e4b50b13cf18e8122964a473e0b62170ab869eca8fc mariadb-10.3.30.tar.gz +# From https://dlm.mariadb.com/2117287/MariaDB/mariadb-10.3.34/source/sha512sums.txt +sha512 46d4575ec1afb68510652a4bb31ca5ce83a2f5f61048a6e9c1487b0ba58f079465a8b72518d44043cd42c631b19ff50b5498584676ac6473705b138fe3300741 mariadb-10.3.34.tar.gz # Hash for license files -sha256 a4665c1189fe31e0bbc27e9b55439df7dad6e99805407fe58d78da7aabe678f8 README.md +sha256 084aa0007efac6dda6aafffb3f3ef8b66b105862dad7ee23f6a4b52813f84464 README.md sha256 240a15a1d0f34d3abca462cdb7e5fb89470967563f16b0e71169e51c1e74cf2b COPYING diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk index db967ca3ed..4eb9c71827 100644 --- a/package/mariadb/mariadb.mk +++ b/package/mariadb/mariadb.mk @@ -4,8 +4,8 @@ # ################################################################################ -MARIADB_VERSION = 10.3.30 -MARIADB_SITE = https://downloads.mariadb.org/interstitial/mariadb-$(MARIADB_VERSION)/source +MARIADB_VERSION = 10.3.34 +MARIADB_SITE = https://dlm.mariadb.com/2117285/MariaDB/mariadb-$(MARIADB_VERSION)/source MARIADB_LICENSE = GPL-2.0 (server), GPL-2.0 with FLOSS exception (GPL client library), LGPL-2.0 (LGPL client library) # Tarball no longer contains LGPL license text # https://jira.mariadb.org/browse/MDEV-12297 From peter at korsgaard.com Mon Feb 28 18:52:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 19:52:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/samba4: security bump version to 4.15.5 In-Reply-To: <20220222214114.374855-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Tue, 22 Feb 2022 22:41:14 +0100") References: <20220222214114.374855-1-bernd.kuhls@t-online.de> Message-ID: <87o82qzuw8.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Release notes: https://www.samba.org/samba/history/samba-4.15.5.html > Fixes CVE-2021-44141, CVE-2021-44142 & CVE-2022-0336. > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 28 18:52:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 19:52:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/vim: security bump to version 8.2.4450 In-Reply-To: <20220222224302.3185944-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 22 Feb 2022 23:43:02 +0100") References: <20220222224302.3185944-1-fontaine.fabrice@gmail.com> Message-ID: <87k0dezuvp.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2022-0554: Use of Out-of-range Pointer Offset in GitHub > repository vim/vim prior to 8.2. > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 28 18:53:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 19:53:31 +0100 Subject: [Buildroot] [PATCH] package/gnutls: security bump to version 3.7.3 In-Reply-To: <20220223172817.3002782-1-francois.perrad@gadz.org> (Francois Perrad's message of "Wed, 23 Feb 2022 18:28:17 +0100") References: <20220223172817.3002782-1-francois.perrad@gadz.org> Message-ID: <87fso2zutw.fsf@dell.be.48ers.dk> >>>>> "Francois" == Francois Perrad writes: > see https://www.gnutls.org/security-new.html#GNUTLS-SA-2022-01-17 > Signed-off-by: Francois Perrad Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 28 18:51:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 19:51:53 +0100 Subject: [Buildroot] [git commit] package/samba4: security bump version to 4.15.5 Message-ID: <20220228184539.BEE5F836D7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=266318937ae72cefd17f38b76de9d400bd4d9f47 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://www.samba.org/samba/history/samba-4.15.5.html Fixes CVE-2021-44141, CVE-2021-44142 & CVE-2022-0336. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/samba4/samba4.hash | 4 ++-- package/samba4/samba4.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 130b628e32..503ec2ce37 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.4.tar.asc -sha256 499065a589b7b9ffb8e3eb6efa8575985919a2999972afc469520a47322aec11 samba-4.15.4.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.15.5.tar.asc +sha256 69115e33831937ba5151be0247943147765aece658ba743f44741672ad68d17f samba-4.15.5.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 1d4b985437..0ad3c2f742 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.15.4 +SAMBA4_VERSION = 4.15.5 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES From peter at korsgaard.com Mon Feb 28 18:52:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 19:52:49 +0100 Subject: [Buildroot] [git commit] package/gnutls: security bump to version 3.7.3 Message-ID: <20220228184539.D768E837B6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=212b020bb43f13121d6cde464f871d5d1cf6cfbe branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master see https://www.gnutls.org/security-new.html#GNUTLS-SA-2022-01-17 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/gnutls/gnutls.hash | 4 ++-- package/gnutls/gnutls.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gnutls/gnutls.hash b/package/gnutls/gnutls.hash index 5d4fd1a0dc..2ffc6c1b4e 100644 --- a/package/gnutls/gnutls.hash +++ b/package/gnutls/gnutls.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/gnutls-3.7.2.tar.xz.sig -sha256 646e6c5a9a185faa4cea796d378a1ba8e1148dbb197ca6605f95986a25af2752 gnutls-3.7.2.tar.xz +# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/gnutls-3.7.3.tar.xz.sig +sha256 fc59c43bc31ab20a6977ff083029277a31935b8355ce387b634fa433f8f6c49a gnutls-3.7.3.tar.xz # Locally calculated sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b doc/COPYING sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 doc/COPYING.LESSER diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index dbf7593854..7317a3bb1e 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -5,7 +5,7 @@ ################################################################################ GNUTLS_VERSION_MAJOR = 3.7 -GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).2 +GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).3 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz GNUTLS_SITE = https://www.gnupg.org/ftp/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR) GNUTLS_LICENSE = LGPL-2.1+ (core library) From peter at korsgaard.com Mon Feb 28 18:52:18 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 19:52:18 +0100 Subject: [Buildroot] [git commit] package/vim: security bump to version 8.2.4450 Message-ID: <20220228184539.CADD1837AA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=28c9cb5ff34aa98bf2d0db63f593745db006c910 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2022-0554: Use of Out-of-range Pointer Offset in GitHub repository vim/vim prior to 8.2. Signed-off-by: Fabrice Fontaine 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 fa3ca53cc8..8b60b7461f 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 b40b4e341de6b65cdeacd4c816dea8fe5e3b385ee5e17af73fc69c00bd7c440b vim-8.2.4301.tar.gz +sha256 b0a5acbe83bbdd4b1412abd9dc2ae2e3593c6cff8ff11c551fda3e6e2a87ec81 vim-8.2.4450.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index 98a5f153a8..28fd33c8ef 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 8.2.4301 +VIM_VERSION = 8.2.4450 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src From peter at korsgaard.com Mon Feb 28 18:55:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 19:55:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/openssh: security bump to version 8.9p1 In-Reply-To: <20220225231816.1648877-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 26 Feb 2022 00:18:16 +0100") References: <20220225231816.1648877-1-fontaine.fabrice@gmail.com> Message-ID: <87bkyqzuqg.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Security Near Miss > ================== > * sshd(8): fix an integer overflow in the user authentication path > that, in conjunction with other logic errors, could have yielded > unauthenticated access under difficult to exploit conditions. > This situation is not exploitable because of independent checks in > the privilege separation monitor. Privilege separation has been > enabled by default in since openssh-3.2.2 (released in 2002) and > has been mandatory since openssh-7.5 (released in 2017). Moreover, > portable OpenSSH has used toolchain features available in most > modern compilers to abort on signed integer overflow since > openssh-6.5 (released in 2014). > Update license (md5crypt removed, bcrypt relicensed to BSD-3-Clause: > https://github.com/openssh/openssh-portable/commit/a5ab4882348d26addc9830a44e053238dfa2cb58 > https://github.com/openssh/openssh-portable/commit/158bf854e2a22cf09064305f4a4e442670562685 > https://github.com/openssh/openssh-portable/commit/c0459588b8d00b73e506c6095958ecfe62a4a7ba) > https://www.openssh.com/txt/release-8.9 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 28 18:55:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 19:55:20 +0100 Subject: [Buildroot] [git commit] package/openssh: security bump to version 8.9p1 Message-ID: <20220228184738.27E4283488@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9597d5ec8e9a021f674ccd97828c843977934e51 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Security Near Miss ================== * sshd(8): fix an integer overflow in the user authentication path that, in conjunction with other logic errors, could have yielded unauthenticated access under difficult to exploit conditions. This situation is not exploitable because of independent checks in the privilege separation monitor. Privilege separation has been enabled by default in since openssh-3.2.2 (released in 2002) and has been mandatory since openssh-7.5 (released in 2017). Moreover, portable OpenSSH has used toolchain features available in most modern compilers to abort on signed integer overflow since openssh-6.5 (released in 2014). Update license (md5crypt removed, bcrypt relicensed to BSD-3-Clause: https://github.com/openssh/openssh-portable/commit/a5ab4882348d26addc9830a44e053238dfa2cb58 https://github.com/openssh/openssh-portable/commit/158bf854e2a22cf09064305f4a4e442670562685 https://github.com/openssh/openssh-portable/commit/c0459588b8d00b73e506c6095958ecfe62a4a7ba) https://www.openssh.com/txt/release-8.9 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/openssh/openssh.hash | 6 +++--- package/openssh/openssh.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/openssh/openssh.hash b/package/openssh/openssh.hash index aab3dba09c..dd123c1bb6 100644 --- a/package/openssh/openssh.hash +++ b/package/openssh/openssh.hash @@ -1,4 +1,4 @@ -# From https://www.openssh.com/txt/release-8.8 (base64 encoded) -sha256 4590890ea9bb9ace4f71ae331785a3a5823232435161960ed5fc86588f331fe9 openssh-8.8p1.tar.gz +# From https://www.openssh.com/txt/release-8.9 (base64 encoded) +sha256 fd497654b7ab1686dac672fb83dfb4ba4096e8b5ffcdaccd262380ae58bec5e7 openssh-8.9p1.tar.gz # Locally calculated -sha256 432abf7480fb31473a6706627212913fc70032e3fb71b90fecb28ae26a2d741d LICENCE +sha256 d6807e99f3d159145c659060f57c3fa74e109faa39326dbfc38674cb550fd104 LICENCE diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index 4145bfd8dc..0e0d59e6ab 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -4,13 +4,13 @@ # ################################################################################ -OPENSSH_VERSION_MAJOR = 8.8 +OPENSSH_VERSION_MAJOR = 8.9 OPENSSH_VERSION_MINOR = p1 OPENSSH_VERSION = $(OPENSSH_VERSION_MAJOR)$(OPENSSH_VERSION_MINOR) OPENSSH_CPE_ID_VERSION = $(OPENSSH_VERSION_MAJOR) OPENSSH_CPE_ID_UPDATE = $(OPENSSH_VERSION_MINOR) OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable -OPENSSH_LICENSE = BSD-4-Clause, BSD-3-Clause, BSD-2-Clause, Public Domain +OPENSSH_LICENSE = BSD-3-Clause, BSD-2-Clause, Public Domain OPENSSH_LICENSE_FILES = LICENCE OPENSSH_CONF_ENV = \ LD="$(TARGET_CC)" \ From peter at korsgaard.com Mon Feb 28 19:55:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 20:55:34 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/expat: fix tarball sha256 Message-ID: <20220228194735.65B1582DFE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6515cc2894663e345b543eab240180b06de2acfb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Commit ab71ac15ddd7ed6a8ca83cbc23ea0b0cbb343f0f forgot to update sha256 Signed-off-by: Fabrice Fontaine [yann.morin.1998 at free.fr: update hash for real ;-)] Signed-off-by: Yann E. MORIN (cherry picked from commit 59a813d2a884c2eb247d9695089375b56751b6d5) Signed-off-by: Peter Korsgaard --- package/expat/expat.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index 3129801668..10e13206d0 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -3,5 +3,5 @@ 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 From peter at korsgaard.com Mon Feb 28 19:55:13 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 20:55:13 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/expat: fix tarball sha256 Message-ID: <20220228194746.EB95A82DFE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=49b1a3ef2e4a90bdcb24d08cb542ac9b5958a799 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Commit ab71ac15ddd7ed6a8ca83cbc23ea0b0cbb343f0f forgot to update sha256 Signed-off-by: Fabrice Fontaine [yann.morin.1998 at free.fr: update hash for real ;-)] Signed-off-by: Yann E. MORIN (cherry picked from commit 59a813d2a884c2eb247d9695089375b56751b6d5) Signed-off-by: Peter Korsgaard --- package/expat/expat.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index 3129801668..10e13206d0 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -3,5 +3,5 @@ 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 From jacques.samoun33 at gmail.com Mon Feb 28 20:05:22 2022 From: jacques.samoun33 at gmail.com (Jacques Samoun) Date: Mon, 28 Feb 2022 21:05:22 +0100 Subject: [Buildroot] device table Message-ID: Hello, despite all my tries, i just cannot make the "device_table" feature work as described in the manual. Basically, i am trying to set 666 rights to /dev/tty + add a dialout group, so i created the following file (device_table.txt" /dev/tty c 666 root dialout 5 0 - - - and have set the correct variable in menuconfig. I know for sure that the build has handled this file ... but looking at the /dev/tty, it is clear that nothing has happened, the permissions are still 600 and the dialout group has not been set. Am I missing something ? Thanks, Jacques -------------- next part -------------- An HTML attachment was scrubbed... URL: From peter at korsgaard.com Mon Feb 28 20:18:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 21:18:28 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] Update for 2021.11.2 Message-ID: <20220228201141.9138E8287C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eeb8c004daf3e09eecdc62af993c74a118e5e5f9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Peter Korsgaard --- CHANGES | 23 +++++++++++++++++++++++ Makefile | 4 ++-- support/misc/Vagrantfile | 2 +- 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 1e1c060107..29b7f2159a 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,26 @@ +2021.11.2, released February 28th, 2022 + + Important / security related fixes. + + Defconfigs: Andes ae3xx, Intel galileo: Fix build with host + gcc >= 10, ROC-RK3399-PC: Bump rootfs size to fix build issue. + + Add conditional patching logic to fix build issues for older + U-Boot / Linux kernel versions when built with a host gcc >= + 10. + + Updated/fixed packages: apitrace, binutils, casync, cgilua, + connman, expat, gauche, gdb, gensio, glibc, go, gst-omx, + gst1-devtools, gst1-libav, gst1-plugins-bad, + gst1-plugins-base, gst1-plugins-good, gst1-plugins-ugly, + gst1-python, gst1-rtsp-server, gst1-vaapi, gstreamer1, + gstreamer1-editing-services, kf5-extra-cmake-modules, kodi, + libarchive, linux, lm-sensors, localedef, log4cxx, mpd, + nfs-utils, php, pistache, pkcs11-helper, prosody, + python-django, python-pyzmq, python-regex, + python-sqliteschema, resiprocate, rtl8723bu, thermald, tiff, + tor, util-linux, vim, xen + 2021.11.1, released January 29th, 2022 Important / security related fixes. diff --git a/Makefile b/Makefile index 45fd44dd62..49551aacc7 100644 --- a/Makefile +++ b/Makefile @@ -92,9 +92,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2021.11.1 +export BR2_VERSION := 2021.11.2 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1643497000 +BR2_VERSION_EPOCH = 1646080000 # 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 eb312081fe..37981d7932 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2021.11.1' +RELEASE='2021.11.2' ### Change here for more memory/cores ### VM_MEMORY=2048 From peter at korsgaard.com Mon Feb 28 20:45:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 21:45:06 +0100 Subject: [Buildroot] Buildroot 2021.11.2 released Message-ID: <877d9ezpnx.fsf@dell.be.48ers.dk> Hi, Buildroot is a simple tool for creating complete embedded Linux systems (http://buildroot.org). Buildroot 2021.11.2 is released - Go download it at: http://buildroot.org/downloads/buildroot-2021.11.2.tar.gz or http://buildroot.org/downloads/buildroot-2021.11.2.tar.xz Or get it from Git: git://git.buildroot.org/buildroot Buildroot 2021.11.2 is a bugfix release, fixing a number of important / security related issues discovered since the 2021.11.1 release. - Defconfigs: Andes ae3xx, Intel galileo: Fix build with host gcc >= 10, ROC-RK3399-PC: Bump rootfs size to fix build issue. - Add conditional patching logic to fix build issues for older U-Boot / Linux kernel versions when built with a host gcc >= 10. - Security fixes for connman, expat, glibc, go, libarchive, localedef, prosody, python-django, tiff, util-linux, vim, xen - Fixes for download/compilation/runtime/license issues in apitrace, binutils, casync, cgilua, gauche, gdb, gensio, gst-omx, gst1-devtools, gst1-libav, gst1-plugins-bad, gst1-plugins-base, gst1-plugins-good, gst1-plugins-ugly, gst1-python, gst1-rtsp-server, gst1-vaapi, gstreamer1, gstreamer1-editing-services, kf5-extra-cmake-modules, kodi, linux, log4cxx, mpd, nfs-utils, php, pistache, pkcs11-helper, python-regex, python-sqliteschema, resiprocate, rtl8723bu, tor For more details, see the CHANGES file: https://git.buildroot.net/buildroot/plain/CHANGES?id=2021.11.2 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.1.. 17 Peter Seiderer 15 Fabrice Fontaine 13 Giulio Benetti 6 Peter Korsgaard 2 Bernd Kuhls 2 Doug Brown 2 Francois Perrad 2 Joachim Wiberg 2 Yann E. MORIN 2 Yegor Yefremov 1 Adrian Perez de Castro 1 Andreas Ziegler 1 Christian Stewart 1 James Hilliard 1 J?rg Krause 1 Michael Opdenacker 1 Nuno Gon?alves 1 Pedro Aguilar 1 Ricardo Martincoski 1 Romain Naour 1 Thomas De Schampheleire -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 28 20:54:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 21:54:15 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] Update for 2021.02.10 Message-ID: <20220228204634.989B283611@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f1d3b87d3d49a377b6fccc48ddd8531c4d293168 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Peter Korsgaard --- CHANGES | 20 ++++++++++++++++++++ Makefile | 4 ++-- support/misc/Vagrantfile | 2 +- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index f7d14f636d..ee01f12a3c 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,23 @@ +2021.02.10, released February 28th, 2022 + + Important / security related fixes. + + Defconfigs: Andes ae3xx, Intel galileo: Fix build with host + gcc >= 10, ROC-RK3399-PC: Bump rootfs size to fix build issue. + + Add conditional patching logic to fix build issues for older + U-Boot / Linux kernel versions when built with a host gcc >= + 10. + + Updated/fixed packages: casync, cgilua, connman, expat, + gauche, gensio, go, gst-omx, gst1-devtools, gst1-libav, + gst1-plugins-bad, gst1-plugins-base, gst1-plugins-good, + gst1-plugins-ugly, gst1-python, gst1-rtsp-server, gst1-vaapi, + gstreamer1, gstreamer1-editing-services, + kf5-extra-cmake-modules, kodi, libarchive, linux, lm-sensors, + log4cxx, mpd, nfs-utils, pistache, prosody, python-django, + python-pyzmq, rtl8723bu, thermald, tiff, util-linux, vim, xen + 2021.02.9, released January 29th, 2022 Important / security related fixes. diff --git a/Makefile b/Makefile index d1a5d4d71e..a3dfc52f51 100644 --- a/Makefile +++ b/Makefile @@ -92,9 +92,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2021.02.9 +export BR2_VERSION := 2021.02.10 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1643480000 +BR2_VERSION_EPOCH = 1646081600 # 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 ff793ccba8..85aa167efc 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2021.02.9' +RELEASE='2021.02.10' ### Change here for more memory/cores ### VM_MEMORY=2048 From peter at korsgaard.com Mon Feb 28 21:05:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 22:05:58 +0100 Subject: [Buildroot] Buildroot 2021.02.10 released Message-ID: <8735k2zop5.fsf@dell.be.48ers.dk> Hi, Buildroot is a simple tool for creating complete embedded Linux systems (http://buildroot.org). Buildroot 2021.02.10 is released - Go download it at: http://buildroot.org/downloads/buildroot-2021.02.10.tar.gz or http://buildroot.org/downloads/buildroot-2021.02.10.tar.bz2 Or get it from Git: git://git.buildroot.org/buildroot Buildroot 2021.02.10 is a bugfix release on the current long term release, fixing a number of important / security related issues discovered since the 2021.02.9 release. - Defconfigs: Andes ae3xx, Intel galileo: Fix build with host gcc >= 10, ROC-RK3399-PC: Bump rootfs size to fix build issue. - Add conditional patching logic to fix build issues for older U-Boot / Linux kernel versions when built with a host gcc >= 10. - Security fixes for connman, expat, go, libarchive, prosody, python-django, tiff, util-linux, vim, xen - Fixes for download/compilation/runtime/license issues in casync, cgilua, gauche, gensio, gst-omx, gst1-devtools, gst1-libav, gst1-plugins-bad, gst1-plugins-base, gst1-plugins-good, gst1-plugins-ugly, gst1-python, gst1-rtsp-server, gst1-vaapi, gstreamer1, gstreamer1-editing-services, kf5-extra-cmake-modules, kodi, linux, log4cxx, mpd, nfs-utils, pistache, rtl8723bu, For more details, see the CHANGES file: https://git.buildroot.net/buildroot/plain/CHANGES?id=2021.02.10 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.9.. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 28 21:11:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 22:11:17 +0100 Subject: [Buildroot] [git commit] Update for 2021.11.2 Message-ID: <20220228210416.7E61C83611@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=67b160c3e39861ee01726763e2a7f65871abdbb5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard (cherry picked from commit eeb8c004daf3e09eecdc62af993c74a118e5e5f9) Signed-off-by: Peter Korsgaard --- CHANGES | 23 +++++++++++++++++++++++ support/misc/Vagrantfile | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 31315cad34..0a76fec045 100644 --- a/CHANGES +++ b/CHANGES @@ -87,6 +87,29 @@ #14501: lttng-modules v2.11 package fails to build #14531: Package EFL - build error +2021.11.2, released February 28th, 2022 + + Important / security related fixes. + + Defconfigs: Andes ae3xx, Intel galileo: Fix build with host + gcc >= 10, ROC-RK3399-PC: Bump rootfs size to fix build issue. + + Add conditional patching logic to fix build issues for older + U-Boot / Linux kernel versions when built with a host gcc >= + 10. + + Updated/fixed packages: apitrace, binutils, casync, cgilua, + connman, expat, gauche, gdb, gensio, glibc, go, gst-omx, + gst1-devtools, gst1-libav, gst1-plugins-bad, + gst1-plugins-base, gst1-plugins-good, gst1-plugins-ugly, + gst1-python, gst1-rtsp-server, gst1-vaapi, gstreamer1, + gstreamer1-editing-services, kf5-extra-cmake-modules, kodi, + libarchive, linux, lm-sensors, localedef, log4cxx, mpd, + nfs-utils, php, pistache, pkcs11-helper, prosody, + python-django, python-pyzmq, python-regex, + python-sqliteschema, resiprocate, rtl8723bu, thermald, tiff, + tor, util-linux, vim, xen + 2021.11.1, released January 29th, 2022 Important / security related fixes. diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index eb312081fe..37981d7932 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2021.11.1' +RELEASE='2021.11.2' ### Change here for more memory/cores ### VM_MEMORY=2048 From peter at korsgaard.com Mon Feb 28 21:11:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 22:11:49 +0100 Subject: [Buildroot] [git commit] docs/website: update for 2021.11.2 Message-ID: <20220228210416.890BF811FD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=746d00ef9ff3772236b61e6477597a7af84e3e1e 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 7d9fad4d9f..b4f7ecc3ce 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -42,37 +42,37 @@
      -

      Latest stable release: 2021.11.1

      +

      Latest stable release: 2021.11.2

      diff --git a/docs/website/news.html b/docs/website/news.html index e571c86a2e..ed37d0a898 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,25 @@

      News

        +
      • +
        +
        +
        +

        2021.11.2 released

        +

        28 February 2022

        +
        +
        +

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

        +
        +
        +
      • +
      • From peter at korsgaard.com Mon Feb 28 21:14:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 22:14:00 +0100 Subject: [Buildroot] [git commit] Update for 2021.02.10 Message-ID: <20220228210935.0E71583850@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=526da6145f81e3ac0753d550ec8f3afee66a6c2a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard (cherry picked from commit f1d3b87d3d49a377b6fccc48ddd8531c4d293168) [Peter: drop Makefile/Vagrantfile change] Signed-off-by: Peter Korsgaard --- CHANGES | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/CHANGES b/CHANGES index 0a76fec045..7c1f014e13 100644 --- a/CHANGES +++ b/CHANGES @@ -736,6 +736,26 @@ #13751: libopenssl (static): huge drop in performance in newer .. #13771: package htop has undeclared dependency on host python +2021.02.10, released February 28th, 2022 + + Important / security related fixes. + + Defconfigs: Andes ae3xx, Intel galileo: Fix build with host + gcc >= 10, ROC-RK3399-PC: Bump rootfs size to fix build issue. + + Add conditional patching logic to fix build issues for older + U-Boot / Linux kernel versions when built with a host gcc >= + 10. + + Updated/fixed packages: casync, cgilua, connman, expat, + gauche, gensio, go, gst-omx, gst1-devtools, gst1-libav, + gst1-plugins-bad, gst1-plugins-base, gst1-plugins-good, + gst1-plugins-ugly, gst1-python, gst1-rtsp-server, gst1-vaapi, + gstreamer1, gstreamer1-editing-services, + kf5-extra-cmake-modules, kodi, libarchive, linux, lm-sensors, + log4cxx, mpd, nfs-utils, pistache, prosody, python-django, + python-pyzmq, rtl8723bu, thermald, tiff, util-linux, vim, xen + 2021.02.9, released January 29th, 2022 Important / security related fixes. From peter at korsgaard.com Mon Feb 28 21:17:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 22:17:20 +0100 Subject: [Buildroot] [git commit] docs/website: update for 2021.02.10 Message-ID: <20220228210935.1BBB88386C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0c4d496bf10675bacfdc1c0901c755e79f157699 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 b4f7ecc3ce..a1b2bc9632 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -8,37 +8,37 @@
        Download
        -

        Latest long term support release: 2021.02.9

        +

        Latest long term support release: 2021.02.10

        diff --git a/docs/website/news.html b/docs/website/news.html index ed37d0a898..3d979877e0 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,25 @@

        News

          +
        • +
          +
          +
          +

          2021.02.10 released

          +

          28 February 2022

          +
          +
          +

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

          +
          +
          +
        • +
        • From peter at korsgaard.com Mon Feb 28 21:19:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 22:19:55 +0100 Subject: [Buildroot] [PATCH] package/at: bump version to 3.2.5 In-Reply-To: <20220228120243.3361127-1-giulio.benetti@benettiengineering.com> (Giulio Benetti's message of "Mon, 28 Feb 2022 13:02:43 +0100") References: <20220228120243.3361127-1-giulio.benetti@benettiengineering.com> Message-ID: <87y21uy9hg.fsf@dell.be.48ers.dk> >>>>> "Giulio" == Giulio Benetti writes: > Signed-off-by: Giulio Benetti Any specific reason this should go to master and not next? -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 28 21:20:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 22:20:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/dbus: bump to version 1.12.22 In-Reply-To: <20220226181747.3033483-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 26 Feb 2022 19:17:47 +0100") References: <20220226181747.3033483-1-fontaine.fabrice@gmail.com> Message-ID: <87tuciy9gl.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://gitlab.freedesktop.org/dbus/dbus/-/blob/dbus-1.12.22/NEWS > Signed-off-by: Fabrice Fontaine Committed to master given the fixes, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 28 21:18:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 22:18:33 +0100 Subject: [Buildroot] [git commit] package/dbus: bump to version 1.12.22 Message-ID: <20220228211234.18F1682655@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7af7acabe051c1b394f53fd02084be7b97d8a8d8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://gitlab.freedesktop.org/dbus/dbus/-/blob/dbus-1.12.22/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/dbus/dbus.hash | 4 ++-- package/dbus/dbus.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/dbus/dbus.hash b/package/dbus/dbus.hash index 06512e5656..176396fe2f 100644 --- a/package/dbus/dbus.hash +++ b/package/dbus/dbus.hash @@ -1,7 +1,7 @@ # Locally calculated after checking pgp signature -# https://dbus.freedesktop.org/releases/dbus/dbus-1.12.20.tar.gz.asc +# https://dbus.freedesktop.org/releases/dbus/dbus-1.12.22.tar.gz.asc # using key 36EC5A6448A4F5EF79BEFE98E05AE1478F814C4F -sha256 f77620140ecb4cdc67f37fb444f8a6bea70b5b6461f12f1cbe2cec60fa7de5fe dbus-1.12.20.tar.gz +sha256 8d25785c798ec4f892e6f9d177fb0ceeb8b29867b119798f9d5228561d3ad474 dbus-1.12.22.tar.gz # Locally calculated sha256 0e46f54efb12d04ab5c33713bacd0e140c9a35b57ae29e03c853203266e8f3a1 COPYING diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index d78e102427..de447d8680 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -4,7 +4,7 @@ # ################################################################################ -DBUS_VERSION = 1.12.20 +DBUS_VERSION = 1.12.22 DBUS_SITE = https://dbus.freedesktop.org/releases/dbus DBUS_LICENSE = AFL-2.1 or GPL-2.0+ (library, tools), GPL-2.0+ (tools) DBUS_LICENSE_FILES = COPYING From giulio.benetti at benettiengineering.com Mon Feb 28 21:29:26 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 28 Feb 2022 22:29:26 +0100 Subject: [Buildroot] [PATCH] package/at: bump version to 3.2.5 In-Reply-To: <87y21uy9hg.fsf@dell.be.48ers.dk> References: <87y21uy9hg.fsf@dell.be.48ers.dk> Message-ID: <3C088CA7-EE28-4D60-8DDD-68492CE9D73D@benettiengineering.com> Hi Peter, > Il giorno 28 feb 2022, alle ore 22:20, Peter Korsgaard ha scritto: > > ? >> >>>>>> "Giulio" == Giulio Benetti writes: > >> Signed-off-by: Giulio Benetti > > Any specific reason this should go to master and not next? Sorry, I?ve forgotten to add ?next?, this is for next branch. Best regards ?- Giulio Benetti Benetti Engineering sas > > -- > Bye, Peter Korsgaard > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From aperez at igalia.com Mon Feb 28 21:34:32 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Mon, 28 Feb 2022 23:34:32 +0200 Subject: [Buildroot] [PATCH 1/1] package/seatd: security bump to version 0.6.4 Message-ID: <20220228213432.3289480-1-aperez@igalia.com> This release contains a security fix in seatd-launch which prevents removal of files that the calling user did not have privileges to remove. Release notes: https://git.sr.ht/~kennylevinsen/seatd/refs/0.6.4 Signed-off-by: Adrian Perez de Castro --- package/seatd/seatd.hash | 2 +- package/seatd/seatd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/seatd/seatd.hash b/package/seatd/seatd.hash index 18f65d3aeb..88793b6dd5 100644 --- a/package/seatd/seatd.hash +++ b/package/seatd/seatd.hash @@ -1,5 +1,5 @@ # Calculated locally -sha256 5226850c163b485aebe71da0d3f4941761637e146a5c9393cb40c52617ad84a8 0.6.3.tar.gz +sha256 3d4ac288114219ba7721239cafee7bfbeb7cf8e1e7fd653602a369e4ad050bd8 0.6.4.tar.gz # License files sha256 282a494803d666616bd726e0279636b5f6a31387ae19a707459074050f2600d3 LICENSE diff --git a/package/seatd/seatd.mk b/package/seatd/seatd.mk index 27d3155b2b..5382cad39b 100644 --- a/package/seatd/seatd.mk +++ b/package/seatd/seatd.mk @@ -4,7 +4,7 @@ # ################################################################################ -SEATD_VERSION = 0.6.3 +SEATD_VERSION = 0.6.4 SEATD_SOURCE = $(SEATD_VERSION).tar.gz SEATD_SITE = https://git.sr.ht/~kennylevinsen/seatd/archive SEATD_LICENSE = MIT -- 2.35.1 From peter at korsgaard.com Mon Feb 28 21:38:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 22:38:26 +0100 Subject: [Buildroot] [git commit] Update for 2022.02-rc3 Message-ID: <20220228213103.2B29A837B6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5b6e2ee8b7924419e13625c20ae34f656be3f7b4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard --- CHANGES | 11 +++++++++++ Makefile | 4 ++-- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 21 +++++++++++++++++++++ 4 files changed, 43 insertions(+), 11 deletions(-) diff --git a/CHANGES b/CHANGES index 7c1f014e13..8e8ecd1a72 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,14 @@ +2022.02-rc3, released February 28th, 2022 + + Fixes all over the tree. + + Defconfigs: Xilinx zynqmp zcu102/zcu106: Fix U-Boot DTS config + + Updated/fixed packages: bluez5_utils, bpftool, dbus, exempi, + flac, freerdp, frr, gnutls, libpjsip, libxml2, mariadb, + openssh, python-twisted, qt5webkit, samba4, vim, weston, + wireshark, wolfssl, xdg-dbus-proxy, xterm, + 2022.02-rc2, released February 20th, 2022 Fixes all over the tree. diff --git a/Makefile b/Makefile index 0ed93e600d..4f693d40a9 100644 --- a/Makefile +++ b/Makefile @@ -92,9 +92,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2022.02-rc2 +export BR2_VERSION := 2022.02-rc3 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1645395000 +BR2_VERSION_EPOCH = 1646083800 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/docs/website/download.html b/docs/website/download.html index a1b2bc9632..891221e155 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -76,37 +76,37 @@
        -

        Latest release candidate: 2022.02-rc2

        +

        Latest release candidate: 2022.02-rc3

        diff --git a/docs/website/news.html b/docs/website/news.html index 3d979877e0..88885a058f 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,27 @@

        News

          +
        • +
          +
          +
          +

          2022.02-rc3 released

          +

          28 February 2022

          +
          +
          +

          2022.02-rc3 has been released with more cleanups and build fixes. See the + CHANGES + file for details.

          + +

          Head to the downloads page to pick up the + 2022.02-rc3 + release candidate, and report any problems found to the + mailing list or + bug tracker.

          +
          +
          +
        • +
        • From peter at korsgaard.com Mon Feb 28 21:41:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 22:41:16 +0100 Subject: [Buildroot] Buildroot 2022.02-rc3 released Message-ID: <87pmn6y8hv.fsf@dell.be.48ers.dk> Hi, Buildroot 2022.02-rc3 is released - Go download it at: http://buildroot.net/downloads/buildroot-2022.02-rc3.tar.gz or http://buildroot.net/downloads/buildroot-2022.02-rc3.tar.xz Or get it from Git: git://git.buildroot.net/buildroot Another week, another release candidate. Please give it a spin and report any problems to the mailing list or bug tracker. Many thanks to the people contributing to this release: git shortlog -sn 2022.02-rc2.. 17 Fabrice Fontaine 7 Peter Korsgaard 1 Adrian Perez de Castro 1 Bernd Kuhls 1 Francois Perrad 1 James Hilliard 1 Neal Frager 1 Romain Naour For more details, see the CHANGES file: http://git.buildroot.net/buildroot/plain/CHANGES?id=2022.02-rc3 -- Bye, Peter Korsgaard From arnout at mind.be Wed Feb 23 20:27:25 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 23 Feb 2022 21:27:25 +0100 Subject: [Buildroot] [git commit] package/dialog: bump to version 1.3-20220117 Message-ID: <20220309132156.CB55D83915@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1868f372c02760e324f91ebcf5685323855351f1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://invisible-mirror.net/dialog/CHANGES.html#index-t20220117 Fixes: - https://bugs.buildroot.org/show_bug.cgi?id=14596 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/dialog/dialog.hash | 2 +- package/dialog/dialog.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dialog/dialog.hash b/package/dialog/dialog.hash index 2286590b66..3136d18b2b 100644 --- a/package/dialog/dialog.hash +++ b/package/dialog/dialog.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 466163e8b97c2b7709d00389199add3156bd813f60ccb0335d0a30f2d4a17f99 dialog-1.3-20200327.tgz +sha256 754cb6bf7dc6a9ac5c1f80c13caa4d976e30a5a6e8b46f17b3bb9b080c31041f dialog-1.3-20220117.tgz # Locally computed sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/dialog/dialog.mk b/package/dialog/dialog.mk index 1c98d354e3..681f8ec9fe 100644 --- a/package/dialog/dialog.mk +++ b/package/dialog/dialog.mk @@ -4,7 +4,7 @@ # ################################################################################ -DIALOG_VERSION = 1.3-20200327 +DIALOG_VERSION = 1.3-20220117 DIALOG_SOURCE = dialog-$(DIALOG_VERSION).tgz DIALOG_SITE = https://invisible-mirror.net/archives/dialog DIALOG_CONF_OPTS = --with-ncurses --with-curses-dir=$(STAGING_DIR)/usr \ From james.hilliard1 at gmail.com Tue Feb 1 01:33:07 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 31 Jan 2022 18:33:07 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-aiohttp-session: bump to version 2.11.0 Message-ID: <20220201013307.1956972-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-aiohttp-session/python-aiohttp-session.hash | 4 ++-- package/python-aiohttp-session/python-aiohttp-session.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aiohttp-session/python-aiohttp-session.hash b/package/python-aiohttp-session/python-aiohttp-session.hash index 3842f0c7af..8b44318307 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 d57d463a9db13b681f7924b38aa77f64 aiohttp-session-2.10.0.tar.gz -sha256 2af19af9f435937baacbb6420f887b21e5021bb34be146c2702c58e6ebf6b76b aiohttp-session-2.10.0.tar.gz +md5 797273eb5f0ef9e95fa92c6a933cf4ad aiohttp-session-2.11.0.tar.gz +sha256 0fdf39600f6a05c4943ef6c7b099071ca9854413111a26761626244be5015dc4 aiohttp-session-2.11.0.tar.gz # Locally computed sha256 checksums sha256 7bc5dd2f229a6b922befb1427fd4ad2c0b255f12c1b1869370ba77520dc22bc7 LICENSE diff --git a/package/python-aiohttp-session/python-aiohttp-session.mk b/package/python-aiohttp-session/python-aiohttp-session.mk index a28b1ae143..3d59b75e3d 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.10.0 +PYTHON_AIOHTTP_SESSION_VERSION = 2.11.0 PYTHON_AIOHTTP_SESSION_SOURCE = aiohttp-session-$(PYTHON_AIOHTTP_SESSION_VERSION).tar.gz -PYTHON_AIOHTTP_SESSION_SITE = https://files.pythonhosted.org/packages/d6/3f/ab6288e8bbf4a9ae63ea0d3d5711bccc3a6dad1cb85a420c14fdeabc209e +PYTHON_AIOHTTP_SESSION_SITE = https://files.pythonhosted.org/packages/3b/a7/0b97b9a2e3a553a86a6703f86b0e9b1afb2b262849700e8f80015c0f643f PYTHON_AIOHTTP_SESSION_SETUP_TYPE = setuptools PYTHON_AIOHTTP_SESSION_LICENSE = Apache-2.0 PYTHON_AIOHTTP_SESSION_LICENSE_FILES = LICENSE -- 2.25.1 From thomas.petazzoni at bootlin.com Tue Feb 1 07:08:02 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 01 Feb 2022 07:08:02 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-31 Message-ID: <20220201070808.2B96240971@smtp2.osuosl.org> Hello, Autobuild statistics for 2022-01-31 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 67 | 6 | 0 | 73 | 2021.11.x | 24 | 1 | 0 | 25 | master | 85 | 42 | 0 | 127 | Classification of failures by reason for master ----------------------------------------------- rygel-0.40.2 | 4 unknown | 4 bat-0.18.3 | 3 cryptsetup-2.4.2 | 3 libuhttpd-3.14.1 | 3 wavemon-0.9.4 | 3 bluez5_utils-5.63 | 2 cairo-1.16.0 | 1 cryptopp-8.6.0 | 1 frr-8.1 | 1 fstrcmp-0.7.D001 | 1 gocryptfs-2.2.1 | 1 google-breakpad-7515ab13768... | 1 guile-3.0.7 | 1 host-delve-1.8.0 | 1 iproute2-5.16.0 | 1 libblockdev-2.25 | 1 mesa3d-21.3.4 | 1 mongrel2-1.13.0 | 1 neon-0.32.2 | 1 perl-5.34.0 | 1 pulseview-0.4.2 | 1 qt5webkit-5.212.0-alpha4 | 1 rtorrent-0.9.8 | 1 ruby-3.1.0 | 1 waffle-1.6.1 | 1 xvisor-0.3.1 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | bat-0.18.3 | NOK | http://autobuild.buildroot.net/results/f854a4e5038ca27d8497fb7129b5cc64a9f7ff1d | arm | bat-0.18.3 | NOK | http://autobuild.buildroot.net/results/2eb975dc561c1a6997e86017dc2455c4555ff742 | arm | bat-0.18.3 | NOK | http://autobuild.buildroot.net/results/f56b3ab091705dc99bc3b8fa042bc367cbd02a3a | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/e639f16dfd687cdd3bd25d40d28796ab1ca0af9e | mips64el | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/5c75ad724df3ff726559acee0da31f777ef6bc68 | arm | cairo-1.16.0 | NOK | http://autobuild.buildroot.net/results/8e2b273272626c41df503c96628a9c2e34404f46 | powerpc | cryptopp-8.6.0 | NOK | http://autobuild.buildroot.net/results/252a6f6a0bb7e5c0efe7338ad2e4c211530267e7 | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/6ed262b36b4061d0fdc95fa5a6f73fdf5fef91fe | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/48abcc403e7e3e934aba7fbc5f278f28c8c0560c | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/b15a6532b028421c9a92a3c427f4cbe339d95275 | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/ef743c15d7711aae025f60bd9405c740739acd76 | arm | fstrcmp-0.7.D001 | NOK | http://autobuild.buildroot.net/results/986a5df3957de948de4439e2050a875a5c4e9f93 | x86_64 | gocryptfs-2.2.1 | NOK | http://autobuild.buildroot.net/results/034faafa66329a5055fc1a0ed4d14358b8b40d63 | mipsel | google-breakpad-7515ab13768... | NOK | http://autobuild.buildroot.net/results/ad17e586242942b732ae59aa0a19f7bdf2957088 | sparc64 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/c8a62deff1b490c5147d956d64fb9ba1283479fe | ORPH arm | host-delve-1.8.0 | NOK | http://autobuild.buildroot.net/results/08bf879f7ab25ac7ff6b535112c8b889bec4fcfb | i586 | iproute2-5.16.0 | NOK | http://autobuild.buildroot.net/results/455840288bbe13ed585b0e2dc7b20a294dd1eee1 | powerpc64le | libblockdev-2.25 | NOK | http://autobuild.buildroot.net/results/2fd1b4001b64004be49dd91329945ab108e1a90c | ORPH m68k | libuhttpd-3.14.1 | NOK | http://autobuild.buildroot.net/results/8bb865ebca04f2ba0b2761d421fa1d98404b0ef2 | arm | libuhttpd-3.14.1 | NOK | http://autobuild.buildroot.net/results/8d2a79dacf9ac423f7ece51b8c23f3683238312b | m68k | libuhttpd-3.14.1 | NOK | http://autobuild.buildroot.net/results/5d42251597d66b929677199a044115380dac42c7 | x86_64 | mesa3d-21.3.4 | NOK | http://autobuild.buildroot.net/results/05b2ebd2f1abcf909ffe06f14aebef1dabfef582 | arm | mongrel2-1.13.0 | NOK | http://autobuild.buildroot.net/results/356f99489bc629b9cb864cf9f6299e70ce943fed | arm | neon-0.32.2 | NOK | http://autobuild.buildroot.net/results/da995ef26001357e51a5907de9c6111b9ff89bdf | ORPH arm | perl-5.34.0 | NOK | http://autobuild.buildroot.net/results/2622d5f0405c387be414132bd71d4f84406d5af3 | riscv32 | pulseview-0.4.2 | NOK | http://autobuild.buildroot.net/results/80427fc30d77ac5919b8c01d41afd805293e0fea | aarch64 | qt5webkit-5.212.0-alpha4 | NOK | http://autobuild.buildroot.net/results/d5fa35cfdad09aaaaa88b537d79d8446d10872fe | arm | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/69a68f11887523b1f8516d02e85e76f64f6c363e | ORPH riscv64 | ruby-3.1.0 | NOK | http://autobuild.buildroot.net/results/95a0cd885f644ca877d8266610a89e003864b71c | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/1b79cfa0a439fe9ebfab24ff141e6d667853c1ac | arc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/846c8a79b7d5bb9e4b23fe7521884d2f1b9eff4a | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/70efd9ab53c60e4c44b354ec34f9a27bf73e71e5 | s390x | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/4e2e9dde0b18a5958ee2bcb8d72c0f9e76f85492 | mipsel | unknown | NOK | http://autobuild.buildroot.net/results/2ce862a946d5a9ccbfe0b82957ec522092c1ddf4 | arc | unknown | NOK | http://autobuild.buildroot.net/results/b621449701ccef80348cbd045028ba4a91073c80 | m68k | unknown | NOK | http://autobuild.buildroot.net/results/e71af53b01e242798127263524dbd935a297f9f6 | mipsel | unknown | NOK | http://autobuild.buildroot.net/results/05d43f7bbfdb66fa2eb278108e0b5589781a0047 | arm | waffle-1.6.1 | NOK | http://autobuild.buildroot.net/results/b401476e5e1382ed872cfc77e8b0c34718bdf1f0 | aarch64 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/cebe8c50629d9d40f24bbee5bfb13044f68b7c25 | mips64el | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/191f564994c82360a94e96a2a5e172e137a65eaa | s390x | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/5c42c34e9449496cfd6bc1264cb792c3bfb2d68c | arm | xvisor-0.3.1 | NOK | http://autobuild.buildroot.net/results/eb794bb28d67d43a10030c0d057726dac1926dc3 | Classification of failures by reason for 2021.02.x -------------------------------------------------- azure-iot-sdk-c-LTS_07_2020... | 1 host-sentry-cli-1.57.0 | 1 libtheora-1.1.1 | 1 monkey-f54856ce250c4e257354... | 1 ndisc6-1.0.4 | 1 rocksdb-6.13.3 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- riscv32 | azure-iot-sdk-c-LTS_07_2020... | NOK | http://autobuild.buildroot.net/results/5f8db0b92087f694513fe6597ae10aac92e77e6c | powerpc | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/a8f611e5e3f3d3c5c85a9f910afc02e6041e1b93 | or1k | libtheora-1.1.1 | NOK | http://autobuild.buildroot.net/results/acb1729465fe728b7c91852afda4edb808f8ea91 | ORPH powerpc | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/1bd449648c1510f564a7f5f519e670fc222c6e19 | arm | ndisc6-1.0.4 | NOK | http://autobuild.buildroot.net/results/2b6a0d09d14b483754343990222dab8d6a896386 | ORPH m68k | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/41754f87d67b5747b5e1096ea3222b0a3512faeb | Classification of failures by reason for 2021.11.x -------------------------------------------------- zeromq-4.3.4 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/4cd4f5f4d90c244872d844ea2aeb90f6b3fe28e3 | Gitlab CI results for 2022-01-31 ================================ Detail of runtime-test failures for master ------------------------------------------ runtime-test | link to the job | orph? --------------------------+---------------------------------------------------------------+------ TestIso9660Grub2Hybrid | https://gitlab.com/buildroot.org/buildroot/-/jobs/2033214851 | ORPH TestLuajitRings | https://gitlab.com/buildroot.org/buildroot/-/jobs/2033215112 | ORPH TestLuajitTurbolua | https://gitlab.com/buildroot.org/buildroot/-/jobs/2033215128 | ORPH TestLxc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2033215000 | ORPH TestPerlGDGraph | https://gitlab.com/buildroot.org/buildroot/-/jobs/2033215014 | ORPH TestPythonPy2Pynacl | https://gitlab.com/buildroot.org/buildroot/-/jobs/2033215088 | ORPH TestPythonPy2Pyyaml | https://gitlab.com/buildroot.org/buildroot/-/jobs/2033215093 | ORPH TestPythonPy3Constantly | https://gitlab.com/buildroot.org/buildroot/-/jobs/2033215060 | ORPH ...honPy3FlaskExpectsJson | https://gitlab.com/buildroot.org/buildroot/-/jobs/2033215068 | ORPH TestPythonPy3Pyyaml | https://gitlab.com/buildroot.org/buildroot/-/jobs/2033215094 | ORPH TestRust | https://gitlab.com/buildroot.org/buildroot/-/jobs/2033215113 | ORPH TestRustBin | https://gitlab.com/buildroot.org/buildroot/-/jobs/2033215115 | ORPH -- http://autobuild.buildroot.net From heiko.thiery at gmail.com Tue Feb 1 07:22:53 2022 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Tue, 1 Feb 2022 08:22:53 +0100 Subject: [Buildroot] [PATCH v5] configs/kontron_bl_imx8mm_defconfig: new defconfig In-Reply-To: <3ea22a9d-938a-5086-66c6-a8f5510c8573@grinn-global.com> References: <20220131153022.351662-1-heiko.thiery@gmail.com> <12be81a6-7f2e-35b8-4f44-d8a20fce74f1@benettiengineering.com> <86bf975a-1599-005a-5ebc-a149cc973da4@benettiengineering.com> <3ea22a9d-938a-5086-66c6-a8f5510c8573@grinn-global.com> Message-ID: Hi, Am Mo., 31. Jan. 2022 um 18:45 Uhr schrieb Bartosz Bilas : > > Hello, > > On 31.01.2022 18:11, Giulio Benetti wrote: > > On 31/01/22 17:42, Michael Nazzareno Trimarchi wrote: > > [SNIP] > >>>>> 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. For organizing "real" projects I also prefer to use the "savedefconfig" way. But here to have a new defconfig in mainline buildroot I prefer a clean minimal defconfig. But I think that's just a matter of taste. -- Heiko From geomatsi at gmail.com Tue Feb 1 08:53:15 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Tue, 1 Feb 2022 11:53:15 +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: Hi Yegor, > 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. Thanks ! I reproduced the problem using your wpa_supplicant config snippet. Looking into Makefile of wpa_supplicant: - CONFIG_MESH for some reason needs SAE, so it enables CONFIG_SAE - CONFIG_SAE enables only HMAC_SHA256_KDF, which is apparently not enough It turns out that at least HMAC_SHA384_KDF is required for successful build. Here is a minimal patch for wpa_supplicant that fixes build for your snippet: diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile index cb66defac..c8e53a3c9 100644 --- a/wpa_supplicant/Makefile +++ b/wpa_supplicant/Makefile @@ -246,6 +246,7 @@ endif ifdef CONFIG_MESH NEED_80211_COMMON=y NEED_AES_SIV=y +NEED_HMAC_SHA384_KDF=y CONFIG_SAE=y CONFIG_AP=y CFLAGS += -DCONFIG_MESH In fact, it looks like wpa_supplicant build would fail for any configuration when we enable SAE without DPP. However in Buildroot we enable all WPA3 support at once which includes OWE/SAE/DPP. Meanwhile DPP enables all the NEED_HMAC_SHA***_KDF options. Regards, Sergey From patrickdepinguin at gmail.com Tue Feb 1 08:55:20 2022 From: patrickdepinguin at gmail.com (Thomas De Schampheleire) Date: Tue, 1 Feb 2022 09:55:20 +0100 Subject: [Buildroot] [PATCHv2 1/2] utils/size-stats-compare: clarify meaning of variables in print_result In-Reply-To: <527fd8d5-6c7e-aa10-06ba-e634ba3c600d@mind.be> References: <20210303150451.7963-1-patrickdepinguin@gmail.com> <527fd8d5-6c7e-aa10-06ba-e634ba3c600d@mind.be> Message-ID: El lun, 31 ene 2022 a las 21:38, Arnout Vandecappelle () escribi?: > > > > 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... No worries, thanks in any case! /Thomas From michael at amarulasolutions.com Tue Feb 1 09:13:42 2022 From: michael at amarulasolutions.com (Michael Trimarchi) Date: Tue, 1 Feb 2022 10:13:42 +0100 Subject: [Buildroot] [PATCH] boot/uboot: add support for bundling TEE in BIN format into U-Boot Message-ID: <20220201091342.143010-1-michael@amarulasolutions.com> Some U-Boot platforms (e.g. nxp) can bundle OPTEE's tee.bin into the U-Boot image using binman. This patch brings the necessary changes to enable this feature. Signed-off-by: Michael Trimarchi --- boot/uboot/Config.in | 12 ++++++++++++ boot/uboot/uboot.mk | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index c630fc6552..117bbd3faf 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -237,6 +237,18 @@ config BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE U-Boot. This option makes sure optee-os gets built prior to U-Boot, and that the TEE variable pointing to OPTEE's tee.elf, is passed during the Buildroot build. +choice + prompt "U-Boot OPTEE BL32 format" + default BR2_TARGET_UBOOT_NEEDS_OPTEE_BIN + depends on BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE + +config BR2_TARGET_UBOOT_NEEDS_OPTEE_BIN + bool "tee.bin" + +config BR2_TARGET_UBOOT_NEEDS_OPTEE_ELF + bool "tee.elf" + +endchoice config BR2_TARGET_UBOOT_NEEDS_OPENSBI bool "U-Boot needs OpenSBI" diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 574fc7089a..210fa219ed 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -177,7 +177,19 @@ endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE),y) UBOOT_DEPENDENCIES += optee-os +ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPTEE_ELF),y) UBOOT_MAKE_OPTS += TEE=$(BINARIES_DIR)/tee.elf +define UBOOT_COPY_TEE_FIRMWARE + cp $(BINARIES_DIR)/tee.elf $(@D)/ +endef +UBOOT_PRE_BUILD_HOOKS += UBOOT_COPY_TEE_FIRMWARE +else +UBOOT_MAKE_OPTS += BL32=$(BINARIES_DIR)/tee.bin +define UBOOT_COPY_TEE_FIRMWARE + cp $(BINARIES_DIR)/tee-raw.bin $(@D)/tee.bin +endef +UBOOT_PRE_BUILD_HOOKS += UBOOT_COPY_TEE_FIRMWARE +endif endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSBI),y) -- 2.25.1 From yegorslists at googlemail.com Tue Feb 1 10:25:50 2022 From: yegorslists at googlemail.com (Yegor Yefremov) Date: Tue, 1 Feb 2022 11:25:50 +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: Hi Sergey, On Tue, Feb 1, 2022 at 9:53 AM Sergey Matyukevich wrote: > > Hi Yegor, > > > 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. > > Thanks ! I reproduced the problem using your wpa_supplicant config snippet. > Looking into Makefile of wpa_supplicant: > - CONFIG_MESH for some reason needs SAE, so it enables CONFIG_SAE > - CONFIG_SAE enables only HMAC_SHA256_KDF, which is apparently not enough > > It turns out that at least HMAC_SHA384_KDF is required for successful build. > Here is a minimal patch for wpa_supplicant that fixes build for your snippet: > > diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile > index cb66defac..c8e53a3c9 100644 > --- a/wpa_supplicant/Makefile > +++ b/wpa_supplicant/Makefile > @@ -246,6 +246,7 @@ endif > ifdef CONFIG_MESH > NEED_80211_COMMON=y > NEED_AES_SIV=y > +NEED_HMAC_SHA384_KDF=y > CONFIG_SAE=y > CONFIG_AP=y > CFLAGS += -DCONFIG_MESH > > > In fact, it looks like wpa_supplicant build would fail for any configuration > when we enable SAE without DPP. However in Buildroot we enable all WPA3 > support at once which includes OWE/SAE/DPP. Meanwhile DPP enables all > the NEED_HMAC_SHA***_KDF options. Would you then add this patch to the version bump? I'll keep an eye on what happens with the official solution on the hostap mailing list. Regards, Yegor From geomatsi at gmail.com Tue Feb 1 10:46:15 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Tue, 1 Feb 2022 13:46:15 +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: > Hi Sergey, > > On Tue, Feb 1, 2022 at 9:53 AM Sergey Matyukevich wrote: > > > > Hi Yegor, > > > > > 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. > > > > Thanks ! I reproduced the problem using your wpa_supplicant config snippet. > > Looking into Makefile of wpa_supplicant: > > - CONFIG_MESH for some reason needs SAE, so it enables CONFIG_SAE > > - CONFIG_SAE enables only HMAC_SHA256_KDF, which is apparently not enough > > > > It turns out that at least HMAC_SHA384_KDF is required for successful build. > > Here is a minimal patch for wpa_supplicant that fixes build for your snippet: > > > > diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile > > index cb66defac..c8e53a3c9 100644 > > --- a/wpa_supplicant/Makefile > > +++ b/wpa_supplicant/Makefile > > @@ -246,6 +246,7 @@ endif > > ifdef CONFIG_MESH > > NEED_80211_COMMON=y > > NEED_AES_SIV=y > > +NEED_HMAC_SHA384_KDF=y > > CONFIG_SAE=y > > CONFIG_AP=y > > CFLAGS += -DCONFIG_MESH > > > > > > In fact, it looks like wpa_supplicant build would fail for any configuration > > when we enable SAE without DPP. However in Buildroot we enable all WPA3 > > support at once which includes OWE/SAE/DPP. Meanwhile DPP enables all > > the NEED_HMAC_SHA***_KDF options. > > Would you then add this patch to the version bump? I'll keep an eye on > what happens with the official solution on the hostap mailing list. I will send it separately on top of version update patches. Regards, Sergey From yann.morin at orange.com Tue Feb 1 13:49:44 2022 From: yann.morin at orange.com (yann.morin at orange.com) Date: Tue, 1 Feb 2022 14:49:44 +0100 Subject: [Buildroot] [PATCH] package/doc-asciidoc: fix build for out-of-tree documents Message-ID: <11822_1643723386_61F93A7A_11822_315_1_f2cd4a063f756aa49d3dc715be368bd3738e5f1d.1643723384.git.yann.morin@orange.com> From: "Yann E. MORIN" The doc-asciidoc infra allows document to define sources and resources, and those can only be local (there is no download support for documents). The currently documented way to specify those is to use the $(pkgdir) macro to point to the document sources and resources when they are along the .mk. However, this works only for sources and not for resources. Indeed, sources are used to generate Makefile dependency rules, so $(pkgdir) is expanded and evaluated during the call to $(doc-asciidoc), while resources are expanded and evaluated when the rules are executed, which always happen after all the parsing has be done, at which point $(pkgdir) expands to the last Makefile that was parsed, which is always Buildroot's own manual. This went unnoticed so far because Buildroot's manual is 1) the last to be parsed, and 2) not using $(pkgdir) anyway. Additionally, $(pkgdir) is mostly an internal macro, that is, as this change demonstrates, difficult to use, and thus should not be used, in packages or in documents. We fix that by introducing $(FOO_DOCDIR), similar to $(FOO_PKGDIR), which points to the document directory. We choose not to name the variable FOO_PKGDIR, because it semantically is not a package. As a consequence, the last argument to the doc-asciidoc macro is now superfluous, so it is removed, which causes a little bit of churn in the main macro. As a further consequence, the third argument in the inner macro is no longer needed either, so it too is removed, which causes a bit more churn yet in the inner macro. Signed-off-by: Yann E. MORIN Cc: Frederic GARDES --- docs/manual/adding-packages-asciidoc.txt | 17 ++++- package/doc-asciidoc.mk | 90 ++++++++++++------------ 2 files changed, 59 insertions(+), 48 deletions(-) diff --git a/docs/manual/adding-packages-asciidoc.txt b/docs/manual/adding-packages-asciidoc.txt index f9688b36c7..0bfe99d22e 100644 --- a/docs/manual/adding-packages-asciidoc.txt +++ b/docs/manual/adding-packages-asciidoc.txt @@ -39,7 +39,7 @@ Here is an example to render a simple AsciiDoc document. 04: # 05: ################################################################################ 06: -07: FOO_SOURCES = $(sort $(wildcard $(pkgdir)/*)) +07: FOO_SOURCES = $(sort $(wildcard $(FOO_DOCDIR)/*)) 08: $(eval $(call asciidoc-document)) ---- @@ -85,6 +85,17 @@ various steps: * +FOO_CHECK_DEPENDENCIES__HOOKS+, to run additional tests for the specified format ++ (see the list of rendered formats, above). +Buildroot sets the following variable that can be used in the definitions +above: + +* +$(FOO_DOCDIR)+, similar to +$(FOO_PKGDIR)+, contains the path to the + directory containing +foo.mk+. It can be used to refer to the document + sources, and can be used in the hooks, especially the post-rsync hook + if parts of the documentation needs to be generated. + +* +$(@D)+, as for traditional packages, contains the path to the directory + where the document will be copied and built. + Here is a complete example that uses all variables and all hooks: ---- @@ -94,8 +105,8 @@ Here is a complete example that uses all variables and all hooks: 04: # 05: ################################################################################ 06: -07: FOO_SOURCES = $(sort $(wildcard $(pkgdir)/*)) -08: FOO_RESOURCES = $(sort $(wildcard $(pkgdir)/ressources)) +07: FOO_SOURCES = $(sort $(wildcard $(FOO_DOCDIR)/*)) +08: FOO_RESOURCES = $(sort $(wildcard $(FOO_DOCDIR)/ressources)) 09: 10: define FOO_GEN_EXTRA_DOC 11: /path/to/generate-script --outdir=$(@D) diff --git a/package/doc-asciidoc.mk b/package/doc-asciidoc.mk index be92496c2e..2bd761edfb 100644 --- a/package/doc-asciidoc.mk +++ b/package/doc-asciidoc.mk @@ -42,12 +42,11 @@ BR_ASCIIDOC_CONF = docs/conf/asciidoc.conf # argument 1 is the name of the document and the top-level asciidoc file must # have the same name # argument 2 is the uppercase name of the document -# argument 3 is the directory containing the document -# argument 4 is the type of document to generate (-f argument of a2x) -# argument 5 is the document type as used in the make target -# argument 6 is the output file extension for the document type -# argument 7 is the human text for the document type -# argument 8 (optional) are extra arguments for a2x +# argument 3 is the type of document to generate (-f argument of a2x) +# argument 4 is the document type as used in the make target +# argument 5 is the output file extension for the document type +# argument 6 is the human text for the document type +# argument 7 (optional) are extra arguments for a2x # # The variable _SOURCES defines the dependencies. # @@ -55,55 +54,55 @@ BR_ASCIIDOC_CONF = docs/conf/asciidoc.conf # all variable references except the arguments must be $$-quoted. ################################################################################ define ASCIIDOC_INNER -$(1): $(1)-$(5) -.PHONY: $(1)-$(5) -$(1)-$(5): $$(O)/docs/$(1)/$(1).$(6) +$(1): $(1)-$(4) +.PHONY: $(1)-$(4) +$(1)-$(4): $$(O)/docs/$(1)/$(1).$(5) -asciidoc-check-dependencies-$(5): -.PHONY: $(1)-check-dependencies-$(5) +asciidoc-check-dependencies-$(4): +.PHONY: $(1)-check-dependencies-$(4) # Single line, because splitting a foreach is not easy... -$(1)-check-dependencies-$(5): asciidoc-check-dependencies-$(5) - $$(Q)$$(foreach hook,$$($(2)_CHECK_DEPENDENCIES_$$(call UPPERCASE,$(5))_HOOKS),$$(call $$(hook))$$(sep)) +$(1)-check-dependencies-$(4): asciidoc-check-dependencies-$(4) + $$(Q)$$(foreach hook,$$($(2)_CHECK_DEPENDENCIES_$$(call UPPERCASE,$(4))_HOOKS),$$(call $$(hook))$$(sep)) # Include Buildroot's AsciiDoc configuration first: # - generic configuration, # - then output-specific configuration ifneq ($$(wildcard $$(BR_ASCIIDOC_CONF)),) -$(2)_$(4)_ASCIIDOC_OPTS += -f $$(BR_ASCIIDOC_CONF) +$(2)_$(3)_ASCIIDOC_OPTS += -f $$(BR_ASCIIDOC_CONF) endif -BR_$(4)_ASCIIDOC_CONF = docs/conf/asciidoc-$(4).conf -ifneq ($$(wildcard $$(BR_$(4)_ASCIIDOC_CONF)),) -$(2)_$(4)_ASCIIDOC_OPTS += -f $$(BR_$(4)_ASCIIDOC_CONF) +BR_$(3)_ASCIIDOC_CONF = docs/conf/asciidoc-$(3).conf +ifneq ($$(wildcard $$(BR_$(3)_ASCIIDOC_CONF)),) +$(2)_$(3)_ASCIIDOC_OPTS += -f $$(BR_$(3)_ASCIIDOC_CONF) endif # Then include the document's AsciiDoc configuration: # - generic configuration, # - then output-specific configuration ifneq ($$(wildcard $$($(2)_ASCIIDOC_CONF)),) -$(2)_$(4)_ASCIIDOC_OPTS += -f $$($(2)_ASCIIDOC_CONF) +$(2)_$(3)_ASCIIDOC_OPTS += -f $$($(2)_ASCIIDOC_CONF) endif -$(2)_$(4)_ASCIIDOC_CONF = $(3)/asciidoc-$(4).conf -ifneq ($$(wildcard $$($(2)_$(4)_ASCIIDOC_CONF)),) -$(2)_$(4)_ASCIIDOC_OPTS += -f $$($(2)_$(4)_ASCIIDOC_CONF) +$(2)_$(3)_ASCIIDOC_CONF = $$($(2)_DOCDIR)/asciidoc-$(3).conf +ifneq ($$(wildcard $$($(2)_$(3)_ASCIIDOC_CONF)),) +$(2)_$(3)_ASCIIDOC_OPTS += -f $$($(2)_$(3)_ASCIIDOC_CONF) endif # Handle a2x warning about --destination-dir option only applicable to HTML # based outputs. So: # - use the --destination-dir option if possible (html and split-html), # - otherwise copy the generated document to the output directory -$(2)_$(4)_A2X_OPTS = -ifneq ($$(filter $(5),html split-html),) -$(2)_$(4)_A2X_OPTS += --destination-dir="$$(@D)" +$(2)_$(3)_A2X_OPTS = +ifneq ($$(filter $(4),html split-html),) +$(2)_$(3)_A2X_OPTS += --destination-dir="$$(@D)" else -define $(2)_$(4)_INSTALL_CMDS - $$(Q)cp -f $$(BUILD_DIR)/docs/$(1)/$(1).$(6) $$(@D) +define $(2)_$(3)_INSTALL_CMDS + $$(Q)cp -f $$(BUILD_DIR)/docs/$(1)/$(1).$(5) $$(@D) endef endif -$$(O)/docs/$(1)/$(1).$(6): export TZ=UTC +$$(O)/docs/$(1)/$(1).$(5): export TZ=UTC -ifeq ($(6)-$$(GENDOC_XSLTPROC_IS_BROKEN),pdf-y) -$$(O)/docs/$(1)/$(1).$(6): +ifeq ($(5)-$$(GENDOC_XSLTPROC_IS_BROKEN),pdf-y) +$$(O)/docs/$(1)/$(1).$(5): $$(warning PDF generation is disabled because of a bug in \ xsltproc. To be able to generate a PDF, you should \ build xsltproc from the libxslt sources >=1.1.29 and pass it \ @@ -112,20 +111,20 @@ $$(O)/docs/$(1)/$(1).$(6): else # -r $(@D) is there for documents that use external filters; those filters # generate code at the same location it finds the document's source files. -$$(O)/docs/$(1)/$(1).$(6): $$($(2)_SOURCES) \ +$$(O)/docs/$(1)/$(1).$(5): $$($(2)_SOURCES) \ $(1)-check-dependencies \ - $(1)-check-dependencies-$(5) \ + $(1)-check-dependencies-$(4) \ $(1)-prepare-sources - $$(Q)$$(call MESSAGE,"Generating $(7) $(1)...") + $$(Q)$$(call MESSAGE,"Generating $(6) $(1)...") $$(Q)mkdir -p $$(@D) - $$(Q)a2x $(8) -f $(4) -d book -L \ + $$(Q)a2x $(7) -f $(3) -d book -L \ $$(foreach r,$$($(2)_RESOURCES) $$(@D), \ --resource="$$(abspath $$(r))") \ - $$($(2)_$(4)_A2X_OPTS) \ - --asciidoc-opts="$$($(2)_$(4)_ASCIIDOC_OPTS)" \ + $$($(2)_$(3)_A2X_OPTS) \ + --asciidoc-opts="$$($(2)_$(3)_ASCIIDOC_OPTS)" \ $$(BUILD_DIR)/docs/$(1)/$(1).txt # install the generated document - $$($(2)_$(4)_INSTALL_CMDS) + $$($(2)_$(3)_INSTALL_CMDS) endif endef @@ -135,13 +134,14 @@ endef # argument 1 is the lowercase name of the document; the document's main file # must have the same name, with the .txt extension # argument 2 is the uppercase name of the document -# argument 3 is the directory containing the document's sources # # The variable _SOURCES defines the dependencies. # The variable _RESOURCES defines where the document's # resources, such as images, are located; must be an absolute path. ################################################################################ define ASCIIDOC +$(2)_DOCDIR = $(pkgdir) + # Single line, because splitting a foreach is not easy... .PHONY: $(1)-check-dependencies $(1)-check-dependencies: asciidoc-check-dependencies $$($(2)_DEPENDENCIES) @@ -153,29 +153,29 @@ $(1)-check-dependencies: asciidoc-check-dependencies $$($(2)_DEPENDENCIES) $$(BUILD_DIR)/docs/$(1)/.stamp_doc_rsynced: $$(Q)$$(call MESSAGE,"Preparing the $(1) sources...") $$(Q)mkdir -p $$(@D) - $$(Q)rsync -a $(3) $$(@D) + $$(Q)rsync -a $$($(2)_DOCDIR) $$(@D) $$(Q)$$(foreach hook,$$($(2)_POST_RSYNC_HOOKS),$$(call $$(hook))$$(sep)) .PHONY: $(1)-prepare-sources $(1)-prepare-sources: $$(BUILD_DIR)/docs/$(1)/.stamp_doc_rsynced -$(2)_ASCIIDOC_CONF = $(3)/asciidoc.conf +$(2)_ASCIIDOC_CONF = $$($(2)_DOCDIR)/asciidoc.conf -$(call ASCIIDOC_INNER,$(1),$(2),$(3),xhtml,html,html,HTML,\ +$(call ASCIIDOC_INNER,$(1),$(2),xhtml,html,html,HTML,\ --xsltproc-opts "--stringparam toc.section.depth 1") -$(call ASCIIDOC_INNER,$(1),$(2),$(3),chunked,split-html,chunked,split HTML,\ +$(call ASCIIDOC_INNER,$(1),$(2),chunked,split-html,chunked,split HTML,\ --xsltproc-opts "--stringparam toc.section.depth 1") # dblatex needs to pass the '--maxvars ...' option to xsltproc to prevent it # from reaching the template recursion limit when processing the (long) target # package table and bailing out. -$(call ASCIIDOC_INNER,$(1),$(2),$(3),pdf,pdf,pdf,PDF,\ +$(call ASCIIDOC_INNER,$(1),$(2),pdf,pdf,pdf,PDF,\ --dblatex-opts "-P latex.output.revhistory=0 -x '--maxvars 100000'") -$(call ASCIIDOC_INNER,$(1),$(2),$(3),text,text,text,text) +$(call ASCIIDOC_INNER,$(1),$(2),text,text,text,text) -$(call ASCIIDOC_INNER,$(1),$(2),$(3),epub,epub,epub,ePUB) +$(call ASCIIDOC_INNER,$(1),$(2),epub,epub,epub,ePUB) clean: $(1)-clean $(1)-clean: @@ -187,4 +187,4 @@ endef # asciidoc-document -- the target generator macro for asciidoc documents ################################################################################ -asciidoc-document = $(call ASCIIDOC,$(pkgname),$(call UPPERCASE,$(pkgname)),$(pkgdir)) +asciidoc-document = $(call ASCIIDOC,$(pkgname),$(call UPPERCASE,$(pkgname))) -- 2.25.1 _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From yann.morin at orange.com Tue Feb 1 14:00:06 2022 From: yann.morin at orange.com (yann.morin at orange.com) Date: Tue, 1 Feb 2022 15:00:06 +0100 Subject: [Buildroot] [PATCH] package/glibc: allow runing on kernel older than used for the headers Message-ID: <12945_1643724020_61F93CE8_12945_430_1_dfe1b340bf9e8e2c47987f28f8fd40cca7d16b3b.1643724006.git.yann.morin@orange.com> From: "Yann E. MORIN" Currently, we configure glibc to not add compatibility support for kernel older than the one used for the headers. This is on the expectation that the system will never run on a kernel that is older than the one used for the headers and, when Buildroot builds the kernel, on another, older kernel. However, in some situations, it is possible to build for a generic system, where the kernel may be a different version. This can be the case, for example, when Building an image that is to be used in a container that can run on a range of machines each with different kernel versions. In such a case, it is interesting to build glibc in a way as to take better advantage of the newer kernels, and thus using newer kernel headers, while still allowing running onn older kernels, and thus carrying more compatibility code. We add an option to glibc to be allow the user to provide the oldest kernel version they expect to use, and use that if specified; if not specified (the default), use the version of the kernel headers as was done previously. Signed-off-by: Yann E. MORIN Cc: Frederic GARDES --- package/glibc/Config.in | 12 ++++++++++++ package/glibc/glibc.mk | 5 ++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package/glibc/Config.in b/package/glibc/Config.in index 5ecd058145..01da045ce7 100644 --- a/package/glibc/Config.in +++ b/package/glibc/Config.in @@ -10,6 +10,18 @@ config BR2_PACKAGE_GLIBC help https://www.gnu.org/software/libc/ +config BR2_PACKAGE_GLIBC_KERNEL_COMPAT + string "Oldest kernel version supported" + help + If you plan on running on various kernel versions, enter the + oldest version you expect to run on here. + + Note that the older the version, the more backward compatibility + code is added, and the slower the code may get. + + Leave it empty (the default) to use the same version as used for + the kernel headers. + config BR2_PACKAGE_GLIBC_UTILS bool "Install glibc utilities" help diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index 5c26b0e6df..43015417c2 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -98,6 +98,9 @@ endif GLIBC_MAKE = $(BR2_MAKE) GLIBC_CONF_ENV += ac_cv_prog_MAKE="$(BR2_MAKE)" +GLIBC_KERNEL_VERSION = $(or $(call qstrip,$(BR2_PACKAGE_GLIBC_KERNEL_COMPAT)), \ + $(call qstrip,$(BR2_TOOLCHAIN_HEADERS_AT_LEAST))) + # Even though we use the autotools-package infrastructure, we have to # override the default configure commands for several reasons: # @@ -128,7 +131,7 @@ define GLIBC_CONFIGURE_CMDS --disable-profile \ --disable-werror \ --without-gd \ - --enable-kernel=$(call qstrip,$(BR2_TOOLCHAIN_HEADERS_AT_LEAST)) \ + --enable-kernel=$(GLIBC_KERNEL_VERSION) \ --with-headers=$(STAGING_DIR)/usr/include) $(GLIBC_ADD_MISSING_STUB_H) endef -- 2.25.1 _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From Alexey.Brodkin at synopsys.com Tue Feb 1 14:23:44 2022 From: Alexey.Brodkin at synopsys.com (Alexey Brodkin) Date: Tue, 1 Feb 2022 14:23:44 +0000 Subject: [Buildroot] [PATCH] package/glibc: allow runing on kernel older than used for the headers In-Reply-To: <12945_1643724020_61F93CE8_12945_430_1_dfe1b340bf9e8e2c47987f28f8fd40cca7d16b3b.1643724006.git.yann.morin@orange.com> References: <12945_1643724020_61F93CE8_12945_430_1_dfe1b340bf9e8e2c47987f28f8fd40cca7d16b3b.1643724006.git.yann.morin@orange.com> Message-ID: Hi Yann, > Currently, we configure glibc to not add compatibility support for > kernel older than the one used for the headers. This is on the > expectation that the system will never run on a kernel that is older > than the one used for the headers and, when Buildroot builds the kernel, > on another, older kernel. > > However, in some situations, it is possible to build for a generic > system, where the kernel may be a different version. This can be the > case, for example, when Building an image that is to be used in a > container that can run on a range of machines each with different kernel > versions. In such a case, it is interesting to build glibc in a way as > to take better advantage of the newer kernels, and thus using newer > kernel headers, while still allowing running onn older kernels, and thus > carrying more compatibility code. > > We add an option to glibc to be allow the user to provide the oldest > kernel version they expect to use, and use that if specified; if not > specified (the default), use the version of the kernel headers as was > done previously. That's a very welcome one as it bites us all the time we try to run more recent rootfs with some older kernels. > Signed-off-by: Yann E. MORIN > Cc: Frederic GARDES > +config BR2_PACKAGE_GLIBC_KERNEL_COMPAT > + string "Oldest kernel version supported" > + help > + If you plan on running on various kernel versions, enter the > + oldest version you expect to run on here. > + > + Note that the older the version, the more backward compatibility > + code is added, and the slower the code may get. > + > + Leave it empty (the default) to use the same version as used for > + the kernel headers. I'd say there's the third option and frankly I like this one the most - default oldest version assumed by the glibc itself. The beauty of it is it's really the oldest version of the kernel which is supported by a given glibc version for a particular architecture. > config BR2_PACKAGE_GLIBC_UTILS > bool "Install glibc utilities" > help > diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk > index 5c26b0e6df..43015417c2 100644 > --- a/package/glibc/glibc.mk > +++ b/package/glibc/glibc.mk > @@ -98,6 +98,9 @@ endif > GLIBC_MAKE = $(BR2_MAKE) > GLIBC_CONF_ENV += ac_cv_prog_MAKE="$(BR2_MAKE)" > > +GLIBC_KERNEL_VERSION = $(or $(call qstrip,$(BR2_PACKAGE_GLIBC_KERNEL_COMPAT)), \ > + $(call qstrip,$(BR2_TOOLCHAIN_HEADERS_AT_LEAST))) > + > # Even though we use the autotools-package infrastructure, we have to > # override the default configure commands for several reasons: > # > @@ -128,7 +131,7 @@ define GLIBC_CONFIGURE_CMDS > --disable-profile \ > --disable-werror \ > --without-gd \ > - --enable-kernel=$(call qstrip,$(BR2_TOOLCHAIN_HEADERS_AT_LEAST)) \ > + --enable-kernel=$(GLIBC_KERNEL_VERSION) \ See [1] and how "arch_minimum_kernel" is used in [2]. I.e. for that third option to work we need to skip setup of "--enable-kernel" completely. [1] https://sourceware.org/git/?p=glibc.git;a=blob;f=configure;h=8e5bee775a651fcbaaa96ede8039ae1f049e296e;hb=HEAD#l3529 [2] https://sourceware.org/git/?p=glibc.git;a=blob;f=sysdeps/unix/sysv/linux/configure.ac;h=197b7e66c8fe6eb0a1136c992478b9a2272713e7;hb=HEAD#l30 -Alexey From yann.morin at orange.com Tue Feb 1 15:09:48 2022 From: yann.morin at orange.com (yann.morin at orange.com) Date: Tue, 1 Feb 2022 16:09:48 +0100 Subject: [Buildroot] [PATCH] package/glibc: allow runing on kernel older than used for the headers In-Reply-To: References: <12945_1643724020_61F93CE8_12945_430_1_dfe1b340bf9e8e2c47987f28f8fd40cca7d16b3b.1643724006.git.yann.morin@orange.com> Message-ID: <22491_1643728190_61F94D3E_22491_62_1_20220201150948.GB3216@tl-lnx-nyma7486> Alexey, All, On 2022-02-01 14:23 +0000, Alexey Brodkin spake thusly: [--SNIP--] > > +config BR2_PACKAGE_GLIBC_KERNEL_COMPAT > > + string "Oldest kernel version supported" > > + help > > + If you plan on running on various kernel versions, enter the > > + oldest version you expect to run on here. > > + > > + Note that the older the version, the more backward compatibility > > + code is added, and the slower the code may get. > > + > > + Leave it empty (the default) to use the same version as used for > > + the kernel headers. > I'd say there's the third option and frankly I like this one the most - default > oldest version assumed by the glibc itself. The beauty of it is it's really the > oldest version of the kernel which is supported by a given glibc version for > a particular architecture. I also considered that, but I believe that a user should explicitly request the oldest kernel they want to support (yes, they'd have to do their homework to see what that version can be for their architecture). Letting the system decide on itself is prone to providing some surprises... However, letting the user provide an explicit version is also prone to surprises, because if that version is too old, glibc resets it to the oldest it actually supports, and just merely emits a warning message, which does not prevent the build to succeed (it still fails at runtime in the usual way then)... So, in either case, meh... So, we'd have to differentiate between the three cases: - use same as headers (should be the default to keep current behaviour) - use oldest supported by glibc - use explcitly specified version So, two options there: - recognise a magical value in BR2_PACKAGE_GLIBC_KERNEL_COMPAT, like 'oldest' (bikeshed, go) to mean the oldest glibc can support, empty to mean "same as headers", or an actual value. - add a boolean "Specify oldest kernel supported", and hide BR2_PACKAGE_GLIBC_KERNEL_COMPAT behind that boolean; then if the boolean is not set, use same as headers (as today); if it is set, then use BR2_PACKAGE_GLIBC_KERNEL_COMPAT is set, or let glibc decide if not set. Thoughts? Needless to say, I don't have much sympathy for the first option, magical values are bad... But I am not too fond of the second option either, but I can't see a better way to provide for the three different cases... > [1] https://sourceware.org/git/?p=glibc.git;a=blob;f=configure;h=8e5bee775a651fcbaaa96ede8039ae1f049e296e;hb=HEAD#l3529 > [2] https://sourceware.org/git/?p=glibc.git;a=blob;f=sysdeps/unix/sysv/linux/configure.ac;h=197b7e66c8fe6eb0a1136c992478b9a2272713e7;hb=HEAD#l30 Yeah, I already had a look at those for various archs. Thanks! Regards, Yann E. MORIN. -- ____________ .-----------------.--------------------: _ :------------------. | Yann E. MORIN | Real-Time Embedded | __/ ) | /"\ ASCII RIBBON | | +33 534.541.179 | Software Designer | _/ - /' | \ / CAMPAIGN | | +33 638.411.245 '--------------------: (_ `--, | X AGAINST | | yann.morin (at) orange.com |_=" ,--' | / \ HTML MAIL | '--------------------------------------:______/_____:------------------' _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From julien.boibessot at armadeus.com Tue Feb 1 17:06:47 2022 From: julien.boibessot at armadeus.com (julien.boibessot at armadeus.com) Date: Tue, 1 Feb 2022 18:06:47 +0100 Subject: [Buildroot] [PATCH] package/ltris: bump version to 1.2.3 Message-ID: <20220201170647.109298-1-julien.boibessot@armadeus.com> From: Julien BOIBESSOT 0001-fix-build-with-gcc-4.8.patch was integrated mainline and cross-compilation slightly changed. --- .../ltris/0001-fix-build-with-gcc-4.8.patch | 20 ------------------- package/ltris/ltris.hash | 4 ++-- package/ltris/ltris.mk | 4 ++-- 3 files changed, 4 insertions(+), 24 deletions(-) delete mode 100644 package/ltris/0001-fix-build-with-gcc-4.8.patch diff --git a/package/ltris/0001-fix-build-with-gcc-4.8.patch b/package/ltris/0001-fix-build-with-gcc-4.8.patch deleted file mode 100644 index d6bbf6a946..0000000000 --- a/package/ltris/0001-fix-build-with-gcc-4.8.patch +++ /dev/null @@ -1,20 +0,0 @@ -Fix build with gcc 4.8 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://sourceforge.net/p/lgames/patches/28] -Index: ltris/src/bowl.c -=================================================================== ---- ltris/src/bowl.c (r?vision 421) -+++ ltris/src/bowl.c (copie de travail) -@@ -828,9 +828,10 @@ - */ - void bowl_init_block_masks() - { -+ int i; - int masksize = sizeof(block_masks[0].mask); // same for all - -- for (int i = 0; i < 7; i++) { -+ for (i = 0; i < 7; i++) { - block_masks[i].rx = 2; - block_masks[i].ry = 2; - memset(block_masks[i].mask, 0, masksize ); diff --git a/package/ltris/ltris.hash b/package/ltris/ltris.hash index f696e3af17..20f34342ff 100644 --- a/package/ltris/ltris.hash +++ b/package/ltris/ltris.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 a7bc6c5fc6539b88505077a1b4580edc9b179ce0a6b829c58fbd9416cf456195 ltris-1.2.tar.gz -sha256 67f82e045cf7acfef853ea0f426575a8359161a0a325e19f02b529a87c4b6c34 COPYING +sha256 0ec4ad053e066a296529e923c2f626fa0a19c094c5ae03e44359f9c9e50955a8 ltris-1.2.3.tar.gz +sha256 67f82e045cf7acfef853ea0f426575a8359161a0a325e19f02b529a87c4b6c34 COPYING diff --git a/package/ltris/ltris.mk b/package/ltris/ltris.mk index 9b59613417..6e37bdbd19 100644 --- a/package/ltris/ltris.mk +++ b/package/ltris/ltris.mk @@ -5,7 +5,7 @@ ################################################################################ LTRIS_SITE = http://downloads.sourceforge.net/lgames/ltris -LTRIS_VERSION = 1.2 +LTRIS_VERSION = 1.2.3 LTRIS_LICENSE = GPL-2.0+ LTRIS_LICENSE_FILES = COPYING @@ -13,7 +13,7 @@ LTRIS_DEPENDENCIES = sdl $(TARGET_NLS_DEPENDENCIES) LTRIS_LIBS = $(TARGET_NLS_LIBS) LTRIS_CONF_ENV = \ - SDL_CONFIG="$(STAGING_DIR)/usr/bin/sdl-config" \ + PATH="$(PATH):$(STAGING_DIR)/usr/bin" \ LIBS="$(LTRIS_LIBS)" ifeq ($(BR2_PACKAGE_LTRIS_AUDIO),y) -- 2.25.1 From yann.morin.1998 at free.fr Tue Feb 1 17:14:41 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 1 Feb 2022 18:14:41 +0100 Subject: [Buildroot] [PATCH] boot/uboot: add support for bundling TEE in BIN format into U-Boot In-Reply-To: <20220201091342.143010-1-michael@amarulasolutions.com> References: <20220201091342.143010-1-michael@amarulasolutions.com> Message-ID: <20220201171441.GV457876@scaer> Michael, All, On 2022-02-01 10:13 +0100, Michael Trimarchi spake thusly: > Some U-Boot platforms (e.g. nxp) can bundle OPTEE's tee.bin > into the U-Boot image using binman. This patch brings the necessary changes to > enable this feature. > > Signed-off-by: Michael Trimarchi > --- > boot/uboot/Config.in | 12 ++++++++++++ > boot/uboot/uboot.mk | 12 ++++++++++++ > 2 files changed, 24 insertions(+) > > diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in > index c630fc6552..117bbd3faf 100644 > --- a/boot/uboot/Config.in > +++ b/boot/uboot/Config.in > @@ -237,6 +237,18 @@ config BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE > U-Boot. This option makes sure optee-os gets built prior to > U-Boot, and that the TEE variable pointing to OPTEE's > tee.elf, is passed during the Buildroot build. Missing empty line here. > +choice > + prompt "U-Boot OPTEE BL32 format" > + default BR2_TARGET_UBOOT_NEEDS_OPTEE_BIN > + depends on BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE > + > +config BR2_TARGET_UBOOT_NEEDS_OPTEE_BIN > + bool "tee.bin" > + > +config BR2_TARGET_UBOOT_NEEDS_OPTEE_ELF > + bool "tee.elf" > + > +endchoice > > config BR2_TARGET_UBOOT_NEEDS_OPENSBI > bool "U-Boot needs OpenSBI" > diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk > index 574fc7089a..210fa219ed 100644 > --- a/boot/uboot/uboot.mk > +++ b/boot/uboot/uboot.mk > @@ -177,7 +177,19 @@ endif > > ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE),y) > UBOOT_DEPENDENCIES += optee-os > +ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPTEE_ELF),y) > UBOOT_MAKE_OPTS += TEE=$(BINARIES_DIR)/tee.elf > +define UBOOT_COPY_TEE_FIRMWARE > + cp $(BINARIES_DIR)/tee.elf $(@D)/ Why do you need to copy it, when TEE is pointing to the original in $(BINARIESD_DIR), just above, and that has worked well so far? > +endef > +UBOOT_PRE_BUILD_HOOKS += UBOOT_COPY_TEE_FIRMWARE > +else > +UBOOT_MAKE_OPTS += BL32=$(BINARIES_DIR)/tee.bin > +define UBOOT_COPY_TEE_FIRMWARE > + cp $(BINARIES_DIR)/tee-raw.bin $(@D)/tee.bin Ditto: why do you need to copy it, when TEE, just above, also points to the original in $(BINARIES_DIR) ? Regards, Yann E. MORIN. > +endef > +UBOOT_PRE_BUILD_HOOKS += UBOOT_COPY_TEE_FIRMWARE > +endif > endif > > ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSBI),y) > -- > 2.25.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 giulio.benetti at benettiengineering.com Tue Feb 1 17:19:10 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 1 Feb 2022 18:19:10 +0100 Subject: [Buildroot] [PATCH] package/cryptsetup: disable package if we build for Microblaze Message-ID: <20220201171910.32728-1-giulio.benetti@benettiengineering.com> cryptsetup has the same build failure found for libfuse. For libfuse I've patched meson that now correctly checks if symver is available: https://github.com/libfuse/libfuse/pull/620/commits/3aba09a5c56e017746c5c1652dbc845f4db7374a But in cryptsetup the check is done in a header file while building, so I can't use the same approach and that would take not few work to move the check to Autotools, so I've opened an issue on cryptsetup's gitlab: https://gitlab.com/cryptsetup/cryptsetup/-/issues/709 asking if they can manage it the way I've done for libfuse. So let's disable cryptsetup if we're building on Microblaze for the moment and when the issue will be fixed upstream, I will bump the version and re-enable building for Microblaze. Fixes: http://autobuild.buildroot.net/results/86b/86b6b13e6be8375875caebcd91de91fef83f72e8/ Signed-off-by: Giulio Benetti --- package/cryptsetup/Config.in | 1 + package/libblockdev/Config.in | 1 + package/luksmeta/Config.in | 1 + package/systemd/Config.in | 1 + package/udisks/Config.in | 1 + 5 files changed, 5 insertions(+) diff --git a/package/cryptsetup/Config.in b/package/cryptsetup/Config.in index f36883ea47..2f3dd8d2b2 100644 --- a/package/cryptsetup/Config.in +++ b/package/cryptsetup/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_CRYPTSETUP bool "cryptsetup" depends on BR2_TOOLCHAIN_HAS_THREADS # lvm2 + depends on !BR2_microblaze # wrong symver detection depends on BR2_USE_MMU # lvm2, libargon2 depends on !BR2_STATIC_LIBS # lvm2, libargon2 depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c diff --git a/package/libblockdev/Config.in b/package/libblockdev/Config.in index 4389fd794c..38fe2331cf 100644 --- a/package/libblockdev/Config.in +++ b/package/libblockdev/Config.in @@ -23,6 +23,7 @@ comment "plugins" config BR2_PACKAGE_LIBBLOCKDEV_CRYPTO bool "crypto" depends on BR2_TOOLCHAIN_HAS_SYNC_4 # cryptsetup -> json-c + depends on !BR2_microblaze # cryptsetup select BR2_PACKAGE_CRYPTSETUP config BR2_PACKAGE_LIBBLOCKDEV_FS diff --git a/package/luksmeta/Config.in b/package/luksmeta/Config.in index ddc9b6f3bf..88a10bc9da 100644 --- a/package/luksmeta/Config.in +++ b/package/luksmeta/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_LUKSMETA bool "luksmeta" depends on BR2_TOOLCHAIN_HAS_THREADS # cryptsetup -> lvm2 + depends on !BR2_microblaze # cryptsetup depends on BR2_USE_MMU # cryptsetup -> lvm2 depends on !BR2_STATIC_LIBS # cryptsetup -> lvm2 depends on BR2_TOOLCHAIN_HAS_SYNC_4 # cryptsetup -> json-c diff --git a/package/systemd/Config.in b/package/systemd/Config.in index cc0736561e..d1e692f826 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -228,6 +228,7 @@ config BR2_PACKAGE_SYSTEMD_HIBERNATE config BR2_PACKAGE_SYSTEMD_HOMED bool "enable home daemon" depends on BR2_TOOLCHAIN_HAS_THREADS # cryptsetup -> lvm2 + depends on !BR2_microblaze # cryptsetup depends on BR2_USE_MMU # cryptsetup -> lvm2 depends on !BR2_STATIC_LIBS # cryptsetup -> lvm2 depends on BR2_TOOLCHAIN_HAS_SYNC_4 # cryptsetup -> json-c diff --git a/package/udisks/Config.in b/package/udisks/Config.in index 82f11ae7de..8a48d85924 100644 --- a/package/udisks/Config.in +++ b/package/udisks/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_UDISKS depends on BR2_TOOLCHAIN_HAS_THREADS # polkit depends on BR2_USE_WCHAR # dbus-glib -> glib2 depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libblockdev -> cryptsetup -> json-c + depends on !BR2_microblaze # cryptsetup depends on !BR2_STATIC_LIBS # polkit -> duktape select BR2_PACKAGE_DBUS select BR2_PACKAGE_DBUS_GLIB -- 2.25.1 From yegorslists at googlemail.com Tue Feb 1 17:22:00 2022 From: yegorslists at googlemail.com (Yegor Yefremov) Date: Tue, 1 Feb 2022 18:22:00 +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: 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 Reviewed-by: Yegor Yefremov > --- > ...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 yegorslists at googlemail.com Tue Feb 1 17:22:35 2022 From: yegorslists at googlemail.com (Yegor Yefremov) Date: Tue, 1 Feb 2022 18:22:35 +0100 Subject: [Buildroot] [PATCH 2/2] package/hostapd: bump version to 2.10 In-Reply-To: <20220131194818.2084092-2-geomatsi@gmail.com> References: <20220131194818.2084092-1-geomatsi@gmail.com> <20220131194818.2084092-2-geomatsi@gmail.com> Message-ID: On Mon, Jan 31, 2022 at 8:48 PM Sergey Matyukevich wrote: > > 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 Reviewed-by: Yegor Yefremov > --- > ...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 giulio.benetti at benettiengineering.com Tue Feb 1 17:33:51 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 1 Feb 2022 18:33:51 +0100 Subject: [Buildroot] [PATCH 1/2] package/cryptsetup: bump version to 2.4.3 Message-ID: <20220201173352.160244-1-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- package/cryptsetup/cryptsetup.hash | 2 +- package/cryptsetup/cryptsetup.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cryptsetup/cryptsetup.hash b/package/cryptsetup/cryptsetup.hash index b3bb859bdc..dce2686d31 100644 --- a/package/cryptsetup/cryptsetup.hash +++ b/package/cryptsetup/cryptsetup.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.4/sha256sums.asc -sha256 170cc2326a9daeeeb578579176bd10d4a60ee5c4fc5bc69018ce67dafc540b9c cryptsetup-2.4.2.tar.xz +sha256 fc0df945188172264ec5bf1d0bda08264fadc8a3f856d47eba91f31fe354b507 cryptsetup-2.4.3.tar.xz sha256 45670cce8b6a0ddd66c8016cd8ccef6cd71f35717cbacc7f1e895b3855207b33 COPYING sha256 8c33cc37871654ec7ed87e6fbb896c8cf33ef5ef05b1611a5aed857596ffafa5 COPYING.LGPL diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index 9cfd647ac6..2e06047c56 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -5,7 +5,7 @@ ################################################################################ CRYPTSETUP_VERSION_MAJOR = 2.4 -CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).2 +CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).3 CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR) CRYPTSETUP_DEPENDENCIES = \ -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Feb 1 17:33:52 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 1 Feb 2022 18:33:52 +0100 Subject: [Buildroot] [PATCH 2/2] DEVELOPERS: add Giulio Benetti to cryptsetup package In-Reply-To: <20220201173352.160244-1-giulio.benetti@benettiengineering.com> References: <20220201173352.160244-1-giulio.benetti@benettiengineering.com> Message-ID: <20220201173352.160244-2-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 38724726d4..5255b096b0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1097,6 +1097,7 @@ F: configs/asus_tinker_rk3288_defconfig F: configs/olimex_a* F: package/at/ F: package/binutils/ +F: package/cryptsetup/ F: package/erlang-jiffy/ F: package/gcc/ F: package/harfbuzz/ -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Feb 1 17:37:59 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 1 Feb 2022 18:37:59 +0100 Subject: [Buildroot] [PATCH 2/2] DEVELOPERS: add Giulio Benetti to cryptsetup package In-Reply-To: <20220201173633.GC21736@darwin.bork.org> References: <20220201173352.160244-1-giulio.benetti@benettiengineering.com> <20220201173352.160244-2-giulio.benetti@benettiengineering.com> <20220201173633.GC21736@darwin.bork.org> Message-ID: <9c345e33-0f39-c52b-55e1-46c7cf096e2f@benettiengineering.com> Hi Martin, On 01/02/22 18:36, Martin Hicks wrote: > On Tue, Feb 01, 2022 at 06:33:52PM +0100, Giulio Benetti wrote: >> Signed-off-by: Giulio Benetti > > Signed-off-by: Martin Hicks > > I could be removed as a Cryptsetup maintainer. I no longer have a vested interest > in using cryptsetup in a buildroot firmware. That's ok, I send a patch for this and I ask you to give a Acked-by: Best regards -- Giulio Benetti Benetti Engineering sas > Thanks, > mh > >> --- >> DEVELOPERS | 1 + >> 1 file changed, 1 insertion(+) >> >> diff --git a/DEVELOPERS b/DEVELOPERS >> index 38724726d4..5255b096b0 100644 >> --- a/DEVELOPERS >> +++ b/DEVELOPERS >> @@ -1097,6 +1097,7 @@ F: configs/asus_tinker_rk3288_defconfig >> F: configs/olimex_a* >> F: package/at/ >> F: package/binutils/ >> +F: package/cryptsetup/ >> F: package/erlang-jiffy/ >> F: package/gcc/ >> F: package/harfbuzz/ >> -- >> 2.25.1 >> > From giulio.benetti at benettiengineering.com Tue Feb 1 17:41:18 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 1 Feb 2022 18:41:18 +0100 Subject: [Buildroot] [PATCH] DEVELOPERS: remove Martin Hicks from file Message-ID: <20220201174118.277366-1-giulio.benetti@benettiengineering.com> Martin Hicks asked to not maintain cryptsetup anymore: https://lists.buildroot.org/pipermail/buildroot/2022-February/635413.html Also he doesn't mantain any other package, so let's remove him from this file. Signed-off-by: Giulio Benetti --- DEVELOPERS | 3 --- 1 file changed, 3 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 5255b096b0..555723867e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1847,9 +1847,6 @@ F: package/rpi-firmware/ F: package/tzdata/ F: package/zic/ -N: Martin Hicks -F: package/cryptsetup/ - N: Martin Kepplinger F: package/tslib/ F: package/x11r7/xdriver_xf86-input-tslib/ -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Feb 1 17:42:02 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 1 Feb 2022 18:42:02 +0100 Subject: [Buildroot] [PATCH] DEVELOPERS: remove Martin Hicks from file Message-ID: <20220201174202.286878-1-giulio.benetti@benettiengineering.com> Martin Hicks asked to not maintain cryptsetup anymore: https://lists.buildroot.org/pipermail/buildroot/2022-February/635413.html Also he doesn't mantain any other package, so let's remove him from this file. Signed-off-by: Giulio Benetti --- DEVELOPERS | 3 --- 1 file changed, 3 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 5255b096b0..555723867e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1847,9 +1847,6 @@ F: package/rpi-firmware/ F: package/tzdata/ F: package/zic/ -N: Martin Hicks -F: package/cryptsetup/ - N: Martin Kepplinger F: package/tslib/ F: package/x11r7/xdriver_xf86-input-tslib/ -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Feb 1 17:42:45 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 1 Feb 2022 18:42:45 +0100 Subject: [Buildroot] [PATCH] DEVELOPERS: remove Martin Hicks from file In-Reply-To: <20220201174118.277366-1-giulio.benetti@benettiengineering.com> References: <20220201174118.277366-1-giulio.benetti@benettiengineering.com> Message-ID: <69b69000-f7ff-cd04-2c1e-301a8d0d9dc3@benettiengineering.com> I've resent with Martin in Cc to give a Acked-by, sorry for the noise -- Giulio Benetti Benetti Engineering sas On 01/02/22 18:41, Giulio Benetti wrote: > Martin Hicks asked to not maintain cryptsetup anymore: > https://lists.buildroot.org/pipermail/buildroot/2022-February/635413.html > > Also he doesn't mantain any other package, so let's remove him from this > file. > > Signed-off-by: Giulio Benetti > --- > DEVELOPERS | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/DEVELOPERS b/DEVELOPERS > index 5255b096b0..555723867e 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1847,9 +1847,6 @@ F: package/rpi-firmware/ > F: package/tzdata/ > F: package/zic/ > > -N: Martin Hicks > -F: package/cryptsetup/ > - > N: Martin Kepplinger > F: package/tslib/ > F: package/x11r7/xdriver_xf86-input-tslib/ From michael at amarulasolutions.com Tue Feb 1 17:57:30 2022 From: michael at amarulasolutions.com (Michael Nazzareno Trimarchi) Date: Tue, 1 Feb 2022 18:57:30 +0100 Subject: [Buildroot] [PATCH] boot/uboot: add support for bundling TEE in BIN format into U-Boot In-Reply-To: <20220201171441.GV457876@scaer> References: <20220201091342.143010-1-michael@amarulasolutions.com> <20220201171441.GV457876@scaer> Message-ID: Hi On Tue, Feb 1, 2022 at 6:14 PM Yann E. MORIN wrote: > > Michael, All, > > On 2022-02-01 10:13 +0100, Michael Trimarchi spake thusly: > > Some U-Boot platforms (e.g. nxp) can bundle OPTEE's tee.bin > > into the U-Boot image using binman. This patch brings the necessary changes to > > enable this feature. > > > > Signed-off-by: Michael Trimarchi > > --- > > boot/uboot/Config.in | 12 ++++++++++++ > > boot/uboot/uboot.mk | 12 ++++++++++++ > > 2 files changed, 24 insertions(+) > > > > diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in > > index c630fc6552..117bbd3faf 100644 > > --- a/boot/uboot/Config.in > > +++ b/boot/uboot/Config.in > > @@ -237,6 +237,18 @@ config BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE > > U-Boot. This option makes sure optee-os gets built prior to > > U-Boot, and that the TEE variable pointing to OPTEE's > > tee.elf, is passed during the Buildroot build. > > Missing empty line here. > ok > > +choice > > + prompt "U-Boot OPTEE BL32 format" > > + default BR2_TARGET_UBOOT_NEEDS_OPTEE_BIN > > + depends on BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE > > + > > +config BR2_TARGET_UBOOT_NEEDS_OPTEE_BIN > > + bool "tee.bin" > > + > > +config BR2_TARGET_UBOOT_NEEDS_OPTEE_ELF > > + bool "tee.elf" > > + > > +endchoice > > > > config BR2_TARGET_UBOOT_NEEDS_OPENSBI > > bool "U-Boot needs OpenSBI" > > diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk > > index 574fc7089a..210fa219ed 100644 > > --- a/boot/uboot/uboot.mk > > +++ b/boot/uboot/uboot.mk > > @@ -177,7 +177,19 @@ endif > > > > ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE),y) > > UBOOT_DEPENDENCIES += optee-os > > +ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPTEE_ELF),y) > > UBOOT_MAKE_OPTS += TEE=$(BINARIES_DIR)/tee.elf > > +define UBOOT_COPY_TEE_FIRMWARE > > + cp $(BINARIES_DIR)/tee.elf $(@D)/ > > Why do you need to copy it, when TEE is pointing to the original in > $(BINARIESD_DIR), just above, and that has worked well so far? > The copy are needed to binman to include it > > +endef > > +UBOOT_PRE_BUILD_HOOKS += UBOOT_COPY_TEE_FIRMWARE > > +else > > +UBOOT_MAKE_OPTS += BL32=$(BINARIES_DIR)/tee.bin > > +define UBOOT_COPY_TEE_FIRMWARE > > + cp $(BINARIES_DIR)/tee-raw.bin $(@D)/tee.bin > > Ditto: why do you need to copy it, when TEE, just above, also points to > the original in $(BINARIES_DIR) ? Same as above Michael > > Regards, > Yann E. MORIN. > > > +endef > > +UBOOT_PRE_BUILD_HOOKS += UBOOT_COPY_TEE_FIRMWARE > > +endif > > endif > > > > ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSBI),y) > > -- > > 2.25.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. | > '------------------------------^-------^------------------^--------------------' -- 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 Tue Feb 1 18:00:53 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 1 Feb 2022 19:00:53 +0100 Subject: [Buildroot] [PATCH 1/2] board/orangepi/orangepi-zero-plus2: fix build after genimage update In-Reply-To: <20220131212456.3176156-1-geomatsi@gmail.com> References: <20220131212456.3176156-1-geomatsi@gmail.com> Message-ID: Hi Sergey, On 31/01/22 22:24, Sergey Matyukevich wrote: > 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. Here we need a: Fixes: url where you point the failure Best regards -- Giulio Benetti Benetti Engineering sas > 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 > } From giulio.benetti at benettiengineering.com Tue Feb 1 18:06:02 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 1 Feb 2022 19:06:02 +0100 Subject: [Buildroot] [PATCH 2/2] configs/orangepi_zero_plus2: BSP update In-Reply-To: <20220131212456.3176156-2-geomatsi@gmail.com> References: <20220131212456.3176156-1-geomatsi@gmail.com> <20220131212456.3176156-2-geomatsi@gmail.com> Message-ID: Hi Sergey, On 31/01/22 22:24, Sergey Matyukevich wrote: > 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. Same as previous patch we need a: Fixes: url where you point the failure There is the latest gitlab pipeline here, especially this board build failure: https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478371 But this was for previous patch, sorry, so please point this ^^^ URL there. And here probably you've found the bug by yourself, correct? Best regards -- Giulio Benetti Benetti Engineering sas > 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 -- Giulio Benetti Benetti Engineering sas From geomatsi at gmail.com Tue Feb 1 18:11:27 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Tue, 1 Feb 2022 21:11:27 +0300 Subject: [Buildroot] [PATCH 1/2] board/orangepi/orangepi-zero-plus2: fix build after genimage update In-Reply-To: References: <20220131212456.3176156-1-geomatsi@gmail.com> Message-ID: > Hi Sergey, > > On 31/01/22 22:24, Sergey Matyukevich wrote: > > 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. > > Here we need a: > Fixes: > url where you point the failure You are right. But I don't have a CI report for this. I noticed the problem when building images locally. Regards, Sergey From giulio.benetti at benettiengineering.com Tue Feb 1 18:18:51 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 1 Feb 2022 19:18:51 +0100 Subject: [Buildroot] [PATCH 1/2] board/orangepi/orangepi-zero-plus2: fix build after genimage update In-Reply-To: References: <20220131212456.3176156-1-geomatsi@gmail.com> Message-ID: <260964d9-46f6-cb5d-8779-9559f0a2d0a8@benettiengineering.com> On 01/02/22 19:11, Sergey Matyukevich wrote: >> Hi Sergey, >> >> On 31/01/22 22:24, Sergey Matyukevich wrote: >>> 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. >> >> Here we need a: >> Fixes: >> url where you point the failure > > You are right. But I don't have a CI report for this. I noticed the problem when > building images locally. Check here for this patch: https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478371 for the other you've found it locally. -- Giulio Benetti Benetti Engineering sas From festevam at gmail.com Tue Feb 1 18:25:48 2022 From: festevam at gmail.com (Fabio Estevam) Date: Tue, 1 Feb 2022 15:25:48 -0300 Subject: [Buildroot] kmscube: GLES3/gl3.h: No such file or directory Message-ID: Hi Rob, We are getting the following kmscube build error in Buildroot: ../cube-shadertoy.c:37:10: fatal error: GLES3/gl3.h: No such file or directory 37 | #include Complete log: http://autobuild.buildroot.net/results/7f559e89a96273fc019056eae13104e14161a484/build-end.log In OpenEmbedded the following patch is used: http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-graphics/kmscube/kmscube/0001-texturator-Use-correct-GL-extension-header.patch?h=master What would be the appropriate fix for this issue? Thanks, Fabio Estevam From giulio.benetti at benettiengineering.com Tue Feb 1 18:33:25 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 1 Feb 2022 19:33:25 +0100 Subject: [Buildroot] [PATCH 0/6] Fix gitlab CI build failure due to missing HOST_ dependencies Message-ID: <20220201183331.4009320-1-giulio.benetti@benettiengineering.com> This patchset fixes the gitlab build failure due to HOST_ dependencies(uboot/linux). Giulio Benetti (6): configs/bananapi_m2_ultra_defconfig: u-boot needs host python3 and host openssl configs/beaglev_defconfig: linux needs host openssl configs/microchip_sama5d2_icp_mmc_defconfig: linux needs host openssl configs/microchip_sama5d2_icp_mmc_dev_defconfig: linux needs host openssl configs/microchip_sama7g5ek_mmc_defconfig: add missing BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15 configs/microchip_sama7g5ek_mmc_dev_defconfig: add missing BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15 configs/bananapi_m2_ultra_defconfig | 2 ++ configs/beaglev_defconfig | 1 + configs/microchip_sama5d2_icp_mmc_defconfig | 1 + configs/microchip_sama5d2_icp_mmc_dev_defconfig | 1 + configs/microchip_sama7g5ek_mmc_defconfig | 1 + configs/microchip_sama7g5ek_mmc_dev_defconfig | 1 + 6 files changed, 7 insertions(+) -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Feb 1 18:33:28 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 1 Feb 2022 19:33:28 +0100 Subject: [Buildroot] [PATCH 3/6] configs/microchip_sama5d2_icp_mmc_defconfig: linux needs host openssl In-Reply-To: <20220201183331.4009320-1-giulio.benetti@benettiengineering.com> References: <20220201183331.4009320-1-giulio.benetti@benettiengineering.com> Message-ID: <20220201183331.4009320-4-giulio.benetti@benettiengineering.com> Fixes: https://gitlab.com/ymorin/buildroot/-/jobs/2035821094 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..27ea4970f1 100644 --- a/configs/microchip_sama5d2_icp_mmc_defconfig +++ b/configs/microchip_sama5d2_icp_mmc_defconfig @@ -12,6 +12,7 @@ BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,li BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d2_icp" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Feb 1 18:33:26 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 1 Feb 2022 19:33:26 +0100 Subject: [Buildroot] [PATCH 1/6] configs/bananapi_m2_ultra_defconfig: u-boot needs host python3 and host openssl In-Reply-To: <20220201183331.4009320-1-giulio.benetti@benettiengineering.com> References: <20220201183331.4009320-1-giulio.benetti@benettiengineering.com> Message-ID: <20220201183331.4009320-2-giulio.benetti@benettiengineering.com> Fixes: https://gitlab.com/ymorin/buildroot/-/jobs/2035820967 Signed-off-by: Giulio Benetti --- configs/bananapi_m2_ultra_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/bananapi_m2_ultra_defconfig b/configs/bananapi_m2_ultra_defconfig index 67ecec424c..2ec0e60e8d 100644 --- a/configs/bananapi_m2_ultra_defconfig +++ b/configs/bananapi_m2_ultra_defconfig @@ -19,7 +19,9 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="bananapi_m2_berry" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" BR2_PACKAGE_HOST_DOSFSTOOLS=y -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Feb 1 18:33:29 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 1 Feb 2022 19:33:29 +0100 Subject: [Buildroot] [PATCH 4/6] configs/microchip_sama5d2_icp_mmc_dev_defconfig: linux needs host openssl In-Reply-To: <20220201183331.4009320-1-giulio.benetti@benettiengineering.com> References: <20220201183331.4009320-1-giulio.benetti@benettiengineering.com> Message-ID: <20220201183331.4009320-5-giulio.benetti@benettiengineering.com> Fixes: https://gitlab.com/ymorin/buildroot/-/jobs/2035821096 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..27d1d3409d 100644 --- a/configs/microchip_sama5d2_icp_mmc_dev_defconfig +++ b/configs/microchip_sama5d2_icp_mmc_dev_defconfig @@ -16,6 +16,7 @@ BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,li BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d2_icp" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_LINUX_TOOLS_IIO=y BR2_PACKAGE_BZIP2=y BR2_PACKAGE_XZ=y -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Feb 1 18:33:27 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 1 Feb 2022 19:33:27 +0100 Subject: [Buildroot] [PATCH 2/6] configs/beaglev_defconfig: linux needs host openssl In-Reply-To: <20220201183331.4009320-1-giulio.benetti@benettiengineering.com> References: <20220201183331.4009320-1-giulio.benetti@benettiengineering.com> Message-ID: <20220201183331.4009320-3-giulio.benetti@benettiengineering.com> Fixes: https://gitlab.com/ymorin/buildroot/-/jobs/2035820979 Signed-off-by: Giulio Benetti --- configs/beaglev_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/beaglev_defconfig b/configs/beaglev_defconfig index 70459bf3e8..79af8c2ece 100644 --- a/configs/beaglev_defconfig +++ b/configs/beaglev_defconfig @@ -16,6 +16,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="starlight" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="starfive/jh7100-beaglev-starlight" 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_TAR is not set -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Feb 1 18:33:30 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 1 Feb 2022 19:33:30 +0100 Subject: [Buildroot] [PATCH 5/6] configs/microchip_sama7g5ek_mmc_defconfig: add missing BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15 In-Reply-To: <20220201183331.4009320-1-giulio.benetti@benettiengineering.com> References: <20220201183331.4009320-1-giulio.benetti@benettiengineering.com> Message-ID: <20220201183331.4009320-6-giulio.benetti@benettiengineering.com> Fixes: https://gitlab.com/ymorin/buildroot/-/jobs/2035821098 Signed-off-by: Giulio Benetti --- configs/microchip_sama7g5ek_mmc_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/microchip_sama7g5ek_mmc_defconfig b/configs/microchip_sama7g5ek_mmc_defconfig index b1cd193829..2d4b720342 100644 --- a/configs/microchip_sama7g5ek_mmc_defconfig +++ b/configs/microchip_sama7g5ek_mmc_defconfig @@ -1,6 +1,7 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/microchip/sama7g5ek/genimage.cfg" BR2_LINUX_KERNEL=y -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Feb 1 18:33:31 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 1 Feb 2022 19:33:31 +0100 Subject: [Buildroot] [PATCH 6/6] configs/microchip_sama7g5ek_mmc_dev_defconfig: add missing BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15 In-Reply-To: <20220201183331.4009320-1-giulio.benetti@benettiengineering.com> References: <20220201183331.4009320-1-giulio.benetti@benettiengineering.com> Message-ID: <20220201183331.4009320-7-giulio.benetti@benettiengineering.com> Fixes: https://gitlab.com/ymorin/buildroot/-/jobs/2035821100 Signed-off-by: Giulio Benetti --- configs/microchip_sama7g5ek_mmc_dev_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/microchip_sama7g5ek_mmc_dev_defconfig b/configs/microchip_sama7g5ek_mmc_dev_defconfig index 3253bce401..383865c2b6 100644 --- a/configs/microchip_sama7g5ek_mmc_dev_defconfig +++ b/configs/microchip_sama7g5ek_mmc_dev_defconfig @@ -1,6 +1,7 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_TOOLCHAIN_BUILDROOT_WCHAR=y BR2_PTHREAD_DEBUG=y BR2_TOOLCHAIN_BUILDROOT_CXX=y -- 2.25.1 From yann.morin.1998 at free.fr Tue Feb 1 19:01:26 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 1 Feb 2022 20:01:26 +0100 Subject: [Buildroot] [PATCH] boot/uboot: add support for bundling TEE in BIN format into U-Boot In-Reply-To: References: <20220201091342.143010-1-michael@amarulasolutions.com> <20220201171441.GV457876@scaer> Message-ID: <20220201190126.GW457876@scaer> Michael, All, On 2022-02-01 18:57 +0100, Michael Nazzareno Trimarchi spake thusly: > On Tue, Feb 1, 2022 at 6:14 PM Yann E. MORIN wrote: > > On 2022-02-01 10:13 +0100, Michael Trimarchi spake thusly: > > > Some U-Boot platforms (e.g. nxp) can bundle OPTEE's tee.bin > > > into the U-Boot image using binman. This patch brings the necessary changes to > > > enable this feature. Also, comit log not nicely formatted: it should be wrapped at ~72 chars on every lines. > > > Signed-off-by: Michael Trimarchi > > > --- [--SNIP--] > > > ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE),y) > > > UBOOT_DEPENDENCIES += optee-os > > > +ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPTEE_ELF),y) > > > UBOOT_MAKE_OPTS += TEE=$(BINARIES_DIR)/tee.elf ,^^^^^^^^^^^^^^^^^^^^^^^^^^^ Note this for later ----/ > > > +define UBOOT_COPY_TEE_FIRMWARE > > > + cp $(BINARIES_DIR)/tee.elf $(@D)/ > > Why do you need to copy it, when TEE is pointing to the original in > > $(BINARIESD_DIR), just above, and that has worked well so far? > The copy are needed to binman to include it As far as I understand it, BR2_TARGET_UBOOT_NEEDS_OPTEE_ELF is supposed to behave like the code we had so far, and so far we did not have the copy, and that seems that it worked OK without the copy. Now you are adding the copy: why was it not needed before, and why is it needed now? And if binman needs it in the source tree, then why do we point the TEE variable to the original location in BINARIES_DIR, as I highlighted above? > > > +endef > > > +UBOOT_PRE_BUILD_HOOKS += UBOOT_COPY_TEE_FIRMWARE > > > +else > > > +UBOOT_MAKE_OPTS += BL32=$(BINARIES_DIR)/tee.bin > > > +define UBOOT_COPY_TEE_FIRMWARE > > > + cp $(BINARIES_DIR)/tee-raw.bin $(@D)/tee.bin > > Ditto: why do you need to copy it, when TEE, just above, also points to > > the original in $(BINARIES_DIR) ? > Same as above Ditto. 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 michael at amarulasolutions.com Tue Feb 1 19:12:48 2022 From: michael at amarulasolutions.com (Michael Nazzareno Trimarchi) Date: Tue, 1 Feb 2022 20:12:48 +0100 Subject: [Buildroot] [PATCH] boot/uboot: add support for bundling TEE in BIN format into U-Boot In-Reply-To: <20220201190126.GW457876@scaer> References: <20220201091342.143010-1-michael@amarulasolutions.com> <20220201171441.GV457876@scaer> <20220201190126.GW457876@scaer> Message-ID: Hi Yann On Tue, Feb 1, 2022 at 8:01 PM Yann E. MORIN wrote: > > Michael, All, > > On 2022-02-01 18:57 +0100, Michael Nazzareno Trimarchi spake thusly: > > On Tue, Feb 1, 2022 at 6:14 PM Yann E. MORIN wrote: > > > On 2022-02-01 10:13 +0100, Michael Trimarchi spake thusly: > > > > Some U-Boot platforms (e.g. nxp) can bundle OPTEE's tee.bin > > > > into the U-Boot image using binman. This patch brings the necessary changes to > > > > enable this feature. > > Also, comit log not nicely formatted: it should be wrapped at ~72 chars > on every lines. > > > > > Signed-off-by: Michael Trimarchi > > > > --- > [--SNIP--] > > > > ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE),y) > > > > UBOOT_DEPENDENCIES += optee-os > > > > +ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPTEE_ELF),y) > > > > UBOOT_MAKE_OPTS += TEE=$(BINARIES_DIR)/tee.elf > ,^^^^^^^^^^^^^^^^^^^^^^^^^^^ > Note this for later ----/ > > > > > +define UBOOT_COPY_TEE_FIRMWARE > > > > + cp $(BINARIES_DIR)/tee.elf $(@D)/ > > > Why do you need to copy it, when TEE is pointing to the original in > > > $(BINARIESD_DIR), just above, and that has worked well so far? > > The copy are needed to binman to include it > > As far as I understand it, BR2_TARGET_UBOOT_NEEDS_OPTEE_ELF is supposed > to behave like the code we had so far, and so far we did not have the > copy, and that seems that it worked OK without the copy. > > Now you are adding the copy: why was it not needed before, and why is it > needed now? > > And if binman needs it in the source tree, then why do we point the TEE > variable to the original location in BINARIES_DIR, as I highlighted > above? binman takes this and put an image on each part. We already copy atf. Now nxp I need to copy tee-raw.bin in tee.bin fit { description = "Configuration to load ATF before U-Boot"; fit,external-offset = ; fit,fdt-list = "of-list"; #address-cells = <1>; images { uboot { arch = "arm64"; compression = "none"; description = "U-Boot (64-bit)"; load = ; type = "standalone"; uboot_blob { filename = "u-boot-nodtb.bin"; type = "blob-ext"; }; }; atf { arch = "arm64"; compression = "none"; description = "ARM Trusted Firmware"; entry = <0x960000>; load = <0x960000>; type = "firmware"; atf_blob { filename = "bl31.bin"; type = "blob-ext"; }; }; tee { arch = "arm64"; compression = "none"; description = "OP-TEE Trusted OS (bl32)"; load = <0x5f800000>; entry = <0x5f800000>; type = "firmware"; tee_blob { filename = "tee.bin"; type = "blob-ext"; }; }; binman_fip: fip { arch = "arm64"; compression = "none"; description = "Trusted Firmware FIP"; load = <0x40310000>; type = "firmware"; }; @fdt-SEQ { compression = "none"; description = "NAME"; type = "flat_dt"; uboot_fdt_blob { filename = "u-boot.dtb"; type = "blob-ext"; }; }; }; The above work working for rockchip so as we copy atf, I need to copy tee Michael > > > > > +endef > > > > +UBOOT_PRE_BUILD_HOOKS += UBOOT_COPY_TEE_FIRMWARE > > > > +else > > > > +UBOOT_MAKE_OPTS += BL32=$(BINARIES_DIR)/tee.bin > > > > +define UBOOT_COPY_TEE_FIRMWARE > > > > + cp $(BINARIES_DIR)/tee-raw.bin $(@D)/tee.bin > > > Ditto: why do you need to copy it, when TEE, just above, also points to > > > the original in $(BINARIES_DIR) ? > > Same as above > > Ditto. > > 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. | > '------------------------------^-------^------------------^--------------------' -- 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 michael at amarulasolutions.com Tue Feb 1 19:47:41 2022 From: michael at amarulasolutions.com (Michael Nazzareno Trimarchi) Date: Tue, 1 Feb 2022 20:47:41 +0100 Subject: [Buildroot] [PATCH] boot/uboot: add support for bundling TEE in BIN format into U-Boot In-Reply-To: References: <20220201091342.143010-1-michael@amarulasolutions.com> <20220201171441.GV457876@scaer> <20220201190126.GW457876@scaer> Message-ID: Hi Yann On Tue, Feb 1, 2022 at 8:12 PM Michael Nazzareno Trimarchi wrote: > > Hi Yann > > > On Tue, Feb 1, 2022 at 8:01 PM Yann E. MORIN wrote: > > > > Michael, All, > > > > On 2022-02-01 18:57 +0100, Michael Nazzareno Trimarchi spake thusly: > > > On Tue, Feb 1, 2022 at 6:14 PM Yann E. MORIN wrote: > > > > On 2022-02-01 10:13 +0100, Michael Trimarchi spake thusly: > > > > > Some U-Boot platforms (e.g. nxp) can bundle OPTEE's tee.bin > > > > > into the U-Boot image using binman. This patch brings the necessary changes to > > > > > enable this feature. > > > > Also, comit log not nicely formatted: it should be wrapped at ~72 chars > > on every lines. > > > > > > > Signed-off-by: Michael Trimarchi > > > > > --- > > [--SNIP--] > > > > > ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE),y) > > > > > UBOOT_DEPENDENCIES += optee-os > > > > > +ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPTEE_ELF),y) > > > > > UBOOT_MAKE_OPTS += TEE=$(BINARIES_DIR)/tee.elf > > ,^^^^^^^^^^^^^^^^^^^^^^^^^^^ > > Note this for later ----/ > > > > > > > +define UBOOT_COPY_TEE_FIRMWARE > > > > > + cp $(BINARIES_DIR)/tee.elf $(@D)/ > > > > Why do you need to copy it, when TEE is pointing to the original in > > > > $(BINARIESD_DIR), just above, and that has worked well so far? > > > The copy are needed to binman to include it > > > > As far as I understand it, BR2_TARGET_UBOOT_NEEDS_OPTEE_ELF is supposed > > to behave like the code we had so far, and so far we did not have the > > copy, and that seems that it worked OK without the copy. > > > > Now you are adding the copy: why was it not needed before, and why is it > > needed now? > > > > And if binman needs it in the source tree, then why do we point the TEE > > variable to the original location in BINARIES_DIR, as I highlighted > > above? > > binman takes this and put an image on each part. We already copy atf. > Now nxp I need to copy tee-raw.bin in tee.bin > > fit { > description = "Configuration to load ATF before U-Boot"; > fit,external-offset = ; > fit,fdt-list = "of-list"; > #address-cells = <1>; > > images { > uboot { > arch = "arm64"; > compression = "none"; > description = "U-Boot (64-bit)"; > load = ; > type = "standalone"; > > uboot_blob { > filename = "u-boot-nodtb.bin"; > type = "blob-ext"; > }; > }; > > atf { > arch = "arm64"; > compression = "none"; > description = "ARM Trusted Firmware"; > entry = <0x960000>; > load = <0x960000>; > type = "firmware"; > > atf_blob { > filename = "bl31.bin"; > type = "blob-ext"; > }; > }; > > tee { > arch = "arm64"; > compression = "none"; > description = "OP-TEE Trusted > OS (bl32)"; > load = <0x5f800000>; > entry = <0x5f800000>; > type = "firmware"; > > tee_blob { > filename = "tee.bin"; > type = "blob-ext"; > }; > }; > > binman_fip: fip { > arch = "arm64"; > compression = "none"; > description = "Trusted Firmware FIP"; > load = <0x40310000>; > type = "firmware"; > }; > > @fdt-SEQ { > compression = "none"; > description = "NAME"; > type = "flat_dt"; > > uboot_fdt_blob { > filename = "u-boot.dtb"; > type = "blob-ext"; > }; > }; > }; > > The above work working for rockchip so as we copy atf, I need to copy tee > For your better understand this is my config change for the board I sent yesterday 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_BL32_OPTEE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_TARGETS="BL32_BASE=0x5f800000 BL32_SIZE=0x800000" BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30a60000" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_DEBUG=y +BR2_TARGET_OPTEE_OS=y +BR2_TARGET_OPTEE_OS_PLATFORM="imx-mx8mnevk" +BR2_TARGET_OPTEE_OS_ADDITIONAL_VARIABLES="CFG_UART_BASE=UART4_BASE CFG_DDR_SIZE=0x20000000 CFG_TZDRAM_SIZE=0x600000 CFG_SHMEM_SIZE=0x200000 CFG_TEE_CORE_NB_CORE=1" +BR2_TARGET_OPTEE_OS_CORE_IMAGES="tee.bin tee-*_v2.bin tee-raw.bin" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y @@ -36,6 +47,7 @@ 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_OPTEE_TEE=y BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" I have sent a patch upstream for atf in order to calculate better reserved area. Michael > Michael > > > > > > > > +endef > > > > > +UBOOT_PRE_BUILD_HOOKS += UBOOT_COPY_TEE_FIRMWARE > > > > > +else > > > > > +UBOOT_MAKE_OPTS += BL32=$(BINARIES_DIR)/tee.bin > > > > > +define UBOOT_COPY_TEE_FIRMWARE > > > > > + cp $(BINARIES_DIR)/tee-raw.bin $(@D)/tee.bin > > > > Ditto: why do you need to copy it, when TEE, just above, also points to > > > > the original in $(BINARIES_DIR) ? > > > Same as above > > > > Ditto. > > > > 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. | > > '------------------------------^-------^------------------^--------------------' > > > > -- > 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 -- 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 michael at amarulasolutions.com Tue Feb 1 20:04:04 2022 From: michael at amarulasolutions.com (Michael Nazzareno Trimarchi) Date: Tue, 1 Feb 2022 21:04:04 +0100 Subject: [Buildroot] [PATCH 3/6] configs/microchip_sama5d2_icp_mmc_defconfig: linux needs host openssl In-Reply-To: <20220201183331.4009320-4-giulio.benetti@benettiengineering.com> References: <20220201183331.4009320-1-giulio.benetti@benettiengineering.com> <20220201183331.4009320-4-giulio.benetti@benettiengineering.com> Message-ID: Hi Giulio On Tue, Feb 1, 2022 at 7:34 PM Giulio Benetti wrote: > > Fixes: > https://gitlab.com/ymorin/buildroot/-/jobs/2035821094 > > 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..27ea4970f1 100644 > --- a/configs/microchip_sama5d2_icp_mmc_defconfig > +++ b/configs/microchip_sama5d2_icp_mmc_defconfig > @@ -12,6 +12,7 @@ BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,li > BR2_LINUX_KERNEL_DEFCONFIG="sama5" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d2_icp" > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y I can see that my submission help on those patches Reviewed-by: Michael Trimarchi Michael > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > -- > 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 Alexey.Brodkin at synopsys.com Tue Feb 1 20:02:18 2022 From: Alexey.Brodkin at synopsys.com (Alexey Brodkin) Date: Tue, 1 Feb 2022 20:02:18 +0000 Subject: [Buildroot] [PATCH] package/glibc: allow runing on kernel older than used for the headers In-Reply-To: <22491_1643728190_61F94D3E_22491_62_1_20220201150948.GB3216@tl-lnx-nyma7486> References: <12945_1643724020_61F93CE8_12945_430_1_dfe1b340bf9e8e2c47987f28f8fd40cca7d16b3b.1643724006.git.yann.morin@orange.com> <22491_1643728190_61F94D3E_22491_62_1_20220201150948.GB3216@tl-lnx-nyma7486> Message-ID: Hi Yann, > > > +config BR2_PACKAGE_GLIBC_KERNEL_COMPAT > > > + string "Oldest kernel version supported" > > > + help > > > + If you plan on running on various kernel versions, enter the > > > + oldest version you expect to run on here. > > > + > > > + Note that the older the version, the more backward compatibility > > > + code is added, and the slower the code may get. > > > + > > > + Leave it empty (the default) to use the same version as used for > > > + the kernel headers. > > I'd say there's the third option and frankly I like this one the most - default > > oldest version assumed by the glibc itself. The beauty of it is it's really the > > oldest version of the kernel which is supported by a given glibc version for > > a particular architecture. > > I also considered that, but I believe that a user should explicitly > request the oldest kernel they want to support (yes, they'd have to do > their homework to see what that version can be for their architecture). Yup, let's provide our user with enough rope ;) > Letting the system decide on itself is prone to providing some > surprises... However, letting the user provide an explicit version is > also prone to surprises, because if that version is too old, glibc > resets it to the oldest it actually supports, and just merely emits a > warning message, which does not prevent the build to succeed (it still > fails at runtime in the usual way then)... > > So, in either case, meh... Agree. > So, we'd have to differentiate between the three cases: > - use same as headers (should be the default to keep current > behaviour) > - use oldest supported by glibc > - use explcitly specified version > > So, two options there: > > - recognise a magical value in BR2_PACKAGE_GLIBC_KERNEL_COMPAT, like > 'oldest' (bikeshed, go) to mean the oldest glibc can support, empty > to mean "same as headers", or an actual value. This option looks a bit more clean to me as we don't introduce yet another hidden option (as in the one below). Though I would think not that many people is really worried by the toolchain internals, so maybe you introduce something, it quickly gets discussed and merged? :) Alternatively we may explicitly set per-arch minimal version in their corresponding "arch/Config.in.xxx" so at least this is more visible as not each and every user is willing to dig into glibc's internals. Thinking out loud further along the lines above, maybe even in the same way explicitly set kernel version that matches used headers (if we automatically extract that info from some existing Buildroot variable)? Ir it's really something insane? > - add a boolean "Specify oldest kernel supported", and hide > BR2_PACKAGE_GLIBC_KERNEL_COMPAT behind that boolean; then if the > boolean is not set, use same as headers (as today); if it is set, > then use BR2_PACKAGE_GLIBC_KERNEL_COMPAT is set, or let glibc decide > if not set. > -Alexey From giulio.benetti at benettiengineering.com Tue Feb 1 20:18:14 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 1 Feb 2022 21:18:14 +0100 Subject: [Buildroot] [PATCH 3/6] configs/microchip_sama5d2_icp_mmc_defconfig: linux needs host openssl In-Reply-To: References: Message-ID: <93CEDCC7-8859-4CBD-B21F-C07DA101A204@benettiengineering.com> Hi Michael, > Il giorno 1 feb 2022, alle ore 21:04, Michael Nazzareno Trimarchi ha scritto: > > ?Hi Giulio > >> On Tue, Feb 1, 2022 at 7:34 PM Giulio Benetti >> wrote: >> >> Fixes: >> https://gitlab.com/ymorin/buildroot/-/jobs/2035821094 >> >> 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..27ea4970f1 100644 >> --- a/configs/microchip_sama5d2_icp_mmc_defconfig >> +++ b/configs/microchip_sama5d2_icp_mmc_defconfig >> @@ -12,6 +12,7 @@ BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,li >> BR2_LINUX_KERNEL_DEFCONFIG="sama5" >> BR2_LINUX_KERNEL_DTS_SUPPORT=y >> BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d2_icp" >> +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > > I can see that my submission help on those patches Keep submitting! And thank you for the review :-) It would be great if you send the Reviewed-by to all patches of this patchset. Giulio > > Reviewed-by: Michael Trimarchi > > Michael > >> BR2_TARGET_ROOTFS_EXT2=y >> BR2_TARGET_ROOTFS_EXT2_4=y >> BR2_TARGET_ROOTFS_EXT2_SIZE="120M" >> -- >> 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 arnout at mind.be Tue Feb 1 20:42:17 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 1 Feb 2022 21:42:17 +0100 Subject: [Buildroot] [PATCH] package/glibc: allow runing on kernel older than used for the headers In-Reply-To: <22491_1643728190_61F94D3E_22491_62_1_20220201150948.GB3216@tl-lnx-nyma7486> References: <12945_1643724020_61F93CE8_12945_430_1_dfe1b340bf9e8e2c47987f28f8fd40cca7d16b3b.1643724006.git.yann.morin@orange.com> <22491_1643728190_61F94D3E_22491_62_1_20220201150948.GB3216@tl-lnx-nyma7486> Message-ID: <46ea7193-ea68-c8b6-9b43-d5b17bb8144f@mind.be> On 01/02/2022 16:09, yann.morin at orange.com wrote: > Alexey, All, > > On 2022-02-01 14:23 +0000, Alexey Brodkin spake thusly: > [--SNIP--] >>> +config BR2_PACKAGE_GLIBC_KERNEL_COMPAT >>> + string "Oldest kernel version supported" >>> + help >>> + If you plan on running on various kernel versions, enter the >>> + oldest version you expect to run on here. >>> + >>> + Note that the older the version, the more backward compatibility >>> + code is added, and the slower the code may get. >>> + >>> + Leave it empty (the default) to use the same version as used for >>> + the kernel headers. >> I'd say there's the third option and frankly I like this one the most - default >> oldest version assumed by the glibc itself. The beauty of it is it's really the >> oldest version of the kernel which is supported by a given glibc version for >> a particular architecture. > > I also considered that, but I believe that a user should explicitly > request the oldest kernel they want to support (yes, they'd have to do > their homework to see what that version can be for their architecture). I'm doubting if the added value of this is sufficient to warrant the complexity. I could be swayed if it would give a build-time error if we know that it's not going to run on such an old kernel. But as mentioned below, there's just a warning. In addition, if you build a userspace with recent headers, this is going to allow packages that depend on TOOLCHAIN_HEADERS_AT_LEAST_... Which may cause runtime failures when running those packages on an older kernel. So the whole concept of allowing older kernels is already a bit shaky. So I think that a simple boolean config (still called BR2_PACKAGE_GLIBC_KERNEL_COMPAT) would be sufficient. Doesn't solve the TOOLCHAIN_HEADERS_AT_LEAST problem, but at least init will be running (well, except if it's systemd and you try to run on 3.4...) For context, this is the commit that originally introduced --enable-kernel: commit fd5bcd0eda8fb21f639c34a09b212e6f9b066a04 Author: Sam bobroff Date: Thu Jan 28 04:51:23 2016 package/glibc: set --enable-kernel to match kernel Glibc is currently configured without any "--enable-kernel" option. This causes it to use the oldest possible kernel API, slowing it down and preventing it from using any kernel features from later versions. Since we are likely building a kernel and matching glibc together, backwards compatability is probably unnecessary so this patch unconditionally configures glibc with --enable-kernel set to BR2_TOOLCHAIN_HEADERS_AT_LEAST. It's true that the slowdown will probably be smaller if you only have a partial fallback, but is that really going to be significant? You can convince me with numbers :-) Regards, Arnout > Letting the system decide on itself is prone to providing some > surprises... However, letting the user provide an explicit version is > also prone to surprises, because if that version is too old, glibc > resets it to the oldest it actually supports, and just merely emits a > warning message, which does not prevent the build to succeed (it still > fails at runtime in the usual way then)... > > So, in either case, meh... > > So, we'd have to differentiate between the three cases: > - use same as headers (should be the default to keep current > behaviour) > - use oldest supported by glibc > - use explcitly specified version > > So, two options there: > > - recognise a magical value in BR2_PACKAGE_GLIBC_KERNEL_COMPAT, like > 'oldest' (bikeshed, go) to mean the oldest glibc can support, empty > to mean "same as headers", or an actual value. > > - add a boolean "Specify oldest kernel supported", and hide > BR2_PACKAGE_GLIBC_KERNEL_COMPAT behind that boolean; then if the > boolean is not set, use same as headers (as today); if it is set, > then use BR2_PACKAGE_GLIBC_KERNEL_COMPAT is set, or let glibc decide > if not set. > > Thoughts? > > Needless to say, I don't have much sympathy for the first option, > magical values are bad... But I am not too fond of the second option > either, but I can't see a better way to provide for the three different > cases... > >> [1] https://sourceware.org/git/?p=glibc.git;a=blob;f=configure;h=8e5bee775a651fcbaaa96ede8039ae1f049e296e;hb=HEAD#l3529 >> [2] https://sourceware.org/git/?p=glibc.git;a=blob;f=sysdeps/unix/sysv/linux/configure.ac;h=197b7e66c8fe6eb0a1136c992478b9a2272713e7;hb=HEAD#l30 > > Yeah, I already had a look at those for various archs. > > Thanks! > > Regards, > Yann E. MORIN. > From andre at ignavus.net Tue Feb 1 20:43:45 2022 From: andre at ignavus.net (Andre Renaud) Date: Wed, 2 Feb 2022 09:43:45 +1300 Subject: [Buildroot] [PATCH] package/libglfw: bump to 3.3.6 and enable Wayland/libGLES support Message-ID: <8B42D9C7-D86C-4A08-B552-3523E7D0C50D@ignavus.net> Signed-off-by: Andre Renaud --- package/libglfw/Config.in | 19 ++++++++++--------- package/libglfw/libglfw.hash | 2 +- package/libglfw/libglfw.mk | 16 ++++++++++++++-- 3 files changed, 25 insertions(+), 12 deletions(-) diff --git a/package/libglfw/Config.in b/package/libglfw/Config.in index 06f4376453..9705fef432 100644 --- a/package/libglfw/Config.in +++ b/package/libglfw/Config.in @@ -1,17 +1,18 @@ config BR2_PACKAGE_LIBGLFW bool "libglfw" - depends on BR2_PACKAGE_XORG7 - depends on BR2_PACKAGE_HAS_LIBGL - select BR2_PACKAGE_XLIB_LIBXCURSOR - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_XLIB_LIBXI - select BR2_PACKAGE_XLIB_LIBXINERAMA - select BR2_PACKAGE_XLIB_LIBXRANDR + depends on BR2_PACKAGE_XORG7 || BR2_PACKAGE_WAYLAND + depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES + select BR2_PACKAGE_XLIB_LIBXCURSOR if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBXI if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBXINERAMA if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_XORG7 help GLFW is an Open Source, multi-platform library for creating windows with OpenGL contexts and receiving input and events. http://www.glfw.org -comment "libglfw depends on X.org and needs an OpenGL backend" - depends on !BR2_PACKAGE_XORG7 || !BR2_PACKAGE_HAS_LIBGL +comment "libglfw depends on X.org/Wayland and needs an OpenGL/GLES backend" + depends on !(BR2_PACKAGE_XORG7 || BR2_PACKAGE_WAYLAND) + depends on !(BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES) diff --git a/package/libglfw/libglfw.hash b/package/libglfw/libglfw.hash index c21a595bbc..5bffc55d26 100644 --- a/package/libglfw/libglfw.hash +++ b/package/libglfw/libglfw.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 98768e12e615fbe9f3386f5bbfeb91b5a3b45a8c4c77159cef06b1f6ff749537 libglfw-3.3.2.tar.gz +sha256 ed07b90e334dcd39903e6288d90fa1ae0cf2d2119fec516cf743a0a404527c02 libglfw-3.3.6.tar.gz sha256 149704059b5d0bf551637e50042dd4de9c2cae921021f6636298911e3a5f9462 LICENSE.md diff --git a/package/libglfw/libglfw.mk b/package/libglfw/libglfw.mk index 63d2a88bf8..7daf61af0e 100644 --- a/package/libglfw/libglfw.mk +++ b/package/libglfw/libglfw.mk @@ -4,11 +4,19 @@ # ################################################################################ -LIBGLFW_VERSION = 3.3.2 +LIBGLFW_VERSION = 3.3.6 LIBGLFW_SITE = $(call github,glfw,glfw,$(LIBGLFW_VERSION)) LIBGLFW_INSTALL_STAGING = YES -LIBGLFW_DEPENDENCIES = libgl xlib_libXcursor xlib_libXext \ +ifeq ($(BR2_PACKAGE_XORG7),y) +LIBGLFW_DEPENDENCIES = xlib_libXcursor xlib_libXext \ xlib_libXi xlib_libXinerama xlib_libXrandr +endif +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) +LIBGLFW_DEPENDENCIES += libgl +endif +ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) +LIBGLFW_DEPENDENCIES += libgles +endif LIBGLFW_LICENSE = Zlib LIBGLFW_LICENSE_FILES = LICENSE.md @@ -17,6 +25,10 @@ LIBGLFW_CONF_OPTS += \ -DGLFW_BUILD_TESTS=OFF \ -DGLFW_BUILD_DOCS=OFF +ifeq ($(BR2_PACKAGE_WAYLAND),y) +LIBGLFW_CONF_OPTS += -DGLFW_USE_WAYLAND=1 +endif + ifeq ($(BR2_PACKAGE_XLIB_LIBXXF86VM),y) LIBGLFW_DEPENDENCIES += xlib_libXxf86vm endif -- 2.32.0 From arnout at mind.be Tue Feb 1 20:51:05 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 1 Feb 2022 21:51:05 +0100 Subject: [Buildroot] [PATCH v5] configs/kontron_bl_imx8mm_defconfig: new defconfig In-Reply-To: <3ea22a9d-938a-5086-66c6-a8f5510c8573@grinn-global.com> References: <20220131153022.351662-1-heiko.thiery@gmail.com> <12be81a6-7f2e-35b8-4f44-d8a20fce74f1@benettiengineering.com> <86bf975a-1599-005a-5ebc-a149cc973da4@benettiengineering.com> <3ea22a9d-938a-5086-66c6-a8f5510c8573@grinn-global.com> Message-ID: <17628e7b-51cc-a075-196d-e45720089a12@mind.be> On 31/01/2022 18:45, Bartosz Bilas wrote: > Hello, > > On 31.01.2022 18:11, Giulio Benetti wrote: >> On 31/01/22 17:42, Michael Nazzareno Trimarchi wrote: >> >> [SNIP] Thank you for the snip. My arm was getting tired of scrolling through all the quoting :-) [snip some more] >>>>>>> +# 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. The in-tree defconfigs should *not* be generated with "make savedefconfig": we want to explicitly set some options even if they're at their default value. The reason is that on master, the defaults can be updated. The typical example is the kernel headers version (cfr. [1]). But also arch options can change default (a few years ago this happened for ARM floating point), and others as well. We're not very good in making sure that options are properly set. For sure, however: - global sync via savedefconfig is *not* what we want; - a defconfig with comments makes it easier to be sure that options are set explicitly. Regards, Arnout [1] https://patchwork.ozlabs.org/project/buildroot/patch/20220201183331.4009320-6-giulio.benetti at benettiengineering.com/ From arnout at mind.be Tue Feb 1 20:52:35 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 1 Feb 2022 21:52:35 +0100 Subject: [Buildroot] [git commit] utils/size-stats-compare: fix flake8 error Message-ID: <20220201204545.4099C81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f1768855e73c1c41eed0cad94ec4a5f90c8535bb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master utils/size-stats-compare:80:15: E225 missing whitespace around operator Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- utils/size-stats-compare | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/size-stats-compare b/utils/size-stats-compare index 2ccbe7d191..fc6dd70623 100755 --- a/utils/size-stats-compare +++ b/utils/size-stats-compare @@ -77,7 +77,7 @@ def print_results(result, threshold): # 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) + maxpkgname = max(len(pkgname) for filename, pkgname in result) for entry in sorted(list_result, key=lambda entry: entry[1][1]): data = dict( From aduskett at gmail.com Tue Feb 1 21:05:15 2022 From: aduskett at gmail.com (Adam Duskett) Date: Tue, 1 Feb 2022 13:05:15 -0800 Subject: [Buildroot] [PATCH v7 1/1] package/qt5: bump packages to latest kde submodule versions In-Reply-To: <20220131225622.90226-1-james.hilliard1@gmail.com> References: <20220131225622.90226-1-james.hilliard1@gmail.com> Message-ID: All: I have tested this patch series in a Ubuntu 20.04 Docker container with every option selected using test-pkg. There were no errors reported. This patch series is ready for prime-time! Great job James and thanks for the wonderful work! Reviewed-by: Adam Duskett Tested-by: Adam Duskett On Mon, Jan 31, 2022 at 2:57 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 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 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From arnout at mind.be Tue Feb 1 21:43:56 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 1 Feb 2022 22:43:56 +0100 Subject: [Buildroot] [PATCH 1/1] package/hiawatha: fix build with gcc 4.8 In-Reply-To: <20220114175614.963475-1-fontaine.fabrice@gmail.com> References: <20220114175614.963475-1-fontaine.fabrice@gmail.com> Message-ID: <05ec3e99-2839-b04f-6ff2-82cd693a1bf3@mind.be> On 14/01/2022 18:56, Fabrice Fontaine wrote: > 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 Applied to master, thanks. Regards, Arnout > --- > 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 \ From arnout at mind.be Tue Feb 1 21:44:36 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 1 Feb 2022 22:44:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/php-apcu: fix build without __sync_*_4 intrinsics In-Reply-To: <20220115111622.1910388-1-fontaine.fabrice@gmail.com> References: <20220115111622.1910388-1-fontaine.fabrice@gmail.com> Message-ID: <8892c3ac-c187-2ac4-9355-9c79b6a84194@mind.be> On 15/01/2022 12:16, Fabrice Fontaine wrote: > 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 Applied to master, thanks. Regards, Arnout > --- > 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)) From arnout at mind.be Tue Feb 1 21:46:20 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 1 Feb 2022 22:46:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/mtd: fix build with libexecinfo In-Reply-To: <20220115150610.2084070-1-fontaine.fabrice@gmail.com> References: <20220115150610.2084070-1-fontaine.fabrice@gmail.com> Message-ID: On 15/01/2022 16:06, 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-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 Applied to master, thanks. Regards, Arnout > --- > 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 From arnout at mind.be Tue Feb 1 21:46:43 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 1 Feb 2022 22:46:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/liburing: fix static build In-Reply-To: <20220116220724.3460985-1-fontaine.fabrice@gmail.com> References: <20220116220724.3460985-1-fontaine.fabrice@gmail.com> Message-ID: <8ce4268a-b0fc-ef1d-f660-aa684140db49@mind.be> On 16/01/2022 23:07, Fabrice Fontaine wrote: > 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 Applied to master, thanks. Regards, Arnout > --- > 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)) From arnout at mind.be Tue Feb 1 21:53:18 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 1 Feb 2022 22:53:18 +0100 Subject: [Buildroot] [PATCH] package/efl: fix build failure with eeze disabled In-Reply-To: <20220124100920.3005564-1-giulio.benetti@benettiengineering.com> References: <20220124100920.3005564-1-giulio.benetti@benettiengineering.com> Message-ID: <168006d0-d098-07e2-7203-489d7573a3ec@mind.be> On 24/01/2022 11:09, Giulio Benetti wrote: > 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 There are two other patches that somehow deal with this issue [1][2] in addition to this one [3]. Could someone choose between the and mark the rest as Superseded in patchwork? Regards, Arnout [1] https://patchwork.ozlabs.org/project/buildroot/patch/20211230221904.3064022-1-fontaine.fabrice at gmail.com/ [2] https://patchwork.ozlabs.org/project/buildroot/patch/20220129224651.1282263-4-romain.naour at gmail.com/ [3] https://patchwork.ozlabs.org/project/buildroot/patch/20220124100920.3005564-1-giulio.benetti at benettiengineering.com/ > > 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) From arnout at mind.be Tue Feb 1 21:54:22 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 1 Feb 2022 22:54:22 +0100 Subject: [Buildroot] [PATCH] package/uclibc: update to 1.0.40 In-Reply-To: References: Message-ID: <1af59aa3-4881-be25-e092-b09931bd20d3@mind.be> On 25/01/2022 01:15, Waldemar Brodkorb wrote: > Signed-off-by: Waldemar Brodkorb Applied to master, thanks. Regards, Arnout > --- > 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+ From arnout at mind.be Tue Feb 1 21:54:54 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 1 Feb 2022 22:54:54 +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: On 25/01/2022 22:08, Fabrice Fontaine wrote: > 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 Applied to master, thanks. Regards, Arnout > --- > 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 From arnout at mind.be Tue Feb 1 22:00:06 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 1 Feb 2022 23:00:06 +0100 Subject: [Buildroot] [PATCH v2] package/util-linux: bump version to 2.37.3 (fixes CVE-2021-3996, CVE-2021-3995) In-Reply-To: <20220125221533.17535-1-ps.report@gmx.net> References: <20220125221533.17535-1-ps.report@gmx.net> Message-ID: On 25/01/2022 23:15, Peter Seiderer wrote: > - add 'touch' workaround for missing disk-utils/raw.8 file ([1], [2]) in > util-linux-2.37.4 release download package 2.37.3 I assume. > > 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 2.37.3 as well. I moved this hunk to the beginning of the file, to increase the chance that it is noticed on next bump (which hopefully makes it unneeded). > +# 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 I moved this to a post-patch instead of pre-build hook. Applied to master, thanks. Regards, Arnout > + > # Install PAM configuration files > ifeq ($(BR2_PACKAGE_UTIL_LINUX_SU)$(BR2_PACKAGE_LINUX_PAM),yy) > define UTIL_LINUX_INSTALL_PAMFILES From arnout at mind.be Tue Feb 1 22:00:23 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 1 Feb 2022 23:00:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/tesseract-ocr: override neon check In-Reply-To: <20220125223454.444515-1-fontaine.fabrice@gmail.com> References: <20220125223454.444515-1-fontaine.fabrice@gmail.com> Message-ID: On 25/01/2022 23:34, Fabrice Fontaine wrote: > 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 Applied to master, thanks. Regards, Arnout > --- > 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 From arnout at mind.be Tue Feb 1 22:01:56 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 1 Feb 2022 23:01:56 +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: <0e736882-10dd-ce89-4430-25cef83d9c2f@mind.be> On 26/01/2022 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 Applied to master, thanks. Regards, Arnout > --- > ...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 arnout at mind.be Tue Feb 1 22:03:43 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 1 Feb 2022 23:03:43 +0100 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: <3d918cc7-c716-e867-f393-9418d08e7efb@mind.be> On 26/01/2022 20:34, 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 Applied to master, thanks. Regards, Arnout > --- > 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 > + From fontaine.fabrice at gmail.com Tue Feb 1 22:01:51 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 1 Feb 2022 23:01:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/libusb: bump to version 1.0.25 Message-ID: <20220201220151.350153-1-fontaine.fabrice@gmail.com> Drop patch (already in version) https://github.com/libusb/libusb/blob/v1.0.25/ChangeLog Signed-off-by: Fabrice Fontaine --- ...parsing-of-descriptors-for-multi-con.patch | 62 ------------------- package/libusb/libusb.hash | 2 +- package/libusb/libusb.mk | 2 +- 3 files changed, 2 insertions(+), 64 deletions(-) delete mode 100644 package/libusb/0001-linux_usbfs-Fix-parsing-of-descriptors-for-multi-con.patch diff --git a/package/libusb/0001-linux_usbfs-Fix-parsing-of-descriptors-for-multi-con.patch b/package/libusb/0001-linux_usbfs-Fix-parsing-of-descriptors-for-multi-con.patch deleted file mode 100644 index 55e6a1494e..0000000000 --- a/package/libusb/0001-linux_usbfs-Fix-parsing-of-descriptors-for-multi-con.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 623e2a995d156e115c91f56a3ec691bdc333df8b Mon Sep 17 00:00:00 2001 -From: Chris Dickens -Date: Sun, 13 Dec 2020 15:49:19 -0800 -Subject: [PATCH] linux_usbfs: Fix parsing of descriptors for - multi-configuration devices - -Commit e2be556bd2 ("linux_usbfs: Parse config descriptors during device -initialization") introduced a regression for devices with multiple -configurations. The logic that verifies the reported length of the -configuration descriptors failed to count the length of the -configuration descriptor itself and would truncate the actual length by -9 bytes, leading to a parsing error for subsequent descriptors. - -Closes #825 - -Signed-off-by: Chris Dickens -(cherry picked from commit f6d2cb561402c3b6d3627c0eb89e009b503d9067) -Signed-off-by: John Keeping ---- - libusb/os/linux_usbfs.c | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - -diff --git a/libusb/os/linux_usbfs.c b/libusb/os/linux_usbfs.c -index fb2ed53..4d2dc8d 100644 ---- a/libusb/os/linux_usbfs.c -+++ b/libusb/os/linux_usbfs.c -@@ -641,7 +641,12 @@ static int seek_to_next_config(struct libusb_context *ctx, - uint8_t *buffer, size_t len) - { - struct usbi_descriptor_header *header; -- int offset = 0; -+ int offset; -+ -+ /* Start seeking past the config descriptor */ -+ offset = LIBUSB_DT_CONFIG_SIZE; -+ buffer += LIBUSB_DT_CONFIG_SIZE; -+ len -= LIBUSB_DT_CONFIG_SIZE; - - while (len > 0) { - if (len < 2) { -@@ -718,7 +723,7 @@ static int parse_config_descriptors(struct libusb_device *dev) - } - - if (priv->sysfs_dir) { -- /* -+ /* - * In sysfs wTotalLength is ignored, instead the kernel returns a - * config descriptor with verified bLength fields, with descriptors - * with an invalid bLength removed. -@@ -727,8 +732,7 @@ static int parse_config_descriptors(struct libusb_device *dev) - int offset; - - if (num_configs > 1 && idx < num_configs - 1) { -- offset = seek_to_next_config(ctx, buffer + LIBUSB_DT_CONFIG_SIZE, -- remaining - LIBUSB_DT_CONFIG_SIZE); -+ offset = seek_to_next_config(ctx, buffer, remaining); - if (offset < 0) - return offset; - sysfs_config_len = (uint16_t)offset; --- -2.30.1 - diff --git a/package/libusb/libusb.hash b/package/libusb/libusb.hash index 6169a186a5..a18935fe03 100644 --- a/package/libusb/libusb.hash +++ b/package/libusb/libusb.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 7efd2685f7b327326dcfb85cee426d9b871fd70e22caa15bb68d595ce2a2b12a libusb-1.0.24.tar.bz2 +sha256 8a28ef197a797ebac2702f095e81975e2b02b2eeff2774fa909c78a74ef50849 libusb-1.0.25.tar.bz2 sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk index 28efcadefc..1e82cb9a85 100644 --- a/package/libusb/libusb.mk +++ b/package/libusb/libusb.mk @@ -5,7 +5,7 @@ ################################################################################ LIBUSB_VERSION_MAJOR = 1.0 -LIBUSB_VERSION = $(LIBUSB_VERSION_MAJOR).24 +LIBUSB_VERSION = $(LIBUSB_VERSION_MAJOR).25 LIBUSB_SOURCE = libusb-$(LIBUSB_VERSION).tar.bz2 LIBUSB_SITE = https://github.com/libusb/libusb/releases/download/v$(LIBUSB_VERSION) LIBUSB_LICENSE = LGPL-2.1+ -- 2.34.1 From arnout at mind.be Tue Feb 1 22:04:02 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 1 Feb 2022 23:04:02 +0100 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: <9a932f1f-83b7-c10e-5e5f-4e0f13306340@mind.be> On 26/01/2022 22:00, Fabrice Fontaine wrote: > 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 Applied to master, thanks. Regards, Arnout > --- > 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 From arnout at mind.be Tue Feb 1 22:04:35 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 1 Feb 2022 23:04:35 +0100 Subject: [Buildroot] [PATCH v2, 1/2] package/xvisor: drop ARM32 without virtualization support In-Reply-To: <20220126225159.1567622-1-fontaine.fabrice@gmail.com> References: <20220126225159.1567622-1-fontaine.fabrice@gmail.com> Message-ID: On 26/01/2022 23:51, 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"! > > 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 Both applied ot master, thanks. Regards, Arnout > --- > 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 From arnout at mind.be Tue Feb 1 22:04:52 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 1 Feb 2022 23:04:52 +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: <8e7905ab-b882-a363-8fd3-d5e8c2d7b00b@mind.be> On 01/02/2022 00:00, Fabrice Fontaine wrote: > 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 Applied to master, thanks. Regards, Arnout > --- > ...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" > + From arnout at mind.be Tue Feb 1 21:58:16 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 1 Feb 2022 22:58:16 +0100 Subject: [Buildroot] [git commit] package/util-linux: bump version to 2.37.3 (fixes CVE-2021-3996, CVE-2021-3995) Message-ID: <20220201215822.190B782858@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b292f1d41a8734b6cdcbcf2ae726b51f9e1338a9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - add 'touch' workaround for missing disk-utils/raw.8 file ([1], [2]) in util-linux-2.37.3 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 [Arnout: put fix in POST_PATCH instead of PRE_COMPILE hook] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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..e59ef7dadc 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) @@ -35,6 +35,13 @@ UTIL_LINUX_CONF_OPTS += \ UTIL_LINUX_LINK_LIBS = $(TARGET_NLS_LIBS) +# workaround missing disk-utils/raw.8 file in util-linux-2.37.3 +# release download package +define UTIL_LINUX_FIX_DISK_UTILS_COMPILE + touch $(@D)/disk-utils/raw.8 +endef +UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE + HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf # We also don't want the host-python dependency From arnout at mind.be Tue Feb 1 21:23:48 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 1 Feb 2022 22:23:48 +0100 Subject: [Buildroot] [git commit] package/php-apcu: fix build without __sync_*_4 intrinsics Message-ID: <20220201215821.DC2CC82858@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=67126ef063a9a502bddb016be89e40bcaefc74c2 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 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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)) From arnout at mind.be Tue Feb 1 21:23:45 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 1 Feb 2022 22:23:45 +0100 Subject: [Buildroot] [git commit] package/hiawatha: fix build with gcc 4.8 Message-ID: <20220201215821.D29E982817@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=65f4f119f2db06230bd1c83d2907a08fb23685db branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 \ From arnout at mind.be Tue Feb 1 21:53:35 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 1 Feb 2022 22:53:35 +0100 Subject: [Buildroot] [git commit] package/netopeer2: disable tests Message-ID: <20220201215822.0F8DC82817@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=20ddb8369478c311212420e4a2a0cbffe859f8f2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 From arnout at mind.be Tue Feb 1 21:58:55 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 1 Feb 2022 22:58:55 +0100 Subject: [Buildroot] [git commit] package/binutils: add upstream patch for v2.37 fixing linking of thin archives Message-ID: <20220201215822.36DB282858@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=40f7b0bb6b91400b9e1fc60f410c9cdcbd1998ab branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...he-file-descriptor-if-there-is-no-archive.patch | 236 +++++++++++++++++++++ 1 file changed, 236 insertions(+) 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 + From arnout at mind.be Tue Feb 1 21:58:55 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 1 Feb 2022 22:58:55 +0100 Subject: [Buildroot] [git commit] package/iproute2: fix musl build Message-ID: <20220201215822.5C8B882817@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6dac320f73e37b88b8e2b063e41bae53aae466a3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Reviewed-by: Petr Vorel Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../0001-lib-fix-ax25-h-include-for-musl.patch | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) 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" + From arnout at mind.be Tue Feb 1 21:58:55 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 1 Feb 2022 22:58:55 +0100 Subject: [Buildroot] [git commit] package/umtprd: bump to version 1.6.2 Message-ID: <20220201215822.40CF582817@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=145a401b3b2d94e39e76b7ffea154971711aa6f3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Acked-by: Paul Cercueil Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 From arnout at mind.be Tue Feb 1 21:23:53 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 1 Feb 2022 22:23:53 +0100 Subject: [Buildroot] [git commit] package/liburing: fix static build Message-ID: <20220201215821.F0AD282817@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d3e453e96401e0df74b385e296373bd29ddd6c4c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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)) From arnout at mind.be Tue Feb 1 21:58:55 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 1 Feb 2022 22:58:55 +0100 Subject: [Buildroot] [git commit] configs/orangepi_zero_defconfig: refactoring, bump Linux and U-Boot versions Message-ID: <20220201215822.2CA5A82817@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2a084afe2a36d0dc29480afa62e57bbfe9c30e48 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../{linux-extras.config => linux-extras.fragment} | 0 configs/orangepi_zero_defconfig | 32 +++++++++++++++------- 2 files changed, 22 insertions(+), 10 deletions(-) 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 arnout at mind.be Tue Feb 1 21:58:55 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 1 Feb 2022 22:58:55 +0100 Subject: [Buildroot] [git commit] package/xvisor: drop ARM32 without virtualization support Message-ID: <20220201215822.49AFF82858@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3c7099f3abe7fd58b1642bebca5ca6c9e5d68de7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 From arnout at mind.be Tue Feb 1 21:58:55 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 1 Feb 2022 22:58:55 +0100 Subject: [Buildroot] [git commit] package/tesseract-ocr: override neon check Message-ID: <20220201215822.233938285F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=789e84b5dacbb39a34fe0ea873f044690a0944a2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 From arnout at mind.be Tue Feb 1 21:23:50 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 1 Feb 2022 22:23:50 +0100 Subject: [Buildroot] [git commit] package/mtd: fix build with libexecinfo Message-ID: <20220201215821.E60D38285F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c97e139924c28f98dae13b3c0ef2f5c1f75e1d70 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-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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 From arnout at mind.be Tue Feb 1 21:58:55 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 1 Feb 2022 22:58:55 +0100 Subject: [Buildroot] [git commit] package/xvisor: add riscv support Message-ID: <20220201215822.529B18285F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=750aa61300ca6434426916e83cf0ce18f729b668 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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) From arnout at mind.be Tue Feb 1 21:53:35 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 1 Feb 2022 22:53:35 +0100 Subject: [Buildroot] [git commit] package/uclibc: update to 1.0.40 Message-ID: <20220201215822.0576082858@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f458646bd0b86884cea0a26a0ad5c733477a6634 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Waldemar Brodkorb Reviewed-by: Petr Vorel Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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+ From fontaine.fabrice at gmail.com Tue Feb 1 22:04:29 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 1 Feb 2022 23:04:29 +0100 Subject: [Buildroot] [PATCH] package/efl: fix build failure with eeze disabled In-Reply-To: References: <168006d0-d098-07e2-7203-489d7573a3ec@mind.be> Message-ID: Hi, Le mar. 1 f?vr. 2022 ? 23:02, Giulio Benetti a ?crit : > > Hi Arnout, > > > Il giorno 1 feb 2022, alle ore 22:53, Arnout Vandecappelle ha scritto: > > > > ? > > > >> On 24/01/2022 11:09, Giulio Benetti wrote: > >> 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 > > > > There are two other patches that somehow deal with this issue [1][2] in addition to this one [3]. > > > > Could someone choose between the and mark the rest as Superseded in patchwork? > > Fabrice commented on mine that mine was better. > Then the Romain one came out few days ago and I can tell his one is better. > > So I would go for the Romain patch. > > I set mine as superseded and Fabrice can do the before. I also set mine as superseded. > > Best regards > Giulio > > > > > > > Regards, > > Arnout > > > > [1] https://patchwork.ozlabs.org/project/buildroot/patch/20211230221904.3064022-1-fontaine.fabrice at gmail.com/ > > [2] https://patchwork.ozlabs.org/project/buildroot/patch/20220129224651.1282263-4-romain.naour at gmail.com/ > > [3] https://patchwork.ozlabs.org/project/buildroot/patch/20220124100920.3005564-1-giulio.benetti at benettiengineering.com/ > > > > > >> 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) > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > Best Regards, Fabrice From fontaine.fabrice at gmail.com Tue Feb 1 22:06:26 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 1 Feb 2022 23:06:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/libgpg-error: add or1k support Message-ID: <20220201220626.350423-1-fontaine.fabrice@gmail.com> or1k is supported since version 1.18 and https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=commit;h=c143fa81462584ad39ea780908266bce3fb9a49e Signed-off-by: Fabrice Fontaine --- package/libgpg-error/Config.in | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/package/libgpg-error/Config.in b/package/libgpg-error/Config.in index 44e9d67aaf..03157dd9fe 100644 --- a/package/libgpg-error/Config.in +++ b/package/libgpg-error/Config.in @@ -2,14 +2,19 @@ config BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS bool # see src/syscfg/ default y if \ - BR2_aarch64 || BR2_aarch64_eb || BR2_arm || \ - BR2_armeb || BR2_i386 || BR2_mips || \ - BR2_mipsel || BR2_mips64 || BR2_mips64el || \ - BR2_m68k || BR2_nios2 || BR2_powerpc || \ - BR2_powerpc64 || BR2_powerpc64le || BR2_RISCV_64 || \ - BR2_RISCV_32 || BR2_s390x || BR2_sh4 || \ - BR2_sh4eb || BR2_sh4a || BR2_sh4aeb || \ - BR2_sparc || BR2_sparc64 || BR2_x86_64 + BR2_aarch64 || BR2_aarch64_eb || \ + BR2_arm || BR2_armeb || \ + BR2_i386 || BR2_mips || \ + BR2_mipsel || BR2_mips64 || \ + BR2_mips64el || BR2_m68k || \ + BR2_nios2 || BR2_or1k || \ + BR2_powerpc || BR2_powerpc64 || \ + BR2_powerpc64le || BR2_RISCV_64 || \ + BR2_RISCV_32 || BR2_s390x || \ + BR2_sh4 || BR2_sh4eb || \ + BR2_sh4a || BR2_sh4aeb || \ + BR2_sparc || BR2_sparc64 || \ + BR2_x86_64 config BR2_PACKAGE_LIBGPG_ERROR bool "libgpg-error" @@ -36,6 +41,8 @@ config BR2_PACKAGE_LIBGPG_ERROR_SYSCFG if BR2_m68k default "nios2-unknown-linux-gnu" \ if BR2_nios2 + default "or1k-unknown-linux-gnu" \ + if BR2_or1k default "powerpc-unknown-linux-gnu" \ if BR2_powerpc default "powerpc64-unknown-linux-gnu" \ -- 2.34.1 From giulio.benetti at benettiengineering.com Tue Feb 1 22:02:04 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 1 Feb 2022 23:02:04 +0100 Subject: [Buildroot] [PATCH] package/efl: fix build failure with eeze disabled In-Reply-To: <168006d0-d098-07e2-7203-489d7573a3ec@mind.be> References: <168006d0-d098-07e2-7203-489d7573a3ec@mind.be> Message-ID: Hi Arnout, > Il giorno 1 feb 2022, alle ore 22:53, Arnout Vandecappelle ha scritto: > > ? > >> On 24/01/2022 11:09, Giulio Benetti wrote: >> 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 > > There are two other patches that somehow deal with this issue [1][2] in addition to this one [3]. > > Could someone choose between the and mark the rest as Superseded in patchwork? Fabrice commented on mine that mine was better. Then the Romain one came out few days ago and I can tell his one is better. So I would go for the Romain patch. I set mine as superseded and Fabrice can do the before. Best regards Giulio > > > Regards, > Arnout > > [1] https://patchwork.ozlabs.org/project/buildroot/patch/20211230221904.3064022-1-fontaine.fabrice at gmail.com/ > [2] https://patchwork.ozlabs.org/project/buildroot/patch/20220129224651.1282263-4-romain.naour at gmail.com/ > [3] https://patchwork.ozlabs.org/project/buildroot/patch/20220124100920.3005564-1-giulio.benetti at benettiengineering.com/ > > >> 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) > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From giulio.benetti at benettiengineering.com Tue Feb 1 22:12:33 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 1 Feb 2022 23:12:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/libgpg-error: add or1k support In-Reply-To: <20220201220626.350423-1-fontaine.fabrice@gmail.com> References: <20220201220626.350423-1-fontaine.fabrice@gmail.com> Message-ID: <5C805706-7722-4179-A3F0-EB6F7FA592DB@benettiengineering.com> Hi Fabrice, > Il giorno 1 feb 2022, alle ore 23:08, Fabrice Fontaine ha scritto: > > ?or1k is supported since version 1.18 and > https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=commit;h=c143fa81462584ad39ea780908266bce3fb9a49e > > Signed-off-by: Fabrice Fontaine The or1k revenge :-) Reviewed-by: Giulio Benetti Best regards Giulio > --- > package/libgpg-error/Config.in | 23 +++++++++++++++-------- > 1 file changed, 15 insertions(+), 8 deletions(-) > > diff --git a/package/libgpg-error/Config.in b/package/libgpg-error/Config.in > index 44e9d67aaf..03157dd9fe 100644 > --- a/package/libgpg-error/Config.in > +++ b/package/libgpg-error/Config.in > @@ -2,14 +2,19 @@ config BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS > bool > # see src/syscfg/ > default y if \ > - BR2_aarch64 || BR2_aarch64_eb || BR2_arm || \ > - BR2_armeb || BR2_i386 || BR2_mips || \ > - BR2_mipsel || BR2_mips64 || BR2_mips64el || \ > - BR2_m68k || BR2_nios2 || BR2_powerpc || \ > - BR2_powerpc64 || BR2_powerpc64le || BR2_RISCV_64 || \ > - BR2_RISCV_32 || BR2_s390x || BR2_sh4 || \ > - BR2_sh4eb || BR2_sh4a || BR2_sh4aeb || \ > - BR2_sparc || BR2_sparc64 || BR2_x86_64 > + BR2_aarch64 || BR2_aarch64_eb || \ > + BR2_arm || BR2_armeb || \ > + BR2_i386 || BR2_mips || \ > + BR2_mipsel || BR2_mips64 || \ > + BR2_mips64el || BR2_m68k || \ > + BR2_nios2 || BR2_or1k || \ > + BR2_powerpc || BR2_powerpc64 || \ > + BR2_powerpc64le || BR2_RISCV_64 || \ > + BR2_RISCV_32 || BR2_s390x || \ > + BR2_sh4 || BR2_sh4eb || \ > + BR2_sh4a || BR2_sh4aeb || \ > + BR2_sparc || BR2_sparc64 || \ > + BR2_x86_64 > > config BR2_PACKAGE_LIBGPG_ERROR > bool "libgpg-error" > @@ -36,6 +41,8 @@ config BR2_PACKAGE_LIBGPG_ERROR_SYSCFG > if BR2_m68k > default "nios2-unknown-linux-gnu" \ > if BR2_nios2 > + default "or1k-unknown-linux-gnu" \ > + if BR2_or1k > default "powerpc-unknown-linux-gnu" \ > if BR2_powerpc > default "powerpc64-unknown-linux-gnu" \ > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From peter at korsgaard.com Tue Feb 1 22:13:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 01 Feb 2022 23:13:46 +0100 Subject: [Buildroot] [PATCH] package/prosody: security bump to 0.11.13 In-Reply-To: <20220131144734.1199549-1-francois.perrad@gadz.org> (Francois Perrad's message of "Mon, 31 Jan 2022 15:47:34 +0100") References: <20220131144734.1199549-1-francois.perrad@gadz.org> Message-ID: <871r0m2q1x.fsf@dell.be.48ers.dk> >>>>> "Francois" == Francois Perrad writes: > see https://prosody.im/doc/release/0.11.13 > Signed-off-by: Francois Perrad Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 1 22:14:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 01 Feb 2022 23:14:36 +0100 Subject: [Buildroot] [PATCH] package/expat: security bump to 2.4.4 In-Reply-To: <20220131145825.1206899-1-francois.perrad@gadz.org> (Francois Perrad's message of "Mon, 31 Jan 2022 15:58:25 +0100") References: <20220131145825.1206899-1-francois.perrad@gadz.org> Message-ID: <87wnie1bg3.fsf@dell.be.48ers.dk> >>>>> "Francois" == Francois Perrad writes: > fix CVE-2022-23852, CVE-2022-23990 > Signed-off-by: Francois Perrad Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 1 22:14:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 1 Feb 2022 23:14:05 +0100 Subject: [Buildroot] [git commit] package/expat: security bump to 2.4.4 Message-ID: <20220201220756.64CCE82858@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ab71ac15ddd7ed6a8ca83cbc23ea0b0cbb343f0f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master fix CVE-2022-23852, CVE-2022-23990 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- 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 0853c3c76d..3129801668 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 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 From peter at korsgaard.com Tue Feb 1 22:12:52 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 1 Feb 2022 23:12:52 +0100 Subject: [Buildroot] [git commit] package/prosody: security bump to 0.11.13 Message-ID: <20220201220756.5C41882803@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=800e53cf7e3ec71c3830e8a125b0a5546786d44f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master see https://prosody.im/doc/release/0.11.13 Signed-off-by: Francois Perrad 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 b6fa6532a5..3a3a363a4b 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 d697c85568..62ba073b9e 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 From peter at korsgaard.com Tue Feb 1 22:17:12 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 01 Feb 2022 23:17:12 +0100 Subject: [Buildroot] [PATCH] package/at: bump version to 3.2.4 In-Reply-To: <20220131123441.3645526-1-giulio.benetti@benettiengineering.com> (Giulio Benetti's message of "Mon, 31 Jan 2022 13:34:41 +0100") References: <20220131123441.3645526-1-giulio.benetti@benettiengineering.com> Message-ID: <87sft21bbr.fsf@dell.be.48ers.dk> >>>>> "Giulio" == Giulio Benetti writes: > All local patches except on have been upstreamed, so let's remove them and > rename/rebase the remaining one. > Signed-off-by: Giulio Benetti > +++ 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 What does this do? > +++ 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 Is autoreconf still needed? -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 1 22:17:52 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 01 Feb 2022 23:17:52 +0100 Subject: [Buildroot] [PATCH] package/python3: bump version to 3.10.2 In-Reply-To: <20220131110027.29013-1-peter@korsgaard.com> (Peter Korsgaard's message of "Mon, 31 Jan 2022 12:00:27 +0100") References: <20220131110027.29013-1-peter@korsgaard.com> Message-ID: <87o83q1ban.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Refresh 0032-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch now > that the MULTIARCH logic got updated by: > https://github.com/python/cpython/commit/7e951f356ec76a5a5fdb851d71df5d120014bf3f > Update license hash after a change of copyright years: > https://github.com/python/cpython/commit/35955e4adec4dd09127af93f9413d46889a3c475 > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 1 22:17:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 1 Feb 2022 23:17:36 +0100 Subject: [Buildroot] [git commit] package/python3: bump version to 3.10.2 Message-ID: <20220201221102.D990182814@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=519a50decd7ee051ca5b900bed8abc7d99105d02 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Refresh 0032-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch now that the MULTIARCH logic got updated by: https://github.com/python/cpython/commit/7e951f356ec76a5a5fdb851d71df5d120014bf3f Update license hash after a change of copyright years: https://github.com/python/cpython/commit/35955e4adec4dd09127af93f9413d46889a3c475 Signed-off-by: Peter Korsgaard --- ...c-fixup-CC-print-multiarch-output-for-mus.patch | 29 ++++++++++++---------- package/python3/python3.hash | 8 +++--- package/python3/python3.mk | 2 +- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/package/python3/0032-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch b/package/python3/0032-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch index 7fe2516e98..eff010fa22 100644 --- a/package/python3/0032-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 d009b0142f77881dd75ff760fec728dbc8581a03 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 @@ -24,25 +24,28 @@ workaround, rewrite the --print-multiarch output to match older GCC versions to keep the configure script happy. Signed-off-by: Peter Korsgaard +[Peter: updated for 3.10.2] --- - configure.ac | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) + configure.ac | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 615c16aced..241298e6cf 100644 +index 913051c276..aba03f3779 100644 --- a/configure.ac +++ b/configure.ac -@@ -873,7 +873,9 @@ fi - rm -f conftest.c conftest.out - - if test x$PLATFORM_TRIPLET != xdarwin; then -- MULTIARCH=$($CC --print-multiarch 2>/dev/null) +@@ -876,7 +876,11 @@ AC_MSG_CHECKING([for multiarch]) + AS_CASE([$ac_sys_system], + [Darwin*], [MULTIARCH=""], + [FreeBSD*], [MULTIARCH=""], +- [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_SUBST([MULTIARCH]) + AC_MSG_RESULT([$MULTIARCH]) -- -2.25.1 +2.20.1 diff --git a/package/python3/python3.hash b/package/python3/python3.hash index fa4b334877..97f4653490 100644 --- a/package/python3/python3.hash +++ b/package/python3/python3.hash @@ -1,5 +1,5 @@ -# From https://www.python.org/downloads/release/python-3101/ -md5 789210934745a65247a3ebf5da9adb64 Python-3.10.1.tar.xz +# From https://www.python.org/downloads/release/python-3102/ +md5 14e8c22458ed7779a1957b26cde01db9 Python-3.10.2.tar.xz # Locally computed -sha256 a7f1265b6e1a5de1ec5c3ec7019ab53413469934758311e9d240c46e5ae6e177 Python-3.10.1.tar.xz -sha256 d0285b61e1a8e420c7deb95836738a5d4a0d26463138b17601f5971212684c4b LICENSE +sha256 17de3ac7da9f2519aa9d64378c603a73a0e9ad58dffa8812e45160c086de64c7 Python-3.10.2.tar.xz +sha256 f03e17cd594c2085f66a454e695c7ebe5b4d3c0eff534f4f194abc2fd164621b LICENSE diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 6d629ae96e..f9afcd5097 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -5,7 +5,7 @@ ################################################################################ PYTHON3_VERSION_MAJOR = 3.10 -PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).1 +PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).2 PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz PYTHON3_SITE = https://python.org/ftp/python/$(PYTHON3_VERSION) PYTHON3_LICENSE = Python-2.0, others From giulio.benetti at benettiengineering.com Tue Feb 1 22:23:58 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 1 Feb 2022 23:23:58 +0100 Subject: [Buildroot] [PATCH] package/at: bump version to 3.2.4 In-Reply-To: <87sft21bbr.fsf@dell.be.48ers.dk> References: <20220131123441.3645526-1-giulio.benetti@benettiengineering.com> <87sft21bbr.fsf@dell.be.48ers.dk> Message-ID: <3b46e3fd-6fa1-eac5-bd28-f726f23a921c@benettiengineering.com> Hi Peter, On 01/02/22 23:17, Peter Korsgaard wrote: >>>>>> "Giulio" == Giulio Benetti writes: > > > All local patches except on have been upstreamed, so let's remove them and > > rename/rebase the remaining one. > > > Signed-off-by: Giulio Benetti > > +++ 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 > > What does this do? oops, that remained as part of the old patch so I need to drop it > > +++ 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 > > Is autoreconf still needed? > I'm checking right now -- Giulio Benetti Benetti Engineering sas From aperez at igalia.com Tue Feb 1 22:27:42 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Wed, 2 Feb 2022 00:27:42 +0200 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: <20220202002742.GB1241348@momiji> Hi, On Wed, 26 Jan 2022 20:34:31 +0100 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 Amusingly I ran into this a couple of days ago and almost simultaneously sent a patch to include the fixes in the WebKit SDK we use for development [1] =) > Signed-off-by: Peter Seiderer Reviewed-by: Adrian Perez de Castro Cheers, ?Adri?n --- [1] https://bugs.webkit.org/show_bug.cgi?id=235975 -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: From fontaine.fabrice at gmail.com Tue Feb 1 22:27:45 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 1 Feb 2022 23:27:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/safeclib: bump to version 3.7.1 Message-ID: <20220201222745.411463-1-fontaine.fabrice@gmail.com> Drop patch (already in version) and so autoreconf https://github.com/rurban/safeclib/blob/v3.7.1/ChangeLog Signed-off-by: Fabrice Fontaine --- ...gure.ac-add-disable-hardening-option.patch | 63 ------------------- package/safeclib/safeclib.hash | 4 +- package/safeclib/safeclib.mk | 6 +- 3 files changed, 4 insertions(+), 69 deletions(-) delete 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 deleted file mode 100644 index e851fce993..0000000000 --- a/package/safeclib/0001-configure.ac-add-disable-hardening-option.patch +++ /dev/null @@ -1,63 +0,0 @@ -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.hash b/package/safeclib/safeclib.hash index af732f93fd..bca5d86261 100644 --- a/package/safeclib/safeclib.hash +++ b/package/safeclib/safeclib.hash @@ -1,5 +1,5 @@ -# From https://github.com/rurban/safeclib/releases/tag/v02092020 -sha256 d374bdcbfcdc4c9a76abed3707667372ca212fd87a369e7bcaaa54e716d27c0a libsafec-02092020.tar.xz +# From https://github.com/rurban/safeclib/releases/tag/v3.7.1 +sha256 71d3ec970f930bd980f2a41127228eeedfc53749e4c6b203329adc4ff7df32a7 safeclib-3.7.1.tar.xz # Hash for license file sha256 c33e77efd5781e3d59a2bb648c82d2a615035ef0d24cf58880380e3af906510b COPYING diff --git a/package/safeclib/safeclib.mk b/package/safeclib/safeclib.mk index 29ffea7f2e..91b3e26c68 100644 --- a/package/safeclib/safeclib.mk +++ b/package/safeclib/safeclib.mk @@ -4,15 +4,13 @@ # ################################################################################ -SAFECLIB_VERSION = 02092020 +SAFECLIB_VERSION = 3.7.1 SAFECLIB_SITE = \ https://github.com/rurban/safeclib/releases/download/v$(SAFECLIB_VERSION) -SAFECLIB_SOURCE = libsafec-$(SAFECLIB_VERSION).tar.xz +SAFECLIB_SOURCE = safeclib-$(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 -- 2.34.1 From giulio.benetti at benettiengineering.com Tue Feb 1 22:32:04 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 1 Feb 2022 23:32:04 +0100 Subject: [Buildroot] [PATCH v2] package/at: bump version to 3.2.4 In-Reply-To: <3b46e3fd-6fa1-eac5-bd28-f726f23a921c@benettiengineering.com> References: <3b46e3fd-6fa1-eac5-bd28-f726f23a921c@benettiengineering.com> Message-ID: <20220201223204.3796621-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 --- V1->V2: suggested by Peter * removed useless lines from local patch * remove AT_AUTORECONF = y since it's not needed anymore --- ...ake-install-for-non-root-don-t-stri.patch} | 9 +- ...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 | 3 +- 6 files changed, 7 insertions(+), 200 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} (96%) 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 96% 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..91e9738358 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 77b28c32ebfed0eb130a0acdb2acb7206f2b9530 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,17 @@ 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(-) diff --git a/Makefile.in b/Makefile.in -index a7197f2..0b35a67 100644 +index 4ae194f..af82e4c 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -99,43 +99,42 @@ atrun: atrun.in +@@ -102,43 +102,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..26c44f5287 100644 --- a/package/at/at.mk +++ b/package/at/at.mk @@ -4,10 +4,9 @@ # ################################################################################ -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 AT_DEPENDENCIES = $(if $(BR2_PACKAGE_FLEX),flex) host-bison host-flex AT_LICENSE = GPL-2.0+, GPL-3.0+, ISC AT_LICENSE_FILES = Copyright COPYING -- 2.25.1 From ps.report at gmx.net Tue Feb 1 22:32:47 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 1 Feb 2022 23:32:47 +0100 Subject: [Buildroot] [PATCH v1] package/libcamera: fix uclibc/musl compile with libexecinfo enabled In-Reply-To: <20220131230730.22235-1-ps.report@gmx.net> References: <20220131230730.22235-1-ps.report@gmx.net> Message-ID: <20220201233247.28ac615b@gmx.net> On Tue, 1 Feb 2022 00:07:30 +0100, Peter Seiderer wrote: > - 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 Should be: LIBCAMERA_LDFLAGS = $(TARGET_LDFLAGS) -lexecinfo Updated patch will follow... Regards, Peter > +endif > + > $(eval $(meson-package)) From fontaine.fabrice at gmail.com Tue Feb 1 22:33:49 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 1 Feb 2022 23:33:49 +0100 Subject: [Buildroot] [PATCH 1/1] package/lcms2: bump to version 2.13 Message-ID: <20220201223349.424073-1-fontaine.fabrice@gmail.com> https://littlecms.com/blog/2022/01/28/lcms2-2.13 Signed-off-by: Fabrice Fontaine --- package/lcms2/lcms2.hash | 6 +++--- package/lcms2/lcms2.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/lcms2/lcms2.hash b/package/lcms2/lcms2.hash index 8477610ff0..d3ae1d934f 100644 --- a/package/lcms2/lcms2.hash +++ b/package/lcms2/lcms2.hash @@ -1,5 +1,5 @@ -# From https://sourceforge.net/projects/lcms/files/lcms/2.12 -sha1 3d0c0276fcd3930b80c424512ec0b1ed54ec1497 lcms2-2.12.tar.gz +# From https://sourceforge.net/projects/lcms/files/lcms/2.13 +sha1 1676097fb18fce83c9c876d56828c83a6ad829dd lcms2-2.13.tar.gz # Locally computed: -sha256 18663985e864100455ac3e507625c438c3710354d85e5cbb7cd4043e11fe10f5 lcms2-2.12.tar.gz +sha256 0c67a5cc144029cfa34647a52809ec399aae488db4258a6a66fba318474a070f lcms2-2.13.tar.gz sha256 46d4e05af3bce75332a12d01f19bcce7e32b6bac544be28a64043d0231291e31 COPYING diff --git a/package/lcms2/lcms2.mk b/package/lcms2/lcms2.mk index 49ddccd82b..5a253d044b 100644 --- a/package/lcms2/lcms2.mk +++ b/package/lcms2/lcms2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LCMS2_VERSION = 2.12 +LCMS2_VERSION = 2.13 LCMS2_SITE = http://downloads.sourceforge.net/project/lcms/lcms/$(LCMS2_VERSION) LCMS2_LICENSE = MIT LCMS2_LICENSE_FILES = COPYING -- 2.34.1 From ps.report at gmx.net Tue Feb 1 22:53:33 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 1 Feb 2022 23:53:33 +0100 Subject: [Buildroot] [PATCH v3 2/2] package/pkg-meson: improve generation of cross-compilation file In-Reply-To: <44572e0d-1989-106f-65fa-4b784427e15b@mind.be> References: <20211203215438.213437-1-nolange79@gmail.com> <20211203215438.213437-2-nolange79@gmail.com> <44572e0d-1989-106f-65fa-4b784427e15b@mind.be> Message-ID: <20220201235333.7e621c61@gmx.net> Hello Arnout, *, On Tue, 1 Feb 2022 00:00:58 +0100, Arnout Vandecappelle wrote: > 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. In my early version of the patch ([1]) it was PKG_TARGET_CFLAGS, PKG_TARGET_LDFLAGS, PKG_TARGET_CXXFLAGS, in the later version adopted by Yann ([2]) it became PKG_TARGET_CFLAGS, PKG_TARGET_CFLAGS, PKG_TARGET_CFLAGS (cut & paste mistake?) > > I'm not sure what to do about it. Fix it ;-)...and I believe the usage of the provided cross-compilation.conf.in template is a seldom used feature...and the few (if any?) experts using it know how to sed (or hand edit) it with the right values... Regards, Peter [1] http://patchwork.ozlabs.org/project/buildroot/patch/20190423205302.14382-1-ps.report at gmx.net/ [2] http://lists.busybox.net/pipermail/buildroot/2019-June/253129.html > > > > > $(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' > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From giulio.benetti at benettiengineering.com Tue Feb 1 23:02:17 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 2 Feb 2022 00:02:17 +0100 Subject: [Buildroot] [PATCH 5/6] configs/microchip_sama7g5ek_mmc_defconfig: add missing BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15 In-Reply-To: <20220201183331.4009320-6-giulio.benetti@benettiengineering.com> References: <20220201183331.4009320-1-giulio.benetti@benettiengineering.com> <20220201183331.4009320-6-giulio.benetti@benettiengineering.com> Message-ID: This and next patch miss host openssl linux dependency. I re-send V2. Sorry for the noise. Best regards -- Giulio Benetti Benetti Engineering sas On 01/02/22 19:33, Giulio Benetti wrote: > Fixes: > https://gitlab.com/ymorin/buildroot/-/jobs/2035821098 > > Signed-off-by: Giulio Benetti > --- > configs/microchip_sama7g5ek_mmc_defconfig | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/configs/microchip_sama7g5ek_mmc_defconfig b/configs/microchip_sama7g5ek_mmc_defconfig > index b1cd193829..2d4b720342 100644 > --- a/configs/microchip_sama7g5ek_mmc_defconfig > +++ b/configs/microchip_sama7g5ek_mmc_defconfig > @@ -1,6 +1,7 @@ > BR2_arm=y > BR2_cortex_a7=y > BR2_ARM_FPU_NEON_VFPV4=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/microchip/sama7g5ek/genimage.cfg" > BR2_LINUX_KERNEL=y From giulio.benetti at benettiengineering.com Tue Feb 1 23:04:08 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 2 Feb 2022 00:04:08 +0100 Subject: [Buildroot] [PATCH v2 0/6] Fix gitlab CI build failure due to missing HOST_ dependencies Message-ID: <20220201230414.4144930-1-giulio.benetti@benettiengineering.com> This patchset fixes the gitlab build failure due to HOST_ dependencies(uboot/linux). V1->V2: * add missing host openssl for linux on microchip_sama7g5ek_mmc_defconfig/_dev_defconfig Giulio Benetti (6): configs/bananapi_m2_ultra_defconfig: u-boot needs host python3 and host openssl configs/beaglev_defconfig: linux needs host openssl configs/microchip_sama5d2_icp_mmc_defconfig: linux needs host openssl configs/microchip_sama5d2_icp_mmc_dev_defconfig: linux needs host openssl configs/microchip_sama7g5ek_mmc_defconfig: add missing BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15 and host openssl for linux configs/microchip_sama7g5ek_mmc_dev_defconfig: add missing BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15 and host openssl for linux configs/bananapi_m2_ultra_defconfig | 2 ++ configs/beaglev_defconfig | 1 + configs/microchip_sama5d2_icp_mmc_defconfig | 1 + configs/microchip_sama5d2_icp_mmc_dev_defconfig | 1 + configs/microchip_sama7g5ek_mmc_defconfig | 2 ++ configs/microchip_sama7g5ek_mmc_dev_defconfig | 2 ++ 6 files changed, 9 insertions(+) -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Feb 1 23:04:12 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 2 Feb 2022 00:04:12 +0100 Subject: [Buildroot] [PATCH v2 4/6] configs/microchip_sama5d2_icp_mmc_dev_defconfig: linux needs host openssl In-Reply-To: <20220201230414.4144930-1-giulio.benetti@benettiengineering.com> References: <20220201230414.4144930-1-giulio.benetti@benettiengineering.com> Message-ID: <20220201230414.4144930-5-giulio.benetti@benettiengineering.com> Fixes: https://gitlab.com/ymorin/buildroot/-/jobs/2035821096 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..27d1d3409d 100644 --- a/configs/microchip_sama5d2_icp_mmc_dev_defconfig +++ b/configs/microchip_sama5d2_icp_mmc_dev_defconfig @@ -16,6 +16,7 @@ BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,li BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d2_icp" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_LINUX_TOOLS_IIO=y BR2_PACKAGE_BZIP2=y BR2_PACKAGE_XZ=y -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Feb 1 23:04:09 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 2 Feb 2022 00:04:09 +0100 Subject: [Buildroot] [PATCH v2 1/6] configs/bananapi_m2_ultra_defconfig: u-boot needs host python3 and host openssl In-Reply-To: <20220201230414.4144930-1-giulio.benetti@benettiengineering.com> References: <20220201230414.4144930-1-giulio.benetti@benettiengineering.com> Message-ID: <20220201230414.4144930-2-giulio.benetti@benettiengineering.com> Fixes: https://gitlab.com/ymorin/buildroot/-/jobs/2035820967 Signed-off-by: Giulio Benetti --- configs/bananapi_m2_ultra_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/bananapi_m2_ultra_defconfig b/configs/bananapi_m2_ultra_defconfig index 67ecec424c..2ec0e60e8d 100644 --- a/configs/bananapi_m2_ultra_defconfig +++ b/configs/bananapi_m2_ultra_defconfig @@ -19,7 +19,9 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="bananapi_m2_berry" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" BR2_PACKAGE_HOST_DOSFSTOOLS=y -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Feb 1 23:04:10 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 2 Feb 2022 00:04:10 +0100 Subject: [Buildroot] [PATCH v2 2/6] configs/beaglev_defconfig: linux needs host openssl In-Reply-To: <20220201230414.4144930-1-giulio.benetti@benettiengineering.com> References: <20220201230414.4144930-1-giulio.benetti@benettiengineering.com> Message-ID: <20220201230414.4144930-3-giulio.benetti@benettiengineering.com> Fixes: https://gitlab.com/ymorin/buildroot/-/jobs/2035820979 Signed-off-by: Giulio Benetti --- configs/beaglev_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/beaglev_defconfig b/configs/beaglev_defconfig index 70459bf3e8..79af8c2ece 100644 --- a/configs/beaglev_defconfig +++ b/configs/beaglev_defconfig @@ -16,6 +16,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="starlight" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="starfive/jh7100-beaglev-starlight" 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_TAR is not set -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Feb 1 23:04:13 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 2 Feb 2022 00:04:13 +0100 Subject: [Buildroot] [PATCH v2 5/6] configs/microchip_sama7g5ek_mmc_defconfig: add missing BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15 and host openssl for linux In-Reply-To: <20220201230414.4144930-1-giulio.benetti@benettiengineering.com> References: <20220201230414.4144930-1-giulio.benetti@benettiengineering.com> Message-ID: <20220201230414.4144930-6-giulio.benetti@benettiengineering.com> Fixes: https://gitlab.com/ymorin/buildroot/-/jobs/2035821098 Signed-off-by: Giulio Benetti --- V1->V2: * add host openssl linux --- configs/microchip_sama7g5ek_mmc_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/microchip_sama7g5ek_mmc_defconfig b/configs/microchip_sama7g5ek_mmc_defconfig index b1cd193829..df48c0880b 100644 --- a/configs/microchip_sama7g5ek_mmc_defconfig +++ b/configs/microchip_sama7g5ek_mmc_defconfig @@ -1,12 +1,14 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/microchip/sama7g5ek/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_DEFCONFIG="sama7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama7g5ek" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Feb 1 23:04:14 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 2 Feb 2022 00:04:14 +0100 Subject: [Buildroot] [PATCH v2 6/6] configs/microchip_sama7g5ek_mmc_dev_defconfig: add missing BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15 and host openssl for linux In-Reply-To: <20220201230414.4144930-1-giulio.benetti@benettiengineering.com> References: <20220201230414.4144930-1-giulio.benetti@benettiengineering.com> Message-ID: <20220201230414.4144930-7-giulio.benetti@benettiengineering.com> Fixes: https://gitlab.com/ymorin/buildroot/-/jobs/2035821100 Signed-off-by: Giulio Benetti --- V1->V2: * add host openssl linux --- configs/microchip_sama7g5ek_mmc_dev_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/microchip_sama7g5ek_mmc_dev_defconfig b/configs/microchip_sama7g5ek_mmc_dev_defconfig index 3253bce401..d34192b66d 100644 --- a/configs/microchip_sama7g5ek_mmc_dev_defconfig +++ b/configs/microchip_sama7g5ek_mmc_dev_defconfig @@ -1,6 +1,7 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_TOOLCHAIN_BUILDROOT_WCHAR=y BR2_PTHREAD_DEBUG=y BR2_TOOLCHAIN_BUILDROOT_CXX=y @@ -11,6 +12,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_DEFCONFIG="sama7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama7g5ek" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_LINUX_TOOLS_IIO=y BR2_PACKAGE_BZIP2=y BR2_PACKAGE_XZ=y -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Feb 1 23:04:11 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 2 Feb 2022 00:04:11 +0100 Subject: [Buildroot] [PATCH v2 3/6] configs/microchip_sama5d2_icp_mmc_defconfig: linux needs host openssl In-Reply-To: <20220201230414.4144930-1-giulio.benetti@benettiengineering.com> References: <20220201230414.4144930-1-giulio.benetti@benettiengineering.com> Message-ID: <20220201230414.4144930-4-giulio.benetti@benettiengineering.com> Fixes: https://gitlab.com/ymorin/buildroot/-/jobs/2035821094 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..27ea4970f1 100644 --- a/configs/microchip_sama5d2_icp_mmc_defconfig +++ b/configs/microchip_sama5d2_icp_mmc_defconfig @@ -12,6 +12,7 @@ BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,li BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d2_icp" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Feb 1 23:06:43 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 2 Feb 2022 00:06:43 +0100 Subject: [Buildroot] [PATCH v2 3/6] configs/microchip_sama5d2_icp_mmc_defconfig: linux needs host openssl In-Reply-To: <20220201230414.4144930-4-giulio.benetti@benettiengineering.com> References: <20220201230414.4144930-1-giulio.benetti@benettiengineering.com> <20220201230414.4144930-4-giulio.benetti@benettiengineering.com> Message-ID: <037b8bb1-8191-2410-ca36-272597898584@benettiengineering.com> On 02/02/22 00:04, Giulio Benetti wrote: > Fixes: > https://gitlab.com/ymorin/buildroot/-/jobs/2035821094 > > Signed-off-by: Giulio Benetti I've left back this: Reviewed-by: Michael Trimarchi Best regards -- Giulio Benetti Benetti Engineering sas > --- > 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..27ea4970f1 100644 > --- a/configs/microchip_sama5d2_icp_mmc_defconfig > +++ b/configs/microchip_sama5d2_icp_mmc_defconfig > @@ -12,6 +12,7 @@ BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,li > BR2_LINUX_KERNEL_DEFCONFIG="sama5" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d2_icp" > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > BR2_TARGET_ROOTFS_EXT2_SIZE="120M" From fontaine.fabrice at gmail.com Tue Feb 1 23:08:45 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 2 Feb 2022 00:08:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/libblockdev: fix build with libglib2 >= 2.69 Message-ID: <20220201230845.888962-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump of libglib2 to version 2.70 in commit 079923d5fabf4f887bb140808cb16067ca08b19b: 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)) { | ^~ Fixes: - http://autobuild.buildroot.org/results/8f9ca895cb07014804130a7ccbcb758b1d519470 Signed-off-by: Fabrice Fontaine --- ...ec-Fix-deprecated-glib-function-call.patch | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 package/libblockdev/0002-exec-Fix-deprecated-glib-function-call.patch diff --git a/package/libblockdev/0002-exec-Fix-deprecated-glib-function-call.patch b/package/libblockdev/0002-exec-Fix-deprecated-glib-function-call.patch new file mode 100644 index 0000000000..2c370a133f --- /dev/null +++ b/package/libblockdev/0002-exec-Fix-deprecated-glib-function-call.patch @@ -0,0 +1,32 @@ +From aad927a81fd9067865dc391c5bbff12ac51a0002 Mon Sep 17 00:00:00 2001 +From: Manuel Wassermann +Date: Thu, 1 Jul 2021 04:45:49 +0200 +Subject: [PATCH] exec: Fix deprecated glib function call Glib will rename + "g_spawn_check_exit_status()" to "g_spawn_check_wait_status()" in version + 2.69. + +[Retrieved from: +https://github.com/storaged-project/libblockdev/commit/aad927a81fd9067865dc391c5bbff12ac51a0002] +Signed-off-by: Fabrice Fontaine +--- + src/utils/exec.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/src/utils/exec.c b/src/utils/exec.c +index 317fb5525..8faeb289c 100644 +--- a/src/utils/exec.c ++++ b/src/utils/exec.c +@@ -236,7 +236,12 @@ gboolean bd_utils_exec_and_report_status_error (const gchar **argv, const BDExtr + /* g_spawn_sync set the status in the same way waitpid() does, we need + to get the process exit code manually (this is similar to calling + WEXITSTATUS but also sets the error for terminated processes */ +- if (!g_spawn_check_exit_status (exit_status, error)) { ++ ++ #if !GLIB_CHECK_VERSION(2, 69, 0) ++ #define g_spawn_check_wait_status(x,y) (g_spawn_check_exit_status (x,y)) ++ #endif ++ ++ if (!g_spawn_check_wait_status (exit_status, error)) { + if (g_error_matches (*error, G_SPAWN_ERROR, G_SPAWN_ERROR_FAILED)) { + /* process was terminated abnormally (e.g. using a signal) */ + g_free (stdout_data); -- 2.34.1 From giulio.benetti at benettiengineering.com Tue Feb 1 23:22:02 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 2 Feb 2022 00:22:02 +0100 Subject: [Buildroot] [URGENT 0/1] This patch is needed for host-util-linux Message-ID: <20220201232203.333403-1-giulio.benetti@benettiengineering.com> host-util-linux is very used, so please apply this asap, otherwise a lot of builds will fail. Giulio Benetti (1): package/util-linux: fix host build failure package/util-linux/util-linux.mk | 1 + 1 file changed, 1 insertion(+) -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Feb 1 23:22:03 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 2 Feb 2022 00:22:03 +0100 Subject: [Buildroot] [URGENT 1/1] package/util-linux: fix host build failure In-Reply-To: <20220201232203.333403-1-giulio.benetti@benettiengineering.com> References: <20220201232203.333403-1-giulio.benetti@benettiengineering.com> Message-ID: <20220201232203.333403-2-giulio.benetti@benettiengineering.com> The UTIL_LINUX_FIX_DISK_UTILS_COMPILE workaround is needed for host building too. So let's add it to HOST_UTIL_LINUX_POST_PATCH_HOOKS. host-util-linux is used a lot, so this patch fixes a lot of future builds. Signed-off-by: Giulio Benetti --- package/util-linux/util-linux.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index e59ef7dadc..5a4ff64d01 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -41,6 +41,7 @@ define UTIL_LINUX_FIX_DISK_UTILS_COMPILE touch $(@D)/disk-utils/raw.8 endef UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE +HOST_UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Feb 1 23:25:00 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 2 Feb 2022 00:25:00 +0100 Subject: [Buildroot] [URGENT 1/1] package/util-linux: fix host build failure In-Reply-To: <20220201232203.333403-2-giulio.benetti@benettiengineering.com> References: <20220201232203.333403-1-giulio.benetti@benettiengineering.com> <20220201232203.333403-2-giulio.benetti@benettiengineering.com> Message-ID: On 02/02/22 00:22, Giulio Benetti wrote: > The UTIL_LINUX_FIX_DISK_UTILS_COMPILE workaround is needed for host > building too. So let's add it to HOST_UTIL_LINUX_POST_PATCH_HOOKS. > host-util-linux is used a lot, so this patch fixes a lot of future > builds. I was too fast... Fixes: http://autobuild.buildroot.net/results/b8c/b8cb40efc036a01802c914544cd4fc29dfd67af6// and others that are coming out. Best regards! -- Giulio Benetti Benetti Engineering sas > Signed-off-by: Giulio Benetti > --- > package/util-linux/util-linux.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk > index e59ef7dadc..5a4ff64d01 100644 > --- a/package/util-linux/util-linux.mk > +++ b/package/util-linux/util-linux.mk > @@ -41,6 +41,7 @@ define UTIL_LINUX_FIX_DISK_UTILS_COMPILE > touch $(@D)/disk-utils/raw.8 > endef > UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE > +HOST_UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE > > HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf > From james.hilliard1 at gmail.com Wed Feb 2 03:06:56 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 1 Feb 2022 20:06:56 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-aioconsole: bump to version 0.4.0 Message-ID: <20220202030656.2175796-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 26a3778756..39ce16f8b2 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 f8b67330e631cfc45a9b2560a6e0fa98 aioconsole-0.3.3.tar.gz -sha256 47df42d9f8cc3995bbe032dd5f01d32cc5b06639e9078bb9b4e3c55b237f5e32 aioconsole-0.3.3.tar.gz +md5 56a1e6542ea3627bdbc67f24abcaa341 aioconsole-0.4.0.tar.gz +sha256 a30ad5276b85dd20a48d235111d0bd26c6bedf7b56d605ffc10ae27124b4b0b4 aioconsole-0.4.0.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 f06d91a550..44857054d4 100644 --- a/package/python-aioconsole/python-aioconsole.mk +++ b/package/python-aioconsole/python-aioconsole.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOCONSOLE_VERSION = 0.3.3 +PYTHON_AIOCONSOLE_VERSION = 0.4.0 PYTHON_AIOCONSOLE_SOURCE = aioconsole-$(PYTHON_AIOCONSOLE_VERSION).tar.gz -PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/dd/f6/bbc451ba96c1e1da6aa253f254b181ceb03272b475b27b481b57865d7d7f +PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/f2/7a/7628ec23f140ffca532c7f630e179503727b755849b5eab15576bbf7d3df 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 Wed Feb 2 03:11:30 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 1 Feb 2022 20:11:30 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-autobahn: bump to version 22.1.1 Message-ID: <20220202031130.2178288-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-autobahn/python-autobahn.hash | 4 ++-- package/python-autobahn/python-autobahn.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-autobahn/python-autobahn.hash b/package/python-autobahn/python-autobahn.hash index 0bbb9112d0..7b963df635 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 1ccd46d938d8b9fed435e9781e54e887 autobahn-21.11.1.tar.gz -sha256 bd6f46315419ca0a5be4109f737410208ad5f19718f67ca6a4a674cc66ca9b18 autobahn-21.11.1.tar.gz +md5 9b0ae4ff164232c952ba01ab3516188e autobahn-22.1.1.tar.gz +sha256 17e1b58b6ae1a63ca7d926b1d71bb9e4fd6b9ac9a1a2277d8ee40e0b61f54746 autobahn-22.1.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 db9e5083d1..df43e9cdf2 100644 --- a/package/python-autobahn/python-autobahn.mk +++ b/package/python-autobahn/python-autobahn.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AUTOBAHN_VERSION = 21.11.1 +PYTHON_AUTOBAHN_VERSION = 22.1.1 PYTHON_AUTOBAHN_SOURCE = autobahn-$(PYTHON_AUTOBAHN_VERSION).tar.gz -PYTHON_AUTOBAHN_SITE = https://files.pythonhosted.org/packages/f1/d3/23fdf1ab0104b1b65d2f7884e923f0526750a59f96334d752afc79cf44ed +PYTHON_AUTOBAHN_SITE = https://files.pythonhosted.org/packages/0e/2a/0b627ad4adf70437b5753462958b3ba5c6802d7664eb4a680e46423659ba PYTHON_AUTOBAHN_LICENSE = MIT PYTHON_AUTOBAHN_LICENSE_FILES = LICENSE PYTHON_AUTOBAHN_CPE_ID_VENDOR = crossbar -- 2.25.1 From james.hilliard1 at gmail.com Wed Feb 2 03:17:09 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 1 Feb 2022 20:17:09 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-cbor2: bump to version 5.4.2.post1 Message-ID: <20220202031709.2181778-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 9910e632a2..8858fc72d3 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 b3a6085ee1a9e11ddec305f7a7bc5956 cbor2-5.4.2.tar.gz -sha256 e283e70b55a049ff364cc5e648fde587e4d9b0e87e4b2664c69e639135e6b3b8 cbor2-5.4.2.tar.gz +md5 a9518fd435d9eafd91063b3bf10d5c5b cbor2-5.4.2.post1.tar.gz +sha256 9cf21d59604b9529d7877c8e0342a2ebaae1a07fe8ff5683dc75fec15847c797 cbor2-5.4.2.post1.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 4cc09a219f..dd007217d1 100644 --- a/package/python-cbor2/python-cbor2.mk +++ b/package/python-cbor2/python-cbor2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CBOR2_VERSION = 5.4.2 +PYTHON_CBOR2_VERSION = 5.4.2.post1 PYTHON_CBOR2_SOURCE = cbor2-$(PYTHON_CBOR2_VERSION).tar.gz -PYTHON_CBOR2_SITE = https://files.pythonhosted.org/packages/d4/ca/b96be94f694155ce58823c38cf8fd1aa620bdc91e2c801713cdb4167b6aa +PYTHON_CBOR2_SITE = https://files.pythonhosted.org/packages/49/74/2b9f9b76e2831f54d70e177a4e602e72cb86441632d1bcc15be1f04a73f6 PYTHON_CBOR2_SETUP_TYPE = setuptools PYTHON_CBOR2_LICENSE = MIT PYTHON_CBOR2_LICENSE_FILES = LICENSE.txt -- 2.25.1 From joel at jms.id.au Wed Feb 2 03:17:45 2022 From: joel at jms.id.au (Joel Stanley) Date: Wed, 2 Feb 2022 13:47:45 +1030 Subject: [Buildroot] [PATCH] board: x86_64: Enable and mount debugfs Message-ID: <20220202031745.448551-1-joel@jms.id.au> Add DEBUG_FS to the kernel options, and modify fstab so it is automatically mounted at boot. This is useful when testing. Signed-off-by: Joel Stanley --- board/qemu/x86_64/linux.config | 1 + board/qemu/x86_64/post-build.sh | 3 +++ 2 files changed, 4 insertions(+) diff --git a/board/qemu/x86_64/linux.config b/board/qemu/x86_64/linux.config index e1d2ce01b004..2ed5c4194560 100644 --- a/board/qemu/x86_64/linux.config +++ b/board/qemu/x86_64/linux.config @@ -50,4 +50,5 @@ CONFIG_EXT4_FS=y CONFIG_AUTOFS4_FS=y CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y +CONFIG_DEBUG_FS=y CONFIG_UNWINDER_FRAME_POINTER=y diff --git a/board/qemu/x86_64/post-build.sh b/board/qemu/x86_64/post-build.sh index bf83a002c2fc..0b27ab2c8074 100755 --- a/board/qemu/x86_64/post-build.sh +++ b/board/qemu/x86_64/post-build.sh @@ -9,3 +9,6 @@ if [ -e ${TARGET_DIR}/etc/inittab ]; then sed -i '/GENERIC_SERIAL/a\ tty1::respawn:/sbin/getty -L tty1 0 vt100 # QEMU graphical window' ${TARGET_DIR}/etc/inittab fi + +# Mount debugfs on boot +echo "debugfs /sys/kernel/debug debugfs defaults 0 0" >> ${TARGET_DIR}/etc/fstab -- 2.34.1 From james.hilliard1 at gmail.com Wed Feb 2 03:20:25 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 1 Feb 2022 20:20:25 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-charset-normalizer: bump to version 2.0.11 Message-ID: <20220202032025.2182903-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 eb3b67598b..3c6e58a616 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 eaed8aaf95d7e3bc2daefcd8d0f03458 charset-normalizer-2.0.10.tar.gz -sha256 876d180e9d7432c5d1dfd4c5d26b72f099d503e8fcc0feb7532c9289be60fcbd charset-normalizer-2.0.10.tar.gz +md5 2abe3754fef25c99799a518cb83a81ae charset-normalizer-2.0.11.tar.gz +sha256 98398a9d69ee80548c762ba991a4728bfc3836768ed226b3945908d1a688371c charset-normalizer-2.0.11.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 33f2e132de..0a96a6b078 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.10 +PYTHON_CHARSET_NORMALIZER_VERSION = 2.0.11 PYTHON_CHARSET_NORMALIZER_SOURCE = charset-normalizer-$(PYTHON_CHARSET_NORMALIZER_VERSION).tar.gz -PYTHON_CHARSET_NORMALIZER_SITE = https://files.pythonhosted.org/packages/48/44/76b179e0d1afe6e6a91fd5661c284f60238987f3b42b676d141d01cd5b97 +PYTHON_CHARSET_NORMALIZER_SITE = https://files.pythonhosted.org/packages/e8/e8/b6cfd28fb430b2ec9923ad0147025bf8bbdf304b1eb3039b69f1ce44ed6e 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 Wed Feb 2 03:31:44 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 1 Feb 2022 20:31:44 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-cssutils: bump to version 2.3.0 Message-ID: <20220202033144.2187501-1-james.hilliard1@gmail.com> Drop python2 support. Add new host-python-setuptools-scm dependency. Signed-off-by: James Hilliard --- package/python-cssutils/Config.in | 4 ++-- package/python-cssutils/python-cssutils.hash | 6 +++--- package/python-cssutils/python-cssutils.mk | 5 +++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/package/python-cssutils/Config.in b/package/python-cssutils/Config.in index 74de742c31..141561901c 100644 --- a/package/python-cssutils/Config.in +++ b/package/python-cssutils/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_PYTHON_CSSUTILS bool "python-cssutils" - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime help A CSS Cascading Style Sheets library for Python. diff --git a/package/python-cssutils/python-cssutils.hash b/package/python-cssutils/python-cssutils.hash index 393daffb8b..e22dde6e56 100644 --- a/package/python-cssutils/python-cssutils.hash +++ b/package/python-cssutils/python-cssutils.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/cssutils/json -md5 dc66d96c2d78f1687f59ac412fe9d318 cssutils-1.0.2.tar.gz -sha256 a2fcf06467553038e98fea9cfe36af2bf14063eb147a70958cfcaa8f5786acaf cssutils-1.0.2.tar.gz +md5 71955999f595e4b0eb5a218d614652ca cssutils-2.3.0.tar.gz +sha256 b2d3b16047caae82e5c590036935bafa1b621cf45c2f38885af4be4838f0fd00 cssutils-2.3.0.tar.gz # Locally computed sha256 checksums -sha256 03c570a068086ee577dcd795519ea93462b2ed2fcb6dcc4dfce56a71a2fd6e5a COPYING.LESSER +sha256 03c570a068086ee577dcd795519ea93462b2ed2fcb6dcc4dfce56a71a2fd6e5a COPYING.LESSER diff --git a/package/python-cssutils/python-cssutils.mk b/package/python-cssutils/python-cssutils.mk index 513c3a87de..09c2ca44d6 100644 --- a/package/python-cssutils/python-cssutils.mk +++ b/package/python-cssutils/python-cssutils.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_CSSUTILS_VERSION = 1.0.2 +PYTHON_CSSUTILS_VERSION = 2.3.0 PYTHON_CSSUTILS_SOURCE = cssutils-$(PYTHON_CSSUTILS_VERSION).tar.gz -PYTHON_CSSUTILS_SITE = https://files.pythonhosted.org/packages/5c/0b/c5f29d29c037e97043770b5e7c740b6252993e4b57f029b3cd03c78ddfec +PYTHON_CSSUTILS_SITE = https://files.pythonhosted.org/packages/f5/c6/878abb7df855938a067b762a688da3fcdfea4e41c2399feaf80369b61ed7 PYTHON_CSSUTILS_LICENSE = LGPL-3.0+ PYTHON_CSSUTILS_LICENSE_FILES = COPYING.LESSER PYTHON_CSSUTILS_SETUP_TYPE = setuptools +PYTHON_CSSUTILS_DEPENDENCIES = host-python-setuptools-scm $(eval $(python-package)) -- 2.25.1 From james.hilliard1 at gmail.com Wed Feb 2 03:40:36 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 1 Feb 2022 20:40:36 -0700 Subject: [Buildroot] [PATCH 1/1] package/python{3}-cython: bump to version 0.29.27 Message-ID: <20220202034036.2188757-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 b07f171c25..9c5f1225cf 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 971c9708dd5269180868fc0af986084c Cython-0.29.26.tar.gz -sha256 af377d543a762867da11fcf6e558f7a4a535ff8693f30cce123fab10c00fa312 Cython-0.29.26.tar.gz +md5 2b2ba86abcf823985935d37f5e43b19a Cython-0.29.27.tar.gz +sha256 c6a442504db906dfc13a480e96850cced994ecdc076bcf492c43515b78f70da2 Cython-0.29.27.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 cf41086dea..89708cb9a8 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.26 +PYTHON_CYTHON_VERSION = 0.29.27 PYTHON_CYTHON_SOURCE = Cython-$(PYTHON_CYTHON_VERSION).tar.gz -PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/bc/fa/8604d92ef753e0036d807f1b3179813ab2fa283e3b19c926e11673c8205b +PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/eb/46/80dd9e5ad67ebc766ff3229901bde4a7bc82907efe93cd7007c4df458dd5 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 da159cedc8..56d88b5bf7 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.26 +PYTHON3_CYTHON_VERSION = 0.29.27 PYTHON3_CYTHON_SOURCE = Cython-$(PYTHON3_CYTHON_VERSION).tar.gz -PYTHON3_CYTHON_SITE = https://files.pythonhosted.org/packages/bc/fa/8604d92ef753e0036d807f1b3179813ab2fa283e3b19c926e11673c8205b +PYTHON3_CYTHON_SITE = https://files.pythonhosted.org/packages/eb/46/80dd9e5ad67ebc766ff3229901bde4a7bc82907efe93cd7007c4df458dd5 PYTHON3_CYTHON_SETUP_TYPE = setuptools PYTHON3_CYTHON_LICENSE = Apache-2.0 PYTHON3_CYTHON_LICENSE_FILES = COPYING.txt LICENSE.txt -- 2.25.1 From james.hilliard1 at gmail.com Wed Feb 2 03:47:55 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 1 Feb 2022 20:47:55 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-fonttools: bump to version 4.29.1 Message-ID: <20220202034755.2191344-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 1f9b546c23..df0bdf980d 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 4a894b3cd108432f7636849b4026b771 fonttools-4.28.5.zip -sha256 545c05d0f7903a863c2020e07b8f0a57517f2c40d940bded77076397872d14ca fonttools-4.28.5.zip +md5 7fc490291991da874911fed1e743362d fonttools-4.29.1.zip +sha256 2b18a172120e32128a80efee04cff487d5d140fe7d817deb648b2eee023a40e4 fonttools-4.29.1.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 c5c605161b..d5c4cdf8e5 100644 --- a/package/python-fonttools/python-fonttools.mk +++ b/package/python-fonttools/python-fonttools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FONTTOOLS_VERSION = 4.28.5 +PYTHON_FONTTOOLS_VERSION = 4.29.1 PYTHON_FONTTOOLS_SOURCE = fonttools-$(PYTHON_FONTTOOLS_VERSION).zip -PYTHON_FONTTOOLS_SITE = https://files.pythonhosted.org/packages/ce/1b/d4cd86f4e6cbd54a3c4f807015b116299bcd6d6587ea0645d88ba9d932bb +PYTHON_FONTTOOLS_SITE = https://files.pythonhosted.org/packages/2d/4c/49ba863863502bb9fea19d8bd04a527da336b4a2698c8a0c7129e9cc2716 PYTHON_FONTTOOLS_SETUP_TYPE = setuptools PYTHON_FONTTOOLS_LICENSE = MIT PYTHON_FONTTOOLS_LICENSE_FILES = LICENSE -- 2.25.1 From james.hilliard1 at gmail.com Wed Feb 2 03:58:47 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 1 Feb 2022 20:58:47 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-janus: bump to version 1.0.0 Message-ID: <20220202035847.2194218-1-james.hilliard1@gmail.com> Add new python-typing-extensions runtime dependency. Signed-off-by: James Hilliard --- package/python-janus/Config.in | 1 + package/python-janus/python-janus.hash | 4 ++-- package/python-janus/python-janus.mk | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/python-janus/Config.in b/package/python-janus/Config.in index a1ba0463f9..38e4b7217f 100644 --- a/package/python-janus/Config.in +++ b/package/python-janus/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_JANUS bool "python-janus" depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime help Mixed sync-async queue to interoperate between asyncio tasks and classic threads. diff --git a/package/python-janus/python-janus.hash b/package/python-janus/python-janus.hash index 7d914389d2..7f7ce35caa 100644 --- a/package/python-janus/python-janus.hash +++ b/package/python-janus/python-janus.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/janus/json -md5 dad6a03e7664cb800ce45ef8bcf12439 janus-0.6.1.tar.gz -sha256 4712e0ef75711fe5947c2db855bc96221a9a03641b52e5ae8e25c2b705dd1d0c janus-0.6.1.tar.gz +md5 2d8c0b884c14f18fc5223858eb16461e janus-1.0.0.tar.gz +sha256 df976f2cdcfb034b147a2d51edfc34ff6bfb12d4e2643d3ad0e10de058cb1612 janus-1.0.0.tar.gz # Locally computed sha256 checksums sha256 8b177cccb6ddec12a9fc97bd49e7e2bbcd92464625624bd8bdbfad799ae606e9 LICENSE diff --git a/package/python-janus/python-janus.mk b/package/python-janus/python-janus.mk index 2b08733c18..43df87870d 100644 --- a/package/python-janus/python-janus.mk +++ b/package/python-janus/python-janus.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_JANUS_VERSION = 0.6.1 +PYTHON_JANUS_VERSION = 1.0.0 PYTHON_JANUS_SOURCE = janus-$(PYTHON_JANUS_VERSION).tar.gz -PYTHON_JANUS_SITE = https://files.pythonhosted.org/packages/7c/1b/8769c2dca84dd8ca92e48b14750c7106ff4313df4fee651dbc3cd9e345a9 +PYTHON_JANUS_SITE = https://files.pythonhosted.org/packages/b8/a8/facab7275d7d3d2032f375843fe46fad1cfa604a108b5a238638d4615bdc PYTHON_JANUS_SETUP_TYPE = setuptools PYTHON_JANUS_LICENSE = Apache-2.0 PYTHON_JANUS_LICENSE_FILES = LICENSE -- 2.25.1 From james.hilliard1 at gmail.com Wed Feb 2 04:06:19 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 1 Feb 2022 21:06:19 -0700 Subject: [Buildroot] [PATCH 1/1] package/python{3}-pycryptodomex: bump to version 3.14.0 Message-ID: <20220202040619.2197495-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-pycryptodomex/python-pycryptodomex.hash | 4 ++-- package/python-pycryptodomex/python-pycryptodomex.mk | 4 ++-- package/python3-pycryptodomex/python3-pycryptodomex.mk | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-pycryptodomex/python-pycryptodomex.hash b/package/python-pycryptodomex/python-pycryptodomex.hash index 9512f185a8..920cec2518 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 dcf0d13044c700410bdce31a5afdf6d0 pycryptodomex-3.13.0.tar.gz -sha256 63443230247837dd03c5d4028cae5cb2e6793a9ae110e321798bee48a04ff3e9 pycryptodomex-3.13.0.tar.gz +md5 18f571832bbfbf0f4516ccef009f2dfb pycryptodomex-3.14.0.tar.gz +sha256 2d8bda8f949b79b78b293706aa7fc1e5c171c62661252bfdd5d12c70acd03282 pycryptodomex-3.14.0.tar.gz # Locally computed sha256 checksums sha256 4e04660d77c1c64e89d79537919fb8240fa21484a7e3db29f358b2c7f84ea073 LICENSE.rst sha256 8e563c767164faa0831a333b57d23d4311cf566eb1b15d93250f4606be4eb549 Doc/LEGAL/COPYRIGHT.pycrypto diff --git a/package/python-pycryptodomex/python-pycryptodomex.mk b/package/python-pycryptodomex/python-pycryptodomex.mk index 92780327a1..7821052b43 100644 --- a/package/python-pycryptodomex/python-pycryptodomex.mk +++ b/package/python-pycryptodomex/python-pycryptodomex.mk @@ -5,9 +5,9 @@ ################################################################################ # Please keep in sync with package/python3-pycryptodomex/python3-pycryptodomex.mk -PYTHON_PYCRYPTODOMEX_VERSION = 3.13.0 +PYTHON_PYCRYPTODOMEX_VERSION = 3.14.0 PYTHON_PYCRYPTODOMEX_SOURCE = pycryptodomex-$(PYTHON_PYCRYPTODOMEX_VERSION).tar.gz -PYTHON_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/7a/21/f399ba8dfd6e40eee444151af3237af22788b8b16077c75ec0419125f619 +PYTHON_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/a6/b3/a5e59cd3ad65d4dc470a3a63381d0495885cf1ac7659c83c6bc9e9e79df6 PYTHON_PYCRYPTODOMEX_SETUP_TYPE = setuptools PYTHON_PYCRYPTODOMEX_LICENSE = \ BSD-2-Clause, \ diff --git a/package/python3-pycryptodomex/python3-pycryptodomex.mk b/package/python3-pycryptodomex/python3-pycryptodomex.mk index 06a46cdf63..35469df85a 100644 --- a/package/python3-pycryptodomex/python3-pycryptodomex.mk +++ b/package/python3-pycryptodomex/python3-pycryptodomex.mk @@ -5,9 +5,9 @@ ################################################################################ # Please keep in sync with package/python-pycryptodomex/python-pycryptodomex.mk -PYTHON3_PYCRYPTODOMEX_VERSION = 3.13.0 +PYTHON3_PYCRYPTODOMEX_VERSION = 3.14.0 PYTHON3_PYCRYPTODOMEX_SOURCE = pycryptodomex-$(PYTHON3_PYCRYPTODOMEX_VERSION).tar.gz -PYTHON3_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/7a/21/f399ba8dfd6e40eee444151af3237af22788b8b16077c75ec0419125f619 +PYTHON3_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/a6/b3/a5e59cd3ad65d4dc470a3a63381d0495885cf1ac7659c83c6bc9e9e79df6 PYTHON3_PYCRYPTODOMEX_SETUP_TYPE = setuptools PYTHON3_PYCRYPTODOMEX_LICENSE = \ BSD-2-Clause, \ -- 2.25.1 From james.hilliard1 at gmail.com Wed Feb 2 04:11:15 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 1 Feb 2022 21:11:15 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-pyparsing: bump to version 3.0.7 Message-ID: <20220202041115.2198598-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 a21baf46e5..1e56e878a1 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 2f5fad6c8e99ac2562ab08ad9e45b195 pyparsing-3.0.6.tar.gz -sha256 d9bdec0013ef1eb5a84ab39a3b3868911598afa494f5faa038647101504e2b81 pyparsing-3.0.6.tar.gz +md5 9d38774991175444e21a3dfa865876cc pyparsing-3.0.7.tar.gz +sha256 18ee9022775d270c55187733956460083db60b37d0d0fb357445f3094eed3eea pyparsing-3.0.7.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 b6ab353a6d..e33541bdb7 100644 --- a/package/python-pyparsing/python-pyparsing.mk +++ b/package/python-pyparsing/python-pyparsing.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYPARSING_VERSION = 3.0.6 +PYTHON_PYPARSING_VERSION = 3.0.7 PYTHON_PYPARSING_SOURCE = pyparsing-$(PYTHON_PYPARSING_VERSION).tar.gz -PYTHON_PYPARSING_SITE = https://files.pythonhosted.org/packages/ab/61/1a1613e3dcca483a7aa9d446cb4614e6425eb853b90db131c305bd9674cb +PYTHON_PYPARSING_SITE = https://files.pythonhosted.org/packages/d6/60/9bed18f43275b34198eb9720d4c1238c68b3755620d20df0afd89424d32b PYTHON_PYPARSING_LICENSE = MIT PYTHON_PYPARSING_LICENSE_FILES = LICENSE PYTHON_PYPARSING_SETUP_TYPE = setuptools -- 2.25.1 From james.hilliard1 at gmail.com Wed Feb 2 04:20:24 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 1 Feb 2022 21:20:24 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-setuptools-scm: bump to version 6.4.2 Message-ID: <20220202042024.2202751-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-setuptools-scm/python-setuptools-scm.hash | 4 ++-- package/python-setuptools-scm/python-setuptools-scm.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-setuptools-scm/python-setuptools-scm.hash b/package/python-setuptools-scm/python-setuptools-scm.hash index 22b9afd2c2..934c505442 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 32918d8ac566360c21411e0b3556c695 setuptools_scm-6.3.2.tar.gz -sha256 a49aa8081eeb3514eb9728fa5040f2eaa962d6c6f4ec9c32f6c1fba88f88a0f2 setuptools_scm-6.3.2.tar.gz +md5 b4e02bf8e62ed49142ea7b42a68671d7 setuptools_scm-6.4.2.tar.gz +sha256 6833ac65c6ed9711a4d5d2266f8024cfa07c533a0e55f4c12f6eff280a5a9e30 setuptools_scm-6.4.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 b2990a56cb..8c5229e1a6 100644 --- a/package/python-setuptools-scm/python-setuptools-scm.mk +++ b/package/python-setuptools-scm/python-setuptools-scm.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SETUPTOOLS_SCM_VERSION = 6.3.2 +PYTHON_SETUPTOOLS_SCM_VERSION = 6.4.2 PYTHON_SETUPTOOLS_SCM_SOURCE = setuptools_scm-$(PYTHON_SETUPTOOLS_SCM_VERSION).tar.gz -PYTHON_SETUPTOOLS_SCM_SITE = https://files.pythonhosted.org/packages/4b/0d/ecb9595fae02467edba5023eb8a23c688d2b438a6a8d1a9e2b8649faf23d +PYTHON_SETUPTOOLS_SCM_SITE = https://files.pythonhosted.org/packages/4a/18/477d3d9eb2f88230ff2a41de9d8ffa3554b706352787d289f57f76bfba0b PYTHON_SETUPTOOLS_SCM_LICENSE = MIT PYTHON_SETUPTOOLS_SCM_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_SCM_SETUP_TYPE = setuptools -- 2.25.1 From james.hilliard1 at gmail.com Wed Feb 2 04:38:30 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 1 Feb 2022 21:38:30 -0700 Subject: [Buildroot] [PATCH 1/1] package/python3-setuptools: bump to version 60.6.0 Message-ID: <20220202043830.2211307-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-setuptools/59.8.0/python-setuptools.hash | 4 ---- .../{59.8.0 => 60.6.0}/0001-add-executable.patch | 0 package/python-setuptools/60.6.0/python-setuptools.hash | 4 ++++ package/python-setuptools/python-setuptools.mk | 4 ++-- package/python3-setuptools/0001-add-executable.patch | 2 +- package/python3-setuptools/python3-setuptools.hash | 2 +- package/python3-setuptools/python3-setuptools.mk | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 package/python-setuptools/59.8.0/python-setuptools.hash rename package/python-setuptools/{59.8.0 => 60.6.0}/0001-add-executable.patch (100%) create mode 100644 package/python-setuptools/60.6.0/python-setuptools.hash diff --git a/package/python-setuptools/59.8.0/python-setuptools.hash b/package/python-setuptools/59.8.0/python-setuptools.hash deleted file mode 100644 index 285919639d..0000000000 --- a/package/python-setuptools/59.8.0/python-setuptools.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From https://pypi.org/pypi/setuptools/json -md5 675f2089d970bf0bbfc3f49c80e4c7c3 setuptools-59.8.0.tar.gz -sha256 09980778aa734c3037a47997f28d6db5ab18bdf2af0e49f719bfc53967fd2e82 setuptools-59.8.0.tar.gz -sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE diff --git a/package/python-setuptools/59.8.0/0001-add-executable.patch b/package/python-setuptools/60.6.0/0001-add-executable.patch similarity index 100% rename from package/python-setuptools/59.8.0/0001-add-executable.patch rename to package/python-setuptools/60.6.0/0001-add-executable.patch diff --git a/package/python-setuptools/60.6.0/python-setuptools.hash b/package/python-setuptools/60.6.0/python-setuptools.hash new file mode 100644 index 0000000000..734cb4d580 --- /dev/null +++ b/package/python-setuptools/60.6.0/python-setuptools.hash @@ -0,0 +1,4 @@ +# From https://pypi.org/pypi/setuptools/json +md5 392e91d7e244998c586c88da2cf881d3 setuptools-60.6.0.tar.gz +sha256 eb83b1012ae6bf436901c2a2cee35d45b7260f31fd4b65fd1e50a9f99c11d7f8 setuptools-60.6.0.tar.gz +sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk index d83336b909..15912d96f5 100644 --- a/package/python-setuptools/python-setuptools.mk +++ b/package/python-setuptools/python-setuptools.mk @@ -9,9 +9,9 @@ ifeq ($(BR2_PACKAGE_PYTHON3),y) # Please keep in sync with # package/python3-setuptools/python3-setuptools.mk -PYTHON_SETUPTOOLS_VERSION = 59.8.0 +PYTHON_SETUPTOOLS_VERSION = 60.6.0 PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON3_SETUPTOOLS_VERSION).tar.gz -PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/ef/75/2bc7bef4d668f9caa9c6ed3f3187989922765403198243040d08d2a52725 +PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/8f/89/9fec81ec84737c925a1ee992af2c6c7153aec4051c26afeadd6b822354d2 else # Python PYTHON_SETUPTOOLS_VERSION = 44.0.0 PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).zip diff --git a/package/python3-setuptools/0001-add-executable.patch b/package/python3-setuptools/0001-add-executable.patch index 6fc7595a8d..9d608239bc 120000 --- a/package/python3-setuptools/0001-add-executable.patch +++ b/package/python3-setuptools/0001-add-executable.patch @@ -1 +1 @@ -../python-setuptools/59.8.0/0001-add-executable.patch \ No newline at end of file +../python-setuptools/60.6.0/0001-add-executable.patch \ No newline at end of file diff --git a/package/python3-setuptools/python3-setuptools.hash b/package/python3-setuptools/python3-setuptools.hash index 91d8bc0887..9fb96015aa 120000 --- a/package/python3-setuptools/python3-setuptools.hash +++ b/package/python3-setuptools/python3-setuptools.hash @@ -1 +1 @@ -../python-setuptools/59.8.0/python-setuptools.hash \ No newline at end of file +../python-setuptools/60.6.0/python-setuptools.hash \ No newline at end of file diff --git a/package/python3-setuptools/python3-setuptools.mk b/package/python3-setuptools/python3-setuptools.mk index f4dae2d15d..55a01dba01 100644 --- a/package/python3-setuptools/python3-setuptools.mk +++ b/package/python3-setuptools/python3-setuptools.mk @@ -6,9 +6,9 @@ # Please keep in sync with # package/python-setuptools/python-setuptools.mk -PYTHON3_SETUPTOOLS_VERSION = 59.8.0 +PYTHON3_SETUPTOOLS_VERSION = 60.6.0 PYTHON3_SETUPTOOLS_SOURCE = setuptools-$(PYTHON3_SETUPTOOLS_VERSION).tar.gz -PYTHON3_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/ef/75/2bc7bef4d668f9caa9c6ed3f3187989922765403198243040d08d2a52725 +PYTHON3_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/8f/89/9fec81ec84737c925a1ee992af2c6c7153aec4051c26afeadd6b822354d2 PYTHON3_SETUPTOOLS_LICENSE = MIT PYTHON3_SETUPTOOLS_LICENSE_FILES = LICENSE PYTHON3_SETUPTOOLS_CPE_ID_VENDOR = python -- 2.25.1 From thomas.petazzoni at bootlin.com Wed Feb 2 07:02:24 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 02 Feb 2022 07:02:24 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-02-01 Message-ID: <20220202070229.B33E540424@smtp2.osuosl.org> Hello, Autobuild statistics for 2022-02-01 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 66 | 9 | 0 | 75 | 2021.11.x | 17 | 0 | 0 | 17 | master | 114 | 42 | 0 | 156 | Classification of failures by reason for master ----------------------------------------------- rygel-0.40.2 | 6 iproute2-5.16.0 | 4 guile-3.0.7 | 3 bat-0.18.3 | 2 frr-8.1 | 2 mongodb-4.2.18 | 2 mongrel2-1.13.0 | 2 pulseview-0.4.2 | 2 tesseract-ocr-5.0.1 | 2 bluez5_utils-5.63 | 1 boinc-7.18.1 | 1 efl-1.26.1 | 1 google-breakpad-7515ab13768... | 1 host-util-linux-2.37.3 | 1 libblockdev-2.25 | 1 libuhttpd-3.14.1 | 1 nodejs-14.18.3 | 1 opencv4-4.5.5 | 1 qt5base-5.15.2 | 1 resiprocate-1.12.0 | 1 rtorrent-0.9.8 | 1 sg3_utils-1.47 | 1 suricata-6.0.4 | 1 unknown | 1 vlc-3.0.16 | 1 xml-security-c-2.0.4 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | bat-0.18.3 | NOK | http://autobuild.buildroot.net/results/4e5d09720e1041b661abbab300d136c10c5a8d7d | i586 | bat-0.18.3 | NOK | http://autobuild.buildroot.net/results/b28ea9e9bb361171c74ae2a0139d318a5127d987 | mips | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/f28fe58f4a61e472eb9d927e1ac5c3ce91bcedf9 | arm | boinc-7.18.1 | NOK | http://autobuild.buildroot.net/results/8e6e3563274622821105046328c66f3e10c76192 | arm | efl-1.26.1 | NOK | http://autobuild.buildroot.net/results/bd077e01708f1e389dc95ce3d95e75e3f89ecf1f | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/baeefc4afec26fc6fc1c0ea4e0664fd014519643 | microblazeel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/da6473439f4cbfa89b5b391fd704044e59ff970a | mipsel | google-breakpad-7515ab13768... | NOK | http://autobuild.buildroot.net/results/22ea26b16268cbc6e213a1a8e384e97bd20ab822 | powerpc64le | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/6b5721c2ac7b4bef05e2f1c0d09312c2c1a941ef | ORPH riscv32 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/a6a68c18fb895fabc86fe80b5f2826785de2c167 | ORPH powerpc64le | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/a8d2d6ae17a05355c92df1081e4326f75efb41e9 | ORPH arm | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/f397fc286a0d4b11b09dee3a850b64b1fe8f437f | ORPH riscv64 | iproute2-5.16.0 | NOK | http://autobuild.buildroot.net/results/57657fda6740cc804f4409f31089dc7c40f74a4e | x86_64 | iproute2-5.16.0 | NOK | http://autobuild.buildroot.net/results/f99bb3722ea34b5bc6e2b813df87e4de472769f6 | arm | iproute2-5.16.0 | NOK | http://autobuild.buildroot.net/results/a7f294c6904cc081be8d015ed392260f77a0c188 | riscv64 | iproute2-5.16.0 | NOK | http://autobuild.buildroot.net/results/9394abc10a7e836710ddae6562eafd72bfb8263e | aarch64 | libblockdev-2.25 | NOK | http://autobuild.buildroot.net/results/8f9ca895cb07014804130a7ccbcb758b1d519470 | ORPH m68k | libuhttpd-3.14.1 | NOK | http://autobuild.buildroot.net/results/491b279f6029aec7fa7b9d82304def42e883177b | arm | mongodb-4.2.18 | NOK | http://autobuild.buildroot.net/results/d4b0a6f91954c307b7660612497ad90db72f4b69 | arm | mongodb-4.2.18 | NOK | http://autobuild.buildroot.net/results/3461e9c2bfe6dfe2c041d4c551a51a653bd03c06 | arm | mongrel2-1.13.0 | NOK | http://autobuild.buildroot.net/results/04aa95fc8d4edcfbbbfc5bd5d5bf93a7119a9f0b | mips | mongrel2-1.13.0 | NOK | http://autobuild.buildroot.net/results/9627c426d98fdc582f35b13996b1892f098bcad2 | mipsel | nodejs-14.18.3 | NOK | http://autobuild.buildroot.net/results/8996cc747d90b5d7d15c93c09ba3ae3981f34af6 | powerpc | opencv4-4.5.5 | NOK | http://autobuild.buildroot.net/results/90787c5d8a492df662f8c7b2ee5df95184309cf6 | xtensa | pulseview-0.4.2 | NOK | http://autobuild.buildroot.net/results/18d39de9f2df7114eb992ea57efa58547d7247fe | aarch64 | pulseview-0.4.2 | NOK | http://autobuild.buildroot.net/results/47fe7f2c5dee593b19461e830b4fd76517a7c0eb | riscv64 | qt5base-5.15.2 | NOK | http://autobuild.buildroot.net/results/a4aaf0971377a20f6f4893d482fbe14ad06d8e76 | arm | resiprocate-1.12.0 | NOK | http://autobuild.buildroot.net/results/ed249c8a59a12bbfff470370867d517c6bdc2933 | ORPH i586 | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/158e32c11f8b06670973abc7b9603f2f4f77beb4 | ORPH mips64el | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/b1fa6aec6bad3d087239e29a8b864921718f5b6f | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/2261838c4bebad936329e90fc829f5b029cf1b39 | powerpc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/650e064bd0f5661f5bf85ae147930c5f8ca60451 | riscv64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/2379f2da589b44edfac9816648e2a3d7916491af | powerpc64le | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/12f0cea0a844e8774a05e31c0ce8b3bb2efd9484 | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/d40e5f87411e208669dedb64d93bd96d4273fc6b | m68k | sg3_utils-1.47 | NOK | http://autobuild.buildroot.net/results/5038411b9e8907ee88048d6010ec75c8f53c4ae9 | arm | suricata-6.0.4 | NOK | http://autobuild.buildroot.net/results/f707c5e3119379e41913f207708fc61178d437b2 | arm | tesseract-ocr-5.0.1 | NOK | http://autobuild.buildroot.net/results/83218b7d248ca294be80fa6b7c0cfb542c9b326e | arm | tesseract-ocr-5.0.1 | NOK | http://autobuild.buildroot.net/results/bfae8b8897353147370535a46c8d7b43a469da35 | arm | unknown | NOK | http://autobuild.buildroot.net/results/c8478dc96499b276236cbf7de35d8f44239d6bda | sh4 | vlc-3.0.16 | NOK | http://autobuild.buildroot.net/results/4eb47ace0d96063e94d58636e331f0a507fb6136 | arm | xml-security-c-2.0.4 | NOK | http://autobuild.buildroot.net/results/549cde069a1492dc87435a4af155e51d3c998b0d | Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 3 glib-networking-2.66.0 | 1 host-go-1.16.13 | 1 monkey-f54856ce250c4e257354... | 1 ndisc6-1.0.4 | 1 openldap-2.4.59 | 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/3e2b499e602b0ad5e7d3ff0f8fb33b857863d562 | ORPH mips64el | host-go-1.16.13 | NOK | http://autobuild.buildroot.net/results/8a5ab390afef75ee7c7c88f03161174928948adf | m68k | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/8fb5e47e890ae0a2b83a51662a50af73323ccb7f | x86_64 | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/52b828d3aa3ee5aa747f76a476457c81ce0ab526 | arm | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/7308662ee2faf740de09342279ef66efec2f0960 | microblazeel | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/0f78f13a13c8b77b6abc0735abb2a83557c8ef86 | arm | ndisc6-1.0.4 | NOK | http://autobuild.buildroot.net/results/ab457340d8cc12cced36300b770ce3c33d34d944 | ORPH riscv32 | openldap-2.4.59 | NOK | http://autobuild.buildroot.net/results/980c56bdc7678f10ea1ae1c0acf88fa9ed573e1d | nios2 | unknown | NOK | http://autobuild.buildroot.net/results/1b41a2394519e63f1fc6629a7771611426864247 | -- http://autobuild.buildroot.net From asafka7 at gmail.com Wed Feb 2 07:33:38 2022 From: asafka7 at gmail.com (Asaf Kahlon) Date: Wed, 2 Feb 2022 09:33:38 +0200 Subject: [Buildroot] [PATCH 1/1] package/{libuv, uvw}: bump to versions 1.43.0, 2.11.0_libuv_v1.43 Message-ID: <20220202073338.106855-1-asafka7@gmail.com> Signed-off-by: Asaf Kahlon --- package/libuv/libuv.hash | 2 +- package/libuv/libuv.mk | 2 +- package/uvw/uvw.hash | 2 +- package/uvw/uvw.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libuv/libuv.hash b/package/libuv/libuv.hash index 172ef1f168..1874aa344c 100644 --- a/package/libuv/libuv.hash +++ b/package/libuv/libuv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 371e5419708f6aaeb8656671f89400b92a9bba6443369af1bb70bcd6e4b3c764 libuv-1.42.0.tar.gz +sha256 9e27825a55279de69a7c43e42d509fd1337c9bece2547c761e91a1592e91cc4d libuv-1.43.0.tar.gz sha256 6d20216ae022fbeed23916f48508fd807ece3d8464992330643b0e64e5c0c24b LICENSE diff --git a/package/libuv/libuv.mk b/package/libuv/libuv.mk index 9fe775951d..ed51fc92f9 100644 --- a/package/libuv/libuv.mk +++ b/package/libuv/libuv.mk @@ -6,7 +6,7 @@ # When bumping libuv, check if a new version of uvw is available # and bump it too. -LIBUV_VERSION = 1.42.0 +LIBUV_VERSION = 1.43.0 LIBUV_SITE = $(call github,libuv,libuv,v$(LIBUV_VERSION)) LIBUV_DEPENDENCIES = host-pkgconf LIBUV_INSTALL_STAGING = YES diff --git a/package/uvw/uvw.hash b/package/uvw/uvw.hash index 5f7521c8b3..564c0980f3 100644 --- a/package/uvw/uvw.hash +++ b/package/uvw/uvw.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 30b0ba97a94d5e652490c6b1b32c95e608263f21cf3bc606308d09b3e3a114bf uvw-2.10.0_libuv_v1.42.tar.gz +sha256 3af4efa2842299490ec764f2148f85f4426dfb4f8d8aa436cc2d049db2b7b514 uvw-2.11.0_libuv_v1.43.tar.gz sha256 5de32af2469480cf3261c9781962e0887366666ba8ee1f4a32c386c77fc50c88 LICENSE diff --git a/package/uvw/uvw.mk b/package/uvw/uvw.mk index 9c15d536cb..161c40849d 100644 --- a/package/uvw/uvw.mk +++ b/package/uvw/uvw.mk @@ -4,7 +4,7 @@ # ################################################################################ -UVW_VERSION = 2.10.0_libuv_v1.42 +UVW_VERSION = 2.11.0_libuv_v1.43 UVW_SITE = $(call github,skypjack,uvw,v$(UVW_VERSION)) UVW_INSTALL_STAGING = YES UVW_INSTALL_TARGET = NO -- 2.32.0 From arnout at mind.be Wed Feb 2 07:41:34 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 2 Feb 2022 08:41:34 +0100 Subject: [Buildroot] [URGENT 1/1] package/util-linux: fix host build failure In-Reply-To: <20220201232203.333403-2-giulio.benetti@benettiengineering.com> References: <20220201232203.333403-1-giulio.benetti@benettiengineering.com> <20220201232203.333403-2-giulio.benetti@benettiengineering.com> Message-ID: On 02/02/2022 00:22, Giulio Benetti wrote: > The UTIL_LINUX_FIX_DISK_UTILS_COMPILE workaround is needed for host > building too. So let's add it to HOST_UTIL_LINUX_POST_PATCH_HOOKS. > host-util-linux is used a lot, so this patch fixes a lot of future > builds. Darn, I tested that, both with and without BR2_PACKAGE_HOST_UTIL_LINUX set. I don't understand what went wrong in my test... Anyway, applied to master, thanks. Regards, Arnout > > Signed-off-by: Giulio Benetti > --- > package/util-linux/util-linux.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk > index e59ef7dadc..5a4ff64d01 100644 > --- a/package/util-linux/util-linux.mk > +++ b/package/util-linux/util-linux.mk > @@ -41,6 +41,7 @@ define UTIL_LINUX_FIX_DISK_UTILS_COMPILE > touch $(@D)/disk-utils/raw.8 > endef > UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE > +HOST_UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE > > HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf > From fontaine.fabrice at gmail.com Wed Feb 2 07:52:28 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 2 Feb 2022 08:52:28 +0100 Subject: [Buildroot] [PATCH 1/1] package/domoticz: bump to version 2022.01 Message-ID: <20220202075228.1187021-1-fontaine.fabrice@gmail.com> https://github.com/domoticz/domoticz/blob/2022.1/History.txt Signed-off-by: Fabrice Fontaine --- package/domoticz/domoticz.hash | 2 +- package/domoticz/domoticz.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/domoticz/domoticz.hash b/package/domoticz/domoticz.hash index dcd5bead1e..18bf57b7e0 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 b7faf959c4f1dbfec3b0c17ab495f29b3d1437bc2251579c5252be82247e7ff9 domoticz-2022.1-br1.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 License.txt diff --git a/package/domoticz/domoticz.mk b/package/domoticz/domoticz.mk index f142791830..5edc10e8d8 100644 --- a/package/domoticz/domoticz.mk +++ b/package/domoticz/domoticz.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOMOTICZ_VERSION = 2021.1 +DOMOTICZ_VERSION = 2022.1 DOMOTICZ_SITE = https://github.com/domoticz/domoticz DOMOTICZ_SITE_METHOD = git DOMOTICZ_GIT_SUBMODULES = YES -- 2.34.1 From fontaine.fabrice at gmail.com Wed Feb 2 07:56:51 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 2 Feb 2022 08:56:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/jasper: disable programs Message-ID: <20220202075651.1205886-1-fontaine.fabrice@gmail.com> Disable demo programs through JAS_ENABLE_PROGRAMS option which is available and enabled by default since version 2.0.14 and https://github.com/jasper-software/jasper/commit/e02518ce7161cd37ded64af78ac520e0424a9b12 As a side-effect, this will avoid the following build failure raised since bump to version 2.0.33 in commit f791221c8616bfa6d338ce6c287353395cc2c61a: [ 96%] Linking C executable imginfo /home/buildroot/autobuild/instance-3/output-1/per-package/jasper/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-uclibc/10.3.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: attempted static link of dynamic object `/home/buildroot/autobuild/instance-3/output-1/per-package/jasper/host/x86_64-buildroot-linux-uclibc/sysroot/lib/libc.so.1' Fixes: - http://autobuild.buildroot.org/results/b106fdf32ffa9e0ef1254e0a29fdcdc821020e08 Signed-off-by: Fabrice Fontaine --- package/jasper/jasper.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/jasper/jasper.mk b/package/jasper/jasper.mk index 05168db763..6b6bbcd6e6 100644 --- a/package/jasper/jasper.mk +++ b/package/jasper/jasper.mk @@ -11,7 +11,9 @@ JASPER_LICENSE = JasPer-2.0 JASPER_LICENSE_FILES = LICENSE JASPER_CPE_ID_VENDOR = jasper_project JASPER_SUPPORTS_IN_SOURCE_BUILD = NO -JASPER_CONF_OPTS = -DJAS_ENABLE_DOC=OFF +JASPER_CONF_OPTS = \ + -DJAS_ENABLE_DOC=OFF \ + -DJAS_ENABLE_PROGRAMS=OFF ifeq ($(BR2_STATIC_LIBS),y) JASPER_CONF_OPTS += -DJAS_ENABLE_SHARED=OFF -- 2.34.1 From peter at korsgaard.com Wed Feb 2 10:10:11 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 02 Feb 2022 11:10:11 +0100 Subject: [Buildroot] [PATCH 1/1] package/expat: security bump to version 2.4.4 In-Reply-To: <20220131225230.178602-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 31 Jan 2022 23:52:30 +0100") References: <20220131225230.178602-1-fontaine.fabrice@gmail.com> Message-ID: <87k0ed1svw.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > 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 Sorry, I applied the other patch for the same before noticing this (even though your commit message is a lot nicer). -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 2 10:17:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 02 Feb 2022 11:17:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-aioconsole: bump to version 0.4.0 In-Reply-To: <20220202030656.2175796-1-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 1 Feb 2022 20:06:56 -0700") References: <20220202030656.2175796-1-james.hilliard1@gmail.com> Message-ID: <87fsp11skg.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 2 10:17:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 02 Feb 2022 11:17:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-autobahn: bump to version 22.1.1 In-Reply-To: <20220202031130.2178288-1-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 1 Feb 2022 20:11:30 -0700") References: <20220202031130.2178288-1-james.hilliard1@gmail.com> Message-ID: <87bkzp1sk3.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 2 10:17:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 02 Feb 2022 11:17:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-cbor2: bump to version 5.4.2.post1 In-Reply-To: <20220202031709.2181778-1-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 1 Feb 2022 20:17:09 -0700") References: <20220202031709.2181778-1-james.hilliard1@gmail.com> Message-ID: <877dad1sjo.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 2 10:17:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 02 Feb 2022 11:17:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-charset-normalizer: bump to version 2.0.11 In-Reply-To: <20220202032025.2182903-1-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 1 Feb 2022 20:20:25 -0700") References: <20220202032025.2182903-1-james.hilliard1@gmail.com> Message-ID: <8735l11sjd.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 2 10:18:25 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 02 Feb 2022 11:18:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-cssutils: bump to version 2.3.0 In-Reply-To: <20220202033144.2187501-1-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 1 Feb 2022 20:31:44 -0700") References: <20220202033144.2187501-1-james.hilliard1@gmail.com> Message-ID: <87y22tzi4u.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Drop python2 support. > Add new host-python-setuptools-scm dependency. > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 2 10:18:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 02 Feb 2022 11:18:55 +0100 Subject: [Buildroot] [PATCH 1/1] package/python{3}-cython: bump to version 0.29.27 In-Reply-To: <20220202034036.2188757-1-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 1 Feb 2022 20:40:36 -0700") References: <20220202034036.2188757-1-james.hilliard1@gmail.com> Message-ID: <87r18lzi40.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 2 10:19:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 02 Feb 2022 11:19:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-fonttools: bump to version 4.29.1 In-Reply-To: <20220202034755.2191344-1-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 1 Feb 2022 20:47:55 -0700") References: <20220202034755.2191344-1-james.hilliard1@gmail.com> Message-ID: <87mtj9zi3o.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 2 10:19:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 02 Feb 2022 11:19:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-janus: bump to version 1.0.0 In-Reply-To: <20220202035847.2194218-1-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 1 Feb 2022 20:58:47 -0700") References: <20220202035847.2194218-1-james.hilliard1@gmail.com> Message-ID: <87iltxzi2l.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Add new python-typing-extensions runtime dependency. > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 2 10:20:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 02 Feb 2022 11:20:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pyparsing: bump to version 3.0.7 In-Reply-To: <20220202041115.2198598-1-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 1 Feb 2022 21:11:15 -0700") References: <20220202041115.2198598-1-james.hilliard1@gmail.com> Message-ID: <87ee4lzi22.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 2 10:20:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 02 Feb 2022 11:20:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-setuptools-scm: bump to version 6.4.2 In-Reply-To: <20220202042024.2202751-1-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 1 Feb 2022 21:20:24 -0700") References: <20220202042024.2202751-1-james.hilliard1@gmail.com> Message-ID: <87a6f9zi1q.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 2 10:21:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 02 Feb 2022 11:21:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/python3-setuptools: bump to version 60.6.0 In-Reply-To: <20220202043830.2211307-1-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 1 Feb 2022 21:38:30 -0700") References: <20220202043830.2211307-1-james.hilliard1@gmail.com> Message-ID: <875ypxzi0b.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 2 10:21:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 02 Feb 2022 11:21:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/jasper: disable programs In-Reply-To: <20220202075651.1205886-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 2 Feb 2022 08:56:51 +0100") References: <20220202075651.1205886-1-fontaine.fabrice@gmail.com> Message-ID: <871r0lzhzo.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Disable demo programs through JAS_ENABLE_PROGRAMS option which is > available and enabled by default since version 2.0.14 and > https://github.com/jasper-software/jasper/commit/e02518ce7161cd37ded64af78ac520e0424a9b12 > As a side-effect, this will avoid the following build failure raised > since bump to version 2.0.33 in commit > f791221c8616bfa6d338ce6c287353395cc2c61a: > [ 96%] Linking C executable imginfo > /home/buildroot/autobuild/instance-3/output-1/per-package/jasper/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-uclibc/10.3.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: > attempted static link of dynamic object > `/home/buildroot/autobuild/instance-3/output-1/per-package/jasper/host/x86_64-buildroot-linux-uclibc/sysroot/lib/libc.so.1' > Fixes: > - http://autobuild.buildroot.org/results/b106fdf32ffa9e0ef1254e0a29fdcdc821020e08 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 2 10:17:29 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 2 Feb 2022 11:17:29 +0100 Subject: [Buildroot] [git commit] package/python-cbor2: bump to version 5.4.2.post1 Message-ID: <20220202101446.87C8D829FC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=731787ae42b4e6fa5a683b0c3239b90f8f0c578a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- 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 9910e632a2..8858fc72d3 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 b3a6085ee1a9e11ddec305f7a7bc5956 cbor2-5.4.2.tar.gz -sha256 e283e70b55a049ff364cc5e648fde587e4d9b0e87e4b2664c69e639135e6b3b8 cbor2-5.4.2.tar.gz +md5 a9518fd435d9eafd91063b3bf10d5c5b cbor2-5.4.2.post1.tar.gz +sha256 9cf21d59604b9529d7877c8e0342a2ebaae1a07fe8ff5683dc75fec15847c797 cbor2-5.4.2.post1.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 4cc09a219f..dd007217d1 100644 --- a/package/python-cbor2/python-cbor2.mk +++ b/package/python-cbor2/python-cbor2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CBOR2_VERSION = 5.4.2 +PYTHON_CBOR2_VERSION = 5.4.2.post1 PYTHON_CBOR2_SOURCE = cbor2-$(PYTHON_CBOR2_VERSION).tar.gz -PYTHON_CBOR2_SITE = https://files.pythonhosted.org/packages/d4/ca/b96be94f694155ce58823c38cf8fd1aa620bdc91e2c801713cdb4167b6aa +PYTHON_CBOR2_SITE = https://files.pythonhosted.org/packages/49/74/2b9f9b76e2831f54d70e177a4e602e72cb86441632d1bcc15be1f04a73f6 PYTHON_CBOR2_SETUP_TYPE = setuptools PYTHON_CBOR2_LICENSE = MIT PYTHON_CBOR2_LICENSE_FILES = LICENSE.txt From peter at korsgaard.com Wed Feb 2 10:17:12 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 2 Feb 2022 11:17:12 +0100 Subject: [Buildroot] [git commit] package/python-autobahn: bump to version 22.1.1 Message-ID: <20220202101446.7EF94829F9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=96eb628bb4f4e14086c90254178db1979f33bad5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-autobahn/python-autobahn.hash | 4 ++-- package/python-autobahn/python-autobahn.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-autobahn/python-autobahn.hash b/package/python-autobahn/python-autobahn.hash index 0bbb9112d0..7b963df635 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 1ccd46d938d8b9fed435e9781e54e887 autobahn-21.11.1.tar.gz -sha256 bd6f46315419ca0a5be4109f737410208ad5f19718f67ca6a4a674cc66ca9b18 autobahn-21.11.1.tar.gz +md5 9b0ae4ff164232c952ba01ab3516188e autobahn-22.1.1.tar.gz +sha256 17e1b58b6ae1a63ca7d926b1d71bb9e4fd6b9ac9a1a2277d8ee40e0b61f54746 autobahn-22.1.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 db9e5083d1..df43e9cdf2 100644 --- a/package/python-autobahn/python-autobahn.mk +++ b/package/python-autobahn/python-autobahn.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AUTOBAHN_VERSION = 21.11.1 +PYTHON_AUTOBAHN_VERSION = 22.1.1 PYTHON_AUTOBAHN_SOURCE = autobahn-$(PYTHON_AUTOBAHN_VERSION).tar.gz -PYTHON_AUTOBAHN_SITE = https://files.pythonhosted.org/packages/f1/d3/23fdf1ab0104b1b65d2f7884e923f0526750a59f96334d752afc79cf44ed +PYTHON_AUTOBAHN_SITE = https://files.pythonhosted.org/packages/0e/2a/0b627ad4adf70437b5753462958b3ba5c6802d7664eb4a680e46423659ba PYTHON_AUTOBAHN_LICENSE = MIT PYTHON_AUTOBAHN_LICENSE_FILES = LICENSE PYTHON_AUTOBAHN_CPE_ID_VENDOR = crossbar From peter at korsgaard.com Wed Feb 2 10:20:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 2 Feb 2022 11:20:01 +0100 Subject: [Buildroot] [git commit] package/python-pyparsing: bump to version 3.0.7 Message-ID: <20220202101446.BCAED829F9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=02358c962c43b90f272aedd77a43033643056557 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- 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 a21baf46e5..1e56e878a1 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 2f5fad6c8e99ac2562ab08ad9e45b195 pyparsing-3.0.6.tar.gz -sha256 d9bdec0013ef1eb5a84ab39a3b3868911598afa494f5faa038647101504e2b81 pyparsing-3.0.6.tar.gz +md5 9d38774991175444e21a3dfa865876cc pyparsing-3.0.7.tar.gz +sha256 18ee9022775d270c55187733956460083db60b37d0d0fb357445f3094eed3eea pyparsing-3.0.7.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 b6ab353a6d..e33541bdb7 100644 --- a/package/python-pyparsing/python-pyparsing.mk +++ b/package/python-pyparsing/python-pyparsing.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYPARSING_VERSION = 3.0.6 +PYTHON_PYPARSING_VERSION = 3.0.7 PYTHON_PYPARSING_SOURCE = pyparsing-$(PYTHON_PYPARSING_VERSION).tar.gz -PYTHON_PYPARSING_SITE = https://files.pythonhosted.org/packages/ab/61/1a1613e3dcca483a7aa9d446cb4614e6425eb853b90db131c305bd9674cb +PYTHON_PYPARSING_SITE = https://files.pythonhosted.org/packages/d6/60/9bed18f43275b34198eb9720d4c1238c68b3755620d20df0afd89424d32b PYTHON_PYPARSING_LICENSE = MIT PYTHON_PYPARSING_LICENSE_FILES = LICENSE PYTHON_PYPARSING_SETUP_TYPE = setuptools From peter at korsgaard.com Wed Feb 2 10:17:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 2 Feb 2022 11:17:40 +0100 Subject: [Buildroot] [git commit] package/python-charset-normalizer: bump to version 2.0.11 Message-ID: <20220202101446.90A52822ED@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ea80e29647dafea9aa2312838a13527be28d3fc1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- 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 eb3b67598b..3c6e58a616 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 eaed8aaf95d7e3bc2daefcd8d0f03458 charset-normalizer-2.0.10.tar.gz -sha256 876d180e9d7432c5d1dfd4c5d26b72f099d503e8fcc0feb7532c9289be60fcbd charset-normalizer-2.0.10.tar.gz +md5 2abe3754fef25c99799a518cb83a81ae charset-normalizer-2.0.11.tar.gz +sha256 98398a9d69ee80548c762ba991a4728bfc3836768ed226b3945908d1a688371c charset-normalizer-2.0.11.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 33f2e132de..0a96a6b078 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.10 +PYTHON_CHARSET_NORMALIZER_VERSION = 2.0.11 PYTHON_CHARSET_NORMALIZER_SOURCE = charset-normalizer-$(PYTHON_CHARSET_NORMALIZER_VERSION).tar.gz -PYTHON_CHARSET_NORMALIZER_SITE = https://files.pythonhosted.org/packages/48/44/76b179e0d1afe6e6a91fd5661c284f60238987f3b42b676d141d01cd5b97 +PYTHON_CHARSET_NORMALIZER_SITE = https://files.pythonhosted.org/packages/e8/e8/b6cfd28fb430b2ec9923ad0147025bf8bbdf304b1eb3039b69f1ce44ed6e PYTHON_CHARSET_NORMALIZER_SETUP_TYPE = setuptools PYTHON_CHARSET_NORMALIZER_LICENSE = MIT PYTHON_CHARSET_NORMALIZER_LICENSE_FILES = LICENSE From peter at korsgaard.com Wed Feb 2 10:20:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 2 Feb 2022 11:20:27 +0100 Subject: [Buildroot] [git commit] package/python3-setuptools: bump to version 60.6.0 Message-ID: <20220202101446.CF473829F9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=43c8afef8ddd5ce590076c0932c78c4953279c68 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-setuptools/59.8.0/python-setuptools.hash | 4 ---- .../python-setuptools/{59.8.0 => 60.6.0}/0001-add-executable.patch | 0 package/python-setuptools/60.6.0/python-setuptools.hash | 4 ++++ package/python-setuptools/python-setuptools.mk | 4 ++-- package/python3-setuptools/0001-add-executable.patch | 2 +- package/python3-setuptools/python3-setuptools.hash | 2 +- package/python3-setuptools/python3-setuptools.mk | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package/python-setuptools/59.8.0/python-setuptools.hash b/package/python-setuptools/59.8.0/python-setuptools.hash deleted file mode 100644 index 285919639d..0000000000 --- a/package/python-setuptools/59.8.0/python-setuptools.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From https://pypi.org/pypi/setuptools/json -md5 675f2089d970bf0bbfc3f49c80e4c7c3 setuptools-59.8.0.tar.gz -sha256 09980778aa734c3037a47997f28d6db5ab18bdf2af0e49f719bfc53967fd2e82 setuptools-59.8.0.tar.gz -sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE diff --git a/package/python-setuptools/59.8.0/0001-add-executable.patch b/package/python-setuptools/60.6.0/0001-add-executable.patch similarity index 100% rename from package/python-setuptools/59.8.0/0001-add-executable.patch rename to package/python-setuptools/60.6.0/0001-add-executable.patch diff --git a/package/python-setuptools/60.6.0/python-setuptools.hash b/package/python-setuptools/60.6.0/python-setuptools.hash new file mode 100644 index 0000000000..734cb4d580 --- /dev/null +++ b/package/python-setuptools/60.6.0/python-setuptools.hash @@ -0,0 +1,4 @@ +# From https://pypi.org/pypi/setuptools/json +md5 392e91d7e244998c586c88da2cf881d3 setuptools-60.6.0.tar.gz +sha256 eb83b1012ae6bf436901c2a2cee35d45b7260f31fd4b65fd1e50a9f99c11d7f8 setuptools-60.6.0.tar.gz +sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk index d83336b909..15912d96f5 100644 --- a/package/python-setuptools/python-setuptools.mk +++ b/package/python-setuptools/python-setuptools.mk @@ -9,9 +9,9 @@ ifeq ($(BR2_PACKAGE_PYTHON3),y) # Please keep in sync with # package/python3-setuptools/python3-setuptools.mk -PYTHON_SETUPTOOLS_VERSION = 59.8.0 +PYTHON_SETUPTOOLS_VERSION = 60.6.0 PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON3_SETUPTOOLS_VERSION).tar.gz -PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/ef/75/2bc7bef4d668f9caa9c6ed3f3187989922765403198243040d08d2a52725 +PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/8f/89/9fec81ec84737c925a1ee992af2c6c7153aec4051c26afeadd6b822354d2 else # Python PYTHON_SETUPTOOLS_VERSION = 44.0.0 PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).zip diff --git a/package/python3-setuptools/0001-add-executable.patch b/package/python3-setuptools/0001-add-executable.patch index 6fc7595a8d..9d608239bc 120000 --- a/package/python3-setuptools/0001-add-executable.patch +++ b/package/python3-setuptools/0001-add-executable.patch @@ -1 +1 @@ -../python-setuptools/59.8.0/0001-add-executable.patch \ No newline at end of file +../python-setuptools/60.6.0/0001-add-executable.patch \ No newline at end of file diff --git a/package/python3-setuptools/python3-setuptools.hash b/package/python3-setuptools/python3-setuptools.hash index 91d8bc0887..9fb96015aa 120000 --- a/package/python3-setuptools/python3-setuptools.hash +++ b/package/python3-setuptools/python3-setuptools.hash @@ -1 +1 @@ -../python-setuptools/59.8.0/python-setuptools.hash \ No newline at end of file +../python-setuptools/60.6.0/python-setuptools.hash \ No newline at end of file diff --git a/package/python3-setuptools/python3-setuptools.mk b/package/python3-setuptools/python3-setuptools.mk index f4dae2d15d..55a01dba01 100644 --- a/package/python3-setuptools/python3-setuptools.mk +++ b/package/python3-setuptools/python3-setuptools.mk @@ -6,9 +6,9 @@ # Please keep in sync with # package/python-setuptools/python-setuptools.mk -PYTHON3_SETUPTOOLS_VERSION = 59.8.0 +PYTHON3_SETUPTOOLS_VERSION = 60.6.0 PYTHON3_SETUPTOOLS_SOURCE = setuptools-$(PYTHON3_SETUPTOOLS_VERSION).tar.gz -PYTHON3_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/ef/75/2bc7bef4d668f9caa9c6ed3f3187989922765403198243040d08d2a52725 +PYTHON3_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/8f/89/9fec81ec84737c925a1ee992af2c6c7153aec4051c26afeadd6b822354d2 PYTHON3_SETUPTOOLS_LICENSE = MIT PYTHON3_SETUPTOOLS_LICENSE_FILES = LICENSE PYTHON3_SETUPTOOLS_CPE_ID_VENDOR = python From peter at korsgaard.com Wed Feb 2 10:19:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 2 Feb 2022 11:19:04 +0100 Subject: [Buildroot] [git commit] package/python-fonttools: bump to version 4.29.1 Message-ID: <20220202101446.AC32A822ED@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ecee383549b66787cb857f02a89717e004b951bb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- 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 1f9b546c23..df0bdf980d 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 4a894b3cd108432f7636849b4026b771 fonttools-4.28.5.zip -sha256 545c05d0f7903a863c2020e07b8f0a57517f2c40d940bded77076397872d14ca fonttools-4.28.5.zip +md5 7fc490291991da874911fed1e743362d fonttools-4.29.1.zip +sha256 2b18a172120e32128a80efee04cff487d5d140fe7d817deb648b2eee023a40e4 fonttools-4.29.1.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 c5c605161b..d5c4cdf8e5 100644 --- a/package/python-fonttools/python-fonttools.mk +++ b/package/python-fonttools/python-fonttools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FONTTOOLS_VERSION = 4.28.5 +PYTHON_FONTTOOLS_VERSION = 4.29.1 PYTHON_FONTTOOLS_SOURCE = fonttools-$(PYTHON_FONTTOOLS_VERSION).zip -PYTHON_FONTTOOLS_SITE = https://files.pythonhosted.org/packages/ce/1b/d4cd86f4e6cbd54a3c4f807015b116299bcd6d6587ea0645d88ba9d932bb +PYTHON_FONTTOOLS_SITE = https://files.pythonhosted.org/packages/2d/4c/49ba863863502bb9fea19d8bd04a527da336b4a2698c8a0c7129e9cc2716 PYTHON_FONTTOOLS_SETUP_TYPE = setuptools PYTHON_FONTTOOLS_LICENSE = MIT PYTHON_FONTTOOLS_LICENSE_FILES = LICENSE From peter at korsgaard.com Wed Feb 2 10:17:57 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 2 Feb 2022 11:17:57 +0100 Subject: [Buildroot] [git commit] package/python-cssutils: bump to version 2.3.0 Message-ID: <20220202101446.9AFDE829F9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=414fa848445eaede01264ad9d8374585b18a95c0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop python2 support. Add new host-python-setuptools-scm dependency. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-cssutils/Config.in | 4 ++-- package/python-cssutils/python-cssutils.hash | 6 +++--- package/python-cssutils/python-cssutils.mk | 5 +++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/package/python-cssutils/Config.in b/package/python-cssutils/Config.in index 74de742c31..141561901c 100644 --- a/package/python-cssutils/Config.in +++ b/package/python-cssutils/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_PYTHON_CSSUTILS bool "python-cssutils" - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime help A CSS Cascading Style Sheets library for Python. diff --git a/package/python-cssutils/python-cssutils.hash b/package/python-cssutils/python-cssutils.hash index 393daffb8b..e22dde6e56 100644 --- a/package/python-cssutils/python-cssutils.hash +++ b/package/python-cssutils/python-cssutils.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/cssutils/json -md5 dc66d96c2d78f1687f59ac412fe9d318 cssutils-1.0.2.tar.gz -sha256 a2fcf06467553038e98fea9cfe36af2bf14063eb147a70958cfcaa8f5786acaf cssutils-1.0.2.tar.gz +md5 71955999f595e4b0eb5a218d614652ca cssutils-2.3.0.tar.gz +sha256 b2d3b16047caae82e5c590036935bafa1b621cf45c2f38885af4be4838f0fd00 cssutils-2.3.0.tar.gz # Locally computed sha256 checksums -sha256 03c570a068086ee577dcd795519ea93462b2ed2fcb6dcc4dfce56a71a2fd6e5a COPYING.LESSER +sha256 03c570a068086ee577dcd795519ea93462b2ed2fcb6dcc4dfce56a71a2fd6e5a COPYING.LESSER diff --git a/package/python-cssutils/python-cssutils.mk b/package/python-cssutils/python-cssutils.mk index 513c3a87de..09c2ca44d6 100644 --- a/package/python-cssutils/python-cssutils.mk +++ b/package/python-cssutils/python-cssutils.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_CSSUTILS_VERSION = 1.0.2 +PYTHON_CSSUTILS_VERSION = 2.3.0 PYTHON_CSSUTILS_SOURCE = cssutils-$(PYTHON_CSSUTILS_VERSION).tar.gz -PYTHON_CSSUTILS_SITE = https://files.pythonhosted.org/packages/5c/0b/c5f29d29c037e97043770b5e7c740b6252993e4b57f029b3cd03c78ddfec +PYTHON_CSSUTILS_SITE = https://files.pythonhosted.org/packages/f5/c6/878abb7df855938a067b762a688da3fcdfea4e41c2399feaf80369b61ed7 PYTHON_CSSUTILS_LICENSE = LGPL-3.0+ PYTHON_CSSUTILS_LICENSE_FILES = COPYING.LESSER PYTHON_CSSUTILS_SETUP_TYPE = setuptools +PYTHON_CSSUTILS_DEPENDENCIES = host-python-setuptools-scm $(eval $(python-package)) From peter at korsgaard.com Wed Feb 2 10:21:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 2 Feb 2022 11:21:22 +0100 Subject: [Buildroot] [git commit] package/jasper: disable programs Message-ID: <20220202101446.DA398829FC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3558a98df611ec7c9b4735326e97e17bfde2b9b9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Disable demo programs through JAS_ENABLE_PROGRAMS option which is available and enabled by default since version 2.0.14 and https://github.com/jasper-software/jasper/commit/e02518ce7161cd37ded64af78ac520e0424a9b12 As a side-effect, this will avoid the following build failure raised since bump to version 2.0.33 in commit f791221c8616bfa6d338ce6c287353395cc2c61a: [ 96%] Linking C executable imginfo /home/buildroot/autobuild/instance-3/output-1/per-package/jasper/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-uclibc/10.3.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: attempted static link of dynamic object `/home/buildroot/autobuild/instance-3/output-1/per-package/jasper/host/x86_64-buildroot-linux-uclibc/sysroot/lib/libc.so.1' Fixes: - http://autobuild.buildroot.org/results/b106fdf32ffa9e0ef1254e0a29fdcdc821020e08 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/jasper/jasper.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/jasper/jasper.mk b/package/jasper/jasper.mk index 05168db763..6b6bbcd6e6 100644 --- a/package/jasper/jasper.mk +++ b/package/jasper/jasper.mk @@ -11,7 +11,9 @@ JASPER_LICENSE = JasPer-2.0 JASPER_LICENSE_FILES = LICENSE JASPER_CPE_ID_VENDOR = jasper_project JASPER_SUPPORTS_IN_SOURCE_BUILD = NO -JASPER_CONF_OPTS = -DJAS_ENABLE_DOC=OFF +JASPER_CONF_OPTS = \ + -DJAS_ENABLE_DOC=OFF \ + -DJAS_ENABLE_PROGRAMS=OFF ifeq ($(BR2_STATIC_LIBS),y) JASPER_CONF_OPTS += -DJAS_ENABLE_SHARED=OFF From peter at korsgaard.com Wed Feb 2 10:19:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 2 Feb 2022 11:19:42 +0100 Subject: [Buildroot] [git commit] package/python-janus: bump to version 1.0.0 Message-ID: <20220202101446.B4872829F9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b32b8785df57b3efda67f3b0390574fd65698693 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add new python-typing-extensions runtime dependency. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-janus/Config.in | 1 + package/python-janus/python-janus.hash | 4 ++-- package/python-janus/python-janus.mk | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/python-janus/Config.in b/package/python-janus/Config.in index a1ba0463f9..38e4b7217f 100644 --- a/package/python-janus/Config.in +++ b/package/python-janus/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_JANUS bool "python-janus" depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime help Mixed sync-async queue to interoperate between asyncio tasks and classic threads. diff --git a/package/python-janus/python-janus.hash b/package/python-janus/python-janus.hash index 7d914389d2..7f7ce35caa 100644 --- a/package/python-janus/python-janus.hash +++ b/package/python-janus/python-janus.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/janus/json -md5 dad6a03e7664cb800ce45ef8bcf12439 janus-0.6.1.tar.gz -sha256 4712e0ef75711fe5947c2db855bc96221a9a03641b52e5ae8e25c2b705dd1d0c janus-0.6.1.tar.gz +md5 2d8c0b884c14f18fc5223858eb16461e janus-1.0.0.tar.gz +sha256 df976f2cdcfb034b147a2d51edfc34ff6bfb12d4e2643d3ad0e10de058cb1612 janus-1.0.0.tar.gz # Locally computed sha256 checksums sha256 8b177cccb6ddec12a9fc97bd49e7e2bbcd92464625624bd8bdbfad799ae606e9 LICENSE diff --git a/package/python-janus/python-janus.mk b/package/python-janus/python-janus.mk index 2b08733c18..43df87870d 100644 --- a/package/python-janus/python-janus.mk +++ b/package/python-janus/python-janus.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_JANUS_VERSION = 0.6.1 +PYTHON_JANUS_VERSION = 1.0.0 PYTHON_JANUS_SOURCE = janus-$(PYTHON_JANUS_VERSION).tar.gz -PYTHON_JANUS_SITE = https://files.pythonhosted.org/packages/7c/1b/8769c2dca84dd8ca92e48b14750c7106ff4313df4fee651dbc3cd9e345a9 +PYTHON_JANUS_SITE = https://files.pythonhosted.org/packages/b8/a8/facab7275d7d3d2032f375843fe46fad1cfa604a108b5a238638d4615bdc PYTHON_JANUS_SETUP_TYPE = setuptools PYTHON_JANUS_LICENSE = Apache-2.0 PYTHON_JANUS_LICENSE_FILES = LICENSE From peter at korsgaard.com Wed Feb 2 10:18:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 2 Feb 2022 11:18:45 +0100 Subject: [Buildroot] [git commit] package/python{3}-cython: bump to version 0.29.27 Message-ID: <20220202101446.A3F02822ED@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3fae4cddea023b008b59f99986f8aaef9d1cb562 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- 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 b07f171c25..9c5f1225cf 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 971c9708dd5269180868fc0af986084c Cython-0.29.26.tar.gz -sha256 af377d543a762867da11fcf6e558f7a4a535ff8693f30cce123fab10c00fa312 Cython-0.29.26.tar.gz +md5 2b2ba86abcf823985935d37f5e43b19a Cython-0.29.27.tar.gz +sha256 c6a442504db906dfc13a480e96850cced994ecdc076bcf492c43515b78f70da2 Cython-0.29.27.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 cf41086dea..89708cb9a8 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.26 +PYTHON_CYTHON_VERSION = 0.29.27 PYTHON_CYTHON_SOURCE = Cython-$(PYTHON_CYTHON_VERSION).tar.gz -PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/bc/fa/8604d92ef753e0036d807f1b3179813ab2fa283e3b19c926e11673c8205b +PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/eb/46/80dd9e5ad67ebc766ff3229901bde4a7bc82907efe93cd7007c4df458dd5 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 da159cedc8..56d88b5bf7 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.26 +PYTHON3_CYTHON_VERSION = 0.29.27 PYTHON3_CYTHON_SOURCE = Cython-$(PYTHON3_CYTHON_VERSION).tar.gz -PYTHON3_CYTHON_SITE = https://files.pythonhosted.org/packages/bc/fa/8604d92ef753e0036d807f1b3179813ab2fa283e3b19c926e11673c8205b +PYTHON3_CYTHON_SITE = https://files.pythonhosted.org/packages/eb/46/80dd9e5ad67ebc766ff3229901bde4a7bc82907efe93cd7007c4df458dd5 PYTHON3_CYTHON_SETUP_TYPE = setuptools PYTHON3_CYTHON_LICENSE = Apache-2.0 PYTHON3_CYTHON_LICENSE_FILES = COPYING.txt LICENSE.txt From peter at korsgaard.com Wed Feb 2 10:10:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 2 Feb 2022 11:10:56 +0100 Subject: [Buildroot] [git commit] package/python-aioconsole: bump to version 0.4.0 Message-ID: <20220202101446.75CE1822ED@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b706d6a21c2d54213a05e9787036e04075a9c012 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- 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 26a3778756..39ce16f8b2 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 f8b67330e631cfc45a9b2560a6e0fa98 aioconsole-0.3.3.tar.gz -sha256 47df42d9f8cc3995bbe032dd5f01d32cc5b06639e9078bb9b4e3c55b237f5e32 aioconsole-0.3.3.tar.gz +md5 56a1e6542ea3627bdbc67f24abcaa341 aioconsole-0.4.0.tar.gz +sha256 a30ad5276b85dd20a48d235111d0bd26c6bedf7b56d605ffc10ae27124b4b0b4 aioconsole-0.4.0.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 f06d91a550..44857054d4 100644 --- a/package/python-aioconsole/python-aioconsole.mk +++ b/package/python-aioconsole/python-aioconsole.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOCONSOLE_VERSION = 0.3.3 +PYTHON_AIOCONSOLE_VERSION = 0.4.0 PYTHON_AIOCONSOLE_SOURCE = aioconsole-$(PYTHON_AIOCONSOLE_VERSION).tar.gz -PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/dd/f6/bbc451ba96c1e1da6aa253f254b181ceb03272b475b27b481b57865d7d7f +PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/f2/7a/7628ec23f140ffca532c7f630e179503727b755849b5eab15576bbf7d3df PYTHON_AIOCONSOLE_SETUP_TYPE = setuptools PYTHON_AIOCONSOLE_LICENSE = GPL-3.0 PYTHON_AIOCONSOLE_LICENSE_FILES = LICENSE From peter at korsgaard.com Wed Feb 2 10:20:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 2 Feb 2022 11:20:15 +0100 Subject: [Buildroot] [git commit] package/python-setuptools-scm: bump to version 6.4.2 Message-ID: <20220202101446.C639F822ED@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7995738abf772109d3df2a55eb9ab114d43f1c99 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-setuptools-scm/python-setuptools-scm.hash | 4 ++-- package/python-setuptools-scm/python-setuptools-scm.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-setuptools-scm/python-setuptools-scm.hash b/package/python-setuptools-scm/python-setuptools-scm.hash index 22b9afd2c2..934c505442 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 32918d8ac566360c21411e0b3556c695 setuptools_scm-6.3.2.tar.gz -sha256 a49aa8081eeb3514eb9728fa5040f2eaa962d6c6f4ec9c32f6c1fba88f88a0f2 setuptools_scm-6.3.2.tar.gz +md5 b4e02bf8e62ed49142ea7b42a68671d7 setuptools_scm-6.4.2.tar.gz +sha256 6833ac65c6ed9711a4d5d2266f8024cfa07c533a0e55f4c12f6eff280a5a9e30 setuptools_scm-6.4.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 b2990a56cb..8c5229e1a6 100644 --- a/package/python-setuptools-scm/python-setuptools-scm.mk +++ b/package/python-setuptools-scm/python-setuptools-scm.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SETUPTOOLS_SCM_VERSION = 6.3.2 +PYTHON_SETUPTOOLS_SCM_VERSION = 6.4.2 PYTHON_SETUPTOOLS_SCM_SOURCE = setuptools_scm-$(PYTHON_SETUPTOOLS_SCM_VERSION).tar.gz -PYTHON_SETUPTOOLS_SCM_SITE = https://files.pythonhosted.org/packages/4b/0d/ecb9595fae02467edba5023eb8a23c688d2b438a6a8d1a9e2b8649faf23d +PYTHON_SETUPTOOLS_SCM_SITE = https://files.pythonhosted.org/packages/4a/18/477d3d9eb2f88230ff2a41de9d8ffa3554b706352787d289f57f76bfba0b PYTHON_SETUPTOOLS_SCM_LICENSE = MIT PYTHON_SETUPTOOLS_SCM_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_SCM_SETUP_TYPE = setuptools From thomas.devoogdt at gmail.com Wed Feb 2 11:25:28 2022 From: thomas.devoogdt at gmail.com (Thomas Devoogdt) Date: Wed, 2 Feb 2022 12:25:28 +0100 Subject: [Buildroot] [PATCH] pacakge/glib-networking: bump to version 2.70.0 Message-ID: <20220202112528.7778-1-thomas.devoogdt@barco.com> From: Thomas Devoogdt PKCS#11 is required if gnutls is used: https://gitlab.gnome.org/GNOME/glib-networking/-/commit/9b3d30e40f306f0e36e2a396d3b6df1edeea9f21 Older compilers require c_std=gnu99: https://gitlab.gnome.org/GNOME/glib-networking/-/commit/b192086b9936602a40a14d00a6883b339b9d7955 Signed-off-by: Thomas Devoogdt --- .../0001-meson-change-std-to-gnu99.patch | 30 +++++++++++++++++++ package/glib-networking/Config.in | 1 + package/glib-networking/glib-networking.hash | 4 +-- package/glib-networking/glib-networking.mk | 2 +- 4 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 package/glib-networking/0001-meson-change-std-to-gnu99.patch diff --git a/package/glib-networking/0001-meson-change-std-to-gnu99.patch b/package/glib-networking/0001-meson-change-std-to-gnu99.patch new file mode 100644 index 0000000000..9f266bc2c8 --- /dev/null +++ b/package/glib-networking/0001-meson-change-std-to-gnu99.patch @@ -0,0 +1,30 @@ +From cdfa726bae1d82b7bd3735475fc2b2c6a31c1d2f Mon Sep 17 00:00:00 2001 +From: Ignacio Casal Quinteiro +Date: Fri, 12 Nov 2021 11:51:33 +0100 +Subject: [PATCH] meson: change std to gnu99 + +This is the same as glib and should fix issues with old +compilers + +(cherry picked from commit b192086b9936602a40a14d00a6883b339b9d7955) +Signed-off-by: Thomas Devoogdt +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index b018ca7b..130a2bf0 100644 +--- a/meson.build ++++ b/meson.build +@@ -3,7 +3,7 @@ project( + version: '2.70.0', + license: 'LGPL2.1+', + meson_version: '>= 0.50.0', +- default_options: ['c_std=c99'] ++ default_options: ['c_std=gnu99'] + ) + + prefix = get_option('prefix') +-- +2.17.1 + diff --git a/package/glib-networking/Config.in b/package/glib-networking/Config.in index 22331255f7..38cded5e6b 100644 --- a/package/glib-networking/Config.in +++ b/package/glib-networking/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_GLIB_NETWORKING depends on !BR2_STATIC_LIBS select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_GNUTLS + select BR2_PACKAGE_P11_KIT if BR2_PACKAGE_GNUTLS help Network-related GIO modules for glib. diff --git a/package/glib-networking/glib-networking.hash b/package/glib-networking/glib-networking.hash index 976a19f25e..6a53b436b0 100644 --- a/package/glib-networking/glib-networking.hash +++ b/package/glib-networking/glib-networking.hash @@ -1,3 +1,3 @@ -# From http://ftp.gnome.org/pub/gnome/sources/glib-networking/2.66/glib-networking-2.66.0.sha256sum -sha256 c5d7be2437fdd196eebfb70c4517b96d3ba7ec13bd496318b8f02dea383e0099 glib-networking-2.66.0.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/glib-networking/2.70/glib-networking-2.70.0.sha256sum +sha256 66b408e7afa86c582fe38963db56133869ab4b57d34e48ec56aba621940d6f35 glib-networking-2.70.0.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/glib-networking/glib-networking.mk b/package/glib-networking/glib-networking.mk index 65630c7fed..53280700bc 100644 --- a/package/glib-networking/glib-networking.mk +++ b/package/glib-networking/glib-networking.mk @@ -4,7 +4,7 @@ # ################################################################################ -GLIB_NETWORKING_VERSION_MAJOR = 2.66 +GLIB_NETWORKING_VERSION_MAJOR = 2.70 GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_VERSION_MAJOR).0 GLIB_NETWORKING_SITE = http://ftp.gnome.org/pub/gnome/sources/glib-networking/$(GLIB_NETWORKING_VERSION_MAJOR) GLIB_NETWORKING_SOURCE = glib-networking-$(GLIB_NETWORKING_VERSION).tar.xz -- 2.17.1 From aperez at igalia.com Wed Feb 2 11:32:22 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Wed, 2 Feb 2022 13:32:22 +0200 Subject: [Buildroot] [PATCH] pacakge/glib-networking: bump to version 2.70.0 In-Reply-To: <20220202112528.7778-1-thomas.devoogdt@barco.com> References: <20220202112528.7778-1-thomas.devoogdt@barco.com> Message-ID: <20220202133222.GB1296849@momiji> On Wed, 02 Feb 2022 12:25:28 +0100 Thomas Devoogdt wrote: > From: Thomas Devoogdt > > PKCS#11 is required if gnutls is used: > https://gitlab.gnome.org/GNOME/glib-networking/-/commit/9b3d30e40f306f0e36e2a396d3b6df1edeea9f21 > > Older compilers require c_std=gnu99: > https://gitlab.gnome.org/GNOME/glib-networking/-/commit/b192086b9936602a40a14d00a6883b339b9d7955 > > Signed-off-by: Thomas Devoogdt Reviewed-by: Adrian Perez de Castro > --- > .../0001-meson-change-std-to-gnu99.patch | 30 +++++++++++++++++++ > package/glib-networking/Config.in | 1 + > package/glib-networking/glib-networking.hash | 4 +-- > package/glib-networking/glib-networking.mk | 2 +- > 4 files changed, 34 insertions(+), 3 deletions(-) > create mode 100644 package/glib-networking/0001-meson-change-std-to-gnu99.patch > > diff --git a/package/glib-networking/0001-meson-change-std-to-gnu99.patch b/package/glib-networking/0001-meson-change-std-to-gnu99.patch > new file mode 100644 > index 0000000000..9f266bc2c8 > --- /dev/null > +++ b/package/glib-networking/0001-meson-change-std-to-gnu99.patch > @@ -0,0 +1,30 @@ > +From cdfa726bae1d82b7bd3735475fc2b2c6a31c1d2f Mon Sep 17 00:00:00 2001 > +From: Ignacio Casal Quinteiro > +Date: Fri, 12 Nov 2021 11:51:33 +0100 > +Subject: [PATCH] meson: change std to gnu99 > + > +This is the same as glib and should fix issues with old > +compilers > + > +(cherry picked from commit b192086b9936602a40a14d00a6883b339b9d7955) > +Signed-off-by: Thomas Devoogdt > +--- > + meson.build | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/meson.build b/meson.build > +index b018ca7b..130a2bf0 100644 > +--- a/meson.build > ++++ b/meson.build > +@@ -3,7 +3,7 @@ project( > + version: '2.70.0', > + license: 'LGPL2.1+', > + meson_version: '>= 0.50.0', > +- default_options: ['c_std=c99'] > ++ default_options: ['c_std=gnu99'] > + ) > + > + prefix = get_option('prefix') > +-- > +2.17.1 > + > diff --git a/package/glib-networking/Config.in b/package/glib-networking/Config.in > index 22331255f7..38cded5e6b 100644 > --- a/package/glib-networking/Config.in > +++ b/package/glib-networking/Config.in > @@ -6,6 +6,7 @@ config BR2_PACKAGE_GLIB_NETWORKING > depends on !BR2_STATIC_LIBS > select BR2_PACKAGE_LIBGLIB2 > select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_GNUTLS > + select BR2_PACKAGE_P11_KIT if BR2_PACKAGE_GNUTLS > help > Network-related GIO modules for glib. > > diff --git a/package/glib-networking/glib-networking.hash b/package/glib-networking/glib-networking.hash > index 976a19f25e..6a53b436b0 100644 > --- a/package/glib-networking/glib-networking.hash > +++ b/package/glib-networking/glib-networking.hash > @@ -1,3 +1,3 @@ > -# From http://ftp.gnome.org/pub/gnome/sources/glib-networking/2.66/glib-networking-2.66.0.sha256sum > -sha256 c5d7be2437fdd196eebfb70c4517b96d3ba7ec13bd496318b8f02dea383e0099 glib-networking-2.66.0.tar.xz > +# From http://ftp.gnome.org/pub/gnome/sources/glib-networking/2.70/glib-networking-2.70.0.sha256sum > +sha256 66b408e7afa86c582fe38963db56133869ab4b57d34e48ec56aba621940d6f35 glib-networking-2.70.0.tar.xz > sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING > diff --git a/package/glib-networking/glib-networking.mk b/package/glib-networking/glib-networking.mk > index 65630c7fed..53280700bc 100644 > --- a/package/glib-networking/glib-networking.mk > +++ b/package/glib-networking/glib-networking.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -GLIB_NETWORKING_VERSION_MAJOR = 2.66 > +GLIB_NETWORKING_VERSION_MAJOR = 2.70 > GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_VERSION_MAJOR).0 > GLIB_NETWORKING_SITE = http://ftp.gnome.org/pub/gnome/sources/glib-networking/$(GLIB_NETWORKING_VERSION_MAJOR) > GLIB_NETWORKING_SOURCE = glib-networking-$(GLIB_NETWORKING_VERSION).tar.xz > -- > 2.17.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot Cheers, ?Adri?n -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: From giulio.benetti at benettiengineering.com Wed Feb 2 12:49:27 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 2 Feb 2022 13:49:27 +0100 Subject: [Buildroot] [PATCH] package/cryptsetup: disable package if we build for Microblaze In-Reply-To: <20220201171910.32728-1-giulio.benetti@benettiengineering.com> References: <20220201171910.32728-1-giulio.benetti@benettiengineering.com> Message-ID: <9DF432CD-1007-4C7A-87A6-1DAAC90BE738@benettiengineering.com> Hi All, please drop this patch since upstream is very reactive and they?re working for fixing. I?ll send a patch soon for fixing instead than disabling. Best regards Giulio Benetti > Il giorno 1 feb 2022, alle ore 18:19, Giulio Benetti ha scritto: > > ?cryptsetup has the same build failure found for libfuse. For libfuse I've > patched meson that now correctly checks if symver is available: > https://github.com/libfuse/libfuse/pull/620/commits/3aba09a5c56e017746c5c1652dbc845f4db7374a > But in cryptsetup the check is done in a header file while building, so I > can't use the same approach and that would take not few work to move the > check to Autotools, so I've opened an issue on cryptsetup's gitlab: > https://gitlab.com/cryptsetup/cryptsetup/-/issues/709 > asking if they can manage it the way I've done for libfuse. > > So let's disable cryptsetup if we're building on Microblaze for the moment > and when the issue will be fixed upstream, I will bump the version and > re-enable building for Microblaze. > > Fixes: > http://autobuild.buildroot.net/results/86b/86b6b13e6be8375875caebcd91de91fef83f72e8/ > > Signed-off-by: Giulio Benetti > --- > package/cryptsetup/Config.in | 1 + > package/libblockdev/Config.in | 1 + > package/luksmeta/Config.in | 1 + > package/systemd/Config.in | 1 + > package/udisks/Config.in | 1 + > 5 files changed, 5 insertions(+) > > diff --git a/package/cryptsetup/Config.in b/package/cryptsetup/Config.in > index f36883ea47..2f3dd8d2b2 100644 > --- a/package/cryptsetup/Config.in > +++ b/package/cryptsetup/Config.in > @@ -1,6 +1,7 @@ > config BR2_PACKAGE_CRYPTSETUP > bool "cryptsetup" > depends on BR2_TOOLCHAIN_HAS_THREADS # lvm2 > + depends on !BR2_microblaze # wrong symver detection > depends on BR2_USE_MMU # lvm2, libargon2 > depends on !BR2_STATIC_LIBS # lvm2, libargon2 > depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c > diff --git a/package/libblockdev/Config.in b/package/libblockdev/Config.in > index 4389fd794c..38fe2331cf 100644 > --- a/package/libblockdev/Config.in > +++ b/package/libblockdev/Config.in > @@ -23,6 +23,7 @@ comment "plugins" > config BR2_PACKAGE_LIBBLOCKDEV_CRYPTO > bool "crypto" > depends on BR2_TOOLCHAIN_HAS_SYNC_4 # cryptsetup -> json-c > + depends on !BR2_microblaze # cryptsetup > select BR2_PACKAGE_CRYPTSETUP > > config BR2_PACKAGE_LIBBLOCKDEV_FS > diff --git a/package/luksmeta/Config.in b/package/luksmeta/Config.in > index ddc9b6f3bf..88a10bc9da 100644 > --- a/package/luksmeta/Config.in > +++ b/package/luksmeta/Config.in > @@ -1,6 +1,7 @@ > config BR2_PACKAGE_LUKSMETA > bool "luksmeta" > depends on BR2_TOOLCHAIN_HAS_THREADS # cryptsetup -> lvm2 > + depends on !BR2_microblaze # cryptsetup > depends on BR2_USE_MMU # cryptsetup -> lvm2 > depends on !BR2_STATIC_LIBS # cryptsetup -> lvm2 > depends on BR2_TOOLCHAIN_HAS_SYNC_4 # cryptsetup -> json-c > diff --git a/package/systemd/Config.in b/package/systemd/Config.in > index cc0736561e..d1e692f826 100644 > --- a/package/systemd/Config.in > +++ b/package/systemd/Config.in > @@ -228,6 +228,7 @@ config BR2_PACKAGE_SYSTEMD_HIBERNATE > config BR2_PACKAGE_SYSTEMD_HOMED > bool "enable home daemon" > depends on BR2_TOOLCHAIN_HAS_THREADS # cryptsetup -> lvm2 > + depends on !BR2_microblaze # cryptsetup > depends on BR2_USE_MMU # cryptsetup -> lvm2 > depends on !BR2_STATIC_LIBS # cryptsetup -> lvm2 > depends on BR2_TOOLCHAIN_HAS_SYNC_4 # cryptsetup -> json-c > diff --git a/package/udisks/Config.in b/package/udisks/Config.in > index 82f11ae7de..8a48d85924 100644 > --- a/package/udisks/Config.in > +++ b/package/udisks/Config.in > @@ -6,6 +6,7 @@ config BR2_PACKAGE_UDISKS > depends on BR2_TOOLCHAIN_HAS_THREADS # polkit > depends on BR2_USE_WCHAR # dbus-glib -> glib2 > depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libblockdev -> cryptsetup -> json-c > + depends on !BR2_microblaze # cryptsetup > depends on !BR2_STATIC_LIBS # polkit -> duktape > select BR2_PACKAGE_DBUS > select BR2_PACKAGE_DBUS_GLIB > -- > 2.25.1 > From arnout at mind.be Wed Feb 2 12:53:50 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 2 Feb 2022 13:53:50 +0100 Subject: [Buildroot] [git commit] package/util-linux: fix host build failure Message-ID: <20220202124656.810F982156@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d895bd973b35fde10d3dd7db530d9e4782926497 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The UTIL_LINUX_FIX_DISK_UTILS_COMPILE workaround is needed for host building too. So let's add it to HOST_UTIL_LINUX_POST_PATCH_HOOKS. host-util-linux is used a lot, so this patch fixes a lot of future builds. Fixes: http://autobuild.buildroot.net/results/b8c/b8cb40efc036a01802c914544cd4fc29dfd67af6// Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/util-linux/util-linux.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index e59ef7dadc..5a4ff64d01 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -41,6 +41,7 @@ define UTIL_LINUX_FIX_DISK_UTILS_COMPILE touch $(@D)/disk-utils/raw.8 endef UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE +HOST_UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf From yann.morin at orange.com Wed Feb 2 13:48:38 2022 From: yann.morin at orange.com (yann.morin at orange.com) Date: Wed, 2 Feb 2022 14:48:38 +0100 Subject: [Buildroot] [PATCHv2] package/glibc: allow runing on kernels older than used for the headers Message-ID: <19291_1643809720_61FA8BB8_19291_487_24_41ca9ce22939ce2ed0c41973db7d612542850824.1643809712.git.yann.morin@orange.com> From: "Yann E. MORIN" Currently, we configure glibc to not add compatibility support for kernels older than the one used for the headers. This is on the expectation that the system will never run on a kernel that is older than the one used for the headers or, when Buildroot builds the kernel, on another, older kernel. However, in some situations, it is possible to build for a generic system, where the kernel may be a different version. This can be the case, for example, when Building an image that is to be used in a container that can run on a range of machines each with different kernel versions. In such a case, it is interesting to build glibc in a way as to take better advantage of the newer kernels, and thus using newer kernel headers, while still allowing running on older kernels, and thus carrying more compatibility code. We add an option to glibc to allow the user to enable compatibility shims. To simplify the case, when that option is enabled, we just let glibc enable as old compatibility shims as supported by the current architecture. The code size increase is very small. For an ARM Cortex-A7, with gcc-10.3.0, the delta is as follows (other files installed by glibc had no size delta; sizes in bytes): file | no compat | compat | delta ----------------------+-----------+-----------+------- ld-linux-armhf.so.3 | 200216 | 200284 | + 68 libc.so.6 | 1814496 | 1823120 | +8624 ------+------- Total | +8692 No runtime overhead has been measured; the overhead is most probably in the measurement noise. Indeed, the compatibility shims are very lightweight. For example, there are 9 arch-generic shims: renameat2(), execveat(), mlock2(), statx(), faccessat2(), close_range(), time64-related syscall shenanigans, a waitid() feature, and a futex operation (LOCK_PI2) and then each arch may define a few others. i386 has less than 20 (mostly related to socket options, and one for the ordering of the clone() arguments), while ARM seems to have only two (mlock2() and a configurable futex feature). Note: however, as Arnout pointed out, some programs may still actually fail to run even with such compatibility shim, if they really expect the shimed syscalls to really exist and have no fallback (and/or no proper error-handling). Still, in the vast majority of cases, those compatibility shims are enough to have a system running. Signed-off-by: Yann E. MORIN Cc: Alexey Brodkin Cc: Arnout Vandecappelle --- Changes v1 -> v2: - don't let user provide a version, enable all compat shims (Arnout, Alexey) - add size measurements and explanations about no runtime overhead measurements (Arnout) --- package/glibc/Config.in | 12 ++++++++++++ package/glibc/glibc.mk | 8 ++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/package/glibc/Config.in b/package/glibc/Config.in index 5ecd058145..8e9ddac7d9 100644 --- a/package/glibc/Config.in +++ b/package/glibc/Config.in @@ -10,6 +10,18 @@ config BR2_PACKAGE_GLIBC help https://www.gnu.org/software/libc/ +config BR2_PACKAGE_GLIBC_KERNEL_COMPAT + bool "Enable compatibiltiy shims to run on older kernels" + help + Say 'y' here if you plan on running your system on a kernel + older than the version used for the toolchain headers. + + Enabling those compatibility shims may generate a slightly + bigger and slightly slower glibc library. + + The oldest supported kernel version depends on the + architecture. + config BR2_PACKAGE_GLIBC_UTILS bool "Install glibc utilities" help diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index 5c26b0e6df..9ea9f27a2f 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -98,6 +98,10 @@ endif GLIBC_MAKE = $(BR2_MAKE) GLIBC_CONF_ENV += ac_cv_prog_MAKE="$(BR2_MAKE)" +ifeq ($(BR2_PACKAGE_GLIBC_KERNEL_COMPAT),) +GLIBC_CONF_OPTS += --enable-kernel=$(call qstrip,$(BR2_TOOLCHAIN_HEADERS_AT_LEAST)) +endif + # Even though we use the autotools-package infrastructure, we have to # override the default configure commands for several reasons: # @@ -128,8 +132,8 @@ define GLIBC_CONFIGURE_CMDS --disable-profile \ --disable-werror \ --without-gd \ - --enable-kernel=$(call qstrip,$(BR2_TOOLCHAIN_HEADERS_AT_LEAST)) \ - --with-headers=$(STAGING_DIR)/usr/include) + --with-headers=$(STAGING_DIR)/usr/include \ + $(GLIBC_CONF_OPTS)) $(GLIBC_ADD_MISSING_STUB_H) endef -- 2.25.1 _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From giulio.benetti at benettiengineering.com Wed Feb 2 15:58:21 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 2 Feb 2022 16:58:21 +0100 Subject: [Buildroot] [PATCH] configs/microchip_sam9x60ek_mmc_dev_defconfig: expand rootfs size to 120M Message-ID: <20220202155821.4038299-1-giulio.benetti@benettiengineering.com> Default 60M for rootfs are not enough and generate a build failure, so let's expand rootfs size to 120M. Fixes: https://gitlab.com/ymorin/buildroot/-/jobs/2035821088 Signed-off-by: Giulio Benetti --- configs/microchip_sam9x60ek_mmc_dev_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/microchip_sam9x60ek_mmc_dev_defconfig b/configs/microchip_sam9x60ek_mmc_dev_defconfig index da1bd33dd3..00ccd784b5 100644 --- a/configs/microchip_sam9x60ek_mmc_dev_defconfig +++ b/configs/microchip_sam9x60ek_mmc_dev_defconfig @@ -7,6 +7,7 @@ BR2_TARGET_GENERIC_HOSTNAME="sam9x60ek" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/microchip/sam9x60ek_mmc/genimage.cfg" +BR2_TARGET_ROOTFS_EXT2_SIZE=120M BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,linux4microchip-2021.10)/linux-linux4microchip-2021.10.tar.gz" -- 2.25.1 From neal.frager at xilinx.com Wed Feb 2 16:55:55 2022 From: neal.frager at xilinx.com (Neal Frager) Date: Wed, 2 Feb 2022 09:55:55 -0700 Subject: [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2 Message-ID: <20220202165555.3497977-1-nealf@xilinx.com> Signed-off-by: Neal Frager --- board/zynqmp/genimage.cfg | 1 + ...-fix-Remove-GGC-ignore-Warray-bounds.patch | 68 ------- ...64-zynqmp-zcu106-fix-SPL-MMC-booting.patch | 52 ------ ...2-arm64-zynqmp-Enable-booting-to-ATF.patch | 114 ------------ ...ept-an-absolute-path-for-PMUFW_INIT_.patch | 68 ------- ...ynqmp-pass-the-PS-init-file-as-a-kco.patch | 175 ------------------ configs/zynqmp_zcu102_defconfig | 35 ++++ configs/zynqmp_zcu106_defconfig | 15 +- 8 files changed, 44 insertions(+), 484 deletions(-) delete mode 100644 board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch delete mode 100644 board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch delete mode 100644 board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch delete mode 100644 board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch delete mode 100644 board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch create mode 100644 configs/zynqmp_zcu102_defconfig diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg index ed202f4550..557364e124 100644 --- a/board/zynqmp/genimage.cfg +++ b/board/zynqmp/genimage.cfg @@ -3,6 +3,7 @@ image boot.vfat { files = { "boot.bin", "u-boot.bin", + "u-boot.itb", "atf-uboot.ub", "system.dtb", "Image" diff --git a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch b/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch deleted file mode 100644 index 0c1a9ba2a4..0000000000 --- a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch +++ /dev/null @@ -1,68 +0,0 @@ -From da003e6ada7d0217fe99dc7c649a731f8ebd3c34 Mon Sep 17 00:00:00 2001 -From: Deepika Bhavnani -Date: Thu, 15 Aug 2019 00:56:46 +0300 -Subject: [PATCH] Coverity fix: Remove GGC ignore -Warray-bounds - -GCC diagnostics were added to ignore array boundaries, instead -of ignoring GCC warning current code will check for array boundaries -and perform and array update only for valid elements. - -Resolves: `CID 246574` `CID 246710` `CID 246651` - -Signed-off-by: Deepika Bhavnani -Change-Id: I7530ecf7a1707351c6ee87e90cc3d33574088f57 - -Backported from: 41af05154abe136938bcfb5f26c969933784bbef -[Adapted to apply on 1.5] - ---- - lib/psci/psci_common.c | 20 ++++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) - -diff --git a/lib/psci/psci_common.c b/lib/psci/psci_common.c -index 2220a745cd6e..6282d992a2f0 100644 ---- a/lib/psci/psci_common.c -+++ b/lib/psci/psci_common.c -@@ -188,21 +188,17 @@ static unsigned int get_power_on_target_pwrlvl(void) - /****************************************************************************** - * Helper function to update the requested local power state array. This array - * does not store the requested state for the CPU power level. Hence an -- * assertion is added to prevent us from accessing the wrong index. -+ * assertion is added to prevent us from accessing the CPU power level. - *****************************************************************************/ - static void psci_set_req_local_pwr_state(unsigned int pwrlvl, - unsigned int cpu_idx, - plat_local_state_t req_pwr_state) - { -- /* -- * This should never happen, we have this here to avoid -- * "array subscript is above array bounds" errors in GCC. -- */ - assert(pwrlvl > PSCI_CPU_PWR_LVL); --#pragma GCC diagnostic push --#pragma GCC diagnostic ignored "-Warray-bounds" -- psci_req_local_pwr_states[pwrlvl - 1][cpu_idx] = req_pwr_state; --#pragma GCC diagnostic pop -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && -+ (cpu_idx < PLATFORM_CORE_COUNT)) { -+ psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx] = req_pwr_state; -+ } - } - - /****************************************************************************** -@@ -228,7 +224,11 @@ static plat_local_state_t *psci_get_req_local_pwr_states(unsigned int pwrlvl, - { - assert(pwrlvl > PSCI_CPU_PWR_LVL); - -- return &psci_req_local_pwr_states[pwrlvl - 1][cpu_idx]; -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && -+ (cpu_idx < PLATFORM_CORE_COUNT)) { -+ return &psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx]; -+ } else -+ return NULL; - } - - /* --- -2.34.0 - diff --git a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch b/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch deleted file mode 100644 index 4d85e1bb12..0000000000 --- a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch +++ /dev/null @@ -1,52 +0,0 @@ -From e5d72ed8339eb05285448aad3c89d21e4d18fd29 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Mon, 26 Feb 2018 09:40:34 +0100 -Subject: [PATCH] arm64: zynqmp: zcu106: fix SPL MMC booting - -The U-Boot SPL generated with the current zcu106 defconfig cannot boot -from MMC: - - [...] - U-Boot SPL 2018.01 (Feb 21 2018 - 17:47:14) - EL Level: EL3 - Trying to boot from MMC1 - sdhci_transfer_data: Error detected in status(0x408020)! - spl_load_image_fat_os: error reading image u-boot.bin, err - -2 - spl_load_image_fat: error reading image u-boot.img, err - -6 - SPL: failed to boot from all boot devices - ### ERROR ### Please RESET the board ### - -Fix by lowering the rpll value. The new value for the RPLL_CTRL -register comes from the current psu_init_gpl.c from the HDF file at -https://github.com/xilinx/hdf-examples/tree/01ad8ea5fd1989abf4ea5a072d019a16cb2bc546/zcu106-zynqmp -(generated by Vivado v2017.4). - -RPLL and sdio1_ref clocks before and after this change: - - - Old values: RPLL 1.36 GHz, sdio1_ref 272 MHz - - New values: RPLL 1.16 GHz, sdio1_ref 233 MHz - -Signed-off-by: Luca Ceresoli -Cc: Michal Simek -Upstream-status: accepted upstream in a different form ---- - - board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -index 4d18abe000ca..e6fa477e53e7 100644 ---- a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -+++ b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -@@ -10,7 +10,7 @@ - static unsigned long psu_pll_init_data(void) - { - psu_mask_write(0xFF5E0034, 0xFE7FEDEFU, 0x7E4E2C62U); -- psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00013C00U); -+ psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00014600U); - psu_mask_write(0xFF5E0030, 0x00000008U, 0x00000008U); - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000001U); - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000000U); --- -2.7.4 - diff --git a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch b/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch deleted file mode 100644 index 487fff6812..0000000000 --- a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 5e3cac50cc981e01d9072241035a8d4162560c71 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Mon, 12 Mar 2018 17:18:38 +0100 -Subject: [PATCH] arm64: zynqmp: Enable booting to ATF - -U-Boot is now able to boot to ARM Trusted Firmware (ATF). The boot -flow is SPL(EL3) loads ATF and full u-boot and jump to ATF(EL3) which -pass control to full u-boot(EL2). This has been tested on zcu106, so -enable it in this defconfig. - -To generate an image that triggers this booting flow, you need to pass -'-O arm-trusted-firmware' to mkimage. - -Signed-off-by: Luca Ceresoli -Signed-off-by: Michal Simek -Backported from upstream: http://git.denx.de/?p=u-boot.git;a=commit;h=5e3cac50cc981e01d9072241035a8d4162560c71 ---- - - configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 + - configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 + - configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 + - configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 + - configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 1 + - configs/xilinx_zynqmp_zcu102_revA_defconfig | 1 + - configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 + - 7 files changed, 7 insertions(+) - -diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig -index c5bfa2b12638..488c72258b0e 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig -index f86dce403a42..5d501eec0edd 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig -@@ -20,6 +20,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig -index 6e947cf56827..6f7eaebd7676 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig -@@ -16,6 +16,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_CMD_MEMTEST=y - CONFIG_SYS_ALT_MEMTEST=y -diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig -index 1c934858c61c..7a3806cba4b5 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig -@@ -17,6 +17,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_CMD_MEMTEST=y - CONFIG_SYS_ALT_MEMTEST=y -diff --git a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig -index e13c7c56f310..e4408f182ca0 100644 ---- a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig -+++ b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig b/configs/xilinx_zynqmp_zcu102_revA_defconfig -index 5b2cd495ee85..b52f6789fd4b 100644 ---- a/configs/xilinx_zynqmp_zcu102_revA_defconfig -+++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig -index e6530fbfe7ff..80592554f682 100644 ---- a/configs/xilinx_zynqmp_zcu102_revB_defconfig -+++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y --- -2.7.4 - diff --git a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch b/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch deleted file mode 100644 index 95ab7b3b75..0000000000 --- a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch +++ /dev/null @@ -1,68 +0,0 @@ -From c7df098a71e05dc81cee818747759e8060b59626 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Mon, 4 Jun 2018 12:21:01 +0200 -Subject: [PATCH] arm64: zynqmp: accept an absolute path for PMUFW_INIT_FILE - -The value of PMUFW_INIT_FILE is prefixed with "$(srctree)/", thus -forcing it to be a relative path inside the U-Boot source tree. Since -the PMUFW is a binary file generated outside of U-Boot, the PMUFW -binary must be copied inside the U-Boot source tree before the -build. - -This generates a few problems: - - * if the source tree is shared among different out-of-tree builds, - they will pollute (and potentially corrupt) each other - * the source tree cannot be read-only - * any buildsystem must add a command to copy the PMUFW binary - * putting an externally-generated binary in the source tree is ugly - as hell - -Avoid these problems by accepting an absolute path for -PMUFW_INIT_FILE. This would be as simple as removing the "$(srctree)/" -prefix, but in order to keep backward compatibility we rather use the -shell and readlink to get the absolute path even when starting from a -relative path. - -Since 'readlink -f' produces an empty string if the file does not -exist, we also add a check to ensure the file configured in -PMUFW_INIT_FILE exists. Otherwise the build would exit successfully, -but produce a boot.bin without PMUFW as if PMUFW_INIT_FILE were empty. - -Tested in the 12 possible combinations of: - - PMUFW_INIT_FILE empty, relative, absolute, non-existing - - building in-tree, in subdir, in other directory - -Signed-off-by: Luca Ceresoli -Cc: Michal Simek -Cc: Simon Glass -Cc: Emmanuel Vadot -Signed-off-by: Michal Simek -Backported from upstream: https://git.denx.de/?p=u-boot.git;a=commit;h=c7df098a71e05dc81cee818747759e8060b59626 ---- - scripts/Makefile.spl | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl -index ef018b5b4056..252f13826d4c 100644 ---- a/scripts/Makefile.spl -+++ b/scripts/Makefile.spl -@@ -167,8 +167,14 @@ ifdef CONFIG_ARCH_ZYNQ - MKIMAGEFLAGS_boot.bin = -T zynqimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) - endif - ifdef CONFIG_ARCH_ZYNQMP -+ifneq ($(CONFIG_PMUFW_INIT_FILE),"") -+spl/boot.bin: zynqmp-check-pmufw -+zynqmp-check-pmufw: FORCE -+ ( cd $(srctree) && test -r $(CONFIG_PMUFW_INIT_FILE) ) \ -+ || ( echo "Cannot read $(CONFIG_PMUFW_INIT_FILE)" && false ) -+endif - MKIMAGEFLAGS_boot.bin = -T zynqmpimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) \ -- -n $(srctree)/$(CONFIG_PMUFW_INIT_FILE) -+ -n "$(shell cd $(srctree); readlink -f $(CONFIG_PMUFW_INIT_FILE))" - endif - - spl/boot.bin: $(obj)/u-boot-spl.bin FORCE --- -2.7.4 - diff --git a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch b/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch deleted file mode 100644 index b32e162780..0000000000 --- a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch +++ /dev/null @@ -1,175 +0,0 @@ -From 4c9d54ab5a41d65000c8d249b6fb1b76056f1812 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Wed, 20 Jun 2018 12:11:50 +0200 -Subject: [PATCH] arm/arm64: zynq/zynqmp: pass the PS init file as a kconfig - variable - -U-Boot needs to link ps7_init_gpl.c on Zynq or psu_init_gpl.c on -ZynqMP (PS init for short). The current logic to locate this file for -both platforms is: - - 1. if a board-specific file exists in - board/xilinx/zynq[mp]/$(CONFIG_DEFAULT_DEVICE_TREE)/ps?_init_gpl.c - then use it - 2. otherwise use board/xilinx/zynq/ps?_init_gpl.c - -In the latter case the file does not exist in the U-Boot sources and -must be copied in the source tree from the outside before starting the -build. This is typical when it is generated from Xilinx tools while -developing a custom hardware. However making sure that a -board-specific file is _not_ found (and used) requires some trickery -such as removing or overwriting all PS init files (e.g.: the current -meta-xilinx yocto layer [0]). - -This generates a few problems: - - * if the source tree is shared among different out-of-tree builds, - they will pollute (and potentially corrupt) each other - * the source tree cannot be read-only - * any buildsystem must add a command to copy the PS init file binary - * overwriting or deleting files in the source tree is ugly as hell - -Simplify usage by allowing to pass the path to the desired PS init -file in kconfig variable XILINX_PS_INIT_FILE. It can be an absolute -path or relative to $(srctree). If the variable is set, the -user-specified file will always be used without being copied -around. If the the variable is left empty, for backward compatibility -fall back to the old behaviour. - -Since the issue is the same for Zynq and ZynqMP, add one kconfig -variable in a common place and use it for both. - -Also use the new kconfig help text to document all the ways to give -U-Boot the PS init file. - -Build-tested with all combinations of: - - platform: zynq or zynqmp - - PS init file: from XILINX_PS_INIT_FILE (absolute, relative path, - non-existing), in-tree board-specific, in board/xilinx/zynq[mp]/ - - building in-tree, in subdir, in other directory - -[0] https://github.com/Xilinx/meta-xilinx/blob/b2f74cc7fe5c4881589d5e440a17cb51fc66a7ab/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init.inc#L9 - -Signed-off-by: Luca Ceresoli -Cc: Albert Aribaud -Cc: Michal Simek -Cc: Nathan Rossi -Backported from upstream: https://git.denx.de/?p=u-boot.git;a=commit;h=6da4f67ad09cd8b311d77b2b04e557b7ef65b56c ---- - arch/arm/Kconfig | 1 + - board/xilinx/Kconfig | 41 +++++++++++++++++++++++++++++++++++++++++ - board/xilinx/zynq/Makefile | 10 +++++++++- - board/xilinx/zynqmp/Makefile | 10 +++++++++- - 4 files changed, 60 insertions(+), 2 deletions(-) - create mode 100644 board/xilinx/Kconfig - -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 22234cde2ab6..e04979d0ef7e 100644 ---- a/arch/arm/Kconfig -+++ b/arch/arm/Kconfig -@@ -1293,4 +1293,5 @@ source "board/technologic/ts4600/Kconfig" - source "board/vscom/baltos/Kconfig" - source "board/woodburn/Kconfig" - source "board/work-microwave/work_92105/Kconfig" -+source "board/xilinx/Kconfig" - source "board/zipitz2/Kconfig" - - source "arch/arm/Kconfig.debug" -diff --git a/board/xilinx/Kconfig b/board/xilinx/Kconfig -new file mode 100644 -index 000000000000..aa3fa061edef ---- /dev/null -+++ b/board/xilinx/Kconfig -@@ -0,0 +1,41 @@ -+# Copyright (c) 2018, Luca Ceresoli -+# -+# SPDX-License-Identifier: GPL-2.0 -+ -+if ARCH_ZYNQ || ARCH_ZYNQMP -+ -+config XILINX_PS_INIT_FILE -+ string "Zynq/ZynqMP PS init file(s) location" -+ help -+ On Zynq and ZynqMP U-Boot SPL (or U-Boot proper if -+ ZYNQMP_PSU_INIT_ENABLED is set) is responsible for some -+ basic initializations, such as enabling peripherals and -+ configuring pinmuxes. The PS init file (called -+ psu_init_gpl.c on ZynqMP, ps7_init_gpl.c for Zynq-7000) -+ contains the code for such initializations. -+ -+ U-Boot contains PS init files for some boards, but each of -+ them describes only one specific configuration. Users of a -+ different board, or needing a different configuration, can -+ generate custom files using the Xilinx development tools. -+ -+ There are three ways to give a PS init file to U-Boot: -+ -+ 1. Set this variable to the path, either relative to the -+ source tree or absolute, where the psu_init_gpl.c or -+ ps7_init_gpl.c file is located. U-Boot will build this -+ file. -+ -+ 2. If you leave an empty string here, U-Boot will use -+ board/xilinx/zynq/$(CONFIG_DEFAULT_DEVICE_TREE)/ps7_init_gpl.c -+ for Zynq-7000, or -+ board/xilinx/zynqmp/$(CONFIG_DEFAULT_DEVICE_TREE)/psu_init_gpl.c -+ for ZynqMP. -+ -+ 3. If the above file does not exist, U-Boot will use -+ board/xilinx/zynq/ps7_init_gpl.c for Zynq-7000, or -+ board/xilinx/zynqmp/psu_init_gpl.c for ZynqMP. This file -+ is not provided by U-Boot, you have to copy it there -+ before the build. -+ -+endif -diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile -index 5a76a26720cd..03ad5f0532ee 100644 ---- a/board/xilinx/zynq/Makefile -+++ b/board/xilinx/zynq/Makefile -@@ -5,10 +5,18 @@ - - obj-y := board.o - --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE)) -+init-objs := ps_init_gpl.o -+spl/board/xilinx/zynq/ps_init_gpl.o board/xilinx/zynq/ps_init_gpl.o: $(PS_INIT_FILE) -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ -+endif - -+ifeq ($(init-objs),) -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/ps7_init_gpl.c),\ - $(hw-platform-y)/ps7_init_gpl.o) -+endif - - ifeq ($(init-objs),) - ifneq ($(wildcard $(srctree)/$(src)/ps7_init_gpl.c),) -diff --git a/board/xilinx/zynqmp/Makefile b/board/xilinx/zynqmp/Makefile -index 05ccd25dcef3..960b81fc5853 100644 ---- a/board/xilinx/zynqmp/Makefile -+++ b/board/xilinx/zynqmp/Makefile -@@ -5,10 +5,18 @@ - - obj-y := zynqmp.o - --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE)) -+init-objs := ps_init_gpl.o -+spl/board/xilinx/zynqmp/ps_init_gpl.o board/xilinx/zynqmp/ps_init_gpl.o: $(PS_INIT_FILE) -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ -+endif - -+ifeq ($(init-objs),) -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/psu_init_gpl.c),\ - $(hw-platform-y)/psu_init_gpl.o) -+endif - - ifeq ($(init-objs),) - ifneq ($(wildcard $(srctree)/$(src)/psu_init_gpl.c),) --- -2.7.4 - diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig new file mode 100644 index 0000000000..336f5c2dbe --- /dev/null +++ b/configs/zynqmp_zcu102_defconfig @@ -0,0 +1,35 @@ +BR2_aarch64=y +BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2" +BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.4_2021.2" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" +BR2_TARGET_UBOOT_ZYNQMP=y +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/master/bin/pmufw-v2021.2.bin" +BR2_TARGET_UBOOT_FORMAT_ITB=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index bee7c1daf7..3a6947e1e8 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -1,11 +1,11 @@ BR2_aarch64=y BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" @@ -14,21 +14,22 @@ BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.4_2021.2" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/53fdb7b6c92860ceb0ec5fd14deee302f4a84269/bin/pmufw-zcu106-default-v2017.4.bin" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/master/bin/pmufw-v2021.2.bin" +BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -- 2.17.1 From Alexey.Brodkin at synopsys.com Wed Feb 2 17:00:00 2022 From: Alexey.Brodkin at synopsys.com (Alexey Brodkin) Date: Wed, 2 Feb 2022 17:00:00 +0000 Subject: [Buildroot] [PATCHv2] package/glibc: allow runing on kernels older than used for the headers In-Reply-To: <19291_1643809720_61FA8BB8_19291_487_24_41ca9ce22939ce2ed0c41973db7d612542850824.1643809712.git.yann.morin@orange.com> References: <19291_1643809720_61FA8BB8_19291_487_24_41ca9ce22939ce2ed0c41973db7d612542850824.1643809712.git.yann.morin@orange.com> Message-ID: Hi Yann, > We add an option to glibc to allow the user to enable compatibility > shims. To simplify the case, when that option is enabled, we just let > glibc enable as old compatibility shims as supported by the current > architecture. Looks reasonable to me. I mean to not have all the flexibility proposed initially, instead adding an option to fall back to something much older compared to used headers. If more options are needed later, we'll get to know it at some point ;) And thanks for doing that, as I meant to do something similar a while ago, but never posted my local changes. -Alexey From giulio.benetti at benettiengineering.com Wed Feb 2 17:10:34 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 2 Feb 2022 18:10:34 +0100 Subject: [Buildroot] [PATCH] configs/pcengines_apu2_defconfig: linux needs host libelf Message-ID: <20220202171035.1740791-1-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- configs/pcengines_apu2_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/pcengines_apu2_defconfig b/configs/pcengines_apu2_defconfig index 0792c93c19..a85808554c 100644 --- a/configs/pcengines_apu2_defconfig +++ b/configs/pcengines_apu2_defconfig @@ -8,6 +8,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION=y 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" +BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y # Default hostname and TTY BR2_TARGET_GENERIC_HOSTNAME="apu2" -- 2.25.1 From giulio.benetti at benettiengineering.com Wed Feb 2 17:10:35 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 2 Feb 2022 18:10:35 +0100 Subject: [Buildroot] [PATCH] configs/roc_pc_rk3399_defconfig: expand rootfs size to 120M In-Reply-To: <20220202171035.1740791-1-giulio.benetti@benettiengineering.com> References: <20220202171035.1740791-1-giulio.benetti@benettiengineering.com> Message-ID: <20220202171035.1740791-2-giulio.benetti@benettiengineering.com> Default 60M for rootfs are not enough and generate a build failure, so let's expand rootfs size to 120M. Signed-off-by: Giulio Benetti --- configs/roc_pc_rk3399_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/roc_pc_rk3399_defconfig b/configs/roc_pc_rk3399_defconfig index dfbc5e4f47..ae7cf19a80 100644 --- a/configs/roc_pc_rk3399_defconfig +++ b/configs/roc_pc_rk3399_defconfig @@ -45,7 +45,7 @@ BR2_TARGET_GENERIC_HOSTNAME="roc-rk3399-pc" BR2_TARGET_GENERIC_ISSUE="Welcome to ROC-RK3399-PC!" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="64M" +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -- 2.25.1 From fontaine.fabrice at gmail.com Wed Feb 2 17:33:06 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 2 Feb 2022 18:33:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/sconeserver: fix build with icu and libxml2 Message-ID: <20220202173306.42559-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since addition of icu support in libxml2 through commit 49d7c85421e87d9d762be9352805cb47a2f0bbeb: In file included from /home/peko/autobuild/instance-1/output-1/host/mips64el-buildroot-linux-gnu/sysroot/usr/include/unicode/ptypes.h:52:0, from /home/peko/autobuild/instance-1/output-1/host/mips64el-buildroot-linux-gnu/sysroot/usr/include/unicode/umachine.h:46, from /home/peko/autobuild/instance-1/output-1/host/mips64el-buildroot-linux-gnu/sysroot/usr/include/unicode/utypes.h:38, from /home/peko/autobuild/instance-1/output-1/host/mips64el-buildroot-linux-gnu/sysroot/usr/include/unicode/ucnv_err.h:88, from /home/peko/autobuild/instance-1/output-1/host/mips64el-buildroot-linux-gnu/sysroot/usr/include/unicode/ucnv.h:51, from /home/peko/autobuild/instance-1/output-1/host/mips64el-buildroot-linux-gnu/sysroot/usr/bin/../../usr/include/libxml2/libxml/encoding.h:31, from /home/peko/autobuild/instance-1/output-1/host/mips64el-buildroot-linux-gnu/sysroot/usr/bin/../../usr/include/libxml2/libxml/parser.h:812, from conftest.cpp:61: /home/peko/autobuild/instance-1/output-1/host/mips64el-buildroot-linux-gnu/sysroot/usr/include/unicode/localpointer.h:224:41: error: 'noexcept' does not name a type LocalPointer(LocalPointer &&src) U_NOEXCEPT : LocalPointerBase(src.ptr) { ^ /home/peko/autobuild/instance-1/output-1/host/mips64el-buildroot-linux-gnu/sysroot/usr/include/unicode/localpointer.h:224:41: note: C++11 'noexcept' only available with -std=c++11 or -std=gnu++11 Fixes: - http://autobuild.buildroot.org/results/be043792e6e5501631517881b10096291a654364 Signed-off-by: Fabrice Fontaine --- package/sconeserver/sconeserver.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/sconeserver/sconeserver.mk b/package/sconeserver/sconeserver.mk index 17407c29f5..2b28f8015c 100644 --- a/package/sconeserver/sconeserver.mk +++ b/package/sconeserver/sconeserver.mk @@ -29,6 +29,8 @@ SCONESERVER_CONF_OPTS += \ ifeq ($(BR2_PACKAGE_LIBXML2),y) SCONESERVER_CONF_OPTS += \ --with-xml2-config="$(STAGING_DIR)/usr/bin/xml2-config" +# Needed to fix build failure when icu is enabled in libxml2 +SCONESERVER_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" endif ifeq ($(BR2_PACKAGE_OPENSSL),y) -- 2.34.1 From festevam at gmail.com Wed Feb 2 17:49:48 2022 From: festevam at gmail.com (Fabio Estevam) Date: Wed, 2 Feb 2022 14:49:48 -0300 Subject: [Buildroot] [PATCH] configs/warp7: bump Kernel and U-Boot version Message-ID: <20220202174948.1919945-1-festevam@gmail.com> Bump U-Boot to 2022.01 and kernel to version 5.16.5. Signed-off-by: Fabio Estevam --- configs/warp7_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig index 5fca9f6cfc..04dfc94f7d 100644 --- a/configs/warp7_defconfig +++ b/configs/warp7_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 5.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +# Linux headers same as kernel, a 5.16 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -15,7 +15,7 @@ BR2_ROOTFS_OVERLAY="board/warp7/rootfs_overlay" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.14" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16.5" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7s-warp" @@ -25,7 +25,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="warp7" 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_FORMAT_DTB_IMX=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y -- 2.25.1 From petr.vorel at gmail.com Wed Feb 2 18:25:13 2022 From: petr.vorel at gmail.com (Petr Vorel) Date: Wed, 2 Feb 2022 19:25:13 +0100 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: Hi, gentle ping for a review. Kind regards, Petr > 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" From james.hilliard1 at gmail.com Wed Feb 2 19:39:20 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 2 Feb 2022 12:39:20 -0700 Subject: [Buildroot] [PATCH 1/1] package:{clang, lld, llvm}: bump to version 11.1.0 In-Reply-To: <731c2ec5-e693-f2d4-5f48-0eaf376c57d1@smile.fr> References: <20220131015937.4113728-1-james.hilliard1@gmail.com> <20220131104553.715b97ce@windsurf> <731c2ec5-e693-f2d4-5f48-0eaf376c57d1@smile.fr> Message-ID: On Mon, Jan 31, 2022 at 4:36 AM Romain Naour wrote: > > Hello James, Thomas, All, > > Le 31/01/2022 ? 10:45, Thomas Petazzoni via buildroot a ?crit : > > On Sun, 30 Jan 2022 18:59:37 -0700 > > James Hilliard wrote: > > > >> This appears to be the latest version that has a working lld build. > >> > >> Version 12.0.0 and newer have broken lld stand-alone builds: > >> https://bugs.llvm.org/show_bug.cgi?id=49228 > >> > >> Signed-off-by: James Hilliard > > > > Is this really enough? I remember seeing patches a long time ago doing > > bumps on LLVM/Clang and that was much more involved, which I think > > explains why we're still at version 9.x. > > > > Romain, any comments on this? > > Adding Matt in Cc: > > IIRC, there is an issue with libclc package which is part of the llvm project. > > Due to the gap between the two version, all CMake options must be reviewed (long > and boring task I agree). Oh, I guess there was already a series here with more changes: https://patchwork.ozlabs.org/project/buildroot/list/?series=233431&submitter=&state=*&q=&archive=both&delegate= > > Best regards, > Romain > > > > > Thomas > From james.hilliard1 at gmail.com Wed Feb 2 20:34:11 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 2 Feb 2022 13:34:11 -0700 Subject: [Buildroot] [PATCH 1/1] package/python3-setuptools: bump to version 60.7.0 Message-ID: <20220202203411.150459-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-setuptools/60.6.0/python-setuptools.hash | 4 ---- .../{60.6.0 => 60.7.0}/0001-add-executable.patch | 0 package/python-setuptools/60.7.0/python-setuptools.hash | 4 ++++ package/python-setuptools/python-setuptools.mk | 4 ++-- package/python3-setuptools/0001-add-executable.patch | 2 +- package/python3-setuptools/python3-setuptools.hash | 2 +- package/python3-setuptools/python3-setuptools.mk | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 package/python-setuptools/60.6.0/python-setuptools.hash rename package/python-setuptools/{60.6.0 => 60.7.0}/0001-add-executable.patch (100%) create mode 100644 package/python-setuptools/60.7.0/python-setuptools.hash diff --git a/package/python-setuptools/60.6.0/python-setuptools.hash b/package/python-setuptools/60.6.0/python-setuptools.hash deleted file mode 100644 index 734cb4d580..0000000000 --- a/package/python-setuptools/60.6.0/python-setuptools.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From https://pypi.org/pypi/setuptools/json -md5 392e91d7e244998c586c88da2cf881d3 setuptools-60.6.0.tar.gz -sha256 eb83b1012ae6bf436901c2a2cee35d45b7260f31fd4b65fd1e50a9f99c11d7f8 setuptools-60.6.0.tar.gz -sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE diff --git a/package/python-setuptools/60.6.0/0001-add-executable.patch b/package/python-setuptools/60.7.0/0001-add-executable.patch similarity index 100% rename from package/python-setuptools/60.6.0/0001-add-executable.patch rename to package/python-setuptools/60.7.0/0001-add-executable.patch diff --git a/package/python-setuptools/60.7.0/python-setuptools.hash b/package/python-setuptools/60.7.0/python-setuptools.hash new file mode 100644 index 0000000000..8df7155d4c --- /dev/null +++ b/package/python-setuptools/60.7.0/python-setuptools.hash @@ -0,0 +1,4 @@ +# From https://pypi.org/pypi/setuptools/json +md5 082637e8fbc2e1fd9c637665d8fcccd8 setuptools-60.7.0.tar.gz +sha256 b83cf328a4f6a987c95610e76b29a30778db05174eef71f771776c48f8f25d1b setuptools-60.7.0.tar.gz +sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk index 15912d96f5..8bca852fe2 100644 --- a/package/python-setuptools/python-setuptools.mk +++ b/package/python-setuptools/python-setuptools.mk @@ -9,9 +9,9 @@ ifeq ($(BR2_PACKAGE_PYTHON3),y) # Please keep in sync with # package/python3-setuptools/python3-setuptools.mk -PYTHON_SETUPTOOLS_VERSION = 60.6.0 +PYTHON_SETUPTOOLS_VERSION = 60.7.0 PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON3_SETUPTOOLS_VERSION).tar.gz -PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/8f/89/9fec81ec84737c925a1ee992af2c6c7153aec4051c26afeadd6b822354d2 +PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/29/dd/48d662bb93e5e51e72265ef612f869947d4ae4126328d7156824cd50d440 else # Python PYTHON_SETUPTOOLS_VERSION = 44.0.0 PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).zip diff --git a/package/python3-setuptools/0001-add-executable.patch b/package/python3-setuptools/0001-add-executable.patch index 9d608239bc..46b5935d33 120000 --- a/package/python3-setuptools/0001-add-executable.patch +++ b/package/python3-setuptools/0001-add-executable.patch @@ -1 +1 @@ -../python-setuptools/60.6.0/0001-add-executable.patch \ No newline at end of file +../python-setuptools/60.7.0/0001-add-executable.patch \ No newline at end of file diff --git a/package/python3-setuptools/python3-setuptools.hash b/package/python3-setuptools/python3-setuptools.hash index 9fb96015aa..2c9d3614d5 120000 --- a/package/python3-setuptools/python3-setuptools.hash +++ b/package/python3-setuptools/python3-setuptools.hash @@ -1 +1 @@ -../python-setuptools/60.6.0/python-setuptools.hash \ No newline at end of file +../python-setuptools/60.7.0/python-setuptools.hash \ No newline at end of file diff --git a/package/python3-setuptools/python3-setuptools.mk b/package/python3-setuptools/python3-setuptools.mk index 55a01dba01..d5aaa01918 100644 --- a/package/python3-setuptools/python3-setuptools.mk +++ b/package/python3-setuptools/python3-setuptools.mk @@ -6,9 +6,9 @@ # Please keep in sync with # package/python-setuptools/python-setuptools.mk -PYTHON3_SETUPTOOLS_VERSION = 60.6.0 +PYTHON3_SETUPTOOLS_VERSION = 60.7.0 PYTHON3_SETUPTOOLS_SOURCE = setuptools-$(PYTHON3_SETUPTOOLS_VERSION).tar.gz -PYTHON3_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/8f/89/9fec81ec84737c925a1ee992af2c6c7153aec4051c26afeadd6b822354d2 +PYTHON3_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/29/dd/48d662bb93e5e51e72265ef612f869947d4ae4126328d7156824cd50d440 PYTHON3_SETUPTOOLS_LICENSE = MIT PYTHON3_SETUPTOOLS_LICENSE_FILES = LICENSE PYTHON3_SETUPTOOLS_CPE_ID_VENDOR = python -- 2.25.1 From giulio.benetti at benettiengineering.com Wed Feb 2 20:37:25 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 2 Feb 2022 21:37:25 +0100 Subject: [Buildroot] [PATCH] package/cryptsetup: fix build failure with Microblaze Message-ID: <20220202203725.2115889-1-giulio.benetti@benettiengineering.com> Add local patch pending upstream[1] to fix the build failure after my suggestion[2] to imitate what I've done with libfuse[3]. [1]: https://gitlab.com/cryptsetup/cryptsetup/-/merge_requests/275?commit_id=5f71b3d63181aa88a68f7f71eab8801f2d8d2cde [2]: https://gitlab.com/cryptsetup/cryptsetup/-/issues/709 [3]: https://github.com/libfuse/libfuse/pull/620/commits/3aba09a5c56e017746c5c1652dbc845f4db7374a Fixes: http://autobuild.buildroot.net/results/bad/bad4d01fde3191e4d481a8e9dae18df3b1a94537/ Signed-off-by: Giulio Benetti --- ...d-check-program-for-symver-attribute.patch | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 package/cryptsetup/0001-Add-check-program-for-symver-attribute.patch diff --git a/package/cryptsetup/0001-Add-check-program-for-symver-attribute.patch b/package/cryptsetup/0001-Add-check-program-for-symver-attribute.patch new file mode 100644 index 0000000000..04f59a2050 --- /dev/null +++ b/package/cryptsetup/0001-Add-check-program-for-symver-attribute.patch @@ -0,0 +1,56 @@ +From 7c6ec620de3f99d4212f4a54aa576df1b97020ab Mon Sep 17 00:00:00 2001 +From: Ondrej Kozina +Date: Wed, 2 Feb 2022 11:34:57 +0100 +Subject: [PATCH] Add check program for symver attribute. + +Fixes: #709. +Signed-off-by: Giulio Benetti +--- + configure.ac | 11 +++++++++++ + lib/libcryptsetup_symver.h | 8 +++----- + 2 files changed, 14 insertions(+), 5 deletions(-) + +diff --git a/configure.ac b/configure.ac +index a0e5990d..b052f8cf 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -554,6 +554,17 @@ if test "x$enable_static_cryptsetup" = "xyes"; then + PKG_CONFIG=$saved_PKG_CONFIG + fi + ++dnl Check compiler support for symver function attribute ++saved_CFLAGS=$CFLAGS ++CFLAGS="-O0 -Werror" ++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ++ void _test_sym(void); ++ __attribute__((__symver__("sym at VERSION_4.2"))) void _test_sym(void) {} ++]], ++[[ _test_sym() ]] ++)],[ AC_DEFINE([HAVE_ATTRIBUTE_SYMVER], 1, [Define to 1 to use __attribute__((symver))])]) ++CFLAGS=$saved_CFLAGS ++ + AC_MSG_CHECKING([for systemd tmpfiles config directory]) + PKG_CHECK_VAR([systemd_tmpfilesdir], [systemd], [tmpfilesdir], [], [systemd_tmpfilesdir=no]) + AC_MSG_RESULT([$systemd_tmpfilesdir]) +diff --git a/lib/libcryptsetup_symver.h b/lib/libcryptsetup_symver.h +index 2a804b6a..3558310d 100644 +--- a/lib/libcryptsetup_symver.h ++++ b/lib/libcryptsetup_symver.h +@@ -67,11 +67,9 @@ + * under CRYPT_SYMBOL_EXPORT_OLD(int, crypt_func_X, ...) macro + */ + +-#ifdef __has_attribute +-# if __has_attribute(symver) +-# define _CRYPT_SYMVER(_local_sym, _public_sym, _ver_str, _maj, _min) \ +- __attribute__((__symver__(#_public_sym _ver_str #_maj "." #_min))) +-# endif ++#if HAVE_ATTRIBUTE_SYMVER ++# define _CRYPT_SYMVER(_local_sym, _public_sym, _ver_str, _maj, _min) \ ++ __attribute__((__symver__(#_public_sym _ver_str #_maj "." #_min))) + #endif + + #if !defined(_CRYPT_SYMVER) && defined(__GNUC__) +-- +2.25.1 + -- 2.25.1 From ps.report at gmx.net Wed Feb 2 20:37:46 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 2 Feb 2022 21:37:46 +0100 Subject: [Buildroot] [PATCH v2] package/util-linux: bump version to 2.37.3 (fixes CVE-2021-3996, CVE-2021-3995) In-Reply-To: References: <20220125221533.17535-1-ps.report@gmx.net> Message-ID: <20220202213746.779fee61@gmx.net> Hello Arnout, On Tue, 1 Feb 2022 23:00:06 +0100, Arnout Vandecappelle wrote: > On 25/01/2022 23:15, Peter Seiderer wrote: > > - add 'touch' workaround for missing disk-utils/raw.8 file ([1], [2]) in > > util-linux-2.37.4 release download package > > 2.37.3 I assume. Yes... > > > > > For details see [1]. > > > > [1] https://www.spinics.net/lists/util-linux-ng/msg17037.html This reference should be [3] and the links for [1] and [2] are missing: [1] https://github.com/util-linux/util-linux/issues/1579 [2] https://github.com/util-linux/util-linux/issues/1577 > > > > 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 > > 2.37.3 as well. Yes... > > I moved this hunk to the beginning of the file, to increase the chance that it > is noticed on next bump (which hopefully makes it unneeded). > > > +# 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 > > I moved this to a post-patch instead of pre-build hook. > > > Applied to master, thanks. Thanks for cleaning up my mess... Regards, Peter > > Regards, > Arnout > > > + > > # Install PAM configuration files > > ifeq ($(BR2_PACKAGE_UTIL_LINUX_SU)$(BR2_PACKAGE_LINUX_PAM),yy) > > define UTIL_LINUX_INSTALL_PAMFILES > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From ps.report at gmx.net Wed Feb 2 20:42:10 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 2 Feb 2022 21:42:10 +0100 Subject: [Buildroot] [URGENT 1/1] package/util-linux: fix host build failure In-Reply-To: References: <20220201232203.333403-1-giulio.benetti@benettiengineering.com> <20220201232203.333403-2-giulio.benetti@benettiengineering.com> Message-ID: <20220202214210.0a2483e6@gmx.net> Hello Arnout, Giulio, On Wed, 2 Feb 2022 08:41:34 +0100, Arnout Vandecappelle wrote: > On 02/02/2022 00:22, Giulio Benetti wrote: > > The UTIL_LINUX_FIX_DISK_UTILS_COMPILE workaround is needed for host > > building too. So let's add it to HOST_UTIL_LINUX_POST_PATCH_HOOKS. > > host-util-linux is used a lot, so this patch fixes a lot of future > > builds. > > Darn, I tested that, both with and without BR2_PACKAGE_HOST_UTIL_LINUX set. I > don't understand what went wrong in my test... The raw support depends on the available toolchain headers, see e.g. package/util-linux/Config.in: config BR2_PACKAGE_UTIL_LINUX_RAW bool "raw" depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_14 help Build a linux raw character device Or according to [1] '--disable-raw' for the host build should do the trick too... Regards, Peter [1] https://github.com/util-linux/util-linux/issues/1577 > > Anyway, applied to master, thanks. > > Regards, > Arnout > > > > > > Signed-off-by: Giulio Benetti > > --- > > package/util-linux/util-linux.mk | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk > > index e59ef7dadc..5a4ff64d01 100644 > > --- a/package/util-linux/util-linux.mk > > +++ b/package/util-linux/util-linux.mk > > @@ -41,6 +41,7 @@ define UTIL_LINUX_FIX_DISK_UTILS_COMPILE > > touch $(@D)/disk-utils/raw.8 > > endef > > UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE > > +HOST_UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE > > > > HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf > > From giulio.benetti at benettiengineering.com Wed Feb 2 21:09:22 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 2 Feb 2022 22:09:22 +0100 Subject: [Buildroot] [URGENT 1/1] package/util-linux: fix host build failure In-Reply-To: <20220202214210.0a2483e6@gmx.net> References: <20220201232203.333403-1-giulio.benetti@benettiengineering.com> <20220201232203.333403-2-giulio.benetti@benettiengineering.com> <20220202214210.0a2483e6@gmx.net> Message-ID: <48ab9669-d467-a394-12a2-fd229f6229f0@benettiengineering.com> Hi Peter, On 02/02/22 21:42, Peter Seiderer wrote: > Hello Arnout, Giulio, > > On Wed, 2 Feb 2022 08:41:34 +0100, Arnout Vandecappelle wrote: > >> On 02/02/2022 00:22, Giulio Benetti wrote: >>> The UTIL_LINUX_FIX_DISK_UTILS_COMPILE workaround is needed for host >>> building too. So let's add it to HOST_UTIL_LINUX_POST_PATCH_HOOKS. >>> host-util-linux is used a lot, so this patch fixes a lot of future >>> builds. >> >> Darn, I tested that, both with and without BR2_PACKAGE_HOST_UTIL_LINUX set. I >> don't understand what went wrong in my test... > > The raw support depends on the available toolchain headers, see e.g. > package/util-linux/Config.in: > > config BR2_PACKAGE_UTIL_LINUX_RAW > bool "raw" > depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_14 > help > Build a linux raw character device > > Or according to [1] '--disable-raw' for the host build should do > the trick too... I was in hurry to produce the patch last night, so I went for the fastest way. Can you give a try with --disable-raw and eventually submit the patch? That would save some time while building. Also because host-util-linux is used a lot Thank you! Best regards -- Giulio Benetti Benetti Engineering sas > Regards, > Peter > > [1] https://github.com/util-linux/util-linux/issues/1577 > >> >> Anyway, applied to master, thanks. >> >> Regards, >> Arnout >> >> >>> >>> Signed-off-by: Giulio Benetti >>> --- >>> package/util-linux/util-linux.mk | 1 + >>> 1 file changed, 1 insertion(+) >>> >>> diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk >>> index e59ef7dadc..5a4ff64d01 100644 >>> --- a/package/util-linux/util-linux.mk >>> +++ b/package/util-linux/util-linux.mk >>> @@ -41,6 +41,7 @@ define UTIL_LINUX_FIX_DISK_UTILS_COMPILE >>> touch $(@D)/disk-utils/raw.8 >>> endef >>> UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE >>> +HOST_UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE >>> >>> HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf >>> > From ps.report at gmx.net Wed Feb 2 21:40:46 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 2 Feb 2022 22:40:46 +0100 Subject: [Buildroot] [URGENT 1/1] package/util-linux: fix host build failure In-Reply-To: <48ab9669-d467-a394-12a2-fd229f6229f0@benettiengineering.com> References: <20220201232203.333403-1-giulio.benetti@benettiengineering.com> <20220201232203.333403-2-giulio.benetti@benettiengineering.com> <20220202214210.0a2483e6@gmx.net> <48ab9669-d467-a394-12a2-fd229f6229f0@benettiengineering.com> Message-ID: <20220202224046.1ccef19a@gmx.net> Hello Giulio, On Wed, 2 Feb 2022 22:09:22 +0100, Giulio Benetti wrote: > Hi Peter, > > On 02/02/22 21:42, Peter Seiderer wrote: > > Hello Arnout, Giulio, > > > > On Wed, 2 Feb 2022 08:41:34 +0100, Arnout Vandecappelle wrote: > > > >> On 02/02/2022 00:22, Giulio Benetti wrote: > >>> The UTIL_LINUX_FIX_DISK_UTILS_COMPILE workaround is needed for host > >>> building too. So let's add it to HOST_UTIL_LINUX_POST_PATCH_HOOKS. > >>> host-util-linux is used a lot, so this patch fixes a lot of future > >>> builds. > >> > >> Darn, I tested that, both with and without BR2_PACKAGE_HOST_UTIL_LINUX set. I > >> don't understand what went wrong in my test... > > > > The raw support depends on the available toolchain headers, see e.g. > > package/util-linux/Config.in: > > > > config BR2_PACKAGE_UTIL_LINUX_RAW > > bool "raw" > > depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_14 > > help > > Build a linux raw character device > > > > Or according to [1] '--disable-raw' for the host build should do > > the trick too... > > I was in hurry to produce the patch last night, so I went for the > fastest way. Can you give a try with --disable-raw and eventually submit Thanks for taking care! > the patch? That would save some time while building. Also because > host-util-linux is used a lot Sorry, could not reproduce the host-build failure on my system, seems the toolchain is too up-to-date (openSUSE Tumbleweed - gcc-11.2.1) ;-) But can provide an RFC patch for testing... Regards, Peter > > Thank you! > Best regards From giulio.benetti at benettiengineering.com Wed Feb 2 21:43:57 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 2 Feb 2022 22:43:57 +0100 Subject: [Buildroot] [PATCH] board/intel/galileo: fix build failure with host gcc 10 Message-ID: <20220202214357.2640301-1-giulio.benetti@benettiengineering.com> Building galileo_defconfig throws error: ``` /usr/bin/ld: arch/x86/tools/relocs_64.o:(.bss+0x0): multiple definition of `per_cpu_load_addr'; arch/x86/tools/relocs_32.o:(.bss+0x0): first defined here ``` To fix this let's add an upstreamed patch[1] and add BR2_GLOBAL_PATCH_DIR to galileo_defconfig to point to where patch is. [1]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=eeeda4cd06e828b331b15741a204ff9f5874d28d.patch Fixes: https://gitlab.com/ymorin/buildroot/-/jobs/2035821039 Signed-off-by: Giulio Benetti --- ...relocs-Make-per_cpu_load_addr-static.patch | 39 +++++++++++++++++++ configs/galileo_defconfig | 1 + 2 files changed, 40 insertions(+) create mode 100644 board/intel/galileo/patches/linux/0001-x86-relocs-Make-per_cpu_load_addr-static.patch diff --git a/board/intel/galileo/patches/linux/0001-x86-relocs-Make-per_cpu_load_addr-static.patch b/board/intel/galileo/patches/linux/0001-x86-relocs-Make-per_cpu_load_addr-static.patch new file mode 100644 index 0000000000..1d206cc6d1 --- /dev/null +++ b/board/intel/galileo/patches/linux/0001-x86-relocs-Make-per_cpu_load_addr-static.patch @@ -0,0 +1,39 @@ +From eeeda4cd06e828b331b15741a204ff9f5874d28d Mon Sep 17 00:00:00 2001 +From: Ben Hutchings +Date: Wed, 24 Sep 2014 13:30:12 +0100 +Subject: [PATCH] x86/relocs: Make per_cpu_load_addr static + +per_cpu_load_addr is only used for 64-bit relocations, but is +declared in both configurations of relocs.c - with different +types. This has undefined behaviour in general. GNU ld is +documented to use the larger size in this case, but other tools +may differ and some warn about this. + +References: https://bugs.debian.org/748577 +Reported-by: Michael Tautschnig +Signed-off-by: Ben Hutchings +Cc: 748577 at bugs.debian.org +Cc: Linus Torvalds +Link: http://lkml.kernel.org/r/1411561812.3659.23.camel at decadent.org.uk +Signed-off-by: Ingo Molnar +Signed-off-by: Giulio Benetti +--- + arch/x86/tools/relocs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c +index bbb1d2259ecf..a5efb21d5228 100644 +--- a/arch/x86/tools/relocs.c ++++ b/arch/x86/tools/relocs.c +@@ -695,7 +695,7 @@ static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel, + * + */ + static int per_cpu_shndx = -1; +-Elf_Addr per_cpu_load_addr; ++static Elf_Addr per_cpu_load_addr; + + static void percpu_init(void) + { +-- +2.25.1 + diff --git a/configs/galileo_defconfig b/configs/galileo_defconfig index 03ca23f414..a8fd0a6dcc 100644 --- a/configs/galileo_defconfig +++ b/configs/galileo_defconfig @@ -1,4 +1,5 @@ BR2_x86_x1000=y +BR2_GLOBAL_PATCH_DIR=board/intel/galileo/patches # Needed for TARGET_GRUB2 BR2_TOOLCHAIN_BUILDROOT_WCHAR=y # Linux headers same as kernel, a 3.14 series -- 2.25.1 From giulio.benetti at benettiengineering.com Wed Feb 2 21:54:18 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 2 Feb 2022 22:54:18 +0100 Subject: [Buildroot] [URGENT 1/1] package/util-linux: fix host build failure In-Reply-To: <20220202224046.1ccef19a@gmx.net> References: <20220201232203.333403-1-giulio.benetti@benettiengineering.com> <20220201232203.333403-2-giulio.benetti@benettiengineering.com> <20220202214210.0a2483e6@gmx.net> <48ab9669-d467-a394-12a2-fd229f6229f0@benettiengineering.com> <20220202224046.1ccef19a@gmx.net> Message-ID: <412baee3-b818-521a-99bf-ee868d3e1be2@benettiengineering.com> On 02/02/22 22:40, Peter Seiderer wrote: > Hello Giulio, > > On Wed, 2 Feb 2022 22:09:22 +0100, Giulio Benetti wrote: > >> Hi Peter, >> >> On 02/02/22 21:42, Peter Seiderer wrote: >>> Hello Arnout, Giulio, >>> >>> On Wed, 2 Feb 2022 08:41:34 +0100, Arnout Vandecappelle wrote: >>> >>>> On 02/02/2022 00:22, Giulio Benetti wrote: >>>>> The UTIL_LINUX_FIX_DISK_UTILS_COMPILE workaround is needed for host >>>>> building too. So let's add it to HOST_UTIL_LINUX_POST_PATCH_HOOKS. >>>>> host-util-linux is used a lot, so this patch fixes a lot of future >>>>> builds. >>>> >>>> Darn, I tested that, both with and without BR2_PACKAGE_HOST_UTIL_LINUX set. I >>>> don't understand what went wrong in my test... >>> >>> The raw support depends on the available toolchain headers, see e.g. >>> package/util-linux/Config.in: >>> >>> config BR2_PACKAGE_UTIL_LINUX_RAW >>> bool "raw" >>> depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_14 >>> help >>> Build a linux raw character device >>> >>> Or according to [1] '--disable-raw' for the host build should do >>> the trick too... >> >> I was in hurry to produce the patch last night, so I went for the >> fastest way. Can you give a try with --disable-raw and eventually submit > > Thanks for taking care! > >> the patch? That would save some time while building. Also because >> host-util-linux is used a lot > > Sorry, could not reproduce the host-build failure on my system, seems the > toolchain is too up-to-date (openSUSE Tumbleweed - gcc-11.2.1) ;-) > > But can provide an RFC patch for testing... I give a go on my pc and if it works I add Suggested-by: Peter Seiderer Are you on IRC? If yes my nick is benettig you can ping me there :-) Best regards -- Giulio Benetti Benetti Engineering sas From giulio.benetti at benettiengineering.com Wed Feb 2 22:05:38 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 2 Feb 2022 23:05:38 +0100 Subject: [Buildroot] [PATCH] package/util-linux: improve host build failure fix In-Reply-To: <412baee3-b818-521a-99bf-ee868d3e1be2@benettiengineering.com> References: <412baee3-b818-521a-99bf-ee868d3e1be2@benettiengineering.com> Message-ID: <20220202220538.2858380-1-giulio.benetti@benettiengineering.com> As suggested by Peter Seiderer package util-linux doesn't need raw support when built for host, so let's remove: HOST_UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE in favor of: HOST_UTIL_LINUX_CONF_OPTS += --disable-raw This is a better approach than my commit: https://git.buildroot.net/buildroot/commit/?id=d895bd973b35fde10d3dd7db530d9e4782926497 Suggested-by: Peter Seiderer Signed-off-by: Giulio Benetti --- package/util-linux/util-linux.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 5a4ff64d01..f3297257cf 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -41,7 +41,6 @@ define UTIL_LINUX_FIX_DISK_UTILS_COMPILE touch $(@D)/disk-utils/raw.8 endef UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE -HOST_UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf @@ -49,7 +48,8 @@ HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf HOST_UTIL_LINUX_CONF_OPTS = \ --without-systemd \ --with-systemdsystemunitdir=no \ - --without-python + --without-python \ + --disable-raw ifneq ($(BR2_PACKAGE_UTIL_LINUX_BINARIES)$(BR2_PACKAGE_UTIL_LINUX_CRAMFS)$(BR2_PACKAGE_UTIL_LINUX_FSCK)$(BR2_PACKAGE_UTIL_LINUX_LOSETUP),) UTIL_LINUX_SELINUX_MODULES = fstools -- 2.25.1 From giulio.benetti at benettiengineering.com Wed Feb 2 22:10:59 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 2 Feb 2022 23:10:59 +0100 Subject: [Buildroot] [URGENT 1/1] package/util-linux: fix host build failure In-Reply-To: <20220202224046.1ccef19a@gmx.net> References: <20220201232203.333403-1-giulio.benetti@benettiengineering.com> <20220201232203.333403-2-giulio.benetti@benettiengineering.com> <20220202214210.0a2483e6@gmx.net> <48ab9669-d467-a394-12a2-fd229f6229f0@benettiengineering.com> <20220202224046.1ccef19a@gmx.net> Message-ID: <7f7bc01d-adb2-9ee9-e54c-0ef6736c83a0@benettiengineering.com> Hi Peter, On 02/02/22 22:40, Peter Seiderer wrote: > Hello Giulio, > > On Wed, 2 Feb 2022 22:09:22 +0100, Giulio Benetti wrote: > >> Hi Peter, >> >> On 02/02/22 21:42, Peter Seiderer wrote: >>> Hello Arnout, Giulio, >>> >>> On Wed, 2 Feb 2022 08:41:34 +0100, Arnout Vandecappelle wrote: >>> >>>> On 02/02/2022 00:22, Giulio Benetti wrote: >>>>> The UTIL_LINUX_FIX_DISK_UTILS_COMPILE workaround is needed for host >>>>> building too. So let's add it to HOST_UTIL_LINUX_POST_PATCH_HOOKS. >>>>> host-util-linux is used a lot, so this patch fixes a lot of future >>>>> builds. >>>> >>>> Darn, I tested that, both with and without BR2_PACKAGE_HOST_UTIL_LINUX set. I >>>> don't understand what went wrong in my test... >>> >>> The raw support depends on the available toolchain headers, see e.g. >>> package/util-linux/Config.in: >>> >>> config BR2_PACKAGE_UTIL_LINUX_RAW >>> bool "raw" >>> depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_14 >>> help >>> Build a linux raw character device >>> >>> Or according to [1] '--disable-raw' for the host build should do >>> the trick too... >> >> I was in hurry to produce the patch last night, so I went for the >> fastest way. Can you give a try with --disable-raw and eventually submit > > Thanks for taking care! I've just sent a patch like you've suggested: https://patchwork.ozlabs.org/project/buildroot/patch/20220202220538.2858380-1-giulio.benetti at benettiengineering.com/ >> the patch? That would save some time while building. Also because >> host-util-linux is used a lot > > Sorry, could not reproduce the host-build failure on my system, seems the > toolchain is too up-to-date (openSUSE Tumbleweed - gcc-11.2.1) ;-) For this situation you can use this docker: docker pull registry.gitlab.com/buildroot.org/buildroot/base:20220105.2314 There gcc is version 10.2.1 and it's the official one used for build-testing buildroot defconfigs. You can find it also in buildroot/.gitlab-ci.yml Can you give a go with that docker by reproducing the failure and then applying the latest patch? That way you can give a Reviewed-by: or also a Tested-by: you Thank you! Kind regards -- Giulio Benetti Benetti Engineering sas From giulio.benetti at benettiengineering.com Wed Feb 2 22:22:28 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 2 Feb 2022 23:22:28 +0100 Subject: [Buildroot] csky_gx6605s build failure Message-ID: Hi Guo, I'm dealing with gitlab-ci failures, including csky_gx6605s_defconfig. What is missing is basically the toolchain. Buildroot can't build a tooclahin for C-Sky at the moment(we should wait until gcc 12 if it will keep ck610 variant). So my idea would be to add an external toolchain your company could provide with a stable URL to make this defconfig to build successfully instead of dropping it. And once gcc 12 is released and added to Buildroot we can drop the external toolchain and use the Buildroot's one. What do you think? Best regards -- Giulio Benetti Benetti Engineering sas From luca at lucaceresoli.net Wed Feb 2 22:28:42 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Wed, 2 Feb 2022 23:28:42 +0100 Subject: [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2 In-Reply-To: <20220202165555.3497977-1-nealf@xilinx.com> References: <20220202165555.3497977-1-nealf@xilinx.com> Message-ID: Hi Neal, thank you for your effort and for sending a patch in the format that is the most convenient for other people to review your code. Your work seems generally in a good shape. I have several remarks, see below, but nothing really problematic. On 02/02/22 17:55, Neal Frager wrote: > Signed-off-by: Neal Frager Maybe you can add more details before the Signed-off-by line, suah as "Also add a defconfig for ZCU102", "remove U-Boot and ATF patches not upstream"... First issue: this defconfig does not build on my PC: $ git clean -xdf && make zynqmp_zcu106_defconfig && verynice make package/pkg-generic.mk:266: *** BR2_GLOBAL_PATCH_DIR contains nonexistent directory board/zynqmp/patches/. Stop. $ As you removed all patches (which is sooo gooood!) you now have to remove the BR2_GLOBAL_PATCH_DIR. > --- > board/zynqmp/genimage.cfg | 1 + > ...-fix-Remove-GGC-ignore-Warray-bounds.patch | 68 ------- > ...64-zynqmp-zcu106-fix-SPL-MMC-booting.patch | 52 ------ > ...2-arm64-zynqmp-Enable-booting-to-ATF.patch | 114 ------------ > ...ept-an-absolute-path-for-PMUFW_INIT_.patch | 68 ------- > ...ynqmp-pass-the-PS-init-file-as-a-kco.patch | 175 ------------------ > configs/zynqmp_zcu102_defconfig | 35 ++++ > configs/zynqmp_zcu106_defconfig | 15 +- > 8 files changed, 44 insertions(+), 484 deletions(-) > delete mode 100644 board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch > delete mode 100644 board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch > delete mode 100644 board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch > delete mode 100644 board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch > delete mode 100644 board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch > create mode 100644 configs/zynqmp_zcu102_defconfig > > diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg > index ed202f4550..557364e124 100644 > --- a/board/zynqmp/genimage.cfg > +++ b/board/zynqmp/genimage.cfg > @@ -3,6 +3,7 @@ image boot.vfat { > files = { > "boot.bin", > "u-boot.bin", > + "u-boot.itb", Is u-boot.bin still needed, when we have the .itb? > diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig > index bee7c1daf7..3a6947e1e8 100644 > --- a/configs/zynqmp_zcu106_defconfig > +++ b/configs/zynqmp_zcu106_defconfig > @@ -1,11 +1,11 @@ > BR2_aarch64=y > BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_GIT=y > BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" > -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" > @@ -14,21 +14,22 @@ BR2_TARGET_ROOTFS_EXT2_4=y > # BR2_TARGET_ROOTFS_TAR is not set > BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.4_2021.2" As far as I remember (but I ask the core developers to confirm or deny), from the Buildroot perspective upstream versions are generally preferred even when they lack some non-fundamental features (e.g.: some drivers are missing) that are in vendor forks. Is there a reason for switching ATF to the Xilinx fork? In this case explain it in the commit message, otherwise stay on the upstream repo, upgrading to the latest [working] release. A similar question applies to kernel and U-Boot: is it possible to switch to upstream releases? > BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" > -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7" > -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA" > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" The "_virt" suffix looks strange to the uninitiated. IIRC it is the main, unified defconfig for all Xilinx kernels. Please add a line in the commit message so it is clear for everybody's benefit. > BR2_TARGET_UBOOT_NEEDS_DTC=y > BR2_TARGET_UBOOT_SPL=y > BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" > BR2_TARGET_UBOOT_ZYNQMP=y > -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/53fdb7b6c92860ceb0ec5fd14deee302f4a84269/bin/pmufw-zcu106-default-v2017.4.bin" > +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/master/bin/pmufw-v2021.2.bin" Please point to a tag, not a branch, or the file could be modified in the future, resulting in a non-reproducible build. Use: https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/v2021.2/bin/pmufw-v2021.2.bin Ouch, now the build I had started ended with a new error: >>> arm-trusted-firmware xlnx_rebase_v2.4_2021.2 Building ... AR .../build/zynqmp/release/lib/libc.a LD .../build/zynqmp/release/bl31/bl31.elf .../aarch64-buildroot-linux-uclibc-ld: .../build/zynqmp/release/bl31/bl31.elf section `coherent_ram' will not fit in region `RAM' .../aarch64-buildroot-linux-uclibc-ld: BL31 image has exceeded its limit. .../aarch64-buildroot-linux-uclibc-ld: region `RAM' overflowed by 1 byte I have run my build on Ubuntu 18.04 with your patch applied on current master. I assume you have built and run it successfully. Any idea on why it fails on a different host? -- Luca From giulio.benetti at benettiengineering.com Wed Feb 2 22:33:24 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 2 Feb 2022 23:33:24 +0100 Subject: [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2 In-Reply-To: <20220202165555.3497977-1-nealf@xilinx.com> References: <20220202165555.3497977-1-nealf@xilinx.com> Message-ID: <59b73223-73b3-1b9e-b8ec-0cedb0c605ef@benettiengineering.com> Hi Neal, nice to see you've made it with git send-email :-), Here I would improve commit log by stating that you're dropping all local patches because they are now upstreamed On 02/02/22 17:55, Neal Frager wrote: > Signed-off-by: Neal Frager > --- > board/zynqmp/genimage.cfg | 1 + > ...-fix-Remove-GGC-ignore-Warray-bounds.patch | 68 ------- > ...64-zynqmp-zcu106-fix-SPL-MMC-booting.patch | 52 ------ > ...2-arm64-zynqmp-Enable-booting-to-ATF.patch | 114 ------------ > ...ept-an-absolute-path-for-PMUFW_INIT_.patch | 68 ------- > ...ynqmp-pass-the-PS-init-file-as-a-kco.patch | 175 ------------------ > configs/zynqmp_zcu102_defconfig | 35 ++++ This ^^^ file is added, so it deserves a second patch after this one, basically this becomes a patchset of 2 patches > configs/zynqmp_zcu106_defconfig | 15 +- > 8 files changed, 44 insertions(+), 484 deletions(-) > delete mode 100644 board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch > delete mode 100644 board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch > delete mode 100644 board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch > delete mode 100644 board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch > delete mode 100644 board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch > create mode 100644 configs/zynqmp_zcu102_defconfig > > diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg > index ed202f4550..557364e124 100644 > --- a/board/zynqmp/genimage.cfg > +++ b/board/zynqmp/genimage.cfg > @@ -3,6 +3,7 @@ image boot.vfat { > files = { > "boot.bin", > "u-boot.bin", > + "u-boot.itb", Can you please justify this adding ^^^ in commit log? > "atf-uboot.ub", > "system.dtb", > "Image" > diff --git a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch b/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch > deleted file mode 100644 > index 0c1a9ba2a4..0000000000 > --- a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch > +++ /dev/null > @@ -1,68 +0,0 @@ > -From da003e6ada7d0217fe99dc7c649a731f8ebd3c34 Mon Sep 17 00:00:00 2001 > -From: Deepika Bhavnani > -Date: Thu, 15 Aug 2019 00:56:46 +0300 > -Subject: [PATCH] Coverity fix: Remove GGC ignore -Warray-bounds > - > -GCC diagnostics were added to ignore array boundaries, instead > -of ignoring GCC warning current code will check for array boundaries > -and perform and array update only for valid elements. > - > -Resolves: `CID 246574` `CID 246710` `CID 246651` > - > -Signed-off-by: Deepika Bhavnani > -Change-Id: I7530ecf7a1707351c6ee87e90cc3d33574088f57 > - > -Backported from: 41af05154abe136938bcfb5f26c969933784bbef > -[Adapted to apply on 1.5] > - > ---- > - lib/psci/psci_common.c | 20 ++++++++++---------- > - 1 file changed, 10 insertions(+), 10 deletions(-) > - > -diff --git a/lib/psci/psci_common.c b/lib/psci/psci_common.c > -index 2220a745cd6e..6282d992a2f0 100644 > ---- a/lib/psci/psci_common.c > -+++ b/lib/psci/psci_common.c > -@@ -188,21 +188,17 @@ static unsigned int get_power_on_target_pwrlvl(void) > - /****************************************************************************** > - * Helper function to update the requested local power state array. This array > - * does not store the requested state for the CPU power level. Hence an > -- * assertion is added to prevent us from accessing the wrong index. > -+ * assertion is added to prevent us from accessing the CPU power level. > - *****************************************************************************/ > - static void psci_set_req_local_pwr_state(unsigned int pwrlvl, > - unsigned int cpu_idx, > - plat_local_state_t req_pwr_state) > - { > -- /* > -- * This should never happen, we have this here to avoid > -- * "array subscript is above array bounds" errors in GCC. > -- */ > - assert(pwrlvl > PSCI_CPU_PWR_LVL); > --#pragma GCC diagnostic push > --#pragma GCC diagnostic ignored "-Warray-bounds" > -- psci_req_local_pwr_states[pwrlvl - 1][cpu_idx] = req_pwr_state; > --#pragma GCC diagnostic pop > -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && > -+ (cpu_idx < PLATFORM_CORE_COUNT)) { > -+ psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx] = req_pwr_state; > -+ } > - } > - > - /****************************************************************************** > -@@ -228,7 +224,11 @@ static plat_local_state_t *psci_get_req_local_pwr_states(unsigned int pwrlvl, > - { > - assert(pwrlvl > PSCI_CPU_PWR_LVL); > - > -- return &psci_req_local_pwr_states[pwrlvl - 1][cpu_idx]; > -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && > -+ (cpu_idx < PLATFORM_CORE_COUNT)) { > -+ return &psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx]; > -+ } else > -+ return NULL; > - } > - > - /* > --- > -2.34.0 > - > diff --git a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch b/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch > deleted file mode 100644 > index 4d85e1bb12..0000000000 > --- a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch > +++ /dev/null > @@ -1,52 +0,0 @@ > -From e5d72ed8339eb05285448aad3c89d21e4d18fd29 Mon Sep 17 00:00:00 2001 > -From: Luca Ceresoli > -Date: Mon, 26 Feb 2018 09:40:34 +0100 > -Subject: [PATCH] arm64: zynqmp: zcu106: fix SPL MMC booting > - > -The U-Boot SPL generated with the current zcu106 defconfig cannot boot > -from MMC: > - > - [...] > - U-Boot SPL 2018.01 (Feb 21 2018 - 17:47:14) > - EL Level: EL3 > - Trying to boot from MMC1 > - sdhci_transfer_data: Error detected in status(0x408020)! > - spl_load_image_fat_os: error reading image u-boot.bin, err - -2 > - spl_load_image_fat: error reading image u-boot.img, err - -6 > - SPL: failed to boot from all boot devices > - ### ERROR ### Please RESET the board ### > - > -Fix by lowering the rpll value. The new value for the RPLL_CTRL > -register comes from the current psu_init_gpl.c from the HDF file at > -https://github.com/xilinx/hdf-examples/tree/01ad8ea5fd1989abf4ea5a072d019a16cb2bc546/zcu106-zynqmp > -(generated by Vivado v2017.4). > - > -RPLL and sdio1_ref clocks before and after this change: > - > - - Old values: RPLL 1.36 GHz, sdio1_ref 272 MHz > - - New values: RPLL 1.16 GHz, sdio1_ref 233 MHz > - > -Signed-off-by: Luca Ceresoli > -Cc: Michal Simek > -Upstream-status: accepted upstream in a different form > ---- > - > - board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c > -index 4d18abe000ca..e6fa477e53e7 100644 > ---- a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c > -+++ b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c > -@@ -10,7 +10,7 @@ > - static unsigned long psu_pll_init_data(void) > - { > - psu_mask_write(0xFF5E0034, 0xFE7FEDEFU, 0x7E4E2C62U); > -- psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00013C00U); > -+ psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00014600U); > - psu_mask_write(0xFF5E0030, 0x00000008U, 0x00000008U); > - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000001U); > - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000000U); > --- > -2.7.4 > - > diff --git a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch b/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch > deleted file mode 100644 > index 487fff6812..0000000000 > --- a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch > +++ /dev/null > @@ -1,114 +0,0 @@ > -From 5e3cac50cc981e01d9072241035a8d4162560c71 Mon Sep 17 00:00:00 2001 > -From: Luca Ceresoli > -Date: Mon, 12 Mar 2018 17:18:38 +0100 > -Subject: [PATCH] arm64: zynqmp: Enable booting to ATF > - > -U-Boot is now able to boot to ARM Trusted Firmware (ATF). The boot > -flow is SPL(EL3) loads ATF and full u-boot and jump to ATF(EL3) which > -pass control to full u-boot(EL2). This has been tested on zcu106, so > -enable it in this defconfig. > - > -To generate an image that triggers this booting flow, you need to pass > -'-O arm-trusted-firmware' to mkimage. > - > -Signed-off-by: Luca Ceresoli > -Signed-off-by: Michal Simek > -Backported from upstream: http://git.denx.de/?p=u-boot.git;a=commit;h=5e3cac50cc981e01d9072241035a8d4162560c71 > ---- > - > - configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 + > - configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 + > - configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 + > - configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 + > - configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 1 + > - configs/xilinx_zynqmp_zcu102_revA_defconfig | 1 + > - configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 + > - 7 files changed, 7 insertions(+) > - > -diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig > -index c5bfa2b12638..488c72258b0e 100644 > ---- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig > -+++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig > -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_FASTBOOT=y > - CONFIG_FASTBOOT_FLASH=y > -diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig > -index f86dce403a42..5d501eec0edd 100644 > ---- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig > -+++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig > -@@ -20,6 +20,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_FASTBOOT=y > - CONFIG_FASTBOOT_FLASH=y > -diff --git a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig > -index 6e947cf56827..6f7eaebd7676 100644 > ---- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig > -+++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig > -@@ -16,6 +16,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_CMD_MEMTEST=y > - CONFIG_SYS_ALT_MEMTEST=y > -diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig > -index 1c934858c61c..7a3806cba4b5 100644 > ---- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig > -+++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig > -@@ -17,6 +17,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_CMD_MEMTEST=y > - CONFIG_SYS_ALT_MEMTEST=y > -diff --git a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig > -index e13c7c56f310..e4408f182ca0 100644 > ---- a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig > -+++ b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig > -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_FASTBOOT=y > - CONFIG_FASTBOOT_FLASH=y > -diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig b/configs/xilinx_zynqmp_zcu102_revA_defconfig > -index 5b2cd495ee85..b52f6789fd4b 100644 > ---- a/configs/xilinx_zynqmp_zcu102_revA_defconfig > -+++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig > -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_FASTBOOT=y > - CONFIG_FASTBOOT_FLASH=y > -diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig > -index e6530fbfe7ff..80592554f682 100644 > ---- a/configs/xilinx_zynqmp_zcu102_revB_defconfig > -+++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig > -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_FASTBOOT=y > - CONFIG_FASTBOOT_FLASH=y > --- > -2.7.4 > - > diff --git a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch b/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch > deleted file mode 100644 > index 95ab7b3b75..0000000000 > --- a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch > +++ /dev/null > @@ -1,68 +0,0 @@ > -From c7df098a71e05dc81cee818747759e8060b59626 Mon Sep 17 00:00:00 2001 > -From: Luca Ceresoli > -Date: Mon, 4 Jun 2018 12:21:01 +0200 > -Subject: [PATCH] arm64: zynqmp: accept an absolute path for PMUFW_INIT_FILE > - > -The value of PMUFW_INIT_FILE is prefixed with "$(srctree)/", thus > -forcing it to be a relative path inside the U-Boot source tree. Since > -the PMUFW is a binary file generated outside of U-Boot, the PMUFW > -binary must be copied inside the U-Boot source tree before the > -build. > - > -This generates a few problems: > - > - * if the source tree is shared among different out-of-tree builds, > - they will pollute (and potentially corrupt) each other > - * the source tree cannot be read-only > - * any buildsystem must add a command to copy the PMUFW binary > - * putting an externally-generated binary in the source tree is ugly > - as hell > - > -Avoid these problems by accepting an absolute path for > -PMUFW_INIT_FILE. This would be as simple as removing the "$(srctree)/" > -prefix, but in order to keep backward compatibility we rather use the > -shell and readlink to get the absolute path even when starting from a > -relative path. > - > -Since 'readlink -f' produces an empty string if the file does not > -exist, we also add a check to ensure the file configured in > -PMUFW_INIT_FILE exists. Otherwise the build would exit successfully, > -but produce a boot.bin without PMUFW as if PMUFW_INIT_FILE were empty. > - > -Tested in the 12 possible combinations of: > - - PMUFW_INIT_FILE empty, relative, absolute, non-existing > - - building in-tree, in subdir, in other directory > - > -Signed-off-by: Luca Ceresoli > -Cc: Michal Simek > -Cc: Simon Glass > -Cc: Emmanuel Vadot > -Signed-off-by: Michal Simek > -Backported from upstream: https://git.denx.de/?p=u-boot.git;a=commit;h=c7df098a71e05dc81cee818747759e8060b59626 > ---- > - scripts/Makefile.spl | 8 +++++++- > - 1 file changed, 7 insertions(+), 1 deletion(-) > - > -diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl > -index ef018b5b4056..252f13826d4c 100644 > ---- a/scripts/Makefile.spl > -+++ b/scripts/Makefile.spl > -@@ -167,8 +167,14 @@ ifdef CONFIG_ARCH_ZYNQ > - MKIMAGEFLAGS_boot.bin = -T zynqimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) > - endif > - ifdef CONFIG_ARCH_ZYNQMP > -+ifneq ($(CONFIG_PMUFW_INIT_FILE),"") > -+spl/boot.bin: zynqmp-check-pmufw > -+zynqmp-check-pmufw: FORCE > -+ ( cd $(srctree) && test -r $(CONFIG_PMUFW_INIT_FILE) ) \ > -+ || ( echo "Cannot read $(CONFIG_PMUFW_INIT_FILE)" && false ) > -+endif > - MKIMAGEFLAGS_boot.bin = -T zynqmpimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) \ > -- -n $(srctree)/$(CONFIG_PMUFW_INIT_FILE) > -+ -n "$(shell cd $(srctree); readlink -f $(CONFIG_PMUFW_INIT_FILE))" > - endif > - > - spl/boot.bin: $(obj)/u-boot-spl.bin FORCE > --- > -2.7.4 > - > diff --git a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch b/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch > deleted file mode 100644 > index b32e162780..0000000000 > --- a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch > +++ /dev/null > @@ -1,175 +0,0 @@ > -From 4c9d54ab5a41d65000c8d249b6fb1b76056f1812 Mon Sep 17 00:00:00 2001 > -From: Luca Ceresoli > -Date: Wed, 20 Jun 2018 12:11:50 +0200 > -Subject: [PATCH] arm/arm64: zynq/zynqmp: pass the PS init file as a kconfig > - variable > - > -U-Boot needs to link ps7_init_gpl.c on Zynq or psu_init_gpl.c on > -ZynqMP (PS init for short). The current logic to locate this file for > -both platforms is: > - > - 1. if a board-specific file exists in > - board/xilinx/zynq[mp]/$(CONFIG_DEFAULT_DEVICE_TREE)/ps?_init_gpl.c > - then use it > - 2. otherwise use board/xilinx/zynq/ps?_init_gpl.c > - > -In the latter case the file does not exist in the U-Boot sources and > -must be copied in the source tree from the outside before starting the > -build. This is typical when it is generated from Xilinx tools while > -developing a custom hardware. However making sure that a > -board-specific file is _not_ found (and used) requires some trickery > -such as removing or overwriting all PS init files (e.g.: the current > -meta-xilinx yocto layer [0]). > - > -This generates a few problems: > - > - * if the source tree is shared among different out-of-tree builds, > - they will pollute (and potentially corrupt) each other > - * the source tree cannot be read-only > - * any buildsystem must add a command to copy the PS init file binary > - * overwriting or deleting files in the source tree is ugly as hell > - > -Simplify usage by allowing to pass the path to the desired PS init > -file in kconfig variable XILINX_PS_INIT_FILE. It can be an absolute > -path or relative to $(srctree). If the variable is set, the > -user-specified file will always be used without being copied > -around. If the the variable is left empty, for backward compatibility > -fall back to the old behaviour. > - > -Since the issue is the same for Zynq and ZynqMP, add one kconfig > -variable in a common place and use it for both. > - > -Also use the new kconfig help text to document all the ways to give > -U-Boot the PS init file. > - > -Build-tested with all combinations of: > - - platform: zynq or zynqmp > - - PS init file: from XILINX_PS_INIT_FILE (absolute, relative path, > - non-existing), in-tree board-specific, in board/xilinx/zynq[mp]/ > - - building in-tree, in subdir, in other directory > - > -[0] https://github.com/Xilinx/meta-xilinx/blob/b2f74cc7fe5c4881589d5e440a17cb51fc66a7ab/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init.inc#L9 > - > -Signed-off-by: Luca Ceresoli > -Cc: Albert Aribaud > -Cc: Michal Simek > -Cc: Nathan Rossi > -Backported from upstream: https://git.denx.de/?p=u-boot.git;a=commit;h=6da4f67ad09cd8b311d77b2b04e557b7ef65b56c > ---- > - arch/arm/Kconfig | 1 + > - board/xilinx/Kconfig | 41 +++++++++++++++++++++++++++++++++++++++++ > - board/xilinx/zynq/Makefile | 10 +++++++++- > - board/xilinx/zynqmp/Makefile | 10 +++++++++- > - 4 files changed, 60 insertions(+), 2 deletions(-) > - create mode 100644 board/xilinx/Kconfig > - > -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig > -index 22234cde2ab6..e04979d0ef7e 100644 > ---- a/arch/arm/Kconfig > -+++ b/arch/arm/Kconfig > -@@ -1293,4 +1293,5 @@ source "board/technologic/ts4600/Kconfig" > - source "board/vscom/baltos/Kconfig" > - source "board/woodburn/Kconfig" > - source "board/work-microwave/work_92105/Kconfig" > -+source "board/xilinx/Kconfig" > - source "board/zipitz2/Kconfig" > - > - source "arch/arm/Kconfig.debug" > -diff --git a/board/xilinx/Kconfig b/board/xilinx/Kconfig > -new file mode 100644 > -index 000000000000..aa3fa061edef > ---- /dev/null > -+++ b/board/xilinx/Kconfig > -@@ -0,0 +1,41 @@ > -+# Copyright (c) 2018, Luca Ceresoli > -+# > -+# SPDX-License-Identifier: GPL-2.0 > -+ > -+if ARCH_ZYNQ || ARCH_ZYNQMP > -+ > -+config XILINX_PS_INIT_FILE > -+ string "Zynq/ZynqMP PS init file(s) location" > -+ help > -+ On Zynq and ZynqMP U-Boot SPL (or U-Boot proper if > -+ ZYNQMP_PSU_INIT_ENABLED is set) is responsible for some > -+ basic initializations, such as enabling peripherals and > -+ configuring pinmuxes. The PS init file (called > -+ psu_init_gpl.c on ZynqMP, ps7_init_gpl.c for Zynq-7000) > -+ contains the code for such initializations. > -+ > -+ U-Boot contains PS init files for some boards, but each of > -+ them describes only one specific configuration. Users of a > -+ different board, or needing a different configuration, can > -+ generate custom files using the Xilinx development tools. > -+ > -+ There are three ways to give a PS init file to U-Boot: > -+ > -+ 1. Set this variable to the path, either relative to the > -+ source tree or absolute, where the psu_init_gpl.c or > -+ ps7_init_gpl.c file is located. U-Boot will build this > -+ file. > -+ > -+ 2. If you leave an empty string here, U-Boot will use > -+ board/xilinx/zynq/$(CONFIG_DEFAULT_DEVICE_TREE)/ps7_init_gpl.c > -+ for Zynq-7000, or > -+ board/xilinx/zynqmp/$(CONFIG_DEFAULT_DEVICE_TREE)/psu_init_gpl.c > -+ for ZynqMP. > -+ > -+ 3. If the above file does not exist, U-Boot will use > -+ board/xilinx/zynq/ps7_init_gpl.c for Zynq-7000, or > -+ board/xilinx/zynqmp/psu_init_gpl.c for ZynqMP. This file > -+ is not provided by U-Boot, you have to copy it there > -+ before the build. > -+ > -+endif > -diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile > -index 5a76a26720cd..03ad5f0532ee 100644 > ---- a/board/xilinx/zynq/Makefile > -+++ b/board/xilinx/zynq/Makefile > -@@ -5,10 +5,18 @@ > - > - obj-y := board.o > - > --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) > -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") > -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE)) > -+init-objs := ps_init_gpl.o > -+spl/board/xilinx/zynq/ps_init_gpl.o board/xilinx/zynq/ps_init_gpl.o: $(PS_INIT_FILE) > -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ > -+endif > - > -+ifeq ($(init-objs),) > -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) > - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/ps7_init_gpl.c),\ > - $(hw-platform-y)/ps7_init_gpl.o) > -+endif > - > - ifeq ($(init-objs),) > - ifneq ($(wildcard $(srctree)/$(src)/ps7_init_gpl.c),) > -diff --git a/board/xilinx/zynqmp/Makefile b/board/xilinx/zynqmp/Makefile > -index 05ccd25dcef3..960b81fc5853 100644 > ---- a/board/xilinx/zynqmp/Makefile > -+++ b/board/xilinx/zynqmp/Makefile > -@@ -5,10 +5,18 @@ > - > - obj-y := zynqmp.o > - > --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) > -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") > -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE)) > -+init-objs := ps_init_gpl.o > -+spl/board/xilinx/zynqmp/ps_init_gpl.o board/xilinx/zynqmp/ps_init_gpl.o: $(PS_INIT_FILE) > -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ > -+endif > - > -+ifeq ($(init-objs),) > -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) > - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/psu_init_gpl.c),\ > - $(hw-platform-y)/psu_init_gpl.o) > -+endif > - > - ifeq ($(init-objs),) > - ifneq ($(wildcard $(srctree)/$(src)/psu_init_gpl.c),) > --- > -2.7.4 > - > diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig > new file mode 100644 > index 0000000000..336f5c2dbe > --- /dev/null > +++ b/configs/zynqmp_zcu102_defconfig > @@ -0,0 +1,35 @@ > +BR2_aarch64=y > +BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_GIT=y > +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2" > +BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +# BR2_TARGET_ROOTFS_TAR is not set > +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.4_2021.2" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_SPL=y > +BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" > +BR2_TARGET_UBOOT_ZYNQMP=y > +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/master/bin/pmufw-v2021.2.bin" > +BR2_TARGET_UBOOT_FORMAT_ITB=y > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_MTOOLS=y As pointed above this ^^^ file must be in a separate patch and it deserves also a maintainer. So please you or maybe Luca could add an entry to DEVELOPERS for this board > diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig > index bee7c1daf7..3a6947e1e8 100644 > --- a/configs/zynqmp_zcu106_defconfig > +++ b/configs/zynqmp_zcu106_defconfig > @@ -1,11 +1,11 @@ > BR2_aarch64=y > BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" Since all patches are gone, this ^^^ is not needed anymore > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_GIT=y > BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" > -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" > @@ -14,21 +14,22 @@ BR2_TARGET_ROOTFS_EXT2_4=y > # BR2_TARGET_ROOTFS_TAR is not set > BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.4_2021.2" It's worth mention in commit log that you're switching from ARM to Xilinx ATF > BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" > -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7" > -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA" > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" > BR2_TARGET_UBOOT_NEEDS_DTC=y > BR2_TARGET_UBOOT_SPL=y > BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" > BR2_TARGET_UBOOT_ZYNQMP=y > -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/53fdb7b6c92860ceb0ec5fd14deee302f4a84269/bin/pmufw-zcu106-default-v2017.4.bin" > +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/master/bin/pmufw-v2021.2.bin" > +BR2_TARGET_UBOOT_FORMAT_ITB=y Here ^^^ I see that probably you're switching from .bin to .itb so better mention it in commit log > BR2_PACKAGE_HOST_DOSFSTOOLS=y > BR2_PACKAGE_HOST_GENIMAGE=y > BR2_PACKAGE_HOST_MTOOLS=y Thank you! Best regards -- Giulio Benetti Benetti Engineering sas From james.hilliard1 at gmail.com Wed Feb 2 23:50:20 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 2 Feb 2022 16:50:20 -0700 Subject: [Buildroot] [PATCH 1/1] package/pkg-python: set _PYTHON_PROJECT_BASE Message-ID: <20220202235020.782745-1-james.hilliard1@gmail.com> This variable is supposed to be set when cross compiling and is now required by setuptools to be set correctly after the latest version bump. Fixes: http://autobuild.buildroot.net/results/2e8/2e8093e68d04e8cbb20b095068b24c8bbe5f69ad http://autobuild.buildroot.net/results/9e3/9e3cfddb651a59d7f2d04bc88e6fff2a06e9b465 Signed-off-by: James Hilliard --- package/pkg-python.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 22ea77352c..00bdb9150a 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -33,6 +33,7 @@ PKG_PYTHON_DISTUTILS_ENV = \ LDSHARED="$(TARGET_CROSS)gcc -shared" \ PYTHONPATH="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_PATH),$(PYTHON_PATH))" \ PYTHONNOUSERSITE=1 \ + _PYTHON_PROJECT_BASE="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_DIR),$(PYTHON_DIR))" \ _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ _python_sysroot=$(STAGING_DIR) \ _python_prefix=/usr \ @@ -60,6 +61,7 @@ HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \ # Target setuptools-based packages PKG_PYTHON_SETUPTOOLS_ENV = \ + _PYTHON_PROJECT_BASE="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_DIR),$(PYTHON_DIR))" \ _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ PATH=$(BR_PATH) \ $(TARGET_CONFIGURE_OPTS) \ -- 2.25.1 From ca0 at protonmail.ch Thu Feb 3 02:01:50 2022 From: ca0 at protonmail.ch (ca0) Date: Thu, 03 Feb 2022 02:01:50 +0000 Subject: [Buildroot] package libldns Message-ID: <5_xofMlQqIrdAjpopLNCIYCGiqsc2UoXvUQG4GIV5Bd0dY31bw-gZ_0eoD0ix_iW-BI3-5O_RbQESkV3ybUN1zFSLY2r3PAr3ZOfxYOFmrU=@protonmail.ch> Building this package with orangepi_zero_defconfig results in an useless user system because both thee files are blown away ./output/target/usr/lib/ld-musl-armhf.so.1 ./output/host/arm-buildroot-linux-musleabihf/sysroot/usr/lib/ld-musl-armhf.so.1 Is the ldconfig hackery needed for embedded systems and is it supported when cross compiling? From nealf at xilinx.com Thu Feb 3 06:20:52 2022 From: nealf at xilinx.com (Neal Frager) Date: Thu, 3 Feb 2022 06:20:52 +0000 Subject: [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2 In-Reply-To: References: <20220202165555.3497977-1-nealf@xilinx.com> Message-ID: Hi Luca, Thank you for your positive feedback. Below you can find my thoughts. Neal Frager Embedded Processor Specialist Xilinx neal.frager at xilinx.com Mobile: +33.6.48.11.37.36 www.linkedin.com/in/neal-frager-0397463 -----Original Message----- From: Luca Ceresoli Sent: Wednesday 2 February 2022 23:29 To: Neal Frager ; buildroot at buildroot.org Cc: Neal Frager Subject: Re: [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2 CAUTION: This message has originated from an External Source. Please use proper judgment and caution when opening attachments, clicking links, or responding to this email. Hi Neal, thank you for your effort and for sending a patch in the format that is the most convenient for other people to review your code. Your work seems generally in a good shape. I have several remarks, see below, but nothing really problematic. On 02/02/22 17:55, Neal Frager wrote: > Signed-off-by: Neal Frager Maybe you can add more details before the Signed-off-by line, suah as "Also add a defconfig for ZCU102", "remove U-Boot and ATF patches not upstream"... [Neal] Could you share the proper git commands for adding comments to a patch? I would be happy to add more comments, but I am a bit new to git, and I do not know what commands I need to use. First issue: this defconfig does not build on my PC: $ git clean -xdf && make zynqmp_zcu106_defconfig && verynice make package/pkg-generic.mk:266: *** BR2_GLOBAL_PATCH_DIR contains nonexistent directory board/zynqmp/patches/. Stop. $ As you removed all patches (which is sooo gooood!) you now have to remove the BR2_GLOBAL_PATCH_DIR. [Neal] I have not seen this error on my side, but to fix it, I will just remove the BR2_GLOBAL_PATCH_DIR from the defconfigs. > --- > board/zynqmp/genimage.cfg | 1 + > ...-fix-Remove-GGC-ignore-Warray-bounds.patch | 68 ------- > ...64-zynqmp-zcu106-fix-SPL-MMC-booting.patch | 52 ------ > ...2-arm64-zynqmp-Enable-booting-to-ATF.patch | 114 ------------ > ...ept-an-absolute-path-for-PMUFW_INIT_.patch | 68 ------- > ...ynqmp-pass-the-PS-init-file-as-a-kco.patch | 175 ------------------ > configs/zynqmp_zcu102_defconfig | 35 ++++ > configs/zynqmp_zcu106_defconfig | 15 +- > 8 files changed, 44 insertions(+), 484 deletions(-) delete mode > 100644 > board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC > -ignore-Warray-bounds.patch delete mode 100644 > board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-bootin > g.patch delete mode 100644 > board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.pat > ch delete mode 100644 > board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-f > or-PMUFW_INIT_.patch delete mode 100644 > board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init > -file-as-a-kco.patch create mode 100644 > configs/zynqmp_zcu102_defconfig > > diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg > index ed202f4550..557364e124 100644 > --- a/board/zynqmp/genimage.cfg > +++ b/board/zynqmp/genimage.cfg > @@ -3,6 +3,7 @@ image boot.vfat { > files = { > "boot.bin", > "u-boot.bin", > + "u-boot.itb", Is u-boot.bin still needed, when we have the .itb? [Neal] u-boot.bin is no longer needed. I can remove it. > diff --git a/configs/zynqmp_zcu106_defconfig > b/configs/zynqmp_zcu106_defconfig index bee7c1daf7..3a6947e1e8 100644 > --- a/configs/zynqmp_zcu106_defconfig > +++ b/configs/zynqmp_zcu106_defconfig > @@ -1,11 +1,11 @@ > BR2_aarch64=y > BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_GIT=y > BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" > -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" > @@ -14,21 +14,22 @@ BR2_TARGET_ROOTFS_EXT2_4=y # > BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.4_2021.2" As far as I remember (but I ask the core developers to confirm or deny), from the Buildroot perspective upstream versions are generally preferred even when they lack some non-fundamental features (e.g.: some drivers are missing) that are in vendor forks. Is there a reason for switching ATF to the Xilinx fork? In this case explain it in the commit message, otherwise stay on the upstream repo, upgrading to the latest [working] release. A similar question applies to kernel and U-Boot: is it possible to switch to upstream releases? [Neal] I was trying to match the Xilinx tested software release 2021.2 with these patches. The mainline Linux kernel is still missing quite a bit of the Xilinx drivers, so if a developer uses all mainline locations, there will be things that do not work properly. The ATF should probably be ok, as it is almost identical to the Xilinx fork, but since I was already using the Xilinx fork for the Linux kernel and U-Boot, I thought it would be better to use the Xilinx tested fork for everything to remain consistent. > BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" > -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7" > -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA" > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" The "_virt" suffix looks strange to the uninitiated. IIRC it is the main, unified defconfig for all Xilinx kernels. Please add a line in the commit message so it is clear for everybody's benefit. [Neal] Yes, I will add a comment on this when I learn the proper git command for adding comments. > BR2_TARGET_UBOOT_NEEDS_DTC=y > BR2_TARGET_UBOOT_SPL=y > BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" > BR2_TARGET_UBOOT_ZYNQMP=y > -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/53fdb7b6c92860ceb0ec5fd14deee302f4a84269/bin/pmufw-zcu106-default-v2017.4.bin" > +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/master/bin/pmufw-v2021.2.bin" Please point to a tag, not a branch, or the file could be modified in the future, resulting in a non-reproducible build. Use: https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/v2021.2/bin/pmufw-v2021.2.bin [Neal] Good catch. I will update this in the defconfigs. Ouch, now the build I had started ended with a new error: >>> arm-trusted-firmware xlnx_rebase_v2.4_2021.2 Building ... AR .../build/zynqmp/release/lib/libc.a LD .../build/zynqmp/release/bl31/bl31.elf .../aarch64-buildroot-linux-uclibc-ld: .../build/zynqmp/release/bl31/bl31.elf section `coherent_ram' will not fit in region `RAM' .../aarch64-buildroot-linux-uclibc-ld: BL31 image has exceeded its limit. .../aarch64-buildroot-linux-uclibc-ld: region `RAM' overflowed by 1 byte I have run my build on Ubuntu 18.04 with your patch applied on current master. I assume you have built and run it successfully. Any idea on why it fails on a different host? [Neal] I have seen the ATF build error as well. There seems to be an issue with the default buildroot aarch64-buildroot-linux-uclibc compiler when building the ATF. I fixed the issue on my side by going into the output/build/arm-trusted-firmware-xlnx_rebase_v2.4_2021.2 and running the build with the aarch-none-elf compiler using the build command below. Basically, changing nothing but the compiler. Do you have any thoughts about how to fix this? make CROSS_COMPILE=aarch64-none-elf- PLAT=zynqmp RESET_TO_BL31=1 -- Luca From nealf at xilinx.com Thu Feb 3 06:24:26 2022 From: nealf at xilinx.com (Neal Frager) Date: Thu, 3 Feb 2022 06:24:26 +0000 Subject: [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2 In-Reply-To: <59b73223-73b3-1b9e-b8ec-0cedb0c605ef@benettiengineering.com> References: <20220202165555.3497977-1-nealf@xilinx.com> <59b73223-73b3-1b9e-b8ec-0cedb0c605ef@benettiengineering.com> Message-ID: Hi Giulio, Thank you very much for your feedback. I would be happy to split the zynqmp_zcu102_defconfig off into a second patch. No problem. As for adding comments to the log, could you share the proper git commands for doing this? I would be happy to do it, but I am a bit new to git and I did not know the proper command to use for adding log comments. Best regards, Neal Frager Xilinx -----Original Message----- From: Giulio Benetti Sent: Wednesday 2 February 2022 23:33 To: Neal Frager ; buildroot at buildroot.org Cc: luca at lucaceresoli.net; Neal Frager Subject: Re: [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2 CAUTION: This message has originated from an External Source. Please use proper judgment and caution when opening attachments, clicking links, or responding to this email. Hi Neal, nice to see you've made it with git send-email :-), Here I would improve commit log by stating that you're dropping all local patches because they are now upstreamed On 02/02/22 17:55, Neal Frager wrote: > Signed-off-by: Neal Frager > --- > board/zynqmp/genimage.cfg | 1 + > ...-fix-Remove-GGC-ignore-Warray-bounds.patch | 68 ------- > ...64-zynqmp-zcu106-fix-SPL-MMC-booting.patch | 52 ------ > ...2-arm64-zynqmp-Enable-booting-to-ATF.patch | 114 ------------ > ...ept-an-absolute-path-for-PMUFW_INIT_.patch | 68 ------- > ...ynqmp-pass-the-PS-init-file-as-a-kco.patch | 175 ------------------ > configs/zynqmp_zcu102_defconfig | 35 ++++ This ^^^ file is added, so it deserves a second patch after this one, basically this becomes a patchset of 2 patches > configs/zynqmp_zcu106_defconfig | 15 +- > 8 files changed, 44 insertions(+), 484 deletions(-) > delete mode 100644 board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch > delete mode 100644 board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch > delete mode 100644 board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch > delete mode 100644 board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch > delete mode 100644 board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch > create mode 100644 configs/zynqmp_zcu102_defconfig > > diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg > index ed202f4550..557364e124 100644 > --- a/board/zynqmp/genimage.cfg > +++ b/board/zynqmp/genimage.cfg > @@ -3,6 +3,7 @@ image boot.vfat { > files = { > "boot.bin", > "u-boot.bin", > + "u-boot.itb", Can you please justify this adding ^^^ in commit log? > "atf-uboot.ub", > "system.dtb", > "Image" > diff --git > a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-G > GC-ignore-Warray-bounds.patch > b/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-G > GC-ignore-Warray-bounds.patch > deleted file mode 100644 > index 0c1a9ba2a4..0000000000 > --- > a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-G > GC-ignore-Warray-bounds.patch > +++ /dev/null > @@ -1,68 +0,0 @@ > -From da003e6ada7d0217fe99dc7c649a731f8ebd3c34 Mon Sep 17 00:00:00 > 2001 > -From: Deepika Bhavnani > -Date: Thu, 15 Aug 2019 00:56:46 +0300 > -Subject: [PATCH] Coverity fix: Remove GGC ignore -Warray-bounds > - > -GCC diagnostics were added to ignore array boundaries, instead -of > ignoring GCC warning current code will check for array boundaries -and > perform and array update only for valid elements. > - > -Resolves: `CID 246574` `CID 246710` `CID 246651` > - > -Signed-off-by: Deepika Bhavnani > -Change-Id: I7530ecf7a1707351c6ee87e90cc3d33574088f57 > - > -Backported from: 41af05154abe136938bcfb5f26c969933784bbef > -[Adapted to apply on 1.5] > - > ---- > - lib/psci/psci_common.c | 20 ++++++++++---------- > - 1 file changed, 10 insertions(+), 10 deletions(-) > - > -diff --git a/lib/psci/psci_common.c b/lib/psci/psci_common.c -index > 2220a745cd6e..6282d992a2f0 100644 > ---- a/lib/psci/psci_common.c > -+++ b/lib/psci/psci_common.c > -@@ -188,21 +188,17 @@ static unsigned int > get_power_on_target_pwrlvl(void) > - > /********************************************************************* > ********* > - * Helper function to update the requested local power state array. > This array > - * does not store the requested state for the CPU power level. Hence > an > -- * assertion is added to prevent us from accessing the wrong index. > -+ * assertion is added to prevent us from accessing the CPU power level. > - > ********************************************************************** > *******/ > - static void psci_set_req_local_pwr_state(unsigned int pwrlvl, > - unsigned int cpu_idx, > - plat_local_state_t req_pwr_state) > - { > -- /* > -- * This should never happen, we have this here to avoid > -- * "array subscript is above array bounds" errors in GCC. > -- */ > - assert(pwrlvl > PSCI_CPU_PWR_LVL); > --#pragma GCC diagnostic push > --#pragma GCC diagnostic ignored "-Warray-bounds" > -- psci_req_local_pwr_states[pwrlvl - 1][cpu_idx] = req_pwr_state; > --#pragma GCC diagnostic pop > -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && > -+ (cpu_idx < PLATFORM_CORE_COUNT)) { > -+ psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx] = req_pwr_state; > -+ } > - } > - > - > /********************************************************************* > ********* -@@ -228,7 +224,11 @@ static plat_local_state_t > *psci_get_req_local_pwr_states(unsigned int pwrlvl, > - { > - assert(pwrlvl > PSCI_CPU_PWR_LVL); > - > -- return &psci_req_local_pwr_states[pwrlvl - 1][cpu_idx]; > -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && > -+ (cpu_idx < PLATFORM_CORE_COUNT)) { > -+ return &psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx]; > -+ } else > -+ return NULL; > - } > - > - /* > --- > -2.34.0 > - > diff --git > a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-boot > ing.patch > b/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-boot > ing.patch > deleted file mode 100644 > index 4d85e1bb12..0000000000 > --- > a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-boot > ing.patch > +++ /dev/null > @@ -1,52 +0,0 @@ > -From e5d72ed8339eb05285448aad3c89d21e4d18fd29 Mon Sep 17 00:00:00 > 2001 > -From: Luca Ceresoli > -Date: Mon, 26 Feb 2018 09:40:34 +0100 > -Subject: [PATCH] arm64: zynqmp: zcu106: fix SPL MMC booting > - > -The U-Boot SPL generated with the current zcu106 defconfig cannot > boot -from MMC: > - > - [...] > - U-Boot SPL 2018.01 (Feb 21 2018 - 17:47:14) > - EL Level: EL3 > - Trying to boot from MMC1 > - sdhci_transfer_data: Error detected in status(0x408020)! > - spl_load_image_fat_os: error reading image u-boot.bin, err - -2 > - spl_load_image_fat: error reading image u-boot.img, err - -6 > - SPL: failed to boot from all boot devices > - ### ERROR ### Please RESET the board ### > - > -Fix by lowering the rpll value. The new value for the RPLL_CTRL > -register comes from the current psu_init_gpl.c from the HDF file at > -https://github.com/xilinx/hdf-examples/tree/01ad8ea5fd1989abf4ea5a072 > d019a16cb2bc546/zcu106-zynqmp > -(generated by Vivado v2017.4). > - > -RPLL and sdio1_ref clocks before and after this change: > - > - - Old values: RPLL 1.36 GHz, sdio1_ref 272 MHz > - - New values: RPLL 1.16 GHz, sdio1_ref 233 MHz > - > -Signed-off-by: Luca Ceresoli > -Cc: Michal Simek > -Upstream-status: accepted upstream in a different form > ---- > - > - board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c > b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c > -index 4d18abe000ca..e6fa477e53e7 100644 > ---- a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c > -+++ b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c > -@@ -10,7 +10,7 @@ > - static unsigned long psu_pll_init_data(void) > - { > - psu_mask_write(0xFF5E0034, 0xFE7FEDEFU, 0x7E4E2C62U); > -- psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00013C00U); > -+ psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00014600U); > - psu_mask_write(0xFF5E0030, 0x00000008U, 0x00000008U); > - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000001U); > - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000000U); > --- > -2.7.4 > - > diff --git > a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.p > atch > b/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.p > atch > deleted file mode 100644 > index 487fff6812..0000000000 > --- > a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.p > atch > +++ /dev/null > @@ -1,114 +0,0 @@ > -From 5e3cac50cc981e01d9072241035a8d4162560c71 Mon Sep 17 00:00:00 > 2001 > -From: Luca Ceresoli > -Date: Mon, 12 Mar 2018 17:18:38 +0100 > -Subject: [PATCH] arm64: zynqmp: Enable booting to ATF > - > -U-Boot is now able to boot to ARM Trusted Firmware (ATF). The boot > -flow is SPL(EL3) loads ATF and full u-boot and jump to ATF(EL3) which > -pass control to full u-boot(EL2). This has been tested on zcu106, so > -enable it in this defconfig. > - > -To generate an image that triggers this booting flow, you need to > pass -'-O arm-trusted-firmware' to mkimage. > - > -Signed-off-by: Luca Ceresoli > -Signed-off-by: Michal Simek -Backported > from upstream: > http://git.denx.de/?p=u-boot.git;a=commit;h=5e3cac50cc981e01d907224103 > 5a8d4162560c71 > ---- > - > - configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 + > - configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 + > - configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 + > - configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 + > - configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 1 + > - configs/xilinx_zynqmp_zcu102_revA_defconfig | 1 + > - configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 + > - 7 files changed, 7 insertions(+) > - > -diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig > b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig > -index c5bfa2b12638..488c72258b0e 100644 > ---- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig > -+++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig > -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_FASTBOOT=y > - CONFIG_FASTBOOT_FLASH=y > -diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig > b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig > -index f86dce403a42..5d501eec0edd 100644 > ---- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig > -+++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig > -@@ -20,6 +20,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_FASTBOOT=y > - CONFIG_FASTBOOT_FLASH=y > -diff --git a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig > b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig > -index 6e947cf56827..6f7eaebd7676 100644 > ---- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig > -+++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig > -@@ -16,6 +16,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_CMD_MEMTEST=y > - CONFIG_SYS_ALT_MEMTEST=y > -diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig > b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig > -index 1c934858c61c..7a3806cba4b5 100644 > ---- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig > -+++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig > -@@ -17,6 +17,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_CMD_MEMTEST=y > - CONFIG_SYS_ALT_MEMTEST=y > -diff --git a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig > b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig > -index e13c7c56f310..e4408f182ca0 100644 > ---- a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig > -+++ b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig > -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_FASTBOOT=y > - CONFIG_FASTBOOT_FLASH=y > -diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig > b/configs/xilinx_zynqmp_zcu102_revA_defconfig > -index 5b2cd495ee85..b52f6789fd4b 100644 > ---- a/configs/xilinx_zynqmp_zcu102_revA_defconfig > -+++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig > -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_FASTBOOT=y > - CONFIG_FASTBOOT_FLASH=y > -diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig > b/configs/xilinx_zynqmp_zcu102_revB_defconfig > -index e6530fbfe7ff..80592554f682 100644 > ---- a/configs/xilinx_zynqmp_zcu102_revB_defconfig > -+++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig > -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_FASTBOOT=y > - CONFIG_FASTBOOT_FLASH=y > --- > -2.7.4 > - > diff --git > a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path > -for-PMUFW_INIT_.patch > b/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path > -for-PMUFW_INIT_.patch > deleted file mode 100644 > index 95ab7b3b75..0000000000 > --- > a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path > -for-PMUFW_INIT_.patch > +++ /dev/null > @@ -1,68 +0,0 @@ > -From c7df098a71e05dc81cee818747759e8060b59626 Mon Sep 17 00:00:00 > 2001 > -From: Luca Ceresoli > -Date: Mon, 4 Jun 2018 12:21:01 +0200 > -Subject: [PATCH] arm64: zynqmp: accept an absolute path for > PMUFW_INIT_FILE > - > -The value of PMUFW_INIT_FILE is prefixed with "$(srctree)/", thus > -forcing it to be a relative path inside the U-Boot source tree. Since > -the PMUFW is a binary file generated outside of U-Boot, the PMUFW > -binary must be copied inside the U-Boot source tree before the > -build. > - > -This generates a few problems: > - > - * if the source tree is shared among different out-of-tree builds, > - they will pollute (and potentially corrupt) each other > - * the source tree cannot be read-only > - * any buildsystem must add a command to copy the PMUFW binary > - * putting an externally-generated binary in the source tree is ugly > - as hell > - > -Avoid these problems by accepting an absolute path for > -PMUFW_INIT_FILE. This would be as simple as removing the "$(srctree)/" > -prefix, but in order to keep backward compatibility we rather use the > -shell and readlink to get the absolute path even when starting from a > -relative path. > - > -Since 'readlink -f' produces an empty string if the file does not > -exist, we also add a check to ensure the file configured in > -PMUFW_INIT_FILE exists. Otherwise the build would exit successfully, > -but produce a boot.bin without PMUFW as if PMUFW_INIT_FILE were empty. > - > -Tested in the 12 possible combinations of: > - - PMUFW_INIT_FILE empty, relative, absolute, non-existing > - - building in-tree, in subdir, in other directory > - > -Signed-off-by: Luca Ceresoli > -Cc: Michal Simek > -Cc: Simon Glass > -Cc: Emmanuel Vadot > -Signed-off-by: Michal Simek -Backported > from upstream: > https://git.denx.de/?p=u-boot.git;a=commit;h=c7df098a71e05dc81cee81874 > 7759e8060b59626 > ---- > - scripts/Makefile.spl | 8 +++++++- > - 1 file changed, 7 insertions(+), 1 deletion(-) > - > -diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl -index > ef018b5b4056..252f13826d4c 100644 > ---- a/scripts/Makefile.spl > -+++ b/scripts/Makefile.spl > -@@ -167,8 +167,14 @@ ifdef CONFIG_ARCH_ZYNQ > - MKIMAGEFLAGS_boot.bin = -T zynqimage -R > $(srctree)/$(CONFIG_BOOT_INIT_FILE) > - endif > - ifdef CONFIG_ARCH_ZYNQMP > -+ifneq ($(CONFIG_PMUFW_INIT_FILE),"") > -+spl/boot.bin: zynqmp-check-pmufw > -+zynqmp-check-pmufw: FORCE > -+ ( cd $(srctree) && test -r $(CONFIG_PMUFW_INIT_FILE) ) \ > -+ || ( echo "Cannot read $(CONFIG_PMUFW_INIT_FILE)" && > -+false ) endif > - MKIMAGEFLAGS_boot.bin = -T zynqmpimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) \ > -- -n $(srctree)/$(CONFIG_PMUFW_INIT_FILE) > -+ -n "$(shell cd $(srctree); readlink -f $(CONFIG_PMUFW_INIT_FILE))" > - endif > - > - spl/boot.bin: $(obj)/u-boot-spl.bin FORCE > --- > -2.7.4 > - > diff --git > a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-in > it-file-as-a-kco.patch > b/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-in > it-file-as-a-kco.patch > deleted file mode 100644 > index b32e162780..0000000000 > --- > a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-in > it-file-as-a-kco.patch > +++ /dev/null > @@ -1,175 +0,0 @@ > -From 4c9d54ab5a41d65000c8d249b6fb1b76056f1812 Mon Sep 17 00:00:00 > 2001 > -From: Luca Ceresoli > -Date: Wed, 20 Jun 2018 12:11:50 +0200 > -Subject: [PATCH] arm/arm64: zynq/zynqmp: pass the PS init file as a > kconfig > - variable > - > -U-Boot needs to link ps7_init_gpl.c on Zynq or psu_init_gpl.c on > -ZynqMP (PS init for short). The current logic to locate this file for > -both platforms is: > - > - 1. if a board-specific file exists in > - board/xilinx/zynq[mp]/$(CONFIG_DEFAULT_DEVICE_TREE)/ps?_init_gpl.c > - then use it > - 2. otherwise use board/xilinx/zynq/ps?_init_gpl.c > - > -In the latter case the file does not exist in the U-Boot sources and > -must be copied in the source tree from the outside before starting > the -build. This is typical when it is generated from Xilinx tools > while -developing a custom hardware. However making sure that a > -board-specific file is _not_ found (and used) requires some trickery > -such as removing or overwriting all PS init files (e.g.: the current > -meta-xilinx yocto layer [0]). > - > -This generates a few problems: > - > - * if the source tree is shared among different out-of-tree builds, > - they will pollute (and potentially corrupt) each other > - * the source tree cannot be read-only > - * any buildsystem must add a command to copy the PS init file binary > - * overwriting or deleting files in the source tree is ugly as hell > - > -Simplify usage by allowing to pass the path to the desired PS init > -file in kconfig variable XILINX_PS_INIT_FILE. It can be an absolute > -path or relative to $(srctree). If the variable is set, the > -user-specified file will always be used without being copied -around. > If the the variable is left empty, for backward compatibility -fall > back to the old behaviour. > - > -Since the issue is the same for Zynq and ZynqMP, add one kconfig > -variable in a common place and use it for both. > - > -Also use the new kconfig help text to document all the ways to give > -U-Boot the PS init file. > - > -Build-tested with all combinations of: > - - platform: zynq or zynqmp > - - PS init file: from XILINX_PS_INIT_FILE (absolute, relative path, > - non-existing), in-tree board-specific, in board/xilinx/zynq[mp]/ > - - building in-tree, in subdir, in other directory > - > -[0] > https://github.com/Xilinx/meta-xilinx/blob/b2f74cc7fe5c4881589d5e440a1 > 7cb51fc66a7ab/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init. > inc#L9 > - > -Signed-off-by: Luca Ceresoli > -Cc: Albert Aribaud > -Cc: Michal Simek > -Cc: Nathan Rossi -Backported from upstream: > https://git.denx.de/?p=u-boot.git;a=commit;h=6da4f67ad09cd8b311d77b2b0 > 4e557b7ef65b56c > ---- > - arch/arm/Kconfig | 1 + > - board/xilinx/Kconfig | 41 +++++++++++++++++++++++++++++++++++++++++ > - board/xilinx/zynq/Makefile | 10 +++++++++- > - board/xilinx/zynqmp/Makefile | 10 +++++++++- > - 4 files changed, 60 insertions(+), 2 deletions(-) > - create mode 100644 board/xilinx/Kconfig > - > -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index > 22234cde2ab6..e04979d0ef7e 100644 > ---- a/arch/arm/Kconfig > -+++ b/arch/arm/Kconfig > -@@ -1293,4 +1293,5 @@ source "board/technologic/ts4600/Kconfig" > - source "board/vscom/baltos/Kconfig" > - source "board/woodburn/Kconfig" > - source "board/work-microwave/work_92105/Kconfig" > -+source "board/xilinx/Kconfig" > - source "board/zipitz2/Kconfig" > - > - source "arch/arm/Kconfig.debug" > -diff --git a/board/xilinx/Kconfig b/board/xilinx/Kconfig -new file > mode 100644 -index 000000000000..aa3fa061edef > ---- /dev/null > -+++ b/board/xilinx/Kconfig > -@@ -0,0 +1,41 @@ > -+# Copyright (c) 2018, Luca Ceresoli # # > -+SPDX-License-Identifier: GPL-2.0 > -+ > -+if ARCH_ZYNQ || ARCH_ZYNQMP > -+ > -+config XILINX_PS_INIT_FILE > -+ string "Zynq/ZynqMP PS init file(s) location" > -+ help > -+ On Zynq and ZynqMP U-Boot SPL (or U-Boot proper if > -+ ZYNQMP_PSU_INIT_ENABLED is set) is responsible for some > -+ basic initializations, such as enabling peripherals and > -+ configuring pinmuxes. The PS init file (called > -+ psu_init_gpl.c on ZynqMP, ps7_init_gpl.c for Zynq-7000) > -+ contains the code for such initializations. > -+ > -+ U-Boot contains PS init files for some boards, but each of > -+ them describes only one specific configuration. Users of a > -+ different board, or needing a different configuration, can > -+ generate custom files using the Xilinx development tools. > -+ > -+ There are three ways to give a PS init file to U-Boot: > -+ > -+ 1. Set this variable to the path, either relative to the > -+ source tree or absolute, where the psu_init_gpl.c or > -+ ps7_init_gpl.c file is located. U-Boot will build this > -+ file. > -+ > -+ 2. If you leave an empty string here, U-Boot will use > -+ board/xilinx/zynq/$(CONFIG_DEFAULT_DEVICE_TREE)/ps7_init_gpl.c > -+ for Zynq-7000, or > -+ board/xilinx/zynqmp/$(CONFIG_DEFAULT_DEVICE_TREE)/psu_init_gpl.c > -+ for ZynqMP. > -+ > -+ 3. If the above file does not exist, U-Boot will use > -+ board/xilinx/zynq/ps7_init_gpl.c for Zynq-7000, or > -+ board/xilinx/zynqmp/psu_init_gpl.c for ZynqMP. This file > -+ is not provided by U-Boot, you have to copy it there > -+ before the build. > -+ > -+endif > -diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile > -index 5a76a26720cd..03ad5f0532ee 100644 > ---- a/board/xilinx/zynq/Makefile > -+++ b/board/xilinx/zynq/Makefile > -@@ -5,10 +5,18 @@ > - > - obj-y := board.o > - > --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) > -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") > -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f > -+$(CONFIG_XILINX_PS_INIT_FILE)) init-objs := ps_init_gpl.o > -+spl/board/xilinx/zynq/ps_init_gpl.o board/xilinx/zynq/ps_init_gpl.o: $(PS_INIT_FILE) > -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ endif > - > -+ifeq ($(init-objs),) > -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) > - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/ps7_init_gpl.c),\ > - $(hw-platform-y)/ps7_init_gpl.o) > -+endif > - > - ifeq ($(init-objs),) > - ifneq ($(wildcard $(srctree)/$(src)/ps7_init_gpl.c),) > -diff --git a/board/xilinx/zynqmp/Makefile > b/board/xilinx/zynqmp/Makefile -index 05ccd25dcef3..960b81fc5853 > 100644 > ---- a/board/xilinx/zynqmp/Makefile > -+++ b/board/xilinx/zynqmp/Makefile > -@@ -5,10 +5,18 @@ > - > - obj-y := zynqmp.o > - > --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) > -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") > -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f > -+$(CONFIG_XILINX_PS_INIT_FILE)) init-objs := ps_init_gpl.o > -+spl/board/xilinx/zynqmp/ps_init_gpl.o board/xilinx/zynqmp/ps_init_gpl.o: $(PS_INIT_FILE) > -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ endif > - > -+ifeq ($(init-objs),) > -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) > - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/psu_init_gpl.c),\ > - $(hw-platform-y)/psu_init_gpl.o) > -+endif > - > - ifeq ($(init-objs),) > - ifneq ($(wildcard $(srctree)/$(src)/psu_init_gpl.c),) > --- > -2.7.4 > - > diff --git a/configs/zynqmp_zcu102_defconfig > b/configs/zynqmp_zcu102_defconfig new file mode 100644 index > 0000000000..336f5c2dbe > --- /dev/null > +++ b/configs/zynqmp_zcu102_defconfig > @@ -0,0 +1,35 @@ > +BR2_aarch64=y > +BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_GIT=y > +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2" > +BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +# BR2_TARGET_ROOTFS_TAR is not set > +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.4_2021.2" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_SPL=y > +BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" > +BR2_TARGET_UBOOT_ZYNQMP=y > +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/master/bin/pmufw-v2021.2.bin" > +BR2_TARGET_UBOOT_FORMAT_ITB=y > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_MTOOLS=y As pointed above this ^^^ file must be in a separate patch and it deserves also a maintainer. So please you or maybe Luca could add an entry to DEVELOPERS for this board > diff --git a/configs/zynqmp_zcu106_defconfig > b/configs/zynqmp_zcu106_defconfig index bee7c1daf7..3a6947e1e8 100644 > --- a/configs/zynqmp_zcu106_defconfig > +++ b/configs/zynqmp_zcu106_defconfig > @@ -1,11 +1,11 @@ > BR2_aarch64=y > BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" Since all patches are gone, this ^^^ is not needed anymore > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_GIT=y > BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" > -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" > @@ -14,21 +14,22 @@ BR2_TARGET_ROOTFS_EXT2_4=y > # BR2_TARGET_ROOTFS_TAR is not set > BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.4_2021.2" It's worth mention in commit log that you're switching from ARM to Xilinx ATF > BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" > -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7" > -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA" > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" > BR2_TARGET_UBOOT_NEEDS_DTC=y > BR2_TARGET_UBOOT_SPL=y > BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" > BR2_TARGET_UBOOT_ZYNQMP=y > -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/53fdb7b6c92860ceb0ec5fd14deee302f4a84269/bin/pmufw-zcu106-default-v2017.4.bin" > +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/master/bin/pmufw-v2021.2.bin" > +BR2_TARGET_UBOOT_FORMAT_ITB=y Here ^^^ I see that probably you're switching from .bin to .itb so better mention it in commit log > BR2_PACKAGE_HOST_DOSFSTOOLS=y > BR2_PACKAGE_HOST_GENIMAGE=y > BR2_PACKAGE_HOST_MTOOLS=y Thank you! Best regards -- Giulio Benetti Benetti Engineering sas From thomas.petazzoni at bootlin.com Thu Feb 3 07:05:51 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 03 Feb 2022 07:05:51 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-02-02 Message-ID: <20220203070556.DD3D941570@smtp4.osuosl.org> Hello, Autobuild statistics for 2022-02-02 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 76 | 12 | 0 | 88 | 2021.11.x | 27 | 4 | 0 | 31 | master | 66 | 93 | 0 | 159 | Classification of failures by reason for master ----------------------------------------------- host-util-linux-2.37.3 | 62 host-libselinux-3.3 | 6 unknown | 4 python-aiohttp-3.8.1 | 2 rtorrent-0.9.8 | 2 rygel-0.40.2 | 2 adwaita-icon-theme-3.37.2 | 1 bluez5_utils-5.63 | 1 boinc-7.18.1 | 1 cryptsetup-2.4.2 | 1 frr-8.1 | 1 host-python-docutils-0.15.2 | 1 jasper-2.0.33 | 1 libglvnd-1.3.2 | 1 libselinux-3.3 | 1 mesa3d-21.3.4 | 1 mp4v2-5.0.1 | 1 python-argon2-cffi-21.1.0 | 1 python-brotli-1.0.9 | 1 sconeserver-6b932d7d8dbb700... | 1 xvisor-0.3.1 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- m68k | adwaita-icon-theme-3.37.2 | NOK | http://autobuild.buildroot.net/results/0e00059b09b4445eaaec1030997883187c6a80d6 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/c39c0e9b5411bc586173b47324b052efb110fe3f | arm | boinc-7.18.1 | NOK | http://autobuild.buildroot.net/results/5816378705c3276e97dc8c030b3b0f9a3e391aa9 | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/bad4d01fde3191e4d481a8e9dae18df3b1a94537 | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/885f01b447ed4de75dbbc4491f0c6bdd3997700e | aarch64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/84bc42a947cc2c68c9d601e98cc8954c88e33b11 | s390x | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/29fd227a36b6493fdfede4d224daa193ec77ffaa | mips64el | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/b23eee490b9be140e019933112f1f7612578bca0 | sparc64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/37f11633d96729f0d8020ddbc13b9acf0120c0a1 | mips64el | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/9362ea8a085c97ce3c9a37c5a00b42e0644989b2 | powerpc64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/23d2e80704debd4d624c63661dcc20c0c1c488d5 | sparc64 | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/02dd94c09dabdbdd8b47673393577a7fd3af3aeb | m68k | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/cbdf02d6d44c1c0ea9b99fe9a53dc451c02c6d45 | ORPH powerpc | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/35fc4e922d7d5ba5e85dbd376d9a0b954271f59e | ORPH arc | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/5f43ab24b9b49b020fffbb59489abed55c07f5c2 | ORPH mips64el | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/7a4309bc894be152a85d8b25bab17ffd993617bb | ORPH sparc | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/2227d8aef44fc3b082c8e93ef3eef94087f7d2ac | ORPH arc | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/23fe38ff0be9d4d25f512bab033d9ddae8fd4354 | ORPH sparc | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/38eb5ef2ab6ce6161487a660b8756858f29f31e7 | ORPH arm | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/13b74ff23b18e0b01a7cee57b9584d3880611dc0 | ORPH mipsel | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/38325617007308c109020f75679994e14b0015a6 | ORPH arm | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/bc6aa6156d2f48c14681e260e61b97d339bce76d | ORPH aarch64 | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/3923bba9148638414a0d180a9e1feb17e0171f64 | ORPH arm | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/aadb130fc7ad7c5e5df0700d48f32d2a5a944452 | ORPH m68k | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/130cf2ceb980a86cca86ff6a7a945203e486a9dd | ORPH arm | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/eaf9a3a4f8c226084e6e21501a2d3e13d0e742b8 | ORPH i686 | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/6cc15972eb4cb6d771597bf98e176775b253dfa5 | ORPH arm | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/3708db3d397332a939a8276d957f0fb51f0360fb | ORPH mips64el | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/d4bd6fcb37d566bdba7dd9c2b46fe6b007259652 | ORPH m68k | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/3bf0471e2fc79a495385f9202171e2c8ae4ace5d | ORPH mips | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/ec01e80449ecafe015c9b693ba3a7c2b2917786a | ORPH powerpc64 | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/cbdf8ef931a63b7a5375778c4927f6ca28bb999d | ORPH aarch64 | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/7bdd64e7c031a4bc4a51569bdacd0f12000d19ea | ORPH x86_64 | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/5282e9846785d8e03dce2c05f0e678b8d9cb610c | ORPH arm | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/4649d72ab7093b60239e8210d3329587148c129e | ORPH m68k | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/7216879730b1a4d27bb3640e3e4b95d7d06f80ff | ORPH mipsel | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/ec98d23f5f0f60154519a919a30a86a820a18ea9 | ORPH arm | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/15cdd73c29306891c365fb35e580043191fe54e3 | ORPH arm | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/c101c4033a456cd23c724db7ee178dd771cdf3b4 | ORPH arc | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/d617bb3e5aec233712f53dc78476119f5454cbd7 | ORPH mipsel | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/7bde5bf714b4a5007ea2b06124f514bfbc41301d | ORPH powerpc64le | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/1ec43c2e9fd529dd99f8fa8a1d160c9b5a5fa736 | ORPH m68k | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/5589845b14a47c29918e2bdc93ccfb74d0b7c73d | ORPH xtensa | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/739399b1bd664a13e1a4b81fdace8f45be95f096 | ORPH mipsel | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/e498da3b10b2c4f24c74f7a14a7941ed2b451ec6 | ORPH powerpc | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/c85cd1634e940bb242d72092fe68d2d05a33f03a | ORPH arc | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/28d792f74d0ce34c5f751a0ba1b6edb40d92f1aa | ORPH aarch64 | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/23afe9f1f13b7693cca24e3e86f9d04fd095a50f | ORPH x86_64 | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/4dd133b0cf5d2d29321bc38a875e909544fc114f | ORPH arc | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/5ed83936207623190ed65f61996c4917b6d5cdeb | ORPH powerpc | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/af8bbe1c2019066aa8baf7790f35887b9c4c1ef7 | ORPH arc | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/0d20979df14c7fd0307c6bc78d0c6e977191e9ae | ORPH arm | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/47780646faf8cbd1cb1b1b7560cdda23134ac24f | ORPH arc | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/187548fadcc66e8cdbc24a3ef2c45ee6a8a853e5 | ORPH arm | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/52dac30516ca65522c424115573e7ddb9361d8f9 | ORPH mipsel | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/8b9e5776768ecd77c0798534aa7517d5e230f53a | ORPH mips64el | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/c03a703745152fff6690087871e22370dc55c669 | ORPH powerpc64 | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/07f6daaa46538fcd938537949078c3a1f0ae6929 | ORPH s390x | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/dd4d28bf5a8a618d992b4cae9423af4947b46fd0 | ORPH m68k | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/719a846c965cf09b9a97abaf4a877698d791cffb | ORPH arm | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/8dbb4e0cf367f6f72c07c57c66535a560b4e036e | ORPH arm | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/e52f4dccae02f7264c2bfefbf8f5e7d83dee04af | ORPH sparc | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/55e1809c78ad46c8bdcf042b39a858022e65d636 | ORPH x86_64 | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/b8cb40efc036a01802c914544cd4fc29dfd67af6 | ORPH arm | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/ba1369703e3c5b2d730bafcb5faea90b0ba27dd5 | ORPH riscv64 | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/cb06fb63ed8700af2d3c737a5e8e8a11d988b3f5 | ORPH riscv64 | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/f0c87123ce569e46941339359c1a624a99c562f0 | ORPH powerpc | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/a047476142dc27681d5eb9ec60a1f6ed10531457 | ORPH x86_64 | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/2eb54d77d883d1ab31b9f61ef4e2411c9cee6d75 | ORPH mips | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/de8dd3f7c1f3e5b91af3d664edc042646812794e | ORPH i686 | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/29f273a14b2d3d44fb74fefc987cf271601e65bd | ORPH nios2 | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/26a59e826ec291b35f9d8a4aaca11b127146be8e | ORPH i686 | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/97891a7bfd78c8c87294617ce4a7d1f3d2fc6731 | ORPH arm | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/0f4e11ec2046c29acdb1e4c9bb93ee2291dca9b8 | ORPH x86_64 | jasper-2.0.33 | NOK | http://autobuild.buildroot.net/results/b106fdf32ffa9e0ef1254e0a29fdcdc821020e08 | arm | libglvnd-1.3.2 | NOK | http://autobuild.buildroot.net/results/6ff0b80de4a09bdd34d3f627e94a4fca9d9c3514 | ORPH arc | libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/1395f1b29bcbe30fa47524736899917892cb6bf6 | x86_64 | mesa3d-21.3.4 | NOK | http://autobuild.buildroot.net/results/51866218f9ba7aa7ee3c1acf10aeb31c9d70a266 | mips64el | mp4v2-5.0.1 | NOK | http://autobuild.buildroot.net/results/8dfdf0888cf1d2904b610bfb4c8e2d75562b51c6 | ORPH i686 | python-aiohttp-3.8.1 | NOK | http://autobuild.buildroot.net/results/2e8093e68d04e8cbb20b095068b24c8bbe5f69ad | mips64el | python-aiohttp-3.8.1 | NOK | http://autobuild.buildroot.net/results/6a0d2e3db7c573cd0ca98d953185f71f9ec044fd | or1k | python-argon2-cffi-21.1.0 | NOK | http://autobuild.buildroot.net/results/3207bb214dcb0c8bb96e3994af9875a2c4e8cb2c | mipsel | python-brotli-1.0.9 | NOK | http://autobuild.buildroot.net/results/9e3cfddb651a59d7f2d04bc88e6fff2a06e9b465 | arc | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/2a563299c8668d06ec4a1684c06512520819923e | ORPH x86_64 | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/e614db8f94eaf6fabe45856ecd75af3f54d8361d | ORPH xtensa | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/2b2ce3bc565f1a5ea14f1a3eb2890670f1fda9a6 | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/a60073e472d2130fadd25384306385215a09bcf0 | mips64el | sconeserver-6b932d7d8dbb700... | NOK | http://autobuild.buildroot.net/results/be043792e6e5501631517881b10096291a654364 | powerpc64 | unknown | NOK | http://autobuild.buildroot.net/results/9cb6aeb34e238e141515d9c27b5dfaa462fb9ffa | powerpc64 | unknown | NOK | http://autobuild.buildroot.net/results/d7b8fb91f92c361bc0e38166bcb49ca58a58dbbe | m68k | unknown | NOK | http://autobuild.buildroot.net/results/aec2eeaf29dc71adc955461d0391ef3125349217 | arm | unknown | NOK | http://autobuild.buildroot.net/results/22bc42bba9ac87e72934e8c29fcd69c60cbca77c | arm | xvisor-0.3.1 | NOK | http://autobuild.buildroot.net/results/94cc1d71bbaecbda41c7ab325fb4ada30dc4cf0a | Classification of failures by reason for 2021.02.x -------------------------------------------------- unknown | 4 host-sentry-cli-1.57.0 | 3 monkey-f54856ce250c4e257354... | 2 ndisc6-1.0.4 | 2 zeromq-4.3.4 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/0aefceff16d609fbc6fceb02612355907de1b771 | powerpc | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/52f6ae114ab020c1d83d03f168e42b18fc1e6bd5 | arm | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/5173137747b60eefc8429e06d75efe52632b0fbe | mips64el | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/0d678fbfa74a2385d7a231ed6e6890793a700483 | microblazeel | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/ae9b9cc180d35261d14b31650c5aac4f7e1eb0e8 | arm | ndisc6-1.0.4 | NOK | http://autobuild.buildroot.net/results/ce203db04bf0a1b3933f5ce563a155120d7fe5f0 | ORPH arm | ndisc6-1.0.4 | NOK | http://autobuild.buildroot.net/results/d3e71c97cd62495accc667e97d17261f3d79e479 | ORPH arm | unknown | NOK | http://autobuild.buildroot.net/results/35273145d382bc4ed39222a76b3b366a1363069a | mips64el | unknown | NOK | http://autobuild.buildroot.net/results/9f4f4db18063cc0b7e21e92d948c7c73f9653909 | x86_64 | unknown | NOK | http://autobuild.buildroot.net/results/fc76a4fd44cc45c234df25b9dfee7998be0b3268 | i686 | unknown | NOK | http://autobuild.buildroot.net/results/44d85bb4341d1a5060f10a3b4677e0b5eb857ff7 | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/d5e70c6c8fb8b80d48c4cccaa9eb15eeb9c087fb | Classification of failures by reason for 2021.11.x -------------------------------------------------- unknown | 2 wavemon-0.9.4 | 2 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arc | unknown | NOK | http://autobuild.buildroot.net/results/b1e0884d5c54196d626cb25d42cd9b84b8f3e432 | mipsel | unknown | NOK | http://autobuild.buildroot.net/results/325f3be7398e5fc2a0e47c7c29be0a160638bbbd | x86_64 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/e75a5dfe638a282ca86514d5398e1451847e1d61 | mips64el | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/d7bfd6d04038bd4ef8c806d8f540f7c6c36a2531 | -- http://autobuild.buildroot.net From yann.morin at orange.com Thu Feb 3 08:11:33 2022 From: yann.morin at orange.com (yann.morin at orange.com) Date: Thu, 3 Feb 2022 09:11:33 +0100 Subject: [Buildroot] [PATCHv2] package/glibc: allow runing on kernels older than used for the headers In-Reply-To: References: <19291_1643809720_61FA8BB8_19291_487_24_41ca9ce22939ce2ed0c41973db7d612542850824.1643809712.git.yann.morin@orange.com> Message-ID: <2371_1643875895_61FB8E37_2371_137_1_20220203081133.GA3479@tl-lnx-nyma7486> Alexey, All, On 2022-02-02 17:00 +0000, Alexey Brodkin spake thusly: > > We add an option to glibc to allow the user to enable compatibility > > shims. To simplify the case, when that option is enabled, we just let > > glibc enable as old compatibility shims as supported by the current > > architecture. > Looks reasonable to me. I mean to not have all the flexibility proposed > initially, instead adding an option to fall back to something much > older compared to used headers. > > If more options are needed later, we'll get to know it at some point ;) > > And thanks for doing that, as I meant to do something similar a while ago, > but never posted my local changes. Will that be followed up by a reviewed-by or maybe a tested-by tag? ;-) Thanks for the feedback, by the way. ? Regards, Yann E. MORIN. -- ____________ .-----------------.--------------------: _ :------------------. | Yann E. MORIN | Real-Time Embedded | __/ ) | /"\ ASCII RIBBON | | +33 534.541.179 | Software Designer | _/ - /' | \ / CAMPAIGN | | +33 638.411.245 '--------------------: (_ `--, | X AGAINST | | yann.morin (at) orange.com |_=" ,--' | / \ HTML MAIL | '--------------------------------------:______/_____:------------------' _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From luca at lucaceresoli.net Thu Feb 3 08:14:33 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Thu, 3 Feb 2022 09:14:33 +0100 Subject: [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2 In-Reply-To: References: <20220202165555.3497977-1-nealf@xilinx.com> Message-ID: <57bd27fd-09c8-9441-8429-bb4983287c6c@lucaceresoli.net> Hi Neal, On 03/02/22 07:20, Neal Frager wrote: > Hi Luca, > > Thank you for your positive feedback. Below you can find my thoughts. > > Neal Frager > Embedded Processor Specialist > Xilinx > > neal.frager at xilinx.com > Mobile: +33.6.48.11.37.36 > www.linkedin.com/in/neal-frager-0397463 > > -----Original Message----- > From: Luca Ceresoli > Sent: Wednesday 2 February 2022 23:29 > To: Neal Frager ; buildroot at buildroot.org > Cc: Neal Frager > Subject: Re: [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2 > > CAUTION: This message has originated from an External Source. Please use proper judgment and caution when opening attachments, clicking links, or responding to this email. > > > Hi Neal, > > thank you for your effort and for sending a patch in the format that is the most convenient for other people to review your code. > > Your work seems generally in a good shape. I have several remarks, see below, but nothing really problematic. > > On 02/02/22 17:55, Neal Frager wrote: >> Signed-off-by: Neal Frager > > Maybe you can add more details before the Signed-off-by line, suah as "Also add a defconfig for ZCU102", "remove U-Boot and ATF patches not upstream"... > > [Neal] Could you share the proper git commands for adding comments to a patch? I would be happy to add more comments, but I am a bit new to git, and I do not know what commands I need to use. The command 'git commit' opens an editor where you can write a commit message with all the details you wish. And if you have already done your commit and want to modify the comment, use 'git commit --amend'. A suggested reading is ProGit, the official git book: https://git-scm.com/book/en/v2/Git-Basics-Recording-Changes-to-the-Repository A few suggestions on how to write a good commit message: https://cbea.ms/git-commit/ > First issue: this defconfig does not build on my PC: > > $ git clean -xdf && make zynqmp_zcu106_defconfig && verynice make > package/pkg-generic.mk:266: *** BR2_GLOBAL_PATCH_DIR contains nonexistent directory board/zynqmp/patches/. Stop. > $ > > As you removed all patches (which is sooo gooood!) you now have to remove the BR2_GLOBAL_PATCH_DIR. > > [Neal] I have not seen this error on my side, but to fix it, I will just remove the BR2_GLOBAL_PATCH_DIR from the defconfigs. > >> --- >> board/zynqmp/genimage.cfg | 1 + >> ...-fix-Remove-GGC-ignore-Warray-bounds.patch | 68 ------- >> ...64-zynqmp-zcu106-fix-SPL-MMC-booting.patch | 52 ------ >> ...2-arm64-zynqmp-Enable-booting-to-ATF.patch | 114 ------------ >> ...ept-an-absolute-path-for-PMUFW_INIT_.patch | 68 ------- >> ...ynqmp-pass-the-PS-init-file-as-a-kco.patch | 175 ------------------ >> configs/zynqmp_zcu102_defconfig | 35 ++++ >> configs/zynqmp_zcu106_defconfig | 15 +- >> 8 files changed, 44 insertions(+), 484 deletions(-) delete mode >> 100644 >> board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC >> -ignore-Warray-bounds.patch delete mode 100644 >> board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-bootin >> g.patch delete mode 100644 >> board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.pat >> ch delete mode 100644 >> board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-f >> or-PMUFW_INIT_.patch delete mode 100644 >> board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init >> -file-as-a-kco.patch create mode 100644 >> configs/zynqmp_zcu102_defconfig >> >> diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg >> index ed202f4550..557364e124 100644 >> --- a/board/zynqmp/genimage.cfg >> +++ b/board/zynqmp/genimage.cfg >> @@ -3,6 +3,7 @@ image boot.vfat { >> files = { >> "boot.bin", >> "u-boot.bin", >> + "u-boot.itb", > > Is u-boot.bin still needed, when we have the .itb? > > [Neal] u-boot.bin is no longer needed. I can remove it. > >> diff --git a/configs/zynqmp_zcu106_defconfig >> b/configs/zynqmp_zcu106_defconfig index bee7c1daf7..3a6947e1e8 100644 >> --- a/configs/zynqmp_zcu106_defconfig >> +++ b/configs/zynqmp_zcu106_defconfig >> @@ -1,11 +1,11 @@ >> BR2_aarch64=y >> BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" >> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y >> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y >> BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" >> BR2_LINUX_KERNEL=y >> BR2_LINUX_KERNEL_CUSTOM_GIT=y >> BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" >> -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" >> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2" >> BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" >> BR2_LINUX_KERNEL_DTS_SUPPORT=y >> BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" >> @@ -14,21 +14,22 @@ BR2_TARGET_ROOTFS_EXT2_4=y # >> BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y >> BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y >> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" >> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5" >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.4_2021.2" > > As far as I remember (but I ask the core developers to confirm or deny), from the Buildroot perspective upstream versions are generally preferred even when they lack some non-fundamental features (e.g.: some drivers are missing) that are in vendor forks. > > Is there a reason for switching ATF to the Xilinx fork? In this case explain it in the commit message, otherwise stay on the upstream repo, upgrading to the latest [working] release. > > A similar question applies to kernel and U-Boot: is it possible to switch to upstream releases? > > [Neal] I was trying to match the Xilinx tested software release 2021.2 with these patches. The mainline Linux kernel is still missing quite a bit of the Xilinx drivers, so if a developer uses all mainline locations, there will be things that do not work properly. The ATF should probably be ok, as it is almost identical to the Xilinx fork, but since I was already using the Xilinx fork for the Linux kernel and U-Boot, I thought it would be better to use the Xilinx tested fork for everything to remain consistent. I can understand that mainline Linux has significantly fewer drivers than the Xilinx fork. However I have good hope that current mainline U-Boot is enough to boot properly, at least it's worth giving it a try and, should it fail, explain what's the problem that forces to stay on a fork. About ATF I would just stay on mainline. I would be surprised if an old mainline version worked and not a recent one. > Ouch, now the build I had started ended with a new error: > >>>> arm-trusted-firmware xlnx_rebase_v2.4_2021.2 Building > ... > AR .../build/zynqmp/release/lib/libc.a > LD .../build/zynqmp/release/bl31/bl31.elf > .../aarch64-buildroot-linux-uclibc-ld: > .../build/zynqmp/release/bl31/bl31.elf section `coherent_ram' will not fit in region `RAM' > .../aarch64-buildroot-linux-uclibc-ld: BL31 image has exceeded its limit. > .../aarch64-buildroot-linux-uclibc-ld: region `RAM' overflowed by 1 byte > > I have run my build on Ubuntu 18.04 with your patch applied on current master. > > I assume you have built and run it successfully. Any idea on why it fails on a different host? > > [Neal] I have seen the ATF build error as well. There seems to be an issue with the default buildroot aarch64-buildroot-linux-uclibc compiler when building the ATF. I fixed the issue on my side by going into the output/build/arm-trusted-firmware-xlnx_rebase_v2.4_2021.2 and running the build with the aarch-none-elf compiler using the build command below. Basically, changing nothing but the compiler. Do you have any thoughts about how to fix this? > > make CROSS_COMPILE=aarch64-none-elf- PLAT=zynqmp RESET_TO_BL31=1 I'm afraid a defconfig that requires manual steps to build is a no-go, so we really need a solution. I don't know a proper solution, but first why don't you try mainline ATF? Should it build (and run) it'd be a double win! :) Otherwise you could try another toolchain, such as one prebuilt on https://toolchains.bootlin.com/ . -- Luca From yegorslists at googlemail.com Thu Feb 3 09:08:48 2022 From: yegorslists at googlemail.com (yegorslists at googlemail.com) Date: Thu, 3 Feb 2022 10:08:48 +0100 Subject: [Buildroot] [PATCH] package/python-docutils: bump to version 0.18.1 Message-ID: <20220203090848.22869-1-yegorslists@googlemail.com> From: Yegor Yefremov Remove the obsolete patch as docutils is now a setuptools package. The package also includes code licensed under BSD-3-Clause licence. COPYING.txt has the following changes: * copyright year * more exceptions from the Public Domain added * BSD-3-Clause license added Fixes: http://autobuild.buildroot.net/results/02dd94c09dabdbdd8b47673393577a7fd3af3aeb Signed-off-by: Yegor Yefremov --- .../0001-Update-setup.py.patch | 64 ------------------- package/python-docutils/python-docutils.hash | 6 +- package/python-docutils/python-docutils.mk | 8 +-- 3 files changed, 7 insertions(+), 71 deletions(-) delete mode 100644 package/python-docutils/0001-Update-setup.py.patch diff --git a/package/python-docutils/0001-Update-setup.py.patch b/package/python-docutils/0001-Update-setup.py.patch deleted file mode 100644 index 3fb34a9763..0000000000 --- a/package/python-docutils/0001-Update-setup.py.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 583e59ccf72a02c2a6f0399f29f622c7f2f4a932 Mon Sep 17 00:00:00 2001 -From: milde -Date: Sun, 1 Sep 2019 19:39:36 +0000 -Subject: [PATCH] Update setup.py - -Python 3.4 no longer supported, -more languages supported (and Lithuanian accepted by PyPi). - -git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk at 8383 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 - -[Asaf: adjust upstream patch to 0.15.2] -Signed-off-by: Asaf Kahlon ---- - setup.py | 14 +++++++++++++- - 1 file changed, 13 insertions(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index f801ea2..5c1ebfd 100755 ---- a/setup.py -+++ b/setup.py -@@ -7,6 +7,10 @@ import os - import glob - try: - import setuptools -+except ImportError: -+ print('Warning: Could not load package `setuptools`.') -+ print('Actions requiring `setuptools` instead of `distutils` will fail') -+try: - from distutils.core import setup, Command - from distutils.command.build import build - from distutils.command.build_py import build_py -@@ -123,7 +127,7 @@ what-you-see-is-what-you-get plaintext markup syntax.""", # wrap at col 60 - 'maintainer_email': 'docutils-develop at lists.sourceforge.net', - 'license': 'public domain, Python, 2-Clause BSD, GPL 3 (see COPYING.txt)', - 'platforms': 'OS-independent', -- 'python_requires': '>=2.6, !=3.0.*, !=3.1.*, !=3.2.*', -+ 'python_requires': '>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*', - 'package_dir': {'docutils': 'docutils', - 'docutils.tools': 'tools'}, - 'packages': ['docutils', -@@ -213,14 +219,20 @@ classifiers = [ - 'Natural Language :: Chinese (Simplified)', - 'Natural Language :: Chinese (Traditional)', - 'Natural Language :: Czech', -+ 'Natural Language :: Danish', - 'Natural Language :: Dutch', - 'Natural Language :: Esperanto', - 'Natural Language :: Finnish', - 'Natural Language :: French', - 'Natural Language :: Galician', - 'Natural Language :: German', -+ 'Natural Language :: Hebrew', - 'Natural Language :: Italian', - 'Natural Language :: Japanese', -+ 'Natural Language :: Korean', -+ 'Natural Language :: Latvian', -+ 'Natural Language :: Lithuanian', -+ 'Natural Language :: Persian', - 'Natural Language :: Polish', - 'Natural Language :: Portuguese (Brazilian)', - 'Natural Language :: Russian', --- -2.20.1 -k diff --git a/package/python-docutils/python-docutils.hash b/package/python-docutils/python-docutils.hash index ccccca1064..9f6bb53bdb 100644 --- a/package/python-docutils/python-docutils.hash +++ b/package/python-docutils/python-docutils.hash @@ -1,4 +1,4 @@ # md5 from https://pypi.python.org/pypi/docutils/json, sha256 locally computed -md5 e26a308d8000b0bed7416a633217c676 docutils-0.15.2.tar.gz -sha256 a2aeea129088da402665e92e0b25b04b073c04b2dce4ab65caaa38b7ce2e1a99 docutils-0.15.2.tar.gz -sha256 efa0c85aa99ea5b4781240031b0d02af54d7b5554c87ad2b2bea9ba490f6663f COPYING.txt +md5 ca5827e2432fd58f4c8d74a6591135de docutils-0.18.1.tar.gz +sha256 679987caf361a7539d76e584cbeddc311e3aee937877c87346f31debc63e9d06 docutils-0.18.1.tar.gz +sha256 f20172170ef9aeebbf53adf5d8f7d309f7dc6068e9a3a1b52ea772305686739d COPYING.txt diff --git a/package/python-docutils/python-docutils.mk b/package/python-docutils/python-docutils.mk index 9a42d3e5dc..3872b54906 100644 --- a/package/python-docutils/python-docutils.mk +++ b/package/python-docutils/python-docutils.mk @@ -4,12 +4,12 @@ # ################################################################################ -PYTHON_DOCUTILS_VERSION = 0.15.2 +PYTHON_DOCUTILS_VERSION = 0.18.1 PYTHON_DOCUTILS_SOURCE = docutils-$(PYTHON_DOCUTILS_VERSION).tar.gz -PYTHON_DOCUTILS_SITE = https://files.pythonhosted.org/packages/93/22/953e071b589b0b1fee420ab06a0d15e5aa0c7470eb9966d60393ce58ad61 -PYTHON_DOCUTILS_LICENSE = Public Domain, BSD-2-Clause, GPL-3.0 (emacs mode), other +PYTHON_DOCUTILS_SITE = https://files.pythonhosted.org/packages/57/b1/b880503681ea1b64df05106fc7e3c4e3801736cf63deffc6fa7fc5404cf5 +PYTHON_DOCUTILS_LICENSE = Public Domain, BSD-2-Clause, BSD-3-Clause, GPL-3.0 (emacs mode), other PYTHON_DOCUTILS_LICENSE_FILES = COPYING.txt -PYTHON_DOCUTILS_SETUP_TYPE = distutils +PYTHON_DOCUTILS_SETUP_TYPE = setuptools $(eval $(python-package)) $(eval $(host-python-package)) -- 2.17.0 From br015 at umbiko.net Thu Feb 3 09:47:46 2022 From: br015 at umbiko.net (Andreas Ziegler) Date: Thu, 3 Feb 2022 10:47:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/mpd: ignore CVE-2020-746[56] intended for FreeBSD PPP daemon Message-ID: <20220203094746.22715-1-br015@umbiko.net> cpe:2.3:a:mpd_project:mpd:*:*:*:*:*:*:*:* is not a valid CPE identifier for mpd (musicpd.org); this string refers to MPD /FreeBSD PPP daemon (sourceforge.net/projects/mpd) Since mpd does not have entries in the CVE database, put these two CVE identifiers on the mpd ignore list: https://nvd.nist.gov/vuln/detail/CVE-2020-7465 https://nvd.nist.gov/vuln/detail/CVE-2020-7466 Signed-off-by: Andreas Ziegler --- package/mpd/mpd.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index 6f01b29c6d..a55e4adde2 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -11,6 +11,8 @@ 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 +# these refer to the FreeBSD PPP daemon +MPD_IGNORE_CVES = CVE-2020-7465 CVE-2020-7466 MPD_SELINUX_MODULES = mpd MPD_CONF_OPTS = \ -Daudiofile=disabled \ -- 2.33.1 From nealf at xilinx.com Thu Feb 3 10:07:50 2022 From: nealf at xilinx.com (Neal Frager) Date: Thu, 3 Feb 2022 10:07:50 +0000 Subject: [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2 In-Reply-To: <57bd27fd-09c8-9441-8429-bb4983287c6c@lucaceresoli.net> References: <20220202165555.3497977-1-nealf@xilinx.com> <57bd27fd-09c8-9441-8429-bb4983287c6c@lucaceresoli.net> Message-ID: Hi Luca, Thank you for your feedback. As for the ATF, yes, the mainline version should work, and since it does not have the same build issue with the buildroot compiler, I will move the patch back to the mainline ATF version. Unfortunately, U-Boot is another story. The mainline U-Boot will boot just fine with an SD card. However, I know that the Xilinx U-Boot QSPI driver is not yet in mainline. Since QSPI is a very popular boot flash medium, I cannot in good conscience recommend using the mainline U-Boot until QSPI is well supported for Xilinx devices. Xilinx is working hard to get all of our U-Boot and Linux kernel drivers in mainline, but we are not yet there. I would be happy to update the zcu_10x_defconfigs to using the mainline U-Boot and Linux kernels when the level of necessary support is better. Best regards, Neal Frager Embedded Processor Specialist Xilinx neal.frager at xilinx.com -----Original Message----- From: Luca Ceresoli Sent: Thursday 3 February 2022 09:15 To: Neal Frager ; buildroot at buildroot.org Subject: Re: [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2 CAUTION: This message has originated from an External Source. Please use proper judgment and caution when opening attachments, clicking links, or responding to this email. Hi Neal, On 03/02/22 07:20, Neal Frager wrote: > Hi Luca, > > Thank you for your positive feedback. Below you can find my thoughts. > > Neal Frager > Embedded Processor Specialist > Xilinx > > neal.frager at xilinx.com > Mobile: +33.6.48.11.37.36 > www.linkedin.com/in/neal-frager-0397463 > > -----Original Message----- > From: Luca Ceresoli > Sent: Wednesday 2 February 2022 23:29 > To: Neal Frager ; buildroot at buildroot.org > Cc: Neal Frager > Subject: Re: [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux > to Xilinx 2021.2 > > CAUTION: This message has originated from an External Source. Please use proper judgment and caution when opening attachments, clicking links, or responding to this email. > > > Hi Neal, > > thank you for your effort and for sending a patch in the format that is the most convenient for other people to review your code. > > Your work seems generally in a good shape. I have several remarks, see below, but nothing really problematic. > > On 02/02/22 17:55, Neal Frager wrote: >> Signed-off-by: Neal Frager > > Maybe you can add more details before the Signed-off-by line, suah as "Also add a defconfig for ZCU102", "remove U-Boot and ATF patches not upstream"... > > [Neal] Could you share the proper git commands for adding comments to a patch? I would be happy to add more comments, but I am a bit new to git, and I do not know what commands I need to use. The command 'git commit' opens an editor where you can write a commit message with all the details you wish. And if you have already done your commit and want to modify the comment, use 'git commit --amend'. A suggested reading is ProGit, the official git book: https://git-scm.com/book/en/v2/Git-Basics-Recording-Changes-to-the-Repository A few suggestions on how to write a good commit message: https://cbea.ms/git-commit/ > First issue: this defconfig does not build on my PC: > > $ git clean -xdf && make zynqmp_zcu106_defconfig && verynice make > package/pkg-generic.mk:266: *** BR2_GLOBAL_PATCH_DIR contains nonexistent directory board/zynqmp/patches/. Stop. > $ > > As you removed all patches (which is sooo gooood!) you now have to remove the BR2_GLOBAL_PATCH_DIR. > > [Neal] I have not seen this error on my side, but to fix it, I will just remove the BR2_GLOBAL_PATCH_DIR from the defconfigs. > >> --- >> board/zynqmp/genimage.cfg | 1 + >> ...-fix-Remove-GGC-ignore-Warray-bounds.patch | 68 ------- >> ...64-zynqmp-zcu106-fix-SPL-MMC-booting.patch | 52 ------ >> ...2-arm64-zynqmp-Enable-booting-to-ATF.patch | 114 ------------ >> ...ept-an-absolute-path-for-PMUFW_INIT_.patch | 68 ------- >> ...ynqmp-pass-the-PS-init-file-as-a-kco.patch | 175 ------------------ >> configs/zynqmp_zcu102_defconfig | 35 ++++ >> configs/zynqmp_zcu106_defconfig | 15 +- >> 8 files changed, 44 insertions(+), 484 deletions(-) delete mode >> 100644 >> board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GG >> C -ignore-Warray-bounds.patch delete mode 100644 >> board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booti >> n >> g.patch delete mode 100644 >> board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.pa >> t >> ch delete mode 100644 >> board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path- >> f or-PMUFW_INIT_.patch delete mode 100644 >> board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-ini >> t -file-as-a-kco.patch create mode 100644 >> configs/zynqmp_zcu102_defconfig >> >> diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg >> index ed202f4550..557364e124 100644 >> --- a/board/zynqmp/genimage.cfg >> +++ b/board/zynqmp/genimage.cfg >> @@ -3,6 +3,7 @@ image boot.vfat { >> files = { >> "boot.bin", >> "u-boot.bin", >> + "u-boot.itb", > > Is u-boot.bin still needed, when we have the .itb? > > [Neal] u-boot.bin is no longer needed. I can remove it. > >> diff --git a/configs/zynqmp_zcu106_defconfig >> b/configs/zynqmp_zcu106_defconfig index bee7c1daf7..3a6947e1e8 100644 >> --- a/configs/zynqmp_zcu106_defconfig >> +++ b/configs/zynqmp_zcu106_defconfig >> @@ -1,11 +1,11 @@ >> BR2_aarch64=y >> BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" >> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y >> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y >> BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" >> BR2_LINUX_KERNEL=y >> BR2_LINUX_KERNEL_CUSTOM_GIT=y >> BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" >> -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" >> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2" >> BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" >> BR2_LINUX_KERNEL_DTS_SUPPORT=y >> BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" >> @@ -14,21 +14,22 @@ BR2_TARGET_ROOTFS_EXT2_4=y # >> BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y >> BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y >> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" >> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5" >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.4_2021.2" > > As far as I remember (but I ask the core developers to confirm or deny), from the Buildroot perspective upstream versions are generally preferred even when they lack some non-fundamental features (e.g.: some drivers are missing) that are in vendor forks. > > Is there a reason for switching ATF to the Xilinx fork? In this case explain it in the commit message, otherwise stay on the upstream repo, upgrading to the latest [working] release. > > A similar question applies to kernel and U-Boot: is it possible to switch to upstream releases? > > [Neal] I was trying to match the Xilinx tested software release 2021.2 with these patches. The mainline Linux kernel is still missing quite a bit of the Xilinx drivers, so if a developer uses all mainline locations, there will be things that do not work properly. The ATF should probably be ok, as it is almost identical to the Xilinx fork, but since I was already using the Xilinx fork for the Linux kernel and U-Boot, I thought it would be better to use the Xilinx tested fork for everything to remain consistent. I can understand that mainline Linux has significantly fewer drivers than the Xilinx fork. However I have good hope that current mainline U-Boot is enough to boot properly, at least it's worth giving it a try and, should it fail, explain what's the problem that forces to stay on a fork. About ATF I would just stay on mainline. I would be surprised if an old mainline version worked and not a recent one. > Ouch, now the build I had started ended with a new error: > >>>> arm-trusted-firmware xlnx_rebase_v2.4_2021.2 Building > ... > AR .../build/zynqmp/release/lib/libc.a > LD .../build/zynqmp/release/bl31/bl31.elf > .../aarch64-buildroot-linux-uclibc-ld: > .../build/zynqmp/release/bl31/bl31.elf section `coherent_ram' will not fit in region `RAM' > .../aarch64-buildroot-linux-uclibc-ld: BL31 image has exceeded its limit. > .../aarch64-buildroot-linux-uclibc-ld: region `RAM' overflowed by 1 > byte > > I have run my build on Ubuntu 18.04 with your patch applied on current master. > > I assume you have built and run it successfully. Any idea on why it fails on a different host? > > [Neal] I have seen the ATF build error as well. There seems to be an issue with the default buildroot aarch64-buildroot-linux-uclibc compiler when building the ATF. I fixed the issue on my side by going into the output/build/arm-trusted-firmware-xlnx_rebase_v2.4_2021.2 and running the build with the aarch-none-elf compiler using the build command below. Basically, changing nothing but the compiler. Do you have any thoughts about how to fix this? > > make CROSS_COMPILE=aarch64-none-elf- PLAT=zynqmp RESET_TO_BL31=1 I'm afraid a defconfig that requires manual steps to build is a no-go, so we really need a solution. I don't know a proper solution, but first why don't you try mainline ATF? Should it build (and run) it'd be a double win! :) Otherwise you could try another toolchain, such as one prebuilt on https://toolchains.bootlin.com/ . -- Luca From luca at lucaceresoli.net Thu Feb 3 11:04:26 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Thu, 3 Feb 2022 12:04:26 +0100 Subject: [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2 In-Reply-To: References: <20220202165555.3497977-1-nealf@xilinx.com> <57bd27fd-09c8-9441-8429-bb4983287c6c@lucaceresoli.net> Message-ID: <5b3dfa87-e879-e4d4-2797-7801bcf24435@lucaceresoli.net> Hi Neal, On 03/02/22 11:07, Neal Frager wrote: > Hi Luca, > > Thank you for your feedback. > > As for the ATF, yes, the mainline version should work, and since it does not have the same build issue with the buildroot compiler, I will move the patch back to the mainline ATF version. > > Unfortunately, U-Boot is another story. The mainline U-Boot will boot just fine with an SD card. However, I know that the Xilinx U-Boot QSPI driver is not yet in mainline. Since QSPI is a very popular boot flash medium, I cannot in good conscience recommend using the mainline U-Boot until QSPI is well supported for Xilinx devices. OK, so you have a good reason to stay on the Xilinx fork. Just mention this in your commit message. Hint: the above paragraph is a good draft to start from. > Xilinx is working hard to get all of our U-Boot and Linux kernel drivers in mainline, but we are not yet there. I would be happy to update the zcu_10x_defconfigs to using the mainline U-Boot and Linux kernels when the level of necessary support is better. Sounds like a good plan! -- Luca From peter at korsgaard.com Thu Feb 3 11:05:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 03 Feb 2022 12:05:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/libblockdev: fix build with libglib2 >= 2.69 In-Reply-To: <20220201230845.888962-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 2 Feb 2022 00:08:45 +0100") References: <20220201230845.888962-1-fontaine.fabrice@gmail.com> Message-ID: <87sft0xlax.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure raised since bump of libglib2 to version > 2.70 in commit 079923d5fabf4f887bb140808cb16067ca08b19b: > 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)) { > | ^~ > Fixes: > - http://autobuild.buildroot.org/results/8f9ca895cb07014804130a7ccbcb758b1d519470 > Signed-off-by: Fabrice Fontaine Committed, thanks. Any specific reason to not just bump to the 2.26 version? -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 3 11:04:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 3 Feb 2022 12:04:31 +0100 Subject: [Buildroot] [git commit] package/libblockdev: fix build with libglib2 >= 2.69 Message-ID: <20220203105812.ECE258275E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=72b4229cfce065d877168bf368081378d6c80a6e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since bump of libglib2 to version 2.70 in commit 079923d5fabf4f887bb140808cb16067ca08b19b: 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)) { | ^~ Fixes: - http://autobuild.buildroot.org/results/8f9ca895cb07014804130a7ccbcb758b1d519470 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...02-exec-Fix-deprecated-glib-function-call.patch | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/package/libblockdev/0002-exec-Fix-deprecated-glib-function-call.patch b/package/libblockdev/0002-exec-Fix-deprecated-glib-function-call.patch new file mode 100644 index 0000000000..2c370a133f --- /dev/null +++ b/package/libblockdev/0002-exec-Fix-deprecated-glib-function-call.patch @@ -0,0 +1,32 @@ +From aad927a81fd9067865dc391c5bbff12ac51a0002 Mon Sep 17 00:00:00 2001 +From: Manuel Wassermann +Date: Thu, 1 Jul 2021 04:45:49 +0200 +Subject: [PATCH] exec: Fix deprecated glib function call Glib will rename + "g_spawn_check_exit_status()" to "g_spawn_check_wait_status()" in version + 2.69. + +[Retrieved from: +https://github.com/storaged-project/libblockdev/commit/aad927a81fd9067865dc391c5bbff12ac51a0002] +Signed-off-by: Fabrice Fontaine +--- + src/utils/exec.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/src/utils/exec.c b/src/utils/exec.c +index 317fb5525..8faeb289c 100644 +--- a/src/utils/exec.c ++++ b/src/utils/exec.c +@@ -236,7 +236,12 @@ gboolean bd_utils_exec_and_report_status_error (const gchar **argv, const BDExtr + /* g_spawn_sync set the status in the same way waitpid() does, we need + to get the process exit code manually (this is similar to calling + WEXITSTATUS but also sets the error for terminated processes */ +- if (!g_spawn_check_exit_status (exit_status, error)) { ++ ++ #if !GLIB_CHECK_VERSION(2, 69, 0) ++ #define g_spawn_check_wait_status(x,y) (g_spawn_check_exit_status (x,y)) ++ #endif ++ ++ if (!g_spawn_check_wait_status (exit_status, error)) { + if (g_error_matches (*error, G_SPAWN_ERROR, G_SPAWN_ERROR_FAILED)) { + /* process was terminated abnormally (e.g. using a signal) */ + g_free (stdout_data); From giulio.benetti at benettiengineering.com Thu Feb 3 12:01:32 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 3 Feb 2022 13:01:32 +0100 Subject: [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2 In-Reply-To: References: <20220202165555.3497977-1-nealf@xilinx.com> <59b73223-73b3-1b9e-b8ec-0cedb0c605ef@benettiengineering.com> Message-ID: Hi Neal, On 03/02/22 07:24, Neal Frager wrote: > Hi Giulio, > > Thank you very much for your feedback. You're welcome. Please don't top-post, answer inline as you see all around the Mailing List. Also, I don't know if you've read my entire answer. Usually until you don't see "Best regards" and the name of the one who answer, the answer-mail is not finished yet, so simply scroll down until you finish the e-mail. So please check also the rest of my previous e-mail. > I would be happy to split the zynqmp_zcu102_defconfig off into a second patch. No problem. Fine > As for adding comments to the log, could you share the proper git commands for doing this? I would be happy to do it, but I am a bit new to git and I did not know the proper command to use for adding log comments. Luca already pointed you a lot of very useful links. Another tool I like to create patches for me is "git gui" and also "gitk" to scroll the commits in a non-console way. Most of all "git gui" is helpful to me to choose a single line to stage or revert. Best regards --- Giulio Benetti Benetti Engineering sas > Best regards, > > Neal Frager > Xilinx > > -----Original Message----- > From: Giulio Benetti > Sent: Wednesday 2 February 2022 23:33 > To: Neal Frager ; buildroot at buildroot.org > Cc: luca at lucaceresoli.net; Neal Frager > Subject: Re: [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2 > > CAUTION: This message has originated from an External Source. Please use proper judgment and caution when opening attachments, clicking links, or responding to this email. > > > Hi Neal, > > nice to see you've made it with git send-email :-), > > Here I would improve commit log by stating that you're dropping all local patches because they are now upstreamed > > On 02/02/22 17:55, Neal Frager wrote: >> Signed-off-by: Neal Frager >> --- >> board/zynqmp/genimage.cfg | 1 + >> ...-fix-Remove-GGC-ignore-Warray-bounds.patch | 68 ------- >> ...64-zynqmp-zcu106-fix-SPL-MMC-booting.patch | 52 ------ >> ...2-arm64-zynqmp-Enable-booting-to-ATF.patch | 114 ------------ >> ...ept-an-absolute-path-for-PMUFW_INIT_.patch | 68 ------- >> ...ynqmp-pass-the-PS-init-file-as-a-kco.patch | 175 ------------------ >> configs/zynqmp_zcu102_defconfig | 35 ++++ > > This ^^^ file is added, so it deserves a second patch after this one, basically this becomes a patchset of 2 patches > >> configs/zynqmp_zcu106_defconfig | 15 +- >> 8 files changed, 44 insertions(+), 484 deletions(-) >> delete mode 100644 board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch >> delete mode 100644 board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch >> delete mode 100644 board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch >> delete mode 100644 board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch >> delete mode 100644 board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch >> create mode 100644 configs/zynqmp_zcu102_defconfig >> >> diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg >> index ed202f4550..557364e124 100644 >> --- a/board/zynqmp/genimage.cfg >> +++ b/board/zynqmp/genimage.cfg >> @@ -3,6 +3,7 @@ image boot.vfat { >> files = { >> "boot.bin", >> "u-boot.bin", >> + "u-boot.itb", > > Can you please justify this adding ^^^ in commit log? > >> "atf-uboot.ub", >> "system.dtb", >> "Image" >> diff --git >> a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-G >> GC-ignore-Warray-bounds.patch >> b/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-G >> GC-ignore-Warray-bounds.patch >> deleted file mode 100644 >> index 0c1a9ba2a4..0000000000 >> --- >> a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-G >> GC-ignore-Warray-bounds.patch >> +++ /dev/null >> @@ -1,68 +0,0 @@ >> -From da003e6ada7d0217fe99dc7c649a731f8ebd3c34 Mon Sep 17 00:00:00 >> 2001 >> -From: Deepika Bhavnani >> -Date: Thu, 15 Aug 2019 00:56:46 +0300 >> -Subject: [PATCH] Coverity fix: Remove GGC ignore -Warray-bounds >> - >> -GCC diagnostics were added to ignore array boundaries, instead -of >> ignoring GCC warning current code will check for array boundaries -and >> perform and array update only for valid elements. >> - >> -Resolves: `CID 246574` `CID 246710` `CID 246651` >> - >> -Signed-off-by: Deepika Bhavnani >> -Change-Id: I7530ecf7a1707351c6ee87e90cc3d33574088f57 >> - >> -Backported from: 41af05154abe136938bcfb5f26c969933784bbef >> -[Adapted to apply on 1.5] >> - >> ---- >> - lib/psci/psci_common.c | 20 ++++++++++---------- >> - 1 file changed, 10 insertions(+), 10 deletions(-) >> - >> -diff --git a/lib/psci/psci_common.c b/lib/psci/psci_common.c -index >> 2220a745cd6e..6282d992a2f0 100644 >> ---- a/lib/psci/psci_common.c >> -+++ b/lib/psci/psci_common.c >> -@@ -188,21 +188,17 @@ static unsigned int >> get_power_on_target_pwrlvl(void) >> - >> /********************************************************************* >> ********* >> - * Helper function to update the requested local power state array. >> This array >> - * does not store the requested state for the CPU power level. Hence >> an >> -- * assertion is added to prevent us from accessing the wrong index. >> -+ * assertion is added to prevent us from accessing the CPU power level. >> - >> ********************************************************************** >> *******/ >> - static void psci_set_req_local_pwr_state(unsigned int pwrlvl, >> - unsigned int cpu_idx, >> - plat_local_state_t req_pwr_state) >> - { >> -- /* >> -- * This should never happen, we have this here to avoid >> -- * "array subscript is above array bounds" errors in GCC. >> -- */ >> - assert(pwrlvl > PSCI_CPU_PWR_LVL); >> --#pragma GCC diagnostic push >> --#pragma GCC diagnostic ignored "-Warray-bounds" >> -- psci_req_local_pwr_states[pwrlvl - 1][cpu_idx] = req_pwr_state; >> --#pragma GCC diagnostic pop >> -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && >> -+ (cpu_idx < PLATFORM_CORE_COUNT)) { >> -+ psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx] = req_pwr_state; >> -+ } >> - } >> - >> - >> /********************************************************************* >> ********* -@@ -228,7 +224,11 @@ static plat_local_state_t >> *psci_get_req_local_pwr_states(unsigned int pwrlvl, >> - { >> - assert(pwrlvl > PSCI_CPU_PWR_LVL); >> - >> -- return &psci_req_local_pwr_states[pwrlvl - 1][cpu_idx]; >> -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && >> -+ (cpu_idx < PLATFORM_CORE_COUNT)) { >> -+ return &psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx]; >> -+ } else >> -+ return NULL; >> - } >> - >> - /* >> --- >> -2.34.0 >> - >> diff --git >> a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-boot >> ing.patch >> b/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-boot >> ing.patch >> deleted file mode 100644 >> index 4d85e1bb12..0000000000 >> --- >> a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-boot >> ing.patch >> +++ /dev/null >> @@ -1,52 +0,0 @@ >> -From e5d72ed8339eb05285448aad3c89d21e4d18fd29 Mon Sep 17 00:00:00 >> 2001 >> -From: Luca Ceresoli >> -Date: Mon, 26 Feb 2018 09:40:34 +0100 >> -Subject: [PATCH] arm64: zynqmp: zcu106: fix SPL MMC booting >> - >> -The U-Boot SPL generated with the current zcu106 defconfig cannot >> boot -from MMC: >> - >> - [...] >> - U-Boot SPL 2018.01 (Feb 21 2018 - 17:47:14) >> - EL Level: EL3 >> - Trying to boot from MMC1 >> - sdhci_transfer_data: Error detected in status(0x408020)! >> - spl_load_image_fat_os: error reading image u-boot.bin, err - -2 >> - spl_load_image_fat: error reading image u-boot.img, err - -6 >> - SPL: failed to boot from all boot devices >> - ### ERROR ### Please RESET the board ### >> - >> -Fix by lowering the rpll value. The new value for the RPLL_CTRL >> -register comes from the current psu_init_gpl.c from the HDF file at >> -https://github.com/xilinx/hdf-examples/tree/01ad8ea5fd1989abf4ea5a072 >> d019a16cb2bc546/zcu106-zynqmp >> -(generated by Vivado v2017.4). >> - >> -RPLL and sdio1_ref clocks before and after this change: >> - >> - - Old values: RPLL 1.36 GHz, sdio1_ref 272 MHz >> - - New values: RPLL 1.16 GHz, sdio1_ref 233 MHz >> - >> -Signed-off-by: Luca Ceresoli >> -Cc: Michal Simek >> -Upstream-status: accepted upstream in a different form >> ---- >> - >> - board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c | 2 +- >> - 1 file changed, 1 insertion(+), 1 deletion(-) >> - >> -diff --git a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c >> b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c >> -index 4d18abe000ca..e6fa477e53e7 100644 >> ---- a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c >> -+++ b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c >> -@@ -10,7 +10,7 @@ >> - static unsigned long psu_pll_init_data(void) >> - { >> - psu_mask_write(0xFF5E0034, 0xFE7FEDEFU, 0x7E4E2C62U); >> -- psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00013C00U); >> -+ psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00014600U); >> - psu_mask_write(0xFF5E0030, 0x00000008U, 0x00000008U); >> - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000001U); >> - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000000U); >> --- >> -2.7.4 >> - >> diff --git >> a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.p >> atch >> b/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.p >> atch >> deleted file mode 100644 >> index 487fff6812..0000000000 >> --- >> a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.p >> atch >> +++ /dev/null >> @@ -1,114 +0,0 @@ >> -From 5e3cac50cc981e01d9072241035a8d4162560c71 Mon Sep 17 00:00:00 >> 2001 >> -From: Luca Ceresoli >> -Date: Mon, 12 Mar 2018 17:18:38 +0100 >> -Subject: [PATCH] arm64: zynqmp: Enable booting to ATF >> - >> -U-Boot is now able to boot to ARM Trusted Firmware (ATF). The boot >> -flow is SPL(EL3) loads ATF and full u-boot and jump to ATF(EL3) which >> -pass control to full u-boot(EL2). This has been tested on zcu106, so >> -enable it in this defconfig. >> - >> -To generate an image that triggers this booting flow, you need to >> pass -'-O arm-trusted-firmware' to mkimage. >> - >> -Signed-off-by: Luca Ceresoli >> -Signed-off-by: Michal Simek -Backported >> from upstream: >> http://git.denx.de/?p=u-boot.git;a=commit;h=5e3cac50cc981e01d907224103 >> 5a8d4162560c71 >> ---- >> - >> - configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 + >> - configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 + >> - configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 + >> - configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 + >> - configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 1 + >> - configs/xilinx_zynqmp_zcu102_revA_defconfig | 1 + >> - configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 + >> - 7 files changed, 7 insertions(+) >> - >> -diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig >> b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig >> -index c5bfa2b12638..488c72258b0e 100644 >> ---- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig >> -+++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig >> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >> - CONFIG_SPL_OS_BOOT=y >> - CONFIG_SPL_RAM_SUPPORT=y >> - CONFIG_SPL_RAM_DEVICE=y >> -+CONFIG_SPL_ATF=y >> - CONFIG_SYS_PROMPT="ZynqMP> " >> - CONFIG_FASTBOOT=y >> - CONFIG_FASTBOOT_FLASH=y >> -diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig >> b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig >> -index f86dce403a42..5d501eec0edd 100644 >> ---- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig >> -+++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig >> -@@ -20,6 +20,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >> - CONFIG_SPL_OS_BOOT=y >> - CONFIG_SPL_RAM_SUPPORT=y >> - CONFIG_SPL_RAM_DEVICE=y >> -+CONFIG_SPL_ATF=y >> - CONFIG_SYS_PROMPT="ZynqMP> " >> - CONFIG_FASTBOOT=y >> - CONFIG_FASTBOOT_FLASH=y >> -diff --git a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig >> b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig >> -index 6e947cf56827..6f7eaebd7676 100644 >> ---- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig >> -+++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig >> -@@ -16,6 +16,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >> - CONFIG_SPL_OS_BOOT=y >> - CONFIG_SPL_RAM_SUPPORT=y >> - CONFIG_SPL_RAM_DEVICE=y >> -+CONFIG_SPL_ATF=y >> - CONFIG_SYS_PROMPT="ZynqMP> " >> - CONFIG_CMD_MEMTEST=y >> - CONFIG_SYS_ALT_MEMTEST=y >> -diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig >> b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig >> -index 1c934858c61c..7a3806cba4b5 100644 >> ---- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig >> -+++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig >> -@@ -17,6 +17,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >> - CONFIG_SPL_OS_BOOT=y >> - CONFIG_SPL_RAM_SUPPORT=y >> - CONFIG_SPL_RAM_DEVICE=y >> -+CONFIG_SPL_ATF=y >> - CONFIG_SYS_PROMPT="ZynqMP> " >> - CONFIG_CMD_MEMTEST=y >> - CONFIG_SYS_ALT_MEMTEST=y >> -diff --git a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig >> b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig >> -index e13c7c56f310..e4408f182ca0 100644 >> ---- a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig >> -+++ b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig >> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >> - CONFIG_SPL_OS_BOOT=y >> - CONFIG_SPL_RAM_SUPPORT=y >> - CONFIG_SPL_RAM_DEVICE=y >> -+CONFIG_SPL_ATF=y >> - CONFIG_SYS_PROMPT="ZynqMP> " >> - CONFIG_FASTBOOT=y >> - CONFIG_FASTBOOT_FLASH=y >> -diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig >> b/configs/xilinx_zynqmp_zcu102_revA_defconfig >> -index 5b2cd495ee85..b52f6789fd4b 100644 >> ---- a/configs/xilinx_zynqmp_zcu102_revA_defconfig >> -+++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig >> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >> - CONFIG_SPL_OS_BOOT=y >> - CONFIG_SPL_RAM_SUPPORT=y >> - CONFIG_SPL_RAM_DEVICE=y >> -+CONFIG_SPL_ATF=y >> - CONFIG_SYS_PROMPT="ZynqMP> " >> - CONFIG_FASTBOOT=y >> - CONFIG_FASTBOOT_FLASH=y >> -diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig >> b/configs/xilinx_zynqmp_zcu102_revB_defconfig >> -index e6530fbfe7ff..80592554f682 100644 >> ---- a/configs/xilinx_zynqmp_zcu102_revB_defconfig >> -+++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig >> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >> - CONFIG_SPL_OS_BOOT=y >> - CONFIG_SPL_RAM_SUPPORT=y >> - CONFIG_SPL_RAM_DEVICE=y >> -+CONFIG_SPL_ATF=y >> - CONFIG_SYS_PROMPT="ZynqMP> " >> - CONFIG_FASTBOOT=y >> - CONFIG_FASTBOOT_FLASH=y >> --- >> -2.7.4 >> - >> diff --git >> a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path >> -for-PMUFW_INIT_.patch >> b/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path >> -for-PMUFW_INIT_.patch >> deleted file mode 100644 >> index 95ab7b3b75..0000000000 >> --- >> a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path >> -for-PMUFW_INIT_.patch >> +++ /dev/null >> @@ -1,68 +0,0 @@ >> -From c7df098a71e05dc81cee818747759e8060b59626 Mon Sep 17 00:00:00 >> 2001 >> -From: Luca Ceresoli >> -Date: Mon, 4 Jun 2018 12:21:01 +0200 >> -Subject: [PATCH] arm64: zynqmp: accept an absolute path for >> PMUFW_INIT_FILE >> - >> -The value of PMUFW_INIT_FILE is prefixed with "$(srctree)/", thus >> -forcing it to be a relative path inside the U-Boot source tree. Since >> -the PMUFW is a binary file generated outside of U-Boot, the PMUFW >> -binary must be copied inside the U-Boot source tree before the >> -build. >> - >> -This generates a few problems: >> - >> - * if the source tree is shared among different out-of-tree builds, >> - they will pollute (and potentially corrupt) each other >> - * the source tree cannot be read-only >> - * any buildsystem must add a command to copy the PMUFW binary >> - * putting an externally-generated binary in the source tree is ugly >> - as hell >> - >> -Avoid these problems by accepting an absolute path for >> -PMUFW_INIT_FILE. This would be as simple as removing the "$(srctree)/" >> -prefix, but in order to keep backward compatibility we rather use the >> -shell and readlink to get the absolute path even when starting from a >> -relative path. >> - >> -Since 'readlink -f' produces an empty string if the file does not >> -exist, we also add a check to ensure the file configured in >> -PMUFW_INIT_FILE exists. Otherwise the build would exit successfully, >> -but produce a boot.bin without PMUFW as if PMUFW_INIT_FILE were empty. >> - >> -Tested in the 12 possible combinations of: >> - - PMUFW_INIT_FILE empty, relative, absolute, non-existing >> - - building in-tree, in subdir, in other directory >> - >> -Signed-off-by: Luca Ceresoli >> -Cc: Michal Simek >> -Cc: Simon Glass >> -Cc: Emmanuel Vadot >> -Signed-off-by: Michal Simek -Backported >> from upstream: >> https://git.denx.de/?p=u-boot.git;a=commit;h=c7df098a71e05dc81cee81874 >> 7759e8060b59626 >> ---- >> - scripts/Makefile.spl | 8 +++++++- >> - 1 file changed, 7 insertions(+), 1 deletion(-) >> - >> -diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl -index >> ef018b5b4056..252f13826d4c 100644 >> ---- a/scripts/Makefile.spl >> -+++ b/scripts/Makefile.spl >> -@@ -167,8 +167,14 @@ ifdef CONFIG_ARCH_ZYNQ >> - MKIMAGEFLAGS_boot.bin = -T zynqimage -R >> $(srctree)/$(CONFIG_BOOT_INIT_FILE) >> - endif >> - ifdef CONFIG_ARCH_ZYNQMP >> -+ifneq ($(CONFIG_PMUFW_INIT_FILE),"") >> -+spl/boot.bin: zynqmp-check-pmufw >> -+zynqmp-check-pmufw: FORCE >> -+ ( cd $(srctree) && test -r $(CONFIG_PMUFW_INIT_FILE) ) \ >> -+ || ( echo "Cannot read $(CONFIG_PMUFW_INIT_FILE)" && >> -+false ) endif >> - MKIMAGEFLAGS_boot.bin = -T zynqmpimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) \ >> -- -n $(srctree)/$(CONFIG_PMUFW_INIT_FILE) >> -+ -n "$(shell cd $(srctree); readlink -f $(CONFIG_PMUFW_INIT_FILE))" >> - endif >> - >> - spl/boot.bin: $(obj)/u-boot-spl.bin FORCE >> --- >> -2.7.4 >> - >> diff --git >> a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-in >> it-file-as-a-kco.patch >> b/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-in >> it-file-as-a-kco.patch >> deleted file mode 100644 >> index b32e162780..0000000000 >> --- >> a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-in >> it-file-as-a-kco.patch >> +++ /dev/null >> @@ -1,175 +0,0 @@ >> -From 4c9d54ab5a41d65000c8d249b6fb1b76056f1812 Mon Sep 17 00:00:00 >> 2001 >> -From: Luca Ceresoli >> -Date: Wed, 20 Jun 2018 12:11:50 +0200 >> -Subject: [PATCH] arm/arm64: zynq/zynqmp: pass the PS init file as a >> kconfig >> - variable >> - >> -U-Boot needs to link ps7_init_gpl.c on Zynq or psu_init_gpl.c on >> -ZynqMP (PS init for short). The current logic to locate this file for >> -both platforms is: >> - >> - 1. if a board-specific file exists in >> - board/xilinx/zynq[mp]/$(CONFIG_DEFAULT_DEVICE_TREE)/ps?_init_gpl.c >> - then use it >> - 2. otherwise use board/xilinx/zynq/ps?_init_gpl.c >> - >> -In the latter case the file does not exist in the U-Boot sources and >> -must be copied in the source tree from the outside before starting >> the -build. This is typical when it is generated from Xilinx tools >> while -developing a custom hardware. However making sure that a >> -board-specific file is _not_ found (and used) requires some trickery >> -such as removing or overwriting all PS init files (e.g.: the current >> -meta-xilinx yocto layer [0]). >> - >> -This generates a few problems: >> - >> - * if the source tree is shared among different out-of-tree builds, >> - they will pollute (and potentially corrupt) each other >> - * the source tree cannot be read-only >> - * any buildsystem must add a command to copy the PS init file binary >> - * overwriting or deleting files in the source tree is ugly as hell >> - >> -Simplify usage by allowing to pass the path to the desired PS init >> -file in kconfig variable XILINX_PS_INIT_FILE. It can be an absolute >> -path or relative to $(srctree). If the variable is set, the >> -user-specified file will always be used without being copied -around. >> If the the variable is left empty, for backward compatibility -fall >> back to the old behaviour. >> - >> -Since the issue is the same for Zynq and ZynqMP, add one kconfig >> -variable in a common place and use it for both. >> - >> -Also use the new kconfig help text to document all the ways to give >> -U-Boot the PS init file. >> - >> -Build-tested with all combinations of: >> - - platform: zynq or zynqmp >> - - PS init file: from XILINX_PS_INIT_FILE (absolute, relative path, >> - non-existing), in-tree board-specific, in board/xilinx/zynq[mp]/ >> - - building in-tree, in subdir, in other directory >> - >> -[0] >> https://github.com/Xilinx/meta-xilinx/blob/b2f74cc7fe5c4881589d5e440a1 >> 7cb51fc66a7ab/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init. >> inc#L9 >> - >> -Signed-off-by: Luca Ceresoli >> -Cc: Albert Aribaud >> -Cc: Michal Simek >> -Cc: Nathan Rossi -Backported from upstream: >> https://git.denx.de/?p=u-boot.git;a=commit;h=6da4f67ad09cd8b311d77b2b0 >> 4e557b7ef65b56c >> ---- >> - arch/arm/Kconfig | 1 + >> - board/xilinx/Kconfig | 41 +++++++++++++++++++++++++++++++++++++++++ >> - board/xilinx/zynq/Makefile | 10 +++++++++- >> - board/xilinx/zynqmp/Makefile | 10 +++++++++- >> - 4 files changed, 60 insertions(+), 2 deletions(-) >> - create mode 100644 board/xilinx/Kconfig >> - >> -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index >> 22234cde2ab6..e04979d0ef7e 100644 >> ---- a/arch/arm/Kconfig >> -+++ b/arch/arm/Kconfig >> -@@ -1293,4 +1293,5 @@ source "board/technologic/ts4600/Kconfig" >> - source "board/vscom/baltos/Kconfig" >> - source "board/woodburn/Kconfig" >> - source "board/work-microwave/work_92105/Kconfig" >> -+source "board/xilinx/Kconfig" >> - source "board/zipitz2/Kconfig" >> - >> - source "arch/arm/Kconfig.debug" >> -diff --git a/board/xilinx/Kconfig b/board/xilinx/Kconfig -new file >> mode 100644 -index 000000000000..aa3fa061edef >> ---- /dev/null >> -+++ b/board/xilinx/Kconfig >> -@@ -0,0 +1,41 @@ >> -+# Copyright (c) 2018, Luca Ceresoli # # >> -+SPDX-License-Identifier: GPL-2.0 >> -+ >> -+if ARCH_ZYNQ || ARCH_ZYNQMP >> -+ >> -+config XILINX_PS_INIT_FILE >> -+ string "Zynq/ZynqMP PS init file(s) location" >> -+ help >> -+ On Zynq and ZynqMP U-Boot SPL (or U-Boot proper if >> -+ ZYNQMP_PSU_INIT_ENABLED is set) is responsible for some >> -+ basic initializations, such as enabling peripherals and >> -+ configuring pinmuxes. The PS init file (called >> -+ psu_init_gpl.c on ZynqMP, ps7_init_gpl.c for Zynq-7000) >> -+ contains the code for such initializations. >> -+ >> -+ U-Boot contains PS init files for some boards, but each of >> -+ them describes only one specific configuration. Users of a >> -+ different board, or needing a different configuration, can >> -+ generate custom files using the Xilinx development tools. >> -+ >> -+ There are three ways to give a PS init file to U-Boot: >> -+ >> -+ 1. Set this variable to the path, either relative to the >> -+ source tree or absolute, where the psu_init_gpl.c or >> -+ ps7_init_gpl.c file is located. U-Boot will build this >> -+ file. >> -+ >> -+ 2. If you leave an empty string here, U-Boot will use >> -+ board/xilinx/zynq/$(CONFIG_DEFAULT_DEVICE_TREE)/ps7_init_gpl.c >> -+ for Zynq-7000, or >> -+ board/xilinx/zynqmp/$(CONFIG_DEFAULT_DEVICE_TREE)/psu_init_gpl.c >> -+ for ZynqMP. >> -+ >> -+ 3. If the above file does not exist, U-Boot will use >> -+ board/xilinx/zynq/ps7_init_gpl.c for Zynq-7000, or >> -+ board/xilinx/zynqmp/psu_init_gpl.c for ZynqMP. This file >> -+ is not provided by U-Boot, you have to copy it there >> -+ before the build. >> -+ >> -+endif >> -diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile >> -index 5a76a26720cd..03ad5f0532ee 100644 >> ---- a/board/xilinx/zynq/Makefile >> -+++ b/board/xilinx/zynq/Makefile >> -@@ -5,10 +5,18 @@ >> - >> - obj-y := board.o >> - >> --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) >> -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") >> -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f >> -+$(CONFIG_XILINX_PS_INIT_FILE)) init-objs := ps_init_gpl.o >> -+spl/board/xilinx/zynq/ps_init_gpl.o board/xilinx/zynq/ps_init_gpl.o: $(PS_INIT_FILE) >> -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ endif >> - >> -+ifeq ($(init-objs),) >> -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) >> - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/ps7_init_gpl.c),\ >> - $(hw-platform-y)/ps7_init_gpl.o) >> -+endif >> - >> - ifeq ($(init-objs),) >> - ifneq ($(wildcard $(srctree)/$(src)/ps7_init_gpl.c),) >> -diff --git a/board/xilinx/zynqmp/Makefile >> b/board/xilinx/zynqmp/Makefile -index 05ccd25dcef3..960b81fc5853 >> 100644 >> ---- a/board/xilinx/zynqmp/Makefile >> -+++ b/board/xilinx/zynqmp/Makefile >> -@@ -5,10 +5,18 @@ >> - >> - obj-y := zynqmp.o >> - >> --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) >> -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") >> -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f >> -+$(CONFIG_XILINX_PS_INIT_FILE)) init-objs := ps_init_gpl.o >> -+spl/board/xilinx/zynqmp/ps_init_gpl.o board/xilinx/zynqmp/ps_init_gpl.o: $(PS_INIT_FILE) >> -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ endif >> - >> -+ifeq ($(init-objs),) >> -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) >> - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/psu_init_gpl.c),\ >> - $(hw-platform-y)/psu_init_gpl.o) >> -+endif >> - >> - ifeq ($(init-objs),) >> - ifneq ($(wildcard $(srctree)/$(src)/psu_init_gpl.c),) >> --- >> -2.7.4 >> - >> diff --git a/configs/zynqmp_zcu102_defconfig >> b/configs/zynqmp_zcu102_defconfig new file mode 100644 index >> 0000000000..336f5c2dbe >> --- /dev/null >> +++ b/configs/zynqmp_zcu102_defconfig >> @@ -0,0 +1,35 @@ >> +BR2_aarch64=y >> +BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" >> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y >> +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" >> +BR2_LINUX_KERNEL=y >> +BR2_LINUX_KERNEL_CUSTOM_GIT=y >> +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" >> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2" >> +BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" >> +BR2_LINUX_KERNEL_DTS_SUPPORT=y >> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" >> +BR2_TARGET_ROOTFS_EXT2=y >> +BR2_TARGET_ROOTFS_EXT2_4=y >> +# BR2_TARGET_ROOTFS_TAR is not set >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.4_2021.2" >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" >> +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2" >> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" >> +BR2_TARGET_UBOOT_NEEDS_DTC=y >> +BR2_TARGET_UBOOT_SPL=y >> +BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" >> +BR2_TARGET_UBOOT_ZYNQMP=y >> +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/master/bin/pmufw-v2021.2.bin" >> +BR2_TARGET_UBOOT_FORMAT_ITB=y >> +BR2_PACKAGE_HOST_DOSFSTOOLS=y >> +BR2_PACKAGE_HOST_GENIMAGE=y >> +BR2_PACKAGE_HOST_MTOOLS=y > > As pointed above this ^^^ file must be in a separate patch and it deserves also a maintainer. So please you or maybe Luca could add an entry to DEVELOPERS for this board > >> diff --git a/configs/zynqmp_zcu106_defconfig >> b/configs/zynqmp_zcu106_defconfig index bee7c1daf7..3a6947e1e8 100644 >> --- a/configs/zynqmp_zcu106_defconfig >> +++ b/configs/zynqmp_zcu106_defconfig >> @@ -1,11 +1,11 @@ >> BR2_aarch64=y >> BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" > > Since all patches are gone, this ^^^ is not needed anymore > >> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y >> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y >> BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" >> BR2_LINUX_KERNEL=y >> BR2_LINUX_KERNEL_CUSTOM_GIT=y >> BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" >> -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" >> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2" >> BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" >> BR2_LINUX_KERNEL_DTS_SUPPORT=y >> BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" >> @@ -14,21 +14,22 @@ BR2_TARGET_ROOTFS_EXT2_4=y >> # BR2_TARGET_ROOTFS_TAR is not set >> BR2_TARGET_ARM_TRUSTED_FIRMWARE=y >> BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y >> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" >> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5" >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.4_2021.2" > > It's worth mention in commit log that you're switching from ARM to Xilinx ATF > >> BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" >> BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" >> -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7" >> -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA" >> +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2" >> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" >> BR2_TARGET_UBOOT_NEEDS_DTC=y >> BR2_TARGET_UBOOT_SPL=y >> BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" >> BR2_TARGET_UBOOT_ZYNQMP=y >> -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/53fdb7b6c92860ceb0ec5fd14deee302f4a84269/bin/pmufw-zcu106-default-v2017.4.bin" >> +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/master/bin/pmufw-v2021.2.bin" >> +BR2_TARGET_UBOOT_FORMAT_ITB=y > > Here ^^^ I see that probably you're switching from .bin to .itb so better mention it in commit log > >> BR2_PACKAGE_HOST_DOSFSTOOLS=y >> BR2_PACKAGE_HOST_GENIMAGE=y >> BR2_PACKAGE_HOST_MTOOLS=y > > Thank you! > > Best regards > -- > Giulio Benetti > Benetti Engineering sas -- From neal.frager at xilinx.com Thu Feb 3 13:44:01 2022 From: neal.frager at xilinx.com (Neal Frager) Date: Thu, 3 Feb 2022 06:44:01 -0700 Subject: [Buildroot] [PATCH 1/2] configs/zynqmp_zcu106: Bump ATF/U-Boot/Linux to Xilinx 2021.2 Message-ID: <20220203134402.1647985-1-neal.frager@xilinx.com> bump ATF to v2.4 bump U-Boot to Xilinx 2021.2 (2021.01): important drivers not in mainline bump Linux to Xilinx 2021.2 (5.10): important drivers not in mainline deleted board/zynqmp/patches directory: already in mainline modified board/zynqmp/genimage.cfg: U-Boot 2021.01 uses u-boot.itb format bump configs/zynqmp_zcu106_defconfig to Xilinx 2021.2 Signed-off-by: Neal Frager --- board/zynqmp/genimage.cfg | 2 +- ...-fix-Remove-GGC-ignore-Warray-bounds.patch | 68 ------- ...64-zynqmp-zcu106-fix-SPL-MMC-booting.patch | 52 ------ ...2-arm64-zynqmp-Enable-booting-to-ATF.patch | 114 ------------ ...ept-an-absolute-path-for-PMUFW_INIT_.patch | 68 ------- ...ynqmp-pass-the-PS-init-file-as-a-kco.patch | 175 ------------------ board/zynqmp/readme.txt | 10 +- configs/zynqmp_zcu106_defconfig | 14 +- 8 files changed, 13 insertions(+), 490 deletions(-) delete mode 100644 board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch delete mode 100644 board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch delete mode 100644 board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch delete mode 100644 board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch delete mode 100644 board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg index ed202f4550..58dc6d785d 100644 --- a/board/zynqmp/genimage.cfg +++ b/board/zynqmp/genimage.cfg @@ -2,7 +2,7 @@ image boot.vfat { vfat { files = { "boot.bin", - "u-boot.bin", + "u-boot.itb", "atf-uboot.ub", "system.dtb", "Image" diff --git a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch b/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch deleted file mode 100644 index 0c1a9ba2a4..0000000000 --- a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch +++ /dev/null @@ -1,68 +0,0 @@ -From da003e6ada7d0217fe99dc7c649a731f8ebd3c34 Mon Sep 17 00:00:00 2001 -From: Deepika Bhavnani -Date: Thu, 15 Aug 2019 00:56:46 +0300 -Subject: [PATCH] Coverity fix: Remove GGC ignore -Warray-bounds - -GCC diagnostics were added to ignore array boundaries, instead -of ignoring GCC warning current code will check for array boundaries -and perform and array update only for valid elements. - -Resolves: `CID 246574` `CID 246710` `CID 246651` - -Signed-off-by: Deepika Bhavnani -Change-Id: I7530ecf7a1707351c6ee87e90cc3d33574088f57 - -Backported from: 41af05154abe136938bcfb5f26c969933784bbef -[Adapted to apply on 1.5] - ---- - lib/psci/psci_common.c | 20 ++++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) - -diff --git a/lib/psci/psci_common.c b/lib/psci/psci_common.c -index 2220a745cd6e..6282d992a2f0 100644 ---- a/lib/psci/psci_common.c -+++ b/lib/psci/psci_common.c -@@ -188,21 +188,17 @@ static unsigned int get_power_on_target_pwrlvl(void) - /****************************************************************************** - * Helper function to update the requested local power state array. This array - * does not store the requested state for the CPU power level. Hence an -- * assertion is added to prevent us from accessing the wrong index. -+ * assertion is added to prevent us from accessing the CPU power level. - *****************************************************************************/ - static void psci_set_req_local_pwr_state(unsigned int pwrlvl, - unsigned int cpu_idx, - plat_local_state_t req_pwr_state) - { -- /* -- * This should never happen, we have this here to avoid -- * "array subscript is above array bounds" errors in GCC. -- */ - assert(pwrlvl > PSCI_CPU_PWR_LVL); --#pragma GCC diagnostic push --#pragma GCC diagnostic ignored "-Warray-bounds" -- psci_req_local_pwr_states[pwrlvl - 1][cpu_idx] = req_pwr_state; --#pragma GCC diagnostic pop -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && -+ (cpu_idx < PLATFORM_CORE_COUNT)) { -+ psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx] = req_pwr_state; -+ } - } - - /****************************************************************************** -@@ -228,7 +224,11 @@ static plat_local_state_t *psci_get_req_local_pwr_states(unsigned int pwrlvl, - { - assert(pwrlvl > PSCI_CPU_PWR_LVL); - -- return &psci_req_local_pwr_states[pwrlvl - 1][cpu_idx]; -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && -+ (cpu_idx < PLATFORM_CORE_COUNT)) { -+ return &psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx]; -+ } else -+ return NULL; - } - - /* --- -2.34.0 - diff --git a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch b/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch deleted file mode 100644 index 4d85e1bb12..0000000000 --- a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch +++ /dev/null @@ -1,52 +0,0 @@ -From e5d72ed8339eb05285448aad3c89d21e4d18fd29 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Mon, 26 Feb 2018 09:40:34 +0100 -Subject: [PATCH] arm64: zynqmp: zcu106: fix SPL MMC booting - -The U-Boot SPL generated with the current zcu106 defconfig cannot boot -from MMC: - - [...] - U-Boot SPL 2018.01 (Feb 21 2018 - 17:47:14) - EL Level: EL3 - Trying to boot from MMC1 - sdhci_transfer_data: Error detected in status(0x408020)! - spl_load_image_fat_os: error reading image u-boot.bin, err - -2 - spl_load_image_fat: error reading image u-boot.img, err - -6 - SPL: failed to boot from all boot devices - ### ERROR ### Please RESET the board ### - -Fix by lowering the rpll value. The new value for the RPLL_CTRL -register comes from the current psu_init_gpl.c from the HDF file at -https://github.com/xilinx/hdf-examples/tree/01ad8ea5fd1989abf4ea5a072d019a16cb2bc546/zcu106-zynqmp -(generated by Vivado v2017.4). - -RPLL and sdio1_ref clocks before and after this change: - - - Old values: RPLL 1.36 GHz, sdio1_ref 272 MHz - - New values: RPLL 1.16 GHz, sdio1_ref 233 MHz - -Signed-off-by: Luca Ceresoli -Cc: Michal Simek -Upstream-status: accepted upstream in a different form ---- - - board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -index 4d18abe000ca..e6fa477e53e7 100644 ---- a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -+++ b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -@@ -10,7 +10,7 @@ - static unsigned long psu_pll_init_data(void) - { - psu_mask_write(0xFF5E0034, 0xFE7FEDEFU, 0x7E4E2C62U); -- psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00013C00U); -+ psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00014600U); - psu_mask_write(0xFF5E0030, 0x00000008U, 0x00000008U); - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000001U); - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000000U); --- -2.7.4 - diff --git a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch b/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch deleted file mode 100644 index 487fff6812..0000000000 --- a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 5e3cac50cc981e01d9072241035a8d4162560c71 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Mon, 12 Mar 2018 17:18:38 +0100 -Subject: [PATCH] arm64: zynqmp: Enable booting to ATF - -U-Boot is now able to boot to ARM Trusted Firmware (ATF). The boot -flow is SPL(EL3) loads ATF and full u-boot and jump to ATF(EL3) which -pass control to full u-boot(EL2). This has been tested on zcu106, so -enable it in this defconfig. - -To generate an image that triggers this booting flow, you need to pass -'-O arm-trusted-firmware' to mkimage. - -Signed-off-by: Luca Ceresoli -Signed-off-by: Michal Simek -Backported from upstream: http://git.denx.de/?p=u-boot.git;a=commit;h=5e3cac50cc981e01d9072241035a8d4162560c71 ---- - - configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 + - configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 + - configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 + - configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 + - configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 1 + - configs/xilinx_zynqmp_zcu102_revA_defconfig | 1 + - configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 + - 7 files changed, 7 insertions(+) - -diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig -index c5bfa2b12638..488c72258b0e 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig -index f86dce403a42..5d501eec0edd 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig -@@ -20,6 +20,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig -index 6e947cf56827..6f7eaebd7676 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig -@@ -16,6 +16,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_CMD_MEMTEST=y - CONFIG_SYS_ALT_MEMTEST=y -diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig -index 1c934858c61c..7a3806cba4b5 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig -@@ -17,6 +17,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_CMD_MEMTEST=y - CONFIG_SYS_ALT_MEMTEST=y -diff --git a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig -index e13c7c56f310..e4408f182ca0 100644 ---- a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig -+++ b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig b/configs/xilinx_zynqmp_zcu102_revA_defconfig -index 5b2cd495ee85..b52f6789fd4b 100644 ---- a/configs/xilinx_zynqmp_zcu102_revA_defconfig -+++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig -index e6530fbfe7ff..80592554f682 100644 ---- a/configs/xilinx_zynqmp_zcu102_revB_defconfig -+++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y --- -2.7.4 - diff --git a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch b/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch deleted file mode 100644 index 95ab7b3b75..0000000000 --- a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch +++ /dev/null @@ -1,68 +0,0 @@ -From c7df098a71e05dc81cee818747759e8060b59626 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Mon, 4 Jun 2018 12:21:01 +0200 -Subject: [PATCH] arm64: zynqmp: accept an absolute path for PMUFW_INIT_FILE - -The value of PMUFW_INIT_FILE is prefixed with "$(srctree)/", thus -forcing it to be a relative path inside the U-Boot source tree. Since -the PMUFW is a binary file generated outside of U-Boot, the PMUFW -binary must be copied inside the U-Boot source tree before the -build. - -This generates a few problems: - - * if the source tree is shared among different out-of-tree builds, - they will pollute (and potentially corrupt) each other - * the source tree cannot be read-only - * any buildsystem must add a command to copy the PMUFW binary - * putting an externally-generated binary in the source tree is ugly - as hell - -Avoid these problems by accepting an absolute path for -PMUFW_INIT_FILE. This would be as simple as removing the "$(srctree)/" -prefix, but in order to keep backward compatibility we rather use the -shell and readlink to get the absolute path even when starting from a -relative path. - -Since 'readlink -f' produces an empty string if the file does not -exist, we also add a check to ensure the file configured in -PMUFW_INIT_FILE exists. Otherwise the build would exit successfully, -but produce a boot.bin without PMUFW as if PMUFW_INIT_FILE were empty. - -Tested in the 12 possible combinations of: - - PMUFW_INIT_FILE empty, relative, absolute, non-existing - - building in-tree, in subdir, in other directory - -Signed-off-by: Luca Ceresoli -Cc: Michal Simek -Cc: Simon Glass -Cc: Emmanuel Vadot -Signed-off-by: Michal Simek -Backported from upstream: https://git.denx.de/?p=u-boot.git;a=commit;h=c7df098a71e05dc81cee818747759e8060b59626 ---- - scripts/Makefile.spl | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl -index ef018b5b4056..252f13826d4c 100644 ---- a/scripts/Makefile.spl -+++ b/scripts/Makefile.spl -@@ -167,8 +167,14 @@ ifdef CONFIG_ARCH_ZYNQ - MKIMAGEFLAGS_boot.bin = -T zynqimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) - endif - ifdef CONFIG_ARCH_ZYNQMP -+ifneq ($(CONFIG_PMUFW_INIT_FILE),"") -+spl/boot.bin: zynqmp-check-pmufw -+zynqmp-check-pmufw: FORCE -+ ( cd $(srctree) && test -r $(CONFIG_PMUFW_INIT_FILE) ) \ -+ || ( echo "Cannot read $(CONFIG_PMUFW_INIT_FILE)" && false ) -+endif - MKIMAGEFLAGS_boot.bin = -T zynqmpimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) \ -- -n $(srctree)/$(CONFIG_PMUFW_INIT_FILE) -+ -n "$(shell cd $(srctree); readlink -f $(CONFIG_PMUFW_INIT_FILE))" - endif - - spl/boot.bin: $(obj)/u-boot-spl.bin FORCE --- -2.7.4 - diff --git a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch b/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch deleted file mode 100644 index b32e162780..0000000000 --- a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch +++ /dev/null @@ -1,175 +0,0 @@ -From 4c9d54ab5a41d65000c8d249b6fb1b76056f1812 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Wed, 20 Jun 2018 12:11:50 +0200 -Subject: [PATCH] arm/arm64: zynq/zynqmp: pass the PS init file as a kconfig - variable - -U-Boot needs to link ps7_init_gpl.c on Zynq or psu_init_gpl.c on -ZynqMP (PS init for short). The current logic to locate this file for -both platforms is: - - 1. if a board-specific file exists in - board/xilinx/zynq[mp]/$(CONFIG_DEFAULT_DEVICE_TREE)/ps?_init_gpl.c - then use it - 2. otherwise use board/xilinx/zynq/ps?_init_gpl.c - -In the latter case the file does not exist in the U-Boot sources and -must be copied in the source tree from the outside before starting the -build. This is typical when it is generated from Xilinx tools while -developing a custom hardware. However making sure that a -board-specific file is _not_ found (and used) requires some trickery -such as removing or overwriting all PS init files (e.g.: the current -meta-xilinx yocto layer [0]). - -This generates a few problems: - - * if the source tree is shared among different out-of-tree builds, - they will pollute (and potentially corrupt) each other - * the source tree cannot be read-only - * any buildsystem must add a command to copy the PS init file binary - * overwriting or deleting files in the source tree is ugly as hell - -Simplify usage by allowing to pass the path to the desired PS init -file in kconfig variable XILINX_PS_INIT_FILE. It can be an absolute -path or relative to $(srctree). If the variable is set, the -user-specified file will always be used without being copied -around. If the the variable is left empty, for backward compatibility -fall back to the old behaviour. - -Since the issue is the same for Zynq and ZynqMP, add one kconfig -variable in a common place and use it for both. - -Also use the new kconfig help text to document all the ways to give -U-Boot the PS init file. - -Build-tested with all combinations of: - - platform: zynq or zynqmp - - PS init file: from XILINX_PS_INIT_FILE (absolute, relative path, - non-existing), in-tree board-specific, in board/xilinx/zynq[mp]/ - - building in-tree, in subdir, in other directory - -[0] https://github.com/Xilinx/meta-xilinx/blob/b2f74cc7fe5c4881589d5e440a17cb51fc66a7ab/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init.inc#L9 - -Signed-off-by: Luca Ceresoli -Cc: Albert Aribaud -Cc: Michal Simek -Cc: Nathan Rossi -Backported from upstream: https://git.denx.de/?p=u-boot.git;a=commit;h=6da4f67ad09cd8b311d77b2b04e557b7ef65b56c ---- - arch/arm/Kconfig | 1 + - board/xilinx/Kconfig | 41 +++++++++++++++++++++++++++++++++++++++++ - board/xilinx/zynq/Makefile | 10 +++++++++- - board/xilinx/zynqmp/Makefile | 10 +++++++++- - 4 files changed, 60 insertions(+), 2 deletions(-) - create mode 100644 board/xilinx/Kconfig - -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 22234cde2ab6..e04979d0ef7e 100644 ---- a/arch/arm/Kconfig -+++ b/arch/arm/Kconfig -@@ -1293,4 +1293,5 @@ source "board/technologic/ts4600/Kconfig" - source "board/vscom/baltos/Kconfig" - source "board/woodburn/Kconfig" - source "board/work-microwave/work_92105/Kconfig" -+source "board/xilinx/Kconfig" - source "board/zipitz2/Kconfig" - - source "arch/arm/Kconfig.debug" -diff --git a/board/xilinx/Kconfig b/board/xilinx/Kconfig -new file mode 100644 -index 000000000000..aa3fa061edef ---- /dev/null -+++ b/board/xilinx/Kconfig -@@ -0,0 +1,41 @@ -+# Copyright (c) 2018, Luca Ceresoli -+# -+# SPDX-License-Identifier: GPL-2.0 -+ -+if ARCH_ZYNQ || ARCH_ZYNQMP -+ -+config XILINX_PS_INIT_FILE -+ string "Zynq/ZynqMP PS init file(s) location" -+ help -+ On Zynq and ZynqMP U-Boot SPL (or U-Boot proper if -+ ZYNQMP_PSU_INIT_ENABLED is set) is responsible for some -+ basic initializations, such as enabling peripherals and -+ configuring pinmuxes. The PS init file (called -+ psu_init_gpl.c on ZynqMP, ps7_init_gpl.c for Zynq-7000) -+ contains the code for such initializations. -+ -+ U-Boot contains PS init files for some boards, but each of -+ them describes only one specific configuration. Users of a -+ different board, or needing a different configuration, can -+ generate custom files using the Xilinx development tools. -+ -+ There are three ways to give a PS init file to U-Boot: -+ -+ 1. Set this variable to the path, either relative to the -+ source tree or absolute, where the psu_init_gpl.c or -+ ps7_init_gpl.c file is located. U-Boot will build this -+ file. -+ -+ 2. If you leave an empty string here, U-Boot will use -+ board/xilinx/zynq/$(CONFIG_DEFAULT_DEVICE_TREE)/ps7_init_gpl.c -+ for Zynq-7000, or -+ board/xilinx/zynqmp/$(CONFIG_DEFAULT_DEVICE_TREE)/psu_init_gpl.c -+ for ZynqMP. -+ -+ 3. If the above file does not exist, U-Boot will use -+ board/xilinx/zynq/ps7_init_gpl.c for Zynq-7000, or -+ board/xilinx/zynqmp/psu_init_gpl.c for ZynqMP. This file -+ is not provided by U-Boot, you have to copy it there -+ before the build. -+ -+endif -diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile -index 5a76a26720cd..03ad5f0532ee 100644 ---- a/board/xilinx/zynq/Makefile -+++ b/board/xilinx/zynq/Makefile -@@ -5,10 +5,18 @@ - - obj-y := board.o - --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE)) -+init-objs := ps_init_gpl.o -+spl/board/xilinx/zynq/ps_init_gpl.o board/xilinx/zynq/ps_init_gpl.o: $(PS_INIT_FILE) -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ -+endif - -+ifeq ($(init-objs),) -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/ps7_init_gpl.c),\ - $(hw-platform-y)/ps7_init_gpl.o) -+endif - - ifeq ($(init-objs),) - ifneq ($(wildcard $(srctree)/$(src)/ps7_init_gpl.c),) -diff --git a/board/xilinx/zynqmp/Makefile b/board/xilinx/zynqmp/Makefile -index 05ccd25dcef3..960b81fc5853 100644 ---- a/board/xilinx/zynqmp/Makefile -+++ b/board/xilinx/zynqmp/Makefile -@@ -5,10 +5,18 @@ - - obj-y := zynqmp.o - --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE)) -+init-objs := ps_init_gpl.o -+spl/board/xilinx/zynqmp/ps_init_gpl.o board/xilinx/zynqmp/ps_init_gpl.o: $(PS_INIT_FILE) -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ -+endif - -+ifeq ($(init-objs),) -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/psu_init_gpl.c),\ - $(hw-platform-y)/psu_init_gpl.o) -+endif - - ifeq ($(init-objs),) - ifneq ($(wildcard $(srctree)/$(src)/psu_init_gpl.c),) --- -2.7.4 - diff --git a/board/zynqmp/readme.txt b/board/zynqmp/readme.txt index da37f4ccc9..9755f182ae 100644 --- a/board/zynqmp/readme.txt +++ b/board/zynqmp/readme.txt @@ -1,10 +1,10 @@ ******************************** -Xilinx ZCU106 board - ZynqMP SoC +Xilinx ZCU102 / ZCU106 boards - ZynqMP SoC ******************************** -This document describes the Buildroot support for the ZCU106 board by -Xilinx, based on the Zynq UltraScale+ MPSoC (aka ZynqMP). It has been -tested with the EK-U1-ZCU106-ES2 pre-production board. +This document describes the Buildroot support for the ZCU102 and ZCU106 +boards by Xilinx, based on the Zynq UltraScale+ MPSoC (aka ZynqMP). +It has been tested with the ZCU102 and ZCU106 production boards. How to build it =============== @@ -32,7 +32,7 @@ After building, you should get a tree like this: +-- rootfs.ext4 -> rootfs.ext2 +-- sdcard.img +-- system.dtb -> zynqmp-zcu106-revA.dtb - +-- u-boot.bin + +-- u-boot.itb `-- zynqmp-zcu106-revA.dtb How to write the SD card diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index bee7c1daf7..34b3d89ffb 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -1,11 +1,10 @@ BR2_aarch64=y -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" @@ -15,20 +14,21 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v2.4" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/53fdb7b6c92860ceb0ec5fd14deee302f4a84269/bin/pmufw-zcu106-default-v2017.4.bin" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/2021.2/bin/pmufw-v2021.2.bin" +BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -- 2.17.1 From neal.frager at xilinx.com Thu Feb 3 13:44:02 2022 From: neal.frager at xilinx.com (Neal Frager) Date: Thu, 3 Feb 2022 06:44:02 -0700 Subject: [Buildroot] [PATCH 2/2] Add configs/zynqmp_zcu102_defconfig In-Reply-To: <20220203134402.1647985-1-neal.frager@xilinx.com> References: <20220203134402.1647985-1-neal.frager@xilinx.com> Message-ID: <20220203134402.1647985-2-neal.frager@xilinx.com> Signed-off-by: Neal Frager --- configs/zynqmp_zcu102_defconfig | 34 +++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 configs/zynqmp_zcu102_defconfig diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig new file mode 100644 index 0000000000..5f98e72aaf --- /dev/null +++ b/configs/zynqmp_zcu102_defconfig @@ -0,0 +1,34 @@ +BR2_aarch64=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2" +BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v2.4" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" +BR2_TARGET_UBOOT_ZYNQMP=y +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/2021.2/bin/pmufw-v2021.2.bin" +BR2_TARGET_UBOOT_FORMAT_ITB=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y -- 2.17.1 From nealf at xilinx.com Thu Feb 3 13:57:01 2022 From: nealf at xilinx.com (Neal Frager) Date: Thu, 3 Feb 2022 13:57:01 +0000 Subject: [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2 In-Reply-To: References: <20220202165555.3497977-1-nealf@xilinx.com> <59b73223-73b3-1b9e-b8ec-0cedb0c605ef@benettiengineering.com> Message-ID: Hi Giulio, > Hi Neal, > On 03/02/22 07:24, Neal Frager wrote: > Hi Giulio, > > Thank you very much for your feedback. > You're welcome. > Please don't top-post, answer inline as you see all around the Mailing List. > Also, I don't know if you've read my entire answer. Usually until you don't see "Best regards" and the name of the one who answer, the answer-mail is not finished yet, so simply scroll down until you finish the e-mail. > So please check also the rest of my previous e-mail. I hope this method of inline answer works. I have submitted a new set of patches based on the feedback from you and Luca. Could you please have a look and let me know what you think? > I would be happy to split the zynqmp_zcu102_defconfig off into a second patch. No problem. > Fine > As for adding comments to the log, could you share the proper git commands for doing this? I would be happy to do it, but I am a bit new to git and I did not know the proper command to use for adding log comments. > Luca already pointed you a lot of very useful links. > Another tool I like to create patches for me is "git gui" and also "gitk" to scroll the commits in a non-console way. > Most of all "git gui" is helpful to me to choose a single line to stage or revert. > Best regards --- > Giulio Benetti > Benetti Engineering sas > Best regards, > > Neal Frager > Xilinx > Best regards, Neal Frager Xilinx > -----Original Message----- > From: Giulio Benetti > Sent: Wednesday 2 February 2022 23:33 > To: Neal Frager ; buildroot at buildroot.org > Cc: luca at lucaceresoli.net; Neal Frager > Subject: Re: [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump > ATF/U-Boot/Linux to Xilinx 2021.2 > > CAUTION: This message has originated from an External Source. Please use proper judgment and caution when opening attachments, clicking links, or responding to this email. > > > Hi Neal, > > nice to see you've made it with git send-email :-), > > Here I would improve commit log by stating that you're dropping all > local patches because they are now upstreamed > > On 02/02/22 17:55, Neal Frager wrote: >> Signed-off-by: Neal Frager >> --- >> board/zynqmp/genimage.cfg | 1 + >> ...-fix-Remove-GGC-ignore-Warray-bounds.patch | 68 ------- >> ...64-zynqmp-zcu106-fix-SPL-MMC-booting.patch | 52 ------ >> ...2-arm64-zynqmp-Enable-booting-to-ATF.patch | 114 ------------ >> ...ept-an-absolute-path-for-PMUFW_INIT_.patch | 68 ------- >> ...ynqmp-pass-the-PS-init-file-as-a-kco.patch | 175 ------------------ >> configs/zynqmp_zcu102_defconfig | 35 ++++ > > This ^^^ file is added, so it deserves a second patch after this one, > basically this becomes a patchset of 2 patches > >> configs/zynqmp_zcu106_defconfig | 15 +- >> 8 files changed, 44 insertions(+), 484 deletions(-) >> delete mode 100644 board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch >> delete mode 100644 board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch >> delete mode 100644 board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch >> delete mode 100644 board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch >> delete mode 100644 board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch >> create mode 100644 configs/zynqmp_zcu102_defconfig >> >> diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg >> index ed202f4550..557364e124 100644 >> --- a/board/zynqmp/genimage.cfg >> +++ b/board/zynqmp/genimage.cfg >> @@ -3,6 +3,7 @@ image boot.vfat { >> files = { >> "boot.bin", >> "u-boot.bin", >> + "u-boot.itb", > > Can you please justify this adding ^^^ in commit log? > >> "atf-uboot.ub", >> "system.dtb", >> "Image" >> diff --git >> a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove- >> G >> GC-ignore-Warray-bounds.patch >> b/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove- >> G >> GC-ignore-Warray-bounds.patch >> deleted file mode 100644 >> index 0c1a9ba2a4..0000000000 >> --- >> a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove- >> G >> GC-ignore-Warray-bounds.patch >> +++ /dev/null >> @@ -1,68 +0,0 @@ >> -From da003e6ada7d0217fe99dc7c649a731f8ebd3c34 Mon Sep 17 00:00:00 >> 2001 >> -From: Deepika Bhavnani >> -Date: Thu, 15 Aug 2019 00:56:46 +0300 >> -Subject: [PATCH] Coverity fix: Remove GGC ignore -Warray-bounds >> - >> -GCC diagnostics were added to ignore array boundaries, instead -of >> ignoring GCC warning current code will check for array boundaries >> -and perform and array update only for valid elements. >> - >> -Resolves: `CID 246574` `CID 246710` `CID 246651` >> - >> -Signed-off-by: Deepika Bhavnani >> -Change-Id: I7530ecf7a1707351c6ee87e90cc3d33574088f57 >> - >> -Backported from: 41af05154abe136938bcfb5f26c969933784bbef >> -[Adapted to apply on 1.5] >> - >> ---- >> - lib/psci/psci_common.c | 20 ++++++++++---------- >> - 1 file changed, 10 insertions(+), 10 deletions(-) >> - >> -diff --git a/lib/psci/psci_common.c b/lib/psci/psci_common.c -index >> 2220a745cd6e..6282d992a2f0 100644 >> ---- a/lib/psci/psci_common.c >> -+++ b/lib/psci/psci_common.c >> -@@ -188,21 +188,17 @@ static unsigned int >> get_power_on_target_pwrlvl(void) >> - >> /******************************************************************** >> * >> ********* >> - * Helper function to update the requested local power state array. >> This array >> - * does not store the requested state for the CPU power level. >> Hence an >> -- * assertion is added to prevent us from accessing the wrong index. >> -+ * assertion is added to prevent us from accessing the CPU power level. >> - >> ********************************************************************* >> * >> *******/ >> - static void psci_set_req_local_pwr_state(unsigned int pwrlvl, >> - unsigned int cpu_idx, >> - plat_local_state_t req_pwr_state) >> - { >> -- /* >> -- * This should never happen, we have this here to avoid >> -- * "array subscript is above array bounds" errors in GCC. >> -- */ >> - assert(pwrlvl > PSCI_CPU_PWR_LVL); >> --#pragma GCC diagnostic push >> --#pragma GCC diagnostic ignored "-Warray-bounds" >> -- psci_req_local_pwr_states[pwrlvl - 1][cpu_idx] = req_pwr_state; >> --#pragma GCC diagnostic pop >> -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && >> -+ (cpu_idx < PLATFORM_CORE_COUNT)) { >> -+ psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx] = req_pwr_state; >> -+ } >> - } >> - >> - >> /******************************************************************** >> * >> ********* -@@ -228,7 +224,11 @@ static plat_local_state_t >> *psci_get_req_local_pwr_states(unsigned int pwrlvl, >> - { >> - assert(pwrlvl > PSCI_CPU_PWR_LVL); >> - >> -- return &psci_req_local_pwr_states[pwrlvl - 1][cpu_idx]; >> -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && >> -+ (cpu_idx < PLATFORM_CORE_COUNT)) { >> -+ return &psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx]; >> -+ } else >> -+ return NULL; >> - } >> - >> - /* >> --- >> -2.34.0 >> - >> diff --git >> a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-boo >> t >> ing.patch >> b/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-boo >> t >> ing.patch >> deleted file mode 100644 >> index 4d85e1bb12..0000000000 >> --- >> a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-boo >> t >> ing.patch >> +++ /dev/null >> @@ -1,52 +0,0 @@ >> -From e5d72ed8339eb05285448aad3c89d21e4d18fd29 Mon Sep 17 00:00:00 >> 2001 >> -From: Luca Ceresoli >> -Date: Mon, 26 Feb 2018 09:40:34 +0100 >> -Subject: [PATCH] arm64: zynqmp: zcu106: fix SPL MMC booting >> - >> -The U-Boot SPL generated with the current zcu106 defconfig cannot >> boot -from MMC: >> - >> - [...] >> - U-Boot SPL 2018.01 (Feb 21 2018 - 17:47:14) >> - EL Level: EL3 >> - Trying to boot from MMC1 >> - sdhci_transfer_data: Error detected in status(0x408020)! >> - spl_load_image_fat_os: error reading image u-boot.bin, err - -2 >> - spl_load_image_fat: error reading image u-boot.img, err - -6 >> - SPL: failed to boot from all boot devices >> - ### ERROR ### Please RESET the board ### >> - >> -Fix by lowering the rpll value. The new value for the RPLL_CTRL >> -register comes from the current psu_init_gpl.c from the HDF file at >> -https://github.com/xilinx/hdf-examples/tree/01ad8ea5fd1989abf4ea5a07 >> 2 >> d019a16cb2bc546/zcu106-zynqmp >> -(generated by Vivado v2017.4). >> - >> -RPLL and sdio1_ref clocks before and after this change: >> - >> - - Old values: RPLL 1.36 GHz, sdio1_ref 272 MHz >> - - New values: RPLL 1.16 GHz, sdio1_ref 233 MHz >> - >> -Signed-off-by: Luca Ceresoli >> -Cc: Michal Simek >> -Upstream-status: accepted upstream in a different form >> ---- >> - >> - board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c | 2 +- >> - 1 file changed, 1 insertion(+), 1 deletion(-) >> - >> -diff --git a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c >> b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c >> -index 4d18abe000ca..e6fa477e53e7 100644 >> ---- a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c >> -+++ b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c >> -@@ -10,7 +10,7 @@ >> - static unsigned long psu_pll_init_data(void) >> - { >> - psu_mask_write(0xFF5E0034, 0xFE7FEDEFU, 0x7E4E2C62U); >> -- psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00013C00U); >> -+ psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00014600U); >> - psu_mask_write(0xFF5E0030, 0x00000008U, 0x00000008U); >> - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000001U); >> - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000000U); >> --- >> -2.7.4 >> - >> diff --git >> a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF. >> p >> atch >> b/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF. >> p >> atch >> deleted file mode 100644 >> index 487fff6812..0000000000 >> --- >> a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF. >> p >> atch >> +++ /dev/null >> @@ -1,114 +0,0 @@ >> -From 5e3cac50cc981e01d9072241035a8d4162560c71 Mon Sep 17 00:00:00 >> 2001 >> -From: Luca Ceresoli >> -Date: Mon, 12 Mar 2018 17:18:38 +0100 >> -Subject: [PATCH] arm64: zynqmp: Enable booting to ATF >> - >> -U-Boot is now able to boot to ARM Trusted Firmware (ATF). The boot >> -flow is SPL(EL3) loads ATF and full u-boot and jump to ATF(EL3) >> which -pass control to full u-boot(EL2). This has been tested on >> zcu106, so -enable it in this defconfig. >> - >> -To generate an image that triggers this booting flow, you need to >> pass -'-O arm-trusted-firmware' to mkimage. >> - >> -Signed-off-by: Luca Ceresoli >> -Signed-off-by: Michal Simek -Backported >> from upstream: >> http://git.denx.de/?p=u-boot.git;a=commit;h=5e3cac50cc981e01d90722410 >> 3 >> 5a8d4162560c71 >> ---- >> - >> - configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 + >> - configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 + >> - configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 + >> - configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 + >> - configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 1 + >> - configs/xilinx_zynqmp_zcu102_revA_defconfig | 1 + >> - configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 + >> - 7 files changed, 7 insertions(+) >> - >> -diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig >> b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig >> -index c5bfa2b12638..488c72258b0e 100644 >> ---- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig >> -+++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig >> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >> - CONFIG_SPL_OS_BOOT=y >> - CONFIG_SPL_RAM_SUPPORT=y >> - CONFIG_SPL_RAM_DEVICE=y >> -+CONFIG_SPL_ATF=y >> - CONFIG_SYS_PROMPT="ZynqMP> " >> - CONFIG_FASTBOOT=y >> - CONFIG_FASTBOOT_FLASH=y >> -diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig >> b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig >> -index f86dce403a42..5d501eec0edd 100644 >> ---- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig >> -+++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig >> -@@ -20,6 +20,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >> - CONFIG_SPL_OS_BOOT=y >> - CONFIG_SPL_RAM_SUPPORT=y >> - CONFIG_SPL_RAM_DEVICE=y >> -+CONFIG_SPL_ATF=y >> - CONFIG_SYS_PROMPT="ZynqMP> " >> - CONFIG_FASTBOOT=y >> - CONFIG_FASTBOOT_FLASH=y >> -diff --git a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig >> b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig >> -index 6e947cf56827..6f7eaebd7676 100644 >> ---- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig >> -+++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig >> -@@ -16,6 +16,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >> - CONFIG_SPL_OS_BOOT=y >> - CONFIG_SPL_RAM_SUPPORT=y >> - CONFIG_SPL_RAM_DEVICE=y >> -+CONFIG_SPL_ATF=y >> - CONFIG_SYS_PROMPT="ZynqMP> " >> - CONFIG_CMD_MEMTEST=y >> - CONFIG_SYS_ALT_MEMTEST=y >> -diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig >> b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig >> -index 1c934858c61c..7a3806cba4b5 100644 >> ---- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig >> -+++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig >> -@@ -17,6 +17,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >> - CONFIG_SPL_OS_BOOT=y >> - CONFIG_SPL_RAM_SUPPORT=y >> - CONFIG_SPL_RAM_DEVICE=y >> -+CONFIG_SPL_ATF=y >> - CONFIG_SYS_PROMPT="ZynqMP> " >> - CONFIG_CMD_MEMTEST=y >> - CONFIG_SYS_ALT_MEMTEST=y >> -diff --git a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig >> b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig >> -index e13c7c56f310..e4408f182ca0 100644 >> ---- a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig >> -+++ b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig >> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >> - CONFIG_SPL_OS_BOOT=y >> - CONFIG_SPL_RAM_SUPPORT=y >> - CONFIG_SPL_RAM_DEVICE=y >> -+CONFIG_SPL_ATF=y >> - CONFIG_SYS_PROMPT="ZynqMP> " >> - CONFIG_FASTBOOT=y >> - CONFIG_FASTBOOT_FLASH=y >> -diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig >> b/configs/xilinx_zynqmp_zcu102_revA_defconfig >> -index 5b2cd495ee85..b52f6789fd4b 100644 >> ---- a/configs/xilinx_zynqmp_zcu102_revA_defconfig >> -+++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig >> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >> - CONFIG_SPL_OS_BOOT=y >> - CONFIG_SPL_RAM_SUPPORT=y >> - CONFIG_SPL_RAM_DEVICE=y >> -+CONFIG_SPL_ATF=y >> - CONFIG_SYS_PROMPT="ZynqMP> " >> - CONFIG_FASTBOOT=y >> - CONFIG_FASTBOOT_FLASH=y >> -diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig >> b/configs/xilinx_zynqmp_zcu102_revB_defconfig >> -index e6530fbfe7ff..80592554f682 100644 >> ---- a/configs/xilinx_zynqmp_zcu102_revB_defconfig >> -+++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig >> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >> - CONFIG_SPL_OS_BOOT=y >> - CONFIG_SPL_RAM_SUPPORT=y >> - CONFIG_SPL_RAM_DEVICE=y >> -+CONFIG_SPL_ATF=y >> - CONFIG_SYS_PROMPT="ZynqMP> " >> - CONFIG_FASTBOOT=y >> - CONFIG_FASTBOOT_FLASH=y >> --- >> -2.7.4 >> - >> diff --git >> a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-pat >> h >> -for-PMUFW_INIT_.patch >> b/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-pat >> h >> -for-PMUFW_INIT_.patch >> deleted file mode 100644 >> index 95ab7b3b75..0000000000 >> --- >> a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-pat >> h >> -for-PMUFW_INIT_.patch >> +++ /dev/null >> @@ -1,68 +0,0 @@ >> -From c7df098a71e05dc81cee818747759e8060b59626 Mon Sep 17 00:00:00 >> 2001 >> -From: Luca Ceresoli >> -Date: Mon, 4 Jun 2018 12:21:01 +0200 >> -Subject: [PATCH] arm64: zynqmp: accept an absolute path for >> PMUFW_INIT_FILE >> - >> -The value of PMUFW_INIT_FILE is prefixed with "$(srctree)/", thus >> -forcing it to be a relative path inside the U-Boot source tree. >> Since -the PMUFW is a binary file generated outside of U-Boot, the >> PMUFW -binary must be copied inside the U-Boot source tree before the >> -build. >> - >> -This generates a few problems: >> - >> - * if the source tree is shared among different out-of-tree builds, >> - they will pollute (and potentially corrupt) each other >> - * the source tree cannot be read-only >> - * any buildsystem must add a command to copy the PMUFW binary >> - * putting an externally-generated binary in the source tree is ugly >> - as hell >> - >> -Avoid these problems by accepting an absolute path for >> -PMUFW_INIT_FILE. This would be as simple as removing the "$(srctree)/" >> -prefix, but in order to keep backward compatibility we rather use >> the -shell and readlink to get the absolute path even when starting >> from a -relative path. >> - >> -Since 'readlink -f' produces an empty string if the file does not >> -exist, we also add a check to ensure the file configured in >> -PMUFW_INIT_FILE exists. Otherwise the build would exit successfully, >> -but produce a boot.bin without PMUFW as if PMUFW_INIT_FILE were empty. >> - >> -Tested in the 12 possible combinations of: >> - - PMUFW_INIT_FILE empty, relative, absolute, non-existing >> - - building in-tree, in subdir, in other directory >> - >> -Signed-off-by: Luca Ceresoli >> -Cc: Michal Simek >> -Cc: Simon Glass >> -Cc: Emmanuel Vadot >> -Signed-off-by: Michal Simek -Backported >> from upstream: >> https://git.denx.de/?p=u-boot.git;a=commit;h=c7df098a71e05dc81cee8187 >> 4 >> 7759e8060b59626 >> ---- >> - scripts/Makefile.spl | 8 +++++++- >> - 1 file changed, 7 insertions(+), 1 deletion(-) >> - >> -diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl -index >> ef018b5b4056..252f13826d4c 100644 >> ---- a/scripts/Makefile.spl >> -+++ b/scripts/Makefile.spl >> -@@ -167,8 +167,14 @@ ifdef CONFIG_ARCH_ZYNQ >> - MKIMAGEFLAGS_boot.bin = -T zynqimage -R >> $(srctree)/$(CONFIG_BOOT_INIT_FILE) >> - endif >> - ifdef CONFIG_ARCH_ZYNQMP >> -+ifneq ($(CONFIG_PMUFW_INIT_FILE),"") >> -+spl/boot.bin: zynqmp-check-pmufw >> -+zynqmp-check-pmufw: FORCE >> -+ ( cd $(srctree) && test -r $(CONFIG_PMUFW_INIT_FILE) ) \ >> -+ || ( echo "Cannot read $(CONFIG_PMUFW_INIT_FILE)" && >> -+false ) endif >> - MKIMAGEFLAGS_boot.bin = -T zynqmpimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) \ >> -- -n $(srctree)/$(CONFIG_PMUFW_INIT_FILE) >> -+ -n "$(shell cd $(srctree); readlink -f $(CONFIG_PMUFW_INIT_FILE))" >> - endif >> - >> - spl/boot.bin: $(obj)/u-boot-spl.bin FORCE >> --- >> -2.7.4 >> - >> diff --git >> a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-i >> n >> it-file-as-a-kco.patch >> b/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-i >> n >> it-file-as-a-kco.patch >> deleted file mode 100644 >> index b32e162780..0000000000 >> --- >> a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-i >> n >> it-file-as-a-kco.patch >> +++ /dev/null >> @@ -1,175 +0,0 @@ >> -From 4c9d54ab5a41d65000c8d249b6fb1b76056f1812 Mon Sep 17 00:00:00 >> 2001 >> -From: Luca Ceresoli >> -Date: Wed, 20 Jun 2018 12:11:50 +0200 >> -Subject: [PATCH] arm/arm64: zynq/zynqmp: pass the PS init file as a >> kconfig >> - variable >> - >> -U-Boot needs to link ps7_init_gpl.c on Zynq or psu_init_gpl.c on >> -ZynqMP (PS init for short). The current logic to locate this file >> for -both platforms is: >> - >> - 1. if a board-specific file exists in >> - board/xilinx/zynq[mp]/$(CONFIG_DEFAULT_DEVICE_TREE)/ps?_init_gpl.c >> - then use it >> - 2. otherwise use board/xilinx/zynq/ps?_init_gpl.c >> - >> -In the latter case the file does not exist in the U-Boot sources and >> -must be copied in the source tree from the outside before starting >> the -build. This is typical when it is generated from Xilinx tools >> while -developing a custom hardware. However making sure that a >> -board-specific file is _not_ found (and used) requires some trickery >> -such as removing or overwriting all PS init files (e.g.: the current >> -meta-xilinx yocto layer [0]). >> - >> -This generates a few problems: >> - >> - * if the source tree is shared among different out-of-tree builds, >> - they will pollute (and potentially corrupt) each other >> - * the source tree cannot be read-only >> - * any buildsystem must add a command to copy the PS init file >> binary >> - * overwriting or deleting files in the source tree is ugly as hell >> - >> -Simplify usage by allowing to pass the path to the desired PS init >> -file in kconfig variable XILINX_PS_INIT_FILE. It can be an absolute >> -path or relative to $(srctree). If the variable is set, the >> -user-specified file will always be used without being copied -around. >> If the the variable is left empty, for backward compatibility -fall >> back to the old behaviour. >> - >> -Since the issue is the same for Zynq and ZynqMP, add one kconfig >> -variable in a common place and use it for both. >> - >> -Also use the new kconfig help text to document all the ways to give >> -U-Boot the PS init file. >> - >> -Build-tested with all combinations of: >> - - platform: zynq or zynqmp >> - - PS init file: from XILINX_PS_INIT_FILE (absolute, relative path, >> - non-existing), in-tree board-specific, in board/xilinx/zynq[mp]/ >> - - building in-tree, in subdir, in other directory >> - >> -[0] >> https://github.com/Xilinx/meta-xilinx/blob/b2f74cc7fe5c4881589d5e440a >> 1 >> 7cb51fc66a7ab/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init. >> inc#L9 >> - >> -Signed-off-by: Luca Ceresoli >> -Cc: Albert Aribaud >> -Cc: Michal Simek >> -Cc: Nathan Rossi -Backported from upstream: >> https://git.denx.de/?p=u-boot.git;a=commit;h=6da4f67ad09cd8b311d77b2b >> 0 >> 4e557b7ef65b56c >> ---- >> - arch/arm/Kconfig | 1 + >> - board/xilinx/Kconfig | 41 +++++++++++++++++++++++++++++++++++++++++ >> - board/xilinx/zynq/Makefile | 10 +++++++++- >> - board/xilinx/zynqmp/Makefile | 10 +++++++++- >> - 4 files changed, 60 insertions(+), 2 deletions(-) >> - create mode 100644 board/xilinx/Kconfig >> - >> -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index >> 22234cde2ab6..e04979d0ef7e 100644 >> ---- a/arch/arm/Kconfig >> -+++ b/arch/arm/Kconfig >> -@@ -1293,4 +1293,5 @@ source "board/technologic/ts4600/Kconfig" >> - source "board/vscom/baltos/Kconfig" >> - source "board/woodburn/Kconfig" >> - source "board/work-microwave/work_92105/Kconfig" >> -+source "board/xilinx/Kconfig" >> - source "board/zipitz2/Kconfig" >> - >> - source "arch/arm/Kconfig.debug" >> -diff --git a/board/xilinx/Kconfig b/board/xilinx/Kconfig -new file >> mode 100644 -index 000000000000..aa3fa061edef >> ---- /dev/null >> -+++ b/board/xilinx/Kconfig >> -@@ -0,0 +1,41 @@ >> -+# Copyright (c) 2018, Luca Ceresoli # # >> -+SPDX-License-Identifier: GPL-2.0 >> -+ >> -+if ARCH_ZYNQ || ARCH_ZYNQMP >> -+ >> -+config XILINX_PS_INIT_FILE >> -+ string "Zynq/ZynqMP PS init file(s) location" >> -+ help >> -+ On Zynq and ZynqMP U-Boot SPL (or U-Boot proper if >> -+ ZYNQMP_PSU_INIT_ENABLED is set) is responsible for some >> -+ basic initializations, such as enabling peripherals and >> -+ configuring pinmuxes. The PS init file (called >> -+ psu_init_gpl.c on ZynqMP, ps7_init_gpl.c for Zynq-7000) >> -+ contains the code for such initializations. >> -+ >> -+ U-Boot contains PS init files for some boards, but each of >> -+ them describes only one specific configuration. Users of a >> -+ different board, or needing a different configuration, can >> -+ generate custom files using the Xilinx development tools. >> -+ >> -+ There are three ways to give a PS init file to U-Boot: >> -+ >> -+ 1. Set this variable to the path, either relative to the >> -+ source tree or absolute, where the psu_init_gpl.c or >> -+ ps7_init_gpl.c file is located. U-Boot will build this >> -+ file. >> -+ >> -+ 2. If you leave an empty string here, U-Boot will use >> -+ board/xilinx/zynq/$(CONFIG_DEFAULT_DEVICE_TREE)/ps7_init_gpl.c >> -+ for Zynq-7000, or >> -+ board/xilinx/zynqmp/$(CONFIG_DEFAULT_DEVICE_TREE)/psu_init_gpl.c >> -+ for ZynqMP. >> -+ >> -+ 3. If the above file does not exist, U-Boot will use >> -+ board/xilinx/zynq/ps7_init_gpl.c for Zynq-7000, or >> -+ board/xilinx/zynqmp/psu_init_gpl.c for ZynqMP. This file >> -+ is not provided by U-Boot, you have to copy it there >> -+ before the build. >> -+ >> -+endif >> -diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile >> -index 5a76a26720cd..03ad5f0532ee 100644 >> ---- a/board/xilinx/zynq/Makefile >> -+++ b/board/xilinx/zynq/Makefile >> -@@ -5,10 +5,18 @@ >> - >> - obj-y := board.o >> - >> --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) >> -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") >> -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f >> -+$(CONFIG_XILINX_PS_INIT_FILE)) init-objs := ps_init_gpl.o >> -+spl/board/xilinx/zynq/ps_init_gpl.o board/xilinx/zynq/ps_init_gpl.o: $(PS_INIT_FILE) >> -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ endif >> - >> -+ifeq ($(init-objs),) >> -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) >> - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/ps7_init_gpl.c),\ >> - $(hw-platform-y)/ps7_init_gpl.o) >> -+endif >> - >> - ifeq ($(init-objs),) >> - ifneq ($(wildcard $(srctree)/$(src)/ps7_init_gpl.c),) >> -diff --git a/board/xilinx/zynqmp/Makefile >> b/board/xilinx/zynqmp/Makefile -index 05ccd25dcef3..960b81fc5853 >> 100644 >> ---- a/board/xilinx/zynqmp/Makefile >> -+++ b/board/xilinx/zynqmp/Makefile >> -@@ -5,10 +5,18 @@ >> - >> - obj-y := zynqmp.o >> - >> --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) >> -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") >> -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f >> -+$(CONFIG_XILINX_PS_INIT_FILE)) init-objs := ps_init_gpl.o >> -+spl/board/xilinx/zynqmp/ps_init_gpl.o board/xilinx/zynqmp/ps_init_gpl.o: $(PS_INIT_FILE) >> -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ endif >> - >> -+ifeq ($(init-objs),) >> -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) >> - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/psu_init_gpl.c),\ >> - $(hw-platform-y)/psu_init_gpl.o) >> -+endif >> - >> - ifeq ($(init-objs),) >> - ifneq ($(wildcard $(srctree)/$(src)/psu_init_gpl.c),) >> --- >> -2.7.4 >> - >> diff --git a/configs/zynqmp_zcu102_defconfig >> b/configs/zynqmp_zcu102_defconfig new file mode 100644 index >> 0000000000..336f5c2dbe >> --- /dev/null >> +++ b/configs/zynqmp_zcu102_defconfig >> @@ -0,0 +1,35 @@ >> +BR2_aarch64=y >> +BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" >> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y >> +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" >> +BR2_LINUX_KERNEL=y >> +BR2_LINUX_KERNEL_CUSTOM_GIT=y >> +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" >> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2" >> +BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" >> +BR2_LINUX_KERNEL_DTS_SUPPORT=y >> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" >> +BR2_TARGET_ROOTFS_EXT2=y >> +BR2_TARGET_ROOTFS_EXT2_4=y >> +# BR2_TARGET_ROOTFS_TAR is not set >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.4_2021.2" >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" >> +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2" >> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" >> +BR2_TARGET_UBOOT_NEEDS_DTC=y >> +BR2_TARGET_UBOOT_SPL=y >> +BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" >> +BR2_TARGET_UBOOT_ZYNQMP=y >> +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/master/bin/pmufw-v2021.2.bin" >> +BR2_TARGET_UBOOT_FORMAT_ITB=y >> +BR2_PACKAGE_HOST_DOSFSTOOLS=y >> +BR2_PACKAGE_HOST_GENIMAGE=y >> +BR2_PACKAGE_HOST_MTOOLS=y > > As pointed above this ^^^ file must be in a separate patch and it > deserves also a maintainer. So please you or maybe Luca could add an > entry to DEVELOPERS for this board > >> diff --git a/configs/zynqmp_zcu106_defconfig >> b/configs/zynqmp_zcu106_defconfig index bee7c1daf7..3a6947e1e8 100644 >> --- a/configs/zynqmp_zcu106_defconfig >> +++ b/configs/zynqmp_zcu106_defconfig >> @@ -1,11 +1,11 @@ >> BR2_aarch64=y >> BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" > > Since all patches are gone, this ^^^ is not needed anymore > >> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y >> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y >> BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" >> BR2_LINUX_KERNEL=y >> BR2_LINUX_KERNEL_CUSTOM_GIT=y >> BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" >> -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" >> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2" >> BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" >> BR2_LINUX_KERNEL_DTS_SUPPORT=y >> BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" >> @@ -14,21 +14,22 @@ BR2_TARGET_ROOTFS_EXT2_4=y >> # BR2_TARGET_ROOTFS_TAR is not set >> BR2_TARGET_ARM_TRUSTED_FIRMWARE=y >> BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y >> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" >> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5" >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.4_2021.2" > > It's worth mention in commit log that you're switching from ARM to > Xilinx ATF > >> BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" >> BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" >> -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7" >> -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA" >> +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2" >> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" >> BR2_TARGET_UBOOT_NEEDS_DTC=y >> BR2_TARGET_UBOOT_SPL=y >> BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" >> BR2_TARGET_UBOOT_ZYNQMP=y >> -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/53fdb7b6c92860ceb0ec5fd14deee302f4a84269/bin/pmufw-zcu106-default-v2017.4.bin" >> +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/master/bin/pmufw-v2021.2.bin" >> +BR2_TARGET_UBOOT_FORMAT_ITB=y > > Here ^^^ I see that probably you're switching from .bin to .itb so > better mention it in commit log > >> BR2_PACKAGE_HOST_DOSFSTOOLS=y >> BR2_PACKAGE_HOST_GENIMAGE=y >> BR2_PACKAGE_HOST_MTOOLS=y > > Thank you! > > Best regards > -- > Giulio Benetti > Benetti Engineering sas -- From giulio.benetti at benettiengineering.com Thu Feb 3 14:05:35 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 3 Feb 2022 15:05:35 +0100 Subject: [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2 In-Reply-To: References: Message-ID: Hi Neal, > Il giorno 3 feb 2022, alle ore 14:57, Neal Frager ha scritto: > > ?Hi Giulio, > >> Hi Neal, > >> On 03/02/22 07:24, Neal Frager wrote: >> Hi Giulio, >> >> Thank you very much for your feedback. > >> You're welcome. > >> Please don't top-post, answer inline as you see all around the Mailing List. > >> Also, I don't know if you've read my entire answer. Usually until you don't see "Best regards" and the name of the one who answer, the answer-mail is not finished yet, so simply scroll down until you finish the e-mail. > >> So please check also the rest of my previous e-mail. > > I hope this method of inline answer works. Yes it does work. Only remember to set your client using plain-text only. I?m on mobile now so probably my answer and yours will be in html. But we need plain-text, please check your email client and set plain-text by default. > I have submitted a new set of patches based on the feedback from you and Luca. Could you please have a look and let me know what you think? Sure, I?m going to tonight :-) Also Luca I think will since he?s the maintainer of zynq stuff. Also we?ve sent you the review almost at the same time yesterday :-) Best regards ?- Giulio Benetti Benetti Engineering sas > >> I would be happy to split the zynqmp_zcu102_defconfig off into a second patch. No problem. > >> Fine > >> As for adding comments to the log, could you share the proper git commands for doing this? I would be happy to do it, but I am a bit new to git and I did not know the proper command to use for adding log comments. > >> Luca already pointed you a lot of very useful links. > >> Another tool I like to create patches for me is "git gui" and also "gitk" to scroll the commits in a non-console way. > >> Most of all "git gui" is helpful to me to choose a single line to stage or revert. > >> Best regards > --- >> Giulio Benetti >> Benetti Engineering sas > >> Best regards, >> >> Neal Frager >> Xilinx >> > > Best regards, > Neal Frager > Xilinx > >> -----Original Message----- >> From: Giulio Benetti >> Sent: Wednesday 2 February 2022 23:33 >> To: Neal Frager ; buildroot at buildroot.org >> Cc: luca at lucaceresoli.net; Neal Frager >> Subject: Re: [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump >> ATF/U-Boot/Linux to Xilinx 2021.2 >> >> CAUTION: This message has originated from an External Source. Please use proper judgment and caution when opening attachments, clicking links, or responding to this email. >> >> >> Hi Neal, >> >> nice to see you've made it with git send-email :-), >> >> Here I would improve commit log by stating that you're dropping all >> local patches because they are now upstreamed >> >>> On 02/02/22 17:55, Neal Frager wrote: >>> Signed-off-by: Neal Frager >>> --- >>> board/zynqmp/genimage.cfg | 1 + >>> ...-fix-Remove-GGC-ignore-Warray-bounds.patch | 68 ------- >>> ...64-zynqmp-zcu106-fix-SPL-MMC-booting.patch | 52 ------ >>> ...2-arm64-zynqmp-Enable-booting-to-ATF.patch | 114 ------------ >>> ...ept-an-absolute-path-for-PMUFW_INIT_.patch | 68 ------- >>> ...ynqmp-pass-the-PS-init-file-as-a-kco.patch | 175 ------------------ >>> configs/zynqmp_zcu102_defconfig | 35 ++++ >> >> This ^^^ file is added, so it deserves a second patch after this one, >> basically this becomes a patchset of 2 patches >> >>> configs/zynqmp_zcu106_defconfig | 15 +- >>> 8 files changed, 44 insertions(+), 484 deletions(-) >>> delete mode 100644 board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch >>> delete mode 100644 board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch >>> delete mode 100644 board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch >>> delete mode 100644 board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch >>> delete mode 100644 board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch >>> create mode 100644 configs/zynqmp_zcu102_defconfig >>> >>> diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg >>> index ed202f4550..557364e124 100644 >>> --- a/board/zynqmp/genimage.cfg >>> +++ b/board/zynqmp/genimage.cfg >>> @@ -3,6 +3,7 @@ image boot.vfat { >>> files = { >>> "boot.bin", >>> "u-boot.bin", >>> + "u-boot.itb", >> >> Can you please justify this adding ^^^ in commit log? >> >>> "atf-uboot.ub", >>> "system.dtb", >>> "Image" >>> diff --git >>> a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove- >>> G >>> GC-ignore-Warray-bounds.patch >>> b/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove- >>> G >>> GC-ignore-Warray-bounds.patch >>> deleted file mode 100644 >>> index 0c1a9ba2a4..0000000000 >>> --- >>> a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove- >>> G >>> GC-ignore-Warray-bounds.patch >>> +++ /dev/null >>> @@ -1,68 +0,0 @@ >>> -From da003e6ada7d0217fe99dc7c649a731f8ebd3c34 Mon Sep 17 00:00:00 >>> 2001 >>> -From: Deepika Bhavnani >>> -Date: Thu, 15 Aug 2019 00:56:46 +0300 >>> -Subject: [PATCH] Coverity fix: Remove GGC ignore -Warray-bounds >>> - >>> -GCC diagnostics were added to ignore array boundaries, instead -of >>> ignoring GCC warning current code will check for array boundaries >>> -and perform and array update only for valid elements. >>> - >>> -Resolves: `CID 246574` `CID 246710` `CID 246651` >>> - >>> -Signed-off-by: Deepika Bhavnani >>> -Change-Id: I7530ecf7a1707351c6ee87e90cc3d33574088f57 >>> - >>> -Backported from: 41af05154abe136938bcfb5f26c969933784bbef >>> -[Adapted to apply on 1.5] >>> - >>> ---- >>> - lib/psci/psci_common.c | 20 ++++++++++---------- >>> - 1 file changed, 10 insertions(+), 10 deletions(-) >>> - >>> -diff --git a/lib/psci/psci_common.c b/lib/psci/psci_common.c -index >>> 2220a745cd6e..6282d992a2f0 100644 >>> ---- a/lib/psci/psci_common.c >>> -+++ b/lib/psci/psci_common.c >>> -@@ -188,21 +188,17 @@ static unsigned int >>> get_power_on_target_pwrlvl(void) >>> - >>> /******************************************************************** >>> * >>> ********* >>> - * Helper function to update the requested local power state array. >>> This array >>> - * does not store the requested state for the CPU power level. >>> Hence an >>> -- * assertion is added to prevent us from accessing the wrong index. >>> -+ * assertion is added to prevent us from accessing the CPU power level. >>> - >>> ********************************************************************* >>> * >>> *******/ >>> - static void psci_set_req_local_pwr_state(unsigned int pwrlvl, >>> - unsigned int cpu_idx, >>> - plat_local_state_t req_pwr_state) >>> - { >>> -- /* >>> -- * This should never happen, we have this here to avoid >>> -- * "array subscript is above array bounds" errors in GCC. >>> -- */ >>> - assert(pwrlvl > PSCI_CPU_PWR_LVL); >>> --#pragma GCC diagnostic push >>> --#pragma GCC diagnostic ignored "-Warray-bounds" >>> -- psci_req_local_pwr_states[pwrlvl - 1][cpu_idx] = req_pwr_state; >>> --#pragma GCC diagnostic pop >>> -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && >>> -+ (cpu_idx < PLATFORM_CORE_COUNT)) { >>> -+ psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx] = req_pwr_state; >>> -+ } >>> - } >>> - >>> - >>> /******************************************************************** >>> * >>> ********* -@@ -228,7 +224,11 @@ static plat_local_state_t >>> *psci_get_req_local_pwr_states(unsigned int pwrlvl, >>> - { >>> - assert(pwrlvl > PSCI_CPU_PWR_LVL); >>> - >>> -- return &psci_req_local_pwr_states[pwrlvl - 1][cpu_idx]; >>> -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && >>> -+ (cpu_idx < PLATFORM_CORE_COUNT)) { >>> -+ return &psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx]; >>> -+ } else >>> -+ return NULL; >>> - } >>> - >>> - /* >>> --- >>> -2.34.0 >>> - >>> diff --git >>> a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-boo >>> t >>> ing.patch >>> b/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-boo >>> t >>> ing.patch >>> deleted file mode 100644 >>> index 4d85e1bb12..0000000000 >>> --- >>> a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-boo >>> t >>> ing.patch >>> +++ /dev/null >>> @@ -1,52 +0,0 @@ >>> -From e5d72ed8339eb05285448aad3c89d21e4d18fd29 Mon Sep 17 00:00:00 >>> 2001 >>> -From: Luca Ceresoli >>> -Date: Mon, 26 Feb 2018 09:40:34 +0100 >>> -Subject: [PATCH] arm64: zynqmp: zcu106: fix SPL MMC booting >>> - >>> -The U-Boot SPL generated with the current zcu106 defconfig cannot >>> boot -from MMC: >>> - >>> - [...] >>> - U-Boot SPL 2018.01 (Feb 21 2018 - 17:47:14) >>> - EL Level: EL3 >>> - Trying to boot from MMC1 >>> - sdhci_transfer_data: Error detected in status(0x408020)! >>> - spl_load_image_fat_os: error reading image u-boot.bin, err - -2 >>> - spl_load_image_fat: error reading image u-boot.img, err - -6 >>> - SPL: failed to boot from all boot devices >>> - ### ERROR ### Please RESET the board ### >>> - >>> -Fix by lowering the rpll value. The new value for the RPLL_CTRL >>> -register comes from the current psu_init_gpl.c from the HDF file at >>> -https://github.com/xilinx/hdf-examples/tree/01ad8ea5fd1989abf4ea5a07 >>> 2 >>> d019a16cb2bc546/zcu106-zynqmp >>> -(generated by Vivado v2017.4). >>> - >>> -RPLL and sdio1_ref clocks before and after this change: >>> - >>> - - Old values: RPLL 1.36 GHz, sdio1_ref 272 MHz >>> - - New values: RPLL 1.16 GHz, sdio1_ref 233 MHz >>> - >>> -Signed-off-by: Luca Ceresoli >>> -Cc: Michal Simek >>> -Upstream-status: accepted upstream in a different form >>> ---- >>> - >>> - board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c | 2 +- >>> - 1 file changed, 1 insertion(+), 1 deletion(-) >>> - >>> -diff --git a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c >>> b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c >>> -index 4d18abe000ca..e6fa477e53e7 100644 >>> ---- a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c >>> -+++ b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c >>> -@@ -10,7 +10,7 @@ >>> - static unsigned long psu_pll_init_data(void) >>> - { >>> - psu_mask_write(0xFF5E0034, 0xFE7FEDEFU, 0x7E4E2C62U); >>> -- psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00013C00U); >>> -+ psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00014600U); >>> - psu_mask_write(0xFF5E0030, 0x00000008U, 0x00000008U); >>> - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000001U); >>> - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000000U); >>> --- >>> -2.7.4 >>> - >>> diff --git >>> a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF. >>> p >>> atch >>> b/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF. >>> p >>> atch >>> deleted file mode 100644 >>> index 487fff6812..0000000000 >>> --- >>> a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF. >>> p >>> atch >>> +++ /dev/null >>> @@ -1,114 +0,0 @@ >>> -From 5e3cac50cc981e01d9072241035a8d4162560c71 Mon Sep 17 00:00:00 >>> 2001 >>> -From: Luca Ceresoli >>> -Date: Mon, 12 Mar 2018 17:18:38 +0100 >>> -Subject: [PATCH] arm64: zynqmp: Enable booting to ATF >>> - >>> -U-Boot is now able to boot to ARM Trusted Firmware (ATF). The boot >>> -flow is SPL(EL3) loads ATF and full u-boot and jump to ATF(EL3) >>> which -pass control to full u-boot(EL2). This has been tested on >>> zcu106, so -enable it in this defconfig. >>> - >>> -To generate an image that triggers this booting flow, you need to >>> pass -'-O arm-trusted-firmware' to mkimage. >>> - >>> -Signed-off-by: Luca Ceresoli >>> -Signed-off-by: Michal Simek -Backported >>> from upstream: >>> http://git.denx.de/?p=u-boot.git;a=commit;h=5e3cac50cc981e01d90722410 >>> 3 >>> 5a8d4162560c71 >>> ---- >>> - >>> - configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 + >>> - configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 + >>> - configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 + >>> - configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 + >>> - configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 1 + >>> - configs/xilinx_zynqmp_zcu102_revA_defconfig | 1 + >>> - configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 + >>> - 7 files changed, 7 insertions(+) >>> - >>> -diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig >>> b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig >>> -index c5bfa2b12638..488c72258b0e 100644 >>> ---- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig >>> -+++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig >>> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >>> - CONFIG_SPL_OS_BOOT=y >>> - CONFIG_SPL_RAM_SUPPORT=y >>> - CONFIG_SPL_RAM_DEVICE=y >>> -+CONFIG_SPL_ATF=y >>> - CONFIG_SYS_PROMPT="ZynqMP> " >>> - CONFIG_FASTBOOT=y >>> - CONFIG_FASTBOOT_FLASH=y >>> -diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig >>> b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig >>> -index f86dce403a42..5d501eec0edd 100644 >>> ---- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig >>> -+++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig >>> -@@ -20,6 +20,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >>> - CONFIG_SPL_OS_BOOT=y >>> - CONFIG_SPL_RAM_SUPPORT=y >>> - CONFIG_SPL_RAM_DEVICE=y >>> -+CONFIG_SPL_ATF=y >>> - CONFIG_SYS_PROMPT="ZynqMP> " >>> - CONFIG_FASTBOOT=y >>> - CONFIG_FASTBOOT_FLASH=y >>> -diff --git a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig >>> b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig >>> -index 6e947cf56827..6f7eaebd7676 100644 >>> ---- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig >>> -+++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig >>> -@@ -16,6 +16,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >>> - CONFIG_SPL_OS_BOOT=y >>> - CONFIG_SPL_RAM_SUPPORT=y >>> - CONFIG_SPL_RAM_DEVICE=y >>> -+CONFIG_SPL_ATF=y >>> - CONFIG_SYS_PROMPT="ZynqMP> " >>> - CONFIG_CMD_MEMTEST=y >>> - CONFIG_SYS_ALT_MEMTEST=y >>> -diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig >>> b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig >>> -index 1c934858c61c..7a3806cba4b5 100644 >>> ---- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig >>> -+++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig >>> -@@ -17,6 +17,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >>> - CONFIG_SPL_OS_BOOT=y >>> - CONFIG_SPL_RAM_SUPPORT=y >>> - CONFIG_SPL_RAM_DEVICE=y >>> -+CONFIG_SPL_ATF=y >>> - CONFIG_SYS_PROMPT="ZynqMP> " >>> - CONFIG_CMD_MEMTEST=y >>> - CONFIG_SYS_ALT_MEMTEST=y >>> -diff --git a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig >>> b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig >>> -index e13c7c56f310..e4408f182ca0 100644 >>> ---- a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig >>> -+++ b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig >>> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >>> - CONFIG_SPL_OS_BOOT=y >>> - CONFIG_SPL_RAM_SUPPORT=y >>> - CONFIG_SPL_RAM_DEVICE=y >>> -+CONFIG_SPL_ATF=y >>> - CONFIG_SYS_PROMPT="ZynqMP> " >>> - CONFIG_FASTBOOT=y >>> - CONFIG_FASTBOOT_FLASH=y >>> -diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig >>> b/configs/xilinx_zynqmp_zcu102_revA_defconfig >>> -index 5b2cd495ee85..b52f6789fd4b 100644 >>> ---- a/configs/xilinx_zynqmp_zcu102_revA_defconfig >>> -+++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig >>> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >>> - CONFIG_SPL_OS_BOOT=y >>> - CONFIG_SPL_RAM_SUPPORT=y >>> - CONFIG_SPL_RAM_DEVICE=y >>> -+CONFIG_SPL_ATF=y >>> - CONFIG_SYS_PROMPT="ZynqMP> " >>> - CONFIG_FASTBOOT=y >>> - CONFIG_FASTBOOT_FLASH=y >>> -diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig >>> b/configs/xilinx_zynqmp_zcu102_revB_defconfig >>> -index e6530fbfe7ff..80592554f682 100644 >>> ---- a/configs/xilinx_zynqmp_zcu102_revB_defconfig >>> -+++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig >>> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >>> - CONFIG_SPL_OS_BOOT=y >>> - CONFIG_SPL_RAM_SUPPORT=y >>> - CONFIG_SPL_RAM_DEVICE=y >>> -+CONFIG_SPL_ATF=y >>> - CONFIG_SYS_PROMPT="ZynqMP> " >>> - CONFIG_FASTBOOT=y >>> - CONFIG_FASTBOOT_FLASH=y >>> --- >>> -2.7.4 >>> - >>> diff --git >>> a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-pat >>> h >>> -for-PMUFW_INIT_.patch >>> b/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-pat >>> h >>> -for-PMUFW_INIT_.patch >>> deleted file mode 100644 >>> index 95ab7b3b75..0000000000 >>> --- >>> a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-pat >>> h >>> -for-PMUFW_INIT_.patch >>> +++ /dev/null >>> @@ -1,68 +0,0 @@ >>> -From c7df098a71e05dc81cee818747759e8060b59626 Mon Sep 17 00:00:00 >>> 2001 >>> -From: Luca Ceresoli >>> -Date: Mon, 4 Jun 2018 12:21:01 +0200 >>> -Subject: [PATCH] arm64: zynqmp: accept an absolute path for >>> PMUFW_INIT_FILE >>> - >>> -The value of PMUFW_INIT_FILE is prefixed with "$(srctree)/", thus >>> -forcing it to be a relative path inside the U-Boot source tree. >>> Since -the PMUFW is a binary file generated outside of U-Boot, the >>> PMUFW -binary must be copied inside the U-Boot source tree before the >>> -build. >>> - >>> -This generates a few problems: >>> - >>> - * if the source tree is shared among different out-of-tree builds, >>> - they will pollute (and potentially corrupt) each other >>> - * the source tree cannot be read-only >>> - * any buildsystem must add a command to copy the PMUFW binary >>> - * putting an externally-generated binary in the source tree is ugly >>> - as hell >>> - >>> -Avoid these problems by accepting an absolute path for >>> -PMUFW_INIT_FILE. This would be as simple as removing the "$(srctree)/" >>> -prefix, but in order to keep backward compatibility we rather use >>> the -shell and readlink to get the absolute path even when starting >>> from a -relative path. >>> - >>> -Since 'readlink -f' produces an empty string if the file does not >>> -exist, we also add a check to ensure the file configured in >>> -PMUFW_INIT_FILE exists. Otherwise the build would exit successfully, >>> -but produce a boot.bin without PMUFW as if PMUFW_INIT_FILE were empty. >>> - >>> -Tested in the 12 possible combinations of: >>> - - PMUFW_INIT_FILE empty, relative, absolute, non-existing >>> - - building in-tree, in subdir, in other directory >>> - >>> -Signed-off-by: Luca Ceresoli >>> -Cc: Michal Simek >>> -Cc: Simon Glass >>> -Cc: Emmanuel Vadot >>> -Signed-off-by: Michal Simek -Backported >>> from upstream: >>> https://git.denx.de/?p=u-boot.git;a=commit;h=c7df098a71e05dc81cee8187 >>> 4 >>> 7759e8060b59626 >>> ---- >>> - scripts/Makefile.spl | 8 +++++++- >>> - 1 file changed, 7 insertions(+), 1 deletion(-) >>> - >>> -diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl -index >>> ef018b5b4056..252f13826d4c 100644 >>> ---- a/scripts/Makefile.spl >>> -+++ b/scripts/Makefile.spl >>> -@@ -167,8 +167,14 @@ ifdef CONFIG_ARCH_ZYNQ >>> - MKIMAGEFLAGS_boot.bin = -T zynqimage -R >>> $(srctree)/$(CONFIG_BOOT_INIT_FILE) >>> - endif >>> - ifdef CONFIG_ARCH_ZYNQMP >>> -+ifneq ($(CONFIG_PMUFW_INIT_FILE),"") >>> -+spl/boot.bin: zynqmp-check-pmufw >>> -+zynqmp-check-pmufw: FORCE >>> -+ ( cd $(srctree) && test -r $(CONFIG_PMUFW_INIT_FILE) ) \ >>> -+ || ( echo "Cannot read $(CONFIG_PMUFW_INIT_FILE)" && >>> -+false ) endif >>> - MKIMAGEFLAGS_boot.bin = -T zynqmpimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) \ >>> -- -n $(srctree)/$(CONFIG_PMUFW_INIT_FILE) >>> -+ -n "$(shell cd $(srctree); readlink -f $(CONFIG_PMUFW_INIT_FILE))" >>> - endif >>> - >>> - spl/boot.bin: $(obj)/u-boot-spl.bin FORCE >>> --- >>> -2.7.4 >>> - >>> diff --git >>> a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-i >>> n >>> it-file-as-a-kco.patch >>> b/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-i >>> n >>> it-file-as-a-kco.patch >>> deleted file mode 100644 >>> index b32e162780..0000000000 >>> --- >>> a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-i >>> n >>> it-file-as-a-kco.patch >>> +++ /dev/null >>> @@ -1,175 +0,0 @@ >>> -From 4c9d54ab5a41d65000c8d249b6fb1b76056f1812 Mon Sep 17 00:00:00 >>> 2001 >>> -From: Luca Ceresoli >>> -Date: Wed, 20 Jun 2018 12:11:50 +0200 >>> -Subject: [PATCH] arm/arm64: zynq/zynqmp: pass the PS init file as a >>> kconfig >>> - variable >>> - >>> -U-Boot needs to link ps7_init_gpl.c on Zynq or psu_init_gpl.c on >>> -ZynqMP (PS init for short). The current logic to locate this file >>> for -both platforms is: >>> - >>> - 1. if a board-specific file exists in >>> - board/xilinx/zynq[mp]/$(CONFIG_DEFAULT_DEVICE_TREE)/ps?_init_gpl.c >>> - then use it >>> - 2. otherwise use board/xilinx/zynq/ps?_init_gpl.c >>> - >>> -In the latter case the file does not exist in the U-Boot sources and >>> -must be copied in the source tree from the outside before starting >>> the -build. This is typical when it is generated from Xilinx tools >>> while -developing a custom hardware. However making sure that a >>> -board-specific file is _not_ found (and used) requires some trickery >>> -such as removing or overwriting all PS init files (e.g.: the current >>> -meta-xilinx yocto layer [0]). >>> - >>> -This generates a few problems: >>> - >>> - * if the source tree is shared among different out-of-tree builds, >>> - they will pollute (and potentially corrupt) each other >>> - * the source tree cannot be read-only >>> - * any buildsystem must add a command to copy the PS init file >>> binary >>> - * overwriting or deleting files in the source tree is ugly as hell >>> - >>> -Simplify usage by allowing to pass the path to the desired PS init >>> -file in kconfig variable XILINX_PS_INIT_FILE. It can be an absolute >>> -path or relative to $(srctree). If the variable is set, the >>> -user-specified file will always be used without being copied -around. >>> If the the variable is left empty, for backward compatibility -fall >>> back to the old behaviour. >>> - >>> -Since the issue is the same for Zynq and ZynqMP, add one kconfig >>> -variable in a common place and use it for both. >>> - >>> -Also use the new kconfig help text to document all the ways to give >>> -U-Boot the PS init file. >>> - >>> -Build-tested with all combinations of: >>> - - platform: zynq or zynqmp >>> - - PS init file: from XILINX_PS_INIT_FILE (absolute, relative path, >>> - non-existing), in-tree board-specific, in board/xilinx/zynq[mp]/ >>> - - building in-tree, in subdir, in other directory >>> - >>> -[0] >>> https://github.com/Xilinx/meta-xilinx/blob/b2f74cc7fe5c4881589d5e440a >>> 1 >>> 7cb51fc66a7ab/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init. >>> inc#L9 >>> - >>> -Signed-off-by: Luca Ceresoli >>> -Cc: Albert Aribaud >>> -Cc: Michal Simek >>> -Cc: Nathan Rossi -Backported from upstream: >>> https://git.denx.de/?p=u-boot.git;a=commit;h=6da4f67ad09cd8b311d77b2b >>> 0 >>> 4e557b7ef65b56c >>> ---- >>> - arch/arm/Kconfig | 1 + >>> - board/xilinx/Kconfig | 41 +++++++++++++++++++++++++++++++++++++++++ >>> - board/xilinx/zynq/Makefile | 10 +++++++++- >>> - board/xilinx/zynqmp/Makefile | 10 +++++++++- >>> - 4 files changed, 60 insertions(+), 2 deletions(-) >>> - create mode 100644 board/xilinx/Kconfig >>> - >>> -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index >>> 22234cde2ab6..e04979d0ef7e 100644 >>> ---- a/arch/arm/Kconfig >>> -+++ b/arch/arm/Kconfig >>> -@@ -1293,4 +1293,5 @@ source "board/technologic/ts4600/Kconfig" >>> - source "board/vscom/baltos/Kconfig" >>> - source "board/woodburn/Kconfig" >>> - source "board/work-microwave/work_92105/Kconfig" >>> -+source "board/xilinx/Kconfig" >>> - source "board/zipitz2/Kconfig" >>> - >>> - source "arch/arm/Kconfig.debug" >>> -diff --git a/board/xilinx/Kconfig b/board/xilinx/Kconfig -new file >>> mode 100644 -index 000000000000..aa3fa061edef >>> ---- /dev/null >>> -+++ b/board/xilinx/Kconfig >>> -@@ -0,0 +1,41 @@ >>> -+# Copyright (c) 2018, Luca Ceresoli # # >>> -+SPDX-License-Identifier: GPL-2.0 >>> -+ >>> -+if ARCH_ZYNQ || ARCH_ZYNQMP >>> -+ >>> -+config XILINX_PS_INIT_FILE >>> -+ string "Zynq/ZynqMP PS init file(s) location" >>> -+ help >>> -+ On Zynq and ZynqMP U-Boot SPL (or U-Boot proper if >>> -+ ZYNQMP_PSU_INIT_ENABLED is set) is responsible for some >>> -+ basic initializations, such as enabling peripherals and >>> -+ configuring pinmuxes. The PS init file (called >>> -+ psu_init_gpl.c on ZynqMP, ps7_init_gpl.c for Zynq-7000) >>> -+ contains the code for such initializations. >>> -+ >>> -+ U-Boot contains PS init files for some boards, but each of >>> -+ them describes only one specific configuration. Users of a >>> -+ different board, or needing a different configuration, can >>> -+ generate custom files using the Xilinx development tools. >>> -+ >>> -+ There are three ways to give a PS init file to U-Boot: >>> -+ >>> -+ 1. Set this variable to the path, either relative to the >>> -+ source tree or absolute, where the psu_init_gpl.c or >>> -+ ps7_init_gpl.c file is located. U-Boot will build this >>> -+ file. >>> -+ >>> -+ 2. If you leave an empty string here, U-Boot will use >>> -+ board/xilinx/zynq/$(CONFIG_DEFAULT_DEVICE_TREE)/ps7_init_gpl.c >>> -+ for Zynq-7000, or >>> -+ board/xilinx/zynqmp/$(CONFIG_DEFAULT_DEVICE_TREE)/psu_init_gpl.c >>> -+ for ZynqMP. >>> -+ >>> -+ 3. If the above file does not exist, U-Boot will use >>> -+ board/xilinx/zynq/ps7_init_gpl.c for Zynq-7000, or >>> -+ board/xilinx/zynqmp/psu_init_gpl.c for ZynqMP. This file >>> -+ is not provided by U-Boot, you have to copy it there >>> -+ before the build. >>> -+ >>> -+endif >>> -diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile >>> -index 5a76a26720cd..03ad5f0532ee 100644 >>> ---- a/board/xilinx/zynq/Makefile >>> -+++ b/board/xilinx/zynq/Makefile >>> -@@ -5,10 +5,18 @@ >>> - >>> - obj-y := board.o >>> - >>> --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) >>> -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") >>> -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f >>> -+$(CONFIG_XILINX_PS_INIT_FILE)) init-objs := ps_init_gpl.o >>> -+spl/board/xilinx/zynq/ps_init_gpl.o board/xilinx/zynq/ps_init_gpl.o: $(PS_INIT_FILE) >>> -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ endif >>> - >>> -+ifeq ($(init-objs),) >>> -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) >>> - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/ps7_init_gpl.c),\ >>> - $(hw-platform-y)/ps7_init_gpl.o) >>> -+endif >>> - >>> - ifeq ($(init-objs),) >>> - ifneq ($(wildcard $(srctree)/$(src)/ps7_init_gpl.c),) >>> -diff --git a/board/xilinx/zynqmp/Makefile >>> b/board/xilinx/zynqmp/Makefile -index 05ccd25dcef3..960b81fc5853 >>> 100644 >>> ---- a/board/xilinx/zynqmp/Makefile >>> -+++ b/board/xilinx/zynqmp/Makefile >>> -@@ -5,10 +5,18 @@ >>> - >>> - obj-y := zynqmp.o >>> - >>> --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) >>> -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") >>> -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f >>> -+$(CONFIG_XILINX_PS_INIT_FILE)) init-objs := ps_init_gpl.o >>> -+spl/board/xilinx/zynqmp/ps_init_gpl.o board/xilinx/zynqmp/ps_init_gpl.o: $(PS_INIT_FILE) >>> -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ endif >>> - >>> -+ifeq ($(init-objs),) >>> -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) >>> - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/psu_init_gpl.c),\ >>> - $(hw-platform-y)/psu_init_gpl.o) >>> -+endif >>> - >>> - ifeq ($(init-objs),) >>> - ifneq ($(wildcard $(srctree)/$(src)/psu_init_gpl.c),) >>> --- >>> -2.7.4 >>> - >>> diff --git a/configs/zynqmp_zcu102_defconfig >>> b/configs/zynqmp_zcu102_defconfig new file mode 100644 index >>> 0000000000..336f5c2dbe >>> --- /dev/null >>> +++ b/configs/zynqmp_zcu102_defconfig >>> @@ -0,0 +1,35 @@ >>> +BR2_aarch64=y >>> +BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" >>> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y >>> +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" >>> +BR2_LINUX_KERNEL=y >>> +BR2_LINUX_KERNEL_CUSTOM_GIT=y >>> +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" >>> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2" >>> +BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" >>> +BR2_LINUX_KERNEL_DTS_SUPPORT=y >>> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" >>> +BR2_TARGET_ROOTFS_EXT2=y >>> +BR2_TARGET_ROOTFS_EXT2_4=y >>> +# BR2_TARGET_ROOTFS_TAR is not set >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.4_2021.2" >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" >>> +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2" >>> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" >>> +BR2_TARGET_UBOOT_NEEDS_DTC=y >>> +BR2_TARGET_UBOOT_SPL=y >>> +BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" >>> +BR2_TARGET_UBOOT_ZYNQMP=y >>> +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/master/bin/pmufw-v2021.2.bin" >>> +BR2_TARGET_UBOOT_FORMAT_ITB=y >>> +BR2_PACKAGE_HOST_DOSFSTOOLS=y >>> +BR2_PACKAGE_HOST_GENIMAGE=y >>> +BR2_PACKAGE_HOST_MTOOLS=y >> >> As pointed above this ^^^ file must be in a separate patch and it >> deserves also a maintainer. So please you or maybe Luca could add an >> entry to DEVELOPERS for this board >> >>> diff --git a/configs/zynqmp_zcu106_defconfig >>> b/configs/zynqmp_zcu106_defconfig index bee7c1daf7..3a6947e1e8 100644 >>> --- a/configs/zynqmp_zcu106_defconfig >>> +++ b/configs/zynqmp_zcu106_defconfig >>> @@ -1,11 +1,11 @@ >>> BR2_aarch64=y >>> BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" >> >> Since all patches are gone, this ^^^ is not needed anymore >> >>> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y >>> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y >>> BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" >>> BR2_LINUX_KERNEL=y >>> BR2_LINUX_KERNEL_CUSTOM_GIT=y >>> BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" >>> -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" >>> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2" >>> BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" >>> BR2_LINUX_KERNEL_DTS_SUPPORT=y >>> BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" >>> @@ -14,21 +14,22 @@ BR2_TARGET_ROOTFS_EXT2_4=y >>> # BR2_TARGET_ROOTFS_TAR is not set >>> BR2_TARGET_ARM_TRUSTED_FIRMWARE=y >>> BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y >>> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" >>> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5" >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.4_2021.2" >> >> It's worth mention in commit log that you're switching from ARM to >> Xilinx ATF >> >>> BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" >>> BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" >>> -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7" >>> -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA" >>> +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2" >>> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" >>> BR2_TARGET_UBOOT_NEEDS_DTC=y >>> BR2_TARGET_UBOOT_SPL=y >>> BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" >>> BR2_TARGET_UBOOT_ZYNQMP=y >>> -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/53fdb7b6c92860ceb0ec5fd14deee302f4a84269/bin/pmufw-zcu106-default-v2017.4.bin" >>> +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/master/bin/pmufw-v2021.2.bin" >>> +BR2_TARGET_UBOOT_FORMAT_ITB=y >> >> Here ^^^ I see that probably you're switching from .bin to .itb so >> better mention it in commit log >> >>> BR2_PACKAGE_HOST_DOSFSTOOLS=y >>> BR2_PACKAGE_HOST_GENIMAGE=y >>> BR2_PACKAGE_HOST_MTOOLS=y >> >> Thank you! >> >> Best regards >> -- >> Giulio Benetti >> Benetti Engineering sas > > -- > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > From nealf at xilinx.com Thu Feb 3 14:09:44 2022 From: nealf at xilinx.com (Neal Frager) Date: Thu, 3 Feb 2022 14:09:44 +0000 Subject: [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2 In-Reply-To: References: Message-ID: Hi Giulio, > Hi Neal, > Il giorno 3 feb 2022, alle ore 14:57, Neal Frager ha scritto: > > ?Hi Giulio, > >> Hi Neal, > >> On 03/02/22 07:24, Neal Frager wrote: >> Hi Giulio, >> >> Thank you very much for your feedback. > >> You're welcome. > >> Please don't top-post, answer inline as you see all around the Mailing List. > >> Also, I don't know if you've read my entire answer. Usually until you don't see "Best regards" and the name of the one who answer, the answer-mail is not finished yet, so simply scroll down until you finish the e-mail. > >> So please check also the rest of my previous e-mail. > > I hope this method of inline answer works. > Yes it does work. Only remember to set your client using plain-text only. I?m on mobile now so probably my answer and yours will be in html. > But we need plain-text, please check your email client and set plain-text by default. As far as I can tell, my replies are already in plain-text by default. Let me know if you catch a message where that is not the case. > I have submitted a new set of patches based on the feedback from you and Luca. Could you please have a look and let me know what you think? > Sure, I?m going to tonight :-) > Also Luca I think will since he?s the maintainer of zynq stuff. > Also we?ve sent you the review almost at the same time yesterday :-) > Best regards > ? - > Giulio Benetti > Benetti Engineering sas I look forward to your feedback. Best regards, Neal Frager > >> I would be happy to split the zynqmp_zcu102_defconfig off into a second patch. No problem. > >> Fine > >> As for adding comments to the log, could you share the proper git commands for doing this? I would be happy to do it, but I am a bit new to git and I did not know the proper command to use for adding log comments. > >> Luca already pointed you a lot of very useful links. > >> Another tool I like to create patches for me is "git gui" and also "gitk" to scroll the commits in a non-console way. > >> Most of all "git gui" is helpful to me to choose a single line to stage or revert. > >> Best regards > --- >> Giulio Benetti >> Benetti Engineering sas > >> Best regards, >> >> Neal Frager >> Xilinx >> > > Best regards, > Neal Frager > Xilinx > >> -----Original Message----- >> From: Giulio Benetti >> Sent: Wednesday 2 February 2022 23:33 >> To: Neal Frager ; buildroot at buildroot.org >> Cc: luca at lucaceresoli.net; Neal Frager >> Subject: Re: [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump >> ATF/U-Boot/Linux to Xilinx 2021.2 >> >> CAUTION: This message has originated from an External Source. Please use proper judgment and caution when opening attachments, clicking links, or responding to this email. >> >> >> Hi Neal, >> >> nice to see you've made it with git send-email :-), >> >> Here I would improve commit log by stating that you're dropping all >> local patches because they are now upstreamed >> >>> On 02/02/22 17:55, Neal Frager wrote: >>> Signed-off-by: Neal Frager >>> --- >>> board/zynqmp/genimage.cfg | 1 + >>> ...-fix-Remove-GGC-ignore-Warray-bounds.patch | 68 ------- >>> ...64-zynqmp-zcu106-fix-SPL-MMC-booting.patch | 52 ------ >>> ...2-arm64-zynqmp-Enable-booting-to-ATF.patch | 114 ------------ >>> ...ept-an-absolute-path-for-PMUFW_INIT_.patch | 68 ------- >>> ...ynqmp-pass-the-PS-init-file-as-a-kco.patch | 175 ------------------ >>> configs/zynqmp_zcu102_defconfig | 35 ++++ >> >> This ^^^ file is added, so it deserves a second patch after this one, >> basically this becomes a patchset of 2 patches >> >>> configs/zynqmp_zcu106_defconfig | 15 +- >>> 8 files changed, 44 insertions(+), 484 deletions(-) >>> delete mode 100644 board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch >>> delete mode 100644 board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch >>> delete mode 100644 board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch >>> delete mode 100644 board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch >>> delete mode 100644 board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch >>> create mode 100644 configs/zynqmp_zcu102_defconfig >>> >>> diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg >>> index ed202f4550..557364e124 100644 >>> --- a/board/zynqmp/genimage.cfg >>> +++ b/board/zynqmp/genimage.cfg >>> @@ -3,6 +3,7 @@ image boot.vfat { >>> files = { >>> "boot.bin", >>> "u-boot.bin", >>> + "u-boot.itb", >> >> Can you please justify this adding ^^^ in commit log? >> >>> "atf-uboot.ub", >>> "system.dtb", >>> "Image" >>> diff --git >>> a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove >>> - >>> G >>> GC-ignore-Warray-bounds.patch >>> b/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove >>> - >>> G >>> GC-ignore-Warray-bounds.patch >>> deleted file mode 100644 >>> index 0c1a9ba2a4..0000000000 >>> --- >>> a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove >>> - >>> G >>> GC-ignore-Warray-bounds.patch >>> +++ /dev/null >>> @@ -1,68 +0,0 @@ >>> -From da003e6ada7d0217fe99dc7c649a731f8ebd3c34 Mon Sep 17 00:00:00 >>> 2001 >>> -From: Deepika Bhavnani >>> -Date: Thu, 15 Aug 2019 00:56:46 +0300 >>> -Subject: [PATCH] Coverity fix: Remove GGC ignore -Warray-bounds >>> - >>> -GCC diagnostics were added to ignore array boundaries, instead -of >>> ignoring GCC warning current code will check for array boundaries >>> -and perform and array update only for valid elements. >>> - >>> -Resolves: `CID 246574` `CID 246710` `CID 246651` >>> - >>> -Signed-off-by: Deepika Bhavnani >>> -Change-Id: I7530ecf7a1707351c6ee87e90cc3d33574088f57 >>> - >>> -Backported from: 41af05154abe136938bcfb5f26c969933784bbef >>> -[Adapted to apply on 1.5] >>> - >>> ---- >>> - lib/psci/psci_common.c | 20 ++++++++++---------- >>> - 1 file changed, 10 insertions(+), 10 deletions(-) >>> - >>> -diff --git a/lib/psci/psci_common.c b/lib/psci/psci_common.c -index >>> 2220a745cd6e..6282d992a2f0 100644 >>> ---- a/lib/psci/psci_common.c >>> -+++ b/lib/psci/psci_common.c >>> -@@ -188,21 +188,17 @@ static unsigned int >>> get_power_on_target_pwrlvl(void) >>> - >>> /******************************************************************* >>> * >>> * >>> ********* >>> - * Helper function to update the requested local power state array. >>> This array >>> - * does not store the requested state for the CPU power level. >>> Hence an >>> -- * assertion is added to prevent us from accessing the wrong index. >>> -+ * assertion is added to prevent us from accessing the CPU power level. >>> - >>> ******************************************************************** >>> * >>> * >>> *******/ >>> - static void psci_set_req_local_pwr_state(unsigned int pwrlvl, >>> - unsigned int cpu_idx, >>> - plat_local_state_t req_pwr_state) >>> - { >>> -- /* >>> -- * This should never happen, we have this here to avoid >>> -- * "array subscript is above array bounds" errors in GCC. >>> -- */ >>> - assert(pwrlvl > PSCI_CPU_PWR_LVL); >>> --#pragma GCC diagnostic push >>> --#pragma GCC diagnostic ignored "-Warray-bounds" >>> -- psci_req_local_pwr_states[pwrlvl - 1][cpu_idx] = req_pwr_state; >>> --#pragma GCC diagnostic pop >>> -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && >>> -+ (cpu_idx < PLATFORM_CORE_COUNT)) { >>> -+ psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx] = req_pwr_state; >>> -+ } >>> - } >>> - >>> - >>> /******************************************************************* >>> * >>> * >>> ********* -@@ -228,7 +224,11 @@ static plat_local_state_t >>> *psci_get_req_local_pwr_states(unsigned int pwrlvl, >>> - { >>> - assert(pwrlvl > PSCI_CPU_PWR_LVL); >>> - >>> -- return &psci_req_local_pwr_states[pwrlvl - 1][cpu_idx]; >>> -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && >>> -+ (cpu_idx < PLATFORM_CORE_COUNT)) { >>> -+ return &psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx]; >>> -+ } else >>> -+ return NULL; >>> - } >>> - >>> - /* >>> --- >>> -2.34.0 >>> - >>> diff --git >>> a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-bo >>> o >>> t >>> ing.patch >>> b/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-bo >>> o >>> t >>> ing.patch >>> deleted file mode 100644 >>> index 4d85e1bb12..0000000000 >>> --- >>> a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-bo >>> o >>> t >>> ing.patch >>> +++ /dev/null >>> @@ -1,52 +0,0 @@ >>> -From e5d72ed8339eb05285448aad3c89d21e4d18fd29 Mon Sep 17 00:00:00 >>> 2001 >>> -From: Luca Ceresoli >>> -Date: Mon, 26 Feb 2018 09:40:34 +0100 >>> -Subject: [PATCH] arm64: zynqmp: zcu106: fix SPL MMC booting >>> - >>> -The U-Boot SPL generated with the current zcu106 defconfig cannot >>> boot -from MMC: >>> - >>> - [...] >>> - U-Boot SPL 2018.01 (Feb 21 2018 - 17:47:14) >>> - EL Level: EL3 >>> - Trying to boot from MMC1 >>> - sdhci_transfer_data: Error detected in status(0x408020)! >>> - spl_load_image_fat_os: error reading image u-boot.bin, err - -2 >>> - spl_load_image_fat: error reading image u-boot.img, err - -6 >>> - SPL: failed to boot from all boot devices >>> - ### ERROR ### Please RESET the board ### >>> - >>> -Fix by lowering the rpll value. The new value for the RPLL_CTRL >>> -register comes from the current psu_init_gpl.c from the HDF file at >>> -https://github.com/xilinx/hdf-examples/tree/01ad8ea5fd1989abf4ea5a0 >>> 7 >>> 2 >>> d019a16cb2bc546/zcu106-zynqmp >>> -(generated by Vivado v2017.4). >>> - >>> -RPLL and sdio1_ref clocks before and after this change: >>> - >>> - - Old values: RPLL 1.36 GHz, sdio1_ref 272 MHz >>> - - New values: RPLL 1.16 GHz, sdio1_ref 233 MHz >>> - >>> -Signed-off-by: Luca Ceresoli >>> -Cc: Michal Simek >>> -Upstream-status: accepted upstream in a different form >>> ---- >>> - >>> - board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c | 2 +- >>> - 1 file changed, 1 insertion(+), 1 deletion(-) >>> - >>> -diff --git a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c >>> b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c >>> -index 4d18abe000ca..e6fa477e53e7 100644 >>> ---- a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c >>> -+++ b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c >>> -@@ -10,7 +10,7 @@ >>> - static unsigned long psu_pll_init_data(void) >>> - { >>> - psu_mask_write(0xFF5E0034, 0xFE7FEDEFU, 0x7E4E2C62U); >>> -- psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00013C00U); >>> -+ psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00014600U); >>> - psu_mask_write(0xFF5E0030, 0x00000008U, 0x00000008U); >>> - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000001U); >>> - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000000U); >>> --- >>> -2.7.4 >>> - >>> diff --git >>> a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF. >>> p >>> atch >>> b/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF. >>> p >>> atch >>> deleted file mode 100644 >>> index 487fff6812..0000000000 >>> --- >>> a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF. >>> p >>> atch >>> +++ /dev/null >>> @@ -1,114 +0,0 @@ >>> -From 5e3cac50cc981e01d9072241035a8d4162560c71 Mon Sep 17 00:00:00 >>> 2001 >>> -From: Luca Ceresoli >>> -Date: Mon, 12 Mar 2018 17:18:38 +0100 >>> -Subject: [PATCH] arm64: zynqmp: Enable booting to ATF >>> - >>> -U-Boot is now able to boot to ARM Trusted Firmware (ATF). The boot >>> -flow is SPL(EL3) loads ATF and full u-boot and jump to ATF(EL3) >>> which -pass control to full u-boot(EL2). This has been tested on >>> zcu106, so -enable it in this defconfig. >>> - >>> -To generate an image that triggers this booting flow, you need to >>> pass -'-O arm-trusted-firmware' to mkimage. >>> - >>> -Signed-off-by: Luca Ceresoli >>> -Signed-off-by: Michal Simek -Backported >>> from upstream: >>> http://git.denx.de/?p=u-boot.git;a=commit;h=5e3cac50cc981e01d9072241 >>> 0 >>> 3 >>> 5a8d4162560c71 >>> ---- >>> - >>> - configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 + >>> - configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 + >>> - configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 + >>> - configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 + >>> - configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 1 + >>> - configs/xilinx_zynqmp_zcu102_revA_defconfig | 1 + >>> - configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 + >>> - 7 files changed, 7 insertions(+) >>> - >>> -diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig >>> b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig >>> -index c5bfa2b12638..488c72258b0e 100644 >>> ---- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig >>> -+++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig >>> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >>> - CONFIG_SPL_OS_BOOT=y >>> - CONFIG_SPL_RAM_SUPPORT=y >>> - CONFIG_SPL_RAM_DEVICE=y >>> -+CONFIG_SPL_ATF=y >>> - CONFIG_SYS_PROMPT="ZynqMP> " >>> - CONFIG_FASTBOOT=y >>> - CONFIG_FASTBOOT_FLASH=y >>> -diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig >>> b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig >>> -index f86dce403a42..5d501eec0edd 100644 >>> ---- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig >>> -+++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig >>> -@@ -20,6 +20,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >>> - CONFIG_SPL_OS_BOOT=y >>> - CONFIG_SPL_RAM_SUPPORT=y >>> - CONFIG_SPL_RAM_DEVICE=y >>> -+CONFIG_SPL_ATF=y >>> - CONFIG_SYS_PROMPT="ZynqMP> " >>> - CONFIG_FASTBOOT=y >>> - CONFIG_FASTBOOT_FLASH=y >>> -diff --git a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig >>> b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig >>> -index 6e947cf56827..6f7eaebd7676 100644 >>> ---- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig >>> -+++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig >>> -@@ -16,6 +16,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >>> - CONFIG_SPL_OS_BOOT=y >>> - CONFIG_SPL_RAM_SUPPORT=y >>> - CONFIG_SPL_RAM_DEVICE=y >>> -+CONFIG_SPL_ATF=y >>> - CONFIG_SYS_PROMPT="ZynqMP> " >>> - CONFIG_CMD_MEMTEST=y >>> - CONFIG_SYS_ALT_MEMTEST=y >>> -diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig >>> b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig >>> -index 1c934858c61c..7a3806cba4b5 100644 >>> ---- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig >>> -+++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig >>> -@@ -17,6 +17,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >>> - CONFIG_SPL_OS_BOOT=y >>> - CONFIG_SPL_RAM_SUPPORT=y >>> - CONFIG_SPL_RAM_DEVICE=y >>> -+CONFIG_SPL_ATF=y >>> - CONFIG_SYS_PROMPT="ZynqMP> " >>> - CONFIG_CMD_MEMTEST=y >>> - CONFIG_SYS_ALT_MEMTEST=y >>> -diff --git a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig >>> b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig >>> -index e13c7c56f310..e4408f182ca0 100644 >>> ---- a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig >>> -+++ b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig >>> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >>> - CONFIG_SPL_OS_BOOT=y >>> - CONFIG_SPL_RAM_SUPPORT=y >>> - CONFIG_SPL_RAM_DEVICE=y >>> -+CONFIG_SPL_ATF=y >>> - CONFIG_SYS_PROMPT="ZynqMP> " >>> - CONFIG_FASTBOOT=y >>> - CONFIG_FASTBOOT_FLASH=y >>> -diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig >>> b/configs/xilinx_zynqmp_zcu102_revA_defconfig >>> -index 5b2cd495ee85..b52f6789fd4b 100644 >>> ---- a/configs/xilinx_zynqmp_zcu102_revA_defconfig >>> -+++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig >>> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >>> - CONFIG_SPL_OS_BOOT=y >>> - CONFIG_SPL_RAM_SUPPORT=y >>> - CONFIG_SPL_RAM_DEVICE=y >>> -+CONFIG_SPL_ATF=y >>> - CONFIG_SYS_PROMPT="ZynqMP> " >>> - CONFIG_FASTBOOT=y >>> - CONFIG_FASTBOOT_FLASH=y >>> -diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig >>> b/configs/xilinx_zynqmp_zcu102_revB_defconfig >>> -index e6530fbfe7ff..80592554f682 100644 >>> ---- a/configs/xilinx_zynqmp_zcu102_revB_defconfig >>> -+++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig >>> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y >>> - CONFIG_SPL_OS_BOOT=y >>> - CONFIG_SPL_RAM_SUPPORT=y >>> - CONFIG_SPL_RAM_DEVICE=y >>> -+CONFIG_SPL_ATF=y >>> - CONFIG_SYS_PROMPT="ZynqMP> " >>> - CONFIG_FASTBOOT=y >>> - CONFIG_FASTBOOT_FLASH=y >>> --- >>> -2.7.4 >>> - >>> diff --git >>> a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-pa >>> t >>> h >>> -for-PMUFW_INIT_.patch >>> b/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-pa >>> t >>> h >>> -for-PMUFW_INIT_.patch >>> deleted file mode 100644 >>> index 95ab7b3b75..0000000000 >>> --- >>> a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-pa >>> t >>> h >>> -for-PMUFW_INIT_.patch >>> +++ /dev/null >>> @@ -1,68 +0,0 @@ >>> -From c7df098a71e05dc81cee818747759e8060b59626 Mon Sep 17 00:00:00 >>> 2001 >>> -From: Luca Ceresoli >>> -Date: Mon, 4 Jun 2018 12:21:01 +0200 >>> -Subject: [PATCH] arm64: zynqmp: accept an absolute path for >>> PMUFW_INIT_FILE >>> - >>> -The value of PMUFW_INIT_FILE is prefixed with "$(srctree)/", thus >>> -forcing it to be a relative path inside the U-Boot source tree. >>> Since -the PMUFW is a binary file generated outside of U-Boot, the >>> PMUFW -binary must be copied inside the U-Boot source tree before >>> the -build. >>> - >>> -This generates a few problems: >>> - >>> - * if the source tree is shared among different out-of-tree builds, >>> - they will pollute (and potentially corrupt) each other >>> - * the source tree cannot be read-only >>> - * any buildsystem must add a command to copy the PMUFW binary >>> - * putting an externally-generated binary in the source tree is ugly >>> - as hell >>> - >>> -Avoid these problems by accepting an absolute path for >>> -PMUFW_INIT_FILE. This would be as simple as removing the "$(srctree)/" >>> -prefix, but in order to keep backward compatibility we rather use >>> the -shell and readlink to get the absolute path even when starting >>> from a -relative path. >>> - >>> -Since 'readlink -f' produces an empty string if the file does not >>> -exist, we also add a check to ensure the file configured in >>> -PMUFW_INIT_FILE exists. Otherwise the build would exit >>> successfully, -but produce a boot.bin without PMUFW as if PMUFW_INIT_FILE were empty. >>> - >>> -Tested in the 12 possible combinations of: >>> - - PMUFW_INIT_FILE empty, relative, absolute, non-existing >>> - - building in-tree, in subdir, in other directory >>> - >>> -Signed-off-by: Luca Ceresoli >>> -Cc: Michal Simek >>> -Cc: Simon Glass >>> -Cc: Emmanuel Vadot >>> -Signed-off-by: Michal Simek -Backported >>> from upstream: >>> https://git.denx.de/?p=u-boot.git;a=commit;h=c7df098a71e05dc81cee818 >>> 7 >>> 4 >>> 7759e8060b59626 >>> ---- >>> - scripts/Makefile.spl | 8 +++++++- >>> - 1 file changed, 7 insertions(+), 1 deletion(-) >>> - >>> -diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl -index >>> ef018b5b4056..252f13826d4c 100644 >>> ---- a/scripts/Makefile.spl >>> -+++ b/scripts/Makefile.spl >>> -@@ -167,8 +167,14 @@ ifdef CONFIG_ARCH_ZYNQ >>> - MKIMAGEFLAGS_boot.bin = -T zynqimage -R >>> $(srctree)/$(CONFIG_BOOT_INIT_FILE) >>> - endif >>> - ifdef CONFIG_ARCH_ZYNQMP >>> -+ifneq ($(CONFIG_PMUFW_INIT_FILE),"") >>> -+spl/boot.bin: zynqmp-check-pmufw >>> -+zynqmp-check-pmufw: FORCE >>> -+ ( cd $(srctree) && test -r $(CONFIG_PMUFW_INIT_FILE) ) \ >>> -+ || ( echo "Cannot read $(CONFIG_PMUFW_INIT_FILE)" && >>> -+false ) endif >>> - MKIMAGEFLAGS_boot.bin = -T zynqmpimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) \ >>> -- -n $(srctree)/$(CONFIG_PMUFW_INIT_FILE) >>> -+ -n "$(shell cd $(srctree); readlink -f $(CONFIG_PMUFW_INIT_FILE))" >>> - endif >>> - >>> - spl/boot.bin: $(obj)/u-boot-spl.bin FORCE >>> --- >>> -2.7.4 >>> - >>> diff --git >>> a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS- >>> i >>> n >>> it-file-as-a-kco.patch >>> b/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS- >>> i >>> n >>> it-file-as-a-kco.patch >>> deleted file mode 100644 >>> index b32e162780..0000000000 >>> --- >>> a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS- >>> i >>> n >>> it-file-as-a-kco.patch >>> +++ /dev/null >>> @@ -1,175 +0,0 @@ >>> -From 4c9d54ab5a41d65000c8d249b6fb1b76056f1812 Mon Sep 17 00:00:00 >>> 2001 >>> -From: Luca Ceresoli >>> -Date: Wed, 20 Jun 2018 12:11:50 +0200 >>> -Subject: [PATCH] arm/arm64: zynq/zynqmp: pass the PS init file as a >>> kconfig >>> - variable >>> - >>> -U-Boot needs to link ps7_init_gpl.c on Zynq or psu_init_gpl.c on >>> -ZynqMP (PS init for short). The current logic to locate this file >>> for -both platforms is: >>> - >>> - 1. if a board-specific file exists in >>> - board/xilinx/zynq[mp]/$(CONFIG_DEFAULT_DEVICE_TREE)/ps?_init_gpl.c >>> - then use it >>> - 2. otherwise use board/xilinx/zynq/ps?_init_gpl.c >>> - >>> -In the latter case the file does not exist in the U-Boot sources >>> and -must be copied in the source tree from the outside before >>> starting the -build. This is typical when it is generated from >>> Xilinx tools while -developing a custom hardware. However making >>> sure that a -board-specific file is _not_ found (and used) requires >>> some trickery -such as removing or overwriting all PS init files >>> (e.g.: the current -meta-xilinx yocto layer [0]). >>> - >>> -This generates a few problems: >>> - >>> - * if the source tree is shared among different out-of-tree builds, >>> - they will pollute (and potentially corrupt) each other >>> - * the source tree cannot be read-only >>> - * any buildsystem must add a command to copy the PS init file >>> binary >>> - * overwriting or deleting files in the source tree is ugly as hell >>> - >>> -Simplify usage by allowing to pass the path to the desired PS init >>> -file in kconfig variable XILINX_PS_INIT_FILE. It can be an absolute >>> -path or relative to $(srctree). If the variable is set, the >>> -user-specified file will always be used without being copied -around. >>> If the the variable is left empty, for backward compatibility -fall >>> back to the old behaviour. >>> - >>> -Since the issue is the same for Zynq and ZynqMP, add one kconfig >>> -variable in a common place and use it for both. >>> - >>> -Also use the new kconfig help text to document all the ways to give >>> -U-Boot the PS init file. >>> - >>> -Build-tested with all combinations of: >>> - - platform: zynq or zynqmp >>> - - PS init file: from XILINX_PS_INIT_FILE (absolute, relative path, >>> - non-existing), in-tree board-specific, in board/xilinx/zynq[mp]/ >>> - - building in-tree, in subdir, in other directory >>> - >>> -[0] >>> https://github.com/Xilinx/meta-xilinx/blob/b2f74cc7fe5c4881589d5e440 >>> a >>> 1 >>> 7cb51fc66a7ab/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init. >>> inc#L9 >>> - >>> -Signed-off-by: Luca Ceresoli >>> -Cc: Albert Aribaud >>> -Cc: Michal Simek >>> -Cc: Nathan Rossi -Backported from upstream: >>> https://git.denx.de/?p=u-boot.git;a=commit;h=6da4f67ad09cd8b311d77b2 >>> b >>> 0 >>> 4e557b7ef65b56c >>> ---- >>> - arch/arm/Kconfig | 1 + >>> - board/xilinx/Kconfig | 41 +++++++++++++++++++++++++++++++++++++++++ >>> - board/xilinx/zynq/Makefile | 10 +++++++++- >>> - board/xilinx/zynqmp/Makefile | 10 +++++++++- >>> - 4 files changed, 60 insertions(+), 2 deletions(-) >>> - create mode 100644 board/xilinx/Kconfig >>> - >>> -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index >>> 22234cde2ab6..e04979d0ef7e 100644 >>> ---- a/arch/arm/Kconfig >>> -+++ b/arch/arm/Kconfig >>> -@@ -1293,4 +1293,5 @@ source "board/technologic/ts4600/Kconfig" >>> - source "board/vscom/baltos/Kconfig" >>> - source "board/woodburn/Kconfig" >>> - source "board/work-microwave/work_92105/Kconfig" >>> -+source "board/xilinx/Kconfig" >>> - source "board/zipitz2/Kconfig" >>> - >>> - source "arch/arm/Kconfig.debug" >>> -diff --git a/board/xilinx/Kconfig b/board/xilinx/Kconfig -new file >>> mode 100644 -index 000000000000..aa3fa061edef >>> ---- /dev/null >>> -+++ b/board/xilinx/Kconfig >>> -@@ -0,0 +1,41 @@ >>> -+# Copyright (c) 2018, Luca Ceresoli # # >>> -+SPDX-License-Identifier: GPL-2.0 >>> -+ >>> -+if ARCH_ZYNQ || ARCH_ZYNQMP >>> -+ >>> -+config XILINX_PS_INIT_FILE >>> -+ string "Zynq/ZynqMP PS init file(s) location" >>> -+ help >>> -+ On Zynq and ZynqMP U-Boot SPL (or U-Boot proper if >>> -+ ZYNQMP_PSU_INIT_ENABLED is set) is responsible for some >>> -+ basic initializations, such as enabling peripherals and >>> -+ configuring pinmuxes. The PS init file (called >>> -+ psu_init_gpl.c on ZynqMP, ps7_init_gpl.c for Zynq-7000) >>> -+ contains the code for such initializations. >>> -+ >>> -+ U-Boot contains PS init files for some boards, but each of >>> -+ them describes only one specific configuration. Users of a >>> -+ different board, or needing a different configuration, can >>> -+ generate custom files using the Xilinx development tools. >>> -+ >>> -+ There are three ways to give a PS init file to U-Boot: >>> -+ >>> -+ 1. Set this variable to the path, either relative to the >>> -+ source tree or absolute, where the psu_init_gpl.c or >>> -+ ps7_init_gpl.c file is located. U-Boot will build this >>> -+ file. >>> -+ >>> -+ 2. If you leave an empty string here, U-Boot will use >>> -+ board/xilinx/zynq/$(CONFIG_DEFAULT_DEVICE_TREE)/ps7_init_gpl.c >>> -+ for Zynq-7000, or >>> -+ board/xilinx/zynqmp/$(CONFIG_DEFAULT_DEVICE_TREE)/psu_init_gpl.c >>> -+ for ZynqMP. >>> -+ >>> -+ 3. If the above file does not exist, U-Boot will use >>> -+ board/xilinx/zynq/ps7_init_gpl.c for Zynq-7000, or >>> -+ board/xilinx/zynqmp/psu_init_gpl.c for ZynqMP. This file >>> -+ is not provided by U-Boot, you have to copy it there >>> -+ before the build. >>> -+ >>> -+endif >>> -diff --git a/board/xilinx/zynq/Makefile >>> b/board/xilinx/zynq/Makefile -index 5a76a26720cd..03ad5f0532ee >>> 100644 >>> ---- a/board/xilinx/zynq/Makefile >>> -+++ b/board/xilinx/zynq/Makefile >>> -@@ -5,10 +5,18 @@ >>> - >>> - obj-y := board.o >>> - >>> --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) >>> -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") >>> -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f >>> -+$(CONFIG_XILINX_PS_INIT_FILE)) init-objs := ps_init_gpl.o >>> -+spl/board/xilinx/zynq/ps_init_gpl.o board/xilinx/zynq/ps_init_gpl.o: $(PS_INIT_FILE) >>> -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ endif >>> - >>> -+ifeq ($(init-objs),) >>> -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) >>> - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/ps7_init_gpl.c),\ >>> - $(hw-platform-y)/ps7_init_gpl.o) >>> -+endif >>> - >>> - ifeq ($(init-objs),) >>> - ifneq ($(wildcard $(srctree)/$(src)/ps7_init_gpl.c),) >>> -diff --git a/board/xilinx/zynqmp/Makefile >>> b/board/xilinx/zynqmp/Makefile -index 05ccd25dcef3..960b81fc5853 >>> 100644 >>> ---- a/board/xilinx/zynqmp/Makefile >>> -+++ b/board/xilinx/zynqmp/Makefile >>> -@@ -5,10 +5,18 @@ >>> - >>> - obj-y := zynqmp.o >>> - >>> --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) >>> -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") >>> -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f >>> -+$(CONFIG_XILINX_PS_INIT_FILE)) init-objs := ps_init_gpl.o >>> -+spl/board/xilinx/zynqmp/ps_init_gpl.o board/xilinx/zynqmp/ps_init_gpl.o: $(PS_INIT_FILE) >>> -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ endif >>> - >>> -+ifeq ($(init-objs),) >>> -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) >>> - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/psu_init_gpl.c),\ >>> - $(hw-platform-y)/psu_init_gpl.o) >>> -+endif >>> - >>> - ifeq ($(init-objs),) >>> - ifneq ($(wildcard $(srctree)/$(src)/psu_init_gpl.c),) >>> --- >>> -2.7.4 >>> - >>> diff --git a/configs/zynqmp_zcu102_defconfig >>> b/configs/zynqmp_zcu102_defconfig new file mode 100644 index >>> 0000000000..336f5c2dbe >>> --- /dev/null >>> +++ b/configs/zynqmp_zcu102_defconfig >>> @@ -0,0 +1,35 @@ >>> +BR2_aarch64=y >>> +BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" >>> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y >>> +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" >>> +BR2_LINUX_KERNEL=y >>> +BR2_LINUX_KERNEL_CUSTOM_GIT=y >>> +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" >>> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2" >>> +BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" >>> +BR2_LINUX_KERNEL_DTS_SUPPORT=y >>> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" >>> +BR2_TARGET_ROOTFS_EXT2=y >>> +BR2_TARGET_ROOTFS_EXT2_4=y >>> +# BR2_TARGET_ROOTFS_TAR is not set >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.4_2021.2" >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" >>> +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2" >>> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" >>> +BR2_TARGET_UBOOT_NEEDS_DTC=y >>> +BR2_TARGET_UBOOT_SPL=y >>> +BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" >>> +BR2_TARGET_UBOOT_ZYNQMP=y >>> +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/master/bin/pmufw-v2021.2.bin" >>> +BR2_TARGET_UBOOT_FORMAT_ITB=y >>> +BR2_PACKAGE_HOST_DOSFSTOOLS=y >>> +BR2_PACKAGE_HOST_GENIMAGE=y >>> +BR2_PACKAGE_HOST_MTOOLS=y >> >> As pointed above this ^^^ file must be in a separate patch and it >> deserves also a maintainer. So please you or maybe Luca could add an >> entry to DEVELOPERS for this board >> >>> diff --git a/configs/zynqmp_zcu106_defconfig >>> b/configs/zynqmp_zcu106_defconfig index bee7c1daf7..3a6947e1e8 >>> 100644 >>> --- a/configs/zynqmp_zcu106_defconfig >>> +++ b/configs/zynqmp_zcu106_defconfig >>> @@ -1,11 +1,11 @@ >>> BR2_aarch64=y >>> BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" >> >> Since all patches are gone, this ^^^ is not needed anymore >> >>> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y >>> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y >>> BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" >>> BR2_LINUX_KERNEL=y >>> BR2_LINUX_KERNEL_CUSTOM_GIT=y >>> BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" >>> -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" >>> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2" >>> BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" >>> BR2_LINUX_KERNEL_DTS_SUPPORT=y >>> BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" >>> @@ -14,21 +14,22 @@ BR2_TARGET_ROOTFS_EXT2_4=y >>> # BR2_TARGET_ROOTFS_TAR is not set >>> BR2_TARGET_ARM_TRUSTED_FIRMWARE=y >>> BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y >>> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" >>> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5" >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.4_2021.2" >> >> It's worth mention in commit log that you're switching from ARM to >> Xilinx ATF >> >>> BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" >>> BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" >>> -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7" >>> -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA" >>> +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2" >>> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" >>> BR2_TARGET_UBOOT_NEEDS_DTC=y >>> BR2_TARGET_UBOOT_SPL=y >>> BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" >>> BR2_TARGET_UBOOT_ZYNQMP=y >>> -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/53fdb7b6c92860ceb0ec5fd14deee302f4a84269/bin/pmufw-zcu106-default-v2017.4.bin" >>> +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/master/bin/pmufw-v2021.2.bin" >>> +BR2_TARGET_UBOOT_FORMAT_ITB=y >> >> Here ^^^ I see that probably you're switching from .bin to .itb so >> better mention it in commit log >> >>> BR2_PACKAGE_HOST_DOSFSTOOLS=y >>> BR2_PACKAGE_HOST_GENIMAGE=y >>> BR2_PACKAGE_HOST_MTOOLS=y >> >> Thank you! >> >> Best regards >> -- >> Giulio Benetti >> Benetti Engineering sas > > -- > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > From giulio.benetti at benettiengineering.com Thu Feb 3 14:25:17 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 3 Feb 2022 15:25:17 +0100 Subject: [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2 In-Reply-To: References: Message-ID: <1422bf74-c342-fe70-5c2b-43d526118590@benettiengineering.com> On 03/02/22 15:09, Neal Frager wrote: [ SNIP ] >> Yes it does work. Only remember to set your client using plain-text only. I?m on mobile now so probably my answer and yours will be in html. >> But we need plain-text, please check your email client and set plain-text by default. > > As far as I can tell, my replies are already in plain-text by default. Let me know if you catch a message where that is not the case. > Ah sorry, I was on mobile, I've checked on PC now and you're sending in plain-text mode. Best regards -- Giulio Benetti Benetti Engineering sas From Alexey.Brodkin at synopsys.com Thu Feb 3 15:45:41 2022 From: Alexey.Brodkin at synopsys.com (Alexey Brodkin) Date: Thu, 3 Feb 2022 15:45:41 +0000 Subject: [Buildroot] [PATCHv2] package/glibc: allow runing on kernels older than used for the headers In-Reply-To: <2371_1643875895_61FB8E37_2371_137_1_20220203081133.GA3479@tl-lnx-nyma7486> References: <19291_1643809720_61FA8BB8_19291_487_24_41ca9ce22939ce2ed0c41973db7d612542850824.1643809712.git.yann.morin@orange.com> <2371_1643875895_61FB8E37_2371_137_1_20220203081133.GA3479@tl-lnx-nyma7486> Message-ID: Hi Yann, > On 2022-02-02 17:00 +0000, Alexey Brodkin spake thusly: > > > We add an option to glibc to allow the user to enable compatibility > > > shims. To simplify the case, when that option is enabled, we just let > > > glibc enable as old compatibility shims as supported by the current > > > architecture. > > Looks reasonable to me. I mean to not have all the flexibility proposed > > initially, instead adding an option to fall back to something much > > older compared to used headers. > > > > If more options are needed later, we'll get to know it at some point ;) > > > > And thanks for doing that, as I meant to do something similar a while ago, > > but never posted my local changes. > > Will that be followed up by a reviewed-by or maybe a tested-by tag? ;-) Indeed the following config ----------------------->8--------------------- BR2_arcle=y BR2_archs38=y BR2_TOOLCHAIN_BUILDROOT_GLIBC=y BR2_KERNEL_HEADERS_5_15=y BR2_BINUTILS_VERSION_2_37_X=y BR2_GCC_VERSION_11_X=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.176" BR2_LINUX_KERNEL_DEFCONFIG="haps_hs" BR2_LINUX_KERNEL_VMLINUX=y BR2_TARGET_ROOTFS_INITRAMFS=y ----------------------->8--------------------- fails to boot with: ----------------------->8--------------------- Run /init as init process FATAL: kernel too old Kernel panic - not syncing: Attempted to kill init! exitcode=0x00007f00 ---[ end Kernel panic - not syncing: Attempted to kill init! exitcode=0x00007f00 ]--- ----------------------->8--------------------- But if we add newly introduced "BR2_PACKAGE_GLIBC_KERNEL_COMPAT=y" all boots well. With that... Tested-by: Alexey Brodkin > Thanks for the feedback, by the way. That's my pleasure! -Alexey From david.heng at smile.fr Thu Feb 3 15:59:51 2022 From: david.heng at smile.fr (David HENG) Date: Thu, 3 Feb 2022 16:59:51 +0100 Subject: [Buildroot] [PATCH 1/1] configs/qemu_*: bump kernel version to 5.15.18 Message-ID: <20220203155951.1277343-1-david.heng@smile.fr> See runtimes test here : https://gitlab.com/davidheng.pw/buildroot/-/pipelines/460019580 Signed-off-by: David HENG --- It seems that qemu_s390x_defconfig made a timeout on Gitlab shared-runner at the end but work after a restarting. https://gitlab.com/davidheng.pw/buildroot/-/jobs/2044971657 --- configs/qemu_aarch64_sbsa_defconfig | 2 +- configs/qemu_aarch64_virt_defconfig | 2 +- configs/qemu_arm_versatile_defconfig | 2 +- configs/qemu_arm_versatile_nommu_defconfig | 2 +- configs/qemu_arm_vexpress_defconfig | 2 +- configs/qemu_arm_vexpress_tz_defconfig | 2 +- configs/qemu_m68k_mcf5208_defconfig | 2 +- configs/qemu_m68k_q800_defconfig | 2 +- configs/qemu_microblazebe_mmu_defconfig | 2 +- configs/qemu_microblazeel_mmu_defconfig | 2 +- configs/qemu_mips32r2_malta_defconfig | 2 +- configs/qemu_mips32r2el_malta_defconfig | 2 +- configs/qemu_mips32r6_malta_defconfig | 2 +- configs/qemu_mips32r6el_malta_defconfig | 2 +- configs/qemu_mips64_malta_defconfig | 2 +- configs/qemu_mips64el_malta_defconfig | 2 +- configs/qemu_mips64r6_malta_defconfig | 2 +- configs/qemu_mips64r6el_malta_defconfig | 2 +- configs/qemu_nios2_10m50_defconfig | 2 +- configs/qemu_or1k_defconfig | 2 +- configs/qemu_ppc64_e5500_defconfig | 2 +- configs/qemu_ppc64_pseries_defconfig | 2 +- configs/qemu_ppc64le_powernv8_defconfig | 2 +- configs/qemu_ppc64le_pseries_defconfig | 2 +- configs/qemu_ppc_bamboo_defconfig | 2 +- configs/qemu_ppc_e500mc_defconfig | 2 +- configs/qemu_ppc_g3beige_defconfig | 2 +- configs/qemu_ppc_mac99_defconfig | 2 +- configs/qemu_ppc_mpc8544ds_defconfig | 2 +- configs/qemu_riscv32_virt_defconfig | 2 +- configs/qemu_riscv64_virt_defconfig | 2 +- configs/qemu_s390x_defconfig | 2 +- configs/qemu_sh4_r2d_defconfig | 2 +- configs/qemu_sh4eb_r2d_defconfig | 2 +- configs/qemu_sparc64_sun4u_defconfig | 2 +- configs/qemu_sparc_ss10_defconfig | 2 +- configs/qemu_x86_64_defconfig | 2 +- configs/qemu_x86_defconfig | 2 +- configs/qemu_xtensa_lx60_defconfig | 2 +- configs/qemu_xtensa_lx60_nommu_defconfig | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) diff --git a/configs/qemu_aarch64_sbsa_defconfig b/configs/qemu_aarch64_sbsa_defconfig index e7d3bd03ca..2d6134e78c 100644 --- a/configs/qemu_aarch64_sbsa_defconfig +++ b/configs/qemu_aarch64_sbsa_defconfig @@ -25,7 +25,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.18" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_aarch64_virt_defconfig b/configs/qemu_aarch64_virt_defconfig index 9fbf293311..03df0ad9e2 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.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig index 5e399d17de..4f43273a82 100644 --- a/configs/qemu_arm_versatile_defconfig +++ b/configs/qemu_arm_versatile_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.18" BR2_LINUX_KERNEL_DEFCONFIG="versatile" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-versatile/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/configs/qemu_arm_versatile_nommu_defconfig b/configs/qemu_arm_versatile_nommu_defconfig index 1357742703..0c49d1b67d 100644 --- a/configs/qemu_arm_versatile_nommu_defconfig +++ b/configs/qemu_arm_versatile_nommu_defconfig @@ -31,7 +31,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.18" BR2_LINUX_KERNEL_DEFCONFIG="versatile" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-versatile/linux-nommu.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/configs/qemu_arm_vexpress_defconfig b/configs/qemu_arm_vexpress_defconfig index dafcc37bc0..2c813456f4 100644 --- a/configs/qemu_arm_vexpress_defconfig +++ b/configs/qemu_arm_vexpress_defconfig @@ -25,7 +25,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.18" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" diff --git a/configs/qemu_arm_vexpress_tz_defconfig b/configs/qemu_arm_vexpress_tz_defconfig index 327762277b..def11721ae 100644 --- a/configs/qemu_arm_vexpress_tz_defconfig +++ b/configs/qemu_arm_vexpress_tz_defconfig @@ -22,7 +22,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.18" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-vexpress-tz/linux.fragment" diff --git a/configs/qemu_m68k_mcf5208_defconfig b/configs/qemu_m68k_mcf5208_defconfig index 1dcd8272c3..0490b9e29e 100644 --- a/configs/qemu_m68k_mcf5208_defconfig +++ b/configs/qemu_m68k_mcf5208_defconfig @@ -19,7 +19,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-mcf5208/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_m68k_q800_defconfig b/configs/qemu_m68k_q800_defconfig index 7bf8b4061f..30d8982db3 100644 --- a/configs/qemu_m68k_q800_defconfig +++ b/configs/qemu_m68k_q800_defconfig @@ -19,7 +19,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-q800/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_microblazebe_mmu_defconfig b/configs/qemu_microblazebe_mmu_defconfig index 0508f92c36..7bd2ae53b8 100644 --- a/configs/qemu_microblazebe_mmu_defconfig +++ b/configs/qemu_microblazebe_mmu_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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux.config" BR2_LINUX_KERNEL_LINUX_BIN=y diff --git a/configs/qemu_microblazeel_mmu_defconfig b/configs/qemu_microblazeel_mmu_defconfig index 10811e284e..cd8c5a3cb2 100644 --- a/configs/qemu_microblazeel_mmu_defconfig +++ b/configs/qemu_microblazeel_mmu_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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux.config" BR2_LINUX_KERNEL_LINUX_BIN=y diff --git a/configs/qemu_mips32r2_malta_defconfig b/configs/qemu_mips32r2_malta_defconfig index c08ca862c5..49d84c308b 100644 --- a/configs/qemu_mips32r2_malta_defconfig +++ b/configs/qemu_mips32r2_malta_defconfig @@ -19,7 +19,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips32r2el_malta_defconfig b/configs/qemu_mips32r2el_malta_defconfig index 0bb16b9320..5363018c47 100644 --- a/configs/qemu_mips32r2el_malta_defconfig +++ b/configs/qemu_mips32r2el_malta_defconfig @@ -19,7 +19,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips32r6_malta_defconfig b/configs/qemu_mips32r6_malta_defconfig index f7b218c62a..f77feb9b6d 100644 --- a/configs/qemu_mips32r6_malta_defconfig +++ b/configs/qemu_mips32r6_malta_defconfig @@ -19,7 +19,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips32r6el_malta_defconfig b/configs/qemu_mips32r6el_malta_defconfig index d0f118ff90..575034441a 100644 --- a/configs/qemu_mips32r6el_malta_defconfig +++ b/configs/qemu_mips32r6el_malta_defconfig @@ -19,7 +19,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips64_malta_defconfig b/configs/qemu_mips64_malta_defconfig index fe03b911c5..e9438fda1e 100644 --- a/configs/qemu_mips64_malta_defconfig +++ b/configs/qemu_mips64_malta_defconfig @@ -19,7 +19,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips64el_malta_defconfig b/configs/qemu_mips64el_malta_defconfig index c6d428226c..4b1c8e22af 100644 --- a/configs/qemu_mips64el_malta_defconfig +++ b/configs/qemu_mips64el_malta_defconfig @@ -19,7 +19,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips64r6_malta_defconfig b/configs/qemu_mips64r6_malta_defconfig index 9cf651a4ba..87ef7902af 100644 --- a/configs/qemu_mips64r6_malta_defconfig +++ b/configs/qemu_mips64r6_malta_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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips64r6el_malta_defconfig b/configs/qemu_mips64r6el_malta_defconfig index 0d02a5b4df..5774207f65 100644 --- a/configs/qemu_mips64r6el_malta_defconfig +++ b/configs/qemu_mips64r6el_malta_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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_nios2_10m50_defconfig b/configs/qemu_nios2_10m50_defconfig index 44afb928e3..4b9c53e8de 100644 --- a/configs/qemu_nios2_10m50_defconfig +++ b/configs/qemu_nios2_10m50_defconfig @@ -1,7 +1,7 @@ BR2_nios2=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" BR2_LINUX_KERNEL_DEFCONFIG="10m50" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/nios2-10m50/linux.fragment" BR2_TARGET_ROOTFS_INITRAMFS=y diff --git a/configs/qemu_or1k_defconfig b/configs/qemu_or1k_defconfig index 9d55cb3420..b3d9d79156 100644 --- a/configs/qemu_or1k_defconfig +++ b/configs/qemu_or1k_defconfig @@ -15,7 +15,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/or1k/linux.config" diff --git a/configs/qemu_ppc64_e5500_defconfig b/configs/qemu_ppc64_e5500_defconfig index 09aac50252..072240c99c 100644 --- a/configs/qemu_ppc64_e5500_defconfig +++ b/configs/qemu_ppc64_e5500_defconfig @@ -16,7 +16,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.18" BR2_LINUX_KERNEL_DEFCONFIG="corenet64_smp" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc64-e5500/linux.fragment" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_ppc64_pseries_defconfig b/configs/qemu_ppc64_pseries_defconfig index 1a20e2ee0e..ad523ec2ef 100644 --- a/configs/qemu_ppc64_pseries_defconfig +++ b/configs/qemu_ppc64_pseries_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.18" BR2_LINUX_KERNEL_DEFCONFIG="pseries" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc64le_powernv8_defconfig b/configs/qemu_ppc64le_powernv8_defconfig index d8ea6655fc..a784695ddf 100644 --- a/configs/qemu_ppc64le_powernv8_defconfig +++ b/configs/qemu_ppc64le_powernv8_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.18" BR2_LINUX_KERNEL_DEFCONFIG="powernv" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc64le_pseries_defconfig b/configs/qemu_ppc64le_pseries_defconfig index 46f62b8313..f10b0fdf40 100644 --- a/configs/qemu_ppc64le_pseries_defconfig +++ b/configs/qemu_ppc64le_pseries_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.18" BR2_LINUX_KERNEL_DEFCONFIG="pseries_le" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_bamboo_defconfig b/configs/qemu_ppc_bamboo_defconfig index d6abbeb452..6129c4a663 100644 --- a/configs/qemu_ppc_bamboo_defconfig +++ b/configs/qemu_ppc_bamboo_defconfig @@ -19,7 +19,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.18" BR2_LINUX_KERNEL_DEFCONFIG="44x/bamboo" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-bamboo/linux.fragment" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_e500mc_defconfig b/configs/qemu_ppc_e500mc_defconfig index 232bc1f70c..1853e538bb 100644 --- a/configs/qemu_ppc_e500mc_defconfig +++ b/configs/qemu_ppc_e500mc_defconfig @@ -16,7 +16,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.18" BR2_LINUX_KERNEL_DEFCONFIG="corenet32_smp" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-e500mc/linux.fragment" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_ppc_g3beige_defconfig b/configs/qemu_ppc_g3beige_defconfig index 824fe648ab..9bbebede1b 100644 --- a/configs/qemu_ppc_g3beige_defconfig +++ b/configs/qemu_ppc_g3beige_defconfig @@ -19,7 +19,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-g3beige/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_mac99_defconfig b/configs/qemu_ppc_mac99_defconfig index ddeb99465a..e9629ff233 100644 --- a/configs/qemu_ppc_mac99_defconfig +++ b/configs/qemu_ppc_mac99_defconfig @@ -11,7 +11,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.18" BR2_LINUX_KERNEL_DEFCONFIG="pmac32" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-mac99/linux.fragment" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_mpc8544ds_defconfig b/configs/qemu_ppc_mpc8544ds_defconfig index 1a72d81ed5..2b51573da9 100644 --- a/configs/qemu_ppc_mpc8544ds_defconfig +++ b/configs/qemu_ppc_mpc8544ds_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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-mpc8544ds/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_riscv32_virt_defconfig b/configs/qemu_riscv32_virt_defconfig index e2753cfcfd..dff87ef342 100644 --- a/configs/qemu_riscv32_virt_defconfig +++ b/configs/qemu_riscv32_virt_defconfig @@ -19,7 +19,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.18" BR2_LINUX_KERNEL_DEFCONFIG="rv32" BR2_LINUX_KERNEL_IMAGE=y diff --git a/configs/qemu_riscv64_virt_defconfig b/configs/qemu_riscv64_virt_defconfig index 07f20776f0..d67d070185 100644 --- a/configs/qemu_riscv64_virt_defconfig +++ b/configs/qemu_riscv64_virt_defconfig @@ -19,7 +19,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.18" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_IMAGE=y diff --git a/configs/qemu_s390x_defconfig b/configs/qemu_s390x_defconfig index 86ac1fd024..346df04ada 100644 --- a/configs/qemu_s390x_defconfig +++ b/configs/qemu_s390x_defconfig @@ -17,7 +17,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.18" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_sh4_r2d_defconfig b/configs/qemu_sh4_r2d_defconfig index c8177e6096..0f12b7dfe9 100644 --- a/configs/qemu_sh4_r2d_defconfig +++ b/configs/qemu_sh4_r2d_defconfig @@ -20,7 +20,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Linux 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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux.config" BR2_LINUX_KERNEL_ZIMAGE=y diff --git a/configs/qemu_sh4eb_r2d_defconfig b/configs/qemu_sh4eb_r2d_defconfig index f334569779..d5ee371e79 100644 --- a/configs/qemu_sh4eb_r2d_defconfig +++ b/configs/qemu_sh4eb_r2d_defconfig @@ -19,7 +19,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Linux 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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4eb-r2d/linux.config" BR2_LINUX_KERNEL_ZIMAGE=y diff --git a/configs/qemu_sparc64_sun4u_defconfig b/configs/qemu_sparc64_sun4u_defconfig index 941439d338..485b497e71 100644 --- a/configs/qemu_sparc64_sun4u_defconfig +++ b/configs/qemu_sparc64_sun4u_defconfig @@ -19,7 +19,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Linux 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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc64-sun4u/linux.config" diff --git a/configs/qemu_sparc_ss10_defconfig b/configs/qemu_sparc_ss10_defconfig index 62d3acb16b..2ba04c0864 100644 --- a/configs/qemu_sparc_ss10_defconfig +++ b/configs/qemu_sparc_ss10_defconfig @@ -19,7 +19,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Linux 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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc-ss10/linux.config" diff --git a/configs/qemu_x86_64_defconfig b/configs/qemu_x86_64_defconfig index 1bca76df44..cc505a8540 100644 --- a/configs/qemu_x86_64_defconfig +++ b/configs/qemu_x86_64_defconfig @@ -21,7 +21,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux.config" BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig index 54cf8e9794..34b7e2d292 100644 --- a/configs/qemu_x86_defconfig +++ b/configs/qemu_x86_defconfig @@ -22,7 +22,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux.config" diff --git a/configs/qemu_xtensa_lx60_defconfig b/configs/qemu_xtensa_lx60_defconfig index 1db3fd3ce4..cb78106091 100644 --- a/configs/qemu_xtensa_lx60_defconfig +++ b/configs/qemu_xtensa_lx60_defconfig @@ -21,7 +21,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y diff --git a/configs/qemu_xtensa_lx60_nommu_defconfig b/configs/qemu_xtensa_lx60_nommu_defconfig index d4c07b574c..c4473fb32a 100644 --- a/configs/qemu_xtensa_lx60_nommu_defconfig +++ b/configs/qemu_xtensa_lx60_nommu_defconfig @@ -25,7 +25,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux-nommu.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y -- 2.25.1 From fontaine.fabrice at gmail.com Thu Feb 3 17:17:15 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 3 Feb 2022 18:17:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/libblockdev: bump to version 2.26 Message-ID: <20220203171715.658568-1-fontaine.fabrice@gmail.com> - Add upstream link to first patch - Drop second patch (already in version) https://github.com/storaged-project/libblockdev/blob/2.26-1/NEWS.rst Signed-off-by: Fabrice Fontaine --- ...-replacement-function-for-strerror_l.patch | 2 ++ ...ec-Fix-deprecated-glib-function-call.patch | 32 ------------------- package/libblockdev/libblockdev.hash | 2 +- package/libblockdev/libblockdev.mk | 2 +- 4 files changed, 4 insertions(+), 34 deletions(-) delete mode 100644 package/libblockdev/0002-exec-Fix-deprecated-glib-function-call.patch diff --git a/package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch b/package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch index 018e4c4489..d5c9b2dfdb 100644 --- a/package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch +++ b/package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch @@ -8,6 +8,8 @@ so let's provide a simple replacement function that falls back on strerror(). Signed-off-by: Thomas Petazzoni +[Upstream status: +https://github.com/storaged-project/libblockdev/pull/701] --- configure.ac | 2 ++ src/plugins/crypto.c | 7 +++++++ diff --git a/package/libblockdev/0002-exec-Fix-deprecated-glib-function-call.patch b/package/libblockdev/0002-exec-Fix-deprecated-glib-function-call.patch deleted file mode 100644 index 2c370a133f..0000000000 --- a/package/libblockdev/0002-exec-Fix-deprecated-glib-function-call.patch +++ /dev/null @@ -1,32 +0,0 @@ -From aad927a81fd9067865dc391c5bbff12ac51a0002 Mon Sep 17 00:00:00 2001 -From: Manuel Wassermann -Date: Thu, 1 Jul 2021 04:45:49 +0200 -Subject: [PATCH] exec: Fix deprecated glib function call Glib will rename - "g_spawn_check_exit_status()" to "g_spawn_check_wait_status()" in version - 2.69. - -[Retrieved from: -https://github.com/storaged-project/libblockdev/commit/aad927a81fd9067865dc391c5bbff12ac51a0002] -Signed-off-by: Fabrice Fontaine ---- - src/utils/exec.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/src/utils/exec.c b/src/utils/exec.c -index 317fb5525..8faeb289c 100644 ---- a/src/utils/exec.c -+++ b/src/utils/exec.c -@@ -236,7 +236,12 @@ gboolean bd_utils_exec_and_report_status_error (const gchar **argv, const BDExtr - /* g_spawn_sync set the status in the same way waitpid() does, we need - to get the process exit code manually (this is similar to calling - WEXITSTATUS but also sets the error for terminated processes */ -- if (!g_spawn_check_exit_status (exit_status, error)) { -+ -+ #if !GLIB_CHECK_VERSION(2, 69, 0) -+ #define g_spawn_check_wait_status(x,y) (g_spawn_check_exit_status (x,y)) -+ #endif -+ -+ if (!g_spawn_check_wait_status (exit_status, error)) { - if (g_error_matches (*error, G_SPAWN_ERROR, G_SPAWN_ERROR_FAILED)) { - /* process was terminated abnormally (e.g. using a signal) */ - g_free (stdout_data); diff --git a/package/libblockdev/libblockdev.hash b/package/libblockdev/libblockdev.hash index 101b99f1a8..53a3b0737f 100644 --- a/package/libblockdev/libblockdev.hash +++ b/package/libblockdev/libblockdev.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 555aa42a2db39649ad83253bdc902ab5bd63d39c123e0c8055c4de7fe7571668 libblockdev-2.25.tar.gz +sha256 c4c0e10b35ac632bda8ce6d200b5601184984dec387fe59185921eb42432e069 libblockdev-2.26.tar.gz sha256 97bdc721d875501b6243a456333fdfdb1ab64d31c4da2554de845caf4674b946 LICENSE diff --git a/package/libblockdev/libblockdev.mk b/package/libblockdev/libblockdev.mk index 39ae9230d9..36b74966fb 100644 --- a/package/libblockdev/libblockdev.mk +++ b/package/libblockdev/libblockdev.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBBLOCKDEV_VERSION = 2.25 +LIBBLOCKDEV_VERSION = 2.26 LIBBLOCKDEV_SITE = https://github.com/storaged-project/libblockdev/releases/download/$(LIBBLOCKDEV_VERSION)-1 LIBBLOCKDEV_LICENSE = LGPL-2.1 LIBBLOCKDEV_LICENSE_FILES = LICENSE -- 2.34.1 From james.hilliard1 at gmail.com Thu Feb 3 18:25:08 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 3 Feb 2022 11:25:08 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-docutils: bump to version 0.18.1 Message-ID: <20220203182508.3046615-1-james.hilliard1@gmail.com> License hash changed due to Python-2.0 license addition. Change GPL-3.0 license to correct GPL-3.0+ variant. Switch from distutils to setuptools. Fixes: http://autobuild.buildroot.net/results/f24/f24e332688cb1118c8d28343f424d0ce1c78f7a8 Signed-off-by: James Hilliard --- .../0001-Update-setup.py.patch | 64 ------------------- package/python-docutils/python-docutils.hash | 9 +-- package/python-docutils/python-docutils.mk | 8 +-- 3 files changed, 9 insertions(+), 72 deletions(-) delete mode 100644 package/python-docutils/0001-Update-setup.py.patch diff --git a/package/python-docutils/0001-Update-setup.py.patch b/package/python-docutils/0001-Update-setup.py.patch deleted file mode 100644 index 3fb34a9763..0000000000 --- a/package/python-docutils/0001-Update-setup.py.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 583e59ccf72a02c2a6f0399f29f622c7f2f4a932 Mon Sep 17 00:00:00 2001 -From: milde -Date: Sun, 1 Sep 2019 19:39:36 +0000 -Subject: [PATCH] Update setup.py - -Python 3.4 no longer supported, -more languages supported (and Lithuanian accepted by PyPi). - -git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk at 8383 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 - -[Asaf: adjust upstream patch to 0.15.2] -Signed-off-by: Asaf Kahlon ---- - setup.py | 14 +++++++++++++- - 1 file changed, 13 insertions(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index f801ea2..5c1ebfd 100755 ---- a/setup.py -+++ b/setup.py -@@ -7,6 +7,10 @@ import os - import glob - try: - import setuptools -+except ImportError: -+ print('Warning: Could not load package `setuptools`.') -+ print('Actions requiring `setuptools` instead of `distutils` will fail') -+try: - from distutils.core import setup, Command - from distutils.command.build import build - from distutils.command.build_py import build_py -@@ -123,7 +127,7 @@ what-you-see-is-what-you-get plaintext markup syntax.""", # wrap at col 60 - 'maintainer_email': 'docutils-develop at lists.sourceforge.net', - 'license': 'public domain, Python, 2-Clause BSD, GPL 3 (see COPYING.txt)', - 'platforms': 'OS-independent', -- 'python_requires': '>=2.6, !=3.0.*, !=3.1.*, !=3.2.*', -+ 'python_requires': '>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*', - 'package_dir': {'docutils': 'docutils', - 'docutils.tools': 'tools'}, - 'packages': ['docutils', -@@ -213,14 +219,20 @@ classifiers = [ - 'Natural Language :: Chinese (Simplified)', - 'Natural Language :: Chinese (Traditional)', - 'Natural Language :: Czech', -+ 'Natural Language :: Danish', - 'Natural Language :: Dutch', - 'Natural Language :: Esperanto', - 'Natural Language :: Finnish', - 'Natural Language :: French', - 'Natural Language :: Galician', - 'Natural Language :: German', -+ 'Natural Language :: Hebrew', - 'Natural Language :: Italian', - 'Natural Language :: Japanese', -+ 'Natural Language :: Korean', -+ 'Natural Language :: Latvian', -+ 'Natural Language :: Lithuanian', -+ 'Natural Language :: Persian', - 'Natural Language :: Polish', - 'Natural Language :: Portuguese (Brazilian)', - 'Natural Language :: Russian', --- -2.20.1 -k diff --git a/package/python-docutils/python-docutils.hash b/package/python-docutils/python-docutils.hash index ccccca1064..05984b77a3 100644 --- a/package/python-docutils/python-docutils.hash +++ b/package/python-docutils/python-docutils.hash @@ -1,4 +1,5 @@ -# md5 from https://pypi.python.org/pypi/docutils/json, sha256 locally computed -md5 e26a308d8000b0bed7416a633217c676 docutils-0.15.2.tar.gz -sha256 a2aeea129088da402665e92e0b25b04b073c04b2dce4ab65caaa38b7ce2e1a99 docutils-0.15.2.tar.gz -sha256 efa0c85aa99ea5b4781240031b0d02af54d7b5554c87ad2b2bea9ba490f6663f COPYING.txt +# md5, sha256 from https://pypi.org/pypi/docutils/json +md5 ca5827e2432fd58f4c8d74a6591135de docutils-0.18.1.tar.gz +sha256 679987caf361a7539d76e584cbeddc311e3aee937877c87346f31debc63e9d06 docutils-0.18.1.tar.gz +# Locally computed sha256 checksums +sha256 f20172170ef9aeebbf53adf5d8f7d309f7dc6068e9a3a1b52ea772305686739d COPYING.txt diff --git a/package/python-docutils/python-docutils.mk b/package/python-docutils/python-docutils.mk index 9a42d3e5dc..52c4613996 100644 --- a/package/python-docutils/python-docutils.mk +++ b/package/python-docutils/python-docutils.mk @@ -4,12 +4,12 @@ # ################################################################################ -PYTHON_DOCUTILS_VERSION = 0.15.2 +PYTHON_DOCUTILS_VERSION = 0.18.1 PYTHON_DOCUTILS_SOURCE = docutils-$(PYTHON_DOCUTILS_VERSION).tar.gz -PYTHON_DOCUTILS_SITE = https://files.pythonhosted.org/packages/93/22/953e071b589b0b1fee420ab06a0d15e5aa0c7470eb9966d60393ce58ad61 -PYTHON_DOCUTILS_LICENSE = Public Domain, BSD-2-Clause, GPL-3.0 (emacs mode), other +PYTHON_DOCUTILS_SITE = https://files.pythonhosted.org/packages/57/b1/b880503681ea1b64df05106fc7e3c4e3801736cf63deffc6fa7fc5404cf5 +PYTHON_DOCUTILS_LICENSE = Public Domain, Python-2.0, BSD-2-Clause, GPL-3.0+ (emacs mode) PYTHON_DOCUTILS_LICENSE_FILES = COPYING.txt -PYTHON_DOCUTILS_SETUP_TYPE = distutils +PYTHON_DOCUTILS_SETUP_TYPE = setuptools $(eval $(python-package)) $(eval $(host-python-package)) -- 2.25.1 From arnout at mind.be Thu Feb 3 18:45:08 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 3 Feb 2022 19:45:08 +0100 Subject: [Buildroot] package libldns In-Reply-To: <5_xofMlQqIrdAjpopLNCIYCGiqsc2UoXvUQG4GIV5Bd0dY31bw-gZ_0eoD0ix_iW-BI3-5O_RbQESkV3ybUN1zFSLY2r3PAr3ZOfxYOFmrU=@protonmail.ch> References: <5_xofMlQqIrdAjpopLNCIYCGiqsc2UoXvUQG4GIV5Bd0dY31bw-gZ_0eoD0ix_iW-BI3-5O_RbQESkV3ybUN1zFSLY2r3PAr3ZOfxYOFmrU=@protonmail.ch> Message-ID: Hi ca0, On 03/02/2022 03:01, ca0 via buildroot wrote: > Building this package with orangepi_zero_defconfig results in an useless user system because both thee files are blown away What is "this package"? The subject mentions libidns, but there's no libidns package in buildroot. What do you mean with "blown away"? > ./output/target/usr/lib/ld-musl-armhf.so.1 This file belongs to the musl standard C library, but orangepi_zero_defconfig builds a uClibc standard C library, so it shouldn't even be there. You can check which libraries are needed for an executable or shared library with "readelf -d output/target/...". All the libraries mentioned there should exist in output/target/lib or output/target/usr/lib. If not, it is indeed broken. If you want more help, you will need to provide a whole lot more details. Regards, Arnout > ./output/host/arm-buildroot-linux-musleabihf/sysroot/usr/lib/ld-musl-armhf.so.1 > > Is the ldconfig hackery needed for embedded systems and is it supported when cross compiling? > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From james.hilliard1 at gmail.com Thu Feb 3 18:47:18 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 3 Feb 2022 11:47:18 -0700 Subject: [Buildroot] [PATCH 1/1] package/bat: bump to version 0.19.0 Message-ID: <20220203184718.3173767-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/bat/bat.hash | 2 +- package/bat/bat.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/bat/bat.hash b/package/bat/bat.hash index aa6c8d743d..f4d3e32c34 100644 --- a/package/bat/bat.hash +++ b/package/bat/bat.hash @@ -1,4 +1,4 @@ # Locally generated -sha256 9c345788eb916777a60e7ff32031f1c92edc5565031e0c057bce860982768744 bat-0.18.3.tar.gz +sha256 7940641baaa61cd3bcd1c3db4804d179609d6ccd955868928a129bf3f853e0b2 bat-0.19.0.tar.gz sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE-APACHE sha256 64de710b6309a7db5e44ad0af382300c7fb6f6d116d8ae32f0164e05db033068 LICENSE-MIT diff --git a/package/bat/bat.mk b/package/bat/bat.mk index 9b619af172..dc29a85429 100644 --- a/package/bat/bat.mk +++ b/package/bat/bat.mk @@ -4,7 +4,7 @@ # ################################################################################ -BAT_VERSION = 0.18.3 +BAT_VERSION = 0.19.0 BAT_SITE = $(call github,sharkdp,bat,v$(BAT_VERSION)) BAT_LICENSE = Apache-2.0 or MIT BAT_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT -- 2.25.1 From arnout at mind.be Thu Feb 3 18:49:18 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 3 Feb 2022 19:49:18 +0100 Subject: [Buildroot] package libldns In-Reply-To: References: <5_xofMlQqIrdAjpopLNCIYCGiqsc2UoXvUQG4GIV5Bd0dY31bw-gZ_0eoD0ix_iW-BI3-5O_RbQESkV3ybUN1zFSLY2r3PAr3ZOfxYOFmrU=@protonmail.ch> Message-ID: <6c85206c-139f-474d-7ca5-5f21fd606d96@mind.be> On 03/02/2022 19:45, Arnout Vandecappelle wrote: > ?Hi ca0, > > On 03/02/2022 03:01, ca0 via buildroot wrote: >> Building this package with orangepi_zero_defconfig results in an useless user >> system because both thee files are blown away > > ?What is "this package"? The subject mentions libidns, but there's no libidns > package in buildroot. ?Apparently I misread, it's libldns which does indeed exist. ?I did a build of it and it looks OK... ?Regards, ?Arnout > > ?What do you mean with "blown away"? > >> ./output/target/usr/lib/ld-musl-armhf.so.1 > > ?This file belongs to the musl standard C library, but orangepi_zero_defconfig > builds a uClibc standard C library, so it shouldn't even be there. > > ?You can check which libraries are needed for an executable or shared library > with "readelf -d output/target/...". All the libraries mentioned there should > exist in output/target/lib or output/target/usr/lib. If not, it is indeed broken. > > > ?If you want more help, you will need to provide a whole lot more details. > > ?Regards, > ?Arnout > > >> ./output/host/arm-buildroot-linux-musleabihf/sysroot/usr/lib/ld-musl-armhf.so.1 >> > >> Is the ldconfig hackery needed for embedded systems and is it supported when >> cross compiling? >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot From bernd.kuhls at t-online.de Thu Feb 3 19:04:31 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Thu, 3 Feb 2022 20:04:31 +0100 Subject: [Buildroot] [PATCH 1/2] package/kodi-pvr-hts: bump version to 19.0.6-Matrix Message-ID: <20220203190432.1637478-1-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/kodi-pvr-hts/kodi-pvr-hts.hash | 2 +- package/kodi-pvr-hts/kodi-pvr-hts.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-hts/kodi-pvr-hts.hash b/package/kodi-pvr-hts/kodi-pvr-hts.hash index 135b0088c4..40cd8fd62f 100644 --- a/package/kodi-pvr-hts/kodi-pvr-hts.hash +++ b/package/kodi-pvr-hts/kodi-pvr-hts.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 25799d0d043df7819c767adc89d081cbd6eb61d29135befbc621719274a1c074 kodi-pvr-hts-19.0.4-Matrix.tar.gz +sha256 990e5fd0757d48b86675aa124b77629e7fb2de6b27dcfd6f6ccc7ce181d04aeb kodi-pvr-hts-19.0.6-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-hts/kodi-pvr-hts.mk b/package/kodi-pvr-hts/kodi-pvr-hts.mk index 6c9e5a715f..caa90b7af6 100644 --- a/package/kodi-pvr-hts/kodi-pvr-hts.mk +++ b/package/kodi-pvr-hts/kodi-pvr-hts.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_HTS_VERSION = 19.0.4-Matrix +KODI_PVR_HTS_VERSION = 19.0.6-Matrix KODI_PVR_HTS_SITE = $(call github,kodi-pvr,pvr.hts,$(KODI_PVR_HTS_VERSION)) KODI_PVR_HTS_LICENSE = GPL-2.0+ KODI_PVR_HTS_LICENSE_FILES = LICENSE.md -- 2.30.2 From bernd.kuhls at t-online.de Thu Feb 3 19:04:32 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Thu, 3 Feb 2022 20:04:32 +0100 Subject: [Buildroot] [PATCH 2/2] package/kodi-pvr-iptvsimple: bump version to 19.1.0-Matrix In-Reply-To: <20220203190432.1637478-1-bernd.kuhls@t-online.de> References: <20220203190432.1637478-1-bernd.kuhls@t-online.de> Message-ID: <20220203190432.1637478-2-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash | 2 +- package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash index bd3d44d908..6ace3a5859 100644 --- a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash +++ b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 3df76fb7f03f2fd64c75526d5bf89b0f2300f70bf825794fa27bd6fbdd706fb2 kodi-pvr-iptvsimple-19.0.3-Matrix.tar.gz +sha256 c92736b3f3c96fe36d7b20b329c82b47180260e3ed40fc456ef709572fad5fb0 kodi-pvr-iptvsimple-19.1.0-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk index 5f5025cd80..eedb0fb817 100644 --- a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk +++ b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_IPTVSIMPLE_VERSION = 19.0.3-Matrix +KODI_PVR_IPTVSIMPLE_VERSION = 19.1.0-Matrix KODI_PVR_IPTVSIMPLE_SITE = $(call github,kodi-pvr,pvr.iptvsimple,$(KODI_PVR_IPTVSIMPLE_VERSION)) KODI_PVR_IPTVSIMPLE_LICENSE = GPL-2.0+ KODI_PVR_IPTVSIMPLE_LICENSE_FILES = LICENSE.md -- 2.30.2 From arnout at mind.be Thu Feb 3 19:35:56 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 3 Feb 2022 20:35:56 +0100 Subject: [Buildroot] [PATCH v7 1/1] package/qt5: bump packages to latest kde submodule versions In-Reply-To: <20220131225622.90226-1-james.hilliard1@gmail.com> References: <20220131225622.90226-1-james.hilliard1@gmail.com> Message-ID: On 31/01/2022 23:56, 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 It took me some reading of the patch and of the upstream repositories to understand that there are actually no release tarballs or tags, and the the 5.15.8 is something we just pull out of our hat to be compatible with qt5webengine. So I updated the commit message to (hopefully) better explain that. > > 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. Instead of creating a separate package for it (which BTW you forgot to add to DEVELOPERS), I changed this to use the git download method and _GIT_SUBMODULES = YES. I checked that it extracts to exactly the same thing. > > 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. I don't really understand why this was needed rather than calling syncqt explicitly, but OK. Applied to master, thanks. Regards, Arnout > > 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 [snip] From arnout at mind.be Thu Feb 3 19:27:27 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 3 Feb 2022 20:27:27 +0100 Subject: [Buildroot] [git commit] package/qt5: bump packages to latest kde submodule versions Message-ID: <20220203192858.6E46582628@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5770a645a3a49a3f0f02972131a4ff5283b4c11e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This points all qt5 packages to the latest kde submodule versions available at https://invent.kde.org/qt/qt/qt5/-/tree/kde/5.15 There is no 5.15.8 release of the kde-maintained modules, no release tarballs and no tags. Instead, there's just a rolling maintenance branch. We take a snapshot of that branch and call it 5.15.8, to match the latest qt5webengine release. We need to remove some patches applied upstream already. qt5location has mapboxgl as a submodule, which is not included in the gitlab-generated tarball. Therefore, use the git download method with submodules enabled. 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. Instead of calling syncqt.pl, update the MODULE_VERSION in .qmake.conf to 5.15.8 and 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 Reviewed-by: Adam Duskett Tested-by: Adam Duskett Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/pkg-qmake.mk | 4 +- package/qt5/qt5.mk | 4 +- package/qt5/qt53d/qt53d.hash | 4 +- package/qt5/qt53d/qt53d.mk | 7 +- ...0006-Fix-build-with-GCC-11-include-limits.patch | 53 ------- ...-for-avoiding-huge-number-of-tiny-dashes.patch} | 0 .../qt5/qt5base/0007-Build-fixes-for-GCC-11.patch | 61 -------- .../qt5base/0008-Add-missing-limits-include.patch | 32 ---- .../qt5/qt5base/0009-Fix-build-on-riscv32.patch | 45 ------ ...ssing-intensive-painting-of-high-number-o.patch | 163 --------------------- ...x-for-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 +- package/qt5/qt5connectivity/qt5connectivity.hash | 4 +- package/qt5/qt5connectivity/qt5connectivity.mk | 7 +- ...revent_p-needs-c-limits-inlcude-fixes-gcc.patch | 45 ------ package/qt5/qt5declarative/qt5declarative.hash | 4 +- package/qt5/qt5declarative/qt5declarative.mk | 7 +- .../qt5graphicaleffects/qt5graphicaleffects.hash | 4 +- .../qt5/qt5graphicaleffects/qt5graphicaleffects.mk | 7 +- package/qt5/qt5imageformats/qt5imageformats.hash | 4 +- package/qt5/qt5imageformats/qt5imageformats.mk | 7 +- package/qt5/qt5knx/qt5knx.mk | 2 +- package/qt5/qt5location/Config.in | 1 + package/qt5/qt5location/qt5location.hash | 4 +- package/qt5/qt5location/qt5location.mk | 8 +- 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 +- package/qt5/qt5quickcontrols/qt5quickcontrols.hash | 4 +- package/qt5/qt5quickcontrols/qt5quickcontrols.mk | 7 +- .../qt5/qt5quickcontrols2/qt5quickcontrols2.hash | 4 +- package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk | 7 +- package/qt5/qt5quicktimeline/qt5quicktimeline.hash | 4 +- package/qt5/qt5quicktimeline/qt5quicktimeline.mk | 7 +- package/qt5/qt5remoteobjects/qt5remoteobjects.hash | 4 +- package/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 +- .../qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash | 4 +- .../qt5/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 +- ...romium-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 +- package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 4 +- package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 7 +- 73 files changed, 261 insertions(+), 649 deletions(-) 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/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/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..17da2bb9ad 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 11cf8320598821c97f853635c529451503917895f11e664dfdd0b63bf48c8a46 qt5location-861e372b6ad81570d4f496e42fb25a6699b72f2f-br1.tar.gz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5location/qt5location.mk b/package/qt5/qt5location/qt5location.mk index ea741d0df6..b1d19d7811 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 +QT5LOCATION_SITE_METHOD = git +QT5LOCATION_GIT_SUBMODULES = YES 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 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 From ps.report at gmx.net Thu Feb 3 20:23:27 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 3 Feb 2022 21:23:27 +0100 Subject: [Buildroot] [PATCH] package/util-linux: improve host build failure fix In-Reply-To: <20220202220538.2858380-1-giulio.benetti@benettiengineering.com> References: <412baee3-b818-521a-99bf-ee868d3e1be2@benettiengineering.com> <20220202220538.2858380-1-giulio.benetti@benettiengineering.com> Message-ID: <20220203212328.264bc948@gmx.net> Hello Giulio, On Wed, 2 Feb 2022 23:05:38 +0100, Giulio Benetti wrote: > As suggested by Peter Seiderer package util-linux doesn't need raw support > when built for host, so let's remove: > HOST_UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE > in favor of: > HOST_UTIL_LINUX_CONF_OPTS += --disable-raw > This is a better approach than my commit: > https://git.buildroot.net/buildroot/commit/?id=d895bd973b35fde10d3dd7db530d9e4782926497 > > Suggested-by: Peter Seiderer > Signed-off-by: Giulio Benetti Tested with registry.gitlab.com/buildroot.org/buildroot/base:20220105.2314: - reverted 'package/util-linux: fix host build failure' (d895bd973b35fde10d3dd7db530d9e4782926497) --> build fails with: No rule to make target 'disk-utils/raw.8' - build with 'package/util-linux: fix host build failure' (d895bd973b35fde10d3dd7db530d9e4782926497) --> build o.k. - build with this additional patch --> build o.k. Tested-by: Peter Seiderer > --- > package/util-linux/util-linux.mk | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk > index 5a4ff64d01..f3297257cf 100644 > --- a/package/util-linux/util-linux.mk > +++ b/package/util-linux/util-linux.mk > @@ -41,7 +41,6 @@ define UTIL_LINUX_FIX_DISK_UTILS_COMPILE > touch $(@D)/disk-utils/raw.8 > endef > UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE > -HOST_UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE > > HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf > The line above reads: # We also don't want the host-python dependency > @@ -49,7 +48,8 @@ HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf > HOST_UTIL_LINUX_CONF_OPTS = \ > --without-systemd \ > --with-systemdsystemunitdir=no \ > - --without-python > + --without-python \ > + --disable-raw So I would move the 'disable-raw' down to line 196ff (or below to an extra 'HOST_UTIL_LINUX_CONF_OPTS +=' section with comment why... With this change you can add my: Reviewed-by: Peter Seiderer Regards, Peter > > ifneq ($(BR2_PACKAGE_UTIL_LINUX_BINARIES)$(BR2_PACKAGE_UTIL_LINUX_CRAMFS)$(BR2_PACKAGE_UTIL_LINUX_FSCK)$(BR2_PACKAGE_UTIL_LINUX_LOSETUP),) > UTIL_LINUX_SELINUX_MODULES = fstools From arnout at mind.be Thu Feb 3 20:37:49 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 3 Feb 2022 21:37:49 +0100 Subject: [Buildroot] [PATCH v1] package/mesa3d: fix glvnd option handling In-Reply-To: <20220113212605.13343-1-ps.report@gmx.net> References: <20220113212605.13343-1-ps.report@gmx.net> Message-ID: <14d0cf8a-c3bd-55d8-c18d-6488d266d69e@mind.be> On 13/01/2022 22:26, Peter Seiderer wrote: > - 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),) Hard to read, but I don't know a better way to do it :-( Applied to master, thanks. Regards, Arnout > 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)) From arnout at mind.be Thu Feb 3 20:38:09 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 3 Feb 2022 21:38:09 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/gensio: add avahi optional dependency In-Reply-To: <20220113232903.318853-1-fontaine.fabrice@gmail.com> References: <20220113232903.318853-1-fontaine.fabrice@gmail.com> Message-ID: <2b31f3d9-12bb-dc7a-61ba-9e6981985cc0@mind.be> On 14/01/2022 00:29, 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 Applied to master, thanks. Regards, Arnout > --- > 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 \ From yann.morin.1998 at free.fr Thu Feb 3 20:37:46 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 3 Feb 2022 21:37:46 +0100 Subject: [Buildroot] [git commit] package/pkg-python: set _PYTHON_PROJECT_BASE Message-ID: <20220203203125.2CCB882A25@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7c1bb5c2bfdc9d726c41a66b30b7aa8e759c6596 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This variable is supposed to be set when cross compiling and is now required by setuptools to be set correctly after the latest version bump. Not much reference for that variable, exept for: https://github.com/python/cpython/blob/v3.10.2/Lib/sysconfig.py#L157-L159 Fixes: http://autobuild.buildroot.net/results/2e8/2e8093e68d04e8cbb20b095068b24c8bbe5f69ad http://autobuild.buildroot.net/results/9e3/9e3cfddb651a59d7f2d04bc88e6fff2a06e9b465 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/pkg-python.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 22ea77352c..00bdb9150a 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -33,6 +33,7 @@ PKG_PYTHON_DISTUTILS_ENV = \ LDSHARED="$(TARGET_CROSS)gcc -shared" \ PYTHONPATH="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_PATH),$(PYTHON_PATH))" \ PYTHONNOUSERSITE=1 \ + _PYTHON_PROJECT_BASE="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_DIR),$(PYTHON_DIR))" \ _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ _python_sysroot=$(STAGING_DIR) \ _python_prefix=/usr \ @@ -60,6 +61,7 @@ HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \ # Target setuptools-based packages PKG_PYTHON_SETUPTOOLS_ENV = \ + _PYTHON_PROJECT_BASE="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_DIR),$(PYTHON_DIR))" \ _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ PATH=$(BR_PATH) \ $(TARGET_CONFIGURE_OPTS) \ From yann.morin.1998 at free.fr Thu Feb 3 20:39:14 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 3 Feb 2022 21:39:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/pkg-python: set _PYTHON_PROJECT_BASE In-Reply-To: <20220202235020.782745-1-james.hilliard1@gmail.com> References: <20220202235020.782745-1-james.hilliard1@gmail.com> Message-ID: <20220203203914.GX457876@scaer> James, All, On 2022-02-02 16:50 -0700, James Hilliard spake thusly: > This variable is supposed to be set when cross compiling and is > now required by setuptools to be set correctly after the latest > version bump. > > Fixes: > http://autobuild.buildroot.net/results/2e8/2e8093e68d04e8cbb20b095068b24c8bbe5f69ad > http://autobuild.buildroot.net/results/9e3/9e3cfddb651a59d7f2d04bc88e6fff2a06e9b465 > > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/pkg-python.mk | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/package/pkg-python.mk b/package/pkg-python.mk > index 22ea77352c..00bdb9150a 100644 > --- a/package/pkg-python.mk > +++ b/package/pkg-python.mk > @@ -33,6 +33,7 @@ PKG_PYTHON_DISTUTILS_ENV = \ > LDSHARED="$(TARGET_CROSS)gcc -shared" \ > PYTHONPATH="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_PATH),$(PYTHON_PATH))" \ > PYTHONNOUSERSITE=1 \ > + _PYTHON_PROJECT_BASE="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_DIR),$(PYTHON_DIR))" \ > _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ > _python_sysroot=$(STAGING_DIR) \ > _python_prefix=/usr \ > @@ -60,6 +61,7 @@ HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \ > > # Target setuptools-based packages > PKG_PYTHON_SETUPTOOLS_ENV = \ > + _PYTHON_PROJECT_BASE="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_DIR),$(PYTHON_DIR))" \ > _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ > PATH=$(BR_PATH) \ > $(TARGET_CONFIGURE_OPTS) \ > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From arnout at mind.be Thu Feb 3 20:39:53 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 3 Feb 2022 21:39:53 +0100 Subject: [Buildroot] [PATCH 1/1] package/kf5/kf5-extra-cmake-modules: do not build documentation In-Reply-To: <20220113233758.110264-1-aperez@igalia.com> References: <20220113233758.110264-1-aperez@igalia.com> Message-ID: <56d88177-6e09-dba3-6b27-2119cd55db52@mind.be> On 14/01/2022 00:37, Adrian Perez de Castro wrote: > 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 Applied to master, thanks. (AFAICS the v2 was in fact identical) Regards, Arnout > --- > .../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)) From arnout at mind.be Thu Feb 3 20:41:12 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 3 Feb 2022 21:41:12 +0100 Subject: [Buildroot] [PATCH 2/2] package/rtl8723bu: fix firmware install path In-Reply-To: <20220114050734.497034-2-doug@schmorgal.com> References: <20220114050734.497034-1-doug@schmorgal.com> <20220114050734.497034-2-doug@schmorgal.com> Message-ID: <49ef11ab-7227-6a71-13d2-58da7d05aff2@mind.be> On 14/01/2022 06:07, Doug Brown via buildroot wrote: > 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 Applied to master, thanks. I also double-checked that this was indeed wrong from the very first version that was added to Buildroot. @Peter this is for stable. Regards, Arnout > --- > 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)) From arnout at mind.be Thu Feb 3 20:41:33 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 3 Feb 2022 21:41:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/libglvnd: needs threads In-Reply-To: <20220114074309.356873-1-fontaine.fabrice@gmail.com> References: <20220114074309.356873-1-fontaine.fabrice@gmail.com> Message-ID: On 14/01/2022 08:43, Fabrice Fontaine wrote: > 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 Applied to master, thanks. Regards, Arnout > --- > 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 From arnout at mind.be Thu Feb 3 20:42:02 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 3 Feb 2022 21:42:02 +0100 Subject: [Buildroot] [PATCH] package/poppler: fix build failure due to gcc bug 68485 In-Reply-To: <20220114084506.776644-1-giulio.benetti@benettiengineering.com> References: <20220114084506.776644-1-giulio.benetti@benettiengineering.com> Message-ID: <79c74b43-e0c3-e25e-c64a-3ea36bc7cf85@mind.be> On 14/01/2022 09:45, Giulio Benetti wrote: > 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 Applied to master, thanks. Regards, Arnout > --- > 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)) From arnout at mind.be Thu Feb 3 20:43:13 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 3 Feb 2022 21:43:13 +0100 Subject: [Buildroot] [PATCH] linux: clarify BR2_LINUX_KERNEL_CUSTOM_DTS_PATH description In-Reply-To: <20220114093049.2380117-1-michael.opdenacker@bootlin.com> References: <20220114093049.2380117-1-michael.opdenacker@bootlin.com> Message-ID: On 14/01/2022 10:30, Michael Opdenacker wrote: > 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. I rewrapped this at 72 columns, and added "... and dts files are compiled from here" to clarify that the dtsi are just copied. Applied to master, thanks. Regards, Arnout > > config BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME > bool "Keep the directory name of the Device Tree" From arnout at mind.be Thu Feb 3 20:43:46 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 3 Feb 2022 21:43:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/ghostscript: bump to version 9.55.0 In-Reply-To: <20220115143900.2033727-1-fontaine.fabrice@gmail.com> References: <20220115143900.2033727-1-fontaine.fabrice@gmail.com> Message-ID: On 15/01/2022 15:39, Fabrice Fontaine wrote: > - 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 Applied to master, thanks. Regards, Arnout > --- > ...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 -- make_null(op - i); > -+ 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); > -+ } > -+ else { > -+ check_ostack(O_STACK_PAD - stack_depth_adjust); > -+ push(O_STACK_PAD - stack_depth_adjust); > -+ for (i=0;i -+ make_null(op - i); > -+ } > - } > - } > - > --- > -2.25.1 > - > 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 > deleted file mode 100644 > index 72e07df0ac..0000000000 > --- a/package/ghostscript/0004-Bug-703902-Fix-op-stack-management-in-sampled_data_continue.patch > +++ /dev/null > @@ -1,68 +0,0 @@ > -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 - make_null(op - i); > - } > --- > -2.25.1 > - > diff --git a/package/ghostscript/ghostscript.hash b/package/ghostscript/ghostscript.hash > index f6cedc6198..95305a5e06 100644 > --- a/package/ghostscript/ghostscript.hash > +++ b/package/ghostscript/ghostscript.hash > @@ -1,5 +1,5 @@ > -# From https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9533/SHA512SUMS > -sha512 c142ef9d83896aa8fd18c8e412220fe8f4950614be00d327d27ab051fe85e16524bf2ee00f46c2aca7a352ce47bc3acf2c4de0f7bbea7e4c55474b8af6cdc0a6 ghostscript-9.53.3.tar.gz > +# From https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9550/SHA512SUMS > +sha512 3646b7981dced443559ba97c74c08463139e86a5479661e4dcd217c51e3f8e766da9cf4d7889a98ba3c079a17e9e5b452cc765b633e0720deab2337e77efdd09 ghostscript-9.55.0.tar.gz > > # Hash for license file: > -sha256 6f852249f975287b3efd43a5883875e47fa9f3125e2f1b18b5c09517ac30ecf2 LICENSE > +sha256 8ce064f423b7c24a011b6ebf9431b8bf9861a5255e47c84bfb23fc526d030a8b LICENSE > diff --git a/package/ghostscript/ghostscript.mk b/package/ghostscript/ghostscript.mk > index 9e13f29fe9..24a0c489a8 100644 > --- a/package/ghostscript/ghostscript.mk > +++ b/package/ghostscript/ghostscript.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -GHOSTSCRIPT_VERSION = 9.53.3 > +GHOSTSCRIPT_VERSION = 9.55.0 > GHOSTSCRIPT_SITE = https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs$(subst .,,$(GHOSTSCRIPT_VERSION)) > GHOSTSCRIPT_LICENSE = AGPL-3.0 > GHOSTSCRIPT_LICENSE_FILES = LICENSE > @@ -21,15 +21,6 @@ GHOSTSCRIPT_DEPENDENCIES = \ > libpng \ > tiff > > -# 0002-Bug-704342-Include-device-specifier-strings-in-acces.patch > -GHOSTSCRIPT_IGNORE_CVES += CVE-2021-3781 > - > -# 0003-oss-fuzz-30715-Check-stack-limits-after-function-evaluation.patch > -GHOSTSCRIPT_IGNORE_CVES += CVE-2021-45944 > - > -# 0004-Bug-703902-Fix-op-stack-management-in-sampled_data_continue.patch > -GHOSTSCRIPT_IGNORE_CVES += CVE-2021-45949 > - > # Ghostscript includes (old) copies of several libraries, delete them. > # Inspired by linuxfromscratch: > # http://www.linuxfromscratch.org/blfs/view/svn/pst/gs.html > @@ -52,6 +43,7 @@ GHOSTSCRIPT_CONF_OPTS = \ > --enable-freetype \ > --disable-gtk \ > --without-libpaper \ > + --without-pdf \ > --with-system-libtiff > > ifeq ($(BR2_PACKAGE_JBIG2DEC),y) From arnout at mind.be Thu Feb 3 20:44:01 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 3 Feb 2022 21:44:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/mpdecimal: bump to version 2.5.1 In-Reply-To: <20220115162142.2300207-1-fontaine.fabrice@gmail.com> References: <20220115162142.2300207-1-fontaine.fabrice@gmail.com> Message-ID: <42d558bf-d2a9-f581-3a15-f8dc89150b47@mind.be> On 15/01/2022 17:21, Fabrice Fontaine wrote: > Drop patch (already in version) and so autoreconf > > https://www.bytereef.org/mpdecimal/changelog.html > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...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 From arnout at mind.be Thu Feb 3 20:44:42 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 3 Feb 2022 21:44:42 +0100 Subject: [Buildroot] [git commit] package/mesa3d: fix glvnd option handling Message-ID: <20220203203800.4F992825B5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ac5ab240f1c5fd2c920f9d048c20827c9e56f303 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/mesa3d/mesa3d.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 6907d8c94f..c572f9b1aa 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)) From arnout at mind.be Thu Feb 3 20:44:43 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 3 Feb 2022 21:44:43 +0100 Subject: [Buildroot] [git commit] package/kf5/kf5-extra-cmake-modules: do not build documentation Message-ID: <20220203203800.629D982B5D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b341f0c91f658484f90c5addd553c579b8d210c1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/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)) From arnout at mind.be Thu Feb 3 20:44:43 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 3 Feb 2022 21:44:43 +0100 Subject: [Buildroot] [git commit] package/rtl8723bu: bump to version 19b4bdc05483a1e79a4f955a80f8f72cdd5dedc3 Message-ID: <20220203203800.6CB3E82AE4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=89211450c68df76f3b850c651733c86fb02b40d6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This version fixes a bug that prevents the user from switching from one access point to another. Signed-off-by: Doug Brown Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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) From arnout at mind.be Thu Feb 3 20:44:42 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 3 Feb 2022 21:44:42 +0100 Subject: [Buildroot] [git commit] package/gensio: add avahi optional dependency Message-ID: <20220203203800.58B1E7FFA5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f0a1d47f6fe6bda3b18b3fcfca37757b37695dbb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 \ From arnout at mind.be Thu Feb 3 20:44:43 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 3 Feb 2022 21:44:43 +0100 Subject: [Buildroot] [git commit] package/poppler: fix build failure due to gcc bug 68485 Message-ID: <20220203203800.8CB0882B5D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=de1a3737879eef4a9dd283269a896e50a1badabf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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)) From arnout at mind.be Thu Feb 3 20:44:43 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 3 Feb 2022 21:44:43 +0100 Subject: [Buildroot] [git commit] linux: clarify BR2_LINUX_KERNEL_CUSTOM_DTS_PATH description Message-ID: <20220203203800.94DC382AE4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8ef413b59a870b6a593eb9f1a71caef30c1848c3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- linux/Config.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 582f37ba7c..13d99bd09d 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 the .dts files will + be compiled from there. config BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME bool "Keep the directory name of the Device Tree" From arnout at mind.be Thu Feb 3 20:44:43 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 3 Feb 2022 21:44:43 +0100 Subject: [Buildroot] [git commit] package/libglvnd: needs threads Message-ID: <20220203203800.83DBE7FFA5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2a7b360b5f8ed86001bb349d937100e9e46584b0 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: 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 From arnout at mind.be Thu Feb 3 20:44:43 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 3 Feb 2022 21:44:43 +0100 Subject: [Buildroot] [git commit] package/mpdecimal: bump to version 2.5.1 Message-ID: <20220203203800.A772E825B5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=995c093d6a3e8042110d6a8d96fdc7ad65a557c4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patch (already in version) and so autoreconf https://www.bytereef.org/mpdecimal/changelog.html Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...-support-for-enable-disable-shared-static.patch | 147 --------------------- package/mpdecimal/mpdecimal.hash | 2 +- package/mpdecimal/mpdecimal.mk | 3 +- 3 files changed, 2 insertions(+), 150 deletions(-) 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 From arnout at mind.be Thu Feb 3 20:44:43 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 3 Feb 2022 21:44:43 +0100 Subject: [Buildroot] [git commit] package/ghostscript: bump to version 9.55.0 Message-ID: <20220203203800.9EA61825B5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7a4944569ce83b0b7b0cabd6e8aa184b8cb72a22 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...-704405-Fix-typo-in-non-forked-lcms2-code.patch | 28 +++ ...01-bug-702985-drop-use-of-FT_CALLBACK_DEF.patch | 55 ----- ...Include-device-specifier-strings-in-acces.patch | 234 --------------------- ...ck-stack-limits-after-function-evaluation.patch | 52 ----- ...stack-management-in-sampled_data_continue.patch | 68 ------ package/ghostscript/ghostscript.hash | 6 +- package/ghostscript/ghostscript.mk | 12 +- 7 files changed, 33 insertions(+), 422 deletions(-) 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 commit: https://git.buildroot.net/buildroot/commit/?id=657d9731cf52dd7e9a2564ba68ce19e675c1eaee branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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. It was like that since the very first version that was added to Buildroot. Signed-off-by: Doug Brown Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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)) From james.hilliard1 at gmail.com Thu Feb 3 20:46:53 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 3 Feb 2022 13:46:53 -0700 Subject: [Buildroot] [PATCH v7 1/1] package/qt5: bump packages to latest kde submodule versions In-Reply-To: References: <20220131225622.90226-1-james.hilliard1@gmail.com> Message-ID: On Thu, Feb 3, 2022 at 12:35 PM Arnout Vandecappelle wrote: > > > > On 31/01/2022 23:56, 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 > > It took me some reading of the patch and of the upstream repositories to > understand that there are actually no release tarballs or tags, and the the > 5.15.8 is something we just pull out of our hat to be compatible with > qt5webengine. So I updated the commit message to (hopefully) better explain that. Yeah, upstream def makes this a bit annoying. > > > > > 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. > > Instead of creating a separate package for it (which BTW you forgot to add to > DEVELOPERS), I changed this to use the git download method and _GIT_SUBMODULES = > YES. I checked that it extracts to exactly the same thing. Yeah, I had done it this way mostly for consistency with the qt5webengine WIP update as for that we kinda need to patch multiple deps that have upstream patches that apply easier against the deps directly. > > > > > 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. > > I don't really understand why this was needed rather than calling syncqt > explicitly, but OK. Some packages like qt5base don't work with calling syncqt explicitly as they have different logic needed. > > Applied to master, thanks. > > Regards, > Arnout > > > > > 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 > > [snip] From yann.morin.1998 at free.fr Thu Feb 3 20:56:17 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 3 Feb 2022 21:56:17 +0100 Subject: [Buildroot] [git commit] package/gdb: backport fix for gdbserver 11.1 on aarch64 Message-ID: <20220203204945.F13E7825B5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4353c716466fb8860dea265985829e9fae58e016 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 [yann.morin.1998 at free.fr: add SoB in patch, provided live on IRC] Signed-off-by: Yann E. MORIN --- .../gdb/11.1/0010-gdbserver-aarch64-support.patch | 320 +++++++++++++++++++++ 1 file changed, 320 insertions(+) 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..3718b1b6fd --- /dev/null +++ b/package/gdb/11.1/0010-gdbserver-aarch64-support.patch @@ -0,0 +1,320 @@ +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. + +Backported from: eb79b2318066cafb75ffdce310e3bbd44f7c79e3 +Signed-off-by: Joachim Wiberg +--- + 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 yann.morin.1998 at free.fr Thu Feb 3 20:58:38 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 3 Feb 2022 21:58:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/gdb: backport fix for gdbserver 11.1 on aarch64 In-Reply-To: <20220128084244.2258811-1-troglobit@gmail.com> References: <20220128084244.2258811-1-troglobit@gmail.com> Message-ID: <20220203205838.GY457876@scaer> Joachim, All, On 2022-01-28 09:42 +0100, Joachim Wiberg spake thusly: > 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. You forgot to add your SoB here, so I added what you provided on IRC: Backported from: eb79b2318066cafb75ffdce310e3bbd44f7c79e3 Signed-off-by: Joachim Wiberg Applied to master, thanks. Regards, Yann E. MORIN. > +--- > + 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 > + > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From ca0 at protonmail.ch Thu Feb 3 21:37:39 2022 From: ca0 at protonmail.ch (ca0) Date: Thu, 03 Feb 2022 21:37:39 +0000 Subject: [Buildroot] package libldns In-Reply-To: <6c85206c-139f-474d-7ca5-5f21fd606d96@mind.be> References: <5_xofMlQqIrdAjpopLNCIYCGiqsc2UoXvUQG4GIV5Bd0dY31bw-gZ_0eoD0ix_iW-BI3-5O_RbQESkV3ybUN1zFSLY2r3PAr3ZOfxYOFmrU=@protonmail.ch> <6c85206c-139f-474d-7ca5-5f21fd606d96@mind.be> Message-ID: Naah - builds only for Intel. Do an arm build and you'll find that the m4/libtool.m4 runs a whole lot of ldconfig commands that show some error codes and the worst part is that the libc files mentioned are "blown away" (see https://dictionary.tn/whats-another-word-for-blown-away/) like taken our behind the shed and have a few bullets put in them - ie. deleted. Do you know what a pain it is not having the build fail there and then, because you have to debug a non working init, check the kernel and then find that your user space has been crippled by some Nazi collaborators (my bad, I'll stick to EU Nazi references from now on). Are you saying that this package works for ARM? Sent with ProtonMail Secure Email. ------- Original Message ------- On Thursday, February 3rd, 2022 at 6:49 PM, Arnout Vandecappelle wrote: > On 03/02/2022 19:45, Arnout Vandecappelle wrote: > > > Hi ca0, > > > > On 03/02/2022 03:01, ca0 via buildroot wrote: > > > > > Building this package with orangepi_zero_defconfig results in an useless user > > > > > > system because both thee files are blown away > > > > What is "this package"? The subject mentions libidns, but there's no libidns > > > > package in buildroot. > > Apparently I misread, it's libldns which does indeed exist. > > I did a build of it and it looks OK... > > Regards, > > Arnout > > > What do you mean with "blown away"? > > > > > ./output/target/usr/lib/ld-musl-armhf.so.1 > > > > This file belongs to the musl standard C library, but orangepi_zero_defconfig > > > > builds a uClibc standard C library, so it shouldn't even be there. > > > > You can check which libraries are needed for an executable or shared library > > > > with "readelf -d output/target/...". All the libraries mentioned there should > > > > exist in output/target/lib or output/target/usr/lib. If not, it is indeed broken. > > > > If you want more help, you will need to provide a whole lot more details. > > > > Regards, > > > > Arnout > > > > > ./output/host/arm-buildroot-linux-musleabihf/sysroot/usr/lib/ld-musl-armhf.so.1 > > > > > > Is the ldconfig hackery needed for embedded systems and is it supported when > > > > > > cross compiling? > > > > > > buildroot mailing list > > > > > > buildroot at buildroot.org > > > > > > https://lists.buildroot.org/mailman/listinfo/buildroot From fontaine.fabrice at gmail.com Thu Feb 3 22:05:04 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 3 Feb 2022 23:05:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/ddrescue: bump to version 1.26 Message-ID: <20220203220504.667447-1-fontaine.fabrice@gmail.com> https://lists.gnu.org/archive/html/info-gnu/2022-01/msg00013.html Signed-off-by: Fabrice Fontaine --- package/ddrescue/ddrescue.hash | 4 ++-- package/ddrescue/ddrescue.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ddrescue/ddrescue.hash b/package/ddrescue/ddrescue.hash index 6877b7008d..f7c82b086b 100644 --- a/package/ddrescue/ddrescue.hash +++ b/package/ddrescue/ddrescue.hash @@ -1,4 +1,4 @@ -# From https://lists.gnu.org/archive/html/info-gnu/2020-03/msg00002.html -sha256 ce538ebd26a09f45da67d3ad3f7431932428231ceec7a2d255f716fa231a1063 ddrescue-1.25.tar.lz +# From https://lists.gnu.org/archive/html/info-gnu/2022-01/msg00013.html +sha256 e513cd3a90d9810dfdd91197d40aa40f6df01597bfb5ecfdfb205de1127c551f ddrescue-1.26.tar.lz # Locally computed sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef COPYING diff --git a/package/ddrescue/ddrescue.mk b/package/ddrescue/ddrescue.mk index f113681fa1..6d16d8701f 100644 --- a/package/ddrescue/ddrescue.mk +++ b/package/ddrescue/ddrescue.mk @@ -4,7 +4,7 @@ # ################################################################################ -DDRESCUE_VERSION = 1.25 +DDRESCUE_VERSION = 1.26 DDRESCUE_SOURCE = ddrescue-$(DDRESCUE_VERSION).tar.lz DDRESCUE_SITE = http://download.savannah.gnu.org/releases/ddrescue DDRESCUE_LICENSE = GPL-2.0+ -- 2.34.1 From fontaine.fabrice at gmail.com Thu Feb 3 22:26:39 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 3 Feb 2022 23:26:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/dt-utils: use snapshot tarball Message-ID: <20220203222639.725822-1-fontaine.fabrice@gmail.com> Use snapshot tarball so DT_UTILS_VERSION will match what is returned by https://release-monitoring.org Signed-off-by: Fabrice Fontaine --- package/dt-utils/dt-utils.hash | 2 +- package/dt-utils/dt-utils.mk | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/dt-utils/dt-utils.hash b/package/dt-utils/dt-utils.hash index 74819158bb..9fca594db5 100644 --- a/package/dt-utils/dt-utils.hash +++ b/package/dt-utils/dt-utils.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8b29d3a8799170afdb1b077e655528bf4e6afe0c789107b1eec8fff9d4482771 dt-utils-v2021.03.0-br1.tar.gz +sha256 63cf47c70911bb3605bafac38a5a7e19eb753ac1c90de2abceaf2fdefd71be6d dt-utils-2021.03.0.tar.xz sha256 a45932c79317d15116eadbf1c9c6fc59117ec3c4621db3a876066defa723963b COPYING diff --git a/package/dt-utils/dt-utils.mk b/package/dt-utils/dt-utils.mk index bc7fd90631..d264e2cdc9 100644 --- a/package/dt-utils/dt-utils.mk +++ b/package/dt-utils/dt-utils.mk @@ -4,9 +4,9 @@ # ################################################################################ -DT_UTILS_VERSION = v2021.03.0 -DT_UTILS_SITE = https://git.pengutronix.de/git/tools/dt-utils -DT_UTILS_SITE_METHOD = git +DT_UTILS_VERSION = 2021.03.0 +DT_UTILS_SOURCE = dt-utils-$(DT_UTILS_VERSION).tar.xz +DT_UTILS_SITE = https://git.pengutronix.de/cgit/tools/dt-utils/snapshot DT_UTILS_LICENSE = GPL-2.0 DT_UTILS_LICENSE_FILES = COPYING DT_UTILS_DEPENDENCIES = udev -- 2.34.1 From giulio.benetti at benettiengineering.com Thu Feb 3 22:29:47 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 3 Feb 2022 23:29:47 +0100 Subject: [Buildroot] [PATCH] package/util-linux: improve host build failure fix In-Reply-To: <20220203212328.264bc948@gmx.net> References: <412baee3-b818-521a-99bf-ee868d3e1be2@benettiengineering.com> <20220202220538.2858380-1-giulio.benetti@benettiengineering.com> <20220203212328.264bc948@gmx.net> Message-ID: <08bae7c4-b9cc-ebb9-c53e-5a3d0b5d044f@benettiengineering.com> Hi Peter, On 03/02/22 21:23, Peter Seiderer wrote: > Hello Giulio, > > On Wed, 2 Feb 2022 23:05:38 +0100, Giulio Benetti wrote: > >> As suggested by Peter Seiderer package util-linux doesn't need raw support >> when built for host, so let's remove: >> HOST_UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE >> in favor of: >> HOST_UTIL_LINUX_CONF_OPTS += --disable-raw >> This is a better approach than my commit: >> https://git.buildroot.net/buildroot/commit/?id=d895bd973b35fde10d3dd7db530d9e4782926497 >> >> Suggested-by: Peter Seiderer >> Signed-off-by: Giulio Benetti > > Tested with registry.gitlab.com/buildroot.org/buildroot/base:20220105.2314: > > - reverted 'package/util-linux: fix host build failure' (d895bd973b35fde10d3dd7db530d9e4782926497) > --> build fails with: No rule to make target 'disk-utils/raw.8' > > - build with 'package/util-linux: fix host build failure' (d895bd973b35fde10d3dd7db530d9e4782926497) > --> build o.k. > > - build with this additional patch > --> build o.k. > > Tested-by: Peter Seiderer > > >> --- >> package/util-linux/util-linux.mk | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk >> index 5a4ff64d01..f3297257cf 100644 >> --- a/package/util-linux/util-linux.mk >> +++ b/package/util-linux/util-linux.mk >> @@ -41,7 +41,6 @@ define UTIL_LINUX_FIX_DISK_UTILS_COMPILE >> touch $(@D)/disk-utils/raw.8 >> endef >> UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE >> -HOST_UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE >> >> HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf >> > > The line above reads: > > # We also don't want the host-python dependency Oh, you're totally right >> @@ -49,7 +48,8 @@ HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf >> HOST_UTIL_LINUX_CONF_OPTS = \ >> --without-systemd \ >> --with-systemdsystemunitdir=no \ >> - --without-python >> + --without-python \ >> + --disable-raw > > So I would move the 'disable-raw' down to line 196ff (or below to an > extra 'HOST_UTIL_LINUX_CONF_OPTS +=' section with comment why... Yes > With this change you can add my: > > Reviewed-by: Peter Seiderer > > Regards, > Peter > >> >> ifneq ($(BR2_PACKAGE_UTIL_LINUX_BINARIES)$(BR2_PACKAGE_UTIL_LINUX_CRAMFS)$(BR2_PACKAGE_UTIL_LINUX_FSCK)$(BR2_PACKAGE_UTIL_LINUX_LOSETUP),) >> UTIL_LINUX_SELINUX_MODULES = fstools > Thank you! Going to reply with V2. Best regards -- Giulio Benetti Benetti Engineering sas From giulio.benetti at benettiengineering.com Thu Feb 3 22:31:24 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 3 Feb 2022 23:31:24 +0100 Subject: [Buildroot] [PATCH v2] package/util-linux: improve host build failure fix In-Reply-To: <20220203212328.264bc948@gmx.net> References: <20220203212328.264bc948@gmx.net> Message-ID: <20220203223124.3017611-1-giulio.benetti@benettiengineering.com> As suggested by Peter Seiderer package util-linux doesn't need raw support when built for host, so let's remove: HOST_UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE in favor of: HOST_UTIL_LINUX_CONF_OPTS += --disable-raw This is a better approach than my commit: https://git.buildroot.net/buildroot/commit/?id=d895bd973b35fde10d3dd7db530d9e4782926497 Suggested-by: Peter Seiderer Tested-by: Peter Seiderer Reviewed-by: Peter Seiderer Signed-off-by: Giulio Benetti --- V1->V2: * move --disable-raw to a dedicated HOST_UTIL_LINUX_CONF_OPTS as suggested by Peter Seiderer. This avoid ambiguity since previously it was under the comment "# We also don't want the host-python dependency". --- package/util-linux/util-linux.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 5a4ff64d01..40fd518a58 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -41,7 +41,6 @@ define UTIL_LINUX_FIX_DISK_UTILS_COMPILE touch $(@D)/disk-utils/raw.8 endef UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE -HOST_UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf @@ -202,6 +201,11 @@ HOST_UTIL_LINUX_CONF_OPTS += \ --without-ncursesw \ --without-tinfo +# Disable raw command since starting from version 2.37 needs a +# work-around to build but in the end we don't need at all. +HOST_UTIL_LINUX_CONF_OPTS += \ + --disable-raw + ifeq ($(BR2_PACKAGE_HOST_UTIL_LINUX),y) HOST_UTIL_LINUX_CONF_OPTS += --disable-makeinstall-chown # disable commands that have ncurses dependency, as well as -- 2.25.1 From fontaine.fabrice at gmail.com Thu Feb 3 22:36:15 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 3 Feb 2022 23:36:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/trace-cmd: use snapshot tarball Message-ID: <20220203223615.729285-1-fontaine.fabrice@gmail.com> Use snapshot tarball so TRACE_CMD_VERSION will match what is returned by https://release-monitoring.org Signed-off-by: Fabrice Fontaine --- package/trace-cmd/trace-cmd.hash | 2 +- package/trace-cmd/trace-cmd.mk | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/trace-cmd/trace-cmd.hash b/package/trace-cmd/trace-cmd.hash index 1f34a0da60..00cecc7828 100644 --- a/package/trace-cmd/trace-cmd.hash +++ b/package/trace-cmd/trace-cmd.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 9401a43bda4837dfde5e64e0dbe5d3918bf50eb86b4d23fa89713b0f2defcbc1 trace-cmd-trace-cmd-v2.9.6-br1.tar.gz +sha256 45924a763376a700221f64b4034f87263e4038ec88b120a0abfb5743d051d068 trace-cmd-v2.9.6.tar.gz sha256 b1d04b850c1c7471b0f0896f6c6f0fcfc9f07e2dd183a5f5826af269fe9e88fb COPYING sha256 70f297763149e72306919c924e164f83041d5e512868d4c8c1826c171b3e49f9 COPYING.LIB sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 LICENSES/GPL-2.0 diff --git a/package/trace-cmd/trace-cmd.mk b/package/trace-cmd/trace-cmd.mk index a592b1f027..d9ed417f20 100644 --- a/package/trace-cmd/trace-cmd.mk +++ b/package/trace-cmd/trace-cmd.mk @@ -4,9 +4,10 @@ # ################################################################################ -TRACE_CMD_VERSION = trace-cmd-v2.9.6 -TRACE_CMD_SITE = https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git -TRACE_CMD_SITE_METHOD = git +TRACE_CMD_VERSION = 2.9.6 +TRACE_CMD_SOURCE = trace-cmd-v$(TRACE_CMD_VERSION).tar.gz +TRACE_CMD_SITE = \ + https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot TRACE_CMD_LICENSE = GPL-2.0, LGPL-2.1 TRACE_CMD_LICENSE_FILES = COPYING COPYING.LIB LICENSES/GPL-2.0 LICENSES/LGPL-2.1 -- 2.34.1 From fontaine.fabrice at gmail.com Thu Feb 3 22:47:09 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 3 Feb 2022 23:47:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/speexdsp: use snapshot tarball Message-ID: <20220203224709.736830-1-fontaine.fabrice@gmail.com> Use snapshot tarball so SPEEXDSP_VERSION will match what is returned by https://release-monitoring.org Signed-off-by: Fabrice Fontaine --- package/speexdsp/speexdsp.hash | 2 +- package/speexdsp/speexdsp.mk | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/speexdsp/speexdsp.hash b/package/speexdsp/speexdsp.hash index fd9870dc58..82e054d4d4 100644 --- a/package/speexdsp/speexdsp.hash +++ b/package/speexdsp/speexdsp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c92c7e428cb5ca11b4e6f13118ff288332f330b6fefc93cb39bf7b43b13cb1f7 speexdsp-SpeexDSP-1.2.0-br1.tar.gz +sha256 0fe0e31be215f820bed0f9c913c673997773fce3a03a4555658e7b73a54eed7b speexdsp-SpeexDSP-1.2.0.tar.bz2 sha256 671bb5d8fd3c6b05a2e831d90f978ac27965c92bd8ea6d16b3df76e3440c0e9f COPYING diff --git a/package/speexdsp/speexdsp.mk b/package/speexdsp/speexdsp.mk index 35c06dd833..8e886b2b21 100644 --- a/package/speexdsp/speexdsp.mk +++ b/package/speexdsp/speexdsp.mk @@ -4,9 +4,9 @@ # ################################################################################ -SPEEXDSP_VERSION = SpeexDSP-1.2.0 -SPEEXDSP_SITE = https://gitlab.xiph.org/xiph/speexdsp.git -SPEEXDSP_SITE_METHOD = git +SPEEXDSP_VERSION = 1.2.0 +SPEEXDSP_SOURCE = speexdsp-SpeexDSP-$(SPEEXDSP_VERSION).tar.bz2 +SPEEXDSP_SITE = https://gitlab.xiph.org/xiph/speexdsp/-/archive/SpeexDSP-$(SPEEXDSP_VERSION) SPEEXDSP_LICENSE = BSD-3-Clause SPEEXDSP_LICENSE_FILES = COPYING SPEEXDSP_INSTALL_STAGING = YES -- 2.34.1 From giulio.benetti at benettiengineering.com Thu Feb 3 22:59:52 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 3 Feb 2022 23:59:52 +0100 Subject: [Buildroot] [PATCH 0/5] Fix genimage build failure on Gitlab-CI Message-ID: <20220203225957.3039320-1-giulio.benetti@benettiengineering.com> Giulio Benetti (5): board/friendlyarm/nanopc-t4:use partition-type-uuid for genimage-15 board/friendlyarm/nanopi-m4:use partition-type-uuid for genimage-15 board/pine64/rockpro64:use partition-type-uuid for genimage-15 board/radxa/rockpi-4:use partition-type-uuid for genimage-15 board/radxa/rockpi-n10:use partition-type-uuid for genimage-15 board/friendlyarm/nanopc-t4/genimage.cfg | 4 ++-- board/friendlyarm/nanopi-m4/genimage.cfg | 4 ++-- board/pine64/rockpro64/genimage.cfg | 4 ++-- board/radxa/rockpi-4/genimage.cfg | 4 ++-- board/radxa/rockpi-n10/genimage.cfg | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) -- 2.25.1 From giulio.benetti at benettiengineering.com Thu Feb 3 22:59:53 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 3 Feb 2022 23:59:53 +0100 Subject: [Buildroot] [PATCH 1/5] board/friendlyarm/nanopc-t4:use partition-type-uuid for genimage-15 In-Reply-To: <20220203225957.3039320-1-giulio.benetti@benettiengineering.com> References: <20220203225957.3039320-1-giulio.benetti@benettiengineering.com> Message-ID: <20220203225957.3039320-2-giulio.benetti@benettiengineering.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 So let's use for EFI System partition: 'partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b' and for Root partition (64-bit ARM/AArch64): 'partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae' Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/1929717055 FTR, the magic UUID are from: https://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs Signed-off-by: Giulio Benetti --- board/friendlyarm/nanopc-t4/genimage.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/friendlyarm/nanopc-t4/genimage.cfg b/board/friendlyarm/nanopc-t4/genimage.cfg index d63c293ab4..98dc2f3892 100644 --- a/board/friendlyarm/nanopc-t4/genimage.cfg +++ b/board/friendlyarm/nanopc-t4/genimage.cfg @@ -26,14 +26,14 @@ image sdcard.img { } partition boot { - partition-type = 0xC + partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b bootable = "true" image = "boot.vfat" offset = 16M } partition rootfs { - partition-type = 0x83 + partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae image = "rootfs.ext4" } } -- 2.25.1 From giulio.benetti at benettiengineering.com Thu Feb 3 22:59:54 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 3 Feb 2022 23:59:54 +0100 Subject: [Buildroot] [PATCH 2/5] board/friendlyarm/nanopi-m4:use partition-type-uuid for genimage-15 In-Reply-To: <20220203225957.3039320-1-giulio.benetti@benettiengineering.com> References: <20220203225957.3039320-1-giulio.benetti@benettiengineering.com> Message-ID: <20220203225957.3039320-3-giulio.benetti@benettiengineering.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 So let's use for EFI System partition: 'partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b' and for Root partition (64-bit ARM/AArch64): 'partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae' Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/1929717059 FTR, the magic UUID are from: https://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs Signed-off-by: Giulio Benetti --- board/friendlyarm/nanopi-m4/genimage.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/friendlyarm/nanopi-m4/genimage.cfg b/board/friendlyarm/nanopi-m4/genimage.cfg index 35d056ae6e..8d0e6ad13b 100644 --- a/board/friendlyarm/nanopi-m4/genimage.cfg +++ b/board/friendlyarm/nanopi-m4/genimage.cfg @@ -26,14 +26,14 @@ image sdcard.img { } partition boot { - partition-type = 0xC + partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b bootable = "true" image = "boot.vfat" offset = 16M } partition rootfs { - partition-type = 0x83 + partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae image = "rootfs.ext4" } } -- 2.25.1 From giulio.benetti at benettiengineering.com Thu Feb 3 22:59:56 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 3 Feb 2022 23:59:56 +0100 Subject: [Buildroot] [PATCH 4/5] board/radxa/rockpi-4:use partition-type-uuid for genimage-15 In-Reply-To: <20220203225957.3039320-1-giulio.benetti@benettiengineering.com> References: <20220203225957.3039320-1-giulio.benetti@benettiengineering.com> Message-ID: <20220203225957.3039320-5-giulio.benetti@benettiengineering.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 So let's use for EFI System partition: 'partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b' and for Root partition (64-bit ARM/AArch64): 'partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae' Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/1929717240 FTR, the magic UUID are from: https://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs Signed-off-by: Giulio Benetti --- board/radxa/rockpi-4/genimage.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/radxa/rockpi-4/genimage.cfg b/board/radxa/rockpi-4/genimage.cfg index a5100af420..68cc4d61a8 100644 --- a/board/radxa/rockpi-4/genimage.cfg +++ b/board/radxa/rockpi-4/genimage.cfg @@ -26,14 +26,14 @@ image sdcard.img { } partition boot { - partition-type = 0xC + partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b bootable = "true" image = "boot.vfat" offset = 16M } partition rootfs { - partition-type = 0x83 + partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae image = "rootfs.ext4" } } -- 2.25.1 From giulio.benetti at benettiengineering.com Thu Feb 3 22:59:55 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 3 Feb 2022 23:59:55 +0100 Subject: [Buildroot] [PATCH 3/5] board/pine64/rockpro64:use partition-type-uuid for genimage-15 In-Reply-To: <20220203225957.3039320-1-giulio.benetti@benettiengineering.com> References: <20220203225957.3039320-1-giulio.benetti@benettiengineering.com> Message-ID: <20220203225957.3039320-4-giulio.benetti@benettiengineering.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 So let's use for EFI System partition: 'partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b' and for Root partition (64-bit ARM/AArch64): 'partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae' Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/1929717243 FTR, the magic UUID are from: https://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs Signed-off-by: Giulio Benetti --- board/pine64/rockpro64/genimage.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/pine64/rockpro64/genimage.cfg b/board/pine64/rockpro64/genimage.cfg index 14dd0e1d18..d3926f2df6 100644 --- a/board/pine64/rockpro64/genimage.cfg +++ b/board/pine64/rockpro64/genimage.cfg @@ -26,14 +26,14 @@ image sdcard.img { } partition boot { - partition-type = 0xC + partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b bootable = "true" image = "boot.vfat" offset = 16M } partition rootfs { - partition-type = 0x83 + partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae image = "rootfs.ext4" } } -- 2.25.1 From giulio.benetti at benettiengineering.com Thu Feb 3 22:59:57 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 3 Feb 2022 23:59:57 +0100 Subject: [Buildroot] [PATCH 5/5] board/radxa/rockpi-n10:use partition-type-uuid for genimage-15 In-Reply-To: <20220203225957.3039320-1-giulio.benetti@benettiengineering.com> References: <20220203225957.3039320-1-giulio.benetti@benettiengineering.com> Message-ID: <20220203225957.3039320-6-giulio.benetti@benettiengineering.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 So let's use for EFI System partition: 'partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b' and for Root partition (64-bit ARM/AArch64): 'partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae' Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/1929717241 FTR, the magic UUID are from: https://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs Signed-off-by: Giulio Benetti --- board/radxa/rockpi-n10/genimage.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/radxa/rockpi-n10/genimage.cfg b/board/radxa/rockpi-n10/genimage.cfg index 652e75db11..7f4b639bbc 100644 --- a/board/radxa/rockpi-n10/genimage.cfg +++ b/board/radxa/rockpi-n10/genimage.cfg @@ -26,14 +26,14 @@ image sdcard.img { } partition boot { - partition-type = 0xC + partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b bootable = "true" image = "boot.vfat" offset = 16M } partition rootfs { - partition-type = 0x83 + partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae image = "rootfs.ext4" } } -- 2.25.1 From fontaine.fabrice at gmail.com Thu Feb 3 23:14:32 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 4 Feb 2022 00:14:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/netcat-openbsd: bump to version 1.218 Message-ID: <20220203231432.748145-1-fontaine.fabrice@gmail.com> - Use official tarball so NETCAT_OPENBSD_VERSION will match what is returned by https://release-monitoring.org - Use netcat.c as the license file Signed-off-by: Fabrice Fontaine --- package/netcat-openbsd/netcat-openbsd.hash | 9 ++++++--- package/netcat-openbsd/netcat-openbsd.mk | 9 +++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/package/netcat-openbsd/netcat-openbsd.hash b/package/netcat-openbsd/netcat-openbsd.hash index b70cae8860..e55dea53e7 100644 --- a/package/netcat-openbsd/netcat-openbsd.hash +++ b/package/netcat-openbsd/netcat-openbsd.hash @@ -1,3 +1,6 @@ -# Locally calculated -sha256 55e578f652cbf6ffc95f75ea3e2645ab335fab63649568bd7cdb0a6331ca87de netcat-openbsd-debian_1.195-2-br1.tar.gz -sha256 e2e86d58c38f044a49f51e45515747585db58a2305419c73323eaad88fcaef5c debian/copyright +# From http://snapshot.debian.org/archive/debian/20211206T030211Z/pool/main/n/netcat-openbsd/netcat-openbsd_1.218-3.dsc +sha256 a28a5d39abaf481747b1e78b4b50e96d0cdab0ffef289cba156dc11941c64857 netcat-openbsd_1.218.orig.tar.gz +sha256 19229ebc825d12cd805843228c498cc881dcef127a9d680fcfbd8cb2da966161 netcat-openbsd_1.218-3.debian.tar.xz + +# Hash for license file +sha256 acfd1d822ee2e8e0b196c7a369383d0cb9bc131b56c3c95976a32498728fe1e3 netcat.c diff --git a/package/netcat-openbsd/netcat-openbsd.mk b/package/netcat-openbsd/netcat-openbsd.mk index a2333531c0..311f8aa819 100644 --- a/package/netcat-openbsd/netcat-openbsd.mk +++ b/package/netcat-openbsd/netcat-openbsd.mk @@ -4,11 +4,12 @@ # ################################################################################ -NETCAT_OPENBSD_VERSION = debian/1.195-2 -NETCAT_OPENBSD_SITE = https://salsa.debian.org/debian/netcat-openbsd.git -NETCAT_OPENBSD_SITE_METHOD = git +NETCAT_OPENBSD_VERSION = 1.218 +NETCAT_OPENBSD_SOURCE = netcat-openbsd_$(NETCAT_OPENBSD_VERSION).orig.tar.gz +NETCAT_OPENBSD_PATCH = netcat-openbsd_$(NETCAT_OPENBSD_VERSION)-3.debian.tar.xz +NETCAT_OPENBSD_SITE = http://snapshot.debian.org/archive/debian/20211206T030211Z/pool/main/n/netcat-openbsd NETCAT_OPENBSD_LICENSE = BSD-3-Clause -NETCAT_OPENBSD_LICENSE_FILES = debian/copyright +NETCAT_OPENBSD_LICENSE_FILES = netcat.c NETCAT_OPENBSD_DEPENDENCIES = host-pkgconf libbsd define NETCAT_OPENBSD_APPLY_DEBIAN_PATCHES -- 2.34.1 From ps.report at gmx.net Thu Feb 3 23:23:21 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 4 Feb 2022 00:23:21 +0100 Subject: [Buildroot] [PATCH v2] package/libcamera: fix uclibc/musl compile with libexecinfo enabled Message-ID: <20220203232321.26733-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 --- Changes v1 -> v2: - preserver original TARGET_LDFLAGS while setting LIBCAMERA_LDFLAGS --- package/libcamera/libcamera.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/libcamera/libcamera.mk b/package/libcamera/libcamera.mk index 524cf07e03..534d8d2637 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 = $(TARGET_LDFLAGS) -lexecinfo +endif + $(eval $(meson-package)) -- 2.34.1 From ps.report at gmx.net Thu Feb 3 23:24:10 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 4 Feb 2022 00:24:10 +0100 Subject: [Buildroot] [PATCH v1] package/mtools: bump version to 4.0.37 Message-ID: <20220203232410.26906-1-ps.report@gmx.net> For details see [1]. [1] https://lists.gnu.org/archive/html/info-gnu/2022-01/msg00006.html Signed-off-by: Peter Seiderer --- 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 c37d4df456..5d1bca486f 100644 --- a/package/mtools/mtools.hash +++ b/package/mtools/mtools.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 78ac74b2d1cae77bb2da29461a13ed862ff6b7c1289d5bf80fdb09e039c2c48f mtools-4.0.36.tar.lz +sha256 f4dd1fb4b4d72f344f7efcfb05219de3882c6c6fce678d75e7cfb29ca162c7ca mtools-4.0.37.tar.lz # Locally calculated sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/mtools/mtools.mk b/package/mtools/mtools.mk index 4908c3fa2f..f73fd5d231 100644 --- a/package/mtools/mtools.mk +++ b/package/mtools/mtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -MTOOLS_VERSION = 4.0.36 +MTOOLS_VERSION = 4.0.37 MTOOLS_SOURCE = mtools-$(MTOOLS_VERSION).tar.lz MTOOLS_SITE = $(BR2_GNU_MIRROR)/mtools MTOOLS_LICENSE = GPL-3.0+ -- 2.34.1 From giulio.benetti at benettiengineering.com Thu Feb 3 23:40:29 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 4 Feb 2022 00:40:29 +0100 Subject: [Buildroot] [PATCH v3] configs/friendlyarm_nanopi_r2s: new defconfig In-Reply-To: <20220130101150.20605-1-gilles.talis@gmail.com> References: <20220130101150.20605-1-gilles.talis@gmail.com> Message-ID: Hi Giles, On 30/01/22 11:11, 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 > --- > 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 This ^^^ will fail due to latest genimage version. You can't specify partition-type anymore but you have to specify: partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae That means "Root partition (64-bit ARM/AArch64)", check this out: https://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs > + 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 On aarch64 this ^^^ became useless so you can drop it > +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 Have you tested this defconfig with Gitlab-CI docker? registry.gitlab.com/buildroot.org/buildroot/base:20220105.2314 It helps to check if any possible host tool is missing. Can you give a go with it? Thank you! Best regards -- Giulio Benetti Benetti Engineering sas From giulio.benetti at benettiengineering.com Thu Feb 3 23:43:03 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 4 Feb 2022 00:43:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/trace-cmd: use snapshot tarball In-Reply-To: <20220203223615.729285-1-fontaine.fabrice@gmail.com> References: <20220203223615.729285-1-fontaine.fabrice@gmail.com> Message-ID: <34acab3f-35d5-8130-34a6-dc528eda09b5@benettiengineering.com> Hi Fabrice, On 03/02/22 23:36, Fabrice Fontaine wrote: > Use snapshot tarball so TRACE_CMD_VERSION will match what is returned by > https://release-monitoring.org > > Signed-off-by: Fabrice Fontaine Thank you! Reviewed-by: Giulio Benetti Best regards -- Giulio Benetti Benetti Engineering sas > --- > package/trace-cmd/trace-cmd.hash | 2 +- > package/trace-cmd/trace-cmd.mk | 7 ++++--- > 2 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/package/trace-cmd/trace-cmd.hash b/package/trace-cmd/trace-cmd.hash > index 1f34a0da60..00cecc7828 100644 > --- a/package/trace-cmd/trace-cmd.hash > +++ b/package/trace-cmd/trace-cmd.hash > @@ -1,5 +1,5 @@ > # Locally computed > -sha256 9401a43bda4837dfde5e64e0dbe5d3918bf50eb86b4d23fa89713b0f2defcbc1 trace-cmd-trace-cmd-v2.9.6-br1.tar.gz > +sha256 45924a763376a700221f64b4034f87263e4038ec88b120a0abfb5743d051d068 trace-cmd-v2.9.6.tar.gz > sha256 b1d04b850c1c7471b0f0896f6c6f0fcfc9f07e2dd183a5f5826af269fe9e88fb COPYING > sha256 70f297763149e72306919c924e164f83041d5e512868d4c8c1826c171b3e49f9 COPYING.LIB > sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 LICENSES/GPL-2.0 > diff --git a/package/trace-cmd/trace-cmd.mk b/package/trace-cmd/trace-cmd.mk > index a592b1f027..d9ed417f20 100644 > --- a/package/trace-cmd/trace-cmd.mk > +++ b/package/trace-cmd/trace-cmd.mk > @@ -4,9 +4,10 @@ > # > ################################################################################ > > -TRACE_CMD_VERSION = trace-cmd-v2.9.6 > -TRACE_CMD_SITE = https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git > -TRACE_CMD_SITE_METHOD = git > +TRACE_CMD_VERSION = 2.9.6 > +TRACE_CMD_SOURCE = trace-cmd-v$(TRACE_CMD_VERSION).tar.gz > +TRACE_CMD_SITE = \ > + https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot > TRACE_CMD_LICENSE = GPL-2.0, LGPL-2.1 > TRACE_CMD_LICENSE_FILES = COPYING COPYING.LIB LICENSES/GPL-2.0 LICENSES/LGPL-2.1 > From giulio.benetti at benettiengineering.com Thu Feb 3 23:54:38 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 4 Feb 2022 00:54:38 +0100 Subject: [Buildroot] [PATCH] manual: board support: add instructions to test defconfig in the official docker Message-ID: <20220203235438.610277-1-giulio.benetti@benettiengineering.com> Often new boards have not been tested with official docker so let's add instructions to do it. Signed-off-by: Giulio Benetti --- docs/manual/adding-board-support.txt | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/docs/manual/adding-board-support.txt b/docs/manual/adding-board-support.txt index 33ed709535..f5fb3af371 100644 --- a/docs/manual/adding-board-support.txt +++ b/docs/manual/adding-board-support.txt @@ -46,3 +46,25 @@ create a directory +board/+ and a subdirectory +board//+. You can then store your patches and configurations in these directories, and reference them from the main Buildroot configuration. Refer to xref:customize[] for more details. + +Before submitting patches for new boards it would be better to test it +by building it using .gitlab-ci.yml specified docker. For example at the +time of this writing the docker is: +$CI_REGISTRY/buildroot.org/buildroot/base:20220105.2314 +so: +Pull the docker: +-------------------- + $ docker pull registry.gitlab.com/buildroot.org/buildroot/base:20220105.2314 +-------------------- +Run the docker: +-------------------- + $ sudo docker run -it registry.gitlab.com/buildroot.org/buildroot/base:20220105.2314 /bin/bash +-------------------- +Inside the docker hint: +-------------------- + $ git clone git://git.busybox.net/buildroot + $ cd buildroot + $ make +_defconfig+ + $ make +-------------------- +Wait until build finishes and eventually add host dependencies. -- 2.25.1 From giulio.benetti at benettiengineering.com Fri Feb 4 00:06:57 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 4 Feb 2022 01:06:57 +0100 Subject: [Buildroot] [PATCH] board/radxa/rockpi-n8:use partition-type-uuid for genimage-15 Message-ID: <20220204000657.747245-1-giulio.benetti@benettiengineering.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 So let's use for EFI System partition: 'partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b' and for Root partition (32-bit ARM): 'partition-type-uuid = 69DAD710-2CE4-4E3C-B16C-21A1D49ABED3' Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/1929717242 FTR, the magic UUID are from: https://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs Signed-off-by: Giulio Benetti --- board/radxa/rockpi-n8/genimage.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/radxa/rockpi-n8/genimage.cfg b/board/radxa/rockpi-n8/genimage.cfg index 2e064d48c0..909a646499 100644 --- a/board/radxa/rockpi-n8/genimage.cfg +++ b/board/radxa/rockpi-n8/genimage.cfg @@ -26,14 +26,14 @@ image sdcard.img { } partition boot { - partition-type = 0xC + partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b bootable = "true" image = "boot.vfat" offset = 16M } partition rootfs { - partition-type = 0x83 + partition-type-uuid = 69dad710-2ce4-4e3c-b16c-21a1d49abed3 image = "rootfs.ext4" } } -- 2.25.1 From giulio.benetti at benettiengineering.com Fri Feb 4 00:31:46 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 4 Feb 2022 01:31:46 +0100 Subject: [Buildroot] [PATCH v3] configs/friendlyarm_nanopi_r2s: new defconfig In-Reply-To: References: <20220130101150.20605-1-gilles.talis@gmail.com> Message-ID: <2ad7cffb-cff9-0945-fa09-de39307d480c@benettiengineering.com> Hi Gilles, On 04/02/22 00:40, Giulio Benetti wrote: > Hi Giles, > > On 30/01/22 11:11, 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 >> --- >> 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 > > This ^^^ will fail due to latest genimage version. You can't specify > partition-type anymore but you have to specify: > partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae > > That means "Root partition (64-bit ARM/AArch64)", check this out: > https://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs This is not true since you're not using "gpt" partition table. So you leave: partition-type = 0x83 Sorry for the noise! Best regards -- Giulio Benetti Benetti Engineering sas >> + 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 > > On aarch64 this ^^^ became useless so you can drop it > >> +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 > > Have you tested this defconfig with Gitlab-CI docker? > registry.gitlab.com/buildroot.org/buildroot/base:20220105.2314 > > It helps to check if any possible host tool is missing. > > Can you give a go with it? > > Thank you! > > Best regards From giulio.benetti at benettiengineering.com Fri Feb 4 00:56:10 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 4 Feb 2022 01:56:10 +0100 Subject: [Buildroot] [PATCH] board/pc: fix build failure due to new genimage 15 Message-ID: <20220204005610.897894-1-giulio.benetti@benettiengineering.com> Actually genimage fails to create final image with: ``` ERROR: hdimage(disk.img): partition [MBR] (offset 0x1b8, size 0x48) overlaps previous partition boot (offset 0x0, size 0x200) ERROR: hdimage(disk.img): bootloaders, etc. that overlap with the partition table must declare the overlapping area as a hole. ``` This is because genimage 15 is less permissive than before, so let's add holes = {"(440; 512)"} to leave room to MBR. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/1865935249 Signed-off-by: Giulio Benetti --- board/pc/genimage-bios.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/board/pc/genimage-bios.cfg b/board/pc/genimage-bios.cfg index 26d12d9ab3..54026f6527 100644 --- a/board/pc/genimage-bios.cfg +++ b/board/pc/genimage-bios.cfg @@ -7,6 +7,7 @@ image disk.img { image = "boot.img" offset = 0 size = 512 + holes = {"(440; 512)"} } partition grub { -- 2.25.1 From giulio.benetti at benettiengineering.com Fri Feb 4 01:03:48 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 4 Feb 2022 02:03:48 +0100 Subject: [Buildroot] qt5webengine build failure on gitlab-CI Message-ID: <1662cf67-b9ef-33be-c5c4-5d5e786f944a@benettiengineering.com> Hi Peter and James, I can fix this build failure[1] due to qt5webengine, you're the experts here, can you take a look please? You have to build using official docker as I've described in this patch for the manual: https://patchwork.ozlabs.org/project/buildroot/patch/20220203235438.610277-1-giulio.benetti at benettiengineering.com/ I've tried this patch: https://patchwork.ozlabs.org/project/buildroot/patch/20220117114358.3814200-1-james.hilliard1 at gmail.com/ but it didn't help :-/ Thanks in advance! [1]: https://gitlab.com/buildroot.org/buildroot/-/jobs/1929717230 Best regards -- Giulio Benetti Benetti Engineering sas From giulio.benetti at benettiengineering.com Fri Feb 4 01:40:22 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 4 Feb 2022 02:40:22 +0100 Subject: [Buildroot] [PATCH 2/2] Add configs/zynqmp_zcu102_defconfig In-Reply-To: <20220203134402.1647985-2-neal.frager@xilinx.com> References: <20220203134402.1647985-1-neal.frager@xilinx.com> <20220203134402.1647985-2-neal.frager@xilinx.com> Message-ID: <80d97a22-5159-3111-75a3-9286e4776385@benettiengineering.com> Hi Neal, can you please improve commit log doing a presentation of what is zynqmp_zcu102? Is this for thi boards https://www.xilinx.com/products/boards-and-kits/ek-u1-zcu102-g.html ? If yes please describe its features and point the url at the end of commit log. On 03/02/22 14:44, Neal Frager wrote: > Signed-off-by: Neal Frager > --- > configs/zynqmp_zcu102_defconfig | 34 +++++++++++++++++++++++++++++++++ > 1 file changed, 34 insertions(+) > create mode 100644 configs/zynqmp_zcu102_defconfig > > diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig > new file mode 100644 > index 0000000000..5f98e72aaf > --- /dev/null > +++ b/configs/zynqmp_zcu102_defconfig > @@ -0,0 +1,34 @@ > +BR2_aarch64=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_GIT=y > +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2" > +BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" Here you need also: BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +# BR2_TARGET_ROOTFS_TAR is not set > +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v2.4" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_SPL=y > +BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" > +BR2_TARGET_UBOOT_ZYNQMP=y > +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/2021.2/bin/pmufw-v2021.2.bin" This ^^^ URL is unreachable and I've found this as substitution: https://github.com/lucaceresoli/zynqmp-pmufw-binaries/blob/v2021.2/bin/pmufw-v2021.2.bin Luca, is that the correct one? I've switched to v2021.2 tag and copied the link. > +BR2_TARGET_UBOOT_FORMAT_ITB=y > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_MTOOLS=y I've built with gitlab-CI, check this patch for the manual to reproduce: https://patchwork.ozlabs.org/project/buildroot/patch/20220203235438.610277-1-giulio.benetti at benettiengineering.com/ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y came out using the docker. Can anyone test it on real hardware? Luca maybe? For the rest it built correctly. Thank you! Best regards -- Giulio Benetti Benetti Engineering sas From giulio.benetti at benettiengineering.com Fri Feb 4 01:41:19 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 4 Feb 2022 02:41:19 +0100 Subject: [Buildroot] [PATCH 1/2] configs/zynqmp_zcu106: Bump ATF/U-Boot/Linux to Xilinx 2021.2 In-Reply-To: <20220203134402.1647985-1-neal.frager@xilinx.com> References: <20220203134402.1647985-1-neal.frager@xilinx.com> Message-ID: Hi Neal, On 03/02/22 14:44, Neal Frager wrote: > bump ATF to v2.4 > bump U-Boot to Xilinx 2021.2 (2021.01): important drivers not in mainline > bump Linux to Xilinx 2021.2 (5.10): important drivers not in mainline > deleted board/zynqmp/patches directory: already in mainline > modified board/zynqmp/genimage.cfg: U-Boot 2021.01 uses u-boot.itb format > bump configs/zynqmp_zcu106_defconfig to Xilinx 2021.2 Can you please improve the commit log like: ``` This patch: - bumps ATF to v2.4 - bumps U-Boot to Xilinx 2021.2 (2021.01): important drivers not in mainline - bumps Linux to Xilinx 2021.2 (5.10): important drivers not in mainline - deletes board/zynqmp/patches directory: already in mainline - modifies board/zynqmp/genimage.cfg: U-Boot 2021.01 uses u-boot.itb format - bumps configs/zynqmp_zcu106_defconfig to Xilinx 2021.2 ``` > Signed-off-by: Neal Frager > --- > board/zynqmp/genimage.cfg | 2 +- > ...-fix-Remove-GGC-ignore-Warray-bounds.patch | 68 ------- > ...64-zynqmp-zcu106-fix-SPL-MMC-booting.patch | 52 ------ > ...2-arm64-zynqmp-Enable-booting-to-ATF.patch | 114 ------------ > ...ept-an-absolute-path-for-PMUFW_INIT_.patch | 68 ------- > ...ynqmp-pass-the-PS-init-file-as-a-kco.patch | 175 ------------------ > board/zynqmp/readme.txt | 10 +- > configs/zynqmp_zcu106_defconfig | 14 +- > 8 files changed, 13 insertions(+), 490 deletions(-) > delete mode 100644 board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch > delete mode 100644 board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch > delete mode 100644 board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch > delete mode 100644 board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch > delete mode 100644 board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch > > diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg > index ed202f4550..58dc6d785d 100644 > --- a/board/zynqmp/genimage.cfg > +++ b/board/zynqmp/genimage.cfg > @@ -2,7 +2,7 @@ image boot.vfat { > vfat { > files = { > "boot.bin", > - "u-boot.bin", > + "u-boot.itb", > "atf-uboot.ub", > "system.dtb", > "Image" > diff --git a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch b/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch > deleted file mode 100644 > index 0c1a9ba2a4..0000000000 > --- a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch > +++ /dev/null > @@ -1,68 +0,0 @@ > -From da003e6ada7d0217fe99dc7c649a731f8ebd3c34 Mon Sep 17 00:00:00 2001 > -From: Deepika Bhavnani > -Date: Thu, 15 Aug 2019 00:56:46 +0300 > -Subject: [PATCH] Coverity fix: Remove GGC ignore -Warray-bounds > - > -GCC diagnostics were added to ignore array boundaries, instead > -of ignoring GCC warning current code will check for array boundaries > -and perform and array update only for valid elements. > - > -Resolves: `CID 246574` `CID 246710` `CID 246651` > - > -Signed-off-by: Deepika Bhavnani > -Change-Id: I7530ecf7a1707351c6ee87e90cc3d33574088f57 > - > -Backported from: 41af05154abe136938bcfb5f26c969933784bbef > -[Adapted to apply on 1.5] > - > ---- > - lib/psci/psci_common.c | 20 ++++++++++---------- > - 1 file changed, 10 insertions(+), 10 deletions(-) > - > -diff --git a/lib/psci/psci_common.c b/lib/psci/psci_common.c > -index 2220a745cd6e..6282d992a2f0 100644 > ---- a/lib/psci/psci_common.c > -+++ b/lib/psci/psci_common.c > -@@ -188,21 +188,17 @@ static unsigned int get_power_on_target_pwrlvl(void) > - /****************************************************************************** > - * Helper function to update the requested local power state array. This array > - * does not store the requested state for the CPU power level. Hence an > -- * assertion is added to prevent us from accessing the wrong index. > -+ * assertion is added to prevent us from accessing the CPU power level. > - *****************************************************************************/ > - static void psci_set_req_local_pwr_state(unsigned int pwrlvl, > - unsigned int cpu_idx, > - plat_local_state_t req_pwr_state) > - { > -- /* > -- * This should never happen, we have this here to avoid > -- * "array subscript is above array bounds" errors in GCC. > -- */ > - assert(pwrlvl > PSCI_CPU_PWR_LVL); > --#pragma GCC diagnostic push > --#pragma GCC diagnostic ignored "-Warray-bounds" > -- psci_req_local_pwr_states[pwrlvl - 1][cpu_idx] = req_pwr_state; > --#pragma GCC diagnostic pop > -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && > -+ (cpu_idx < PLATFORM_CORE_COUNT)) { > -+ psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx] = req_pwr_state; > -+ } > - } > - > - /****************************************************************************** > -@@ -228,7 +224,11 @@ static plat_local_state_t *psci_get_req_local_pwr_states(unsigned int pwrlvl, > - { > - assert(pwrlvl > PSCI_CPU_PWR_LVL); > - > -- return &psci_req_local_pwr_states[pwrlvl - 1][cpu_idx]; > -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && > -+ (cpu_idx < PLATFORM_CORE_COUNT)) { > -+ return &psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx]; > -+ } else > -+ return NULL; > - } > - > - /* > --- > -2.34.0 > - > diff --git a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch b/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch > deleted file mode 100644 > index 4d85e1bb12..0000000000 > --- a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch > +++ /dev/null > @@ -1,52 +0,0 @@ > -From e5d72ed8339eb05285448aad3c89d21e4d18fd29 Mon Sep 17 00:00:00 2001 > -From: Luca Ceresoli > -Date: Mon, 26 Feb 2018 09:40:34 +0100 > -Subject: [PATCH] arm64: zynqmp: zcu106: fix SPL MMC booting > - > -The U-Boot SPL generated with the current zcu106 defconfig cannot boot > -from MMC: > - > - [...] > - U-Boot SPL 2018.01 (Feb 21 2018 - 17:47:14) > - EL Level: EL3 > - Trying to boot from MMC1 > - sdhci_transfer_data: Error detected in status(0x408020)! > - spl_load_image_fat_os: error reading image u-boot.bin, err - -2 > - spl_load_image_fat: error reading image u-boot.img, err - -6 > - SPL: failed to boot from all boot devices > - ### ERROR ### Please RESET the board ### > - > -Fix by lowering the rpll value. The new value for the RPLL_CTRL > -register comes from the current psu_init_gpl.c from the HDF file at > -https://github.com/xilinx/hdf-examples/tree/01ad8ea5fd1989abf4ea5a072d019a16cb2bc546/zcu106-zynqmp > -(generated by Vivado v2017.4). > - > -RPLL and sdio1_ref clocks before and after this change: > - > - - Old values: RPLL 1.36 GHz, sdio1_ref 272 MHz > - - New values: RPLL 1.16 GHz, sdio1_ref 233 MHz > - > -Signed-off-by: Luca Ceresoli > -Cc: Michal Simek > -Upstream-status: accepted upstream in a different form > ---- > - > - board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c > -index 4d18abe000ca..e6fa477e53e7 100644 > ---- a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c > -+++ b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c > -@@ -10,7 +10,7 @@ > - static unsigned long psu_pll_init_data(void) > - { > - psu_mask_write(0xFF5E0034, 0xFE7FEDEFU, 0x7E4E2C62U); > -- psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00013C00U); > -+ psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00014600U); > - psu_mask_write(0xFF5E0030, 0x00000008U, 0x00000008U); > - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000001U); > - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000000U); > --- > -2.7.4 > - > diff --git a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch b/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch > deleted file mode 100644 > index 487fff6812..0000000000 > --- a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch > +++ /dev/null > @@ -1,114 +0,0 @@ > -From 5e3cac50cc981e01d9072241035a8d4162560c71 Mon Sep 17 00:00:00 2001 > -From: Luca Ceresoli > -Date: Mon, 12 Mar 2018 17:18:38 +0100 > -Subject: [PATCH] arm64: zynqmp: Enable booting to ATF > - > -U-Boot is now able to boot to ARM Trusted Firmware (ATF). The boot > -flow is SPL(EL3) loads ATF and full u-boot and jump to ATF(EL3) which > -pass control to full u-boot(EL2). This has been tested on zcu106, so > -enable it in this defconfig. > - > -To generate an image that triggers this booting flow, you need to pass > -'-O arm-trusted-firmware' to mkimage. > - > -Signed-off-by: Luca Ceresoli > -Signed-off-by: Michal Simek > -Backported from upstream: http://git.denx.de/?p=u-boot.git;a=commit;h=5e3cac50cc981e01d9072241035a8d4162560c71 > ---- > - > - configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 + > - configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 + > - configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 + > - configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 + > - configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 1 + > - configs/xilinx_zynqmp_zcu102_revA_defconfig | 1 + > - configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 + > - 7 files changed, 7 insertions(+) > - > -diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig > -index c5bfa2b12638..488c72258b0e 100644 > ---- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig > -+++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig > -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_FASTBOOT=y > - CONFIG_FASTBOOT_FLASH=y > -diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig > -index f86dce403a42..5d501eec0edd 100644 > ---- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig > -+++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig > -@@ -20,6 +20,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_FASTBOOT=y > - CONFIG_FASTBOOT_FLASH=y > -diff --git a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig > -index 6e947cf56827..6f7eaebd7676 100644 > ---- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig > -+++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig > -@@ -16,6 +16,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_CMD_MEMTEST=y > - CONFIG_SYS_ALT_MEMTEST=y > -diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig > -index 1c934858c61c..7a3806cba4b5 100644 > ---- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig > -+++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig > -@@ -17,6 +17,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_CMD_MEMTEST=y > - CONFIG_SYS_ALT_MEMTEST=y > -diff --git a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig > -index e13c7c56f310..e4408f182ca0 100644 > ---- a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig > -+++ b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig > -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_FASTBOOT=y > - CONFIG_FASTBOOT_FLASH=y > -diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig b/configs/xilinx_zynqmp_zcu102_revA_defconfig > -index 5b2cd495ee85..b52f6789fd4b 100644 > ---- a/configs/xilinx_zynqmp_zcu102_revA_defconfig > -+++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig > -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_FASTBOOT=y > - CONFIG_FASTBOOT_FLASH=y > -diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig > -index e6530fbfe7ff..80592554f682 100644 > ---- a/configs/xilinx_zynqmp_zcu102_revB_defconfig > -+++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig > -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_FASTBOOT=y > - CONFIG_FASTBOOT_FLASH=y > --- > -2.7.4 > - > diff --git a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch b/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch > deleted file mode 100644 > index 95ab7b3b75..0000000000 > --- a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch > +++ /dev/null > @@ -1,68 +0,0 @@ > -From c7df098a71e05dc81cee818747759e8060b59626 Mon Sep 17 00:00:00 2001 > -From: Luca Ceresoli > -Date: Mon, 4 Jun 2018 12:21:01 +0200 > -Subject: [PATCH] arm64: zynqmp: accept an absolute path for PMUFW_INIT_FILE > - > -The value of PMUFW_INIT_FILE is prefixed with "$(srctree)/", thus > -forcing it to be a relative path inside the U-Boot source tree. Since > -the PMUFW is a binary file generated outside of U-Boot, the PMUFW > -binary must be copied inside the U-Boot source tree before the > -build. > - > -This generates a few problems: > - > - * if the source tree is shared among different out-of-tree builds, > - they will pollute (and potentially corrupt) each other > - * the source tree cannot be read-only > - * any buildsystem must add a command to copy the PMUFW binary > - * putting an externally-generated binary in the source tree is ugly > - as hell > - > -Avoid these problems by accepting an absolute path for > -PMUFW_INIT_FILE. This would be as simple as removing the "$(srctree)/" > -prefix, but in order to keep backward compatibility we rather use the > -shell and readlink to get the absolute path even when starting from a > -relative path. > - > -Since 'readlink -f' produces an empty string if the file does not > -exist, we also add a check to ensure the file configured in > -PMUFW_INIT_FILE exists. Otherwise the build would exit successfully, > -but produce a boot.bin without PMUFW as if PMUFW_INIT_FILE were empty. > - > -Tested in the 12 possible combinations of: > - - PMUFW_INIT_FILE empty, relative, absolute, non-existing > - - building in-tree, in subdir, in other directory > - > -Signed-off-by: Luca Ceresoli > -Cc: Michal Simek > -Cc: Simon Glass > -Cc: Emmanuel Vadot > -Signed-off-by: Michal Simek > -Backported from upstream: https://git.denx.de/?p=u-boot.git;a=commit;h=c7df098a71e05dc81cee818747759e8060b59626 > ---- > - scripts/Makefile.spl | 8 +++++++- > - 1 file changed, 7 insertions(+), 1 deletion(-) > - > -diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl > -index ef018b5b4056..252f13826d4c 100644 > ---- a/scripts/Makefile.spl > -+++ b/scripts/Makefile.spl > -@@ -167,8 +167,14 @@ ifdef CONFIG_ARCH_ZYNQ > - MKIMAGEFLAGS_boot.bin = -T zynqimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) > - endif > - ifdef CONFIG_ARCH_ZYNQMP > -+ifneq ($(CONFIG_PMUFW_INIT_FILE),"") > -+spl/boot.bin: zynqmp-check-pmufw > -+zynqmp-check-pmufw: FORCE > -+ ( cd $(srctree) && test -r $(CONFIG_PMUFW_INIT_FILE) ) \ > -+ || ( echo "Cannot read $(CONFIG_PMUFW_INIT_FILE)" && false ) > -+endif > - MKIMAGEFLAGS_boot.bin = -T zynqmpimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) \ > -- -n $(srctree)/$(CONFIG_PMUFW_INIT_FILE) > -+ -n "$(shell cd $(srctree); readlink -f $(CONFIG_PMUFW_INIT_FILE))" > - endif > - > - spl/boot.bin: $(obj)/u-boot-spl.bin FORCE > --- > -2.7.4 > - > diff --git a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch b/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch > deleted file mode 100644 > index b32e162780..0000000000 > --- a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch > +++ /dev/null > @@ -1,175 +0,0 @@ > -From 4c9d54ab5a41d65000c8d249b6fb1b76056f1812 Mon Sep 17 00:00:00 2001 > -From: Luca Ceresoli > -Date: Wed, 20 Jun 2018 12:11:50 +0200 > -Subject: [PATCH] arm/arm64: zynq/zynqmp: pass the PS init file as a kconfig > - variable > - > -U-Boot needs to link ps7_init_gpl.c on Zynq or psu_init_gpl.c on > -ZynqMP (PS init for short). The current logic to locate this file for > -both platforms is: > - > - 1. if a board-specific file exists in > - board/xilinx/zynq[mp]/$(CONFIG_DEFAULT_DEVICE_TREE)/ps?_init_gpl.c > - then use it > - 2. otherwise use board/xilinx/zynq/ps?_init_gpl.c > - > -In the latter case the file does not exist in the U-Boot sources and > -must be copied in the source tree from the outside before starting the > -build. This is typical when it is generated from Xilinx tools while > -developing a custom hardware. However making sure that a > -board-specific file is _not_ found (and used) requires some trickery > -such as removing or overwriting all PS init files (e.g.: the current > -meta-xilinx yocto layer [0]). > - > -This generates a few problems: > - > - * if the source tree is shared among different out-of-tree builds, > - they will pollute (and potentially corrupt) each other > - * the source tree cannot be read-only > - * any buildsystem must add a command to copy the PS init file binary > - * overwriting or deleting files in the source tree is ugly as hell > - > -Simplify usage by allowing to pass the path to the desired PS init > -file in kconfig variable XILINX_PS_INIT_FILE. It can be an absolute > -path or relative to $(srctree). If the variable is set, the > -user-specified file will always be used without being copied > -around. If the the variable is left empty, for backward compatibility > -fall back to the old behaviour. > - > -Since the issue is the same for Zynq and ZynqMP, add one kconfig > -variable in a common place and use it for both. > - > -Also use the new kconfig help text to document all the ways to give > -U-Boot the PS init file. > - > -Build-tested with all combinations of: > - - platform: zynq or zynqmp > - - PS init file: from XILINX_PS_INIT_FILE (absolute, relative path, > - non-existing), in-tree board-specific, in board/xilinx/zynq[mp]/ > - - building in-tree, in subdir, in other directory > - > -[0] https://github.com/Xilinx/meta-xilinx/blob/b2f74cc7fe5c4881589d5e440a17cb51fc66a7ab/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init.inc#L9 > - > -Signed-off-by: Luca Ceresoli > -Cc: Albert Aribaud > -Cc: Michal Simek > -Cc: Nathan Rossi > -Backported from upstream: https://git.denx.de/?p=u-boot.git;a=commit;h=6da4f67ad09cd8b311d77b2b04e557b7ef65b56c > ---- > - arch/arm/Kconfig | 1 + > - board/xilinx/Kconfig | 41 +++++++++++++++++++++++++++++++++++++++++ > - board/xilinx/zynq/Makefile | 10 +++++++++- > - board/xilinx/zynqmp/Makefile | 10 +++++++++- > - 4 files changed, 60 insertions(+), 2 deletions(-) > - create mode 100644 board/xilinx/Kconfig > - > -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig > -index 22234cde2ab6..e04979d0ef7e 100644 > ---- a/arch/arm/Kconfig > -+++ b/arch/arm/Kconfig > -@@ -1293,4 +1293,5 @@ source "board/technologic/ts4600/Kconfig" > - source "board/vscom/baltos/Kconfig" > - source "board/woodburn/Kconfig" > - source "board/work-microwave/work_92105/Kconfig" > -+source "board/xilinx/Kconfig" > - source "board/zipitz2/Kconfig" > - > - source "arch/arm/Kconfig.debug" > -diff --git a/board/xilinx/Kconfig b/board/xilinx/Kconfig > -new file mode 100644 > -index 000000000000..aa3fa061edef > ---- /dev/null > -+++ b/board/xilinx/Kconfig > -@@ -0,0 +1,41 @@ > -+# Copyright (c) 2018, Luca Ceresoli > -+# > -+# SPDX-License-Identifier: GPL-2.0 > -+ > -+if ARCH_ZYNQ || ARCH_ZYNQMP > -+ > -+config XILINX_PS_INIT_FILE > -+ string "Zynq/ZynqMP PS init file(s) location" > -+ help > -+ On Zynq and ZynqMP U-Boot SPL (or U-Boot proper if > -+ ZYNQMP_PSU_INIT_ENABLED is set) is responsible for some > -+ basic initializations, such as enabling peripherals and > -+ configuring pinmuxes. The PS init file (called > -+ psu_init_gpl.c on ZynqMP, ps7_init_gpl.c for Zynq-7000) > -+ contains the code for such initializations. > -+ > -+ U-Boot contains PS init files for some boards, but each of > -+ them describes only one specific configuration. Users of a > -+ different board, or needing a different configuration, can > -+ generate custom files using the Xilinx development tools. > -+ > -+ There are three ways to give a PS init file to U-Boot: > -+ > -+ 1. Set this variable to the path, either relative to the > -+ source tree or absolute, where the psu_init_gpl.c or > -+ ps7_init_gpl.c file is located. U-Boot will build this > -+ file. > -+ > -+ 2. If you leave an empty string here, U-Boot will use > -+ board/xilinx/zynq/$(CONFIG_DEFAULT_DEVICE_TREE)/ps7_init_gpl.c > -+ for Zynq-7000, or > -+ board/xilinx/zynqmp/$(CONFIG_DEFAULT_DEVICE_TREE)/psu_init_gpl.c > -+ for ZynqMP. > -+ > -+ 3. If the above file does not exist, U-Boot will use > -+ board/xilinx/zynq/ps7_init_gpl.c for Zynq-7000, or > -+ board/xilinx/zynqmp/psu_init_gpl.c for ZynqMP. This file > -+ is not provided by U-Boot, you have to copy it there > -+ before the build. > -+ > -+endif > -diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile > -index 5a76a26720cd..03ad5f0532ee 100644 > ---- a/board/xilinx/zynq/Makefile > -+++ b/board/xilinx/zynq/Makefile > -@@ -5,10 +5,18 @@ > - > - obj-y := board.o > - > --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) > -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") > -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE)) > -+init-objs := ps_init_gpl.o > -+spl/board/xilinx/zynq/ps_init_gpl.o board/xilinx/zynq/ps_init_gpl.o: $(PS_INIT_FILE) > -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ > -+endif > - > -+ifeq ($(init-objs),) > -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) > - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/ps7_init_gpl.c),\ > - $(hw-platform-y)/ps7_init_gpl.o) > -+endif > - > - ifeq ($(init-objs),) > - ifneq ($(wildcard $(srctree)/$(src)/ps7_init_gpl.c),) > -diff --git a/board/xilinx/zynqmp/Makefile b/board/xilinx/zynqmp/Makefile > -index 05ccd25dcef3..960b81fc5853 100644 > ---- a/board/xilinx/zynqmp/Makefile > -+++ b/board/xilinx/zynqmp/Makefile > -@@ -5,10 +5,18 @@ > - > - obj-y := zynqmp.o > - > --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) > -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") > -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE)) > -+init-objs := ps_init_gpl.o > -+spl/board/xilinx/zynqmp/ps_init_gpl.o board/xilinx/zynqmp/ps_init_gpl.o: $(PS_INIT_FILE) > -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ > -+endif > - > -+ifeq ($(init-objs),) > -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) > - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/psu_init_gpl.c),\ > - $(hw-platform-y)/psu_init_gpl.o) > -+endif > - > - ifeq ($(init-objs),) > - ifneq ($(wildcard $(srctree)/$(src)/psu_init_gpl.c),) > --- > -2.7.4 > - > diff --git a/board/zynqmp/readme.txt b/board/zynqmp/readme.txt > index da37f4ccc9..9755f182ae 100644 > --- a/board/zynqmp/readme.txt > +++ b/board/zynqmp/readme.txt > @@ -1,10 +1,10 @@ > ******************************** > -Xilinx ZCU106 board - ZynqMP SoC > +Xilinx ZCU102 / ZCU106 boards - ZynqMP SoC > ******************************** > > -This document describes the Buildroot support for the ZCU106 board by > -Xilinx, based on the Zynq UltraScale+ MPSoC (aka ZynqMP). It has been > -tested with the EK-U1-ZCU106-ES2 pre-production board. > +This document describes the Buildroot support for the ZCU102 and ZCU106 > +boards by Xilinx, based on the Zynq UltraScale+ MPSoC (aka ZynqMP). > +It has been tested with the ZCU102 and ZCU106 production boards. > > How to build it > =============== > @@ -32,7 +32,7 @@ After building, you should get a tree like this: > +-- rootfs.ext4 -> rootfs.ext2 > +-- sdcard.img > +-- system.dtb -> zynqmp-zcu106-revA.dtb > - +-- u-boot.bin > + +-- u-boot.itb > `-- zynqmp-zcu106-revA.dtb > > How to write the SD card > diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig > index bee7c1daf7..34b3d89ffb 100644 > --- a/configs/zynqmp_zcu106_defconfig > +++ b/configs/zynqmp_zcu106_defconfig > @@ -1,11 +1,10 @@ > BR2_aarch64=y > -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_GIT=y > BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" > -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" Here you need also: BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > @@ -15,20 +14,21 @@ BR2_TARGET_ROOTFS_EXT2_4=y > BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y > BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v2.4" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" > -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7" > -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA" > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" > BR2_TARGET_UBOOT_NEEDS_DTC=y > BR2_TARGET_UBOOT_SPL=y > BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" > BR2_TARGET_UBOOT_ZYNQMP=y > -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/53fdb7b6c92860ceb0ec5fd14deee302f4a84269/bin/pmufw-zcu106-default-v2017.4.bin" > +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/2021.2/bin/pmufw-v2021.2.bin" This ^^^ URL is unreachable and I've found this as substitution: https://github.com/lucaceresoli/zynqmp-pmufw-binaries/blob/v2021.2/bin/pmufw-v2021.2.bin Luca, is that the correct one? I've switched to v2021.2 tag and copied the link. > +BR2_TARGET_UBOOT_FORMAT_ITB=y > BR2_PACKAGE_HOST_DOSFSTOOLS=y > BR2_PACKAGE_HOST_GENIMAGE=y > BR2_PACKAGE_HOST_MTOOLS=y I've built with gitlab-CI, check this patch for the manual to reproduce: https://patchwork.ozlabs.org/project/buildroot/patch/20220203235438.610277-1-giulio.benetti at benettiengineering.com/ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y came out using the docker. Can also anyone test it on real hardware? Luca maybe? For the rest it built correctly. Thank you! Best regards -- Giulio Benetti Benetti Engineering sas From thomas.petazzoni at bootlin.com Fri Feb 4 06:57:13 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 04 Feb 2022 06:57:13 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-02-03 Message-ID: <20220204065718.DE184401FB@smtp2.osuosl.org> Hello, Autobuild statistics for 2022-02-03 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 58 | 6 | 0 | 64 | 2021.11.x | 22 | 1 | 0 | 23 | master | 66 | 55 | 0 | 121 | Classification of failures by reason for master ----------------------------------------------- host-libselinux-3.3 | 10 python-aiohttp-3.8.1 | 8 i2c-tools-4.3 | 7 libselinux-3.3 | 5 guile-3.0.7 | 3 host-python-docutils-0.15.2 | 2 python-argon2-cffi-bindings... | 2 rygel-0.40.2 | 2 apcupsd-3.14.14 | 1 bat-0.18.3 | 1 bluez5_utils-5.63 | 1 libblockdev-2.25 | 1 libglvnd-1.3.2 | 1 mongrel2-1.13.0 | 1 opencv4-4.5.5 | 1 perl-5.34.0 | 1 pulseview-0.4.2 | 1 python-augeas-1.1.0 | 1 python-brotli-1.0.9 | 1 python-bsdiff4-1.2.1 | 1 python-cchardet-2.1.7 | 1 python-docutils-0.15.2 | 1 python-pydantic-1.8.2 | 1 util-linux-2.37.3 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sparc | apcupsd-3.14.14 | NOK | http://autobuild.buildroot.net/results/0543be638c356109539f574137439577c8aa834b | arm | bat-0.18.3 | NOK | http://autobuild.buildroot.net/results/a1bf3226bc95574bd7c7d5aa4014e86b103f3343 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/cc2b5c51742119458011c396474b61da6a601630 | riscv32 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/c1df00e611fe41d9d55b326dee84036a74f40f05 | ORPH sparc64 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/41ffaedf8d52332fda2b6f8a6cec227858dfeb07 | ORPH arm | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/7ffb21d95eb91040ca0f243969aaa90e42655bae | ORPH arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/710590c1e7e0ca062c6f684c288fcd92918aa2ec | aarch64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/63e8ef18976295566b7677de7fbf58e6f1182d50 | sparc64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/99c24216636cff241ee8248ff38adf5d48c97bb6 | mips64el | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/59a95285ad56a1dfc944412eb43af8b75e27cee8 | mipsel | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/39dd8b703bf14c5014764dd70b907dd29737065c | riscv32 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/50397f9a1f637f0f8fe53e691798de7d2a49469e | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/49003a72bc4c52160122ae3e80f6cbd66a17a144 | aarch64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/ee5eb3bf2525968fd957f02b6013abcb5138f3af | aarch64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/5c54193986933fccab3858781beb635a6a970945 | sparc64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/09589fdcc4994155d2138c52075c7a05fe2bdabc | powerpc | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/f24e332688cb1118c8d28343f424d0ce1c78f7a8 | m68k | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/0e28933572a037d94af7df7499935b93adec70aa | or1k | i2c-tools-4.3 | NOK | http://autobuild.buildroot.net/results/4de907565a65693a6252c504510b541d8f2af496 | mips64el | i2c-tools-4.3 | NOK | http://autobuild.buildroot.net/results/40cff94b5c912067b131a3f68452d29417c1f9da | arc | i2c-tools-4.3 | NOK | http://autobuild.buildroot.net/results/ec5838614ee2efcdc94615e7ada3581be40b1a87 | arc | i2c-tools-4.3 | NOK | http://autobuild.buildroot.net/results/aeba166da336ad0e60cb28f27d4468e1ceecddad | nios2 | i2c-tools-4.3 | NOK | http://autobuild.buildroot.net/results/b9794e514abcc5c1b1711aa09bd5e5d5469dcacb | riscv64 | i2c-tools-4.3 | NOK | http://autobuild.buildroot.net/results/c7c6c7a45d556fd7fe1909c7312dbc94de2509d9 | m68k | i2c-tools-4.3 | NOK | http://autobuild.buildroot.net/results/a6501743e68406e0969eca510c5c978c9a299b01 | riscv64 | libblockdev-2.25 | NOK | http://autobuild.buildroot.net/results/e4b12c5abb38c0c35d76c12af676c94cb74bdc06 | ORPH arm | libglvnd-1.3.2 | NOK | http://autobuild.buildroot.net/results/28283b5c035ab7860e274ac9eeed8c65d5541618 | ORPH powerpc | libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/1192a9b95367dafaecb96d11bdfbe2661db30a08 | mips | libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/4e8c9f388dec36a7737a235f9aa9dc01734bff5e | mipsel | libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/c87d018e16f186e4afe50fec12aa767a08ef7bb9 | powerpc64 | libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/a2f8b6ed6348a76b8597edc2ed181bfdfd990fdc | m68k | libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/4ec36f0b91630377ca8c057de1ea5ec151c0d05e | mips64el | mongrel2-1.13.0 | NOK | http://autobuild.buildroot.net/results/8fcf9e650e7ba15c6ae8c4b08d52a89c87117574 | powerpc | opencv4-4.5.5 | NOK | http://autobuild.buildroot.net/results/1aabbec245cb7a8d144190c803bccec52a0277eb | powerpc | perl-5.34.0 | NOK | http://autobuild.buildroot.net/results/edb8ef198a5755802c6c32408833096b59d0bbbd | aarch64 | pulseview-0.4.2 | NOK | http://autobuild.buildroot.net/results/78364c6f7950fea1a765c3d5654fca62116aa15e | arc | python-aiohttp-3.8.1 | NOK | http://autobuild.buildroot.net/results/8f6edf4f6ecd2fd1f1dc16312ba70bf85c774d9c | nios2 | python-aiohttp-3.8.1 | NOK | http://autobuild.buildroot.net/results/bf03a028b650e5a166a816936eaa994c37776646 | powerpc64 | python-aiohttp-3.8.1 | NOK | http://autobuild.buildroot.net/results/d85b00cf7847486950b1faddfe2ca78aa759be72 | arc | python-aiohttp-3.8.1 | NOK | http://autobuild.buildroot.net/results/982259958e7dcfffbecf2d184d383f9b4f7a6f14 | sh4 | python-aiohttp-3.8.1 | NOK | http://autobuild.buildroot.net/results/ee1b2a45d704a3e46ac5da8ddff3261af46b666f | arm | python-aiohttp-3.8.1 | NOK | http://autobuild.buildroot.net/results/a9d4292b755deebecc17117385492262caf9e456 | powerpc | python-aiohttp-3.8.1 | NOK | http://autobuild.buildroot.net/results/edb212f98d3d3bace75bad814288f84220d00aa7 | arm | python-aiohttp-3.8.1 | NOK | http://autobuild.buildroot.net/results/c8fca3c380befb6e55c65a2942c7dc65522c94a9 | arm | python-argon2-cffi-bindings... | NOK | http://autobuild.buildroot.net/results/83b2551452a04a701e013dfad5cbd901c569d032 | arm | python-argon2-cffi-bindings... | NOK | http://autobuild.buildroot.net/results/2b270c75d07ae4a9985bd4b8ee9b3bb3d865d9df | xtensa | python-augeas-1.1.0 | NOK | http://autobuild.buildroot.net/results/82847ea138cbd6901755c96da884e5fa5b034c83 | i686 | python-brotli-1.0.9 | NOK | http://autobuild.buildroot.net/results/9eec4ac69e651d85b6a63c32ba0b65d24301a885 | i586 | python-bsdiff4-1.2.1 | NOK | http://autobuild.buildroot.net/results/f5cc863dc47328e501961a7451d296dbcd7470bb | mipsel | python-cchardet-2.1.7 | NOK | http://autobuild.buildroot.net/results/83df94d1e1dd67e5394bcffa26653841582de772 | s390x | python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/11d901c18f1941cccb7195e9bd1f9c04ee9ec2fd | sparc64 | python-pydantic-1.8.2 | NOK | http://autobuild.buildroot.net/results/b51f5ceea663d39ee26256a60239192eabc9dddb | powerpc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/83ca6359def05e543f91f129f6c446d611e27df3 | sh4 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/9d3c41a4e4ba43e25226fb2293543de505189d23 | arc | util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/dcc94d8ee57e2d7c26b5202ce858350fe7593b9d | ORPH Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 3 ndisc6-1.0.4 | 1 unknown | 1 zeromq-4.3.4 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- powerpc | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/73066150cb054431ff115060f1699d4b8b180241 | microblazeel | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/4ca648754fbf09b3cc87ca951639821e3b0bf738 | sparc64 | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/5e6da7fdf89ba18b48e6b8e31a4e1750594cebfb | arm | ndisc6-1.0.4 | NOK | http://autobuild.buildroot.net/results/2c4832b524333579598eb9ec79995ca61878621c | ORPH arm | unknown | NOK | http://autobuild.buildroot.net/results/02cadf1bfe3eb779f26d37104569d02e504bb60f | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/a070424be878048f4ccc958906f58fa5ab1995a5 | Classification of failures by reason for 2021.11.x -------------------------------------------------- unknown | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- nios2 | unknown | NOK | http://autobuild.buildroot.net/results/2589adecb9bfa3dd4f5aed4ca40f1f4ee5ed463d | -- http://autobuild.buildroot.net From nealf at xilinx.com Fri Feb 4 07:09:18 2022 From: nealf at xilinx.com (Neal Frager) Date: Fri, 4 Feb 2022 07:09:18 +0000 Subject: [Buildroot] [PATCH 2/2] Add configs/zynqmp_zcu102_defconfig In-Reply-To: <80d97a22-5159-3111-75a3-9286e4776385@benettiengineering.com> References: <20220203134402.1647985-1-neal.frager@xilinx.com> <20220203134402.1647985-2-neal.frager@xilinx.com> <80d97a22-5159-3111-75a3-9286e4776385@benettiengineering.com> Message-ID: Hi Giulio, > Hi Neal, > can you please improve commit log doing a presentation of what is zynqmp_zcu102? > Is this for thi boards > https://www.xilinx.com/products/boards-and-kits/ek-u1-zcu102-g.html ? > If yes please describe its features and point the url at the end of commit log. Yes, no problem. I will add the url that describes the board to the commit log. On 03/02/22 14:44, Neal Frager wrote: > Signed-off-by: Neal Frager > --- > configs/zynqmp_zcu102_defconfig | 34 +++++++++++++++++++++++++++++++++ > 1 file changed, 34 insertions(+) > create mode 100644 configs/zynqmp_zcu102_defconfig > > diff --git a/configs/zynqmp_zcu102_defconfig > b/configs/zynqmp_zcu102_defconfig new file mode 100644 index > 0000000000..5f98e72aaf > --- /dev/null > +++ b/configs/zynqmp_zcu102_defconfig > @@ -0,0 +1,34 @@ > +BR2_aarch64=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_GIT=y > +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2" > +BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" > Here you need also: > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y Thanks for making me aware of this. I will add it to both defconfigs. > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +# BR2_TARGET_ROOTFS_TAR is not set > +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v2.4" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_SPL=y > +BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" > +BR2_TARGET_UBOOT_ZYNQMP=y > +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/2021.2/bin/pmufw-v2021.2.bin" > This ^^^ URL is unreachable and I've found this as substitution: > https://github.com/lucaceresoli/zynqmp-pmufw-binaries/blob/v2021.2/bin/pmufw-v2021.2.bin > Luca, is that the correct one? I've switched to v2021.2 tag and copied the link. Sorry about this one. I was balancing a couple too many versions of my defconfig files and this typo slipped through the cracks. I have corrected it in both defconfigs for the next version of the patch. > +BR2_TARGET_UBOOT_FORMAT_ITB=y > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_MTOOLS=y > I've built with gitlab-CI, check this patch for the manual to reproduce: > https://patchwork.ozlabs.org/project/buildroot/patch/20220203235438.610277-1-giulio.benetti at benettiengineering.com/ > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y came out using the docker. > Can anyone test it on real hardware? Luca maybe? Regarding the board test, there is one thing still missing. U-Boot 2021.01 uses distro boot, so for U-Boot to properly boot the Linux kernel and rootfs, a boot.scr file needs to be in the boot partition of the SD card. I have been getting it to work by manually adding this file to the SD card image after the build. But a better way would be that this file is already included with the genimage.cfg. How does buildroot typically handle U-Boot boot.scr files? I would be happy to add this to the automated build process, but I do not wish to re-invent the wheel. > For the rest it built correctly. > Thank you! > Best regards > -- > Giulio Benetti > Benetti Engineering sas Thank you for your thorough review and feedback. Best regards, Neal Frager neal.frager at xilinx.com Xilinx From ps.report at gmx.net Fri Feb 4 07:51:00 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 4 Feb 2022 08:51:00 +0100 Subject: [Buildroot] qt5webengine build failure on gitlab-CI In-Reply-To: <1662cf67-b9ef-33be-c5c4-5d5e786f944a@benettiengineering.com> References: <1662cf67-b9ef-33be-c5c4-5d5e786f944a@benettiengineering.com> Message-ID: <20220204085100.77deaeb8@gmx.net> Hello Giulio, On Fri, 4 Feb 2022 02:03:48 +0100, Giulio Benetti wrote: > Hi Peter and James, > > I can fix this build failure[1] due to qt5webengine, you're the experts > here, can you take a look please? > > You have to build using official docker as I've described in this patch > for the manual: > https://patchwork.ozlabs.org/project/buildroot/patch/20220203235438.610277-1-giulio.benetti at benettiengineering.com/ > > I've tried this patch: > https://patchwork.ozlabs.org/project/buildroot/patch/20220117114358.3814200-1-james.hilliard1 at gmail.com/ > but it didn't help :-/ See [2], [3] and [4].... Regards, Peter [2] http://lists.busybox.net/pipermail/buildroot/2020-December/601542.html [3] http://lists.busybox.net/pipermail/buildroot/2021-January/301496.html [4] http://lists.busybox.net/pipermail/buildroot/2022-January/633204.html > > Thanks in advance! > > [1]: https://gitlab.com/buildroot.org/buildroot/-/jobs/1929717230 > > Best regards From james.hilliard1 at gmail.com Fri Feb 4 08:52:41 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 4 Feb 2022 01:52:41 -0700 Subject: [Buildroot] qt5webengine build failure on gitlab-CI In-Reply-To: <1662cf67-b9ef-33be-c5c4-5d5e786f944a@benettiengineering.com> References: <1662cf67-b9ef-33be-c5c4-5d5e786f944a@benettiengineering.com> Message-ID: On Thu, Feb 3, 2022 at 6:03 PM Giulio Benetti wrote: > > Hi Peter and James, > > I can fix this build failure[1] due to qt5webengine, you're the experts > here, can you take a look please? > > You have to build using official docker as I've described in this patch > for the manual: > https://patchwork.ozlabs.org/project/buildroot/patch/20220203235438.610277-1-giulio.benetti at benettiengineering.com/ > > I've tried this patch: > https://patchwork.ozlabs.org/project/buildroot/patch/20220117114358.3814200-1-james.hilliard1 at gmail.com/ > but it didn't help :-/ I've got a WIP branch that should hopefully fix this and a bunch of related issues, cleaning it up at the moment: https://github.com/buildroot/buildroot/compare/master...jameshilliard:qt5webengine-kde > > Thanks in advance! > > [1]: https://gitlab.com/buildroot.org/buildroot/-/jobs/1929717230 > > Best regards > -- > Giulio Benetti > Benetti Engineering sas From giulio.benetti at benettiengineering.com Fri Feb 4 10:13:54 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 4 Feb 2022 11:13:54 +0100 Subject: [Buildroot] [PATCH 2/2] Add configs/zynqmp_zcu102_defconfig In-Reply-To: References: <20220203134402.1647985-1-neal.frager@xilinx.com> <20220203134402.1647985-2-neal.frager@xilinx.com> <80d97a22-5159-3111-75a3-9286e4776385@benettiengineering.com> Message-ID: <2b671b31-5f2e-e3f1-b365-e5f2be2ca4fc@benettiengineering.com> Hi Neal, On 04/02/22 08:09, Neal Frager wrote: > Hi Giulio, > >> Hi Neal, > >> can you please improve commit log doing a presentation of what is zynqmp_zcu102? > >> Is this for thi boards >> https://www.xilinx.com/products/boards-and-kits/ek-u1-zcu102-g.html ? > >> If yes please describe its features and point the url at the end of commit log. > > Yes, no problem. I will add the url that describes the board to the commit log. > > On 03/02/22 14:44, Neal Frager wrote: >> Signed-off-by: Neal Frager >> --- >> configs/zynqmp_zcu102_defconfig | 34 +++++++++++++++++++++++++++++++++ >> 1 file changed, 34 insertions(+) >> create mode 100644 configs/zynqmp_zcu102_defconfig >> >> diff --git a/configs/zynqmp_zcu102_defconfig >> b/configs/zynqmp_zcu102_defconfig new file mode 100644 index >> 0000000000..5f98e72aaf >> --- /dev/null >> +++ b/configs/zynqmp_zcu102_defconfig >> @@ -0,0 +1,34 @@ >> +BR2_aarch64=y >> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y >> +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" >> +BR2_LINUX_KERNEL=y >> +BR2_LINUX_KERNEL_CUSTOM_GIT=y >> +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" >> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2" >> +BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" >> +BR2_LINUX_KERNEL_DTS_SUPPORT=y >> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" > >> Here you need also: >> BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > > Thanks for making me aware of this. I will add it to both defconfigs. > >> +BR2_TARGET_ROOTFS_EXT2=y >> +BR2_TARGET_ROOTFS_EXT2_4=y >> +# BR2_TARGET_ROOTFS_TAR is not set >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v2.4" >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" >> +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2" >> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" >> +BR2_TARGET_UBOOT_NEEDS_DTC=y >> +BR2_TARGET_UBOOT_SPL=y >> +BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" >> +BR2_TARGET_UBOOT_ZYNQMP=y >> +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/2021.2/bin/pmufw-v2021.2.bin" > >> This ^^^ URL is unreachable and I've found this as substitution: >> https://github.com/lucaceresoli/zynqmp-pmufw-binaries/blob/v2021.2/bin/pmufw-v2021.2.bin > >> Luca, is that the correct one? I've switched to v2021.2 tag and copied the link. > > Sorry about this one. I was balancing a couple too many versions of my defconfig files and this typo slipped through the cracks. I have corrected it in both defconfigs for the next version of the patch. > >> +BR2_TARGET_UBOOT_FORMAT_ITB=y >> +BR2_PACKAGE_HOST_DOSFSTOOLS=y >> +BR2_PACKAGE_HOST_GENIMAGE=y >> +BR2_PACKAGE_HOST_MTOOLS=y > >> I've built with gitlab-CI, check this patch for the manual to reproduce: >> https://patchwork.ozlabs.org/project/buildroot/patch/20220203235438.610277-1-giulio.benetti at benettiengineering.com/ > >> BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y came out using the docker. > >> Can anyone test it on real hardware? Luca maybe? > > Regarding the board test, there is one thing still missing. U-Boot 2021.01 uses distro boot, so for U-Boot to properly boot the Linux kernel and rootfs, a boot.scr file needs to be in the boot partition of the SD card. I have been getting it to work by manually adding this file to the SD card image after the build. But a better way would be that this file is already included with the genimage.cfg. How does buildroot typically handle U-Boot boot.scr files? I would be happy to add this to the automated build process, but I do not wish to re-invent the wheel. Lately a lot of extlinux.conf has been used instead of boot.scr, so you could go for something like this: https://git.buildroot.net/buildroot/tree/board/stmicroelectronics/stm32mp157c-dk2/overlay/boot/extlinux/extlinux.conf and point to it in board defconfig. Best regards -- Giulio Benetti Benetti Engineering sas From a.marud at post.pl Fri Feb 4 10:22:11 2022 From: a.marud at post.pl (Arek Marud) Date: Fri, 4 Feb 2022 11:22:11 +0100 Subject: [Buildroot] I have a problem adding new package In-Reply-To: <20220130234800.14da56ca@windsurf> References: <20220130234800.14da56ca@windsurf> Message-ID: Helo Thomas, Thank you for your answer. I had a problem with libonvif compilation. Compiler complaing about unsafe include path (details pasted below). I was able to compile project ONLY when --includedir parameter was set, without it - compiler complains about include path. https://gist.github.com/arekmd/11e9621ae3fc476cf37e80150d15b177 I pasted build log without LIBONVIF_CONF_OPTS line. myname buildroot$> make libonvif-build WARNING: no hash file for v1.1.1.tar.gz >>> libonvif 1.1.1 Extracting gzip -d -c /home/myname/workbench/resources/development/myproj/buildroot/buildroot/ dl/libonvif/v1.1.1.tar.gz | tar --strip-components=1 -C /home/myname/workbench/res ources/development/myproj/buildroot/buildroot/output/build/libonvif-1.1.1 -xf - >>> libonvif 1.1.1 Patching >>> libonvif 1.1.1 Updating config.sub and config.guess for file in config.guess config.sub; do for i in $(find /home/myname/workbench/res ources/development/myproj/buildroot/buildroot/output/build/libonvif-1.1.1 -name $ file); do cp support/gnuconfig/$file $i; done; done >>> libonvif 1.1.1 Patching libtool patching file /home/myname/workbench/resources/development/myproj/buildroot/buildro ot/output/build/libonvif-1.1.1/ltmain.sh Hunk #1 succeeded at 2694 (offset 7 lines). Hunk #2 succeeded at 4284 (offset 7 lines). Hunk #3 succeeded at 6579 (offset 25 lines). Hunk #4 succeeded at 6589 (offset 25 lines). Hunk #5 succeeded at 6882 (offset 25 lines). Hunk #6 succeeded at 7174 (offset 25 lines). Hunk #7 succeeded at 8140 (offset 28 lines). Hunk #8 succeeded at 10769 (offset 59 lines). >>> libonvif 1.1.1 Configuring (cd /home/myname/workbench/resources/development/myproj/buildroot/buildroot/output/ build/libonvif-1.1.1/ && rm -rf config.cache && PATH="/home/myname/workbench/resou rces/development/myproj/buildroot/buildroot/output/host/bin:/home/myname/workbench/ resources/development/myproj/buildroot/buildroot/output/host/sbin:/home/myname/.loc al/bin:/home/myname/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/bin:/var/lib/fl atpak/exports/bin:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl" AR ="/home/myname/workbench/resources/development/myproj/buildroot/buildroot/output/ho st/bin/aarch64-myproj-linux-gnu-ar" AS="/home/myname/workbench/resources/developmen t/myproj/buildroot/buildroot/output/host/bin/aarch64-myproj-linux-gnu-as" LD="/hom e/myname/workbench/resources/development/myproj/buildroot/buildroot/output/host/bin /aarch64-myproj-linux-gnu-ld" NM="/home/myname/workbench/resources/development/auvi c/buildroot/buildroot/output/host/bin/aarch64-myproj-linux-gnu-nm" CC="/home/myname /workbench/resources/development/myproj/buildroot/buildroot/output/host/bin/aarch 64-myproj-linux-gnu-gcc" GCC="/home/myname/workbench/resources/development/myproj/bu ildroot/buildroot/output/host/bin/aarch64-myproj-linux-gnu-gcc" CPP="/home/myname/w orkbench/resources/development/myproj/buildroot/buildroot/output/host/bin/aarch64 -myproj-linux-gnu-cpp" CXX="/home/myname/workbench/resources/development/myproj/buil droot/buildroot/output/host/bin/aarch64-myproj-linux-gnu-g++" FC="/home/myname/work bench/resources/development/myproj/buildroot/buildroot/output/host/bin/aarch64-Au vic-linux-gnu-gfortran" F77="/home/myname/workbench/resources/development/myproj/bu ildroot/buildroot/output/host/bin/aarch64-myproj-linux-gnu-gfortran" RANLIB="/hom e/myname/workbench/resources/development/myproj/buildroot/buildroot/output/host/bin /aarch64-myproj-linux-gnu-ranlib" READELF="/home/myname/workbench/resources/develop ment/myproj/buildroot/buildroot/output/host/bin/aarch64-myproj-linux-gnu-readelf" STRIP="/home/myname/workbench/resources/development/myproj/buildroot/buildroot/outp ut/host/bin/aarch64-myproj-linux-gnu-strip" OBJCOPY="/home/myname/workbench/resourc es/development/myproj/buildroot/buildroot/output/host/bin/aarch64-myproj-linux-gnu -objcopy" OBJDUMP="/home/myname/workbench/resources/development/myproj/buildroot/bu ildroot/output/host/bin/aarch64-myproj-linux-gnu-objdump" AR_FOR_BUILD="/usr/bin/ ar" AS_FOR_BUILD="/usr/bin/as" CC_FOR_BUILD="/usr/bin/gcc" GCC_FOR_BUILD="/usr/b in/gcc" CXX_FOR_BUILD="/usr/bin/g++" LD_FOR_BUILD="/usr/bin/ld" CPPFLAGS_FOR_BUI LD="-I/home/myname/workbench/resources/development/myproj/buildroot/buildroot/outpu t/host/include" CFLAGS_FOR_BUILD="-O2 -I/home/myname/workbench/resources/developme nt/myproj/buildroot/buildroot/output/host/include" CXXFLAGS_FOR_BUILD="-O2 -I/hom e/myname/workbench/resources/development/myproj/buildroot/buildroot/output/host/inc lude" LDFLAGS_FOR_BUILD="-L/home/myname/workbench/resources/development/myproj/buil droot/buildroot/output/host/lib -Wl,-rpath,/home/myname/workbench/resources/develo pment/myproj/buildroot/buildroot/output/host/lib" FCFLAGS_FOR_BUILD="" DEFAULT_AS SEMBLER="/home/myname/workbench/resources/development/myproj/buildroot/buildroot/ou tput/host/bin/aarch64-myproj-linux-gnu-as" DEFAULT_LINKER="/home/myname/workbench/r esources/development/myproj/buildroot/buildroot/output/host/bin/aarch64-myproj-lin ux-gnu-ld" CPPFLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BI TS=64" CFLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 " CXXFLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BI TS=64 -Os -g0 " LDFLAGS="" FCFLAGS=" -Os -g0" FFLAGS=" -Os -g0" PKG_CONFIG="/ho me/myname/workbench/resources/development/myproj/buildroot/buildroot/output/host/bi n/pkg-config" STAGING_DIR="/home/myname/workbench/resources/development/myproj/buil droot/buildroot/output/host/aarch64-myproj-linux-gnu/sysroot" INTLTOOL_PERL=/usr/ bin/perl ac_cv_lbl_unaligned_fail=yes ac_cv_func_mmap_fixed_mapped=yes ac_cv_fun c_memcmp_working=yes ac_cv_have_decl_malloc=yes gl_cv_func_malloc_0_nonnull=yes ac_cv_func_malloc_0_nonnull=yes ac_cv_func_calloc_0_nonnull=yes ac_cv_func_reall oc_0_nonnull=yes lt_cv_sys_lib_search_path_spec="" ac_cv_c_bigendian=no CONFIG _SITE=/dev/null ./configure --target=aarch64-myproj-linux-gnu --host=aarch64-Auvi c-linux-gnu --build=x86_64-pc-linux-gnu --prefix=/usr --exec-prefix=/usr --sysco nfdir=/etc --localstatedir=/var --program-prefix="" --disable-gtk-doc --disable- gtk-doc-html --disable-doc --disable-docs --disable-documentation --with-xmlto=n o --with-fop=no --disable-dependency-tracking --enable-ipv6 --disable-nls --disa ble-static --enable-shared ) configure: WARNING: unrecognized options: --disable-gtk-doc, --disable-gtk-doc-h tml, --disable-doc, --disable-docs, --disable-documentation, --with-xmlto, --wit h-fop, --enable-ipv6, --disable-nls checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for aarch64-myproj-linux-gnu-strip... /home/myname/workbench/resources/dev elopment/myproj/buildroot/buildroot/output/host/bin/aarch64-myproj-linux-gnu-strip checking for a thread-safe mkdir -p... /usr/bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking for style of include used by make... GNU checking for aarch64-myproj-linux-gnu-gcc... /home/myname/workbench/resources/devel opment/myproj/buildroot/buildroot/output/host/bin/aarch64-myproj-linux-gnu-gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... yes checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether /home/myname/workbench/resources/development/myproj/buildroot/buil droot/output/host/bin/aarch64-myproj-linux-gnu-gcc accepts -g... yes checking for /home/myname/workbench/resources/development/myproj/buildroot/buildroo t/output/host/bin/aarch64-myproj-linux-gnu-gcc option to accept ISO C89... none n eeded checking whether /home/myname/workbench/resources/development/myproj/buildroot/buil droot/output/host/bin/aarch64-myproj-linux-gnu-gcc understands -c and -o together ... yes checking dependency style of /home/myname/workbench/resources/development/myproj/bu ildroot/buildroot/output/host/bin/aarch64-myproj-linux-gnu-gcc... none checking for aarch64-myproj-linux-gnu-ar... /home/myname/workbench/resources/develo pment/myproj/buildroot/buildroot/output/host/bin/aarch64-myproj-linux-gnu-ar checking the archiver (/home/myname/workbench/resources/development/myproj/buildroo t/buildroot/output/host/bin/aarch64-myproj-linux-gnu-ar) interface... ar checking build system type... x86_64-pc-linux-gnu checking host system type... aarch64-myproj-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /usr/bin/sed checking for grep that handles long lines and -e... /usr/bin/grep checking for egrep... /usr/bin/grep -E checking for fgrep... /usr/bin/grep -F checking for ld used by /home/myname/workbench/resources/development/myproj/buildro ot/buildroot/output/host/bin/aarch64-myproj-linux-gnu-gcc... /home/myname/workbench /resources/development/myproj/buildroot/buildroot/output/host/bin/aarch64-myproj-l inux-gnu-ld checking if the linker (/home/myname/workbench/resources/development/myproj/buildro ot/buildroot/output/host/bin/aarch64-myproj-linux-gnu-ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /home/myname/workbench/reso urces/development/myproj/buildroot/buildroot/output/host/bin/aarch64-myproj-linux- gnu-nm checking the name lister (/home/myname/workbench/resources/development/myproj/build root/buildroot/output/host/bin/aarch64-myproj-linux-gnu-nm) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking how to convert x86_64-pc-linux-gnu file names to aarch64-myproj-linux-gn u format... func_convert_file_noop checking how to convert x86_64-pc-linux-gnu file names to toolchain format... fu nc_convert_file_noop checking for /home/myname/workbench/resources/development/myproj/buildroot/buildroo t/output/host/bin/aarch64-myproj-linux-gnu-ld option to reload object files... -r checking for aarch64-myproj-linux-gnu-objdump... /home/myname/workbench/resources/d evelopment/myproj/buildroot/buildroot/output/host/bin/aarch64-myproj-linux-gnu-obj dump checking how to recognize dependent libraries... pass_all checking for aarch64-myproj-linux-gnu-dlltool... no checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for aarch64-myproj-linux-gnu-ar... (cached) /home/myname/workbench/resourc es/development/myproj/buildroot/buildroot/output/host/bin/aarch64-myproj-linux-gnu -ar checking for archiver @FILE support... @ checking for aarch64-myproj-linux-gnu-strip... (cached) /home/myname/workbench/reso urces/development/myproj/buildroot/buildroot/output/host/bin/aarch64-myproj-linux- gnu-strip checking for aarch64-myproj-linux-gnu-ranlib... /home/myname/workbench/resources/de velopment/myproj/buildroot/buildroot/output/host/bin/aarch64-myproj-linux-gnu-ranl ib checking command to parse /home/myname/workbench/resources/development/myproj/build root/buildroot/output/host/bin/aarch64-myproj-linux-gnu-nm output from /home/myname /workbench/resources/development/myproj/buildroot/buildroot/output/host/bin/aarch 64-myproj-linux-gnu-gcc object... ok checking for sysroot... no checking for a working dd... /usr/bin/dd checking how to truncate binary pipes... /usr/bin/dd bs=4096 count=1 checking for aarch64-myproj-linux-gnu-mt... no checking for mt... no checking if : is a manifest tool... no checking how to run the C preprocessor... /home/myname/workbench/resources/develop ment/myproj/buildroot/buildroot/output/host/bin/aarch64-myproj-linux-gnu-cpp checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if /home/myname/workbench/resources/development/myproj/buildroot/buildroot /output/host/bin/aarch64-myproj-linux-gnu-gcc supports -fno-rtti -fno-exceptions. .. no checking for /home/myname/workbench/resources/development/myproj/buildroot/buildroo t/output/host/bin/aarch64-myproj-linux-gnu-gcc option to produce PIC... -fPIC -DP IC checking if /home/myname/workbench/resources/development/myproj/buildroot/buildroot /output/host/bin/aarch64-myproj-linux-gnu-gcc PIC flag -fPIC -DPIC works... yes checking if /home/myname/workbench/resources/development/myproj/buildroot/buildroot /output/host/bin/aarch64-myproj-linux-gnu-gcc static flag -static works... yes checking if /home/myname/workbench/resources/development/myproj/buildroot/buildroot /output/host/bin/aarch64-myproj-linux-gnu-gcc supports -c -o file.o... yes checking if /home/myname/workbench/resources/development/myproj/buildroot/buildroot /output/host/bin/aarch64-myproj-linux-gnu-gcc supports -c -o file.o... (cached) y es checking whether the /home/myname/workbench/resources/development/myproj/buildroot/ buildroot/output/host/bin/aarch64-myproj-linux-gnu-gcc linker (/home/myname/workben ch/resources/development/myproj/buildroot/buildroot/output/host/bin/aarch64-myproj -linux-gnu-ld) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... no host is aarch64-myproj-linux-gnu checking for aarch64-myproj-linux-gnu-gcc... (cached) /home/myname/workbench/resour ces/development/myproj/buildroot/buildroot/output/host/bin/aarch64-myproj-linux-gn u-gcc checking whether we are using the GNU C compiler... (cached) yes checking whether /home/myname/workbench/resources/development/myproj/buildroot/buil droot/output/host/bin/aarch64-myproj-linux-gnu-gcc accepts -g... (cached) yes checking for /home/myname/workbench/resources/development/myproj/buildroot/buildroo t/output/host/bin/aarch64-myproj-linux-gnu-gcc option to accept ISO C89... (cache d) none needed checking whether /home/myname/workbench/resources/development/myproj/buildroot/buil droot/output/host/bin/aarch64-myproj-linux-gnu-gcc understands -c and -o together ... (cached) yes checking dependency style of /home/myname/workbench/resources/development/myproj/bu ildroot/buildroot/output/host/bin/aarch64-myproj-linux-gnu-gcc... (cached) none checking pkg-config is at least version 0.9.0... yes checking for LIBXML2... yes checking arpa/inet.h usability... yes checking arpa/inet.h presence... yes checking for arpa/inet.h... yes checking fcntl.h usability... yes checking fcntl.h presence... yes checking for fcntl.h... yes checking float.h usability... yes checking float.h presence... yes checking for float.h... yes checking for inttypes.h... (cached) yes checking limits.h usability... yes checking limits.h presence... yes checking for limits.h... yes checking locale.h usability... yes checking locale.h presence... yes checking for locale.h... yes checking for memory.h... (cached) yes checking netdb.h usability... yes checking netdb.h presence... yes checking for netdb.h... yes checking netinet/in.h usability... yes checking netinet/in.h presence... yes checking for netinet/in.h... yes checking for stdint.h... (cached) yes checking for stdlib.h... (cached) yes checking for string.h... (cached) yes checking for strings.h... (cached) yes checking sys/ioctl.h usability... yes checking sys/ioctl.h presence... yes checking for sys/ioctl.h... yes checking sys/socket.h usability... yes checking sys/socket.h presence... yes checking for sys/socket.h... yes checking sys/time.h usability... yes checking sys/time.h presence... yes checking for sys/time.h... yes checking sys/timeb.h usability... yes checking sys/timeb.h presence... yes checking for sys/timeb.h... yes checking for unistd.h... (cached) yes checking for stdbool.h that conforms to C99... yes checking for _Bool... yes checking for size_t... yes checking whether time.h and sys/time.h may both be included... yes checking for sys/time.h... (cached) yes checking for unistd.h... (cached) yes checking for alarm... yes checking for working mktime... no checking whether strerror_r is declared... yes checking for strerror_r... yes checking whether strerror_r returns char *... no checking for working strtod... no checking for pow... no checking for pow in -lm... yes checking for ftime... yes checking for gethostbyname... yes checking for gettimeofday... yes checking for localtime_r... yes checking for memset... yes checking for select... yes checking for socket... yes checking for strchr... yes checking for strdup... yes checking for strerror... yes checking for strstr... yes checking for strtod... (cached) no checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating Makefile config.status: creating build/Makefile config.status: creating build/libonvif.pc config.status: creating config.h config.status: executing depfiles commands config.status: executing libtool commands configure: WARNING: unrecognized options: --disable-gtk-doc, --disable-gtk-doc-h tml, --disable-doc, --disable-docs, --disable-documentation, --with-xmlto, --wit h-fop, --enable-ipv6, --disable-nls >>> libonvif 1.1.1 Building PATH="/home/myname/workbench/resources/development/myproj/buildroot/buildroot/outpu t/host/bin:/home/myname/workbench/resources/development/myproj/buildroot/buildroot/ output/host/sbin:/home/myname/.local/bin:/home/myname/.local/bin:/usr/local/sbin:/us r/local/bin:/usr/bin:/var/lib/flatpak/exports/bin:/usr/bin/site_perl:/usr/bin/ve ndor_perl:/usr/bin/core_perl" /usr/bin/make -j5 -C /home/myname/workbench/resour ces/development/myproj/buildroot/buildroot/output/build/libonvif-1.1.1/ make[1]: Entering directory '/home/myname/workbench/resources/development/myproj/bu ildroot/buildroot/output/build/libonvif-1.1.1' /usr/bin/make all-recursive make[2]: Entering directory '/home/myname/workbench/resources/development/myproj/bu ildroot/buildroot/output/build/libonvif-1.1.1' Making all in build make[3]: Entering directory '/home/myname/workbench/resources/development/myproj/bu ildroot/buildroot/output/build/libonvif-1.1.1/build' /bin/sh ../libtool --tag=CC --mode=compile /home/myname/workbench/resources/dev elopment/myproj/buildroot/buildroot/output/host/bin/aarch64-myproj-linux-gnu-gcc - DHAVE_CONFIG_H -I. -I.. -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFS ET_BITS=64 -I/usr/include -I/usr/include/libxml2 -I../source -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -c -o onvif.lo `test -f '../source/onvif.c' || echo './'`../source/onvif.c /bin/sh ../libtool --tag=CC --mode=compile /home/myname/workbench/resources/dev elopment/myproj/buildroot/buildroot/output/host/bin/aarch64-myproj-linux-gnu-gcc - DHAVE_CONFIG_H -I. -I.. -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFS ET_BITS=64 -I/usr/include -I/usr/include/libxml2 -I../source -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -c -o sha1.lo `test -f ' ../source/sha1.c' || echo './'`../source/sha1.c /bin/sh ../libtool --tag=CC --mode=compile /home/myname/workbench/resources/dev elopment/myproj/buildroot/buildroot/output/host/bin/aarch64-myproj-linux-gnu-gcc - DHAVE_CONFIG_H -I. -I.. -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFS ET_BITS=64 -I/usr/include -I/usr/include/libxml2 -I../source -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -c -o cencode.lo `test - f '../source/cencode.c' || echo './'`../source/cencode.c libtool: compile: /home/myname/workbench/resources/development/myproj/buildroot/bu ildroot/output/host/bin/aarch64-myproj-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I.. -D_ LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include -I/ usr/include/libxml2 -I../source -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FIL E_OFFSET_BITS=64 -Os -g0 -c ../source/onvif.c -fPIC -DPIC -o .libs/onvif.o aarch64-myproj-linux-gnu-gcc: ERROR: unsafe header/library path used in cross-com pilation: '-I/usr/include' make[3]: *** [Makefile:459: onvif.lo] Error 1 make[3]: *** Waiting for unfinished jobs.... libtool: compile: /home/myname/workbench/resources/development/myproj/buildroot/bu ildroot/output/host/bin/aarch64-myproj-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I.. -D_ LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include -I/ usr/include/libxml2 -I../source -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FIL E_OFFSET_BITS=64 -Os -g0 -c ../source/cencode.c -fPIC -DPIC -o .libs/cencode.o aarch64-myproj-linux-gnu-gcc: ERROR: unsafe header/library path used in cross-com pilation: '-I/usr/include' make[3]: *** [Makefile:473: cencode.lo] Error 1 libtool: compile: /home/myname/workbench/resources/development/myproj/buildroot/bu ildroot/output/host/bin/aarch64-myproj-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I.. -D_ LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include -I/ usr/include/libxml2 -I../source -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FIL E_OFFSET_BITS=64 -Os -g0 -c ../source/sha1.c -fPIC -DPIC -o .libs/sha1.o aarch64-myproj-linux-gnu-gcc: ERROR: unsafe header/library path used in cross-com pilation: '-I/usr/include' make[3]: *** [Makefile:466: sha1.lo] Error 1 make[3]: Leaving directory '/home/myname/workbench/resources/development/myproj/bui ldroot/buildroot/output/build/libonvif-1.1.1/build' make[2]: *** [Makefile:454: all-recursive] Error 1 make[2]: Leaving directory '/home/myname/workbench/resources/development/myproj/bui ldroot/buildroot/output/build/libonvif-1.1.1' make[1]: *** [Makefile:365: all] Error 2 make[1]: Leaving directory '/home/myname/workbench/resources/development/myproj/bui ldroot/buildroot/output/build/libonvif-1.1.1' make: *** [package/pkg-generic.mk:295: /home/myname/workbench/resources/developmen t/myproj/buildroot/buildroot/output/build/libonvif-1.1.1/.stamp_built] Error 2 myname buildroot$> Dnia Sun, Jan 30, 2022 at 11:48:00PM +0100, Thomas Petazzoni napisa?(a): > Hello Arek, > > On Sun, 30 Jan 2022 23:09:50 +0100 > Arek Marud wrote: > > > I'm trying to add new package to Buildroot. I follow Buildroot tutorial > > for autotools package. But I got an error message, and i have no idea > > what is the problem. > > > > https://gist.github.com/arekmd/c33a3a487ec73d8847c3c115f8fa3299 > > libonvif: installs files in /home/myname/workbench/resources/development/myproj/buildroot/buildroot/output/host/aarch64-myproj-linux-gnu/sysroot//home/myname/workbench/resources/development/myproj/buildroot/buildroot/output > > Look at this path: it contains two times > /home/myname/workbench/resources/development/myproj/buildroot/buildroot/output, > and that's clearly bogus, and that's why Buildroot complains. > > > ################################################################################ > > # > > # libonvif > > ################################################################################ > > LIBONVIF_VERSION = 1.1.1 > > LIBONVIF_SOURCE = v$(LIBONVIF_VERSION).tar.gz > > LIBONVIF_SITE = https://github.com/sr99622/libonvif/archive/refs/tags > > LIBONVIF_INSTALL_STAGING = YES > > LIBONVIF_INSTALL_TARGET = YES > > LIBONVIF_CONF_OPTS = --with-libxml2 --includedir="$(STAGING_DIR)/usr/include/libxml2" > > This includedir is wrong, and is perhaps the reason for the failure. > includedir is the location where libonvif will install its headers, not > where the libxml2 headers will be found. And setting > $(STAGING_DIR)/usr/include/libxml2 for includedir is incorrect, because > then at install time we pass DESTDIR=$(TARGET_DIR) (for target > installation) or DESTDIR=$(STAGING_DIR) (for staging installation). > > This means that the libonvif headers will get installed in: > > $(TARGET_DIR)/$(STAGING_DIR)/usr/include/libxml2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ this is the value you passed to includedir > > and > > $(STAGING_DIR)/$(STAGING_DIR)/usr/include/libxml2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ this is the value you passed to includedir > > Hope this helps, > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com From giulio.benetti at benettiengineering.com Fri Feb 4 10:24:35 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 4 Feb 2022 11:24:35 +0100 Subject: [Buildroot] qt5webengine build failure on gitlab-CI In-Reply-To: <20220204085100.77deaeb8@gmx.net> References: <1662cf67-b9ef-33be-c5c4-5d5e786f944a@benettiengineering.com> <20220204085100.77deaeb8@gmx.net> Message-ID: <92e2c20f-86dd-812b-e13f-5479146e640b@benettiengineering.com> Hi Peter, On 04/02/22 08:51, Peter Seiderer wrote: > Hello Giulio, > > On Fri, 4 Feb 2022 02:03:48 +0100, Giulio Benetti wrote: > >> Hi Peter and James, >> >> I can fix this build failure[1] due to qt5webengine, you're the experts >> here, can you take a look please? >> >> You have to build using official docker as I've described in this patch >> for the manual: >> https://patchwork.ozlabs.org/project/buildroot/patch/20220203235438.610277-1-giulio.benetti at benettiengineering.com/ >> >> I've tried this patch: >> https://patchwork.ozlabs.org/project/buildroot/patch/20220117114358.3814200-1-james.hilliard1 at gmail.com/ >> but it didn't help :-/ > > See [2], [3] and [4].... Thank you for pointing, this patch: https://patchwork.ozlabs.org/project/buildroot/patch/20201221203952.22168-3-ps.report at gmx.net/ seems to be what we need at the moment IMHO. It can also be backported. Best regards -- Giulio Benetti Benetti Engineering sas > Regards, > Peter > > [2] http://lists.busybox.net/pipermail/buildroot/2020-December/601542.html > [3] http://lists.busybox.net/pipermail/buildroot/2021-January/301496.html > [4] http://lists.busybox.net/pipermail/buildroot/2022-January/633204.html > >> >> Thanks in advance! >> >> [1]: https://gitlab.com/buildroot.org/buildroot/-/jobs/1929717230 >> >> Best regards > From giulio.benetti at benettiengineering.com Fri Feb 4 10:27:32 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 4 Feb 2022 11:27:32 +0100 Subject: [Buildroot] qt5webengine build failure on gitlab-CI In-Reply-To: References: <1662cf67-b9ef-33be-c5c4-5d5e786f944a@benettiengineering.com> Message-ID: Hi James, On 04/02/22 09:52, James Hilliard wrote: > On Thu, Feb 3, 2022 at 6:03 PM Giulio Benetti > wrote: >> >> Hi Peter and James, >> >> I can fix this build failure[1] due to qt5webengine, you're the experts >> here, can you take a look please? >> >> You have to build using official docker as I've described in this patch >> for the manual: >> https://patchwork.ozlabs.org/project/buildroot/patch/20220203235438.610277-1-giulio.benetti at benettiengineering.com/ >> >> I've tried this patch: >> https://patchwork.ozlabs.org/project/buildroot/patch/20220117114358.3814200-1-james.hilliard1 at gmail.com/ >> but it didn't help :-/ > > I've got a WIP branch that should hopefully fix this and a bunch of > related issues, > cleaning it up at the moment: > https://github.com/buildroot/buildroot/compare/master...jameshilliard:qt5webengine-kde This is a good improvement, but I need something to fix the actual problem and that can be eventually backported, so this: https://patchwork.ozlabs.org/project/buildroot/patch/20201221203952.22168-3-ps.report at gmx.net/ fits more our needs for the moment. Thank you! Best regards -- Giulio Benetti Benetti Engineering sas >> >> Thanks in advance! >> >> [1]: https://gitlab.com/buildroot.org/buildroot/-/jobs/1929717230 >> >> Best regards >> -- >> Giulio Benetti >> Benetti Engineering sas > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From giulio.benetti at benettiengineering.com Fri Feb 4 10:40:49 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 4 Feb 2022 11:40:49 +0100 Subject: [Buildroot] [PATCH 1/2 v2] boot/uboot: fix build with host-gcc 10+ In-Reply-To: <79dd83642a7b1964ed69d74c4b0f93eada940a4e.1643665029.git.yann.morin.1998@free.fr> References: <79dd83642a7b1964ed69d74c4b0f93eada940a4e.1643665029.git.yann.morin.1998@free.fr> Message-ID: <76c64971-4c4a-41a3-89d7-f1e837961d6e@benettiengineering.com> Hi Yann, On 31/01/22 22:38, Yann E. MORIN wrote: > 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) I've extensively tested this patch while fixing Gitlab-CI build failures and here there is the actual situation: https://paste.debian.net/1229530/ I've built successfully circa 20-25 cases where the problem didn't arise and also a couple where the problem arised. So: Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti Thank you! Best regards -- Giulio Benetti Benetti Engineering sas > > --- > 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) From giulio.benetti at benettiengineering.com Fri Feb 4 10:41:09 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 4 Feb 2022 11:41:09 +0100 Subject: [Buildroot] [PATCH 2/2 v2] linux: fix build with host-gcc 10+ In-Reply-To: References: Message-ID: <4fc954ba-48d7-388f-39e4-56f83db14297@benettiengineering.com> Hi Yann, On 31/01/22 22:38, 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. > > 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) I've extensively tested this patch while fixing Gitlab-CI build failures and here there is the actual situation: https://paste.debian.net/1229530/ I've built successfully circa 20-25 cases where the problem didn't arise and also a couple where the problem arised. So: Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti Thank you! Best regards -- Giulio Benetti Benetti Engineering sas > --- > 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 -- Giulio Benetti Benetti Engineering sas From bugzilla at busybox.net Fri Feb 4 11:03:18 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Fri, 04 Feb 2022 11:03:18 +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 --- Comment #3 from oliver.kasten at trsystems.de --- I have the same issue. It seems that qemu used in v8-qemu-wrapper.in caused this issue. Build nodejs for aarch64 on x86_64 works fine, but building for x86_64 on x86_64 failed. I entered a bug request for qemu (https://gitlab.com/qemu-project/qemu/-/issues/857). -- You are receiving this mail because: You are on the CC list for the bug. From giulio.benetti at benettiengineering.com Fri Feb 4 11:21:39 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 4 Feb 2022 12:21:39 +0100 Subject: [Buildroot] qt5webengine build failure on gitlab-CI In-Reply-To: References: <1662cf67-b9ef-33be-c5c4-5d5e786f944a@benettiengineering.com> Message-ID: <67349e3c-373f-905a-840a-55c4b8143906@benettiengineering.com> On 04/02/22 11:27, Giulio Benetti wrote: > Hi James, > > On 04/02/22 09:52, James Hilliard wrote: >> On Thu, Feb 3, 2022 at 6:03 PM Giulio Benetti >> wrote: >>> >>> Hi Peter and James, >>> >>> I can fix this build failure[1] due to qt5webengine, you're the experts >>> here, can you take a look please? >>> >>> You have to build using official docker as I've described in this patch >>> for the manual: >>> https://patchwork.ozlabs.org/project/buildroot/patch/20220203235438.610277-1-giulio.benetti at benettiengineering.com/ >>> >>> I've tried this patch: >>> https://patchwork.ozlabs.org/project/buildroot/patch/20220117114358.3814200-1-james.hilliard1 at gmail.com/ >>> but it didn't help :-/ >> >> I've got a WIP branch that should hopefully fix this and a bunch of >> related issues, >> cleaning it up at the moment: >> https://github.com/buildroot/buildroot/compare/master...jameshilliard:qt5webengine-kde > > This is a good improvement, but I need something to fix the actual > problem and that can be eventually backported, so this: > https://patchwork.ozlabs.org/project/buildroot/patch/20201221203952.22168-3-ps.report at gmx.net/ > fits more our needs for the moment. I was wrong, I haven't pulled the master branch so I was still building 5.15.2 and no 5.15.8 Look forward for having your patch to test then. Thank you! Best regards -- Giulio Benetti Benetti Engineering sas From ps.report at gmx.net Fri Feb 4 15:37:15 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 4 Feb 2022 16:37:15 +0100 Subject: [Buildroot] [PATCH v1] package/findutils: bump version to 4.9.0 Message-ID: <20220204153715.15481-1-ps.report@gmx.net> For details see [1]. [1] https://lists.gnu.org/archive/html/info-gnu/2022-02/msg00003.html Signed-off-by: Peter Seiderer --- package/findutils/findutils.hash | 2 +- package/findutils/findutils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/findutils/findutils.hash b/package/findutils/findutils.hash index 26dbe59181..0284c0e7b2 100644 --- a/package/findutils/findutils.hash +++ b/package/findutils/findutils.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 57127b7e97d91282c6ace556378d5455a9509898297e46e10443016ea1387164 findutils-4.8.0.tar.xz +sha256 a2bfb8c09d436770edc59f50fa483e785b161a3b7b9d547573cb08065fd462fe findutils-4.9.0.tar.xz # Hash for license file sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING diff --git a/package/findutils/findutils.mk b/package/findutils/findutils.mk index 3237e5502a..9731a35047 100644 --- a/package/findutils/findutils.mk +++ b/package/findutils/findutils.mk @@ -4,7 +4,7 @@ # ################################################################################ -FINDUTILS_VERSION = 4.8.0 +FINDUTILS_VERSION = 4.9.0 FINDUTILS_SOURCE = findutils-$(FINDUTILS_VERSION).tar.xz FINDUTILS_SITE = $(BR2_GNU_MIRROR)/findutils FINDUTILS_LICENSE = GPL-3.0+ -- 2.34.1 From ps.report at gmx.net Fri Feb 4 15:46:20 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 4 Feb 2022 16:46:20 +0100 Subject: [Buildroot] [PATCH v1 01/12] package/gstreamer1: bump version to 1.18.6 In-Reply-To: <20220204154631.17814-1-ps.report@gmx.net> References: <20220204154631.17814-1-ps.report@gmx.net> Message-ID: <20220204154631.17814-2-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gstreamer1/gstreamer1.hash | 4 ++-- package/gstreamer1/gstreamer1/gstreamer1.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gstreamer1/gstreamer1.hash b/package/gstreamer1/gstreamer1/gstreamer1.hash index c6282454ca..1202bf2c50 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.hash +++ b/package/gstreamer1/gstreamer1/gstreamer1.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.18.5.tar.xz.sha256sum -sha256 55862232a63459bbf56abebde3085ca9aec211b478e891dacea4d6df8cafe80a gstreamer-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.18.6.tar.xz.sha256sum +sha256 4ec816010dd4d3a93cf470ad0a6f25315f52b204eb1d71dfa70ab8a1c3bd06e6 gstreamer-1.18.6.tar.xz sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk index 1aab035e05..27745f3bf9 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_VERSION = 1.18.5 +GSTREAMER1_VERSION = 1.18.6 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer GSTREAMER1_INSTALL_STAGING = YES -- 2.34.1 From ps.report at gmx.net Fri Feb 4 15:46:19 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 4 Feb 2022 16:46:19 +0100 Subject: [Buildroot] [PATCH v1 00/12] package/gstreamer1/*: bump version to 1.18.6 Message-ID: <20220204154631.17814-1-ps.report@gmx.net> For details see [1] and [2]. [1] https://lists.freedesktop.org/archives/gstreamer-devel/2022-February/079533.html [2] https://gstreamer.freedesktop.org/releases/1.18/#1.18.6 Peter Seiderer (12): package/gstreamer1: bump version to 1.18.6 package/gst1-plugins-base: bump version to 1.18.6 package/gst1-plugins-good: bump version to 1.18.6 package/gst1-plugins-bad: bump version to 1.18.6 package/gst1-plugins-ugly: bump version to 1.18.6 package/gst1-devtools: bump version to 1.18.6 package/gst1-libav: bump version to 1.18.6 package/gst1-vaapi: bump version to 1.18.6 package/gst1-rtsp-server: bump version to 1.18.6 package/gstreamer1-editing-services: bump version to 1.18.6 package/gst-omx: bump version to 1.18.6 package/gst1-python: bump version to 1.18.6 package/gstreamer1/gst-omx/gst-omx.hash | 4 +- package/gstreamer1/gst-omx/gst-omx.mk | 2 +- .../gst1-devtools/gst1-devtools.hash | 4 +- .../gstreamer1/gst1-devtools/gst1-devtools.mk | 2 +- package/gstreamer1/gst1-libav/gst1-libav.hash | 4 +- package/gstreamer1/gst1-libav/gst1-libav.mk | 2 +- .../gst1-plugins-bad/gst1-plugins-bad.hash | 4 +- .../gst1-plugins-bad/gst1-plugins-bad.mk | 2 +- ...eo-gstvideoaggregator.c-fix-build-wi.patch | 45 ------------------- .../gst1-plugins-base/gst1-plugins-base.hash | 4 +- .../gst1-plugins-base/gst1-plugins-base.mk | 2 +- .../gst1-plugins-good/gst1-plugins-good.hash | 4 +- .../gst1-plugins-good/gst1-plugins-good.mk | 2 +- .../gst1-plugins-ugly/gst1-plugins-ugly.hash | 4 +- .../gst1-plugins-ugly/gst1-plugins-ugly.mk | 2 +- .../gstreamer1/gst1-python/gst1-python.hash | 4 +- package/gstreamer1/gst1-python/gst1-python.mk | 2 +- .../gst1-rtsp-server/gst1-rtsp-server.hash | 4 +- .../gst1-rtsp-server/gst1-rtsp-server.mk | 2 +- package/gstreamer1/gst1-vaapi/gst1-vaapi.hash | 4 +- package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 2 +- .../gstreamer1-editing-services.hash | 4 +- .../gstreamer1-editing-services.mk | 2 +- package/gstreamer1/gstreamer1/gstreamer1.hash | 4 +- package/gstreamer1/gstreamer1/gstreamer1.mk | 2 +- 25 files changed, 36 insertions(+), 81 deletions(-) delete mode 100644 package/gstreamer1/gst1-plugins-base/0001-gst-libs-gst-video-gstvideoaggregator.c-fix-build-wi.patch -- 2.34.1 From ps.report at gmx.net Fri Feb 4 15:46:21 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 4 Feb 2022 16:46:21 +0100 Subject: [Buildroot] [PATCH v1 02/12] package/gst1-plugins-base: bump version to 1.18.6 In-Reply-To: <20220204154631.17814-1-ps.report@gmx.net> References: <20220204154631.17814-1-ps.report@gmx.net> Message-ID: <20220204154631.17814-3-ps.report@gmx.net> - removed 0001-gst-libs-gst-video-gstvideoaggregator.c-fix-build-wi.patch (upstream accepted [1], [2]) [1] https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/974 [2] https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/commit/d86cf6314f8f178c59600f55321ce73d4ca95d97.patch Signed-off-by: Peter Seiderer --- ...eo-gstvideoaggregator.c-fix-build-wi.patch | 45 ------------------- .../gst1-plugins-base/gst1-plugins-base.hash | 4 +- .../gst1-plugins-base/gst1-plugins-base.mk | 2 +- 3 files changed, 3 insertions(+), 48 deletions(-) delete mode 100644 package/gstreamer1/gst1-plugins-base/0001-gst-libs-gst-video-gstvideoaggregator.c-fix-build-wi.patch diff --git a/package/gstreamer1/gst1-plugins-base/0001-gst-libs-gst-video-gstvideoaggregator.c-fix-build-wi.patch b/package/gstreamer1/gst1-plugins-base/0001-gst-libs-gst-video-gstvideoaggregator.c-fix-build-wi.patch deleted file mode 100644 index 87cd6493f5..0000000000 --- a/package/gstreamer1/gst1-plugins-base/0001-gst-libs-gst-video-gstvideoaggregator.c-fix-build-wi.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 012ca1bcd234ee02f576dd58b1f09baba18b89b0 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 14 Dec 2020 07:42:55 +0100 -Subject: [PATCH] gst-libs/gst/video/gstvideoaggregator.c: fix build with gcc - 4.8 - -Fix the following build failure with gcc 4.8 which has been added with -https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/commit/d268c193ad39fb970351ed62898be806ebd0a71e: - -../gst-libs/gst/video/gstvideoaggregator.c: In function 'gst_video_aggregator_init': -../gst-libs/gst/video/gstvideoaggregator.c:2762:3: error: 'for' loop initial declarations are only allowed in C99 mode - for (gint i = 0; i < gst_caps_get_size (src_template); i++) { - ^ - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/974] ---- - gst-libs/gst/video/gstvideoaggregator.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/gst-libs/gst/video/gstvideoaggregator.c b/gst-libs/gst/video/gstvideoaggregator.c -index 2e3d813be..04dad6563 100644 ---- a/gst-libs/gst/video/gstvideoaggregator.c -+++ b/gst-libs/gst/video/gstvideoaggregator.c -@@ -2786,6 +2786,7 @@ gst_video_aggregator_init (GstVideoAggregator * vagg, - { - GstCaps *src_template; - GstPadTemplate *pad_template; -+ gint i; - - vagg->priv = gst_video_aggregator_get_instance_private (vagg); - vagg->priv->current_caps = NULL; -@@ -2800,7 +2801,7 @@ gst_video_aggregator_init (GstVideoAggregator * vagg, - pad_template = - gst_element_class_get_pad_template (GST_ELEMENT_CLASS (klass), "src"); - src_template = gst_pad_template_get_caps (pad_template); -- for (gint i = 0; i < gst_caps_get_size (src_template); i++) { -+ for (i = 0; i < gst_caps_get_size (src_template); i++) { - const GValue *v = - gst_structure_get_value (gst_caps_get_structure (src_template, i), - "format"); --- -2.29.2 - diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash index 200ba0fe5d..081dc6f213 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.18.5.tar.xz.sha256sum -sha256 960b7af4585700db0fdd5b843554e11e2564fed9e061f591fae88a7be6446fa3 gst-plugins-base-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.18.6.tar.xz.sha256sum +sha256 56a9ff2fe9e6603b9e658cf6897d412a173d2180829fe01e92568549c6bd0f5b gst-plugins-base-1.18.6.tar.xz sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk index 76757fd6a8..c99eeb6c59 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BASE_VERSION = 1.18.5 +GST1_PLUGINS_BASE_VERSION = 1.18.6 GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz GST1_PLUGINS_BASE_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-base GST1_PLUGINS_BASE_INSTALL_STAGING = YES -- 2.34.1 From ps.report at gmx.net Fri Feb 4 15:46:22 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 4 Feb 2022 16:46:22 +0100 Subject: [Buildroot] [PATCH v1 03/12] package/gst1-plugins-good: bump version to 1.18.6 In-Reply-To: <20220204154631.17814-1-ps.report@gmx.net> References: <20220204154631.17814-1-ps.report@gmx.net> Message-ID: <20220204154631.17814-4-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash | 4 ++-- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash index ea9f43bfd2..e342bd133e 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.5.tar.xz.sha256sum -sha256 3aaeeea7765fbf8801acce4a503a9b05f73f04e8a35352e9d00232cfd555796b gst-plugins-good-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.6.tar.xz.sha256sum +sha256 26723ac01fcb360ade1f41d168c7c322d8af4ceb7e55c8c12ed2690d06a76eed gst-plugins-good-1.18.6.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk index 44da3c3c30..e0ca29c5fd 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_GOOD_VERSION = 1.18.5 +GST1_PLUGINS_GOOD_VERSION = 1.18.6 GST1_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST1_PLUGINS_GOOD_VERSION).tar.xz GST1_PLUGINS_GOOD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-good GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING -- 2.34.1 From ps.report at gmx.net Fri Feb 4 15:46:26 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 4 Feb 2022 16:46:26 +0100 Subject: [Buildroot] [PATCH v1 07/12] package/gst1-libav: bump version to 1.18.6 In-Reply-To: <20220204154631.17814-1-ps.report@gmx.net> References: <20220204154631.17814-1-ps.report@gmx.net> Message-ID: <20220204154631.17814-8-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-libav/gst1-libav.hash | 4 ++-- package/gstreamer1/gst1-libav/gst1-libav.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-libav/gst1-libav.hash b/package/gstreamer1/gst1-libav/gst1-libav.hash index 040a6e33f3..5fb39a0b3e 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.hash +++ b/package/gstreamer1/gst1-libav/gst1-libav.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.18.5.tar.xz.sha256sum -sha256 822e008a910e9dd13aedbdd8dc63fedef4040c0ee2e927bab3112e9de693a548 gst-libav-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.18.6.tar.xz.sha256sum +sha256 e4e50dcd5a29441ae34de60d2221057e8064ed824bb6ca4dc0fd9ee88fbe9b81 gst-libav-1.18.6.tar.xz sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gst1-libav/gst1-libav.mk b/package/gstreamer1/gst1-libav/gst1-libav.mk index 01ec4d2c98..55c6e06e0e 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.mk +++ b/package/gstreamer1/gst1-libav/gst1-libav.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_LIBAV_VERSION = 1.18.5 +GST1_LIBAV_VERSION = 1.18.6 GST1_LIBAV_SOURCE = gst-libav-$(GST1_LIBAV_VERSION).tar.xz GST1_LIBAV_SITE = https://gstreamer.freedesktop.org/src/gst-libav GST1_LIBAV_LICENSE = LGPL-2.0+ -- 2.34.1 From ps.report at gmx.net Fri Feb 4 15:46:28 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 4 Feb 2022 16:46:28 +0100 Subject: [Buildroot] [PATCH v1 09/12] package/gst1-rtsp-server: bump version to 1.18.6 In-Reply-To: <20220204154631.17814-1-ps.report@gmx.net> References: <20220204154631.17814-1-ps.report@gmx.net> Message-ID: <20220204154631.17814-10-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash | 4 ++-- package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash index 627a451d04..fadef41351 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash @@ -1,4 +1,4 @@ -# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.18.5.tar.xz.sha256sum -sha256 04d63bf48816c6f41c73f6de0f912a7cef0aab39c44162a7bcece1923dfc9d1f gst-rtsp-server-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.18.6.tar.xz.sha256sum +sha256 826f32afbcf94b823541efcac4a0dacdb62f6145ef58f363095749f440262be9 gst-rtsp-server-1.18.6.tar.xz sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING.LIB diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk index 37942423a5..55403754f3 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_RTSP_SERVER_VERSION = 1.18.5 +GST1_RTSP_SERVER_VERSION = 1.18.6 GST1_RTSP_SERVER_SOURCE = gst-rtsp-server-$(GST1_RTSP_SERVER_VERSION).tar.xz GST1_RTSP_SERVER_SITE = http://gstreamer.freedesktop.org/src/gst-rtsp-server GST1_RTSP_SERVER_LICENSE = LGPL-2.0+ -- 2.34.1 From ps.report at gmx.net Fri Feb 4 15:46:27 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 4 Feb 2022 16:46:27 +0100 Subject: [Buildroot] [PATCH v1 08/12] package/gst1-vaapi: bump version to 1.18.6 In-Reply-To: <20220204154631.17814-1-ps.report@gmx.net> References: <20220204154631.17814-1-ps.report@gmx.net> Message-ID: <20220204154631.17814-9-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-vaapi/gst1-vaapi.hash | 4 ++-- package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash index b0c19fc600..7e22774c11 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.18.5.tar.xz.sha256sum -sha256 4a460fb95559f41444eb24864ad2d9e37922b6eea941510310319fc3e0ba727b gstreamer-vaapi-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.18.6.tar.xz.sha256sum +sha256 ab6270f1e5e4546fbe6f5ea246d86ca3d196282eb863d46e6cdcc96f867449e0 gstreamer-vaapi-1.18.6.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk index 9810b12cf7..6af851602f 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_VAAPI_VERSION = 1.18.5 +GST1_VAAPI_VERSION = 1.18.6 GST1_VAAPI_SITE = https://gstreamer.freedesktop.org/src/gstreamer-vaapi GST1_VAAPI_SOURCE = gstreamer-vaapi-$(GST1_VAAPI_VERSION).tar.xz GST1_VAAPI_LICENSE = LGPL-2.1+ -- 2.34.1 From ps.report at gmx.net Fri Feb 4 15:46:31 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 4 Feb 2022 16:46:31 +0100 Subject: [Buildroot] [PATCH v1 12/12] package/gst1-python: bump version to 1.18.6 In-Reply-To: <20220204154631.17814-1-ps.report@gmx.net> References: <20220204154631.17814-1-ps.report@gmx.net> Message-ID: <20220204154631.17814-13-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-python/gst1-python.hash | 4 ++-- package/gstreamer1/gst1-python/gst1-python.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-python/gst1-python.hash b/package/gstreamer1/gst1-python/gst1-python.hash index 2035c81fea..a760e53e7d 100644 --- a/package/gstreamer1/gst1-python/gst1-python.hash +++ b/package/gstreamer1/gst1-python/gst1-python.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.18.5.tar.xz.sha256sum -sha256 533685871305959d6db89507f3b3aa6c765c2f2b0dacdc32c5a6543e72e5bc52 gst-python-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.18.6.tar.xz.sha256sum +sha256 bdc0ea22fbd7335ad9decc151561aacc53c51206a9735b81eac700ce5b0bbd4a gst-python-1.18.6.tar.xz sha256 ea3ad127610e5ded2210b3a86a46314f2b3b28e438eccffdae19a4d6fbcdb0c2 COPYING diff --git a/package/gstreamer1/gst1-python/gst1-python.mk b/package/gstreamer1/gst1-python/gst1-python.mk index 614cb22396..7faab752cd 100644 --- a/package/gstreamer1/gst1-python/gst1-python.mk +++ b/package/gstreamer1/gst1-python/gst1-python.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PYTHON_VERSION = 1.18.5 +GST1_PYTHON_VERSION = 1.18.6 GST1_PYTHON_SOURCE = gst-python-$(GST1_PYTHON_VERSION).tar.xz GST1_PYTHON_SITE = https://gstreamer.freedesktop.org/src/gst-python GST1_PYTHON_INSTALL_STAGING = YES -- 2.34.1 From ps.report at gmx.net Fri Feb 4 15:46:29 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 4 Feb 2022 16:46:29 +0100 Subject: [Buildroot] [PATCH v1 10/12] package/gstreamer1-editing-services: bump version to 1.18.6 In-Reply-To: <20220204154631.17814-1-ps.report@gmx.net> References: <20220204154631.17814-1-ps.report@gmx.net> Message-ID: <20220204154631.17814-11-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- .../gstreamer1-editing-services.hash | 4 ++-- .../gstreamer1-editing-services.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash index daaf729c70..e29dc112ce 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash @@ -1,5 +1,5 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.18.5.tar.xz.sha256sum -sha256 8af4a8394d051f3e18280686db49a6efaccc95c0c59a17f0f564e32000590df5 gst-editing-services-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.18.6.tar.xz.sha256sum +sha256 fe10d14ef896aa21038317f6f81e1158ccc6caaed9b0d5a29ae5bdd63074582c gst-editing-services-1.18.6.tar.xz # Hashes for license files: sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk index d3de79c5f6..a3722cbbca 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_EDITING_SERVICES_VERSION = 1.18.5 +GSTREAMER1_EDITING_SERVICES_VERSION = 1.18.6 GSTREAMER1_EDITING_SERVICES_SOURCE = gst-editing-services-$(GSTREAMER1_EDITING_SERVICES_VERSION).tar.xz GSTREAMER1_EDITING_SERVICES_SITE = https://gstreamer.freedesktop.org/src/gstreamer-editing-services GSTREAMER1_EDITING_SERVICES_LICENSE = LGPL-2.0+ -- 2.34.1 From ps.report at gmx.net Fri Feb 4 15:46:24 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 4 Feb 2022 16:46:24 +0100 Subject: [Buildroot] [PATCH v1 05/12] package/gst1-plugins-ugly: bump version to 1.18.6 In-Reply-To: <20220204154631.17814-1-ps.report@gmx.net> References: <20220204154631.17814-1-ps.report@gmx.net> Message-ID: <20220204154631.17814-6-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash | 4 ++-- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash index 93945cdecd..26fd0fd9ac 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.18.5.tar.xz.sha256sum -sha256 df32803e98f8a9979373fa2ca7e05e62f977b1097576d3a80619d9f5c69f66d9 gst-plugins-ugly-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.18.6.tar.xz.sha256sum +sha256 4969c409cb6a88317d2108b8577108e18623b2333d7b587ae3f39459c70e3a7f gst-plugins-ugly-1.18.6.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk index a25110264e..7f483deb81 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_UGLY_VERSION = 1.18.5 +GST1_PLUGINS_UGLY_VERSION = 1.18.6 GST1_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST1_PLUGINS_UGLY_VERSION).tar.xz GST1_PLUGINS_UGLY_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-ugly GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING -- 2.34.1 From ps.report at gmx.net Fri Feb 4 15:46:25 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 4 Feb 2022 16:46:25 +0100 Subject: [Buildroot] [PATCH v1 06/12] package/gst1-devtools: bump version to 1.18.6 In-Reply-To: <20220204154631.17814-1-ps.report@gmx.net> References: <20220204154631.17814-1-ps.report@gmx.net> Message-ID: <20220204154631.17814-7-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-devtools/gst1-devtools.hash | 4 ++-- package/gstreamer1/gst1-devtools/gst1-devtools.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.hash b/package/gstreamer1/gst1-devtools/gst1-devtools.hash index c19254c195..011385e757 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.hash +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.18.5.tar.xz.sha256sum -sha256 fecffc86447daf5c2a06843c757a991d745caa2069446a0d746e99b13f7cb079 gst-devtools-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.18.6.tar.xz.sha256sum +sha256 3725622c740a635452e54b79d065f963ab7706ca2403de6c43072ae7610a0de4 gst-devtools-1.18.6.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 validate/COPYING diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.mk b/package/gstreamer1/gst1-devtools/gst1-devtools.mk index 1c25823953..66b509ae2c 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.mk +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_DEVTOOLS_VERSION = 1.18.5 +GST1_DEVTOOLS_VERSION = 1.18.6 GST1_DEVTOOLS_SOURCE = gst-devtools-$(GST1_DEVTOOLS_VERSION).tar.xz GST1_DEVTOOLS_SITE = https://gstreamer.freedesktop.org/src/gst-devtools GST1_DEVTOOLS_LICENSE = LGPL-2.1+ -- 2.34.1 From ps.report at gmx.net Fri Feb 4 15:46:30 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 4 Feb 2022 16:46:30 +0100 Subject: [Buildroot] [PATCH v1 11/12] package/gst-omx: bump version to 1.18.6 In-Reply-To: <20220204154631.17814-1-ps.report@gmx.net> References: <20220204154631.17814-1-ps.report@gmx.net> Message-ID: <20220204154631.17814-12-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gst-omx/gst-omx.hash | 4 ++-- package/gstreamer1/gst-omx/gst-omx.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst-omx/gst-omx.hash b/package/gstreamer1/gst-omx/gst-omx.hash index 9040393506..47f7cb5893 100644 --- a/package/gstreamer1/gst-omx/gst-omx.hash +++ b/package/gstreamer1/gst-omx/gst-omx.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.18.5.tar.xz.sha256sum -sha256 2cd457c1e8deb1a9b39608048fb36a44f6c9a864a6b6115b1453a32e7be93b42 gst-omx-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.18.6.tar.xz.sha256sum +sha256 b5281c938e959fd2418e989cfb6065fdd9fe5f6f87ee86236c9427166e708163 gst-omx-1.18.6.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst-omx/gst-omx.mk b/package/gstreamer1/gst-omx/gst-omx.mk index f7be1d59ef..dc65509244 100644 --- a/package/gstreamer1/gst-omx/gst-omx.mk +++ b/package/gstreamer1/gst-omx/gst-omx.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST_OMX_VERSION = 1.18.5 +GST_OMX_VERSION = 1.18.6 GST_OMX_SOURCE = gst-omx-$(GST_OMX_VERSION).tar.xz GST_OMX_SITE = https://gstreamer.freedesktop.org/src/gst-omx -- 2.34.1 From ps.report at gmx.net Fri Feb 4 15:46:23 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 4 Feb 2022 16:46:23 +0100 Subject: [Buildroot] [PATCH v1 04/12] package/gst1-plugins-bad: bump version to 1.18.6 In-Reply-To: <20220204154631.17814-1-ps.report@gmx.net> References: <20220204154631.17814-1-ps.report@gmx.net> Message-ID: <20220204154631.17814-5-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash | 4 ++-- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash index cbb2729dab..d31a78981e 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.5.tar.xz.sha256sum -sha256 a164923b94f0d08578a6fcaeaac6e0c05da788a46903a1086870e9ca45ad678e gst-plugins-bad-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.6.tar.xz.sha256sum +sha256 0b1b50ac6311f0c510248b6cd64d6d3c94369344828baa602db85ded5bc70ec9 gst-plugins-bad-1.18.6.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index ac00fd59e1..d02ca1ba74 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BAD_VERSION = 1.18.5 +GST1_PLUGINS_BAD_VERSION = 1.18.6 GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz GST1_PLUGINS_BAD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-bad GST1_PLUGINS_BAD_INSTALL_STAGING = YES -- 2.34.1 From bernd.kuhls at t-online.de Fri Feb 4 16:45:28 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Fri, 4 Feb 2022 17:45:28 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi-pvr-mythtv: bump version to 19.0.7-Matrix Message-ID: <20220204164528.80593-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 cb10d24a4f..15596333f5 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 8e63e85e055ec1e2d727506c939c4f53f6aef8b714f5c18f73c58102355f2e14 kodi-pvr-mythtv-19.0.6-Matrix.tar.gz +sha256 ccb97573c308c99adccdedf8328133c02d48c11620b602a906cf25107602dba5 kodi-pvr-mythtv-19.0.7-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 351fbc4eae..3040f87e14 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.6-Matrix +KODI_PVR_MYTHTV_VERSION = 19.0.7-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 dan at thejacksons.uk Fri Feb 4 16:55:21 2022 From: dan at thejacksons.uk (Dan Jackson) Date: Fri, 4 Feb 2022 16:55:21 +0000 Subject: [Buildroot] Getting Buildroot-created binaries to work with the Intel (TI) Puma 5 ARM-based CPU? Message-ID: Hello everyone, I am new to Buildroot, so I hope you will forgive me if I make any obvious mistakes or omissions in my email. I hope this mailing list is the correct place to post my query, normally I would ask on forums or in Github issues, but Buildroot seems not to have a forum and its Github explicitly says not to post queries in the issues there. I have been experimenting with an old router, which uses an Intel Puma 5 ARM-based CPU (it's my understanding that Intel bought this design from Texas Instruments). At the moment I am not looking to replace the whole operating system, initially I would just like to build some binaries (such as dropbear for example) to make the exploration process easier. The original software on the device was built with an ancient version of Buildroot - a config file can be seen in the /etc folder - and many of the options specified no longer exist in current Buildroot versions or relate to proprietary software components for which source code is not available. There are two other Puma 5 toolchains I have come across on the Internet, and both of these are also based on old Buildroot versions, but also patch these with a number of things, such as compiler command line switches and options file tweaks. Unfortunately, the older Buildroot versions do not seem to function properly on modern Linux installations. So, I was wondering what would need to be done to enable creation of Puma 5 compatible binaries using the current stable version of Buildroot? Links to the two toolchains I mentioned: https://github.com/bmaia/cross-utils/tree/master/armeb/puma5_toolchain (uses Buildroot 2009.02) https://sourceforge.net/projects/dg3270.arris/files/DG3270_9.1.103FB/ (uses Buildroot 2013.08.1) Thanks, Dan Jackson. From james.hilliard1 at gmail.com Fri Feb 4 17:12:13 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 4 Feb 2022 10:12:13 -0700 Subject: [Buildroot] qt5webengine build failure on gitlab-CI In-Reply-To: <67349e3c-373f-905a-840a-55c4b8143906@benettiengineering.com> References: <1662cf67-b9ef-33be-c5c4-5d5e786f944a@benettiengineering.com> <67349e3c-373f-905a-840a-55c4b8143906@benettiengineering.com> Message-ID: On Fri, Feb 4, 2022 at 4:21 AM Giulio Benetti wrote: > > On 04/02/22 11:27, Giulio Benetti wrote: > > Hi James, > > > > On 04/02/22 09:52, James Hilliard wrote: > >> On Thu, Feb 3, 2022 at 6:03 PM Giulio Benetti > >> wrote: > >>> > >>> Hi Peter and James, > >>> > >>> I can fix this build failure[1] due to qt5webengine, you're the experts > >>> here, can you take a look please? > >>> > >>> You have to build using official docker as I've described in this patch > >>> for the manual: > >>> https://patchwork.ozlabs.org/project/buildroot/patch/20220203235438.610277-1-giulio.benetti at benettiengineering.com/ > >>> > >>> I've tried this patch: > >>> https://patchwork.ozlabs.org/project/buildroot/patch/20220117114358.3814200-1-james.hilliard1 at gmail.com/ > >>> but it didn't help :-/ > >> > >> I've got a WIP branch that should hopefully fix this and a bunch of > >> related issues, > >> cleaning it up at the moment: > >> https://github.com/buildroot/buildroot/compare/master...jameshilliard:qt5webengine-kde > > > > This is a good improvement, but I need something to fix the actual > > problem and that can be eventually backported, so this: > > https://patchwork.ozlabs.org/project/buildroot/patch/20201221203952.22168-3-ps.report at gmx.net/ > > fits more our needs for the moment. > > I was wrong, I haven't pulled the master branch so I was still building > 5.15.2 and no 5.15.8 The master branch still uses 5.15.2. > > Look forward for having your patch to test then. > > Thank you! > Best regards > -- > Giulio Benetti > Benetti Engineering sas From peter at korsgaard.com Fri Feb 4 17:47:11 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 4 Feb 2022 18:47:11 +0100 Subject: [Buildroot] [PATCH] package/{glibc, localedef}: security bump for additional post-2.34.x fixes Message-ID: <20220204174712.1109-1-peter@korsgaard.com> Fixes the following security issues: CVE-2022-23219: Passing an overlong file name to the clnt_create legacy function could result in a stack-based buffer overflow when using the "unix" protocol. Reported by Martin Sebor. CVE-2022-23218: Passing an overlong file name to the svcunix_create legacy function could result in a stack-based buffer overflow. CVE-2021-3998: Passing a path longer than PATH_MAX to the realpath function could result in a memory leak and potential access of uninitialized memory. Reported by Qualys. CVE-2021-3999: Passing a buffer of size exactly 1 byte to the getcwd function may result in an off-by-one buffer underflow and overflow when the current working directory is longer than PATH_MAX and also corresponds to the / directory through an unprivileged mount namespace. Reported by Qualys. Signed-off-by: Peter Korsgaard --- ...1-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch | 0 .../glibc.hash | 2 +- package/glibc/glibc.mk | 2 +- .../0001-HACK-only-build-and-install-localedef.patch | 0 ...02-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch | 0 .../localedef.hash | 2 +- package/localedef/localedef.mk | 2 +- 7 files changed, 4 insertions(+), 4 deletions(-) rename package/glibc/{2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4 => 2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c}/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch (100%) rename package/glibc/{2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4 => 2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c}/glibc.hash (70%) rename package/localedef/{2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4 => 2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c}/0001-HACK-only-build-and-install-localedef.patch (100%) rename package/localedef/{2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4 => 2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c}/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch (100%) rename package/localedef/{2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4 => 2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c}/localedef.hash (70%) 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-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch similarity index 100% rename from package/glibc/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch rename to package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch diff --git a/package/glibc/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/glibc.hash b/package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/glibc.hash similarity index 70% rename from package/glibc/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/glibc.hash rename to package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/glibc.hash index 595de95a58..dfd939020f 100644 --- a/package/glibc/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/glibc.hash +++ b/package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/glibc.hash @@ -1,5 +1,5 @@ # Locally calculated (fetched from Github) -sha256 1c7ed0f69ed268bd66f9754d0cb8fb65e0dafc1f9a1048ea50d1e96d60399686 glibc-2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4.tar.gz +sha256 3c299a21468a80356b848ca341f45551616c4928a6c871e6d45cee942e8b0f24 glibc-2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c.tar.gz # Hashes for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index 5c26b0e6df..9b591aa2a3 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -7,7 +7,7 @@ # Generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- # When updating the version, please also update localedef -GLIBC_VERSION = 2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4 +GLIBC_VERSION = 2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c # Upstream doesn't officially provide an https download link. # There is one (https://sourceware.org/git/glibc.git) but it's not reliable, # sometimes the connection times out. So use an unofficial github mirror. diff --git a/package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0001-HACK-only-build-and-install-localedef.patch b/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-HACK-only-build-and-install-localedef.patch similarity index 100% rename from package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0001-HACK-only-build-and-install-localedef.patch rename to package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-HACK-only-build-and-install-localedef.patch diff --git a/package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch b/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch similarity index 100% rename from package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch rename to package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch diff --git a/package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/localedef.hash b/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/localedef.hash similarity index 70% rename from package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/localedef.hash rename to package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/localedef.hash index 595de95a58..dfd939020f 100644 --- a/package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/localedef.hash +++ b/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/localedef.hash @@ -1,5 +1,5 @@ # Locally calculated (fetched from Github) -sha256 1c7ed0f69ed268bd66f9754d0cb8fb65e0dafc1f9a1048ea50d1e96d60399686 glibc-2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4.tar.gz +sha256 3c299a21468a80356b848ca341f45551616c4928a6c871e6d45cee942e8b0f24 glibc-2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c.tar.gz # Hashes for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/localedef/localedef.mk b/package/localedef/localedef.mk index 87d921cffe..f8f0b42984 100644 --- a/package/localedef/localedef.mk +++ b/package/localedef/localedef.mk @@ -7,7 +7,7 @@ # Use the same VERSION and SITE as target glibc # As in glibc.mk, generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- -LOCALEDEF_VERSION = 2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4 +LOCALEDEF_VERSION = 2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION).tar.gz LOCALEDEF_SITE = $(call github,bminor,glibc,$(LOCALEDEF_VERSION)) HOST_LOCALEDEF_DL_SUBDIR = glibc -- 2.20.1 From giulio.benetti at benettiengineering.com Fri Feb 4 18:55:08 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 4 Feb 2022 19:55:08 +0100 Subject: [Buildroot] qt5webengine build failure on gitlab-CI In-Reply-To: References: <1662cf67-b9ef-33be-c5c4-5d5e786f944a@benettiengineering.com> <67349e3c-373f-905a-840a-55c4b8143906@benettiengineering.com> Message-ID: On 04/02/22 18:12, James Hilliard wrote: [SNIP] >> I was wrong, I haven't pulled the master branch so I was still building >> 5.15.2 and no 5.15.8 > > The master branch still uses 5.15.2. Yes, I've mixed things up. qt5 uses 5.15.8 but qt5webengine still uses 5.15.2 Best regards -- Giulio Benetti Benetti Engineering sas From aduskett at gmail.com Fri Feb 4 19:32:15 2022 From: aduskett at gmail.com (Adam Duskett) Date: Fri, 4 Feb 2022 11:32:15 -0800 Subject: [Buildroot] [PATCH 1/1] package/python-django: bump to version 4.0.2 Message-ID: <20220204193215.167521-1-aduskett@gmail.com> Tested with: support/testing/run-tests tests.package.test_python_django.TestPythonPy3Django Signed-off-by: Adam Duskett --- 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 89bc5ffb19..f78df56c5f 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 6c4a53d2ccb464bc3dd772c6f2f07df9 Django-3.2.11.tar.gz -sha256 69c94abe5d6b1b088bf475e09b7b74403f943e34da107e798465d2045da27e75 Django-3.2.11.tar.gz +md5 a86339c0e87241597afa8744704d9965 Django-4.0.2.tar.gz +sha256 110fb58fb12eca59e072ad59fc42d771cd642dd7a2f2416582aa9da7a8ef954a Django-4.0.2.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-django/python-django.mk b/package/python-django/python-django.mk index 25a645823b..652ca477ce 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 3.2.11 +PYTHON_DJANGO_VERSION = 4.0.2 PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz # The official Django site has an unpractical URL -PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/20/86/e4348aac45bc83fc8e9dda2cfd81004b007c65b68c1499a4233acabdaa3b +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/61/84/676c840e8f1188a6c836e3224b97aa8be4c2e6857c690d6c564eb23a4975 PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE -- 2.34.1 From aduskett at gmail.com Fri Feb 4 20:56:33 2022 From: aduskett at gmail.com (Adam Duskett) Date: Fri, 4 Feb 2022 12:56:33 -0800 Subject: [Buildroot] [PATCH v4 2/3] package/dracut: new host package In-Reply-To: <20220110124644.1388438-2-thierry.bultel@linatsea.fr> References: <20220110124644.1388438-1-thierry.bultel@linatsea.fr> <20220110124644.1388438-2-thierry.bultel@linatsea.fr> Message-ID: Hello! Thank you for the patch series! Hopefully I can help a bit. First things first: - dracut.hash is missing. - Please run ./utils/check-package package/dracut/* and fix any warnings Your Dracut package does not depend on systemd, which results in the error: dracut: FAILED: output/host/lib/dracut/dracut-install -r output/build/buildroot-fs/cpio/target -D output/build/buildroot-fs/cpio/tmp/dracut.Sm7N5J/initramfs -a -l udevadm cat uname blkid dracut: Cannot find [systemd-]udevd binary! I do have a dracut package you may find useful here: https://gitlab.com/aduskett/buildroot/-/tree/dracut/external/package/dracut Thanks! Adam On Mon, Jan 10, 2022 at 4:57 AM Thierry Bultel wrote: > > 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 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From aduskett at gmail.com Fri Feb 4 21:00:21 2022 From: aduskett at gmail.com (Adam Duskett) Date: Fri, 4 Feb 2022 13:00:21 -0800 Subject: [Buildroot] [PATCH v4 2/3] package/dracut: new host package In-Reply-To: References: <20220110124644.1388438-1-thierry.bultel@linatsea.fr> <20220110124644.1388438-2-thierry.bultel@linatsea.fr> Message-ID: One other thing: I do not believe cross-ldd is needed. My package uses the existing host-prelink-cross package. On Fri, Feb 4, 2022 at 12:56 PM Adam Duskett wrote: > > Hello! Thank you for the patch series! Hopefully I can help a bit. > > First things first: > - dracut.hash is missing. > - Please run ./utils/check-package package/dracut/* and fix any warnings > > Your Dracut package does not depend on systemd, which results in the error: > > dracut: FAILED: output/host/lib/dracut/dracut-install -r > output/build/buildroot-fs/cpio/target -D > output/build/buildroot-fs/cpio/tmp/dracut.Sm7N5J/initramfs -a -l > udevadm cat uname blkid > dracut: Cannot find [systemd-]udevd binary! > > I do have a dracut package you may find useful here: > https://gitlab.com/aduskett/buildroot/-/tree/dracut/external/package/dracut > > Thanks! > Adam > > On Mon, Jan 10, 2022 at 4:57 AM Thierry Bultel > wrote: > > > > 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 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot From thierry.bultel at linatsea.fr Fri Feb 4 21:48:59 2022 From: thierry.bultel at linatsea.fr (Thierry Bultel) Date: Fri, 4 Feb 2022 22:48:59 +0100 Subject: [Buildroot] [PATCH v4 2/3] package/dracut: new host package In-Reply-To: References: <20220110124644.1388438-1-thierry.bultel@linatsea.fr> <20220110124644.1388438-2-thierry.bultel@linatsea.fr> Message-ID: <6c7e0795-0402-16c4-6d8c-7c2eb4b98529@linatsea.fr> Hi Adam, thanks for the comments, mine follow below ... Le 04/02/2022 ? 21:56, Adam Duskett a ?crit?: > Hello! Thank you for the patch series! Hopefully I can help a bit. > > First things first: > - dracut.hash is missing. Sure. I will had it. > - Please run ./utils/check-package package/dracut/* and fix any warnings I am pretty sure I had done in at least once. Will recheck, thanks; > > Your Dracut package does not depend on systemd, which results in the error: > > dracut: FAILED: output/host/lib/dracut/dracut-install -r > output/build/buildroot-fs/cpio/target -D > output/build/buildroot-fs/cpio/tmp/dracut.Sm7N5J/initramfs -a -l > udevadm cat uname blkid > dracut: Cannot find [systemd-]udevd binary! I do no agree. Despite of the fact that dracut was indeed thought to use systemd, it is absolutely possible to use it without. That is what the provided configuration file in my cpio patch does (support/testing/conf/dracut.conf). I personally use with busybox init. About host-prelink-cross, I have to check that it works in the configurations I have. Thanks, Thierry > > I do have a dracut package you may find useful here: > https://gitlab.com/aduskett/buildroot/-/tree/dracut/external/package/dracut > > Thanks! > Adam > > On Mon, Jan 10, 2022 at 4:57 AM Thierry Bultel > wrote: >> 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 >> >> _______________________________________________ >> 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 -- 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 peter at korsgaard.com Fri Feb 4 21:54:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 04 Feb 2022 22:54:42 +0100 Subject: [Buildroot] [PATCH 1/2] package/kodi-pvr-hts: bump version to 19.0.6-Matrix In-Reply-To: <20220203190432.1637478-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Thu, 3 Feb 2022 20:04:31 +0100") References: <20220203190432.1637478-1-bernd.kuhls@t-online.de> Message-ID: <87mtj6xpp9.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 4 21:54:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 04 Feb 2022 22:54:47 +0100 Subject: [Buildroot] [PATCH 2/2] package/kodi-pvr-iptvsimple: bump version to 19.1.0-Matrix In-Reply-To: <20220203190432.1637478-2-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Thu, 3 Feb 2022 20:04:32 +0100") References: <20220203190432.1637478-1-bernd.kuhls@t-online.de> <20220203190432.1637478-2-bernd.kuhls@t-online.de> Message-ID: <87iltuxpp4.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 4 21:55:13 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 04 Feb 2022 22:55:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/ddrescue: bump to version 1.26 In-Reply-To: <20220203220504.667447-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 3 Feb 2022 23:05:04 +0100") References: <20220203220504.667447-1-fontaine.fabrice@gmail.com> Message-ID: <87ee4ixpoe.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://lists.gnu.org/archive/html/info-gnu/2022-01/msg00013.html > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 4 21:55:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 4 Feb 2022 22:55:01 +0100 Subject: [Buildroot] [git commit] package/ddrescue: bump to version 1.26 Message-ID: <20220204214813.4294D82B2E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ed81b96cc549eeb0951e84303106699f728e089c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://lists.gnu.org/archive/html/info-gnu/2022-01/msg00013.html Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/ddrescue/ddrescue.hash | 4 ++-- package/ddrescue/ddrescue.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ddrescue/ddrescue.hash b/package/ddrescue/ddrescue.hash index 6877b7008d..f7c82b086b 100644 --- a/package/ddrescue/ddrescue.hash +++ b/package/ddrescue/ddrescue.hash @@ -1,4 +1,4 @@ -# From https://lists.gnu.org/archive/html/info-gnu/2020-03/msg00002.html -sha256 ce538ebd26a09f45da67d3ad3f7431932428231ceec7a2d255f716fa231a1063 ddrescue-1.25.tar.lz +# From https://lists.gnu.org/archive/html/info-gnu/2022-01/msg00013.html +sha256 e513cd3a90d9810dfdd91197d40aa40f6df01597bfb5ecfdfb205de1127c551f ddrescue-1.26.tar.lz # Locally computed sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef COPYING diff --git a/package/ddrescue/ddrescue.mk b/package/ddrescue/ddrescue.mk index f113681fa1..6d16d8701f 100644 --- a/package/ddrescue/ddrescue.mk +++ b/package/ddrescue/ddrescue.mk @@ -4,7 +4,7 @@ # ################################################################################ -DDRESCUE_VERSION = 1.25 +DDRESCUE_VERSION = 1.26 DDRESCUE_SOURCE = ddrescue-$(DDRESCUE_VERSION).tar.lz DDRESCUE_SITE = http://download.savannah.gnu.org/releases/ddrescue DDRESCUE_LICENSE = GPL-2.0+ From peter at korsgaard.com Fri Feb 4 21:54:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 4 Feb 2022 22:54:09 +0100 Subject: [Buildroot] [git commit] package/kodi-pvr-hts: bump version to 19.0.6-Matrix Message-ID: <20220204214813.3243A81D75@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b8720e7048ade3a9409dbac1588854ba23d5f24f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/kodi-pvr-hts/kodi-pvr-hts.hash | 2 +- package/kodi-pvr-hts/kodi-pvr-hts.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-hts/kodi-pvr-hts.hash b/package/kodi-pvr-hts/kodi-pvr-hts.hash index 135b0088c4..40cd8fd62f 100644 --- a/package/kodi-pvr-hts/kodi-pvr-hts.hash +++ b/package/kodi-pvr-hts/kodi-pvr-hts.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 25799d0d043df7819c767adc89d081cbd6eb61d29135befbc621719274a1c074 kodi-pvr-hts-19.0.4-Matrix.tar.gz +sha256 990e5fd0757d48b86675aa124b77629e7fb2de6b27dcfd6f6ccc7ce181d04aeb kodi-pvr-hts-19.0.6-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-hts/kodi-pvr-hts.mk b/package/kodi-pvr-hts/kodi-pvr-hts.mk index 6c9e5a715f..caa90b7af6 100644 --- a/package/kodi-pvr-hts/kodi-pvr-hts.mk +++ b/package/kodi-pvr-hts/kodi-pvr-hts.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_HTS_VERSION = 19.0.4-Matrix +KODI_PVR_HTS_VERSION = 19.0.6-Matrix KODI_PVR_HTS_SITE = $(call github,kodi-pvr,pvr.hts,$(KODI_PVR_HTS_VERSION)) KODI_PVR_HTS_LICENSE = GPL-2.0+ KODI_PVR_HTS_LICENSE_FILES = LICENSE.md From peter at korsgaard.com Fri Feb 4 21:54:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 4 Feb 2022 22:54:19 +0100 Subject: [Buildroot] [git commit] package/kodi-pvr-iptvsimple: bump version to 19.1.0-Matrix Message-ID: <20220204214813.3A0CB81999@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=125ec43bf0ca74fbca5c96e6f436dabf945dd529 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash | 2 +- package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash index bd3d44d908..6ace3a5859 100644 --- a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash +++ b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 3df76fb7f03f2fd64c75526d5bf89b0f2300f70bf825794fa27bd6fbdd706fb2 kodi-pvr-iptvsimple-19.0.3-Matrix.tar.gz +sha256 c92736b3f3c96fe36d7b20b329c82b47180260e3ed40fc456ef709572fad5fb0 kodi-pvr-iptvsimple-19.1.0-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk index 5f5025cd80..eedb0fb817 100644 --- a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk +++ b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_IPTVSIMPLE_VERSION = 19.0.3-Matrix +KODI_PVR_IPTVSIMPLE_VERSION = 19.1.0-Matrix KODI_PVR_IPTVSIMPLE_SITE = $(call github,kodi-pvr,pvr.iptvsimple,$(KODI_PVR_IPTVSIMPLE_VERSION)) KODI_PVR_IPTVSIMPLE_LICENSE = GPL-2.0+ KODI_PVR_IPTVSIMPLE_LICENSE_FILES = LICENSE.md From peter at korsgaard.com Fri Feb 4 22:04:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 04 Feb 2022 23:04:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/libblockdev: bump to version 2.26 In-Reply-To: <20220203171715.658568-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 3 Feb 2022 18:17:15 +0100") References: <20220203171715.658568-1-fontaine.fabrice@gmail.com> Message-ID: <87a6f6xp89.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - Add upstream link to first patch > - Drop second patch (already in version) > https://github.com/storaged-project/libblockdev/blob/2.26-1/NEWS.rst > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 4 22:05:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 04 Feb 2022 23:05:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/bat: bump to version 0.19.0 In-Reply-To: <20220203184718.3173767-1-james.hilliard1@gmail.com> (James Hilliard's message of "Thu, 3 Feb 2022 11:47:18 -0700") References: <20220203184718.3173767-1-james.hilliard1@gmail.com> Message-ID: <875ypuxp7m.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 Feb 4 22:05:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 4 Feb 2022 23:05:04 +0100 Subject: [Buildroot] [git commit] package/bat: bump to version 0.19.0 Message-ID: <20220204215815.BE32E819CD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b4ddaeb080ec00891ec415d373236582d28e9c17 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/bat/bat.hash | 2 +- package/bat/bat.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/bat/bat.hash b/package/bat/bat.hash index aa6c8d743d..f4d3e32c34 100644 --- a/package/bat/bat.hash +++ b/package/bat/bat.hash @@ -1,4 +1,4 @@ # Locally generated -sha256 9c345788eb916777a60e7ff32031f1c92edc5565031e0c057bce860982768744 bat-0.18.3.tar.gz +sha256 7940641baaa61cd3bcd1c3db4804d179609d6ccd955868928a129bf3f853e0b2 bat-0.19.0.tar.gz sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE-APACHE sha256 64de710b6309a7db5e44ad0af382300c7fb6f6d116d8ae32f0164e05db033068 LICENSE-MIT diff --git a/package/bat/bat.mk b/package/bat/bat.mk index 9b619af172..dc29a85429 100644 --- a/package/bat/bat.mk +++ b/package/bat/bat.mk @@ -4,7 +4,7 @@ # ################################################################################ -BAT_VERSION = 0.18.3 +BAT_VERSION = 0.19.0 BAT_SITE = $(call github,sharkdp,bat,v$(BAT_VERSION)) BAT_LICENSE = Apache-2.0 or MIT BAT_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT From peter at korsgaard.com Fri Feb 4 22:04:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 4 Feb 2022 23:04:49 +0100 Subject: [Buildroot] [git commit] package/libblockdev: bump to version 2.26 Message-ID: <20220204215815.B38058184C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f54f61eb3a8c09e46137712796c2b93f4760a6d4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Add upstream link to first patch - Drop second patch (already in version) https://github.com/storaged-project/libblockdev/blob/2.26-1/NEWS.rst Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...ovide-replacement-function-for-strerror_l.patch | 2 ++ ...02-exec-Fix-deprecated-glib-function-call.patch | 32 ---------------------- package/libblockdev/libblockdev.hash | 2 +- package/libblockdev/libblockdev.mk | 2 +- 4 files changed, 4 insertions(+), 34 deletions(-) diff --git a/package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch b/package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch index 018e4c4489..d5c9b2dfdb 100644 --- a/package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch +++ b/package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch @@ -8,6 +8,8 @@ so let's provide a simple replacement function that falls back on strerror(). Signed-off-by: Thomas Petazzoni +[Upstream status: +https://github.com/storaged-project/libblockdev/pull/701] --- configure.ac | 2 ++ src/plugins/crypto.c | 7 +++++++ diff --git a/package/libblockdev/0002-exec-Fix-deprecated-glib-function-call.patch b/package/libblockdev/0002-exec-Fix-deprecated-glib-function-call.patch deleted file mode 100644 index 2c370a133f..0000000000 --- a/package/libblockdev/0002-exec-Fix-deprecated-glib-function-call.patch +++ /dev/null @@ -1,32 +0,0 @@ -From aad927a81fd9067865dc391c5bbff12ac51a0002 Mon Sep 17 00:00:00 2001 -From: Manuel Wassermann -Date: Thu, 1 Jul 2021 04:45:49 +0200 -Subject: [PATCH] exec: Fix deprecated glib function call Glib will rename - "g_spawn_check_exit_status()" to "g_spawn_check_wait_status()" in version - 2.69. - -[Retrieved from: -https://github.com/storaged-project/libblockdev/commit/aad927a81fd9067865dc391c5bbff12ac51a0002] -Signed-off-by: Fabrice Fontaine ---- - src/utils/exec.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/src/utils/exec.c b/src/utils/exec.c -index 317fb5525..8faeb289c 100644 ---- a/src/utils/exec.c -+++ b/src/utils/exec.c -@@ -236,7 +236,12 @@ gboolean bd_utils_exec_and_report_status_error (const gchar **argv, const BDExtr - /* g_spawn_sync set the status in the same way waitpid() does, we need - to get the process exit code manually (this is similar to calling - WEXITSTATUS but also sets the error for terminated processes */ -- if (!g_spawn_check_exit_status (exit_status, error)) { -+ -+ #if !GLIB_CHECK_VERSION(2, 69, 0) -+ #define g_spawn_check_wait_status(x,y) (g_spawn_check_exit_status (x,y)) -+ #endif -+ -+ if (!g_spawn_check_wait_status (exit_status, error)) { - if (g_error_matches (*error, G_SPAWN_ERROR, G_SPAWN_ERROR_FAILED)) { - /* process was terminated abnormally (e.g. using a signal) */ - g_free (stdout_data); diff --git a/package/libblockdev/libblockdev.hash b/package/libblockdev/libblockdev.hash index 101b99f1a8..53a3b0737f 100644 --- a/package/libblockdev/libblockdev.hash +++ b/package/libblockdev/libblockdev.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 555aa42a2db39649ad83253bdc902ab5bd63d39c123e0c8055c4de7fe7571668 libblockdev-2.25.tar.gz +sha256 c4c0e10b35ac632bda8ce6d200b5601184984dec387fe59185921eb42432e069 libblockdev-2.26.tar.gz sha256 97bdc721d875501b6243a456333fdfdb1ab64d31c4da2554de845caf4674b946 LICENSE diff --git a/package/libblockdev/libblockdev.mk b/package/libblockdev/libblockdev.mk index 39ae9230d9..36b74966fb 100644 --- a/package/libblockdev/libblockdev.mk +++ b/package/libblockdev/libblockdev.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBBLOCKDEV_VERSION = 2.25 +LIBBLOCKDEV_VERSION = 2.26 LIBBLOCKDEV_SITE = https://github.com/storaged-project/libblockdev/releases/download/$(LIBBLOCKDEV_VERSION)-1 LIBBLOCKDEV_LICENSE = LGPL-2.1 LIBBLOCKDEV_LICENSE_FILES = LICENSE From peter at korsgaard.com Fri Feb 4 22:16:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 04 Feb 2022 23:16:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/samba4: bump version to 4.15.4 In-Reply-To: <20220128095040.2706666-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Fri, 28 Jan 2022 10:50:40 +0100") References: <20220128095040.2706666-1-bernd.kuhls@t-online.de> Message-ID: <871r0ixopm.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Release notes: https://www.samba.org/samba/history/samba-4.15.4.html > Signed-off-by: Bernd Kuhls Committed, thanks. I see 4.15.5 is out with security fixes, care to send a patch for that? -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 4 22:15:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 4 Feb 2022 23:15:19 +0100 Subject: [Buildroot] [git commit] package/samba4: bump version to 4.15.4 Message-ID: <20220204220858.21DAE81EB3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6939ed917173c5b595f491478410a2ed1caf9342 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://www.samba.org/samba/history/samba-4.15.4.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/samba4/samba4.hash | 4 ++-- package/samba4/samba4.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 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 From peter at korsgaard.com Fri Feb 4 22:24:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 04 Feb 2022 23:24:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/{mesa3d, mesa3d-headers}: bump version to 21.3.5 In-Reply-To: <20220128095249.2707373-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Fri, 28 Jan 2022 10:52:49 +0100") References: <20220128095249.2707373-1-bernd.kuhls@t-online.de> Message-ID: <87wniaw9qw.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Release notes: > https://lists.freedesktop.org/archives/mesa-announce/2022-January/000660.html > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 4 22:24:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 04 Feb 2022 23:24:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/php: bump version to 8.0.15 In-Reply-To: <20220128094827.2705597-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Fri, 28 Jan 2022 10:48:27 +0100") References: <20220128094827.2705597-1-bernd.kuhls@t-online.de> Message-ID: <87sfsyw9qq.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Changelog: https://www.php.net/ChangeLog-8.php#8.0.15 > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 4 22:24:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 4 Feb 2022 23:24:33 +0100 Subject: [Buildroot] [git commit] package/php: bump version to 8.0.15 Message-ID: <20220204221759.9EE5582195@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b784733f9cfd661f013dde1b0aa5347e825a4187 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog: https://www.php.net/ChangeLog-8.php#8.0.15 Signed-off-by: Bernd Kuhls 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 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 From peter at korsgaard.com Fri Feb 4 22:24:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 4 Feb 2022 23:24:26 +0100 Subject: [Buildroot] [git commit] package/{mesa3d, mesa3d-headers}: bump version to 21.3.5 Message-ID: <20220204221759.94E8381E3B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bd6f38c254d83e12c67a987e6941aea632552417 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://lists.freedesktop.org/archives/mesa-announce/2022-January/000660.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/mesa3d.hash | 6 +++--- package/mesa3d/mesa3d.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 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 c572f9b1aa..5f080ff5fc 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 From thomas.petazzoni at bootlin.com Sat Feb 5 07:06:34 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 05 Feb 2022 07:06:34 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-02-04 Message-ID: <20220205070641.26F7960E8F@smtp3.osuosl.org> Hello, Autobuild statistics for 2022-02-04 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 60 | 4 | 0 | 64 | 2021.11.x | 28 | 0 | 0 | 28 | master | 78 | 61 | 0 | 139 | Classification of failures by reason for master ----------------------------------------------- host-libselinux-3.3 | 16 host-python-docutils-0.15.2 | 12 unknown | 5 frr-8.1 | 4 python-docutils-0.15.2 | 3 rygel-0.40.2 | 3 bluez5_utils-5.63 | 2 host-delve-1.8.0 | 2 pulseview-0.4.2 | 2 bat-0.18.3 | 1 belle-sip-4.4.8 | 1 bird-2.0.8 | 1 boinc-7.18.1 | 1 guile-3.0.7 | 1 host-go-1.17.6 | 1 libuhttpd-3.14.1 | 1 Makefile:747: target-finalize | 1 mongrel2-1.13.0 | 1 nodejs-14.18.3 | 1 qt-webkit-kiosk-a7720e50f2b... | 1 systemd-250.3 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | bat-0.18.3 | NOK | http://autobuild.buildroot.net/results/edee65777efc5f9e0285dfaf1569f092a7731bce | nios2 | belle-sip-4.4.8 | NOK | http://autobuild.buildroot.net/results/846597f3573d3b0d52e80627a9577d14b9348547 | mips64el | bird-2.0.8 | NOK | http://autobuild.buildroot.net/results/993d48876c27a75b4e837806b69b1beba3761c3d | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/f64741f288ab4d4374f810b36d97cfc571fde7e5 | mips64el | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/613a8a856b02c1e318eb5db12134977c568d0d33 | riscv32 | boinc-7.18.1 | NOK | http://autobuild.buildroot.net/results/05bdd820059b624b8d2785cd0b5b3971b0880a0b | mips64el | frr-8.1 | NOK | http://autobuild.buildroot.net/results/e14997abce0b4213437c75ede798b6923788841c | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/93384959e54badf0903321437027aa06f6f8f98c | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/130094ebd3c27f9f123a21b811e73cb82ac4251e | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/ee65ae857c77fdfa844f74e335360c1f360cdff6 | powerpc64le | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/bff3bbc344b7754fddd094c1e8add5a2da471c42 | ORPH arm | host-delve-1.8.0 | NOK | http://autobuild.buildroot.net/results/4195b05c5e9ea473b4135fdf9c0c17d27f56f9fd | arm | host-delve-1.8.0 | NOK | http://autobuild.buildroot.net/results/bd8833a7620dd5f4a9940775164ed80135020cf9 | mips64el | host-go-1.17.6 | NOK | http://autobuild.buildroot.net/results/cdf4a4f52cc5fb1fb94f90c6bb0a1976bca7b08f | i686 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/00e256601de59a5c85c6891d30f8bff3c7fa6c2d | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/ea124618a7119c8b24b843af172510b699a94f8b | mips64el | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/b10007d12cdabfeb8e92fc7806ca5a0e5568ae39 | xtensa | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/264fe0206435732a85e0a30b08b097b625ff6b2e | riscv64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/cb3edaf67991656a9fb35aa308530ea44a8f0795 | aarch64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/5a4a50960709377281fbd5f254d161916c829ca5 | xtensa | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/4742378bed443ecd1bfd8a9196d2717d29f4f906 | arc | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/251879431ca5bbab21c45028ac7790e0b48319d8 | mips | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/79939f13c49a8833229676fc0903b32ea372656b | or1k | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/f168ddc689cb33e1619cd960523b2533d7ab3b51 | microblazeel | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/62a4eb5d23f937f2cf71971368e29eab36fae68f | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/1b6d876b89f457d0bb7d728b96da20d9a86c1d39 | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/0a36fa928be782abd4e543ead05cc6b8fed7c005 | powerpc | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/8ed457867e09d8c6db7aab19a52316018cc14fff | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/8a73a7f55674098cce3cf096d1e37688fcd20c89 | arc | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/49ea55a0df49a87a347235fba3de7fbc69a043af | i586 | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/4d3fc7a18a5f1dd46bacfd01bbd1bb8a22d8fb43 | powerpc64le | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/99e09d316db083a973b9b3d3e3e44115d4bf59cc | sparc | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/e35cf9faae2907d64a6f5db0f551d51bad7c4346 | sparc64 | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/24c76da1089cf7ac56386f2df96f03f9da31d2b5 | arc | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/de45ed9b51eaaccb2ebc4c79ba2cc3a83718a538 | arm | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/8467a55460877672de41dd06f481df13c58eb5df | arm | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/b90f74e0a8bb6990fc2d5bfb7a05d4c648cf27e3 | arm | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/bbca433bf6f81fb06b6424c00989246506ae45db | arm | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/e3d1f17f64e39b49a20335fae432f84d1bd346ae | arc | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/3a1adaac277c1b2ac095df5e399d1750669f1dd9 | riscv32 | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/de0334544c45f48a0e6b11c4c9d2c3c63b4648fd | xtensa | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/86b6c094822cff44fed68bfdda9ceceff38383fd | m68k | libuhttpd-3.14.1 | NOK | http://autobuild.buildroot.net/results/c57f1d0f805cb815c53900ddfeb783fd75bde756 | powerpc | Makefile:747: target-finalize | NOK | http://autobuild.buildroot.net/results/dfb3aa2e3c9dc23ca5768ac785fec5e3c2d54935 | arm | mongrel2-1.13.0 | NOK | http://autobuild.buildroot.net/results/da9ddfbe279610fe2e1cccc35b0455b3181da175 | x86_64 | nodejs-14.18.3 | NOK | http://autobuild.buildroot.net/results/eaa66466ae693dcf867cacf1f899040d66809bad | or1k | pulseview-0.4.2 | NOK | http://autobuild.buildroot.net/results/a63bf10c5b30c0c92aae1fc6263f5c02585a8752 | powerpc | pulseview-0.4.2 | NOK | http://autobuild.buildroot.net/results/9f8483696edf62408777cbcb97844648e9a47ac4 | aarch64 | python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/026671f502c6e9f46f248b0273c4d3588e6125ac | nios2 | python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/7eb6c1238a96c875001fa0cc819afd690a4b5b9c | arm | python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/2ec65e34110c57e78fbb3a88f49c75667f9f74ad | x86_64 | qt-webkit-kiosk-a7720e50f2b... | NOK | http://autobuild.buildroot.net/results/5209a3bd1ab3840893eba69607191c6661657541 | riscv64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/f06bfc96d4af6f8360fa226d648723ee1a831045 | arc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/17840fd71062732d6026c04d7572f454c266560b | mips64el | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/2ac082f5ce2a614643cdbf493837165801b5ca9e | nios2 | systemd-250.3 | NOK | http://autobuild.buildroot.net/results/5fc884e11e46ab165ea21c8e8f2901516d79ff80 | arm | unknown | NOK | http://autobuild.buildroot.net/results/48d537a2ed7786c0456f0455c2de05ccfa80ece4 | microblazeel | unknown | NOK | http://autobuild.buildroot.net/results/4e7ed7bf8ac4d4f37b677b9a805f50de836a44a1 | microblazeel | unknown | NOK | http://autobuild.buildroot.net/results/d809a0a49a1c7cbd7d534773b905c1733f2f4ca1 | arc | unknown | NOK | http://autobuild.buildroot.net/results/d540ecff2196ed700d31f97bddc681487a0809f3 | arm | unknown | NOK | http://autobuild.buildroot.net/results/1587fda56c5a697b9a3c0be6c20579baeba77df9 | Classification of failures by reason for 2021.02.x -------------------------------------------------- rocksdb-6.13.3 | 2 azure-iot-sdk-c-LTS_07_2020... | 1 host-sentry-cli-1.57.0 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- riscv32 | azure-iot-sdk-c-LTS_07_2020... | NOK | http://autobuild.buildroot.net/results/61c5b24e27b8242a5a2136537825a7d8e79e27d4 | powerpc | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/3e8786a301adb36375e4a96481ba1468b074d464 | powerpc | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/d26aa08fabe9a6e254ff8ef1f6ebdb71432f23a7 | arm | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/8e21dfdc2c436c4eb4367025c6e31a04acf3560d | Gitlab CI results for 2022-02-04 ================================ Detail of defconfig failures for master --------------------------------------- defconfig | link to the job | orph? ----------------------------------+---------------------------------------------------------------+------ amarula_a64_relic | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012177 | arcturus_ucls1012a | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012180 | arcturus_ucp1020 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012181 | arm_juno | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012183 | armadeus_apf27 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012184 | at91sam9260eknf | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012189 | at91sam9g20dfc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012190 | at91sam9g45m10ek | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012191 | at91sam9rlek | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012192 | at91sam9x5ek | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012193 | at91sam9x5ek_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012195 | at91sam9x5ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012196 | at91sam9x5ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012198 | atmel_sama5d27_som1_ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012199 | atmel_sama5d2_xplained_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012201 | atmel_sama5d2_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012203 | atmel_sama5d3_xplained | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012204 | atmel_sama5d3_xplained_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012205 | atmel_sama5d3_xplained_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012206 | atmel_sama5d3_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012207 | atmel_sama5d3xek | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012208 | atmel_sama5d4_xplained | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012209 | atmel_sama5d4_xplained_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012211 | atmel_sama5d4_xplained_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012212 | atmel_sama5d4_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012213 | avenger96 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012214 | bananapi_m1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012215 | bananapi_m1_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012216 | bananapi_m2_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012217 | bananapi_m2_ultra | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012218 | bananapi_m64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012220 | bananapro | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012221 | beagleboardx15 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012222 | beaglebone_qt5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012224 | beaglev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012226 | beelink_gs1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012227 | chromebook_snow | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012229 | csky_gx6605s | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012231 | engicam_imx6qdl_icore | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012233 | engicam_imx6qdl_icore_qt5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012234 | engicam_imx6qdl_icore_rqs | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012235 | engicam_imx6ul_geam | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012236 | engicam_imx6ul_isiot | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012237 | freescale_imx8mmevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012248 | freescale_imx8mnevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012249 | freescale_imx8mpevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012250 | freescale_p1025twr | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012254 | freescale_t1040d4rdb | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012256 | freescale_t2080_qds_rdb | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012258 | friendlyarm_nanopc_t4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012259 | friendlyarm_nanopi_a64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012260 | friendlyarm_nanopi_m1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012261 | ORPH friendlyarm_nanopi_m1_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012262 | ORPH friendlyarm_nanopi_m4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012263 | friendlyarm_nanopi_neo | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012266 | friendlyarm_nanopi_neo2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012264 | friendlyarm_nanopi_neo4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012265 | friendlyarm_nanopi_neo_plus2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012267 | friendlyarm_nanopi_r1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012269 | galileo | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012270 | imx23evk | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012276 | imx8mmpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012287 | imx8mpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012288 | lego_ev3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012295 | licheepi_zero | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012296 | microchip_sam9x60ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012300 | microchip_sam9x60ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012301 | microchip_sama5d27_wlsom1_ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012302 | ...hip_sama5d27_wlsom1_ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012303 | microchip_sama5d2_icp_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012305 | microchip_sama5d2_icp_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012307 | microchip_sama7g5ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012308 | microchip_sama7g5ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012310 | mx25pdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012318 | odroidxu4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012335 | olimex_imx233_olinuxino | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012349 | orangepi_lite2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012356 | orangepi_one_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012361 | orangepi_pc2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012362 | orangepi_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012366 | ORPH orangepi_prime | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012368 | orangepi_rk3399 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012371 | orangepi_win | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012373 | orangepi_zero_plus2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012377 | pc_x86_64_bios | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012381 | pcengines_apu2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012386 | pine64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012390 | pine64_sopine | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012391 | raspberrypi3_qt5we | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012474 | riotboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012484 | roc_pc_rk3399 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012487 | rock_pi_4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012489 | rock_pi_n10 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012491 | rock_pi_n8 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012492 | rockpro64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012494 | s6lx9_microboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012498 | snps_aarch64_vdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012502 | snps_arc700_axs101 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012503 | snps_archs38_axs103 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012504 | snps_archs38_hsdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012509 | socrates_cyclone5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012513 | solidrun_clearfog | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012517 | toradex_apalis_imx6 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012538 | ts4900 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012540 | ts7680 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012543 | warpboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012551 | zynq_microzed | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012552 | zynq_qmtech | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012553 | zynq_zc706 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012554 | zynq_zed | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012556 | zynqmp_zcu106 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2048012558 | -- http://autobuild.buildroot.net From kuzminov.sergey81 at gmail.com Sat Feb 5 07:28:01 2022 From: kuzminov.sergey81 at gmail.com (Sergey Kuzminov) Date: Sat, 5 Feb 2022 10:28:01 +0300 Subject: [Buildroot] [PATCH] configs/orangepi_zero_defconfig: switch to extlinux Message-ID: <20220205072801.13567-1-kuzminov.sergey81@gmail.com> Changes: - Exclude FAT partition, he is no longer needed for U-Boot. - Switch the rootfs partition from MBR to GPT for partition-uuid to work. - Switch to extlinux, this is convenient for debugging. - Create common scenarios for multiple boards to create an SD image: board/orangepi/common. Signed-off-by: Sergey Kuzminov --- board/orangepi/common/extlinux.conf | 5 ++++ board/orangepi/common/genimage.cfg | 23 +++++++++++++++ board/orangepi/common/post-build.sh | 34 +++++++++++++++++++++ board/orangepi/orangepi-zero/boot.cmd | 9 ------ board/orangepi/orangepi-zero/genimage.cfg | 36 ----------------------- configs/orangepi_zero_defconfig | 11 ++++--- 6 files changed, 67 insertions(+), 51 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 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..fa0d988991 --- /dev/null +++ b/board/orangepi/common/genimage.cfg @@ -0,0 +1,23 @@ +image sdcard.img { + partition u-boot { + in-partition-table = false + image = "u-boot-sunxi-with-spl.bin" + offset = 8K + size = 1000K # 1MB - 8KB(offset) - 16KB(GPT) + } + + hdimage { + partition-table-type = gpt + gpt-location = 1008K # 1MB - 16KB(GPT) + gpt-no-backup = true + # After writing the image to the SD card, + # backup GPT data structures at the end of the disk: + # gdisk /dev/mmcblk0 then press the buttons: x, e, w, y + } + + 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/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 5aaa1566c5..96f0c3f600 100644 --- a/configs/orangepi_zero_defconfig +++ b/configs/orangepi_zero_defconfig @@ -20,10 +20,13 @@ 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_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y # Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="63M" +BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y # BR2_TARGET_ROOTFS_TAR is not set # Bootloader @@ -39,16 +42,12 @@ 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 # 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" # Wireless driver and firmware BR2_PACKAGE_XR819_XRADIO=y -- 2.34.1 From bernd.kuhls at t-online.de Sat Feb 5 09:09:43 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 5 Feb 2022 10:09:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/tor: bump version to 0.4.6.10 Message-ID: <20220205090943.4012391-1-bernd.kuhls@t-online.de> Release notes: https://gitlab.torproject.org/tpo/core/tor/-/raw/release-0.4.6/ReleaseNotes Signed-off-by: Bernd Kuhls --- 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 63d47d7fa6..16e01c80a9 100644 --- a/package/tor/tor.hash +++ b/package/tor/tor.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c7e93380988ce20b82aa19c06cdb2f10302b72cfebec7c15b5b96bcfc94ca9a9 tor-0.4.6.9.tar.gz +sha256 94ccd60e04e558f33be73032bc84ea241660f92f58cfb88789bda6893739e31c tor-0.4.6.10.tar.gz sha256 47b54ed17e8fdcab3c44729a1789a09b208f9a63a845a7e50def9df729eebad0 LICENSE diff --git a/package/tor/tor.mk b/package/tor/tor.mk index fc1db6da6b..d16b3541eb 100644 --- a/package/tor/tor.mk +++ b/package/tor/tor.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOR_VERSION = 0.4.6.9 +TOR_VERSION = 0.4.6.10 TOR_SITE = https://dist.torproject.org TOR_LICENSE = BSD-3-Clause TOR_LICENSE_FILES = LICENSE -- 2.30.2 From bernd.kuhls at t-online.de Sat Feb 5 09:13:04 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 5 Feb 2022 10:13:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/dovecot-pigeonhole: bump version to 0.5.18 Message-ID: <20220205091304.4096595-1-bernd.kuhls@t-online.de> Release notes: https://github.com/dovecot/pigeonhole/blob/release-0.5.18/NEWS Signed-off-by: Bernd Kuhls --- package/dovecot-pigeonhole/dovecot-pigeonhole.hash | 2 +- package/dovecot-pigeonhole/dovecot-pigeonhole.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dovecot-pigeonhole/dovecot-pigeonhole.hash b/package/dovecot-pigeonhole/dovecot-pigeonhole.hash index b244563935..f3a5890151 100644 --- a/package/dovecot-pigeonhole/dovecot-pigeonhole.hash +++ b/package/dovecot-pigeonhole/dovecot-pigeonhole.hash @@ -1,3 +1,3 @@ # Locally computed after checking signature -sha256 3cc4a3de6d7e27bd99ac59b99faa161287f78167272699a22591798ffcf84512 dovecot-2.3-pigeonhole-0.5.17.1.tar.gz +sha256 a6d828f8d6f2decba5105343ece5c7a65245bd94e46a8ae4432a6d97543108a5 dovecot-2.3-pigeonhole-0.5.18.tar.gz sha256 fc9e9522216f2a9a28b31300e3c73c1df56acc27dfae951bf516e7995366b51a COPYING diff --git a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk index 95e9059392..dd533977f4 100644 --- a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk +++ b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOVECOT_PIGEONHOLE_VERSION = 0.5.17.1 +DOVECOT_PIGEONHOLE_VERSION = 0.5.18 DOVECOT_PIGEONHOLE_SOURCE = dovecot-2.3-pigeonhole-$(DOVECOT_PIGEONHOLE_VERSION).tar.gz DOVECOT_PIGEONHOLE_SITE = https://pigeonhole.dovecot.org/releases/2.3 DOVECOT_PIGEONHOLE_LICENSE = LGPL-2.1 -- 2.30.2 From bernd.kuhls at t-online.de Sat Feb 5 09:19:13 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 5 Feb 2022 10:19:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/intel-gmmlib: bump version to 22.0.2 Message-ID: <20220205091913.4135654-1-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/intel-gmmlib/intel-gmmlib.hash | 2 +- package/intel-gmmlib/intel-gmmlib.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-gmmlib/intel-gmmlib.hash b/package/intel-gmmlib/intel-gmmlib.hash index 8780eb9229..71a153e0a3 100644 --- a/package/intel-gmmlib/intel-gmmlib.hash +++ b/package/intel-gmmlib/intel-gmmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 341eb3fa478e427e5a6f03d4cbc97bc2b02c52728dcf06c4794661d34b7c6e5c intel-gmmlib-22.0.1.tar.gz +sha256 7cc044dc0979269abe825054ba6cc1b67169dc7a7f4192898e2dd04142a633fa intel-gmmlib-22.0.2.tar.gz sha256 8b7446825df3f8b0268307e272aa6aaaf78351c83161d860d02c913c22666c48 LICENSE.md diff --git a/package/intel-gmmlib/intel-gmmlib.mk b/package/intel-gmmlib/intel-gmmlib.mk index c45a7669b1..235f71341c 100644 --- a/package/intel-gmmlib/intel-gmmlib.mk +++ b/package/intel-gmmlib/intel-gmmlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_GMMLIB_VERSION = 22.0.1 +INTEL_GMMLIB_VERSION = 22.0.2 INTEL_GMMLIB_SITE = https://github.com/intel/gmmlib/archive INTEL_GMMLIB_LICENSE = MIT INTEL_GMMLIB_LICENSE_FILES = LICENSE.md -- 2.30.2 From bernd.kuhls at t-online.de Sat Feb 5 09:26:20 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 5 Feb 2022 10:26:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/libldns: remove --disable-dane-verify configure option Message-ID: <20220205092620.4162598-1-bernd.kuhls@t-online.de> Not needed anymore after openssl was bumped to 1.1.x, snippet from libldns configure: checking for SSL_get0_dane... yes Signed-off-by: Bernd Kuhls --- package/libldns/libldns.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/libldns/libldns.mk b/package/libldns/libldns.mk index 7deca978da..c934e19136 100644 --- a/package/libldns/libldns.mk +++ b/package/libldns/libldns.mk @@ -13,11 +13,9 @@ LIBLDNS_CPE_ID_VENDOR = nlnetlabs LIBLDNS_CPE_ID_PRODUCT = ldns LIBLDNS_INSTALL_STAGING = YES LIBLDNS_DEPENDENCIES = openssl -# --disable-dane-verify can be removed after openssl bump to 1.1.x LIBLDNS_CONF_OPTS = \ --with-ssl=$(STAGING_DIR)/usr \ --enable-dane \ - --disable-dane-verify \ --enable-ecdsa \ --enable-gost \ --enable-sha2 \ -- 2.30.2 From romain.naour at gmail.com Sat Feb 5 10:51:23 2022 From: romain.naour at gmail.com (Romain Naour) Date: Sat, 5 Feb 2022 11:51:23 +0100 Subject: [Buildroot] [PATCH] package/{glibc, localedef}: security bump for additional post-2.34.x fixes In-Reply-To: <20220204174712.1109-1-peter@korsgaard.com> References: <20220204174712.1109-1-peter@korsgaard.com> Message-ID: <5de97254-e4b3-308e-c05f-26e394e2c668@gmail.com> Hi Peter, Le 04/02/2022 ? 18:47, Peter Korsgaard a ?crit?: > Fixes the following security issues: > > CVE-2022-23219: Passing an overlong file name to the clnt_create > legacy function could result in a stack-based buffer overflow when > using the "unix" protocol. Reported by Martin Sebor. > > CVE-2022-23218: Passing an overlong file name to the svcunix_create > legacy function could result in a stack-based buffer overflow. > > CVE-2021-3998: Passing a path longer than PATH_MAX to the realpath > function could result in a memory leak and potential access of > uninitialized memory. Reported by Qualys. > > CVE-2021-3999: Passing a buffer of size exactly 1 byte to the getcwd > function may result in an off-by-one buffer underflow and overflow > when the current working directory is longer than PATH_MAX and also > corresponds to the / directory through an unprivileged mount > namespace. Reported by Qualys. > > Signed-off-by: Peter Korsgaard Reviewed-by: Romain Naour Best regards, Romain > --- > ...1-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch | 0 > .../glibc.hash | 2 +- > package/glibc/glibc.mk | 2 +- > .../0001-HACK-only-build-and-install-localedef.patch | 0 > ...02-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch | 0 > .../localedef.hash | 2 +- > package/localedef/localedef.mk | 2 +- > 7 files changed, 4 insertions(+), 4 deletions(-) > rename package/glibc/{2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4 => 2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c}/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch (100%) > rename package/glibc/{2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4 => 2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c}/glibc.hash (70%) > rename package/localedef/{2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4 => 2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c}/0001-HACK-only-build-and-install-localedef.patch (100%) > rename package/localedef/{2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4 => 2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c}/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch (100%) > rename package/localedef/{2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4 => 2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c}/localedef.hash (70%) > > 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-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch > similarity index 100% > rename from package/glibc/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch > rename to package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch > diff --git a/package/glibc/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/glibc.hash b/package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/glibc.hash > similarity index 70% > rename from package/glibc/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/glibc.hash > rename to package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/glibc.hash > index 595de95a58..dfd939020f 100644 > --- a/package/glibc/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/glibc.hash > +++ b/package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/glibc.hash > @@ -1,5 +1,5 @@ > # Locally calculated (fetched from Github) > -sha256 1c7ed0f69ed268bd66f9754d0cb8fb65e0dafc1f9a1048ea50d1e96d60399686 glibc-2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4.tar.gz > +sha256 3c299a21468a80356b848ca341f45551616c4928a6c871e6d45cee942e8b0f24 glibc-2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c.tar.gz > > # Hashes for license files > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk > index 5c26b0e6df..9b591aa2a3 100644 > --- a/package/glibc/glibc.mk > +++ b/package/glibc/glibc.mk > @@ -7,7 +7,7 @@ > # Generate version string using: > # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- > # When updating the version, please also update localedef > -GLIBC_VERSION = 2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4 > +GLIBC_VERSION = 2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c > # Upstream doesn't officially provide an https download link. > # There is one (https://sourceware.org/git/glibc.git) but it's not reliable, > # sometimes the connection times out. So use an unofficial github mirror. > diff --git a/package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0001-HACK-only-build-and-install-localedef.patch b/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-HACK-only-build-and-install-localedef.patch > similarity index 100% > rename from package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0001-HACK-only-build-and-install-localedef.patch > rename to package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-HACK-only-build-and-install-localedef.patch > diff --git a/package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch b/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch > similarity index 100% > rename from package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch > rename to package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch > diff --git a/package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/localedef.hash b/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/localedef.hash > similarity index 70% > rename from package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/localedef.hash > rename to package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/localedef.hash > index 595de95a58..dfd939020f 100644 > --- a/package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/localedef.hash > +++ b/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/localedef.hash > @@ -1,5 +1,5 @@ > # Locally calculated (fetched from Github) > -sha256 1c7ed0f69ed268bd66f9754d0cb8fb65e0dafc1f9a1048ea50d1e96d60399686 glibc-2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4.tar.gz > +sha256 3c299a21468a80356b848ca341f45551616c4928a6c871e6d45cee942e8b0f24 glibc-2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c.tar.gz > > # Hashes for license files > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > diff --git a/package/localedef/localedef.mk b/package/localedef/localedef.mk > index 87d921cffe..f8f0b42984 100644 > --- a/package/localedef/localedef.mk > +++ b/package/localedef/localedef.mk > @@ -7,7 +7,7 @@ > # Use the same VERSION and SITE as target glibc > # As in glibc.mk, generate version string using: > # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- > -LOCALEDEF_VERSION = 2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4 > +LOCALEDEF_VERSION = 2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c > LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION).tar.gz > LOCALEDEF_SITE = $(call github,bminor,glibc,$(LOCALEDEF_VERSION)) > HOST_LOCALEDEF_DL_SUBDIR = glibc From peter at korsgaard.com Sat Feb 5 11:27:11 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 12:27:11 +0100 Subject: [Buildroot] [PATCH] package/ltris: bump version to 1.2.3 In-Reply-To: <20220201170647.109298-1-julien.boibessot@armadeus.com> (julien boibessot's message of "Tue, 1 Feb 2022 18:06:47 +0100") References: <20220201170647.109298-1-julien.boibessot@armadeus.com> Message-ID: <87o83lwo34.fsf@dell.be.48ers.dk> >>>>> "julien" == julien boibessot writes: > From: Julien BOIBESSOT > 0001-fix-build-with-gcc-4.8.patch was integrated mainline and cross-compilation > slightly changed. > --- > .../ltris/0001-fix-build-with-gcc-4.8.patch | 20 ------------------- > package/ltris/ltris.hash | 4 ++-- > package/ltris/ltris.mk | 4 ++-- > 3 files changed, 4 insertions(+), 24 deletions(-) > delete mode 100644 package/ltris/0001-fix-build-with-gcc-4.8.patch > diff --git a/package/ltris/0001-fix-build-with-gcc-4.8.patch b/package/ltris/0001-fix-build-with-gcc-4.8.patch > deleted file mode 100644 > index d6bbf6a946..0000000000 > --- a/package/ltris/0001-fix-build-with-gcc-4.8.patch > +++ /dev/null > @@ -1,20 +0,0 @@ > -Fix build with gcc 4.8 > - > -Signed-off-by: Fabrice Fontaine > -[Upstream status: https://sourceforge.net/p/lgames/patches/28] > -Index: ltris/src/bowl.c > -=================================================================== > ---- ltris/src/bowl.c (r?vision 421) > -+++ ltris/src/bowl.c (copie de travail) > -@@ -828,9 +828,10 @@ > - */ > - void bowl_init_block_masks() > - { > -+ int i; > - int masksize = sizeof(block_masks[0].mask); // same for all > - > -- for (int i = 0; i < 7; i++) { > -+ for (i = 0; i < 7; i++) { > - block_masks[i].rx = 2; > - block_masks[i].ry = 2; > - memset(block_masks[i].mask, 0, masksize ); > diff --git a/package/ltris/ltris.hash b/package/ltris/ltris.hash > index f696e3af17..20f34342ff 100644 > --- a/package/ltris/ltris.hash > +++ b/package/ltris/ltris.hash > @@ -1,3 +1,3 @@ > # Locally computed: > -sha256 a7bc6c5fc6539b88505077a1b4580edc9b179ce0a6b829c58fbd9416cf456195 ltris-1.2.tar.gz > -sha256 67f82e045cf7acfef853ea0f426575a8359161a0a325e19f02b529a87c4b6c34 COPYING > +sha256 0ec4ad053e066a296529e923c2f626fa0a19c094c5ae03e44359f9c9e50955a8 ltris-1.2.3.tar.gz > +sha256 67f82e045cf7acfef853ea0f426575a8359161a0a325e19f02b529a87c4b6c34 COPYING NIT: The style used (as checked by check-package) is two spaces after sha256, not a tab. > diff --git a/package/ltris/ltris.mk b/package/ltris/ltris.mk > index 9b59613417..6e37bdbd19 100644 > --- a/package/ltris/ltris.mk > +++ b/package/ltris/ltris.mk > @@ -5,7 +5,7 @@ > ################################################################################ > LTRIS_SITE = http://downloads.sourceforge.net/lgames/ltris > -LTRIS_VERSION = 1.2 > +LTRIS_VERSION = 1.2.3 > LTRIS_LICENSE = GPL-2.0+ > LTRIS_LICENSE_FILES = COPYING > @@ -13,7 +13,7 @@ LTRIS_DEPENDENCIES = sdl $(TARGET_NLS_DEPENDENCIES) > LTRIS_LIBS = $(TARGET_NLS_LIBS) > LTRIS_CONF_ENV = \ > - SDL_CONFIG="$(STAGING_DIR)/usr/bin/sdl-config" \ > + PATH="$(PATH):$(STAGING_DIR)/usr/bin" \ That's no good. This would mean that the wrong sdl-config would get picked up if the build machine has sdl-config. Looking at the configure script, I see it has a --with-sdl-exec-prefix, so we could pass --with-sdl-exec-prefix=$(STAGING_DIR)/usr, which goes fine all the way until the configure script throws away all the sdl detection and does: CFLAGS="$CFLAGS $(sdl-config --cflags)" LIBS="$LIBS $(sdl-config --libs)" This is even done after prepending /usr/bin to the PATH, so we cannot even do like in nodejs and put sdl-config in a dedicated directory and stick it in the front of the path :/ I guess they should just do: CFLAGS="$CFLAGS $SDL_CFLAGS" LIBS="$LIBS SDL_LIBS" Care to send a patch upstream for that and send an updated patch to us? In the mean time I have marked the patch as changes requested. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 11:42:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 12:42:00 +0100 Subject: [Buildroot] [git commit] package/libusb: bump to version 1.0.25 Message-ID: <20220205113500.DA2518269F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=aad609936fc83acfe1eac6ffc86d29ac35dcf54e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patch (already in version) https://github.com/libusb/libusb/blob/v1.0.25/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...-Fix-parsing-of-descriptors-for-multi-con.patch | 62 ---------------------- package/libusb/libusb.hash | 2 +- package/libusb/libusb.mk | 2 +- 3 files changed, 2 insertions(+), 64 deletions(-) diff --git a/package/libusb/0001-linux_usbfs-Fix-parsing-of-descriptors-for-multi-con.patch b/package/libusb/0001-linux_usbfs-Fix-parsing-of-descriptors-for-multi-con.patch deleted file mode 100644 index 55e6a1494e..0000000000 --- a/package/libusb/0001-linux_usbfs-Fix-parsing-of-descriptors-for-multi-con.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 623e2a995d156e115c91f56a3ec691bdc333df8b Mon Sep 17 00:00:00 2001 -From: Chris Dickens -Date: Sun, 13 Dec 2020 15:49:19 -0800 -Subject: [PATCH] linux_usbfs: Fix parsing of descriptors for - multi-configuration devices - -Commit e2be556bd2 ("linux_usbfs: Parse config descriptors during device -initialization") introduced a regression for devices with multiple -configurations. The logic that verifies the reported length of the -configuration descriptors failed to count the length of the -configuration descriptor itself and would truncate the actual length by -9 bytes, leading to a parsing error for subsequent descriptors. - -Closes #825 - -Signed-off-by: Chris Dickens -(cherry picked from commit f6d2cb561402c3b6d3627c0eb89e009b503d9067) -Signed-off-by: John Keeping ---- - libusb/os/linux_usbfs.c | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - -diff --git a/libusb/os/linux_usbfs.c b/libusb/os/linux_usbfs.c -index fb2ed53..4d2dc8d 100644 ---- a/libusb/os/linux_usbfs.c -+++ b/libusb/os/linux_usbfs.c -@@ -641,7 +641,12 @@ static int seek_to_next_config(struct libusb_context *ctx, - uint8_t *buffer, size_t len) - { - struct usbi_descriptor_header *header; -- int offset = 0; -+ int offset; -+ -+ /* Start seeking past the config descriptor */ -+ offset = LIBUSB_DT_CONFIG_SIZE; -+ buffer += LIBUSB_DT_CONFIG_SIZE; -+ len -= LIBUSB_DT_CONFIG_SIZE; - - while (len > 0) { - if (len < 2) { -@@ -718,7 +723,7 @@ static int parse_config_descriptors(struct libusb_device *dev) - } - - if (priv->sysfs_dir) { -- /* -+ /* - * In sysfs wTotalLength is ignored, instead the kernel returns a - * config descriptor with verified bLength fields, with descriptors - * with an invalid bLength removed. -@@ -727,8 +732,7 @@ static int parse_config_descriptors(struct libusb_device *dev) - int offset; - - if (num_configs > 1 && idx < num_configs - 1) { -- offset = seek_to_next_config(ctx, buffer + LIBUSB_DT_CONFIG_SIZE, -- remaining - LIBUSB_DT_CONFIG_SIZE); -+ offset = seek_to_next_config(ctx, buffer, remaining); - if (offset < 0) - return offset; - sysfs_config_len = (uint16_t)offset; --- -2.30.1 - diff --git a/package/libusb/libusb.hash b/package/libusb/libusb.hash index 6169a186a5..a18935fe03 100644 --- a/package/libusb/libusb.hash +++ b/package/libusb/libusb.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 7efd2685f7b327326dcfb85cee426d9b871fd70e22caa15bb68d595ce2a2b12a libusb-1.0.24.tar.bz2 +sha256 8a28ef197a797ebac2702f095e81975e2b02b2eeff2774fa909c78a74ef50849 libusb-1.0.25.tar.bz2 sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk index 28efcadefc..1e82cb9a85 100644 --- a/package/libusb/libusb.mk +++ b/package/libusb/libusb.mk @@ -5,7 +5,7 @@ ################################################################################ LIBUSB_VERSION_MAJOR = 1.0 -LIBUSB_VERSION = $(LIBUSB_VERSION_MAJOR).24 +LIBUSB_VERSION = $(LIBUSB_VERSION_MAJOR).25 LIBUSB_SOURCE = libusb-$(LIBUSB_VERSION).tar.bz2 LIBUSB_SITE = https://github.com/libusb/libusb/releases/download/v$(LIBUSB_VERSION) LIBUSB_LICENSE = LGPL-2.1+ From peter at korsgaard.com Sat Feb 5 11:42:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 12:42:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/libusb: bump to version 1.0.25 In-Reply-To: <20220201220151.350153-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 1 Feb 2022 23:01:51 +0100") References: <20220201220151.350153-1-fontaine.fabrice@gmail.com> Message-ID: <87k0e9wndr.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Drop patch (already in version) > https://github.com/libusb/libusb/blob/v1.0.25/ChangeLog > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 11:43:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 12:43:30 +0100 Subject: [Buildroot] [PATCH] configs/warp7: bump Kernel and U-Boot version In-Reply-To: <20220202174948.1919945-1-festevam@gmail.com> (Fabio Estevam's message of "Wed, 2 Feb 2022 14:49:48 -0300") References: <20220202174948.1919945-1-festevam@gmail.com> Message-ID: <87fsoxwnbx.fsf@dell.be.48ers.dk> >>>>> "Fabio" == Fabio Estevam writes: > Bump U-Boot to 2022.01 and kernel to version 5.16.5. > Signed-off-by: Fabio Estevam Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 11:44:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 12:44:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/python3-setuptools: bump to version 60.7.0 In-Reply-To: <20220202203411.150459-1-james.hilliard1@gmail.com> (James Hilliard's message of "Wed, 2 Feb 2022 13:34:11 -0700") References: <20220202203411.150459-1-james.hilliard1@gmail.com> Message-ID: <87bkzlwna5.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 11:43:18 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 12:43:18 +0100 Subject: [Buildroot] [git commit] configs/warp7: bump Kernel and U-Boot version Message-ID: <20220205113732.B6AEA826AB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e9fc598a4d0fd8f9172ee589d628474e7ba1c3ea branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Bump U-Boot to 2022.01 and kernel to version 5.16.5. Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- configs/warp7_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig index 5fca9f6cfc..04dfc94f7d 100644 --- a/configs/warp7_defconfig +++ b/configs/warp7_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 5.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +# Linux headers same as kernel, a 5.16 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -15,7 +15,7 @@ BR2_ROOTFS_OVERLAY="board/warp7/rootfs_overlay" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.14" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16.5" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7s-warp" @@ -25,7 +25,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="warp7" 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_FORMAT_DTB_IMX=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y From peter at korsgaard.com Sat Feb 5 11:44:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 12:44:03 +0100 Subject: [Buildroot] [git commit] package/python3-setuptools: bump to version 60.7.0 Message-ID: <20220205113732.BFD89819CD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=89cf28a8f30cfeb05bfce326019bec8344a7a115 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-setuptools/60.6.0/python-setuptools.hash | 4 ---- .../python-setuptools/{60.6.0 => 60.7.0}/0001-add-executable.patch | 0 package/python-setuptools/60.7.0/python-setuptools.hash | 4 ++++ package/python-setuptools/python-setuptools.mk | 4 ++-- package/python3-setuptools/0001-add-executable.patch | 2 +- package/python3-setuptools/python3-setuptools.hash | 2 +- package/python3-setuptools/python3-setuptools.mk | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package/python-setuptools/60.6.0/python-setuptools.hash b/package/python-setuptools/60.6.0/python-setuptools.hash deleted file mode 100644 index 734cb4d580..0000000000 --- a/package/python-setuptools/60.6.0/python-setuptools.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From https://pypi.org/pypi/setuptools/json -md5 392e91d7e244998c586c88da2cf881d3 setuptools-60.6.0.tar.gz -sha256 eb83b1012ae6bf436901c2a2cee35d45b7260f31fd4b65fd1e50a9f99c11d7f8 setuptools-60.6.0.tar.gz -sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE diff --git a/package/python-setuptools/60.6.0/0001-add-executable.patch b/package/python-setuptools/60.7.0/0001-add-executable.patch similarity index 100% rename from package/python-setuptools/60.6.0/0001-add-executable.patch rename to package/python-setuptools/60.7.0/0001-add-executable.patch diff --git a/package/python-setuptools/60.7.0/python-setuptools.hash b/package/python-setuptools/60.7.0/python-setuptools.hash new file mode 100644 index 0000000000..8df7155d4c --- /dev/null +++ b/package/python-setuptools/60.7.0/python-setuptools.hash @@ -0,0 +1,4 @@ +# From https://pypi.org/pypi/setuptools/json +md5 082637e8fbc2e1fd9c637665d8fcccd8 setuptools-60.7.0.tar.gz +sha256 b83cf328a4f6a987c95610e76b29a30778db05174eef71f771776c48f8f25d1b setuptools-60.7.0.tar.gz +sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk index 15912d96f5..8bca852fe2 100644 --- a/package/python-setuptools/python-setuptools.mk +++ b/package/python-setuptools/python-setuptools.mk @@ -9,9 +9,9 @@ ifeq ($(BR2_PACKAGE_PYTHON3),y) # Please keep in sync with # package/python3-setuptools/python3-setuptools.mk -PYTHON_SETUPTOOLS_VERSION = 60.6.0 +PYTHON_SETUPTOOLS_VERSION = 60.7.0 PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON3_SETUPTOOLS_VERSION).tar.gz -PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/8f/89/9fec81ec84737c925a1ee992af2c6c7153aec4051c26afeadd6b822354d2 +PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/29/dd/48d662bb93e5e51e72265ef612f869947d4ae4126328d7156824cd50d440 else # Python PYTHON_SETUPTOOLS_VERSION = 44.0.0 PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).zip diff --git a/package/python3-setuptools/0001-add-executable.patch b/package/python3-setuptools/0001-add-executable.patch index 9d608239bc..46b5935d33 120000 --- a/package/python3-setuptools/0001-add-executable.patch +++ b/package/python3-setuptools/0001-add-executable.patch @@ -1 +1 @@ -../python-setuptools/60.6.0/0001-add-executable.patch \ No newline at end of file +../python-setuptools/60.7.0/0001-add-executable.patch \ No newline at end of file diff --git a/package/python3-setuptools/python3-setuptools.hash b/package/python3-setuptools/python3-setuptools.hash index 9fb96015aa..2c9d3614d5 120000 --- a/package/python3-setuptools/python3-setuptools.hash +++ b/package/python3-setuptools/python3-setuptools.hash @@ -1 +1 @@ -../python-setuptools/60.6.0/python-setuptools.hash \ No newline at end of file +../python-setuptools/60.7.0/python-setuptools.hash \ No newline at end of file diff --git a/package/python3-setuptools/python3-setuptools.mk b/package/python3-setuptools/python3-setuptools.mk index 55a01dba01..d5aaa01918 100644 --- a/package/python3-setuptools/python3-setuptools.mk +++ b/package/python3-setuptools/python3-setuptools.mk @@ -6,9 +6,9 @@ # Please keep in sync with # package/python-setuptools/python-setuptools.mk -PYTHON3_SETUPTOOLS_VERSION = 60.6.0 +PYTHON3_SETUPTOOLS_VERSION = 60.7.0 PYTHON3_SETUPTOOLS_SOURCE = setuptools-$(PYTHON3_SETUPTOOLS_VERSION).tar.gz -PYTHON3_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/8f/89/9fec81ec84737c925a1ee992af2c6c7153aec4051c26afeadd6b822354d2 +PYTHON3_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/29/dd/48d662bb93e5e51e72265ef612f869947d4ae4126328d7156824cd50d440 PYTHON3_SETUPTOOLS_LICENSE = MIT PYTHON3_SETUPTOOLS_LICENSE_FILES = LICENSE PYTHON3_SETUPTOOLS_CPE_ID_VENDOR = python From peter at korsgaard.com Sat Feb 5 12:48:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 13:48:44 +0100 Subject: [Buildroot] package libldns In-Reply-To: (ca's message of "Thu, 03 Feb 2022 21:37:39 +0000") References: <5_xofMlQqIrdAjpopLNCIYCGiqsc2UoXvUQG4GIV5Bd0dY31bw-gZ_0eoD0ix_iW-BI3-5O_RbQESkV3ybUN1zFSLY2r3PAr3ZOfxYOFmrU=@protonmail.ch> <6c85206c-139f-474d-7ca5-5f21fd606d96@mind.be> Message-ID: <877da9wkb7.fsf@dell.be.48ers.dk> >>>>> "ca0" == ca0 via buildroot writes: > Naah - builds only for Intel. Do an arm build and you'll find that the > m4/libtool.m4 runs a whole lot of ldconfig commands that show some > error codes and the worst part is that the libc files mentioned are > "blown away" (see > https://dictionary.tn/whats-another-word-for-blown-away/) like taken > our behind the shed and have a few bullets put in them - > ie. deleted. Do you know what a pain it is not having the build fail > there and then, because you have to debug a non working init, check > the kernel and then find that your user space has been crippled by > some Nazi collaborators (my bad, I'll stick to EU Nazi references from > now on). > Are you saying that this package works for ARM? It builds here on armv7/musl without issues on git master: cat defconfig BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_VFP=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_MUSL_STABLE=y BR2_PACKAGE_LIBLDNS=y # BR2_TARGET_ROOTFS_TAR is not set tree target/lib target/usr/lib target/lib ??? ld-musl-armhf.so.1 -> ../lib/libc.so ??? libatomic.so.1 -> libatomic.so.1.2.0 ??? libatomic.so.1.2.0 ??? libc.so ??? libgcc_s.so.1 target/usr/lib ??? libcrypto.so -> libcrypto.so.1.1 ??? libcrypto.so.1.1 ??? libgfortran.so.5 -> libgfortran.so.5.0.0 ??? libgfortran.so.5.0.0 ??? libldns.so -> libldns.so.3.2.0 ??? libldns.so.3 -> libldns.so.3.2.0 ??? libldns.so.3.2.0 ??? libssl.so -> libssl.so.1.1 ??? libssl.so.1.1 ??? libstdc++.so.6 -> libstdc++.so.6.0.28 ??? libstdc++.so.6.0.28 ??? libstdc++.so.6.0.28-gdb.py ??? libz.so -> libz.so.1.2.11 ??? libz.so.1 -> libz.so.1.2.11 ??? libz.so.1.2.11 ??? os-release -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 12:51:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 13:51:17 +0100 Subject: [Buildroot] [PATCH] package/{glibc, localedef}: security bump for additional post-2.34.x fixes In-Reply-To: <5de97254-e4b3-308e-c05f-26e394e2c668@gmail.com> (Romain Naour's message of "Sat, 5 Feb 2022 11:51:23 +0100") References: <20220204174712.1109-1-peter@korsgaard.com> <5de97254-e4b3-308e-c05f-26e394e2c668@gmail.com> Message-ID: <87zgn5v5mi.fsf@dell.be.48ers.dk> >>>>> "Romain" == Romain Naour writes: > Hi Peter, > Le 04/02/2022 ? 18:47, Peter Korsgaard a ?crit?: >> Fixes the following security issues: >> >> CVE-2022-23219: Passing an overlong file name to the clnt_create >> legacy function could result in a stack-based buffer overflow when >> using the "unix" protocol. Reported by Martin Sebor. >> >> CVE-2022-23218: Passing an overlong file name to the svcunix_create >> legacy function could result in a stack-based buffer overflow. >> >> CVE-2021-3998: Passing a path longer than PATH_MAX to the realpath >> function could result in a memory leak and potential access of >> uninitialized memory. Reported by Qualys. >> >> CVE-2021-3999: Passing a buffer of size exactly 1 byte to the getcwd >> function may result in an off-by-one buffer underflow and overflow >> when the current working directory is longer than PATH_MAX and also >> corresponds to the / directory through an unprivileged mount >> namespace. Reported by Qualys. >> >> Signed-off-by: Peter Korsgaard > Reviewed-by: Romain Naour Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 12:51:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 13:51:09 +0100 Subject: [Buildroot] [git commit] package/{glibc, localedef}: security bump for additional post-2.34.x fixes Message-ID: <20220205124414.D529182293@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1983d2e6a30fb6ca1d81f47798467bb0ac4401e6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes the following security issues: CVE-2022-23219: Passing an overlong file name to the clnt_create legacy function could result in a stack-based buffer overflow when using the "unix" protocol. Reported by Martin Sebor. CVE-2022-23218: Passing an overlong file name to the svcunix_create legacy function could result in a stack-based buffer overflow. CVE-2021-3998: Passing a path longer than PATH_MAX to the realpath function could result in a memory leak and potential access of uninitialized memory. Reported by Qualys. CVE-2021-3999: Passing a buffer of size exactly 1 byte to the getcwd function may result in an off-by-one buffer underflow and overflow when the current working directory is longer than PATH_MAX and also corresponds to the / directory through an unprivileged mount namespace. Reported by Qualys. Signed-off-by: Peter Korsgaard Reviewed-by: Romain Naour Signed-off-by: Peter Korsgaard --- .../0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch | 0 .../glibc.hash | 2 +- package/glibc/glibc.mk | 2 +- .../0001-HACK-only-build-and-install-localedef.patch | 0 .../0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch | 0 .../localedef.hash | 2 +- package/localedef/localedef.mk | 2 +- 7 files changed, 4 insertions(+), 4 deletions(-) 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-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch similarity index 100% rename from package/glibc/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch rename to package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch diff --git a/package/glibc/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/glibc.hash b/package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/glibc.hash similarity index 70% rename from package/glibc/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/glibc.hash rename to package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/glibc.hash index 595de95a58..dfd939020f 100644 --- a/package/glibc/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/glibc.hash +++ b/package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/glibc.hash @@ -1,5 +1,5 @@ # Locally calculated (fetched from Github) -sha256 1c7ed0f69ed268bd66f9754d0cb8fb65e0dafc1f9a1048ea50d1e96d60399686 glibc-2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4.tar.gz +sha256 3c299a21468a80356b848ca341f45551616c4928a6c871e6d45cee942e8b0f24 glibc-2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c.tar.gz # Hashes for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index 5c26b0e6df..9b591aa2a3 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -7,7 +7,7 @@ # Generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- # When updating the version, please also update localedef -GLIBC_VERSION = 2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4 +GLIBC_VERSION = 2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c # Upstream doesn't officially provide an https download link. # There is one (https://sourceware.org/git/glibc.git) but it's not reliable, # sometimes the connection times out. So use an unofficial github mirror. diff --git a/package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0001-HACK-only-build-and-install-localedef.patch b/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-HACK-only-build-and-install-localedef.patch similarity index 100% rename from package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0001-HACK-only-build-and-install-localedef.patch rename to package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-HACK-only-build-and-install-localedef.patch diff --git a/package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch b/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch similarity index 100% rename from package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch rename to package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch diff --git a/package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/localedef.hash b/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/localedef.hash similarity index 70% rename from package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/localedef.hash rename to package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/localedef.hash index 595de95a58..dfd939020f 100644 --- a/package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/localedef.hash +++ b/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/localedef.hash @@ -1,5 +1,5 @@ # Locally calculated (fetched from Github) -sha256 1c7ed0f69ed268bd66f9754d0cb8fb65e0dafc1f9a1048ea50d1e96d60399686 glibc-2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4.tar.gz +sha256 3c299a21468a80356b848ca341f45551616c4928a6c871e6d45cee942e8b0f24 glibc-2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c.tar.gz # Hashes for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/localedef/localedef.mk b/package/localedef/localedef.mk index 87d921cffe..f8f0b42984 100644 --- a/package/localedef/localedef.mk +++ b/package/localedef/localedef.mk @@ -7,7 +7,7 @@ # Use the same VERSION and SITE as target glibc # As in glibc.mk, generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- -LOCALEDEF_VERSION = 2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4 +LOCALEDEF_VERSION = 2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION).tar.gz LOCALEDEF_SITE = $(call github,bminor,glibc,$(LOCALEDEF_VERSION)) HOST_LOCALEDEF_DL_SUBDIR = glibc From peter at korsgaard.com Sat Feb 5 12:52:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 13:52:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/tor: bump version to 0.4.6.10 In-Reply-To: <20220205090943.4012391-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sat, 5 Feb 2022 10:09:43 +0100") References: <20220205090943.4012391-1-bernd.kuhls@t-online.de> Message-ID: <87v8xtv5kc.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Release notes: > https://gitlab.torproject.org/tpo/core/tor/-/raw/release-0.4.6/ReleaseNotes > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 12:53:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 13:53:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/libldns: remove --disable-dane-verify configure option In-Reply-To: <20220205092620.4162598-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sat, 5 Feb 2022 10:26:20 +0100") References: <20220205092620.4162598-1-bernd.kuhls@t-online.de> Message-ID: <87r18hv5jd.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Not needed anymore after openssl was bumped to 1.1.x, snippet from > libldns configure: > checking for SSL_get0_dane... yes Also if libressl is used? -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 12:55:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 13:55:08 +0100 Subject: [Buildroot] [PATCH v1] package/findutils: bump version to 4.9.0 In-Reply-To: <20220204153715.15481-1-ps.report@gmx.net> (Peter Seiderer's message of "Fri, 4 Feb 2022 16:37:15 +0100") References: <20220204153715.15481-1-ps.report@gmx.net> Message-ID: <87mtj5v5g3.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > For details see [1]. > [1] https://lists.gnu.org/archive/html/info-gnu/2022-02/msg00003.html > Signed-off-by: Peter Seiderer Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 12:52:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 13:52:03 +0100 Subject: [Buildroot] [git commit] package/tor: bump version to 0.4.6.10 Message-ID: <20220205124809.1F2FB82650@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b3058f39b86993996d17c8f38f0bfd83d654b5a7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://gitlab.torproject.org/tpo/core/tor/-/raw/release-0.4.6/ReleaseNotes Signed-off-by: Bernd Kuhls 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 63d47d7fa6..16e01c80a9 100644 --- a/package/tor/tor.hash +++ b/package/tor/tor.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c7e93380988ce20b82aa19c06cdb2f10302b72cfebec7c15b5b96bcfc94ca9a9 tor-0.4.6.9.tar.gz +sha256 94ccd60e04e558f33be73032bc84ea241660f92f58cfb88789bda6893739e31c tor-0.4.6.10.tar.gz sha256 47b54ed17e8fdcab3c44729a1789a09b208f9a63a845a7e50def9df729eebad0 LICENSE diff --git a/package/tor/tor.mk b/package/tor/tor.mk index fc1db6da6b..d16b3541eb 100644 --- a/package/tor/tor.mk +++ b/package/tor/tor.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOR_VERSION = 0.4.6.9 +TOR_VERSION = 0.4.6.10 TOR_SITE = https://dist.torproject.org TOR_LICENSE = BSD-3-Clause TOR_LICENSE_FILES = LICENSE From peter at korsgaard.com Sat Feb 5 12:55:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 13:55:04 +0100 Subject: [Buildroot] [git commit] package/findutils: bump version to 4.9.0 Message-ID: <20220205124809.28D9282803@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ad2a752d7b2e6b880d7ad8c2a785092dc2b47e6b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For details see [1]. [1] https://lists.gnu.org/archive/html/info-gnu/2022-02/msg00003.html Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/findutils/findutils.hash | 2 +- package/findutils/findutils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/findutils/findutils.hash b/package/findutils/findutils.hash index 26dbe59181..0284c0e7b2 100644 --- a/package/findutils/findutils.hash +++ b/package/findutils/findutils.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 57127b7e97d91282c6ace556378d5455a9509898297e46e10443016ea1387164 findutils-4.8.0.tar.xz +sha256 a2bfb8c09d436770edc59f50fa483e785b161a3b7b9d547573cb08065fd462fe findutils-4.9.0.tar.xz # Hash for license file sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING diff --git a/package/findutils/findutils.mk b/package/findutils/findutils.mk index 3237e5502a..9731a35047 100644 --- a/package/findutils/findutils.mk +++ b/package/findutils/findutils.mk @@ -4,7 +4,7 @@ # ################################################################################ -FINDUTILS_VERSION = 4.8.0 +FINDUTILS_VERSION = 4.9.0 FINDUTILS_SOURCE = findutils-$(FINDUTILS_VERSION).tar.xz FINDUTILS_SITE = $(BR2_GNU_MIRROR)/findutils FINDUTILS_LICENSE = GPL-3.0+ From peter at korsgaard.com Sat Feb 5 12:55:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 13:55:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi-pvr-mythtv: bump version to 19.0.7-Matrix In-Reply-To: <20220204164528.80593-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Fri, 4 Feb 2022 17:45:28 +0100") References: <20220204164528.80593-1-bernd.kuhls@t-online.de> Message-ID: <87ilttv5f0.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 Feb 5 12:55:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 13:55:44 +0100 Subject: [Buildroot] [git commit] package/kodi-pvr-mythtv: bump version to 19.0.7-Matrix Message-ID: <20220205124839.1D78982650@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e830f40635b30de6dfd7c91ce785ef8b48e2a6b4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- 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 cb10d24a4f..15596333f5 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 8e63e85e055ec1e2d727506c939c4f53f6aef8b714f5c18f73c58102355f2e14 kodi-pvr-mythtv-19.0.6-Matrix.tar.gz +sha256 ccb97573c308c99adccdedf8328133c02d48c11620b602a906cf25107602dba5 kodi-pvr-mythtv-19.0.7-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 351fbc4eae..3040f87e14 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.6-Matrix +KODI_PVR_MYTHTV_VERSION = 19.0.7-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 peter at korsgaard.com Sat Feb 5 13:58:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 14:58:40 +0100 Subject: [Buildroot] [PATCH v1] package/mtools: bump version to 4.0.37 In-Reply-To: <20220203232410.26906-1-ps.report@gmx.net> (Peter Seiderer's message of "Fri, 4 Feb 2022 00:24:10 +0100") References: <20220203232410.26906-1-ps.report@gmx.net> Message-ID: <87ee4hv2i7.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > For details see [1]. > [1] https://lists.gnu.org/archive/html/info-gnu/2022-01/msg00006.html > Signed-off-by: Peter Seiderer Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 13:59:29 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 14:59:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-django: bump to version 4.0.2 In-Reply-To: <20220204193215.167521-1-aduskett@gmail.com> (Adam Duskett's message of "Fri, 4 Feb 2022 11:32:15 -0800") References: <20220204193215.167521-1-aduskett@gmail.com> Message-ID: <87a6f5v2gu.fsf@dell.be.48ers.dk> >>>>> "Adam" == Adam Duskett writes: > Tested with: > support/testing/run-tests tests.package.test_python_django.TestPythonPy3Django > Signed-off-by: Adam Duskett Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 13:51:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 14:51:30 +0100 Subject: [Buildroot] [PATCH] package/xen: security bump to version 4.14.4 Message-ID: <20220205135132.3007-1-peter@korsgaard.com> Includes a number of bugfixes and the security fixes up to xsa-395: https://xenproject.org/downloads/xen-project-archives/xen-project-4-14-series/xen-project-4-14-4/ Drop the now upstream xsa38* patches. Signed-off-by: Peter Korsgaard --- package/xen/xen.hash | 11 +---------- package/xen/xen.mk | 19 +------------------ 2 files changed, 2 insertions(+), 28 deletions(-) diff --git a/package/xen/xen.hash b/package/xen/xen.hash index 10a778053a..a81d05e3f7 100644 --- a/package/xen/xen.hash +++ b/package/xen/xen.hash @@ -1,12 +1,3 @@ # Locally computed -sha256 a3dad76a772393a1875e8f44a6059a95fea4bde40f97b800966969ac6f3a498d xen-4.14.3.tar.gz +sha256 e76d56dfcdabf5d80aa06819f44472de49526a518dbb483eb08e7ff9aec2c669 xen-4.14.4.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 cfc166dc4c..03341d4275 100644 --- a/package/xen/xen.mk +++ b/package/xen/xen.mk @@ -4,30 +4,13 @@ # ################################################################################ -XEN_VERSION = 4.14.3 +XEN_VERSION = 4.14.4 XEN_SITE = https://downloads.xenproject.org/release/xen/$(XEN_VERSION) XEN_LICENSE = GPL-2.0 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) -- 2.20.1 From fontaine.fabrice at gmail.com Sat Feb 5 13:58:06 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 5 Feb 2022 14:58:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/cryptopp: disable altivec if needed Message-ID: <20220205135806.312865-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since commit bf4cf9de833e2d571d98d1ca935ea08a3468e463: blake2s_simd.cpp:715:8: error: 'uint32x4_p' does not name a type; did you mean 'uint32_t'? 715 | inline uint32x4_p VecLoad32(const T* p) | ^~~~~~~~~~ | uint32_t Fixes: - http://autobuild.buildroot.org/results/9e9f8559b12b8e2cf99cfab435fa7dd5796bbcd5 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 4353e35e0a..87d6fba237 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_POWERPC_CPU_HAS_ALTIVEC),y) +CRYPTOPP_CXXFLAGS += -DCRYPTOPP_DISABLE_ALTIVEC +endif + ifneq ($(BR2_ARM_CPU_HAS_NEON),y) CRYPTOPP_CXXFLAGS += -DCRYPTOPP_DISABLE_ARM_NEON endif -- 2.34.1 From peter at korsgaard.com Sat Feb 5 13:59:52 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 14:59:52 +0100 Subject: [Buildroot] [git commit] package/dovecot-pigeonhole: bump version to 0.5.18 Message-ID: <20220205135422.74AE182815@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6ec46f5608c204c8b84afff64c2804bfaef8956e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://github.com/dovecot/pigeonhole/blob/release-0.5.18/NEWS Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/dovecot-pigeonhole/dovecot-pigeonhole.hash | 2 +- package/dovecot-pigeonhole/dovecot-pigeonhole.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dovecot-pigeonhole/dovecot-pigeonhole.hash b/package/dovecot-pigeonhole/dovecot-pigeonhole.hash index b244563935..f3a5890151 100644 --- a/package/dovecot-pigeonhole/dovecot-pigeonhole.hash +++ b/package/dovecot-pigeonhole/dovecot-pigeonhole.hash @@ -1,3 +1,3 @@ # Locally computed after checking signature -sha256 3cc4a3de6d7e27bd99ac59b99faa161287f78167272699a22591798ffcf84512 dovecot-2.3-pigeonhole-0.5.17.1.tar.gz +sha256 a6d828f8d6f2decba5105343ece5c7a65245bd94e46a8ae4432a6d97543108a5 dovecot-2.3-pigeonhole-0.5.18.tar.gz sha256 fc9e9522216f2a9a28b31300e3c73c1df56acc27dfae951bf516e7995366b51a COPYING diff --git a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk index 95e9059392..dd533977f4 100644 --- a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk +++ b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOVECOT_PIGEONHOLE_VERSION = 0.5.17.1 +DOVECOT_PIGEONHOLE_VERSION = 0.5.18 DOVECOT_PIGEONHOLE_SOURCE = dovecot-2.3-pigeonhole-$(DOVECOT_PIGEONHOLE_VERSION).tar.gz DOVECOT_PIGEONHOLE_SITE = https://pigeonhole.dovecot.org/releases/2.3 DOVECOT_PIGEONHOLE_LICENSE = LGPL-2.1 From peter at korsgaard.com Sat Feb 5 13:58:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 14:58:38 +0100 Subject: [Buildroot] [git commit] package/mtools: bump version to 4.0.37 Message-ID: <20220205135422.62770817C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e26b261ab5f67fe93414f364d62a7cc8eb75934c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For details see [1]. [1] https://lists.gnu.org/archive/html/info-gnu/2022-01/msg00006.html Signed-off-by: Peter Seiderer 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 c37d4df456..5d1bca486f 100644 --- a/package/mtools/mtools.hash +++ b/package/mtools/mtools.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 78ac74b2d1cae77bb2da29461a13ed862ff6b7c1289d5bf80fdb09e039c2c48f mtools-4.0.36.tar.lz +sha256 f4dd1fb4b4d72f344f7efcfb05219de3882c6c6fce678d75e7cfb29ca162c7ca mtools-4.0.37.tar.lz # Locally calculated sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/mtools/mtools.mk b/package/mtools/mtools.mk index 4908c3fa2f..f73fd5d231 100644 --- a/package/mtools/mtools.mk +++ b/package/mtools/mtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -MTOOLS_VERSION = 4.0.36 +MTOOLS_VERSION = 4.0.37 MTOOLS_SOURCE = mtools-$(MTOOLS_VERSION).tar.lz MTOOLS_SITE = $(BR2_GNU_MIRROR)/mtools MTOOLS_LICENSE = GPL-3.0+ From peter at korsgaard.com Sat Feb 5 13:59:11 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 14:59:11 +0100 Subject: [Buildroot] [git commit] package/python-django: bump to version 4.0.2 Message-ID: <20220205135422.6B43A82810@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c60848387baa3da4c4635c83282995cce6aab363 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Tested with: support/testing/run-tests tests.package.test_python_django.TestPythonPy3Django Signed-off-by: Adam Duskett 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 89bc5ffb19..f78df56c5f 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 6c4a53d2ccb464bc3dd772c6f2f07df9 Django-3.2.11.tar.gz -sha256 69c94abe5d6b1b088bf475e09b7b74403f943e34da107e798465d2045da27e75 Django-3.2.11.tar.gz +md5 a86339c0e87241597afa8744704d9965 Django-4.0.2.tar.gz +sha256 110fb58fb12eca59e072ad59fc42d771cd642dd7a2f2416582aa9da7a8ef954a Django-4.0.2.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-django/python-django.mk b/package/python-django/python-django.mk index 25a645823b..652ca477ce 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 3.2.11 +PYTHON_DJANGO_VERSION = 4.0.2 PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz # The official Django site has an unpractical URL -PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/20/86/e4348aac45bc83fc8e9dda2cfd81004b007c65b68c1499a4233acabdaa3b +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/61/84/676c840e8f1188a6c836e3224b97aa8be4c2e6857c690d6c564eb23a4975 PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE From peter at korsgaard.com Sat Feb 5 14:01:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 15:01:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/dovecot-pigeonhole: bump version to 0.5.18 In-Reply-To: <20220205091304.4096595-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sat, 5 Feb 2022 10:13:04 +0100") References: <20220205091304.4096595-1-bernd.kuhls@t-online.de> Message-ID: <875yptv2dd.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Release notes: > https://github.com/dovecot/pigeonhole/blob/release-0.5.18/NEWS > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 14:01:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 15:01:46 +0100 Subject: [Buildroot] [git commit] package/intel-gmmlib: bump version to 22.0.2 Message-ID: <20220205135436.7EBC082745@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9a60a0ff349c40349831d61c7c3e5190bf1db0d6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/intel-gmmlib/intel-gmmlib.hash | 2 +- package/intel-gmmlib/intel-gmmlib.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-gmmlib/intel-gmmlib.hash b/package/intel-gmmlib/intel-gmmlib.hash index 8780eb9229..71a153e0a3 100644 --- a/package/intel-gmmlib/intel-gmmlib.hash +++ b/package/intel-gmmlib/intel-gmmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 341eb3fa478e427e5a6f03d4cbc97bc2b02c52728dcf06c4794661d34b7c6e5c intel-gmmlib-22.0.1.tar.gz +sha256 7cc044dc0979269abe825054ba6cc1b67169dc7a7f4192898e2dd04142a633fa intel-gmmlib-22.0.2.tar.gz sha256 8b7446825df3f8b0268307e272aa6aaaf78351c83161d860d02c913c22666c48 LICENSE.md diff --git a/package/intel-gmmlib/intel-gmmlib.mk b/package/intel-gmmlib/intel-gmmlib.mk index c45a7669b1..235f71341c 100644 --- a/package/intel-gmmlib/intel-gmmlib.mk +++ b/package/intel-gmmlib/intel-gmmlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_GMMLIB_VERSION = 22.0.1 +INTEL_GMMLIB_VERSION = 22.0.2 INTEL_GMMLIB_SITE = https://github.com/intel/gmmlib/archive INTEL_GMMLIB_LICENSE = MIT INTEL_GMMLIB_LICENSE_FILES = LICENSE.md From peter at korsgaard.com Sat Feb 5 14:01:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 15:01:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/intel-gmmlib: bump version to 22.0.2 In-Reply-To: <20220205091913.4135654-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sat, 5 Feb 2022 10:19:13 +0100") References: <20220205091913.4135654-1-bernd.kuhls@t-online.de> Message-ID: <871r0hv2cx.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From arnout at mind.be Sat Feb 5 14:10:41 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 5 Feb 2022 15:10:41 +0100 Subject: [Buildroot] [PATCH] board/pc: fix build failure due to new genimage 15 In-Reply-To: <20220204005610.897894-1-giulio.benetti@benettiengineering.com> References: <20220204005610.897894-1-giulio.benetti@benettiengineering.com> Message-ID: <98670320-83fa-c6e9-9bc4-aa30d9deb6ff@mind.be> Hi Giulio, On 04/02/2022 01:56, Giulio Benetti wrote: > Actually genimage fails to create final image with: > ``` > ERROR: hdimage(disk.img): partition [MBR] (offset 0x1b8, size 0x48) overlaps previous partition boot (offset 0x0, size 0x200) > ERROR: hdimage(disk.img): bootloaders, etc. that overlap with the partition table must declare the overlapping area as a hole. > ``` > > This is because genimage 15 is less permissive than before, so let's add > holes = {"(440; 512)"} to leave room to MBR. > > Fixes: > https://gitlab.com/buildroot.org/buildroot/-/jobs/1865935249 > > Signed-off-by: Giulio Benetti > --- > board/pc/genimage-bios.cfg | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/board/pc/genimage-bios.cfg b/board/pc/genimage-bios.cfg > index 26d12d9ab3..54026f6527 100644 > --- a/board/pc/genimage-bios.cfg > +++ b/board/pc/genimage-bios.cfg > @@ -7,6 +7,7 @@ image disk.img { > image = "boot.img" > offset = 0 > size = 512 > + holes = {"(440; 512)"} Have you tested this change on an actual board (i.e. a PC :-)? Regards, Arnout > } > > partition grub { From fontaine.fabrice at gmail.com Sat Feb 5 14:11:32 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 5 Feb 2022 15:11:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/libgeotiff: bump to version 1.7.0 Message-ID: <20220205141132.419654-1-fontaine.fabrice@gmail.com> https://github.com/OSGeo/libgeotiff/releases/tag/1.7.0 Signed-off-by: Fabrice Fontaine --- package/libgeotiff/libgeotiff.hash | 2 +- package/libgeotiff/libgeotiff.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libgeotiff/libgeotiff.hash b/package/libgeotiff/libgeotiff.hash index 51adcc2843..ec9fccb492 100644 --- a/package/libgeotiff/libgeotiff.hash +++ b/package/libgeotiff/libgeotiff.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 9311017e5284cffb86f2c7b7a9df1fb5ebcdc61c30468fb2e6bca36e4272ebca libgeotiff-1.6.0.tar.gz +sha256 fc304d8839ca5947cfbeb63adb9d1aa47acef38fc6d6689e622926e672a99a7e libgeotiff-1.7.0.tar.gz sha256 6a22340b8293c50a34ce8e95589489bd3ec65bcb8b93e61cbda3daaafe498375 LICENSE diff --git a/package/libgeotiff/libgeotiff.mk b/package/libgeotiff/libgeotiff.mk index c6fb61b4a2..c49528565d 100644 --- a/package/libgeotiff/libgeotiff.mk +++ b/package/libgeotiff/libgeotiff.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGEOTIFF_VERSION = 1.6.0 +LIBGEOTIFF_VERSION = 1.7.0 LIBGEOTIFF_SITE = http://download.osgeo.org/geotiff/libgeotiff LIBGEOTIFF_LICENSE = X11-style, public domain LIBGEOTIFF_LICENSE_FILES = LICENSE -- 2.34.1 From fontaine.fabrice at gmail.com Sat Feb 5 14:14:48 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 5 Feb 2022 15:14:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/tiff: fix CVE-2022-22844 Message-ID: <20220205141448.420553-1-fontaine.fabrice@gmail.com> LibTIFF 4.3.0 has an out-of-bounds read in _TIFFmemcpy in tif_unix.c in certain situations involving a custom tag and 0x0200 as the second word of the DE field. Signed-off-by: Fabrice Fontaine --- ...lobal-buffer-overflow-for-ASCII-tags.patch | 43 +++++++++++++++++++ package/tiff/tiff.mk | 4 ++ 2 files changed, 47 insertions(+) create mode 100644 package/tiff/0001-tiffset-fix-global-buffer-overflow-for-ASCII-tags.patch diff --git a/package/tiff/0001-tiffset-fix-global-buffer-overflow-for-ASCII-tags.patch b/package/tiff/0001-tiffset-fix-global-buffer-overflow-for-ASCII-tags.patch new file mode 100644 index 0000000000..ba1487782e --- /dev/null +++ b/package/tiff/0001-tiffset-fix-global-buffer-overflow-for-ASCII-tags.patch @@ -0,0 +1,43 @@ +From 03047a26952a82daaa0792957ce211e0aa51bc64 Mon Sep 17 00:00:00 2001 +From: 4ugustus +Date: Tue, 25 Jan 2022 16:25:28 +0000 +Subject: [PATCH] tiffset: fix global-buffer-overflow for ASCII tags where + count is required (fixes #355) + +[Retrieved from: +https://gitlab.com/libtiff/libtiff/-/commit/03047a26952a82daaa0792957ce211e0aa51bc64] +Signed-off-by: Fabrice Fontaine +--- + tools/tiffset.c | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) + +diff --git a/tools/tiffset.c b/tools/tiffset.c +index 8c9e23c5..e7a88c09 100644 +--- a/tools/tiffset.c ++++ b/tools/tiffset.c +@@ -146,9 +146,19 @@ main(int argc, char* argv[]) + + arg_index++; + if (TIFFFieldDataType(fip) == TIFF_ASCII) { +- if (TIFFSetField(tiff, TIFFFieldTag(fip), argv[arg_index]) != 1) +- fprintf( stderr, "Failed to set %s=%s\n", +- TIFFFieldName(fip), argv[arg_index] ); ++ if(TIFFFieldPassCount( fip )) { ++ size_t len; ++ len = strlen(argv[arg_index]) + 1; ++ if (len > UINT16_MAX || TIFFSetField(tiff, TIFFFieldTag(fip), ++ (uint16_t)len, argv[arg_index]) != 1) ++ fprintf( stderr, "Failed to set %s=%s\n", ++ TIFFFieldName(fip), argv[arg_index] ); ++ } else { ++ if (TIFFSetField(tiff, TIFFFieldTag(fip), ++ argv[arg_index]) != 1) ++ fprintf( stderr, "Failed to set %s=%s\n", ++ TIFFFieldName(fip), argv[arg_index] ); ++ } + } else if (TIFFFieldWriteCount(fip) > 0 + || TIFFFieldWriteCount(fip) == TIFF_VARIABLE) { + int ret = 1; +-- +GitLab + diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index f6c6de12c5..f80ab7ac55 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -11,6 +11,10 @@ TIFF_LICENSE_FILES = COPYRIGHT TIFF_CPE_ID_VENDOR = libtiff TIFF_CPE_ID_PRODUCT = libtiff TIFF_INSTALL_STAGING = YES + +# 0001-tiffset-fix-global-buffer-overflow-for-ASCII-tags.patch +TIFF_IGNORE_CVES += CVE-2022-22844 + TIFF_CONF_OPTS = \ --disable-cxx \ --without-x -- 2.34.1 From fontaine.fabrice at gmail.com Sat Feb 5 14:30:43 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 5 Feb 2022 15:30:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/cryptopp: needs C++ Message-ID: <20220205143043.427517-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since commit bf4cf9de833e2d571d98d1ca935ea08a3468e463: no -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O2 -g0 -D_FORTIFY_SOURCE=1 -fPIC -DCRYPTOPP_DISABLE_ARM_NEON -c cryptlib.cpp make[1]: no: Command not found Fixes: - http://autobuild.buildroot.org/results/fa90b416a219a512a482e7dc63e2d72b184307c7 Signed-off-by: Fabrice Fontaine --- package/cryptopp/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/cryptopp/Config.in b/package/cryptopp/Config.in index feb945db2f..1648a73f9d 100644 --- a/package/cryptopp/Config.in +++ b/package/cryptopp/Config.in @@ -1,9 +1,11 @@ config BR2_PACKAGE_CRYPTOPP bool "cryptopp" + depends on BR2_INSTALL_LIBSTDCPP 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, wchar" - depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR +comment "cryptopp needs a toolchain w/ C++, dynamic library, wchar" + depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ + !BR2_USE_WCHAR -- 2.34.1 From peter at korsgaard.com Sat Feb 5 14:43:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 15:43:04 +0100 Subject: [Buildroot] [PATCH] package/rauc: d-bus support is optional Message-ID: <20220205144306.29481-1-peter@korsgaard.com> As pointed out by Jan L?bbe, D-Bus support is optional: > You can build without D-Bus (./configure --disable-service). So drop it from the required dependencies and add a RAUC_DBUS sub option like it is done for network/json. Signed-off-by: Peter Korsgaard --- package/rauc/Config.in | 8 +++++++- package/rauc/rauc.mk | 9 ++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/package/rauc/Config.in b/package/rauc/Config.in index 676ff42b51..b4f7b81948 100644 --- a/package/rauc/Config.in +++ b/package/rauc/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_RAUC depends on BR2_USE_WCHAR # glib2 select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_DBUS select BR2_PACKAGE_SQUASHFS # run-time dependency select BR2_PACKAGE_UBOOT_TOOLS if BR2_TARGET_UBOOT # run-time dependency select BR2_PACKAGE_UBOOT_TOOLS_FWPRINTENV if BR2_TARGET_UBOOT @@ -19,6 +18,13 @@ config BR2_PACKAGE_RAUC if BR2_PACKAGE_RAUC +config BR2_PACKAGE_RAUC_DBUS + bool "dbus support" + select BR2_PACKAGE_DBUS + help + This option enables support for controlling rauc through + D-Bus. + config BR2_PACKAGE_RAUC_NETWORK bool "network support" select BR2_PACKAGE_LIBCURL diff --git a/package/rauc/rauc.mk b/package/rauc/rauc.mk index 4fb3ddde3e..99efc16c2f 100644 --- a/package/rauc/rauc.mk +++ b/package/rauc/rauc.mk @@ -10,7 +10,14 @@ RAUC_SOURCE = rauc-$(RAUC_VERSION).tar.xz RAUC_LICENSE = LGPL-2.1 RAUC_LICENSE_FILES = COPYING RAUC_CPE_ID_VENDOR = pengutronix -RAUC_DEPENDENCIES = host-pkgconf openssl libglib2 dbus +RAUC_DEPENDENCIES = host-pkgconf openssl libglib2 + +ifeq ($(BR2_PACKAGE_RAUC_DBUS),y) +RAUC_CONF_OPTS += --enable-service +RAUC_DEPENDENCIES += dbus +else +RAUC_CONF_OPTS += --disable-service +endif ifeq ($(BR2_PACKAGE_RAUC_NETWORK),y) RAUC_CONF_OPTS += --enable-network -- 2.20.1 From fontaine.fabrice at gmail.com Sat Feb 5 14:50:39 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 5 Feb 2022 15:50:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/mpdecimal: fix build without threads Message-ID: <20220205145039.439160-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump to version 2.5.1 in commit 995c093d6a3e8042110d6a8d96fdc7ad65a557c4: /home/peko/autobuild/instance-0/output-1/per-package/mpdecimal/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: cannot find -lpthread Fixes: - http://autobuild.buildroot.org/results/b20c090f2ac5ea6d1c761820763037b87bde137a Signed-off-by: Fabrice Fontaine --- package/mpdecimal/mpdecimal.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/mpdecimal/mpdecimal.mk b/package/mpdecimal/mpdecimal.mk index 25c12c08b1..aa322df340 100644 --- a/package/mpdecimal/mpdecimal.mk +++ b/package/mpdecimal/mpdecimal.mk @@ -11,6 +11,9 @@ MPDECIMAL_LICENSE = BSD-2-Clause MPDECIMAL_LICENSE_FILES = LICENSE.txt MPDECIMAL_CONF_OPTS = LD="$(TARGET_CC)" +# threads are only needed for tests +MPDECIMAL_MAKE_OPTS = MPD_PTHREAD= + # On i386, by default, mpdecimal tries to uses which is not # available in musl/uclibc. So in this case, we tell mpdecimal to use # the generic 32 bits code, which is anyway the one used on ARM, -- 2.34.1 From peter at korsgaard.com Sat Feb 5 14:56:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 15:56:28 +0100 Subject: [Buildroot] [PATCH v1 00/12] package/gstreamer1/*: bump version to 1.18.6 In-Reply-To: <20220204154631.17814-1-ps.report@gmx.net> (Peter Seiderer's message of "Fri, 4 Feb 2022 16:46:19 +0100") References: <20220204154631.17814-1-ps.report@gmx.net> Message-ID: <87wni9tl9f.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > For details see [1] and [2]. > [1] https://lists.freedesktop.org/archives/gstreamer-devel/2022-February/079533.html > [2] https://gstreamer.freedesktop.org/releases/1.18/#1.18.6 > Peter Seiderer (12): > package/gstreamer1: bump version to 1.18.6 > package/gst1-plugins-base: bump version to 1.18.6 > package/gst1-plugins-good: bump version to 1.18.6 > package/gst1-plugins-bad: bump version to 1.18.6 > package/gst1-plugins-ugly: bump version to 1.18.6 > package/gst1-devtools: bump version to 1.18.6 > package/gst1-libav: bump version to 1.18.6 > package/gst1-vaapi: bump version to 1.18.6 > package/gst1-rtsp-server: bump version to 1.18.6 > package/gstreamer1-editing-services: bump version to 1.18.6 > package/gst-omx: bump version to 1.18.6 > package/gst1-python: bump version to 1.18.6 Committed series, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 14:53:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 15:53:44 +0100 Subject: [Buildroot] [git commit] package/gst1-plugins-good: bump version to 1.18.6 Message-ID: <20220205144955.6D1CC82967@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8741ac0e502bacad8c81c9b02e116d9ce00fee03 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash | 4 ++-- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash index ea9f43bfd2..e342bd133e 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.5.tar.xz.sha256sum -sha256 3aaeeea7765fbf8801acce4a503a9b05f73f04e8a35352e9d00232cfd555796b gst-plugins-good-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.6.tar.xz.sha256sum +sha256 26723ac01fcb360ade1f41d168c7c322d8af4ceb7e55c8c12ed2690d06a76eed gst-plugins-good-1.18.6.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk index 44da3c3c30..e0ca29c5fd 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_GOOD_VERSION = 1.18.5 +GST1_PLUGINS_GOOD_VERSION = 1.18.6 GST1_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST1_PLUGINS_GOOD_VERSION).tar.xz GST1_PLUGINS_GOOD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-good GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING From peter at korsgaard.com Sat Feb 5 14:53:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 15:53:22 +0100 Subject: [Buildroot] [git commit] package/gstreamer1: bump version to 1.18.6 Message-ID: <20220205144955.5A2E282901@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=58be19b0280e803ebe710c591cd4780cdd037a5e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/gstreamer1/gstreamer1/gstreamer1.hash | 4 ++-- package/gstreamer1/gstreamer1/gstreamer1.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gstreamer1/gstreamer1.hash b/package/gstreamer1/gstreamer1/gstreamer1.hash index c6282454ca..1202bf2c50 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.hash +++ b/package/gstreamer1/gstreamer1/gstreamer1.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.18.5.tar.xz.sha256sum -sha256 55862232a63459bbf56abebde3085ca9aec211b478e891dacea4d6df8cafe80a gstreamer-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.18.6.tar.xz.sha256sum +sha256 4ec816010dd4d3a93cf470ad0a6f25315f52b204eb1d71dfa70ab8a1c3bd06e6 gstreamer-1.18.6.tar.xz sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk index 1aab035e05..27745f3bf9 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_VERSION = 1.18.5 +GSTREAMER1_VERSION = 1.18.6 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer GSTREAMER1_INSTALL_STAGING = YES From peter at korsgaard.com Sat Feb 5 14:54:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 15:54:26 +0100 Subject: [Buildroot] [git commit] package/gst1-plugins-ugly: bump version to 1.18.6 Message-ID: <20220205144955.807B88295E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4d02d512f380a51097026ab33241aa466c33ee07 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash | 4 ++-- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash index 93945cdecd..26fd0fd9ac 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.18.5.tar.xz.sha256sum -sha256 df32803e98f8a9979373fa2ca7e05e62f977b1097576d3a80619d9f5c69f66d9 gst-plugins-ugly-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.18.6.tar.xz.sha256sum +sha256 4969c409cb6a88317d2108b8577108e18623b2333d7b587ae3f39459c70e3a7f gst-plugins-ugly-1.18.6.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk index a25110264e..7f483deb81 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_UGLY_VERSION = 1.18.5 +GST1_PLUGINS_UGLY_VERSION = 1.18.6 GST1_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST1_PLUGINS_UGLY_VERSION).tar.xz GST1_PLUGINS_UGLY_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-ugly GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING From peter at korsgaard.com Sat Feb 5 14:53:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 15:53:33 +0100 Subject: [Buildroot] [git commit] package/gst1-plugins-base: bump version to 1.18.6 Message-ID: <20220205144955.642418295E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ecdc76a39c89d37a90c2b87ecf62db09de710beb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - removed 0001-gst-libs-gst-video-gstvideoaggregator.c-fix-build-wi.patch (upstream accepted [1], [2]) [1] https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/974 [2] https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/commit/d86cf6314f8f178c59600f55321ce73d4ca95d97.patch Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- ...t-video-gstvideoaggregator.c-fix-build-wi.patch | 45 ---------------------- .../gst1-plugins-base/gst1-plugins-base.hash | 4 +- .../gst1-plugins-base/gst1-plugins-base.mk | 2 +- 3 files changed, 3 insertions(+), 48 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-base/0001-gst-libs-gst-video-gstvideoaggregator.c-fix-build-wi.patch b/package/gstreamer1/gst1-plugins-base/0001-gst-libs-gst-video-gstvideoaggregator.c-fix-build-wi.patch deleted file mode 100644 index 87cd6493f5..0000000000 --- a/package/gstreamer1/gst1-plugins-base/0001-gst-libs-gst-video-gstvideoaggregator.c-fix-build-wi.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 012ca1bcd234ee02f576dd58b1f09baba18b89b0 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 14 Dec 2020 07:42:55 +0100 -Subject: [PATCH] gst-libs/gst/video/gstvideoaggregator.c: fix build with gcc - 4.8 - -Fix the following build failure with gcc 4.8 which has been added with -https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/commit/d268c193ad39fb970351ed62898be806ebd0a71e: - -../gst-libs/gst/video/gstvideoaggregator.c: In function 'gst_video_aggregator_init': -../gst-libs/gst/video/gstvideoaggregator.c:2762:3: error: 'for' loop initial declarations are only allowed in C99 mode - for (gint i = 0; i < gst_caps_get_size (src_template); i++) { - ^ - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/974] ---- - gst-libs/gst/video/gstvideoaggregator.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/gst-libs/gst/video/gstvideoaggregator.c b/gst-libs/gst/video/gstvideoaggregator.c -index 2e3d813be..04dad6563 100644 ---- a/gst-libs/gst/video/gstvideoaggregator.c -+++ b/gst-libs/gst/video/gstvideoaggregator.c -@@ -2786,6 +2786,7 @@ gst_video_aggregator_init (GstVideoAggregator * vagg, - { - GstCaps *src_template; - GstPadTemplate *pad_template; -+ gint i; - - vagg->priv = gst_video_aggregator_get_instance_private (vagg); - vagg->priv->current_caps = NULL; -@@ -2800,7 +2801,7 @@ gst_video_aggregator_init (GstVideoAggregator * vagg, - pad_template = - gst_element_class_get_pad_template (GST_ELEMENT_CLASS (klass), "src"); - src_template = gst_pad_template_get_caps (pad_template); -- for (gint i = 0; i < gst_caps_get_size (src_template); i++) { -+ for (i = 0; i < gst_caps_get_size (src_template); i++) { - const GValue *v = - gst_structure_get_value (gst_caps_get_structure (src_template, i), - "format"); --- -2.29.2 - diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash index 200ba0fe5d..081dc6f213 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.18.5.tar.xz.sha256sum -sha256 960b7af4585700db0fdd5b843554e11e2564fed9e061f591fae88a7be6446fa3 gst-plugins-base-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.18.6.tar.xz.sha256sum +sha256 56a9ff2fe9e6603b9e658cf6897d412a173d2180829fe01e92568549c6bd0f5b gst-plugins-base-1.18.6.tar.xz sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk index 76757fd6a8..c99eeb6c59 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BASE_VERSION = 1.18.5 +GST1_PLUGINS_BASE_VERSION = 1.18.6 GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz GST1_PLUGINS_BASE_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-base GST1_PLUGINS_BASE_INSTALL_STAGING = YES From peter at korsgaard.com Sat Feb 5 14:54:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 15:54:37 +0100 Subject: [Buildroot] [git commit] package/gst1-devtools: bump version to 1.18.6 Message-ID: <20220205144955.8979D82967@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=efd9eac4d7579808caa23ee52a0d9661c8f987be branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-devtools/gst1-devtools.hash | 4 ++-- package/gstreamer1/gst1-devtools/gst1-devtools.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.hash b/package/gstreamer1/gst1-devtools/gst1-devtools.hash index c19254c195..011385e757 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.hash +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.18.5.tar.xz.sha256sum -sha256 fecffc86447daf5c2a06843c757a991d745caa2069446a0d746e99b13f7cb079 gst-devtools-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.18.6.tar.xz.sha256sum +sha256 3725622c740a635452e54b79d065f963ab7706ca2403de6c43072ae7610a0de4 gst-devtools-1.18.6.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 validate/COPYING diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.mk b/package/gstreamer1/gst1-devtools/gst1-devtools.mk index 1c25823953..66b509ae2c 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.mk +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_DEVTOOLS_VERSION = 1.18.5 +GST1_DEVTOOLS_VERSION = 1.18.6 GST1_DEVTOOLS_SOURCE = gst-devtools-$(GST1_DEVTOOLS_VERSION).tar.xz GST1_DEVTOOLS_SITE = https://gstreamer.freedesktop.org/src/gst-devtools GST1_DEVTOOLS_LICENSE = LGPL-2.1+ From peter at korsgaard.com Sat Feb 5 14:55:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 15:55:34 +0100 Subject: [Buildroot] [git commit] package/gst-omx: bump version to 1.18.6 Message-ID: <20220205144955.B1F258295E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ce4bc450007910aa673d0f8356e99c421d20af89 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst-omx/gst-omx.hash | 4 ++-- package/gstreamer1/gst-omx/gst-omx.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst-omx/gst-omx.hash b/package/gstreamer1/gst-omx/gst-omx.hash index 9040393506..47f7cb5893 100644 --- a/package/gstreamer1/gst-omx/gst-omx.hash +++ b/package/gstreamer1/gst-omx/gst-omx.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.18.5.tar.xz.sha256sum -sha256 2cd457c1e8deb1a9b39608048fb36a44f6c9a864a6b6115b1453a32e7be93b42 gst-omx-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.18.6.tar.xz.sha256sum +sha256 b5281c938e959fd2418e989cfb6065fdd9fe5f6f87ee86236c9427166e708163 gst-omx-1.18.6.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst-omx/gst-omx.mk b/package/gstreamer1/gst-omx/gst-omx.mk index f7be1d59ef..dc65509244 100644 --- a/package/gstreamer1/gst-omx/gst-omx.mk +++ b/package/gstreamer1/gst-omx/gst-omx.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST_OMX_VERSION = 1.18.5 +GST_OMX_VERSION = 1.18.6 GST_OMX_SOURCE = gst-omx-$(GST_OMX_VERSION).tar.xz GST_OMX_SITE = https://gstreamer.freedesktop.org/src/gst-omx From peter at korsgaard.com Sat Feb 5 14:54:59 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 15:54:59 +0100 Subject: [Buildroot] [git commit] package/gst1-libav: bump version to 1.18.6 Message-ID: <20220205144955.919D382901@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8de78f3da0cdbc139b876bdeb34079302ce02934 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-libav/gst1-libav.hash | 4 ++-- package/gstreamer1/gst1-libav/gst1-libav.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-libav/gst1-libav.hash b/package/gstreamer1/gst1-libav/gst1-libav.hash index 040a6e33f3..5fb39a0b3e 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.hash +++ b/package/gstreamer1/gst1-libav/gst1-libav.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.18.5.tar.xz.sha256sum -sha256 822e008a910e9dd13aedbdd8dc63fedef4040c0ee2e927bab3112e9de693a548 gst-libav-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.18.6.tar.xz.sha256sum +sha256 e4e50dcd5a29441ae34de60d2221057e8064ed824bb6ca4dc0fd9ee88fbe9b81 gst-libav-1.18.6.tar.xz sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gst1-libav/gst1-libav.mk b/package/gstreamer1/gst1-libav/gst1-libav.mk index 01ec4d2c98..55c6e06e0e 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.mk +++ b/package/gstreamer1/gst1-libav/gst1-libav.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_LIBAV_VERSION = 1.18.5 +GST1_LIBAV_VERSION = 1.18.6 GST1_LIBAV_SOURCE = gst-libav-$(GST1_LIBAV_VERSION).tar.xz GST1_LIBAV_SITE = https://gstreamer.freedesktop.org/src/gst-libav GST1_LIBAV_LICENSE = LGPL-2.0+ From peter at korsgaard.com Sat Feb 5 14:55:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 15:55:09 +0100 Subject: [Buildroot] [git commit] package/gst1-vaapi: bump version to 1.18.6 Message-ID: <20220205144955.9A0F68295E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=aef9027773543fede0cbfa3405f5919e38671dbf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-vaapi/gst1-vaapi.hash | 4 ++-- package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash index b0c19fc600..7e22774c11 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.18.5.tar.xz.sha256sum -sha256 4a460fb95559f41444eb24864ad2d9e37922b6eea941510310319fc3e0ba727b gstreamer-vaapi-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.18.6.tar.xz.sha256sum +sha256 ab6270f1e5e4546fbe6f5ea246d86ca3d196282eb863d46e6cdcc96f867449e0 gstreamer-vaapi-1.18.6.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk index 9810b12cf7..6af851602f 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_VAAPI_VERSION = 1.18.5 +GST1_VAAPI_VERSION = 1.18.6 GST1_VAAPI_SITE = https://gstreamer.freedesktop.org/src/gstreamer-vaapi GST1_VAAPI_SOURCE = gstreamer-vaapi-$(GST1_VAAPI_VERSION).tar.xz GST1_VAAPI_LICENSE = LGPL-2.1+ From peter at korsgaard.com Sat Feb 5 14:55:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 15:55:27 +0100 Subject: [Buildroot] [git commit] package/gstreamer1-editing-services: bump version to 1.18.6 Message-ID: <20220205144955.AA22482901@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=aa87c2e1689b920052ee4a802e24ca342d8f9651 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- .../gstreamer1-editing-services/gstreamer1-editing-services.hash | 4 ++-- .../gstreamer1-editing-services/gstreamer1-editing-services.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash index daaf729c70..e29dc112ce 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash @@ -1,5 +1,5 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.18.5.tar.xz.sha256sum -sha256 8af4a8394d051f3e18280686db49a6efaccc95c0c59a17f0f564e32000590df5 gst-editing-services-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.18.6.tar.xz.sha256sum +sha256 fe10d14ef896aa21038317f6f81e1158ccc6caaed9b0d5a29ae5bdd63074582c gst-editing-services-1.18.6.tar.xz # Hashes for license files: sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk index d3de79c5f6..a3722cbbca 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_EDITING_SERVICES_VERSION = 1.18.5 +GSTREAMER1_EDITING_SERVICES_VERSION = 1.18.6 GSTREAMER1_EDITING_SERVICES_SOURCE = gst-editing-services-$(GSTREAMER1_EDITING_SERVICES_VERSION).tar.xz GSTREAMER1_EDITING_SERVICES_SITE = https://gstreamer.freedesktop.org/src/gstreamer-editing-services GSTREAMER1_EDITING_SERVICES_LICENSE = LGPL-2.0+ From peter at korsgaard.com Sat Feb 5 14:55:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 15:55:19 +0100 Subject: [Buildroot] [git commit] package/gst1-rtsp-server: bump version to 1.18.6 Message-ID: <20220205144955.A1CF582967@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=56c0d7b8867228bb44e76f4bf296e27202d10f13 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash | 4 ++-- package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash index 627a451d04..fadef41351 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash @@ -1,4 +1,4 @@ -# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.18.5.tar.xz.sha256sum -sha256 04d63bf48816c6f41c73f6de0f912a7cef0aab39c44162a7bcece1923dfc9d1f gst-rtsp-server-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.18.6.tar.xz.sha256sum +sha256 826f32afbcf94b823541efcac4a0dacdb62f6145ef58f363095749f440262be9 gst-rtsp-server-1.18.6.tar.xz sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING.LIB diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk index 37942423a5..55403754f3 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_RTSP_SERVER_VERSION = 1.18.5 +GST1_RTSP_SERVER_VERSION = 1.18.6 GST1_RTSP_SERVER_SOURCE = gst-rtsp-server-$(GST1_RTSP_SERVER_VERSION).tar.xz GST1_RTSP_SERVER_SITE = http://gstreamer.freedesktop.org/src/gst-rtsp-server GST1_RTSP_SERVER_LICENSE = LGPL-2.0+ From peter at korsgaard.com Sat Feb 5 14:55:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 15:55:44 +0100 Subject: [Buildroot] [git commit] package/gst1-python: bump version to 1.18.6 Message-ID: <20220205144955.B9B6E82967@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dc66c5901cbc912941f26275aac0f4b3fe6cf596 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-python/gst1-python.hash | 4 ++-- package/gstreamer1/gst1-python/gst1-python.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-python/gst1-python.hash b/package/gstreamer1/gst1-python/gst1-python.hash index 2035c81fea..a760e53e7d 100644 --- a/package/gstreamer1/gst1-python/gst1-python.hash +++ b/package/gstreamer1/gst1-python/gst1-python.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.18.5.tar.xz.sha256sum -sha256 533685871305959d6db89507f3b3aa6c765c2f2b0dacdc32c5a6543e72e5bc52 gst-python-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.18.6.tar.xz.sha256sum +sha256 bdc0ea22fbd7335ad9decc151561aacc53c51206a9735b81eac700ce5b0bbd4a gst-python-1.18.6.tar.xz sha256 ea3ad127610e5ded2210b3a86a46314f2b3b28e438eccffdae19a4d6fbcdb0c2 COPYING diff --git a/package/gstreamer1/gst1-python/gst1-python.mk b/package/gstreamer1/gst1-python/gst1-python.mk index 614cb22396..7faab752cd 100644 --- a/package/gstreamer1/gst1-python/gst1-python.mk +++ b/package/gstreamer1/gst1-python/gst1-python.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PYTHON_VERSION = 1.18.5 +GST1_PYTHON_VERSION = 1.18.6 GST1_PYTHON_SOURCE = gst-python-$(GST1_PYTHON_VERSION).tar.xz GST1_PYTHON_SITE = https://gstreamer.freedesktop.org/src/gst-python GST1_PYTHON_INSTALL_STAGING = YES From peter at korsgaard.com Sat Feb 5 14:54:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 15:54:05 +0100 Subject: [Buildroot] [git commit] package/gst1-plugins-bad: bump version to 1.18.6 Message-ID: <20220205144955.76ACC82901@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ed2f427fd240f539e833919c6ef832c58eb86959 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash | 4 ++-- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash index cbb2729dab..d31a78981e 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.5.tar.xz.sha256sum -sha256 a164923b94f0d08578a6fcaeaac6e0c05da788a46903a1086870e9ca45ad678e gst-plugins-bad-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.6.tar.xz.sha256sum +sha256 0b1b50ac6311f0c510248b6cd64d6d3c94369344828baa602db85ded5bc70ec9 gst-plugins-bad-1.18.6.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index ac00fd59e1..d02ca1ba74 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BAD_VERSION = 1.18.5 +GST1_PLUGINS_BAD_VERSION = 1.18.6 GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz GST1_PLUGINS_BAD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-bad GST1_PLUGINS_BAD_INSTALL_STAGING = YES From fontaine.fabrice at gmail.com Sat Feb 5 14:57:16 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 5 Feb 2022 15:57:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/vim: security bump to version 8.2.4301 Message-ID: <20220205145716.459582-1-fontaine.fabrice@gmail.com> Fix CVE-2022-0393: Out-of-bounds Read in GitHub repository vim/vim prior to 8.2. 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 49056b31cd..36a5842157 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 8770c6308a6c0b0f8b93a4d7202451d195b4efad17787c0306f0be60947732c4 vim-8.2.4224.tar.gz +sha256 8770c6308a6c0b0f8b93a4d7202451d195b4efad17787c0306f0be60947732c4 vim-8.2.4301.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index 74ab1ec584..98a5f153a8 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 8.2.4224 +VIM_VERSION = 8.2.4301 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 Sat Feb 5 14:59:30 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 5 Feb 2022 15:59:30 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/vim: security bump to version 8.2.4301 Message-ID: <20220205145930.460304-1-fontaine.fabrice@gmail.com> Fix CVE-2022-0393: Out-of-bounds Read in GitHub repository vim/vim prior to 8.2. Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2: - Fix tarball hash 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 49056b31cd..fa3ca53cc8 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 8770c6308a6c0b0f8b93a4d7202451d195b4efad17787c0306f0be60947732c4 vim-8.2.4224.tar.gz +sha256 b40b4e341de6b65cdeacd4c816dea8fe5e3b385ee5e17af73fc69c00bd7c440b vim-8.2.4301.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index 74ab1ec584..98a5f153a8 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 8.2.4224 +VIM_VERSION = 8.2.4301 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 Sat Feb 5 15:09:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 16:09:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/bullet: bump to version 3.21 In-Reply-To: <20220126211220.1550407-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 26 Jan 2022 22:12:20 +0100") References: <20220126211220.1550407-1-fontaine.fabrice@gmail.com> Message-ID: <87sfsxtkng.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - Drop patch (already in version) > - Update indentation in hash file (two spaces) > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 15:11:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 16:11:53 +0100 Subject: [Buildroot] [PATCH 1/1] package/meson: bump to version 0.61.1 In-Reply-To: <20220127162100.2629696-1-james.hilliard1@gmail.com> (James Hilliard's message of "Thu, 27 Jan 2022 09:21:00 -0700") References: <20220127162100.2629696-1-james.hilliard1@gmail.com> Message-ID: <87o83ltkjq.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Drop patch that is now upstream. > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 15:13:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 16:13:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/libgeos: bump version to 3.10.2 In-Reply-To: <20220128050013.277864-1-fido_max@inbox.ru> (Maxim Kochetkov's message of "Fri, 28 Jan 2022 08:00:13 +0300") References: <20220128050013.277864-1-fido_max@inbox.ru> Message-ID: <87k0e9tkgu.fsf@dell.be.48ers.dk> >>>>> "Maxim" == Maxim Kochetkov writes: > Changelog: https://github.com/libgeos/geos/blob/3.10.2/NEWS > Signed-off-by: Maxim Kochetkov Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 15:13:52 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 16:13:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/libosmium: bump version to 2.17.3 In-Reply-To: <20220128051332.459202-1-fido_max@inbox.ru> (Maxim Kochetkov's message of "Fri, 28 Jan 2022 08:13:32 +0300") References: <20220128051332.459202-1-fido_max@inbox.ru> Message-ID: <87fsoxtkgf.fsf@dell.be.48ers.dk> >>>>> "Maxim" == Maxim Kochetkov writes: > Release-notes: https://github.com/osmcode/libosmium/releases/tag/v2.17.3 > Signed-off-by: Maxim Kochetkov Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 15:14:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 16:14:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/osm2pgsql: bump version 1.5.2 In-Reply-To: <20220128055910.798614-1-fido_max@inbox.ru> (Maxim Kochetkov via buildroot's message of "Fri, 28 Jan 2022 08:59:10 +0300") References: <20220128055910.798614-1-fido_max@inbox.ru> Message-ID: <87bkzltkfy.fsf@dell.be.48ers.dk> >>>>> "Maxim" == Maxim Kochetkov via buildroot writes: > Release-notes: https://github.com/openstreetmap/osm2pgsql/releases/tag/1.5.2 > Signed-off-by: Maxim Kochetkov Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 15:14:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 16:14:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/keepalived: bump to version 2.2.7 In-Reply-To: <20220128212005.2899314-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 28 Jan 2022 22:20:05 +0100") References: <20220128212005.2899314-1-fontaine.fabrice@gmail.com> Message-ID: <877da9tkf4.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > 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 Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 15:13:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 16:13:34 +0100 Subject: [Buildroot] [git commit] package/libgeos: bump version to 3.10.2 Message-ID: <20220205151113.AC55382981@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=df013c4de64815c283fefadcee05cf63bc339182 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog: https://github.com/libgeos/geos/blob/3.10.2/NEWS Signed-off-by: Maxim Kochetkov Signed-off-by: Peter Korsgaard --- 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 From peter at korsgaard.com Sat Feb 5 15:09:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 16:09:08 +0100 Subject: [Buildroot] [git commit] package/bullet: bump to version 3.21 Message-ID: <20220205151113.994B68295E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7ddbcb76aaa4e88dfe7aef5072aafd95107b7161 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Drop patch (already in version) - Update indentation in hash file (two spaces) Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...ras-VHACD-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(-) 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 From peter at korsgaard.com Sat Feb 5 15:14:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 16:14:03 +0100 Subject: [Buildroot] [git commit] package/osm2pgsql: bump version 1.5.2 Message-ID: <20220205151113.BE38782967@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=714498eb296ff3615c7a1ce92d999d27da97bfb2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release-notes: https://github.com/openstreetmap/osm2pgsql/releases/tag/1.5.2 Signed-off-by: Maxim Kochetkov Signed-off-by: Peter Korsgaard --- 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 From peter at korsgaard.com Sat Feb 5 15:11:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 16:11:42 +0100 Subject: [Buildroot] [git commit] package/meson: bump to version 0.61.1 Message-ID: <20220205151113.A3B4882967@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c2151a3f222854a711f40dc074be2bc9a63630a1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patch that is now upstream. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- ...me-fix-typo-in-vapigen-option-metadatadir.patch | 33 ---------------------- package/meson/meson.hash | 4 +-- package/meson/meson.mk | 2 +- 3 files changed, 3 insertions(+), 36 deletions(-) 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 6c0d1ab08e..ad15e3f91e 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 From peter at korsgaard.com Sat Feb 5 15:13:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 16:13:49 +0100 Subject: [Buildroot] [git commit] package/libosmium: bump version to 2.17.3 Message-ID: <20220205151113.B62428295E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=119f2213068be11905fd769f2caa83212511cc8f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release-notes: https://github.com/osmcode/libosmium/releases/tag/v2.17.3 Signed-off-by: Maxim Kochetkov Signed-off-by: Peter Korsgaard --- 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 From peter at korsgaard.com Sat Feb 5 15:14:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 16:14:35 +0100 Subject: [Buildroot] [git commit] package/keepalived: bump to version 2.2.7 Message-ID: <20220205151113.C6CEC82981@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=79f631000fe6846e72f44810452bb764c228ad44 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Signed-off-by: Peter Korsgaard --- .../0001-core-Fix-compiling-on-RHEL-9.patch | 34 ------------------ ...02-dbus-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(-) 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 From peter at korsgaard.com Sat Feb 5 15:29:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 16:29:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/openlayers: bump to version 6.12.0 In-Reply-To: <20220131094156.166729-1-thomas.claveirole@green-communications.fr> (Thomas Claveirole's message of "Mon, 31 Jan 2022 10:41:56 +0100") References: <20220131094156.166729-1-thomas.claveirole@green-communications.fr> Message-ID: <8735kxtjqr.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Claveirole writes: > Signed-off-by: Thomas Claveirole Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 15:31:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 16:31:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/libgpg-error: add or1k support In-Reply-To: <20220201220626.350423-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 1 Feb 2022 23:06:26 +0100") References: <20220201220626.350423-1-fontaine.fabrice@gmail.com> Message-ID: <87y22ps535.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > or1k is supported since version 1.18 and > https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=commit;h=c143fa81462584ad39ea780908266bce3fb9a49e > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 15:31:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 16:31:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/safeclib: bump to version 3.7.1 In-Reply-To: <20220201222745.411463-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 1 Feb 2022 23:27:45 +0100") References: <20220201222745.411463-1-fontaine.fabrice@gmail.com> Message-ID: <87tudds52j.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Drop patch (already in version) and so autoreconf > https://github.com/rurban/safeclib/blob/v3.7.1/ChangeLog > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 15:32:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 16:32:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/lcms2: bump to version 2.13 In-Reply-To: <20220201223349.424073-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 1 Feb 2022 23:33:49 +0100") References: <20220201223349.424073-1-fontaine.fabrice@gmail.com> Message-ID: <87pmo1s51k.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://littlecms.com/blog/2022/01/28/lcms2-2.13 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 15:28:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 16:28:44 +0100 Subject: [Buildroot] [git commit] package/openlayers: bump to version 6.12.0 Message-ID: <20220205152506.E61C28295E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a9c94d126f5579a68f85584a6ebe1dd20130b39f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Thomas Claveirole Signed-off-by: Peter Korsgaard --- 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 b72d5fcde8..2d6c2fb9d3 100644 --- a/package/openlayers/openlayers.hash +++ b/package/openlayers/openlayers.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 8c4751915808a5a84adcd760fff453429a95993cadf77003ac94eae127240c1a v6.11.0-dist.zip +sha256 aeb8107a23a99d79efb6031c7cf901307b63571c39fd744f771d4a707e06a14f v6.12.0-dist.zip diff --git a/package/openlayers/openlayers.mk b/package/openlayers/openlayers.mk index 1f8b485018..7532bb7f68 100644 --- a/package/openlayers/openlayers.mk +++ b/package/openlayers/openlayers.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENLAYERS_VERSION = 6.11.0 +OPENLAYERS_VERSION = 6.12.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 peter at korsgaard.com Sat Feb 5 15:30:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 16:30:02 +0100 Subject: [Buildroot] [git commit] package/libgpg-error: add or1k support Message-ID: <20220205152506.EECE182967@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d0e519ad3d459e8e38c77216b3d30a4ec383a991 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master or1k is supported since version 1.18 and https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=commit;h=c143fa81462584ad39ea780908266bce3fb9a49e Signed-off-by: Fabrice Fontaine Reviewed-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- package/libgpg-error/Config.in | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/package/libgpg-error/Config.in b/package/libgpg-error/Config.in index 44e9d67aaf..03157dd9fe 100644 --- a/package/libgpg-error/Config.in +++ b/package/libgpg-error/Config.in @@ -2,14 +2,19 @@ config BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS bool # see src/syscfg/ default y if \ - BR2_aarch64 || BR2_aarch64_eb || BR2_arm || \ - BR2_armeb || BR2_i386 || BR2_mips || \ - BR2_mipsel || BR2_mips64 || BR2_mips64el || \ - BR2_m68k || BR2_nios2 || BR2_powerpc || \ - BR2_powerpc64 || BR2_powerpc64le || BR2_RISCV_64 || \ - BR2_RISCV_32 || BR2_s390x || BR2_sh4 || \ - BR2_sh4eb || BR2_sh4a || BR2_sh4aeb || \ - BR2_sparc || BR2_sparc64 || BR2_x86_64 + BR2_aarch64 || BR2_aarch64_eb || \ + BR2_arm || BR2_armeb || \ + BR2_i386 || BR2_mips || \ + BR2_mipsel || BR2_mips64 || \ + BR2_mips64el || BR2_m68k || \ + BR2_nios2 || BR2_or1k || \ + BR2_powerpc || BR2_powerpc64 || \ + BR2_powerpc64le || BR2_RISCV_64 || \ + BR2_RISCV_32 || BR2_s390x || \ + BR2_sh4 || BR2_sh4eb || \ + BR2_sh4a || BR2_sh4aeb || \ + BR2_sparc || BR2_sparc64 || \ + BR2_x86_64 config BR2_PACKAGE_LIBGPG_ERROR bool "libgpg-error" @@ -36,6 +41,8 @@ config BR2_PACKAGE_LIBGPG_ERROR_SYSCFG if BR2_m68k default "nios2-unknown-linux-gnu" \ if BR2_nios2 + default "or1k-unknown-linux-gnu" \ + if BR2_or1k default "powerpc-unknown-linux-gnu" \ if BR2_powerpc default "powerpc64-unknown-linux-gnu" \ From peter at korsgaard.com Sat Feb 5 15:31:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 16:31:51 +0100 Subject: [Buildroot] [git commit] package/lcms2: bump to version 2.13 Message-ID: <20220205152507.0DCD48295E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1e48e5bf0c67295e219a2d7d58213d0a71a5863d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://littlecms.com/blog/2022/01/28/lcms2-2.13 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/lcms2/lcms2.hash | 6 +++--- package/lcms2/lcms2.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/lcms2/lcms2.hash b/package/lcms2/lcms2.hash index 8477610ff0..d3ae1d934f 100644 --- a/package/lcms2/lcms2.hash +++ b/package/lcms2/lcms2.hash @@ -1,5 +1,5 @@ -# From https://sourceforge.net/projects/lcms/files/lcms/2.12 -sha1 3d0c0276fcd3930b80c424512ec0b1ed54ec1497 lcms2-2.12.tar.gz +# From https://sourceforge.net/projects/lcms/files/lcms/2.13 +sha1 1676097fb18fce83c9c876d56828c83a6ad829dd lcms2-2.13.tar.gz # Locally computed: -sha256 18663985e864100455ac3e507625c438c3710354d85e5cbb7cd4043e11fe10f5 lcms2-2.12.tar.gz +sha256 0c67a5cc144029cfa34647a52809ec399aae488db4258a6a66fba318474a070f lcms2-2.13.tar.gz sha256 46d4e05af3bce75332a12d01f19bcce7e32b6bac544be28a64043d0231291e31 COPYING diff --git a/package/lcms2/lcms2.mk b/package/lcms2/lcms2.mk index 49ddccd82b..5a253d044b 100644 --- a/package/lcms2/lcms2.mk +++ b/package/lcms2/lcms2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LCMS2_VERSION = 2.12 +LCMS2_VERSION = 2.13 LCMS2_SITE = http://downloads.sourceforge.net/project/lcms/lcms/$(LCMS2_VERSION) LCMS2_LICENSE = MIT LCMS2_LICENSE_FILES = COPYING From peter at korsgaard.com Sat Feb 5 15:31:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 16:31:20 +0100 Subject: [Buildroot] [git commit] package/safeclib: bump to version 3.7.1 Message-ID: <20220205152507.041DC82981@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cc27267ae41bf44276c63b1e86042c4fae4adf50 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patch (already in version) and so autoreconf https://github.com/rurban/safeclib/blob/v3.7.1/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...configure.ac-add-disable-hardening-option.patch | 63 ---------------------- package/safeclib/safeclib.hash | 4 +- package/safeclib/safeclib.mk | 6 +-- 3 files changed, 4 insertions(+), 69 deletions(-) diff --git a/package/safeclib/0001-configure.ac-add-disable-hardening-option.patch b/package/safeclib/0001-configure.ac-add-disable-hardening-option.patch deleted file mode 100644 index e851fce993..0000000000 --- a/package/safeclib/0001-configure.ac-add-disable-hardening-option.patch +++ /dev/null @@ -1,63 +0,0 @@ -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.hash b/package/safeclib/safeclib.hash index af732f93fd..bca5d86261 100644 --- a/package/safeclib/safeclib.hash +++ b/package/safeclib/safeclib.hash @@ -1,5 +1,5 @@ -# From https://github.com/rurban/safeclib/releases/tag/v02092020 -sha256 d374bdcbfcdc4c9a76abed3707667372ca212fd87a369e7bcaaa54e716d27c0a libsafec-02092020.tar.xz +# From https://github.com/rurban/safeclib/releases/tag/v3.7.1 +sha256 71d3ec970f930bd980f2a41127228eeedfc53749e4c6b203329adc4ff7df32a7 safeclib-3.7.1.tar.xz # Hash for license file sha256 c33e77efd5781e3d59a2bb648c82d2a615035ef0d24cf58880380e3af906510b COPYING diff --git a/package/safeclib/safeclib.mk b/package/safeclib/safeclib.mk index 29ffea7f2e..91b3e26c68 100644 --- a/package/safeclib/safeclib.mk +++ b/package/safeclib/safeclib.mk @@ -4,15 +4,13 @@ # ################################################################################ -SAFECLIB_VERSION = 02092020 +SAFECLIB_VERSION = 3.7.1 SAFECLIB_SITE = \ https://github.com/rurban/safeclib/releases/download/v$(SAFECLIB_VERSION) -SAFECLIB_SOURCE = libsafec-$(SAFECLIB_VERSION).tar.xz +SAFECLIB_SOURCE = safeclib-$(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 From peter at korsgaard.com Sat Feb 5 15:33:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 16:33:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/domoticz: bump to version 2022.01 In-Reply-To: <20220202075228.1187021-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 2 Feb 2022 08:52:28 +0100") References: <20220202075228.1187021-1-fontaine.fabrice@gmail.com> Message-ID: <87leyps500.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://github.com/domoticz/domoticz/blob/2022.1/History.txt > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 15:32:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 16:32:56 +0100 Subject: [Buildroot] [git commit] package/domoticz: bump to version 2022.01 Message-ID: <20220205152654.4BBF78295E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=adca60540f4fd271dda48b9a121986492700e73a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/domoticz/domoticz/blob/2022.1/History.txt Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/domoticz/domoticz.hash | 2 +- package/domoticz/domoticz.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/domoticz/domoticz.hash b/package/domoticz/domoticz.hash index dcd5bead1e..18bf57b7e0 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 b7faf959c4f1dbfec3b0c17ab495f29b3d1437bc2251579c5252be82247e7ff9 domoticz-2022.1-br1.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 License.txt diff --git a/package/domoticz/domoticz.mk b/package/domoticz/domoticz.mk index f142791830..5edc10e8d8 100644 --- a/package/domoticz/domoticz.mk +++ b/package/domoticz/domoticz.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOMOTICZ_VERSION = 2021.1 +DOMOTICZ_VERSION = 2022.1 DOMOTICZ_SITE = https://github.com/domoticz/domoticz DOMOTICZ_SITE_METHOD = git DOMOTICZ_GIT_SUBMODULES = YES From giulio.benetti at benettiengineering.com Sat Feb 5 15:36:29 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 5 Feb 2022 16:36:29 +0100 Subject: [Buildroot] [PATCH] board/pc: fix build failure due to new genimage 15 In-Reply-To: <98670320-83fa-c6e9-9bc4-aa30d9deb6ff@mind.be> References: <98670320-83fa-c6e9-9bc4-aa30d9deb6ff@mind.be> Message-ID: <34C01EB2-BB12-4DE4-BC53-0141B5DF491D@benettiengineering.com> Hi Arnout, > Il giorno 5 feb 2022, alle ore 15:11, Arnout Vandecappelle ha scritto: > > ? Hi Giulio, > >> On 04/02/2022 01:56, Giulio Benetti wrote: >> Actually genimage fails to create final image with: >> ``` >> ERROR: hdimage(disk.img): partition [MBR] (offset 0x1b8, size 0x48) overlaps previous partition boot (offset 0x0, size 0x200) >> ERROR: hdimage(disk.img): bootloaders, etc. that overlap with the partition table must declare the overlapping area as a hole. >> ``` >> This is because genimage 15 is less permissive than before, so let's add >> holes = {"(440; 512)"} to leave room to MBR. >> Fixes: >> https://gitlab.com/buildroot.org/buildroot/-/jobs/1865935249 >> Signed-off-by: Giulio Benetti >> --- >> board/pc/genimage-bios.cfg | 1 + >> 1 file changed, 1 insertion(+) >> diff --git a/board/pc/genimage-bios.cfg b/board/pc/genimage-bios.cfg >> index 26d12d9ab3..54026f6527 100644 >> --- a/board/pc/genimage-bios.cfg >> +++ b/board/pc/genimage-bios.cfg >> @@ -7,6 +7,7 @@ image disk.img { >> image = "boot.img" >> offset = 0 >> size = 512 >> + holes = {"(440; 512)"} > > Have you tested this change on an actual board (i.e. a PC :-)? I?ve tested it with qemu and it boots the kernel correctly(that is in rootfs), only thing is that it can?t mount the rootfs and I don?t understand why. I wanted to ask about this but I?ve got lost among all the other patches :-) Could someone double check if it mounts? Best regards Giulio > > Regards, > Arnout > >> } >> partition grub { > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From peter.macleod.thompson at gmail.com Sat Feb 5 16:05:11 2022 From: peter.macleod.thompson at gmail.com (Peter Thompson) Date: Sat, 5 Feb 2022 09:05:11 -0700 Subject: [Buildroot] [PATCH 1/1] bump version to 2.0.18 Message-ID: <20220205160511.4602-1-peter.macleod.thompson@gmail.com> From: PeterThompson Signed-off-by: PeterThompson --- package/sdl2_ttf/sdl2_ttf.hash | 4 ++-- package/sdl2_ttf/sdl2_ttf.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sdl2_ttf/sdl2_ttf.hash b/package/sdl2_ttf/sdl2_ttf.hash index 16459e4a59..a490b002b6 100644 --- a/package/sdl2_ttf/sdl2_ttf.hash +++ b/package/sdl2_ttf/sdl2_ttf.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a9eceb1ad88c1f1545cd7bd28e7cbc0b2c14191d40238f531a15b01b1b22cd33 SDL2_ttf-2.0.15.tar.gz -sha256 f6370809c9f644760920d9945c5be07aed17664975f2e4741013d4d9a2ec696f COPYING.txt +sha256 7234eb8883514e019e7747c703e4a774575b18d435c22a4a29d068cb768a2251 SDL2_ttf-2.0.18.tar.gz +sha256 e211dfe7e2c36e64048be886fe3f2bbba8732ce4dd77b596a355d3abbec775a4 COPYING.txt diff --git a/package/sdl2_ttf/sdl2_ttf.mk b/package/sdl2_ttf/sdl2_ttf.mk index 326cb99366..1fe7c0a075 100644 --- a/package/sdl2_ttf/sdl2_ttf.mk +++ b/package/sdl2_ttf/sdl2_ttf.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_TTF_VERSION = 2.0.15 +SDL2_TTF_VERSION = 2.0.18 SDL2_TTF_SOURCE = SDL2_ttf-$(SDL2_TTF_VERSION).tar.gz SDL2_TTF_SITE = http://www.libsdl.org/projects/SDL_ttf/release SDL2_TTF_LICENSE = Zlib -- 2.20.1 From yegorslists at googlemail.com Sat Feb 5 16:48:26 2022 From: yegorslists at googlemail.com (Yegor Yefremov) Date: Sat, 5 Feb 2022 17:48:26 +0100 Subject: [Buildroot] [PATCH 1/1] bump version to 2.0.18 In-Reply-To: <20220205160511.4602-1-peter.macleod.thompson@gmail.com> References: <20220205160511.4602-1-peter.macleod.thompson@gmail.com> Message-ID: Hi Peter, On Sat, Feb 5, 2022 at 5:05 PM Peter Thompson wrote: > > From: PeterThompson > > Signed-off-by: PeterThompson > --- > package/sdl2_ttf/sdl2_ttf.hash | 4 ++-- > package/sdl2_ttf/sdl2_ttf.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/sdl2_ttf/sdl2_ttf.hash b/package/sdl2_ttf/sdl2_ttf.hash > index 16459e4a59..a490b002b6 100644 > --- a/package/sdl2_ttf/sdl2_ttf.hash > +++ b/package/sdl2_ttf/sdl2_ttf.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 a9eceb1ad88c1f1545cd7bd28e7cbc0b2c14191d40238f531a15b01b1b22cd33 SDL2_ttf-2.0.15.tar.gz > -sha256 f6370809c9f644760920d9945c5be07aed17664975f2e4741013d4d9a2ec696f COPYING.txt > +sha256 7234eb8883514e019e7747c703e4a774575b18d435c22a4a29d068cb768a2251 SDL2_ttf-2.0.18.tar.gz > +sha256 e211dfe7e2c36e64048be886fe3f2bbba8732ce4dd77b596a355d3abbec775a4 COPYING.txt > diff --git a/package/sdl2_ttf/sdl2_ttf.mk b/package/sdl2_ttf/sdl2_ttf.mk > index 326cb99366..1fe7c0a075 100644 > --- a/package/sdl2_ttf/sdl2_ttf.mk > +++ b/package/sdl2_ttf/sdl2_ttf.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -SDL2_TTF_VERSION = 2.0.15 > +SDL2_TTF_VERSION = 2.0.18 > SDL2_TTF_SOURCE = SDL2_ttf-$(SDL2_TTF_VERSION).tar.gz > SDL2_TTF_SITE = http://www.libsdl.org/projects/SDL_ttf/release > SDL2_TTF_LICENSE = Zlib Package name is missing from the patch subject. Regards, Yegor From peter at korsgaard.com Sat Feb 5 17:21:25 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 18:21:25 +0100 Subject: [Buildroot] [PATCH] pacakge/glib-networking: bump to version 2.70.0 In-Reply-To: <20220202112528.7778-1-thomas.devoogdt@barco.com> (Thomas Devoogdt's message of "Wed, 2 Feb 2022 12:25:28 +0100") References: <20220202112528.7778-1-thomas.devoogdt@barco.com> Message-ID: <87h79drzze.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Devoogdt writes: > From: Thomas Devoogdt > PKCS#11 is required if gnutls is used: > https://gitlab.gnome.org/GNOME/glib-networking/-/commit/9b3d30e40f306f0e36e2a396d3b6df1edeea9f21 > Older compilers require c_std=gnu99: > https://gitlab.gnome.org/GNOME/glib-networking/-/commit/b192086b9936602a40a14d00a6883b339b9d7955 > Signed-off-by: Thomas Devoogdt Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 17:21:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 18:21:35 +0100 Subject: [Buildroot] [git commit] package/glib-networking: bump to version 2.70.0 Message-ID: <20220205171500.6E78782211@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=53fa10f4c91598d49c37b30ddce84daaf7d50216 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master PKCS#11 is required if gnutls is used: https://gitlab.gnome.org/GNOME/glib-networking/-/commit/9b3d30e40f306f0e36e2a396d3b6df1edeea9f21 Add an upstream patch to fix compilation with older compilers: https://gitlab.gnome.org/GNOME/glib-networking/-/commit/b192086b9936602a40a14d00a6883b339b9d7955 Signed-off-by: Thomas Devoogdt Reviewed-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard --- .../0001-meson-change-std-to-gnu99.patch | 30 ++++++++++++++++++++++ package/glib-networking/Config.in | 1 + package/glib-networking/glib-networking.hash | 4 +-- package/glib-networking/glib-networking.mk | 2 +- 4 files changed, 34 insertions(+), 3 deletions(-) diff --git a/package/glib-networking/0001-meson-change-std-to-gnu99.patch b/package/glib-networking/0001-meson-change-std-to-gnu99.patch new file mode 100644 index 0000000000..9f266bc2c8 --- /dev/null +++ b/package/glib-networking/0001-meson-change-std-to-gnu99.patch @@ -0,0 +1,30 @@ +From cdfa726bae1d82b7bd3735475fc2b2c6a31c1d2f Mon Sep 17 00:00:00 2001 +From: Ignacio Casal Quinteiro +Date: Fri, 12 Nov 2021 11:51:33 +0100 +Subject: [PATCH] meson: change std to gnu99 + +This is the same as glib and should fix issues with old +compilers + +(cherry picked from commit b192086b9936602a40a14d00a6883b339b9d7955) +Signed-off-by: Thomas Devoogdt +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index b018ca7b..130a2bf0 100644 +--- a/meson.build ++++ b/meson.build +@@ -3,7 +3,7 @@ project( + version: '2.70.0', + license: 'LGPL2.1+', + meson_version: '>= 0.50.0', +- default_options: ['c_std=c99'] ++ default_options: ['c_std=gnu99'] + ) + + prefix = get_option('prefix') +-- +2.17.1 + diff --git a/package/glib-networking/Config.in b/package/glib-networking/Config.in index 22331255f7..38cded5e6b 100644 --- a/package/glib-networking/Config.in +++ b/package/glib-networking/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_GLIB_NETWORKING depends on !BR2_STATIC_LIBS select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_GNUTLS + select BR2_PACKAGE_P11_KIT if BR2_PACKAGE_GNUTLS help Network-related GIO modules for glib. diff --git a/package/glib-networking/glib-networking.hash b/package/glib-networking/glib-networking.hash index 976a19f25e..6a53b436b0 100644 --- a/package/glib-networking/glib-networking.hash +++ b/package/glib-networking/glib-networking.hash @@ -1,3 +1,3 @@ -# From http://ftp.gnome.org/pub/gnome/sources/glib-networking/2.66/glib-networking-2.66.0.sha256sum -sha256 c5d7be2437fdd196eebfb70c4517b96d3ba7ec13bd496318b8f02dea383e0099 glib-networking-2.66.0.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/glib-networking/2.70/glib-networking-2.70.0.sha256sum +sha256 66b408e7afa86c582fe38963db56133869ab4b57d34e48ec56aba621940d6f35 glib-networking-2.70.0.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/glib-networking/glib-networking.mk b/package/glib-networking/glib-networking.mk index 65630c7fed..53280700bc 100644 --- a/package/glib-networking/glib-networking.mk +++ b/package/glib-networking/glib-networking.mk @@ -4,7 +4,7 @@ # ################################################################################ -GLIB_NETWORKING_VERSION_MAJOR = 2.66 +GLIB_NETWORKING_VERSION_MAJOR = 2.70 GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_VERSION_MAJOR).0 GLIB_NETWORKING_SITE = http://ftp.gnome.org/pub/gnome/sources/glib-networking/$(GLIB_NETWORKING_VERSION_MAJOR) GLIB_NETWORKING_SOURCE = glib-networking-$(GLIB_NETWORKING_VERSION).tar.xz From peter at korsgaard.com Sat Feb 5 17:24:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 18:24:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/libgeotiff: bump to version 1.7.0 In-Reply-To: <20220205141132.419654-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 5 Feb 2022 15:11:32 +0100") References: <20220205141132.419654-1-fontaine.fabrice@gmail.com> Message-ID: <87czk1rzux.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://github.com/OSGeo/libgeotiff/releases/tag/1.7.0 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 17:24:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 18:24:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/tiff: fix CVE-2022-22844 In-Reply-To: <20220205141448.420553-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 5 Feb 2022 15:14:48 +0100") References: <20220205141448.420553-1-fontaine.fabrice@gmail.com> Message-ID: <878ruprzu8.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > LibTIFF 4.3.0 has an out-of-bounds read in _TIFFmemcpy in tif_unix.c in > certain situations involving a custom tag and 0x0200 as the second word > of the DE field. > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From giulio.benetti at benettiengineering.com Sat Feb 5 17:26:21 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 5 Feb 2022 18:26:21 +0100 Subject: [Buildroot] [PATCH] configs/orangepi_zero_defconfig: switch to extlinux In-Reply-To: <20220205072801.13567-1-kuzminov.sergey81@gmail.com> References: <20220205072801.13567-1-kuzminov.sergey81@gmail.com> Message-ID: <6e5f8adf-30a2-797e-f01b-4536ebc916ab@benettiengineering.com> Hi Sergey, On 05/02/22 08:28, Sergey Kuzminov wrote: > Changes: > - Exclude FAT partition, he is no longer needed for U-Boot. typo s/he/it > - Switch the rootfs partition from MBR to GPT for partition-uuid to work. > - Switch to extlinux, this is convenient for debugging. > - Create common scenarios for multiple boards to create an SD image: board/orangepi/common. > > Signed-off-by: Sergey Kuzminov > --- > board/orangepi/common/extlinux.conf | 5 ++++ > board/orangepi/common/genimage.cfg | 23 +++++++++++++++ > board/orangepi/common/post-build.sh | 34 +++++++++++++++++++++ > board/orangepi/orangepi-zero/boot.cmd | 9 ------ > board/orangepi/orangepi-zero/genimage.cfg | 36 ----------------------- > configs/orangepi_zero_defconfig | 11 ++++--- > 6 files changed, 67 insertions(+), 51 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 > 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 Here ^^^ you've left a commented line, I guess the correct one is the second one, right? Or anyway you can only keep one. > diff --git a/board/orangepi/common/genimage.cfg b/board/orangepi/common/genimage.cfg > new file mode 100644 > index 0000000000..fa0d988991 > --- /dev/null > +++ b/board/orangepi/common/genimage.cfg > @@ -0,0 +1,23 @@ > +image sdcard.img { > + partition u-boot { > + in-partition-table = false > + image = "u-boot-sunxi-with-spl.bin" > + offset = 8K > + size = 1000K # 1MB - 8KB(offset) - 16KB(GPT) > + } > + > + hdimage { > + partition-table-type = gpt > + gpt-location = 1008K # 1MB - 16KB(GPT) > + gpt-no-backup = true > + # After writing the image to the SD card, > + # backup GPT data structures at the end of the disk: > + # gdisk /dev/mmcblk0 then press the buttons: x, e, w, y > + } > + > + 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/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 5aaa1566c5..96f0c3f600 100644 > --- a/configs/orangepi_zero_defconfig > +++ b/configs/orangepi_zero_defconfig > @@ -20,10 +20,13 @@ 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_NEEDS_HOST_OPENSSL=y > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > > # Filesystem > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="63M" > +BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y It's worth mentioning this change ^^^ in commit log > # BR2_TARGET_ROOTFS_TAR is not set > > # Bootloader > @@ -39,16 +42,12 @@ 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 > > # 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" > > # Wireless driver and firmware > BR2_PACKAGE_XR819_XRADIO=y I've built it successfully locally so: Tested-by: Giulio Benetti and with the corrected commit log you can send V2 with ^^^ and also: Reviewed-by: Giulio Benetti Best regards -- Giulio Benetti Benetti Engineering sas From peter at korsgaard.com Sat Feb 5 17:28:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 18:28:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/cryptopp: needs C++ In-Reply-To: <20220205143043.427517-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 5 Feb 2022 15:30:43 +0100") References: <20220205143043.427517-1-fontaine.fabrice@gmail.com> Message-ID: <874k5drzoc.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure raised since commit > bf4cf9de833e2d571d98d1ca935ea08a3468e463: > no -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O2 -g0 -D_FORTIFY_SOURCE=1 -fPIC -DCRYPTOPP_DISABLE_ARM_NEON -c cryptlib.cpp > make[1]: no: Command not found > Fixes: > - http://autobuild.buildroot.org/results/fa90b416a219a512a482e7dc63e2d72b184307c7 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 17:28:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Feb 2022 18:28:30 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/vim: security bump to version 8.2.4301 In-Reply-To: <20220205145930.460304-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 5 Feb 2022 15:59:30 +0100") References: <20220205145930.460304-1-fontaine.fabrice@gmail.com> Message-ID: <87zgn5ql35.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2022-0393: Out-of-bounds Read in GitHub repository vim/vim prior > to 8.2. > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2: > - Fix tarball hash Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 5 17:23:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 18:23:22 +0100 Subject: [Buildroot] [git commit] package/libgeotiff: bump to version 1.7.0 Message-ID: <20220205172122.67374827A2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9229054bd54e49d868a5403401d407605297bfb6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/OSGeo/libgeotiff/releases/tag/1.7.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libgeotiff/libgeotiff.hash | 2 +- package/libgeotiff/libgeotiff.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libgeotiff/libgeotiff.hash b/package/libgeotiff/libgeotiff.hash index 51adcc2843..ec9fccb492 100644 --- a/package/libgeotiff/libgeotiff.hash +++ b/package/libgeotiff/libgeotiff.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 9311017e5284cffb86f2c7b7a9df1fb5ebcdc61c30468fb2e6bca36e4272ebca libgeotiff-1.6.0.tar.gz +sha256 fc304d8839ca5947cfbeb63adb9d1aa47acef38fc6d6689e622926e672a99a7e libgeotiff-1.7.0.tar.gz sha256 6a22340b8293c50a34ce8e95589489bd3ec65bcb8b93e61cbda3daaafe498375 LICENSE diff --git a/package/libgeotiff/libgeotiff.mk b/package/libgeotiff/libgeotiff.mk index c6fb61b4a2..c49528565d 100644 --- a/package/libgeotiff/libgeotiff.mk +++ b/package/libgeotiff/libgeotiff.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGEOTIFF_VERSION = 1.6.0 +LIBGEOTIFF_VERSION = 1.7.0 LIBGEOTIFF_SITE = http://download.osgeo.org/geotiff/libgeotiff LIBGEOTIFF_LICENSE = X11-style, public domain LIBGEOTIFF_LICENSE_FILES = LICENSE From peter at korsgaard.com Sat Feb 5 17:28:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 18:28:20 +0100 Subject: [Buildroot] [git commit] package/vim: security bump to version 8.2.4301 Message-ID: <20220205172122.81771827A2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=18a19c985f3363510d8ae317e66d53680475db26 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2022-0393: Out-of-bounds Read in GitHub repository vim/vim prior to 8.2. Signed-off-by: Fabrice Fontaine 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 49056b31cd..fa3ca53cc8 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 8770c6308a6c0b0f8b93a4d7202451d195b4efad17787c0306f0be60947732c4 vim-8.2.4224.tar.gz +sha256 b40b4e341de6b65cdeacd4c816dea8fe5e3b385ee5e17af73fc69c00bd7c440b vim-8.2.4301.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index 74ab1ec584..98a5f153a8 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 8.2.4224 +VIM_VERSION = 8.2.4301 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src From peter at korsgaard.com Sat Feb 5 17:24:14 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 18:24:14 +0100 Subject: [Buildroot] [git commit] package/tiff: fix CVE-2022-22844 Message-ID: <20220205172122.6F60A82A80@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7ec5f99b3a00a1ec4dd6677a0ee6418267ffba25 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master LibTIFF 4.3.0 has an out-of-bounds read in _TIFFmemcpy in tif_unix.c in certain situations involving a custom tag and 0x0200 as the second word of the DE field. Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...fix-global-buffer-overflow-for-ASCII-tags.patch | 43 ++++++++++++++++++++++ package/tiff/tiff.mk | 4 ++ 2 files changed, 47 insertions(+) diff --git a/package/tiff/0001-tiffset-fix-global-buffer-overflow-for-ASCII-tags.patch b/package/tiff/0001-tiffset-fix-global-buffer-overflow-for-ASCII-tags.patch new file mode 100644 index 0000000000..ba1487782e --- /dev/null +++ b/package/tiff/0001-tiffset-fix-global-buffer-overflow-for-ASCII-tags.patch @@ -0,0 +1,43 @@ +From 03047a26952a82daaa0792957ce211e0aa51bc64 Mon Sep 17 00:00:00 2001 +From: 4ugustus +Date: Tue, 25 Jan 2022 16:25:28 +0000 +Subject: [PATCH] tiffset: fix global-buffer-overflow for ASCII tags where + count is required (fixes #355) + +[Retrieved from: +https://gitlab.com/libtiff/libtiff/-/commit/03047a26952a82daaa0792957ce211e0aa51bc64] +Signed-off-by: Fabrice Fontaine +--- + tools/tiffset.c | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) + +diff --git a/tools/tiffset.c b/tools/tiffset.c +index 8c9e23c5..e7a88c09 100644 +--- a/tools/tiffset.c ++++ b/tools/tiffset.c +@@ -146,9 +146,19 @@ main(int argc, char* argv[]) + + arg_index++; + if (TIFFFieldDataType(fip) == TIFF_ASCII) { +- if (TIFFSetField(tiff, TIFFFieldTag(fip), argv[arg_index]) != 1) +- fprintf( stderr, "Failed to set %s=%s\n", +- TIFFFieldName(fip), argv[arg_index] ); ++ if(TIFFFieldPassCount( fip )) { ++ size_t len; ++ len = strlen(argv[arg_index]) + 1; ++ if (len > UINT16_MAX || TIFFSetField(tiff, TIFFFieldTag(fip), ++ (uint16_t)len, argv[arg_index]) != 1) ++ fprintf( stderr, "Failed to set %s=%s\n", ++ TIFFFieldName(fip), argv[arg_index] ); ++ } else { ++ if (TIFFSetField(tiff, TIFFFieldTag(fip), ++ argv[arg_index]) != 1) ++ fprintf( stderr, "Failed to set %s=%s\n", ++ TIFFFieldName(fip), argv[arg_index] ); ++ } + } else if (TIFFFieldWriteCount(fip) > 0 + || TIFFFieldWriteCount(fip) == TIFF_VARIABLE) { + int ret = 1; +-- +GitLab + diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index f6c6de12c5..f80ab7ac55 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -11,6 +11,10 @@ TIFF_LICENSE_FILES = COPYRIGHT TIFF_CPE_ID_VENDOR = libtiff TIFF_CPE_ID_PRODUCT = libtiff TIFF_INSTALL_STAGING = YES + +# 0001-tiffset-fix-global-buffer-overflow-for-ASCII-tags.patch +TIFF_IGNORE_CVES += CVE-2022-22844 + TIFF_CONF_OPTS = \ --disable-cxx \ --without-x From peter at korsgaard.com Sat Feb 5 17:26:59 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Feb 2022 18:26:59 +0100 Subject: [Buildroot] [git commit] package/cryptopp: needs C++ Message-ID: <20220205172122.7813682A81@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=403892137cbf134f729834b98ede008760b8c4f0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since commit bf4cf9de833e2d571d98d1ca935ea08a3468e463: no -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O2 -g0 -D_FORTIFY_SOURCE=1 -fPIC -DCRYPTOPP_DISABLE_ARM_NEON -c cryptlib.cpp make[1]: no: Command not found Fixes: - http://autobuild.buildroot.org/results/fa90b416a219a512a482e7dc63e2d72b184307c7 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/cryptopp/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/cryptopp/Config.in b/package/cryptopp/Config.in index feb945db2f..1648a73f9d 100644 --- a/package/cryptopp/Config.in +++ b/package/cryptopp/Config.in @@ -1,9 +1,11 @@ config BR2_PACKAGE_CRYPTOPP bool "cryptopp" + depends on BR2_INSTALL_LIBSTDCPP 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, wchar" - depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR +comment "cryptopp needs a toolchain w/ C++, dynamic library, wchar" + depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ + !BR2_USE_WCHAR From giulio.benetti at benettiengineering.com Sat Feb 5 17:40:11 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 5 Feb 2022 18:40:11 +0100 Subject: [Buildroot] [PATCH] board/pc: fix build failure due to new genimage 15 In-Reply-To: <34C01EB2-BB12-4DE4-BC53-0141B5DF491D@benettiengineering.com> References: <98670320-83fa-c6e9-9bc4-aa30d9deb6ff@mind.be> <34C01EB2-BB12-4DE4-BC53-0141B5DF491D@benettiengineering.com> Message-ID: Hi again Arnout, On 05/02/22 16:36, Giulio Benetti wrote: > Hi Arnout, > >> Il giorno 5 feb 2022, alle ore 15:11, Arnout Vandecappelle ha scritto: >> >> ? Hi Giulio, >> >>> On 04/02/2022 01:56, Giulio Benetti wrote: >>> Actually genimage fails to create final image with: >>> ``` >>> ERROR: hdimage(disk.img): partition [MBR] (offset 0x1b8, size 0x48) overlaps previous partition boot (offset 0x0, size 0x200) >>> ERROR: hdimage(disk.img): bootloaders, etc. that overlap with the partition table must declare the overlapping area as a hole. >>> ``` >>> This is because genimage 15 is less permissive than before, so let's add >>> holes = {"(440; 512)"} to leave room to MBR. >>> Fixes: >>> https://gitlab.com/buildroot.org/buildroot/-/jobs/1865935249 >>> Signed-off-by: Giulio Benetti >>> --- >>> board/pc/genimage-bios.cfg | 1 + >>> 1 file changed, 1 insertion(+) >>> diff --git a/board/pc/genimage-bios.cfg b/board/pc/genimage-bios.cfg >>> index 26d12d9ab3..54026f6527 100644 >>> --- a/board/pc/genimage-bios.cfg >>> +++ b/board/pc/genimage-bios.cfg >>> @@ -7,6 +7,7 @@ image disk.img { >>> image = "boot.img" >>> offset = 0 >>> size = 512 >>> + holes = {"(440; 512)"} >> >> Have you tested this change on an actual board (i.e. a PC :-)? > > I?ve tested it with qemu and it boots the kernel correctly(that is in rootfs), only thing is that it can?t mount the rootfs and I don?t understand why. > I wanted to ask about this but I?ve got lost among all the other patches :-) I've compared the 2 disk.img files, one generated with genimage 14 without "holes..." and the other generated with genimage 15 and they are the same. The problem here is not that it can't mount using qemu, but it doesn't show the shell. Here is the qemu command: qemu-system-x86_64 -M pc -drive file=images/disk.img,if=virtio,format=raw -net nic,model=virtio -net user and this is the output: https://imgur.com/a/ffZBlJR So it seems like a busybox/init system issue with tty1. I'm digging. Best regards -- Giulio Benetti Benetti Engineering sas > Could someone double check if it mounts? > > Best regards > Giulio > >> >> Regards, >> Arnout >> >>> } >>> partition grub { >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From bernd.kuhls at t-online.de Sat Feb 5 17:40:46 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 5 Feb 2022 18:40:46 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/libldns: enable dane-verify for OpenSSL Message-ID: <20220205174046.1850152-1-bernd.kuhls@t-online.de> Since the bump of libopenssl to 1.1.x support for offline DANE verification can be enabled. Signed-off-by: Bernd Kuhls --- v2: enable only for libopenssl, libressl does not support SSL_get0_dane (Peter) package/libldns/libldns.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/package/libldns/libldns.mk b/package/libldns/libldns.mk index 7deca978da..86e7c0eafc 100644 --- a/package/libldns/libldns.mk +++ b/package/libldns/libldns.mk @@ -13,11 +13,9 @@ LIBLDNS_CPE_ID_VENDOR = nlnetlabs LIBLDNS_CPE_ID_PRODUCT = ldns LIBLDNS_INSTALL_STAGING = YES LIBLDNS_DEPENDENCIES = openssl -# --disable-dane-verify can be removed after openssl bump to 1.1.x LIBLDNS_CONF_OPTS = \ --with-ssl=$(STAGING_DIR)/usr \ --enable-dane \ - --disable-dane-verify \ --enable-ecdsa \ --enable-gost \ --enable-sha2 \ @@ -26,6 +24,12 @@ LIBLDNS_CONF_OPTS = \ --without-pyldns \ --without-pyldnsx +ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) +LIBLDNS_CONF_OPTS += --enable-dane-verify +else +LIBLDNS_CONF_OPTS += --disable-dane-verify +endif + ifeq ($(BR2_STATIC_LIBS),y) LIBLDNS_DEPENDENCIES += host-pkgconf # missing -lz breaks configure, add it using pkgconf -- 2.30.2 From bernd.kuhls at t-online.de Sat Feb 5 18:08:16 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 5 Feb 2022 19:08:16 +0100 Subject: [Buildroot] [PATCH 2/3] package/dht: new package In-Reply-To: <20220205180817.2103343-1-bernd.kuhls@t-online.de> References: <20220205180817.2103343-1-bernd.kuhls@t-online.de> Message-ID: <20220205180817.2103343-2-bernd.kuhls@t-online.de> Needed for upcoming version bump of transmission. Signed-off-by: Bernd Kuhls --- Build test using this defconfig BR2_PACKAGE_DHT=y was successful: 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]: 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]: OK br-arm-full-nothread [29/45]: OK br-arm-full-static [30/45]: OK br-i386-pentium4-full [31/45]: OK br-i386-pentium-mmx-musl [32/45]: OK br-mips64-n64-full [33/45]: OK br-mips64r6-el-hf-glibc [34/45]: OK br-powerpc-603e-basic-cpp [35/45]: OK br-powerpc64-power7-glibc [36/45]: OK linaro-aarch64-be [37/45]: OK linaro-aarch64 [38/45]: OK linaro-arm [39/45]: OK sourcery-arm-armv4t [40/45]: OK sourcery-arm [41/45]: OK sourcery-arm-thumb2 [42/45]: OK sourcery-mips64 [43/45]: OK sourcery-mips [44/45]: OK sourcery-nios2 [45/45]: OK 45 builds, 0 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed DEVELOPERS | 1 + package/Config.in | 1 + package/dht/0001-cmake.patch | 67 ++++++++++++++++++++++++++++++++++++ package/dht/Config.in | 6 ++++ package/dht/dht.hash | 3 ++ package/dht/dht.mk | 13 +++++++ 6 files changed, 91 insertions(+) create mode 100644 package/dht/0001-cmake.patch create mode 100644 package/dht/Config.in create mode 100644 package/dht/dht.hash create mode 100644 package/dht/dht.mk diff --git a/DEVELOPERS b/DEVELOPERS index 70021ef823..c4084c5545 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -325,6 +325,7 @@ F: package/bluez-tools/ F: package/boinc/ F: package/clamav/ F: package/dav1d/ +F: package/dht/ F: package/dovecot/ F: package/dovecot-pigeonhole/ F: package/dtv-scan-tables/ diff --git a/package/Config.in b/package/Config.in index 52a8ff8fe3..990ee19665 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1798,6 +1798,7 @@ menu "Networking" source "package/daq/Config.in" source "package/daq3/Config.in" source "package/davici/Config.in" + source "package/dht/Config.in" source "package/enet/Config.in" source "package/filemq/Config.in" source "package/flickcurl/Config.in" diff --git a/package/dht/0001-cmake.patch b/package/dht/0001-cmake.patch new file mode 100644 index 0000000000..bbac639044 --- /dev/null +++ b/package/dht/0001-cmake.patch @@ -0,0 +1,67 @@ +From 25e12bb39eea3d433602de6390796fec8a8f3620 Mon Sep 17 00:00:00 2001 +From: Mike Gelfand +Date: Sun, 1 Jan 2017 16:23:21 +0300 +Subject: [PATCH] Remove Makefile, add Makefile.am and CMakeLists.txt + +Downloaded from transmission repo: +https://github.com/transmission/dht/commit/25e12bb39eea3d433602de6390796fec8a8f3620 + +Upstream status: rejected (https://github.com/jech/dht/pull/19) + +Signed-off-by: Bernd Kuhls +--- + CMakeLists.txt | 9 +++++++++ + Makefile | 9 --------- + Makefile.am | 11 +++++++++++ + 3 files changed, 20 insertions(+), 9 deletions(-) + create mode 100644 CMakeLists.txt + delete mode 100644 Makefile + create mode 100644 Makefile.am + +diff --git a/CMakeLists.txt b/CMakeLists.txt +new file mode 100644 +index 0000000..6d4aa99 +--- /dev/null ++++ b/CMakeLists.txt +@@ -0,0 +1,9 @@ ++cmake_minimum_required(VERSION 2.8) ++project(dht C) ++ ++add_library(${PROJECT_NAME} STATIC ++ dht.c ++) ++ ++install(TARGETS ${PROJECT_NAME} DESTINATION lib) ++install(FILES dht.h DESTINATION include/dht) +diff --git a/Makefile b/Makefile +deleted file mode 100644 +index e012945..0000000 +--- a/Makefile ++++ /dev/null +@@ -1,9 +0,0 @@ +-CFLAGS = -g -Wall +-LDLIBS = -lcrypt +- +-dht-example: dht-example.o dht.o +- +-all: dht-example +- +-clean: +- -rm -f dht-example dht-example.o dht-example.id dht.o *~ core +diff --git a/Makefile.am b/Makefile.am +new file mode 100644 +index 0000000..2dba648 +--- /dev/null ++++ b/Makefile.am +@@ -0,0 +1,11 @@ ++AM_CFLAGS = @PTHREAD_CFLAGS@ ++ ++noinst_LIBRARIES = libdht.a ++libdht_a_SOURCES = dht.c ++libdht_a_DEPENDENCIES = $(builddir)/include/dht ++noinst_HEADERS = dht.h ++EXTRA_DIST = CHANGES CMakeLists.txt dht-example.c LICENCE README ++ ++$(builddir)/include/dht: ++ $(MKDIR_P) $(builddir)/include ++ (cd $(builddir)/include && $(LN_S) $(abs_srcdir) dht) diff --git a/package/dht/Config.in b/package/dht/Config.in new file mode 100644 index 0000000000..7660295c8d --- /dev/null +++ b/package/dht/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_DHT + bool "dht" + help + BitTorrent DHT library + + https://www.irif.fr/~jch/software/bittorrent diff --git a/package/dht/dht.hash b/package/dht/dht.hash new file mode 100644 index 0000000000..0f5d5c1758 --- /dev/null +++ b/package/dht/dht.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 3873d54b786cf74090672ed6f786b82510ae375d5a8d8f4d99314e358d898baa dht-0.26.tar.gz +sha256 06ce07293caf8c8ddfaf47797ad1fb18d1c040a8375231d8f8a6105cef51a8e6 LICENCE diff --git a/package/dht/dht.mk b/package/dht/dht.mk new file mode 100644 index 0000000000..0fa4ed9e6a --- /dev/null +++ b/package/dht/dht.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# dht +# +################################################################################ + +DHT_VERSION = 0.26 +DHT_SITE = $(call github,jech,dht,dht-$(DHT_VERSION)) +DHT_LICENSE = MIT +DHT_LICENSE_FILES = LICENCE +DHT_INSTALL_STAGING = YES + +$(eval $(cmake-package)) -- 2.30.2 From bernd.kuhls at t-online.de Sat Feb 5 18:08:15 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 5 Feb 2022 19:08:15 +0100 Subject: [Buildroot] [PATCH 1/3] package/libdeflate: new package Message-ID: <20220205180817.2103343-1-bernd.kuhls@t-online.de> Needed for upcoming version bump of transmission: https://github.com/transmission/transmission/commit/d8d765c59551b97ffb10bedb6f66133a54954a0e Signed-off-by: Bernd Kuhls --- Build test using this defconfig BR2_PACKAGE_LIBDEFLATE=y was successful: 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]: 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]: OK br-arm-full-nothread [29/45]: OK br-arm-full-static [30/45]: OK br-i386-pentium4-full [31/45]: OK br-i386-pentium-mmx-musl [32/45]: OK br-mips64-n64-full [33/45]: OK br-mips64r6-el-hf-glibc [34/45]: OK br-powerpc-603e-basic-cpp [35/45]: OK br-powerpc64-power7-glibc [36/45]: OK linaro-aarch64-be [37/45]: OK linaro-aarch64 [38/45]: OK linaro-arm [39/45]: OK sourcery-arm-armv4t [40/45]: OK sourcery-arm [41/45]: OK sourcery-arm-thumb2 [42/45]: OK sourcery-mips64 [43/45]: OK sourcery-mips [44/45]: OK sourcery-nios2 [45/45]: OK 45 builds, 0 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed DEVELOPERS | 1 + package/Config.in | 1 + .../0001-fix-crc32-build-on-arm.patch | 49 +++++++++++++++++++ package/libdeflate/Config.in | 7 +++ package/libdeflate/libdeflate.hash | 3 ++ package/libdeflate/libdeflate.mk | 34 +++++++++++++ 6 files changed, 95 insertions(+) create mode 100644 package/libdeflate/0001-fix-crc32-build-on-arm.patch create mode 100644 package/libdeflate/Config.in create mode 100644 package/libdeflate/libdeflate.hash create mode 100644 package/libdeflate/libdeflate.mk diff --git a/DEVELOPERS b/DEVELOPERS index a1ec9a091e..70021ef823 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -364,6 +364,7 @@ F: package/libcec/ F: package/libcodec2/ F: package/libcrossguid/ F: package/libdcadec/ +F: package/libdeflate/ F: package/libdrm/ F: package/libdvbcsa/ F: package/libdvdcss/ diff --git a/package/Config.in b/package/Config.in index 5e6fed6dec..52a8ff8fe3 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1393,6 +1393,7 @@ endmenu menu "Compression and decompression" source "package/libarchive/Config.in" + source "package/libdeflate/Config.in" source "package/libmspack/Config.in" source "package/libsquish/Config.in" source "package/libzip/Config.in" diff --git a/package/libdeflate/0001-fix-crc32-build-on-arm.patch b/package/libdeflate/0001-fix-crc32-build-on-arm.patch new file mode 100644 index 0000000000..1ea3d6d564 --- /dev/null +++ b/package/libdeflate/0001-fix-crc32-build-on-arm.patch @@ -0,0 +1,49 @@ +From ce096af0f9f9c76ba98408daeee45c4f456be602 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sat, 5 Feb 2022 14:32:18 +0100 +Subject: [PATCH] fix crc32 build on arm + +Fixes build error + +/tmp/ccAwbDTP.s: Assembler messages: +/tmp/ccAwbDTP.s:140: Error: selected processor does not support `crc32b r0,r0,r3' in ARM mode +/tmp/ccAwbDTP.s:146: Error: selected processor does not support `crc32w r3,r0,r3' in ARM mode +/tmp/ccAwbDTP.s:148: Error: selected processor does not support `crc32w r3,r3,r4' in ARM mode +/tmp/ccAwbDTP.s:150: Error: selected processor does not support `crc32w r3,r3,r4' in ARM mode +/tmp/ccAwbDTP.s:152: Error: selected processor does not support `crc32w r3,r3,r0' in ARM mode +/tmp/ccAwbDTP.s:154: Error: selected processor does not support `crc32w r3,r3,r4' in ARM mode +/tmp/ccAwbDTP.s:156: Error: selected processor does not support `crc32w r3,r3,r0' in ARM mode +/tmp/ccAwbDTP.s:158: Error: selected processor does not support `crc32w r3,r3,r4' in ARM mode +/tmp/ccAwbDTP.s:159: Error: selected processor does not support `crc32w r0,r3,r0' in ARM mode +/tmp/ccAwbDTP.s:165: Error: selected processor does not support `crc32w lr,r0,lr' in ARM mode +/tmp/ccAwbDTP.s:166: Error: selected processor does not support `crc32w r0,lr,r4' in ARM mode +/tmp/ccAwbDTP.s:170: Error: selected processor does not support `crc32b r0,r0,r3' in ARM mode +/tmp/ccAwbDTP.s:177: Error: selected processor does not support `crc32b r0,r0,r3' in ARM mode + +Patch sent upstream as RFC: +https://github.com/ebiggers/libdeflate/pull/163 + +Signed-off-by: Bernd Kuhls +--- + common/compiler_gcc.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/common/compiler_gcc.h b/common/compiler_gcc.h +index 2a45b05..ea16c2d 100644 +--- a/common/compiler_gcc.h ++++ b/common/compiler_gcc.h +@@ -128,9 +128,9 @@ + * they work as expected. (Well, not quite. There's still a bug, but we + * have to work around it later when including arm_acle.h.) + */ +-# if GCC_PREREQ(10, 1) || \ ++# if ((GCC_PREREQ(10, 1) || \ + (GCC_PREREQ(9, 3) && !GCC_PREREQ(10, 0)) || \ +- (GCC_PREREQ(8, 4) && !GCC_PREREQ(9, 0)) || \ ++ (GCC_PREREQ(8, 4) && !GCC_PREREQ(9, 0))) && defined(__aarch64__)) || \ + (defined(__clang__) && __has_builtin(__builtin_arm_crc32b)) + # define COMPILER_SUPPORTS_CRC32_TARGET_INTRINSICS 1 + # endif +-- +2.30.2 + diff --git a/package/libdeflate/Config.in b/package/libdeflate/Config.in new file mode 100644 index 0000000000..d2fb0d6c55 --- /dev/null +++ b/package/libdeflate/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_LIBDEFLATE + bool "libdeflate" + help + Libdeflate is a heavily optimized library for DEFLATE/zlib/ + gzip compression and decompression + + https://github.com/ebiggers/libdeflate diff --git a/package/libdeflate/libdeflate.hash b/package/libdeflate/libdeflate.hash new file mode 100644 index 0000000000..ef480ab270 --- /dev/null +++ b/package/libdeflate/libdeflate.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 a537ab6125c226b874c02b166488b326aece954930260dbf682d88fc339137e3 libdeflate-1.9.tar.gz +sha256 5d246dd2537307b80fed9ba5fdddf5d0fe7a8f023393a071182b9daed56b40fe COPYING diff --git a/package/libdeflate/libdeflate.mk b/package/libdeflate/libdeflate.mk new file mode 100644 index 0000000000..2453804989 --- /dev/null +++ b/package/libdeflate/libdeflate.mk @@ -0,0 +1,34 @@ +################################################################################ +# +# libdeflate +# +################################################################################ + +LIBDEFLATE_VERSION = 1.9 +LIBDEFLATE_SITE = $(call github,ebiggers,libdeflate,v$(LIBDEFLATE_VERSION)) +LIBDEFLATE_LICENSE = MIT +LIBDEFLATE_LICENSE_FILES = COPYING +LIBDEFLATE_INSTALL_STAGING = YES + +ifeq ($(BR2_STATIC_LIBS),y) +LIBDEFLATE_MAKE_OPTS += DISABLE_SHARED=yes +endif + +define LIBDEFLATE_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \ + $(LIBDEFLATE_MAKE_OPTS) +endef + +define LIBDEFLATE_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \ + $(LIBDEFLATE_MAKE_OPTS) \ + DESTDIR="$(STAGING_DIR)" PREFIX=/usr install +endef + +define LIBDEFLATE_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \ + $(LIBDEFLATE_MAKE_OPTS) \ + DESTDIR="$(TARGET_DIR)" PREFIX=/usr install +endef + +$(eval $(generic-package)) -- 2.30.2 From bernd.kuhls at t-online.de Sat Feb 5 18:08:17 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 5 Feb 2022 19:08:17 +0100 Subject: [Buildroot] [PATCH 3/3] package/libutp: new package In-Reply-To: <20220205180817.2103343-1-bernd.kuhls@t-online.de> References: <20220205180817.2103343-1-bernd.kuhls@t-online.de> Message-ID: <20220205180817.2103343-3-bernd.kuhls@t-online.de> Needed for upcoming version bump of transmission. Signed-off-by: Bernd Kuhls --- Build test using this defconfig BR2_PACKAGE_LIBUTP=y was successful: 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]: OK br-arm-full-static [30/45]: OK br-i386-pentium4-full [31/45]: OK br-i386-pentium-mmx-musl [32/45]: OK br-mips64-n64-full [33/45]: OK br-mips64r6-el-hf-glibc [34/45]: OK br-powerpc-603e-basic-cpp [35/45]: OK br-powerpc64-power7-glibc [36/45]: OK linaro-aarch64-be [37/45]: OK linaro-aarch64 [38/45]: OK linaro-arm [39/45]: OK sourcery-arm-armv4t [40/45]: OK sourcery-arm [41/45]: OK sourcery-arm-thumb2 [42/45]: OK sourcery-mips64 [43/45]: OK sourcery-mips [44/45]: OK sourcery-nios2 [45/45]: OK 45 builds, 2 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed DEVELOPERS | 1 + package/Config.in | 1 + package/libutp/Config.in | 10 ++++++++++ package/libutp/libutp.hash | 3 +++ package/libutp/libutp.mk | 13 +++++++++++++ 5 files changed, 28 insertions(+) create mode 100644 package/libutp/Config.in create mode 100644 package/libutp/libutp.hash create mode 100644 package/libutp/libutp.mk diff --git a/DEVELOPERS b/DEVELOPERS index c4084c5545..c1e486a175 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -398,6 +398,7 @@ F: package/libsoundtouch/ F: package/libsquish/ F: package/libudfread/ F: package/liburiparser/ +F: package/libutp/ F: package/libva/ F: package/libva-intel-driver/ F: package/libva-utils/ diff --git a/package/Config.in b/package/Config.in index 990ee19665..03fd6c04dd 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1881,6 +1881,7 @@ menu "Networking" source "package/libupnp/Config.in" source "package/libupnpp/Config.in" source "package/liburiparser/Config.in" + source "package/libutp/Config.in" source "package/libuwsc/Config.in" source "package/libvncserver/Config.in" source "package/libwebsock/Config.in" diff --git a/package/libutp/Config.in b/package/libutp/Config.in new file mode 100644 index 0000000000..6382913103 --- /dev/null +++ b/package/libutp/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_LIBUTP + bool "libutp" + depends on BR2_INSTALL_LIBSTDCPP + help + uTorrent Transport Protocol library + + https://github.com/bittorrent/libutp + +comment "libutp support needs a toolchain with C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/libutp/libutp.hash b/package/libutp/libutp.hash new file mode 100644 index 0000000000..38d46b0ae5 --- /dev/null +++ b/package/libutp/libutp.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 c515e6f9add47d3d202389e8a62feb765f0ae41d6398cc238e44028be520774e libutp-fda9f4b3db97ccb243fcbed2ce280eb4135d705b.tar.gz +sha256 4441418beb8e352b6e2aa09083b4c51a86814a49878dbb1a81936b466cd5badd LICENSE diff --git a/package/libutp/libutp.mk b/package/libutp/libutp.mk new file mode 100644 index 0000000000..c926c290d2 --- /dev/null +++ b/package/libutp/libutp.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# libutp +# +################################################################################ + +LIBUTP_VERSION = fda9f4b3db97ccb243fcbed2ce280eb4135d705b +LIBUTP_SITE = $(call github,transmission,libutp,$(LIBUTP_VERSION)) +LIBUTP_LICENSE = MIT +LIBUTP_LICENSE_FILES = LICENSE +LIBUTP_INSTALL_STAGING = YES + +$(eval $(cmake-package)) -- 2.30.2 From peter.macleod.thompson at gmail.com Sat Feb 5 18:12:58 2022 From: peter.macleod.thompson at gmail.com (Peter Thompson) Date: Sat, 5 Feb 2022 11:12:58 -0700 Subject: [Buildroot] [PATCH 1/1] bump version to 2.0.18 Message-ID: <20220205181259.5831-1-peter.macleod.thompson@gmail.com> From: PeterThompson Signed-off-by: PeterThompson --- package/sdl2_ttf/sdl2_ttf.hash | 4 ++-- package/sdl2_ttf/sdl2_ttf.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sdl2_ttf/sdl2_ttf.hash b/package/sdl2_ttf/sdl2_ttf.hash index 16459e4a59..a490b002b6 100644 --- a/package/sdl2_ttf/sdl2_ttf.hash +++ b/package/sdl2_ttf/sdl2_ttf.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a9eceb1ad88c1f1545cd7bd28e7cbc0b2c14191d40238f531a15b01b1b22cd33 SDL2_ttf-2.0.15.tar.gz -sha256 f6370809c9f644760920d9945c5be07aed17664975f2e4741013d4d9a2ec696f COPYING.txt +sha256 7234eb8883514e019e7747c703e4a774575b18d435c22a4a29d068cb768a2251 SDL2_ttf-2.0.18.tar.gz +sha256 e211dfe7e2c36e64048be886fe3f2bbba8732ce4dd77b596a355d3abbec775a4 COPYING.txt diff --git a/package/sdl2_ttf/sdl2_ttf.mk b/package/sdl2_ttf/sdl2_ttf.mk index 326cb99366..1fe7c0a075 100644 --- a/package/sdl2_ttf/sdl2_ttf.mk +++ b/package/sdl2_ttf/sdl2_ttf.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_TTF_VERSION = 2.0.15 +SDL2_TTF_VERSION = 2.0.18 SDL2_TTF_SOURCE = SDL2_ttf-$(SDL2_TTF_VERSION).tar.gz SDL2_TTF_SITE = http://www.libsdl.org/projects/SDL_ttf/release SDL2_TTF_LICENSE = Zlib -- 2.20.1 From bernd.kuhls at t-online.de Sat Feb 5 18:15:36 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 5 Feb 2022 19:15:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi-pvr-stalker: bump version to 19.0.2-Matrix Message-ID: <20220205181536.2110535-1-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 90e74d451a..2eae79d371 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 84a92c298ddda8d72072aafe2a62c5c6b48b60b3b85408ce7ca4f96e42965541 kodi-pvr-stalker-19.0.1-Matrix.tar.gz +sha256 ca472c4f43f77d7badca3fbe174f5877e6b3ff63407da09f690d8146ec737b59 kodi-pvr-stalker-19.0.2-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 a0d5f4356d..efa293a40d 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.1-Matrix +KODI_PVR_STALKER_VERSION = 19.0.2-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 kuzminov.sergey81 at gmail.com Sat Feb 5 18:21:44 2022 From: kuzminov.sergey81 at gmail.com (Sergey Kuzminov) Date: Sat, 5 Feb 2022 21:21:44 +0300 Subject: [Buildroot] [PATCH] configs/orangepi_zero_defconfig: switch to extlinux In-Reply-To: <6e5f8adf-30a2-797e-f01b-4536ebc916ab@benettiengineering.com> References: <20220205072801.13567-1-kuzminov.sergey81@gmail.com> <6e5f8adf-30a2-797e-f01b-4536ebc916ab@benettiengineering.com> Message-ID: <57596c27-7f00-da71-38b4-93c337e79dd0@gmail.com> Hi, Giulio, 05.02.2022 20:26, Giulio Benetti: > Hi Sergey, > > On 05/02/22 08:28, Sergey Kuzminov wrote: >> Changes: >> - Exclude FAT partition, he is no longer needed for U-Boot. > > typo s/he/it ok > >> - Switch the rootfs partition from MBR to GPT for partition-uuid to work. >> - Switch to extlinux, this is convenient for debugging. >> - Create common scenarios for multiple boards to create an SD image: >> board/orangepi/common. >> >> Signed-off-by: Sergey Kuzminov >> --- >> ? board/orangepi/common/extlinux.conf?????? |? 5 ++++ >> ? board/orangepi/common/genimage.cfg??????? | 23 +++++++++++++++ >> ? board/orangepi/common/post-build.sh?????? | 34 +++++++++++++++++++++ >> ? board/orangepi/orangepi-zero/boot.cmd???? |? 9 ------ >> ? board/orangepi/orangepi-zero/genimage.cfg | 36 ----------------------- >> ? configs/orangepi_zero_defconfig?????????? | 11 ++++--- >> ? 6 files changed, 67 insertions(+), 51 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 >> ? 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 > > Here ^^^ you've left a commented line, I guess the correct one is the > second one, right? Or anyway you can only keep one. The first line is for debugging, the second is for work. > >> diff --git a/board/orangepi/common/genimage.cfg >> b/board/orangepi/common/genimage.cfg >> new file mode 100644 >> index 0000000000..fa0d988991 >> --- /dev/null >> +++ b/board/orangepi/common/genimage.cfg >> @@ -0,0 +1,23 @@ >> +image sdcard.img { >> +??? partition u-boot { >> +??????? in-partition-table = false >> +??????? image = "u-boot-sunxi-with-spl.bin" >> +??????? offset = 8K >> +??????? size = 1000K # 1MB - 8KB(offset) - 16KB(GPT) >> +??? } >> + >> +??? hdimage { >> +??????? partition-table-type = gpt >> +??????? gpt-location = 1008K # 1MB - 16KB(GPT) >> +??????? gpt-no-backup = true >> +??????? # After writing the image to the SD card, >> +??????? # backup GPT data structures at the end of the disk: >> +??????? # gdisk /dev/mmcblk0 then press the buttons: x, e, w, y >> +??? } >> + >> +??? 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/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 5aaa1566c5..96f0c3f600 100644 >> --- a/configs/orangepi_zero_defconfig >> +++ b/configs/orangepi_zero_defconfig >> @@ -20,10 +20,13 @@ 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_NEEDS_HOST_OPENSSL=y >> +BR2_LINUX_KERNEL_INSTALL_TARGET=y >> ? # Filesystem >> ? BR2_TARGET_ROOTFS_EXT2=y >> ? BR2_TARGET_ROOTFS_EXT2_4=y >> +BR2_TARGET_ROOTFS_EXT2_SIZE="63M" >> +BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y > > It's worth mentioning this change ^^^ in commit log ok > >> ? # BR2_TARGET_ROOTFS_TAR is not set >> ? # Bootloader >> @@ -39,16 +42,12 @@ 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 >> ? # 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" >> ? # Wireless driver and firmware >> ? BR2_PACKAGE_XR819_XRADIO=y > > I've built it successfully locally so: > Tested-by: Giulio Benetti > and with the corrected commit log you can send V2 with ^^^ and also: > Reviewed-by: Giulio Benetti > > Best regards Thank you. From giulio.benetti at benettiengineering.com Sat Feb 5 19:38:05 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 5 Feb 2022 20:38:05 +0100 Subject: [Buildroot] [PATCH] configs/orangepi_zero_defconfig: switch to extlinux In-Reply-To: <57596c27-7f00-da71-38b4-93c337e79dd0@gmail.com> References: <57596c27-7f00-da71-38b4-93c337e79dd0@gmail.com> Message-ID: <33C48754-6B54-40CD-9127-9118C1DE24F1@benettiengineering.com> Hi Sergey, > Il giorno 5 feb 2022, alle ore 19:22, Sergey Kuzminov ha scritto: > > ?Hi, Giulio, > > 05.02.2022 20:26, Giulio Benetti: >> Hi Sergey, >>> On 05/02/22 08:28, Sergey Kuzminov wrote: >>> Changes: >>> - Exclude FAT partition, he is no longer needed for U-Boot. >> typo s/he/it > > ok > >>> - Switch the rootfs partition from MBR to GPT for partition-uuid to work. >>> - Switch to extlinux, this is convenient for debugging. >>> - Create common scenarios for multiple boards to create an SD image: board/orangepi/common. >>> >>> Signed-off-by: Sergey Kuzminov >>> --- >>> board/orangepi/common/extlinux.conf | 5 ++++ >>> board/orangepi/common/genimage.cfg | 23 +++++++++++++++ >>> board/orangepi/common/post-build.sh | 34 +++++++++++++++++++++ >>> board/orangepi/orangepi-zero/boot.cmd | 9 ------ >>> board/orangepi/orangepi-zero/genimage.cfg | 36 ----------------------- >>> configs/orangepi_zero_defconfig | 11 ++++--- >>> 6 files changed, 67 insertions(+), 51 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 >>> 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 >> Here ^^^ you've left a commented line, I guess the correct one is the second one, right? Or anyway you can only keep one. > > The first line is for debugging, the second is for work. I understand, but you have to keep only one, so the second one and drop the first, otherwise I don?t think it will be accepted. Thank you! Best regards Giulio Benetti > >>> diff --git a/board/orangepi/common/genimage.cfg b/board/orangepi/common/genimage.cfg >>> new file mode 100644 >>> index 0000000000..fa0d988991 >>> --- /dev/null >>> +++ b/board/orangepi/common/genimage.cfg >>> @@ -0,0 +1,23 @@ >>> +image sdcard.img { >>> + partition u-boot { >>> + in-partition-table = false >>> + image = "u-boot-sunxi-with-spl.bin" >>> + offset = 8K >>> + size = 1000K # 1MB - 8KB(offset) - 16KB(GPT) >>> + } >>> + >>> + hdimage { >>> + partition-table-type = gpt >>> + gpt-location = 1008K # 1MB - 16KB(GPT) >>> + gpt-no-backup = true >>> + # After writing the image to the SD card, >>> + # backup GPT data structures at the end of the disk: >>> + # gdisk /dev/mmcblk0 then press the buttons: x, e, w, y >>> + } >>> + >>> + 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/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 5aaa1566c5..96f0c3f600 100644 >>> --- a/configs/orangepi_zero_defconfig >>> +++ b/configs/orangepi_zero_defconfig >>> @@ -20,10 +20,13 @@ 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_NEEDS_HOST_OPENSSL=y >>> +BR2_LINUX_KERNEL_INSTALL_TARGET=y >>> # Filesystem >>> BR2_TARGET_ROOTFS_EXT2=y >>> BR2_TARGET_ROOTFS_EXT2_4=y >>> +BR2_TARGET_ROOTFS_EXT2_SIZE="63M" >>> +BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y >> It's worth mentioning this change ^^^ in commit log > > ok > >>> # BR2_TARGET_ROOTFS_TAR is not set >>> # Bootloader >>> @@ -39,16 +42,12 @@ 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 >>> # 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" >>> # Wireless driver and firmware >>> BR2_PACKAGE_XR819_XRADIO=y >> I've built it successfully locally so: >> Tested-by: Giulio Benetti >> and with the corrected commit log you can send V2 with ^^^ and also: >> Reviewed-by: Giulio Benetti >> Best regards > > Thank you. > From giulio.benetti at benettiengineering.com Sat Feb 5 19:40:03 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 5 Feb 2022 20:40:03 +0100 Subject: [Buildroot] [PATCH 1/1] bump version to 2.0.18 In-Reply-To: <20220205181259.5831-1-peter.macleod.thompson@gmail.com> References: <20220205181259.5831-1-peter.macleod.thompson@gmail.com> Message-ID: Hi Peter, on subject it?s missing: package/sdl2_ttf: bump version to 2.0.18 Best regards Giulio > Il giorno 5 feb 2022, alle ore 19:13, Peter Thompson ha scritto: > > ?From: PeterThompson > > Signed-off-by: PeterThompson > --- > package/sdl2_ttf/sdl2_ttf.hash | 4 ++-- > package/sdl2_ttf/sdl2_ttf.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/sdl2_ttf/sdl2_ttf.hash b/package/sdl2_ttf/sdl2_ttf.hash > index 16459e4a59..a490b002b6 100644 > --- a/package/sdl2_ttf/sdl2_ttf.hash > +++ b/package/sdl2_ttf/sdl2_ttf.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 a9eceb1ad88c1f1545cd7bd28e7cbc0b2c14191d40238f531a15b01b1b22cd33 SDL2_ttf-2.0.15.tar.gz > -sha256 f6370809c9f644760920d9945c5be07aed17664975f2e4741013d4d9a2ec696f COPYING.txt > +sha256 7234eb8883514e019e7747c703e4a774575b18d435c22a4a29d068cb768a2251 SDL2_ttf-2.0.18.tar.gz > +sha256 e211dfe7e2c36e64048be886fe3f2bbba8732ce4dd77b596a355d3abbec775a4 COPYING.txt > diff --git a/package/sdl2_ttf/sdl2_ttf.mk b/package/sdl2_ttf/sdl2_ttf.mk > index 326cb99366..1fe7c0a075 100644 > --- a/package/sdl2_ttf/sdl2_ttf.mk > +++ b/package/sdl2_ttf/sdl2_ttf.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -SDL2_TTF_VERSION = 2.0.15 > +SDL2_TTF_VERSION = 2.0.18 > SDL2_TTF_SOURCE = SDL2_ttf-$(SDL2_TTF_VERSION).tar.gz > SDL2_TTF_SITE = http://www.libsdl.org/projects/SDL_ttf/release > SDL2_TTF_LICENSE = Zlib > -- > 2.20.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From james.hilliard1 at gmail.com Sat Feb 5 20:18:30 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 5 Feb 2022 13:18:30 -0700 Subject: [Buildroot] [PATCH v6 1/8] package/webp: enable host build Message-ID: <20220205201837.3324085-1-james.hilliard1@gmail.com> This will be needed by qt5webengine. Signed-off-by: James Hilliard --- package/webp/webp.mk | 5 +++++ 1 file changed, 5 insertions(+) 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 james.hilliard1 at gmail.com Sat Feb 5 20:18:32 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 5 Feb 2022 13:18:32 -0700 Subject: [Buildroot] [PATCH v6 3/8] package/icu: don't disable renaming for host build In-Reply-To: <20220205201837.3324085-1-james.hilliard1@gmail.com> References: <20220205201837.3324085-1-james.hilliard1@gmail.com> Message-ID: <20220205201837.3324085-3-james.hilliard1@gmail.com> Using a different renaming option for the icu host build can cause issues for packages such as qt5webengine which expect target and host packages to be built with the same options. Signed-off-by: James Hilliard --- package/icu/icu.mk | 3 +-- package/nodejs/nodejs.mk | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/icu/icu.mk b/package/icu/icu.mk index 7e0c96e43a..ebbb1968fc 100644 --- a/package/icu/icu.mk +++ b/package/icu/icu.mk @@ -45,8 +45,7 @@ HOST_ICU_CONF_OPTS = \ --disable-tests \ --disable-extras \ --disable-icuio \ - --disable-layout \ - --disable-renaming + --disable-layout ICU_SUBDIR = source HOST_ICU_SUBDIR = source diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 727af6dc50..2e41c11dbd 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -94,7 +94,7 @@ NODEJS_HOST_TOOLS_V8 = \ NODEJS_HOST_TOOLS_NODE = mkcodecache NODEJS_HOST_TOOLS = $(NODEJS_HOST_TOOLS_V8) $(NODEJS_HOST_TOOLS_NODE) -HOST_NODEJS_CXXFLAGS = $(HOST_CXXFLAGS) -DU_DISABLE_RENAMING=1 +HOST_NODEJS_CXXFLAGS = $(HOST_CXXFLAGS) define HOST_NODEJS_BUILD_CMDS $(HOST_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python3 \ -- 2.25.1 From james.hilliard1 at gmail.com Sat Feb 5 20:18:31 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 5 Feb 2022 13:18:31 -0700 Subject: [Buildroot] [PATCH v6 2/8] package/re2: switch to generic-package make build In-Reply-To: <20220205201837.3324085-1-james.hilliard1@gmail.com> References: <20220205201837.3324085-1-james.hilliard1@gmail.com> Message-ID: <20220205201837.3324085-2-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. This will be needed by qt5webengine. 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 Sat Feb 5 20:18:33 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 5 Feb 2022 13:18:33 -0700 Subject: [Buildroot] [PATCH v6 4/8] package/qt5/qt5base: enable ccache via configure option In-Reply-To: <20220205201837.3324085-1-james.hilliard1@gmail.com> References: <20220205201837.3324085-1-james.hilliard1@gmail.com> Message-ID: <20220205201837.3324085-4-james.hilliard1@gmail.com> This should be cleaner than editing mkspecs/common/g++-base.conf. Signed-off-by: James Hilliard --- package/qt5/qt5base/qt5base.mk | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index d8a0bf1d16..4b7a2a937d 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -289,10 +289,9 @@ endef endif # This allows to use ccache when available -define QT5BASE_CONFIGURE_HOSTCC - $(SED) 's,^QMAKE_CC\s*=.*,QMAKE_CC = $(HOSTCC),' $(@D)/mkspecs/common/g++-base.conf - $(SED) 's,^QMAKE_CXX\s*=.*,QMAKE_CXX = $(HOSTCXX),' $(@D)/mkspecs/common/g++-base.conf -endef +ifeq ($(BR2_CCACHE),y) +QT5BASE_CONFIGURE_OPTS += -ccache +endif # Must be last so can override all options set by Buildroot QT5BASE_CONFIGURE_OPTS += $(call qstrip,$(BR2_PACKAGE_QT5BASE_CUSTOM_CONF_OPTS)) -- 2.25.1 From james.hilliard1 at gmail.com Sat Feb 5 20:18:34 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 5 Feb 2022 13:18:34 -0700 Subject: [Buildroot] [PATCH v6 5/8] package/qt5/qt5webengine-chromium-catapult: new package In-Reply-To: <20220205201837.3324085-1-james.hilliard1@gmail.com> References: <20220205201837.3324085-1-james.hilliard1@gmail.com> Message-ID: <20220205201837.3324085-5-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 Sat Feb 5 20:18:36 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 5 Feb 2022 13:18:36 -0700 Subject: [Buildroot] [PATCH v6 7/8] package/qt5/qt5base: disable broken qmake sysrootify In-Reply-To: <20220205201837.3324085-1-james.hilliard1@gmail.com> References: <20220205201837.3324085-1-james.hilliard1@gmail.com> Message-ID: <20220205201837.3324085-7-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. Improves pkg-config target/host separation. Signed-off-by: James Hilliard --- Changes v5 -> v6: - rebase/rework with qt5webengine bump 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/qt5/qt5base/qt.conf.in | 21 ++++++++++++++++++--- package/qt5/qt5base/qt5base.mk | 5 ++++- 2 files changed, 22 insertions(+), 4 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 4b7a2a937d..ea41c8fd72 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -315,12 +315,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)" \ @@ -329,6 +332,6 @@ define QT5BASE_CONFIGURE_CMDS ) endef -QT5BASE_POST_INSTALL_STAGING_HOOKS += QT5_INSTALL_QT_CONF +QT5BASE_PRE_INSTALL_STAGING_HOOKS += QT5_INSTALL_QT_CONF $(eval $(qmake-package)) -- 2.25.1 From james.hilliard1 at gmail.com Sat Feb 5 20:18:37 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 5 Feb 2022 13:18:37 -0700 Subject: [Buildroot] [PATCH v6 8/8] package/qt5/qt5webengine: bump to version 5.15.8 In-Reply-To: <20220205201837.3324085-1-james.hilliard1@gmail.com> References: <20220205201837.3324085-1-james.hilliard1@gmail.com> Message-ID: <20220205201837.3324085-8-james.hilliard1@gmail.com> We need to use the separate package for the chromium submodule so that which has python3 support patches. We also need to apply a patch to qt5webengine to allow building with python3. Drop a patch which is now upstream. 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. Switch libraries to system libraries instead of bundled when possible. Migrate unsupported WEBENGINE_CONFIG to new config flag option. Override feature detection using config override flags to ensure we get the expected features enabled/disabled as autodetection logic may otherwise disable features without throwing build errors. Signed-off-by: James Hilliard --- Changes v5 -> v6: - switch to python3 - fix up config flags and rebase Changes v3 -> v4: - linker fixes Changes v2 -> v3: - add kconfig entries --- package/qt5/qt5.mk | 1 - .../0002-Add-python3-build-support.patch | 168 +++ ...m-breakpad-fix-build-with-glibc-2.34.patch | 76 -- package/qt5/qt5webengine/Config.in | 13 + .../qt5/qt5webengine/host-python-wrapper.in | 3 + package/qt5/qt5webengine/qt5webengine.hash | 1001 +---------------- package/qt5/qt5webengine/qt5webengine.mk | 157 ++- 7 files changed, 322 insertions(+), 1097 deletions(-) create mode 100644 package/qt5/qt5webengine/0002-Add-python3-build-support.patch delete mode 100644 package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch create mode 100644 package/qt5/qt5webengine/host-python-wrapper.in diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk index 656e3067dc..0706c3548d 100644 --- a/package/qt5/qt5.mk +++ b/package/qt5/qt5.mk @@ -6,7 +6,6 @@ QT5_VERSION_MAJOR = 5.15 QT5_VERSION = $(QT5_VERSION_MAJOR).8 -QT5_SOURCE_TARBALL_PREFIX = everywhere-src QT5_SITE = https://invent.kde.org/qt/qt include $(sort $(wildcard package/qt5/*/*.mk)) diff --git a/package/qt5/qt5webengine/0002-Add-python3-build-support.patch b/package/qt5/qt5webengine/0002-Add-python3-build-support.patch new file mode 100644 index 0000000000..18fc1c1de0 --- /dev/null +++ b/package/qt5/qt5webengine/0002-Add-python3-build-support.patch @@ -0,0 +1,168 @@ +From 1e299a6c9eeb08555208b76623e453d8ab96b6e3 Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Fri, 4 Feb 2022 16:16:35 -0700 +Subject: [PATCH] Add python3 build support + +Adapted from: +https://github.com/archlinux/svntogit-packages/blob/6edf5f1aaea952d046aff89a2e0175258fe77361/trunk/qt5-webengine-python3.patch + +Signed-off-by: James Hilliard +--- + configure.pri | 13 ++++++------- + mkspecs/features/functions.prf | 6 +++--- + src/buildtools/config/support.pri | 10 +++++----- + src/buildtools/configure.json | 18 +++++++++--------- + 4 files changed, 23 insertions(+), 24 deletions(-) + +diff --git a/configure.pri b/configure.pri +index e072961f..6fec7b20 100644 +--- a/configure.pri ++++ b/configure.pri +@@ -13,8 +13,7 @@ defineTest(isPythonVersionSupported) { + python_version = $$split(python_version, ',') + python_major_version = $$first(python_version) + greaterThan(python_major_version, 2) { +- qtLog("Python version 3 is not supported by Chromium.") +- return(false) ++ return(true) + } + python_minor_version = $$member(python_version, 1) + python_patch_version = $$member(python_version, 2) +@@ -52,10 +51,10 @@ defineTest(qtConfReport_jumboBuild) { + qtConfReportPadded($${1}, $$mergeLimit) + } + +-defineTest(qtConfTest_detectPython2) { +- python = $$qtConfFindInPath("python2$$EXE_SUFFIX") ++defineTest(qtConfTest_detectPython) { ++ python = $$qtConfFindInPath("python$$EXE_SUFFIX") + isEmpty(python) { +- qtLog("'python2$$EXE_SUFFIX' not found in PATH. Checking for 'python$$EXE_SUFFIX'.") ++ qtLog("'python$$EXE_SUFFIX' not found in PATH. Checking for 'python$$EXE_SUFFIX'.") + python = $$qtConfFindInPath("python$$EXE_SUFFIX") + } + isEmpty(python) { +@@ -63,11 +62,11 @@ defineTest(qtConfTest_detectPython2) { + return(false) + } + !isPythonVersionSupported($$python) { +- qtLog("A suitable Python 2 executable could not be located.") ++ qtLog("A suitable Python executable could not be located.") + return(false) + } + +- # Make tests.python2.location available in configure.json. ++ # Make tests.python.location available in configure.json. + $${1}.location = $$clean_path($$python) + export($${1}.location) + $${1}.cache += location +diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf +index 2750d707..9fda13d0 100644 +--- a/mkspecs/features/functions.prf ++++ b/mkspecs/features/functions.prf +@@ -39,11 +39,11 @@ defineReplace(which) { + + # Returns the unquoted path to the python executable. + defineReplace(pythonPath) { +- isEmpty(QMAKE_PYTHON2) { ++ isEmpty(QMAKE_PYTHON) { + # Fallback for building QtWebEngine with Qt < 5.8 +- QMAKE_PYTHON2 = python ++ QMAKE_PYTHON = python + } +- return($$QMAKE_PYTHON2) ++ return($$QMAKE_PYTHON) + } + + # Returns the python executable for use with shell / make targets. +diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri +index e7f869a1..1bf2c5d7 100644 +--- a/src/buildtools/config/support.pri ++++ b/src/buildtools/config/support.pri +@@ -21,7 +21,7 @@ defineReplace(qtwebengine_checkWebEngineCoreError) { + !qtwebengine_checkForGperf(QtWebEngine):return(false) + !qtwebengine_checkForBison(QtWebEngine):return(false) + !qtwebengine_checkForFlex(QtWebEngine):return(false) +- !qtwebengine_checkForPython2(QtWebEngine):return(false) ++ !qtwebengine_checkForPython(QtWebEngine):return(false) + !qtwebengine_checkForNodejs(QtWebEngine):return(false) + !qtwebengine_checkForSanitizer(QtWebEngine):return(false) + linux:!qtwebengine_checkForPkgCfg(QtWebEngine):return(false) +@@ -51,7 +51,7 @@ defineReplace(qtwebengine_checkPdfError) { + !qtwebengine_checkForGperf(QtPdf):return(false) + !qtwebengine_checkForBison(QtPdf):return(false) + !qtwebengine_checkForFlex(QtPdf):return(false) +- !qtwebengine_checkForPython2(QtPdf):return(false) ++ !qtwebengine_checkForPython(QtPdf):return(false) + !qtwebengine_checkForSanitizer(QtPdf):return(false) + linux:!qtwebengine_checkForPkgCfg(QtPdf):return(false) + linux:!qtwebengine_checkForHostPkgCfg(QtPdf):return(false) +@@ -143,10 +143,10 @@ defineTest(qtwebengine_checkForFlex) { + return(true) + } + +-defineTest(qtwebengine_checkForPython2) { ++defineTest(qtwebengine_checkForPython) { + module = $$1 +- !qtConfig(webengine-python2) { +- qtwebengine_skipBuild("Python version 2 (2.7.5 or later) is required to build $${module}.") ++ !qtConfig(webengine-python) { ++ qtwebengine_skipBuild("Python is required to build $${module}.") + return(false) + } + return(true) +diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json +index 88d1790c..032aa665 100644 +--- a/src/buildtools/configure.json ++++ b/src/buildtools/configure.json +@@ -295,9 +295,9 @@ + "label": "system ninja", + "type": "detectNinja" + }, +- "webengine-python2": { +- "label": "python2", +- "type": "detectPython2", ++ "webengine-python": { ++ "label": "python", ++ "type": "detectPython", + "log": "location" + }, + "webengine-winversion": { +@@ -374,7 +374,7 @@ + && features.webengine-gperf + && features.webengine-bison + && features.webengine-flex +- && features.webengine-python2 ++ && features.webengine-python + && features.webengine-nodejs + && (!config.sanitizer || features.webengine-sanitizer) + && (!config.linux || features.pkg-config) +@@ -400,7 +400,7 @@ + && features.webengine-gperf + && features.webengine-bison + && features.webengine-flex +- && features.webengine-python2 ++ && features.webengine-python + && (!config.sanitizer || features.webengine-sanitizer) + && (!config.linux || features.pkg-config) + && (!config.linux || features.webengine-host-pkg-config) +@@ -423,12 +423,12 @@ + "autoDetect": "features.private_tests", + "output": [ "privateFeature" ] + }, +- "webengine-python2": { +- "label": "python2", +- "condition": "tests.webengine-python2", ++ "webengine-python": { ++ "label": "python", ++ "condition": "tests.webengine-python", + "output": [ + "privateFeature", +- { "type": "varAssign", "name": "QMAKE_PYTHON2", "value": "tests.webengine-python2.location" } ++ { "type": "varAssign", "name": "QMAKE_PYTHON", "value": "tests.webengine-python.location" } + ] + }, + "webengine-gperf": { +-- +2.25.1 + 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 deleted file mode 100644 index 44a6424c7d..0000000000 --- a/package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch +++ /dev/null @@ -1,76 +0,0 @@ -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/Config.in b/package/qt5/qt5webengine/Config.in index 5d537cdf84..b5ba8c4649 100644 --- a/package/qt5/qt5webengine/Config.in +++ b/package/qt5/qt5webengine/Config.in @@ -32,24 +32,35 @@ 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). # 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_LCMS2 + 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_MINIZIP select BR2_PACKAGE_OPUS + select BR2_PACKAGE_RE2 + select BR2_PACKAGE_SNAPPY 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 @@ -57,9 +68,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/host-python-wrapper.in b/package/qt5/qt5webengine/host-python-wrapper.in new file mode 100644 index 0000000000..3400be1d06 --- /dev/null +++ b/package/qt5/qt5webengine/host-python-wrapper.in @@ -0,0 +1,3 @@ +#!/bin/sh +LD_LIBRARY_PATH="@HOST_DIR@/lib" \ +exec @HOST_DIR@/bin/python "$@" 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 cebd6d0fe2..68eb2e8a1c 100644 --- a/package/qt5/qt5webengine/qt5webengine.mk +++ b/package/qt5/qt5webengine/qt5webengine.mk @@ -4,42 +4,147 @@ # ################################################################################ -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 \ - host-pkgconf host-python +QT5WEBENGINE_VERSION = $(QT5_VERSION) +QT5WEBENGINE_SITE = $(QT5_SITE)/qtwebengine/-/archive/v$(QT5WEBENGINE_VERSION)-lts +QT5WEBENGINE_SOURCE = qtwebengine-v$(QT5WEBENGINE_VERSION)-lts.tar.bz2 +QT5WEBENGINE_DEPENDENCIES = qt5declarative qt5webchannel +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 + +# command line argument separator +QT5WEBENGINE_CONF_OPTS = -- 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 += \ + xlib_libXcomposite \ + xlib_libXcursor \ + xlib_libXi \ + xlib_libxkbfile \ + xlib_libXrandr \ + xlib_libXScrnSaver \ + xlib_libXtst +QT5WEBENGINE_CONF_OPTS += \ + -feature-webengine-ozone \ + -feature-webengine-system-libdrm \ + -feature-webengine-system-x11 \ + -feature-webengine-system-xkbfile \ + -feature-webengine-system-xcomposite \ + -feature-webengine-system-xcursor \ + -feature-webengine-system-xi \ + -feature-webengine-system-xproto-gl \ + -feature-webengine-system-xtst +else +QT5WEBENGINE_CONF_OPTS += \ + -no-feature-webengine-ozone \ + -no-feature-webengine-system-libdrm \ + -no-feature-webengine-system-x11 \ + -no-feature-webengine-system-xkbfile \ + -no-feature-webengine-system-xcomposite \ + -no-feature-webengine-system-xcursor \ + -no-feature-webengine-system-xi \ + -no-feature-webengine-system-xproto-gl \ + -no-feature-webengine-system-xtst endif -QT5WEBENGINE_DEPENDENCIES += host-libpng host-libnss libnss +QT5WEBENGINE_DEPENDENCIES += \ + host-bison \ + host-flex \ + host-freetype \ + host-gperf \ + host-harfbuzz \ + host-icu \ + host-ninja \ + host-nodejs \ + host-pkgconf \ + host-libjpeg \ + host-libnss \ + host-libpng \ + host-python3 \ + host-webp \ + host-zlib \ + ffmpeg \ + freetype \ + jpeg \ + lcms2 \ + libevent \ + libnss \ + libvpx \ + libxml2 \ + libxslt \ + re2 \ + snappy \ + webp -QT5WEBENGINE_CONF_OPTS += WEBENGINE_CONFIG+=use_system_ffmpeg +QT5WEBENGINE_CONF_OPTS += \ + -webengine-embedded-build \ + -webengine-ffmpeg \ + -webengine-icu \ + -webengine-opus \ + -webengine-webchannel \ + -webengine-webp \ + -feature-build-qtwebengine-core \ + -feature-webengine-core-support \ + -feature-webengine-system-dbus \ + -feature-webengine-system-fontconfig \ + -feature-webengine-system-freetype \ + -feature-webengine-system-glib \ + -feature-webengine-system-glibc \ + -feature-webengine-system-harfbuzz \ + -feature-webengine-system-jpeg \ + -feature-webengine-system-khr \ + -feature-webengine-system-lcms2 \ + -feature-webengine-system-libevent \ + -feature-webengine-system-libvpx \ + -feature-webengine-system-libxml2 \ + -feature-webengine-system-ninja \ + -feature-webengine-system-nss \ + -feature-webengine-system-png \ + -feature-webengine-system-re2 \ + -feature-webengine-system-snappy \ + -feature-webengine-system-zlib + +QT5WEBENGINE_CONF_OPTS += \ + -no-webengine-geolocation \ + -no-webengine-kerberos \ + -no-webengine-pepper-plugins \ + -no-webengine-printing-and-pdf \ + -no-webengine-spellchecker \ + -no-webengine-webrtc \ + -no-webengine-webrtc-pipewire \ + -no-feature-webengine-developer-build \ + -no-feature-webengine-full-debug-info \ + -no-feature-webengine-native-spellchecker \ + -no-feature-webengine-noexecstack \ + -no-feature-webengine-system-minizip \ + -no-feature-webengine-system-gn ifeq ($(BR2_PACKAGE_QT5WEBENGINE_PROPRIETARY_CODECS),y) -QT5WEBENGINE_CONF_OPTS += WEBENGINE_CONFIG+=use_proprietary_codecs +QT5WEBENGINE_CONF_OPTS += -webengine-proprietary-codecs +else +QT5WEBENGINE_CONF_OPTS += -no-webengine-proprietary-codecs endif ifeq ($(BR2_PACKAGE_QT5WEBENGINE_ALSA),y) QT5WEBENGINE_DEPENDENCIES += alsa-lib +QT5WEBENGINE_CONF_OPTS += -webengine-alsa else -QT5WEBENGINE_CONF_OPTS += QT_CONFIG-=alsa +QT5WEBENGINE_CONF_OPTS += -no-webengine-alsa +endif + +ifeq ($(BR2_PACKAGE_PULSEAUDIO),y) +QT5WEBENGINE_DEPENDENCIES += pulseaudio +QT5WEBENGINE_CONF_OPTS += -webengine-pulseaudio +else +QT5WEBENGINE_CONF_OPTS += -no-webengine-pulseaudio endif # QtWebengine's build system uses python, but only supports python2. We work @@ -47,21 +152,31 @@ endif # symlink. QT5WEBENGINE_ENV = \ PATH=$(@D)/host-bin:$(BR_PATH) \ - PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig -define QT5WEBENGINE_PYTHON2_SYMLINK + PKG_CONFIG_SYSROOT_DIR="/" +define QT5WEBENGINE_CREATE_HOST_PYTHON_WRAPPER mkdir -p $(@D)/host-bin - ln -sf $(HOST_DIR)/bin/python2 $(@D)/host-bin/python + sed s%@HOST_DIR@%$(HOST_DIR)%g $(QT5WEBENGINE_PKGDIR)/host-python-wrapper.in > $(@D)/host-bin/python + chmod +x $(@D)/host-bin/python endef -QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_PYTHON2_SYMLINK +QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_CREATE_HOST_PYTHON_WRAPPER 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 + mkdir -p $(@D)/host-bin 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 Sat Feb 5 20:23:49 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 5 Feb 2022 21:23:49 +0100 Subject: [Buildroot] [PATCH v6 4/8] package/qt5/qt5base: enable ccache via configure option In-Reply-To: <20220205201837.3324085-4-james.hilliard1@gmail.com> References: <20220205201837.3324085-1-james.hilliard1@gmail.com> <20220205201837.3324085-4-james.hilliard1@gmail.com> Message-ID: <20220205212349.17db6aa4@windsurf> On Sat, 5 Feb 2022 13:18:33 -0700 James Hilliard wrote: > # This allows to use ccache when available > -define QT5BASE_CONFIGURE_HOSTCC > - $(SED) 's,^QMAKE_CC\s*=.*,QMAKE_CC = $(HOSTCC),' $(@D)/mkspecs/common/g++-base.conf > - $(SED) 's,^QMAKE_CXX\s*=.*,QMAKE_CXX = $(HOSTCXX),' $(@D)/mkspecs/common/g++-base.conf > -endef This this variable is dropped, then surely the place it was used should also be modified? > +ifeq ($(BR2_CCACHE),y) > +QT5BASE_CONFIGURE_OPTS += -ccache > +endif Are we sure this is going to use Buildroot's ccache and not the system ccache? Indeed, $(HOSTCC) and $(HOSTCXX) are defined as: CCACHE = $(HOST_DIR)/bin/ccache HOSTCC = $(CCACHE) $(HOSTCC_NOCCACHE) HOSTCXX = $(CCACHE) $(HOSTCXX_NOCCACHE) so we know that it's the Buildroot ccache that will be used. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From james.hilliard1 at gmail.com Sat Feb 5 20:18:35 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 5 Feb 2022 13:18:35 -0700 Subject: [Buildroot] [PATCH v6 6/8] package/qt5/qt5webengine-chromium: new package In-Reply-To: <20220205201837.3324085-1-james.hilliard1@gmail.com> References: <20220205201837.3324085-1-james.hilliard1@gmail.com> Message-ID: <20220205201837.3324085-6-james.hilliard1@gmail.com> 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. Signed-off-by: James Hilliard --- package/qt5/Config.in | 1 + .../0001-Add-python3-build-support.patch | 1858 +++++++++++++++++ .../0002-Don-t-rebase-sysroot-path.patch | 32 + package/qt5/qt5webengine-chromium/Config.in | 5 + .../qt5webengine-chromium/chromium-latest.inc | 1257 +++++++++++ .../qt5webengine-chromium.hash | 1256 +++++++++++ .../qt5webengine-chromium.mk | 23 + 7 files changed, 4432 insertions(+) create mode 100644 package/qt5/qt5webengine-chromium/0001-Add-python3-build-support.patch create mode 100644 package/qt5/qt5webengine-chromium/0002-Don-t-rebase-sysroot-path.patch 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 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/qt5webengine-chromium/0001-Add-python3-build-support.patch b/package/qt5/qt5webengine-chromium/0001-Add-python3-build-support.patch new file mode 100644 index 0000000000..cc9726418e --- /dev/null +++ b/package/qt5/qt5webengine-chromium/0001-Add-python3-build-support.patch @@ -0,0 +1,1858 @@ +From bf94b834e9beb4e7bc25dbc4c61f5e2db39e7cdc Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Fri, 4 Feb 2022 15:43:35 -0700 +Subject: [PATCH] Add python3 build support + +Adapted from: +https://github.com/archlinux/svntogit-packages/blob/6edf5f1aaea952d046aff89a2e0175258fe77361/trunk/qt5-webengine-chromium-python3.patch + +Signed-off-by: James Hilliard +--- + .../protobufs/binary_proto_generator.py | 8 +- + .../tracing/generate_trace_viewer_grd.py | 2 +- + chromium/mojo/public/tools/bindings/BUILD.gn | 2 + + .../tools/bindings/gen_data_files_list.py | 8 +- + .../generators/mojom_java_generator.py | 4 + + .../tools/mojom/mojom/generate/generator.py | 14 ++-- + .../tools/mojom/mojom/generate/module.py | 3 +- + .../mojom/mojom/generate/template_expander.py | 12 +-- + .../scripts/bind_gen/blink_v8_bridge.py | 6 +- + .../scripts/bind_gen/callback_interface.py | 2 +- + .../bindings/scripts/bind_gen/code_node.py | 10 +-- + .../bindings/scripts/bind_gen/codegen_expr.py | 15 ++-- + .../scripts/bind_gen/codegen_format.py | 2 +- + .../scripts/bind_gen/codegen_utils.py | 2 +- + .../bindings/scripts/bind_gen/dictionary.py | 2 +- + .../bindings/scripts/bind_gen/interface.py | 82 +++++++++++-------- + .../scripts/bind_gen/mako_renderer.py | 2 +- + .../bindings/scripts/bind_gen/style_format.py | 9 +- + .../bindings/scripts/bind_gen/task_queue.py | 5 +- + .../bindings/scripts/code_generator.py | 10 +++ + .../scripts/generate_origin_trial_features.py | 4 +- + .../bindings/scripts/idl_definitions.py | 8 +- + .../renderer/bindings/scripts/idl_reader.py | 4 +- + .../renderer/bindings/scripts/idl_types.py | 2 +- + .../renderer/bindings/scripts/utilities.py | 28 +++---- + .../renderer/bindings/scripts/v8_interface.py | 9 +- + .../renderer/bindings/scripts/v8_methods.py | 4 + + .../renderer/bindings/scripts/v8_utilities.py | 2 +- + .../scripts/web_idl/callback_interface.py | 12 +-- + .../bindings/scripts/web_idl/database.py | 2 +- + .../bindings/scripts/web_idl/exposure.py | 5 +- + .../bindings/scripts/web_idl/function_like.py | 28 +++---- + .../bindings/scripts/web_idl/idl_compiler.py | 21 ++--- + .../bindings/scripts/web_idl/interface.py | 45 +++++----- + .../bindings/scripts/web_idl/ir_builder.py | 29 ++++--- + .../bindings/scripts/web_idl/make_copy.py | 7 ++ + .../bindings/scripts/web_idl/namespace.py | 12 +-- + .../bindings/templates/dictionary_v8.cc.tmpl | 8 +- + .../scripts/core/css/make_style_shorthands.py | 23 +++--- + .../properties/make_css_property_instances.py | 4 +- + .../blink/renderer/build/scripts/gperf.py | 2 +- + .../blink/renderer/build/scripts/in_file.py | 2 +- + .../renderer/build/scripts/in_generator.py | 5 ++ + .../build/scripts/make_runtime_features.py | 2 +- + .../scripts/templates/element_factory.cc.tmpl | 4 +- + .../templates/element_type_helpers.cc.tmpl | 4 +- + .../templates/element_type_helpers.h.tmpl | 2 +- + .../build/scripts/templates/macros.tmpl | 4 +- + .../templates/make_qualified_names.h.tmpl | 4 +- + .../dawn/generator/generator_lib.py | 4 + + .../devtools-frontend/src/BUILD.gn | 2 + + .../scripts/build/build_inspector_overlay.py | 3 +- + .../build/build_release_applications.py | 9 +- + .../scripts/build/generate_devtools_grd.py | 4 +- + .../src/scripts/build/modular_build.py | 6 +- + chromium/third_party/jinja2/tests.py | 2 +- + chromium/tools/metrics/ukm/gen_builders.py | 5 +- + .../ui/ozone/generate_constructor_list.py | 13 ++- + .../ui/ozone/generate_ozone_platform_list.py | 26 ++++-- + 59 files changed, 331 insertions(+), 229 deletions(-) + +diff --git a/chromium/components/resources/protobufs/binary_proto_generator.py b/chromium/components/resources/protobufs/binary_proto_generator.py +index 7422ead9697..16365515f26 100755 +--- a/chromium/components/resources/protobufs/binary_proto_generator.py ++++ b/chromium/components/resources/protobufs/binary_proto_generator.py +@@ -7,7 +7,7 @@ + Converts a given ASCII proto into a binary resource. + + """ +- ++from __future__ import print_function + import abc + import imp + import optparse +@@ -196,12 +196,12 @@ class BinaryProtoGenerator: + self._ImportProtoModules(opts.path) + + if not self.VerifyArgs(opts): +- print "Wrong arguments" ++ print("Wrong arguments") + return 1 + + try: + self._GenerateBinaryProtos(opts) + except Exception as e: +- print "ERROR: Failed to render binary version of %s:\n %s\n%s" % ( +- opts.infile, str(e), traceback.format_exc()) ++ print("ERROR: Failed to render binary version of %s:\n %s\n%s" % ++ (opts.infile, str(e), traceback.format_exc())) + return 1 +diff --git a/chromium/content/browser/tracing/generate_trace_viewer_grd.py b/chromium/content/browser/tracing/generate_trace_viewer_grd.py +index 037f9497dc2..be393d21f90 100755 +--- a/chromium/content/browser/tracing/generate_trace_viewer_grd.py ++++ b/chromium/content/browser/tracing/generate_trace_viewer_grd.py +@@ -74,7 +74,7 @@ def main(argv): + for filename in parsed_args.source_files: + add_file_to_grd(doc, os.path.basename(filename)) + +- with open(parsed_args.output_filename, 'w') as output_file: ++ with open(parsed_args.output_filename, 'wb') as output_file: + output_file.write(doc.toxml(encoding='UTF-8')) + + +diff --git a/chromium/mojo/public/tools/bindings/BUILD.gn b/chromium/mojo/public/tools/bindings/BUILD.gn +index fc04b5dd0b1..708958e438b 100644 +--- a/chromium/mojo/public/tools/bindings/BUILD.gn ++++ b/chromium/mojo/public/tools/bindings/BUILD.gn +@@ -2,9 +2,11 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import("//build/config/python.gni") + import("//mojo/public/tools/bindings/mojom.gni") + import("//third_party/jinja2/jinja2.gni") + ++# TODO(crbug.com/1194274): Investigate nondeterminism in Py3 builds. + action("precompile_templates") { + sources = mojom_generator_sources + sources += [ +diff --git a/chromium/mojo/public/tools/bindings/gen_data_files_list.py b/chromium/mojo/public/tools/bindings/gen_data_files_list.py +index 79c9e50efce..8b78d092418 100644 +--- a/chromium/mojo/public/tools/bindings/gen_data_files_list.py ++++ b/chromium/mojo/public/tools/bindings/gen_data_files_list.py +@@ -18,7 +18,6 @@ import os + import re + import sys + +-from cStringIO import StringIO + from optparse import OptionParser + + sys.path.insert( +@@ -41,12 +40,9 @@ def main(): + pattern = re.compile(options.pattern) + files = [f for f in os.listdir(options.directory) if pattern.match(f)] + +- stream = StringIO() +- for f in files: +- print(f, file=stream) ++ contents = '\n'.join(f for f in files) + '\n' ++ WriteFile(contents, options.output) + +- WriteFile(stream.getvalue(), options.output) +- stream.close() + + if __name__ == '__main__': + sys.exit(main()) +diff --git a/chromium/mojo/public/tools/bindings/generators/mojom_java_generator.py b/chromium/mojo/public/tools/bindings/generators/mojom_java_generator.py +index 96b2fdfae0c..00b9dccd00c 100644 +--- a/chromium/mojo/public/tools/bindings/generators/mojom_java_generator.py ++++ b/chromium/mojo/public/tools/bindings/generators/mojom_java_generator.py +@@ -25,6 +25,10 @@ sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir, + 'build', 'android', 'gyp')) + from util import build_utils + ++# TODO(crbug.com/1174969): Remove this once Python2 is obsoleted. ++if sys.version_info.major != 2: ++ basestring = str ++ long = int + + GENERATOR_PREFIX = 'java' + +diff --git a/chromium/mojo/public/tools/mojom/mojom/generate/generator.py b/chromium/mojo/public/tools/mojom/mojom/generate/generator.py +index de62260a5c9..4a1c73fcf82 100644 +--- a/chromium/mojo/public/tools/mojom/mojom/generate/generator.py ++++ b/chromium/mojo/public/tools/mojom/mojom/generate/generator.py +@@ -136,9 +136,14 @@ class Stylizer(object): + + def WriteFile(contents, full_path): + # If |contents| is same with the file content, we skip updating. ++ if not isinstance(contents, bytes): ++ data = contents.encode('utf8') ++ else: ++ data = contents ++ + if os.path.isfile(full_path): + with open(full_path, 'rb') as destination_file: +- if destination_file.read() == contents: ++ if destination_file.read() == data: + return + + # Make sure the containing directory exists. +@@ -146,11 +151,8 @@ def WriteFile(contents, full_path): + fileutil.EnsureDirectoryExists(full_dir) + + # Dump the data to disk. +- with open(full_path, "wb") as f: +- if not isinstance(contents, bytes): +- f.write(contents.encode('utf-8')) +- else: +- f.write(contents) ++ with open(full_path, 'wb') as f: ++ f.write(data) + + + def AddComputedData(module): +diff --git a/chromium/mojo/public/tools/mojom/mojom/generate/module.py b/chromium/mojo/public/tools/mojom/mojom/generate/module.py +index ebbc9b322ea..3d026429bbc 100644 +--- a/chromium/mojo/public/tools/mojom/mojom/generate/module.py ++++ b/chromium/mojo/public/tools/mojom/mojom/generate/module.py +@@ -398,7 +398,8 @@ class Field(object): + + + class StructField(Field): +- pass ++ def __hash__(self): ++ return super(Field, self).__hash__() + + + class UnionField(Field): +diff --git a/chromium/mojo/public/tools/mojom/mojom/generate/template_expander.py b/chromium/mojo/public/tools/mojom/mojom/generate/template_expander.py +index 7a300560246..8d9e26fb7f6 100644 +--- a/chromium/mojo/public/tools/mojom/mojom/generate/template_expander.py ++++ b/chromium/mojo/public/tools/mojom/mojom/generate/template_expander.py +@@ -75,9 +75,9 @@ def PrecompileTemplates(generator_modules, output_dir): + os.path.dirname(module.__file__), generator.GetTemplatePrefix()) + ])) + jinja_env.filters.update(generator.GetFilters()) +- jinja_env.compile_templates( +- os.path.join(output_dir, "%s.zip" % generator.GetTemplatePrefix()), +- extensions=["tmpl"], +- zip="stored", +- py_compile=True, +- ignore_errors=False) ++ jinja_env.compile_templates(os.path.join( ++ output_dir, "%s.zip" % generator.GetTemplatePrefix()), ++ extensions=["tmpl"], ++ zip="stored", ++ py_compile=sys.version_info.major < 3, ++ ignore_errors=False) +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/blink_v8_bridge.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/blink_v8_bridge.py +index 3225ecca6e4..fc078d31b55 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/blink_v8_bridge.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/blink_v8_bridge.py +@@ -344,7 +344,7 @@ def make_default_value_expr(idl_type, default_value): + """ + assert default_value.is_type_compatible_with(idl_type) + +- class DefaultValueExpr: ++ class DefaultValueExpr(object): + _ALLOWED_SYMBOLS_IN_DEPS = ("isolate") + + def __init__(self, initializer_expr, initializer_deps, +@@ -502,7 +502,7 @@ def make_v8_to_blink_value(blink_var_name, + assert isinstance(blink_var_name, str) + assert isinstance(v8_value_expr, str) + assert isinstance(idl_type, web_idl.IdlType) +- assert (argument_index is None or isinstance(argument_index, (int, long))) ++ assert (argument_index is None or isinstance(argument_index, int)) + assert (default_value is None + or isinstance(default_value, web_idl.LiteralConstant)) + +@@ -622,7 +622,7 @@ def make_v8_to_blink_value_variadic(blink_var_name, v8_array, + """ + assert isinstance(blink_var_name, str) + assert isinstance(v8_array, str) +- assert isinstance(v8_array_start_index, (int, long)) ++ assert isinstance(v8_array_start_index, int) + assert isinstance(idl_type, web_idl.IdlType) + + pattern = ("auto&& ${{{_1}}} = " +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/callback_interface.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/callback_interface.py +index 4a6df513068..8b51f23a409 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/callback_interface.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/callback_interface.py +@@ -177,7 +177,7 @@ def generate_callback_interface(callback_interface_identifier): + prop_install_mode=PropInstallMode.UNCONDITIONAL, + trampoline_var_name=None, + attribute_entries=[], +- constant_entries=filter(is_unconditional, constant_entries), ++ constant_entries=list(filter(is_unconditional, constant_entries)), + exposed_construct_entries=[], + operation_entries=[]) + (install_interface_template_decl, install_interface_template_def, +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/code_node.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/code_node.py +index 52972fefe20..e5ae9d9629e 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/code_node.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/code_node.py +@@ -503,13 +503,13 @@ class CompositeNode(CodeNode): + gensym_kwargs = {} + template_vars = {} + for arg in args: +- assert isinstance(arg, (CodeNode, int, long, str)) ++ assert isinstance(arg, (CodeNode, int, str)) + gensym = CodeNode.gensym() + gensym_args.append("${{{}}}".format(gensym)) + template_vars[gensym] = arg + for key, value in kwargs.items(): +- assert isinstance(key, (int, long, str)) +- assert isinstance(value, (CodeNode, int, long, str)) ++ assert isinstance(key, (int, str)) ++ assert isinstance(value, (CodeNode, int, str)) + gensym = CodeNode.gensym() + gensym_kwargs[key] = "${{{}}}".format(gensym) + template_vars[gensym] = value +@@ -602,7 +602,7 @@ class ListNode(CodeNode): + def insert(self, index, node): + if node is None: + return +- assert isinstance(index, (int, long)) ++ assert isinstance(index, int) + assert isinstance(node, CodeNode) + assert node.outer is None and node.prev is None + +@@ -721,7 +721,7 @@ class SymbolScopeNode(SequenceNode): + if not scope_chains: + return counts + +- self_index = iter(scope_chains).next().index(self) ++ self_index = next(iter(scope_chains)).index(self) + scope_chains = map( + lambda scope_chain: scope_chain[self_index + 1:], scope_chains) + scope_to_likeliness = {} +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_expr.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_expr.py +index a229a6c71c9..5fa288dabf2 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_expr.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_expr.py +@@ -109,7 +109,7 @@ def expr_and(terms): + + if any(term.is_always_false for term in terms): + return _Expr(False) +- terms = filter(lambda x: not x.is_always_true, terms) ++ terms = list(filter(lambda x: not x.is_always_true, terms)) + if not terms: + return _Expr(True) + if len(terms) == 1: +@@ -124,7 +124,7 @@ def expr_or(terms): + + if any(term.is_always_true for term in terms): + return _Expr(True) +- terms = filter(lambda x: not x.is_always_false, terms) ++ terms = list(filter(lambda x: not x.is_always_false, terms)) + if not terms: + return _Expr(False) + if len(terms) == 1: +@@ -222,7 +222,7 @@ def expr_from_exposure(exposure, + elif exposure.only_in_secure_contexts is False: + secure_context_term = _Expr(True) + else: +- terms = map(ref_enabled, exposure.only_in_secure_contexts) ++ terms = list(map(ref_enabled, exposure.only_in_secure_contexts)) + secure_context_term = expr_or( + [_Expr("${is_in_secure_context}"), + expr_not(expr_and(terms))]) +@@ -275,10 +275,11 @@ def expr_from_exposure(exposure, + + # [ContextEnabled] + if exposure.context_enabled_features: +- terms = map( +- lambda feature: _Expr( +- "${{context_feature_settings}}->is{}Enabled()".format( +- feature)), exposure.context_enabled_features) ++ terms = list( ++ map( ++ lambda feature: _Expr( ++ "${{context_feature_settings}}->is{}Enabled()".format( ++ feature)), exposure.context_enabled_features)) + context_enabled_terms.append( + expr_and([_Expr("${context_feature_settings}"), + expr_or(terms)])) +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_format.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_format.py +index 87d26eec3ca..f3e9d38247e 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_format.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_format.py +@@ -23,7 +23,7 @@ class _TemplateFormatter(string.Formatter): + self._template_formatter_indexing_count_ = 0 + + def get_value(self, key, args, kwargs): +- if isinstance(key, (int, long)): ++ if isinstance(key, int): + return args[key] + assert isinstance(key, str) + if not key: +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_utils.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_utils.py +index 2bcc4fed49a..e72282aa696 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_utils.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_utils.py +@@ -116,4 +116,4 @@ def write_code_node_to_file(code_node, filepath): + # stderr=format_result.error_message)) + # + # web_idl.file_io.write_to_file_if_changed(filepath, format_result.contents) +- web_idl.file_io.write_to_file_if_changed(filepath, rendered_text) ++ web_idl.file_io.write_to_file_if_changed(filepath, rendered_text.encode('utf-8')) +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/dictionary.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/dictionary.py +index b39f0100410..4d68202296b 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/dictionary.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/dictionary.py +@@ -993,7 +993,7 @@ def make_dict_trace_func(cg_context): + _2 = _blink_member_name(member).value_var + return TextNode(_format(pattern, _1=_1, _2=_2)) + +- body.extend(map(make_trace_member_node, own_members)) ++ body.extend(list(map(make_trace_member_node, own_members))) + body.append(TextNode("BaseClass::Trace(visitor);")) + + return func_decl, func_def +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py +index 10ff30656ad..bfdf7128aac 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py +@@ -582,7 +582,7 @@ def _make_blink_api_call(code_node, + overriding_args=None): + assert isinstance(code_node, SymbolScopeNode) + assert isinstance(cg_context, CodeGenContext) +- assert num_of_args is None or isinstance(num_of_args, (int, long)) ++ assert num_of_args is None or isinstance(num_of_args, int) + assert (overriding_args is None + or (isinstance(overriding_args, (list, tuple)) + and all(isinstance(arg, str) for arg in overriding_args))) +@@ -1196,8 +1196,10 @@ def make_overload_dispatcher(cg_context): + did_use_break = did_use_break or can_fail + + conditional = expr_or( +- map(lambda item: expr_from_exposure(item.function_like.exposure), +- items)) ++ list( ++ map( ++ lambda item: expr_from_exposure(item.function_like.exposure ++ ), items))) + if not conditional.is_always_true: + node = CxxUnlikelyIfNode(cond=conditional, body=node) + +@@ -4642,7 +4644,7 @@ class _PropEntryConstructorGroup(_PropEntryBase): + def __init__(self, is_context_dependent, exposure_conditional, world, + constructor_group, ctor_callback_name, ctor_func_length): + assert isinstance(ctor_callback_name, str) +- assert isinstance(ctor_func_length, (int, long)) ++ assert isinstance(ctor_func_length, int) + + _PropEntryBase.__init__(self, is_context_dependent, + exposure_conditional, world, constructor_group) +@@ -4670,7 +4672,7 @@ class _PropEntryOperationGroup(_PropEntryBase): + op_func_length, + no_alloc_direct_callback_name=None): + assert isinstance(op_callback_name, str) +- assert isinstance(op_func_length, (int, long)) ++ assert isinstance(op_func_length, int) + + _PropEntryBase.__init__(self, is_context_dependent, + exposure_conditional, world, operation_group) +@@ -5175,9 +5177,9 @@ def make_install_interface_template(cg_context, function_name, class_name, api_c + ]) + + if class_like.identifier == "CSSStyleDeclaration": +- css_properties = filter( +- lambda attr: "CSSProperty" in attr.extended_attributes, +- class_like.attributes) ++ css_properties = list( ++ filter(lambda attr: "CSSProperty" in attr.extended_attributes, ++ class_like.attributes)) + if css_properties: + prop_name_list = "".join( + map(lambda attr: "\"{}\", ".format(attr.identifier), +@@ -5567,8 +5569,8 @@ ${instance_object} = ${v8_context}->Global()->GetPrototype().As();\ + "V8DOMConfiguration::InstallConstants(${isolate}, " + "${interface_template}, ${prototype_template}, " + "kConstantCallbackTable, base::size(kConstantCallbackTable));") +- constant_callback_entries = filter(lambda entry: entry.const_callback_name, +- constant_entries) ++ constant_callback_entries = list(filter(lambda entry: entry.const_callback_name, ++ constant_entries)) + install_properties(table_name, constant_callback_entries, + _make_constant_callback_registration_table, + installer_call_text) +@@ -5584,8 +5586,8 @@ ${instance_object} = ${v8_context}->Global()->GetPrototype().As();\ + "V8DOMConfiguration::InstallConstants(${isolate}, " + "${interface_template}, ${prototype_template}, " + "kConstantValueTable, base::size(kConstantValueTable));") +- constant_value_entries = filter( +- lambda entry: not entry.const_callback_name, constant_entries) ++ constant_value_entries = list(filter( ++ lambda entry: not entry.const_callback_name, constant_entries)) + install_properties(table_name, constant_value_entries, + _make_constant_value_registration_table, + installer_call_text) +@@ -6336,8 +6338,8 @@ def make_v8_context_snapshot_api(cg_context, component, attribute_entries, + assert isinstance(component, web_idl.Component) + + derived_interfaces = cg_context.interface.deriveds +- derived_names = map(lambda interface: interface.identifier, +- derived_interfaces) ++ derived_names = list( ++ map(lambda interface: interface.identifier, derived_interfaces)) + derived_names.append(cg_context.interface.identifier) + if not ("Window" in derived_names or "HTMLDocument" in derived_names): + return None, None +@@ -6411,9 +6413,11 @@ def _make_v8_context_snapshot_get_reference_table_function( + collect_callbacks(named_properties_object_callback_defs) + collect_callbacks(cross_origin_property_callback_defs) + +- entry_nodes = map( +- lambda name: TextNode("reinterpret_cast({}),".format(name)), +- filter(None, callback_names)) ++ entry_nodes = list( ++ map( ++ lambda name: TextNode("reinterpret_cast({}),".format(name ++ )), ++ filter(None, callback_names))) + table_node = ListNode([ + TextNode("using namespace ${class_name}Callbacks;"), + TextNode("static const intptr_t kReferenceTable[] = {"), +@@ -6451,10 +6455,11 @@ def _make_v8_context_snapshot_install_props_per_context_function( + class_name=None, + prop_install_mode=PropInstallMode.V8_CONTEXT_SNAPSHOT, + trampoline_var_name=None, +- attribute_entries=filter(selector, attribute_entries), +- constant_entries=filter(selector, constant_entries), +- exposed_construct_entries=filter(selector, exposed_construct_entries), +- operation_entries=filter(selector, operation_entries)) ++ attribute_entries=list(filter(selector, attribute_entries)), ++ constant_entries=list(filter(selector, constant_entries)), ++ exposed_construct_entries=list( ++ filter(selector, exposed_construct_entries)), ++ operation_entries=list(filter(selector, operation_entries))) + + return func_decl, func_def + +@@ -6810,11 +6815,11 @@ def generate_interface(interface_identifier): + class_name=impl_class_name, + prop_install_mode=PropInstallMode.UNCONDITIONAL, + trampoline_var_name=tp_install_unconditional_props, +- attribute_entries=filter(is_unconditional, attribute_entries), +- constant_entries=filter(is_unconditional, constant_entries), +- exposed_construct_entries=filter(is_unconditional, +- exposed_construct_entries), +- operation_entries=filter(is_unconditional, operation_entries)) ++ attribute_entries=list(filter(is_unconditional, attribute_entries)), ++ constant_entries=list(filter(is_unconditional, constant_entries)), ++ exposed_construct_entries=list( ++ filter(is_unconditional, exposed_construct_entries)), ++ operation_entries=list(filter(is_unconditional, operation_entries))) + (install_context_independent_props_decl, + install_context_independent_props_def, + install_context_independent_props_trampoline) = make_install_properties( +@@ -6823,11 +6828,14 @@ def generate_interface(interface_identifier): + class_name=impl_class_name, + prop_install_mode=PropInstallMode.CONTEXT_INDEPENDENT, + trampoline_var_name=tp_install_context_independent_props, +- attribute_entries=filter(is_context_independent, attribute_entries), +- constant_entries=filter(is_context_independent, constant_entries), +- exposed_construct_entries=filter(is_context_independent, +- exposed_construct_entries), +- operation_entries=filter(is_context_independent, operation_entries)) ++ attribute_entries=list( ++ filter(is_context_independent, attribute_entries)), ++ constant_entries=list(filter(is_context_independent, ++ constant_entries)), ++ exposed_construct_entries=list( ++ filter(is_context_independent, exposed_construct_entries)), ++ operation_entries=list( ++ filter(is_context_independent, operation_entries))) + (install_context_dependent_props_decl, install_context_dependent_props_def, + install_context_dependent_props_trampoline) = make_install_properties( + cg_context, +@@ -6835,11 +6843,13 @@ def generate_interface(interface_identifier): + class_name=impl_class_name, + prop_install_mode=PropInstallMode.CONTEXT_DEPENDENT, + trampoline_var_name=tp_install_context_dependent_props, +- attribute_entries=filter(is_context_dependent, attribute_entries), +- constant_entries=filter(is_context_dependent, constant_entries), +- exposed_construct_entries=filter(is_context_dependent, +- exposed_construct_entries), +- operation_entries=filter(is_context_dependent, operation_entries)) ++ attribute_entries=list(filter(is_context_dependent, ++ attribute_entries)), ++ constant_entries=list(filter(is_context_dependent, constant_entries)), ++ exposed_construct_entries=list( ++ filter(is_context_dependent, exposed_construct_entries)), ++ operation_entries=list(filter(is_context_dependent, ++ operation_entries))) + (install_interface_template_decl, install_interface_template_def, + install_interface_template_trampoline) = make_install_interface_template( + cg_context, +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/mako_renderer.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/mako_renderer.py +index b4c70553863..f3a2fcd772d 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/mako_renderer.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/mako_renderer.py +@@ -105,7 +105,7 @@ class MakoRenderer(object): + on_error = self._caller_stack_on_error + if (len(current) <= len(on_error) + and all(current[i] == on_error[i] +- for i in xrange(len(current)))): ++ for i in range(len(current)))): + pass # Error happened in a deeper caller. + else: + self._caller_stack_on_error = list(self._caller_stack) +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py +index dc3493cc394..017d3d47bb3 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py +@@ -70,8 +70,13 @@ def gn_format(contents, filename=None): + + + def _invoke_format_command(command_line, filename, contents): +- proc = subprocess.Popen( +- command_line, stdin=subprocess.PIPE, stdout=subprocess.PIPE) ++ kwargs = {} ++ if sys.version_info.major != 2: ++ kwargs['encoding'] = 'utf-8' ++ proc = subprocess.Popen(command_line, ++ stdin=subprocess.PIPE, ++ stdout=subprocess.PIPE, ++ **kwargs) + stdout_output, stderr_output = proc.communicate(input=contents) + exit_code = proc.wait() + +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/task_queue.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/task_queue.py +index 0d8f4c0f303..e666a9b668e 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/task_queue.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/task_queue.py +@@ -2,6 +2,7 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import functools + import multiprocessing + + from .package_initializer import package_initializer +@@ -76,7 +77,7 @@ class TaskQueue(object): + if not report_progress: + return + +- done_count = reduce( ++ done_count = functools.reduce( + lambda count, worker_task: count + bool(worker_task.ready()), + self._worker_tasks, 0) + report_progress(len(self._worker_tasks), done_count) +@@ -85,4 +86,4 @@ class TaskQueue(object): + def _task_queue_run_tasks(tasks): + for task in tasks: + func, args, kwargs = task +- apply(func, args, kwargs) ++ func(*args, **kwargs) +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/code_generator.py b/chromium/third_party/blink/renderer/bindings/scripts/code_generator.py +index e8280be7213..e49e6eb965e 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/code_generator.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/code_generator.py +@@ -13,6 +13,7 @@ import re + import sys + + from idl_types import set_ancestors, IdlType ++from itertools import groupby + from v8_globals import includes + from v8_interface import constant_filters + from v8_types import set_component_dirs +@@ -43,6 +44,7 @@ TEMPLATES_DIR = os.path.normpath( + # after path[0] == invoking script dir + sys.path.insert(1, THIRD_PARTY_DIR) + import jinja2 ++from jinja2.filters import make_attrgetter, environmentfilter + + + def generate_indented_conditional(code, conditional): +@@ -88,6 +90,13 @@ def runtime_enabled_if(code, name): + return generate_indented_conditional(code, function) + + ++ at environmentfilter ++def do_stringify_key_group_by(environment, value, attribute): ++ expr = make_attrgetter(environment, attribute) ++ key = lambda item: '' if expr(item) is None else str(expr(item)) ++ return groupby(sorted(value, key=key), expr) ++ ++ + def initialize_jinja_env(cache_dir): + jinja_env = jinja2.Environment( + loader=jinja2.FileSystemLoader(TEMPLATES_DIR), +@@ -117,6 +126,7 @@ def initialize_jinja_env(cache_dir): + }) + jinja_env.filters.update(constant_filters()) + jinja_env.filters.update(method_filters()) ++ jinja_env.filters["stringifykeygroupby"] = do_stringify_key_group_by + return jinja_env + + +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/generate_origin_trial_features.py b/chromium/third_party/blink/renderer/bindings/scripts/generate_origin_trial_features.py +index 130004eae83..04c0fabcef2 100755 +--- a/chromium/third_party/blink/renderer/bindings/scripts/generate_origin_trial_features.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/generate_origin_trial_features.py +@@ -80,7 +80,7 @@ def read_idl_file(reader, idl_filename): + assert len(interfaces) == 1, ( + "Expected one interface in file %r, found %d" % + (idl_filename, len(interfaces))) +- return (interfaces.values()[0], includes) ++ return (list(interfaces.values())[0], includes) + + + def interface_is_global(interface): +@@ -281,7 +281,7 @@ def main(): + + info_provider = create_component_info_provider( + os.path.normpath(options.info_dir), options.target_component) +- idl_filenames = map(str.strip, open(options.idl_files_list)) ++ idl_filenames = list(map(str.strip, open(options.idl_files_list))) + + generate_origin_trial_features(info_provider, options, idl_filenames) + return 0 +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/idl_definitions.py b/chromium/third_party/blink/renderer/bindings/scripts/idl_definitions.py +index 14e6e9d3f87..b027818aef2 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/idl_definitions.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/idl_definitions.py +@@ -394,7 +394,8 @@ class IdlInterface(object): + else: + raise ValueError('Unrecognized node class: %s' % child_class) + +- if len(filter(None, [self.iterable, self.maplike, self.setlike])) > 1: ++ if len(list(filter(None, ++ [self.iterable, self.maplike, self.setlike]))) > 1: + raise ValueError( + 'Interface can only have one of iterable<>, maplike<> and setlike<>.' + ) +@@ -512,6 +513,9 @@ class IdlAttribute(TypedObject): + def accept(self, visitor): + visitor.visit_attribute(self) + ++ def __lt__(self, other): ++ return self.name < other.name ++ + + ################################################################################ + # Constants +@@ -852,7 +856,7 @@ class IdlIncludes(object): + ################################################################################ + + +-class Exposure: ++class Exposure(object): + """An Exposure holds one Exposed or RuntimeEnabled condition. + Each exposure has two properties: exposed and runtime_enabled. + Exposure(e, r) corresponds to [Exposed(e r)]. Exposure(e) corresponds to +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/idl_reader.py b/chromium/third_party/blink/renderer/bindings/scripts/idl_reader.py +index 8d72865a6ca..b80eebdcd61 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/idl_reader.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/idl_reader.py +@@ -55,8 +55,8 @@ def validate_blink_idl_definitions(idl_filename, idl_file_basename, + definitions. There is no filename convention in this case. + - Otherwise, an IDL file is invalid. + """ +- targets = ( +- definitions.interfaces.values() + definitions.dictionaries.values()) ++ targets = (list(definitions.interfaces.values()) + ++ list(definitions.dictionaries.values())) + number_of_targets = len(targets) + if number_of_targets > 1: + raise Exception( +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/idl_types.py b/chromium/third_party/blink/renderer/bindings/scripts/idl_types.py +index cd4f0c3513b..ab95e9c0b08 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/idl_types.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/idl_types.py +@@ -349,7 +349,7 @@ class IdlUnionType(IdlTypeBase): + return True + + def single_matching_member_type(self, predicate): +- matching_types = filter(predicate, self.flattened_member_types) ++ matching_types = list(filter(predicate, self.flattened_member_types)) + if len(matching_types) > 1: + raise ValueError('%s is ambiguous.' % self.name) + return matching_types[0] if matching_types else None +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/utilities.py b/chromium/third_party/blink/renderer/bindings/scripts/utilities.py +index e1677ee7bd6..3c5006f064f 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/utilities.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/utilities.py +@@ -196,8 +196,9 @@ class ComponentInfoProviderModules(ComponentInfoProvider): + + @property + def callback_functions(self): +- return dict(self._component_info_core['callback_functions'].items() + +- self._component_info_modules['callback_functions'].items()) ++ return dict( ++ list(self._component_info_core['callback_functions'].items()) + ++ list(self._component_info_modules['callback_functions'].items())) + + @property + def specifier_for_export(self): +@@ -209,8 +210,8 @@ class ComponentInfoProviderModules(ComponentInfoProvider): + + + def load_interfaces_info_overall_pickle(info_dir): +- with open(os.path.join(info_dir, +- 'interfaces_info.pickle')) as interface_info_file: ++ with open(os.path.join(info_dir, 'interfaces_info.pickle'), ++ mode='rb') as interface_info_file: + return pickle.load(interface_info_file) + + +@@ -236,23 +237,20 @@ def merge_dict_recursively(target, diff): + + def create_component_info_provider_core(info_dir): + interfaces_info = load_interfaces_info_overall_pickle(info_dir) +- with open( +- os.path.join(info_dir, 'core', +- 'component_info_core.pickle')) as component_info_file: ++ with open(os.path.join(info_dir, 'core', 'component_info_core.pickle'), ++ mode='rb') as component_info_file: + component_info = pickle.load(component_info_file) + return ComponentInfoProviderCore(interfaces_info, component_info) + + + def create_component_info_provider_modules(info_dir): + interfaces_info = load_interfaces_info_overall_pickle(info_dir) +- with open( +- os.path.join(info_dir, 'core', +- 'component_info_core.pickle')) as component_info_file: ++ with open(os.path.join(info_dir, 'core', 'component_info_core.pickle'), ++ mode='rb') as component_info_file: + component_info_core = pickle.load(component_info_file) +- with open( +- os.path.join( +- info_dir, 'modules', +- 'component_info_modules.pickle')) as component_info_file: ++ with open(os.path.join(info_dir, 'modules', ++ 'component_info_modules.pickle'), ++ mode='rb') as component_info_file: + component_info_modules = pickle.load(component_info_file) + return ComponentInfoProviderModules(interfaces_info, component_info_core, + component_info_modules) +@@ -356,7 +354,7 @@ def write_pickle_file(pickle_filename, data): + pickle_filename = abs(pickle_filename) + # If |data| is same with the file content, we skip updating. + if os.path.isfile(pickle_filename): +- with open(pickle_filename) as pickle_file: ++ with open(pickle_filename, 'rb') as pickle_file: + try: + if pickle.load(pickle_file) == data: + return +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/v8_interface.py b/chromium/third_party/blink/renderer/bindings/scripts/v8_interface.py +index a43260414db..a85b03abe75 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/v8_interface.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/v8_interface.py +@@ -189,7 +189,7 @@ def context_enabled_features(attributes): + return sorted([ + member for member in members + if member.get(KEY) and not member.get('exposed_test') +- ]) ++ ], key=lambda item: item['name']) + + def member_filter_by_name(members, name): + return [member for member in members if member[KEY] == name] +@@ -612,7 +612,8 @@ def interface_context(interface, interfaces, component_info): + sorted( + origin_trial_features(interface, context['constants'], + context['attributes'], context['methods']) + +- context_enabled_features(context['attributes'])), ++ context_enabled_features(context['attributes']), ++ key=lambda item: item['name']), + }) + if context['optional_features']: + includes.add('platform/bindings/v8_per_context_data.h') +@@ -1356,9 +1357,9 @@ def resolution_tests_methods(effective_overloads): + + # Extract argument and IDL type to simplify accessing these in each loop. + arguments = [method['arguments'][index] for method in methods] +- arguments_methods = zip(arguments, methods) ++ arguments_methods = list(zip(arguments, methods)) + idl_types = [argument['idl_type_object'] for argument in arguments] +- idl_types_methods = zip(idl_types, methods) ++ idl_types_methods = list(zip(idl_types, methods)) + + # We can?t do a single loop through all methods or simply sort them, because + # a method may be listed in multiple steps of the resolution algorithm, and +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/v8_methods.py b/chromium/third_party/blink/renderer/bindings/scripts/v8_methods.py +index 5f1f89a3def..6ee8a407798 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/v8_methods.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/v8_methods.py +@@ -46,6 +46,10 @@ import v8_types + import v8_utilities + from v8_utilities import (has_extended_attribute_value, is_unforgeable) + ++# TODO: Remove this once Python2 is obsoleted. ++if sys.version_info.major != 2: ++ basestring = str ++ + + def method_is_visible(method, interface_is_partial): + if 'overloads' in method: +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/v8_utilities.py b/chromium/third_party/blink/renderer/bindings/scripts/v8_utilities.py +index 2ecd6923320..fcfc48371b1 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/v8_utilities.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/v8_utilities.py +@@ -271,7 +271,7 @@ EXPOSED_WORKERS = set([ + ]) + + +-class ExposureSet: ++class ExposureSet(object): + """An ExposureSet is a collection of Exposure instructions.""" + + def __init__(self, exposures=None): +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/callback_interface.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/callback_interface.py +index 13fb7c7068d..b73b7710687 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/callback_interface.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/callback_interface.py +@@ -91,11 +91,13 @@ class CallbackInterface(UserDefinedType, WithExtendedAttributes, + for operation_ir in ir.operations + ]) + self._operation_groups = tuple([ +- OperationGroup( +- operation_group_ir, +- filter(lambda x: x.identifier == operation_group_ir.identifier, +- self._operations), +- owner=self) for operation_group_ir in ir.operation_groups ++ OperationGroup(operation_group_ir, ++ list( ++ filter( ++ lambda x: x.identifier == operation_group_ir ++ .identifier, self._operations)), ++ owner=self) ++ for operation_group_ir in ir.operation_groups + ]) + + @property +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/database.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/database.py +index c92cf48eb2a..f5d59129449 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/database.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/database.py +@@ -156,4 +156,4 @@ class Database(object): + return self._view_by_kind(Database._Kind.UNION) + + def _view_by_kind(self, kind): +- return self._impl.find_by_kind(kind).values() ++ return list(self._impl.find_by_kind(kind).values()) +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/exposure.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/exposure.py +index abaeef39c30..e36cf7439ae 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/exposure.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/exposure.py +@@ -8,8 +8,11 @@ from .runtime_enabled_features import RuntimeEnabledFeatures + class _Feature(str): + """Represents a runtime-enabled feature.""" + ++ def __new__(cls, value): ++ return str.__new__(cls, value) ++ + def __init__(self, value): +- str.__init__(self, value) ++ str.__init__(self) + self._is_context_dependent = ( + RuntimeEnabledFeatures.is_context_dependent(self)) + +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/function_like.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/function_like.py +index 648c70d803d..1712f19c672 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/function_like.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/function_like.py +@@ -71,8 +71,9 @@ class FunctionLike(WithIdentifier): + def num_of_required_arguments(self): + """Returns the number of required arguments.""" + return len( +- filter(lambda arg: not (arg.is_optional or arg.is_variadic), +- self.arguments)) ++ list( ++ filter(lambda arg: not (arg.is_optional or arg.is_variadic), ++ self.arguments))) + + + class OverloadGroup(WithIdentifier): +@@ -171,8 +172,7 @@ class OverloadGroup(WithIdentifier): + Returns the effective overload set. + https://heycam.github.io/webidl/#compute-the-effective-overload-set + """ +- assert argument_count is None or isinstance(argument_count, +- (int, long)) ++ assert argument_count is None or isinstance(argument_count, int) + + N = argument_count + S = [] +@@ -188,21 +188,21 @@ class OverloadGroup(WithIdentifier): + + S.append( + OverloadGroup.EffectiveOverloadItem( +- X, map(lambda arg: arg.idl_type, X.arguments), +- map(lambda arg: arg.optionality, X.arguments))) ++ X, list(map(lambda arg: arg.idl_type, X.arguments)), ++ list(map(lambda arg: arg.optionality, X.arguments)))) + + if X.is_variadic: +- for i in xrange(n, max(maxarg, N)): +- t = map(lambda arg: arg.idl_type, X.arguments) +- o = map(lambda arg: arg.optionality, X.arguments) +- for _ in xrange(n, i + 1): ++ for i in range(n, max(maxarg, N)): ++ t = list(map(lambda arg: arg.idl_type, X.arguments)) ++ o = list(map(lambda arg: arg.optionality, X.arguments)) ++ for _ in range(n, i + 1): + t.append(X.arguments[-1].idl_type) + o.append(X.arguments[-1].optionality) + S.append(OverloadGroup.EffectiveOverloadItem(X, t, o)) + +- t = map(lambda arg: arg.idl_type, X.arguments) +- o = map(lambda arg: arg.optionality, X.arguments) +- for i in xrange(n - 1, -1, -1): ++ t = list(map(lambda arg: arg.idl_type, X.arguments)) ++ o = list(map(lambda arg: arg.optionality, X.arguments)) ++ for i in range(n - 1, -1, -1): + if X.arguments[i].optionality == IdlType.Optionality.REQUIRED: + break + S.append(OverloadGroup.EffectiveOverloadItem(X, t[:i], o[:i])) +@@ -222,7 +222,7 @@ class OverloadGroup(WithIdentifier): + for item in items) + assert len(items) > 1 + +- for index in xrange(len(items[0].type_list)): ++ for index in range(len(items[0].type_list)): + # Assume that the given items are valid, and we only need to test + # the two types. + if OverloadGroup.are_distinguishable_types( +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/idl_compiler.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/idl_compiler.py +index c5ee2bd8a3d..58315072480 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/idl_compiler.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/idl_compiler.py +@@ -149,8 +149,8 @@ class IdlCompiler(object): + for old_ir in old_irs: + new_ir = make_copy(old_ir) + self._ir_map.add(new_ir) +- new_ir.attributes = filter(not_disabled, new_ir.attributes) +- new_ir.operations = filter(not_disabled, new_ir.operations) ++ new_ir.attributes = list(filter(not_disabled, new_ir.attributes)) ++ new_ir.operations = list(filter(not_disabled, new_ir.operations)) + + def _record_defined_in_partial_and_mixin(self): + old_irs = self._ir_map.irs_of_kinds( +@@ -231,7 +231,7 @@ class IdlCompiler(object): + only_to_members_of_partial_or_mixin=False) + propagate_to_exposure(propagate) + +- map(process_member_like, ir.iter_all_members()) ++ list(map(process_member_like, ir.iter_all_members())) + + def process_member_like(ir): + propagate = functools.partial(propagate_extattr, ir=ir) +@@ -257,7 +257,7 @@ class IdlCompiler(object): + + self._ir_map.move_to_new_phase() + +- map(process_interface_like, old_irs) ++ list(map(process_interface_like, old_irs)) + + def _determine_blink_headers(self): + irs = self._ir_map.irs_of_kinds( +@@ -422,9 +422,9 @@ class IdlCompiler(object): + assert not new_interface.deriveds + derived_set = identifier_to_derived_set.get( + new_interface.identifier, set()) +- new_interface.deriveds = map( +- lambda id_: self._ref_to_idl_def_factory.create(id_), +- sorted(derived_set)) ++ new_interface.deriveds = list( ++ map(lambda id_: self._ref_to_idl_def_factory.create(id_), ++ sorted(derived_set))) + + def _supplement_missing_html_constructor_operation(self): + # Temporary mitigation of misuse of [HTMLConstructor] +@@ -553,7 +553,8 @@ class IdlCompiler(object): + self._ir_map.add(new_ir) + + for group in new_ir.iter_all_overload_groups(): +- exposures = map(lambda overload: overload.exposure, group) ++ exposures = list(map(lambda overload: overload.exposure, ++ group)) + + # [Exposed] + if any(not exposure.global_names_and_features +@@ -653,8 +654,8 @@ class IdlCompiler(object): + constructs = set() + for global_name in global_names: + constructs.update(exposed_map.get(global_name, [])) +- new_ir.exposed_constructs = map( +- self._ref_to_idl_def_factory.create, sorted(constructs)) ++ new_ir.exposed_constructs = list( ++ map(self._ref_to_idl_def_factory.create, sorted(constructs))) + + assert not new_ir.legacy_window_aliases + if new_ir.identifier != 'Window': +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/interface.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/interface.py +index 65d24e529d1..067ef2eb0b2 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/interface.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/interface.py +@@ -180,8 +180,9 @@ class Interface(UserDefinedType, WithExtendedAttributes, WithCodeGeneratorInfo, + self._constructor_groups = tuple([ + ConstructorGroup( + group_ir, +- filter(lambda x: x.identifier == group_ir.identifier, +- self._constructors), ++ list( ++ filter(lambda x: x.identifier == group_ir.identifier, ++ self._constructors)), + owner=self) for group_ir in ir.constructor_groups + ]) + assert len(self._constructor_groups) <= 1 +@@ -192,8 +193,9 @@ class Interface(UserDefinedType, WithExtendedAttributes, WithCodeGeneratorInfo, + self._named_constructor_groups = tuple([ + ConstructorGroup( + group_ir, +- filter(lambda x: x.identifier == group_ir.identifier, +- self._named_constructors), ++ list( ++ filter(lambda x: x.identifier == group_ir.identifier, ++ self._named_constructors)), + owner=self) for group_ir in ir.named_constructor_groups + ]) + self._operations = tuple([ +@@ -203,22 +205,23 @@ class Interface(UserDefinedType, WithExtendedAttributes, WithCodeGeneratorInfo, + self._operation_groups = tuple([ + OperationGroup( + group_ir, +- filter(lambda x: x.identifier == group_ir.identifier, +- self._operations), ++ list( ++ filter(lambda x: x.identifier == group_ir.identifier, ++ self._operations)), + owner=self) for group_ir in ir.operation_groups + ]) + self._exposed_constructs = tuple(ir.exposed_constructs) + self._legacy_window_aliases = tuple(ir.legacy_window_aliases) + self._indexed_and_named_properties = None +- indexed_and_named_property_operations = filter( +- lambda x: x.is_indexed_or_named_property_operation, +- self._operations) ++ indexed_and_named_property_operations = list( ++ filter(lambda x: x.is_indexed_or_named_property_operation, ++ self._operations)) + if indexed_and_named_property_operations: + self._indexed_and_named_properties = IndexedAndNamedProperties( + indexed_and_named_property_operations, owner=self) + self._stringifier = None +- stringifier_operation_irs = filter(lambda x: x.is_stringifier, +- ir.operations) ++ stringifier_operation_irs = list( ++ filter(lambda x: x.is_stringifier, ir.operations)) + if stringifier_operation_irs: + assert len(stringifier_operation_irs) == 1 + op_ir = make_copy(stringifier_operation_irs[0]) +@@ -231,8 +234,9 @@ class Interface(UserDefinedType, WithExtendedAttributes, WithCodeGeneratorInfo, + attribute = None + if operation.stringifier_attribute: + attr_id = operation.stringifier_attribute +- attributes = filter(lambda x: x.identifier == attr_id, +- self._attributes) ++ attributes = list( ++ filter(lambda x: x.identifier == attr_id, ++ self._attributes)) + assert len(attributes) == 1 + attribute = attributes[0] + self._stringifier = Stringifier(operation, attribute, owner=self) +@@ -578,8 +582,9 @@ class Iterable(WithDebugInfo): + self._operation_groups = tuple([ + OperationGroup( + group_ir, +- filter(lambda x: x.identifier == group_ir.identifier, +- self._operations), ++ list( ++ filter(lambda x: x.identifier == group_ir.identifier, ++ self._operations)), + owner=owner) for group_ir in ir.operation_groups + ]) + +@@ -666,8 +671,9 @@ class Maplike(WithDebugInfo): + self._operation_groups = tuple([ + OperationGroup( + group_ir, +- filter(lambda x: x.identifier == group_ir.identifier, +- self._operations), ++ list( ++ filter(lambda x: x.identifier == group_ir.identifier, ++ self._operations)), + owner=owner) for group_ir in ir.operation_groups + ]) + +@@ -755,8 +761,9 @@ class Setlike(WithDebugInfo): + self._operation_groups = tuple([ + OperationGroup( + group_ir, +- filter(lambda x: x.identifier == group_ir.identifier, +- self._operations), ++ list( ++ filter(lambda x: x.identifier == group_ir.identifier, ++ self._operations)), + owner=owner) for group_ir in ir.operation_groups + ]) + +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/ir_builder.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/ir_builder.py +index e9aeff4ab82..d80554d603e 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/ir_builder.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/ir_builder.py +@@ -2,6 +2,8 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import sys ++ + from .argument import Argument + from .ast_group import AstGroup + from .attribute import Attribute +@@ -30,6 +32,11 @@ from .operation import Operation + from .typedef import Typedef + + ++# TODO: Remove this once Python2 is obsoleted. ++if sys.version_info.major != 2: ++ long = int ++ ++ + def load_and_register_idl_definitions(filepaths, register_ir, + create_ref_to_idl_def, idl_type_factory): + """ +@@ -160,7 +167,7 @@ class _IRBuilder(object): + child_nodes = list(node.GetChildren()) + extended_attributes = self._take_extended_attributes(child_nodes) + +- members = map(self._build_interface_member, child_nodes) ++ members = list(map(self._build_interface_member, child_nodes)) + attributes = [] + constants = [] + operations = [] +@@ -302,7 +309,7 @@ class _IRBuilder(object): + child_nodes = list(node.GetChildren()) + inherited = self._take_inheritance(child_nodes) + extended_attributes = self._take_extended_attributes(child_nodes) +- own_members = map(self._build_dictionary_member, child_nodes) ++ own_members = list(map(self._build_dictionary_member, child_nodes)) + + return Dictionary.IR( + identifier=Identifier(node.GetName()), +@@ -336,7 +343,7 @@ class _IRBuilder(object): + + child_nodes = list(node.GetChildren()) + extended_attributes = self._take_extended_attributes(child_nodes) +- members = map(self._build_interface_member, child_nodes) ++ members = list(map(self._build_interface_member, child_nodes)) + constants = [] + operations = [] + for member in members: +@@ -456,8 +463,8 @@ class _IRBuilder(object): + assert len(child_nodes) == 1 + child = child_nodes[0] + if child.GetClass() == 'Arguments': +- arguments = map(build_extattr_argument, +- child.GetChildren()) ++ arguments = list( ++ map(build_extattr_argument, child.GetChildren())) + elif child.GetClass() == 'Call': + assert len(child.GetChildren()) == 1 + grand_child = child.GetChildren()[0] +@@ -486,7 +493,9 @@ class _IRBuilder(object): + + assert node.GetClass() == 'ExtAttributes' + return ExtendedAttributes( +- filter(None, map(build_extended_attribute, node.GetChildren()))) ++ list( ++ filter(None, map(build_extended_attribute, ++ node.GetChildren())))) + + def _build_inheritance(self, node): + assert node.GetClass() == 'Inherit' +@@ -506,7 +515,7 @@ class _IRBuilder(object): + + def _build_iterable(self, node): + assert node.GetClass() == 'Iterable' +- types = map(self._build_type, node.GetChildren()) ++ types = list(map(self._build_type, node.GetChildren())) + assert len(types) == 1 or len(types) == 2 + if len(types) == 1: # value iterator + key_type, value_type = (None, types[0]) +@@ -584,7 +593,7 @@ class _IRBuilder(object): + def _build_maplike(self, node, interface_identifier): + assert node.GetClass() == 'Maplike' + assert isinstance(interface_identifier, Identifier) +- types = map(self._build_type, node.GetChildren()) ++ types = list(map(self._build_type, node.GetChildren())) + assert len(types) == 2 + key_type, value_type = types + is_readonly = bool(node.GetProperty('READONLY')) +@@ -676,7 +685,7 @@ class _IRBuilder(object): + def _build_setlike(self, node, interface_identifier): + assert node.GetClass() == 'Setlike' + assert isinstance(interface_identifier, Identifier) +- types = map(self._build_type, node.GetChildren()) ++ types = list(map(self._build_type, node.GetChildren())) + assert len(types) == 1 + value_type = types[0] + is_readonly = bool(node.GetProperty('READONLY')) +@@ -838,7 +847,7 @@ class _IRBuilder(object): + + def build_union_type(node, extended_attributes): + return self._idl_type_factory.union_type( +- member_types=map(self._build_type, node.GetChildren()), ++ member_types=list(map(self._build_type, node.GetChildren())), + is_optional=is_optional, + extended_attributes=extended_attributes, + debug_info=self._build_debug_info(node)) +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/make_copy.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/make_copy.py +index a7a2b11f3f0..2f6b61300ff 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/make_copy.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/make_copy.py +@@ -3,6 +3,13 @@ + # found in the LICENSE file. + + ++import sys ++ ++# TODO: Remove this once Python2 is obsoleted. ++if sys.version_info.major != 2: ++ long = int ++ basestring = str ++ + def make_copy(obj, memo=None): + """ + Creates a copy of the given object, which should be an IR or part of IR. +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/namespace.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/namespace.py +index eeabef97cbe..bd7e98907f3 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/namespace.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/namespace.py +@@ -107,11 +107,13 @@ class Namespace(UserDefinedType, WithExtendedAttributes, WithCodeGeneratorInfo, + for operation_ir in ir.operations + ]) + self._operation_groups = tuple([ +- OperationGroup( +- operation_group_ir, +- filter(lambda x: x.identifier == operation_group_ir.identifier, +- self._operations), +- owner=self) for operation_group_ir in ir.operation_groups ++ OperationGroup(operation_group_ir, ++ list( ++ filter( ++ lambda x: x.identifier == operation_group_ir ++ .identifier, self._operations)), ++ owner=self) ++ for operation_group_ir in ir.operation_groups + ]) + + @property +diff --git a/chromium/third_party/blink/renderer/bindings/templates/dictionary_v8.cc.tmpl b/chromium/third_party/blink/renderer/bindings/templates/dictionary_v8.cc.tmpl +index 0add9c45a38..dc910f6d227 100644 +--- a/chromium/third_party/blink/renderer/bindings/templates/dictionary_v8.cc.tmpl ++++ b/chromium/third_party/blink/renderer/bindings/templates/dictionary_v8.cc.tmpl +@@ -59,9 +59,9 @@ void {{v8_class}}::ToImpl(v8::Isolate* isolate, v8::Local v8_value, { + DCHECK(executionContext); + {% endif %}{# has_origin_trial_members #} + {% endif %}{# members #} +- {% for origin_trial_test, origin_trial_member_list in members | groupby('origin_trial_feature_name') %} ++ {% for origin_trial_test, origin_trial_member_list in members | stringifykeygroupby('origin_trial_feature_name') %} + {% filter origin_trial_enabled(origin_trial_test, "executionContext") %} +- {% for feature_name, member_list in origin_trial_member_list | groupby('runtime_enabled_feature_name') %} ++ {% for feature_name, member_list in origin_trial_member_list | stringifykeygroupby('runtime_enabled_feature_name') %} + {% filter runtime_enabled(feature_name) %} + {% for member in member_list %} + v8::Local {{member.v8_value}}; +@@ -147,9 +147,9 @@ bool toV8{{cpp_class}}(const {{cpp_class}}* impl, v8::Local dictiona + DCHECK(executionContext); + {% endif %}{# has_origin_trial_members #} + {% endif %}{# members #} +- {% for origin_trial_test, origin_trial_member_list in members | groupby('origin_trial_feature_name') %} ++ {% for origin_trial_test, origin_trial_member_list in members | stringifykeygroupby('origin_trial_feature_name') %} + {% filter origin_trial_enabled(origin_trial_test, "executionContext") %} +- {% for feature_name, member_list in origin_trial_member_list | groupby('runtime_enabled_feature_name') %} ++ {% for feature_name, member_list in origin_trial_member_list | stringifykeygroupby('runtime_enabled_feature_name') %} + {% filter runtime_enabled(feature_name) %} + {% for member in member_list %} + v8::Local {{member.v8_value}}; +diff --git a/chromium/third_party/blink/renderer/build/scripts/core/css/make_style_shorthands.py b/chromium/third_party/blink/renderer/build/scripts/core/css/make_style_shorthands.py +index 1799cd5a153..5f43ffabc26 100755 +--- a/chromium/third_party/blink/renderer/build/scripts/core/css/make_style_shorthands.py ++++ b/chromium/third_party/blink/renderer/build/scripts/core/css/make_style_shorthands.py +@@ -71,7 +71,7 @@ class Expansion(object): + def enabled_longhands(self): + include = lambda longhand: not longhand[ + 'runtime_flag'] or self.is_enabled(longhand['runtime_flag']) +- return filter(include, self._longhands) ++ return list(filter(include, self._longhands)) + + @property + def index(self): +@@ -87,8 +87,9 @@ class Expansion(object): + + def create_expansions(longhands): + flags = collect_runtime_flags(longhands) +- expansions = map(lambda mask: Expansion(longhands, flags, mask), +- range(1 << len(flags))) ++ expansions = list( ++ map(lambda mask: Expansion(longhands, flags, mask), ++ range(1 << len(flags)))) + assert len(expansions) > 0 + # We generate 2^N expansions for N flags, so enforce some limit. + assert len(flags) <= 4, 'Too many runtime flags for a single shorthand' +@@ -114,14 +115,14 @@ class StylePropertyShorthandWriter(json5_generator.Writer): + + self._longhand_dictionary = defaultdict(list) + for property_ in json5_properties.shorthands: +- property_['longhand_enum_keys'] = map(enum_key_for_css_property, +- property_['longhands']) +- property_['longhand_property_ids'] = map(id_for_css_property, +- property_['longhands']) +- +- longhands = map( +- lambda name: json5_properties.properties_by_name[name], +- property_['longhands']) ++ property_['longhand_enum_keys'] = list( ++ map(enum_key_for_css_property, property_['longhands'])) ++ property_['longhand_property_ids'] = list( ++ map(id_for_css_property, property_['longhands'])) ++ ++ longhands = list( ++ map(lambda name: json5_properties.properties_by_name[name], ++ property_['longhands'])) + property_['expansions'] = create_expansions(longhands) + for longhand_enum_key in property_['longhand_enum_keys']: + self._longhand_dictionary[longhand_enum_key].append(property_) +diff --git a/chromium/third_party/blink/renderer/build/scripts/core/css/properties/make_css_property_instances.py b/chromium/third_party/blink/renderer/build/scripts/core/css/properties/make_css_property_instances.py +index 75030ac577e..f72aadee17d 100755 +--- a/chromium/third_party/blink/renderer/build/scripts/core/css/properties/make_css_property_instances.py ++++ b/chromium/third_party/blink/renderer/build/scripts/core/css/properties/make_css_property_instances.py +@@ -42,8 +42,8 @@ class CSSPropertyInstancesWriter(json5_generator.Writer): + aliases = self._css_properties.aliases + + # Lists of PropertyClassData. +- self._property_classes_by_id = map(self.get_class, properties) +- self._alias_classes_by_id = map(self.get_class, aliases) ++ self._property_classes_by_id = list(map(self.get_class, properties)) ++ self._alias_classes_by_id = list(map(self.get_class, aliases)) + + # Sort by enum value. + self._property_classes_by_id.sort(key=lambda t: t.enum_value) +diff --git a/chromium/third_party/blink/renderer/build/scripts/gperf.py b/chromium/third_party/blink/renderer/build/scripts/gperf.py +index 5ee49056be4..db72660d471 100644 +--- a/chromium/third_party/blink/renderer/build/scripts/gperf.py ++++ b/chromium/third_party/blink/renderer/build/scripts/gperf.py +@@ -95,7 +95,7 @@ def main(): + + open(args.output_file, 'wb').write( + generate_gperf(gperf_path, +- open(infile).read(), gperf_args)) ++ open(infile).read(), gperf_args).encode('utf-8')) + + + if __name__ == '__main__': +diff --git a/chromium/third_party/blink/renderer/build/scripts/in_file.py b/chromium/third_party/blink/renderer/build/scripts/in_file.py +index 28adc050f1e..58113483e57 100644 +--- a/chromium/third_party/blink/renderer/build/scripts/in_file.py ++++ b/chromium/third_party/blink/renderer/build/scripts/in_file.py +@@ -66,7 +66,7 @@ class InFile(object): + self._defaults = defaults + self._valid_values = copy.deepcopy( + valid_values if valid_values else {}) +- self._parse(map(str.strip, lines)) ++ self._parse(list(map(str.strip, lines))) + + @classmethod + def load_from_files(self, file_paths, defaults, valid_values, +diff --git a/chromium/third_party/blink/renderer/build/scripts/in_generator.py b/chromium/third_party/blink/renderer/build/scripts/in_generator.py +index e46740a2e85..ab1981ad1e3 100644 +--- a/chromium/third_party/blink/renderer/build/scripts/in_generator.py ++++ b/chromium/third_party/blink/renderer/build/scripts/in_generator.py +@@ -32,10 +32,15 @@ import os + import os.path + import shlex + import shutil ++import sys + import optparse + + from in_file import InFile + ++# TODO: Remove this once Python2 is obsoleted. ++if sys.version_info.major != 2: ++ basestring = str ++ + + ######################################################### + # This is now deprecated - use json5_generator.py instead +diff --git a/chromium/third_party/blink/renderer/build/scripts/make_runtime_features.py b/chromium/third_party/blink/renderer/build/scripts/make_runtime_features.py +index cafe8d94a8e..6925a4fa580 100755 +--- a/chromium/third_party/blink/renderer/build/scripts/make_runtime_features.py ++++ b/chromium/third_party/blink/renderer/build/scripts/make_runtime_features.py +@@ -138,7 +138,7 @@ class RuntimeFeatureWriter(BaseRuntimeFeatureWriter): + except Exception: + # If trouble unpickling, overwrite + pass +- with open(os.path.abspath(file_name), 'w') as pickle_file: ++ with open(os.path.abspath(file_name), 'wb') as pickle_file: + pickle.dump(features_map, pickle_file) + + def _template_inputs(self): +diff --git a/chromium/third_party/blink/renderer/build/scripts/templates/element_factory.cc.tmpl b/chromium/third_party/blink/renderer/build/scripts/templates/element_factory.cc.tmpl +index dc3f44c5b10..3eefcf9f0ee 100644 +--- a/chromium/third_party/blink/renderer/build/scripts/templates/element_factory.cc.tmpl ++++ b/chromium/third_party/blink/renderer/build/scripts/templates/element_factory.cc.tmpl +@@ -26,7 +26,7 @@ using {{namespace}}FunctionMap = HashMapGetExecutionContext())) { +diff --git a/chromium/third_party/blink/renderer/build/scripts/templates/element_type_helpers.h.tmpl b/chromium/third_party/blink/renderer/build/scripts/templates/element_type_helpers.h.tmpl +index 1b5297d52dc..edecc81d9d4 100644 +--- a/chromium/third_party/blink/renderer/build/scripts/templates/element_type_helpers.h.tmpl ++++ b/chromium/third_party/blink/renderer/build/scripts/templates/element_type_helpers.h.tmpl +@@ -15,7 +15,7 @@ namespace blink { + class Document; + + // Type checking. +-{% for tag in tags|sort if not tag.multipleTagNames and not tag.noTypeHelpers %} ++{% for tag in tags|sort(attribute='name') if not tag.multipleTagNames and not tag.noTypeHelpers %} + class {{tag.interface}}; + template <> + inline bool IsElementOfType(const Node& node) { +diff --git a/chromium/third_party/blink/renderer/build/scripts/templates/macros.tmpl b/chromium/third_party/blink/renderer/build/scripts/templates/macros.tmpl +index 0244433af2e..dcdbb02a56c 100644 +--- a/chromium/third_party/blink/renderer/build/scripts/templates/macros.tmpl ++++ b/chromium/third_party/blink/renderer/build/scripts/templates/macros.tmpl +@@ -25,7 +25,7 @@ + + + {% macro trie_leaf(index, object, return_macro, lowercase_data) %} +-{% set name, value = object.items()[0] %} ++{% set name, value = (object.items()|list)[0] %} + {% if name|length %} + if ( + {%- for c in name -%} +@@ -45,7 +45,7 @@ return {{ return_macro(value) }}; + + + {% macro trie_switch(trie, index, return_macro, lowercase_data) %} +-{% if trie|length == 1 and trie.values()[0] is string %} ++{% if trie|length == 1 and (trie.values()|list)[0] is string %} + {{ trie_leaf(index, trie, return_macro, lowercase_data) -}} + {% else %} + {% if lowercase_data %} +diff --git a/chromium/third_party/blink/renderer/build/scripts/templates/make_qualified_names.h.tmpl b/chromium/third_party/blink/renderer/build/scripts/templates/make_qualified_names.h.tmpl +index cb05c6c4315..bd5566b03e7 100644 +--- a/chromium/third_party/blink/renderer/build/scripts/templates/make_qualified_names.h.tmpl ++++ b/chromium/third_party/blink/renderer/build/scripts/templates/make_qualified_names.h.tmpl +@@ -24,12 +24,12 @@ namespace {{cpp_namespace}} { + {{symbol_export}}extern const WTF::AtomicString& {{namespace_prefix}}NamespaceURI; + + // Tags +-{% for tag in tags|sort %} ++{% for tag in tags|sort(attribute='name') %} + {{symbol_export}}extern const blink::{{namespace}}QualifiedName& {{tag|symbol}}Tag; + {% endfor %} + + // Attributes +-{% for attr in attrs|sort %} ++{% for attr in attrs|sort(attribute='name') %} + {{symbol_export}}extern const blink::QualifiedName& {{attr|symbol}}Attr; + {% endfor %} + +diff --git a/chromium/third_party/dawn/generator/generator_lib.py b/chromium/third_party/dawn/generator/generator_lib.py +index 5e3734d7833..e3d46bd194f 100644 +--- a/chromium/third_party/dawn/generator/generator_lib.py ++++ b/chromium/third_party/dawn/generator/generator_lib.py +@@ -201,6 +201,10 @@ def _compute_python_dependencies(root_dir=None): + + paths = set() + for path in module_paths: ++ # Builtin/namespaced modules may return None for the file path. ++ if not path: ++ continue ++ + path = os.path.abspath(path) + + if not path.startswith(root_dir): +diff --git a/chromium/third_party/devtools-frontend/src/BUILD.gn b/chromium/third_party/devtools-frontend/src/BUILD.gn +index cd488e88b60..ea1dc3d9a79 100644 +--- a/chromium/third_party/devtools-frontend/src/BUILD.gn ++++ b/chromium/third_party/devtools-frontend/src/BUILD.gn +@@ -2,6 +2,8 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import("//build/config/python.gni") ++ + import("//third_party/blink/public/public_features.gni") + import("./all_devtools_files.gni") + import("./all_devtools_modules.gni") +diff --git a/chromium/third_party/devtools-frontend/src/scripts/build/build_inspector_overlay.py b/chromium/third_party/devtools-frontend/src/scripts/build/build_inspector_overlay.py +index d6666e8b74f..0f7a661e632 100644 +--- a/chromium/third_party/devtools-frontend/src/scripts/build/build_inspector_overlay.py ++++ b/chromium/third_party/devtools-frontend/src/scripts/build/build_inspector_overlay.py +@@ -45,7 +45,8 @@ def rollup(input_path, output_path, filename, max_size, rollup_plugin): + ['--format', 'iife', '-n', 'InspectorOverlay'] + ['--input', target] + + ['--plugin', rollup_plugin], + stdout=subprocess.PIPE, +- stderr=subprocess.PIPE) ++ stderr=subprocess.PIPE, ++ text=True) + out, error = rollup_process.communicate() + if not out: + raise Exception("rollup failed: " + error) +diff --git a/chromium/third_party/devtools-frontend/src/scripts/build/build_release_applications.py b/chromium/third_party/devtools-frontend/src/scripts/build/build_release_applications.py +index fa8e73d34af..7d0b84b2171 100644 +--- a/chromium/third_party/devtools-frontend/src/scripts/build/build_release_applications.py ++++ b/chromium/third_party/devtools-frontend/src/scripts/build/build_release_applications.py +@@ -10,7 +10,7 @@ Builds applications in release mode: + and?the?application?loader?into?a?single?script. + """ + +-from cStringIO import StringIO ++from io import StringIO + from os import path + from os.path import join + import copy +@@ -145,8 +145,7 @@ class ReleaseBuilder(object): + resource_content = read_file(path.join(self.application_dir, resource_name)) + if not (resource_name.endswith('.html') + or resource_name.endswith('md')): +- resource_content += resource_source_url(resource_name).encode( +- 'utf-8') ++ resource_content += resource_source_url(resource_name) + resource_content = resource_content.replace('\\', '\\\\') + resource_content = resource_content.replace('\n', '\\n') + resource_content = resource_content.replace('"', '\\"') +@@ -173,7 +172,9 @@ class ReleaseBuilder(object): + def _concatenate_application_script(self, output): + output.write('Root.allDescriptors.push(...%s);' % self._release_module_descriptors()) + if self.descriptors.extends: +- output.write('Root.applicationDescriptor.modules.push(...%s);' % json.dumps(self.descriptors.application.values())) ++ output.write( ++ 'Root.applicationDescriptor.modules.push(...%s);' % ++ json.dumps(list(self.descriptors.application.values()))) + else: + output.write('Root.applicationDescriptor = %s;' % self.descriptors.application_json()) + +diff --git a/chromium/third_party/devtools-frontend/src/scripts/build/generate_devtools_grd.py b/chromium/third_party/devtools-frontend/src/scripts/build/generate_devtools_grd.py +index be510c48d76..c6a59c90298 100644 +--- a/chromium/third_party/devtools-frontend/src/scripts/build/generate_devtools_grd.py ++++ b/chromium/third_party/devtools-frontend/src/scripts/build/generate_devtools_grd.py +@@ -123,7 +123,7 @@ def main(argv): + + try: + os.makedirs(path.join(output_directory, 'Images')) +- except OSError, e: ++ except OSError as e: + if e.errno != errno.EEXIST: + raise e + +@@ -147,7 +147,7 @@ def main(argv): + shutil.copy(path.join(dirname, filename), path.join(output_directory, 'Images')) + add_file_to_grd(doc, path.join('Images', filename)) + +- with open(parsed_args.output_filename, 'w') as output_file: ++ with open(parsed_args.output_filename, 'wb') as output_file: + output_file.write(doc.toxml(encoding='UTF-8')) + + +diff --git a/chromium/third_party/devtools-frontend/src/scripts/build/modular_build.py b/chromium/third_party/devtools-frontend/src/scripts/build/modular_build.py +index 0ba695d3810..bb1da2f9f8d 100644 +--- a/chromium/third_party/devtools-frontend/src/scripts/build/modular_build.py ++++ b/chromium/third_party/devtools-frontend/src/scripts/build/modular_build.py +@@ -7,6 +7,8 @@ + Utilities for the modular DevTools build. + """ + ++from __future__ import print_function ++ + import collections + from os import path + import os +@@ -40,7 +42,7 @@ def load_and_parse_json(filename): + try: + return json.loads(read_file(filename)) + except: +- print 'ERROR: Failed to parse %s' % filename ++ print('ERROR: Failed to parse %s' % filename) + raise + + class Descriptors: +@@ -57,7 +59,7 @@ class Descriptors: + + def application_json(self): + result = dict() +- result['modules'] = self.application.values() ++ result['modules'] = list(self.application.values()) + return json.dumps(result) + + def all_compiled_files(self): +diff --git a/chromium/third_party/jinja2/tests.py b/chromium/third_party/jinja2/tests.py +index 0adc3d4dbcb..b14f85ff148 100644 +--- a/chromium/third_party/jinja2/tests.py ++++ b/chromium/third_party/jinja2/tests.py +@@ -10,7 +10,7 @@ + """ + import operator + import re +-from collections import Mapping ++from collections.abc import Mapping + from jinja2.runtime import Undefined + from jinja2._compat import text_type, string_types, integer_types + import decimal +diff --git a/chromium/tools/metrics/ukm/gen_builders.py b/chromium/tools/metrics/ukm/gen_builders.py +index f9f61d90a56..44e46fae8cc 100755 +--- a/chromium/tools/metrics/ukm/gen_builders.py ++++ b/chromium/tools/metrics/ukm/gen_builders.py +@@ -48,9 +48,10 @@ def ReadFilteredData(path): + data = ukm_model.UKM_XML_TYPE.Parse(ukm_file.read()) + event_tag = ukm_model._EVENT_TYPE.tag + metric_tag = ukm_model._METRIC_TYPE.tag +- data[event_tag] = filter(ukm_model.IsNotObsolete, data[event_tag]) ++ data[event_tag] = list(filter(ukm_model.IsNotObsolete, data[event_tag])) + for event in data[event_tag]: +- event[metric_tag] = filter(ukm_model.IsNotObsolete, event[metric_tag]) ++ event[metric_tag] = list( ++ filter(ukm_model.IsNotObsolete, event[metric_tag])) + return data + + +diff --git a/chromium/ui/ozone/generate_constructor_list.py b/chromium/ui/ozone/generate_constructor_list.py +index 8d800636c97..04fa18e93df 100755 +--- a/chromium/ui/ozone/generate_constructor_list.py ++++ b/chromium/ui/ozone/generate_constructor_list.py +@@ -45,12 +45,15 @@ Example Output: ./ui/ozone/generate_constructor_list.py \ + } // namespace ui + """ + ++try: ++ from StringIO import StringIO # for Python 2 ++except ImportError: ++ from io import StringIO # for Python 3 + import optparse + import os + import collections + import re + import sys +-import string + + + def GetTypedefName(typename): +@@ -68,7 +71,7 @@ def GetConstructorName(typename, platform): + This is just "Create" + typename + platform. + """ + +- return 'Create' + typename + string.capitalize(platform) ++ return 'Create' + typename + platform.capitalize() + + + def GenerateConstructorList(out, namespace, export, typenames, platforms, +@@ -163,12 +166,14 @@ def main(argv): + sys.exit(1) + + # Write to standard output or file specified by --output_cc. +- out_cc = sys.stdout ++ out_cc = getattr(sys.stdout, 'buffer', sys.stdout) + if options.output_cc: + out_cc = open(options.output_cc, 'wb') + +- GenerateConstructorList(out_cc, options.namespace, options.export, ++ out_cc_str = StringIO() ++ GenerateConstructorList(out_cc_str, options.namespace, options.export, + typenames, platforms, includes, usings) ++ out_cc.write(out_cc_str.getvalue().encode('utf-8')) + + if options.output_cc: + out_cc.close() +diff --git a/chromium/ui/ozone/generate_ozone_platform_list.py b/chromium/ui/ozone/generate_ozone_platform_list.py +index d47c398259b..2702b68b9bd 100755 +--- a/chromium/ui/ozone/generate_ozone_platform_list.py ++++ b/chromium/ui/ozone/generate_ozone_platform_list.py +@@ -49,12 +49,15 @@ Example Output: ./generate_ozone_platform_list.py --default wayland dri wayland + + """ + ++try: ++ from StringIO import StringIO # for Python 2 ++except ImportError: ++ from io import StringIO # for Python 3 + import optparse + import os + import collections + import re + import sys +-import string + + + def GetConstantName(name): +@@ -63,7 +66,7 @@ def GetConstantName(name): + We just capitalize the platform name and prepend "CreateOzonePlatform". + """ + +- return 'kPlatform' + string.capitalize(name) ++ return 'kPlatform' + name.capitalize() + + + def GeneratePlatformListText(out, platforms): +@@ -149,9 +152,9 @@ def main(argv): + platforms.insert(0, options.default) + + # Write to standard output or file specified by --output_{cc,h}. +- out_cc = sys.stdout +- out_h = sys.stdout +- out_txt = sys.stdout ++ out_cc = getattr(sys.stdout, 'buffer', sys.stdout) ++ out_h = getattr(sys.stdout, 'buffer', sys.stdout) ++ out_txt = getattr(sys.stdout, 'buffer', sys.stdout) + if options.output_cc: + out_cc = open(options.output_cc, 'wb') + if options.output_h: +@@ -159,9 +162,16 @@ def main(argv): + if options.output_txt: + out_txt = open(options.output_txt, 'wb') + +- GeneratePlatformListText(out_txt, platforms) +- GeneratePlatformListHeader(out_h, platforms) +- GeneratePlatformListSource(out_cc, platforms) ++ out_txt_str = StringIO() ++ out_h_str = StringIO() ++ out_cc_str = StringIO() ++ ++ GeneratePlatformListText(out_txt_str, platforms) ++ out_txt.write(out_txt_str.getvalue().encode('utf-8')) ++ GeneratePlatformListHeader(out_h_str, platforms) ++ out_h.write(out_h_str.getvalue().encode('utf-8')) ++ GeneratePlatformListSource(out_cc_str, platforms) ++ out_cc.write(out_cc_str.getvalue().encode('utf-8')) + + if options.output_cc: + out_cc.close() +-- +2.25.1 + diff --git a/package/qt5/qt5webengine-chromium/0002-Don-t-rebase-sysroot-path.patch b/package/qt5/qt5webengine-chromium/0002-Don-t-rebase-sysroot-path.patch new file mode 100644 index 0000000000..c39f008a3d --- /dev/null +++ b/package/qt5/qt5webengine-chromium/0002-Don-t-rebase-sysroot-path.patch @@ -0,0 +1,32 @@ +From bfc520671693587a0b81842018326da35aa97f80 Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Thu, 3 Feb 2022 20:41:08 -0700 +Subject: [PATCH] Don't rebase sysroot path + +Just use the actual sysroot as rebase_path will generate an invalid +sysroot path. + +Fixes: +/home/buildroot/buildroot/output/per-package/qt5webengine/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-buildroot-linux-gnu/10.3.0/../../../../aarch64-buildroot-linux-gnu/bin/ld: cannot find crti.o: No such file or directory + +Signed-off-by: James Hilliard +--- + chromium/build/config/posix/BUILD.gn | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chromium/build/config/posix/BUILD.gn b/chromium/build/config/posix/BUILD.gn +index e61554c5656..dc957225869 100644 +--- a/chromium/build/config/posix/BUILD.gn ++++ b/chromium/build/config/posix/BUILD.gn +@@ -27,7 +27,7 @@ config("runtime_library") { + + if (!is_apple && sysroot != "") { + # Pass the sysroot to all C compiler variants, the assembler, and linker. +- sysroot_flags = [ "--sysroot=" + rebase_path(sysroot, root_build_dir) ] ++ sysroot_flags = [ "--sysroot=" + sysroot ] + if (is_linux || is_chromeos) { + # This is here so that all files get recompiled after a sysroot roll and + # when turning the sysroot on or off. (defines are passed via the command +-- +2.25.1 + 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)) -- 2.25.1 From james.hilliard1 at gmail.com Sat Feb 5 20:40:27 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 5 Feb 2022 13:40:27 -0700 Subject: [Buildroot] [PATCH v6 4/8] package/qt5/qt5base: enable ccache via configure option In-Reply-To: <20220205212349.17db6aa4@windsurf> References: <20220205201837.3324085-1-james.hilliard1@gmail.com> <20220205201837.3324085-4-james.hilliard1@gmail.com> <20220205212349.17db6aa4@windsurf> Message-ID: On Sat, Feb 5, 2022 at 1:23 PM Thomas Petazzoni wrote: > > On Sat, 5 Feb 2022 13:18:33 -0700 > James Hilliard wrote: > > > # This allows to use ccache when available > > -define QT5BASE_CONFIGURE_HOSTCC > > - $(SED) 's,^QMAKE_CC\s*=.*,QMAKE_CC = $(HOSTCC),' $(@D)/mkspecs/common/g++-base.conf > > - $(SED) 's,^QMAKE_CXX\s*=.*,QMAKE_CXX = $(HOSTCXX),' $(@D)/mkspecs/common/g++-base.conf > > -endef > > This this variable is dropped, then surely the place it was used should also be modified? Oh, forgot to remove it from there. > > > +ifeq ($(BR2_CCACHE),y) > > +QT5BASE_CONFIGURE_OPTS += -ccache > > +endif > > Are we sure this is going to use Buildroot's ccache and not the system > ccache? Looks to be detecting it properly at least(my system also has a system ccache): Checking for ccache... Searching for file ccache. Found at /home/buildroot/buildroot/output/per-package/qt5base/host/bin/ccache. test config.qtbase.tests.ccache succeeded > > Indeed, $(HOSTCC) and $(HOSTCXX) are defined as: > > CCACHE = $(HOST_DIR)/bin/ccache > HOSTCC = $(CCACHE) $(HOSTCC_NOCCACHE) > HOSTCXX = $(CCACHE) $(HOSTCXX_NOCCACHE) > > so we know that it's the Buildroot ccache that will be used. The gn build system in qt5webengine has some special ccache conditional handling that doesn't get properly enabled with this method as it enables based on the qt5base ccache flag instead AFAIU. > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com From arnout at mind.be Sat Feb 5 21:18:06 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 5 Feb 2022 22:18:06 +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: On 11/01/2022 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 > 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 Applied to master, with an extension of the help text as suggested by Luca and pointing to the URL provided by James. Thanks! Regards, Arnout > --- > 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)) From arnout at mind.be Sat Feb 5 21:16:41 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 5 Feb 2022 22:16:41 +0100 Subject: [Buildroot] [git commit] package/zynq-boot-bin: drop legacy package Message-ID: <20220205211057.D792F82650@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f22bff4a79faee5e4501e0f7653c09e6dcf5387e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 python3-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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- Config.in.legacy | 13 +++++++++++++ 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, 13 insertions(+), 47 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 62717463df..34d8c71cc8 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,19 @@ 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. Should you still have an older U-Boot that needs + this, a python3 version of the zynq-boot-bin.py script can be + downloaded from the URL below and called from a post-build + script. + + https://gist.githubusercontent.com/jameshilliard/e09235dfc6f96c11418a134e6ebf7890/raw/135b7480c405ae8a77a9db615e495f9a9f2d3242/zynq-boot-bin.py + config BR2_PACKAGE_RPI_BT_FIRMWARE bool "rpi-bt-firmware package was renamed" depends on BR2_arm || BR2_aarch64 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)) From kuzminov.sergey81 at gmail.com Sat Feb 5 21:55:58 2022 From: kuzminov.sergey81 at gmail.com (Sergey Kuzminov) Date: Sun, 6 Feb 2022 00:55:58 +0300 Subject: [Buildroot] [PATCH v2] configs/orangepi_zero_defconfig: switch to extlinux Message-ID: <20220205215558.30751-1-kuzminov.sergey81@gmail.com> Changes: v1: - Exclude FAT partition, it is no longer needed for U-Boot. - Switch the rootfs partition from MBR to GPT for partition-uuid to work. - Switch to extlinux, this is convenient for debugging. - Create common scenarios for multiple boards to create an SD image: board/orangepi/common. v2: - Fix typo in first line of changes (s/he/it). - Add BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y. - Exclude one boot option from extlinux.conf. Signed-off-by: Sergey Kuzminov --- board/orangepi/common/extlinux.conf | 4 +++ board/orangepi/common/genimage.cfg | 23 +++++++++++++++ board/orangepi/common/post-build.sh | 34 +++++++++++++++++++++ board/orangepi/orangepi-zero/boot.cmd | 9 ------ board/orangepi/orangepi-zero/genimage.cfg | 36 ----------------------- configs/orangepi_zero_defconfig | 11 ++++--- 6 files changed, 66 insertions(+), 51 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 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..12f496b1fa --- /dev/null +++ b/board/orangepi/common/extlinux.conf @@ -0,0 +1,4 @@ +LABEL default + kernel /boot/%LINUXIMAGE% + devicetreedir /boot + 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..fa0d988991 --- /dev/null +++ b/board/orangepi/common/genimage.cfg @@ -0,0 +1,23 @@ +image sdcard.img { + partition u-boot { + in-partition-table = false + image = "u-boot-sunxi-with-spl.bin" + offset = 8K + size = 1000K # 1MB - 8KB(offset) - 16KB(GPT) + } + + hdimage { + partition-table-type = gpt + gpt-location = 1008K # 1MB - 16KB(GPT) + gpt-no-backup = true + # After writing the image to the SD card, + # backup GPT data structures at the end of the disk: + # gdisk /dev/mmcblk0 then press the buttons: x, e, w, y + } + + 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/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 5aaa1566c5..96f0c3f600 100644 --- a/configs/orangepi_zero_defconfig +++ b/configs/orangepi_zero_defconfig @@ -20,10 +20,13 @@ 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_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y # Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="63M" +BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y # BR2_TARGET_ROOTFS_TAR is not set # Bootloader @@ -39,16 +42,12 @@ 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 # 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" # Wireless driver and firmware BR2_PACKAGE_XR819_XRADIO=y -- 2.34.1 From arnout at mind.be Sat Feb 5 22:09:31 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 5 Feb 2022 23:09:31 +0100 Subject: [Buildroot] [git commit] support/scripts/mkusers: allow option for system uid/gid Message-ID: <20220205220301.E60E882952@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=41ea61d59c3e0261673be978bcfc779c8188e43f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Some software decides based on uid/gid whether a user is a system or normal (human) user, with different 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 user range. All identifiers used up to now should have been from the system range, so -1 is now interpreted as a system user/group. Note that after this commit, all the UIDs and GIDs that are created automatically (with -1) will change. That means if there is peristent data on an existing system that was created by such an automatic user, it will suddenly belong to a different user. However, this could already happen before: if a USERS line is added to a package, then other UIDs may change as well. Add system/user ranges as variables, and the argument for user/system uid variable as well. Thus some magic constants could be removed, some further occurences of -1 were replaced with equivalent logic. For consistency, the existing MIN/MAX_UID/GID variables are renamed to FIRST/LAST_USER_UID/GID. Update the documentation with the new automatic ranges. [1] - https://systemd.io/UIDS-GIDS/ [2] - https://www.freedesktop.org/software/systemd/man/journald.conf.html Signed-off-by: Norbert Lange [Arnout: use -1 for system users; refactor the changes a bit] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- docs/manual/makeusers-syntax.txt | 11 ++++-- support/scripts/mkusers | 84 ++++++++++++++++++++++++++-------------- 2 files changed, 63 insertions(+), 32 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 d00ba33823..4fc06f8fdf 100755 --- a/support/scripts/mkusers +++ b/support/scripts/mkusers @@ -4,10 +4,19 @@ myname="${0##*/}" #---------------------------------------------------------------------------- # Configurable items -MIN_UID=1000 -MAX_UID=1999 -MIN_GID=1000 -MAX_GID=1999 +FIRST_USER_UID=1000 +LAST_USER_UID=1999 +FIRST_USER_GID=1000 +LAST_USER_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=-1 +AUTO_USER_ID=-2 + # 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" \ @@ -194,20 +203,22 @@ check_user_validity() { # then simply report its current GID. Otherwise, generate the lowest GID # that is: # - not 0 -# - comprised in [MIN_GID..MAX_GID] +# - comprised in [$2..$3] # - not already used by a group generate_gid() { local group="${1}" + local mingid="${2}" + local maxgid="${3}" 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,10 @@ add_one_group() { local members # Generate a new GID if needed - if [ ${gid} -eq -1 ]; then - gid="$( generate_gid "${group}" )" + if [ ${gid} -eq ${AUTO_USER_ID} ]; then + gid="$( generate_gid "${group}" $FIRST_USER_GID $LAST_USER_GID )" + elif [ ${gid} -eq ${AUTO_SYSTEM_ID} ]; then + gid="$( generate_gid "${group}" $FIRST_SYSTEM_GID $LAST_SYSTEM_GID )" fi members=$(get_members "$group") @@ -243,20 +256,23 @@ add_one_group() { # then simply report its current UID. Otherwise, generate the lowest UID # that is: # - not 0 -# - comprised in [MIN_UID..MAX_UID] +# - comprised in [$2..$3] # - not already used by a user generate_uid() { local username="${1}" + local minuid="${2}" + local maxuid="${3}" + 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 +323,10 @@ 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} -eq ${AUTO_USER_ID} ]; then + uid="$( generate_uid "${username}" $FIRST_USER_GID $LAST_USER_GID )" + elif [ ${uid} -eq ${AUTO_SYSTEM_ID} ]; then + uid="$( generate_uid "${username}" $FIRST_SYSTEM_GID $LAST_SYSTEM_GID )" fi # Remove any previous instance of this user @@ -369,14 +387,15 @@ add_one_user() { main() { local username uid group gid passwd home shell groups comment local line + local auto_id local -a ENTRIES # Some sanity checks - if [ ${MIN_UID} -le 0 ]; then - fail "MIN_UID must be >0 (currently %d)\n" ${MIN_UID} + if [ ${FIRST_USER_UID} -le 0 ]; then + fail "FIRST_USER_UID must be >0 (currently %d)\n" ${FIRST_USER_UID} fi - if [ ${MIN_GID} -le 0 ]; then - fail "MIN_GID must be >0 (currently %d)\n" ${MIN_GID} + if [ ${FIRST_USER_GID} -le 0 ]; then + fail "FIRST_USER_GID must be >0 (currently %d)\n" ${FIRST_USER_GID} fi # Read in all the file in memory, exclude empty lines and comments @@ -384,8 +403,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,18 +418,27 @@ 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 # Then, create all the additional groups # If any additional group is already a main group, we should use - # the gid of that main group; otherwise, we can use any gid + # the gid of that main group; otherwise, we can use any gid - a + # system gid if the uid is a system user (<= LAST_SYSTEM_UID), + # otherwise a user gid. for line in "${ENTRIES[@]}"; do read username uid group gid passwd home shell groups comment <<<"${line}" if [ "${groups}" != "-" ]; then + if [ ${uid} -le 0 ]; then + auto_id=${uid} + elif [ ${uid} -le ${LAST_SYSTEM_UID} ]; then + auto_id=${AUTO_SYSTEM_ID} + else + auto_id=${AUTO_USER_ID} + fi for g in ${groups//,/ }; do - add_one_group "${g}" -1 + add_one_group "${g}" ${auto_id} done fi done @@ -433,7 +461,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 Sat Feb 5 22:13:05 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 5 Feb 2022 23:13:05 +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: <9ff36776-8e54-e835-21de-5b7466efb7fb@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]). > > 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 I applied both to master, after squashing and making the modifications I mentioned in my previous review. In addition... > --- > 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 For consistency wiht LAST_SYSTEM_UID, I renamed this one to LAST_USER_UID (and same for the other 3 of course). Regards, Arnout > 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 From arnout at mind.be Sat Feb 5 22:14:15 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 5 Feb 2022 23:14: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: <1cc78242-026c-6c70-04b6-4c76a15fe6d7@mind.be> On 14/01/2022 11:12, Norbert Lange wrote: > 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} I changed this to decide on user or system ID based on the uid: if [ ${uid} -le 0 ]; then auto_id=${uid} elif [ ${uid} -le ${LAST_SYSTEM_UID} ]; then auto_id=${AUTO_SYSTEM_ID} else auto_id=${AUTO_USER_ID} fi for g in ${groups//,/ }; do add_one_group "${g}" ${auto_id} done It seems to work well. Regards, Arnout > done > fi > done From giulio.benetti at benettiengineering.com Sat Feb 5 22:18:06 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 5 Feb 2022 23:18:06 +0100 Subject: [Buildroot] [PATCH v2] configs/orangepi_zero_defconfig: switch to extlinux In-Reply-To: <20220205215558.30751-1-kuzminov.sergey81@gmail.com> References: <20220205215558.30751-1-kuzminov.sergey81@gmail.com> Message-ID: <033373DF-6707-4295-8A12-D4ABE072608F@benettiengineering.com> Hi Sergey, below I give you a better example of commit log, and the dealing with V1->V2 series. > Il giorno 5 feb 2022, alle ore 22:56, Sergey Kuzminov ha scritto: > > ?Changes: > v1: Please Remove this line ^^^ > - Exclude FAT partition, it is no longer needed for U-Boot. > - Switch the rootfs partition from MBR to GPT for partition-uuid to work. > - Switch to extlinux, this is convenient for debugging. > - Create common scenarios for multiple boards to create an SD image: board/orangepi/common. > > v2: Remove this ^^^ line > - Fix typo in first line of changes (s/he/it). This too ^^^ > - Add BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y. Here we need an explanation of the reason why, what this implies. > - Exclude one boot option from extlinux.conf. This ^^^ too > > Signed-off-by: Sergey Kuzminov ?- V1->V2: * improved commit log * removed commented line in extlinux.conf * removed one boot option from extlinux.conf > --- So as you can see, commit log doesn?t mention the patch version, while after the 3 dashes you can write in general whatever you want because it won?t be part of commit log and it?s usually used to report V1->V2 version etc. > board/orangepi/common/extlinux.conf | 4 +++ > board/orangepi/common/genimage.cfg | 23 +++++++++++++++ > board/orangepi/common/post-build.sh | 34 +++++++++++++++++++++ > board/orangepi/orangepi-zero/boot.cmd | 9 ------ > board/orangepi/orangepi-zero/genimage.cfg | 36 ----------------------- > configs/orangepi_zero_defconfig | 11 ++++--- > 6 files changed, 66 insertions(+), 51 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 > 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..12f496b1fa > --- /dev/null > +++ b/board/orangepi/common/extlinux.conf > @@ -0,0 +1,4 @@ > +LABEL default > + kernel /boot/%LINUXIMAGE% > + devicetreedir /boot > + 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..fa0d988991 > --- /dev/null > +++ b/board/orangepi/common/genimage.cfg > @@ -0,0 +1,23 @@ > +image sdcard.img { > + partition u-boot { > + in-partition-table = false > + image = "u-boot-sunxi-with-spl.bin" > + offset = 8K > + size = 1000K # 1MB - 8KB(offset) - 16KB(GPT) > + } > + > + hdimage { > + partition-table-type = gpt > + gpt-location = 1008K # 1MB - 16KB(GPT) > + gpt-no-backup = true > + # After writing the image to the SD card, > + # backup GPT data structures at the end of the disk: > + # gdisk /dev/mmcblk0 then press the buttons: x, e, w, y Why don?t you make this part ^^^ automatic with a script or you simply use genimage itself? What it?s expected as board defconfig is something that you burn a sdcard with the sdcard.img file and that?s it. So here you need to make it automatic. So we wait for V3 with the commit log form you read above and requested changes. Thank you! Best regards ?- Giulio Benetti Benetti Engineering sas > + } > + > + 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/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 5aaa1566c5..96f0c3f600 100644 > --- a/configs/orangepi_zero_defconfig > +++ b/configs/orangepi_zero_defconfig > @@ -20,10 +20,13 @@ 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_NEEDS_HOST_OPENSSL=y > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > > # Filesystem > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="63M" > +BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y > # BR2_TARGET_ROOTFS_TAR is not set > > # Bootloader > @@ -39,16 +42,12 @@ 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 > > # 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" > > # Wireless driver and firmware > BR2_PACKAGE_XR819_XRADIO=y > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From arnout at mind.be Sat Feb 5 22:23:31 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 5 Feb 2022 23:23:31 +0100 Subject: [Buildroot] [PATCH] docs/manuali/makeusers-syntax.txt: add caveat for upgrading Message-ID: <20220205222331.3432353-1-arnout@mind.be> With the change of the range of UIDs that is generated from the automatic ID (-1), it became apparent that there is a potential problem with these automatic IDs when upgrading: they may have changed, which means that persistent files that exist outside of the rootfs suddenly have a different owner. Add a caveat section to the manual, as well as an explanation of how to work around the problem. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- docs/manual/makeusers-syntax.txt | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/docs/manual/makeusers-syntax.txt b/docs/manual/makeusers-syntax.txt index 3d1013f447..cebc6240ae 100644 --- a/docs/manual/makeusers-syntax.txt +++ b/docs/manual/makeusers-syntax.txt @@ -90,3 +90,17 @@ This will create this user: - +shell+ is: +/bin/sh+ - +test+ is not a member of any additional +groups+ - +comment+ is: +Test user+ + + +=== Caveat when updating Buildroot + +When updating buildroot or when packages are added or removed to/from +the configuration, it is possible that the automatic UIDs and GIDs are +changed. This can be a problem if persistent files were created with +that user or group: after upgrade, they will suddenly have a different +owner. + +Therefore, it is advisable to perpetuate the automatic IDs. This can be +done either by adding a users table with the generated IDs. It is only +needed to do this for UIDs that actually create persistent files, e.g. +database. -- 2.34.1 From arnout at mind.be Sat Feb 5 22:47:47 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 5 Feb 2022 23:47:47 +0100 Subject: [Buildroot] [PATCH 1/2] package/lua: bump to version 5.4.4 In-Reply-To: <20220126145503.1032630-1-francois.perrad@gadz.org> References: <20220126145503.1032630-1-francois.perrad@gadz.org> Message-ID: On 26/01/2022 15:55, Francois Perrad wrote: > Signed-off-by: Francois Perrad Both applied to master. However, Franc?ois, when the license hash changes, please explain in the commit message why it changed. Regards, Arnout > --- > 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 From arnout at mind.be Sat Feb 5 22:48:06 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 5 Feb 2022 23:48:06 +0100 Subject: [Buildroot] [PATCH] package/fmt: bump to version 8.1.1 In-Reply-To: <20220124074307.91368-1-buildroot@heine.tech> References: <20220124074307.91368-1-buildroot@heine.tech> Message-ID: <81b25800-0327-773c-86f5-a9f53af2914c@mind.be> On 24/01/2022 08:42, Michael Nosthoff via buildroot wrote: > Signed-off-by: Michael Nosthoff Applied to master, thanks. Regards, Arnout > --- > 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 From arnout at mind.be Sat Feb 5 22:48:44 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 5 Feb 2022 23:48:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/runc: bump to version 1.1.0 In-Reply-To: <20220124080013.83231-1-christian@paral.in> References: <20220124080013.83231-1-christian@paral.in> Message-ID: On 24/01/2022 09:00, Christian Stewart via buildroot wrote: > Added LGPL-2.1 license specifier: libseccomp is statically-linked. Is there also a license file for that? > https://github.com/opencontainers/runc/releases/tag/v1.1.0 > > Signed-off-by: Christian Stewart Applied to master, thanks. Regards, Arnout > --- > 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 > From arnout at mind.be Sat Feb 5 22:50:02 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 5 Feb 2022 23:50:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/sdl2: bump version to 2.0.20 In-Reply-To: <20220124080107.4094-1-mf@go-sys.de> References: <20220124080107.4094-1-mf@go-sys.de> Message-ID: On 24/01/2022 09:01, Michael Fischer wrote: > 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 When the license hash changes, please explain in the commit message why it changed. I added: Copyright year updated in LICENSE.txt. Applied to master, thanks. Regards, Arnout > 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 From arnout at mind.be Sat Feb 5 22:50:23 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 5 Feb 2022 23:50:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/network-manager: bump to version 1.34.0 In-Reply-To: <20220124092612.4019025-1-james.hilliard1@gmail.com> References: <20220124092612.4019025-1-james.hilliard1@gmail.com> Message-ID: On 24/01/2022 10:26, James Hilliard wrote: > CONTRIBUTING.md hash changed due to various style updates and > additions. > > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > 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 From arnout at mind.be Sat Feb 5 22:50:57 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 5 Feb 2022 23:50:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/libnpupnp: bump to version 4.2.1 In-Reply-To: <20220124223806.2720164-1-fontaine.fabrice@gmail.com> References: <20220124223806.2720164-1-fontaine.fabrice@gmail.com> Message-ID: On 24/01/2022 23:38, Fabrice Fontaine wrote: > Signed-off-by: Fabrice Fontaine Just in time for 2022.02 :-) Applied to master, thanks. Regards, Arnout > --- > 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 From arnout at mind.be Sat Feb 5 22:51:15 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 5 Feb 2022 23:51:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-dataproperty: bump to version 0.54.2 In-Reply-To: <20220125212039.300631-1-fontaine.fabrice@gmail.com> References: <20220125212039.300631-1-fontaine.fabrice@gmail.com> Message-ID: <527e0e50-1daa-5683-b587-053b503b1202@mind.be> On 25/01/2022 22:20, Fabrice Fontaine wrote: > 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 Applied to master, thanks. Regards, Arnout > --- > 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 From arnout at mind.be Sat Feb 5 22:52:31 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 5 Feb 2022 23:52:31 +0100 Subject: [Buildroot] [PATCH 1/2] package/python-sqliteschema: drop python-six dependency In-Reply-To: <20220125213242.301404-1-fontaine.fabrice@gmail.com> References: <20220125213242.301404-1-fontaine.fabrice@gmail.com> Message-ID: On 25/01/2022 22:32, Fabrice Fontaine wrote: > 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 Both applied to master, thanks. Peter, this one is for 2021.11. Regards, Arnout > --- > 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 From arnout at mind.be Sat Feb 5 22:54:09 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 5 Feb 2022 23:54:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/boost: enable context/coroutine for arm variants In-Reply-To: <20220126082505.10253-1-pieter.degendt@gmail.com> References: <20220126082505.10253-1-pieter.degendt@gmail.com> Message-ID: On 26/01/2022 09:25, Pieter De Gendt wrote: > Add boost context support for aarch64/aarch64_be and select AAPCS > as ABI for all arm variants. I've added an explanation _why_ the change to AAPCS (because ucontext only works with AAPCS ABI). > > 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 There's a comment just above this that refers to an outdated URL. I've updated that as well. Applied to master, thanks. Regards, Arnout > 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 From arnout at mind.be Sat Feb 5 22:54:35 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 5 Feb 2022 23:54:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/lighttpd: add pgsql support In-Reply-To: <20220126211749.1550932-1-fontaine.fabrice@gmail.com> References: <20220126211749.1550932-1-fontaine.fabrice@gmail.com> Message-ID: On 26/01/2022 22:17, Fabrice Fontaine wrote: > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > 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 From arnout at mind.be Sat Feb 5 22:34:40 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 5 Feb 2022 23:34:40 +0100 Subject: [Buildroot] [git commit] package/python-sqliteschema: drop python-six dependency Message-ID: <20220205224746.ADA9E82AA2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=66192c66b9421b95f6cc45a46264c0193a873c58 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 From arnout at mind.be Sat Feb 5 22:30:23 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 5 Feb 2022 23:30:23 +0100 Subject: [Buildroot] [git commit] package/runc: bump to version 1.1.0 Message-ID: <20220205224746.82A4282AA7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=25457ba3458b932507424a9a55298282128059c8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 From arnout at mind.be Sat Feb 5 22:34:41 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 5 Feb 2022 23:34:41 +0100 Subject: [Buildroot] [git commit] package/python-sqliteschema: bump to version 1.2.1 Message-ID: <20220205224746.B5FAB82AA7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5eff46a6c97203e7874edc931c4180f606f08275 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/thombashi/sqliteschema/releases/tag/v1.2.1 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 From arnout at mind.be Sat Feb 5 22:34:40 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 5 Feb 2022 23:34:40 +0100 Subject: [Buildroot] [git commit] package/libnpupnp: bump to version 4.2.1 Message-ID: <20220205224746.9CDB282AA7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b5654af1bae4c56af914d2d948cbe2dd1ae4de88 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 From arnout at mind.be Sat Feb 5 22:45:19 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 5 Feb 2022 23:45:19 +0100 Subject: [Buildroot] [git commit] package/lua: bump to version 5.4.4 Message-ID: <20220205224746.C6A7482AA2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4f9a5659023c66fc166de28fd39a6c97a9490667 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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(-) diff --git a/package/lua/5.4.3/lua.hash b/package/lua/5.4.3/lua.hash deleted file mode 100644 index be3604837f..0000000000 --- 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 7b9d6d76f3..68316e108f 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 0000000000..b55b17f258 --- /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 844e165df0..09e7b34f7d 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 From arnout at mind.be Sat Feb 5 22:45:19 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 5 Feb 2022 23:45:19 +0100 Subject: [Buildroot] [git commit] package/lua: use Lua 5.4 as default Message-ID: <20220205224746.CF6E282AA7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d32e062f1cc709893ed5893ebae736a54c36eef9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master lua-sdl2 is not available on Lua 5.4, so update its test to use Lua 5.3 instead. Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 5d4cee5d5b..309dd6eec2 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 573ae01005..9703dffbd4 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 22c4087f5d..b9aad15f45 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 From arnout at mind.be Sat Feb 5 22:41:47 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 5 Feb 2022 23:41:47 +0100 Subject: [Buildroot] [git commit] package/boost: enable context/coroutine for arm variants Message-ID: <20220205224746.BE1AC82AE5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1c667a11400e51618a4b38d288816cbb3ee7478f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add boost context support for aarch64/aarch64_be. Context support for ARM is only available in the AAPCS ABI, so switch to AAPCS ABI for all ARM variants. While we're at it, update the URL about the context architecture support to the one corresponding to the current version of boost. Signed-off-by: Pieter De Gendt [Arnout: update URL, extend commit message] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/boost/Config.in | 3 ++- package/boost/boost.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/boost/Config.in b/package/boost/Config.in index 1c405a36c3..2c458bf88a 100644 --- a/package/boost/Config.in +++ b/package/boost/Config.in @@ -68,12 +68,13 @@ config BR2_PACKAGE_BOOST_CONTAINER Standard library containers and extensions. # see -# http://www.boost.org/doc/libs/1_59_0/libs/context/doc/html/context/architectures.html +# http://www.boost.org/doc/libs/1_78_0/libs/context/doc/html/context/architectures.html # for the list of supported architectures. Sparc pretends to be # supported, but it doesn't build. 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 From arnout at mind.be Sat Feb 5 22:34:26 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 5 Feb 2022 23:34:26 +0100 Subject: [Buildroot] [git commit] package/sdl2: bump version to 2.0.20 Message-ID: <20220205224746.8BEAD82AE5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ee572c54488a2929833b17778d1e4de2892f5d4b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Copyright year updated in LICENSE.txt. Signed-off-by: Michael Fischer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 From arnout at mind.be Sat Feb 5 22:46:12 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 5 Feb 2022 23:46:12 +0100 Subject: [Buildroot] [git commit] package/python-pyopenssl: bump to version 21.0.0 Message-ID: <20220205224746.D74C582AA7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a1acae45658989922d799f0b668444217ef01e7a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update indentation in hash file (two spaces) https://github.com/pyca/pyopenssl/blob/21.0.0/CHANGELOG.rst Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 From arnout at mind.be Sat Feb 5 22:30:20 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 5 Feb 2022 23:30:20 +0100 Subject: [Buildroot] [git commit] package/fmt: bump to version 8.1.1 Message-ID: <20220205224746.78CFE82AA2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ec7fd50d08690a383fec40748ac9b78c3f764316 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Michael Nosthoff Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 From arnout at mind.be Sat Feb 5 22:46:12 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 5 Feb 2022 23:46:12 +0100 Subject: [Buildroot] [git commit] package/lighttpd: add pgsql support Message-ID: <20220205224746.DF05782AE5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b429dce6f8e2ee162b79fe2a3ebb1bd179f462e3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 f46e1a9a66..b9f64a3bc3 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -80,6 +80,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 f8ed7c6f7c..49ab8587f7 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -23,7 +23,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 \ @@ -95,6 +94,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 From arnout at mind.be Sat Feb 5 22:34:40 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 5 Feb 2022 23:34:40 +0100 Subject: [Buildroot] [git commit] package/python-dataproperty: bump to version 0.54.2 Message-ID: <20220205224746.A545A82AE5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bf7c819f1ea0dd699d886dba1b7db177acc90b1a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 From arnout at mind.be Sat Feb 5 22:34:40 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 5 Feb 2022 23:34:40 +0100 Subject: [Buildroot] [git commit] package/network-manager: bump to version 1.34.0 Message-ID: <20220205224746.94A2582AA2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bd7179d1394a002934f6c4d3ce3d1952cc3fe445 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master CONTRIBUTING.md hash changed due to various style updates and additions. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 From arnout at mind.be Sat Feb 5 22:58:57 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 5 Feb 2022 23:58:57 +0100 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: On 27/01/2022 00:56, 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). Since it apparently wasn't clear enough (cfr. Baruch's comment), I've tried to explain a bit better. Hopefully it indeed is better :-) Applied to master, thanks. Regards, Arnout > > 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/ \ From arnout at mind.be Sat Feb 5 22:55:53 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 5 Feb 2022 23:55:53 +0100 Subject: [Buildroot] [git commit] package/ltp-testsuite: bump version to 20220121 Message-ID: <20220205225146.DC88782A80@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=85af8e22c62dc9e378f27c59dc388c8d7394a91f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master LTP now builds metadata directory for the host. It supports cross-compilation, we just need to pass HOST_CFLAGS and HOST_LDFLAGS in addition to the target flags. They have to be passed to make, adding them to configure does not work. Without this, on some architectures the -mlongcalls and -mauto-litpools get passed to the host compile, but they're not valid there. 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch | 45 ++++++---------- .../0002-lib-fix-MemAvailable-parsing.patch | 36 ------------- .../0003-lapi-rtnetlink.h-Fix-include-guards.patch | 37 ------------- ...ate-if_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(-) 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/ \ From arnout at mind.be Sat Feb 5 22:59:47 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 5 Feb 2022 23:59:47 +0100 Subject: [Buildroot] [git commit] package/ltp-testsuite: update spacing in hash file Message-ID: <20220205225308.F03B482A80@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3b0d174166dbc68a3c688da63eb9684390981895 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master sha1 was using just 1 space. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/ltp-testsuite/ltp-testsuite.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ltp-testsuite/ltp-testsuite.hash b/package/ltp-testsuite/ltp-testsuite.hash index bd648cbfdd..53429fd59f 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/20220121/ltp-full-20220121.tar.xz.sha1 -sha1 211935e901afea1010ec4f70369b782fbee93ed4 ltp-full-20220121.tar.xz +sha1 211935e901afea1010ec4f70369b782fbee93ed4 ltp-full-20220121.tar.xz # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 ad002520616fac52362229ea0f1bb9d304fc03ff0096ccb5b1820cee9fc8413a ltp-full-20220121.tar.xz From james.hilliard1 at gmail.com Sat Feb 5 23:03:01 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 5 Feb 2022 16:03:01 -0700 Subject: [Buildroot] [PATCH 1/2] package/wayland-protocols: bump to version 1.25 Message-ID: <20220205230302.3837382-1-james.hilliard1@gmail.com> Drop patch that is now upstream. Signed-off-by: James Hilliard --- ...and-scanner-is-only-needed-for-tests.patch | 42 ------------------- .../wayland-protocols/wayland-protocols.hash | 8 ++-- .../wayland-protocols/wayland-protocols.mk | 2 +- 3 files changed, 5 insertions(+), 47 deletions(-) delete mode 100644 package/wayland-protocols/0001-meson.build-wayland-scanner-is-only-needed-for-tests.patch diff --git a/package/wayland-protocols/0001-meson.build-wayland-scanner-is-only-needed-for-tests.patch b/package/wayland-protocols/0001-meson.build-wayland-scanner-is-only-needed-for-tests.patch deleted file mode 100644 index ff3ec5719c..0000000000 --- a/package/wayland-protocols/0001-meson.build-wayland-scanner-is-only-needed-for-tests.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 80e97bd00bf6263845aa98b411507baba28be67e Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 19 Sep 2021 11:01:00 +0200 -Subject: [PATCH] meson.build: wayland-scanner is only needed for tests - -wayland-scanner is only needed for tests so don't require it if tests -are disabled - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://gitlab.freedesktop.org/wayland/wayland-protocols/-/commit/80e97bd00bf6263845aa98b411507baba28be67e] ---- - meson.build | 2 -- - tests/meson.build | 1 + - 2 files changed, 1 insertion(+), 2 deletions(-) - -diff --git a/meson.build b/meson.build -index 94b49e7..15dbc37 100644 ---- a/meson.build -+++ b/meson.build -@@ -8,8 +8,6 @@ wayland_protocols_version = meson.project_version() - - fs = import('fs') - --dep_scanner = dependency('wayland-scanner', native: true) -- - stable_protocols = [ - 'presentation-time', - 'viewporter', -diff --git a/tests/meson.build b/tests/meson.build -index 66337e7..74824ae 100644 ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -1,4 +1,5 @@ - prog_scan_sh = find_program('scan.sh') -+dep_scanner = dependency('wayland-scanner', native: true) - prog_scanner = find_program(dep_scanner.get_pkgconfig_variable('wayland_scanner')) - - libwayland = [ --- -GitLab - diff --git a/package/wayland-protocols/wayland-protocols.hash b/package/wayland-protocols/wayland-protocols.hash index b76bafb437..1262f0f9d7 100644 --- a/package/wayland-protocols/wayland-protocols.hash +++ b/package/wayland-protocols/wayland-protocols.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2021-September/041979.html -md5 31a6c469718db37d2688109e548506e4 wayland-protocols-1.23.tar.xz -sha1 8c4ebdce35953b1e2af458c139a432a308af6f50 wayland-protocols-1.23.tar.xz -sha256 6c0af1915f96f615927a6270d025bd973ff1c58e521e4ca1fc9abfc914633f76 wayland-protocols-1.23.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2022-January/042102.html +md5 0c192bf32de09ec30de4a82d1c65329c wayland-protocols-1.25.tar.xz +sha1 275298332d124e40e345aa82bc8f48ef8cad3480 wayland-protocols-1.25.tar.xz +sha256 f1ff0f7199d0a0da337217dd8c99979967808dc37731a1e759e822b75b571460 wayland-protocols-1.25.tar.xz sha256 f1a2b233e8a9a71c40f4aa885be08a0842ac85bb8588703c1dd7e6e6502e3124 COPYING diff --git a/package/wayland-protocols/wayland-protocols.mk b/package/wayland-protocols/wayland-protocols.mk index 41ab1e1c99..746d82e308 100644 --- a/package/wayland-protocols/wayland-protocols.mk +++ b/package/wayland-protocols/wayland-protocols.mk @@ -4,7 +4,7 @@ # ################################################################################ -WAYLAND_PROTOCOLS_VERSION = 1.23 +WAYLAND_PROTOCOLS_VERSION = 1.25 WAYLAND_PROTOCOLS_SITE = https://wayland.freedesktop.org/releases WAYLAND_PROTOCOLS_SOURCE = wayland-protocols-$(WAYLAND_PROTOCOLS_VERSION).tar.xz WAYLAND_PROTOCOLS_LICENSE = MIT -- 2.25.1 From james.hilliard1 at gmail.com Sat Feb 5 23:03:02 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 5 Feb 2022 16:03:02 -0700 Subject: [Buildroot] [PATCH 2/2] package/weston: bump to version 10.0.0 In-Reply-To: <20220205230302.3837382-1-james.hilliard1@gmail.com> References: <20220205230302.3837382-1-james.hilliard1@gmail.com> Message-ID: <20220205230302.3837382-2-james.hilliard1@gmail.com> Drop patches that are now upstream. Jpeg dependency is now optional. Add new backend compositor options. Add comment indicating fbdev is deprecated(not yet removed). Enable tools to match existing default(all enabled). Signed-off-by: James Hilliard --- ...ntl.h-for-open-O_RDWR-O_CLOEXEC-and-.patch | 48 --- ...libweston-backend-drm-might-need-EGL.patch | 47 --- ...003-pipewire-add-support-for-0.3-API.patch | 391 ------------------ ...4-pipewire-fix-null-deref-in-0-3-API.patch | 28 -- package/weston/Config.in | 34 +- package/weston/weston.hash | 10 +- package/weston/weston.mk | 35 +- 7 files changed, 58 insertions(+), 535 deletions(-) delete mode 100644 package/weston/0001-tests-include-fcntl.h-for-open-O_RDWR-O_CLOEXEC-and-.patch delete mode 100644 package/weston/0002-libweston-backend-drm-might-need-EGL.patch delete mode 100644 package/weston/0003-pipewire-add-support-for-0.3-API.patch delete mode 100644 package/weston/0004-pipewire-fix-null-deref-in-0-3-API.patch diff --git a/package/weston/0001-tests-include-fcntl.h-for-open-O_RDWR-O_CLOEXEC-and-.patch b/package/weston/0001-tests-include-fcntl.h-for-open-O_RDWR-O_CLOEXEC-and-.patch deleted file mode 100644 index 2eb6bd838c..0000000000 --- a/package/weston/0001-tests-include-fcntl.h-for-open-O_RDWR-O_CLOEXEC-and-.patch +++ /dev/null @@ -1,48 +0,0 @@ -From b10c0e843dcb8148bbe869bb15261955b94ac98c Mon Sep 17 00:00:00 2001 -From: Denys Dmytriyenko -Date: Tue, 8 Sep 2020 19:37:42 -0400 -Subject: [PATCH] tests: include fcntl.h for open(), O_RDWR, O_CLOEXEC and - O_CREAT - -musl libc (unlike glibc) requires explicitly incuding fcntl.h to define open(), -O_RDWR, O_CLOEXEC and O_CREAT. Otherwise the build fails with the errors: - -| ../weston-9.0.0/tests/weston-test-fixture-compositor.c: In function 'wait_for_lock': -| ../weston-9.0.0/tests/weston-test-fixture-compositor.c:135:7: warning: implicit declaration of function 'open'; did you mean 'popen'? [-Wimplicit-function-declaration] -| 135 | fd = open(lock_path, O_RDWR | O_CLOEXEC | O_CREAT, 00700); -| | ^~~~ -| | popen -| ../weston-9.0.0/tests/weston-test-fixture-compositor.c:135:23: error: 'O_RDWR' undeclared (first use in this function) -| 135 | fd = open(lock_path, O_RDWR | O_CLOEXEC | O_CREAT, 00700); -| | ^~~~~~ -| ../weston-9.0.0/tests/weston-test-fixture-compositor.c:135:23: note: each undeclared identifier is reported only once for each function it appears in -| ../weston-9.0.0/tests/weston-test-fixture-compositor.c:135:32: error: 'O_CLOEXEC' undeclared (first use in this function) -| 135 | fd = open(lock_path, O_RDWR | O_CLOEXEC | O_CREAT, 00700); -| | ^~~~~~~~~ -| ../weston-9.0.0/tests/weston-test-fixture-compositor.c:135:44: error: 'O_CREAT' undeclared (first use in this function) -| 135 | fd = open(lock_path, O_RDWR | O_CLOEXEC | O_CREAT, 00700); -| | ^~~~~~~ - -Signed-off-by: Denys Dmytriyenko -Signed-off-by: James Hilliard -[james.hilliard1 at gmail.com: backport from upstream commit -b10c0e843dcb8148bbe869bb15261955b94ac98c] ---- - tests/weston-test-fixture-compositor.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tests/weston-test-fixture-compositor.c b/tests/weston-test-fixture-compositor.c -index 1c32959c..c1eb26c4 100644 ---- a/tests/weston-test-fixture-compositor.c -+++ b/tests/weston-test-fixture-compositor.c -@@ -35,6 +35,7 @@ - #include - #include - #include -+#include - - #include "shared/helpers.h" - #include "weston-test-fixture-compositor.h" --- -2.25.1 - diff --git a/package/weston/0002-libweston-backend-drm-might-need-EGL.patch b/package/weston/0002-libweston-backend-drm-might-need-EGL.patch deleted file mode 100644 index f504e1145b..0000000000 --- a/package/weston/0002-libweston-backend-drm-might-need-EGL.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 4b93b71067949cc5efabb9b3d59278a3f362b11c Mon Sep 17 00:00:00 2001 -From: Heiko Thiery -Date: Wed, 21 Oct 2020 13:33:25 +0200 -Subject: [PATCH] libweston/backend/drm: might need EGL - -gbm-drm.c includes gl-renderer.h. When EGL is enabled, that in turns -includes egl.h. As such, dependencies for drm should include EGL if -it is available. - -This condition is modelled after a similar one in libweston/meson.build - -Reported-by: Gary Bisson -Reported-by: Heiko Thiery -Signed-off-by: Yann E. MORIN -Cc: Refik Tuzakli -Cc: Thomas Petazzoni -Signed-off-by: Heiko Thiery ---- -This patch should be a proper fix for the issue discribed in the patch from -Gary [1]. - -Since the MR on weston upstream [2] is not merged now I add this patch -to have working weston with imx in buildroot. - -[1] https://patchwork.ozlabs.org/project/buildroot/patch/20200402130842.918696-3-gary.bisson at boundarydevices.com/ -[2] https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/508 ---- - libweston/backend-drm/meson.build | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/libweston/backend-drm/meson.build b/libweston/backend-drm/meson.build -index 484c2702..e3e5b976 100644 ---- a/libweston/backend-drm/meson.build -+++ b/libweston/backend-drm/meson.build -@@ -53,6 +53,9 @@ if get_option('renderer-gl') - config_h.set('HAVE_GBM_FD_IMPORT', '1') - endif - deps_drm += dep_gbm -+ if dep_egl.found() -+ deps_drm += dep_egl -+ endif - srcs_drm += 'drm-gbm.c' - config_h.set('BUILD_DRM_GBM', '1') - endif --- -2.20.1 - diff --git a/package/weston/0003-pipewire-add-support-for-0.3-API.patch b/package/weston/0003-pipewire-add-support-for-0.3-API.patch deleted file mode 100644 index b486b3de5c..0000000000 --- a/package/weston/0003-pipewire-add-support-for-0.3-API.patch +++ /dev/null @@ -1,391 +0,0 @@ -From cc08737e3fd174ec3c4c208ea4f2a3a6a9e8af3e Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Mon, 6 Jul 2020 00:58:02 -0600 -Subject: [PATCH] pipewire: add support for 0.3 API - -Fixes: #369 - -Signed-off-by: James Hilliard -[james.hilliard1 at gmail.com: backport from upstream commit -80b585f8d2a31e780b4de41fbd187a742bea7e1a] ---- - .gitlab-ci.yml | 2 +- - .gitlab-ci/debian-install.sh | 16 ++++- - pipewire/meson.build | 28 ++++++--- - pipewire/pipewire-plugin.c | 118 ++++++++++++++++++++++++++++++++++- - 4 files changed, 151 insertions(+), 13 deletions(-) - -diff --git a/pipewire/meson.build b/pipewire/meson.build -index 3d3374b8..e30a0b62 100644 ---- a/pipewire/meson.build -+++ b/pipewire/meson.build -@@ -5,17 +5,25 @@ if get_option('pipewire') - error('Attempting to build the pipewire plugin without the required DRM backend. ' + user_hint) - endif - -- depnames = [ -- 'libpipewire-0.2', 'libspa-0.1' -- ] - deps_pipewire = [ dep_libweston_private ] -- foreach depname : depnames -- dep = dependency(depname, required: false) -- if not dep.found() -- error('Pipewire plugin requires @0@ which was not found. '.format(depname) + user_hint) -- endif -- deps_pipewire += dep -- endforeach -+ -+ dep_libpipewire = dependency('libpipewire-0.3', required: false) -+ if not dep_libpipewire.found() -+ dep_libpipewire = dependency('libpipewire-0.2', required: false) -+ endif -+ if not dep_libpipewire.found() -+ error('Pipewire plugin requires libpipewire which was not found. ' + user_hint) -+ endif -+ deps_pipewire += dep_libpipewire -+ -+ dep_libspa = dependency('libspa-0.2', required: false) -+ if not dep_libspa.found() -+ dep_libspa = dependency('libspa-0.1', required: false) -+ endif -+ if not dep_libspa.found() -+ error('Pipewire plugin requires libspa which was not found. ' + user_hint) -+ endif -+ deps_pipewire += dep_libspa - - plugin_pipewire = shared_library( - 'pipewire-plugin', -diff --git a/pipewire/pipewire-plugin.c b/pipewire/pipewire-plugin.c -index 6f892574..ce70ea63 100644 ---- a/pipewire/pipewire-plugin.c -+++ b/pipewire/pipewire-plugin.c -@@ -34,20 +34,27 @@ - #include - #include - -+#include -+ - #include - #include - #include - --#include -+#if PW_CHECK_VERSION(0, 2, 90) -+#include -+#include -+#endif - - #define PROP_RANGE(min, max) 2, (min), (max) - -+#if !PW_CHECK_VERSION(0, 2, 90) - struct type { - struct spa_type_media_type media_type; - struct spa_type_media_subtype media_subtype; - struct spa_type_format_video format_video; - struct spa_type_video_format video_format; - }; -+#endif - - struct weston_pipewire { - struct weston_compositor *compositor; -@@ -60,12 +67,19 @@ struct weston_pipewire { - struct pw_loop *loop; - struct wl_event_source *loop_source; - -+#if PW_CHECK_VERSION(0, 2, 90) -+ struct pw_context *context; -+#endif - struct pw_core *core; - struct pw_type *t; -+#if PW_CHECK_VERSION(0, 2, 90) -+ struct spa_hook core_listener; -+#else - struct type type; - - struct pw_remote *remote; - struct spa_hook remote_listener; -+#endif - }; - - struct pipewire_output { -@@ -100,6 +114,7 @@ struct pipewire_frame_data { - struct wl_event_source *fence_sync_event_source; - }; - -+#if !PW_CHECK_VERSION(0, 2, 90) - static inline void init_type(struct type *type, struct spa_type_map *map) - { - spa_type_media_type_map(map, &type->media_type); -@@ -107,6 +122,7 @@ static inline void init_type(struct type *type, struct spa_type_map *map) - spa_type_format_video_map(map, &type->format_video); - spa_type_video_format_map(map, &type->video_format); - } -+#endif - - static void - pipewire_debug_impl(struct weston_pipewire *pipewire, -@@ -141,6 +157,7 @@ pipewire_debug_impl(struct weston_pipewire *pipewire, - free(logstr); - } - -+#if !PW_CHECK_VERSION(0, 2, 90) - static void - pipewire_debug(struct weston_pipewire *pipewire, const char *fmt, ...) - { -@@ -150,6 +167,7 @@ pipewire_debug(struct weston_pipewire *pipewire, const char *fmt, ...) - pipewire_debug_impl(pipewire, NULL, fmt, ap); - va_end(ap); - } -+#endif - - static void - pipewire_output_debug(struct pipewire_output *output, const char *fmt, ...) -@@ -185,7 +203,9 @@ pipewire_output_handle_frame(struct pipewire_output *output, int fd, - const struct weston_drm_virtual_output_api *api = - output->pipewire->virtual_output_api; - size_t size = output->output->height * stride; -+#if !PW_CHECK_VERSION(0, 2, 90) - struct pw_type *t = output->pipewire->t; -+#endif - struct pw_buffer *buffer; - struct spa_buffer *spa_buffer; - struct spa_meta_header *h; -@@ -203,7 +223,12 @@ pipewire_output_handle_frame(struct pipewire_output *output, int fd, - - spa_buffer = buffer->buffer; - -+#if PW_CHECK_VERSION(0, 2, 90) -+ if ((h = spa_buffer_find_meta_data(spa_buffer, SPA_META_Header, -+ sizeof(struct spa_meta_header)))) { -+#else - if ((h = spa_buffer_find_meta(spa_buffer, t->meta.Header))) { -+#endif - h->pts = -1; - h->flags = 0; - h->seq = output->seq++; -@@ -375,18 +400,40 @@ pipewire_set_dpms(struct weston_output *base_output, enum dpms_enum level) - static int - pipewire_output_connect(struct pipewire_output *output) - { -+#if !PW_CHECK_VERSION(0, 2, 90) - struct weston_pipewire *pipewire = output->pipewire; - struct type *type = &pipewire->type; -+#endif - uint8_t buffer[1024]; - struct spa_pod_builder builder = - SPA_POD_BUILDER_INIT(buffer, sizeof(buffer)); - const struct spa_pod *params[1]; -+#if !PW_CHECK_VERSION(0, 2, 90) - struct pw_type *t = pipewire->t; -+#endif - int frame_rate = output->output->current_mode->refresh / 1000; - int width = output->output->width; - int height = output->output->height; - int ret; - -+#if PW_CHECK_VERSION(0, 2, 90) -+ params[0] = spa_pod_builder_add_object(&builder, -+ SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat, -+ SPA_FORMAT_mediaType, SPA_POD_Id(SPA_MEDIA_TYPE_video), -+ SPA_FORMAT_mediaSubtype, SPA_POD_Id(SPA_MEDIA_SUBTYPE_raw), -+ SPA_FORMAT_VIDEO_format, SPA_POD_Id(SPA_VIDEO_FORMAT_BGRx), -+ SPA_FORMAT_VIDEO_size, SPA_POD_Rectangle(&SPA_RECTANGLE(width, height)), -+ SPA_FORMAT_VIDEO_framerate, SPA_POD_Fraction(&SPA_FRACTION (0, 1)), -+ SPA_FORMAT_VIDEO_maxFramerate, -+ SPA_POD_CHOICE_RANGE_Fraction(&SPA_FRACTION(frame_rate, 1), -+ &SPA_FRACTION(1, 1), -+ &SPA_FRACTION(frame_rate, 1))); -+ -+ ret = pw_stream_connect(output->stream, PW_DIRECTION_OUTPUT, SPA_ID_INVALID, -+ (PW_STREAM_FLAG_DRIVER | -+ PW_STREAM_FLAG_MAP_BUFFERS), -+ params, 1); -+#else - params[0] = spa_pod_builder_object(&builder, - t->param.idEnumFormat, t->spa_format, - "I", type->media_type.video, -@@ -406,6 +453,7 @@ pipewire_output_connect(struct pipewire_output *output) - (PW_STREAM_FLAG_DRIVER | - PW_STREAM_FLAG_MAP_BUFFERS), - params, 1); -+#endif - if (ret != 0) { - weston_log("Failed to connect pipewire stream: %s", - spa_strerror(ret)); -@@ -482,26 +530,42 @@ pipewire_output_stream_state_changed(void *data, enum pw_stream_state old, - } - - static void -+#if PW_CHECK_VERSION(0, 2, 90) -+pipewire_output_stream_param_changed(void *data, uint32_t id, const struct spa_pod *format) -+#else - pipewire_output_stream_format_changed(void *data, const struct spa_pod *format) -+#endif - { - struct pipewire_output *output = data; -+#if !PW_CHECK_VERSION(0, 2, 90) - struct weston_pipewire *pipewire = output->pipewire; -+#endif - uint8_t buffer[1024]; - struct spa_pod_builder builder = - SPA_POD_BUILDER_INIT(buffer, sizeof(buffer)); - const struct spa_pod *params[2]; -+#if !PW_CHECK_VERSION(0, 2, 90) - struct pw_type *t = pipewire->t; -+#endif - int32_t width, height, stride, size; - const int bpp = 4; - - if (!format) { - pipewire_output_debug(output, "format = None"); -+#if PW_CHECK_VERSION(0, 2, 90) -+ pw_stream_update_params(output->stream, NULL, 0); -+#else - pw_stream_finish_format(output->stream, 0, NULL, 0); -+#endif - return; - } - -+#if PW_CHECK_VERSION(0, 2, 90) -+ spa_format_video_raw_parse(format, &output->video_format); -+#else - spa_format_video_raw_parse(format, &output->video_format, - &pipewire->type.format_video); -+#endif - - width = output->video_format.size.width; - height = output->video_format.size.height; -@@ -510,6 +574,21 @@ pipewire_output_stream_format_changed(void *data, const struct spa_pod *format) - - pipewire_output_debug(output, "format = %dx%d", width, height); - -+#if PW_CHECK_VERSION(0, 2, 90) -+ params[0] = spa_pod_builder_add_object(&builder, -+ SPA_TYPE_OBJECT_ParamBuffers, SPA_PARAM_Buffers, -+ SPA_PARAM_BUFFERS_size, SPA_POD_Int(size), -+ SPA_PARAM_BUFFERS_stride, SPA_POD_Int(stride), -+ SPA_PARAM_BUFFERS_buffers, SPA_POD_CHOICE_RANGE_Int(4, 2, 8), -+ SPA_PARAM_BUFFERS_align, SPA_POD_Int(16)); -+ -+ params[1] = spa_pod_builder_add_object(&builder, -+ SPA_TYPE_OBJECT_ParamMeta, SPA_PARAM_Meta, -+ SPA_PARAM_META_type, SPA_POD_Id(SPA_META_Header), -+ SPA_PARAM_META_size, SPA_POD_Int(sizeof(struct spa_meta_header))); -+ -+ pw_stream_update_params(output->stream, params, 2); -+#else - params[0] = spa_pod_builder_object(&builder, - t->param.idBuffers, t->param_buffers.Buffers, - ":", t->param_buffers.size, -@@ -527,12 +606,17 @@ pipewire_output_stream_format_changed(void *data, const struct spa_pod *format) - ":", t->param_meta.size, "i", sizeof(struct spa_meta_header)); - - pw_stream_finish_format(output->stream, 0, params, 2); -+#endif - } - - static const struct pw_stream_events stream_events = { - PW_VERSION_STREAM_EVENTS, - .state_changed = pipewire_output_stream_state_changed, -+#if PW_CHECK_VERSION(0, 2, 90) -+ .param_changed = pipewire_output_stream_param_changed, -+#else - .format_changed = pipewire_output_stream_format_changed, -+#endif - }; - - static struct weston_output * -@@ -560,7 +644,11 @@ pipewire_output_create(struct weston_compositor *c, char *name) - if (!head) - goto err; - -+#if PW_CHECK_VERSION(0, 2, 90) -+ output->stream = pw_stream_new(pipewire->core, name, NULL); -+#else - output->stream = pw_stream_new(pipewire->remote, name, NULL); -+#endif - if (!output->stream) { - weston_log("Cannot initialize pipewire stream\n"); - goto err; -@@ -704,6 +792,14 @@ weston_pipewire_loop_handler(int fd, uint32_t mask, void *data) - return 0; - } - -+#if PW_CHECK_VERSION(0, 2, 90) -+static void -+weston_pipewire_error(void *data, uint32_t id, int seq, int res, -+ const char *error) -+{ -+ weston_log("pipewire remote error: %s\n", error); -+} -+#else - static void - weston_pipewire_state_changed(void *data, enum pw_remote_state old, - enum pw_remote_state state, const char *error) -@@ -725,12 +821,20 @@ weston_pipewire_state_changed(void *data, enum pw_remote_state old, - break; - } - } -+#endif - - -+#if PW_CHECK_VERSION(0, 2, 90) -+static const struct pw_core_events core_events = { -+ PW_VERSION_CORE_EVENTS, -+ .error = weston_pipewire_error, -+}; -+#else - static const struct pw_remote_events remote_events = { - PW_VERSION_REMOTE_EVENTS, - .state_changed = weston_pipewire_state_changed, - }; -+#endif - - static int - weston_pipewire_init(struct weston_pipewire *pipewire) -@@ -745,10 +849,19 @@ weston_pipewire_init(struct weston_pipewire *pipewire) - - pw_loop_enter(pipewire->loop); - -+#if PW_CHECK_VERSION(0, 2, 90) -+ pipewire->context = pw_context_new(pipewire->loop, NULL, 0); -+#else - pipewire->core = pw_core_new(pipewire->loop, NULL); - pipewire->t = pw_core_get_type(pipewire->core); - init_type(&pipewire->type, pipewire->t->map); -+#endif - -+#if PW_CHECK_VERSION(0, 2, 90) -+ pw_core_add_listener(pipewire->core, -+ &pipewire->core_listener, -+ &core_events, pipewire); -+#else - pipewire->remote = pw_remote_new(pipewire->core, NULL, 0); - pw_remote_add_listener(pipewire->remote, - &pipewire->remote_listener, -@@ -777,6 +890,7 @@ weston_pipewire_init(struct weston_pipewire *pipewire) - goto err; - } - } -+#endif - - loop = wl_display_get_event_loop(pipewire->compositor->wl_display); - pipewire->loop_source = -@@ -786,12 +900,14 @@ weston_pipewire_init(struct weston_pipewire *pipewire) - pipewire); - - return 0; -+#if !PW_CHECK_VERSION(0, 2, 90) - err: - if (pipewire->remote) - pw_remote_destroy(pipewire->remote); - pw_loop_leave(pipewire->loop); - pw_loop_destroy(pipewire->loop); - return -1; -+#endif - } - - static const struct weston_pipewire_api pipewire_api = { --- -2.25.1 - diff --git a/package/weston/0004-pipewire-fix-null-deref-in-0-3-API.patch b/package/weston/0004-pipewire-fix-null-deref-in-0-3-API.patch deleted file mode 100644 index f65348e166..0000000000 --- a/package/weston/0004-pipewire-fix-null-deref-in-0-3-API.patch +++ /dev/null @@ -1,28 +0,0 @@ -From a67393c353e0f25b142910a817be5a7754d436c3 Mon Sep 17 00:00:00 2001 -From: Ambareesh Balaji -Date: Sat, 5 Dec 2020 20:49:55 -0500 -Subject: [PATCH] pipewire: fix null deref in 0.3 API - -Signed-off-by: Ambareesh Balaji -[Retrieved from: -https://gitlab.freedesktop.org/wayland/weston/-/commit/a67393c353e0f25b142910a817be5a7754d436c3] -Signed-off-by: Fabrice Fontaine ---- - pipewire/pipewire-plugin.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/pipewire/pipewire-plugin.c b/pipewire/pipewire-plugin.c -index ca5cbfec1..55705acfc 100644 ---- a/pipewire/pipewire-plugin.c -+++ b/pipewire/pipewire-plugin.c -@@ -856,6 +856,7 @@ weston_pipewire_init(struct weston_pipewire *pipewire) - - #if PW_CHECK_VERSION(0, 2, 90) - pipewire->context = pw_context_new(pipewire->loop, NULL, 0); -+ pipewire->core = pw_context_connect(pipewire->context, NULL, 0); - #else - pipewire->core = pw_core_new(pipewire->loop, NULL); - pipewire->t = pw_core_get_type(pipewire->core); --- -GitLab - diff --git a/package/weston/Config.in b/package/weston/Config.in index 8f3dbc7931..d45e50baaa 100644 --- a/package/weston/Config.in +++ b/package/weston/Config.in @@ -35,7 +35,7 @@ choice prompt "default compositor" config BR2_PACKAGE_WESTON_DEFAULT_FBDEV - bool "fbdev" + bool "fbdev (deprecated)" select BR2_PACKAGE_WESTON_FBDEV config BR2_PACKAGE_WESTON_DEFAULT_DRM @@ -46,21 +46,31 @@ config BR2_PACKAGE_WESTON_DEFAULT_DRM comment "drm backend needs mesa3d w/ EGL driver" depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL && !BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL +config BR2_PACKAGE_WESTON_DEFAULT_HEADLESS + bool "headless" + select BR2_PACKAGE_WESTON_HEADLESS + +config BR2_PACKAGE_WESTON_DEFAULT_WAYLAND + bool "wayland (nested)" + select BR2_PACKAGE_WESTON_WAYLAND + config BR2_PACKAGE_WESTON_DEFAULT_X11 - bool "X11" + bool "X11 (nested)" depends on BR2_PACKAGE_XORG7 select BR2_PACKAGE_WESTON_X11 -comment "X11 backend needs X.org" +comment "X11 (nested) backend needs X.org" depends on !BR2_PACKAGE_XORG7 endchoice config BR2_PACKAGE_WESTON_DEFAULT_COMPOSITOR string - default "fbdev" if BR2_PACKAGE_WESTON_DEFAULT_FBDEV - default "drm" if BR2_PACKAGE_WESTON_DEFAULT_DRM - default "x11" if BR2_PACKAGE_WESTON_DEFAULT_X11 + default "fbdev" if BR2_PACKAGE_WESTON_DEFAULT_FBDEV + default "drm" if BR2_PACKAGE_WESTON_DEFAULT_DRM + default "headless" if BR2_PACKAGE_WESTON_DEFAULT_HEADLESS + default "wayland" if BR2_PACKAGE_WESTON_DEFAULT_WAYLAND + default "x11" if BR2_PACKAGE_WESTON_DEFAULT_X11 config BR2_PACKAGE_WESTON_DRM bool "DRM compositor" @@ -71,7 +81,7 @@ comment "DRM compositor needs an OpenGL EGL backend provided by mesa3d" depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL && !BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL config BR2_PACKAGE_WESTON_FBDEV - bool "fbdev compositor" + bool "fbdev compositor (deprecated)" # FreeRDP needs threads and !static, already the case for weston config BR2_PACKAGE_WESTON_RDP @@ -99,13 +109,19 @@ comment "RDP compositor needs a toolchain w/ wchar, C++" depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP +config BR2_PACKAGE_WESTON_HEADLESS + bool "headless (testing) compositor" + +config BR2_PACKAGE_WESTON_WAYLAND + bool "Wayland (nested) compositor" + config BR2_PACKAGE_WESTON_X11 - bool "X11 compositor" + bool "X11 (nested) compositor" depends on BR2_PACKAGE_XORG7 select BR2_PACKAGE_LIBXCB select BR2_PACKAGE_XLIB_LIBX11 -comment "X11 compositor needs X.org enabled" +comment "X11 (nested) compositor needs X.org enabled" depends on !BR2_PACKAGE_XORG7 config BR2_PACKAGE_WESTON_XWAYLAND diff --git a/package/weston/weston.hash b/package/weston/weston.hash index 5a6b38686a..b78a7c7550 100644 --- a/package/weston/weston.hash +++ b/package/weston/weston.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2020-September/041595.html -md5 b406da0fe9139fd39653238fde22a6cf weston-9.0.0.tar.xz -sha1 90b9540a0bd6d6f7a465817f1c696d4d393183c9 weston-9.0.0.tar.xz -sha256 5cf5d6ce192e0eb15c1fc861a436bf21b5bb3b91dbdabbdebe83e1f83aa098fe weston-9.0.0.tar.xz -sha512 ccc263f8279b7b23e5c593b4a8a023de2c3dc178b1b8d6593599171770bcfe97608de9fcb77aa1cab39255451d289d323e51c317dae190c7641282e085b84f90 weston-9.0.0.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2022-February/042103.html +md5 bc4abe2ee6904a4890a0c641c6257f91 weston-10.0.0.tar.xz +sha1 b1a51e3bb7ee1d75bbf728c8071771e07fc97fdd weston-10.0.0.tar.xz +sha256 5c23964112b90238bed39e5dd1e41cd71a79398813cdc3bbb15a9fdc94e547ae weston-10.0.0.tar.xz +sha512 77e05530751e4f743eebf015ab5b78a1fcc66b774713b5e296cfffc488be84e459f811c85ac4280b7b63eebf4ff5c958dd7306376ab343e6b80feae16c8c35a4 weston-10.0.0.tar.xz sha256 fdb65868f65d0fbdb05c2d3b779e10ce9969fa0c4b9262ba4f260e87086ab860 COPYING diff --git a/package/weston/weston.mk b/package/weston/weston.mk index 6dd5439291..a0a18d9358 100644 --- a/package/weston/weston.mk +++ b/package/weston/weston.mk @@ -4,7 +4,7 @@ # ################################################################################ -WESTON_VERSION = 9.0.0 +WESTON_VERSION = 10.0.0 WESTON_SITE = https://wayland.freedesktop.org/releases WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz WESTON_LICENSE = MIT @@ -12,12 +12,14 @@ WESTON_LICENSE_FILES = COPYING WESTON_CPE_ID_VENDOR = wayland WESTON_DEPENDENCIES = host-pkgconf wayland wayland-protocols \ - libxkbcommon pixman libpng jpeg udev cairo libinput libdrm + libxkbcommon pixman libpng udev cairo libinput libdrm WESTON_CONF_OPTS = \ -Dbackend-headless=false \ -Dcolor-management-colord=false \ - -Dremoting=false + -Ddoc=false \ + -Dremoting=false \ + -Dtools=calibrator,debug,info,terminal,touch-calibrator # Uses VIDIOC_EXPBUF, only available from 3.8+ ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_8),y) @@ -33,6 +35,13 @@ else WESTON_CONF_OPTS += -Dlauncher-logind=false endif +ifeq ($(BR2_PACKAGE_JPEG),y) +WESTON_CONF_OPTS += -Dimage-jpeg=true +WESTON_DEPENDENCIES += jpeg +else +WESTON_CONF_OPTS += -Dimage-jpeg=false +endif + ifeq ($(BR2_PACKAGE_WEBP),y) WESTON_CONF_OPTS += -Dimage-webp=true WESTON_DEPENDENCIES += webp @@ -48,10 +57,10 @@ endef define WESTON_USERS - - weston-launch -1 - - - - Weston launcher group endef -WESTON_CONF_OPTS += -Dweston-launch=true +WESTON_CONF_OPTS += -Ddeprecated-weston-launch=true WESTON_DEPENDENCIES += linux-pam else -WESTON_CONF_OPTS += -Dweston-launch=false +WESTON_CONF_OPTS += -Ddeprecated-weston-launch=false endif ifeq ($(BR2_PACKAGE_HAS_LIBEGL_WAYLAND)$(BR2_PACKAGE_HAS_LIBGLES),yy) @@ -77,9 +86,9 @@ WESTON_CONF_OPTS += -Dbackend-rdp=false endif ifeq ($(BR2_PACKAGE_WESTON_FBDEV),y) -WESTON_CONF_OPTS += -Dbackend-fbdev=true +WESTON_CONF_OPTS += -Ddeprecated-backend-fbdev=true else -WESTON_CONF_OPTS += -Dbackend-fbdev=false +WESTON_CONF_OPTS += -Ddeprecated-backend-fbdev=false endif ifeq ($(BR2_PACKAGE_WESTON_DRM),y) @@ -88,6 +97,18 @@ else WESTON_CONF_OPTS += -Dbackend-drm=false endif +ifeq ($(BR2_PACKAGE_WESTON_HEADLESS),y) +WESTON_CONF_OPTS += -Dbackend-headless=true +else +WESTON_CONF_OPTS += -Dbackend-headless=false +endif + +ifeq ($(BR2_PACKAGE_WESTON_WAYLAND),y) +WESTON_CONF_OPTS += -Dbackend-wayland=true +else +WESTON_CONF_OPTS += -Dbackend-wayland=false +endif + ifeq ($(BR2_PACKAGE_WESTON_X11),y) WESTON_CONF_OPTS += -Dbackend-x11=true WESTON_DEPENDENCIES += libxcb xlib_libX11 -- 2.25.1 From kuzminov.sergey81 at gmail.com Sat Feb 5 23:04:22 2022 From: kuzminov.sergey81 at gmail.com (Sergey Kuzminov) Date: Sun, 6 Feb 2022 02:04:22 +0300 Subject: [Buildroot] [PATCH v2] configs/orangepi_zero_defconfig: switch to extlinux In-Reply-To: <033373DF-6707-4295-8A12-D4ABE072608F@benettiengineering.com> References: <20220205215558.30751-1-kuzminov.sergey81@gmail.com> <033373DF-6707-4295-8A12-D4ABE072608F@benettiengineering.com> Message-ID: <4b114bca-d4ee-9ff9-931c-bd7501eb2e32@gmail.com> Hi Giulio, 06.02.2022 01:18, Giulio Benetti: > Hi Sergey, > > below I give you a better example of commit log, > and the dealing with V1->V2 series. > >> Il giorno 5 feb 2022, alle ore 22:56, Sergey Kuzminov ha scritto: >> >> ?Changes: >> v1: > > Please Remove this line ^^^ > >> - Exclude FAT partition, it is no longer needed for U-Boot. >> - Switch the rootfs partition from MBR to GPT for partition-uuid to work. >> - Switch to extlinux, this is convenient for debugging. >> - Create common scenarios for multiple boards to create an SD image: board/orangepi/common. >> >> v2: > Remove this ^^^ line >> - Fix typo in first line of changes (s/he/it). > This too ^^^ >> - Add BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y. > Here we need an explanation of the reason why, what this implies. >> - Exclude one boot option from extlinux.conf. > This ^^^ too >> >> Signed-off-by: Sergey Kuzminov > ?- > V1->V2: > * improved commit log > * removed commented line in extlinux.conf > * removed one boot option from extlinux.conf >> --- > > So as you can see, commit log doesn?t mention the patch version, while after the 3 dashes you > can write in general whatever you want because it won?t be part of commit log and it?s usually used > to report V1->V2 version etc. Changes: * Exclude FAT partition, it is no longer needed for U-Boot. * Switch the rootfs partition from MBR to GPT for partition-uuid to work. * Switch to extlinux, this is convenient for debugging. * Create common scenarios for multiple boards to create an SD image: board/orangepi/common. * Add BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y, remount root filesystem read-write during boot. --- V1->V2: * improved commit log * removed commented line in extlinux.conf * removed one boot option from extlinux.conf V2->V3: * improved commit log That's right? >> +++ b/board/orangepi/common/genimage.cfg >> @@ -0,0 +1,23 @@ >> +image sdcard.img { >> + partition u-boot { >> + in-partition-table = false >> + image = "u-boot-sunxi-with-spl.bin" >> + offset = 8K >> + size = 1000K # 1MB - 8KB(offset) - 16KB(GPT) >> + } >> + >> + hdimage { >> + partition-table-type = gpt >> + gpt-location = 1008K # 1MB - 16KB(GPT) >> + gpt-no-backup = true >> + # After writing the image to the SD card, >> + # backup GPT data structures at the end of the disk: >> + # gdisk /dev/mmcblk0 then press the buttons: x, e, w, y > > Why don?t you make this part ^^^ automatic with a script or you simply use genimage itself? > > What it?s expected as board defconfig is something that you burn a sdcard with the sdcard.img file and that?s it. So here you need to make it automatic. > > So we wait for V3 with the commit log form you read above and requested changes. The problem is that it is not possible to create an sdcard.img image with the correct GPT structure. The second copy of the GPT must be at the end of the disk, and the size of sdcard.img will not match the SD card. Will work and so, with one copy of GPT. But the disk utilities may issue a warning about the absence of a second copy of the GPT. You can correct the situation only after writing sdcard.img to the SD card, or during the first loading of the board in a separate script. This is out of scope for this patch. From giulio.benetti at benettiengineering.com Sat Feb 5 23:13:56 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 00:13:56 +0100 Subject: [Buildroot] [PATCH v2] configs/orangepi_zero_defconfig: switch to extlinux In-Reply-To: <4b114bca-d4ee-9ff9-931c-bd7501eb2e32@gmail.com> References: <20220205215558.30751-1-kuzminov.sergey81@gmail.com> <033373DF-6707-4295-8A12-D4ABE072608F@benettiengineering.com> <4b114bca-d4ee-9ff9-931c-bd7501eb2e32@gmail.com> Message-ID: Hi Sergey, On 06/02/22 00:04, Sergey Kuzminov wrote: > Hi Giulio, > > 06.02.2022 01:18, Giulio Benetti: >> Hi Sergey, >> >> below I give you a better example of commit log, >> and the dealing with V1->V2 series. >> >>> Il giorno 5 feb 2022, alle ore 22:56, Sergey Kuzminov ha scritto: >>> >>> ?Changes: >>> v1: >> >> Please Remove this line ^^^ >> >>> - Exclude FAT partition, it is no longer needed for U-Boot. >>> - Switch the rootfs partition from MBR to GPT for partition-uuid to work. >>> - Switch to extlinux, this is convenient for debugging. >>> - Create common scenarios for multiple boards to create an SD image: board/orangepi/common. >>> >>> v2: >> Remove this ^^^ line >>> - Fix typo in first line of changes (s/he/it). >> This too ^^^ >>> - Add BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y. >> Here we need an explanation of the reason why, what this implies. >>> - Exclude one boot option from extlinux.conf. >> This ^^^ too >>> >>> Signed-off-by: Sergey Kuzminov >> ?- >> V1->V2: >> * improved commit log >> * removed commented line in extlinux.conf >> * removed one boot option from extlinux.conf >>> --- >> >> So as you can see, commit log doesn?t mention the patch version, while after the 3 dashes you >> can write in general whatever you want because it won?t be part of commit log and it?s usually used >> to report V1->V2 version etc. > > Changes: > * Exclude FAT partition, it is no longer needed for U-Boot. > * Switch the rootfs partition from MBR to GPT for partition-uuid to work. > * Switch to extlinux, this is convenient for debugging. > * Create common scenarios for multiple boards to create an SD image: > board/orangepi/common. > * Add BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y, remount root filesystem > read-write during boot. > > --- > V1->V2: > * improved commit log > * removed commented line in extlinux.conf > * removed one boot option from extlinux.conf > > V2->V3: > * improved commit log > > That's right? Yes, this works for me now > >>> +++ b/board/orangepi/common/genimage.cfg >>> @@ -0,0 +1,23 @@ >>> +image sdcard.img { >>> + partition u-boot { >>> + in-partition-table = false >>> + image = "u-boot-sunxi-with-spl.bin" >>> + offset = 8K >>> + size = 1000K # 1MB - 8KB(offset) - 16KB(GPT) >>> + } >>> + >>> + hdimage { >>> + partition-table-type = gpt >>> + gpt-location = 1008K # 1MB - 16KB(GPT) >>> + gpt-no-backup = true >>> + # After writing the image to the SD card, >>> + # backup GPT data structures at the end of the disk: >>> + # gdisk /dev/mmcblk0 then press the buttons: x, e, w, y >> >> Why don?t you make this part ^^^ automatic with a script or you simply use genimage itself? >> >> What it?s expected as board defconfig is something that you burn a sdcard with the sdcard.img file and that?s it. So here you need to make it automatic. >> >> So we wait for V3 with the commit log form you read above and requested changes. > > The problem is that it is not possible to create an sdcard.img image > with the correct GPT structure. The second copy of the GPT must be at > the end of the disk, and the size of sdcard.img will not match the SD > card. Will work and so, with one copy of GPT. But the disk utilities may > issue a warning about the absence of a second copy of the GPT. You can > correct the situation only after writing sdcard.img to the SD card, or > during the first loading of the board in a separate script. This is out > of scope for this patch. Ok, so please remove those 3 commented lines since I think the board actually works without those additional commands, correct? Otherwise, it this doesn't work on target without gdisk commands, you need to add a post-image.sh script to launch those commands. Thank you! Best regards -- Giulio Benetti Benetti Engineering sas From kuzminov.sergey81 at gmail.com Sat Feb 5 23:17:06 2022 From: kuzminov.sergey81 at gmail.com (Sergey Kuzminov) Date: Sun, 6 Feb 2022 02:17:06 +0300 Subject: [Buildroot] [PATCH v2] configs/orangepi_zero_defconfig: switch to extlinux In-Reply-To: References: <20220205215558.30751-1-kuzminov.sergey81@gmail.com> <033373DF-6707-4295-8A12-D4ABE072608F@benettiengineering.com> <4b114bca-d4ee-9ff9-931c-bd7501eb2e32@gmail.com> Message-ID: <54d39db2-d11d-ffc6-1966-c721b26d1a5c@gmail.com> 06.02.2022 02:13, Giulio Benetti ?????: > Hi Sergey, > > On 06/02/22 00:04, Sergey Kuzminov wrote: >> Hi Giulio, >> >> 06.02.2022 01:18, Giulio Benetti: >>> Hi Sergey, >>> >>> below I give you a better example of commit log, >>> and the dealing with V1->V2 series. >>> >>>> Il giorno 5 feb 2022, alle ore 22:56, Sergey Kuzminov >>>> ha scritto: >>>> >>>> ?Changes: >>>> v1: >>> >>> Please Remove this line ^^^ >>> >>>> - Exclude FAT partition, it is no longer needed for U-Boot. >>>> - Switch the rootfs partition from MBR to GPT for partition-uuid to >>>> work. >>>> - Switch to extlinux, this is convenient for debugging. >>>> - Create common scenarios for multiple boards to create an SD image: >>>> board/orangepi/common. >>>> >>>> v2: >>> Remove this ^^^ line >>>> - Fix typo in first line of changes (s/he/it). >>> This too ^^^ >>>> - Add BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y. >>> Here we need an explanation of the reason why, what this implies. >>>> - Exclude one boot option from extlinux.conf. >>> This ^^^ too >>>> >>>> Signed-off-by: Sergey Kuzminov >>> ?- >>> V1->V2: >>> * improved commit log >>> * removed commented line in extlinux.conf >>> * removed one boot option from extlinux.conf >>>> --- >>> >>> So as you can see, commit log doesn?t mention the patch version, >>> while after the 3 dashes you >>> can write in general whatever you want because it won?t be part of >>> commit log and it?s usually used >>> to report V1->V2 version etc. >> >> Changes: >> * Exclude FAT partition, it is no longer needed for U-Boot. >> * Switch the rootfs partition from MBR to GPT for partition-uuid to work. >> * Switch to extlinux, this is convenient for debugging. >> * Create common scenarios for multiple boards to create an SD image: >> board/orangepi/common. >> * Add BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y, remount root filesystem >> read-write during boot. >> >> --- >> V1->V2: >> * improved commit log >> * removed commented line in extlinux.conf >> * removed one boot option from extlinux.conf >> >> V2->V3: >> * improved commit log >> >> That's right? > > Yes, this works for me now > >> >>>> +++ b/board/orangepi/common/genimage.cfg >>>> @@ -0,0 +1,23 @@ >>>> +image sdcard.img { >>>> +??? partition u-boot { >>>> +??????? in-partition-table = false >>>> +??????? image = "u-boot-sunxi-with-spl.bin" >>>> +??????? offset = 8K >>>> +??????? size = 1000K # 1MB - 8KB(offset) - 16KB(GPT) >>>> +??? } >>>> + >>>> +??? hdimage { >>>> +??????? partition-table-type = gpt >>>> +??????? gpt-location = 1008K # 1MB - 16KB(GPT) >>>> +??????? gpt-no-backup = true >>>> +??????? # After writing the image to the SD card, >>>> +??????? # backup GPT data structures at the end of the disk: >>>> +??????? # gdisk /dev/mmcblk0 then press the buttons: x, e, w, y >>> >>> Why don?t you make this part ^^^ automatic with a script or you >>> simply use genimage itself? >>> >>> What it?s expected as board defconfig is something that you burn a >>> sdcard with the sdcard.img file and that?s it. So here you need to >>> make it automatic. >>> >>> So we wait for V3 with the commit log form you read above and >>> requested changes. >> >> The problem is that it is not possible to create an sdcard.img image >> with the correct GPT structure. The second copy of the GPT must be at >> the end of the disk, and the size of sdcard.img will not match the SD >> card. Will work and so, with one copy of GPT. But the disk utilities may >> issue a warning about the absence of a second copy of the GPT. You can >> correct the situation only after writing sdcard.img to the SD card, or >> during the first loading of the board in a separate script. This is out >> of scope for this patch. > > Ok, so please remove those 3 commented lines since I think the board > actually works without those additional commands, correct? Yes. > > Otherwise, it this doesn't work on target without gdisk commands, you > need to add a post-image.sh script to launch those commands. > > Thank you! > Best regards From giulio.benetti at benettiengineering.com Sat Feb 5 23:28:01 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 00:28:01 +0100 Subject: [Buildroot] [PATCH v2] configs/orangepi_zero_defconfig: switch to extlinux In-Reply-To: <54d39db2-d11d-ffc6-1966-c721b26d1a5c@gmail.com> References: <54d39db2-d11d-ffc6-1966-c721b26d1a5c@gmail.com> Message-ID: Hi Sergey, > Il giorno 6 feb 2022, alle ore 00:17, Sergey Kuzminov ha scritto: > > ?06.02.2022 02:13, Giulio Benetti ?????: >> Hi Sergey, >>> On 06/02/22 00:04, Sergey Kuzminov wrote: >>> Hi Giulio, >>> >>> 06.02.2022 01:18, Giulio Benetti: >>>> Hi Sergey, >>>> >>>> below I give you a better example of commit log, >>>> and the dealing with V1->V2 series. >>>> >>>>> Il giorno 5 feb 2022, alle ore 22:56, Sergey Kuzminov ha scritto: >>>>> >>>>> ?Changes: >>>>> v1: >>>> >>>> Please Remove this line ^^^ >>>> >>>>> - Exclude FAT partition, it is no longer needed for U-Boot. >>>>> - Switch the rootfs partition from MBR to GPT for partition-uuid to work. >>>>> - Switch to extlinux, this is convenient for debugging. >>>>> - Create common scenarios for multiple boards to create an SD image: board/orangepi/common. >>>>> >>>>> v2: >>>> Remove this ^^^ line >>>>> - Fix typo in first line of changes (s/he/it). >>>> This too ^^^ >>>>> - Add BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y. >>>> Here we need an explanation of the reason why, what this implies. >>>>> - Exclude one boot option from extlinux.conf. >>>> This ^^^ too >>>>> >>>>> Signed-off-by: Sergey Kuzminov >>>> ?- >>>> V1->V2: >>>> * improved commit log >>>> * removed commented line in extlinux.conf >>>> * removed one boot option from extlinux.conf >>>>> --- >>>> >>>> So as you can see, commit log doesn?t mention the patch version, while after the 3 dashes you >>>> can write in general whatever you want because it won?t be part of commit log and it?s usually used >>>> to report V1->V2 version etc. >>> >>> Changes: >>> * Exclude FAT partition, it is no longer needed for U-Boot. >>> * Switch the rootfs partition from MBR to GPT for partition-uuid to work. >>> * Switch to extlinux, this is convenient for debugging. >>> * Create common scenarios for multiple boards to create an SD image: >>> board/orangepi/common. >>> * Add BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y, remount root filesystem >>> read-write during boot. >>> >>> --- >>> V1->V2: >>> * improved commit log >>> * removed commented line in extlinux.conf >>> * removed one boot option from extlinux.conf >>> >>> V2->V3: >>> * improved commit log >>> >>> That's right? >> Yes, this works for me now >>> >>>>> +++ b/board/orangepi/common/genimage.cfg >>>>> @@ -0,0 +1,23 @@ >>>>> +image sdcard.img { >>>>> + partition u-boot { >>>>> + in-partition-table = false >>>>> + image = "u-boot-sunxi-with-spl.bin" >>>>> + offset = 8K >>>>> + size = 1000K # 1MB - 8KB(offset) - 16KB(GPT) >>>>> + } >>>>> + >>>>> + hdimage { >>>>> + partition-table-type = gpt >>>>> + gpt-location = 1008K # 1MB - 16KB(GPT) >>>>> + gpt-no-backup = true >>>>> + # After writing the image to the SD card, >>>>> + # backup GPT data structures at the end of the disk: >>>>> + # gdisk /dev/mmcblk0 then press the buttons: x, e, w, y >>>> >>>> Why don?t you make this part ^^^ automatic with a script or you simply use genimage itself? >>>> >>>> What it?s expected as board defconfig is something that you burn a sdcard with the sdcard.img file and that?s it. So here you need to make it automatic. >>>> >>>> So we wait for V3 with the commit log form you read above and requested changes. >>> >>> The problem is that it is not possible to create an sdcard.img image >>> with the correct GPT structure. The second copy of the GPT must be at >>> the end of the disk, and the size of sdcard.img will not match the SD >>> card. Will work and so, with one copy of GPT. But the disk utilities may >>> issue a warning about the absence of a second copy of the GPT. You can >>> correct the situation only after writing sdcard.img to the SD card, or >>> during the first loading of the board in a separate script. This is out >>> of scope for this patch. >> Ok, so please remove those 3 commented lines since I think the board actually works without those additional commands, correct? > > Yes. Perfect, so you can send the V3 patch. Please remember to keep my Reviewed-by and Tested-by after your SoB that I?ve given you on V1 patch. You can follow patchwork here: https://patchwork.ozlabs.org/project/buildroot/list/ You should also subscribe to patchwork and mark your V1 and V2 patches as superseded. Thank you Giulio > >> Otherwise, it this doesn't work on target without gdisk commands, you need to add a post-image.sh script to launch those commands. >> Thank you! >> Best regards > -------------- next part -------------- An HTML attachment was scrubbed... URL: From kuzminov.sergey81 at gmail.com Sat Feb 5 23:29:18 2022 From: kuzminov.sergey81 at gmail.com (Sergey Kuzminov) Date: Sun, 6 Feb 2022 02:29:18 +0300 Subject: [Buildroot] [PATCH v3] configs/orangepi_zero_defconfig: switch to extlinux Message-ID: <20220205232918.27091-1-kuzminov.sergey81@gmail.com> Changes: * Exclude FAT partition, it is no longer needed for U-Boot. * Switch the rootfs partition from MBR to GPT for partition-uuid to work. * Switch to extlinux, this is convenient for debugging. * Create common scenarios for multiple boards to create an SD image: board/orangepi/common. * Add BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y, remount root filesystem read-write during boot. --- V1->V2: * improved commit log * removed commented line in extlinux.conf * removed one boot option from extlinux.conf V2->V3: * improved commit log * removed comment from board/orangepi/common/genimage.cfg Signed-off-by: Sergey Kuzminov --- board/orangepi/common/extlinux.conf | 4 +++ board/orangepi/common/genimage.cfg | 20 +++++++++++++ board/orangepi/common/post-build.sh | 34 +++++++++++++++++++++ board/orangepi/orangepi-zero/boot.cmd | 9 ------ board/orangepi/orangepi-zero/genimage.cfg | 36 ----------------------- configs/orangepi_zero_defconfig | 11 ++++--- 6 files changed, 63 insertions(+), 51 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 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..12f496b1fa --- /dev/null +++ b/board/orangepi/common/extlinux.conf @@ -0,0 +1,4 @@ +LABEL default + kernel /boot/%LINUXIMAGE% + devicetreedir /boot + 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..a61c4a039f --- /dev/null +++ b/board/orangepi/common/genimage.cfg @@ -0,0 +1,20 @@ +image sdcard.img { + partition u-boot { + in-partition-table = false + image = "u-boot-sunxi-with-spl.bin" + offset = 8K + size = 1000K # 1MB - 8KB(offset) - 16KB(GPT) + } + + hdimage { + partition-table-type = gpt + gpt-location = 1008K # 1MB - 16KB(GPT) + gpt-no-backup = true + } + + 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/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 5aaa1566c5..96f0c3f600 100644 --- a/configs/orangepi_zero_defconfig +++ b/configs/orangepi_zero_defconfig @@ -20,10 +20,13 @@ 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_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y # Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="63M" +BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y # BR2_TARGET_ROOTFS_TAR is not set # Bootloader @@ -39,16 +42,12 @@ 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 # 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" # Wireless driver and firmware BR2_PACKAGE_XR819_XRADIO=y -- 2.34.1 From giulio.benetti at benettiengineering.com Sat Feb 5 23:34:19 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 00:34:19 +0100 Subject: [Buildroot] [PATCH v3] configs/orangepi_zero_defconfig: switch to extlinux In-Reply-To: <20220205232918.27091-1-kuzminov.sergey81@gmail.com> References: <20220205232918.27091-1-kuzminov.sergey81@gmail.com> Message-ID: <583B80CF-6F5A-4E96-BAF6-FC019E12868E@benettiengineering.com> > Il giorno 6 feb 2022, alle ore 00:29, Sergey Kuzminov ha scritto: > > ?Changes: > * Exclude FAT partition, it is no longer needed for U-Boot. > * Switch the rootfs partition from MBR to GPT for partition-uuid to work. > * Switch to extlinux, this is convenient for debugging. > * Create common scenarios for multiple boards to create an SD image: board/orangepi/common. > * Add BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y, remount root filesystem read-write during boot. Your SoB goes here along my Reviewed-by and Tested-by(one per line) I?ve given you on V1. > --- > V1->V2: > * improved commit log > * removed commented line in extlinux.conf > * removed one boot option from extlinux.conf > > V2->V3: > * improved commit log > * removed comment from board/orangepi/common/genimage.cfg > > Signed-off-by: Sergey Kuzminov And here you remove your SoB ^^^ Please send a V4 pointing you?ve fixed your Signed-off-by position and we?re done :-) Giulio > --- > board/orangepi/common/extlinux.conf | 4 +++ > board/orangepi/common/genimage.cfg | 20 +++++++++++++ > board/orangepi/common/post-build.sh | 34 +++++++++++++++++++++ > board/orangepi/orangepi-zero/boot.cmd | 9 ------ > board/orangepi/orangepi-zero/genimage.cfg | 36 ----------------------- > configs/orangepi_zero_defconfig | 11 ++++--- > 6 files changed, 63 insertions(+), 51 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 > 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..12f496b1fa > --- /dev/null > +++ b/board/orangepi/common/extlinux.conf > @@ -0,0 +1,4 @@ > +LABEL default > + kernel /boot/%LINUXIMAGE% > + devicetreedir /boot > + 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..a61c4a039f > --- /dev/null > +++ b/board/orangepi/common/genimage.cfg > @@ -0,0 +1,20 @@ > +image sdcard.img { > + partition u-boot { > + in-partition-table = false > + image = "u-boot-sunxi-with-spl.bin" > + offset = 8K > + size = 1000K # 1MB - 8KB(offset) - 16KB(GPT) > + } > + > + hdimage { > + partition-table-type = gpt > + gpt-location = 1008K # 1MB - 16KB(GPT) > + gpt-no-backup = true > + } > + > + 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/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 5aaa1566c5..96f0c3f600 100644 > --- a/configs/orangepi_zero_defconfig > +++ b/configs/orangepi_zero_defconfig > @@ -20,10 +20,13 @@ 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_NEEDS_HOST_OPENSSL=y > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > > # Filesystem > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="63M" > +BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y > # BR2_TARGET_ROOTFS_TAR is not set > > # Bootloader > @@ -39,16 +42,12 @@ 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 > > # 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" > > # Wireless driver and firmware > BR2_PACKAGE_XR819_XRADIO=y > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From kuzminov.sergey81 at gmail.com Sat Feb 5 23:50:40 2022 From: kuzminov.sergey81 at gmail.com (Sergey Kuzminov) Date: Sun, 6 Feb 2022 02:50:40 +0300 Subject: [Buildroot] [PATCH v3] configs/orangepi_zero_defconfig: switch to extlinux In-Reply-To: <583B80CF-6F5A-4E96-BAF6-FC019E12868E@benettiengineering.com> References: <20220205232918.27091-1-kuzminov.sergey81@gmail.com> <583B80CF-6F5A-4E96-BAF6-FC019E12868E@benettiengineering.com> Message-ID: <7d81f185-699c-9fc4-f392-07b332ce8184@gmail.com> 06.02.2022 02:34, Giulio Benetti: >> Il giorno 6 feb 2022, alle ore 00:29, Sergey Kuzminov ha scritto: >> >> ?Changes: >> * Exclude FAT partition, it is no longer needed for U-Boot. >> * Switch the rootfs partition from MBR to GPT for partition-uuid to work. >> * Switch to extlinux, this is convenient for debugging. >> * Create common scenarios for multiple boards to create an SD image: board/orangepi/common. >> * Add BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y, remount root filesystem read-write during boot. > Your SoB goes here along my Reviewed-by and Tested-by(one per line) I?ve given you on V1. > >> --- >> V1->V2: >> * improved commit log >> * removed commented line in extlinux.conf >> * removed one boot option from extlinux.conf >> >> V2->V3: >> * improved commit log >> * removed comment from board/orangepi/common/genimage.cfg >> >> Signed-off-by: Sergey Kuzminov > And here you remove your SoB ^^^ > > Please send a V4 pointing you?ve fixed your Signed-off-by position and we?re done:-) I don't understand how to do what you are asking. From daniil.stas at posteo.net Sun Feb 6 00:07:11 2022 From: daniil.stas at posteo.net (Daniil Stas) Date: Sun, 6 Feb 2022 00:07:11 +0000 Subject: [Buildroot] [BUG] boot/arm-trusted-firmware: Stack protection setting doesn't work Message-ID: <20220206020711.3dc6e42e@ux550ve> The bug was introduced in commit ccac9a5bbb ("boot/arm-trusted-firmware: don't force ENABLE_STACK_PROTECTOR"). In this commit the ENABLE_STACK_PROTECTOR option was moved from make arguments to the environment. But this value gets overwritten in make_helpers/defaults.mk (and platform specific makefiles) before it gets handled in the lib/stack_protector/stack_protector.mk. So setting it via environment doesn't work. You can check it, for example, if you compile TF-A for stm32mp157a_dk1 platform, and then check if bl32/stack_protector.o file is built. It gets built only with commit ccac9a5bbb being reverted. From james.hilliard1 at gmail.com Sun Feb 6 00:37:46 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 5 Feb 2022 17:37:46 -0700 Subject: [Buildroot] [PATCH 1/1] package/pipewire: bump to version 0.3.45 Message-ID: <20220206003746.1772081-1-james.hilliard1@gmail.com> Drop patch that is now upstream. Set new x11 and libcanberra meson config options. Signed-off-by: James Hilliard --- ...eson.build-add-atomic_dep-dependency.patch | 40 ------------------- package/pipewire/pipewire.hash | 2 +- package/pipewire/pipewire.mk | 10 ++++- 3 files changed, 10 insertions(+), 42 deletions(-) delete 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 deleted file mode 100644 index b91adbe7e4..0000000000 --- a/package/pipewire/0001-spa-meson.build-add-atomic_dep-dependency.patch +++ /dev/null @@ -1,40 +0,0 @@ -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 - diff --git a/package/pipewire/pipewire.hash b/package/pipewire/pipewire.hash index 8464a56338..a9d59663ae 100644 --- a/package/pipewire/pipewire.hash +++ b/package/pipewire/pipewire.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 2e91f228ffb93494f2423956b930014de20e15639a03f3df4fca4ebf4bc51fc0 pipewire-0.3.43.tar.bz2 +sha256 76291373f7ab271664df5b6a22b678ad57e485e25c73ee9c78e049a67b7886d2 pipewire-0.3.45.tar.bz2 sha256 8909c319a7e27dbb33a15b9035f89ab3b7b2f6a12f8bcddc755206a8db1ada44 COPYING sha256 be4be5d77424833edf31f53fc1f1cecb6996b9e2d747d9e6fb8f878362ebc92b LICENSE diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index b05ce2bcc2..fc521c86ac 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -4,7 +4,7 @@ # ################################################################################ -PIPEWIRE_VERSION = 0.3.43 +PIPEWIRE_VERSION = 0.3.45 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) @@ -29,6 +29,7 @@ PIPEWIRE_CONF_OPTS += \ -Dvideotestsrc=enabled \ -Dvolume=enabled \ -Dsession-managers=[] \ + -Dlibcanberra=disabled \ -Dlv2=disabled ifeq ($(BR2_PACKAGE_DBUS),y) @@ -128,6 +129,13 @@ else PIPEWIRE_CONF_OPTS += -Dlibcamera=disabled endif +ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y) +PIPEWIRE_CONF_OPTS += -Dx11=enabled +PIPEWIRE_DEPENDENCIES += xlib_libX11 +else +PIPEWIRE_CONF_OPTS += -Dx11=disabled +endif + ifeq ($(BR2_PACKAGE_LIBUSB),y) PIPEWIRE_CONF_OPTS += -Dlibusb=enabled PIPEWIRE_DEPENDENCIES += libusb -- 2.25.1 From peter.macleod.thompson at gmail.com Sun Feb 6 05:53:30 2022 From: peter.macleod.thompson at gmail.com (Peter Thompson) Date: Sat, 5 Feb 2022 22:53:30 -0700 Subject: [Buildroot] [PATCH 1/1] package/sdl2_ttf: bump version to 2.0.18 Message-ID: <20220206055330.11218-1-peter.macleod.thompson@gmail.com> From: PeterThompson Signed-off-by: PeterThompson --- package/sdl2_ttf/sdl2_ttf.hash | 4 ++-- package/sdl2_ttf/sdl2_ttf.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sdl2_ttf/sdl2_ttf.hash b/package/sdl2_ttf/sdl2_ttf.hash index 16459e4a59..a490b002b6 100644 --- a/package/sdl2_ttf/sdl2_ttf.hash +++ b/package/sdl2_ttf/sdl2_ttf.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a9eceb1ad88c1f1545cd7bd28e7cbc0b2c14191d40238f531a15b01b1b22cd33 SDL2_ttf-2.0.15.tar.gz -sha256 f6370809c9f644760920d9945c5be07aed17664975f2e4741013d4d9a2ec696f COPYING.txt +sha256 7234eb8883514e019e7747c703e4a774575b18d435c22a4a29d068cb768a2251 SDL2_ttf-2.0.18.tar.gz +sha256 e211dfe7e2c36e64048be886fe3f2bbba8732ce4dd77b596a355d3abbec775a4 COPYING.txt diff --git a/package/sdl2_ttf/sdl2_ttf.mk b/package/sdl2_ttf/sdl2_ttf.mk index 326cb99366..1fe7c0a075 100644 --- a/package/sdl2_ttf/sdl2_ttf.mk +++ b/package/sdl2_ttf/sdl2_ttf.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_TTF_VERSION = 2.0.15 +SDL2_TTF_VERSION = 2.0.18 SDL2_TTF_SOURCE = SDL2_ttf-$(SDL2_TTF_VERSION).tar.gz SDL2_TTF_SITE = http://www.libsdl.org/projects/SDL_ttf/release SDL2_TTF_LICENSE = Zlib -- 2.20.1 From thomas.petazzoni at bootlin.com Sun Feb 6 07:08:59 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 06 Feb 2022 07:08:59 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-02-05 Message-ID: <20220206070904.9AE508141C@smtp1.osuosl.org> Hello, Autobuild statistics for 2022-02-05 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 52 | 7 | 0 | 59 | 2021.11.x | 23 | 3 | 0 | 26 | master | 64 | 54 | 0 | 118 | Classification of failures by reason for master ----------------------------------------------- host-libselinux-3.3 | 13 host-python-docutils-0.15.2 | 10 rygel-0.40.2 | 6 bluez5_utils-5.63 | 5 cryptopp-8.6.0 | 2 tovid-87c676f4aadb7303d2cd9... | 2 wavemon-0.9.4 | 2 bat-0.19.0 | 1 bird-2.0.8 | 1 cryptsetup-2.4.2 | 1 docker-proxy-55685ba49593e6... | 1 guile-3.0.7 | 1 kf5-kcoreaddons-5.47.0 | 1 mp4v2-5.0.1 | 1 mpdecimal-2.5.1 | 1 mpv-0.33.1 | 1 python-docutils-0.15.2 | 1 rtorrent-0.9.8 | 1 sconeserver-6b932d7d8dbb700... | 1 systemd-250.3 | 1 target-finalize | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | bat-0.19.0 | NOK | http://autobuild.buildroot.net/results/f6b8f966295c6bdb8753a601b7936d4a37a81abd | mips64el | bird-2.0.8 | NOK | http://autobuild.buildroot.net/results/4c756fb8c36a64c11d559a6eedd71561fb15e8d4 | mips64el | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/6482f4195aa546d0d160eb20b0fa91247cd2bc33 | mips | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/c24807c247a682889fa28df5342c348a0ac4285d | mips64el | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/dd267013faaca1d5ebb6cdfdbc7d4527725006de | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/b745566790bad48b3d6930cc93fdd5d7b8680999 | mips64el | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/ac7ba633fe96d72c848acf1f43544ba6f897055b | powerpc | cryptopp-8.6.0 | NOK | http://autobuild.buildroot.net/results/e33b13e7a769febf28152a09a20295ec80b44164 | powerpc | cryptopp-8.6.0 | NOK | http://autobuild.buildroot.net/results/9e9f8559b12b8e2cf99cfab435fa7dd5796bbcd5 | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/5b6a522000e7b6081bbaa595dd300ce4c47a2852 | x86_64 | docker-proxy-55685ba49593e6... | NOK | http://autobuild.buildroot.net/results/59c103c6b552bcb6d5d8722502f044e9c938bad8 | arm | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/97ed6412047af3b3b881cf217210062bf4e4366e | ORPH arc | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/90f2e99833e50b73d1f883bd2a4dcd62b0e16491 | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/361410a6f843a7e198829b059eb9b9099852536e | mips64el | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/0a3dc4bf48ad842df4bcb4b8a1a7aa7425db0463 | mips64el | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/9491e9e270441a8e9f118cdb165121a375e53e15 | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/9074cbfcc6ef54f32bea1eb8232c6e50f2d48081 | aarch64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/8202804e3779908e6107c8750135869f6ad93c8f | microblazeel | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/66b78774776aff2af09aec477915eeeaac289189 | powerpc | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/eea09d68e1de44b887099fa4c27df7b8dcf190bc | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/0a49e46d2d29f051d0eca588643f90bd1c439b20 | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/7a0b385a9363f6b0dd4ab4ad561ec0b7e681eba6 | i686 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/702e64ae020e6ee10d4dcf45e23f9f6d082be3ba | riscv32 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/3731dffcc22cb96df8804901a9d94531b9b42dcc | powerpc | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/effd0f57649ef8753a46f889025819765801050e | i686 | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/eac4ceede674914506bf6a38b4ab528e3b66c70f | nios2 | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/3eee0fd5468c4e064cca1b493fdd9ae85161cae6 | x86_64 | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/81f772a48394d0eff2d9589b182f02f3f1af58dd | arm | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/8cff150298dff135c8d073516b02c627a167506a | aarch64 | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/4cad8e1c54584edc9b28548c797136d239fd00a4 | or1k | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/3aaa1bf531d73c9901643d6b4c42d30e57f3c6ed | sparc64 | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/c5917cba0c56be8827161e4473b8246f80994673 | microblazeel | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/f96d24d704fe38959ee2065869cab27d22519d71 | sh4 | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/d248faf5e10396f71becdcbfc57b07d6be14cf7e | mips64el | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/080a9a9cd896456ed2a6b15fcfc0f61ceb1fc6cf | arm | kf5-kcoreaddons-5.47.0 | NOK | http://autobuild.buildroot.net/results/694a2322d9161b55f5db66d1ace57d836360ed84 | arm | mp4v2-5.0.1 | NOK | http://autobuild.buildroot.net/results/178f1266396d44c6659a67d8e68cb99e36d544ea | ORPH arm | mpdecimal-2.5.1 | NOK | http://autobuild.buildroot.net/results/b20c090f2ac5ea6d1c761820763037b87bde137a | arc | mpv-0.33.1 | NOK | http://autobuild.buildroot.net/results/b46b864c63962466ce14a0906d4e54bfd8703281 | riscv64 | python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/75cabbb22f702fea9d9b75a4ab45eb389cf56ad1 | arc | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/522fd76e0edf575d6546dfa7665fa8647dfcf1df | ORPH arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/a33a91e44d35219fe256b1c43ef20898ba3a7584 | nios2 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/f3d2b17272e642ce657836289d44094a9dc3fb92 | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/e7c578e473ff1bd36fadfe25076ae44c8ed89663 | powerpc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/6eca1e0f81621c4f91225bdf19c726a9f2ada37d | aarch64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/7564c5d1210b2997262362d53a568328191230dc | riscv64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/f1b6faefb5499c4c63c05d17fcf556da1c8eb86a | mips | sconeserver-6b932d7d8dbb700... | NOK | http://autobuild.buildroot.net/results/2ec3114b6db6fb15cda365e1e4a332fd664818bb | nios2 | systemd-250.3 | NOK | http://autobuild.buildroot.net/results/c067a59b41b22703e402fc700ce6884ae32b576e | sparc | target-finalize | NOK | http://autobuild.buildroot.net/results/70b02e5c7e4f71e5e7d898dc84b759a2bae3ecdd | mipsel | tovid-87c676f4aadb7303d2cd9... | NOK | http://autobuild.buildroot.net/results/003bf2c1ed85851e68f4d81017582f559e342949 | s390x | tovid-87c676f4aadb7303d2cd9... | NOK | http://autobuild.buildroot.net/results/817aa1585cc59a29019ea1a8541d581b8d97ad2e | riscv32 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/0b5c2ba1b5ed76983c5b0ef121daa965c9362b48 | arm | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/c149383bc0b1e6c0022958213bc2752f34e21c4e | Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 2 monkey-f54856ce250c4e257354... | 1 openal-1.20.1 | 1 rocksdb-6.13.3 | 1 ruby-2.7.5 | 1 tvheadend-febcf9818d7c37fec... | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- nios2 | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/cad988f300e150bee71c7fece3827cf2f57523bb | m68k | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/4c12678290af91cc3401b8f8fc8e4c931171a7a5 | powerpc64le | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/dc0a1c6ac4df77a4d87e24618c7118c9b2f561be | or1k | openal-1.20.1 | NOK | http://autobuild.buildroot.net/results/2965a328ab73760e17793542d003defeb3e40b07 | m68k | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/c760fc779ff55a1a373e16ce45f5d9d591cda8a6 | aarch64 | ruby-2.7.5 | NOK | http://autobuild.buildroot.net/results/32aa592c2e596278abe858959885f68e0c776097 | riscv32 | tvheadend-febcf9818d7c37fec... | NOK | http://autobuild.buildroot.net/results/ff61b8d86d325552176abff2e7e70b938b29d2c5 | Classification of failures by reason for 2021.11.x -------------------------------------------------- python-pybind-2.6.1 | 1 suricata-6.0.4 | 1 wavemon-0.9.4 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- riscv64 | python-pybind-2.6.1 | NOK | http://autobuild.buildroot.net/results/9e19cd111d352440960b304eaadf0db14d02802b | arm | suricata-6.0.4 | NOK | http://autobuild.buildroot.net/results/cbef9bfc76b6b7ea890fffac2c663aa9adfa5ca9 | x86_64 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/a6bc18d284014275446683d84a62ba6ae8aaf667 | -- http://autobuild.buildroot.net From giulio.benetti at benettiengineering.com Sun Feb 6 07:13:55 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 08:13:55 +0100 Subject: [Buildroot] [PATCH v3] configs/orangepi_zero_defconfig: switch to extlinux In-Reply-To: <7d81f185-699c-9fc4-f392-07b332ce8184@gmail.com> References: <7d81f185-699c-9fc4-f392-07b332ce8184@gmail.com> Message-ID: <02663281-0879-462D-8A89-F922E86018A7@benettiengineering.com> Hi Sergey, > Il giorno 6 feb 2022, alle ore 00:50, Sergey Kuzminov ha scritto: > > ?06.02.2022 02:34, Giulio Benetti: >>>> Il giorno 6 feb 2022, alle ore 00:29, Sergey Kuzminov ha scritto: >>> >>> ?Changes: >>> * Exclude FAT partition, it is no longer needed for U-Boot. >>> * Switch the rootfs partition from MBR to GPT for partition-uuid to work. >>> * Switch to extlinux, this is convenient for debugging. >>> * Create common scenarios for multiple boards to create an SD image: board/orangepi/common. >>> * Add BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y, remount root filesystem read-write during boot. Move your Signed-off-by here(before the 3 dashes) and that?s all. This is because everything between the two sets of 3 dashes won?t be part of the commit. So we need your SoB here. >> Your SoB goes here along my Reviewed-by and Tested-by(one per line) I?ve given you on V1. >>> --- While here until next 3 dashes won?t be part of the commit log, but we need it for Mailing list to track the changes. >>> V1->V2: >>> * improved commit log >>> * removed commented line in extlinux.conf >>> * removed one boot option from extlinux.conf >>> >>> V2->V3: >>> * improved commit log >>> * removed comment from board/orangepi/common/genimage.cfg >>> >>> Signed-off-by: Sergey Kuzminov So if you keep your SoB here ^^^ won?t be part of the commit and that?s not what we want. >> And here you remove your SoB ^^^ >> Please send a V4 pointing you?ve fixed your Signed-off-by position and we?re done:-) > > I don't understand how to do what you are asking. All clear now? Kind regards Giulio > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From kuzminov.sergey81 at gmail.com Sun Feb 6 07:35:12 2022 From: kuzminov.sergey81 at gmail.com (Sergey Kuzminov) Date: Sun, 6 Feb 2022 10:35:12 +0300 Subject: [Buildroot] [PATCH v3] configs/orangepi_zero_defconfig: switch to extlinux In-Reply-To: <02663281-0879-462D-8A89-F922E86018A7@benettiengineering.com> References: <7d81f185-699c-9fc4-f392-07b332ce8184@gmail.com> <02663281-0879-462D-8A89-F922E86018A7@benettiengineering.com> Message-ID: <0177b527-6098-91f9-2c78-e7f898c537f0@gmail.com> Hi Giulio, 06.02.2022 10:13, Giulio Benetti: > Hi Sergey, > >> Il giorno 6 feb 2022, alle ore 00:50, Sergey Kuzminov ha scritto: >> >> ?06.02.2022 02:34, Giulio Benetti: >>>>> Il giorno 6 feb 2022, alle ore 00:29, Sergey Kuzminov ha scritto: >>>> >>>> ?Changes: >>>> * Exclude FAT partition, it is no longer needed for U-Boot. >>>> * Switch the rootfs partition from MBR to GPT for partition-uuid to work. >>>> * Switch to extlinux, this is convenient for debugging. >>>> * Create common scenarios for multiple boards to create an SD image: board/orangepi/common. >>>> * Add BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y, remount root filesystem read-write during boot. > > Move your Signed-off-by here(before the 3 dashes) and that?s all. > This is because everything between the two sets of 3 dashes won?t be part of the commit. > So we need your SoB here. > >>> Your SoB goes here along my Reviewed-by and Tested-by(one per line) I?ve given you on V1. >>>> --- > While here until next 3 dashes won?t be part of the commit log, but we need it for Mailing list to track the changes. >>>> V1->V2: >>>> * improved commit log >>>> * removed commented line in extlinux.conf >>>> * removed one boot option from extlinux.conf >>>> >>>> V2->V3: >>>> * improved commit log >>>> * removed comment from board/orangepi/common/genimage.cfg >>>> >>>> Signed-off-by: Sergey Kuzminov > > So if you keep your SoB here ^^^ won?t be part of the commit and that?s not what we want. > >>> And here you remove your SoB ^^^ >>> Please send a V4 pointing you?ve fixed your Signed-off-by position and we?re done:-) >> >> I don't understand how to do what you are asking. > > All clear now? > > Kind regards > Giulio > >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > Now I understand. Thank you. From fontaine.fabrice at gmail.com Sun Feb 6 07:38:05 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 6 Feb 2022 08:38:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/lighttpd: add mysql support Message-ID: <20220206073805.832602-1-fontaine.fabrice@gmail.com> lighttpd only supports mariadb Signed-off-by: Fabrice Fontaine --- package/lighttpd/Config.in | 9 +++++++++ package/lighttpd/lighttpd.mk | 8 +++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index b9f64a3bc3..aa18c13171 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -61,6 +61,15 @@ config BR2_PACKAGE_LIGHTTPD_MAXMINDDB help Enable MaxMind GeoIP2 support. Needed to support mod_maxminddb +config BR2_PACKAGE_LIGHTTPD_MYSQL + bool "mysql support" + depends on BR2_PACKAGE_MARIADB + help + Enable mysql support for lighttpd mod_vhostdb_mysql. + +comment "mysql support needs mariadb" + depends on !BR2_PACKAGE_MARIADB + 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 49ab8587f7..595c59cb37 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -19,7 +19,6 @@ LIGHTTPD_CONF_OPTS = \ -Dwith_libev=false \ -Dwith_libunwind=false \ -Dwith_mbedtls=false \ - -Dwith_mysql=false \ -Dwith_nettle=false \ -Dwith_nss=false \ -Dwith_pcre=false \ @@ -73,6 +72,13 @@ else LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=false endif +ifeq ($(BR2_PACKAGE_LIGHTTPD_MYSQL),y) +LIGHTTPD_DEPENDENCIES += mysql +LIGHTTPD_CONF_OPTS += -Dwith_mysql=true +else +LIGHTTPD_CONF_OPTS += -Dwith_mysql=false +endif + ifeq ($(BR2_PACKAGE_LIGHTTPD_OPENSSL),y) LIGHTTPD_DEPENDENCIES += openssl LIGHTTPD_CONF_OPTS += -Dwith_openssl=true -- 2.34.1 From kuzminov.sergey81 at gmail.com Sun Feb 6 07:48:53 2022 From: kuzminov.sergey81 at gmail.com (Sergey Kuzminov) Date: Sun, 6 Feb 2022 10:48:53 +0300 Subject: [Buildroot] [PATCH v4] configs/orangepi_zero_defconfig: switch to extlinux Message-ID: <20220206074853.25887-1-kuzminov.sergey81@gmail.com> Changes: * Exclude FAT partition, it is no longer needed for U-Boot. * Switch the rootfs partition from MBR to GPT for partition-uuid to work. * Switch to extlinux, this is convenient for debugging. * Create common scenarios for multiple boards to create an SD image: board/orangepi/common. * Add BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y, remount root filesystem read-write during boot. Signed-off-by: Sergey Kuzminov --- V1->V2: * improved commit log * removed commented line in extlinux.conf * removed one boot option from extlinux.conf V2->V3: * improved commit log * removed comment from board/orangepi/common/genimage.cfg V3->V4: * fixed Signed-off-by position --- board/orangepi/common/extlinux.conf | 4 +++ board/orangepi/common/genimage.cfg | 20 +++++++++++++ board/orangepi/common/post-build.sh | 34 +++++++++++++++++++++ board/orangepi/orangepi-zero/boot.cmd | 9 ------ board/orangepi/orangepi-zero/genimage.cfg | 36 ----------------------- configs/orangepi_zero_defconfig | 11 ++++--- 6 files changed, 63 insertions(+), 51 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 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..12f496b1fa --- /dev/null +++ b/board/orangepi/common/extlinux.conf @@ -0,0 +1,4 @@ +LABEL default + kernel /boot/%LINUXIMAGE% + devicetreedir /boot + 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..a61c4a039f --- /dev/null +++ b/board/orangepi/common/genimage.cfg @@ -0,0 +1,20 @@ +image sdcard.img { + partition u-boot { + in-partition-table = false + image = "u-boot-sunxi-with-spl.bin" + offset = 8K + size = 1000K # 1MB - 8KB(offset) - 16KB(GPT) + } + + hdimage { + partition-table-type = gpt + gpt-location = 1008K # 1MB - 16KB(GPT) + gpt-no-backup = true + } + + 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/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 5aaa1566c5..96f0c3f600 100644 --- a/configs/orangepi_zero_defconfig +++ b/configs/orangepi_zero_defconfig @@ -20,10 +20,13 @@ 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_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y # Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="63M" +BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y # BR2_TARGET_ROOTFS_TAR is not set # Bootloader @@ -39,16 +42,12 @@ 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 # 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" # Wireless driver and firmware BR2_PACKAGE_XR819_XRADIO=y -- 2.34.1 From giulio.benetti at benettiengineering.com Sun Feb 6 08:04:24 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 09:04:24 +0100 Subject: [Buildroot] [PATCH v4] configs/orangepi_zero_defconfig: switch to extlinux In-Reply-To: <20220206074853.25887-1-kuzminov.sergey81@gmail.com> References: <20220206074853.25887-1-kuzminov.sergey81@gmail.com> Message-ID: Hi Sergey, On 06/02/22 08:48, Sergey Kuzminov wrote: > Changes: > * Exclude FAT partition, it is no longer needed for U-Boot. > * Switch the rootfs partition from MBR to GPT for partition-uuid to work. > * Switch to extlinux, this is convenient for debugging. > * Create common scenarios for multiple boards to create an SD image: board/orangepi/common. > * Add BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y, remount root filesystem read-write during boot. > > Signed-off-by: Sergey Kuzminov Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti [Only built successfully] Best regards -- Giulio Benetti Benetti Engineering sas > --- > V1->V2: > * improved commit log > * removed commented line in extlinux.conf > * removed one boot option from extlinux.conf > > V2->V3: > * improved commit log > * removed comment from board/orangepi/common/genimage.cfg > > V3->V4: > * fixed Signed-off-by position > --- > board/orangepi/common/extlinux.conf | 4 +++ > board/orangepi/common/genimage.cfg | 20 +++++++++++++ > board/orangepi/common/post-build.sh | 34 +++++++++++++++++++++ > board/orangepi/orangepi-zero/boot.cmd | 9 ------ > board/orangepi/orangepi-zero/genimage.cfg | 36 ----------------------- > configs/orangepi_zero_defconfig | 11 ++++--- > 6 files changed, 63 insertions(+), 51 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 > 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..12f496b1fa > --- /dev/null > +++ b/board/orangepi/common/extlinux.conf > @@ -0,0 +1,4 @@ > +LABEL default > + kernel /boot/%LINUXIMAGE% > + devicetreedir /boot > + 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..a61c4a039f > --- /dev/null > +++ b/board/orangepi/common/genimage.cfg > @@ -0,0 +1,20 @@ > +image sdcard.img { > + partition u-boot { > + in-partition-table = false > + image = "u-boot-sunxi-with-spl.bin" > + offset = 8K > + size = 1000K # 1MB - 8KB(offset) - 16KB(GPT) > + } > + > + hdimage { > + partition-table-type = gpt > + gpt-location = 1008K # 1MB - 16KB(GPT) > + gpt-no-backup = true > + } > + > + 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/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 5aaa1566c5..96f0c3f600 100644 > --- a/configs/orangepi_zero_defconfig > +++ b/configs/orangepi_zero_defconfig > @@ -20,10 +20,13 @@ 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_NEEDS_HOST_OPENSSL=y > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > > # Filesystem > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="63M" > +BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y > # BR2_TARGET_ROOTFS_TAR is not set > > # Bootloader > @@ -39,16 +42,12 @@ 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 > > # 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" > > # Wireless driver and firmware > BR2_PACKAGE_XR819_XRADIO=y From paguilar at paguilar.org Sun Feb 6 08:43:34 2022 From: paguilar at paguilar.org (Pedro Aguilar) Date: Sun, 6 Feb 2022 09:43:34 +0100 Subject: [Buildroot] [PATCH v1 1/1] package/guile: Guile 3.0.7 requires libiconv. Message-ID: <20220206084334.1900252-1-paguilar@paguilar.org> This fixes the error reported in the daily results. Signed-off-by: Pedro Aguilar --- package/guile/Config.in | 1 + package/guile/guile.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/guile/Config.in b/package/guile/Config.in index b1182a4cee..2367a3ed3d 100644 --- a/package/guile/Config.in +++ b/package/guile/Config.in @@ -9,6 +9,7 @@ config BR2_PACKAGE_GUILE select BR2_PACKAGE_LIBFFI select BR2_PACKAGE_GMP select BR2_PACKAGE_BDWGC + select BR2_PACKAGE_LIBICONV help Guile is an interpreter and compiler for the Scheme programming language, a clean and elegant dialect of Lisp. diff --git a/package/guile/guile.mk b/package/guile/guile.mk index 0f245fca76..0f26443023 100644 --- a/package/guile/guile.mk +++ b/package/guile/guile.mk @@ -15,7 +15,7 @@ GUILE_LICENSE = LGPL-3.0+ GUILE_LICENSE_FILES = LICENSE COPYING COPYING.LESSER GUILE_CPE_ID_VENDOR = gnu -GUILE_DEPENDENCIES = host-guile libunistring libffi gmp bdwgc host-pkgconf +GUILE_DEPENDENCIES = host-guile libunistring libffi gmp bdwgc host-pkgconf libiconv HOST_GUILE_DEPENDENCIES = host-libunistring host-libffi host-gmp host-bdwgc host-flex host-pkgconf host-gettext # The HAVE_GC* CFLAGS specify that we will use internal callbacks -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 6 08:48:17 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 09:48:17 +0100 Subject: [Buildroot] [PATCH v1 1/1] package/guile: Guile 3.0.7 requires libiconv. In-Reply-To: <20220206084334.1900252-1-paguilar@paguilar.org> References: <20220206084334.1900252-1-paguilar@paguilar.org> Message-ID: <15b995c3-8d86-55f5-2b0e-d17e3f1d6978@benettiengineering.com> Hi Pedro, On 06/02/22 09:43, Pedro Aguilar wrote: > This fixes the error reported in the daily results. Please add to commit log: ``` Fixes: http://autobuild.buildroot.net/results/0ad/0add99a8cbb143d912d48ef4670e09a6710bb8b1/ ``` Thank you Best regards -- Giulio Benetti Benetti Engineering sas > Signed-off-by: Pedro Aguilar > --- > package/guile/Config.in | 1 + > package/guile/guile.mk | 2 +- > 2 files changed, 2 insertions(+), 1 deletion(-) > > diff --git a/package/guile/Config.in b/package/guile/Config.in > index b1182a4cee..2367a3ed3d 100644 > --- a/package/guile/Config.in > +++ b/package/guile/Config.in > @@ -9,6 +9,7 @@ config BR2_PACKAGE_GUILE > select BR2_PACKAGE_LIBFFI > select BR2_PACKAGE_GMP > select BR2_PACKAGE_BDWGC > + select BR2_PACKAGE_LIBICONV > help > Guile is an interpreter and compiler for the Scheme > programming language, a clean and elegant dialect of Lisp. > diff --git a/package/guile/guile.mk b/package/guile/guile.mk > index 0f245fca76..0f26443023 100644 > --- a/package/guile/guile.mk > +++ b/package/guile/guile.mk > @@ -15,7 +15,7 @@ GUILE_LICENSE = LGPL-3.0+ > GUILE_LICENSE_FILES = LICENSE COPYING COPYING.LESSER > GUILE_CPE_ID_VENDOR = gnu > > -GUILE_DEPENDENCIES = host-guile libunistring libffi gmp bdwgc host-pkgconf > +GUILE_DEPENDENCIES = host-guile libunistring libffi gmp bdwgc host-pkgconf libiconv > HOST_GUILE_DEPENDENCIES = host-libunistring host-libffi host-gmp host-bdwgc host-flex host-pkgconf host-gettext > > # The HAVE_GC* CFLAGS specify that we will use internal callbacks From giulio.benetti at benettiengineering.com Sun Feb 6 08:54:44 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 09:54:44 +0100 Subject: [Buildroot] [PATCH v1 1/1] package/guile: Guile 3.0.7 requires libiconv. In-Reply-To: <20220206084334.1900252-1-paguilar@paguilar.org> References: <20220206084334.1900252-1-paguilar@paguilar.org> Message-ID: <3942047e-e69e-d079-3ca5-55409fdda839@benettiengineering.com> Too fast... On 06/02/22 09:43, Pedro Aguilar wrote: > This fixes the error reported in the daily results. > > Signed-off-by: Pedro Aguilar > --- > package/guile/Config.in | 1 + > package/guile/guile.mk | 2 +- > 2 files changed, 2 insertions(+), 1 deletion(-) > > diff --git a/package/guile/Config.in b/package/guile/Config.in > index b1182a4cee..2367a3ed3d 100644 > --- a/package/guile/Config.in > +++ b/package/guile/Config.in > @@ -9,6 +9,7 @@ config BR2_PACKAGE_GUILE > select BR2_PACKAGE_LIBFFI > select BR2_PACKAGE_GMP > select BR2_PACKAGE_BDWGC > + select BR2_PACKAGE_LIBICONV > help > Guile is an interpreter and compiler for the Scheme > programming language, a clean and elegant dialect of Lisp. > diff --git a/package/guile/guile.mk b/package/guile/guile.mk > index 0f245fca76..0f26443023 100644 > --- a/package/guile/guile.mk > +++ b/package/guile/guile.mk > @@ -15,7 +15,7 @@ GUILE_LICENSE = LGPL-3.0+ > GUILE_LICENSE_FILES = LICENSE COPYING COPYING.LESSER > GUILE_CPE_ID_VENDOR = gnu > > -GUILE_DEPENDENCIES = host-guile libunistring libffi gmp bdwgc host-pkgconf > +GUILE_DEPENDENCIES = host-guile libunistring libffi gmp bdwgc host-pkgconf libiconv Here ^^^ please keep alphabetical order, so libiconv goes before libunistring and doing so can you please move host-pkgconf after host-guile? Thank you! -- Giulio Benetti Benetti Engineering sas > HOST_GUILE_DEPENDENCIES = host-libunistring host-libffi host-gmp host-bdwgc host-flex host-pkgconf host-gettext > > # The HAVE_GC* CFLAGS specify that we will use internal callbacks From thomas.devoogdt at gmail.com Sun Feb 6 09:04:26 2022 From: thomas.devoogdt at gmail.com (Thomas Devoogdt) Date: Sun, 6 Feb 2022 10:04:26 +0100 Subject: [Buildroot] [PATCH] package/bluez5_utils: fix build with libglib2 >= 2.69 Message-ID: <20220206090426.15583-1-thomas.devoogdt@gmail.com> Fix the following build failure raised since bump of libglib2 to version 2.70 in commit 079923d: profiles/battery/battery.c:162:2: warning: 'g_memdup' is deprecated (declared at /home/buildroot/autobuild/instance-0/output-1/host/bin/../arm-buildroot-linux-gnueabi/sysroot/usr/include/glib-2.0/glib/gstrfuncs.h:257): Use 'g_memdup2' instead [-Wdeprecated-declarations] batt->initial_value = g_memdup(value, length); Fixes: - http://autobuild.buildroot.org/results/6b8/6b8870d12e0804d6154230a7322c49416c1dc0e2/build-end.log Sources: - https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=710220f861b100856711a0a4d4a852874228a57a - https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=9f09e69ecb077082301dafb745856e1f3731aaa7 - https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=cfab569484b18407fc117bb96634525cc76ea1f5 Signed-off-by: Thomas Devoogdt --- ...-tools-mesh-cfgtest-include-limits.h.patch | 6 +- ...til-Rename-btd_malloc-to-util_malloc.patch | 67 + .../0003-shared-util-Add-util_memdup.patch | 57 + ...ace-use-of-g_memdup-with-util_memdup.patch | 1411 +++++++++++++++++ 4 files changed, 1538 insertions(+), 3 deletions(-) create mode 100644 package/bluez5_utils/0002-shared-util-Rename-btd_malloc-to-util_malloc.patch create mode 100644 package/bluez5_utils/0003-shared-util-Add-util_memdup.patch create mode 100644 package/bluez5_utils/0004-build-Replace-use-of-g_memdup-with-util_memdup.patch diff --git a/package/bluez5_utils/0001-tools-mesh-cfgtest-include-limits.h.patch b/package/bluez5_utils/0001-tools-mesh-cfgtest-include-limits.h.patch index 7f1197357f..57f363a7fd 100644 --- a/package/bluez5_utils/0001-tools-mesh-cfgtest-include-limits.h.patch +++ b/package/bluez5_utils/0001-tools-mesh-cfgtest-include-limits.h.patch @@ -1,7 +1,7 @@ -From 5158827fded7cb4daf550a5956aff0c74f6c38fc Mon Sep 17 00:00:00 2001 +From 1cf621cae3844f31bdac85298f4ae736be5488f6 Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Thu, 22 Jul 2021 21:36:13 +0200 -Subject: [PATCH] tools/mesh-cfgtest: include limits.h +Subject: [PATCH 1/4] tools/mesh-cfgtest: include limits.h mesh-cfgtest.c uses PATH_MAX so it should include limits.h. @@ -29,5 +29,5 @@ index fa0474faa..116ab7f16 100644 #include #include -- -2.32.0 +2.17.1 diff --git a/package/bluez5_utils/0002-shared-util-Rename-btd_malloc-to-util_malloc.patch b/package/bluez5_utils/0002-shared-util-Rename-btd_malloc-to-util_malloc.patch new file mode 100644 index 0000000000..ac5d4a6c3f --- /dev/null +++ b/package/bluez5_utils/0002-shared-util-Rename-btd_malloc-to-util_malloc.patch @@ -0,0 +1,67 @@ +From f3263fed28bf510a1225661fe2b5f598300c11cd Mon Sep 17 00:00:00 2001 +From: Luiz Augusto von Dentz +Date: Wed, 5 Jan 2022 15:53:35 -0800 +Subject: [PATCH 2/4] shared/util: Rename btd_malloc to util_malloc + +util functions are not limited to daemon only which is normally the case +when using btd prefix. + +(cherry picked from commit 710220f861b100856711a0a4d4a852874228a57a) +Signed-off-by: Thomas Devoogdt +--- + profiles/audio/avdtp.c | 2 +- + src/shared/util.c | 2 +- + src/shared/util.h | 4 ++-- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/profiles/audio/avdtp.c b/profiles/audio/avdtp.c +index d3dfbf96d..f2b461330 100644 +--- a/profiles/audio/avdtp.c ++++ b/profiles/audio/avdtp.c +@@ -1333,7 +1333,7 @@ static GSList *caps_to_list(uint8_t *data, size_t size, + break; + } + +- cpy = btd_malloc(sizeof(*cpy) + cap->length); ++ cpy = util_malloc(sizeof(*cpy) + cap->length); + memcpy(cpy, cap, sizeof(*cap) + cap->length); + + size -= sizeof(*cap) + cap->length; +diff --git a/src/shared/util.c b/src/shared/util.c +index 81b20d86f..93110047b 100644 +--- a/src/shared/util.c ++++ b/src/shared/util.c +@@ -25,7 +25,7 @@ + + #include "src/shared/util.h" + +-void *btd_malloc(size_t size) ++void *util_malloc(size_t size) + { + if (__builtin_expect(!!size, 1)) { + void *ptr; +diff --git a/src/shared/util.h b/src/shared/util.h +index ac70117ca..11d09979d 100644 +--- a/src/shared/util.h ++++ b/src/shared/util.h +@@ -75,7 +75,7 @@ do { \ + size_t __n = (size_t) (count); \ + size_t __s = sizeof(type); \ + void *__p; \ +- __p = btd_malloc(__n * __s); \ ++ __p = util_malloc(__n * __s); \ + memset(__p, 0, __n * __s); \ + __p; \ + })) +@@ -86,7 +86,7 @@ do { \ + char *strdelimit(char *str, char *del, char c); + int strsuffix(const char *str, const char *suffix); + +-void *btd_malloc(size_t size); ++void *util_malloc(size_t size); + + typedef void (*util_debug_func_t)(const char *str, void *user_data); + +-- +2.17.1 + diff --git a/package/bluez5_utils/0003-shared-util-Add-util_memdup.patch b/package/bluez5_utils/0003-shared-util-Add-util_memdup.patch new file mode 100644 index 0000000000..ff39d19f3e --- /dev/null +++ b/package/bluez5_utils/0003-shared-util-Add-util_memdup.patch @@ -0,0 +1,57 @@ +From 28f1c140374d1ecda65e3d59cca72352c3a07774 Mon Sep 17 00:00:00 2001 +From: Luiz Augusto von Dentz +Date: Thu, 6 Jan 2022 11:45:12 -0800 +Subject: [PATCH 3/4] shared/util: Add util_memdup + +This adds util_memdup which is intended to replace g_memdup since +replacing that with g_memdup2 requires bumping the glib version. + +(cherry picked from commit 9f09e69ecb077082301dafb745856e1f3731aaa7) +Signed-off-by: Thomas Devoogdt +--- + src/shared/util.c | 16 ++++++++++++++++ + src/shared/util.h | 1 + + 2 files changed, 17 insertions(+) + +diff --git a/src/shared/util.c b/src/shared/util.c +index 93110047b..6e1c83057 100644 +--- a/src/shared/util.c ++++ b/src/shared/util.c +@@ -41,6 +41,22 @@ void *util_malloc(size_t size) + return NULL; + } + ++void *util_memdup(const void *src, size_t size) ++{ ++ void *cpy; ++ ++ if (!src || !size) ++ return NULL; ++ ++ cpy = util_malloc(size); ++ if (!cpy) ++ return NULL; ++ ++ memcpy(cpy, src, size); ++ ++ return cpy; ++} ++ + void util_debug_va(util_debug_func_t function, void *user_data, + const char *format, va_list va) + { +diff --git a/src/shared/util.h b/src/shared/util.h +index 11d09979d..8ef6132c4 100644 +--- a/src/shared/util.h ++++ b/src/shared/util.h +@@ -87,6 +87,7 @@ char *strdelimit(char *str, char *del, char c); + int strsuffix(const char *str, const char *suffix); + + void *util_malloc(size_t size); ++void *util_memdup(const void *src, size_t size); + + typedef void (*util_debug_func_t)(const char *str, void *user_data); + +-- +2.17.1 + diff --git a/package/bluez5_utils/0004-build-Replace-use-of-g_memdup-with-util_memdup.patch b/package/bluez5_utils/0004-build-Replace-use-of-g_memdup-with-util_memdup.patch new file mode 100644 index 0000000000..9c4c3e9e01 --- /dev/null +++ b/package/bluez5_utils/0004-build-Replace-use-of-g_memdup-with-util_memdup.patch @@ -0,0 +1,1411 @@ +From 7eb74180cf6fd6cebc61bb719d458cbf5d7f4ca7 Mon Sep 17 00:00:00 2001 +From: Luiz Augusto von Dentz +Date: Thu, 6 Jan 2022 12:50:33 -0800 +Subject: [PATCH 4/4] build: Replace use of g_memdup with util_memdup +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This replaces the uses of g_memdup with util_memdup since the former has +been deprecated: + + warning: ?g_memdup? is deprecated: Use 'g_memdup2' instead + [-Wdeprecated-declarations] + +g_memdup2 requires bumping glib version which would likely have its +own problems thus why util_memdup was introduced. + +(cherry picked from commit cfab569484b18407fc117bb96634525cc76ea1f5) +Signed-off-by: Thomas Devoogdt +--- + Makefile.am | 10 ++--- + Makefile.obexd | 1 + + Makefile.tools | 11 ++++-- + android/a2dp.c | 9 +++-- + android/avctp.c | 5 ++- + android/avrcp-lib.c | 2 +- + android/gatt.c | 5 ++- + android/hidhost.c | 3 +- + android/tester-main.c | 77 +++++++++++++++++++++----------------- + attrib/gatt.c | 12 +++--- + client/gatt.c | 2 +- + gobex/gobex-header.c | 7 ++-- + gobex/gobex-packet.c | 5 ++- + obexd/src/obex.c | 5 ++- + plugins/neard.c | 9 +++-- + plugins/policy.c | 7 ++-- + profiles/audio/avctp.c | 9 +++-- + profiles/audio/avrcp.c | 10 ++--- + profiles/battery/bas.c | 4 +- + profiles/battery/battery.c | 4 +- + profiles/deviceinfo/dis.c | 4 +- + profiles/input/hog-lib.c | 12 +++--- + profiles/scanparam/scpp.c | 4 +- + src/eir.c | 8 ++-- + tools/gatt-service.c | 15 ++++---- + tools/mesh-gatt/gatt.c | 5 ++- + unit/test-avctp.c | 4 +- + unit/test-avdtp.c | 6 +-- + unit/test-avrcp.c | 10 ++--- + unit/test-gatt.c | 4 +- + unit/test-hfp.c | 11 +++--- + unit/test-hog.c | 26 ++++++------- + unit/test-sdp.c | 10 +++-- + unit/test-uhid.c | 2 +- + 34 files changed, 172 insertions(+), 146 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 308f13c50..9b5e140b8 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -508,23 +508,23 @@ unit_tests += unit/test-gobex-header unit/test-gobex-packet unit/test-gobex \ + + unit_test_gobex_SOURCES = $(gobex_sources) unit/util.c unit/util.h \ + unit/test-gobex.c +-unit_test_gobex_LDADD = $(GLIB_LIBS) ++unit_test_gobex_LDADD = src/libshared-glib.la $(GLIB_LIBS) + + unit_test_gobex_packet_SOURCES = $(gobex_sources) unit/util.c unit/util.h \ + unit/test-gobex-packet.c +-unit_test_gobex_packet_LDADD = $(GLIB_LIBS) ++unit_test_gobex_packet_LDADD = src/libshared-glib.la $(GLIB_LIBS) + + unit_test_gobex_header_SOURCES = $(gobex_sources) unit/util.c unit/util.h \ + unit/test-gobex-header.c +-unit_test_gobex_header_LDADD = $(GLIB_LIBS) ++unit_test_gobex_header_LDADD = src/libshared-glib.la $(GLIB_LIBS) + + unit_test_gobex_transfer_SOURCES = $(gobex_sources) unit/util.c unit/util.h \ + unit/test-gobex-transfer.c +-unit_test_gobex_transfer_LDADD = $(GLIB_LIBS) ++unit_test_gobex_transfer_LDADD = src/libshared-glib.la $(GLIB_LIBS) + + unit_test_gobex_apparam_SOURCES = $(gobex_sources) unit/util.c unit/util.h \ + unit/test-gobex-apparam.c +-unit_test_gobex_apparam_LDADD = $(GLIB_LIBS) ++unit_test_gobex_apparam_LDADD = src/libshared-glib.la $(GLIB_LIBS) + endif + + unit_tests += unit/test-lib +diff --git a/Makefile.obexd b/Makefile.obexd +index 37a133455..5d1a4ff65 100644 +--- a/Makefile.obexd ++++ b/Makefile.obexd +@@ -82,6 +82,7 @@ obexd_src_obexd_SOURCES = $(btio_sources) $(gobex_sources) \ + obexd/src/map_ap.h + obexd_src_obexd_LDADD = lib/libbluetooth-internal.la \ + gdbus/libgdbus-internal.la \ ++ src/libshared-glib.la \ + $(ICAL_LIBS) $(DBUS_LIBS) $(LIBEBOOK_LIBS) \ + $(LIBEDATASERVER_LIBS) $(GLIB_LIBS) -ldl + +diff --git a/Makefile.tools b/Makefile.tools +index c7bdff83f..35b0021ea 100644 +--- a/Makefile.tools ++++ b/Makefile.tools +@@ -302,7 +302,8 @@ tools_mpris_proxy_SOURCES = tools/mpris-proxy.c + tools_mpris_proxy_LDADD = gdbus/libgdbus-internal.la $(GLIB_LIBS) $(DBUS_LIBS) + + tools_gatt_service_SOURCES = tools/gatt-service.c +-tools_gatt_service_LDADD = $(GLIB_LIBS) $(DBUS_LIBS) gdbus/libgdbus-internal.la ++tools_gatt_service_LDADD = gdbus/libgdbus-internal.la \ ++ src/libshared-mainloop.la $(GLIB_LIBS) $(DBUS_LIBS) + + profiles_iap_iapd_SOURCES = profiles/iap/main.c + profiles_iap_iapd_LDADD = gdbus/libgdbus-internal.la $(GLIB_LIBS) $(DBUS_LIBS) +@@ -448,11 +449,12 @@ noinst_PROGRAMS += tools/btmgmt tools/obex-client-tool tools/obex-server-tool \ + tools_obex_client_tool_SOURCES = $(gobex_sources) $(btio_sources) \ + tools/obex-client-tool.c + tools_obex_client_tool_LDADD = lib/libbluetooth-internal.la \ +- $(GLIB_LIBS) -lreadline ++ src/libshared-glib.la $(GLIB_LIBS) -lreadline + + tools_obex_server_tool_SOURCES = $(gobex_sources) $(btio_sources) \ + tools/obex-server-tool.c +-tools_obex_server_tool_LDADD = lib/libbluetooth-internal.la $(GLIB_LIBS) ++tools_obex_server_tool_LDADD = lib/libbluetooth-internal.la \ ++ src/libshared-glib.la $(GLIB_LIBS) + + tools_bluetooth_player_SOURCES = tools/bluetooth-player.c + tools_bluetooth_player_LDADD = gdbus/libgdbus-internal.la \ +@@ -461,7 +463,8 @@ tools_bluetooth_player_LDADD = gdbus/libgdbus-internal.la \ + + tools_obexctl_SOURCES = tools/obexctl.c + tools_obexctl_LDADD = gdbus/libgdbus-internal.la src/libshared-glib.la \ +- $(GLIB_LIBS) $(DBUS_LIBS) -lreadline ++ src/libshared-glib.la $(GLIB_LIBS) $(DBUS_LIBS) \ ++ -lreadline + + tools_btmgmt_SOURCES = tools/btmgmt.c src/uuid-helper.c client/display.c + tools_btmgmt_LDADD = lib/libbluetooth-internal.la src/libshared-mainloop.la \ +diff --git a/android/a2dp.c b/android/a2dp.c +index 029107cf5..ee607a32d 100644 +--- a/android/a2dp.c ++++ b/android/a2dp.c +@@ -26,6 +26,7 @@ + #include "lib/sdp_lib.h" + #include "profiles/audio/a2dp-codecs.h" + #include "src/shared/queue.h" ++#include "src/shared/util.h" + #include "src/log.h" + #include "hal-msg.h" + #include "ipc-common.h" +@@ -428,7 +429,7 @@ static struct a2dp_preset *sbc_select_range(void *caps, uint8_t caps_len, + + p = g_new0(struct a2dp_preset, 1); + p->len = conf_len; +- p->data = g_memdup(conf, p->len); ++ p->data = util_memdup(conf, p->len); + + return p; + } +@@ -448,7 +449,7 @@ static struct a2dp_preset *aac_select_range(void *caps, uint8_t caps_len, + + p = g_new0(struct a2dp_preset, 1); + p->len = conf_len; +- p->data = g_memdup(conf, p->len); ++ p->data = util_memdup(conf, p->len); + + return p; + } +@@ -1036,7 +1037,7 @@ static gboolean sep_setconf_ind(struct avdtp *session, + + preset = g_new0(struct a2dp_preset, 1); + preset->len = cap->length - sizeof(*codec); +- preset->data = g_memdup(codec->data, preset->len); ++ preset->data = util_memdup(codec->data, preset->len); + + if (check_config(endpoint, preset) < 0) { + preset_free(preset); +@@ -1365,7 +1366,7 @@ static GSList *parse_presets(const struct audio_preset *p, uint8_t count, + + preset = g_new0(struct a2dp_preset, 1); + preset->len = p->len; +- preset->data = g_memdup(p->data, preset->len); ++ preset->data = util_memdup(p->data, preset->len); + l = g_slist_append(l, preset); + + len -= preset->len; +diff --git a/android/avctp.c b/android/avctp.c +index 14ebbc391..37b4cec4f 100644 +--- a/android/avctp.c ++++ b/android/avctp.c +@@ -31,6 +31,7 @@ + #include + + #include "lib/sdp.h" ++#include "src/shared/util.h" + #include "src/log.h" + #include "avctp.h" + +@@ -1177,7 +1178,7 @@ static int avctp_send_req(struct avctp *session, uint8_t code, uint8_t subunit, + + for (i = 0; i < iov_cnt; i++) { + pdu[i].iov_len = iov[i].iov_len; +- pdu[i].iov_base = g_memdup(iov[i].iov_base, iov[i].iov_len); ++ pdu[i].iov_base = util_memdup(iov[i].iov_base, iov[i].iov_len); + } + + req = g_new0(struct avctp_control_req, 1); +@@ -1218,7 +1219,7 @@ int avctp_send_browsing_req(struct avctp *session, + + for (i = 0; i < iov_cnt; i++) { + pdu[i].iov_len = iov[i].iov_len; +- pdu[i].iov_base = g_memdup(iov[i].iov_base, iov[i].iov_len); ++ pdu[i].iov_base = util_memdup(iov[i].iov_base, iov[i].iov_len); + } + + req = g_new0(struct avctp_browsing_req, 1); +diff --git a/android/avrcp-lib.c b/android/avrcp-lib.c +index 2007d09d2..b342692cb 100644 +--- a/android/avrcp-lib.c ++++ b/android/avrcp-lib.c +@@ -2620,7 +2620,7 @@ static char *parse_folder_list(uint8_t *params, uint16_t params_len, + return NULL; + } + +- folders[count] = g_memdup(¶ms[i], len); ++ folders[count] = util_memdup(¶ms[i], len); + i += len; + } + +diff --git a/android/gatt.c b/android/gatt.c +index a8a0c488b..e8ba5aabb 100644 +--- a/android/gatt.c ++++ b/android/gatt.c +@@ -1338,7 +1338,8 @@ static void discover_primary_cb(uint8_t status, GSList *services, + } + + bt_uuid_to_uuid128(&uuid, &u128); +- new_uuid = g_memdup(&u128.value.u128, sizeof(u128.value.u128)); ++ new_uuid = util_memdup(&u128.value.u128, ++ sizeof(u128.value.u128)); + + uuids = g_slist_prepend(uuids, new_uuid); + } +@@ -6633,7 +6634,7 @@ static uint8_t write_prep_request(const uint8_t *cmd, uint16_t cmd_len, + + queue_push_tail(dev->pending_requests, data); + +- data->value = g_memdup(value, vlen); ++ data->value = util_memdup(value, vlen); + data->length = vlen; + + if (!gatt_db_attribute_write(attrib, offset, value, vlen, cmd[0], +diff --git a/android/hidhost.c b/android/hidhost.c +index 016382e17..b4e5c527f 100644 +--- a/android/hidhost.c ++++ b/android/hidhost.c +@@ -689,7 +689,8 @@ static void hid_sdp_search_cb(sdp_list_t *recs, int err, gpointer data) + goto fail; + + dev->rd_size = data->unitSize; +- dev->rd_data = g_memdup(data->val.str, data->unitSize); ++ dev->rd_data = util_memdup(data->val.str, ++ data->unitSize); + } + } + +diff --git a/android/tester-main.c b/android/tester-main.c +index ff5ecdf83..317c1de06 100644 +--- a/android/tester-main.c ++++ b/android/tester-main.c +@@ -1253,7 +1253,8 @@ static bt_property_t *copy_properties(int num_properties, + for (i = 0; i < num_properties; i++) { + props[i].type = properties[i].type; + props[i].len = properties[i].len; +- props[i].val = g_memdup(properties[i].val, properties[i].len); ++ props[i].val = util_memdup(properties[i].val, ++ properties[i].len); + } + + return props; +@@ -1268,7 +1269,8 @@ static bt_property_t *repack_properties(int num_properties, + for (i = 0; i < num_properties; i++) { + props[i].type = properties[i]->type; + props[i].len = properties[i]->len; +- props[i].val = g_memdup(properties[i]->val, properties[i]->len); ++ props[i].val = util_memdup(properties[i]->val, ++ properties[i]->len); + } + + return props; +@@ -1281,7 +1283,7 @@ static bt_property_t *create_property(bt_property_type_t type, void *val, + + prop->type = type; + prop->len = len; +- prop->val = g_memdup(val, len); ++ prop->val = util_memdup(val, len); + + return prop; + } +@@ -1615,7 +1617,7 @@ static void gattc_search_result_cb(int conn_id, btgatt_srvc_id_t *srvc_id) + + step->callback = CB_GATTC_SEARCH_RESULT; + step->callback_result.conn_id = conn_id; +- step->callback_result.service = g_memdup(srvc_id, sizeof(*srvc_id)); ++ step->callback_result.service = util_memdup(srvc_id, sizeof(*srvc_id)); + + schedule_callback_verification(step); + } +@@ -1639,8 +1641,8 @@ static void gattc_get_characteristic_cb(int conn_id, int status, + step->callback = CB_GATTC_GET_CHARACTERISTIC; + step->callback_result.status = status; + step->callback_result.conn_id = conn_id; +- step->callback_result.service = g_memdup(srvc_id, sizeof(*srvc_id)); +- step->callback_result.characteristic = g_memdup(char_id, ++ step->callback_result.service = util_memdup(srvc_id, sizeof(*srvc_id)); ++ step->callback_result.characteristic = util_memdup(char_id, + sizeof(*char_id)); + step->callback_result.char_prop = char_prop; + +@@ -1656,10 +1658,10 @@ static void gattc_get_descriptor_cb(int conn_id, int status, + step->callback = CB_GATTC_GET_DESCRIPTOR; + step->callback_result.status = status; + step->callback_result.conn_id = conn_id; +- step->callback_result.service = g_memdup(srvc_id, sizeof(*srvc_id)); +- step->callback_result.characteristic = g_memdup(char_id, ++ step->callback_result.service = util_memdup(srvc_id, sizeof(*srvc_id)); ++ step->callback_result.characteristic = util_memdup(char_id, + sizeof(*char_id)); +- step->callback_result.descriptor = g_memdup(descr_id, ++ step->callback_result.descriptor = util_memdup(descr_id, + sizeof(*descr_id)); + + schedule_callback_verification(step); +@@ -1673,8 +1675,8 @@ static void gattc_get_included_service_cb(int conn_id, int status, + step->callback = CB_GATTC_GET_INCLUDED_SERVICE; + step->callback_result.status = status; + step->callback_result.conn_id = conn_id; +- step->callback_result.service = g_memdup(srvc_id, sizeof(*srvc_id)); +- step->callback_result.included = g_memdup(incl_srvc_id, ++ step->callback_result.service = util_memdup(srvc_id, sizeof(*srvc_id)); ++ step->callback_result.included = util_memdup(incl_srvc_id, + sizeof(*srvc_id)); + + schedule_callback_verification(step); +@@ -1688,7 +1690,8 @@ static void gattc_read_characteristic_cb(int conn_id, int status, + step->callback = CB_GATTC_READ_CHARACTERISTIC; + step->callback_result.status = status; + step->callback_result.conn_id = conn_id; +- step->callback_result.read_params = g_memdup(p_data, sizeof(*p_data)); ++ step->callback_result.read_params = util_memdup(p_data, ++ sizeof(*p_data)); + + schedule_callback_verification(step); + } +@@ -1701,7 +1704,8 @@ static void gattc_read_descriptor_cb(int conn_id, int status, + step->callback = CB_GATTC_READ_DESCRIPTOR; + step->callback_result.status = status; + step->callback_result.conn_id = conn_id; +- step->callback_result.read_params = g_memdup(p_data, sizeof(*p_data)); ++ step->callback_result.read_params = util_memdup(p_data, ++ sizeof(*p_data)); + + schedule_callback_verification(step); + } +@@ -1714,7 +1718,8 @@ static void gattc_write_characteristic_cb(int conn_id, int status, + step->callback = CB_GATTC_WRITE_CHARACTERISTIC; + step->callback_result.status = status; + step->callback_result.conn_id = conn_id; +- step->callback_result.write_params = g_memdup(p_data, sizeof(*p_data)); ++ step->callback_result.write_params = util_memdup(p_data, ++ sizeof(*p_data)); + + schedule_callback_verification(step); + } +@@ -1727,7 +1732,8 @@ static void gattc_write_descriptor_cb(int conn_id, int status, + step->callback = CB_GATTC_WRITE_DESCRIPTOR; + step->callback_result.status = status; + step->callback_result.conn_id = conn_id; +- step->callback_result.write_params = g_memdup(p_data, sizeof(*p_data)); ++ step->callback_result.write_params = util_memdup(p_data, ++ sizeof(*p_data)); + + schedule_callback_verification(step); + } +@@ -1742,8 +1748,8 @@ static void gattc_register_for_notification_cb(int conn_id, int registered, + step->callback = CB_GATTC_REGISTER_FOR_NOTIFICATION; + step->callback_result.status = status; + step->callback_result.conn_id = conn_id; +- step->callback_result.service = g_memdup(srvc_id, sizeof(*srvc_id)); +- step->callback_result.characteristic = g_memdup(char_id, ++ step->callback_result.service = util_memdup(srvc_id, sizeof(*srvc_id)); ++ step->callback_result.characteristic = util_memdup(char_id, + sizeof(*char_id)); + step->callback_result.notification_registered = registered; + +@@ -1756,7 +1762,8 @@ static void gattc_notif_cb(int conn_id, btgatt_notify_params_t *p_data) + + step->callback = CB_GATTC_NOTIFY; + step->callback_result.conn_id = conn_id; +- step->callback_result.notify_params = g_memdup(p_data, sizeof(*p_data)); ++ step->callback_result.notify_params = util_memdup(p_data, ++ sizeof(*p_data)); + + schedule_callback_verification(step); + } +@@ -1827,8 +1834,8 @@ static void gatts_service_added_cb(int status, int server_if, + + step->callback_result.status = status; + step->callback_result.gatt_app_id = server_if; +- step->callback_result.service = g_memdup(srvc_id, sizeof(*srvc_id)); +- step->callback_result.srvc_handle = g_memdup(&srvc_handle, ++ step->callback_result.service = util_memdup(srvc_id, sizeof(*srvc_id)); ++ step->callback_result.srvc_handle = util_memdup(&srvc_handle, + sizeof(srvc_handle)); + + schedule_callback_verification(step); +@@ -1844,9 +1851,9 @@ static void gatts_included_service_added_cb(int status, int server_if, + + step->callback_result.status = status; + step->callback_result.gatt_app_id = server_if; +- step->callback_result.srvc_handle = g_memdup(&srvc_handle, ++ step->callback_result.srvc_handle = util_memdup(&srvc_handle, + sizeof(srvc_handle)); +- step->callback_result.inc_srvc_handle = g_memdup(&inc_srvc_handle, ++ step->callback_result.inc_srvc_handle = util_memdup(&inc_srvc_handle, + sizeof(inc_srvc_handle)); + + schedule_callback_verification(step); +@@ -1863,10 +1870,10 @@ static void gatts_characteristic_added_cb(int status, int server_if, + + step->callback_result.status = status; + step->callback_result.gatt_app_id = server_if; +- step->callback_result.srvc_handle = g_memdup(&srvc_handle, ++ step->callback_result.srvc_handle = util_memdup(&srvc_handle, + sizeof(srvc_handle)); +- step->callback_result.uuid = g_memdup(uuid, sizeof(*uuid)); +- step->callback_result.char_handle = g_memdup(&char_handle, ++ step->callback_result.uuid = util_memdup(uuid, sizeof(*uuid)); ++ step->callback_result.char_handle = util_memdup(&char_handle, + sizeof(char_handle)); + + schedule_callback_verification(step); +@@ -1883,10 +1890,10 @@ static void gatts_descriptor_added_cb(int status, int server_if, + + step->callback_result.status = status; + step->callback_result.gatt_app_id = server_if; +- step->callback_result.srvc_handle = g_memdup(&srvc_handle, ++ step->callback_result.srvc_handle = util_memdup(&srvc_handle, + sizeof(srvc_handle)); +- step->callback_result.uuid = g_memdup(uuid, sizeof(*uuid)); +- step->callback_result.desc_handle = g_memdup(&desc_handle, ++ step->callback_result.uuid = util_memdup(uuid, sizeof(*uuid)); ++ step->callback_result.desc_handle = util_memdup(&desc_handle, + sizeof(desc_handle)); + + schedule_callback_verification(step); +@@ -1900,7 +1907,7 @@ static void gatts_service_started_cb(int status, int server_if, int srvc_handle) + + step->callback_result.status = status; + step->callback_result.gatt_app_id = server_if; +- step->callback_result.srvc_handle = g_memdup(&srvc_handle, ++ step->callback_result.srvc_handle = util_memdup(&srvc_handle, + sizeof(srvc_handle)); + + schedule_callback_verification(step); +@@ -1914,7 +1921,7 @@ static void gatts_service_stopped_cb(int status, int server_if, int srvc_handle) + + step->callback_result.status = status; + step->callback_result.gatt_app_id = server_if; +- step->callback_result.srvc_handle = g_memdup(&srvc_handle, ++ step->callback_result.srvc_handle = util_memdup(&srvc_handle, + sizeof(srvc_handle)); + + schedule_callback_verification(step); +@@ -1928,7 +1935,7 @@ static void gatts_service_deleted_cb(int status, int server_if, int srvc_handle) + + step->callback_result.status = status; + step->callback_result.gatt_app_id = server_if; +- step->callback_result.srvc_handle = g_memdup(&srvc_handle, ++ step->callback_result.srvc_handle = util_memdup(&srvc_handle, + sizeof(srvc_handle)); + + schedule_callback_verification(step); +@@ -1945,7 +1952,7 @@ static void gatts_request_read_cb(int conn_id, int trans_id, bt_bdaddr_t *bda, + + step->callback_result.conn_id = conn_id; + step->callback_result.trans_id = trans_id; +- step->callback_result.attr_handle = g_memdup(&attr_handle, ++ step->callback_result.attr_handle = util_memdup(&attr_handle, + sizeof(attr_handle)); + step->callback_result.offset = offset; + step->callback_result.is_long = is_long; +@@ -1974,13 +1981,13 @@ static void gatts_request_write_cb(int conn_id, int trans_id, bt_bdaddr_t *bda, + + step->callback_result.conn_id = conn_id; + step->callback_result.trans_id = trans_id; +- step->callback_result.attr_handle = g_memdup(&attr_handle, ++ step->callback_result.attr_handle = util_memdup(&attr_handle, + sizeof(attr_handle)); + step->callback_result.offset = offset; + step->callback_result.length = length; + step->callback_result.need_rsp = need_rsp; + step->callback_result.is_prep = is_prep; +- step->callback_result.value = g_memdup(&value, length); ++ step->callback_result.value = util_memdup(&value, length); + + /* Utilize property verification mechanism for bdaddr */ + props[0] = create_property(BT_PROPERTY_BDADDR, bda, sizeof(*bda)); +@@ -2169,7 +2176,7 @@ static btmce_mas_instance_t *copy_mas_instances(int num_instances, + inst[i].id = instances[i].id; + inst[i].scn = instances[i].scn; + inst[i].msg_types = instances[i].msg_types; +- inst[i].p_name = g_memdup(instances[i].p_name, ++ inst[i].p_name = util_memdup(instances[i].p_name, + strlen(instances[i].p_name)); + } + +diff --git a/attrib/gatt.c b/attrib/gatt.c +index 46b2ca381..b496dd1eb 100644 +--- a/attrib/gatt.c ++++ b/attrib/gatt.c +@@ -135,7 +135,7 @@ static void discover_char_unref(void *data) + + g_slist_free_full(dc->characteristics, g_free); + g_attrib_unref(dc->attrib); +- g_free(dc->uuid); ++ free(dc->uuid); + g_free(dc); + } + +@@ -157,7 +157,7 @@ static void discover_desc_unref(void *data) + + g_slist_free_full(dd->descriptors, g_free); + g_attrib_unref(dd->attrib); +- g_free(dd->uuid); ++ free(dd->uuid); + g_free(dd); + } + +@@ -696,7 +696,7 @@ guint gatt_discover_char(GAttrib *attrib, uint16_t start, uint16_t end, + dc->user_data = user_data; + dc->end = end; + dc->start = start; +- dc->uuid = g_memdup(uuid, sizeof(bt_uuid_t)); ++ dc->uuid = util_memdup(uuid, sizeof(bt_uuid_t)); + + dc->id = g_attrib_send(attrib, 0, buf, plen, char_discovered_cb, + discover_char_ref(dc), discover_char_unref); +@@ -905,7 +905,7 @@ static void prepare_write_cb(guint8 status, const guint8 *rpdu, guint16 rlen, + if (long_write->offset == long_write->vlen) { + execute_write(long_write->attrib, ATT_WRITE_ALL_PREP_WRITES, + long_write->func, long_write->user_data); +- g_free(long_write->value); ++ free(long_write->value); + g_free(long_write); + + return; +@@ -964,7 +964,7 @@ guint gatt_write_char(GAttrib *attrib, uint16_t handle, const uint8_t *value, + long_write->func = func; + long_write->user_data = user_data; + long_write->handle = handle; +- long_write->value = g_memdup(value, vlen); ++ long_write->value = util_memdup(value, vlen); + long_write->vlen = vlen; + + return prepare_write(long_write); +@@ -1130,7 +1130,7 @@ guint gatt_discover_desc(GAttrib *attrib, uint16_t start, uint16_t end, + dd->user_data = user_data; + dd->start = start; + dd->end = end; +- dd->uuid = g_memdup(uuid, sizeof(bt_uuid_t)); ++ dd->uuid = util_memdup(uuid, sizeof(bt_uuid_t)); + + dd->id = g_attrib_send(attrib, 0, buf, plen, desc_discovered_cb, + discover_desc_ref(dd), discover_desc_unref); +diff --git a/client/gatt.c b/client/gatt.c +index 11f70dc4f..13872c794 100644 +--- a/client/gatt.c ++++ b/client/gatt.c +@@ -811,7 +811,7 @@ static uint8_t *str2bytearray(char *arg, size_t *val_len) + + *val_len = i; + +- return g_memdup(value, i); ++ return util_memdup(value, i); + } + + void gatt_write_attribute(GDBusProxy *proxy, int argc, char *argv[]) +diff --git a/gobex/gobex-header.c b/gobex/gobex-header.c +index 011d33d1a..002ba8861 100644 +--- a/gobex/gobex-header.c ++++ b/gobex/gobex-header.c +@@ -15,6 +15,7 @@ + + #include "gobex-header.h" + #include "gobex-debug.h" ++#include "src/shared/util.h" + + /* Header types */ + #define G_OBEX_HDR_ENC_UNICODE (0 << 6) +@@ -222,7 +223,7 @@ GObexHeader *g_obex_header_decode(const void *data, gsize len, + + switch (data_policy) { + case G_OBEX_DATA_COPY: +- header->v.data = g_memdup(ptr, header->vlen); ++ header->v.data = util_memdup(ptr, header->vlen); + break; + case G_OBEX_DATA_REF: + header->extdata = TRUE; +@@ -282,7 +283,7 @@ void g_obex_header_free(GObexHeader *header) + break; + case G_OBEX_HDR_ENC_BYTES: + if (!header->extdata) +- g_free(header->v.data); ++ free(header->v.data); + break; + case G_OBEX_HDR_ENC_UINT8: + case G_OBEX_HDR_ENC_UINT32: +@@ -410,7 +411,7 @@ GObexHeader *g_obex_header_new_bytes(guint8 id, const void *data, gsize len) + header->id = id; + header->vlen = len; + header->hlen = len + 3; +- header->v.data = g_memdup(data, len); ++ header->v.data = util_memdup(data, len); + + return header; + } +diff --git a/gobex/gobex-packet.c b/gobex/gobex-packet.c +index 11937a5a5..8ae78b0f6 100644 +--- a/gobex/gobex-packet.c ++++ b/gobex/gobex-packet.c +@@ -17,6 +17,7 @@ + #include "gobex-defs.h" + #include "gobex-packet.h" + #include "gobex-debug.h" ++#include "src/shared/util.h" + + #define FINAL_BIT 0x80 + +@@ -201,7 +202,7 @@ gboolean g_obex_packet_set_data(GObexPacket *pkt, const void *data, gsize len, + + switch (data_policy) { + case G_OBEX_DATA_COPY: +- pkt->data.buf = g_memdup(data, len); ++ pkt->data.buf = util_memdup(data, len); + break; + case G_OBEX_DATA_REF: + pkt->data.buf_ref = data; +@@ -259,7 +260,7 @@ void g_obex_packet_free(GObexPacket *pkt) + switch (pkt->data_policy) { + case G_OBEX_DATA_INHERIT: + case G_OBEX_DATA_COPY: +- g_free(pkt->data.buf); ++ free(pkt->data.buf); + break; + case G_OBEX_DATA_REF: + break; +diff --git a/obexd/src/obex.c b/obexd/src/obex.c +index 9f992ec18..3a68fd66c 100644 +--- a/obexd/src/obex.c ++++ b/obexd/src/obex.c +@@ -40,6 +40,7 @@ + #include "mimetype.h" + #include "service.h" + #include "transport.h" ++#include "src/shared/util.h" + + typedef struct { + uint8_t version; +@@ -145,7 +146,7 @@ static void os_reset_session(struct obex_session *os) + os->path = NULL; + } + if (os->apparam) { +- g_free(os->apparam); ++ free(os->apparam); + os->apparam = NULL; + os->apparam_len = 0; + } +@@ -594,7 +595,7 @@ static void parse_apparam(struct obex_session *os, GObexPacket *req) + if (!g_obex_header_get_bytes(hdr, &apparam, &len)) + return; + +- os->apparam = g_memdup(apparam, len); ++ os->apparam = util_memdup(apparam, len); + os->apparam_len = len; + DBG("APPARAM"); + } +diff --git a/plugins/neard.c b/plugins/neard.c +index e07b51106..a75527148 100644 +--- a/plugins/neard.c ++++ b/plugins/neard.c +@@ -30,6 +30,7 @@ + #include "src/eir.h" + #include "src/agent.h" + #include "src/btd.h" ++#include "src/shared/util.h" + + #define NEARD_NAME "org.neard" + #define NEARD_PATH "/" +@@ -71,7 +72,7 @@ static void free_oob_params(struct oob_params *params) + g_free(params->name); + g_free(params->hash); + g_free(params->randomizer); +- g_free(params->pin); ++ free(params->pin); + } + + static DBusMessage *error_reply(DBusMessage *msg, int error) +@@ -407,10 +408,10 @@ static int process_nokia_long (void *data, size_t size, uint8_t marker, + remote->name = g_strndup((char *)n->name, n->name_len); + + if (marker == 0x01) { +- remote->pin = g_memdup(n->authentication, 4); ++ remote->pin = util_memdup(n->authentication, 4); + remote->pin_len = 4; + } else if (marker == 0x02) { +- remote->pin = g_memdup(n->authentication, 16); ++ remote->pin = util_memdup(n->authentication, 16); + remote->pin_len = 16; + } + +@@ -439,7 +440,7 @@ static int process_nokia_short (void *data, size_t size, + if (n->name_len > 0) + remote->name = g_strndup((char *)n->name, n->name_len); + +- remote->pin = g_memdup(n->authentication, 4); ++ remote->pin = util_memdup(n->authentication, 4); + remote->pin_len = 4; + + return 0; +diff --git a/plugins/policy.c b/plugins/policy.c +index 051db82e1..48f5db7d3 100644 +--- a/plugins/policy.c ++++ b/plugins/policy.c +@@ -32,6 +32,7 @@ + #include "src/profile.h" + #include "src/btd.h" + #include "src/shared/timeout.h" ++#include "src/shared/util.h" + + #define CONTROL_CONNECT_TIMEOUT 2 + #define SOURCE_RETRY_TIMEOUT 2 +@@ -855,7 +856,7 @@ static int policy_init(void) + reconnect_attempts = default_attempts; + reconnect_intervals_len = sizeof(default_intervals) / + sizeof(*reconnect_intervals); +- reconnect_intervals = g_memdup(default_intervals, ++ reconnect_intervals = util_memdup(default_intervals, + sizeof(default_intervals)); + goto done; + } +@@ -886,7 +887,7 @@ static int policy_init(void) + g_clear_error(&gerr); + reconnect_intervals_len = sizeof(default_intervals) / + sizeof(*reconnect_intervals); +- reconnect_intervals = g_memdup(default_intervals, ++ reconnect_intervals = util_memdup(default_intervals, + sizeof(default_intervals)); + } + +@@ -919,7 +920,7 @@ static void policy_exit(void) + if (reconnect_uuids) + g_strfreev(reconnect_uuids); + +- g_free(reconnect_intervals); ++ free(reconnect_intervals); + + g_slist_free_full(reconnects, reconnect_destroy); + +diff --git a/profiles/audio/avctp.c b/profiles/audio/avctp.c +index 64d1a8504..6f64f162b 100644 +--- a/profiles/audio/avctp.c ++++ b/profiles/audio/avctp.c +@@ -40,6 +40,7 @@ + #include "src/log.h" + #include "src/error.h" + #include "src/shared/timeout.h" ++#include "src/shared/util.h" + + #include "avctp.h" + #include "avrcp.h" +@@ -760,7 +761,7 @@ static void control_req_destroy(void *data) + NULL, 0, req->user_data); + + done: +- g_free(req->operands); ++ free(req->operands); + g_free(req); + } + +@@ -776,7 +777,7 @@ static void browsing_req_destroy(void *data) + req->func(session, NULL, 0, req->user_data); + + done: +- g_free(req->operands); ++ free(req->operands); + g_free(req); + } + +@@ -1727,7 +1728,7 @@ static int avctp_send_req(struct avctp *session, uint8_t code, + req->subunit = subunit; + req->op = opcode; + req->func = func; +- req->operands = g_memdup(operands, operand_count); ++ req->operands = util_memdup(operands, operand_count); + req->operand_count = operand_count; + req->user_data = user_data; + +@@ -1765,7 +1766,7 @@ int avctp_send_browsing_req(struct avctp *session, + + req = g_new0(struct avctp_browsing_req, 1); + req->func = func; +- req->operands = g_memdup(operands, operand_count); ++ req->operands = util_memdup(operands, operand_count); + req->operand_count = operand_count; + req->user_data = user_data; + +diff --git a/profiles/audio/avrcp.c b/profiles/audio/avrcp.c +index 7c280203c..d4e19ffc0 100644 +--- a/profiles/audio/avrcp.c ++++ b/profiles/audio/avrcp.c +@@ -1298,7 +1298,7 @@ static uint8_t avrcp_handle_get_current_player_value(struct avrcp *session, + * Save a copy of requested settings because we can override them + * while responding + */ +- settings = g_memdup(&pdu->params[1], pdu->params[0]); ++ settings = util_memdup(&pdu->params[1], pdu->params[0]); + len = 0; + + /* +@@ -1323,7 +1323,7 @@ static uint8_t avrcp_handle_get_current_player_value(struct avrcp *session, + pdu->params[++len] = val; + } + +- g_free(settings); ++ free(settings); + + if (len) { + pdu->params[0] = len / 2; +@@ -2801,7 +2801,7 @@ static gboolean avrcp_set_browsed_player_rsp(struct avctp *conn, + break; + } + +- folders[count] = g_memdup(&pdu->params[i], len); ++ folders[count] = util_memdup(&pdu->params[i], len); + i += len; + } + +@@ -2888,7 +2888,7 @@ static void avrcp_player_parse_features(struct avrcp_player *player, + { + struct media_player *mp = player->user_data; + +- player->features = g_memdup(features, 16); ++ player->features = util_memdup(features, 16); + + if (features[7] & 0x08) { + media_player_set_browsable(mp, true); +@@ -3622,7 +3622,7 @@ static void player_destroy(gpointer data) + g_slist_free(player->sessions); + g_free(player->path); + g_free(player->change_path); +- g_free(player->features); ++ free(player->features); + g_free(player); + } + +diff --git a/profiles/battery/bas.c b/profiles/battery/bas.c +index 3c6173b61..16ff22e19 100644 +--- a/profiles/battery/bas.c ++++ b/profiles/battery/bas.c +@@ -62,7 +62,7 @@ static void bas_free(struct bt_bas *bas) + { + bt_bas_detach(bas); + +- g_free(bas->primary); ++ free(bas->primary); + queue_destroy(bas->gatt_op, (void *) destroy_gatt_req); + free(bas); + } +@@ -75,7 +75,7 @@ struct bt_bas *bt_bas_new(void *primary) + bas->gatt_op = queue_new(); + + if (primary) +- bas->primary = g_memdup(primary, sizeof(*bas->primary)); ++ bas->primary = util_memdup(primary, sizeof(*bas->primary)); + + return bt_bas_ref(bas); + } +diff --git a/profiles/battery/battery.c b/profiles/battery/battery.c +index 176d127f6..02d024d92 100644 +--- a/profiles/battery/battery.c ++++ b/profiles/battery/battery.c +@@ -66,7 +66,7 @@ static void batt_free(struct batt *batt) + gatt_db_unref(batt->db); + bt_gatt_client_unref(batt->client); + btd_device_unref(batt->device); +- g_free (batt->initial_value); ++ free(batt->initial_value); + if (batt->battery) + btd_battery_unregister(batt->battery); + g_free(batt); +@@ -159,7 +159,7 @@ static void read_initial_battery_level_cb(bool success, + if (!length) + return; + +- batt->initial_value = g_memdup(value, length); ++ batt->initial_value = util_memdup(value, length); + + /* request notify */ + batt->batt_level_cb_id = +diff --git a/profiles/deviceinfo/dis.c b/profiles/deviceinfo/dis.c +index 87fa63306..f660179ed 100644 +--- a/profiles/deviceinfo/dis.c ++++ b/profiles/deviceinfo/dis.c +@@ -72,7 +72,7 @@ static void dis_free(struct bt_dis *dis) + { + bt_dis_detach(dis); + +- g_free(dis->primary); ++ free(dis->primary); + queue_destroy(dis->gatt_op, (void *) destroy_gatt_req); + g_free(dis); + } +@@ -143,7 +143,7 @@ struct bt_dis *bt_dis_new_primary(void *primary) + dis->gatt_op = queue_new(); + + if (primary) +- dis->primary = g_memdup(primary, sizeof(*dis->primary)); ++ dis->primary = util_memdup(primary, sizeof(*dis->primary)); + + return bt_dis_ref(dis); + } +diff --git a/profiles/input/hog-lib.c b/profiles/input/hog-lib.c +index 3bbe42370..d37caa1f1 100644 +--- a/profiles/input/hog-lib.c ++++ b/profiles/input/hog-lib.c +@@ -527,9 +527,9 @@ static void report_read_cb(guint8 status, const guint8 *pdu, guint16 len, + } + + if (report->value) +- g_free(report->value); ++ free(report->value); + +- report->value = g_memdup(pdu, len); ++ report->value = util_memdup(pdu, len); + report->len = len; + } + +@@ -1217,7 +1217,7 @@ static void report_free(void *data) + { + struct report *report = data; + +- g_free(report->value); ++ free(report->value); + g_free(report); + } + +@@ -1241,7 +1241,7 @@ static void hog_free(void *data) + bt_uhid_unref(hog->uhid); + g_slist_free_full(hog->reports, report_free); + g_free(hog->name); +- g_free(hog->primary); ++ free(hog->primary); + queue_destroy(hog->gatt_op, (void *) destroy_gatt_req); + if (hog->gatt_db) + gatt_db_unref(hog->gatt_db); +@@ -1609,7 +1609,7 @@ static void hog_attach_hog(struct bt_hog *hog, struct gatt_primary *primary) + struct bt_hog *instance; + + if (!hog->primary) { +- hog->primary = g_memdup(primary, sizeof(*primary)); ++ hog->primary = util_memdup(primary, sizeof(*primary)); + discover_char(hog, hog->attrib, primary->range.start, + primary->range.end, NULL, + char_discovered_cb, hog); +@@ -1623,7 +1623,7 @@ static void hog_attach_hog(struct bt_hog *hog, struct gatt_primary *primary) + if (!instance) + return; + +- instance->primary = g_memdup(primary, sizeof(*primary)); ++ instance->primary = util_memdup(primary, sizeof(*primary)); + find_included(instance, hog->attrib, primary->range.start, + primary->range.end, find_included_cb, instance); + +diff --git a/profiles/scanparam/scpp.c b/profiles/scanparam/scpp.c +index da38a6aaa..4be8b26cc 100644 +--- a/profiles/scanparam/scpp.c ++++ b/profiles/scanparam/scpp.c +@@ -91,7 +91,7 @@ static void scpp_free(struct bt_scpp *scan) + { + bt_scpp_detach(scan); + +- g_free(scan->primary); ++ free(scan->primary); + queue_destroy(scan->gatt_op, NULL); /* cleared in bt_scpp_detach */ + g_free(scan); + } +@@ -110,7 +110,7 @@ struct bt_scpp *bt_scpp_new(void *primary) + scan->gatt_op = queue_new(); + + if (primary) +- scan->primary = g_memdup(primary, sizeof(*scan->primary)); ++ scan->primary = util_memdup(primary, sizeof(*scan->primary)); + + return bt_scpp_ref(scan); + } +diff --git a/src/eir.c b/src/eir.c +index 0f5d14fcd..2f9ee036f 100644 +--- a/src/eir.c ++++ b/src/eir.c +@@ -53,9 +53,9 @@ void eir_data_free(struct eir_data *eir) + eir->services = NULL; + g_free(eir->name); + eir->name = NULL; +- g_free(eir->hash); ++ free(eir->hash); + eir->hash = NULL; +- g_free(eir->randomizer); ++ free(eir->randomizer); + eir->randomizer = NULL; + g_slist_free_full(eir->msd_list, g_free); + eir->msd_list = NULL; +@@ -323,13 +323,13 @@ void eir_parse(struct eir_data *eir, const uint8_t *eir_data, uint8_t eir_len) + case EIR_SSP_HASH: + if (data_len < 16) + break; +- eir->hash = g_memdup(data, 16); ++ eir->hash = util_memdup(data, 16); + break; + + case EIR_SSP_RANDOMIZER: + if (data_len < 16) + break; +- eir->randomizer = g_memdup(data, 16); ++ eir->randomizer = util_memdup(data, 16); + break; + + case EIR_DEVICE_ID: +diff --git a/tools/gatt-service.c b/tools/gatt-service.c +index 631c4f249..ed6b06f1e 100644 +--- a/tools/gatt-service.c ++++ b/tools/gatt-service.c +@@ -26,6 +26,7 @@ + #include "gdbus/gdbus.h" + + #include "src/error.h" ++#include "src/shared/util.h" + + #define GATT_MGR_IFACE "org.bluez.GattManager1" + #define GATT_SERVICE_IFACE "org.bluez.GattService1" +@@ -126,8 +127,8 @@ static gboolean desc_get_value(const GDBusPropertyTable *property, + + static void desc_write(struct descriptor *desc, const uint8_t *value, int len) + { +- g_free(desc->value); +- desc->value = g_memdup(value, len); ++ free(desc->value); ++ desc->value = util_memdup(value, len); + desc->vlen = len; + + g_dbus_emit_property_changed(connection, desc->path, +@@ -264,8 +265,8 @@ static gboolean chr_get_props(const GDBusPropertyTable *property, + + static void chr_write(struct characteristic *chr, const uint8_t *value, int len) + { +- g_free(chr->value); +- chr->value = g_memdup(value, len); ++ free(chr->value); ++ chr->value = util_memdup(value, len); + chr->vlen = len; + + g_dbus_emit_property_changed(connection, chr->path, GATT_CHR_IFACE, +@@ -388,7 +389,7 @@ static void chr_iface_destroy(gpointer user_data) + + g_free(chr->uuid); + g_free(chr->service); +- g_free(chr->value); ++ free(chr->value); + g_free(chr->path); + g_free(chr); + } +@@ -398,7 +399,7 @@ static void desc_iface_destroy(gpointer user_data) + struct descriptor *desc = user_data; + + g_free(desc->uuid); +- g_free(desc->value); ++ free(desc->value); + g_free(desc->path); + g_free(desc); + } +@@ -592,7 +593,7 @@ static gboolean register_characteristic(const char *chr_uuid, + + chr = g_new0(struct characteristic, 1); + chr->uuid = g_strdup(chr_uuid); +- chr->value = g_memdup(value, vlen); ++ chr->value = util_memdup(value, vlen); + chr->vlen = vlen; + chr->props = props; + chr->service = g_strdup(service_path); +diff --git a/tools/mesh-gatt/gatt.c b/tools/mesh-gatt/gatt.c +index c8a8123fb..ab9743cd1 100644 +--- a/tools/mesh-gatt/gatt.c ++++ b/tools/mesh-gatt/gatt.c +@@ -24,6 +24,7 @@ + + #include "src/shared/io.h" + #include "src/shared/shell.h" ++#include "src/shared/util.h" + #include "gdbus/gdbus.h" + #include "lib/bluetooth.h" + #include "lib/uuid.h" +@@ -86,7 +87,7 @@ static void write_data_free(void *user_data) + { + struct write_data *data = user_data; + +- g_free(data->gatt_data); ++ free(data->gatt_data); + free(data); + } + +@@ -338,7 +339,7 @@ bool mesh_gatt_write(GDBusProxy *proxy, uint8_t *buf, uint16_t len, + /* TODO: should keep in queue in case we need to cancel write? */ + + data->gatt_len = len; +- data->gatt_data = g_memdup(buf, len); ++ data->gatt_data = util_memdup(buf, len); + data->gatt_data[0] &= GATT_TYPE_MASK; + data->iov.iov_base = data->gatt_data; + data->iov.iov_len = len; +diff --git a/unit/test-avctp.c b/unit/test-avctp.c +index fa7db59c8..25fd3abc2 100644 +--- a/unit/test-avctp.c ++++ b/unit/test-avctp.c +@@ -53,7 +53,7 @@ struct context { + #define raw_pdu(args...) \ + { \ + .valid = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +@@ -64,7 +64,7 @@ struct context { + }; \ + static struct test_data data; \ + data.test_name = g_strdup(name); \ +- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ ++ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ + tester_add(name, &data, NULL, function, NULL); \ + } while (0) + +diff --git a/unit/test-avdtp.c b/unit/test-avdtp.c +index 4e8a68c6b..2e49def43 100644 +--- a/unit/test-avdtp.c ++++ b/unit/test-avdtp.c +@@ -48,7 +48,7 @@ struct test_data { + #define raw_pdu(args...) \ + { \ + .valid = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +@@ -56,7 +56,7 @@ struct test_data { + { \ + .valid = true, \ + .fragmented = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +@@ -67,7 +67,7 @@ struct test_data { + }; \ + static struct test_data data; \ + data.test_name = g_strdup(name); \ +- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ ++ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ + tester_add(name, &data, NULL, function, NULL); \ + } while (0) + +diff --git a/unit/test-avrcp.c b/unit/test-avrcp.c +index 34a70377d..b637a8a1b 100644 +--- a/unit/test-avrcp.c ++++ b/unit/test-avrcp.c +@@ -61,7 +61,7 @@ struct context { + #define raw_pdu(args...) \ + { \ + .valid = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +@@ -69,7 +69,7 @@ struct context { + { \ + .valid = true, \ + .browse = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +@@ -77,7 +77,7 @@ struct context { + { \ + .valid = true, \ + .fragmented = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +@@ -85,7 +85,7 @@ struct context { + { \ + .valid = true, \ + .continuing = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +@@ -96,7 +96,7 @@ struct context { + }; \ + static struct test_data data; \ + data.test_name = g_strdup(name); \ +- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ ++ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ + tester_add(name, &data, NULL, function, NULL); \ + } while (0) + +diff --git a/unit/test-gatt.c b/unit/test-gatt.c +index 6a47268e6..f92d860c4 100644 +--- a/unit/test-gatt.c ++++ b/unit/test-gatt.c +@@ -73,7 +73,7 @@ struct context { + #define raw_pdu(args...) \ + { \ + .valid = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +@@ -94,7 +94,7 @@ struct context { + data.uuid = bt_uuid; \ + data.step = test_step; \ + data.source_db = db; \ +- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ ++ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ + tester_add(name, &data, NULL, function, NULL); \ + } while (0) + +diff --git a/unit/test-hfp.c b/unit/test-hfp.c +index f504724d7..b4af99d53 100644 +--- a/unit/test-hfp.c ++++ b/unit/test-hfp.c +@@ -17,6 +17,7 @@ + #include + #include "src/shared/hfp.h" + #include "src/shared/tester.h" ++#include "src/shared/util.h" + + struct context { + guint watch_id; +@@ -50,7 +51,7 @@ struct test_data { + #define raw_pdu(args...) \ + { \ + .valid = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +@@ -62,7 +63,7 @@ struct test_data { + #define type_pdu(cmd_type, args...) \ + { \ + .valid = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + .type = cmd_type, \ + } +@@ -70,7 +71,7 @@ struct test_data { + #define frg_pdu(args...) \ + { \ + .valid = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + .fragmented = true, \ + } +@@ -82,7 +83,7 @@ struct test_data { + }; \ + static struct test_data data; \ + data.test_name = g_strdup(name); \ +- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ ++ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ + data.result_func = result_function; \ + tester_add(name, &data, NULL, function, NULL); \ + data.test_handler = test_handler; \ +@@ -96,7 +97,7 @@ struct test_data { + }; \ + static struct test_data data; \ + data.test_name = g_strdup(name); \ +- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ ++ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ + data.hf_result_func = result_func; \ + data.response_func = response_function; \ + tester_add(name, &data, NULL, function, NULL); \ +diff --git a/unit/test-hog.c b/unit/test-hog.c +index 116a5cb07..067497de4 100644 +--- a/unit/test-hog.c ++++ b/unit/test-hog.c +@@ -59,24 +59,24 @@ struct context { + #define raw_pdu(args...) \ + { \ + .valid = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +-#define false_pdu() \ +-{ \ +- .valid = false, \ ++#define false_pdu() \ ++{ \ ++ .valid = false, \ + } + +-#define define_test(name, function, args...) \ +- do { \ +- const struct test_pdu pdus[] = { \ +- args, { } \ +- }; \ +- static struct test_data data; \ +- data.test_name = g_strdup(name); \ +- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ +- tester_add(name, &data, NULL, function, NULL); \ ++#define define_test(name, function, args...) \ ++ do { \ ++ const struct test_pdu pdus[] = { \ ++ args, { } \ ++ }; \ ++ static struct test_data data; \ ++ data.test_name = g_strdup(name); \ ++ data.pdu_list = util_memdup(pdus, sizeof(pdus));\ ++ tester_add(name, &data, NULL, function, NULL); \ + } while (0) + + static gboolean context_quit(gpointer user_data) +diff --git a/unit/test-sdp.c b/unit/test-sdp.c +index 8f95fcb71..5c04a71eb 100644 +--- a/unit/test-sdp.c ++++ b/unit/test-sdp.c +@@ -47,14 +47,16 @@ struct test_data { + #define raw_pdu(args...) \ + { \ + .valid = true, \ +- .raw_data = g_memdup(raw_data(args), sizeof(raw_data(args))), \ ++ .raw_data = util_memdup(raw_data(args), \ ++ sizeof(raw_data(args))), \ + .raw_size = sizeof(raw_data(args)), \ + } + + #define raw_pdu_cont(cont, args...) \ + { \ + .valid = true, \ +- .raw_data = g_memdup(raw_data(args), sizeof(raw_data(args))), \ ++ .raw_data = util_memdup(raw_data(args), \ ++ sizeof(raw_data(args))), \ + .raw_size = sizeof(raw_data(args)), \ + .cont_len = cont, \ + } +@@ -66,7 +68,7 @@ struct test_data { + }; \ + static struct test_data data; \ + data.mtu = _mtu; \ +- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ ++ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ + tester_add(name, &data, NULL, test_sdp, NULL); \ + } while (0) + +@@ -92,7 +94,7 @@ struct test_data_de { + #define define_test_de_attr(name, input, exp) \ + do { \ + static struct test_data_de data; \ +- data.input_data = g_memdup(input, sizeof(input)); \ ++ data.input_data = util_memdup(input, sizeof(input)); \ + data.input_size = sizeof(input); \ + data.expected = exp; \ + tester_add("/sdp/DE/ATTR/" name, &data, NULL, \ +diff --git a/unit/test-uhid.c b/unit/test-uhid.c +index 001d39a3d..8a8eef855 100644 +--- a/unit/test-uhid.c ++++ b/unit/test-uhid.c +@@ -61,7 +61,7 @@ struct context { + }; \ + static struct test_data data; \ + data.test_name = g_strdup(name); \ +- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ ++ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ + tester_add(name, &data, NULL, function, NULL); \ + } while (0) + +-- +2.17.1 + -- 2.17.1 From giulio.benetti at benettiengineering.com Sun Feb 6 09:08:09 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 10:08:09 +0100 Subject: [Buildroot] [PATCH] toolchain: update gcc bug 99410 Message-ID: <20220206090809.1532589-1-giulio.benetti@benettiengineering.com> Gcc bug 99410 reappeared in gcc 10.x while building belle-sip, but it's fixed on gcc 11.x, so let's update bug conditions. Fixes: http://autobuild.buildroot.net/results/846597f3573d3b0d52e80627a9577d14b9348547/ Signed-off-by: Giulio Benetti --- toolchain/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/toolchain/Config.in b/toolchain/Config.in index ccdf62503d..aed8f393a3 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -185,11 +185,11 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_93847 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=99410 # Error: branch offset out of range on Nios II. This bug # no longer exists in gcc 8.x but reappeared on gcc 9.x and has been -# fixed on gcc 10.x. +# fixed on gcc 11.x. config BR2_TOOLCHAIN_HAS_GCC_BUG_99140 bool default y if !BR2_TOOLCHAIN_GCC_AT_LEAST_8 - default y if BR2_TOOLCHAIN_GCC_AT_LEAST_9 && !BR2_TOOLCHAIN_GCC_AT_LEAST_10 + default y if BR2_TOOLCHAIN_GCC_AT_LEAST_10 && !BR2_TOOLCHAIN_GCC_AT_LEAST_11 depends on BR2_nios2 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101737 -- 2.25.1 From paguilar at paguilar.org Sun Feb 6 09:20:48 2022 From: paguilar at paguilar.org (Pedro Aguilar) Date: Sun, 6 Feb 2022 10:20:48 +0100 Subject: [Buildroot] [PATCH v1] DEVELOPERS: Add packages guile and bdwgc to Pedro Aguilar Message-ID: <20220206092048.1901703-1-paguilar@paguilar.org> Signed-off-by: Pedro Aguilar --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index a1ec9a091e..97d264afef 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2199,6 +2199,8 @@ F: package/umtprd/ N: Pedro Aguilar F: package/libunistring/ +F: package/guile/ +F: package/bdwgc/ N: Peter Korsgaard F: board/arrow/avenger96/ -- 2.25.1 From thomas.devoogdt at gmail.com Sun Feb 6 09:23:57 2022 From: thomas.devoogdt at gmail.com (Thomas Devoogdt) Date: Sun, 6 Feb 2022 10:23:57 +0100 Subject: [Buildroot] [PATCH] package/bluez5_utils: fix build with libglib2 >= 2.69 Message-ID: <20220206092357.19286-1-thomas.devoogdt@gmail.com> Fix the following build failure raised since bump of libglib2 to version 2.70 in commit 079923d: profiles/battery/battery.c:162:2: warning: 'g_memdup' is deprecated (declared at /home/buildroot/autobuild/instance-0/output-1/host/bin/../arm-buildroot-linux-gnueabi/sysroot/usr/include/glib-2.0/glib/gstrfuncs.h:257): Use 'g_memdup2' instead [-Wdeprecated-declarations] batt->initial_value = g_memdup(value, length); Fixes: - http://autobuild.buildroot.org/results/6b8/6b8870d12e0804d6154230a7322c49416c1dc0e2/build-end.log Sources: - https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=710220f861b100856711a0a4d4a852874228a57a - https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=9f09e69ecb077082301dafb745856e1f3731aaa7 - https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=cfab569484b18407fc117bb96634525cc76ea1f5 Signed-off-by: Thomas Devoogdt --- [update] removed patch numbers & remve change to 0001-tools-mesh-cfgtest-include-limits.h ...til-Rename-btd_malloc-to-util_malloc.patch | 67 + .../0003-shared-util-Add-util_memdup.patch | 57 + ...ace-use-of-g_memdup-with-util_memdup.patch | 1411 +++++++++++++++++ 3 files changed, 1535 insertions(+) create mode 100644 package/bluez5_utils/0002-shared-util-Rename-btd_malloc-to-util_malloc.patch create mode 100644 package/bluez5_utils/0003-shared-util-Add-util_memdup.patch create mode 100644 package/bluez5_utils/0004-build-Replace-use-of-g_memdup-with-util_memdup.patch diff --git a/package/bluez5_utils/0002-shared-util-Rename-btd_malloc-to-util_malloc.patch b/package/bluez5_utils/0002-shared-util-Rename-btd_malloc-to-util_malloc.patch new file mode 100644 index 0000000000..f8d74528d8 --- /dev/null +++ b/package/bluez5_utils/0002-shared-util-Rename-btd_malloc-to-util_malloc.patch @@ -0,0 +1,67 @@ +From f3263fed28bf510a1225661fe2b5f598300c11cd Mon Sep 17 00:00:00 2001 +From: Luiz Augusto von Dentz +Date: Wed, 5 Jan 2022 15:53:35 -0800 +Subject: [PATCH] shared/util: Rename btd_malloc to util_malloc + +util functions are not limited to daemon only which is normally the case +when using btd prefix. + +(cherry picked from commit 710220f861b100856711a0a4d4a852874228a57a) +Signed-off-by: Thomas Devoogdt +--- + profiles/audio/avdtp.c | 2 +- + src/shared/util.c | 2 +- + src/shared/util.h | 4 ++-- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/profiles/audio/avdtp.c b/profiles/audio/avdtp.c +index d3dfbf96d..f2b461330 100644 +--- a/profiles/audio/avdtp.c ++++ b/profiles/audio/avdtp.c +@@ -1333,7 +1333,7 @@ static GSList *caps_to_list(uint8_t *data, size_t size, + break; + } + +- cpy = btd_malloc(sizeof(*cpy) + cap->length); ++ cpy = util_malloc(sizeof(*cpy) + cap->length); + memcpy(cpy, cap, sizeof(*cap) + cap->length); + + size -= sizeof(*cap) + cap->length; +diff --git a/src/shared/util.c b/src/shared/util.c +index 81b20d86f..93110047b 100644 +--- a/src/shared/util.c ++++ b/src/shared/util.c +@@ -25,7 +25,7 @@ + + #include "src/shared/util.h" + +-void *btd_malloc(size_t size) ++void *util_malloc(size_t size) + { + if (__builtin_expect(!!size, 1)) { + void *ptr; +diff --git a/src/shared/util.h b/src/shared/util.h +index ac70117ca..11d09979d 100644 +--- a/src/shared/util.h ++++ b/src/shared/util.h +@@ -75,7 +75,7 @@ do { \ + size_t __n = (size_t) (count); \ + size_t __s = sizeof(type); \ + void *__p; \ +- __p = btd_malloc(__n * __s); \ ++ __p = util_malloc(__n * __s); \ + memset(__p, 0, __n * __s); \ + __p; \ + })) +@@ -86,7 +86,7 @@ do { \ + char *strdelimit(char *str, char *del, char c); + int strsuffix(const char *str, const char *suffix); + +-void *btd_malloc(size_t size); ++void *util_malloc(size_t size); + + typedef void (*util_debug_func_t)(const char *str, void *user_data); + +-- +2.17.1 + diff --git a/package/bluez5_utils/0003-shared-util-Add-util_memdup.patch b/package/bluez5_utils/0003-shared-util-Add-util_memdup.patch new file mode 100644 index 0000000000..d5c31a2614 --- /dev/null +++ b/package/bluez5_utils/0003-shared-util-Add-util_memdup.patch @@ -0,0 +1,57 @@ +From 28f1c140374d1ecda65e3d59cca72352c3a07774 Mon Sep 17 00:00:00 2001 +From: Luiz Augusto von Dentz +Date: Thu, 6 Jan 2022 11:45:12 -0800 +Subject: [PATCH] shared/util: Add util_memdup + +This adds util_memdup which is intended to replace g_memdup since +replacing that with g_memdup2 requires bumping the glib version. + +(cherry picked from commit 9f09e69ecb077082301dafb745856e1f3731aaa7) +Signed-off-by: Thomas Devoogdt +--- + src/shared/util.c | 16 ++++++++++++++++ + src/shared/util.h | 1 + + 2 files changed, 17 insertions(+) + +diff --git a/src/shared/util.c b/src/shared/util.c +index 93110047b..6e1c83057 100644 +--- a/src/shared/util.c ++++ b/src/shared/util.c +@@ -41,6 +41,22 @@ void *util_malloc(size_t size) + return NULL; + } + ++void *util_memdup(const void *src, size_t size) ++{ ++ void *cpy; ++ ++ if (!src || !size) ++ return NULL; ++ ++ cpy = util_malloc(size); ++ if (!cpy) ++ return NULL; ++ ++ memcpy(cpy, src, size); ++ ++ return cpy; ++} ++ + void util_debug_va(util_debug_func_t function, void *user_data, + const char *format, va_list va) + { +diff --git a/src/shared/util.h b/src/shared/util.h +index 11d09979d..8ef6132c4 100644 +--- a/src/shared/util.h ++++ b/src/shared/util.h +@@ -87,6 +87,7 @@ char *strdelimit(char *str, char *del, char c); + int strsuffix(const char *str, const char *suffix); + + void *util_malloc(size_t size); ++void *util_memdup(const void *src, size_t size); + + typedef void (*util_debug_func_t)(const char *str, void *user_data); + +-- +2.17.1 + diff --git a/package/bluez5_utils/0004-build-Replace-use-of-g_memdup-with-util_memdup.patch b/package/bluez5_utils/0004-build-Replace-use-of-g_memdup-with-util_memdup.patch new file mode 100644 index 0000000000..9e1047c957 --- /dev/null +++ b/package/bluez5_utils/0004-build-Replace-use-of-g_memdup-with-util_memdup.patch @@ -0,0 +1,1411 @@ +From 7eb74180cf6fd6cebc61bb719d458cbf5d7f4ca7 Mon Sep 17 00:00:00 2001 +From: Luiz Augusto von Dentz +Date: Thu, 6 Jan 2022 12:50:33 -0800 +Subject: [PATCH] build: Replace use of g_memdup with util_memdup +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This replaces the uses of g_memdup with util_memdup since the former has +been deprecated: + + warning: ?g_memdup? is deprecated: Use 'g_memdup2' instead + [-Wdeprecated-declarations] + +g_memdup2 requires bumping glib version which would likely have its +own problems thus why util_memdup was introduced. + +(cherry picked from commit cfab569484b18407fc117bb96634525cc76ea1f5) +Signed-off-by: Thomas Devoogdt +--- + Makefile.am | 10 ++--- + Makefile.obexd | 1 + + Makefile.tools | 11 ++++-- + android/a2dp.c | 9 +++-- + android/avctp.c | 5 ++- + android/avrcp-lib.c | 2 +- + android/gatt.c | 5 ++- + android/hidhost.c | 3 +- + android/tester-main.c | 77 +++++++++++++++++++++----------------- + attrib/gatt.c | 12 +++--- + client/gatt.c | 2 +- + gobex/gobex-header.c | 7 ++-- + gobex/gobex-packet.c | 5 ++- + obexd/src/obex.c | 5 ++- + plugins/neard.c | 9 +++-- + plugins/policy.c | 7 ++-- + profiles/audio/avctp.c | 9 +++-- + profiles/audio/avrcp.c | 10 ++--- + profiles/battery/bas.c | 4 +- + profiles/battery/battery.c | 4 +- + profiles/deviceinfo/dis.c | 4 +- + profiles/input/hog-lib.c | 12 +++--- + profiles/scanparam/scpp.c | 4 +- + src/eir.c | 8 ++-- + tools/gatt-service.c | 15 ++++---- + tools/mesh-gatt/gatt.c | 5 ++- + unit/test-avctp.c | 4 +- + unit/test-avdtp.c | 6 +-- + unit/test-avrcp.c | 10 ++--- + unit/test-gatt.c | 4 +- + unit/test-hfp.c | 11 +++--- + unit/test-hog.c | 26 ++++++------- + unit/test-sdp.c | 10 +++-- + unit/test-uhid.c | 2 +- + 34 files changed, 172 insertions(+), 146 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 308f13c50..9b5e140b8 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -508,23 +508,23 @@ unit_tests += unit/test-gobex-header unit/test-gobex-packet unit/test-gobex \ + + unit_test_gobex_SOURCES = $(gobex_sources) unit/util.c unit/util.h \ + unit/test-gobex.c +-unit_test_gobex_LDADD = $(GLIB_LIBS) ++unit_test_gobex_LDADD = src/libshared-glib.la $(GLIB_LIBS) + + unit_test_gobex_packet_SOURCES = $(gobex_sources) unit/util.c unit/util.h \ + unit/test-gobex-packet.c +-unit_test_gobex_packet_LDADD = $(GLIB_LIBS) ++unit_test_gobex_packet_LDADD = src/libshared-glib.la $(GLIB_LIBS) + + unit_test_gobex_header_SOURCES = $(gobex_sources) unit/util.c unit/util.h \ + unit/test-gobex-header.c +-unit_test_gobex_header_LDADD = $(GLIB_LIBS) ++unit_test_gobex_header_LDADD = src/libshared-glib.la $(GLIB_LIBS) + + unit_test_gobex_transfer_SOURCES = $(gobex_sources) unit/util.c unit/util.h \ + unit/test-gobex-transfer.c +-unit_test_gobex_transfer_LDADD = $(GLIB_LIBS) ++unit_test_gobex_transfer_LDADD = src/libshared-glib.la $(GLIB_LIBS) + + unit_test_gobex_apparam_SOURCES = $(gobex_sources) unit/util.c unit/util.h \ + unit/test-gobex-apparam.c +-unit_test_gobex_apparam_LDADD = $(GLIB_LIBS) ++unit_test_gobex_apparam_LDADD = src/libshared-glib.la $(GLIB_LIBS) + endif + + unit_tests += unit/test-lib +diff --git a/Makefile.obexd b/Makefile.obexd +index 37a133455..5d1a4ff65 100644 +--- a/Makefile.obexd ++++ b/Makefile.obexd +@@ -82,6 +82,7 @@ obexd_src_obexd_SOURCES = $(btio_sources) $(gobex_sources) \ + obexd/src/map_ap.h + obexd_src_obexd_LDADD = lib/libbluetooth-internal.la \ + gdbus/libgdbus-internal.la \ ++ src/libshared-glib.la \ + $(ICAL_LIBS) $(DBUS_LIBS) $(LIBEBOOK_LIBS) \ + $(LIBEDATASERVER_LIBS) $(GLIB_LIBS) -ldl + +diff --git a/Makefile.tools b/Makefile.tools +index c7bdff83f..35b0021ea 100644 +--- a/Makefile.tools ++++ b/Makefile.tools +@@ -302,7 +302,8 @@ tools_mpris_proxy_SOURCES = tools/mpris-proxy.c + tools_mpris_proxy_LDADD = gdbus/libgdbus-internal.la $(GLIB_LIBS) $(DBUS_LIBS) + + tools_gatt_service_SOURCES = tools/gatt-service.c +-tools_gatt_service_LDADD = $(GLIB_LIBS) $(DBUS_LIBS) gdbus/libgdbus-internal.la ++tools_gatt_service_LDADD = gdbus/libgdbus-internal.la \ ++ src/libshared-mainloop.la $(GLIB_LIBS) $(DBUS_LIBS) + + profiles_iap_iapd_SOURCES = profiles/iap/main.c + profiles_iap_iapd_LDADD = gdbus/libgdbus-internal.la $(GLIB_LIBS) $(DBUS_LIBS) +@@ -448,11 +449,12 @@ noinst_PROGRAMS += tools/btmgmt tools/obex-client-tool tools/obex-server-tool \ + tools_obex_client_tool_SOURCES = $(gobex_sources) $(btio_sources) \ + tools/obex-client-tool.c + tools_obex_client_tool_LDADD = lib/libbluetooth-internal.la \ +- $(GLIB_LIBS) -lreadline ++ src/libshared-glib.la $(GLIB_LIBS) -lreadline + + tools_obex_server_tool_SOURCES = $(gobex_sources) $(btio_sources) \ + tools/obex-server-tool.c +-tools_obex_server_tool_LDADD = lib/libbluetooth-internal.la $(GLIB_LIBS) ++tools_obex_server_tool_LDADD = lib/libbluetooth-internal.la \ ++ src/libshared-glib.la $(GLIB_LIBS) + + tools_bluetooth_player_SOURCES = tools/bluetooth-player.c + tools_bluetooth_player_LDADD = gdbus/libgdbus-internal.la \ +@@ -461,7 +463,8 @@ tools_bluetooth_player_LDADD = gdbus/libgdbus-internal.la \ + + tools_obexctl_SOURCES = tools/obexctl.c + tools_obexctl_LDADD = gdbus/libgdbus-internal.la src/libshared-glib.la \ +- $(GLIB_LIBS) $(DBUS_LIBS) -lreadline ++ src/libshared-glib.la $(GLIB_LIBS) $(DBUS_LIBS) \ ++ -lreadline + + tools_btmgmt_SOURCES = tools/btmgmt.c src/uuid-helper.c client/display.c + tools_btmgmt_LDADD = lib/libbluetooth-internal.la src/libshared-mainloop.la \ +diff --git a/android/a2dp.c b/android/a2dp.c +index 029107cf5..ee607a32d 100644 +--- a/android/a2dp.c ++++ b/android/a2dp.c +@@ -26,6 +26,7 @@ + #include "lib/sdp_lib.h" + #include "profiles/audio/a2dp-codecs.h" + #include "src/shared/queue.h" ++#include "src/shared/util.h" + #include "src/log.h" + #include "hal-msg.h" + #include "ipc-common.h" +@@ -428,7 +429,7 @@ static struct a2dp_preset *sbc_select_range(void *caps, uint8_t caps_len, + + p = g_new0(struct a2dp_preset, 1); + p->len = conf_len; +- p->data = g_memdup(conf, p->len); ++ p->data = util_memdup(conf, p->len); + + return p; + } +@@ -448,7 +449,7 @@ static struct a2dp_preset *aac_select_range(void *caps, uint8_t caps_len, + + p = g_new0(struct a2dp_preset, 1); + p->len = conf_len; +- p->data = g_memdup(conf, p->len); ++ p->data = util_memdup(conf, p->len); + + return p; + } +@@ -1036,7 +1037,7 @@ static gboolean sep_setconf_ind(struct avdtp *session, + + preset = g_new0(struct a2dp_preset, 1); + preset->len = cap->length - sizeof(*codec); +- preset->data = g_memdup(codec->data, preset->len); ++ preset->data = util_memdup(codec->data, preset->len); + + if (check_config(endpoint, preset) < 0) { + preset_free(preset); +@@ -1365,7 +1366,7 @@ static GSList *parse_presets(const struct audio_preset *p, uint8_t count, + + preset = g_new0(struct a2dp_preset, 1); + preset->len = p->len; +- preset->data = g_memdup(p->data, preset->len); ++ preset->data = util_memdup(p->data, preset->len); + l = g_slist_append(l, preset); + + len -= preset->len; +diff --git a/android/avctp.c b/android/avctp.c +index 14ebbc391..37b4cec4f 100644 +--- a/android/avctp.c ++++ b/android/avctp.c +@@ -31,6 +31,7 @@ + #include + + #include "lib/sdp.h" ++#include "src/shared/util.h" + #include "src/log.h" + #include "avctp.h" + +@@ -1177,7 +1178,7 @@ static int avctp_send_req(struct avctp *session, uint8_t code, uint8_t subunit, + + for (i = 0; i < iov_cnt; i++) { + pdu[i].iov_len = iov[i].iov_len; +- pdu[i].iov_base = g_memdup(iov[i].iov_base, iov[i].iov_len); ++ pdu[i].iov_base = util_memdup(iov[i].iov_base, iov[i].iov_len); + } + + req = g_new0(struct avctp_control_req, 1); +@@ -1218,7 +1219,7 @@ int avctp_send_browsing_req(struct avctp *session, + + for (i = 0; i < iov_cnt; i++) { + pdu[i].iov_len = iov[i].iov_len; +- pdu[i].iov_base = g_memdup(iov[i].iov_base, iov[i].iov_len); ++ pdu[i].iov_base = util_memdup(iov[i].iov_base, iov[i].iov_len); + } + + req = g_new0(struct avctp_browsing_req, 1); +diff --git a/android/avrcp-lib.c b/android/avrcp-lib.c +index 2007d09d2..b342692cb 100644 +--- a/android/avrcp-lib.c ++++ b/android/avrcp-lib.c +@@ -2620,7 +2620,7 @@ static char *parse_folder_list(uint8_t *params, uint16_t params_len, + return NULL; + } + +- folders[count] = g_memdup(¶ms[i], len); ++ folders[count] = util_memdup(¶ms[i], len); + i += len; + } + +diff --git a/android/gatt.c b/android/gatt.c +index a8a0c488b..e8ba5aabb 100644 +--- a/android/gatt.c ++++ b/android/gatt.c +@@ -1338,7 +1338,8 @@ static void discover_primary_cb(uint8_t status, GSList *services, + } + + bt_uuid_to_uuid128(&uuid, &u128); +- new_uuid = g_memdup(&u128.value.u128, sizeof(u128.value.u128)); ++ new_uuid = util_memdup(&u128.value.u128, ++ sizeof(u128.value.u128)); + + uuids = g_slist_prepend(uuids, new_uuid); + } +@@ -6633,7 +6634,7 @@ static uint8_t write_prep_request(const uint8_t *cmd, uint16_t cmd_len, + + queue_push_tail(dev->pending_requests, data); + +- data->value = g_memdup(value, vlen); ++ data->value = util_memdup(value, vlen); + data->length = vlen; + + if (!gatt_db_attribute_write(attrib, offset, value, vlen, cmd[0], +diff --git a/android/hidhost.c b/android/hidhost.c +index 016382e17..b4e5c527f 100644 +--- a/android/hidhost.c ++++ b/android/hidhost.c +@@ -689,7 +689,8 @@ static void hid_sdp_search_cb(sdp_list_t *recs, int err, gpointer data) + goto fail; + + dev->rd_size = data->unitSize; +- dev->rd_data = g_memdup(data->val.str, data->unitSize); ++ dev->rd_data = util_memdup(data->val.str, ++ data->unitSize); + } + } + +diff --git a/android/tester-main.c b/android/tester-main.c +index ff5ecdf83..317c1de06 100644 +--- a/android/tester-main.c ++++ b/android/tester-main.c +@@ -1253,7 +1253,8 @@ static bt_property_t *copy_properties(int num_properties, + for (i = 0; i < num_properties; i++) { + props[i].type = properties[i].type; + props[i].len = properties[i].len; +- props[i].val = g_memdup(properties[i].val, properties[i].len); ++ props[i].val = util_memdup(properties[i].val, ++ properties[i].len); + } + + return props; +@@ -1268,7 +1269,8 @@ static bt_property_t *repack_properties(int num_properties, + for (i = 0; i < num_properties; i++) { + props[i].type = properties[i]->type; + props[i].len = properties[i]->len; +- props[i].val = g_memdup(properties[i]->val, properties[i]->len); ++ props[i].val = util_memdup(properties[i]->val, ++ properties[i]->len); + } + + return props; +@@ -1281,7 +1283,7 @@ static bt_property_t *create_property(bt_property_type_t type, void *val, + + prop->type = type; + prop->len = len; +- prop->val = g_memdup(val, len); ++ prop->val = util_memdup(val, len); + + return prop; + } +@@ -1615,7 +1617,7 @@ static void gattc_search_result_cb(int conn_id, btgatt_srvc_id_t *srvc_id) + + step->callback = CB_GATTC_SEARCH_RESULT; + step->callback_result.conn_id = conn_id; +- step->callback_result.service = g_memdup(srvc_id, sizeof(*srvc_id)); ++ step->callback_result.service = util_memdup(srvc_id, sizeof(*srvc_id)); + + schedule_callback_verification(step); + } +@@ -1639,8 +1641,8 @@ static void gattc_get_characteristic_cb(int conn_id, int status, + step->callback = CB_GATTC_GET_CHARACTERISTIC; + step->callback_result.status = status; + step->callback_result.conn_id = conn_id; +- step->callback_result.service = g_memdup(srvc_id, sizeof(*srvc_id)); +- step->callback_result.characteristic = g_memdup(char_id, ++ step->callback_result.service = util_memdup(srvc_id, sizeof(*srvc_id)); ++ step->callback_result.characteristic = util_memdup(char_id, + sizeof(*char_id)); + step->callback_result.char_prop = char_prop; + +@@ -1656,10 +1658,10 @@ static void gattc_get_descriptor_cb(int conn_id, int status, + step->callback = CB_GATTC_GET_DESCRIPTOR; + step->callback_result.status = status; + step->callback_result.conn_id = conn_id; +- step->callback_result.service = g_memdup(srvc_id, sizeof(*srvc_id)); +- step->callback_result.characteristic = g_memdup(char_id, ++ step->callback_result.service = util_memdup(srvc_id, sizeof(*srvc_id)); ++ step->callback_result.characteristic = util_memdup(char_id, + sizeof(*char_id)); +- step->callback_result.descriptor = g_memdup(descr_id, ++ step->callback_result.descriptor = util_memdup(descr_id, + sizeof(*descr_id)); + + schedule_callback_verification(step); +@@ -1673,8 +1675,8 @@ static void gattc_get_included_service_cb(int conn_id, int status, + step->callback = CB_GATTC_GET_INCLUDED_SERVICE; + step->callback_result.status = status; + step->callback_result.conn_id = conn_id; +- step->callback_result.service = g_memdup(srvc_id, sizeof(*srvc_id)); +- step->callback_result.included = g_memdup(incl_srvc_id, ++ step->callback_result.service = util_memdup(srvc_id, sizeof(*srvc_id)); ++ step->callback_result.included = util_memdup(incl_srvc_id, + sizeof(*srvc_id)); + + schedule_callback_verification(step); +@@ -1688,7 +1690,8 @@ static void gattc_read_characteristic_cb(int conn_id, int status, + step->callback = CB_GATTC_READ_CHARACTERISTIC; + step->callback_result.status = status; + step->callback_result.conn_id = conn_id; +- step->callback_result.read_params = g_memdup(p_data, sizeof(*p_data)); ++ step->callback_result.read_params = util_memdup(p_data, ++ sizeof(*p_data)); + + schedule_callback_verification(step); + } +@@ -1701,7 +1704,8 @@ static void gattc_read_descriptor_cb(int conn_id, int status, + step->callback = CB_GATTC_READ_DESCRIPTOR; + step->callback_result.status = status; + step->callback_result.conn_id = conn_id; +- step->callback_result.read_params = g_memdup(p_data, sizeof(*p_data)); ++ step->callback_result.read_params = util_memdup(p_data, ++ sizeof(*p_data)); + + schedule_callback_verification(step); + } +@@ -1714,7 +1718,8 @@ static void gattc_write_characteristic_cb(int conn_id, int status, + step->callback = CB_GATTC_WRITE_CHARACTERISTIC; + step->callback_result.status = status; + step->callback_result.conn_id = conn_id; +- step->callback_result.write_params = g_memdup(p_data, sizeof(*p_data)); ++ step->callback_result.write_params = util_memdup(p_data, ++ sizeof(*p_data)); + + schedule_callback_verification(step); + } +@@ -1727,7 +1732,8 @@ static void gattc_write_descriptor_cb(int conn_id, int status, + step->callback = CB_GATTC_WRITE_DESCRIPTOR; + step->callback_result.status = status; + step->callback_result.conn_id = conn_id; +- step->callback_result.write_params = g_memdup(p_data, sizeof(*p_data)); ++ step->callback_result.write_params = util_memdup(p_data, ++ sizeof(*p_data)); + + schedule_callback_verification(step); + } +@@ -1742,8 +1748,8 @@ static void gattc_register_for_notification_cb(int conn_id, int registered, + step->callback = CB_GATTC_REGISTER_FOR_NOTIFICATION; + step->callback_result.status = status; + step->callback_result.conn_id = conn_id; +- step->callback_result.service = g_memdup(srvc_id, sizeof(*srvc_id)); +- step->callback_result.characteristic = g_memdup(char_id, ++ step->callback_result.service = util_memdup(srvc_id, sizeof(*srvc_id)); ++ step->callback_result.characteristic = util_memdup(char_id, + sizeof(*char_id)); + step->callback_result.notification_registered = registered; + +@@ -1756,7 +1762,8 @@ static void gattc_notif_cb(int conn_id, btgatt_notify_params_t *p_data) + + step->callback = CB_GATTC_NOTIFY; + step->callback_result.conn_id = conn_id; +- step->callback_result.notify_params = g_memdup(p_data, sizeof(*p_data)); ++ step->callback_result.notify_params = util_memdup(p_data, ++ sizeof(*p_data)); + + schedule_callback_verification(step); + } +@@ -1827,8 +1834,8 @@ static void gatts_service_added_cb(int status, int server_if, + + step->callback_result.status = status; + step->callback_result.gatt_app_id = server_if; +- step->callback_result.service = g_memdup(srvc_id, sizeof(*srvc_id)); +- step->callback_result.srvc_handle = g_memdup(&srvc_handle, ++ step->callback_result.service = util_memdup(srvc_id, sizeof(*srvc_id)); ++ step->callback_result.srvc_handle = util_memdup(&srvc_handle, + sizeof(srvc_handle)); + + schedule_callback_verification(step); +@@ -1844,9 +1851,9 @@ static void gatts_included_service_added_cb(int status, int server_if, + + step->callback_result.status = status; + step->callback_result.gatt_app_id = server_if; +- step->callback_result.srvc_handle = g_memdup(&srvc_handle, ++ step->callback_result.srvc_handle = util_memdup(&srvc_handle, + sizeof(srvc_handle)); +- step->callback_result.inc_srvc_handle = g_memdup(&inc_srvc_handle, ++ step->callback_result.inc_srvc_handle = util_memdup(&inc_srvc_handle, + sizeof(inc_srvc_handle)); + + schedule_callback_verification(step); +@@ -1863,10 +1870,10 @@ static void gatts_characteristic_added_cb(int status, int server_if, + + step->callback_result.status = status; + step->callback_result.gatt_app_id = server_if; +- step->callback_result.srvc_handle = g_memdup(&srvc_handle, ++ step->callback_result.srvc_handle = util_memdup(&srvc_handle, + sizeof(srvc_handle)); +- step->callback_result.uuid = g_memdup(uuid, sizeof(*uuid)); +- step->callback_result.char_handle = g_memdup(&char_handle, ++ step->callback_result.uuid = util_memdup(uuid, sizeof(*uuid)); ++ step->callback_result.char_handle = util_memdup(&char_handle, + sizeof(char_handle)); + + schedule_callback_verification(step); +@@ -1883,10 +1890,10 @@ static void gatts_descriptor_added_cb(int status, int server_if, + + step->callback_result.status = status; + step->callback_result.gatt_app_id = server_if; +- step->callback_result.srvc_handle = g_memdup(&srvc_handle, ++ step->callback_result.srvc_handle = util_memdup(&srvc_handle, + sizeof(srvc_handle)); +- step->callback_result.uuid = g_memdup(uuid, sizeof(*uuid)); +- step->callback_result.desc_handle = g_memdup(&desc_handle, ++ step->callback_result.uuid = util_memdup(uuid, sizeof(*uuid)); ++ step->callback_result.desc_handle = util_memdup(&desc_handle, + sizeof(desc_handle)); + + schedule_callback_verification(step); +@@ -1900,7 +1907,7 @@ static void gatts_service_started_cb(int status, int server_if, int srvc_handle) + + step->callback_result.status = status; + step->callback_result.gatt_app_id = server_if; +- step->callback_result.srvc_handle = g_memdup(&srvc_handle, ++ step->callback_result.srvc_handle = util_memdup(&srvc_handle, + sizeof(srvc_handle)); + + schedule_callback_verification(step); +@@ -1914,7 +1921,7 @@ static void gatts_service_stopped_cb(int status, int server_if, int srvc_handle) + + step->callback_result.status = status; + step->callback_result.gatt_app_id = server_if; +- step->callback_result.srvc_handle = g_memdup(&srvc_handle, ++ step->callback_result.srvc_handle = util_memdup(&srvc_handle, + sizeof(srvc_handle)); + + schedule_callback_verification(step); +@@ -1928,7 +1935,7 @@ static void gatts_service_deleted_cb(int status, int server_if, int srvc_handle) + + step->callback_result.status = status; + step->callback_result.gatt_app_id = server_if; +- step->callback_result.srvc_handle = g_memdup(&srvc_handle, ++ step->callback_result.srvc_handle = util_memdup(&srvc_handle, + sizeof(srvc_handle)); + + schedule_callback_verification(step); +@@ -1945,7 +1952,7 @@ static void gatts_request_read_cb(int conn_id, int trans_id, bt_bdaddr_t *bda, + + step->callback_result.conn_id = conn_id; + step->callback_result.trans_id = trans_id; +- step->callback_result.attr_handle = g_memdup(&attr_handle, ++ step->callback_result.attr_handle = util_memdup(&attr_handle, + sizeof(attr_handle)); + step->callback_result.offset = offset; + step->callback_result.is_long = is_long; +@@ -1974,13 +1981,13 @@ static void gatts_request_write_cb(int conn_id, int trans_id, bt_bdaddr_t *bda, + + step->callback_result.conn_id = conn_id; + step->callback_result.trans_id = trans_id; +- step->callback_result.attr_handle = g_memdup(&attr_handle, ++ step->callback_result.attr_handle = util_memdup(&attr_handle, + sizeof(attr_handle)); + step->callback_result.offset = offset; + step->callback_result.length = length; + step->callback_result.need_rsp = need_rsp; + step->callback_result.is_prep = is_prep; +- step->callback_result.value = g_memdup(&value, length); ++ step->callback_result.value = util_memdup(&value, length); + + /* Utilize property verification mechanism for bdaddr */ + props[0] = create_property(BT_PROPERTY_BDADDR, bda, sizeof(*bda)); +@@ -2169,7 +2176,7 @@ static btmce_mas_instance_t *copy_mas_instances(int num_instances, + inst[i].id = instances[i].id; + inst[i].scn = instances[i].scn; + inst[i].msg_types = instances[i].msg_types; +- inst[i].p_name = g_memdup(instances[i].p_name, ++ inst[i].p_name = util_memdup(instances[i].p_name, + strlen(instances[i].p_name)); + } + +diff --git a/attrib/gatt.c b/attrib/gatt.c +index 46b2ca381..b496dd1eb 100644 +--- a/attrib/gatt.c ++++ b/attrib/gatt.c +@@ -135,7 +135,7 @@ static void discover_char_unref(void *data) + + g_slist_free_full(dc->characteristics, g_free); + g_attrib_unref(dc->attrib); +- g_free(dc->uuid); ++ free(dc->uuid); + g_free(dc); + } + +@@ -157,7 +157,7 @@ static void discover_desc_unref(void *data) + + g_slist_free_full(dd->descriptors, g_free); + g_attrib_unref(dd->attrib); +- g_free(dd->uuid); ++ free(dd->uuid); + g_free(dd); + } + +@@ -696,7 +696,7 @@ guint gatt_discover_char(GAttrib *attrib, uint16_t start, uint16_t end, + dc->user_data = user_data; + dc->end = end; + dc->start = start; +- dc->uuid = g_memdup(uuid, sizeof(bt_uuid_t)); ++ dc->uuid = util_memdup(uuid, sizeof(bt_uuid_t)); + + dc->id = g_attrib_send(attrib, 0, buf, plen, char_discovered_cb, + discover_char_ref(dc), discover_char_unref); +@@ -905,7 +905,7 @@ static void prepare_write_cb(guint8 status, const guint8 *rpdu, guint16 rlen, + if (long_write->offset == long_write->vlen) { + execute_write(long_write->attrib, ATT_WRITE_ALL_PREP_WRITES, + long_write->func, long_write->user_data); +- g_free(long_write->value); ++ free(long_write->value); + g_free(long_write); + + return; +@@ -964,7 +964,7 @@ guint gatt_write_char(GAttrib *attrib, uint16_t handle, const uint8_t *value, + long_write->func = func; + long_write->user_data = user_data; + long_write->handle = handle; +- long_write->value = g_memdup(value, vlen); ++ long_write->value = util_memdup(value, vlen); + long_write->vlen = vlen; + + return prepare_write(long_write); +@@ -1130,7 +1130,7 @@ guint gatt_discover_desc(GAttrib *attrib, uint16_t start, uint16_t end, + dd->user_data = user_data; + dd->start = start; + dd->end = end; +- dd->uuid = g_memdup(uuid, sizeof(bt_uuid_t)); ++ dd->uuid = util_memdup(uuid, sizeof(bt_uuid_t)); + + dd->id = g_attrib_send(attrib, 0, buf, plen, desc_discovered_cb, + discover_desc_ref(dd), discover_desc_unref); +diff --git a/client/gatt.c b/client/gatt.c +index 11f70dc4f..13872c794 100644 +--- a/client/gatt.c ++++ b/client/gatt.c +@@ -811,7 +811,7 @@ static uint8_t *str2bytearray(char *arg, size_t *val_len) + + *val_len = i; + +- return g_memdup(value, i); ++ return util_memdup(value, i); + } + + void gatt_write_attribute(GDBusProxy *proxy, int argc, char *argv[]) +diff --git a/gobex/gobex-header.c b/gobex/gobex-header.c +index 011d33d1a..002ba8861 100644 +--- a/gobex/gobex-header.c ++++ b/gobex/gobex-header.c +@@ -15,6 +15,7 @@ + + #include "gobex-header.h" + #include "gobex-debug.h" ++#include "src/shared/util.h" + + /* Header types */ + #define G_OBEX_HDR_ENC_UNICODE (0 << 6) +@@ -222,7 +223,7 @@ GObexHeader *g_obex_header_decode(const void *data, gsize len, + + switch (data_policy) { + case G_OBEX_DATA_COPY: +- header->v.data = g_memdup(ptr, header->vlen); ++ header->v.data = util_memdup(ptr, header->vlen); + break; + case G_OBEX_DATA_REF: + header->extdata = TRUE; +@@ -282,7 +283,7 @@ void g_obex_header_free(GObexHeader *header) + break; + case G_OBEX_HDR_ENC_BYTES: + if (!header->extdata) +- g_free(header->v.data); ++ free(header->v.data); + break; + case G_OBEX_HDR_ENC_UINT8: + case G_OBEX_HDR_ENC_UINT32: +@@ -410,7 +411,7 @@ GObexHeader *g_obex_header_new_bytes(guint8 id, const void *data, gsize len) + header->id = id; + header->vlen = len; + header->hlen = len + 3; +- header->v.data = g_memdup(data, len); ++ header->v.data = util_memdup(data, len); + + return header; + } +diff --git a/gobex/gobex-packet.c b/gobex/gobex-packet.c +index 11937a5a5..8ae78b0f6 100644 +--- a/gobex/gobex-packet.c ++++ b/gobex/gobex-packet.c +@@ -17,6 +17,7 @@ + #include "gobex-defs.h" + #include "gobex-packet.h" + #include "gobex-debug.h" ++#include "src/shared/util.h" + + #define FINAL_BIT 0x80 + +@@ -201,7 +202,7 @@ gboolean g_obex_packet_set_data(GObexPacket *pkt, const void *data, gsize len, + + switch (data_policy) { + case G_OBEX_DATA_COPY: +- pkt->data.buf = g_memdup(data, len); ++ pkt->data.buf = util_memdup(data, len); + break; + case G_OBEX_DATA_REF: + pkt->data.buf_ref = data; +@@ -259,7 +260,7 @@ void g_obex_packet_free(GObexPacket *pkt) + switch (pkt->data_policy) { + case G_OBEX_DATA_INHERIT: + case G_OBEX_DATA_COPY: +- g_free(pkt->data.buf); ++ free(pkt->data.buf); + break; + case G_OBEX_DATA_REF: + break; +diff --git a/obexd/src/obex.c b/obexd/src/obex.c +index 9f992ec18..3a68fd66c 100644 +--- a/obexd/src/obex.c ++++ b/obexd/src/obex.c +@@ -40,6 +40,7 @@ + #include "mimetype.h" + #include "service.h" + #include "transport.h" ++#include "src/shared/util.h" + + typedef struct { + uint8_t version; +@@ -145,7 +146,7 @@ static void os_reset_session(struct obex_session *os) + os->path = NULL; + } + if (os->apparam) { +- g_free(os->apparam); ++ free(os->apparam); + os->apparam = NULL; + os->apparam_len = 0; + } +@@ -594,7 +595,7 @@ static void parse_apparam(struct obex_session *os, GObexPacket *req) + if (!g_obex_header_get_bytes(hdr, &apparam, &len)) + return; + +- os->apparam = g_memdup(apparam, len); ++ os->apparam = util_memdup(apparam, len); + os->apparam_len = len; + DBG("APPARAM"); + } +diff --git a/plugins/neard.c b/plugins/neard.c +index e07b51106..a75527148 100644 +--- a/plugins/neard.c ++++ b/plugins/neard.c +@@ -30,6 +30,7 @@ + #include "src/eir.h" + #include "src/agent.h" + #include "src/btd.h" ++#include "src/shared/util.h" + + #define NEARD_NAME "org.neard" + #define NEARD_PATH "/" +@@ -71,7 +72,7 @@ static void free_oob_params(struct oob_params *params) + g_free(params->name); + g_free(params->hash); + g_free(params->randomizer); +- g_free(params->pin); ++ free(params->pin); + } + + static DBusMessage *error_reply(DBusMessage *msg, int error) +@@ -407,10 +408,10 @@ static int process_nokia_long (void *data, size_t size, uint8_t marker, + remote->name = g_strndup((char *)n->name, n->name_len); + + if (marker == 0x01) { +- remote->pin = g_memdup(n->authentication, 4); ++ remote->pin = util_memdup(n->authentication, 4); + remote->pin_len = 4; + } else if (marker == 0x02) { +- remote->pin = g_memdup(n->authentication, 16); ++ remote->pin = util_memdup(n->authentication, 16); + remote->pin_len = 16; + } + +@@ -439,7 +440,7 @@ static int process_nokia_short (void *data, size_t size, + if (n->name_len > 0) + remote->name = g_strndup((char *)n->name, n->name_len); + +- remote->pin = g_memdup(n->authentication, 4); ++ remote->pin = util_memdup(n->authentication, 4); + remote->pin_len = 4; + + return 0; +diff --git a/plugins/policy.c b/plugins/policy.c +index 051db82e1..48f5db7d3 100644 +--- a/plugins/policy.c ++++ b/plugins/policy.c +@@ -32,6 +32,7 @@ + #include "src/profile.h" + #include "src/btd.h" + #include "src/shared/timeout.h" ++#include "src/shared/util.h" + + #define CONTROL_CONNECT_TIMEOUT 2 + #define SOURCE_RETRY_TIMEOUT 2 +@@ -855,7 +856,7 @@ static int policy_init(void) + reconnect_attempts = default_attempts; + reconnect_intervals_len = sizeof(default_intervals) / + sizeof(*reconnect_intervals); +- reconnect_intervals = g_memdup(default_intervals, ++ reconnect_intervals = util_memdup(default_intervals, + sizeof(default_intervals)); + goto done; + } +@@ -886,7 +887,7 @@ static int policy_init(void) + g_clear_error(&gerr); + reconnect_intervals_len = sizeof(default_intervals) / + sizeof(*reconnect_intervals); +- reconnect_intervals = g_memdup(default_intervals, ++ reconnect_intervals = util_memdup(default_intervals, + sizeof(default_intervals)); + } + +@@ -919,7 +920,7 @@ static void policy_exit(void) + if (reconnect_uuids) + g_strfreev(reconnect_uuids); + +- g_free(reconnect_intervals); ++ free(reconnect_intervals); + + g_slist_free_full(reconnects, reconnect_destroy); + +diff --git a/profiles/audio/avctp.c b/profiles/audio/avctp.c +index 64d1a8504..6f64f162b 100644 +--- a/profiles/audio/avctp.c ++++ b/profiles/audio/avctp.c +@@ -40,6 +40,7 @@ + #include "src/log.h" + #include "src/error.h" + #include "src/shared/timeout.h" ++#include "src/shared/util.h" + + #include "avctp.h" + #include "avrcp.h" +@@ -760,7 +761,7 @@ static void control_req_destroy(void *data) + NULL, 0, req->user_data); + + done: +- g_free(req->operands); ++ free(req->operands); + g_free(req); + } + +@@ -776,7 +777,7 @@ static void browsing_req_destroy(void *data) + req->func(session, NULL, 0, req->user_data); + + done: +- g_free(req->operands); ++ free(req->operands); + g_free(req); + } + +@@ -1727,7 +1728,7 @@ static int avctp_send_req(struct avctp *session, uint8_t code, + req->subunit = subunit; + req->op = opcode; + req->func = func; +- req->operands = g_memdup(operands, operand_count); ++ req->operands = util_memdup(operands, operand_count); + req->operand_count = operand_count; + req->user_data = user_data; + +@@ -1765,7 +1766,7 @@ int avctp_send_browsing_req(struct avctp *session, + + req = g_new0(struct avctp_browsing_req, 1); + req->func = func; +- req->operands = g_memdup(operands, operand_count); ++ req->operands = util_memdup(operands, operand_count); + req->operand_count = operand_count; + req->user_data = user_data; + +diff --git a/profiles/audio/avrcp.c b/profiles/audio/avrcp.c +index 7c280203c..d4e19ffc0 100644 +--- a/profiles/audio/avrcp.c ++++ b/profiles/audio/avrcp.c +@@ -1298,7 +1298,7 @@ static uint8_t avrcp_handle_get_current_player_value(struct avrcp *session, + * Save a copy of requested settings because we can override them + * while responding + */ +- settings = g_memdup(&pdu->params[1], pdu->params[0]); ++ settings = util_memdup(&pdu->params[1], pdu->params[0]); + len = 0; + + /* +@@ -1323,7 +1323,7 @@ static uint8_t avrcp_handle_get_current_player_value(struct avrcp *session, + pdu->params[++len] = val; + } + +- g_free(settings); ++ free(settings); + + if (len) { + pdu->params[0] = len / 2; +@@ -2801,7 +2801,7 @@ static gboolean avrcp_set_browsed_player_rsp(struct avctp *conn, + break; + } + +- folders[count] = g_memdup(&pdu->params[i], len); ++ folders[count] = util_memdup(&pdu->params[i], len); + i += len; + } + +@@ -2888,7 +2888,7 @@ static void avrcp_player_parse_features(struct avrcp_player *player, + { + struct media_player *mp = player->user_data; + +- player->features = g_memdup(features, 16); ++ player->features = util_memdup(features, 16); + + if (features[7] & 0x08) { + media_player_set_browsable(mp, true); +@@ -3622,7 +3622,7 @@ static void player_destroy(gpointer data) + g_slist_free(player->sessions); + g_free(player->path); + g_free(player->change_path); +- g_free(player->features); ++ free(player->features); + g_free(player); + } + +diff --git a/profiles/battery/bas.c b/profiles/battery/bas.c +index 3c6173b61..16ff22e19 100644 +--- a/profiles/battery/bas.c ++++ b/profiles/battery/bas.c +@@ -62,7 +62,7 @@ static void bas_free(struct bt_bas *bas) + { + bt_bas_detach(bas); + +- g_free(bas->primary); ++ free(bas->primary); + queue_destroy(bas->gatt_op, (void *) destroy_gatt_req); + free(bas); + } +@@ -75,7 +75,7 @@ struct bt_bas *bt_bas_new(void *primary) + bas->gatt_op = queue_new(); + + if (primary) +- bas->primary = g_memdup(primary, sizeof(*bas->primary)); ++ bas->primary = util_memdup(primary, sizeof(*bas->primary)); + + return bt_bas_ref(bas); + } +diff --git a/profiles/battery/battery.c b/profiles/battery/battery.c +index 176d127f6..02d024d92 100644 +--- a/profiles/battery/battery.c ++++ b/profiles/battery/battery.c +@@ -66,7 +66,7 @@ static void batt_free(struct batt *batt) + gatt_db_unref(batt->db); + bt_gatt_client_unref(batt->client); + btd_device_unref(batt->device); +- g_free (batt->initial_value); ++ free(batt->initial_value); + if (batt->battery) + btd_battery_unregister(batt->battery); + g_free(batt); +@@ -159,7 +159,7 @@ static void read_initial_battery_level_cb(bool success, + if (!length) + return; + +- batt->initial_value = g_memdup(value, length); ++ batt->initial_value = util_memdup(value, length); + + /* request notify */ + batt->batt_level_cb_id = +diff --git a/profiles/deviceinfo/dis.c b/profiles/deviceinfo/dis.c +index 87fa63306..f660179ed 100644 +--- a/profiles/deviceinfo/dis.c ++++ b/profiles/deviceinfo/dis.c +@@ -72,7 +72,7 @@ static void dis_free(struct bt_dis *dis) + { + bt_dis_detach(dis); + +- g_free(dis->primary); ++ free(dis->primary); + queue_destroy(dis->gatt_op, (void *) destroy_gatt_req); + g_free(dis); + } +@@ -143,7 +143,7 @@ struct bt_dis *bt_dis_new_primary(void *primary) + dis->gatt_op = queue_new(); + + if (primary) +- dis->primary = g_memdup(primary, sizeof(*dis->primary)); ++ dis->primary = util_memdup(primary, sizeof(*dis->primary)); + + return bt_dis_ref(dis); + } +diff --git a/profiles/input/hog-lib.c b/profiles/input/hog-lib.c +index 3bbe42370..d37caa1f1 100644 +--- a/profiles/input/hog-lib.c ++++ b/profiles/input/hog-lib.c +@@ -527,9 +527,9 @@ static void report_read_cb(guint8 status, const guint8 *pdu, guint16 len, + } + + if (report->value) +- g_free(report->value); ++ free(report->value); + +- report->value = g_memdup(pdu, len); ++ report->value = util_memdup(pdu, len); + report->len = len; + } + +@@ -1217,7 +1217,7 @@ static void report_free(void *data) + { + struct report *report = data; + +- g_free(report->value); ++ free(report->value); + g_free(report); + } + +@@ -1241,7 +1241,7 @@ static void hog_free(void *data) + bt_uhid_unref(hog->uhid); + g_slist_free_full(hog->reports, report_free); + g_free(hog->name); +- g_free(hog->primary); ++ free(hog->primary); + queue_destroy(hog->gatt_op, (void *) destroy_gatt_req); + if (hog->gatt_db) + gatt_db_unref(hog->gatt_db); +@@ -1609,7 +1609,7 @@ static void hog_attach_hog(struct bt_hog *hog, struct gatt_primary *primary) + struct bt_hog *instance; + + if (!hog->primary) { +- hog->primary = g_memdup(primary, sizeof(*primary)); ++ hog->primary = util_memdup(primary, sizeof(*primary)); + discover_char(hog, hog->attrib, primary->range.start, + primary->range.end, NULL, + char_discovered_cb, hog); +@@ -1623,7 +1623,7 @@ static void hog_attach_hog(struct bt_hog *hog, struct gatt_primary *primary) + if (!instance) + return; + +- instance->primary = g_memdup(primary, sizeof(*primary)); ++ instance->primary = util_memdup(primary, sizeof(*primary)); + find_included(instance, hog->attrib, primary->range.start, + primary->range.end, find_included_cb, instance); + +diff --git a/profiles/scanparam/scpp.c b/profiles/scanparam/scpp.c +index da38a6aaa..4be8b26cc 100644 +--- a/profiles/scanparam/scpp.c ++++ b/profiles/scanparam/scpp.c +@@ -91,7 +91,7 @@ static void scpp_free(struct bt_scpp *scan) + { + bt_scpp_detach(scan); + +- g_free(scan->primary); ++ free(scan->primary); + queue_destroy(scan->gatt_op, NULL); /* cleared in bt_scpp_detach */ + g_free(scan); + } +@@ -110,7 +110,7 @@ struct bt_scpp *bt_scpp_new(void *primary) + scan->gatt_op = queue_new(); + + if (primary) +- scan->primary = g_memdup(primary, sizeof(*scan->primary)); ++ scan->primary = util_memdup(primary, sizeof(*scan->primary)); + + return bt_scpp_ref(scan); + } +diff --git a/src/eir.c b/src/eir.c +index 0f5d14fcd..2f9ee036f 100644 +--- a/src/eir.c ++++ b/src/eir.c +@@ -53,9 +53,9 @@ void eir_data_free(struct eir_data *eir) + eir->services = NULL; + g_free(eir->name); + eir->name = NULL; +- g_free(eir->hash); ++ free(eir->hash); + eir->hash = NULL; +- g_free(eir->randomizer); ++ free(eir->randomizer); + eir->randomizer = NULL; + g_slist_free_full(eir->msd_list, g_free); + eir->msd_list = NULL; +@@ -323,13 +323,13 @@ void eir_parse(struct eir_data *eir, const uint8_t *eir_data, uint8_t eir_len) + case EIR_SSP_HASH: + if (data_len < 16) + break; +- eir->hash = g_memdup(data, 16); ++ eir->hash = util_memdup(data, 16); + break; + + case EIR_SSP_RANDOMIZER: + if (data_len < 16) + break; +- eir->randomizer = g_memdup(data, 16); ++ eir->randomizer = util_memdup(data, 16); + break; + + case EIR_DEVICE_ID: +diff --git a/tools/gatt-service.c b/tools/gatt-service.c +index 631c4f249..ed6b06f1e 100644 +--- a/tools/gatt-service.c ++++ b/tools/gatt-service.c +@@ -26,6 +26,7 @@ + #include "gdbus/gdbus.h" + + #include "src/error.h" ++#include "src/shared/util.h" + + #define GATT_MGR_IFACE "org.bluez.GattManager1" + #define GATT_SERVICE_IFACE "org.bluez.GattService1" +@@ -126,8 +127,8 @@ static gboolean desc_get_value(const GDBusPropertyTable *property, + + static void desc_write(struct descriptor *desc, const uint8_t *value, int len) + { +- g_free(desc->value); +- desc->value = g_memdup(value, len); ++ free(desc->value); ++ desc->value = util_memdup(value, len); + desc->vlen = len; + + g_dbus_emit_property_changed(connection, desc->path, +@@ -264,8 +265,8 @@ static gboolean chr_get_props(const GDBusPropertyTable *property, + + static void chr_write(struct characteristic *chr, const uint8_t *value, int len) + { +- g_free(chr->value); +- chr->value = g_memdup(value, len); ++ free(chr->value); ++ chr->value = util_memdup(value, len); + chr->vlen = len; + + g_dbus_emit_property_changed(connection, chr->path, GATT_CHR_IFACE, +@@ -388,7 +389,7 @@ static void chr_iface_destroy(gpointer user_data) + + g_free(chr->uuid); + g_free(chr->service); +- g_free(chr->value); ++ free(chr->value); + g_free(chr->path); + g_free(chr); + } +@@ -398,7 +399,7 @@ static void desc_iface_destroy(gpointer user_data) + struct descriptor *desc = user_data; + + g_free(desc->uuid); +- g_free(desc->value); ++ free(desc->value); + g_free(desc->path); + g_free(desc); + } +@@ -592,7 +593,7 @@ static gboolean register_characteristic(const char *chr_uuid, + + chr = g_new0(struct characteristic, 1); + chr->uuid = g_strdup(chr_uuid); +- chr->value = g_memdup(value, vlen); ++ chr->value = util_memdup(value, vlen); + chr->vlen = vlen; + chr->props = props; + chr->service = g_strdup(service_path); +diff --git a/tools/mesh-gatt/gatt.c b/tools/mesh-gatt/gatt.c +index c8a8123fb..ab9743cd1 100644 +--- a/tools/mesh-gatt/gatt.c ++++ b/tools/mesh-gatt/gatt.c +@@ -24,6 +24,7 @@ + + #include "src/shared/io.h" + #include "src/shared/shell.h" ++#include "src/shared/util.h" + #include "gdbus/gdbus.h" + #include "lib/bluetooth.h" + #include "lib/uuid.h" +@@ -86,7 +87,7 @@ static void write_data_free(void *user_data) + { + struct write_data *data = user_data; + +- g_free(data->gatt_data); ++ free(data->gatt_data); + free(data); + } + +@@ -338,7 +339,7 @@ bool mesh_gatt_write(GDBusProxy *proxy, uint8_t *buf, uint16_t len, + /* TODO: should keep in queue in case we need to cancel write? */ + + data->gatt_len = len; +- data->gatt_data = g_memdup(buf, len); ++ data->gatt_data = util_memdup(buf, len); + data->gatt_data[0] &= GATT_TYPE_MASK; + data->iov.iov_base = data->gatt_data; + data->iov.iov_len = len; +diff --git a/unit/test-avctp.c b/unit/test-avctp.c +index fa7db59c8..25fd3abc2 100644 +--- a/unit/test-avctp.c ++++ b/unit/test-avctp.c +@@ -53,7 +53,7 @@ struct context { + #define raw_pdu(args...) \ + { \ + .valid = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +@@ -64,7 +64,7 @@ struct context { + }; \ + static struct test_data data; \ + data.test_name = g_strdup(name); \ +- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ ++ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ + tester_add(name, &data, NULL, function, NULL); \ + } while (0) + +diff --git a/unit/test-avdtp.c b/unit/test-avdtp.c +index 4e8a68c6b..2e49def43 100644 +--- a/unit/test-avdtp.c ++++ b/unit/test-avdtp.c +@@ -48,7 +48,7 @@ struct test_data { + #define raw_pdu(args...) \ + { \ + .valid = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +@@ -56,7 +56,7 @@ struct test_data { + { \ + .valid = true, \ + .fragmented = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +@@ -67,7 +67,7 @@ struct test_data { + }; \ + static struct test_data data; \ + data.test_name = g_strdup(name); \ +- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ ++ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ + tester_add(name, &data, NULL, function, NULL); \ + } while (0) + +diff --git a/unit/test-avrcp.c b/unit/test-avrcp.c +index 34a70377d..b637a8a1b 100644 +--- a/unit/test-avrcp.c ++++ b/unit/test-avrcp.c +@@ -61,7 +61,7 @@ struct context { + #define raw_pdu(args...) \ + { \ + .valid = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +@@ -69,7 +69,7 @@ struct context { + { \ + .valid = true, \ + .browse = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +@@ -77,7 +77,7 @@ struct context { + { \ + .valid = true, \ + .fragmented = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +@@ -85,7 +85,7 @@ struct context { + { \ + .valid = true, \ + .continuing = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +@@ -96,7 +96,7 @@ struct context { + }; \ + static struct test_data data; \ + data.test_name = g_strdup(name); \ +- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ ++ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ + tester_add(name, &data, NULL, function, NULL); \ + } while (0) + +diff --git a/unit/test-gatt.c b/unit/test-gatt.c +index 6a47268e6..f92d860c4 100644 +--- a/unit/test-gatt.c ++++ b/unit/test-gatt.c +@@ -73,7 +73,7 @@ struct context { + #define raw_pdu(args...) \ + { \ + .valid = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +@@ -94,7 +94,7 @@ struct context { + data.uuid = bt_uuid; \ + data.step = test_step; \ + data.source_db = db; \ +- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ ++ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ + tester_add(name, &data, NULL, function, NULL); \ + } while (0) + +diff --git a/unit/test-hfp.c b/unit/test-hfp.c +index f504724d7..b4af99d53 100644 +--- a/unit/test-hfp.c ++++ b/unit/test-hfp.c +@@ -17,6 +17,7 @@ + #include + #include "src/shared/hfp.h" + #include "src/shared/tester.h" ++#include "src/shared/util.h" + + struct context { + guint watch_id; +@@ -50,7 +51,7 @@ struct test_data { + #define raw_pdu(args...) \ + { \ + .valid = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +@@ -62,7 +63,7 @@ struct test_data { + #define type_pdu(cmd_type, args...) \ + { \ + .valid = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + .type = cmd_type, \ + } +@@ -70,7 +71,7 @@ struct test_data { + #define frg_pdu(args...) \ + { \ + .valid = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + .fragmented = true, \ + } +@@ -82,7 +83,7 @@ struct test_data { + }; \ + static struct test_data data; \ + data.test_name = g_strdup(name); \ +- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ ++ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ + data.result_func = result_function; \ + tester_add(name, &data, NULL, function, NULL); \ + data.test_handler = test_handler; \ +@@ -96,7 +97,7 @@ struct test_data { + }; \ + static struct test_data data; \ + data.test_name = g_strdup(name); \ +- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ ++ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ + data.hf_result_func = result_func; \ + data.response_func = response_function; \ + tester_add(name, &data, NULL, function, NULL); \ +diff --git a/unit/test-hog.c b/unit/test-hog.c +index 116a5cb07..067497de4 100644 +--- a/unit/test-hog.c ++++ b/unit/test-hog.c +@@ -59,24 +59,24 @@ struct context { + #define raw_pdu(args...) \ + { \ + .valid = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +-#define false_pdu() \ +-{ \ +- .valid = false, \ ++#define false_pdu() \ ++{ \ ++ .valid = false, \ + } + +-#define define_test(name, function, args...) \ +- do { \ +- const struct test_pdu pdus[] = { \ +- args, { } \ +- }; \ +- static struct test_data data; \ +- data.test_name = g_strdup(name); \ +- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ +- tester_add(name, &data, NULL, function, NULL); \ ++#define define_test(name, function, args...) \ ++ do { \ ++ const struct test_pdu pdus[] = { \ ++ args, { } \ ++ }; \ ++ static struct test_data data; \ ++ data.test_name = g_strdup(name); \ ++ data.pdu_list = util_memdup(pdus, sizeof(pdus));\ ++ tester_add(name, &data, NULL, function, NULL); \ + } while (0) + + static gboolean context_quit(gpointer user_data) +diff --git a/unit/test-sdp.c b/unit/test-sdp.c +index 8f95fcb71..5c04a71eb 100644 +--- a/unit/test-sdp.c ++++ b/unit/test-sdp.c +@@ -47,14 +47,16 @@ struct test_data { + #define raw_pdu(args...) \ + { \ + .valid = true, \ +- .raw_data = g_memdup(raw_data(args), sizeof(raw_data(args))), \ ++ .raw_data = util_memdup(raw_data(args), \ ++ sizeof(raw_data(args))), \ + .raw_size = sizeof(raw_data(args)), \ + } + + #define raw_pdu_cont(cont, args...) \ + { \ + .valid = true, \ +- .raw_data = g_memdup(raw_data(args), sizeof(raw_data(args))), \ ++ .raw_data = util_memdup(raw_data(args), \ ++ sizeof(raw_data(args))), \ + .raw_size = sizeof(raw_data(args)), \ + .cont_len = cont, \ + } +@@ -66,7 +68,7 @@ struct test_data { + }; \ + static struct test_data data; \ + data.mtu = _mtu; \ +- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ ++ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ + tester_add(name, &data, NULL, test_sdp, NULL); \ + } while (0) + +@@ -92,7 +94,7 @@ struct test_data_de { + #define define_test_de_attr(name, input, exp) \ + do { \ + static struct test_data_de data; \ +- data.input_data = g_memdup(input, sizeof(input)); \ ++ data.input_data = util_memdup(input, sizeof(input)); \ + data.input_size = sizeof(input); \ + data.expected = exp; \ + tester_add("/sdp/DE/ATTR/" name, &data, NULL, \ +diff --git a/unit/test-uhid.c b/unit/test-uhid.c +index 001d39a3d..8a8eef855 100644 +--- a/unit/test-uhid.c ++++ b/unit/test-uhid.c +@@ -61,7 +61,7 @@ struct context { + }; \ + static struct test_data data; \ + data.test_name = g_strdup(name); \ +- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ ++ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ + tester_add(name, &data, NULL, function, NULL); \ + } while (0) + +-- +2.17.1 + -- 2.17.1 From thomas.petazzoni at bootlin.com Sun Feb 6 09:25:37 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 10:25:37 +0100 Subject: [Buildroot] [git commit] package/xen: security bump to version 4.14.4 Message-ID: <20220206091833.3287E82B51@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7d3845f10ccc0810243036439b955cd9f49d3da4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Includes a number of bugfixes and the security fixes up to xsa-395: https://xenproject.org/downloads/xen-project-archives/xen-project-4-14-series/xen-project-4-14-4/ Drop the now upstream xsa38* patches. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- package/xen/xen.hash | 11 +---------- package/xen/xen.mk | 19 +------------------ 2 files changed, 2 insertions(+), 28 deletions(-) diff --git a/package/xen/xen.hash b/package/xen/xen.hash index 10a778053a..a81d05e3f7 100644 --- a/package/xen/xen.hash +++ b/package/xen/xen.hash @@ -1,12 +1,3 @@ # Locally computed -sha256 a3dad76a772393a1875e8f44a6059a95fea4bde40f97b800966969ac6f3a498d xen-4.14.3.tar.gz +sha256 e76d56dfcdabf5d80aa06819f44472de49526a518dbb483eb08e7ff9aec2c669 xen-4.14.4.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 cfc166dc4c..03341d4275 100644 --- a/package/xen/xen.mk +++ b/package/xen/xen.mk @@ -4,30 +4,13 @@ # ################################################################################ -XEN_VERSION = 4.14.3 +XEN_VERSION = 4.14.4 XEN_SITE = https://downloads.xenproject.org/release/xen/$(XEN_VERSION) XEN_LICENSE = GPL-2.0 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 thomas.petazzoni at bootlin.com Sun Feb 6 09:26:07 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 10:26:07 +0100 Subject: [Buildroot] [PATCH] package/xen: security bump to version 4.14.4 In-Reply-To: <20220205135132.3007-1-peter@korsgaard.com> References: <20220205135132.3007-1-peter@korsgaard.com> Message-ID: <20220206102607.737fa77b@windsurf> On Sat, 5 Feb 2022 14:51:30 +0100 Peter Korsgaard wrote: > Includes a number of bugfixes and the security fixes up to xsa-395: > https://xenproject.org/downloads/xen-project-archives/xen-project-4-14-series/xen-project-4-14-4/ > > Drop the now upstream xsa38* patches. > > Signed-off-by: Peter Korsgaard > --- > package/xen/xen.hash | 11 +---------- > package/xen/xen.mk | 19 +------------------ > 2 files changed, 2 insertions(+), 28 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 6 09:30:40 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 10:30:40 +0100 Subject: [Buildroot] [PATCH v1 1/1] package/guile: Guile 3.0.7 requires libiconv. In-Reply-To: <20220206084334.1900252-1-paguilar@paguilar.org> References: <20220206084334.1900252-1-paguilar@paguilar.org> Message-ID: <20220206103040.1704ef40@windsurf> On Sun, 6 Feb 2022 09:43:34 +0100 Pedro Aguilar wrote: > This fixes the error reported in the daily results. > > Signed-off-by: Pedro Aguilar libiconv is normally needed only on toolchains that don't have BR2_ENABLE_LOCALE. But the build failure of guile happens with glibc toolchains, so it doesn't make much sense. Are you sure that your analysis of the problem is correct? Could you provide some more details? Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 6 09:31:40 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 10:31:40 +0100 Subject: [Buildroot] [git commit] board/pine64/rockpro64: use partition-type-uuid in genimage.cfg Message-ID: <20220206092448.2FB6282B9A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2466a542813228099fdfce9488199dc6e39d78b9 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 So let's use for EFI System partition: 'partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b' and for Root partition (64-bit ARM/AArch64): 'partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae' Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/1929717243 FTR, the magic UUID are from: https://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- board/pine64/rockpro64/genimage.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/pine64/rockpro64/genimage.cfg b/board/pine64/rockpro64/genimage.cfg index 14dd0e1d18..d3926f2df6 100644 --- a/board/pine64/rockpro64/genimage.cfg +++ b/board/pine64/rockpro64/genimage.cfg @@ -26,14 +26,14 @@ image sdcard.img { } partition boot { - partition-type = 0xC + partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b bootable = "true" image = "boot.vfat" offset = 16M } partition rootfs { - partition-type = 0x83 + partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae image = "rootfs.ext4" } } From thomas.petazzoni at bootlin.com Sun Feb 6 09:31:25 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 10:31:25 +0100 Subject: [Buildroot] [git commit] board/friendlyarm/nanopc-t4: use partition-type-uuid in genimage.cfg Message-ID: <20220206092448.1D002822F1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7a9a74fc823d14ec8b7bbfea9b1e4535e408c95c 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 So let's use for EFI System partition: 'partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b' and for Root partition (64-bit ARM/AArch64): 'partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae' Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/1929717055 FTR, the magic UUID are from: https://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- board/friendlyarm/nanopc-t4/genimage.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/friendlyarm/nanopc-t4/genimage.cfg b/board/friendlyarm/nanopc-t4/genimage.cfg index d63c293ab4..98dc2f3892 100644 --- a/board/friendlyarm/nanopc-t4/genimage.cfg +++ b/board/friendlyarm/nanopc-t4/genimage.cfg @@ -26,14 +26,14 @@ image sdcard.img { } partition boot { - partition-type = 0xC + partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b bootable = "true" image = "boot.vfat" offset = 16M } partition rootfs { - partition-type = 0x83 + partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae image = "rootfs.ext4" } } From thomas.petazzoni at bootlin.com Sun Feb 6 09:31:34 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 10:31:34 +0100 Subject: [Buildroot] [git commit] board/friendlyarm/nanopi-m4: use partition-type-uuid in genimage.cfg Message-ID: <20220206092448.28A0882B8E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bd29ee0e8ef59361824ef4ae7957208915d80c65 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 So let's use for EFI System partition: 'partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b' and for Root partition (64-bit ARM/AArch64): 'partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae' Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/1929717059 FTR, the magic UUID are from: https://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- board/friendlyarm/nanopi-m4/genimage.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/friendlyarm/nanopi-m4/genimage.cfg b/board/friendlyarm/nanopi-m4/genimage.cfg index 35d056ae6e..8d0e6ad13b 100644 --- a/board/friendlyarm/nanopi-m4/genimage.cfg +++ b/board/friendlyarm/nanopi-m4/genimage.cfg @@ -26,14 +26,14 @@ image sdcard.img { } partition boot { - partition-type = 0xC + partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b bootable = "true" image = "boot.vfat" offset = 16M } partition rootfs { - partition-type = 0x83 + partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae image = "rootfs.ext4" } } From thomas.petazzoni at bootlin.com Sun Feb 6 09:31:53 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 10:31:53 +0100 Subject: [Buildroot] [git commit] board/radxa/rockpi-n10: use partition-type-uuid in genimage.cfg Message-ID: <20220206092448.414B582B8E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=93532fb711f537f77a2cfe0a23e085444c5747b5 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 So let's use for EFI System partition: 'partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b' and for Root partition (64-bit ARM/AArch64): 'partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae' Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/1929717241 FTR, the magic UUID are from: https://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- board/radxa/rockpi-n10/genimage.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/radxa/rockpi-n10/genimage.cfg b/board/radxa/rockpi-n10/genimage.cfg index 652e75db11..7f4b639bbc 100644 --- a/board/radxa/rockpi-n10/genimage.cfg +++ b/board/radxa/rockpi-n10/genimage.cfg @@ -26,14 +26,14 @@ image sdcard.img { } partition boot { - partition-type = 0xC + partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b bootable = "true" image = "boot.vfat" offset = 16M } partition rootfs { - partition-type = 0x83 + partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae image = "rootfs.ext4" } } From thomas.petazzoni at bootlin.com Sun Feb 6 09:31:46 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 10:31:46 +0100 Subject: [Buildroot] [git commit] board/radxa/rockpi-4: use partition-type-uuid in genimage.cfg Message-ID: <20220206092448.38B96822F1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c71c93aa76e803043a5c7cdd0315897540e0a647 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 So let's use for EFI System partition: 'partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b' and for Root partition (64-bit ARM/AArch64): 'partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae' Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/1929717240 FTR, the magic UUID are from: https://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- board/radxa/rockpi-4/genimage.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/radxa/rockpi-4/genimage.cfg b/board/radxa/rockpi-4/genimage.cfg index a5100af420..68cc4d61a8 100644 --- a/board/radxa/rockpi-4/genimage.cfg +++ b/board/radxa/rockpi-4/genimage.cfg @@ -26,14 +26,14 @@ image sdcard.img { } partition boot { - partition-type = 0xC + partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b bootable = "true" image = "boot.vfat" offset = 16M } partition rootfs { - partition-type = 0x83 + partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae image = "rootfs.ext4" } } From thomas.petazzoni at bootlin.com Sun Feb 6 09:32:16 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 10:32:16 +0100 Subject: [Buildroot] [PATCH 0/5] Fix genimage build failure on Gitlab-CI In-Reply-To: <20220203225957.3039320-1-giulio.benetti@benettiengineering.com> References: <20220203225957.3039320-1-giulio.benetti@benettiengineering.com> Message-ID: <20220206103216.6d89c19e@windsurf> On Thu, 3 Feb 2022 23:59:52 +0100 Giulio Benetti wrote: > Giulio Benetti (5): > board/friendlyarm/nanopc-t4:use partition-type-uuid for genimage-15 > board/friendlyarm/nanopi-m4:use partition-type-uuid for genimage-15 > board/pine64/rockpro64:use partition-type-uuid for genimage-15 > board/radxa/rockpi-4:use partition-type-uuid for genimage-15 > board/radxa/rockpi-n10:use partition-type-uuid for genimage-15 Series applied, thanks -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From peter at korsgaard.com Sun Feb 6 09:45:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 10:45:02 +0100 Subject: [Buildroot] [PATCH 1/2] package/avahi: drop unneeded am_cv_path_PYTHON Message-ID: <20220206094504.11415-1-peter@korsgaard.com> It is not used by the configure script and refer to PYTHON_TARGET_BINARY which was dropped back in 2010 by commit e3418f69cf (python: convert to autotargets, bump to 2.7.1, many improvements), so drop it. Signed-off-by: Peter Korsgaard --- package/avahi/avahi.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk index 13e2106014..04c4164af6 100644 --- a/package/avahi/avahi.mk +++ b/package/avahi/avahi.mk @@ -107,7 +107,6 @@ endif ifeq ($(BR2_PACKAGE_PYTHON),y) AVAHI_CONF_ENV += \ am_cv_pathless_PYTHON=python \ - am_cv_path_PYTHON=$(PYTHON_TARGET_BINARY) \ am_cv_python_version=$(PYTHON_VERSION) \ am_cv_python_platform=linux2 \ am_cv_python_pythondir=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \ -- 2.20.1 From peter at korsgaard.com Sun Feb 6 09:45:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 10:45:03 +0100 Subject: [Buildroot] [PATCH 2/2] package/avahi: add pygobject support, move to python3 In-Reply-To: <20220206094504.11415-1-peter@korsgaard.com> References: <20220206094504.11415-1-peter@korsgaard.com> Message-ID: <20220206094504.11415-2-peter@korsgaard.com> The python support in avahi needs pygobjet to do anything: Building avahi-python: no (You need python, pygobject and python-dbus!) So add optional support for it. Python-gobject is only available for python3, so change the python logic to use python 3. Signed-off-by: Peter Korsgaard --- package/avahi/avahi.mk | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk index 04c4164af6..1992669a92 100644 --- a/package/avahi/avahi.mk +++ b/package/avahi/avahi.mk @@ -40,7 +40,6 @@ AVAHI_CONF_OPTS = \ --disable-gtk \ --disable-gtk3 \ --disable-gdbm \ - --disable-pygobject \ --disable-mono \ --disable-monodoc \ --disable-stack-protector \ @@ -104,16 +103,16 @@ else AVAHI_CONF_OPTS += --disable-glib --disable-gobject endif -ifeq ($(BR2_PACKAGE_PYTHON),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) AVAHI_CONF_ENV += \ - am_cv_pathless_PYTHON=python \ - am_cv_python_version=$(PYTHON_VERSION) \ - am_cv_python_platform=linux2 \ - am_cv_python_pythondir=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \ - am_cv_python_pyexecdir=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \ + am_cv_pathless_PYTHON=python3 \ + am_cv_python_version=$(PYTHON3_VERSION) \ + am_cv_python_platform=linux5 \ + am_cv_python_pythondir=/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + am_cv_python_pyexecdir=/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ py_cv_mod_socket_=yes -AVAHI_DEPENDENCIES += python +AVAHI_DEPENDENCIES += python3 AVAHI_CONF_OPTS += --enable-python else AVAHI_CONF_OPTS += --disable-python @@ -127,6 +126,13 @@ else AVAHI_CONF_OPTS += --disable-python-dbus endif +ifeq ($(BR2_PACKAGE_PYTHON_GOBJECT),y) +AVAHI_CONF_OPTS += --enable-pygobject +AVAHI_DEPENDENCIES += python-gobject +else +AVAHI_CONF_OPTS += --disable-pygobject +endif + AVAHI_CONF_ENV += CFLAGS="$(AVAHI_CFLAGS)" AVAHI_MAKE_OPTS += LIBS=$(TARGET_NLS_LIBS) -- 2.20.1 From giulio.benetti at benettiengineering.com Sun Feb 6 09:54:03 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 10:54:03 +0100 Subject: [Buildroot] [PATCH] docs/manual: fix "+size = +" latex formatting Message-ID: <20220206095403.1563814-1-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- docs/manual/writing-rules.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/manual/writing-rules.txt b/docs/manual/writing-rules.txt index 3eec095d0e..06f87556ed 100644 --- a/docs/manual/writing-rules.txt +++ b/docs/manual/writing-rules.txt @@ -184,7 +184,7 @@ image sdimage.img { * Every node(+section+, +partition+, +file+, +subnode+) must have an open curly bracket on the same line of the node's name, while the closing one must be on a newline and after it a newline must be added except for the - last one node. Same goes for its option, for example option +size = +. + last one node. Same goes for its option, for example option +size+ +=+. * Every +option+(i.e. +image+, +offset+, +size+) must have the +=+ assignment one space from it and one space from the value specified. -- 2.25.1 From fontaine.fabrice at gmail.com Sun Feb 6 09:53:59 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 6 Feb 2022 10:53:59 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/rygel: gobject-introspection is mandatory Message-ID: <20220206095359.854435-1-fontaine.fabrice@gmail.com> vapi (and gobject-introspection) is mandatory since bump to version 0.40.2 in commit 6acdbb81c8d6cdd3ecb476ae24e72fd4547011c3: valac -C --pkg posix --pkg libxml-2.0 --pkg gmodule-2.0 --pkg gio-2.0 --pkg gssdp-1.2 --pkg gee-0.8 --pkg gupnp-1.2 --target-glib ' 2.56' --pkg glib-2.0 --color=always --directory src/librygel-core/librygel-core-2.6.so.2.0.4.p --basedir ../src/librygel-core --library rygel-core-2.6 --header src/librygel-core/rygel-core.h --vapi ../rygel-core-2.6.vapi --gir ../Rygel-2.6.gir ../src/librygel-core/rygel-build-config.vapi ../src/librygel-core/rygel-connection-manager.vala ../src/librygel-core/rygel-basic-management.vala ../src/librygel-core/rygel-basic-management-test.vala ../src/librygel-core/rygel-basic-management-test-ping.vala ../src/librygel-core/rygel-basic-management-test-nslookup.vala ../src/librygel-core/rygel-basic-management-test-traceroute.vala ../src/librygel-core/rygel-description-file.vala ../src/librygel-core/rygel-dlna-profile.vala ../src/librygel-core/rygel-energy-management.vala ../src/librygel-core/rygel-root-device.vala ../src/librygel-core/rygel-root-device-factory.vala ../src/librygel-core/rygel-dbus-interface.vala ../src/librygel-core/rygel-log-handler.vala ../src/librygel-core/rygel-meta-config.vala ../src/librygel-core/rygel-plugin-loader.vala ../src/librygel-core/rygel-recursive-module-loader.vala ../src/librygel-core/rygel-plugin.vala ../src/librygel-core/rygel-resource-info.vala ../src/librygel-core/rygel-media-device.vala ../src/librygel-core/rygel-configuration.vala ../src/librygel-core/rygel-base-configuration.vala ../src/librygel-core/rygel-cmdline-config.vala ../src/librygel-core/rygel-environment-config.vala ../src/librygel-core/rygel-user-config.vala ../src/librygel-core/rygel-state-machine.vala ../src/librygel-core/rygel-v1-hacks.vala ../src/librygel-core/rygel-icon-info.vala ../src/librygel-core/rygel-xml-utils.vala ../src/librygel-core/rygel-plugin-information.vala error: Package `gssdp-1.2' not found in specified Vala API directories or GObject-Introspection GIR directories error: Package `gupnp-1.2' not found in specified Vala API directories or GObject-Introspection GIR directories Depends on BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES instead of selecting it to avoid the following recursive dependency: package/gstreamer1/gstreamer1/Config.in:5:error: recursive dependency detected! package/gstreamer1/gstreamer1/Config.in:5: symbol BR2_PACKAGE_GSTREAMER1 is selected by BR2_PACKAGE_RYGEL_MEDIA_ENGINE_GSTREAMER1 package/rygel/Config.in:46: symbol BR2_PACKAGE_RYGEL_MEDIA_ENGINE_GSTREAMER1 is part of choice package/rygel/Config.in:39: choice contains symbol package/rygel/Config.in:39: choice contains symbol BR2_PACKAGE_RYGEL package/rygel/Config.in:1: symbol BR2_PACKAGE_RYGEL depends on BR2_PACKAGE_PYTHON3 package/python3/Config.in:5: symbol BR2_PACKAGE_PYTHON3 is selected by BR2_PACKAGE_JACK2_DBUS package/jack2/Config.in:35: symbol BR2_PACKAGE_JACK2_DBUS depends on BR2_PACKAGE_JACK2 package/jack2/Config.in:1: symbol BR2_PACKAGE_JACK2 is selected by BR2_PACKAGE_FLUIDSYNTH_JACK2 package/fluidsynth/Config.in:37: symbol BR2_PACKAGE_FLUIDSYNTH_JACK2 depends on BR2_PACKAGE_FLUIDSYNTH package/fluidsynth/Config.in:1: symbol BR2_PACKAGE_FLUIDSYNTH is selected by BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FLUIDSYNTH package/gstreamer1/gst1-plugins-bad/Config.in:425: symbol BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FLUIDSYNTH depends on BR2_PACKAGE_GSTREAMER1 Fixes: - http://autobuild.buildroot.org/results/027ce84895fab6fb251dd37cd5cfb7169287a2de Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2: - Depends on BR2_PACKAGE_{PYTHON3,GSTREAMER1_EDITING_SERVICES} package/rygel/Config.in | 23 +++++++++++++++++------ package/rygel/rygel.mk | 9 ++------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/package/rygel/Config.in b/package/rygel/Config.in index df48918833..30e8430537 100644 --- a/package/rygel/Config.in +++ b/package/rygel/Config.in @@ -2,8 +2,14 @@ config BR2_PACKAGE_RYGEL bool "rygel" depends on BR2_USE_WCHAR # gupnp-av depends on BR2_TOOLCHAIN_HAS_THREADS # gupnp-av - depends on BR2_USE_MMU # gupnp-av + depends on BR2_USE_MMU # gupnp-av, gobject-introspection + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS # gobject-introspection + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # gobject-introspection + depends on BR2_HOST_GCC_AT_LEAST_8 # gobject-introspection -> host-qemu + depends on BR2_TOOLCHAIN_USES_GLIBC # gobject-introspection + depends on BR2_PACKAGE_PYTHON3 # gobject-introspection select BR2_PACKAGE_GDK_PIXBUF + select BR2_PACKAGE_GOBJECT_INTROSPECTION select BR2_PACKAGE_GUPNP_AV select BR2_PACKAGE_GUPNP_DLNA select BR2_PACKAGE_LIBGEE @@ -39,14 +45,19 @@ config BR2_PACKAGE_RYGEL_MEDIA_ENGINE_SIMPLE config BR2_PACKAGE_RYGEL_MEDIA_ENGINE_GSTREAMER1 bool "gstreamer1" - select BR2_PACKAGE_GSTREAMER1 - select BR2_PACKAGE_GST1_PLUGINS_BASE - select BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES + depends on BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES + +comment "gstreamer1 needs gst1-editing-services" + depends on !BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES endchoice -comment "rygel needs a toolchain w/ wchar, threads" +comment "rygel needs a glibc toolchain w/ wchar, threads, gcc >= 4.9, host gcc >= 8" depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_USES_GLIBC || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_HOST_GCC_AT_LEAST_8 endif # BR2_PACKAGE_RYGEL diff --git a/package/rygel/rygel.mk b/package/rygel/rygel.mk index c541cdc0ed..bfcd5df3c6 100644 --- a/package/rygel/rygel.mk +++ b/package/rygel/rygel.mk @@ -12,6 +12,7 @@ RYGEL_LICENSE = LGPL-2.1+, CC-BY-SA-3.0 (logo) RYGEL_LICENSE_FILES = COPYING COPYING.logo RYGEL_DEPENDENCIES = \ gdk-pixbuf \ + gobject-introspection \ gupnp-av \ gupnp-dlna \ libgee \ @@ -24,16 +25,10 @@ RYGEL_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) RYGEL_CONF_OPTS += \ -Dapi-docs=false \ -Dexamples=false \ + -Dintrospection=enabled \ -Dtests=false RYGEL_PLUGINS = external,lms,mpris,ruih -ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) -RYGEL_CONF_OPTS += -Dintrospection=enabled -RYGEL_DEPENDENCIES += gobject-introspection -else -RYGEL_CONF_OPTS += -Dintrospection=disabled -endif - ifeq ($(BR2_PACKAGE_RYGEL_MEDIA_ENGINE_GSTREAMER1),y) RYGEL_CONF_OPTS += \ -Dengines=gstreamer \ -- 2.34.1 From guillaume.bressaix at gmail.com Sun Feb 6 10:11:34 2022 From: guillaume.bressaix at gmail.com (Guillaume W. Bres) Date: Sun, 6 Feb 2022 11:11:34 +0100 Subject: [Buildroot] [PATCH] package/mbw: new package Message-ID: <20220206101134.30291-1-guillaume.bressaix@gmail.com> Signed-off-by: Guillaume W. Bres --- DEVELOPERS | 1 + package/Config.in | 1 + package/mbw/Config.in | 7 +++++++ package/mbw/mbw.hash | 3 +++ package/mbw/mbw.mk | 20 ++++++++++++++++++++ 5 files changed, 32 insertions(+) create mode 100644 package/mbw/Config.in create mode 100644 package/mbw/mbw.hash create mode 100644 package/mbw/mbw.mk diff --git a/DEVELOPERS b/DEVELOPERS index a1ec9a091e..acc87aa007 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1148,6 +1148,7 @@ N: Guillaume William Brs F: package/libnids/ F: package/libxcrypt/ F: package/liquid-dsp/ +F: package/mbw/ F: package/pixiewps/ F: package/python-pybind/ F: package/reaver/ diff --git a/package/Config.in b/package/Config.in index e4ca195beb..8445173633 100644 --- a/package/Config.in +++ b/package/Config.in @@ -118,6 +118,7 @@ menu "Debugging, profiling and benchmark" source "package/lttng-babeltrace/Config.in" source "package/lttng-modules/Config.in" source "package/lttng-tools/Config.in" + source "package/mbw/Config.in" source "package/mcelog/Config.in" source "package/memstat/Config.in" source "package/netperf/Config.in" diff --git a/package/mbw/Config.in b/package/mbw/Config.in new file mode 100644 index 0000000000..7bafa35359 --- /dev/null +++ b/package/mbw/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_MBW + bool "mbw" + help + MBW is a memory bandwidth benchmarking tool. + MBW determines the "copy" memory bandwidth available + to userspace programs. + https://github.com/raas/mbw diff --git a/package/mbw/mbw.hash b/package/mbw/mbw.hash new file mode 100644 index 0000000000..966b3c9dae --- /dev/null +++ b/package/mbw/mbw.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 9f7365c752f4dfe0d7d46c599ff1e4b412179be764b0d712269d7ee61e0cf718 mbw-1.4.tar.gz +sha256 43a285e18a2158494b099645e1ea3514452c085927b34856d39c1f6917c7d04d mbw.spec diff --git a/package/mbw/mbw.mk b/package/mbw/mbw.mk new file mode 100644 index 0000000000..fb599d0bfd --- /dev/null +++ b/package/mbw/mbw.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# mbw +# +################################################################################ + +MBW_VERSION = 1.4 +MBW_SITE = $(call github,raas,mbw,v$(MBW_VERSION)) +MBW_LICENSE = LGPL-2.1 +MBW_LICENSE_FILES = mbw.spec + +define MBW_BUILD_CMDS + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) +endef + +define MBW_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/mbw $(TARGET_DIR)/usr/sbin +endef + +$(eval $(generic-package)) -- 2.20.1 From fontaine.fabrice at gmail.com Sun Feb 6 10:14:33 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 6 Feb 2022 11:14:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/libopenh264: bump to version 2.2.0 Message-ID: <20220206101433.862930-1-fontaine.fabrice@gmail.com> Drop patches (already in version) https://github.com/cisco/openh264/releases/tag/v2.2.0 Signed-off-by: Fabrice Fontaine --- .../0001-Add-USE_STACK_PROTECTOR-option.patch | 100 ------------------ package/libopenh264/0002-fix-mips-build.patch | 73 ------------- ...n-inc-asmdefs_mmi.h-fix-mips32-build.patch | 89 ---------------- package/libopenh264/libopenh264.hash | 2 +- package/libopenh264/libopenh264.mk | 2 +- 5 files changed, 2 insertions(+), 264 deletions(-) delete mode 100644 package/libopenh264/0001-Add-USE_STACK_PROTECTOR-option.patch delete mode 100644 package/libopenh264/0002-fix-mips-build.patch delete mode 100644 package/libopenh264/0003-codec-common-inc-asmdefs_mmi.h-fix-mips32-build.patch diff --git a/package/libopenh264/0001-Add-USE_STACK_PROTECTOR-option.patch b/package/libopenh264/0001-Add-USE_STACK_PROTECTOR-option.patch deleted file mode 100644 index 3758cd668b..0000000000 --- a/package/libopenh264/0001-Add-USE_STACK_PROTECTOR-option.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 1e7435751c055723b7103dd1d5bb68530e1a2678 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 8 Oct 2019 20:18:18 +0200 -Subject: [PATCH] Add USE_STACK_PROTECTOR option - --fstack-protector-all is not supported on all linux toolchains so add an -option to disable it (and enable it by default to keep current behavior) - -Fixes: - - http://autobuild.buildroot.org/results/377818cf8c1f2632cabdccb32bf4e7f06c0fdbbd - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/cisco/openh264/pull/3175] ---- - Makefile | 1 + - build/platform-android.mk | 5 ++++- - build/platform-bsd.mk | 5 ++++- - build/platform-darwin.mk | 5 ++++- - build/platform-linux.mk | 5 ++++- - 5 files changed, 17 insertions(+), 4 deletions(-) - -diff --git a/Makefile b/Makefile -index 74ff029d..c2061f6a 100644 ---- a/Makefile -+++ b/Makefile -@@ -34,6 +34,7 @@ GTEST_VER=release-1.8.1 - CCASFLAGS=$(CFLAGS) - STATIC_LDFLAGS=-lstdc++ - STRIP ?= strip -+USE_STACK_PROTECTOR = Yes - - SHAREDLIB_MAJORVERSION=5 - FULL_VERSION := 2.0.0 -diff --git a/build/platform-android.mk b/build/platform-android.mk -index 6f6ce347..06534301 100644 ---- a/build/platform-android.mk -+++ b/build/platform-android.mk -@@ -44,7 +44,10 @@ SYSROOT = $(NDKROOT)/platforms/android-$(NDKLEVEL)/arch-$(ARCH) - CXX = $(TOOLCHAINPREFIX)g++ - CC = $(TOOLCHAINPREFIX)gcc - AR = $(TOOLCHAINPREFIX)ar --CFLAGS += -DANDROID_NDK -fpic --sysroot=$(SYSROOT) -MMD -MP -fstack-protector-all -+CFLAGS += -DANDROID_NDK -fpic --sysroot=$(SYSROOT) -MMD -MP -+ifeq ($(USE_STACK_PROTECTOR), Yes) -+CFLAGS +=-fstack-protector-all -+endif - CFLAGS += -isystem $(NDKROOT)/sysroot/usr/include -isystem $(NDKROOT)/sysroot/usr/include/$(TOOLCHAIN_NAME) -D__ANDROID_API__=$(NDKLEVEL) - CXXFLAGS += -fno-rtti -fno-exceptions - LDFLAGS += --sysroot=$(SYSROOT) -diff --git a/build/platform-bsd.mk b/build/platform-bsd.mk -index e60d2cc0..2e0bf2cc 100644 ---- a/build/platform-bsd.mk -+++ b/build/platform-bsd.mk -@@ -3,7 +3,10 @@ SHAREDLIBSUFFIX = so - SHAREDLIBSUFFIXFULLVER=$(SHAREDLIBSUFFIX).$(FULL_VERSION) - SHAREDLIBSUFFIXMAJORVER=$(SHAREDLIBSUFFIX).$(SHAREDLIB_MAJORVERSION) - SHLDFLAGS = -Wl,-soname,$(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXMAJORVER) --CFLAGS += -fPIC -fstack-protector-all -+CFLAGS += -fPIC -+ifeq ($(USE_STACK_PROTECTOR), Yes) -+CFLAGS += -fstack-protector-all -+endif - LDFLAGS += -lpthread - STATIC_LDFLAGS += -lpthread -lm - ifeq ($(ASM_ARCH), x86) -diff --git a/build/platform-darwin.mk b/build/platform-darwin.mk -index 6c7b2443..718c8e2f 100644 ---- a/build/platform-darwin.mk -+++ b/build/platform-darwin.mk -@@ -10,7 +10,10 @@ SHLDFLAGS = -dynamiclib -twolevel_namespace -undefined dynamic_lookup \ - $(SHAREDLIB_DIR)/$(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXMAJORVER) - SHARED = -dynamiclib - SHARED += -current_version $(CURRENT_VERSION) -compatibility_version $(COMPATIBILITY_VERSION) --CFLAGS += -Wall -fPIC -MMD -MP -fstack-protector-all -+CFLAGS += -Wall -fPIC -MMD -MP -+ifeq ($(USE_STACK_PROTECTOR), Yes) -+CFLAGS += -fstack-protector-all -+endif - ifeq ($(ASM_ARCH), x86) - ASMFLAGS += -DPREFIX - ifeq ($(ARCH), x86_64) -diff --git a/build/platform-linux.mk b/build/platform-linux.mk -index 44fe2424..b5c006b2 100644 ---- a/build/platform-linux.mk -+++ b/build/platform-linux.mk -@@ -3,7 +3,10 @@ SHAREDLIBSUFFIX = so - SHAREDLIBSUFFIXFULLVER=$(SHAREDLIBSUFFIX).$(FULL_VERSION) - SHAREDLIBSUFFIXMAJORVER=$(SHAREDLIBSUFFIX).$(SHAREDLIB_MAJORVERSION) - SHLDFLAGS = -Wl,-soname,$(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXMAJORVER) --CFLAGS += -Wall -fno-strict-aliasing -fPIC -MMD -MP -fstack-protector-all -+CFLAGS += -Wall -fno-strict-aliasing -fPIC -MMD -MP -+ifeq ($(USE_STACK_PROTECTOR), Yes) -+CFLAGS += -fstack-protector-all -+endif - LDFLAGS += -lpthread - STATIC_LDFLAGS += -lpthread -lm - AR_OPTS = crD $@ --- -2.23.0 - diff --git a/package/libopenh264/0002-fix-mips-build.patch b/package/libopenh264/0002-fix-mips-build.patch deleted file mode 100644 index c4927d567b..0000000000 --- a/package/libopenh264/0002-fix-mips-build.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 9d5981eecde2133b9d6099eb99f96b1c29c3e520 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Mon, 13 Apr 2020 12:03:01 +0200 -Subject: [PATCH] fix mips build - -In total three PR were sent upstream to fix mips builds: -https://github.com/cisco/openh264/pull/3185 -https://github.com/cisco/openh264/pull/3217 -https://github.com/cisco/openh264/pull/3225 - -Buildroot used the first version -https://git.buildroot.net/buildroot/commit/package/libopenh264?id=e8d0df569e1844f7ba28918a53ee38027b325b8f -downloaded from https://github.com/cisco/openh264/pull/3185 - -During discussion the gcc option '-march=loongson3a' was changed to -'-Wa,-mloongson-mmi,-mloongson-ext': -https://github.com/cisco/openh264/pull/3185#discussion_r337818960 - -This causes build errors with gcc version 8.3.0 (Buildroot 2020.02) - -tmp/cctgEQaw.s:662: Error: opcode not supported on this processor: loongson3a (mips64r2) `bc .L22' -/tmp/cctgEQaw.s:1679: Error: opcode not supported on this processor: loongson3a (mips64r2) `bc .L27' -/tmp/cctgEQaw.s:2218: Error: opcode not supported on this processor: loongson3a (mips64r2) `jrc $31' - -This patch partly reverts the change to fix mips build. - -$ /home/bernd/buildroot/br5/output/host/bin/mips64el-linux-gcc -v - -Using built-in specs. -COLLECT_GCC=/home/bernd/buildroot/br5/output/host/opt/ext-toolchain/bin/mips64el-linux-gcc.br_real -COLLECT_LTO_WRAPPER=/home/bernd/buildroot/br5/output/host/opt/ext-toolchain/bin/../libexec/gcc/mips64el-buildroot-linux-gnu/8.3.0/lto-wrapper -Target: mips64el-buildroot-linux-gnu -Configured with: ./configure --prefix=/opt/br-mips64r6-n64-el-hf-2020.02 --sysconfdir=/opt/br-mips64r6-n64-el-hf-2020.02/etc --enable-static --target=mips64el-buildroot-linux-gnu --with-sysroot=/opt/br-mips64r6-n64-el-hf-2020.02/mips64el-buildroot-linux-gnu/sysroot --enable-__cxa_atexit --with-gnu-ld --disable-libssp --disable-multilib --disable-decimal-float --with-gmp=/opt/br-mips64r6-n64-el-hf-2020.02 --with-mpc=/opt/br-mips64r6-n64-el-hf-2020.02 --with-mpfr=/opt/br-mips64r6-n64-el-hf-2020.02 --with-pkgversion='Buildroot 2020.02' --with-bugurl=http://bugs.buildroot.net/ --disable-libquadmath --enable-tls --enable-threads --without-isl --without-cloog --with-arch=mips64r6 --with-abi=64 --with-nan=2008 --enable-languages=c,c++ --with-build-time-tools=/opt/br-mips64r6-n64-el-hf-2020.02/mips64el-buildroot-linux-gnu/bin --enable-shared --disable-libgomp -Thread model: posix -gcc version 8.3.0 (Buildroot 2020.02) - -Patch sent upstream: https://github.com/cisco/openh264/pull/3267 - -Signed-off-by: Bernd Kuhls ---- - build/arch.mk | 2 +- - build/mips-simd-check.sh | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/build/arch.mk b/build/arch.mk -index 1bf318ab..c6570ed4 100644 ---- a/build/arch.mk -+++ b/build/arch.mk -@@ -41,7 +41,7 @@ ASMFLAGS += -I$(SRC_PATH)codec/common/mips/ - ifeq ($(ENABLE_MMI), Yes) - ENABLE_MMI = $(shell $(SRC_PATH)build/mips-simd-check.sh $(CC) mmi) - ifeq ($(ENABLE_MMI), Yes) --CFLAGS += -DHAVE_MMI -Wa,-mloongson-mmi,-mloongson-ext -+CFLAGS += -DHAVE_MMI -march=loongson3a - endif - endif - #msa -diff --git a/build/mips-simd-check.sh b/build/mips-simd-check.sh -index 5efffbef..d0d72f9e 100755 ---- a/build/mips-simd-check.sh -+++ b/build/mips-simd-check.sh -@@ -15,7 +15,7 @@ TMPO=$(mktemp tmp.XXXXXX.o) - if [ $2 == "mmi" ] - then - echo "void main(void){ __asm__ volatile(\"punpcklhw \$f0, \$f0, \$f0\"); }" > $TMPC -- $1 -Wa,-mloongson-mmi $TMPC -o $TMPO &> /dev/null -+ $1 -march=loongson3a $TMPC -o $TMPO &> /dev/null - if test -s $TMPO - then - echo "Yes" --- -2.25.0 - diff --git a/package/libopenh264/0003-codec-common-inc-asmdefs_mmi.h-fix-mips32-build.patch b/package/libopenh264/0003-codec-common-inc-asmdefs_mmi.h-fix-mips32-build.patch deleted file mode 100644 index e11b1d13ef..0000000000 --- a/package/libopenh264/0003-codec-common-inc-asmdefs_mmi.h-fix-mips32-build.patch +++ /dev/null @@ -1,89 +0,0 @@ -From c505f81e336088b6729a5407a03459f488353288 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 24 May 2021 22:54:01 +0200 -Subject: [PATCH] codec/common/inc/asmdefs_mmi.h: fix mips32 build - -Fix the following build failure on mips32 which is raised since version -2.0.0 and -https://github.com/cisco/openh264/commit/b13e5bceb18ebb93d0313b46aab4af6f480ca933: - -codec/common/mips/copy_mb_mmi.c: In function 'WelsCopy16x16_mmi': -./codec/common/inc/asmdefs_mmi.h:293:21: error: '_ABI64' undeclared (first use in this function) - 293 | if (_MIPS_SIM == _ABI64) \ - | ^~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/cba3e9d0fd061cc3a92cb732bcdc2c7b66dbf6cb - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/cisco/openh264/pull/3384] ---- - codec/common/inc/asmdefs_mmi.h | 17 +++++++++++------ - 1 file changed, 11 insertions(+), 6 deletions(-) - -diff --git a/codec/common/inc/asmdefs_mmi.h b/codec/common/inc/asmdefs_mmi.h -index 69a7ae39..5d1aed93 100644 ---- a/codec/common/inc/asmdefs_mmi.h -+++ b/codec/common/inc/asmdefs_mmi.h -@@ -288,9 +288,9 @@ - /** - * backup register - */ -+#if defined(_ABI64) && _MIPS_SIM == _ABI64 - #define BACKUP_REG \ - double __attribute__((aligned(16))) __back_temp[8]; \ -- if (_MIPS_SIM == _ABI64) \ - __asm__ volatile ( \ - "gssqc1 $f25, $f24, 0x00(%[temp]) \n\t" \ - "gssqc1 $f27, $f26, 0x10(%[temp]) \n\t" \ -@@ -299,8 +299,10 @@ - : \ - : [temp]"r"(__back_temp) \ - : "memory" \ -- ); \ -- else \ -+ ); -+#else -+#define BACKUP_REG \ -+ double __attribute__((aligned(16))) __back_temp[8]; \ - __asm__ volatile ( \ - "gssqc1 $f22, $f20, 0x00(%[temp]) \n\t" \ - "gssqc1 $f26, $f24, 0x10(%[temp]) \n\t" \ -@@ -309,12 +311,13 @@ - : [temp]"r"(__back_temp) \ - : "memory" \ - ); -+#endif - - /** - * recover register - */ -+#if defined(_ABI64) && _MIPS_SIM == _ABI64 - #define RECOVER_REG \ -- if (_MIPS_SIM == _ABI64) \ - __asm__ volatile ( \ - "gslqc1 $f25, $f24, 0x00(%[temp]) \n\t" \ - "gslqc1 $f27, $f26, 0x10(%[temp]) \n\t" \ -@@ -323,8 +326,9 @@ - : \ - : [temp]"r"(__back_temp) \ - : "memory" \ -- ); \ -- else \ -+ ); -+#else -+#define RECOVER_REG \ - __asm__ volatile ( \ - "gslqc1 $f22, $f20, 0x00(%[temp]) \n\t" \ - "gslqc1 $f26, $f24, 0x10(%[temp]) \n\t" \ -@@ -333,6 +337,7 @@ - : [temp]"r"(__back_temp) \ - : "memory" \ - ); -+#endif - - # define OK 1 - # define NOTOK 0 --- -2.30.2 - diff --git a/package/libopenh264/libopenh264.hash b/package/libopenh264/libopenh264.hash index 0689ab961f..712425a024 100644 --- a/package/libopenh264/libopenh264.hash +++ b/package/libopenh264/libopenh264.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 af173e90fce65f80722fa894e1af0d6b07572292e76de7b65273df4c0a8be678 libopenh264-2.1.1.tar.gz +sha256 e4e5c8ba48e64ba6ce61e8b6e2b76b2d870c74c270147649082feabb40f25905 libopenh264-2.2.0.tar.gz sha256 dd5c1c9668512530fa5a96e4c29ac4033d70a7eeb0eed7a42fddb6dd794ebdbb LICENSE diff --git a/package/libopenh264/libopenh264.mk b/package/libopenh264/libopenh264.mk index 0c17579979..ea41f72661 100644 --- a/package/libopenh264/libopenh264.mk +++ b/package/libopenh264/libopenh264.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENH264_VERSION = 2.1.1 +LIBOPENH264_VERSION = 2.2.0 LIBOPENH264_SITE = $(call github,cisco,openh264,v$(LIBOPENH264_VERSION)) LIBOPENH264_LICENSE = BSD-2-Clause LIBOPENH264_LICENSE_FILES = LICENSE -- 2.34.1 From thomas.petazzoni at bootlin.com Sun Feb 6 10:20:15 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 11:20:15 +0100 Subject: [Buildroot] [git commit] package/trace-cmd: use snapshot tarball Message-ID: <20220206101337.A1485825B9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=48f6ff227984612ddf0fb27222b59e50a11d20c9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Use snapshot tarball so TRACE_CMD_VERSION will match what is returned by https://release-monitoring.org Signed-off-by: Fabrice Fontaine Reviewed-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/trace-cmd/trace-cmd.hash | 2 +- package/trace-cmd/trace-cmd.mk | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/trace-cmd/trace-cmd.hash b/package/trace-cmd/trace-cmd.hash index 1f34a0da60..00cecc7828 100644 --- a/package/trace-cmd/trace-cmd.hash +++ b/package/trace-cmd/trace-cmd.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 9401a43bda4837dfde5e64e0dbe5d3918bf50eb86b4d23fa89713b0f2defcbc1 trace-cmd-trace-cmd-v2.9.6-br1.tar.gz +sha256 45924a763376a700221f64b4034f87263e4038ec88b120a0abfb5743d051d068 trace-cmd-v2.9.6.tar.gz sha256 b1d04b850c1c7471b0f0896f6c6f0fcfc9f07e2dd183a5f5826af269fe9e88fb COPYING sha256 70f297763149e72306919c924e164f83041d5e512868d4c8c1826c171b3e49f9 COPYING.LIB sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 LICENSES/GPL-2.0 diff --git a/package/trace-cmd/trace-cmd.mk b/package/trace-cmd/trace-cmd.mk index a592b1f027..d9ed417f20 100644 --- a/package/trace-cmd/trace-cmd.mk +++ b/package/trace-cmd/trace-cmd.mk @@ -4,9 +4,10 @@ # ################################################################################ -TRACE_CMD_VERSION = trace-cmd-v2.9.6 -TRACE_CMD_SITE = https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git -TRACE_CMD_SITE_METHOD = git +TRACE_CMD_VERSION = 2.9.6 +TRACE_CMD_SOURCE = trace-cmd-v$(TRACE_CMD_VERSION).tar.gz +TRACE_CMD_SITE = \ + https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot TRACE_CMD_LICENSE = GPL-2.0, LGPL-2.1 TRACE_CMD_LICENSE_FILES = COPYING COPYING.LIB LICENSES/GPL-2.0 LICENSES/LGPL-2.1 From thomas.petazzoni at bootlin.com Sun Feb 6 10:21:38 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 11:21:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/trace-cmd: use snapshot tarball In-Reply-To: <20220203223615.729285-1-fontaine.fabrice@gmail.com> References: <20220203223615.729285-1-fontaine.fabrice@gmail.com> Message-ID: <20220206112138.77563a44@windsurf> On Thu, 3 Feb 2022 23:36:15 +0100 Fabrice Fontaine wrote: > Use snapshot tarball so TRACE_CMD_VERSION will match what is returned by > https://release-monitoring.org > > Signed-off-by: Fabrice Fontaine > --- > package/trace-cmd/trace-cmd.hash | 2 +- > package/trace-cmd/trace-cmd.mk | 7 ++++--- > 2 files changed, 5 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 6 10:21:10 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 11:21:10 +0100 Subject: [Buildroot] [git commit] package/speexdsp: use snapshot tarball Message-ID: <20220206101631.ACBEC8267F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=550ab032881e1aacde344c575f1fce586d9ce243 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Use snapshot tarball so SPEEXDSP_VERSION will match what is returned by https://release-monitoring.org Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/speexdsp/speexdsp.hash | 2 +- package/speexdsp/speexdsp.mk | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/speexdsp/speexdsp.hash b/package/speexdsp/speexdsp.hash index fd9870dc58..82e054d4d4 100644 --- a/package/speexdsp/speexdsp.hash +++ b/package/speexdsp/speexdsp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c92c7e428cb5ca11b4e6f13118ff288332f330b6fefc93cb39bf7b43b13cb1f7 speexdsp-SpeexDSP-1.2.0-br1.tar.gz +sha256 0fe0e31be215f820bed0f9c913c673997773fce3a03a4555658e7b73a54eed7b speexdsp-SpeexDSP-1.2.0.tar.bz2 sha256 671bb5d8fd3c6b05a2e831d90f978ac27965c92bd8ea6d16b3df76e3440c0e9f COPYING diff --git a/package/speexdsp/speexdsp.mk b/package/speexdsp/speexdsp.mk index 35c06dd833..8e886b2b21 100644 --- a/package/speexdsp/speexdsp.mk +++ b/package/speexdsp/speexdsp.mk @@ -4,9 +4,9 @@ # ################################################################################ -SPEEXDSP_VERSION = SpeexDSP-1.2.0 -SPEEXDSP_SITE = https://gitlab.xiph.org/xiph/speexdsp.git -SPEEXDSP_SITE_METHOD = git +SPEEXDSP_VERSION = 1.2.0 +SPEEXDSP_SOURCE = speexdsp-SpeexDSP-$(SPEEXDSP_VERSION).tar.bz2 +SPEEXDSP_SITE = https://gitlab.xiph.org/xiph/speexdsp/-/archive/SpeexDSP-$(SPEEXDSP_VERSION) SPEEXDSP_LICENSE = BSD-3-Clause SPEEXDSP_LICENSE_FILES = COPYING SPEEXDSP_INSTALL_STAGING = YES From thomas.petazzoni at bootlin.com Sun Feb 6 10:24:05 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 11:24:05 +0100 Subject: [Buildroot] [git commit] package/netcat-openbsd: bump to version 1.218 Message-ID: <20220206101652.9A5648267F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3d24fb7e7b013e6cbbac91abe7c45ca9ed788756 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Use official tarball so NETCAT_OPENBSD_VERSION will match what is returned by https://release-monitoring.org - Use netcat.c as the license file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/netcat-openbsd/netcat-openbsd.hash | 9 ++++++--- package/netcat-openbsd/netcat-openbsd.mk | 9 +++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/package/netcat-openbsd/netcat-openbsd.hash b/package/netcat-openbsd/netcat-openbsd.hash index b70cae8860..e55dea53e7 100644 --- a/package/netcat-openbsd/netcat-openbsd.hash +++ b/package/netcat-openbsd/netcat-openbsd.hash @@ -1,3 +1,6 @@ -# Locally calculated -sha256 55e578f652cbf6ffc95f75ea3e2645ab335fab63649568bd7cdb0a6331ca87de netcat-openbsd-debian_1.195-2-br1.tar.gz -sha256 e2e86d58c38f044a49f51e45515747585db58a2305419c73323eaad88fcaef5c debian/copyright +# From http://snapshot.debian.org/archive/debian/20211206T030211Z/pool/main/n/netcat-openbsd/netcat-openbsd_1.218-3.dsc +sha256 a28a5d39abaf481747b1e78b4b50e96d0cdab0ffef289cba156dc11941c64857 netcat-openbsd_1.218.orig.tar.gz +sha256 19229ebc825d12cd805843228c498cc881dcef127a9d680fcfbd8cb2da966161 netcat-openbsd_1.218-3.debian.tar.xz + +# Hash for license file +sha256 acfd1d822ee2e8e0b196c7a369383d0cb9bc131b56c3c95976a32498728fe1e3 netcat.c diff --git a/package/netcat-openbsd/netcat-openbsd.mk b/package/netcat-openbsd/netcat-openbsd.mk index a2333531c0..311f8aa819 100644 --- a/package/netcat-openbsd/netcat-openbsd.mk +++ b/package/netcat-openbsd/netcat-openbsd.mk @@ -4,11 +4,12 @@ # ################################################################################ -NETCAT_OPENBSD_VERSION = debian/1.195-2 -NETCAT_OPENBSD_SITE = https://salsa.debian.org/debian/netcat-openbsd.git -NETCAT_OPENBSD_SITE_METHOD = git +NETCAT_OPENBSD_VERSION = 1.218 +NETCAT_OPENBSD_SOURCE = netcat-openbsd_$(NETCAT_OPENBSD_VERSION).orig.tar.gz +NETCAT_OPENBSD_PATCH = netcat-openbsd_$(NETCAT_OPENBSD_VERSION)-3.debian.tar.xz +NETCAT_OPENBSD_SITE = http://snapshot.debian.org/archive/debian/20211206T030211Z/pool/main/n/netcat-openbsd NETCAT_OPENBSD_LICENSE = BSD-3-Clause -NETCAT_OPENBSD_LICENSE_FILES = debian/copyright +NETCAT_OPENBSD_LICENSE_FILES = netcat.c NETCAT_OPENBSD_DEPENDENCIES = host-pkgconf libbsd define NETCAT_OPENBSD_APPLY_DEBIAN_PATCHES From thomas.petazzoni at bootlin.com Sun Feb 6 10:24:13 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 11:24:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/netcat-openbsd: bump to version 1.218 In-Reply-To: <20220203231432.748145-1-fontaine.fabrice@gmail.com> References: <20220203231432.748145-1-fontaine.fabrice@gmail.com> Message-ID: <20220206112413.628ee1b1@windsurf> On Fri, 4 Feb 2022 00:14:32 +0100 Fabrice Fontaine wrote: > - Use official tarball so NETCAT_OPENBSD_VERSION will match what is > returned by https://release-monitoring.org > - Use netcat.c as the license file > > Signed-off-by: Fabrice Fontaine > --- > package/netcat-openbsd/netcat-openbsd.hash | 9 ++++++--- > package/netcat-openbsd/netcat-openbsd.mk | 9 +++++---- > 2 files changed, 11 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 Sun Feb 6 10:24:43 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 11:24:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/speexdsp: use snapshot tarball In-Reply-To: <20220203224709.736830-1-fontaine.fabrice@gmail.com> References: <20220203224709.736830-1-fontaine.fabrice@gmail.com> Message-ID: <20220206112443.3c6d0b93@windsurf> On Thu, 3 Feb 2022 23:47:09 +0100 Fabrice Fontaine wrote: > Use snapshot tarball so SPEEXDSP_VERSION will match what is returned by > https://release-monitoring.org > > Signed-off-by: Fabrice Fontaine > --- > package/speexdsp/speexdsp.hash | 2 +- > package/speexdsp/speexdsp.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 thomas.petazzoni at bootlin.com Sun Feb 6 10:26:04 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 11:26:04 +0100 Subject: [Buildroot] [git commit] package/libcamera: fix uclibc/musl compile with libexecinfo enabled Message-ID: <20220206101852.01D3A8267F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0ca3b660f4d75f1746508fc7cdee74daa14250a1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - 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 Signed-off-by: Thomas Petazzoni --- package/libcamera/libcamera.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/libcamera/libcamera.mk b/package/libcamera/libcamera.mk index 524cf07e03..534d8d2637 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 = $(TARGET_LDFLAGS) -lexecinfo +endif + $(eval $(meson-package)) From thomas.petazzoni at bootlin.com Sun Feb 6 10:26:13 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 11:26:13 +0100 Subject: [Buildroot] [PATCH v2] package/libcamera: fix uclibc/musl compile with libexecinfo enabled In-Reply-To: <20220203232321.26733-1-ps.report@gmx.net> References: <20220203232321.26733-1-ps.report@gmx.net> Message-ID: <20220206112613.2df5a08b@windsurf> On Fri, 4 Feb 2022 00:23:21 +0100 Peter Seiderer wrote: > - 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 > --- > Changes v1 -> v2: > - preserver original TARGET_LDFLAGS while setting LIBCAMERA_LDFLAGS > --- > package/libcamera/libcamera.mk | 5 +++++ > 1 file changed, 5 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 6 10:27:27 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 11:27:27 +0100 Subject: [Buildroot] [git commit] package/libuhttpd: needs MMU Message-ID: <20220206102014.745438276A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6647ee8ee6e35a17f9154ece4903b09fb5a3014c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Signed-off-by: Thomas Petazzoni --- 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 From thomas.petazzoni at bootlin.com Sun Feb 6 10:27:35 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 11:27:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/libuhttpd: needs MMU In-Reply-To: <20220131220841.127708-1-fontaine.fabrice@gmail.com> References: <20220131220841.127708-1-fontaine.fabrice@gmail.com> Message-ID: <20220206112735.1ed394dc@windsurf> On Mon, 31 Jan 2022 23:08:41 +0100 Fabrice Fontaine wrote: > 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(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From peter at korsgaard.com Sun Feb 6 10:29:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 11:29:55 +0100 Subject: [Buildroot] [PATCH] package/gnuradio: simplify pyver logic Message-ID: <20220206102956.15291-1-peter@korsgaard.com> Gnuradio only works with python3 since commit 786c783f3796 (package/python-numpy: bump to version 1.18.2), so the python2/3 logic for _PYVER can be dropped. Signed-off-by: Peter Korsgaard --- package/gnuradio/gnuradio.mk | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index 658357398d..417a51e067 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -11,13 +11,6 @@ GNURADIO_LICENSE_FILES = COPYING GNURADIO_SUPPORTS_IN_SOURCE_BUILD = NO -# needed to determine site-packages path -ifeq ($(BR2_PACKAGE_PYTHON),y) -GNURADIO_PYVER = $(PYTHON_VERSION_MAJOR) -else ifeq ($(BR2_PACKAGE_PYTHON3),y) -GNURADIO_PYVER = $(PYTHON3_VERSION_MAJOR) -endif - # host-python-mako and host-python-six are needed for volk to compile GNURADIO_DEPENDENCIES = \ host-python3 \ @@ -125,7 +118,7 @@ GNURADIO_CONF_OPTS += -DENABLE_PYTHON=ON # mandatory to install python modules in site-packages and to use # correct path for python libraries GNURADIO_CONF_OPTS += -DGR_PYTHON_RELATIVE=ON \ - -DGR_PYTHON_DIR=lib/python$(GNURADIO_PYVER)/site-packages + -DGR_PYTHON_DIR=lib/python$(PYTHON3_VERSION_MAJOR)/site-packages else GNURADIO_CONF_OPTS += -DENABLE_PYTHON=OFF endif -- 2.20.1 From giulio.benetti at benettiengineering.com Sun Feb 6 10:37:33 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 11:37:33 +0100 Subject: [Buildroot] [PATCH] package/systemd: don't treat ld warnings as errors Message-ID: <20220206103733.1580146-1-giulio.benetti@benettiengineering.com> Nios2 ld emits warnings like: ' /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/nios2-linux-gnu/7.3.1/../../../../nios2-linux-gnu/bin/ld: FDE encoding in /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/nios2-linux-gnu/7.3.1/libgcc.a(_umoddi3.o)(.eh_frame) prevents .eh_frame_hdr table being created. ' Since '-Wl,--fatal-warnings' is passed by default, build fails, so don't treat warnings as errors by appending "-Wl,--no-fatal-warnings" to SYSTEMD_LDFLAGS the same way I've done for Microblaze in commit: https://git.buildroot.net/buildroot/commit/?id=cc53d5357d84ff9b78d76e45ce216061df8a37c1 Fixes: http://autobuild.buildroot.net/results/5fc884e11e46ab165ea21c8e8f2901516d79ff80/ Signed-off-by: Giulio Benetti --- package/systemd/systemd.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 5626b54e8e..0f7da5cb28 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -90,6 +90,11 @@ SYSTEMD_CONF_OPTS += \ -Dumount-path=/usr/bin/umount \ -Dutmp=false +ifeq ($(BR2_nios),y) +# Nios2 ld emits warnings, make warnings not to be treated as errors +SYSTEMD_LDFLAGS = $(TARGET_LDFLAGS) -Wl,--no-fatal-warnings +endif + ifeq ($(BR2_PACKAGE_ACL),y) SYSTEMD_DEPENDENCIES += acl SYSTEMD_CONF_OPTS += -Dacl=true -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 6 10:39:09 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 11:39:09 +0100 Subject: [Buildroot] [PATCH] package/systemd: don't treat ld warnings as errors In-Reply-To: <20220206103733.1580146-1-giulio.benetti@benettiengineering.com> References: <20220206103733.1580146-1-giulio.benetti@benettiengineering.com> Message-ID: <4271dc4d-6096-4f9a-11d3-125f1cd5ea2d@benettiengineering.com> On 06/02/22 11:37, Giulio Benetti wrote: > Nios2 ld emits warnings like: > ' > /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/nios2-linux-gnu/7.3.1/../../../../nios2-linux-gnu/bin/ld: FDE encoding in /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/nios2-linux-gnu/7.3.1/libgcc.a(_umoddi3.o)(.eh_frame) prevents .eh_frame_hdr table being created. > ' > Since '-Wl,--fatal-warnings' is passed by default, build fails, so don't > treat warnings as errors by appending "-Wl,--no-fatal-warnings" to > SYSTEMD_LDFLAGS the same way I've done for Microblaze in commit: > https://git.buildroot.net/buildroot/commit/?id=cc53d5357d84ff9b78d76e45ce216061df8a37c1 > > Fixes: > http://autobuild.buildroot.net/results/5fc884e11e46ab165ea21c8e8f2901516d79ff80/ > > Signed-off-by: Giulio Benetti > --- > package/systemd/systemd.mk | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > index 5626b54e8e..0f7da5cb28 100644 > --- a/package/systemd/systemd.mk > +++ b/package/systemd/systemd.mk > @@ -90,6 +90,11 @@ SYSTEMD_CONF_OPTS += \ > -Dumount-path=/usr/bin/umount \ > -Dutmp=false > > +ifeq ($(BR2_nios),y) s/BR2_nios/BR2_nios2, I send a V2, please reject this patch Sorry for the noise -- Giulio Benetti Benetti Engineering sas > +# Nios2 ld emits warnings, make warnings not to be treated as errors > +SYSTEMD_LDFLAGS = $(TARGET_LDFLAGS) -Wl,--no-fatal-warnings > +endif > + > ifeq ($(BR2_PACKAGE_ACL),y) > SYSTEMD_DEPENDENCIES += acl > SYSTEMD_CONF_OPTS += -Dacl=true From giulio.benetti at benettiengineering.com Sun Feb 6 10:41:20 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 11:41:20 +0100 Subject: [Buildroot] [PATCH v2] package/systemd: don't treat ld warnings as errors Message-ID: <20220206104120.1580819-1-giulio.benetti@benettiengineering.com> Nios2 ld emits warnings like: ' /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/nios2-linux-gnu/7.3.1/../../../../nios2-linux-gnu/bin/ld: FDE encoding in /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/nios2-linux-gnu/7.3.1/libgcc.a(_umoddi3.o)(.eh_frame) prevents .eh_frame_hdr table being created. ' Since '-Wl,--fatal-warnings' is passed by default, build fails, so don't treat warnings as errors by appending "-Wl,--no-fatal-warnings" to SYSTEMD_LDFLAGS the same way I've done for Microblaze in commit: https://git.buildroot.net/buildroot/commit/?id=cc53d5357d84ff9b78d76e45ce216061df8a37c1 Fixes: http://autobuild.buildroot.net/results/5fc884e11e46ab165ea21c8e8f2901516d79ff80/ Signed-off-by: Giulio Benetti --- V1->V2: * renamed BR2_nios to BR2_nios2 --- package/systemd/systemd.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 5626b54e8e..b07fac27d4 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -90,6 +90,11 @@ SYSTEMD_CONF_OPTS += \ -Dumount-path=/usr/bin/umount \ -Dutmp=false +ifeq ($(BR2_nios2),y) +# Nios2 ld emits warnings, make warnings not to be treated as errors +SYSTEMD_LDFLAGS = $(TARGET_LDFLAGS) -Wl,--no-fatal-warnings +endif + ifeq ($(BR2_PACKAGE_ACL),y) SYSTEMD_DEPENDENCIES += acl SYSTEMD_CONF_OPTS += -Dacl=true -- 2.25.1 From thomas.petazzoni at bootlin.com Sun Feb 6 10:40:17 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 11:40:17 +0100 Subject: [Buildroot] [git commit] package/cgilua: add CGILUA_CPE_ID_VENDOR Message-ID: <20220206103431.DA8FA82BBB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=755116460b8de88cb833ab4bf37649a7fb26728d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Signed-off-by: Thomas Petazzoni --- 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)) From thomas.petazzoni at bootlin.com Sun Feb 6 10:42:22 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 11:42:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/cgilua: add CGILUA_CPE_ID_VENDOR In-Reply-To: <20220131220240.127249-1-fontaine.fabrice@gmail.com> References: <20220131220240.127249-1-fontaine.fabrice@gmail.com> Message-ID: <20220206114222.5205b420@windsurf> On Mon, 31 Jan 2022 23:02:40 +0100 Fabrice Fontaine wrote: > 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(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 6 10:46:36 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 11:46:36 +0100 Subject: [Buildroot] [git commit] configs/orangepi_zero_plus2: update Linux/U-Boot versions Message-ID: <20220206103935.0500782BBB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3934db55727af394d09c5b9808d1ccde77f1dce6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Signed-off-by: Thomas Petazzoni --- 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 From thomas.petazzoni at bootlin.com Sun Feb 6 10:46:07 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 11:46:07 +0100 Subject: [Buildroot] [git commit] board/orangepi/orangepi-zero-plus2: fix build after genimage update Message-ID: <20220206103934.F242A82B9A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0f72e01e055f79e84e876dd01c03f29abdbd531b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478371 Signed-off-by: Sergey Matyukevich Signed-off-by: Thomas Petazzoni --- 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 } From thomas.petazzoni at bootlin.com Sun Feb 6 10:47:47 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 11:47:47 +0100 Subject: [Buildroot] [PATCH 1/2] board/orangepi/orangepi-zero-plus2: fix build after genimage update In-Reply-To: <20220131212456.3176156-1-geomatsi@gmail.com> References: <20220131212456.3176156-1-geomatsi@gmail.com> Message-ID: <20220206114747.4b02f9d7@windsurf> On Tue, 1 Feb 2022 00:24:55 +0300 Sergey Matyukevich wrote: > 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(-) Both applied, thanks! In the commit log of the first patch, I've added a reference to the Gitlab CI failure that the patch is fixing, as suggested by Giulio. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 6 10:50:06 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 11:50:06 +0100 Subject: [Buildroot] [PATCH v2 5/6] configs/microchip_sama7g5ek_mmc_defconfig: add missing BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15 and host openssl for linux In-Reply-To: <20220201230414.4144930-6-giulio.benetti@benettiengineering.com> References: <20220201230414.4144930-1-giulio.benetti@benettiengineering.com> <20220201230414.4144930-6-giulio.benetti@benettiengineering.com> Message-ID: <20220206115006.4619d1fc@windsurf> On Wed, 2 Feb 2022 00:04:13 +0100 Giulio Benetti wrote: > Fixes: > https://gitlab.com/ymorin/buildroot/-/jobs/2035821098 > > Signed-off-by: Giulio Benetti > --- > V1->V2: > * add host openssl linux > --- > configs/microchip_sama7g5ek_mmc_defconfig | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/configs/microchip_sama7g5ek_mmc_defconfig b/configs/microchip_sama7g5ek_mmc_defconfig > index b1cd193829..df48c0880b 100644 > --- a/configs/microchip_sama7g5ek_mmc_defconfig > +++ b/configs/microchip_sama7g5ek_mmc_defconfig > @@ -1,12 +1,14 @@ > BR2_arm=y > BR2_cortex_a7=y > BR2_ARM_FPU_NEON_VFPV4=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y This will continue to break: the big problem in this defconfig is that the kernel version is not defined as a fixed version. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 6 10:50:41 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 11:50:41 +0100 Subject: [Buildroot] [PATCH v2 6/6] configs/microchip_sama7g5ek_mmc_dev_defconfig: add missing BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15 and host openssl for linux In-Reply-To: <20220201230414.4144930-7-giulio.benetti@benettiengineering.com> References: <20220201230414.4144930-1-giulio.benetti@benettiengineering.com> <20220201230414.4144930-7-giulio.benetti@benettiengineering.com> Message-ID: <20220206115041.58101a3a@windsurf> On Wed, 2 Feb 2022 00:04:14 +0100 Giulio Benetti wrote: > Fixes: > https://gitlab.com/ymorin/buildroot/-/jobs/2035821100 > > Signed-off-by: Giulio Benetti > --- > V1->V2: > * add host openssl linux > --- > configs/microchip_sama7g5ek_mmc_dev_defconfig | 2 ++ > 1 file changed, 2 insertions(+) Same problem as PATCH 5/6: the kernel version should be defined as a fixed version. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 6 10:51:20 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 11:51:20 +0100 Subject: [Buildroot] [git commit] configs/beaglev: linux needs host openssl Message-ID: <20220206104417.8A4D282BBB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a8c0a1c6a0a771eab65f27fc4ed3f76c43334ef8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: https://gitlab.com/ymorin/buildroot/-/jobs/2035820979 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- configs/beaglev_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/beaglev_defconfig b/configs/beaglev_defconfig index 70459bf3e8..79af8c2ece 100644 --- a/configs/beaglev_defconfig +++ b/configs/beaglev_defconfig @@ -16,6 +16,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="starlight" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="starfive/jh7100-beaglev-starlight" 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_TAR is not set From thomas.petazzoni at bootlin.com Sun Feb 6 10:51:25 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 11:51:25 +0100 Subject: [Buildroot] [git commit] configs/microchip_sama5d2_icp_mmc_dev: linux needs host openssl Message-ID: <20220206104417.9A5B582B9A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e3375bfdb2ee26d30019bee66e6d4f21fe8801de branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: https://gitlab.com/ymorin/buildroot/-/jobs/2035821096 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- 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..27d1d3409d 100644 --- a/configs/microchip_sama5d2_icp_mmc_dev_defconfig +++ b/configs/microchip_sama5d2_icp_mmc_dev_defconfig @@ -16,6 +16,7 @@ BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,li BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d2_icp" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_LINUX_TOOLS_IIO=y BR2_PACKAGE_BZIP2=y BR2_PACKAGE_XZ=y From thomas.petazzoni at bootlin.com Sun Feb 6 10:51:22 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 11:51:22 +0100 Subject: [Buildroot] [git commit] configs/microchip_sama5d2_icp_mmc: linux needs host openssl Message-ID: <20220206104417.91F0782BBF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2a35673c80cc64eed9e06b0fe4cb579ae70abcfd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: https://gitlab.com/ymorin/buildroot/-/jobs/2035821094 Signed-off-by: Giulio Benetti Reviewed-by: Michael Trimarchi Signed-off-by: Thomas Petazzoni --- 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..27ea4970f1 100644 --- a/configs/microchip_sama5d2_icp_mmc_defconfig +++ b/configs/microchip_sama5d2_icp_mmc_defconfig @@ -12,6 +12,7 @@ BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,li BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d2_icp" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" From thomas.petazzoni at bootlin.com Sun Feb 6 10:51:17 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 11:51:17 +0100 Subject: [Buildroot] [git commit] configs/bananapi_m2_ultra: u-boot needs host python3 and host openssl Message-ID: <20220206104417.81ED182B9A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=490438f437b2a603204aa6ae9cbf3875c262f976 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: https://gitlab.com/ymorin/buildroot/-/jobs/2035820967 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- configs/bananapi_m2_ultra_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/bananapi_m2_ultra_defconfig b/configs/bananapi_m2_ultra_defconfig index 67ecec424c..2ec0e60e8d 100644 --- a/configs/bananapi_m2_ultra_defconfig +++ b/configs/bananapi_m2_ultra_defconfig @@ -19,7 +19,9 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="bananapi_m2_berry" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" BR2_PACKAGE_HOST_DOSFSTOOLS=y From thomas.petazzoni at bootlin.com Sun Feb 6 10:51:56 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 11:51:56 +0100 Subject: [Buildroot] [PATCH v2 0/6] Fix gitlab CI build failure due to missing HOST_ dependencies In-Reply-To: <20220201230414.4144930-1-giulio.benetti@benettiengineering.com> References: <20220201230414.4144930-1-giulio.benetti@benettiengineering.com> Message-ID: <20220206115156.6042cc1b@windsurf> On Wed, 2 Feb 2022 00:04:08 +0100 Giulio Benetti wrote: > configs/bananapi_m2_ultra_defconfig: u-boot needs host python3 and > host openssl > configs/beaglev_defconfig: linux needs host openssl > configs/microchip_sama5d2_icp_mmc_defconfig: linux needs host openssl > configs/microchip_sama5d2_icp_mmc_dev_defconfig: linux needs host > openssl These four are applied. > configs/microchip_sama7g5ek_mmc_defconfig: add missing > BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15 and host openssl for > linux > configs/microchip_sama7g5ek_mmc_dev_defconfig: add missing > BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15 and host openssl for > linux These two have issues, marked 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 Sun Feb 6 10:52:58 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 11:52:58 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: add guile and bdwgc packages to Pedro Aguilar Message-ID: <20220206104547.A013182984@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=437543c7d907943a159870a4b04efa88e36cc460 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Pedro Aguilar Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index a1ec9a091e..c52cb35b60 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2198,6 +2198,8 @@ F: package/lightning/ F: package/umtprd/ N: Pedro Aguilar +F: package/bdwgc/ +F: package/guile/ F: package/libunistring/ N: Peter Korsgaard From thomas.petazzoni at bootlin.com Sun Feb 6 10:54:09 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 11:54:09 +0100 Subject: [Buildroot] [PATCH v1] DEVELOPERS: Add packages guile and bdwgc to Pedro Aguilar In-Reply-To: <20220206092048.1901703-1-paguilar@paguilar.org> References: <20220206092048.1901703-1-paguilar@paguilar.org> Message-ID: <20220206115409.1f1174ee@windsurf> On Sun, 6 Feb 2022 10:20:48 +0100 Pedro Aguilar wrote: > Signed-off-by: Pedro Aguilar > --- > DEVELOPERS | 2 ++ > 1 file changed, 2 insertions(+) Applied to master after fixing the patch to sort package entries alphabetically. Thanks a lot for volunteering to look after those packages! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From arnout at mind.be Sun Feb 6 10:55:16 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 6 Feb 2022 11:55:16 +0100 Subject: [Buildroot] [PATCHv2] package/glibc: allow runing on kernels older than used for the headers In-Reply-To: <19291_1643809720_61FA8BB8_19291_487_24_41ca9ce22939ce2ed0c41973db7d612542850824.1643809712.git.yann.morin@orange.com> References: <19291_1643809720_61FA8BB8_19291_487_24_41ca9ce22939ce2ed0c41973db7d612542850824.1643809712.git.yann.morin@orange.com> Message-ID: <5f1e37b9-7346-2031-60bf-fa96d9a6e72d@mind.be> On 02/02/2022 14:48, yann.morin at orange.com wrote: > From: "Yann E. MORIN" > > Currently, we configure glibc to not add compatibility support for > kernels older than the one used for the headers. This is on the > expectation that the system will never run on a kernel that is older > than the one used for the headers or, when Buildroot builds the kernel, > on another, older kernel. > > However, in some situations, it is possible to build for a generic > system, where the kernel may be a different version. This can be the > case, for example, when Building an image that is to be used in a > container that can run on a range of machines each with different kernel > versions. In such a case, it is interesting to build glibc in a way as > to take better advantage of the newer kernels, and thus using newer > kernel headers, while still allowing running on older kernels, and thus > carrying more compatibility code. > > We add an option to glibc to allow the user to enable compatibility > shims. To simplify the case, when that option is enabled, we just let > glibc enable as old compatibility shims as supported by the current > architecture. > > The code size increase is very small. For an ARM Cortex-A7, with > gcc-10.3.0, the delta is as follows (other files installed by glibc had > no size delta; sizes in bytes): > file | no compat | compat | delta > ----------------------+-----------+-----------+------- > ld-linux-armhf.so.3 | 200216 | 200284 | + 68 > libc.so.6 | 1814496 | 1823120 | +8624 > ------+------- > Total | +8692 > > No runtime overhead has been measured; the overhead is most probably > in the measurement noise. Indeed, the compatibility shims are very > lightweight. For example, there are 9 arch-generic shims: > renameat2(), execveat(), mlock2(), statx(), faccessat2(), > close_range(), time64-related syscall shenanigans, a waitid() > feature, and a futex operation (LOCK_PI2) > and then each arch may define a few others. i386 has less than 20 > (mostly related to socket options, and one for the ordering of the > clone() arguments), while ARM seems to have only two (mlock2() and a > configurable futex feature). > > Note: however, as Arnout pointed out, some programs may still actually > fail to run even with such compatibility shim, if they really expect the > shimed syscalls to really exist and have no fallback (and/or no proper > error-handling). Still, in the vast majority of cases, those > compatibility shims are enough to have a system running. > > Signed-off-by: Yann E. MORIN > Cc: Alexey Brodkin > Cc: Arnout Vandecappelle Applied to master, thanks. Regards, Arnout > > --- > Changes v1 -> v2: > - don't let user provide a version, enable all compat shims (Arnout, > Alexey) > - add size measurements and explanations about no runtime overhead > measurements (Arnout) > --- > package/glibc/Config.in | 12 ++++++++++++ > package/glibc/glibc.mk | 8 ++++++-- > 2 files changed, 18 insertions(+), 2 deletions(-) > > diff --git a/package/glibc/Config.in b/package/glibc/Config.in > index 5ecd058145..8e9ddac7d9 100644 > --- a/package/glibc/Config.in > +++ b/package/glibc/Config.in > @@ -10,6 +10,18 @@ config BR2_PACKAGE_GLIBC > help > https://www.gnu.org/software/libc/ > > +config BR2_PACKAGE_GLIBC_KERNEL_COMPAT > + bool "Enable compatibiltiy shims to run on older kernels" > + help > + Say 'y' here if you plan on running your system on a kernel > + older than the version used for the toolchain headers. > + > + Enabling those compatibility shims may generate a slightly > + bigger and slightly slower glibc library. > + > + The oldest supported kernel version depends on the > + architecture. > + > config BR2_PACKAGE_GLIBC_UTILS > bool "Install glibc utilities" > help > diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk > index 5c26b0e6df..9ea9f27a2f 100644 > --- a/package/glibc/glibc.mk > +++ b/package/glibc/glibc.mk > @@ -98,6 +98,10 @@ endif > GLIBC_MAKE = $(BR2_MAKE) > GLIBC_CONF_ENV += ac_cv_prog_MAKE="$(BR2_MAKE)" > > +ifeq ($(BR2_PACKAGE_GLIBC_KERNEL_COMPAT),) > +GLIBC_CONF_OPTS += --enable-kernel=$(call qstrip,$(BR2_TOOLCHAIN_HEADERS_AT_LEAST)) > +endif > + > # Even though we use the autotools-package infrastructure, we have to > # override the default configure commands for several reasons: > # > @@ -128,8 +132,8 @@ define GLIBC_CONFIGURE_CMDS > --disable-profile \ > --disable-werror \ > --without-gd \ > - --enable-kernel=$(call qstrip,$(BR2_TOOLCHAIN_HEADERS_AT_LEAST)) \ > - --with-headers=$(STAGING_DIR)/usr/include) > + --with-headers=$(STAGING_DIR)/usr/include \ > + $(GLIBC_CONF_OPTS)) > $(GLIBC_ADD_MISSING_STUB_H) > endef > From arnout at mind.be Sun Feb 6 10:55:31 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 6 Feb 2022 11:55:31 +0100 Subject: [Buildroot] [git commit] package/glibc: allow runing on kernels older than used for the headers Message-ID: <20220206104826.7668281DF5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=525ffc2bb17fa11fc128124d2d3a92d8698eaab8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Currently, we configure glibc to not add compatibility support for kernels older than the one used for the headers. This is on the expectation that the system will never run on a kernel that is older than the one used for the headers or, when Buildroot builds the kernel, on another, older kernel. However, in some situations, it is possible to build for a generic system, where the kernel may be a different version. This can be the case, for example, when Building an image that is to be used in a container that can run on a range of machines each with different kernel versions. In such a case, it is interesting to build glibc in a way as to take better advantage of the newer kernels, and thus using newer kernel headers, while still allowing running on older kernels, and thus carrying more compatibility code. We add an option to glibc to allow the user to enable compatibility shims. To simplify the case, when that option is enabled, we just let glibc enable as old compatibility shims as supported by the current architecture. The code size increase is very small. For an ARM Cortex-A7, with gcc-10.3.0, the delta is as follows (other files installed by glibc had no size delta; sizes in bytes): file | no compat | compat | delta ----------------------+-----------+-----------+------- ld-linux-armhf.so.3 | 200216 | 200284 | + 68 libc.so.6 | 1814496 | 1823120 | +8624 ------+------- Total | +8692 No runtime overhead has been measured; the overhead is most probably in the measurement noise. Indeed, the compatibility shims are very lightweight. For example, there are 9 arch-generic shims: renameat2(), execveat(), mlock2(), statx(), faccessat2(), close_range(), time64-related syscall shenanigans, a waitid() feature, and a futex operation (LOCK_PI2) and then each arch may define a few others. i386 has less than 20 (mostly related to socket options, and one for the ordering of the clone() arguments), while ARM seems to have only two (mlock2() and a configurable futex feature). Note: however, as Arnout pointed out, some programs may still actually fail to run even with such compatibility shim, if they really expect the shimed syscalls to really exist and have no fallback (and/or no proper error-handling). Still, in the vast majority of cases, those compatibility shims are enough to have a system running. Signed-off-by: Yann E. MORIN Cc: Alexey Brodkin Cc: Arnout Vandecappelle Tested-by: Alexey Brodkin Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/glibc/Config.in | 12 ++++++++++++ package/glibc/glibc.mk | 8 ++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/package/glibc/Config.in b/package/glibc/Config.in index 5ecd058145..8e9ddac7d9 100644 --- a/package/glibc/Config.in +++ b/package/glibc/Config.in @@ -10,6 +10,18 @@ config BR2_PACKAGE_GLIBC help https://www.gnu.org/software/libc/ +config BR2_PACKAGE_GLIBC_KERNEL_COMPAT + bool "Enable compatibiltiy shims to run on older kernels" + help + Say 'y' here if you plan on running your system on a kernel + older than the version used for the toolchain headers. + + Enabling those compatibility shims may generate a slightly + bigger and slightly slower glibc library. + + The oldest supported kernel version depends on the + architecture. + config BR2_PACKAGE_GLIBC_UTILS bool "Install glibc utilities" help diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index 9b591aa2a3..2702994c6b 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -98,6 +98,10 @@ endif GLIBC_MAKE = $(BR2_MAKE) GLIBC_CONF_ENV += ac_cv_prog_MAKE="$(BR2_MAKE)" +ifeq ($(BR2_PACKAGE_GLIBC_KERNEL_COMPAT),) +GLIBC_CONF_OPTS += --enable-kernel=$(call qstrip,$(BR2_TOOLCHAIN_HEADERS_AT_LEAST)) +endif + # Even though we use the autotools-package infrastructure, we have to # override the default configure commands for several reasons: # @@ -128,8 +132,8 @@ define GLIBC_CONFIGURE_CMDS --disable-profile \ --disable-werror \ --without-gd \ - --enable-kernel=$(call qstrip,$(BR2_TOOLCHAIN_HEADERS_AT_LEAST)) \ - --with-headers=$(STAGING_DIR)/usr/include) + --with-headers=$(STAGING_DIR)/usr/include \ + $(GLIBC_CONF_OPTS)) $(GLIBC_ADD_MISSING_STUB_H) endef From thomas.petazzoni at bootlin.com Sun Feb 6 10:58:14 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 11:58:14 +0100 Subject: [Buildroot] [PATCH] toolchain: update gcc bug 99410 In-Reply-To: <20220206090809.1532589-1-giulio.benetti@benettiengineering.com> References: <20220206090809.1532589-1-giulio.benetti@benettiengineering.com> Message-ID: <20220206115814.3fe54f1e@windsurf> On Sun, 6 Feb 2022 10:08:09 +0100 Giulio Benetti wrote: > Gcc bug 99410 reappeared in gcc 10.x while building belle-sip, but it's > fixed on gcc 11.x, so let's update bug conditions. > > Fixes: > http://autobuild.buildroot.net/results/846597f3573d3b0d52e80627a9577d14b9348547/ > > Signed-off-by: Giulio Benetti > --- > toolchain/Config.in | 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 Feb 6 10:58:38 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 11:58:38 +0100 Subject: [Buildroot] [git commit] toolchain: update gcc bug 99410 Message-ID: <20220206105128.7BA0581DF5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=88f79aead8fa750bc0e93ef8798751a4b463e9d9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Gcc bug 99410 reappeared in gcc 10.x while building belle-sip, but it's fixed on gcc 11.x, so let's update bug conditions. Fixes: http://autobuild.buildroot.net/results/846597f3573d3b0d52e80627a9577d14b9348547/ Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- toolchain/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/toolchain/Config.in b/toolchain/Config.in index adc93ab725..53d2046379 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -185,11 +185,11 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_93847 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=99410 # Error: branch offset out of range on Nios II. This bug # no longer exists in gcc 8.x but reappeared on gcc 9.x and has been -# fixed on gcc 10.x. +# fixed on gcc 11.x. config BR2_TOOLCHAIN_HAS_GCC_BUG_99140 bool default y if !BR2_TOOLCHAIN_GCC_AT_LEAST_8 - default y if BR2_TOOLCHAIN_GCC_AT_LEAST_9 && !BR2_TOOLCHAIN_GCC_AT_LEAST_10 + default y if BR2_TOOLCHAIN_GCC_AT_LEAST_10 && !BR2_TOOLCHAIN_GCC_AT_LEAST_11 depends on BR2_nios2 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101737 From arnout at mind.be Sun Feb 6 11:05:42 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 6 Feb 2022 12:05:42 +0100 Subject: [Buildroot] [PATCH 2/2] package/avahi: add pygobject support, move to python3 In-Reply-To: <20220206094504.11415-2-peter@korsgaard.com> References: <20220206094504.11415-1-peter@korsgaard.com> <20220206094504.11415-2-peter@korsgaard.com> Message-ID: <89d065e4-5745-8b6a-4aed-d03b26c112f2@mind.be> On 06/02/2022 10:45, Peter Korsgaard wrote: > The python support in avahi needs pygobjet to do anything: > > Building avahi-python: no (You need python, pygobject and python-dbus!) So, doesn't that mean that... > > So add optional support for it. Python-gobject is only available for > python3, so change the python logic to use python 3. > > Signed-off-by: Peter Korsgaard > --- > package/avahi/avahi.mk | 22 ++++++++++++++-------- > 1 file changed, 14 insertions(+), 8 deletions(-) > > diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk > index 04c4164af6..1992669a92 100644 > --- a/package/avahi/avahi.mk > +++ b/package/avahi/avahi.mk > @@ -40,7 +40,6 @@ AVAHI_CONF_OPTS = \ > --disable-gtk \ > --disable-gtk3 \ > --disable-gdbm \ > - --disable-pygobject \ > --disable-mono \ > --disable-monodoc \ > --disable-stack-protector \ > @@ -104,16 +103,16 @@ else > AVAHI_CONF_OPTS += --disable-glib --disable-gobject > endif > > -ifeq ($(BR2_PACKAGE_PYTHON),y) > +ifeq ($(BR2_PACKAGE_PYTHON3),y) ... this condition should be ifeq ($(BR2_PACKAGE_PYTHON_GOBJECT)$(BR2_PACKAGE_PYTHON_DBUS_NEXT),yy) (python3 is implied by python-gobject). If what I'm saying is true, then actually I'd go a bit further than that and add select BR2_PACKAGE_PYTHON_DBUS_NEXT if BR2_PACKAGE_PYTHON_GOBJECT to Config.in. Automatically selecting python-gobject would go a little too far since it depends on gobject-introspection and we really don't want to enable that beast unless it's really needed... Regards, Arnout > AVAHI_CONF_ENV += \ > - am_cv_pathless_PYTHON=python \ > - am_cv_python_version=$(PYTHON_VERSION) \ > - am_cv_python_platform=linux2 \ > - am_cv_python_pythondir=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \ > - am_cv_python_pyexecdir=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \ > + am_cv_pathless_PYTHON=python3 \ > + am_cv_python_version=$(PYTHON3_VERSION) \ > + am_cv_python_platform=linux5 \ > + am_cv_python_pythondir=/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > + am_cv_python_pyexecdir=/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > py_cv_mod_socket_=yes > > -AVAHI_DEPENDENCIES += python > +AVAHI_DEPENDENCIES += python3 > AVAHI_CONF_OPTS += --enable-python > else > AVAHI_CONF_OPTS += --disable-python > @@ -127,6 +126,13 @@ else > AVAHI_CONF_OPTS += --disable-python-dbus > endif > > +ifeq ($(BR2_PACKAGE_PYTHON_GOBJECT),y) > +AVAHI_CONF_OPTS += --enable-pygobject > +AVAHI_DEPENDENCIES += python-gobject > +else > +AVAHI_CONF_OPTS += --disable-pygobject > +endif > + > AVAHI_CONF_ENV += CFLAGS="$(AVAHI_CFLAGS)" > > AVAHI_MAKE_OPTS += LIBS=$(TARGET_NLS_LIBS) From arnout at mind.be Sun Feb 6 11:07:38 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 6 Feb 2022 12:07:38 +0100 Subject: [Buildroot] [PATCH 2/2] package/avahi: add pygobject support, move to python3 In-Reply-To: <89d065e4-5745-8b6a-4aed-d03b26c112f2@mind.be> References: <20220206094504.11415-1-peter@korsgaard.com> <20220206094504.11415-2-peter@korsgaard.com> <89d065e4-5745-8b6a-4aed-d03b26c112f2@mind.be> Message-ID: On 06/02/2022 12:05, Arnout Vandecappelle wrote: > > > On 06/02/2022 10:45, Peter Korsgaard wrote: >> The python support in avahi needs pygobjet to do anything: >> >> Building avahi-python:????????????? no?? (You need python, pygobject and >> python-dbus!) > > ?So, doesn't that mean that... > >> >> So add optional support for it.? Python-gobject is only available for >> python3, so change the python logic to use python 3. >> >> Signed-off-by: Peter Korsgaard >> --- >> ? package/avahi/avahi.mk | 22 ++++++++++++++-------- >> ? 1 file changed, 14 insertions(+), 8 deletions(-) >> >> diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk >> index 04c4164af6..1992669a92 100644 >> --- a/package/avahi/avahi.mk >> +++ b/package/avahi/avahi.mk >> @@ -40,7 +40,6 @@ AVAHI_CONF_OPTS = \ >> ????? --disable-gtk \ >> ????? --disable-gtk3 \ >> ????? --disable-gdbm \ >> -??? --disable-pygobject \ >> ????? --disable-mono \ >> ????? --disable-monodoc \ >> ????? --disable-stack-protector \ >> @@ -104,16 +103,16 @@ else >> ? AVAHI_CONF_OPTS += --disable-glib --disable-gobject >> ? endif >> ? -ifeq ($(BR2_PACKAGE_PYTHON),y) >> +ifeq ($(BR2_PACKAGE_PYTHON3),y) > > ... this condition should be > > ifeq ($(BR2_PACKAGE_PYTHON_GOBJECT)$(BR2_PACKAGE_PYTHON_DBUS_NEXT),yy) > > (python3 is implied by python-gobject). > > ?If what I'm saying is true, then actually I'd go a bit further than that and add > > ????select BR2_PACKAGE_PYTHON_DBUS_NEXT if BR2_PACKAGE_PYTHON_GOBJECT ?Actually, we could make it ??? select BR2_PACKAGE_PYTHON_GOBJECT if BR2_PACKAGE_PYTHON3 && BR2_PACKAGE_GOBJECT_INTROSPECTION ??? select BR2_PACKAGE_PYTHON_DBUS_NEXT if BR2_PACKAGE_PYTHON3 && BR2_PACKAGE_GOBJECT_INTROSPECTION (with probably some comment to explain why the weird dependencies) ?Regards, ?Arnout > > to Config.in. Automatically selecting python-gobject would go a little too far > since it depends on gobject-introspection and we really don't want to enable > that beast unless it's really needed... > > ?Regards, > ?Arnout > >> ? AVAHI_CONF_ENV += \ >> -??? am_cv_pathless_PYTHON=python \ >> -??? am_cv_python_version=$(PYTHON_VERSION) \ >> -??? am_cv_python_platform=linux2 \ >> - am_cv_python_pythondir=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \ >> - am_cv_python_pyexecdir=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \ >> +??? am_cv_pathless_PYTHON=python3 \ >> +??? am_cv_python_version=$(PYTHON3_VERSION) \ >> +??? am_cv_python_platform=linux5 \ >> + am_cv_python_pythondir=/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ >> + am_cv_python_pyexecdir=/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ >> ????? py_cv_mod_socket_=yes >> ? -AVAHI_DEPENDENCIES += python >> +AVAHI_DEPENDENCIES += python3 >> ? AVAHI_CONF_OPTS += --enable-python >> ? else >> ? AVAHI_CONF_OPTS += --disable-python >> @@ -127,6 +126,13 @@ else >> ? AVAHI_CONF_OPTS += --disable-python-dbus >> ? endif >> ? +ifeq ($(BR2_PACKAGE_PYTHON_GOBJECT),y) >> +AVAHI_CONF_OPTS += --enable-pygobject >> +AVAHI_DEPENDENCIES += python-gobject >> +else >> +AVAHI_CONF_OPTS += --disable-pygobject >> +endif >> + >> ? AVAHI_CONF_ENV += CFLAGS="$(AVAHI_CFLAGS)" >> ? ? AVAHI_MAKE_OPTS += LIBS=$(TARGET_NLS_LIBS) From arnout at mind.be Sun Feb 6 11:14:06 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 6 Feb 2022 12:14:06 +0100 Subject: [Buildroot] [PATCH] toolchain: update gcc bug 99410 In-Reply-To: <20220206090809.1532589-1-giulio.benetti@benettiengineering.com> References: <20220206090809.1532589-1-giulio.benetti@benettiengineering.com> Message-ID: On 06/02/2022 10:08, Giulio Benetti wrote: > Gcc bug 99410 reappeared in gcc 10.x while building belle-sip, but it's > fixed on gcc 11.x, so let's update bug conditions. > > Fixes: > http://autobuild.buildroot.net/results/846597f3573d3b0d52e80627a9577d14b9348547/ > > Signed-off-by: Giulio Benetti > --- > toolchain/Config.in | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/toolchain/Config.in b/toolchain/Config.in > index ccdf62503d..aed8f393a3 100644 > --- a/toolchain/Config.in > +++ b/toolchain/Config.in > @@ -185,11 +185,11 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_93847 > # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=99410 > # Error: branch offset out of range on Nios II. This bug > # no longer exists in gcc 8.x but reappeared on gcc 9.x and has been If this statement is true... > -# fixed on gcc 10.x. > +# fixed on gcc 11.x. > config BR2_TOOLCHAIN_HAS_GCC_BUG_99140 > bool > default y if !BR2_TOOLCHAIN_GCC_AT_LEAST_8 > - default y if BR2_TOOLCHAIN_GCC_AT_LEAST_9 && !BR2_TOOLCHAIN_GCC_AT_LEAST_10 > + default y if BR2_TOOLCHAIN_GCC_AT_LEAST_10 && !BR2_TOOLCHAIN_GCC_AT_LEAST_11 ... then this should be default y if BR2_TOOLCHAIN_GCC_AT_LEAST_9 && !BR2_TOOLCHAIN_GCC_AT_LEAST_11 We don't have a nios2 GCC9 toolchain in the autobuilders so we'll never notice, of course. Regards, Arnout > depends on BR2_nios2 > > # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101737 From peter at korsgaard.com Sun Feb 6 11:17:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 06 Feb 2022 12:17:08 +0100 Subject: [Buildroot] [PATCH 2/2] package/avahi: add pygobject support, move to python3 In-Reply-To: <89d065e4-5745-8b6a-4aed-d03b26c112f2@mind.be> (Arnout Vandecappelle's message of "Sun, 6 Feb 2022 12:05:42 +0100") References: <20220206094504.11415-1-peter@korsgaard.com> <20220206094504.11415-2-peter@korsgaard.com> <89d065e4-5745-8b6a-4aed-d03b26c112f2@mind.be> Message-ID: <87pmo0qm6j.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle writes: > On 06/02/2022 10:45, Peter Korsgaard wrote: >> The python support in avahi needs pygobjet to do anything: >> >> Building avahi-python: no (You need python, pygobject and python-dbus!) > So, doesn't that mean that... >> -ifeq ($(BR2_PACKAGE_PYTHON),y) >> +ifeq ($(BR2_PACKAGE_PYTHON3),y) > ... this condition should be > ifeq ($(BR2_PACKAGE_PYTHON_GOBJECT)$(BR2_PACKAGE_PYTHON_DBUS_NEXT),yy) > (python3 is implied by python-gobject). Well, it could - But there is no harm in passing --enable-python without dbus/gobject, it will just not do anything. Notice that it is dbus-python, not python-dbus-next. -- Bye, Peter Korsgaard From giulio.benetti at benettiengineering.com Sun Feb 6 11:26:18 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 12:26:18 +0100 Subject: [Buildroot] [PATCH v3 0/2] Fix gitlab CI build failure due to missing HOST_ dependencies In-Reply-To: <20220206115156.6042cc1b@windsurf> References: <20220206115156.6042cc1b@windsurf> Message-ID: <20220206112620.1637342-1-giulio.benetti@benettiengineering.com> This patchset fixes the gitlab build failure due to HOST_ dependencies(uboot/linux). V1->V2: * add missing host openssl for linux on microchip_sama7g5ek_mmc_defconfig/_dev_defconfig V2->V3: * add specific custom linux version as suggested by Thomas Giulio Benetti (2): configs/microchip_sama7g5ek_mmc_defconfig: set custom linux version to 5.15.21 and add host openssl for linux configs/microchip_sama7g5ek_mmc_dev_defconfig: set custom linux version to 5.15.21 and add host openssl for linux configs/microchip_sama7g5ek_mmc_defconfig | 4 ++++ configs/microchip_sama7g5ek_mmc_dev_defconfig | 4 ++++ 2 files changed, 8 insertions(+) -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 6 11:26:19 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 12:26:19 +0100 Subject: [Buildroot] [PATCH v3 1/2] configs/microchip_sama7g5ek_mmc_defconfig: set custom linux version to 5.15.21 and add host openssl for linux In-Reply-To: <20220206112620.1637342-1-giulio.benetti@benettiengineering.com> References: <20220206115156.6042cc1b@windsurf> <20220206112620.1637342-1-giulio.benetti@benettiengineering.com> Message-ID: <20220206112620.1637342-2-giulio.benetti@benettiengineering.com> Fixes: https://gitlab.com/ymorin/buildroot/-/jobs/2035821098 Signed-off-by: Giulio Benetti --- V1->V2: * add host openssl linux V2->V3: * set custom linux version as suggested by Thomas --- configs/microchip_sama7g5ek_mmc_defconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configs/microchip_sama7g5ek_mmc_defconfig b/configs/microchip_sama7g5ek_mmc_defconfig index b1cd193829..7ab81d1dd0 100644 --- a/configs/microchip_sama7g5ek_mmc_defconfig +++ b/configs/microchip_sama7g5ek_mmc_defconfig @@ -1,12 +1,16 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/microchip/sama7g5ek/genimage.cfg" BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.21" BR2_LINUX_KERNEL_DEFCONFIG="sama7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama7g5ek" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 6 11:26:20 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 12:26:20 +0100 Subject: [Buildroot] [PATCH v3 2/2] configs/microchip_sama7g5ek_mmc_dev_defconfig: set custom linux version to 5.15.21 and add host openssl for linux In-Reply-To: <20220206112620.1637342-1-giulio.benetti@benettiengineering.com> References: <20220206115156.6042cc1b@windsurf> <20220206112620.1637342-1-giulio.benetti@benettiengineering.com> Message-ID: <20220206112620.1637342-3-giulio.benetti@benettiengineering.com> Fixes: https://gitlab.com/ymorin/buildroot/-/jobs/2035821100 Signed-off-by: Giulio Benetti --- V1->V2: * add host openssl linux V2->V3: * set custom linux version as suggested by Thomas --- configs/microchip_sama7g5ek_mmc_dev_defconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configs/microchip_sama7g5ek_mmc_dev_defconfig b/configs/microchip_sama7g5ek_mmc_dev_defconfig index 3253bce401..c11ea2f518 100644 --- a/configs/microchip_sama7g5ek_mmc_dev_defconfig +++ b/configs/microchip_sama7g5ek_mmc_dev_defconfig @@ -1,6 +1,7 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_TOOLCHAIN_BUILDROOT_WCHAR=y BR2_PTHREAD_DEBUG=y BR2_TOOLCHAIN_BUILDROOT_CXX=y @@ -8,9 +9,12 @@ BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/microchip/sama7g5ek/genimage.cfg" BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.21" BR2_LINUX_KERNEL_DEFCONFIG="sama7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama7g5ek" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_LINUX_TOOLS_IIO=y BR2_PACKAGE_BZIP2=y BR2_PACKAGE_XZ=y -- 2.25.1 From arnout at mind.be Sun Feb 6 11:31:57 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 6 Feb 2022 12:31:57 +0100 Subject: [Buildroot] I have a problem adding new package In-Reply-To: References: <20220130234800.14da56ca@windsurf> Message-ID: Hi Arek, Please don't top-post, but reply inline like I do below. On 04/02/2022 11:22, Arek Marud wrote: > Helo Thomas, > > Thank you for your answer. > I had a problem with libonvif compilation. Compiler complaing about > unsafe include path (details pasted below). > > I was able to compile project ONLY when --includedir parameter was set, > without it - compiler complains about include path. > > https://gist.github.com/arekmd/11e9621ae3fc476cf37e80150d15b177 > > I pasted build log without LIBONVIF_CONF_OPTS line. > > > myname buildroot$> make libonvif-build > WARNING: no hash file for v1.1.1.tar.gz >>>> libonvif 1.1.1 Extracting [snip] > make[3]: Entering directory '/home/myname/workbench/resources/development/myproj/bu > ildroot/buildroot/output/build/libonvif-1.1.1/build' > /bin/sh ../libtool --tag=CC --mode=compile /home/myname/workbench/resources/dev > elopment/myproj/buildroot/buildroot/output/host/bin/aarch64-myproj-linux-gnu-gcc - > DHAVE_CONFIG_H -I. -I.. -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFS > ET_BITS=64 -I/usr/include -I/usr/include/libxml2 -I../source -D_LARGEFILE_SOURCE ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ This is what is wrong. It is caused by the following lines in build/Makefile.am [1] AM_CFLAGS = -I$(INCLUDE) -I$(INCLUDE)/libxml2 -I../source ... INCLUDE = @includedir@ LIB = @libdir@ That is just simply wrong. The proper fix is to patch the project and - Remove the -I stuff from AM_CFLAGS, instead just set AM_CFLAGS = -I../source - Remove the INCLUDE and LIB assignments - Do proper discovery of libxml2 in configure.ac - Add the libxml2 include and lib directories to CFLAGS and LIBS either in configure.ac or in build/Makefile.am But it seems that this project is pretty dead, so the easier approach is to just add LIBONVIF_MAKE_OPTS = \ INCLUDE=$(STAGING_DIR)/usr/include \ LIBS=$(STAGING_DIR)/usr/lib Regards, Arnout [1] https://github.com/sr99622/libonvif/blob/76961fb9f3ece462724a4a6c09b4bd7cc051b759/build/Makefile.am#L7 From giulio.benetti at benettiengineering.com Sun Feb 6 11:33:02 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 12:33:02 +0100 Subject: [Buildroot] [PATCH] toolchain: update gcc bug 99410 In-Reply-To: References: <20220206090809.1532589-1-giulio.benetti@benettiengineering.com> Message-ID: <578d1d13-7b6c-6c99-098c-a831800fd492@benettiengineering.com> Hi Arnout, On 06/02/22 12:14, Arnout Vandecappelle wrote: > > > On 06/02/2022 10:08, Giulio Benetti wrote: >> Gcc bug 99410 reappeared in gcc 10.x while building belle-sip, but it's >> fixed on gcc 11.x, so let's update bug conditions. >> >> Fixes: >> http://autobuild.buildroot.net/results/846597f3573d3b0d52e80627a9577d14b9348547/ >> >> Signed-off-by: Giulio Benetti >> --- >> toolchain/Config.in | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/toolchain/Config.in b/toolchain/Config.in >> index ccdf62503d..aed8f393a3 100644 >> --- a/toolchain/Config.in >> +++ b/toolchain/Config.in >> @@ -185,11 +185,11 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_93847 >> # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=99410 >> # Error: branch offset out of range on Nios II. This bug >> # no longer exists in gcc 8.x but reappeared on gcc 9.x and has been > > If this statement is true... > >> -# fixed on gcc 10.x. >> +# fixed on gcc 11.x. >> config BR2_TOOLCHAIN_HAS_GCC_BUG_99140 >> bool >> default y if !BR2_TOOLCHAIN_GCC_AT_LEAST_8 >> - default y if BR2_TOOLCHAIN_GCC_AT_LEAST_9 && !BR2_TOOLCHAIN_GCC_AT_LEAST_10 >> + default y if BR2_TOOLCHAIN_GCC_AT_LEAST_10 && !BR2_TOOLCHAIN_GCC_AT_LEAST_11 > > ... then this should be > > default y if BR2_TOOLCHAIN_GCC_AT_LEAST_9 && !BR2_TOOLCHAIN_GCC_AT_LEAST_11 but it's all negative options, so I thought I needed AT_LEAST_10 to cover gcc 10.x as having the bug. But it's not needed. So I only need to modify from !BR2_TOOLCHAIN_GCC_AT_LEAST_10 to !BR2_TOOLCHAIN_GCC_AT_LEAST_11 and that's it. So I send a V2 for this. > We don't have a nios2 GCC9 toolchain in the autobuilders so we'll never > notice, of course. I've tested it locally with buildroot built toolchain. Thank you! Best regards -- Giulio Benetti Benetti Engineering sas > Regards, > Arnout > >> depends on BR2_nios2 >> >> # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101737 > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From giulio.benetti at benettiengineering.com Sun Feb 6 11:34:12 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 12:34:12 +0100 Subject: [Buildroot] [PATCH] toolchain: update gcc bug 99410 In-Reply-To: <578d1d13-7b6c-6c99-098c-a831800fd492@benettiengineering.com> References: <20220206090809.1532589-1-giulio.benetti@benettiengineering.com> <578d1d13-7b6c-6c99-098c-a831800fd492@benettiengineering.com> Message-ID: <2fec6210-3811-197d-45a7-1ece869f49e0@benettiengineering.com> On 06/02/22 12:33, Giulio Benetti wrote: > Hi Arnout, > > On 06/02/22 12:14, Arnout Vandecappelle wrote: >> >> >> On 06/02/2022 10:08, Giulio Benetti wrote: >>> Gcc bug 99410 reappeared in gcc 10.x while building belle-sip, but it's >>> fixed on gcc 11.x, so let's update bug conditions. >>> >>> Fixes: >>> http://autobuild.buildroot.net/results/846597f3573d3b0d52e80627a9577d14b9348547/ >>> >>> Signed-off-by: Giulio Benetti >>> --- >>> toolchain/Config.in | 4 ++-- >>> 1 file changed, 2 insertions(+), 2 deletions(-) >>> >>> diff --git a/toolchain/Config.in b/toolchain/Config.in >>> index ccdf62503d..aed8f393a3 100644 >>> --- a/toolchain/Config.in >>> +++ b/toolchain/Config.in >>> @@ -185,11 +185,11 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_93847 >>> # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=99410 >>> # Error: branch offset out of range on Nios II. This bug >>> # no longer exists in gcc 8.x but reappeared on gcc 9.x and has been >> >> If this statement is true... >> >>> -# fixed on gcc 10.x. >>> +# fixed on gcc 11.x. >>> config BR2_TOOLCHAIN_HAS_GCC_BUG_99140 >>> bool >>> default y if !BR2_TOOLCHAIN_GCC_AT_LEAST_8 >>> - default y if BR2_TOOLCHAIN_GCC_AT_LEAST_9 && !BR2_TOOLCHAIN_GCC_AT_LEAST_10 >>> + default y if BR2_TOOLCHAIN_GCC_AT_LEAST_10 && !BR2_TOOLCHAIN_GCC_AT_LEAST_11 >> >> ... then this should be >> >> default y if BR2_TOOLCHAIN_GCC_AT_LEAST_9 && !BR2_TOOLCHAIN_GCC_AT_LEAST_11 > > but it's all negative options, so I thought I needed AT_LEAST_10 to > cover gcc 10.x as having the bug. But it's not needed. So I only need to > modify from !BR2_TOOLCHAIN_GCC_AT_LEAST_10 to > !BR2_TOOLCHAIN_GCC_AT_LEAST_11 and that's it. > > So I send a V2 for this. Not V2, I need a new one to fix it since it's already been applied. I send it now >> We don't have a nios2 GCC9 toolchain in the autobuilders so we'll never >> notice, of course. > > I've tested it locally with buildroot built toolchain. > > Thank you! > > Best regards -- Giulio Benetti Benetti Engineering sas From arnout at mind.be Sun Feb 6 11:49:36 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 6 Feb 2022 12:49:36 +0100 Subject: [Buildroot] Getting Buildroot-created binaries to work with the Intel (TI) Puma 5 ARM-based CPU? In-Reply-To: References: Message-ID: <53fa9f43-8aa2-4820-70e9-365e22b3408c@mind.be> On 04/02/2022 17:55, Dan Jackson wrote: > Hello everyone, > > I am new to Buildroot, so I hope you will forgive me if I make any obvious mistakes or omissions in my email. > > I hope this mailing list is the correct place to post my query, normally I would ask on forums or in Github issues, but Buildroot seems not to have a forum and its Github explicitly says not to post queries in the issues there. > > I have been experimenting with an old router, which uses an Intel Puma 5 ARM-based CPU (it's my understanding that Intel bought this design from Texas Instruments). ... And last year they sold that division to MaxLinear, so it's no longer Intel, actually :-) > At the moment I am not looking to replace the whole operating system, initially I would just like to build some binaries (such as dropbear for example) to make the exploration process easier. This may not work out so well, it's often easier to just build an entire system. The kernel can be tricky though (since it's probably not running an upstream kernel, and it may be hard to find the vendor kernel). But building a complete userspace is definitely a feasible option. Though it may be tricky to be able to boot that userspace and still go back in case it fails. What could work is to build a chroot environment to do some experiments. > The original software on the device was built with an ancient version of Buildroot - a config file can be seen in the /etc folder - and many of the options specified no longer exist in current Buildroot versions or relate to proprietary software components for which source code is not available. It's way more likely that it's actually built with OpenWrt (they sometimes call their build system "buildroot" even though there's not much of a relation between the two projects). Not that that will help you much, because the considerations are still the same. Theoretically, you can demand from whoever gave/sold you the device to give you the sources for both the kernel and for OpenWrt or Buildroot. In practice, that is probably going to be a bit tricky to achieve. Still, it may help to point a request to the router vendor. Luckily... > There are two other Puma 5 toolchains I have come across on the Internet, and both of these are also based on old Buildroot versions, but also patch these with a number of things, such as compiler command line switches and options file tweaks. It's very unlikely that you need any particular options to build userspace - you may need them to build a userspace that is compatible with what is already installed on the system, but not to build a complete userspace. The only issue then is to find out which architecture options you need to enable. > > Unfortunately, the older Buildroot versions do not seem to function properly on modern Linux installations. > > So, I was wondering what would need to be done to enable creation of Puma 5 compatible binaries using the current stable version of Buildroot? > > Links to the two toolchains I mentioned: > https://github.com/bmaia/cross-utils/tree/master/armeb/puma5_toolchain (uses Buildroot 2009.02) This one uses BR2_armeb=y BR2_arm1176jz_s=y BR2_ARM_EABI=y It's not clear if there's an FPU, so use soft float. That should be enough to build a toolchain and userspace with current Buildroot. Regards, Arnout > https://sourceforge.net/projects/dg3270.arris/files/DG3270_9.1.103FB/ (uses Buildroot 2013.08.1) > > Thanks, > Dan Jackson. > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From leo at yuriev.ru Sun Feb 6 12:13:35 2022 From: leo at yuriev.ru (=?UTF-8?q?=D0=9B=D0=B5=D0=BE=D0=BD=D0=B8=D0=B4=20=D0=AE=D1=80=D1=8C=D0=B5=D0=B2=20=28Leonid=20Yuriev=29?=) Date: Sun, 6 Feb 2022 15:13:35 +0300 Subject: [Buildroot] [PATCH] package/libmdbx: bump version to 0.11.4 Message-ID: <20220206121337.1491403-1-leo@yuriev.ru> This is stable bugfix release of libmdbx. So it is reasonable to backport this patch to all applicable releases/branches of buildroot. Please refer to the ChangeLog for more historical information and actual TODOs. https://github.com/erthink/libmdbx/blob/master/ChangeLog.md Release notes: https://github.com/erthink/libmdbx/releases/tag/v0.11.4 Signed-off-by: ?????? ????? (Leonid Yuriev) --- package/libmdbx/libmdbx.hash | 2 +- package/libmdbx/libmdbx.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libmdbx/libmdbx.hash b/package/libmdbx/libmdbx.hash index c8b50f9ac3..2483d14dd1 100644 --- a/package/libmdbx/libmdbx.hash +++ b/package/libmdbx/libmdbx.hash @@ -1,5 +1,5 @@ # Hashes from: https://github.com/erthink/libmdbx/releases/ -sha256 f954ba8c9768914a92c2b46aac0d66bec674dbb4d7b0f01e362ea2921746ddaa libmdbx-amalgamated-0.11.1.tar.gz +sha256 884de528f5c2abab2187b7c4c84b769d2551e1a748cbfdf0ae4c0f5c9f8dbd27 libmdbx-amalgamated-0.11.4.tar.gz # Locally calculated sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE diff --git a/package/libmdbx/libmdbx.mk b/package/libmdbx/libmdbx.mk index 02d00b1a5a..1aff8fbb4d 100644 --- a/package/libmdbx/libmdbx.mk +++ b/package/libmdbx/libmdbx.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMDBX_VERSION = 0.11.1 +LIBMDBX_VERSION = 0.11.4 LIBMDBX_SOURCE = libmdbx-amalgamated-$(LIBMDBX_VERSION).tar.gz LIBMDBX_SITE = https://github.com/erthink/libmdbx/releases/download/v$(LIBMDBX_VERSION) LIBMDBX_SUPPORTS_IN_SOURCE_BUILD = NO -- 2.35.1 From peter at korsgaard.com Sun Feb 6 12:16:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 13:16:51 +0100 Subject: [Buildroot] [PATCH] package/libpwquality: support python bindings with python3 Message-ID: <20220206121652.30854-1-peter@korsgaard.com> The python bindings support python3 as well, so enable it if python3 is enabled. Signed-off-by: Peter Korsgaard --- package/libpwquality/libpwquality.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libpwquality/libpwquality.mk b/package/libpwquality/libpwquality.mk index 7c0c5df38e..54a03be453 100644 --- a/package/libpwquality/libpwquality.mk +++ b/package/libpwquality/libpwquality.mk @@ -12,9 +12,9 @@ LIBPWQUALITY_INSTALL_STAGING = YES LIBPWQUALITY_DEPENDENCIES = cracklib LIBPWQUALITY_LICENSE_FILES = COPYING -ifeq ($(BR2_PACKAGE_PYTHON),y) +ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) LIBPWQUALITY_CONF_OPTS += --enable-python-bindings -LIBPWQUALITY_DEPENDENCIES += python +LIBPWQUALITY_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON3),python3,python) LIBPWQUALITY_MAKE_ENV += $(PKG_PYTHON_DISTUTILS_ENV) else LIBPWQUALITY_CONF_OPTS += --disable-python-bindings -- 2.20.1 From thomas.petazzoni at bootlin.com Sun Feb 6 12:16:56 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 6 Feb 2022 13:16:56 +0100 Subject: [Buildroot] [PATCH v3 1/2] configs/microchip_sama7g5ek_mmc_defconfig: set custom linux version to 5.15.21 and add host openssl for linux In-Reply-To: <20220206112620.1637342-2-giulio.benetti@benettiengineering.com> References: <20220206115156.6042cc1b@windsurf> <20220206112620.1637342-1-giulio.benetti@benettiengineering.com> <20220206112620.1637342-2-giulio.benetti@benettiengineering.com> Message-ID: <20220206131656.16e2c8a6@windsurf> On Sun, 6 Feb 2022 12:26:19 +0100 Giulio Benetti wrote: > Fixes: > https://gitlab.com/ymorin/buildroot/-/jobs/2035821098 > > Signed-off-by: Giulio Benetti Did you actually test on HW that 5.15.21 was working? Shouldn't this be done by the original submitter of the defconfig. Eugen, Ludovic? Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From petr.vorel at gmail.com Sun Feb 6 12:30:50 2022 From: petr.vorel at gmail.com (Petr Vorel) Date: Sun, 6 Feb 2022 13:30:50 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/ltp-testsuite: bump version to 20220121 In-Reply-To: References: <20220126235652.25712-1-petr.vorel@gmail.com> Message-ID: Hi Arnout, > On 27/01/2022 00:56, 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). > Since it apparently wasn't clear enough (cfr. Baruch's comment), I've tried > to explain a bit better. Hopefully it indeed is better :-) Thanks a lot! Kind regards, Petr > Applied to master, thanks. > Regards, > Arnout From peter at korsgaard.com Sun Feb 6 13:17:57 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 14:17:57 +0100 Subject: [Buildroot] [PATCH] package/nfs-utils: nfsiostat used python3, not python2 Message-ID: <20220206131758.28001-1-peter@korsgaard.com> nfsiostat is a python3 script, so keep it if python3 is enabled and not python2: head -n 1 target/usr/sbin/nfsiostat #!/usr/bin/python3 Signed-off-by: Peter Korsgaard --- package/nfs-utils/nfs-utils.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk index 6a3a801359..44653e2707 100644 --- a/package/nfs-utils/nfs-utils.mk +++ b/package/nfs-utils/nfs-utils.mk @@ -114,7 +114,7 @@ define NFS_UTILS_REMOVE_NFSIOSTAT endef # nfsiostat is interpreted python, so remove it unless it's in the target -NFS_UTILS_POST_INSTALL_TARGET_HOOKS += $(if $(BR2_PACKAGE_PYTHON),,NFS_UTILS_REMOVE_NFSIOSTAT) +NFS_UTILS_POST_INSTALL_TARGET_HOOKS += $(if $(BR2_PACKAGE_PYTHON3),,NFS_UTILS_REMOVE_NFSIOSTAT) define HOST_NFS_UTILS_BUILD_CMDS $(MAKE) -C $(@D)/tools/rpcgen -- 2.20.1 From peter at korsgaard.com Sun Feb 6 13:32:41 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 06 Feb 2022 14:32:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/sdl2_ttf: bump version to 2.0.18 In-Reply-To: <20220206055330.11218-1-peter.macleod.thompson@gmail.com> (Peter Thompson's message of "Sat, 5 Feb 2022 22:53:30 -0700") References: <20220206055330.11218-1-peter.macleod.thompson@gmail.com> Message-ID: <87k0e8xgqu.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Thompson writes: > From: PeterThompson > Signed-off-by: PeterThompson NIT: You have a space missing before Thompson. You updated the hash of the license file but didn't explain why. Committed with that fixed, thanks. > --- > package/sdl2_ttf/sdl2_ttf.hash | 4 ++-- > package/sdl2_ttf/sdl2_ttf.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > diff --git a/package/sdl2_ttf/sdl2_ttf.hash b/package/sdl2_ttf/sdl2_ttf.hash > index 16459e4a59..a490b002b6 100644 > --- a/package/sdl2_ttf/sdl2_ttf.hash > +++ b/package/sdl2_ttf/sdl2_ttf.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 a9eceb1ad88c1f1545cd7bd28e7cbc0b2c14191d40238f531a15b01b1b22cd33 SDL2_ttf-2.0.15.tar.gz > -sha256 f6370809c9f644760920d9945c5be07aed17664975f2e4741013d4d9a2ec696f COPYING.txt > +sha256 7234eb8883514e019e7747c703e4a774575b18d435c22a4a29d068cb768a2251 SDL2_ttf-2.0.18.tar.gz > +sha256 e211dfe7e2c36e64048be886fe3f2bbba8732ce4dd77b596a355d3abbec775a4 COPYING.txt > diff --git a/package/sdl2_ttf/sdl2_ttf.mk b/package/sdl2_ttf/sdl2_ttf.mk > index 326cb99366..1fe7c0a075 100644 > --- a/package/sdl2_ttf/sdl2_ttf.mk > +++ b/package/sdl2_ttf/sdl2_ttf.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > -SDL2_TTF_VERSION = 2.0.15 > +SDL2_TTF_VERSION = 2.0.18 > SDL2_TTF_SOURCE = SDL2_ttf-$(SDL2_TTF_VERSION).tar.gz > SDL2_TTF_SITE = http://www.libsdl.org/projects/SDL_ttf/release > SDL2_TTF_LICENSE = Zlib > -- > 2.20.1 > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 6 13:30:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 14:30:38 +0100 Subject: [Buildroot] [git commit] package/sdl2_ttf: bump version to 2.0.18 Message-ID: <20220206132613.4355D82582@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f4da031a77f200515bcc5b2e0fe665a7b4f2a780 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update the license hash because of a change in copyright year: - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga Signed-off-by: Peter Thompson Signed-off-by: Peter Korsgaard --- package/sdl2_ttf/sdl2_ttf.hash | 4 ++-- package/sdl2_ttf/sdl2_ttf.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sdl2_ttf/sdl2_ttf.hash b/package/sdl2_ttf/sdl2_ttf.hash index 16459e4a59..a490b002b6 100644 --- a/package/sdl2_ttf/sdl2_ttf.hash +++ b/package/sdl2_ttf/sdl2_ttf.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a9eceb1ad88c1f1545cd7bd28e7cbc0b2c14191d40238f531a15b01b1b22cd33 SDL2_ttf-2.0.15.tar.gz -sha256 f6370809c9f644760920d9945c5be07aed17664975f2e4741013d4d9a2ec696f COPYING.txt +sha256 7234eb8883514e019e7747c703e4a774575b18d435c22a4a29d068cb768a2251 SDL2_ttf-2.0.18.tar.gz +sha256 e211dfe7e2c36e64048be886fe3f2bbba8732ce4dd77b596a355d3abbec775a4 COPYING.txt diff --git a/package/sdl2_ttf/sdl2_ttf.mk b/package/sdl2_ttf/sdl2_ttf.mk index 326cb99366..1fe7c0a075 100644 --- a/package/sdl2_ttf/sdl2_ttf.mk +++ b/package/sdl2_ttf/sdl2_ttf.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_TTF_VERSION = 2.0.15 +SDL2_TTF_VERSION = 2.0.18 SDL2_TTF_SOURCE = SDL2_ttf-$(SDL2_TTF_VERSION).tar.gz SDL2_TTF_SITE = http://www.libsdl.org/projects/SDL_ttf/release SDL2_TTF_LICENSE = Zlib From peter at korsgaard.com Sun Feb 6 13:35:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 06 Feb 2022 14:35:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/pipewire: bump to version 0.3.45 In-Reply-To: <20220206003746.1772081-1-james.hilliard1@gmail.com> (James Hilliard's message of "Sat, 5 Feb 2022 17:37:46 -0700") References: <20220206003746.1772081-1-james.hilliard1@gmail.com> Message-ID: <87fsowxgmu.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Drop patch that is now upstream. > Set new x11 and libcanberra meson config options. > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 6 13:33:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 14:33:58 +0100 Subject: [Buildroot] [git commit] package/pipewire: bump to version 0.3.45 Message-ID: <20220206132801.092ED81970@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e6a2903946b9083ec764e7e4619abb93951f3c4f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patch that is now upstream. Set new x11 and libcanberra meson config options. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- ...spa-meson.build-add-atomic_dep-dependency.patch | 40 ---------------------- package/pipewire/pipewire.hash | 2 +- package/pipewire/pipewire.mk | 10 +++++- 3 files changed, 10 insertions(+), 42 deletions(-) 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 deleted file mode 100644 index b91adbe7e4..0000000000 --- a/package/pipewire/0001-spa-meson.build-add-atomic_dep-dependency.patch +++ /dev/null @@ -1,40 +0,0 @@ -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 - diff --git a/package/pipewire/pipewire.hash b/package/pipewire/pipewire.hash index 8464a56338..a9d59663ae 100644 --- a/package/pipewire/pipewire.hash +++ b/package/pipewire/pipewire.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 2e91f228ffb93494f2423956b930014de20e15639a03f3df4fca4ebf4bc51fc0 pipewire-0.3.43.tar.bz2 +sha256 76291373f7ab271664df5b6a22b678ad57e485e25c73ee9c78e049a67b7886d2 pipewire-0.3.45.tar.bz2 sha256 8909c319a7e27dbb33a15b9035f89ab3b7b2f6a12f8bcddc755206a8db1ada44 COPYING sha256 be4be5d77424833edf31f53fc1f1cecb6996b9e2d747d9e6fb8f878362ebc92b LICENSE diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index b05ce2bcc2..fc521c86ac 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -4,7 +4,7 @@ # ################################################################################ -PIPEWIRE_VERSION = 0.3.43 +PIPEWIRE_VERSION = 0.3.45 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) @@ -29,6 +29,7 @@ PIPEWIRE_CONF_OPTS += \ -Dvideotestsrc=enabled \ -Dvolume=enabled \ -Dsession-managers=[] \ + -Dlibcanberra=disabled \ -Dlv2=disabled ifeq ($(BR2_PACKAGE_DBUS),y) @@ -128,6 +129,13 @@ else PIPEWIRE_CONF_OPTS += -Dlibcamera=disabled endif +ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y) +PIPEWIRE_CONF_OPTS += -Dx11=enabled +PIPEWIRE_DEPENDENCIES += xlib_libX11 +else +PIPEWIRE_CONF_OPTS += -Dx11=disabled +endif + ifeq ($(BR2_PACKAGE_LIBUSB),y) PIPEWIRE_CONF_OPTS += -Dlibusb=enabled PIPEWIRE_DEPENDENCIES += libusb From peter at korsgaard.com Sun Feb 6 13:38:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 06 Feb 2022 14:38:28 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi-pvr-stalker: bump version to 19.0.2-Matrix In-Reply-To: <20220205181536.2110535-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sat, 5 Feb 2022 19:15:36 +0100") References: <20220205181536.2110535-1-bernd.kuhls@t-online.de> Message-ID: <87bkzkxgh7.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 6 13:37:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 14:37:55 +0100 Subject: [Buildroot] [git commit] package/kodi-pvr-stalker: bump version to 19.0.2-Matrix Message-ID: <20220206133117.9307482BC7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fa1114224d357c221c87d4f2f90c050ff83e08b4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- 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 90e74d451a..2eae79d371 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 84a92c298ddda8d72072aafe2a62c5c6b48b60b3b85408ce7ca4f96e42965541 kodi-pvr-stalker-19.0.1-Matrix.tar.gz +sha256 ca472c4f43f77d7badca3fbe174f5877e6b3ff63407da09f690d8146ec737b59 kodi-pvr-stalker-19.0.2-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 a0d5f4356d..efa293a40d 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.1-Matrix +KODI_PVR_STALKER_VERSION = 19.0.2-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 peter at korsgaard.com Sun Feb 6 13:47:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 06 Feb 2022 14:47:08 +0100 Subject: [Buildroot] [PATCH v2] package/at: bump version to 3.2.4 In-Reply-To: <20220201223204.3796621-1-giulio.benetti@benettiengineering.com> (Giulio Benetti's message of "Tue, 1 Feb 2022 23:32:04 +0100") References: <3b46e3fd-6fa1-eac5-bd28-f726f23a921c@benettiengineering.com> <20220201223204.3796621-1-giulio.benetti@benettiengineering.com> Message-ID: <877da8xg2r.fsf@dell.be.48ers.dk> >>>>> "Giulio" == Giulio Benetti writes: > All local patches except on have been upstreamed, so let's remove them and > rename/rebase the remaining one. > Signed-off-by: Giulio Benetti > --- > V1-> V2: suggested by Peter > * removed useless lines from local patch > * remove AT_AUTORECONF = y since it's not needed anymore Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 6 13:44:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 14:44:33 +0100 Subject: [Buildroot] [git commit] package/at: bump version to 3.2.4 Message-ID: <20220206134000.88C6282931@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=edd57e0db8d5adbce36692400889373e67f6f7a6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master All local patches except on have been upstreamed, so let's remove them and rename/rebase the remaining one. Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- ...fix-make-install-for-non-root-don-t-stri.patch} | 9 +- ...0001-Makefile.in-replace-IROOT-by-DESTDIR.patch | 113 --------------------- ...fix-getloadavg.c-compilation-revert-to-3..patch | 39 ------- .../0004-Makefile-fix-parallel-build-failure.patch | 41 -------- package/at/at.hash | 2 +- package/at/at.mk | 3 +- 6 files changed, 7 insertions(+), 200 deletions(-) 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 96% 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..91e9738358 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 77b28c32ebfed0eb130a0acdb2acb7206f2b9530 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,17 @@ 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(-) diff --git a/Makefile.in b/Makefile.in -index a7197f2..0b35a67 100644 +index 4ae194f..af82e4c 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -99,43 +99,42 @@ atrun: atrun.in +@@ -102,43 +102,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..26c44f5287 100644 --- a/package/at/at.mk +++ b/package/at/at.mk @@ -4,10 +4,9 @@ # ################################################################################ -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 AT_DEPENDENCIES = $(if $(BR2_PACKAGE_FLEX),flex) host-bison host-flex AT_LICENSE = GPL-2.0+, GPL-3.0+, ISC AT_LICENSE_FILES = Copyright COPYING From peter at korsgaard.com Sun Feb 6 13:54:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 06 Feb 2022 14:54:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/libopenh264: bump to version 2.2.0 In-Reply-To: <20220206101433.862930-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 6 Feb 2022 11:14:33 +0100") References: <20220206101433.862930-1-fontaine.fabrice@gmail.com> Message-ID: <8735kwxfr8.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Drop patches (already in version) > https://github.com/cisco/openh264/releases/tag/v2.2.0 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 6 13:54:57 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 06 Feb 2022 14:54:57 +0100 Subject: [Buildroot] [PATCH] package/libmdbx: bump version to 0.11.4 In-Reply-To: <20220206121337.1491403-1-leo@yuriev.ru> (=?utf-8?B?ItCb0LU=?= =?utf-8?B?0L7QvdC40LQg0K7RgNGM0LXQsg==?= (Leonid Yuriev)"'s message of "Sun, 6 Feb 2022 15:13:35 +0300") References: <20220206121337.1491403-1-leo@yuriev.ru> Message-ID: <87y22ow15a.fsf@dell.be.48ers.dk> >>>>> "??????" == ?????? ????? (Leonid Yuriev) writes: > This is stable bugfix release of libmdbx. So it is reasonable to backport > this patch to all applicable releases/branches of buildroot. > Please refer to the ChangeLog for more historical information and actual TODOs. > https://github.com/erthink/libmdbx/blob/master/ChangeLog.md > Release notes: https://github.com/erthink/libmdbx/releases/tag/v0.11.4 > Signed-off-by: ?????? ????? (Leonid Yuriev) Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 6 13:53:59 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 14:53:59 +0100 Subject: [Buildroot] [git commit] package/libmdbx: bump version to 0.11.4 Message-ID: <20220206134759.5975182BCD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e0d3799b5554e6479404a255861e512cacfd88af branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This is stable bugfix release of libmdbx. So it is reasonable to backport this patch to all applicable releases/branches of buildroot. Please refer to the ChangeLog for more historical information and actual TODOs. https://github.com/erthink/libmdbx/blob/master/ChangeLog.md Release notes: https://github.com/erthink/libmdbx/releases/tag/v0.11.4 Signed-off-by: ???????????? ?????????? (Leonid Yuriev) Signed-off-by: Peter Korsgaard --- package/libmdbx/libmdbx.hash | 2 +- package/libmdbx/libmdbx.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libmdbx/libmdbx.hash b/package/libmdbx/libmdbx.hash index c8b50f9ac3..2483d14dd1 100644 --- a/package/libmdbx/libmdbx.hash +++ b/package/libmdbx/libmdbx.hash @@ -1,5 +1,5 @@ # Hashes from: https://github.com/erthink/libmdbx/releases/ -sha256 f954ba8c9768914a92c2b46aac0d66bec674dbb4d7b0f01e362ea2921746ddaa libmdbx-amalgamated-0.11.1.tar.gz +sha256 884de528f5c2abab2187b7c4c84b769d2551e1a748cbfdf0ae4c0f5c9f8dbd27 libmdbx-amalgamated-0.11.4.tar.gz # Locally calculated sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE diff --git a/package/libmdbx/libmdbx.mk b/package/libmdbx/libmdbx.mk index 02d00b1a5a..1aff8fbb4d 100644 --- a/package/libmdbx/libmdbx.mk +++ b/package/libmdbx/libmdbx.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMDBX_VERSION = 0.11.1 +LIBMDBX_VERSION = 0.11.4 LIBMDBX_SOURCE = libmdbx-amalgamated-$(LIBMDBX_VERSION).tar.gz LIBMDBX_SITE = https://github.com/erthink/libmdbx/releases/download/v$(LIBMDBX_VERSION) LIBMDBX_SUPPORTS_IN_SOURCE_BUILD = NO From peter at korsgaard.com Sun Feb 6 13:53:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 14:53:49 +0100 Subject: [Buildroot] [git commit] package/libopenh264: bump to version 2.2.0 Message-ID: <20220206134759.5168982BC7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=76b5cb700410878e52f9366428402b8b6b4fcf86 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patches (already in version) https://github.com/cisco/openh264/releases/tag/v2.2.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .../0001-Add-USE_STACK_PROTECTOR-option.patch | 100 --------------------- package/libopenh264/0002-fix-mips-build.patch | 73 --------------- ...common-inc-asmdefs_mmi.h-fix-mips32-build.patch | 89 ------------------ package/libopenh264/libopenh264.hash | 2 +- package/libopenh264/libopenh264.mk | 2 +- 5 files changed, 2 insertions(+), 264 deletions(-) diff --git a/package/libopenh264/0001-Add-USE_STACK_PROTECTOR-option.patch b/package/libopenh264/0001-Add-USE_STACK_PROTECTOR-option.patch deleted file mode 100644 index 3758cd668b..0000000000 --- a/package/libopenh264/0001-Add-USE_STACK_PROTECTOR-option.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 1e7435751c055723b7103dd1d5bb68530e1a2678 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 8 Oct 2019 20:18:18 +0200 -Subject: [PATCH] Add USE_STACK_PROTECTOR option - --fstack-protector-all is not supported on all linux toolchains so add an -option to disable it (and enable it by default to keep current behavior) - -Fixes: - - http://autobuild.buildroot.org/results/377818cf8c1f2632cabdccb32bf4e7f06c0fdbbd - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/cisco/openh264/pull/3175] ---- - Makefile | 1 + - build/platform-android.mk | 5 ++++- - build/platform-bsd.mk | 5 ++++- - build/platform-darwin.mk | 5 ++++- - build/platform-linux.mk | 5 ++++- - 5 files changed, 17 insertions(+), 4 deletions(-) - -diff --git a/Makefile b/Makefile -index 74ff029d..c2061f6a 100644 ---- a/Makefile -+++ b/Makefile -@@ -34,6 +34,7 @@ GTEST_VER=release-1.8.1 - CCASFLAGS=$(CFLAGS) - STATIC_LDFLAGS=-lstdc++ - STRIP ?= strip -+USE_STACK_PROTECTOR = Yes - - SHAREDLIB_MAJORVERSION=5 - FULL_VERSION := 2.0.0 -diff --git a/build/platform-android.mk b/build/platform-android.mk -index 6f6ce347..06534301 100644 ---- a/build/platform-android.mk -+++ b/build/platform-android.mk -@@ -44,7 +44,10 @@ SYSROOT = $(NDKROOT)/platforms/android-$(NDKLEVEL)/arch-$(ARCH) - CXX = $(TOOLCHAINPREFIX)g++ - CC = $(TOOLCHAINPREFIX)gcc - AR = $(TOOLCHAINPREFIX)ar --CFLAGS += -DANDROID_NDK -fpic --sysroot=$(SYSROOT) -MMD -MP -fstack-protector-all -+CFLAGS += -DANDROID_NDK -fpic --sysroot=$(SYSROOT) -MMD -MP -+ifeq ($(USE_STACK_PROTECTOR), Yes) -+CFLAGS +=-fstack-protector-all -+endif - CFLAGS += -isystem $(NDKROOT)/sysroot/usr/include -isystem $(NDKROOT)/sysroot/usr/include/$(TOOLCHAIN_NAME) -D__ANDROID_API__=$(NDKLEVEL) - CXXFLAGS += -fno-rtti -fno-exceptions - LDFLAGS += --sysroot=$(SYSROOT) -diff --git a/build/platform-bsd.mk b/build/platform-bsd.mk -index e60d2cc0..2e0bf2cc 100644 ---- a/build/platform-bsd.mk -+++ b/build/platform-bsd.mk -@@ -3,7 +3,10 @@ SHAREDLIBSUFFIX = so - SHAREDLIBSUFFIXFULLVER=$(SHAREDLIBSUFFIX).$(FULL_VERSION) - SHAREDLIBSUFFIXMAJORVER=$(SHAREDLIBSUFFIX).$(SHAREDLIB_MAJORVERSION) - SHLDFLAGS = -Wl,-soname,$(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXMAJORVER) --CFLAGS += -fPIC -fstack-protector-all -+CFLAGS += -fPIC -+ifeq ($(USE_STACK_PROTECTOR), Yes) -+CFLAGS += -fstack-protector-all -+endif - LDFLAGS += -lpthread - STATIC_LDFLAGS += -lpthread -lm - ifeq ($(ASM_ARCH), x86) -diff --git a/build/platform-darwin.mk b/build/platform-darwin.mk -index 6c7b2443..718c8e2f 100644 ---- a/build/platform-darwin.mk -+++ b/build/platform-darwin.mk -@@ -10,7 +10,10 @@ SHLDFLAGS = -dynamiclib -twolevel_namespace -undefined dynamic_lookup \ - $(SHAREDLIB_DIR)/$(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXMAJORVER) - SHARED = -dynamiclib - SHARED += -current_version $(CURRENT_VERSION) -compatibility_version $(COMPATIBILITY_VERSION) --CFLAGS += -Wall -fPIC -MMD -MP -fstack-protector-all -+CFLAGS += -Wall -fPIC -MMD -MP -+ifeq ($(USE_STACK_PROTECTOR), Yes) -+CFLAGS += -fstack-protector-all -+endif - ifeq ($(ASM_ARCH), x86) - ASMFLAGS += -DPREFIX - ifeq ($(ARCH), x86_64) -diff --git a/build/platform-linux.mk b/build/platform-linux.mk -index 44fe2424..b5c006b2 100644 ---- a/build/platform-linux.mk -+++ b/build/platform-linux.mk -@@ -3,7 +3,10 @@ SHAREDLIBSUFFIX = so - SHAREDLIBSUFFIXFULLVER=$(SHAREDLIBSUFFIX).$(FULL_VERSION) - SHAREDLIBSUFFIXMAJORVER=$(SHAREDLIBSUFFIX).$(SHAREDLIB_MAJORVERSION) - SHLDFLAGS = -Wl,-soname,$(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXMAJORVER) --CFLAGS += -Wall -fno-strict-aliasing -fPIC -MMD -MP -fstack-protector-all -+CFLAGS += -Wall -fno-strict-aliasing -fPIC -MMD -MP -+ifeq ($(USE_STACK_PROTECTOR), Yes) -+CFLAGS += -fstack-protector-all -+endif - LDFLAGS += -lpthread - STATIC_LDFLAGS += -lpthread -lm - AR_OPTS = crD $@ --- -2.23.0 - diff --git a/package/libopenh264/0002-fix-mips-build.patch b/package/libopenh264/0002-fix-mips-build.patch deleted file mode 100644 index c4927d567b..0000000000 --- a/package/libopenh264/0002-fix-mips-build.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 9d5981eecde2133b9d6099eb99f96b1c29c3e520 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Mon, 13 Apr 2020 12:03:01 +0200 -Subject: [PATCH] fix mips build - -In total three PR were sent upstream to fix mips builds: -https://github.com/cisco/openh264/pull/3185 -https://github.com/cisco/openh264/pull/3217 -https://github.com/cisco/openh264/pull/3225 - -Buildroot used the first version -https://git.buildroot.net/buildroot/commit/package/libopenh264?id=e8d0df569e1844f7ba28918a53ee38027b325b8f -downloaded from https://github.com/cisco/openh264/pull/3185 - -During discussion the gcc option '-march=loongson3a' was changed to -'-Wa,-mloongson-mmi,-mloongson-ext': -https://github.com/cisco/openh264/pull/3185#discussion_r337818960 - -This causes build errors with gcc version 8.3.0 (Buildroot 2020.02) - -tmp/cctgEQaw.s:662: Error: opcode not supported on this processor: loongson3a (mips64r2) `bc .L22' -/tmp/cctgEQaw.s:1679: Error: opcode not supported on this processor: loongson3a (mips64r2) `bc .L27' -/tmp/cctgEQaw.s:2218: Error: opcode not supported on this processor: loongson3a (mips64r2) `jrc $31' - -This patch partly reverts the change to fix mips build. - -$ /home/bernd/buildroot/br5/output/host/bin/mips64el-linux-gcc -v - -Using built-in specs. -COLLECT_GCC=/home/bernd/buildroot/br5/output/host/opt/ext-toolchain/bin/mips64el-linux-gcc.br_real -COLLECT_LTO_WRAPPER=/home/bernd/buildroot/br5/output/host/opt/ext-toolchain/bin/../libexec/gcc/mips64el-buildroot-linux-gnu/8.3.0/lto-wrapper -Target: mips64el-buildroot-linux-gnu -Configured with: ./configure --prefix=/opt/br-mips64r6-n64-el-hf-2020.02 --sysconfdir=/opt/br-mips64r6-n64-el-hf-2020.02/etc --enable-static --target=mips64el-buildroot-linux-gnu --with-sysroot=/opt/br-mips64r6-n64-el-hf-2020.02/mips64el-buildroot-linux-gnu/sysroot --enable-__cxa_atexit --with-gnu-ld --disable-libssp --disable-multilib --disable-decimal-float --with-gmp=/opt/br-mips64r6-n64-el-hf-2020.02 --with-mpc=/opt/br-mips64r6-n64-el-hf-2020.02 --with-mpfr=/opt/br-mips64r6-n64-el-hf-2020.02 --with-pkgversion='Buildroot 2020.02' --with-bugurl=http://bugs.buildroot.net/ --disable-libquadmath --enable-tls --enable-threads --without-isl --without-cloog --with-arch=mips64r6 --with-abi=64 --with-nan=2008 --enable-languages=c,c++ --with-build-time-tools=/opt/br-mips64r6-n64-el-hf-2020.02/mips64el-buildroot-linux-gnu/bin --enable-shared --disable-libgomp -Thread model: posix -gcc version 8.3.0 (Buildroot 2020.02) - -Patch sent upstream: https://github.com/cisco/openh264/pull/3267 - -Signed-off-by: Bernd Kuhls ---- - build/arch.mk | 2 +- - build/mips-simd-check.sh | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/build/arch.mk b/build/arch.mk -index 1bf318ab..c6570ed4 100644 ---- a/build/arch.mk -+++ b/build/arch.mk -@@ -41,7 +41,7 @@ ASMFLAGS += -I$(SRC_PATH)codec/common/mips/ - ifeq ($(ENABLE_MMI), Yes) - ENABLE_MMI = $(shell $(SRC_PATH)build/mips-simd-check.sh $(CC) mmi) - ifeq ($(ENABLE_MMI), Yes) --CFLAGS += -DHAVE_MMI -Wa,-mloongson-mmi,-mloongson-ext -+CFLAGS += -DHAVE_MMI -march=loongson3a - endif - endif - #msa -diff --git a/build/mips-simd-check.sh b/build/mips-simd-check.sh -index 5efffbef..d0d72f9e 100755 ---- a/build/mips-simd-check.sh -+++ b/build/mips-simd-check.sh -@@ -15,7 +15,7 @@ TMPO=$(mktemp tmp.XXXXXX.o) - if [ $2 == "mmi" ] - then - echo "void main(void){ __asm__ volatile(\"punpcklhw \$f0, \$f0, \$f0\"); }" > $TMPC -- $1 -Wa,-mloongson-mmi $TMPC -o $TMPO &> /dev/null -+ $1 -march=loongson3a $TMPC -o $TMPO &> /dev/null - if test -s $TMPO - then - echo "Yes" --- -2.25.0 - diff --git a/package/libopenh264/0003-codec-common-inc-asmdefs_mmi.h-fix-mips32-build.patch b/package/libopenh264/0003-codec-common-inc-asmdefs_mmi.h-fix-mips32-build.patch deleted file mode 100644 index e11b1d13ef..0000000000 --- a/package/libopenh264/0003-codec-common-inc-asmdefs_mmi.h-fix-mips32-build.patch +++ /dev/null @@ -1,89 +0,0 @@ -From c505f81e336088b6729a5407a03459f488353288 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 24 May 2021 22:54:01 +0200 -Subject: [PATCH] codec/common/inc/asmdefs_mmi.h: fix mips32 build - -Fix the following build failure on mips32 which is raised since version -2.0.0 and -https://github.com/cisco/openh264/commit/b13e5bceb18ebb93d0313b46aab4af6f480ca933: - -codec/common/mips/copy_mb_mmi.c: In function 'WelsCopy16x16_mmi': -./codec/common/inc/asmdefs_mmi.h:293:21: error: '_ABI64' undeclared (first use in this function) - 293 | if (_MIPS_SIM == _ABI64) \ - | ^~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/cba3e9d0fd061cc3a92cb732bcdc2c7b66dbf6cb - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/cisco/openh264/pull/3384] ---- - codec/common/inc/asmdefs_mmi.h | 17 +++++++++++------ - 1 file changed, 11 insertions(+), 6 deletions(-) - -diff --git a/codec/common/inc/asmdefs_mmi.h b/codec/common/inc/asmdefs_mmi.h -index 69a7ae39..5d1aed93 100644 ---- a/codec/common/inc/asmdefs_mmi.h -+++ b/codec/common/inc/asmdefs_mmi.h -@@ -288,9 +288,9 @@ - /** - * backup register - */ -+#if defined(_ABI64) && _MIPS_SIM == _ABI64 - #define BACKUP_REG \ - double __attribute__((aligned(16))) __back_temp[8]; \ -- if (_MIPS_SIM == _ABI64) \ - __asm__ volatile ( \ - "gssqc1 $f25, $f24, 0x00(%[temp]) \n\t" \ - "gssqc1 $f27, $f26, 0x10(%[temp]) \n\t" \ -@@ -299,8 +299,10 @@ - : \ - : [temp]"r"(__back_temp) \ - : "memory" \ -- ); \ -- else \ -+ ); -+#else -+#define BACKUP_REG \ -+ double __attribute__((aligned(16))) __back_temp[8]; \ - __asm__ volatile ( \ - "gssqc1 $f22, $f20, 0x00(%[temp]) \n\t" \ - "gssqc1 $f26, $f24, 0x10(%[temp]) \n\t" \ -@@ -309,12 +311,13 @@ - : [temp]"r"(__back_temp) \ - : "memory" \ - ); -+#endif - - /** - * recover register - */ -+#if defined(_ABI64) && _MIPS_SIM == _ABI64 - #define RECOVER_REG \ -- if (_MIPS_SIM == _ABI64) \ - __asm__ volatile ( \ - "gslqc1 $f25, $f24, 0x00(%[temp]) \n\t" \ - "gslqc1 $f27, $f26, 0x10(%[temp]) \n\t" \ -@@ -323,8 +326,9 @@ - : \ - : [temp]"r"(__back_temp) \ - : "memory" \ -- ); \ -- else \ -+ ); -+#else -+#define RECOVER_REG \ - __asm__ volatile ( \ - "gslqc1 $f22, $f20, 0x00(%[temp]) \n\t" \ - "gslqc1 $f26, $f24, 0x10(%[temp]) \n\t" \ -@@ -333,6 +337,7 @@ - : [temp]"r"(__back_temp) \ - : "memory" \ - ); -+#endif - - # define OK 1 - # define NOTOK 0 --- -2.30.2 - diff --git a/package/libopenh264/libopenh264.hash b/package/libopenh264/libopenh264.hash index 0689ab961f..712425a024 100644 --- a/package/libopenh264/libopenh264.hash +++ b/package/libopenh264/libopenh264.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 af173e90fce65f80722fa894e1af0d6b07572292e76de7b65273df4c0a8be678 libopenh264-2.1.1.tar.gz +sha256 e4e5c8ba48e64ba6ce61e8b6e2b76b2d870c74c270147649082feabb40f25905 libopenh264-2.2.0.tar.gz sha256 dd5c1c9668512530fa5a96e4c29ac4033d70a7eeb0eed7a42fddb6dd794ebdbb LICENSE diff --git a/package/libopenh264/libopenh264.mk b/package/libopenh264/libopenh264.mk index 0c17579979..ea41f72661 100644 --- a/package/libopenh264/libopenh264.mk +++ b/package/libopenh264/libopenh264.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENH264_VERSION = 2.1.1 +LIBOPENH264_VERSION = 2.2.0 LIBOPENH264_SITE = $(call github,cisco,openh264,v$(LIBOPENH264_VERSION)) LIBOPENH264_LICENSE = BSD-2-Clause LIBOPENH264_LICENSE_FILES = LICENSE From dan at thejacksons.uk Sun Feb 6 13:55:29 2022 From: dan at thejacksons.uk (Dan Jackson) Date: Sun, 6 Feb 2022 13:55:29 +0000 Subject: [Buildroot] Getting Buildroot-created binaries to work with the Intel (TI) Puma 5 ARM-based CPU? In-Reply-To: <53fa9f43-8aa2-4820-70e9-365e22b3408c@mind.be> References: <53fa9f43-8aa2-4820-70e9-365e22b3408c@mind.be> Message-ID: > -----Original Message----- > From: Arnout Vandecappelle > Sent: 06 February 2022 11:50 > To: Dan Jackson ; buildroot at buildroot.org > Subject: Re: [Buildroot] Getting Buildroot-created binaries to work with the > Intel (TI) Puma 5 ARM-based CPU? > [...snip...] > > > > Links to the two toolchains I mentioned: > > https://github.com/bmaia/cross- > utils/tree/master/armeb/puma5_toolchain (uses Buildroot 2009.02) > > This one uses > > BR2_armeb=y > BR2_arm1176jz_s=y > BR2_ARM_EABI=y > > It's not clear if there's an FPU, so use soft float. From /proc/cpuinfo on the target device I can see: Features : swp half thumb fastmult edsp java It's my understanding this line would include "vfp" if there was an FPU, so I don't believe there is one. > > That should be enough to build a toolchain and userspace with current > Buildroot. I tried creating a fresh Buildroot using the current stable version 2021.11 and only the above options. I then tried transferring the files from the generated rootfs.tar to a directory /var/tmp/test on the device (the reason for this is that / is a read-only file system, so /bin, /lib, /usr are not writable, but /var is a read-write file system). I then attempted to execute it in the following manner (accounting for the fact that Buildroot builds dynamically linked executables by default): /var/tmp/test/lib/ld-uClibc-1.0.39.so --library-path /var/tmp/test/lib /var/tmp/test/bin/busybox (this method was suggested in the section LD_LIBRARY_PATH on this page: https://tldp.org/HOWTO/Program-Library-HOWTO/shared-libraries.html) However this did not work and in fact produced a "Segmentation fault" error. Have I made some kind of obvious error or mistake? Thanks, Dan Jackson. From peter at korsgaard.com Sun Feb 6 13:58:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 06 Feb 2022 14:58:27 +0100 Subject: [Buildroot] [PATCH] package/nfs-utils: nfsiostat used python3, not python2 In-Reply-To: <20220206131758.28001-1-peter@korsgaard.com> (Peter Korsgaard's message of "Sun, 6 Feb 2022 14:17:57 +0100") References: <20220206131758.28001-1-peter@korsgaard.com> Message-ID: <87tudcw0zg.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: s/used/uses/ in the subject naturally. > nfsiostat is a python3 script, so keep it if python3 is enabled and not > python2: > head -n 1 target/usr/sbin/nfsiostat > #!/usr/bin/python3 > Signed-off-by: Peter Korsgaard > --- > package/nfs-utils/nfs-utils.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk > index 6a3a801359..44653e2707 100644 > --- a/package/nfs-utils/nfs-utils.mk > +++ b/package/nfs-utils/nfs-utils.mk > @@ -114,7 +114,7 @@ define NFS_UTILS_REMOVE_NFSIOSTAT > endef > # nfsiostat is interpreted python, so remove it unless it's in the target > -NFS_UTILS_POST_INSTALL_TARGET_HOOKS += $(if $(BR2_PACKAGE_PYTHON),,NFS_UTILS_REMOVE_NFSIOSTAT) > +NFS_UTILS_POST_INSTALL_TARGET_HOOKS += $(if $(BR2_PACKAGE_PYTHON3),,NFS_UTILS_REMOVE_NFSIOSTAT) > define HOST_NFS_UTILS_BUILD_CMDS > $(MAKE) -C $(@D)/tools/rpcgen > -- > 2.20.1 -- Bye, Peter Korsgaard From arnout at mind.be Sun Feb 6 13:59:36 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 6 Feb 2022 14:59:36 +0100 Subject: [Buildroot] [PATCH v2 1/4] utils/checkpackagelib: add unit tests In-Reply-To: <20220123160847.2653086-1-ricardo.martincoski@gmail.com> References: <20220123160847.2653086-1-ricardo.martincoski@gmail.com> Message-ID: <08b436a2-8d45-a93e-cecd-9b9b5b632fc9@mind.be> On 23/01/2022 17:08, Ricardo Martincoski wrote: > 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. I've been thinking of ways to simplify this (e.g. the filename is *usually* the same for a given set of tests, and the expected lines *usually* start with 'filename:'), but nothing really simple fell out, and progress is better than perfection. Therefore, series applied to master (and the new docker image pushed to the registry). Regards, Arnout > > 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] From arnout at mind.be Sun Feb 6 14:00:44 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 6 Feb 2022 15:00:44 +0100 Subject: [Buildroot] [PATCH v2 4/4] utils/docker-run: new script In-Reply-To: <20220123160847.2653086-4-ricardo.martincoski@gmail.com> References: <20220123160847.2653086-1-ricardo.martincoski@gmail.com> <20220123160847.2653086-4-ricardo.martincoski@gmail.com> Message-ID: <5f160478-5d3f-0541-7d54-0bc80772e636@mind.be> On 23/01/2022 17:08, Ricardo Martincoski wrote: > 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}" $* This should be "$@" instead of $*, right? There was another shellcheck error as well, for which I added an exception. And I also added an exec to the last line. Regards, Arnout From fontaine.fabrice at gmail.com Sun Feb 6 14:04:59 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 6 Feb 2022 15:04:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/gerbera: fix build with fmt > 8.0 Message-ID: <20220206140459.1622884-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump of fmt to version 8.1.1 in commit ec7fd50d08690a383fec40748ac9b78c3f764316: /home/peko/autobuild/instance-0/output-1/host/mips64el-buildroot-linux-uclibc/sysroot/usr/include/fmt/core.h:1728:7: error: static assertion failed: Cannot format an argument. To make type T formattable provide a formatter specialization: https://fmt.dev/latest/api.html#udt formattable, ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/009db44f83c3b02025c910ce4f190bd709c5ab49 Signed-off-by: Fabrice Fontaine --- package/gerbera/0001-Fix-for-fmt-8-0.patch | 44 ++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 package/gerbera/0001-Fix-for-fmt-8-0.patch diff --git a/package/gerbera/0001-Fix-for-fmt-8-0.patch b/package/gerbera/0001-Fix-for-fmt-8-0.patch new file mode 100644 index 0000000000..c4419209a5 --- /dev/null +++ b/package/gerbera/0001-Fix-for-fmt-8-0.patch @@ -0,0 +1,44 @@ +From 82d84ac5e62c23e717198fc7b2ef190ff95e70d1 Mon Sep 17 00:00:00 2001 +From: kyak +Date: Wed, 12 Jan 2022 19:41:37 +0300 +Subject: [PATCH] Fix for fmt > 8.0 + +[Retrieved from: +https://github.com/gerbera/gerbera/commit/82d84ac5e62c23e717198fc7b2ef190ff95e70d1] +Signed-off-by: Fabrice Fontaine +--- + src/util/logger.h | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/src/util/logger.h b/src/util/logger.h +index 58696e52f..ba64afa79 100644 +--- a/src/util/logger.h ++++ b/src/util/logger.h +@@ -32,7 +32,9 @@ + #ifndef __LOGGER_H__ + #define __LOGGER_H__ + ++#include + #include ++#include + + #define log_debug SPDLOG_DEBUG + #define log_info SPDLOG_INFO +@@ -40,4 +42,17 @@ + #define log_error SPDLOG_ERROR + #define log_js SPDLOG_INFO + ++#if FMT_VERSION >= 80100 ++template ++struct fmt::formatter, char>> ++ : formatter> { ++ template ++ auto format(const T& value, FormatContext& ctx) -> decltype(ctx.out()) ++ { ++ return fmt::formatter>::format( ++ static_cast>(value), ctx); ++ } ++}; ++#endif ++ + #endif // __LOGGER_H__ -- 2.34.1 From peter at korsgaard.com Sun Feb 6 14:15:13 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 06 Feb 2022 15:15:13 +0100 Subject: [Buildroot] [PATCH] package/bluez5_utils: fix build with libglib2 >= 2.69 In-Reply-To: <20220206092357.19286-1-thomas.devoogdt@gmail.com> (Thomas Devoogdt's message of "Sun, 6 Feb 2022 10:23:57 +0100") References: <20220206092357.19286-1-thomas.devoogdt@gmail.com> Message-ID: <87pmo0w07i.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Devoogdt writes: > Fix the following build failure raised since bump of libglib2 to version > 2.70 in commit 079923d: > profiles/battery/battery.c:162:2: warning: 'g_memdup' is deprecated (declared at /home/buildroot/autobuild/instance-0/output-1/host/bin/../arm-buildroot-linux-gnueabi/sysroot/usr/include/glib-2.0/glib/gstrfuncs.h:257): Use 'g_memdup2' instead [-Wdeprecated-declarations] > batt-> initial_value = g_memdup(value, length); > Fixes: > - http://autobuild.buildroot.org/results/6b8/6b8870d12e0804d6154230a7322c49416c1dc0e2/build-end.log > Sources: > - https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=710220f861b100856711a0a4d4a852874228a57a > - https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=9f09e69ecb077082301dafb745856e1f3731aaa7 > - https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=cfab569484b18407fc117bb96634525cc76ea1f5 > Signed-off-by: Thomas Devoogdt > --- > [update] removed patch numbers & remve change to 0001-tools-mesh-cfgtest-include-limits.h Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 6 14:10:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 15:10:51 +0100 Subject: [Buildroot] [git commit] package/bluez5_utils: fix build with libglib2 >= 2.69 Message-ID: <20220206141008.55A0082ACC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=572d08ee4a731b203b2d3aaf720a48f622609371 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since bump of libglib2 to version 2.70 in commit 079923d: profiles/battery/battery.c:162:2: warning: 'g_memdup' is deprecated (declared at /home/buildroot/autobuild/instance-0/output-1/host/bin/../arm-buildroot-linux-gnueabi/sysroot/usr/include/glib-2.0/glib/gstrfuncs.h:257): Use 'g_memdup2' instead [-Wdeprecated-declarations] batt->initial_value = g_memdup(value, length); Fixes: - http://autobuild.buildroot.org/results/6b8/6b8870d12e0804d6154230a7322c49416c1dc0e2/build-end.log Sources: - https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=710220f861b100856711a0a4d4a852874228a57a - https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=9f09e69ecb077082301dafb745856e1f3731aaa7 - https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=cfab569484b18407fc117bb96634525cc76ea1f5 Signed-off-by: Thomas Devoogdt Signed-off-by: Peter Korsgaard --- ...red-util-Rename-btd_malloc-to-util_malloc.patch | 67 + .../0003-shared-util-Add-util_memdup.patch | 57 + ...-Replace-use-of-g_memdup-with-util_memdup.patch | 1411 ++++++++++++++++++++ 3 files changed, 1535 insertions(+) diff --git a/package/bluez5_utils/0002-shared-util-Rename-btd_malloc-to-util_malloc.patch b/package/bluez5_utils/0002-shared-util-Rename-btd_malloc-to-util_malloc.patch new file mode 100644 index 0000000000..f8d74528d8 --- /dev/null +++ b/package/bluez5_utils/0002-shared-util-Rename-btd_malloc-to-util_malloc.patch @@ -0,0 +1,67 @@ +From f3263fed28bf510a1225661fe2b5f598300c11cd Mon Sep 17 00:00:00 2001 +From: Luiz Augusto von Dentz +Date: Wed, 5 Jan 2022 15:53:35 -0800 +Subject: [PATCH] shared/util: Rename btd_malloc to util_malloc + +util functions are not limited to daemon only which is normally the case +when using btd prefix. + +(cherry picked from commit 710220f861b100856711a0a4d4a852874228a57a) +Signed-off-by: Thomas Devoogdt +--- + profiles/audio/avdtp.c | 2 +- + src/shared/util.c | 2 +- + src/shared/util.h | 4 ++-- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/profiles/audio/avdtp.c b/profiles/audio/avdtp.c +index d3dfbf96d..f2b461330 100644 +--- a/profiles/audio/avdtp.c ++++ b/profiles/audio/avdtp.c +@@ -1333,7 +1333,7 @@ static GSList *caps_to_list(uint8_t *data, size_t size, + break; + } + +- cpy = btd_malloc(sizeof(*cpy) + cap->length); ++ cpy = util_malloc(sizeof(*cpy) + cap->length); + memcpy(cpy, cap, sizeof(*cap) + cap->length); + + size -= sizeof(*cap) + cap->length; +diff --git a/src/shared/util.c b/src/shared/util.c +index 81b20d86f..93110047b 100644 +--- a/src/shared/util.c ++++ b/src/shared/util.c +@@ -25,7 +25,7 @@ + + #include "src/shared/util.h" + +-void *btd_malloc(size_t size) ++void *util_malloc(size_t size) + { + if (__builtin_expect(!!size, 1)) { + void *ptr; +diff --git a/src/shared/util.h b/src/shared/util.h +index ac70117ca..11d09979d 100644 +--- a/src/shared/util.h ++++ b/src/shared/util.h +@@ -75,7 +75,7 @@ do { \ + size_t __n = (size_t) (count); \ + size_t __s = sizeof(type); \ + void *__p; \ +- __p = btd_malloc(__n * __s); \ ++ __p = util_malloc(__n * __s); \ + memset(__p, 0, __n * __s); \ + __p; \ + })) +@@ -86,7 +86,7 @@ do { \ + char *strdelimit(char *str, char *del, char c); + int strsuffix(const char *str, const char *suffix); + +-void *btd_malloc(size_t size); ++void *util_malloc(size_t size); + + typedef void (*util_debug_func_t)(const char *str, void *user_data); + +-- +2.17.1 + diff --git a/package/bluez5_utils/0003-shared-util-Add-util_memdup.patch b/package/bluez5_utils/0003-shared-util-Add-util_memdup.patch new file mode 100644 index 0000000000..d5c31a2614 --- /dev/null +++ b/package/bluez5_utils/0003-shared-util-Add-util_memdup.patch @@ -0,0 +1,57 @@ +From 28f1c140374d1ecda65e3d59cca72352c3a07774 Mon Sep 17 00:00:00 2001 +From: Luiz Augusto von Dentz +Date: Thu, 6 Jan 2022 11:45:12 -0800 +Subject: [PATCH] shared/util: Add util_memdup + +This adds util_memdup which is intended to replace g_memdup since +replacing that with g_memdup2 requires bumping the glib version. + +(cherry picked from commit 9f09e69ecb077082301dafb745856e1f3731aaa7) +Signed-off-by: Thomas Devoogdt +--- + src/shared/util.c | 16 ++++++++++++++++ + src/shared/util.h | 1 + + 2 files changed, 17 insertions(+) + +diff --git a/src/shared/util.c b/src/shared/util.c +index 93110047b..6e1c83057 100644 +--- a/src/shared/util.c ++++ b/src/shared/util.c +@@ -41,6 +41,22 @@ void *util_malloc(size_t size) + return NULL; + } + ++void *util_memdup(const void *src, size_t size) ++{ ++ void *cpy; ++ ++ if (!src || !size) ++ return NULL; ++ ++ cpy = util_malloc(size); ++ if (!cpy) ++ return NULL; ++ ++ memcpy(cpy, src, size); ++ ++ return cpy; ++} ++ + void util_debug_va(util_debug_func_t function, void *user_data, + const char *format, va_list va) + { +diff --git a/src/shared/util.h b/src/shared/util.h +index 11d09979d..8ef6132c4 100644 +--- a/src/shared/util.h ++++ b/src/shared/util.h +@@ -87,6 +87,7 @@ char *strdelimit(char *str, char *del, char c); + int strsuffix(const char *str, const char *suffix); + + void *util_malloc(size_t size); ++void *util_memdup(const void *src, size_t size); + + typedef void (*util_debug_func_t)(const char *str, void *user_data); + +-- +2.17.1 + diff --git a/package/bluez5_utils/0004-build-Replace-use-of-g_memdup-with-util_memdup.patch b/package/bluez5_utils/0004-build-Replace-use-of-g_memdup-with-util_memdup.patch new file mode 100644 index 0000000000..9e1047c957 --- /dev/null +++ b/package/bluez5_utils/0004-build-Replace-use-of-g_memdup-with-util_memdup.patch @@ -0,0 +1,1411 @@ +From 7eb74180cf6fd6cebc61bb719d458cbf5d7f4ca7 Mon Sep 17 00:00:00 2001 +From: Luiz Augusto von Dentz +Date: Thu, 6 Jan 2022 12:50:33 -0800 +Subject: [PATCH] build: Replace use of g_memdup with util_memdup +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This replaces the uses of g_memdup with util_memdup since the former has +been deprecated: + + warning: ???g_memdup??? is deprecated: Use 'g_memdup2' instead + [-Wdeprecated-declarations] + +g_memdup2 requires bumping glib version which would likely have its +own problems thus why util_memdup was introduced. + +(cherry picked from commit cfab569484b18407fc117bb96634525cc76ea1f5) +Signed-off-by: Thomas Devoogdt +--- + Makefile.am | 10 ++--- + Makefile.obexd | 1 + + Makefile.tools | 11 ++++-- + android/a2dp.c | 9 +++-- + android/avctp.c | 5 ++- + android/avrcp-lib.c | 2 +- + android/gatt.c | 5 ++- + android/hidhost.c | 3 +- + android/tester-main.c | 77 +++++++++++++++++++++----------------- + attrib/gatt.c | 12 +++--- + client/gatt.c | 2 +- + gobex/gobex-header.c | 7 ++-- + gobex/gobex-packet.c | 5 ++- + obexd/src/obex.c | 5 ++- + plugins/neard.c | 9 +++-- + plugins/policy.c | 7 ++-- + profiles/audio/avctp.c | 9 +++-- + profiles/audio/avrcp.c | 10 ++--- + profiles/battery/bas.c | 4 +- + profiles/battery/battery.c | 4 +- + profiles/deviceinfo/dis.c | 4 +- + profiles/input/hog-lib.c | 12 +++--- + profiles/scanparam/scpp.c | 4 +- + src/eir.c | 8 ++-- + tools/gatt-service.c | 15 ++++---- + tools/mesh-gatt/gatt.c | 5 ++- + unit/test-avctp.c | 4 +- + unit/test-avdtp.c | 6 +-- + unit/test-avrcp.c | 10 ++--- + unit/test-gatt.c | 4 +- + unit/test-hfp.c | 11 +++--- + unit/test-hog.c | 26 ++++++------- + unit/test-sdp.c | 10 +++-- + unit/test-uhid.c | 2 +- + 34 files changed, 172 insertions(+), 146 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 308f13c50..9b5e140b8 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -508,23 +508,23 @@ unit_tests += unit/test-gobex-header unit/test-gobex-packet unit/test-gobex \ + + unit_test_gobex_SOURCES = $(gobex_sources) unit/util.c unit/util.h \ + unit/test-gobex.c +-unit_test_gobex_LDADD = $(GLIB_LIBS) ++unit_test_gobex_LDADD = src/libshared-glib.la $(GLIB_LIBS) + + unit_test_gobex_packet_SOURCES = $(gobex_sources) unit/util.c unit/util.h \ + unit/test-gobex-packet.c +-unit_test_gobex_packet_LDADD = $(GLIB_LIBS) ++unit_test_gobex_packet_LDADD = src/libshared-glib.la $(GLIB_LIBS) + + unit_test_gobex_header_SOURCES = $(gobex_sources) unit/util.c unit/util.h \ + unit/test-gobex-header.c +-unit_test_gobex_header_LDADD = $(GLIB_LIBS) ++unit_test_gobex_header_LDADD = src/libshared-glib.la $(GLIB_LIBS) + + unit_test_gobex_transfer_SOURCES = $(gobex_sources) unit/util.c unit/util.h \ + unit/test-gobex-transfer.c +-unit_test_gobex_transfer_LDADD = $(GLIB_LIBS) ++unit_test_gobex_transfer_LDADD = src/libshared-glib.la $(GLIB_LIBS) + + unit_test_gobex_apparam_SOURCES = $(gobex_sources) unit/util.c unit/util.h \ + unit/test-gobex-apparam.c +-unit_test_gobex_apparam_LDADD = $(GLIB_LIBS) ++unit_test_gobex_apparam_LDADD = src/libshared-glib.la $(GLIB_LIBS) + endif + + unit_tests += unit/test-lib +diff --git a/Makefile.obexd b/Makefile.obexd +index 37a133455..5d1a4ff65 100644 +--- a/Makefile.obexd ++++ b/Makefile.obexd +@@ -82,6 +82,7 @@ obexd_src_obexd_SOURCES = $(btio_sources) $(gobex_sources) \ + obexd/src/map_ap.h + obexd_src_obexd_LDADD = lib/libbluetooth-internal.la \ + gdbus/libgdbus-internal.la \ ++ src/libshared-glib.la \ + $(ICAL_LIBS) $(DBUS_LIBS) $(LIBEBOOK_LIBS) \ + $(LIBEDATASERVER_LIBS) $(GLIB_LIBS) -ldl + +diff --git a/Makefile.tools b/Makefile.tools +index c7bdff83f..35b0021ea 100644 +--- a/Makefile.tools ++++ b/Makefile.tools +@@ -302,7 +302,8 @@ tools_mpris_proxy_SOURCES = tools/mpris-proxy.c + tools_mpris_proxy_LDADD = gdbus/libgdbus-internal.la $(GLIB_LIBS) $(DBUS_LIBS) + + tools_gatt_service_SOURCES = tools/gatt-service.c +-tools_gatt_service_LDADD = $(GLIB_LIBS) $(DBUS_LIBS) gdbus/libgdbus-internal.la ++tools_gatt_service_LDADD = gdbus/libgdbus-internal.la \ ++ src/libshared-mainloop.la $(GLIB_LIBS) $(DBUS_LIBS) + + profiles_iap_iapd_SOURCES = profiles/iap/main.c + profiles_iap_iapd_LDADD = gdbus/libgdbus-internal.la $(GLIB_LIBS) $(DBUS_LIBS) +@@ -448,11 +449,12 @@ noinst_PROGRAMS += tools/btmgmt tools/obex-client-tool tools/obex-server-tool \ + tools_obex_client_tool_SOURCES = $(gobex_sources) $(btio_sources) \ + tools/obex-client-tool.c + tools_obex_client_tool_LDADD = lib/libbluetooth-internal.la \ +- $(GLIB_LIBS) -lreadline ++ src/libshared-glib.la $(GLIB_LIBS) -lreadline + + tools_obex_server_tool_SOURCES = $(gobex_sources) $(btio_sources) \ + tools/obex-server-tool.c +-tools_obex_server_tool_LDADD = lib/libbluetooth-internal.la $(GLIB_LIBS) ++tools_obex_server_tool_LDADD = lib/libbluetooth-internal.la \ ++ src/libshared-glib.la $(GLIB_LIBS) + + tools_bluetooth_player_SOURCES = tools/bluetooth-player.c + tools_bluetooth_player_LDADD = gdbus/libgdbus-internal.la \ +@@ -461,7 +463,8 @@ tools_bluetooth_player_LDADD = gdbus/libgdbus-internal.la \ + + tools_obexctl_SOURCES = tools/obexctl.c + tools_obexctl_LDADD = gdbus/libgdbus-internal.la src/libshared-glib.la \ +- $(GLIB_LIBS) $(DBUS_LIBS) -lreadline ++ src/libshared-glib.la $(GLIB_LIBS) $(DBUS_LIBS) \ ++ -lreadline + + tools_btmgmt_SOURCES = tools/btmgmt.c src/uuid-helper.c client/display.c + tools_btmgmt_LDADD = lib/libbluetooth-internal.la src/libshared-mainloop.la \ +diff --git a/android/a2dp.c b/android/a2dp.c +index 029107cf5..ee607a32d 100644 +--- a/android/a2dp.c ++++ b/android/a2dp.c +@@ -26,6 +26,7 @@ + #include "lib/sdp_lib.h" + #include "profiles/audio/a2dp-codecs.h" + #include "src/shared/queue.h" ++#include "src/shared/util.h" + #include "src/log.h" + #include "hal-msg.h" + #include "ipc-common.h" +@@ -428,7 +429,7 @@ static struct a2dp_preset *sbc_select_range(void *caps, uint8_t caps_len, + + p = g_new0(struct a2dp_preset, 1); + p->len = conf_len; +- p->data = g_memdup(conf, p->len); ++ p->data = util_memdup(conf, p->len); + + return p; + } +@@ -448,7 +449,7 @@ static struct a2dp_preset *aac_select_range(void *caps, uint8_t caps_len, + + p = g_new0(struct a2dp_preset, 1); + p->len = conf_len; +- p->data = g_memdup(conf, p->len); ++ p->data = util_memdup(conf, p->len); + + return p; + } +@@ -1036,7 +1037,7 @@ static gboolean sep_setconf_ind(struct avdtp *session, + + preset = g_new0(struct a2dp_preset, 1); + preset->len = cap->length - sizeof(*codec); +- preset->data = g_memdup(codec->data, preset->len); ++ preset->data = util_memdup(codec->data, preset->len); + + if (check_config(endpoint, preset) < 0) { + preset_free(preset); +@@ -1365,7 +1366,7 @@ static GSList *parse_presets(const struct audio_preset *p, uint8_t count, + + preset = g_new0(struct a2dp_preset, 1); + preset->len = p->len; +- preset->data = g_memdup(p->data, preset->len); ++ preset->data = util_memdup(p->data, preset->len); + l = g_slist_append(l, preset); + + len -= preset->len; +diff --git a/android/avctp.c b/android/avctp.c +index 14ebbc391..37b4cec4f 100644 +--- a/android/avctp.c ++++ b/android/avctp.c +@@ -31,6 +31,7 @@ + #include + + #include "lib/sdp.h" ++#include "src/shared/util.h" + #include "src/log.h" + #include "avctp.h" + +@@ -1177,7 +1178,7 @@ static int avctp_send_req(struct avctp *session, uint8_t code, uint8_t subunit, + + for (i = 0; i < iov_cnt; i++) { + pdu[i].iov_len = iov[i].iov_len; +- pdu[i].iov_base = g_memdup(iov[i].iov_base, iov[i].iov_len); ++ pdu[i].iov_base = util_memdup(iov[i].iov_base, iov[i].iov_len); + } + + req = g_new0(struct avctp_control_req, 1); +@@ -1218,7 +1219,7 @@ int avctp_send_browsing_req(struct avctp *session, + + for (i = 0; i < iov_cnt; i++) { + pdu[i].iov_len = iov[i].iov_len; +- pdu[i].iov_base = g_memdup(iov[i].iov_base, iov[i].iov_len); ++ pdu[i].iov_base = util_memdup(iov[i].iov_base, iov[i].iov_len); + } + + req = g_new0(struct avctp_browsing_req, 1); +diff --git a/android/avrcp-lib.c b/android/avrcp-lib.c +index 2007d09d2..b342692cb 100644 +--- a/android/avrcp-lib.c ++++ b/android/avrcp-lib.c +@@ -2620,7 +2620,7 @@ static char *parse_folder_list(uint8_t *params, uint16_t params_len, + return NULL; + } + +- folders[count] = g_memdup(¶ms[i], len); ++ folders[count] = util_memdup(¶ms[i], len); + i += len; + } + +diff --git a/android/gatt.c b/android/gatt.c +index a8a0c488b..e8ba5aabb 100644 +--- a/android/gatt.c ++++ b/android/gatt.c +@@ -1338,7 +1338,8 @@ static void discover_primary_cb(uint8_t status, GSList *services, + } + + bt_uuid_to_uuid128(&uuid, &u128); +- new_uuid = g_memdup(&u128.value.u128, sizeof(u128.value.u128)); ++ new_uuid = util_memdup(&u128.value.u128, ++ sizeof(u128.value.u128)); + + uuids = g_slist_prepend(uuids, new_uuid); + } +@@ -6633,7 +6634,7 @@ static uint8_t write_prep_request(const uint8_t *cmd, uint16_t cmd_len, + + queue_push_tail(dev->pending_requests, data); + +- data->value = g_memdup(value, vlen); ++ data->value = util_memdup(value, vlen); + data->length = vlen; + + if (!gatt_db_attribute_write(attrib, offset, value, vlen, cmd[0], +diff --git a/android/hidhost.c b/android/hidhost.c +index 016382e17..b4e5c527f 100644 +--- a/android/hidhost.c ++++ b/android/hidhost.c +@@ -689,7 +689,8 @@ static void hid_sdp_search_cb(sdp_list_t *recs, int err, gpointer data) + goto fail; + + dev->rd_size = data->unitSize; +- dev->rd_data = g_memdup(data->val.str, data->unitSize); ++ dev->rd_data = util_memdup(data->val.str, ++ data->unitSize); + } + } + +diff --git a/android/tester-main.c b/android/tester-main.c +index ff5ecdf83..317c1de06 100644 +--- a/android/tester-main.c ++++ b/android/tester-main.c +@@ -1253,7 +1253,8 @@ static bt_property_t *copy_properties(int num_properties, + for (i = 0; i < num_properties; i++) { + props[i].type = properties[i].type; + props[i].len = properties[i].len; +- props[i].val = g_memdup(properties[i].val, properties[i].len); ++ props[i].val = util_memdup(properties[i].val, ++ properties[i].len); + } + + return props; +@@ -1268,7 +1269,8 @@ static bt_property_t *repack_properties(int num_properties, + for (i = 0; i < num_properties; i++) { + props[i].type = properties[i]->type; + props[i].len = properties[i]->len; +- props[i].val = g_memdup(properties[i]->val, properties[i]->len); ++ props[i].val = util_memdup(properties[i]->val, ++ properties[i]->len); + } + + return props; +@@ -1281,7 +1283,7 @@ static bt_property_t *create_property(bt_property_type_t type, void *val, + + prop->type = type; + prop->len = len; +- prop->val = g_memdup(val, len); ++ prop->val = util_memdup(val, len); + + return prop; + } +@@ -1615,7 +1617,7 @@ static void gattc_search_result_cb(int conn_id, btgatt_srvc_id_t *srvc_id) + + step->callback = CB_GATTC_SEARCH_RESULT; + step->callback_result.conn_id = conn_id; +- step->callback_result.service = g_memdup(srvc_id, sizeof(*srvc_id)); ++ step->callback_result.service = util_memdup(srvc_id, sizeof(*srvc_id)); + + schedule_callback_verification(step); + } +@@ -1639,8 +1641,8 @@ static void gattc_get_characteristic_cb(int conn_id, int status, + step->callback = CB_GATTC_GET_CHARACTERISTIC; + step->callback_result.status = status; + step->callback_result.conn_id = conn_id; +- step->callback_result.service = g_memdup(srvc_id, sizeof(*srvc_id)); +- step->callback_result.characteristic = g_memdup(char_id, ++ step->callback_result.service = util_memdup(srvc_id, sizeof(*srvc_id)); ++ step->callback_result.characteristic = util_memdup(char_id, + sizeof(*char_id)); + step->callback_result.char_prop = char_prop; + +@@ -1656,10 +1658,10 @@ static void gattc_get_descriptor_cb(int conn_id, int status, + step->callback = CB_GATTC_GET_DESCRIPTOR; + step->callback_result.status = status; + step->callback_result.conn_id = conn_id; +- step->callback_result.service = g_memdup(srvc_id, sizeof(*srvc_id)); +- step->callback_result.characteristic = g_memdup(char_id, ++ step->callback_result.service = util_memdup(srvc_id, sizeof(*srvc_id)); ++ step->callback_result.characteristic = util_memdup(char_id, + sizeof(*char_id)); +- step->callback_result.descriptor = g_memdup(descr_id, ++ step->callback_result.descriptor = util_memdup(descr_id, + sizeof(*descr_id)); + + schedule_callback_verification(step); +@@ -1673,8 +1675,8 @@ static void gattc_get_included_service_cb(int conn_id, int status, + step->callback = CB_GATTC_GET_INCLUDED_SERVICE; + step->callback_result.status = status; + step->callback_result.conn_id = conn_id; +- step->callback_result.service = g_memdup(srvc_id, sizeof(*srvc_id)); +- step->callback_result.included = g_memdup(incl_srvc_id, ++ step->callback_result.service = util_memdup(srvc_id, sizeof(*srvc_id)); ++ step->callback_result.included = util_memdup(incl_srvc_id, + sizeof(*srvc_id)); + + schedule_callback_verification(step); +@@ -1688,7 +1690,8 @@ static void gattc_read_characteristic_cb(int conn_id, int status, + step->callback = CB_GATTC_READ_CHARACTERISTIC; + step->callback_result.status = status; + step->callback_result.conn_id = conn_id; +- step->callback_result.read_params = g_memdup(p_data, sizeof(*p_data)); ++ step->callback_result.read_params = util_memdup(p_data, ++ sizeof(*p_data)); + + schedule_callback_verification(step); + } +@@ -1701,7 +1704,8 @@ static void gattc_read_descriptor_cb(int conn_id, int status, + step->callback = CB_GATTC_READ_DESCRIPTOR; + step->callback_result.status = status; + step->callback_result.conn_id = conn_id; +- step->callback_result.read_params = g_memdup(p_data, sizeof(*p_data)); ++ step->callback_result.read_params = util_memdup(p_data, ++ sizeof(*p_data)); + + schedule_callback_verification(step); + } +@@ -1714,7 +1718,8 @@ static void gattc_write_characteristic_cb(int conn_id, int status, + step->callback = CB_GATTC_WRITE_CHARACTERISTIC; + step->callback_result.status = status; + step->callback_result.conn_id = conn_id; +- step->callback_result.write_params = g_memdup(p_data, sizeof(*p_data)); ++ step->callback_result.write_params = util_memdup(p_data, ++ sizeof(*p_data)); + + schedule_callback_verification(step); + } +@@ -1727,7 +1732,8 @@ static void gattc_write_descriptor_cb(int conn_id, int status, + step->callback = CB_GATTC_WRITE_DESCRIPTOR; + step->callback_result.status = status; + step->callback_result.conn_id = conn_id; +- step->callback_result.write_params = g_memdup(p_data, sizeof(*p_data)); ++ step->callback_result.write_params = util_memdup(p_data, ++ sizeof(*p_data)); + + schedule_callback_verification(step); + } +@@ -1742,8 +1748,8 @@ static void gattc_register_for_notification_cb(int conn_id, int registered, + step->callback = CB_GATTC_REGISTER_FOR_NOTIFICATION; + step->callback_result.status = status; + step->callback_result.conn_id = conn_id; +- step->callback_result.service = g_memdup(srvc_id, sizeof(*srvc_id)); +- step->callback_result.characteristic = g_memdup(char_id, ++ step->callback_result.service = util_memdup(srvc_id, sizeof(*srvc_id)); ++ step->callback_result.characteristic = util_memdup(char_id, + sizeof(*char_id)); + step->callback_result.notification_registered = registered; + +@@ -1756,7 +1762,8 @@ static void gattc_notif_cb(int conn_id, btgatt_notify_params_t *p_data) + + step->callback = CB_GATTC_NOTIFY; + step->callback_result.conn_id = conn_id; +- step->callback_result.notify_params = g_memdup(p_data, sizeof(*p_data)); ++ step->callback_result.notify_params = util_memdup(p_data, ++ sizeof(*p_data)); + + schedule_callback_verification(step); + } +@@ -1827,8 +1834,8 @@ static void gatts_service_added_cb(int status, int server_if, + + step->callback_result.status = status; + step->callback_result.gatt_app_id = server_if; +- step->callback_result.service = g_memdup(srvc_id, sizeof(*srvc_id)); +- step->callback_result.srvc_handle = g_memdup(&srvc_handle, ++ step->callback_result.service = util_memdup(srvc_id, sizeof(*srvc_id)); ++ step->callback_result.srvc_handle = util_memdup(&srvc_handle, + sizeof(srvc_handle)); + + schedule_callback_verification(step); +@@ -1844,9 +1851,9 @@ static void gatts_included_service_added_cb(int status, int server_if, + + step->callback_result.status = status; + step->callback_result.gatt_app_id = server_if; +- step->callback_result.srvc_handle = g_memdup(&srvc_handle, ++ step->callback_result.srvc_handle = util_memdup(&srvc_handle, + sizeof(srvc_handle)); +- step->callback_result.inc_srvc_handle = g_memdup(&inc_srvc_handle, ++ step->callback_result.inc_srvc_handle = util_memdup(&inc_srvc_handle, + sizeof(inc_srvc_handle)); + + schedule_callback_verification(step); +@@ -1863,10 +1870,10 @@ static void gatts_characteristic_added_cb(int status, int server_if, + + step->callback_result.status = status; + step->callback_result.gatt_app_id = server_if; +- step->callback_result.srvc_handle = g_memdup(&srvc_handle, ++ step->callback_result.srvc_handle = util_memdup(&srvc_handle, + sizeof(srvc_handle)); +- step->callback_result.uuid = g_memdup(uuid, sizeof(*uuid)); +- step->callback_result.char_handle = g_memdup(&char_handle, ++ step->callback_result.uuid = util_memdup(uuid, sizeof(*uuid)); ++ step->callback_result.char_handle = util_memdup(&char_handle, + sizeof(char_handle)); + + schedule_callback_verification(step); +@@ -1883,10 +1890,10 @@ static void gatts_descriptor_added_cb(int status, int server_if, + + step->callback_result.status = status; + step->callback_result.gatt_app_id = server_if; +- step->callback_result.srvc_handle = g_memdup(&srvc_handle, ++ step->callback_result.srvc_handle = util_memdup(&srvc_handle, + sizeof(srvc_handle)); +- step->callback_result.uuid = g_memdup(uuid, sizeof(*uuid)); +- step->callback_result.desc_handle = g_memdup(&desc_handle, ++ step->callback_result.uuid = util_memdup(uuid, sizeof(*uuid)); ++ step->callback_result.desc_handle = util_memdup(&desc_handle, + sizeof(desc_handle)); + + schedule_callback_verification(step); +@@ -1900,7 +1907,7 @@ static void gatts_service_started_cb(int status, int server_if, int srvc_handle) + + step->callback_result.status = status; + step->callback_result.gatt_app_id = server_if; +- step->callback_result.srvc_handle = g_memdup(&srvc_handle, ++ step->callback_result.srvc_handle = util_memdup(&srvc_handle, + sizeof(srvc_handle)); + + schedule_callback_verification(step); +@@ -1914,7 +1921,7 @@ static void gatts_service_stopped_cb(int status, int server_if, int srvc_handle) + + step->callback_result.status = status; + step->callback_result.gatt_app_id = server_if; +- step->callback_result.srvc_handle = g_memdup(&srvc_handle, ++ step->callback_result.srvc_handle = util_memdup(&srvc_handle, + sizeof(srvc_handle)); + + schedule_callback_verification(step); +@@ -1928,7 +1935,7 @@ static void gatts_service_deleted_cb(int status, int server_if, int srvc_handle) + + step->callback_result.status = status; + step->callback_result.gatt_app_id = server_if; +- step->callback_result.srvc_handle = g_memdup(&srvc_handle, ++ step->callback_result.srvc_handle = util_memdup(&srvc_handle, + sizeof(srvc_handle)); + + schedule_callback_verification(step); +@@ -1945,7 +1952,7 @@ static void gatts_request_read_cb(int conn_id, int trans_id, bt_bdaddr_t *bda, + + step->callback_result.conn_id = conn_id; + step->callback_result.trans_id = trans_id; +- step->callback_result.attr_handle = g_memdup(&attr_handle, ++ step->callback_result.attr_handle = util_memdup(&attr_handle, + sizeof(attr_handle)); + step->callback_result.offset = offset; + step->callback_result.is_long = is_long; +@@ -1974,13 +1981,13 @@ static void gatts_request_write_cb(int conn_id, int trans_id, bt_bdaddr_t *bda, + + step->callback_result.conn_id = conn_id; + step->callback_result.trans_id = trans_id; +- step->callback_result.attr_handle = g_memdup(&attr_handle, ++ step->callback_result.attr_handle = util_memdup(&attr_handle, + sizeof(attr_handle)); + step->callback_result.offset = offset; + step->callback_result.length = length; + step->callback_result.need_rsp = need_rsp; + step->callback_result.is_prep = is_prep; +- step->callback_result.value = g_memdup(&value, length); ++ step->callback_result.value = util_memdup(&value, length); + + /* Utilize property verification mechanism for bdaddr */ + props[0] = create_property(BT_PROPERTY_BDADDR, bda, sizeof(*bda)); +@@ -2169,7 +2176,7 @@ static btmce_mas_instance_t *copy_mas_instances(int num_instances, + inst[i].id = instances[i].id; + inst[i].scn = instances[i].scn; + inst[i].msg_types = instances[i].msg_types; +- inst[i].p_name = g_memdup(instances[i].p_name, ++ inst[i].p_name = util_memdup(instances[i].p_name, + strlen(instances[i].p_name)); + } + +diff --git a/attrib/gatt.c b/attrib/gatt.c +index 46b2ca381..b496dd1eb 100644 +--- a/attrib/gatt.c ++++ b/attrib/gatt.c +@@ -135,7 +135,7 @@ static void discover_char_unref(void *data) + + g_slist_free_full(dc->characteristics, g_free); + g_attrib_unref(dc->attrib); +- g_free(dc->uuid); ++ free(dc->uuid); + g_free(dc); + } + +@@ -157,7 +157,7 @@ static void discover_desc_unref(void *data) + + g_slist_free_full(dd->descriptors, g_free); + g_attrib_unref(dd->attrib); +- g_free(dd->uuid); ++ free(dd->uuid); + g_free(dd); + } + +@@ -696,7 +696,7 @@ guint gatt_discover_char(GAttrib *attrib, uint16_t start, uint16_t end, + dc->user_data = user_data; + dc->end = end; + dc->start = start; +- dc->uuid = g_memdup(uuid, sizeof(bt_uuid_t)); ++ dc->uuid = util_memdup(uuid, sizeof(bt_uuid_t)); + + dc->id = g_attrib_send(attrib, 0, buf, plen, char_discovered_cb, + discover_char_ref(dc), discover_char_unref); +@@ -905,7 +905,7 @@ static void prepare_write_cb(guint8 status, const guint8 *rpdu, guint16 rlen, + if (long_write->offset == long_write->vlen) { + execute_write(long_write->attrib, ATT_WRITE_ALL_PREP_WRITES, + long_write->func, long_write->user_data); +- g_free(long_write->value); ++ free(long_write->value); + g_free(long_write); + + return; +@@ -964,7 +964,7 @@ guint gatt_write_char(GAttrib *attrib, uint16_t handle, const uint8_t *value, + long_write->func = func; + long_write->user_data = user_data; + long_write->handle = handle; +- long_write->value = g_memdup(value, vlen); ++ long_write->value = util_memdup(value, vlen); + long_write->vlen = vlen; + + return prepare_write(long_write); +@@ -1130,7 +1130,7 @@ guint gatt_discover_desc(GAttrib *attrib, uint16_t start, uint16_t end, + dd->user_data = user_data; + dd->start = start; + dd->end = end; +- dd->uuid = g_memdup(uuid, sizeof(bt_uuid_t)); ++ dd->uuid = util_memdup(uuid, sizeof(bt_uuid_t)); + + dd->id = g_attrib_send(attrib, 0, buf, plen, desc_discovered_cb, + discover_desc_ref(dd), discover_desc_unref); +diff --git a/client/gatt.c b/client/gatt.c +index 11f70dc4f..13872c794 100644 +--- a/client/gatt.c ++++ b/client/gatt.c +@@ -811,7 +811,7 @@ static uint8_t *str2bytearray(char *arg, size_t *val_len) + + *val_len = i; + +- return g_memdup(value, i); ++ return util_memdup(value, i); + } + + void gatt_write_attribute(GDBusProxy *proxy, int argc, char *argv[]) +diff --git a/gobex/gobex-header.c b/gobex/gobex-header.c +index 011d33d1a..002ba8861 100644 +--- a/gobex/gobex-header.c ++++ b/gobex/gobex-header.c +@@ -15,6 +15,7 @@ + + #include "gobex-header.h" + #include "gobex-debug.h" ++#include "src/shared/util.h" + + /* Header types */ + #define G_OBEX_HDR_ENC_UNICODE (0 << 6) +@@ -222,7 +223,7 @@ GObexHeader *g_obex_header_decode(const void *data, gsize len, + + switch (data_policy) { + case G_OBEX_DATA_COPY: +- header->v.data = g_memdup(ptr, header->vlen); ++ header->v.data = util_memdup(ptr, header->vlen); + break; + case G_OBEX_DATA_REF: + header->extdata = TRUE; +@@ -282,7 +283,7 @@ void g_obex_header_free(GObexHeader *header) + break; + case G_OBEX_HDR_ENC_BYTES: + if (!header->extdata) +- g_free(header->v.data); ++ free(header->v.data); + break; + case G_OBEX_HDR_ENC_UINT8: + case G_OBEX_HDR_ENC_UINT32: +@@ -410,7 +411,7 @@ GObexHeader *g_obex_header_new_bytes(guint8 id, const void *data, gsize len) + header->id = id; + header->vlen = len; + header->hlen = len + 3; +- header->v.data = g_memdup(data, len); ++ header->v.data = util_memdup(data, len); + + return header; + } +diff --git a/gobex/gobex-packet.c b/gobex/gobex-packet.c +index 11937a5a5..8ae78b0f6 100644 +--- a/gobex/gobex-packet.c ++++ b/gobex/gobex-packet.c +@@ -17,6 +17,7 @@ + #include "gobex-defs.h" + #include "gobex-packet.h" + #include "gobex-debug.h" ++#include "src/shared/util.h" + + #define FINAL_BIT 0x80 + +@@ -201,7 +202,7 @@ gboolean g_obex_packet_set_data(GObexPacket *pkt, const void *data, gsize len, + + switch (data_policy) { + case G_OBEX_DATA_COPY: +- pkt->data.buf = g_memdup(data, len); ++ pkt->data.buf = util_memdup(data, len); + break; + case G_OBEX_DATA_REF: + pkt->data.buf_ref = data; +@@ -259,7 +260,7 @@ void g_obex_packet_free(GObexPacket *pkt) + switch (pkt->data_policy) { + case G_OBEX_DATA_INHERIT: + case G_OBEX_DATA_COPY: +- g_free(pkt->data.buf); ++ free(pkt->data.buf); + break; + case G_OBEX_DATA_REF: + break; +diff --git a/obexd/src/obex.c b/obexd/src/obex.c +index 9f992ec18..3a68fd66c 100644 +--- a/obexd/src/obex.c ++++ b/obexd/src/obex.c +@@ -40,6 +40,7 @@ + #include "mimetype.h" + #include "service.h" + #include "transport.h" ++#include "src/shared/util.h" + + typedef struct { + uint8_t version; +@@ -145,7 +146,7 @@ static void os_reset_session(struct obex_session *os) + os->path = NULL; + } + if (os->apparam) { +- g_free(os->apparam); ++ free(os->apparam); + os->apparam = NULL; + os->apparam_len = 0; + } +@@ -594,7 +595,7 @@ static void parse_apparam(struct obex_session *os, GObexPacket *req) + if (!g_obex_header_get_bytes(hdr, &apparam, &len)) + return; + +- os->apparam = g_memdup(apparam, len); ++ os->apparam = util_memdup(apparam, len); + os->apparam_len = len; + DBG("APPARAM"); + } +diff --git a/plugins/neard.c b/plugins/neard.c +index e07b51106..a75527148 100644 +--- a/plugins/neard.c ++++ b/plugins/neard.c +@@ -30,6 +30,7 @@ + #include "src/eir.h" + #include "src/agent.h" + #include "src/btd.h" ++#include "src/shared/util.h" + + #define NEARD_NAME "org.neard" + #define NEARD_PATH "/" +@@ -71,7 +72,7 @@ static void free_oob_params(struct oob_params *params) + g_free(params->name); + g_free(params->hash); + g_free(params->randomizer); +- g_free(params->pin); ++ free(params->pin); + } + + static DBusMessage *error_reply(DBusMessage *msg, int error) +@@ -407,10 +408,10 @@ static int process_nokia_long (void *data, size_t size, uint8_t marker, + remote->name = g_strndup((char *)n->name, n->name_len); + + if (marker == 0x01) { +- remote->pin = g_memdup(n->authentication, 4); ++ remote->pin = util_memdup(n->authentication, 4); + remote->pin_len = 4; + } else if (marker == 0x02) { +- remote->pin = g_memdup(n->authentication, 16); ++ remote->pin = util_memdup(n->authentication, 16); + remote->pin_len = 16; + } + +@@ -439,7 +440,7 @@ static int process_nokia_short (void *data, size_t size, + if (n->name_len > 0) + remote->name = g_strndup((char *)n->name, n->name_len); + +- remote->pin = g_memdup(n->authentication, 4); ++ remote->pin = util_memdup(n->authentication, 4); + remote->pin_len = 4; + + return 0; +diff --git a/plugins/policy.c b/plugins/policy.c +index 051db82e1..48f5db7d3 100644 +--- a/plugins/policy.c ++++ b/plugins/policy.c +@@ -32,6 +32,7 @@ + #include "src/profile.h" + #include "src/btd.h" + #include "src/shared/timeout.h" ++#include "src/shared/util.h" + + #define CONTROL_CONNECT_TIMEOUT 2 + #define SOURCE_RETRY_TIMEOUT 2 +@@ -855,7 +856,7 @@ static int policy_init(void) + reconnect_attempts = default_attempts; + reconnect_intervals_len = sizeof(default_intervals) / + sizeof(*reconnect_intervals); +- reconnect_intervals = g_memdup(default_intervals, ++ reconnect_intervals = util_memdup(default_intervals, + sizeof(default_intervals)); + goto done; + } +@@ -886,7 +887,7 @@ static int policy_init(void) + g_clear_error(&gerr); + reconnect_intervals_len = sizeof(default_intervals) / + sizeof(*reconnect_intervals); +- reconnect_intervals = g_memdup(default_intervals, ++ reconnect_intervals = util_memdup(default_intervals, + sizeof(default_intervals)); + } + +@@ -919,7 +920,7 @@ static void policy_exit(void) + if (reconnect_uuids) + g_strfreev(reconnect_uuids); + +- g_free(reconnect_intervals); ++ free(reconnect_intervals); + + g_slist_free_full(reconnects, reconnect_destroy); + +diff --git a/profiles/audio/avctp.c b/profiles/audio/avctp.c +index 64d1a8504..6f64f162b 100644 +--- a/profiles/audio/avctp.c ++++ b/profiles/audio/avctp.c +@@ -40,6 +40,7 @@ + #include "src/log.h" + #include "src/error.h" + #include "src/shared/timeout.h" ++#include "src/shared/util.h" + + #include "avctp.h" + #include "avrcp.h" +@@ -760,7 +761,7 @@ static void control_req_destroy(void *data) + NULL, 0, req->user_data); + + done: +- g_free(req->operands); ++ free(req->operands); + g_free(req); + } + +@@ -776,7 +777,7 @@ static void browsing_req_destroy(void *data) + req->func(session, NULL, 0, req->user_data); + + done: +- g_free(req->operands); ++ free(req->operands); + g_free(req); + } + +@@ -1727,7 +1728,7 @@ static int avctp_send_req(struct avctp *session, uint8_t code, + req->subunit = subunit; + req->op = opcode; + req->func = func; +- req->operands = g_memdup(operands, operand_count); ++ req->operands = util_memdup(operands, operand_count); + req->operand_count = operand_count; + req->user_data = user_data; + +@@ -1765,7 +1766,7 @@ int avctp_send_browsing_req(struct avctp *session, + + req = g_new0(struct avctp_browsing_req, 1); + req->func = func; +- req->operands = g_memdup(operands, operand_count); ++ req->operands = util_memdup(operands, operand_count); + req->operand_count = operand_count; + req->user_data = user_data; + +diff --git a/profiles/audio/avrcp.c b/profiles/audio/avrcp.c +index 7c280203c..d4e19ffc0 100644 +--- a/profiles/audio/avrcp.c ++++ b/profiles/audio/avrcp.c +@@ -1298,7 +1298,7 @@ static uint8_t avrcp_handle_get_current_player_value(struct avrcp *session, + * Save a copy of requested settings because we can override them + * while responding + */ +- settings = g_memdup(&pdu->params[1], pdu->params[0]); ++ settings = util_memdup(&pdu->params[1], pdu->params[0]); + len = 0; + + /* +@@ -1323,7 +1323,7 @@ static uint8_t avrcp_handle_get_current_player_value(struct avrcp *session, + pdu->params[++len] = val; + } + +- g_free(settings); ++ free(settings); + + if (len) { + pdu->params[0] = len / 2; +@@ -2801,7 +2801,7 @@ static gboolean avrcp_set_browsed_player_rsp(struct avctp *conn, + break; + } + +- folders[count] = g_memdup(&pdu->params[i], len); ++ folders[count] = util_memdup(&pdu->params[i], len); + i += len; + } + +@@ -2888,7 +2888,7 @@ static void avrcp_player_parse_features(struct avrcp_player *player, + { + struct media_player *mp = player->user_data; + +- player->features = g_memdup(features, 16); ++ player->features = util_memdup(features, 16); + + if (features[7] & 0x08) { + media_player_set_browsable(mp, true); +@@ -3622,7 +3622,7 @@ static void player_destroy(gpointer data) + g_slist_free(player->sessions); + g_free(player->path); + g_free(player->change_path); +- g_free(player->features); ++ free(player->features); + g_free(player); + } + +diff --git a/profiles/battery/bas.c b/profiles/battery/bas.c +index 3c6173b61..16ff22e19 100644 +--- a/profiles/battery/bas.c ++++ b/profiles/battery/bas.c +@@ -62,7 +62,7 @@ static void bas_free(struct bt_bas *bas) + { + bt_bas_detach(bas); + +- g_free(bas->primary); ++ free(bas->primary); + queue_destroy(bas->gatt_op, (void *) destroy_gatt_req); + free(bas); + } +@@ -75,7 +75,7 @@ struct bt_bas *bt_bas_new(void *primary) + bas->gatt_op = queue_new(); + + if (primary) +- bas->primary = g_memdup(primary, sizeof(*bas->primary)); ++ bas->primary = util_memdup(primary, sizeof(*bas->primary)); + + return bt_bas_ref(bas); + } +diff --git a/profiles/battery/battery.c b/profiles/battery/battery.c +index 176d127f6..02d024d92 100644 +--- a/profiles/battery/battery.c ++++ b/profiles/battery/battery.c +@@ -66,7 +66,7 @@ static void batt_free(struct batt *batt) + gatt_db_unref(batt->db); + bt_gatt_client_unref(batt->client); + btd_device_unref(batt->device); +- g_free (batt->initial_value); ++ free(batt->initial_value); + if (batt->battery) + btd_battery_unregister(batt->battery); + g_free(batt); +@@ -159,7 +159,7 @@ static void read_initial_battery_level_cb(bool success, + if (!length) + return; + +- batt->initial_value = g_memdup(value, length); ++ batt->initial_value = util_memdup(value, length); + + /* request notify */ + batt->batt_level_cb_id = +diff --git a/profiles/deviceinfo/dis.c b/profiles/deviceinfo/dis.c +index 87fa63306..f660179ed 100644 +--- a/profiles/deviceinfo/dis.c ++++ b/profiles/deviceinfo/dis.c +@@ -72,7 +72,7 @@ static void dis_free(struct bt_dis *dis) + { + bt_dis_detach(dis); + +- g_free(dis->primary); ++ free(dis->primary); + queue_destroy(dis->gatt_op, (void *) destroy_gatt_req); + g_free(dis); + } +@@ -143,7 +143,7 @@ struct bt_dis *bt_dis_new_primary(void *primary) + dis->gatt_op = queue_new(); + + if (primary) +- dis->primary = g_memdup(primary, sizeof(*dis->primary)); ++ dis->primary = util_memdup(primary, sizeof(*dis->primary)); + + return bt_dis_ref(dis); + } +diff --git a/profiles/input/hog-lib.c b/profiles/input/hog-lib.c +index 3bbe42370..d37caa1f1 100644 +--- a/profiles/input/hog-lib.c ++++ b/profiles/input/hog-lib.c +@@ -527,9 +527,9 @@ static void report_read_cb(guint8 status, const guint8 *pdu, guint16 len, + } + + if (report->value) +- g_free(report->value); ++ free(report->value); + +- report->value = g_memdup(pdu, len); ++ report->value = util_memdup(pdu, len); + report->len = len; + } + +@@ -1217,7 +1217,7 @@ static void report_free(void *data) + { + struct report *report = data; + +- g_free(report->value); ++ free(report->value); + g_free(report); + } + +@@ -1241,7 +1241,7 @@ static void hog_free(void *data) + bt_uhid_unref(hog->uhid); + g_slist_free_full(hog->reports, report_free); + g_free(hog->name); +- g_free(hog->primary); ++ free(hog->primary); + queue_destroy(hog->gatt_op, (void *) destroy_gatt_req); + if (hog->gatt_db) + gatt_db_unref(hog->gatt_db); +@@ -1609,7 +1609,7 @@ static void hog_attach_hog(struct bt_hog *hog, struct gatt_primary *primary) + struct bt_hog *instance; + + if (!hog->primary) { +- hog->primary = g_memdup(primary, sizeof(*primary)); ++ hog->primary = util_memdup(primary, sizeof(*primary)); + discover_char(hog, hog->attrib, primary->range.start, + primary->range.end, NULL, + char_discovered_cb, hog); +@@ -1623,7 +1623,7 @@ static void hog_attach_hog(struct bt_hog *hog, struct gatt_primary *primary) + if (!instance) + return; + +- instance->primary = g_memdup(primary, sizeof(*primary)); ++ instance->primary = util_memdup(primary, sizeof(*primary)); + find_included(instance, hog->attrib, primary->range.start, + primary->range.end, find_included_cb, instance); + +diff --git a/profiles/scanparam/scpp.c b/profiles/scanparam/scpp.c +index da38a6aaa..4be8b26cc 100644 +--- a/profiles/scanparam/scpp.c ++++ b/profiles/scanparam/scpp.c +@@ -91,7 +91,7 @@ static void scpp_free(struct bt_scpp *scan) + { + bt_scpp_detach(scan); + +- g_free(scan->primary); ++ free(scan->primary); + queue_destroy(scan->gatt_op, NULL); /* cleared in bt_scpp_detach */ + g_free(scan); + } +@@ -110,7 +110,7 @@ struct bt_scpp *bt_scpp_new(void *primary) + scan->gatt_op = queue_new(); + + if (primary) +- scan->primary = g_memdup(primary, sizeof(*scan->primary)); ++ scan->primary = util_memdup(primary, sizeof(*scan->primary)); + + return bt_scpp_ref(scan); + } +diff --git a/src/eir.c b/src/eir.c +index 0f5d14fcd..2f9ee036f 100644 +--- a/src/eir.c ++++ b/src/eir.c +@@ -53,9 +53,9 @@ void eir_data_free(struct eir_data *eir) + eir->services = NULL; + g_free(eir->name); + eir->name = NULL; +- g_free(eir->hash); ++ free(eir->hash); + eir->hash = NULL; +- g_free(eir->randomizer); ++ free(eir->randomizer); + eir->randomizer = NULL; + g_slist_free_full(eir->msd_list, g_free); + eir->msd_list = NULL; +@@ -323,13 +323,13 @@ void eir_parse(struct eir_data *eir, const uint8_t *eir_data, uint8_t eir_len) + case EIR_SSP_HASH: + if (data_len < 16) + break; +- eir->hash = g_memdup(data, 16); ++ eir->hash = util_memdup(data, 16); + break; + + case EIR_SSP_RANDOMIZER: + if (data_len < 16) + break; +- eir->randomizer = g_memdup(data, 16); ++ eir->randomizer = util_memdup(data, 16); + break; + + case EIR_DEVICE_ID: +diff --git a/tools/gatt-service.c b/tools/gatt-service.c +index 631c4f249..ed6b06f1e 100644 +--- a/tools/gatt-service.c ++++ b/tools/gatt-service.c +@@ -26,6 +26,7 @@ + #include "gdbus/gdbus.h" + + #include "src/error.h" ++#include "src/shared/util.h" + + #define GATT_MGR_IFACE "org.bluez.GattManager1" + #define GATT_SERVICE_IFACE "org.bluez.GattService1" +@@ -126,8 +127,8 @@ static gboolean desc_get_value(const GDBusPropertyTable *property, + + static void desc_write(struct descriptor *desc, const uint8_t *value, int len) + { +- g_free(desc->value); +- desc->value = g_memdup(value, len); ++ free(desc->value); ++ desc->value = util_memdup(value, len); + desc->vlen = len; + + g_dbus_emit_property_changed(connection, desc->path, +@@ -264,8 +265,8 @@ static gboolean chr_get_props(const GDBusPropertyTable *property, + + static void chr_write(struct characteristic *chr, const uint8_t *value, int len) + { +- g_free(chr->value); +- chr->value = g_memdup(value, len); ++ free(chr->value); ++ chr->value = util_memdup(value, len); + chr->vlen = len; + + g_dbus_emit_property_changed(connection, chr->path, GATT_CHR_IFACE, +@@ -388,7 +389,7 @@ static void chr_iface_destroy(gpointer user_data) + + g_free(chr->uuid); + g_free(chr->service); +- g_free(chr->value); ++ free(chr->value); + g_free(chr->path); + g_free(chr); + } +@@ -398,7 +399,7 @@ static void desc_iface_destroy(gpointer user_data) + struct descriptor *desc = user_data; + + g_free(desc->uuid); +- g_free(desc->value); ++ free(desc->value); + g_free(desc->path); + g_free(desc); + } +@@ -592,7 +593,7 @@ static gboolean register_characteristic(const char *chr_uuid, + + chr = g_new0(struct characteristic, 1); + chr->uuid = g_strdup(chr_uuid); +- chr->value = g_memdup(value, vlen); ++ chr->value = util_memdup(value, vlen); + chr->vlen = vlen; + chr->props = props; + chr->service = g_strdup(service_path); +diff --git a/tools/mesh-gatt/gatt.c b/tools/mesh-gatt/gatt.c +index c8a8123fb..ab9743cd1 100644 +--- a/tools/mesh-gatt/gatt.c ++++ b/tools/mesh-gatt/gatt.c +@@ -24,6 +24,7 @@ + + #include "src/shared/io.h" + #include "src/shared/shell.h" ++#include "src/shared/util.h" + #include "gdbus/gdbus.h" + #include "lib/bluetooth.h" + #include "lib/uuid.h" +@@ -86,7 +87,7 @@ static void write_data_free(void *user_data) + { + struct write_data *data = user_data; + +- g_free(data->gatt_data); ++ free(data->gatt_data); + free(data); + } + +@@ -338,7 +339,7 @@ bool mesh_gatt_write(GDBusProxy *proxy, uint8_t *buf, uint16_t len, + /* TODO: should keep in queue in case we need to cancel write? */ + + data->gatt_len = len; +- data->gatt_data = g_memdup(buf, len); ++ data->gatt_data = util_memdup(buf, len); + data->gatt_data[0] &= GATT_TYPE_MASK; + data->iov.iov_base = data->gatt_data; + data->iov.iov_len = len; +diff --git a/unit/test-avctp.c b/unit/test-avctp.c +index fa7db59c8..25fd3abc2 100644 +--- a/unit/test-avctp.c ++++ b/unit/test-avctp.c +@@ -53,7 +53,7 @@ struct context { + #define raw_pdu(args...) \ + { \ + .valid = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +@@ -64,7 +64,7 @@ struct context { + }; \ + static struct test_data data; \ + data.test_name = g_strdup(name); \ +- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ ++ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ + tester_add(name, &data, NULL, function, NULL); \ + } while (0) + +diff --git a/unit/test-avdtp.c b/unit/test-avdtp.c +index 4e8a68c6b..2e49def43 100644 +--- a/unit/test-avdtp.c ++++ b/unit/test-avdtp.c +@@ -48,7 +48,7 @@ struct test_data { + #define raw_pdu(args...) \ + { \ + .valid = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +@@ -56,7 +56,7 @@ struct test_data { + { \ + .valid = true, \ + .fragmented = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +@@ -67,7 +67,7 @@ struct test_data { + }; \ + static struct test_data data; \ + data.test_name = g_strdup(name); \ +- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ ++ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ + tester_add(name, &data, NULL, function, NULL); \ + } while (0) + +diff --git a/unit/test-avrcp.c b/unit/test-avrcp.c +index 34a70377d..b637a8a1b 100644 +--- a/unit/test-avrcp.c ++++ b/unit/test-avrcp.c +@@ -61,7 +61,7 @@ struct context { + #define raw_pdu(args...) \ + { \ + .valid = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +@@ -69,7 +69,7 @@ struct context { + { \ + .valid = true, \ + .browse = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +@@ -77,7 +77,7 @@ struct context { + { \ + .valid = true, \ + .fragmented = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +@@ -85,7 +85,7 @@ struct context { + { \ + .valid = true, \ + .continuing = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +@@ -96,7 +96,7 @@ struct context { + }; \ + static struct test_data data; \ + data.test_name = g_strdup(name); \ +- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ ++ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ + tester_add(name, &data, NULL, function, NULL); \ + } while (0) + +diff --git a/unit/test-gatt.c b/unit/test-gatt.c +index 6a47268e6..f92d860c4 100644 +--- a/unit/test-gatt.c ++++ b/unit/test-gatt.c +@@ -73,7 +73,7 @@ struct context { + #define raw_pdu(args...) \ + { \ + .valid = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +@@ -94,7 +94,7 @@ struct context { + data.uuid = bt_uuid; \ + data.step = test_step; \ + data.source_db = db; \ +- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ ++ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ + tester_add(name, &data, NULL, function, NULL); \ + } while (0) + +diff --git a/unit/test-hfp.c b/unit/test-hfp.c +index f504724d7..b4af99d53 100644 +--- a/unit/test-hfp.c ++++ b/unit/test-hfp.c +@@ -17,6 +17,7 @@ + #include + #include "src/shared/hfp.h" + #include "src/shared/tester.h" ++#include "src/shared/util.h" + + struct context { + guint watch_id; +@@ -50,7 +51,7 @@ struct test_data { + #define raw_pdu(args...) \ + { \ + .valid = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +@@ -62,7 +63,7 @@ struct test_data { + #define type_pdu(cmd_type, args...) \ + { \ + .valid = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + .type = cmd_type, \ + } +@@ -70,7 +71,7 @@ struct test_data { + #define frg_pdu(args...) \ + { \ + .valid = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + .fragmented = true, \ + } +@@ -82,7 +83,7 @@ struct test_data { + }; \ + static struct test_data data; \ + data.test_name = g_strdup(name); \ +- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ ++ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ + data.result_func = result_function; \ + tester_add(name, &data, NULL, function, NULL); \ + data.test_handler = test_handler; \ +@@ -96,7 +97,7 @@ struct test_data { + }; \ + static struct test_data data; \ + data.test_name = g_strdup(name); \ +- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ ++ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ + data.hf_result_func = result_func; \ + data.response_func = response_function; \ + tester_add(name, &data, NULL, function, NULL); \ +diff --git a/unit/test-hog.c b/unit/test-hog.c +index 116a5cb07..067497de4 100644 +--- a/unit/test-hog.c ++++ b/unit/test-hog.c +@@ -59,24 +59,24 @@ struct context { + #define raw_pdu(args...) \ + { \ + .valid = true, \ +- .data = g_memdup(data(args), sizeof(data(args))), \ ++ .data = util_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ + } + +-#define false_pdu() \ +-{ \ +- .valid = false, \ ++#define false_pdu() \ ++{ \ ++ .valid = false, \ + } + +-#define define_test(name, function, args...) \ +- do { \ +- const struct test_pdu pdus[] = { \ +- args, { } \ +- }; \ +- static struct test_data data; \ +- data.test_name = g_strdup(name); \ +- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ +- tester_add(name, &data, NULL, function, NULL); \ ++#define define_test(name, function, args...) \ ++ do { \ ++ const struct test_pdu pdus[] = { \ ++ args, { } \ ++ }; \ ++ static struct test_data data; \ ++ data.test_name = g_strdup(name); \ ++ data.pdu_list = util_memdup(pdus, sizeof(pdus));\ ++ tester_add(name, &data, NULL, function, NULL); \ + } while (0) + + static gboolean context_quit(gpointer user_data) +diff --git a/unit/test-sdp.c b/unit/test-sdp.c +index 8f95fcb71..5c04a71eb 100644 +--- a/unit/test-sdp.c ++++ b/unit/test-sdp.c +@@ -47,14 +47,16 @@ struct test_data { + #define raw_pdu(args...) \ + { \ + .valid = true, \ +- .raw_data = g_memdup(raw_data(args), sizeof(raw_data(args))), \ ++ .raw_data = util_memdup(raw_data(args), \ ++ sizeof(raw_data(args))), \ + .raw_size = sizeof(raw_data(args)), \ + } + + #define raw_pdu_cont(cont, args...) \ + { \ + .valid = true, \ +- .raw_data = g_memdup(raw_data(args), sizeof(raw_data(args))), \ ++ .raw_data = util_memdup(raw_data(args), \ ++ sizeof(raw_data(args))), \ + .raw_size = sizeof(raw_data(args)), \ + .cont_len = cont, \ + } +@@ -66,7 +68,7 @@ struct test_data { + }; \ + static struct test_data data; \ + data.mtu = _mtu; \ +- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ ++ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ + tester_add(name, &data, NULL, test_sdp, NULL); \ + } while (0) + +@@ -92,7 +94,7 @@ struct test_data_de { + #define define_test_de_attr(name, input, exp) \ + do { \ + static struct test_data_de data; \ +- data.input_data = g_memdup(input, sizeof(input)); \ ++ data.input_data = util_memdup(input, sizeof(input)); \ + data.input_size = sizeof(input); \ + data.expected = exp; \ + tester_add("/sdp/DE/ATTR/" name, &data, NULL, \ +diff --git a/unit/test-uhid.c b/unit/test-uhid.c +index 001d39a3d..8a8eef855 100644 +--- a/unit/test-uhid.c ++++ b/unit/test-uhid.c +@@ -61,7 +61,7 @@ struct context { + }; \ + static struct test_data data; \ + data.test_name = g_strdup(name); \ +- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ ++ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ + tester_add(name, &data, NULL, function, NULL); \ + } while (0) + +-- +2.17.1 + From fontaine.fabrice at gmail.com Sun Feb 6 14:18:04 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 6 Feb 2022 15:18:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/ofono: bump to version 1.34 Message-ID: <20220206141804.1744721-1-fontaine.fabrice@gmail.com> Update indentation in hash file (two spaces) https://git.kernel.org/pub/scm/network/ofono/ofono.git/tree/ChangeLog?h=1.34 Signed-off-by: Fabrice Fontaine --- package/ofono/ofono.hash | 4 ++-- package/ofono/ofono.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ofono/ofono.hash b/package/ofono/ofono.hash index 02245a46f4..7edef0eb80 100644 --- a/package/ofono/ofono.hash +++ b/package/ofono/ofono.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/network/ofono/sha256sums.asc -sha256 a15c5d28096c10eb30e47a68b6dc2e7c4a5a99d7f4cfedf0b69624f33d859e9b ofono-1.31.tar.xz +sha256 c0b96d3013447ec2bcb74579bef90e4e59c68dbfa4b9c6fbce5d12401a43aac7 ofono-1.34.tar.xz # Locally computed -sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING +sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/package/ofono/ofono.mk b/package/ofono/ofono.mk index 57d6cab470..b7a2a923f9 100644 --- a/package/ofono/ofono.mk +++ b/package/ofono/ofono.mk @@ -4,7 +4,7 @@ # ################################################################################ -OFONO_VERSION = 1.31 +OFONO_VERSION = 1.34 OFONO_SOURCE = ofono-$(OFONO_VERSION).tar.xz OFONO_SITE = $(BR2_KERNEL_MIRROR)/linux/network/ofono OFONO_LICENSE = GPL-2.0 -- 2.34.1 From giulio.benetti at benettiengineering.com Sun Feb 6 14:24:03 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 15:24:03 +0100 Subject: [Buildroot] [PATCH] toolchain: fix gcc bug 99140 condition In-Reply-To: <2fec6210-3811-197d-45a7-1ece869f49e0@benettiengineering.com> References: <2fec6210-3811-197d-45a7-1ece869f49e0@benettiengineering.com> Message-ID: <20220206142403.1644118-1-giulio.benetti@benettiengineering.com> Gcc bug 99140 exhibits with gcc versions: - up to 7.x - 9.x - 10.x and doesn't show up with gcc versions: - 8.x - 11.x then moving BR2_TOOLCHAIN_GCC_AT_LEAST_9 to BR2_TOOLCHAIN_GCC_AT_LEAST_10 makes gcc version 9 set as working but it's not. So let's back substitute BR2_TOOLCHAIN_GCC_AT_LEAST_10 with BR2_TOOLCHAIN_GCC_AT_LEAST_9. Signed-off-by: Giulio Benetti --- toolchain/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchain/Config.in b/toolchain/Config.in index aed8f393a3..db3f451f45 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -189,7 +189,7 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_93847 config BR2_TOOLCHAIN_HAS_GCC_BUG_99140 bool default y if !BR2_TOOLCHAIN_GCC_AT_LEAST_8 - default y if BR2_TOOLCHAIN_GCC_AT_LEAST_10 && !BR2_TOOLCHAIN_GCC_AT_LEAST_11 + default y if BR2_TOOLCHAIN_GCC_AT_LEAST_9 && !BR2_TOOLCHAIN_GCC_AT_LEAST_11 depends on BR2_nios2 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101737 -- 2.25.1 From peter at korsgaard.com Sun Feb 6 14:24:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 06 Feb 2022 15:24:38 +0100 Subject: [Buildroot] [PATCH] DEVELOPERS: add entry for hostapd and wpa_supplicant to Yegor Yefremov In-Reply-To: <20220130105116.18458-1-yegorslists@googlemail.com> (yegorslists's message of "Sun, 30 Jan 2022 11:51:16 +0100") References: <20220130105116.18458-1-yegorslists@googlemail.com> Message-ID: <87leyovzrt.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 Sun Feb 6 14:24:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 06 Feb 2022 15:24:42 +0100 Subject: [Buildroot] [PATCH] DEVELOPERS: add entry for libqmi and libqrtr-glib to Yegor Yefremov In-Reply-To: <20220130105459.19339-1-yegorslists@googlemail.com> (yegorslists's message of "Sun, 30 Jan 2022 11:54:59 +0100") References: <20220130105459.19339-1-yegorslists@googlemail.com> Message-ID: <87h79cvzrp.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 giulio.benetti at benettiengineering.com Sun Feb 6 14:25:49 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 15:25:49 +0100 Subject: [Buildroot] [PATCH v3 1/2] configs/microchip_sama7g5ek_mmc_defconfig: set custom linux version to 5.15.21 and add host openssl for linux In-Reply-To: <20220206131656.16e2c8a6@windsurf> References: <20220206115156.6042cc1b@windsurf> <20220206112620.1637342-1-giulio.benetti@benettiengineering.com> <20220206112620.1637342-2-giulio.benetti@benettiengineering.com> <20220206131656.16e2c8a6@windsurf> Message-ID: Hi Thomas, On 06/02/22 13:16, Thomas Petazzoni wrote: > On Sun, 6 Feb 2022 12:26:19 +0100 > Giulio Benetti wrote: > >> Fixes: >> https://gitlab.com/ymorin/buildroot/-/jobs/2035821098 >> >> Signed-off-by: Giulio Benetti > > Did you actually test on HW that 5.15.21 was working? Unfortunately I don't have board, so no. > Shouldn't this be > done by the original submitter of the defconfig. > > Eugen, Ludovic? It would be great to have it tested. Both, this and the microchip_sama7g5ek_mmc_dev_defconfig too. Best regards -- Giulio Benetti Benetti Engineering sas From peter at korsgaard.com Sun Feb 6 14:24:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 15:24:01 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] DEVELOPERS: add entry for hostapd and wpa_supplicant to Yegor Yefremov Message-ID: <20220206141931.5635582627@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=72f648703e41ffc1268a57985e113a53fabc65e2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni (cherry picked from commit b4bdbc7c505157d0039d1010e67f653b0f89b945) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 57e4592b4a..bd1d2eca6b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2743,6 +2743,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/ @@ -2771,6 +2772,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 peter at korsgaard.com Sun Feb 6 14:24:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 15:24:03 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] DEVELOPERS: add entry for libqmi and libqrtr-glib to Yegor Yefremov Message-ID: <20220206141931.5F16A82BCD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fad154253deb5b5399ea52a19ed6608dcd00ee4d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni (cherry picked from commit 73ce754531b5e45bd42b56c58718fbacc754406f) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index bd1d2eca6b..7ec36e2185 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2753,6 +2753,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 peter at korsgaard.com Sun Feb 6 14:23:48 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 15:23:48 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] DEVELOPERS: add entry for hostapd and wpa_supplicant to Yegor Yefremov Message-ID: <20220206141937.048C182627@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b2f57d410a940ff719ad5691b575a3f0499ef7b7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni (cherry picked from commit b4bdbc7c505157d0039d1010e67f653b0f89b945) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index e2c0f4d521..d45cfc5572 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2886,6 +2886,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/ @@ -2914,6 +2915,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 peter at korsgaard.com Sun Feb 6 14:23:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 15:23:54 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] DEVELOPERS: add entry for libqmi and libqrtr-glib to Yegor Yefremov Message-ID: <20220206141937.0F3B082BCD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=873223cae13889d663ef8d07c2d71eb15182a4ee branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni (cherry picked from commit 73ce754531b5e45bd42b56c58718fbacc754406f) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index d45cfc5572..2f202e1f19 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2896,6 +2896,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 fontaine.fabrice at gmail.com Sun Feb 6 14:26:38 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 6 Feb 2022 15:26:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/mp4v2: needs gcc >= 5 Message-ID: <20220206142638.1751906-1-fontaine.fabrice@gmail.com> TechSmith fork of mp4v2 needs gcc >= 5: https://github.com/TechSmith/mp4v2/issues/47 As a result, the following build failure is raised since bump to version 5.0.1 in commit df22a9d6b77d9e245dceb7c8fd3f9d80c8917ca0: In file included from ./include/mp4v2/mp4v2.h:58:0, from ./libplatform/platform_posix.h:37, from ./libplatform/platform.h:24, from libplatform/impl.h:6: ./include/mp4v2/file.h:336:5: warning: identifier 'nullptr' is a keyword in C++11 [-Wc++0x-compat] ShouldParseAtomCallback cb = nullptr ); ^ While a it, drop first patch which is not needed now that mp4v2 depends on gcc >= 5 Fixes: - http://autobuild.buildroot.org/results/178f1266396d44c6659a67d8e68cb99e36d544ea Signed-off-by: Fabrice Fontaine --- ...atic-cast-to-unsigned-int-for-cases.patch} | 0 ...mp4track.cpp-replace-nullptr-by-NULL.patch | 50 ------------------- package/mp4v2/Config.in | 6 ++- 3 files changed, 4 insertions(+), 52 deletions(-) rename package/mp4v2/{0002-Static-cast-to-unsigned-int-for-cases.patch => 0001-Static-cast-to-unsigned-int-for-cases.patch} (100%) delete mode 100644 package/mp4v2/0001-src-mp4track.cpp-replace-nullptr-by-NULL.patch diff --git a/package/mp4v2/0002-Static-cast-to-unsigned-int-for-cases.patch b/package/mp4v2/0001-Static-cast-to-unsigned-int-for-cases.patch similarity index 100% rename from package/mp4v2/0002-Static-cast-to-unsigned-int-for-cases.patch rename to package/mp4v2/0001-Static-cast-to-unsigned-int-for-cases.patch diff --git a/package/mp4v2/0001-src-mp4track.cpp-replace-nullptr-by-NULL.patch b/package/mp4v2/0001-src-mp4track.cpp-replace-nullptr-by-NULL.patch deleted file mode 100644 index c279b9c56a..0000000000 --- a/package/mp4v2/0001-src-mp4track.cpp-replace-nullptr-by-NULL.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 78cf76b5d661e37e958163c37c0ad95940c09591 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 30 May 2020 11:42:19 +0200 -Subject: [PATCH] src/mp4track.cpp: replace nullptr by NULL - -Commit 15ec11166ba9ee7b77631d0d9234522f656cfd66 added code that uses -nullptr. nullptr is C++11, it will break the build with gcc < 5. - -Semantically, NULL and nullptr are different, so should not be mixed. -In this situaiton, m_File.FindAtom() indeed does not return nullptr, -but NULL (on error, that is). - -Switch back to comparing against NULL. - -Fixes: - - http://autobuild.buildroot.org/results/14937c96a82fb3d10e5d83bd7b2905b846fb09f9 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/TechSmith/mp4v2/pull/62] ---- - src/mp4track.cpp | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/mp4track.cpp b/src/mp4track.cpp -index 4b8fc9d..42489eb 100644 ---- a/src/mp4track.cpp -+++ b/src/mp4track.cpp -@@ -908,16 +908,16 @@ File* MP4Track::GetSampleFile( MP4SampleId sampleId ) - MP4FtypAtom *pFtypAtom = reinterpret_cast( m_File.FindAtom( "ftyp" ) ); - - // MOV spec does not require "ftyp" atom... -- if ( pFtypAtom == nullptr ) -+ if ( pFtypAtom == NULL ) - { -- return nullptr; -+ return NULL; - } - else - { - // ... but most often it is present with a "qt " value - const char *majorBrand = pFtypAtom->majorBrand.GetValue(); - if ( ::strcmp( pFtypAtom->majorBrand.GetValue(), "qt " ) == 0 ) -- return nullptr; -+ return NULL; - } - throw new Exception( "invalid stsd entry", __FILE__, __LINE__, __FUNCTION__ ); - } --- -2.26.2 - diff --git a/package/mp4v2/Config.in b/package/mp4v2/Config.in index 172d1baabe..00e80cd358 100644 --- a/package/mp4v2/Config.in +++ b/package/mp4v2/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_MP4V2 bool "mp4v2" depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++11 help The MP4v2 library provides functions to read, create, and modify mp4 files. @@ -18,5 +19,6 @@ config BR2_PACKAGE_MP4V2_UTIL endif -comment "mp4v2 needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP +comment "mp4v2 needs a toolchain w/ C++, gcc >= 5" + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 -- 2.34.1 From fontaine.fabrice at gmail.com Sun Feb 6 14:31:12 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 6 Feb 2022 15:31:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/jack1: drop celt comment Message-ID: <20220206143112.1752984-1-fontaine.fabrice@gmail.com> Drop celt comment which is not needed since removal of celt051 in commit b32efbdb0354557db48852478b99080705ba315b Signed-off-by: Fabrice Fontaine --- package/jack1/jack1.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/jack1/jack1.mk b/package/jack1/jack1.mk index 2f97434ebe..311f7c9ba0 100644 --- a/package/jack1/jack1.mk +++ b/package/jack1/jack1.mk @@ -11,8 +11,6 @@ JACK1_LICENSE = GPL-2.0+ (jack server), LGPL-2.1+ (jack library) JACK1_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL JACK1_INSTALL_STAGING = YES -# Dependency to celt can't be met: jack1 requires celt >= 0.8.0 but we -# only have 0.5.1.3 and we cannot upgrade. JACK1_DEPENDENCIES = host-pkgconf alsa-lib berkeleydb libsamplerate libsndfile ifeq ($(BR2_PACKAGE_READLINE),y) -- 2.34.1 From petr.vorel at gmail.com Sun Feb 6 14:34:46 2022 From: petr.vorel at gmail.com (Petr Vorel) Date: Sun, 6 Feb 2022 15:34:46 +0100 Subject: [Buildroot] [PATCH] package/nfs-utils: nfsiostat used python3, not python2 In-Reply-To: <87tudcw0zg.fsf@dell.be.48ers.dk> References: <20220206131758.28001-1-peter@korsgaard.com> <87tudcw0zg.fsf@dell.be.48ers.dk> Message-ID: Hi Peter, > >>>>> "Peter" == Peter Korsgaard writes: > s/used/uses/ in the subject naturally. +1 > > nfsiostat is a python3 script, so keep it if python3 is enabled and not > > python2: Good catch, thanks! Reviewed-by: Petr Vorel Kind regards, Petr > > head -n 1 target/usr/sbin/nfsiostat > > #!/usr/bin/python3 > > Signed-off-by: Peter Korsgaard > > --- > > package/nfs-utils/nfs-utils.mk | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk > > index 6a3a801359..44653e2707 100644 > > --- a/package/nfs-utils/nfs-utils.mk > > +++ b/package/nfs-utils/nfs-utils.mk > > @@ -114,7 +114,7 @@ define NFS_UTILS_REMOVE_NFSIOSTAT > > endef > > # nfsiostat is interpreted python, so remove it unless it's in the target > > -NFS_UTILS_POST_INSTALL_TARGET_HOOKS += $(if $(BR2_PACKAGE_PYTHON),,NFS_UTILS_REMOVE_NFSIOSTAT) > > +NFS_UTILS_POST_INSTALL_TARGET_HOOKS += $(if $(BR2_PACKAGE_PYTHON3),,NFS_UTILS_REMOVE_NFSIOSTAT) > > define HOST_NFS_UTILS_BUILD_CMDS > > $(MAKE) -C $(@D)/tools/rpcgen > > -- > > 2.20.1 From arnout at mind.be Sun Feb 6 14:35:20 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 6 Feb 2022 15:35:20 +0100 Subject: [Buildroot] [git commit] utils/docker-run: new script Message-ID: <20220206142819.E77CB82B2E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=242e9d72e7d2217d6213f63f65d93c5ba3b01f7c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 [Arnout: fix shellcheck errors; add exec] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- utils/docker-run | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/utils/docker-run b/utils/docker-run new file mode 100755 index 0000000000..0614f1325d --- /dev/null +++ b/utils/docker-run @@ -0,0 +1,10 @@ +#!/usr/bin/bash +set -o errexit -o pipefail +DIR=$(dirname "${0}") +MAIN_DIR=$(readlink -f "${DIR}/..") +# shellcheck disable=SC2016 +IMAGE=$(grep ^image: "${MAIN_DIR}/.gitlab-ci.yml" | \ + sed -e 's,^image: ,,g' | sed -e 's,\$CI_REGISTRY,registry.gitlab.com,g') + +set -x +exec docker run -v "${MAIN_DIR}:/home/br-user" -t "${IMAGE}" "$@" From arnout at mind.be Sun Feb 6 14:35:19 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 6 Feb 2022 15:35:19 +0100 Subject: [Buildroot] [git commit] support/docker: add python3-pytest Message-ID: <20220206142819.D6F4182BCD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a9061b7e689db1345afc863d9e60085dd2d83db8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master ... so the unit tests for check-package can run in the GitLab CI. Signed-off-by: Ricardo Martincoski Acked-by: Romain Naour 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 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 \ From arnout at mind.be Sun Feb 6 14:35:19 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 6 Feb 2022 15:35:19 +0100 Subject: [Buildroot] [git commit] utils/checkpackagelib: run unit tests on GitLab CI Message-ID: <20220206142819.DF20C82BD5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fcceee0b2ed2b36e6671c8209d17ccc4dd689548 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master ... so we can catch regressions on check-package. Update to the new docker image that was pushed after the previous commit. Signed-off-by: Ricardo Martincoski Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .gitlab-ci.yml | 2 +- support/misc/gitlab-ci.yml.in | 4 ++++ support/scripts/generate-gitlab-ci-yml | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ea4ec20a17..d54f46c409 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:20220105.2314 +image: $CI_REGISTRY/buildroot.org/buildroot/base:20220206.1324 stages: - generate-gitlab-ci 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) ) From arnout at mind.be Sun Feb 6 14:35:19 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 6 Feb 2022 15:35:19 +0100 Subject: [Buildroot] [git commit] utils/checkpackagelib: add unit tests Message-ID: <20220206142819.D06AA82B2E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fc254881e6dff16a9a4ff98ba981ca2a160e6483 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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(+) 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] From peter at korsgaard.com Sun Feb 6 14:36:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 06 Feb 2022 15:36:37 +0100 Subject: [Buildroot] [git commit] docs/manual/adding-packages-directory.txt: reorder select/depends In-Reply-To: <20220130140530.D72C082A75@busybox.osuosl.org> (Thomas Petazzoni via buildroot's message of "Sun, 30 Jan 2022 15:12:28 +0100") References: <20220130140530.D72C082A75@busybox.osuosl.org> Message-ID: <87czk0vz7u.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni via buildroot writes: > 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 Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Sun Feb 6 14:35:35 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 6 Feb 2022 15:35:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-tinyrpc: bump to version 1.1.4 Message-ID: <20220206143535.1754289-1-fontaine.fabrice@gmail.com> https://github.com/mbr/tinyrpc/compare/1.1.1...1.1.4 Signed-off-by: Fabrice Fontaine --- package/python-tinyrpc/python-tinyrpc.hash | 4 ++-- package/python-tinyrpc/python-tinyrpc.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-tinyrpc/python-tinyrpc.hash b/package/python-tinyrpc/python-tinyrpc.hash index c5bdad567e..d4bd348e61 100644 --- a/package/python-tinyrpc/python-tinyrpc.hash +++ b/package/python-tinyrpc/python-tinyrpc.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/tinyrpc/json -md5 34d7b41ab48297b6b8fbf937e3d43a57 tinyrpc-1.1.1.tar.gz -sha256 9e68d7b9688dac8deaa342a2507d04f0b2ece64a9d19382aa2ee13d692e87d7f tinyrpc-1.1.1.tar.gz +md5 cc7e62891eee806dfbbafb6e3875825e tinyrpc-1.1.4.tar.gz +sha256 c99f412e5d9849c2deb468ea37fee2faf12fbc95bdd3616ae5c276ea195ed6bd tinyrpc-1.1.4.tar.gz # Locally computed sha256 checksums sha256 587f1ea174824613f4a7e0d7fb95fda000a7f58ca17df12416e014c9ee82e619 LICENSE diff --git a/package/python-tinyrpc/python-tinyrpc.mk b/package/python-tinyrpc/python-tinyrpc.mk index f3f7dcc52b..e976778fa2 100644 --- a/package/python-tinyrpc/python-tinyrpc.mk +++ b/package/python-tinyrpc/python-tinyrpc.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TINYRPC_VERSION = 1.1.1 +PYTHON_TINYRPC_VERSION = 1.1.4 PYTHON_TINYRPC_SOURCE = tinyrpc-$(PYTHON_TINYRPC_VERSION).tar.gz -PYTHON_TINYRPC_SITE = https://files.pythonhosted.org/packages/6a/63/0851365686da1ca9ab03d63b035eccf87a1d85b743ce07d079462350da33 +PYTHON_TINYRPC_SITE = https://files.pythonhosted.org/packages/d2/86/2741f0c74cc339416c9803b6393eaf230254ecf36ffd839614799e15a202 PYTHON_TINYRPC_SETUP_TYPE = setuptools PYTHON_TINYRPC_LICENSE = MIT PYTHON_TINYRPC_LICENSE_FILES = LICENSE -- 2.34.1 From fontaine.fabrice at gmail.com Sun Feb 6 14:37:49 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 6 Feb 2022 15:37:49 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pysub: bump to version 1.2.1 Message-ID: <20220206143749.1754530-1-fontaine.fabrice@gmail.com> Update indentation in hash file (two spaces) https://github.com/pyusb/pyusb/releases/tag/v1.2.0 https://github.com/pyusb/pyusb/releases/tag/v1.2.1 Signed-off-by: Fabrice Fontaine --- package/python-pyusb/python-pyusb.hash | 8 ++++---- package/python-pyusb/python-pyusb.mk | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-pyusb/python-pyusb.hash b/package/python-pyusb/python-pyusb.hash index 9c634ef722..f08b212b3e 100644 --- a/package/python-pyusb/python-pyusb.hash +++ b/package/python-pyusb/python-pyusb.hash @@ -1,5 +1,5 @@ -# md5 from https://pypi.python.org/pypi/pyusb/json -md5 a9db479f1fb914e91d3106e67a13ae09 pyusb-1.1.1.tar.gz -# Locally computed -sha256 7d449ad916ce58aff60b89aae0b65ac130f289c24d6a5b7b317742eccffafc38 pyusb-1.1.1.tar.gz +# md5, sha256 from https://pypi.org/pypi/pyusb/json +md5 880008dff32dac8f58076b4e534492d9 pyusb-1.2.1.tar.gz +sha256 a4cc7404a203144754164b8b40994e2849fde1cfff06b08492f12fff9d9de7b9 pyusb-1.2.1.tar.gz +# Locally computed sha256 checksums sha256 03e39fdcee9c18f2f9d0c3500a993ddeac050695eb81070ea41347587c76a7fe LICENSE diff --git a/package/python-pyusb/python-pyusb.mk b/package/python-pyusb/python-pyusb.mk index dc81efde9e..2f4f9581b6 100644 --- a/package/python-pyusb/python-pyusb.mk +++ b/package/python-pyusb/python-pyusb.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYUSB_VERSION = 1.1.1 +PYTHON_PYUSB_VERSION = 1.2.1 PYTHON_PYUSB_SOURCE = pyusb-$(PYTHON_PYUSB_VERSION).tar.gz -PYTHON_PYUSB_SITE = https://files.pythonhosted.org/packages/b9/8d/25c4e446a07e918eb39b5af25c4a83a89db95ae44e4ed5a46c3c53b0a4d6 +PYTHON_PYUSB_SITE = https://files.pythonhosted.org/packages/d9/6e/433a5614132576289b8643fe598dd5d51b16e130fd591564be952e15bb45 PYTHON_PYUSB_LICENSE = BSD-3-Clause PYTHON_PYUSB_LICENSE_FILES = LICENSE PYTHON_PYUSB_SETUP_TYPE = setuptools -- 2.34.1 From fontaine.fabrice at gmail.com Sun Feb 6 14:39:18 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 6 Feb 2022 15:39:18 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/python-pyusb: bump to version 1.2.1 Message-ID: <20220206143918.1755288-1-fontaine.fabrice@gmail.com> Update indentation in hash file (two spaces) https://github.com/pyusb/pyusb/releases/tag/v1.2.0 https://github.com/pyusb/pyusb/releases/tag/v1.2.1 Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2: - Fix typo in commit title (pysub -> pyusb) package/python-pyusb/python-pyusb.hash | 8 ++++---- package/python-pyusb/python-pyusb.mk | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-pyusb/python-pyusb.hash b/package/python-pyusb/python-pyusb.hash index 9c634ef722..f08b212b3e 100644 --- a/package/python-pyusb/python-pyusb.hash +++ b/package/python-pyusb/python-pyusb.hash @@ -1,5 +1,5 @@ -# md5 from https://pypi.python.org/pypi/pyusb/json -md5 a9db479f1fb914e91d3106e67a13ae09 pyusb-1.1.1.tar.gz -# Locally computed -sha256 7d449ad916ce58aff60b89aae0b65ac130f289c24d6a5b7b317742eccffafc38 pyusb-1.1.1.tar.gz +# md5, sha256 from https://pypi.org/pypi/pyusb/json +md5 880008dff32dac8f58076b4e534492d9 pyusb-1.2.1.tar.gz +sha256 a4cc7404a203144754164b8b40994e2849fde1cfff06b08492f12fff9d9de7b9 pyusb-1.2.1.tar.gz +# Locally computed sha256 checksums sha256 03e39fdcee9c18f2f9d0c3500a993ddeac050695eb81070ea41347587c76a7fe LICENSE diff --git a/package/python-pyusb/python-pyusb.mk b/package/python-pyusb/python-pyusb.mk index dc81efde9e..2f4f9581b6 100644 --- a/package/python-pyusb/python-pyusb.mk +++ b/package/python-pyusb/python-pyusb.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYUSB_VERSION = 1.1.1 +PYTHON_PYUSB_VERSION = 1.2.1 PYTHON_PYUSB_SOURCE = pyusb-$(PYTHON_PYUSB_VERSION).tar.gz -PYTHON_PYUSB_SITE = https://files.pythonhosted.org/packages/b9/8d/25c4e446a07e918eb39b5af25c4a83a89db95ae44e4ed5a46c3c53b0a4d6 +PYTHON_PYUSB_SITE = https://files.pythonhosted.org/packages/d9/6e/433a5614132576289b8643fe598dd5d51b16e130fd591564be952e15bb45 PYTHON_PYUSB_LICENSE = BSD-3-Clause PYTHON_PYUSB_LICENSE_FILES = LICENSE PYTHON_PYUSB_SETUP_TYPE = setuptools -- 2.34.1 From peter at korsgaard.com Sun Feb 6 14:35:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 15:35:55 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] docs/manual/adding-packages-directory.txt: reorder select/depends Message-ID: <20220206143439.8B5A7818E5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=728ece090b894a9404d4944b453b78738774d721 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x >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 (cherry picked from commit 39458e33c1e0c4704fd1dbcd64b87cb7016c6deb) Signed-off-by: Peter Korsgaard --- 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 4ceb3fd772..54d96451fe 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 peter at korsgaard.com Sun Feb 6 14:35:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 15:35:50 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] docs/manual/adding-packages-directory.txt: reorder select/depends Message-ID: <20220206143445.3673B8152C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b8eb50e3dc924f06daf814b766116f6defac2924 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x >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 (cherry picked from commit 39458e33c1e0c4704fd1dbcd64b87cb7016c6deb) Signed-off-by: Peter Korsgaard --- 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 4ceb3fd772..54d96451fe 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 fontaine.fabrice at gmail.com Sun Feb 6 14:41:48 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 6 Feb 2022 15:41:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-lmdb: bump to version 1.3.0 Message-ID: <20220206144148.1755592-1-fontaine.fabrice@gmail.com> Update indentation in hash file (two spaces) https://github.com/jnwatson/py-lmdb/blob/py-lmdb_1.3.0/ChangeLog Signed-off-by: Fabrice Fontaine --- package/python-lmdb/python-lmdb.hash | 6 +++--- package/python-lmdb/python-lmdb.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-lmdb/python-lmdb.hash b/package/python-lmdb/python-lmdb.hash index e7b8ae3455..e50c35df67 100644 --- a/package/python-lmdb/python-lmdb.hash +++ b/package/python-lmdb/python-lmdb.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/lmdb/json -md5 b8f4a2cd1748e8a5f5e352d1cb3d4350 lmdb-1.2.1.tar.gz -sha256 5f76a90ebd08922acca11948779b5055f7a262687178e9e94f4e804b9f8465bc lmdb-1.2.1.tar.gz +md5 3c955c49be10a7a07a2fcd54d180c3af lmdb-1.3.0.tar.gz +sha256 60a11efc21aaf009d06518996360eed346f6000bfc9de05114374230879f992e lmdb-1.3.0.tar.gz # Locally computed sha256 checksums -sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE +sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE diff --git a/package/python-lmdb/python-lmdb.mk b/package/python-lmdb/python-lmdb.mk index 33c48cc8c7..fba168d340 100644 --- a/package/python-lmdb/python-lmdb.mk +++ b/package/python-lmdb/python-lmdb.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_LMDB_VERSION = 1.2.1 +PYTHON_LMDB_VERSION = 1.3.0 PYTHON_LMDB_SOURCE = lmdb-$(PYTHON_LMDB_VERSION).tar.gz -PYTHON_LMDB_SITE = https://files.pythonhosted.org/packages/2f/df/3aea5279753cb8ab0c96dec43106e24f388d4179d5224f6d3e652016c095 +PYTHON_LMDB_SITE = https://files.pythonhosted.org/packages/ed/61/41f3c7cbd8a67202ef24fad3375ed936093a0547dc645581dd11c09581b7 PYTHON_LMDB_LICENSE = OLDAP-2.8 PYTHON_LMDB_LICENSE_FILES = LICENSE PYTHON_LMDB_SETUP_TYPE = setuptools -- 2.34.1 From peter at korsgaard.com Sun Feb 6 14:50:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 06 Feb 2022 15:50:01 +0100 Subject: [Buildroot] [PATCH] board/andes: fix build failure with host gcc >= 10 In-Reply-To: <20220129231420.3470589-1-giulio.benetti@benettiengineering.com> (Giulio Benetti's message of "Sun, 30 Jan 2022 00:14:20 +0100") References: <20220129231420.3470589-1-giulio.benetti@benettiengineering.com> Message-ID: <878ruovyli.fsf@dell.be.48ers.dk> >>>>> "Giulio" == Giulio Benetti writes: > 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 Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 6 14:49:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 15:49:37 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] board/andes: fix build failure with host gcc >= 10 Message-ID: <20220206144251.E4E9A82BA0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b7dadab3e1c602fc98ad112ea622a3152862aead branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x 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 (cherry picked from commit 3529e8c21c939d73cc0090cb41c17b02db5b1013) Signed-off-by: Peter Korsgaard --- ...-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 peter at korsgaard.com Sun Feb 6 14:48:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 15:48:37 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] board/andes: fix build failure with host gcc >= 10 Message-ID: <20220206144259.6B70082BA0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6400186971ac3430e3827563b8bce73f15f18583 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x 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 (cherry picked from commit 3529e8c21c939d73cc0090cb41c17b02db5b1013) Signed-off-by: Peter Korsgaard --- ...-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 fontaine.fabrice at gmail.com Sun Feb 6 14:51:08 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 6 Feb 2022 15:51:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/lm-sensors: update LM_SENSORS_VERSION Message-ID: <20220206145108.1757971-1-fontaine.fabrice@gmail.com> Update LM_SENSORS_VERSION to make it match what is returned by https://release-monitoring.org Signed-off-by: Fabrice Fontaine --- package/lm-sensors/lm-sensors.hash | 2 +- package/lm-sensors/lm-sensors.mk | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/lm-sensors/lm-sensors.hash b/package/lm-sensors/lm-sensors.hash index 0ca07b7e69..c941043343 100644 --- a/package/lm-sensors/lm-sensors.hash +++ b/package/lm-sensors/lm-sensors.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 0591f9fa0339f0d15e75326d0365871c2d4e2ed8aa1ff759b3a55d3734b7d197 lm-sensors-3-6-0.tar.gz +sha256 0591f9fa0339f0d15e75326d0365871c2d4e2ed8aa1ff759b3a55d3734b7d197 lm-sensors-3.6.0.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL diff --git a/package/lm-sensors/lm-sensors.mk b/package/lm-sensors/lm-sensors.mk index 8975efaffa..1bf27fc25a 100644 --- a/package/lm-sensors/lm-sensors.mk +++ b/package/lm-sensors/lm-sensors.mk @@ -4,8 +4,9 @@ # ################################################################################ -LM_SENSORS_VERSION = 3-6-0 -LM_SENSORS_SITE = $(call github,lm-sensors,lm-sensors,V$(LM_SENSORS_VERSION)) +LM_SENSORS_VERSION = 3.6.0 +LM_SENSORS_SITE = \ + $(call github,lm-sensors,lm-sensors,V$(subst .,-,$(LM_SENSORS_VERSION))) LM_SENSORS_INSTALL_STAGING = YES LM_SENSORS_DEPENDENCIES = host-bison host-flex LM_SENSORS_LICENSE = LGPL-2.1+ (libsensors), GPL-2.0+ (programs) -- 2.34.1 From peter at korsgaard.com Sun Feb 6 14:52:29 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 15:52:29 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/pkcs11-helper: drop autoreconf Message-ID: <20220206144700.60FD382BBB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=95f5dcef1ba2c05a5ef23f619dac24c067148624 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x 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 (cherry picked from commit 59f8a971ae6c8f88bf99dede56946e701a2c1b40) Signed-off-by: Peter Korsgaard --- 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 peter at korsgaard.com Sun Feb 6 14:55:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 06 Feb 2022 15:55:02 +0100 Subject: [Buildroot] [PATCH 1/2] package/pkcs11-helper: drop autoreconf In-Reply-To: <20220128215013.2997212-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 28 Jan 2022 22:50:12 +0100") References: <20220128215013.2997212-1-fontaine.fabrice@gmail.com> Message-ID: <874k5cvyd5.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > autoreconf is not needed since commit > dbf8047f64f081ffbc97b67dd891690632377692 as the official tarball already > ships a configure file > Signed-off-by: Fabrice Fontaine Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 6 14:55:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 15:55:43 +0100 Subject: [Buildroot] [git commit] package/nfs-utils: nfsiostat uses python3, not python2 Message-ID: <20220206144852.55256817FB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cee035e4391417851fbbf41a1d4eb0c4d2ad60d4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master nfsiostat is a python3 script, so keep it if python3 is enabled and not python2: head -n 1 target/usr/sbin/nfsiostat #!/usr/bin/python3 Signed-off-by: Peter Korsgaard Reviewed-by: Petr Vorel Signed-off-by: Peter Korsgaard --- package/nfs-utils/nfs-utils.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk index 6a3a801359..44653e2707 100644 --- a/package/nfs-utils/nfs-utils.mk +++ b/package/nfs-utils/nfs-utils.mk @@ -114,7 +114,7 @@ define NFS_UTILS_REMOVE_NFSIOSTAT endef # nfsiostat is interpreted python, so remove it unless it's in the target -NFS_UTILS_POST_INSTALL_TARGET_HOOKS += $(if $(BR2_PACKAGE_PYTHON),,NFS_UTILS_REMOVE_NFSIOSTAT) +NFS_UTILS_POST_INSTALL_TARGET_HOOKS += $(if $(BR2_PACKAGE_PYTHON3),,NFS_UTILS_REMOVE_NFSIOSTAT) define HOST_NFS_UTILS_BUILD_CMDS $(MAKE) -C $(@D)/tools/rpcgen From peter at korsgaard.com Sun Feb 6 14:56:12 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 06 Feb 2022 15:56:12 +0100 Subject: [Buildroot] [PATCH] package/nfs-utils: nfsiostat used python3, not python2 In-Reply-To: (Petr Vorel's message of "Sun, 6 Feb 2022 15:34:46 +0100") References: <20220206131758.28001-1-peter@korsgaard.com> <87tudcw0zg.fsf@dell.be.48ers.dk> Message-ID: <87zgn4ujqr.fsf@dell.be.48ers.dk> >>>>> "Petr" == Petr Vorel writes: > Hi Peter, >> >>>>> "Peter" == Peter Korsgaard writes: >> s/used/uses/ in the subject naturally. > +1 >> > nfsiostat is a python3 script, so keep it if python3 is enabled and not >> > python2: > Good catch, thanks! > Reviewed-by: Petr Vorel Committed, thanks. -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Sun Feb 6 14:57:40 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 6 Feb 2022 15:57:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/protozero: bump to version 1.7.1 Message-ID: <20220206145740.1765660-1-fontaine.fabrice@gmail.com> Drop patch (already in version) https://github.com/mapbox/protozero/releases/tag/v1.7.1 Signed-off-by: Fabrice Fontaine --- ...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.34.1 From peter at korsgaard.com Sun Feb 6 15:21:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 06 Feb 2022 16:21:07 +0100 Subject: [Buildroot] [PATCH] package/apitrace: fix build failure on m68k architecture In-Reply-To: <20220129183426.152177-1-giulio.benetti@benettiengineering.com> (Giulio Benetti's message of "Sat, 29 Jan 2022 19:34:26 +0100") References: <20220129183426.152177-1-giulio.benetti@benettiengineering.com> Message-ID: <87v8xsuil8.fsf@dell.be.48ers.dk> >>>>> "Giulio" == Giulio Benetti writes: > 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 Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 6 15:20:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 16:20:06 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/apitrace: fix build failure on m68k architecture Message-ID: <20220206151401.9462782A9A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=08e8792c50685c1a8c2be7609943990f6083f714 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x 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 Signed-off-by: Thomas Petazzoni (cherry picked from commit fdee6c9f3987189eb743f54be2e545ce84d4d3bb) Signed-off-by: Peter Korsgaard --- 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)" From peter at korsgaard.com Sun Feb 6 15:28:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 06 Feb 2022 16:28:05 +0100 Subject: [Buildroot] [git commit] package/pistache: disable package if BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597=y In-Reply-To: <20220130215213.700B8817E3@busybox.osuosl.org> (Thomas Petazzoni via buildroot's message of "Sun, 30 Jan 2022 22:58:44 +0100") References: <20220130215213.700B8817E3@busybox.osuosl.org> Message-ID: <87r18gui9m.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni via buildroot writes: > commit: https://git.buildroot.net/buildroot/commit/?id=d5b08f37a4c3fb4f56f2ca440bafc865bdf04bfe > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Package pistache is affected by binutils bug 27597 (Nios II), so let's > disable it when BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597=y. Let's also > indent the comment dependencies. > Fixes: > http://autobuild.buildroot.net/results/0e7b74c5a07ced2bbae1a0a8c7d7ba26dfa04031/ > 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 Sun Feb 6 15:27:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 16:27:36 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/pistache: disable package if BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597=y Message-ID: <20220206152053.C8C9A8267F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=afcbd7abc4354d9aa3e312a723fc4374bbce919b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Package pistache is affected by binutils bug 27597 (Nios II), so let's disable it when BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597=y. Let's also indent the comment dependencies. Fixes: http://autobuild.buildroot.net/results/0e7b74c5a07ced2bbae1a0a8c7d7ba26dfa04031/ Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni (cherry picked from commit d5b08f37a4c3fb4f56f2ca440bafc865bdf04bfe) Signed-off-by: Peter Korsgaard --- 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 From peter at korsgaard.com Sun Feb 6 15:27:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 16:27:15 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/pistache: disable package if BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597=y Message-ID: <20220206152105.624FC8267F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eb7af923b23a444d3e79c8e7131ed6a03a8b2d9c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Package pistache is affected by binutils bug 27597 (Nios II), so let's disable it when BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597=y. Let's also indent the comment dependencies. Fixes: http://autobuild.buildroot.net/results/0e7b74c5a07ced2bbae1a0a8c7d7ba26dfa04031/ Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni (cherry picked from commit d5b08f37a4c3fb4f56f2ca440bafc865bdf04bfe) Signed-off-by: Peter Korsgaard --- 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 From peter at korsgaard.com Sun Feb 6 15:30:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 16:30:47 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/log4cxx: change download URL to https Message-ID: <20220206152340.0652C829FB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e46015c705e18097827e59cfc6fdee8e3dfccd92 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x - change download URL to https Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni (cherry picked from commit 0876da5ea1a9bd74737a4ccef2995f124368bb86) Signed-off-by: Peter Korsgaard --- 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 0ddea9466a..2bf70a99d2 100644 --- a/package/log4cxx/log4cxx.mk +++ b/package/log4cxx/log4cxx.mk @@ -5,7 +5,7 @@ ################################################################################ LOG4CXX_VERSION = 0.11.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 From peter at korsgaard.com Sun Feb 6 15:31:14 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 06 Feb 2022 16:31:14 +0100 Subject: [Buildroot] [PATCH v1 1/3] package/log4cxx: change download URL to https In-Reply-To: <20220128124538.31789-1-ps.report@gmx.net> (Peter Seiderer's message of "Fri, 28 Jan 2022 13:45:36 +0100") References: <20220128124538.31789-1-ps.report@gmx.net> Message-ID: <87mtj4ui4d.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > - change download URL 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 Sun Feb 6 15:34:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 06 Feb 2022 16:34:24 +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> (Peter Seiderer's message of "Fri, 28 Jan 2022 13:45:37 +0100") References: <20220128124538.31789-1-ps.report@gmx.net> <20220128124538.31789-2-ps.report@gmx.net> Message-ID: <87iltsuhz3.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > - 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 Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 6 15:34:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 06 Feb 2022 16:34:35 +0100 Subject: [Buildroot] [PATCH v1 3/3] package/log4cxx: bump version to 0.12.1 In-Reply-To: <20220128124538.31789-3-ps.report@gmx.net> (Peter Seiderer's message of "Fri, 28 Jan 2022 13:45:38 +0100") References: <20220128124538.31789-1-ps.report@gmx.net> <20220128124538.31789-3-ps.report@gmx.net> Message-ID: <87ee4guhys.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > - 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 Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 6 15:34:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 16:34:05 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/log4cxx: fix boost-fallback (only check for boost if really needed) Message-ID: <20220206152743.D98D682BBB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2a660956f3a14453d05831ad874e756bb39e3c86 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x - 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 Signed-off-by: Thomas Petazzoni (cherry picked from commit d76301be855d6d05af5aa5860e1d31385c197d16) Signed-off-by: Peter Korsgaard --- ...ack-only-check-for-boost-if-really-needed.patch | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) 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 + From peter at korsgaard.com Sun Feb 6 15:29:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 16:29:08 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/log4cxx: change download URL to https Message-ID: <20220206152743.D0A08829FB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f0b03fb9423652804aa5b16a8789a453527b7ba9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x - change download URL to https Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni (cherry picked from commit 0876da5ea1a9bd74737a4ccef2995f124368bb86) Signed-off-by: Peter Korsgaard --- 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 From peter at korsgaard.com Sun Feb 6 15:34:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 16:34:16 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/log4cxx: bump version to 0.12.1 Message-ID: <20220206152743.E59BC82BD7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9ff7b2165762d45479bfa2527c9ed10d2928e4cd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x - 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 Signed-off-by: Thomas Petazzoni (cherry picked from commit 38659ff0cb5b3d8a340adf5ff631200103f53e67) Signed-off-by: Peter Korsgaard --- package/log4cxx/0001-LOGCXX-528.patch | 189 --------------------- ...ck-only-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(-) 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 From arnout at mind.be Sun Feb 6 15:37:09 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 6 Feb 2022 16:37:09 +0100 Subject: [Buildroot] [PATCH 1/1] docs/manual: add section on start script recommendations In-Reply-To: <20211205102010.2834942-1-troglobit@gmail.com> References: <20211205102010.2834942-1-troglobit@gmail.com> Message-ID: On 05/12/2021 11:20, Joachim Wiberg wrote: > Signed-off-by: Joachim Wiberg > --- > docs/manual/adding-packages-directory.txt | 96 +++++++++++++++++++++++ > docs/manual/configure.txt | 1 + > 2 files changed, 97 insertions(+) > > diff --git a/docs/manual/adding-packages-directory.txt b/docs/manual/adding-packages-directory.txt > index 4ceb3fd772..72e8dac5ff 100644 > --- a/docs/manual/adding-packages-directory.txt > +++ b/docs/manual/adding-packages-directory.txt > @@ -554,3 +554,99 @@ over time. Such patches should not be downloaded, and instead be added > locally to the package folder. > > If the +.hash+ file is missing, then no check is done at all. > + > +[[adding-packages-start-script]] > +=== The +SNNfood+ start script > + > +Packages that provide a system daemon usually need to be started somehow > +at boot. Buildroot comes with support for several init systems, some > +are considered tier one (see xref:init-system[]), while others are also > +available but do not have the same level of integration. The > +recommended one in Buildroot is the BusyBox init. I think the intention is that systemd is at the same level as busybox init. And we generally don't distinguish between busybox init and SysV init. I made a few other small changes to the text and applied to master, thanks. Regards, Arnout > + > +All packages providing a system daemon must provide a start script for > +BusyBox init, and should provide a systemd unit file. For consistency, > +the init script must follow the style and composition as defined in the > +reference: +package/busybox/S01syslogd+. There is no recommendation for > +systemd unit files, but if a package comes with its own unit file, that > +is preferred over a local one. Provided of course that the unit file > +is compatible with a Buildroot system. > + > +The name of the start script is composed of the +SNN+ and the daemon > +name. The +NN+ is the start order number which needs to be carefully > +chosen. For example, a program that requires networking to be up should > +not start before +S40network+. The scripts are started in alphabetical > +order, so +S01syslogd+ starts before +S01watchdogd+, and +S02sysctl+ > +start thereafter. > + > +------------------------------ > +01: #!/bin/sh > +02: > +03: DAEMON="syslogd" > +04: PIDFILE="/var/run/$DAEMON.pid" > +05: > +06: SYSLOGD_ARGS="" > +07: > +08: # shellcheck source=/dev/null > +09: [ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" > +10: > +11: # BusyBox' syslogd does not create a pidfile, so pass "-n" in the command line > +12: # and use "-m" to instruct start-stop-daemon to create one. > +13: start() { > +14: printf 'Starting %s: ' "$DAEMON" > +15: # shellcheck disable=SC2086 # we need the word splitting > +16: start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/sbin/$DAEMON" \ > +17: -- -n $SYSLOGD_ARGS > +18: status=$? > +19: if [ "$status" -eq 0 ]; then > +20: echo "OK" > +21: else > +22: echo "FAIL" > +23: fi > +24: return "$status" > +25: } > +26: > +27: stop() { > +28: printf 'Stopping %s: ' "$DAEMON" > +29: start-stop-daemon -K -q -p "$PIDFILE" > +30: status=$? > +31: if [ "$status" -eq 0 ]; then > +32: rm -f "$PIDFILE" > +33: echo "OK" > +34: else > +35: echo "FAIL" > +36: fi > +37: return "$status" > +38: } > +39: > +40: restart() { > +41: stop > +42: sleep 1 > +43: start > +44: } > +45: > +46: case "$1" in > +47: start|stop|restart) > +48: "$1";; > +49: reload) > +50: # Restart, since there is no true "reload" feature. > +51: restart;; > +52: *) > +53: echo "Usage: $0 {start|stop|restart|reload}" > +54: exit 1 > +55: esac > +------------------------------ > + > +*Note:* programs that support reloading their configuration in some > +fashion (+SIGHUP+) should provide a +reload()+ function similar to > ++stop()+. The +start-stop-daemon+ supports +-K -s HUP+ for this. > +It is recommended to always append +-x "/sbin/$DAEMON"+ to all the > ++start-stop-daemon+ commands to ensure signals are set to a PID that > +matches +$DAEMON+. > + > +Both start scripts and unit files can source command line arguments from > ++/etc/default/foo+, in general, if such a file does not exist it should > +not block the start of the daemon, unless there is some site specirfic > +command line argument the daemon requires to start. For start scripts a > ++FOO_ARGS="-s -o -m -e -args"+ can be defined to a default value in and > +the user can override this from +/etc/default/foo+. > diff --git a/docs/manual/configure.txt b/docs/manual/configure.txt > index c9eef567f4..60860d2c71 100644 > --- a/docs/manual/configure.txt > +++ b/docs/manual/configure.txt > @@ -377,6 +377,7 @@ good solution. > Note that if +systemd+ is chosen as init system, /dev management will > be performed by the +udev+ program provided by +systemd+. > > +[[init-system]] > === init system > > The _init_ program is the first userspace program started by the From arnout at mind.be Sun Feb 6 15:35:53 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 6 Feb 2022 16:35:53 +0100 Subject: [Buildroot] [git commit] docs/manual: add section on start script recommendations Message-ID: <20220206153008.BB1268156C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4fe33a1b47ba9c1e90c2c794cefb13962ea89b99 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Joachim Wiberg Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- docs/manual/adding-packages-directory.txt | 96 +++++++++++++++++++++++++++++++ docs/manual/configure.txt | 1 + 2 files changed, 97 insertions(+) diff --git a/docs/manual/adding-packages-directory.txt b/docs/manual/adding-packages-directory.txt index e5c7462a6c..749e2d43b9 100644 --- a/docs/manual/adding-packages-directory.txt +++ b/docs/manual/adding-packages-directory.txt @@ -547,3 +547,99 @@ over time. Such patches should not be downloaded, and instead be added locally to the package folder. If the +.hash+ file is missing, then no check is done at all. + +[[adding-packages-start-script]] +=== The +SNNfoo+ start script + +Packages that provide a system daemon usually need to be started somehow +at boot. Buildroot comes with support for several init systems, some +are considered tier one (see xref:init-system[]), while others are also +available but do not have the same level of integration. Ideally, all +packages providing a system daemon should provide a start script for +BusyBox/SysV init and a systemd unit file. + +For consistency, the start script must follow the style and composition +as shown in the reference: +package/busybox/S01syslogd+. An annotated +example of this style is shown below. There is no specific coding style +for systemd unit files, but if a package comes with its own unit file, +that is preferred over a buildroot specific one, if it is compatible +with buildroot. + +The name of the start script is composed of the +SNN+ and the daemon +name. The +NN+ is the start order number which needs to be carefully +chosen. For example, a program that requires networking to be up should +not start before +S40network+. The scripts are started in alphabetical +order, so +S01syslogd+ starts before +S01watchdogd+, and +S02sysctl+ +start thereafter. + +------------------------------ +01: #!/bin/sh +02: +03: DAEMON="syslogd" +04: PIDFILE="/var/run/$DAEMON.pid" +05: +06: SYSLOGD_ARGS="" +07: +08: # shellcheck source=/dev/null +09: [ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" +10: +11: # BusyBox' syslogd does not create a pidfile, so pass "-n" in the command line +12: # and use "-m" to instruct start-stop-daemon to create one. +13: start() { +14: printf 'Starting %s: ' "$DAEMON" +15: # shellcheck disable=SC2086 # we need the word splitting +16: start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/sbin/$DAEMON" \ +17: -- -n $SYSLOGD_ARGS +18: status=$? +19: if [ "$status" -eq 0 ]; then +20: echo "OK" +21: else +22: echo "FAIL" +23: fi +24: return "$status" +25: } +26: +27: stop() { +28: printf 'Stopping %s: ' "$DAEMON" +29: start-stop-daemon -K -q -p "$PIDFILE" +30: status=$? +31: if [ "$status" -eq 0 ]; then +32: rm -f "$PIDFILE" +33: echo "OK" +34: else +35: echo "FAIL" +36: fi +37: return "$status" +38: } +39: +40: restart() { +41: stop +42: sleep 1 +43: start +44: } +45: +46: case "$1" in +47: start|stop|restart) +48: "$1";; +49: reload) +50: # Restart, since there is no true "reload" feature. +51: restart;; +52: *) +53: echo "Usage: $0 {start|stop|restart|reload}" +54: exit 1 +55: esac +------------------------------ + +*Note:* programs that support reloading their configuration in some +fashion (+SIGHUP+) should provide a +reload()+ function similar to ++stop()+. The +start-stop-daemon+ supports +-K -s HUP+ for this. +It is recommended to always append +-x "/sbin/$DAEMON"+ to all the ++start-stop-daemon+ commands to ensure signals are set to a PID that +matches +$DAEMON+. + +Both start scripts and unit files can source command line arguments from ++/etc/default/foo+, in general, if such a file does not exist it should +not block the start of the daemon, unless there is some site specirfic +command line argument the daemon requires to start. For start scripts a ++FOO_ARGS="-s -o -m -e -args"+ can be defined to a default value in and +the user can override this from +/etc/default/foo+. diff --git a/docs/manual/configure.txt b/docs/manual/configure.txt index c9eef567f4..60860d2c71 100644 --- a/docs/manual/configure.txt +++ b/docs/manual/configure.txt @@ -377,6 +377,7 @@ good solution. Note that if +systemd+ is chosen as init system, /dev management will be performed by the +udev+ program provided by +systemd+. +[[init-system]] === init system The _init_ program is the first userspace program started by the From peter at korsgaard.com Sun Feb 6 16:24:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 06 Feb 2022 17:24:55 +0100 Subject: [Buildroot] [PATCH 1/1] package/connman: bump to version 1.41 In-Reply-To: <20220130222317.2830755-1-james.hilliard1@gmail.com> (James Hilliard's message of "Sun, 30 Jan 2022 15:23:17 -0700") References: <20220130222317.2830755-1-james.hilliard1@gmail.com> Message-ID: <87a6f4ufmw.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard This fixes a number of security issues, so it should ideally have been tagged as a security bump: https://www.openwall.com/lists/oss-security/2022/01/25/1 Committed to 2021.02.x and 2021.11.x with that fixed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 6 15:48:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 16:48:16 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/connman: security bump to version 1.41 Message-ID: <20220206161747.9E8FC82931@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1dd480525f763cbcd7a50960d99cff89a0b0d5ea branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fixes the following security issues: - CVE-2022-23096: An issue was discovered in the DNS proxy in Connman through 1.40. The TCP server reply implementation lacks a check for the presence of sufficient Header Data, leading to an out-of-bounds read. - CVE-2022-23097: An issue was discovered in the DNS proxy in Connman through 1.40. forward_dns_reply mishandles a strnlen call, leading to an out-of-bounds read. - CVE-2022-23098: An issue was discovered in the DNS proxy in Connman through 1.40. The TCP server reply implementation has an infinite loop if no data is received. For details, see the advisory: https://www.openwall.com/lists/oss-security/2022/01/25/1 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni (cherry picked from commit 35a3c018246813597db52ef65b36a295ebdd9285) Signed-off-by: Peter Korsgaard --- package/connman/connman.hash | 2 +- package/connman/connman.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/connman/connman.hash b/package/connman/connman.hash index 797448337c..6fc5edf29a 100644 --- a/package/connman/connman.hash +++ b/package/connman/connman.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/network/connman/sha256sums.asc -sha256 1a57ae7ce234aa3a1744aac3be5c2121d98dce999440ef8ab9cc4edfd5edcb12 connman-1.40.tar.xz +sha256 79fb40f4fdd5530c45aa8e592fb16ba23d3674f3a98cf10b89a6576f198de589 connman-1.41.tar.xz # Locally computed sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING diff --git a/package/connman/connman.mk b/package/connman/connman.mk index 8c66a69882..61851bd2dc 100644 --- a/package/connman/connman.mk +++ b/package/connman/connman.mk @@ -4,7 +4,7 @@ # ################################################################################ -CONNMAN_VERSION = 1.40 +CONNMAN_VERSION = 1.41 CONNMAN_SOURCE = connman-$(CONNMAN_VERSION).tar.xz CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman CONNMAN_DEPENDENCIES = libglib2 dbus From peter at korsgaard.com Sun Feb 6 15:45:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 6 Feb 2022 16:45:33 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/connman: security bump to version 1.41 Message-ID: <20220206161751.8BB7082BD9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b9794087bd971cfb49a22ca2ad01d754b1c47f53 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fixes the following security issues: - CVE-2022-23096: An issue was discovered in the DNS proxy in Connman through 1.40. The TCP server reply implementation lacks a check for the presence of sufficient Header Data, leading to an out-of-bounds read. - CVE-2022-23097: An issue was discovered in the DNS proxy in Connman through 1.40. forward_dns_reply mishandles a strnlen call, leading to an out-of-bounds read. - CVE-2022-23098: An issue was discovered in the DNS proxy in Connman through 1.40. The TCP server reply implementation has an infinite loop if no data is received. For details, see the advisory: https://www.openwall.com/lists/oss-security/2022/01/25/1 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni (cherry picked from commit 35a3c018246813597db52ef65b36a295ebdd9285) Signed-off-by: Peter Korsgaard --- package/connman/connman.hash | 2 +- package/connman/connman.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/connman/connman.hash b/package/connman/connman.hash index 797448337c..6fc5edf29a 100644 --- a/package/connman/connman.hash +++ b/package/connman/connman.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/network/connman/sha256sums.asc -sha256 1a57ae7ce234aa3a1744aac3be5c2121d98dce999440ef8ab9cc4edfd5edcb12 connman-1.40.tar.xz +sha256 79fb40f4fdd5530c45aa8e592fb16ba23d3674f3a98cf10b89a6576f198de589 connman-1.41.tar.xz # Locally computed sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING diff --git a/package/connman/connman.mk b/package/connman/connman.mk index 8c66a69882..61851bd2dc 100644 --- a/package/connman/connman.mk +++ b/package/connman/connman.mk @@ -4,7 +4,7 @@ # ################################################################################ -CONNMAN_VERSION = 1.40 +CONNMAN_VERSION = 1.41 CONNMAN_SOURCE = connman-$(CONNMAN_VERSION).tar.xz CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman CONNMAN_DEPENDENCIES = libglib2 dbus From arnout at mind.be Sun Feb 6 17:27:03 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 6 Feb 2022 18:27:03 +0100 Subject: [Buildroot] [git commit] support/docker: add shellcheck Message-ID: <20220206172023.5513882C83@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=236e2343f39b0aeb6aa18be26c92a0dee7fd656e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Acked-by: Romain Naour 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 120e301b7c..f54c31b54a 100644 --- a/support/docker/Dockerfile +++ b/support/docker/Dockerfile @@ -45,6 +45,7 @@ RUN apt-get install -y --no-install-recommends \ qemu-system-arm \ qemu-system-x86 \ rsync \ + shellcheck \ subversion \ unzip \ wget \ From arnout at mind.be Sun Feb 6 17:26:20 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 6 Feb 2022 18:26:20 +0100 Subject: [Buildroot] [git commit] utils/checkpackagelib: warn about executable files Message-ID: <20220206172023.42B7482BDD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7947328de48cbea36cadf2d41b0b401da761ba37 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Currently there are no .mk, Config.in, .patch or .hash files with executable permissions in the tree. But we don't want to have that. So warn when a file checked by check-package has executable permission. This check will be reused when testing SysV init scripts in the tree. Signed-off-by: Ricardo Martincoski [Arnout: use context manager for temp dir so it gets deleted] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- utils/checkpackagelib/lib_config.py | 1 + utils/checkpackagelib/lib_hash.py | 1 + utils/checkpackagelib/lib_mk.py | 1 + utils/checkpackagelib/lib_patch.py | 1 + utils/checkpackagelib/test_tool.py | 41 +++++++++++++++++++++++++++++++++++++ utils/checkpackagelib/tool.py | 8 ++++++++ 6 files changed, 53 insertions(+) diff --git a/utils/checkpackagelib/lib_config.py b/utils/checkpackagelib/lib_config.py index c348eec399..b05831f2c3 100644 --- a/utils/checkpackagelib/lib_config.py +++ b/utils/checkpackagelib/lib_config.py @@ -10,6 +10,7 @@ from checkpackagelib.lib import ConsecutiveEmptyLines # noqa: F401 from checkpackagelib.lib import EmptyLastLine # noqa: F401 from checkpackagelib.lib import NewlineAtEof # noqa: F401 from checkpackagelib.lib import TrailingSpace # noqa: F401 +from checkpackagelib.tool import NotExecutable # noqa: F401 def _empty_or_comment(text): diff --git a/utils/checkpackagelib/lib_hash.py b/utils/checkpackagelib/lib_hash.py index 1c595e84b8..5968c809bf 100644 --- a/utils/checkpackagelib/lib_hash.py +++ b/utils/checkpackagelib/lib_hash.py @@ -10,6 +10,7 @@ from checkpackagelib.lib import ConsecutiveEmptyLines # noqa: F401 from checkpackagelib.lib import EmptyLastLine # noqa: F401 from checkpackagelib.lib import NewlineAtEof # noqa: F401 from checkpackagelib.lib import TrailingSpace # noqa: F401 +from checkpackagelib.tool import NotExecutable # noqa: F401 def _empty_line_or_comment(text): diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py index 88e4b15c7c..153754b6f1 100644 --- a/utils/checkpackagelib/lib_mk.py +++ b/utils/checkpackagelib/lib_mk.py @@ -13,6 +13,7 @@ from checkpackagelib.lib import EmptyLastLine # noqa: F401 from checkpackagelib.lib import NewlineAtEof # noqa: F401 from checkpackagelib.lib import TrailingSpace # noqa: F401 from checkpackagelib.lib import Utf8Characters # noqa: F401 +from checkpackagelib.tool import NotExecutable # noqa: F401 # used in more than one check start_conditional = ["ifdef", "ifeq", "ifndef", "ifneq"] diff --git a/utils/checkpackagelib/lib_patch.py b/utils/checkpackagelib/lib_patch.py index e4e914b7f0..caee36158f 100644 --- a/utils/checkpackagelib/lib_patch.py +++ b/utils/checkpackagelib/lib_patch.py @@ -8,6 +8,7 @@ import re from checkpackagelib.base import _CheckFunction from checkpackagelib.lib import NewlineAtEof # noqa: F401 +from checkpackagelib.tool import NotExecutable # noqa: F401 class ApplyOrder(_CheckFunction): diff --git a/utils/checkpackagelib/test_tool.py b/utils/checkpackagelib/test_tool.py new file mode 100644 index 0000000000..51c8e0cb27 --- /dev/null +++ b/utils/checkpackagelib/test_tool.py @@ -0,0 +1,41 @@ +import os +import pytest +import re +import tempfile +import checkpackagelib.tool as m + +workdir_regex = re.compile(r'/tmp/tmp[^/]*-checkpackagelib-test-tool') + + +def check_file(tool, filename, string, permissions=None): + with tempfile.TemporaryDirectory(suffix='-checkpackagelib-test-tool') as workdir: + script = os.path.join(workdir, filename) + with open(script, 'wb') as f: + f.write(string.encode()) + if permissions: + os.chmod(script, permissions) + obj = tool(script) + result = obj.run() + if result is None: + return [] + return [workdir_regex.sub('dir', r) for r in result] + + +NotExecutable = [ + ('664', + 'package.mk', + 0o664, + '', + []), + ('775', + 'package.mk', + 0o775, + '', + ["dir/package.mk:0: This file does not need to be executable"]), + ] + + + at pytest.mark.parametrize('testname,filename,permissions,string,expected', NotExecutable) +def test_NotExecutable(testname, filename, permissions, string, expected): + warnings = check_file(m.NotExecutable, filename, string, permissions) + assert warnings == expected diff --git a/utils/checkpackagelib/tool.py b/utils/checkpackagelib/tool.py new file mode 100644 index 0000000000..f2007be1ff --- /dev/null +++ b/utils/checkpackagelib/tool.py @@ -0,0 +1,8 @@ +import os +from checkpackagelib.base import _Tool + + +class NotExecutable(_Tool): + def run(self): + if os.access(self.filename, os.X_OK): + return ["{}:0: This file does not need to be executable".format(self.filename)] From arnout at mind.be Sun Feb 6 17:27:03 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 6 Feb 2022 18:27:03 +0100 Subject: [Buildroot] [git commit] utils/checkpackagelib/lib_sysv: run shellcheck Message-ID: <20220206172023.5E1EE82BA3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d409fe085663194cbe23fbbfef38f566c4910bb8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For simplicity, when shellcheck returns one or more warnings, count it as a single check-package warning. The developer can get the full output either by running shellcheck directly or by calling check-package with -v. Examples: |$ ./utils/docker-run utils/check-package --include Shellcheck package/polkit/S50polkit |package/polkit/S50polkit:0: run 'shellcheck' and fix the warnings |51 lines processed |1 warnings generated |$ ./utils/docker-run utils/check-package --include Shellcheck -v package/polkit/S50polkit |package/polkit/S50polkit:0: run 'shellcheck' and fix the warnings |In package/polkit/S50polkit line 43: |< tab >start|stop|restart|reload) | ^----^ SC2221: This pattern always overrides a later one on line 45. |In package/polkit/S50polkit line 45: |< tab >reload) | ^----^ SC2222: This pattern never matches because of a previous pattern on line 43. |For more information: | https://www.shellcheck.net/wiki/SC2221 -- This pattern always overrides a l... | https://www.shellcheck.net/wiki/SC2222 -- This pattern never matches becaus... |51 lines processed |1 warnings generated NOTICE: shellcheck results depends on the version of the tool. This is why the examples above run inside the docker image. Also update .gitlab-ci.yml with the docker image after the change of the previous commit. We don't actually use shellcheck in CI, but the image from .gitlab-ci.yml is used by the docker-run script and we use that to run shellcheck. Signed-off-by: Ricardo Martincoski [Arnout: make sure a single -v is enough to get shellcheck output; update docker image tag in .gitlab-ci.yml] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .gitlab-ci.yml | 2 +- utils/checkpackagelib/lib_sysv.py | 1 + utils/checkpackagelib/test_tool.py | 46 ++++++++++++++++++++++++++++++++++++++ utils/checkpackagelib/tool.py | 16 +++++++++++++ 4 files changed, 64 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d54f46c409..cad35c96bc 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:20220206.1324 +image: $CI_REGISTRY/buildroot.org/buildroot/base:20220206.1756 stages: - generate-gitlab-ci diff --git a/utils/checkpackagelib/lib_sysv.py b/utils/checkpackagelib/lib_sysv.py index 2ee5f74af7..386d085afc 100644 --- a/utils/checkpackagelib/lib_sysv.py +++ b/utils/checkpackagelib/lib_sysv.py @@ -7,6 +7,7 @@ from checkpackagelib.lib import EmptyLastLine # noqa: F401 from checkpackagelib.lib import NewlineAtEof # noqa: F401 from checkpackagelib.lib import TrailingSpace # noqa: F401 import checkpackagelib.tool +from checkpackagelib.tool import Shellcheck # noqa: F401 class Indent(_CheckFunction): diff --git a/utils/checkpackagelib/test_tool.py b/utils/checkpackagelib/test_tool.py index 9e1abbfc23..38029297a5 100644 --- a/utils/checkpackagelib/test_tool.py +++ b/utils/checkpackagelib/test_tool.py @@ -64,3 +64,49 @@ def test_NotExecutable_hint(testname, hint, filename, permissions, string, expec return hint warnings = check_file(NotExecutable, filename, string, permissions) assert warnings == expected + + +Shellcheck = [ + ('missing shebang', + 'empty.sh', + '', + ["dir/empty.sh:0: run 'shellcheck' and fix the warnings", + "In dir/empty.sh line 1:", + "^-- SC2148: Tips depend on target shell and yours is unknown. Add a shebang or a 'shell' directive.", + "For more information:", + " https://www.shellcheck.net/wiki/SC2148 -- Tips depend on target shell and y..."]), + ('sh shebang', + 'sh-shebang.sh', + '#!/bin/sh', + []), + ('bash shebang', + 'bash-shebang.sh', + '#!/bin/bash', + []), + ('2 warnings', + 'unused.sh', + 'unused=""', + ["dir/unused.sh:0: run 'shellcheck' and fix the warnings", + "In dir/unused.sh line 1:", + 'unused=""', + "^-- SC2148: Tips depend on target shell and yours is unknown. Add a shebang or a 'shell' directive.", + "^----^ SC2034: unused appears unused. Verify use (or export if used externally).", + "For more information:", + " https://www.shellcheck.net/wiki/SC2148 -- Tips depend on target shell and y...", + " https://www.shellcheck.net/wiki/SC2034 -- unused appears unused. Verify use..."]), + ('tab', + 'tab.sh', + '\t#!/bin/sh', + ["dir/tab.sh:0: run 'shellcheck' and fix the warnings", + "In dir/tab.sh line 1:", + '\t#!/bin/sh', + "^-- SC1114: Remove leading spaces before the shebang.", + "For more information:", + " https://www.shellcheck.net/wiki/SC1114 -- Remove leading spaces before the ..."]), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', Shellcheck) +def test_Shellcheck(testname, filename, string, expected): + warnings = check_file(m.Shellcheck, filename, string) + assert warnings == expected diff --git a/utils/checkpackagelib/tool.py b/utils/checkpackagelib/tool.py index e931272554..e719fdd407 100644 --- a/utils/checkpackagelib/tool.py +++ b/utils/checkpackagelib/tool.py @@ -1,4 +1,5 @@ import os +import subprocess from checkpackagelib.base import _Tool @@ -6,3 +7,18 @@ class NotExecutable(_Tool): def run(self): if os.access(self.filename, os.X_OK): return ["{}:0: This file does not need to be executable{}".format(self.filename, self.hint())] + + +class Shellcheck(_Tool): + def run(self): + cmd = ['shellcheck', self.filename] + try: + p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + stdout = p.communicate()[0] + processed_output = [str(line.decode().rstrip()) for line in stdout.splitlines() if line] + if p.returncode == 0: + return + return ["{}:0: run 'shellcheck' and fix the warnings".format(self.filename), + '\n'.join(processed_output)] + except FileNotFoundError: + return ["{}:0: failed to call 'shellcheck'".format(self.filename)] From arnout at mind.be Sun Feb 6 17:27:00 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 6 Feb 2022 18:27:00 +0100 Subject: [Buildroot] [git commit] utils/checkpackagelib/lib_sysv: check SysV init scripts Message-ID: <20220206172023.4C66A82C6C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d020368eeae5f85eb125788d07a7b013e13b34c2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Enable the common checks: - consecutive empty lines - empty last line - missing new line at end of file - trailing space - warn for executable files, with the hint to instead use '$(INSTALL) -D -m 0755' in the .mk file Check indent with tabs: - add a simple check function to warn only when the indent is done using spaces or a mix of tabs and spaces. It does not check indenting levels, but it already makes the review easier, since it diferentiates spaces and tabs. Check variables: - check DAEMON is defined - when DAEMON is defined, check the filename is in the form S01daemon - when PIDFILE is defined, expect it to be in /var/run and defined using $DAEMON. Also add unit test for this. Signed-off-by: Ricardo Martincoski [Arnout: avoid 'del NotExecutable_base' by importing the module instead of the class; refer to manual in warnings] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- utils/check-package | 5 ++ utils/checkpackagelib/base.py | 3 + utils/checkpackagelib/lib_sysv.py | 68 +++++++++++++++++ utils/checkpackagelib/test_lib_sysv.py | 131 +++++++++++++++++++++++++++++++++ utils/checkpackagelib/test_tool.py | 25 +++++++ utils/checkpackagelib/tool.py | 2 +- 6 files changed, 233 insertions(+), 1 deletion(-) diff --git a/utils/check-package b/utils/check-package index 5fb430902d..f64daed84c 100755 --- a/utils/check-package +++ b/utils/check-package @@ -13,6 +13,7 @@ import checkpackagelib.lib_config import checkpackagelib.lib_hash import checkpackagelib.lib_mk import checkpackagelib.lib_patch +import checkpackagelib.lib_sysv VERBOSE_LEVEL_TO_SHOW_IGNORED_FILES = 3 flags = None # Command line arguments. @@ -66,6 +67,8 @@ DO_NOT_CHECK_INTREE = re.compile(r"|".join([ r"toolchain/toolchain-external/pkg-toolchain-external\.mk$", ])) +SYSV_INIT_SCRIPT_FILENAME = re.compile(r"/S\d\d[^/]+$") + def get_lib_from_filename(fname): if flags.intree_only: @@ -85,6 +88,8 @@ def get_lib_from_filename(fname): return checkpackagelib.lib_mk if fname.endswith(".patch"): return checkpackagelib.lib_patch + if SYSV_INIT_SCRIPT_FILENAME.search(fname): + return checkpackagelib.lib_sysv return None diff --git a/utils/checkpackagelib/base.py b/utils/checkpackagelib/base.py index 73da925a03..f666e4110b 100644 --- a/utils/checkpackagelib/base.py +++ b/utils/checkpackagelib/base.py @@ -24,3 +24,6 @@ class _Tool(object): def run(self): pass + + def hint(self): + return "" diff --git a/utils/checkpackagelib/lib_sysv.py b/utils/checkpackagelib/lib_sysv.py new file mode 100644 index 0000000000..2ee5f74af7 --- /dev/null +++ b/utils/checkpackagelib/lib_sysv.py @@ -0,0 +1,68 @@ +import os +import re + +from checkpackagelib.base import _CheckFunction +from checkpackagelib.lib import ConsecutiveEmptyLines # noqa: F401 +from checkpackagelib.lib import EmptyLastLine # noqa: F401 +from checkpackagelib.lib import NewlineAtEof # noqa: F401 +from checkpackagelib.lib import TrailingSpace # noqa: F401 +import checkpackagelib.tool + + +class Indent(_CheckFunction): + INDENTED_WITH_SPACES = re.compile(r"^[\t]* ") + + def check_line(self, lineno, text): + if self.INDENTED_WITH_SPACES.search(text.rstrip()): + return ["{}:{}: should be indented with tabs ({}#adding-packages-start-script)" + .format(self.filename, lineno, self.url_to_manual), + text] + + +class NotExecutable(checkpackagelib.tool.NotExecutable): + def hint(self): + return ", just make sure you use '$(INSTALL) -D -m 0755' in the .mk file" + + +class Variables(_CheckFunction): + DAEMON_VAR = re.compile(r"^DAEMON=[\"']{0,1}([^\"']*)[\"']{0,1}") + PIDFILE_PATTERN = re.compile(r"/var/run/(\$DAEMON|\$\{DAEMON\}).pid") + PIDFILE_VAR = re.compile(r"^PIDFILE=[\"']{0,1}([^\"']*)[\"']{0,1}") + + def before(self): + self.name = None + + def check_line(self, lineno, text): + name_found = self.DAEMON_VAR.search(text.rstrip()) + if name_found: + if self.name: + return ["{}:{}: DAEMON variable redefined ({}#adding-packages-start-script)" + .format(self.filename, lineno, self.url_to_manual), + text] + self.name = name_found.group(1) + if '/' in self.name: + self.name = os.path.basename(self.name) # to be used in after() to check the expected filename + return ["{}:{}: Do not include path in DAEMON ({}#adding-packages-start-script)" + .format(self.filename, lineno, self.url_to_manual), + text, + 'DAEMON="{}"'.format(self.name)] + return + + pidfile_found = self.PIDFILE_VAR.search(text.rstrip()) + if pidfile_found: + pidfile = pidfile_found.group(1) + if not self.PIDFILE_PATTERN.match(pidfile): + return ["{}:{}: Incorrect PIDFILE value ({}#adding-packages-start-script)" + .format(self.filename, lineno, self.url_to_manual), + text, + 'PIDFILE="/var/run/$DAEMON.pid"'] + + def after(self): + if self.name is None: + return ["{}:0: DAEMON variable not defined ({}#adding-packages-start-script)" + .format(self.filename, self.url_to_manual)] + expected_filename = re.compile(r"S\d\d{}$".format(self.name)) + if not expected_filename.match(os.path.basename(self.filename)): + return ["{}:0: filename should be S ({}#adding-packages-start-script)" + .format(self.filename, self.url_to_manual), + "expecting S{}".format(self.name)] diff --git a/utils/checkpackagelib/test_lib_sysv.py b/utils/checkpackagelib/test_lib_sysv.py new file mode 100644 index 0000000000..9ae840594f --- /dev/null +++ b/utils/checkpackagelib/test_lib_sysv.py @@ -0,0 +1,131 @@ +import os +import pytest +import re +import tempfile +import checkpackagelib.test_util as util +import checkpackagelib.lib_sysv as m +from checkpackagelib.test_tool import check_file as tool_check_file + +workdir = os.path.join(tempfile.mkdtemp(suffix='-checkpackagelib-test-sysv')) +workdir_regex = re.compile(r'/tmp/tmp[^/]*-checkpackagelib-test-sysv') + + +Indent = [ + ('empty file', + 'any', + '', + []), + ('empty line', + 'any', + '\n', + []), + ('ignore whitespace', + 'any', + ' \n', + []), + ('spaces', + 'any', + 'case "$1" in\n' + ' start)', + [['any:2: should be indented with tabs (url#adding-packages-start-script)', + ' start)']]), + ('tab', + 'any', + 'case "$1" in\n' + '\tstart)', + []), + ('tabs and spaces', + 'any', + 'case "$1" in\n' + '\t start)', + [['any:2: should be indented with tabs (url#adding-packages-start-script)', + '\t start)']]), + ('spaces and tabs', + 'any', + 'case "$1" in\n' + ' \tstart)', + [['any:2: should be indented with tabs (url#adding-packages-start-script)', + ' \tstart)']]), + ] + + + 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 + + +NotExecutable = [ + ('SysV', + 'sh-shebang.sh', + 0o775, + '#!/bin/sh', + ["dir/sh-shebang.sh:0: This file does not need to be executable," + " just make sure you use '$(INSTALL) -D -m 0755' in the .mk file"]), + ] + + + at pytest.mark.parametrize('testname,filename,permissions,string,expected', NotExecutable) +def test_NotExecutable(testname, filename, permissions, string, expected): + warnings = tool_check_file(m.NotExecutable, filename, string, permissions) + assert warnings == expected + + +Variables = [ + ('empty file', + 'any', + '', + [['any:0: DAEMON variable not defined (url#adding-packages-start-script)']]), + ('daemon and pidfile ok', + 'package/busybox/S01syslogd', + 'DAEMON="syslogd"\n' + 'PIDFILE="/var/run/$DAEMON.pid"\n', + []), + ('wrong filename', + 'package/busybox/S01syslog', + 'DAEMON="syslogd"\n' + 'PIDFILE="/var/run/${DAEMON}.pid"\n', + [['package/busybox/S01syslog:0: filename should be S (url#adding-packages-start-script)', + 'expecting Ssyslogd']]), + ('no pidfile ok', + 'S99something', + 'DAEMON="something"\n', + []), + ('hardcoded pidfile', + 'S99something', + 'DAEMON="something"\n' + 'PIDFILE="/var/run/something.pid"\n', + [['S99something:2: Incorrect PIDFILE value (url#adding-packages-start-script)', + 'PIDFILE="/var/run/something.pid"\n', + 'PIDFILE="/var/run/$DAEMON.pid"']]), + ('redefined daemon', + 'S50any', + 'DAEMON="any"\n' + 'DAEMON="other"\n', + [['S50any:2: DAEMON variable redefined (url#adding-packages-start-script)', + 'DAEMON="other"\n']]), + ('daemon name with dash', + 'S82cups-browsed', + 'DAEMON="cups-browsed"', + []), + ('daemon with path', + 'S50avahi-daemon', + 'DAEMON=/usr/sbin/avahi-daemon', + [['S50avahi-daemon:1: Do not include path in DAEMON (url#adding-packages-start-script)', + 'DAEMON=/usr/sbin/avahi-daemon', + 'DAEMON="avahi-daemon"']]), + ('daemon with path and wrong filename', + 'S50avahi', + 'DAEMON=/usr/sbin/avahi-daemon', + [['S50avahi:1: Do not include path in DAEMON (url#adding-packages-start-script)', + 'DAEMON=/usr/sbin/avahi-daemon', + 'DAEMON="avahi-daemon"'], + ['S50avahi:0: filename should be S (url#adding-packages-start-script)', + 'expecting Savahi-daemon']]), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', Variables) +def test_Variables(testname, filename, string, expected): + warnings = util.check_file(m.Variables, filename, string) + assert warnings == expected diff --git a/utils/checkpackagelib/test_tool.py b/utils/checkpackagelib/test_tool.py index 51c8e0cb27..9e1abbfc23 100644 --- a/utils/checkpackagelib/test_tool.py +++ b/utils/checkpackagelib/test_tool.py @@ -39,3 +39,28 @@ NotExecutable = [ def test_NotExecutable(testname, filename, permissions, string, expected): warnings = check_file(m.NotExecutable, filename, string, permissions) assert warnings == expected + + +NotExecutable_hint = [ + ('no hint', + "", + 'sh-shebang.sh', + 0o775, + '#!/bin/sh', + ["dir/sh-shebang.sh:0: This file does not need to be executable"]), + ('hint', + ", very special hint", + 'sh-shebang.sh', + 0o775, + '#!/bin/sh', + ["dir/sh-shebang.sh:0: This file does not need to be executable, very special hint"]), + ] + + + at pytest.mark.parametrize('testname,hint,filename,permissions,string,expected', NotExecutable_hint) +def test_NotExecutable_hint(testname, hint, filename, permissions, string, expected): + class NotExecutable(m.NotExecutable): + def hint(self): + return hint + warnings = check_file(NotExecutable, filename, string, permissions) + assert warnings == expected diff --git a/utils/checkpackagelib/tool.py b/utils/checkpackagelib/tool.py index f2007be1ff..e931272554 100644 --- a/utils/checkpackagelib/tool.py +++ b/utils/checkpackagelib/tool.py @@ -5,4 +5,4 @@ from checkpackagelib.base import _Tool class NotExecutable(_Tool): def run(self): if os.access(self.filename, os.X_OK): - return ["{}:0: This file does not need to be executable".format(self.filename)] + return ["{}:0: This file does not need to be executable{}".format(self.filename, self.hint())] From arnout at mind.be Sun Feb 6 15:38:52 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 6 Feb 2022 16:38:52 +0100 Subject: [Buildroot] [git commit] utils/check-package: prepare to run external tools Message-ID: <20220206172023.39B8A82BA3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1734127e5998f6874beee5430081f15cfcb33ce6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Some file formats have well-established syntax checkers. One example of this is the tool 'shellcheck' that can analyse shell scripts for common mistakes. There is no reason to reimplement such tools in check-package, when we can just call them. Add the ability to check-package to call external tools that will run once for each file to be analysed. For simplicity, when the tool generated one or more warnings, count it as a single warning from check-package, that can display something like this: |$ ./utils/check-package package/unscd/S46unscd |package/unscd/S46unscd:0: run 'shellcheck' and fix the warnings |25 lines processed |1 warnings generated |$ ./utils/check-package -vvvvvvvvvvvvvvvv package/unscd/S46unscd |package/unscd/S46unscd:0: run 'shellcheck' and fix the warnings |In package/unscd/S46unscd line 9: | printf "Starting ${NAME}: " | ^------------------^ SC2059: Don't use variables in the printf format string. Use printf "..%s.." "$foo". |In package/unscd/S46unscd line 11: | [ $? -eq 0 ] && echo "OK" || echo "FAIL" | ^-- SC2181: Check exit code directly with e.g. 'if mycmd;', not indirectly with $?. |In package/unscd/S46unscd line 14: | printf "Stopping ${NAME}: " | ^------------------^ SC2059: Don't use variables in the printf format string. Use printf "..%s.." "$foo". |In package/unscd/S46unscd line 16: | [ $? -eq 0 ] && echo "OK" || echo "FAIL" | ^-- SC2181: Check exit code directly with e.g. 'if mycmd;', not indirectly with $?. |For more information: | https://www.shellcheck.net/wiki/SC2059 -- Don't use variables in the printf... | https://www.shellcheck.net/wiki/SC2181 -- Check exit code directly with e.g... |25 lines processed |1 warnings generated In this first commit, add only the ability for check-package to call external tools and not an example of such tool, as adding each tool to call may need update to the docker image and can lead to it's own discussion on how to implement. Signed-off-by: Ricardo Martincoski Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- utils/check-package | 34 ++++++++++++++++++++++++++++------ utils/checkpackagelib/base.py | 8 ++++++++ 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/utils/check-package b/utils/check-package index a959fef079..5fb430902d 100755 --- a/utils/check-package +++ b/utils/check-package @@ -8,6 +8,7 @@ import re import six import sys +import checkpackagelib.base import checkpackagelib.lib_config import checkpackagelib.lib_hash import checkpackagelib.lib_mk @@ -87,9 +88,7 @@ def get_lib_from_filename(fname): return None -def is_a_check_function(m): - if not inspect.isclass(m): - return False +def common_inspect_rules(m): # do not call the base class if m.__name__.startswith("_"): return False @@ -100,6 +99,22 @@ def is_a_check_function(m): return True +def is_a_check_function(m): + if not inspect.isclass(m): + return False + if not issubclass(m, checkpackagelib.base._CheckFunction): + return False + return common_inspect_rules(m) + + +def is_external_tool(m): + if not inspect.isclass(m): + return False + if not issubclass(m, checkpackagelib.base._Tool): + return False + return common_inspect_rules(m) + + def print_warnings(warnings): # Avoid the need to use 'return []' at the end of every check function. if warnings is None: @@ -121,14 +136,16 @@ def check_file_using_lib(fname): if flags.verbose >= VERBOSE_LEVEL_TO_SHOW_IGNORED_FILES: print("{}: ignored".format(fname)) return nwarnings, nlines - classes = inspect.getmembers(lib, is_a_check_function) + internal_functions = inspect.getmembers(lib, is_a_check_function) + external_tools = inspect.getmembers(lib, is_external_tool) + all_checks = internal_functions + external_tools if flags.dry_run: - functions_to_run = [c[0] for c in classes] + functions_to_run = [c[0] for c in all_checks] print("{}: would run: {}".format(fname, functions_to_run)) return nwarnings, nlines - objects = [c[1](fname, flags.manual_url) for c in classes] + objects = [c[1](fname, flags.manual_url) for c in internal_functions] for cf in objects: nwarnings += print_warnings(cf.before()) @@ -148,6 +165,11 @@ def check_file_using_lib(fname): for cf in objects: nwarnings += print_warnings(cf.after()) + tools = [c[1](fname) for c in external_tools] + + for tool in tools: + nwarnings += print_warnings(tool.run()) + return nwarnings, nlines diff --git a/utils/checkpackagelib/base.py b/utils/checkpackagelib/base.py index 9544a64e5a..73da925a03 100644 --- a/utils/checkpackagelib/base.py +++ b/utils/checkpackagelib/base.py @@ -16,3 +16,11 @@ class _CheckFunction(object): def after(self): pass + + +class _Tool(object): + def __init__(self, filename): + self.filename = filename + + def run(self): + pass From arnout at mind.be Sun Feb 6 17:29:40 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 6 Feb 2022 18:29:40 +0100 Subject: [Buildroot] [PATCH 0/5] check-package for SysV init scripts (including shellcheck) In-Reply-To: <20211226184919.2753591-1-ricardo.martincoski@gmail.com> References: <20211226184919.2753591-1-ricardo.martincoski@gmail.com> Message-ID: <9d9678b5-3fb1-dc25-65f4-0edf4b27ef3c@mind.be> On 26/12/2021 19:49, Ricardo Martincoski wrote: > Hello, > > This small series (called series2 below) is built on top of [1] (called series1) > specially for its patches 1 (check-package unit tests) and 4 (script > utils/docker-run that eases to run locally commands in the docker image in order > to have stable results across machines). > > So: > series1 1/4 utils/checkpackagelib: add unit tests > series1 2/4 support/docker: add python3-pytest > series1 3/4 utils/checkpackagelib: run unit tests on GitLab CI > series1 4/4 utils/docker-run: new script > series2 1/5 utils/check-package: prepare to run external tools > series2 2/5 utils/checkpackagelib: warn about executable files > series2 3/5 utils/checkpackagelib/lib_sysv: check SysV init scripts > series2 4/5 support/docker: add shellcheck > series2 5/5 utils/checkpackagelib/lib_sysv: run shellcheck Series applied to master. > > This series is also related to [2]. > Cc: Joachim Wiberg > See an example output for patch [2]: > |$ utils/docker-run utils/check-package -vvv package/inadyn/S70inadyn > |package/inadyn/S70inadyn:24: should be indented with tabs, see package/busybox/S01syslogd > |< tab >< tab >< tab > -- $INADYN_ARGS > |package/inadyn/S70inadyn:0: This file does not need to be executable, just make sure you use '$(INSTALL) -D -m 0755' in the .mk file > |74 lines processed > |2 warnings generated > > This series is also related to [3]. > Perhaps if both series are accepted, we can add cross-reference between the doc > and the tool: > - check-package can point to a manual entry This I have done. > - the doc can mention to use check-package directly for SysV init script > - the doc can mention to use check-package inside docker image using > utils/docker-run These two I have not done. I've also made a few more changes, and I've put a new docker image to gitlab so it can be used by run-docker. With this tools thing in check-package, it would be nice if we could move flake8 in there as well. I have a post-commit hook that automatically runs check-package, but not flake8, and because of that it often happens that flake8 errors slip by (on this series as well...). Same for shellcheck, it would be nice to run it on all scripts (particularly in utils/ and support/), not just the init start script. Regards, Arnout > > What this series IS NOT: > - a complete rework of all SysV init scripts in the tree; > - an automated way to rework SysV init scripts; > - the ultimate checker for SysV init scripts that catches all possible errors; > - something to enable in GitLab CI in the short term. > > What this series IS (hopefully): > - a helper for developers willing to rework one SysV init script at a time; > - something that can be extended to check more common mistakes when reworking a > SysV init script with package/busybox/S01syslogd as base; > - a few years from now we can eventually enable the check in GitLab CI when all > SysV init script got reworked. > > In [4] one can see an example of all warnings that would be generated for all > scripts in the tree. > NOTICE that no warnings are generated for package/busybox/S01syslogd, as > expected. > At the end see some extracts from [4] with some interesting results (thanks to > shellcheck). > > NOTICE that as a consequence of using shellcheck, there will be cases that will > need shellcheck disables, just like S01syslogd already does: > | # shellcheck disable=SC2086 # we need the word splitting > > [1] http://patchwork.ozlabs.org/project/buildroot/list/?series=275236 > [2] http://patchwork.ozlabs.org/project/buildroot/patch/20211205102907.2836980-3-troglobit at gmail.com/ > [3] http://patchwork.ozlabs.org/project/buildroot/patch/20211205102010.2834942-1-troglobit at gmail.com/ > [4] https://gitlab.com/RicardoMartincoski/buildroot/-/jobs/1921130201 > > Regards, > Ricardo > > Extracts from [4] with some interesting results: > |board/intel/galileo/rootfs_overlay/etc/init.d/S09modload: ignored > | > |package/pigpio/S50pigpio:4: For PIDFILE use the same pattern found in package/busybox/S01syslogd > |PIDFILE="/var/run/pigpio.pid" > |PIDFILE="/var/run/$DAEMON.pid" > | > |package/pigpio/S50pigpio:0: filename should be S, see package/busybox/S01syslogd > |expecting Spigpiod > | > |package/motion/S99motion:5: Do not include path in DAEMON, see package/busybox/S01syslogd > |DAEMON=/usr/bin/$NAME > |DAEMON="$NAME" > | > |package/motion/S99motion:23: should be indented with tabs, see package/busybox/S01syslogd > | start) > | > |package/motion/S99motion:0: run 'shellcheck' and fix the warnings > |In package/motion/S99motion line 13: > |< tab >printf "Stopping $NAME: " > | ^----------------^ SC2059: Don't use variables in the printf format string. Use printf "..%s.." "$foo". > | > |package/mender/S42mender:0: run 'shellcheck' and fix the warnings > |In package/mender/S42mender line 13: > |< tab > -a "$(readlink /var/lib/mender)" = "/var/run/mender" ] > | ^-- SC2166: Prefer [ p ] && [ q ] as [ p -a q ] is not well defined. > |In package/mender/S42mender line 29: > |< tab >[ $? = 0 ] && echo "OK" || echo "FAIL" > | ^-- SC2181: Check exit code directly with e.g. 'if mycmd;', not indirectly with $?. > | > |package/eudev/S10udev:45: consecutive empty lines > | > |package/mrp/S65mrp:0: filename should be S, see package/busybox/S01syslogd > |expecting Smrp_server > | > |package/bluez5_utils/S40bluetooth:0: filename should be S, see package/busybox/S01syslogd > |expecting Sbluetoothd > | > |package/bluez5_utils/S40bluetooth:0: This file does not need to be executable, just make sure you use '$(INSTALL) -D -m 0755' in the .mk file > | > |package/netatalk/S50netatalk:33: empty line at end of file > | > |package/iptables/S35iptables:0: run 'shellcheck' and fix the warnings > |In package/iptables/S35iptables line 5: > |IPTABLES_ARGS="" > |^-----------^ SC2034: IPTABLES_ARGS appears unused. Verify use (or export if used externally). > | > |package/rpcbind/S30rpcbind:38: empty line at end of file > | > |In package/dhcp/S80dhcp-relay line 31: > |DHCRELAYPID=/var/run/dhcrelay.pid > |^---------^ SC2034: DHCRELAYPID appears unused. Verify use (or export if used externally). > | > |package/busybox/S10mdev:9: consecutive empty lines > | > |package/busybox/S10mdev:0: run 'shellcheck' and fix the warnings > |In package/busybox/S10mdev line 11: > |< tab >echo -n "Starting $DAEMON... " > | ^-- SC2039: In POSIX sh, echo flags are undefined. > | > |In package/targetcli-fb/S50target line 7: > |< tab >local ret > | ^-------^ SC2039: In POSIX sh, 'local' is undefined. > | > |package/oracle-mysql/S97mysqld:0: run 'shellcheck' and fix the warnings > |In package/oracle-mysql/S97mysqld line 28: > |< tab >< tab >< tab >kill `cat /run/mysql/mysqld.pid` > | ^-------------------------^ SC2046: Quote this to prevent word splitting. > | ^-------------------------^ SC2006: Use $(...) notation instead of legacy backticked `...`. > |Did you mean: > |< tab >< tab >< tab >kill $(cat /run/mysql/mysqld.pid) > | > |package/dbus/S30dbus:0: run 'shellcheck' and fix the warnings > |In package/dbus/S30dbus line 58: > | if [ -f /var/lock/subsys/$servicename ]; then > | ^----------^ SC2154: servicename is referenced but not assigned. > | ^----------^ SC2086: Double quote to prevent globbing and word splitting. > |Did you mean: > | if [ -f /var/lock/subsys/"$servicename" ]; then > | > |package/smcroute/S41smcroute:0: This file does not need to be executable, just make sure you use '$(INSTALL) -D -m 0755' in the .mk file > |package/c-icap/S96cicap:0: run 'shellcheck' and fix the warnings > |In package/c-icap/S96cicap line 12: > |< tab >[ $? == 0 ] && echo "OK" || echo "FAIL" > | ^-- SC2181: Check exit code directly with e.g. 'if mycmd;', not indirectly with $?. > | ^-- SC2039: In POSIX sh, == in place of = is undefined. > | > |package/polkit/S50polkit:0: This file does not need to be executable, just make sure you use '$(INSTALL) -D -m 0755' in the .mk file > | > |package/polkit/S50polkit:0: run 'shellcheck' and fix the warnings > |In package/polkit/S50polkit line 43: > |< tab >start|stop|restart|reload) > | ^----^ SC2221: This pattern always overrides a later one on line 45. > |In package/polkit/S50polkit line 45: > |< tab >reload) > | ^----^ SC2222: This pattern never matches because of a previous pattern on line 43. > | > |package/restorecond/S02restorecond:0: run 'shellcheck' and fix the warnings > |In package/restorecond/S02restorecond line 52: > |< tab >< tab >echo $"Usage: $0 {start|stop|restart|reload}" > | ^-- SC2039: In POSIX sh, $".." is undefined. > | > |package/earlyoom/S02earlyoom:0: run 'shellcheck' and fix the warnings > |In package/earlyoom/S02earlyoom line 10: > |start() { > | ^-- SC1009: The mentioned syntax error was in this brace group. > |In package/earlyoom/S02earlyoom line 11: > |< tab >printf() 'Starting %s: ' "$DAEMON" > | ^-- SC1073: Couldn't parse this function. Fix to allow more checks. > | ^-- SC1064: Expected a { to open the function definition. > | ^-- SC1072: Fix any mentioned problems and try again. > | > |package/watchdogd/S01watchdogd:0: This file does not need to be executable, just make sure you use '$(INSTALL) -D -m 0755' in the .mk file > | > |package/brltty/S10brltty:0: run 'shellcheck' and fix the warnings > |In package/brltty/S10brltty line 17: > |restart() { > |^-- SC2120: restart references arguments, but none are ever passed. > | > |package/audit/S02auditd:0: run 'shellcheck' and fix the warnings > |In package/audit/S02auditd line 13: > |CONFIG=/etc/audit/auditd.conf > |^----^ SC2034: CONFIG appears unused. Verify use (or export if used externally). > | > |package/network-manager/S45network-manager:40: consecutive empty lines > |package/network-manager/S45network-manager:41: consecutive empty lines > |package/network-manager/S45network-manager:41: empty line at end of file > | > |package/tftpd/S80tftpd-hpa:0: run 'shellcheck' and fix the warnings > |In package/tftpd/S80tftpd-hpa line 11: > |PIDFILE=/var/run/$NAME.pid > |^-----^ SC2034: PIDFILE appears unused. Verify use (or export if used externally). > | > |package/owfs/S60owfs:0: run 'shellcheck' and fix the warnings > |In package/owfs/S60owfs line 1: > |NAME="owfs" > |^-- SC2148: Tips depend on target shell and yours is unknown. Add a shebang. > | > |package/owfs/S55owserver:0: run 'shellcheck' and fix the warnings > |In package/owfs/S55owserver line 1: > |NAME="owserver" > |^-- SC2148: Tips depend on target shell and yours is unknown. Add a shebang. > | > |package/transmission/S92transmission:0: run 'shellcheck' and fix the warnings > |In package/transmission/S92transmission line 50: > |DAEMON=$(which $NAME) > | ^---^ SC2230: which is non-standard. Use builtin 'command -v' instead. > > Ricardo Martincoski (5): > utils/check-package: prepare to run external tools > utils/checkpackagelib: warn about executable files > utils/checkpackagelib/lib_sysv: check SysV init scripts > support/docker: add shellcheck > utils/checkpackagelib/lib_sysv: run shellcheck > > support/docker/Dockerfile | 1 + > utils/check-package | 39 ++++++-- > utils/checkpackagelib/base.py | 11 +++ > utils/checkpackagelib/lib_config.py | 1 + > utils/checkpackagelib/lib_hash.py | 1 + > utils/checkpackagelib/lib_mk.py | 1 + > utils/checkpackagelib/lib_patch.py | 1 + > utils/checkpackagelib/lib_sysv.py | 67 +++++++++++++ > utils/checkpackagelib/test_lib_sysv.py | 131 +++++++++++++++++++++++++ > utils/checkpackagelib/test_tool.py | 112 +++++++++++++++++++++ > utils/checkpackagelib/tool.py | 23 +++++ > 11 files changed, 382 insertions(+), 6 deletions(-) > create mode 100644 utils/checkpackagelib/lib_sysv.py > create mode 100644 utils/checkpackagelib/test_lib_sysv.py > create mode 100644 utils/checkpackagelib/test_tool.py > create mode 100644 utils/checkpackagelib/tool.py > From arnout at mind.be Sun Feb 6 18:31:44 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 6 Feb 2022 19:31:44 +0100 Subject: [Buildroot] [git commit] utils/checkpackagelib/test_tool.py: fix expectation Message-ID: <20220206184009.9156C82BDA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b42e87772a995b19913822b810f876a5890d2369 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master While committing the shellcheck feature, it was changed to output the full shellcheck output even at verbosity level 1. However, the expectation of the shellcheck test was not updated accordingly. Do that now, simply merging all the shellcheck output in a single string. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- utils/checkpackagelib/test_tool.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/utils/checkpackagelib/test_tool.py b/utils/checkpackagelib/test_tool.py index 38029297a5..a0bf88001d 100644 --- a/utils/checkpackagelib/test_tool.py +++ b/utils/checkpackagelib/test_tool.py @@ -71,9 +71,9 @@ Shellcheck = [ 'empty.sh', '', ["dir/empty.sh:0: run 'shellcheck' and fix the warnings", - "In dir/empty.sh line 1:", - "^-- SC2148: Tips depend on target shell and yours is unknown. Add a shebang or a 'shell' directive.", - "For more information:", + "In dir/empty.sh line 1:\n" + "^-- SC2148: Tips depend on target shell and yours is unknown. Add a shebang or a 'shell' directive.\n" + "For more information:\n" " https://www.shellcheck.net/wiki/SC2148 -- Tips depend on target shell and y..."]), ('sh shebang', 'sh-shebang.sh', @@ -87,21 +87,21 @@ Shellcheck = [ 'unused.sh', 'unused=""', ["dir/unused.sh:0: run 'shellcheck' and fix the warnings", - "In dir/unused.sh line 1:", - 'unused=""', - "^-- SC2148: Tips depend on target shell and yours is unknown. Add a shebang or a 'shell' directive.", - "^----^ SC2034: unused appears unused. Verify use (or export if used externally).", - "For more information:", - " https://www.shellcheck.net/wiki/SC2148 -- Tips depend on target shell and y...", + "In dir/unused.sh line 1:\n" + 'unused=""\n' + "^-- SC2148: Tips depend on target shell and yours is unknown. Add a shebang or a 'shell' directive.\n" + "^----^ SC2034: unused appears unused. Verify use (or export if used externally).\n" + "For more information:\n" + " https://www.shellcheck.net/wiki/SC2148 -- Tips depend on target shell and y...\n" " https://www.shellcheck.net/wiki/SC2034 -- unused appears unused. Verify use..."]), ('tab', 'tab.sh', '\t#!/bin/sh', ["dir/tab.sh:0: run 'shellcheck' and fix the warnings", - "In dir/tab.sh line 1:", - '\t#!/bin/sh', - "^-- SC1114: Remove leading spaces before the shebang.", - "For more information:", + "In dir/tab.sh line 1:\n" + '\t#!/bin/sh\n' + "^-- SC1114: Remove leading spaces before the shebang.\n" + "For more information:\n" " https://www.shellcheck.net/wiki/SC1114 -- Remove leading spaces before the ..."]), ] From baruch at tkos.co.il Sun Feb 6 18:43:21 2022 From: baruch at tkos.co.il (Baruch Siach) Date: Sun, 06 Feb 2022 20:43:21 +0200 Subject: [Buildroot] [BUG] boot/arm-trusted-firmware: Stack protection setting doesn't work In-Reply-To: <20220206020711.3dc6e42e@ux550ve> References: <20220206020711.3dc6e42e@ux550ve> Message-ID: <87mtj3de6j.fsf@tarshish> Hi Daniil Stas, On Sun, Feb 06 2022, Daniil Stas wrote: > The bug was introduced in commit ccac9a5bbb > ("boot/arm-trusted-firmware: don't force ENABLE_STACK_PROTECTOR"). > > In this commit the ENABLE_STACK_PROTECTOR option was moved from make > arguments to the environment. But this value gets overwritten in > make_helpers/defaults.mk (and platform specific makefiles) before it > gets handled in the lib/stack_protector/stack_protector.mk. > So setting it via environment doesn't work. > > You can check it, for example, if you compile TF-A for stm32mp157a_dk1 > platform, and then check if bl32/stack_protector.o file is > built. > It gets built only with commit ccac9a5bbb being reverted. What happens when you build with a toolchain that has no SSP support with the commit you mentioned reverted? I believe you will get a build error similar to this one: aarch64-buildroot-linux-uclibc-gcc.br_real: error: unrecognized command-line option ?-fstack-protector-0?; did you mean ?-fstack-protector?? aarch64-buildroot-linux-uclibc-gcc.br_real: error: unrecognized command-line option ?-fstack-protector-0?; did you mean ?-fstack-protector?? Makefile:1075: recipe for target '/builds/buildroot.org/buildroot/output/build/arm-trusted-firmware-v2.4/build/a80x0_mcbin/release/libc/assert.o' failed make[1]: *** [/builds/buildroot.org/buildroot/output/build/arm-trusted-firmware-v2.4/build/a80x0_mcbin/release/libc/assert.o] Error 1 Copied from https://gitlab.com/buildroot.org/buildroot/-/jobs/1497663294. Do you have a better suggestion? baruch -- ~. .~ Tk Open Systems =}------------------------------------------------ooO--U--Ooo------------{= - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il - From fontaine.fabrice at gmail.com Sun Feb 6 19:08:09 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 6 Feb 2022 20:08:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/protozero: bump to version 1.7.1 In-Reply-To: <1644174029.436223773@f387.i.mail.ru> References: <20220206145740.1765660-1-fontaine.fabrice@gmail.com> <1644174029.436223773@f387.i.mail.ru> Message-ID: Hi, Le dim. 6 f?vr. 2022 ? 20:00, ???????? ?????? a ?crit : > > I just sent the same patch this week. Thanks, I missed it, I set this one as superseded. > > -- > ?????????? ?? Mail.ru ??? Android > > ???????????, 06 ??????? 2022?., 17:59 +03:00 ?? Fabrice Fontaine fontaine.fabrice at gmail.com: > > Drop patch (already in version) > > https://github.com/mapbox/protozero/releases/tag/v1.7.1 > > Signed-off-by: Fabrice Fontaine > --- > ...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.34.1 Best Regards, Fabrice From fido_max at inbox.ru Sun Feb 6 19:00:29 2022 From: fido_max at inbox.ru (=?UTF-8?B?0JrQvtGH0LXRgtC60L7QsiDQnNCw0LrRgdC40Lw=?=) Date: Sun, 06 Feb 2022 22:00:29 +0300 Subject: [Buildroot] =?utf-8?q?=5BPATCH_1/1=5D_package/protozero=3A_bump_?= =?utf-8?q?to_version_1=2E7=2E1?= In-Reply-To: <20220206145740.1765660-1-fontaine.fabrice@gmail.com> References: <20220206145740.1765660-1-fontaine.fabrice@gmail.com> Message-ID: <1644174029.436223773@f387.i.mail.ru> I just sent the same patch this week. -- ?????????? ?? Mail.ru ??? Android ???????????, 06 ??????? 2022?., 17:59 +03:00 ?? Fabrice Fontaine fontaine.fabrice at gmail.com : >Drop patch (already in version) > >https://github.com/mapbox/protozero/releases/tag/v1.7.1 > >Signed-off-by: Fabrice Fontaine < fontaine.fabrice at gmail.com> >--- >?...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 < fontaine.fabrice at gmail.com> >-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 < fontaine.fabrice at gmail.com> >-[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.34.1 -------------- next part -------------- An HTML attachment was scrubbed... URL: From arnout at mind.be Sun Feb 6 19:16:07 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 6 Feb 2022 20:16:07 +0100 Subject: [Buildroot] [git commit] package/ace: new package Message-ID: <20220206191014.9865682BCC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3621918d1bc1ddc9312dd1cc8dec6db61e712fe2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master ACE is an open-source framework that provides many components and patterns for developing high-performance, distributed real-time and embedded systems. It provides powerful, yet efficient abstractions for sockets, demultiplexing loops, threads, synchronization primitives. Signed-off-by: Matt Weber Signed-off-by: Kalpesh Panchal Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 1 + package/Config.in | 1 + package/ace/Config.in | 12 ++++++++ package/ace/ace.hash | 3 ++ package/ace/ace.mk | 61 +++++++++++++++++++++++++++++++++++++++++ package/ace/platform_macros.GNU | 14 ++++++++++ 6 files changed, 92 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index c52cb35b60..1d1cf99898 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1868,6 +1868,7 @@ F: board/qemu/ppc64-e5500/ F: configs/freescale_p* F: configs/freescale_t* F: configs/qemu_ppc64_e5500_defconfig +F: package/ace/ F: package/argp-standalone/ F: package/aufs/ F: package/aufs-util/ diff --git a/package/Config.in b/package/Config.in index e4ca195beb..43ce9013c6 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1924,6 +1924,7 @@ menu "Networking" endmenu menu "Other" + source "package/ace/Config.in" source "package/apr/Config.in" source "package/apr-util/Config.in" source "package/argp-standalone/Config.in" diff --git a/package/ace/Config.in b/package/ace/Config.in new file mode 100644 index 0000000000..226e34df32 --- /dev/null +++ b/package/ace/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_ACE + bool "ace" + depends on BR2_TOOLCHAIN_USES_GLIBC + depends on !BR2_STATIC_LIBS + help + The ADAPTIVE Communication Environment (ACE(TM)) + An OO Network Programming Toolkit in C++. + + http://www.dre.vanderbilt.edu/~schmidt/ACE.html + +comment "ACE needs a glibc toolchain, dynamic library" + depends on !BR2_TOOLCHAIN_USES_GLIBC || BR2_STATIC_LIBS diff --git a/package/ace/ace.hash b/package/ace/ace.hash new file mode 100644 index 0000000000..92fd42e131 --- /dev/null +++ b/package/ace/ace.hash @@ -0,0 +1,3 @@ +# Locally Computed: +sha256 a28339750620c70cd29a8a7088a4bc6ebaf1ff7ba667498a0279ac97f0e32e01 ACE-7.0.1.tar.gz +sha256 687bf9d16119e0caf6fb5c18214928fd6ea0da10df91e906255b7613af8061d8 COPYING diff --git a/package/ace/ace.mk b/package/ace/ace.mk new file mode 100644 index 0000000000..b6b4cfbc24 --- /dev/null +++ b/package/ace/ace.mk @@ -0,0 +1,61 @@ +################################################################################ +# +# ace +# +################################################################################ + +ACE_VERSION = 7.0.1 +ACE_SOURCE = ACE-$(ACE_VERSION).tar.gz +ACE_SITE = http://download.dre.vanderbilt.edu/previous_versions +ACE_LICENSE = DOC +ACE_LICENSE_FILES = COPYING +ACE_INSTALL_STAGING = YES +ACE_CPE_ID_VENDOR = vanderbilt +ACE_CPE_ID_PRODUCT = adaptive_communication_environment + +# Note: We are excluding examples, apps and tests +# Only compiling ACE libraries (no TAO) +ACE_LIBARIES = ace ACEXML Kokyu netsvcs protocols/ace + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +ACE_LIBARIES += ace/SSL +ACE_DEPENDENCIES += openssl +define ACE_CONFIGURE_SSL + echo "ssl = 1" >> $(@D)/include/makeinclude/platform_macros.GNU +endef +endif + +# configure the target build +# refer: http://www.dre.vanderbilt.edu/~schmidt/DOC_ROOT/ACE/ACE-INSTALL.html#unix +define ACE_CONFIGURE_CMDS + # create a config file + echo ' #include "ace/config-linux.h" ' >> $(@D)/ace/config.h + + # Create platform/compiler-specific Makefile configurations + $(INSTALL) -m 0644 package/ace/platform_macros.GNU $(@D)/include/makeinclude/ + + $(ACE_CONFIGURE_SSL) +endef + +define ACE_BUILD_CMDS + $(foreach lib,$(ACE_LIBARIES), \ + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/$(lib) ACE_ROOT="$(@D)" all + ) +endef + +define ACE_LIBARIES_INSTALL + mkdir -p $(1)/usr/share/ace + $(foreach lib,$(ACE_LIBARIES), \ + $(MAKE) -C $(@D)/$(lib) ACE_ROOT="$(@D)" DESTDIR=$(1) install + ) +endef + +define ACE_INSTALL_TARGET_CMDS + $(call ACE_LIBARIES_INSTALL,$(TARGET_DIR)) +endef + +define ACE_INSTALL_STAGING_CMDS + $(call ACE_LIBARIES_INSTALL,$(STAGING_DIR)) +endef + +$(eval $(generic-package)) diff --git a/package/ace/platform_macros.GNU b/package/ace/platform_macros.GNU new file mode 100644 index 0000000000..ab5ec25a1b --- /dev/null +++ b/package/ace/platform_macros.GNU @@ -0,0 +1,14 @@ +# help: http://www.dre.vanderbilt.edu/~schmidt/DOC_ROOT/ACE/ACE-INSTALL.html#unix + +# create a platform macros file +include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU + +# disable RPATH +install_rpath = 0 + +# set the installation prefix +INSTALL_PREFIX = /usr + +# fix link error with ARM EABI tools +# http://list.isis.vanderbilt.edu/pipermail/ace-users/2008-January/002742.html +no_hidden_visibility = 1 From arnout at mind.be Sun Feb 6 19:17:37 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 6 Feb 2022 20:17:37 +0100 Subject: [Buildroot] [PATCH v2] package/ace: new package In-Reply-To: <20210413134139.13281-1-matthew.weber@rockwellcollins.com> References: <20210413134139.13281-1-matthew.weber@rockwellcollins.com> Message-ID: On 13/04/2021 15:41, Matt Weber wrote: > ACE is an open-source framework that provides many components and > patterns for developing high-performance, distributed real-time > and embedded systems. It provides powerful, yet efficient abstractions > for sockets, demultiplexing loops, threads, synchronization primitives. > > Signed-off-by: Matt Weber > Signed-off-by: Kalpesh Panchal I made a few more small modification/simplifications, and applied ot master, thanks. Regards, Arnout > --- > Changes > v1 -> v2: > [Thomas P > - Added platform specific Makefile config file > - Made Config.in dependency style updates > - Made OpenSSL optional > - Used foreach loop in makefile > - Used common install command for target and staging > --- > DEVELOPERS | 1 + > package/Config.in | 1 + > package/ace/Config.in | 12 +++++++ > package/ace/ace.hash | 3 ++ > package/ace/ace.mk | 63 +++++++++++++++++++++++++++++++++ > package/ace/platform_macros.GNU | 14 ++++++++ > 6 files changed, 94 insertions(+) > create mode 100644 package/ace/Config.in > create mode 100644 package/ace/ace.hash > create mode 100644 package/ace/ace.mk > create mode 100644 package/ace/platform_macros.GNU > > diff --git a/DEVELOPERS b/DEVELOPERS > index 626bb393dd..6dac446c68 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1699,6 +1699,7 @@ F: board/qemu/ppc64-e5500/ > F: configs/freescale_p* > F: configs/freescale_t* > F: configs/qemu_ppc64_e5500_defconfig > +F: package/ace/ > F: package/argp-standalone/ > F: package/aufs/ > F: package/aufs-util/ > diff --git a/package/Config.in b/package/Config.in > index 01e6bc0bfa..9f9b22d6d4 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1844,6 +1844,7 @@ menu "Networking" > endmenu > > menu "Other" > + source "package/ace/Config.in" > source "package/appstream-glib/Config.in" > source "package/apr/Config.in" > source "package/apr-util/Config.in" > diff --git a/package/ace/Config.in b/package/ace/Config.in > new file mode 100644 > index 0000000000..226e34df32 > --- /dev/null > +++ b/package/ace/Config.in > @@ -0,0 +1,12 @@ > +config BR2_PACKAGE_ACE > + bool "ace" > + depends on BR2_TOOLCHAIN_USES_GLIBC > + depends on !BR2_STATIC_LIBS > + help > + The ADAPTIVE Communication Environment (ACE(TM)) > + An OO Network Programming Toolkit in C++. > + > + http://www.dre.vanderbilt.edu/~schmidt/ACE.html > + > +comment "ACE needs a glibc toolchain, dynamic library" > + depends on !BR2_TOOLCHAIN_USES_GLIBC || BR2_STATIC_LIBS > diff --git a/package/ace/ace.hash b/package/ace/ace.hash > new file mode 100644 > index 0000000000..92fd42e131 > --- /dev/null > +++ b/package/ace/ace.hash > @@ -0,0 +1,3 @@ > +# Locally Computed: > +sha256 a28339750620c70cd29a8a7088a4bc6ebaf1ff7ba667498a0279ac97f0e32e01 ACE-7.0.1.tar.gz > +sha256 687bf9d16119e0caf6fb5c18214928fd6ea0da10df91e906255b7613af8061d8 COPYING > diff --git a/package/ace/ace.mk b/package/ace/ace.mk > new file mode 100644 > index 0000000000..539e0cc6c4 > --- /dev/null > +++ b/package/ace/ace.mk > @@ -0,0 +1,63 @@ > +################################################################################ > +# > +# ace > +# > +################################################################################ > + > +ACE_VERSION = 7.0.1 > +ACE_SOURCE = ACE-$(ACE_VERSION).tar.gz > +ACE_SITE = http://download.dre.vanderbilt.edu/previous_versions > +ACE_LICENSE = DOC > +ACE_LICENSE_FILES = COPYING > +ACE_INSTALL_STAGING = YES > +ACE_CPE_ID_VENDOR = vanderbilt > +ACE_CPE_ID_PRODUCT = adaptive_communication_environment > + > +# Note: We are excluding examples, apps and tests > +# Only compiling ACE libraries (no TAO) > +ACE_LIBARIES = ace ACEXML Kokyu netsvcs protocols/ace > + > +ifeq ($(BR2_PACKAGE_OPENSSL),y) > +ACE_LIBARIES += ace/SSL > +ACE_DEPENDENCIES = openssl > +ACE_SSL = "ssl = 1" > +endif > + > +# configure the target build > +# refer: http://www.dre.vanderbilt.edu/~schmidt/DOC_ROOT/ACE/ACE-INSTALL.html#unix > +define ACE_CONFIGURE_CMDS > + # create a config file > + echo ' #include "ace/config-linux.h" ' >> $(@D)/ace/config.h > + > + # Create platform/compiler-specific Makefile configurations > + $(INSTALL) -m 0644 package/ace/platform_macros.GNU $(@D)/include/makeinclude/ > + # Enable ssl if OpenSSL is configured > + [ ! -z $(ACE_SSL) ] && \ > + echo $(ACE_SSL) >> $(@D)/include/makeinclude/platform_macros.GNU || \ > + echo 'ace/SSL skipped' > +endef > + > +# compile ace,ACEXML, Kokyu, netsvcs & protocols/ace > +define ACE_BUILD_CMDS > + $(foreach lib,$(ACE_LIBARIES), \ > + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/$(lib) ACE_ROOT="$(@D)" all > + ) > +endef > + > +define ACE_LIBARIES_INSTALL > + # create below folder required by ACE makefiles during install > + mkdir -p $(1)/usr/share/ace > + $(foreach lib,$(ACE_LIBARIES), \ > + $(MAKE) -C $(@D)/$(lib) ACE_ROOT="$(@D)" DESTDIR=$(1) install > + ) > +endef > + > +define ACE_INSTALL_TARGET_CMDS > + $(call ACE_LIBARIES_INSTALL,$(TARGET_DIR)) > +endef > + > +define ACE_INSTALL_STAGING_CMDS > + $(call ACE_LIBARIES_INSTALL,$(STAGING_DIR)) > +endef > + > +$(eval $(generic-package)) > diff --git a/package/ace/platform_macros.GNU b/package/ace/platform_macros.GNU > new file mode 100644 > index 0000000000..ab5ec25a1b > --- /dev/null > +++ b/package/ace/platform_macros.GNU > @@ -0,0 +1,14 @@ > +# help: http://www.dre.vanderbilt.edu/~schmidt/DOC_ROOT/ACE/ACE-INSTALL.html#unix > + > +# create a platform macros file > +include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU > + > +# disable RPATH > +install_rpath = 0 > + > +# set the installation prefix > +INSTALL_PREFIX = /usr > + > +# fix link error with ARM EABI tools > +# http://list.isis.vanderbilt.edu/pipermail/ace-users/2008-January/002742.html > +no_hidden_visibility = 1 From arnout at mind.be Sun Feb 6 19:23:24 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 6 Feb 2022 20:23:24 +0100 Subject: [Buildroot] [PATCH] package/lua-cffi: new package In-Reply-To: <20210321154903.1950636-1-francois.perrad@gadz.org> References: <20210321154903.1950636-1-francois.perrad@gadz.org> Message-ID: <0a0771a9-43f2-0f10-5706-5beddf124a06@mind.be> On 21/03/2021 16:49, Francois Perrad wrote: > Signed-off-by: Francois Perrad > --- > package/Config.in | 1 + > package/lua-cffi/Config.in | 18 ++++++++++++++++++ > package/lua-cffi/lua-cffi.hash | 3 +++ > package/lua-cffi/lua-cffi.mk | 14 ++++++++++++++ > support/testing/tests/package/test_lua_cffi.py | 14 ++++++++++++++ > 5 files changed, 50 insertions(+) > create mode 100644 package/lua-cffi/Config.in > create mode 100644 package/lua-cffi/lua-cffi.hash > create mode 100644 package/lua-cffi/lua-cffi.mk > create mode 100644 support/testing/tests/package/test_lua_cffi.py > > diff --git a/package/Config.in b/package/Config.in > index 8fb173540..5b854f898 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -652,6 +652,7 @@ menu "Lua libraries/modules" > source "package/lua-basexx/Config.in" > source "package/lua-binaryheap/Config.in" > source "package/lua-bit32/Config.in" > + source "package/lua-cffi/Config.in" > source "package/lua-cjson/Config.in" > source "package/lua-coat/Config.in" > source "package/lua-coatpersistent/Config.in" > diff --git a/package/lua-cffi/Config.in b/package/lua-cffi/Config.in > new file mode 100644 > index 000000000..fcf3d25e2 > --- /dev/null > +++ b/package/lua-cffi/Config.in > @@ -0,0 +1,18 @@ > +config BR2_PACKAGE_LUA_CFFI > + bool "lua-cffi" > + depends on !BR2_PACKAGE_LUAJIT > + depends on BR2_TOOLCHAIN_HAS_THREADS # libffi > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 > + depends on BR2_INSTALL_LIBSTDCPP > + select BR2_PACKAGE_LIBFFI > + help > + This is a portable C FFI for Lua, based on libffi and aiming > + to be mostly compatible with LuaJIT FFI, but written from > + scratch. > + > + https://github.com/q66/cffi-lua > + > +comment "lua-cffi needs a toolchain w/ C++, gcc >= 4.8, threads" > + depends on !BR2_INSTALL_LIBSTDCPP || \ You should have copied the dependency on !luajit here, otherwise the comment appears when it can't be selected anyway. Applied to master with that fixed, thanks. Regards, Arnout > + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ > + !BR2_TOOLCHAIN_HAS_THREADS > diff --git a/package/lua-cffi/lua-cffi.hash b/package/lua-cffi/lua-cffi.hash > new file mode 100644 > index 000000000..a532c6c7b > --- /dev/null > +++ b/package/lua-cffi/lua-cffi.hash > @@ -0,0 +1,3 @@ > +# Locally computed > +sha256 c30080d6309167f86d1a96d3ee33f33ef52e884052b7feac140b8c52db10ad7a lua-cffi-0.2.1.tar.gz > +sha256 f5653a4d5864a3920ea1e07dacfd646067314be647598f0acaaf685beaa2e396 COPYING.md > diff --git a/package/lua-cffi/lua-cffi.mk b/package/lua-cffi/lua-cffi.mk > new file mode 100644 > index 000000000..07d84ad5f > --- /dev/null > +++ b/package/lua-cffi/lua-cffi.mk > @@ -0,0 +1,14 @@ > +################################################################################ > +# > +# lua-cffi > +# > +################################################################################ > + > +LUA_CFFI_VERSION=0.2.1 > +LUA_CFFI_SITE = $(call github,q66,cffi-lua,v$(LUA_CFFI_VERSION)) > +LUA_CFFI_LICENSE = MIT > +LUA_CFFI_LICENSE_FILES = COPYING.md > + > +LUA_CFFI_DEPENDENCIES = libffi lua > + > +$(eval $(meson-package)) > diff --git a/support/testing/tests/package/test_lua_cffi.py b/support/testing/tests/package/test_lua_cffi.py > new file mode 100644 > index 000000000..7f56eef56 > --- /dev/null > +++ b/support/testing/tests/package/test_lua_cffi.py > @@ -0,0 +1,14 @@ > +from tests.package.test_lua import TestLuaBase > + > + > +class TestLuaLuaCffi(TestLuaBase): > + config = TestLuaBase.config + \ > + """ > + BR2_PACKAGE_LUA=y > + BR2_PACKAGE_LUA_CFFI=y > + """ > + > + def test_run(self): > + self.login() > + self.module_test("cffi") > + From arnout at mind.be Sun Feb 6 19:22:12 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 6 Feb 2022 20:22:12 +0100 Subject: [Buildroot] [git commit] package/lua-cffi: new package Message-ID: <20220206191613.46D5682BD5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=13114d0f9352531e5d7ebed45cd3f679407c61d9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/Config.in | 1 + package/lua-cffi/Config.in | 19 +++++++++++++++++++ package/lua-cffi/lua-cffi.hash | 3 +++ package/lua-cffi/lua-cffi.mk | 14 ++++++++++++++ support/testing/tests/package/test_lua_cffi.py | 14 ++++++++++++++ 5 files changed, 51 insertions(+) diff --git a/package/Config.in b/package/Config.in index 43ce9013c6..d631ed784a 100644 --- a/package/Config.in +++ b/package/Config.in @@ -677,6 +677,7 @@ menu "Lua libraries/modules" source "package/lua-basexx/Config.in" source "package/lua-binaryheap/Config.in" source "package/lua-bit32/Config.in" + source "package/lua-cffi/Config.in" source "package/lua-cjson/Config.in" source "package/lua-coat/Config.in" source "package/lua-coatpersistent/Config.in" diff --git a/package/lua-cffi/Config.in b/package/lua-cffi/Config.in new file mode 100644 index 0000000000..64a36e1de4 --- /dev/null +++ b/package/lua-cffi/Config.in @@ -0,0 +1,19 @@ +config BR2_PACKAGE_LUA_CFFI + bool "lua-cffi" + depends on !BR2_PACKAGE_LUAJIT + depends on BR2_TOOLCHAIN_HAS_THREADS # libffi + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on BR2_INSTALL_LIBSTDCPP + select BR2_PACKAGE_LIBFFI + help + This is a portable C FFI for Lua, based on libffi and aiming + to be mostly compatible with LuaJIT FFI, but written from + scratch. + + https://github.com/q66/cffi-lua + +comment "lua-cffi needs a toolchain w/ C++, gcc >= 4.8, threads" + depends on !BR2_PACKAGE_LUAJIT + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ + !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/lua-cffi/lua-cffi.hash b/package/lua-cffi/lua-cffi.hash new file mode 100644 index 0000000000..a532c6c7b3 --- /dev/null +++ b/package/lua-cffi/lua-cffi.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 c30080d6309167f86d1a96d3ee33f33ef52e884052b7feac140b8c52db10ad7a lua-cffi-0.2.1.tar.gz +sha256 f5653a4d5864a3920ea1e07dacfd646067314be647598f0acaaf685beaa2e396 COPYING.md diff --git a/package/lua-cffi/lua-cffi.mk b/package/lua-cffi/lua-cffi.mk new file mode 100644 index 0000000000..07d84ad5fa --- /dev/null +++ b/package/lua-cffi/lua-cffi.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# lua-cffi +# +################################################################################ + +LUA_CFFI_VERSION=0.2.1 +LUA_CFFI_SITE = $(call github,q66,cffi-lua,v$(LUA_CFFI_VERSION)) +LUA_CFFI_LICENSE = MIT +LUA_CFFI_LICENSE_FILES = COPYING.md + +LUA_CFFI_DEPENDENCIES = libffi lua + +$(eval $(meson-package)) diff --git a/support/testing/tests/package/test_lua_cffi.py b/support/testing/tests/package/test_lua_cffi.py new file mode 100644 index 0000000000..7f56eef566 --- /dev/null +++ b/support/testing/tests/package/test_lua_cffi.py @@ -0,0 +1,14 @@ +from tests.package.test_lua import TestLuaBase + + +class TestLuaLuaCffi(TestLuaBase): + config = TestLuaBase.config + \ + """ + BR2_PACKAGE_LUA=y + BR2_PACKAGE_LUA_CFFI=y + """ + + def test_run(self): + self.login() + self.module_test("cffi") + From arnout at mind.be Sun Feb 6 19:29:53 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 6 Feb 2022 20:29:53 +0100 Subject: [Buildroot] [git commit] package/grpc: restrict host-grpc to the absolute minimum Message-ID: <20220206192321.0410782BD9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8251d8c2559b25f11684776fc343059cf100657d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 [Arnout: propagate removed dependency to collectd] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/collectd/Config.in | 1 - package/grpc/0004-host-grpc-only-cpp-plugin.patch | 223 ++++++++++++++++++++++ package/grpc/Config.in | 6 +- package/grpc/grpc.mk | 27 ++- 4 files changed, 244 insertions(+), 13 deletions(-) diff --git a/package/collectd/Config.in b/package/collectd/Config.in index 697dc51f7e..67413ffde0 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -680,7 +680,6 @@ config BR2_PACKAGE_COLLECTD_GRPC depends on BR2_INSTALL_LIBSTDCPP # grpc -> protobuf depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # grpc -> protobuf depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # grpc -> libabseil-cpp - depends on BR2_HOST_GCC_AT_LEAST_4_9 # grpc -> host-libabseil-cpp depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS # grpc select BR2_PACKAGE_GRPC help 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 2e8bc5049f..5d8201f12f 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 Sun Feb 6 19:31:29 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 6 Feb 2022 20:31:29 +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: 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? :-) As promised: applied to master, thanks. 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 Eugen.Hristev at microchip.com Sun Feb 6 19:39:48 2022 From: Eugen.Hristev at microchip.com (Eugen.Hristev at microchip.com) Date: Sun, 6 Feb 2022 19:39:48 +0000 Subject: [Buildroot] [PATCH v3 1/2] configs/microchip_sama7g5ek_mmc_defconfig: set custom linux version to 5.15.21 and add host openssl for linux In-Reply-To: References: <20220206115156.6042cc1b@windsurf> <20220206112620.1637342-1-giulio.benetti@benettiengineering.com> <20220206112620.1637342-2-giulio.benetti@benettiengineering.com> <20220206131656.16e2c8a6@windsurf> Message-ID: <0f8fcb54-806c-fb0b-27ea-38eb938a725f@microchip.com> On 2/6/22 4:25 PM, Giulio Benetti wrote: > Hi Thomas, > > On 06/02/22 13:16, Thomas Petazzoni wrote: >> On Sun,? 6 Feb 2022 12:26:19 +0100 >> Giulio Benetti wrote: >> >>> Fixes: >>> https://gitlab.com/ymorin/buildroot/-/jobs/2035821098 >>> >>> Signed-off-by: Giulio Benetti >> >> Did you actually test on HW that 5.15.21 was working? > > Unfortunately I don't have board, so no. > >> Shouldn't this be >> done by the original submitter of the defconfig. >> >> Eugen, Ludovic? I can test it. Do you have a built already done with it on top that I could download ? (would certainly speed things up) I do not really understand why we need to have a fixed kernel version. This board works with latest LTS starting from 5.15. Can't buildroot just select that ? And why just adding the missing dependency does not fix things. (I remember buildroot had something like kernel latest version to pick up ). Eugen > > It would be great to have it tested. Both, this and the > microchip_sama7g5ek_mmc_dev_defconfig too. > > Best regards > -- > Giulio Benetti > Benetti Engineering sas From giulio.benetti at benettiengineering.com Sun Feb 6 19:51:17 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 20:51:17 +0100 Subject: [Buildroot] [PATCH v3 1/2] configs/microchip_sama7g5ek_mmc_defconfig: set custom linux version to 5.15.21 and add host openssl for linux In-Reply-To: <0f8fcb54-806c-fb0b-27ea-38eb938a725f@microchip.com> References: <20220206115156.6042cc1b@windsurf> <20220206112620.1637342-1-giulio.benetti@benettiengineering.com> <20220206112620.1637342-2-giulio.benetti@benettiengineering.com> <20220206131656.16e2c8a6@windsurf> <0f8fcb54-806c-fb0b-27ea-38eb938a725f@microchip.com> Message-ID: <888aa13f-277c-f4a0-2447-79d58145816d@benettiengineering.com> Hi Eugen, Thomas, Ludovic, On 06/02/22 20:39, Eugen.Hristev at microchip.com wrote: > On 2/6/22 4:25 PM, Giulio Benetti wrote: >> Hi Thomas, >> >> On 06/02/22 13:16, Thomas Petazzoni wrote: >>> On Sun,? 6 Feb 2022 12:26:19 +0100 >>> Giulio Benetti wrote: >>> >>>> Fixes: >>>> https://gitlab.com/ymorin/buildroot/-/jobs/2035821098 >>>> >>>> Signed-off-by: Giulio Benetti >>> >>> Did you actually test on HW that 5.15.21 was working? >> >> Unfortunately I don't have board, so no. >> >>> Shouldn't this be >>> done by the original submitter of the defconfig. >>> >>> Eugen, Ludovic? > > I can test it. Do you have a built already done with it on top that I > could download ? (would certainly speed things up) Here are the 2 links with the prebuilt images for both boards: https://www.dropbox.com/s/av9vz28459hakjl/microchip_sama7g5ek_mmc_dev-sdcard.img?dl=0 https://www.dropbox.com/s/77t2tru95f6l0wk/microchip_sama7g5ek_mmc-sdcard.img?dl=0 > I do not really understand why we need to have a fixed kernel version. > This board works with latest LTS starting from 5.15. Can't buildroot > just select that ? It can't because otherwise, once Buildroot Latest Linux version gets bumped(like 5.16 etc.), your defconfig will be built with a new and untested Linux version(i.e 5.16). So we need to set a specific version, test it, commit it, and in the future we can bump it, wait for a HW testing, commit it etc. > And why just adding the missing dependency does not fix things. Because that only chooses the "Custom kernel headers series" and not Linux version, so once Latest version is bumped(i.e. to 5.16) it won't be valid anymore. The point here is that this: BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15 is needed because of these: BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.21" and these ^^^ allow us to have a stable, HW tested defconfig. > (I remember buildroot had something like kernel latest version to pick up ). That is not what we want because of above explanation. It can result in a non working defconfig. Best regards -- Giulio Benetti Benetti Engineering sas From fontaine.fabrice at gmail.com Sun Feb 6 19:56:43 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 6 Feb 2022 20:56:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/lua-cffi: fix spaces Message-ID: <20220206195643.2522277-1-fontaine.fabrice@gmail.com> Commit 13114d0f9352531e5d7ebed45cd3f679407c61d9 forgot to add spaces before and after '=' and added a spurious space in Config.in Signed-off-by: Fabrice Fontaine --- package/lua-cffi/Config.in | 2 +- package/lua-cffi/lua-cffi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lua-cffi/Config.in b/package/lua-cffi/Config.in index 64a36e1de4..f4a760ce0d 100644 --- a/package/lua-cffi/Config.in +++ b/package/lua-cffi/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_LUA_CFFI bool "lua-cffi" depends on !BR2_PACKAGE_LUAJIT - depends on BR2_TOOLCHAIN_HAS_THREADS # libffi + depends on BR2_TOOLCHAIN_HAS_THREADS # libffi depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_LIBFFI diff --git a/package/lua-cffi/lua-cffi.mk b/package/lua-cffi/lua-cffi.mk index 07d84ad5fa..964f49f030 100644 --- a/package/lua-cffi/lua-cffi.mk +++ b/package/lua-cffi/lua-cffi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_CFFI_VERSION=0.2.1 +LUA_CFFI_VERSION = 0.2.1 LUA_CFFI_SITE = $(call github,q66,cffi-lua,v$(LUA_CFFI_VERSION)) LUA_CFFI_LICENSE = MIT LUA_CFFI_LICENSE_FILES = COPYING.md -- 2.34.1 From giulio.benetti at benettiengineering.com Sun Feb 6 20:05:17 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 21:05:17 +0100 Subject: [Buildroot] [PATCH 01/16] board/aarch64-efi/genimage-efi: convert partition-type-uuid to single letter notation In-Reply-To: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> References: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> Message-ID: <20220206200532.2758493-2-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- board/aarch64-efi/genimage-efi.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/aarch64-efi/genimage-efi.cfg b/board/aarch64-efi/genimage-efi.cfg index 87e85816bc..7fbe13d390 100644 --- a/board/aarch64-efi/genimage-efi.cfg +++ b/board/aarch64-efi/genimage-efi.cfg @@ -18,13 +18,13 @@ image disk.img { partition boot { image = "efi-part.vfat" - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + partition-type-uuid = U offset = 32K bootable = true } partition root { - partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae + partition-type-uuid = L image = "rootfs.ext2" } } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 6 20:05:18 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 21:05:18 +0100 Subject: [Buildroot] [PATCH 02/16] board/beaglev/genimage-efi: convert partition-type-uuid to single letter notation In-Reply-To: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> References: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> Message-ID: <20220206200532.2758493-3-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- board/beaglev/genimage.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/beaglev/genimage.cfg b/board/beaglev/genimage.cfg index deefdbc110..54f9118ea9 100644 --- a/board/beaglev/genimage.cfg +++ b/board/beaglev/genimage.cfg @@ -4,7 +4,7 @@ image sdcard.img { } partition rootfs { - partition-type-uuid = 72ec70a6-cf74-40e6-bd49-4bda08e8f224 + partition-type-uuid = L partition-uuid = 0fef845a-c6e1-45bc-82f7-002fa720f958 bootable = "true" image = "rootfs.ext4" -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 6 20:05:16 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 21:05:16 +0100 Subject: [Buildroot] [PATCH 00/16] Use single letter notation in genimage.cfg files for partition-type-uuid Message-ID: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> This patchset convert partition-type-uuid to single letter notation *without* "". Note: This patchset must be applied after this patch: https://patchwork.ozlabs.org/project/buildroot/patch/20220204000657.747245-1-giulio.benetti at benettiengineering.com/ Giulio Benetti (16): board/aarch64-efi/genimage-efi: convert partition-type-uuid to single letter notation board/beaglev/genimage-efi: convert partition-type-uuid to single letter notation board/friendlyarm/nanopc-t4/genimage: convert partition-type-uuid to single letter notation board/friendlyarm/nanopi-m4/genimage: keep partition-type-uuid without "" for consistency board/orangepi/orangepi-pc-plus/genimage: keep partition-type-uuid without "" for consistency board/orangepi/orangepi-r1/genimage: fix partition-type-uuid for boot partition and remove "" for consistency board/orangepi/orangepi-zero-plus2/genimage: keep partition-type-uuid without "" for consistency board/pc/genimage-efi: convert partition-type-uuid to single letter notation board/pine64/rockpro64/genimage: convert partition-type-uuid to single letter notation board/qemu/aarch64-sbsa/genimage: convert partition-type-uuid to single letter notation board/radxa/rockpi-n4/genimage: convert partition-type-uuid to single letter notation board/radxa/rockpi-n10/genimage: convert partition-type-uuid to single letter notation board/radxa/rockpi-n8/genimage: convert partition-type-uuid to single letter notation board/sifive/hifive-unleashed/genimage_sdcard: convert partition-type-uuid to single letter notation board/sifive/hifive-unleashed/genimage_sdcard: add comments to particular partition-type-uuid parameters board/sifive/hifive-unleashed/genimage_spi-nor: add comments to particular partition-type-uuid parameters board/aarch64-efi/genimage-efi.cfg | 4 ++-- board/beaglev/genimage.cfg | 2 +- board/friendlyarm/nanopc-t4/genimage.cfg | 4 ++-- board/friendlyarm/nanopi-m4/genimage.cfg | 4 ++-- board/orangepi/orangepi-pc-plus/genimage.cfg | 4 ++-- board/orangepi/orangepi-r1/genimage.cfg | 4 ++-- board/orangepi/orangepi-zero-plus2/genimage.cfg | 4 ++-- board/pc/genimage-efi.cfg | 4 ++-- board/pine64/rockpro64/genimage.cfg | 4 ++-- board/qemu/aarch64-sbsa/genimage.cfg | 4 ++-- board/radxa/rockpi-4/genimage.cfg | 4 ++-- board/radxa/rockpi-n10/genimage.cfg | 4 ++-- board/radxa/rockpi-n8/genimage.cfg | 4 ++-- board/sifive/hifive-unleashed/genimage_sdcard.cfg | 4 +++- board/sifive/hifive-unleashed/genimage_spi-nor.cfg | 2 ++ 15 files changed, 30 insertions(+), 26 deletions(-) -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 6 20:05:22 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 21:05:22 +0100 Subject: [Buildroot] [PATCH 06/16] board/orangepi/orangepi-r1/genimage: fix partition-type-uuid for boot partition and remove "" for consistency In-Reply-To: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> References: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> Message-ID: <20220206200532.2758493-7-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- board/orangepi/orangepi-r1/genimage.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/orangepi/orangepi-r1/genimage.cfg b/board/orangepi/orangepi-r1/genimage.cfg index e93e802bd9..78b69269b7 100644 --- a/board/orangepi/orangepi-r1/genimage.cfg +++ b/board/orangepi/orangepi-r1/genimage.cfg @@ -28,7 +28,7 @@ image sdcard.img { } partition boot { - partition-type-uuid = "U" + partition-type-uuid = F bootable = "true" image = "boot.vfat" } @@ -36,7 +36,7 @@ image sdcard.img { # 'rootfs' will be used as the partition label, used # with root=PARTLABEL=rootfs kernel command line partition rootfs { - partition-type-uuid = "L" + partition-type-uuid = L image = "rootfs.ext4" size = 512M } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 6 20:05:19 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 21:05:19 +0100 Subject: [Buildroot] [PATCH 03/16] board/friendlyarm/nanopc-t4/genimage: convert partition-type-uuid to single letter notation In-Reply-To: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> References: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> Message-ID: <20220206200532.2758493-4-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- board/friendlyarm/nanopc-t4/genimage.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/friendlyarm/nanopc-t4/genimage.cfg b/board/friendlyarm/nanopc-t4/genimage.cfg index 98dc2f3892..272037c9f7 100644 --- a/board/friendlyarm/nanopc-t4/genimage.cfg +++ b/board/friendlyarm/nanopc-t4/genimage.cfg @@ -26,14 +26,14 @@ image sdcard.img { } partition boot { - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + partition-type-uuid = F bootable = "true" image = "boot.vfat" offset = 16M } partition rootfs { - partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae + partition-type-uuid = L image = "rootfs.ext4" } } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 6 20:05:21 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 21:05:21 +0100 Subject: [Buildroot] [PATCH 05/16] board/orangepi/orangepi-pc-plus/genimage: keep partition-type-uuid without "" for consistency In-Reply-To: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> References: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> Message-ID: <20220206200532.2758493-6-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- board/orangepi/orangepi-pc-plus/genimage.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/orangepi/orangepi-pc-plus/genimage.cfg b/board/orangepi/orangepi-pc-plus/genimage.cfg index 3812d785d5..d94239e9a2 100644 --- a/board/orangepi/orangepi-pc-plus/genimage.cfg +++ b/board/orangepi/orangepi-pc-plus/genimage.cfg @@ -28,7 +28,7 @@ image sdcard.img { } partition boot { - partition-type-uuid = "F" + partition-type-uuid = F bootable = "true" image = "boot.vfat" } @@ -36,7 +36,7 @@ image sdcard.img { # 'rootfs' will be used as the partition label, used # with root=PARTLABEL=rootfs kernel command line partition rootfs { - partition-type-uuid = "L" + partition-type-uuid = L image = "rootfs.ext4" size = 512M } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 6 20:05:23 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 21:05:23 +0100 Subject: [Buildroot] [PATCH 07/16] board/orangepi/orangepi-zero-plus2/genimage: keep partition-type-uuid without "" for consistency In-Reply-To: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> References: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> Message-ID: <20220206200532.2758493-8-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- board/orangepi/orangepi-zero-plus2/genimage.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/orangepi/orangepi-zero-plus2/genimage.cfg b/board/orangepi/orangepi-zero-plus2/genimage.cfg index 5a7ee7707a..9538e6a54e 100644 --- a/board/orangepi/orangepi-zero-plus2/genimage.cfg +++ b/board/orangepi/orangepi-zero-plus2/genimage.cfg @@ -26,7 +26,7 @@ image sdcard.img { } partition boot { - partition-type-uuid = "F" + 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-uuid = "L" + partition-type-uuid = L image = "rootfs.ext4" size = 256M } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 6 20:05:20 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 21:05:20 +0100 Subject: [Buildroot] [PATCH 04/16] board/friendlyarm/nanopi-m4/genimage: keep partition-type-uuid without "" for consistency In-Reply-To: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> References: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> Message-ID: <20220206200532.2758493-5-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- board/friendlyarm/nanopi-m4/genimage.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/friendlyarm/nanopi-m4/genimage.cfg b/board/friendlyarm/nanopi-m4/genimage.cfg index 8d0e6ad13b..655981847e 100644 --- a/board/friendlyarm/nanopi-m4/genimage.cfg +++ b/board/friendlyarm/nanopi-m4/genimage.cfg @@ -26,14 +26,14 @@ image sdcard.img { } partition boot { - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + partition-type-uuid = F bootable = "true" image = "boot.vfat" offset = 16M } partition rootfs { - partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae + partition-type-uuid = L image = "rootfs.ext4" } } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 6 20:05:51 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 21:05:51 +0100 Subject: [Buildroot] [PATCH 16/16] board/sifive/hifive-unleashed/genimage_spi-nor: add comments to particular partition-type-uuid parameters Message-ID: <20220206200551.2758572-1-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- board/sifive/hifive-unleashed/genimage_spi-nor.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/board/sifive/hifive-unleashed/genimage_spi-nor.cfg b/board/sifive/hifive-unleashed/genimage_spi-nor.cfg index 903e675a90..f5e8f188e3 100644 --- a/board/sifive/hifive-unleashed/genimage_spi-nor.cfg +++ b/board/sifive/hifive-unleashed/genimage_spi-nor.cfg @@ -8,12 +8,14 @@ image spi-nor.img { partition u-boot-spl { image = "u-boot-spl.bin" offset = 20K + # ZSBL only loads from this type of partition type uuid partition-type-uuid = 5B193300-FC78-40CD-8002-E86C45580B47 } partition u-boot { image = "u-boot.itb" offset = 1044K + # U-Boot expects exactly this partition type uuid partition-type-uuid = 2E54B353-1271-4842-806F-E436D6AF6985 } } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 6 20:05:24 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 21:05:24 +0100 Subject: [Buildroot] [PATCH 08/16] board/pc/genimage-efi: convert partition-type-uuid to single letter notation In-Reply-To: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> References: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> Message-ID: <20220206200532.2758493-9-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- board/pc/genimage-efi.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/pc/genimage-efi.cfg b/board/pc/genimage-efi.cfg index 035a077a78..9626a5f2e7 100644 --- a/board/pc/genimage-efi.cfg +++ b/board/pc/genimage-efi.cfg @@ -19,13 +19,13 @@ image disk.img { partition boot { image = "efi-part.vfat" - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + partition-type-uuid = U offset = 32K bootable = true } partition root { - partition-type-uuid = 44479540-f297-41b2-9af7-d131d5f0458a + partition-type-uuid = L partition-uuid = UUID_TMP image = "rootfs.ext2" } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 6 20:05:25 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 21:05:25 +0100 Subject: [Buildroot] [PATCH 09/16] board/pine64/rockpro64/genimage: convert partition-type-uuid to single letter notation In-Reply-To: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> References: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> Message-ID: <20220206200532.2758493-10-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- board/pine64/rockpro64/genimage.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/pine64/rockpro64/genimage.cfg b/board/pine64/rockpro64/genimage.cfg index d3926f2df6..4b96a3447d 100644 --- a/board/pine64/rockpro64/genimage.cfg +++ b/board/pine64/rockpro64/genimage.cfg @@ -26,14 +26,14 @@ image sdcard.img { } partition boot { - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + partition-type-uuid = F bootable = "true" image = "boot.vfat" offset = 16M } partition rootfs { - partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae + partition-type-uuid = L image = "rootfs.ext4" } } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 6 20:05:29 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 21:05:29 +0100 Subject: [Buildroot] [PATCH 13/16] board/radxa/rockpi-n8/genimage: convert partition-type-uuid to single letter notation In-Reply-To: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> References: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> Message-ID: <20220206200532.2758493-14-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- board/radxa/rockpi-n8/genimage.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/radxa/rockpi-n8/genimage.cfg b/board/radxa/rockpi-n8/genimage.cfg index 909a646499..3fced4a5d8 100644 --- a/board/radxa/rockpi-n8/genimage.cfg +++ b/board/radxa/rockpi-n8/genimage.cfg @@ -26,14 +26,14 @@ image sdcard.img { } partition boot { - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + partition-type-uuid = F bootable = "true" image = "boot.vfat" offset = 16M } partition rootfs { - partition-type-uuid = 69dad710-2ce4-4e3c-b16c-21a1d49abed3 + partition-type-uuid = L image = "rootfs.ext4" } } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 6 20:05:26 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 21:05:26 +0100 Subject: [Buildroot] [PATCH 10/16] board/qemu/aarch64-sbsa/genimage: convert partition-type-uuid to single letter notation In-Reply-To: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> References: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> Message-ID: <20220206200532.2758493-11-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- board/qemu/aarch64-sbsa/genimage.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/qemu/aarch64-sbsa/genimage.cfg b/board/qemu/aarch64-sbsa/genimage.cfg index bdf8a89d75..629f4e07b7 100644 --- a/board/qemu/aarch64-sbsa/genimage.cfg +++ b/board/qemu/aarch64-sbsa/genimage.cfg @@ -19,13 +19,13 @@ image disk.img { partition boot { image = "efi-part.vfat" - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + partition-type-uuid = U offset = 32K bootable = true } partition root { - partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae + partition-type-uuid = L image = "rootfs.ext2" } } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 6 20:05:30 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 21:05:30 +0100 Subject: [Buildroot] [PATCH 14/16] board/sifive/hifive-unleashed/genimage_sdcard: convert partition-type-uuid to single letter notation In-Reply-To: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> References: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> Message-ID: <20220206200532.2758493-15-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- board/sifive/hifive-unleashed/genimage_sdcard.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/sifive/hifive-unleashed/genimage_sdcard.cfg b/board/sifive/hifive-unleashed/genimage_sdcard.cfg index e66f221d73..b8bd787488 100644 --- a/board/sifive/hifive-unleashed/genimage_sdcard.cfg +++ b/board/sifive/hifive-unleashed/genimage_sdcard.cfg @@ -17,7 +17,7 @@ image sdcard.img { partition rootfs { image = "rootfs.ext4" - partition-type-uuid = 0FC63DAF-8483-4772-8E79-3D69D8477DE4 + partition-type-uuid = L bootable = true } } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 6 20:05:27 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 21:05:27 +0100 Subject: [Buildroot] [PATCH 11/16] board/radxa/rockpi-n4/genimage: convert partition-type-uuid to single letter notation In-Reply-To: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> References: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> Message-ID: <20220206200532.2758493-12-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- board/radxa/rockpi-4/genimage.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/radxa/rockpi-4/genimage.cfg b/board/radxa/rockpi-4/genimage.cfg index 68cc4d61a8..3c3bd8b7fc 100644 --- a/board/radxa/rockpi-4/genimage.cfg +++ b/board/radxa/rockpi-4/genimage.cfg @@ -26,14 +26,14 @@ image sdcard.img { } partition boot { - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + partition-type-uuid = F bootable = "true" image = "boot.vfat" offset = 16M } partition rootfs { - partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae + partition-type-uuid = L image = "rootfs.ext4" } } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 6 20:05:28 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 21:05:28 +0100 Subject: [Buildroot] [PATCH 12/16] board/radxa/rockpi-n10/genimage: convert partition-type-uuid to single letter notation In-Reply-To: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> References: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> Message-ID: <20220206200532.2758493-13-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- board/radxa/rockpi-n10/genimage.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/radxa/rockpi-n10/genimage.cfg b/board/radxa/rockpi-n10/genimage.cfg index 7f4b639bbc..2773658330 100644 --- a/board/radxa/rockpi-n10/genimage.cfg +++ b/board/radxa/rockpi-n10/genimage.cfg @@ -26,14 +26,14 @@ image sdcard.img { } partition boot { - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + partition-type-uuid = F bootable = "true" image = "boot.vfat" offset = 16M } partition rootfs { - partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae + partition-type-uuid = L image = "rootfs.ext4" } } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 6 20:05:31 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 21:05:31 +0100 Subject: [Buildroot] [PATCH 15/16] board/sifive/hifive-unleashed/genimage_sdcard: add comments to particular partition-type-uuid parameters In-Reply-To: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> References: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> Message-ID: <20220206200532.2758493-16-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- board/sifive/hifive-unleashed/genimage_sdcard.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/board/sifive/hifive-unleashed/genimage_sdcard.cfg b/board/sifive/hifive-unleashed/genimage_sdcard.cfg index b8bd787488..47e59a90d7 100644 --- a/board/sifive/hifive-unleashed/genimage_sdcard.cfg +++ b/board/sifive/hifive-unleashed/genimage_sdcard.cfg @@ -6,12 +6,14 @@ image sdcard.img { partition u-boot-spl { image = "u-boot-spl.bin" offset = 17K + # ZSBL only loads from this type of partition type uuid partition-type-uuid = 5B193300-FC78-40CD-8002-E86C45580B47 } partition u-boot { image = "u-boot.itb" offset = 1041K + # U-Boot expects exactly this partition type uuid partition-type-uuid = 2E54B353-1271-4842-806F-E436D6AF6985 } -- 2.25.1 From daniil.stas at posteo.net Sun Feb 6 20:47:00 2022 From: daniil.stas at posteo.net (Daniil Stas) Date: Sun, 6 Feb 2022 20:47:00 +0000 Subject: [Buildroot] [BUG] boot/arm-trusted-firmware: Stack protection setting doesn't work In-Reply-To: <87mtj3de6j.fsf@tarshish> References: <20220206020711.3dc6e42e@ux550ve> <87mtj3de6j.fsf@tarshish> Message-ID: <20220206224700.4b3519b2@ux550ve> Hi, Baruch > What happens when you build with a toolchain that has no SSP support > with the commit you mentioned reverted? I believe you will get a build > error similar to this one: > > aarch64-buildroot-linux-uclibc-gcc.br_real: error: unrecognized > command-line option ?-fstack-protector-0?; did you mean > ?-fstack-protector?? aarch64-buildroot-linux-uclibc-gcc.br_real: > error: unrecognized command-line option ?-fstack-protector-0?; did > you mean ?-fstack-protector?? Makefile:1075: recipe for target > '/builds/buildroot.org/buildroot/output/build/arm-trusted-firmware-v2.4/build/a80x0_mcbin/release/libc/assert.o' > failed make[1]: *** > [/builds/buildroot.org/buildroot/output/build/arm-trusted-firmware-v2.4/build/a80x0_mcbin/release/libc/assert.o] > Error 1 > > Copied from > https://gitlab.com/buildroot.org/buildroot/-/jobs/1497663294. > > Do you have a better suggestion? > > baruch > Yes, if you pass ENABLE_STACK_PROTECTOR=0 argument to the make command you will get this error. I don't know what is the proper fix here... The current TF-A documentation says that the valid ENABLE_STACK_PROTECTOR values are: "all", "strong", "default" and "none". And the comments in Buildroot say that's older versions didn't support "none" value and expected "0" value instead (looks like it was changed in TF-A commit fd7b287cbe). Maybe Buildroot should check the TF-A version and only pass "0" to the old versions. But I don't know if this version comparison can be implemented in Buildroot. Or maybe we can give user an additional option to specify how to pass ENABLE_STACK_PROTECTOR argument, but this doesn't look very convenient... Or maybe it's better to patch TF-A so the newer versions treated "0" value exactly as "none"... Best regards, Daniil From fontaine.fabrice at gmail.com Sun Feb 6 19:51:06 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 6 Feb 2022 20:51:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/guile: fix build with glibc 2.34 Message-ID: <20220206195106.2520033-1-fontaine.fabrice@gmail.com> Fix the following build failure with glibc 2.34 raised since bump to version 3.0.7 in commit d8bee3950aa851620d6a954aebad1f984caa105a: In file included from regexec.c:1368, from regex.c:74: ./malloc/dynarray-skeleton.c:195:24: error: expected declaration specifiers or '...' before '(' token 195 | __attribute_nonnull__ ((1)) | ^ https://lists.gnu.org/archive/html/bug-guile/2021-08/msg00003.html Fixes: - http://autobuild.buildroot.org/results/27a2a69e1177f15daec65eca035b99ea5355c34b Signed-off-by: Fabrice Fontaine --- ...38a53d64054ae2fc8b86c0f87c418c6176e6.patch | 13930 ++++++++++++++++ package/guile/guile.mk | 7 +- 2 files changed, 13935 insertions(+), 2 deletions(-) create mode 100644 package/guile/0004-Update-gnulib-to-8f4538a53d64054ae2fc8b86c0f87c418c6176e6.patch diff --git a/package/guile/0004-Update-gnulib-to-8f4538a53d64054ae2fc8b86c0f87c418c6176e6.patch b/package/guile/0004-Update-gnulib-to-8f4538a53d64054ae2fc8b86c0f87c418c6176e6.patch new file mode 100644 index 0000000000..f471dbc5c0 --- /dev/null +++ b/package/guile/0004-Update-gnulib-to-8f4538a53d64054ae2fc8b86c0f87c418c6176e6.patch @@ -0,0 +1,13930 @@ +From b4a80f4239b19fea4d2cc3e9d197f24b809f0624 Mon Sep 17 00:00:00 2001 +From: Daniel Llorens +Date: Mon, 16 Aug 2021 13:23:27 +0200 +Subject: Update gnulib to 8f4538a53d64054ae2fc8b86c0f87c418c6176e6 + +Includes gnulib:0c907f7da13232908f05c415b8cec56024071906 to fix #49930 +https://lists.gnu.org/archive/html/bug-guile/2021-08/msg00003.html. + +[Retrieved from: +https://git.savannah.gnu.org/cgit/guile.git/commit/?id=b4a80f4239b19fea4d2cc3e9d197f24b809f0624] +Signed-off-by: Fabrice Fontaine +--- + build-aux/announce-gen | 49 +- + build-aux/gendocs.sh | 6 +- + build-aux/git-version-gen | 8 +- + build-aux/gnupload | 17 +- + build-aux/useless-if-before-free | 18 +- + lib/Makefile.am | 986 ++++++++++++++++++++------------------- + lib/_Noreturn.h | 2 +- + lib/accept.c | 10 +- + lib/accept4.c | 14 +- + lib/alignof.h | 12 +- + lib/alloca.c | 4 +- + lib/alloca.in.h | 20 +- + lib/arpa_inet.in.h | 12 +- + lib/asnprintf.c | 14 +- + lib/assure.h | 10 +- + lib/attribute.h | 16 +- + lib/basename-lgpl.c | 10 +- + lib/basename-lgpl.h | 26 +- + lib/binary-io.c | 10 +- + lib/binary-io.h | 10 +- + lib/bind.c | 10 +- + lib/btowc.c | 10 +- + lib/byteswap.in.h | 10 +- + lib/c-ctype.c | 18 + + lib/c-ctype.h | 24 +- + lib/c-strcase.h | 12 +- + lib/c-strcasecmp.c | 12 +- + lib/c-strcaseeq.h | 14 +- + lib/c-strncasecmp.c | 12 +- + lib/canonicalize-lgpl.c | 3 +- + lib/cdefs.h | 43 +- + lib/ceil.c | 10 +- + lib/cloexec.c | 14 +- + lib/cloexec.h | 14 +- + lib/close.c | 10 +- + lib/connect.c | 10 +- + lib/copysign.c | 10 +- + lib/dirent.in.h | 111 +++-- + lib/dirfd.c | 10 +- + lib/dirname-lgpl.c | 10 +- + lib/dirname.h | 39 +- + lib/dup2.c | 10 +- + lib/duplocale.c | 10 +- + lib/dynarray.h | 20 +- + lib/errno.in.h | 12 +- + lib/fcntl.c | 10 +- + lib/fcntl.in.h | 10 +- + lib/fd-hook.c | 14 +- + lib/fd-hook.h | 14 +- + lib/float+.h | 12 +- + lib/float.c | 10 +- + lib/float.in.h | 10 +- + lib/floor.c | 10 +- + lib/free.c | 10 +- + lib/frexp.c | 10 +- + lib/fstat.c | 10 +- + lib/fsync.c | 14 +- + lib/full-read.c | 10 +- + lib/full-read.h | 10 +- + lib/full-write.c | 10 +- + lib/full-write.h | 10 +- + lib/gai_strerror.c | 12 +- + lib/getaddrinfo.c | 12 +- + lib/getdtablesize.c | 10 +- + lib/getlogin.c | 10 +- + lib/getpeername.c | 10 +- + lib/getrandom.c | 16 +- + lib/getsockname.c | 10 +- + lib/getsockopt.c | 10 +- + lib/gettext.h | 14 +- + lib/hard-locale.c | 10 +- + lib/hard-locale.h | 10 +- + lib/iconv.c | 14 +- + lib/iconv.in.h | 12 +- + lib/iconv_close.c | 14 +- + lib/iconv_open-aix.gperf | 14 +- + lib/iconv_open-hpux.gperf | 14 +- + lib/iconv_open-irix.gperf | 14 +- + lib/iconv_open-osf.gperf | 14 +- + lib/iconv_open-solaris.gperf | 14 +- + lib/iconv_open-zos.gperf | 14 +- + lib/iconv_open.c | 14 +- + lib/iconveh.h | 10 +- + lib/inet_ntop.c | 12 +- + lib/inet_pton.c | 10 +- + lib/inttypes.in.h | 10 +- + lib/isfinite.c | 14 +- + lib/isinf.c | 14 +- + lib/isnan.c | 10 +- + lib/isnand-nolibm.h | 10 +- + lib/isnand.c | 10 +- + lib/isnanf-nolibm.h | 10 +- + lib/isnanf.c | 10 +- + lib/isnanl-nolibm.h | 10 +- + lib/isnanl.c | 10 +- + lib/itold.c | 10 +- + lib/langinfo.in.h | 12 +- + lib/lc-charset-dispatch.c | 10 +- + lib/lc-charset-dispatch.h | 10 +- + lib/libc-config.h | 20 +- + lib/libunistring.valgrind | 22 +- + lib/limits.in.h | 28 +- + lib/link.c | 12 +- + lib/listen.c | 10 +- + lib/localcharset.c | 14 +- + lib/localcharset.h | 14 +- + lib/locale.in.h | 10 +- + lib/localeconv.c | 10 +- + lib/log.c | 10 +- + lib/log1p.c | 10 +- + lib/lstat.c | 10 +- + lib/malloc.c | 47 +- + lib/malloc/dynarray_at_failure.c | 3 +- + lib/malloca.c | 36 +- + lib/malloca.h | 36 +- + lib/math.c | 18 + + lib/math.in.h | 10 +- + lib/mbrtowc-impl-utf8.h | 10 +- + lib/mbrtowc-impl.h | 10 +- + lib/mbrtowc.c | 10 +- + lib/mbsinit.c | 10 +- + lib/mbtowc-impl.h | 10 +- + lib/mbtowc-lock.c | 10 +- + lib/mbtowc-lock.h | 10 +- + lib/mbtowc.c | 10 +- + lib/memchr.c | 24 +- + lib/memchr.valgrind | 10 +- + lib/mempcpy.c | 12 +- + lib/minmax.h | 12 +- + lib/mkdir.c | 10 +- + lib/mkostemp.c | 10 +- + lib/msvc-inval.c | 14 +- + lib/msvc-inval.h | 14 +- + lib/msvc-nothrow.c | 14 +- + lib/msvc-nothrow.h | 14 +- + lib/netdb.in.h | 12 +- + lib/netinet_in.in.h | 12 +- + lib/nl_langinfo-lock.c | 10 +- + lib/nl_langinfo.c | 10 +- + lib/nproc.c | 12 +- + lib/nproc.h | 12 +- + lib/nstrftime.c | 19 +- + lib/open.c | 10 +- + lib/pathmax.h | 12 +- + lib/pipe.c | 14 +- + lib/pipe2.c | 14 +- + lib/poll.c | 14 +- + lib/poll.in.h | 14 +- + lib/printf-args.c | 14 +- + lib/printf-args.h | 14 +- + lib/printf-parse.c | 25 +- + lib/printf-parse.h | 14 +- + lib/putenv.c | 10 +- + lib/raise.c | 10 +- + lib/rawmemchr.c | 10 +- + lib/rawmemchr.valgrind | 10 +- + lib/read.c | 10 +- + lib/readlink.c | 10 +- + lib/realloc.c | 68 +-- + lib/recv.c | 10 +- + lib/recvfrom.c | 10 +- + lib/regex_internal.c | 9 +- + lib/regexec.c | 12 +- + lib/rename.c | 10 +- + lib/rmdir.c | 10 +- + lib/round.c | 14 +- + lib/safe-read.c | 10 +- + lib/safe-read.h | 10 +- + lib/safe-write.c | 10 +- + lib/safe-write.h | 10 +- + lib/same-inode.h | 10 +- + lib/scratch_buffer.h | 20 +- + lib/select.c | 23 +- + lib/send.c | 10 +- + lib/sendto.c | 10 +- + lib/setenv.c | 10 +- + lib/setlocale-lock.c | 10 +- + lib/setlocale_null.c | 10 +- + lib/setlocale_null.h | 10 +- + lib/setsockopt.c | 10 +- + lib/shutdown.c | 10 +- + lib/signal.in.h | 10 +- + lib/signbitd.c | 10 +- + lib/signbitf.c | 10 +- + lib/signbitl.c | 10 +- + lib/size_max.h | 12 +- + lib/snprintf.c | 14 +- + lib/socket.c | 10 +- + lib/sockets.c | 10 +- + lib/sockets.h | 10 +- + lib/stat-time.c | 18 + + lib/stat-time.h | 10 +- + lib/stat-w32.c | 10 +- + lib/stat-w32.h | 10 +- + lib/stat.c | 10 +- + lib/stdalign.in.h | 12 +- + lib/stdbool.in.h | 12 +- + lib/stddef.in.h | 12 +- + lib/stdint.in.h | 16 +- + lib/stdio.in.h | 126 +++-- + lib/stdlib.in.h | 185 ++++++-- + lib/strdup.c | 14 +- + lib/streq.h | 14 +- + lib/strftime.h | 10 +- + lib/striconveh.c | 10 +- + lib/striconveh.h | 18 +- + lib/string.in.h | 68 ++- + lib/stripslash.c | 10 +- + lib/sys-limits.h | 12 +- + lib/sys_file.in.h | 12 +- + lib/sys_random.in.h | 12 +- + lib/sys_select.in.h | 12 +- + lib/sys_socket.c | 18 + + lib/sys_socket.in.h | 12 +- + lib/sys_stat.in.h | 12 +- + lib/sys_time.in.h | 12 +- + lib/sys_times.in.h | 12 +- + lib/sys_types.in.h | 12 +- + lib/sys_uio.in.h | 12 +- + lib/tempname.h | 10 +- + lib/time-internal.h | 14 +- + lib/time.in.h | 12 +- + lib/time_r.c | 14 +- + lib/time_rz.c | 14 +- + lib/times.c | 12 +- + lib/trunc.c | 10 +- + lib/tzset.c | 12 +- + lib/unistd.c | 18 + + lib/unistd.in.h | 25 +- + lib/unsetenv.c | 10 +- + lib/vasnprintf.c | 50 +- + lib/vasnprintf.h | 14 +- + lib/verify.h | 14 +- + lib/vsnprintf.c | 14 +- + lib/w32sock.h | 10 +- + lib/wchar.in.h | 63 ++- + lib/wcrtomb.c | 10 +- + lib/wctype-h.c | 19 + + lib/wctype.in.h | 22 +- + lib/windows-initguard.h | 12 +- + lib/write.c | 10 +- + lib/xalloc-oversized.h | 47 +- + lib/xsize.c | 18 + + lib/xsize.h | 12 +- + m4/arpa_inet_h.m4 | 31 +- + m4/dirent_h.m4 | 45 +- + m4/environ.m4 | 5 +- + m4/fcntl_h.m4 | 39 +- + m4/flock.m4 | 4 +- + m4/fstat.m4 | 4 +- + m4/getaddrinfo.m4 | 10 +- + m4/gnulib-common.m4 | 140 +++++- + m4/gnulib-comp.m4 | 140 ++++-- + m4/hostent.m4 | 4 +- + m4/iconv_h.m4 | 27 +- + m4/inttypes.m4 | 31 +- + m4/langinfo_h.m4 | 25 +- + m4/largefile.m4 | 28 +- + m4/limits-h.m4 | 3 +- + m4/locale_h.m4 | 37 +- + m4/malloc.m4 | 152 ++++-- + m4/math_h.m4 | 227 ++++----- + m4/memchr.m4 | 4 +- + m4/mempcpy.m4 | 4 +- + m4/mktime.m4 | 4 +- + m4/netdb_h.m4 | 25 +- + m4/poll_h.m4 | 29 +- + m4/printf.m4 | 5 +- + m4/rawmemchr.m4 | 4 +- + m4/realloc.m4 | 47 +- + m4/regex.m4 | 44 +- + m4/select.m4 | 4 +- + m4/servent.m4 | 4 +- + m4/signal_h.m4 | 33 +- + m4/sockpfaf.m4 | 6 +- + m4/stat.m4 | 4 +- + m4/stddef_h.m4 | 23 +- + m4/stdint.m4 | 6 +- + m4/stdio_h.m4 | 168 ++++--- + m4/stdlib_h.m4 | 116 +++-- + m4/strdup.m4 | 6 +- + m4/string_h.m4 | 124 ++--- + m4/sys_file_h.m4 | 29 +- + m4/sys_random_h.m4 | 25 +- + m4/sys_select_h.m4 | 29 +- + m4/sys_socket_h.m4 | 53 ++- + m4/sys_stat_h.m4 | 65 ++- + m4/sys_time_h.m4 | 34 +- + m4/sys_times_h.m4 | 25 +- + m4/sys_types_h.m4 | 16 +- + m4/sys_uio_h.m4 | 23 +- + m4/threadlib.m4 | 64 ++- + m4/time_h.m4 | 62 +-- + m4/time_r.m4 | 2 +- + m4/time_rz.m4 | 2 +- + m4/timegm.m4 | 4 +- + m4/tzset.m4 | 4 +- + m4/unistd_h.m4 | 194 ++++---- + m4/visibility.m4 | 6 +- + m4/wchar_h.m4 | 109 +++-- + m4/wctype_h.m4 | 39 +- + m4/wint_t.m4 | 10 +- + m4/year2038.m4 | 124 +++++ + maint.mk | 3 +- + 304 files changed, 4266 insertions(+), 3005 deletions(-) + create mode 100644 m4/year2038.m4 + +diff --git a/build-aux/announce-gen b/build-aux/announce-gen +index 84d2d63..f3b5461 100755 +--- a/build-aux/announce-gen ++++ b/build-aux/announce-gen +@@ -35,12 +35,14 @@ + eval 'exec perl -wSx "$0" "$@"' + if 0; + +-my $VERSION = '2020-05-10 16:13'; # UTC ++my $VERSION = '2021-08-04 09:17'; # UTC + # The definition above must lie within the first 8 lines in order + # for the Emacs time-stamp write hook (at end) to update it. + # If you change this file with Emacs, please let the write hook + # do its job. Otherwise, update this string manually. + ++my $copyright_year = '2021'; ++ + use strict; + use Getopt::Long; + use POSIX qw(strftime); +@@ -49,12 +51,6 @@ use POSIX qw(strftime); + + my %valid_release_types = map {$_ => 1} qw (alpha beta stable); + my @archive_suffixes = qw (tar.gz tar.bz2 tar.lz tar.lzma tar.xz); +-my %digest_classes = +- ( +- 'md5' => (eval { require Digest::MD5; } and 'Digest::MD5'), +- 'sha1' => ((eval { require Digest::SHA; } and 'Digest::SHA') +- or (eval { require Digest::SHA1; } and 'Digest::SHA1')) +- ); + my $srcdir = '.'; + + sub usage ($) +@@ -94,7 +90,7 @@ The following are optional: + VERSION is the result of running git describe + in the gnulib source directory. + required if gnulib is in TOOL_LIST. +- --no-print-checksums do not emit MD5 or SHA1 checksums ++ --no-print-checksums do not emit SHA1 or SHA256 checksums + --archive-suffix=SUF add SUF to the list of archive suffixes + --mail-headers=HEADERS a space-separated list of mail headers, e.g., + To: x\@example.com Cc: y-announce\@example.com,... +@@ -161,7 +157,7 @@ sub print_locations ($\@\%@) + + =item C. ++Print the SHA1 and SHA256 signature section for each C<@file>. + + =cut + +@@ -169,23 +165,18 @@ sub print_checksums (@) + { + my (@file) = @_; + +- print "Here are the MD5 and SHA1 checksums:\n"; ++ print "Here are the SHA1 and SHA256 checksums:\n"; + print "\n"; + +- foreach my $meth (qw (md5 sha1)) ++ use Digest::file qw(digest_file_hex digest_file_base64); ++ ++ foreach my $f (@file) + { +- my $class = $digest_classes{$meth} or next; +- foreach my $f (@file) +- { +- open IN, '<', $f +- or die "$ME: $f: cannot open for reading: $!\n"; +- binmode IN; +- my $dig = $class->new->addfile(*IN)->hexdigest; +- close IN; +- print "$dig $f\n"; +- } ++ print digest_file_hex($f, "SHA-1"), " $f\n"; ++ print digest_file_base64($f, "SHA-256"), " $f\n"; + } +- print "\n"; ++ print "\nThe SHA256 checksum is base64 encoded, instead of the\n"; ++ print "hexadecimal encoding that most checksum tools default to.\n\n"; + } + + =item C \@archive_suffixes, + + help => sub { usage 0 }, +- version => sub { print "$ME version $VERSION\n"; exit }, ++ version => ++ sub ++ { ++ print "$ME version $VERSION\n"; ++ print "Copyright (C) $copyright_year Free Software Foundation, Inc.\n"; ++ print "License GPLv3+: GNU GPL version 3 or later .\n" ++ . "This is free software: you are free to change and redistribute it.\n" ++ . "There is NO WARRANTY, to the extent permitted by law.\n"; ++ print "\n"; ++ my $author = "Jim Meyering"; ++ print "Written by $author.\n"; ++ exit ++ }, + ) or usage 1; + + my $fail = 0; +diff --git a/build-aux/gendocs.sh b/build-aux/gendocs.sh +index 1872de9..1241ee3 100755 +--- a/build-aux/gendocs.sh ++++ b/build-aux/gendocs.sh +@@ -2,7 +2,7 @@ + # gendocs.sh -- generate a GNU manual in many formats. This script is + # mentioned in maintain.texi. See the help message below for usage details. + +-scriptversion=2021-01-01.00 ++scriptversion=2021-07-19.18 + + # Copyright 2003-2021 Free Software Foundation, Inc. + # +@@ -58,7 +58,7 @@ EMAIL=webmasters at gnu.org # please override with --email + commonarg= # passed to all makeinfo/texi2html invcations. + dirargs= # passed to all tools (-I dir). + dirs= # -I directories. +-htmlarg="--css-ref=/software/gnulib/manual.css -c TOP_NODE_UP_URL=/manual" ++htmlarg="--css-ref=https://www.gnu.org/software/gnulib/manual.css -c TOP_NODE_UP_URL=/manual" + default_htmlarg=true + infoarg=--no-split + generate_ascii=true +@@ -202,7 +202,7 @@ base=$PACKAGE + + if $default_htmlarg && test -n "$use_texi2html"; then + # The legacy texi2html doesn't support TOP_NODE_UP_URL +- htmlarg="--css-ref=/software/gnulib/manual.css" ++ htmlarg="--css-ref=https://www.gnu.org/software/gnulib/manual.css" + fi + + if test -n "$srcfile"; then +diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen +index be0fc20..5e42afb 100755 +--- a/build-aux/git-version-gen ++++ b/build-aux/git-version-gen +@@ -75,10 +75,10 @@ me=$0 + year=`expr "$scriptversion" : '\([^-]*\)'` + version="git-version-gen $scriptversion + +-Copyright $year Free Software Foundation, Inc. +-There is NO warranty. You may redistribute this software +-under the terms of the GNU General Public License. +-For more information about these matters, see the files named COPYING." ++Copyright (C) ${year} Free Software Foundation, Inc. ++License GPLv3+: GNU GPL version 3 or later . ++This is free software: you are free to change and redistribute it. ++There is NO WARRANTY, to the extent permitted by law." + + usage="\ + Usage: $me [OPTION]... \$srcdir/.tarball-version [TAG-NORMALIZATION-SED-SCRIPT] +diff --git a/build-aux/gnupload b/build-aux/gnupload +index 434741d..e7822ae 100755 +--- a/build-aux/gnupload ++++ b/build-aux/gnupload +@@ -1,13 +1,13 @@ + #!/bin/sh + # Sign files and upload them. + +-scriptversion=2018-05-19.18; # UTC ++scriptversion=2021-04-11.09; # UTC + + # Copyright (C) 2004-2021 Free Software Foundation, Inc. + # + # 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, or (at your option) ++# the Free Software Foundation; either version 2, or (at your option) + # any later version. + # + # This program is distributed in the hope that it will be useful, +@@ -27,8 +27,8 @@ set -e + GPG=gpg + # Choose the proper version of gpg, so as to avoid a + # "gpg-agent is not available in this session" error +-# when gpg-agent is version 3 but gpg is still version 1. +-# FIXME-2020: remove, once all major distros ship gpg version 3 as /usr/bin/gpg ++# when gpg-agent is version 2 but gpg is still version 1. ++# FIXME-2020: remove, once all major distros ship gpg version 2 as /usr/bin/gpg + gpg_agent_version=`(gpg-agent --version) 2>/dev/null | sed -e '2,$d' -e 's/^[^0-9]*//'` + case "$gpg_agent_version" in + 2.*) +@@ -145,6 +145,12 @@ the build-aux/ directory of the gnulib package + + Send patches and bug reports to ." + ++copyright_year=`echo "$scriptversion" | sed -e 's/[^0-9].*//'` ++copyright="Copyright (C) ${copyright_year} Free Software Foundation, Inc. ++License GPLv2+: GNU GPL version 2 or later . ++This is free software: you are free to change and redistribute it. ++There is NO WARRANTY, to the extent permitted by law." ++ + # Read local configuration file + if test -r "$conffile"; then + echo "$0: Reading configuration file $conffile" +@@ -209,7 +215,8 @@ while test -n "$1"; do + ;; + --version) + echo "gnupload $scriptversion" +- exit $? ++ echo "$copyright" ++ exit 0 + ;; + --) + shift +diff --git a/build-aux/useless-if-before-free b/build-aux/useless-if-before-free +index 784d80b..5bbbc44 100755 +--- a/build-aux/useless-if-before-free ++++ b/build-aux/useless-if-before-free +@@ -36,12 +36,14 @@ + eval 'exec perl -wSx "$0" "$@"' + if 0; + +-my $VERSION = '2020-04-04 15:07'; # UTC ++my $VERSION = '2021-04-11 10:11'; # UTC + # The definition above must lie within the first 8 lines in order + # for the Emacs time-stamp write hook (at end) to update it. + # If you change this file with Emacs, please let the write hook + # do its job. Otherwise, update this string manually. + ++my $copyright_year = '2021'; ++ + use strict; + use warnings; + use Getopt::Long; +@@ -118,7 +120,19 @@ sub is_NULL ($) + GetOptions + ( + help => sub { usage 0 }, +- version => sub { print "$ME version $VERSION\n"; exit }, ++ version => ++ sub ++ { ++ print "$ME version $VERSION\n"; ++ print "Copyright (C) $copyright_year Free Software Foundation, Inc.\n"; ++ print "License GPLv3+: GNU GPL version 3 or later .\n" ++ . "This is free software: you are free to change and redistribute it.\n" ++ . "There is NO WARRANTY, to the extent permitted by law.\n"; ++ print "\n"; ++ my $author = "Jim Meyering"; ++ print "Written by $author.\n"; ++ exit ++ }, + list => \$list, + 'name=s@' => \@name, + ) or usage 1; +diff --git a/lib/Makefile.am b/lib/Makefile.am +index 02480f6..cb29c31 100644 +--- a/lib/Makefile.am ++++ b/lib/Makefile.am +@@ -288,8 +288,8 @@ arpa/inet.h: arpa_inet.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON + -e 's|@''HAVE_FEATURES_H''@|$(HAVE_FEATURES_H)|g' \ + -e 's|@''NEXT_ARPA_INET_H''@|$(NEXT_ARPA_INET_H)|g' \ + -e 's|@''HAVE_ARPA_INET_H''@|$(HAVE_ARPA_INET_H)|g' \ +- -e 's/@''GNULIB_INET_NTOP''@/$(GNULIB_INET_NTOP)/g' \ +- -e 's/@''GNULIB_INET_PTON''@/$(GNULIB_INET_PTON)/g' \ ++ -e 's/@''GNULIB_INET_NTOP''@/$(GL_GNULIB_INET_NTOP)/g' \ ++ -e 's/@''GNULIB_INET_PTON''@/$(GL_GNULIB_INET_PTON)/g' \ + -e 's|@''HAVE_WS2TCPIP_H''@|$(HAVE_WS2TCPIP_H)|g' \ + -e 's|@''HAVE_DECL_INET_NTOP''@|$(HAVE_DECL_INET_NTOP)|g' \ + -e 's|@''HAVE_DECL_INET_PTON''@|$(HAVE_DECL_INET_PTON)|g' \ +@@ -470,14 +470,14 @@ dirent.h: dirent.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_DIRENT_H''@|$(NEXT_DIRENT_H)|g' \ +- -e 's/@''GNULIB_OPENDIR''@/$(GNULIB_OPENDIR)/g' \ +- -e 's/@''GNULIB_READDIR''@/$(GNULIB_READDIR)/g' \ +- -e 's/@''GNULIB_REWINDDIR''@/$(GNULIB_REWINDDIR)/g' \ +- -e 's/@''GNULIB_CLOSEDIR''@/$(GNULIB_CLOSEDIR)/g' \ +- -e 's/@''GNULIB_DIRFD''@/$(GNULIB_DIRFD)/g' \ +- -e 's/@''GNULIB_FDOPENDIR''@/$(GNULIB_FDOPENDIR)/g' \ +- -e 's/@''GNULIB_SCANDIR''@/$(GNULIB_SCANDIR)/g' \ +- -e 's/@''GNULIB_ALPHASORT''@/$(GNULIB_ALPHASORT)/g' \ ++ -e 's/@''GNULIB_OPENDIR''@/$(GL_GNULIB_OPENDIR)/g' \ ++ -e 's/@''GNULIB_READDIR''@/$(GL_GNULIB_READDIR)/g' \ ++ -e 's/@''GNULIB_REWINDDIR''@/$(GL_GNULIB_REWINDDIR)/g' \ ++ -e 's/@''GNULIB_CLOSEDIR''@/$(GL_GNULIB_CLOSEDIR)/g' \ ++ -e 's/@''GNULIB_DIRFD''@/$(GL_GNULIB_DIRFD)/g' \ ++ -e 's/@''GNULIB_FDOPENDIR''@/$(GL_GNULIB_FDOPENDIR)/g' \ ++ -e 's/@''GNULIB_SCANDIR''@/$(GL_GNULIB_SCANDIR)/g' \ ++ -e 's/@''GNULIB_ALPHASORT''@/$(GL_GNULIB_ALPHASORT)/g' \ + -e 's/@''HAVE_OPENDIR''@/$(HAVE_OPENDIR)/g' \ + -e 's/@''HAVE_READDIR''@/$(HAVE_READDIR)/g' \ + -e 's/@''HAVE_REWINDDIR''@/$(HAVE_REWINDDIR)/g' \ +@@ -543,6 +543,32 @@ EXTRA_libgnu_la_SOURCES += duplocale.c + ## begin gnulib module dynarray + + if gl_GNULIB_ENABLED_dynarray ++BUILT_SOURCES += malloc/dynarray.gl.h malloc/dynarray-skeleton.gl.h ++ ++malloc/dynarray.gl.h: malloc/dynarray.h ++ $(AM_V_at)$(MKDIR_P) malloc ++ $(AM_V_GEN)rm -f $@-t $@ && \ ++ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ ++ sed -e '/libc_hidden_proto/d' < $(srcdir)/malloc/dynarray.h; \ ++ } > $@-t && \ ++ mv $@-t $@ ++MOSTLYCLEANFILES += malloc/dynarray.gl.h malloc/dynarray.gl.h-t ++ ++malloc/dynarray-skeleton.gl.h: malloc/dynarray-skeleton.c ++ $(AM_V_at)$(MKDIR_P) malloc ++ $(AM_V_GEN)rm -f $@-t $@ && \ ++ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ ++ sed -e 's|||g' \ ++ -e 's|__attribute_maybe_unused__|_GL_ATTRIBUTE_MAYBE_UNUSED|g' \ ++ -e 's|__attribute_nonnull__|_GL_ATTRIBUTE_NONNULL|g' \ ++ -e 's|__attribute_warn_unused_result__|_GL_ATTRIBUTE_NODISCARD|g' \ ++ -e 's|__glibc_likely|_GL_LIKELY|g' \ ++ -e 's|__glibc_unlikely|_GL_UNLIKELY|g' \ ++ < $(srcdir)/malloc/dynarray-skeleton.c; \ ++ } > $@-t && \ ++ mv $@-t $@ ++MOSTLYCLEANFILES += malloc/dynarray-skeleton.gl.h malloc/dynarray-skeleton.gl.h-t ++ + libgnu_la_SOURCES += malloc/dynarray_at_failure.c malloc/dynarray_emplace_enlarge.c malloc/dynarray_finalize.c malloc/dynarray_resize.c malloc/dynarray_resize_clear.c + + endif +@@ -620,13 +646,13 @@ fcntl.h: fcntl.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_FCNTL_H''@|$(NEXT_FCNTL_H)|g' \ +- -e 's/@''GNULIB_CREAT''@/$(GNULIB_CREAT)/g' \ +- -e 's/@''GNULIB_FCNTL''@/$(GNULIB_FCNTL)/g' \ +- -e 's/@''GNULIB_NONBLOCKING''@/$(GNULIB_NONBLOCKING)/g' \ +- -e 's/@''GNULIB_OPEN''@/$(GNULIB_OPEN)/g' \ +- -e 's/@''GNULIB_OPENAT''@/$(GNULIB_OPENAT)/g' \ +- -e 's/@''GNULIB_MDA_CREAT''@/$(GNULIB_MDA_CREAT)/g' \ +- -e 's/@''GNULIB_MDA_OPEN''@/$(GNULIB_MDA_OPEN)/g' \ ++ -e 's/@''GNULIB_CREAT''@/$(GL_GNULIB_CREAT)/g' \ ++ -e 's/@''GNULIB_FCNTL''@/$(GL_GNULIB_FCNTL)/g' \ ++ -e 's/@''GNULIB_NONBLOCKING''@/$(GL_GNULIB_NONBLOCKING)/g' \ ++ -e 's/@''GNULIB_OPEN''@/$(GL_GNULIB_OPEN)/g' \ ++ -e 's/@''GNULIB_OPENAT''@/$(GL_GNULIB_OPENAT)/g' \ ++ -e 's/@''GNULIB_MDA_CREAT''@/$(GL_GNULIB_MDA_CREAT)/g' \ ++ -e 's/@''GNULIB_MDA_OPEN''@/$(GL_GNULIB_MDA_OPEN)/g' \ + -e 's|@''HAVE_FCNTL''@|$(HAVE_FCNTL)|g' \ + -e 's|@''HAVE_OPENAT''@|$(HAVE_OPENAT)|g' \ + -e 's|@''REPLACE_CREAT''@|$(REPLACE_CREAT)|g' \ +@@ -930,7 +956,7 @@ iconv.h: iconv.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_ICONV_H''@|$(NEXT_ICONV_H)|g' \ +- -e 's/@''GNULIB_ICONV''@/$(GNULIB_ICONV)/g' \ ++ -e 's/@''GNULIB_ICONV''@/$(GL_GNULIB_ICONV)/g' \ + -e 's|@''ICONV_CONST''@|$(ICONV_CONST)|g' \ + -e 's|@''REPLACE_ICONV''@|$(REPLACE_ICONV)|g' \ + -e 's|@''REPLACE_ICONV_OPEN''@|$(REPLACE_ICONV_OPEN)|g' \ +@@ -984,10 +1010,8 @@ EXTRA_libgnu_la_SOURCES += iconv.c iconv_close.c iconv_open.c + + ## begin gnulib module idx + +-if gl_GNULIB_ENABLED_idx + libgnu_la_SOURCES += idx.h + +-endif + ## end gnulib module idx + + ## begin gnulib module inet_ntop +@@ -1031,10 +1055,10 @@ inttypes.h: inttypes.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_U + -e 's|@''NEXT_INTTYPES_H''@|$(NEXT_INTTYPES_H)|g' \ + -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \ + -e 's/@''PRIPTR_PREFIX''@/$(PRIPTR_PREFIX)/g' \ +- -e 's/@''GNULIB_IMAXABS''@/$(GNULIB_IMAXABS)/g' \ +- -e 's/@''GNULIB_IMAXDIV''@/$(GNULIB_IMAXDIV)/g' \ +- -e 's/@''GNULIB_STRTOIMAX''@/$(GNULIB_STRTOIMAX)/g' \ +- -e 's/@''GNULIB_STRTOUMAX''@/$(GNULIB_STRTOUMAX)/g' \ ++ -e 's/@''GNULIB_IMAXABS''@/$(GL_GNULIB_IMAXABS)/g' \ ++ -e 's/@''GNULIB_IMAXDIV''@/$(GL_GNULIB_IMAXDIV)/g' \ ++ -e 's/@''GNULIB_STRTOIMAX''@/$(GL_GNULIB_STRTOIMAX)/g' \ ++ -e 's/@''GNULIB_STRTOUMAX''@/$(GL_GNULIB_STRTOUMAX)/g' \ + -e 's/@''HAVE_DECL_IMAXABS''@/$(HAVE_DECL_IMAXABS)/g' \ + -e 's/@''HAVE_DECL_IMAXDIV''@/$(HAVE_DECL_IMAXDIV)/g' \ + -e 's/@''HAVE_DECL_STRTOIMAX''@/$(HAVE_DECL_STRTOIMAX)/g' \ +@@ -1151,7 +1175,7 @@ langinfo.h: langinfo.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_U + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_LANGINFO_H''@|$(NEXT_LANGINFO_H)|g' \ +- -e 's/@''GNULIB_NL_LANGINFO''@/$(GNULIB_NL_LANGINFO)/g' \ ++ -e 's/@''GNULIB_NL_LANGINFO''@/$(GL_GNULIB_NL_LANGINFO)/g' \ + -e 's|@''HAVE_LANGINFO_CODESET''@|$(HAVE_LANGINFO_CODESET)|g' \ + -e 's|@''HAVE_LANGINFO_T_FMT_AMPM''@|$(HAVE_LANGINFO_T_FMT_AMPM)|g' \ + -e 's|@''HAVE_LANGINFO_ALTMON''@|$(HAVE_LANGINFO_ALTMON)|g' \ +@@ -1264,11 +1288,11 @@ locale.h: locale.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_LOCALE_H''@|$(NEXT_LOCALE_H)|g' \ +- -e 's/@''GNULIB_LOCALECONV''@/$(GNULIB_LOCALECONV)/g' \ +- -e 's/@''GNULIB_SETLOCALE''@/$(GNULIB_SETLOCALE)/g' \ +- -e 's/@''GNULIB_SETLOCALE_NULL''@/$(GNULIB_SETLOCALE_NULL)/g' \ +- -e 's/@''GNULIB_DUPLOCALE''@/$(GNULIB_DUPLOCALE)/g' \ +- -e 's/@''GNULIB_LOCALENAME''@/$(GNULIB_LOCALENAME)/g' \ ++ -e 's/@''GNULIB_LOCALECONV''@/$(GL_GNULIB_LOCALECONV)/g' \ ++ -e 's/@''GNULIB_SETLOCALE''@/$(GL_GNULIB_SETLOCALE)/g' \ ++ -e 's/@''GNULIB_SETLOCALE_NULL''@/$(GL_GNULIB_SETLOCALE_NULL)/g' \ ++ -e 's/@''GNULIB_DUPLOCALE''@/$(GL_GNULIB_DUPLOCALE)/g' \ ++ -e 's/@''GNULIB_LOCALENAME''@/$(GL_GNULIB_LOCALENAME)/g' \ + -e 's|@''HAVE_NEWLOCALE''@|$(HAVE_NEWLOCALE)|g' \ + -e 's|@''HAVE_DUPLOCALE''@|$(HAVE_DUPLOCALE)|g' \ + -e 's|@''HAVE_FREELOCALE''@|$(HAVE_FREELOCALE)|g' \ +@@ -1379,108 +1403,108 @@ math.h: math.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $( + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_AS_FIRST_DIRECTIVE_MATH_H''@|$(NEXT_AS_FIRST_DIRECTIVE_MATH_H)|g' \ +- -e 's/@''GNULIB_ACOSF''@/$(GNULIB_ACOSF)/g' \ +- -e 's/@''GNULIB_ACOSL''@/$(GNULIB_ACOSL)/g' \ +- -e 's/@''GNULIB_ASINF''@/$(GNULIB_ASINF)/g' \ +- -e 's/@''GNULIB_ASINL''@/$(GNULIB_ASINL)/g' \ +- -e 's/@''GNULIB_ATANF''@/$(GNULIB_ATANF)/g' \ +- -e 's/@''GNULIB_ATANL''@/$(GNULIB_ATANL)/g' \ +- -e 's/@''GNULIB_ATAN2F''@/$(GNULIB_ATAN2F)/g' \ +- -e 's/@''GNULIB_CBRT''@/$(GNULIB_CBRT)/g' \ +- -e 's/@''GNULIB_CBRTF''@/$(GNULIB_CBRTF)/g' \ +- -e 's/@''GNULIB_CBRTL''@/$(GNULIB_CBRTL)/g' \ +- -e 's/@''GNULIB_CEIL''@/$(GNULIB_CEIL)/g' \ +- -e 's/@''GNULIB_CEILF''@/$(GNULIB_CEILF)/g' \ +- -e 's/@''GNULIB_CEILL''@/$(GNULIB_CEILL)/g' \ +- -e 's/@''GNULIB_COPYSIGN''@/$(GNULIB_COPYSIGN)/g' \ +- -e 's/@''GNULIB_COPYSIGNF''@/$(GNULIB_COPYSIGNF)/g' \ +- -e 's/@''GNULIB_COPYSIGNL''@/$(GNULIB_COPYSIGNL)/g' \ +- -e 's/@''GNULIB_COSF''@/$(GNULIB_COSF)/g' \ +- -e 's/@''GNULIB_COSL''@/$(GNULIB_COSL)/g' \ +- -e 's/@''GNULIB_COSHF''@/$(GNULIB_COSHF)/g' \ +- -e 's/@''GNULIB_EXPF''@/$(GNULIB_EXPF)/g' \ +- -e 's/@''GNULIB_EXPL''@/$(GNULIB_EXPL)/g' \ +- -e 's/@''GNULIB_EXP2''@/$(GNULIB_EXP2)/g' \ +- -e 's/@''GNULIB_EXP2F''@/$(GNULIB_EXP2F)/g' \ +- -e 's/@''GNULIB_EXP2L''@/$(GNULIB_EXP2L)/g' \ +- -e 's/@''GNULIB_EXPM1''@/$(GNULIB_EXPM1)/g' \ +- -e 's/@''GNULIB_EXPM1F''@/$(GNULIB_EXPM1F)/g' \ +- -e 's/@''GNULIB_EXPM1L''@/$(GNULIB_EXPM1L)/g' \ +- -e 's/@''GNULIB_FABSF''@/$(GNULIB_FABSF)/g' \ +- -e 's/@''GNULIB_FABSL''@/$(GNULIB_FABSL)/g' \ +- -e 's/@''GNULIB_FLOOR''@/$(GNULIB_FLOOR)/g' \ +- -e 's/@''GNULIB_FLOORF''@/$(GNULIB_FLOORF)/g' \ +- -e 's/@''GNULIB_FLOORL''@/$(GNULIB_FLOORL)/g' \ +- -e 's/@''GNULIB_FMA''@/$(GNULIB_FMA)/g' \ +- -e 's/@''GNULIB_FMAF''@/$(GNULIB_FMAF)/g' \ +- -e 's/@''GNULIB_FMAL''@/$(GNULIB_FMAL)/g' \ +- -e 's/@''GNULIB_FMOD''@/$(GNULIB_FMOD)/g' \ +- -e 's/@''GNULIB_FMODF''@/$(GNULIB_FMODF)/g' \ +- -e 's/@''GNULIB_FMODL''@/$(GNULIB_FMODL)/g' \ +- -e 's/@''GNULIB_FREXPF''@/$(GNULIB_FREXPF)/g' \ +- -e 's/@''GNULIB_FREXP''@/$(GNULIB_FREXP)/g' \ +- -e 's/@''GNULIB_FREXPL''@/$(GNULIB_FREXPL)/g' \ +- -e 's/@''GNULIB_HYPOT''@/$(GNULIB_HYPOT)/g' \ +- -e 's/@''GNULIB_HYPOTF''@/$(GNULIB_HYPOTF)/g' \ +- -e 's/@''GNULIB_HYPOTL''@/$(GNULIB_HYPOTL)/g' \ ++ -e 's/@''GNULIB_ACOSF''@/$(GL_GNULIB_ACOSF)/g' \ ++ -e 's/@''GNULIB_ACOSL''@/$(GL_GNULIB_ACOSL)/g' \ ++ -e 's/@''GNULIB_ASINF''@/$(GL_GNULIB_ASINF)/g' \ ++ -e 's/@''GNULIB_ASINL''@/$(GL_GNULIB_ASINL)/g' \ ++ -e 's/@''GNULIB_ATANF''@/$(GL_GNULIB_ATANF)/g' \ ++ -e 's/@''GNULIB_ATANL''@/$(GL_GNULIB_ATANL)/g' \ ++ -e 's/@''GNULIB_ATAN2F''@/$(GL_GNULIB_ATAN2F)/g' \ ++ -e 's/@''GNULIB_CBRT''@/$(GL_GNULIB_CBRT)/g' \ ++ -e 's/@''GNULIB_CBRTF''@/$(GL_GNULIB_CBRTF)/g' \ ++ -e 's/@''GNULIB_CBRTL''@/$(GL_GNULIB_CBRTL)/g' \ ++ -e 's/@''GNULIB_CEIL''@/$(GL_GNULIB_CEIL)/g' \ ++ -e 's/@''GNULIB_CEILF''@/$(GL_GNULIB_CEILF)/g' \ ++ -e 's/@''GNULIB_CEILL''@/$(GL_GNULIB_CEILL)/g' \ ++ -e 's/@''GNULIB_COPYSIGN''@/$(GL_GNULIB_COPYSIGN)/g' \ ++ -e 's/@''GNULIB_COPYSIGNF''@/$(GL_GNULIB_COPYSIGNF)/g' \ ++ -e 's/@''GNULIB_COPYSIGNL''@/$(GL_GNULIB_COPYSIGNL)/g' \ ++ -e 's/@''GNULIB_COSF''@/$(GL_GNULIB_COSF)/g' \ ++ -e 's/@''GNULIB_COSL''@/$(GL_GNULIB_COSL)/g' \ ++ -e 's/@''GNULIB_COSHF''@/$(GL_GNULIB_COSHF)/g' \ ++ -e 's/@''GNULIB_EXPF''@/$(GL_GNULIB_EXPF)/g' \ ++ -e 's/@''GNULIB_EXPL''@/$(GL_GNULIB_EXPL)/g' \ ++ -e 's/@''GNULIB_EXP2''@/$(GL_GNULIB_EXP2)/g' \ ++ -e 's/@''GNULIB_EXP2F''@/$(GL_GNULIB_EXP2F)/g' \ ++ -e 's/@''GNULIB_EXP2L''@/$(GL_GNULIB_EXP2L)/g' \ ++ -e 's/@''GNULIB_EXPM1''@/$(GL_GNULIB_EXPM1)/g' \ ++ -e 's/@''GNULIB_EXPM1F''@/$(GL_GNULIB_EXPM1F)/g' \ ++ -e 's/@''GNULIB_EXPM1L''@/$(GL_GNULIB_EXPM1L)/g' \ ++ -e 's/@''GNULIB_FABSF''@/$(GL_GNULIB_FABSF)/g' \ ++ -e 's/@''GNULIB_FABSL''@/$(GL_GNULIB_FABSL)/g' \ ++ -e 's/@''GNULIB_FLOOR''@/$(GL_GNULIB_FLOOR)/g' \ ++ -e 's/@''GNULIB_FLOORF''@/$(GL_GNULIB_FLOORF)/g' \ ++ -e 's/@''GNULIB_FLOORL''@/$(GL_GNULIB_FLOORL)/g' \ ++ -e 's/@''GNULIB_FMA''@/$(GL_GNULIB_FMA)/g' \ ++ -e 's/@''GNULIB_FMAF''@/$(GL_GNULIB_FMAF)/g' \ ++ -e 's/@''GNULIB_FMAL''@/$(GL_GNULIB_FMAL)/g' \ ++ -e 's/@''GNULIB_FMOD''@/$(GL_GNULIB_FMOD)/g' \ ++ -e 's/@''GNULIB_FMODF''@/$(GL_GNULIB_FMODF)/g' \ ++ -e 's/@''GNULIB_FMODL''@/$(GL_GNULIB_FMODL)/g' \ ++ -e 's/@''GNULIB_FREXPF''@/$(GL_GNULIB_FREXPF)/g' \ ++ -e 's/@''GNULIB_FREXP''@/$(GL_GNULIB_FREXP)/g' \ ++ -e 's/@''GNULIB_FREXPL''@/$(GL_GNULIB_FREXPL)/g' \ ++ -e 's/@''GNULIB_HYPOT''@/$(GL_GNULIB_HYPOT)/g' \ ++ -e 's/@''GNULIB_HYPOTF''@/$(GL_GNULIB_HYPOTF)/g' \ ++ -e 's/@''GNULIB_HYPOTL''@/$(GL_GNULIB_HYPOTL)/g' \ + < $(srcdir)/math.in.h | \ +- sed -e 's/@''GNULIB_ILOGB''@/$(GNULIB_ILOGB)/g' \ +- -e 's/@''GNULIB_ILOGBF''@/$(GNULIB_ILOGBF)/g' \ +- -e 's/@''GNULIB_ILOGBL''@/$(GNULIB_ILOGBL)/g' \ +- -e 's/@''GNULIB_ISFINITE''@/$(GNULIB_ISFINITE)/g' \ +- -e 's/@''GNULIB_ISINF''@/$(GNULIB_ISINF)/g' \ +- -e 's/@''GNULIB_ISNAN''@/$(GNULIB_ISNAN)/g' \ +- -e 's/@''GNULIB_ISNANF''@/$(GNULIB_ISNANF)/g' \ +- -e 's/@''GNULIB_ISNAND''@/$(GNULIB_ISNAND)/g' \ +- -e 's/@''GNULIB_ISNANL''@/$(GNULIB_ISNANL)/g' \ +- -e 's/@''GNULIB_LDEXPF''@/$(GNULIB_LDEXPF)/g' \ +- -e 's/@''GNULIB_LDEXPL''@/$(GNULIB_LDEXPL)/g' \ +- -e 's/@''GNULIB_LOG''@/$(GNULIB_LOG)/g' \ +- -e 's/@''GNULIB_LOGF''@/$(GNULIB_LOGF)/g' \ +- -e 's/@''GNULIB_LOGL''@/$(GNULIB_LOGL)/g' \ +- -e 's/@''GNULIB_LOG10''@/$(GNULIB_LOG10)/g' \ +- -e 's/@''GNULIB_LOG10F''@/$(GNULIB_LOG10F)/g' \ +- -e 's/@''GNULIB_LOG10L''@/$(GNULIB_LOG10L)/g' \ +- -e 's/@''GNULIB_LOG1P''@/$(GNULIB_LOG1P)/g' \ +- -e 's/@''GNULIB_LOG1PF''@/$(GNULIB_LOG1PF)/g' \ +- -e 's/@''GNULIB_LOG1PL''@/$(GNULIB_LOG1PL)/g' \ +- -e 's/@''GNULIB_LOG2''@/$(GNULIB_LOG2)/g' \ +- -e 's/@''GNULIB_LOG2F''@/$(GNULIB_LOG2F)/g' \ +- -e 's/@''GNULIB_LOG2L''@/$(GNULIB_LOG2L)/g' \ +- -e 's/@''GNULIB_LOGB''@/$(GNULIB_LOGB)/g' \ +- -e 's/@''GNULIB_LOGBF''@/$(GNULIB_LOGBF)/g' \ +- -e 's/@''GNULIB_LOGBL''@/$(GNULIB_LOGBL)/g' \ +- -e 's/@''GNULIB_MODF''@/$(GNULIB_MODF)/g' \ +- -e 's/@''GNULIB_MODFF''@/$(GNULIB_MODFF)/g' \ +- -e 's/@''GNULIB_MODFL''@/$(GNULIB_MODFL)/g' \ +- -e 's/@''GNULIB_POWF''@/$(GNULIB_POWF)/g' \ +- -e 's/@''GNULIB_REMAINDER''@/$(GNULIB_REMAINDER)/g' \ +- -e 's/@''GNULIB_REMAINDERF''@/$(GNULIB_REMAINDERF)/g' \ +- -e 's/@''GNULIB_REMAINDERL''@/$(GNULIB_REMAINDERL)/g' \ +- -e 's/@''GNULIB_RINT''@/$(GNULIB_RINT)/g' \ +- -e 's/@''GNULIB_RINTF''@/$(GNULIB_RINTF)/g' \ +- -e 's/@''GNULIB_RINTL''@/$(GNULIB_RINTL)/g' \ +- -e 's/@''GNULIB_ROUND''@/$(GNULIB_ROUND)/g' \ +- -e 's/@''GNULIB_ROUNDF''@/$(GNULIB_ROUNDF)/g' \ +- -e 's/@''GNULIB_ROUNDL''@/$(GNULIB_ROUNDL)/g' \ +- -e 's/@''GNULIB_SIGNBIT''@/$(GNULIB_SIGNBIT)/g' \ +- -e 's/@''GNULIB_SINF''@/$(GNULIB_SINF)/g' \ +- -e 's/@''GNULIB_SINL''@/$(GNULIB_SINL)/g' \ +- -e 's/@''GNULIB_SINHF''@/$(GNULIB_SINHF)/g' \ +- -e 's/@''GNULIB_SQRTF''@/$(GNULIB_SQRTF)/g' \ +- -e 's/@''GNULIB_SQRTL''@/$(GNULIB_SQRTL)/g' \ +- -e 's/@''GNULIB_TANF''@/$(GNULIB_TANF)/g' \ +- -e 's/@''GNULIB_TANL''@/$(GNULIB_TANL)/g' \ +- -e 's/@''GNULIB_TANHF''@/$(GNULIB_TANHF)/g' \ +- -e 's/@''GNULIB_TRUNC''@/$(GNULIB_TRUNC)/g' \ +- -e 's/@''GNULIB_TRUNCF''@/$(GNULIB_TRUNCF)/g' \ +- -e 's/@''GNULIB_TRUNCL''@/$(GNULIB_TRUNCL)/g' \ +- -e 's/@''GNULIB_MDA_J0''@/$(GNULIB_MDA_J0)/g' \ +- -e 's/@''GNULIB_MDA_J1''@/$(GNULIB_MDA_J1)/g' \ +- -e 's/@''GNULIB_MDA_JN''@/$(GNULIB_MDA_JN)/g' \ +- -e 's/@''GNULIB_MDA_Y0''@/$(GNULIB_MDA_Y0)/g' \ +- -e 's/@''GNULIB_MDA_Y1''@/$(GNULIB_MDA_Y1)/g' \ +- -e 's/@''GNULIB_MDA_YN''@/$(GNULIB_MDA_YN)/g' \ ++ sed -e 's/@''GNULIB_ILOGB''@/$(GL_GNULIB_ILOGB)/g' \ ++ -e 's/@''GNULIB_ILOGBF''@/$(GL_GNULIB_ILOGBF)/g' \ ++ -e 's/@''GNULIB_ILOGBL''@/$(GL_GNULIB_ILOGBL)/g' \ ++ -e 's/@''GNULIB_ISFINITE''@/$(GL_GNULIB_ISFINITE)/g' \ ++ -e 's/@''GNULIB_ISINF''@/$(GL_GNULIB_ISINF)/g' \ ++ -e 's/@''GNULIB_ISNAN''@/$(GL_GNULIB_ISNAN)/g' \ ++ -e 's/@''GNULIB_ISNANF''@/$(GL_GNULIB_ISNANF)/g' \ ++ -e 's/@''GNULIB_ISNAND''@/$(GL_GNULIB_ISNAND)/g' \ ++ -e 's/@''GNULIB_ISNANL''@/$(GL_GNULIB_ISNANL)/g' \ ++ -e 's/@''GNULIB_LDEXPF''@/$(GL_GNULIB_LDEXPF)/g' \ ++ -e 's/@''GNULIB_LDEXPL''@/$(GL_GNULIB_LDEXPL)/g' \ ++ -e 's/@''GNULIB_LOG''@/$(GL_GNULIB_LOG)/g' \ ++ -e 's/@''GNULIB_LOGF''@/$(GL_GNULIB_LOGF)/g' \ ++ -e 's/@''GNULIB_LOGL''@/$(GL_GNULIB_LOGL)/g' \ ++ -e 's/@''GNULIB_LOG10''@/$(GL_GNULIB_LOG10)/g' \ ++ -e 's/@''GNULIB_LOG10F''@/$(GL_GNULIB_LOG10F)/g' \ ++ -e 's/@''GNULIB_LOG10L''@/$(GL_GNULIB_LOG10L)/g' \ ++ -e 's/@''GNULIB_LOG1P''@/$(GL_GNULIB_LOG1P)/g' \ ++ -e 's/@''GNULIB_LOG1PF''@/$(GL_GNULIB_LOG1PF)/g' \ ++ -e 's/@''GNULIB_LOG1PL''@/$(GL_GNULIB_LOG1PL)/g' \ ++ -e 's/@''GNULIB_LOG2''@/$(GL_GNULIB_LOG2)/g' \ ++ -e 's/@''GNULIB_LOG2F''@/$(GL_GNULIB_LOG2F)/g' \ ++ -e 's/@''GNULIB_LOG2L''@/$(GL_GNULIB_LOG2L)/g' \ ++ -e 's/@''GNULIB_LOGB''@/$(GL_GNULIB_LOGB)/g' \ ++ -e 's/@''GNULIB_LOGBF''@/$(GL_GNULIB_LOGBF)/g' \ ++ -e 's/@''GNULIB_LOGBL''@/$(GL_GNULIB_LOGBL)/g' \ ++ -e 's/@''GNULIB_MODF''@/$(GL_GNULIB_MODF)/g' \ ++ -e 's/@''GNULIB_MODFF''@/$(GL_GNULIB_MODFF)/g' \ ++ -e 's/@''GNULIB_MODFL''@/$(GL_GNULIB_MODFL)/g' \ ++ -e 's/@''GNULIB_POWF''@/$(GL_GNULIB_POWF)/g' \ ++ -e 's/@''GNULIB_REMAINDER''@/$(GL_GNULIB_REMAINDER)/g' \ ++ -e 's/@''GNULIB_REMAINDERF''@/$(GL_GNULIB_REMAINDERF)/g' \ ++ -e 's/@''GNULIB_REMAINDERL''@/$(GL_GNULIB_REMAINDERL)/g' \ ++ -e 's/@''GNULIB_RINT''@/$(GL_GNULIB_RINT)/g' \ ++ -e 's/@''GNULIB_RINTF''@/$(GL_GNULIB_RINTF)/g' \ ++ -e 's/@''GNULIB_RINTL''@/$(GL_GNULIB_RINTL)/g' \ ++ -e 's/@''GNULIB_ROUND''@/$(GL_GNULIB_ROUND)/g' \ ++ -e 's/@''GNULIB_ROUNDF''@/$(GL_GNULIB_ROUNDF)/g' \ ++ -e 's/@''GNULIB_ROUNDL''@/$(GL_GNULIB_ROUNDL)/g' \ ++ -e 's/@''GNULIB_SIGNBIT''@/$(GL_GNULIB_SIGNBIT)/g' \ ++ -e 's/@''GNULIB_SINF''@/$(GL_GNULIB_SINF)/g' \ ++ -e 's/@''GNULIB_SINL''@/$(GL_GNULIB_SINL)/g' \ ++ -e 's/@''GNULIB_SINHF''@/$(GL_GNULIB_SINHF)/g' \ ++ -e 's/@''GNULIB_SQRTF''@/$(GL_GNULIB_SQRTF)/g' \ ++ -e 's/@''GNULIB_SQRTL''@/$(GL_GNULIB_SQRTL)/g' \ ++ -e 's/@''GNULIB_TANF''@/$(GL_GNULIB_TANF)/g' \ ++ -e 's/@''GNULIB_TANL''@/$(GL_GNULIB_TANL)/g' \ ++ -e 's/@''GNULIB_TANHF''@/$(GL_GNULIB_TANHF)/g' \ ++ -e 's/@''GNULIB_TRUNC''@/$(GL_GNULIB_TRUNC)/g' \ ++ -e 's/@''GNULIB_TRUNCF''@/$(GL_GNULIB_TRUNCF)/g' \ ++ -e 's/@''GNULIB_TRUNCL''@/$(GL_GNULIB_TRUNCL)/g' \ ++ -e 's/@''GNULIB_MDA_J0''@/$(GL_GNULIB_MDA_J0)/g' \ ++ -e 's/@''GNULIB_MDA_J1''@/$(GL_GNULIB_MDA_J1)/g' \ ++ -e 's/@''GNULIB_MDA_JN''@/$(GL_GNULIB_MDA_JN)/g' \ ++ -e 's/@''GNULIB_MDA_Y0''@/$(GL_GNULIB_MDA_Y0)/g' \ ++ -e 's/@''GNULIB_MDA_Y1''@/$(GL_GNULIB_MDA_Y1)/g' \ ++ -e 's/@''GNULIB_MDA_YN''@/$(GL_GNULIB_MDA_YN)/g' \ + | \ + sed -e 's|@''HAVE_ACOSF''@|$(HAVE_ACOSF)|g' \ + -e 's|@''HAVE_ACOSL''@|$(HAVE_ACOSL)|g' \ +@@ -1804,7 +1828,7 @@ netdb.h: netdb.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_NETDB_H''@|$(NEXT_NETDB_H)|g' \ + -e 's|@''HAVE_NETDB_H''@|$(HAVE_NETDB_H)|g' \ +- -e 's/@''GNULIB_GETADDRINFO''@/$(GNULIB_GETADDRINFO)/g' \ ++ -e 's/@''GNULIB_GETADDRINFO''@/$(GL_GNULIB_GETADDRINFO)/g' \ + -e 's|@''HAVE_STRUCT_ADDRINFO''@|$(HAVE_STRUCT_ADDRINFO)|g' \ + -e 's|@''HAVE_DECL_FREEADDRINFO''@|$(HAVE_DECL_FREEADDRINFO)|g' \ + -e 's|@''HAVE_DECL_GAI_STRERROR''@|$(HAVE_DECL_GAI_STRERROR)|g' \ +@@ -1937,7 +1961,7 @@ poll.h: poll.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_POLL_H''@|$(NEXT_POLL_H)|g' \ +- -e 's/@''GNULIB_POLL''@/$(GNULIB_POLL)/g' \ ++ -e 's/@''GNULIB_POLL''@/$(GL_GNULIB_POLL)/g' \ + -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \ + -e 's|@''HAVE_POLL''@|$(HAVE_POLL)|g' \ + -e 's|@''REPLACE_POLL''@|$(REPLACE_POLL)|g' \ +@@ -2098,6 +2122,21 @@ EXTRA_DIST += same-inode.h + ## begin gnulib module scratch_buffer + + if gl_GNULIB_ENABLED_scratch_buffer ++BUILT_SOURCES += malloc/scratch_buffer.gl.h ++ ++malloc/scratch_buffer.gl.h: malloc/scratch_buffer.h ++ $(AM_V_at)$(MKDIR_P) malloc ++ $(AM_V_GEN)rm -f $@-t $@ && \ ++ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ ++ sed -e 's|__always_inline|inline _GL_ATTRIBUTE_ALWAYS_INLINE|g' \ ++ -e 's|__glibc_likely|_GL_LIKELY|g' \ ++ -e 's|__glibc_unlikely|_GL_UNLIKELY|g' \ ++ -e '/libc_hidden_proto/d' \ ++ < $(srcdir)/malloc/scratch_buffer.h; \ ++ } > $@-t && \ ++ mv $@-t $@ ++MOSTLYCLEANFILES += malloc/scratch_buffer.gl.h malloc/scratch_buffer.gl.h-t ++ + libgnu_la_SOURCES += malloc/scratch_buffer_dupfree.c malloc/scratch_buffer_grow.c malloc/scratch_buffer_grow_preserve.c malloc/scratch_buffer_set_array_size.c + + endif +@@ -2185,11 +2224,11 @@ signal.h: signal.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_SIGNAL_H''@|$(NEXT_SIGNAL_H)|g' \ +- -e 's/@''GNULIB_PTHREAD_SIGMASK''@/$(GNULIB_PTHREAD_SIGMASK)/g' \ +- -e 's/@''GNULIB_RAISE''@/$(GNULIB_RAISE)/g' \ +- -e 's/@''GNULIB_SIGNAL_H_SIGPIPE''@/$(GNULIB_SIGNAL_H_SIGPIPE)/g' \ +- -e 's/@''GNULIB_SIGPROCMASK''@/$(GNULIB_SIGPROCMASK)/g' \ +- -e 's/@''GNULIB_SIGACTION''@/$(GNULIB_SIGACTION)/g' \ ++ -e 's/@''GNULIB_PTHREAD_SIGMASK''@/$(GL_GNULIB_PTHREAD_SIGMASK)/g' \ ++ -e 's/@''GNULIB_RAISE''@/$(GL_GNULIB_RAISE)/g' \ ++ -e 's/@''GNULIB_SIGNAL_H_SIGPIPE''@/$(GL_GNULIB_SIGNAL_H_SIGPIPE)/g' \ ++ -e 's/@''GNULIB_SIGPROCMASK''@/$(GL_GNULIB_SIGPROCMASK)/g' \ ++ -e 's/@''GNULIB_SIGACTION''@/$(GL_GNULIB_SIGACTION)/g' \ + -e 's|@''HAVE_POSIX_SIGNALBLOCKING''@|$(HAVE_POSIX_SIGNALBLOCKING)|g' \ + -e 's|@''HAVE_PTHREAD_SIGMASK''@|$(HAVE_PTHREAD_SIGMASK)|g' \ + -e 's|@''HAVE_RAISE''@|$(HAVE_RAISE)|g' \ +@@ -2442,7 +2481,7 @@ stdint.h: stdint.in.h $(top_builddir)/config.status + -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \ + -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \ + -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \ +- -e 's/@''GNULIB_OVERRIDES_WINT_T''@/$(GNULIB_OVERRIDES_WINT_T)/g' \ ++ -e 's/@''GNULIBHEADERS_OVERRIDE_WINT_T''@/$(GNULIBHEADERS_OVERRIDE_WINT_T)/g' \ + < $(srcdir)/stdint.in.h; \ + } > $@-t && \ + mv $@-t $@ +@@ -2470,65 +2509,65 @@ stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_STDIO_H''@|$(NEXT_STDIO_H)|g' \ +- -e 's/@''GNULIB_DPRINTF''@/$(GNULIB_DPRINTF)/g' \ +- -e 's/@''GNULIB_FCLOSE''@/$(GNULIB_FCLOSE)/g' \ +- -e 's/@''GNULIB_FDOPEN''@/$(GNULIB_FDOPEN)/g' \ +- -e 's/@''GNULIB_FFLUSH''@/$(GNULIB_FFLUSH)/g' \ +- -e 's/@''GNULIB_FGETC''@/$(GNULIB_FGETC)/g' \ +- -e 's/@''GNULIB_FGETS''@/$(GNULIB_FGETS)/g' \ +- -e 's/@''GNULIB_FOPEN''@/$(GNULIB_FOPEN)/g' \ +- -e 's/@''GNULIB_FPRINTF''@/$(GNULIB_FPRINTF)/g' \ +- -e 's/@''GNULIB_FPRINTF_POSIX''@/$(GNULIB_FPRINTF_POSIX)/g' \ +- -e 's/@''GNULIB_FPURGE''@/$(GNULIB_FPURGE)/g' \ +- -e 's/@''GNULIB_FPUTC''@/$(GNULIB_FPUTC)/g' \ +- -e 's/@''GNULIB_FPUTS''@/$(GNULIB_FPUTS)/g' \ +- -e 's/@''GNULIB_FREAD''@/$(GNULIB_FREAD)/g' \ +- -e 's/@''GNULIB_FREOPEN''@/$(GNULIB_FREOPEN)/g' \ +- -e 's/@''GNULIB_FSCANF''@/$(GNULIB_FSCANF)/g' \ +- -e 's/@''GNULIB_FSEEK''@/$(GNULIB_FSEEK)/g' \ +- -e 's/@''GNULIB_FSEEKO''@/$(GNULIB_FSEEKO)/g' \ +- -e 's/@''GNULIB_FTELL''@/$(GNULIB_FTELL)/g' \ +- -e 's/@''GNULIB_FTELLO''@/$(GNULIB_FTELLO)/g' \ +- -e 's/@''GNULIB_FWRITE''@/$(GNULIB_FWRITE)/g' \ +- -e 's/@''GNULIB_GETC''@/$(GNULIB_GETC)/g' \ +- -e 's/@''GNULIB_GETCHAR''@/$(GNULIB_GETCHAR)/g' \ +- -e 's/@''GNULIB_GETDELIM''@/$(GNULIB_GETDELIM)/g' \ +- -e 's/@''GNULIB_GETLINE''@/$(GNULIB_GETLINE)/g' \ +- -e 's/@''GNULIB_OBSTACK_PRINTF''@/$(GNULIB_OBSTACK_PRINTF)/g' \ +- -e 's/@''GNULIB_OBSTACK_PRINTF_POSIX''@/$(GNULIB_OBSTACK_PRINTF_POSIX)/g' \ +- -e 's/@''GNULIB_PCLOSE''@/$(GNULIB_PCLOSE)/g' \ +- -e 's/@''GNULIB_PERROR''@/$(GNULIB_PERROR)/g' \ +- -e 's/@''GNULIB_POPEN''@/$(GNULIB_POPEN)/g' \ +- -e 's/@''GNULIB_PRINTF''@/$(GNULIB_PRINTF)/g' \ +- -e 's/@''GNULIB_PRINTF_POSIX''@/$(GNULIB_PRINTF_POSIX)/g' \ +- -e 's/@''GNULIB_PUTC''@/$(GNULIB_PUTC)/g' \ +- -e 's/@''GNULIB_PUTCHAR''@/$(GNULIB_PUTCHAR)/g' \ +- -e 's/@''GNULIB_PUTS''@/$(GNULIB_PUTS)/g' \ +- -e 's/@''GNULIB_REMOVE''@/$(GNULIB_REMOVE)/g' \ +- -e 's/@''GNULIB_RENAME''@/$(GNULIB_RENAME)/g' \ +- -e 's/@''GNULIB_RENAMEAT''@/$(GNULIB_RENAMEAT)/g' \ +- -e 's/@''GNULIB_SCANF''@/$(GNULIB_SCANF)/g' \ +- -e 's/@''GNULIB_SNPRINTF''@/$(GNULIB_SNPRINTF)/g' \ +- -e 's/@''GNULIB_SPRINTF_POSIX''@/$(GNULIB_SPRINTF_POSIX)/g' \ +- -e 's/@''GNULIB_STDIO_H_NONBLOCKING''@/$(GNULIB_STDIO_H_NONBLOCKING)/g' \ +- -e 's/@''GNULIB_STDIO_H_SIGPIPE''@/$(GNULIB_STDIO_H_SIGPIPE)/g' \ +- -e 's/@''GNULIB_TMPFILE''@/$(GNULIB_TMPFILE)/g' \ +- -e 's/@''GNULIB_VASPRINTF''@/$(GNULIB_VASPRINTF)/g' \ +- -e 's/@''GNULIB_VDPRINTF''@/$(GNULIB_VDPRINTF)/g' \ +- -e 's/@''GNULIB_VFPRINTF''@/$(GNULIB_VFPRINTF)/g' \ +- -e 's/@''GNULIB_VFPRINTF_POSIX''@/$(GNULIB_VFPRINTF_POSIX)/g' \ +- -e 's/@''GNULIB_VFSCANF''@/$(GNULIB_VFSCANF)/g' \ +- -e 's/@''GNULIB_VSCANF''@/$(GNULIB_VSCANF)/g' \ +- -e 's/@''GNULIB_VPRINTF''@/$(GNULIB_VPRINTF)/g' \ +- -e 's/@''GNULIB_VPRINTF_POSIX''@/$(GNULIB_VPRINTF_POSIX)/g' \ +- -e 's/@''GNULIB_VSNPRINTF''@/$(GNULIB_VSNPRINTF)/g' \ +- -e 's/@''GNULIB_VSPRINTF_POSIX''@/$(GNULIB_VSPRINTF_POSIX)/g' \ +- -e 's/@''GNULIB_MDA_FCLOSEALL''@/$(GNULIB_MDA_FCLOSEALL)/g' \ +- -e 's/@''GNULIB_MDA_FDOPEN''@/$(GNULIB_MDA_FDOPEN)/g' \ +- -e 's/@''GNULIB_MDA_FILENO''@/$(GNULIB_MDA_FILENO)/g' \ +- -e 's/@''GNULIB_MDA_GETW''@/$(GNULIB_MDA_GETW)/g' \ +- -e 's/@''GNULIB_MDA_PUTW''@/$(GNULIB_MDA_PUTW)/g' \ +- -e 's/@''GNULIB_MDA_TEMPNAM''@/$(GNULIB_MDA_TEMPNAM)/g' \ ++ -e 's/@''GNULIB_DPRINTF''@/$(GL_GNULIB_DPRINTF)/g' \ ++ -e 's/@''GNULIB_FCLOSE''@/$(GL_GNULIB_FCLOSE)/g' \ ++ -e 's/@''GNULIB_FDOPEN''@/$(GL_GNULIB_FDOPEN)/g' \ ++ -e 's/@''GNULIB_FFLUSH''@/$(GL_GNULIB_FFLUSH)/g' \ ++ -e 's/@''GNULIB_FGETC''@/$(GL_GNULIB_FGETC)/g' \ ++ -e 's/@''GNULIB_FGETS''@/$(GL_GNULIB_FGETS)/g' \ ++ -e 's/@''GNULIB_FOPEN''@/$(GL_GNULIB_FOPEN)/g' \ ++ -e 's/@''GNULIB_FPRINTF''@/$(GL_GNULIB_FPRINTF)/g' \ ++ -e 's/@''GNULIB_FPRINTF_POSIX''@/$(GL_GNULIB_FPRINTF_POSIX)/g' \ ++ -e 's/@''GNULIB_FPURGE''@/$(GL_GNULIB_FPURGE)/g' \ ++ -e 's/@''GNULIB_FPUTC''@/$(GL_GNULIB_FPUTC)/g' \ ++ -e 's/@''GNULIB_FPUTS''@/$(GL_GNULIB_FPUTS)/g' \ ++ -e 's/@''GNULIB_FREAD''@/$(GL_GNULIB_FREAD)/g' \ ++ -e 's/@''GNULIB_FREOPEN''@/$(GL_GNULIB_FREOPEN)/g' \ ++ -e 's/@''GNULIB_FSCANF''@/$(GL_GNULIB_FSCANF)/g' \ ++ -e 's/@''GNULIB_FSEEK''@/$(GL_GNULIB_FSEEK)/g' \ ++ -e 's/@''GNULIB_FSEEKO''@/$(GL_GNULIB_FSEEKO)/g' \ ++ -e 's/@''GNULIB_FTELL''@/$(GL_GNULIB_FTELL)/g' \ ++ -e 's/@''GNULIB_FTELLO''@/$(GL_GNULIB_FTELLO)/g' \ ++ -e 's/@''GNULIB_FWRITE''@/$(GL_GNULIB_FWRITE)/g' \ ++ -e 's/@''GNULIB_GETC''@/$(GL_GNULIB_GETC)/g' \ ++ -e 's/@''GNULIB_GETCHAR''@/$(GL_GNULIB_GETCHAR)/g' \ ++ -e 's/@''GNULIB_GETDELIM''@/$(GL_GNULIB_GETDELIM)/g' \ ++ -e 's/@''GNULIB_GETLINE''@/$(GL_GNULIB_GETLINE)/g' \ ++ -e 's/@''GNULIB_OBSTACK_PRINTF''@/$(GL_GNULIB_OBSTACK_PRINTF)/g' \ ++ -e 's/@''GNULIB_OBSTACK_PRINTF_POSIX''@/$(GL_GNULIB_OBSTACK_PRINTF_POSIX)/g' \ ++ -e 's/@''GNULIB_PCLOSE''@/$(GL_GNULIB_PCLOSE)/g' \ ++ -e 's/@''GNULIB_PERROR''@/$(GL_GNULIB_PERROR)/g' \ ++ -e 's/@''GNULIB_POPEN''@/$(GL_GNULIB_POPEN)/g' \ ++ -e 's/@''GNULIB_PRINTF''@/$(GL_GNULIB_PRINTF)/g' \ ++ -e 's/@''GNULIB_PRINTF_POSIX''@/$(GL_GNULIB_PRINTF_POSIX)/g' \ ++ -e 's/@''GNULIB_PUTC''@/$(GL_GNULIB_PUTC)/g' \ ++ -e 's/@''GNULIB_PUTCHAR''@/$(GL_GNULIB_PUTCHAR)/g' \ ++ -e 's/@''GNULIB_PUTS''@/$(GL_GNULIB_PUTS)/g' \ ++ -e 's/@''GNULIB_REMOVE''@/$(GL_GNULIB_REMOVE)/g' \ ++ -e 's/@''GNULIB_RENAME''@/$(GL_GNULIB_RENAME)/g' \ ++ -e 's/@''GNULIB_RENAMEAT''@/$(GL_GNULIB_RENAMEAT)/g' \ ++ -e 's/@''GNULIB_SCANF''@/$(GL_GNULIB_SCANF)/g' \ ++ -e 's/@''GNULIB_SNPRINTF''@/$(GL_GNULIB_SNPRINTF)/g' \ ++ -e 's/@''GNULIB_SPRINTF_POSIX''@/$(GL_GNULIB_SPRINTF_POSIX)/g' \ ++ -e 's/@''GNULIB_STDIO_H_NONBLOCKING''@/$(GL_GNULIB_STDIO_H_NONBLOCKING)/g' \ ++ -e 's/@''GNULIB_STDIO_H_SIGPIPE''@/$(GL_GNULIB_STDIO_H_SIGPIPE)/g' \ ++ -e 's/@''GNULIB_TMPFILE''@/$(GL_GNULIB_TMPFILE)/g' \ ++ -e 's/@''GNULIB_VASPRINTF''@/$(GL_GNULIB_VASPRINTF)/g' \ ++ -e 's/@''GNULIB_VDPRINTF''@/$(GL_GNULIB_VDPRINTF)/g' \ ++ -e 's/@''GNULIB_VFPRINTF''@/$(GL_GNULIB_VFPRINTF)/g' \ ++ -e 's/@''GNULIB_VFPRINTF_POSIX''@/$(GL_GNULIB_VFPRINTF_POSIX)/g' \ ++ -e 's/@''GNULIB_VFSCANF''@/$(GL_GNULIB_VFSCANF)/g' \ ++ -e 's/@''GNULIB_VSCANF''@/$(GL_GNULIB_VSCANF)/g' \ ++ -e 's/@''GNULIB_VPRINTF''@/$(GL_GNULIB_VPRINTF)/g' \ ++ -e 's/@''GNULIB_VPRINTF_POSIX''@/$(GL_GNULIB_VPRINTF_POSIX)/g' \ ++ -e 's/@''GNULIB_VSNPRINTF''@/$(GL_GNULIB_VSNPRINTF)/g' \ ++ -e 's/@''GNULIB_VSPRINTF_POSIX''@/$(GL_GNULIB_VSPRINTF_POSIX)/g' \ ++ -e 's/@''GNULIB_MDA_FCLOSEALL''@/$(GL_GNULIB_MDA_FCLOSEALL)/g' \ ++ -e 's/@''GNULIB_MDA_FDOPEN''@/$(GL_GNULIB_MDA_FDOPEN)/g' \ ++ -e 's/@''GNULIB_MDA_FILENO''@/$(GL_GNULIB_MDA_FILENO)/g' \ ++ -e 's/@''GNULIB_MDA_GETW''@/$(GL_GNULIB_MDA_GETW)/g' \ ++ -e 's/@''GNULIB_MDA_PUTW''@/$(GL_GNULIB_MDA_PUTW)/g' \ ++ -e 's/@''GNULIB_MDA_TEMPNAM''@/$(GL_GNULIB_MDA_TEMPNAM)/g' \ + < $(srcdir)/stdio.in.h | \ + sed -e 's|@''HAVE_DECL_FCLOSEALL''@|$(HAVE_DECL_FCLOSEALL)|g' \ + -e 's|@''HAVE_DECL_FPURGE''@|$(HAVE_DECL_FPURGE)|g' \ +@@ -2606,51 +2645,51 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_STDLIB_H''@|$(NEXT_STDLIB_H)|g' \ +- -e 's/@''GNULIB__EXIT''@/$(GNULIB__EXIT)/g' \ +- -e 's/@''GNULIB_ALIGNED_ALLOC''@/$(GNULIB_ALIGNED_ALLOC)/g' \ +- -e 's/@''GNULIB_ATOLL''@/$(GNULIB_ATOLL)/g' \ +- -e 's/@''GNULIB_CALLOC_POSIX''@/$(GNULIB_CALLOC_POSIX)/g' \ +- -e 's/@''GNULIB_CANONICALIZE_FILE_NAME''@/$(GNULIB_CANONICALIZE_FILE_NAME)/g' \ +- -e 's/@''GNULIB_FREE_POSIX''@/$(GNULIB_FREE_POSIX)/g' \ +- -e 's/@''GNULIB_GETLOADAVG''@/$(GNULIB_GETLOADAVG)/g' \ +- -e 's/@''GNULIB_GETSUBOPT''@/$(GNULIB_GETSUBOPT)/g' \ +- -e 's/@''GNULIB_GRANTPT''@/$(GNULIB_GRANTPT)/g' \ +- -e 's/@''GNULIB_MALLOC_POSIX''@/$(GNULIB_MALLOC_POSIX)/g' \ +- -e 's/@''GNULIB_MBTOWC''@/$(GNULIB_MBTOWC)/g' \ +- -e 's/@''GNULIB_MKDTEMP''@/$(GNULIB_MKDTEMP)/g' \ +- -e 's/@''GNULIB_MKOSTEMP''@/$(GNULIB_MKOSTEMP)/g' \ +- -e 's/@''GNULIB_MKOSTEMPS''@/$(GNULIB_MKOSTEMPS)/g' \ +- -e 's/@''GNULIB_MKSTEMP''@/$(GNULIB_MKSTEMP)/g' \ +- -e 's/@''GNULIB_MKSTEMPS''@/$(GNULIB_MKSTEMPS)/g' \ +- -e 's/@''GNULIB_POSIX_MEMALIGN''@/$(GNULIB_POSIX_MEMALIGN)/g' \ +- -e 's/@''GNULIB_POSIX_OPENPT''@/$(GNULIB_POSIX_OPENPT)/g' \ +- -e 's/@''GNULIB_PTSNAME''@/$(GNULIB_PTSNAME)/g' \ +- -e 's/@''GNULIB_PTSNAME_R''@/$(GNULIB_PTSNAME_R)/g' \ +- -e 's/@''GNULIB_PUTENV''@/$(GNULIB_PUTENV)/g' \ +- -e 's/@''GNULIB_QSORT_R''@/$(GNULIB_QSORT_R)/g' \ +- -e 's/@''GNULIB_RANDOM''@/$(GNULIB_RANDOM)/g' \ +- -e 's/@''GNULIB_RANDOM_R''@/$(GNULIB_RANDOM_R)/g' \ +- -e 's/@''GNULIB_REALLOC_POSIX''@/$(GNULIB_REALLOC_POSIX)/g' \ +- -e 's/@''GNULIB_REALLOCARRAY''@/$(GNULIB_REALLOCARRAY)/g' \ +- -e 's/@''GNULIB_REALPATH''@/$(GNULIB_REALPATH)/g' \ +- -e 's/@''GNULIB_RPMATCH''@/$(GNULIB_RPMATCH)/g' \ +- -e 's/@''GNULIB_SECURE_GETENV''@/$(GNULIB_SECURE_GETENV)/g' \ +- -e 's/@''GNULIB_SETENV''@/$(GNULIB_SETENV)/g' \ +- -e 's/@''GNULIB_STRTOD''@/$(GNULIB_STRTOD)/g' \ +- -e 's/@''GNULIB_STRTOL''@/$(GNULIB_STRTOL)/g' \ +- -e 's/@''GNULIB_STRTOLD''@/$(GNULIB_STRTOLD)/g' \ +- -e 's/@''GNULIB_STRTOLL''@/$(GNULIB_STRTOLL)/g' \ +- -e 's/@''GNULIB_STRTOUL''@/$(GNULIB_STRTOUL)/g' \ +- -e 's/@''GNULIB_STRTOULL''@/$(GNULIB_STRTOULL)/g' \ +- -e 's/@''GNULIB_SYSTEM_POSIX''@/$(GNULIB_SYSTEM_POSIX)/g' \ +- -e 's/@''GNULIB_UNLOCKPT''@/$(GNULIB_UNLOCKPT)/g' \ +- -e 's/@''GNULIB_UNSETENV''@/$(GNULIB_UNSETENV)/g' \ +- -e 's/@''GNULIB_WCTOMB''@/$(GNULIB_WCTOMB)/g' \ +- -e 's/@''GNULIB_MDA_ECVT''@/$(GNULIB_MDA_ECVT)/g' \ +- -e 's/@''GNULIB_MDA_FCVT''@/$(GNULIB_MDA_FCVT)/g' \ +- -e 's/@''GNULIB_MDA_GCVT''@/$(GNULIB_MDA_GCVT)/g' \ +- -e 's/@''GNULIB_MDA_MKTEMP''@/$(GNULIB_MDA_MKTEMP)/g' \ +- -e 's/@''GNULIB_MDA_PUTENV''@/$(GNULIB_MDA_PUTENV)/g' \ ++ -e 's/@''GNULIB__EXIT''@/$(GL_GNULIB__EXIT)/g' \ ++ -e 's/@''GNULIB_ALIGNED_ALLOC''@/$(GL_GNULIB_ALIGNED_ALLOC)/g' \ ++ -e 's/@''GNULIB_ATOLL''@/$(GL_GNULIB_ATOLL)/g' \ ++ -e 's/@''GNULIB_CALLOC_POSIX''@/$(GL_GNULIB_CALLOC_POSIX)/g' \ ++ -e 's/@''GNULIB_CANONICALIZE_FILE_NAME''@/$(GL_GNULIB_CANONICALIZE_FILE_NAME)/g' \ ++ -e 's/@''GNULIB_FREE_POSIX''@/$(GL_GNULIB_FREE_POSIX)/g' \ ++ -e 's/@''GNULIB_GETLOADAVG''@/$(GL_GNULIB_GETLOADAVG)/g' \ ++ -e 's/@''GNULIB_GETSUBOPT''@/$(GL_GNULIB_GETSUBOPT)/g' \ ++ -e 's/@''GNULIB_GRANTPT''@/$(GL_GNULIB_GRANTPT)/g' \ ++ -e 's/@''GNULIB_MALLOC_POSIX''@/$(GL_GNULIB_MALLOC_POSIX)/g' \ ++ -e 's/@''GNULIB_MBTOWC''@/$(GL_GNULIB_MBTOWC)/g' \ ++ -e 's/@''GNULIB_MKDTEMP''@/$(GL_GNULIB_MKDTEMP)/g' \ ++ -e 's/@''GNULIB_MKOSTEMP''@/$(GL_GNULIB_MKOSTEMP)/g' \ ++ -e 's/@''GNULIB_MKOSTEMPS''@/$(GL_GNULIB_MKOSTEMPS)/g' \ ++ -e 's/@''GNULIB_MKSTEMP''@/$(GL_GNULIB_MKSTEMP)/g' \ ++ -e 's/@''GNULIB_MKSTEMPS''@/$(GL_GNULIB_MKSTEMPS)/g' \ ++ -e 's/@''GNULIB_POSIX_MEMALIGN''@/$(GL_GNULIB_POSIX_MEMALIGN)/g' \ ++ -e 's/@''GNULIB_POSIX_OPENPT''@/$(GL_GNULIB_POSIX_OPENPT)/g' \ ++ -e 's/@''GNULIB_PTSNAME''@/$(GL_GNULIB_PTSNAME)/g' \ ++ -e 's/@''GNULIB_PTSNAME_R''@/$(GL_GNULIB_PTSNAME_R)/g' \ ++ -e 's/@''GNULIB_PUTENV''@/$(GL_GNULIB_PUTENV)/g' \ ++ -e 's/@''GNULIB_QSORT_R''@/$(GL_GNULIB_QSORT_R)/g' \ ++ -e 's/@''GNULIB_RANDOM''@/$(GL_GNULIB_RANDOM)/g' \ ++ -e 's/@''GNULIB_RANDOM_R''@/$(GL_GNULIB_RANDOM_R)/g' \ ++ -e 's/@''GNULIB_REALLOC_POSIX''@/$(GL_GNULIB_REALLOC_POSIX)/g' \ ++ -e 's/@''GNULIB_REALLOCARRAY''@/$(GL_GNULIB_REALLOCARRAY)/g' \ ++ -e 's/@''GNULIB_REALPATH''@/$(GL_GNULIB_REALPATH)/g' \ ++ -e 's/@''GNULIB_RPMATCH''@/$(GL_GNULIB_RPMATCH)/g' \ ++ -e 's/@''GNULIB_SECURE_GETENV''@/$(GL_GNULIB_SECURE_GETENV)/g' \ ++ -e 's/@''GNULIB_SETENV''@/$(GL_GNULIB_SETENV)/g' \ ++ -e 's/@''GNULIB_STRTOD''@/$(GL_GNULIB_STRTOD)/g' \ ++ -e 's/@''GNULIB_STRTOL''@/$(GL_GNULIB_STRTOL)/g' \ ++ -e 's/@''GNULIB_STRTOLD''@/$(GL_GNULIB_STRTOLD)/g' \ ++ -e 's/@''GNULIB_STRTOLL''@/$(GL_GNULIB_STRTOLL)/g' \ ++ -e 's/@''GNULIB_STRTOUL''@/$(GL_GNULIB_STRTOUL)/g' \ ++ -e 's/@''GNULIB_STRTOULL''@/$(GL_GNULIB_STRTOULL)/g' \ ++ -e 's/@''GNULIB_SYSTEM_POSIX''@/$(GL_GNULIB_SYSTEM_POSIX)/g' \ ++ -e 's/@''GNULIB_UNLOCKPT''@/$(GL_GNULIB_UNLOCKPT)/g' \ ++ -e 's/@''GNULIB_UNSETENV''@/$(GL_GNULIB_UNSETENV)/g' \ ++ -e 's/@''GNULIB_WCTOMB''@/$(GL_GNULIB_WCTOMB)/g' \ ++ -e 's/@''GNULIB_MDA_ECVT''@/$(GL_GNULIB_MDA_ECVT)/g' \ ++ -e 's/@''GNULIB_MDA_FCVT''@/$(GL_GNULIB_MDA_FCVT)/g' \ ++ -e 's/@''GNULIB_MDA_GCVT''@/$(GL_GNULIB_MDA_GCVT)/g' \ ++ -e 's/@''GNULIB_MDA_MKTEMP''@/$(GL_GNULIB_MDA_MKTEMP)/g' \ ++ -e 's/@''GNULIB_MDA_PUTENV''@/$(GL_GNULIB_MDA_PUTENV)/g' \ + < $(srcdir)/stdlib.in.h | \ + sed -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \ + -e 's|@''HAVE_ALIGNED_ALLOC''@|$(HAVE_ALIGNED_ALLOC)|g' \ +@@ -2711,6 +2750,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ + -e 's|@''REPLACE_RANDOM''@|$(REPLACE_RANDOM)|g' \ + -e 's|@''REPLACE_RANDOM_R''@|$(REPLACE_RANDOM_R)|g' \ + -e 's|@''REPLACE_REALLOC''@|$(REPLACE_REALLOC)|g' \ ++ -e 's|@''REPLACE_REALLOCARRAY''@|$(REPLACE_REALLOCARRAY)|g' \ + -e 's|@''REPLACE_REALPATH''@|$(REPLACE_REALPATH)|g' \ + -e 's|@''REPLACE_SETENV''@|$(REPLACE_SETENV)|g' \ + -e 's|@''REPLACE_SETSTATE''@|$(REPLACE_SETSTATE)|g' \ +@@ -2779,49 +2819,49 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_STRING_H''@|$(NEXT_STRING_H)|g' \ +- -e 's/@''GNULIB_EXPLICIT_BZERO''@/$(GNULIB_EXPLICIT_BZERO)/g' \ +- -e 's/@''GNULIB_FFSL''@/$(GNULIB_FFSL)/g' \ +- -e 's/@''GNULIB_FFSLL''@/$(GNULIB_FFSLL)/g' \ +- -e 's/@''GNULIB_MBSLEN''@/$(GNULIB_MBSLEN)/g' \ +- -e 's/@''GNULIB_MBSNLEN''@/$(GNULIB_MBSNLEN)/g' \ +- -e 's/@''GNULIB_MBSCHR''@/$(GNULIB_MBSCHR)/g' \ +- -e 's/@''GNULIB_MBSRCHR''@/$(GNULIB_MBSRCHR)/g' \ +- -e 's/@''GNULIB_MBSSTR''@/$(GNULIB_MBSSTR)/g' \ +- -e 's/@''GNULIB_MBSCASECMP''@/$(GNULIB_MBSCASECMP)/g' \ +- -e 's/@''GNULIB_MBSNCASECMP''@/$(GNULIB_MBSNCASECMP)/g' \ +- -e 's/@''GNULIB_MBSPCASECMP''@/$(GNULIB_MBSPCASECMP)/g' \ +- -e 's/@''GNULIB_MBSCASESTR''@/$(GNULIB_MBSCASESTR)/g' \ +- -e 's/@''GNULIB_MBSCSPN''@/$(GNULIB_MBSCSPN)/g' \ +- -e 's/@''GNULIB_MBSPBRK''@/$(GNULIB_MBSPBRK)/g' \ +- -e 's/@''GNULIB_MBSSPN''@/$(GNULIB_MBSSPN)/g' \ +- -e 's/@''GNULIB_MBSSEP''@/$(GNULIB_MBSSEP)/g' \ +- -e 's/@''GNULIB_MBSTOK_R''@/$(GNULIB_MBSTOK_R)/g' \ +- -e 's/@''GNULIB_MEMCHR''@/$(GNULIB_MEMCHR)/g' \ +- -e 's/@''GNULIB_MEMMEM''@/$(GNULIB_MEMMEM)/g' \ +- -e 's/@''GNULIB_MEMPCPY''@/$(GNULIB_MEMPCPY)/g' \ +- -e 's/@''GNULIB_MEMRCHR''@/$(GNULIB_MEMRCHR)/g' \ +- -e 's/@''GNULIB_RAWMEMCHR''@/$(GNULIB_RAWMEMCHR)/g' \ +- -e 's/@''GNULIB_STPCPY''@/$(GNULIB_STPCPY)/g' \ +- -e 's/@''GNULIB_STPNCPY''@/$(GNULIB_STPNCPY)/g' \ +- -e 's/@''GNULIB_STRCHRNUL''@/$(GNULIB_STRCHRNUL)/g' \ +- -e 's/@''GNULIB_STRDUP''@/$(GNULIB_STRDUP)/g' \ +- -e 's/@''GNULIB_STRNCAT''@/$(GNULIB_STRNCAT)/g' \ +- -e 's/@''GNULIB_STRNDUP''@/$(GNULIB_STRNDUP)/g' \ +- -e 's/@''GNULIB_STRNLEN''@/$(GNULIB_STRNLEN)/g' \ +- -e 's/@''GNULIB_STRPBRK''@/$(GNULIB_STRPBRK)/g' \ +- -e 's/@''GNULIB_STRSEP''@/$(GNULIB_STRSEP)/g' \ +- -e 's/@''GNULIB_STRSTR''@/$(GNULIB_STRSTR)/g' \ +- -e 's/@''GNULIB_STRCASESTR''@/$(GNULIB_STRCASESTR)/g' \ +- -e 's/@''GNULIB_STRTOK_R''@/$(GNULIB_STRTOK_R)/g' \ +- -e 's/@''GNULIB_STRERROR''@/$(GNULIB_STRERROR)/g' \ +- -e 's/@''GNULIB_STRERROR_R''@/$(GNULIB_STRERROR_R)/g' \ +- -e 's/@''GNULIB_STRERRORNAME_NP''@/$(GNULIB_STRERRORNAME_NP)/g' \ +- -e 's/@''GNULIB_SIGABBREV_NP''@/$(GNULIB_SIGABBREV_NP)/g' \ +- -e 's/@''GNULIB_SIGDESCR_NP''@/$(GNULIB_SIGDESCR_NP)/g' \ +- -e 's/@''GNULIB_STRSIGNAL''@/$(GNULIB_STRSIGNAL)/g' \ +- -e 's/@''GNULIB_STRVERSCMP''@/$(GNULIB_STRVERSCMP)/g' \ +- -e 's/@''GNULIB_MDA_MEMCCPY''@/$(GNULIB_MDA_MEMCCPY)/g' \ +- -e 's/@''GNULIB_MDA_STRDUP''@/$(GNULIB_MDA_STRDUP)/g' \ ++ -e 's/@''GNULIB_EXPLICIT_BZERO''@/$(GL_GNULIB_EXPLICIT_BZERO)/g' \ ++ -e 's/@''GNULIB_FFSL''@/$(GL_GNULIB_FFSL)/g' \ ++ -e 's/@''GNULIB_FFSLL''@/$(GL_GNULIB_FFSLL)/g' \ ++ -e 's/@''GNULIB_MBSLEN''@/$(GL_GNULIB_MBSLEN)/g' \ ++ -e 's/@''GNULIB_MBSNLEN''@/$(GL_GNULIB_MBSNLEN)/g' \ ++ -e 's/@''GNULIB_MBSCHR''@/$(GL_GNULIB_MBSCHR)/g' \ ++ -e 's/@''GNULIB_MBSRCHR''@/$(GL_GNULIB_MBSRCHR)/g' \ ++ -e 's/@''GNULIB_MBSSTR''@/$(GL_GNULIB_MBSSTR)/g' \ ++ -e 's/@''GNULIB_MBSCASECMP''@/$(GL_GNULIB_MBSCASECMP)/g' \ ++ -e 's/@''GNULIB_MBSNCASECMP''@/$(GL_GNULIB_MBSNCASECMP)/g' \ ++ -e 's/@''GNULIB_MBSPCASECMP''@/$(GL_GNULIB_MBSPCASECMP)/g' \ ++ -e 's/@''GNULIB_MBSCASESTR''@/$(GL_GNULIB_MBSCASESTR)/g' \ ++ -e 's/@''GNULIB_MBSCSPN''@/$(GL_GNULIB_MBSCSPN)/g' \ ++ -e 's/@''GNULIB_MBSPBRK''@/$(GL_GNULIB_MBSPBRK)/g' \ ++ -e 's/@''GNULIB_MBSSPN''@/$(GL_GNULIB_MBSSPN)/g' \ ++ -e 's/@''GNULIB_MBSSEP''@/$(GL_GNULIB_MBSSEP)/g' \ ++ -e 's/@''GNULIB_MBSTOK_R''@/$(GL_GNULIB_MBSTOK_R)/g' \ ++ -e 's/@''GNULIB_MEMCHR''@/$(GL_GNULIB_MEMCHR)/g' \ ++ -e 's/@''GNULIB_MEMMEM''@/$(GL_GNULIB_MEMMEM)/g' \ ++ -e 's/@''GNULIB_MEMPCPY''@/$(GL_GNULIB_MEMPCPY)/g' \ ++ -e 's/@''GNULIB_MEMRCHR''@/$(GL_GNULIB_MEMRCHR)/g' \ ++ -e 's/@''GNULIB_RAWMEMCHR''@/$(GL_GNULIB_RAWMEMCHR)/g' \ ++ -e 's/@''GNULIB_STPCPY''@/$(GL_GNULIB_STPCPY)/g' \ ++ -e 's/@''GNULIB_STPNCPY''@/$(GL_GNULIB_STPNCPY)/g' \ ++ -e 's/@''GNULIB_STRCHRNUL''@/$(GL_GNULIB_STRCHRNUL)/g' \ ++ -e 's/@''GNULIB_STRDUP''@/$(GL_GNULIB_STRDUP)/g' \ ++ -e 's/@''GNULIB_STRNCAT''@/$(GL_GNULIB_STRNCAT)/g' \ ++ -e 's/@''GNULIB_STRNDUP''@/$(GL_GNULIB_STRNDUP)/g' \ ++ -e 's/@''GNULIB_STRNLEN''@/$(GL_GNULIB_STRNLEN)/g' \ ++ -e 's/@''GNULIB_STRPBRK''@/$(GL_GNULIB_STRPBRK)/g' \ ++ -e 's/@''GNULIB_STRSEP''@/$(GL_GNULIB_STRSEP)/g' \ ++ -e 's/@''GNULIB_STRSTR''@/$(GL_GNULIB_STRSTR)/g' \ ++ -e 's/@''GNULIB_STRCASESTR''@/$(GL_GNULIB_STRCASESTR)/g' \ ++ -e 's/@''GNULIB_STRTOK_R''@/$(GL_GNULIB_STRTOK_R)/g' \ ++ -e 's/@''GNULIB_STRERROR''@/$(GL_GNULIB_STRERROR)/g' \ ++ -e 's/@''GNULIB_STRERROR_R''@/$(GL_GNULIB_STRERROR_R)/g' \ ++ -e 's/@''GNULIB_STRERRORNAME_NP''@/$(GL_GNULIB_STRERRORNAME_NP)/g' \ ++ -e 's/@''GNULIB_SIGABBREV_NP''@/$(GL_GNULIB_SIGABBREV_NP)/g' \ ++ -e 's/@''GNULIB_SIGDESCR_NP''@/$(GL_GNULIB_SIGDESCR_NP)/g' \ ++ -e 's/@''GNULIB_STRSIGNAL''@/$(GL_GNULIB_STRSIGNAL)/g' \ ++ -e 's/@''GNULIB_STRVERSCMP''@/$(GL_GNULIB_STRVERSCMP)/g' \ ++ -e 's/@''GNULIB_MDA_MEMCCPY''@/$(GL_GNULIB_MDA_MEMCCPY)/g' \ ++ -e 's/@''GNULIB_MDA_STRDUP''@/$(GL_GNULIB_MDA_STRDUP)/g' \ + < $(srcdir)/string.in.h | \ + sed -e 's|@''HAVE_EXPLICIT_BZERO''@|$(HAVE_EXPLICIT_BZERO)|g' \ + -e 's|@''HAVE_FFSL''@|$(HAVE_FFSL)|g' \ +@@ -2893,7 +2933,7 @@ sys/file.h: sys_file.in.h $(top_builddir)/config.status $(WARN_ON_USE_H) + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_SYS_FILE_H''@|$(NEXT_SYS_FILE_H)|g' \ + -e 's/@''HAVE_FLOCK''@/$(HAVE_FLOCK)/g' \ +- -e 's/@''GNULIB_FLOCK''@/$(GNULIB_FLOCK)/g' \ ++ -e 's/@''GNULIB_FLOCK''@/$(GL_GNULIB_FLOCK)/g' \ + -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ + < $(srcdir)/sys_file.in.h; \ + } > $@-t && \ +@@ -2922,7 +2962,7 @@ sys/random.h: sys_random.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_N + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_SYS_RANDOM_H''@|$(NEXT_SYS_RANDOM_H)|g' \ + -e 's|@''HAVE_SYS_RANDOM_H''@|$(HAVE_SYS_RANDOM_H)|g' \ +- -e 's/@''GNULIB_GETRANDOM''@/$(GNULIB_GETRANDOM)/g' \ ++ -e 's/@''GNULIB_GETRANDOM''@/$(GL_GNULIB_GETRANDOM)/g' \ + -e 's/@''HAVE_GETRANDOM''@/$(HAVE_GETRANDOM)/g' \ + -e 's/@''REPLACE_GETRANDOM''@/$(REPLACE_GETRANDOM)/g' \ + -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ +@@ -2955,8 +2995,8 @@ sys/select.h: sys_select.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_SYS_SELECT_H''@|$(NEXT_SYS_SELECT_H)|g' \ + -e 's|@''HAVE_SYS_SELECT_H''@|$(HAVE_SYS_SELECT_H)|g' \ +- -e 's/@''GNULIB_PSELECT''@/$(GNULIB_PSELECT)/g' \ +- -e 's/@''GNULIB_SELECT''@/$(GNULIB_SELECT)/g' \ ++ -e 's/@''GNULIB_PSELECT''@/$(GL_GNULIB_PSELECT)/g' \ ++ -e 's/@''GNULIB_SELECT''@/$(GL_GNULIB_SELECT)/g' \ + -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \ + -e 's|@''HAVE_PSELECT''@|$(HAVE_PSELECT)|g' \ + -e 's|@''REPLACE_PSELECT''@|$(REPLACE_PSELECT)|g' \ +@@ -2990,22 +3030,22 @@ sys/socket.h: sys_socket.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_SYS_SOCKET_H''@|$(NEXT_SYS_SOCKET_H)|g' \ + -e 's|@''HAVE_SYS_SOCKET_H''@|$(HAVE_SYS_SOCKET_H)|g' \ +- -e 's/@''GNULIB_CLOSE''@/$(GNULIB_CLOSE)/g' \ +- -e 's/@''GNULIB_SOCKET''@/$(GNULIB_SOCKET)/g' \ +- -e 's/@''GNULIB_CONNECT''@/$(GNULIB_CONNECT)/g' \ +- -e 's/@''GNULIB_ACCEPT''@/$(GNULIB_ACCEPT)/g' \ +- -e 's/@''GNULIB_BIND''@/$(GNULIB_BIND)/g' \ +- -e 's/@''GNULIB_GETPEERNAME''@/$(GNULIB_GETPEERNAME)/g' \ +- -e 's/@''GNULIB_GETSOCKNAME''@/$(GNULIB_GETSOCKNAME)/g' \ +- -e 's/@''GNULIB_GETSOCKOPT''@/$(GNULIB_GETSOCKOPT)/g' \ +- -e 's/@''GNULIB_LISTEN''@/$(GNULIB_LISTEN)/g' \ +- -e 's/@''GNULIB_RECV''@/$(GNULIB_RECV)/g' \ +- -e 's/@''GNULIB_SEND''@/$(GNULIB_SEND)/g' \ +- -e 's/@''GNULIB_RECVFROM''@/$(GNULIB_RECVFROM)/g' \ +- -e 's/@''GNULIB_SENDTO''@/$(GNULIB_SENDTO)/g' \ +- -e 's/@''GNULIB_SETSOCKOPT''@/$(GNULIB_SETSOCKOPT)/g' \ +- -e 's/@''GNULIB_SHUTDOWN''@/$(GNULIB_SHUTDOWN)/g' \ +- -e 's/@''GNULIB_ACCEPT4''@/$(GNULIB_ACCEPT4)/g' \ ++ -e 's/@''GNULIB_CLOSE''@/$(GL_GNULIB_CLOSE)/g' \ ++ -e 's/@''GNULIB_SOCKET''@/$(GL_GNULIB_SOCKET)/g' \ ++ -e 's/@''GNULIB_CONNECT''@/$(GL_GNULIB_CONNECT)/g' \ ++ -e 's/@''GNULIB_ACCEPT''@/$(GL_GNULIB_ACCEPT)/g' \ ++ -e 's/@''GNULIB_BIND''@/$(GL_GNULIB_BIND)/g' \ ++ -e 's/@''GNULIB_GETPEERNAME''@/$(GL_GNULIB_GETPEERNAME)/g' \ ++ -e 's/@''GNULIB_GETSOCKNAME''@/$(GL_GNULIB_GETSOCKNAME)/g' \ ++ -e 's/@''GNULIB_GETSOCKOPT''@/$(GL_GNULIB_GETSOCKOPT)/g' \ ++ -e 's/@''GNULIB_LISTEN''@/$(GL_GNULIB_LISTEN)/g' \ ++ -e 's/@''GNULIB_RECV''@/$(GL_GNULIB_RECV)/g' \ ++ -e 's/@''GNULIB_SEND''@/$(GL_GNULIB_SEND)/g' \ ++ -e 's/@''GNULIB_RECVFROM''@/$(GL_GNULIB_RECVFROM)/g' \ ++ -e 's/@''GNULIB_SENDTO''@/$(GL_GNULIB_SENDTO)/g' \ ++ -e 's/@''GNULIB_SETSOCKOPT''@/$(GL_GNULIB_SETSOCKOPT)/g' \ ++ -e 's/@''GNULIB_SHUTDOWN''@/$(GL_GNULIB_SHUTDOWN)/g' \ ++ -e 's/@''GNULIB_ACCEPT4''@/$(GL_GNULIB_ACCEPT4)/g' \ + -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \ + -e 's|@''HAVE_WS2TCPIP_H''@|$(HAVE_WS2TCPIP_H)|g' \ + -e 's|@''HAVE_STRUCT_SOCKADDR_STORAGE''@|$(HAVE_STRUCT_SOCKADDR_STORAGE)|g' \ +@@ -3042,25 +3082,25 @@ sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU + -e 's|@''NEXT_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \ + -e 's|@''WINDOWS_64_BIT_ST_SIZE''@|$(WINDOWS_64_BIT_ST_SIZE)|g' \ + -e 's|@''WINDOWS_STAT_TIMESPEC''@|$(WINDOWS_STAT_TIMESPEC)|g' \ +- -e 's/@''GNULIB_FCHMODAT''@/$(GNULIB_FCHMODAT)/g' \ +- -e 's/@''GNULIB_FSTAT''@/$(GNULIB_FSTAT)/g' \ +- -e 's/@''GNULIB_FSTATAT''@/$(GNULIB_FSTATAT)/g' \ +- -e 's/@''GNULIB_FUTIMENS''@/$(GNULIB_FUTIMENS)/g' \ +- -e 's/@''GNULIB_GETUMASK''@/$(GNULIB_GETUMASK)/g' \ +- -e 's/@''GNULIB_LCHMOD''@/$(GNULIB_LCHMOD)/g' \ +- -e 's/@''GNULIB_LSTAT''@/$(GNULIB_LSTAT)/g' \ +- -e 's/@''GNULIB_MKDIR''@/$(GNULIB_MKDIR)/g' \ +- -e 's/@''GNULIB_MKDIRAT''@/$(GNULIB_MKDIRAT)/g' \ +- -e 's/@''GNULIB_MKFIFO''@/$(GNULIB_MKFIFO)/g' \ +- -e 's/@''GNULIB_MKFIFOAT''@/$(GNULIB_MKFIFOAT)/g' \ +- -e 's/@''GNULIB_MKNOD''@/$(GNULIB_MKNOD)/g' \ +- -e 's/@''GNULIB_MKNODAT''@/$(GNULIB_MKNODAT)/g' \ +- -e 's/@''GNULIB_STAT''@/$(GNULIB_STAT)/g' \ +- -e 's/@''GNULIB_UTIMENSAT''@/$(GNULIB_UTIMENSAT)/g' \ +- -e 's/@''GNULIB_OVERRIDES_STRUCT_STAT''@/$(GNULIB_OVERRIDES_STRUCT_STAT)/g' \ +- -e 's/@''GNULIB_MDA_CHMOD''@/$(GNULIB_MDA_CHMOD)/g' \ +- -e 's/@''GNULIB_MDA_MKDIR''@/$(GNULIB_MDA_MKDIR)/g' \ +- -e 's/@''GNULIB_MDA_UMASK''@/$(GNULIB_MDA_UMASK)/g' \ ++ -e 's/@''GNULIB_FCHMODAT''@/$(GL_GNULIB_FCHMODAT)/g' \ ++ -e 's/@''GNULIB_FSTAT''@/$(GL_GNULIB_FSTAT)/g' \ ++ -e 's/@''GNULIB_FSTATAT''@/$(GL_GNULIB_FSTATAT)/g' \ ++ -e 's/@''GNULIB_FUTIMENS''@/$(GL_GNULIB_FUTIMENS)/g' \ ++ -e 's/@''GNULIB_GETUMASK''@/$(GL_GNULIB_GETUMASK)/g' \ ++ -e 's/@''GNULIB_LCHMOD''@/$(GL_GNULIB_LCHMOD)/g' \ ++ -e 's/@''GNULIB_LSTAT''@/$(GL_GNULIB_LSTAT)/g' \ ++ -e 's/@''GNULIB_MKDIR''@/$(GL_GNULIB_MKDIR)/g' \ ++ -e 's/@''GNULIB_MKDIRAT''@/$(GL_GNULIB_MKDIRAT)/g' \ ++ -e 's/@''GNULIB_MKFIFO''@/$(GL_GNULIB_MKFIFO)/g' \ ++ -e 's/@''GNULIB_MKFIFOAT''@/$(GL_GNULIB_MKFIFOAT)/g' \ ++ -e 's/@''GNULIB_MKNOD''@/$(GL_GNULIB_MKNOD)/g' \ ++ -e 's/@''GNULIB_MKNODAT''@/$(GL_GNULIB_MKNODAT)/g' \ ++ -e 's/@''GNULIB_STAT''@/$(GL_GNULIB_STAT)/g' \ ++ -e 's/@''GNULIB_UTIMENSAT''@/$(GL_GNULIB_UTIMENSAT)/g' \ ++ -e 's/@''GNULIB_OVERRIDES_STRUCT_STAT''@/$(GL_GNULIB_OVERRIDES_STRUCT_STAT)/g' \ ++ -e 's/@''GNULIB_MDA_CHMOD''@/$(GL_GNULIB_MDA_CHMOD)/g' \ ++ -e 's/@''GNULIB_MDA_MKDIR''@/$(GL_GNULIB_MDA_MKDIR)/g' \ ++ -e 's/@''GNULIB_MDA_UMASK''@/$(GL_GNULIB_MDA_UMASK)/g' \ + -e 's|@''HAVE_FCHMODAT''@|$(HAVE_FCHMODAT)|g' \ + -e 's|@''HAVE_FSTATAT''@|$(HAVE_FSTATAT)|g' \ + -e 's|@''HAVE_FUTIMENS''@|$(HAVE_FUTIMENS)|g' \ +@@ -3114,7 +3154,7 @@ sys/time.h: sys_time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_SYS_TIME_H''@|$(NEXT_SYS_TIME_H)|g' \ +- -e 's/@''GNULIB_GETTIMEOFDAY''@/$(GNULIB_GETTIMEOFDAY)/g' \ ++ -e 's/@''GNULIB_GETTIMEOFDAY''@/$(GL_GNULIB_GETTIMEOFDAY)/g' \ + -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \ + -e 's/@''HAVE_GETTIMEOFDAY''@/$(HAVE_GETTIMEOFDAY)/g' \ + -e 's/@''HAVE_STRUCT_TIMEVAL''@/$(HAVE_STRUCT_TIMEVAL)/g' \ +@@ -3148,7 +3188,7 @@ sys/times.h: sys_times.in.h $(top_builddir)/config.status $(WARN_ON_USE_H) $(ARG + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_SYS_TIMES_H''@|$(NEXT_SYS_TIMES_H)|g' \ +- -e 's/@''GNULIB_TIMES''@/$(GNULIB_TIMES)/g' \ ++ -e 's/@''GNULIB_TIMES''@/$(GL_GNULIB_TIMES)/g' \ + -e 's|@''HAVE_STRUCT_TMS''@|$(HAVE_STRUCT_TMS)|g' \ + -e 's|@''HAVE_TIMES''@|$(HAVE_TIMES)|g' \ + -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ +@@ -3239,18 +3279,18 @@ time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $( + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_TIME_H''@|$(NEXT_TIME_H)|g' \ +- -e 's/@''GNULIB_CTIME''@/$(GNULIB_CTIME)/g' \ +- -e 's/@''GNULIB_LOCALTIME''@/$(GNULIB_LOCALTIME)/g' \ +- -e 's/@''GNULIB_MKTIME''@/$(GNULIB_MKTIME)/g' \ +- -e 's/@''GNULIB_NANOSLEEP''@/$(GNULIB_NANOSLEEP)/g' \ +- -e 's/@''GNULIB_STRFTIME''@/$(GNULIB_STRFTIME)/g' \ +- -e 's/@''GNULIB_STRPTIME''@/$(GNULIB_STRPTIME)/g' \ +- -e 's/@''GNULIB_TIMEGM''@/$(GNULIB_TIMEGM)/g' \ +- -e 's/@''GNULIB_TIMESPEC_GET''@/$(GNULIB_TIMESPEC_GET)/g' \ +- -e 's/@''GNULIB_TIME_R''@/$(GNULIB_TIME_R)/g' \ +- -e 's/@''GNULIB_TIME_RZ''@/$(GNULIB_TIME_RZ)/g' \ +- -e 's/@''GNULIB_TZSET''@/$(GNULIB_TZSET)/g' \ +- -e 's/@''GNULIB_MDA_TZSET''@/$(GNULIB_MDA_TZSET)/g' \ ++ -e 's/@''GNULIB_CTIME''@/$(GL_GNULIB_CTIME)/g' \ ++ -e 's/@''GNULIB_LOCALTIME''@/$(GL_GNULIB_LOCALTIME)/g' \ ++ -e 's/@''GNULIB_MKTIME''@/$(GL_GNULIB_MKTIME)/g' \ ++ -e 's/@''GNULIB_NANOSLEEP''@/$(GL_GNULIB_NANOSLEEP)/g' \ ++ -e 's/@''GNULIB_STRFTIME''@/$(GL_GNULIB_STRFTIME)/g' \ ++ -e 's/@''GNULIB_STRPTIME''@/$(GL_GNULIB_STRPTIME)/g' \ ++ -e 's/@''GNULIB_TIMEGM''@/$(GL_GNULIB_TIMEGM)/g' \ ++ -e 's/@''GNULIB_TIMESPEC_GET''@/$(GL_GNULIB_TIMESPEC_GET)/g' \ ++ -e 's/@''GNULIB_TIME_R''@/$(GL_GNULIB_TIME_R)/g' \ ++ -e 's/@''GNULIB_TIME_RZ''@/$(GL_GNULIB_TIME_RZ)/g' \ ++ -e 's/@''GNULIB_TZSET''@/$(GL_GNULIB_TZSET)/g' \ ++ -e 's/@''GNULIB_MDA_TZSET''@/$(GL_GNULIB_MDA_TZSET)/g' \ + -e 's|@''HAVE_DECL_LOCALTIME_R''@|$(HAVE_DECL_LOCALTIME_R)|g' \ + -e 's|@''HAVE_NANOSLEEP''@|$(HAVE_NANOSLEEP)|g' \ + -e 's|@''HAVE_STRPTIME''@|$(HAVE_STRPTIME)|g' \ +@@ -3360,89 +3400,89 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \ + -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \ +- -e 's/@''GNULIB_ACCESS''@/$(GNULIB_ACCESS)/g' \ +- -e 's/@''GNULIB_CHDIR''@/$(GNULIB_CHDIR)/g' \ +- -e 's/@''GNULIB_CHOWN''@/$(GNULIB_CHOWN)/g' \ +- -e 's/@''GNULIB_CLOSE''@/$(GNULIB_CLOSE)/g' \ +- -e 's/@''GNULIB_COPY_FILE_RANGE''@/$(GNULIB_COPY_FILE_RANGE)/g' \ +- -e 's/@''GNULIB_DUP''@/$(GNULIB_DUP)/g' \ +- -e 's/@''GNULIB_DUP2''@/$(GNULIB_DUP2)/g' \ +- -e 's/@''GNULIB_DUP3''@/$(GNULIB_DUP3)/g' \ +- -e 's/@''GNULIB_ENVIRON''@/$(GNULIB_ENVIRON)/g' \ +- -e 's/@''GNULIB_EUIDACCESS''@/$(GNULIB_EUIDACCESS)/g' \ +- -e 's/@''GNULIB_EXECL''@/$(GNULIB_EXECL)/g' \ +- -e 's/@''GNULIB_EXECLE''@/$(GNULIB_EXECLE)/g' \ +- -e 's/@''GNULIB_EXECLP''@/$(GNULIB_EXECLP)/g' \ +- -e 's/@''GNULIB_EXECV''@/$(GNULIB_EXECV)/g' \ +- -e 's/@''GNULIB_EXECVE''@/$(GNULIB_EXECVE)/g' \ +- -e 's/@''GNULIB_EXECVP''@/$(GNULIB_EXECVP)/g' \ +- -e 's/@''GNULIB_EXECVPE''@/$(GNULIB_EXECVPE)/g' \ +- -e 's/@''GNULIB_FACCESSAT''@/$(GNULIB_FACCESSAT)/g' \ +- -e 's/@''GNULIB_FCHDIR''@/$(GNULIB_FCHDIR)/g' \ +- -e 's/@''GNULIB_FCHOWNAT''@/$(GNULIB_FCHOWNAT)/g' \ +- -e 's/@''GNULIB_FDATASYNC''@/$(GNULIB_FDATASYNC)/g' \ +- -e 's/@''GNULIB_FSYNC''@/$(GNULIB_FSYNC)/g' \ +- -e 's/@''GNULIB_FTRUNCATE''@/$(GNULIB_FTRUNCATE)/g' \ +- -e 's/@''GNULIB_GETCWD''@/$(GNULIB_GETCWD)/g' \ +- -e 's/@''GNULIB_GETDOMAINNAME''@/$(GNULIB_GETDOMAINNAME)/g' \ +- -e 's/@''GNULIB_GETDTABLESIZE''@/$(GNULIB_GETDTABLESIZE)/g' \ +- -e 's/@''GNULIB_GETENTROPY''@/$(GNULIB_GETENTROPY)/g' \ +- -e 's/@''GNULIB_GETGROUPS''@/$(GNULIB_GETGROUPS)/g' \ +- -e 's/@''GNULIB_GETHOSTNAME''@/$(GNULIB_GETHOSTNAME)/g' \ +- -e 's/@''GNULIB_GETLOGIN''@/$(GNULIB_GETLOGIN)/g' \ +- -e 's/@''GNULIB_GETLOGIN_R''@/$(GNULIB_GETLOGIN_R)/g' \ +- -e 's/@''GNULIB_GETOPT_POSIX''@/$(GNULIB_GETOPT_POSIX)/g' \ +- -e 's/@''GNULIB_GETPAGESIZE''@/$(GNULIB_GETPAGESIZE)/g' \ +- -e 's/@''GNULIB_GETPASS''@/$(GNULIB_GETPASS)/g' \ +- -e 's/@''GNULIB_GETUSERSHELL''@/$(GNULIB_GETUSERSHELL)/g' \ +- -e 's/@''GNULIB_GROUP_MEMBER''@/$(GNULIB_GROUP_MEMBER)/g' \ +- -e 's/@''GNULIB_ISATTY''@/$(GNULIB_ISATTY)/g' \ +- -e 's/@''GNULIB_LCHOWN''@/$(GNULIB_LCHOWN)/g' \ +- -e 's/@''GNULIB_LINK''@/$(GNULIB_LINK)/g' \ +- -e 's/@''GNULIB_LINKAT''@/$(GNULIB_LINKAT)/g' \ +- -e 's/@''GNULIB_LSEEK''@/$(GNULIB_LSEEK)/g' \ +- -e 's/@''GNULIB_PIPE''@/$(GNULIB_PIPE)/g' \ +- -e 's/@''GNULIB_PIPE2''@/$(GNULIB_PIPE2)/g' \ +- -e 's/@''GNULIB_PREAD''@/$(GNULIB_PREAD)/g' \ +- -e 's/@''GNULIB_PWRITE''@/$(GNULIB_PWRITE)/g' \ +- -e 's/@''GNULIB_READ''@/$(GNULIB_READ)/g' \ +- -e 's/@''GNULIB_READLINK''@/$(GNULIB_READLINK)/g' \ +- -e 's/@''GNULIB_READLINKAT''@/$(GNULIB_READLINKAT)/g' \ +- -e 's/@''GNULIB_RMDIR''@/$(GNULIB_RMDIR)/g' \ +- -e 's/@''GNULIB_SETHOSTNAME''@/$(GNULIB_SETHOSTNAME)/g' \ +- -e 's/@''GNULIB_SLEEP''@/$(GNULIB_SLEEP)/g' \ +- -e 's/@''GNULIB_SYMLINK''@/$(GNULIB_SYMLINK)/g' \ +- -e 's/@''GNULIB_SYMLINKAT''@/$(GNULIB_SYMLINKAT)/g' \ +- -e 's/@''GNULIB_TRUNCATE''@/$(GNULIB_TRUNCATE)/g' \ +- -e 's/@''GNULIB_TTYNAME_R''@/$(GNULIB_TTYNAME_R)/g' \ +- -e 's/@''GNULIB_UNISTD_H_GETOPT''@/0$(GNULIB_GL_UNISTD_H_GETOPT)/g' \ +- -e 's/@''GNULIB_UNISTD_H_NONBLOCKING''@/$(GNULIB_UNISTD_H_NONBLOCKING)/g' \ +- -e 's/@''GNULIB_UNISTD_H_SIGPIPE''@/$(GNULIB_UNISTD_H_SIGPIPE)/g' \ +- -e 's/@''GNULIB_UNLINK''@/$(GNULIB_UNLINK)/g' \ +- -e 's/@''GNULIB_UNLINKAT''@/$(GNULIB_UNLINKAT)/g' \ +- -e 's/@''GNULIB_USLEEP''@/$(GNULIB_USLEEP)/g' \ +- -e 's/@''GNULIB_WRITE''@/$(GNULIB_WRITE)/g' \ +- -e 's/@''GNULIB_MDA_ACCESS''@/$(GNULIB_MDA_ACCESS)/g' \ +- -e 's/@''GNULIB_MDA_CHDIR''@/$(GNULIB_MDA_CHDIR)/g' \ +- -e 's/@''GNULIB_MDA_CLOSE''@/$(GNULIB_MDA_CLOSE)/g' \ +- -e 's/@''GNULIB_MDA_DUP''@/$(GNULIB_MDA_DUP)/g' \ +- -e 's/@''GNULIB_MDA_DUP2''@/$(GNULIB_MDA_DUP2)/g' \ +- -e 's/@''GNULIB_MDA_EXECL''@/$(GNULIB_MDA_EXECL)/g' \ +- -e 's/@''GNULIB_MDA_EXECLE''@/$(GNULIB_MDA_EXECLE)/g' \ +- -e 's/@''GNULIB_MDA_EXECLP''@/$(GNULIB_MDA_EXECLP)/g' \ +- -e 's/@''GNULIB_MDA_EXECV''@/$(GNULIB_MDA_EXECV)/g' \ +- -e 's/@''GNULIB_MDA_EXECVE''@/$(GNULIB_MDA_EXECVE)/g' \ +- -e 's/@''GNULIB_MDA_EXECVP''@/$(GNULIB_MDA_EXECVP)/g' \ +- -e 's/@''GNULIB_MDA_EXECVPE''@/$(GNULIB_MDA_EXECVPE)/g' \ +- -e 's/@''GNULIB_MDA_GETCWD''@/$(GNULIB_MDA_GETCWD)/g' \ +- -e 's/@''GNULIB_MDA_GETPID''@/$(GNULIB_MDA_GETPID)/g' \ +- -e 's/@''GNULIB_MDA_ISATTY''@/$(GNULIB_MDA_ISATTY)/g' \ +- -e 's/@''GNULIB_MDA_LSEEK''@/$(GNULIB_MDA_LSEEK)/g' \ +- -e 's/@''GNULIB_MDA_READ''@/$(GNULIB_MDA_READ)/g' \ +- -e 's/@''GNULIB_MDA_RMDIR''@/$(GNULIB_MDA_RMDIR)/g' \ +- -e 's/@''GNULIB_MDA_SWAB''@/$(GNULIB_MDA_SWAB)/g' \ +- -e 's/@''GNULIB_MDA_UNLINK''@/$(GNULIB_MDA_UNLINK)/g' \ +- -e 's/@''GNULIB_MDA_WRITE''@/$(GNULIB_MDA_WRITE)/g' \ ++ -e 's/@''GNULIB_ACCESS''@/$(GL_GNULIB_ACCESS)/g' \ ++ -e 's/@''GNULIB_CHDIR''@/$(GL_GNULIB_CHDIR)/g' \ ++ -e 's/@''GNULIB_CHOWN''@/$(GL_GNULIB_CHOWN)/g' \ ++ -e 's/@''GNULIB_CLOSE''@/$(GL_GNULIB_CLOSE)/g' \ ++ -e 's/@''GNULIB_COPY_FILE_RANGE''@/$(GL_GNULIB_COPY_FILE_RANGE)/g' \ ++ -e 's/@''GNULIB_DUP''@/$(GL_GNULIB_DUP)/g' \ ++ -e 's/@''GNULIB_DUP2''@/$(GL_GNULIB_DUP2)/g' \ ++ -e 's/@''GNULIB_DUP3''@/$(GL_GNULIB_DUP3)/g' \ ++ -e 's/@''GNULIB_ENVIRON''@/$(GL_GNULIB_ENVIRON)/g' \ ++ -e 's/@''GNULIB_EUIDACCESS''@/$(GL_GNULIB_EUIDACCESS)/g' \ ++ -e 's/@''GNULIB_EXECL''@/$(GL_GNULIB_EXECL)/g' \ ++ -e 's/@''GNULIB_EXECLE''@/$(GL_GNULIB_EXECLE)/g' \ ++ -e 's/@''GNULIB_EXECLP''@/$(GL_GNULIB_EXECLP)/g' \ ++ -e 's/@''GNULIB_EXECV''@/$(GL_GNULIB_EXECV)/g' \ ++ -e 's/@''GNULIB_EXECVE''@/$(GL_GNULIB_EXECVE)/g' \ ++ -e 's/@''GNULIB_EXECVP''@/$(GL_GNULIB_EXECVP)/g' \ ++ -e 's/@''GNULIB_EXECVPE''@/$(GL_GNULIB_EXECVPE)/g' \ ++ -e 's/@''GNULIB_FACCESSAT''@/$(GL_GNULIB_FACCESSAT)/g' \ ++ -e 's/@''GNULIB_FCHDIR''@/$(GL_GNULIB_FCHDIR)/g' \ ++ -e 's/@''GNULIB_FCHOWNAT''@/$(GL_GNULIB_FCHOWNAT)/g' \ ++ -e 's/@''GNULIB_FDATASYNC''@/$(GL_GNULIB_FDATASYNC)/g' \ ++ -e 's/@''GNULIB_FSYNC''@/$(GL_GNULIB_FSYNC)/g' \ ++ -e 's/@''GNULIB_FTRUNCATE''@/$(GL_GNULIB_FTRUNCATE)/g' \ ++ -e 's/@''GNULIB_GETCWD''@/$(GL_GNULIB_GETCWD)/g' \ ++ -e 's/@''GNULIB_GETDOMAINNAME''@/$(GL_GNULIB_GETDOMAINNAME)/g' \ ++ -e 's/@''GNULIB_GETDTABLESIZE''@/$(GL_GNULIB_GETDTABLESIZE)/g' \ ++ -e 's/@''GNULIB_GETENTROPY''@/$(GL_GNULIB_GETENTROPY)/g' \ ++ -e 's/@''GNULIB_GETGROUPS''@/$(GL_GNULIB_GETGROUPS)/g' \ ++ -e 's/@''GNULIB_GETHOSTNAME''@/$(GL_GNULIB_GETHOSTNAME)/g' \ ++ -e 's/@''GNULIB_GETLOGIN''@/$(GL_GNULIB_GETLOGIN)/g' \ ++ -e 's/@''GNULIB_GETLOGIN_R''@/$(GL_GNULIB_GETLOGIN_R)/g' \ ++ -e 's/@''GNULIB_GETOPT_POSIX''@/$(GL_GNULIB_GETOPT_POSIX)/g' \ ++ -e 's/@''GNULIB_GETPAGESIZE''@/$(GL_GNULIB_GETPAGESIZE)/g' \ ++ -e 's/@''GNULIB_GETPASS''@/$(GL_GNULIB_GETPASS)/g' \ ++ -e 's/@''GNULIB_GETUSERSHELL''@/$(GL_GNULIB_GETUSERSHELL)/g' \ ++ -e 's/@''GNULIB_GROUP_MEMBER''@/$(GL_GNULIB_GROUP_MEMBER)/g' \ ++ -e 's/@''GNULIB_ISATTY''@/$(GL_GNULIB_ISATTY)/g' \ ++ -e 's/@''GNULIB_LCHOWN''@/$(GL_GNULIB_LCHOWN)/g' \ ++ -e 's/@''GNULIB_LINK''@/$(GL_GNULIB_LINK)/g' \ ++ -e 's/@''GNULIB_LINKAT''@/$(GL_GNULIB_LINKAT)/g' \ ++ -e 's/@''GNULIB_LSEEK''@/$(GL_GNULIB_LSEEK)/g' \ ++ -e 's/@''GNULIB_PIPE''@/$(GL_GNULIB_PIPE)/g' \ ++ -e 's/@''GNULIB_PIPE2''@/$(GL_GNULIB_PIPE2)/g' \ ++ -e 's/@''GNULIB_PREAD''@/$(GL_GNULIB_PREAD)/g' \ ++ -e 's/@''GNULIB_PWRITE''@/$(GL_GNULIB_PWRITE)/g' \ ++ -e 's/@''GNULIB_READ''@/$(GL_GNULIB_READ)/g' \ ++ -e 's/@''GNULIB_READLINK''@/$(GL_GNULIB_READLINK)/g' \ ++ -e 's/@''GNULIB_READLINKAT''@/$(GL_GNULIB_READLINKAT)/g' \ ++ -e 's/@''GNULIB_RMDIR''@/$(GL_GNULIB_RMDIR)/g' \ ++ -e 's/@''GNULIB_SETHOSTNAME''@/$(GL_GNULIB_SETHOSTNAME)/g' \ ++ -e 's/@''GNULIB_SLEEP''@/$(GL_GNULIB_SLEEP)/g' \ ++ -e 's/@''GNULIB_SYMLINK''@/$(GL_GNULIB_SYMLINK)/g' \ ++ -e 's/@''GNULIB_SYMLINKAT''@/$(GL_GNULIB_SYMLINKAT)/g' \ ++ -e 's/@''GNULIB_TRUNCATE''@/$(GL_GNULIB_TRUNCATE)/g' \ ++ -e 's/@''GNULIB_TTYNAME_R''@/$(GL_GNULIB_TTYNAME_R)/g' \ ++ -e 's/@''GNULIB_UNISTD_H_GETOPT''@/0$(GL_GNULIB_UNISTD_H_GETOPT)/g' \ ++ -e 's/@''GNULIB_UNISTD_H_NONBLOCKING''@/$(GL_GNULIB_UNISTD_H_NONBLOCKING)/g' \ ++ -e 's/@''GNULIB_UNISTD_H_SIGPIPE''@/$(GL_GNULIB_UNISTD_H_SIGPIPE)/g' \ ++ -e 's/@''GNULIB_UNLINK''@/$(GL_GNULIB_UNLINK)/g' \ ++ -e 's/@''GNULIB_UNLINKAT''@/$(GL_GNULIB_UNLINKAT)/g' \ ++ -e 's/@''GNULIB_USLEEP''@/$(GL_GNULIB_USLEEP)/g' \ ++ -e 's/@''GNULIB_WRITE''@/$(GL_GNULIB_WRITE)/g' \ ++ -e 's/@''GNULIB_MDA_ACCESS''@/$(GL_GNULIB_MDA_ACCESS)/g' \ ++ -e 's/@''GNULIB_MDA_CHDIR''@/$(GL_GNULIB_MDA_CHDIR)/g' \ ++ -e 's/@''GNULIB_MDA_CLOSE''@/$(GL_GNULIB_MDA_CLOSE)/g' \ ++ -e 's/@''GNULIB_MDA_DUP''@/$(GL_GNULIB_MDA_DUP)/g' \ ++ -e 's/@''GNULIB_MDA_DUP2''@/$(GL_GNULIB_MDA_DUP2)/g' \ ++ -e 's/@''GNULIB_MDA_EXECL''@/$(GL_GNULIB_MDA_EXECL)/g' \ ++ -e 's/@''GNULIB_MDA_EXECLE''@/$(GL_GNULIB_MDA_EXECLE)/g' \ ++ -e 's/@''GNULIB_MDA_EXECLP''@/$(GL_GNULIB_MDA_EXECLP)/g' \ ++ -e 's/@''GNULIB_MDA_EXECV''@/$(GL_GNULIB_MDA_EXECV)/g' \ ++ -e 's/@''GNULIB_MDA_EXECVE''@/$(GL_GNULIB_MDA_EXECVE)/g' \ ++ -e 's/@''GNULIB_MDA_EXECVP''@/$(GL_GNULIB_MDA_EXECVP)/g' \ ++ -e 's/@''GNULIB_MDA_EXECVPE''@/$(GL_GNULIB_MDA_EXECVPE)/g' \ ++ -e 's/@''GNULIB_MDA_GETCWD''@/$(GL_GNULIB_MDA_GETCWD)/g' \ ++ -e 's/@''GNULIB_MDA_GETPID''@/$(GL_GNULIB_MDA_GETPID)/g' \ ++ -e 's/@''GNULIB_MDA_ISATTY''@/$(GL_GNULIB_MDA_ISATTY)/g' \ ++ -e 's/@''GNULIB_MDA_LSEEK''@/$(GL_GNULIB_MDA_LSEEK)/g' \ ++ -e 's/@''GNULIB_MDA_READ''@/$(GL_GNULIB_MDA_READ)/g' \ ++ -e 's/@''GNULIB_MDA_RMDIR''@/$(GL_GNULIB_MDA_RMDIR)/g' \ ++ -e 's/@''GNULIB_MDA_SWAB''@/$(GL_GNULIB_MDA_SWAB)/g' \ ++ -e 's/@''GNULIB_MDA_UNLINK''@/$(GL_GNULIB_MDA_UNLINK)/g' \ ++ -e 's/@''GNULIB_MDA_WRITE''@/$(GL_GNULIB_MDA_WRITE)/g' \ + < $(srcdir)/unistd.in.h | \ + sed -e 's|@''HAVE_CHOWN''@|$(HAVE_CHOWN)|g' \ + -e 's|@''HAVE_COPY_FILE_RANGE''@|$(HAVE_COPY_FILE_RANGE)|g' \ +@@ -3617,49 +3657,49 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) + -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \ + -e 's|@''HAVE_WCHAR_H''@|$(HAVE_WCHAR_H)|g' \ + -e 's/@''HAVE_CRTDEFS_H''@/$(HAVE_CRTDEFS_H)/g' \ +- -e 's/@''GNULIB_OVERRIDES_WINT_T''@/$(GNULIB_OVERRIDES_WINT_T)/g' \ +- -e 's/@''GNULIB_BTOWC''@/$(GNULIB_BTOWC)/g' \ +- -e 's/@''GNULIB_WCTOB''@/$(GNULIB_WCTOB)/g' \ +- -e 's/@''GNULIB_MBSINIT''@/$(GNULIB_MBSINIT)/g' \ +- -e 's/@''GNULIB_MBRTOWC''@/$(GNULIB_MBRTOWC)/g' \ +- -e 's/@''GNULIB_MBRLEN''@/$(GNULIB_MBRLEN)/g' \ +- -e 's/@''GNULIB_MBSRTOWCS''@/$(GNULIB_MBSRTOWCS)/g' \ +- -e 's/@''GNULIB_MBSNRTOWCS''@/$(GNULIB_MBSNRTOWCS)/g' \ +- -e 's/@''GNULIB_WCRTOMB''@/$(GNULIB_WCRTOMB)/g' \ +- -e 's/@''GNULIB_WCSRTOMBS''@/$(GNULIB_WCSRTOMBS)/g' \ +- -e 's/@''GNULIB_WCSNRTOMBS''@/$(GNULIB_WCSNRTOMBS)/g' \ +- -e 's/@''GNULIB_WCWIDTH''@/$(GNULIB_WCWIDTH)/g' \ +- -e 's/@''GNULIB_WMEMCHR''@/$(GNULIB_WMEMCHR)/g' \ +- -e 's/@''GNULIB_WMEMCMP''@/$(GNULIB_WMEMCMP)/g' \ +- -e 's/@''GNULIB_WMEMCPY''@/$(GNULIB_WMEMCPY)/g' \ +- -e 's/@''GNULIB_WMEMMOVE''@/$(GNULIB_WMEMMOVE)/g' \ +- -e 's/@''GNULIB_WMEMPCPY''@/$(GNULIB_WMEMPCPY)/g' \ +- -e 's/@''GNULIB_WMEMSET''@/$(GNULIB_WMEMSET)/g' \ +- -e 's/@''GNULIB_WCSLEN''@/$(GNULIB_WCSLEN)/g' \ +- -e 's/@''GNULIB_WCSNLEN''@/$(GNULIB_WCSNLEN)/g' \ +- -e 's/@''GNULIB_WCSCPY''@/$(GNULIB_WCSCPY)/g' \ +- -e 's/@''GNULIB_WCPCPY''@/$(GNULIB_WCPCPY)/g' \ +- -e 's/@''GNULIB_WCSNCPY''@/$(GNULIB_WCSNCPY)/g' \ +- -e 's/@''GNULIB_WCPNCPY''@/$(GNULIB_WCPNCPY)/g' \ +- -e 's/@''GNULIB_WCSCAT''@/$(GNULIB_WCSCAT)/g' \ +- -e 's/@''GNULIB_WCSNCAT''@/$(GNULIB_WCSNCAT)/g' \ +- -e 's/@''GNULIB_WCSCMP''@/$(GNULIB_WCSCMP)/g' \ +- -e 's/@''GNULIB_WCSNCMP''@/$(GNULIB_WCSNCMP)/g' \ +- -e 's/@''GNULIB_WCSCASECMP''@/$(GNULIB_WCSCASECMP)/g' \ +- -e 's/@''GNULIB_WCSNCASECMP''@/$(GNULIB_WCSNCASECMP)/g' \ +- -e 's/@''GNULIB_WCSCOLL''@/$(GNULIB_WCSCOLL)/g' \ +- -e 's/@''GNULIB_WCSXFRM''@/$(GNULIB_WCSXFRM)/g' \ +- -e 's/@''GNULIB_WCSDUP''@/$(GNULIB_WCSDUP)/g' \ +- -e 's/@''GNULIB_WCSCHR''@/$(GNULIB_WCSCHR)/g' \ +- -e 's/@''GNULIB_WCSRCHR''@/$(GNULIB_WCSRCHR)/g' \ +- -e 's/@''GNULIB_WCSCSPN''@/$(GNULIB_WCSCSPN)/g' \ +- -e 's/@''GNULIB_WCSSPN''@/$(GNULIB_WCSSPN)/g' \ +- -e 's/@''GNULIB_WCSPBRK''@/$(GNULIB_WCSPBRK)/g' \ +- -e 's/@''GNULIB_WCSSTR''@/$(GNULIB_WCSSTR)/g' \ +- -e 's/@''GNULIB_WCSTOK''@/$(GNULIB_WCSTOK)/g' \ +- -e 's/@''GNULIB_WCSWIDTH''@/$(GNULIB_WCSWIDTH)/g' \ +- -e 's/@''GNULIB_WCSFTIME''@/$(GNULIB_WCSFTIME)/g' \ +- -e 's/@''GNULIB_MDA_WCSDUP''@/$(GNULIB_MDA_WCSDUP)/g' \ ++ -e 's/@''GNULIBHEADERS_OVERRIDE_WINT_T''@/$(GNULIBHEADERS_OVERRIDE_WINT_T)/g' \ ++ -e 's/@''GNULIB_BTOWC''@/$(GL_GNULIB_BTOWC)/g' \ ++ -e 's/@''GNULIB_WCTOB''@/$(GL_GNULIB_WCTOB)/g' \ ++ -e 's/@''GNULIB_MBSINIT''@/$(GL_GNULIB_MBSINIT)/g' \ ++ -e 's/@''GNULIB_MBRTOWC''@/$(GL_GNULIB_MBRTOWC)/g' \ ++ -e 's/@''GNULIB_MBRLEN''@/$(GL_GNULIB_MBRLEN)/g' \ ++ -e 's/@''GNULIB_MBSRTOWCS''@/$(GL_GNULIB_MBSRTOWCS)/g' \ ++ -e 's/@''GNULIB_MBSNRTOWCS''@/$(GL_GNULIB_MBSNRTOWCS)/g' \ ++ -e 's/@''GNULIB_WCRTOMB''@/$(GL_GNULIB_WCRTOMB)/g' \ ++ -e 's/@''GNULIB_WCSRTOMBS''@/$(GL_GNULIB_WCSRTOMBS)/g' \ ++ -e 's/@''GNULIB_WCSNRTOMBS''@/$(GL_GNULIB_WCSNRTOMBS)/g' \ ++ -e 's/@''GNULIB_WCWIDTH''@/$(GL_GNULIB_WCWIDTH)/g' \ ++ -e 's/@''GNULIB_WMEMCHR''@/$(GL_GNULIB_WMEMCHR)/g' \ ++ -e 's/@''GNULIB_WMEMCMP''@/$(GL_GNULIB_WMEMCMP)/g' \ ++ -e 's/@''GNULIB_WMEMCPY''@/$(GL_GNULIB_WMEMCPY)/g' \ ++ -e 's/@''GNULIB_WMEMMOVE''@/$(GL_GNULIB_WMEMMOVE)/g' \ ++ -e 's/@''GNULIB_WMEMPCPY''@/$(GL_GNULIB_WMEMPCPY)/g' \ ++ -e 's/@''GNULIB_WMEMSET''@/$(GL_GNULIB_WMEMSET)/g' \ ++ -e 's/@''GNULIB_WCSLEN''@/$(GL_GNULIB_WCSLEN)/g' \ ++ -e 's/@''GNULIB_WCSNLEN''@/$(GL_GNULIB_WCSNLEN)/g' \ ++ -e 's/@''GNULIB_WCSCPY''@/$(GL_GNULIB_WCSCPY)/g' \ ++ -e 's/@''GNULIB_WCPCPY''@/$(GL_GNULIB_WCPCPY)/g' \ ++ -e 's/@''GNULIB_WCSNCPY''@/$(GL_GNULIB_WCSNCPY)/g' \ ++ -e 's/@''GNULIB_WCPNCPY''@/$(GL_GNULIB_WCPNCPY)/g' \ ++ -e 's/@''GNULIB_WCSCAT''@/$(GL_GNULIB_WCSCAT)/g' \ ++ -e 's/@''GNULIB_WCSNCAT''@/$(GL_GNULIB_WCSNCAT)/g' \ ++ -e 's/@''GNULIB_WCSCMP''@/$(GL_GNULIB_WCSCMP)/g' \ ++ -e 's/@''GNULIB_WCSNCMP''@/$(GL_GNULIB_WCSNCMP)/g' \ ++ -e 's/@''GNULIB_WCSCASECMP''@/$(GL_GNULIB_WCSCASECMP)/g' \ ++ -e 's/@''GNULIB_WCSNCASECMP''@/$(GL_GNULIB_WCSNCASECMP)/g' \ ++ -e 's/@''GNULIB_WCSCOLL''@/$(GL_GNULIB_WCSCOLL)/g' \ ++ -e 's/@''GNULIB_WCSXFRM''@/$(GL_GNULIB_WCSXFRM)/g' \ ++ -e 's/@''GNULIB_WCSDUP''@/$(GL_GNULIB_WCSDUP)/g' \ ++ -e 's/@''GNULIB_WCSCHR''@/$(GL_GNULIB_WCSCHR)/g' \ ++ -e 's/@''GNULIB_WCSRCHR''@/$(GL_GNULIB_WCSRCHR)/g' \ ++ -e 's/@''GNULIB_WCSCSPN''@/$(GL_GNULIB_WCSCSPN)/g' \ ++ -e 's/@''GNULIB_WCSSPN''@/$(GL_GNULIB_WCSSPN)/g' \ ++ -e 's/@''GNULIB_WCSPBRK''@/$(GL_GNULIB_WCSPBRK)/g' \ ++ -e 's/@''GNULIB_WCSSTR''@/$(GL_GNULIB_WCSSTR)/g' \ ++ -e 's/@''GNULIB_WCSTOK''@/$(GL_GNULIB_WCSTOK)/g' \ ++ -e 's/@''GNULIB_WCSWIDTH''@/$(GL_GNULIB_WCSWIDTH)/g' \ ++ -e 's/@''GNULIB_WCSFTIME''@/$(GL_GNULIB_WCSFTIME)/g' \ ++ -e 's/@''GNULIB_MDA_WCSDUP''@/$(GL_GNULIB_MDA_WCSDUP)/g' \ + < $(srcdir)/wchar.in.h | \ + sed -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \ + -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \ +@@ -3760,14 +3800,14 @@ wctype.h: wctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \ + -e 's/@''HAVE_CRTDEFS_H''@/$(HAVE_CRTDEFS_H)/g' \ +- -e 's/@''GNULIB_OVERRIDES_WINT_T''@/$(GNULIB_OVERRIDES_WINT_T)/g' \ +- -e 's/@''GNULIB_ISWBLANK''@/$(GNULIB_ISWBLANK)/g' \ +- -e 's/@''GNULIB_ISWDIGIT''@/$(GNULIB_ISWDIGIT)/g' \ +- -e 's/@''GNULIB_ISWXDIGIT''@/$(GNULIB_ISWXDIGIT)/g' \ +- -e 's/@''GNULIB_WCTYPE''@/$(GNULIB_WCTYPE)/g' \ +- -e 's/@''GNULIB_ISWCTYPE''@/$(GNULIB_ISWCTYPE)/g' \ +- -e 's/@''GNULIB_WCTRANS''@/$(GNULIB_WCTRANS)/g' \ +- -e 's/@''GNULIB_TOWCTRANS''@/$(GNULIB_TOWCTRANS)/g' \ ++ -e 's/@''GNULIBHEADERS_OVERRIDE_WINT_T''@/$(GNULIBHEADERS_OVERRIDE_WINT_T)/g' \ ++ -e 's/@''GNULIB_ISWBLANK''@/$(GL_GNULIB_ISWBLANK)/g' \ ++ -e 's/@''GNULIB_ISWDIGIT''@/$(GL_GNULIB_ISWDIGIT)/g' \ ++ -e 's/@''GNULIB_ISWXDIGIT''@/$(GL_GNULIB_ISWXDIGIT)/g' \ ++ -e 's/@''GNULIB_WCTYPE''@/$(GL_GNULIB_WCTYPE)/g' \ ++ -e 's/@''GNULIB_ISWCTYPE''@/$(GL_GNULIB_ISWCTYPE)/g' \ ++ -e 's/@''GNULIB_WCTRANS''@/$(GL_GNULIB_WCTRANS)/g' \ ++ -e 's/@''GNULIB_TOWCTRANS''@/$(GL_GNULIB_TOWCTRANS)/g' \ + -e 's/@''HAVE_ISWBLANK''@/$(HAVE_ISWBLANK)/g' \ + -e 's/@''HAVE_ISWCNTRL''@/$(HAVE_ISWCNTRL)/g' \ + -e 's/@''HAVE_WCTYPE_T''@/$(HAVE_WCTYPE_T)/g' \ +diff --git a/lib/_Noreturn.h b/lib/_Noreturn.h +index cb72f26..6fed3c7 100644 +--- a/lib/_Noreturn.h ++++ b/lib/_Noreturn.h +@@ -29,7 +29,7 @@ + # elif ((!defined __cplusplus || defined __clang__) \ + && (201112 <= (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) \ + || (!defined __STRICT_ANSI__ \ +- && (__4 < __GNUC__ + (7 <= __GNUC_MINOR__) \ ++ && (4 < __GNUC__ + (7 <= __GNUC_MINOR__) \ + || (defined __apple_build_version__ \ + ? 6000000 <= __apple_build_version__ \ + : 3 < __clang_major__ + (5 <= __clang_minor__)))))) +diff --git a/lib/accept.c b/lib/accept.c +index 4ec4f43..71457db 100644 +--- a/lib/accept.c ++++ b/lib/accept.c +@@ -2,12 +2,12 @@ + + Copyright (C) 2008-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/accept4.c b/lib/accept4.c +index b444e22..4c2b80e 100644 +--- a/lib/accept4.c ++++ b/lib/accept4.c +@@ -1,18 +1,18 @@ + /* Accept a connection on a socket, with specific opening flags. + Copyright (C) 2009-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser 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, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + #include + +diff --git a/lib/alignof.h b/lib/alignof.h +index 6977c3e..e6e7a51 100644 +--- a/lib/alignof.h ++++ b/lib/alignof.h +@@ -1,18 +1,18 @@ + /* Determine alignment of types. + Copyright (C) 2003-2004, 2006, 2009-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + #ifndef _ALIGNOF_H + #define _ALIGNOF_H +diff --git a/lib/alloca.c b/lib/alloca.c +index 91b9ec3..4880283 100644 +--- a/lib/alloca.c ++++ b/lib/alloca.c +@@ -1,5 +1,7 @@ + /* alloca.c -- allocate automatically reclaimed memory +- (Mostly) portable public-domain implementation -- D A Gwyn ++ This file is in the public domain. */ ++ ++/* (Mostly) portable implementation -- D A Gwyn + + This implementation of the PWB library alloca function, + which is used to allocate space off the run-time stack so +diff --git a/lib/alloca.in.h b/lib/alloca.in.h +index 9c7ccbb..65c2d4d 100644 +--- a/lib/alloca.in.h ++++ b/lib/alloca.in.h +@@ -3,20 +3,18 @@ + Copyright (C) 1995, 1999, 2001-2004, 2006-2021 Free Software Foundation, + Inc. + +- This program is free software; you can redistribute it and/or modify it +- under the terms of the GNU Lesser General Public License as published +- by the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 +- Lesser General Public License for more details. ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public +- License along with this program; if not, see +- . +- */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + /* Avoid using the symbol _ALLOCA_H here, as Bison assumes _ALLOCA_H + means there is a real alloca function. */ +diff --git a/lib/arpa_inet.in.h b/lib/arpa_inet.in.h +index 0ac83ab..9968067 100644 +--- a/lib/arpa_inet.in.h ++++ b/lib/arpa_inet.in.h +@@ -2,18 +2,18 @@ + + Copyright (C) 2005-2006, 2008-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + #ifndef _ at GUARD_PREFIX@_ARPA_INET_H + +diff --git a/lib/asnprintf.c b/lib/asnprintf.c +index 420440a..c5367b2 100644 +--- a/lib/asnprintf.c ++++ b/lib/asnprintf.c +@@ -1,18 +1,18 @@ + /* Formatted output to strings. + Copyright (C) 1999, 2002, 2006, 2009-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + #include + +diff --git a/lib/assure.h b/lib/assure.h +index d95c0c9..49aa82f 100644 +--- a/lib/assure.h ++++ b/lib/assure.h +@@ -2,12 +2,12 @@ + + Copyright (C) 2014-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/attribute.h b/lib/attribute.h +index 27a0fce..80a23f5 100644 +--- a/lib/attribute.h ++++ b/lib/attribute.h +@@ -2,15 +2,15 @@ + + Copyright 2020-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify it +- under the terms of the GNU Lesser General Public License as published +- by the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 +- Lesser General Public License for more details. ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ +@@ -32,7 +32,7 @@ + + + /* This file defines two types of attributes: +- * C2X standard attributes. These have macro names that do not begin with ++ * C2x standard attributes. These have macro names that do not begin with + 'ATTRIBUTE_'. + * Selected GCC attributes; see: + https://gcc.gnu.org/onlinedocs/gcc/Common-Function-Attributes.html +diff --git a/lib/basename-lgpl.c b/lib/basename-lgpl.c +index 405edfa..5dbd157 100644 +--- a/lib/basename-lgpl.c ++++ b/lib/basename-lgpl.c +@@ -3,12 +3,12 @@ + Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2021 Free Software + Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/basename-lgpl.h b/lib/basename-lgpl.h +index 222d21f..d520c09 100644 +--- a/lib/basename-lgpl.h ++++ b/lib/basename-lgpl.h +@@ -1,20 +1,20 @@ +-/* Extract the last component (base name) of a file name. ++/* Extract the last component (base name) of a file name. + +- Copyright (C) 1998, 2001, 2003-2006, 2009-2021 Free Software Foundation, +- Inc. ++ Copyright (C) 1998, 2001, 2003-2006, 2009-2021 Free Software Foundation, ++ Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details. ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License +- along with this program. If not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + #ifndef _BASENAME_LGPL_H + #define _BASENAME_LGPL_H +diff --git a/lib/binary-io.c b/lib/binary-io.c +index 83a820a..adc0ae2 100644 +--- a/lib/binary-io.c ++++ b/lib/binary-io.c +@@ -1,12 +1,12 @@ + /* Binary mode I/O. + Copyright 2017-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/binary-io.h b/lib/binary-io.h +index 1dfbe5a..0fa8d54 100644 +--- a/lib/binary-io.h ++++ b/lib/binary-io.h +@@ -1,12 +1,12 @@ + /* Binary mode I/O. + Copyright (C) 2001, 2003, 2005, 2008-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/bind.c b/lib/bind.c +index 87fe0ed..0e47254 100644 +--- a/lib/bind.c ++++ b/lib/bind.c +@@ -2,12 +2,12 @@ + + Copyright (C) 2008-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/btowc.c b/lib/btowc.c +index e800878..b8239af 100644 +--- a/lib/btowc.c ++++ b/lib/btowc.c +@@ -2,12 +2,12 @@ + Copyright (C) 2008, 2010-2021 Free Software Foundation, Inc. + Written by Bruno Haible , 2008. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/byteswap.in.h b/lib/byteswap.in.h +index c176238..113f878 100644 +--- a/lib/byteswap.in.h ++++ b/lib/byteswap.in.h +@@ -2,12 +2,12 @@ + Copyright (C) 2005, 2007, 2009-2021 Free Software Foundation, Inc. + Written by Oskar Liljeblad , 2005. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/c-ctype.c b/lib/c-ctype.c +index 5d9d4d8..300f97c 100644 +--- a/lib/c-ctype.c ++++ b/lib/c-ctype.c +@@ -1,3 +1,21 @@ ++/* Character handling in C locale. ++ ++ Copyright (C) 2003-2021 Free Software Foundation, Inc. ++ ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. ++ ++ This file 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 Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ ++ + #include ++ + #define C_CTYPE_INLINE _GL_EXTERN_INLINE + #include "c-ctype.h" +diff --git a/lib/c-ctype.h b/lib/c-ctype.h +index e8403db..3a652ac 100644 +--- a/lib/c-ctype.h ++++ b/lib/c-ctype.h +@@ -7,18 +7,18 @@ + + Copyright (C) 2000-2003, 2006, 2008-2021 Free Software Foundation, Inc. + +-This program is free software; you can redistribute it and/or modify +-it under the terms of the GNU Lesser 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 Lesser General Public License for more details. +- +-You should have received a copy of the GNU Lesser General Public License +-along with this program; if not, see . */ ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. ++ ++ This file 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 Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + #ifndef C_CTYPE_H + #define C_CTYPE_H +diff --git a/lib/c-strcase.h b/lib/c-strcase.h +index 8240dbc..82f99bb 100644 +--- a/lib/c-strcase.h ++++ b/lib/c-strcase.h +@@ -2,18 +2,18 @@ + Copyright (C) 1995-1996, 2001, 2003, 2005, 2009-2021 Free Software + Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + #ifndef C_STRCASE_H + #define C_STRCASE_H +diff --git a/lib/c-strcasecmp.c b/lib/c-strcasecmp.c +index 805dc99..3c22455 100644 +--- a/lib/c-strcasecmp.c ++++ b/lib/c-strcasecmp.c +@@ -1,18 +1,18 @@ + /* c-strcasecmp.c -- case insensitive string comparator in C locale + Copyright (C) 1998-1999, 2005-2006, 2009-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + #include + +diff --git a/lib/c-strcaseeq.h b/lib/c-strcaseeq.h +index ed979aa..66b9cf3 100644 +--- a/lib/c-strcaseeq.h ++++ b/lib/c-strcaseeq.h +@@ -1,15 +1,15 @@ + /* Optimized case-insensitive string comparison in C locale. + Copyright (C) 2001-2002, 2007, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify it +- under the terms of the GNU Lesser General Public License as published +- by the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 +- Lesser General Public License for more details. ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ +diff --git a/lib/c-strncasecmp.c b/lib/c-strncasecmp.c +index c3203fd..f3ca786 100644 +--- a/lib/c-strncasecmp.c ++++ b/lib/c-strncasecmp.c +@@ -1,18 +1,18 @@ + /* c-strncasecmp.c -- case insensitive string comparator in C locale + Copyright (C) 1998-1999, 2005-2006, 2009-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + #include + +diff --git a/lib/canonicalize-lgpl.c b/lib/canonicalize-lgpl.c +index c6fef17..92e9639 100644 +--- a/lib/canonicalize-lgpl.c ++++ b/lib/canonicalize-lgpl.c +@@ -74,7 +74,6 @@ + # define __pathconf pathconf + # define __rawmemchr rawmemchr + # define __readlink readlink +-# define __stat stat + # if IN_RELOCWRAPPER + /* When building the relocatable program wrapper, use the system's memmove + function, not the gnulib override, otherwise we would get a link error. +@@ -105,7 +104,7 @@ file_accessible (char const *file) + return __faccessat (AT_FDCWD, file, F_OK, AT_EACCESS) == 0; + # else + struct stat st; +- return __stat (file, &st) == 0 || errno == EOVERFLOW; ++ return stat (file, &st) == 0 || errno == EOVERFLOW; + # endif + } + +diff --git a/lib/cdefs.h b/lib/cdefs.h +index 90f9741..4dac9d2 100644 +--- a/lib/cdefs.h ++++ b/lib/cdefs.h +@@ -259,9 +259,7 @@ + # define __attribute_const__ /* Ignore */ + #endif + +-#if defined __STDC_VERSION__ && 201710L < __STDC_VERSION__ +-# define __attribute_maybe_unused__ [[__maybe_unused__]] +-#elif __GNUC_PREREQ (2,7) || __glibc_has_attribute (__unused__) ++#if __GNUC_PREREQ (2,7) || __glibc_has_attribute (__unused__) + # define __attribute_maybe_unused__ __attribute__ ((__unused__)) + #else + # define __attribute_maybe_unused__ /* Ignore */ +@@ -320,7 +318,9 @@ + #endif + + /* The nonnull function attribute marks pointer parameters that +- must not be NULL. */ ++ must not be NULL. This has the name __nonnull in glibc, ++ and __attribute_nonnull__ in files shared with Gnulib to avoid ++ collision with a different __nonnull in DragonFlyBSD 5.9. */ + #ifndef __attribute_nonnull__ + # if __GNUC_PREREQ (3,3) || __glibc_has_attribute (__nonnull__) + # define __attribute_nonnull__(params) __attribute__ ((__nonnull__ params)) +@@ -332,6 +332,16 @@ + # define __nonnull(params) __attribute_nonnull__ (params) + #endif + ++/* The returns_nonnull function attribute marks the return type of the function ++ as always being non-null. */ ++#ifndef __returns_nonnull ++# if __GNUC_PREREQ (4, 9) || __glibc_has_attribute (__returns_nonnull__) ++# define __returns_nonnull __attribute__ ((__returns_nonnull__)) ++# else ++# define __returns_nonnull ++# endif ++#endif ++ + /* If fortification mode, we warn about unused results of certain + function calls which can lead to problems. */ + #if __GNUC_PREREQ (3,4) || __glibc_has_attribute (__warn_unused_result__) +@@ -485,9 +495,9 @@ + [!!sizeof (struct { int __error_if_negative: (expr) ? 2 : -1; })] + #endif + +-/* The #ifndef lets Gnulib avoid including these on non-glibc +- platforms, where the includes typically do not exist. */ +-#ifndef __WORDSIZE ++/* Gnulib avoids including these, as they don't work on non-glibc or ++ older glibc platforms. */ ++#ifndef __GNULIB_CDEFS + # include + # include + #endif +@@ -594,9 +604,26 @@ _Static_assert (0, "IEEE 128-bits long double requires redirection on this platf + array according to access mode, or at least one element when + size-index is not provided: + access (access-mode, [, ]) */ +-#define __attr_access(x) __attribute__ ((__access__ x)) ++# define __attr_access(x) __attribute__ ((__access__ x)) ++# if __GNUC_PREREQ (11, 0) ++# define __attr_access_none(argno) __attribute__ ((__access__ (__none__, argno))) ++# else ++# define __attr_access_none(argno) ++# endif + #else + # define __attr_access(x) ++# define __attr_access_none(argno) ++#endif ++ ++#if __GNUC_PREREQ (11, 0) ++/* Designates dealloc as a function to call to deallocate objects ++ allocated by the declared function. */ ++# define __attr_dealloc(dealloc, argno) \ ++ __attribute__ ((__malloc__ (dealloc, argno))) ++# define __attr_dealloc_free __attr_dealloc (__builtin_free, 1) ++#else ++# define __attr_dealloc(dealloc, argno) ++# define __attr_dealloc_free + #endif + + /* Specify that a function such as setjmp or vfork may return +diff --git a/lib/ceil.c b/lib/ceil.c +index 06e7e5e..fce05d9 100644 +--- a/lib/ceil.c ++++ b/lib/ceil.c +@@ -1,12 +1,12 @@ + /* Round towards positive infinity. + Copyright (C) 2007, 2010-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser 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, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/cloexec.c b/lib/cloexec.c +index 1f58b72..7defa93 100644 +--- a/lib/cloexec.c ++++ b/lib/cloexec.c +@@ -2,20 +2,20 @@ + + Copyright (C) 1991, 2004-2006, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program. If not, see . ++ along with this program. If not, see . */ + +- The code is taken from glibc/manual/llio.texi */ ++/* The code is taken from glibc/manual/llio.texi */ + + #include + +diff --git a/lib/cloexec.h b/lib/cloexec.h +index 7a71ad4..97a3659 100644 +--- a/lib/cloexec.h ++++ b/lib/cloexec.h +@@ -2,20 +2,18 @@ + + Copyright (C) 2004, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program. If not, see . +- +-*/ ++ along with this program. If not, see . */ + + #include + +diff --git a/lib/close.c b/lib/close.c +index 11e31db..5b9ab6c 100644 +--- a/lib/close.c ++++ b/lib/close.c +@@ -1,12 +1,12 @@ + /* close replacement. + Copyright (C) 2008-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/connect.c b/lib/connect.c +index fe0de7e..b2b2e93 100644 +--- a/lib/connect.c ++++ b/lib/connect.c +@@ -2,12 +2,12 @@ + + Copyright (C) 2008-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/copysign.c b/lib/copysign.c +index ad5b102..fee131b 100644 +--- a/lib/copysign.c ++++ b/lib/copysign.c +@@ -1,12 +1,12 @@ + /* Copy sign into another 'double' number. + Copyright (C) 2011-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser 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, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/dirent.in.h b/lib/dirent.in.h +index a285bde..5775edf 100644 +--- a/lib/dirent.in.h ++++ b/lib/dirent.in.h +@@ -1,12 +1,12 @@ + /* A GNU-like . + Copyright (C) 2006-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +@@ -74,6 +74,30 @@ typedef struct gl_directory DIR; + + /* Declare overridden functions. */ + ++#if @GNULIB_CLOSEDIR@ ++# if @REPLACE_CLOSEDIR@ ++# if !(defined __cplusplus && defined GNULIB_NAMESPACE) ++# undef closedir ++# define closedir rpl_closedir ++# define GNULIB_defined_closedir 1 ++# endif ++_GL_FUNCDECL_RPL (closedir, int, (DIR *dirp) _GL_ARG_NONNULL ((1))); ++_GL_CXXALIAS_RPL (closedir, int, (DIR *dirp)); ++# else ++# if !@HAVE_CLOSEDIR@ ++_GL_FUNCDECL_SYS (closedir, int, (DIR *dirp) _GL_ARG_NONNULL ((1))); ++# endif ++_GL_CXXALIAS_SYS (closedir, int, (DIR *dirp)); ++# endif ++_GL_CXXALIASWARN (closedir); ++#elif defined GNULIB_POSIXCHECK ++# undef closedir ++# if HAVE_RAW_DECL_CLOSEDIR ++_GL_WARN_ON_USE (closedir, "closedir is not portable - " ++ "use gnulib module closedir for portability"); ++# endif ++#endif ++ + #if @GNULIB_OPENDIR@ + # if @REPLACE_OPENDIR@ + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) +@@ -81,20 +105,36 @@ typedef struct gl_directory DIR; + # define opendir rpl_opendir + # define GNULIB_defined_opendir 1 + # endif +-_GL_FUNCDECL_RPL (opendir, DIR *, (const char *dir_name) _GL_ARG_NONNULL ((1))); ++_GL_FUNCDECL_RPL (opendir, DIR *, ++ (const char *dir_name) ++ _GL_ARG_NONNULL ((1)) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC (closedir, 1)); + _GL_CXXALIAS_RPL (opendir, DIR *, (const char *dir_name)); + # else +-# if !@HAVE_OPENDIR@ +-_GL_FUNCDECL_SYS (opendir, DIR *, (const char *dir_name) _GL_ARG_NONNULL ((1))); ++# if !@HAVE_OPENDIR@ || __GNUC__ >= 11 ++_GL_FUNCDECL_SYS (opendir, DIR *, ++ (const char *dir_name) ++ _GL_ARG_NONNULL ((1)) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC (closedir, 1)); + # endif + _GL_CXXALIAS_SYS (opendir, DIR *, (const char *dir_name)); + # endif + _GL_CXXALIASWARN (opendir); +-#elif defined GNULIB_POSIXCHECK +-# undef opendir +-# if HAVE_RAW_DECL_OPENDIR ++#else ++# if @GNULIB_CLOSEDIR@ && __GNUC__ >= 11 && !defined opendir ++/* For -Wmismatched-dealloc: Associate opendir with closedir or ++ rpl_closedir. */ ++_GL_FUNCDECL_SYS (opendir, DIR *, ++ (const char *dir_name) ++ _GL_ARG_NONNULL ((1)) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC (closedir, 1)); ++# endif ++# if defined GNULIB_POSIXCHECK ++# undef opendir ++# if HAVE_RAW_DECL_OPENDIR + _GL_WARN_ON_USE (opendir, "opendir is not portable - " + "use gnulib module opendir for portability"); ++# endif + # endif + #endif + +@@ -126,30 +166,6 @@ _GL_WARN_ON_USE (rewinddir, "rewinddir is not portable - " + # endif + #endif + +-#if @GNULIB_CLOSEDIR@ +-# if @REPLACE_CLOSEDIR@ +-# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +-# undef closedir +-# define closedir rpl_closedir +-# define GNULIB_defined_closedir 1 +-# endif +-_GL_FUNCDECL_RPL (closedir, int, (DIR *dirp) _GL_ARG_NONNULL ((1))); +-_GL_CXXALIAS_RPL (closedir, int, (DIR *dirp)); +-# else +-# if !@HAVE_CLOSEDIR@ +-_GL_FUNCDECL_SYS (closedir, int, (DIR *dirp) _GL_ARG_NONNULL ((1))); +-# endif +-_GL_CXXALIAS_SYS (closedir, int, (DIR *dirp)); +-# endif +-_GL_CXXALIASWARN (closedir); +-#elif defined GNULIB_POSIXCHECK +-# undef closedir +-# if HAVE_RAW_DECL_CLOSEDIR +-_GL_WARN_ON_USE (closedir, "closedir is not portable - " +- "use gnulib module closedir for portability"); +-# endif +-#endif +- + #if @GNULIB_DIRFD@ + /* Return the file descriptor associated with the given directory stream, + or -1 if none exists. */ +@@ -200,20 +216,33 @@ _GL_WARN_ON_USE (dirfd, "dirfd is unportable - " + # undef fdopendir + # define fdopendir rpl_fdopendir + # endif +-_GL_FUNCDECL_RPL (fdopendir, DIR *, (int fd)); ++_GL_FUNCDECL_RPL (fdopendir, DIR *, ++ (int fd) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC (closedir, 1)); + _GL_CXXALIAS_RPL (fdopendir, DIR *, (int fd)); + # else +-# if !@HAVE_FDOPENDIR@ || !@HAVE_DECL_FDOPENDIR@ +-_GL_FUNCDECL_SYS (fdopendir, DIR *, (int fd)); ++# if !@HAVE_FDOPENDIR@ || !@HAVE_DECL_FDOPENDIR@ || __GNUC__ >= 11 ++_GL_FUNCDECL_SYS (fdopendir, DIR *, ++ (int fd) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC (closedir, 1)); + # endif + _GL_CXXALIAS_SYS (fdopendir, DIR *, (int fd)); + # endif + _GL_CXXALIASWARN (fdopendir); +-#elif defined GNULIB_POSIXCHECK +-# undef fdopendir +-# if HAVE_RAW_DECL_FDOPENDIR ++#else ++# if @GNULIB_CLOSEDIR@ && __GNUC__ >= 11 && !defined fdopendir ++/* For -Wmismatched-dealloc: Associate fdopendir with closedir or ++ rpl_closedir. */ ++_GL_FUNCDECL_SYS (fdopendir, DIR *, ++ (int fd) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC (closedir, 1)); ++# endif ++# if defined GNULIB_POSIXCHECK ++# undef fdopendir ++# if HAVE_RAW_DECL_FDOPENDIR + _GL_WARN_ON_USE (fdopendir, "fdopendir is unportable - " + "use gnulib module fdopendir for portability"); ++# endif + # endif + #endif + +diff --git a/lib/dirfd.c b/lib/dirfd.c +index 7da640f..640cb4f 100644 +--- a/lib/dirfd.c ++++ b/lib/dirfd.c +@@ -2,12 +2,12 @@ + + Copyright (C) 2001, 2006, 2008-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/dirname-lgpl.c b/lib/dirname-lgpl.c +index 9cc5db7..95f9c99 100644 +--- a/lib/dirname-lgpl.c ++++ b/lib/dirname-lgpl.c +@@ -3,12 +3,12 @@ + Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2021 Free Software + Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/dirname.h b/lib/dirname.h +index dce1859..25abc7b 100644 +--- a/lib/dirname.h ++++ b/lib/dirname.h +@@ -1,26 +1,26 @@ +-/* Take file names apart into directory and base names. ++/* Take file names apart into directory and base names. + +- Copyright (C) 1998, 2001, 2003-2006, 2009-2021 Free Software Foundation, +- Inc. ++ Copyright (C) 1998, 2001, 2003-2006, 2009-2021 Free Software Foundation, ++ Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details. ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License +- along with this program. If not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + #ifndef DIRNAME_H_ + # define DIRNAME_H_ 1 + + # include +-# include ++# include + # include "filename.h" + # include "basename-lgpl.h" + +@@ -33,11 +33,16 @@ extern "C" { + #endif + + # if GNULIB_DIRNAME +-char *base_name (char const *file) _GL_ATTRIBUTE_MALLOC; +-char *dir_name (char const *file); ++char *base_name (char const *file) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE ++ _GL_ATTRIBUTE_RETURNS_NONNULL; ++char *dir_name (char const *file) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE ++ _GL_ATTRIBUTE_RETURNS_NONNULL; + # endif + +-char *mdir_name (char const *file); ++char *mdir_name (char const *file) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE; + size_t dir_len (char const *file) _GL_ATTRIBUTE_PURE; + + bool strip_trailing_slashes (char *file); +diff --git a/lib/dup2.c b/lib/dup2.c +index 653ef89..53e5552 100644 +--- a/lib/dup2.c ++++ b/lib/dup2.c +@@ -2,12 +2,12 @@ + + Copyright (C) 1999, 2004-2007, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/duplocale.c b/lib/duplocale.c +index 430634d..bc8740d 100644 +--- a/lib/duplocale.c ++++ b/lib/duplocale.c +@@ -1,12 +1,12 @@ + /* Duplicate a locale object. + Copyright (C) 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser 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, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/dynarray.h b/lib/dynarray.h +index 5db6ed9..ec64273 100644 +--- a/lib/dynarray.h ++++ b/lib/dynarray.h +@@ -1,12 +1,12 @@ + /* Type-safe arrays which grow dynamically. + Copyright 2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +@@ -257,18 +257,22 @@ static DYNARRAY_ELEMENT * + + #if defined DYNARRAY_STRUCT || defined DYNARRAY_ELEMENT || defined DYNARRAY_PREFIX + +-# include ++# ifndef _GL_LIKELY ++/* Rely on __builtin_expect, as provided by the module 'builtin-expect'. */ ++# define _GL_LIKELY(cond) __builtin_expect ((cond), 1) ++# define _GL_UNLIKELY(cond) __builtin_expect ((cond), 0) ++# endif + + /* Define auxiliary structs and declare auxiliary functions, common to all + instantiations of dynarray. */ +-# include ++# include + + /* Define the instantiation, specified through + DYNARRAY_STRUCT + DYNARRAY_ELEMENT + DYNARRAY_PREFIX + etc. */ +-# include ++# include + + #else + +diff --git a/lib/errno.in.h b/lib/errno.in.h +index 0ae2ace..3cad9e2 100644 +--- a/lib/errno.in.h ++++ b/lib/errno.in.h +@@ -2,18 +2,18 @@ + + Copyright (C) 2008-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + #ifndef _ at GUARD_PREFIX@_ERRNO_H + +diff --git a/lib/fcntl.c b/lib/fcntl.c +index e6c4b8e..c744eb9 100644 +--- a/lib/fcntl.c ++++ b/lib/fcntl.c +@@ -2,12 +2,12 @@ + + Copyright (C) 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/fcntl.in.h b/lib/fcntl.in.h +index 7254a56..26dedc3 100644 +--- a/lib/fcntl.in.h ++++ b/lib/fcntl.in.h +@@ -2,12 +2,12 @@ + + Copyright (C) 2006-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/fd-hook.c b/lib/fd-hook.c +index f8e2781..75b1626 100644 +--- a/lib/fd-hook.c ++++ b/lib/fd-hook.c +@@ -2,15 +2,15 @@ + Copyright (C) 2009-2021 Free Software Foundation, Inc. + Written by Bruno Haible , 2009. + +- This program is free software: you can redistribute it and/or modify it +- under the terms of the GNU Lesser General Public License as published +- by the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 +- Lesser General Public License for more details. ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ +diff --git a/lib/fd-hook.h b/lib/fd-hook.h +index 0005db7..98e2a52 100644 +--- a/lib/fd-hook.h ++++ b/lib/fd-hook.h +@@ -1,15 +1,15 @@ + /* Hook for making file descriptor functions close(), ioctl() extensible. + Copyright (C) 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify it +- under the terms of the GNU Lesser General Public License as published +- by the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 +- Lesser General Public License for more details. ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ +diff --git a/lib/float+.h b/lib/float+.h +index d814bf1..ad891f6 100644 +--- a/lib/float+.h ++++ b/lib/float+.h +@@ -2,18 +2,18 @@ + Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. + Written by Bruno Haible , 2007. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + #ifndef _FLOATPLUS_H + #define _FLOATPLUS_H +diff --git a/lib/float.c b/lib/float.c +index 5c16d61..dd1e84a 100644 +--- a/lib/float.c ++++ b/lib/float.c +@@ -2,12 +2,12 @@ + Copyright (C) 2011-2021 Free Software Foundation, Inc. + Written by Bruno Haible , 2011. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/float.in.h b/lib/float.in.h +index 1179df5..f52aba3 100644 +--- a/lib/float.in.h ++++ b/lib/float.in.h +@@ -2,12 +2,12 @@ + + Copyright (C) 2007-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/floor.c b/lib/floor.c +index 9f13d16..1530300 100644 +--- a/lib/floor.c ++++ b/lib/floor.c +@@ -1,12 +1,12 @@ + /* Round towards negative infinity. + Copyright (C) 2007, 2010-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser 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, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/free.c b/lib/free.c +index b221241..780f03d 100644 +--- a/lib/free.c ++++ b/lib/free.c +@@ -2,12 +2,12 @@ + + Copyright (C) 2003, 2006, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/frexp.c b/lib/frexp.c +index 55340b8..ab5f343 100644 +--- a/lib/frexp.c ++++ b/lib/frexp.c +@@ -1,12 +1,12 @@ + /* Split a double into fraction and mantissa. + Copyright (C) 2007-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/fstat.c b/lib/fstat.c +index 30440d6..512c688 100644 +--- a/lib/fstat.c ++++ b/lib/fstat.c +@@ -1,12 +1,12 @@ + /* fstat() replacement. + Copyright (C) 2011-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/fsync.c b/lib/fsync.c +index 71fcdde..99a932d 100644 +--- a/lib/fsync.c ++++ b/lib/fsync.c +@@ -9,15 +9,15 @@ + + Copyright (C) 2008-2021 Free Software Foundation, Inc. + +- This library is free software; you can redistribute it and/or +- modify it under the terms of the GNU Lesser General Public +- License as published by the Free Software Foundation; either +- version 2.1 of the License, or (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This library is distributed in the hope that it will be useful, ++ This file 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 +- Lesser General Public License for more details. ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ +diff --git a/lib/full-read.c b/lib/full-read.c +index 32ff1a5..53be659 100644 +--- a/lib/full-read.c ++++ b/lib/full-read.c +@@ -1,12 +1,12 @@ + /* An interface to read that retries after partial reads and interrupts. + Copyright (C) 2002-2003, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/full-read.h b/lib/full-read.h +index 450d645..b36f2e1 100644 +--- a/lib/full-read.h ++++ b/lib/full-read.h +@@ -2,12 +2,12 @@ + + Copyright (C) 2002, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/full-write.c b/lib/full-write.c +index acbfc31..614ca0b 100644 +--- a/lib/full-write.c ++++ b/lib/full-write.c +@@ -2,12 +2,12 @@ + + Copyright (C) 1993-1994, 1997-2006, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/full-write.h b/lib/full-write.h +index 1220d05..c316224 100644 +--- a/lib/full-write.h ++++ b/lib/full-write.h +@@ -2,12 +2,12 @@ + + Copyright (C) 2002-2003, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/gai_strerror.c b/lib/gai_strerror.c +index 907e8e6..4874ef5 100644 +--- a/lib/gai_strerror.c ++++ b/lib/gai_strerror.c +@@ -3,18 +3,18 @@ + This file is part of the GNU C Library. + Contributed by Philip Blundell , 1997. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + #ifndef _LIBC + # include +diff --git a/lib/getaddrinfo.c b/lib/getaddrinfo.c +index 05fc59e..0c42d1b 100644 +--- a/lib/getaddrinfo.c ++++ b/lib/getaddrinfo.c +@@ -2,18 +2,18 @@ + Copyright (C) 1997, 2001-2002, 2004-2021 Free Software Foundation, Inc. + Contributed by Simon Josefsson . + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + /* Don't use __attribute__ __nonnull__ in this compilation unit. Otherwise gcc + optimizes away the sa == NULL test below. */ +diff --git a/lib/getdtablesize.c b/lib/getdtablesize.c +index 918db9d..5006c2d 100644 +--- a/lib/getdtablesize.c ++++ b/lib/getdtablesize.c +@@ -2,12 +2,12 @@ + Copyright (C) 2008-2021 Free Software Foundation, Inc. + Written by Bruno Haible , 2008. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/getlogin.c b/lib/getlogin.c +index 4a70994..7b78c67 100644 +--- a/lib/getlogin.c ++++ b/lib/getlogin.c +@@ -2,12 +2,12 @@ + + Copyright (C) 2010-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/getpeername.c b/lib/getpeername.c +index 5d9cf79..468bb3d 100644 +--- a/lib/getpeername.c ++++ b/lib/getpeername.c +@@ -2,12 +2,12 @@ + + Copyright (C) 2008-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/getrandom.c b/lib/getrandom.c +index b467caa..a186c4d 100644 +--- a/lib/getrandom.c ++++ b/lib/getrandom.c +@@ -2,12 +2,12 @@ + + Copyright 2020-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +@@ -178,7 +178,11 @@ getrandom (void *buffer, size_t length, unsigned int flags) + + (flags & GRND_NONBLOCK ? O_NONBLOCK : 0)); + fd = open (randdevice[devrandom], oflags); + if (fd < 0) +- return fd; ++ { ++ if (errno == ENOENT || errno == ENOTDIR) ++ errno = ENOSYS; ++ return -1; ++ } + randfd[devrandom] = fd; + } + +diff --git a/lib/getsockname.c b/lib/getsockname.c +index 83c1b7d..d1f17b3 100644 +--- a/lib/getsockname.c ++++ b/lib/getsockname.c +@@ -2,12 +2,12 @@ + + Copyright (C) 2008-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/getsockopt.c b/lib/getsockopt.c +index cec4933..b92d034 100644 +--- a/lib/getsockopt.c ++++ b/lib/getsockopt.c +@@ -2,12 +2,12 @@ + + Copyright (C) 2008-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/gettext.h b/lib/gettext.h +index dd05cda..f1c7a24 100644 +--- a/lib/gettext.h ++++ b/lib/gettext.h +@@ -2,18 +2,18 @@ + Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2021 Free Software + Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + #ifndef _LIBGETTEXT_H + #define _LIBGETTEXT_H 1 +diff --git a/lib/hard-locale.c b/lib/hard-locale.c +index ab3610d..8b6802d 100644 +--- a/lib/hard-locale.c ++++ b/lib/hard-locale.c +@@ -3,12 +3,12 @@ + Copyright (C) 1997-1999, 2002-2004, 2006-2007, 2009-2021 Free Software + Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/hard-locale.h b/lib/hard-locale.h +index c4449f9..eba6601 100644 +--- a/lib/hard-locale.h ++++ b/lib/hard-locale.h +@@ -2,12 +2,12 @@ + + Copyright (C) 1999, 2003-2004, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/iconv.c b/lib/iconv.c +index f3480aa..bf51493 100644 +--- a/lib/iconv.c ++++ b/lib/iconv.c +@@ -1,18 +1,18 @@ + /* Character set conversion. + Copyright (C) 1999-2001, 2007, 2009-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + #include + +diff --git a/lib/iconv.in.h b/lib/iconv.in.h +index 0fc0fa7..3a2f94e 100644 +--- a/lib/iconv.in.h ++++ b/lib/iconv.in.h +@@ -2,18 +2,18 @@ + + Copyright (C) 2007-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + #ifndef _ at GUARD_PREFIX@_ICONV_H + +diff --git a/lib/iconv_close.c b/lib/iconv_close.c +index bc40fec..7429b92 100644 +--- a/lib/iconv_close.c ++++ b/lib/iconv_close.c +@@ -1,18 +1,18 @@ + /* Character set conversion. + Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + #include + +diff --git a/lib/iconv_open-aix.gperf b/lib/iconv_open-aix.gperf +index 20ce70a..d073759 100644 +--- a/lib/iconv_open-aix.gperf ++++ b/lib/iconv_open-aix.gperf +@@ -1,18 +1,18 @@ + /* Character set conversion. + Copyright (C) 2007, 2020-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + struct mapping { int standard_name; const char vendor_name[10 + 1]; }; + %struct-type +diff --git a/lib/iconv_open-hpux.gperf b/lib/iconv_open-hpux.gperf +index 921c722..f4664d6 100644 +--- a/lib/iconv_open-hpux.gperf ++++ b/lib/iconv_open-hpux.gperf +@@ -1,18 +1,18 @@ + /* Character set conversion. + Copyright (C) 2007, 2020-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + struct mapping { int standard_name; const char vendor_name[9 + 1]; }; + %struct-type +diff --git a/lib/iconv_open-irix.gperf b/lib/iconv_open-irix.gperf +index 6241de6..9885d92 100644 +--- a/lib/iconv_open-irix.gperf ++++ b/lib/iconv_open-irix.gperf +@@ -1,18 +1,18 @@ + /* Character set conversion. + Copyright (C) 2007, 2020-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + struct mapping { int standard_name; const char vendor_name[10 + 1]; }; + %struct-type +diff --git a/lib/iconv_open-osf.gperf b/lib/iconv_open-osf.gperf +index 97d570c..d818d79 100644 +--- a/lib/iconv_open-osf.gperf ++++ b/lib/iconv_open-osf.gperf +@@ -1,18 +1,18 @@ + /* Character set conversion. + Copyright (C) 2007, 2020-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + struct mapping { int standard_name; const char vendor_name[10 + 1]; }; + %struct-type +diff --git a/lib/iconv_open-solaris.gperf b/lib/iconv_open-solaris.gperf +index 0283aba..648dd3a 100644 +--- a/lib/iconv_open-solaris.gperf ++++ b/lib/iconv_open-solaris.gperf +@@ -1,18 +1,18 @@ + /* Character set conversion. + Copyright (C) 2007, 2009, 2020-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + struct mapping { int standard_name; const char vendor_name[10 + 1]; }; + %struct-type +diff --git a/lib/iconv_open-zos.gperf b/lib/iconv_open-zos.gperf +index faf5d65..1c3552e 100644 +--- a/lib/iconv_open-zos.gperf ++++ b/lib/iconv_open-zos.gperf +@@ -1,18 +1,18 @@ + /* Character set conversion. + Copyright (C) 2019-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + struct mapping { int standard_name; const char vendor_name[10 + 1]; }; + %struct-type +diff --git a/lib/iconv_open.c b/lib/iconv_open.c +index 304592e..e573556 100644 +--- a/lib/iconv_open.c ++++ b/lib/iconv_open.c +@@ -1,18 +1,18 @@ + /* Character set conversion. + Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + #include + +diff --git a/lib/iconveh.h b/lib/iconveh.h +index b2be8fa..cbf692e 100644 +--- a/lib/iconveh.h ++++ b/lib/iconveh.h +@@ -2,12 +2,12 @@ + Copyright (C) 2001-2007, 2009-2021 Free Software Foundation, Inc. + Written by Bruno Haible. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/inet_ntop.c b/lib/inet_ntop.c +index 5b9ea11..409e88c 100644 +--- a/lib/inet_ntop.c ++++ b/lib/inet_ntop.c +@@ -2,18 +2,18 @@ + + Copyright (C) 2005-2006, 2008-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + /* + * Copyright (c) 1996-1999 by Internet Software Consortium. +diff --git a/lib/inet_pton.c b/lib/inet_pton.c +index 57dc7dc..14e8b0a 100644 +--- a/lib/inet_pton.c ++++ b/lib/inet_pton.c +@@ -2,12 +2,12 @@ + + Copyright (C) 2006, 2008-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/inttypes.in.h b/lib/inttypes.in.h +index fe0af82..41cb422 100644 +--- a/lib/inttypes.in.h ++++ b/lib/inttypes.in.h +@@ -2,12 +2,12 @@ + Written by Paul Eggert, Bruno Haible, Derek Price. + This file is part of gnulib. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/isfinite.c b/lib/isfinite.c +index cfd2d33..f1373b9 100644 +--- a/lib/isfinite.c ++++ b/lib/isfinite.c +@@ -1,18 +1,18 @@ + /* Test for finite value (zero, subnormal, or normal, and not infinite or NaN). + Copyright (C) 2007-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser 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, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + /* Written by Ben Pfaff , 2007. */ + +diff --git a/lib/isinf.c b/lib/isinf.c +index 6d4dfc0..62becf2 100644 +--- a/lib/isinf.c ++++ b/lib/isinf.c +@@ -1,18 +1,18 @@ + /* Test for positive or negative infinity. + Copyright (C) 2007-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser 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, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + /* Written by Ben Pfaff , 2008. */ + +diff --git a/lib/isnan.c b/lib/isnan.c +index 2282269..ed3452f 100644 +--- a/lib/isnan.c ++++ b/lib/isnan.c +@@ -1,12 +1,12 @@ + /* Test for NaN that does not need libm. + Copyright (C) 2007-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/isnand-nolibm.h b/lib/isnand-nolibm.h +index fbed474..df64f4e 100644 +--- a/lib/isnand-nolibm.h ++++ b/lib/isnand-nolibm.h +@@ -1,12 +1,12 @@ + /* Test for NaN that does not need libm. + Copyright (C) 2007-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/isnand.c b/lib/isnand.c +index f359130..7c5df90 100644 +--- a/lib/isnand.c ++++ b/lib/isnand.c +@@ -1,12 +1,12 @@ + /* Test for NaN that does not need libm. + Copyright (C) 2008-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/isnanf-nolibm.h b/lib/isnanf-nolibm.h +index ba609d5..bd85811 100644 +--- a/lib/isnanf-nolibm.h ++++ b/lib/isnanf-nolibm.h +@@ -1,12 +1,12 @@ + /* Test for NaN that does not need libm. + Copyright (C) 2007-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/isnanf.c b/lib/isnanf.c +index 94a32e5..3b60340 100644 +--- a/lib/isnanf.c ++++ b/lib/isnanf.c +@@ -1,12 +1,12 @@ + /* Test for NaN that does not need libm. + Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/isnanl-nolibm.h b/lib/isnanl-nolibm.h +index 797c06b..41fe156 100644 +--- a/lib/isnanl-nolibm.h ++++ b/lib/isnanl-nolibm.h +@@ -1,12 +1,12 @@ + /* Test for NaN that does not need libm. + Copyright (C) 2007-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/isnanl.c b/lib/isnanl.c +index b459560..e8dedf0 100644 +--- a/lib/isnanl.c ++++ b/lib/isnanl.c +@@ -1,12 +1,12 @@ + /* Test for NaN that does not need libm. + Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/itold.c b/lib/itold.c +index f52216a..7984866 100644 +--- a/lib/itold.c ++++ b/lib/itold.c +@@ -2,12 +2,12 @@ + Copyright (C) 2011-2021 Free Software Foundation, Inc. + Written by Bruno Haible , 2011. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/langinfo.in.h b/lib/langinfo.in.h +index e8ac12c..4873899 100644 +--- a/lib/langinfo.in.h ++++ b/lib/langinfo.in.h +@@ -1,18 +1,18 @@ + /* Substitute for and wrapper around . + Copyright (C) 2009-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + /* + * POSIX for platforms that lack it or have an incomplete one. +diff --git a/lib/lc-charset-dispatch.c b/lib/lc-charset-dispatch.c +index 98c6e9d..88a0bd3 100644 +--- a/lib/lc-charset-dispatch.c ++++ b/lib/lc-charset-dispatch.c +@@ -1,12 +1,12 @@ + /* Dispatching based on the current locale's character encoding. + Copyright (C) 2018-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/lc-charset-dispatch.h b/lib/lc-charset-dispatch.h +index d9d1ac1..59b485d 100644 +--- a/lib/lc-charset-dispatch.h ++++ b/lib/lc-charset-dispatch.h +@@ -1,12 +1,12 @@ + /* Dispatching based on the current locale's character encoding. + Copyright (C) 2018-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/libc-config.h b/lib/libc-config.h +index f14013f..886c11f 100644 +--- a/lib/libc-config.h ++++ b/lib/libc-config.h +@@ -28,7 +28,10 @@ + + When compiled as part of glibc this is a no-op; when compiled as + part of Gnulib this includes Gnulib's and defines macros +- that glibc library code would normally assume. */ ++ that glibc library code would normally assume. ++ ++ Note: This header file MUST NOT be included by public header files ++ of Gnulib. */ + + #include + +@@ -71,7 +74,7 @@ + # endif + #endif + +-#ifndef __attribute_maybe_unused__ ++#ifndef __attribute_nonnull__ + /* either does not exist, or is too old for Gnulib. + Prepare to include , which is Gnulib's version of a + more-recent glibc . */ +@@ -80,13 +83,9 @@ + # ifndef _FEATURES_H + # define _FEATURES_H 1 + # endif +-/* Define __WORDSIZE so that does not attempt to include +- nonexistent files. Make it a syntax error, since Gnulib does not +- use __WORDSIZE now, and if Gnulib uses it later the syntax error +- will let us know that __WORDSIZE needs configuring. */ +-# ifndef __WORDSIZE +-# define __WORDSIZE %%% +-# endif ++/* Define __GNULIB_CDEFS so that does not attempt to include ++ nonexistent files. */ ++# define __GNULIB_CDEFS + /* Undef the macros unconditionally defined by our copy of glibc + , so that they do not clash with any system-defined + versions. */ +@@ -118,6 +117,9 @@ + # undef __THROW + # undef __THROWNL + # undef __attr_access ++# undef __attr_access_none ++# undef __attr_dealloc ++# undef __attr_dealloc_free + # undef __attribute__ + # undef __attribute_alloc_size__ + # undef __attribute_artificial__ +diff --git a/lib/libunistring.valgrind b/lib/libunistring.valgrind +index 712c39a..9eee19a 100644 +--- a/lib/libunistring.valgrind ++++ b/lib/libunistring.valgrind +@@ -2,18 +2,26 @@ + + # Copyright (C) 2010-2021 Free Software Foundation, Inc. + # +-# This program is free software: you can redistribute it and/or modify it +-# under the terms of the GNU Lesser General Public License as published +-# by the Free Software Foundation; either version 2 of the License, or +-# (at your option) any later version. ++# This file is free software. ++# It is dual-licensed under "the GNU LGPLv3+ or the GNU GPLv2+". ++# You can redistribute it and/or modify it under either ++# - the terms of the GNU Lesser General Public License as published ++# by the Free Software Foundation; either version 3, or (at your ++# option) any later version, or ++# - the terms of the GNU General Public License as published by the ++# Free Software Foundation; either version 2, or (at your option) ++# any later version, or ++# - the same dual license "the GNU LGPLv3+ or the GNU GPLv2+". + # + # 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 +-# Lesser General Public License for more details. ++# Lesser General Public License and the GNU General Public License ++# for more details. + # +-# You should have received a copy of the GNU Lesser General Public License +-# along with this program. If not, see . ++# You should have received a copy of the GNU Lesser General Public ++# License and of the GNU General Public License along with this ++# program. If not, see . + + # Suppress a valgrind message about use of uninitialized memory in freea(). + # This use is OK because it provides only a speedup. +diff --git a/lib/limits.in.h b/lib/limits.in.h +index 4675ba4..2ecafeb 100644 +--- a/lib/limits.in.h ++++ b/lib/limits.in.h +@@ -2,18 +2,18 @@ + + Copyright 2016-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or +- modify it under the terms of the GNU Lesser General Public License +- as published by the Free Software Foundation; either version 2, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + #if __GNUC__ >= 3 + @PRAGMA_SYSTEM_HEADER@ +@@ -99,10 +99,11 @@ + # endif + #endif + +-/* Macros specified by ISO/IEC TS 18661-1:2014. */ ++/* Macros specified by C2x and by ISO/IEC TS 18661-1:2014. */ + + #if (! defined ULLONG_WIDTH \ +- && (defined _GNU_SOURCE || defined __STDC_WANT_IEC_60559_BFP_EXT__)) ++ && (defined _GNU_SOURCE || defined __STDC_WANT_IEC_60559_BFP_EXT__ \ ++ || (defined __STDC_VERSION__ && 201710 < __STDC_VERSION__))) + # define CHAR_WIDTH _GL_INTEGER_WIDTH (CHAR_MIN, CHAR_MAX) + # define SCHAR_WIDTH _GL_INTEGER_WIDTH (SCHAR_MIN, SCHAR_MAX) + # define UCHAR_WIDTH _GL_INTEGER_WIDTH (0, UCHAR_MAX) +@@ -114,7 +115,16 @@ + # define ULONG_WIDTH _GL_INTEGER_WIDTH (0, ULONG_MAX) + # define LLONG_WIDTH _GL_INTEGER_WIDTH (LLONG_MIN, LLONG_MAX) + # define ULLONG_WIDTH _GL_INTEGER_WIDTH (0, ULLONG_MAX) +-#endif /* !ULLONG_WIDTH && (_GNU_SOURCE || __STDC_WANT_IEC_60559_BFP_EXT__) */ ++#endif ++ ++/* Macros specified by C2x. */ ++ ++#if (! defined BOOL_WIDTH \ ++ && (defined _GNU_SOURCE \ ++ || (defined __STDC_VERSION__ && 201710 < __STDC_VERSION__))) ++# define BOOL_MAX 1 ++# define BOOL_WIDTH 1 ++#endif + + #endif /* _ at GUARD_PREFIX@_LIMITS_H */ + #endif /* _ at GUARD_PREFIX@_LIMITS_H */ +diff --git a/lib/link.c b/lib/link.c +index 3ba897a..bd4bef9 100644 +--- a/lib/link.c ++++ b/lib/link.c +@@ -2,18 +2,18 @@ + + Copyright (C) 2009-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + #include + +diff --git a/lib/listen.c b/lib/listen.c +index ccf881c..a145f82 100644 +--- a/lib/listen.c ++++ b/lib/listen.c +@@ -2,12 +2,12 @@ + + Copyright (C) 2008-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/localcharset.c b/lib/localcharset.c +index 87a5979..9c22050 100644 +--- a/lib/localcharset.c ++++ b/lib/localcharset.c +@@ -2,18 +2,18 @@ + + Copyright (C) 2000-2006, 2008-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + /* Written by Bruno Haible . */ + +diff --git a/lib/localcharset.h b/lib/localcharset.h +index c2c1c67..27c3ab6 100644 +--- a/lib/localcharset.h ++++ b/lib/localcharset.h +@@ -2,18 +2,18 @@ + Copyright (C) 2000-2003, 2009-2021 Free Software Foundation, Inc. + This file is part of the GNU CHARSET Library. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + #ifndef _LOCALCHARSET_H + #define _LOCALCHARSET_H +diff --git a/lib/locale.in.h b/lib/locale.in.h +index 4eb3c80..1063070 100644 +--- a/lib/locale.in.h ++++ b/lib/locale.in.h +@@ -1,12 +1,12 @@ + /* A POSIX . + Copyright (C) 2007-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/localeconv.c b/lib/localeconv.c +index cdcaf86..25e95a1 100644 +--- a/lib/localeconv.c ++++ b/lib/localeconv.c +@@ -1,12 +1,12 @@ + /* Query locale dependent information for formatting numbers. + Copyright (C) 2012-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/log.c b/lib/log.c +index 03e9ac9..3f142e8 100644 +--- a/lib/log.c ++++ b/lib/log.c +@@ -1,12 +1,12 @@ + /* Logarithm. + Copyright (C) 2012-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser 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, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/log1p.c b/lib/log1p.c +index 0e51498..c45c6ff 100644 +--- a/lib/log1p.c ++++ b/lib/log1p.c +@@ -1,12 +1,12 @@ + /* Natural logarithm of 1 plus argument. + Copyright (C) 2012-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser 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, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/lstat.c b/lib/lstat.c +index d414d3a..7de0bf1 100644 +--- a/lib/lstat.c ++++ b/lib/lstat.c +@@ -2,12 +2,12 @@ + + Copyright (C) 1997-2006, 2008-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/malloc.c b/lib/malloc.c +index 6bbb97d..0d8b359 100644 +--- a/lib/malloc.c ++++ b/lib/malloc.c +@@ -2,61 +2,50 @@ + + Copyright (C) 1997-1998, 2006-2007, 2009-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + /* written by Jim Meyering and Bruno Haible */ + + #define _GL_USE_STDLIB_ALLOC 1 + #include +-/* Only the AC_FUNC_MALLOC macro defines 'malloc' already in config.h. */ +-#ifdef malloc +-# define NEED_MALLOC_GNU 1 +-# undef malloc +-/* Whereas the gnulib module 'malloc-gnu' defines HAVE_MALLOC_GNU. */ +-#elif GNULIB_MALLOC_GNU && !HAVE_MALLOC_GNU +-# define NEED_MALLOC_GNU 1 +-#endif + + #include + +-/* A function definition is only needed if NEED_MALLOC_GNU is defined above +- or if the module 'malloc-posix' requests it. */ +-#if NEED_MALLOC_GNU || (GNULIB_MALLOC_POSIX && !HAVE_MALLOC_POSIX) ++#include + +-# include ++#include "xalloc-oversized.h" + +-/* Allocate an N-byte block of memory from the heap. +- If N is zero, allocate a 1-byte block. */ ++/* Allocate an N-byte block of memory from the heap, even if N is 0. */ + + void * + rpl_malloc (size_t n) + { +- void *result; +- +-# if NEED_MALLOC_GNU + if (n == 0) + n = 1; +-# endif + +- result = malloc (n); ++ if (xalloc_oversized (n, 1)) ++ { ++ errno = ENOMEM; ++ return NULL; ++ } ++ ++ void *result = malloc (n); + +-# if !HAVE_MALLOC_POSIX ++#if !HAVE_MALLOC_POSIX + if (result == NULL) + errno = ENOMEM; +-# endif ++#endif + + return result; + } +- +-#endif +diff --git a/lib/malloc/dynarray_at_failure.c b/lib/malloc/dynarray_at_failure.c +index 4f840db..8dd6850 100644 +--- a/lib/malloc/dynarray_at_failure.c ++++ b/lib/malloc/dynarray_at_failure.c +@@ -18,11 +18,11 @@ + + #ifndef _LIBC + # include ++# include + #endif + + #include + #include +-#include + + void + __libc_dynarray_at_failure (size_t size, size_t index) +@@ -32,6 +32,7 @@ __libc_dynarray_at_failure (size_t size, size_t index) + __snprintf (buf, sizeof (buf), "Fatal glibc error: " + "array index %zu not less than array length %zu\n", + index, size); ++ __libc_fatal (buf); + #else + abort (); + #endif +diff --git a/lib/malloca.c b/lib/malloca.c +index a546b30..b488423 100644 +--- a/lib/malloca.c ++++ b/lib/malloca.c +@@ -2,18 +2,18 @@ + Copyright (C) 2003, 2006-2007, 2009-2021 Free Software Foundation, Inc. + Written by Bruno Haible , 2003, 2018. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + #define _GL_USE_STDLIB_ALLOC 1 + #include +@@ -21,6 +21,8 @@ + /* Specification. */ + #include "malloca.h" + ++#include "idx.h" ++#include "intprops.h" + #include "verify.h" + + /* The speed critical point in this file is freea() applied to an alloca() +@@ -45,24 +47,30 @@ mmalloca (size_t n) + #if HAVE_ALLOCA + /* Allocate one more word, used to determine the address to pass to freea(), + and room for the alignment ? sa_alignment_max mod 2*sa_alignment_max. */ +- size_t nplus = n + sizeof (small_t) + 2 * sa_alignment_max - 1; +- +- if (nplus >= n) ++ uintptr_t alignment2_mask = 2 * sa_alignment_max - 1; ++ int plus = sizeof (small_t) + alignment2_mask; ++ idx_t nplus; ++ if (!INT_ADD_WRAPV (n, plus, &nplus) && !xalloc_oversized (nplus, 1)) + { + char *mem = (char *) malloc (nplus); + + if (mem != NULL) + { +- char *p = +- (char *)((((uintptr_t)mem + sizeof (small_t) + sa_alignment_max - 1) +- & ~(uintptr_t)(2 * sa_alignment_max - 1)) +- + sa_alignment_max); ++ uintptr_t umem = (uintptr_t)mem, umemplus; ++ /* The INT_ADD_WRAPV avoids signed integer overflow on ++ theoretical platforms where UINTPTR_MAX <= INT_MAX. */ ++ INT_ADD_WRAPV (umem, sizeof (small_t) + sa_alignment_max - 1, ++ &umemplus); ++ idx_t offset = ((umemplus & ~alignment2_mask) ++ + sa_alignment_max - umem); ++ void *vp = mem + offset; ++ small_t *p = vp; + /* Here p >= mem + sizeof (small_t), + and p <= mem + sizeof (small_t) + 2 * sa_alignment_max - 1 + hence p + n <= mem + nplus. + So, the memory range [p, p+n) lies in the allocated memory range + [mem, mem + nplus). */ +- ((small_t *) p)[-1] = p - mem; ++ p[-1] = offset; + /* p ? sa_alignment_max mod 2*sa_alignment_max. */ + return p; + } +diff --git a/lib/malloca.h b/lib/malloca.h +index 9cf7fbb..7eb63d2 100644 +--- a/lib/malloca.h ++++ b/lib/malloca.h +@@ -2,18 +2,18 @@ + Copyright (C) 2003-2007, 2009-2021 Free Software Foundation, Inc. + Written by Bruno Haible , 2003. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + #ifndef _MALLOCA_H + #define _MALLOCA_H +@@ -51,6 +51,13 @@ extern "C" { + # define safe_alloca(N) ((void) (N), NULL) + #endif + ++/* Free a block of memory allocated through malloca(). */ ++#if HAVE_ALLOCA ++extern void freea (void *p); ++#else ++# define freea free ++#endif ++ + /* malloca(N) is a safe variant of alloca(N). It allocates N bytes of + memory allocated on the stack, that must be freed using freea() before + the function returns. Upon failure, it returns NULL. */ +@@ -65,21 +72,16 @@ extern "C" { + # define malloca(N) \ + mmalloca (N) + #endif +-extern void * mmalloca (size_t n); +- +-/* Free a block of memory allocated through malloca(). */ +-#if HAVE_ALLOCA +-extern void freea (void *p); +-#else +-# define freea free +-#endif ++extern void *mmalloca (size_t n) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC (freea, 1) ++ _GL_ATTRIBUTE_ALLOC_SIZE ((1)); + + /* nmalloca(N,S) is an overflow-safe variant of malloca (N * S). + It allocates an array of N objects, each with S bytes of memory, +- on the stack. S must be positive and N must be nonnegative. +- Either N or S should be of type ptrdiff_t or size_t or wider. ++ on the stack. N and S should be nonnegative and free of side effects. + The array must be freed using freea() before the function returns. */ +-#define nmalloca(n, s) (xalloc_oversized (n, s) ? NULL : malloca ((n) * (s))) ++#define nmalloca(n, s) \ ++ (xalloc_oversized (n, s) ? NULL : malloca ((n) * (size_t) (s))) + + + #ifdef __cplusplus +diff --git a/lib/math.c b/lib/math.c +index ba2a6ab..3ffd1d7 100644 +--- a/lib/math.c ++++ b/lib/math.c +@@ -1,4 +1,22 @@ ++/* Inline functions for . ++ ++ Copyright (C) 2012-2021 Free Software Foundation, Inc. ++ ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. ++ ++ This file 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 Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ ++ + #include ++ + #define _GL_MATH_INLINE _GL_EXTERN_INLINE + #include "math.h" + typedef int dummy; +diff --git a/lib/math.in.h b/lib/math.in.h +index d80047c..6a055fb 100644 +--- a/lib/math.in.h ++++ b/lib/math.in.h +@@ -2,12 +2,12 @@ + + Copyright (C) 2002-2003, 2007-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/mbrtowc-impl-utf8.h b/lib/mbrtowc-impl-utf8.h +index ea5ef1f..330fb10 100644 +--- a/lib/mbrtowc-impl-utf8.h ++++ b/lib/mbrtowc-impl-utf8.h +@@ -1,12 +1,12 @@ + /* Convert multibyte character to wide character. + Copyright (C) 1999-2002, 2005-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/mbrtowc-impl.h b/lib/mbrtowc-impl.h +index f7e28fc..bc3e688 100644 +--- a/lib/mbrtowc-impl.h ++++ b/lib/mbrtowc-impl.h +@@ -1,12 +1,12 @@ + /* Convert multibyte character to wide character. + Copyright (C) 1999-2002, 2005-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/mbrtowc.c b/lib/mbrtowc.c +index 0db5104..8832f6e 100644 +--- a/lib/mbrtowc.c ++++ b/lib/mbrtowc.c +@@ -2,12 +2,12 @@ + Copyright (C) 1999-2002, 2005-2021 Free Software Foundation, Inc. + Written by Bruno Haible , 2008. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/mbsinit.c b/lib/mbsinit.c +index 7ca8df7..f440155 100644 +--- a/lib/mbsinit.c ++++ b/lib/mbsinit.c +@@ -2,12 +2,12 @@ + Copyright (C) 2008-2021 Free Software Foundation, Inc. + Written by Bruno Haible , 2008. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/mbtowc-impl.h b/lib/mbtowc-impl.h +index 01342af..30d715d 100644 +--- a/lib/mbtowc-impl.h ++++ b/lib/mbtowc-impl.h +@@ -2,12 +2,12 @@ + Copyright (C) 2011-2021 Free Software Foundation, Inc. + Written by Bruno Haible , 2011. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/mbtowc-lock.c b/lib/mbtowc-lock.c +index ce74793..0f7ae6c 100644 +--- a/lib/mbtowc-lock.c ++++ b/lib/mbtowc-lock.c +@@ -1,12 +1,12 @@ + /* Return the internal lock used by mbrtowc and mbrtoc32. + Copyright (C) 2019-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/mbtowc-lock.h b/lib/mbtowc-lock.h +index 0939517..d31b0b6 100644 +--- a/lib/mbtowc-lock.h ++++ b/lib/mbtowc-lock.h +@@ -1,12 +1,12 @@ + /* Use the internal lock used by mbrtowc and mbrtoc32. + Copyright (C) 2019-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/mbtowc.c b/lib/mbtowc.c +index 2711194..47b431a 100644 +--- a/lib/mbtowc.c ++++ b/lib/mbtowc.c +@@ -2,12 +2,12 @@ + Copyright (C) 2011-2021 Free Software Foundation, Inc. + Written by Bruno Haible , 2011. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/memchr.c b/lib/memchr.c +index d8feb19..56fd59d 100644 +--- a/lib/memchr.c ++++ b/lib/memchr.c +@@ -7,21 +7,21 @@ + adaptation to memchr suggested by Dick Karpinski (dick at cca.ucsf.edu), + and implemented by Roland McGrath (roland at ai.mit.edu). + +-NOTE: The canonical source of this file is maintained with the GNU C Library. +-Bugs can be reported to bug-glibc at prep.ai.mit.edu. ++ NOTE: The canonical source of this file is maintained with the GNU C Library. ++ Bugs can be reported to bug-glibc at prep.ai.mit.edu. + +-This program is free software: you can redistribute it and/or modify it +-under the terms of the GNU Lesser General Public License as published by the +-Free Software Foundation; either version 3 of the License, or any +-later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details. ++ This file 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 Lesser General Public License for more details. + +-You should have received a copy of the GNU Lesser General Public License +-along with this program. If not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + #ifndef _LIBC + # include +diff --git a/lib/memchr.valgrind b/lib/memchr.valgrind +index 034d1ee..4f16481 100644 +--- a/lib/memchr.valgrind ++++ b/lib/memchr.valgrind +@@ -2,12 +2,12 @@ + + # Copyright (C) 2009-2021 Free Software Foundation, Inc. + # +-# This program is free software: you can redistribute it and/or modify +-# it under the terms of the GNU Lesser General Public License as published by +-# the Free Software Foundation; either version 3 of the License, or +-# (at your option) any later version. ++# This file is free software: you can redistribute it and/or modify ++# it under the terms of the GNU Lesser General Public License as ++# published by the Free Software Foundation; either version 2.1 of the ++# License, or (at your option) any later version. + # +-# This program is distributed in the hope that it will be useful, ++# This file 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 Lesser General Public License for more details. +diff --git a/lib/mempcpy.c b/lib/mempcpy.c +index c80e119..cacacdb 100644 +--- a/lib/mempcpy.c ++++ b/lib/mempcpy.c +@@ -1,18 +1,18 @@ + /* Copy memory area and return pointer after last written byte. + Copyright (C) 2003, 2007, 2009-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + #include + +diff --git a/lib/minmax.h b/lib/minmax.h +index 7d0b672..a03361b 100644 +--- a/lib/minmax.h ++++ b/lib/minmax.h +@@ -2,18 +2,18 @@ + Copyright (C) 1995, 1998, 2001, 2003, 2005, 2009-2021 Free Software + Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + #ifndef _MINMAX_H + #define _MINMAX_H +diff --git a/lib/mkdir.c b/lib/mkdir.c +index 453e428..2766cc7 100644 +--- a/lib/mkdir.c ++++ b/lib/mkdir.c +@@ -3,12 +3,12 @@ + + Copyright (C) 2001, 2003, 2006, 2008-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/mkostemp.c b/lib/mkostemp.c +index cfab635..285f1ba 100644 +--- a/lib/mkostemp.c ++++ b/lib/mkostemp.c +@@ -2,12 +2,12 @@ + Foundation, Inc. + This file is derived from the one in the GNU C Library. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/msvc-inval.c b/lib/msvc-inval.c +index de6ebee..a23dac9 100644 +--- a/lib/msvc-inval.c ++++ b/lib/msvc-inval.c +@@ -1,18 +1,18 @@ + /* Invalid parameter handler for MSVC runtime libraries. + Copyright (C) 2011-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + #include + +diff --git a/lib/msvc-inval.h b/lib/msvc-inval.h +index 0d418e1..e115a35 100644 +--- a/lib/msvc-inval.h ++++ b/lib/msvc-inval.h +@@ -1,18 +1,18 @@ + /* Invalid parameter handler for MSVC runtime libraries. + Copyright (C) 2011-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + #ifndef _MSVC_INVAL_H + #define _MSVC_INVAL_H +diff --git a/lib/msvc-nothrow.c b/lib/msvc-nothrow.c +index e72dabe..d3c1f54 100644 +--- a/lib/msvc-nothrow.c ++++ b/lib/msvc-nothrow.c +@@ -2,18 +2,18 @@ + with MSVC runtime libraries. + Copyright (C) 2011-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + #include + +diff --git a/lib/msvc-nothrow.h b/lib/msvc-nothrow.h +index a56cd4e..057b5dd 100644 +--- a/lib/msvc-nothrow.h ++++ b/lib/msvc-nothrow.h +@@ -2,18 +2,18 @@ + with MSVC runtime libraries. + Copyright (C) 2011-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + #ifndef _MSVC_NOTHROW_H + #define _MSVC_NOTHROW_H +diff --git a/lib/netdb.in.h b/lib/netdb.in.h +index 6bcaf1a..eb5c960 100644 +--- a/lib/netdb.in.h ++++ b/lib/netdb.in.h +@@ -2,18 +2,18 @@ + Copyright (C) 2008-2021 Free Software Foundation, Inc. + Written by Simon Josefsson. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + /* This file is supposed to be used on platforms that lack . + It is intended to provide definitions and prototypes needed by an +diff --git a/lib/netinet_in.in.h b/lib/netinet_in.in.h +index 3c1cad6..21f3a64 100644 +--- a/lib/netinet_in.in.h ++++ b/lib/netinet_in.in.h +@@ -1,18 +1,18 @@ + /* Substitute for . + Copyright (C) 2007-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + #ifndef _ at GUARD_PREFIX@_NETINET_IN_H + +diff --git a/lib/nl_langinfo-lock.c b/lib/nl_langinfo-lock.c +index 915c38b..fcdf56d 100644 +--- a/lib/nl_langinfo-lock.c ++++ b/lib/nl_langinfo-lock.c +@@ -1,12 +1,12 @@ + /* Return the internal lock used by nl_langinfo. + Copyright (C) 2019-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/nl_langinfo.c b/lib/nl_langinfo.c +index e8f3cef..b481f20 100644 +--- a/lib/nl_langinfo.c ++++ b/lib/nl_langinfo.c +@@ -2,12 +2,12 @@ + + Copyright (C) 2007-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/nproc.c b/lib/nproc.c +index fef1f8b..e3ddb92 100644 +--- a/lib/nproc.c ++++ b/lib/nproc.c +@@ -2,18 +2,18 @@ + + Copyright (C) 2009-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + /* Written by Glen Lenker and Bruno Haible. */ + +diff --git a/lib/nproc.h b/lib/nproc.h +index cd3ed36..d7659a5 100644 +--- a/lib/nproc.h ++++ b/lib/nproc.h +@@ -2,18 +2,18 @@ + + Copyright (C) 2009-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + /* Written by Glen Lenker and Bruno Haible. */ + +diff --git a/lib/nstrftime.c b/lib/nstrftime.c +index 7ef7529..7f258e8 100644 +--- a/lib/nstrftime.c ++++ b/lib/nstrftime.c +@@ -1,19 +1,18 @@ + /* Copyright (C) 1991-2021 Free Software Foundation, Inc. + This file is part of the GNU C Library. + +- The GNU C Library is free software; you can redistribute it and/or +- modify it under the terms of the GNU Lesser General Public +- License as published by the Free Software Foundation; either +- version 2.1 of the License, or (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 3 of the ++ License, or (at your option) any later version. + +- The GNU C Library is distributed in the hope that it will be useful, ++ This file 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 +- Lesser General Public License for more details. ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public +- License along with the GNU C Library; if not, see +- . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + #ifdef _LIBC + # define USE_IN_EXTENDED_LOCALE_MODEL 1 +diff --git a/lib/open.c b/lib/open.c +index 5dc117e..372cda8 100644 +--- a/lib/open.c ++++ b/lib/open.c +@@ -1,12 +1,12 @@ + /* Open a descriptor to a file. + Copyright (C) 2007-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/pathmax.h b/lib/pathmax.h +index 4af7802..716f4a9 100644 +--- a/lib/pathmax.h ++++ b/lib/pathmax.h +@@ -2,18 +2,18 @@ + Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2021 Free Software + Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + #ifndef _PATHMAX_H + # define _PATHMAX_H +diff --git a/lib/pipe.c b/lib/pipe.c +index 3316ceb..fc978f2 100644 +--- a/lib/pipe.c ++++ b/lib/pipe.c +@@ -1,18 +1,18 @@ + /* Create a pipe. + Copyright (C) 2009-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + #include + +diff --git a/lib/pipe2.c b/lib/pipe2.c +index 25bce6f..9ba8c3b 100644 +--- a/lib/pipe2.c ++++ b/lib/pipe2.c +@@ -1,18 +1,18 @@ + /* Create a pipe, with specific opening flags. + Copyright (C) 2009-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + #include + +diff --git a/lib/poll.c b/lib/poll.c +index d787676..8d5ba96 100644 +--- a/lib/poll.c ++++ b/lib/poll.c +@@ -5,18 +5,18 @@ + + This file is part of gnulib. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + /* Tell gcc not to warn about the (nfd < 0) tests, below. */ + #if (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) || 4 < __GNUC__ +diff --git a/lib/poll.in.h b/lib/poll.in.h +index 1fe8370..e94cd31 100644 +--- a/lib/poll.in.h ++++ b/lib/poll.in.h +@@ -5,18 +5,18 @@ + + This file is part of gnulib. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + #ifndef _ at GUARD_PREFIX@_POLL_H + +diff --git a/lib/printf-args.c b/lib/printf-args.c +index 22e44ef..b822682 100644 +--- a/lib/printf-args.c ++++ b/lib/printf-args.c +@@ -2,18 +2,18 @@ + Copyright (C) 1999, 2002-2003, 2005-2007, 2009-2021 Free Software + Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + /* This file can be parametrized with the following macros: + ENABLE_UNISTDIO Set to 1 to enable the unistdio extensions. +diff --git a/lib/printf-args.h b/lib/printf-args.h +index d15b12d..c8d9174 100644 +--- a/lib/printf-args.h ++++ b/lib/printf-args.h +@@ -2,18 +2,18 @@ + Copyright (C) 1999, 2002-2003, 2006-2007, 2011-2021 Free Software + Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + #ifndef _PRINTF_ARGS_H + #define _PRINTF_ARGS_H +diff --git a/lib/printf-parse.c b/lib/printf-parse.c +index 9f97995..f21cc17 100644 +--- a/lib/printf-parse.c ++++ b/lib/printf-parse.c +@@ -1,18 +1,18 @@ + /* Formatted output to strings. + Copyright (C) 1999-2000, 2002-2003, 2006-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + /* This file can be parametrized with the following macros: + CHAR_T The element type of the format string. +@@ -48,16 +48,7 @@ + #include + + /* Get intmax_t. */ +-#if defined IN_LIBINTL || defined IN_LIBASPRINTF +-# if HAVE_STDINT_H_WITH_UINTMAX +-# include +-# endif +-# if HAVE_INTTYPES_H_WITH_UINTMAX +-# include +-# endif +-#else +-# include +-#endif ++#include + + /* malloc(), realloc(), free(). */ + #include +diff --git a/lib/printf-parse.h b/lib/printf-parse.h +index e05ac8f..77b7409 100644 +--- a/lib/printf-parse.h ++++ b/lib/printf-parse.h +@@ -2,18 +2,18 @@ + Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2021 Free Software + Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + #ifndef _PRINTF_PARSE_H + #define _PRINTF_PARSE_H +diff --git a/lib/putenv.c b/lib/putenv.c +index d342b81..435d10f 100644 +--- a/lib/putenv.c ++++ b/lib/putenv.c +@@ -4,12 +4,12 @@ + NOTE: The canonical source of this file is maintained with the GNU C + Library. Bugs can be reported to bug-glibc at prep.ai.mit.edu. + +- This program is free software: you can redistribute it and/or modify it +- under the terms of the GNU Lesser General Public License as published by the +- Free Software Foundation; either version 3 of the License, or any +- later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser 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, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/raise.c b/lib/raise.c +index eda9126..37c100d 100644 +--- a/lib/raise.c ++++ b/lib/raise.c +@@ -2,12 +2,12 @@ + + Copyright (C) 2002-2003, 2005-2006, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/rawmemchr.c b/lib/rawmemchr.c +index ef35689..896d435 100644 +--- a/lib/rawmemchr.c ++++ b/lib/rawmemchr.c +@@ -1,12 +1,12 @@ + /* Searching in a string. + Copyright (C) 2008-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/rawmemchr.valgrind b/lib/rawmemchr.valgrind +index 90ed95e..d489c32 100644 +--- a/lib/rawmemchr.valgrind ++++ b/lib/rawmemchr.valgrind +@@ -2,12 +2,12 @@ + + # Copyright (C) 2008-2021 Free Software Foundation, Inc. + # +-# This program is free software: you can redistribute it and/or modify +-# it under the terms of the GNU Lesser General Public License as published by +-# the Free Software Foundation; either version 3 of the License, or +-# (at your option) any later version. ++# This file is free software: you can redistribute it and/or modify ++# it under the terms of the GNU Lesser General Public License as ++# published by the Free Software Foundation; either version 2.1 of the ++# License, or (at your option) any later version. + # +-# This program is distributed in the hope that it will be useful, ++# This file 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 Lesser General Public License for more details. +diff --git a/lib/read.c b/lib/read.c +index 125e738..840d9ed 100644 +--- a/lib/read.c ++++ b/lib/read.c +@@ -2,12 +2,12 @@ + Copyright (C) 2008-2021 Free Software Foundation, Inc. + Written by Bruno Haible , 2011. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/readlink.c b/lib/readlink.c +index 38d9e0c..d4f4b08 100644 +--- a/lib/readlink.c ++++ b/lib/readlink.c +@@ -1,12 +1,12 @@ + /* Read the contents of a symbolic link. + Copyright (C) 2003-2007, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/realloc.c b/lib/realloc.c +index 1145514..af03f0c 100644 +--- a/lib/realloc.c ++++ b/lib/realloc.c +@@ -3,12 +3,12 @@ + Copyright (C) 1997, 2003-2004, 2006-2007, 2009-2021 Free Software + Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +@@ -18,68 +18,46 @@ + + /* written by Jim Meyering and Bruno Haible */ + +-#define _GL_USE_STDLIB_ALLOC 1 + #include + +-/* Only the AC_FUNC_REALLOC macro defines 'realloc' already in config.h. */ +-#ifdef realloc +-# define NEED_REALLOC_GNU 1 +-/* Whereas the gnulib module 'realloc-gnu' defines HAVE_REALLOC_GNU. */ +-#elif GNULIB_REALLOC_GNU && !HAVE_REALLOC_GNU +-# define NEED_REALLOC_GNU 1 +-#endif +- +-/* Infer the properties of the system's malloc function. +- The gnulib module 'malloc-gnu' defines HAVE_MALLOC_GNU. */ +-#if GNULIB_MALLOC_GNU && HAVE_MALLOC_GNU +-# define SYSTEM_MALLOC_GLIBC_COMPATIBLE 1 +-#endif +- + #include + +-/* A function definition is only needed if NEED_REALLOC_GNU is defined above +- or if the module 'realloc-posix' requests it. */ +-#if NEED_REALLOC_GNU || (GNULIB_REALLOC_POSIX && !HAVE_REALLOC_POSIX) ++#include ++ ++#include "xalloc-oversized.h" + +-# include ++/* Call the system's realloc below. This file does not define ++ _GL_USE_STDLIB_ALLOC because it needs Gnulib's malloc if present. */ ++#undef realloc + + /* Change the size of an allocated block of memory P to N bytes, +- with error checking. If N is zero, change it to 1. If P is NULL, +- use malloc. */ ++ with error checking. If P is NULL, use malloc. Otherwise if N is zero, ++ free P and return NULL. */ + + void * + rpl_realloc (void *p, size_t n) + { +- void *result; ++ if (p == NULL) ++ return malloc (n); + +-# if NEED_REALLOC_GNU + if (n == 0) + { +- n = 1; +- +- /* In theory realloc might fail, so don't rely on it to free. */ + free (p); +- p = NULL; ++ return NULL; + } +-# endif + +- if (p == NULL) ++ if (xalloc_oversized (n, 1)) + { +-# if GNULIB_REALLOC_GNU && !NEED_REALLOC_GNU && !SYSTEM_MALLOC_GLIBC_COMPATIBLE +- if (n == 0) +- n = 1; +-# endif +- result = malloc (n); ++ errno = ENOMEM; ++ return NULL; + } +- else +- result = realloc (p, n); + +-# if !HAVE_REALLOC_POSIX ++ void *result = realloc (p, n); ++ ++#if !HAVE_MALLOC_POSIX + if (result == NULL) + errno = ENOMEM; +-# endif ++#endif + + return result; + } +- +-#endif +diff --git a/lib/recv.c b/lib/recv.c +index f2a342f..3eb2b4d 100644 +--- a/lib/recv.c ++++ b/lib/recv.c +@@ -2,12 +2,12 @@ + + Copyright (C) 2008-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/recvfrom.c b/lib/recvfrom.c +index 8abda0c..25231ff 100644 +--- a/lib/recvfrom.c ++++ b/lib/recvfrom.c +@@ -2,12 +2,12 @@ + + Copyright (C) 2008-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/regex_internal.c b/lib/regex_internal.c +index 55f6b66..aefcfa2 100644 +--- a/lib/regex_internal.c ++++ b/lib/regex_internal.c +@@ -1211,6 +1211,10 @@ re_node_set_merge (re_node_set *dest, const re_node_set *src) + + if (__glibc_unlikely (dest->nelem == 0)) + { ++ /* Although we already guaranteed above that dest->alloc != 0 and ++ therefore dest->elems != NULL, add a debug assertion to pacify ++ GCC 11.2.1's -fanalyzer. */ ++ DEBUG_ASSERT (dest->elems); + dest->nelem = src->nelem; + memcpy (dest->elems, src->elems, src->nelem * sizeof (Idx)); + return REG_NOERROR; +@@ -1286,7 +1290,10 @@ re_node_set_insert (re_node_set *set, Idx elem) + + if (__glibc_unlikely (set->nelem) == 0) + { +- /* We already guaranteed above that set->alloc != 0. */ ++ /* Although we already guaranteed above that set->alloc != 0 and ++ therefore set->elems != NULL, add a debug assertion to pacify ++ GCC 11.2 -fanalyzer. */ ++ DEBUG_ASSERT (set->elems); + set->elems[0] = elem; + ++set->nelem; + return true; +diff --git a/lib/regexec.c b/lib/regexec.c +index 6309dea..5e4eb49 100644 +--- a/lib/regexec.c ++++ b/lib/regexec.c +@@ -1220,9 +1220,13 @@ proceed_next_node (const re_match_context_t *mctx, Idx nregs, regmatch_t *regs, + { + re_node_set *cur_nodes = &mctx->state_log[*pidx]->nodes; + re_node_set *edests = &dfa->edests[node]; +- bool ok = re_node_set_insert (eps_via_nodes, node); +- if (__glibc_unlikely (! ok)) +- return -2; ++ ++ if (! re_node_set_contains (eps_via_nodes, node)) ++ { ++ bool ok = re_node_set_insert (eps_via_nodes, node); ++ if (__glibc_unlikely (! ok)) ++ return -2; ++ } + + /* Pick a valid destination, or return -1 if none is found. */ + Idx dest_node = -1; +@@ -1414,7 +1418,7 @@ set_regs (const regex_t *preg, const re_match_context_t *mctx, size_t nmatch, + update_regs (dfa, pmatch, prev_idx_match, cur_node, idx, nmatch); + + if ((idx == pmatch[0].rm_eo && cur_node == mctx->last_node) +- || re_node_set_contains (&eps_via_nodes, cur_node)) ++ || (fs && re_node_set_contains (&eps_via_nodes, cur_node))) + { + Idx reg_idx; + cur_node = -1; +diff --git a/lib/rename.c b/lib/rename.c +index 4873025..a3b7dc6 100644 +--- a/lib/rename.c ++++ b/lib/rename.c +@@ -2,12 +2,12 @@ + + Copyright (C) 2001-2003, 2005-2006, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/rmdir.c b/lib/rmdir.c +index a99fb1e..6295e41 100644 +--- a/lib/rmdir.c ++++ b/lib/rmdir.c +@@ -3,12 +3,12 @@ + Copyright (C) 1988, 1990, 1999, 2003-2006, 2009-2021 Free Software + Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/round.c b/lib/round.c +index 47a3936..5525050 100644 +--- a/lib/round.c ++++ b/lib/round.c +@@ -1,18 +1,18 @@ + /* Round toward nearest, breaking ties away from zero. + Copyright (C) 2007, 2010-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser 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, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + /* Written by Ben Pfaff , 2007. + Based heavily on code by Bruno Haible. */ +diff --git a/lib/safe-read.c b/lib/safe-read.c +index a4a1b08..e187b12 100644 +--- a/lib/safe-read.c ++++ b/lib/safe-read.c +@@ -3,12 +3,12 @@ + Copyright (C) 1993-1994, 1998, 2002-2006, 2009-2021 Free Software + Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/safe-read.h b/lib/safe-read.h +index 5050124..111aff5 100644 +--- a/lib/safe-read.h ++++ b/lib/safe-read.h +@@ -1,12 +1,12 @@ + /* An interface to read() that retries after interrupts. + Copyright (C) 2002, 2006, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/safe-write.c b/lib/safe-write.c +index f8b3b8b..494de14 100644 +--- a/lib/safe-write.c ++++ b/lib/safe-write.c +@@ -1,12 +1,12 @@ + /* An interface to write that retries after interrupts. + Copyright (C) 2002, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/safe-write.h b/lib/safe-write.h +index 459629e..25d8c71 100644 +--- a/lib/safe-write.h ++++ b/lib/safe-write.h +@@ -1,12 +1,12 @@ + /* An interface to write() that retries after interrupts. + Copyright (C) 2002, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/same-inode.h b/lib/same-inode.h +index 45e322a8..c727777 100644 +--- a/lib/same-inode.h ++++ b/lib/same-inode.h +@@ -2,12 +2,12 @@ + + Copyright (C) 2006, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/scratch_buffer.h b/lib/scratch_buffer.h +index 4b17f72..8873577 100644 +--- a/lib/scratch_buffer.h ++++ b/lib/scratch_buffer.h +@@ -1,12 +1,12 @@ + /* Variable-sized buffer with on-stack default allocation. + Copyright (C) 2017-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +@@ -110,14 +110,18 @@ extern void *scratch_buffer_dupfree (struct scratch_buffer *buffer, + + /* The implementation is imported from glibc. */ + +-#include +- + /* Avoid possible conflicts with symbols exported by the GNU libc. */ + #define __libc_scratch_buffer_dupfree gl_scratch_buffer_dupfree + #define __libc_scratch_buffer_grow gl_scratch_buffer_grow + #define __libc_scratch_buffer_grow_preserve gl_scratch_buffer_grow_preserve + #define __libc_scratch_buffer_set_array_size gl_scratch_buffer_set_array_size + +-#include ++#ifndef _GL_LIKELY ++/* Rely on __builtin_expect, as provided by the module 'builtin-expect'. */ ++# define _GL_LIKELY(cond) __builtin_expect ((cond), 1) ++# define _GL_UNLIKELY(cond) __builtin_expect ((cond), 0) ++#endif ++ ++#include + + #endif /* _GL_SCRATCH_BUFFER_H */ +diff --git a/lib/select.c b/lib/select.c +index 9a6fc28..eddac4b 100644 +--- a/lib/select.c ++++ b/lib/select.c +@@ -5,18 +5,18 @@ + + This file is part of gnulib. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + #include + +@@ -530,12 +530,13 @@ restart: + if (h != handle_array[nhandles]) + { + /* Perform handle->descriptor mapping. */ +- WSAEventSelect ((SOCKET) h, NULL, 0); +- if (FD_ISSET (h, &handle_rfds)) ++ SOCKET s = (SOCKET) h; ++ WSAEventSelect (s, NULL, 0); ++ if (FD_ISSET (s, &handle_rfds)) + FD_SET (i, rfds); +- if (FD_ISSET (h, &handle_wfds)) ++ if (FD_ISSET (s, &handle_wfds)) + FD_SET (i, wfds); +- if (FD_ISSET (h, &handle_xfds)) ++ if (FD_ISSET (s, &handle_xfds)) + FD_SET (i, xfds); + } + else +diff --git a/lib/send.c b/lib/send.c +index 3625864..58cb70b 100644 +--- a/lib/send.c ++++ b/lib/send.c +@@ -2,12 +2,12 @@ + + Copyright (C) 2008-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/sendto.c b/lib/sendto.c +index 5372a66..029ccd6 100644 +--- a/lib/sendto.c ++++ b/lib/sendto.c +@@ -2,12 +2,12 @@ + + Copyright (C) 2008-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/setenv.c b/lib/setenv.c +index 5374044..3ad3477 100644 +--- a/lib/setenv.c ++++ b/lib/setenv.c +@@ -1,12 +1,12 @@ + /* Copyright (C) 1992, 1995-2003, 2005-2021 Free Software Foundation, Inc. + This file is part of the GNU C Library. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/setlocale-lock.c b/lib/setlocale-lock.c +index 3cb5d47..53e231c 100644 +--- a/lib/setlocale-lock.c ++++ b/lib/setlocale-lock.c +@@ -1,12 +1,12 @@ + /* Return the internal lock used by setlocale_null_r. + Copyright (C) 2019-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/setlocale_null.c b/lib/setlocale_null.c +index 4c50472..dbfda25 100644 +--- a/lib/setlocale_null.c ++++ b/lib/setlocale_null.c +@@ -1,12 +1,12 @@ + /* Query the name of the current global locale. + Copyright (C) 2019-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/setlocale_null.h b/lib/setlocale_null.h +index bf96fa4..00c42e2 100644 +--- a/lib/setlocale_null.h ++++ b/lib/setlocale_null.h +@@ -1,12 +1,12 @@ + /* Query the name of the current global locale. + Copyright (C) 2019-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/setsockopt.c b/lib/setsockopt.c +index db32996..10b1e90 100644 +--- a/lib/setsockopt.c ++++ b/lib/setsockopt.c +@@ -2,12 +2,12 @@ + + Copyright (C) 2008-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/shutdown.c b/lib/shutdown.c +index c5527cd..70c927c 100644 +--- a/lib/shutdown.c ++++ b/lib/shutdown.c +@@ -2,12 +2,12 @@ + + Copyright (C) 2008-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/signal.in.h b/lib/signal.in.h +index b211137..275da8c 100644 +--- a/lib/signal.in.h ++++ b/lib/signal.in.h +@@ -2,12 +2,12 @@ + + Copyright (C) 2006-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/signbitd.c b/lib/signbitd.c +index 2992dd4..2259771 100644 +--- a/lib/signbitd.c ++++ b/lib/signbitd.c +@@ -1,12 +1,12 @@ + /* signbit() macro: Determine the sign bit of a floating-point number. + Copyright (C) 2007-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/signbitf.c b/lib/signbitf.c +index 01be49a..b196d9a 100644 +--- a/lib/signbitf.c ++++ b/lib/signbitf.c +@@ -1,12 +1,12 @@ + /* signbit() macro: Determine the sign bit of a floating-point number. + Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/signbitl.c b/lib/signbitl.c +index 6e0f64e..f73802d 100644 +--- a/lib/signbitl.c ++++ b/lib/signbitl.c +@@ -1,12 +1,12 @@ + /* signbit() macro: Determine the sign bit of a floating-point number. + Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/size_max.h b/lib/size_max.h +index c6d4a18..1186ba9 100644 +--- a/lib/size_max.h ++++ b/lib/size_max.h +@@ -2,18 +2,18 @@ + Copyright (C) 2005-2006, 2009-2021 Free Software Foundation, Inc. + Written by Simon Josefsson. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + #ifndef GNULIB_SIZE_MAX_H + #define GNULIB_SIZE_MAX_H +diff --git a/lib/snprintf.c b/lib/snprintf.c +index 357f287..a589cf1 100644 +--- a/lib/snprintf.c ++++ b/lib/snprintf.c +@@ -2,18 +2,18 @@ + Copyright (C) 2004, 2006-2021 Free Software Foundation, Inc. + Written by Simon Josefsson and Paul Eggert. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + #include + +diff --git a/lib/socket.c b/lib/socket.c +index 8525260..0f2e6ff 100644 +--- a/lib/socket.c ++++ b/lib/socket.c +@@ -2,12 +2,12 @@ + + Copyright (C) 2008-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/sockets.c b/lib/sockets.c +index 394b01e..934da73 100644 +--- a/lib/sockets.c ++++ b/lib/sockets.c +@@ -2,12 +2,12 @@ + + Copyright (C) 2008-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/sockets.h b/lib/sockets.h +index a13b0cb..e70c2bb 100644 +--- a/lib/sockets.h ++++ b/lib/sockets.h +@@ -2,12 +2,12 @@ + + Copyright (C) 2008-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/stat-time.c b/lib/stat-time.c +index 81b83dd..7b92792 100644 +--- a/lib/stat-time.c ++++ b/lib/stat-time.c +@@ -1,3 +1,21 @@ ++/* stat-related time functions. ++ ++ Copyright (C) 2012-2021 Free Software Foundation, Inc. ++ ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. ++ ++ This file 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 Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ ++ + #include ++ + #define _GL_STAT_TIME_INLINE _GL_EXTERN_INLINE + #include "stat-time.h" +diff --git a/lib/stat-time.h b/lib/stat-time.h +index 00c9329..fe3483d 100644 +--- a/lib/stat-time.h ++++ b/lib/stat-time.h +@@ -2,12 +2,12 @@ + + Copyright (C) 2005, 2007, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/stat-w32.c b/lib/stat-w32.c +index fe505cb..4164199 100644 +--- a/lib/stat-w32.c ++++ b/lib/stat-w32.c +@@ -1,12 +1,12 @@ + /* Core of implementation of fstat and stat for native Windows. + Copyright (C) 2017-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/stat-w32.h b/lib/stat-w32.h +index 05c9b0f..5b56c09 100644 +--- a/lib/stat-w32.h ++++ b/lib/stat-w32.h +@@ -1,12 +1,12 @@ + /* Core of implementation of fstat and stat for native Windows. + Copyright (C) 2017-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/stat.c b/lib/stat.c +index 39a1269..bc9a767 100644 +--- a/lib/stat.c ++++ b/lib/stat.c +@@ -1,12 +1,12 @@ + /* Work around platform bugs in stat. + Copyright (C) 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/stdalign.in.h b/lib/stdalign.in.h +index 7b51043..592d58e 100644 +--- a/lib/stdalign.in.h ++++ b/lib/stdalign.in.h +@@ -2,18 +2,18 @@ + + Copyright 2011-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + /* Written by Paul Eggert and Bruno Haible. */ + +diff --git a/lib/stdbool.in.h b/lib/stdbool.in.h +index c404f8d..2a1992d 100644 +--- a/lib/stdbool.in.h ++++ b/lib/stdbool.in.h +@@ -1,18 +1,18 @@ + /* Copyright (C) 2001-2003, 2006-2021 Free Software Foundation, Inc. + Written by Bruno Haible , 2001. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + #ifndef _GL_STDBOOL_H + #define _GL_STDBOOL_H +diff --git a/lib/stddef.in.h b/lib/stddef.in.h +index 4c53e64..42290d4 100644 +--- a/lib/stddef.in.h ++++ b/lib/stddef.in.h +@@ -2,18 +2,18 @@ + + Copyright (C) 2009-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + /* Written by Eric Blake. */ + +diff --git a/lib/stdint.in.h b/lib/stdint.in.h +index a98f1c8..85c5418 100644 +--- a/lib/stdint.in.h ++++ b/lib/stdint.in.h +@@ -2,18 +2,18 @@ + Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood. + This file is part of gnulib. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + /* + * ISO C 99 for platforms that lack it. +@@ -85,7 +85,7 @@ + + /* Override WINT_MIN and WINT_MAX if gnulib's or overrides + wint_t. */ +-#if @GNULIB_OVERRIDES_WINT_T@ ++#if @GNULIBHEADERS_OVERRIDE_WINT_T@ + # undef WINT_MIN + # undef WINT_MAX + # define WINT_MIN 0x0U +@@ -598,7 +598,7 @@ typedef int _verify_intmax_size[sizeof (intmax_t) == sizeof (uintmax_t) + /* wint_t limits */ + /* If gnulib's or overrides wint_t, @WINT_T_SUFFIX@ is not + accurate, therefore use the definitions from above. */ +-# if !@GNULIB_OVERRIDES_WINT_T@ ++# if !@GNULIBHEADERS_OVERRIDE_WINT_T@ + # undef WINT_MIN + # undef WINT_MAX + # if @HAVE_SIGNED_WINT_T@ +diff --git a/lib/stdio.in.h b/lib/stdio.in.h +index 6e10c74..f1bf817 100644 +--- a/lib/stdio.in.h ++++ b/lib/stdio.in.h +@@ -2,18 +2,18 @@ + + Copyright (C) 2004, 2007-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + #if __GNUC__ >= 3 + @PRAGMA_SYSTEM_HEADER@ +@@ -242,7 +242,7 @@ _GL_WARN_ON_USE (fclose, "fclose is not always POSIX compliant - " + _GL_CXXALIAS_MDA (fcloseall, int, (void)); + # else + # if @HAVE_DECL_FCLOSEALL@ +-# if defined __FreeBSD__ ++# if defined __FreeBSD__ || defined __DragonFly__ + _GL_CXXALIAS_SYS (fcloseall, void, (void)); + # else + _GL_CXXALIAS_SYS (fcloseall, int, (void)); +@@ -260,8 +260,9 @@ _GL_CXXALIASWARN (fcloseall); + # undef fdopen + # define fdopen rpl_fdopen + # endif +-_GL_FUNCDECL_RPL (fdopen, FILE *, (int fd, const char *mode) +- _GL_ARG_NONNULL ((2))); ++_GL_FUNCDECL_RPL (fdopen, FILE *, ++ (int fd, const char *mode) ++ _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)); + _GL_CXXALIAS_RPL (fdopen, FILE *, (int fd, const char *mode)); + # elif defined _WIN32 && !defined __CYGWIN__ + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) +@@ -270,28 +271,42 @@ _GL_CXXALIAS_RPL (fdopen, FILE *, (int fd, const char *mode)); + # endif + _GL_CXXALIAS_MDA (fdopen, FILE *, (int fd, const char *mode)); + # else ++# if __GNUC__ >= 11 ++/* For -Wmismatched-dealloc: Associate fdopen with fclose or rpl_fclose. */ ++_GL_FUNCDECL_SYS (fdopen, FILE *, ++ (int fd, const char *mode) ++ _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)); ++# endif + _GL_CXXALIAS_SYS (fdopen, FILE *, (int fd, const char *mode)); + # endif + _GL_CXXALIASWARN (fdopen); +-#elif defined GNULIB_POSIXCHECK +-# undef fdopen ++#else ++# if @GNULIB_FCLOSE@ && __GNUC__ >= 11 && !defined fdopen ++/* For -Wmismatched-dealloc: Associate fdopen with fclose or rpl_fclose. */ ++_GL_FUNCDECL_SYS (fdopen, FILE *, ++ (int fd, const char *mode) ++ _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)); ++# endif ++# if defined GNULIB_POSIXCHECK ++# undef fdopen + /* Assume fdopen is always declared. */ + _GL_WARN_ON_USE (fdopen, "fdopen on native Windows platforms is not POSIX compliant - " + "use gnulib module fdopen for portability"); +-#elif @GNULIB_MDA_FDOPEN@ ++# elif @GNULIB_MDA_FDOPEN@ + /* On native Windows, map 'fdopen' to '_fdopen', so that -loldnames is not + required. In C++ with GNULIB_NAMESPACE, avoid differences between + platforms by defining GNULIB_NAMESPACE::fdopen always. */ +-# if defined _WIN32 && !defined __CYGWIN__ +-# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +-# undef fdopen +-# define fdopen _fdopen +-# endif ++# if defined _WIN32 && !defined __CYGWIN__ ++# if !(defined __cplusplus && defined GNULIB_NAMESPACE) ++# undef fdopen ++# define fdopen _fdopen ++# endif + _GL_CXXALIAS_MDA (fdopen, FILE *, (int fd, const char *mode)); +-# else ++# else + _GL_CXXALIAS_SYS (fdopen, FILE *, (int fd, const char *mode)); +-# endif ++# endif + _GL_CXXALIASWARN (fdopen); ++# endif + #endif + + #if @GNULIB_FFLUSH@ +@@ -380,21 +395,35 @@ _GL_CXXALIASWARN (fileno); + # endif + _GL_FUNCDECL_RPL (fopen, FILE *, + (const char *restrict filename, const char *restrict mode) +- _GL_ARG_NONNULL ((1, 2))); ++ _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)); + _GL_CXXALIAS_RPL (fopen, FILE *, + (const char *restrict filename, const char *restrict mode)); + # else ++# if __GNUC__ >= 11 ++/* For -Wmismatched-dealloc: Associate fopen with fclose or rpl_fclose. */ ++_GL_FUNCDECL_SYS (fopen, FILE *, ++ (const char *restrict filename, const char *restrict mode) ++ _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)); ++# endif + _GL_CXXALIAS_SYS (fopen, FILE *, + (const char *restrict filename, const char *restrict mode)); + # endif + # if __GLIBC__ >= 2 + _GL_CXXALIASWARN (fopen); + # endif +-#elif defined GNULIB_POSIXCHECK +-# undef fopen ++#else ++# if @GNULIB_FCLOSE@ && __GNUC__ >= 11 && !defined fopen ++/* For -Wmismatched-dealloc: Associate fopen with fclose or rpl_fclose. */ ++_GL_FUNCDECL_SYS (fopen, FILE *, ++ (const char *restrict filename, const char *restrict mode) ++ _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)); ++# endif ++# if defined GNULIB_POSIXCHECK ++# undef fopen + /* Assume fopen is always declared. */ + _GL_WARN_ON_USE (fopen, "fopen on native Windows platforms is not POSIX compliant - " + "use gnulib module fopen for portability"); ++# endif + #endif + + #if @GNULIB_FPRINTF_POSIX@ || @GNULIB_FPRINTF@ +@@ -1009,22 +1038,32 @@ _GL_WARN_ON_USE (perror, "perror is not always POSIX compliant - " + # undef popen + # define popen rpl_popen + # endif +-_GL_FUNCDECL_RPL (popen, FILE *, (const char *cmd, const char *mode) +- _GL_ARG_NONNULL ((1, 2))); ++_GL_FUNCDECL_RPL (popen, FILE *, ++ (const char *cmd, const char *mode) ++ _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (pclose, 1)); + _GL_CXXALIAS_RPL (popen, FILE *, (const char *cmd, const char *mode)); + # else +-# if !@HAVE_POPEN@ +-_GL_FUNCDECL_SYS (popen, FILE *, (const char *cmd, const char *mode) +- _GL_ARG_NONNULL ((1, 2))); ++# if !@HAVE_POPEN@ || __GNUC__ >= 11 ++_GL_FUNCDECL_SYS (popen, FILE *, ++ (const char *cmd, const char *mode) ++ _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (pclose, 1)); + # endif + _GL_CXXALIAS_SYS (popen, FILE *, (const char *cmd, const char *mode)); + # endif + _GL_CXXALIASWARN (popen); +-#elif defined GNULIB_POSIXCHECK +-# undef popen +-# if HAVE_RAW_DECL_POPEN ++#else ++# if @GNULIB_PCLOSE@ && __GNUC__ >= 11 && !defined popen ++/* For -Wmismatched-dealloc: Associate popen with pclose or rpl_pclose. */ ++_GL_FUNCDECL_SYS (popen, FILE *, ++ (const char *cmd, const char *mode) ++ _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (pclose, 1)); ++# endif ++# if defined GNULIB_POSIXCHECK ++# undef popen ++# if HAVE_RAW_DECL_POPEN + _GL_WARN_ON_USE (popen, "popen is buggy on some platforms - " + "use gnulib module popen or pipe for more portability"); ++# endif + # endif + #endif + +@@ -1257,6 +1296,7 @@ _GL_CXXALIASWARN (scanf); + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) + # define snprintf rpl_snprintf + # endif ++# define GNULIB_overrides_snprintf 1 + _GL_FUNCDECL_RPL (snprintf, int, + (char *restrict str, size_t size, + const char *restrict format, ...) +@@ -1302,6 +1342,7 @@ _GL_WARN_ON_USE (snprintf, "snprintf is unportable - " + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) + # define sprintf rpl_sprintf + # endif ++# define GNULIB_overrides_sprintf 1 + _GL_FUNCDECL_RPL (sprintf, int, + (char *restrict str, const char *restrict format, ...) + _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3) +@@ -1344,19 +1385,32 @@ _GL_CXXALIASWARN (tempnam); + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) + # define tmpfile rpl_tmpfile + # endif +-_GL_FUNCDECL_RPL (tmpfile, FILE *, (void)); ++_GL_FUNCDECL_RPL (tmpfile, FILE *, (void) ++ _GL_ATTRIBUTE_DEALLOC (fclose, 1)); + _GL_CXXALIAS_RPL (tmpfile, FILE *, (void)); + # else ++# if __GNUC__ >= 11 ++/* For -Wmismatched-dealloc: Associate tmpfile with fclose or rpl_fclose. */ ++_GL_FUNCDECL_SYS (tmpfile, FILE *, (void) ++ _GL_ATTRIBUTE_DEALLOC (fclose, 1)); ++# endif + _GL_CXXALIAS_SYS (tmpfile, FILE *, (void)); + # endif + # if __GLIBC__ >= 2 + _GL_CXXALIASWARN (tmpfile); + # endif +-#elif defined GNULIB_POSIXCHECK +-# undef tmpfile +-# if HAVE_RAW_DECL_TMPFILE ++#else ++# if @GNULIB_FCLOSE@ && __GNUC__ >= 11 && !defined tmpfile ++/* For -Wmismatched-dealloc: Associate tmpfile with fclose or rpl_fclose. */ ++_GL_FUNCDECL_SYS (tmpfile, FILE *, (void) ++ _GL_ATTRIBUTE_DEALLOC (fclose, 1)); ++# endif ++# if defined GNULIB_POSIXCHECK ++# undef tmpfile ++# if HAVE_RAW_DECL_TMPFILE + _GL_WARN_ON_USE (tmpfile, "tmpfile is not usable on mingw - " + "use gnulib module tmpfile for portability"); ++# endif + # endif + #endif + +@@ -1369,6 +1423,7 @@ _GL_WARN_ON_USE (tmpfile, "tmpfile is not usable on mingw - " + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) + # define asprintf rpl_asprintf + # endif ++# define GNULIB_overrides_asprintf + _GL_FUNCDECL_RPL (asprintf, int, + (char **result, const char *format, ...) + _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3) +@@ -1390,6 +1445,7 @@ _GL_CXXALIASWARN (asprintf); + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) + # define vasprintf rpl_vasprintf + # endif ++# define GNULIB_overrides_vasprintf 1 + _GL_FUNCDECL_RPL (vasprintf, int, + (char **result, const char *format, va_list args) + _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0) +@@ -1573,6 +1629,7 @@ _GL_CXXALIASWARN (vscanf); + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) + # define vsnprintf rpl_vsnprintf + # endif ++# define GNULIB_overrides_vsnprintf 1 + _GL_FUNCDECL_RPL (vsnprintf, int, + (char *restrict str, size_t size, + const char *restrict format, va_list args) +@@ -1609,6 +1666,7 @@ _GL_WARN_ON_USE (vsnprintf, "vsnprintf is unportable - " + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) + # define vsprintf rpl_vsprintf + # endif ++# define GNULIB_overrides_vsprintf 1 + _GL_FUNCDECL_RPL (vsprintf, int, + (char *restrict str, + const char *restrict format, va_list args) +diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h +index 7e01262..d86a880 100644 +--- a/lib/stdlib.in.h ++++ b/lib/stdlib.in.h +@@ -2,12 +2,12 @@ + + Copyright (C) 1995, 2001-2004, 2006-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +@@ -149,6 +149,28 @@ _GL_WARN_ON_USE (_Exit, "_Exit is unportable - " + #endif + + ++#if @GNULIB_FREE_POSIX@ ++# if @REPLACE_FREE@ ++# if !(defined __cplusplus && defined GNULIB_NAMESPACE) ++# undef free ++# define free rpl_free ++# endif ++_GL_FUNCDECL_RPL (free, void, (void *ptr)); ++_GL_CXXALIAS_RPL (free, void, (void *ptr)); ++# else ++_GL_CXXALIAS_SYS (free, void, (void *ptr)); ++# endif ++# if __GLIBC__ >= 2 ++_GL_CXXALIASWARN (free); ++# endif ++#elif defined GNULIB_POSIXCHECK ++# undef free ++/* Assume free is always declared. */ ++_GL_WARN_ON_USE (free, "free is not future POSIX compliant everywhere - " ++ "use gnulib module free for portability"); ++#endif ++ ++ + /* Allocate memory with indefinite extent and specified alignment. */ + #if @GNULIB_ALIGNED_ALLOC@ + # if @REPLACE_ALIGNED_ALLOC@ +@@ -156,21 +178,37 @@ _GL_WARN_ON_USE (_Exit, "_Exit is unportable - " + # undef aligned_alloc + # define aligned_alloc rpl_aligned_alloc + # endif +-_GL_FUNCDECL_RPL (aligned_alloc, void *, (size_t alignment, size_t size)); ++_GL_FUNCDECL_RPL (aligned_alloc, void *, ++ (size_t alignment, size_t size) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); + _GL_CXXALIAS_RPL (aligned_alloc, void *, (size_t alignment, size_t size)); + # else + # if @HAVE_ALIGNED_ALLOC@ ++# if __GNUC__ >= 11 ++/* For -Wmismatched-dealloc: Associate aligned_alloc with free or rpl_free. */ ++_GL_FUNCDECL_SYS (aligned_alloc, void *, ++ (size_t alignment, size_t size) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); ++# endif + _GL_CXXALIAS_SYS (aligned_alloc, void *, (size_t alignment, size_t size)); + # endif + # endif + # if @HAVE_ALIGNED_ALLOC@ + _GL_CXXALIASWARN (aligned_alloc); + # endif +-#elif defined GNULIB_POSIXCHECK +-# undef aligned_alloc +-# if HAVE_RAW_DECL_ALIGNED_ALLOC ++#else ++# if @GNULIB_FREE_POSIX@ && __GNUC__ >= 11 && !defined aligned_alloc ++/* For -Wmismatched-dealloc: Associate aligned_alloc with free or rpl_free. */ ++_GL_FUNCDECL_SYS (aligned_alloc, void *, ++ (size_t alignment, size_t size) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); ++# endif ++# if defined GNULIB_POSIXCHECK ++# undef aligned_alloc ++# if HAVE_RAW_DECL_ALIGNED_ALLOC + _GL_WARN_ON_USE (aligned_alloc, "aligned_alloc is not portable - " + "use gnulib module aligned_alloc for portability"); ++# endif + # endif + #endif + +@@ -198,19 +236,35 @@ _GL_WARN_ON_USE (atoll, "atoll is unportable - " + # undef calloc + # define calloc rpl_calloc + # endif +-_GL_FUNCDECL_RPL (calloc, void *, (size_t nmemb, size_t size)); ++_GL_FUNCDECL_RPL (calloc, void *, ++ (size_t nmemb, size_t size) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); + _GL_CXXALIAS_RPL (calloc, void *, (size_t nmemb, size_t size)); + # else ++# if __GNUC__ >= 11 ++/* For -Wmismatched-dealloc: Associate calloc with free or rpl_free. */ ++_GL_FUNCDECL_SYS (calloc, void *, ++ (size_t nmemb, size_t size) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); ++# endif + _GL_CXXALIAS_SYS (calloc, void *, (size_t nmemb, size_t size)); + # endif + # if __GLIBC__ >= 2 + _GL_CXXALIASWARN (calloc); + # endif +-#elif defined GNULIB_POSIXCHECK +-# undef calloc ++#else ++# if @GNULIB_FREE_POSIX@ && __GNUC__ >= 11 && !defined calloc ++/* For -Wmismatched-dealloc: Associate calloc with free or rpl_free. */ ++_GL_FUNCDECL_SYS (calloc, void *, ++ (size_t nmemb, size_t size) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); ++# endif ++# if defined GNULIB_POSIXCHECK ++# undef calloc + /* Assume calloc is always declared. */ + _GL_WARN_ON_USE (calloc, "calloc is not POSIX compliant everywhere - " + "use gnulib module calloc-posix for portability"); ++# endif + #endif + + #if @GNULIB_CANONICALIZE_FILE_NAME@ +@@ -218,13 +272,17 @@ _GL_WARN_ON_USE (calloc, "calloc is not POSIX compliant everywhere - " + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) + # define canonicalize_file_name rpl_canonicalize_file_name + # endif +-_GL_FUNCDECL_RPL (canonicalize_file_name, char *, (const char *name) +- _GL_ARG_NONNULL ((1))); ++_GL_FUNCDECL_RPL (canonicalize_file_name, char *, ++ (const char *name) ++ _GL_ARG_NONNULL ((1)) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); + _GL_CXXALIAS_RPL (canonicalize_file_name, char *, (const char *name)); + # else +-# if !@HAVE_CANONICALIZE_FILE_NAME@ +-_GL_FUNCDECL_SYS (canonicalize_file_name, char *, (const char *name) +- _GL_ARG_NONNULL ((1))); ++# if !@HAVE_CANONICALIZE_FILE_NAME@ || __GNUC__ >= 11 ++_GL_FUNCDECL_SYS (canonicalize_file_name, char *, ++ (const char *name) ++ _GL_ARG_NONNULL ((1)) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); + # endif + _GL_CXXALIAS_SYS (canonicalize_file_name, char *, (const char *name)); + # endif +@@ -233,12 +291,22 @@ _GL_CXXALIAS_SYS (canonicalize_file_name, char *, (const char *name)); + (!@HAVE_CANONICALIZE_FILE_NAME@ || @REPLACE_CANONICALIZE_FILE_NAME@) + # endif + _GL_CXXALIASWARN (canonicalize_file_name); +-#elif defined GNULIB_POSIXCHECK +-# undef canonicalize_file_name +-# if HAVE_RAW_DECL_CANONICALIZE_FILE_NAME ++#else ++# if @GNULIB_FREE_POSIX@ && __GNUC__ >= 11 && !defined canonicalize_file_name ++/* For -Wmismatched-dealloc: Associate canonicalize_file_name with free or ++ rpl_free. */ ++_GL_FUNCDECL_SYS (canonicalize_file_name, char *, ++ (const char *name) ++ _GL_ARG_NONNULL ((1)) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); ++# endif ++# if defined GNULIB_POSIXCHECK ++# undef canonicalize_file_name ++# if HAVE_RAW_DECL_CANONICALIZE_FILE_NAME + _GL_WARN_ON_USE (canonicalize_file_name, + "canonicalize_file_name is unportable - " + "use gnulib module canonicalize-lgpl for portability"); ++# endif + # endif + #endif + +@@ -288,27 +356,6 @@ _GL_CXXALIASWARN (fcvt); + # endif + #endif + +-#if @GNULIB_FREE_POSIX@ +-# if @REPLACE_FREE@ +-# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +-# undef free +-# define free rpl_free +-# endif +-_GL_FUNCDECL_RPL (free, void, (void *ptr)); +-_GL_CXXALIAS_RPL (free, void, (void *ptr)); +-# else +-_GL_CXXALIAS_SYS (free, void, (void *ptr)); +-# endif +-# if __GLIBC__ >= 2 +-_GL_CXXALIASWARN (free); +-# endif +-#elif defined GNULIB_POSIXCHECK +-# undef free +-/* Assume free is always declared. */ +-_GL_WARN_ON_USE (free, "free is not future POSIX compliant everywhere - " +- "use gnulib module free for portability"); +-#endif +- + #if @GNULIB_MDA_GCVT@ + /* On native Windows, map 'gcvt' to '_gcvt', so that -loldnames is not + required. In C++ with GNULIB_NAMESPACE, avoid differences between +@@ -404,19 +451,35 @@ _GL_WARN_ON_USE (grantpt, "grantpt is not portable - " + # undef malloc + # define malloc rpl_malloc + # endif +-_GL_FUNCDECL_RPL (malloc, void *, (size_t size)); ++_GL_FUNCDECL_RPL (malloc, void *, ++ (size_t size) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); + _GL_CXXALIAS_RPL (malloc, void *, (size_t size)); + # else ++# if __GNUC__ >= 11 ++/* For -Wmismatched-dealloc: Associate malloc with free or rpl_free. */ ++_GL_FUNCDECL_SYS (malloc, void *, ++ (size_t size) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); ++# endif + _GL_CXXALIAS_SYS (malloc, void *, (size_t size)); + # endif + # if __GLIBC__ >= 2 + _GL_CXXALIASWARN (malloc); + # endif +-#elif defined GNULIB_POSIXCHECK && !_GL_USE_STDLIB_ALLOC +-# undef malloc ++#else ++# if @GNULIB_FREE_POSIX@ && __GNUC__ >= 11 && !defined malloc ++/* For -Wmismatched-dealloc: Associate malloc with free or rpl_free. */ ++_GL_FUNCDECL_SYS (malloc, void *, ++ (size_t size) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); ++# endif ++# if defined GNULIB_POSIXCHECK && !_GL_USE_STDLIB_ALLOC ++# undef malloc + /* Assume malloc is always declared. */ + _GL_WARN_ON_USE (malloc, "malloc is not POSIX compliant everywhere - " + "use gnulib module malloc-posix for portability"); ++# endif + #endif + + /* Convert a multibyte character to a wide character. */ +@@ -1015,29 +1078,53 @@ _GL_WARN_ON_USE (setstate_r, "setstate_r is unportable - " + # undef realloc + # define realloc rpl_realloc + # endif +-_GL_FUNCDECL_RPL (realloc, void *, (void *ptr, size_t size)); ++_GL_FUNCDECL_RPL (realloc, void *, (void *ptr, size_t size) ++ _GL_ATTRIBUTE_DEALLOC_FREE); + _GL_CXXALIAS_RPL (realloc, void *, (void *ptr, size_t size)); + # else ++# if __GNUC__ >= 11 ++/* For -Wmismatched-dealloc: Associate realloc with free or rpl_free. */ ++_GL_FUNCDECL_SYS (realloc, void *, (void *ptr, size_t size) ++ _GL_ATTRIBUTE_DEALLOC_FREE); ++# endif + _GL_CXXALIAS_SYS (realloc, void *, (void *ptr, size_t size)); + # endif + # if __GLIBC__ >= 2 + _GL_CXXALIASWARN (realloc); + # endif +-#elif defined GNULIB_POSIXCHECK && !_GL_USE_STDLIB_ALLOC +-# undef realloc ++#else ++# if @GNULIB_FREE_POSIX@ && __GNUC__ >= 11 && !defined realloc ++/* For -Wmismatched-dealloc: Associate realloc with free or rpl_free. */ ++_GL_FUNCDECL_SYS (realloc, void *, (void *ptr, size_t size) ++ _GL_ATTRIBUTE_DEALLOC_FREE); ++# endif ++# if defined GNULIB_POSIXCHECK && !_GL_USE_STDLIB_ALLOC ++# undef realloc + /* Assume realloc is always declared. */ + _GL_WARN_ON_USE (realloc, "realloc is not POSIX compliant everywhere - " + "use gnulib module realloc-posix for portability"); ++# endif + #endif + + + #if @GNULIB_REALLOCARRAY@ +-# if ! @HAVE_REALLOCARRAY@ ++# if @REPLACE_REALLOCARRAY@ ++# if !(defined __cplusplus && defined GNULIB_NAMESPACE) ++# undef reallocarray ++# define reallocarray rpl_reallocarray ++# endif ++_GL_FUNCDECL_RPL (reallocarray, void *, ++ (void *ptr, size_t nmemb, size_t size)); ++_GL_CXXALIAS_RPL (reallocarray, void *, ++ (void *ptr, size_t nmemb, size_t size)); ++# else ++# if ! @HAVE_REALLOCARRAY@ + _GL_FUNCDECL_SYS (reallocarray, void *, + (void *ptr, size_t nmemb, size_t size)); +-# endif ++# endif + _GL_CXXALIAS_SYS (reallocarray, void *, + (void *ptr, size_t nmemb, size_t size)); ++# endif + _GL_CXXALIASWARN (reallocarray); + #elif defined GNULIB_POSIXCHECK + # undef reallocarray +diff --git a/lib/strdup.c b/lib/strdup.c +index 2a37049..e5d4d75 100644 +--- a/lib/strdup.c ++++ b/lib/strdup.c +@@ -3,18 +3,18 @@ + + This file is part of the GNU C Library. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + #ifndef _LIBC + # include +diff --git a/lib/streq.h b/lib/streq.h +index 2d9d4c2..adabd15 100644 +--- a/lib/streq.h ++++ b/lib/streq.h +@@ -1,15 +1,15 @@ + /* Optimized string comparison. + Copyright (C) 2001-2002, 2007, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify it +- under the terms of the GNU Lesser General Public License as published +- by the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 +- Lesser General Public License for more details. ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ +diff --git a/lib/strftime.h b/lib/strftime.h +index 645e8c7..790a80e 100644 +--- a/lib/strftime.h ++++ b/lib/strftime.h +@@ -2,12 +2,12 @@ + + Copyright (C) 2002, 2004, 2008-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser 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, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/striconveh.c b/lib/striconveh.c +index 82f6467..78a5e02 100644 +--- a/lib/striconveh.c ++++ b/lib/striconveh.c +@@ -2,12 +2,12 @@ + Copyright (C) 2001-2021 Free Software Foundation, Inc. + Written by Bruno Haible and Simon Josefsson. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/striconveh.h b/lib/striconveh.h +index c9dff1e..60c6329 100644 +--- a/lib/striconveh.h ++++ b/lib/striconveh.h +@@ -2,12 +2,12 @@ + Copyright (C) 2001-2007, 2009-2021 Free Software Foundation, Inc. + Written by Bruno Haible and Simon Josefsson. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +@@ -18,7 +18,7 @@ + #ifndef _STRICONVEH_H + #define _STRICONVEH_H + +-#include ++#include + #if HAVE_ICONV + #include + #endif +@@ -95,7 +95,8 @@ extern int + extern char * + str_cd_iconveh (const char *src, + const iconveh_t *cd, +- enum iconv_ilseq_handler handler); ++ enum iconv_ilseq_handler handler) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE; + + #endif + +@@ -129,7 +130,8 @@ extern int + extern char * + str_iconveh (const char *src, + const char *from_codeset, const char *to_codeset, +- enum iconv_ilseq_handler handler); ++ enum iconv_ilseq_handler handler) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE; + + + #ifdef __cplusplus +diff --git a/lib/string.in.h b/lib/string.in.h +index 1292e29..b043c75 100644 +--- a/lib/string.in.h ++++ b/lib/string.in.h +@@ -2,18 +2,18 @@ + + Copyright (C) 1995-1996, 2001-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + #if __GNUC__ >= 3 + @PRAGMA_SYSTEM_HEADER@ +@@ -47,6 +47,9 @@ + /* NetBSD 5.0 mis-defines NULL. */ + #include + ++/* Get free(). */ ++#include ++ + /* MirBSD defines mbslen as a macro. */ + #if @GNULIB_MBSLEN@ && defined __MirBSD__ + # include +@@ -418,7 +421,10 @@ _GL_WARN_ON_USE (strchrnul, "strchrnul is unportable - " + # undef strdup + # define strdup rpl_strdup + # endif +-_GL_FUNCDECL_RPL (strdup, char *, (char const *__s) _GL_ARG_NONNULL ((1))); ++_GL_FUNCDECL_RPL (strdup, char *, ++ (char const *__s) ++ _GL_ARG_NONNULL ((1)) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); + _GL_CXXALIAS_RPL (strdup, char *, (char const *__s)); + # elif defined _WIN32 && !defined __CYGWIN__ + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) +@@ -431,35 +437,47 @@ _GL_CXXALIAS_MDA (strdup, char *, (char const *__s)); + /* strdup exists as a function and as a macro. Get rid of the macro. */ + # undef strdup + # endif +-# if !(@HAVE_DECL_STRDUP@ || defined strdup) +-_GL_FUNCDECL_SYS (strdup, char *, (char const *__s) _GL_ARG_NONNULL ((1))); ++# if (!@HAVE_DECL_STRDUP@ || __GNUC__ >= 11) && !defined strdup ++_GL_FUNCDECL_SYS (strdup, char *, ++ (char const *__s) ++ _GL_ARG_NONNULL ((1)) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); + # endif + _GL_CXXALIAS_SYS (strdup, char *, (char const *__s)); + # endif + _GL_CXXALIASWARN (strdup); +-#elif defined GNULIB_POSIXCHECK +-# undef strdup +-# if HAVE_RAW_DECL_STRDUP ++#else ++# if __GNUC__ >= 11 && !defined strdup ++/* For -Wmismatched-dealloc: Associate strdup with free or rpl_free. */ ++_GL_FUNCDECL_SYS (strdup, char *, ++ (char const *__s) ++ _GL_ARG_NONNULL ((1)) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); ++# endif ++# if defined GNULIB_POSIXCHECK ++# undef strdup ++# if HAVE_RAW_DECL_STRDUP + _GL_WARN_ON_USE (strdup, "strdup is unportable - " + "use gnulib module strdup for portability"); +-# endif +-#elif @GNULIB_MDA_STRDUP@ ++# endif ++# elif @GNULIB_MDA_STRDUP@ + /* On native Windows, map 'creat' to '_creat', so that -loldnames is not + required. In C++ with GNULIB_NAMESPACE, avoid differences between +- platforms by defining GNULIB_NAMESPACE::creat always. */ +-# if defined _WIN32 && !defined __CYGWIN__ +-# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +-# undef strdup +-# define strdup _strdup +-# endif ++ platforms by defining GNULIB_NAMESPACE::strdup always. */ ++# if defined _WIN32 && !defined __CYGWIN__ ++# if !(defined __cplusplus && defined GNULIB_NAMESPACE) ++# undef strdup ++# define strdup _strdup ++# endif + _GL_CXXALIAS_MDA (strdup, char *, (char const *__s)); +-# else +-# if defined __cplusplus && defined GNULIB_NAMESPACE && defined strdup +-# undef strdup +-# endif ++# else ++# if defined __cplusplus && defined GNULIB_NAMESPACE && defined strdup ++# undef strdup ++# endif + _GL_CXXALIAS_SYS (strdup, char *, (char const *__s)); +-# endif ++# endif + _GL_CXXALIASWARN (strdup); ++# endif + #endif + + /* Append no more than N characters from SRC onto DEST. */ +diff --git a/lib/stripslash.c b/lib/stripslash.c +index b079795..99bfbe6 100644 +--- a/lib/stripslash.c ++++ b/lib/stripslash.c +@@ -3,12 +3,12 @@ + Copyright (C) 1990, 2001, 2003-2006, 2009-2021 Free Software Foundation, + Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/sys-limits.h b/lib/sys-limits.h +index 1856e7f..2d9784d 100644 +--- a/lib/sys-limits.h ++++ b/lib/sys-limits.h +@@ -2,18 +2,18 @@ + + Copyright 2018-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + #ifndef _GL_SYS_LIMITS_H + #define _GL_SYS_LIMITS_H +diff --git a/lib/sys_file.in.h b/lib/sys_file.in.h +index e18594f..4166082 100644 +--- a/lib/sys_file.in.h ++++ b/lib/sys_file.in.h +@@ -2,18 +2,18 @@ + + Copyright (C) 2007-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + /* Written by Richard W.M. Jones. */ + +diff --git a/lib/sys_random.in.h b/lib/sys_random.in.h +index 1a479e9..1abd6c5 100644 +--- a/lib/sys_random.in.h ++++ b/lib/sys_random.in.h +@@ -1,18 +1,18 @@ + /* Substitute for . + Copyright (C) 2020-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + # if __GNUC__ >= 3 + @PRAGMA_SYSTEM_HEADER@ +diff --git a/lib/sys_select.in.h b/lib/sys_select.in.h +index d82c5d1..f8ef648 100644 +--- a/lib/sys_select.in.h ++++ b/lib/sys_select.in.h +@@ -1,18 +1,18 @@ + /* Substitute for . + Copyright (C) 2007-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + # if __GNUC__ >= 3 + @PRAGMA_SYSTEM_HEADER@ +diff --git a/lib/sys_socket.c b/lib/sys_socket.c +index 3b261da..d90b32c 100644 +--- a/lib/sys_socket.c ++++ b/lib/sys_socket.c +@@ -1,4 +1,22 @@ ++/* Inline functions for . ++ ++ Copyright (C) 2012-2021 Free Software Foundation, Inc. ++ ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. ++ ++ This file 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 Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ ++ + #include ++ + #define _GL_SYS_SOCKET_INLINE _GL_EXTERN_INLINE + #include "sys/socket.h" + typedef int dummy; +diff --git a/lib/sys_socket.in.h b/lib/sys_socket.in.h +index c0baa71..0a2c57d 100644 +--- a/lib/sys_socket.in.h ++++ b/lib/sys_socket.in.h +@@ -3,18 +3,18 @@ + Copyright (C) 2005-2021 Free Software Foundation, Inc. + Written by Simon Josefsson. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + /* This file is supposed to be used on platforms that lack , + on platforms where cannot be included standalone, and on +diff --git a/lib/sys_stat.in.h b/lib/sys_stat.in.h +index 125aca0..babe3db 100644 +--- a/lib/sys_stat.in.h ++++ b/lib/sys_stat.in.h +@@ -1,18 +1,18 @@ + /* Provide a more complete sys/stat.h header file. + Copyright (C) 2005-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + /* Written by Eric Blake, Paul Eggert, and Jim Meyering. */ + +diff --git a/lib/sys_time.in.h b/lib/sys_time.in.h +index f310ca5..8035fbe 100644 +--- a/lib/sys_time.in.h ++++ b/lib/sys_time.in.h +@@ -2,18 +2,18 @@ + + Copyright (C) 2007-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + /* Written by Paul Eggert. */ + +diff --git a/lib/sys_times.in.h b/lib/sys_times.in.h +index 3d96200..85b728f 100644 +--- a/lib/sys_times.in.h ++++ b/lib/sys_times.in.h +@@ -1,18 +1,18 @@ + /* Provide a sys/times.h header file. + Copyright (C) 2008-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + /* Written by Simon Josefsson , 2008. */ + +diff --git a/lib/sys_types.in.h b/lib/sys_types.in.h +index 26e7db7..2079d72 100644 +--- a/lib/sys_types.in.h ++++ b/lib/sys_types.in.h +@@ -2,18 +2,18 @@ + + Copyright (C) 2011-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + #if __GNUC__ >= 3 + @PRAGMA_SYSTEM_HEADER@ +diff --git a/lib/sys_uio.in.h b/lib/sys_uio.in.h +index 1941360..507ab01 100644 +--- a/lib/sys_uio.in.h ++++ b/lib/sys_uio.in.h +@@ -1,18 +1,18 @@ + /* Substitute for . + Copyright (C) 2011-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + # if __GNUC__ >= 3 + @PRAGMA_SYSTEM_HEADER@ +diff --git a/lib/tempname.h b/lib/tempname.h +index c91a58d..795bb49 100644 +--- a/lib/tempname.h ++++ b/lib/tempname.h +@@ -2,12 +2,12 @@ + + Copyright (C) 2006, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/time-internal.h b/lib/time-internal.h +index b86b7a0..6bbd0a7 100644 +--- a/lib/time-internal.h ++++ b/lib/time-internal.h +@@ -2,18 +2,18 @@ + + Copyright 2015-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser 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, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + /* Written by Paul Eggert. */ + +diff --git a/lib/time.in.h b/lib/time.in.h +index cbd2bba..a73fe59 100644 +--- a/lib/time.in.h ++++ b/lib/time.in.h +@@ -2,18 +2,18 @@ + + Copyright (C) 2007-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + #if __GNUC__ >= 3 + @PRAGMA_SYSTEM_HEADER@ +diff --git a/lib/time_r.c b/lib/time_r.c +index 2510c4e..88d3c1c 100644 +--- a/lib/time_r.c ++++ b/lib/time_r.c +@@ -2,18 +2,18 @@ + + Copyright (C) 2003, 2006-2007, 2010-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + /* Written by Paul Eggert. */ + +diff --git a/lib/time_rz.c b/lib/time_rz.c +index d32cce7..e772244 100644 +--- a/lib/time_rz.c ++++ b/lib/time_rz.c +@@ -2,18 +2,18 @@ + + Copyright 2015-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser 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, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + /* Written by Paul Eggert. */ + +diff --git a/lib/times.c b/lib/times.c +index b8afa60..72b852e 100644 +--- a/lib/times.c ++++ b/lib/times.c +@@ -2,18 +2,18 @@ + + Copyright (C) 2008-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + /* Written by Simon Josefsson , 2008. */ + +diff --git a/lib/trunc.c b/lib/trunc.c +index cf2adac..1c9c420 100644 +--- a/lib/trunc.c ++++ b/lib/trunc.c +@@ -1,12 +1,12 @@ + /* Round towards zero. + Copyright (C) 2007, 2010-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser 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, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/tzset.c b/lib/tzset.c +index 1f423c4..7fd4936 100644 +--- a/lib/tzset.c ++++ b/lib/tzset.c +@@ -2,18 +2,18 @@ + + Copyright (C) 2001-2003, 2005-2007, 2009-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser 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, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + /* written by Jim Meyering */ + +diff --git a/lib/unistd.c b/lib/unistd.c +index 72bad1c..0763456 100644 +--- a/lib/unistd.c ++++ b/lib/unistd.c +@@ -1,4 +1,22 @@ ++/* Inline functions for . ++ ++ Copyright (C) 2012-2021 Free Software Foundation, Inc. ++ ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. ++ ++ This file 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 Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ ++ + #include ++ + #define _GL_UNISTD_INLINE _GL_EXTERN_INLINE + #include "unistd.h" + typedef int dummy; +diff --git a/lib/unistd.in.h b/lib/unistd.in.h +index 5914fd5..73c882f 100644 +--- a/lib/unistd.in.h ++++ b/lib/unistd.in.h +@@ -1,18 +1,18 @@ + /* Substitute for and wrapper around . + Copyright (C) 2003-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + #ifndef _ at GUARD_PREFIX@_UNISTD_H + +@@ -1521,6 +1521,7 @@ _GL_WARN_ON_USE (group_member, "group_member is unportable - " + # undef isatty + # define isatty rpl_isatty + # endif ++# define GNULIB_defined_isatty 1 + _GL_FUNCDECL_RPL (isatty, int, (int fd)); + _GL_CXXALIAS_RPL (isatty, int, (int fd)); + # elif defined _WIN32 && !defined __CYGWIN__ +@@ -2027,15 +2028,23 @@ _GL_WARN_ON_USE (sleep, "sleep is unportable - " + #if @GNULIB_MDA_SWAB@ + /* On native Windows, map 'swab' to '_swab', so that -loldnames is not + required. In C++ with GNULIB_NAMESPACE, avoid differences between +- platforms by defining GNULIB_NAMESPACE::creat always. */ ++ platforms by defining GNULIB_NAMESPACE::swab always. */ + # if defined _WIN32 && !defined __CYGWIN__ + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) + # undef swab + # define swab _swab + # endif +-_GL_CXXALIAS_MDA (swab, void, (char *from, char *to, int n)); ++/* Need to cast, because in old mingw the arguments are ++ (const char *from, char *to, size_t n). */ ++_GL_CXXALIAS_MDA_CAST (swab, void, (char *from, char *to, int n)); + # else ++# if defined __hpux /* HP-UX */ ++_GL_CXXALIAS_SYS (swab, void, (const char *from, char *to, int n)); ++# elif defined __sun && !defined _XPG4 /* Solaris */ ++_GL_CXXALIAS_SYS (swab, void, (const char *from, char *to, ssize_t n)); ++# else + _GL_CXXALIAS_SYS (swab, void, (const void *from, void *to, ssize_t n)); ++# endif + # endif + _GL_CXXALIASWARN (swab); + #endif +diff --git a/lib/unsetenv.c b/lib/unsetenv.c +index 005fb1f..b2e910e 100644 +--- a/lib/unsetenv.c ++++ b/lib/unsetenv.c +@@ -1,12 +1,12 @@ + /* Copyright (C) 1992, 1995-2002, 2005-2021 Free Software Foundation, Inc. + This file is part of the GNU C Library. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c +index 8d51006..d9b669d 100644 +--- a/lib/vasnprintf.c ++++ b/lib/vasnprintf.c +@@ -1,18 +1,18 @@ + /* vsprintf with automatic memory allocation. + Copyright (C) 1999, 2002-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + /* This file can be parametrized with the following macros: + VASNPRINTF The name of the function being defined. +@@ -60,10 +60,16 @@ + #ifndef VASNPRINTF + # include + #endif +-#ifndef IN_LIBINTL +-# include ++ ++/* As of GCC 11.2.1, gcc -Wanalyzer-too-complex reports that main's ++ use of CHECK macros expands to code that is too complicated for gcc ++ -fanalyzer. Suppress the resulting bogus warnings. */ ++#if 10 <= __GNUC__ ++# pragma GCC diagnostic ignored "-Wanalyzer-null-argument" + #endif + ++#include ++ + /* Specification. */ + #ifndef VASNPRINTF + # if WIDE_CHAR_VERSION +@@ -1924,7 +1930,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, + + /* Ensures that allocated >= needed. Aborts through a jump to + out_of_memory if needed is SIZE_MAX or otherwise too big. */ +-#define ENSURE_ALLOCATION(needed) \ ++#define ENSURE_ALLOCATION_ELSE(needed, oom_statement) \ + if ((needed) > allocated) \ + { \ + size_t memory_size; \ +@@ -1935,17 +1941,19 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, + allocated = (needed); \ + memory_size = xtimes (allocated, sizeof (DCHAR_T)); \ + if (size_overflow_p (memory_size)) \ +- goto out_of_memory; \ ++ oom_statement \ + if (result == resultbuf || result == NULL) \ + memory = (DCHAR_T *) malloc (memory_size); \ + else \ + memory = (DCHAR_T *) realloc (result, memory_size); \ + if (memory == NULL) \ +- goto out_of_memory; \ ++ oom_statement \ + if (result == resultbuf && length > 0) \ + DCHAR_CPY (memory, result, length); \ + result = memory; \ + } ++#define ENSURE_ALLOCATION(needed) \ ++ ENSURE_ALLOCATION_ELSE((needed), goto out_of_memory; ) + + for (cp = format, i = 0, dp = &d.dir[0]; ; cp = dp->dir_end, i++, dp++) + { +@@ -2193,7 +2201,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, + } + if (converted != result + length) + { +- ENSURE_ALLOCATION (xsum (length, converted_len)); ++ ENSURE_ALLOCATION_ELSE (xsum (length, converted_len), ++ { free (converted); goto out_of_memory; }); + DCHAR_CPY (result + length, converted, converted_len); + free (converted); + } +@@ -2317,7 +2326,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, + } + if (converted != result + length) + { +- ENSURE_ALLOCATION (xsum (length, converted_len)); ++ ENSURE_ALLOCATION_ELSE (xsum (length, converted_len), ++ { free (converted); goto out_of_memory; }); + DCHAR_CPY (result + length, converted, converted_len); + free (converted); + } +@@ -2441,7 +2451,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, + } + if (converted != result + length) + { +- ENSURE_ALLOCATION (xsum (length, converted_len)); ++ ENSURE_ALLOCATION_ELSE (xsum (length, converted_len), ++ { free (converted); goto out_of_memory; }); + DCHAR_CPY (result + length, converted, converted_len); + free (converted); + } +@@ -2944,7 +2955,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, + } + } + # else +- ENSURE_ALLOCATION (xsum (length, tmpdst_len)); ++ ENSURE_ALLOCATION_ELSE (xsum (length, tmpdst_len), ++ { free (tmpdst); goto out_of_memory; }); + DCHAR_CPY (result + length, tmpdst, tmpdst_len); + free (tmpdst); + length += tmpdst_len; +@@ -3147,7 +3159,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, + } + } + # else +- ENSURE_ALLOCATION (xsum (length, tmpdst_len)); ++ ENSURE_ALLOCATION_ELSE (xsum (length, tmpdst_len), ++ { free (tmpdst); goto out_of_memory; }); + DCHAR_CPY (result + length, tmpdst, tmpdst_len); + free (tmpdst); + length += tmpdst_len; +@@ -5598,7 +5611,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, + CLEANUP (); + return NULL; + } +- ENSURE_ALLOCATION (xsum (length, tmpdst_len)); ++ ENSURE_ALLOCATION_ELSE (xsum (length, tmpdst_len), ++ { free (tmpdst); goto out_of_memory; }); + DCHAR_CPY (result + length, tmpdst, tmpdst_len); + free (tmpdst); + count = tmpdst_len; +diff --git a/lib/vasnprintf.h b/lib/vasnprintf.h +index aaed859..9b02cdf 100644 +--- a/lib/vasnprintf.h ++++ b/lib/vasnprintf.h +@@ -1,18 +1,18 @@ + /* vsprintf with automatic memory allocation. + Copyright (C) 2002-2004, 2007-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + #ifndef _VASNPRINTF_H + #define _VASNPRINTF_H +diff --git a/lib/verify.h b/lib/verify.h +index d1b4995..a8ca59b 100644 +--- a/lib/verify.h ++++ b/lib/verify.h +@@ -2,12 +2,12 @@ + + Copyright (C) 2005-2006, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +@@ -25,7 +25,7 @@ + works as per C11. This is supported by GCC 4.6.0+ and by clang 4+. + + Define _GL_HAVE__STATIC_ASSERT1 to 1 if _Static_assert (R) works as +- per C2X. This is supported by GCC 9.1+. ++ per C2x. This is supported by GCC 9.1+. + + Support compilers claiming conformance to the relevant standard, + and also support GCC when not pedantic. If we were willing to slow +@@ -202,7 +202,7 @@ template + + This macro requires three or more arguments but uses at most the first + two, so that the _Static_assert macro optionally defined below supports +- both the C11 two-argument syntax and the C2X one-argument syntax. ++ both the C11 two-argument syntax and the C2x one-argument syntax. + + Unfortunately, unlike C11, this implementation must appear as an + ordinary declaration, and cannot appear inside struct { ... }. */ +diff --git a/lib/vsnprintf.c b/lib/vsnprintf.c +index c94c5cb..4a0a3dc 100644 +--- a/lib/vsnprintf.c ++++ b/lib/vsnprintf.c +@@ -2,18 +2,18 @@ + Copyright (C) 2004, 2006-2021 Free Software Foundation, Inc. + Written by Simon Josefsson and Yoann Vandoorselaere . + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License along +- with this program; if not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + #ifdef HAVE_CONFIG_H + # include +diff --git a/lib/w32sock.h b/lib/w32sock.h +index 9b6a231..635a1b2 100644 +--- a/lib/w32sock.h ++++ b/lib/w32sock.h +@@ -2,12 +2,12 @@ + + Copyright (C) 2008-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/wchar.in.h b/lib/wchar.in.h +index fe4171c..be5d36c 100644 +--- a/lib/wchar.in.h ++++ b/lib/wchar.in.h +@@ -2,18 +2,18 @@ + + Copyright (C) 2007-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + /* Written by Eric Blake. */ + +@@ -72,6 +72,9 @@ + # include + #endif + ++/* Get free(). */ ++#include ++ + /* Include the original if it exists. + Some builds of uClibc lack it. */ + /* The include_next requires a split double-inclusion guard. */ +@@ -111,7 +114,7 @@ + /* mingw and MSVC define wint_t as 'unsigned short' in or + . This is too small: ISO C 99 section 7.24.1.(2) says that + wint_t must be "unchanged by default argument promotions". Override it. */ +-# if @GNULIB_OVERRIDES_WINT_T@ ++# if @GNULIBHEADERS_OVERRIDE_WINT_T@ + # if !GNULIB_defined_wint_t + # if @HAVE_CRTDEFS_H@ + # include +@@ -941,36 +944,48 @@ _GL_WARN_ON_USE (wcsxfrm, "wcsxfrm is unportable - " + # endif + _GL_CXXALIAS_MDA (wcsdup, wchar_t *, (const wchar_t *s)); + # else +-# if !@HAVE_WCSDUP@ +-_GL_FUNCDECL_SYS (wcsdup, wchar_t *, (const wchar_t *s)); ++# if !@HAVE_WCSDUP@ || __GNUC__ >= 11 ++_GL_FUNCDECL_SYS (wcsdup, wchar_t *, ++ (const wchar_t *s) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); + # endif + _GL_CXXALIAS_SYS (wcsdup, wchar_t *, (const wchar_t *s)); + # endif + _GL_CXXALIASWARN (wcsdup); +-#elif defined GNULIB_POSIXCHECK +-# undef wcsdup +-# if HAVE_RAW_DECL_WCSDUP ++#else ++# if __GNUC__ >= 11 && !defined wcsdup ++/* For -Wmismatched-dealloc: Associate wcsdup with free or rpl_free. */ ++_GL_FUNCDECL_SYS (wcsdup, wchar_t *, ++ (const wchar_t *s) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); ++# endif ++# if defined GNULIB_POSIXCHECK ++# undef wcsdup ++# if HAVE_RAW_DECL_WCSDUP + _GL_WARN_ON_USE (wcsdup, "wcsdup is unportable - " + "use gnulib module wcsdup for portability"); +-# endif +-#elif @GNULIB_MDA_WCSDUP@ ++# endif ++# elif @GNULIB_MDA_WCSDUP@ + /* On native Windows, map 'wcsdup' to '_wcsdup', so that -loldnames is not + required. In C++ with GNULIB_NAMESPACE, avoid differences between + platforms by defining GNULIB_NAMESPACE::wcsdup always. */ +-# if defined _WIN32 && !defined __CYGWIN__ +-# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +-# undef wcsdup +-# define wcsdup _wcsdup +-# endif ++# if defined _WIN32 && !defined __CYGWIN__ ++# if !(defined __cplusplus && defined GNULIB_NAMESPACE) ++# undef wcsdup ++# define wcsdup _wcsdup ++# endif + _GL_CXXALIAS_MDA (wcsdup, wchar_t *, (const wchar_t *s)); +-# else +-_GL_FUNCDECL_SYS (wcsdup, wchar_t *, (const wchar_t *s)); +-# if @HAVE_DECL_WCSDUP@ ++# else ++_GL_FUNCDECL_SYS (wcsdup, wchar_t *, ++ (const wchar_t *s) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); ++# if @HAVE_DECL_WCSDUP@ + _GL_CXXALIAS_SYS (wcsdup, wchar_t *, (const wchar_t *s)); ++# endif + # endif +-# endif +-# if (defined _WIN32 && !defined __CYGWIN__) || @HAVE_DECL_WCSDUP@ ++# if (defined _WIN32 && !defined __CYGWIN__) || @HAVE_DECL_WCSDUP@ + _GL_CXXALIASWARN (wcsdup); ++# endif + # endif + #endif + +diff --git a/lib/wcrtomb.c b/lib/wcrtomb.c +index 76d21ae..5c9fd79 100644 +--- a/lib/wcrtomb.c ++++ b/lib/wcrtomb.c +@@ -2,12 +2,12 @@ + Copyright (C) 2008-2021 Free Software Foundation, Inc. + Written by Bruno Haible , 2008. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/wctype-h.c b/lib/wctype-h.c +index bb5f847..150221d 100644 +--- a/lib/wctype-h.c ++++ b/lib/wctype-h.c +@@ -1,4 +1,23 @@ ++/* Inline functions for . ++ ++ Copyright (C) 2012-2021 Free Software Foundation, Inc. ++ ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. ++ ++ This file 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 Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ ++ + /* Normally this would be wctype.c, but that name's already taken. */ ++ + #include ++ + #define _GL_WCTYPE_INLINE _GL_EXTERN_INLINE + #include "wctype.h" +diff --git a/lib/wctype.in.h b/lib/wctype.in.h +index 6f0cd21..652d811 100644 +--- a/lib/wctype.in.h ++++ b/lib/wctype.in.h +@@ -2,18 +2,18 @@ + + Copyright (C) 2006-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + /* Written by Bruno Haible and Paul Eggert. */ + +@@ -103,7 +103,7 @@ _GL_INLINE_HEADER_BEGIN + /* mingw and MSVC define wint_t as 'unsigned short' in or + . This is too small: ISO C 99 section 7.24.1.(2) says that + wint_t must be "unchanged by default argument promotions". Override it. */ +-# if @GNULIB_OVERRIDES_WINT_T@ ++# if @GNULIBHEADERS_OVERRIDE_WINT_T@ + # if !GNULIB_defined_wint_t + # if @HAVE_CRTDEFS_H@ + # include +@@ -132,7 +132,7 @@ typedef unsigned int rpl_wint_t; + same way, or not at all. */ + # if ! @HAVE_ISWCNTRL@ || @REPLACE_ISWCNTRL@ + +-# if @GNULIB_OVERRIDES_WINT_T@ /* implies @REPLACE_ISWCNTRL@ */ ++# if @GNULIBHEADERS_OVERRIDE_WINT_T@ /* implies @REPLACE_ISWCNTRL@ */ + + _GL_WCTYPE_INLINE int + rpl_iswalnum (wint_t wc) +@@ -496,7 +496,7 @@ _GL_FUNCDECL_RPL (iswxdigit, int, (wint_t wc)); + + # endif + +-# if defined __MINGW32__ && !@GNULIB_OVERRIDES_WINT_T@ ++# if defined __MINGW32__ && !@GNULIBHEADERS_OVERRIDE_WINT_T@ + + /* On native Windows, wchar_t is uint16_t, and wint_t is uint32_t. + The functions towlower and towupper are implemented in the MSVCRT library +@@ -529,7 +529,7 @@ rpl_towupper (wint_t wc) + # define towupper rpl_towupper + # endif + +-# endif /* __MINGW32__ && !@GNULIB_OVERRIDES_WINT_T@ */ ++# endif /* __MINGW32__ && !@GNULIBHEADERS_OVERRIDE_WINT_T@ */ + + # define GNULIB_defined_wctype_functions 1 + #endif +@@ -646,7 +646,7 @@ _GL_WARN_ON_USE (wctype, "wctype is unportable - " + The argument WC must be either a wchar_t value or WEOF. + The argument DESC must have been returned by the wctype() function. */ + #if @GNULIB_ISWCTYPE@ +-# if @GNULIB_OVERRIDES_WINT_T@ ++# if @GNULIBHEADERS_OVERRIDE_WINT_T@ + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) + # undef iswctype + # define iswctype rpl_iswctype +diff --git a/lib/windows-initguard.h b/lib/windows-initguard.h +index e84051e..7999b23 100644 +--- a/lib/windows-initguard.h ++++ b/lib/windows-initguard.h +@@ -1,18 +1,18 @@ + /* Init guards, somewhat like spinlocks (native Windows implementation). + Copyright (C) 2005-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + /* Written by Bruno Haible , 2005. + Based on GCC's gthr-win32.h. */ +diff --git a/lib/write.c b/lib/write.c +index bc53d4d..614cdc6 100644 +--- a/lib/write.c ++++ b/lib/write.c +@@ -2,12 +2,12 @@ + Copyright (C) 2008-2021 Free Software Foundation, Inc. + Written by Bruno Haible , 2008. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +diff --git a/lib/xalloc-oversized.h b/lib/xalloc-oversized.h +index d255969..4184f33 100644 +--- a/lib/xalloc-oversized.h ++++ b/lib/xalloc-oversized.h +@@ -2,12 +2,12 @@ + + Copyright (C) 1990-2000, 2003-2004, 2006-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. +@@ -22,33 +22,38 @@ + #include + + /* True if N * S does not fit into both ptrdiff_t and size_t. +- S must be positive and N must be nonnegative. ++ N and S should be nonnegative and free of side effects. + This expands to a constant expression if N and S are both constants. + By gnulib convention, SIZE_MAX represents overflow in size_t + calculations, so the conservative size_t-based dividend to use here + is SIZE_MAX - 1. */ + #define __xalloc_oversized(n, s) \ +- ((size_t) (PTRDIFF_MAX < SIZE_MAX ? PTRDIFF_MAX : SIZE_MAX - 1) / (s) < (n)) ++ ((s) != 0 \ ++ && ((size_t) (PTRDIFF_MAX < SIZE_MAX ? PTRDIFF_MAX : SIZE_MAX - 1) / (s) \ ++ < (n))) + +-#if PTRDIFF_MAX < SIZE_MAX +-typedef ptrdiff_t xalloc_count_t; +-#else +-typedef size_t xalloc_count_t; +-#endif ++/* Return 1 if and only if an array of N objects, each of size S, ++ cannot exist reliably because its total size in bytes would exceed ++ MIN (PTRDIFF_MAX, SIZE_MAX - 1). ++ ++ N and S should be nonnegative and free of side effects. ++ ++ Warning: (xalloc_oversized (N, S) ? NULL : malloc (N * S)) can ++ misbehave if N and S are both narrower than ptrdiff_t and size_t, ++ and can be rewritten as (xalloc_oversized (N, S) ? NULL ++ : malloc (N * (size_t) S)). + +-/* Return 1 if an array of N objects, each of size S, cannot exist reliably +- because its total size in bytes exceeds MIN (PTRDIFF_MAX, SIZE_MAX). +- N must be nonnegative, S must be positive, and either N or S should be +- of type ptrdiff_t or size_t or wider. This is a macro, not a function, +- so that it works even if an argument exceeds MAX (PTRDIFF_MAX, SIZE_MAX). */ +-#if 7 <= __GNUC__ && !defined __clang__ ++ This is a macro, not a function, so that it works even if an ++ argument exceeds MAX (PTRDIFF_MAX, SIZE_MAX). */ ++#if 7 <= __GNUC__ && !defined __clang__ && PTRDIFF_MAX < SIZE_MAX + # define xalloc_oversized(n, s) \ +- __builtin_mul_overflow_p (n, s, (xalloc_count_t) 1) +-#elif 5 <= __GNUC__ && !defined __ICC && !__STRICT_ANSI__ ++ __builtin_mul_overflow_p (n, s, (ptrdiff_t) 1) ++#elif (5 <= __GNUC__ && !defined __ICC && !__STRICT_ANSI__ \ ++ && PTRDIFF_MAX < SIZE_MAX) + # define xalloc_oversized(n, s) \ + (__builtin_constant_p (n) && __builtin_constant_p (s) \ + ? __xalloc_oversized (n, s) \ +- : ({ xalloc_count_t __xalloc_count; \ ++ : ({ ptrdiff_t __xalloc_count; \ + __builtin_mul_overflow (n, s, &__xalloc_count); })) + + /* Other compilers use integer division; this may be slower but is +diff --git a/lib/xsize.c b/lib/xsize.c +index 4b4914c..b3d73a2 100644 +--- a/lib/xsize.c ++++ b/lib/xsize.c +@@ -1,3 +1,21 @@ ++/* Checked size_t computations. ++ ++ Copyright (C) 2012-2021 Free Software Foundation, Inc. ++ ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. ++ ++ This file 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 Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ ++ + #include ++ + #define XSIZE_INLINE _GL_EXTERN_INLINE + #include "xsize.h" +diff --git a/lib/xsize.h b/lib/xsize.h +index d4d7b1c..91fa877 100644 +--- a/lib/xsize.h ++++ b/lib/xsize.h +@@ -2,18 +2,18 @@ + + Copyright (C) 2003, 2008-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program; if not, see . */ ++ along with this program. If not, see . */ + + #ifndef _XSIZE_H + #define _XSIZE_H +diff --git a/m4/arpa_inet_h.m4 b/m4/arpa_inet_h.m4 +index c4e386d..a3ba256 100644 +--- a/m4/arpa_inet_h.m4 ++++ b/m4/arpa_inet_h.m4 +@@ -1,4 +1,4 @@ +-# arpa_inet_h.m4 serial 14 ++# arpa_inet_h.m4 serial 17 + dnl Copyright (C) 2006, 2008-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -6,10 +6,10 @@ dnl with or without modifications, as long as this notice is preserved. + + dnl Written by Simon Josefsson and Bruno Haible + +-AC_DEFUN([gl_HEADER_ARPA_INET], ++AC_DEFUN_ONCE([gl_ARPA_INET_H], + [ +- dnl Use AC_REQUIRE here, so that the default behavior below is expanded +- dnl once only, before all statements that occur in other macros. ++ dnl Ensure to expand the default settings once only, before all statements ++ dnl that occur in other macros. + AC_REQUIRE([gl_ARPA_INET_H_DEFAULTS]) + + AC_CHECK_HEADERS_ONCE([arpa/inet.h]) +@@ -40,17 +40,32 @@ AC_DEFUN([gl_HEADER_ARPA_INET], + ]], [inet_ntop inet_pton]) + ]) + ++# gl_ARPA_INET_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_ARPA_INET_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_ARPA_INET_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_ARPA_INET_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_ARPA_INET_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_ARPA_INET_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_INET_NTOP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_INET_PTON]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_ARPA_INET_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_ARPA_INET_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_ARPA_INET_H_DEFAULTS], + [ +- GNULIB_INET_NTOP=0; AC_SUBST([GNULIB_INET_NTOP]) +- GNULIB_INET_PTON=0; AC_SUBST([GNULIB_INET_PTON]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_DECL_INET_NTOP=1; AC_SUBST([HAVE_DECL_INET_NTOP]) + HAVE_DECL_INET_PTON=1; AC_SUBST([HAVE_DECL_INET_PTON]) +diff --git a/m4/dirent_h.m4 b/m4/dirent_h.m4 +index 6d86142..17e2a20 100644 +--- a/m4/dirent_h.m4 ++++ b/m4/dirent_h.m4 +@@ -1,4 +1,4 @@ +-# dirent_h.m4 serial 16 ++# dirent_h.m4 serial 19 + dnl Copyright (C) 2008-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -6,10 +6,10 @@ dnl with or without modifications, as long as this notice is preserved. + + dnl Written by Bruno Haible. + +-AC_DEFUN([gl_DIRENT_H], ++AC_DEFUN_ONCE([gl_DIRENT_H], + [ +- dnl Use AC_REQUIRE here, so that the default behavior below is expanded +- dnl once only, before all statements that occur in other macros. ++ dnl Ensure to expand the default settings once only, before all statements ++ dnl that occur in other macros. + AC_REQUIRE([gl_DIRENT_H_DEFAULTS]) + + dnl is always overridden, because of GNULIB_POSIXCHECK. +@@ -27,26 +27,41 @@ AC_DEFUN([gl_DIRENT_H], + ]], [alphasort closedir dirfd fdopendir opendir readdir rewinddir scandir]) + ]) + ++# gl_DIRENT_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_DIRENT_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_DIRENT_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_DIRENT_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_DIRENT_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_DIRENT_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_UNISTD_H_REQUIRE_DEFAULTS dnl for REPLACE_FCHDIR ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OPENDIR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_READDIR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REWINDDIR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CLOSEDIR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DIRFD]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FDOPENDIR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SCANDIR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ALPHASORT]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_DIRENT_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_DIRENT_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_DIRENT_H_DEFAULTS], + [ +- AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) dnl for REPLACE_FCHDIR +- GNULIB_OPENDIR=0; AC_SUBST([GNULIB_OPENDIR]) +- GNULIB_READDIR=0; AC_SUBST([GNULIB_READDIR]) +- GNULIB_REWINDDIR=0; AC_SUBST([GNULIB_REWINDDIR]) +- GNULIB_CLOSEDIR=0; AC_SUBST([GNULIB_CLOSEDIR]) +- GNULIB_DIRFD=0; AC_SUBST([GNULIB_DIRFD]) +- GNULIB_FDOPENDIR=0; AC_SUBST([GNULIB_FDOPENDIR]) +- GNULIB_SCANDIR=0; AC_SUBST([GNULIB_SCANDIR]) +- GNULIB_ALPHASORT=0; AC_SUBST([GNULIB_ALPHASORT]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_OPENDIR=1; AC_SUBST([HAVE_OPENDIR]) + HAVE_READDIR=1; AC_SUBST([HAVE_READDIR]) +diff --git a/m4/environ.m4 b/m4/environ.m4 +index d971770..ae53291 100644 +--- a/m4/environ.m4 ++++ b/m4/environ.m4 +@@ -1,4 +1,4 @@ +-# environ.m4 serial 7 ++# environ.m4 serial 8 + dnl Copyright (C) 2001-2004, 2006-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -33,7 +33,8 @@ AC_DEFUN([gt_CHECK_VAR_DECL], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[$1 +- extern struct { int foo; } $2;]], ++ typedef struct { int foo; } foo_t; ++ extern foo_t $2;]], + [[$2.foo = 1;]])], + [gt_cv_var=no], + [gt_cv_var=yes])]) +diff --git a/m4/fcntl_h.m4 b/m4/fcntl_h.m4 +index e63a82f..aba4473 100644 +--- a/m4/fcntl_h.m4 ++++ b/m4/fcntl_h.m4 +@@ -1,4 +1,4 @@ +-# serial 17 ++# serial 20 + # Configure fcntl.h. + dnl Copyright (C) 2006-2007, 2009-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation +@@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is preserved. + + dnl Written by Paul Eggert. + +-AC_DEFUN([gl_FCNTL_H], ++AC_DEFUN_ONCE([gl_FCNTL_H], + [ + AC_REQUIRE([gl_FCNTL_H_DEFAULTS]) + AC_REQUIRE([gl_FCNTL_O_FLAGS]) +@@ -26,25 +26,40 @@ AC_DEFUN([gl_FCNTL_H], + ]], [fcntl openat]) + ]) + ++# gl_FCNTL_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_FCNTL_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_FCNTL_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_FCNTL_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_FCNTL_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_FCNTL_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CREAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FCNTL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_NONBLOCKING]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OPEN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OPENAT]) ++ dnl Support Microsoft deprecated alias function names by default. ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_CREAT], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_OPEN], [1]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_FCNTL_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_FCNTL_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_FCNTL_H_DEFAULTS], + [ +- GNULIB_CREAT=0; AC_SUBST([GNULIB_CREAT]) +- GNULIB_FCNTL=0; AC_SUBST([GNULIB_FCNTL]) +- GNULIB_NONBLOCKING=0; AC_SUBST([GNULIB_NONBLOCKING]) +- GNULIB_OPEN=0; AC_SUBST([GNULIB_OPEN]) +- GNULIB_OPENAT=0; AC_SUBST([GNULIB_OPENAT]) +- dnl Support Microsoft deprecated alias function names by default. +- GNULIB_MDA_CREAT=1; AC_SUBST([GNULIB_MDA_CREAT]) +- GNULIB_MDA_OPEN=1; AC_SUBST([GNULIB_MDA_OPEN]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_FCNTL=1; AC_SUBST([HAVE_FCNTL]) + HAVE_OPENAT=1; AC_SUBST([HAVE_OPENAT]) +diff --git a/m4/flock.m4 b/m4/flock.m4 +index eb46642..e1e5fe0 100644 +--- a/m4/flock.m4 ++++ b/m4/flock.m4 +@@ -1,4 +1,4 @@ +-# flock.m4 serial 3 ++# flock.m4 serial 4 + dnl Copyright (C) 2008-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is preserved. + + AC_DEFUN([gl_FUNC_FLOCK], + [ +- AC_REQUIRE([gl_HEADER_SYS_FILE_H_DEFAULTS]) ++ AC_REQUIRE([gl_SYS_FILE_H_DEFAULTS]) + AC_CHECK_FUNCS_ONCE([flock]) + if test $ac_cv_func_flock = no; then + HAVE_FLOCK=0 +diff --git a/m4/fstat.m4 b/m4/fstat.m4 +index 3b5b238..cdaca80 100644 +--- a/m4/fstat.m4 ++++ b/m4/fstat.m4 +@@ -1,4 +1,4 @@ +-# fstat.m4 serial 7 ++# fstat.m4 serial 8 + dnl Copyright (C) 2011-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -34,7 +34,7 @@ AC_DEFUN([gl_FUNC_FSTAT], + + # Prerequisites of lib/fstat.c and lib/stat-w32.c. + AC_DEFUN([gl_PREREQ_FSTAT], [ +- AC_REQUIRE([gl_HEADER_SYS_STAT_H]) ++ AC_REQUIRE([gl_SYS_STAT_H]) + AC_REQUIRE([gl_PREREQ_STAT_W32]) + : + ]) +diff --git a/m4/getaddrinfo.m4 b/m4/getaddrinfo.m4 +index 97889a8..3f8e04f 100644 +--- a/m4/getaddrinfo.m4 ++++ b/m4/getaddrinfo.m4 +@@ -1,4 +1,4 @@ +-# getaddrinfo.m4 serial 33 ++# getaddrinfo.m4 serial 34 + dnl Copyright (C) 2004-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -6,8 +6,8 @@ dnl with or without modifications, as long as this notice is preserved. + + AC_DEFUN([gl_GETADDRINFO], + [ +- AC_REQUIRE([gl_HEADER_SYS_SOCKET])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H +- AC_REQUIRE([gl_HEADER_NETDB])dnl for HAVE_NETDB_H ++ AC_REQUIRE([gl_SYS_SOCKET_H])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H ++ AC_REQUIRE([gl_NETDB_H])dnl for HAVE_NETDB_H + GETADDRINFO_LIB= + gai_saved_LIBS="$LIBS" + +@@ -156,13 +156,13 @@ const char *gai_strerror(int);]])], + # Prerequisites of lib/netdb.in.h and lib/getaddrinfo.c. + AC_DEFUN([gl_PREREQ_GETADDRINFO], [ + AC_REQUIRE([gl_NETDB_H_DEFAULTS]) +- AC_REQUIRE([gl_HEADER_SYS_SOCKET])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H ++ AC_REQUIRE([gl_SYS_SOCKET_H])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H + AC_REQUIRE([gl_HOSTENT]) dnl for HOSTENT_LIB + AC_REQUIRE([gl_SERVENT]) dnl for SERVENT_LIB + AC_REQUIRE([gl_FUNC_INET_NTOP]) dnl for INET_NTOP_LIB + AC_REQUIRE([AC_C_RESTRICT]) + AC_REQUIRE([gl_SOCKET_FAMILIES]) +- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) ++ AC_REQUIRE([gl_SYS_SOCKET_H]) + AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) + + dnl Including sys/socket.h is wrong for Windows, but Windows does not +diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4 +index f2eff10..c801b3d 100644 +--- a/m4/gnulib-common.m4 ++++ b/m4/gnulib-common.m4 +@@ -1,4 +1,4 @@ +-# gnulib-common.m4 serial 63 ++# gnulib-common.m4 serial 67 + dnl Copyright (C) 2007-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -85,12 +85,12 @@ AC_DEFUN([gl_COMMON_BODY], [ + # define _GL_ATTR_fallthrough _GL_GNUC_PREREQ (7, 0) + # define _GL_ATTR_format _GL_GNUC_PREREQ (2, 7) + # define _GL_ATTR_leaf _GL_GNUC_PREREQ (4, 6) ++# define _GL_ATTR_malloc _GL_GNUC_PREREQ (3, 0) + # ifdef _ICC + # define _GL_ATTR_may_alias 0 + # else + # define _GL_ATTR_may_alias _GL_GNUC_PREREQ (3, 3) + # endif +-# define _GL_ATTR_malloc _GL_GNUC_PREREQ (3, 0) + # define _GL_ATTR_noinline _GL_GNUC_PREREQ (3, 1) + # define _GL_ATTR_nonnull _GL_GNUC_PREREQ (3, 3) + # define _GL_ATTR_nonstring _GL_GNUC_PREREQ (8, 0) +@@ -103,6 +103,12 @@ AC_DEFUN([gl_COMMON_BODY], [ + # define _GL_ATTR_warn_unused_result _GL_GNUC_PREREQ (3, 4) + #endif + ++#ifdef __has_c_attribute ++# define _GL_HAS_C_ATTRIBUTE(attr) __has_c_attribute (__##attr##__) ++#else ++# define _GL_HAS_C_ATTRIBUTE(attr) 0 ++#endif ++ + ]dnl There is no _GL_ATTRIBUTE_ALIGNED; use stdalign's _Alignas instead. + [ + #if _GL_HAS_ATTRIBUTE (alloc_size) +@@ -142,7 +148,20 @@ AC_DEFUN([gl_COMMON_BODY], [ + # define _GL_ATTRIBUTE_CONST + #endif + +-#if 201710L < __STDC_VERSION__ ++/* _GL_ATTRIBUTE_DEALLOC (F, I) is for functions returning pointers ++ that can be freed by passing them as the Ith argument to the ++ function F. _GL_ATTRIBUTE_DEALLOC_FREE is for functions that ++ return pointers that can be freed via 'free'; it can be used ++ only after including stdlib.h. These macros cannot be used on ++ inline functions. */ ++#if _GL_GNUC_PREREQ (11, 0) ++# define _GL_ATTRIBUTE_DEALLOC(f, i) __attribute__ ((__malloc__ (f, i))) ++#else ++# define _GL_ATTRIBUTE_DEALLOC(f, i) ++#endif ++#define _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_DEALLOC (free, 1) ++ ++#if _GL_HAS_C_ATTRIBUTE (deprecated) + # define _GL_ATTRIBUTE_DEPRECATED [[__deprecated__]] + #elif _GL_HAS_ATTRIBUTE (deprecated) + # define _GL_ATTRIBUTE_DEPRECATED __attribute__ ((__deprecated__)) +@@ -168,7 +187,7 @@ AC_DEFUN([gl_COMMON_BODY], [ + #endif + + /* FALLTHROUGH is special, because it always expands to something. */ +-#if 201710L < __STDC_VERSION__ ++#if _GL_HAS_C_ATTRIBUTE (fallthrough) + # define _GL_ATTRIBUTE_FALLTHROUGH [[__fallthrough__]] + #elif _GL_HAS_ATTRIBUTE (fallthrough) + # define _GL_ATTRIBUTE_FALLTHROUGH __attribute__ ((__fallthrough__)) +@@ -188,6 +207,12 @@ AC_DEFUN([gl_COMMON_BODY], [ + # define _GL_ATTRIBUTE_LEAF + #endif + ++#if _GL_HAS_ATTRIBUTE (malloc) ++# define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__)) ++#else ++# define _GL_ATTRIBUTE_MALLOC ++#endif ++ + /* Oracle Studio 12.6 mishandles may_alias despite __has_attribute OK. */ + #if _GL_HAS_ATTRIBUTE (may_alias) && !defined __SUNPRO_C + # define _GL_ATTRIBUTE_MAY_ALIAS __attribute__ ((__may_alias__)) +@@ -195,24 +220,15 @@ AC_DEFUN([gl_COMMON_BODY], [ + # define _GL_ATTRIBUTE_MAY_ALIAS + #endif + +-#if 201710L < __STDC_VERSION__ ++#if _GL_HAS_C_ATTRIBUTE (maybe_unused) + # define _GL_ATTRIBUTE_MAYBE_UNUSED [[__maybe_unused__]] +-#elif _GL_HAS_ATTRIBUTE (unused) +-# define _GL_ATTRIBUTE_MAYBE_UNUSED __attribute__ ((__unused__)) + #else +-# define _GL_ATTRIBUTE_MAYBE_UNUSED ++# define _GL_ATTRIBUTE_MAYBE_UNUSED _GL_ATTRIBUTE_UNUSED + #endif + /* Earlier spellings of this macro. */ +-#define _GL_UNUSED _GL_ATTRIBUTE_MAYBE_UNUSED + #define _UNUSED_PARAMETER_ _GL_ATTRIBUTE_MAYBE_UNUSED + +-#if _GL_HAS_ATTRIBUTE (malloc) +-# define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__)) +-#else +-# define _GL_ATTRIBUTE_MALLOC +-#endif +- +-#if 201710L < __STDC_VERSION__ ++#if _GL_HAS_C_ATTRIBUTE (nodiscard) + # define _GL_ATTRIBUTE_NODISCARD [[__nodiscard__]] + #elif _GL_HAS_ATTRIBUTE (warn_unused_result) + # define _GL_ATTRIBUTE_NODISCARD __attribute__ ((__warn_unused_result__)) +@@ -270,11 +286,19 @@ AC_DEFUN([gl_COMMON_BODY], [ + # define _GL_ATTRIBUTE_SENTINEL(pos) + #endif + ++#if _GL_HAS_ATTRIBUTE (unused) ++# define _GL_ATTRIBUTE_UNUSED __attribute__ ((__unused__)) ++#else ++# define _GL_ATTRIBUTE_UNUSED ++#endif ++/* Earlier spellings of this macro. */ ++#define _GL_UNUSED _GL_ATTRIBUTE_UNUSED ++ + ]dnl There is no _GL_ATTRIBUTE_VISIBILITY; see m4/visibility.m4 instead. + [ + /* To support C++ as well as C, use _GL_UNUSED_LABEL with trailing ';'. */ + #if !defined __cplusplus || _GL_GNUC_PREREQ (4, 5) +-# define _GL_UNUSED_LABEL _GL_ATTRIBUTE_MAYBE_UNUSED ++# define _GL_UNUSED_LABEL _GL_ATTRIBUTE_UNUSED + #else + # define _GL_UNUSED_LABEL + #endif +@@ -357,6 +381,16 @@ AC_DEFUN([gl_COMMON_BODY], [ + export LIBC_FATAL_STDERR_ + ]) + ++# gl_MODULE_INDICATOR_INIT_VARIABLE([variablename]) ++# gl_MODULE_INDICATOR_INIT_VARIABLE([variablename], [initialvalue]) ++# initializes the shell variable that indicates the presence of the given module ++# as a C preprocessor expression. ++AC_DEFUN([gl_MODULE_INDICATOR_INIT_VARIABLE], ++[ ++ GL_MODULE_INDICATOR_PREFIX[]_[$1]=m4_if([$2], , [0], [$2]) ++ AC_SUBST(GL_MODULE_INDICATOR_PREFIX[]_[$1]) ++]) ++ + # gl_MODULE_INDICATOR_CONDITION + # expands to a C preprocessor expression that evaluates to 1 or 0, depending + # whether a gnulib module that has been requested shall be considered present +@@ -369,9 +403,9 @@ m4_define([gl_MODULE_INDICATOR_CONDITION], [1]) + AC_DEFUN([gl_MODULE_INDICATOR_SET_VARIABLE], + [ + gl_MODULE_INDICATOR_SET_VARIABLE_AUX( +- [GNULIB_[]m4_translit([[$1]], +- [abcdefghijklmnopqrstuvwxyz./-], +- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])], ++ [GL_MODULE_INDICATOR_PREFIX[]_GNULIB_[]m4_translit([[$1]], ++ [abcdefghijklmnopqrstuvwxyz./-], ++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])], + [gl_MODULE_INDICATOR_CONDITION]) + ]) + +@@ -656,6 +690,72 @@ AC_DEFUN([gl_CACHE_VAL_SILENT], + ]) + ]) + ++# gl_CC_ALLOW_WARNINGS ++# sets and substitutes a variable GL_CFLAG_ALLOW_WARNINGS, to a $(CC) option ++# that reverts a preceding '-Werror' option, if available. ++# This is expected to be '-Wno-error' on gcc, clang (except clang/MSVC), xlclang ++# and empty otherwise. ++AC_DEFUN([gl_CC_ALLOW_WARNINGS], ++[ ++ AC_REQUIRE([AC_PROG_CC]) ++ AC_CACHE_CHECK([for C compiler option to allow warnings], ++ [gl_cv_cc_wallow], ++ [rm -f conftest* ++ echo 'int dummy;' > conftest.c ++ AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS -c conftest.c 2>conftest1.err]) >/dev/null ++ AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS -Wno-error -c conftest.c 2>conftest2.err]) >/dev/null ++ dnl Test the number of error output lines, because AIX xlc accepts the ++ dnl option '-Wno-error', just to produce a warning ++ dnl "Option -Wno-error was incorrectly specified. The option will be ignored." ++ dnl afterwards. ++ if test $? = 0 && test `wc -l < conftest1.err` = `wc -l < conftest2.err`; then ++ gl_cv_cc_wallow='-Wno-error' ++ else ++ gl_cv_cc_wallow=none ++ fi ++ rm -f conftest* ++ ]) ++ case "$gl_cv_cc_wallow" in ++ none) GL_CFLAG_ALLOW_WARNINGS='' ;; ++ *) GL_CFLAG_ALLOW_WARNINGS="$gl_cv_cc_wallow" ;; ++ esac ++ AC_SUBST([GL_CFLAG_ALLOW_WARNINGS]) ++]) ++ ++# gl_CXX_ALLOW_WARNINGS ++# sets and substitutes a variable GL_CXXFLAG_ALLOW_WARNINGS, to a $(CC) option ++# that reverts a preceding '-Werror' option, if available. ++AC_DEFUN([gl_CXX_ALLOW_WARNINGS], ++[ ++ dnl Requires AC_PROG_CXX or gl_PROG_ANSI_CXX. ++ if test -n "$CXX" && test "$CXX" != no; then ++ AC_CACHE_CHECK([for C++ compiler option to allow warnings], ++ [gl_cv_cxx_wallow], ++ [rm -f conftest* ++ echo 'int dummy;' > conftest.cc ++ AC_TRY_COMMAND([${CXX-c++} $CXXFLAGS $CPPFLAGS -c conftest.cc 2>conftest1.err]) >/dev/null ++ AC_TRY_COMMAND([${CXX-c++} $CXXFLAGS $CPPFLAGS -Wno-error -c conftest.cc 2>conftest2.err]) >/dev/null ++ dnl Test the number of error output lines, because AIX xlC accepts the ++ dnl option '-Wno-error', just to produce a warning ++ dnl "Option -Wno-error was incorrectly specified. The option will be ignored." ++ dnl afterwards. ++ if test $? = 0 && test `wc -l < conftest1.err` = `wc -l < conftest2.err`; then ++ gl_cv_cxx_wallow='-Wno-error' ++ else ++ gl_cv_cxx_wallow=none ++ fi ++ rm -f conftest* ++ ]) ++ case "$gl_cv_cxx_wallow" in ++ none) GL_CXXFLAG_ALLOW_WARNINGS='' ;; ++ *) GL_CXXFLAG_ALLOW_WARNINGS="$gl_cv_cxx_wallow" ;; ++ esac ++ else ++ GL_CXXFLAG_ALLOW_WARNINGS='' ++ fi ++ AC_SUBST([GL_CXXFLAG_ALLOW_WARNINGS]) ++]) ++ + dnl Expands to some code for use in .c programs that, on native Windows, defines + dnl the Microsoft deprecated alias function names to the underscore-prefixed + dnl actual function names. With this macro, these function names are available +diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 +index 1290d75..0ae96ea 100644 +--- a/m4/gnulib-comp.m4 ++++ b/m4/gnulib-comp.m4 +@@ -142,6 +142,7 @@ AC_DEFUN([gl_EARLY], + # Code from module langinfo: + # Code from module largefile: + AC_REQUIRE([AC_SYS_LARGEFILE]) ++ AC_REQUIRE([gl_YEAR2038_EARLY]) + # Code from module ldexp: + # Code from module lib-symbol-versions: + # Code from module lib-symbol-visibility: +@@ -281,9 +282,11 @@ AC_DEFUN([gl_INIT], + m4_pushdef([AC_LIBSOURCES], m4_defn([gl_LIBSOURCES])) + m4_pushdef([gl_LIBSOURCES_LIST], []) + m4_pushdef([gl_LIBSOURCES_DIR], []) ++ m4_pushdef([GL_MACRO_PREFIX], [gl]) ++ m4_pushdef([GL_MODULE_INDICATOR_PREFIX], [GL]) + gl_COMMON + gl_source_base='lib' +- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) ++ AC_REQUIRE([gl_SYS_SOCKET_H]) + if test "$ac_cv_header_winsock2_h" = yes; then + AC_LIBOBJ([accept]) + fi +@@ -291,9 +294,10 @@ AC_DEFUN([gl_INIT], + gl_FUNC_ACCEPT4 + gl_SYS_SOCKET_MODULE_INDICATOR([accept4]) + gl_FUNC_ALLOCA +- gl_HEADER_ARPA_INET ++ gl_ARPA_INET_H ++ gl_ARPA_INET_H_REQUIRE_DEFAULTS + AC_PROG_MKDIR_P +- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) ++ AC_REQUIRE([gl_SYS_SOCKET_H]) + if test "$ac_cv_header_winsock2_h" = yes; then + AC_LIBOBJ([bind]) + fi +@@ -317,7 +321,7 @@ AC_DEFUN([gl_INIT], + AC_LIBOBJ([close]) + fi + gl_UNISTD_MODULE_INDICATOR([close]) +- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) ++ AC_REQUIRE([gl_SYS_SOCKET_H]) + if test "$ac_cv_header_winsock2_h" = yes; then + AC_LIBOBJ([connect]) + fi +@@ -328,6 +332,7 @@ AC_DEFUN([gl_INIT], + fi + gl_MATH_MODULE_INDICATOR([copysign]) + gl_DIRENT_H ++ gl_DIRENT_H_REQUIRE_DEFAULTS + gl_FUNC_DIRFD + if test $ac_cv_func_dirfd = no && test $gl_cv_func_dirfd_macro = no \ + || test $REPLACE_DIRFD = 1; then +@@ -347,6 +352,7 @@ AC_DEFUN([gl_INIT], + gl_HEADER_ERRNO_H + AC_REQUIRE([gl_EXTERN_INLINE]) + gl_FCNTL_H ++ gl_FCNTL_H_REQUIRE_DEFAULTS + AC_C_FLEXIBLE_ARRAY_MEMBER + gl_FLOAT_H + if test $REPLACE_FLOAT_LDBL = 1; then +@@ -360,7 +366,7 @@ AC_DEFUN([gl_INIT], + AC_LIBOBJ([flock]) + gl_PREREQ_FLOCK + fi +- gl_HEADER_SYS_FILE_MODULE_INDICATOR([flock]) ++ gl_SYS_FILE_MODULE_INDICATOR([flock]) + AC_REQUIRE([gl_FUNC_FLOOR]) + if test $REPLACE_FLOOR = 1; then + AC_LIBOBJ([floor]) +@@ -409,17 +415,17 @@ AC_DEFUN([gl_INIT], + fi + gl_UNISTD_MODULE_INDICATOR([getlogin]) + AC_REQUIRE([gl_LIB_GETLOGIN]) +- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) ++ AC_REQUIRE([gl_SYS_SOCKET_H]) + if test "$ac_cv_header_winsock2_h" = yes; then + AC_LIBOBJ([getpeername]) + fi + gl_SYS_SOCKET_MODULE_INDICATOR([getpeername]) +- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) ++ AC_REQUIRE([gl_SYS_SOCKET_H]) + if test "$ac_cv_header_winsock2_h" = yes; then + AC_LIBOBJ([getsockname]) + fi + gl_SYS_SOCKET_MODULE_INDICATOR([getsockname]) +- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) ++ AC_REQUIRE([gl_SYS_SOCKET_H]) + if test "$ac_cv_header_winsock2_h" = yes; then + AC_LIBOBJ([getsockopt]) + fi +@@ -439,6 +445,7 @@ AC_DEFUN([gl_INIT], + m4_ifdef([gl_ICONV_MODULE_INDICATOR], + [gl_ICONV_MODULE_INDICATOR([iconv])]) + gl_ICONV_H ++ gl_ICONV_H_REQUIRE_DEFAULTS + gl_FUNC_ICONV_OPEN + if test $REPLACE_ICONV_OPEN = 1; then + AC_LIBOBJ([iconv_open]) +@@ -461,6 +468,7 @@ AC_DEFUN([gl_INIT], + fi + gl_ARPA_INET_MODULE_INDICATOR([inet_pton]) + gl_INTTYPES_INCOMPLETE ++ gl_INTTYPES_H_REQUIRE_DEFAULTS + gl_ISFINITE + if test $REPLACE_ISFINITE = 1; then + AC_LIBOBJ([isfinite]) +@@ -501,6 +509,7 @@ AC_DEFUN([gl_INIT], + fi + gl_MATH_MODULE_INDICATOR([isnanl]) + gl_LANGINFO_H ++ gl_LANGINFO_H_REQUIRE_DEFAULTS + AC_REQUIRE([gl_LARGEFILE]) + gl_FUNC_LDEXP + gl_LD_VERSION_SCRIPT +@@ -512,7 +521,7 @@ AC_DEFUN([gl_INIT], + AC_LIBOBJ([link]) + fi + gl_UNISTD_MODULE_INDICATOR([link]) +- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) ++ AC_REQUIRE([gl_SYS_SOCKET_H]) + if test "$ac_cv_header_winsock2_h" = yes; then + AC_LIBOBJ([listen]) + fi +@@ -522,6 +531,7 @@ AC_DEFUN([gl_INIT], + LOCALCHARSET_TESTS_ENVIRONMENT= + AC_SUBST([LOCALCHARSET_TESTS_ENVIRONMENT]) + gl_LOCALE_H ++ gl_LOCALE_H_REQUIRE_DEFAULTS + gl_FUNC_LOG1P + if test $HAVE_LOG1P = 0 || test $REPLACE_LOG1P = 1; then + AC_LIBOBJ([log1p]) +@@ -541,15 +551,14 @@ AC_DEFUN([gl_INIT], + if test $REPLACE_MALLOC = 1; then + AC_LIBOBJ([malloc]) + fi +- gl_MODULE_INDICATOR([malloc-gnu]) +- gl_FUNC_MALLOC_POSIX ++ AC_REQUIRE([gl_FUNC_MALLOC_POSIX]) + if test $REPLACE_MALLOC = 1; then + AC_LIBOBJ([malloc]) + fi + gl_STDLIB_MODULE_INDICATOR([malloc-posix]) +- gl_MODULE_INDICATOR([malloc-posix]) + gl_MALLOCA + gl_MATH_H ++ gl_MATH_H_REQUIRE_DEFAULTS + gl_MINMAX + gl_FUNC_MKDIR + if test $REPLACE_MKDIR = 1; then +@@ -573,7 +582,8 @@ AC_DEFUN([gl_INIT], + fi + gl_MODULE_INDICATOR([msvc-nothrow]) + gl_MULTIARCH +- gl_HEADER_NETDB ++ gl_NETDB_H ++ gl_NETDB_H_REQUIRE_DEFAULTS + gl_HEADER_NETINET_IN + AC_PROG_MKDIR_P + gl_FUNC_NL_LANGINFO +@@ -607,6 +617,7 @@ AC_DEFUN([gl_INIT], + fi + gl_POLL_MODULE_INDICATOR([poll]) + gl_POLL_H ++ gl_POLL_H_REQUIRE_DEFAULTS + gl_FUNC_PUTENV + if test $REPLACE_PUTENV = 1; then + AC_LIBOBJ([putenv]) +@@ -625,12 +636,12 @@ AC_DEFUN([gl_INIT], + gl_PREREQ_READLINK + fi + gl_UNISTD_MODULE_INDICATOR([readlink]) +- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) ++ AC_REQUIRE([gl_SYS_SOCKET_H]) + if test "$ac_cv_header_winsock2_h" = yes; then + AC_LIBOBJ([recv]) + fi + gl_SYS_SOCKET_MODULE_INDICATOR([recv]) +- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) ++ AC_REQUIRE([gl_SYS_SOCKET_H]) + if test "$ac_cv_header_winsock2_h" = yes; then + AC_LIBOBJ([recvfrom]) + fi +@@ -657,12 +668,12 @@ AC_DEFUN([gl_INIT], + AC_LIBOBJ([select]) + fi + gl_SYS_SELECT_MODULE_INDICATOR([select]) +- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) ++ AC_REQUIRE([gl_SYS_SOCKET_H]) + if test "$ac_cv_header_winsock2_h" = yes; then + AC_LIBOBJ([send]) + fi + gl_SYS_SOCKET_MODULE_INDICATOR([send]) +- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) ++ AC_REQUIRE([gl_SYS_SOCKET_H]) + if test "$ac_cv_header_winsock2_h" = yes; then + AC_LIBOBJ([sendto]) + fi +@@ -672,25 +683,26 @@ AC_DEFUN([gl_INIT], + AC_LIBOBJ([setenv]) + fi + gl_STDLIB_MODULE_INDICATOR([setenv]) +- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) ++ AC_REQUIRE([gl_SYS_SOCKET_H]) + if test "$ac_cv_header_winsock2_h" = yes; then + AC_LIBOBJ([setsockopt]) + fi + gl_SYS_SOCKET_MODULE_INDICATOR([setsockopt]) +- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) ++ AC_REQUIRE([gl_SYS_SOCKET_H]) + if test "$ac_cv_header_winsock2_h" = yes; then + AC_LIBOBJ([shutdown]) + fi + gl_SYS_SOCKET_MODULE_INDICATOR([shutdown]) + gl_SIGNAL_H +- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) ++ gl_SIGNAL_H_REQUIRE_DEFAULTS ++ AC_REQUIRE([gl_SYS_SOCKET_H]) + if test "$ac_cv_header_winsock2_h" = yes; then + AC_LIBOBJ([socket]) + fi + # When this module is used, sockets may actually occur as file descriptors, + # hence it is worth warning if the modules 'close' and 'ioctl' are not used. +- m4_ifdef([gl_UNISTD_H_DEFAULTS], [AC_REQUIRE([gl_UNISTD_H_DEFAULTS])]) +- m4_ifdef([gl_SYS_IOCTL_H_DEFAULTS], [AC_REQUIRE([gl_SYS_IOCTL_H_DEFAULTS])]) ++ m4_ifdef([gl_UNISTD_H_DEFAULTS], [gl_UNISTD_H_REQUIRE_DEFAULTS]) ++ m4_ifdef([gl_SYS_IOCTL_H_DEFAULTS], [gl_SYS_IOCTL_H_REQUIRE_DEFAULTS]) + AC_REQUIRE([gl_PREREQ_SYS_H_WINSOCK2]) + if test "$ac_cv_header_winsock2_h" = yes; then + UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS=1 +@@ -705,31 +717,67 @@ AC_DEFUN([gl_INIT], + gl_STDALIGN_H + AM_STDBOOL_H + gl_STDDEF_H ++ gl_STDDEF_H_REQUIRE_DEFAULTS + gl_STDINT_H + gl_STDIO_H ++ gl_STDIO_H_REQUIRE_DEFAULTS ++ dnl No need to create extra modules for these functions. Everyone who uses ++ dnl likely needs them. ++ gl_STDIO_MODULE_INDICATOR([fscanf]) ++ gl_MODULE_INDICATOR([fscanf]) ++ gl_STDIO_MODULE_INDICATOR([scanf]) ++ gl_MODULE_INDICATOR([scanf]) ++ gl_STDIO_MODULE_INDICATOR([fgetc]) ++ gl_STDIO_MODULE_INDICATOR([getc]) ++ gl_STDIO_MODULE_INDICATOR([getchar]) ++ gl_STDIO_MODULE_INDICATOR([fgets]) ++ gl_STDIO_MODULE_INDICATOR([fread]) ++ dnl No need to create extra modules for these functions. Everyone who uses ++ dnl likely needs them. ++ gl_STDIO_MODULE_INDICATOR([fprintf]) ++ gl_STDIO_MODULE_INDICATOR([printf]) ++ gl_STDIO_MODULE_INDICATOR([vfprintf]) ++ gl_STDIO_MODULE_INDICATOR([vprintf]) ++ gl_STDIO_MODULE_INDICATOR([fputc]) ++ gl_STDIO_MODULE_INDICATOR([putc]) ++ gl_STDIO_MODULE_INDICATOR([putchar]) ++ gl_STDIO_MODULE_INDICATOR([fputs]) ++ gl_STDIO_MODULE_INDICATOR([puts]) ++ gl_STDIO_MODULE_INDICATOR([fwrite]) + gl_STDLIB_H ++ gl_STDLIB_H_REQUIRE_DEFAULTS + if test $gl_cond_libtool = false; then + gl_ltlibdeps="$gl_ltlibdeps $LTLIBICONV" + gl_libdeps="$gl_libdeps $LIBICONV" + fi +- gl_HEADER_STRING_H +- gl_HEADER_SYS_FILE_H ++ gl_STRING_H ++ gl_STRING_H_REQUIRE_DEFAULTS ++ gl_SYS_FILE_H ++ gl_SYS_FILE_H_REQUIRE_DEFAULTS + AC_PROG_MKDIR_P +- AC_REQUIRE([gl_HEADER_SYS_SELECT]) ++ gl_SYS_SELECT_H ++ gl_SYS_SELECT_H_REQUIRE_DEFAULTS + AC_PROG_MKDIR_P +- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) ++ gl_SYS_SOCKET_H ++ gl_SYS_SOCKET_H_REQUIRE_DEFAULTS + AC_PROG_MKDIR_P +- gl_HEADER_SYS_STAT_H ++ gl_SYS_STAT_H ++ gl_SYS_STAT_H_REQUIRE_DEFAULTS + AC_PROG_MKDIR_P +- gl_HEADER_SYS_TIME_H ++ gl_SYS_TIME_H ++ gl_SYS_TIME_H_REQUIRE_DEFAULTS + AC_PROG_MKDIR_P + gl_SYS_TIMES_H ++ gl_SYS_TIMES_H_REQUIRE_DEFAULTS + AC_PROG_MKDIR_P + gl_SYS_TYPES_H ++ gl_SYS_TYPES_H_REQUIRE_DEFAULTS + AC_PROG_MKDIR_P +- gl_HEADER_SYS_UIO ++ gl_SYS_UIO_H ++ gl_SYS_UIO_H_REQUIRE_DEFAULTS + AC_PROG_MKDIR_P +- gl_HEADER_TIME_H ++ gl_TIME_H ++ gl_TIME_H_REQUIRE_DEFAULTS + gl_TIME_RZ + if test $HAVE_TIMEZONE_T = 0; then + AC_LIBOBJ([time_rz]) +@@ -746,9 +794,11 @@ AC_DEFUN([gl_INIT], + fi + gl_MATH_MODULE_INDICATOR([trunc]) + gl_UNISTD_H ++ gl_UNISTD_H_REQUIRE_DEFAULTS + gl_FUNC_VSNPRINTF + gl_STDIO_MODULE_INDICATOR([vsnprintf]) + gl_WCHAR_H ++ gl_WCHAR_H_REQUIRE_DEFAULTS + gl_FUNC_WRITE + if test $REPLACE_WRITE = 1; then + AC_LIBOBJ([write]) +@@ -771,7 +821,6 @@ AC_DEFUN([gl_INIT], + gl_gnulib_enabled_be453cec5eecf5731a274f2de7f2db36=false + gl_gnulib_enabled_30838f5439487421042f2225bed3af76=false + gl_gnulib_enabled_hostent=false +- gl_gnulib_enabled_idx=false + gl_gnulib_enabled_b1df7117b479d2da59d76deba468ee21=false + gl_gnulib_enabled_3f0e593033d1fc2c127581960f641b66=false + gl_gnulib_enabled_dbdf22868a5367f28bf18e0013ac6f8f=false +@@ -880,7 +929,9 @@ AC_SUBST([LTALLOCA]) + func_gl_gnulib_m4code_dynarray () + { + if ! $gl_gnulib_enabled_dynarray; then ++ AC_PROG_MKDIR_P + gl_gnulib_enabled_dynarray=true ++ func_gl_gnulib_m4code_37f71b604aa9c54446783d80f42fe547 + func_gl_gnulib_m4code_21ee726a3540c09237a8e70c0baf7467 + fi + } +@@ -963,12 +1014,6 @@ AC_SUBST([LTALLOCA]) + gl_gnulib_enabled_hostent=true + fi + } +- func_gl_gnulib_m4code_idx () +- { +- if ! $gl_gnulib_enabled_idx; then +- gl_gnulib_enabled_idx=true +- fi +- } + func_gl_gnulib_m4code_b1df7117b479d2da59d76deba468ee21 () + { + if ! $gl_gnulib_enabled_b1df7117b479d2da59d76deba468ee21; then +@@ -1181,7 +1226,6 @@ AC_SUBST([LTALLOCA]) + AC_LIBOBJ([realloc]) + fi + gl_STDLIB_MODULE_INDICATOR([realloc-posix]) +- gl_MODULE_INDICATOR([realloc-posix]) + gl_gnulib_enabled_61bcaca76b3e6f9ae55d57a1c3193bc4=true + fi + } +@@ -1205,7 +1249,9 @@ AC_SUBST([LTALLOCA]) + func_gl_gnulib_m4code_scratch_buffer () + { + if ! $gl_gnulib_enabled_scratch_buffer; then ++ AC_PROG_MKDIR_P + gl_gnulib_enabled_scratch_buffer=true ++ func_gl_gnulib_m4code_37f71b604aa9c54446783d80f42fe547 + func_gl_gnulib_m4code_21ee726a3540c09237a8e70c0baf7467 + func_gl_gnulib_m4code_61bcaca76b3e6f9ae55d57a1c3193bc4 + fi +@@ -1319,7 +1365,8 @@ AC_SUBST([LTALLOCA]) + func_gl_gnulib_m4code_sys_random () + { + if ! $gl_gnulib_enabled_sys_random; then +- gl_HEADER_SYS_RANDOM ++ gl_SYS_RANDOM_H ++ gl_SYS_RANDOM_H_REQUIRE_DEFAULTS + AC_PROG_MKDIR_P + gl_gnulib_enabled_sys_random=true + fi +@@ -1416,6 +1463,7 @@ AC_SUBST([LTALLOCA]) + { + if ! $gl_gnulib_enabled_3dcce957eadc896e63ab5f137947b410; then + gl_WCTYPE_H ++ gl_WCTYPE_H_REQUIRE_DEFAULTS + gl_gnulib_enabled_3dcce957eadc896e63ab5f137947b410=true + fi + } +@@ -1431,9 +1479,6 @@ AC_SUBST([LTALLOCA]) + func_gl_gnulib_m4code_925677f0343de64b89a9f0c790b4104c + fi + if test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1; then +- func_gl_gnulib_m4code_idx +- fi +- if test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1; then + func_gl_gnulib_m4code_21ee726a3540c09237a8e70c0baf7467 + fi + if test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1; then +@@ -1584,9 +1629,6 @@ AC_SUBST([LTALLOCA]) + func_gl_gnulib_m4code_sockets + fi + if test $HAVE_TIMEZONE_T = 0; then +- func_gl_gnulib_m4code_idx +- fi +- if test $HAVE_TIMEZONE_T = 0; then + func_gl_gnulib_m4code_time_r + fi + if test $HAVE_TIMEZONE_T = 0; then +@@ -1621,7 +1663,6 @@ AC_SUBST([LTALLOCA]) + AM_CONDITIONAL([gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36], [$gl_gnulib_enabled_be453cec5eecf5731a274f2de7f2db36]) + AM_CONDITIONAL([gl_GNULIB_ENABLED_30838f5439487421042f2225bed3af76], [$gl_gnulib_enabled_30838f5439487421042f2225bed3af76]) + AM_CONDITIONAL([gl_GNULIB_ENABLED_hostent], [$gl_gnulib_enabled_hostent]) +- AM_CONDITIONAL([gl_GNULIB_ENABLED_idx], [$gl_gnulib_enabled_idx]) + AM_CONDITIONAL([gl_GNULIB_ENABLED_b1df7117b479d2da59d76deba468ee21], [$gl_gnulib_enabled_b1df7117b479d2da59d76deba468ee21]) + AM_CONDITIONAL([gl_GNULIB_ENABLED_3f0e593033d1fc2c127581960f641b66], [$gl_gnulib_enabled_3f0e593033d1fc2c127581960f641b66]) + AM_CONDITIONAL([gl_GNULIB_ENABLED_dbdf22868a5367f28bf18e0013ac6f8f], [$gl_gnulib_enabled_dbdf22868a5367f28bf18e0013ac6f8f]) +@@ -1673,6 +1714,8 @@ AC_SUBST([LTALLOCA]) + m4_if(m4_sysval, [0], [], + [AC_FATAL([expected source file, required through AC_LIBSOURCES, not found])]) + ]) ++ m4_popdef([GL_MODULE_INDICATOR_PREFIX]) ++ m4_popdef([GL_MACRO_PREFIX]) + m4_popdef([gl_LIBSOURCES_DIR]) + m4_popdef([gl_LIBSOURCES_LIST]) + m4_popdef([AC_LIBSOURCES]) +@@ -1699,6 +1742,8 @@ AC_SUBST([LTALLOCA]) + m4_pushdef([AC_LIBSOURCES], m4_defn([gltests_LIBSOURCES])) + m4_pushdef([gltests_LIBSOURCES_LIST], []) + m4_pushdef([gltests_LIBSOURCES_DIR], []) ++ m4_pushdef([GL_MACRO_PREFIX], [gltests]) ++ m4_pushdef([GL_MODULE_INDICATOR_PREFIX], [GL]) + gl_COMMON + gl_source_base='tests' + changequote(,)dnl +@@ -1720,6 +1765,8 @@ changequote([, ])dnl + m4_if(m4_sysval, [0], [], + [AC_FATAL([expected source file, required through AC_LIBSOURCES, not found])]) + ]) ++ m4_popdef([GL_MODULE_INDICATOR_PREFIX]) ++ m4_popdef([GL_MACRO_PREFIX]) + m4_popdef([gltests_LIBSOURCES_DIR]) + m4_popdef([gltests_LIBSOURCES_LIST]) + m4_popdef([AC_LIBSOURCES]) +@@ -2265,6 +2312,7 @@ AC_DEFUN([gl_FILE_LIST], [ + m4/wint_t.m4 + m4/write.m4 + m4/xsize.m4 ++ m4/year2038.m4 + m4/zzgnulib.m4 + top/GNUmakefile + top/maint.mk +diff --git a/m4/hostent.m4 b/m4/hostent.m4 +index 641d72f..f1390a3 100644 +--- a/m4/hostent.m4 ++++ b/m4/hostent.m4 +@@ -1,4 +1,4 @@ +-# hostent.m4 serial 3 ++# hostent.m4 serial 4 + dnl Copyright (C) 2008, 2010-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -13,7 +13,7 @@ AC_DEFUN([gl_HOSTENT], + dnl - On BeOS, they are in libnet. + dnl - On native Windows, they are in ws2_32.dll. + dnl - Otherwise they are in libc. +- AC_REQUIRE([gl_HEADER_SYS_SOCKET])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H ++ AC_REQUIRE([gl_SYS_SOCKET_H])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H + HOSTENT_LIB= + gl_saved_libs="$LIBS" + AC_SEARCH_LIBS([gethostbyname], [nsl network net], +diff --git a/m4/iconv_h.m4 b/m4/iconv_h.m4 +index ab8e283..2940988 100644 +--- a/m4/iconv_h.m4 ++++ b/m4/iconv_h.m4 +@@ -1,10 +1,10 @@ +-# iconv_h.m4 serial 12 ++# iconv_h.m4 serial 15 + dnl Copyright (C) 2007-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. + +-AC_DEFUN([gl_ICONV_H], ++AC_DEFUN_ONCE([gl_ICONV_H], + [ + AC_REQUIRE([gl_ICONV_H_DEFAULTS]) + +@@ -24,22 +24,37 @@ AC_DEFUN([gl_ICONV_H], + dnl Unconditionally enables the replacement of . + AC_DEFUN([gl_REPLACE_ICONV_H], + [ +- AC_REQUIRE([gl_ICONV_H_DEFAULTS]) ++ gl_ICONV_H_REQUIRE_DEFAULTS + ICONV_H='iconv.h' + AM_CONDITIONAL([GL_GENERATE_ICONV_H], [test -n "$ICONV_H"]) + ]) + ++# gl_ICONV_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_ICONV_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_ICONV_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_ICONV_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_ICONV_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_ICONV_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ICONV]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_ICONV_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_ICONV_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_ICONV_H_DEFAULTS], + [ + m4_ifdef([gl_ANSI_CXX], [AC_REQUIRE([gl_ANSI_CXX])]) +- GNULIB_ICONV=0; AC_SUBST([GNULIB_ICONV]) + dnl Assume proper GNU behavior unless another module says otherwise. + ICONV_CONST=; AC_SUBST([ICONV_CONST]) + REPLACE_ICONV=0; AC_SUBST([REPLACE_ICONV]) +diff --git a/m4/inttypes.m4 b/m4/inttypes.m4 +index f56e94a..64b1de5 100644 +--- a/m4/inttypes.m4 ++++ b/m4/inttypes.m4 +@@ -1,4 +1,4 @@ +-# inttypes.m4 serial 32 ++# inttypes.m4 serial 35 + dnl Copyright (C) 2006-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is preserved. + dnl From Derek Price, Bruno Haible. + dnl Test whether is supported or must be substituted. + +-AC_DEFUN([gl_INTTYPES_H], ++AC_DEFUN_ONCE([gl_INTTYPES_H], + [ + AC_REQUIRE([gl_INTTYPES_INCOMPLETE]) + gl_INTTYPES_PRI_SCN +@@ -136,19 +136,34 @@ AC_DEFUN([gl_INTTYPES_CHECK_LONG_LONG_INT_CONDITION], + AC_SUBST([$1]) + ]) + ++# gl_INTTYPES_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_INTTYPES_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_INTTYPES_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_INTTYPES_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_INTTYPES_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_INTTYPES_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_IMAXABS]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_IMAXDIV]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOIMAX]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOUMAX]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_INTTYPES_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_INTTYPES_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_INTTYPES_H_DEFAULTS], + [ +- GNULIB_IMAXABS=0; AC_SUBST([GNULIB_IMAXABS]) +- GNULIB_IMAXDIV=0; AC_SUBST([GNULIB_IMAXDIV]) +- GNULIB_STRTOIMAX=0; AC_SUBST([GNULIB_STRTOIMAX]) +- GNULIB_STRTOUMAX=0; AC_SUBST([GNULIB_STRTOUMAX]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_DECL_IMAXABS=1; AC_SUBST([HAVE_DECL_IMAXABS]) + HAVE_DECL_IMAXDIV=1; AC_SUBST([HAVE_DECL_IMAXDIV]) +diff --git a/m4/langinfo_h.m4 b/m4/langinfo_h.m4 +index 950fe20..87959f7 100644 +--- a/m4/langinfo_h.m4 ++++ b/m4/langinfo_h.m4 +@@ -1,10 +1,10 @@ +-# langinfo_h.m4 serial 9 ++# langinfo_h.m4 serial 12 + dnl Copyright (C) 2009-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. + +-AC_DEFUN([gl_LANGINFO_H], ++AC_DEFUN_ONCE([gl_LANGINFO_H], + [ + AC_REQUIRE([gl_LANGINFO_H_DEFAULTS]) + +@@ -104,18 +104,33 @@ int a = YESEXPR; + ]], [nl_langinfo]) + ]) + ++# gl_LANGINFO_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_LANGINFO_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_LANGINFO_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_LANGINFO_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_LANGINFO_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_LANGINFO_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_NL_LANGINFO]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_LANGINFO_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_LANGINFO_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_LANGINFO_H_DEFAULTS], + [ +- GNULIB_NL_LANGINFO=0; AC_SUBST([GNULIB_NL_LANGINFO]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_NL_LANGINFO=1; AC_SUBST([HAVE_NL_LANGINFO]) + REPLACE_NL_LANGINFO=0; AC_SUBST([REPLACE_NL_LANGINFO]) +diff --git a/m4/largefile.m4 b/m4/largefile.m4 +index cadb16d..fbde5e6 100644 +--- a/m4/largefile.m4 ++++ b/m4/largefile.m4 +@@ -22,7 +22,8 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE], + esac + ]) + +-# The following implementation works around a problem in autoconf <= 2.69; ++# Work around a problem in Autoconf through at least 2.71 on glibc 2.34+ ++# with _TIME_BITS. Also, work around a problem in autoconf <= 2.69: + # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5, + # or configures them incorrectly in some cases. + m4_version_prereq([2.70], [], [ +@@ -40,6 +41,7 @@ m4_define([_AC_SYS_LARGEFILE_TEST_INCLUDES], + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]];[]dnl + ]) ++])# m4_version_prereq 2.70 + + + # _AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE, +@@ -54,7 +56,8 @@ m4_define([_AC_SYS_LARGEFILE_MACRO_VALUE], + [AC_LANG_PROGRAM([$5], [$6])], + [$3=no; break]) + m4_ifval([$6], [AC_LINK_IFELSE], [AC_COMPILE_IFELSE])( +- [AC_LANG_PROGRAM([#define $1 $2 ++ [AC_LANG_PROGRAM([#undef $1 ++#define $1 $2 + $5], [$6])], + [$3=$2; break]) + $3=unknown +@@ -80,9 +83,8 @@ rm -rf conftest*[]dnl + AC_DEFUN([AC_SYS_LARGEFILE], + [AC_ARG_ENABLE(largefile, + [ --disable-largefile omit support for large files]) +-if test "$enable_largefile" != no; then +- +- AC_CACHE_CHECK([for special C compiler options needed for large files], ++AS_IF([test "$enable_largefile" != no], ++ [AC_CACHE_CHECK([for special C compiler options needed for large files], + ac_cv_sys_largefile_CC, + [ac_cv_sys_largefile_CC=no + if test "$GCC" != yes; then +@@ -107,15 +109,15 @@ if test "$enable_largefile" != no; then + ac_cv_sys_file_offset_bits, + [Number of bits in a file offset, on hosts where this is settable.], + [_AC_SYS_LARGEFILE_TEST_INCLUDES]) +- if test $ac_cv_sys_file_offset_bits = unknown; then +- _AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES, 1, +- ac_cv_sys_large_files, +- [Define for large files, on AIX-style hosts.], +- [_AC_SYS_LARGEFILE_TEST_INCLUDES]) +- fi +-fi ++ AS_CASE([$ac_cv_sys_file_offset_bits], ++ [unknown], ++ [_AC_SYS_LARGEFILE_MACRO_VALUE([_LARGE_FILES], [1], ++ [ac_cv_sys_large_files], ++ [Define for large files, on AIX-style hosts.], ++ [_AC_SYS_LARGEFILE_TEST_INCLUDES])], ++ [64], ++ [gl_YEAR2038_BODY([])])]) + ])# AC_SYS_LARGEFILE +-])# m4_version_prereq 2.70 + + # Enable large files on systems where this is implemented by Gnulib, not by the + # system headers. +diff --git a/m4/limits-h.m4 b/m4/limits-h.m4 +index 70dbb7d..00c9fe9 100644 +--- a/m4/limits-h.m4 ++++ b/m4/limits-h.m4 +@@ -11,7 +11,7 @@ AC_DEFUN_ONCE([gl_LIMITS_H], + [ + gl_CHECK_NEXT_HEADERS([limits.h]) + +- AC_CACHE_CHECK([whether limits.h has LLONG_MAX, WORD_BIT, ULLONG_WIDTH etc.], ++ AC_CACHE_CHECK([whether limits.h has WORD_BIT, BOOL_WIDTH etc.], + [gl_cv_header_limits_width], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( +@@ -22,6 +22,7 @@ AC_DEFUN_ONCE([gl_LIMITS_H], + long long llm = LLONG_MAX; + int wb = WORD_BIT; + int ullw = ULLONG_WIDTH; ++ int bw = BOOL_WIDTH; + ]])], + [gl_cv_header_limits_width=yes], + [gl_cv_header_limits_width=no])]) +diff --git a/m4/locale_h.m4 b/m4/locale_h.m4 +index 7b50aa7..444a381 100644 +--- a/m4/locale_h.m4 ++++ b/m4/locale_h.m4 +@@ -1,13 +1,13 @@ +-# locale_h.m4 serial 25 ++# locale_h.m4 serial 28 + dnl Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. + +-AC_DEFUN([gl_LOCALE_H], ++AC_DEFUN_ONCE([gl_LOCALE_H], + [ +- dnl Use AC_REQUIRE here, so that the default behavior below is expanded +- dnl once only, before all statements that occur in other macros. ++ dnl Ensure to expand the default settings once only, before all statements ++ dnl that occur in other macros. + AC_REQUIRE([gl_LOCALE_H_DEFAULTS]) + + dnl Persuade glibc to define locale_t and the int_p_*, int_n_* +@@ -129,22 +129,37 @@ AC_DEFUN([gl_LOCALE_T], + AC_SUBST([HAVE_XLOCALE_H]) + ]) + ++# gl_LOCALE_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_LOCALE_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_LOCALE_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_LOCALE_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_LOCALE_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_LOCALE_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOCALECONV]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETLOCALE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETLOCALE_NULL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DUPLOCALE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOCALENAME]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_LOCALE_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_LOCALE_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_LOCALE_H_DEFAULTS], + [ +- GNULIB_LOCALECONV=0; AC_SUBST([GNULIB_LOCALECONV]) +- GNULIB_SETLOCALE=0; AC_SUBST([GNULIB_SETLOCALE]) +- GNULIB_SETLOCALE_NULL=0; AC_SUBST([GNULIB_SETLOCALE_NULL]) +- GNULIB_DUPLOCALE=0; AC_SUBST([GNULIB_DUPLOCALE]) +- GNULIB_LOCALENAME=0; AC_SUBST([GNULIB_LOCALENAME]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_NEWLOCALE=1; AC_SUBST([HAVE_NEWLOCALE]) + HAVE_DUPLOCALE=1; AC_SUBST([HAVE_DUPLOCALE]) +diff --git a/m4/malloc.m4 b/m4/malloc.m4 +index 32ab42e..972e808 100644 +--- a/m4/malloc.m4 ++++ b/m4/malloc.m4 +@@ -1,21 +1,21 @@ +-# malloc.m4 serial 22 ++# malloc.m4 serial 27 + dnl Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. + + # This is adapted with modifications from upstream Autoconf here: +-# https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=04be2b7a29d65d9a08e64e8e56e594c91749598c ++# https://git.savannah.gnu.org/cgit/autoconf.git/tree/lib/autoconf/functions.m4?id=v2.70#n949 + AC_DEFUN([_AC_FUNC_MALLOC_IF], + [ + AC_REQUIRE([AC_CANONICAL_HOST])dnl for cross-compiles +- AC_CACHE_CHECK([for GNU libc compatible malloc], ++ AC_CACHE_CHECK([whether malloc (0) returns nonnull], + [ac_cv_func_malloc_0_nonnull], + [AC_RUN_IFELSE( + [AC_LANG_PROGRAM( + [[#include + ]], +- [[char *p = malloc (0); ++ [[void *p = malloc (0); + int result = !p; + free (p); + return result;]]) +@@ -24,75 +24,151 @@ AC_DEFUN([_AC_FUNC_MALLOC_IF], + [ac_cv_func_malloc_0_nonnull=no], + [case "$host_os" in + # Guess yes on platforms where we know the result. +- *-gnu* | gnu* | *-musl* | freebsd* | midnightbsd* | netbsd* | openbsd* \ +- | hpux* | solaris* | cygwin* | mingw*) ++ *-gnu* | freebsd* | netbsd* | openbsd* | bitrig* \ ++ | gnu* | *-musl* | midnightbsd* \ ++ | hpux* | solaris* | cygwin* | mingw* | msys* ) + ac_cv_func_malloc_0_nonnull="guessing yes" ;; + # If we don't know, obey --enable-cross-guesses. + *) ac_cv_func_malloc_0_nonnull="$gl_cross_guess_normal" ;; + esac + ]) + ]) +- case "$ac_cv_func_malloc_0_nonnull" in +- *yes) +- $1 +- ;; +- *) +- $2 +- ;; +- esac ++ AS_CASE([$ac_cv_func_malloc_0_nonnull], [*yes], [$1], [$2]) + ])# _AC_FUNC_MALLOC_IF + + # gl_FUNC_MALLOC_GNU + # ------------------ +-# Test whether 'malloc (0)' is handled like in GNU libc, and replace malloc if +-# it is not. ++# Replace malloc if it is not compatible with GNU libc. + AC_DEFUN([gl_FUNC_MALLOC_GNU], + [ + AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) +- dnl _AC_FUNC_MALLOC_IF is defined in Autoconf. +- _AC_FUNC_MALLOC_IF( +- [AC_DEFINE([HAVE_MALLOC_GNU], [1], +- [Define to 1 if your system has a GNU libc compatible 'malloc' +- function, and to 0 otherwise.])], +- [AC_DEFINE([HAVE_MALLOC_GNU], [0]) +- REPLACE_MALLOC=1 ++ AC_REQUIRE([gl_FUNC_MALLOC_POSIX]) ++ if test $REPLACE_MALLOC = 0; then ++ _AC_FUNC_MALLOC_IF([], [REPLACE_MALLOC=1]) ++ fi ++]) ++ ++# gl_FUNC_MALLOC_PTRDIFF ++# ---------------------- ++# Test whether malloc (N) reliably fails when N exceeds PTRDIFF_MAX, ++# and replace malloc otherwise. ++AC_DEFUN([gl_FUNC_MALLOC_PTRDIFF], ++[ ++ AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) ++ AC_REQUIRE([gl_CHECK_MALLOC_PTRDIFF]) ++ test "$gl_cv_malloc_ptrdiff" = yes || REPLACE_MALLOC=1 ++]) ++ ++# Test whether malloc, realloc, calloc refuse to create objects ++# larger than what can be expressed in ptrdiff_t. ++# Set gl_cv_func_malloc_gnu to yes or no accordingly. ++AC_DEFUN([gl_CHECK_MALLOC_PTRDIFF], ++[ ++ AC_CACHE_CHECK([whether malloc is ptrdiff_t safe], ++ [gl_cv_malloc_ptrdiff], ++ [AC_COMPILE_IFELSE( ++ [AC_LANG_PROGRAM( ++ [[#include ++ ]], ++ [[/* 64-bit ptrdiff_t is so wide that no practical platform ++ can exceed it. */ ++ #define WIDE_PTRDIFF (PTRDIFF_MAX >> 31 >> 31 != 0) ++ ++ /* On rare machines where size_t fits in ptrdiff_t there ++ is no problem. */ ++ #define NARROW_SIZE (SIZE_MAX <= PTRDIFF_MAX) ++ ++ /* glibc 2.30 and later malloc refuses to exceed ptrdiff_t ++ bounds even on 32-bit platforms. We don't know which ++ non-glibc systems are safe. */ ++ #define KNOWN_SAFE (2 < __GLIBC__ + (30 <= __GLIBC_MINOR__)) ++ ++ #if WIDE_PTRDIFF || NARROW_SIZE || KNOWN_SAFE ++ return 0; ++ #else ++ #error "malloc might not be ptrdiff_t safe" ++ syntax error ++ #endif ++ ]])], ++ [gl_cv_malloc_ptrdiff=yes], ++ [gl_cv_malloc_ptrdiff=no]) + ]) + ]) + + # gl_FUNC_MALLOC_POSIX + # -------------------- + # Test whether 'malloc' is POSIX compliant (sets errno to ENOMEM when it +-# fails), and replace malloc if it is not. ++# fails, and doesn't mess up with ptrdiff_t overflow), and replace ++# malloc if it is not. + AC_DEFUN([gl_FUNC_MALLOC_POSIX], + [ + AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) ++ AC_REQUIRE([gl_FUNC_MALLOC_PTRDIFF]) + AC_REQUIRE([gl_CHECK_MALLOC_POSIX]) +- if test $gl_cv_func_malloc_posix = yes; then ++ if test "$gl_cv_func_malloc_posix" = yes; then + AC_DEFINE([HAVE_MALLOC_POSIX], [1], +- [Define if the 'malloc' function is POSIX compliant.]) ++ [Define if malloc, realloc, and calloc set errno on allocation failure.]) + else + REPLACE_MALLOC=1 + fi + ]) + +-# Test whether malloc, realloc, calloc are POSIX compliant, ++# Test whether malloc, realloc, calloc set errno to ENOMEM on failure. + # Set gl_cv_func_malloc_posix to yes or no accordingly. + AC_DEFUN([gl_CHECK_MALLOC_POSIX], + [ +- AC_CACHE_CHECK([whether malloc, realloc, calloc are POSIX compliant], ++ AC_REQUIRE([AC_CANONICAL_HOST]) ++ AC_CACHE_CHECK([whether malloc, realloc, calloc set errno on failure], + [gl_cv_func_malloc_posix], + [ + dnl It is too dangerous to try to allocate a large amount of memory: + dnl some systems go to their knees when you do that. So assume that +- dnl all Unix implementations of the function are POSIX compliant. +- AC_COMPILE_IFELSE( +- [AC_LANG_PROGRAM( +- [[]], +- [[#if defined _WIN32 && ! defined __CYGWIN__ +- choke me +- #endif +- ]])], +- [gl_cv_func_malloc_posix=yes], +- [gl_cv_func_malloc_posix=no]) ++ dnl all Unix implementations of the function set errno on failure, ++ dnl except on those platforms where we have seen 'test-malloc-gnu', ++ dnl 'test-realloc-gnu', 'test-calloc-gnu' fail. ++ case "$host_os" in ++ mingw*) ++ gl_cv_func_malloc_posix=no ;; ++ irix* | solaris*) ++ dnl On IRIX 6.5, the three functions return NULL with errno unset ++ dnl when the argument is larger than PTRDIFF_MAX. ++ dnl On Solaris 11.3, the three functions return NULL with errno set ++ dnl to EAGAIN, not ENOMEM, when the argument is larger than ++ dnl PTRDIFF_MAX. ++ dnl Here is a test program: ++m4_divert_push([KILL]) ++#include ++#include ++#include ++#define ptrdiff_t long ++#ifndef PTRDIFF_MAX ++# define PTRDIFF_MAX ((ptrdiff_t) ((1UL << (8 * sizeof (ptrdiff_t) - 1)) - 1)) ++#endif ++ ++int main () ++{ ++ void *p; ++ ++ fprintf (stderr, "PTRDIFF_MAX = %lu\n", (unsigned long) PTRDIFF_MAX); ++ ++ errno = 0; ++ p = malloc ((unsigned long) PTRDIFF_MAX + 1); ++ fprintf (stderr, "p=%p errno=%d\n", p, errno); ++ ++ errno = 0; ++ p = calloc (PTRDIFF_MAX / 2 + 1, 2); ++ fprintf (stderr, "p=%p errno=%d\n", p, errno); ++ ++ errno = 0; ++ p = realloc (NULL, (unsigned long) PTRDIFF_MAX + 1); ++ fprintf (stderr, "p=%p errno=%d\n", p, errno); ++ ++ return 0; ++} ++m4_divert_pop([KILL]) ++ gl_cv_func_malloc_posix=no ;; ++ *) ++ gl_cv_func_malloc_posix=yes ;; ++ esac + ]) + ]) +diff --git a/m4/math_h.m4 b/m4/math_h.m4 +index a9ba5e6..b3a10c3 100644 +--- a/m4/math_h.m4 ++++ b/m4/math_h.m4 +@@ -1,10 +1,10 @@ +-# math_h.m4 serial 122 ++# math_h.m4 serial 125 + dnl Copyright (C) 2007-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. + +-AC_DEFUN([gl_MATH_H], ++AC_DEFUN_ONCE([gl_MATH_H], + [ + AC_REQUIRE([gl_MATH_H_DEFAULTS]) + gl_CHECK_NEXT_HEADERS([math.h]) +@@ -53,119 +53,134 @@ AC_DEFUN([gl_MATH_H], + tanf tanl tanhf trunc truncf truncl]) + ]) + ++# gl_MATH_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_MATH_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_MATH_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_MATH_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_MATH_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_MATH_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ACOSF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ACOSL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ASINF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ASINL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ATANF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ATANL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ATAN2F]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CBRT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CBRTF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CBRTL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CEIL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CEILF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CEILL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_COPYSIGN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_COPYSIGNF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_COPYSIGNL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_COSF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_COSL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_COSHF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXPF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXPL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXP2]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXP2F]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXP2L]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXPM1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXPM1F]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXPM1L]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FABSF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FABSL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FLOOR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FLOORF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FLOORL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FMA]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FMAF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FMAL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FMOD]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FMODF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FMODL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREXPF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREXP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREXPL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_HYPOT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_HYPOTF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_HYPOTL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ILOGB]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ILOGBF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ILOGBL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISFINITE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISINF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISNAN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISNANF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISNAND]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISNANL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LDEXPF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LDEXPL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOGF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOGL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG10]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG10F]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG10L]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG1P]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG1PF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG1PL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG2]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG2F]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG2L]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOGB]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOGBF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOGBL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MODF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MODFF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MODFL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POWF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REMAINDER]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REMAINDERF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REMAINDERL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RINT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RINTF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RINTL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ROUND]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ROUNDF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ROUNDL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGNBIT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SINF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SINL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SINHF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SQRTF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SQRTL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TANF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TANL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TANHF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TRUNC]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TRUNCF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TRUNCL]) ++ dnl Support Microsoft deprecated alias function names by default. ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_J0], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_J1], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_JN], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_Y0], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_Y1], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_YN], [1]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_MATH_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_MATH_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_MATH_H_DEFAULTS], + [ +- GNULIB_ACOSF=0; AC_SUBST([GNULIB_ACOSF]) +- GNULIB_ACOSL=0; AC_SUBST([GNULIB_ACOSL]) +- GNULIB_ASINF=0; AC_SUBST([GNULIB_ASINF]) +- GNULIB_ASINL=0; AC_SUBST([GNULIB_ASINL]) +- GNULIB_ATANF=0; AC_SUBST([GNULIB_ATANF]) +- GNULIB_ATANL=0; AC_SUBST([GNULIB_ATANL]) +- GNULIB_ATAN2F=0; AC_SUBST([GNULIB_ATAN2F]) +- GNULIB_CBRT=0; AC_SUBST([GNULIB_CBRT]) +- GNULIB_CBRTF=0; AC_SUBST([GNULIB_CBRTF]) +- GNULIB_CBRTL=0; AC_SUBST([GNULIB_CBRTL]) +- GNULIB_CEIL=0; AC_SUBST([GNULIB_CEIL]) +- GNULIB_CEILF=0; AC_SUBST([GNULIB_CEILF]) +- GNULIB_CEILL=0; AC_SUBST([GNULIB_CEILL]) +- GNULIB_COPYSIGN=0; AC_SUBST([GNULIB_COPYSIGN]) +- GNULIB_COPYSIGNF=0; AC_SUBST([GNULIB_COPYSIGNF]) +- GNULIB_COPYSIGNL=0; AC_SUBST([GNULIB_COPYSIGNL]) +- GNULIB_COSF=0; AC_SUBST([GNULIB_COSF]) +- GNULIB_COSL=0; AC_SUBST([GNULIB_COSL]) +- GNULIB_COSHF=0; AC_SUBST([GNULIB_COSHF]) +- GNULIB_EXPF=0; AC_SUBST([GNULIB_EXPF]) +- GNULIB_EXPL=0; AC_SUBST([GNULIB_EXPL]) +- GNULIB_EXP2=0; AC_SUBST([GNULIB_EXP2]) +- GNULIB_EXP2F=0; AC_SUBST([GNULIB_EXP2F]) +- GNULIB_EXP2L=0; AC_SUBST([GNULIB_EXP2L]) +- GNULIB_EXPM1=0; AC_SUBST([GNULIB_EXPM1]) +- GNULIB_EXPM1F=0; AC_SUBST([GNULIB_EXPM1F]) +- GNULIB_EXPM1L=0; AC_SUBST([GNULIB_EXPM1L]) +- GNULIB_FABSF=0; AC_SUBST([GNULIB_FABSF]) +- GNULIB_FABSL=0; AC_SUBST([GNULIB_FABSL]) +- GNULIB_FLOOR=0; AC_SUBST([GNULIB_FLOOR]) +- GNULIB_FLOORF=0; AC_SUBST([GNULIB_FLOORF]) +- GNULIB_FLOORL=0; AC_SUBST([GNULIB_FLOORL]) +- GNULIB_FMA=0; AC_SUBST([GNULIB_FMA]) +- GNULIB_FMAF=0; AC_SUBST([GNULIB_FMAF]) +- GNULIB_FMAL=0; AC_SUBST([GNULIB_FMAL]) +- GNULIB_FMOD=0; AC_SUBST([GNULIB_FMOD]) +- GNULIB_FMODF=0; AC_SUBST([GNULIB_FMODF]) +- GNULIB_FMODL=0; AC_SUBST([GNULIB_FMODL]) +- GNULIB_FREXPF=0; AC_SUBST([GNULIB_FREXPF]) +- GNULIB_FREXP=0; AC_SUBST([GNULIB_FREXP]) +- GNULIB_FREXPL=0; AC_SUBST([GNULIB_FREXPL]) +- GNULIB_HYPOT=0; AC_SUBST([GNULIB_HYPOT]) +- GNULIB_HYPOTF=0; AC_SUBST([GNULIB_HYPOTF]) +- GNULIB_HYPOTL=0; AC_SUBST([GNULIB_HYPOTL]) +- GNULIB_ILOGB=0; AC_SUBST([GNULIB_ILOGB]) +- GNULIB_ILOGBF=0; AC_SUBST([GNULIB_ILOGBF]) +- GNULIB_ILOGBL=0; AC_SUBST([GNULIB_ILOGBL]) +- GNULIB_ISFINITE=0; AC_SUBST([GNULIB_ISFINITE]) +- GNULIB_ISINF=0; AC_SUBST([GNULIB_ISINF]) +- GNULIB_ISNAN=0; AC_SUBST([GNULIB_ISNAN]) +- GNULIB_ISNANF=0; AC_SUBST([GNULIB_ISNANF]) +- GNULIB_ISNAND=0; AC_SUBST([GNULIB_ISNAND]) +- GNULIB_ISNANL=0; AC_SUBST([GNULIB_ISNANL]) +- GNULIB_LDEXPF=0; AC_SUBST([GNULIB_LDEXPF]) +- GNULIB_LDEXPL=0; AC_SUBST([GNULIB_LDEXPL]) +- GNULIB_LOG=0; AC_SUBST([GNULIB_LOG]) +- GNULIB_LOGF=0; AC_SUBST([GNULIB_LOGF]) +- GNULIB_LOGL=0; AC_SUBST([GNULIB_LOGL]) +- GNULIB_LOG10=0; AC_SUBST([GNULIB_LOG10]) +- GNULIB_LOG10F=0; AC_SUBST([GNULIB_LOG10F]) +- GNULIB_LOG10L=0; AC_SUBST([GNULIB_LOG10L]) +- GNULIB_LOG1P=0; AC_SUBST([GNULIB_LOG1P]) +- GNULIB_LOG1PF=0; AC_SUBST([GNULIB_LOG1PF]) +- GNULIB_LOG1PL=0; AC_SUBST([GNULIB_LOG1PL]) +- GNULIB_LOG2=0; AC_SUBST([GNULIB_LOG2]) +- GNULIB_LOG2F=0; AC_SUBST([GNULIB_LOG2F]) +- GNULIB_LOG2L=0; AC_SUBST([GNULIB_LOG2L]) +- GNULIB_LOGB=0; AC_SUBST([GNULIB_LOGB]) +- GNULIB_LOGBF=0; AC_SUBST([GNULIB_LOGBF]) +- GNULIB_LOGBL=0; AC_SUBST([GNULIB_LOGBL]) +- GNULIB_MODF=0; AC_SUBST([GNULIB_MODF]) +- GNULIB_MODFF=0; AC_SUBST([GNULIB_MODFF]) +- GNULIB_MODFL=0; AC_SUBST([GNULIB_MODFL]) +- GNULIB_POWF=0; AC_SUBST([GNULIB_POWF]) +- GNULIB_REMAINDER=0; AC_SUBST([GNULIB_REMAINDER]) +- GNULIB_REMAINDERF=0; AC_SUBST([GNULIB_REMAINDERF]) +- GNULIB_REMAINDERL=0; AC_SUBST([GNULIB_REMAINDERL]) +- GNULIB_RINT=0; AC_SUBST([GNULIB_RINT]) +- GNULIB_RINTF=0; AC_SUBST([GNULIB_RINTF]) +- GNULIB_RINTL=0; AC_SUBST([GNULIB_RINTL]) +- GNULIB_ROUND=0; AC_SUBST([GNULIB_ROUND]) +- GNULIB_ROUNDF=0; AC_SUBST([GNULIB_ROUNDF]) +- GNULIB_ROUNDL=0; AC_SUBST([GNULIB_ROUNDL]) +- GNULIB_SIGNBIT=0; AC_SUBST([GNULIB_SIGNBIT]) +- GNULIB_SINF=0; AC_SUBST([GNULIB_SINF]) +- GNULIB_SINL=0; AC_SUBST([GNULIB_SINL]) +- GNULIB_SINHF=0; AC_SUBST([GNULIB_SINHF]) +- GNULIB_SQRTF=0; AC_SUBST([GNULIB_SQRTF]) +- GNULIB_SQRTL=0; AC_SUBST([GNULIB_SQRTL]) +- GNULIB_TANF=0; AC_SUBST([GNULIB_TANF]) +- GNULIB_TANL=0; AC_SUBST([GNULIB_TANL]) +- GNULIB_TANHF=0; AC_SUBST([GNULIB_TANHF]) +- GNULIB_TRUNC=0; AC_SUBST([GNULIB_TRUNC]) +- GNULIB_TRUNCF=0; AC_SUBST([GNULIB_TRUNCF]) +- GNULIB_TRUNCL=0; AC_SUBST([GNULIB_TRUNCL]) +- dnl Support Microsoft deprecated alias function names by default. +- GNULIB_MDA_J0=1; AC_SUBST([GNULIB_MDA_J0]) +- GNULIB_MDA_J1=1; AC_SUBST([GNULIB_MDA_J1]) +- GNULIB_MDA_JN=1; AC_SUBST([GNULIB_MDA_JN]) +- GNULIB_MDA_Y0=1; AC_SUBST([GNULIB_MDA_Y0]) +- GNULIB_MDA_Y1=1; AC_SUBST([GNULIB_MDA_Y1]) +- GNULIB_MDA_YN=1; AC_SUBST([GNULIB_MDA_YN]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_ACOSF=1; AC_SUBST([HAVE_ACOSF]) + HAVE_ACOSL=1; AC_SUBST([HAVE_ACOSL]) +diff --git a/m4/memchr.m4 b/m4/memchr.m4 +index 64470de..ca08192 100644 +--- a/m4/memchr.m4 ++++ b/m4/memchr.m4 +@@ -1,4 +1,4 @@ +-# memchr.m4 serial 17 ++# memchr.m4 serial 18 + dnl Copyright (C) 2002-2004, 2009-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -13,7 +13,7 @@ AC_DEFUN_ONCE([gl_FUNC_MEMCHR], + AC_CHECK_HEADERS_ONCE([sys/mman.h]) + AC_CHECK_FUNCS_ONCE([mprotect]) + +- AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) ++ AC_REQUIRE([gl_STRING_H_DEFAULTS]) + # Detect platform-specific bugs in some versions of glibc: + # memchr should not dereference anything with length 0 + # https://bugzilla.redhat.com/show_bug.cgi?id=499689 +diff --git a/m4/mempcpy.m4 b/m4/mempcpy.m4 +index c5ee2af..f9d9ec8 100644 +--- a/m4/mempcpy.m4 ++++ b/m4/mempcpy.m4 +@@ -1,4 +1,4 @@ +-# mempcpy.m4 serial 11 ++# mempcpy.m4 serial 12 + dnl Copyright (C) 2003-2004, 2006-2007, 2009-2021 Free Software Foundation, + dnl Inc. + dnl This file is free software; the Free Software Foundation +@@ -13,7 +13,7 @@ AC_DEFUN([gl_FUNC_MEMPCPY], + dnl The mempcpy() declaration in lib/string.in.h uses 'restrict'. + AC_REQUIRE([AC_C_RESTRICT]) + +- AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) ++ AC_REQUIRE([gl_STRING_H_DEFAULTS]) + AC_CHECK_FUNCS([mempcpy]) + if test $ac_cv_func_mempcpy = no; then + HAVE_MEMPCPY=0 +diff --git a/m4/mktime.m4 b/m4/mktime.m4 +index 245649e..721189a 100644 +--- a/m4/mktime.m4 ++++ b/m4/mktime.m4 +@@ -1,4 +1,4 @@ +-# serial 35 ++# serial 36 + dnl Copyright (C) 2002-2003, 2005-2007, 2009-2021 Free Software Foundation, + dnl Inc. + dnl This file is free software; the Free Software Foundation +@@ -255,7 +255,7 @@ main () + dnl Main macro of module 'mktime'. + AC_DEFUN([gl_FUNC_MKTIME], + [ +- AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) ++ AC_REQUIRE([gl_TIME_H_DEFAULTS]) + AC_REQUIRE([AC_CANONICAL_HOST]) + AC_REQUIRE([gl_FUNC_MKTIME_WORKS]) + +diff --git a/m4/netdb_h.m4 b/m4/netdb_h.m4 +index db84c78..eb7c3b8 100644 +--- a/m4/netdb_h.m4 ++++ b/m4/netdb_h.m4 +@@ -1,10 +1,10 @@ +-# netdb_h.m4 serial 12 ++# netdb_h.m4 serial 15 + dnl Copyright (C) 2008-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. + +-AC_DEFUN([gl_HEADER_NETDB], ++AC_DEFUN_ONCE([gl_NETDB_H], + [ + AC_REQUIRE([gl_NETDB_H_DEFAULTS]) + gl_CHECK_NEXT_HEADERS([netdb.h]) +@@ -21,18 +21,33 @@ AC_DEFUN([gl_HEADER_NETDB], + [getaddrinfo freeaddrinfo gai_strerror getnameinfo]) + ]) + ++# gl_NETDB_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_NETDB_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_NETDB_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_NETDB_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_NETDB_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_NETDB_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETADDRINFO]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_NETDB_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_NETDB_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_NETDB_H_DEFAULTS], + [ +- GNULIB_GETADDRINFO=0; AC_SUBST([GNULIB_GETADDRINFO]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_STRUCT_ADDRINFO=1; AC_SUBST([HAVE_STRUCT_ADDRINFO]) + HAVE_DECL_FREEADDRINFO=1; AC_SUBST([HAVE_DECL_FREEADDRINFO]) +diff --git a/m4/poll_h.m4 b/m4/poll_h.m4 +index 20692d8..1f0d796 100644 +--- a/m4/poll_h.m4 ++++ b/m4/poll_h.m4 +@@ -1,4 +1,4 @@ +-# poll_h.m4 serial 3 ++# poll_h.m4 serial 6 + dnl Copyright (C) 2010-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -6,10 +6,10 @@ dnl with or without modifications, as long as this notice is preserved. + + dnl Written by Bruno Haible. + +-AC_DEFUN([gl_POLL_H], ++AC_DEFUN_ONCE([gl_POLL_H], + [ +- dnl Use AC_REQUIRE here, so that the default behavior below is expanded +- dnl once only, before all statements that occur in other macros. ++ dnl Ensure to expand the default settings once only, before all statements ++ dnl that occur in other macros. + AC_REQUIRE([gl_POLL_H_DEFAULTS]) + + AC_CHECK_HEADERS_ONCE([poll.h]) +@@ -31,18 +31,33 @@ AC_DEFUN([gl_POLL_H], + [poll]) + ]) + ++# gl_POLL_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_POLL_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_POLL_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_POLL_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_POLL_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_POLL_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POLL]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_POLL_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_POLL_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_POLL_H_DEFAULTS], + [ +- GNULIB_POLL=0; AC_SUBST([GNULIB_POLL]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_POLL=1; AC_SUBST([HAVE_POLL]) + REPLACE_POLL=0; AC_SUBST([REPLACE_POLL]) +diff --git a/m4/printf.m4 b/m4/printf.m4 +index d8b3521..284c7c5 100644 +--- a/m4/printf.m4 ++++ b/m4/printf.m4 +@@ -1,4 +1,4 @@ +-# printf.m4 serial 72 ++# printf.m4 serial 73 + dnl Copyright (C) 2003, 2007-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -537,7 +537,7 @@ int main () + && strcmp (buf, "-0X6.488P-1 33") != 0 + && strcmp (buf, "-0XC.91P-2 33") != 0)) + result |= 2; +- /* This catches a FreeBSD 6.1 bug: it doesn't round. */ ++ /* This catches a FreeBSD 13.0 bug: it doesn't round. */ + if (sprintf (buf, "%.2a %d", 1.51, 33, 44, 55) < 0 + || (strcmp (buf, "0x1.83p+0 33") != 0 + && strcmp (buf, "0x3.05p-1 33") != 0 +@@ -1690,6 +1690,7 @@ dnl + dnl 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 + dnl glibc 2.5 . . . . . . . . . . . . . . . . . . . . + dnl glibc 2.3.6 . . . . # . . . . . . . . . . . . . . . ++dnl FreeBSD 13.0 . . . . # . . . . . . . . # . . . . . . + dnl FreeBSD 5.4, 6.1 . . . . # . . . . . . # . # . . . . . . + dnl Mac OS X 10.13.5 . . . # # . # . . . . . . . . . . # . . + dnl Mac OS X 10.5.8 . . . # # . . . . . . # . . . . . . . . +diff --git a/m4/rawmemchr.m4 b/m4/rawmemchr.m4 +index f928465..452fab1 100644 +--- a/m4/rawmemchr.m4 ++++ b/m4/rawmemchr.m4 +@@ -1,4 +1,4 @@ +-# rawmemchr.m4 serial 2 ++# rawmemchr.m4 serial 3 + dnl Copyright (C) 2003, 2007-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -9,7 +9,7 @@ AC_DEFUN([gl_FUNC_RAWMEMCHR], + dnl Persuade glibc to declare rawmemchr(). + AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) + +- AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) ++ AC_REQUIRE([gl_STRING_H_DEFAULTS]) + AC_CHECK_FUNCS([rawmemchr]) + if test $ac_cv_func_rawmemchr = no; then + HAVE_RAWMEMCHR=0 +diff --git a/m4/realloc.m4 b/m4/realloc.m4 +index a80a02a..0abc418 100644 +--- a/m4/realloc.m4 ++++ b/m4/realloc.m4 +@@ -1,21 +1,21 @@ +-# realloc.m4 serial 20 ++# realloc.m4 serial 24 + dnl Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. + + # This is adapted with modifications from upstream Autoconf here: +-# https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=04be2b7a29d65d9a08e64e8e56e594c91749598c ++# https://git.savannah.gnu.org/cgit/autoconf.git/tree/lib/autoconf/functions.m4?id=v2.70#n1455 + AC_DEFUN([_AC_FUNC_REALLOC_IF], + [ + AC_REQUIRE([AC_CANONICAL_HOST])dnl for cross-compiles +- AC_CACHE_CHECK([for GNU libc compatible realloc], ++ AC_CACHE_CHECK([whether realloc (0, 0) returns nonnull], + [ac_cv_func_realloc_0_nonnull], + [AC_RUN_IFELSE( + [AC_LANG_PROGRAM( + [[#include + ]], +- [[char *p = realloc (0, 0); ++ [[void *p = realloc (0, 0); + int result = !p; + free (p); + return result;]]) +@@ -24,53 +24,40 @@ AC_DEFUN([_AC_FUNC_REALLOC_IF], + [ac_cv_func_realloc_0_nonnull=no], + [case "$host_os" in + # Guess yes on platforms where we know the result. +- *-gnu* | gnu* | *-musl* | freebsd* | midnightbsd* | netbsd* | openbsd* \ +- | hpux* | solaris* | cygwin* | mingw*) ++ *-gnu* | freebsd* | netbsd* | openbsd* | bitrig* \ ++ | gnu* | *-musl* | midnightbsd* \ ++ | hpux* | solaris* | cygwin* | mingw* | msys* ) + ac_cv_func_realloc_0_nonnull="guessing yes" ;; + # If we don't know, obey --enable-cross-guesses. + *) ac_cv_func_realloc_0_nonnull="$gl_cross_guess_normal" ;; + esac + ]) + ]) +- case "$ac_cv_func_realloc_0_nonnull" in +- *yes) +- $1 +- ;; +- *) +- $2 +- ;; +- esac ++ AS_CASE([$ac_cv_func_realloc_0_nonnull], [*yes], [$1], [$2]) + ])# AC_FUNC_REALLOC + + # gl_FUNC_REALLOC_GNU + # ------------------- +-# Test whether 'realloc (0, 0)' is handled like in GNU libc, and replace +-# realloc if it is not. ++# Replace realloc if it is not compatible with GNU libc. + AC_DEFUN([gl_FUNC_REALLOC_GNU], + [ + AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) +- dnl _AC_FUNC_REALLOC_IF is defined in Autoconf. +- _AC_FUNC_REALLOC_IF( +- [AC_DEFINE([HAVE_REALLOC_GNU], [1], +- [Define to 1 if your system has a GNU libc compatible 'realloc' +- function, and to 0 otherwise.])], +- [AC_DEFINE([HAVE_REALLOC_GNU], [0]) +- REPLACE_REALLOC=1 +- ]) ++ AC_REQUIRE([gl_FUNC_REALLOC_POSIX]) ++ if test $REPLACE_REALLOC = 0; then ++ _AC_FUNC_REALLOC_IF([], [REPLACE_REALLOC=1]) ++ fi + ])# gl_FUNC_REALLOC_GNU + + # gl_FUNC_REALLOC_POSIX + # --------------------- + # Test whether 'realloc' is POSIX compliant (sets errno to ENOMEM when it +-# fails), and replace realloc if it is not. ++# fails, and doesn't mess up with ptrdiff_t overflow), ++# and replace realloc if it is not. + AC_DEFUN([gl_FUNC_REALLOC_POSIX], + [ + AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) +- AC_REQUIRE([gl_CHECK_MALLOC_POSIX]) +- if test $gl_cv_func_malloc_posix = yes; then +- AC_DEFINE([HAVE_REALLOC_POSIX], [1], +- [Define if the 'realloc' function is POSIX compliant.]) +- else ++ AC_REQUIRE([gl_FUNC_MALLOC_POSIX]) ++ if test $REPLACE_MALLOC = 1; then + REPLACE_REALLOC=1 + fi + ]) +diff --git a/m4/regex.m4 b/m4/regex.m4 +index 850c572..1c7e562 100644 +--- a/m4/regex.m4 ++++ b/m4/regex.m4 +@@ -1,4 +1,4 @@ +-# serial 71 ++# serial 73 + + # Copyright (C) 1996-2001, 2003-2021 Free Software Foundation, Inc. + # +@@ -246,7 +246,7 @@ AC_DEFUN([gl_REGEX], + & ~RE_CONTEXT_INVALID_DUP + & ~RE_NO_EMPTY_RANGES); + memset (®ex, 0, sizeof regex); +- s = re_compile_pattern ("[[:alnum:]_-]\\\\+$", 16, ®ex); ++ s = re_compile_pattern ("[[:alnum:]_-]\\\\+\$", 16, ®ex); + if (s) + result |= 32; + else +@@ -264,14 +264,50 @@ AC_DEFUN([gl_REGEX], + back reference. */ + re_set_syntax (RE_SYNTAX_POSIX_EGREP); + memset (®ex, 0, sizeof regex); +- s = re_compile_pattern ("0|()0|\\1|0", 10, ®ex); ++ s = re_compile_pattern ("0|()0|\\\\1|0", 10, ®ex); + if (!s) +- result |= 64; ++ { ++ memset (®s, 0, sizeof regs); ++ i = re_search (®ex, "x", 1, 0, 1, ®s); ++ if (i != -1) ++ result |= 64; ++ if (0 <= i) ++ { ++ free (regs.start); ++ free (regs.end); ++ } ++ regfree (®ex); ++ } + else + { + if (strcmp (s, "Invalid back reference")) + result |= 64; ++ } ++ ++ /* glibc bug 11053. */ ++ re_set_syntax (RE_SYNTAX_POSIX_BASIC); ++ memset (®ex, 0, sizeof regex); ++ static char const pat_sub2[] = "\\\\(a*\\\\)*a*\\\\1"; ++ s = re_compile_pattern (pat_sub2, sizeof pat_sub2 - 1, ®ex); ++ if (s) ++ result |= 64; ++ else ++ { ++ memset (®s, 0, sizeof regs); ++ static char const data[] = "a"; ++ int datalen = sizeof data - 1; ++ i = re_search (®ex, data, datalen, 0, datalen, ®s); ++ if (i != 0) ++ result |= 64; ++ else if (regs.num_regs < 2) ++ result |= 64; ++ else if (! (regs.start[0] == 0 && regs.end[0] == 1)) ++ result |= 64; ++ else if (! (regs.start[1] == 0 && regs.end[1] == 0)) ++ result |= 64; + regfree (®ex); ++ free (regs.start); ++ free (regs.end); + } + + #if 0 +diff --git a/m4/select.m4 b/m4/select.m4 +index c7409d2..72c068f 100644 +--- a/m4/select.m4 ++++ b/m4/select.m4 +@@ -1,4 +1,4 @@ +-# select.m4 serial 12 ++# select.m4 serial 13 + dnl Copyright (C) 2009-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is preserved. + + AC_DEFUN([gl_FUNC_SELECT], + [ +- AC_REQUIRE([gl_HEADER_SYS_SELECT]) ++ AC_REQUIRE([gl_SYS_SELECT_H]) + AC_REQUIRE([AC_C_RESTRICT]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_REQUIRE([gl_SOCKETS]) +diff --git a/m4/servent.m4 b/m4/servent.m4 +index 2dda177..9bc3bcd 100644 +--- a/m4/servent.m4 ++++ b/m4/servent.m4 +@@ -1,4 +1,4 @@ +-# servent.m4 serial 3 ++# servent.m4 serial 4 + dnl Copyright (C) 2008, 2010-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -15,7 +15,7 @@ AC_DEFUN([gl_SERVENT], + dnl - On BeOS, they are in libnet. + dnl - On native Windows, they are in ws2_32.dll. + dnl - Otherwise they are in libc. +- AC_REQUIRE([gl_HEADER_SYS_SOCKET])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H ++ AC_REQUIRE([gl_SYS_SOCKET_H])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H + SERVENT_LIB= + gl_saved_libs="$LIBS" + AC_SEARCH_LIBS([getservbyname], [socket network net], +diff --git a/m4/signal_h.m4 b/m4/signal_h.m4 +index ff9f025..8b93880 100644 +--- a/m4/signal_h.m4 ++++ b/m4/signal_h.m4 +@@ -1,10 +1,10 @@ +-# signal_h.m4 serial 19 ++# signal_h.m4 serial 22 + dnl Copyright (C) 2007-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. + +-AC_DEFUN([gl_SIGNAL_H], ++AC_DEFUN_ONCE([gl_SIGNAL_H], + [ + AC_REQUIRE([gl_SIGNAL_H_DEFAULTS]) + AC_REQUIRE([gl_CHECK_TYPE_SIGSET_T]) +@@ -52,22 +52,37 @@ AC_DEFUN([gl_CHECK_TYPE_SIGSET_T], + fi + ]) + ++# gl_SIGNAL_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_SIGNAL_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_SIGNAL_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_SIGNAL_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_SIGNAL_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SIGNAL_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PTHREAD_SIGMASK]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RAISE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGNAL_H_SIGPIPE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGPROCMASK]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGACTION]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_SIGNAL_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_SIGNAL_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_SIGNAL_H_DEFAULTS], + [ +- GNULIB_PTHREAD_SIGMASK=0; AC_SUBST([GNULIB_PTHREAD_SIGMASK]) +- GNULIB_RAISE=0; AC_SUBST([GNULIB_RAISE]) +- GNULIB_SIGNAL_H_SIGPIPE=0; AC_SUBST([GNULIB_SIGNAL_H_SIGPIPE]) +- GNULIB_SIGPROCMASK=0; AC_SUBST([GNULIB_SIGPROCMASK]) +- GNULIB_SIGACTION=0; AC_SUBST([GNULIB_SIGACTION]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_POSIX_SIGNALBLOCKING=1; AC_SUBST([HAVE_POSIX_SIGNALBLOCKING]) + HAVE_PTHREAD_SIGMASK=1; AC_SUBST([HAVE_PTHREAD_SIGMASK]) +diff --git a/m4/sockpfaf.m4 b/m4/sockpfaf.m4 +index edae5d8..17e14c7 100644 +--- a/m4/sockpfaf.m4 ++++ b/m4/sockpfaf.m4 +@@ -1,4 +1,4 @@ +-# sockpfaf.m4 serial 9 ++# sockpfaf.m4 serial 10 + dnl Copyright (C) 2004, 2006, 2009-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -13,7 +13,7 @@ dnl From Bruno Haible. + + AC_DEFUN([gl_SOCKET_FAMILIES], + [ +- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) ++ AC_REQUIRE([gl_SYS_SOCKET_H]) + AC_CHECK_HEADERS_ONCE([netinet/in.h]) + + AC_CACHE_CHECK([for IPv4 sockets], +@@ -60,7 +60,7 @@ AC_DEFUN([gl_SOCKET_FAMILIES], + + AC_DEFUN([gl_SOCKET_FAMILY_UNIX], + [ +- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) ++ AC_REQUIRE([gl_SYS_SOCKET_H]) + AC_CHECK_HEADERS_ONCE([sys/un.h]) + + AC_CACHE_CHECK([for UNIX domain sockets], +diff --git a/m4/stat.m4 b/m4/stat.m4 +index 66f6c8c..9bcdb72 100644 +--- a/m4/stat.m4 ++++ b/m4/stat.m4 +@@ -1,4 +1,4 @@ +-# serial 17 ++# serial 18 + + # Copyright (C) 2009-2021 Free Software Foundation, Inc. + # +@@ -69,7 +69,7 @@ AC_DEFUN([gl_FUNC_STAT], + + # Prerequisites of lib/stat.c and lib/stat-w32.c. + AC_DEFUN([gl_PREREQ_STAT], [ +- AC_REQUIRE([gl_HEADER_SYS_STAT_H]) ++ AC_REQUIRE([gl_SYS_STAT_H]) + AC_REQUIRE([gl_PREREQ_STAT_W32]) + : + ]) +diff --git a/m4/stddef_h.m4 b/m4/stddef_h.m4 +index cd666c4..1303d2e 100644 +--- a/m4/stddef_h.m4 ++++ b/m4/stddef_h.m4 +@@ -1,4 +1,4 @@ +-# stddef_h.m4 serial 9 ++# stddef_h.m4 serial 11 + dnl Copyright (C) 2009-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is preserved. + + dnl A placeholder for , for platforms that have issues. + +-AC_DEFUN([gl_STDDEF_H], ++AC_DEFUN_ONCE([gl_STDDEF_H], + [ + AC_REQUIRE([gl_STDDEF_H_DEFAULTS]) + AC_REQUIRE([gt_TYPE_WCHAR_T]) +@@ -68,13 +68,28 @@ AC_DEFUN([gl_STDDEF_H], + fi + ]) + ++# gl_STDDEF_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_STDDEF_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_STDDEF_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_STDDEF_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_STDDEF_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_STDDEF_H_MODULE_INDICATOR_DEFAULTS], [ ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_STDDEF_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_STDDEF_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_STDDEF_H_DEFAULTS], + [ + dnl Assume proper GNU behavior unless another module says otherwise. +diff --git a/m4/stdint.m4 b/m4/stdint.m4 +index a785b44..2eb1652 100644 +--- a/m4/stdint.m4 ++++ b/m4/stdint.m4 +@@ -1,4 +1,4 @@ +-# stdint.m4 serial 58 ++# stdint.m4 serial 60 + dnl Copyright (C) 2001-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -170,7 +170,7 @@ struct s { + PTRDIFF_MIN == TYPE_MINIMUM (ptrdiff_t) + && PTRDIFF_MAX == TYPE_MAXIMUM (ptrdiff_t) + ? 1 : -1; +- /* Detect bug in FreeBSD 6.0 / ia64. */ ++ /* Detect bug in FreeBSD 6.0/ia64 and FreeBSD 13.0/arm64. */ + int check_SIG_ATOMIC: + SIG_ATOMIC_MIN == TYPE_MINIMUM (sig_atomic_t) + && SIG_ATOMIC_MAX == TYPE_MAXIMUM (sig_atomic_t) +@@ -527,7 +527,7 @@ AC_DEFUN([gl_STDINT_TYPE_PROPERTIES], + dnl requirement that wint_t is "unchanged by default argument promotions". + dnl In this case gnulib's and override wint_t. + dnl Set the variable BITSIZEOF_WINT_T accordingly. +- if test $GNULIB_OVERRIDES_WINT_T = 1; then ++ if test $GNULIBHEADERS_OVERRIDE_WINT_T = 1; then + BITSIZEOF_WINT_T=32 + fi + ]) +diff --git a/m4/stdio_h.m4 b/m4/stdio_h.m4 +index 4c3f24a..e704383 100644 +--- a/m4/stdio_h.m4 ++++ b/m4/stdio_h.m4 +@@ -1,11 +1,12 @@ +-# stdio_h.m4 serial 52 ++# stdio_h.m4 serial 56 + dnl Copyright (C) 2007-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. + +-AC_DEFUN([gl_STDIO_H], ++AC_DEFUN_ONCE([gl_STDIO_H], + [ ++ AC_REQUIRE([gl_STDIO_H_DEFAULTS]) + AH_VERBATIM([MINGW_ANSI_STDIO], + [/* Use GNU style printf and scanf. */ + #ifndef __USE_MINGW_ANSI_STDIO +@@ -13,7 +14,6 @@ AC_DEFUN([gl_STDIO_H], + #endif + ]) + AC_DEFINE([__USE_MINGW_ANSI_STDIO]) +- AC_REQUIRE([gl_STDIO_H_DEFAULTS]) + gl_NEXT_HEADERS([stdio.h]) + + dnl Determine whether __USE_MINGW_ANSI_STDIO makes printf and +@@ -40,17 +40,6 @@ AC_DEFUN([gl_STDIO_H], + attribute "__gnu_printf__" instead of "__printf__"]) + fi + +- dnl No need to create extra modules for these functions. Everyone who uses +- dnl likely needs them. +- GNULIB_FSCANF=1 +- gl_MODULE_INDICATOR([fscanf]) +- GNULIB_SCANF=1 +- gl_MODULE_INDICATOR([scanf]) +- GNULIB_FGETC=1 +- GNULIB_GETC=1 +- GNULIB_GETCHAR=1 +- GNULIB_FGETS=1 +- GNULIB_FREAD=1 + dnl This ifdef is necessary to avoid an error "missing file lib/stdio-read.c" + dnl "expected source file, required through AC_LIBSOURCES, not found". It is + dnl also an optimization, to avoid performing a configure check whose result +@@ -64,18 +53,6 @@ AC_DEFUN([gl_STDIO_H], + fi + ]) + +- dnl No need to create extra modules for these functions. Everyone who uses +- dnl likely needs them. +- GNULIB_FPRINTF=1 +- GNULIB_PRINTF=1 +- GNULIB_VFPRINTF=1 +- GNULIB_VPRINTF=1 +- GNULIB_FPUTC=1 +- GNULIB_PUTC=1 +- GNULIB_PUTCHAR=1 +- GNULIB_FPUTS=1 +- GNULIB_PUTS=1 +- GNULIB_FWRITE=1 + dnl This ifdef is necessary to avoid an error "missing file lib/stdio-write.c" + dnl "expected source file, required through AC_LIBSOURCES, not found". It is + dnl also an optimization, to avoid performing a configure check whose result +@@ -116,77 +93,92 @@ AC_DEFUN([gl_STDIO_H], + fi + ]) + ++# gl_STDIO_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_STDIO_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_STDIO_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_STDIO_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_STDIO_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_STDIO_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DPRINTF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FCLOSE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FDOPEN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FFLUSH]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FGETC]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FGETS]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FOPEN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FPRINTF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FPRINTF_POSIX]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FPURGE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FPUTC]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FPUTS]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREAD]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREOPEN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSCANF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSEEK]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSEEKO]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FTELL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FTELLO]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FWRITE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETC]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETCHAR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETDELIM]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETLINE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OBSTACK_PRINTF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OBSTACK_PRINTF_POSIX]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PCLOSE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PERROR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POPEN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PRINTF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PRINTF_POSIX]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PUTC]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PUTCHAR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PUTS]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REMOVE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RENAME]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RENAMEAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SCANF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SNPRINTF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SPRINTF_POSIX]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STDIO_H_NONBLOCKING]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STDIO_H_SIGPIPE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TMPFILE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VASPRINTF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VFSCANF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VSCANF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VDPRINTF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VFPRINTF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VFPRINTF_POSIX]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VPRINTF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VPRINTF_POSIX]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VSNPRINTF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VSPRINTF_POSIX]) ++ dnl Support Microsoft deprecated alias function names by default. ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_FCLOSEALL], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_FDOPEN], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_FILENO], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_GETW], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_PUTW], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_TEMPNAM], [1]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_STDIO_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_STDIO_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_STDIO_H_DEFAULTS], + [ +- GNULIB_DPRINTF=0; AC_SUBST([GNULIB_DPRINTF]) +- GNULIB_FCLOSE=0; AC_SUBST([GNULIB_FCLOSE]) +- GNULIB_FDOPEN=0; AC_SUBST([GNULIB_FDOPEN]) +- GNULIB_FFLUSH=0; AC_SUBST([GNULIB_FFLUSH]) +- GNULIB_FGETC=0; AC_SUBST([GNULIB_FGETC]) +- GNULIB_FGETS=0; AC_SUBST([GNULIB_FGETS]) +- GNULIB_FOPEN=0; AC_SUBST([GNULIB_FOPEN]) +- GNULIB_FPRINTF=0; AC_SUBST([GNULIB_FPRINTF]) +- GNULIB_FPRINTF_POSIX=0; AC_SUBST([GNULIB_FPRINTF_POSIX]) +- GNULIB_FPURGE=0; AC_SUBST([GNULIB_FPURGE]) +- GNULIB_FPUTC=0; AC_SUBST([GNULIB_FPUTC]) +- GNULIB_FPUTS=0; AC_SUBST([GNULIB_FPUTS]) +- GNULIB_FREAD=0; AC_SUBST([GNULIB_FREAD]) +- GNULIB_FREOPEN=0; AC_SUBST([GNULIB_FREOPEN]) +- GNULIB_FSCANF=0; AC_SUBST([GNULIB_FSCANF]) +- GNULIB_FSEEK=0; AC_SUBST([GNULIB_FSEEK]) +- GNULIB_FSEEKO=0; AC_SUBST([GNULIB_FSEEKO]) +- GNULIB_FTELL=0; AC_SUBST([GNULIB_FTELL]) +- GNULIB_FTELLO=0; AC_SUBST([GNULIB_FTELLO]) +- GNULIB_FWRITE=0; AC_SUBST([GNULIB_FWRITE]) +- GNULIB_GETC=0; AC_SUBST([GNULIB_GETC]) +- GNULIB_GETCHAR=0; AC_SUBST([GNULIB_GETCHAR]) +- GNULIB_GETDELIM=0; AC_SUBST([GNULIB_GETDELIM]) +- GNULIB_GETLINE=0; AC_SUBST([GNULIB_GETLINE]) +- GNULIB_OBSTACK_PRINTF=0; AC_SUBST([GNULIB_OBSTACK_PRINTF]) +- GNULIB_OBSTACK_PRINTF_POSIX=0; AC_SUBST([GNULIB_OBSTACK_PRINTF_POSIX]) +- GNULIB_PCLOSE=0; AC_SUBST([GNULIB_PCLOSE]) +- GNULIB_PERROR=0; AC_SUBST([GNULIB_PERROR]) +- GNULIB_POPEN=0; AC_SUBST([GNULIB_POPEN]) +- GNULIB_PRINTF=0; AC_SUBST([GNULIB_PRINTF]) +- GNULIB_PRINTF_POSIX=0; AC_SUBST([GNULIB_PRINTF_POSIX]) +- GNULIB_PUTC=0; AC_SUBST([GNULIB_PUTC]) +- GNULIB_PUTCHAR=0; AC_SUBST([GNULIB_PUTCHAR]) +- GNULIB_PUTS=0; AC_SUBST([GNULIB_PUTS]) +- GNULIB_REMOVE=0; AC_SUBST([GNULIB_REMOVE]) +- GNULIB_RENAME=0; AC_SUBST([GNULIB_RENAME]) +- GNULIB_RENAMEAT=0; AC_SUBST([GNULIB_RENAMEAT]) +- GNULIB_SCANF=0; AC_SUBST([GNULIB_SCANF]) +- GNULIB_SNPRINTF=0; AC_SUBST([GNULIB_SNPRINTF]) +- GNULIB_SPRINTF_POSIX=0; AC_SUBST([GNULIB_SPRINTF_POSIX]) +- GNULIB_STDIO_H_NONBLOCKING=0; AC_SUBST([GNULIB_STDIO_H_NONBLOCKING]) +- GNULIB_STDIO_H_SIGPIPE=0; AC_SUBST([GNULIB_STDIO_H_SIGPIPE]) +- GNULIB_TMPFILE=0; AC_SUBST([GNULIB_TMPFILE]) +- GNULIB_VASPRINTF=0; AC_SUBST([GNULIB_VASPRINTF]) +- GNULIB_VFSCANF=0; AC_SUBST([GNULIB_VFSCANF]) +- GNULIB_VSCANF=0; AC_SUBST([GNULIB_VSCANF]) +- GNULIB_VDPRINTF=0; AC_SUBST([GNULIB_VDPRINTF]) +- GNULIB_VFPRINTF=0; AC_SUBST([GNULIB_VFPRINTF]) +- GNULIB_VFPRINTF_POSIX=0; AC_SUBST([GNULIB_VFPRINTF_POSIX]) +- GNULIB_VPRINTF=0; AC_SUBST([GNULIB_VPRINTF]) +- GNULIB_VPRINTF_POSIX=0; AC_SUBST([GNULIB_VPRINTF_POSIX]) +- GNULIB_VSNPRINTF=0; AC_SUBST([GNULIB_VSNPRINTF]) +- GNULIB_VSPRINTF_POSIX=0; AC_SUBST([GNULIB_VSPRINTF_POSIX]) +- dnl Support Microsoft deprecated alias function names by default. +- GNULIB_MDA_FCLOSEALL=1; AC_SUBST([GNULIB_MDA_FCLOSEALL]) +- GNULIB_MDA_FDOPEN=1; AC_SUBST([GNULIB_MDA_FDOPEN]) +- GNULIB_MDA_FILENO=1; AC_SUBST([GNULIB_MDA_FILENO]) +- GNULIB_MDA_GETW=1; AC_SUBST([GNULIB_MDA_GETW]) +- GNULIB_MDA_PUTW=1; AC_SUBST([GNULIB_MDA_PUTW]) +- GNULIB_MDA_TEMPNAM=1; AC_SUBST([GNULIB_MDA_TEMPNAM]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_DECL_FCLOSEALL=1; AC_SUBST([HAVE_DECL_FCLOSEALL]) + HAVE_DECL_FPURGE=1; AC_SUBST([HAVE_DECL_FPURGE]) +diff --git a/m4/stdlib_h.m4 b/m4/stdlib_h.m4 +index 5fdb0a7..9c1d1c7 100644 +--- a/m4/stdlib_h.m4 ++++ b/m4/stdlib_h.m4 +@@ -1,10 +1,10 @@ +-# stdlib_h.m4 serial 59 ++# stdlib_h.m4 serial 63 + dnl Copyright (C) 2007-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. + +-AC_DEFUN([gl_STDLIB_H], ++AC_DEFUN_ONCE([gl_STDLIB_H], + [ + AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) + gl_NEXT_HEADERS([stdlib.h]) +@@ -46,63 +46,78 @@ AC_DEFUN([gl_STDLIB_H], + fi + ]) + ++# gl_STDLIB_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_STDLIB_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_STDLIB_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_STDLIB_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_STDLIB_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB__EXIT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ALIGNED_ALLOC]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ATOLL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CALLOC_POSIX]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CANONICALIZE_FILE_NAME]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREE_POSIX]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETLOADAVG]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETSUBOPT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GRANTPT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MALLOC_POSIX]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBTOWC]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKDTEMP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKOSTEMP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKOSTEMPS]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKSTEMP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKSTEMPS]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POSIX_MEMALIGN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POSIX_OPENPT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PTSNAME]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PTSNAME_R]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PUTENV]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_QSORT_R]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RANDOM]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RANDOM_R]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REALLOCARRAY]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REALLOC_POSIX]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REALPATH]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RPMATCH]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SECURE_GETENV]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETENV]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOD]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOLD]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOLL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOUL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOULL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SYSTEM_POSIX]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNLOCKPT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNSETENV]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCTOMB]) ++ dnl Support Microsoft deprecated alias function names by default. ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_ECVT], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_FCVT], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_GCVT], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_MKTEMP], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_PUTENV], [1]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_STDLIB_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_STDLIB_H_DEFAULTS], + [ +- GNULIB__EXIT=0; AC_SUBST([GNULIB__EXIT]) +- GNULIB_ALIGNED_ALLOC=0; AC_SUBST([GNULIB_ALIGNED_ALLOC]) +- GNULIB_ATOLL=0; AC_SUBST([GNULIB_ATOLL]) +- GNULIB_CALLOC_POSIX=0; AC_SUBST([GNULIB_CALLOC_POSIX]) +- GNULIB_CANONICALIZE_FILE_NAME=0; AC_SUBST([GNULIB_CANONICALIZE_FILE_NAME]) +- GNULIB_FREE_POSIX=0; AC_SUBST([GNULIB_FREE_POSIX]) +- GNULIB_GETLOADAVG=0; AC_SUBST([GNULIB_GETLOADAVG]) +- GNULIB_GETSUBOPT=0; AC_SUBST([GNULIB_GETSUBOPT]) +- GNULIB_GRANTPT=0; AC_SUBST([GNULIB_GRANTPT]) +- GNULIB_MALLOC_POSIX=0; AC_SUBST([GNULIB_MALLOC_POSIX]) +- GNULIB_MBTOWC=0; AC_SUBST([GNULIB_MBTOWC]) +- GNULIB_MKDTEMP=0; AC_SUBST([GNULIB_MKDTEMP]) +- GNULIB_MKOSTEMP=0; AC_SUBST([GNULIB_MKOSTEMP]) +- GNULIB_MKOSTEMPS=0; AC_SUBST([GNULIB_MKOSTEMPS]) +- GNULIB_MKSTEMP=0; AC_SUBST([GNULIB_MKSTEMP]) +- GNULIB_MKSTEMPS=0; AC_SUBST([GNULIB_MKSTEMPS]) +- GNULIB_POSIX_MEMALIGN=0;AC_SUBST([GNULIB_POSIX_MEMALIGN]) +- GNULIB_POSIX_OPENPT=0; AC_SUBST([GNULIB_POSIX_OPENPT]) +- GNULIB_PTSNAME=0; AC_SUBST([GNULIB_PTSNAME]) +- GNULIB_PTSNAME_R=0; AC_SUBST([GNULIB_PTSNAME_R]) +- GNULIB_PUTENV=0; AC_SUBST([GNULIB_PUTENV]) +- GNULIB_QSORT_R=0; AC_SUBST([GNULIB_QSORT_R]) +- GNULIB_RANDOM=0; AC_SUBST([GNULIB_RANDOM]) +- GNULIB_RANDOM_R=0; AC_SUBST([GNULIB_RANDOM_R]) +- GNULIB_REALLOCARRAY=0; AC_SUBST([GNULIB_REALLOCARRAY]) +- GNULIB_REALLOC_POSIX=0; AC_SUBST([GNULIB_REALLOC_POSIX]) +- GNULIB_REALPATH=0; AC_SUBST([GNULIB_REALPATH]) +- GNULIB_RPMATCH=0; AC_SUBST([GNULIB_RPMATCH]) +- GNULIB_SECURE_GETENV=0; AC_SUBST([GNULIB_SECURE_GETENV]) +- GNULIB_SETENV=0; AC_SUBST([GNULIB_SETENV]) +- GNULIB_STRTOD=0; AC_SUBST([GNULIB_STRTOD]) +- GNULIB_STRTOL=0; AC_SUBST([GNULIB_STRTOL]) +- GNULIB_STRTOLD=0; AC_SUBST([GNULIB_STRTOLD]) +- GNULIB_STRTOLL=0; AC_SUBST([GNULIB_STRTOLL]) +- GNULIB_STRTOUL=0; AC_SUBST([GNULIB_STRTOUL]) +- GNULIB_STRTOULL=0; AC_SUBST([GNULIB_STRTOULL]) +- GNULIB_SYSTEM_POSIX=0; AC_SUBST([GNULIB_SYSTEM_POSIX]) +- GNULIB_UNLOCKPT=0; AC_SUBST([GNULIB_UNLOCKPT]) +- GNULIB_UNSETENV=0; AC_SUBST([GNULIB_UNSETENV]) +- GNULIB_WCTOMB=0; AC_SUBST([GNULIB_WCTOMB]) +- dnl Support Microsoft deprecated alias function names by default. +- GNULIB_MDA_ECVT=1; AC_SUBST([GNULIB_MDA_ECVT]) +- GNULIB_MDA_FCVT=1; AC_SUBST([GNULIB_MDA_FCVT]) +- GNULIB_MDA_GCVT=1; AC_SUBST([GNULIB_MDA_GCVT]) +- GNULIB_MDA_MKTEMP=1; AC_SUBST([GNULIB_MDA_MKTEMP]) +- GNULIB_MDA_PUTENV=1; AC_SUBST([GNULIB_MDA_PUTENV]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE__EXIT=1; AC_SUBST([HAVE__EXIT]) + HAVE_ALIGNED_ALLOC=1; AC_SUBST([HAVE_ALIGNED_ALLOC]) +@@ -164,6 +179,7 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS], + REPLACE_RANDOM=0; AC_SUBST([REPLACE_RANDOM]) + REPLACE_RANDOM_R=0; AC_SUBST([REPLACE_RANDOM_R]) + REPLACE_REALLOC=0; AC_SUBST([REPLACE_REALLOC]) ++ REPLACE_REALLOCARRAY=0; AC_SUBST([REPLACE_REALLOCARRAY]) + REPLACE_REALPATH=0; AC_SUBST([REPLACE_REALPATH]) + REPLACE_SETENV=0; AC_SUBST([REPLACE_SETENV]) + REPLACE_SETSTATE=0; AC_SUBST([REPLACE_SETSTATE]) +diff --git a/m4/strdup.m4 b/m4/strdup.m4 +index f6f421d..5b6018f 100644 +--- a/m4/strdup.m4 ++++ b/m4/strdup.m4 +@@ -1,4 +1,4 @@ +-# strdup.m4 serial 14 ++# strdup.m4 serial 15 + + dnl Copyright (C) 2002-2021 Free Software Foundation, Inc. + +@@ -8,7 +8,7 @@ dnl with or without modifications, as long as this notice is preserved. + + AC_DEFUN([gl_FUNC_STRDUP], + [ +- AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) ++ AC_REQUIRE([gl_STRING_H_DEFAULTS]) + AC_CHECK_DECLS_ONCE([strdup]) + if test $ac_cv_have_decl_strdup = no; then + HAVE_DECL_STRDUP=0 +@@ -17,7 +17,7 @@ AC_DEFUN([gl_FUNC_STRDUP], + + AC_DEFUN([gl_FUNC_STRDUP_POSIX], + [ +- AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) ++ AC_REQUIRE([gl_STRING_H_DEFAULTS]) + AC_REQUIRE([gl_CHECK_MALLOC_POSIX]) + if test $gl_cv_func_malloc_posix != yes; then + REPLACE_STRDUP=1 +diff --git a/m4/string_h.m4 b/m4/string_h.m4 +index a4cc5b4..80d1e58 100644 +--- a/m4/string_h.m4 ++++ b/m4/string_h.m4 +@@ -5,20 +5,15 @@ + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 29 ++# serial 32 + + # Written by Paul Eggert. + +-AC_DEFUN([gl_HEADER_STRING_H], ++AC_DEFUN_ONCE([gl_STRING_H], + [ +- dnl Use AC_REQUIRE here, so that the default behavior below is expanded +- dnl once only, before all statements that occur in other macros. +- AC_REQUIRE([gl_HEADER_STRING_H_BODY]) +-]) +- +-AC_DEFUN([gl_HEADER_STRING_H_BODY], +-[ +- AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only, before all statements ++ dnl that occur in other macros. ++ AC_REQUIRE([gl_STRING_H_DEFAULTS]) + gl_NEXT_HEADERS([string.h]) + + dnl Check for declarations of anything we want to poison if the +@@ -33,62 +28,77 @@ AC_DEFUN([gl_HEADER_STRING_H_BODY], + AC_REQUIRE([AC_C_RESTRICT]) + ]) + ++# gl_STRING_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_STRING_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_STRING_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + +-AC_DEFUN([gl_HEADER_STRING_H_DEFAULTS], ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_STRING_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_STRING_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXPLICIT_BZERO]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FFSL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FFSLL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MEMCHR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MEMMEM]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MEMPCPY]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MEMRCHR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RAWMEMCHR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STPCPY]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STPNCPY]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRCHRNUL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRDUP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRNCAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRNDUP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRNLEN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRPBRK]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRSEP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRSTR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRCASESTR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOK_R]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSLEN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSNLEN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSCHR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSRCHR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSSTR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSCASECMP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSNCASECMP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSPCASECMP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSCASESTR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSCSPN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSPBRK]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSSPN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSSEP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSTOK_R]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRERROR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRERROR_R]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRERRORNAME_NP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGABBREV_NP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGDESCR_NP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRSIGNAL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRVERSCMP]) ++ dnl Support Microsoft deprecated alias function names by default. ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_MEMCCPY], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_STRDUP], [1]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_STRING_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_STRING_H_DEFAULTS]) ++]) ++ ++AC_DEFUN([gl_STRING_H_DEFAULTS], + [ +- GNULIB_EXPLICIT_BZERO=0; AC_SUBST([GNULIB_EXPLICIT_BZERO]) +- GNULIB_FFSL=0; AC_SUBST([GNULIB_FFSL]) +- GNULIB_FFSLL=0; AC_SUBST([GNULIB_FFSLL]) +- GNULIB_MEMCHR=0; AC_SUBST([GNULIB_MEMCHR]) +- GNULIB_MEMMEM=0; AC_SUBST([GNULIB_MEMMEM]) +- GNULIB_MEMPCPY=0; AC_SUBST([GNULIB_MEMPCPY]) +- GNULIB_MEMRCHR=0; AC_SUBST([GNULIB_MEMRCHR]) +- GNULIB_RAWMEMCHR=0; AC_SUBST([GNULIB_RAWMEMCHR]) +- GNULIB_STPCPY=0; AC_SUBST([GNULIB_STPCPY]) +- GNULIB_STPNCPY=0; AC_SUBST([GNULIB_STPNCPY]) +- GNULIB_STRCHRNUL=0; AC_SUBST([GNULIB_STRCHRNUL]) +- GNULIB_STRDUP=0; AC_SUBST([GNULIB_STRDUP]) +- GNULIB_STRNCAT=0; AC_SUBST([GNULIB_STRNCAT]) +- GNULIB_STRNDUP=0; AC_SUBST([GNULIB_STRNDUP]) +- GNULIB_STRNLEN=0; AC_SUBST([GNULIB_STRNLEN]) +- GNULIB_STRPBRK=0; AC_SUBST([GNULIB_STRPBRK]) +- GNULIB_STRSEP=0; AC_SUBST([GNULIB_STRSEP]) +- GNULIB_STRSTR=0; AC_SUBST([GNULIB_STRSTR]) +- GNULIB_STRCASESTR=0; AC_SUBST([GNULIB_STRCASESTR]) +- GNULIB_STRTOK_R=0; AC_SUBST([GNULIB_STRTOK_R]) +- GNULIB_MBSLEN=0; AC_SUBST([GNULIB_MBSLEN]) +- GNULIB_MBSNLEN=0; AC_SUBST([GNULIB_MBSNLEN]) +- GNULIB_MBSCHR=0; AC_SUBST([GNULIB_MBSCHR]) +- GNULIB_MBSRCHR=0; AC_SUBST([GNULIB_MBSRCHR]) +- GNULIB_MBSSTR=0; AC_SUBST([GNULIB_MBSSTR]) +- GNULIB_MBSCASECMP=0; AC_SUBST([GNULIB_MBSCASECMP]) +- GNULIB_MBSNCASECMP=0; AC_SUBST([GNULIB_MBSNCASECMP]) +- GNULIB_MBSPCASECMP=0; AC_SUBST([GNULIB_MBSPCASECMP]) +- GNULIB_MBSCASESTR=0; AC_SUBST([GNULIB_MBSCASESTR]) +- GNULIB_MBSCSPN=0; AC_SUBST([GNULIB_MBSCSPN]) +- GNULIB_MBSPBRK=0; AC_SUBST([GNULIB_MBSPBRK]) +- GNULIB_MBSSPN=0; AC_SUBST([GNULIB_MBSSPN]) +- GNULIB_MBSSEP=0; AC_SUBST([GNULIB_MBSSEP]) +- GNULIB_MBSTOK_R=0; AC_SUBST([GNULIB_MBSTOK_R]) +- GNULIB_STRERROR=0; AC_SUBST([GNULIB_STRERROR]) +- GNULIB_STRERROR_R=0; AC_SUBST([GNULIB_STRERROR_R]) +- GNULIB_STRERRORNAME_NP=0; AC_SUBST([GNULIB_STRERRORNAME_NP]) +- GNULIB_SIGABBREV_NP=0; AC_SUBST([GNULIB_SIGABBREV_NP]) +- GNULIB_SIGDESCR_NP=0; AC_SUBST([GNULIB_SIGDESCR_NP]) +- GNULIB_STRSIGNAL=0; AC_SUBST([GNULIB_STRSIGNAL]) +- GNULIB_STRVERSCMP=0; AC_SUBST([GNULIB_STRVERSCMP]) + HAVE_MBSLEN=0; AC_SUBST([HAVE_MBSLEN]) +- dnl Support Microsoft deprecated alias function names by default. +- GNULIB_MDA_MEMCCPY=1; AC_SUBST([GNULIB_MDA_MEMCCPY]) +- GNULIB_MDA_STRDUP=1; AC_SUBST([GNULIB_MDA_STRDUP]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_EXPLICIT_BZERO=1; AC_SUBST([HAVE_EXPLICIT_BZERO]) + HAVE_FFSL=1; AC_SUBST([HAVE_FFSL]) +diff --git a/m4/sys_file_h.m4 b/m4/sys_file_h.m4 +index 99c2285..bcde4d7 100644 +--- a/m4/sys_file_h.m4 ++++ b/m4/sys_file_h.m4 +@@ -1,5 +1,5 @@ + # Configure a replacement for . +-# serial 6 ++# serial 9 + + # Copyright (C) 2008-2021 Free Software Foundation, Inc. + # This file is free software; the Free Software Foundation +@@ -8,9 +8,9 @@ + + # Written by Richard W.M. Jones. + +-AC_DEFUN([gl_HEADER_SYS_FILE_H], ++AC_DEFUN_ONCE([gl_SYS_FILE_H], + [ +- AC_REQUIRE([gl_HEADER_SYS_FILE_H_DEFAULTS]) ++ AC_REQUIRE([gl_SYS_FILE_H_DEFAULTS]) + + dnl is always overridden, because of GNULIB_POSIXCHECK. + gl_CHECK_NEXT_HEADERS([sys/file.h]) +@@ -28,14 +28,29 @@ AC_DEFUN([gl_HEADER_SYS_FILE_H], + ]], [flock]) + ]) + +-AC_DEFUN([gl_HEADER_SYS_FILE_MODULE_INDICATOR], ++# gl_SYS_FILE_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. ++AC_DEFUN([gl_SYS_FILE_MODULE_INDICATOR], + [ +- AC_REQUIRE([gl_HEADER_SYS_FILE_H_DEFAULTS]) ++ gl_SYS_FILE_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + ]) + +-AC_DEFUN([gl_HEADER_SYS_FILE_H_DEFAULTS], ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_SYS_FILE_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_FILE_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FLOCK]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_FILE_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_SYS_FILE_H_DEFAULTS]) ++]) ++ ++AC_DEFUN([gl_SYS_FILE_H_DEFAULTS], + [ +- GNULIB_FLOCK=0; AC_SUBST([GNULIB_FLOCK]) + HAVE_FLOCK=1; AC_SUBST([HAVE_FLOCK]) + ]) +diff --git a/m4/sys_random_h.m4 b/m4/sys_random_h.m4 +index 45e0469..37bc316 100644 +--- a/m4/sys_random_h.m4 ++++ b/m4/sys_random_h.m4 +@@ -1,10 +1,10 @@ +-# sys_random_h.m4 serial 5 ++# sys_random_h.m4 serial 8 + dnl Copyright (C) 2020-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. + +-AC_DEFUN([gl_HEADER_SYS_RANDOM], ++AC_DEFUN_ONCE([gl_SYS_RANDOM_H], + [ + AC_REQUIRE([gl_SYS_RANDOM_H_DEFAULTS]) + dnl is always overridden, because of GNULIB_POSIXCHECK. +@@ -35,18 +35,33 @@ AC_DEFUN([gl_HEADER_SYS_RANDOM], + [getrandom]) + ]) + ++# gl_SYS_RANDOM_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_SYS_RANDOM_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_SYS_RANDOM_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_SYS_RANDOM_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_SYS_RANDOM_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_RANDOM_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETRANDOM]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_RANDOM_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_SYS_RANDOM_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_SYS_RANDOM_H_DEFAULTS], + [ +- GNULIB_GETRANDOM=0; AC_SUBST([GNULIB_GETRANDOM]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_GETRANDOM=1; AC_SUBST([HAVE_GETRANDOM]) + REPLACE_GETRANDOM=0; AC_SUBST([REPLACE_GETRANDOM]) +diff --git a/m4/sys_select_h.m4 b/m4/sys_select_h.m4 +index 4b33d31..2e7d140 100644 +--- a/m4/sys_select_h.m4 ++++ b/m4/sys_select_h.m4 +@@ -1,13 +1,13 @@ +-# sys_select_h.m4 serial 20 ++# sys_select_h.m4 serial 23 + dnl Copyright (C) 2006-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. + +-AC_DEFUN([gl_HEADER_SYS_SELECT], ++AC_DEFUN_ONCE([gl_SYS_SELECT_H], + [ +- AC_REQUIRE([AC_C_RESTRICT]) + AC_REQUIRE([gl_SYS_SELECT_H_DEFAULTS]) ++ AC_REQUIRE([AC_C_RESTRICT]) + AC_CACHE_CHECK([whether is self-contained], + [gl_cv_header_sys_select_h_selfcontained], + [ +@@ -75,19 +75,34 @@ AC_DEFUN([gl_HEADER_SYS_SELECT], + ]], [pselect select]) + ]) + ++# gl_SYS_SELECT_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_SYS_SELECT_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_SYS_SELECT_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_SYS_SELECT_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_SYS_SELECT_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_SELECT_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PSELECT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SELECT]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_SELECT_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_SYS_SELECT_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_SYS_SELECT_H_DEFAULTS], + [ +- GNULIB_PSELECT=0; AC_SUBST([GNULIB_PSELECT]) +- GNULIB_SELECT=0; AC_SUBST([GNULIB_SELECT]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_PSELECT=1; AC_SUBST([HAVE_PSELECT]) + REPLACE_PSELECT=0; AC_SUBST([REPLACE_PSELECT]) +diff --git a/m4/sys_socket_h.m4 b/m4/sys_socket_h.m4 +index 503cb96..5676a0d 100644 +--- a/m4/sys_socket_h.m4 ++++ b/m4/sys_socket_h.m4 +@@ -1,4 +1,4 @@ +-# sys_socket_h.m4 serial 25 ++# sys_socket_h.m4 serial 28 + dnl Copyright (C) 2005-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is preserved. + + dnl From Simon Josefsson. + +-AC_DEFUN([gl_HEADER_SYS_SOCKET], ++AC_DEFUN_ONCE([gl_SYS_SOCKET_H], + [ + AC_REQUIRE([gl_SYS_SOCKET_H_DEFAULTS]) + AC_REQUIRE([AC_CANONICAL_HOST]) +@@ -156,32 +156,47 @@ AC_DEFUN([gl_PREREQ_SYS_H_WS2TCPIP], + AC_SUBST([HAVE_WS2TCPIP_H]) + ]) + ++# gl_SYS_SOCKET_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_SYS_SOCKET_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_SYS_SOCKET_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_SYS_SOCKET_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_SYS_SOCKET_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_SOCKET_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SOCKET]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CONNECT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ACCEPT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_BIND]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETPEERNAME]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETSOCKNAME]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETSOCKOPT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LISTEN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RECV]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SEND]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RECVFROM]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SENDTO]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETSOCKOPT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SHUTDOWN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ACCEPT4]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_SOCKET_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_SYS_SOCKET_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_SYS_SOCKET_H_DEFAULTS], + [ +- GNULIB_SOCKET=0; AC_SUBST([GNULIB_SOCKET]) +- GNULIB_CONNECT=0; AC_SUBST([GNULIB_CONNECT]) +- GNULIB_ACCEPT=0; AC_SUBST([GNULIB_ACCEPT]) +- GNULIB_BIND=0; AC_SUBST([GNULIB_BIND]) +- GNULIB_GETPEERNAME=0; AC_SUBST([GNULIB_GETPEERNAME]) +- GNULIB_GETSOCKNAME=0; AC_SUBST([GNULIB_GETSOCKNAME]) +- GNULIB_GETSOCKOPT=0; AC_SUBST([GNULIB_GETSOCKOPT]) +- GNULIB_LISTEN=0; AC_SUBST([GNULIB_LISTEN]) +- GNULIB_RECV=0; AC_SUBST([GNULIB_RECV]) +- GNULIB_SEND=0; AC_SUBST([GNULIB_SEND]) +- GNULIB_RECVFROM=0; AC_SUBST([GNULIB_RECVFROM]) +- GNULIB_SENDTO=0; AC_SUBST([GNULIB_SENDTO]) +- GNULIB_SETSOCKOPT=0; AC_SUBST([GNULIB_SETSOCKOPT]) +- GNULIB_SHUTDOWN=0; AC_SUBST([GNULIB_SHUTDOWN]) +- GNULIB_ACCEPT4=0; AC_SUBST([GNULIB_ACCEPT4]) + HAVE_STRUCT_SOCKADDR_STORAGE=1; AC_SUBST([HAVE_STRUCT_SOCKADDR_STORAGE]) + HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY=1; + AC_SUBST([HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY]) +diff --git a/m4/sys_stat_h.m4 b/m4/sys_stat_h.m4 +index 23cbdd2..ac91d42 100644 +--- a/m4/sys_stat_h.m4 ++++ b/m4/sys_stat_h.m4 +@@ -1,4 +1,4 @@ +-# sys_stat_h.m4 serial 38 -*- Autoconf -*- ++# sys_stat_h.m4 serial 41 -*- Autoconf -*- + dnl Copyright (C) 2006-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is preserved. + dnl From Eric Blake. + dnl Provide a GNU-like . + +-AC_DEFUN([gl_HEADER_SYS_STAT_H], ++AC_DEFUN_ONCE([gl_SYS_STAT_H], + [ + AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS]) + +@@ -52,38 +52,53 @@ AC_DEFUN([gl_HEADER_SYS_STAT_H], + AC_REQUIRE([AC_C_RESTRICT]) + ]) + ++# gl_SYS_STAT_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_SYS_STAT_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_SYS_STAT_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_SYS_STAT_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_STAT_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_UNISTD_H_REQUIRE_DEFAULTS dnl for REPLACE_FCHDIR ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FCHMODAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSTAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSTATAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FUTIMENS]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETUMASK]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LCHMOD]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LSTAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKDIR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKDIRAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKFIFO]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKFIFOAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKNOD]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKNODAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UTIMENSAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OVERRIDES_STRUCT_STAT]) ++ dnl Support Microsoft deprecated alias function names by default. ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_CHMOD], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_MKDIR], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_UMASK], [1]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_STAT_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_SYS_STAT_H_DEFAULTS], + [ +- AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) dnl for REPLACE_FCHDIR +- GNULIB_FCHMODAT=0; AC_SUBST([GNULIB_FCHMODAT]) +- GNULIB_FSTAT=0; AC_SUBST([GNULIB_FSTAT]) +- GNULIB_FSTATAT=0; AC_SUBST([GNULIB_FSTATAT]) +- GNULIB_FUTIMENS=0; AC_SUBST([GNULIB_FUTIMENS]) +- GNULIB_GETUMASK=0; AC_SUBST([GNULIB_GETUMASK]) +- GNULIB_LCHMOD=0; AC_SUBST([GNULIB_LCHMOD]) +- GNULIB_LSTAT=0; AC_SUBST([GNULIB_LSTAT]) +- GNULIB_MKDIR=0; AC_SUBST([GNULIB_MKDIR]) +- GNULIB_MKDIRAT=0; AC_SUBST([GNULIB_MKDIRAT]) +- GNULIB_MKFIFO=0; AC_SUBST([GNULIB_MKFIFO]) +- GNULIB_MKFIFOAT=0; AC_SUBST([GNULIB_MKFIFOAT]) +- GNULIB_MKNOD=0; AC_SUBST([GNULIB_MKNOD]) +- GNULIB_MKNODAT=0; AC_SUBST([GNULIB_MKNODAT]) +- GNULIB_STAT=0; AC_SUBST([GNULIB_STAT]) +- GNULIB_UTIMENSAT=0; AC_SUBST([GNULIB_UTIMENSAT]) +- GNULIB_OVERRIDES_STRUCT_STAT=0; AC_SUBST([GNULIB_OVERRIDES_STRUCT_STAT]) +- dnl Support Microsoft deprecated alias function names by default. +- GNULIB_MDA_CHMOD=1; AC_SUBST([GNULIB_MDA_CHMOD]) +- GNULIB_MDA_MKDIR=1; AC_SUBST([GNULIB_MDA_MKDIR]) +- GNULIB_MDA_UMASK=1; AC_SUBST([GNULIB_MDA_UMASK]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_FCHMODAT=1; AC_SUBST([HAVE_FCHMODAT]) + HAVE_FSTATAT=1; AC_SUBST([HAVE_FSTATAT]) +diff --git a/m4/sys_time_h.m4 b/m4/sys_time_h.m4 +index 64f133d..c425a96 100644 +--- a/m4/sys_time_h.m4 ++++ b/m4/sys_time_h.m4 +@@ -1,5 +1,5 @@ + # Configure a replacement for . +-# serial 9 ++# serial 12 + + # Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. + # This file is free software; the Free Software Foundation +@@ -8,18 +8,13 @@ + + # Written by Paul Eggert and Martin Lambers. + +-AC_DEFUN([gl_HEADER_SYS_TIME_H], ++AC_DEFUN_ONCE([gl_SYS_TIME_H], + [ + dnl Use AC_REQUIRE here, so that the REPLACE_GETTIMEOFDAY=0 statement + dnl below is expanded once only, before all REPLACE_GETTIMEOFDAY=1 + dnl statements that occur in other macros. +- AC_REQUIRE([gl_HEADER_SYS_TIME_H_BODY]) +-]) +- +-AC_DEFUN([gl_HEADER_SYS_TIME_H_BODY], +-[ ++ AC_REQUIRE([gl_SYS_TIME_H_DEFAULTS]) + AC_REQUIRE([AC_C_RESTRICT]) +- AC_REQUIRE([gl_HEADER_SYS_TIME_H_DEFAULTS]) + AC_CHECK_HEADERS_ONCE([sys/time.h]) + gl_CHECK_NEXT_HEADERS([sys/time.h]) + +@@ -89,18 +84,33 @@ AC_DEFUN([gl_HEADER_SYS_TIME_H_BODY], + ]], [gettimeofday]) + ]) + ++# gl_SYS_TIME_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_SYS_TIME_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_HEADER_SYS_TIME_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_SYS_TIME_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + +-AC_DEFUN([gl_HEADER_SYS_TIME_H_DEFAULTS], ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_SYS_TIME_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_TIME_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETTIMEOFDAY]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_TIME_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_SYS_TIME_H_DEFAULTS]) ++]) ++ ++AC_DEFUN([gl_SYS_TIME_H_DEFAULTS], + [ +- GNULIB_GETTIMEOFDAY=0; AC_SUBST([GNULIB_GETTIMEOFDAY]) + dnl Assume POSIX behavior unless another module says otherwise. + HAVE_GETTIMEOFDAY=1; AC_SUBST([HAVE_GETTIMEOFDAY]) + HAVE_STRUCT_TIMEVAL=1; AC_SUBST([HAVE_STRUCT_TIMEVAL]) +diff --git a/m4/sys_times_h.m4 b/m4/sys_times_h.m4 +index b9daaa7..577ead6 100644 +--- a/m4/sys_times_h.m4 ++++ b/m4/sys_times_h.m4 +@@ -1,5 +1,5 @@ + # Configure a replacement for . +-# serial 8 ++# serial 11 + + # Copyright (C) 2008-2021 Free Software Foundation, Inc. + # This file is free software; the Free Software Foundation +@@ -8,7 +8,7 @@ + + # Written by Simon Josefsson. + +-AC_DEFUN([gl_SYS_TIMES_H], ++AC_DEFUN_ONCE([gl_SYS_TIMES_H], + [ + AC_REQUIRE([gl_SYS_TIMES_H_DEFAULTS]) + +@@ -36,16 +36,31 @@ AC_DEFUN([gl_SYS_TIMES_H], + ]], [times]) + ]) + ++# gl_SYS_TIMES_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_SYS_TIMES_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_SYS_TIMES_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_SYS_TIMES_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_SYS_TIMES_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_TIMES_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIMES]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_TIMES_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_SYS_TIMES_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_SYS_TIMES_H_DEFAULTS], + [ +- GNULIB_TIMES=0; AC_SUBST([GNULIB_TIMES]) + HAVE_STRUCT_TMS=1; AC_SUBST([HAVE_STRUCT_TMS]) + HAVE_TIMES=1; AC_SUBST([HAVE_TIMES]) + ]) +diff --git a/m4/sys_types_h.m4 b/m4/sys_types_h.m4 +index 2172c83..6dd6fee 100644 +--- a/m4/sys_types_h.m4 ++++ b/m4/sys_types_h.m4 +@@ -1,4 +1,4 @@ +-# sys_types_h.m4 serial 11 ++# sys_types_h.m4 serial 13 + dnl Copyright (C) 2011-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -6,10 +6,11 @@ dnl with or without modifications, as long as this notice is preserved. + + AC_DEFUN_ONCE([gl_SYS_TYPES_H], + [ ++ AC_REQUIRE([gl_SYS_TYPES_H_DEFAULTS]) ++ + dnl Use sane struct stat types in OpenVMS 8.2 and later. + AC_DEFINE([_USE_STD_STAT], 1, [For standard stat data types on VMS.]) + +- AC_REQUIRE([gl_SYS_TYPES_H_DEFAULTS]) + gl_NEXT_HEADERS([sys/types.h]) + + dnl Ensure the type pid_t gets defined. +@@ -30,6 +31,17 @@ AC_DEFUN_ONCE([gl_SYS_TYPES_H], + AC_SUBST([WINDOWS_STAT_INODES]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_SYS_TYPES_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_TYPE_H_MODULE_INDICATOR_DEFAULTS], [ ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_TYPE_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_SYS_TYPES_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_SYS_TYPES_H_DEFAULTS], + [ + ]) +diff --git a/m4/sys_uio_h.m4 b/m4/sys_uio_h.m4 +index 503de4d..fa176e0 100644 +--- a/m4/sys_uio_h.m4 ++++ b/m4/sys_uio_h.m4 +@@ -1,10 +1,10 @@ +-# sys_uio_h.m4 serial 1 ++# sys_uio_h.m4 serial 3 + dnl Copyright (C) 2011-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. + +-AC_DEFUN([gl_HEADER_SYS_UIO], ++AC_DEFUN_ONCE([gl_SYS_UIO_H], + [ + AC_REQUIRE([gl_SYS_UIO_H_DEFAULTS]) + dnl is always overridden, because of GNULIB_POSIXCHECK. +@@ -17,15 +17,30 @@ AC_DEFUN([gl_HEADER_SYS_UIO], + AC_SUBST([HAVE_SYS_UIO_H]) + ]) + ++# gl_SYS_UIO_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_SYS_UIO_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_SYS_UIO_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_SYS_UIO_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_SYS_UIO_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_UIO_H_MODULE_INDICATOR_DEFAULTS], [ ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_UIO_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_SYS_UIO_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_SYS_UIO_H_DEFAULTS], + [ + ]) +diff --git a/m4/threadlib.m4 b/m4/threadlib.m4 +index 8fc3dfd..37b797c 100644 +--- a/m4/threadlib.m4 ++++ b/m4/threadlib.m4 +@@ -1,4 +1,4 @@ +-# threadlib.m4 serial 30 ++# threadlib.m4 serial 31 + dnl Copyright (C) 2005-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -212,6 +212,27 @@ AC_DEFUN([gl_PTHREADLIB_BODY], + LIBS=$save_LIBS + test $gl_pthread_api = yes && break + done ++ echo "$as_me:__oline__: gl_pthread_api=$gl_pthread_api" >&AS_MESSAGE_LOG_FD ++ echo "$as_me:__oline__: LIBPTHREAD=$LIBPTHREAD" >&AS_MESSAGE_LOG_FD ++ ++ gl_pthread_in_glibc=no ++ # On Linux with glibc >= 2.34, libc contains the fully functional ++ # pthread functions. ++ case "$host_os" in ++ linux*) ++ AC_EGREP_CPP([Lucky user], ++ [#include ++ #ifdef __GNU_LIBRARY__ ++ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 34) || (__GLIBC__ > 2) ++ Lucky user ++ #endif ++ #endif ++ ], ++ [gl_pthread_in_glibc=yes], ++ []) ++ ;; ++ esac ++ echo "$as_me:__oline__: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&AS_MESSAGE_LOG_FD + + # Test for libpthread by looking for pthread_kill. (Not pthread_self, + # since it is defined as a macro on OSF/1.) +@@ -219,18 +240,22 @@ AC_DEFUN([gl_PTHREADLIB_BODY], + # The program links fine without libpthread. But it may actually + # need to link with libpthread in order to create multiple threads. + AC_CHECK_LIB([pthread], [pthread_kill], +- [LIBPMULTITHREAD=-lpthread +- # On Solaris and HP-UX, most pthread functions exist also in libc. +- # Therefore pthread_in_use() needs to actually try to create a +- # thread: pthread_create from libc will fail, whereas +- # pthread_create will actually create a thread. +- # On Solaris 10 or newer, this test is no longer needed, because +- # libc contains the fully functional pthread functions. +- case "$host_os" in +- solaris | solaris2.[1-9] | solaris2.[1-9].* | hpux*) +- AC_DEFINE([PTHREAD_IN_USE_DETECTION_HARD], [1], +- [Define if the pthread_in_use() detection is hard.]) +- esac ++ [if test $gl_pthread_in_glibc = yes; then ++ LIBPMULTITHREAD= ++ else ++ LIBPMULTITHREAD=-lpthread ++ # On Solaris and HP-UX, most pthread functions exist also in libc. ++ # Therefore pthread_in_use() needs to actually try to create a ++ # thread: pthread_create from libc will fail, whereas ++ # pthread_create will actually create a thread. ++ # On Solaris 10 or newer, this test is no longer needed, because ++ # libc contains the fully functional pthread functions. ++ case "$host_os" in ++ solaris | solaris2.[1-9] | solaris2.[1-9].* | hpux*) ++ AC_DEFINE([PTHREAD_IN_USE_DETECTION_HARD], [1], ++ [Define if the pthread_in_use() detection is hard.]) ++ esac ++ fi + ]) + elif test $gl_pthread_api != yes; then + # Some library is needed. Try libpthread and libc_r. +@@ -246,6 +271,7 @@ AC_DEFUN([gl_PTHREADLIB_BODY], + LIBPMULTITHREAD=-lc_r]) + fi + fi ++ echo "$as_me:__oline__: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&AS_MESSAGE_LOG_FD + fi + AC_MSG_CHECKING([whether POSIX threads API is available]) + AC_MSG_RESULT([$gl_pthread_api]) +@@ -311,7 +337,8 @@ AC_DEFUN([gl_STDTHREADLIB_BODY], + dnl glibc >= 2.29 has thrd_create in libpthread. + dnl FreeBSD >= 10 has thrd_create in libstdthreads; this library depends + dnl on libpthread (for the symbol 'pthread_mutexattr_gettype'). +- dnl AIX >= 7.1 and Solaris >= 11.4 have thrd_create in libc. ++ dnl glibc >= 2.34, AIX >= 7.1, and Solaris >= 11.4 have thrd_create in ++ dnl libc. + AC_CHECK_FUNCS([thrd_create]) + if test $ac_cv_func_thrd_create = yes; then + LIBSTDTHREAD= +@@ -481,7 +508,10 @@ AC_DEFUN([gl_THREADLIB_BODY], + gl_threads_api=posix + AC_DEFINE([USE_POSIX_THREADS], [1], + [Define if the POSIX multithreading library can be used.]) +- if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then ++ if test -z "$LIBMULTITHREAD" && test -z "$LTLIBMULTITHREAD"; then ++ AC_DEFINE([USE_POSIX_THREADS_FROM_LIBC], [1], ++ [Define if references to the POSIX multithreading library are satisfied by libc.]) ++ else + if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then + AC_DEFINE([USE_POSIX_THREADS_WEAK], [1], + [Define if references to the POSIX multithreading library should be made weak.]) +@@ -576,7 +606,9 @@ dnl flavours option weak result + dnl --------------- --------- --------- -------- --------- + dnl Linux 2.4/glibc posix -lpthread Y OK + dnl +-dnl GNU Hurd/glibc posix ++dnl Linux/glibc 2.34 posix Y OK ++dnl ++dnl GNU Hurd/glibc posix -lpthread Y OK + dnl + dnl Ubuntu 14.04 posix -pthread Y OK + dnl +diff --git a/m4/time_h.m4 b/m4/time_h.m4 +index b6a1aa3..b57474b 100644 +--- a/m4/time_h.m4 ++++ b/m4/time_h.m4 +@@ -2,7 +2,7 @@ + + # Copyright (C) 2000-2001, 2003-2007, 2009-2021 Free Software Foundation, Inc. + +-# serial 15 ++# serial 18 + + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -10,16 +10,11 @@ + + # Written by Paul Eggert and Jim Meyering. + +-AC_DEFUN([gl_HEADER_TIME_H], ++AC_DEFUN_ONCE([gl_TIME_H], + [ +- dnl Use AC_REQUIRE here, so that the default behavior below is expanded +- dnl once only, before all statements that occur in other macros. +- AC_REQUIRE([gl_HEADER_TIME_H_BODY]) +-]) +- +-AC_DEFUN([gl_HEADER_TIME_H_BODY], +-[ +- AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only, before all statements ++ dnl that occur in other macros. ++ AC_REQUIRE([gl_TIME_H_DEFAULTS]) + + gl_NEXT_HEADERS([time.h]) + AC_REQUIRE([gl_CHECK_TYPE_STRUCT_TIMESPEC]) +@@ -111,30 +106,45 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_TIMESPEC], + AC_SUBST([UNISTD_H_DEFINES_STRUCT_TIMESPEC]) + ]) + ++# gl_TIME_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_TIME_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_TIME_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + +-AC_DEFUN([gl_HEADER_TIME_H_DEFAULTS], ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_TIME_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_TIME_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CTIME]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKTIME]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOCALTIME]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_NANOSLEEP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRFTIME]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRPTIME]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIMEGM]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIMESPEC_GET]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIME_R]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIME_RZ]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TZSET]) ++ dnl Support Microsoft deprecated alias function names by default. ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_TZSET], [1]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_TIME_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_TIME_H_DEFAULTS]) ++]) ++ ++AC_DEFUN([gl_TIME_H_DEFAULTS], + [ +- GNULIB_CTIME=0; AC_SUBST([GNULIB_CTIME]) +- GNULIB_MKTIME=0; AC_SUBST([GNULIB_MKTIME]) +- GNULIB_LOCALTIME=0; AC_SUBST([GNULIB_LOCALTIME]) +- GNULIB_NANOSLEEP=0; AC_SUBST([GNULIB_NANOSLEEP]) +- GNULIB_STRFTIME=0; AC_SUBST([GNULIB_STRFTIME]) +- GNULIB_STRPTIME=0; AC_SUBST([GNULIB_STRPTIME]) +- GNULIB_TIMEGM=0; AC_SUBST([GNULIB_TIMEGM]) +- GNULIB_TIMESPEC_GET=0; AC_SUBST([GNULIB_TIMESPEC_GET]) +- GNULIB_TIME_R=0; AC_SUBST([GNULIB_TIME_R]) +- GNULIB_TIME_RZ=0; AC_SUBST([GNULIB_TIME_RZ]) +- GNULIB_TZSET=0; AC_SUBST([GNULIB_TZSET]) +- dnl Support Microsoft deprecated alias function names by default. +- GNULIB_MDA_TZSET=1; AC_SUBST([GNULIB_MDA_TZSET]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_DECL_LOCALTIME_R=1; AC_SUBST([HAVE_DECL_LOCALTIME_R]) + HAVE_NANOSLEEP=1; AC_SUBST([HAVE_NANOSLEEP]) +diff --git a/m4/time_r.m4 b/m4/time_r.m4 +index 713e93a..2d49b64 100644 +--- a/m4/time_r.m4 ++++ b/m4/time_r.m4 +@@ -12,7 +12,7 @@ AC_DEFUN([gl_TIME_R], + dnl Persuade glibc and Solaris to declare localtime_r. + AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) + +- AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) ++ AC_REQUIRE([gl_TIME_H_DEFAULTS]) + AC_REQUIRE([AC_C_RESTRICT]) + + dnl Some systems don't declare localtime_r() and gmtime_r() if _REENTRANT is +diff --git a/m4/time_rz.m4 b/m4/time_rz.m4 +index 34ef0ba..c5e85dc 100644 +--- a/m4/time_rz.m4 ++++ b/m4/time_rz.m4 +@@ -10,7 +10,7 @@ dnl Written by Paul Eggert. + AC_DEFUN([gl_TIME_RZ], + [ + AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) +- AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) ++ AC_REQUIRE([gl_TIME_H_DEFAULTS]) + AC_REQUIRE([AC_STRUCT_TIMEZONE]) + + # On Mac OS X 10.6, localtime loops forever with some time_t values. +diff --git a/m4/timegm.m4 b/m4/timegm.m4 +index 098c857..58123be 100644 +--- a/m4/timegm.m4 ++++ b/m4/timegm.m4 +@@ -1,4 +1,4 @@ +-# timegm.m4 serial 12 ++# timegm.m4 serial 13 + dnl Copyright (C) 2003, 2007, 2009-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is preserved. + + AC_DEFUN([gl_FUNC_TIMEGM], + [ +- AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) ++ AC_REQUIRE([gl_TIME_H_DEFAULTS]) + AC_REQUIRE([gl_FUNC_MKTIME_WORKS]) + REPLACE_TIMEGM=0 + AC_CHECK_FUNCS_ONCE([timegm]) +diff --git a/m4/tzset.m4 b/m4/tzset.m4 +index 8eaf41f..8a4f285 100644 +--- a/m4/tzset.m4 ++++ b/m4/tzset.m4 +@@ -1,4 +1,4 @@ +-# serial 15 ++# serial 16 + + # Copyright (C) 2003, 2007, 2009-2021 Free Software Foundation, Inc. + # This file is free software; the Free Software Foundation +@@ -9,7 +9,7 @@ + + AC_DEFUN([gl_FUNC_TZSET], + [ +- AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) ++ AC_REQUIRE([gl_TIME_H_DEFAULTS]) + AC_REQUIRE([AC_CANONICAL_HOST]) + REPLACE_TZSET=0 + case "$host_os" in +diff --git a/m4/unistd_h.m4 b/m4/unistd_h.m4 +index 0f26fb9..0ce4ea4 100644 +--- a/m4/unistd_h.m4 ++++ b/m4/unistd_h.m4 +@@ -1,4 +1,4 @@ +-# unistd_h.m4 serial 85 ++# unistd_h.m4 serial 89 + dnl Copyright (C) 2006-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -6,10 +6,10 @@ dnl with or without modifications, as long as this notice is preserved. + + dnl Written by Simon Josefsson, Bruno Haible. + +-AC_DEFUN([gl_UNISTD_H], ++AC_DEFUN_ONCE([gl_UNISTD_H], + [ +- dnl Use AC_REQUIRE here, so that the default behavior below is expanded +- dnl once only, before all statements that occur in other macros. ++ dnl Ensure to expand the default settings once only, before all statements ++ dnl that occur in other macros. + AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) + + gl_CHECK_NEXT_HEADERS([unistd.h]) +@@ -59,100 +59,116 @@ AC_DEFUN([gl_UNISTD_H], + fi + ]) + ++# gl_UNISTD_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_UNISTD_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_UNISTD_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_UNISTD_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_UNISTD_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ACCESS]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CHDIR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CHOWN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CLOSE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_COPY_FILE_RANGE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DUP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DUP2]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DUP3]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ENVIRON]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EUIDACCESS]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECLE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECLP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECV]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECVE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECVP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECVPE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FACCESSAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FCHDIR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FCHOWNAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FDATASYNC]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSYNC]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FTRUNCATE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETCWD]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETDOMAINNAME]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETDTABLESIZE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETENTROPY]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETGROUPS]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETHOSTNAME]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETLOGIN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETLOGIN_R]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETOPT_POSIX]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETPAGESIZE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETPASS]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETUSERSHELL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GROUP_MEMBER]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISATTY]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LCHOWN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LINK]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LINKAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LSEEK]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PIPE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PIPE2]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PREAD]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PWRITE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_READ]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_READLINK]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_READLINKAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RMDIR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETHOSTNAME]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SLEEP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SYMLINK]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SYMLINKAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TRUNCATE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TTYNAME_R]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNISTD_H_GETOPT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNISTD_H_NONBLOCKING]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNISTD_H_SIGPIPE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNLINK]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNLINKAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_USLEEP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WRITE]) ++ dnl Support Microsoft deprecated alias function names by default. ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_ACCESS], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_CHDIR], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_CLOSE], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_DUP], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_DUP2], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECL], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECLE], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECLP], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECV], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECVE], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECVP], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECVPE], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_GETCWD], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_GETPID], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_ISATTY], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_LSEEK], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_READ], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_RMDIR], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_SWAB], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_UNLINK], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_WRITE], [1]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_UNISTD_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_UNISTD_H_DEFAULTS], + [ +- GNULIB_ACCESS=0; AC_SUBST([GNULIB_ACCESS]) +- GNULIB_CHDIR=0; AC_SUBST([GNULIB_CHDIR]) +- GNULIB_CHOWN=0; AC_SUBST([GNULIB_CHOWN]) +- GNULIB_CLOSE=0; AC_SUBST([GNULIB_CLOSE]) +- GNULIB_COPY_FILE_RANGE=0; AC_SUBST([GNULIB_COPY_FILE_RANGE]) +- GNULIB_DUP=0; AC_SUBST([GNULIB_DUP]) +- GNULIB_DUP2=0; AC_SUBST([GNULIB_DUP2]) +- GNULIB_DUP3=0; AC_SUBST([GNULIB_DUP3]) +- GNULIB_ENVIRON=0; AC_SUBST([GNULIB_ENVIRON]) +- GNULIB_EUIDACCESS=0; AC_SUBST([GNULIB_EUIDACCESS]) +- GNULIB_EXECL=0; AC_SUBST([GNULIB_EXECL]) +- GNULIB_EXECLE=0; AC_SUBST([GNULIB_EXECLE]) +- GNULIB_EXECLP=0; AC_SUBST([GNULIB_EXECLP]) +- GNULIB_EXECV=0; AC_SUBST([GNULIB_EXECV]) +- GNULIB_EXECVE=0; AC_SUBST([GNULIB_EXECVE]) +- GNULIB_EXECVP=0; AC_SUBST([GNULIB_EXECVP]) +- GNULIB_EXECVPE=0; AC_SUBST([GNULIB_EXECVPE]) +- GNULIB_FACCESSAT=0; AC_SUBST([GNULIB_FACCESSAT]) +- GNULIB_FCHDIR=0; AC_SUBST([GNULIB_FCHDIR]) +- GNULIB_FCHOWNAT=0; AC_SUBST([GNULIB_FCHOWNAT]) +- GNULIB_FDATASYNC=0; AC_SUBST([GNULIB_FDATASYNC]) +- GNULIB_FSYNC=0; AC_SUBST([GNULIB_FSYNC]) +- GNULIB_FTRUNCATE=0; AC_SUBST([GNULIB_FTRUNCATE]) +- GNULIB_GETCWD=0; AC_SUBST([GNULIB_GETCWD]) +- GNULIB_GETDOMAINNAME=0; AC_SUBST([GNULIB_GETDOMAINNAME]) +- GNULIB_GETDTABLESIZE=0; AC_SUBST([GNULIB_GETDTABLESIZE]) +- GNULIB_GETENTROPY=0; AC_SUBST([GNULIB_GETENTROPY]) +- GNULIB_GETGROUPS=0; AC_SUBST([GNULIB_GETGROUPS]) +- GNULIB_GETHOSTNAME=0; AC_SUBST([GNULIB_GETHOSTNAME]) +- GNULIB_GETLOGIN=0; AC_SUBST([GNULIB_GETLOGIN]) +- GNULIB_GETLOGIN_R=0; AC_SUBST([GNULIB_GETLOGIN_R]) +- GNULIB_GETOPT_POSIX=0; AC_SUBST([GNULIB_GETOPT_POSIX]) +- GNULIB_GETPAGESIZE=0; AC_SUBST([GNULIB_GETPAGESIZE]) +- GNULIB_GETPASS=0; AC_SUBST([GNULIB_GETPASS]) +- GNULIB_GETUSERSHELL=0; AC_SUBST([GNULIB_GETUSERSHELL]) +- GNULIB_GROUP_MEMBER=0; AC_SUBST([GNULIB_GROUP_MEMBER]) +- GNULIB_ISATTY=0; AC_SUBST([GNULIB_ISATTY]) +- GNULIB_LCHOWN=0; AC_SUBST([GNULIB_LCHOWN]) +- GNULIB_LINK=0; AC_SUBST([GNULIB_LINK]) +- GNULIB_LINKAT=0; AC_SUBST([GNULIB_LINKAT]) +- GNULIB_LSEEK=0; AC_SUBST([GNULIB_LSEEK]) +- GNULIB_PIPE=0; AC_SUBST([GNULIB_PIPE]) +- GNULIB_PIPE2=0; AC_SUBST([GNULIB_PIPE2]) +- GNULIB_PREAD=0; AC_SUBST([GNULIB_PREAD]) +- GNULIB_PWRITE=0; AC_SUBST([GNULIB_PWRITE]) +- GNULIB_READ=0; AC_SUBST([GNULIB_READ]) +- GNULIB_READLINK=0; AC_SUBST([GNULIB_READLINK]) +- GNULIB_READLINKAT=0; AC_SUBST([GNULIB_READLINKAT]) +- GNULIB_RMDIR=0; AC_SUBST([GNULIB_RMDIR]) +- GNULIB_SETHOSTNAME=0; AC_SUBST([GNULIB_SETHOSTNAME]) +- GNULIB_SLEEP=0; AC_SUBST([GNULIB_SLEEP]) +- GNULIB_SYMLINK=0; AC_SUBST([GNULIB_SYMLINK]) +- GNULIB_SYMLINKAT=0; AC_SUBST([GNULIB_SYMLINKAT]) +- GNULIB_TRUNCATE=0; AC_SUBST([GNULIB_TRUNCATE]) +- GNULIB_TTYNAME_R=0; AC_SUBST([GNULIB_TTYNAME_R]) +- GNULIB_UNISTD_H_NONBLOCKING=0; AC_SUBST([GNULIB_UNISTD_H_NONBLOCKING]) +- GNULIB_UNISTD_H_SIGPIPE=0; AC_SUBST([GNULIB_UNISTD_H_SIGPIPE]) +- GNULIB_UNLINK=0; AC_SUBST([GNULIB_UNLINK]) +- GNULIB_UNLINKAT=0; AC_SUBST([GNULIB_UNLINKAT]) +- GNULIB_USLEEP=0; AC_SUBST([GNULIB_USLEEP]) +- GNULIB_WRITE=0; AC_SUBST([GNULIB_WRITE]) +- dnl Support Microsoft deprecated alias function names by default. +- GNULIB_MDA_ACCESS=1; AC_SUBST([GNULIB_MDA_ACCESS]) +- GNULIB_MDA_CHDIR=1; AC_SUBST([GNULIB_MDA_CHDIR]) +- GNULIB_MDA_CLOSE=1; AC_SUBST([GNULIB_MDA_CLOSE]) +- GNULIB_MDA_DUP=1; AC_SUBST([GNULIB_MDA_DUP]) +- GNULIB_MDA_DUP2=1; AC_SUBST([GNULIB_MDA_DUP2]) +- GNULIB_MDA_EXECL=1; AC_SUBST([GNULIB_MDA_EXECL]) +- GNULIB_MDA_EXECLE=1; AC_SUBST([GNULIB_MDA_EXECLE]) +- GNULIB_MDA_EXECLP=1; AC_SUBST([GNULIB_MDA_EXECLP]) +- GNULIB_MDA_EXECV=1; AC_SUBST([GNULIB_MDA_EXECV]) +- GNULIB_MDA_EXECVE=1; AC_SUBST([GNULIB_MDA_EXECVE]) +- GNULIB_MDA_EXECVP=1; AC_SUBST([GNULIB_MDA_EXECVP]) +- GNULIB_MDA_EXECVPE=1; AC_SUBST([GNULIB_MDA_EXECVPE]) +- GNULIB_MDA_GETCWD=1; AC_SUBST([GNULIB_MDA_GETCWD]) +- GNULIB_MDA_GETPID=1; AC_SUBST([GNULIB_MDA_GETPID]) +- GNULIB_MDA_ISATTY=1; AC_SUBST([GNULIB_MDA_ISATTY]) +- GNULIB_MDA_LSEEK=1; AC_SUBST([GNULIB_MDA_LSEEK]) +- GNULIB_MDA_READ=1; AC_SUBST([GNULIB_MDA_READ]) +- GNULIB_MDA_RMDIR=1; AC_SUBST([GNULIB_MDA_RMDIR]) +- GNULIB_MDA_SWAB=1; AC_SUBST([GNULIB_MDA_SWAB]) +- GNULIB_MDA_UNLINK=1; AC_SUBST([GNULIB_MDA_UNLINK]) +- GNULIB_MDA_WRITE=1; AC_SUBST([GNULIB_MDA_WRITE]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_CHOWN=1; AC_SUBST([HAVE_CHOWN]) + HAVE_COPY_FILE_RANGE=1; AC_SUBST([HAVE_COPY_FILE_RANGE]) +diff --git a/m4/visibility.m4 b/m4/visibility.m4 +index 8f27a12..d161bd7 100644 +--- a/m4/visibility.m4 ++++ b/m4/visibility.m4 +@@ -1,4 +1,4 @@ +-# visibility.m4 serial 7 ++# visibility.m4 serial 8 + dnl Copyright (C) 2005, 2008, 2010-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -59,6 +59,10 @@ AC_DEFUN([gl_VISIBILITY], + extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void); + extern __attribute__((__visibility__("default"))) int exportedfunc (void); + void dummyfunc (void); ++ int hiddenvar; ++ int exportedvar; ++ int hiddenfunc (void) { return 51; } ++ int exportedfunc (void) { return 1225736919; } + void dummyfunc (void) {} + ]], + [[]])], +diff --git a/m4/wchar_h.m4 b/m4/wchar_h.m4 +index 59c55fc..818b319 100644 +--- a/m4/wchar_h.m4 ++++ b/m4/wchar_h.m4 +@@ -7,9 +7,9 @@ dnl with or without modifications, as long as this notice is preserved. + + dnl Written by Eric Blake. + +-# wchar_h.m4 serial 50 ++# wchar_h.m4 serial 53 + +-AC_DEFUN([gl_WCHAR_H], ++AC_DEFUN_ONCE([gl_WCHAR_H], + [ + AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) + AC_REQUIRE([gl_WCHAR_H_INLINE_OK]) +@@ -125,60 +125,75 @@ Configuration aborted.]) + fi + ]) + ++# gl_WCHAR_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_WCHAR_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_WCHAR_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_WCHAR_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_WCHAR_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_BTOWC]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCTOB]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSINIT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBRTOWC]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBRLEN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSRTOWCS]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSNRTOWCS]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCRTOMB]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSRTOMBS]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNRTOMBS]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCWIDTH]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMCHR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMCMP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMCPY]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMMOVE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMPCPY]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMSET]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSLEN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNLEN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCPY]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCPCPY]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNCPY]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCPNCPY]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNCAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCMP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNCMP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCASECMP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNCASECMP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCOLL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSXFRM]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSDUP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCHR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSRCHR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCSPN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSSPN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSPBRK]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSSTR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSTOK]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSWIDTH]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSFTIME]) ++ dnl Support Microsoft deprecated alias function names by default. ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_WCSDUP], [1]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_WCHAR_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_WCHAR_H_DEFAULTS], + [ +- GNULIB_BTOWC=0; AC_SUBST([GNULIB_BTOWC]) +- GNULIB_WCTOB=0; AC_SUBST([GNULIB_WCTOB]) +- GNULIB_MBSINIT=0; AC_SUBST([GNULIB_MBSINIT]) +- GNULIB_MBRTOWC=0; AC_SUBST([GNULIB_MBRTOWC]) +- GNULIB_MBRLEN=0; AC_SUBST([GNULIB_MBRLEN]) +- GNULIB_MBSRTOWCS=0; AC_SUBST([GNULIB_MBSRTOWCS]) +- GNULIB_MBSNRTOWCS=0; AC_SUBST([GNULIB_MBSNRTOWCS]) +- GNULIB_WCRTOMB=0; AC_SUBST([GNULIB_WCRTOMB]) +- GNULIB_WCSRTOMBS=0; AC_SUBST([GNULIB_WCSRTOMBS]) +- GNULIB_WCSNRTOMBS=0; AC_SUBST([GNULIB_WCSNRTOMBS]) +- GNULIB_WCWIDTH=0; AC_SUBST([GNULIB_WCWIDTH]) +- GNULIB_WMEMCHR=0; AC_SUBST([GNULIB_WMEMCHR]) +- GNULIB_WMEMCMP=0; AC_SUBST([GNULIB_WMEMCMP]) +- GNULIB_WMEMCPY=0; AC_SUBST([GNULIB_WMEMCPY]) +- GNULIB_WMEMMOVE=0; AC_SUBST([GNULIB_WMEMMOVE]) +- GNULIB_WMEMPCPY=0; AC_SUBST([GNULIB_WMEMPCPY]) +- GNULIB_WMEMSET=0; AC_SUBST([GNULIB_WMEMSET]) +- GNULIB_WCSLEN=0; AC_SUBST([GNULIB_WCSLEN]) +- GNULIB_WCSNLEN=0; AC_SUBST([GNULIB_WCSNLEN]) +- GNULIB_WCSCPY=0; AC_SUBST([GNULIB_WCSCPY]) +- GNULIB_WCPCPY=0; AC_SUBST([GNULIB_WCPCPY]) +- GNULIB_WCSNCPY=0; AC_SUBST([GNULIB_WCSNCPY]) +- GNULIB_WCPNCPY=0; AC_SUBST([GNULIB_WCPNCPY]) +- GNULIB_WCSCAT=0; AC_SUBST([GNULIB_WCSCAT]) +- GNULIB_WCSNCAT=0; AC_SUBST([GNULIB_WCSNCAT]) +- GNULIB_WCSCMP=0; AC_SUBST([GNULIB_WCSCMP]) +- GNULIB_WCSNCMP=0; AC_SUBST([GNULIB_WCSNCMP]) +- GNULIB_WCSCASECMP=0; AC_SUBST([GNULIB_WCSCASECMP]) +- GNULIB_WCSNCASECMP=0; AC_SUBST([GNULIB_WCSNCASECMP]) +- GNULIB_WCSCOLL=0; AC_SUBST([GNULIB_WCSCOLL]) +- GNULIB_WCSXFRM=0; AC_SUBST([GNULIB_WCSXFRM]) +- GNULIB_WCSDUP=0; AC_SUBST([GNULIB_WCSDUP]) +- GNULIB_WCSCHR=0; AC_SUBST([GNULIB_WCSCHR]) +- GNULIB_WCSRCHR=0; AC_SUBST([GNULIB_WCSRCHR]) +- GNULIB_WCSCSPN=0; AC_SUBST([GNULIB_WCSCSPN]) +- GNULIB_WCSSPN=0; AC_SUBST([GNULIB_WCSSPN]) +- GNULIB_WCSPBRK=0; AC_SUBST([GNULIB_WCSPBRK]) +- GNULIB_WCSSTR=0; AC_SUBST([GNULIB_WCSSTR]) +- GNULIB_WCSTOK=0; AC_SUBST([GNULIB_WCSTOK]) +- GNULIB_WCSWIDTH=0; AC_SUBST([GNULIB_WCSWIDTH]) +- GNULIB_WCSFTIME=0; AC_SUBST([GNULIB_WCSFTIME]) +- dnl Support Microsoft deprecated alias function names by default. +- GNULIB_MDA_WCSDUP=1; AC_SUBST([GNULIB_MDA_WCSDUP]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_BTOWC=1; AC_SUBST([HAVE_BTOWC]) + HAVE_MBSINIT=1; AC_SUBST([HAVE_MBSINIT]) +diff --git a/m4/wctype_h.m4 b/m4/wctype_h.m4 +index 1ab0bc9..7d74212 100644 +--- a/m4/wctype_h.m4 ++++ b/m4/wctype_h.m4 +@@ -1,4 +1,4 @@ +-# wctype_h.m4 serial 26 ++# wctype_h.m4 serial 30 + + dnl A placeholder for ISO C99 , for platforms that lack it. + +@@ -9,7 +9,7 @@ dnl with or without modifications, as long as this notice is preserved. + + dnl Written by Paul Eggert. + +-AC_DEFUN([gl_WCTYPE_H], ++AC_DEFUN_ONCE([gl_WCTYPE_H], + [ + AC_REQUIRE([gl_WCTYPE_H_DEFAULTS]) + AC_REQUIRE([AC_PROG_CC]) +@@ -62,7 +62,7 @@ AC_DEFUN([gl_WCTYPE_H], + fi + AC_SUBST([HAVE_WCTYPE_H]) + +- if test $GNULIB_OVERRIDES_WINT_T = 1; then ++ if test $GNULIBHEADERS_OVERRIDE_WINT_T = 1; then + REPLACE_ISWCNTRL=1 + else + case "$gl_cv_func_iswcntrl_works" in +@@ -157,24 +157,39 @@ AC_DEFUN([gl_WCTYPE_H], + ]) + ]) + ++# gl_WCTYPE_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_WCTYPE_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_WCTYPE_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_WCTYPE_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_WCTYPE_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_WCTYPE_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISWBLANK]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISWDIGIT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISWXDIGIT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCTYPE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISWCTYPE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCTRANS]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TOWCTRANS]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_WCTYPE_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_WCTYPE_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_WCTYPE_H_DEFAULTS], + [ +- GNULIB_ISWBLANK=0; AC_SUBST([GNULIB_ISWBLANK]) +- GNULIB_ISWDIGIT=0; AC_SUBST([GNULIB_ISWDIGIT]) +- GNULIB_ISWXDIGIT=0; AC_SUBST([GNULIB_ISWXDIGIT]) +- GNULIB_WCTYPE=0; AC_SUBST([GNULIB_WCTYPE]) +- GNULIB_ISWCTYPE=0; AC_SUBST([GNULIB_ISWCTYPE]) +- GNULIB_WCTRANS=0; AC_SUBST([GNULIB_WCTRANS]) +- GNULIB_TOWCTRANS=0; AC_SUBST([GNULIB_TOWCTRANS]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_ISWBLANK=1; AC_SUBST([HAVE_ISWBLANK]) + HAVE_WCTYPE_T=1; AC_SUBST([HAVE_WCTYPE_T]) +diff --git a/m4/wint_t.m4 b/m4/wint_t.m4 +index 2fc7467..a49c508 100644 +--- a/m4/wint_t.m4 ++++ b/m4/wint_t.m4 +@@ -1,4 +1,4 @@ +-# wint_t.m4 serial 10 ++# wint_t.m4 serial 11 + dnl Copyright (C) 2003, 2007-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -34,14 +34,14 @@ AC_DEFUN([gt_TYPE_WINT_T], + [gl_cv_type_wint_t_large_enough=yes], + [gl_cv_type_wint_t_large_enough=no])]) + if test $gl_cv_type_wint_t_large_enough = no; then +- GNULIB_OVERRIDES_WINT_T=1 ++ GNULIBHEADERS_OVERRIDE_WINT_T=1 + else +- GNULIB_OVERRIDES_WINT_T=0 ++ GNULIBHEADERS_OVERRIDE_WINT_T=0 + fi + else +- GNULIB_OVERRIDES_WINT_T=0 ++ GNULIBHEADERS_OVERRIDE_WINT_T=0 + fi +- AC_SUBST([GNULIB_OVERRIDES_WINT_T]) ++ AC_SUBST([GNULIBHEADERS_OVERRIDE_WINT_T]) + ]) + + dnl Prerequisites of the 'wint_t' override. +diff --git a/m4/year2038.m4 b/m4/year2038.m4 +new file mode 100644 +index 0000000..da0f8d7 +--- /dev/null ++++ b/m4/year2038.m4 +@@ -0,0 +1,124 @@ ++# year2038.m4 serial 7 ++dnl Copyright (C) 2017-2021 Free Software Foundation, Inc. ++dnl This file is free software; the Free Software Foundation ++dnl gives unlimited permission to copy and/or distribute it, ++dnl with or without modifications, as long as this notice is preserved. ++ ++dnl Attempt to ensure that 'time_t' can go past the year 2038 and that ++dnl the functions 'time', 'stat', etc. work with post-2038 timestamps. ++ ++AC_DEFUN([gl_YEAR2038_EARLY], ++[ ++ AC_REQUIRE([AC_CANONICAL_HOST]) ++ case "$host_os" in ++ mingw*) ++ AC_DEFINE([__MINGW_USE_VC2005_COMPAT], [1], ++ [For 64-bit time_t on 32-bit mingw.]) ++ ;; ++ esac ++]) ++ ++# gl_YEAR2038_TEST_INCLUDES ++# ------------------------- ++AC_DEFUN([gl_YEAR2038_TEST_INCLUDES], ++[[ ++ #include ++ /* Check that time_t can represent 2**32 - 1 correctly. */ ++ #define LARGE_TIME_T \\ ++ ((time_t) (((time_t) 1 << 30) - 1 + 3 * ((time_t) 1 << 30))) ++ int verify_time_t_range[(LARGE_TIME_T / 65537 == 65535 ++ && LARGE_TIME_T % 65537 == 0) ++ ? 1 : -1]; ++]]) ++ ++# gl_YEAR2038_BODY(REQUIRE-YEAR2038-SAFE) ++----------------------------------------- ++AC_DEFUN([gl_YEAR2038_BODY], ++[ ++ AC_ARG_ENABLE([year2038], ++ [ --disable-year2038 omit support for timestamps past the year 2038]) ++ AS_IF([test "$enable_year2038" != no], ++ [ ++ dnl On many systems, time_t is already a 64-bit type. ++ dnl On those systems where time_t is still 32-bit, it requires kernel ++ dnl and libc support to make it 64-bit. For glibc 2.34 and later on Linux, ++ dnl defining _TIME_BITS=64 and _FILE_OFFSET_BITS=64 is needed on x86 and ARM. ++ dnl ++ dnl On native Windows, the system include files define types __time32_t ++ dnl and __time64_t. By default, time_t is an alias of ++ dnl - __time32_t on 32-bit mingw, ++ dnl - __time64_t on 64-bit mingw and on MSVC (since MSVC 8). ++ dnl But when compiling with -D__MINGW_USE_VC2005_COMPAT, time_t is an ++ dnl alias of __time64_t. ++ dnl And when compiling with -D_USE_32BIT_TIME_T, time_t is an alias of ++ dnl __time32_t. ++ AC_CACHE_CHECK([for time_t past the year 2038], [gl_cv_type_time_t_y2038], ++ [AC_COMPILE_IFELSE( ++ [AC_LANG_SOURCE([gl_YEAR2038_TEST_INCLUDES])], ++ [gl_cv_type_time_t_y2038=yes], [gl_cv_type_time_t_y2038=no]) ++ ]) ++ if test "$gl_cv_type_time_t_y2038" = no; then ++ AC_CACHE_CHECK([for 64-bit time_t with _TIME_BITS=64], ++ [gl_cv_type_time_t_bits_macro], ++ [AC_COMPILE_IFELSE( ++ [AC_LANG_SOURCE([[#define _TIME_BITS 64 ++ #define _FILE_OFFSET_BITS 64 ++ ]gl_YEAR2038_TEST_INCLUDES])], ++ [gl_cv_type_time_t_bits_macro=yes], ++ [gl_cv_type_time_t_bits_macro=no]) ++ ]) ++ if test "$gl_cv_type_time_t_bits_macro" = yes; then ++ AC_DEFINE([_TIME_BITS], [64], ++ [Number of bits in a timestamp, on hosts where this is settable.]) ++ dnl AC_SYS_LARGFILE also defines this; it's OK if we do too. ++ AC_DEFINE([_FILE_OFFSET_BITS], [64], ++ [Number of bits in a file offset, on hosts where this is settable.]) ++ gl_cv_type_time_t_y2038=yes ++ fi ++ fi ++ if test $gl_cv_type_time_t_y2038 = no; then ++ AC_COMPILE_IFELSE( ++ [AC_LANG_SOURCE( ++ [[#ifdef _USE_32BIT_TIME_T ++ int ok; ++ #else ++ error fail ++ #endif ++ ]])], ++ [AC_MSG_FAILURE( ++ [The 'time_t' type stops working after January 2038. ++ Remove _USE_32BIT_TIME_T from the compiler flags.])], ++ [# If not cross-compiling and $1 says we should check, ++ # and 'touch' works with a large timestamp, then evidently wider time_t ++ # is desired and supported, so fail and ask the builder to fix the ++ # problem. Otherwise, just warn the builder. ++ m4_ifval([$1], ++ [if test $cross_compiling = no \ ++ && TZ=UTC0 touch -t 210602070628.15 conftest.time 2>/dev/null; then ++ case `TZ=UTC0 LC_ALL=C ls -l conftest.time 2>/dev/null` in ++ *'Feb 7 2106'* | *'Feb 7 17:10'*) ++ AC_MSG_FAILURE( ++ [The 'time_t' type stops working after January 2038, ++ and your system appears to support a wider 'time_t'. ++ Try configuring with 'CC="${CC} -m64"'. ++ To build with a 32-bit time_t anyway (not recommended), ++ configure with '--disable-year2038'.]);; ++ esac ++ rm -f conftest.time ++ fi]) ++ if test "$gl_warned_about_y2038" != yes; then ++ AC_MSG_WARN( ++ [The 'time_t' type stops working after January 2038, ++ and this package needs a wider 'time_t' type ++ if there is any way to access timestamps after that. ++ Configure with 'CC="${CC} -m64"' perhaps?]) ++ gl_warned_about_y2038=yes ++ fi ++ ]) ++ fi]) ++]) ++ ++AC_DEFUN([gl_YEAR2038], ++[ ++ gl_YEAR2038_BODY([require-year2038-safe]) ++]) +diff --git a/maint.mk b/maint.mk +index ae3a817..6a3ea96 100644 +--- a/maint.mk ++++ b/maint.mk +@@ -1409,7 +1409,7 @@ announcement_mail_headers_alpha = \ + announcement_mail_Cc_beta = $(announcement_mail_Cc_alpha) + announcement_mail_headers_beta = $(announcement_mail_headers_alpha) + +-announcement_mail_Cc_ ?= $(announcement_mail_Cc_$(release-type)) ++announcement_Cc_ ?= $(announcement_Cc_$(release-type)) + announcement_mail_headers_ ?= $(announcement_mail_headers_$(release-type)) + announcement: NEWS ChangeLog $(rel-files) + # Not $(AM_V_GEN) since the output of this command serves as +@@ -1426,7 +1426,6 @@ announcement: NEWS ChangeLog $(rel-files) + --bootstrap-tools=$(bootstrap-tools) \ + $$(case ,$(bootstrap-tools), in (*,gnulib,*) \ + echo --gnulib-version=$(gnulib-version);; esac) \ +- --no-print-checksums \ + $(addprefix --url-dir=, $(url_dir_list)) + + .PHONY: release-commit +-- +cgit v1.1 + diff --git a/package/guile/guile.mk b/package/guile/guile.mk index 0f245fca76..36a1661d67 100644 --- a/package/guile/guile.mk +++ b/package/guile/guile.mk @@ -9,14 +9,17 @@ GUILE_SOURCE = guile-$(GUILE_VERSION).tar.xz GUILE_SITE = $(BR2_GNU_MIRROR)/guile GUILE_INSTALL_STAGING = YES # For 0002-calculate-csqrt_manually.patch and -# 0003-Makefile.am-fix-build-without-makeinfo.patch +# 0003-Makefile.am-fix-build-without-makeinfo.patch and +# 0004-Update-gnulib-to-8f4538a53d64054ae2fc8b86c0f87c418c6176e6.patch GUILE_AUTORECONF = YES GUILE_LICENSE = LGPL-3.0+ GUILE_LICENSE_FILES = LICENSE COPYING COPYING.LESSER GUILE_CPE_ID_VENDOR = gnu GUILE_DEPENDENCIES = host-guile libunistring libffi gmp bdwgc host-pkgconf -HOST_GUILE_DEPENDENCIES = host-libunistring host-libffi host-gmp host-bdwgc host-flex host-pkgconf host-gettext +HOST_GUILE_DEPENDENCIES = \ + host-libunistring host-libffi host-gmp host-bdwgc host-flex \ + host-pkgconf host-gettext host-gperf # The HAVE_GC* CFLAGS specify that we will use internal callbacks # instead of the ones provided by -- 2.34.1 From james.hilliard1 at gmail.com Sun Feb 6 21:06:18 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 6 Feb 2022 14:06:18 -0700 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5declarative: bump to version b3fc740080137fdc36853b8ffedc241c901cb34e Message-ID: <20220206210618.1781561-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/qt5/qt5declarative/qt5declarative.hash | 2 +- package/qt5/qt5declarative/qt5declarative.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash index adda7e03ba..3f2a0891a9 100644 --- a/package/qt5/qt5declarative/qt5declarative.hash +++ b/package/qt5/qt5declarative/qt5declarative.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 14a4b9640a2cd94771108dc3658a77c04c680f3d6444750d55e313b20774ce00 qtdeclarative-9349f3975d26632befc036fc9f2ea6e03aee2182.tar.bz2 +sha256 6c81d1d63991c682c6df74e8208cf22fa4c7753cd59b21ee5d665a6ec3f2982f qtdeclarative-b3fc740080137fdc36853b8ffedc241c901cb34e.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 e63a78021a..882b24d2e9 100644 --- a/package/qt5/qt5declarative/qt5declarative.mk +++ b/package/qt5/qt5declarative/qt5declarative.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5DECLARATIVE_VERSION = 9349f3975d26632befc036fc9f2ea6e03aee2182 +QT5DECLARATIVE_VERSION = b3fc740080137fdc36853b8ffedc241c901cb34e QT5DECLARATIVE_SITE = $(QT5_SITE)/qtdeclarative/-/archive/$(QT5DECLARATIVE_VERSION) QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5DECLARATIVE_VERSION).tar.bz2 QT5DECLARATIVE_INSTALL_STAGING = YES -- 2.25.1 From peter.macleod.thompson at gmail.com Sun Feb 6 21:07:39 2022 From: peter.macleod.thompson at gmail.com (PeterThompson) Date: Sun, 6 Feb 2022 14:07:39 -0700 Subject: [Buildroot] [PATCH 1/1] package/sdl2_ttf: bump version to 2.0.18 Message-ID: <20220206210739.19361-1-peter.macleod.thompson@gmail.com> From: Peter Thompson Updated package/sdl2_ttf/sdl2_ttf.mk from version 2.0.15 to 2.0.18 Updated package/sdl2_ttf/sdl2_ttf.hash to match version 2.0.18 Signed-off-by: Peter Thompson --- package/sdl2_ttf/sdl2_ttf.hash | 4 ++-- package/sdl2_ttf/sdl2_ttf.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sdl2_ttf/sdl2_ttf.hash b/package/sdl2_ttf/sdl2_ttf.hash index 16459e4a59..a490b002b6 100644 --- a/package/sdl2_ttf/sdl2_ttf.hash +++ b/package/sdl2_ttf/sdl2_ttf.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a9eceb1ad88c1f1545cd7bd28e7cbc0b2c14191d40238f531a15b01b1b22cd33 SDL2_ttf-2.0.15.tar.gz -sha256 f6370809c9f644760920d9945c5be07aed17664975f2e4741013d4d9a2ec696f COPYING.txt +sha256 7234eb8883514e019e7747c703e4a774575b18d435c22a4a29d068cb768a2251 SDL2_ttf-2.0.18.tar.gz +sha256 e211dfe7e2c36e64048be886fe3f2bbba8732ce4dd77b596a355d3abbec775a4 COPYING.txt diff --git a/package/sdl2_ttf/sdl2_ttf.mk b/package/sdl2_ttf/sdl2_ttf.mk index 326cb99366..1fe7c0a075 100644 --- a/package/sdl2_ttf/sdl2_ttf.mk +++ b/package/sdl2_ttf/sdl2_ttf.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_TTF_VERSION = 2.0.15 +SDL2_TTF_VERSION = 2.0.18 SDL2_TTF_SOURCE = SDL2_ttf-$(SDL2_TTF_VERSION).tar.gz SDL2_TTF_SITE = http://www.libsdl.org/projects/SDL_ttf/release SDL2_TTF_LICENSE = Zlib -- 2.20.1 From james.hilliard1 at gmail.com Sun Feb 6 21:20:28 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 6 Feb 2022 14:20:28 -0700 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5base: bump to version d16bf02a11953dcac01dca73e6f3778f293adefe Message-ID: <20220206212028.1786742-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/qt5/qt5base/qt5base.hash | 2 +- package/qt5/qt5base/qt5base.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash index 396f5044ff..1b9ff43ab2 100644 --- a/package/qt5/qt5base/qt5base.hash +++ b/package/qt5/qt5base/qt5base.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 269ae20ed74cb949420ac3abac0bdef3b65501ea47c9312c01e8f9073baf24fe qtbase-53a047c212af7fbded6505651f648172f9d7a34d.tar.bz2 +sha256 96b1c96041ae7b5186c94f231979217bd50e3c0a4caeba32982faa8054a6d113 qtbase-d16bf02a11953dcac01dca73e6f3778f293adefe.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 d8a0bf1d16..37ad9c652c 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5BASE_VERSION = 53a047c212af7fbded6505651f648172f9d7a34d +QT5BASE_VERSION = d16bf02a11953dcac01dca73e6f3778f293adefe QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 -- 2.25.1 From james.hilliard1 at gmail.com Sun Feb 6 21:24:05 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 6 Feb 2022 14:24:05 -0700 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5declarative: bump to version 1d49a5b678957adde7e2db23a485a3f48157bc8f Message-ID: <20220206212405.1787998-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/qt5/qt5declarative/qt5declarative.hash | 2 +- package/qt5/qt5declarative/qt5declarative.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash index adda7e03ba..e5b016fc20 100644 --- a/package/qt5/qt5declarative/qt5declarative.hash +++ b/package/qt5/qt5declarative/qt5declarative.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 14a4b9640a2cd94771108dc3658a77c04c680f3d6444750d55e313b20774ce00 qtdeclarative-9349f3975d26632befc036fc9f2ea6e03aee2182.tar.bz2 +sha256 afea60cbfa48f88c1f0f54b8dbbf90370f6d2535179b4ccaf489db8133ff37ea qtdeclarative-1d49a5b678957adde7e2db23a485a3f48157bc8f.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 e63a78021a..54aa3be1cb 100644 --- a/package/qt5/qt5declarative/qt5declarative.mk +++ b/package/qt5/qt5declarative/qt5declarative.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5DECLARATIVE_VERSION = 9349f3975d26632befc036fc9f2ea6e03aee2182 +QT5DECLARATIVE_VERSION = 1d49a5b678957adde7e2db23a485a3f48157bc8f QT5DECLARATIVE_SITE = $(QT5_SITE)/qtdeclarative/-/archive/$(QT5DECLARATIVE_VERSION) QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5DECLARATIVE_VERSION).tar.bz2 QT5DECLARATIVE_INSTALL_STAGING = YES -- 2.25.1 From james.hilliard1 at gmail.com Sun Feb 6 21:28:24 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 6 Feb 2022 14:28:24 -0700 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5wayland: bump to version ce2caf493a1343fbd9f8e4c85baf6a61c057f242 Message-ID: <20220206212824.1790375-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/qt5/qt5wayland/qt5wayland.hash | 2 +- package/qt5/qt5wayland/qt5wayland.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/qt5/qt5wayland/qt5wayland.hash b/package/qt5/qt5wayland/qt5wayland.hash index 1a7400de67..2acdd1643c 100644 --- a/package/qt5/qt5wayland/qt5wayland.hash +++ b/package/qt5/qt5wayland/qt5wayland.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 a29d52c7b12987ed56d922455e0776e161075392969f7c6a8b141b00bd3dd46b qtwayland-b6d85c2a75f5618e87267f5b5c361455be257a17.tar.bz2 +sha256 f43c8ce9070249dfa91b94c09bcbf7c4fa881daf5eecdb9ff93c0eed43a3b7b0 qtwayland-ce2caf493a1343fbd9f8e4c85baf6a61c057f242.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 bcc4915022..61182f611c 100644 --- a/package/qt5/qt5wayland/qt5wayland.mk +++ b/package/qt5/qt5wayland/qt5wayland.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5WAYLAND_VERSION = b6d85c2a75f5618e87267f5b5c361455be257a17 +QT5WAYLAND_VERSION = ce2caf493a1343fbd9f8e4c85baf6a61c057f242 QT5WAYLAND_SITE = $(QT5_SITE)/qtwayland/-/archive/$(QT5WAYLAND_VERSION) QT5WAYLAND_SOURCE = qtwayland-$(QT5WAYLAND_VERSION).tar.bz2 QT5WAYLAND_DEPENDENCIES = wayland -- 2.25.1 From yann.morin.1998 at free.fr Sun Feb 6 21:36:57 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 6 Feb 2022 22:36:57 +0100 Subject: [Buildroot] [PATCH 01/16] board/aarch64-efi/genimage-efi: convert partition-type-uuid to single letter notation In-Reply-To: <20220206200532.2758493-2-giulio.benetti@benettiengineering.com> References: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> <20220206200532.2758493-2-giulio.benetti@benettiengineering.com> Message-ID: <20220206213657.GA457876@scaer> Giulio, All, FTR, a little recap of what we discussed on IRC, see below On 2022-02-06 21:05 +0100, Giulio Benetti spake thusly: > Signed-off-by: Giulio Benetti > --- > board/aarch64-efi/genimage-efi.cfg | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/board/aarch64-efi/genimage-efi.cfg b/board/aarch64-efi/genimage-efi.cfg > index 87e85816bc..7fbe13d390 100644 > --- a/board/aarch64-efi/genimage-efi.cfg > +++ b/board/aarch64-efi/genimage-efi.cfg > @@ -18,13 +18,13 @@ image disk.img { > > partition boot { > image = "efi-part.vfat" > - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b > + partition-type-uuid = U > offset = 32K > bootable = true > } > > partition root { > - partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae > + partition-type-uuid = L As we discussed on IRC, this is not the same thing. genimage will extend the 'L' shorthand to the full UUID 0fc63daf-8483-4772-8e79-3d69d8477de4, which is different. So I don't think uaing the shorthands are correct. The UUID assignments are available on Wikipedia: https://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs But the systemd docuemntation has extra UUID definitions: https://man.archlinux.org/man/systemd-gpt-auto-generator.8 And finally, if neither resources has a UUID for a specific architecture, we can still use the 'generic' "Linux filesystem data" UUID 0FC63DAF-8483-4772-8E79-3D69D8477DE4. Regards, Yann E. MORIN. > image = "rootfs.ext2" > } > } > -- > 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 Sun Feb 6 21:57:34 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 6 Feb 2022 14:57:34 -0700 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5location: remove unused qt5location-mapboxgl Message-ID: <20220206215734.3853337-1-james.hilliard1@gmail.com> This was only needed when the mapboxgl submodule was a separate package(was never included in buildroot only a patch series). Signed-off-by: James Hilliard --- package/qt5/qt5location/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/qt5/qt5location/Config.in b/package/qt5/qt5location/Config.in index b811f9a590..3d91adaf1f 100644 --- a/package/qt5/qt5location/Config.in +++ b/package/qt5/qt5location/Config.in @@ -1,7 +1,6 @@ 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++. -- 2.25.1 From james.hilliard1 at gmail.com Sun Feb 6 22:01:49 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 6 Feb 2022 15:01:49 -0700 Subject: [Buildroot] [PATCH v7 1/1] package/qt5: bump packages to latest kde submodule versions In-Reply-To: References: <20220131225622.90226-1-james.hilliard1@gmail.com> Message-ID: On Thu, Feb 3, 2022 at 12:35 PM Arnout Vandecappelle wrote: > > > > On 31/01/2022 23:56, 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 > > It took me some reading of the patch and of the upstream repositories to > understand that there are actually no release tarballs or tags, and the the > 5.15.8 is something we just pull out of our hat to be compatible with > qt5webengine. So I updated the commit message to (hopefully) better explain that. > > > > > 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. > > Instead of creating a separate package for it (which BTW you forgot to add to > DEVELOPERS), I changed this to use the git download method and _GIT_SUBMODULES = > YES. I checked that it extracts to exactly the same thing. Looks like the package selection for qt5location-mapboxgl wasn't removed: https://patchwork.ozlabs.org/project/buildroot/patch/20220206215734.3853337-1-james.hilliard1 at gmail.com/ > > > > > 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. > > I don't really understand why this was needed rather than calling syncqt > explicitly, but OK. > > Applied to master, thanks. > > Regards, > Arnout > > > > > 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 > > [snip] From fontaine.fabrice at gmail.com Sun Feb 6 22:08:14 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 6 Feb 2022 23:08:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-regex: fix license Message-ID: <20220206220814.2580975-1-fontaine.fabrice@gmail.com> License is Apache-2.0 since bump to version 2021.4.4 in commit d973fac7ca2e7c0c4864e8045e5205764e84c45b and https://github.com/mrabarnett/mrab-regex/commit/b693a1fba731a9aa0dc6ae37b441267d4b7b0419 Signed-off-by: Fabrice Fontaine --- package/python-regex/python-regex.hash | 2 ++ package/python-regex/python-regex.mk | 3 ++- package/python3-regex/python3-regex.mk | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/package/python-regex/python-regex.hash b/package/python-regex/python-regex.hash index 4749cd6167..b0f5bb05da 100644 --- a/package/python-regex/python-regex.hash +++ b/package/python-regex/python-regex.hash @@ -1,3 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/regex/json md5 cd206281327b4c087bb20bf93cee4ab9 regex-2021.4.4.tar.gz sha256 52ba3d3f9b942c49d7e4bc105bb28551c44065f139a65062ab7912bef10c9afb regex-2021.4.4.tar.gz +# Locally computed sha256 checksums +sha256 bff55ef4cdcc8c14ce259f8e8ab60e264418440d6335f4dc138273fbd506144d LICENSE.txt diff --git a/package/python-regex/python-regex.mk b/package/python-regex/python-regex.mk index c46c4d1614..4019bcdd3e 100644 --- a/package/python-regex/python-regex.mk +++ b/package/python-regex/python-regex.mk @@ -9,6 +9,7 @@ PYTHON_REGEX_VERSION = 2021.4.4 PYTHON_REGEX_SOURCE = regex-$(PYTHON_REGEX_VERSION).tar.gz PYTHON_REGEX_SITE = https://files.pythonhosted.org/packages/38/3f/4c42a98c9ad7d08c16e7d23b2194a0e4f3b2914662da8bc88986e4e6de1f PYTHON_REGEX_SETUP_TYPE = setuptools -PYTHON_REGEX_LICENSE = CNRI-Python +PYTHON_REGEX_LICENSE = Apache-2.0 +PYTHON_REGEX_LICENSE_FILES = LICENSE.txt $(eval $(python-package)) diff --git a/package/python3-regex/python3-regex.mk b/package/python3-regex/python3-regex.mk index 0b71768e9d..5c08338437 100644 --- a/package/python3-regex/python3-regex.mk +++ b/package/python3-regex/python3-regex.mk @@ -9,7 +9,8 @@ PYTHON3_REGEX_VERSION = 2021.4.4 PYTHON3_REGEX_SOURCE = regex-$(PYTHON3_REGEX_VERSION).tar.gz PYTHON3_REGEX_SITE = https://files.pythonhosted.org/packages/38/3f/4c42a98c9ad7d08c16e7d23b2194a0e4f3b2914662da8bc88986e4e6de1f PYTHON3_REGEX_SETUP_TYPE = setuptools -PYTHON3_REGEX_LICENSE = CNRI-Python +PYTHON3_REGEX_LICENSE = Apache-2.0 +PYTHON3_REGEX_LICENSE_FILES = LICENSE.txt HOST_PYTHON3_REGEX_DL_SUBDIR = python-regex HOST_PYTHON3_REGEX_NEEDS_HOST_PYTHON = python3 -- 2.34.1 From giulio.benetti at benettiengineering.com Sun Feb 6 22:45:21 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 23:45:21 +0100 Subject: [Buildroot] [PATCH] package/libnss: bump to version 3.75 Message-ID: <20220206224521.3204040-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 819c272a30..07fb340c33 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_74_RTM/src/SHA256SUMS -sha256 88928811f9f40f87d42e2eaccdf6e454562e51486067f2ddbe90aa47ea6cd056 nss-3.74.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_75_RTM/src/SHA256SUMS +sha256 fd571507827284644f4dd522a032acda2286835f6683ed22a1c2d3878cc58582 nss-3.75.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index 537f6dd9b6..a9549e48dd 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.74 +LIBNSS_VERSION = 3.75 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 giulio.benetti at benettiengineering.com Sun Feb 6 22:59:02 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 6 Feb 2022 23:59:02 +0100 Subject: [Buildroot] [PATCH] package/harfbuzz: bump to version 3.3.2 Message-ID: <20220206225902.3349344-1-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- This patch superseeds this: https://patchwork.ozlabs.org/project/buildroot/patch/20220131175341.4091688-1-giulio.benetti at benettiengineering.com/ --- 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..61f2865563 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 1c13bca136c4f66658059853e2c1253f34c88f4b5c5aba6050aba7b5e0ce2503 harfbuzz-3.3.2.tar.xz sha256 4345e1735f8bc6d812fed5180cabb5a5e88a4109d332652f2a45c13cfa5ee692 COPYING diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk index 67eab359c6..1f5dfa8822 100644 --- a/package/harfbuzz/harfbuzz.mk +++ b/package/harfbuzz/harfbuzz.mk @@ -4,7 +4,7 @@ # ################################################################################ -HARFBUZZ_VERSION = 3.2.0 +HARFBUZZ_VERSION = 3.3.2 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 thomas.petazzoni at bootlin.com Mon Feb 7 07:05:56 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 07 Feb 2022 07:05:56 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-02-06 Message-ID: <20220207070604.AF838400E5@smtp2.osuosl.org> Hello, Autobuild statistics for 2022-02-06 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 49 | 2 | 0 | 51 | 2021.11.x | 21 | 2 | 0 | 23 | master | 49 | 46 | 2 | 97 | Classification of failures by reason for master ----------------------------------------------- host-libselinux-3.3 | 8 host-python-docutils-0.15.2 | 7 bluez5_utils-5.63 | 4 gerbera-1.9.2 | 3 rtorrent-0.9.8 | 3 unknown | 3 frr-8.1 | 2 guile-3.0.7 | 2 libuwsc | 2 qt5base-53a047c212af7fbded6... | 2 rygel-0.40.2 | 2 bat-0.19.0 | 1 host-go-1.17.6 | 1 libuhttpd-3.14.1 | 1 luasyslog-2.2.0 | 1 Makefile:747: target-finalize | 1 python-greenlet-1.1.2 | 1 ruby-3.1.0 | 1 tovid-87c676f4aadb7303d2cd9... | 1 vlc-3.0.16 | 1 xvisor-0.3.1 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- i586 | bat-0.19.0 | NOK | http://autobuild.buildroot.net/results/b0587470d420f8f4f95c3ed23eea605c02cc6b51 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/6b8870d12e0804d6154230a7322c49416c1dc0e2 | x86_64 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/0c02afb0cd94fcad76a43e04e48484ee01600c0c | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/dc568a3fc3ba64303d5689b91bfe253331e2c080 | riscv64 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/0cc700483eb4ac5c44e1a1b4ca77c309a0d7b381 | microblazeel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/ef9084aab26e8f799137413e8647104ff82eb658 | mips64el | frr-8.1 | NOK | http://autobuild.buildroot.net/results/4f285a8f5a9c88dab48f235adeca7afec36fe17d | arc | gerbera-1.9.2 | NOK | http://autobuild.buildroot.net/results/8be8502709c3c09bbaa440761478e36af2b5183e | mips64el | gerbera-1.9.2 | NOK | http://autobuild.buildroot.net/results/009db44f83c3b02025c910ce4f190bd709c5ab49 | riscv64 | gerbera-1.9.2 | NOK | http://autobuild.buildroot.net/results/28c8119e26c4316a84c17611b74949dee6b7cfc1 | arm | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/0add99a8cbb143d912d48ef4670e09a6710bb8b1 | powerpc64le | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/27a2a69e1177f15daec65eca035b99ea5355c34b | mips64el | host-go-1.17.6 | NOK | http://autobuild.buildroot.net/results/3d8e942d232300d65ca51cab3425d8e4931d8472 | mipsel | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/3b30572b8a6474dba4db60cfcab03360ace1d8db | m68k | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/4b9aba5285d880865550c5b2541b99e00fa791f4 | sh4 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/a35f2bfc976305fd0d8652fb2e7e6122dc94d8f3 | aarch64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/39d61949058d63193c4049dbf88979af6f4f9d1b | arc | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/4d1b28ee5c869efa53b71930fd4b626bce6a35d2 | riscv64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/6788a3b3c36cfda8a5e87634991dce24e2af414c | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/76d174dee366cafe022c41bdd67cdae0c1589431 | or1k | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/b79b63cc2a35be50d9ab4a0dceacb914f2899da4 | riscv64 | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/15b35322eaeefd243b630f1e806084a80899cd51 | mips64el | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/0cda6d7538f4dc59a301b9e52665cb49232e1151 | mips | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/fa9c31b599f4923c580cbe4bdb37193654466010 | arm | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/0e2bda8245366697ec8c7b6bb90bcdf87dd1e1eb | s390x | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/4e8e7dadb27ccd52fc43e4c972a98e40cdfb29ce | aarch64 | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/19c7b3a2803b8e81b76e8a9b15d18818acf8872b | x86_64 | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/47db3cd830943cba8cd2504bdf1de756c28878f1 | arm | libuhttpd-3.14.1 | NOK | http://autobuild.buildroot.net/results/ccaf94784ed849d39e35f56a276ff9867395d736 | powerpc | libuwsc | TIM | http://autobuild.buildroot.net/results/4ec38cdf58ab740d03ed6961791b7ba402de1bc3 | xtensa | libuwsc | TIM | http://autobuild.buildroot.net/results/90a29dcddfeb9dbbe1b02b6f2ee4ebc866adfefa | i686 | luasyslog-2.2.0 | NOK | http://autobuild.buildroot.net/results/b096cdbe96fb6c24d56b02a3a2b8fde1567f71a9 | arc | Makefile:747: target-finalize | NOK | http://autobuild.buildroot.net/results/7dc93c961247893075c269c7d588cb2a843fb542 | riscv64 | python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/211ebdc837d063fbbe52c333f389ef4c6c647d66 | x86_64 | qt5base-53a047c212af7fbded6... | NOK | http://autobuild.buildroot.net/results/556c868df0050d70b22eb1add4b5402f0c3e3869 | riscv32 | qt5base-53a047c212af7fbded6... | NOK | http://autobuild.buildroot.net/results/503750d22d5244e7281f5a56c2e9eb4403b4155e | sh4 | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/911bfb7a63e1ff5df57cfca701e265b85c065314 | ORPH m68k | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/bc97826134def4dcb1f87f075ca9976dfa349b36 | ORPH arm | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/a6badb2c008db3f13329eb6a0b1a1a5c8083b2e1 | ORPH riscv64 | ruby-3.1.0 | NOK | http://autobuild.buildroot.net/results/43bc9c7929b6c2670b0d913987e8ecfb7a914d43 | sparc64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/40b1b31d209d33c89fe093d8e5c25e800e8e581c | or1k | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/2c485f20bd9055cd6f30a0d3f2a107869648db97 | mips64el | tovid-87c676f4aadb7303d2cd9... | NOK | http://autobuild.buildroot.net/results/8fda0d9b2a5ec6f190609416feb8fb452cfca077 | arm | unknown | NOK | http://autobuild.buildroot.net/results/d90478fe6072f030ce1ae32255a3f801e4ca9a29 | arm | unknown | NOK | http://autobuild.buildroot.net/results/d273a4f47231df0dcce7aa563677459a2395845b | microblazeel | unknown | NOK | http://autobuild.buildroot.net/results/9477863fc3c3a3ec99cd70286f13384fba9cdfca | s390x | vlc-3.0.16 | NOK | http://autobuild.buildroot.net/results/6548a7e6167d9a56d2bb528daee5a6e081935c64 | riscv32 | xvisor-0.3.1 | NOK | http://autobuild.buildroot.net/results/9a22b8fa1dd88ed69c8533078cb28a05e1b54de3 | Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 1 openldap-2.4.59 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- powerpc | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/914d78b433f123c6b87371036894d96a89fd6526 | riscv32 | openldap-2.4.59 | NOK | http://autobuild.buildroot.net/results/e80b16e03a12e74a8a359852572c9e05bf7b21a9 | Classification of failures by reason for 2021.11.x -------------------------------------------------- unknown | 1 wavemon-0.9.4 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- m68k | unknown | NOK | http://autobuild.buildroot.net/results/a324f07e37e8ab4b702c6ca48845dd871533de0a | arm | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/7e587d7408985429d1b8b7371ce1273c0bfc491f | Gitlab CI results for 2022-02-06 ================================ Packages having a newer version =============================== name | found by | link to release-monitoring.org | version | upstream | orph? -------------------------------+----------+----------------------------------------------+--------------+--------------+------- ace | DISTRO | https://release-monitoring.org/project/242395 | 7.0.1 | 7.0.6 | 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 | alfred | DISTRO | https://release-monitoring.org/project/241870 | 2021.4 | 2022.0 | 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.2 | assimp | DISTRO | https://release-monitoring.org/project/06988 | 5.1.6 | 5.2.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 | audit | DISTRO | https://release-monitoring.org/project/15225 | 3.0.6 | 3.0.7 | 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 batctl | DISTRO | https://release-monitoring.org/project/14740 | 2021.0 | 2022.0 | batman-adv | DISTRO | https://release-monitoring.org/project/19529 | 2021.4 | 2022.0 | 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.68 | ORPH bdwgc | DISTRO | https://release-monitoring.org/project/17108 | 8.0.6 | 8.2.0 | belle-sip | DISTRO | https://release-monitoring.org/project/14378 | 4.4.8 | 5.0.68 | belr | DISTRO | https://release-monitoring.org/project/80042 | 4.4.8 | 5.0.68 | 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.18.0 | 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.1 | ORPH 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.5.0 | 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.5 | 0.104.2 | clang | DISTRO | https://release-monitoring.org/project/11811 | 9.0.1 | 13.0.1 | cmake | DISTRO | https://release-monitoring.org/project/00306 | 3.16.9 | 3.22.2 | cog | DISTRO | https://release-monitoring.org/project/21333 | 0.12.0 | 0.13.3 | cryptsetup | DISTRO | https://release-monitoring.org/project/13709 | 2.4.2 | 2.4.3 | cups | DISTRO | https://release-monitoring.org/project/00380 | 2.4.0 | 2.4.1 | 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 | daq3 | DISTRO | https://release-monitoring.org/project/212345 | 3.0.5 | 3.0.6 | 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 debianutils | DISTRO | https://release-monitoring.org/project/21341 | 4.11 | 5.7 | ORPH dialog | DISTRO | https://release-monitoring.org/project/00431 | 1.3-20200327 | 1.3-20220117 | ORPH docker-compose | DISTRO | https://release-monitoring.org/project/06185 | 1.24.1 | 2.2.3 | dovecot | DISTRO | https://release-monitoring.org/project/00456 | 2.3.17.1 | 2.3.18 | drbd-utils | DISTRO | https://release-monitoring.org/project/00462 | 9.19.0 | 9.20.2 | dt | DISTRO | https://release-monitoring.org/project/21844 | 18.32 | 21.27 | ORPH ed | DISTRO | https://release-monitoring.org/project/00659 | 1.17 | 1.18 | ORPH edk2 | DISTRO | https://release-monitoring.org/project/125953 | edk2-stab... | 202111 | efivar | DISTRO | https://release-monitoring.org/project/00664 | 37 | 38 | 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 | ell | DISTRO | https://release-monitoring.org/project/17781 | 0.47 | 0.48 | erlang | DISTRO | https://release-monitoring.org/project/00707 | 22.3.4.22 | 24.2.1 | 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.27 | 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.3 | flare-engine | DISTRO | https://release-monitoring.org/project/21433 | 1.12 | 1.13 | flare-game | DISTRO | https://release-monitoring.org/project/21434 | 1.12 | 1.13 | 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.96 | ORPH fping | DISTRO | https://release-monitoring.org/project/00834 | 5.0 | 5.1 | fuse-overlayfs | DISTRO | https://release-monitoring.org/project/101220 | 1.5.0 | 1.8.2 | fwts | DISTRO | https://release-monitoring.org/project/17383 | 21.11.00 | 22.01.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 gdbm | DISTRO | https://release-monitoring.org/project/00882 | 1.22 | 1.23 | 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 git | DISTRO | https://release-monitoring.org/project/05350 | 2.31.1 | 2.35.1 | glib-networking | DISTRO | https://release-monitoring.org/project/21353 | 2.70.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.1.1 | gnutls | DISTRO | https://release-monitoring.org/project/01221 | 3.7.2 | 3.7.3 | gqrx | DISTRO | https://release-monitoring.org/project/09771 | 2.14.4 | 2.15.8 | granite | DISTRO | https://release-monitoring.org/project/05410 | 6.0.0 | 6.2.0 | ORPH grpc | DISTRO | https://release-monitoring.org/project/19117 | 1.43.0 | 1.43.2 | 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.6 | 1.20.0 | ORPH gst1-devtools | DISTRO | https://release-monitoring.org/project/21856 | 1.18.6 | 1.20.0 | 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.6 | 1.20.0 | ORPH gst1-plugins-bad | DISTRO | https://release-monitoring.org/project/21849 | 1.18.6 | 1.20.0 | ORPH gst1-plugins-base | DISTRO | https://release-monitoring.org/project/21850 | 1.18.6 | 1.20.0 | ORPH gst1-plugins-good | DISTRO | https://release-monitoring.org/project/21852 | 1.18.6 | 1.20.0 | ORPH gst1-plugins-ugly | DISTRO | https://release-monitoring.org/project/15187 | 1.18.6 | 1.20.0 | ORPH gst1-python | DISTRO | https://release-monitoring.org/project/03881 | 1.18.6 | 1.20.0 | ORPH gst1-rtsp-server | DISTRO | https://release-monitoring.org/project/21853 | 1.18.6 | 1.20.0 | ORPH gst1-vaapi | DISTRO | https://release-monitoring.org/project/21855 | 1.18.6 | 1.20.0 | ORPH gstd | DISTRO | https://release-monitoring.org/project/235022 | 0.13.0 | 0.13.2 | ORPH gstreamer1 | DISTRO | https://release-monitoring.org/project/01263 | 1.18.6 | 1.20.0 | ORPH gstreamer1-editing-services | DISTRO | https://release-monitoring.org/project/230920 | 1.18.6 | 1.20.0 | 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.1 | harfbuzz | DISTRO | https://release-monitoring.org/project/01299 | 3.2.0 | 3.3.2 | 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 hwdata | DISTRO | https://release-monitoring.org/project/05387 | 0.355 | 0.356 | 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-23 | 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 iperf3 | DISTRO | https://release-monitoring.org/project/01389 | 3.10.1 | 3.11 | 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.21 | 1.24 | 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 | janet | DISTRO | https://release-monitoring.org/project/155612 | 1.19.2 | 1.20.0 | janus-gateway | DISTRO | https://release-monitoring.org/project/15715 | 0.11.6 | 0.11.7 | 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.4 | ORPH jquery-mobile | DISTRO | https://release-monitoring.org/project/59395 | 1.4.3 | 1.4.5 | ORPH jquery-ui | DISTRO | https://release-monitoring.org/project/21815 | 1.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 | 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-R3a | 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.2-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.6-Ma... | 20.2.2-Nexus | kodi-pvr-iptvsimple | DISTRO | https://release-monitoring.org/project/21782 | 19.1.0-Ma... | 20.3.0-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.7-Ma... | 20.2.4-Nexus | kodi-pvr-nextpvr | DISTRO | https://release-monitoring.org/project/21779 | 19.0.3-Ma... | 20.2.2-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.2-Ma... | 20.2.1-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 | lcms2 | DISTRO | https://release-monitoring.org/project/09815 | 2.13 | 2.13.1 | 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.26 | 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.5 | libcap | DISTRO | https://release-monitoring.org/project/01569 | 2.62 | 2.63 | 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 | libfreeglut | DISTRO | https://release-monitoring.org/project/00846 | 3.2.1 | 3.2.2 | libfuse | GUESS | https://release-monitoring.org/project/00861 | 2.9.9 | 3.10.5 | ORPH libgcrypt | DISTRO | https://release-monitoring.org/project/01623 | 1.9.4 | 1.10.0 | ORPH libgdiplus | DISTRO | https://release-monitoring.org/project/06440 | 6.0.5 | 6.1 | 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.70.0 | 2.70.3 | 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.44 | 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.14 | 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 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 | libnfs | DISTRO | https://release-monitoring.org/project/07325 | 4.0.0 | 5.0.1 | ORPH libnss | DISTRO | https://release-monitoring.org/project/02503 | 3.74 | 3.75 | 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 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 | 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.2 | 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 | libxcrypt | DISTRO | https://release-monitoring.org/project/16436 | 4.4.27 | 4.4.28 | libxkbcommon | DISTRO | https://release-monitoring.org/project/01780 | 1.3.1 | 1.4.0 | 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.69 | ORPH liquid-dsp | DISTRO | https://release-monitoring.org/project/14535 | 1.3.2 | 1.4.0 | 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.1 | 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.1 | lm-sensors | DISTRO | https://release-monitoring.org/project/01831 | 3-6-0 | 3.6.0 | ORPH 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 | lttng-tools | DISTRO | https://release-monitoring.org/project/07136 | 2.13.2 | 2.13.4 | lua | DISTRO | https://release-monitoring.org/project/01847 | 5.1.5 | 5.4.4 | lua-resty-http | DISTRO | https://release-monitoring.org/project/13887 | 0.15-0 | 0.16.1 | luv | DISTRO | https://release-monitoring.org/project/21510 | 1.42.0-1 | 1.43.0-0 | luvi | DISTRO | https://release-monitoring.org/project/21512 | 2.12.0 | 2.13.0 | lxc | DISTRO | https://release-monitoring.org/project/01860 | 4.0.11 | 4.0.12 | lynx | DISTRO | https://release-monitoring.org/project/01863 | 2.8.9rel.1 | 2.9.0 | lzip | DISTRO | https://release-monitoring.org/project/01866 | 1.22 | 1.23 | ORPH 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.68 | 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 | mender | DISTRO | https://release-monitoring.org/project/20629 | 3.1.0 | 3.2.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 | minetest | DISTRO | https://release-monitoring.org/project/01978 | 5.4.1 | 5.5.0 | minetest-game | DISTRO | https://release-monitoring.org/project/21522 | 5.4.1 | 5.5.0 | 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.18 | 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.168 | 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 | 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-20220205 | ORPH netdata | DISTRO | https://release-monitoring.org/project/11046 | 1.21.1 | 1.33.0 | 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.6 | 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.47.03 | 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+8 | 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 | optee-benchmark | DISTRO | https://release-monitoring.org/project/21555 | 3.15.0 | 3.16.0 | optee-client | DISTRO | https://release-monitoring.org/project/21556 | 3.15.0 | 3.16.0 | optee-examples | DISTRO | https://release-monitoring.org/project/21557 | 3.15.0 | 3.16.0 | optee-test | DISTRO | https://release-monitoring.org/project/21558 | 3.15.0 | 3.16.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.68 | ORPH osm2pgsql | DISTRO | https://release-monitoring.org/project/02575 | 1.5.2 | 1.6.0 | 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 | 202201 | 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.76 | 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.15 | 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.3 | 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 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 | poke | DISTRO | https://release-monitoring.org/project/179926 | 1.4 | 2.0 | ORPH policycoreutils | DISTRO | https://release-monitoring.org/project/03680 | 3.2 | 20200710 | poppler | DISTRO | https://release-monitoring.org/project/03686 | 21.12.0 | 22.02.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.4 | 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.16 | 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-aioconsole | DISTRO | https://release-monitoring.org/project/21244 | 0.4.0 | 0.4.1 | python-aiohttp-remotes | DISTRO | https://release-monitoring.org/project/21248 | 1.1.0 | 1.2.0 | python-aiohttp-session | DISTRO | https://release-monitoring.org/project/21250 | 2.10.0 | 2.11.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.2 | python-asgiref | DISTRO | https://release-monitoring.org/project/18462 | 3.3.4 | 3.5.0 | 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.2 | python-boto3 | DISTRO | https://release-monitoring.org/project/08778 | 1.19.2 | 1.20.49 | python-botocore | DISTRO | https://release-monitoring.org/project/08748 | 1.22.2 | 1.23.49 | python-canopen | DISTRO | https://release-monitoring.org/project/23230 | 1.0.0 | 2.0.0b1 | 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-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-cython | DISTRO | https://release-monitoring.org/project/12679 | 0.29.27 | 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-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-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-entrypoints | DISTRO | https://release-monitoring.org/project/12081 | 0.3 | 0.4 | 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-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.4 | python-humanize | DISTRO | https://release-monitoring.org/project/19799 | 3.11.0 | 3.14.0 | 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-iwlib | DISTRO | https://release-monitoring.org/project/51611 | 1.5 | 1.7.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-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-libusb1 | DISTRO | https://release-monitoring.org/project/12301 | 2.0.1 | 3.0.0 | 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-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.2 | python-oauthlib | DISTRO | https://release-monitoring.org/project/05377 | 3.1.1 | 3.2.0 | 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-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 | 9.0.0 | 9.0.1 | python-pip | DISTRO | https://release-monitoring.org/project/06529 | 21.2.4 | 22.0.3 | 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.26 | python-protobuf | DISTRO | https://release-monitoring.org/project/03715 | 3.19.1 | 3.19.4 | 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-pybind | DISTRO | https://release-monitoring.org/project/13384 | 2.9.0 | 2.9.1 | python-pycairo | DISTRO | https://release-monitoring.org/project/13166 | 1.19.1 | 1.20.1 | python-pycryptodomex | DISTRO | https://release-monitoring.org/project/36851 | 3.13.0 | 3.14.1 | python-pydantic | DISTRO | https://release-monitoring.org/project/29768 | 1.8.2 | 1.9.0 | python-pyelftools | DISTRO | https://release-monitoring.org/project/16219 | 0.27 | 0.28 | 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.1 | python-pylibftdi | DISTRO | https://release-monitoring.org/project/21583 | 0.18.1 | 0.20.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.5 | python-pyopenssl | DISTRO | https://release-monitoring.org/project/05535 | 21.0.0 | 22.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 | DISTRO | https://release-monitoring.org/project/03765 | 6.2.5 | 7.0.0 | python-pytest-asyncio | DISTRO | https://release-monitoring.org/project/07273 | 0.15.1 | 0.17.2 | python-pyudev | DISTRO | https://release-monitoring.org/project/08485 | 0.22.0 | 0.23.2 | python-pyusb | DISTRO | https://release-monitoring.org/project/21595 | 1.1.1 | 1.2.1 | 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.2 | python-reentry | DISTRO | https://release-monitoring.org/project/21596 | 1.3.2 | 1.3.3 | python-regex | DISTRO | https://release-monitoring.org/project/05548 | 2021.4.4 | 2022.1.18 | python-requests-oauthlib | DISTRO | https://release-monitoring.org/project/11803 | 1.3.0 | 1.3.1 | python-rpi-gpio | DISTRO | https://release-monitoring.org/project/12026 | 0.7.0 | 0.7.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-s3transfer | DISTRO | https://release-monitoring.org/project/10428 | 0.5.0 | 0.5.1 | 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.4 | 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.8.1 | 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-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.1 | 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.4 | 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 | 22.1.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-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.1 | python-web2py | DISTRO | https://release-monitoring.org/project/20617 | 2.21.1 | 2.22.1 | 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.3 | python3-cython | DISTRO | https://release-monitoring.org/project/12679 | 0.29.27 | 3.0.0a10 | python3-psutil | DISTRO | https://release-monitoring.org/project/03978 | 5.8.0 | 5.9.0 | python3-pycryptodomex | DISTRO | https://release-monitoring.org/project/36851 | 3.13.0 | 3.14.1 | python3-pyelftools | DISTRO | https://release-monitoring.org/project/16219 | 0.27 | 0.28 | python3-regex | DISTRO | https://release-monitoring.org/project/05548 | 2021.4.4 | 2022.1.18 | python3-setuptools | DISTRO | https://release-monitoring.org/project/04021 | 60.7.0 | 60.8.1 | qpid-proton | DISTRO | https://release-monitoring.org/project/15198 | 0.35.0 | 0.36.0 | qt5coap | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.3 | qt5knx | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.3 | qt5mqtt | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.3 | qt5opcua | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.3 | qt5webengine | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.3 | qt5webkit | DISTRO | https://release-monitoring.org/project/07927 | 5.212.0-a... | 6.2.3 | 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 | re2 | DISTRO | https://release-monitoring.org/project/10500 | 2021-11-01 | 2022-02-01 | 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.28.2 | 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 | rygel | DISTRO | https://release-monitoring.org/project/04751 | 0.40.2 | 0.40.3 | s390-tools | DISTRO | https://release-monitoring.org/project/10714 | 2.19.0 | 2.20.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.2 | 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 | safeclib | DISTRO | https://release-monitoring.org/project/21385 | 3.7.1 | 01022022 | samba4 | DISTRO | https://release-monitoring.org/project/04758 | 4.15.4 | 4.15.5 | 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 | screen | DISTRO | https://release-monitoring.org/project/04772 | 4.8.0 | 4.9.0 | ORPH 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.1 | sentry-native | DISTRO | https://release-monitoring.org/project/135639 | 0.4.1 | 0.4.14 | 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.22.0 | sofia-sip | DISTRO | https://release-monitoring.org/project/10509 | 1.13.6-41... | 1.13.7 | 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 | sphinxbase | DISTRO | https://release-monitoring.org/project/20548 | 5prealpha | 0.8 | 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 | strongswan | DISTRO | https://release-monitoring.org/project/04899 | 5.9.4 | 5.9.5 | stunnel | DISTRO | https://release-monitoring.org/project/04901 | 5.60 | 5.62 | sudo | DISTRO | https://release-monitoring.org/project/04906 | 1.9.8p2 | 1.9.9 | ORPH 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 | tcpreplay | DISTRO | https://release-monitoring.org/project/13716 | 4.3.4 | 4.4.0 | ORPH 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 | 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 | 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 | 6.1.3 | 6.1.4 | ORPH upmpdcli | DISTRO | https://release-monitoring.org/project/15848 | 1.5.12 | 1.5.13 | upower | DISTRO | https://release-monitoring.org/project/05056 | 0.99.11 | 0.99.14 | 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.2 | ORPH valijson | DISTRO | https://release-monitoring.org/project/18452 | 0.3 | 0.6 | vim | DISTRO | https://release-monitoring.org/project/05092 | 8.2.4301 | 8.2.4309 | ORPH vnstat | DISTRO | https://release-monitoring.org/project/07283 | 2.8 | 2.9 | 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 | vulkan-headers | DISTRO | https://release-monitoring.org/project/88835 | 1.2.203 | 1.3.205 | ORPH 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.25 | ORPH waylandpp | DISTRO | https://release-monitoring.org/project/16969 | 0.2.8 | 0.2.9 | 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 weston | DISTRO | https://release-monitoring.org/project/13745 | 9.0.0 | 10.0.0 | wilc1000-firmware | DISTRO | https://release-monitoring.org/project/65598 | 14.1 | 15.6 | wine | DISTRO | https://release-monitoring.org/project/05134 | 6.0 | 7.1 | 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.1 | 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.4 | 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-input-libinput | DISTRO | https://release-monitoring.org/project/05782 | 1.2.0 | 1.2.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.4 | 4.16.0 | xinetd | DISTRO | https://release-monitoring.org/project/06382 | 2.3.15 | 2.3.15.4 | xmrig | DISTRO | https://release-monitoring.org/project/17499 | 6.16.3 | 6.16.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.19 | ORPH xterm | DISTRO | https://release-monitoring.org/project/05272 | 367 | 370 | ORPH yaml-cpp | DISTRO | https://release-monitoring.org/project/05284 | 0.6.3 | 0.7.0 | ORPH zabbix | DISTRO | https://release-monitoring.org/project/05492 | 5.4.9 | 5.4.10 | 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 | 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 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 hostapd | CVE-2022-23303 | https://security-tracker.debian.org/tracker/CVE-2022-23303 hostapd | CVE-2022-23304 | https://security-tracker.debian.org/tracker/CVE-2022-23304 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 libpjsip | CVE-2021-37706 | https://security-tracker.debian.org/tracker/CVE-2021-37706 libpjsip | CVE-2021-41141 | https://security-tracker.debian.org/tracker/CVE-2021-41141 libpjsip | CVE-2021-43804 | https://security-tracker.debian.org/tracker/CVE-2021-43804 libpjsip | CVE-2021-43845 | https://security-tracker.debian.org/tracker/CVE-2021-43845 libpjsip | CVE-2022-21722 | https://security-tracker.debian.org/tracker/CVE-2022-21722 libpjsip | CVE-2022-21723 | https://security-tracker.debian.org/tracker/CVE-2022-21723 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 mariadb | CVE-2021-46658 | https://security-tracker.debian.org/tracker/CVE-2021-46658 mariadb | CVE-2021-46659 | https://security-tracker.debian.org/tracker/CVE-2021-46659 mariadb | CVE-2021-46661 | https://security-tracker.debian.org/tracker/CVE-2021-46661 mariadb | CVE-2021-46662 | https://security-tracker.debian.org/tracker/CVE-2021-46662 mariadb | CVE-2021-46663 | https://security-tracker.debian.org/tracker/CVE-2021-46663 mariadb | CVE-2021-46664 | https://security-tracker.debian.org/tracker/CVE-2021-46664 mariadb | CVE-2021-46665 | https://security-tracker.debian.org/tracker/CVE-2021-46665 mariadb | CVE-2021-46667 | https://security-tracker.debian.org/tracker/CVE-2021-46667 mariadb | CVE-2021-46668 | https://security-tracker.debian.org/tracker/CVE-2021-46668 mariadb | CVE-2021-46669 | https://security-tracker.debian.org/tracker/CVE-2021-46669 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 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 polkit | CVE-2021-4034 | https://security-tracker.debian.org/tracker/CVE-2021-4034 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-ipython | CVE-2022-21699 | https://security-tracker.debian.org/tracker/CVE-2022-21699 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-4145 | https://security-tracker.debian.org/tracker/CVE-2021-4145 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 wpa_supplicant | CVE-2022-23303 | https://security-tracker.debian.org/tracker/CVE-2022-23303 wpa_supplicant | CVE-2022-23304 | https://security-tracker.debian.org/tracker/CVE-2022-23304 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-28707 | https://security-tracker.debian.org/tracker/CVE-2021-28707 xen | CVE-2021-28708 | https://security-tracker.debian.org/tracker/CVE-2021-28708 xen | CVE-2021-28711 | https://security-tracker.debian.org/tracker/CVE-2021-28711 xen | CVE-2021-28712 | https://security-tracker.debian.org/tracker/CVE-2021-28712 xen | CVE-2021-28713 | https://security-tracker.debian.org/tracker/CVE-2021-28713 xen | CVE-2022-23033 | https://security-tracker.debian.org/tracker/CVE-2022-23033 xen | CVE-2022-23035 | https://security-tracker.debian.org/tracker/CVE-2022-23035 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 xterm | CVE-2022-24130 | https://security-tracker.debian.org/tracker/CVE-2022-24130 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 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-2022-23852 | https://security-tracker.debian.org/tracker/CVE-2022-23852 expat | CVE-2022-23990 | https://security-tracker.debian.org/tracker/CVE-2022-23990 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 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-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 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 hostapd | CVE-2022-23303 | https://security-tracker.debian.org/tracker/CVE-2022-23303 hostapd | CVE-2022-23304 | https://security-tracker.debian.org/tracker/CVE-2022-23304 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 libldns | CVE-2020-19860 | https://security-tracker.debian.org/tracker/CVE-2020-19860 libldns | CVE-2020-19861 | https://security-tracker.debian.org/tracker/CVE-2020-19861 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 libpjsip | CVE-2021-37706 | https://security-tracker.debian.org/tracker/CVE-2021-37706 libpjsip | CVE-2021-41141 | https://security-tracker.debian.org/tracker/CVE-2021-41141 libpjsip | CVE-2021-43804 | https://security-tracker.debian.org/tracker/CVE-2021-43804 libpjsip | CVE-2021-43845 | https://security-tracker.debian.org/tracker/CVE-2021-43845 libpjsip | CVE-2022-21722 | https://security-tracker.debian.org/tracker/CVE-2022-21722 libpjsip | CVE-2022-21723 | https://security-tracker.debian.org/tracker/CVE-2022-21723 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 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 mariadb | CVE-2021-46658 | https://security-tracker.debian.org/tracker/CVE-2021-46658 mariadb | CVE-2021-46659 | https://security-tracker.debian.org/tracker/CVE-2021-46659 mariadb | CVE-2021-46661 | https://security-tracker.debian.org/tracker/CVE-2021-46661 mariadb | CVE-2021-46662 | https://security-tracker.debian.org/tracker/CVE-2021-46662 mariadb | CVE-2021-46663 | https://security-tracker.debian.org/tracker/CVE-2021-46663 mariadb | CVE-2021-46664 | https://security-tracker.debian.org/tracker/CVE-2021-46664 mariadb | CVE-2021-46665 | https://security-tracker.debian.org/tracker/CVE-2021-46665 mariadb | CVE-2021-46667 | https://security-tracker.debian.org/tracker/CVE-2021-46667 mariadb | CVE-2021-46668 | https://security-tracker.debian.org/tracker/CVE-2021-46668 mariadb | CVE-2021-46669 | https://security-tracker.debian.org/tracker/CVE-2021-46669 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 minetest | CVE-2022-24300 | https://security-tracker.debian.org/tracker/CVE-2022-24300 minetest | CVE-2022-24301 | https://security-tracker.debian.org/tracker/CVE-2022-24301 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 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 polkit | CVE-2021-4034 | https://security-tracker.debian.org/tracker/CVE-2021-4034 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 protobuf | CVE-2021-22570 | https://security-tracker.debian.org/tracker/CVE-2021-22570 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-ipython | CVE-2022-21699 | https://security-tracker.debian.org/tracker/CVE-2022-21699 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 qemu | CVE-2021-4145 | https://security-tracker.debian.org/tracker/CVE-2021-4145 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 rust | CVE-2022-21658 | https://security-tracker.debian.org/tracker/CVE-2022-21658 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-2022-0393 | https://security-tracker.debian.org/tracker/CVE-2022-0393 vim | CVE-2022-0408 | https://security-tracker.debian.org/tracker/CVE-2022-0408 vim | CVE-2022-0413 | https://security-tracker.debian.org/tracker/CVE-2022-0413 vim | CVE-2022-0417 | https://security-tracker.debian.org/tracker/CVE-2022-0417 vim | CVE-2022-0443 | https://security-tracker.debian.org/tracker/CVE-2022-0443 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 wpa_supplicant | CVE-2022-23303 | https://security-tracker.debian.org/tracker/CVE-2022-23303 wpa_supplicant | CVE-2022-23304 | https://security-tracker.debian.org/tracker/CVE-2022-23304 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 xen | CVE-2022-23033 | https://security-tracker.debian.org/tracker/CVE-2022-23033 xen | CVE-2022-23035 | https://security-tracker.debian.org/tracker/CVE-2022-23035 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 xterm | CVE-2022-24130 | https://security-tracker.debian.org/tracker/CVE-2022-24130 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 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-2022-23852 | https://security-tracker.debian.org/tracker/CVE-2022-23852 expat | CVE-2022-23990 | https://security-tracker.debian.org/tracker/CVE-2022-23990 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 hostapd | CVE-2022-23303 | https://security-tracker.debian.org/tracker/CVE-2022-23303 hostapd | CVE-2022-23304 | https://security-tracker.debian.org/tracker/CVE-2022-23304 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 libldns | CVE-2020-19860 | https://security-tracker.debian.org/tracker/CVE-2020-19860 libldns | CVE-2020-19861 | https://security-tracker.debian.org/tracker/CVE-2020-19861 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libpjsip | CVE-2021-37706 | https://security-tracker.debian.org/tracker/CVE-2021-37706 libpjsip | CVE-2021-41141 | https://security-tracker.debian.org/tracker/CVE-2021-41141 libpjsip | CVE-2021-43804 | https://security-tracker.debian.org/tracker/CVE-2021-43804 libpjsip | CVE-2021-43845 | https://security-tracker.debian.org/tracker/CVE-2021-43845 libpjsip | CVE-2022-21722 | https://security-tracker.debian.org/tracker/CVE-2022-21722 libpjsip | CVE-2022-21723 | https://security-tracker.debian.org/tracker/CVE-2022-21723 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 mariadb | CVE-2021-46658 | https://security-tracker.debian.org/tracker/CVE-2021-46658 mariadb | CVE-2021-46659 | https://security-tracker.debian.org/tracker/CVE-2021-46659 mariadb | CVE-2021-46661 | https://security-tracker.debian.org/tracker/CVE-2021-46661 mariadb | CVE-2021-46662 | https://security-tracker.debian.org/tracker/CVE-2021-46662 mariadb | CVE-2021-46663 | https://security-tracker.debian.org/tracker/CVE-2021-46663 mariadb | CVE-2021-46664 | https://security-tracker.debian.org/tracker/CVE-2021-46664 mariadb | CVE-2021-46665 | https://security-tracker.debian.org/tracker/CVE-2021-46665 mariadb | CVE-2021-46667 | https://security-tracker.debian.org/tracker/CVE-2021-46667 mariadb | CVE-2021-46668 | https://security-tracker.debian.org/tracker/CVE-2021-46668 mariadb | CVE-2021-46669 | https://security-tracker.debian.org/tracker/CVE-2021-46669 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 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 polkit | CVE-2021-4034 | https://security-tracker.debian.org/tracker/CVE-2021-4034 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-ipython | CVE-2022-21699 | https://security-tracker.debian.org/tracker/CVE-2022-21699 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 qemu | CVE-2021-4145 | https://security-tracker.debian.org/tracker/CVE-2021-4145 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 rust | CVE-2022-21658 | https://security-tracker.debian.org/tracker/CVE-2022-21658 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-2022-0393 | https://security-tracker.debian.org/tracker/CVE-2022-0393 vim | CVE-2022-0408 | https://security-tracker.debian.org/tracker/CVE-2022-0408 vim | CVE-2022-0413 | https://security-tracker.debian.org/tracker/CVE-2022-0413 vim | CVE-2022-0417 | https://security-tracker.debian.org/tracker/CVE-2022-0417 vim | CVE-2022-0443 | https://security-tracker.debian.org/tracker/CVE-2022-0443 webkitgtk | CVE-2021-42762 | https://security-tracker.debian.org/tracker/CVE-2021-42762 wpa_supplicant | CVE-2022-23303 | https://security-tracker.debian.org/tracker/CVE-2022-23303 wpa_supplicant | CVE-2022-23304 | https://security-tracker.debian.org/tracker/CVE-2022-23304 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 xen | CVE-2022-23033 | https://security-tracker.debian.org/tracker/CVE-2022-23033 xen | CVE-2022-23035 | https://security-tracker.debian.org/tracker/CVE-2022-23035 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 xterm | CVE-2022-24130 | https://security-tracker.debian.org/tracker/CVE-2022-24130 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 -- http://autobuild.buildroot.net From peter at korsgaard.com Mon Feb 7 07:31:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Feb 2022 08:31:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/lm-sensors: update LM_SENSORS_VERSION In-Reply-To: <20220206145108.1757971-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 6 Feb 2022 15:51:08 +0100") References: <20220206145108.1757971-1-fontaine.fabrice@gmail.com> Message-ID: <875ypruo88.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Update LM_SENSORS_VERSION to make it match what is returned by > https://release-monitoring.org > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 7 07:31:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Feb 2022 08:31:55 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-lmdb: bump to version 1.3.0 In-Reply-To: <20220206144148.1755592-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 6 Feb 2022 15:41:48 +0100") References: <20220206144148.1755592-1-fontaine.fabrice@gmail.com> Message-ID: <871r0fuo7o.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Update indentation in hash file (two spaces) > https://github.com/jnwatson/py-lmdb/blob/py-lmdb_1.3.0/ChangeLog > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 7 07:32:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Feb 2022 08:32:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/jack1: drop celt comment In-Reply-To: <20220206143112.1752984-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 6 Feb 2022 15:31:12 +0100") References: <20220206143112.1752984-1-fontaine.fabrice@gmail.com> Message-ID: <87wni7t9n1.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Drop celt comment which is not needed since removal of celt051 in commit > b32efbdb0354557db48852478b99080705ba315b > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 7 07:32:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Feb 2022 08:32:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/ofono: bump to version 1.34 In-Reply-To: <20220206141804.1744721-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 6 Feb 2022 15:18:04 +0100") References: <20220206141804.1744721-1-fontaine.fabrice@gmail.com> Message-ID: <87sfsvt9mi.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Update indentation in hash file (two spaces) > https://git.kernel.org/pub/scm/network/ofono/ofono.git/tree/ChangeLog?h=1.34 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 7 07:32:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Feb 2022 08:32:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-tinyrpc: bump to version 1.1.4 In-Reply-To: <20220206143535.1754289-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 6 Feb 2022 15:35:35 +0100") References: <20220206143535.1754289-1-fontaine.fabrice@gmail.com> Message-ID: <87o83jt9lz.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://github.com/mbr/tinyrpc/compare/1.1.1...1.1.4 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 7 07:33:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Feb 2022 08:33:08 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/python-pyusb: bump to version 1.2.1 In-Reply-To: <20220206143918.1755288-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 6 Feb 2022 15:39:18 +0100") References: <20220206143918.1755288-1-fontaine.fabrice@gmail.com> Message-ID: <87k0e7t9l7.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Update indentation in hash file (two spaces) > https://github.com/pyusb/pyusb/releases/tag/v1.2.0 > https://github.com/pyusb/pyusb/releases/tag/v1.2.1 > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2: > - Fix typo in commit title (pysub -> pyusb) Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 7 07:35:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Feb 2022 08:35:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/lua-cffi: fix spaces In-Reply-To: <20220206195643.2522277-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 6 Feb 2022 20:56:43 +0100") References: <20220206195643.2522277-1-fontaine.fabrice@gmail.com> Message-ID: <87czjzt9h9.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Commit 13114d0f9352531e5d7ebed45cd3f679407c61d9 forgot to add spaces > before and after '=' and added a spurious space in Config.in > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 7 07:31:18 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Feb 2022 08:31:18 +0100 Subject: [Buildroot] [git commit] package/jack1: drop celt comment Message-ID: <20220207072828.5897882BB8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c6e200383cdf738f58fe1c6e42d3d5a10f7c1a62 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop celt comment which is not needed since removal of celt051 in commit b32efbdb0354557db48852478b99080705ba315b Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/jack1/jack1.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/jack1/jack1.mk b/package/jack1/jack1.mk index 2f97434ebe..311f7c9ba0 100644 --- a/package/jack1/jack1.mk +++ b/package/jack1/jack1.mk @@ -11,8 +11,6 @@ JACK1_LICENSE = GPL-2.0+ (jack server), LGPL-2.1+ (jack library) JACK1_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL JACK1_INSTALL_STAGING = YES -# Dependency to celt can't be met: jack1 requires celt >= 0.8.0 but we -# only have 0.5.1.3 and we cannot upgrade. JACK1_DEPENDENCIES = host-pkgconf alsa-lib berkeleydb libsamplerate libsndfile ifeq ($(BR2_PACKAGE_READLINE),y) From peter at korsgaard.com Mon Feb 7 07:30:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Feb 2022 08:30:28 +0100 Subject: [Buildroot] [git commit] package/lm-sensors: update LM_SENSORS_VERSION Message-ID: <20220207072828.4F4B782B95@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=521afeab9b7c0b07a849355e8b1c1fde0965c84f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update LM_SENSORS_VERSION to make it match what is returned by https://release-monitoring.org Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/lm-sensors/lm-sensors.hash | 2 +- package/lm-sensors/lm-sensors.mk | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/lm-sensors/lm-sensors.hash b/package/lm-sensors/lm-sensors.hash index 0ca07b7e69..c941043343 100644 --- a/package/lm-sensors/lm-sensors.hash +++ b/package/lm-sensors/lm-sensors.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 0591f9fa0339f0d15e75326d0365871c2d4e2ed8aa1ff759b3a55d3734b7d197 lm-sensors-3-6-0.tar.gz +sha256 0591f9fa0339f0d15e75326d0365871c2d4e2ed8aa1ff759b3a55d3734b7d197 lm-sensors-3.6.0.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL diff --git a/package/lm-sensors/lm-sensors.mk b/package/lm-sensors/lm-sensors.mk index 8975efaffa..1bf27fc25a 100644 --- a/package/lm-sensors/lm-sensors.mk +++ b/package/lm-sensors/lm-sensors.mk @@ -4,8 +4,9 @@ # ################################################################################ -LM_SENSORS_VERSION = 3-6-0 -LM_SENSORS_SITE = $(call github,lm-sensors,lm-sensors,V$(LM_SENSORS_VERSION)) +LM_SENSORS_VERSION = 3.6.0 +LM_SENSORS_SITE = \ + $(call github,lm-sensors,lm-sensors,V$(subst .,-,$(LM_SENSORS_VERSION))) LM_SENSORS_INSTALL_STAGING = YES LM_SENSORS_DEPENDENCIES = host-bison host-flex LM_SENSORS_LICENSE = LGPL-2.1+ (libsensors), GPL-2.0+ (programs) From peter at korsgaard.com Mon Feb 7 07:32:18 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Feb 2022 08:32:18 +0100 Subject: [Buildroot] [git commit] package/ofono: bump to version 1.34 Message-ID: <20220207072828.6FFB4814A4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=91a0425d066fd073c8dd9907b902010162d5954b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update indentation in hash file (two spaces) https://git.kernel.org/pub/scm/network/ofono/ofono.git/tree/ChangeLog?h=1.34 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/ofono/ofono.hash | 4 ++-- package/ofono/ofono.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ofono/ofono.hash b/package/ofono/ofono.hash index 02245a46f4..7edef0eb80 100644 --- a/package/ofono/ofono.hash +++ b/package/ofono/ofono.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/network/ofono/sha256sums.asc -sha256 a15c5d28096c10eb30e47a68b6dc2e7c4a5a99d7f4cfedf0b69624f33d859e9b ofono-1.31.tar.xz +sha256 c0b96d3013447ec2bcb74579bef90e4e59c68dbfa4b9c6fbce5d12401a43aac7 ofono-1.34.tar.xz # Locally computed -sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING +sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/package/ofono/ofono.mk b/package/ofono/ofono.mk index 57d6cab470..b7a2a923f9 100644 --- a/package/ofono/ofono.mk +++ b/package/ofono/ofono.mk @@ -4,7 +4,7 @@ # ################################################################################ -OFONO_VERSION = 1.31 +OFONO_VERSION = 1.34 OFONO_SOURCE = ofono-$(OFONO_VERSION).tar.xz OFONO_SITE = $(BR2_KERNEL_MIRROR)/linux/network/ofono OFONO_LICENSE = GPL-2.0 From peter at korsgaard.com Mon Feb 7 07:32:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Feb 2022 08:32:36 +0100 Subject: [Buildroot] [git commit] package/python-tinyrpc: bump to version 1.1.4 Message-ID: <20220207072828.78EBD82BB8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=73d427137cc2867f1018261f61cf9c514f50a6fb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/mbr/tinyrpc/compare/1.1.1...1.1.4 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/python-tinyrpc/python-tinyrpc.hash | 4 ++-- package/python-tinyrpc/python-tinyrpc.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-tinyrpc/python-tinyrpc.hash b/package/python-tinyrpc/python-tinyrpc.hash index c5bdad567e..d4bd348e61 100644 --- a/package/python-tinyrpc/python-tinyrpc.hash +++ b/package/python-tinyrpc/python-tinyrpc.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/tinyrpc/json -md5 34d7b41ab48297b6b8fbf937e3d43a57 tinyrpc-1.1.1.tar.gz -sha256 9e68d7b9688dac8deaa342a2507d04f0b2ece64a9d19382aa2ee13d692e87d7f tinyrpc-1.1.1.tar.gz +md5 cc7e62891eee806dfbbafb6e3875825e tinyrpc-1.1.4.tar.gz +sha256 c99f412e5d9849c2deb468ea37fee2faf12fbc95bdd3616ae5c276ea195ed6bd tinyrpc-1.1.4.tar.gz # Locally computed sha256 checksums sha256 587f1ea174824613f4a7e0d7fb95fda000a7f58ca17df12416e014c9ee82e619 LICENSE diff --git a/package/python-tinyrpc/python-tinyrpc.mk b/package/python-tinyrpc/python-tinyrpc.mk index f3f7dcc52b..e976778fa2 100644 --- a/package/python-tinyrpc/python-tinyrpc.mk +++ b/package/python-tinyrpc/python-tinyrpc.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TINYRPC_VERSION = 1.1.1 +PYTHON_TINYRPC_VERSION = 1.1.4 PYTHON_TINYRPC_SOURCE = tinyrpc-$(PYTHON_TINYRPC_VERSION).tar.gz -PYTHON_TINYRPC_SITE = https://files.pythonhosted.org/packages/6a/63/0851365686da1ca9ab03d63b035eccf87a1d85b743ce07d079462350da33 +PYTHON_TINYRPC_SITE = https://files.pythonhosted.org/packages/d2/86/2741f0c74cc339416c9803b6393eaf230254ecf36ffd839614799e15a202 PYTHON_TINYRPC_SETUP_TYPE = setuptools PYTHON_TINYRPC_LICENSE = MIT PYTHON_TINYRPC_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 7 07:31:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Feb 2022 08:31:46 +0100 Subject: [Buildroot] [git commit] package/python-lmdb: bump to version 1.3.0 Message-ID: <20220207072828.6293082BC8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cb2d17921bfb1f34601f1f2fcf27aa89a88a9591 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update indentation in hash file (two spaces) https://github.com/jnwatson/py-lmdb/blob/py-lmdb_1.3.0/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/python-lmdb/python-lmdb.hash | 6 +++--- package/python-lmdb/python-lmdb.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-lmdb/python-lmdb.hash b/package/python-lmdb/python-lmdb.hash index e7b8ae3455..e50c35df67 100644 --- a/package/python-lmdb/python-lmdb.hash +++ b/package/python-lmdb/python-lmdb.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/lmdb/json -md5 b8f4a2cd1748e8a5f5e352d1cb3d4350 lmdb-1.2.1.tar.gz -sha256 5f76a90ebd08922acca11948779b5055f7a262687178e9e94f4e804b9f8465bc lmdb-1.2.1.tar.gz +md5 3c955c49be10a7a07a2fcd54d180c3af lmdb-1.3.0.tar.gz +sha256 60a11efc21aaf009d06518996360eed346f6000bfc9de05114374230879f992e lmdb-1.3.0.tar.gz # Locally computed sha256 checksums -sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE +sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE diff --git a/package/python-lmdb/python-lmdb.mk b/package/python-lmdb/python-lmdb.mk index 33c48cc8c7..fba168d340 100644 --- a/package/python-lmdb/python-lmdb.mk +++ b/package/python-lmdb/python-lmdb.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_LMDB_VERSION = 1.2.1 +PYTHON_LMDB_VERSION = 1.3.0 PYTHON_LMDB_SOURCE = lmdb-$(PYTHON_LMDB_VERSION).tar.gz -PYTHON_LMDB_SITE = https://files.pythonhosted.org/packages/2f/df/3aea5279753cb8ab0c96dec43106e24f388d4179d5224f6d3e652016c095 +PYTHON_LMDB_SITE = https://files.pythonhosted.org/packages/ed/61/41f3c7cbd8a67202ef24fad3375ed936093a0547dc645581dd11c09581b7 PYTHON_LMDB_LICENSE = OLDAP-2.8 PYTHON_LMDB_LICENSE_FILES = LICENSE PYTHON_LMDB_SETUP_TYPE = setuptools From peter at korsgaard.com Mon Feb 7 07:32:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Feb 2022 08:32:56 +0100 Subject: [Buildroot] [git commit] package/python-pyusb: bump to version 1.2.1 Message-ID: <20220207072828.82C93814A4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a181757f96bc83bb7ddaafcfb1df9f8f18d4bc0d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update indentation in hash file (two spaces) https://github.com/pyusb/pyusb/releases/tag/v1.2.0 https://github.com/pyusb/pyusb/releases/tag/v1.2.1 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/python-pyusb/python-pyusb.hash | 8 ++++---- package/python-pyusb/python-pyusb.mk | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-pyusb/python-pyusb.hash b/package/python-pyusb/python-pyusb.hash index 9c634ef722..f08b212b3e 100644 --- a/package/python-pyusb/python-pyusb.hash +++ b/package/python-pyusb/python-pyusb.hash @@ -1,5 +1,5 @@ -# md5 from https://pypi.python.org/pypi/pyusb/json -md5 a9db479f1fb914e91d3106e67a13ae09 pyusb-1.1.1.tar.gz -# Locally computed -sha256 7d449ad916ce58aff60b89aae0b65ac130f289c24d6a5b7b317742eccffafc38 pyusb-1.1.1.tar.gz +# md5, sha256 from https://pypi.org/pypi/pyusb/json +md5 880008dff32dac8f58076b4e534492d9 pyusb-1.2.1.tar.gz +sha256 a4cc7404a203144754164b8b40994e2849fde1cfff06b08492f12fff9d9de7b9 pyusb-1.2.1.tar.gz +# Locally computed sha256 checksums sha256 03e39fdcee9c18f2f9d0c3500a993ddeac050695eb81070ea41347587c76a7fe LICENSE diff --git a/package/python-pyusb/python-pyusb.mk b/package/python-pyusb/python-pyusb.mk index dc81efde9e..2f4f9581b6 100644 --- a/package/python-pyusb/python-pyusb.mk +++ b/package/python-pyusb/python-pyusb.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYUSB_VERSION = 1.1.1 +PYTHON_PYUSB_VERSION = 1.2.1 PYTHON_PYUSB_SOURCE = pyusb-$(PYTHON_PYUSB_VERSION).tar.gz -PYTHON_PYUSB_SITE = https://files.pythonhosted.org/packages/b9/8d/25c4e446a07e918eb39b5af25c4a83a89db95ae44e4ed5a46c3c53b0a4d6 +PYTHON_PYUSB_SITE = https://files.pythonhosted.org/packages/d9/6e/433a5614132576289b8643fe598dd5d51b16e130fd591564be952e15bb45 PYTHON_PYUSB_LICENSE = BSD-3-Clause PYTHON_PYUSB_LICENSE_FILES = LICENSE PYTHON_PYUSB_SETUP_TYPE = setuptools From peter at korsgaard.com Mon Feb 7 07:35:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Feb 2022 08:35:09 +0100 Subject: [Buildroot] [git commit] package/lua-cffi: fix spaces Message-ID: <20220207072828.8BF4882BC8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c33cecfac4d48346611b56e6f1a553a1fe86d704 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 13114d0f9352531e5d7ebed45cd3f679407c61d9 forgot to add spaces before and after '=' and added a spurious space in Config.in Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/lua-cffi/Config.in | 2 +- package/lua-cffi/lua-cffi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lua-cffi/Config.in b/package/lua-cffi/Config.in index 64a36e1de4..f4a760ce0d 100644 --- a/package/lua-cffi/Config.in +++ b/package/lua-cffi/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_LUA_CFFI bool "lua-cffi" depends on !BR2_PACKAGE_LUAJIT - depends on BR2_TOOLCHAIN_HAS_THREADS # libffi + depends on BR2_TOOLCHAIN_HAS_THREADS # libffi depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_LIBFFI diff --git a/package/lua-cffi/lua-cffi.mk b/package/lua-cffi/lua-cffi.mk index 07d84ad5fa..964f49f030 100644 --- a/package/lua-cffi/lua-cffi.mk +++ b/package/lua-cffi/lua-cffi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_CFFI_VERSION=0.2.1 +LUA_CFFI_VERSION = 0.2.1 LUA_CFFI_SITE = $(call github,q66,cffi-lua,v$(LUA_CFFI_VERSION)) LUA_CFFI_LICENSE = MIT LUA_CFFI_LICENSE_FILES = COPYING.md From peter at korsgaard.com Mon Feb 7 07:37:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Feb 2022 08:37:33 +0100 Subject: [Buildroot] [PATCH] package/rauc: d-bus support is optional In-Reply-To: <20220205144306.29481-1-peter@korsgaard.com> (Peter Korsgaard's message of "Sat, 5 Feb 2022 15:43:04 +0100") References: <20220205144306.29481-1-peter@korsgaard.com> Message-ID: <878runt9du.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > As pointed out by Jan L?bbe, D-Bus support is optional: >> You can build without D-Bus (./configure --disable-service). > So drop it from the required dependencies and add a RAUC_DBUS sub option > like it is done for network/json. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 7 07:37:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Feb 2022 08:37:21 +0100 Subject: [Buildroot] [git commit] package/rauc: d-bus support is optional Message-ID: <20220207073030.B5FD482D5B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=72308ab9a32de6e8b4b23e42f115ed5ee87e5f33 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master As pointed out by Jan L??bbe, D-Bus support is optional: > You can build without D-Bus (./configure --disable-service). So drop it from the required dependencies and add a RAUC_DBUS sub option like it is done for network/json. Signed-off-by: Peter Korsgaard --- package/rauc/Config.in | 8 +++++++- package/rauc/rauc.mk | 9 ++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/package/rauc/Config.in b/package/rauc/Config.in index 676ff42b51..b4f7b81948 100644 --- a/package/rauc/Config.in +++ b/package/rauc/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_RAUC depends on BR2_USE_WCHAR # glib2 select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_DBUS select BR2_PACKAGE_SQUASHFS # run-time dependency select BR2_PACKAGE_UBOOT_TOOLS if BR2_TARGET_UBOOT # run-time dependency select BR2_PACKAGE_UBOOT_TOOLS_FWPRINTENV if BR2_TARGET_UBOOT @@ -19,6 +18,13 @@ config BR2_PACKAGE_RAUC if BR2_PACKAGE_RAUC +config BR2_PACKAGE_RAUC_DBUS + bool "dbus support" + select BR2_PACKAGE_DBUS + help + This option enables support for controlling rauc through + D-Bus. + config BR2_PACKAGE_RAUC_NETWORK bool "network support" select BR2_PACKAGE_LIBCURL diff --git a/package/rauc/rauc.mk b/package/rauc/rauc.mk index 4fb3ddde3e..99efc16c2f 100644 --- a/package/rauc/rauc.mk +++ b/package/rauc/rauc.mk @@ -10,7 +10,14 @@ RAUC_SOURCE = rauc-$(RAUC_VERSION).tar.xz RAUC_LICENSE = LGPL-2.1 RAUC_LICENSE_FILES = COPYING RAUC_CPE_ID_VENDOR = pengutronix -RAUC_DEPENDENCIES = host-pkgconf openssl libglib2 dbus +RAUC_DEPENDENCIES = host-pkgconf openssl libglib2 + +ifeq ($(BR2_PACKAGE_RAUC_DBUS),y) +RAUC_CONF_OPTS += --enable-service +RAUC_DEPENDENCIES += dbus +else +RAUC_CONF_OPTS += --disable-service +endif ifeq ($(BR2_PACKAGE_RAUC_NETWORK),y) RAUC_CONF_OPTS += --enable-network From arnout at mind.be Mon Feb 7 07:52:55 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 7 Feb 2022 08:52:55 +0100 Subject: [Buildroot] [git commit] support/testing: fix test_lua_cffi.py flake8 error Message-ID: <20220207074629.4D4D982815@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=11f8b9fb45aee2d83fffd8d57f5c4ccfc1b1f613 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master support/testing/tests/package/test_lua_cffi.py:14:1: W391 blank line at end of file Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- support/testing/tests/package/test_lua_cffi.py | 1 - 1 file changed, 1 deletion(-) diff --git a/support/testing/tests/package/test_lua_cffi.py b/support/testing/tests/package/test_lua_cffi.py index 7f56eef566..32547a4ae1 100644 --- a/support/testing/tests/package/test_lua_cffi.py +++ b/support/testing/tests/package/test_lua_cffi.py @@ -11,4 +11,3 @@ class TestLuaLuaCffi(TestLuaBase): def test_run(self): self.login() self.module_test("cffi") - From thomas.petazzoni at bootlin.com Mon Feb 7 07:55:17 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 7 Feb 2022 08:55:17 +0100 Subject: [Buildroot] [PATCH 01/16] board/aarch64-efi/genimage-efi: convert partition-type-uuid to single letter notation In-Reply-To: <20220206213657.GA457876@scaer> References: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> <20220206200532.2758493-2-giulio.benetti@benettiengineering.com> <20220206213657.GA457876@scaer> Message-ID: <20220207085517.5c13c097@windsurf> Hello, On Sun, 6 Feb 2022 22:36:57 +0100 "Yann E. MORIN" wrote: > > partition root { > > - partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae > > + partition-type-uuid = L > > As we discussed on IRC, this is not the same thing. genimage will extend > the 'L' shorthand to the full UUID 0fc63daf-8483-4772-8e79-3d69d8477de4, > which is different. And? Is that really important? > So I don't think uaing the shorthands are correct. Why? > The UUID assignments are available on Wikipedia: > https://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs > > But the systemd docuemntation has extra UUID definitions: > https://man.archlinux.org/man/systemd-gpt-auto-generator.8 Yes, but how useful are they? Unless these systemd-defined UUID are really relevant, I would prefer that we use the shortcuts provided by genimage wherever possible, and only rely on using the full UUID for special cases, such as the board/sifive/hifive-unleashed/genimage_sdcard.cfg (PATCH 15/16). This way, it would be pretty clear that we have the "common cases" (boot partition, rootfs partition) and the "odd/special cases". Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From Eugen.Hristev at microchip.com Mon Feb 7 08:44:31 2022 From: Eugen.Hristev at microchip.com (Eugen.Hristev at microchip.com) Date: Mon, 7 Feb 2022 08:44:31 +0000 Subject: [Buildroot] [PATCH v3 1/2] configs/microchip_sama7g5ek_mmc_defconfig: set custom linux version to 5.15.21 and add host openssl for linux In-Reply-To: <888aa13f-277c-f4a0-2447-79d58145816d@benettiengineering.com> References: <20220206115156.6042cc1b@windsurf> <20220206112620.1637342-1-giulio.benetti@benettiengineering.com> <20220206112620.1637342-2-giulio.benetti@benettiengineering.com> <20220206131656.16e2c8a6@windsurf> <0f8fcb54-806c-fb0b-27ea-38eb938a725f@microchip.com> <888aa13f-277c-f4a0-2447-79d58145816d@benettiengineering.com> Message-ID: On 2/6/22 9:51 PM, Giulio Benetti wrote: > Hi Eugen, Thomas, Ludovic, > > On 06/02/22 20:39, Eugen.Hristev at microchip.com wrote: >> On 2/6/22 4:25 PM, Giulio Benetti wrote: >>> Hi Thomas, >>> >>> On 06/02/22 13:16, Thomas Petazzoni wrote: >>>> On Sun,? 6 Feb 2022 12:26:19 +0100 >>>> Giulio Benetti wrote: >>>> >>>>> Fixes: >>>>> https://gitlab.com/ymorin/buildroot/-/jobs/2035821098 >>>>> >>>>> Signed-off-by: Giulio Benetti >>>> >>>> Did you actually test on HW that 5.15.21 was working? >>> >>> Unfortunately I don't have board, so no. >>> >>>> Shouldn't this be >>>> done by the original submitter of the defconfig. >>>> >>>> Eugen, Ludovic? >> >> I can test it. Do you have a built already done with it on top that I >> could download ? (would certainly speed things up) > > Here are the 2 links with the prebuilt images for both boards: > https://www.dropbox.com/s/av9vz28459hakjl/microchip_sama7g5ek_mmc_dev-sdcard.img?dl=0 > > https://www.dropbox.com/s/77t2tru95f6l0wk/microchip_sama7g5ek_mmc-sdcard.img?dl=0 > > >> I do not really understand why we need to have a fixed kernel version. >> This board works with latest LTS starting from 5.15. Can't buildroot >> just select that ? > > It can't because otherwise, once Buildroot Latest Linux version gets > bumped(like 5.16 etc.), your defconfig will be built with a new and > untested Linux version(i.e 5.16). So we need to set a specific version, > test it, commit it, and in the future we can bump it, wait for a HW > testing, commit it etc. > >> And why just adding the missing dependency does not fix things. > > Because that only chooses the "Custom kernel headers series" and not > Linux version, so once Latest version is bumped(i.e. to 5.16) it won't > be valid anymore. The point here is that this: > BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15 > is needed because of these: > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.21" > > and these ^^^ allow us to have a stable, HW tested defconfig. > >> (I remember buildroot had something like kernel latest version to pick >> up ). > > That is not what we want because of above explanation. It can result in > a non working defconfig. Booting Linux on physical CPU 0x0 Linux version 5.15.21 (br-user at 73343cda1592) (arm-buildroot-linux-uclibcgnueabihf-gcc.br_real (Buildroot 2021.11-1538-g036577d6b5) 10.3.0, GNU ld (GNU Binutils) 2.36.1) #1 Sun Feb 6 14:40:03 UTC 2022 CPU: ARMv7 Processor [410fc075] revision 5 (ARMv7), cr=10c53c7d # cat /etc/os-release NAME=Buildroot VERSION=2021.11-1538-g036577d6b5 ID=buildroot VERSION_ID=2022.02-git PRETTY_NAME="Buildroot 2022.02-git" # It looks to boot fine. Tested-by: Eugen Hristev > > Best regards > -- > Giulio Benetti > Benetti Engineering sas From Eugen.Hristev at microchip.com Mon Feb 7 08:53:42 2022 From: Eugen.Hristev at microchip.com (Eugen.Hristev at microchip.com) Date: Mon, 7 Feb 2022 08:53:42 +0000 Subject: [Buildroot] [PATCH v3 2/2] configs/microchip_sama7g5ek_mmc_dev_defconfig: set custom linux version to 5.15.21 and add host openssl for linux In-Reply-To: <20220206112620.1637342-3-giulio.benetti@benettiengineering.com> References: <20220206115156.6042cc1b@windsurf> <20220206112620.1637342-1-giulio.benetti@benettiengineering.com> <20220206112620.1637342-3-giulio.benetti@benettiengineering.com> Message-ID: On 2/6/22 1:26 PM, Giulio Benetti wrote: > Fixes: > https://gitlab.com/ymorin/buildroot/-/jobs/2035821100 > > Signed-off-by: Giulio Benetti > --- > V1->V2: > * add host openssl linux > V2->V3: > * set custom linux version as suggested by Thomas > --- > configs/microchip_sama7g5ek_mmc_dev_defconfig | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/configs/microchip_sama7g5ek_mmc_dev_defconfig b/configs/microchip_sama7g5ek_mmc_dev_defconfig > index 3253bce401..c11ea2f518 100644 > --- a/configs/microchip_sama7g5ek_mmc_dev_defconfig > +++ b/configs/microchip_sama7g5ek_mmc_dev_defconfig > @@ -1,6 +1,7 @@ > BR2_arm=y > BR2_cortex_a7=y > BR2_ARM_FPU_NEON_VFPV4=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > BR2_TOOLCHAIN_BUILDROOT_WCHAR=y > BR2_PTHREAD_DEBUG=y > BR2_TOOLCHAIN_BUILDROOT_CXX=y > @@ -8,9 +9,12 @@ BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y > BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/microchip/sama7g5ek/genimage.cfg" > BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.21" > BR2_LINUX_KERNEL_DEFCONFIG="sama7" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama7g5ek" > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > BR2_PACKAGE_LINUX_TOOLS_IIO=y > BR2_PACKAGE_BZIP2=y > BR2_PACKAGE_XZ=y > -- > 2.25.1 > Hi, This one boots , but it has a small problem Here is the log : Waiting for root device /dev/mmcblk1p2... mmc1: new SDHC card at address aaaa mmcblk1: mmc1:aaaa SL16G 14.8 GiB mmcblk1: p1 p2 EXT4-fs (mmcblk1p2): mounted filesystem with ordered data mode. Opts: (null). Quota mode: disabled. VFS: Mounted root (ext4 filesystem) on device 179:2. devtmpfs: mounted Freeing unused kernel image (initmem) memory: 1024K Run /sbin/init as init process mmc0: new MMC card at address 0001 mmcblk0: mmc0:0001 S40004 3.64 GiB mmcblk0: p1 mmcblk0boot0: mmc0:0001 S40004 4.00 MiB mmcblk0boot1: mmc0:0001 S40004 4.00 MiB mmcblk0rpmb: mmc0:0001 S40004 4.00 MiB, chardev (246:0) EXT4-fs (mmcblk1p2): re-mounted. Opts: (null). Quota mode: disabled. Starting syslogd: OK Starting klogd: OK Running sysctl: OK Populating /dev using udev: udevd[101]: starting version 3.2.11 random: udevd: uninitialized urandom read (16 bytes read) random: udevd: uninitialized urandom read (16 bytes read) random: udevd: uninitialized urandom read (16 bytes read) udevd[102]: starting eudev-3.2.11 done Saving random seed: OK Starting system message bus: done Starting iptables: OK Starting bluetoothd: OK Starting network: OK urandom_read: 5 callbacks suppressed random: bluetoothd: uninitialized urandom read (4 bytes read) LDO2: disabling VDDOUT25: disabling ^C^C ^Z random: crng init done ssh-keygen: generating new host keys: RSA DSA ECDSA ED25519 Starting sshd: OK Welcome to Buildroot buildroot login: It takes a few minutes before crng init done. I remember such problem was caused by libjitterentropy . Even so, it looks like a different problem, so, Tested-by: Eugen Hristev Eugen From nealf at xilinx.com Mon Feb 7 09:34:31 2022 From: nealf at xilinx.com (Neal Frager) Date: Mon, 7 Feb 2022 09:34:31 +0000 Subject: [Buildroot] Xilinx zynqmp_zcu10x_defconfigs: two things left In-Reply-To: <8be136a0-1263-3b17-0b78-b7d34ef146c2@lucaceresoli.net> References: <0a82d8c7-a0c6-06a5-6a0b-788fd5c4a935@benettiengineering.com> <8be136a0-1263-3b17-0b78-b7d34ef146c2@lucaceresoli.net> Message-ID: Adding buildroot ML on copy of discussion: Hi Neal, Giulio, Neal, it's better to send technical discussion e-mail on the Buildroot mailing list: you'll get more replies, less latency and other people can benefit from the discussion (now and in the future). On 06/02/22 23:20, Giulio Benetti wrote: > Hi Neal, > > On 06/02/22 20:27, Neal Frager wrote: >> Hi Giulio, Luca, >> >> I now have a version of the defconfigs which will at least build >> cleanly with buildroot without requiring any manual steps. However, >> in order to get Linux to boot and login to the rootfs, I am still >> doing two manual things to make this happen. If our goal is to make >> defconfigs that just boot, then we need to find a solution to make >> these two manual things included with the buildroot build automation. >> >> 1. PMU firmware configuration object. Without configuring the >> following U-Boot .config option, the PMU firmware does not appear to >> be working properly. I have been fixing this manually by adding this >> configuration, rebuilding U-Boot, and then copying the results into >> the output/images directory. While this works, it is not a clean out >> of box experience for new users. >> >> CONFIG_ZYNQMP_SPL_PM_CFG_OBJ_FILE >> >> Is there a buildroot config option like BR2_TARGET_UBOOT_ZYNQMP_PMUFW >> available that can be used for configuring this with the automated >> build process? > > There is a better option I think: > BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES Even better, use BR2_TARGET_UBOOT_ZYNQMP_PM_CFG Buildroot option (Bootloaders -> U-Boot -> Boot on the Xilinx ZynqMP SoCs). It is specifically done for that purpose. -- Luca From nealf at xilinx.com Mon Feb 7 09:35:11 2022 From: nealf at xilinx.com (Neal Frager) Date: Mon, 7 Feb 2022 09:35:11 +0000 Subject: [Buildroot] Xilinx zynqmp_zcu10x_defconfigs: two things left In-Reply-To: <0a82d8c7-a0c6-06a5-6a0b-788fd5c4a935@benettiengineering.com> References: <0a82d8c7-a0c6-06a5-6a0b-788fd5c4a935@benettiengineering.com> Message-ID: Adding buildroot ML on copy of discussion: Hi Neal, On 06/02/22 20:27, Neal Frager wrote: > Hi Giulio, Luca, > > I now have a version of the defconfigs which will at least build cleanly with buildroot without requiring any manual steps. However, in order to get Linux to boot and login to the rootfs, I am still doing two manual things to make this happen. If our goal is to make defconfigs that just boot, then we need to find a solution to make these two manual things included with the buildroot build automation. > > 1. PMU firmware configuration object. Without configuring the following U-Boot .config option, the PMU firmware does not appear to be working properly. I have been fixing this manually by adding this configuration, rebuilding U-Boot, and then copying the results into the output/images directory. While this works, it is not a clean out of box experience for new users. > > CONFIG_ZYNQMP_SPL_PM_CFG_OBJ_FILE > > Is there a buildroot config option like BR2_TARGET_UBOOT_ZYNQMP_PMUFW available that can be used for configuring this with the automated build process? There is a better option I think: BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES With this you can add a fragment file like: https://github.com/buildroot/buildroot/blob/master/board/olimex/a20_olinuxino/linux-disable-lima.fragment in your board that simply enables that option, so it will contain: CONFIG_ZYNQMP_SPL_PM_CFG_OBJ_FILE=12345 To test it, remember to rebuild uboot from scratch with: # make uboot-dirclean uboot With this it should simply work. Hint: if you need to configure uboot, don't navigate to build/uboot-... and hint make menuconfig, but, in the buildroot folder simply hint: # make uboot-menuconfig and this is true for Linux too > 2. Kernel bootargs configuration. I suppose this should be the easier one to fix as there is probably already a solution. The current out of box buildroot build will fail to find the rootfs unless I stop the boot process within U-Boot to execute the two commands below. > > setenv bootargs "console=ttyPS0,115200n8 root=/dev/mmcblk0p2 rw rootwait" > saveenv > > Once the bootargs parameter is saved in the U-Boot environment, my buildroot image is able to boot properly. Is there a way to configure the bootargs parameter from the buildroot defconfig? Yes there is. You can go with 2 typical options: 1) use boot.scr script that ends up to rootfs /boot/ 2) use extlinux.conf The 2nd solution is the most used in the last months. You can take a look here: https://github.com/buildroot/buildroot/tree/master/board/orangepi/orangepi-lite2 and check extlinux.conf and post-build.sh scripts you will have to provide the same way and then add: https://github.com/buildroot/buildroot/blob/master/configs/orangepi_lite2_defconfig#L48 to your defconfigs. That way it should work depending if your u-boot search for extlinux.conf, but usually yes. So give a try that way and let us know. > I believe we are almost there for creating a new image which can build and run without any manual steps. Thank you both for all your help! Awesome! Best regards :-) -- Giulio Benetti Benetti Engineering sas From Alexey.Brodkin at synopsys.com Mon Feb 7 10:07:08 2022 From: Alexey.Brodkin at synopsys.com (Alexey Brodkin) Date: Mon, 7 Feb 2022 10:07:08 +0000 Subject: [Buildroot] [arc-buildroot] [PATCH 1/5] configs/snps_arc700_axs101: bump kernel and u-boot versions In-Reply-To: <20220131081214.12773-2-geomatsi@gmail.com> References: <20220131081214.12773-1-geomatsi@gmail.com> <20220131081214.12773-2-geomatsi@gmail.com> Message-ID: Hi Sergey, all, > Bump versions: > - use U-Boot 2022.01 > - use Linux kernel v5.16 > > Add U-Boot configuration fragment increasing early malloc pool size. > > Signed-off-by: Sergey Matyukevich Acked-by: Alexey Brodkin From Alexey.Brodkin at synopsys.com Mon Feb 7 10:08:12 2022 From: Alexey.Brodkin at synopsys.com (Alexey Brodkin) Date: Mon, 7 Feb 2022 10:08:12 +0000 Subject: [Buildroot] [arc-buildroot] [PATCH 2/5] configs/snps_archs32_axs103: bump kernel and u-boot versions In-Reply-To: <20220131081214.12773-3-geomatsi@gmail.com> References: <20220131081214.12773-1-geomatsi@gmail.com> <20220131081214.12773-3-geomatsi@gmail.com> Message-ID: Hi Sergey, all, > Bump versions: > - use U-Boot 2022.01 > - use Linux kernel v5.16 > > Add U-Boot configuration fragment increasing early malloc pool size. > > Signed-off-by: Sergey Matyukevich Acked-by: Alexey Brodkin From Alexey.Brodkin at synopsys.com Mon Feb 7 10:09:27 2022 From: Alexey.Brodkin at synopsys.com (Alexey Brodkin) Date: Mon, 7 Feb 2022 10:09:27 +0000 Subject: [Buildroot] [arc-buildroot] [PATCH 3/5] configs/snps_archs38_hsdk: bump kernel and u-boot versions In-Reply-To: <20220131081214.12773-4-geomatsi@gmail.com> References: <20220131081214.12773-1-geomatsi@gmail.com> <20220131081214.12773-4-geomatsi@gmail.com> Message-ID: Hi Sergey, all, > Bump versions: > - use U-Boot 2022.01 > - use Linux kernel v5.16 > > Signed-off-by: Sergey Matyukevich Acked-by: Alexey Brodkin From Alexey.Brodkin at synopsys.com Mon Feb 7 10:09:56 2022 From: Alexey.Brodkin at synopsys.com (Alexey Brodkin) Date: Mon, 7 Feb 2022 10:09:56 +0000 Subject: [Buildroot] [arc-buildroot] [PATCH 4/5] configs/snps_archs38_haps: bump kernel and u-boot versions In-Reply-To: <20220131081214.12773-5-geomatsi@gmail.com> References: <20220131081214.12773-1-geomatsi@gmail.com> <20220131081214.12773-5-geomatsi@gmail.com> Message-ID: Hi Sergey, all, > Bump versions: > - use U-Boot 2022.01 > - use Linux kernel v5.16 > > Signed-off-by: Sergey Matyukevich Acked-by: Alexey Brodkin From Alexey.Brodkin at synopsys.com Mon Feb 7 10:11:06 2022 From: Alexey.Brodkin at synopsys.com (Alexey Brodkin) Date: Mon, 7 Feb 2022 10:11:06 +0000 Subject: [Buildroot] [arc-buildroot] [PATCH 5/5] board/synopsys: remove outdated vdk boards In-Reply-To: <20220131081214.12773-6-geomatsi@gmail.com> References: <20220131081214.12773-1-geomatsi@gmail.com> <20220131081214.12773-6-geomatsi@gmail.com> Message-ID: Hi Sergey, all, > Remove outdated and unused aarch64 and archs38 Synopsys VDK boards. > > Signed-off-by: Sergey Matyukevich Acked-by: Alexey Brodkin From luca at lucaceresoli.net Mon Feb 7 10:25:15 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Mon, 7 Feb 2022 11:25:15 +0100 Subject: [Buildroot] Xilinx zynqmp_zcu10x_defconfigs: two things left In-Reply-To: References: <0a82d8c7-a0c6-06a5-6a0b-788fd5c4a935@benettiengineering.com> <8be136a0-1263-3b17-0b78-b7d34ef146c2@lucaceresoli.net> Message-ID: <032d657b-eb9a-2dc9-f60b-8536f1fc6c57@lucaceresoli.net> Hi Neal, On 07/02/22 10:34, Neal Frager wrote: > Adding buildroot ML on copy of discussion: > > Hi Neal, Giulio, > > Neal, it's better to send technical discussion e-mail on the Buildroot mailing list: you'll get more replies, less latency and other people can benefit from the discussion (now and in the future). Thanks for adding the ML in the loop! > > On 06/02/22 23:20, Giulio Benetti wrote: >> Hi Neal, >> >> On 06/02/22 20:27, Neal Frager wrote: >>> Hi Giulio, Luca, >>> >>> I now have a version of the defconfigs which will at least build >>> cleanly with buildroot without requiring any manual steps. However, >>> in order to get Linux to boot and login to the rootfs, I am still >>> doing two manual things to make this happen. If our goal is to make >>> defconfigs that just boot, then we need to find a solution to make >>> these two manual things included with the buildroot build automation. >>> >>> 1. PMU firmware configuration object. Without configuring the >>> following U-Boot .config option, the PMU firmware does not appear to >>> be working properly. I have been fixing this manually by adding this >>> configuration, rebuilding U-Boot, and then copying the results into >>> the output/images directory. While this works, it is not a clean out >>> of box experience for new users. >>> >>> CONFIG_ZYNQMP_SPL_PM_CFG_OBJ_FILE >>> >>> Is there a buildroot config option like BR2_TARGET_UBOOT_ZYNQMP_PMUFW >>> available that can be used for configuring this with the automated >>> build process? >> >> There is a better option I think: >> BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES > > Even better, use BR2_TARGET_UBOOT_ZYNQMP_PM_CFG Buildroot option (Bootloaders -> U-Boot -> Boot on the Xilinx ZynqMP SoCs). It is specifically done for that purpose. In reply to your additional question (sent privately): > Thank you for sharing this option. That should work well. But where > will it get the pmu_obj.bin file from? Do we need to put that file on > your git as well, so that it can get automatically downloaded at build > time? The zcu106 defconfig currently in Buildroot uses a pmufw that has a hard-coded pm_cfg_obj for zcu106 in its default Vivado configuration. It is an old and unflexible hack that required a different pmufw binary for each zynqmp hardware _and_ peripheral configuration (or other solutions like a "wildcard" configuration). Nowadays pmufw images do not contain a pm_cfg_obj anymore, as it gets passed from U-Boot SPL at runtime [0]. This allows to use the same pmufw binary for all zynqmp designs. This means you should provide a pm_cfg_obj.c file in boards/ and put the path to that file in BR2_TARGET_UBOOT_ZYNQMP_PM_CFG. It will be built in U-Boot SPL, which will pass it at runtime to the PMUFW. Note that you could handle similarly the psu_init_gpl.c: provide one in boards/ and put its path in BR2_TARGET_UBOOT_ZYNQMP_PSU_INIT_FILE. But since U-Boot has a builtin psu_init_gpl for the ZCU106 (and 102 too) then you should not need do anything. It's for other boards not supported in U-Boot. [0] https://lucaceresoli.net/zynqmp-uboot-spl-pmufw-cfg-load/ -- Luca From andreynech at gmail.com Mon Feb 7 10:33:16 2022 From: andreynech at gmail.com (Andrey Nechypurenko) Date: Mon, 7 Feb 2022 11:33:16 +0100 Subject: [Buildroot] Build error with 2021.11.x Message-ID: Hello Buildrooters, I just updated Buildroot from 2021.08.x to 2021.11.x and got build problems. In particular, ICU library could not be built. I was trying with ARM external toolchain and with Linaro 2018 getting the same error. It would be great if someone can provide hints on what might be wrong and how to fix the problem. Below are the relevant logs and information. Thank you, Andrey. ? buildroot git:(2021.11.x) uname -a Linux tutnix 5.4.0-97-generic #110-Ubuntu SMP Thu Jan 13 18:22:13 UTC 2022 x86_64 x86_64 x86_64 GNU/Linux ? buildroot git:(2021.11.x) lsb_release -a No LSB modules are available. Distributor ID: Ubuntu Description: Ubuntu 20.04.3 LTS Release: 20.04 Codename: focal =================== Error message: ========================== >>> icu 69-1 Extracting gzip -d -c /home/and/p2/download/icu/icu4c-69_1-src.tgz | tar --strip-components=1 -C /home/and/p2/build/prodx/build/icu-69-1 -xf - >>> icu 69-1 Patching Applying 0001-dont-build-static-dynamic-twice.patch using patch: patching file source/config/mh-linux Hunk #1 succeeded at 37 (offset 2 lines). Applying 0002-workaround-toolchain-bugs.patch using patch: patching file source/configure Hunk #1 succeeded at 4478 (offset 155 lines). Hunk #2 succeeded at 4492 (offset 155 lines). Applying 0003-link-icudata-as-data-only.patch using patch: patching file source/config/mh-linux Hunk #1 succeeded at 23 (offset 2 lines). Applying 0004-fix-static-linking-with-icu-uc.patch using patch: patching file source/Makefile.in Hunk #1 succeeded at 276 (offset 12 lines). Applying 0005-ICU-21587-Fix-memory-bug-w-baseName.patch using patch: patching file source/common/locid.cpp Hunk #2 succeeded at 2700 (offset 15 lines). patching file source/test/intltest/loctest.cpp Hunk #1 succeeded at 282 (offset -2 lines). Hunk #2 succeeded at 6479 (offset -43 lines). patching file source/test/intltest/loctest.h Hunk #1 succeeded at 154 (offset -2 lines). >>> icu 69-1 Updating config.sub and config.guess for file in config.guess config.sub; do for i in $(find /home/and/p2/build/prodx/build/icu-69-1 -name $file); do cp support/gnuconfig/$file $i; done; done >>> icu 69-1 Patching libtool >>> icu 69-1 Configuring (cd /home/and/p2/build/prodx/build/icu-69-1/source && rm -rf config.cache && PATH="/home/and/p2/build/prodx/host/bin:/home/and/p2/build/prodx/host/sbin:/home/and/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/home/and/.dotnet/tools:/usr/local/go/bin" AR="/home/and/p2/build/prodx/host/bin/arm-linux-gnueabihf-ar" AS="/home/and/p2/build/prodx/host/bin/arm-linux-gnueabihf-as" LD="/home/and/p2/build/prodx/host/bin/arm-linux-gnueabihf-ld" NM="/home/and/p2/build/prodx/host/bin/arm-linux-gnueabihf-nm" CC="/home/and/p2/build/prodx/host/bin/arm-linux-gnueabihf-gcc" GCC="/home/and/p2/build/prodx/host/bin/arm-linux-gnueabihf-gcc" CPP="/home/and/p2/build/prodx/host/bin/arm-linux-gnueabihf-cpp" CXX="/home/and/p2/build/prodx/host/bin/arm-linux-gnueabihf-g++" FC="/home/and/p2/build/prodx/host/bin/arm-linux-gnueabihf-gfortran" F77="/home/and/p2/build/prodx/host/bin/arm-linux-gnueabihf-gfortran" RANLIB="/home/and/p2/build/prodx/host/bin/arm-linux-gnueabihf-ranlib" READELF="/home/and/p2/build/prodx/host/bin/arm-linux-gnueabihf-readelf" STRIP="/home/and/p2/build/prodx/host/bin/arm-linux-gnueabihf-strip" OBJCOPY="/home/and/p2/build/prodx/host/bin/arm-linux-gnueabihf-objcopy" OBJDUMP="/home/and/p2/build/prodx/host/bin/arm-linux-gnueabihf-objdump" AR_FOR_BUILD="/usr/bin/ar" AS_FOR_BUILD="/usr/bin/as" CC_FOR_BUILD="/usr/bin/gcc" GCC_FOR_BUILD="/usr/bin/gcc" CXX_FOR_BUILD="/usr/bin/g++" LD_FOR_BUILD="/usr/bin/ld" CPPFLAGS_FOR_BUILD="-I/home/and/p2/build/prodx/host/include" CFLAGS_FOR_BUILD="-O2 -I/home/and/p2/build/prodx/host/include" CXXFLAGS_FOR_BUILD="-O2 -I/home/and/p2/build/prodx/host/include" LDFLAGS_FOR_BUILD="-L/home/and/p2/build/prodx/host/lib -Wl,-rpath,/home/and/p2/build/prodx/host/lib" FCFLAGS_FOR_BUILD="" DEFAULT_ASSEMBLER="/home/and/p2/build/prodx/host/bin/arm-linux-gnueabihf-as" DEFAULT_LINKER="/home/and/p2/build/prodx/host/bin/arm-linux-gnueabihf-ld" CPPFLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" CFLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O3 -g0 -D_FORTIFY_SOURCE=1" CXXFLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O3 -g0 -D_FORTIFY_SOURCE=1" LDFLAGS="" FCFLAGS=" -O3 -g0" FFLAGS=" -O3 -g0" PKG_CONFIG="/home/and/p2/build/prodx/host/bin/pkg-config" STAGING_DIR="/home/and/p2/build/prodx/host/arm-buildroot-linux-gnueabihf/sysroot" INTLTOOL_PERL=/usr/bin/perl CFLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O3 -g0 -D_FORTIFY_SOURCE=1 -I/home/and/p2/build/prodx/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/drm" LDFLAGS=" -ldrm" ac_cv_lbl_unaligned_fail=yes ac_cv_func_mmap_fixed_mapped=yes ac_cv_func_memcmp_working=yes ac_cv_have_decl_malloc=yes gl_cv_func_malloc_0_nonnull=yes ac_cv_func_malloc_0_nonnull=yes ac_cv_func_calloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes lt_cv_sys_lib_search_path_spec="" ac_cv_c_bigendian=no LIBS="-latomic" CONFIG_SITE=/dev/null ./configure --target=arm-buildroot-linux-gnueabihf --host=arm-buildroot-linux-gnueabihf --build=x86_64-pc-linux-gnu --prefix=/usr --exec-prefix=/usr --sysconfdir=/etc --localstatedir=/var --program-prefix="" --disable-gtk-doc --disable-gtk-doc-html --disable-doc --disable-docs --disable-documentation --with-xmlto=no --with-fop=no --disable-dependency-tracking --enable-ipv6 --enable-nls --disable-static --enable-shared --with-cross-build=/home/and/p2/build/prodx/build/host-icu-69-1/source --disable-samples --disable-tests ) configure: WARNING: unrecognized options: --disable-gtk-doc, --disable-gtk-doc-html, --disable-doc, --disable-docs, --disable-documentation, --with-xmlto, --with-fop, --disable-dependency-tracking, --enable-ipv6, --enable-nls checking for ICU version numbers... release 69.1, library 69.1, unicode version 13.0 checking build system type... x86_64-pc-linux-gnu checking host system type... arm-buildroot-linux-gnueabihf checking whether to build debug libraries... no checking whether to build release libraries... yes checking for arm-buildroot-linux-gnueabihf-clang... /home/and/p2/build/prodx/host/bin/arm-linux-gnueabihf-gcc checking whether the C compiler works... no configure: error: in `/home/and/p2/build/prodx/build/icu-69-1/source': configure: error: C compiler cannot create executables See `config.log' for more details make[1]: *** [package/pkg-generic.mk:285: /home/and/p2/build/prodx/build/icu-69-1/.stamp_configured] Error 77 make: *** [Makefile:23: _all] Error 2 =================== From config.log ============================= configure:3057: checking whether the C compiler works configure:3079: /home/and/p2/build/prodx/host/bin/arm-linux-gnueabihf-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O3 -g0 -D_FORTIFY_SOURCE=1 -I/home/and/p2/build/prodx/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/drm -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -ldrm conftest.c -latomic >&5 /home/and/p2/build/prodx/host/opt/ext-toolchain/bin/../lib/gcc/arm-linux-gnueabihf/7.3.1/../../../../arm-linux-gnueabihf/bin/ld: cannot find -ldrm collect2: error: ld returned 1 exit status configure:3083: $? = 1 configure:3121: result: no configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "ICU" | #define PACKAGE_TARNAME "International Components for Unicode" | #define PACKAGE_VERSION "69.1" | #define PACKAGE_STRING "ICU 69.1" | #define PACKAGE_BUGREPORT "http://icu-project.org/bugs" | #define PACKAGE_URL "http://icu-project.org" | /* end confdefs.h. */ | | int | main () | { | | ; | return 0; | } configure:3126: error: in `/home/and/p2/build/prodx/build/icu-69-1/source': configure:3128: error: C compiler cannot create executables =================== In build directory ========================= $ find . -name "*drm*" ./build/buildroot-config/br2/package/libdrm ./build/buildroot-config/br2/package/libdrm.h ./build/buildroot-config/br2/package/glmark2/flavor/drm ./build/buildroot-config/br2/package/weston/default/drm.h ./build/buildroot-config/br2/package/weston/drm.h ./build/buildroot-config/br2/package/sdl2/kmsdrm.h ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/drm ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/drm/msm_drm.h ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/drm/drm_sarea.h ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/drm/sis_drm.h ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/drm/r128_drm.h ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/drm/i915_drm.h ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/drm/amdgpu_drm.h ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/drm/qxl_drm.h ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/drm/drm.h ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/drm/via_drm.h ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/drm/radeon_drm.h ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/drm/savage_drm.h ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/drm/virtgpu_drm.h ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/drm/nouveau_drm.h ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/drm/exynos_drm.h ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/drm/vmwgfx_drm.h ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/drm/mga_drm.h ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/drm/tegra_drm.h ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/drm/i810_drm.h ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/drm/vc4_drm.h ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/drm/drm_fourcc.h ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/drm/drm_mode.h ./host/opt/ext-toolchain/arm-linux-gnueabihf/libc/usr/include/drm ./host/opt/ext-toolchain/arm-linux-gnueabihf/libc/usr/include/drm/msm_drm.h ./host/opt/ext-toolchain/arm-linux-gnueabihf/libc/usr/include/drm/drm_sarea.h ./host/opt/ext-toolchain/arm-linux-gnueabihf/libc/usr/include/drm/sis_drm.h ./host/opt/ext-toolchain/arm-linux-gnueabihf/libc/usr/include/drm/r128_drm.h ./host/opt/ext-toolchain/arm-linux-gnueabihf/libc/usr/include/drm/i915_drm.h ./host/opt/ext-toolchain/arm-linux-gnueabihf/libc/usr/include/drm/amdgpu_drm.h ./host/opt/ext-toolchain/arm-linux-gnueabihf/libc/usr/include/drm/qxl_drm.h ./host/opt/ext-toolchain/arm-linux-gnueabihf/libc/usr/include/drm/drm.h ./host/opt/ext-toolchain/arm-linux-gnueabihf/libc/usr/include/drm/via_drm.h ./host/opt/ext-toolchain/arm-linux-gnueabihf/libc/usr/include/drm/radeon_drm.h ./host/opt/ext-toolchain/arm-linux-gnueabihf/libc/usr/include/drm/savage_drm.h ./host/opt/ext-toolchain/arm-linux-gnueabihf/libc/usr/include/drm/virtgpu_drm.h ./host/opt/ext-toolchain/arm-linux-gnueabihf/libc/usr/include/drm/nouveau_drm.h ./host/opt/ext-toolchain/arm-linux-gnueabihf/libc/usr/include/drm/exynos_drm.h ./host/opt/ext-toolchain/arm-linux-gnueabihf/libc/usr/include/drm/vmwgfx_drm.h ./host/opt/ext-toolchain/arm-linux-gnueabihf/libc/usr/include/drm/mga_drm.h ./host/opt/ext-toolchain/arm-linux-gnueabihf/libc/usr/include/drm/tegra_drm.h ./host/opt/ext-toolchain/arm-linux-gnueabihf/libc/usr/include/drm/i810_drm.h ./host/opt/ext-toolchain/arm-linux-gnueabihf/libc/usr/include/drm/vc4_drm.h ./host/opt/ext-toolchain/arm-linux-gnueabihf/libc/usr/include/drm/drm_fourcc.h ./host/opt/ext-toolchain/arm-linux-gnueabihf/libc/usr/include/drm/drm_mode.h From jose.pekkarinen at unikie.com Mon Feb 7 11:22:28 2022 From: jose.pekkarinen at unikie.com (=?UTF-8?q?Jos=C3=A9=20Pekkarinen?=) Date: Mon, 7 Feb 2022 13:22:28 +0200 Subject: [Buildroot] [PATCH] package/alfred: bump to version 2022.0 Message-ID: <20220207112228.1753927-1-jose.pekkarinen@unikie.com> https://www.open-mesh.org/news/107 Signed-off-by: Jos? Pekkarinen --- package/alfred/alfred.hash | 6 +++--- package/alfred/alfred.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/alfred/alfred.hash b/package/alfred/alfred.hash index 0799071231..2da7eb31c8 100644 --- a/package/alfred/alfred.hash +++ b/package/alfred/alfred.hash @@ -1,5 +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 +# From https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2022.0.tar.gz.sha1 +sha1 8e00789d3e1e5c959dd985809861ff624d372694 alfred-2022.0.tar.gz # Locally computed -sha256 4c79b6c45de4bcc8cbfe64cba9a0f8b4ef304ca84c194622f2bfa41e01e2cb95 alfred-2021.4.tar.gz +sha256 abba1dac61eccfcd6329e7331d0555fecc937760fb36c6cf55ce6c1d751cfd98 alfred-2022.0.tar.gz sha256 cecbf53d1148e13256ac29f8b900655b7fc8dc12d59939a95bc2323ea1747025 LICENSES/preferred/GPL-2.0 diff --git a/package/alfred/alfred.mk b/package/alfred/alfred.mk index ed59066393..24b9956b11 100644 --- a/package/alfred/alfred.mk +++ b/package/alfred/alfred.mk @@ -4,7 +4,7 @@ # ################################################################################ -ALFRED_VERSION = 2021.4 +ALFRED_VERSION = 2022.0 ALFRED_SITE = https://downloads.open-mesh.org/batman/stable/sources/alfred ALFRED_LICENSE = GPL-2.0 ALFRED_LICENSE_FILES = LICENSES/preferred/GPL-2.0 -- 2.25.1 From fperrad at gmail.com Mon Feb 7 12:09:46 2022 From: fperrad at gmail.com (Francois Perrad) Date: Mon, 7 Feb 2022 13:09:46 +0100 Subject: [Buildroot] [PATCH] package/libbsd: bump to version 0.11.5 Message-ID: <20220207120946.1553618-1-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/libbsd/libbsd.hash | 8 +++++--- package/libbsd/libbsd.mk | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/libbsd/libbsd.hash b/package/libbsd/libbsd.hash index 17bb32e01..435ea5470 100644 --- a/package/libbsd/libbsd.hash +++ b/package/libbsd/libbsd.hash @@ -1,3 +1,5 @@ -# From https://lists.freedesktop.org/archives/libbsd/2021-February/000305.html -sha512 a7015ea1ffa3766b1a4690526a25231898ad8275149b31fb6801082450172249997c36165626d101ffce53b59767a46676eebc0806426922fe4e773a0376c1f5 libbsd-0.11.3.tar.xz -sha256 ff2fdeeb0fe8bcb9045fe91d69e8312a5b477c54db48dffe34dd1c0d730c5864 COPYING +# From https://lists.freedesktop.org/archives/libbsd/2022-January/000322.html +sha512 c52c19eddd53630aca14f9f6221f7b84aa9cc798b4bb91e867822b161793313aab872ac1c0350d29312a72fee6e2061f3910ff918b724ec171d8c9de5837c841 libbsd-0.11.5.tar.xz + +# License files (locally computed) +sha256 3761714adb9c45fa588b77b372d6e75dcc9e6822cc2d6baa712007241aec714e COPYING diff --git a/package/libbsd/libbsd.mk b/package/libbsd/libbsd.mk index 86df8a97a..0654bef82 100644 --- a/package/libbsd/libbsd.mk +++ b/package/libbsd/libbsd.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBBSD_VERSION = 0.11.3 +LIBBSD_VERSION = 0.11.5 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, \ -- 2.32.0 From nealf at xilinx.com Mon Feb 7 12:50:54 2022 From: nealf at xilinx.com (Neal Frager) Date: Mon, 7 Feb 2022 12:50:54 +0000 Subject: [Buildroot] Xilinx zynqmp_zcu10x_defconfigs: two things left In-Reply-To: <032d657b-eb9a-2dc9-f60b-8536f1fc6c57@lucaceresoli.net> References: <0a82d8c7-a0c6-06a5-6a0b-788fd5c4a935@benettiengineering.com> <8be136a0-1263-3b17-0b78-b7d34ef146c2@lucaceresoli.net> <032d657b-eb9a-2dc9-f60b-8536f1fc6c57@lucaceresoli.net> Message-ID: Hi Luca, >The zcu106 defconfig currently in Buildroot uses a pmufw that has a hard-coded pm_cfg_obj for zcu106 in its default Vivado configuration. It is an old and unflexible hack that required a different pmufw binary for each zynqmp hardware _and_ peripheral configuration (or other solutions like a "wildcard" configuration). > Nowadays pmufw images do not contain a pm_cfg_obj anymore, as it gets passed from U-Boot SPL at runtime [0]. This allows to use the same pmufw binary for all zynqmp designs. > This means you should provide a pm_cfg_obj.c file in boards/ and put the path to that file in BR2_TARGET_UBOOT_ZYNQMP_PM_CFG. It will be built in U-Boot SPL, which will pass it at runtime to the PMUFW. > Note that you could handle similarly the psu_init_gpl.c: provide one in boards/ and put its path in BR2_TARGET_UBOOT_ZYNQMP_PSU_INIT_FILE. But since U-Boot has a builtin psu_init_gpl for the ZCU106 (and 102 too) then you should not need do anything. It's for other boards not supported in U-Boot. > [0] https://lucaceresoli.net/zynqmp-uboot-spl-pmufw-cfg-load/ I tried this method, but I am getting the error below. Do you have any ideas? cp /buildroot/output/images/bl31.bin /buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/ /buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/tools/zynqmp_pm_cfg_obj_convert.py "board/zynqmp/pm_cfg_obj.c" "/buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/pm_cfg_obj.bin" package/pkg-generic.mk:289: recipe for target '/buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/.stamp_built' failed Traceback (most recent call last): File "/buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/tools/zynqmp_pm_cfg_obj_convert.py", line 293, in code, flags=re.DOTALL).group(1) AttributeError: 'NoneType' object has no attribute 'group' make: *** [/buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/.stamp_built] Error 1 Thank you for your help! Best regards, Neal Frager Xilinx From nealf at xilinx.com Mon Feb 7 13:00:35 2022 From: nealf at xilinx.com (Neal Frager) Date: Mon, 7 Feb 2022 13:00:35 +0000 Subject: [Buildroot] Xilinx zynqmp_zcu10x_defconfigs: two things left In-Reply-To: References: <0a82d8c7-a0c6-06a5-6a0b-788fd5c4a935@benettiengineering.com> <8be136a0-1263-3b17-0b78-b7d34ef146c2@lucaceresoli.net> <032d657b-eb9a-2dc9-f60b-8536f1fc6c57@lucaceresoli.net> Message-ID: Hi Luca, >The zcu106 defconfig currently in Buildroot uses a pmufw that has a hard-coded pm_cfg_obj for zcu106 in its default Vivado configuration. It is an old and unflexible hack that required a different pmufw binary for each zynqmp hardware _and_ peripheral configuration (or other solutions like a "wildcard" configuration). > Nowadays pmufw images do not contain a pm_cfg_obj anymore, as it gets passed from U-Boot SPL at runtime [0]. This allows to use the same pmufw binary for all zynqmp designs. > This means you should provide a pm_cfg_obj.c file in boards/ and put the path to that file in BR2_TARGET_UBOOT_ZYNQMP_PM_CFG. It will be built in U-Boot SPL, which will pass it at runtime to the PMUFW. > Note that you could handle similarly the psu_init_gpl.c: provide one in boards/ and put its path in BR2_TARGET_UBOOT_ZYNQMP_PSU_INIT_FILE. But since U-Boot has a builtin psu_init_gpl for the ZCU106 (and 102 too) then you should not need do anything. It's for other boards not supported in U-Boot. > [0] https://lucaceresoli.net/zynqmp-uboot-spl-pmufw-cfg-load/ I tried this method, but I am getting the error below. Do you have any ideas? Attached you can find the pm_cfg_obj.c source file that comes with Xilinx 2021.2. cp /buildroot/output/images/bl31.bin /buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/ /buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/tools/zynqmp_pm_cfg_obj_convert.py "board/zynqmp/pm_cfg_obj.c" "/buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/pm_cfg_obj.bin" package/pkg-generic.mk:289: recipe for target '/buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/.stamp_built' failed Traceback (most recent call last): File "/buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/tools/zynqmp_pm_cfg_obj_convert.py", line 293, in code, flags=re.DOTALL).group(1) AttributeError: 'NoneType' object has no attribute 'group' make: *** [/buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/.stamp_built] Error 1 Thank you for your help! Best regards, Neal Frager Xilinx -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: pm_cfg_obj.c URL: From nealf at xilinx.com Mon Feb 7 13:24:57 2022 From: nealf at xilinx.com (Neal Frager) Date: Mon, 7 Feb 2022 13:24:57 +0000 Subject: [Buildroot] Xilinx zynqmp_zcu10x_defconfigs: two things left In-Reply-To: References: <0a82d8c7-a0c6-06a5-6a0b-788fd5c4a935@benettiengineering.com> <8be136a0-1263-3b17-0b78-b7d34ef146c2@lucaceresoli.net> <032d657b-eb9a-2dc9-f60b-8536f1fc6c57@lucaceresoli.net> Message-ID: Hi Luca, >The zcu106 defconfig currently in Buildroot uses a pmufw that has a hard-coded pm_cfg_obj for zcu106 in its default Vivado configuration. It is an old and unflexible hack that required a different pmufw binary for each zynqmp hardware _and_ peripheral configuration (or other solutions like a "wildcard" configuration). > Nowadays pmufw images do not contain a pm_cfg_obj anymore, as it gets passed from U-Boot SPL at runtime [0]. This allows to use the same pmufw binary for all zynqmp designs. > This means you should provide a pm_cfg_obj.c file in boards/ and put the path to that file in BR2_TARGET_UBOOT_ZYNQMP_PM_CFG. It will be built in U-Boot SPL, which will pass it at runtime to the PMUFW. > Note that you could handle similarly the psu_init_gpl.c: provide one in boards/ and put its path in BR2_TARGET_UBOOT_ZYNQMP_PSU_INIT_FILE. But since U-Boot has a builtin psu_init_gpl for the ZCU106 (and 102 too) then you should not need do anything. It's for other boards not supported in U-Boot. > [0] https://lucaceresoli.net/zynqmp-uboot-spl-pmufw-cfg-load/ > I tried this method, but I am getting the error below. Do you have any ideas? Attached you can find the pm_cfg_obj.c source file that comes with Xilinx 2021.2. > cp /buildroot/output/images/bl31.bin /buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/ > /buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/tools/zynqmp_pm_cfg_obj_convert.py "board/zynqmp/pm_cfg_obj.c" "/buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/pm_cfg_obj.bin" > package/pkg-generic.mk:289: recipe for target '/buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/.stamp_built' failed Traceback (most recent call last): > File "/buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/tools/zynqmp_pm_cfg_obj_convert.py", line 293, in code, flags=re.DOTALL).group(1) > AttributeError: 'NoneType' object has no attribute 'group' > make: *** [/buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/.stamp_built] Error 1 I figured out the root cause. Our newer software tools provide support for the IAR compiler for customers using IAR and not Linux / gcc. This causes an issue for your script as it does not catch that there are two places now where the XPm_ConfigObject is defined, one for the gcc compiler and another for the IAR compiler. I can work around this for my current patch, but could you work on an updated zynqmp_pm_cfg_obj_convert.py which can handle the new pm_cfg_obj.c file with the IAR compiler support? It would be great if you could make a new version of this and push it into U-Boot mainline. Thanks for your help! Best regards, Neal Frager Xilinx From nealf at xilinx.com Mon Feb 7 13:27:03 2022 From: nealf at xilinx.com (Neal Frager) Date: Mon, 7 Feb 2022 13:27:03 +0000 Subject: [Buildroot] Xilinx zynqmp_zcu10x_defconfigs: two things left In-Reply-To: References: <0a82d8c7-a0c6-06a5-6a0b-788fd5c4a935@benettiengineering.com> <8be136a0-1263-3b17-0b78-b7d34ef146c2@lucaceresoli.net> <032d657b-eb9a-2dc9-f60b-8536f1fc6c57@lucaceresoli.net> Message-ID: Hi Luca, >The zcu106 defconfig currently in Buildroot uses a pmufw that has a hard-coded pm_cfg_obj for zcu106 in its default Vivado configuration. It is an old and unflexible hack that required a different pmufw binary for each zynqmp hardware _and_ peripheral configuration (or other solutions like a "wildcard" configuration). > Nowadays pmufw images do not contain a pm_cfg_obj anymore, as it gets passed from U-Boot SPL at runtime [0]. This allows to use the same pmufw binary for all zynqmp designs. > This means you should provide a pm_cfg_obj.c file in boards/ and put the path to that file in BR2_TARGET_UBOOT_ZYNQMP_PM_CFG. It will be built in U-Boot SPL, which will pass it at runtime to the PMUFW. > Note that you could handle similarly the psu_init_gpl.c: provide one in boards/ and put its path in BR2_TARGET_UBOOT_ZYNQMP_PSU_INIT_FILE. But since U-Boot has a builtin psu_init_gpl for the ZCU106 (and 102 too) then you should not need do anything. It's for other boards not supported in U-Boot. > [0] https://lucaceresoli.net/zynqmp-uboot-spl-pmufw-cfg-load/ > I tried this method, but I am getting the error below. Do you have any ideas? Attached you can find the pm_cfg_obj.c source file that comes with Xilinx 2021.2. > cp /buildroot/output/images/bl31.bin /buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/ > /buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/tools/zynqmp_pm_cfg_obj_convert.py "board/zynqmp/pm_cfg_obj.c" "/buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/pm_cfg_obj.bin" > package/pkg-generic.mk:289: recipe for target '/buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/.stamp_built' failed Traceback (most recent call last): > File "/buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/tools/zynqmp_pm_cfg_obj_convert.py", line 293, in code, flags=re.DOTALL).group(1) > AttributeError: 'NoneType' object has no attribute 'group' > make: *** [/buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/.stamp_built] Error 1 I figured out the root cause. Our newer software tools provide support for the IAR compiler for customers using IAR and not Linux / gcc. This causes an issue for your script as it does not catch that there are two places now where the XPm_ConfigObject is defined, one for the gcc compiler and another for the IAR compiler. I can work around this for my current patch, but could you work on an updated zynqmp_pm_cfg_obj_convert.py which can handle the new pm_cfg_obj.c file with the IAR compiler support? It would be great if you could make a new version of this and push it into U-Boot mainline. Thanks for your help! Best regards, Neal Frager Xilinx From luca at lucaceresoli.net Mon Feb 7 13:38:15 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Mon, 7 Feb 2022 14:38:15 +0100 Subject: [Buildroot] Xilinx zynqmp_zcu10x_defconfigs: two things left In-Reply-To: References: <0a82d8c7-a0c6-06a5-6a0b-788fd5c4a935@benettiengineering.com> <8be136a0-1263-3b17-0b78-b7d34ef146c2@lucaceresoli.net> <032d657b-eb9a-2dc9-f60b-8536f1fc6c57@lucaceresoli.net> Message-ID: <16f4b7bf-546b-3bf4-c6a3-b711c8cfcadb@lucaceresoli.net> Hi Neal, On 07/02/22 14:00, Neal Frager wrote: > Hi Luca, > >> The zcu106 defconfig currently in Buildroot uses a pmufw that has a hard-coded pm_cfg_obj for zcu106 in its default Vivado configuration. It is an old and unflexible hack that required a different pmufw binary for each zynqmp hardware _and_ peripheral configuration (or other solutions like a "wildcard" configuration). > >> Nowadays pmufw images do not contain a pm_cfg_obj anymore, as it gets passed from U-Boot SPL at runtime [0]. This allows to use the same pmufw binary for all zynqmp designs. > >> This means you should provide a pm_cfg_obj.c file in boards/ and put the path to that file in BR2_TARGET_UBOOT_ZYNQMP_PM_CFG. It will be built in U-Boot SPL, which will pass it at runtime to the PMUFW. > >> Note that you could handle similarly the psu_init_gpl.c: provide one in boards/ and put its path in BR2_TARGET_UBOOT_ZYNQMP_PSU_INIT_FILE. But since U-Boot has a builtin psu_init_gpl for the ZCU106 (and 102 too) then you should not need do anything. It's for other boards not supported in U-Boot. > >> [0] https://lucaceresoli.net/zynqmp-uboot-spl-pmufw-cfg-load/ > > I tried this method, but I am getting the error below. Do you have any ideas? Attached you can find the pm_cfg_obj.c source file that comes with Xilinx 2021.2. > > cp /buildroot/output/images/bl31.bin /buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/ > /buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/tools/zynqmp_pm_cfg_obj_convert.py "board/zynqmp/pm_cfg_obj.c" "/buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/pm_cfg_obj.bin" > package/pkg-generic.mk:289: recipe for target '/buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/.stamp_built' failed Traceback (most recent call last): > File "/buildroot/output/build/uboot-xlnx_rebase_v2021.01_2021.2/tools/zynqmp_pm_cfg_obj_convert.py", line 293, in > code, flags=re.DOTALL).group(1) > AttributeError: 'NoneType' object has no attribute 'group' Vitis 2020.1 changed the format of pm_cfg_obj.c. There's a fix commit [0] in U-Boot 2021.04 but as you are based on 2021.01 you don't have it. You have two options to use that fix: 1. use U-Boot >= 2021.04 2. provide that commit as a patch to the uboot package in Buildroot To go for option 2, you'll have to put the patch in the BR2_GLOBAL_PATCH_DIR, and of course _not_ remove BR2_GLOBAL_PATCH_DIR from the defconfig as you would otherwise. Hint to create the patch file: cd git format-patch -1 d42ab39f58e828c99a0cba6890e29986e87d11f5 mv 0001-*.patch /board/zynqmp/patches/uboot/ Then add a "Backported from:" line to the patch (see [1]) [0] https://source.denx.de/u-boot/u-boot/-/commit/d42ab39f58e828c99a0cba6890e29986e87d11f5 [1] https://buildroot.org/downloads/manual/manual.html#_integrating_patches_found_on_the_web -- Luca From oleks at arcturusnetworks.com Mon Feb 7 15:53:57 2022 From: oleks at arcturusnetworks.com (Oleksandr G Zhadan) Date: Mon, 7 Feb 2022 10:53:57 -0500 Subject: [Buildroot] [PATCH 1/1] board/arcturus/aarch64-ucls1012a: bump u-boot and kernel version Message-ID: <4b667326-5aca-538b-9b36-7f0d5a400e9f@arcturusnetworks.com> Signed-off-by: Oleksandr G Zhadan Signed-off-by: Michael Durrant --- ?board/arcturus/aarch64-ucls1012a/post-build.sh??? |? 2 -- ?board/arcturus/aarch64-ucls1012a/readme.txt?????? |? 8 ++++---- ?.../rootfs_overlay/etc/init.d/S09modload????????? | 14 -------------- ?configs/arcturus_ucls1012a_defconfig????????????? | 15 +++++++-------- ?4 files changed, 11 insertions(+), 28 deletions(-) ?delete mode 100755 board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload diff --git a/board/arcturus/aarch64-ucls1012a/post-build.sh b/board/arcturus/aarch64-ucls1012a/post-build.sh index f8ba78095f..ca3862988d 100755 --- a/board/arcturus/aarch64-ucls1012a/post-build.sh +++ b/board/arcturus/aarch64-ucls1012a/post-build.sh @@ -1,5 +1,3 @@ ?#!/bin/sh -mkdir -p ${TARGET_DIR}/lib/firmware -cp -f ${BUILD_DIR}/linux-custom/firmware/ppfe/* ${TARGET_DIR}/lib/firmware/ ?cp -f ${BUILD_DIR}/linux-custom/br2-ucls1012a.its ${BINARIES_DIR}/ diff --git a/board/arcturus/aarch64-ucls1012a/readme.txt b/board/arcturus/aarch64-ucls1012a/readme.txt index 483d5e9aef..f892fc4abc 100644 --- a/board/arcturus/aarch64-ucls1012a/readme.txt +++ b/board/arcturus/aarch64-ucls1012a/readme.txt @@ -23,14 +23,14 @@ Result of the build ?After building, you should obtain this tree: ???? output/images/ -??? +-- arc-ucls1012a.dtb -??? +-- Image +??? +-- br2-ucls1012a.its +??? +-- Image.gz ???? +-- part0-000000.itb ???? +-- rootfs.cpio ???? +-- rootfs.cpio.gz ???? +-- rootfs.tar ???? +-- u-boot.bin -??? +-- ucls1012a.its +??? +-- ucls1012a-som.dtb ?Flashing ?-------- @@ -60,7 +60,7 @@ u-boot shell. ?4. Program the ITB image (includes Kernel, DTB and Ramdisk) ???? B$ tftp part0-000000.itb -??? B$ run iprogram +??? B$ run program0 ?5. Booting your new system diff --git a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload b/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload deleted file mode 100755 index c87ffda14f..0000000000 --- a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -# -case "$1" in -?????? start) -??????????????? modprobe pfe -??????????????? ;; -??????? stop) -??????????????? ;; -??????? restart|reload) -??????????????? ;; -??????? *) -??????????????? echo "Usage: $0 {start|stop|restart}" -??????????????? exit 1 -esac diff --git a/configs/arcturus_ucls1012a_defconfig b/configs/arcturus_ucls1012a_defconfig index fd33ebf1f6..f544a5240a 100644 --- a/configs/arcturus_ucls1012a_defconfig +++ b/configs/arcturus_ucls1012a_defconfig @@ -1,24 +1,23 @@ ?# Architecture ?BR2_aarch64=y -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y ?# System settings ?BR2_TARGET_GENERIC_HOSTNAME="ucls1012a" ?BR2_TARGET_GENERIC_ISSUE="Welcome to uCLS1012A-SOM" ?BR2_SYSTEM_DHCP="eth0" -BR2_ROOTFS_OVERLAY="board/arcturus/aarch64-ucls1012a/rootfs_overlay" ?BR2_ROOTFS_POST_BUILD_SCRIPT="board/arcturus/aarch64-ucls1012a/post-build.sh" ?BR2_ROOTFS_POST_IMAGE_SCRIPT="board/arcturus/aarch64-ucls1012a/post-image.sh" ?# Kernel ?BR2_LINUX_KERNEL=y ?BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-kernel,v.20.31)/linux-v.20.31.tar.gz" -BR2_LINUX_KERNEL_DEFCONFIG="ucls1012a" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-kernel,v.22.05)/linux-v.22.05.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="ucls1012a_som" +BR2_LINUX_KERNEL_IMAGEGZ=y ?BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="arcturus/arc-ucls1012a" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="arcturus/ucls1012a-som" ?# Filesystem ?BR2_TARGET_ROOTFS_CPIO=y @@ -28,8 +27,8 @@ BR2_TARGET_ROOTFS_CPIO_GZIP=y ?BR2_TARGET_UBOOT=y ?BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y ?BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-uboot,v.20.31)/uboot-v.20.31.tar.gz" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="UCLS1012A_QSPI128" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-uboot,v.22.05)/uboot-v.22.05.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="UCLS1012A_SOM" ?# Tools ?BR2_PACKAGE_HOST_UBOOT_TOOLS=y -- 2.26.2 _______________________________________________ buildroot mailing list buildroot at buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot From nealf at xilinx.com Mon Feb 7 17:03:25 2022 From: nealf at xilinx.com (Neal Frager) Date: Mon, 7 Feb 2022 17:03:25 +0000 Subject: [Buildroot] Xilinx zynqmp_zcu10x_defconfigs: two things left In-Reply-To: <16f4b7bf-546b-3bf4-c6a3-b711c8cfcadb@lucaceresoli.net> References: <0a82d8c7-a0c6-06a5-6a0b-788fd5c4a935@benettiengineering.com> <8be136a0-1263-3b17-0b78-b7d34ef146c2@lucaceresoli.net> <032d657b-eb9a-2dc9-f60b-8536f1fc6c57@lucaceresoli.net> <16f4b7bf-546b-3bf4-c6a3-b711c8cfcadb@lucaceresoli.net> Message-ID: Hi Luca, > Vitis 2020.1 changed the format of pm_cfg_obj.c. There's a fix commit [0] in U-Boot 2021.04 but as you are based on 2021.01 you don't have it. > You have two options to use that fix: > 1. use U-Boot >= 2021.04 > 2. provide that commit as a patch to the uboot package in Buildroot > To go for option 2, you'll have to put the patch in the BR2_GLOBAL_PATCH_DIR, and of course _not_ remove BR2_GLOBAL_PATCH_DIR from the defconfig as you would otherwise. > Hint to create the patch file: > cd > git format-patch -1 d42ab39f58e828c99a0cba6890e29986e87d11f5 > mv 0001-*.patch /board/zynqmp/patches/uboot/ > Then add a "Backported from:" line to the patch (see [1]) I have tested the new version of zynqmp_pm_cfg_obj_convert.py with U-Boot 2022.01, and I confirm that is solves the problem! Great job! I now just need to figure out how to generate an vfat partition that has the file extlinux.conf in the path /extlinux/extlinux.conf. Once I have this piece, I will have a version of the defconfigs that builds and runs without manual steps. Best regards, Neal Frager Xilinx From giulio.benetti at benettiengineering.com Mon Feb 7 17:16:38 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 7 Feb 2022 18:16:38 +0100 Subject: [Buildroot] Xilinx zynqmp_zcu10x_defconfigs: two things left In-Reply-To: References: <0a82d8c7-a0c6-06a5-6a0b-788fd5c4a935@benettiengineering.com> <8be136a0-1263-3b17-0b78-b7d34ef146c2@lucaceresoli.net> <032d657b-eb9a-2dc9-f60b-8536f1fc6c57@lucaceresoli.net> <16f4b7bf-546b-3bf4-c6a3-b711c8cfcadb@lucaceresoli.net> Message-ID: Hi Neal, On 07/02/22 18:03, Neal Frager wrote: > Hi Luca, > >> Vitis 2020.1 changed the format of pm_cfg_obj.c. There's a fix commit [0] in U-Boot 2021.04 but as you are based on 2021.01 you don't have it. > >> You have two options to use that fix: >> 1. use U-Boot >= 2021.04 >> 2. provide that commit as a patch to the uboot package in Buildroot > >> To go for option 2, you'll have to put the patch in the BR2_GLOBAL_PATCH_DIR, and of course _not_ remove BR2_GLOBAL_PATCH_DIR from the defconfig as you would otherwise. > >> Hint to create the patch file: >> cd >> git format-patch -1 d42ab39f58e828c99a0cba6890e29986e87d11f5 >> mv 0001-*.patch /board/zynqmp/patches/uboot/ >> Then add a "Backported from:" line to the patch (see [1]) > > I have tested the new version of zynqmp_pm_cfg_obj_convert.py with U-Boot 2022.01, and I confirm that is solves the problem! Great job! > > I now just need to figure out how to generate an vfat partition that has the file extlinux.conf in the path /extlinux/extlinux.conf. Once I have this piece, I will have a version of the defconfigs that builds and runs without manual steps. In the boards I've pointed you before: https://github.com/buildroot/buildroot/tree/master/board/orangepi/orangepi-lite2 there is everythyng you need, the post-build script: https://github.com/buildroot/buildroot/blob/master/board/orangepi/orangepi-lite2/post-build.sh that copies the extlinux.conf. And as explained before you have to point to it like this: https://github.com/buildroot/buildroot/blob/master/configs/orangepi_lite2_defconfig#L48 For creating the VFAT you can imitate this genimage.cfg file: https://github.com/buildroot/buildroot/blob/master/board/orangepi/orangepi-lite2/genimage.cfg#L1-L11 that must be pointed by: https://github.com/buildroot/buildroot/blob/master/configs/orangepi_lite2_defconfig#L46-L47 So you can imitate those steps and it should work as expected. Best regards -- Giulio Benetti Benetti Engineering sas From nealf at xilinx.com Mon Feb 7 17:26:19 2022 From: nealf at xilinx.com (Neal Frager) Date: Mon, 7 Feb 2022 17:26:19 +0000 Subject: [Buildroot] Xilinx zynqmp_zcu10x_defconfigs: two things left In-Reply-To: References: <0a82d8c7-a0c6-06a5-6a0b-788fd5c4a935@benettiengineering.com> <8be136a0-1263-3b17-0b78-b7d34ef146c2@lucaceresoli.net> <032d657b-eb9a-2dc9-f60b-8536f1fc6c57@lucaceresoli.net> <16f4b7bf-546b-3bf4-c6a3-b711c8cfcadb@lucaceresoli.net> Message-ID: Hi Giulio, > In the boards I've pointed you before: > https://github.com/buildroot/buildroot/tree/master/board/orangepi/orangepi-lite2 > there is everythyng you need, the post-build script: > https://github.com/buildroot/buildroot/blob/master/board/orangepi/orangepi-lite2/post-build.sh > that copies the extlinux.conf. > And as explained before you have to point to it like this: > https://github.com/buildroot/buildroot/blob/master/configs/orangepi_lite2_defconfig#L48 > For creating the VFAT you can imitate this genimage.cfg file: > https://github.com/buildroot/buildroot/blob/master/board/orangepi/orangepi-lite2/genimage.cfg#L1-L11 > that must be pointed by: > https://github.com/buildroot/buildroot/blob/master/configs/orangepi_lite2_defconfig#L46-L47 Yes, the problem is that these steps put the extlinux.conf in the root directory of the vfat image, which does not work. U-Boot only looks for the extlinux.conf in the extlinux.conf directory. So what I was missing was figuring out how to build a vfat image with my extlinux.conf in the extlinux directory. I finally figured it out with the following genimage.cfg. image boot.vfat { vfat { files = { "boot.bin", "u-boot.itb", "system.dtb", "Image" } file extlinux/extlinux.conf { image = extlinux.conf } } size = 32M } image sdcard.img { hdimage { } partition boot { partition-type = 0xC bootable = "true" image = "boot.vfat" } partition rootfs { partition-type = 0x83 image = "rootfs.ext4" } } Thanks for your help! Best regards, Neal Frager Xilinx From fontaine.fabrice at gmail.com Mon Feb 7 17:25:00 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 7 Feb 2022 18:25:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/libusb: add -latomic to libusb-1.0.pc if needed Message-ID: <20220207172500.3041019-1-fontaine.fabrice@gmail.com> libusb unconditionally uses atomic since version 1.0.25 and https://github.com/libusb/libusb/commit/1a08aa84d96397a3840a75abe66051f5360c2c84 resulting in the following build failure with pcsc-lite or openocd since commit aad609936fc83acfe1eac6ffc86d29ac35dcf54e: checking for libusb_init... configure: error: libusb not found, use ./configure LIBUSB_LIBS=... /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: /home/buildroot/autobuild/instance-0/output-1/host/sparc-buildroot-linux-uclibc/sysroot/usr/lib/libusb-1.0.so: undefined reference to `__atomic_fetch_add_4' collect2: error: ld returned 1 exit status Fixes: - http://autobuild.buildroot.org/results/4a27a769bb3cdf78643c3049b87d792178d6512c - http://autobuild.buildroot.org/results/b59b30cbe0e27399db5c7586f369104e68a1589a Signed-off-by: Fabrice Fontaine --- ...igure.ac-link-with-latomic-if-needed.patch | 39 +++++++++++++++++++ package/libusb/libusb.mk | 2 + 2 files changed, 41 insertions(+) create mode 100644 package/libusb/0001-configure.ac-link-with-latomic-if-needed.patch diff --git a/package/libusb/0001-configure.ac-link-with-latomic-if-needed.patch b/package/libusb/0001-configure.ac-link-with-latomic-if-needed.patch new file mode 100644 index 0000000000..5f6c88e57d --- /dev/null +++ b/package/libusb/0001-configure.ac-link-with-latomic-if-needed.patch @@ -0,0 +1,39 @@ +From 0b857081d687f7ee41483a3d7e9846af44a5ba7d Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 7 Feb 2022 11:55:54 +0100 +Subject: [PATCH] configure.ac: link with -latomic if needed + +libusb unconditionally uses atomic_fetch_add since version 1.0.25 and +https://github.com/libusb/libusb/commit/1a08aa84d96397a3840a75abe66051f5360c2c84 +https://github.com/libusb/libusb/commit/eed8a371ea53939096ba94d44001e0637d042572 +but some architectures (e.g. sparc) needs to link with -latomic to be +able to use it. So check if -latomic is needed and update libusb-1.0.pc +accordingly to avoid the following build failure with openocd: + +/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: /home/buildroot/autobuild/instance-0/output-1/host/sparc-buildroot-linux-uclibc/sysroot/usr/lib/libusb-1.0.so: undefined reference to `__atomic_fetch_add_4' +collect2: error: ld returned 1 exit status + +Fixes: + - http://autobuild.buildroot.org/results/4a27a769bb3cdf78643c3049b87d792178d6512c + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/libusb/libusb/pull/1064] +--- + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure.ac b/configure.ac +index f6cf2f9..002bcf6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -152,6 +152,7 @@ if test "x$platform" = xposix; then + AC_SEARCH_LIBS([pthread_create], [pthread], + [test "x$ac_cv_search_pthread_create" != "xnone required" && AC_SUBST(THREAD_LIBS, [-lpthread])], + [], []) ++ AC_SEARCH_LIBS([__atomic_fetch_add_4], [atomic]) + elif test "x$platform" = xwindows; then + AC_DEFINE([PLATFORM_WINDOWS], [1], [Define to 1 if compiling for a Windows platform.]) + else +-- +2.34.1 + diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk index 1e82cb9a85..aa306e295d 100644 --- a/package/libusb/libusb.mk +++ b/package/libusb/libusb.mk @@ -13,6 +13,8 @@ LIBUSB_LICENSE_FILES = COPYING LIBUSB_CPE_ID_VENDOR = libusb LIBUSB_DEPENDENCIES = host-pkgconf LIBUSB_INSTALL_STAGING = YES +# We're patching configure.ac +LIBUSB_AUTORECONF = YES # Avoid the discovery of udev for the host variant HOST_LIBUSB_CONF_OPTS = --disable-udev -- 2.34.1 From fontaine.fabrice at gmail.com Mon Feb 7 17:26:49 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 7 Feb 2022 18:26:49 +0100 Subject: [Buildroot] [PATCH 1/1] package/lighttpd: pgsql needs wchar Message-ID: <20220207172649.3041300-1-fontaine.fabrice@gmail.com> Commit b429dce6f8e2ee162b79fe2a3ebb1bd179f462e3 forgot to add wchar dependency resulting in the following build failure of postgresql: configure: error: C compiler "/home/buildroot/autobuild/instance-2/output-1/host/bin/arm-linux-gcc" does not support C99 Fixes: - http://autobuild.buildroot.org/results/e4b59fecd2a5bcda8103ddf4eae3dbd78fe3b896 Signed-off-by: Fabrice Fontaine --- package/lighttpd/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index aa18c13171..6f0c927319 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -92,11 +92,13 @@ config BR2_PACKAGE_LIGHTTPD_PCRE config BR2_PACKAGE_LIGHTTPD_PGSQL bool "pgsql support" depends on BR2_USE_MMU # postgresql + depends on BR2_USE_WCHAR # 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_MMU depends on !BR2_USE_WCHAR config BR2_PACKAGE_LIGHTTPD_WEBDAV -- 2.34.1 From giulio.benetti at benettiengineering.com Mon Feb 7 17:29:57 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 7 Feb 2022 18:29:57 +0100 Subject: [Buildroot] [PATCH 1/1] board/arcturus/aarch64-ucls1012a: bump u-boot and kernel version In-Reply-To: <4b667326-5aca-538b-9b36-7f0d5a400e9f@arcturusnetworks.com> References: <4b667326-5aca-538b-9b36-7f0d5a400e9f@arcturusnetworks.com> Message-ID: Hi Oleksandr, can you improve commit log? Looking at what you do below I see you do more than just bumping u-boot and linux. Also please specify the versions you're bumping to, On 07/02/22 16:53, Oleksandr G Zhadan wrote: > Signed-off-by: Oleksandr G Zhadan > Signed-off-by: Michael Durrant > --- > ?board/arcturus/aarch64-ucls1012a/post-build.sh??? |? 2 -- > ?board/arcturus/aarch64-ucls1012a/readme.txt?????? |? 8 ++++---- > ?.../rootfs_overlay/etc/init.d/S09modload????????? | 14 -------------- > ?configs/arcturus_ucls1012a_defconfig????????????? | 15 +++++++-------- > ?4 files changed, 11 insertions(+), 28 deletions(-) > ?delete mode 100755 > board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload > > diff --git a/board/arcturus/aarch64-ucls1012a/post-build.sh > b/board/arcturus/aarch64-ucls1012a/post-build.sh > index f8ba78095f..ca3862988d 100755 > --- a/board/arcturus/aarch64-ucls1012a/post-build.sh > +++ b/board/arcturus/aarch64-ucls1012a/post-build.sh > @@ -1,5 +1,3 @@ > ?#!/bin/sh > > -mkdir -p ${TARGET_DIR}/lib/firmware > -cp -f ${BUILD_DIR}/linux-custom/firmware/ppfe/* ${TARGET_DIR}/lib/firmware/ > ?cp -f ${BUILD_DIR}/linux-custom/br2-ucls1012a.its ${BINARIES_DIR}/ > diff --git a/board/arcturus/aarch64-ucls1012a/readme.txt > b/board/arcturus/aarch64-ucls1012a/readme.txt > index 483d5e9aef..f892fc4abc 100644 > --- a/board/arcturus/aarch64-ucls1012a/readme.txt > +++ b/board/arcturus/aarch64-ucls1012a/readme.txt > @@ -23,14 +23,14 @@ Result of the build > ?After building, you should obtain this tree: > > ???? output/images/ > -??? +-- arc-ucls1012a.dtb > -??? +-- Image > +??? +-- br2-ucls1012a.its > +??? +-- Image.gz > ???? +-- part0-000000.itb > ???? +-- rootfs.cpio > ???? +-- rootfs.cpio.gz > ???? +-- rootfs.tar > ???? +-- u-boot.bin > -??? +-- ucls1012a.its > +??? +-- ucls1012a-som.dtb > > ?Flashing > ?-------- > @@ -60,7 +60,7 @@ u-boot shell. > ?4. Program the ITB image (includes Kernel, DTB and Ramdisk) > > ???? B$ tftp part0-000000.itb > -??? B$ run iprogram > +??? B$ run program0 > > ?5. Booting your new system > > diff --git > a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload > b/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload > deleted file mode 100755 > index c87ffda14f..0000000000 > --- a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload > +++ /dev/null > @@ -1,14 +0,0 @@ > -#!/bin/sh > -# > -case "$1" in > -?????? start) > -??????????????? modprobe pfe > -??????????????? ;; > -??????? stop) > -??????????????? ;; > -??????? restart|reload) > -??????????????? ;; > -??????? *) > -??????????????? echo "Usage: $0 {start|stop|restart}" > -??????????????? exit 1 > -esac Here you remove this file for modprobe() fpe, why? Can you elabore in commit log? > diff --git a/configs/arcturus_ucls1012a_defconfig > b/configs/arcturus_ucls1012a_defconfig > index fd33ebf1f6..f544a5240a 100644 > --- a/configs/arcturus_ucls1012a_defconfig > +++ b/configs/arcturus_ucls1012a_defconfig > @@ -1,24 +1,23 @@ > ?# Architecture > ?BR2_aarch64=y > > -# Linux headers same as kernel, a 4.14 series > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y > > ?# System settings > ?BR2_TARGET_GENERIC_HOSTNAME="ucls1012a" > ?BR2_TARGET_GENERIC_ISSUE="Welcome to uCLS1012A-SOM" > ?BR2_SYSTEM_DHCP="eth0" > -BR2_ROOTFS_OVERLAY="board/arcturus/aarch64-ucls1012a/rootfs_overlay" > ?BR2_ROOTFS_POST_BUILD_SCRIPT="board/arcturus/aarch64-ucls1012a/post-build.sh" > ?BR2_ROOTFS_POST_IMAGE_SCRIPT="board/arcturus/aarch64-ucls1012a/post-image.sh" > > ?# Kernel > ?BR2_LINUX_KERNEL=y > ?BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call > github,ArcturusNetworks,uCLS1012A-kernel,v.20.31)/linux-v.20.31.tar.gz" > -BR2_LINUX_KERNEL_DEFCONFIG="ucls1012a" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call > github,ArcturusNetworks,uCLS1012A-kernel,v.22.05)/linux-v.22.05.tar.gz" > +BR2_LINUX_KERNEL_DEFCONFIG="ucls1012a_som" Here ^^^ you also change the defconfig name, another thing to add to commit log and the reason > +BR2_LINUX_KERNEL_IMAGEGZ=y Here ^^^ you change to zImage, another thing to add to commit log > ?BR2_LINUX_KERNEL_DTS_SUPPORT=y > -BR2_LINUX_KERNEL_INTREE_DTS_NAME="arcturus/arc-ucls1012a" > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="arcturus/ucls1012a-som" > > ?# Filesystem > ?BR2_TARGET_ROOTFS_CPIO=y > @@ -28,8 +27,8 @@ BR2_TARGET_ROOTFS_CPIO_GZIP=y > ?BR2_TARGET_UBOOT=y > ?BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > ?BR2_TARGET_UBOOT_CUSTOM_TARBALL=y > -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call > github,ArcturusNetworks,uCLS1012A-uboot,v.20.31)/uboot-v.20.31.tar.gz" > -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="UCLS1012A_QSPI128" > +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call > github,ArcturusNetworks,uCLS1012A-uboot,v.22.05)/uboot-v.22.05.tar.gz" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="UCLS1012A_SOM" Ditto > ?# Tools > ?BR2_PACKAGE_HOST_UBOOT_TOOLS=y Also, which Buildroot version do you use to create patch? And which specific command do you use? I ask you this because patch results malformed: ``` patch -p1 < ~/Downloads/1-1-board-arcturus-aarch64-ucls1012a-bump-u-boot-and-kernel-version.patch patching file board/arcturus/aarch64-ucls1012a/post-build.sh Hunk #1 succeeded at 1 with fuzz 2. patching file board/arcturus/aarch64-ucls1012a/readme.txt Hunk #1 FAILED at 23. Hunk #2 FAILED at 60. 2 out of 2 hunks FAILED -- saving rejects to file board/arcturus/aarch64-ucls1012a/readme.txt.rej patching file board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload Reversed (or previously applied) patch detected! Assume -R? [n] Apply anyway? [n] Skipping patch. 1 out of 1 hunk ignored -- saving rejects to file board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload.rej patching file configs/arcturus_ucls1012a_defconfig patch: **** malformed patch at line 201: github,ArcturusNetworks,uCLS1012A-kernel,v.20.31)/linux-v.20.31.tar.gz" ``` I've tried applying with: git am xxx.patch and then with: patch -p1 < xxx.patch but that gave me the malformed patch error. Usually this is how I do: Rebase # git pull --rebase upstream master Create the patch assuming it is on top of the commits # git format-patch -M -s -o . -1 Then I send it with: # git send-email --to "buildroot " 0001-xxxx.patch Can you please check? Because I want to give a build and check in buildroot docker. Thank you! Best regards -- Giulio Benetti Benetti Engineering sas From fontaine.fabrice at gmail.com Mon Feb 7 17:32:15 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 7 Feb 2022 18:32:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/ace: needs C++11 Message-ID: <20220207173215.3041588-1-fontaine.fabrice@gmail.com> ace needs C++11 since its addition in commit 3621918d1bc1ddc9312dd1cc8dec6db61e712fe2 to avoid the following build failure: In file included from /home/peko/autobuild/instance-1/output-1/host/opt/ext-toolchain/mips-linux-gnu/include/c++/5.3.0/chrono:35:0, from /home/peko/autobuild/instance-1/output-1/build/ace-7.0.1/ace/Time_Value.h:23, from /home/peko/autobuild/instance-1/output-1/build/ace-7.0.1/ace/OS_NS_unistd.h:25, from /home/peko/autobuild/instance-1/output-1/build/ace-7.0.1/ace/ACE.inl:2, from /home/peko/autobuild/instance-1/output-1/build/ace-7.0.1/ace/ACE.h:886, from /home/peko/autobuild/instance-1/output-1/build/ace-7.0.1/ace/ACE.cpp:1: /home/peko/autobuild/instance-1/output-1/host/opt/ext-toolchain/mips-linux-gnu/include/c++/5.3.0/bits/c++0x_warning.h:32:2: error: #error This file requires compiler and library support for the ISO C++ 2011 standard. This support is currently experimental, and must be enabled with the -std=c++11 or -std=gnu++11 compiler options. #error This file requires compiler and library support for the \ ^ Fixes: - http://autobuild.buildroot.org/results/13376405e313da112f546076a10859e60631d5d5 Signed-off-by: Fabrice Fontaine --- package/ace/Config.in | 8 ++++++-- package/ace/ace.mk | 9 +++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/package/ace/Config.in b/package/ace/Config.in index 226e34df32..5000f2352f 100644 --- a/package/ace/Config.in +++ b/package/ace/Config.in @@ -2,11 +2,15 @@ config BR2_PACKAGE_ACE bool "ace" depends on BR2_TOOLCHAIN_USES_GLIBC depends on !BR2_STATIC_LIBS + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 help The ADAPTIVE Communication Environment (ACE(TM)) An OO Network Programming Toolkit in C++. http://www.dre.vanderbilt.edu/~schmidt/ACE.html -comment "ACE needs a glibc toolchain, dynamic library" - depends on !BR2_TOOLCHAIN_USES_GLIBC || BR2_STATIC_LIBS +comment "ACE needs a glibc toolchain, dynamic library, C++, gcc >= 4.8" + depends on !BR2_TOOLCHAIN_USES_GLIBC || BR2_STATIC_LIBS || \ + !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/package/ace/ace.mk b/package/ace/ace.mk index b6b4cfbc24..8df89d8c6f 100644 --- a/package/ace/ace.mk +++ b/package/ace/ace.mk @@ -17,6 +17,10 @@ ACE_CPE_ID_PRODUCT = adaptive_communication_environment # Only compiling ACE libraries (no TAO) ACE_LIBARIES = ace ACEXML Kokyu netsvcs protocols/ace +ACE_MAKE_OPTS = \ + ACE_ROOT="$(@D)" \ + DEFFLAGS="$(TARGET_CPPFLAGS) -std=c++11" + ifeq ($(BR2_PACKAGE_OPENSSL),y) ACE_LIBARIES += ace/SSL ACE_DEPENDENCIES += openssl @@ -39,14 +43,15 @@ endef define ACE_BUILD_CMDS $(foreach lib,$(ACE_LIBARIES), \ - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/$(lib) ACE_ROOT="$(@D)" all + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/$(lib) \ + $(ACE_MAKE_OPTS) all ) endef define ACE_LIBARIES_INSTALL mkdir -p $(1)/usr/share/ace $(foreach lib,$(ACE_LIBARIES), \ - $(MAKE) -C $(@D)/$(lib) ACE_ROOT="$(@D)" DESTDIR=$(1) install + $(MAKE) -C $(@D)/$(lib) $(ACE_MAKE_OPTS) DESTDIR=$(1) install ) endef -- 2.34.1 From giulio.benetti at benettiengineering.com Mon Feb 7 17:36:22 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 7 Feb 2022 18:36:22 +0100 Subject: [Buildroot] Xilinx zynqmp_zcu10x_defconfigs: two things left In-Reply-To: References: <0a82d8c7-a0c6-06a5-6a0b-788fd5c4a935@benettiengineering.com> <8be136a0-1263-3b17-0b78-b7d34ef146c2@lucaceresoli.net> <032d657b-eb9a-2dc9-f60b-8536f1fc6c57@lucaceresoli.net> <16f4b7bf-546b-3bf4-c6a3-b711c8cfcadb@lucaceresoli.net> Message-ID: Hi Neal, On 07/02/22 18:26, Neal Frager wrote: > Hi Giulio, > >> In the boards I've pointed you before: >> https://github.com/buildroot/buildroot/tree/master/board/orangepi/orangepi-lite2 > >> there is everythyng you need, the post-build script: >> https://github.com/buildroot/buildroot/blob/master/board/orangepi/orangepi-lite2/post-build.sh >> that copies the extlinux.conf. > >> And as explained before you have to point to it like this: >> https://github.com/buildroot/buildroot/blob/master/configs/orangepi_lite2_defconfig#L48 > >> For creating the VFAT you can imitate this genimage.cfg file: >> https://github.com/buildroot/buildroot/blob/master/board/orangepi/orangepi-lite2/genimage.cfg#L1-L11 > >> that must be pointed by: >> https://github.com/buildroot/buildroot/blob/master/configs/orangepi_lite2_defconfig#L46-L47 > > Yes, the problem is that these steps put the extlinux.conf in the root directory of the vfat image, which does not work. U-Boot only looks for the extlinux.conf in the extlinux.conf directory. So what I was missing was figuring out how to build a vfat image with my extlinux.conf in the extlinux directory. I finally figured it out with the following genimage.cfg. Aah ok. Usually /extlinux/extlinux.conf is found in ext4 /boot/ but it's ok even in vfat. > > image boot.vfat { > vfat { > files = { > "boot.bin", > "u-boot.itb", > "system.dtb", > "Image" > } > file extlinux/extlinux.conf { > image = extlinux.conf > } > } > > size = 32M > } > > image sdcard.img { > hdimage { > } > > partition boot { > partition-type = 0xC > bootable = "true" > image = "boot.vfat" > } > > partition rootfs { > partition-type = 0x83 > image = "rootfs.ext4" > } > } > > Thanks for your help! You're welcome Best regards -- Giulio Benetti Benetti Engineering sas From yann.morin.1998 at free.fr Mon Feb 7 17:37:51 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 7 Feb 2022 18:37:51 +0100 Subject: [Buildroot] [PATCH 01/16] board/aarch64-efi/genimage-efi: convert partition-type-uuid to single letter notation In-Reply-To: <20220207085517.5c13c097@windsurf> References: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> <20220206200532.2758493-2-giulio.benetti@benettiengineering.com> <20220206213657.GA457876@scaer> <20220207085517.5c13c097@windsurf> Message-ID: <20220207173751.GA2249818@scaer> Thomas, All, On 2022-02-07 08:55 +0100, Thomas Petazzoni spake thusly: > On Sun, 6 Feb 2022 22:36:57 +0100 > "Yann E. MORIN" wrote: > > > partition root { > > > - partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae > > > + partition-type-uuid = L > > As we discussed on IRC, this is not the same thing. genimage will extend > > the 'L' shorthand to the full UUID 0fc63daf-8483-4772-8e79-3d69d8477de4, > > which is different. > And? Is that really important? > > So I don't think uaing the shorthands are correct. > Why? I think that it is important that we do adhere to the expected values; see below... > > The UUID assignments are available on Wikipedia: > > https://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs > > But the systemd docuemntation has extra UUID definitions: > > https://man.archlinux.org/man/systemd-gpt-auto-generator.8 > Yes, but how useful are they? Why would we diverge from the specs? > Unless these systemd-defined UUID are really relevant, I would prefer > that we use the shortcuts provided by genimage wherever possible, and > only rely on using the full UUID for special cases, such as the > board/sifive/hifive-unleashed/genimage_sdcard.cfg (PATCH 15/16). There are tools that expect those values, to autodetect partitions. This is the case, of course, of systemd-gpt-auto-generator, which will lookup the partition UUIDs, but other tools may expect these UUIDs too. I am not saying that we would cause trouble by changing our board descriptions, but if we want to allow people to just copy them as the base for their own development, then diverging from expected behaviour is not nice. > This way, it would be pretty clear that we have the "common cases" (boot > partition, rootfs partition) and the "odd/special cases". I think the "common case" would be "adhere to spec, use specified values", while the exceptions are "the spec says nothing, use something else and comment it". Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Mon Feb 7 17:40:02 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 7 Feb 2022 18:40:02 +0100 Subject: [Buildroot] csky_gx6605s build failure In-Reply-To: References: Message-ID: <20220207174002.GB2249818@scaer> Guo, All, On 2022-02-07 15:33 +0800, Guo Ren spake thusly: > We?re using buildroot to build ck610 toolchain, here is the build log: > https://gitlab.com/c-sky/buildroot/-/jobs/1978229010 > Here is the Qemu testing log: > https://gitlab.com/c-sky/buildroot/-/jobs/1978229040 > > Could we use this toolchain which built from buildroot as the external toolchain you mentioned? > https://gitlab.com/c-sky/buildroot/-/jobs/1978229010/artifacts/file/output/images/toolchain_thead_610_compat_next_glibc_br_defconfig_8c99ae1c7cb66c0f062ed453fd9ae4c59422a42a.tar.xz > > Ps: > Ck610 ISA is mcore(we call it abiv1), gcc 12 doesn?t support it, here is toolchain related repo (base on gcc 6.3): > https://gitlab.com/c-sky/buildroot/-/blob/master/patches/0003-version.patch > > Git hub repo: > -else ifeq ($(BR2_GCC_VERSION_CSKY),y) > -GCC_SITE = $(call github,c-sky,gcc,$(GCC_VERSION)) > -GCC_SOURCE = gcc-$(GCC_VERSION).tar.gz Do you think you could send an update to the defconfig we have in-tree, and any change you've made on your Buildroot fork, 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 peter at korsgaard.com Mon Feb 7 18:19:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Feb 2022 19:19:40 +0100 Subject: [Buildroot] [PATCH] package/gnuradio: simplify pyver logic In-Reply-To: <20220206102956.15291-1-peter@korsgaard.com> (Peter Korsgaard's message of "Sun, 6 Feb 2022 11:29:55 +0100") References: <20220206102956.15291-1-peter@korsgaard.com> Message-ID: <874k5atu83.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Gnuradio only works with python3 since commit 786c783f3796 > (package/python-numpy: bump to version 1.18.2), so the python2/3 logic for > _PYVER can be dropped. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 7 18:19:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Feb 2022 19:19:51 +0100 Subject: [Buildroot] [PATCH] package/libpwquality: support python bindings with python3 In-Reply-To: <20220206121652.30854-1-peter@korsgaard.com> (Peter Korsgaard's message of "Sun, 6 Feb 2022 13:16:51 +0100") References: <20220206121652.30854-1-peter@korsgaard.com> Message-ID: <87zgn2sfnc.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > The python bindings support python3 as well, so enable it if python3 is > enabled. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 7 18:20:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Feb 2022 19:20:16 +0100 Subject: [Buildroot] [PATCH 1/2] package/avahi: drop unneeded am_cv_path_PYTHON In-Reply-To: <20220206094504.11415-1-peter@korsgaard.com> (Peter Korsgaard's message of "Sun, 6 Feb 2022 10:45:02 +0100") References: <20220206094504.11415-1-peter@korsgaard.com> Message-ID: <87v8xqsfmn.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > It is not used by the configure script and refer to PYTHON_TARGET_BINARY > which was dropped back in 2010 by commit e3418f69cf (python: convert to > autotargets, bump to 2.7.1, many improvements), so drop it. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 7 18:22:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Feb 2022 19:22:16 +0100 Subject: [Buildroot] [PATCH 2/2] package/avahi: add pygobject support, move to python3 In-Reply-To: <20220206094504.11415-2-peter@korsgaard.com> (Peter Korsgaard's message of "Sun, 6 Feb 2022 10:45:03 +0100") References: <20220206094504.11415-1-peter@korsgaard.com> <20220206094504.11415-2-peter@korsgaard.com> Message-ID: <87r18esfjb.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > The python support in avahi needs pygobjet to do anything: > Building avahi-python: no (You need python, pygobject and python-dbus!) > So add optional support for it. Python-gobject is only available for > python3, so change the python logic to use python 3. > Signed-off-by: Peter Korsgaard Committed, thanks. The further cleanup to only pass --enable-python if all the dependencies are present can be done later. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 7 18:23:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Feb 2022 19:23:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/lighttpd: pgsql needs wchar In-Reply-To: <20220207172649.3041300-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 7 Feb 2022 18:26:49 +0100") References: <20220207172649.3041300-1-fontaine.fabrice@gmail.com> Message-ID: <87mtj2sfhj.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Commit b429dce6f8e2ee162b79fe2a3ebb1bd179f462e3 forgot to add wchar > dependency resulting in the following build failure of postgresql: > configure: error: C compiler "/home/buildroot/autobuild/instance-2/output-1/host/bin/arm-linux-gcc" does not support C99 > Fixes: > - http://autobuild.buildroot.org/results/e4b59fecd2a5bcda8103ddf4eae3dbd78fe3b896 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 7 18:24:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Feb 2022 19:24:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/ace: needs C++11 In-Reply-To: <20220207173215.3041588-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 7 Feb 2022 18:32:15 +0100") References: <20220207173215.3041588-1-fontaine.fabrice@gmail.com> Message-ID: <87iltqsffd.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > ace needs C++11 since its addition in commit > 3621918d1bc1ddc9312dd1cc8dec6db61e712fe2 to avoid the following build > failure: > In file included from /home/peko/autobuild/instance-1/output-1/host/opt/ext-toolchain/mips-linux-gnu/include/c++/5.3.0/chrono:35:0, > from /home/peko/autobuild/instance-1/output-1/build/ace-7.0.1/ace/Time_Value.h:23, > from /home/peko/autobuild/instance-1/output-1/build/ace-7.0.1/ace/OS_NS_unistd.h:25, > from /home/peko/autobuild/instance-1/output-1/build/ace-7.0.1/ace/ACE.inl:2, > from /home/peko/autobuild/instance-1/output-1/build/ace-7.0.1/ace/ACE.h:886, > from /home/peko/autobuild/instance-1/output-1/build/ace-7.0.1/ace/ACE.cpp:1: > /home/peko/autobuild/instance-1/output-1/host/opt/ext-toolchain/mips-linux-gnu/include/c++/5.3.0/bits/c++0x_warning.h:32:2: error: #error This file requires compiler and library support for the ISO C++ 2011 standard. This support is currently experimental, and must be enabled with the -std=c++11 or -std=gnu++11 compiler options. > #error This file requires compiler and library support for the \ > ^ > Fixes: > - http://autobuild.buildroot.org/results/13376405e313da112f546076a10859e60631d5d5 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 7 18:19:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Feb 2022 19:19:32 +0100 Subject: [Buildroot] [git commit] package/libpwquality: support python bindings with python3 Message-ID: <20220207181734.8A84582DC2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=92a1b71204d6cccd2e1c4f4c67d4f0d17edc1adb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The python bindings support python3 as well, so enable it if python3 is enabled. Signed-off-by: Peter Korsgaard --- package/libpwquality/libpwquality.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libpwquality/libpwquality.mk b/package/libpwquality/libpwquality.mk index 7c0c5df38e..54a03be453 100644 --- a/package/libpwquality/libpwquality.mk +++ b/package/libpwquality/libpwquality.mk @@ -12,9 +12,9 @@ LIBPWQUALITY_INSTALL_STAGING = YES LIBPWQUALITY_DEPENDENCIES = cracklib LIBPWQUALITY_LICENSE_FILES = COPYING -ifeq ($(BR2_PACKAGE_PYTHON),y) +ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) LIBPWQUALITY_CONF_OPTS += --enable-python-bindings -LIBPWQUALITY_DEPENDENCIES += python +LIBPWQUALITY_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON3),python3,python) LIBPWQUALITY_MAKE_ENV += $(PKG_PYTHON_DISTUTILS_ENV) else LIBPWQUALITY_CONF_OPTS += --disable-python-bindings From peter at korsgaard.com Mon Feb 7 18:23:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Feb 2022 19:23:50 +0100 Subject: [Buildroot] [git commit] package/ace: needs C++11 Message-ID: <20220207181734.AE85582DC5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e8011a08b6fd83b43babc3b3d91d5636f28154de branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master ace needs C++11 since its addition in commit 3621918d1bc1ddc9312dd1cc8dec6db61e712fe2 to avoid the following build failure: In file included from /home/peko/autobuild/instance-1/output-1/host/opt/ext-toolchain/mips-linux-gnu/include/c++/5.3.0/chrono:35:0, from /home/peko/autobuild/instance-1/output-1/build/ace-7.0.1/ace/Time_Value.h:23, from /home/peko/autobuild/instance-1/output-1/build/ace-7.0.1/ace/OS_NS_unistd.h:25, from /home/peko/autobuild/instance-1/output-1/build/ace-7.0.1/ace/ACE.inl:2, from /home/peko/autobuild/instance-1/output-1/build/ace-7.0.1/ace/ACE.h:886, from /home/peko/autobuild/instance-1/output-1/build/ace-7.0.1/ace/ACE.cpp:1: /home/peko/autobuild/instance-1/output-1/host/opt/ext-toolchain/mips-linux-gnu/include/c++/5.3.0/bits/c++0x_warning.h:32:2: error: #error This file requires compiler and library support for the ISO C++ 2011 standard. This support is currently experimental, and must be enabled with the -std=c++11 or -std=gnu++11 compiler options. #error This file requires compiler and library support for the \ ^ Fixes: - http://autobuild.buildroot.org/results/13376405e313da112f546076a10859e60631d5d5 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/ace/Config.in | 8 ++++++-- package/ace/ace.mk | 9 +++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/package/ace/Config.in b/package/ace/Config.in index 226e34df32..5000f2352f 100644 --- a/package/ace/Config.in +++ b/package/ace/Config.in @@ -2,11 +2,15 @@ config BR2_PACKAGE_ACE bool "ace" depends on BR2_TOOLCHAIN_USES_GLIBC depends on !BR2_STATIC_LIBS + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 help The ADAPTIVE Communication Environment (ACE(TM)) An OO Network Programming Toolkit in C++. http://www.dre.vanderbilt.edu/~schmidt/ACE.html -comment "ACE needs a glibc toolchain, dynamic library" - depends on !BR2_TOOLCHAIN_USES_GLIBC || BR2_STATIC_LIBS +comment "ACE needs a glibc toolchain, dynamic library, C++, gcc >= 4.8" + depends on !BR2_TOOLCHAIN_USES_GLIBC || BR2_STATIC_LIBS || \ + !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/package/ace/ace.mk b/package/ace/ace.mk index b6b4cfbc24..8df89d8c6f 100644 --- a/package/ace/ace.mk +++ b/package/ace/ace.mk @@ -17,6 +17,10 @@ ACE_CPE_ID_PRODUCT = adaptive_communication_environment # Only compiling ACE libraries (no TAO) ACE_LIBARIES = ace ACEXML Kokyu netsvcs protocols/ace +ACE_MAKE_OPTS = \ + ACE_ROOT="$(@D)" \ + DEFFLAGS="$(TARGET_CPPFLAGS) -std=c++11" + ifeq ($(BR2_PACKAGE_OPENSSL),y) ACE_LIBARIES += ace/SSL ACE_DEPENDENCIES += openssl @@ -39,14 +43,15 @@ endef define ACE_BUILD_CMDS $(foreach lib,$(ACE_LIBARIES), \ - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/$(lib) ACE_ROOT="$(@D)" all + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/$(lib) \ + $(ACE_MAKE_OPTS) all ) endef define ACE_LIBARIES_INSTALL mkdir -p $(1)/usr/share/ace $(foreach lib,$(ACE_LIBARIES), \ - $(MAKE) -C $(@D)/$(lib) ACE_ROOT="$(@D)" DESTDIR=$(1) install + $(MAKE) -C $(@D)/$(lib) $(ACE_MAKE_OPTS) DESTDIR=$(1) install ) endef From peter at korsgaard.com Mon Feb 7 18:20:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Feb 2022 19:20:07 +0100 Subject: [Buildroot] [git commit] package/avahi: drop unneeded am_cv_path_PYTHON Message-ID: <20220207181734.9391E82DC5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ff44d53b647c20b5221fe960d7411ddf8094a3cc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master It is not used by the configure script and refer to PYTHON_TARGET_BINARY which was dropped back in 2010 by commit e3418f69cf (python: convert to autotargets, bump to 2.7.1, many improvements), so drop it. Signed-off-by: Peter Korsgaard --- package/avahi/avahi.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk index 13e2106014..04c4164af6 100644 --- a/package/avahi/avahi.mk +++ b/package/avahi/avahi.mk @@ -107,7 +107,6 @@ endif ifeq ($(BR2_PACKAGE_PYTHON),y) AVAHI_CONF_ENV += \ am_cv_pathless_PYTHON=python \ - am_cv_path_PYTHON=$(PYTHON_TARGET_BINARY) \ am_cv_python_version=$(PYTHON_VERSION) \ am_cv_python_platform=linux2 \ am_cv_python_pythondir=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \ From peter at korsgaard.com Mon Feb 7 18:21:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Feb 2022 19:21:33 +0100 Subject: [Buildroot] [git commit] package/avahi: add pygobject support, move to python3 Message-ID: <20220207181734.9BB0882AB5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=71dc252bb96c5d8f667f11abf3e0b8ba59fd4131 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The python support in avahi needs pygobjet to do anything: Building avahi-python: no (You need python, pygobject and python-dbus!) So add optional support for it. Python-gobject is only available for python3, so change the python logic to use python 3. Signed-off-by: Peter Korsgaard --- package/avahi/avahi.mk | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk index 04c4164af6..1992669a92 100644 --- a/package/avahi/avahi.mk +++ b/package/avahi/avahi.mk @@ -40,7 +40,6 @@ AVAHI_CONF_OPTS = \ --disable-gtk \ --disable-gtk3 \ --disable-gdbm \ - --disable-pygobject \ --disable-mono \ --disable-monodoc \ --disable-stack-protector \ @@ -104,16 +103,16 @@ else AVAHI_CONF_OPTS += --disable-glib --disable-gobject endif -ifeq ($(BR2_PACKAGE_PYTHON),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) AVAHI_CONF_ENV += \ - am_cv_pathless_PYTHON=python \ - am_cv_python_version=$(PYTHON_VERSION) \ - am_cv_python_platform=linux2 \ - am_cv_python_pythondir=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \ - am_cv_python_pyexecdir=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \ + am_cv_pathless_PYTHON=python3 \ + am_cv_python_version=$(PYTHON3_VERSION) \ + am_cv_python_platform=linux5 \ + am_cv_python_pythondir=/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + am_cv_python_pyexecdir=/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ py_cv_mod_socket_=yes -AVAHI_DEPENDENCIES += python +AVAHI_DEPENDENCIES += python3 AVAHI_CONF_OPTS += --enable-python else AVAHI_CONF_OPTS += --disable-python @@ -127,6 +126,13 @@ else AVAHI_CONF_OPTS += --disable-python-dbus endif +ifeq ($(BR2_PACKAGE_PYTHON_GOBJECT),y) +AVAHI_CONF_OPTS += --enable-pygobject +AVAHI_DEPENDENCIES += python-gobject +else +AVAHI_CONF_OPTS += --disable-pygobject +endif + AVAHI_CONF_ENV += CFLAGS="$(AVAHI_CFLAGS)" AVAHI_MAKE_OPTS += LIBS=$(TARGET_NLS_LIBS) From peter at korsgaard.com Mon Feb 7 18:18:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Feb 2022 19:18:58 +0100 Subject: [Buildroot] [git commit] package/gnuradio: simplify pyver logic Message-ID: <20220207181734.8228782AB5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7162d69194d606734e7148f009dd034b31d1302a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Gnuradio only works with python3 since commit 786c783f3796 (package/python-numpy: bump to version 1.18.2), so the python2/3 logic for _PYVER can be dropped. Signed-off-by: Peter Korsgaard --- package/gnuradio/gnuradio.mk | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index 658357398d..417a51e067 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -11,13 +11,6 @@ GNURADIO_LICENSE_FILES = COPYING GNURADIO_SUPPORTS_IN_SOURCE_BUILD = NO -# needed to determine site-packages path -ifeq ($(BR2_PACKAGE_PYTHON),y) -GNURADIO_PYVER = $(PYTHON_VERSION_MAJOR) -else ifeq ($(BR2_PACKAGE_PYTHON3),y) -GNURADIO_PYVER = $(PYTHON3_VERSION_MAJOR) -endif - # host-python-mako and host-python-six are needed for volk to compile GNURADIO_DEPENDENCIES = \ host-python3 \ @@ -125,7 +118,7 @@ GNURADIO_CONF_OPTS += -DENABLE_PYTHON=ON # mandatory to install python modules in site-packages and to use # correct path for python libraries GNURADIO_CONF_OPTS += -DGR_PYTHON_RELATIVE=ON \ - -DGR_PYTHON_DIR=lib/python$(GNURADIO_PYVER)/site-packages + -DGR_PYTHON_DIR=lib/python$(PYTHON3_VERSION_MAJOR)/site-packages else GNURADIO_CONF_OPTS += -DENABLE_PYTHON=OFF endif From peter at korsgaard.com Mon Feb 7 18:22:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Feb 2022 19:22:34 +0100 Subject: [Buildroot] [git commit] package/lighttpd: pgsql needs wchar Message-ID: <20220207181734.A59A682DC2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b8e7e90b839c5411674729326f3f603a5a2c69d9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit b429dce6f8e2ee162b79fe2a3ebb1bd179f462e3 forgot to add wchar dependency resulting in the following build failure of postgresql: configure: error: C compiler "/home/buildroot/autobuild/instance-2/output-1/host/bin/arm-linux-gcc" does not support C99 Fixes: - http://autobuild.buildroot.org/results/e4b59fecd2a5bcda8103ddf4eae3dbd78fe3b896 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/lighttpd/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index b9f64a3bc3..4406a685ba 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -83,11 +83,13 @@ config BR2_PACKAGE_LIGHTTPD_PCRE config BR2_PACKAGE_LIGHTTPD_PGSQL bool "pgsql support" depends on BR2_USE_MMU # postgresql + depends on BR2_USE_WCHAR # 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_MMU depends on !BR2_USE_WCHAR config BR2_PACKAGE_LIGHTTPD_WEBDAV From nealf at xilinx.com Mon Feb 7 18:40:41 2022 From: nealf at xilinx.com (Neal Frager) Date: Mon, 7 Feb 2022 18:40:41 +0000 Subject: [Buildroot] Xilinx zynqmp_zcu10x_defconfigs: two things left In-Reply-To: References: <0a82d8c7-a0c6-06a5-6a0b-788fd5c4a935@benettiengineering.com> <8be136a0-1263-3b17-0b78-b7d34ef146c2@lucaceresoli.net> <032d657b-eb9a-2dc9-f60b-8536f1fc6c57@lucaceresoli.net> <16f4b7bf-546b-3bf4-c6a3-b711c8cfcadb@lucaceresoli.net> Message-ID: Hi Giulio, > Aah ok. > Usually /extlinux/extlinux.conf is found in ext4 /boot/ but it's ok even in vfat. Unfortunately, it was a bit of a chicken and the egg issue. U-Boot could not find the rootfs.ext4 without the extlinux.conf. So if the extlinux.conf was in the ext4 file system, U-Boot could never find it. This is why it needs to be in the vfat partition for booting, and specifically in the /extlinux directory in the case of zynqmp. > > image boot.vfat { > vfat { > files = { > "boot.bin", > "u-boot.itb", > "system.dtb", > "Image" > } > file extlinux/extlinux.conf { > image = extlinux.conf > } > } > > size = 32M > } > > image sdcard.img { > hdimage { > } > > partition boot { > partition-type = 0xC > bootable = "true" > image = "boot.vfat" > } > > partition rootfs { > partition-type = 0x83 > image = "rootfs.ext4" > } > } > The good news is I just completed a build of a version that builds and runs without needing any manual post-build steps. All that is required is 'make zynqmp_zcu10x_defconfig' followed by 'make'. The way it should be. I will be submitting a new patch set tomorrow. It will include the following software versions. ATF v2.6 from https://github.com/Xilinx/arm-trusted-firmware U-Boot 2022.01 from https://github.com/Xilinx/u-boot-xlnx Linux 5.15 from https://github.com/Xilinx/linux-xlnx Using these versions allow me to make use of the updated U-Boot tools/zynqmp_pm_cfg_obj_convert.py without needing to be dependent on any build patches. Thank you both, Giulio and Luca, for your fantastic support! Best regards, Neal Frager Xilinx From peter at korsgaard.com Mon Feb 7 18:43:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Feb 2022 19:43:42 +0100 Subject: [Buildroot] Build error with 2021.11.x In-Reply-To: (Andrey Nechypurenko's message of "Mon, 7 Feb 2022 11:33:16 +0100") References: Message-ID: <87ee4esejl.fsf@dell.be.48ers.dk> >>>>> "Andrey" == Andrey Nechypurenko writes: > Hello Buildrooters, > I just updated Buildroot from 2021.08.x to 2021.11.x and got build problems. > In particular, ICU library could not be built. I was trying with ARM > external toolchain and with Linaro 2018 getting the same error. > It would be great if someone can provide hints on what might be wrong and > how to fix the problem. Below are the relevant logs and information. > Thank you, > Andrey. >>>> icu 69-1 Configuring [snip] > INTLTOOL_PERL=/usr/bin/perl CFLAGS="-D_LARGEFILE_SOURCE > -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O3 -g0 > -D_FORTIFY_SOURCE=1 > -I/home/and/p2/build/prodx/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/drm" > LDFLAGS=" -ldrm" ac_cv_lbl_unaligned_fail=yes Hmm, is this a pristine upstream Buildroot 2021.11 without any external packages? You seem to be passing some extra CFLAGS / LDFLAGS to the configure script. Variables like TARGET_CONFIGURE_OPTS are global, so you cannot change it in a custom package without causing problems, like this: > configure:3057: checking whether the C compiler works > configure:3079: > /home/and/p2/build/prodx/host/bin/arm-linux-gnueabihf-gcc > -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O3 > -g0 -D_FORTIFY_SOURCE=1 > -I/home/and/p2/build/prodx/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/drm > -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 > -ldrm conftest.c -latomic >&5 > /home/and/p2/build/prodx/host/opt/ext-toolchain/bin/../lib/gcc/arm-linux-gnueabihf/7.3.1/../../../../arm-linux-gnueabihf/bin/ld: > cannot find -ldrm -- Bye, Peter Korsgaard From aduskett at gmail.com Mon Feb 7 19:02:37 2022 From: aduskett at gmail.com (Adam Duskett) Date: Mon, 7 Feb 2022 11:02:37 -0800 Subject: [Buildroot] [PATCH 2/3] package/mender/mender.mk: add bootloader-integration inventory script In-Reply-To: <20220207190238.73906-1-aduskett@gmail.com> References: <20220207190238.73906-1-aduskett@gmail.com> Message-ID: <20220207190238.73906-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 33b4611a5f..f462a34fa5 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 Mon Feb 7 19:02:36 2022 From: aduskett at gmail.com (Adam Duskett) Date: Mon, 7 Feb 2022 11:02:36 -0800 Subject: [Buildroot] [PATCH 1/3] package/mender: bump to version 3.2.1 Message-ID: <20220207190238.73906-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..3a7a675341 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 8dd04f963f1816350c5406312969f5b11d45c772274a8c32f7a9da8b2cc36561 3.2.1.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..33b4611a5f 100644 --- a/package/mender/mender.mk +++ b/package/mender/mender.mk @@ -4,7 +4,7 @@ # ################################################################################ -MENDER_VERSION = 3.1.0 +MENDER_VERSION = 3.2.1 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 Mon Feb 7 19:02:38 2022 From: aduskett at gmail.com (Adam Duskett) Date: Mon, 7 Feb 2022 11:02:38 -0800 Subject: [Buildroot] [PATCH 3/3] package/mender-artifact: bump to version 3.7.0 In-Reply-To: <20220207190238.73906-1-aduskett@gmail.com> References: <20220207190238.73906-1-aduskett@gmail.com> Message-ID: <20220207190238.73906-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 andreynech at gmail.com Mon Feb 7 19:44:34 2022 From: andreynech at gmail.com (Andrey Nechypurenko) Date: Mon, 7 Feb 2022 20:44:34 +0100 Subject: [Buildroot] Build error with 2021.11.x In-Reply-To: <87ee4esejl.fsf@dell.be.48ers.dk> References: <87ee4esejl.fsf@dell.be.48ers.dk> Message-ID: Hi Peter, > >>>> icu 69-1 Configuring > > [snip] > > > INTLTOOL_PERL=/usr/bin/perl CFLAGS="-D_LARGEFILE_SOURCE > > -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O3 -g0 > > -D_FORTIFY_SOURCE=1 > > -I/home/and/p2/build/prodx/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/drm" > > LDFLAGS=" -ldrm" ac_cv_lbl_unaligned_fail=yes > > Hmm, is this a pristine upstream Buildroot 2021.11 without any external > packages? You seem to be passing some extra CFLAGS / LDFLAGS to the > configure script. > > Variables like TARGET_CONFIGURE_OPTS are global, so you cannot change it > in a custom package without causing problems, like this: Indeed, I am using an external tree and one custom package did modify TARGET_CONFIGURE_OPTS. Somehow I did not realize that these variables are global. Thank you very much! Really appreciate the help. Best regards, Andrey. From bugzilla at busybox.net Mon Feb 7 22:16:59 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Mon, 07 Feb 2022 22:16:59 +0000 Subject: [Buildroot] [Bug 14556] python-crossbar fails to build In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14556 --- Comment #1 from Emile Cormier --- I can launch Crossbar with the changes I made in my personal fork: https://github.com/ecorm/buildroot/tree/issue-14556-crossbar I will submit a patch once I confirm Crossbar works with our (proprietary) app. -- You are receiving this mail because: You are on the CC list for the bug. From fperrad at gmail.com Mon Feb 7 12:24:23 2022 From: fperrad at gmail.com (Francois Perrad) Date: Mon, 7 Feb 2022 13:24:23 +0100 Subject: [Buildroot] [PATCH] package/zstd: bump to version 1.5.2 Message-ID: <20220207122423.1561946-1-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/zstd/zstd.hash | 4 ++-- package/zstd/zstd.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/zstd/zstd.hash b/package/zstd/zstd.hash index d7d8a448f..eca44b89f 100644 --- a/package/zstd/zstd.hash +++ b/package/zstd/zstd.hash @@ -1,5 +1,5 @@ -# From https://github.com/facebook/zstd/releases/download/v1.5.1/zstd-1.5.1.tar.gz.sha256 -sha256 e28b2f2ed5710ea0d3a1ecac3f6a947a016b972b9dd30242369010e5f53d7002 zstd-1.5.1.tar.gz +# From https://github.com/facebook/zstd/releases/download/v1.5.2/zstd-1.5.2.tar.gz.sha256 +sha256 7c42d56fac126929a6a85dbc73ff1db2411d04f104fae9bdea51305663a83fd0 zstd-1.5.2.tar.gz # License files (locally computed) sha256 2c1a7fa704df8f3a606f6fc010b8b5aaebf403f3aeec339a12048f1ba7331a0b LICENSE diff --git a/package/zstd/zstd.mk b/package/zstd/zstd.mk index 476190e9a..a4bbada82 100644 --- a/package/zstd/zstd.mk +++ b/package/zstd/zstd.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZSTD_VERSION = 1.5.1 +ZSTD_VERSION = 1.5.2 ZSTD_SITE = https://github.com/facebook/zstd/releases/download/v$(ZSTD_VERSION) ZSTD_INSTALL_STAGING = YES ZSTD_LICENSE = BSD-3-Clause or GPL-2.0 -- 2.32.0 From neal.frager at xilinx.com Tue Feb 8 07:15:58 2022 From: neal.frager at xilinx.com (Neal Frager) Date: Tue, 8 Feb 2022 00:15:58 -0700 Subject: [Buildroot] [PATCH 1/2] configs/zynqmp_zcu106: Bump ATF/U-Boot/Linux to Xilinx 2022 Message-ID: <20220208071559.2862411-1-neal.frager@xilinx.com> This patch: - bumps configs/zynqmp_zcu106_defconfig to Xilinx 2022 - bumps ATF to Xilinx v2.6: mainline v2.6 requires patch to build - bumps U-Boot to Xilinx 2022.01: important drivers not in mainline - bumps Linux to Xilinx 5.15: important drivers not in mainline - deletes board/zynqmp/patches directory: patches already in mainline - modifies board/zynqmp/genimage.cfg: U-Boot 2022.01 uses u-boot.itb format - adds extlinux.conf to vfat bootfs - modifies U-Boot to unified xilinx_zynqmp_virt_defconfig (supports all boards) - adds support for SPL pm_cfg_obj.c loading to PMU firmware Signed-off-by: Neal Frager --- board/zynqmp/extlinux.conf | 4 + board/zynqmp/genimage.cfg | 6 +- ...-fix-Remove-GGC-ignore-Warray-bounds.patch | 68 -- ...64-zynqmp-zcu106-fix-SPL-MMC-booting.patch | 52 -- ...2-arm64-zynqmp-Enable-booting-to-ATF.patch | 114 ---- ...ept-an-absolute-path-for-PMUFW_INIT_.patch | 68 -- ...ynqmp-pass-the-PS-init-file-as-a-kco.patch | 175 ----- board/zynqmp/pm_cfg_obj.c | 614 ++++++++++++++++++ board/zynqmp/post-image.sh | 1 + board/zynqmp/readme.txt | 23 +- configs/zynqmp_zcu106_defconfig | 21 +- 11 files changed, 651 insertions(+), 495 deletions(-) create mode 100644 board/zynqmp/extlinux.conf delete mode 100644 board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch delete mode 100644 board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch delete mode 100644 board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch delete mode 100644 board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch delete mode 100644 board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch create mode 100755 board/zynqmp/pm_cfg_obj.c diff --git a/board/zynqmp/extlinux.conf b/board/zynqmp/extlinux.conf new file mode 100644 index 0000000000..15ef707ea2 --- /dev/null +++ b/board/zynqmp/extlinux.conf @@ -0,0 +1,4 @@ +label linux + kernel /Image + devicetree /system.dtb + append console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg index ed202f4550..20d8352c08 100644 --- a/board/zynqmp/genimage.cfg +++ b/board/zynqmp/genimage.cfg @@ -2,11 +2,13 @@ image boot.vfat { vfat { files = { "boot.bin", - "u-boot.bin", - "atf-uboot.ub", + "u-boot.itb", "system.dtb", "Image" } + file extlinux/extlinux.conf { + image = extlinux.conf + } } size = 32M diff --git a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch b/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch deleted file mode 100644 index 0c1a9ba2a4..0000000000 --- a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch +++ /dev/null @@ -1,68 +0,0 @@ -From da003e6ada7d0217fe99dc7c649a731f8ebd3c34 Mon Sep 17 00:00:00 2001 -From: Deepika Bhavnani -Date: Thu, 15 Aug 2019 00:56:46 +0300 -Subject: [PATCH] Coverity fix: Remove GGC ignore -Warray-bounds - -GCC diagnostics were added to ignore array boundaries, instead -of ignoring GCC warning current code will check for array boundaries -and perform and array update only for valid elements. - -Resolves: `CID 246574` `CID 246710` `CID 246651` - -Signed-off-by: Deepika Bhavnani -Change-Id: I7530ecf7a1707351c6ee87e90cc3d33574088f57 - -Backported from: 41af05154abe136938bcfb5f26c969933784bbef -[Adapted to apply on 1.5] - ---- - lib/psci/psci_common.c | 20 ++++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) - -diff --git a/lib/psci/psci_common.c b/lib/psci/psci_common.c -index 2220a745cd6e..6282d992a2f0 100644 ---- a/lib/psci/psci_common.c -+++ b/lib/psci/psci_common.c -@@ -188,21 +188,17 @@ static unsigned int get_power_on_target_pwrlvl(void) - /****************************************************************************** - * Helper function to update the requested local power state array. This array - * does not store the requested state for the CPU power level. Hence an -- * assertion is added to prevent us from accessing the wrong index. -+ * assertion is added to prevent us from accessing the CPU power level. - *****************************************************************************/ - static void psci_set_req_local_pwr_state(unsigned int pwrlvl, - unsigned int cpu_idx, - plat_local_state_t req_pwr_state) - { -- /* -- * This should never happen, we have this here to avoid -- * "array subscript is above array bounds" errors in GCC. -- */ - assert(pwrlvl > PSCI_CPU_PWR_LVL); --#pragma GCC diagnostic push --#pragma GCC diagnostic ignored "-Warray-bounds" -- psci_req_local_pwr_states[pwrlvl - 1][cpu_idx] = req_pwr_state; --#pragma GCC diagnostic pop -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && -+ (cpu_idx < PLATFORM_CORE_COUNT)) { -+ psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx] = req_pwr_state; -+ } - } - - /****************************************************************************** -@@ -228,7 +224,11 @@ static plat_local_state_t *psci_get_req_local_pwr_states(unsigned int pwrlvl, - { - assert(pwrlvl > PSCI_CPU_PWR_LVL); - -- return &psci_req_local_pwr_states[pwrlvl - 1][cpu_idx]; -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && -+ (cpu_idx < PLATFORM_CORE_COUNT)) { -+ return &psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx]; -+ } else -+ return NULL; - } - - /* --- -2.34.0 - diff --git a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch b/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch deleted file mode 100644 index 4d85e1bb12..0000000000 --- a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch +++ /dev/null @@ -1,52 +0,0 @@ -From e5d72ed8339eb05285448aad3c89d21e4d18fd29 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Mon, 26 Feb 2018 09:40:34 +0100 -Subject: [PATCH] arm64: zynqmp: zcu106: fix SPL MMC booting - -The U-Boot SPL generated with the current zcu106 defconfig cannot boot -from MMC: - - [...] - U-Boot SPL 2018.01 (Feb 21 2018 - 17:47:14) - EL Level: EL3 - Trying to boot from MMC1 - sdhci_transfer_data: Error detected in status(0x408020)! - spl_load_image_fat_os: error reading image u-boot.bin, err - -2 - spl_load_image_fat: error reading image u-boot.img, err - -6 - SPL: failed to boot from all boot devices - ### ERROR ### Please RESET the board ### - -Fix by lowering the rpll value. The new value for the RPLL_CTRL -register comes from the current psu_init_gpl.c from the HDF file at -https://github.com/xilinx/hdf-examples/tree/01ad8ea5fd1989abf4ea5a072d019a16cb2bc546/zcu106-zynqmp -(generated by Vivado v2017.4). - -RPLL and sdio1_ref clocks before and after this change: - - - Old values: RPLL 1.36 GHz, sdio1_ref 272 MHz - - New values: RPLL 1.16 GHz, sdio1_ref 233 MHz - -Signed-off-by: Luca Ceresoli -Cc: Michal Simek -Upstream-status: accepted upstream in a different form ---- - - board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -index 4d18abe000ca..e6fa477e53e7 100644 ---- a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -+++ b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -@@ -10,7 +10,7 @@ - static unsigned long psu_pll_init_data(void) - { - psu_mask_write(0xFF5E0034, 0xFE7FEDEFU, 0x7E4E2C62U); -- psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00013C00U); -+ psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00014600U); - psu_mask_write(0xFF5E0030, 0x00000008U, 0x00000008U); - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000001U); - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000000U); --- -2.7.4 - diff --git a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch b/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch deleted file mode 100644 index 487fff6812..0000000000 --- a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 5e3cac50cc981e01d9072241035a8d4162560c71 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Mon, 12 Mar 2018 17:18:38 +0100 -Subject: [PATCH] arm64: zynqmp: Enable booting to ATF - -U-Boot is now able to boot to ARM Trusted Firmware (ATF). The boot -flow is SPL(EL3) loads ATF and full u-boot and jump to ATF(EL3) which -pass control to full u-boot(EL2). This has been tested on zcu106, so -enable it in this defconfig. - -To generate an image that triggers this booting flow, you need to pass -'-O arm-trusted-firmware' to mkimage. - -Signed-off-by: Luca Ceresoli -Signed-off-by: Michal Simek -Backported from upstream: http://git.denx.de/?p=u-boot.git;a=commit;h=5e3cac50cc981e01d9072241035a8d4162560c71 ---- - - configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 + - configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 + - configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 + - configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 + - configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 1 + - configs/xilinx_zynqmp_zcu102_revA_defconfig | 1 + - configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 + - 7 files changed, 7 insertions(+) - -diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig -index c5bfa2b12638..488c72258b0e 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig -index f86dce403a42..5d501eec0edd 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig -@@ -20,6 +20,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig -index 6e947cf56827..6f7eaebd7676 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig -@@ -16,6 +16,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_CMD_MEMTEST=y - CONFIG_SYS_ALT_MEMTEST=y -diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig -index 1c934858c61c..7a3806cba4b5 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig -@@ -17,6 +17,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_CMD_MEMTEST=y - CONFIG_SYS_ALT_MEMTEST=y -diff --git a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig -index e13c7c56f310..e4408f182ca0 100644 ---- a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig -+++ b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig b/configs/xilinx_zynqmp_zcu102_revA_defconfig -index 5b2cd495ee85..b52f6789fd4b 100644 ---- a/configs/xilinx_zynqmp_zcu102_revA_defconfig -+++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig -index e6530fbfe7ff..80592554f682 100644 ---- a/configs/xilinx_zynqmp_zcu102_revB_defconfig -+++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y --- -2.7.4 - diff --git a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch b/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch deleted file mode 100644 index 95ab7b3b75..0000000000 --- a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch +++ /dev/null @@ -1,68 +0,0 @@ -From c7df098a71e05dc81cee818747759e8060b59626 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Mon, 4 Jun 2018 12:21:01 +0200 -Subject: [PATCH] arm64: zynqmp: accept an absolute path for PMUFW_INIT_FILE - -The value of PMUFW_INIT_FILE is prefixed with "$(srctree)/", thus -forcing it to be a relative path inside the U-Boot source tree. Since -the PMUFW is a binary file generated outside of U-Boot, the PMUFW -binary must be copied inside the U-Boot source tree before the -build. - -This generates a few problems: - - * if the source tree is shared among different out-of-tree builds, - they will pollute (and potentially corrupt) each other - * the source tree cannot be read-only - * any buildsystem must add a command to copy the PMUFW binary - * putting an externally-generated binary in the source tree is ugly - as hell - -Avoid these problems by accepting an absolute path for -PMUFW_INIT_FILE. This would be as simple as removing the "$(srctree)/" -prefix, but in order to keep backward compatibility we rather use the -shell and readlink to get the absolute path even when starting from a -relative path. - -Since 'readlink -f' produces an empty string if the file does not -exist, we also add a check to ensure the file configured in -PMUFW_INIT_FILE exists. Otherwise the build would exit successfully, -but produce a boot.bin without PMUFW as if PMUFW_INIT_FILE were empty. - -Tested in the 12 possible combinations of: - - PMUFW_INIT_FILE empty, relative, absolute, non-existing - - building in-tree, in subdir, in other directory - -Signed-off-by: Luca Ceresoli -Cc: Michal Simek -Cc: Simon Glass -Cc: Emmanuel Vadot -Signed-off-by: Michal Simek -Backported from upstream: https://git.denx.de/?p=u-boot.git;a=commit;h=c7df098a71e05dc81cee818747759e8060b59626 ---- - scripts/Makefile.spl | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl -index ef018b5b4056..252f13826d4c 100644 ---- a/scripts/Makefile.spl -+++ b/scripts/Makefile.spl -@@ -167,8 +167,14 @@ ifdef CONFIG_ARCH_ZYNQ - MKIMAGEFLAGS_boot.bin = -T zynqimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) - endif - ifdef CONFIG_ARCH_ZYNQMP -+ifneq ($(CONFIG_PMUFW_INIT_FILE),"") -+spl/boot.bin: zynqmp-check-pmufw -+zynqmp-check-pmufw: FORCE -+ ( cd $(srctree) && test -r $(CONFIG_PMUFW_INIT_FILE) ) \ -+ || ( echo "Cannot read $(CONFIG_PMUFW_INIT_FILE)" && false ) -+endif - MKIMAGEFLAGS_boot.bin = -T zynqmpimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) \ -- -n $(srctree)/$(CONFIG_PMUFW_INIT_FILE) -+ -n "$(shell cd $(srctree); readlink -f $(CONFIG_PMUFW_INIT_FILE))" - endif - - spl/boot.bin: $(obj)/u-boot-spl.bin FORCE --- -2.7.4 - diff --git a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch b/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch deleted file mode 100644 index b32e162780..0000000000 --- a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch +++ /dev/null @@ -1,175 +0,0 @@ -From 4c9d54ab5a41d65000c8d249b6fb1b76056f1812 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Wed, 20 Jun 2018 12:11:50 +0200 -Subject: [PATCH] arm/arm64: zynq/zynqmp: pass the PS init file as a kconfig - variable - -U-Boot needs to link ps7_init_gpl.c on Zynq or psu_init_gpl.c on -ZynqMP (PS init for short). The current logic to locate this file for -both platforms is: - - 1. if a board-specific file exists in - board/xilinx/zynq[mp]/$(CONFIG_DEFAULT_DEVICE_TREE)/ps?_init_gpl.c - then use it - 2. otherwise use board/xilinx/zynq/ps?_init_gpl.c - -In the latter case the file does not exist in the U-Boot sources and -must be copied in the source tree from the outside before starting the -build. This is typical when it is generated from Xilinx tools while -developing a custom hardware. However making sure that a -board-specific file is _not_ found (and used) requires some trickery -such as removing or overwriting all PS init files (e.g.: the current -meta-xilinx yocto layer [0]). - -This generates a few problems: - - * if the source tree is shared among different out-of-tree builds, - they will pollute (and potentially corrupt) each other - * the source tree cannot be read-only - * any buildsystem must add a command to copy the PS init file binary - * overwriting or deleting files in the source tree is ugly as hell - -Simplify usage by allowing to pass the path to the desired PS init -file in kconfig variable XILINX_PS_INIT_FILE. It can be an absolute -path or relative to $(srctree). If the variable is set, the -user-specified file will always be used without being copied -around. If the the variable is left empty, for backward compatibility -fall back to the old behaviour. - -Since the issue is the same for Zynq and ZynqMP, add one kconfig -variable in a common place and use it for both. - -Also use the new kconfig help text to document all the ways to give -U-Boot the PS init file. - -Build-tested with all combinations of: - - platform: zynq or zynqmp - - PS init file: from XILINX_PS_INIT_FILE (absolute, relative path, - non-existing), in-tree board-specific, in board/xilinx/zynq[mp]/ - - building in-tree, in subdir, in other directory - -[0] https://github.com/Xilinx/meta-xilinx/blob/b2f74cc7fe5c4881589d5e440a17cb51fc66a7ab/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init.inc#L9 - -Signed-off-by: Luca Ceresoli -Cc: Albert Aribaud -Cc: Michal Simek -Cc: Nathan Rossi -Backported from upstream: https://git.denx.de/?p=u-boot.git;a=commit;h=6da4f67ad09cd8b311d77b2b04e557b7ef65b56c ---- - arch/arm/Kconfig | 1 + - board/xilinx/Kconfig | 41 +++++++++++++++++++++++++++++++++++++++++ - board/xilinx/zynq/Makefile | 10 +++++++++- - board/xilinx/zynqmp/Makefile | 10 +++++++++- - 4 files changed, 60 insertions(+), 2 deletions(-) - create mode 100644 board/xilinx/Kconfig - -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 22234cde2ab6..e04979d0ef7e 100644 ---- a/arch/arm/Kconfig -+++ b/arch/arm/Kconfig -@@ -1293,4 +1293,5 @@ source "board/technologic/ts4600/Kconfig" - source "board/vscom/baltos/Kconfig" - source "board/woodburn/Kconfig" - source "board/work-microwave/work_92105/Kconfig" -+source "board/xilinx/Kconfig" - source "board/zipitz2/Kconfig" - - source "arch/arm/Kconfig.debug" -diff --git a/board/xilinx/Kconfig b/board/xilinx/Kconfig -new file mode 100644 -index 000000000000..aa3fa061edef ---- /dev/null -+++ b/board/xilinx/Kconfig -@@ -0,0 +1,41 @@ -+# Copyright (c) 2018, Luca Ceresoli -+# -+# SPDX-License-Identifier: GPL-2.0 -+ -+if ARCH_ZYNQ || ARCH_ZYNQMP -+ -+config XILINX_PS_INIT_FILE -+ string "Zynq/ZynqMP PS init file(s) location" -+ help -+ On Zynq and ZynqMP U-Boot SPL (or U-Boot proper if -+ ZYNQMP_PSU_INIT_ENABLED is set) is responsible for some -+ basic initializations, such as enabling peripherals and -+ configuring pinmuxes. The PS init file (called -+ psu_init_gpl.c on ZynqMP, ps7_init_gpl.c for Zynq-7000) -+ contains the code for such initializations. -+ -+ U-Boot contains PS init files for some boards, but each of -+ them describes only one specific configuration. Users of a -+ different board, or needing a different configuration, can -+ generate custom files using the Xilinx development tools. -+ -+ There are three ways to give a PS init file to U-Boot: -+ -+ 1. Set this variable to the path, either relative to the -+ source tree or absolute, where the psu_init_gpl.c or -+ ps7_init_gpl.c file is located. U-Boot will build this -+ file. -+ -+ 2. If you leave an empty string here, U-Boot will use -+ board/xilinx/zynq/$(CONFIG_DEFAULT_DEVICE_TREE)/ps7_init_gpl.c -+ for Zynq-7000, or -+ board/xilinx/zynqmp/$(CONFIG_DEFAULT_DEVICE_TREE)/psu_init_gpl.c -+ for ZynqMP. -+ -+ 3. If the above file does not exist, U-Boot will use -+ board/xilinx/zynq/ps7_init_gpl.c for Zynq-7000, or -+ board/xilinx/zynqmp/psu_init_gpl.c for ZynqMP. This file -+ is not provided by U-Boot, you have to copy it there -+ before the build. -+ -+endif -diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile -index 5a76a26720cd..03ad5f0532ee 100644 ---- a/board/xilinx/zynq/Makefile -+++ b/board/xilinx/zynq/Makefile -@@ -5,10 +5,18 @@ - - obj-y := board.o - --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE)) -+init-objs := ps_init_gpl.o -+spl/board/xilinx/zynq/ps_init_gpl.o board/xilinx/zynq/ps_init_gpl.o: $(PS_INIT_FILE) -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ -+endif - -+ifeq ($(init-objs),) -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/ps7_init_gpl.c),\ - $(hw-platform-y)/ps7_init_gpl.o) -+endif - - ifeq ($(init-objs),) - ifneq ($(wildcard $(srctree)/$(src)/ps7_init_gpl.c),) -diff --git a/board/xilinx/zynqmp/Makefile b/board/xilinx/zynqmp/Makefile -index 05ccd25dcef3..960b81fc5853 100644 ---- a/board/xilinx/zynqmp/Makefile -+++ b/board/xilinx/zynqmp/Makefile -@@ -5,10 +5,18 @@ - - obj-y := zynqmp.o - --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE)) -+init-objs := ps_init_gpl.o -+spl/board/xilinx/zynqmp/ps_init_gpl.o board/xilinx/zynqmp/ps_init_gpl.o: $(PS_INIT_FILE) -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ -+endif - -+ifeq ($(init-objs),) -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/psu_init_gpl.c),\ - $(hw-platform-y)/psu_init_gpl.o) -+endif - - ifeq ($(init-objs),) - ifneq ($(wildcard $(srctree)/$(src)/psu_init_gpl.c),) --- -2.7.4 - diff --git a/board/zynqmp/pm_cfg_obj.c b/board/zynqmp/pm_cfg_obj.c new file mode 100755 index 0000000000..7566b3236a --- /dev/null +++ b/board/zynqmp/pm_cfg_obj.c @@ -0,0 +1,614 @@ +/****************************************************************************** +* Copyright (c) 2017 - 2020 Xilinx, Inc. All rights reserved. +* SPDX-License-Identifier: MIT +******************************************************************************/ + + +#include "xil_types.h" +#include "pm_defs.h" + +#define PM_CONFIG_MASTER_SECTION_ID 0x101U +#define PM_CONFIG_SLAVE_SECTION_ID 0x102U +#define PM_CONFIG_PREALLOC_SECTION_ID 0x103U +#define PM_CONFIG_POWER_SECTION_ID 0x104U +#define PM_CONFIG_RESET_SECTION_ID 0x105U +#define PM_CONFIG_SHUTDOWN_SECTION_ID 0x106U +#define PM_CONFIG_SET_CONFIG_SECTION_ID 0x107U +#define PM_CONFIG_GPO_SECTION_ID 0x108U + +#define PM_SLAVE_FLAG_IS_SHAREABLE 0x1U +#define PM_MASTER_USING_SLAVE_MASK 0x2U + +#define PM_CONFIG_GPO1_MIO_PIN_34_MAP (1U << 10U) +#define PM_CONFIG_GPO1_MIO_PIN_35_MAP (1U << 11U) +#define PM_CONFIG_GPO1_MIO_PIN_36_MAP (1U << 12U) +#define PM_CONFIG_GPO1_MIO_PIN_37_MAP (1U << 13U) + +#define PM_CONFIG_GPO1_BIT_2_MASK (1U << 2U) +#define PM_CONFIG_GPO1_BIT_3_MASK (1U << 3U) +#define PM_CONFIG_GPO1_BIT_4_MASK (1U << 4U) +#define PM_CONFIG_GPO1_BIT_5_MASK (1U << 5U) + +#define SUSPEND_TIMEOUT 0xFFFFFFFFU + + +#define PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK 0x00000001 +#define PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK 0x00000100 +#define PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK 0x00000200 + + + +#if defined (__ICCARM__) +#pragma language=save +#pragma language=extended +#endif +#if defined (__GNUC__) + const u32 XPm_ConfigObject[] __attribute__((used, section(".sys_cfg_data"))) = +#elif defined (__ICCARM__) +#pragma location = ".sys_cfg_data" +__root const u32 XPm_ConfigObject[] = +#endif +{ + /**********************************************************************/ + /* HEADER */ + 1, /* Number of remaining words in the header */ + 8, /* Number of sections included in config object */ + /**********************************************************************/ + /* MASTER SECTION */ + PM_CONFIG_MASTER_SECTION_ID, /* Master SectionID */ + 3U, /* No. of Masters*/ + + NODE_APU, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_0, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_1, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Wake permissions */ + + + /**********************************************************************/ + /* SLAVE SECTION */ + + + PM_CONFIG_SLAVE_SECTION_ID, /* Section ID */ + 49, /* Number of slaves */ + + NODE_OCM_BANK_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TCM_0_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_0_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_1_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TCM_1_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_L2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU_PP_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU_PP_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_USB_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_USB_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_TTC_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SATA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_ETH_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_UART_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_UART_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SPI_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_SPI_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_I2C_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_I2C_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SD_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_SD_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_DP, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GDMA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_ADMA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_NAND, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_QSPI, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPIO, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_CAN_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_CAN_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_EXTERN, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_DDR, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_IPI_APU, + 0U, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_0, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_1, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_PCIE, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_PCAP, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_RTC, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_VCU, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_PL, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + + /**********************************************************************/ + /* PREALLOC SECTION */ + + PM_CONFIG_PREALLOC_SECTION_ID, /* Preallaoc SectionID */ + 3U, /* No. of Masters*/ + +/* Prealloc for psu_cortexa53_0 */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, + 12, + NODE_DDR, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_L2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_3, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_SD_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_QSPI, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_PL, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_APU, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_0 */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + 14, + NODE_TCM_0_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_0_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_DDR, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_3, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_SD_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_QSPI, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_PL, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_ADMA, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_1 */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + 3, + NODE_TCM_1_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_1_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /**********************************************************************/ + /* POWER SECTION */ + + PM_CONFIG_POWER_SECTION_ID, /* Power Section ID */ + 4U, /* Number of power nodes */ + + NODE_APU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_RPU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_FPD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_PLD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + + /**********************************************************************/ + /* RESET SECTION */ + + PM_CONFIG_RESET_SECTION_ID, /* Reset Section ID */ + 120U, /* Number of resets */ + + XILPM_RESET_PCIE_CFG, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_BRIDGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_CTRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRF, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GDMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SATA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APU_L2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DDR, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SOFT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_QSPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_NAND, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ADMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOU_CC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TIMESTAMP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R50, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R51, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_AMBA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_OCM, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_PGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RTC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SYSMON, 0, + XILPM_RESET_AFI_FM6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_LPD_SWDT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_FPD, PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + XILPM_RESET_RPU_DBG1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_DBG0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_VPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_7, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_8, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_9, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_10, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_11, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_12, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_13, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_14, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_15, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_16, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_17, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_18, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_19, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_20, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_21, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_22, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_23, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_24, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_25, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_26, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_27, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_28, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_29, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_30, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_31, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_LS, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PS_ONLY, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_92, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_93, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_94, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_95, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + + /**********************************************************************/ + /* SET CONFIG SECTION */ + PM_CONFIG_SET_CONFIG_SECTION_ID, /* Section ID */ + 0, /* Permissions to set config */ + /**********************************************************************/ + /* SHUTDOWN SECTION */ + PM_CONFIG_SHUTDOWN_SECTION_ID, /* Section ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* System Shutdown/Restart Permission */ + + /**********************************************************************/ + /* GPO SECTION */ + PM_CONFIG_GPO_SECTION_ID, /* GPO Section ID */ + PM_CONFIG_GPO1_BIT_2_MASK | + PM_CONFIG_GPO1_MIO_PIN_34_MAP | + PM_CONFIG_GPO1_MIO_PIN_35_MAP | + PM_CONFIG_GPO1_MIO_PIN_36_MAP | + PM_CONFIG_GPO1_MIO_PIN_37_MAP | + 0, /* State of GPO pins */ +}; +#if defined (__ICCARM__) +#pragma language=restore +#endif diff --git a/board/zynqmp/post-image.sh b/board/zynqmp/post-image.sh index b2b99fed01..a9f29b3175 100755 --- a/board/zynqmp/post-image.sh +++ b/board/zynqmp/post-image.sh @@ -10,4 +10,5 @@ FIRST_DT=$(sed -nr \ [ -z "${FIRST_DT}" ] || ln -fs ${FIRST_DT}.dtb ${BINARIES_DIR}/system.dtb +cp board/zynqmp/extlinux.conf output/images/extlinux.conf support/scripts/genimage.sh -c board/zynqmp/genimage.cfg diff --git a/board/zynqmp/readme.txt b/board/zynqmp/readme.txt index da37f4ccc9..0dc1793e03 100644 --- a/board/zynqmp/readme.txt +++ b/board/zynqmp/readme.txt @@ -1,10 +1,19 @@ -******************************** -Xilinx ZCU106 board - ZynqMP SoC -******************************** +****************************************** +Xilinx ZCU102 / ZCU106 boards - ZynqMP SoC +****************************************** + +This document describes the Buildroot support for the ZCU102 and ZCU106 +boards by Xilinx, based on the Zynq UltraScale+ MPSoC (aka ZynqMP). +It has been tested with the ZCU102 and ZCU106 production boards. + +Evaluation board features can be found here with the links below. + +ZCU102: +https://www.xilinx.com/products/boards-and-kits/zcu102.html + +ZCU106: +https://www.xilinx.com/products/boards-and-kits/zcu106.html -This document describes the Buildroot support for the ZCU106 board by -Xilinx, based on the Zynq UltraScale+ MPSoC (aka ZynqMP). It has been -tested with the EK-U1-ZCU106-ES2 pre-production board. How to build it =============== @@ -32,7 +41,7 @@ After building, you should get a tree like this: +-- rootfs.ext4 -> rootfs.ext2 +-- sdcard.img +-- system.dtb -> zynqmp-zcu106-revA.dtb - +-- u-boot.bin + +-- u-boot.itb `-- zynqmp-zcu106-revA.dtb How to write the SD card diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index bee7c1daf7..1b951b3313 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -1,34 +1,37 @@ BR2_aarch64=y -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.15" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.6" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA" +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2022.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/53fdb7b6c92860ceb0ec5fd14deee302f4a84269/bin/pmufw-zcu106-default-v2017.4.bin" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/v2021.2/bin/pmufw-v2021.2.bin" +BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/pm_cfg_obj.c" +BR2_TARGET_UBOOT_FORMAT_ITB=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -- 2.17.1 From neal.frager at xilinx.com Tue Feb 8 07:15:59 2022 From: neal.frager at xilinx.com (Neal Frager) Date: Tue, 8 Feb 2022 00:15:59 -0700 Subject: [Buildroot] [PATCH 2/2] Add configs/zynqmp_zcu102_defconfig In-Reply-To: <20220208071559.2862411-1-neal.frager@xilinx.com> References: <20220208071559.2862411-1-neal.frager@xilinx.com> Message-ID: <20220208071559.2862411-2-neal.frager@xilinx.com> This patch: - adds support for Xilinx ZCU102 evaluation board - ZCU102 features can be found here: - https://www.xilinx.com/products/boards-and-kits/zcu102.html Signed-off-by: Neal Frager --- configs/zynqmp_zcu102_defconfig | 37 +++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 configs/zynqmp_zcu102_defconfig diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig new file mode 100644 index 0000000000..65a32d11d0 --- /dev/null +++ b/configs/zynqmp_zcu102_defconfig @@ -0,0 +1,37 @@ +BR2_aarch64=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.15" +BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.6" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/Xilinx/u-boot-xlnx.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2022.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" +BR2_TARGET_UBOOT_ZYNQMP=y +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/v2021.2/bin/pmufw-v2021.2.bin" +BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/pm_cfg_obj.c" +BR2_TARGET_UBOOT_FORMAT_ITB=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y -- 2.17.1 From thomas.petazzoni at bootlin.com Tue Feb 8 07:25:58 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 08 Feb 2022 07:25:58 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-02-07 Message-ID: <20220208072603.4DB1C60888@smtp3.osuosl.org> Hello, Autobuild statistics for 2022-02-07 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 45 | 7 | 0 | 52 | 2021.11.x | 20 | 1 | 0 | 21 | master | 35 | 49 | 2 | 86 | Classification of failures by reason for master ----------------------------------------------- host-libselinux-3.3 | 13 bluez5_utils-5.63 | 11 host-python-docutils-0.15.2 | 5 gerbera-1.9.2 | 4 ace-7.0.1 | 2 bird-2.0.8 | 2 libuwsc | 2 belle-sip-4.4.8 | 1 host-grpc-1.43.0 | 1 libuhttpd-3.14.1 | 1 mpd-0.23.5 | 1 openocd-0.11.0 | 1 pcsc-lite-1.9.5 | 1 perl-5.34.0 | 1 poppler-21.12.0 | 1 postgresql-14.1 | 1 qt5base-53a047c212af7fbded6... | 1 rtorrent-0.9.8 | 1 unknown | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips | ace-7.0.1 | NOK | http://autobuild.buildroot.net/results/a10dae2e6e5f07590bcc1526216a4d41ae420fc7 | mips64el | ace-7.0.1 | NOK | http://autobuild.buildroot.net/results/13376405e313da112f546076a10859e60631d5d5 | xtensa | belle-sip-4.4.8 | NOK | http://autobuild.buildroot.net/results/67ffdea04cd847685c097551c6bb397ddac1b2d7 | mips64el | bird-2.0.8 | NOK | http://autobuild.buildroot.net/results/c633ec702afb8c4f63ab1807250e469904ece9b3 | nds32le | bird-2.0.8 | NOK | http://autobuild.buildroot.net/results/220501962e48cd7ddb5d5e849c41e5700e085177 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/fef25236f2fb1de7d2bab8c72cecfdbd760bf5e2 | sparc64 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/8d6ee2e834e5925bccce9e4cf302a8d7f161ba65 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/b2978749181775f71045e57746484e315834e2cc | or1k | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/ea576f4bab0f321a412645afbb70457a5d7595c1 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/8221e8684b6f4e7de254bc944df4e9194f53a138 | arc | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/4d2d72b006d42fb3ed5fd9dfce1631056cc11a3a | m68k | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/ccfeabf9509d070d7641f824bdeadd9bd1cfa995 | nios2 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/bf1ee71708644842b9b59b03f419b087358b8f22 | powerpc | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/98cf0818c6b5a8d2d347437a979ab08441803b4d | xtensa | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/d40e351c1f02bf6530aa9ffac170b6042e93f501 | powerpc64 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/ccb141f8ff040ebd2515cc3d3137ed6db9a35bc1 | powerpc64le | gerbera-1.9.2 | NOK | http://autobuild.buildroot.net/results/4a2fc2094ccb52cbaf4977140c78c3cc75b5d068 | xtensa | gerbera-1.9.2 | NOK | http://autobuild.buildroot.net/results/d9fae4b220b87be1c778e1228d7ed4adbbc1c278 | s390x | gerbera-1.9.2 | NOK | http://autobuild.buildroot.net/results/ac9eb751c853031a7c4eec525aa5f4a882320bd1 | riscv64 | gerbera-1.9.2 | NOK | http://autobuild.buildroot.net/results/2bfff4fd24fe07051cc07622eb6daa8312164f66 | aarch64 | host-grpc-1.43.0 | NOK | http://autobuild.buildroot.net/results/96de2e7560d8d985a4079e53f0a2c88545be745d | microblazeel | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/c53c52d3d233dda1766a04c0ff3a4081da947b09 | sh4 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/119efa9e934d1661b577e19d3dae3b28a494db3a | x86_64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/1e82a8b02a1ce56169cd8d6f48d2c7e161950752 | powerpc64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/73ff5f4b71caf6ee05d36a4e3b22ec3796393230 | powerpc | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/662524038ce5ae447821afd7e6ca41552036da86 | xtensa | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/6384c41865b35557f4559277bfb9b2b60654ab94 | s390x | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/7bb924e1c14989d57ab65cf9d4035ba89cd37cb0 | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/a7bdf69b603af0778264b9fce909569ef6a0a1de | riscv64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/c63b3a1aa07f000518239dcb86755f3482e2eaf6 | microblazeel | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/bae6af7f80c183ab282891e17c11ec6f834174b4 | mips64el | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/95d1afed62cddd4d911436bfa1dde52e3164edc3 | i586 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/5f7346d120ca9601c0cd521a8f7115898a218924 | xtensa | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/c94fcb109cce9ca0bed9d5e0cc077253f9bb39a5 | powerpc64le | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/b82682d3f0be0cdd9802a373faab651876f28ac3 | arm | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/bfec58eb8215d08c6fb2a681398ab6c0c121cc75 | powerpc | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/9c65891a4041db1c57cf8966cc62e5fbfa5d81e5 | mips | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/40b1274b1019eae80e1a6cffae4b46b3c9a0f814 | arm | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/61b863777ca9a417e7b9b0d20065d69e81f368e7 | arm | libuhttpd-3.14.1 | NOK | http://autobuild.buildroot.net/results/a3a970a6398dcb0e4e03f4277f1a50c6b5eff7bd | aarch64 | libuwsc | TIM | http://autobuild.buildroot.net/results/14f2e3517d432ecfba7c0c30b0b2d039007a611e | microblazeel | libuwsc | TIM | http://autobuild.buildroot.net/results/30cad6e8afb864fdf4e19f58ef83f22b5a77d15c | xtensa | mpd-0.23.5 | NOK | http://autobuild.buildroot.net/results/032aaff121fb114f388c67dbca3ad2b02f670e38 | sparc | openocd-0.11.0 | NOK | http://autobuild.buildroot.net/results/4a27a769bb3cdf78643c3049b87d792178d6512c | ORPH sparc | pcsc-lite-1.9.5 | NOK | http://autobuild.buildroot.net/results/b59b30cbe0e27399db5c7586f369104e68a1589a | ORPH powerpc | perl-5.34.0 | NOK | http://autobuild.buildroot.net/results/0e0291ed7c9db636c1e6b72e5e8f7d7f04bf1563 | xtensa | poppler-21.12.0 | NOK | http://autobuild.buildroot.net/results/0f2a841b03462dd34ccf4be489b76a2a12550e54 | arm | postgresql-14.1 | NOK | http://autobuild.buildroot.net/results/e4b59fecd2a5bcda8103ddf4eae3dbd78fe3b896 | riscv32 | qt5base-53a047c212af7fbded6... | NOK | http://autobuild.buildroot.net/results/3b1b1b2f97d5645cacbd1e021b18006bb765362f | sh4 | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/5d614713e047e57558ef785d6c3b497006deb5c5 | ORPH arm | unknown | NOK | http://autobuild.buildroot.net/results/b51b1c608b050cd2982abe58a3eff68c4756be0b | Classification of failures by reason for 2021.02.x -------------------------------------------------- python-pybind-2.6.1 | 2 zeromq-4.3.4 | 2 gvfs-1.44.1 | 1 host-sentry-cli-1.57.0 | 1 rocksdb-6.13.3 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- aarch64 | gvfs-1.44.1 | NOK | http://autobuild.buildroot.net/results/b4dfbb94f8cbfe40b3a566b90d87cc132a309099 | ORPH arm | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/abec1ecbfa3a7c56c1dddf03c641b66463124840 | aarch64_be | python-pybind-2.6.1 | NOK | http://autobuild.buildroot.net/results/0c77ee2af362301fc17eb641931436c4cb87f71c | riscv64 | python-pybind-2.6.1 | NOK | http://autobuild.buildroot.net/results/67ec201c11d4dfa2d491c0d8f23a5cab9d840956 | m68k | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/e74b26aea0be9f3bd6be31d3d923da30ac408f39 | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/fd9d319726f6ac85892f04ffc480bbcce00b3f9a | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/8d51430b95f864e53e5223b72b9761331f9b3f95 | Classification of failures by reason for 2021.11.x -------------------------------------------------- zeromq-4.3.4 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/47c0738e024ff2c2c4c65a0ea034c97454343b2f | Gitlab CI results for 2022-02-07 ================================ Detail of runtime-test failures for master ------------------------------------------ runtime-test | link to the job | orph? --------------------------+---------------------------------------------------------------+------ TestIPythonPy3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2060952123 | ORPH TestIso9660Grub2Hybrid | https://gitlab.com/buildroot.org/buildroot/-/jobs/2060952067 | ORPH TestLuaHttp | https://gitlab.com/buildroot.org/buildroot/-/jobs/2060952145 | ORPH TestLuaLuasyslog | https://gitlab.com/buildroot.org/buildroot/-/jobs/2060952178 | ORPH TestLxc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2060952181 | ORPH TestOci | https://gitlab.com/buildroot.org/buildroot/-/jobs/2060952078 | ORPH TestPerllibwwwperl | https://gitlab.com/buildroot.org/buildroot/-/jobs/2060952198 | ORPH TestPythonPy2Pynacl | https://gitlab.com/buildroot.org/buildroot/-/jobs/2060952264 | ORPH TestPythonPy2Pyyaml | https://gitlab.com/buildroot.org/buildroot/-/jobs/2060952270 | ORPH TestPythonPy3Automat | https://gitlab.com/buildroot.org/buildroot/-/jobs/2060952222 | ORPH TestPythonPy3Crossbar | https://gitlab.com/buildroot.org/buildroot/-/jobs/2060952238 | ORPH TestPythonPy3Pyyaml | https://gitlab.com/buildroot.org/buildroot/-/jobs/2060952271 | ORPH TestPythonPy3Treq | https://gitlab.com/buildroot.org/buildroot/-/jobs/2060952277 | ORPH TestPythonPy3Twisted | https://gitlab.com/buildroot.org/buildroot/-/jobs/2060952278 | ORPH TestPythonPy3Txtorcon | https://gitlab.com/buildroot.org/buildroot/-/jobs/2060952280 | ORPH TestRust | https://gitlab.com/buildroot.org/buildroot/-/jobs/2060952289 | ORPH TestRustBin | https://gitlab.com/buildroot.org/buildroot/-/jobs/2060952290 | ORPH -- http://autobuild.buildroot.net From davis.roman84 at gmail.com Tue Feb 8 07:54:16 2022 From: davis.roman84 at gmail.com (Davis Roman) Date: Tue, 8 Feb 2022 02:54:16 -0500 Subject: [Buildroot] how to install host package's .pc file into host/lib/pkgconfig Message-ID: Hello, I'm trying to build a host package and I would like for its corresponding .pc file to be copied into host/lib/pkgconfig Currently the manual says I should set LIBFOO_INSTALL_STAGING = YES for target packages but what should I use for host packages? Thank you, Davis -------------- next part -------------- An HTML attachment was scrubbed... URL: From paguilar at paguilar.org Tue Feb 8 09:19:13 2022 From: paguilar at paguilar.org (Pedro Aguilar) Date: Tue, 8 Feb 2022 10:19:13 +0100 (CET) Subject: [Buildroot] [PATCH v1 1/1] package/guile: Guile 3.0.7 requires libiconv. In-Reply-To: <20220206103040.1704ef40@windsurf> References: <20220206084334.1900252-1-paguilar@paguilar.org> <20220206103040.1704ef40@windsurf> Message-ID: <784201902.75253.1644311953307@email.ionos.it> Hi Thomas, I added libiconv based on the error I got while building. The attchmnt has the output error and the config file I used. However, I was not aware of BR2_ENABLE_LOCALE, so I selected it and removed libiconv and it also built correctly. The other config file shows this configuration. May be a correct solution could be to add the dependency on BR2_ENABLE_LOCALE. But if it's not present, enable libiconv. Thanks. Regards, > On 06/02/2022 10:30 Thomas Petazzoni wrote: > > > On Sun, 6 Feb 2022 09:43:34 +0100 > Pedro Aguilar wrote: > > > This fixes the error reported in the daily results. > > > > Signed-off-by: Pedro Aguilar > > libiconv is normally needed only on toolchains that don't have > BR2_ENABLE_LOCALE. But the build failure of guile happens with glibc > toolchains, so it doesn't make much sense. > > Are you sure that your analysis of the problem is correct? Could you > provide some more details? > > Thanks a lot! > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com Pedro Aguilar https://paguilar.org -------------- next part -------------- Making all in libguile SNARF filesys.x SNARF fports.x SNARF generalized-vectors.x SNARF goops.x SNARF gsubr.x SNARF guardians.x SNARF hash.x SNARF hashtab.x SNARF hooks.x filesys.c:28: warning: "_LARGEFILE64_SOURCE" redefined 28 | #define _LARGEFILE64_SOURCE /* ask for stat64 etc */ | : note: this is the location of the previous definition fports.c:22: warning: "_LARGEFILE64_SOURCE" redefined 22 | #define _LARGEFILE64_SOURCE /* ask for stat64 etc */ | : note: this is the location of the previous definition In file included from goops.c:46: ports-internal.h:26:10: fatal error: iconv.h: No such file or directory 26 | #include | ^~~~~~~~~ compilation terminated. SNARF i18n.x make[4]: *** [Makefile:4541: goops.x] Error 1 make[4]: *** Waiting for unfinished jobs.... In file included from fports.c:63: ports-internal.h:26:10: fatal error: iconv.h: No such file or directory 26 | #include | ^~~~~~~~~ compilation terminated. In file included from filesys.c:95: ports-internal.h:26:10: fatal error: iconv.h: No such file or directory 26 | #include | ^~~~~~~~~ compilation terminated. make[4]: *** [Makefile:4541: fports.x] Error 1 make[4]: *** [Makefile:4541: filesys.x] Error 1 make[3]: *** [Makefile:2044: all-recursive] Error 1 make[2]: *** [Makefile:1930: all] Error 2 make[1]: *** [package/pkg-generic.mk:292: /home/projects/br/build_qemu_x86/build/guile-3.0.7/.stamp_built] Error 2 make: *** [Makefile:23: _all] Error 2 -------------- next part -------------- A non-text attachment was scrubbed... Name: guile_enable_locale.config Type: application/octet-stream Size: 113072 bytes Desc: not available URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: guile_enable_libiconv.config Type: application/octet-stream Size: 113355 bytes Desc: not available URL: From nealf at xilinx.com Tue Feb 8 10:07:43 2022 From: nealf at xilinx.com (Neal Frager) Date: Tue, 8 Feb 2022 10:07:43 +0000 Subject: [Buildroot] [PATCH 1/2] configs/zynqmp_zcu106: Bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <20220208071559.2862411-1-neal.frager@xilinx.com> References: <20220208071559.2862411-1-neal.frager@xilinx.com> Message-ID: Hi everyone, Please disregard this patch set for now. I thought of a better way to handle the pm_cfg_obj.c file without adding it permanently to buildroot. I will be sending an updated patch set shortly using the following configuration: BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="https://raw.githubusercontent.com/Xilinx/embeddedsw/xlnx_rel_v2021.2/lib/sw_apps/zynqmp_fsbl/misc/pm_cfg_obj.c" Everything else will remain the same. Best regards, Neal Frager Xilinx From giulio.benetti at benettiengineering.com Tue Feb 8 10:18:02 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 8 Feb 2022 11:18:02 +0100 Subject: [Buildroot] [PATCH 1/2] configs/zynqmp_zcu106: Bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: References: <20220208071559.2862411-1-neal.frager@xilinx.com> Message-ID: <69efa9da-ae55-6795-8724-ed7105083924@benettiengineering.com> Hi Neal, On 08/02/22 11:07, Neal Frager wrote: > Hi everyone, > > Please disregard this patch set for now. I thought of a better way to handle the pm_cfg_obj.c file without adding it permanently to buildroot. I will be sending an updated patch set shortly using the following configuration: > > BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="https://raw.githubusercontent.com/Xilinx/embeddedsw/xlnx_rel_v2021.2/lib/sw_apps/zynqmp_fsbl/misc/pm_cfg_obj.c" Ok, I was about building your patches :-) Please send as v2, so when creating patches add -v2: # git format-patch -s -M -o outgoing -2 -v2 then add 3 dashes before the actual 3 dashes in the produced patches and described what is changed between V1 version to V2 like: --- V1->V2: * moved BR2_TARGET_UBOOT_ZYNQMP_PM_CFG to an URL instead of local patch as suggested by Giulio * other eventual modifies --- And if you send then a v3, then keep previous V1->V2 and add: --- V1->V2: * moved BR2_TARGET_UBOOT_ZYNQMP_PM_CFG to an URL instead of local patch as suggested by Giulio V2->V3: * modified .... --- Best regards -- Giulio Benetti Benetti Engineering sas From nealf at xilinx.com Tue Feb 8 10:19:47 2022 From: nealf at xilinx.com (Neal Frager) Date: Tue, 8 Feb 2022 10:19:47 +0000 Subject: [Buildroot] [PATCH 1/2] configs/zynqmp_zcu106: Bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: References: <20220208071559.2862411-1-neal.frager@xilinx.com> Message-ID: Hi Luca, Perhaps you can help with this step. It seems that the BR2_TARGET_UBOOT_ZYNQMP_PM_CFG configuration requires the pm_cfg_obj.c file to already be downloaded to the local machine. One solution which I have already implemented is to add the pm_cfg_obj.c file to the board/zynqmp directory. But I would imagine a better solution would be to download it off of the Xilinx github, so that users can always get the correct version should they want to use versions of software which are not pre-defined in the defconfig. Could you help us with adding support to the BR2_TARGET_UBOOT_ZYNQMP_PM_CFG configuration to enable the ability to download the pm_cfg_obj.c file to the dl directory like we do for the pmufw.bin file? BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="https://github.com/Xilinx/embeddedsw/blob/xlnx_rel_v2021.2/lib/sw_apps/zynqmp_fsbl/misc/pm_cfg_obj.c" Error message: Traceback (most recent call last): File "/buildroot/output/build/uboot-xlnx_rebase_v2022.01/tools/zynqmp_pm_cfg_obj_convert.py", line 252, in in_file = open(args.in_file, mode='r') FileNotFoundError: [Errno 2] No such file or directory: 'https://github.com/Xilinx/embeddedsw/blob/xlnx_rel_v2021.2/lib/sw_apps/zynqmp_fsbl/misc/pm_cfg_obj.c' What are your thoughts? Thanks for your help! Best regards, Neal Frager Xilinx From nealf at xilinx.com Tue Feb 8 10:24:56 2022 From: nealf at xilinx.com (Neal Frager) Date: Tue, 8 Feb 2022 10:24:56 +0000 Subject: [Buildroot] [PATCH 1/2] configs/zynqmp_zcu106: Bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <69efa9da-ae55-6795-8724-ed7105083924@benettiengineering.com> References: <20220208071559.2862411-1-neal.frager@xilinx.com> <69efa9da-ae55-6795-8724-ed7105083924@benettiengineering.com> Message-ID: Hi Giulio, > Ok, I was about building your patches :-) > Please send as v2, so when creating patches add -v2: > # git format-patch -s -M -o outgoing -2 -v2 then add 3 dashes before the actual 3 dashes in the produced patches and described what is changed between V1 version to V2 like: > --- > V1->V2: > * moved BR2_TARGET_UBOOT_ZYNQMP_PM_CFG to an URL instead of local patch as suggested by Giulio > * other eventual modifies > --- > And if you send then a v3, then keep previous V1->V2 and add: > --- > V1->V2: > * moved BR2_TARGET_UBOOT_ZYNQMP_PM_CFG to an URL instead of local patch as suggested by Giulio > V2->V3: > * modified .... > --- Thank you for your quick response. How do you think we should handle this? It appears that the BR2_TARGET_UBOOT_ZYNQMP_PM_CFG configuration does not yet support pre-downloading the file from a URL. Is this something that can easily be updated? If not, perhaps it makes sense to move forward with my patch set as is for now, and then I can include a new update once the BR2_TARGET_UBOOT_ZYNQMP_PM_CFG configuration accepts URL inputs. What are your thoughts on this? Best regards, Neal Frager Xilinx From nealf at xilinx.com Tue Feb 8 11:13:41 2022 From: nealf at xilinx.com (Neal Frager) Date: Tue, 8 Feb 2022 11:13:41 +0000 Subject: [Buildroot] Xilinx mainline ATF v2.6 Message-ID: Hi Giulio, > today morning I had couple of hours and I've managed to fix the build failure and sent the patch upstream: > https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/13800 > Can you please give a try to that patch? > Here is a fast link to download exactly that one: > https://review.trustedfirmware.org/changes/TF-A%2Ftrusted-firmware-a~13800/revisions/1/patch?download > But its name is awful. So please: > # git clone https://github.com/giuliobenetti/trusted-firmware-a.git > # git checkout bl31-zynqmp-linker-failure # git format-patch -s -M -o . -1 I am trying to test your patch now, but when I follow your instructions, I get the following error upon checkout: error: pathsec 'bl31-zynqmp-linker-failure' did not match any file(s) known to git. Any ideas how I can obtain the proper patch for testing? On 04/02/22 14:32, Neal Frager wrote: > Hi Giulio, > > If you simply modify the defconfig from my patch to change BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v2.4" to BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v2.6" and rebuild, you will see the build error when trying to build the mainline ATF v2.6. If you can fix it on your side, that would be great! >er > Best regards, > > Neal Frager > Xilinx > > Best regards, Neal Frager Xilinx From giulio.benetti at benettiengineering.com Tue Feb 8 11:16:46 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 8 Feb 2022 12:16:46 +0100 Subject: [Buildroot] [PATCH 1/2] configs/zynqmp_zcu106: Bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: References: <20220208071559.2862411-1-neal.frager@xilinx.com> <69efa9da-ae55-6795-8724-ed7105083924@benettiengineering.com> Message-ID: <32cc1c12-1496-7db9-5e32-1b99404a4fe3@benettiengineering.com> Hi Neal, On 08/02/22 11:24, Neal Frager wrote: > Hi Giulio, > >> Ok, I was about building your patches :-) > >> Please send as v2, so when creating patches add -v2: >> # git format-patch -s -M -o outgoing -2 -v2 then add 3 dashes before the actual 3 dashes in the produced patches and described what is changed between V1 version to V2 like: >> --- >> V1->V2: >> * moved BR2_TARGET_UBOOT_ZYNQMP_PM_CFG to an URL instead of local patch as suggested by Giulio >> * other eventual modifies >> --- > >> And if you send then a v3, then keep previous V1->V2 and add: >> --- >> V1->V2: >> * moved BR2_TARGET_UBOOT_ZYNQMP_PM_CFG to an URL instead of local patch as suggested by Giulio >> V2->V3: >> * modified .... >> --- > > Thank you for your quick response. How do you think we should handle this? It appears that the BR2_TARGET_UBOOT_ZYNQMP_PM_CFG configuration does not yet support pre-downloading the file from a URL. It's not its purpose. > Is this something that can easily be updated? If not, perhaps it makes sense to move forward with my patch set as is for now, and then I can include a new update once the BR2_TARGET_UBOOT_ZYNQMP_PM_CFG configuration accepts URL inputs. > > What are your thoughts on this? I think you should go with local patch honestly. As the patch is now. -- Giulio Benetti Benetti Engineering sas From giulio.benetti at benettiengineering.com Tue Feb 8 11:20:47 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 8 Feb 2022 12:20:47 +0100 Subject: [Buildroot] Xilinx mainline ATF v2.6 In-Reply-To: References: Message-ID: Hi Neal, On 08/02/22 12:13, Neal Frager wrote: > Hi Giulio, > >> today morning I had couple of hours and I've managed to fix the build failure and sent the patch upstream: >> https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/13800 > >> Can you please give a try to that patch? > >> Here is a fast link to download exactly that one: >> https://review.trustedfirmware.org/changes/TF-A%2Ftrusted-firmware-a~13800/revisions/1/patch?download > >> But its name is awful. So please: >> # git clone https://github.com/giuliobenetti/trusted-firmware-a.git >> # git checkout bl31-zynqmp-linker-failure # git format-patch -s -M -o . -1 > > I am trying to test your patch now, but when I follow your instructions, I get the following error upon checkout: > > error: pathsec 'bl31-zynqmp-linker-failure' did not match any file(s) known to git. > > Any ideas how I can obtain the proper patch for testing? Yes, the branch name was wrong. So: # git clone https://github.com/giuliobenetti/trusted-firmware-a.git # cd trusted-firmware-a # git checkout fix/bl31-zynqmp-linker-failure # git format-patch -s -M -o . -1 Here is the pending patch in ARM Gerrit: https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/13800 You can download it from there too following their instructions. Best regards -- Giulio Benetti Benetti Engineering sas > On 04/02/22 14:32, Neal Frager wrote: >> Hi Giulio, >> >> If you simply modify the defconfig from my patch to change BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v2.4" to BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v2.6" and rebuild, you will see the build error when trying to build the mainline ATF v2.6. If you can fix it on your side, that would be great! >> er >> Best regards, >> >> Neal Frager >> Xilinx >> >> > > Best regards, > Neal Frager > Xilinx > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From giulio.benetti at benettiengineering.com Tue Feb 8 11:47:03 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 8 Feb 2022 12:47:03 +0100 Subject: [Buildroot] [PATCH v1 1/1] package/guile: Guile 3.0.7 requires libiconv. In-Reply-To: <784201902.75253.1644311953307@email.ionos.it> References: <20220206084334.1900252-1-paguilar@paguilar.org> <20220206103040.1704ef40@windsurf> <784201902.75253.1644311953307@email.ionos.it> Message-ID: Hi Pedro, Thomas, please don't top-post, answer in-line. On 08/02/22 10:19, Pedro Aguilar wrote: > Hi Thomas, > > I added libiconv based on the error I got while building. The attchmnt has the output error and the config file I used. Please send your changes as patches, or otherwise paste here the last lines of logs or in the case log is very long use pastebin and point the URL here. So please don't attach anything. > However, I was not aware of BR2_ENABLE_LOCALE, so I selected it and removed libiconv and it also built correctly. The other config file shows this configuration. > > May be a correct solution could be to add the dependency on BR2_ENABLE_LOCALE. But if it's not present, enable libiconv. I think this is a good example of what you're trying to do: https://git.buildroot.net/buildroot/tree/package/libcdio/Config.in#n4 Best regards -- Giulio Benetti Benetti Engineering sas > Thanks. > > Regards, > >> On 06/02/2022 10:30 Thomas Petazzoni wrote: >> >> >> On Sun, 6 Feb 2022 09:43:34 +0100 >> Pedro Aguilar wrote: >> >>> This fixes the error reported in the daily results. >>> >>> Signed-off-by: Pedro Aguilar >> >> libiconv is normally needed only on toolchains that don't have >> BR2_ENABLE_LOCALE. But the build failure of guile happens with glibc >> toolchains, so it doesn't make much sense. >> >> Are you sure that your analysis of the problem is correct? Could you >> provide some more details? >> >> Thanks a lot! >> >> Thomas >> -- >> Thomas Petazzoni, co-owner and CEO, Bootlin >> Embedded Linux and Kernel engineering and training >> https://bootlin.com > > Pedro Aguilar > https://paguilar.org > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From nealf at xilinx.com Tue Feb 8 11:56:13 2022 From: nealf at xilinx.com (Neal Frager) Date: Tue, 8 Feb 2022 11:56:13 +0000 Subject: [Buildroot] [PATCH 1/2] configs/zynqmp_zcu106: Bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <32cc1c12-1496-7db9-5e32-1b99404a4fe3@benettiengineering.com> References: <20220208071559.2862411-1-neal.frager@xilinx.com> <69efa9da-ae55-6795-8724-ed7105083924@benettiengineering.com> <32cc1c12-1496-7db9-5e32-1b99404a4fe3@benettiengineering.com> Message-ID: Hi Giulio, > I think you should go with local patch honestly. > As the patch is now. > -- > Giulio Benetti > Benetti Engineering sas Ok. Please go ahead and start building with the patch as is. I have tested it on my side. It builds and runs without needing any manual steps. Best regards, Neal Frager Xilinx From giulio.benetti at benettiengineering.com Tue Feb 8 12:02:40 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 8 Feb 2022 13:02:40 +0100 Subject: [Buildroot] [PATCH v1 1/1] package/guile: Guile 3.0.7 requires libiconv. In-Reply-To: References: Message-ID: <0B93B49F-FD97-4CFE-9B13-DC866D12C7E1@benettiengineering.com> > Il giorno 8 feb 2022, alle ore 12:47, Giulio Benetti ha scritto: > > ?Hi Pedro, Thomas, > > please don't top-post, answer in-line. > >> On 08/02/22 10:19, Pedro Aguilar wrote: >> Hi Thomas, >> I added libiconv based on the error I got while building. The attchmnt has the output error and the config file I used. > > Please send your changes as patches, or otherwise paste here the last lines of logs or in the case log is very long use pastebin and point the URL here. So please don't attach anything. > >> However, I was not aware of BR2_ENABLE_LOCALE, so I selected it and removed libiconv and it also built correctly. The other config file shows this configuration. >> May be a correct solution could be to add the dependency on BR2_ENABLE_LOCALE. But if it's not present, enable libiconv. > > I think this is a good example of what you're trying to do: > https://git.buildroot.net/buildroot/tree/package/libcdio/Config.in#n4 And you also need this: https://git.buildroot.net/buildroot/tree/package/libcdio/libcdio.mk#n16 Best regards Giulio > > Best regards > -- > Giulio Benetti > Benetti Engineering sas > >> Thanks. >> Regards, >>>> On 06/02/2022 10:30 Thomas Petazzoni wrote: >>> >>> On Sun, 6 Feb 2022 09:43:34 +0100 >>> Pedro Aguilar wrote: >>> >>>> This fixes the error reported in the daily results. >>>> >>>> Signed-off-by: Pedro Aguilar >>> >>> libiconv is normally needed only on toolchains that don't have >>> BR2_ENABLE_LOCALE. But the build failure of guile happens with glibc >>> toolchains, so it doesn't make much sense. >>> >>> Are you sure that your analysis of the problem is correct? Could you >>> provide some more details? >>> >>> Thanks a lot! >>> >>> Thomas >>> -- >>> Thomas Petazzoni, co-owner and CEO, Bootlin >>> Embedded Linux and Kernel engineering and training >>> https://bootlin.com >> Pedro Aguilar >> https://paguilar.org >> _______________________________________________ >> 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 -------------- next part -------------- An HTML attachment was scrubbed... URL: From guillaume.bressaix at gmail.com Tue Feb 8 12:19:28 2022 From: guillaume.bressaix at gmail.com (Guillaume W. Bres) Date: Tue, 8 Feb 2022 13:19:28 +0100 Subject: [Buildroot] [PATCH 1/1] package/liquid-dsp: bump version to 1.4.0 Message-ID: <20220208121928.28519-1-guillaume.bressaix@gmail.com> Signed-off-by: Guillaume W. Bres --- package/liquid-dsp/liquid-dsp.hash | 4 ++-- package/liquid-dsp/liquid-dsp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/liquid-dsp/liquid-dsp.hash b/package/liquid-dsp/liquid-dsp.hash index 31bcd68767..7e5de6b259 100644 --- a/package/liquid-dsp/liquid-dsp.hash +++ b/package/liquid-dsp/liquid-dsp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 85093624ef9cb90ead64c836d2f42690197edace1a86257d6524c4e4dc870483 liquid-dsp-1.3.2.tar.gz -sha256 4df7126196efba1283deb99e3269418dde4ab0ad1fde80a55051153451eb4df2 LICENSE +sha256 66f38d509aa8f6207d2035bae5ee081a3d9df0f2cab516bc2118b5b1c6ce3333 liquid-dsp-1.4.0.tar.gz +sha256 4df7126196efba1283deb99e3269418dde4ab0ad1fde80a55051153451eb4df2 LICENSE diff --git a/package/liquid-dsp/liquid-dsp.mk b/package/liquid-dsp/liquid-dsp.mk index 9745893b7c..fcdf572532 100644 --- a/package/liquid-dsp/liquid-dsp.mk +++ b/package/liquid-dsp/liquid-dsp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIQUID_DSP_VERSION = 1.3.2 +LIQUID_DSP_VERSION = 1.4.0 LIQUID_DSP_SITE = $(call github,jgaeddert,liquid-dsp,v$(LIQUID_DSP_VERSION)) LIQUID_DSP_LICENSE = MIT LIQUID_DSP_LICENSE_FILES = LICENSE -- 2.30.2 From luca at lucaceresoli.net Tue Feb 8 12:26:14 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Tue, 8 Feb 2022 13:26:14 +0100 Subject: [Buildroot] [PATCH 1/2] configs/zynqmp_zcu106: Bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <32cc1c12-1496-7db9-5e32-1b99404a4fe3@benettiengineering.com> References: <20220208071559.2862411-1-neal.frager@xilinx.com> <69efa9da-ae55-6795-8724-ed7105083924@benettiengineering.com> <32cc1c12-1496-7db9-5e32-1b99404a4fe3@benettiengineering.com> Message-ID: <690d8e1b-fb6d-7c36-b07f-4ed9ca61b768@lucaceresoli.net> Hi Neal, On 08/02/22 12:16, Giulio Benetti wrote: > Hi Neal, > > On 08/02/22 11:24, Neal Frager wrote: >> Hi Giulio, >> >>> Ok, I was about building your patches :-) >> >>> Please send as v2, so when creating patches add -v2: >>> # git format-patch -s -M -o outgoing -2 -v2 then add 3 dashes before >>> the actual 3 dashes in the produced patches and described what is >>> changed between V1 version to V2 like: >>> --- >>> V1->V2: >>> * moved BR2_TARGET_UBOOT_ZYNQMP_PM_CFG to an URL instead of local >>> patch as suggested by Giulio >>> * other eventual modifies >>> --- >> >>> And if you send then a v3, then keep previous V1->V2 and add: >>> --- >>> V1->V2: >>> * moved BR2_TARGET_UBOOT_ZYNQMP_PM_CFG to an URL instead of local >>> patch as suggested by Giulio >>> V2->V3: >>> * modified .... >>> --- >> >> Thank you for your quick response.? How do you think we should handle >> this?? It appears that the BR2_TARGET_UBOOT_ZYNQMP_PM_CFG >> configuration does not yet support pre-downloading the file from a URL. > > It's not its purpose. > >> ?Is this something that can easily be updated?? If not, perhaps it >> makes sense to move forward with my patch set as is for now, and then >> I can include a new update once the BR2_TARGET_UBOOT_ZYNQMP_PM_CFG >> configuration accepts URL inputs. >> >> What are your thoughts on this? > > I think you should go with local patch honestly. > As the patch is now. I agree with Giulio, it's probably better to add the file to Buildroot. Here's the rationale. Downloading files instead of versioning them is not necessarily a bad idea. However pm_cfg_obj.c is unavoidably a configuration-dependent file, meaning each user making their _project_ (project = a specific configuration of a specific hardware) will have a different pm_cfg_obj.c. This is different from downloading a patch, or a pmufw.bin, which are reusable across several projects. Theoretically, it might make sense to have a repo hosting pm_cfg_obj.c only if that repo contains all project-specific material for the _project_ : schematics, FPGA design etc. But this is not the case here. BTW pm_cfg_obj.c is a 32 kB text file that compresses to 2 kB. Not a big deal. -- Luca From nealf at xilinx.com Tue Feb 8 13:56:38 2022 From: nealf at xilinx.com (Neal Frager) Date: Tue, 8 Feb 2022 13:56:38 +0000 Subject: [Buildroot] [PATCH 1/2] configs/zynqmp_zcu106: Bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <690d8e1b-fb6d-7c36-b07f-4ed9ca61b768@lucaceresoli.net> References: <20220208071559.2862411-1-neal.frager@xilinx.com> <69efa9da-ae55-6795-8724-ed7105083924@benettiengineering.com> <32cc1c12-1496-7db9-5e32-1b99404a4fe3@benettiengineering.com> <690d8e1b-fb6d-7c36-b07f-4ed9ca61b768@lucaceresoli.net> Message-ID: Hi Luca, > Hi Neal, > On 08/02/22 12:16, Giulio Benetti wrote: > Hi Neal, > > On 08/02/22 11:24, Neal Frager wrote: >> Hi Giulio, >> >>> Ok, I was about building your patches :-) >> >>> Please send as v2, so when creating patches add -v2: >>> # git format-patch -s -M -o outgoing -2 -v2 then add 3 dashes before >>> the actual 3 dashes in the produced patches and described what is >>> changed between V1 version to V2 like: >>> --- >>> V1->V2: >>> * moved BR2_TARGET_UBOOT_ZYNQMP_PM_CFG to an URL instead of local >>> patch as suggested by Giulio >>> * other eventual modifies >>> --- >> >>> And if you send then a v3, then keep previous V1->V2 and add: >>> --- >>> V1->V2: >>> * moved BR2_TARGET_UBOOT_ZYNQMP_PM_CFG to an URL instead of local >>> patch as suggested by Giulio >>> V2->V3: >>> * modified .... >>> --- >> >> Thank you for your quick response. How do you think we should handle >> this? It appears that the BR2_TARGET_UBOOT_ZYNQMP_PM_CFG >> configuration does not yet support pre-downloading the file from a URL. > > It's not its purpose. > >> Is this something that can easily be updated? If not, perhaps it >> makes sense to move forward with my patch set as is for now, and then >> I can include a new update once the BR2_TARGET_UBOOT_ZYNQMP_PM_CFG >> configuration accepts URL inputs. >> >> What are your thoughts on this? > > I think you should go with local patch honestly. > As the patch is now. > I agree with Giulio, it's probably better to add the file to Buildroot. > Here's the rationale. > Downloading files instead of versioning them is not necessarily a bad idea. However pm_cfg_obj.c is unavoidably a configuration-dependent file, meaning each user making their _project_ (project = a specific configuration of a specific hardware) will have a different pm_cfg_obj.c. This is different from downloading a patch, or a pmufw.bin, which are reusable across several projects. > Theoretically, it might make sense to have a repo hosting pm_cfg_obj.c only if that repo contains all project-specific material for the _project_ : schematics, FPGA design etc. But this is not the case here. > BTW pm_cfg_obj.c is a 32 kB text file that compresses to 2 kB. Not a big deal. I agree with your rationale. However, not every FPGA design will have a new pm_cfg_obj.c. While it is possible to do some customizations with this file, all of the Xilinx evaluation boards now use the same one. I would expect most developers never even touch this file, to be honest. So in a high percentage of cases, the pm_cfg_obj.c is really coming from a specific Xilinx embeddedsw release branch which developers should want to be the same release version as the PMU firmware binary. In any case, the short term solution of including a pm_cfg_obj.c in buildroot is already done using this patch set. On my side, this patch set builds and runs out of the box without needing any manual steps. Have you had a chance to at least test the build process? Best regards, Neal Frager Xilinx From nealf at xilinx.com Tue Feb 8 15:25:41 2022 From: nealf at xilinx.com (Neal Frager) Date: Tue, 8 Feb 2022 15:25:41 +0000 Subject: [Buildroot] Xilinx mainline ATF v2.6 In-Reply-To: References: Message-ID: Hi Giulio, > Yes, the branch name was wrong. So: > # git clone https://github.com/giuliobenetti/trusted-firmware-a.git > # cd trusted-firmware-a > # git checkout fix/bl31-zynqmp-linker-failure # git format-patch -s -M -o . -1 > Here is the pending patch in ARM Gerrit: > https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/13800 > You can download it from there too following their instructions. Good job! I tested your patch. Not only does it build, but it runs too! ------ U-Boot SPL 2022.01 (Feb 08 2022 - 15:18:47 +0000) PMUFW: v1.1 Loading new PMUFW cfg obj (2200 bytes) Silicon version: 3 EL Level: EL3 Chip ID: zu9eg Multiboot: 0 Trying to boot from MMC2 spl: could not initialize mmc. error: -19 Trying to boot from MMC1 spl_load_image_fat_os: error reading image u-boot.bin, err - -2 NOTICE: TF-A running on XCZU9EG/silicon at 0xfffea000 NOTICE: BL31: v2.6(release):2021.11-1539-gba7dbc88c5-dirty NOTICE: BL31: Built : 15:15:15, Feb 8 2022 U-Boot 2022.01 (Feb 08 2022 - 15:18:47 +0000) CPU: ZynqMP Silicon: v3 Model: ZynqMP ZCU102 Rev1.0 Board: Xilinx ZynqMP DRAM: 4 GiB PMUFW: v1.1 Xilinx I2C Legacy format at nvmem0: Board name: zcu102 Board rev: 1.0 Board SN: 847318611722-66244 Ethernet mac: 00:0a:35:03:6c:ca EL Level: EL2 Chip ID: zu9eg NAND: 0 MiB MMC: mmc at ff170000: 0 Loading Environment from FAT... *** Error - No Valid Environment Area found *** Warning - bad env area, using default environment In: serial Out: serial Err: serial Bootmode: LVL_SHFT_SD_MODE1 Reset reason: EXTERNAL Net: ZYNQ GEM: ff0e0000, mdio bus ff0e0000, phyaddr 12, interface rgmii-id eth0: ethernet at ff0e0000 scanning bus for devices... SATA link 0 timeout. SATA link 1 timeout. AHCI 0001.0301 32 slots 2 ports 6 Gbps 0x3 impl SATA mode flags: 64bit ncq pm clo only pmp fbss pio slum part ccc apst starting USB... Bus usb at fe200000: Register 2000440 NbrPorts 2 Starting the controller USB XHCI 1.00 scanning bus usb at fe200000 for devices... 1 USB Device(s) found scanning usb for storage devices... 0 Storage Device(s) found Hit any key to stop autoboot: 0 switch to partitions #0, OK mmc0 is current device Scanning mmc 0:1... Found /extlinux/extlinux.conf Retrieving file: /extlinux/extlinux.conf 1: linux Retrieving file: /Image append: console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait Retrieving file: /system.dtb ## Flattened Device Tree blob at 40000000 Booting using the fdt blob at 0x40000000 Loading Device Tree to 000000007bdf5000, end 000000007be01d46 ... OK Starting kernel ... [ 0.000000] Booting Linux on physical CPU 0x0000000000 [0x410fd034] [ 0.000000] Linux version 5.15.0 (nealf at xirengwts08) (aarch64-buildroot-linux-uclibc-gcc.br_real (Buildroot 2021.11-1539-gba7dbc88c5) 10.3.0, GNU ld (GNU Binutils) 2.36.1) #1 SMP Tue Feb 8 09:42:51 GMT 2022 [ 0.000000] Machine model: ZynqMP ZCU102 Rev1.0 [ 0.000000] efi: UEFI not found. [ 0.000000] Zone ranges: [ 0.000000] DMA32 [mem 0x0000000000000000-0x00000000ffffffff] [ 0.000000] Normal [mem 0x0000000100000000-0x000000087fffffff] [ 0.000000] Movable zone start for each node [ 0.000000] Early memory node ranges [ 0.000000] node 0: [mem 0x0000000000000000-0x000000007fffffff] [ 0.000000] node 0: [mem 0x0000000800000000-0x000000087fffffff] [ 0.000000] Initmem setup node 0 [mem 0x0000000000000000-0x000000087fffffff] [ 0.000000] cma: Reserved 256 MiB at 0x000000006bc00000 [ 0.000000] psci: probing for conduit method from DT. [ 0.000000] psci: PSCIv1.1 detected in firmware. [ 0.000000] psci: Using standard PSCI v0.2 function IDs [ 0.000000] psci: MIGRATE_INFO_TYPE not supported. [ 0.000000] psci: SMC Calling Convention v1.2 [ 0.000000] percpu: Embedded 18 pages/cpu s33048 r8192 d32488 u73728 [ 0.000000] Detected VIPT I-cache on CPU0 [ 0.000000] CPU features: detected: ARM erratum 845719 [ 0.000000] Built 1 zonelists, mobility grouping on. Total pages: 1034240 [ 0.000000] Kernel command line: console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait [ 0.000000] Dentry cache hash table entries: 524288 (order: 10, 4194304 bytes, linear) [ 0.000000] Inode-cache hash table entries: 262144 (order: 9, 2097152 bytes, linear) [ 0.000000] mem auto-init: stack:off, heap alloc:off, heap free:off [ 0.000000] software IO TLB: mapped [mem 0x000000007c000000-0x0000000080000000] (64MB) [ 0.000000] Memory: 3772784K/4194304K available (13568K kernel code, 904K rwdata, 3864K rodata, 1984K init, 306K bss, 159376K reserved, 262144K cma-reserved) [ 0.000000] rcu: Hierarchical RCU implementation. [ 0.000000] rcu: RCU event tracing is enabled. [ 0.000000] rcu: RCU calculated value of scheduler-enlistment delay is 25 jiffies. [ 0.000000] NR_IRQS: 64, nr_irqs: 64, preallocated irqs: 0 [ 0.000000] GIC: Adjusting CPU interface base to 0x00000000f902f000 [ 0.000000] Root IRQ handler: gic_handle_irq [ 0.000000] GIC: Using split EOI/Deactivate mode [ 0.000000] random: get_random_bytes called from start_kernel+0x470/0x6f8 with crng_init=0 [ 0.000000] arch_timer: cp15 timer(s) running at 100.00MHz (phys). [ 0.000000] clocksource: arch_sys_counter: mask: 0xffffffffffffff max_cycles: 0x171024e7e0, max_idle_ns: 440795205315 ns [ 0.000000] sched_clock: 56 bits at 100MHz, resolution 10ns, wraps every 4398046511100ns [ 0.000302] Console: colour dummy device 80x25 [ 0.000335] Calibrating delay loop (skipped), value calculated using timer frequency.. 200.00 BogoMIPS (lpj=400000) [ 0.000346] pid_max: default: 32768 minimum: 301 [ 0.000454] Mount-cache hash table entries: 8192 (order: 4, 65536 bytes, linear) [ 0.000474] Mountpoint-cache hash table entries: 8192 (order: 4, 65536 bytes, linear) [ 0.001288] rcu: Hierarchical SRCU implementation. [ 0.001556] EFI services will not be available. [ 0.001681] smp: Bringing up secondary CPUs ... [ 0.002000] Detected VIPT I-cache on CPU1 [ 0.002037] CPU1: Booted secondary processor 0x0000000001 [0x410fd034] [ 0.002399] Detected VIPT I-cache on CPU2 [ 0.002422] CPU2: Booted secondary processor 0x0000000002 [0x410fd034] [ 0.002749] Detected VIPT I-cache on CPU3 [ 0.002771] CPU3: Booted secondary processor 0x0000000003 [0x410fd034] [ 0.002814] smp: Brought up 1 node, 4 CPUs [ 0.002831] SMP: Total of 4 processors activated. [ 0.002836] CPU features: detected: 32-bit EL0 Support [ 0.002842] CPU features: detected: CRC32 instructions [ 0.002883] CPU: All CPU(s) started at EL2 [ 0.002898] alternatives: patching kernel code [ 0.003949] devtmpfs: initialized [ 0.009573] clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 7645041785100000 ns [ 0.009592] futex hash table entries: 1024 (order: 4, 65536 bytes, linear) [ 0.017450] pinctrl core: initialized pinctrl subsystem [ 0.018081] NET: Registered PF_NETLINK/PF_ROUTE protocol family [ 0.019062] DMA: preallocated 512 KiB GFP_KERNEL pool for atomic allocations [ 0.019156] DMA: preallocated 512 KiB GFP_KERNEL|GFP_DMA32 pool for atomic allocations [ 0.019193] audit: initializing netlink subsys (disabled) [ 0.019268] audit: type=2000 audit(0.016:1): state=initialized audit_enabled=0 res=1 [ 0.019561] hw-breakpoint: found 6 breakpoint and 4 watchpoint registers. [ 0.019621] ASID allocator initialised with 65536 entries [ 0.037594] HugeTLB registered 1.00 GiB page size, pre-allocated 0 pages [ 0.037607] HugeTLB registered 32.0 MiB page size, pre-allocated 0 pages [ 0.037614] HugeTLB registered 2.00 MiB page size, pre-allocated 0 pages [ 0.037620] HugeTLB registered 64.0 KiB page size, pre-allocated 0 pages [ 1.102226] DRBG: Continuing without Jitter RNG [ 1.204763] raid6: neonx8 gen() 2139 MB/s [ 1.272812] raid6: neonx8 xor() 1593 MB/s [ 1.340871] raid6: neonx4 gen() 2187 MB/s [ 1.408916] raid6: neonx4 xor() 1576 MB/s [ 1.476978] raid6: neonx2 gen() 2068 MB/s [ 1.545028] raid6: neonx2 xor() 1447 MB/s [ 1.613093] raid6: neonx1 gen() 1803 MB/s [ 1.681147] raid6: neonx1 xor() 1240 MB/s [ 1.749207] raid6: int64x8 gen() 1471 MB/s [ 1.817250] raid6: int64x8 xor() 785 MB/s [ 1.885312] raid6: int64x4 gen() 1557 MB/s [ 1.953371] raid6: int64x4 xor() 842 MB/s [ 2.021437] raid6: int64x2 gen() 1396 MB/s [ 2.089488] raid6: int64x2 xor() 750 MB/s [ 2.157543] raid6: int64x1 gen() 1186 MB/s [ 2.225599] raid6: int64x1 xor() 596 MB/s [ 2.225604] raid6: using algorithm neonx4 gen() 2187 MB/s [ 2.225610] raid6: .... xor() 1576 MB/s, rmw enabled [ 2.225615] raid6: using neon recovery algorithm [ 2.225994] iommu: Default domain type: Translated [ 2.226001] iommu: DMA domain TLB invalidation policy: strict mode [ 2.226220] SCSI subsystem initialized [ 2.226362] usbcore: registered new interface driver usbfs [ 2.226390] usbcore: registered new interface driver hub [ 2.226417] usbcore: registered new device driver usb [ 2.226469] mc: Linux media interface: v0.10 [ 2.226488] videodev: Linux video capture interface: v2.00 [ 2.226525] pps_core: LinuxPPS API ver. 1 registered [ 2.226531] pps_core: Software ver. 5.3.6 - Copyright 2005-2007 Rodolfo Giometti [ 2.226543] PTP clock support registered [ 2.226569] EDAC MC: Ver: 3.0.0 [ 2.226852] zynqmp-ipi-mbox mailbox at ff990400: Registered ZynqMP IPI mbox with TX/RX channels. [ 2.227040] FPGA manager framework [ 2.227166] Advanced Linux Sound Architecture Driver Initialized. [ 2.227447] Bluetooth: Core ver 2.22 [ 2.227471] NET: Registered PF_BLUETOOTH protocol family [ 2.227476] Bluetooth: HCI device and connection manager initialized [ 2.227485] Bluetooth: HCI socket layer initialized [ 2.227491] Bluetooth: L2CAP socket layer initialized [ 2.227502] Bluetooth: SCO socket layer initialized [ 2.227789] clocksource: Switched to clocksource arch_sys_counter [ 2.227887] VFS: Disk quotas dquot_6.6.0 [ 2.227926] VFS: Dquot-cache hash table entries: 512 (order 0, 4096 bytes) [ 2.231840] NET: Registered PF_INET protocol family [ 2.231964] IP idents hash table entries: 65536 (order: 7, 524288 bytes, linear) [ 2.233486] tcp_listen_portaddr_hash hash table entries: 2048 (order: 3, 32768 bytes, linear) [ 2.233533] TCP established hash table entries: 32768 (order: 6, 262144 bytes, linear) [ 2.233739] TCP bind hash table entries: 32768 (order: 7, 524288 bytes, linear) [ 2.234123] TCP: Hash tables configured (established 32768 bind 32768) [ 2.234190] UDP hash table entries: 2048 (order: 4, 65536 bytes, linear) [ 2.234266] UDP-Lite hash table entries: 2048 (order: 4, 65536 bytes, linear) [ 2.234416] NET: Registered PF_UNIX/PF_LOCAL protocol family [ 2.234703] RPC: Registered named UNIX socket transport module. [ 2.234710] RPC: Registered udp transport module. [ 2.234714] RPC: Registered tcp transport module. [ 2.234719] RPC: Registered tcp NFSv4.1 backchannel transport module. [ 2.235305] PCI: CLS 0 bytes, default 64 [ 2.235585] armv8-pmu pmu: hw perfevents: no interrupt-affinity property, guessing. [ 2.235747] hw perfevents: enabled with armv8_pmuv3 PMU driver, 7 counters available [ 2.236543] Initialise system trusted keyrings [ 2.236640] workingset: timestamp_bits=62 max_order=20 bucket_order=0 [ 2.237202] NFS: Registering the id_resolver key type [ 2.237216] Key type id_resolver registered [ 2.237221] Key type id_legacy registered [ 2.237237] nfs4filelayout_init: NFSv4 File Layout Driver Registering... [ 2.237244] nfs4flexfilelayout_init: NFSv4 Flexfile Layout Driver Registering... [ 2.237261] jffs2: version 2.2. (NAND) ?? 2001-2006 Red Hat, Inc. [ 2.273306] NET: Registered PF_ALG protocol family [ 2.273320] xor: measuring software checksum speed [ 2.277366] 8regs : 2438 MB/sec [ 2.280888] 32regs : 2800 MB/sec [ 2.285157] arm64_neon : 2309 MB/sec [ 2.285163] xor: using function: 32regs (2800 MB/sec) [ 2.285170] Key type asymmetric registered [ 2.285175] Asymmetric key parser 'x509' registered [ 2.285211] Block layer SCSI generic (bsg) driver version 0.4 loaded (major 245) [ 2.285218] io scheduler mq-deadline registered [ 2.285223] io scheduler kyber registered [ 2.309790] Serial: 8250/16550 driver, 4 ports, IRQ sharing disabled [ 2.313198] cacheinfo: Unable to detect cache hierarchy for CPU 0 [ 2.317134] brd: module loaded [ 2.320288] loop: module loaded [ 2.321033] mtdoops: mtd device (mtddev=name/number) must be supplied [ 2.322271] libphy: Fixed MDIO Bus: probed [ 2.323366] tun: Universal TUN/TAP device driver, 1.6 [ 2.323447] CAN device driver interface [ 2.324182] usbcore: registered new interface driver asix [ 2.324219] usbcore: registered new interface driver ax88179_178a [ 2.324244] usbcore: registered new interface driver cdc_ether [ 2.324266] usbcore: registered new interface driver net1080 [ 2.324287] usbcore: registered new interface driver cdc_subset [ 2.324310] usbcore: registered new interface driver zaurus [ 2.324342] usbcore: registered new interface driver cdc_ncm [ 2.325046] usbcore: registered new interface driver uas [ 2.325077] usbcore: registered new interface driver usb-storage [ 2.325704] rtc_zynqmp ffa60000.rtc: registered as rtc0 [ 2.325721] rtc_zynqmp ffa60000.rtc: setting system clock to 2021-01-25T16:34:35 UTC (1611592475) [ 2.325789] i2c_dev: i2c /dev entries driver [ 2.327253] usbcore: registered new interface driver uvcvideo [ 2.328075] Bluetooth: HCI UART driver ver 2.3 [ 2.328082] Bluetooth: HCI UART protocol H4 registered [ 2.328088] Bluetooth: HCI UART protocol BCSP registered [ 2.328106] Bluetooth: HCI UART protocol LL registered [ 2.328112] Bluetooth: HCI UART protocol ATH3K registered [ 2.328128] Bluetooth: HCI UART protocol Three-wire (H5) registered [ 2.328166] Bluetooth: HCI UART protocol Intel registered [ 2.328182] Bluetooth: HCI UART protocol QCA registered [ 2.328211] usbcore: registered new interface driver bcm203x [ 2.328237] usbcore: registered new interface driver bpa10x [ 2.328262] usbcore: registered new interface driver bfusb [ 2.328287] usbcore: registered new interface driver btusb [ 2.328324] usbcore: registered new interface driver ath3k [ 2.328397] EDAC MC: ECC not enabled [ 2.328531] EDAC DEVICE0: Giving out device to module edac controller cache_err: DEV edac (POLLED) [ 2.328682] EDAC DEVICE1: Giving out device to module zynqmp-ocm-edac controller zynqmp_ocm: DEV ff960000.memory-controller (INTERRUPT) [ 2.329022] sdhci: Secure Digital Host Controller Interface driver [ 2.329028] sdhci: Copyright(c) Pierre Ossman [ 2.329032] sdhci-pltfm: SDHCI platform and OF driver helper [ 2.329372] ledtrig-cpu: registered to indicate activity on CPUs [ 2.329463] SMCCC: SOC_ID: ARCH_SOC_ID not implemented, skipping .... [ 2.329501] zynqmp_firmware_probe Platform Management API v1.1 [ 2.329510] zynqmp_firmware_probe Trustzone version v1.0 [ 2.359668] securefw securefw: securefw probed [ 2.359886] alg: No test for xilinx-zynqmp-aes (zynqmp-aes) [ 2.359905] zynqmp_aes firmware:zynqmp-firmware:zynqmp-aes: AES Successfully Registered [ 2.360070] alg: No test for xilinx-keccak-384 (zynqmp-keccak-384) [ 2.360247] alg: No test for xilinx-zynqmp-rsa (zynqmp-rsa) [ 2.360389] usbcore: registered new interface driver usbhid [ 2.360395] usbhid: USB HID core driver [ 2.363052] fpga_manager fpga0: Xilinx ZynqMP FPGA Manager registered [ 2.363387] usbcore: registered new interface driver snd-usb-audio [ 2.364208] pktgen: Packet Generator for packet performance testing. Version: 2.75 [ 2.364576] Initializing XFRM netlink socket [ 2.364653] NET: Registered PF_INET6 protocol family [ 2.365096] Segment Routing with IPv6 [ 2.365114] In-situ OAM (IOAM) with IPv6 [ 2.365163] sit: IPv6, IPv4 and MPLS over IPv4 tunneling driver [ 2.365470] NET: Registered PF_PACKET protocol family [ 2.365487] NET: Registered PF_KEY protocol family [ 2.365507] can: controller area network core [ 2.365536] NET: Registered PF_CAN protocol family [ 2.365542] can: raw protocol [ 2.365548] can: broadcast manager protocol [ 2.365555] can: netlink gateway - max_hops=1 [ 2.365624] Bluetooth: RFCOMM TTY layer initialized [ 2.365634] Bluetooth: RFCOMM socket layer initialized [ 2.365649] Bluetooth: RFCOMM ver 1.11 [ 2.365658] Bluetooth: BNEP (Ethernet Emulation) ver 1.3 [ 2.365664] Bluetooth: BNEP filters: protocol multicast [ 2.365671] Bluetooth: BNEP socket layer initialized [ 2.365676] Bluetooth: HIDP (Human Interface Emulation) ver 1.2 [ 2.365683] Bluetooth: HIDP socket layer initialized [ 2.365793] 9pnet: Installing 9P2000 support [ 2.365811] Key type dns_resolver registered [ 2.365915] registered taskstats version 1 [ 2.365921] Loading compiled-in X.509 certificates [ 2.366901] Btrfs loaded, crc32c=crc32c-generic, zoned=no, fsverity=no [ 2.374985] ff000000.serial: ttyPS0 at MMIO 0xff000000 (irq = 47, base_baud = 6249999) is a xuartps [ 3.675073] printk: console [ttyPS0] enabled [ 3.680067] ff010000.serial: ttyPS1 at MMIO 0xff010000 (irq = 48, base_baud = 6249999) is a xuartps [ 3.689389] of-fpga-region fpga-full: FPGA Region probed [ 3.695960] nwl-pcie fd0e0000.pcie: host bridge /axi/pcie at fd0e0000 ranges: [ 3.702858] nwl-pcie fd0e0000.pcie: MEM 0x00e0000000..0x00efffffff -> 0x00e0000000 [ 3.710863] nwl-pcie fd0e0000.pcie: MEM 0x0600000000..0x07ffffffff -> 0x0600000000 [ 3.718932] nwl-pcie fd0e0000.pcie: Link is DOWN [ 3.723692] nwl-pcie fd0e0000.pcie: PCI host bridge to bus 0000:00 [ 3.729868] pci_bus 0000:00: root bus resource [bus 00-ff] [ 3.735353] pci_bus 0000:00: root bus resource [mem 0xe0000000-0xefffffff] [ 3.742225] pci_bus 0000:00: root bus resource [mem 0x600000000-0x7ffffffff pref] [ 3.749731] pci 0000:00:00.0: [10ee:d021] type 01 class 0x060400 [ 3.755796] pci 0000:00:00.0: PME# supported from D0 D1 D2 D3hot [ 3.765470] pci 0000:00:00.0: PCI bridge to [bus 01-0c] [ 3.771018] xilinx-zynqmp-dma fd500000.dma-controller: ZynqMP DMA driver Probe success [ 3.779096] xilinx-zynqmp-dma fd510000.dma-controller: ZynqMP DMA driver Probe success [ 3.787168] xilinx-zynqmp-dma fd520000.dma-controller: ZynqMP DMA driver Probe success [ 3.795240] xilinx-zynqmp-dma fd530000.dma-controller: ZynqMP DMA driver Probe success [ 3.803315] xilinx-zynqmp-dma fd540000.dma-controller: ZynqMP DMA driver Probe success [ 3.811381] xilinx-zynqmp-dma fd550000.dma-controller: ZynqMP DMA driver Probe success [ 3.819459] xilinx-zynqmp-dma fd560000.dma-controller: ZynqMP DMA driver Probe success [ 3.827528] xilinx-zynqmp-dma fd570000.dma-controller: ZynqMP DMA driver Probe success [ 3.835850] xilinx-zynqmp-dpdma fd4c0000.dma-controller: Xilinx DPDMA engine is probed [ 3.844554] spi-nor spi0.0: found n25q512a, expected m25p80 [ 3.850649] spi-nor spi0.0: n25q512a (131072 Kbytes) [ 3.855638] 4 fixed-partitions partitions found on MTD device spi0.0 [ 3.861982] Creating 4 MTD partitions on "spi0.0": [ 3.866765] 0x000000000000-0x000000100000 : "qspi-fsbl-uboot" [ 3.873306] 0x000000100000-0x000000600000 : "qspi-linux" [ 3.879305] 0x000000600000-0x000000620000 : "qspi-device-tree" [ 3.885811] 0x000000620000-0x000000c00000 : "qspi-rootfs" [ 3.894566] macb ff0e0000.ethernet: Not enabling partial store and forward [ 3.902041] libphy: MACB_mii_bus: probed [ 3.906625] macb ff0e0000.ethernet eth0: Cadence GEM rev 0x50070106 at 0xff0e0000 irq 30 (00:0a:35:03:6c:ca) [ 3.916754] xilinx-axipmon ffa00000.perf-monitor: Probed Xilinx APM [ 3.923298] xilinx-axipmon fd0b0000.perf-monitor: Probed Xilinx APM [ 3.929802] xilinx-axipmon fd490000.perf-monitor: Probed Xilinx APM [ 3.936303] xilinx-axipmon ffa10000.perf-monitor: Probed Xilinx APM [ 3.943645] pca953x 0-0020: supply vcc not found, using dummy regulator [ 3.950339] pca953x 0-0020: using no AI [ 3.954846] gpio-318 (sel0): hogged as output/low [ 3.959756] gpio-319 (sel1): hogged as output/high [ 3.964755] gpio-320 (sel2): hogged as output/high [ 3.969753] gpio-321 (sel3): hogged as output/high [ 3.974906] pca953x 0-0021: supply vcc not found, using dummy regulator [ 3.981575] pca953x 0-0021: using no AI [ 3.994348] i2c i2c-0: Added multiplexed i2c bus 2 [ 4.005627] i2c i2c-0: Added multiplexed i2c bus 3 [ 4.021538] random: fast init done [ 4.063343] i2c i2c-0: Added multiplexed i2c bus 4 [ 4.068256] i2c i2c-0: Added multiplexed i2c bus 5 [ 4.073051] pca954x 0-0075: registered 4 multiplexed busses for I2C mux pca9544 [ 4.080406] cdns-i2c ff020000.i2c: 400 kHz mmio ff020000 irq 32 [ 4.087774] at24 6-0054: supply vcc not found, using dummy regulator [ 4.094661] at24 6-0054: 1024 byte 24c08 EEPROM, writable, 1 bytes/write [ 4.101402] i2c i2c-1: Added multiplexed i2c bus 6 [ 4.106723] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out [ 4.114028] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out [ 4.121333] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out [ 4.128631] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out [ 4.135932] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out [ 4.143230] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out [ 4.150532] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out [ 4.157832] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out [ 4.166228] si5341 7-0036: Chip: 5341 Grade: 1 Rev: 1 [ 4.204262] i2c i2c-1: Added multiplexed i2c bus 7 [ 4.211860] si570 8-005d: registered, current frequency 300000000 Hz [ 4.218249] i2c i2c-1: Added multiplexed i2c bus 8 [ 4.237968] si570 9-005d: registered, current frequency 148500000 Hz [ 4.244356] i2c i2c-1: Added multiplexed i2c bus 9 [ 4.249368] si5324 10-0069: si5328 probed [ 4.316105] si5324 10-0069: si5328 probe successful [ 4.321023] i2c i2c-1: Added multiplexed i2c bus 10 [ 4.326009] i2c i2c-1: Added multiplexed i2c bus 11 [ 4.331002] i2c i2c-1: Added multiplexed i2c bus 12 [ 4.335995] i2c i2c-1: Added multiplexed i2c bus 13 [ 4.340870] pca954x 1-0074: registered 8 multiplexed busses for I2C switch pca9548 [ 4.348795] i2c i2c-1: Added multiplexed i2c bus 14 [ 4.353797] i2c i2c-1: Added multiplexed i2c bus 15 [ 4.358799] i2c i2c-1: Added multiplexed i2c bus 16 [ 4.363811] i2c i2c-1: Added multiplexed i2c bus 17 [ 4.368809] i2c i2c-1: Added multiplexed i2c bus 18 [ 4.373819] i2c i2c-1: Added multiplexed i2c bus 19 [ 4.378823] i2c i2c-1: Added multiplexed i2c bus 20 [ 4.383828] i2c i2c-1: Added multiplexed i2c bus 21 [ 4.388705] pca954x 1-0075: registered 8 multiplexed busses for I2C switch pca9548 [ 4.396304] cdns-i2c ff030000.i2c: 400 kHz mmio ff030000 irq 33 [ 4.406274] cdns-wdt fd4d0000.watchdog: Xilinx Watchdog Timer with timeout 60s [ 4.415726] zynqmp-display fd4a0000.display: vtc bridge property not present [ 4.424824] xilinx-dp-snd-codec fd4a0000.display:zynqmp_dp_snd_codec0: Xilinx DisplayPort Sound Codec probed [ 4.434896] xilinx-dp-snd-pcm zynqmp_dp_snd_pcm0: Xilinx DisplayPort Sound PCM probed [ 4.442954] xilinx-dp-snd-pcm zynqmp_dp_snd_pcm1: Xilinx DisplayPort Sound PCM probed [ 4.448513] mmc0: SDHCI controller on ff170000.mmc [ff170000.mmc] using ADMA 64-bit [ 4.459057] xilinx-dp-snd-card fd4a0000.display:zynqmp_dp_snd_card: Xilinx DisplayPort Sound Card probed [ 4.468634] OF: graph: no port node found in /axi/display at fd4a0000 [ 4.475120] xlnx-drm xlnx-drm.0: bound fd4a0000.display (ops 0xffffffc010e17fa0) [ 4.482712] [drm] Initialized xlnx 1.0.0 20130509 for fd4a0000.display on minor 0 [ 4.490206] zynqmp-display fd4a0000.display: ZynqMP DisplayPort Subsystem driver probed [ 4.496962] mmc0: new high speed SDHC card at address aaaa [ 4.498430] ahci-ceva fd0c0000.ahci: supply ahci not found, using dummy regulator [ 4.511219] ahci-ceva fd0c0000.ahci: supply phy not found, using dummy regulator [ 4.511379] mmcblk0: mmc0:aaaa SB16G 14.8 GiB [ 4.518690] ahci-ceva fd0c0000.ahci: supply target not found, using dummy regulator [ 4.527484] mmcblk0: p1 p2 [ 4.540954] ahci-ceva fd0c0000.ahci: AHCI 0001.0301 32 slots 2 ports 6 Gbps 0x3 impl platform mode [ 4.549923] ahci-ceva fd0c0000.ahci: flags: 64bit ncq sntf pm clo only pmp fbs pio slum part ccc sds apst [ 4.560268] scsi host0: ahci-ceva [ 4.563829] scsi host1: ahci-ceva [ 4.567237] ata1: SATA max UDMA/133 mmio [mem 0xfd0c0000-0xfd0c1fff] port 0x100 irq 45 [ 4.575152] ata2: SATA max UDMA/133 mmio [mem 0xfd0c0000-0xfd0c1fff] port 0x180 irq 45 [ 4.605877] xhci-hcd xhci-hcd.1.auto: xHCI Host Controller [ 4.611375] xhci-hcd xhci-hcd.1.auto: new USB bus registered, assigned bus number 1 [ 4.619123] xhci-hcd xhci-hcd.1.auto: hcc params 0x0238f625 hci version 0x100 quirks 0x0000000002010810 [ 4.628540] xhci-hcd xhci-hcd.1.auto: irq 53, io mem 0xfe200000 [ 4.634549] xhci-hcd xhci-hcd.1.auto: xHCI Host Controller [ 4.640035] xhci-hcd xhci-hcd.1.auto: new USB bus registered, assigned bus number 2 [ 4.647692] xhci-hcd xhci-hcd.1.auto: Host supports USB 3.0 SuperSpeed [ 4.654319] usb usb1: New USB device found, idVendor=1d6b, idProduct=0002, bcdDevice= 5.15 [ 4.662582] usb usb1: New USB device strings: Mfr=3, Product=2, SerialNumber=1 [ 4.669795] usb usb1: Product: xHCI Host Controller [ 4.674664] usb usb1: Manufacturer: Linux 5.15.0 xhci-hcd [ 4.680054] usb usb1: SerialNumber: xhci-hcd.1.auto [ 4.685214] hub 1-0:1.0: USB hub found [ 4.688988] hub 1-0:1.0: 1 port detected [ 4.693202] usb usb2: New USB device found, idVendor=1d6b, idProduct=0003, bcdDevice= 5.15 [ 4.701463] usb usb2: New USB device strings: Mfr=3, Product=2, SerialNumber=1 [ 4.708682] usb usb2: Product: xHCI Host Controller [ 4.713550] usb usb2: Manufacturer: Linux 5.15.0 xhci-hcd [ 4.718944] usb usb2: SerialNumber: xhci-hcd.1.auto [ 4.724075] hub 2-0:1.0: USB hub found [ 4.727842] hub 2-0:1.0: 1 port detected [ 4.734650] input: gpio-keys as /devices/platform/gpio-keys/input/input0 [ 4.741660] of_cfs_init [ 4.744131] of_cfs_init: OK [ 4.747039] cfg80211: Loading compiled-in X.509 certificates for regulatory database [ 4.881580] cfg80211: Loaded X.509 cert 'sforshee: 00b28ddf47aef9cea7' [ 4.888214] zynqmp_pll_disable() clock disable failed for dpll_int, ret = -13 [ 4.896228] platform regulatory.0: Direct firmware load for regulatory.db failed with error -2 [ 4.897975] ata2: SATA link down (SStatus 0 SControl 330) [ 4.904842] cfg80211: failed to load regulatory.db [ 4.905622] ALSA device list: [ 4.905626] #0: DisplayPort monitor [ 4.910252] ata1: SATA link down (SStatus 0 SControl 330) [ 4.950910] EXT4-fs (mmcblk0p2): mounted filesystem with ordered data mode. Opts: (null). Quota mode: none. [ 4.960680] VFS: Mounted root (ext4 filesystem) on device 179:2. [ 4.969332] devtmpfs: mounted [ 4.972830] Freeing unused kernel memory: 1984K [ 4.977453] Run /sbin/init as init process [ 5.056434] EXT4-fs (mmcblk0p2): re-mounted. Opts: (null). Quota mode: none. Starting syslogd: OK Starting klogd: OK Running sysctl: OK Saving random seed: [ 5.105554] random: dd: uninitialized urandom read (512 bytes read) OK Starting network: OK Welcome to Buildroot buildroot login: root # Best regards, Neal Frager Xilinx From giulio.benetti at benettiengineering.com Tue Feb 8 16:19:18 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 8 Feb 2022 17:19:18 +0100 Subject: [Buildroot] Xilinx mainline ATF v2.6 In-Reply-To: References: Message-ID: <11BB5427-9C48-4116-AECB-EA33631B3519@benettiengineering.com> Hi Neal, > Il giorno 8 feb 2022, alle ore 16:26, Neal Frager ha scritto: > > ?Hi Giulio, > >> Yes, the branch name was wrong. So: >> # git clone https://github.com/giuliobenetti/trusted-firmware-a.git >> # cd trusted-firmware-a >> # git checkout fix/bl31-zynqmp-linker-failure # git format-patch -s -M -o . -1 > >> Here is the pending patch in ARM Gerrit: >> https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/13800 >> You can download it from there too following their instructions. > > Good job! I tested your patch. Not only does it build, but it runs too! Thanks a lot for testing runtime. It should be merged soon as you can see from gerrit :-) Best regards Giulio > > ------ > > U-Boot SPL 2022.01 (Feb 08 2022 - 15:18:47 +0000) > PMUFW: v1.1 > Loading new PMUFW cfg obj (2200 bytes) > Silicon version: 3 > EL Level: EL3 > Chip ID: zu9eg > Multiboot: 0 > Trying to boot from MMC2 > spl: could not initialize mmc. error: -19 > Trying to boot from MMC1 > spl_load_image_fat_os: error reading image u-boot.bin, err - -2 > NOTICE: TF-A running on XCZU9EG/silicon at 0xfffea000 > NOTICE: BL31: v2.6(release):2021.11-1539-gba7dbc88c5-dirty > NOTICE: BL31: Built : 15:15:15, Feb 8 2022 > > > U-Boot 2022.01 (Feb 08 2022 - 15:18:47 +0000) > > CPU: ZynqMP > Silicon: v3 > Model: ZynqMP ZCU102 Rev1.0 > Board: Xilinx ZynqMP > DRAM: 4 GiB > PMUFW: v1.1 > Xilinx I2C Legacy format at nvmem0: > Board name: zcu102 > Board rev: 1.0 > Board SN: 847318611722-66244 > Ethernet mac: 00:0a:35:03:6c:ca > EL Level: EL2 > Chip ID: zu9eg > NAND: 0 MiB > MMC: mmc at ff170000: 0 > Loading Environment from FAT... *** Error - No Valid Environment Area found > *** Warning - bad env area, using default environment > > In: serial > Out: serial > Err: serial > Bootmode: LVL_SHFT_SD_MODE1 > Reset reason: EXTERNAL > Net: > ZYNQ GEM: ff0e0000, mdio bus ff0e0000, phyaddr 12, interface rgmii-id > eth0: ethernet at ff0e0000 > scanning bus for devices... > SATA link 0 timeout. > SATA link 1 timeout. > AHCI 0001.0301 32 slots 2 ports 6 Gbps 0x3 impl SATA mode > flags: 64bit ncq pm clo only pmp fbss pio slum part ccc apst > starting USB... > Bus usb at fe200000: Register 2000440 NbrPorts 2 > Starting the controller > USB XHCI 1.00 > scanning bus usb at fe200000 for devices... 1 USB Device(s) found > scanning usb for storage devices... 0 Storage Device(s) found > Hit any key to stop autoboot: 0 > switch to partitions #0, OK > mmc0 is current device > Scanning mmc 0:1... > Found /extlinux/extlinux.conf > Retrieving file: /extlinux/extlinux.conf > 1: linux > Retrieving file: /Image > append: console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait > Retrieving file: /system.dtb > ## Flattened Device Tree blob at 40000000 > Booting using the fdt blob at 0x40000000 > Loading Device Tree to 000000007bdf5000, end 000000007be01d46 ... OK > > Starting kernel ... > > [ 0.000000] Booting Linux on physical CPU 0x0000000000 [0x410fd034] > [ 0.000000] Linux version 5.15.0 (nealf at xirengwts08) (aarch64-buildroot-linux-uclibc-gcc.br_real (Buildroot 2021.11-1539-gba7dbc88c5) 10.3.0, GNU ld (GNU Binutils) 2.36.1) #1 SMP Tue Feb 8 09:42:51 GMT 2022 > [ 0.000000] Machine model: ZynqMP ZCU102 Rev1.0 > [ 0.000000] efi: UEFI not found. > [ 0.000000] Zone ranges: > [ 0.000000] DMA32 [mem 0x0000000000000000-0x00000000ffffffff] > [ 0.000000] Normal [mem 0x0000000100000000-0x000000087fffffff] > [ 0.000000] Movable zone start for each node > [ 0.000000] Early memory node ranges > [ 0.000000] node 0: [mem 0x0000000000000000-0x000000007fffffff] > [ 0.000000] node 0: [mem 0x0000000800000000-0x000000087fffffff] > [ 0.000000] Initmem setup node 0 [mem 0x0000000000000000-0x000000087fffffff] > [ 0.000000] cma: Reserved 256 MiB at 0x000000006bc00000 > [ 0.000000] psci: probing for conduit method from DT. > [ 0.000000] psci: PSCIv1.1 detected in firmware. > [ 0.000000] psci: Using standard PSCI v0.2 function IDs > [ 0.000000] psci: MIGRATE_INFO_TYPE not supported. > [ 0.000000] psci: SMC Calling Convention v1.2 > [ 0.000000] percpu: Embedded 18 pages/cpu s33048 r8192 d32488 u73728 > [ 0.000000] Detected VIPT I-cache on CPU0 > [ 0.000000] CPU features: detected: ARM erratum 845719 > [ 0.000000] Built 1 zonelists, mobility grouping on. Total pages: 1034240 > [ 0.000000] Kernel command line: console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait > [ 0.000000] Dentry cache hash table entries: 524288 (order: 10, 4194304 bytes, linear) > [ 0.000000] Inode-cache hash table entries: 262144 (order: 9, 2097152 bytes, linear) > [ 0.000000] mem auto-init: stack:off, heap alloc:off, heap free:off > [ 0.000000] software IO TLB: mapped [mem 0x000000007c000000-0x0000000080000000] (64MB) > [ 0.000000] Memory: 3772784K/4194304K available (13568K kernel code, 904K rwdata, 3864K rodata, 1984K init, 306K bss, 159376K reserved, 262144K cma-reserved) > [ 0.000000] rcu: Hierarchical RCU implementation. > [ 0.000000] rcu: RCU event tracing is enabled. > [ 0.000000] rcu: RCU calculated value of scheduler-enlistment delay is 25 jiffies. > [ 0.000000] NR_IRQS: 64, nr_irqs: 64, preallocated irqs: 0 > [ 0.000000] GIC: Adjusting CPU interface base to 0x00000000f902f000 > [ 0.000000] Root IRQ handler: gic_handle_irq > [ 0.000000] GIC: Using split EOI/Deactivate mode > [ 0.000000] random: get_random_bytes called from start_kernel+0x470/0x6f8 with crng_init=0 > [ 0.000000] arch_timer: cp15 timer(s) running at 100.00MHz (phys). > [ 0.000000] clocksource: arch_sys_counter: mask: 0xffffffffffffff max_cycles: 0x171024e7e0, max_idle_ns: 440795205315 ns > [ 0.000000] sched_clock: 56 bits at 100MHz, resolution 10ns, wraps every 4398046511100ns > [ 0.000302] Console: colour dummy device 80x25 > [ 0.000335] Calibrating delay loop (skipped), value calculated using timer frequency.. 200.00 BogoMIPS (lpj=400000) > [ 0.000346] pid_max: default: 32768 minimum: 301 > [ 0.000454] Mount-cache hash table entries: 8192 (order: 4, 65536 bytes, linear) > [ 0.000474] Mountpoint-cache hash table entries: 8192 (order: 4, 65536 bytes, linear) > [ 0.001288] rcu: Hierarchical SRCU implementation. > [ 0.001556] EFI services will not be available. > [ 0.001681] smp: Bringing up secondary CPUs ... > [ 0.002000] Detected VIPT I-cache on CPU1 > [ 0.002037] CPU1: Booted secondary processor 0x0000000001 [0x410fd034] > [ 0.002399] Detected VIPT I-cache on CPU2 > [ 0.002422] CPU2: Booted secondary processor 0x0000000002 [0x410fd034] > [ 0.002749] Detected VIPT I-cache on CPU3 > [ 0.002771] CPU3: Booted secondary processor 0x0000000003 [0x410fd034] > [ 0.002814] smp: Brought up 1 node, 4 CPUs > [ 0.002831] SMP: Total of 4 processors activated. > [ 0.002836] CPU features: detected: 32-bit EL0 Support > [ 0.002842] CPU features: detected: CRC32 instructions > [ 0.002883] CPU: All CPU(s) started at EL2 > [ 0.002898] alternatives: patching kernel code > [ 0.003949] devtmpfs: initialized > [ 0.009573] clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 7645041785100000 ns > [ 0.009592] futex hash table entries: 1024 (order: 4, 65536 bytes, linear) > [ 0.017450] pinctrl core: initialized pinctrl subsystem > [ 0.018081] NET: Registered PF_NETLINK/PF_ROUTE protocol family > [ 0.019062] DMA: preallocated 512 KiB GFP_KERNEL pool for atomic allocations > [ 0.019156] DMA: preallocated 512 KiB GFP_KERNEL|GFP_DMA32 pool for atomic allocations > [ 0.019193] audit: initializing netlink subsys (disabled) > [ 0.019268] audit: type=2000 audit(0.016:1): state=initialized audit_enabled=0 res=1 > [ 0.019561] hw-breakpoint: found 6 breakpoint and 4 watchpoint registers. > [ 0.019621] ASID allocator initialised with 65536 entries > [ 0.037594] HugeTLB registered 1.00 GiB page size, pre-allocated 0 pages > [ 0.037607] HugeTLB registered 32.0 MiB page size, pre-allocated 0 pages > [ 0.037614] HugeTLB registered 2.00 MiB page size, pre-allocated 0 pages > [ 0.037620] HugeTLB registered 64.0 KiB page size, pre-allocated 0 pages > [ 1.102226] DRBG: Continuing without Jitter RNG > [ 1.204763] raid6: neonx8 gen() 2139 MB/s > [ 1.272812] raid6: neonx8 xor() 1593 MB/s > [ 1.340871] raid6: neonx4 gen() 2187 MB/s > [ 1.408916] raid6: neonx4 xor() 1576 MB/s > [ 1.476978] raid6: neonx2 gen() 2068 MB/s > [ 1.545028] raid6: neonx2 xor() 1447 MB/s > [ 1.613093] raid6: neonx1 gen() 1803 MB/s > [ 1.681147] raid6: neonx1 xor() 1240 MB/s > [ 1.749207] raid6: int64x8 gen() 1471 MB/s > [ 1.817250] raid6: int64x8 xor() 785 MB/s > [ 1.885312] raid6: int64x4 gen() 1557 MB/s > [ 1.953371] raid6: int64x4 xor() 842 MB/s > [ 2.021437] raid6: int64x2 gen() 1396 MB/s > [ 2.089488] raid6: int64x2 xor() 750 MB/s > [ 2.157543] raid6: int64x1 gen() 1186 MB/s > [ 2.225599] raid6: int64x1 xor() 596 MB/s > [ 2.225604] raid6: using algorithm neonx4 gen() 2187 MB/s > [ 2.225610] raid6: .... xor() 1576 MB/s, rmw enabled > [ 2.225615] raid6: using neon recovery algorithm > [ 2.225994] iommu: Default domain type: Translated > [ 2.226001] iommu: DMA domain TLB invalidation policy: strict mode > [ 2.226220] SCSI subsystem initialized > [ 2.226362] usbcore: registered new interface driver usbfs > [ 2.226390] usbcore: registered new interface driver hub > [ 2.226417] usbcore: registered new device driver usb > [ 2.226469] mc: Linux media interface: v0.10 > [ 2.226488] videodev: Linux video capture interface: v2.00 > [ 2.226525] pps_core: LinuxPPS API ver. 1 registered > [ 2.226531] pps_core: Software ver. 5.3.6 - Copyright 2005-2007 Rodolfo Giometti > [ 2.226543] PTP clock support registered > [ 2.226569] EDAC MC: Ver: 3.0.0 > [ 2.226852] zynqmp-ipi-mbox mailbox at ff990400: Registered ZynqMP IPI mbox with TX/RX channels. > [ 2.227040] FPGA manager framework > [ 2.227166] Advanced Linux Sound Architecture Driver Initialized. > [ 2.227447] Bluetooth: Core ver 2.22 > [ 2.227471] NET: Registered PF_BLUETOOTH protocol family > [ 2.227476] Bluetooth: HCI device and connection manager initialized > [ 2.227485] Bluetooth: HCI socket layer initialized > [ 2.227491] Bluetooth: L2CAP socket layer initialized > [ 2.227502] Bluetooth: SCO socket layer initialized > [ 2.227789] clocksource: Switched to clocksource arch_sys_counter > [ 2.227887] VFS: Disk quotas dquot_6.6.0 > [ 2.227926] VFS: Dquot-cache hash table entries: 512 (order 0, 4096 bytes) > [ 2.231840] NET: Registered PF_INET protocol family > [ 2.231964] IP idents hash table entries: 65536 (order: 7, 524288 bytes, linear) > [ 2.233486] tcp_listen_portaddr_hash hash table entries: 2048 (order: 3, 32768 bytes, linear) > [ 2.233533] TCP established hash table entries: 32768 (order: 6, 262144 bytes, linear) > [ 2.233739] TCP bind hash table entries: 32768 (order: 7, 524288 bytes, linear) > [ 2.234123] TCP: Hash tables configured (established 32768 bind 32768) > [ 2.234190] UDP hash table entries: 2048 (order: 4, 65536 bytes, linear) > [ 2.234266] UDP-Lite hash table entries: 2048 (order: 4, 65536 bytes, linear) > [ 2.234416] NET: Registered PF_UNIX/PF_LOCAL protocol family > [ 2.234703] RPC: Registered named UNIX socket transport module. > [ 2.234710] RPC: Registered udp transport module. > [ 2.234714] RPC: Registered tcp transport module. > [ 2.234719] RPC: Registered tcp NFSv4.1 backchannel transport module. > [ 2.235305] PCI: CLS 0 bytes, default 64 > [ 2.235585] armv8-pmu pmu: hw perfevents: no interrupt-affinity property, guessing. > [ 2.235747] hw perfevents: enabled with armv8_pmuv3 PMU driver, 7 counters available > [ 2.236543] Initialise system trusted keyrings > [ 2.236640] workingset: timestamp_bits=62 max_order=20 bucket_order=0 > [ 2.237202] NFS: Registering the id_resolver key type > [ 2.237216] Key type id_resolver registered > [ 2.237221] Key type id_legacy registered > [ 2.237237] nfs4filelayout_init: NFSv4 File Layout Driver Registering... > [ 2.237244] nfs4flexfilelayout_init: NFSv4 Flexfile Layout Driver Registering... > [ 2.237261] jffs2: version 2.2. (NAND) ?? 2001-2006 Red Hat, Inc. > [ 2.273306] NET: Registered PF_ALG protocol family > [ 2.273320] xor: measuring software checksum speed > [ 2.277366] 8regs : 2438 MB/sec > [ 2.280888] 32regs : 2800 MB/sec > [ 2.285157] arm64_neon : 2309 MB/sec > [ 2.285163] xor: using function: 32regs (2800 MB/sec) > [ 2.285170] Key type asymmetric registered > [ 2.285175] Asymmetric key parser 'x509' registered > [ 2.285211] Block layer SCSI generic (bsg) driver version 0.4 loaded (major 245) > [ 2.285218] io scheduler mq-deadline registered > [ 2.285223] io scheduler kyber registered > [ 2.309790] Serial: 8250/16550 driver, 4 ports, IRQ sharing disabled > [ 2.313198] cacheinfo: Unable to detect cache hierarchy for CPU 0 > [ 2.317134] brd: module loaded > [ 2.320288] loop: module loaded > [ 2.321033] mtdoops: mtd device (mtddev=name/number) must be supplied > [ 2.322271] libphy: Fixed MDIO Bus: probed > [ 2.323366] tun: Universal TUN/TAP device driver, 1.6 > [ 2.323447] CAN device driver interface > [ 2.324182] usbcore: registered new interface driver asix > [ 2.324219] usbcore: registered new interface driver ax88179_178a > [ 2.324244] usbcore: registered new interface driver cdc_ether > [ 2.324266] usbcore: registered new interface driver net1080 > [ 2.324287] usbcore: registered new interface driver cdc_subset > [ 2.324310] usbcore: registered new interface driver zaurus > [ 2.324342] usbcore: registered new interface driver cdc_ncm > [ 2.325046] usbcore: registered new interface driver uas > [ 2.325077] usbcore: registered new interface driver usb-storage > [ 2.325704] rtc_zynqmp ffa60000.rtc: registered as rtc0 > [ 2.325721] rtc_zynqmp ffa60000.rtc: setting system clock to 2021-01-25T16:34:35 UTC (1611592475) > [ 2.325789] i2c_dev: i2c /dev entries driver > [ 2.327253] usbcore: registered new interface driver uvcvideo > [ 2.328075] Bluetooth: HCI UART driver ver 2.3 > [ 2.328082] Bluetooth: HCI UART protocol H4 registered > [ 2.328088] Bluetooth: HCI UART protocol BCSP registered > [ 2.328106] Bluetooth: HCI UART protocol LL registered > [ 2.328112] Bluetooth: HCI UART protocol ATH3K registered > [ 2.328128] Bluetooth: HCI UART protocol Three-wire (H5) registered > [ 2.328166] Bluetooth: HCI UART protocol Intel registered > [ 2.328182] Bluetooth: HCI UART protocol QCA registered > [ 2.328211] usbcore: registered new interface driver bcm203x > [ 2.328237] usbcore: registered new interface driver bpa10x > [ 2.328262] usbcore: registered new interface driver bfusb > [ 2.328287] usbcore: registered new interface driver btusb > [ 2.328324] usbcore: registered new interface driver ath3k > [ 2.328397] EDAC MC: ECC not enabled > [ 2.328531] EDAC DEVICE0: Giving out device to module edac controller cache_err: DEV edac (POLLED) > [ 2.328682] EDAC DEVICE1: Giving out device to module zynqmp-ocm-edac controller zynqmp_ocm: DEV ff960000.memory-controller (INTERRUPT) > [ 2.329022] sdhci: Secure Digital Host Controller Interface driver > [ 2.329028] sdhci: Copyright(c) Pierre Ossman > [ 2.329032] sdhci-pltfm: SDHCI platform and OF driver helper > [ 2.329372] ledtrig-cpu: registered to indicate activity on CPUs > [ 2.329463] SMCCC: SOC_ID: ARCH_SOC_ID not implemented, skipping .... > [ 2.329501] zynqmp_firmware_probe Platform Management API v1.1 > [ 2.329510] zynqmp_firmware_probe Trustzone version v1.0 > [ 2.359668] securefw securefw: securefw probed > [ 2.359886] alg: No test for xilinx-zynqmp-aes (zynqmp-aes) > [ 2.359905] zynqmp_aes firmware:zynqmp-firmware:zynqmp-aes: AES Successfully Registered > [ 2.360070] alg: No test for xilinx-keccak-384 (zynqmp-keccak-384) > [ 2.360247] alg: No test for xilinx-zynqmp-rsa (zynqmp-rsa) > [ 2.360389] usbcore: registered new interface driver usbhid > [ 2.360395] usbhid: USB HID core driver > [ 2.363052] fpga_manager fpga0: Xilinx ZynqMP FPGA Manager registered > [ 2.363387] usbcore: registered new interface driver snd-usb-audio > [ 2.364208] pktgen: Packet Generator for packet performance testing. Version: 2.75 > [ 2.364576] Initializing XFRM netlink socket > [ 2.364653] NET: Registered PF_INET6 protocol family > [ 2.365096] Segment Routing with IPv6 > [ 2.365114] In-situ OAM (IOAM) with IPv6 > [ 2.365163] sit: IPv6, IPv4 and MPLS over IPv4 tunneling driver > [ 2.365470] NET: Registered PF_PACKET protocol family > [ 2.365487] NET: Registered PF_KEY protocol family > [ 2.365507] can: controller area network core > [ 2.365536] NET: Registered PF_CAN protocol family > [ 2.365542] can: raw protocol > [ 2.365548] can: broadcast manager protocol > [ 2.365555] can: netlink gateway - max_hops=1 > [ 2.365624] Bluetooth: RFCOMM TTY layer initialized > [ 2.365634] Bluetooth: RFCOMM socket layer initialized > [ 2.365649] Bluetooth: RFCOMM ver 1.11 > [ 2.365658] Bluetooth: BNEP (Ethernet Emulation) ver 1.3 > [ 2.365664] Bluetooth: BNEP filters: protocol multicast > [ 2.365671] Bluetooth: BNEP socket layer initialized > [ 2.365676] Bluetooth: HIDP (Human Interface Emulation) ver 1.2 > [ 2.365683] Bluetooth: HIDP socket layer initialized > [ 2.365793] 9pnet: Installing 9P2000 support > [ 2.365811] Key type dns_resolver registered > [ 2.365915] registered taskstats version 1 > [ 2.365921] Loading compiled-in X.509 certificates > [ 2.366901] Btrfs loaded, crc32c=crc32c-generic, zoned=no, fsverity=no > [ 2.374985] ff000000.serial: ttyPS0 at MMIO 0xff000000 (irq = 47, base_baud = 6249999) is a xuartps > [ 3.675073] printk: console [ttyPS0] enabled > [ 3.680067] ff010000.serial: ttyPS1 at MMIO 0xff010000 (irq = 48, base_baud = 6249999) is a xuartps > [ 3.689389] of-fpga-region fpga-full: FPGA Region probed > [ 3.695960] nwl-pcie fd0e0000.pcie: host bridge /axi/pcie at fd0e0000 ranges: > [ 3.702858] nwl-pcie fd0e0000.pcie: MEM 0x00e0000000..0x00efffffff -> 0x00e0000000 > [ 3.710863] nwl-pcie fd0e0000.pcie: MEM 0x0600000000..0x07ffffffff -> 0x0600000000 > [ 3.718932] nwl-pcie fd0e0000.pcie: Link is DOWN > [ 3.723692] nwl-pcie fd0e0000.pcie: PCI host bridge to bus 0000:00 > [ 3.729868] pci_bus 0000:00: root bus resource [bus 00-ff] > [ 3.735353] pci_bus 0000:00: root bus resource [mem 0xe0000000-0xefffffff] > [ 3.742225] pci_bus 0000:00: root bus resource [mem 0x600000000-0x7ffffffff pref] > [ 3.749731] pci 0000:00:00.0: [10ee:d021] type 01 class 0x060400 > [ 3.755796] pci 0000:00:00.0: PME# supported from D0 D1 D2 D3hot > [ 3.765470] pci 0000:00:00.0: PCI bridge to [bus 01-0c] > [ 3.771018] xilinx-zynqmp-dma fd500000.dma-controller: ZynqMP DMA driver Probe success > [ 3.779096] xilinx-zynqmp-dma fd510000.dma-controller: ZynqMP DMA driver Probe success > [ 3.787168] xilinx-zynqmp-dma fd520000.dma-controller: ZynqMP DMA driver Probe success > [ 3.795240] xilinx-zynqmp-dma fd530000.dma-controller: ZynqMP DMA driver Probe success > [ 3.803315] xilinx-zynqmp-dma fd540000.dma-controller: ZynqMP DMA driver Probe success > [ 3.811381] xilinx-zynqmp-dma fd550000.dma-controller: ZynqMP DMA driver Probe success > [ 3.819459] xilinx-zynqmp-dma fd560000.dma-controller: ZynqMP DMA driver Probe success > [ 3.827528] xilinx-zynqmp-dma fd570000.dma-controller: ZynqMP DMA driver Probe success > [ 3.835850] xilinx-zynqmp-dpdma fd4c0000.dma-controller: Xilinx DPDMA engine is probed > [ 3.844554] spi-nor spi0.0: found n25q512a, expected m25p80 > [ 3.850649] spi-nor spi0.0: n25q512a (131072 Kbytes) > [ 3.855638] 4 fixed-partitions partitions found on MTD device spi0.0 > [ 3.861982] Creating 4 MTD partitions on "spi0.0": > [ 3.866765] 0x000000000000-0x000000100000 : "qspi-fsbl-uboot" > [ 3.873306] 0x000000100000-0x000000600000 : "qspi-linux" > [ 3.879305] 0x000000600000-0x000000620000 : "qspi-device-tree" > [ 3.885811] 0x000000620000-0x000000c00000 : "qspi-rootfs" > [ 3.894566] macb ff0e0000.ethernet: Not enabling partial store and forward > [ 3.902041] libphy: MACB_mii_bus: probed > [ 3.906625] macb ff0e0000.ethernet eth0: Cadence GEM rev 0x50070106 at 0xff0e0000 irq 30 (00:0a:35:03:6c:ca) > [ 3.916754] xilinx-axipmon ffa00000.perf-monitor: Probed Xilinx APM > [ 3.923298] xilinx-axipmon fd0b0000.perf-monitor: Probed Xilinx APM > [ 3.929802] xilinx-axipmon fd490000.perf-monitor: Probed Xilinx APM > [ 3.936303] xilinx-axipmon ffa10000.perf-monitor: Probed Xilinx APM > [ 3.943645] pca953x 0-0020: supply vcc not found, using dummy regulator > [ 3.950339] pca953x 0-0020: using no AI > [ 3.954846] gpio-318 (sel0): hogged as output/low > [ 3.959756] gpio-319 (sel1): hogged as output/high > [ 3.964755] gpio-320 (sel2): hogged as output/high > [ 3.969753] gpio-321 (sel3): hogged as output/high > [ 3.974906] pca953x 0-0021: supply vcc not found, using dummy regulator > [ 3.981575] pca953x 0-0021: using no AI > [ 3.994348] i2c i2c-0: Added multiplexed i2c bus 2 > [ 4.005627] i2c i2c-0: Added multiplexed i2c bus 3 > [ 4.021538] random: fast init done > [ 4.063343] i2c i2c-0: Added multiplexed i2c bus 4 > [ 4.068256] i2c i2c-0: Added multiplexed i2c bus 5 > [ 4.073051] pca954x 0-0075: registered 4 multiplexed busses for I2C mux pca9544 > [ 4.080406] cdns-i2c ff020000.i2c: 400 kHz mmio ff020000 irq 32 > [ 4.087774] at24 6-0054: supply vcc not found, using dummy regulator > [ 4.094661] at24 6-0054: 1024 byte 24c08 EEPROM, writable, 1 bytes/write > [ 4.101402] i2c i2c-1: Added multiplexed i2c bus 6 > [ 4.106723] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out > [ 4.114028] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out > [ 4.121333] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out > [ 4.128631] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out > [ 4.135932] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out > [ 4.143230] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out > [ 4.150532] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out > [ 4.157832] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out > [ 4.166228] si5341 7-0036: Chip: 5341 Grade: 1 Rev: 1 > [ 4.204262] i2c i2c-1: Added multiplexed i2c bus 7 > [ 4.211860] si570 8-005d: registered, current frequency 300000000 Hz > [ 4.218249] i2c i2c-1: Added multiplexed i2c bus 8 > [ 4.237968] si570 9-005d: registered, current frequency 148500000 Hz > [ 4.244356] i2c i2c-1: Added multiplexed i2c bus 9 > [ 4.249368] si5324 10-0069: si5328 probed > [ 4.316105] si5324 10-0069: si5328 probe successful > [ 4.321023] i2c i2c-1: Added multiplexed i2c bus 10 > [ 4.326009] i2c i2c-1: Added multiplexed i2c bus 11 > [ 4.331002] i2c i2c-1: Added multiplexed i2c bus 12 > [ 4.335995] i2c i2c-1: Added multiplexed i2c bus 13 > [ 4.340870] pca954x 1-0074: registered 8 multiplexed busses for I2C switch pca9548 > [ 4.348795] i2c i2c-1: Added multiplexed i2c bus 14 > [ 4.353797] i2c i2c-1: Added multiplexed i2c bus 15 > [ 4.358799] i2c i2c-1: Added multiplexed i2c bus 16 > [ 4.363811] i2c i2c-1: Added multiplexed i2c bus 17 > [ 4.368809] i2c i2c-1: Added multiplexed i2c bus 18 > [ 4.373819] i2c i2c-1: Added multiplexed i2c bus 19 > [ 4.378823] i2c i2c-1: Added multiplexed i2c bus 20 > [ 4.383828] i2c i2c-1: Added multiplexed i2c bus 21 > [ 4.388705] pca954x 1-0075: registered 8 multiplexed busses for I2C switch pca9548 > [ 4.396304] cdns-i2c ff030000.i2c: 400 kHz mmio ff030000 irq 33 > [ 4.406274] cdns-wdt fd4d0000.watchdog: Xilinx Watchdog Timer with timeout 60s > [ 4.415726] zynqmp-display fd4a0000.display: vtc bridge property not present > [ 4.424824] xilinx-dp-snd-codec fd4a0000.display:zynqmp_dp_snd_codec0: Xilinx DisplayPort Sound Codec probed > [ 4.434896] xilinx-dp-snd-pcm zynqmp_dp_snd_pcm0: Xilinx DisplayPort Sound PCM probed > [ 4.442954] xilinx-dp-snd-pcm zynqmp_dp_snd_pcm1: Xilinx DisplayPort Sound PCM probed > [ 4.448513] mmc0: SDHCI controller on ff170000.mmc [ff170000.mmc] using ADMA 64-bit > [ 4.459057] xilinx-dp-snd-card fd4a0000.display:zynqmp_dp_snd_card: Xilinx DisplayPort Sound Card probed > [ 4.468634] OF: graph: no port node found in /axi/display at fd4a0000 > [ 4.475120] xlnx-drm xlnx-drm.0: bound fd4a0000.display (ops 0xffffffc010e17fa0) > [ 4.482712] [drm] Initialized xlnx 1.0.0 20130509 for fd4a0000.display on minor 0 > [ 4.490206] zynqmp-display fd4a0000.display: ZynqMP DisplayPort Subsystem driver probed > [ 4.496962] mmc0: new high speed SDHC card at address aaaa > [ 4.498430] ahci-ceva fd0c0000.ahci: supply ahci not found, using dummy regulator > [ 4.511219] ahci-ceva fd0c0000.ahci: supply phy not found, using dummy regulator > [ 4.511379] mmcblk0: mmc0:aaaa SB16G 14.8 GiB > [ 4.518690] ahci-ceva fd0c0000.ahci: supply target not found, using dummy regulator > [ 4.527484] mmcblk0: p1 p2 > [ 4.540954] ahci-ceva fd0c0000.ahci: AHCI 0001.0301 32 slots 2 ports 6 Gbps 0x3 impl platform mode > [ 4.549923] ahci-ceva fd0c0000.ahci: flags: 64bit ncq sntf pm clo only pmp fbs pio slum part ccc sds apst > [ 4.560268] scsi host0: ahci-ceva > [ 4.563829] scsi host1: ahci-ceva > [ 4.567237] ata1: SATA max UDMA/133 mmio [mem 0xfd0c0000-0xfd0c1fff] port 0x100 irq 45 > [ 4.575152] ata2: SATA max UDMA/133 mmio [mem 0xfd0c0000-0xfd0c1fff] port 0x180 irq 45 > [ 4.605877] xhci-hcd xhci-hcd.1.auto: xHCI Host Controller > [ 4.611375] xhci-hcd xhci-hcd.1.auto: new USB bus registered, assigned bus number 1 > [ 4.619123] xhci-hcd xhci-hcd.1.auto: hcc params 0x0238f625 hci version 0x100 quirks 0x0000000002010810 > [ 4.628540] xhci-hcd xhci-hcd.1.auto: irq 53, io mem 0xfe200000 > [ 4.634549] xhci-hcd xhci-hcd.1.auto: xHCI Host Controller > [ 4.640035] xhci-hcd xhci-hcd.1.auto: new USB bus registered, assigned bus number 2 > [ 4.647692] xhci-hcd xhci-hcd.1.auto: Host supports USB 3.0 SuperSpeed > [ 4.654319] usb usb1: New USB device found, idVendor=1d6b, idProduct=0002, bcdDevice= 5.15 > [ 4.662582] usb usb1: New USB device strings: Mfr=3, Product=2, SerialNumber=1 > [ 4.669795] usb usb1: Product: xHCI Host Controller > [ 4.674664] usb usb1: Manufacturer: Linux 5.15.0 xhci-hcd > [ 4.680054] usb usb1: SerialNumber: xhci-hcd.1.auto > [ 4.685214] hub 1-0:1.0: USB hub found > [ 4.688988] hub 1-0:1.0: 1 port detected > [ 4.693202] usb usb2: New USB device found, idVendor=1d6b, idProduct=0003, bcdDevice= 5.15 > [ 4.701463] usb usb2: New USB device strings: Mfr=3, Product=2, SerialNumber=1 > [ 4.708682] usb usb2: Product: xHCI Host Controller > [ 4.713550] usb usb2: Manufacturer: Linux 5.15.0 xhci-hcd > [ 4.718944] usb usb2: SerialNumber: xhci-hcd.1.auto > [ 4.724075] hub 2-0:1.0: USB hub found > [ 4.727842] hub 2-0:1.0: 1 port detected > [ 4.734650] input: gpio-keys as /devices/platform/gpio-keys/input/input0 > [ 4.741660] of_cfs_init > [ 4.744131] of_cfs_init: OK > [ 4.747039] cfg80211: Loading compiled-in X.509 certificates for regulatory database > [ 4.881580] cfg80211: Loaded X.509 cert 'sforshee: 00b28ddf47aef9cea7' > [ 4.888214] zynqmp_pll_disable() clock disable failed for dpll_int, ret = -13 > [ 4.896228] platform regulatory.0: Direct firmware load for regulatory.db failed with error -2 > [ 4.897975] ata2: SATA link down (SStatus 0 SControl 330) > [ 4.904842] cfg80211: failed to load regulatory.db > [ 4.905622] ALSA device list: > [ 4.905626] #0: DisplayPort monitor > [ 4.910252] ata1: SATA link down (SStatus 0 SControl 330) > [ 4.950910] EXT4-fs (mmcblk0p2): mounted filesystem with ordered data mode. Opts: (null). Quota mode: none. > [ 4.960680] VFS: Mounted root (ext4 filesystem) on device 179:2. > [ 4.969332] devtmpfs: mounted > [ 4.972830] Freeing unused kernel memory: 1984K > [ 4.977453] Run /sbin/init as init process > [ 5.056434] EXT4-fs (mmcblk0p2): re-mounted. Opts: (null). Quota mode: none. > Starting syslogd: OK > Starting klogd: OK > Running sysctl: OK > Saving random seed: [ 5.105554] random: dd: uninitialized urandom read (512 bytes read) > OK > Starting network: OK > > Welcome to Buildroot > buildroot login: root > # > > Best regards, > Neal Frager > Xilinx > > From gwenj at trabucayre.com Tue Feb 8 16:24:08 2022 From: gwenj at trabucayre.com (Gwenhael Goavec-Merou) Date: Tue, 8 Feb 2022 17:24:08 +0100 Subject: [Buildroot] [PATCH 1/2] package/volk: new package Message-ID: <20220208162409.496110-1-gwenj@trabucayre.com> From: Gwenhael Goavec-Merou VOLK is the Vector-Optimized Library of Kernels Signed-off-by: Gwenhael Goavec-Merou --- DEVELOPERS | 1 + package/Config.in | 1 + package/volk/Config.in | 31 +++++++++++++++++++++++++++++++ package/volk/volk.hash | 3 +++ package/volk/volk.mk | 39 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 75 insertions(+) create mode 100644 package/volk/Config.in create mode 100644 package/volk/volk.hash create mode 100644 package/volk/volk.mk diff --git a/DEVELOPERS b/DEVELOPERS index 1d1cf99898..c8a9b87c47 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1181,6 +1181,7 @@ F: package/python-markdown/ F: package/python-remi/ F: package/python-sip/ F: package/uhd/ +F: package/volk/ N: Heiko Thiery F: board/kontron/pitx-imx8m/ diff --git a/package/Config.in b/package/Config.in index d631ed784a..c0353829a3 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2062,6 +2062,7 @@ endif source "package/tz/Config.in" source "package/tzdata/Config.in" source "package/uvw/Config.in" + source "package/volk/Config.in" source "package/xapian/Config.in" endmenu diff --git a/package/volk/Config.in b/package/volk/Config.in new file mode 100644 index 0000000000..4539cd2153 --- /dev/null +++ b/package/volk/Config.in @@ -0,0 +1,31 @@ +comment "volk needs a toolchain w/ C++, NPTL, wchar, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS + +config BR2_PACKAGE_VOLK + bool "volk" + depends on BR2_INSTALL_LIBSTDCPP + depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL + depends on BR2_USE_MMU # use fork() + depends on BR2_USE_WCHAR # boost + select BR2_PACKAGE_BOOST + select BR2_PACKAGE_BOOST_FILESYSTEM + select BR2_PACKAGE_BOOST_SYSTEM + help + VOLK is the Vector-Optimized Library of Kernels. It is a + library that contains kernels of hand-written SIMD code + for different mathematical operations. Since each SIMD + architecture can be very different and no compiler has yet + come along to handle vectorization properly or highly + efficiently, VOLK approaches the problem differently. + + For each architecture or platform that a developer wishes + to vectorize for, a new proto-kernel is added to VOLK. At + runtime, VOLK will select the correct proto-kernel. In this + way, the users of VOLK call a kernel for performing the + operation that is platform/architecture agnostic. This + allows us to write portable SIMD code. + + https://www.libvolk.org/ diff --git a/package/volk/volk.hash b/package/volk/volk.hash new file mode 100644 index 0000000000..9fca6c1b33 --- /dev/null +++ b/package/volk/volk.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 d9183b9f86a32cdbb8698cbbeb15de574962c05200ccf445c1058629073521f8 volk-2.5.0.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/volk/volk.mk b/package/volk/volk.mk new file mode 100644 index 0000000000..cdb0ea9a77 --- /dev/null +++ b/package/volk/volk.mk @@ -0,0 +1,39 @@ +################################################################################ +# +# volk +# +################################################################################ + +VOLK_VERSION = 2.5.0 +VOLK_SITE = https://github.com/gnuradio/volk/releases/download/v$(VOLK_VERSION) +VOLK_LICENSE = GPL-3.0+ +VOLK_LICENSE_FILES = COPYING + +VOLK_SUPPORTS_IN_SOURCE_BUILD = NO + +# host-python-mako are needed for volk to compile +VOLK_DEPENDENCIES = host-python3 host-python-mako boost + +VOLK_CONF_OPTS = \ + -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 \ + -DENABLE_MODTOOL=OFF \ + -DENABLE_TESTING=OFF \ + -DENABLE_PROFILING=OFF \ + -DVOLK_PYTHON_DIR=lib/python$(PYTHON3_VERSION_MAJOR)/site-packages + +# For third-party blocks, the volk library is mandatory at +# compile time. +VOLK_INSTALL_STAGING = YES + +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +VOLK_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic +endif + +ifeq ($(BR2_PACKAGE_ORC),y) +VOLK_DEPENDENCIES += orc +VOLK_CONF_OPTS += -DENABLE_ORC=ON +else +VOLK_CONF_OPTS += -DENABLE_ORC=OFF +endif + +$(eval $(cmake-package)) -- 2.34.1 From gwenj at trabucayre.com Tue Feb 8 16:24:09 2022 From: gwenj at trabucayre.com (Gwenhael Goavec-Merou) Date: Tue, 8 Feb 2022 17:24:09 +0100 Subject: [Buildroot] [PATCH 2/2] package/gnuradio: move to package/volk instead of using the internal one In-Reply-To: <20220208162409.496110-1-gwenj@trabucayre.com> References: <20220208162409.496110-1-gwenj@trabucayre.com> Message-ID: <20220208162409.496110-2-gwenj@trabucayre.com> From: Gwenhael Goavec-Merou Until recent releases GNURadio was shipped with volk as a submodule. With 3.9 and 3.10 this is no more true and requires building volk before GNURadio. This patch disable internal's volk, and add a dependency to the corresponding package, to use inconditionnaly the one build by buildroot Signed-off-by: Gwenhael Goavec-Merou --- package/gnuradio/Config.in | 1 + package/gnuradio/gnuradio.mk | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/package/gnuradio/Config.in b/package/gnuradio/Config.in index 1896d1326a..103175946c 100644 --- a/package/gnuradio/Config.in +++ b/package/gnuradio/Config.in @@ -28,6 +28,7 @@ config BR2_PACKAGE_GNURADIO select BR2_PACKAGE_BOOST_THREAD select BR2_PACKAGE_LOG4CPP select BR2_PACKAGE_GMP + select BR2_PACKAGE_VOLK help GNU Radio is a free & open-source software development toolkit that provides signal processing blocks to implement diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index 417a51e067..ed7060b85c 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -19,13 +19,15 @@ GNURADIO_DEPENDENCIES = \ host-swig \ boost \ log4cpp \ - gmp + gmp \ + volk GNURADIO_CONF_OPTS = \ -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 \ -DENABLE_DEFAULT=OFF \ -DENABLE_VOLK=ON \ -DENABLE_GNURADIO_RUNTIME=ON \ + -DENABLE_INTERNAL_VOLK=OFF \ -DENABLE_TESTING=OFF \ -DXMLTO_EXECUTABLE=NOTFOUND -- 2.34.1 From nealf at xilinx.com Tue Feb 8 16:31:17 2022 From: nealf at xilinx.com (Neal Frager) Date: Tue, 8 Feb 2022 16:31:17 +0000 Subject: [Buildroot] Xilinx mainline ATF v2.6 In-Reply-To: <11BB5427-9C48-4116-AECB-EA33631B3519@benettiengineering.com> References: <11BB5427-9C48-4116-AECB-EA33631B3519@benettiengineering.com> Message-ID: Hi Giulio, > Thanks a lot for testing runtime. > It should be merged soon as you can see from gerrit :-) Excellent news! I added a comment to gerrit which should only help. > > ------ > > U-Boot SPL 2022.01 (Feb 08 2022 - 15:18:47 +0000) > PMUFW: v1.1 > Loading new PMUFW cfg obj (2200 bytes) > Silicon version: 3 > EL Level: EL3 > Chip ID: zu9eg > Multiboot: 0 > Trying to boot from MMC2 > spl: could not initialize mmc. error: -19 Trying to boot from MMC1 > spl_load_image_fat_os: error reading image u-boot.bin, err - -2 > NOTICE: TF-A running on XCZU9EG/silicon at 0xfffea000 > NOTICE: BL31: v2.6(release):2021.11-1539-gba7dbc88c5-dirty > NOTICE: BL31: Built : 15:15:15, Feb 8 2022 > > > U-Boot 2022.01 (Feb 08 2022 - 15:18:47 +0000) > > CPU: ZynqMP > Silicon: v3 > Model: ZynqMP ZCU102 Rev1.0 > Board: Xilinx ZynqMP > DRAM: 4 GiB > PMUFW: v1.1 > Xilinx I2C Legacy format at nvmem0: > Board name: zcu102 > Board rev: 1.0 > Board SN: 847318611722-66244 > Ethernet mac: 00:0a:35:03:6c:ca > EL Level: EL2 > Chip ID: zu9eg > NAND: 0 MiB > MMC: mmc at ff170000: 0 > Loading Environment from FAT... *** Error - No Valid Environment Area found > *** Warning - bad env area, using default environment > > In: serial > Out: serial > Err: serial > Bootmode: LVL_SHFT_SD_MODE1 > Reset reason: EXTERNAL > Net: > ZYNQ GEM: ff0e0000, mdio bus ff0e0000, phyaddr 12, interface rgmii-id > eth0: ethernet at ff0e0000 > scanning bus for devices... > SATA link 0 timeout. > SATA link 1 timeout. > AHCI 0001.0301 32 slots 2 ports 6 Gbps 0x3 impl SATA mode > flags: 64bit ncq pm clo only pmp fbss pio slum part ccc apst > starting USB... > Bus usb at fe200000: Register 2000440 NbrPorts 2 > Starting the controller > USB XHCI 1.00 > scanning bus usb at fe200000 for devices... 1 USB Device(s) found > scanning usb for storage devices... 0 Storage Device(s) found > Hit any key to stop autoboot: 0 > switch to partitions #0, OK > mmc0 is current device > Scanning mmc 0:1... > Found /extlinux/extlinux.conf > Retrieving file: /extlinux/extlinux.conf > 1: linux > Retrieving file: /Image > append: console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait > Retrieving file: /system.dtb > ## Flattened Device Tree blob at 40000000 > Booting using the fdt blob at 0x40000000 > Loading Device Tree to 000000007bdf5000, end 000000007be01d46 ... OK > > Starting kernel ... > > [ 0.000000] Booting Linux on physical CPU 0x0000000000 [0x410fd034] > [ 0.000000] Linux version 5.15.0 (nealf at xirengwts08) (aarch64-buildroot-linux-uclibc-gcc.br_real (Buildroot 2021.11-1539-gba7dbc88c5) 10.3.0, GNU ld (GNU Binutils) 2.36.1) #1 SMP Tue Feb 8 09:42:51 GMT 2022 > [ 0.000000] Machine model: ZynqMP ZCU102 Rev1.0 > [ 0.000000] efi: UEFI not found. > [ 0.000000] Zone ranges: > [ 0.000000] DMA32 [mem 0x0000000000000000-0x00000000ffffffff] > [ 0.000000] Normal [mem 0x0000000100000000-0x000000087fffffff] > [ 0.000000] Movable zone start for each node > [ 0.000000] Early memory node ranges > [ 0.000000] node 0: [mem 0x0000000000000000-0x000000007fffffff] > [ 0.000000] node 0: [mem 0x0000000800000000-0x000000087fffffff] > [ 0.000000] Initmem setup node 0 [mem 0x0000000000000000-0x000000087fffffff] > [ 0.000000] cma: Reserved 256 MiB at 0x000000006bc00000 > [ 0.000000] psci: probing for conduit method from DT. > [ 0.000000] psci: PSCIv1.1 detected in firmware. > [ 0.000000] psci: Using standard PSCI v0.2 function IDs > [ 0.000000] psci: MIGRATE_INFO_TYPE not supported. > [ 0.000000] psci: SMC Calling Convention v1.2 > [ 0.000000] percpu: Embedded 18 pages/cpu s33048 r8192 d32488 u73728 > [ 0.000000] Detected VIPT I-cache on CPU0 > [ 0.000000] CPU features: detected: ARM erratum 845719 > [ 0.000000] Built 1 zonelists, mobility grouping on. Total pages: 1034240 > [ 0.000000] Kernel command line: console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait > [ 0.000000] Dentry cache hash table entries: 524288 (order: 10, 4194304 bytes, linear) > [ 0.000000] Inode-cache hash table entries: 262144 (order: 9, 2097152 bytes, linear) > [ 0.000000] mem auto-init: stack:off, heap alloc:off, heap free:off > [ 0.000000] software IO TLB: mapped [mem 0x000000007c000000-0x0000000080000000] (64MB) > [ 0.000000] Memory: 3772784K/4194304K available (13568K kernel code, 904K rwdata, 3864K rodata, 1984K init, 306K bss, 159376K reserved, 262144K cma-reserved) > [ 0.000000] rcu: Hierarchical RCU implementation. > [ 0.000000] rcu: RCU event tracing is enabled. > [ 0.000000] rcu: RCU calculated value of scheduler-enlistment delay is 25 jiffies. > [ 0.000000] NR_IRQS: 64, nr_irqs: 64, preallocated irqs: 0 > [ 0.000000] GIC: Adjusting CPU interface base to 0x00000000f902f000 > [ 0.000000] Root IRQ handler: gic_handle_irq > [ 0.000000] GIC: Using split EOI/Deactivate mode > [ 0.000000] random: get_random_bytes called from start_kernel+0x470/0x6f8 with crng_init=0 > [ 0.000000] arch_timer: cp15 timer(s) running at 100.00MHz (phys). > [ 0.000000] clocksource: arch_sys_counter: mask: 0xffffffffffffff max_cycles: 0x171024e7e0, max_idle_ns: 440795205315 ns > [ 0.000000] sched_clock: 56 bits at 100MHz, resolution 10ns, wraps every 4398046511100ns > [ 0.000302] Console: colour dummy device 80x25 > [ 0.000335] Calibrating delay loop (skipped), value calculated using timer frequency.. 200.00 BogoMIPS (lpj=400000) > [ 0.000346] pid_max: default: 32768 minimum: 301 > [ 0.000454] Mount-cache hash table entries: 8192 (order: 4, 65536 bytes, linear) > [ 0.000474] Mountpoint-cache hash table entries: 8192 (order: 4, 65536 bytes, linear) > [ 0.001288] rcu: Hierarchical SRCU implementation. > [ 0.001556] EFI services will not be available. > [ 0.001681] smp: Bringing up secondary CPUs ... > [ 0.002000] Detected VIPT I-cache on CPU1 > [ 0.002037] CPU1: Booted secondary processor 0x0000000001 [0x410fd034] > [ 0.002399] Detected VIPT I-cache on CPU2 > [ 0.002422] CPU2: Booted secondary processor 0x0000000002 [0x410fd034] > [ 0.002749] Detected VIPT I-cache on CPU3 > [ 0.002771] CPU3: Booted secondary processor 0x0000000003 [0x410fd034] > [ 0.002814] smp: Brought up 1 node, 4 CPUs > [ 0.002831] SMP: Total of 4 processors activated. > [ 0.002836] CPU features: detected: 32-bit EL0 Support > [ 0.002842] CPU features: detected: CRC32 instructions > [ 0.002883] CPU: All CPU(s) started at EL2 > [ 0.002898] alternatives: patching kernel code > [ 0.003949] devtmpfs: initialized > [ 0.009573] clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 7645041785100000 ns > [ 0.009592] futex hash table entries: 1024 (order: 4, 65536 bytes, linear) > [ 0.017450] pinctrl core: initialized pinctrl subsystem > [ 0.018081] NET: Registered PF_NETLINK/PF_ROUTE protocol family > [ 0.019062] DMA: preallocated 512 KiB GFP_KERNEL pool for atomic allocations > [ 0.019156] DMA: preallocated 512 KiB GFP_KERNEL|GFP_DMA32 pool for atomic allocations > [ 0.019193] audit: initializing netlink subsys (disabled) > [ 0.019268] audit: type=2000 audit(0.016:1): state=initialized audit_enabled=0 res=1 > [ 0.019561] hw-breakpoint: found 6 breakpoint and 4 watchpoint registers. > [ 0.019621] ASID allocator initialised with 65536 entries > [ 0.037594] HugeTLB registered 1.00 GiB page size, pre-allocated 0 pages > [ 0.037607] HugeTLB registered 32.0 MiB page size, pre-allocated 0 pages > [ 0.037614] HugeTLB registered 2.00 MiB page size, pre-allocated 0 pages > [ 0.037620] HugeTLB registered 64.0 KiB page size, pre-allocated 0 pages > [ 1.102226] DRBG: Continuing without Jitter RNG > [ 1.204763] raid6: neonx8 gen() 2139 MB/s > [ 1.272812] raid6: neonx8 xor() 1593 MB/s > [ 1.340871] raid6: neonx4 gen() 2187 MB/s > [ 1.408916] raid6: neonx4 xor() 1576 MB/s > [ 1.476978] raid6: neonx2 gen() 2068 MB/s > [ 1.545028] raid6: neonx2 xor() 1447 MB/s > [ 1.613093] raid6: neonx1 gen() 1803 MB/s > [ 1.681147] raid6: neonx1 xor() 1240 MB/s > [ 1.749207] raid6: int64x8 gen() 1471 MB/s > [ 1.817250] raid6: int64x8 xor() 785 MB/s > [ 1.885312] raid6: int64x4 gen() 1557 MB/s > [ 1.953371] raid6: int64x4 xor() 842 MB/s > [ 2.021437] raid6: int64x2 gen() 1396 MB/s > [ 2.089488] raid6: int64x2 xor() 750 MB/s > [ 2.157543] raid6: int64x1 gen() 1186 MB/s > [ 2.225599] raid6: int64x1 xor() 596 MB/s > [ 2.225604] raid6: using algorithm neonx4 gen() 2187 MB/s > [ 2.225610] raid6: .... xor() 1576 MB/s, rmw enabled > [ 2.225615] raid6: using neon recovery algorithm > [ 2.225994] iommu: Default domain type: Translated > [ 2.226001] iommu: DMA domain TLB invalidation policy: strict mode > [ 2.226220] SCSI subsystem initialized > [ 2.226362] usbcore: registered new interface driver usbfs > [ 2.226390] usbcore: registered new interface driver hub > [ 2.226417] usbcore: registered new device driver usb > [ 2.226469] mc: Linux media interface: v0.10 > [ 2.226488] videodev: Linux video capture interface: v2.00 > [ 2.226525] pps_core: LinuxPPS API ver. 1 registered > [ 2.226531] pps_core: Software ver. 5.3.6 - Copyright 2005-2007 Rodolfo Giometti > [ 2.226543] PTP clock support registered > [ 2.226569] EDAC MC: Ver: 3.0.0 > [ 2.226852] zynqmp-ipi-mbox mailbox at ff990400: Registered ZynqMP IPI mbox with TX/RX channels. > [ 2.227040] FPGA manager framework > [ 2.227166] Advanced Linux Sound Architecture Driver Initialized. > [ 2.227447] Bluetooth: Core ver 2.22 > [ 2.227471] NET: Registered PF_BLUETOOTH protocol family > [ 2.227476] Bluetooth: HCI device and connection manager initialized > [ 2.227485] Bluetooth: HCI socket layer initialized > [ 2.227491] Bluetooth: L2CAP socket layer initialized > [ 2.227502] Bluetooth: SCO socket layer initialized > [ 2.227789] clocksource: Switched to clocksource arch_sys_counter > [ 2.227887] VFS: Disk quotas dquot_6.6.0 > [ 2.227926] VFS: Dquot-cache hash table entries: 512 (order 0, 4096 bytes) > [ 2.231840] NET: Registered PF_INET protocol family > [ 2.231964] IP idents hash table entries: 65536 (order: 7, 524288 bytes, linear) > [ 2.233486] tcp_listen_portaddr_hash hash table entries: 2048 (order: 3, 32768 bytes, linear) > [ 2.233533] TCP established hash table entries: 32768 (order: 6, 262144 bytes, linear) > [ 2.233739] TCP bind hash table entries: 32768 (order: 7, 524288 bytes, linear) > [ 2.234123] TCP: Hash tables configured (established 32768 bind 32768) > [ 2.234190] UDP hash table entries: 2048 (order: 4, 65536 bytes, linear) > [ 2.234266] UDP-Lite hash table entries: 2048 (order: 4, 65536 bytes, linear) > [ 2.234416] NET: Registered PF_UNIX/PF_LOCAL protocol family > [ 2.234703] RPC: Registered named UNIX socket transport module. > [ 2.234710] RPC: Registered udp transport module. > [ 2.234714] RPC: Registered tcp transport module. > [ 2.234719] RPC: Registered tcp NFSv4.1 backchannel transport module. > [ 2.235305] PCI: CLS 0 bytes, default 64 > [ 2.235585] armv8-pmu pmu: hw perfevents: no interrupt-affinity property, guessing. > [ 2.235747] hw perfevents: enabled with armv8_pmuv3 PMU driver, 7 counters available > [ 2.236543] Initialise system trusted keyrings > [ 2.236640] workingset: timestamp_bits=62 max_order=20 bucket_order=0 > [ 2.237202] NFS: Registering the id_resolver key type > [ 2.237216] Key type id_resolver registered > [ 2.237221] Key type id_legacy registered > [ 2.237237] nfs4filelayout_init: NFSv4 File Layout Driver Registering... > [ 2.237244] nfs4flexfilelayout_init: NFSv4 Flexfile Layout Driver Registering... > [ 2.237261] jffs2: version 2.2. (NAND) ?? 2001-2006 Red Hat, Inc. > [ 2.273306] NET: Registered PF_ALG protocol family > [ 2.273320] xor: measuring software checksum speed > [ 2.277366] 8regs : 2438 MB/sec > [ 2.280888] 32regs : 2800 MB/sec > [ 2.285157] arm64_neon : 2309 MB/sec > [ 2.285163] xor: using function: 32regs (2800 MB/sec) > [ 2.285170] Key type asymmetric registered > [ 2.285175] Asymmetric key parser 'x509' registered > [ 2.285211] Block layer SCSI generic (bsg) driver version 0.4 loaded (major 245) > [ 2.285218] io scheduler mq-deadline registered > [ 2.285223] io scheduler kyber registered > [ 2.309790] Serial: 8250/16550 driver, 4 ports, IRQ sharing disabled > [ 2.313198] cacheinfo: Unable to detect cache hierarchy for CPU 0 > [ 2.317134] brd: module loaded > [ 2.320288] loop: module loaded > [ 2.321033] mtdoops: mtd device (mtddev=name/number) must be supplied > [ 2.322271] libphy: Fixed MDIO Bus: probed > [ 2.323366] tun: Universal TUN/TAP device driver, 1.6 > [ 2.323447] CAN device driver interface > [ 2.324182] usbcore: registered new interface driver asix > [ 2.324219] usbcore: registered new interface driver ax88179_178a > [ 2.324244] usbcore: registered new interface driver cdc_ether > [ 2.324266] usbcore: registered new interface driver net1080 > [ 2.324287] usbcore: registered new interface driver cdc_subset > [ 2.324310] usbcore: registered new interface driver zaurus > [ 2.324342] usbcore: registered new interface driver cdc_ncm > [ 2.325046] usbcore: registered new interface driver uas > [ 2.325077] usbcore: registered new interface driver usb-storage > [ 2.325704] rtc_zynqmp ffa60000.rtc: registered as rtc0 > [ 2.325721] rtc_zynqmp ffa60000.rtc: setting system clock to 2021-01-25T16:34:35 UTC (1611592475) > [ 2.325789] i2c_dev: i2c /dev entries driver > [ 2.327253] usbcore: registered new interface driver uvcvideo > [ 2.328075] Bluetooth: HCI UART driver ver 2.3 > [ 2.328082] Bluetooth: HCI UART protocol H4 registered > [ 2.328088] Bluetooth: HCI UART protocol BCSP registered > [ 2.328106] Bluetooth: HCI UART protocol LL registered > [ 2.328112] Bluetooth: HCI UART protocol ATH3K registered > [ 2.328128] Bluetooth: HCI UART protocol Three-wire (H5) registered > [ 2.328166] Bluetooth: HCI UART protocol Intel registered > [ 2.328182] Bluetooth: HCI UART protocol QCA registered > [ 2.328211] usbcore: registered new interface driver bcm203x > [ 2.328237] usbcore: registered new interface driver bpa10x > [ 2.328262] usbcore: registered new interface driver bfusb > [ 2.328287] usbcore: registered new interface driver btusb > [ 2.328324] usbcore: registered new interface driver ath3k > [ 2.328397] EDAC MC: ECC not enabled > [ 2.328531] EDAC DEVICE0: Giving out device to module edac controller cache_err: DEV edac (POLLED) > [ 2.328682] EDAC DEVICE1: Giving out device to module zynqmp-ocm-edac controller zynqmp_ocm: DEV ff960000.memory-controller (INTERRUPT) > [ 2.329022] sdhci: Secure Digital Host Controller Interface driver > [ 2.329028] sdhci: Copyright(c) Pierre Ossman > [ 2.329032] sdhci-pltfm: SDHCI platform and OF driver helper > [ 2.329372] ledtrig-cpu: registered to indicate activity on CPUs > [ 2.329463] SMCCC: SOC_ID: ARCH_SOC_ID not implemented, skipping .... > [ 2.329501] zynqmp_firmware_probe Platform Management API v1.1 > [ 2.329510] zynqmp_firmware_probe Trustzone version v1.0 > [ 2.359668] securefw securefw: securefw probed > [ 2.359886] alg: No test for xilinx-zynqmp-aes (zynqmp-aes) > [ 2.359905] zynqmp_aes firmware:zynqmp-firmware:zynqmp-aes: AES Successfully Registered > [ 2.360070] alg: No test for xilinx-keccak-384 (zynqmp-keccak-384) > [ 2.360247] alg: No test for xilinx-zynqmp-rsa (zynqmp-rsa) > [ 2.360389] usbcore: registered new interface driver usbhid > [ 2.360395] usbhid: USB HID core driver > [ 2.363052] fpga_manager fpga0: Xilinx ZynqMP FPGA Manager registered > [ 2.363387] usbcore: registered new interface driver snd-usb-audio > [ 2.364208] pktgen: Packet Generator for packet performance testing. Version: 2.75 > [ 2.364576] Initializing XFRM netlink socket > [ 2.364653] NET: Registered PF_INET6 protocol family > [ 2.365096] Segment Routing with IPv6 > [ 2.365114] In-situ OAM (IOAM) with IPv6 > [ 2.365163] sit: IPv6, IPv4 and MPLS over IPv4 tunneling driver > [ 2.365470] NET: Registered PF_PACKET protocol family > [ 2.365487] NET: Registered PF_KEY protocol family > [ 2.365507] can: controller area network core > [ 2.365536] NET: Registered PF_CAN protocol family > [ 2.365542] can: raw protocol > [ 2.365548] can: broadcast manager protocol > [ 2.365555] can: netlink gateway - max_hops=1 > [ 2.365624] Bluetooth: RFCOMM TTY layer initialized > [ 2.365634] Bluetooth: RFCOMM socket layer initialized > [ 2.365649] Bluetooth: RFCOMM ver 1.11 > [ 2.365658] Bluetooth: BNEP (Ethernet Emulation) ver 1.3 > [ 2.365664] Bluetooth: BNEP filters: protocol multicast > [ 2.365671] Bluetooth: BNEP socket layer initialized > [ 2.365676] Bluetooth: HIDP (Human Interface Emulation) ver 1.2 > [ 2.365683] Bluetooth: HIDP socket layer initialized > [ 2.365793] 9pnet: Installing 9P2000 support > [ 2.365811] Key type dns_resolver registered > [ 2.365915] registered taskstats version 1 > [ 2.365921] Loading compiled-in X.509 certificates > [ 2.366901] Btrfs loaded, crc32c=crc32c-generic, zoned=no, fsverity=no > [ 2.374985] ff000000.serial: ttyPS0 at MMIO 0xff000000 (irq = 47, base_baud = 6249999) is a xuartps > [ 3.675073] printk: console [ttyPS0] enabled > [ 3.680067] ff010000.serial: ttyPS1 at MMIO 0xff010000 (irq = 48, base_baud = 6249999) is a xuartps > [ 3.689389] of-fpga-region fpga-full: FPGA Region probed > [ 3.695960] nwl-pcie fd0e0000.pcie: host bridge /axi/pcie at fd0e0000 ranges: > [ 3.702858] nwl-pcie fd0e0000.pcie: MEM 0x00e0000000..0x00efffffff -> 0x00e0000000 > [ 3.710863] nwl-pcie fd0e0000.pcie: MEM 0x0600000000..0x07ffffffff -> 0x0600000000 > [ 3.718932] nwl-pcie fd0e0000.pcie: Link is DOWN > [ 3.723692] nwl-pcie fd0e0000.pcie: PCI host bridge to bus 0000:00 > [ 3.729868] pci_bus 0000:00: root bus resource [bus 00-ff] > [ 3.735353] pci_bus 0000:00: root bus resource [mem 0xe0000000-0xefffffff] > [ 3.742225] pci_bus 0000:00: root bus resource [mem 0x600000000-0x7ffffffff pref] > [ 3.749731] pci 0000:00:00.0: [10ee:d021] type 01 class 0x060400 > [ 3.755796] pci 0000:00:00.0: PME# supported from D0 D1 D2 D3hot > [ 3.765470] pci 0000:00:00.0: PCI bridge to [bus 01-0c] > [ 3.771018] xilinx-zynqmp-dma fd500000.dma-controller: ZynqMP DMA driver Probe success > [ 3.779096] xilinx-zynqmp-dma fd510000.dma-controller: ZynqMP DMA driver Probe success > [ 3.787168] xilinx-zynqmp-dma fd520000.dma-controller: ZynqMP DMA driver Probe success > [ 3.795240] xilinx-zynqmp-dma fd530000.dma-controller: ZynqMP DMA driver Probe success > [ 3.803315] xilinx-zynqmp-dma fd540000.dma-controller: ZynqMP DMA driver Probe success > [ 3.811381] xilinx-zynqmp-dma fd550000.dma-controller: ZynqMP DMA driver Probe success > [ 3.819459] xilinx-zynqmp-dma fd560000.dma-controller: ZynqMP DMA driver Probe success > [ 3.827528] xilinx-zynqmp-dma fd570000.dma-controller: ZynqMP DMA driver Probe success > [ 3.835850] xilinx-zynqmp-dpdma fd4c0000.dma-controller: Xilinx DPDMA engine is probed > [ 3.844554] spi-nor spi0.0: found n25q512a, expected m25p80 > [ 3.850649] spi-nor spi0.0: n25q512a (131072 Kbytes) > [ 3.855638] 4 fixed-partitions partitions found on MTD device spi0.0 > [ 3.861982] Creating 4 MTD partitions on "spi0.0": > [ 3.866765] 0x000000000000-0x000000100000 : "qspi-fsbl-uboot" > [ 3.873306] 0x000000100000-0x000000600000 : "qspi-linux" > [ 3.879305] 0x000000600000-0x000000620000 : "qspi-device-tree" > [ 3.885811] 0x000000620000-0x000000c00000 : "qspi-rootfs" > [ 3.894566] macb ff0e0000.ethernet: Not enabling partial store and forward > [ 3.902041] libphy: MACB_mii_bus: probed > [ 3.906625] macb ff0e0000.ethernet eth0: Cadence GEM rev 0x50070106 at 0xff0e0000 irq 30 (00:0a:35:03:6c:ca) > [ 3.916754] xilinx-axipmon ffa00000.perf-monitor: Probed Xilinx APM > [ 3.923298] xilinx-axipmon fd0b0000.perf-monitor: Probed Xilinx APM > [ 3.929802] xilinx-axipmon fd490000.perf-monitor: Probed Xilinx APM > [ 3.936303] xilinx-axipmon ffa10000.perf-monitor: Probed Xilinx APM > [ 3.943645] pca953x 0-0020: supply vcc not found, using dummy regulator > [ 3.950339] pca953x 0-0020: using no AI > [ 3.954846] gpio-318 (sel0): hogged as output/low > [ 3.959756] gpio-319 (sel1): hogged as output/high > [ 3.964755] gpio-320 (sel2): hogged as output/high > [ 3.969753] gpio-321 (sel3): hogged as output/high > [ 3.974906] pca953x 0-0021: supply vcc not found, using dummy regulator > [ 3.981575] pca953x 0-0021: using no AI > [ 3.994348] i2c i2c-0: Added multiplexed i2c bus 2 > [ 4.005627] i2c i2c-0: Added multiplexed i2c bus 3 > [ 4.021538] random: fast init done > [ 4.063343] i2c i2c-0: Added multiplexed i2c bus 4 > [ 4.068256] i2c i2c-0: Added multiplexed i2c bus 5 > [ 4.073051] pca954x 0-0075: registered 4 multiplexed busses for I2C mux pca9544 > [ 4.080406] cdns-i2c ff020000.i2c: 400 kHz mmio ff020000 irq 32 > [ 4.087774] at24 6-0054: supply vcc not found, using dummy regulator > [ 4.094661] at24 6-0054: 1024 byte 24c08 EEPROM, writable, 1 bytes/write > [ 4.101402] i2c i2c-1: Added multiplexed i2c bus 6 > [ 4.106723] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out > [ 4.114028] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out > [ 4.121333] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out > [ 4.128631] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out > [ 4.135932] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out > [ 4.143230] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out > [ 4.150532] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out > [ 4.157832] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out > [ 4.166228] si5341 7-0036: Chip: 5341 Grade: 1 Rev: 1 > [ 4.204262] i2c i2c-1: Added multiplexed i2c bus 7 > [ 4.211860] si570 8-005d: registered, current frequency 300000000 Hz > [ 4.218249] i2c i2c-1: Added multiplexed i2c bus 8 > [ 4.237968] si570 9-005d: registered, current frequency 148500000 Hz > [ 4.244356] i2c i2c-1: Added multiplexed i2c bus 9 > [ 4.249368] si5324 10-0069: si5328 probed > [ 4.316105] si5324 10-0069: si5328 probe successful > [ 4.321023] i2c i2c-1: Added multiplexed i2c bus 10 > [ 4.326009] i2c i2c-1: Added multiplexed i2c bus 11 > [ 4.331002] i2c i2c-1: Added multiplexed i2c bus 12 > [ 4.335995] i2c i2c-1: Added multiplexed i2c bus 13 > [ 4.340870] pca954x 1-0074: registered 8 multiplexed busses for I2C switch pca9548 > [ 4.348795] i2c i2c-1: Added multiplexed i2c bus 14 > [ 4.353797] i2c i2c-1: Added multiplexed i2c bus 15 > [ 4.358799] i2c i2c-1: Added multiplexed i2c bus 16 > [ 4.363811] i2c i2c-1: Added multiplexed i2c bus 17 > [ 4.368809] i2c i2c-1: Added multiplexed i2c bus 18 > [ 4.373819] i2c i2c-1: Added multiplexed i2c bus 19 > [ 4.378823] i2c i2c-1: Added multiplexed i2c bus 20 > [ 4.383828] i2c i2c-1: Added multiplexed i2c bus 21 > [ 4.388705] pca954x 1-0075: registered 8 multiplexed busses for I2C switch pca9548 > [ 4.396304] cdns-i2c ff030000.i2c: 400 kHz mmio ff030000 irq 33 > [ 4.406274] cdns-wdt fd4d0000.watchdog: Xilinx Watchdog Timer with timeout 60s > [ 4.415726] zynqmp-display fd4a0000.display: vtc bridge property not present > [ 4.424824] xilinx-dp-snd-codec fd4a0000.display:zynqmp_dp_snd_codec0: Xilinx DisplayPort Sound Codec probed > [ 4.434896] xilinx-dp-snd-pcm zynqmp_dp_snd_pcm0: Xilinx DisplayPort Sound PCM probed > [ 4.442954] xilinx-dp-snd-pcm zynqmp_dp_snd_pcm1: Xilinx DisplayPort Sound PCM probed > [ 4.448513] mmc0: SDHCI controller on ff170000.mmc [ff170000.mmc] using ADMA 64-bit > [ 4.459057] xilinx-dp-snd-card fd4a0000.display:zynqmp_dp_snd_card: Xilinx DisplayPort Sound Card probed > [ 4.468634] OF: graph: no port node found in /axi/display at fd4a0000 > [ 4.475120] xlnx-drm xlnx-drm.0: bound fd4a0000.display (ops 0xffffffc010e17fa0) > [ 4.482712] [drm] Initialized xlnx 1.0.0 20130509 for fd4a0000.display on minor 0 > [ 4.490206] zynqmp-display fd4a0000.display: ZynqMP DisplayPort Subsystem driver probed > [ 4.496962] mmc0: new high speed SDHC card at address aaaa > [ 4.498430] ahci-ceva fd0c0000.ahci: supply ahci not found, using dummy regulator > [ 4.511219] ahci-ceva fd0c0000.ahci: supply phy not found, using dummy regulator > [ 4.511379] mmcblk0: mmc0:aaaa SB16G 14.8 GiB > [ 4.518690] ahci-ceva fd0c0000.ahci: supply target not found, using dummy regulator > [ 4.527484] mmcblk0: p1 p2 > [ 4.540954] ahci-ceva fd0c0000.ahci: AHCI 0001.0301 32 slots 2 ports 6 Gbps 0x3 impl platform mode > [ 4.549923] ahci-ceva fd0c0000.ahci: flags: 64bit ncq sntf pm clo only pmp fbs pio slum part ccc sds apst > [ 4.560268] scsi host0: ahci-ceva > [ 4.563829] scsi host1: ahci-ceva > [ 4.567237] ata1: SATA max UDMA/133 mmio [mem 0xfd0c0000-0xfd0c1fff] port 0x100 irq 45 > [ 4.575152] ata2: SATA max UDMA/133 mmio [mem 0xfd0c0000-0xfd0c1fff] port 0x180 irq 45 > [ 4.605877] xhci-hcd xhci-hcd.1.auto: xHCI Host Controller > [ 4.611375] xhci-hcd xhci-hcd.1.auto: new USB bus registered, assigned bus number 1 > [ 4.619123] xhci-hcd xhci-hcd.1.auto: hcc params 0x0238f625 hci version 0x100 quirks 0x0000000002010810 > [ 4.628540] xhci-hcd xhci-hcd.1.auto: irq 53, io mem 0xfe200000 > [ 4.634549] xhci-hcd xhci-hcd.1.auto: xHCI Host Controller > [ 4.640035] xhci-hcd xhci-hcd.1.auto: new USB bus registered, assigned bus number 2 > [ 4.647692] xhci-hcd xhci-hcd.1.auto: Host supports USB 3.0 SuperSpeed > [ 4.654319] usb usb1: New USB device found, idVendor=1d6b, idProduct=0002, bcdDevice= 5.15 > [ 4.662582] usb usb1: New USB device strings: Mfr=3, Product=2, SerialNumber=1 > [ 4.669795] usb usb1: Product: xHCI Host Controller > [ 4.674664] usb usb1: Manufacturer: Linux 5.15.0 xhci-hcd > [ 4.680054] usb usb1: SerialNumber: xhci-hcd.1.auto > [ 4.685214] hub 1-0:1.0: USB hub found > [ 4.688988] hub 1-0:1.0: 1 port detected > [ 4.693202] usb usb2: New USB device found, idVendor=1d6b, idProduct=0003, bcdDevice= 5.15 > [ 4.701463] usb usb2: New USB device strings: Mfr=3, Product=2, SerialNumber=1 > [ 4.708682] usb usb2: Product: xHCI Host Controller > [ 4.713550] usb usb2: Manufacturer: Linux 5.15.0 xhci-hcd > [ 4.718944] usb usb2: SerialNumber: xhci-hcd.1.auto > [ 4.724075] hub 2-0:1.0: USB hub found > [ 4.727842] hub 2-0:1.0: 1 port detected > [ 4.734650] input: gpio-keys as /devices/platform/gpio-keys/input/input0 > [ 4.741660] of_cfs_init > [ 4.744131] of_cfs_init: OK > [ 4.747039] cfg80211: Loading compiled-in X.509 certificates for regulatory database > [ 4.881580] cfg80211: Loaded X.509 cert 'sforshee: 00b28ddf47aef9cea7' > [ 4.888214] zynqmp_pll_disable() clock disable failed for dpll_int, ret = -13 > [ 4.896228] platform regulatory.0: Direct firmware load for regulatory.db failed with error -2 > [ 4.897975] ata2: SATA link down (SStatus 0 SControl 330) > [ 4.904842] cfg80211: failed to load regulatory.db > [ 4.905622] ALSA device list: > [ 4.905626] #0: DisplayPort monitor > [ 4.910252] ata1: SATA link down (SStatus 0 SControl 330) > [ 4.950910] EXT4-fs (mmcblk0p2): mounted filesystem with ordered data mode. Opts: (null). Quota mode: none. > [ 4.960680] VFS: Mounted root (ext4 filesystem) on device 179:2. > [ 4.969332] devtmpfs: mounted > [ 4.972830] Freeing unused kernel memory: 1984K > [ 4.977453] Run /sbin/init as init process > [ 5.056434] EXT4-fs (mmcblk0p2): re-mounted. Opts: (null). Quota mode: none. > Starting syslogd: OK > Starting klogd: OK > Running sysctl: OK > Saving random seed: [ 5.105554] random: dd: uninitialized urandom read (512 bytes read) > OK > Starting network: OK > > Welcome to Buildroot > buildroot login: root > # > > Best regards, > Neal Frager > Xilinx > > From giulio.benetti at benettiengineering.com Tue Feb 8 16:31:31 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 8 Feb 2022 17:31:31 +0100 Subject: [Buildroot] [PATCH 1/2] configs/zynqmp_zcu106: Bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: References: <20220208071559.2862411-1-neal.frager@xilinx.com> <69efa9da-ae55-6795-8724-ed7105083924@benettiengineering.com> <32cc1c12-1496-7db9-5e32-1b99404a4fe3@benettiengineering.com> Message-ID: Hi Neal, On 08/02/22 12:56, Neal Frager wrote: > Hi Giulio, > >> I think you should go with local patch honestly. >> As the patch is now. > >> -- >> Giulio Benetti >> Benetti Engineering sas > > Ok. Please go ahead and start building with the patch as is. I have tested it on my side. It builds and runs without needing any manual steps. I'm building both defconfigs and see if everything is ok. In meanwhile I ask you to subscribe and set as "superseded" the old patches in buildroot patchwork: https://patchwork.ozlabs.org/project/buildroot/list/ Take care next times, when you send another version you should produce the patch with -v2(or -v3 etc.) flash and indicate what you've changed between versions. Thank you! Best regards -- Giulio Benetti Benetti Engineering sas From giulio.benetti at benettiengineering.com Tue Feb 8 16:32:59 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 8 Feb 2022 17:32:59 +0100 Subject: [Buildroot] Xilinx mainline ATF v2.6 In-Reply-To: References: <11BB5427-9C48-4116-AECB-EA33631B3519@benettiengineering.com> Message-ID: <2abae9e5-6dfc-838f-301e-a0e15af2a0f5@benettiengineering.com> On 08/02/22 17:31, Neal Frager wrote: > Hi Giulio, > >> Thanks a lot for testing runtime. >> It should be merged soon as you can see from gerrit :-) > > Excellent news! I added a comment to gerrit which should only help. I've just received the notifications via e-mail and checked, thanks a lot! :-) -- Giulio Benetti Benetti Engineering sas >> >> ------ >> >> U-Boot SPL 2022.01 (Feb 08 2022 - 15:18:47 +0000) >> PMUFW: v1.1 >> Loading new PMUFW cfg obj (2200 bytes) >> Silicon version: 3 >> EL Level: EL3 >> Chip ID: zu9eg >> Multiboot: 0 >> Trying to boot from MMC2 >> spl: could not initialize mmc. error: -19 Trying to boot from MMC1 >> spl_load_image_fat_os: error reading image u-boot.bin, err - -2 >> NOTICE: TF-A running on XCZU9EG/silicon at 0xfffea000 >> NOTICE: BL31: v2.6(release):2021.11-1539-gba7dbc88c5-dirty >> NOTICE: BL31: Built : 15:15:15, Feb 8 2022 >> >> >> U-Boot 2022.01 (Feb 08 2022 - 15:18:47 +0000) >> >> CPU: ZynqMP >> Silicon: v3 >> Model: ZynqMP ZCU102 Rev1.0 >> Board: Xilinx ZynqMP >> DRAM: 4 GiB >> PMUFW: v1.1 >> Xilinx I2C Legacy format at nvmem0: >> Board name: zcu102 >> Board rev: 1.0 >> Board SN: 847318611722-66244 >> Ethernet mac: 00:0a:35:03:6c:ca >> EL Level: EL2 >> Chip ID: zu9eg >> NAND: 0 MiB >> MMC: mmc at ff170000: 0 >> Loading Environment from FAT... *** Error - No Valid Environment Area found >> *** Warning - bad env area, using default environment >> >> In: serial >> Out: serial >> Err: serial >> Bootmode: LVL_SHFT_SD_MODE1 >> Reset reason: EXTERNAL >> Net: >> ZYNQ GEM: ff0e0000, mdio bus ff0e0000, phyaddr 12, interface rgmii-id >> eth0: ethernet at ff0e0000 >> scanning bus for devices... >> SATA link 0 timeout. >> SATA link 1 timeout. >> AHCI 0001.0301 32 slots 2 ports 6 Gbps 0x3 impl SATA mode >> flags: 64bit ncq pm clo only pmp fbss pio slum part ccc apst >> starting USB... >> Bus usb at fe200000: Register 2000440 NbrPorts 2 >> Starting the controller >> USB XHCI 1.00 >> scanning bus usb at fe200000 for devices... 1 USB Device(s) found >> scanning usb for storage devices... 0 Storage Device(s) found >> Hit any key to stop autoboot: 0 >> switch to partitions #0, OK >> mmc0 is current device >> Scanning mmc 0:1... >> Found /extlinux/extlinux.conf >> Retrieving file: /extlinux/extlinux.conf >> 1: linux >> Retrieving file: /Image >> append: console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait >> Retrieving file: /system.dtb >> ## Flattened Device Tree blob at 40000000 >> Booting using the fdt blob at 0x40000000 >> Loading Device Tree to 000000007bdf5000, end 000000007be01d46 ... OK >> >> Starting kernel ... >> >> [ 0.000000] Booting Linux on physical CPU 0x0000000000 [0x410fd034] >> [ 0.000000] Linux version 5.15.0 (nealf at xirengwts08) (aarch64-buildroot-linux-uclibc-gcc.br_real (Buildroot 2021.11-1539-gba7dbc88c5) 10.3.0, GNU ld (GNU Binutils) 2.36.1) #1 SMP Tue Feb 8 09:42:51 GMT 2022 >> [ 0.000000] Machine model: ZynqMP ZCU102 Rev1.0 >> [ 0.000000] efi: UEFI not found. >> [ 0.000000] Zone ranges: >> [ 0.000000] DMA32 [mem 0x0000000000000000-0x00000000ffffffff] >> [ 0.000000] Normal [mem 0x0000000100000000-0x000000087fffffff] >> [ 0.000000] Movable zone start for each node >> [ 0.000000] Early memory node ranges >> [ 0.000000] node 0: [mem 0x0000000000000000-0x000000007fffffff] >> [ 0.000000] node 0: [mem 0x0000000800000000-0x000000087fffffff] >> [ 0.000000] Initmem setup node 0 [mem 0x0000000000000000-0x000000087fffffff] >> [ 0.000000] cma: Reserved 256 MiB at 0x000000006bc00000 >> [ 0.000000] psci: probing for conduit method from DT. >> [ 0.000000] psci: PSCIv1.1 detected in firmware. >> [ 0.000000] psci: Using standard PSCI v0.2 function IDs >> [ 0.000000] psci: MIGRATE_INFO_TYPE not supported. >> [ 0.000000] psci: SMC Calling Convention v1.2 >> [ 0.000000] percpu: Embedded 18 pages/cpu s33048 r8192 d32488 u73728 >> [ 0.000000] Detected VIPT I-cache on CPU0 >> [ 0.000000] CPU features: detected: ARM erratum 845719 >> [ 0.000000] Built 1 zonelists, mobility grouping on. Total pages: 1034240 >> [ 0.000000] Kernel command line: console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait >> [ 0.000000] Dentry cache hash table entries: 524288 (order: 10, 4194304 bytes, linear) >> [ 0.000000] Inode-cache hash table entries: 262144 (order: 9, 2097152 bytes, linear) >> [ 0.000000] mem auto-init: stack:off, heap alloc:off, heap free:off >> [ 0.000000] software IO TLB: mapped [mem 0x000000007c000000-0x0000000080000000] (64MB) >> [ 0.000000] Memory: 3772784K/4194304K available (13568K kernel code, 904K rwdata, 3864K rodata, 1984K init, 306K bss, 159376K reserved, 262144K cma-reserved) >> [ 0.000000] rcu: Hierarchical RCU implementation. >> [ 0.000000] rcu: RCU event tracing is enabled. >> [ 0.000000] rcu: RCU calculated value of scheduler-enlistment delay is 25 jiffies. >> [ 0.000000] NR_IRQS: 64, nr_irqs: 64, preallocated irqs: 0 >> [ 0.000000] GIC: Adjusting CPU interface base to 0x00000000f902f000 >> [ 0.000000] Root IRQ handler: gic_handle_irq >> [ 0.000000] GIC: Using split EOI/Deactivate mode >> [ 0.000000] random: get_random_bytes called from start_kernel+0x470/0x6f8 with crng_init=0 >> [ 0.000000] arch_timer: cp15 timer(s) running at 100.00MHz (phys). >> [ 0.000000] clocksource: arch_sys_counter: mask: 0xffffffffffffff max_cycles: 0x171024e7e0, max_idle_ns: 440795205315 ns >> [ 0.000000] sched_clock: 56 bits at 100MHz, resolution 10ns, wraps every 4398046511100ns >> [ 0.000302] Console: colour dummy device 80x25 >> [ 0.000335] Calibrating delay loop (skipped), value calculated using timer frequency.. 200.00 BogoMIPS (lpj=400000) >> [ 0.000346] pid_max: default: 32768 minimum: 301 >> [ 0.000454] Mount-cache hash table entries: 8192 (order: 4, 65536 bytes, linear) >> [ 0.000474] Mountpoint-cache hash table entries: 8192 (order: 4, 65536 bytes, linear) >> [ 0.001288] rcu: Hierarchical SRCU implementation. >> [ 0.001556] EFI services will not be available. >> [ 0.001681] smp: Bringing up secondary CPUs ... >> [ 0.002000] Detected VIPT I-cache on CPU1 >> [ 0.002037] CPU1: Booted secondary processor 0x0000000001 [0x410fd034] >> [ 0.002399] Detected VIPT I-cache on CPU2 >> [ 0.002422] CPU2: Booted secondary processor 0x0000000002 [0x410fd034] >> [ 0.002749] Detected VIPT I-cache on CPU3 >> [ 0.002771] CPU3: Booted secondary processor 0x0000000003 [0x410fd034] >> [ 0.002814] smp: Brought up 1 node, 4 CPUs >> [ 0.002831] SMP: Total of 4 processors activated. >> [ 0.002836] CPU features: detected: 32-bit EL0 Support >> [ 0.002842] CPU features: detected: CRC32 instructions >> [ 0.002883] CPU: All CPU(s) started at EL2 >> [ 0.002898] alternatives: patching kernel code >> [ 0.003949] devtmpfs: initialized >> [ 0.009573] clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 7645041785100000 ns >> [ 0.009592] futex hash table entries: 1024 (order: 4, 65536 bytes, linear) >> [ 0.017450] pinctrl core: initialized pinctrl subsystem >> [ 0.018081] NET: Registered PF_NETLINK/PF_ROUTE protocol family >> [ 0.019062] DMA: preallocated 512 KiB GFP_KERNEL pool for atomic allocations >> [ 0.019156] DMA: preallocated 512 KiB GFP_KERNEL|GFP_DMA32 pool for atomic allocations >> [ 0.019193] audit: initializing netlink subsys (disabled) >> [ 0.019268] audit: type=2000 audit(0.016:1): state=initialized audit_enabled=0 res=1 >> [ 0.019561] hw-breakpoint: found 6 breakpoint and 4 watchpoint registers. >> [ 0.019621] ASID allocator initialised with 65536 entries >> [ 0.037594] HugeTLB registered 1.00 GiB page size, pre-allocated 0 pages >> [ 0.037607] HugeTLB registered 32.0 MiB page size, pre-allocated 0 pages >> [ 0.037614] HugeTLB registered 2.00 MiB page size, pre-allocated 0 pages >> [ 0.037620] HugeTLB registered 64.0 KiB page size, pre-allocated 0 pages >> [ 1.102226] DRBG: Continuing without Jitter RNG >> [ 1.204763] raid6: neonx8 gen() 2139 MB/s >> [ 1.272812] raid6: neonx8 xor() 1593 MB/s >> [ 1.340871] raid6: neonx4 gen() 2187 MB/s >> [ 1.408916] raid6: neonx4 xor() 1576 MB/s >> [ 1.476978] raid6: neonx2 gen() 2068 MB/s >> [ 1.545028] raid6: neonx2 xor() 1447 MB/s >> [ 1.613093] raid6: neonx1 gen() 1803 MB/s >> [ 1.681147] raid6: neonx1 xor() 1240 MB/s >> [ 1.749207] raid6: int64x8 gen() 1471 MB/s >> [ 1.817250] raid6: int64x8 xor() 785 MB/s >> [ 1.885312] raid6: int64x4 gen() 1557 MB/s >> [ 1.953371] raid6: int64x4 xor() 842 MB/s >> [ 2.021437] raid6: int64x2 gen() 1396 MB/s >> [ 2.089488] raid6: int64x2 xor() 750 MB/s >> [ 2.157543] raid6: int64x1 gen() 1186 MB/s >> [ 2.225599] raid6: int64x1 xor() 596 MB/s >> [ 2.225604] raid6: using algorithm neonx4 gen() 2187 MB/s >> [ 2.225610] raid6: .... xor() 1576 MB/s, rmw enabled >> [ 2.225615] raid6: using neon recovery algorithm >> [ 2.225994] iommu: Default domain type: Translated >> [ 2.226001] iommu: DMA domain TLB invalidation policy: strict mode >> [ 2.226220] SCSI subsystem initialized >> [ 2.226362] usbcore: registered new interface driver usbfs >> [ 2.226390] usbcore: registered new interface driver hub >> [ 2.226417] usbcore: registered new device driver usb >> [ 2.226469] mc: Linux media interface: v0.10 >> [ 2.226488] videodev: Linux video capture interface: v2.00 >> [ 2.226525] pps_core: LinuxPPS API ver. 1 registered >> [ 2.226531] pps_core: Software ver. 5.3.6 - Copyright 2005-2007 Rodolfo Giometti >> [ 2.226543] PTP clock support registered >> [ 2.226569] EDAC MC: Ver: 3.0.0 >> [ 2.226852] zynqmp-ipi-mbox mailbox at ff990400: Registered ZynqMP IPI mbox with TX/RX channels. >> [ 2.227040] FPGA manager framework >> [ 2.227166] Advanced Linux Sound Architecture Driver Initialized. >> [ 2.227447] Bluetooth: Core ver 2.22 >> [ 2.227471] NET: Registered PF_BLUETOOTH protocol family >> [ 2.227476] Bluetooth: HCI device and connection manager initialized >> [ 2.227485] Bluetooth: HCI socket layer initialized >> [ 2.227491] Bluetooth: L2CAP socket layer initialized >> [ 2.227502] Bluetooth: SCO socket layer initialized >> [ 2.227789] clocksource: Switched to clocksource arch_sys_counter >> [ 2.227887] VFS: Disk quotas dquot_6.6.0 >> [ 2.227926] VFS: Dquot-cache hash table entries: 512 (order 0, 4096 bytes) >> [ 2.231840] NET: Registered PF_INET protocol family >> [ 2.231964] IP idents hash table entries: 65536 (order: 7, 524288 bytes, linear) >> [ 2.233486] tcp_listen_portaddr_hash hash table entries: 2048 (order: 3, 32768 bytes, linear) >> [ 2.233533] TCP established hash table entries: 32768 (order: 6, 262144 bytes, linear) >> [ 2.233739] TCP bind hash table entries: 32768 (order: 7, 524288 bytes, linear) >> [ 2.234123] TCP: Hash tables configured (established 32768 bind 32768) >> [ 2.234190] UDP hash table entries: 2048 (order: 4, 65536 bytes, linear) >> [ 2.234266] UDP-Lite hash table entries: 2048 (order: 4, 65536 bytes, linear) >> [ 2.234416] NET: Registered PF_UNIX/PF_LOCAL protocol family >> [ 2.234703] RPC: Registered named UNIX socket transport module. >> [ 2.234710] RPC: Registered udp transport module. >> [ 2.234714] RPC: Registered tcp transport module. >> [ 2.234719] RPC: Registered tcp NFSv4.1 backchannel transport module. >> [ 2.235305] PCI: CLS 0 bytes, default 64 >> [ 2.235585] armv8-pmu pmu: hw perfevents: no interrupt-affinity property, guessing. >> [ 2.235747] hw perfevents: enabled with armv8_pmuv3 PMU driver, 7 counters available >> [ 2.236543] Initialise system trusted keyrings >> [ 2.236640] workingset: timestamp_bits=62 max_order=20 bucket_order=0 >> [ 2.237202] NFS: Registering the id_resolver key type >> [ 2.237216] Key type id_resolver registered >> [ 2.237221] Key type id_legacy registered >> [ 2.237237] nfs4filelayout_init: NFSv4 File Layout Driver Registering... >> [ 2.237244] nfs4flexfilelayout_init: NFSv4 Flexfile Layout Driver Registering... >> [ 2.237261] jffs2: version 2.2. (NAND) ?? 2001-2006 Red Hat, Inc. >> [ 2.273306] NET: Registered PF_ALG protocol family >> [ 2.273320] xor: measuring software checksum speed >> [ 2.277366] 8regs : 2438 MB/sec >> [ 2.280888] 32regs : 2800 MB/sec >> [ 2.285157] arm64_neon : 2309 MB/sec >> [ 2.285163] xor: using function: 32regs (2800 MB/sec) >> [ 2.285170] Key type asymmetric registered >> [ 2.285175] Asymmetric key parser 'x509' registered >> [ 2.285211] Block layer SCSI generic (bsg) driver version 0.4 loaded (major 245) >> [ 2.285218] io scheduler mq-deadline registered >> [ 2.285223] io scheduler kyber registered >> [ 2.309790] Serial: 8250/16550 driver, 4 ports, IRQ sharing disabled >> [ 2.313198] cacheinfo: Unable to detect cache hierarchy for CPU 0 >> [ 2.317134] brd: module loaded >> [ 2.320288] loop: module loaded >> [ 2.321033] mtdoops: mtd device (mtddev=name/number) must be supplied >> [ 2.322271] libphy: Fixed MDIO Bus: probed >> [ 2.323366] tun: Universal TUN/TAP device driver, 1.6 >> [ 2.323447] CAN device driver interface >> [ 2.324182] usbcore: registered new interface driver asix >> [ 2.324219] usbcore: registered new interface driver ax88179_178a >> [ 2.324244] usbcore: registered new interface driver cdc_ether >> [ 2.324266] usbcore: registered new interface driver net1080 >> [ 2.324287] usbcore: registered new interface driver cdc_subset >> [ 2.324310] usbcore: registered new interface driver zaurus >> [ 2.324342] usbcore: registered new interface driver cdc_ncm >> [ 2.325046] usbcore: registered new interface driver uas >> [ 2.325077] usbcore: registered new interface driver usb-storage >> [ 2.325704] rtc_zynqmp ffa60000.rtc: registered as rtc0 >> [ 2.325721] rtc_zynqmp ffa60000.rtc: setting system clock to 2021-01-25T16:34:35 UTC (1611592475) >> [ 2.325789] i2c_dev: i2c /dev entries driver >> [ 2.327253] usbcore: registered new interface driver uvcvideo >> [ 2.328075] Bluetooth: HCI UART driver ver 2.3 >> [ 2.328082] Bluetooth: HCI UART protocol H4 registered >> [ 2.328088] Bluetooth: HCI UART protocol BCSP registered >> [ 2.328106] Bluetooth: HCI UART protocol LL registered >> [ 2.328112] Bluetooth: HCI UART protocol ATH3K registered >> [ 2.328128] Bluetooth: HCI UART protocol Three-wire (H5) registered >> [ 2.328166] Bluetooth: HCI UART protocol Intel registered >> [ 2.328182] Bluetooth: HCI UART protocol QCA registered >> [ 2.328211] usbcore: registered new interface driver bcm203x >> [ 2.328237] usbcore: registered new interface driver bpa10x >> [ 2.328262] usbcore: registered new interface driver bfusb >> [ 2.328287] usbcore: registered new interface driver btusb >> [ 2.328324] usbcore: registered new interface driver ath3k >> [ 2.328397] EDAC MC: ECC not enabled >> [ 2.328531] EDAC DEVICE0: Giving out device to module edac controller cache_err: DEV edac (POLLED) >> [ 2.328682] EDAC DEVICE1: Giving out device to module zynqmp-ocm-edac controller zynqmp_ocm: DEV ff960000.memory-controller (INTERRUPT) >> [ 2.329022] sdhci: Secure Digital Host Controller Interface driver >> [ 2.329028] sdhci: Copyright(c) Pierre Ossman >> [ 2.329032] sdhci-pltfm: SDHCI platform and OF driver helper >> [ 2.329372] ledtrig-cpu: registered to indicate activity on CPUs >> [ 2.329463] SMCCC: SOC_ID: ARCH_SOC_ID not implemented, skipping .... >> [ 2.329501] zynqmp_firmware_probe Platform Management API v1.1 >> [ 2.329510] zynqmp_firmware_probe Trustzone version v1.0 >> [ 2.359668] securefw securefw: securefw probed >> [ 2.359886] alg: No test for xilinx-zynqmp-aes (zynqmp-aes) >> [ 2.359905] zynqmp_aes firmware:zynqmp-firmware:zynqmp-aes: AES Successfully Registered >> [ 2.360070] alg: No test for xilinx-keccak-384 (zynqmp-keccak-384) >> [ 2.360247] alg: No test for xilinx-zynqmp-rsa (zynqmp-rsa) >> [ 2.360389] usbcore: registered new interface driver usbhid >> [ 2.360395] usbhid: USB HID core driver >> [ 2.363052] fpga_manager fpga0: Xilinx ZynqMP FPGA Manager registered >> [ 2.363387] usbcore: registered new interface driver snd-usb-audio >> [ 2.364208] pktgen: Packet Generator for packet performance testing. Version: 2.75 >> [ 2.364576] Initializing XFRM netlink socket >> [ 2.364653] NET: Registered PF_INET6 protocol family >> [ 2.365096] Segment Routing with IPv6 >> [ 2.365114] In-situ OAM (IOAM) with IPv6 >> [ 2.365163] sit: IPv6, IPv4 and MPLS over IPv4 tunneling driver >> [ 2.365470] NET: Registered PF_PACKET protocol family >> [ 2.365487] NET: Registered PF_KEY protocol family >> [ 2.365507] can: controller area network core >> [ 2.365536] NET: Registered PF_CAN protocol family >> [ 2.365542] can: raw protocol >> [ 2.365548] can: broadcast manager protocol >> [ 2.365555] can: netlink gateway - max_hops=1 >> [ 2.365624] Bluetooth: RFCOMM TTY layer initialized >> [ 2.365634] Bluetooth: RFCOMM socket layer initialized >> [ 2.365649] Bluetooth: RFCOMM ver 1.11 >> [ 2.365658] Bluetooth: BNEP (Ethernet Emulation) ver 1.3 >> [ 2.365664] Bluetooth: BNEP filters: protocol multicast >> [ 2.365671] Bluetooth: BNEP socket layer initialized >> [ 2.365676] Bluetooth: HIDP (Human Interface Emulation) ver 1.2 >> [ 2.365683] Bluetooth: HIDP socket layer initialized >> [ 2.365793] 9pnet: Installing 9P2000 support >> [ 2.365811] Key type dns_resolver registered >> [ 2.365915] registered taskstats version 1 >> [ 2.365921] Loading compiled-in X.509 certificates >> [ 2.366901] Btrfs loaded, crc32c=crc32c-generic, zoned=no, fsverity=no >> [ 2.374985] ff000000.serial: ttyPS0 at MMIO 0xff000000 (irq = 47, base_baud = 6249999) is a xuartps >> [ 3.675073] printk: console [ttyPS0] enabled >> [ 3.680067] ff010000.serial: ttyPS1 at MMIO 0xff010000 (irq = 48, base_baud = 6249999) is a xuartps >> [ 3.689389] of-fpga-region fpga-full: FPGA Region probed >> [ 3.695960] nwl-pcie fd0e0000.pcie: host bridge /axi/pcie at fd0e0000 ranges: >> [ 3.702858] nwl-pcie fd0e0000.pcie: MEM 0x00e0000000..0x00efffffff -> 0x00e0000000 >> [ 3.710863] nwl-pcie fd0e0000.pcie: MEM 0x0600000000..0x07ffffffff -> 0x0600000000 >> [ 3.718932] nwl-pcie fd0e0000.pcie: Link is DOWN >> [ 3.723692] nwl-pcie fd0e0000.pcie: PCI host bridge to bus 0000:00 >> [ 3.729868] pci_bus 0000:00: root bus resource [bus 00-ff] >> [ 3.735353] pci_bus 0000:00: root bus resource [mem 0xe0000000-0xefffffff] >> [ 3.742225] pci_bus 0000:00: root bus resource [mem 0x600000000-0x7ffffffff pref] >> [ 3.749731] pci 0000:00:00.0: [10ee:d021] type 01 class 0x060400 >> [ 3.755796] pci 0000:00:00.0: PME# supported from D0 D1 D2 D3hot >> [ 3.765470] pci 0000:00:00.0: PCI bridge to [bus 01-0c] >> [ 3.771018] xilinx-zynqmp-dma fd500000.dma-controller: ZynqMP DMA driver Probe success >> [ 3.779096] xilinx-zynqmp-dma fd510000.dma-controller: ZynqMP DMA driver Probe success >> [ 3.787168] xilinx-zynqmp-dma fd520000.dma-controller: ZynqMP DMA driver Probe success >> [ 3.795240] xilinx-zynqmp-dma fd530000.dma-controller: ZynqMP DMA driver Probe success >> [ 3.803315] xilinx-zynqmp-dma fd540000.dma-controller: ZynqMP DMA driver Probe success >> [ 3.811381] xilinx-zynqmp-dma fd550000.dma-controller: ZynqMP DMA driver Probe success >> [ 3.819459] xilinx-zynqmp-dma fd560000.dma-controller: ZynqMP DMA driver Probe success >> [ 3.827528] xilinx-zynqmp-dma fd570000.dma-controller: ZynqMP DMA driver Probe success >> [ 3.835850] xilinx-zynqmp-dpdma fd4c0000.dma-controller: Xilinx DPDMA engine is probed >> [ 3.844554] spi-nor spi0.0: found n25q512a, expected m25p80 >> [ 3.850649] spi-nor spi0.0: n25q512a (131072 Kbytes) >> [ 3.855638] 4 fixed-partitions partitions found on MTD device spi0.0 >> [ 3.861982] Creating 4 MTD partitions on "spi0.0": >> [ 3.866765] 0x000000000000-0x000000100000 : "qspi-fsbl-uboot" >> [ 3.873306] 0x000000100000-0x000000600000 : "qspi-linux" >> [ 3.879305] 0x000000600000-0x000000620000 : "qspi-device-tree" >> [ 3.885811] 0x000000620000-0x000000c00000 : "qspi-rootfs" >> [ 3.894566] macb ff0e0000.ethernet: Not enabling partial store and forward >> [ 3.902041] libphy: MACB_mii_bus: probed >> [ 3.906625] macb ff0e0000.ethernet eth0: Cadence GEM rev 0x50070106 at 0xff0e0000 irq 30 (00:0a:35:03:6c:ca) >> [ 3.916754] xilinx-axipmon ffa00000.perf-monitor: Probed Xilinx APM >> [ 3.923298] xilinx-axipmon fd0b0000.perf-monitor: Probed Xilinx APM >> [ 3.929802] xilinx-axipmon fd490000.perf-monitor: Probed Xilinx APM >> [ 3.936303] xilinx-axipmon ffa10000.perf-monitor: Probed Xilinx APM >> [ 3.943645] pca953x 0-0020: supply vcc not found, using dummy regulator >> [ 3.950339] pca953x 0-0020: using no AI >> [ 3.954846] gpio-318 (sel0): hogged as output/low >> [ 3.959756] gpio-319 (sel1): hogged as output/high >> [ 3.964755] gpio-320 (sel2): hogged as output/high >> [ 3.969753] gpio-321 (sel3): hogged as output/high >> [ 3.974906] pca953x 0-0021: supply vcc not found, using dummy regulator >> [ 3.981575] pca953x 0-0021: using no AI >> [ 3.994348] i2c i2c-0: Added multiplexed i2c bus 2 >> [ 4.005627] i2c i2c-0: Added multiplexed i2c bus 3 >> [ 4.021538] random: fast init done >> [ 4.063343] i2c i2c-0: Added multiplexed i2c bus 4 >> [ 4.068256] i2c i2c-0: Added multiplexed i2c bus 5 >> [ 4.073051] pca954x 0-0075: registered 4 multiplexed busses for I2C mux pca9544 >> [ 4.080406] cdns-i2c ff020000.i2c: 400 kHz mmio ff020000 irq 32 >> [ 4.087774] at24 6-0054: supply vcc not found, using dummy regulator >> [ 4.094661] at24 6-0054: 1024 byte 24c08 EEPROM, writable, 1 bytes/write >> [ 4.101402] i2c i2c-1: Added multiplexed i2c bus 6 >> [ 4.106723] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out >> [ 4.114028] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out >> [ 4.121333] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out >> [ 4.128631] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out >> [ 4.135932] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out >> [ 4.143230] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out >> [ 4.150532] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out >> [ 4.157832] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out >> [ 4.166228] si5341 7-0036: Chip: 5341 Grade: 1 Rev: 1 >> [ 4.204262] i2c i2c-1: Added multiplexed i2c bus 7 >> [ 4.211860] si570 8-005d: registered, current frequency 300000000 Hz >> [ 4.218249] i2c i2c-1: Added multiplexed i2c bus 8 >> [ 4.237968] si570 9-005d: registered, current frequency 148500000 Hz >> [ 4.244356] i2c i2c-1: Added multiplexed i2c bus 9 >> [ 4.249368] si5324 10-0069: si5328 probed >> [ 4.316105] si5324 10-0069: si5328 probe successful >> [ 4.321023] i2c i2c-1: Added multiplexed i2c bus 10 >> [ 4.326009] i2c i2c-1: Added multiplexed i2c bus 11 >> [ 4.331002] i2c i2c-1: Added multiplexed i2c bus 12 >> [ 4.335995] i2c i2c-1: Added multiplexed i2c bus 13 >> [ 4.340870] pca954x 1-0074: registered 8 multiplexed busses for I2C switch pca9548 >> [ 4.348795] i2c i2c-1: Added multiplexed i2c bus 14 >> [ 4.353797] i2c i2c-1: Added multiplexed i2c bus 15 >> [ 4.358799] i2c i2c-1: Added multiplexed i2c bus 16 >> [ 4.363811] i2c i2c-1: Added multiplexed i2c bus 17 >> [ 4.368809] i2c i2c-1: Added multiplexed i2c bus 18 >> [ 4.373819] i2c i2c-1: Added multiplexed i2c bus 19 >> [ 4.378823] i2c i2c-1: Added multiplexed i2c bus 20 >> [ 4.383828] i2c i2c-1: Added multiplexed i2c bus 21 >> [ 4.388705] pca954x 1-0075: registered 8 multiplexed busses for I2C switch pca9548 >> [ 4.396304] cdns-i2c ff030000.i2c: 400 kHz mmio ff030000 irq 33 >> [ 4.406274] cdns-wdt fd4d0000.watchdog: Xilinx Watchdog Timer with timeout 60s >> [ 4.415726] zynqmp-display fd4a0000.display: vtc bridge property not present >> [ 4.424824] xilinx-dp-snd-codec fd4a0000.display:zynqmp_dp_snd_codec0: Xilinx DisplayPort Sound Codec probed >> [ 4.434896] xilinx-dp-snd-pcm zynqmp_dp_snd_pcm0: Xilinx DisplayPort Sound PCM probed >> [ 4.442954] xilinx-dp-snd-pcm zynqmp_dp_snd_pcm1: Xilinx DisplayPort Sound PCM probed >> [ 4.448513] mmc0: SDHCI controller on ff170000.mmc [ff170000.mmc] using ADMA 64-bit >> [ 4.459057] xilinx-dp-snd-card fd4a0000.display:zynqmp_dp_snd_card: Xilinx DisplayPort Sound Card probed >> [ 4.468634] OF: graph: no port node found in /axi/display at fd4a0000 >> [ 4.475120] xlnx-drm xlnx-drm.0: bound fd4a0000.display (ops 0xffffffc010e17fa0) >> [ 4.482712] [drm] Initialized xlnx 1.0.0 20130509 for fd4a0000.display on minor 0 >> [ 4.490206] zynqmp-display fd4a0000.display: ZynqMP DisplayPort Subsystem driver probed >> [ 4.496962] mmc0: new high speed SDHC card at address aaaa >> [ 4.498430] ahci-ceva fd0c0000.ahci: supply ahci not found, using dummy regulator >> [ 4.511219] ahci-ceva fd0c0000.ahci: supply phy not found, using dummy regulator >> [ 4.511379] mmcblk0: mmc0:aaaa SB16G 14.8 GiB >> [ 4.518690] ahci-ceva fd0c0000.ahci: supply target not found, using dummy regulator >> [ 4.527484] mmcblk0: p1 p2 >> [ 4.540954] ahci-ceva fd0c0000.ahci: AHCI 0001.0301 32 slots 2 ports 6 Gbps 0x3 impl platform mode >> [ 4.549923] ahci-ceva fd0c0000.ahci: flags: 64bit ncq sntf pm clo only pmp fbs pio slum part ccc sds apst >> [ 4.560268] scsi host0: ahci-ceva >> [ 4.563829] scsi host1: ahci-ceva >> [ 4.567237] ata1: SATA max UDMA/133 mmio [mem 0xfd0c0000-0xfd0c1fff] port 0x100 irq 45 >> [ 4.575152] ata2: SATA max UDMA/133 mmio [mem 0xfd0c0000-0xfd0c1fff] port 0x180 irq 45 >> [ 4.605877] xhci-hcd xhci-hcd.1.auto: xHCI Host Controller >> [ 4.611375] xhci-hcd xhci-hcd.1.auto: new USB bus registered, assigned bus number 1 >> [ 4.619123] xhci-hcd xhci-hcd.1.auto: hcc params 0x0238f625 hci version 0x100 quirks 0x0000000002010810 >> [ 4.628540] xhci-hcd xhci-hcd.1.auto: irq 53, io mem 0xfe200000 >> [ 4.634549] xhci-hcd xhci-hcd.1.auto: xHCI Host Controller >> [ 4.640035] xhci-hcd xhci-hcd.1.auto: new USB bus registered, assigned bus number 2 >> [ 4.647692] xhci-hcd xhci-hcd.1.auto: Host supports USB 3.0 SuperSpeed >> [ 4.654319] usb usb1: New USB device found, idVendor=1d6b, idProduct=0002, bcdDevice= 5.15 >> [ 4.662582] usb usb1: New USB device strings: Mfr=3, Product=2, SerialNumber=1 >> [ 4.669795] usb usb1: Product: xHCI Host Controller >> [ 4.674664] usb usb1: Manufacturer: Linux 5.15.0 xhci-hcd >> [ 4.680054] usb usb1: SerialNumber: xhci-hcd.1.auto >> [ 4.685214] hub 1-0:1.0: USB hub found >> [ 4.688988] hub 1-0:1.0: 1 port detected >> [ 4.693202] usb usb2: New USB device found, idVendor=1d6b, idProduct=0003, bcdDevice= 5.15 >> [ 4.701463] usb usb2: New USB device strings: Mfr=3, Product=2, SerialNumber=1 >> [ 4.708682] usb usb2: Product: xHCI Host Controller >> [ 4.713550] usb usb2: Manufacturer: Linux 5.15.0 xhci-hcd >> [ 4.718944] usb usb2: SerialNumber: xhci-hcd.1.auto >> [ 4.724075] hub 2-0:1.0: USB hub found >> [ 4.727842] hub 2-0:1.0: 1 port detected >> [ 4.734650] input: gpio-keys as /devices/platform/gpio-keys/input/input0 >> [ 4.741660] of_cfs_init >> [ 4.744131] of_cfs_init: OK >> [ 4.747039] cfg80211: Loading compiled-in X.509 certificates for regulatory database >> [ 4.881580] cfg80211: Loaded X.509 cert 'sforshee: 00b28ddf47aef9cea7' >> [ 4.888214] zynqmp_pll_disable() clock disable failed for dpll_int, ret = -13 >> [ 4.896228] platform regulatory.0: Direct firmware load for regulatory.db failed with error -2 >> [ 4.897975] ata2: SATA link down (SStatus 0 SControl 330) >> [ 4.904842] cfg80211: failed to load regulatory.db >> [ 4.905622] ALSA device list: >> [ 4.905626] #0: DisplayPort monitor >> [ 4.910252] ata1: SATA link down (SStatus 0 SControl 330) >> [ 4.950910] EXT4-fs (mmcblk0p2): mounted filesystem with ordered data mode. Opts: (null). Quota mode: none. >> [ 4.960680] VFS: Mounted root (ext4 filesystem) on device 179:2. >> [ 4.969332] devtmpfs: mounted >> [ 4.972830] Freeing unused kernel memory: 1984K >> [ 4.977453] Run /sbin/init as init process >> [ 5.056434] EXT4-fs (mmcblk0p2): re-mounted. Opts: (null). Quota mode: none. >> Starting syslogd: OK >> Starting klogd: OK >> Running sysctl: OK >> Saving random seed: [ 5.105554] random: dd: uninitialized urandom read (512 bytes read) >> OK >> Starting network: OK >> >> Welcome to Buildroot >> buildroot login: root >> # >> >> Best regards, >> Neal Frager >> Xilinx >> >> > From nealf at xilinx.com Tue Feb 8 16:43:10 2022 From: nealf at xilinx.com (Neal Frager) Date: Tue, 8 Feb 2022 16:43:10 +0000 Subject: [Buildroot] [PATCH 1/2] configs/zynqmp_zcu106: Bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: References: <20220208071559.2862411-1-neal.frager@xilinx.com> <69efa9da-ae55-6795-8724-ed7105083924@benettiengineering.com> <32cc1c12-1496-7db9-5e32-1b99404a4fe3@benettiengineering.com> Message-ID: Hi Giulio, > I'm building both defconfigs and see if everything is ok. > In meanwhile I ask you to subscribe and set as "superseded" the old patches in buildroot patchwork: > https://patchwork.ozlabs.org/project/buildroot/list/ Done. Let me know if you see any issues with my patch set. On my side, it builds and runs without any manual steps required. > Take care next times, when you send another version you should produce the patch with -v2(or -v3 etc.) flash and indicate what you've changed between versions. Ok, no problem. Thanks again for all your help! Best regards, Neal Frager Xilinx From giulio.benetti at benettiengineering.com Tue Feb 8 17:02:29 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 8 Feb 2022 18:02:29 +0100 Subject: [Buildroot] [PATCH 1/2] configs/zynqmp_zcu106: Bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: References: <20220208071559.2862411-1-neal.frager@xilinx.com> <69efa9da-ae55-6795-8724-ed7105083924@benettiengineering.com> <32cc1c12-1496-7db9-5e32-1b99404a4fe3@benettiengineering.com> Message-ID: <97653013-1d33-4a03-00cf-ffdb3fa5e723@benettiengineering.com> Hi Neal, On 08/02/22 17:43, Neal Frager wrote: > Hi Giulio, > >> I'm building both defconfigs and see if everything is ok. >> In meanwhile I ask you to subscribe and set as "superseded" the old patches in buildroot patchwork: >> https://patchwork.ozlabs.org/project/buildroot/list/ > > Done. Let me know if you see any issues with my patch set. On my side, it builds and runs without any manual steps required. You've missed one thing in defconfig you couldn't see because it's on host-side: BR2_TARGET_UBOOT_NEEDS_OPENSSL=y that goes after: BR2_TARGET_UBOOT_NEEDS_DTC=y that is required by uboot in hosts where openssl is not installed, in your system is installed so you don't see the error. This is true for both defconfigs. I ask you to reproduce it by using these docker's instructions: https://patchwork.ozlabs.org/project/buildroot/patch/20220203235438.610277-1-giulio.benetti at benettiengineering.com/ Have you already used docker? Also there is another problem on post-image.sh: ``` INFO: cmd: "find '/home/br-user/git/upstream/ci-tests/zynqmp_zcu106_defconfig/build/genimage.tmp/root' -depth -type d -printf '%P\0' | xargs -0 -I {} touch -r '/tmp/tmp.OZIeSLbRSO/{}' '/home/br-user/git/upstream/ci-tests/zynqmp_zcu106_defconfig/build/genimage.tmp/root/{}'" (stderr): ERROR: file(extlinux.conf): stat(/home/br-user/git/upstream/ci-tests/zynqmp_zcu106_defconfig/images/extlinux.conf) failed: No such file or directory ERROR: vfat(boot.vfat): could not setup extlinux.conf ``` That is because you need extlinux.conf to be copied in post-build.sh script, not in post-image.sh because it is too late(image is already generated), but you need it *to* generate image. So you have to create a specific post-build.sh with: cp board/zynqmp/extlinux.conf output/images/extlinux.conf and point to it with BR2_ROOTFS_POST_BUILD_SCRIPT. BUT don't use explicit paths like them, but always try to imitate what other boards/packages do, like: ``` #!/bin/sh BOARD_DIR="$(dirname $0)" install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf ``` Because if you change the output directory to build buildroot with: # make O=../output-zynqmp zynqmp_zcu102_defconfig that script will never work. And that fixes the problem. So now I wait for V2 :-) >> Take care next times, when you send another version you should produce the patch with -v2(or -v3 etc.) flash and indicate what you've changed between versions. > > Ok, no problem. +1 > Thanks again for all your help! It's a pleasure Best regards -- Giulio Benetti Benetti Engineering sas From oleks at arcturusnetworks.com Tue Feb 8 17:31:56 2022 From: oleks at arcturusnetworks.com (Oleksandr G Zhadan) Date: Tue, 8 Feb 2022 12:31:56 -0500 Subject: [Buildroot] [PATCH 1/1] board/arcturus/aarch64-ucls1012a: bump u-boot and kernel version In-Reply-To: References: <4b667326-5aca-538b-9b36-7f0d5a400e9f@arcturusnetworks.com> Message-ID: Hi Giulio, Thanks for the quick response and your notes. New V2 patch file attached. The patches are based on today's `git clone https://git.buildroot.net/buildroot`. Patches created with the options you suggested: `git format-patch -M -s -o . -1` Unfortunately I can't send it now with 'git send-email --to "buildroot " 0001-xxxx.patch`. If it doesn't work for you, we'll send it later. Kind Regards, Oleks On 2/7/22 12:29, Giulio Benetti wrote: > Hi Oleksandr, > > can you improve commit log? Looking at what you do below I see you do > more than just bumping u-boot and linux. Also please specify the > versions you're bumping to, > > On 07/02/22 16:53, Oleksandr G Zhadan wrote: >> Signed-off-by: Oleksandr G Zhadan >> Signed-off-by: Michael Durrant >> --- >> ? ?board/arcturus/aarch64-ucls1012a/post-build.sh??? |? 2 -- >> ? ?board/arcturus/aarch64-ucls1012a/readme.txt?????? |? 8 ++++---- >> ? ?.../rootfs_overlay/etc/init.d/S09modload????????? | 14 -------------- >> ? ?configs/arcturus_ucls1012a_defconfig????????????? | 15 >> +++++++-------- >> ? ?4 files changed, 11 insertions(+), 28 deletions(-) >> ? ?delete mode 100755 >> board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload >> >> diff --git a/board/arcturus/aarch64-ucls1012a/post-build.sh >> b/board/arcturus/aarch64-ucls1012a/post-build.sh >> index f8ba78095f..ca3862988d 100755 >> --- a/board/arcturus/aarch64-ucls1012a/post-build.sh >> +++ b/board/arcturus/aarch64-ucls1012a/post-build.sh >> @@ -1,5 +1,3 @@ >> ? ?#!/bin/sh >> >> -mkdir -p ${TARGET_DIR}/lib/firmware >> -cp -f ${BUILD_DIR}/linux-custom/firmware/ppfe/* >> ${TARGET_DIR}/lib/firmware/ >> ? ?cp -f ${BUILD_DIR}/linux-custom/br2-ucls1012a.its ${BINARIES_DIR}/ >> diff --git a/board/arcturus/aarch64-ucls1012a/readme.txt >> b/board/arcturus/aarch64-ucls1012a/readme.txt >> index 483d5e9aef..f892fc4abc 100644 >> --- a/board/arcturus/aarch64-ucls1012a/readme.txt >> +++ b/board/arcturus/aarch64-ucls1012a/readme.txt >> @@ -23,14 +23,14 @@ Result of the build >> ? ?After building, you should obtain this tree: >> >> ? ???? output/images/ >> -??? +-- arc-ucls1012a.dtb >> -??? +-- Image >> +??? +-- br2-ucls1012a.its >> +??? +-- Image.gz >> ? ???? +-- part0-000000.itb >> ? ???? +-- rootfs.cpio >> ? ???? +-- rootfs.cpio.gz >> ? ???? +-- rootfs.tar >> ? ???? +-- u-boot.bin >> -??? +-- ucls1012a.its >> +??? +-- ucls1012a-som.dtb >> >> ? ?Flashing >> ? ?-------- >> @@ -60,7 +60,7 @@ u-boot shell. >> ? ?4. Program the ITB image (includes Kernel, DTB and Ramdisk) >> >> ? ???? B$ tftp part0-000000.itb >> -??? B$ run iprogram >> +??? B$ run program0 >> >> ? ?5. Booting your new system >> >> diff --git >> a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload >> b/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload >> deleted file mode 100755 >> index c87ffda14f..0000000000 >> --- >> a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload >> +++ /dev/null >> @@ -1,14 +0,0 @@ >> -#!/bin/sh >> -# >> -case "$1" in >> -?????? start) >> -??????????????? modprobe pfe >> -??????????????? ;; >> -??????? stop) >> -??????????????? ;; >> -??????? restart|reload) >> -??????????????? ;; >> -??????? *) >> -??????????????? echo "Usage: $0 {start|stop|restart}" >> -??????????????? exit 1 >> -esac > > Here you remove this file for modprobe() fpe, why? Can you elabore in > commit log? > >> diff --git a/configs/arcturus_ucls1012a_defconfig >> b/configs/arcturus_ucls1012a_defconfig >> index fd33ebf1f6..f544a5240a 100644 >> --- a/configs/arcturus_ucls1012a_defconfig >> +++ b/configs/arcturus_ucls1012a_defconfig >> @@ -1,24 +1,23 @@ >> ? ?# Architecture >> ? ?BR2_aarch64=y >> >> -# Linux headers same as kernel, a 4.14 series >> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y >> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y >> >> ? ?# System settings >> ? ?BR2_TARGET_GENERIC_HOSTNAME="ucls1012a" >> ? ?BR2_TARGET_GENERIC_ISSUE="Welcome to uCLS1012A-SOM" >> ? ?BR2_SYSTEM_DHCP="eth0" >> -BR2_ROOTFS_OVERLAY="board/arcturus/aarch64-ucls1012a/rootfs_overlay" >> ?BR2_ROOTFS_POST_BUILD_SCRIPT="board/arcturus/aarch64-ucls1012a/post-build.sh" >> ?BR2_ROOTFS_POST_IMAGE_SCRIPT="board/arcturus/aarch64-ucls1012a/post-image.sh" >> >> ? ?# Kernel >> ? ?BR2_LINUX_KERNEL=y >> ? ?BR2_LINUX_KERNEL_CUSTOM_TARBALL=y >> -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call >> github,ArcturusNetworks,uCLS1012A-kernel,v.20.31)/linux-v.20.31.tar.gz" >> -BR2_LINUX_KERNEL_DEFCONFIG="ucls1012a" >> +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call >> github,ArcturusNetworks,uCLS1012A-kernel,v.22.05)/linux-v.22.05.tar.gz" >> +BR2_LINUX_KERNEL_DEFCONFIG="ucls1012a_som" > > Here ^^^ you also change the defconfig name, another thing to add to > commit log and the reason > >> +BR2_LINUX_KERNEL_IMAGEGZ=y > > Here ^^^ you change to zImage, another thing to add to commit log > >> ? ?BR2_LINUX_KERNEL_DTS_SUPPORT=y >> -BR2_LINUX_KERNEL_INTREE_DTS_NAME="arcturus/arc-ucls1012a" >> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="arcturus/ucls1012a-som" >> >> ? ?# Filesystem >> ? ?BR2_TARGET_ROOTFS_CPIO=y >> @@ -28,8 +27,8 @@ BR2_TARGET_ROOTFS_CPIO_GZIP=y >> ? ?BR2_TARGET_UBOOT=y >> ? ?BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y >> ? ?BR2_TARGET_UBOOT_CUSTOM_TARBALL=y >> -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call >> github,ArcturusNetworks,uCLS1012A-uboot,v.20.31)/uboot-v.20.31.tar.gz" >> -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="UCLS1012A_QSPI128" >> +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call >> github,ArcturusNetworks,uCLS1012A-uboot,v.22.05)/uboot-v.22.05.tar.gz" >> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="UCLS1012A_SOM" > > Ditto > >> ? ?# Tools >> ? ?BR2_PACKAGE_HOST_UBOOT_TOOLS=y > > Also, which Buildroot version do you use to create patch? > And which specific command do you use? I ask you this because patch > results malformed: > ``` > patch -p1 < > ~/Downloads/1-1-board-arcturus-aarch64-ucls1012a-bump-u-boot-and-kernel-version.patch > patching file board/arcturus/aarch64-ucls1012a/post-build.sh > Hunk #1 succeeded at 1 with fuzz 2. > patching file board/arcturus/aarch64-ucls1012a/readme.txt > Hunk #1 FAILED at 23. > Hunk #2 FAILED at 60. > 2 out of 2 hunks FAILED -- saving rejects to file > board/arcturus/aarch64-ucls1012a/readme.txt.rej > patching file > board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload > Reversed (or previously applied) patch detected!? Assume -R? [n] > Apply anyway? [n] > Skipping patch. > 1 out of 1 hunk ignored -- saving rejects to file > board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload.rej > patching file configs/arcturus_ucls1012a_defconfig > patch: **** malformed patch at line 201: > github,ArcturusNetworks,uCLS1012A-kernel,v.20.31)/linux-v.20.31.tar.gz" > ``` > > I've tried applying with: > git am xxx.patch > and then with: > patch -p1 < xxx.patch > > but that gave me the malformed patch error. > > Usually this is how I do: > Rebase > # git pull --rebase upstream master > Create the patch assuming it is on top of the commits > # git format-patch -M -s -o . -1 > Then I send it with: > # git send-email --to "buildroot " > 0001-xxxx.patch > > Can you please check? Because I want to give a build and check in > buildroot docker. > > Thank you! > > Best regards -- Oleksandr Zhadan oleks at arcturusnetworks.com 416.621.0125 x.235 }|{/\|)/\|-| -------------- next part -------------- A non-text attachment was scrubbed... Name: 0001-Buildroot-PATCH-V2-1-1-board-arcturus-aarch64-ucls10.patch Type: text/x-patch Size: 4483 bytes Desc: not available URL: From buildroot at busybox.net Tue Feb 8 17:37:20 2022 From: buildroot at busybox.net (busybox.net) Date: 8 Feb 2022 11:37:20 -0600 Subject: [Buildroot] ACTION REQUIRED Message-ID: <20220208113720.03C9A39E93F3AE2D@busybox.net> An HTML attachment was scrubbed... URL: From yann.morin at orange.com Tue Feb 8 18:05:26 2022 From: yann.morin at orange.com (yann.morin at orange.com) Date: Tue, 8 Feb 2022 19:05:26 +0100 Subject: [Buildroot] [PATCH 0/3] package/pkg-cargo: build in sub-directory Message-ID: <3095_1644343529_6202B0E9_3095_200_1_cover.1644343524.git.yann.morin@orange.com> From: "Yann E. MORIN" Hello All! This three-patch series allows cargo-based packages to reside in a sub-directory of the package source tree. It also allows cargo- and golang-based packages to declare their own download environment variables. The golang case was not tested, by lack of an affected package, but the change is simple enough (hopefully). Regards, Yann E. MORIN. The following changes since commit f9668ea37b81819794bb3964705f900895b54128 support/scripts/graph-build-time: add support for timeline graphing (2022-02-08 13:47:55 +0100) are available as patches in this mail series, for you to apply patches up to 61674c9d53c678f60a82c5c347147c31b9a29ba6 package/pkg-cargo: allow building in a sub-directory (2022-02-08 18:58:24 +0100) ---------------------------------------------------------------- Yann E. MORIN (3): package/pkg-cargo: allow packages to define download environment package/pkg-golang: allow packages to define download environment package/pkg-cargo: allow building in a sub-directory package/pkg-cargo.mk | 18 +++++++++++++----- package/pkg-golang.mk | 2 +- 2 files changed, 14 insertions(+), 6 deletions(-) -- ____________ .-----------------.--------------------: _ :------------------. | Yann E. MORIN | Real-Time Embedded | __/ ) | /"\ ASCII RIBBON | | +33 534.541.179 | Software Designer | _/ - /' | \ / CAMPAIGN | | +33 638.411.245 '--------------------: (_ `--, | X AGAINST | | yann.morin (at) orange.com |_=" ,--' | / \ HTML MAIL | '--------------------------------------:______/_____:------------------' _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From yann.morin at orange.com Tue Feb 8 18:05:28 2022 From: yann.morin at orange.com (yann.morin at orange.com) Date: Tue, 8 Feb 2022 19:05:28 +0100 Subject: [Buildroot] [PATCH 1/3] package/pkg-cargo: allow packages to define download environment In-Reply-To: References: Message-ID: <22854_1644343532_6202B0EC_22854_63_1_181af9d04551529f049a322dff7a44684beeabfc.1644343524.git.yann.morin@orange.com> From: "Yann E. MORIN" Currently, the cargo infrastructure forcibly sets the package _DL_ENV variable, instead of appending to it, which prevents packages from providing their own download environment variables. We fix that by using an append-assignment. Note: when introduced, that variable was explicitly not documented, and is supposed to only be used by packages infrastructures. However, that variable exists, and it can be (ab)used by br2-external packages (most probably to ill effects, but heh!). We anyway leave it undocumented, like _ROOTFS_PRE_CMD_HOOKS. Signed-off-by: Yann E. MORIN Cc: 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 e74a8358bc..66bea513e0 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -69,7 +69,7 @@ define inner-cargo-package $(2)_DOWNLOAD_DEPENDENCIES += host-rustc $(2)_DOWNLOAD_POST_PROCESS = cargo -$(2)_DL_ENV = CARGO_HOME=$$(HOST_DIR)/share/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.25.1 _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From yann.morin at orange.com Tue Feb 8 18:05:29 2022 From: yann.morin at orange.com (yann.morin at orange.com) Date: Tue, 8 Feb 2022 19:05:29 +0100 Subject: [Buildroot] [PATCH 2/3] package/pkg-golang: allow packages to define download environment In-Reply-To: References: Message-ID: <30606_1644343535_6202B0EF_30606_119_1_9d53b11cbc235d413367e901185b296b2c82b589.1644343524.git.yann.morin@orange.com> From: "Yann E. MORIN" Currently, the golang infrastructure forcibly sets the package _DL_ENV variable, instead of appending to it, which prevents packages from providing their own download environment variables. We fix that by using an append-assignment. Note: when introduced, that variable was explicitly not documented, and is supposed to only be used by packages infrastructures. However, that variable exists, and it can be (ab)used by br2-external packages (most probably to ill effects, but heh!). We anyway leave it undocumented, like _ROOTFS_PRE_CMD_HOOKS. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Christian Stewart Cc: Anisse Astier --- 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..69eae02830 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -83,7 +83,7 @@ endef $(2)_POST_PATCH_HOOKS += $(2)_GEN_GOMOD $(2)_DOWNLOAD_POST_PROCESS = go -$(2)_DL_ENV = \ +$(2)_DL_ENV += \ $(HOST_GO_COMMON_ENV) \ GOPROXY=direct \ BR_GOMOD=$$($(2)_GOMOD) -- 2.25.1 _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From yann.morin at orange.com Tue Feb 8 18:05:30 2022 From: yann.morin at orange.com (yann.morin at orange.com) Date: Tue, 8 Feb 2022 19:05:30 +0100 Subject: [Buildroot] [PATCH 3/3] package/pkg-cargo: allow building in a sub-directory In-Reply-To: References: Message-ID: <3095_1644343537_6202B0F1_3095_214_1_61674c9d53c678f60a82c5c347147c31b9a29ba6.1644343524.git.yann.morin@orange.com> From: "Yann E. MORIN" Some packages have their rust sources as a sub-directory, rather than at the root of the source tree. Do like we do for autotools-package, and use the package's _SRCDIR rather than the top-level directory $(@D). Additionally, in such a situation, it is more than probable that the Cargo.toml is also present in that sub-directory, so use that when vendoring the package, unless the package took extra precautions to specify an alternate location. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni --- package/pkg-cargo.mk | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index 66bea513e0..68e15e066c 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -71,6 +71,14 @@ $(2)_DOWNLOAD_DEPENDENCIES += host-rustc $(2)_DOWNLOAD_POST_PROCESS = cargo $(2)_DL_ENV += CARGO_HOME=$$(HOST_DIR)/share/cargo +# If building in a sub directory, use that to find the Cargo.toml, unless +# the package already provided its location. +ifneq ($$($(2)_SUBDIR),) +ifneq ($$(filter BR_CARGO_MANIFEST_PATH=%,$$($(2)_DL_ENV))) +$(2)_DL_ENV += BR_CARGO_MANIFEST_PATH=$$($(2)_SUBDIR)/Cargo.toml +endif +endif + # Due to vendoring, it is pretty likely that not all licenses are # listed in _LICENSE. $(2)_LICENSE += , vendored dependencies licenses probably not listed @@ -97,7 +105,7 @@ $(2)_LICENSE += , vendored dependencies licenses probably not listed ifndef $(2)_BUILD_CMDS ifeq ($(4),target) define $(2)_BUILD_CMDS - cd $$(@D) && \ + cd $$($$(PKG)_SRCDIR) && \ $$(TARGET_MAKE_ENV) \ $$(TARGET_CONFIGURE_OPTS) \ $$(PKG_CARGO_ENV) \ @@ -111,7 +119,7 @@ define $(2)_BUILD_CMDS endef else # ifeq ($(4),target) define $(2)_BUILD_CMDS - cd $$(@D) && \ + cd $$($$(PKG)_SRCDIR) && \ $$(HOST_MAKE_ENV) \ RUSTFLAGS="$$(addprefix -C link-args=,$$(HOST_LDFLAGS))" \ $$(HOST_CONFIGURE_OPTS) \ @@ -133,7 +141,7 @@ endif # ifndef $(2)_BUILD_CMDS # ifndef $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS - cd $$(@D) && \ + cd $$($$(PKG)_SRCDIR) && \ $$(TARGET_MAKE_ENV) \ $$(TARGET_CONFIGURE_OPTS) \ $$(PKG_CARGO_ENV) \ @@ -152,7 +160,7 @@ endif ifndef $(2)_INSTALL_CMDS define $(2)_INSTALL_CMDS - cd $$(@D) && \ + cd $$($$(PKG)_SRCDIR) && \ $$(HOST_MAKE_ENV) \ RUSTFLAGS="$$(addprefix -C link-args=,$$(HOST_LDFLAGS))" \ $$(HOST_CONFIGURE_OPTS) \ -- 2.25.1 _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From giulio.benetti at benettiengineering.com Tue Feb 8 18:25:01 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 8 Feb 2022 19:25:01 +0100 Subject: [Buildroot] [PATCH 1/1] board/arcturus/aarch64-ucls1012a: bump u-boot and kernel version In-Reply-To: References: <4b667326-5aca-538b-9b36-7f0d5a400e9f@arcturusnetworks.com> Message-ID: <2920974c-149f-ea4c-9b79-9a1b862fce95@benettiengineering.com> Hi Oleksandr, On 08/02/22 18:31, Oleksandr G Zhadan wrote: > Hi Giulio, > > Thanks for the quick response and your notes. > > New V2 patch file attached. The patches are based on today's `git clone > https://git.buildroot.net/buildroot`. good > Patches created with the options you suggested: `git format-patch -M -s > -o . -1` Ok, but you also need the flag -v2, so this is the command: # git format-patch -M -s -o . -1 -v2 And then you need to add what's changed after the 3 dashes. Check this patch as an example: https://lists.buildroot.org/pipermail/buildroot/2022-February/635926.html Take care of adding 3 dashes and listing: --- V1->V2: * changed this * changed that --- > Unfortunately I can't send it now with 'git send-email --to "buildroot > " 0001-xxxx.patch`. If it doesn't work for you, > we'll send it later. Yes, we need it sent like that for reviewing. Anyway I've checked that the attached patch now applies correctly, so you're on the right path! Best regards -- Giulio Benetti Benetti Engineering sas > > Kind Regards, > > Oleks > > > On 2/7/22 12:29, Giulio Benetti wrote: >> Hi Oleksandr, >> >> can you improve commit log? Looking at what you do below I see you do >> more than just bumping u-boot and linux. Also please specify the >> versions you're bumping to, >> >> On 07/02/22 16:53, Oleksandr G Zhadan wrote: >>> Signed-off-by: Oleksandr G Zhadan >>> Signed-off-by: Michael Durrant >>> --- >>> ? ?board/arcturus/aarch64-ucls1012a/post-build.sh??? |? 2 -- >>> ? ?board/arcturus/aarch64-ucls1012a/readme.txt?????? |? 8 ++++---- >>> ? ?.../rootfs_overlay/etc/init.d/S09modload????????? | 14 -------------- >>> ? ?configs/arcturus_ucls1012a_defconfig????????????? | 15 >>> +++++++-------- >>> ? ?4 files changed, 11 insertions(+), 28 deletions(-) >>> ? ?delete mode 100755 >>> board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload >>> >>> diff --git a/board/arcturus/aarch64-ucls1012a/post-build.sh >>> b/board/arcturus/aarch64-ucls1012a/post-build.sh >>> index f8ba78095f..ca3862988d 100755 >>> --- a/board/arcturus/aarch64-ucls1012a/post-build.sh >>> +++ b/board/arcturus/aarch64-ucls1012a/post-build.sh >>> @@ -1,5 +1,3 @@ >>> ? ?#!/bin/sh >>> >>> -mkdir -p ${TARGET_DIR}/lib/firmware >>> -cp -f ${BUILD_DIR}/linux-custom/firmware/ppfe/* >>> ${TARGET_DIR}/lib/firmware/ >>> ? ?cp -f ${BUILD_DIR}/linux-custom/br2-ucls1012a.its ${BINARIES_DIR}/ >>> diff --git a/board/arcturus/aarch64-ucls1012a/readme.txt >>> b/board/arcturus/aarch64-ucls1012a/readme.txt >>> index 483d5e9aef..f892fc4abc 100644 >>> --- a/board/arcturus/aarch64-ucls1012a/readme.txt >>> +++ b/board/arcturus/aarch64-ucls1012a/readme.txt >>> @@ -23,14 +23,14 @@ Result of the build >>> ? ?After building, you should obtain this tree: >>> >>> ? ???? output/images/ >>> -??? +-- arc-ucls1012a.dtb >>> -??? +-- Image >>> +??? +-- br2-ucls1012a.its >>> +??? +-- Image.gz >>> ? ???? +-- part0-000000.itb >>> ? ???? +-- rootfs.cpio >>> ? ???? +-- rootfs.cpio.gz >>> ? ???? +-- rootfs.tar >>> ? ???? +-- u-boot.bin >>> -??? +-- ucls1012a.its >>> +??? +-- ucls1012a-som.dtb >>> >>> ? ?Flashing >>> ? ?-------- >>> @@ -60,7 +60,7 @@ u-boot shell. >>> ? ?4. Program the ITB image (includes Kernel, DTB and Ramdisk) >>> >>> ? ???? B$ tftp part0-000000.itb >>> -??? B$ run iprogram >>> +??? B$ run program0 >>> >>> ? ?5. Booting your new system >>> >>> diff --git >>> a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload >>> b/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload >>> deleted file mode 100755 >>> index c87ffda14f..0000000000 >>> --- >>> a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload >>> +++ /dev/null >>> @@ -1,14 +0,0 @@ >>> -#!/bin/sh >>> -# >>> -case "$1" in >>> -?????? start) >>> -??????????????? modprobe pfe >>> -??????????????? ;; >>> -??????? stop) >>> -??????????????? ;; >>> -??????? restart|reload) >>> -??????????????? ;; >>> -??????? *) >>> -??????????????? echo "Usage: $0 {start|stop|restart}" >>> -??????????????? exit 1 >>> -esac >> >> Here you remove this file for modprobe() fpe, why? Can you elabore in >> commit log? >> >>> diff --git a/configs/arcturus_ucls1012a_defconfig >>> b/configs/arcturus_ucls1012a_defconfig >>> index fd33ebf1f6..f544a5240a 100644 >>> --- a/configs/arcturus_ucls1012a_defconfig >>> +++ b/configs/arcturus_ucls1012a_defconfig >>> @@ -1,24 +1,23 @@ >>> ? ?# Architecture >>> ? ?BR2_aarch64=y >>> >>> -# Linux headers same as kernel, a 4.14 series >>> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y >>> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y >>> >>> ? ?# System settings >>> ? ?BR2_TARGET_GENERIC_HOSTNAME="ucls1012a" >>> ? ?BR2_TARGET_GENERIC_ISSUE="Welcome to uCLS1012A-SOM" >>> ? ?BR2_SYSTEM_DHCP="eth0" >>> -BR2_ROOTFS_OVERLAY="board/arcturus/aarch64-ucls1012a/rootfs_overlay" >>> ?BR2_ROOTFS_POST_BUILD_SCRIPT="board/arcturus/aarch64-ucls1012a/post-build.sh" >>> ?BR2_ROOTFS_POST_IMAGE_SCRIPT="board/arcturus/aarch64-ucls1012a/post-image.sh" >>> >>> ? ?# Kernel >>> ? ?BR2_LINUX_KERNEL=y >>> ? ?BR2_LINUX_KERNEL_CUSTOM_TARBALL=y >>> -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call >>> github,ArcturusNetworks,uCLS1012A-kernel,v.20.31)/linux-v.20.31.tar.gz" >>> -BR2_LINUX_KERNEL_DEFCONFIG="ucls1012a" >>> +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call >>> github,ArcturusNetworks,uCLS1012A-kernel,v.22.05)/linux-v.22.05.tar.gz" >>> +BR2_LINUX_KERNEL_DEFCONFIG="ucls1012a_som" >> >> Here ^^^ you also change the defconfig name, another thing to add to >> commit log and the reason >> >>> +BR2_LINUX_KERNEL_IMAGEGZ=y >> >> Here ^^^ you change to zImage, another thing to add to commit log >> >>> ? ?BR2_LINUX_KERNEL_DTS_SUPPORT=y >>> -BR2_LINUX_KERNEL_INTREE_DTS_NAME="arcturus/arc-ucls1012a" >>> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="arcturus/ucls1012a-som" >>> >>> ? ?# Filesystem >>> ? ?BR2_TARGET_ROOTFS_CPIO=y >>> @@ -28,8 +27,8 @@ BR2_TARGET_ROOTFS_CPIO_GZIP=y >>> ? ?BR2_TARGET_UBOOT=y >>> ? ?BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y >>> ? ?BR2_TARGET_UBOOT_CUSTOM_TARBALL=y >>> -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call >>> github,ArcturusNetworks,uCLS1012A-uboot,v.20.31)/uboot-v.20.31.tar.gz" >>> -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="UCLS1012A_QSPI128" >>> +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call >>> github,ArcturusNetworks,uCLS1012A-uboot,v.22.05)/uboot-v.22.05.tar.gz" >>> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="UCLS1012A_SOM" >> >> Ditto >> >>> ? ?# Tools >>> ? ?BR2_PACKAGE_HOST_UBOOT_TOOLS=y >> >> Also, which Buildroot version do you use to create patch? >> And which specific command do you use? I ask you this because patch >> results malformed: >> ``` >> patch -p1 < >> ~/Downloads/1-1-board-arcturus-aarch64-ucls1012a-bump-u-boot-and-kernel-version.patch >> patching file board/arcturus/aarch64-ucls1012a/post-build.sh >> Hunk #1 succeeded at 1 with fuzz 2. >> patching file board/arcturus/aarch64-ucls1012a/readme.txt >> Hunk #1 FAILED at 23. >> Hunk #2 FAILED at 60. >> 2 out of 2 hunks FAILED -- saving rejects to file >> board/arcturus/aarch64-ucls1012a/readme.txt.rej >> patching file >> board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload >> Reversed (or previously applied) patch detected!? Assume -R? [n] >> Apply anyway? [n] >> Skipping patch. >> 1 out of 1 hunk ignored -- saving rejects to file >> board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload.rej >> patching file configs/arcturus_ucls1012a_defconfig >> patch: **** malformed patch at line 201: >> github,ArcturusNetworks,uCLS1012A-kernel,v.20.31)/linux-v.20.31.tar.gz" >> ``` >> >> I've tried applying with: >> git am xxx.patch >> and then with: >> patch -p1 < xxx.patch >> >> but that gave me the malformed patch error. >> >> Usually this is how I do: >> Rebase >> # git pull --rebase upstream master >> Create the patch assuming it is on top of the commits >> # git format-patch -M -s -o . -1 >> Then I send it with: >> # git send-email --to "buildroot " >> 0001-xxxx.patch >> >> Can you please check? Because I want to give a build and check in >> buildroot docker. >> >> Thank you! >> >> Best regards > From fontaine.fabrice at gmail.com Tue Feb 8 18:26:36 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 8 Feb 2022 19:26:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/neon: fix ssl build without threads Message-ID: <20220208182636.3976618-1-fontaine.fabrice@gmail.com> Fix the following ssl build failure without threads raised since bump to version 0.32.2 in commit 029a6dc3e3320984c6369747e0b79060f13b2afc and https://github.com/notroj/neon/commit/281c84fc3996c757efdf6e9b3f906d7a1fc08b1d: ne_openssl.c:43:10: fatal error: pthread.h: No such file or directory 43 | #include | ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/da995ef26001357e51a5907de9c6111b9ff89bdf Signed-off-by: Fabrice Fontaine --- ...se-TS_SSL-feature-with-OpenSSL-1.1.0.patch | 76 +++++++++++++++++++ .../0002-configure.ac-fix-autoreconf.patch | 28 +++++++ package/neon/neon.mk | 2 + 3 files changed, 106 insertions(+) create mode 100644 package/neon/0001-Revert-Advertise-TS_SSL-feature-with-OpenSSL-1.1.0.patch create mode 100644 package/neon/0002-configure.ac-fix-autoreconf.patch diff --git a/package/neon/0001-Revert-Advertise-TS_SSL-feature-with-OpenSSL-1.1.0.patch b/package/neon/0001-Revert-Advertise-TS_SSL-feature-with-OpenSSL-1.1.0.patch new file mode 100644 index 0000000000..02088bfe02 --- /dev/null +++ b/package/neon/0001-Revert-Advertise-TS_SSL-feature-with-OpenSSL-1.1.0.patch @@ -0,0 +1,76 @@ +From 8f9e110b391f065536780d19c2257ad7afd83522 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 31 Jan 2022 23:42:13 +0100 +Subject: [PATCH] Revert "Advertise TS_SSL feature with OpenSSL >= 1.1.0." + +This reverts commit 281c84fc3996c757efdf6e9b3f906d7a1fc08b1d. + +Indeed openssl can be built on toolchains without threads support which +will result in the following build failure: + +ne_openssl.c:43:10: fatal error: pthread.h: No such file or directory + 43 | #include + | ^~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/da995ef26001357e51a5907de9c6111b9ff89bdf + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/notroj/neon/pull/71] +--- + macros/neon.m4 | 15 ++++----------- + src/ne_openssl.c | 4 ++-- + 2 files changed, 6 insertions(+), 13 deletions(-) + +diff --git a/macros/neon.m4 b/macros/neon.m4 +index 129d4ac..5a5fb1b 100644 +--- a/macros/neon.m4 ++++ b/macros/neon.m4 +@@ -960,13 +960,9 @@ yes|openssl) + AC_CHECK_HEADERS(openssl/ssl.h openssl/opensslv.h,, + [AC_MSG_ERROR([OpenSSL headers not found, cannot enable SSL support])]) + ++ # Enable EGD support if using 0.9.7 or newer + NE_CHECK_OPENSSLVER(ne_cv_lib_ssl097, 0.9.7, 0x00907000L) +- NE_CHECK_OPENSSLVER(ne_cv_lib_ssl110, 1.1.0, 0x10100000L) +- if test "$ne_cv_lib_ssl110" = "yes"; then +- NE_ENABLE_SUPPORT(SSL, [SSL support enabled, using OpenSSL $NE_SSL_VERSION]) +- AC_DEFINE(HAVE_OPENSSL11, 1, [Enable OpenSSL 1.1 support]) +- elif test "$ne_cv_lib_ssl097" = "yes"; then +- # Enable EGD support if using 0.9.7 or newer ++ if test "$ne_cv_lib_ssl097" = "yes"; then + AC_MSG_NOTICE([OpenSSL >= 0.9.7; EGD support not needed in neon]) + NE_ENABLE_SUPPORT(SSL, [SSL support enabled, using OpenSSL $NE_SSL_VERSION]) + NE_CHECK_FUNCS(CRYPTO_set_idptr_callback SSL_SESSION_cmp) +@@ -1074,11 +1070,8 @@ CC/CFLAGS/LIBS must be used to make the POSIX library interfaces + available]),, + enable_threadsafe_ssl=no) + +-case ${enable_threadsafe_ssl}X${ne_cv_lib_ssl110} in +-*Xyes) +- NE_ENABLE_SUPPORT(TS_SSL, [OpenSSL is natively thread-safe]) +- ;; +-posixX*|yesX*) ++case $enable_threadsafe_ssl in ++posix|yes) + ne_pthr_ok=yes + AC_CHECK_FUNCS([pthread_mutex_init pthread_mutex_lock],,[ne_pthr_ok=no]) + if test "${ne_pthr_ok}" = "no"; then +diff --git a/src/ne_openssl.c b/src/ne_openssl.c +index 41a5c05..96c768e 100644 +--- a/src/ne_openssl.c ++++ b/src/ne_openssl.c +@@ -1194,8 +1194,8 @@ char *ne_vstrhash(unsigned int flags, va_list ap) + return ne__strhash2hex(v, vlen, flags); + } + +-#if defined(NE_HAVE_TS_SSL) && OPENSSL_VERSION_NUMBER < 0x10100000L +-/* From OpenSSL 1.1.0 locking callbacks are no longer needed. */ ++#if defined(NE_HAVE_TS_SSL) && OPENSSL_VERSION_NUMBER < 0x10101000L ++/* For OpenSSL 1.1.1 locking callbacks are no longer need at all. */ + #define WITH_OPENSSL_LOCKING (1) + + /* Implementation of locking callbacks to make OpenSSL thread-safe. +-- +2.34.1 + diff --git a/package/neon/0002-configure.ac-fix-autoreconf.patch b/package/neon/0002-configure.ac-fix-autoreconf.patch new file mode 100644 index 0000000000..cd63d1ed41 --- /dev/null +++ b/package/neon/0002-configure.ac-fix-autoreconf.patch @@ -0,0 +1,28 @@ +From cf779609a5dd38f0a8fdb3c4539371f13fd3a24a Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 8 Feb 2022 18:34:25 +0100 +Subject: [PATCH] configure.ac: fix autoreconf + +Add AC_CONFIG_MACRO_DIR(macros) to fix autoreconf + +Signed-off-by: Fabrice Fontaine +[Upstream status: not sent yet] +--- + configure.ac | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 37b14ec..122151d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1,5 +1,7 @@ + AC_PREREQ(2.58) dnl 2.58 required for AS_HELP_STRING + ++AC_CONFIG_MACRO_DIR(macros) ++ + dnl Extract the version (sans LF) from .version, created at release-time. + m4_define(ne_version, [m4_translit(m4_include(.version), [ + ])]) +-- +2.34.1 + diff --git a/package/neon/neon.mk b/package/neon/neon.mk index 3bbd12561f..eae6bfbad6 100644 --- a/package/neon/neon.mk +++ b/package/neon/neon.mk @@ -10,6 +10,8 @@ NEON_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (manual and tests) NEON_LICENSE_FILES = src/COPYING.LIB test/COPYING README.md NEON_CPE_ID_VENDOR = webdav NEON_INSTALL_STAGING = YES +# We're patching configure.ac +NEON_AUTORECONF = YES NEON_CONF_OPTS = --without-gssapi --disable-rpath NEON_CONFIG_SCRIPTS = neon-config NEON_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES) -- 2.34.1 From fontaine.fabrice at gmail.com Tue Feb 8 18:29:29 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 8 Feb 2022 19:29:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/resiprocate: fix build of rend with gcc 11 Message-ID: <20220208182929.3976984-1-fontaine.fabrice@gmail.com> Fix the following build failure of rend with gcc 11: /home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/riscv32-buildroot-linux-gnu/include/c++/11.2.0/bits/stl_tree.h:770:15: error: static assertion failed: comparison object must be invocable as const 770 | is_invocable_v, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/ad9d89fefe1a667daa123397a072bf130bfa03a7 Signed-off-by: Fabrice Fontaine --- ...e-issue-compiling-with-Visual-Studio.patch | 95 +++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100644 package/resiprocate/0001-Fix-some-issue-compiling-with-Visual-Studio.patch diff --git a/package/resiprocate/0001-Fix-some-issue-compiling-with-Visual-Studio.patch b/package/resiprocate/0001-Fix-some-issue-compiling-with-Visual-Studio.patch new file mode 100644 index 0000000000..826774ce8d --- /dev/null +++ b/package/resiprocate/0001-Fix-some-issue-compiling-with-Visual-Studio.patch @@ -0,0 +1,95 @@ +From be76b10a50749e2e11dce8dcc38b414a7f9d8747 Mon Sep 17 00:00:00 2001 +From: Ben Walden +Date: Sat, 22 Aug 2020 23:14:11 +0100 +Subject: [PATCH] Fix some issue compiling with Visual Studio 16.7.0 and tidy + up Visual Studio 16 project files + +[Retrieved (and updated to keep only RendKa.cxx update) from: +https://github.com/resiprocate/resiprocate/commit/be76b10a50749e2e11dce8dcc38b414a7f9d8747] +SIgned-off-by: Fabrice Fontaine +--- + VisualStudioReadme.htm | 65 + + contrib/GeoIP/GeoIP_12_0.vcxproj | 550 ------- + contrib/GeoIP/GeoIP_16_0.vcxproj | 93 +- + .../db/build_windows/db_static_12_0.vcxproj | 1260 ----------------- + .../db/build_windows/db_static_16_0.vcxproj | 696 +-------- + contrib/db/dbinc/atomic.h | 4 +- + contrib/db/mp/mp_fget.c | 4 +- + contrib/db/mp/mp_mvcc.c | 4 +- + contrib/db/mp/mp_region.c | 4 +- + contrib/db/mutex/mut_method.c | 2 +- + contrib/pcre/pcre_12_0.vcxproj | 466 ------ + contrib/pcre/pcre_16_0.vcxproj | 159 +-- + contrib/popt/popt_12_0.vcxproj | 394 ------ + contrib/popt/popt_16_0.vcxproj | 120 +- + reSIProcate_16_0.sln | 58 +- + .../queuetostream_12_0.vcxproj | 582 -------- + .../queuetostream_16_0.vcxproj | 207 ++- + repro/repro_12_0.vcxproj | 825 ----------- + repro/repro_12_0.vcxproj.filters | 47 - + repro/repro_16_0.vcxproj | 159 ++- + repro/reprocmd/reprocmd_12_0.vcxproj | 597 -------- + repro/reprocmd/reprocmd_16_0.vcxproj | 139 +- + repro/reprolib_12_0.vcxproj | 596 -------- + repro/reprolib_12_0.vcxproj.filters | 136 -- + repro/reprolib_16_0.vcxproj | 132 +- + resip/dum/dum_12_0.vcxproj | 615 -------- + resip/dum/dum_16_0.vcxproj | 124 +- + resip/dum/test/basicCall_12_0.vcxproj | 621 -------- + resip/dum/test/basicCall_16_0.vcxproj | 145 +- + resip/dum/test/basicClient_12_0.vcxproj | 653 --------- + resip/dum/test/basicClient_16_0.vcxproj | 158 +-- + resip/dum/test/basicMessage_12_0.vcxproj | 615 -------- + resip/dum/test/basicMessage_16_0.vcxproj | 141 +- + resip/dum/test/basicRegister_12_0.vcxproj | 615 -------- + resip/dum/test/basicRegister_16_0.vcxproj | 137 +- + resip/rend/RendKa.cxx | 2 +- + resip/rend/rend_12_0.vcxproj | 352 ----- + resip/rend/rend_16_0.vcxproj | 89 +- + resip/stack/resiprocate_12_0.vcxproj | 873 ------------ + resip/stack/resiprocate_12_0.vcxproj.filters | 351 ----- + resip/stack/resiprocate_16_0.vcxproj | 165 ++- + resip/stack/test/test_12_0.vcxproj | 627 -------- + resip/stack/test/test_16_0.vcxproj | 171 ++- + rutil/dns/ares/ares_12_0.vcxproj | 488 ------- + rutil/dns/ares/ares_12_0.vcxproj.filters | 34 - + rutil/dns/ares/ares_16_0.vcxproj | 159 +-- + rutil/rutil_12_0.vcxproj | 604 -------- + rutil/rutil_16_0.vcxproj | 153 +- + 48 files changed, 1409 insertions(+), 13782 deletions(-) + delete mode 100644 contrib/GeoIP/GeoIP_12_0.vcxproj + delete mode 100644 contrib/db/build_windows/db_static_12_0.vcxproj + delete mode 100644 contrib/pcre/pcre_12_0.vcxproj + delete mode 100644 contrib/popt/popt_12_0.vcxproj + delete mode 100644 repro/accountingconsumers/queuetostream_12_0.vcxproj + delete mode 100644 repro/repro_12_0.vcxproj + delete mode 100644 repro/repro_12_0.vcxproj.filters + delete mode 100644 repro/reprocmd/reprocmd_12_0.vcxproj + delete mode 100644 repro/reprolib_12_0.vcxproj + delete mode 100644 repro/reprolib_12_0.vcxproj.filters + delete mode 100644 resip/dum/dum_12_0.vcxproj + delete mode 100644 resip/dum/test/basicCall_12_0.vcxproj + delete mode 100644 resip/dum/test/basicClient_12_0.vcxproj + delete mode 100644 resip/dum/test/basicMessage_12_0.vcxproj + delete mode 100644 resip/dum/test/basicRegister_12_0.vcxproj + delete mode 100644 resip/rend/rend_12_0.vcxproj + delete mode 100644 resip/stack/resiprocate_12_0.vcxproj + delete mode 100644 resip/stack/resiprocate_12_0.vcxproj.filters + delete mode 100644 resip/stack/test/test_12_0.vcxproj + delete mode 100644 rutil/dns/ares/ares_12_0.vcxproj + delete mode 100644 rutil/dns/ares/ares_12_0.vcxproj.filters + delete mode 100644 rutil/rutil_12_0.vcxproj + +diff --git a/resip/rend/RendKa.cxx b/resip/rend/RendKa.cxx +index 8645f17636..8321ada1ee 100644 +--- a/resip/rend/RendKa.cxx ++++ b/resip/rend/RendKa.cxx +@@ -66,7 +66,7 @@ bool operator<(const RendKaAssoc& a, const RendKaAssoc& b) + + struct RendKaConn + { +- bool operator() (const RendKaAssocPtr& a, const RendKaAssocPtr& b) ++ bool operator()(const RendKaAssocPtr& a, const RendKaAssocPtr& b) const + { + return *a < *b; + } -- 2.34.1 From fontaine.fabrice at gmail.com Tue Feb 8 19:18:36 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 8 Feb 2022 20:18:36 +0100 Subject: [Buildroot] [PATCH 1/2] package/keepalived: fix build with kernel < 4.13 Message-ID: <20220208191837.4057713-1-fontaine.fabrice@gmail.com> Fix the following build failure with kernel < 4.13 raised since bump to version 2.27 in commit 79f631000fe6846e72f44810452bb764c228ad44: vrrp_nftables.c: In function 'setup_rule_move_igmp': vrrp_nftables.c:1226:15: error: 'NFT_META_L4PROTO' undeclared (first use in this function) add_meta(r, NFT_META_L4PROTO, NFT_REG_1); ^ Fixes: - http://autobuild.buildroot.org/results/2132570fb0407abc0e70146d771471e13ef10237 Signed-off-by: Fabrice Fontaine --- ...upport-meta-l4proro-until-Linux-3-14.patch | 76 +++++++++++++++++++ ...upport-meta-l4proro-until-Linux-3-14.patch | 40 ++++++++++ package/keepalived/keepalived.mk | 2 + 3 files changed, 118 insertions(+) create mode 100644 package/keepalived/0001-vrrp-nft-didn-t-support-meta-l4proro-until-Linux-3-14.patch create mode 100644 package/keepalived/0002-ipvs-nft-didn-t-support-meta-l4proro-until-Linux-3-14.patch diff --git a/package/keepalived/0001-vrrp-nft-didn-t-support-meta-l4proro-until-Linux-3-14.patch b/package/keepalived/0001-vrrp-nft-didn-t-support-meta-l4proro-until-Linux-3-14.patch new file mode 100644 index 0000000000..9d5f3f7905 --- /dev/null +++ b/package/keepalived/0001-vrrp-nft-didn-t-support-meta-l4proro-until-Linux-3-14.patch @@ -0,0 +1,76 @@ +From edc71b19c619fdc1d71df10a2d0e8f5822965d69 Mon Sep 17 00:00:00 2001 +From: Quentin Armitage +Date: Tue, 8 Feb 2022 14:58:49 +0000 +Subject: [PATCH] vrrp: nft didn't support meta l4proro until Linux 3.14 + +For Linux 3.13 (first version to support nftables), we instead specify: + at nh,48,8 58 + +Signed-off-by: Quentin Armitage + +[Retrieved (and updated to drop update of README.kernel_versions) from: +https://github.com/acassen/keepalived/commit/edc71b19c619fdc1d71df10a2d0e8f5822965d69] +Signed-off-by: Fabrice Fontaine +--- + README.kernel_versions | 1 + + configure.ac | 5 +++++ + keepalived/vrrp/vrrp_nftables.c | 16 ++++++++++++++-- + 3 files changed, 20 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 350a9f4e9..bc643dbf1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1754,6 +1754,11 @@ if test .${enable_nftables} != .no; then + ],[ + AC_MSG_RESULT(no) + ]) ++ ++ # nft l4proto from Linux 3.14 ++ AC_CHECK_DECLS([NFT_META_L4PROTO], [], [], ++ [#include ]) ++ + # nft dup from Linux 4.3 + AC_CHECK_DECLS([NFTA_DUP_MAX], [], [], + [#include ]) +diff --git a/keepalived/vrrp/vrrp_nftables.c b/keepalived/vrrp/vrrp_nftables.c +index d3ea39db3..8b5095ad4 100644 +--- a/keepalived/vrrp/vrrp_nftables.c ++++ b/keepalived/vrrp/vrrp_nftables.c +@@ -1191,6 +1191,8 @@ setup_rule_move_igmp(uint8_t family, const char *table, + otherwise: + nft add rule ip keepalived out ip protocol igmp [meta oifkind macvlan] oif @vmac_set drop + nft add rule ip6 keepalived out icmpv6 type mld2-listener-report [meta oifkind macvlan] oif @vmac_set drop ++ * ++ * Note: on 3.13 kernels, icmpv6 is specified as @nh,48,8 58 + */ + struct nftnl_rule *r = NULL; + uint64_t handle_num; +@@ -1223,7 +1225,12 @@ setup_rule_move_igmp(uint8_t family, const char *table, + offsetof(struct iphdr, daddr), sizeof(struct in_addr)); + #endif + } else { +- add_meta(r, NFT_META_L4PROTO, NFT_REG_1); ++#if HAVE_DECL_NFT_META_L4PROTO ++ add_meta(r, NFT_META_L4PROTO, NFT_REG_1); /* From Linux 3.14 */ ++#else ++ add_payload(r, NFT_PAYLOAD_NETWORK_HEADER, NFT_REG_1, ++ offsetof(struct ip6_hdr, ip6_nxt), sizeof(((struct ip6_hdr *)NULL)->ip6_nxt)); ++#endif + protocol = IPPROTO_ICMPV6; + add_cmp(r, NFT_REG_1, NFT_CMP_EQ, &protocol, sizeof(protocol)); + add_payload(r, NFT_PAYLOAD_TRANSPORT_HEADER, NFT_REG_1, +@@ -1279,7 +1286,12 @@ setup_rule_drop_router_solicit(const char *table, const char *chain, + nftnl_rule_set_u64(r, NFTNL_RULE_POSITION, handle_num); + } + +- add_meta(r, NFT_META_L4PROTO, NFT_REG_1); ++#if HAVE_DECL_NFT_META_L4PROTO ++ add_meta(r, NFT_META_L4PROTO, NFT_REG_1); /* From Linux 3.14 */ ++#else ++ add_payload(r, NFT_PAYLOAD_NETWORK_HEADER, NFT_REG_1, ++ offsetof(struct ip6_hdr, ip6_nxt), sizeof(((struct ip6_hdr *)NULL)->ip6_nxt)); ++#endif + protocol = IPPROTO_ICMPV6; + add_cmp(r, NFT_REG_1, NFT_CMP_EQ, &protocol, sizeof(protocol)); + add_payload(r, NFT_PAYLOAD_TRANSPORT_HEADER, NFT_REG_1, diff --git a/package/keepalived/0002-ipvs-nft-didn-t-support-meta-l4proro-until-Linux-3-14.patch b/package/keepalived/0002-ipvs-nft-didn-t-support-meta-l4proro-until-Linux-3-14.patch new file mode 100644 index 0000000000..3713de37c2 --- /dev/null +++ b/package/keepalived/0002-ipvs-nft-didn-t-support-meta-l4proro-until-Linux-3-14.patch @@ -0,0 +1,40 @@ +From 50e8a8d56cd5a3d7184b035708865302bbc7ef69 Mon Sep 17 00:00:00 2001 +From: Quentin Armitage +Date: Tue, 8 Feb 2022 17:43:49 +0000 +Subject: [PATCH] ipvs: nft didn't support meta l4proro until Linux 3.14 + +For Linux 3.13 (first version to support nftables), we instead specify: +ipv4: @nh,72,8 PROTO +ipv6: @nh,48,8 PROTO + +Signed-off-by: Quentin Armitage + +[Retrieved from: +https://github.com/acassen/keepalived/commit/50e8a8d56cd5a3d7184b035708865302bbc7ef69] +Signed-off-by: Fabrice Fontaine +--- + keepalived/check/check_nftables.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/keepalived/check/check_nftables.c b/keepalived/check/check_nftables.c +index 2d163ac14..45831203b 100644 +--- a/keepalived/check/check_nftables.c ++++ b/keepalived/check/check_nftables.c +@@ -150,7 +150,16 @@ setup_rule_set_mark(uint8_t family, const char *table, + nftnl_rule_set_u64(r, NFTNL_RULE_POSITION, handle_num); + } + +- add_meta(r, NFT_META_L4PROTO, NFT_REG_1); ++#if HAVE_DECL_NFT_META_L4PROTO ++ add_meta(r, NFT_META_L4PROTO, NFT_REG_1); /* From Linux 3.14 */ ++#else ++ if (family == NFPROTO_IPV4) ++ add_payload(r, NFT_PAYLOAD_NETWORK_HEADER, NFT_REG_1, ++ offsetof(struct iphdr, protocol), sizeof(((struct iphdr *)NULL)->protocol)); ++ else ++ add_payload(r, NFT_PAYLOAD_NETWORK_HEADER, NFT_REG_1, ++ offsetof(struct ip6_hdr, ip6_nxt), sizeof(((struct ip6_hdr *)NULL)->ip6_nxt)); ++#endif + add_cmp(r, NFT_REG_1, NFT_CMP_EQ, &l4_protocol, sizeof(l4_protocol)); + if (family == NFPROTO_IPV4) + add_payload(r, NFT_PAYLOAD_NETWORK_HEADER, NFT_REG_1, diff --git a/package/keepalived/keepalived.mk b/package/keepalived/keepalived.mk index 7a1123b4dd..c7e8c3e2ec 100644 --- a/package/keepalived/keepalived.mk +++ b/package/keepalived/keepalived.mk @@ -11,6 +11,8 @@ KEEPALIVED_LICENSE = GPL-2.0+ KEEPALIVED_LICENSE_FILES = COPYING KEEPALIVED_CPE_ID_VENDOR = keepalived KEEPALIVED_CONF_OPTS = --disable-hardening +# We're patching configure.ac +KEEPALIVED_AUTORECONF = YES ifeq ($(BR2_PACKAGE_JSON_C),y) KEEPALIVED_DEPENDENCIES += json-c -- 2.34.1 From fontaine.fabrice at gmail.com Tue Feb 8 19:18:37 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 8 Feb 2022 20:18:37 +0100 Subject: [Buildroot] [PATCH 2/2] package/keepalived: fix build with gcc < 4.9 In-Reply-To: <20220208191837.4057713-1-fontaine.fabrice@gmail.com> References: <20220208191837.4057713-1-fontaine.fabrice@gmail.com> Message-ID: <20220208191837.4057713-2-fontaine.fabrice@gmail.com> Disable track-process to avoid the following build failure with gcc < 4.9 raised since bump to version 2.2.7 in commit 79f631000fe6846e72f44810452bb764c228ad44 as suggested by upstream in https://github.com/acassen/keepalived/issues/2094: In file included from ../../lib/rbtree.h:24:0, from ../../lib/rbtree_ka.h:26, from ../../lib/scheduler.h:40, from ../../lib/notify.h:31, from ../../keepalived/include/vrrp.h:41, from ../../keepalived/include/track_process.h:31, from track_process.c:50: ../../lib/rbtree_types.h:31:25: error: initializer element is not constant #define RB_ROOT (struct rb_root) { NULL, } ^ Fixes: - http://autobuild.buildroot.org/results/2132570fb0407abc0e70146d771471e13ef10237 Signed-off-by: Fabrice Fontaine --- package/keepalived/keepalived.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/keepalived/keepalived.mk b/package/keepalived/keepalived.mk index c7e8c3e2ec..5d6cf174e3 100644 --- a/package/keepalived/keepalived.mk +++ b/package/keepalived/keepalived.mk @@ -56,4 +56,8 @@ else KEEPALIVED_CONF_OPTS += --disable-nftables endif +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_9),) +KEEPALIVED_CONF_OPTS += --disable-track-process +endif + $(eval $(autotools-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Tue Feb 8 19:21:56 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 8 Feb 2022 20:21:56 +0100 Subject: [Buildroot] [PATCH v2, 1/2] package/keepalived: fix build with kernel < 3.14 Message-ID: <20220208192157.4058193-1-fontaine.fabrice@gmail.com> Fix the following build failure with kernel < 3.14 raised since bump to version 2.27 in commit 79f631000fe6846e72f44810452bb764c228ad44: vrrp_nftables.c: In function 'setup_rule_move_igmp': vrrp_nftables.c:1226:15: error: 'NFT_META_L4PROTO' undeclared (first use in this function) add_meta(r, NFT_META_L4PROTO, NFT_REG_1); ^ Fixes: - http://autobuild.buildroot.org/results/2132570fb0407abc0e70146d771471e13ef10237 Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2: - Fix kernel version (4.13 -> 3.14) ...upport-meta-l4proro-until-Linux-3-14.patch | 76 +++++++++++++++++++ ...upport-meta-l4proro-until-Linux-3-14.patch | 40 ++++++++++ package/keepalived/keepalived.mk | 2 + 3 files changed, 118 insertions(+) create mode 100644 package/keepalived/0001-vrrp-nft-didn-t-support-meta-l4proro-until-Linux-3-14.patch create mode 100644 package/keepalived/0002-ipvs-nft-didn-t-support-meta-l4proro-until-Linux-3-14.patch diff --git a/package/keepalived/0001-vrrp-nft-didn-t-support-meta-l4proro-until-Linux-3-14.patch b/package/keepalived/0001-vrrp-nft-didn-t-support-meta-l4proro-until-Linux-3-14.patch new file mode 100644 index 0000000000..9d5f3f7905 --- /dev/null +++ b/package/keepalived/0001-vrrp-nft-didn-t-support-meta-l4proro-until-Linux-3-14.patch @@ -0,0 +1,76 @@ +From edc71b19c619fdc1d71df10a2d0e8f5822965d69 Mon Sep 17 00:00:00 2001 +From: Quentin Armitage +Date: Tue, 8 Feb 2022 14:58:49 +0000 +Subject: [PATCH] vrrp: nft didn't support meta l4proro until Linux 3.14 + +For Linux 3.13 (first version to support nftables), we instead specify: + at nh,48,8 58 + +Signed-off-by: Quentin Armitage + +[Retrieved (and updated to drop update of README.kernel_versions) from: +https://github.com/acassen/keepalived/commit/edc71b19c619fdc1d71df10a2d0e8f5822965d69] +Signed-off-by: Fabrice Fontaine +--- + README.kernel_versions | 1 + + configure.ac | 5 +++++ + keepalived/vrrp/vrrp_nftables.c | 16 ++++++++++++++-- + 3 files changed, 20 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 350a9f4e9..bc643dbf1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1754,6 +1754,11 @@ if test .${enable_nftables} != .no; then + ],[ + AC_MSG_RESULT(no) + ]) ++ ++ # nft l4proto from Linux 3.14 ++ AC_CHECK_DECLS([NFT_META_L4PROTO], [], [], ++ [#include ]) ++ + # nft dup from Linux 4.3 + AC_CHECK_DECLS([NFTA_DUP_MAX], [], [], + [#include ]) +diff --git a/keepalived/vrrp/vrrp_nftables.c b/keepalived/vrrp/vrrp_nftables.c +index d3ea39db3..8b5095ad4 100644 +--- a/keepalived/vrrp/vrrp_nftables.c ++++ b/keepalived/vrrp/vrrp_nftables.c +@@ -1191,6 +1191,8 @@ setup_rule_move_igmp(uint8_t family, const char *table, + otherwise: + nft add rule ip keepalived out ip protocol igmp [meta oifkind macvlan] oif @vmac_set drop + nft add rule ip6 keepalived out icmpv6 type mld2-listener-report [meta oifkind macvlan] oif @vmac_set drop ++ * ++ * Note: on 3.13 kernels, icmpv6 is specified as @nh,48,8 58 + */ + struct nftnl_rule *r = NULL; + uint64_t handle_num; +@@ -1223,7 +1225,12 @@ setup_rule_move_igmp(uint8_t family, const char *table, + offsetof(struct iphdr, daddr), sizeof(struct in_addr)); + #endif + } else { +- add_meta(r, NFT_META_L4PROTO, NFT_REG_1); ++#if HAVE_DECL_NFT_META_L4PROTO ++ add_meta(r, NFT_META_L4PROTO, NFT_REG_1); /* From Linux 3.14 */ ++#else ++ add_payload(r, NFT_PAYLOAD_NETWORK_HEADER, NFT_REG_1, ++ offsetof(struct ip6_hdr, ip6_nxt), sizeof(((struct ip6_hdr *)NULL)->ip6_nxt)); ++#endif + protocol = IPPROTO_ICMPV6; + add_cmp(r, NFT_REG_1, NFT_CMP_EQ, &protocol, sizeof(protocol)); + add_payload(r, NFT_PAYLOAD_TRANSPORT_HEADER, NFT_REG_1, +@@ -1279,7 +1286,12 @@ setup_rule_drop_router_solicit(const char *table, const char *chain, + nftnl_rule_set_u64(r, NFTNL_RULE_POSITION, handle_num); + } + +- add_meta(r, NFT_META_L4PROTO, NFT_REG_1); ++#if HAVE_DECL_NFT_META_L4PROTO ++ add_meta(r, NFT_META_L4PROTO, NFT_REG_1); /* From Linux 3.14 */ ++#else ++ add_payload(r, NFT_PAYLOAD_NETWORK_HEADER, NFT_REG_1, ++ offsetof(struct ip6_hdr, ip6_nxt), sizeof(((struct ip6_hdr *)NULL)->ip6_nxt)); ++#endif + protocol = IPPROTO_ICMPV6; + add_cmp(r, NFT_REG_1, NFT_CMP_EQ, &protocol, sizeof(protocol)); + add_payload(r, NFT_PAYLOAD_TRANSPORT_HEADER, NFT_REG_1, diff --git a/package/keepalived/0002-ipvs-nft-didn-t-support-meta-l4proro-until-Linux-3-14.patch b/package/keepalived/0002-ipvs-nft-didn-t-support-meta-l4proro-until-Linux-3-14.patch new file mode 100644 index 0000000000..3713de37c2 --- /dev/null +++ b/package/keepalived/0002-ipvs-nft-didn-t-support-meta-l4proro-until-Linux-3-14.patch @@ -0,0 +1,40 @@ +From 50e8a8d56cd5a3d7184b035708865302bbc7ef69 Mon Sep 17 00:00:00 2001 +From: Quentin Armitage +Date: Tue, 8 Feb 2022 17:43:49 +0000 +Subject: [PATCH] ipvs: nft didn't support meta l4proro until Linux 3.14 + +For Linux 3.13 (first version to support nftables), we instead specify: +ipv4: @nh,72,8 PROTO +ipv6: @nh,48,8 PROTO + +Signed-off-by: Quentin Armitage + +[Retrieved from: +https://github.com/acassen/keepalived/commit/50e8a8d56cd5a3d7184b035708865302bbc7ef69] +Signed-off-by: Fabrice Fontaine +--- + keepalived/check/check_nftables.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/keepalived/check/check_nftables.c b/keepalived/check/check_nftables.c +index 2d163ac14..45831203b 100644 +--- a/keepalived/check/check_nftables.c ++++ b/keepalived/check/check_nftables.c +@@ -150,7 +150,16 @@ setup_rule_set_mark(uint8_t family, const char *table, + nftnl_rule_set_u64(r, NFTNL_RULE_POSITION, handle_num); + } + +- add_meta(r, NFT_META_L4PROTO, NFT_REG_1); ++#if HAVE_DECL_NFT_META_L4PROTO ++ add_meta(r, NFT_META_L4PROTO, NFT_REG_1); /* From Linux 3.14 */ ++#else ++ if (family == NFPROTO_IPV4) ++ add_payload(r, NFT_PAYLOAD_NETWORK_HEADER, NFT_REG_1, ++ offsetof(struct iphdr, protocol), sizeof(((struct iphdr *)NULL)->protocol)); ++ else ++ add_payload(r, NFT_PAYLOAD_NETWORK_HEADER, NFT_REG_1, ++ offsetof(struct ip6_hdr, ip6_nxt), sizeof(((struct ip6_hdr *)NULL)->ip6_nxt)); ++#endif + add_cmp(r, NFT_REG_1, NFT_CMP_EQ, &l4_protocol, sizeof(l4_protocol)); + if (family == NFPROTO_IPV4) + add_payload(r, NFT_PAYLOAD_NETWORK_HEADER, NFT_REG_1, diff --git a/package/keepalived/keepalived.mk b/package/keepalived/keepalived.mk index 7a1123b4dd..c7e8c3e2ec 100644 --- a/package/keepalived/keepalived.mk +++ b/package/keepalived/keepalived.mk @@ -11,6 +11,8 @@ KEEPALIVED_LICENSE = GPL-2.0+ KEEPALIVED_LICENSE_FILES = COPYING KEEPALIVED_CPE_ID_VENDOR = keepalived KEEPALIVED_CONF_OPTS = --disable-hardening +# We're patching configure.ac +KEEPALIVED_AUTORECONF = YES ifeq ($(BR2_PACKAGE_JSON_C),y) KEEPALIVED_DEPENDENCIES += json-c -- 2.34.1 From fontaine.fabrice at gmail.com Tue Feb 8 19:21:57 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 8 Feb 2022 20:21:57 +0100 Subject: [Buildroot] [PATCH v2, 2/2] package/keepalived: fix build with gcc < 4.9 In-Reply-To: <20220208192157.4058193-1-fontaine.fabrice@gmail.com> References: <20220208192157.4058193-1-fontaine.fabrice@gmail.com> Message-ID: <20220208192157.4058193-2-fontaine.fabrice@gmail.com> Disable track-process to avoid the following build failure with gcc < 4.9 raised since bump to version 2.2.7 in commit 79f631000fe6846e72f44810452bb764c228ad44 as suggested by upstream in https://github.com/acassen/keepalived/issues/2094: In file included from ../../lib/rbtree.h:24:0, from ../../lib/rbtree_ka.h:26, from ../../lib/scheduler.h:40, from ../../lib/notify.h:31, from ../../keepalived/include/vrrp.h:41, from ../../keepalived/include/track_process.h:31, from track_process.c:50: ../../lib/rbtree_types.h:31:25: error: initializer element is not constant #define RB_ROOT (struct rb_root) { NULL, } ^ Fixes: - http://autobuild.buildroot.org/results/2132570fb0407abc0e70146d771471e13ef10237 Signed-off-by: Fabrice Fontaine --- package/keepalived/keepalived.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/keepalived/keepalived.mk b/package/keepalived/keepalived.mk index c7e8c3e2ec..5d6cf174e3 100644 --- a/package/keepalived/keepalived.mk +++ b/package/keepalived/keepalived.mk @@ -56,4 +56,8 @@ else KEEPALIVED_CONF_OPTS += --disable-nftables endif +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_9),) +KEEPALIVED_CONF_OPTS += --disable-track-process +endif + $(eval $(autotools-package)) -- 2.34.1 From arnout at mind.be Tue Feb 8 19:50:54 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 8 Feb 2022 20:50:54 +0100 Subject: [Buildroot] Getting Buildroot-created binaries to work with the Intel (TI) Puma 5 ARM-based CPU? In-Reply-To: References: <53fa9f43-8aa2-4820-70e9-365e22b3408c@mind.be> Message-ID: On 06/02/2022 14:55, Dan Jackson wrote: > > >> -----Original Message----- >> From: Arnout Vandecappelle >> Sent: 06 February 2022 11:50 >> To: Dan Jackson ; buildroot at buildroot.org >> Subject: Re: [Buildroot] Getting Buildroot-created binaries to work with the >> Intel (TI) Puma 5 ARM-based CPU? >> > > [...snip...] > >>> >>> Links to the two toolchains I mentioned: >>> https://github.com/bmaia/cross- >> utils/tree/master/armeb/puma5_toolchain (uses Buildroot 2009.02) >> >> This one uses >> >> BR2_armeb=y >> BR2_arm1176jz_s=y >> BR2_ARM_EABI=y >> >> It's not clear if there's an FPU, so use soft float. > > From /proc/cpuinfo on the target device I can see: > > Features : swp half thumb fastmult edsp java > > It's my understanding this line would include "vfp" if there was an FPU, so I don't believe there is one. > >> >> That should be enough to build a toolchain and userspace with current >> Buildroot. > > I tried creating a fresh Buildroot using the current stable version 2021.11 and only the above options. > > I then tried transferring the files from the generated rootfs.tar to a directory /var/tmp/test on the device (the reason for this is that / is a read-only file system, so /bin, /lib, /usr are not writable, but /var is a read-write file system). > > I then attempted to execute it in the following manner (accounting for the fact that Buildroot builds dynamically linked executables by default): > > /var/tmp/test/lib/ld-uClibc-1.0.39.so --library-path /var/tmp/test/lib /var/tmp/test/bin/busybox > > (this method was suggested in the section LD_LIBRARY_PATH on this page: https://tldp.org/HOWTO/Program-Library-HOWTO/shared-libraries.html) I generally find it easier to chroot, but OK. (To do anything more than the simplest thing, you'll have to bind-mount a bunch of directories of course: /proc, /sys, and whatever directories you want to share with the rest of the system). > However this did not work and in fact produced a "Segmentation fault" error. Segmentation fault is not what you'd expect if some arch-related setting is wrong - it would be SIGILL or SIGFPE or something like that. You could try building with BR2_STATIC_LIBS=y, then you don't have to worry about shared libraries. Oh hang on, I forgot: you need to make sure that the kernel headers version is set to the same version as the running kernel. With glibc there is some backward compatibility for older kernels, but uClibc needs to be identical. Regards, Arnout > > Have I made some kind of obvious error or mistake? > > Thanks, > Dan Jackson. From giulio.benetti at benettiengineering.com Tue Feb 8 20:00:36 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 8 Feb 2022 21:00:36 +0100 Subject: [Buildroot] [PATCH] board/pc: fix build failure due to new genimage 15 In-Reply-To: References: <98670320-83fa-c6e9-9bc4-aa30d9deb6ff@mind.be> <34C01EB2-BB12-4DE4-BC53-0141B5DF491D@benettiengineering.com> Message-ID: <41eaa6a2-6053-7671-1ff7-b8dd191263ba@benettiengineering.com> Hi Arnout, On 05/02/22 18:40, Giulio Benetti wrote: > Hi again Arnout, > > On 05/02/22 16:36, Giulio Benetti wrote: >> Hi Arnout, >> >>> Il giorno 5 feb 2022, alle ore 15:11, Arnout Vandecappelle ha scritto: >>> >>> ? Hi Giulio, >>> >>>> On 04/02/2022 01:56, Giulio Benetti wrote: >>>> Actually genimage fails to create final image with: >>>> ``` >>>> ERROR: hdimage(disk.img): partition [MBR] (offset 0x1b8, size 0x48) overlaps previous partition boot (offset 0x0, size 0x200) >>>> ERROR: hdimage(disk.img): bootloaders, etc. that overlap with the partition table must declare the overlapping area as a hole. >>>> ``` >>>> This is because genimage 15 is less permissive than before, so let's add >>>> holes = {"(440; 512)"} to leave room to MBR. >>>> Fixes: >>>> https://gitlab.com/buildroot.org/buildroot/-/jobs/1865935249 >>>> Signed-off-by: Giulio Benetti >>>> --- >>>> board/pc/genimage-bios.cfg | 1 + >>>> 1 file changed, 1 insertion(+) >>>> diff --git a/board/pc/genimage-bios.cfg b/board/pc/genimage-bios.cfg >>>> index 26d12d9ab3..54026f6527 100644 >>>> --- a/board/pc/genimage-bios.cfg >>>> +++ b/board/pc/genimage-bios.cfg >>>> @@ -7,6 +7,7 @@ image disk.img { >>>> image = "boot.img" >>>> offset = 0 >>>> size = 512 >>>> + holes = {"(440; 512)"} >>> >>> Have you tested this change on an actual board (i.e. a PC :-)? >> >> I?ve tested it with qemu and it boots the kernel correctly(that is in rootfs), only thing is that it can?t mount the rootfs and I don?t understand why. >> I wanted to ask about this but I?ve got lost among all the other patches :-) > > I've compared the 2 disk.img files, one generated with genimage 14 > without "holes..." and the other generated with genimage 15 and they are > the same. > > The problem here is not that it can't mount using qemu, but it doesn't > show the shell. > > Here is the qemu command: > qemu-system-x86_64 -M pc -drive > file=images/disk.img,if=virtio,format=raw -net nic,model=virtio -net user > > and this is the output: > https://imgur.com/a/ffZBlJR > > So it seems like a busybox/init system issue with tty1. I'm digging. I've found the problem. Using the grub.cfg as it is(root=/dev/sda1) works only with Virtualbox but not with Qemu that needs s/sda1/vda1. But it's not so well explained in readme.txt, so I'm going to send a patch for that. So I can give a: Tested-by: Giulio Benetti [Giulio: tested successfully with Qemu and Virtualbox] Best regards -- Giulio Benetti Benetti Engineering sas From giulio.benetti at benettiengineering.com Tue Feb 8 20:01:34 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 8 Feb 2022 21:01:34 +0100 Subject: [Buildroot] [PATCH] board/pc: fix build failure due to new genimage 15 In-Reply-To: <41eaa6a2-6053-7671-1ff7-b8dd191263ba@benettiengineering.com> References: <98670320-83fa-c6e9-9bc4-aa30d9deb6ff@mind.be> <34C01EB2-BB12-4DE4-BC53-0141B5DF491D@benettiengineering.com> <41eaa6a2-6053-7671-1ff7-b8dd191263ba@benettiengineering.com> Message-ID: <0a4cafd3-cbe0-16b7-cc3e-668e14240f0e@benettiengineering.com> On 08/02/22 21:00, Giulio Benetti wrote: > Hi Arnout, > > On 05/02/22 18:40, Giulio Benetti wrote: >> Hi again Arnout, >> >> On 05/02/22 16:36, Giulio Benetti wrote: >>> Hi Arnout, >>> >>>> Il giorno 5 feb 2022, alle ore 15:11, Arnout Vandecappelle ha scritto: >>>> >>>> ? Hi Giulio, >>>> >>>>> On 04/02/2022 01:56, Giulio Benetti wrote: >>>>> Actually genimage fails to create final image with: >>>>> ``` >>>>> ERROR: hdimage(disk.img): partition [MBR] (offset 0x1b8, size 0x48) overlaps previous partition boot (offset 0x0, size 0x200) >>>>> ERROR: hdimage(disk.img): bootloaders, etc. that overlap with the partition table must declare the overlapping area as a hole. >>>>> ``` >>>>> This is because genimage 15 is less permissive than before, so let's add >>>>> holes = {"(440; 512)"} to leave room to MBR. >>>>> Fixes: >>>>> https://gitlab.com/buildroot.org/buildroot/-/jobs/1865935249 >>>>> Signed-off-by: Giulio Benetti >>>>> --- >>>>> board/pc/genimage-bios.cfg | 1 + >>>>> 1 file changed, 1 insertion(+) >>>>> diff --git a/board/pc/genimage-bios.cfg b/board/pc/genimage-bios.cfg >>>>> index 26d12d9ab3..54026f6527 100644 >>>>> --- a/board/pc/genimage-bios.cfg >>>>> +++ b/board/pc/genimage-bios.cfg >>>>> @@ -7,6 +7,7 @@ image disk.img { >>>>> image = "boot.img" >>>>> offset = 0 >>>>> size = 512 >>>>> + holes = {"(440; 512)"} >>>> >>>> Have you tested this change on an actual board (i.e. a PC :-)? >>> >>> I?ve tested it with qemu and it boots the kernel correctly(that is in rootfs), only thing is that it can?t mount the rootfs and I don?t understand why. >>> I wanted to ask about this but I?ve got lost among all the other patches :-) >> >> I've compared the 2 disk.img files, one generated with genimage 14 >> without "holes..." and the other generated with genimage 15 and they are >> the same. >> >> The problem here is not that it can't mount using qemu, but it doesn't >> show the shell. >> >> Here is the qemu command: >> qemu-system-x86_64 -M pc -drive >> file=images/disk.img,if=virtio,format=raw -net nic,model=virtio -net user >> >> and this is the output: >> https://imgur.com/a/ffZBlJR >> >> So it seems like a busybox/init system issue with tty1. I'm digging. > > I've found the problem. Using the grub.cfg as it is(root=/dev/sda1) > works only with Virtualbox but not with Qemu that needs s/sda1/vda1. > > But it's not so well explained in readme.txt, so I'm going to send a > patch for that. Pardon, I've only misread. readme.txt is correct. > So I can give a: > Tested-by: Giulio Benetti > [Giulio: tested successfully with Qemu and Virtualbox] > > Best regards -- Giulio Benetti Benetti Engineering sas From arnout at mind.be Tue Feb 8 20:25:24 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 8 Feb 2022 21:25:24 +0100 Subject: [Buildroot] [PATCHv2 1/7] arch: move definition of KERNEL_ARCH to Config.in. files In-Reply-To: <20220115200306.14037-2-patrickdepinguin@gmail.com> References: <20220115200306.14037-1-patrickdepinguin@gmail.com> <20220115200306.14037-2-patrickdepinguin@gmail.com> Message-ID: On 15/01/2022 21:02, Thomas De Schampheleire wrote: > 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 Applied to master, thanks. Regards, Arnout > > --- > 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" > From arnout at mind.be Tue Feb 8 20:26:07 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 8 Feb 2022 21:26:07 +0100 Subject: [Buildroot] [PATCHv2 2/7] core: introduce NORMALIZED_ARCH as non-kernel replacement for KERNEL_ARCH In-Reply-To: <20220115200306.14037-3-patrickdepinguin@gmail.com> References: <20220115200306.14037-1-patrickdepinguin@gmail.com> <20220115200306.14037-3-patrickdepinguin@gmail.com> Message-ID: On 15/01/2022 21:03, Thomas De Schampheleire wrote: > 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 I also renamed BR2_KERNEL_ARCH introduced in the previous patch to BR2_NORMALIZED_ARCH. Applied to master, thanks. Regards, Arnout > > --- > 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 From arnout at mind.be Tue Feb 8 20:28:52 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 8 Feb 2022 21:28:52 +0100 Subject: [Buildroot] [PATCHv2 7/7] linux/linux.mk: correct LINUX_ARCH_PATH for sparc64 In-Reply-To: <20220115200306.14037-8-patrickdepinguin@gmail.com> References: <20220115200306.14037-1-patrickdepinguin@gmail.com> <20220115200306.14037-8-patrickdepinguin@gmail.com> Message-ID: On 15/01/2022 21:03, Thomas De Schampheleire wrote: > 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 AFAIU this is completely independent of the rest of the series, so I applied to master, thanks. Regards, Arnout > --- > 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 From arnout at mind.be Tue Feb 8 20:24:41 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 8 Feb 2022 21:24:41 +0100 Subject: [Buildroot] [git commit] linux/linux.mk: correct LINUX_ARCH_PATH for sparc64 Message-ID: <20220208202150.3CF6A82B8F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0ecfdc093227c37ed1083e43404b748e8ee8a323 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 From arnout at mind.be Tue Feb 8 19:55:36 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 8 Feb 2022 20:55:36 +0100 Subject: [Buildroot] [git commit] arch: move definition of KERNEL_ARCH to Config.in. files Message-ID: <20220208202150.2666B82B8F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cf198e229994ae4d55ed5c50c8e14bc0649aba37 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 27f2bfcd4c..521b02d1b6 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -564,6 +564,10 @@ config BR2_ARCH default "i686" if BR2_i386 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 arnout at mind.be Tue Feb 8 20:20:23 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 8 Feb 2022 21:20:23 +0100 Subject: [Buildroot] [git commit] core: introduce NORMALIZED_ARCH as non-kernel replacement for KERNEL_ARCH Message-ID: <20220208202150.3464E82DBF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dd8a410eafaceb30fd06e17edbb2d01283f99494 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 [Arnout: Also rename BR2_KERNEL_ARCH to BR2_NORMALIZED_ARCH] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- Makefile | 3 ++- arch/Config.in | 2 +- arch/Config.in.arc | 2 +- arch/Config.in.arm | 2 +- arch/Config.in.csky | 2 +- arch/Config.in.m68k | 2 +- arch/Config.in.microblaze | 2 +- arch/Config.in.mips | 2 +- arch/Config.in.nds32 | 2 +- arch/Config.in.nios2 | 2 +- arch/Config.in.or1k | 2 +- arch/Config.in.powerpc | 2 +- arch/Config.in.riscv | 2 +- arch/Config.in.s390x | 2 +- arch/Config.in.sh | 2 +- arch/Config.in.sparc | 2 +- arch/Config.in.x86 | 2 +- arch/Config.in.xtensa | 2 +- 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 +++++----- 29 files changed, 45 insertions(+), 44 deletions(-) diff --git a/Makefile b/Makefile index e012d121b9..8a4ec4ef85 100644 --- a/Makefile +++ b/Makefile @@ -437,7 +437,8 @@ QUIET := $(if $(findstring s,$(filter-out --%,$(MAKEFLAGS))),-q) # Strip off the annoying quoting ARCH := $(call qstrip,$(BR2_ARCH)) -KERNEL_ARCH := $(call qstrip,$(BR2_KERNEL_ARCH)) +NORMALIZED_ARCH := $(call qstrip,$(BR2_NORMALIZED_ARCH)) +KERNEL_ARCH := $(call qstrip,$(BR2_NORMALIZED_ARCH)) ZCAT := $(call qstrip,$(BR2_ZCAT)) BZCAT := $(call qstrip,$(BR2_BZCAT)) diff --git a/arch/Config.in b/arch/Config.in index edf337f13e..98b0e40d51 100644 --- a/arch/Config.in +++ b/arch/Config.in @@ -328,7 +328,7 @@ config BR2_ARCH_NEEDS_GCC_AT_LEAST_11 config BR2_ARCH string -config BR2_KERNEL_ARCH +config BR2_NORMALIZED_ARCH string config BR2_ENDIAN diff --git a/arch/Config.in.arc b/arch/Config.in.arc index cc55c9e68f..388d3496bc 100644 --- a/arch/Config.in.arc +++ b/arch/Config.in.arc @@ -62,7 +62,7 @@ config BR2_ARCH default "arc" if BR2_arcle default "arceb" if BR2_arceb -config BR2_KERNEL_ARCH +config BR2_NORMALIZED_ARCH default "arc" config BR2_arc diff --git a/arch/Config.in.arm b/arch/Config.in.arm index 0f50512fad..85040ac89f 100644 --- a/arch/Config.in.arm +++ b/arch/Config.in.arm @@ -822,7 +822,7 @@ config BR2_ARCH default "aarch64" if BR2_aarch64 default "aarch64_be" if BR2_aarch64_be -config BR2_KERNEL_ARCH +config BR2_NORMALIZED_ARCH default "arm" if BR2_arm || BR2_armeb default "arm64" if BR2_aarch64 || BR2_aarch64_be diff --git a/arch/Config.in.csky b/arch/Config.in.csky index df9e7ab75b..b20b39e225 100644 --- a/arch/Config.in.csky +++ b/arch/Config.in.csky @@ -39,7 +39,7 @@ config BR2_GCC_TARGET_FLOAT_ABI config BR2_ARCH default "csky" -config BR2_KERNEL_ARCH +config BR2_NORMALIZED_ARCH default "csky" config BR2_ENDIAN diff --git a/arch/Config.in.m68k b/arch/Config.in.m68k index 7f3aec7232..1f7d944621 100644 --- a/arch/Config.in.m68k +++ b/arch/Config.in.m68k @@ -1,7 +1,7 @@ config BR2_ARCH default "m68k" if BR2_m68k -config BR2_KERNEL_ARCH +config BR2_NORMALIZED_ARCH default "m68k" config BR2_ENDIAN diff --git a/arch/Config.in.microblaze b/arch/Config.in.microblaze index 52aa252a2c..0502001afc 100644 --- a/arch/Config.in.microblaze +++ b/arch/Config.in.microblaze @@ -2,7 +2,7 @@ config BR2_ARCH default "microblazeel" if BR2_microblazeel default "microblaze" if BR2_microblazebe -config BR2_KERNEL_ARCH +config BR2_NORMALIZED_ARCH default "microblaze" config BR2_ENDIAN diff --git a/arch/Config.in.mips b/arch/Config.in.mips index b4923f8484..7f44f06c9d 100644 --- a/arch/Config.in.mips +++ b/arch/Config.in.mips @@ -235,7 +235,7 @@ config BR2_ARCH default "mips64" if BR2_mips64 default "mips64el" if BR2_mips64el -config BR2_KERNEL_ARCH +config BR2_NORMALIZED_ARCH default "mips" config BR2_ENDIAN diff --git a/arch/Config.in.nds32 b/arch/Config.in.nds32 index 61fc346260..0babb2cf7f 100644 --- a/arch/Config.in.nds32 +++ b/arch/Config.in.nds32 @@ -1,7 +1,7 @@ config BR2_ARCH default "nds32le" -config BR2_KERNEL_ARCH +config BR2_NORMALIZED_ARCH default "nds32" config BR2_GCC_TARGET_ARCH diff --git a/arch/Config.in.nios2 b/arch/Config.in.nios2 index c77b1a1c59..a5d7e66d40 100644 --- a/arch/Config.in.nios2 +++ b/arch/Config.in.nios2 @@ -1,7 +1,7 @@ config BR2_ARCH default "nios2" -config BR2_KERNEL_ARCH +config BR2_NORMALIZED_ARCH default "nios2" config BR2_ENDIAN diff --git a/arch/Config.in.or1k b/arch/Config.in.or1k index ef1bded453..f42aef9eef 100644 --- a/arch/Config.in.or1k +++ b/arch/Config.in.or1k @@ -1,7 +1,7 @@ config BR2_ARCH default "or1k" -config BR2_KERNEL_ARCH +config BR2_NORMALIZED_ARCH default "openrisc" config BR2_ENDIAN diff --git a/arch/Config.in.powerpc b/arch/Config.in.powerpc index 33b2471cf9..4a39cfee70 100644 --- a/arch/Config.in.powerpc +++ b/arch/Config.in.powerpc @@ -157,7 +157,7 @@ config BR2_ARCH default "powerpc64" if BR2_powerpc64 default "powerpc64le" if BR2_powerpc64le -config BR2_KERNEL_ARCH +config BR2_NORMALIZED_ARCH default "powerpc" config BR2_ENDIAN diff --git a/arch/Config.in.riscv b/arch/Config.in.riscv index 1a008a935d..288ed833eb 100644 --- a/arch/Config.in.riscv +++ b/arch/Config.in.riscv @@ -118,7 +118,7 @@ config BR2_ARCH default "riscv32" if !BR2_ARCH_IS_64 default "riscv64" if BR2_ARCH_IS_64 -config BR2_KERNEL_ARCH +config BR2_NORMALIZED_ARCH default "riscv" config BR2_ENDIAN diff --git a/arch/Config.in.s390x b/arch/Config.in.s390x index bf4b70f957..da6ac55d8a 100644 --- a/arch/Config.in.s390x +++ b/arch/Config.in.s390x @@ -17,7 +17,7 @@ endchoice config BR2_ARCH default "s390x" if BR2_s390x -config BR2_KERNEL_ARCH +config BR2_NORMALIZED_ARCH default "s390" config BR2_ENDIAN diff --git a/arch/Config.in.sh b/arch/Config.in.sh index fde42dfce2..c1ba449dd5 100644 --- a/arch/Config.in.sh +++ b/arch/Config.in.sh @@ -24,7 +24,7 @@ config BR2_ARCH default "sh4a" if BR2_sh4a default "sh4aeb" if BR2_sh4aeb -config BR2_KERNEL_ARCH +config BR2_NORMALIZED_ARCH default "sh" config BR2_ENDIAN diff --git a/arch/Config.in.sparc b/arch/Config.in.sparc index b91df6892b..f5f4bd6708 100644 --- a/arch/Config.in.sparc +++ b/arch/Config.in.sparc @@ -21,7 +21,7 @@ config BR2_ARCH default "sparc" if BR2_sparc default "sparc64" if BR2_sparc64 -config BR2_KERNEL_ARCH +config BR2_NORMALIZED_ARCH default "sparc" if BR2_sparc default "sparc64" if BR2_sparc64 diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index 521b02d1b6..2560da922b 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -564,7 +564,7 @@ config BR2_ARCH default "i686" if BR2_i386 default "x86_64" if BR2_x86_64 -config BR2_KERNEL_ARCH +config BR2_NORMALIZED_ARCH default "i386" if !BR2_x86_64 default "x86_64" if BR2_x86_64 diff --git a/arch/Config.in.xtensa b/arch/Config.in.xtensa index acc340eca6..45ad2dc487 100644 --- a/arch/Config.in.xtensa +++ b/arch/Config.in.xtensa @@ -48,7 +48,7 @@ config BR2_ENDIAN config BR2_ARCH default "xtensa" if BR2_xtensa -config BR2_KERNEL_ARCH +config BR2_NORMALIZED_ARCH default "xtensa" config BR2_READELF_ARCH_NAME 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 a61d1c8135..d05b9bb479 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 From arnout at mind.be Tue Feb 8 20:49:47 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 8 Feb 2022 21:49:47 +0100 Subject: [Buildroot] [PATCHv2 0/7] Basic support for 64-bit kernel and 32-bit userland In-Reply-To: <20220115200306.14037-1-patrickdepinguin@gmail.com> References: <20220115200306.14037-1-patrickdepinguin@gmail.com> Message-ID: On 15/01/2022 21:02, Thomas De Schampheleire wrote: > 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. So, I'm not entirely convinced about this approach. Here are my objections. - At least for arm, you need an entirely different toolchain for the 32 and the 64-bit variants. But even for x86, the Buildroot internal toolchain for x86_64 doesn't support -m32. So for most users this is not even going to work. - There is an alternative: two separate Buildroot configs, one for the kernel + modules, one for userspace. - I don't think the flexibility is useful. I think it would be better to reuse the BR2_KERNEL_64_USERLAND_32 option. (E.g. add an option to Config.in.x86 when the arch is x86_64 to build a 32-bit userspace.) That way we can use it to pass -m32 where needed, to build an internal toolchain that supports it, and to check for the external toolchain if it supports it. Doesn't solve the issue for ARM, but it's a start. Also, I think we absolutely need to test this feature. At the very least, we'd need to config in the autobuilders that enables it, or enable it randomly in genrandconfig. Although I'm not sure if it tests anything if no kernel is built (let alone that it's not even booted). For now, I've left the rest of the series as New in patchwork, let's see what the others think. Regards, Arnout > > 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 > From fontaine.fabrice at gmail.com Tue Feb 8 20:52:32 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 8 Feb 2022 21:52:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/sudo: drop openssl workaround Message-ID: <20220208205232.16362-1-fontaine.fabrice@gmail.com> Drop workaround added by commit bf899e50d89439b1a1bdf22bc933075958ffc108 because sudo natively supports pkg-config for searching openssl (which is enabled by default) since version 1.9.2 and https://github.com/sudo-project/sudo/commit/4cadd549513ef35d4d740e941576294f4491d13d As a side-effect, this will fix the following build failure when openssl is not installed on host (as LIBS is set before AX_PROG_CC_FOR_BUILD): configure:8162: checking whether the C compiler works configure:8184: /usr/bin/gcc -O2 -I/home/buildroot/autobuild/instance-2/output-1/host/include -I/home/buildroot/autobuild/instance-2/output-1/host/include -L/home/buildroot/autobuild/instance-2/output-1/host/lib -Wl,-rpath,/home/buildroot/autobuild/instance-2/output-1/host/lib conftest.c -L/home/buildroot/autobuild/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib -lssl -L/home/buildroot/autobuild/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib -pthread -latomic -lcrypto -pthread -latomic >&5 /usr/bin/ld: skipping incompatible /home/buildroot/autobuild/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libssl.a when searching for -lssl /usr/bin/ld: skipping incompatible /home/buildroot/autobuild/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libssl.a when searching for -lssl /usr/bin/ld: cannot find -lssl Fixes: - http://autobuild.buildroot.org/results/7a5d4dd22343be46a5ddd1c1a1a8e1799517d564 Signed-off-by: Fabrice Fontaine --- package/sudo/sudo.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index f2c074e55f..a752217123 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -45,17 +45,17 @@ endif ifeq ($(BR2_PACKAGE_OPENLDAP),y) SUDO_DEPENDENCIES += openldap SUDO_CONF_OPTS += --with-ldap -# If we are building sudo statically and openldap was linked with openssl, then -# when we link sudo with openldap we need to specify the openssl libs, otherwise -# it will fail with "undefined reference" errors. -ifeq ($(BR2_STATIC_LIBS)$(BR2_PACKAGE_OPENSSL),yy) -SUDO_DEPENDENCIES += host-pkgconf -SUDO_CONF_ENV += LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs libssl libcrypto`" -endif else SUDO_CONF_OPTS += --without-ldap endif +ifeq ($(BR2_PACKAGE_OPENSSL),y) +SUDO_DEPENDENCIES += host-pkgconf openssl +SUDO_CONF_OPTS += --enable-openssl +else +SUDO_CONF_OPTS += --disable-openssl +endif + # mksigname/mksiglist needs to run on build host to generate source files define SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST $(MAKE) $(HOST_CONFIGURE_OPTS) \ -- 2.34.1 From arnout at mind.be Tue Feb 8 20:56:08 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 8 Feb 2022 21:56:08 +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: <6d74e1be-2ff0-5e4d-cf2d-1e2b078162c1@mind.be> On 27/05/2021 16:51, Juergen Stuber wrote: > 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. I've extended the commit message a bit to explain a use case where relative paths may be useful, and applied to master, thanks. Regards, Arnout > > 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 arnout at mind.be Tue Feb 8 20:51:36 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 8 Feb 2022 21:51:36 +0100 Subject: [Buildroot] [git commit] toolchain/toolchain-external: Allow relative paths in BR2_TOOLCHAIN_EXTERNAL_PATH. Message-ID: <20220208204854.1420882DC5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0b28ee9267f790792eb8335ee2ceba268ea6152e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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. Although relative paths sounds like something less than ideal to put in a Buildroot configuration, it's actually rather typical to put the buildroot sources as a submodule (or subdirectory) of custom sources (either in a BR2_EXTERNAL or not), in which case the relative path is well-defined. Signed-off-by: Juergen Stuber Reviewed-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 68d7a3fe21..299b6008aa 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 fontaine.fabrice at gmail.com Tue Feb 8 21:06:44 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 8 Feb 2022 22:06:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/libuhttpd: depends on gcc >= 4.9 Message-ID: <20220208210644.16926-1-fontaine.fabrice@gmail.com> Add a dependency on gcc >= 4.9 to avoid the following build failure with gcc 4.8.3 raised since bump to version 3.14.1 in commit 61797c52f5deef2cb67e60cf075ca243078c8855 and https://github.com/zhaojh329/libuhttpd/commit/ffdf7de3a4a1f5a62aa3814ac96e889958a30840: /home/peko/autobuild/instance-1/output-1/build/libuhttpd-3.14.1/src/cgi.c:41:5: error: initializer element is not a constant expression [-Werror] {"accept", strlen("accept"), "HTTP_ACCEPT"}, ^ It should be noted that upstream rejected a patch to remove -Werror: https://github.com/zhaojh329/libuhttpd/pull/12 Fixes: - http://autobuild.buildroot.org/results/a3a970a6398dcb0e4e03f4277f1a50c6b5eff7bd Signed-off-by: Fabrice Fontaine --- package/libuhttpd/Config.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/libuhttpd/Config.in b/package/libuhttpd/Config.in index 52bbd313bc..97fc984ea0 100644 --- a/package/libuhttpd/Config.in +++ b/package/libuhttpd/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_LIBUHTTPD bool "libuhttpd" depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 select BR2_PACKAGE_LIBEV select BR2_PACKAGE_WOLFSSL_ALL if BR2_PACKAGE_WOLFSSL help @@ -8,3 +9,7 @@ config BR2_PACKAGE_LIBUHTTPD library based on libev https://github.com/zhaojh329/libuhttpd + +comment "libuhttpd needs a toolchain w/ gcc >= 4.9" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 -- 2.34.1 From arnout at mind.be Tue Feb 8 21:09:44 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 8 Feb 2022 22:09:44 +0100 Subject: [Buildroot] [PATCH v5] package/libcamera-apps: new package In-Reply-To: <20210502095925.10744-1-ps.report@gmx.net> References: <20210502095925.10744-1-ps.report@gmx.net> Message-ID: On 02/05/2021 11:59, Peter Seiderer wrote: > Signed-off-by: Peter Seiderer (Finally) applied to master, thanks. However... [snip] > diff --git a/package/libcamera-apps/0001-cmake-remove-Wfatal-errors-compiler-command-line-opt.patch b/package/libcamera-apps/0001-cmake-remove-Wfatal-errors-compiler-command-line-opt.patch > new file mode 100644 > index 0000000000..11d19fa526 > --- /dev/null > +++ b/package/libcamera-apps/0001-cmake-remove-Wfatal-errors-compiler-command-line-opt.patch > @@ -0,0 +1,25 @@ > +From 22096ef8cfb18563c1955145db24742081910e10 Mon Sep 17 00:00:00 2001 > +From: Peter Seiderer > +Date: Fri, 5 Feb 2021 18:24:08 +0100 > +Subject: [PATCH] cmake: remove -Wfatal-errors compiler command line option > + > +Signed-off-by: Peter Seiderer > +--- > + CMakeLists.txt | 1 - > + 1 file changed, 1 deletion(-) > + > +diff --git a/CMakeLists.txt b/CMakeLists.txt > +index 4191245..199a0f6 100644 > +--- a/CMakeLists.txt > ++++ b/CMakeLists.txt > +@@ -10,7 +10,6 @@ endif() > + set (CMAKE_EXPORT_COMPILE_COMMANDS ON) > + set (CMAKE_CXX_STANDARD 17) > + set (CMAKE CXX_FLAGS "-Wall -Wextra -pedantic -Wno-unused-parameter -faligned-new") > +-add_definitions(-Wfatal-errors) Why is this patch needed? The only thing that -Wfatal-errors does is to stop compilation when there is an error, instead of trying to continue and find more errors in the rest of the file. It's not -Werror. I kept the patch anyway because I didn't test without it. Regards, Arnout > + add_definitions(-Wno-psabi) > + add_definitions(-DBOOST_LOG_DYN_LINK) > + > +-- > +2.30.0 > + > diff --git a/package/libcamera-apps/Config.in b/package/libcamera-apps/Config.in > new file mode 100644 > index 0000000000..08667eb830 > --- /dev/null > +++ b/package/libcamera-apps/Config.in > @@ -0,0 +1,31 @@ > +config BR2_PACKAGE_LIBCAMERA_APPS > + bool "libcamera-apps" > + depends on BR2_PACKAGE_LIBCAMERA_ARCH_SUPPORTS # libcamera > + depends on BR2_INSTALL_LIBSTDCPP # libcamera/boost > + depends on BR2_TOOLCHAIN_HAS_THREADS # libcamera/boost/libdrm > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17/libcamera > + depends on !BR2_STATIC_LIBS # gnutls/libcamera > + depends on BR2_USE_WCHAR # gnutls/libcamera/boost > + depends on BR2_PACKAGE_XORG7 > + depends on BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL # libepoxy > + select BR2_PACKAGE_BOOST > + select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS > + select BR2_PACKAGE_JPEG > + select BR2_PACKAGE_LIBCAMERA > + select BR2_PACKAGE_LIBDRM > + select BR2_PACKAGE_LIBEPOXY > + select BR2_PACKAGE_LIBEXIF > + select BR2_PACKAGE_LIBPNG > + select BR2_PACKAGE_TIFF > + select BR2_PACKAGE_XLIB_LIBX11 > + help > + This is a small suite of libcamera-based apps that aim to copy > + the functionality of the existing "raspicam" apps. > + > + https://github.com/raspberrypi/libcamera-apps > + > +comment "libcamera-apps needs a toolchain w/ C++, threads, wchar, dynamic library, gcc >= 7 and needs an OpenGL and/or OpenGL EGL backend" > + 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 > + depends on !BR2_PACKAGE_HAS_LIBEGL && !BR2_PACKAGE_HAS_LIBGL > diff --git a/package/libcamera-apps/libcamera-apps.hash b/package/libcamera-apps/libcamera-apps.hash > new file mode 100644 > index 0000000000..da426434c1 > --- /dev/null > +++ b/package/libcamera-apps/libcamera-apps.hash > @@ -0,0 +1,3 @@ > +# Locally computed > +sha256 9b3475e1c817cbcf942c4be0dac3d1f6bf2ee192b0ca5edb95c85c06c5a12b4f libcamera-apps-326fdfd120a0f62b7e76f4ee8aa0c82c2bf008e6.tar.gz > +sha256 36dfed86bdef661a0a14ec1a1cc84c771d5a06b6f9b92e9ebb610ba711bd528a license.txt > diff --git a/package/libcamera-apps/libcamera-apps.mk b/package/libcamera-apps/libcamera-apps.mk > new file mode 100644 > index 0000000000..5edcefefad > --- /dev/null > +++ b/package/libcamera-apps/libcamera-apps.mk > @@ -0,0 +1,25 @@ > +################################################################################ > +# > +# libcamera-apps > +# > +################################################################################ > + > +LIBCAMERA_APPS_VERSION = 326fdfd120a0f62b7e76f4ee8aa0c82c2bf008e6 > +LIBCAMERA_APPS_SITE = $(call github,raspberrypi,libcamera-apps,$(LIBCAMERA_APPS_VERSION)) > +LIBCAMERA_APPS_LICENSE = BSD-2-Clause > +LIBCAMERA_APPS_LICENSE_FILES = license.txt > +LIBCAMERA_APPS_DEPENDENCIES = \ > + host-pkgconf \ > + boost \ > + jpeg \ > + libcamera \ > + libdrm \ > + libexif \ > + libepoxy \ > + libpng \ > + tiff \ > + xlib_libX11 > + > +LIBCAMERA_APPS_CONF_OPTS = -DENABLE_COMPILE_FLAGS_FOR_TARGET=disabled > + > +$(eval $(cmake-package)) From ps.report at gmx.net Tue Feb 8 21:23:55 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 8 Feb 2022 22:23:55 +0100 Subject: [Buildroot] [PATCH v1 03/13] package/gst1-plugins-good: bump version to 1.20.0 In-Reply-To: <20220208212405.19243-1-ps.report@gmx.net> References: <20220208212405.19243-1-ps.report@gmx.net> Message-ID: <20220208212405.19243-4-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash | 4 ++-- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash index e342bd133e..9ad1d7bf46 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.6.tar.xz.sha256sum -sha256 26723ac01fcb360ade1f41d168c7c322d8af4ceb7e55c8c12ed2690d06a76eed gst-plugins-good-1.18.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.20.0.tar.xz.sha256sum +sha256 2d119c15ab8c9e79f8cd3c6bf582ff7a050b28ccae52ab4865e1a1464991659c gst-plugins-good-1.20.0.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk index e0ca29c5fd..6298d578ed 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_GOOD_VERSION = 1.18.6 +GST1_PLUGINS_GOOD_VERSION = 1.20.0 GST1_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST1_PLUGINS_GOOD_VERSION).tar.xz GST1_PLUGINS_GOOD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-good GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING -- 2.34.1 From ps.report at gmx.net Tue Feb 8 21:24:00 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 8 Feb 2022 22:24:00 +0100 Subject: [Buildroot] [PATCH v1 08/13] package/gst1-vaapi: bump version to 1.20.0 In-Reply-To: <20220208212405.19243-1-ps.report@gmx.net> References: <20220208212405.19243-1-ps.report@gmx.net> Message-ID: <20220208212405.19243-9-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-vaapi/gst1-vaapi.hash | 4 ++-- package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash index 7e22774c11..b32d91e1e2 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.18.6.tar.xz.sha256sum -sha256 ab6270f1e5e4546fbe6f5ea246d86ca3d196282eb863d46e6cdcc96f867449e0 gstreamer-vaapi-1.18.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.20.0.tar.xz.sha256sum +sha256 f79a47346dfd5e585e063e77078e5fc498b06dee895bfcbf47d8863fcac9ea32 gstreamer-vaapi-1.20.0.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk index 6af851602f..19ee625703 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_VAAPI_VERSION = 1.18.6 +GST1_VAAPI_VERSION = 1.20.0 GST1_VAAPI_SITE = https://gstreamer.freedesktop.org/src/gstreamer-vaapi GST1_VAAPI_SOURCE = gstreamer-vaapi-$(GST1_VAAPI_VERSION).tar.xz GST1_VAAPI_LICENSE = LGPL-2.1+ -- 2.34.1 From ps.report at gmx.net Tue Feb 8 21:23:54 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 8 Feb 2022 22:23:54 +0100 Subject: [Buildroot] [PATCH v1 02/13] package/gst1-plugins-base: bump version to 1.20.0 In-Reply-To: <20220208212405.19243-1-ps.report@gmx.net> References: <20220208212405.19243-1-ps.report@gmx.net> Message-ID: <20220208212405.19243-3-ps.report@gmx.net> - disable new qt5 (Qt5 QML examples) option (suboption of already disabled tests/examples) - update COPYING hash (license text update from LGPL-2.0+ to LGPL-2.1+, see [1]) and adjust GST1_PLUGINS_BASE_LICENSE accordingly [1] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/d157b23fb0ce175b167611a4cb019599d9017042.patch Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash | 6 +++--- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash index 081dc6f213..ffc3445cda 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.18.6.tar.xz.sha256sum -sha256 56a9ff2fe9e6603b9e658cf6897d412a173d2180829fe01e92568549c6bd0f5b gst-plugins-base-1.18.6.tar.xz -sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING +# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.20.0.tar.xz.sha256sum +sha256 4cb66fccf730b1037e6533862c2128990912a6db4e5bbd14e0ef914450eb4c7c gst-plugins-base-1.20.0.tar.xz +sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk index c99eeb6c59..68281738fa 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk @@ -4,12 +4,12 @@ # ################################################################################ -GST1_PLUGINS_BASE_VERSION = 1.18.6 +GST1_PLUGINS_BASE_VERSION = 1.20.0 GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz GST1_PLUGINS_BASE_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-base GST1_PLUGINS_BASE_INSTALL_STAGING = YES GST1_PLUGINS_BASE_LICENSE_FILES = COPYING -GST1_PLUGINS_BASE_LICENSE = LGPL-2.0+, LGPL-2.1+ +GST1_PLUGINS_BASE_LICENSE = LGPL-2.1+ GST1_PLUGINS_BASE_CONF_OPTS = \ -Dexamples=disabled \ @@ -17,6 +17,7 @@ GST1_PLUGINS_BASE_CONF_OPTS = \ -Dgobject-cast-checks=disabled \ -Dglib-asserts=disabled \ -Dglib-checks=disabled \ + -Dqt5=disabled \ -Ddoc=disabled # Options which require currently unpackaged libraries -- 2.34.1 From ps.report at gmx.net Tue Feb 8 21:23:52 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 8 Feb 2022 22:23:52 +0100 Subject: [Buildroot] [PATCH v1 00/13] package/gstreamer1/*: bump version to 1.20.0 Message-ID: <20220208212405.19243-1-ps.report@gmx.net> For details see [1] and [2]. [1] https://lists.freedesktop.org/archives/gstreamer-devel/2022-February/079534.html [2] https://gstreamer.freedesktop.org/releases/1.20/ Peter Seiderer (13): package/gstreamer1: bump version to 1.20.0 package/gst1-plugins-base: bump version to 1.20.0 package/gst1-plugins-good: bump version to 1.20.0 package/gst1-plugins-bad: bump version to 1.20.0 package/gst1-plugins-ugly: bump version to 1.20.0 package/gst1-devtools: bump version to 1.20.0 package/gst1-libav: bump version to 1.20.0 package/gst1-vaapi: bump version to 1.20.0 package/gst1-rtsp-server: bump version to 1.20.0 package/gstreamer1-editing-services: bump version to 1.20.0 package/gst-omx: bump version to 1.20.0 package/gst1-python: bump version to 1.20.0 package/gst1-plugins-bayer2rgb-neon: fix plugin install Config.in.legacy | 22 ++++++---- package/gstreamer1/gst-omx/gst-omx.hash | 4 +- package/gstreamer1/gst-omx/gst-omx.mk | 2 +- .../gst1-devtools/gst1-devtools.hash | 4 +- .../gstreamer1/gst1-devtools/gst1-devtools.mk | 13 ++++-- package/gstreamer1/gst1-libav/gst1-libav.hash | 6 +-- package/gstreamer1/gst1-libav/gst1-libav.mk | 4 +- ...n-Allow-building-against-neon-0-32-x.patch | 29 ------------- package/gstreamer1/gst1-plugins-bad/Config.in | 31 +++++++++----- .../gst1-plugins-bad/gst1-plugins-bad.hash | 4 +- .../gst1-plugins-bad/gst1-plugins-bad.mk | 36 ++++++++++++---- .../gst1-plugins-base/gst1-plugins-base.hash | 6 +-- .../gst1-plugins-base/gst1-plugins-base.mk | 5 ++- .../gst1-plugins-bayer2rgb-neon.mk | 4 +- .../gst1-plugins-good/gst1-plugins-good.hash | 4 +- .../gst1-plugins-good/gst1-plugins-good.mk | 2 +- .../gst1-plugins-ugly/gst1-plugins-ugly.hash | 4 +- .../gst1-plugins-ugly/gst1-plugins-ugly.mk | 3 +- .../gstreamer1/gst1-python/gst1-python.hash | 4 +- package/gstreamer1/gst1-python/gst1-python.mk | 2 +- ...-rtsp-server-meson.build-add-gst_dep.patch | 41 ------------------- .../gst1-rtsp-server/gst1-rtsp-server.hash | 8 ++-- .../gst1-rtsp-server/gst1-rtsp-server.mk | 4 +- package/gstreamer1/gst1-vaapi/gst1-vaapi.hash | 4 +- package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 2 +- .../gstreamer1-editing-services.hash | 4 +- .../gstreamer1-editing-services.mk | 2 +- package/gstreamer1/gstreamer1/gstreamer1.hash | 6 +-- package/gstreamer1/gstreamer1/gstreamer1.mk | 5 +-- 29 files changed, 119 insertions(+), 146 deletions(-) delete mode 100644 package/gstreamer1/gst1-plugins-bad/0001-neon-Allow-building-against-neon-0-32-x.patch delete mode 100644 package/gstreamer1/gst1-rtsp-server/0001-gst-rtsp-server-meson.build-add-gst_dep.patch -- 2.34.1 From ps.report at gmx.net Tue Feb 8 21:24:01 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 8 Feb 2022 22:24:01 +0100 Subject: [Buildroot] [PATCH v1 09/13] package/gst1-rtsp-server: bump version to 1.20.0 In-Reply-To: <20220208212405.19243-1-ps.report@gmx.net> References: <20220208212405.19243-1-ps.report@gmx.net> Message-ID: <20220208212405.19243-10-ps.report@gmx.net> - removed 0001-gst-rtsp-server-meson.build-add-gst_dep.patch (upstream accepted [1]) - update COPYING/COPYING.LIB hash (license text update from LGPL-2.0+ to LGPL-2.1+, see [2]) and adjust GST1_RTSP_SERVER_LICENSE accordingly [1] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/e637aae629f5b95b748a6f23abecc2b502272822.patch [2] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/cc5cdab0165e3bdf5f4f748b3ba2a3493d304e70.patch Signed-off-by: Peter Seiderer --- ...-rtsp-server-meson.build-add-gst_dep.patch | 41 ------------------- .../gst1-rtsp-server/gst1-rtsp-server.hash | 8 ++-- .../gst1-rtsp-server/gst1-rtsp-server.mk | 4 +- 3 files changed, 6 insertions(+), 47 deletions(-) delete mode 100644 package/gstreamer1/gst1-rtsp-server/0001-gst-rtsp-server-meson.build-add-gst_dep.patch 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 deleted file mode 100644 index b63f634598..0000000000 --- a/package/gstreamer1/gst1-rtsp-server/0001-gst-rtsp-server-meson.build-add-gst_dep.patch +++ /dev/null @@ -1,41 +0,0 @@ -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 - diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash index fadef41351..00ff974c6e 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash @@ -1,4 +1,4 @@ -# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.18.6.tar.xz.sha256sum -sha256 826f32afbcf94b823541efcac4a0dacdb62f6145ef58f363095749f440262be9 gst-rtsp-server-1.18.6.tar.xz -sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING -sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING.LIB +# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.20.0.tar.xz.sha256sum +sha256 c209f5ed906da713fdd44a8844e909aa6c8af3dfb630259b092cfb77a7755843 gst-rtsp-server-1.20.0.tar.xz +sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING +sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING.LIB diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk index 55403754f3..d22dd5e7cc 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk @@ -4,10 +4,10 @@ # ################################################################################ -GST1_RTSP_SERVER_VERSION = 1.18.6 +GST1_RTSP_SERVER_VERSION = 1.20.0 GST1_RTSP_SERVER_SOURCE = gst-rtsp-server-$(GST1_RTSP_SERVER_VERSION).tar.xz GST1_RTSP_SERVER_SITE = http://gstreamer.freedesktop.org/src/gst-rtsp-server -GST1_RTSP_SERVER_LICENSE = LGPL-2.0+ +GST1_RTSP_SERVER_LICENSE = LGPL-2.1+ GST1_RTSP_SERVER_LICENSE_FILES = COPYING COPYING.LIB GST1_RTSP_SERVER_CPE_ID_VENDOR = gstreamer_project GST1_RTSP_SERVER_CPE_ID_PRODUCT = gst-rtsp-server -- 2.34.1 From ps.report at gmx.net Tue Feb 8 21:24:03 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 8 Feb 2022 22:24:03 +0100 Subject: [Buildroot] [PATCH v1 11/13] package/gst-omx: bump version to 1.20.0 In-Reply-To: <20220208212405.19243-1-ps.report@gmx.net> References: <20220208212405.19243-1-ps.report@gmx.net> Message-ID: <20220208212405.19243-12-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gst-omx/gst-omx.hash | 4 ++-- package/gstreamer1/gst-omx/gst-omx.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst-omx/gst-omx.hash b/package/gstreamer1/gst-omx/gst-omx.hash index 47f7cb5893..0b95505c5f 100644 --- a/package/gstreamer1/gst-omx/gst-omx.hash +++ b/package/gstreamer1/gst-omx/gst-omx.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.18.6.tar.xz.sha256sum -sha256 b5281c938e959fd2418e989cfb6065fdd9fe5f6f87ee86236c9427166e708163 gst-omx-1.18.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.20.0.tar.xz.sha256sum +sha256 c1e46b70ac379ac7b3646506370c9e1007b56ae293f4d334bc0e724c76c345dd gst-omx-1.20.0.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst-omx/gst-omx.mk b/package/gstreamer1/gst-omx/gst-omx.mk index dc65509244..f71e1242ff 100644 --- a/package/gstreamer1/gst-omx/gst-omx.mk +++ b/package/gstreamer1/gst-omx/gst-omx.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST_OMX_VERSION = 1.18.6 +GST_OMX_VERSION = 1.20.0 GST_OMX_SOURCE = gst-omx-$(GST_OMX_VERSION).tar.xz GST_OMX_SITE = https://gstreamer.freedesktop.org/src/gst-omx -- 2.34.1 From ps.report at gmx.net Tue Feb 8 21:24:04 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 8 Feb 2022 22:24:04 +0100 Subject: [Buildroot] [PATCH v1 12/13] package/gst1-python: bump version to 1.20.0 In-Reply-To: <20220208212405.19243-1-ps.report@gmx.net> References: <20220208212405.19243-1-ps.report@gmx.net> Message-ID: <20220208212405.19243-13-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-python/gst1-python.hash | 4 ++-- package/gstreamer1/gst1-python/gst1-python.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-python/gst1-python.hash b/package/gstreamer1/gst1-python/gst1-python.hash index a760e53e7d..a2f17583fd 100644 --- a/package/gstreamer1/gst1-python/gst1-python.hash +++ b/package/gstreamer1/gst1-python/gst1-python.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.18.6.tar.xz.sha256sum -sha256 bdc0ea22fbd7335ad9decc151561aacc53c51206a9735b81eac700ce5b0bbd4a gst-python-1.18.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.20.0.tar.xz.sha256sum +sha256 8f67bdc5606ba33606c6bc896e89de7dcd8cf4fca459f71389b1b6fe075b5e54 gst-python-1.20.0.tar.xz sha256 ea3ad127610e5ded2210b3a86a46314f2b3b28e438eccffdae19a4d6fbcdb0c2 COPYING diff --git a/package/gstreamer1/gst1-python/gst1-python.mk b/package/gstreamer1/gst1-python/gst1-python.mk index 7faab752cd..a9cc32d1d7 100644 --- a/package/gstreamer1/gst1-python/gst1-python.mk +++ b/package/gstreamer1/gst1-python/gst1-python.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PYTHON_VERSION = 1.18.6 +GST1_PYTHON_VERSION = 1.20.0 GST1_PYTHON_SOURCE = gst-python-$(GST1_PYTHON_VERSION).tar.xz GST1_PYTHON_SITE = https://gstreamer.freedesktop.org/src/gst-python GST1_PYTHON_INSTALL_STAGING = YES -- 2.34.1 From ps.report at gmx.net Tue Feb 8 21:23:57 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 8 Feb 2022 22:23:57 +0100 Subject: [Buildroot] [PATCH v1 05/13] package/gst1-plugins-ugly: bump version to 1.20.0 In-Reply-To: <20220208212405.19243-1-ps.report@gmx.net> References: <20220208212405.19243-1-ps.report@gmx.net> Message-ID: <20220208212405.19243-6-ps.report@gmx.net> - enable new gpl option ('Allow build plugins that have GPL-licensed dependencies') in case gpl plugin enabled Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash | 4 ++-- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash index 26fd0fd9ac..d16134f24b 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.18.6.tar.xz.sha256sum -sha256 4969c409cb6a88317d2108b8577108e18623b2333d7b587ae3f39459c70e3a7f gst-plugins-ugly-1.18.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.20.0.tar.xz.sha256sum +sha256 4e8dcb5d26552f0a4937f6bc6279bd9070f55ca6ae0eaa32d72d264c44001c2e gst-plugins-ugly-1.20.0.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk index 7f483deb81..05b1fab304 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_UGLY_VERSION = 1.18.6 +GST1_PLUGINS_UGLY_VERSION = 1.20.0 GST1_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST1_PLUGINS_UGLY_VERSION).tar.xz GST1_PLUGINS_UGLY_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-ugly GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING @@ -89,6 +89,7 @@ endif # Add GPL license if GPL plugins enabled. ifeq ($(GST1_PLUGINS_UGLY_HAS_GPL_LICENSE),y) +GST1_PLUGINS_UGLY_CONF_OPTS += -Dgpl=enabled GST1_PLUGINS_UGLY_LICENSE += , GPL-2.0 endif -- 2.34.1 From ps.report at gmx.net Tue Feb 8 21:23:59 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 8 Feb 2022 22:23:59 +0100 Subject: [Buildroot] [PATCH v1 07/13] package/gst1-libav: bump version to 1.20.0 In-Reply-To: <20220208212405.19243-1-ps.report@gmx.net> References: <20220208212405.19243-1-ps.report@gmx.net> Message-ID: <20220208212405.19243-8-ps.report@gmx.net> - update COPYING hash (license text update from LGPL-2.0+ to LGPL-2.1+, see [1]) and adjust GST1_LIBAV_LICENSE accordingly [1] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/d157b23fb0ce175b167611a4cb019599d9017042.patch Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-libav/gst1-libav.hash | 6 +++--- package/gstreamer1/gst1-libav/gst1-libav.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/gstreamer1/gst1-libav/gst1-libav.hash b/package/gstreamer1/gst1-libav/gst1-libav.hash index 5fb39a0b3e..3204de3c14 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.hash +++ b/package/gstreamer1/gst1-libav/gst1-libav.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.18.6.tar.xz.sha256sum -sha256 e4e50dcd5a29441ae34de60d2221057e8064ed824bb6ca4dc0fd9ee88fbe9b81 gst-libav-1.18.6.tar.xz -sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING +# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.20.0.tar.xz.sha256sum +sha256 5eee5ed8d5082a31b500448e41535c722ee30cd5f8224f32982bbaba2eedef17 gst-libav-1.20.0.tar.xz +sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gst1-libav/gst1-libav.mk b/package/gstreamer1/gst1-libav/gst1-libav.mk index 55c6e06e0e..f07e5061b4 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.mk +++ b/package/gstreamer1/gst1-libav/gst1-libav.mk @@ -4,10 +4,10 @@ # ################################################################################ -GST1_LIBAV_VERSION = 1.18.6 +GST1_LIBAV_VERSION = 1.20.0 GST1_LIBAV_SOURCE = gst-libav-$(GST1_LIBAV_VERSION).tar.xz GST1_LIBAV_SITE = https://gstreamer.freedesktop.org/src/gst-libav -GST1_LIBAV_LICENSE = LGPL-2.0+ +GST1_LIBAV_LICENSE = LGPL-2.1+ GST1_LIBAV_LICENSE_FILES = COPYING GST1_LIBAV_DEPENDENCIES = host-pkgconf ffmpeg gstreamer1 gst1-plugins-base GST1_LIBAV_CONF_OPTS = -Ddoc=disabled -- 2.34.1 From ps.report at gmx.net Tue Feb 8 21:23:53 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 8 Feb 2022 22:23:53 +0100 Subject: [Buildroot] [PATCH v1 01/13] package/gstreamer1: bump version to 1.20.0 In-Reply-To: <20220208212405.19243-1-ps.report@gmx.net> References: <20220208212405.19243-1-ps.report@gmx.net> Message-ID: <20220208212405.19243-2-ps.report@gmx.net> - meson option gtk_doc removed ([1]) - update COPYING hash (license text update from LGPL-2.0+ to LGPL-2.1+, see [2]) and adjust GSTREAMER1_LICENSE accordingly [1] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/f5ee12395832d4305bb8dbdf4751552d03430d6d.patch [2] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/d157b23fb0ce175b167611a4cb019599d9017042.patch Signed-off-by: Peter Seiderer --- package/gstreamer1/gstreamer1/gstreamer1.hash | 6 +++--- package/gstreamer1/gstreamer1/gstreamer1.mk | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/gstreamer1/gstreamer1/gstreamer1.hash b/package/gstreamer1/gstreamer1/gstreamer1.hash index 1202bf2c50..f4a74a6125 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.hash +++ b/package/gstreamer1/gstreamer1/gstreamer1.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.18.6.tar.xz.sha256sum -sha256 4ec816010dd4d3a93cf470ad0a6f25315f52b204eb1d71dfa70ab8a1c3bd06e6 gstreamer-1.18.6.tar.xz -sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING +# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.20.0.tar.xz.sha256sum +sha256 edf4bffff85591d4fff7b21bb9ed7f0feabc123ac4a4eff29e73cbce454f9db7 gstreamer-1.20.0.tar.xz +sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk index 27745f3bf9..86df5d6cf6 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -4,12 +4,12 @@ # ################################################################################ -GSTREAMER1_VERSION = 1.18.6 +GSTREAMER1_VERSION = 1.20.0 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer GSTREAMER1_INSTALL_STAGING = YES GSTREAMER1_LICENSE_FILES = COPYING -GSTREAMER1_LICENSE = LGPL-2.0+, LGPL-2.1+ +GSTREAMER1_LICENSE = LGPL-2.1+ GSTREAMER1_CPE_ID_VENDOR = gstreamer_project GSTREAMER1_CPE_ID_PRODUCT = gstreamer @@ -18,7 +18,6 @@ GSTREAMER1_CONF_OPTS = \ -Dtests=disabled \ -Dbenchmarks=disabled \ -Dtools=$(if $(BR2_PACKAGE_GSTREAMER1_INSTALL_TOOLS),enabled,disabled) \ - -Dgtk_doc=disabled \ -Dgobject-cast-checks=disabled \ -Dglib-asserts=disabled \ -Dglib-checks=disabled \ -- 2.34.1 From ps.report at gmx.net Tue Feb 8 21:23:56 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 8 Feb 2022 22:23:56 +0100 Subject: [Buildroot] [PATCH v1 04/13] package/gst1-plugins-bad: bump version to 1.20.0 In-Reply-To: <20220208212405.19243-1-ps.report@gmx.net> References: <20220208212405.19243-1-ps.report@gmx.net> Message-ID: <20220208212405.19243-5-ps.report@gmx.net> - removed 0001-neon-Allow-building-against-neon-0-32-x.patch (from upstream [1]) - add codecalpha option (VP8/VP9 alpha support) - add qroverlay option (overlay data on top of video in the form of a QR code) with json-glib and libqrencode dependencies (omit json-glib explicit dependencies as they are the same as for gstreamer1, glib2 BR2_USE_WCHAR, BR2_TOOLCHAIN_HAS_THREADS and BR2_USE_MMU), place instead to 'plugins without external deps' section into 'plugins that need external deps' section as it clearly has dependencies (prelimary to upstream commit [2]) - add aes option (AES encryption/decryption plugin) - disable new option asio (Steinberg Audio Streaming, windows only) - disable new option gs (Google Cloud Storage, needs storage_client library) - disable new option ldac (LDAC bluetooth audio codec, needs ldacBT-enc library) - remove legacy option ofa (disabled) - disable new option onnx (ONNX neural network, needs libonnxruntime library) - disable new option isac (iSAC plugin, needs webrtc-audio-coding-1 library) - removed libmms ('Microsoft Multi Media Server streaming protocol' option, add Config.in.legacy entry - enable new gpl option ('Allow build plugins that have (A)GPL-licensed dependencies') in case gpl plugin enabled [1] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/b83e85ab677c79b46f520abebd1ee031e3a139c0.patch [2] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/5d70c168b356691073a0d22f7ce3ea7efb20641c.patch Signed-off-by: Peter Seiderer --- Config.in.legacy | 22 ++++++++---- ...n-Allow-building-against-neon-0-32-x.patch | 29 --------------- package/gstreamer1/gst1-plugins-bad/Config.in | 31 ++++++++++------ .../gst1-plugins-bad/gst1-plugins-bad.hash | 4 +-- .../gst1-plugins-bad/gst1-plugins-bad.mk | 36 ++++++++++++++----- 5 files changed, 64 insertions(+), 58 deletions(-) delete mode 100644 package/gstreamer1/gst1-plugins-bad/0001-neon-Allow-building-against-neon-0-32-x.patch diff --git a/Config.in.legacy b/Config.in.legacy index 34d8c71cc8..2d7f14f097 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,16 @@ 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_TARGET_UBOOT_ZYNQ_IMAGE bool "Generate image for Xilinx Zynq" select BR2_LEGACY @@ -159,15 +169,13 @@ config BR2_TARGET_UBOOT_ZYNQ_IMAGE https://gist.githubusercontent.com/jameshilliard/e09235dfc6f96c11418a134e6ebf7890/raw/135b7480c405ae8a77a9db615e495f9a9f2d3242/zynq-boot-bin.py -config BR2_PACKAGE_RPI_BT_FIRMWARE - bool "rpi-bt-firmware package was renamed" - depends on BR2_arm || BR2_aarch64 +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBMMS + bool "gst1-plugins-bad plugin libmms was removed" + depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_HAS_THREADS 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. + This plugin was removed with gst1-plugins-bad-1.20.0. config BR2_PACKAGE_RPI_WIFI_FIRMWARE bool "rpi-wifi-firmware package was renamed" 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 deleted file mode 100644 index e995a8cb91..0000000000 --- a/package/gstreamer1/gst1-plugins-bad/0001-neon-Allow-building-against-neon-0-32-x.patch +++ /dev/null @@ -1,29 +0,0 @@ -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 - diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in index b793cb8eb1..234d57636b 100644 --- a/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/package/gstreamer1/gst1-plugins-bad/Config.in @@ -76,6 +76,12 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CAMERABIN2 help Take image snapshots and record movies from camera +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CODECALPHA + bool "codecalpha" + help + Elements for VP8/VP9 alpha support (codecalphademux, + alphacombine, vp8alphadecodebin, vp9alphadecodebin) + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_COLOREFFECTS bool "coloreffects" help @@ -324,6 +330,12 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_Y4M comment "plugins with external dependencies" +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AES + bool "aes" + select BR2_PACKAGE_OPENSSL + help + "AES encryption/decryption plugin" + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASSRENDER bool "assrender" depends on BR2_INSTALL_LIBSTDCPP # libass -> harfbuzz @@ -458,17 +470,6 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_KMS help KMS video sink -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBMMS - bool "libmms" - depends on BR2_USE_WCHAR # libmms -> libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libmms -> libglib2 - select BR2_PACKAGE_LIBMMS - help - Microsoft Multi Media Server streaming protocol support - -comment "libmms needs a toolchain w/ wchar, threads" - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS - config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DTLS bool "dtls" select BR2_PACKAGE_OPENSSL @@ -558,6 +559,14 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPUS help OPUS plugin library +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_QROVERLAY + bool "qroverlay" + select BR2_PACKAGE_JSON_GLIB + select BR2_PACKAGE_LIBQRENCODE + help + Elements qroverlay, debugqroverlay (overlay data on top of + video in the form of a QR code) + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RSVG bool "rsvg" depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # librsvg diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash index d31a78981e..72c9624b94 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.6.tar.xz.sha256sum -sha256 0b1b50ac6311f0c510248b6cd64d6d3c94369344828baa602db85ded5bc70ec9 gst-plugins-bad-1.18.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.20.0.tar.xz.sha256sum +sha256 015b8d4d9a395ebf444d40876867a2034dd3304b3ad48bc3a0dd0c1ee71dc11d gst-plugins-bad-1.20.0.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index d02ca1ba74..24fd9dd312 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BAD_VERSION = 1.18.6 +GST1_PLUGINS_BAD_VERSION = 1.20.0 GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz GST1_PLUGINS_BAD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-bad GST1_PLUGINS_BAD_INSTALL_STAGING = YES @@ -34,6 +34,7 @@ GST1_PLUGINS_BAD_CONF_OPTS = \ # Options which require currently unpackaged libraries GST1_PLUGINS_BAD_CONF_OPTS += \ + -Dasio=disabled \ -Davtp=disabled \ -Dopensles=disabled \ -Dmsdk=disabled \ @@ -46,16 +47,18 @@ GST1_PLUGINS_BAD_CONF_OPTS += \ -Dresindvd=disabled \ -Dfaac=disabled \ -Dflite=disabled \ + -Dgs=disabled \ -Dgsm=disabled \ -Dkate=disabled \ -Dladspa=disabled \ + -Dldac=disabled \ -Dlv2=disabled \ -Dmediafoundation=disabled \ -Dmicrodns=disabled \ -Dlibde265=disabled \ -Dmodplug=disabled \ -Dmplex=disabled \ - -Dofa=disabled \ + -Donnx=disabled \ -Dopenexr=disabled \ -Dopenni2=disabled \ -Dteletext=disabled \ @@ -69,6 +72,7 @@ GST1_PLUGINS_BAD_CONF_OPTS += \ -Dwasapi2=disabled \ -Dzxing=disabled \ -Dmagicleap=disabled \ + -Disac=disabled \ -Diqa=disabled \ -Dopencv=disabled @@ -180,6 +184,12 @@ else GST1_PLUGINS_BAD_CONF_OPTS += -Dcamerabin2=disabled endif +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CODECALPHA),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Dcodecalpha=enabled +else +GST1_PLUGINS_BAD_CONF_OPTS += -Dcodecalpha=disabled +endif + ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_COLOREFFECTS),y) GST1_PLUGINS_BAD_CONF_OPTS += -Dcoloreffects=enabled else @@ -497,6 +507,13 @@ endif # Plugins with dependencies +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AES),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Daes=enabled +GST1_PLUGINS_BAD_DEPENDENCIES += openssl +else +GST1_PLUGINS_BAD_CONF_OPTS += -Daes=disabled +endif + ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASSRENDER),y) GST1_PLUGINS_BAD_CONF_OPTS += -Dassrender=enabled GST1_PLUGINS_BAD_DEPENDENCIES += libass @@ -604,13 +621,6 @@ else GST1_PLUGINS_BAD_CONF_OPTS += -Dkms=disabled endif -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBMMS),y) -GST1_PLUGINS_BAD_CONF_OPTS += -Dlibmms=enabled -GST1_PLUGINS_BAD_DEPENDENCIES += libmms -else -GST1_PLUGINS_BAD_CONF_OPTS += -Dlibmms=disabled -endif - ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DTLS),y) GST1_PLUGINS_BAD_CONF_OPTS += -Ddtls=enabled GST1_PLUGINS_BAD_DEPENDENCIES += openssl @@ -677,6 +687,13 @@ else GST1_PLUGINS_BAD_CONF_OPTS += -Dopus=disabled endif +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_QROVERLAY),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Dqroverlay=enabled +GST1_PLUGINS_BAD_DEPENDENCIES += json-glib libqrencode +else +GST1_PLUGINS_BAD_CONF_OPTS += -Dqroverlay=disabled +endif + ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RSVG),y) GST1_PLUGINS_BAD_CONF_OPTS += -Drsvg=enabled GST1_PLUGINS_BAD_DEPENDENCIES += librsvg @@ -787,6 +804,7 @@ endif # Add GPL license if GPL licensed plugins enabled. ifeq ($(GST1_PLUGINS_BAD_HAS_GPL_LICENSE),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Dgpl=enabled GST1_PLUGINS_BAD_LICENSE += , GPL-2.0+ GST1_PLUGINS_BAD_LICENSE_FILES += COPYING endif -- 2.34.1 From ps.report at gmx.net Tue Feb 8 21:24:02 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 8 Feb 2022 22:24:02 +0100 Subject: [Buildroot] [PATCH v1 10/13] package/gstreamer1-editing-services: bump version to 1.20.0 In-Reply-To: <20220208212405.19243-1-ps.report@gmx.net> References: <20220208212405.19243-1-ps.report@gmx.net> Message-ID: <20220208212405.19243-11-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- .../gstreamer1-editing-services.hash | 4 ++-- .../gstreamer1-editing-services.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash index e29dc112ce..9662e6b8fb 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash @@ -1,5 +1,5 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.18.6.tar.xz.sha256sum -sha256 fe10d14ef896aa21038317f6f81e1158ccc6caaed9b0d5a29ae5bdd63074582c gst-editing-services-1.18.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.20.0.tar.xz.sha256sum +sha256 f837adcf4073d19a5908984e879cd039f4192ca368e71d39e8ccd8a56b9feedf gst-editing-services-1.20.0.tar.xz # Hashes for license files: sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk index a3722cbbca..5e03c08ae7 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_EDITING_SERVICES_VERSION = 1.18.6 +GSTREAMER1_EDITING_SERVICES_VERSION = 1.20.0 GSTREAMER1_EDITING_SERVICES_SOURCE = gst-editing-services-$(GSTREAMER1_EDITING_SERVICES_VERSION).tar.xz GSTREAMER1_EDITING_SERVICES_SITE = https://gstreamer.freedesktop.org/src/gstreamer-editing-services GSTREAMER1_EDITING_SERVICES_LICENSE = LGPL-2.0+ -- 2.34.1 From ps.report at gmx.net Tue Feb 8 21:24:05 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 8 Feb 2022 22:24:05 +0100 Subject: [Buildroot] [PATCH v1 13/13] package/gst1-plugins-bayer2rgb-neon: fix plugin install In-Reply-To: <20220208212405.19243-1-ps.report@gmx.net> References: <20220208212405.19243-1-ps.report@gmx.net> Message-ID: <20220208212405.19243-14-ps.report@gmx.net> - fix plugin install path, add '-with-plugindir=/usr/lib/gstreamer-1.0', otherwise the plugins are installed with duplicated build path (as detected by step_check_build_dir) - remove GST1_PLUGINS_BAYER2RGB_NEON_INSTALL_STAGING (no need to install the plugin to staging) Signed-off-by: Peter Seiderer --- .../gst1-plugins-bayer2rgb-neon.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.mk b/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.mk index 815099e315..0d4aeac7f5 100644 --- a/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.mk +++ b/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.mk @@ -10,8 +10,6 @@ GST1_PLUGINS_BAYER2RGB_NEON_SITE_METHOD = git GST1_PLUGINS_BAYER2RGB_NEON_LICENSE = GPL-3.0 GST1_PLUGINS_BAYER2RGB_NEON_LICENSE_FILES = COPYING -GST1_PLUGINS_BAYER2RGB_NEON_INSTALL_STAGING = YES - GST1_PLUGINS_BAYER2RGB_NEON_DEPENDENCIES = \ host-pkgconf \ gstreamer1 \ @@ -20,4 +18,6 @@ GST1_PLUGINS_BAYER2RGB_NEON_DEPENDENCIES = \ GST1_PLUGINS_BAYER2RGB_NEON_AUTORECONF = YES +GST1_PLUGINS_BAYER2RGB_NEON_CONF_OPTS = --with-plugindir=/usr/lib/gstreamer-1.0 + $(eval $(autotools-package)) -- 2.34.1 From ps.report at gmx.net Tue Feb 8 21:23:58 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 8 Feb 2022 22:23:58 +0100 Subject: [Buildroot] [PATCH v1 06/13] package/gst1-devtools: bump version to 1.20.0 In-Reply-To: <20220208212405.19243-1-ps.report@gmx.net> References: <20220208212405.19243-1-ps.report@gmx.net> Message-ID: <20220208212405.19243-7-ps.report@gmx.net> - use new option cairo ('Build GstValidateVideo') instead pure optional dependency on packet cairo Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-devtools/gst1-devtools.hash | 4 ++-- package/gstreamer1/gst1-devtools/gst1-devtools.mk | 13 ++++++++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.hash b/package/gstreamer1/gst1-devtools/gst1-devtools.hash index 011385e757..dd09280a9c 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.hash +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.18.6.tar.xz.sha256sum -sha256 3725622c740a635452e54b79d065f963ab7706ca2403de6c43072ae7610a0de4 gst-devtools-1.18.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.20.0.tar.xz.sha256sum +sha256 69fc8756ec9d93e5c5258c99088434f203e91fdbc5af28d1f2c583fd819b7a1d gst-devtools-1.20.0.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 validate/COPYING diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.mk b/package/gstreamer1/gst1-devtools/gst1-devtools.mk index 66b509ae2c..59a55577cb 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.mk +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_DEVTOOLS_VERSION = 1.18.6 +GST1_DEVTOOLS_VERSION = 1.20.0 GST1_DEVTOOLS_SOURCE = gst-devtools-$(GST1_DEVTOOLS_VERSION).tar.xz GST1_DEVTOOLS_SITE = https://gstreamer.freedesktop.org/src/gst-devtools GST1_DEVTOOLS_LICENSE = LGPL-2.1+ @@ -14,8 +14,7 @@ GST1_DEVTOOLS_INSTALL_STAGING = YES GST1_DEVTOOLS_DEPENDENCIES = \ gstreamer1 \ gst1-plugins-base \ - json-glib \ - $(if $(BR2_PACKAGE_CAIRO),cairo) + json-glib ifeq ($(BR2_PACKAGE_PYTHON3),y) GST1_DEVTOOLS_DEPENDENCIES += host-python3 python3 @@ -34,4 +33,12 @@ GST1_DEVTOOLS_CONF_OPTS = \ -Dtests=disabled \ -Ddoc=disabled +# build GstValidateVideo +ifeq ($(BR2_PACKAGE_CAIRO),y) +GST1_DEVTOOLS_CONF_OPTS += -Dcairo=enabled +GST1_DEVTOOLS_DEPENDENCIES += cairo +else +GST1_DEVTOOLS_CONF_OPTS += -Dcairo=disabled +endif + $(eval $(meson-package)) -- 2.34.1 From romain.naour at gmail.com Tue Feb 8 21:35:13 2022 From: romain.naour at gmail.com (Romain Naour) Date: Tue, 8 Feb 2022 22:35:13 +0100 Subject: [Buildroot] [PATCH 1/2] support/scripts/gen-bootlin-toolchains: add s390x toolchain Message-ID: <20220208213514.7141-1-romain.naour@gmail.com> s390x support has been added since toolchain-builder release 2021.05 [1]. [1] https://github.com/bootlin/toolchains-builder/commit/4bbb52a6a30a340a30722bc170467aa6fa4adbe6 Signed-off-by: Romain Naour --- support/scripts/gen-bootlin-toolchains | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/support/scripts/gen-bootlin-toolchains b/support/scripts/gen-bootlin-toolchains index dc173fa949..f9dd9da9a8 100755 --- a/support/scripts/gen-bootlin-toolchains +++ b/support/scripts/gen-bootlin-toolchains @@ -162,6 +162,10 @@ arches = { 'conditions': ['BR2_riscv', 'BR2_riscv_g', 'BR2_RISCV_64', 'BR2_RISCV_ABI_LP64D'], 'prefix': 'riscv64', }, + 's390x-z13': { + 'conditions': ['BR2_s390x', 'BR2_s390x_z13'], + 'prefix': 's390x', + }, 'sh-sh4': { 'conditions': ['BR2_sh', 'BR2_sh4'], 'prefix': 'sh4', -- 2.34.1 From romain.naour at gmail.com Tue Feb 8 21:35:14 2022 From: romain.naour at gmail.com (Romain Naour) Date: Tue, 8 Feb 2022 22:35:14 +0100 Subject: [Buildroot] [PATCH 2/2] toolchain/toolchain-external/toolchain-external-bootlin: update with new s390x toolchain In-Reply-To: <20220208213514.7141-1-romain.naour@gmail.com> References: <20220208213514.7141-1-romain.naour@gmail.com> Message-ID: <20220208213514.7141-2-romain.naour@gmail.com> Signed-off-by: Romain Naour --- .../tests/toolchain/test_external_bootlin.py | 30 +++++++++++ .../Config.in.options | 51 +++++++++++++++++++ .../toolchain-external-bootlin.hash | 4 ++ .../toolchain-external-bootlin.mk | 12 +++++ 4 files changed, 97 insertions(+) diff --git a/support/testing/tests/toolchain/test_external_bootlin.py b/support/testing/tests/toolchain/test_external_bootlin.py index cf6174303e..94df9ac488 100644 --- a/support/testing/tests/toolchain/test_external_bootlin.py +++ b/support/testing/tests/toolchain/test_external_bootlin.py @@ -2152,6 +2152,36 @@ class TestExternalToolchainBootlinRiscv64lp64dUclibcStable(TestExternalToolchain TestExternalToolchain.common_check(self) +class TestExternalToolchainBootlinS390xz13GlibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_s390x=y + BR2_s390x_z13=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_GLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "s390x-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinS390xz13GlibcStable(TestExternalToolchain): + config = """ + BR2_s390x=y + BR2_s390x_z13=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_GLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "s390x-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + class TestExternalToolchainBootlinShsh4GlibcBleedingEdge(TestExternalToolchain): config = """ BR2_sh=y diff --git a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options index 4b4404620c..53034c4f5e 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options @@ -33,6 +33,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCH_SUPPORTS default y if BR2_powerpc64le && BR2_powerpc_power8 default y if BR2_riscv && BR2_riscv_g && BR2_RISCV_32 && BR2_RISCV_ABI_ILP32D default y if BR2_riscv && BR2_riscv_g && BR2_RISCV_64 && BR2_RISCV_ABI_LP64D + default y if BR2_s390x && BR2_s390x_z13 default y if BR2_sh && BR2_sh4 default y if BR2_sh && BR2_sh4aeb default y if BR2_sparc64 && BR2_sparc_v9 @@ -3455,6 +3456,56 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_UCLIBC_STABLE https://toolchains.bootlin.com/ +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_GLIBC_BLEEDING_EDGE + bool "s390x-z13 glibc bleeding-edge 2021.11-1" + depends on BR2_s390x + depends on BR2_s390x_z13 + 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 s390x-z13 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_S390X_Z13_GLIBC_STABLE + bool "s390x-z13 glibc stable 2021.11-1" + depends on BR2_s390x + depends on BR2_s390x_z13 + 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 s390x-z13 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_SH_SH4_GLIBC_BLEEDING_EDGE bool "sh-sh4 glibc bleeding-edge 2021.11-1" depends on BR2_sh 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 6542694033..1f2aa1386c 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash +++ b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash @@ -278,6 +278,10 @@ sha256 42ca8024547e51e6126e3c9e711d80815aa4b2997900dfc8af4b9514105e8b78 riscv6 sha256 02dd9fe4a024f84c7f73b7155640066017c7d18dd90c4da6efe6f0e66d24f75c riscv64-lp64d--uclibc--bleeding-edge-2021.11-1.tar.bz2 # From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--uclibc--stable-2021.11-1.sha256 sha256 01f061e1b3d106d25614ae5bd64df3a3588bc960caa3bbad14b50f718a558f41 riscv64-lp64d--uclibc--stable-2021.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/s390x-z13/tarballs/s390x-z13--glibc--bleeding-edge-2021.11-1.sha256 +sha256 d8e657ba00929007e938c7fc398fb5aee8abeceea3ad1cd304c05e7f47d9ef30 s390x-z13--glibc--bleeding-edge-2021.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/s390x-z13/tarballs/s390x-z13--glibc--stable-2021.11-1.sha256 +sha256 04d8c28bc1af09a949cfe76991379fef4b0876448192625a22c028c7daf92e3f s390x-z13--glibc--stable-2021.11-1.tar.bz2 # From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--glibc--bleeding-edge-2021.11-1.sha256 sha256 64c14617fb95b1eeb50564d1e0ccbf73fa73e5e58aea6b192549fc7127e4bd5c sh-sh4--glibc--bleeding-edge-2021.11-1.tar.bz2 # From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--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 fb19ef2909..786967052f 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk +++ b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk @@ -840,6 +840,18 @@ TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv64-lp64d--uclibc--stable-$(TOOLCHAIN_EX TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs endif +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_GLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = s390x-z13--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/s390x-z13/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_GLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = s390x-z13--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/s390x-z13/tarballs +endif + ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_GLIBC_BLEEDING_EDGE),y) TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 -- 2.34.1 From kieran.bingham at ideasonboard.com Tue Feb 8 21:28:49 2022 From: kieran.bingham at ideasonboard.com (Kieran Bingham) Date: Tue, 08 Feb 2022 21:28:49 +0000 Subject: [Buildroot] [PATCH v5] package/libcamera-apps: new package In-Reply-To: References: <20210502095925.10744-1-ps.report@gmx.net> Message-ID: <164435572997.3447701.14524139530215798014@Monstersaurus> Hi All, Quoting Arnout Vandecappelle (2022-02-08 21:09:44) > > > On 02/05/2021 11:59, Peter Seiderer wrote: > > Signed-off-by: Peter Seiderer > > (Finally) applied to master, thanks. However... Ohh, I'm happy to see this packaged. Can someone try to bump the libcamera to the latest revision soon please? There have been a couple of bug fixes/performance issues resolved that were quite noticable on the Pi. In fact, now I check there's a couple more RPi patches to be merged soon so it might be worth getting those in first. -- Kieran. > > [snip] > > diff --git a/package/libcamera-apps/0001-cmake-remove-Wfatal-errors-compiler-command-line-opt.patch b/package/libcamera-apps/0001-cmake-remove-Wfatal-errors-compiler-command-line-opt.patch > > new file mode 100644 > > index 0000000000..11d19fa526 > > --- /dev/null > > +++ b/package/libcamera-apps/0001-cmake-remove-Wfatal-errors-compiler-command-line-opt.patch > > @@ -0,0 +1,25 @@ > > +From 22096ef8cfb18563c1955145db24742081910e10 Mon Sep 17 00:00:00 2001 > > +From: Peter Seiderer > > +Date: Fri, 5 Feb 2021 18:24:08 +0100 > > +Subject: [PATCH] cmake: remove -Wfatal-errors compiler command line option > > + > > +Signed-off-by: Peter Seiderer > > +--- > > + CMakeLists.txt | 1 - > > + 1 file changed, 1 deletion(-) > > + > > +diff --git a/CMakeLists.txt b/CMakeLists.txt > > +index 4191245..199a0f6 100644 > > +--- a/CMakeLists.txt > > ++++ b/CMakeLists.txt > > +@@ -10,7 +10,6 @@ endif() > > + set (CMAKE_EXPORT_COMPILE_COMMANDS ON) > > + set (CMAKE_CXX_STANDARD 17) > > + set (CMAKE CXX_FLAGS "-Wall -Wextra -pedantic -Wno-unused-parameter -faligned-new") > > +-add_definitions(-Wfatal-errors) > > Why is this patch needed? The only thing that -Wfatal-errors does is to stop > compilation when there is an error, instead of trying to continue and find more > errors in the rest of the file. It's not -Werror. > > I kept the patch anyway because I didn't test without it. > > > Regards, > Arnout > > > > + add_definitions(-Wno-psabi) > > + add_definitions(-DBOOST_LOG_DYN_LINK) > > + > > +-- > > +2.30.0 > > + > > diff --git a/package/libcamera-apps/Config.in b/package/libcamera-apps/Config.in > > new file mode 100644 > > index 0000000000..08667eb830 > > --- /dev/null > > +++ b/package/libcamera-apps/Config.in > > @@ -0,0 +1,31 @@ > > +config BR2_PACKAGE_LIBCAMERA_APPS > > + bool "libcamera-apps" > > + depends on BR2_PACKAGE_LIBCAMERA_ARCH_SUPPORTS # libcamera > > + depends on BR2_INSTALL_LIBSTDCPP # libcamera/boost > > + depends on BR2_TOOLCHAIN_HAS_THREADS # libcamera/boost/libdrm > > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17/libcamera > > + depends on !BR2_STATIC_LIBS # gnutls/libcamera > > + depends on BR2_USE_WCHAR # gnutls/libcamera/boost > > + depends on BR2_PACKAGE_XORG7 > > + depends on BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL # libepoxy > > + select BR2_PACKAGE_BOOST > > + select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS > > + select BR2_PACKAGE_JPEG > > + select BR2_PACKAGE_LIBCAMERA > > + select BR2_PACKAGE_LIBDRM > > + select BR2_PACKAGE_LIBEPOXY > > + select BR2_PACKAGE_LIBEXIF > > + select BR2_PACKAGE_LIBPNG > > + select BR2_PACKAGE_TIFF > > + select BR2_PACKAGE_XLIB_LIBX11 > > + help > > + This is a small suite of libcamera-based apps that aim to copy > > + the functionality of the existing "raspicam" apps. > > + > > + https://github.com/raspberrypi/libcamera-apps > > + > > +comment "libcamera-apps needs a toolchain w/ C++, threads, wchar, dynamic library, gcc >= 7 and needs an OpenGL and/or OpenGL EGL backend" > > + 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 > > + depends on !BR2_PACKAGE_HAS_LIBEGL && !BR2_PACKAGE_HAS_LIBGL > > diff --git a/package/libcamera-apps/libcamera-apps.hash b/package/libcamera-apps/libcamera-apps.hash > > new file mode 100644 > > index 0000000000..da426434c1 > > --- /dev/null > > +++ b/package/libcamera-apps/libcamera-apps.hash > > @@ -0,0 +1,3 @@ > > +# Locally computed > > +sha256 9b3475e1c817cbcf942c4be0dac3d1f6bf2ee192b0ca5edb95c85c06c5a12b4f libcamera-apps-326fdfd120a0f62b7e76f4ee8aa0c82c2bf008e6.tar.gz > > +sha256 36dfed86bdef661a0a14ec1a1cc84c771d5a06b6f9b92e9ebb610ba711bd528a license.txt > > diff --git a/package/libcamera-apps/libcamera-apps.mk b/package/libcamera-apps/libcamera-apps.mk > > new file mode 100644 > > index 0000000000..5edcefefad > > --- /dev/null > > +++ b/package/libcamera-apps/libcamera-apps.mk > > @@ -0,0 +1,25 @@ > > +################################################################################ > > +# > > +# libcamera-apps > > +# > > +################################################################################ > > + > > +LIBCAMERA_APPS_VERSION = 326fdfd120a0f62b7e76f4ee8aa0c82c2bf008e6 > > +LIBCAMERA_APPS_SITE = $(call github,raspberrypi,libcamera-apps,$(LIBCAMERA_APPS_VERSION)) > > +LIBCAMERA_APPS_LICENSE = BSD-2-Clause > > +LIBCAMERA_APPS_LICENSE_FILES = license.txt > > +LIBCAMERA_APPS_DEPENDENCIES = \ > > + host-pkgconf \ > > + boost \ > > + jpeg \ > > + libcamera \ > > + libdrm \ > > + libexif \ > > + libepoxy \ > > + libpng \ > > + tiff \ > > + xlib_libX11 > > + > > +LIBCAMERA_APPS_CONF_OPTS = -DENABLE_COMPILE_FLAGS_FOR_TARGET=disabled > > + > > +$(eval $(cmake-package)) From paguilar at paguilar.org Tue Feb 8 21:37:22 2022 From: paguilar at paguilar.org (Pedro Aguilar) Date: Tue, 8 Feb 2022 22:37:22 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/guile: Add BR2_ENABLE_LOCALE as dependency. Message-ID: <20220208213722.836257-1-paguilar@paguilar.org> If it's not present, enable libiconv. Signed-off-by: Pedro Aguilar --- Changes v1 -> v2: - Use BR2_ENABLE_LOCALE if selected, otherwise use libiconv as before (pointed out by Thomas and Giulio) --- package/guile/Config.in | 1 + package/guile/guile.mk | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/package/guile/Config.in b/package/guile/Config.in index b1182a4cee..f70e674018 100644 --- a/package/guile/Config.in +++ b/package/guile/Config.in @@ -9,6 +9,7 @@ config BR2_PACKAGE_GUILE select BR2_PACKAGE_LIBFFI select BR2_PACKAGE_GMP select BR2_PACKAGE_BDWGC + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE help Guile is an interpreter and compiler for the Scheme programming language, a clean and elegant dialect of Lisp. diff --git a/package/guile/guile.mk b/package/guile/guile.mk index 0f245fca76..03420407f8 100644 --- a/package/guile/guile.mk +++ b/package/guile/guile.mk @@ -18,6 +18,10 @@ GUILE_CPE_ID_VENDOR = gnu GUILE_DEPENDENCIES = host-guile libunistring libffi gmp bdwgc host-pkgconf HOST_GUILE_DEPENDENCIES = host-libunistring host-libffi host-gmp host-bdwgc host-flex host-pkgconf host-gettext +ifeq ($(BR2_ENABLE_LOCALE),) +GUILE_DEPENDENCIES += libiconv +endif + # The HAVE_GC* CFLAGS specify that we will use internal callbacks # instead of the ones provided by # bdwgc. Eg. HAVE_GC_SET_FINALIZER_NOTIFIER specifies that we won't -- 2.25.1 From heiko.thiery at gmail.com Tue Feb 8 21:39:03 2022 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Tue, 8 Feb 2022 22:39:03 +0100 Subject: [Buildroot] Buildroot + RAUC In-Reply-To: References: Message-ID: Hi Charles, Am So., 2. Jan. 2022 um 00:53 Uhr schrieb Charles Steinkuehler : > > 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 For me this is a great work and a good starting point for my first attempts using rauc. > All comments welcome, especially the "no you fool, don't do it *THAT* > way!" variety. :) Thanks -- Heiko From giulio.benetti at benettiengineering.com Tue Feb 8 22:06:36 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 8 Feb 2022 23:06:36 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/guile: Add BR2_ENABLE_LOCALE as dependency. In-Reply-To: <20220208213722.836257-1-paguilar@paguilar.org> References: <20220208213722.836257-1-paguilar@paguilar.org> Message-ID: <5f710ea1-3f98-9435-c033-e73e70e86342@benettiengineering.com> Hi Pedro, On 08/02/22 22:37, Pedro Aguilar wrote: > If it's not present, enable libiconv. Here it's missing: Fixes: URL to autobuilder failure And also I can't find guile failing due to LIBICONV. At least, I only find: http://autobuild.buildroot.net/?reason=guile-3.0.7 But it seems to be about another problem(to be solved too). Can you please point the autobuilder failure? Otherwise I can't test/review your patch. Thank you! Best regards -- Giulio Benetti Benetti Engineering sas > Signed-off-by: Pedro Aguilar > > --- > Changes v1 -> v2: > - Use BR2_ENABLE_LOCALE if selected, otherwise use libiconv > as before (pointed out by Thomas and Giulio) > --- > package/guile/Config.in | 1 + > package/guile/guile.mk | 4 ++++ > 2 files changed, 5 insertions(+) > > diff --git a/package/guile/Config.in b/package/guile/Config.in > index b1182a4cee..f70e674018 100644 > --- a/package/guile/Config.in > +++ b/package/guile/Config.in > @@ -9,6 +9,7 @@ config BR2_PACKAGE_GUILE > select BR2_PACKAGE_LIBFFI > select BR2_PACKAGE_GMP > select BR2_PACKAGE_BDWGC > + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE > help > Guile is an interpreter and compiler for the Scheme > programming language, a clean and elegant dialect of Lisp. > diff --git a/package/guile/guile.mk b/package/guile/guile.mk > index 0f245fca76..03420407f8 100644 > --- a/package/guile/guile.mk > +++ b/package/guile/guile.mk > @@ -18,6 +18,10 @@ GUILE_CPE_ID_VENDOR = gnu > GUILE_DEPENDENCIES = host-guile libunistring libffi gmp bdwgc host-pkgconf > HOST_GUILE_DEPENDENCIES = host-libunistring host-libffi host-gmp host-bdwgc host-flex host-pkgconf host-gettext > > +ifeq ($(BR2_ENABLE_LOCALE),) > +GUILE_DEPENDENCIES += libiconv > +endif > + > # The HAVE_GC* CFLAGS specify that we will use internal callbacks > # instead of the ones provided by > # bdwgc. Eg. HAVE_GC_SET_FINALIZER_NOTIFIER specifies that we won't From giulio.benetti at benettiengineering.com Tue Feb 8 22:09:01 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 8 Feb 2022 23:09:01 +0100 Subject: [Buildroot] [PATCH v5] package/libcamera-apps: new package In-Reply-To: <164435572997.3447701.14524139530215798014@Monstersaurus> References: <20210502095925.10744-1-ps.report@gmx.net> <164435572997.3447701.14524139530215798014@Monstersaurus> Message-ID: <00d36960-8959-806c-1527-d08a8b94591b@benettiengineering.com> Hi Kieran, On 08/02/22 22:28, Kieran Bingham wrote: > Hi All, > > Quoting Arnout Vandecappelle (2022-02-08 21:09:44) >> >> >> On 02/05/2021 11:59, Peter Seiderer wrote: >>> Signed-off-by: Peter Seiderer >> >> (Finally) applied to master, thanks. However... > > Ohh, I'm happy to see this packaged. > > Can someone try to bump the libcamera to the latest revision soon > please? There have been a couple of bug fixes/performance issues > resolved that were quite noticable on the Pi. > > In fact, now I check there's a couple more RPi patches to be merged soon > so it might be worth getting those in first. I can bump the version once you've pushed the RPi patches, but I see that you're the maintainer here in Buildroot so you should. Anyway it's not a problem for me. Only let me know when it's time to bump it Thank you! Best regards -- Giulio Benetti Benetti Engineering sas > -- > Kieran. > >> >> [snip] >>> diff --git a/package/libcamera-apps/0001-cmake-remove-Wfatal-errors-compiler-command-line-opt.patch b/package/libcamera-apps/0001-cmake-remove-Wfatal-errors-compiler-command-line-opt.patch >>> new file mode 100644 >>> index 0000000000..11d19fa526 >>> --- /dev/null >>> +++ b/package/libcamera-apps/0001-cmake-remove-Wfatal-errors-compiler-command-line-opt.patch >>> @@ -0,0 +1,25 @@ >>> +From 22096ef8cfb18563c1955145db24742081910e10 Mon Sep 17 00:00:00 2001 >>> +From: Peter Seiderer >>> +Date: Fri, 5 Feb 2021 18:24:08 +0100 >>> +Subject: [PATCH] cmake: remove -Wfatal-errors compiler command line option >>> + >>> +Signed-off-by: Peter Seiderer >>> +--- >>> + CMakeLists.txt | 1 - >>> + 1 file changed, 1 deletion(-) >>> + >>> +diff --git a/CMakeLists.txt b/CMakeLists.txt >>> +index 4191245..199a0f6 100644 >>> +--- a/CMakeLists.txt >>> ++++ b/CMakeLists.txt >>> +@@ -10,7 +10,6 @@ endif() >>> + set (CMAKE_EXPORT_COMPILE_COMMANDS ON) >>> + set (CMAKE_CXX_STANDARD 17) >>> + set (CMAKE CXX_FLAGS "-Wall -Wextra -pedantic -Wno-unused-parameter -faligned-new") >>> +-add_definitions(-Wfatal-errors) >> >> Why is this patch needed? The only thing that -Wfatal-errors does is to stop >> compilation when there is an error, instead of trying to continue and find more >> errors in the rest of the file. It's not -Werror. >> >> I kept the patch anyway because I didn't test without it. >> >> >> Regards, >> Arnout >> >> >>> + add_definitions(-Wno-psabi) >>> + add_definitions(-DBOOST_LOG_DYN_LINK) >>> + >>> +-- >>> +2.30.0 >>> + >>> diff --git a/package/libcamera-apps/Config.in b/package/libcamera-apps/Config.in >>> new file mode 100644 >>> index 0000000000..08667eb830 >>> --- /dev/null >>> +++ b/package/libcamera-apps/Config.in >>> @@ -0,0 +1,31 @@ >>> +config BR2_PACKAGE_LIBCAMERA_APPS >>> + bool "libcamera-apps" >>> + depends on BR2_PACKAGE_LIBCAMERA_ARCH_SUPPORTS # libcamera >>> + depends on BR2_INSTALL_LIBSTDCPP # libcamera/boost >>> + depends on BR2_TOOLCHAIN_HAS_THREADS # libcamera/boost/libdrm >>> + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17/libcamera >>> + depends on !BR2_STATIC_LIBS # gnutls/libcamera >>> + depends on BR2_USE_WCHAR # gnutls/libcamera/boost >>> + depends on BR2_PACKAGE_XORG7 >>> + depends on BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL # libepoxy >>> + select BR2_PACKAGE_BOOST >>> + select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS >>> + select BR2_PACKAGE_JPEG >>> + select BR2_PACKAGE_LIBCAMERA >>> + select BR2_PACKAGE_LIBDRM >>> + select BR2_PACKAGE_LIBEPOXY >>> + select BR2_PACKAGE_LIBEXIF >>> + select BR2_PACKAGE_LIBPNG >>> + select BR2_PACKAGE_TIFF >>> + select BR2_PACKAGE_XLIB_LIBX11 >>> + help >>> + This is a small suite of libcamera-based apps that aim to copy >>> + the functionality of the existing "raspicam" apps. >>> + >>> + https://github.com/raspberrypi/libcamera-apps >>> + >>> +comment "libcamera-apps needs a toolchain w/ C++, threads, wchar, dynamic library, gcc >= 7 and needs an OpenGL and/or OpenGL EGL backend" >>> + 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 >>> + depends on !BR2_PACKAGE_HAS_LIBEGL && !BR2_PACKAGE_HAS_LIBGL >>> diff --git a/package/libcamera-apps/libcamera-apps.hash b/package/libcamera-apps/libcamera-apps.hash >>> new file mode 100644 >>> index 0000000000..da426434c1 >>> --- /dev/null >>> +++ b/package/libcamera-apps/libcamera-apps.hash >>> @@ -0,0 +1,3 @@ >>> +# Locally computed >>> +sha256 9b3475e1c817cbcf942c4be0dac3d1f6bf2ee192b0ca5edb95c85c06c5a12b4f libcamera-apps-326fdfd120a0f62b7e76f4ee8aa0c82c2bf008e6.tar.gz >>> +sha256 36dfed86bdef661a0a14ec1a1cc84c771d5a06b6f9b92e9ebb610ba711bd528a license.txt >>> diff --git a/package/libcamera-apps/libcamera-apps.mk b/package/libcamera-apps/libcamera-apps.mk >>> new file mode 100644 >>> index 0000000000..5edcefefad >>> --- /dev/null >>> +++ b/package/libcamera-apps/libcamera-apps.mk >>> @@ -0,0 +1,25 @@ >>> +################################################################################ >>> +# >>> +# libcamera-apps >>> +# >>> +################################################################################ >>> + >>> +LIBCAMERA_APPS_VERSION = 326fdfd120a0f62b7e76f4ee8aa0c82c2bf008e6 >>> +LIBCAMERA_APPS_SITE = $(call github,raspberrypi,libcamera-apps,$(LIBCAMERA_APPS_VERSION)) >>> +LIBCAMERA_APPS_LICENSE = BSD-2-Clause >>> +LIBCAMERA_APPS_LICENSE_FILES = license.txt >>> +LIBCAMERA_APPS_DEPENDENCIES = \ >>> + host-pkgconf \ >>> + boost \ >>> + jpeg \ >>> + libcamera \ >>> + libdrm \ >>> + libexif \ >>> + libepoxy \ >>> + libpng \ >>> + tiff \ >>> + xlib_libX11 >>> + >>> +LIBCAMERA_APPS_CONF_OPTS = -DENABLE_COMPILE_FLAGS_FOR_TARGET=disabled >>> + >>> +$(eval $(cmake-package)) > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From ps.report at gmx.net Tue Feb 8 22:20:24 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 8 Feb 2022 23:20:24 +0100 Subject: [Buildroot] [PATCH v1] package/libxkbcommon: bump version to 1.4.0 Message-ID: <20220208222024.24167-1-ps.report@gmx.net> - bump version to 1.4.0 - add new option to select some tools for the target (xkbcli, xkbcli-compile-keymap, xkbcli-how-to-type, xkbcli-interactive-evdev, xkbcli-interactive-x11, xkbcli-interactive-wayland For details see [1]. [1] https://lists.freedesktop.org/archives/wayland-devel/2022-February/042104.html Signed-off-by: Peter Seiderer --- package/libxkbcommon/Config.in | 11 +++++++++++ package/libxkbcommon/libxkbcommon.hash | 4 ++-- package/libxkbcommon/libxkbcommon.mk | 8 +++++++- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/package/libxkbcommon/Config.in b/package/libxkbcommon/Config.in index 4e73a24abb..e9f61227a0 100644 --- a/package/libxkbcommon/Config.in +++ b/package/libxkbcommon/Config.in @@ -7,3 +7,14 @@ config BR2_PACKAGE_LIBXKBCOMMON specification. https://xkbcommon.org + +if BR2_PACKAGE_LIBXKBCOMMON + +config BR2_PACKAGE_LIBXKBCOMMON_TOOLS + bool "tools" + help + Tools: xkbcli, xkbcli-compile-keymap, xkbcli-how-to-type, + xkbcli-interactive-evdev, xkbcli-interactive-x11, + xkbcli-interactive-wayland + +endif diff --git a/package/libxkbcommon/libxkbcommon.hash b/package/libxkbcommon/libxkbcommon.hash index c00fffe706..fff2b7a943 100644 --- a/package/libxkbcommon/libxkbcommon.hash +++ b/package/libxkbcommon/libxkbcommon.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2021-September/041976.html -sha256 b3c710d27a2630054e1e1399c85b7f330ef03359b460f0c1b3b587fd01fe9234 libxkbcommon-1.3.1.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2022-February/042104.html +sha256 106cec5263f9100a7e79b5f7220f889bc78e7d7ffc55d2b6fdb1efefb8024031 libxkbcommon-1.4.0.tar.xz # License file: sha256 086caee279449369d41c1157911ec7696e707b93feba7280de757d3c470b2dfb LICENSE diff --git a/package/libxkbcommon/libxkbcommon.mk b/package/libxkbcommon/libxkbcommon.mk index ee2bc1ee99..f2c49cc700 100644 --- a/package/libxkbcommon/libxkbcommon.mk +++ b/package/libxkbcommon/libxkbcommon.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBXKBCOMMON_VERSION = 1.3.1 +LIBXKBCOMMON_VERSION = 1.4.0 LIBXKBCOMMON_SITE = https://xkbcommon.org/download LIBXKBCOMMON_SOURCE = libxkbcommon-$(LIBXKBCOMMON_VERSION).tar.xz LIBXKBCOMMON_LICENSE = MIT/X11 @@ -23,4 +23,10 @@ else LIBXKBCOMMON_CONF_OPTS += -Denable-x11=false endif +ifeq ($(BR2_PACKAGE_LIBXKBCOMMON_TOOLS),y) +LIBXKBCOMMON_CONF_OPTS += -Denable-tools=true +else +LIBXKBCOMMON_CONF_OPTS += -Denable-tools=false +endif + $(eval $(meson-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Tue Feb 8 22:23:56 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 8 Feb 2022 23:23:56 +0100 Subject: [Buildroot] [PATCH 1/1] package/grpc: fix fourth patch Message-ID: <20220208222356.24675-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since the addition of fourth patch in commit 8251d8c2559b25f11684776fc343059cf100657d: 1 out of 22 hunks FAILED -- saving rejects to file CMakeLists.txt.rej Fixes: - http://autobuild.buildroot.org/results/44f6d7c61316e90d22e75cb1fb77c3bc5b31ad66 Signed-off-by: Fabrice Fontaine --- package/grpc/0004-host-grpc-only-cpp-plugin.patch | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/package/grpc/0004-host-grpc-only-cpp-plugin.patch b/package/grpc/0004-host-grpc-only-cpp-plugin.patch index 43fad7e3d6..c97d9a9385 100644 --- a/package/grpc/0004-host-grpc-only-cpp-plugin.patch +++ b/package/grpc/0004-host-grpc-only-cpp-plugin.patch @@ -10,6 +10,7 @@ others. Upstream-status: not accepted (see https://github.com/grpc/grpc/issues/25322) Signed-off-by: Thomas De Schampheleire +Signed-off-by: Fabrice Fontaine --- CMakeLists.txt | 43 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 35 insertions(+), 8 deletions(-) @@ -167,15 +168,6 @@ index e8934a3e03..c2df332cc6 100644 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} ) -- 2.34.1 From giulio.benetti at benettiengineering.com Tue Feb 8 22:54:17 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 8 Feb 2022 23:54:17 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/guile: Add BR2_ENABLE_LOCALE as dependency. In-Reply-To: <5f710ea1-3f98-9435-c033-e73e70e86342@benettiengineering.com> References: <20220208213722.836257-1-paguilar@paguilar.org> <5f710ea1-3f98-9435-c033-e73e70e86342@benettiengineering.com> Message-ID: Hi again Pedro, I've reproduced the build failure with your previous attached .config file and this patch fixes it. So below... On 08/02/22 23:06, Giulio Benetti wrote: > Hi Pedro, > > On 08/02/22 22:37, Pedro Aguilar wrote: >> If it's not present, enable libiconv. > Here it's missing: > Fixes: > URL to autobuilder failure ...please provide the autobuilder failure URL and if it doesn't exist than we don't need it. So once done this I can give you my Review. Waiting for V2 with improved commit log then. Thank you! Best regards -- Giulio Benetti Benetti Engineering sas > > And also I can't find guile failing due to LIBICONV. > > At least, I only find: > http://autobuild.buildroot.net/?reason=guile-3.0.7 > > But it seems to be about another problem(to be solved too). > > Can you please point the autobuilder failure? > Otherwise I can't test/review your patch. > > Thank you! > Best regards > -- Giulio Benetti Benetti Engineering sas >> Signed-off-by: Pedro Aguilar >> >> --- >> Changes v1 -> v2: >> - Use BR2_ENABLE_LOCALE if selected, otherwise use libiconv >> as before (pointed out by Thomas and Giulio) >> --- >> package/guile/Config.in | 1 + >> package/guile/guile.mk | 4 ++++ >> 2 files changed, 5 insertions(+) >> >> diff --git a/package/guile/Config.in b/package/guile/Config.in >> index b1182a4cee..f70e674018 100644 >> --- a/package/guile/Config.in >> +++ b/package/guile/Config.in >> @@ -9,6 +9,7 @@ config BR2_PACKAGE_GUILE >> select BR2_PACKAGE_LIBFFI >> select BR2_PACKAGE_GMP >> select BR2_PACKAGE_BDWGC >> + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE >> help >> Guile is an interpreter and compiler for the Scheme >> programming language, a clean and elegant dialect of Lisp. >> diff --git a/package/guile/guile.mk b/package/guile/guile.mk >> index 0f245fca76..03420407f8 100644 >> --- a/package/guile/guile.mk >> +++ b/package/guile/guile.mk >> @@ -18,6 +18,10 @@ GUILE_CPE_ID_VENDOR = gnu >> GUILE_DEPENDENCIES = host-guile libunistring libffi gmp bdwgc host-pkgconf >> HOST_GUILE_DEPENDENCIES = host-libunistring host-libffi host-gmp host-bdwgc host-flex host-pkgconf host-gettext >> >> +ifeq ($(BR2_ENABLE_LOCALE),) >> +GUILE_DEPENDENCIES += libiconv >> +endif >> + >> # The HAVE_GC* CFLAGS specify that we will use internal callbacks >> # instead of the ones provided by >> # bdwgc. Eg. HAVE_GC_SET_FINALIZER_NOTIFIER specifies that we won't > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > From romain.naour at gmail.com Wed Feb 9 00:23:08 2022 From: romain.naour at gmail.com (Romain Naour) Date: Wed, 9 Feb 2022 01:23:08 +0100 Subject: [Buildroot] [PATCHv2] package/poke: bump to version 2.1 Message-ID: <20220209002308.137832-1-romain.naour@gmail.com> Tested locally with poke testsuite on aarch64 with Qemu: === poke Summary === # of expected passes 6320 # of unsupported tests 7 Build tested with test-pkg: https://gitlab.com/kubu93/buildroot/-/pipelines/466516470 See: http://www.jemarch.net/poke-2.0-relnotes.html http://www.jemarch.net/poke-2.1-relnotes.html Signed-off-by: Romain Naour --- test-pkg config: BR2_PACKAGE_POKE=y BR2_PACKAGE_JSON_C=y v2: poke 2.0 had a issue with minimal-threading on several architectures (not only ARM thumb2), this feature is now disabled by default with poke 2.1. --- ...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..c30713b91c 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 cd528e6c1bbc540c3b629c2b4f36b784b30a026b005a38b99283422599442670 poke-2.1.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 jitter/COPYING diff --git a/package/poke/poke.mk b/package/poke/poke.mk index ddd03ae3b0..2852673548 100644 --- a/package/poke/poke.mk +++ b/package/poke/poke.mk @@ -4,7 +4,7 @@ # ################################################################################ -POKE_VERSION = 1.4 +POKE_VERSION = 2.1 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.34.1 From peterlin at andestech.com Wed Feb 9 03:55:52 2022 From: peterlin at andestech.com (Yu Chien Peter Lin) Date: Wed, 9 Feb 2022 11:55:52 +0800 Subject: [Buildroot] Patch state of andes/ae350 Message-ID: Hi Thomas, I would like to follow up on my patches last month. Are they still under review? Please let me know if I missed something that needs to be fixed. Regards, Yu-Chien Peter Lin From baruch at tkos.co.il Wed Feb 9 05:43:33 2022 From: baruch at tkos.co.il (Baruch Siach) Date: Wed, 09 Feb 2022 07:43:33 +0200 Subject: [Buildroot] [PATCH v1 04/13] package/gst1-plugins-bad: bump version to 1.20.0 In-Reply-To: <20220208212405.19243-5-ps.report@gmx.net> References: <20220208212405.19243-1-ps.report@gmx.net> <20220208212405.19243-5-ps.report@gmx.net> Message-ID: <875ypod24w.fsf@tarshish> Hi Peter, On Tue, Feb 08 2022, Peter Seiderer wrote: > - removed 0001-neon-Allow-building-against-neon-0-32-x.patch > (from upstream [1]) > > - add codecalpha option (VP8/VP9 alpha support) > > - add qroverlay option (overlay data on top of video in the form of a QR code) > with json-glib and libqrencode dependencies (omit json-glib explicit > dependencies as they are the same as for gstreamer1, glib2 BR2_USE_WCHAR, > BR2_TOOLCHAIN_HAS_THREADS and BR2_USE_MMU), place instead to 'plugins without > external deps' section into 'plugins that need external deps' section as it > clearly has dependencies (prelimary to upstream commit [2]) > > - add aes option (AES encryption/decryption plugin) > > - disable new option asio (Steinberg Audio Streaming, windows only) > > - disable new option gs (Google Cloud Storage, needs storage_client library) > > - disable new option ldac (LDAC bluetooth audio codec, needs ldacBT-enc library) > > - remove legacy option ofa (disabled) > > - disable new option onnx (ONNX neural network, needs libonnxruntime library) > > - disable new option isac (iSAC plugin, needs webrtc-audio-coding-1 library) > > - removed libmms ('Microsoft Multi Media Server streaming protocol' option, > add Config.in.legacy entry > > - enable new gpl option ('Allow build plugins that have (A)GPL-licensed > dependencies') in case gpl plugin enabled > > [1] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/b83e85ab677c79b46f520abebd1ee031e3a139c0.patch > [2] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/5d70c168b356691073a0d22f7ce3ea7efb20641c.patch > > Signed-off-by: Peter Seiderer > --- > Config.in.legacy | 22 ++++++++---- > ...n-Allow-building-against-neon-0-32-x.patch | 29 --------------- > package/gstreamer1/gst1-plugins-bad/Config.in | 31 ++++++++++------ > .../gst1-plugins-bad/gst1-plugins-bad.hash | 4 +-- > .../gst1-plugins-bad/gst1-plugins-bad.mk | 36 ++++++++++++++----- > 5 files changed, 64 insertions(+), 58 deletions(-) > delete mode 100644 package/gstreamer1/gst1-plugins-bad/0001-neon-Allow-building-against-neon-0-32-x.patch > > diff --git a/Config.in.legacy b/Config.in.legacy > index 34d8c71cc8..2d7f14f097 100644 > --- a/Config.in.legacy > +++ b/Config.in.legacy > @@ -146,6 +146,16 @@ 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. > + This is already in master (and it's unrelated). baruch -- ~. .~ 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 Feb 9 07:46:14 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 09 Feb 2022 07:46:14 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-02-08 Message-ID: <20220209074620.34B3183103@smtp1.osuosl.org> Hello, Autobuild statistics for 2022-02-08 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 48 | 7 | 0 | 55 | 2021.11.x | 14 | 0 | 0 | 14 | master | 60 | 44 | 0 | 104 | Classification of failures by reason for master ----------------------------------------------- host-libselinux-3.3 | 7 gerbera-1.9.2 | 5 bluez5_utils-5.63 | 4 host-python-docutils-0.15.2 | 4 unknown | 3 python-docutils-0.15.2 | 2 wavemon-0.9.4 | 2 boinc-7.18.1 | 1 cairo-1.16.0 | 1 docker-proxy-55685ba49593e6... | 1 frr-8.1 | 1 guile-3.0.7 | 1 host-grpc-1.43.0 | 1 keepalived-2.2.7 | 1 librtlsdr-ed0317e6a58c09887... | 1 linux-pam-1.5.2 | 1 Makefile:747: target-finalize | 1 neon-0.32.2 | 1 opencv4-4.5.5 | 1 python-greenlet-1.1.2 | 1 resiprocate-1.12.0 | 1 rtorrent-0.9.8 | 1 rygel-0.40.2 | 1 sudo-1.9.8p2 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- riscv64 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/5c96d82719691ad307021591bd5ef0d2de952ad0 | m68k | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/1e33ed794dfb5248e667feee2c3ec9a7a52f5056 | powerpc64 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/f417516c61d4999f17dfc16399a4d596d7d33beb | riscv64 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/0ddf026413bf968600124b9869511c3a54663771 | x86_64 | boinc-7.18.1 | NOK | http://autobuild.buildroot.net/results/5022a9dc3ea7c073be0b1c0c608428ae94ad4c26 | s390x | cairo-1.16.0 | NOK | http://autobuild.buildroot.net/results/031d61ed4df168d96be7aa4658733f812d732ef5 | x86_64 | docker-proxy-55685ba49593e6... | NOK | http://autobuild.buildroot.net/results/6c4d434c23f1aef90d04701cc7a79c7a80bfb6e4 | xtensa | frr-8.1 | NOK | http://autobuild.buildroot.net/results/010dd5ca7f2b24120212d3b9e2f14a54a59aa6ce | arc | gerbera-1.9.2 | NOK | http://autobuild.buildroot.net/results/8d89717067872feccf9127503b49d949351d8df0 | x86_64 | gerbera-1.9.2 | NOK | http://autobuild.buildroot.net/results/6d50a4b2424a298118252818ec5a5042e9356062 | i686 | gerbera-1.9.2 | NOK | http://autobuild.buildroot.net/results/d06f0ddc78b0c045e9698f27e93edf08101da925 | x86_64 | gerbera-1.9.2 | NOK | http://autobuild.buildroot.net/results/b273cb3c5948812456d4386c89f06462afb81a73 | arm | gerbera-1.9.2 | NOK | http://autobuild.buildroot.net/results/bc3dcdc6b0ced939368384fff6a63cd25450cae7 | arm | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/f8efe6143bc99f1cedddba9b4a54e7175e859f95 | riscv64 | host-grpc-1.43.0 | NOK | http://autobuild.buildroot.net/results/44f6d7c61316e90d22e75cb1fb77c3bc5b31ad66 | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/30fa8f979767eceda116b8d390f11b8da3bb2659 | powerpc | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/e43242875be865ef373fed673eabdad45adcc4cb | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/8cd5cd59b22b4e75d83d44130583cb251b4d8115 | arc | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/9d2fe02f9b922771aab72a4369f16125d3fd3159 | nios2 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/dbe756e340531454f19b8daaa1baf6058582b260 | x86_64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/064d5f44a2da73b0854869bf6e0678e12124d68d | aarch64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/aded9c08368582d96de4f36cf8f9c2fc786cd45f | arm | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/6b748d2330e869b1a239bca3284bc748ac95b2c9 | i586 | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/df7af0b8a54156ab8749c57c8c2bf17fb04400ec | mips64el | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/a941ae11f18805c4a0d6f672553550127072a571 | arc | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/0b0eef5c5f105a0c443529fa66f1ddb9f0ab7434 | arm | keepalived-2.2.7 | NOK | http://autobuild.buildroot.net/results/2132570fb0407abc0e70146d771471e13ef10237 | sparc | librtlsdr-ed0317e6a58c09887... | NOK | http://autobuild.buildroot.net/results/b6f373907f4e9f4979f332a4dfa3241f30a1f8c7 | x86_64 | linux-pam-1.5.2 | NOK | http://autobuild.buildroot.net/results/94c29bb6393f68547285b5ff8c4c65f644e16097 | ORPH aarch64 | Makefile:747: target-finalize | NOK | http://autobuild.buildroot.net/results/d0c081e1eeb0dc0e988de51cceff02c5c870fbc2 | arm | neon-0.32.2 | NOK | http://autobuild.buildroot.net/results/2b005bdfd0f4949cc45dfd427cd6bd796fd56907 | ORPH m68k | opencv4-4.5.5 | NOK | http://autobuild.buildroot.net/results/edcd1139f2ba4b1a66f61feb222c738718d824f5 | m68k | python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/fad07777625e14d1c722821e3a7023d877f2996f | xtensa | python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/78ccedbcd1c6cfef2ae52cdf387b353d0dd497b8 | mips64el | python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/42b4cf13af6ce93f8722922a0d21d40faa7375da | riscv32 | resiprocate-1.12.0 | NOK | http://autobuild.buildroot.net/results/ad9d89fefe1a667daa123397a072bf130bfa03a7 | ORPH mipsel | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/e87a99cb0392da58db831a369569537d9ef9be8a | ORPH arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/7c324c097979e00d383d9ff3e4b6927925253b4e | arm | sudo-1.9.8p2 | NOK | http://autobuild.buildroot.net/results/7a5d4dd22343be46a5ddd1c1a1a8e1799517d564 | ORPH nios2 | unknown | NOK | http://autobuild.buildroot.net/results/5ea7b2b23b6675b926cb5ed84b1d947184b6514e | microblazeel | unknown | NOK | http://autobuild.buildroot.net/results/a11e5fba7d7f11c21cc7c44e578e576c82c294be | m68k | unknown | NOK | http://autobuild.buildroot.net/results/f35806609fcc98e769939e607232e4b2fa4b3d1d | powerpc | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/de7a848ef4555f27a101ca4113e0a148316cbe37 | arm | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/30e4f0c68fa39dc82b52d7d0bf59111526ea11e5 | Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 2 monkey-f54856ce250c4e257354... | 2 libp11-0.4.11 | 1 unknown | 1 zeromq-4.3.4 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- xtensa | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/1753e968e19c461f00c775b9c43647ef8495381a | arm | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/59aa202cc83eb510da9b8abff23ce9e4cb83cd52 | riscv32 | libp11-0.4.11 | NOK | http://autobuild.buildroot.net/results/7e033fad93f56db7c5f860374ee2dc6d328b2cb3 | ORPH i686 | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/97699054e8252a9d0ea38c404e024d7714b30ec7 | nios2 | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/6f2a352a892f9a709c4c41e56cf8d0afe5c07d92 | arm | unknown | NOK | http://autobuild.buildroot.net/results/ce1ef4979f5409ab13e5ecf66b2ecb5ba34074c3 | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/eb270686f33ea625888f579f28110951296feafd | -- http://autobuild.buildroot.net From neal.frager at xilinx.com Wed Feb 9 08:28:20 2022 From: neal.frager at xilinx.com (Neal Frager) Date: Wed, 9 Feb 2022 01:28:20 -0700 Subject: [Buildroot] [PATCH 1/2] configs/zynqmp_zcu106: Bump ATF/U-Boot/Linux to Xilinx 2022 -v2 Message-ID: <20220209082821.72879-1-neal.frager@xilinx.com> This patch: - bumps configs/zynqmp_zcu106_defconfig to Xilinx 2022 - bumps ATF to Xilinx v2.6: mainline v2.6 requires patch to build - bumps U-Boot to Xilinx 2022.01: important drivers not in mainline - bumps Linux to Xilinx 5.15: important drivers not in mainline - deletes board/zynqmp/patches directory: patches already in mainline - modifies board/zynqmp/genimage.cfg: U-Boot 2022.01 uses u-boot.itb format - adds extlinux.conf to vfat bootfs - modifies U-Boot to unified xilinx_zynqmp_virt_defconfig (supports all boards) - adds support for SPL pm_cfg_obj.c loading to PMU firmware - adds support for host machines without SSL Signed-off-by: Neal Frager --- board/zynqmp/extlinux.conf | 4 + board/zynqmp/genimage.cfg | 6 +- board/zynqmp/pm_cfg_obj.c | 614 ++++++++++++++++++++++++++++++++ board/zynqmp/post-build.sh | 10 + board/zynqmp/post-image.sh | 4 +- board/zynqmp/readme.txt | 23 +- configs/zynqmp_zcu106_defconfig | 23 +- 7 files changed, 665 insertions(+), 19 deletions(-) create mode 100644 board/zynqmp/extlinux.conf create mode 100644 board/zynqmp/pm_cfg_obj.c create mode 100755 board/zynqmp/post-build.sh diff --git a/board/zynqmp/extlinux.conf b/board/zynqmp/extlinux.conf new file mode 100644 index 0000000000..15ef707ea2 --- /dev/null +++ b/board/zynqmp/extlinux.conf @@ -0,0 +1,4 @@ +label linux + kernel /Image + devicetree /system.dtb + append console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg index ed202f4550..20d8352c08 100644 --- a/board/zynqmp/genimage.cfg +++ b/board/zynqmp/genimage.cfg @@ -2,11 +2,13 @@ image boot.vfat { vfat { files = { "boot.bin", - "u-boot.bin", - "atf-uboot.ub", + "u-boot.itb", "system.dtb", "Image" } + file extlinux/extlinux.conf { + image = extlinux.conf + } } size = 32M diff --git a/board/zynqmp/pm_cfg_obj.c b/board/zynqmp/pm_cfg_obj.c new file mode 100644 index 0000000000..7566b3236a --- /dev/null +++ b/board/zynqmp/pm_cfg_obj.c @@ -0,0 +1,614 @@ +/****************************************************************************** +* Copyright (c) 2017 - 2020 Xilinx, Inc. All rights reserved. +* SPDX-License-Identifier: MIT +******************************************************************************/ + + +#include "xil_types.h" +#include "pm_defs.h" + +#define PM_CONFIG_MASTER_SECTION_ID 0x101U +#define PM_CONFIG_SLAVE_SECTION_ID 0x102U +#define PM_CONFIG_PREALLOC_SECTION_ID 0x103U +#define PM_CONFIG_POWER_SECTION_ID 0x104U +#define PM_CONFIG_RESET_SECTION_ID 0x105U +#define PM_CONFIG_SHUTDOWN_SECTION_ID 0x106U +#define PM_CONFIG_SET_CONFIG_SECTION_ID 0x107U +#define PM_CONFIG_GPO_SECTION_ID 0x108U + +#define PM_SLAVE_FLAG_IS_SHAREABLE 0x1U +#define PM_MASTER_USING_SLAVE_MASK 0x2U + +#define PM_CONFIG_GPO1_MIO_PIN_34_MAP (1U << 10U) +#define PM_CONFIG_GPO1_MIO_PIN_35_MAP (1U << 11U) +#define PM_CONFIG_GPO1_MIO_PIN_36_MAP (1U << 12U) +#define PM_CONFIG_GPO1_MIO_PIN_37_MAP (1U << 13U) + +#define PM_CONFIG_GPO1_BIT_2_MASK (1U << 2U) +#define PM_CONFIG_GPO1_BIT_3_MASK (1U << 3U) +#define PM_CONFIG_GPO1_BIT_4_MASK (1U << 4U) +#define PM_CONFIG_GPO1_BIT_5_MASK (1U << 5U) + +#define SUSPEND_TIMEOUT 0xFFFFFFFFU + + +#define PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK 0x00000001 +#define PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK 0x00000100 +#define PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK 0x00000200 + + + +#if defined (__ICCARM__) +#pragma language=save +#pragma language=extended +#endif +#if defined (__GNUC__) + const u32 XPm_ConfigObject[] __attribute__((used, section(".sys_cfg_data"))) = +#elif defined (__ICCARM__) +#pragma location = ".sys_cfg_data" +__root const u32 XPm_ConfigObject[] = +#endif +{ + /**********************************************************************/ + /* HEADER */ + 1, /* Number of remaining words in the header */ + 8, /* Number of sections included in config object */ + /**********************************************************************/ + /* MASTER SECTION */ + PM_CONFIG_MASTER_SECTION_ID, /* Master SectionID */ + 3U, /* No. of Masters*/ + + NODE_APU, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_0, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_1, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Wake permissions */ + + + /**********************************************************************/ + /* SLAVE SECTION */ + + + PM_CONFIG_SLAVE_SECTION_ID, /* Section ID */ + 49, /* Number of slaves */ + + NODE_OCM_BANK_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TCM_0_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_0_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_1_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TCM_1_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_L2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU_PP_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU_PP_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_USB_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_USB_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_TTC_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SATA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_ETH_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_UART_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_UART_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SPI_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_SPI_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_I2C_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_I2C_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SD_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_SD_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_DP, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GDMA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_ADMA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_NAND, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_QSPI, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPIO, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_CAN_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_CAN_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_EXTERN, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_DDR, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_IPI_APU, + 0U, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_0, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_1, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_PCIE, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_PCAP, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_RTC, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_VCU, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_PL, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + + /**********************************************************************/ + /* PREALLOC SECTION */ + + PM_CONFIG_PREALLOC_SECTION_ID, /* Preallaoc SectionID */ + 3U, /* No. of Masters*/ + +/* Prealloc for psu_cortexa53_0 */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, + 12, + NODE_DDR, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_L2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_3, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_SD_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_QSPI, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_PL, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_APU, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_0 */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + 14, + NODE_TCM_0_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_0_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_DDR, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_3, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_SD_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_QSPI, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_PL, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_ADMA, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_1 */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + 3, + NODE_TCM_1_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_1_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /**********************************************************************/ + /* POWER SECTION */ + + PM_CONFIG_POWER_SECTION_ID, /* Power Section ID */ + 4U, /* Number of power nodes */ + + NODE_APU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_RPU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_FPD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_PLD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + + /**********************************************************************/ + /* RESET SECTION */ + + PM_CONFIG_RESET_SECTION_ID, /* Reset Section ID */ + 120U, /* Number of resets */ + + XILPM_RESET_PCIE_CFG, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_BRIDGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_CTRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRF, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GDMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SATA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APU_L2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DDR, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SOFT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_QSPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_NAND, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ADMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOU_CC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TIMESTAMP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R50, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R51, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_AMBA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_OCM, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_PGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RTC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SYSMON, 0, + XILPM_RESET_AFI_FM6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_LPD_SWDT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_FPD, PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + XILPM_RESET_RPU_DBG1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_DBG0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_VPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_7, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_8, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_9, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_10, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_11, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_12, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_13, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_14, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_15, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_16, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_17, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_18, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_19, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_20, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_21, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_22, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_23, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_24, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_25, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_26, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_27, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_28, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_29, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_30, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_31, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_LS, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PS_ONLY, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_92, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_93, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_94, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_95, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + + /**********************************************************************/ + /* SET CONFIG SECTION */ + PM_CONFIG_SET_CONFIG_SECTION_ID, /* Section ID */ + 0, /* Permissions to set config */ + /**********************************************************************/ + /* SHUTDOWN SECTION */ + PM_CONFIG_SHUTDOWN_SECTION_ID, /* Section ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* System Shutdown/Restart Permission */ + + /**********************************************************************/ + /* GPO SECTION */ + PM_CONFIG_GPO_SECTION_ID, /* GPO Section ID */ + PM_CONFIG_GPO1_BIT_2_MASK | + PM_CONFIG_GPO1_MIO_PIN_34_MAP | + PM_CONFIG_GPO1_MIO_PIN_35_MAP | + PM_CONFIG_GPO1_MIO_PIN_36_MAP | + PM_CONFIG_GPO1_MIO_PIN_37_MAP | + 0, /* State of GPO pins */ +}; +#if defined (__ICCARM__) +#pragma language=restore +#endif diff --git a/board/zynqmp/post-build.sh b/board/zynqmp/post-build.sh new file mode 100755 index 0000000000..ef55f49376 --- /dev/null +++ b/board/zynqmp/post-build.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +# genimage will need to find the extlinux.conf +# in the binaries directory + +BOARD_DIR="$(dirname $0)" + +install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux.conf + + diff --git a/board/zynqmp/post-image.sh b/board/zynqmp/post-image.sh index b2b99fed01..ed6dbe188c 100755 --- a/board/zynqmp/post-image.sh +++ b/board/zynqmp/post-image.sh @@ -10,4 +10,6 @@ FIRST_DT=$(sed -nr \ [ -z "${FIRST_DT}" ] || ln -fs ${FIRST_DT}.dtb ${BINARIES_DIR}/system.dtb -support/scripts/genimage.sh -c board/zynqmp/genimage.cfg +BOARD_DIR="$(dirname $0)" + +support/scripts/genimage.sh -c $BOARD_DIR/genimage.cfg diff --git a/board/zynqmp/readme.txt b/board/zynqmp/readme.txt index da37f4ccc9..0dc1793e03 100644 --- a/board/zynqmp/readme.txt +++ b/board/zynqmp/readme.txt @@ -1,10 +1,19 @@ -******************************** -Xilinx ZCU106 board - ZynqMP SoC -******************************** +****************************************** +Xilinx ZCU102 / ZCU106 boards - ZynqMP SoC +****************************************** + +This document describes the Buildroot support for the ZCU102 and ZCU106 +boards by Xilinx, based on the Zynq UltraScale+ MPSoC (aka ZynqMP). +It has been tested with the ZCU102 and ZCU106 production boards. + +Evaluation board features can be found here with the links below. + +ZCU102: +https://www.xilinx.com/products/boards-and-kits/zcu102.html + +ZCU106: +https://www.xilinx.com/products/boards-and-kits/zcu106.html -This document describes the Buildroot support for the ZCU106 board by -Xilinx, based on the Zynq UltraScale+ MPSoC (aka ZynqMP). It has been -tested with the EK-U1-ZCU106-ES2 pre-production board. How to build it =============== @@ -32,7 +41,7 @@ After building, you should get a tree like this: +-- rootfs.ext4 -> rootfs.ext2 +-- sdcard.img +-- system.dtb -> zynqmp-zcu106-revA.dtb - +-- u-boot.bin + +-- u-boot.itb `-- zynqmp-zcu106-revA.dtb How to write the SD card diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index bee7c1daf7..2026f60bd1 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -1,34 +1,39 @@ BR2_aarch64=y -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.15" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.6" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA" +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2022.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/53fdb7b6c92860ceb0ec5fd14deee302f4a84269/bin/pmufw-zcu106-default-v2017.4.bin" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/v2021.2/bin/pmufw-v2021.2.bin" +BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/pm_cfg_obj.c" +BR2_TARGET_UBOOT_FORMAT_ITB=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -- 2.17.1 From neal.frager at xilinx.com Wed Feb 9 08:28:21 2022 From: neal.frager at xilinx.com (Neal Frager) Date: Wed, 9 Feb 2022 01:28:21 -0700 Subject: [Buildroot] [PATCH 2/2] Add configs/zynqmp_zcu102_defconfig -v2 In-Reply-To: <20220209082821.72879-1-neal.frager@xilinx.com> References: <20220209082821.72879-1-neal.frager@xilinx.com> Message-ID: <20220209082821.72879-2-neal.frager@xilinx.com> This patch: - adds support for Xilinx ZCU102 evaluation board - ZCU102 features can be found here: - https://www.xilinx.com/products/boards-and-kits/zcu102.html Signed-off-by: Neal Frager --- configs/zynqmp_zcu102_defconfig | 39 +++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 configs/zynqmp_zcu102_defconfig diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig new file mode 100644 index 0000000000..acffda64bf --- /dev/null +++ b/configs/zynqmp_zcu102_defconfig @@ -0,0 +1,39 @@ +BR2_aarch64=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.15" +BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.6" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/Xilinx/u-boot-xlnx.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2022.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" +BR2_TARGET_UBOOT_ZYNQMP=y +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/v2021.2/bin/pmufw-v2021.2.bin" +BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/pm_cfg_obj.c" +BR2_TARGET_UBOOT_FORMAT_ITB=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y -- 2.17.1 From nealf at xilinx.com Wed Feb 9 08:30:07 2022 From: nealf at xilinx.com (Neal Frager) Date: Wed, 9 Feb 2022 08:30:07 +0000 Subject: [Buildroot] [PATCH 1/2] configs/zynqmp_zcu106: Bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <97653013-1d33-4a03-00cf-ffdb3fa5e723@benettiengineering.com> References: <20220208071559.2862411-1-neal.frager@xilinx.com> <69efa9da-ae55-6795-8724-ed7105083924@benettiengineering.com> <32cc1c12-1496-7db9-5e32-1b99404a4fe3@benettiengineering.com> <97653013-1d33-4a03-00cf-ffdb3fa5e723@benettiengineering.com> Message-ID: Hi Giulio, > So now I wait for V2 :-) Thank you for your feedback. You can now find -v2 in your inbox for review. I appreciate your support! Best regards, Neal Frager Xilinx From yann.morin at orange.com Wed Feb 9 08:44:05 2022 From: yann.morin at orange.com (yann.morin at orange.com) Date: Wed, 9 Feb 2022 09:44:05 +0100 Subject: [Buildroot] [PATCH 3/3] package/pkg-cargo: allow building in a sub-directory In-Reply-To: <61674c9d53c678f60a82c5c347147c31b9a29ba6.1644343524.git.yann.morin@orange.com> References: <61674c9d53c678f60a82c5c347147c31b9a29ba6.1644343524.git.yann.morin@orange.com> Message-ID: <5856_1644396248_62037ED8_5856_45_6_20220209084405.GA3766@tl-lnx-nyma7486> All, On 2022-02-08 19:05 +0100, yann.morin at orange.com spake thusly: > From: "Yann E. MORIN" > Some packages have their rust sources as a sub-directory, rather > than at the root of the source tree. > > Do like we do for autotools-package, and use the package's _SRCDIR > rather than the top-level directory $(@D). > > Additionally, in such a situation, it is more than probable that > the Cargo.toml is also present in that sub-directory, so use that > when vendoring the package, unless the package took extra precautions > to specify an alternate location. > > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni > --- > package/pkg-cargo.mk | 16 ++++++++++++---- > 1 file changed, 12 insertions(+), 4 deletions(-) > > diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk > index 66bea513e0..68e15e066c 100644 > --- a/package/pkg-cargo.mk > +++ b/package/pkg-cargo.mk > @@ -71,6 +71,14 @@ $(2)_DOWNLOAD_DEPENDENCIES += host-rustc > $(2)_DOWNLOAD_POST_PROCESS = cargo > $(2)_DL_ENV += CARGO_HOME=$$(HOST_DIR)/share/cargo > > +# If building in a sub directory, use that to find the Cargo.toml, unless > +# the package already provided its location. > +ifneq ($$($(2)_SUBDIR),) > +ifneq ($$(filter BR_CARGO_MANIFEST_PATH=%,$$($(2)_DL_ENV))) ------^ I forgot to git commit --amend to add the missing comma. Sorry for the noise... :-( Regards, Yann E. MORIN. > +$(2)_DL_ENV += BR_CARGO_MANIFEST_PATH=$$($(2)_SUBDIR)/Cargo.toml > +endif > +endif > + > # Due to vendoring, it is pretty likely that not all licenses are > # listed in _LICENSE. > $(2)_LICENSE += , vendored dependencies licenses probably not listed > @@ -97,7 +105,7 @@ $(2)_LICENSE += , vendored dependencies licenses probably not listed > ifndef $(2)_BUILD_CMDS > ifeq ($(4),target) > define $(2)_BUILD_CMDS > - cd $$(@D) && \ > + cd $$($$(PKG)_SRCDIR) && \ > $$(TARGET_MAKE_ENV) \ > $$(TARGET_CONFIGURE_OPTS) \ > $$(PKG_CARGO_ENV) \ > @@ -111,7 +119,7 @@ define $(2)_BUILD_CMDS > endef > else # ifeq ($(4),target) > define $(2)_BUILD_CMDS > - cd $$(@D) && \ > + cd $$($$(PKG)_SRCDIR) && \ > $$(HOST_MAKE_ENV) \ > RUSTFLAGS="$$(addprefix -C link-args=,$$(HOST_LDFLAGS))" \ > $$(HOST_CONFIGURE_OPTS) \ > @@ -133,7 +141,7 @@ endif # ifndef $(2)_BUILD_CMDS > # > ifndef $(2)_INSTALL_TARGET_CMDS > define $(2)_INSTALL_TARGET_CMDS > - cd $$(@D) && \ > + cd $$($$(PKG)_SRCDIR) && \ > $$(TARGET_MAKE_ENV) \ > $$(TARGET_CONFIGURE_OPTS) \ > $$(PKG_CARGO_ENV) \ > @@ -152,7 +160,7 @@ endif > > ifndef $(2)_INSTALL_CMDS > define $(2)_INSTALL_CMDS > - cd $$(@D) && \ > + cd $$($$(PKG)_SRCDIR) && \ > $$(HOST_MAKE_ENV) \ > RUSTFLAGS="$$(addprefix -C link-args=,$$(HOST_LDFLAGS))" \ > $$(HOST_CONFIGURE_OPTS) \ > -- > 2.25.1 > -- ____________ .-----------------.--------------------: _ :------------------. | Yann E. MORIN | Real-Time Embedded | __/ ) | /"\ ASCII RIBBON | | +33 534.541.179 | Software Designer | _/ - /' | \ / CAMPAIGN | | +33 638.411.245 '--------------------: (_ `--, | X AGAINST | | yann.morin (at) orange.com |_=" ,--' | / \ HTML MAIL | '--------------------------------------:______/_____:------------------' _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From patrickdepinguin at gmail.com Wed Feb 9 11:55:00 2022 From: patrickdepinguin at gmail.com (Thomas De Schampheleire) Date: Wed, 9 Feb 2022 12:55:00 +0100 Subject: [Buildroot] [PATCHv2 0/7] Basic support for 64-bit kernel and 32-bit userland In-Reply-To: References: <20220115200306.14037-1-patrickdepinguin@gmail.com> Message-ID: Hi Arnout, El mar, 8 feb 2022 a las 21:49, Arnout Vandecappelle () escribi?: > > > > On 15/01/2022 21:02, Thomas De Schampheleire wrote: > > 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. > > So, I'm not entirely convinced about this approach. Here are my objections. > > - At least for arm, you need an entirely different toolchain for the 32 and the > 64-bit variants. But even for x86, the Buildroot internal toolchain for x86_64 > doesn't support -m32. So for most users this is not even going to work. With crosstool-ng it is possible to build a multilib toolchain for x86 without issue. It's true that the internal Buildroot logic does not allow this currently, but that by itself is not necessarily an objection to me. For ARM we have packaged two toolchains in one, with the bin/, lib/ etc. paths at top-level pointing to the 'default' toolchain, i.e. 32-bit in our case, and changes in linux/uboot to use the 64-bit toolchain specifically. We'd need to discuss if and how we would integrate that in mainline Buildroot. > > - There is an alternative: two separate Buildroot configs, one for the kernel + > modules, one for userspace. Ok, but it is not so convenient at least in our case, where all surrounding build logic and validation assumes that you just set a single defconfig, build it, then obtain the results from output/images. We'd need surrounding scripting to handle the separate kernel build. Additionally, what about a build with initramfs built-in the vmlinux image? This would need the rootfs file from the 32-bit buildroot copied over to the kernel buildroot context, and then attached there. This is additional complexity. > > - I don't think the flexibility is useful. I think it would be better to reuse > the BR2_KERNEL_64_USERLAND_32 option. (E.g. add an option to Config.in.x86 when > the arch is x86_64 to build a 32-bit userspace.) That way we can use it to pass > -m32 where needed, to build an internal toolchain that supports it, and to check > for the external toolchain if it supports it. Doesn't solve the issue for ARM, > but it's a start. > > > Also, I think we absolutely need to test this feature. At the very least, we'd > need to config in the autobuilders that enables it, or enable it randomly in > genrandconfig. Although I'm not sure if it tests anything if no kernel is built > (let alone that it's not even booted). Yes I had created a qemu defconfig and multilib toolchain that can be used for tests. But Romain found that the binaries do not run on the build farm. Would it be possible to get temporary shell access to that environment so I can find out what options I really need? > > > For now, I've left the rest of the series as New in patchwork, let's see what > the others think. Thanks for your feedback, Thomas From peter at korsgaard.com Wed Feb 9 15:26:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 16:26:06 +0100 Subject: [Buildroot] [PATCH] package/python-pyzmq: drop python2 dependency for comment Message-ID: <20220209152606.20762-1-peter@korsgaard.com> The package was updated to support python3 in commit 4a8bedc51d9 (python-pyzmq: enable PyZMQ for Python 3), but the comment dependency was missed. Signed-off-by: Peter Korsgaard --- package/python-pyzmq/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/python-pyzmq/Config.in b/package/python-pyzmq/Config.in index 8f33a635c8..f8ce52f844 100644 --- a/package/python-pyzmq/Config.in +++ b/package/python-pyzmq/Config.in @@ -9,5 +9,4 @@ config BR2_PACKAGE_PYTHON_PYZMQ http://zeromq.org/bindings:python comment "python-pyzmq needs a toolchain w/ C++, threads" - depends on BR2_PACKAGE_PYTHON depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS) -- 2.20.1 From derek at ihtfp.com Wed Feb 9 15:28:10 2022 From: derek at ihtfp.com (Derek Atkins) Date: Wed, 9 Feb 2022 10:28:10 -0500 Subject: [Buildroot] Makefile: add target to clean targetfs Message-ID: <60d52762385d6ecff820bddc8f91d1af.squirrel@mail2.ihtfp.org> Hi, Sorry to raise up a 6-year-old thread, but I'm looking to use Jenkins to implement a CI/CD solution to build a BuildRoot system, but I need to be able to "clean out" the target directory between each build to ensure that different branches don't contaminate each other. I don't want to delete all of 'build' because 90% (or more) of the build *is* consistent between branches, and I'd like to not require 3 hours per build to rebuild e.g. the whole toolchain. I've found that the patch as updated per the thread from 2015 does mostly work: target-clean: $(RM) -rf $(BR_DIR)/output/target $(BR_DIR)/output/staging \ $(BR_DIR)/output/build/.root \ $(BR_DIR)/output/build/*/.stamp_target_installed \ $(BR_DIR)/output/build/*/.stamp_staging_installed \ $(BR_DIR)/output/build/host-gcc-final-*/.stamp_host_installed When I rebuild using this rule, and then run the proposed rsync command (see below), the resulting target directory matches -- except for a few obvious changes like etc/issue and usr/lib/os-release (as the git release is now "dirty"). Strangely, lib/libpthread-2.32.so is different. rsync -rvncl --delete --exclude '*.pyc' --exclude '*.pyo' --exclude 'tmp/ldconfig/aux-cache' output/target/ output/target.orig/ HOWEVER, there are a few side-effects here that I'd like to ask about. Specifically, it looks like GLIBC and parts of the final-stage gcc actually recompile (I see a lot of instances of arm-buildroot-linux-gnueabi-gcc and xgcc in the logs). I would have just expected it to reinstall. Moreover, busybox seems to recompile, too. I am happy to share my config and makelog output if it would help, but I was trying to keep this message short. Any suggestions would be highly appreciated. Thanks, -derek PS: I have mail delivery turned off for the list, so I would appreciate if you could CC me on any replies. Thanks again. -- Derek Atkins 617-623-3745 derek at ihtfp.com www.ihtfp.com Computer and Internet Security Consultant From yann.morin at orange.com Wed Feb 9 16:08:43 2022 From: yann.morin at orange.com (yann.morin at orange.com) Date: Wed, 9 Feb 2022 17:08:43 +0100 Subject: [Buildroot] [PATCH 0/5 v2] package/pkg-{cargo, golang}: enhance build process Message-ID: <24539_1644422926_6203E70E_24539_404_5_cover.1644422916.git.yann.morin@orange.com> From: "Yann E. MORIN" Hello All! This five-patch series enhances the cargo- and golang-based package infrastructures: - allow building cargo packages in a sub-directory of the package source tree; - fix dependencies when using override-srcdir - allow passing arbitrary _DL_ENV The golang-related changes are not tested, by lack of a go package to test them against, but the changes look obvious and simple enough (note: they were spotted as the two infras got in simultaneously recently, so it looked like a good idea to fix both in the same series). Changes v1 -> v2: - fix conditional in the sub-directory patch - add patch to allow building with override-srcdir Regards, Yann E. MORIN. The following changes since commit 1753d7e667163aacf2ec1d495d2ab62fb384d52c package/doc-asciidoc: fix build for out-of-tree documents (2022-02-09 09:58:47 +0100) are available as patches in this mail series, for you to apply patches up to a1a52ce7fd9920435f8cc9e82513d62f9badd738 package/pkg-golang: host-go is also a build dependency (2022-02-09 16:39:52 +0100) ---------------------------------------------------------------- Yann E. MORIN (5): package/pkg-cargo: allow packages to define download environment package/pkg-cargo: allow building in a sub-directory package/pkg-cargo: host-rustc is also a build dependency package/pkg-golang: allow packages to define download environment package/pkg-golang: host-go is also a build dependency package/pkg-cargo.mk | 22 ++++++++++++++++------ package/pkg-golang.mk | 6 ++++-- 2 files changed, 20 insertions(+), 8 deletions(-) -- ____________ .-----------------.--------------------: _ :------------------. | Yann E. MORIN | Real-Time Embedded | __/ ) | /"\ ASCII RIBBON | | +33 534.541.179 | Software Designer | _/ - /' | \ / CAMPAIGN | | +33 638.411.245 '--------------------: (_ `--, | X AGAINST | | yann.morin (at) orange.com |_=" ,--' | / \ HTML MAIL | '--------------------------------------:______/_____:------------------' _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From yann.morin at orange.com Wed Feb 9 16:08:43 2022 From: yann.morin at orange.com (yann.morin at orange.com) Date: Wed, 9 Feb 2022 17:08:43 +0100 Subject: [Buildroot] [PATCH 1/5 v2] package/pkg-cargo: allow packages to define download environment In-Reply-To: References: Message-ID: <9354_1644422930_6203E712_9354_383_11_2d5b77c2a90cf722e007a5bf3ed4227d2bd1fda6.1644422916.git.yann.morin@orange.com> From: "Yann E. MORIN" Currently, the cargo infrastructure forcibly sets the package _DL_ENV variable, instead of appending to it, which prevents packages from providing their own download environment variables. We fix that by using an append-assignment. Note: when introduced, that variable was explicitly not documented, and is supposed to only be used by packages infrastructures. However, that variable exists, and it can be (ab)used by br2-external packages (most probably to ill effects, but heh!). We anyway leave it undocumented, like _ROOTFS_PRE_CMD_HOOKS. Signed-off-by: Yann E. MORIN Cc: 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 e74a8358bc..66bea513e0 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -69,7 +69,7 @@ define inner-cargo-package $(2)_DOWNLOAD_DEPENDENCIES += host-rustc $(2)_DOWNLOAD_POST_PROCESS = cargo -$(2)_DL_ENV = CARGO_HOME=$$(HOST_DIR)/share/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.25.1 _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From yann.morin at orange.com Wed Feb 9 16:08:44 2022 From: yann.morin at orange.com (yann.morin at orange.com) Date: Wed, 9 Feb 2022 17:08:44 +0100 Subject: [Buildroot] [PATCH 2/5 v2] package/pkg-cargo: allow building in a sub-directory In-Reply-To: References: Message-ID: <20175_1644422934_6203E716_20175_175_1_fea7d1545892211e01cb6660dc5fba16b0851c47.1644422916.git.yann.morin@orange.com> From: "Yann E. MORIN" Some packages have their rust sources as a sub-directory, rather than at the root of the source tree. Do like we do for autotools-package, and use the package's _SRCDIR rather than the top-level directory $(@D). Additionally, in such a situation, it is more than probable that the Cargo.toml is also present in that sub-directory, so use that when vendoring the package, unless the package took extra precautions to specify an alternate location. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni --- Changes v1 -> v2: - fix conditional (inverted logic) - fix syntax in conditional (missing comma) --- package/pkg-cargo.mk | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index 66bea513e0..e1d81197b5 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -71,6 +71,14 @@ $(2)_DOWNLOAD_DEPENDENCIES += host-rustc $(2)_DOWNLOAD_POST_PROCESS = cargo $(2)_DL_ENV += CARGO_HOME=$$(HOST_DIR)/share/cargo +# If building in a sub directory, use that to find the Cargo.toml, unless +# the package already provided its location. +ifneq ($$($(2)_SUBDIR),) +ifeq ($$(filter BR_CARGO_MANIFEST_PATH=%,$$($(2)_DL_ENV)),) +$(2)_DL_ENV += BR_CARGO_MANIFEST_PATH=$$($(2)_SUBDIR)/Cargo.toml +endif +endif + # Due to vendoring, it is pretty likely that not all licenses are # listed in _LICENSE. $(2)_LICENSE += , vendored dependencies licenses probably not listed @@ -97,7 +105,7 @@ $(2)_LICENSE += , vendored dependencies licenses probably not listed ifndef $(2)_BUILD_CMDS ifeq ($(4),target) define $(2)_BUILD_CMDS - cd $$(@D) && \ + cd $$($$(PKG)_SRCDIR) && \ $$(TARGET_MAKE_ENV) \ $$(TARGET_CONFIGURE_OPTS) \ $$(PKG_CARGO_ENV) \ @@ -111,7 +119,7 @@ define $(2)_BUILD_CMDS endef else # ifeq ($(4),target) define $(2)_BUILD_CMDS - cd $$(@D) && \ + cd $$($$(PKG)_SRCDIR) && \ $$(HOST_MAKE_ENV) \ RUSTFLAGS="$$(addprefix -C link-args=,$$(HOST_LDFLAGS))" \ $$(HOST_CONFIGURE_OPTS) \ @@ -133,7 +141,7 @@ endif # ifndef $(2)_BUILD_CMDS # ifndef $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS - cd $$(@D) && \ + cd $$($$(PKG)_SRCDIR) && \ $$(TARGET_MAKE_ENV) \ $$(TARGET_CONFIGURE_OPTS) \ $$(PKG_CARGO_ENV) \ @@ -152,7 +160,7 @@ endif ifndef $(2)_INSTALL_CMDS define $(2)_INSTALL_CMDS - cd $$(@D) && \ + cd $$($$(PKG)_SRCDIR) && \ $$(HOST_MAKE_ENV) \ RUSTFLAGS="$$(addprefix -C link-args=,$$(HOST_LDFLAGS))" \ $$(HOST_CONFIGURE_OPTS) \ -- 2.25.1 _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From yann.morin at orange.com Wed Feb 9 16:08:45 2022 From: yann.morin at orange.com (yann.morin at orange.com) Date: Wed, 9 Feb 2022 17:08:45 +0100 Subject: [Buildroot] [PATCH 3/5 v2] package/pkg-cargo: host-rustc is also a build dependency In-Reply-To: References: Message-ID: <9430_1644422939_6203E71B_9430_485_1_951512fc2010b31a4d2d50fe12c2ad86f3a0c1a1.1644422916.git.yann.morin@orange.com> From: "Yann E. MORIN" Currently, host-rustc is a download dependency, because we need cargo for the vendoring during the downlaod step. However, when using a package in override-srcdir, there is no download step, so host-rustc is not pulled in as a dependency which breaks running the build of a single pcakge from scratch: $ make clean $ make my-rust-package [...] [...] cargo build --offline --release --manifest-path Cargo.toml --locked /bin/sh: cargo: command not found We fix that by adding host-rustc as a standard dependency too. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni --- package/pkg-cargo.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index e1d81197b5..24dd50e399 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -65,8 +65,10 @@ HOST_PKG_CARGO_ENV = \ define inner-cargo-package -# We need host-rustc to run cargo +# We need host-rustc to run cargo at download time (for vendoring), +# and at build and install time. $(2)_DOWNLOAD_DEPENDENCIES += host-rustc +$(2)_DEPENDENCIES += host-rustc $(2)_DOWNLOAD_POST_PROCESS = cargo $(2)_DL_ENV += CARGO_HOME=$$(HOST_DIR)/share/cargo -- 2.25.1 _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From yann.morin at orange.com Wed Feb 9 16:08:46 2022 From: yann.morin at orange.com (yann.morin at orange.com) Date: Wed, 9 Feb 2022 17:08:46 +0100 Subject: [Buildroot] [PATCH 4/5 v2] package/pkg-golang: allow packages to define download environment In-Reply-To: References: Message-ID: <20175_1644422945_6203E721_20175_189_1_2f2cfe45bc7a546997c16e84a6e617dc0752a731.1644422916.git.yann.morin@orange.com> From: "Yann E. MORIN" Currently, the golang infrastructure forcibly sets the package _DL_ENV variable, instead of appending to it, which prevents packages from providing their own download environment variables. We fix that by using an append-assignment. Note: when introduced, that variable was explicitly not documented, and is supposed to only be used by packages infrastructures. However, that variable exists, and it can be (ab)used by br2-external packages (most probably to ill effects, but heh!). We anyway leave it undocumented, like _ROOTFS_PRE_CMD_HOOKS. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Christian Stewart Cc: Anisse Astier --- 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..69eae02830 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -83,7 +83,7 @@ endef $(2)_POST_PATCH_HOOKS += $(2)_GEN_GOMOD $(2)_DOWNLOAD_POST_PROCESS = go -$(2)_DL_ENV = \ +$(2)_DL_ENV += \ $(HOST_GO_COMMON_ENV) \ GOPROXY=direct \ BR_GOMOD=$$($(2)_GOMOD) -- 2.25.1 _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From yann.morin at orange.com Wed Feb 9 16:08:47 2022 From: yann.morin at orange.com (yann.morin at orange.com) Date: Wed, 9 Feb 2022 17:08:47 +0100 Subject: [Buildroot] [PATCH 5/5 v2] package/pkg-golang: host-go is also a build dependency In-Reply-To: References: Message-ID: <25580_1644422947_6203E723_25580_17_1_a1a52ce7fd9920435f8cc9e82513d62f9badd738.1644422916.git.yann.morin@orange.com> From: "Yann E. MORIN" Currently, host-go is a download dependency, because we need go for the vendoring during the downlaod step. However, when using a package in override-srcdir, there is no download step, so host-go is not pulled in as a dependency, which will break the build of a single package from scratch. We fix that by adding host-go as a standard dependency too. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Christian Stewart Cc: Anisse Astier --- package/pkg-golang.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk index 69eae02830..ddefdf1214 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -47,8 +47,10 @@ $(2)_BUILD_OPTS += \ -trimpath \ -p $(PARALLEL_JOBS) -# Target packages need the Go compiler on the host. +# Target packages need the Go compiler on the host at download time (for +# vendoring), and at build and install time. $(2)_DOWNLOAD_DEPENDENCIES += host-go +$(2)_DEPENDENCIES += host-go $(2)_BUILD_TARGETS ?= . -- 2.25.1 _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From ps.report at gmx.net Wed Feb 9 16:21:31 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 9 Feb 2022 17:21:31 +0100 Subject: [Buildroot] [PATCH v1 04/13] package/gst1-plugins-bad: bump version to 1.20.0 In-Reply-To: <875ypod24w.fsf@tarshish> References: <20220208212405.19243-1-ps.report@gmx.net> <20220208212405.19243-5-ps.report@gmx.net> <875ypod24w.fsf@tarshish> Message-ID: <20220209172131.0f03e25f@gmx.net> Hello Baruch, On Wed, 09 Feb 2022 07:43:33 +0200, Baruch Siach wrote: > Hi Peter, > > On Tue, Feb 08 2022, Peter Seiderer wrote: > > - removed 0001-neon-Allow-building-against-neon-0-32-x.patch > > (from upstream [1]) > > > > - add codecalpha option (VP8/VP9 alpha support) > > > > - add qroverlay option (overlay data on top of video in the form of a QR code) > > with json-glib and libqrencode dependencies (omit json-glib explicit > > dependencies as they are the same as for gstreamer1, glib2 BR2_USE_WCHAR, > > BR2_TOOLCHAIN_HAS_THREADS and BR2_USE_MMU), place instead to 'plugins without > > external deps' section into 'plugins that need external deps' section as it > > clearly has dependencies (prelimary to upstream commit [2]) > > > > - add aes option (AES encryption/decryption plugin) > > > > - disable new option asio (Steinberg Audio Streaming, windows only) > > > > - disable new option gs (Google Cloud Storage, needs storage_client library) > > > > - disable new option ldac (LDAC bluetooth audio codec, needs ldacBT-enc library) > > > > - remove legacy option ofa (disabled) > > > > - disable new option onnx (ONNX neural network, needs libonnxruntime library) > > > > - disable new option isac (iSAC plugin, needs webrtc-audio-coding-1 library) > > > > - removed libmms ('Microsoft Multi Media Server streaming protocol' option, > > add Config.in.legacy entry > > > > - enable new gpl option ('Allow build plugins that have (A)GPL-licensed > > dependencies') in case gpl plugin enabled > > > > [1] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/b83e85ab677c79b46f520abebd1ee031e3a139c0.patch > > [2] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/5d70c168b356691073a0d22f7ce3ea7efb20641c.patch > > > > Signed-off-by: Peter Seiderer > > --- > > Config.in.legacy | 22 ++++++++---- > > ...n-Allow-building-against-neon-0-32-x.patch | 29 --------------- > > package/gstreamer1/gst1-plugins-bad/Config.in | 31 ++++++++++------ > > .../gst1-plugins-bad/gst1-plugins-bad.hash | 4 +-- > > .../gst1-plugins-bad/gst1-plugins-bad.mk | 36 ++++++++++++++----- > > 5 files changed, 64 insertions(+), 58 deletions(-) > > delete mode 100644 package/gstreamer1/gst1-plugins-bad/0001-neon-Allow-building-against-neon-0-32-x.patch > > > > diff --git a/Config.in.legacy b/Config.in.legacy > > index 34d8c71cc8..2d7f14f097 100644 > > --- a/Config.in.legacy > > +++ b/Config.in.legacy > > @@ -146,6 +146,16 @@ 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. > > + > > This is already in master (and it's unrelated). Yes, you are right (seems to be some rebase/merge artefact), will respin the patchset..., thanks for review! Regards, Peter > > baruch > From ps.report at gmx.net Wed Feb 9 16:27:18 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 9 Feb 2022 17:27:18 +0100 Subject: [Buildroot] [PATCH v5] package/libcamera-apps: new package In-Reply-To: References: <20210502095925.10744-1-ps.report@gmx.net> Message-ID: <20220209172718.4afc2ed6@gmx.net> Hello Arnout, On Tue, 8 Feb 2022 22:09:44 +0100, Arnout Vandecappelle wrote: > On 02/05/2021 11:59, Peter Seiderer wrote: > > Signed-off-by: Peter Seiderer > > (Finally) applied to master, thanks. However... > > [snip] > > diff --git a/package/libcamera-apps/0001-cmake-remove-Wfatal-errors-compiler-command-line-opt.patch b/package/libcamera-apps/0001-cmake-remove-Wfatal-errors-compiler-command-line-opt.patch > > new file mode 100644 > > index 0000000000..11d19fa526 > > --- /dev/null > > +++ b/package/libcamera-apps/0001-cmake-remove-Wfatal-errors-compiler-command-line-opt.patch > > @@ -0,0 +1,25 @@ > > +From 22096ef8cfb18563c1955145db24742081910e10 Mon Sep 17 00:00:00 2001 > > +From: Peter Seiderer > > +Date: Fri, 5 Feb 2021 18:24:08 +0100 > > +Subject: [PATCH] cmake: remove -Wfatal-errors compiler command line option > > + > > +Signed-off-by: Peter Seiderer > > +--- > > + CMakeLists.txt | 1 - > > + 1 file changed, 1 deletion(-) > > + > > +diff --git a/CMakeLists.txt b/CMakeLists.txt > > +index 4191245..199a0f6 100644 > > +--- a/CMakeLists.txt > > ++++ b/CMakeLists.txt > > +@@ -10,7 +10,6 @@ endif() > > + set (CMAKE_EXPORT_COMPILE_COMMANDS ON) > > + set (CMAKE_CXX_STANDARD 17) > > + set (CMAKE CXX_FLAGS "-Wall -Wextra -pedantic -Wno-unused-parameter -faligned-new") > > +-add_definitions(-Wfatal-errors) > > Why is this patch needed? The only thing that -Wfatal-errors does is to stop > compilation when there is an error, instead of trying to continue and find more > errors in the rest of the file. It's not -Werror. Do not remember the exact failure.... > > I kept the patch anyway because I didn't test without it. Ups, patch needs some update anyway, fails with current libcamera package/version: -- Checking for module 'camera' -- Package 'camera', required by 'virtual:world', not found CMake Error at /usr/share/cmake/Modules/FindPkgConfig.cmake:603 (message): A required package was not found Call Stack (most recent call first): /usr/share/cmake/Modules/FindPkgConfig.cmake:825 (_pkg_check_modules_internal) CMakeLists.txt:36 (pkg_check_modules) Fixed upstream by [1]... Regards, Peter [1] https://github.com/raspberrypi/libcamera-apps/commit/729df015fb37ab25abd73c4832f9e7fa5d1cb8de > > > Regards, > Arnout > > > > + add_definitions(-Wno-psabi) > > + add_definitions(-DBOOST_LOG_DYN_LINK) > > + > > +-- > > +2.30.0 > > + > > diff --git a/package/libcamera-apps/Config.in b/package/libcamera-apps/Config.in > > new file mode 100644 > > index 0000000000..08667eb830 > > --- /dev/null > > +++ b/package/libcamera-apps/Config.in > > @@ -0,0 +1,31 @@ > > +config BR2_PACKAGE_LIBCAMERA_APPS > > + bool "libcamera-apps" > > + depends on BR2_PACKAGE_LIBCAMERA_ARCH_SUPPORTS # libcamera > > + depends on BR2_INSTALL_LIBSTDCPP # libcamera/boost > > + depends on BR2_TOOLCHAIN_HAS_THREADS # libcamera/boost/libdrm > > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17/libcamera > > + depends on !BR2_STATIC_LIBS # gnutls/libcamera > > + depends on BR2_USE_WCHAR # gnutls/libcamera/boost > > + depends on BR2_PACKAGE_XORG7 > > + depends on BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL # libepoxy > > + select BR2_PACKAGE_BOOST > > + select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS > > + select BR2_PACKAGE_JPEG > > + select BR2_PACKAGE_LIBCAMERA > > + select BR2_PACKAGE_LIBDRM > > + select BR2_PACKAGE_LIBEPOXY > > + select BR2_PACKAGE_LIBEXIF > > + select BR2_PACKAGE_LIBPNG > > + select BR2_PACKAGE_TIFF > > + select BR2_PACKAGE_XLIB_LIBX11 > > + help > > + This is a small suite of libcamera-based apps that aim to copy > > + the functionality of the existing "raspicam" apps. > > + > > + https://github.com/raspberrypi/libcamera-apps > > + > > +comment "libcamera-apps needs a toolchain w/ C++, threads, wchar, dynamic library, gcc >= 7 and needs an OpenGL and/or OpenGL EGL backend" > > + 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 > > + depends on !BR2_PACKAGE_HAS_LIBEGL && !BR2_PACKAGE_HAS_LIBGL > > diff --git a/package/libcamera-apps/libcamera-apps.hash b/package/libcamera-apps/libcamera-apps.hash > > new file mode 100644 > > index 0000000000..da426434c1 > > --- /dev/null > > +++ b/package/libcamera-apps/libcamera-apps.hash > > @@ -0,0 +1,3 @@ > > +# Locally computed > > +sha256 9b3475e1c817cbcf942c4be0dac3d1f6bf2ee192b0ca5edb95c85c06c5a12b4f libcamera-apps-326fdfd120a0f62b7e76f4ee8aa0c82c2bf008e6.tar.gz > > +sha256 36dfed86bdef661a0a14ec1a1cc84c771d5a06b6f9b92e9ebb610ba711bd528a license.txt > > diff --git a/package/libcamera-apps/libcamera-apps.mk b/package/libcamera-apps/libcamera-apps.mk > > new file mode 100644 > > index 0000000000..5edcefefad > > --- /dev/null > > +++ b/package/libcamera-apps/libcamera-apps.mk > > @@ -0,0 +1,25 @@ > > +################################################################################ > > +# > > +# libcamera-apps > > +# > > +################################################################################ > > + > > +LIBCAMERA_APPS_VERSION = 326fdfd120a0f62b7e76f4ee8aa0c82c2bf008e6 > > +LIBCAMERA_APPS_SITE = $(call github,raspberrypi,libcamera-apps,$(LIBCAMERA_APPS_VERSION)) > > +LIBCAMERA_APPS_LICENSE = BSD-2-Clause > > +LIBCAMERA_APPS_LICENSE_FILES = license.txt > > +LIBCAMERA_APPS_DEPENDENCIES = \ > > + host-pkgconf \ > > + boost \ > > + jpeg \ > > + libcamera \ > > + libdrm \ > > + libexif \ > > + libepoxy \ > > + libpng \ > > + tiff \ > > + xlib_libX11 > > + > > +LIBCAMERA_APPS_CONF_OPTS = -DENABLE_COMPILE_FLAGS_FOR_TARGET=disabled > > + > > +$(eval $(cmake-package)) From peter at korsgaard.com Wed Feb 9 16:50:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:26 +0100 Subject: [Buildroot] [PATCH 000/107] Drop python 2.7 Message-ID: <20220209165213.4498-1-peter@korsgaard.com> Python 2.7 is EOL since April 2020 and almost all packages support python 3, so drop it before the 2022.02 release. It is a big series, but the changes are mainly mechanical in nature. There is still some cleanup to do, E.G. the python2 support in pkg-python and the host python-setuptools package - But this is IMHO the minimum changes before -rc1. Peter Korsgaard (107): support/testing: drop python2 tests package/python: drop target package package/alsa-lib: drop python2 support package/bmap-tools: drop python2 support package/boost: drop python2 support package/cifs-utils: drop python2 support package/cracklib: move python support to python3 package/crudini: drop python2 support package/dbus-python: drop python2 support package/docker-compose: drop reference to BR2_PACKAGE_PYTHON package/dstat: drop python2 support package/evemu: drop python2 support package/fail2ban: drop python2 support package/glsandbox-player: drop reference to python2 package/gpsd: drop python2 support package/gst1-devtools: drop python2 support package/i2c-tools: drop python2 support package/iotop: drop python2 support package/jack2: drop python2 support package/kmod: drop python2 support package/libcec: drop python2 support package/libevent: drop python2 support package/libftdi1: drop python2 support package/libiio: drop python2 support package/libpwquality: drop python2 support package/libsigrokdecode: drop reference to python2 package/libsoc: drop python2 support package/lttng-libust: drop python2 support package/networkd-dispatcher: drop reference to python2 package/nftables: drop python2 support package/ogre: drop python2 support package/opkg-utils: drop reference to python2 package/owfs: drop python support package/python-aenum: drop python2 support package/python-argon2-cffi: drop python2 support package/python-bsdiff4: drop python2 support package/python-can: drop python2 support package/python-couchdb: drop python2 support package/python-dicttoxml: drop python2 support package/python-dpkt: drop python2 support package/python-esptool: drop python2 support package/python-fire: drop python2 support package/python-flask: drop python2 support package/python-jsonschema: drop python2 support package/python-libconfig: drop python2 support package/python-logbook: drop python2 support package/python-lxml: drop python2 support package/python-m2crypto: drop python2 support package/python-pexpect: drop python2 support package/python-pickleshare: drop python2 support package/python-pymodbus: drop python2 support package/python-pyqrcode: drop python2 support package/python-pyqt5: drop python2 support package/python-pyroute2: drop python2 support package/python-pyudev: drop python2 support package/python-raven: drop python2 support package/python-reentry: drop python2 support package/python-remi: drop python2 support package/python-scapy: drop python2 support package/python-sentry-sdk: drop python2 support package/python-setuptools: drop python2 support package/python-sip: drop python2 support package/python-txtorcon: drop python2 support package/python-typing-extensions: drop python2 support package/python-urllib3: drop python2 support package/python-web2py: drop python2 support package/python-webob: drop python2 support package/python-websocket-client: drop python2 support package/python-werkzeug: drop python2 support package/python-whoosh: drop python2 support package/python-xlrd: drop python2 support package/python-xmltodict: drop python2 support package/python3: drop references to python2 package/ranger: drop python2 support package/selinux-python: drop reference to python2 package/snmpclitools: drop python2 support package/supervisor: drop python2 support package/suricata: drop python2 support package/syslog-ng: drop python2 support package/tovid: drop python2 support package/trace-cmd: drop python2 support package/util-linux: drop python2 support package/zfs: drop python2 support package/python: drop host package package/python-backports-abc: drop python2 specific package package/python-backports-shutil-get-terminal-size: drop python2 specific package package/python-backports-ssl-match-hostname: drop python2 specific package package/python-futures: drop python2 specific package package/python-id3: drop python2 specific package package/python-ipaddr: drop python2 specific package package/python-ipaddress: drop python2 specific package package/python-mad: drop python2 specific package package/python-nfc: drop python2 specific package package/python-pam: drop python2 specific package package/python-pathlib2: drop python2 specific package package/python-pypcap: drop python2 specific package package/python-pyro: drop python2 specific package package/python-singledispatch: drop python2 specific package package/python-subprocess32: drop python2 specific package package/python-typing: drop python2 specific package package/python-yieldfrom: drop python2 specific package package/python-configobj: drop python2 specific package package/python-dialog: drop python2 specific package package/python-enum: drop python2 specific package package/python-enum34: drop python2 specific package package/python-functools32: drop python2 specific package docs/manual: drop python2 references Config.in.legacy | 140 ++++++++ DEVELOPERS | 15 - docs/manual/adding-packages-python.txt | 8 - docs/manual/writing-rules.txt | 8 +- package/Config.in | 25 +- package/Config.in.host | 1 - package/alsa-lib/Config.in | 2 +- package/alsa-lib/alsa-lib.mk | 11 +- package/bmap-tools/Config.in | 5 +- package/boost/Config.in | 2 +- package/boost/boost.mk | 11 +- package/cifs-utils/Config.in | 2 +- package/cracklib/cracklib.mk | 7 +- package/crudini/Config.in | 2 +- package/dbus-python/Config.in | 8 +- package/dbus-python/dbus-python.mk | 28 +- package/docker-compose/Config.in | 9 +- package/dstat/Config.in | 10 +- package/evemu/evemu.mk | 4 +- package/fail2ban/Config.in | 2 +- package/fail2ban/fail2ban.mk | 7 +- package/glslsandbox-player/Config.in | 1 - package/gpsd/Config.in | 4 +- package/gpsd/gpsd.mk | 4 - package/gstreamer1/gst1-devtools/Config.in | 6 +- package/i2c-tools/i2c-tools.mk | 8 +- package/iotop/Config.in | 9 +- package/jack2/Config.in | 5 +- package/kmod/kmod.mk | 4 +- package/libcec/libcec.mk | 4 +- package/libevent/libevent.mk | 2 +- package/libftdi1/Config.in | 2 +- package/libftdi1/libftdi1.mk | 2 +- package/libiio/Config.in | 2 +- package/libiio/libiio.mk | 10 +- package/libpwquality/libpwquality.mk | 4 +- package/libsigrokdecode/Config.in | 6 - package/libsoc/libsoc.mk | 6 +- package/lttng-libust/lttng-libust.mk | 5 +- package/networkd-dispatcher/Config.in | 2 - package/nftables/nftables.mk | 4 +- package/ogre/ogre.mk | 5 +- package/opkg-utils/Config.in | 6 - package/owfs/owfs.mk | 24 +- package/python-aenum/python-aenum.mk | 9 - package/python-argon2-cffi/Config.in | 1 - package/python-backports-abc/Config.in | 8 - .../python-backports-abc.hash | 5 - .../python-backports-abc.mk | 14 - .../Config.in | 8 - ...on-backports-shutil-get-terminal-size.hash | 5 - ...thon-backports-shutil-get-terminal-size.mk | 14 - .../Config.in | 7 - .../python-backports-ssl-match-hostname.hash | 5 - .../python-backports-ssl-match-hostname.mk | 14 - package/python-bsdiff4/Config.in | 3 +- package/python-can/Config.in | 7 +- package/python-configobj/Config.in | 10 - .../python-configobj/python-configobj.hash | 3 - package/python-configobj/python-configobj.mk | 14 - package/python-couchdb/Config.in | 3 +- package/python-dialog/Config.in | 10 - package/python-dialog/python-dialog.hash | 5 - package/python-dialog/python-dialog.mk | 15 - package/python-dicttoxml/Config.in | 3 +- package/python-dpkt/Config.in | 3 +- package/python-enum/Config.in | 12 - package/python-enum/python-enum.hash | 5 - package/python-enum/python-enum.mk | 14 - package/python-enum34/Config.in | 12 - package/python-enum34/python-enum34.hash | 5 - package/python-enum34/python-enum34.mk | 17 - package/python-esptool/Config.in | 3 +- package/python-fire/Config.in | 1 - package/python-fire/python-fire.mk | 9 - package/python-flask/Config.in | 7 +- package/python-functools32/Config.in | 8 - .../python-functools32.hash | 4 - .../python-functools32/python-functools32.mk | 14 - package/python-futures/Config.in | 7 - package/python-futures/python-futures.hash | 5 - package/python-futures/python-futures.mk | 14 - package/python-id3/Config.in | 9 - package/python-id3/python-id3.hash | 3 - package/python-id3/python-id3.mk | 14 - package/python-ipaddr/Config.in | 9 - package/python-ipaddr/python-ipaddr.hash | 5 - package/python-ipaddr/python-ipaddr.mk | 14 - package/python-ipaddress/Config.in | 7 - .../python-ipaddress/python-ipaddress.hash | 5 - package/python-ipaddress/python-ipaddress.mk | 14 - package/python-jsonschema/Config.in | 1 - package/python-libconfig/python-libconfig.mk | 8 +- package/python-logbook/Config.in | 3 +- package/python-lxml/Config.in | 3 +- package/python-m2crypto/Config.in | 7 +- package/python-mad/Config.in | 9 - package/python-mad/python-mad.hash | 3 - package/python-mad/python-mad.mk | 29 -- package/python-nfc/Config.in | 16 - package/python-nfc/python-nfc.hash | 3 - package/python-nfc/python-nfc.mk | 14 - package/python-pam/0001-dealloc.patch | 25 -- package/python-pam/0002-nofree.patch | 68 ---- .../0003-memory-errors-CVE2012-1502.patch | 136 -------- package/python-pam/Config.in | 16 - package/python-pam/python-pam.hash | 3 - package/python-pam/python-pam.mk | 16 - package/python-pathlib2/Config.in | 13 - package/python-pathlib2/python-pathlib2.hash | 5 - package/python-pathlib2/python-pathlib2.mk | 14 - package/python-pexpect/python-pexpect.mk | 10 - package/python-pickleshare/Config.in | 1 - package/python-pymodbus/python-pymodbus.mk | 9 - package/python-pypcap/Config.in | 9 - package/python-pypcap/python-pypcap.hash | 3 - package/python-pypcap/python-pypcap.mk | 21 -- package/python-pyqrcode/Config.in | 6 +- package/python-pyqt5/python-pyqt5.mk | 14 +- package/python-pyro/Config.in | 10 - package/python-pyro/python-pyro.hash | 5 - package/python-pyro/python-pyro.mk | 16 - package/python-pyroute2/Config.in | 3 +- package/python-pyudev/Config.in | 3 +- package/python-raven/Config.in | 9 +- package/python-reentry/Config.in | 1 - package/python-remi/Config.in | 3 +- package/python-scapy/Config.in | 3 +- .../python-sentry-sdk/python-sentry-sdk.mk | 10 - package/python-setuptools/Config.in | 6 +- .../python-setuptools/python-setuptools.mk | 16 - package/python-singledispatch/Config.in | 9 - .../python-singledispatch.hash | 5 - .../python-singledispatch.mk | 14 - package/python-sip/python-sip.mk | 19 +- package/python-subprocess32/Config.in | 13 - .../python-subprocess32.hash | 5 - .../python-subprocess32.mk | 31 -- package/python-txtorcon/python-txtorcon.mk | 9 - package/python-typing-extensions/Config.in | 1 - package/python-typing/Config.in | 8 - package/python-typing/python-typing.hash | 5 - package/python-typing/python-typing.mk | 15 - package/python-urllib3/Config.in | 3 +- package/python-web2py/Config.in | 9 +- package/python-webob/Config.in | 4 +- package/python-websocket-client/Config.in | 3 +- package/python-werkzeug/Config.in | 3 +- package/python-whoosh/Config.in | 3 +- package/python-xlrd/Config.in | 6 +- package/python-xmltodict/Config.in | 3 +- package/python-yieldfrom/Config.in | 8 - .../python-yieldfrom/python-yieldfrom.hash | 5 - package/python-yieldfrom/python-yieldfrom.mk | 15 - ...-do-not-add-invalid-header-locations.patch | 42 --- ...get_python_inc-for-cross-compilation.patch | 48 --- ...nstall-location-of-_sysconfigdata.py.patch | 88 ----- ...ilation-of-.pyc-and-.pyo-conditional.patch | 78 ----- ...taddrinfo-test-for-cross-compilation.patch | 31 -- ...astructure-to-be-able-to-disable-ext.patch | 81 ----- ...y-header-paths-for-cross-compilation.patch | 64 ---- ...ook-in-usr-lib-termcap-for-libraries.patch | 31 -- ...9-Fix-python-config-for-cross-builds.patch | 229 ------------- ...ove-the-python-symlink-install-rules.patch | 43 --- .../0011-Don-t-add-multiarch-paths.patch | 36 --- .../0012-Abort-on-failed-module-build.patch | 30 -- ...d-when-threads-are-not-used-availabl.patch | 58 ---- .../python/0014-Serial-ioctl-workaround.patch | 33 -- ...e-shebang-of-Python-scripts-for-cros.patch | 35 -- ...-disable-installation-of-test-module.patch | 105 ------ .../0017-Add-an-option-to-disable-pydoc.patch | 89 ------ ...018-Add-an-option-to-disable-lib2to3.patch | 92 ------ ...option-to-disable-the-sqlite3-module.patch | 69 ---- ...d-an-option-to-disable-the-tk-module.patch | 73 ----- ...-option-to-disable-the-curses-module.patch | 61 ---- .../0022-Add-an-option-to-disable-expat.patch | 92 ------ ...-Add-an-option-to-disable-CJK-codecs.patch | 32 -- .../0024-Add-an-option-to-disable-NIS.patch | 35 -- ...Add-an-option-to-disable-unicodedata.patch | 32 -- .../0026-Add-an-option-to-disable-bsddb.patch | 87 ----- ...-an-option-to-disable-the-ssl-module.patch | 32 -- ...-an-option-to-disable-the-bz2-module.patch | 32 -- ...an-option-to-disable-the-zlib-module.patch | 32 -- .../0030-Do-not-install-the-idle-editor.patch | 55 ---- ...on-to-disable-the-ossaudiodev-module.patch | 32 -- ...option-to-disable-the-hashlib-module.patch | 32 -- ...an-option-to-disable-readline-module.patch | 32 -- ...locale-and-set-to-default-when-addin.patch | 37 --- package/python/Config.in | 139 -------- package/python/Config.in.host | 16 - package/python/python.hash | 5 - package/python/python.mk | 302 ------------------ package/python3/Config.in | 1 - package/python3/python3.mk | 2 - package/ranger/Config.in | 5 +- package/selinux-python/Config.in | 5 - package/snmpclitools/Config.in | 2 +- package/supervisor/Config.in | 3 +- package/suricata/suricata.mk | 4 +- package/syslog-ng/syslog-ng.mk | 7 +- package/tovid/Config.in | 6 +- package/trace-cmd/trace-cmd.mk | 5 +- package/util-linux/util-linux.mk | 4 +- package/zfs/zfs.mk | 12 +- .../package/sample_python_subprocess32.py | 6 - .../testing/tests/package/test_bmap_tools.py | 8 - support/testing/tests/package/test_crudini.py | 8 - .../testing/tests/package/test_libftdi1.py | 12 - support/testing/tests/package/test_python.py | 14 - .../testing/tests/package/test_python_argh.py | 9 - .../tests/package/test_python_bitstring.py | 10 - .../testing/tests/package/test_python_can.py | 11 - .../testing/tests/package/test_python_cbor.py | 11 - .../tests/package/test_python_click.py | 9 - .../tests/package/test_python_constantly.py | 10 - .../tests/package/test_python_gnupg.py | 10 - .../tests/package/test_python_incremental.py | 11 - .../tests/package/test_python_passlib.py | 11 - .../tests/package/test_python_pexpect.py | 10 - .../tests/package/test_python_pynacl.py | 11 - .../tests/package/test_python_pyyaml.py | 11 - .../tests/package/test_python_subprocess32.py | 11 - .../tests/package/test_python_ubjson.py | 11 - 223 files changed, 270 insertions(+), 3981 deletions(-) delete mode 100644 package/python-backports-abc/Config.in delete mode 100644 package/python-backports-abc/python-backports-abc.hash delete mode 100644 package/python-backports-abc/python-backports-abc.mk delete mode 100644 package/python-backports-shutil-get-terminal-size/Config.in delete mode 100644 package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.hash delete mode 100644 package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.mk delete mode 100644 package/python-backports-ssl-match-hostname/Config.in delete mode 100644 package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.hash delete mode 100644 package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.mk delete mode 100644 package/python-configobj/Config.in delete mode 100644 package/python-configobj/python-configobj.hash delete mode 100644 package/python-configobj/python-configobj.mk delete mode 100644 package/python-dialog/Config.in delete mode 100644 package/python-dialog/python-dialog.hash delete mode 100644 package/python-dialog/python-dialog.mk delete mode 100644 package/python-enum/Config.in delete mode 100644 package/python-enum/python-enum.hash delete mode 100644 package/python-enum/python-enum.mk delete mode 100644 package/python-enum34/Config.in delete mode 100644 package/python-enum34/python-enum34.hash delete mode 100644 package/python-enum34/python-enum34.mk delete mode 100644 package/python-functools32/Config.in delete mode 100644 package/python-functools32/python-functools32.hash delete mode 100644 package/python-functools32/python-functools32.mk delete mode 100644 package/python-futures/Config.in delete mode 100644 package/python-futures/python-futures.hash delete mode 100644 package/python-futures/python-futures.mk delete mode 100644 package/python-id3/Config.in delete mode 100644 package/python-id3/python-id3.hash delete mode 100644 package/python-id3/python-id3.mk delete mode 100644 package/python-ipaddr/Config.in delete mode 100644 package/python-ipaddr/python-ipaddr.hash delete mode 100644 package/python-ipaddr/python-ipaddr.mk delete mode 100644 package/python-ipaddress/Config.in delete mode 100644 package/python-ipaddress/python-ipaddress.hash delete mode 100644 package/python-ipaddress/python-ipaddress.mk delete mode 100644 package/python-mad/Config.in delete mode 100644 package/python-mad/python-mad.hash delete mode 100644 package/python-mad/python-mad.mk delete mode 100644 package/python-nfc/Config.in delete mode 100644 package/python-nfc/python-nfc.hash delete mode 100644 package/python-nfc/python-nfc.mk delete mode 100644 package/python-pam/0001-dealloc.patch delete mode 100644 package/python-pam/0002-nofree.patch delete mode 100644 package/python-pam/0003-memory-errors-CVE2012-1502.patch delete mode 100644 package/python-pam/Config.in delete mode 100644 package/python-pam/python-pam.hash delete mode 100644 package/python-pam/python-pam.mk delete mode 100644 package/python-pathlib2/Config.in delete mode 100644 package/python-pathlib2/python-pathlib2.hash delete mode 100644 package/python-pathlib2/python-pathlib2.mk delete mode 100644 package/python-pypcap/Config.in delete mode 100644 package/python-pypcap/python-pypcap.hash delete mode 100644 package/python-pypcap/python-pypcap.mk delete mode 100644 package/python-pyro/Config.in delete mode 100644 package/python-pyro/python-pyro.hash delete mode 100644 package/python-pyro/python-pyro.mk delete mode 100644 package/python-singledispatch/Config.in delete mode 100644 package/python-singledispatch/python-singledispatch.hash delete mode 100644 package/python-singledispatch/python-singledispatch.mk delete mode 100644 package/python-subprocess32/Config.in delete mode 100644 package/python-subprocess32/python-subprocess32.hash delete mode 100644 package/python-subprocess32/python-subprocess32.mk delete mode 100644 package/python-typing/Config.in delete mode 100644 package/python-typing/python-typing.hash delete mode 100644 package/python-typing/python-typing.mk delete mode 100644 package/python-yieldfrom/Config.in delete mode 100644 package/python-yieldfrom/python-yieldfrom.hash delete mode 100644 package/python-yieldfrom/python-yieldfrom.mk delete mode 100644 package/python/0001-setup.py-do-not-add-invalid-header-locations.patch delete mode 100644 package/python/0002-Fix-get_python_inc-for-cross-compilation.patch delete mode 100644 package/python/0003-Change-the-install-location-of-_sysconfigdata.py.patch delete mode 100644 package/python/0004-Make-the-compilation-of-.pyc-and-.pyo-conditional.patch delete mode 100644 package/python/0005-Adjust-getaddrinfo-test-for-cross-compilation.patch delete mode 100644 package/python/0006-Add-minimal-infrastructure-to-be-able-to-disable-ext.patch delete mode 100644 package/python/0007-Adjust-library-header-paths-for-cross-compilation.patch delete mode 100644 package/python/0008-Don-t-look-in-usr-lib-termcap-for-libraries.patch delete mode 100644 package/python/0009-Fix-python-config-for-cross-builds.patch delete mode 100644 package/python/0010-Remove-the-python-symlink-install-rules.patch delete mode 100644 package/python/0011-Don-t-add-multiarch-paths.patch delete mode 100644 package/python/0012-Abort-on-failed-module-build.patch delete mode 100644 package/python/0013-sqlite3-fix-build-when-threads-are-not-used-availabl.patch delete mode 100644 package/python/0014-Serial-ioctl-workaround.patch delete mode 100644 package/python/0015-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch delete mode 100644 package/python/0016-Add-an-option-to-disable-installation-of-test-module.patch delete mode 100644 package/python/0017-Add-an-option-to-disable-pydoc.patch delete mode 100644 package/python/0018-Add-an-option-to-disable-lib2to3.patch delete mode 100644 package/python/0019-Add-option-to-disable-the-sqlite3-module.patch delete mode 100644 package/python/0020-Add-an-option-to-disable-the-tk-module.patch delete mode 100644 package/python/0021-Add-an-option-to-disable-the-curses-module.patch delete mode 100644 package/python/0022-Add-an-option-to-disable-expat.patch delete mode 100644 package/python/0023-Add-an-option-to-disable-CJK-codecs.patch delete mode 100644 package/python/0024-Add-an-option-to-disable-NIS.patch delete mode 100644 package/python/0025-Add-an-option-to-disable-unicodedata.patch delete mode 100644 package/python/0026-Add-an-option-to-disable-bsddb.patch delete mode 100644 package/python/0027-Add-an-option-to-disable-the-ssl-module.patch delete mode 100644 package/python/0028-Add-an-option-to-disable-the-bz2-module.patch delete mode 100644 package/python/0029-Add-an-option-to-disable-the-zlib-module.patch delete mode 100644 package/python/0030-Do-not-install-the-idle-editor.patch delete mode 100644 package/python/0031-Add-an-option-to-disable-the-ossaudiodev-module.patch delete mode 100644 package/python/0032-Add-option-to-disable-the-hashlib-module.patch delete mode 100644 package/python/0033-Add-an-option-to-disable-readline-module.patch delete mode 100644 package/python/0034-Override-system-locale-and-set-to-default-when-addin.patch delete mode 100644 package/python/Config.in delete mode 100644 package/python/Config.in.host delete mode 100644 package/python/python.hash delete mode 100644 package/python/python.mk delete mode 100644 support/testing/tests/package/sample_python_subprocess32.py delete mode 100644 support/testing/tests/package/test_python_subprocess32.py -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:32 +0100 Subject: [Buildroot] [PATCH 006/107] package/cifs-utils: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-7-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/cifs-utils/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/cifs-utils/Config.in b/package/cifs-utils/Config.in index f15d1e3dc4..d1b1406a3e 100644 --- a/package/cifs-utils/Config.in +++ b/package/cifs-utils/Config.in @@ -21,7 +21,7 @@ config BR2_PACKAGE_CIFS_UTILS_SMBTOOLS depends on BR2_USE_WCHAR # python3 depends on BR2_TOOLCHAIN_HAS_THREADS # python3 depends on !BR2_STATIC_LIBS # python3 - select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON # runtime + select BR2_PACKAGE_PYTHON3 # runtime help Install the smb tools smbinfo and smb2-quota (python implementations). -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:30 +0100 Subject: [Buildroot] [PATCH 004/107] package/bmap-tools: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-5-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/bmap-tools/Config.in | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package/bmap-tools/Config.in b/package/bmap-tools/Config.in index 83b4d92786..91081069c7 100644 --- a/package/bmap-tools/Config.in +++ b/package/bmap-tools/Config.in @@ -1,8 +1,7 @@ config BR2_PACKAGE_BMAP_TOOLS bool "bmap-tools" - depends on BR2_PACKAGE_PYTHON3 || BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime, pkg_resources select BR2_PACKAGE_PYTHON_SIX # runtime help -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:34 +0100 Subject: [Buildroot] [PATCH 008/107] package/crudini: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-9-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/crudini/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/crudini/Config.in b/package/crudini/Config.in index 240848dffc..ff4c98d579 100644 --- a/package/crudini/Config.in +++ b/package/crudini/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_CRUDINI bool "crudini" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_INIPARSE # runtime help A utility for handling ini files from the command line and -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:29 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:29 +0100 Subject: [Buildroot] [PATCH 003/107] package/alsa-lib: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-4-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/alsa-lib/Config.in | 2 +- package/alsa-lib/alsa-lib.mk | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/package/alsa-lib/Config.in b/package/alsa-lib/Config.in index 4168d1f220..af3de984d9 100644 --- a/package/alsa-lib/Config.in +++ b/package/alsa-lib/Config.in @@ -22,7 +22,7 @@ if BR2_PACKAGE_ALSA_LIB config BR2_PACKAGE_ALSA_LIB_PYTHON bool "Python support for alsa-lib" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 help Add python support for alsa-lib. Python will be built and libpython will be installed diff --git a/package/alsa-lib/alsa-lib.mk b/package/alsa-lib/alsa-lib.mk index b5cd3f0d13..5d12f5e6d8 100644 --- a/package/alsa-lib/alsa-lib.mk +++ b/package/alsa-lib/alsa-lib.mk @@ -61,20 +61,11 @@ endif ifeq ($(BR2_PACKAGE_ALSA_LIB_PYTHON),y) ALSA_LIB_CONF_OPTS += \ - --enable-mixer-pymods -ifeq ($(BR2_PACKAGE_PYTHON),y) -ALSA_LIB_CONF_OPTS += \ - --with-pythonlibs=-lpython$(PYTHON_VERSION_MAJOR) \ - --with-pythonincludes=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) -ALSA_LIB_CFLAGS += -I$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) -ALSA_LIB_DEPENDENCIES += python -else -ALSA_LIB_CONF_OPTS += \ + --enable-mixer-pymods \ --with-pythonlibs=-lpython$(PYTHON3_VERSION_MAJOR) \ --with-pythonincludes=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) ALSA_LIB_CFLAGS += -I$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) ALSA_LIB_DEPENDENCIES += python3 -endif else ALSA_LIB_CONF_OPTS += --disable-python endif -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:39 +0100 Subject: [Buildroot] [PATCH 013/107] package/fail2ban: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-14-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/fail2ban/Config.in | 2 +- package/fail2ban/fail2ban.mk | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/package/fail2ban/Config.in b/package/fail2ban/Config.in index 86e6233793..8a48a8c1d0 100644 --- a/package/fail2ban/Config.in +++ b/package/fail2ban/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_FAIL2BAN bool "fail2ban" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_SYSTEMD if BR2_PACKAGE_SYSTEMD help Fail2ban scans log files (e.g. /var/log/apache/error_log) and diff --git a/package/fail2ban/fail2ban.mk b/package/fail2ban/fail2ban.mk index 9202dc1ddd..4a08981a97 100644 --- a/package/fail2ban/fail2ban.mk +++ b/package/fail2ban/fail2ban.mk @@ -15,15 +15,13 @@ FAIL2BAN_SETUP_TYPE = distutils # 0001-fixed-possible-RCE-vulnerability-unset-escape-variable.patch FAIL2BAN_IGNORE_CVES += CVE-2021-32749 -ifeq ($(BR2_PACKAGE_PYTHON3),y) define FAIL2BAN_PYTHON_2TO3 $(HOST_DIR)/bin/2to3 --write --nobackups --no-diffs $(@D)/bin/* $(@D)/fail2ban endef -FAIL2BAN_DEPENDENCIES += host-python3 +FAIL2BAN_DEPENDENCIES = host-python3 # We can't use _POST_PATCH_HOOKS because dependencies are not guaranteed # to build and install before _POST_PATCH_HOOKS run. FAIL2BAN_PRE_CONFIGURE_HOOKS += FAIL2BAN_PYTHON_2TO3 -endif define FAIL2BAN_FIX_DEFAULT_CONFIG $(SED) '/^socket/c\socket = /run/fail2ban.sock' $(TARGET_DIR)/etc/fail2ban/fail2ban.conf @@ -34,8 +32,7 @@ FAIL2BAN_POST_INSTALL_TARGET_HOOKS += FAIL2BAN_FIX_DEFAULT_CONFIG # fail2ban-python points to host python define FAIL2BAN_FIX_FAIL2BAN_PYTHON_SYMLINK - ln -snf $(if $(BR2_PACKAGE_PYTHON),python,python3) \ - $(TARGET_DIR)/usr/bin/fail2ban-python + ln -snf python3 $(TARGET_DIR)/usr/bin/fail2ban-python endef FAIL2BAN_POST_INSTALL_TARGET_HOOKS += FAIL2BAN_FIX_FAIL2BAN_PYTHON_SYMLINK -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:37 +0100 Subject: [Buildroot] [PATCH 011/107] package/dstat: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-12-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/dstat/Config.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package/dstat/Config.in b/package/dstat/Config.in index 647a7033c6..09d1970f73 100644 --- a/package/dstat/Config.in +++ b/package/dstat/Config.in @@ -1,10 +1,10 @@ config BR2_PACKAGE_DSTAT bool "dstat" - depends on BR2_USE_WCHAR # python - depends on BR2_USE_MMU # python - depends on BR2_TOOLCHAIN_HAS_THREADS # python - depends on !BR2_STATIC_LIBS # python - select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON + depends on BR2_USE_WCHAR # python3 + depends on BR2_USE_MMU # python3 + depends on BR2_TOOLCHAIN_HAS_THREADS # python3 + depends on !BR2_STATIC_LIBS # python3 + select BR2_PACKAGE_PYTHON3 # runtime help Dstat, written in Python, is a versatile replacement for vmstat, iostat, netstat and ifstat. Dstat overcomes some of -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:35 +0100 Subject: [Buildroot] [PATCH 009/107] package/dbus-python: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-10-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/dbus-python/Config.in | 8 +++----- package/dbus-python/dbus-python.mk | 28 ++++------------------------ 2 files changed, 7 insertions(+), 29 deletions(-) diff --git a/package/dbus-python/Config.in b/package/dbus-python/Config.in index 4bfb59ed91..76453e168a 100644 --- a/package/dbus-python/Config.in +++ b/package/dbus-python/Config.in @@ -3,16 +3,14 @@ config BR2_PACKAGE_DBUS_PYTHON depends on BR2_USE_WCHAR # glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 depends on BR2_PACKAGE_DBUS - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_LIBGLIB2 - # pyexpat: runtime dependency only - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime help Python bindings for D-Bus http://dbus.freedesktop.org/doc/dbus-python/ comment "dbus-python needs a toolchain w/ wchar, threads" - depends on BR2_PACKAGE_DBUS && (BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3) + depends on BR2_PACKAGE_DBUS && BR2_PACKAGE_PYTHON3 depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/dbus-python/dbus-python.mk b/package/dbus-python/dbus-python.mk index 3e28aed25c..d9bb30ed67 100644 --- a/package/dbus-python/dbus-python.mk +++ b/package/dbus-python/dbus-python.mk @@ -9,40 +9,20 @@ DBUS_PYTHON_SITE = http://dbus.freedesktop.org/releases/dbus-python DBUS_PYTHON_INSTALL_STAGING = YES DBUS_PYTHON_LICENSE = MIT (dbus-python), AFL-2.1 or GPL-2.0+ (dbus-gmain) DBUS_PYTHON_LICENSE_FILES = COPYING dbus-gmain/COPYING -DBUS_PYTHON_DEPENDENCIES = dbus libglib2 -HOST_DBUS_PYTHON_DEPENDENCIES = host-dbus host-libglib2 +DBUS_PYTHON_DEPENDENCIES = dbus libglib2 python3 host-python3 +HOST_DBUS_PYTHON_DEPENDENCIES = host-dbus host-libglib2 host-python3 -ifeq ($(BR2_PACKAGE_PYTHON),y) -DBUS_PYTHON_DEPENDENCIES += python host-python - -DBUS_PYTHON_CONF_ENV += \ - PYTHON=$(HOST_DIR)/bin/python2 \ - PYTHON_INCLUDES="`$(STAGING_DIR)/usr/bin/python2-config --includes`" \ - PYTHON_LIBS="`$(STAGING_DIR)/usr/bin/python2-config --ldflags`" - -HOST_DBUS_PYTHON_DEPENDENCIES += host-python - -HOST_DBUS_PYTHON_CONF_ENV += \ - PYTHON=$(HOST_DIR)/bin/python2 \ - PYTHON_INCLUDES="`$(HOST_DIR)/usr/bin/python2-config --includes`" \ - PYTHON_LIBS="`$(HOST_DIR)/usr/bin/python2-config --ldflags`" -else -DBUS_PYTHON_DEPENDENCIES += python3 host-python3 - -DBUS_PYTHON_CONF_ENV += \ +DBUS_PYTHON_CONF_ENV = \ PYTHON=$(HOST_DIR)/bin/python3 \ PYTHON_INCLUDES="`$(STAGING_DIR)/usr/bin/python3-config --includes`" \ PYTHON_LIBS="`$(STAGING_DIR)/usr/bin/python3-config --ldflags`" \ PYTHON_EXTRA_LIBS="`$(STAGING_DIR)/usr/bin/python3-config --libs --embed`" -HOST_DBUS_PYTHON_DEPENDENCIES += host-python3 - -HOST_DBUS_PYTHON_CONF_ENV += \ +HOST_DBUS_PYTHON_CONF_ENV = \ PYTHON=$(HOST_DIR)/bin/python3 \ PYTHON_INCLUDES="`$(HOST_DIR)/usr/bin/python3-config --includes`" \ PYTHON_LIBS="`$(HOST_DIR)/usr/bin/python3-config --ldflags`" \ PYTHON_EXTRA_LIBS="`$(HOST_DIR)/usr/bin/python3-config --libs --embed`" -endif $(eval $(autotools-package)) $(eval $(host-autotools-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:40 +0100 Subject: [Buildroot] [PATCH 014/107] package/glsandbox-player: drop reference to python2 In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-15-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/glslsandbox-player/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/glslsandbox-player/Config.in b/package/glslsandbox-player/Config.in index 2d15a7e270..317eb62898 100644 --- a/package/glslsandbox-player/Config.in +++ b/package/glslsandbox-player/Config.in @@ -33,7 +33,6 @@ config BR2_PACKAGE_GLSLSANDBOX_PLAYER_TESTING config BR2_PACKAGE_GLSLSANDBOX_PLAYER_SCRIPTS bool "Install scripts" - depends on !BR2_PACKAGE_PYTHON # python3 depends on !BR2_STATIC_LIBS # python3 depends on BR2_TOOLCHAIN_HAS_THREADS # python3 depends on BR2_USE_MMU # bash, python3 -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:36 +0100 Subject: [Buildroot] [PATCH 010/107] package/docker-compose: drop reference to BR2_PACKAGE_PYTHON In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-11-peter@korsgaard.com> And adjust the comments to clarify that the toolchain dependencies are from python3. Signed-off-by: Peter Korsgaard --- package/docker-compose/Config.in | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/package/docker-compose/Config.in b/package/docker-compose/Config.in index 761befea4d..f82a0c4bc2 100644 --- a/package/docker-compose/Config.in +++ b/package/docker-compose/Config.in @@ -1,10 +1,9 @@ config BR2_PACKAGE_DOCKER_COMPOSE bool "docker-compose" - depends on !BR2_PACKAGE_PYTHON # python-paramiko -> python-bcrypt - depends on BR2_USE_MMU # python - depends on BR2_USE_WCHAR # python - depends on BR2_TOOLCHAIN_HAS_THREADS # python - depends on !BR2_STATIC_LIBS # python + depends on BR2_USE_MMU # python3 + depends on BR2_USE_WCHAR # python3 + depends on BR2_TOOLCHAIN_HAS_THREADS # python3 + depends on !BR2_STATIC_LIBS # python3 # python-paramiko -> python-cryptography depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS select BR2_PACKAGE_PYTHON3 -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:45 +0100 Subject: [Buildroot] [PATCH 019/107] package/jack2: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-20-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/jack2/Config.in | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package/jack2/Config.in b/package/jack2/Config.in index f9de7be041..bc883190d5 100644 --- a/package/jack2/Config.in +++ b/package/jack2/Config.in @@ -37,9 +37,8 @@ config BR2_PACKAGE_JACK2_DBUS depends on BR2_USE_WCHAR # dbus-python, python select BR2_PACKAGE_DBUS select BR2_PACKAGE_DBUS_PYTHON - select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime help Build and use jackdbus. -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:41 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:41 +0100 Subject: [Buildroot] [PATCH 015/107] package/gpsd: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-16-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/gpsd/Config.in | 4 ++-- package/gpsd/gpsd.mk | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/package/gpsd/Config.in b/package/gpsd/Config.in index 1da9a5ce2a..b66d0952dd 100644 --- a/package/gpsd/Config.in +++ b/package/gpsd/Config.in @@ -81,8 +81,8 @@ config BR2_PACKAGE_GPSD_SQUELCH config BR2_PACKAGE_GPSD_PYTHON bool "build Python support and modules" - depends on BR2_USE_WCHAR # python - select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON + depends on BR2_USE_WCHAR # python3 + select BR2_PACKAGE_PYTHON3 help Python libraries and tools for the gpsd service daemon including gpsfake test harness. diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk index 636c6c95ba..4388b7e24d 100644 --- a/package/gpsd/gpsd.mk +++ b/package/gpsd/gpsd.mk @@ -194,10 +194,6 @@ ifeq ($(BR2_PACKAGE_PYTHON3),y) GPSD_SCONS_OPTS += \ python=yes \ python_libdir="/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages" -else ifeq ($(BR2_PACKAGE_PYTHON),y) -GPSD_SCONS_OPTS += \ - python=yes \ - python_libdir="/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages" else GPSD_SCONS_OPTS += python=no endif -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:42 +0100 Subject: [Buildroot] [PATCH 016/107] package/gst1-devtools: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-17-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-devtools/Config.in | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package/gstreamer1/gst1-devtools/Config.in b/package/gstreamer1/gst1-devtools/Config.in index 55cf25d53e..3f39beff53 100644 --- a/package/gstreamer1/gst1-devtools/Config.in +++ b/package/gstreamer1/gst1-devtools/Config.in @@ -1,11 +1,10 @@ config BR2_PACKAGE_GST1_DEVTOOLS bool "gst1-devtools" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_GSTREAMER1_CHECK select BR2_PACKAGE_GST1_PLUGINS_BASE select BR2_PACKAGE_JSON_GLIB - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_PYEXPAT # cairo is autodetected but needs PNG support select BR2_PACKAGE_CAIRO_PNG if BR2_PACKAGE_CAIRO help @@ -14,5 +13,4 @@ config BR2_PACKAGE_GST1_DEVTOOLS https://gstreamer.freedesktop.org comment "gst1-devtools depends on python" - depends on !BR2_PACKAGE_PYTHON depends on !BR2_PACKAGE_PYTHON3 -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:44 +0100 Subject: [Buildroot] [PATCH 018/107] package/iotop: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-19-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/iotop/Config.in | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/package/iotop/Config.in b/package/iotop/Config.in index ada6131606..460503b9d7 100644 --- a/package/iotop/Config.in +++ b/package/iotop/Config.in @@ -1,11 +1,10 @@ -comment "iotop depends on python or python3" - depends on !BR2_PACKAGE_PYTHON && !BR2_PACKAGE_PYTHON3 +comment "iotop depends on python3" + depends on !BR2_PACKAGE_PYTHON3 config BR2_PACKAGE_IOTOP bool "iotop" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 - select BR2_PACKAGE_PYTHON_CURSES if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_CURSES if BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_CURSES help iotop does for I/O usage what top does for CPU usage. -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:47 +0100 Subject: [Buildroot] [PATCH 021/107] package/libcec: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-22-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/libcec/libcec.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libcec/libcec.mk b/package/libcec/libcec.mk index 6591bc009a..8b5d70d008 100644 --- a/package/libcec/libcec.mk +++ b/package/libcec/libcec.mk @@ -20,8 +20,8 @@ ifeq ($(BR2_PACKAGE_HAS_UDEV),y) LIBCEC_DEPENDENCIES += udev endif -ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) -LIBCEC_DEPENDENCIES += host-swig $(if $(BR2_PACKAGE_PYTHON3),python3,python) +ifeq ($(BR2_PACKAGE_PYTHON3),y) +LIBCEC_DEPENDENCIES += host-swig python3 endif ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:46 +0100 Subject: [Buildroot] [PATCH 020/107] package/kmod: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-21-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/kmod/kmod.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk index c7f510ec0f..82e8597759 100644 --- a/package/kmod/kmod.mk +++ b/package/kmod/kmod.mk @@ -62,8 +62,8 @@ else KMOD_CONF_OPTS += --without-openssl endif -ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) -KMOD_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,python3) +ifeq ($(BR2_PACKAGE_PYTHON3),y) +KMOD_DEPENDENCIES += python3 KMOD_CONF_OPTS += --enable-python endif -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:48 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:48 +0100 Subject: [Buildroot] [PATCH 022/107] package/libevent: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-23-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/libevent/libevent.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libevent/libevent.mk b/package/libevent/libevent.mk index 93ba88ca88..4c23156f72 100644 --- a/package/libevent/libevent.mk +++ b/package/libevent/libevent.mk @@ -25,7 +25,7 @@ endef # libevent installs a python script to target - get rid of it if we # don't have python support enabled -ifneq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) +ifneq ($(BR2_PACKAGE_PYTHON3),y) LIBEVENT_POST_INSTALL_TARGET_HOOKS += LIBEVENT_REMOVE_PYSCRIPT endif -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:49 +0100 Subject: [Buildroot] [PATCH 023/107] package/libftdi1: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-24-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/libftdi1/Config.in | 2 +- package/libftdi1/libftdi1.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libftdi1/Config.in b/package/libftdi1/Config.in index 2d32573563..ec91366115 100644 --- a/package/libftdi1/Config.in +++ b/package/libftdi1/Config.in @@ -24,7 +24,7 @@ comment "libftdipp1 needs a toolchain w/ C++, wchar" config BR2_PACKAGE_LIBFTDI1_PYTHON_BINDINGS bool "python bindings" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 help Python bindings for libftdi diff --git a/package/libftdi1/libftdi1.mk b/package/libftdi1/libftdi1.mk index 6688694b47..d2e3f42e14 100644 --- a/package/libftdi1/libftdi1.mk +++ b/package/libftdi1/libftdi1.mk @@ -24,7 +24,7 @@ LIBFTDI1_CONF_OPTS += -DFTDIPP=OFF endif ifeq ($(BR2_PACKAGE_LIBFTDI1_PYTHON_BINDINGS),y) -LIBFTDI1_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,python3) host-swig +LIBFTDI1_DEPENDENCIES += python3 host-swig LIBFTDI1_CONF_OPTS += -DPYTHON_BINDINGS=ON else LIBFTDI1_CONF_OPTS += -DPYTHON_BINDINGS=OFF -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:53 +0100 Subject: [Buildroot] [PATCH 027/107] package/libsoc: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-28-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/libsoc/libsoc.mk | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/package/libsoc/libsoc.mk b/package/libsoc/libsoc.mk index bbc33143cc..95753b8b68 100644 --- a/package/libsoc/libsoc.mk +++ b/package/libsoc/libsoc.mk @@ -12,12 +12,8 @@ LIBSOC_AUTORECONF = YES LIBSOC_INSTALL_STAGING = YES LIBSOC_DEPENDENCIES = host-pkgconf -# Install Python 2 bindings -ifeq ($(BR2_PACKAGE_PYTHON),y) -LIBSOC_DEPENDENCIES += python -LIBSOC_CONF_OPTS += --enable-python=2 # Install Python 3 bindings -else ifeq ($(BR2_PACKAGE_PYTHON3),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) LIBSOC_DEPENDENCIES += python3 LIBSOC_CONF_OPTS += --enable-python=3 else -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:50 +0100 Subject: [Buildroot] [PATCH 024/107] package/libiio: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-25-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/libiio/Config.in | 2 +- package/libiio/libiio.mk | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/package/libiio/Config.in b/package/libiio/Config.in index 0d89331c89..98d663e203 100644 --- a/package/libiio/Config.in +++ b/package/libiio/Config.in @@ -91,7 +91,7 @@ config BR2_PACKAGE_LIBIIO_BINDINGS_CSHARP config BR2_PACKAGE_LIBIIO_BINDINGS_PYTHON bool "Install Python bindings" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 help Install the Python bindings. diff --git a/package/libiio/libiio.mk b/package/libiio/libiio.mk index a4fe0d4541..48e2f385e3 100644 --- a/package/libiio/libiio.mk +++ b/package/libiio/libiio.mk @@ -73,14 +73,10 @@ LIBIIO_CONF_OPTS += -DHAVE_DNS_SD=OFF 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 +LIBIIO_CONF_OPTS += \ + -DPYTHON_BINDINGS=ON + -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 else LIBIIO_CONF_OPTS += -DPYTHON_BINDINGS=OFF endif -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:54 +0100 Subject: [Buildroot] [PATCH 028/107] package/lttng-libust: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-29-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/lttng-libust/lttng-libust.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/package/lttng-libust/lttng-libust.mk b/package/lttng-libust/lttng-libust.mk index ef7d1a6200..7ead28052e 100644 --- a/package/lttng-libust/lttng-libust.mk +++ b/package/lttng-libust/lttng-libust.mk @@ -20,10 +20,7 @@ LTTNG_LIBUST_AUTORECONF = YES # https://www.mail-archive.com/lttng-dev at lists.lttng.org/msg12950.html LTTNG_LIBUST_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -DUATOMIC_NO_LINK_ERROR" -ifeq ($(BR2_PACKAGE_PYTHON),y) -LTTNG_LIBUST_DEPENDENCIES += python -LTTNG_LIBUST_CONF_OPTS += --enable-python-agent -else ifeq ($(BR2_PACKAGE_PYTHON3),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) LTTNG_LIBUST_DEPENDENCIES += python3 LTTNG_LIBUST_CONF_OPTS += --enable-python-agent else -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:55 +0100 Subject: [Buildroot] [PATCH 029/107] package/networkd-dispatcher: drop reference to python2 In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-30-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/networkd-dispatcher/Config.in | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/networkd-dispatcher/Config.in b/package/networkd-dispatcher/Config.in index ab8c473951..54b48e4ca8 100644 --- a/package/networkd-dispatcher/Config.in +++ b/package/networkd-dispatcher/Config.in @@ -4,7 +4,6 @@ config BR2_PACKAGE_NETWORKD_DISPATCHER 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 @@ -23,7 +22,6 @@ config BR2_PACKAGE_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 -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:56 +0100 Subject: [Buildroot] [PATCH 030/107] package/nftables: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-31-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/nftables/nftables.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/nftables/nftables.mk b/package/nftables/nftables.mk index d5c16ac2be..232d541488 100644 --- a/package/nftables/nftables.mk +++ b/package/nftables/nftables.mk @@ -35,9 +35,9 @@ else NFTABLES_CONF_OPTS += --without-json endif -ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) NFTABLES_CONF_OPTS += --enable-python -NFTABLES_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,python3) +NFTABLES_DEPENDENCIES += python3 else NFTABLES_CONF_OPTS += --disable-python endif -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:52 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:52 +0100 Subject: [Buildroot] [PATCH 026/107] package/libsigrokdecode: drop reference to python2 In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-27-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/libsigrokdecode/Config.in | 6 ------ 1 file changed, 6 deletions(-) diff --git a/package/libsigrokdecode/Config.in b/package/libsigrokdecode/Config.in index 28cbb5ca5e..b58c8a2a29 100644 --- a/package/libsigrokdecode/Config.in +++ b/package/libsigrokdecode/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_LIBSIGROKDECODE bool "libsigrokdecode" - depends on !BR2_PACKAGE_PYTHON # python3 depends on BR2_USE_WCHAR # libglib2/python3 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2/python3 depends on BR2_USE_MMU # libglib2/python3 @@ -19,9 +18,4 @@ config BR2_PACKAGE_LIBSIGROKDECODE comment "libsigrokdecode needs a toolchain w/ wchar, threads, dynamic library" depends on BR2_USE_MMU - depends on !BR2_PACKAGE_PYTHON depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS - -comment "libsigrokdecode is not compatible with python" - depends on BR2_USE_MMU - depends on BR2_PACKAGE_PYTHON -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:58 +0100 Subject: [Buildroot] [PATCH 032/107] package/opkg-utils: drop reference to python2 In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-33-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/opkg-utils/Config.in | 6 ------ 1 file changed, 6 deletions(-) diff --git a/package/opkg-utils/Config.in b/package/opkg-utils/Config.in index 3c5a3ee347..2973055baf 100644 --- a/package/opkg-utils/Config.in +++ b/package/opkg-utils/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_OPKG_UTILS depends on BR2_USE_WCHAR # python3 depends on BR2_TOOLCHAIN_HAS_THREADS # python3 <- libffi depends on !BR2_STATIC_LIBS # python3 - depends on !BR2_PACKAGE_PYTHON # python3 select BR2_PACKAGE_BINUTILS if !BR2_PACKAGE_BUSYBOX # runtime select BR2_PACKAGE_BINUTILS_TARGET if !BR2_PACKAGE_BUSYBOX # runtime select BR2_PACKAGE_COREUTILS if !BR2_PACKAGE_BUSYBOX # runtime @@ -27,8 +26,3 @@ comment "opkg-utils needs a toolchain w/ wchar, threads, dynamic library" depends on !BR2_nios2 || BR2_PACKAGE_BUSYBOX depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS - -comment "opkg-utils needs python3" - depends on !BR2_nios2 || BR2_PACKAGE_BUSYBOX - depends on BR2_USE_MMU - depends on BR2_PACKAGE_PYTHON -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:59 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:59 +0100 Subject: [Buildroot] [PATCH 033/107] package/owfs: drop python support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-34-peter@korsgaard.com> The python support only works with python2, so drop it. Notice that there is a PR adding python3 support, but it is not yet merged: https://github.com/owfs/owfs/pull/32 Signed-off-by: Peter Korsgaard --- package/owfs/owfs.mk | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/package/owfs/owfs.mk b/package/owfs/owfs.mk index 7c69a5251b..986dca921a 100644 --- a/package/owfs/owfs.mk +++ b/package/owfs/owfs.mk @@ -67,30 +67,8 @@ else OWFS_CONF_OPTS += --disable-avahi endif -# setup.py isn't python3 compliant -ifeq ($(BR2_PACKAGE_PYTHON),y) -OWFS_CONF_OPTS += \ - --enable-owpython \ - --with-python \ - --with-pythonconfig=$(STAGING_DIR)/usr/bin/python-config -OWFS_MAKE_ENV += \ - CC="$(TARGET_CC)" \ - PYTHONPATH="$(PYTHON_PATH)" \ - _python_sysroot=$(STAGING_DIR) \ - _python_prefix=/usr \ - _python_exec_prefix=/usr -OWFS_DEPENDENCIES += python host-swig -# The configure scripts finds PYSITEDIR as the python_lib directory of -# host-python, and then prepends DESTDIR in front of it. So we end up -# installing things in $(TARGET_DIR)/$(HOST_DIR)/lib/python which is -# clearly wrong. -# Patching owfs to do the right thing is not trivial, it's much easier to -# override the PYSITEDIR variable in make. -OWFS_EXTRA_MAKE_OPTS += PYSITEDIR=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages - -else +# python2 only (https://github.com/owfs/owfs/pull/32) OWFS_CONF_OPTS += --disable-owpython --without-python -endif ifeq ($(BR2_STATIC_LIBS),y) # zeroconf support uses dlopen() -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:57 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:57 +0100 Subject: [Buildroot] [PATCH 031/107] package/ogre: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-32-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/ogre/ogre.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package/ogre/ogre.mk b/package/ogre/ogre.mk index 72fd616c0c..3fd2fc4650 100644 --- a/package/ogre/ogre.mk +++ b/package/ogre/ogre.mk @@ -42,9 +42,8 @@ OGRE_CONF_OPTS = -DOGRE_BUILD_DEPENDENCIES=OFF \ -DCMAKE_CXX_FLAGS="$(OGRE_CXXFLAGS)" # Enable optional python component if python interpreter is present on the target. -ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) -OGRE_DEPENDENCIES += host-swig \ - $(if $(BR2_PACKAGE_PYTHON3),host-python3,host-python) +ifeq ($(BR2_PACKAGE_PYTHON3),y) +OGRE_DEPENDENCIES += host-swig host-python3 OGRE_CONF_OPTS += -DOGRE_BUILD_COMPONENT_PYTHON=ON else OGRE_CONF_OPTS += -DOGRE_BUILD_COMPONENT_PYTHON=OFF -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:04 +0100 Subject: [Buildroot] [PATCH 038/107] package/python-couchdb: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-39-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-couchdb/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-couchdb/Config.in b/package/python-couchdb/Config.in index 9156883b38..5bff75750b 100644 --- a/package/python-couchdb/Config.in +++ b/package/python-couchdb/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_COUCHDB bool "python-couchdb" - select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_SSL # runtime help Python client library for working with CouchDB. -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:05 +0100 Subject: [Buildroot] [PATCH 039/107] package/python-dicttoxml: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-40-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-dicttoxml/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-dicttoxml/Config.in b/package/python-dicttoxml/Config.in index e38a5f7909..145887eddc 100644 --- a/package/python-dicttoxml/Config.in +++ b/package/python-dicttoxml/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_DICTTOXML bool "python-dicttoxml" - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_PYEXPAT help Converts a Python dictionary or other native data type into a valid XML string. -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:01 +0100 Subject: [Buildroot] [PATCH 035/107] package/python-argon2-cffi: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-36-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-argon2-cffi/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/python-argon2-cffi/Config.in b/package/python-argon2-cffi/Config.in index 16bbe6c4e3..5cddb3314e 100644 --- a/package/python-argon2-cffi/Config.in +++ b/package/python-argon2-cffi/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_PYTHON_ARGON2_CFFI depends on BR2_USE_MMU # libargon2 depends on !BR2_STATIC_LIBS # libargon2 select BR2_PACKAGE_PYTHON_CFFI # runtime - select BR2_PACKAGE_PYTHON_ENUM34 if BR2_PACKAGE_PYTHON # runtime select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_LIBARGON2 help -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:06 +0100 Subject: [Buildroot] [PATCH 040/107] package/python-dpkt: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-41-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-dpkt/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-dpkt/Config.in b/package/python-dpkt/Config.in index 9bd7a98d26..819d0fb613 100644 --- a/package/python-dpkt/Config.in +++ b/package/python-dpkt/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_DPKT bool "python-dpkt" - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_ZLIB # runtime help Fast, simple packet creation / parsing, with definitions for the basic TCP/IP protocols. -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:02 +0100 Subject: [Buildroot] [PATCH 036/107] package/python-bsdiff4: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-37-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-bsdiff4/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-bsdiff4/Config.in b/package/python-bsdiff4/Config.in index a383cda0f5..32070fb9a8 100644 --- a/package/python-bsdiff4/Config.in +++ b/package/python-bsdiff4/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_BSDIFF4 bool "python-bsdiff4" - select BR2_PACKAGE_PYTHON_BZIP2 if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_BZIP2 if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_BZIP2 # runtime help binary diff and patch using the BSDIFF4-format. -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:08 +0100 Subject: [Buildroot] [PATCH 042/107] package/python-fire: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-43-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-fire/Config.in | 1 - package/python-fire/python-fire.mk | 9 --------- 2 files changed, 10 deletions(-) diff --git a/package/python-fire/Config.in b/package/python-fire/Config.in index b718ddac5e..9c816b0fd0 100644 --- a/package/python-fire/Config.in +++ b/package/python-fire/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_PYTHON_FIRE bool "python-fire" select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_TERMCOLOR # runtime - select BR2_PACKAGE_PYTHON_ENUM34 if BR2_PACKAGE_PYTHON # runtime help A library for automatically generating command line interfaces. diff --git a/package/python-fire/python-fire.mk b/package/python-fire/python-fire.mk index 7ba971abc4..40631fce86 100644 --- a/package/python-fire/python-fire.mk +++ b/package/python-fire/python-fire.mk @@ -11,13 +11,4 @@ PYTHON_FIRE_SETUP_TYPE = setuptools PYTHON_FIRE_LICENSE = Apache-2.0 PYTHON_FIRE_LICENSE_FILES = LICENSE -ifeq ($(BR2_PACKAGE_PYTHON),y) -# only needed/valid for python 3.x -define PYTHON_FIRE_RM_PY3_FILE - rm -f $(TARGET_DIR)/usr/lib/python*/site-packages/fire/test_components_py3.py -endef - -PYTHON_FIRE_POST_INSTALL_TARGET_HOOKS += PYTHON_FIRE_RM_PY3_FILE -endif - $(eval $(python-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:03 +0100 Subject: [Buildroot] [PATCH 037/107] package/python-can: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-38-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-can/Config.in | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/package/python-can/Config.in b/package/python-can/Config.in index 3d06374c6a..dc9eb0ae4e 100644 --- a/package/python-can/Config.in +++ b/package/python-can/Config.in @@ -1,13 +1,10 @@ config BR2_PACKAGE_PYTHON_CAN bool "python-can" select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime - select BR2_PACKAGE_PYTHON_SQLITE if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_SQLITE if BR2_PACKAGE_PYTHON3 # runtime - select BR2_PACKAGE_PYTHON_TYPING if BR2_PACKAGE_PYTHON # runtime + select BR2_PACKAGE_PYTHON3_SQLITE # runtime select BR2_PACKAGE_PYTHON_AENUM # runtime select BR2_PACKAGE_PYTHON_WRAPT # runtime - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_ZLIB help This module provides controller area network support for Python. -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:07 +0100 Subject: [Buildroot] [PATCH 041/107] package/python-esptool: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-42-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-esptool/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-esptool/Config.in b/package/python-esptool/Config.in index 570f9aa42f..b21ccd72d5 100644 --- a/package/python-esptool/Config.in +++ b/package/python-esptool/Config.in @@ -3,8 +3,7 @@ config BR2_PACKAGE_PYTHON_ESPTOOL select BR2_PACKAGE_PYTHON_ECDSA # runtime select BR2_PACKAGE_PYTHON_PYAES # runtime select BR2_PACKAGE_PYTHON_SERIAL # runtime - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_ZLIB help A serial utility to communicate & flash code to Espressif ESP8266 & ESP32 chips. -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:09 +0100 Subject: [Buildroot] [PATCH 043/107] package/python-flask: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-44-peter@korsgaard.com> The package alredy depended on python3, so no functional change. Signed-off-by: Peter Korsgaard --- package/python-flask/Config.in | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/package/python-flask/Config.in b/package/python-flask/Config.in index 56bfe10f01..8a44bf2db4 100644 --- a/package/python-flask/Config.in +++ b/package/python-flask/Config.in @@ -1,15 +1,12 @@ config BR2_PACKAGE_PYTHON_FLASK bool "python-flask" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_CLICK # runtime select BR2_PACKAGE_PYTHON_JINJA2 # runtime select BR2_PACKAGE_PYTHON_WERKZEUG # runtime select BR2_PACKAGE_PYTHON_ITSDANGEROUS # runtime select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime - select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_SSL + select BR2_PACKAGE_PYTHON3_ZLIB help Flask is a microframework for Python based on Werkzeug, Jinja 2 and good intentions. -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:10 +0100 Subject: [Buildroot] [PATCH 044/107] package/python-jsonschema: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-45-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-jsonschema/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/python-jsonschema/Config.in b/package/python-jsonschema/Config.in index b547f4ae1a..7002653722 100644 --- a/package/python-jsonschema/Config.in +++ b/package/python-jsonschema/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_JSONSCHEMA bool "python-jsonschema" - select BR2_PACKAGE_PYTHON_FUNCTOOLS32 if BR2_PACKAGE_PYTHON # runtime help An implementation of JSON Schema validation for Python. -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:16 +0100 Subject: [Buildroot] [PATCH 050/107] package/python-pickleshare: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-51-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-pickleshare/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/python-pickleshare/Config.in b/package/python-pickleshare/Config.in index 35a26637a5..18391b7ce8 100644 --- a/package/python-pickleshare/Config.in +++ b/package/python-pickleshare/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PICKLESHARE bool "python-pickleshare" - select BR2_PACKAGE_PYTHON_PATHLIB2 if BR2_PACKAGE_PYTHON # runtime help Tiny 'shelve'-like database with concurrency support -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:15 +0100 Subject: [Buildroot] [PATCH 049/107] package/python-pexpect: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-50-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-pexpect/python-pexpect.mk | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/package/python-pexpect/python-pexpect.mk b/package/python-pexpect/python-pexpect.mk index a9609cbe79..3efda26825 100644 --- a/package/python-pexpect/python-pexpect.mk +++ b/package/python-pexpect/python-pexpect.mk @@ -11,14 +11,4 @@ PYTHON_PEXPECT_LICENSE = ISC PYTHON_PEXPECT_LICENSE_FILES = LICENSE PYTHON_PEXPECT_SETUP_TYPE = distutils -# async.py is not usable with Python 2, and removing is the solution -# recommended by upstream: -# https://github.com/pexpect/pexpect/issues/290 -ifeq ($(BR2_PACKAGE_PYTHON),y) -define PYTHON_PEXPECT_REMOVE_ASYNC_PY - $(RM) $(@D)/pexpect/_async.py -endef -PYTHON_PEXPECT_POST_PATCH_HOOKS += PYTHON_PEXPECT_REMOVE_ASYNC_PY -endif - $(eval $(python-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:17 +0100 Subject: [Buildroot] [PATCH 051/107] package/python-pymodbus: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-52-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-pymodbus/python-pymodbus.mk | 9 --------- 1 file changed, 9 deletions(-) diff --git a/package/python-pymodbus/python-pymodbus.mk b/package/python-pymodbus/python-pymodbus.mk index 9135a4d0c4..d96e21a55c 100644 --- a/package/python-pymodbus/python-pymodbus.mk +++ b/package/python-pymodbus/python-pymodbus.mk @@ -11,13 +11,4 @@ PYTHON_PYMODBUS_SETUP_TYPE = setuptools PYTHON_PYMODBUS_LICENSE = BSD-3-Clause PYTHON_PYMODBUS_LICENSE_FILES = doc/LICENSE -ifeq ($(BR2_PACKAGE_PYTHON),y) -# only needed/valid for python 3.x -define PYTHON_PYMODBUS_RM_PY3_FILES - rm -rf $(TARGET_DIR)/usr/lib/python*/site-packages/pymodbus/client/asynchronous/asyncio -endef - -PYTHON_PYMODBUS_POST_INSTALL_TARGET_HOOKS += PYTHON_PYMODBUS_RM_PY3_FILES -endif - $(eval $(python-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:13 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:13 +0100 Subject: [Buildroot] [PATCH 047/107] package/python-lxml: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-48-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-lxml/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-lxml/Config.in b/package/python-lxml/Config.in index fcb30d56ee..3f3cb5c550 100644 --- a/package/python-lxml/Config.in +++ b/package/python-lxml/Config.in @@ -2,8 +2,7 @@ config BR2_PACKAGE_PYTHON_LXML bool "python-lxml" select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_LIBXSLT - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_ZLIB help The lxml XML toolkit is a Pythonic binding for the C libraries libxml2 and libxslt. -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:18 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:18 +0100 Subject: [Buildroot] [PATCH 052/107] package/python-pyqrcode: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-53-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-pyqrcode/Config.in | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package/python-pyqrcode/Config.in b/package/python-pyqrcode/Config.in index 01b7ae8132..d07ab4965a 100644 --- a/package/python-pyqrcode/Config.in +++ b/package/python-pyqrcode/Config.in @@ -1,9 +1,7 @@ config BR2_PACKAGE_PYTHON_PYQRCODE bool "python-pyqrcode" - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime - select BR2_PACKAGE_PYTHON_CODECSCJK if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_CODECSCJK if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime + select BR2_PACKAGE_PYTHON3_CODECSCJK # runtime help A QR code generator written purely in Python with SVG, EPS, PNG and terminal output. -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:20 +0100 Subject: [Buildroot] [PATCH 054/107] package/python-pyroute2: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-55-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-pyroute2/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-pyroute2/Config.in b/package/python-pyroute2/Config.in index 5df0a63d4b..9e685f9d1e 100644 --- a/package/python-pyroute2/Config.in +++ b/package/python-pyroute2/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_PYROUTE2 bool "python-pyroute2" - select BR2_PACKAGE_PYTHON_SQLITE if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_SQLITE if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_SQLITE help Python netlink library - Linux network / netns / wireless / ipset configuration. -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:14 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:14 +0100 Subject: [Buildroot] [PATCH 048/107] package/python-m2crypto: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-49-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-m2crypto/Config.in | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/package/python-m2crypto/Config.in b/package/python-m2crypto/Config.in index 7481d49e5c..af710d5351 100644 --- a/package/python-m2crypto/Config.in +++ b/package/python-m2crypto/Config.in @@ -1,11 +1,8 @@ config BR2_PACKAGE_PYTHON_M2CRYPTO bool "python-m2crypto" select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime - select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 # runtime - select BR2_PACKAGE_PYTHON_TYPING if BR2_PACKAGE_PYTHON # runtime + select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime + select BR2_PACKAGE_PYTHON3_SSL # runtime help M2Crypto: A Python crypto and SSL toolkit. -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:19 +0100 Subject: [Buildroot] [PATCH 053/107] package/python-pyqt5: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-54-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-pyqt5/python-pyqt5.mk | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/package/python-pyqt5/python-pyqt5.mk b/package/python-pyqt5/python-pyqt5.mk index b05043563e..af32f63796 100644 --- a/package/python-pyqt5/python-pyqt5.mk +++ b/package/python-pyqt5/python-pyqt5.mk @@ -19,14 +19,6 @@ PYTHON_PYQT5_MODULES = \ $(if $(BR2_PACKAGE_QT5BASE_PRINTSUPPORT),QtPrintSupport) \ $(if $(BR2_PACKAGE_QT5BASE_XML),QtXml) -ifeq ($(BR2_PACKAGE_PYTHON),y) -PYTHON_PYQT5_PYTHON_DIR = python$(PYTHON_VERSION_MAJOR) -PYTHON_PYQT5_RM_PORT_BASE = port_v3 -else ifeq ($(BR2_PACKAGE_PYTHON3),y) -PYTHON_PYQT5_PYTHON_DIR = python$(PYTHON3_VERSION_MAJOR) -PYTHON_PYQT5_RM_PORT_BASE = port_v2 -endif - ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS),y) PYTHON_PYQT5_MODULES += QtWidgets @@ -159,7 +151,7 @@ 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 \ + --destdir $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ --qmake $(HOST_DIR)/bin/qmake \ --sysroot $(STAGING_DIR)/usr \ -w --confirm-license \ @@ -186,8 +178,8 @@ endef # __init__.pyc is needed if BR2_PACKAGE_PYTHON_PYC_ONLY is set define PYTHON_PYQT5_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) install - touch $(TARGET_DIR)/usr/lib/$(PYTHON_PYQT5_PYTHON_DIR)/site-packages/PyQt5/__init__.py - $(RM) -rf $(TARGET_DIR)/usr/lib/$(PYTHON_PYQT5_PYTHON_DIR)/site-packages/PyQt5/uic/$(PYTHON_PYQT5_RM_PORT_BASE) + touch $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/PyQt5/__init__.py + $(RM) -rf $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/PyQt5/uic/port_v2 endef $(eval $(generic-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:21 +0100 Subject: [Buildroot] [PATCH 055/107] package/python-pyudev: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-56-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-pyudev/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-pyudev/Config.in b/package/python-pyudev/Config.in index fb853956e8..e0da067cc2 100644 --- a/package/python-pyudev/Config.in +++ b/package/python-pyudev/Config.in @@ -1,8 +1,7 @@ config BR2_PACKAGE_PYTHON_PYUDEV bool "python-pyudev" depends on BR2_PACKAGE_HAS_UDEV - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_ZLIB # runtime select BR2_PACKAGE_PYTHON_SIX # runtime help pyudev is a LGPL licenced, pure Python 2/3 binding to -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:40 +0100 Subject: [Buildroot] [PATCH 074/107] package/ranger: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-75-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/ranger/Config.in | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package/ranger/Config.in b/package/ranger/Config.in index ee0ffecd13..a379002f95 100644 --- a/package/ranger/Config.in +++ b/package/ranger/Config.in @@ -4,9 +4,8 @@ config BR2_PACKAGE_RANGER depends on BR2_USE_WCHAR # python3 depends on BR2_TOOLCHAIN_HAS_THREADS # python3 depends on !BR2_STATIC_LIBS # python3 - select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON_CURSES if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_CURSES if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_CURSES help ranger is a console file manager with VI key bindings. It provides a minimalistic and nice curses interface with a -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:41 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:41 +0100 Subject: [Buildroot] [PATCH 075/107] package/selinux-python: drop reference to python2 In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-76-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/selinux-python/Config.in | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/selinux-python/Config.in b/package/selinux-python/Config.in index 6a518f97d4..ad50cc0735 100644 --- a/package/selinux-python/Config.in +++ b/package/selinux-python/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_SELINUX_PYTHON bool "selinux-python" - depends on !BR2_PACKAGE_PYTHON depends on BR2_USE_MMU depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS @@ -46,10 +45,6 @@ comment "sepolgen needs a toolchain w/ gcc 5" endif -comment "selinux-python needs python3" - depends on BR2_USE_MMU - depends on BR2_PACKAGE_PYTHON - comment "selinux-python packages needs a toolchain w/ wchar, threads, dynamic library" depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:43 +0100 Subject: [Buildroot] [PATCH 077/107] package/supervisor: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-78-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/supervisor/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/supervisor/Config.in b/package/supervisor/Config.in index 7ca3cae134..8ba19dc000 100644 --- a/package/supervisor/Config.in +++ b/package/supervisor/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_SUPERVISOR bool "supervisor" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime dependency help A client/server system that allows its users to control a @@ -9,5 +9,4 @@ config BR2_PACKAGE_SUPERVISOR http://supervisord.org/ comment "supervisor needs a python interpreter" - depends on !BR2_PACKAGE_PYTHON depends on !BR2_PACKAGE_PYTHON3 -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:46 +0100 Subject: [Buildroot] [PATCH 080/107] package/tovid: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-81-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/tovid/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/tovid/Config.in b/package/tovid/Config.in index f972e18852..3dbb0e229e 100644 --- a/package/tovid/Config.in +++ b/package/tovid/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_TOVID depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # mpv depends on BR2_TOOLCHAIN_HAS_ATOMIC # mpv @@ -40,8 +40,8 @@ comment "tovid needs a toolchain w/ threads, C++, wchar, gcc >= 4.9" || !BR2_USE_WCHAR depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC -comment "tovid depends on python or python3" - depends on !BR2_PACKAGE_PYTHON && !BR2_PACKAGE_PYTHON3 +comment "tovid depends on python3" + depends on !BR2_PACKAGE_PYTHON3 depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_TOOLCHAIN_HAS_SYNC_4 -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:44 +0100 Subject: [Buildroot] [PATCH 078/107] package/suricata: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-79-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/suricata/suricata.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/suricata/suricata.mk b/package/suricata/suricata.mk index 3255fd35a1..86d8970178 100644 --- a/package/suricata/suricata.mk +++ b/package/suricata/suricata.mk @@ -116,9 +116,9 @@ else SURICATA_CONF_OPTS += --disable-luajit endif -ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) SURICATA_CONF_OPTS += --enable-python -SURICATA_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,python3) +SURICATA_DEPENDENCIES += python3 else SURICATA_CONF_OPTS += --disable-python endif -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:47 +0100 Subject: [Buildroot] [PATCH 081/107] package/trace-cmd: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-82-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/trace-cmd/trace-cmd.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/package/trace-cmd/trace-cmd.mk b/package/trace-cmd/trace-cmd.mk index d9ed417f20..fe0cd71ec4 100644 --- a/package/trace-cmd/trace-cmd.mk +++ b/package/trace-cmd/trace-cmd.mk @@ -18,10 +18,7 @@ ifeq ($(BR2_PACKAGE_AUDIT),y) TRACE_CMD_DEPENDENCIES += audit endif -ifeq ($(BR2_PACKAGE_PYTHON),y) -TRACE_CMD_DEPENDENCIES += python host-swig -TRACE_CMD_MAKE_OPTS += PYTHON_VERS=python -else ifeq ($(BR2_PACKAGE_PYTHON3),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) TRACE_CMD_DEPENDENCIES += python3 host-swig TRACE_CMD_MAKE_OPTS += PYTHON_VERS=python3 else -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:48 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:48 +0100 Subject: [Buildroot] [PATCH 082/107] package/util-linux: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-83-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/util-linux/util-linux.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 5a4ff64d01..1ca605f3fb 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -241,9 +241,9 @@ HOST_UTIL_LINUX_CONF_OPTS += --disable-all-programs endif # Install libmount Python bindings -ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) UTIL_LINUX_CONF_OPTS += --with-python -UTIL_LINUX_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,python3) +UTIL_LINUX_DEPENDENCIES += python3 ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBMOUNT),y) UTIL_LINUX_CONF_OPTS += --enable-pylibmount else -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:49 +0100 Subject: [Buildroot] [PATCH 083/107] package/zfs: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-84-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/zfs/zfs.mk | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/package/zfs/zfs.mk b/package/zfs/zfs.mk index 0e7e3e4e74..6b542f5c05 100644 --- a/package/zfs/zfs.mk +++ b/package/zfs/zfs.mk @@ -37,17 +37,7 @@ else ZFS_CONF_OPTS += --disable-systemd 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 host-python-packaging -ZFS_CONF_ENV += \ - PYTHON=$(HOST_DIR)/usr/bin/python2 \ - PYTHON_CPPFLAGS="`$(STAGING_DIR)/usr/bin/python2-config --includes`" \ - PYTHON_LIBS="`$(STAGING_DIR)/usr/bin/python2-config --ldflags`" \ - PYTHON_SITE_PKG="/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages" -ZFS_CONF_OPTS += --enable-pyzfs -else ifeq ($(BR2_PACKAGE_PYTHON3),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) ZFS_DEPENDENCIES += python3 python-setuptools host-python-cffi host-python-packaging ZFS_CONF_ENV += \ PYTHON=$(HOST_DIR)/usr/bin/python3 \ -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:51 +0100 Subject: [Buildroot] [PATCH 085/107] package/python-backports-abc: drop python2 specific package In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-86-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++++ package/Config.in | 1 - package/python-backports-abc/Config.in | 8 -------- .../python-backports-abc/python-backports-abc.hash | 5 ----- .../python-backports-abc/python-backports-abc.mk | 14 -------------- 5 files changed, 6 insertions(+), 28 deletions(-) delete mode 100644 package/python-backports-abc/Config.in delete mode 100644 package/python-backports-abc/python-backports-abc.hash delete mode 100644 package/python-backports-abc/python-backports-abc.mk diff --git a/Config.in.legacy b/Config.in.legacy index 6bc3803a5c..cc1ed8f9d5 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_BACKPORTS_ABC + bool "python-backports-abc removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON bool "python2.7 package removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index ca2fb363e3..46e6b30cdf 100644 --- a/package/Config.in +++ b/package/Config.in @@ -941,7 +941,6 @@ menu "External python modules" source "package/python-avro/Config.in" source "package/python-babel/Config.in" source "package/python-backcall/Config.in" - source "package/python-backports-abc/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-abc/Config.in b/package/python-backports-abc/Config.in deleted file mode 100644 index 43566279e8..0000000000 --- a/package/python-backports-abc/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PYTHON_BACKPORTS_ABC - bool "python-backports-abc" - depends on BR2_PACKAGE_PYTHON - help - A backport of recent additions to the 'collections.abc' - module. - - https://pypi.python.org/pypi/backports_abc diff --git a/package/python-backports-abc/python-backports-abc.hash b/package/python-backports-abc/python-backports-abc.hash deleted file mode 100644 index 4f4c9bd1fe..0000000000 --- a/package/python-backports-abc/python-backports-abc.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5 from https://pypi.python.org/pypi/backports_abc/json -md5 7d1936ec183a3586290adf60f6f96764 backports_abc-0.5.tar.gz -# Locally computed -sha256 033be54514a03e255df75c5aee8f9e672f663f93abb723444caec8fe43437bde backports_abc-0.5.tar.gz -sha256 0a4f3b38055f50f047a42521568fa6ddb9a5976c2884f6ae138796d0f71150ca LICENSE diff --git a/package/python-backports-abc/python-backports-abc.mk b/package/python-backports-abc/python-backports-abc.mk deleted file mode 100644 index 66cea1703e..0000000000 --- a/package/python-backports-abc/python-backports-abc.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-backports-abc -# -################################################################################ - -PYTHON_BACKPORTS_ABC_VERSION = 0.5 -PYTHON_BACKPORTS_ABC_SOURCE = backports_abc-$(PYTHON_BACKPORTS_ABC_VERSION).tar.gz -PYTHON_BACKPORTS_ABC_SITE = https://pypi.python.org/packages/68/3c/1317a9113c377d1e33711ca8de1e80afbaf4a3c950dd0edfaf61f9bfe6d8 -PYTHON_BACKPORTS_ABC_LICENSE = Python-2.0 -PYTHON_BACKPORTS_ABC_LICENSE_FILES = LICENSE -PYTHON_BACKPORTS_ABC_SETUP_TYPE = setuptools - -$(eval $(python-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:52 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:52 +0100 Subject: [Buildroot] [PATCH 086/107] package/python-backports-shutil-get-terminal-size: drop python2 specific package In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-87-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++++ DEVELOPERS | 1 - package/Config.in | 1 - .../Config.in | 8 -------- .../python-backports-shutil-get-terminal-size.hash | 5 ----- .../python-backports-shutil-get-terminal-size.mk | 14 -------------- 6 files changed, 6 insertions(+), 29 deletions(-) delete mode 100644 package/python-backports-shutil-get-terminal-size/Config.in delete mode 100644 package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.hash delete mode 100644 package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.mk diff --git a/Config.in.legacy b/Config.in.legacy index cc1ed8f9d5..89c095a388 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE + bool "python-backports-shutil-get-terminal-size removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_BACKPORTS_ABC bool "python-backports-abc removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 1d1cf99898..2fd8d4d010 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -143,7 +143,6 @@ N: Andreas Ziegler F: package/mpd/ N: Andrey Smirnov -F: package/python-backports-shutil-get-terminal-size/ F: package/python-decorator/ F: package/python-ipython-genutils/ F: package/python-pathlib2/ diff --git a/package/Config.in b/package/Config.in index 46e6b30cdf..fbfc876d89 100644 --- a/package/Config.in +++ b/package/Config.in @@ -941,7 +941,6 @@ menu "External python modules" source "package/python-avro/Config.in" source "package/python-babel/Config.in" source "package/python-backcall/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" source "package/python-beautifulsoup4/Config.in" diff --git a/package/python-backports-shutil-get-terminal-size/Config.in b/package/python-backports-shutil-get-terminal-size/Config.in deleted file mode 100644 index 392e05a282..0000000000 --- a/package/python-backports-shutil-get-terminal-size/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE - bool "python-backports-shutil-get-terminal-size" - depends on BR2_PACKAGE_PYTHON - help - A backport of the get_terminal_size function from Python - 3.3's shutil. - - https://pypi.python.org/pypi/backports.shutil_get_terminal_size diff --git a/package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.hash b/package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.hash deleted file mode 100644 index 40883a4e3b..0000000000 --- a/package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5 from https://pypi.python.org/pypi/backports.shutil_get_terminal_size/json -md5 03267762480bd86b50580dc19dff3c66 backports.shutil_get_terminal_size-1.0.0.tar.gz -# Locally computed -sha256 713e7a8228ae80341c70586d1cc0a8caa5207346927e23d09dcbcaf18eadec80 backports.shutil_get_terminal_size-1.0.0.tar.gz -sha256 9edd99f8c339cddbfe36a9707e671fccf245b3e50b80eec0877dccec87a2dfe4 LICENSE diff --git a/package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.mk b/package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.mk deleted file mode 100644 index 7c24b196f2..0000000000 --- a/package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-backports-shutil-get-terminal-size -# -################################################################################ - -PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE_VERSION = 1.0.0 -PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE_SOURCE = backports.shutil_get_terminal_size-$(PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE_VERSION).tar.gz -PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE_SITE = https://pypi.python.org/packages/ec/9c/368086faa9c016efce5da3e0e13ba392c9db79e3ab740b763fe28620b18b -PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE_SETUP_TYPE = setuptools -PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE_LICENSE = MIT -PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE_LICENSE_FILES = LICENSE - -$(eval $(python-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:54 +0100 Subject: [Buildroot] [PATCH 088/107] package/python-futures: drop python2 specific package In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-89-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/python-futures/Config.in | 7 ------- package/python-futures/python-futures.hash | 5 ----- package/python-futures/python-futures.mk | 14 -------------- 6 files changed, 6 insertions(+), 28 deletions(-) delete mode 100644 package/python-futures/Config.in delete mode 100644 package/python-futures/python-futures.hash delete mode 100644 package/python-futures/python-futures.mk diff --git a/Config.in.legacy b/Config.in.legacy index 10476a2adf..7e85e4cf63 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_FUTURES + bool "python-futures removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME bool "python-backports-ssl-match-hostname removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index c94a7831fc..d2ed22dac0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -436,7 +436,6 @@ F: package/pulseaudio/ F: package/pure-ftpd/ F: package/python-couchdb/ F: package/python-cssutils/ -F: package/python-futures/ F: package/python-mwclient/ F: package/python-mwscrape/ F: package/python-mwscrape2slob/ diff --git a/package/Config.in b/package/Config.in index 73f266504a..b18d298a1b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1032,7 +1032,6 @@ menu "External python modules" source "package/python-frozenlist/Config.in" source "package/python-functools32/Config.in" source "package/python-future/Config.in" - source "package/python-futures/Config.in" source "package/python-git/Config.in" source "package/python-gitdb2/Config.in" source "package/python-gnupg/Config.in" diff --git a/package/python-futures/Config.in b/package/python-futures/Config.in deleted file mode 100644 index 2eb40e93bd..0000000000 --- a/package/python-futures/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_FUTURES - bool "python-futures" - depends on BR2_PACKAGE_PYTHON # not needed for python3 - help - Backport of the concurrent.futures package from Python 3.2. - - https://github.com/agronholm/pythonfutures diff --git a/package/python-futures/python-futures.hash b/package/python-futures/python-futures.hash deleted file mode 100644 index a4fbdf4fe9..0000000000 --- a/package/python-futures/python-futures.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/futures/json -md5 b43a39ae1475e3fd6940f2b4f7214675 futures-3.3.0.tar.gz -sha256 7e033af76a5e35f58e56da7a91e687706faf4e7bdfb2cbc3f2cca6b9bcda9794 futures-3.3.0.tar.gz -# Locally computed sha256 checksums -sha256 a698bd5d441e4a16af6c992b8e80cbfa12755d72d910854fa1fb11d4deb0059a LICENSE diff --git a/package/python-futures/python-futures.mk b/package/python-futures/python-futures.mk deleted file mode 100644 index 0666948115..0000000000 --- a/package/python-futures/python-futures.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-futures -# -################################################################################ - -PYTHON_FUTURES_VERSION = 3.3.0 -PYTHON_FUTURES_SOURCE = futures-$(PYTHON_FUTURES_VERSION).tar.gz -PYTHON_FUTURES_SITE = https://files.pythonhosted.org/packages/47/04/5fc6c74ad114032cd2c544c575bffc17582295e9cd6a851d6026ab4b2c00 -PYTHON_FUTURES_SETUP_TYPE = setuptools -PYTHON_FUTURES_LICENSE = BSD-2-Clause -PYTHON_FUTURES_LICENSE_FILES = LICENSE - -$(eval $(python-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:56 +0100 Subject: [Buildroot] [PATCH 090/107] package/python-ipaddr: drop python2 specific package In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-91-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/python-ipaddr/Config.in | 9 --------- package/python-ipaddr/python-ipaddr.hash | 5 ----- package/python-ipaddr/python-ipaddr.mk | 14 -------------- 6 files changed, 6 insertions(+), 30 deletions(-) delete mode 100644 package/python-ipaddr/Config.in delete mode 100644 package/python-ipaddr/python-ipaddr.hash delete mode 100644 package/python-ipaddr/python-ipaddr.mk diff --git a/Config.in.legacy b/Config.in.legacy index 03ea14a512..c78fb20756 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_IPADDR + bool "python-ipaddr removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_ID3 bool "python-id3 removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 985f43b614..c74bb3ae38 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2248,7 +2248,6 @@ F: package/python-docker-pycreds/ F: package/python-enum/ F: package/python-enum34/ F: package/python-functools32/ -F: package/python-ipaddr/ F: package/python-pam/ F: package/python-psutil/ F: package/python-request-id/ diff --git a/package/Config.in b/package/Config.in index 0ee1c8ddb4..611a8f6aa8 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1058,7 +1058,6 @@ menu "External python modules" source "package/python-iniparse/Config.in" source "package/python-intelhex/Config.in" source "package/python-iowait/Config.in" - source "package/python-ipaddr/Config.in" source "package/python-ipaddress/Config.in" source "package/python-ipdb/Config.in" source "package/python-iptables/Config.in" diff --git a/package/python-ipaddr/Config.in b/package/python-ipaddr/Config.in deleted file mode 100644 index 57279273f9..0000000000 --- a/package/python-ipaddr/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PYTHON_IPADDR - bool "python-ipaddr" - depends on BR2_PACKAGE_PYTHON # included since python3.3 - help - An IPv4/IPv6 manipulation library in Python. This library is - used to create/poke/manipulate IPv4 and IPv6 addresses and - prefixes. - - https://github.com/google/ipaddr-py diff --git a/package/python-ipaddr/python-ipaddr.hash b/package/python-ipaddr/python-ipaddr.hash deleted file mode 100644 index d9963a2933..0000000000 --- a/package/python-ipaddr/python-ipaddr.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/ipaddr/json -md5 f88353e40dec06410acfa075b8209b27 ipaddr-2.2.0.tar.gz -sha256 4092dfe667588d16aa12b59acb7c8a4024e5dcb23a681cd0b0b602373eca88d6 ipaddr-2.2.0.tar.gz -# Locally computed sha256 checksums -sha256 175b3b509d5c840db72ad8c22d22a690d15c67b317f34de8a8bb0a66059e8215 COPYING diff --git a/package/python-ipaddr/python-ipaddr.mk b/package/python-ipaddr/python-ipaddr.mk deleted file mode 100644 index 9a5d147533..0000000000 --- a/package/python-ipaddr/python-ipaddr.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-ipaddr -# -################################################################################ - -PYTHON_IPADDR_VERSION = 2.2.0 -PYTHON_IPADDR_SOURCE = ipaddr-$(PYTHON_IPADDR_VERSION).tar.gz -PYTHON_IPADDR_SITE = https://files.pythonhosted.org/packages/9d/a7/1b39a16cb90dfe491f57e1cab3103a15d4e8dd9a150872744f531b1106c1 -PYTHON_IPADDR_SETUP_TYPE = distutils -PYTHON_IPADDR_LICENSE = Apache-2.0 -PYTHON_IPADDR_LICENSE_FILES = COPYING - -$(eval $(python-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:53 +0100 Subject: [Buildroot] [PATCH 087/107] package/python-backports-ssl-match-hostname: drop python2 specific package In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-88-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++++ DEVELOPERS | 1 - package/Config.in | 1 - .../python-backports-ssl-match-hostname/Config.in | 7 ------- .../python-backports-ssl-match-hostname.hash | 5 ----- .../python-backports-ssl-match-hostname.mk | 14 -------------- 6 files changed, 6 insertions(+), 28 deletions(-) delete mode 100644 package/python-backports-ssl-match-hostname/Config.in delete mode 100644 package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.hash delete mode 100644 package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.mk diff --git a/Config.in.legacy b/Config.in.legacy index 89c095a388..10476a2adf 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME + bool "python-backports-ssl-match-hostname removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE bool "python-backports-shutil-get-terminal-size removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 2fd8d4d010..c94a7831fc 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2243,7 +2243,6 @@ F: package/lzop/ F: package/memtool/ F: package/mosquitto/ F: package/python-alsaaudio/ -F: package/python-backports-ssl-match-hostname/ F: package/python-cached-property/ F: package/python-docker/ F: package/python-dockerpty/ diff --git a/package/Config.in b/package/Config.in index fbfc876d89..73f266504a 100644 --- a/package/Config.in +++ b/package/Config.in @@ -941,7 +941,6 @@ menu "External python modules" source "package/python-avro/Config.in" source "package/python-babel/Config.in" source "package/python-backcall/Config.in" - source "package/python-backports-ssl-match-hostname/Config.in" source "package/python-bcrypt/Config.in" source "package/python-beautifulsoup4/Config.in" source "package/python-bidict/Config.in" diff --git a/package/python-backports-ssl-match-hostname/Config.in b/package/python-backports-ssl-match-hostname/Config.in deleted file mode 100644 index 8e55191a9e..0000000000 --- a/package/python-backports-ssl-match-hostname/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME - bool "python-backports-ssl-match-hostname" - depends on BR2_PACKAGE_PYTHON - help - The ssl.match_hostname() function from Python 3.5. - - http://bitbucket.org/brandon/backports.ssl_match_hostname diff --git a/package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.hash b/package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.hash deleted file mode 100644 index 145174cd5b..0000000000 --- a/package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/backports.ssl_match_hostname/json -md5 32d2f593af01a046bec3d2f5181a420a backports.ssl_match_hostname-3.7.0.1.tar.gz -sha256 bb82e60f9fbf4c080eabd957c39f0641f0fc247d9a16e31e26d594d8f42b9fd2 backports.ssl_match_hostname-3.7.0.1.tar.gz -# Locally computed sha256 checksums -sha256 bfc8a75a4b9aec224aa7973c0c9d7cc0134bdcbf8eefd008936b58554d66e97e LICENSE.txt diff --git a/package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.mk b/package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.mk deleted file mode 100644 index 300961662d..0000000000 --- a/package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-backports-ssl-match-hostname -# -################################################################################ - -PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_VERSION = 3.7.0.1 -PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_SOURCE = backports.ssl_match_hostname-$(PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_VERSION).tar.gz -PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_SITE = https://files.pythonhosted.org/packages/ff/2b/8265224812912bc5b7a607c44bf7b027554e1b9775e9ee0de8032e3de4b2 -PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_SETUP_TYPE = distutils -PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_LICENSE = Python-2.0 -PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_LICENSE_FILES = LICENSE.txt - -$(eval $(python-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:58 +0100 Subject: [Buildroot] [PATCH 092/107] package/python-mad: drop python2 specific package In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-93-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/python-mad/Config.in | 9 --------- package/python-mad/python-mad.hash | 3 --- package/python-mad/python-mad.mk | 29 ----------------------------- 6 files changed, 6 insertions(+), 43 deletions(-) delete mode 100644 package/python-mad/Config.in delete mode 100644 package/python-mad/python-mad.hash delete mode 100644 package/python-mad/python-mad.mk diff --git a/Config.in.legacy b/Config.in.legacy index 14b26408fe..f6607deeeb 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_MAD + bool "python-mad removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_IPADDRESS bool "python-ipaddress removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index c74bb3ae38..fe28772d8b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2805,7 +2805,6 @@ F: package/python3/ F: package/python-augeas/ F: package/python-flask-expects-json/ F: package/python-git/ -F: package/python-mad/ F: package/python-serial/ F: package/python-unittest-xml-reporting/ F: package/qextserialport/ diff --git a/package/Config.in b/package/Config.in index 50c0e13510..d5c46ef997 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1086,7 +1086,6 @@ menu "External python modules" source "package/python-lxml/Config.in" source "package/python-m2crypto/Config.in" source "package/python-m2r/Config.in" - source "package/python-mad/Config.in" source "package/python-mako/Config.in" source "package/python-markdown/Config.in" source "package/python-markdown2/Config.in" diff --git a/package/python-mad/Config.in b/package/python-mad/Config.in deleted file mode 100644 index 25354213d6..0000000000 --- a/package/python-mad/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PYTHON_MAD - bool "python-mad" - depends on BR2_PACKAGE_PYTHON - select BR2_PACKAGE_LIBMAD - help - python-mad is a Python binding for the MAD library, a - high-quality integer-only MPEG decoder. - - http://spacepants.org/src/pymad/ diff --git a/package/python-mad/python-mad.hash b/package/python-mad/python-mad.hash deleted file mode 100644 index 7b19ae5a44..0000000000 --- a/package/python-mad/python-mad.hash +++ /dev/null @@ -1,3 +0,0 @@ -# locally computed -sha256 1c9fc529b78de7d26e9e47cf182c9f8bf43838d8f62a9c1773540d57f5ebc522 pymad-0.6.tar.gz -sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING diff --git a/package/python-mad/python-mad.mk b/package/python-mad/python-mad.mk deleted file mode 100644 index a22214876f..0000000000 --- a/package/python-mad/python-mad.mk +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# -# python-mad -# -################################################################################ - -PYTHON_MAD_VERSION = 0.6 -PYTHON_MAD_SOURCE = pymad-$(PYTHON_MAD_VERSION).tar.gz -PYTHON_MAD_SITE = http://spacepants.org/src/pymad/download -PYTHON_MAD_SETUP_TYPE = distutils -PYTHON_MAD_LICENSE = GPL-2.0+ -PYTHON_MAD_LICENSE_FILES = COPYING - -PYTHON_MAD_DEPENDENCIES = libmad - -ifeq ($(BR2_ENDIAN),"LITTLE") -PYTHON_MAD_ENDIAN = little -else -PYTHON_MAD_ENDIAN = big -endif - -define PYTHON_MAD_CONFIGURE_CMDS - echo "endian = $(PYTHON_MAD_ENDIAN)" > $(@D)/Setup - echo "mad_libs = mad" >> $(@D)/Setup - echo "mad_lib_dir = $(STAGING_DIR)/usr/lib" >> $(@D)/Setup - echo "mad_include_dir = $(STAGING_DIR)/usr/include" >> $(@D)/Setup -endef - -$(eval $(python-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:59 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:59 +0100 Subject: [Buildroot] [PATCH 093/107] package/python-nfc: drop python2 specific package In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-94-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/python-nfc/Config.in | 16 ---------------- package/python-nfc/python-nfc.hash | 3 --- package/python-nfc/python-nfc.mk | 14 -------------- 6 files changed, 6 insertions(+), 35 deletions(-) delete mode 100644 package/python-nfc/Config.in delete mode 100644 package/python-nfc/python-nfc.hash delete mode 100644 package/python-nfc/python-nfc.mk diff --git a/Config.in.legacy b/Config.in.legacy index f6607deeeb..80adf521f8 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_NFC + bool "python-nfc removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_MAD bool "python-mad removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index fe28772d8b..7b38d3c0f7 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2598,7 +2598,6 @@ F: package/nanocom/ F: package/neard/ F: package/neardal/ F: package/owl-linux/ -F: package/python-nfc/ F: package/rapidjson/ F: package/sconeserver/ F: package/sound-theme-borealis/ diff --git a/package/Config.in b/package/Config.in index d5c46ef997..8dc91becb0 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1110,7 +1110,6 @@ menu "External python modules" source "package/python-netifaces/Config.in" source "package/python-networkmanager/Config.in" source "package/python-networkx/Config.in" - source "package/python-nfc/Config.in" source "package/python-numpy/Config.in" source "package/python-oauthlib/Config.in" source "package/python-opcua-asyncio/Config.in" diff --git a/package/python-nfc/Config.in b/package/python-nfc/Config.in deleted file mode 100644 index 7008723f60..0000000000 --- a/package/python-nfc/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_PYTHON_NFC - bool "python-nfc" - depends on BR2_PACKAGE_PYTHON - depends on BR2_TOOLCHAIN_HAS_THREADS # libusb - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb - select BR2_PACKAGE_LIBUSB - select BR2_PACKAGE_LIBUSB_COMPAT - help - Python module for near field communication. - - https://launchpad.net/nfcpy - -comment "python-nfc needs a toolchain w/ threads, gcc >= 4.9" - depends on BR2_PACKAGE_PYTHON - depends on !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/python-nfc/python-nfc.hash b/package/python-nfc/python-nfc.hash deleted file mode 100644 index 6514973f53..0000000000 --- a/package/python-nfc/python-nfc.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed: -sha256 7ff9265e393e9e70173ecef5a1f9124e67d3b6e481c2dc3a9537b6a769ebe16f python-nfc-0.13.5.tar.gz -sha256 0dc4b0a3362f197e250604567a6b4eb16bbc34c186425401e2201a193a82549f LICENSE diff --git a/package/python-nfc/python-nfc.mk b/package/python-nfc/python-nfc.mk deleted file mode 100644 index f5417410c9..0000000000 --- a/package/python-nfc/python-nfc.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-nfc -# -################################################################################ - -PYTHON_NFC_VERSION = 0.13.5 -PYTHON_NFC_SITE = $(call github,nfcpy,nfcpy,v$(PYTHON_NFC_VERSION)) -PYTHON_NFC_DEPENDENCIES = libusb libusb-compat -PYTHON_NFC_SETUP_TYPE = setuptools -PYTHON_NFC_LICENSE = EUPL-1.1+ -PYTHON_NFC_LICENSE_FILES = LICENSE - -$(eval $(python-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:50 +0100 Subject: [Buildroot] [PATCH 084/107] package/python: drop host package In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-85-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- ...-do-not-add-invalid-header-locations.patch | 42 --- ...get_python_inc-for-cross-compilation.patch | 48 --- ...nstall-location-of-_sysconfigdata.py.patch | 88 ----- ...ilation-of-.pyc-and-.pyo-conditional.patch | 78 ----- ...taddrinfo-test-for-cross-compilation.patch | 31 -- ...astructure-to-be-able-to-disable-ext.patch | 81 ----- ...y-header-paths-for-cross-compilation.patch | 64 ---- ...ook-in-usr-lib-termcap-for-libraries.patch | 31 -- ...9-Fix-python-config-for-cross-builds.patch | 229 ------------- ...ove-the-python-symlink-install-rules.patch | 43 --- .../0011-Don-t-add-multiarch-paths.patch | 36 --- .../0012-Abort-on-failed-module-build.patch | 30 -- ...d-when-threads-are-not-used-availabl.patch | 58 ---- .../python/0014-Serial-ioctl-workaround.patch | 33 -- ...e-shebang-of-Python-scripts-for-cros.patch | 35 -- ...-disable-installation-of-test-module.patch | 105 ------ .../0017-Add-an-option-to-disable-pydoc.patch | 89 ------ ...018-Add-an-option-to-disable-lib2to3.patch | 92 ------ ...option-to-disable-the-sqlite3-module.patch | 69 ---- ...d-an-option-to-disable-the-tk-module.patch | 73 ----- ...-option-to-disable-the-curses-module.patch | 61 ---- .../0022-Add-an-option-to-disable-expat.patch | 92 ------ ...-Add-an-option-to-disable-CJK-codecs.patch | 32 -- .../0024-Add-an-option-to-disable-NIS.patch | 35 -- ...Add-an-option-to-disable-unicodedata.patch | 32 -- .../0026-Add-an-option-to-disable-bsddb.patch | 87 ----- ...-an-option-to-disable-the-ssl-module.patch | 32 -- ...-an-option-to-disable-the-bz2-module.patch | 32 -- ...an-option-to-disable-the-zlib-module.patch | 32 -- .../0030-Do-not-install-the-idle-editor.patch | 55 ---- ...on-to-disable-the-ossaudiodev-module.patch | 32 -- ...option-to-disable-the-hashlib-module.patch | 32 -- ...an-option-to-disable-readline-module.patch | 32 -- ...locale-and-set-to-default-when-addin.patch | 37 --- package/python/Config.in.host | 16 - package/python/python.hash | 5 - package/python/python.mk | 302 ------------------ 37 files changed, 2301 deletions(-) delete mode 100644 package/python/0001-setup.py-do-not-add-invalid-header-locations.patch delete mode 100644 package/python/0002-Fix-get_python_inc-for-cross-compilation.patch delete mode 100644 package/python/0003-Change-the-install-location-of-_sysconfigdata.py.patch delete mode 100644 package/python/0004-Make-the-compilation-of-.pyc-and-.pyo-conditional.patch delete mode 100644 package/python/0005-Adjust-getaddrinfo-test-for-cross-compilation.patch delete mode 100644 package/python/0006-Add-minimal-infrastructure-to-be-able-to-disable-ext.patch delete mode 100644 package/python/0007-Adjust-library-header-paths-for-cross-compilation.patch delete mode 100644 package/python/0008-Don-t-look-in-usr-lib-termcap-for-libraries.patch delete mode 100644 package/python/0009-Fix-python-config-for-cross-builds.patch delete mode 100644 package/python/0010-Remove-the-python-symlink-install-rules.patch delete mode 100644 package/python/0011-Don-t-add-multiarch-paths.patch delete mode 100644 package/python/0012-Abort-on-failed-module-build.patch delete mode 100644 package/python/0013-sqlite3-fix-build-when-threads-are-not-used-availabl.patch delete mode 100644 package/python/0014-Serial-ioctl-workaround.patch delete mode 100644 package/python/0015-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch delete mode 100644 package/python/0016-Add-an-option-to-disable-installation-of-test-module.patch delete mode 100644 package/python/0017-Add-an-option-to-disable-pydoc.patch delete mode 100644 package/python/0018-Add-an-option-to-disable-lib2to3.patch delete mode 100644 package/python/0019-Add-option-to-disable-the-sqlite3-module.patch delete mode 100644 package/python/0020-Add-an-option-to-disable-the-tk-module.patch delete mode 100644 package/python/0021-Add-an-option-to-disable-the-curses-module.patch delete mode 100644 package/python/0022-Add-an-option-to-disable-expat.patch delete mode 100644 package/python/0023-Add-an-option-to-disable-CJK-codecs.patch delete mode 100644 package/python/0024-Add-an-option-to-disable-NIS.patch delete mode 100644 package/python/0025-Add-an-option-to-disable-unicodedata.patch delete mode 100644 package/python/0026-Add-an-option-to-disable-bsddb.patch delete mode 100644 package/python/0027-Add-an-option-to-disable-the-ssl-module.patch delete mode 100644 package/python/0028-Add-an-option-to-disable-the-bz2-module.patch delete mode 100644 package/python/0029-Add-an-option-to-disable-the-zlib-module.patch delete mode 100644 package/python/0030-Do-not-install-the-idle-editor.patch delete mode 100644 package/python/0031-Add-an-option-to-disable-the-ossaudiodev-module.patch delete mode 100644 package/python/0032-Add-option-to-disable-the-hashlib-module.patch delete mode 100644 package/python/0033-Add-an-option-to-disable-readline-module.patch delete mode 100644 package/python/0034-Override-system-locale-and-set-to-default-when-addin.patch delete mode 100644 package/python/Config.in.host delete mode 100644 package/python/python.hash delete mode 100644 package/python/python.mk diff --git a/package/python/0001-setup.py-do-not-add-invalid-header-locations.patch b/package/python/0001-setup.py-do-not-add-invalid-header-locations.patch deleted file mode 100644 index 3b2c9833e8..0000000000 --- a/package/python/0001-setup.py-do-not-add-invalid-header-locations.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 3dc31a435b67de2ba3dd3457f0c939e20b58e8de Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 22:17:06 +0100 -Subject: [PATCH] setup.py: do not add invalid header locations - -This piece of code incorrectly adds /usr/include to -self.compiler.include_dirs, and results in the following invalid -compilation line: - -/home/thomas/projets/buildroot/output/host/usr/bin/arm-none-linux-gnueabi-gcc -fPIC \ - -fno-strict-aliasing -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 \ - -pipe -Os -DNDEBUG -g -O3 -Wall -Wstrict-prototypes \ - -I/usr/include -I. -IInclude -I./Include \ - -I/home/thomas/projets/buildroot/output/host/usr/arm-buildroot-linux-gnueabi/sysroot/usr/include \ - -I/home/thomas/projets/buildroot/output/build/python-2.7.6/Include \ - -I/home/thomas/projets/buildroot/output/build/python-2.7.6 \ - -c /home/thomas/projets/buildroot/output/build/python-2.7.6/Modules/mathmodule.c \ - -o build/temp.linux2-arm-2.7/home/thomas/projets/buildroot/output/build/python-2.7.6/Modules/mathmodule.o -cc1: warning: include location "/usr/include" is unsafe for cross-compilation [-Wpoison-system-directories] -[...] - -Signed-off-by: Thomas Petazzoni ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 54054c2..64001e2 100644 ---- a/setup.py -+++ b/setup.py -@@ -496,7 +496,7 @@ class PyBuildExt(build_ext): - for directory in reversed(options.dirs): - add_dir_to_list(dir_list, directory) - -- if os.path.normpath(sys.prefix) != '/usr' \ -+ if False and os.path.normpath(sys.prefix) != '/usr' \ - and not sysconfig.get_config_var('PYTHONFRAMEWORK'): - # OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework - # (PYTHONFRAMEWORK is set) to avoid # linking problems when --- -2.7.4 - diff --git a/package/python/0002-Fix-get_python_inc-for-cross-compilation.patch b/package/python/0002-Fix-get_python_inc-for-cross-compilation.patch deleted file mode 100644 index 1fa4e92788..0000000000 --- a/package/python/0002-Fix-get_python_inc-for-cross-compilation.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 367ee7d103cf9f670c3925d555edf6f6a5b9d8d5 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 22:17:25 +0100 -Subject: [PATCH] Fix get_python_inc() for cross-compilation - -When we are cross compiling, doing os.path.dirname(sys.executable) to -get the build directory is incorrect, because we're executing the host -Python to build things for the target. Instead, we should use the -project_base variable. - -This fixes cross-compilation, which was adding incorrect header paths -pointing to the location where the host Python was built: - -/home/thomas/projets/buildroot/output/host/usr/bin/arm-none-linux-gnueabi-gcc -fPIC -fno-strict-aliasing \ - -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -pipe -Os -DNDEBUG -g -O3 -Wall -Wstrict-prototypes \ - -I/usr/include -I. -IInclude -I./Include -I/home/thomas/projets/buildroot/output/host/usr/arm-buildroot-linux-gnueabi/sysroot/usr/include \ - -I/home/thomas/projets/buildroot/output/host/usr/bin/Include -I/home/thomas/projets/buildroot/output/host/usr/bin \ - -c /home/thomas/projets/buildroot/output/build/python-2.7.6/Modules/_struct.c \ - -o build/temp.linux2-arm-2.7/home/thomas/projets/buildroot/output/build/python-2.7.6/Modules/_struct.o - -This patch allows to fix the -/home/thomas/projets/buildroot/output/host/usr/bin/Include and -/home/thomas/projets/buildroot/output/host/usr/bin paths that are -incorrectly added to the header paths. - -Signed-off-by: Thomas Petazzoni -[Asaf: update for 2.7.17] -Signed-off-by: Asaf Kahlon ---- - Lib/distutils/sysconfig.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py -index 1a4b792644..14c7d81c48 100644 ---- a/Lib/distutils/sysconfig.py -+++ b/Lib/distutils/sysconfig.py -@@ -85,7 +85,7 @@ def get_python_inc(plat_specific=0, prefix=None): - if os.name == "posix": - if python_build: - if sys.executable: -- buildir = os.path.dirname(sys.executable) -+ buildir = project_base - else: - # sys.executable can be empty if argv[0] has been changed - # and Python is unable to retrieve the real program name --- -2.20.1 - diff --git a/package/python/0003-Change-the-install-location-of-_sysconfigdata.py.patch b/package/python/0003-Change-the-install-location-of-_sysconfigdata.py.patch deleted file mode 100644 index 9e05af2e31..0000000000 --- a/package/python/0003-Change-the-install-location-of-_sysconfigdata.py.patch +++ /dev/null @@ -1,88 +0,0 @@ -From e3f3c454ec4992a2283640cef0a35da5a05fb399 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 22:17:59 +0100 -Subject: [PATCH] Change the install location of _sysconfigdata.py - -The _sysconfigdata.py module contains definitions that are needed when -building Python modules. In cross-compilation mode, when building -Python extensions for the target, we need to use the _sysconfigdata.py -of the target Python while executing the host Python. - -However until now, the _sysconfigdata.py module was installed in -build/lib.- directory, together with a number of -architecture-specific shared objects, which cannot be used with the -host Python. - -To solve this problem, this patch moves _sysconfigdata.py to a -separate location, build/sysconfigdata.-/, and only -this directory gets added to the PYTHONPATH of the host Python -interpreter when building Python modules for the target. - -Signed-off-by: Thomas Petazzoni -[Peter: update for 2.7.16] -Signed-off-by: Peter Korsgaard ---- - Makefile.pre.in | 12 ++++++++++-- - configure.ac | 2 +- - 2 files changed, 11 insertions(+), 3 deletions(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 9297e7fc89..49d3c0926f 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -509,6 +509,9 @@ pybuilddir.txt: $(BUILDPYTHON) - rm -f ./pybuilddir.txt ; \ - exit 1 ; \ - fi -+ echo `cat pybuilddir.txt`/sysconfigdata > pysysconfigdatadir.txt -+ mkdir -p `cat pysysconfigdatadir.txt` -+ cp `cat pybuilddir.txt`/_sysconfigdata.py `cat pysysconfigdatadir.txt` - - # This is shared by the math and cmath modules - Modules/_math.o: Modules/_math.c Modules/_math.h -@@ -1091,7 +1094,7 @@ libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c - else true; \ - fi; \ - done -- @for i in $(srcdir)/Lib/*.py `cat pybuilddir.txt`/_sysconfigdata.py $(srcdir)/Lib/*.doc $(srcdir)/Lib/*.egg-info ; \ -+ @for i in $(srcdir)/Lib/*.py $(srcdir)/Lib/*.doc $(srcdir)/Lib/*.egg-info ; \ - do \ - if test -x $$i; then \ - $(INSTALL_SCRIPT) $$i $(DESTDIR)$(LIBDEST); \ -@@ -1101,6 +1104,11 @@ libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c - echo $(INSTALL_DATA) $$i $(LIBDEST); \ - fi; \ - done -+ $(INSTALL_DATA) `cat pysysconfigdatadir.txt`/_sysconfigdata.py \ -+ $(DESTDIR)$(LIBDEST) -+ mkdir -p $(DESTDIR)$(LIBDEST)/sysconfigdata -+ $(INSTALL_DATA) `cat pysysconfigdatadir.txt`/_sysconfigdata.py \ -+ $(DESTDIR)$(LIBDEST)/sysconfigdata - @for d in $(LIBSUBDIRS); \ - do \ - a=$(srcdir)/Lib/$$d; \ -@@ -1426,7 +1434,7 @@ distclean: clobber - Modules/Setup Modules/Setup.local Modules/Setup.config \ - Modules/ld_so_aix Modules/python.exp Misc/python.pc - -rm -f python*-gdb.py -- -rm -f pybuilddir.txt -+ -rm -f pybuilddir.txt pysysconfigdatadir.txt - # Issue #28258: set LC_ALL to avoid issues with Estonian locale. - # Expansion is performed here by shell (spawned by make) itself before - # arguments are passed to find. So LC_ALL=C must be set as a separate -diff --git a/configure.ac b/configure.ac -index aecf6066e8..7143172b98 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -36,7 +36,7 @@ if test "$cross_compiling" = yes; then - AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found]) - fi - AC_MSG_RESULT($interp) -- PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/$(PLATDIR) '$interp -+ PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pysysconfigdatadir.txt && echo $(abs_builddir)/`cat pysysconfigdatadir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/$(PLATDIR) '$interp - fi - elif test "$cross_compiling" = maybe; then - AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH]) --- -2.11.0 - diff --git a/package/python/0004-Make-the-compilation-of-.pyc-and-.pyo-conditional.patch b/package/python/0004-Make-the-compilation-of-.pyc-and-.pyo-conditional.patch deleted file mode 100644 index ef1eb04046..0000000000 --- a/package/python/0004-Make-the-compilation-of-.pyc-and-.pyo-conditional.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 57ab41fa019d3ce276decd488938e5a00049cb9d Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 22:18:57 +0100 -Subject: [PATCH] Make the compilation of .pyc and .pyo conditional - -This commit adds --{enable,disable}-{pyc,pyo} options to enable/disable -the compilation of pyc/pyo files. - -Signed-off-by: Thomas Petazzoni -[Peter: update for 2.7.16] -Signed-off-by: Peter Korsgaard ---- - Makefile.pre.in | 8 ++++++++ - configure.ac | 11 +++++++++++ - 2 files changed, 19 insertions(+) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 49d3c0926f..247d3c2902 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -1139,24 +1139,32 @@ libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c - $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \ - $(DESTDIR)$(LIBDEST)/distutils/tests ; \ - fi -+ifeq (@PYC_BUILD@,yes) - PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - $(PYTHON_FOR_BUILD) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST) -f \ - -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ - $(DESTDIR)$(LIBDEST) -+endif -+ifeq (@PYO_BUILD@,yes) - PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - $(PYTHON_FOR_BUILD) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST) -f \ - -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ - $(DESTDIR)$(LIBDEST) -+endif -+ifeq (@PYC_BUILD@,yes) - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - $(PYTHON_FOR_BUILD) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST)/site-packages -f \ - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages -+endif -+ifeq (@PYO_BUILD@,yes) - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - $(PYTHON_FOR_BUILD) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST)/site-packages -f \ - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages -+endif - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - $(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 7143172b98..6bd8369105 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -773,6 +773,17 @@ SunOS*) - ;; - esac - -+AC_SUBST(PYC_BUILD) -+ -+AC_ARG_ENABLE(pyc-build, -+ AS_HELP_STRING([--disable-pyc-build], [disable build of pyc files]), -+ [ PYC_BUILD="${enableval}" ], [ PYC_BUILD=yes ]) -+ -+AC_SUBST(PYO_BUILD) -+ -+AC_ARG_ENABLE(pyo-build, -+ AS_HELP_STRING([--disable-pyo-build], [disable build of pyo files]), -+ [ PYO_BUILD="${enableval}" ], [ PYO_BUILD=yes ]) - - AC_SUBST(LIBRARY) - AC_MSG_CHECKING(LIBRARY) --- -2.11.0 - diff --git a/package/python/0005-Adjust-getaddrinfo-test-for-cross-compilation.patch b/package/python/0005-Adjust-getaddrinfo-test-for-cross-compilation.patch deleted file mode 100644 index c910ae7181..0000000000 --- a/package/python/0005-Adjust-getaddrinfo-test-for-cross-compilation.patch +++ /dev/null @@ -1,31 +0,0 @@ -From e674e29ceba34e55c9149ce99489e543aa4ebb01 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 22:19:47 +0100 -Subject: [PATCH] Adjust getaddrinfo() test for cross-compilation - -The getaddrinfo() test in configure.ac uses AC_RUN_IFELSE(), which isn't -cross-compilation friendly. - -Signed-off-by: Thomas Petazzoni -[Peter: update for 2.7.16] -Signed-off-by: Peter Korsgaard ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 6bd8369105..77ca6d86ca 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3563,7 +3563,7 @@ fi - - AC_MSG_RESULT($ac_cv_buggy_getaddrinfo) - --if test $have_getaddrinfo = no -o "$ac_cv_buggy_getaddrinfo" = yes -+if test $have_getaddrinfo = no || test "$cross_compiling" != "yes" -a "$ac_cv_buggy_getaddrinfo" = yes - then - if test $ipv6 = yes - then --- -2.11.0 - diff --git a/package/python/0006-Add-minimal-infrastructure-to-be-able-to-disable-ext.patch b/package/python/0006-Add-minimal-infrastructure-to-be-able-to-disable-ext.patch deleted file mode 100644 index b1a20eb04e..0000000000 --- a/package/python/0006-Add-minimal-infrastructure-to-be-able-to-disable-ext.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 94ec96dd8827adfb5e272d28a4d76510e28657b3 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 22:21:28 +0100 -Subject: [PATCH] Add minimal infrastructure to be able to disable extensions - -This commit adds some logic to the Python build system to be able to -disable Python extensions. Follow-up commits actually add options to -disable specific extensions. - -Signed-off-by: Thomas Petazzoni -[Peter: update for 2.7.16] -Signed-off-by: Peter Korsgaard ---- - Makefile.pre.in | 6 +++++- - configure.ac | 2 ++ - setup.py | 5 ++++- - 3 files changed, 11 insertions(+), 2 deletions(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 247d3c2902..c1c98ecc5a 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -160,6 +160,8 @@ FILEMODE= 644 - # configure script arguments - CONFIG_ARGS= @CONFIG_ARGS@ - -+# disabled extensions -+DISABLED_EXTENSIONS= @DISABLED_EXTENSIONS@ - - # Subdirectories with code - SRCDIRS= @SRCDIRS@ -@@ -528,6 +530,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o - esac; \ - $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ - _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \ -+ DISABLED_EXTENSIONS="$(DISABLED_EXTENSIONS)" \ - $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build - - # Build static library -@@ -1280,7 +1283,8 @@ libainstall: @DEF_MAKE_RULE@ python-config - # Install the dynamically loadable modules - # This goes into $(exec_prefix) - sharedinstall: sharedmods -- $(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \ -+ $(RUNSHARED) DISABLED_EXTENSIONS="$(DISABLED_EXTENSIONS)" \ -+ $(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \ - --prefix=$(prefix) \ - --install-scripts=$(BINDIR) \ - --install-platlib=$(DESTSHARED) \ -diff --git a/configure.ac b/configure.ac -index 77ca6d86ca..13f90b3ddd 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2491,6 +2491,8 @@ LIBS="$withval $LIBS" - - PKG_PROG_PKG_CONFIG - -+AC_SUBST(DISABLED_EXTENSIONS) -+ - # Check for use of the system expat library - AC_MSG_CHECKING(for --with-system-expat) - AC_ARG_WITH(system_expat, -diff --git a/setup.py b/setup.py -index 812d53d560..d426dd02ea 100644 ---- a/setup.py -+++ b/setup.py -@@ -33,7 +33,10 @@ host_platform = get_platform() - COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS")) - - # This global variable is used to hold the list of modules to be disabled. --disabled_module_list = [] -+try: -+ disabled_module_list = sysconfig.get_config_var("DISABLED_EXTENSIONS").split(" ") -+except KeyError: -+ disabled_module_list = list() - - def add_dir_to_list(dirlist, dir): - """Add the directory 'dir' to the list 'dirlist' (at the front) if --- -2.11.0 - diff --git a/package/python/0007-Adjust-library-header-paths-for-cross-compilation.patch b/package/python/0007-Adjust-library-header-paths-for-cross-compilation.patch deleted file mode 100644 index c68f1bf7f2..0000000000 --- a/package/python/0007-Adjust-library-header-paths-for-cross-compilation.patch +++ /dev/null @@ -1,64 +0,0 @@ -From f3e0a677c4736f95338825a022a884f8dc7a5c14 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 22:22:19 +0100 -Subject: [PATCH] Adjust library/header paths for cross-compilation - -When cross-compiling third-party extensions, the get_python_inc() or -get_python_lib() can be called, to return the path to headers or -libraries. However, they use the sys.prefix of the host Python, which -returns incorrect paths when cross-compiling (paths pointing to host -headers and libraries). - -In order to fix this, we introduce the _python_sysroot, _python_prefix -and _python_exec_prefix variables, that allow to override these -values, and get correct header/library paths when cross-compiling -third-party Python modules. - -The _python_sysroot variable is also used to prefix the LIBDIR value -taken from the sysconfigdata module. - -Signed-off-by: Thomas Petazzoni ---- - Lib/distutils/command/build_ext.py | 5 ++++- - Lib/distutils/sysconfig.py | 9 +++++++-- - 2 files changed, 11 insertions(+), 3 deletions(-) - -diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py -index 2c68be3..375b08c 100644 ---- a/Lib/distutils/command/build_ext.py -+++ b/Lib/distutils/command/build_ext.py -@@ -240,7 +240,10 @@ class build_ext (Command): - if (sysconfig.get_config_var('Py_ENABLE_SHARED')): - if not sysconfig.python_build: - # building third party extensions -- self.library_dirs.append(sysconfig.get_config_var('LIBDIR')) -+ libdir = sysconfig.get_config_var('LIBDIR') -+ if "_python_sysroot" in os.environ: -+ libdir = os.environ.get("_python_sysroot") + libdir -+ self.library_dirs.append(libdir) - else: - # building python standard extensions - self.library_dirs.append('.') -diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py -index d72b6e5..72151df 100644 ---- a/Lib/distutils/sysconfig.py -+++ b/Lib/distutils/sysconfig.py -@@ -19,8 +19,13 @@ import sys - from distutils.errors import DistutilsPlatformError - - # These are needed in a couple of spots, so just compute them once. --PREFIX = os.path.normpath(sys.prefix) --EXEC_PREFIX = os.path.normpath(sys.exec_prefix) -+if "_python_sysroot" in os.environ: -+ _sysroot=os.environ.get('_python_sysroot') -+ PREFIX = os.path.normpath(_sysroot + os.environ.get('_python_prefix')) -+ EXEC_PREFIX = os.path.normpath(_sysroot + os.environ.get('_python_exec_prefix')) -+else: -+ PREFIX = os.path.normpath(sys.prefix) -+ EXEC_PREFIX = os.path.normpath(sys.exec_prefix) - - # Path to the base directory of the project. On Windows the binary may - # live in project/PCBuild9. If we're dealing with an x64 Windows build, --- -2.7.4 - diff --git a/package/python/0008-Don-t-look-in-usr-lib-termcap-for-libraries.patch b/package/python/0008-Don-t-look-in-usr-lib-termcap-for-libraries.patch deleted file mode 100644 index d523b74638..0000000000 --- a/package/python/0008-Don-t-look-in-usr-lib-termcap-for-libraries.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 87b627d8845e67fd798449b414bece04f18bd450 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 22:22:40 +0100 -Subject: [PATCH] Don't look in /usr/lib/termcap for libraries - -Signed-off-by: Thomas Petazzoni ---- - setup.py | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/setup.py b/setup.py -index 3b51c0a..fa32532 100644 ---- a/setup.py -+++ b/setup.py -@@ -784,12 +784,9 @@ class PyBuildExt(build_ext): - pass # Issue 7384: Already linked against curses or tinfo. - elif curses_library: - readline_libs.append(curses_library) -- elif self.compiler.find_library_file(lib_dirs + -- ['/usr/lib/termcap'], -- 'termcap'): -+ elif self.compiler.find_library_file(lib_dirs, 'termcap'): - readline_libs.append('termcap') - exts.append( Extension('readline', ['readline.c'], -- library_dirs=['/usr/lib/termcap'], - extra_link_args=readline_extra_link_args, - libraries=readline_libs) ) - else: --- -2.7.4 - diff --git a/package/python/0009-Fix-python-config-for-cross-builds.patch b/package/python/0009-Fix-python-config-for-cross-builds.patch deleted file mode 100644 index 3cf8797c03..0000000000 --- a/package/python/0009-Fix-python-config-for-cross-builds.patch +++ /dev/null @@ -1,229 +0,0 @@ -From 1522c6c00ee88eb1148d3b2021d32d819b416375 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Tue, 7 Mar 2017 22:23:14 +0100 -Subject: [PATCH] Fix python-config for cross-builds - -Add a backport of http://bugs.python.org/issue16235 so we can use -python-config for cross builds. - -This basically replaces the python version of python-config with a -pure-shell version that's already preprocessed when installed and -doesn't depend on the sysconfig import that usually leads to bad -data/results. - -Signed-off-by: Gustavo Zacarias -[Bernd: rebased for Python 2.7.15] -Signed-off-by: Bernd Kuhls -[Peter: update for 2.7.16] -Signed-off-by: Peter Korsgaard ---- - Makefile.pre.in | 13 +++--- - Misc/python-config.sh.in | 102 +++++++++++++++++++++++++++++++++++++++++++++++ - configure.ac | 7 +++- - 3 files changed, 116 insertions(+), 6 deletions(-) - create mode 100644 Misc/python-config.sh.in - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index c1c98ecc5a..727a92af42 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -170,7 +170,7 @@ SRCDIRS= @SRCDIRS@ - SUBDIRSTOO= Include Lib Misc Demo - - # Files and directories to be distributed --CONFIGFILES= configure configure.ac acconfig.h pyconfig.h.in Makefile.pre.in -+CONFIGFILES= configure configure.ac acconfig.h pyconfig.h.in Makefile.pre.in Misc/python-config.sh - DISTFILES= README ChangeLog $(CONFIGFILES) - DISTDIRS= $(SUBDIRS) $(SUBDIRSTOO) Ext-dummy - DIST= $(DISTFILES) $(DISTDIRS) -@@ -403,7 +403,7 @@ LIBRARY_OBJS= \ - - # Default target - all: @DEF_MAKE_ALL_RULE@ --build_all: check-clean-src $(BUILDPYTHON) oldsharedmods sharedmods gdbhooks -+build_all: check-clean-src $(BUILDPYTHON) oldsharedmods sharedmods gdbhooks python-config - - # Check that the source is clean when building out of source. - check-clean-src: -@@ -1190,10 +1190,12 @@ $(srcdir)/Lib/$(PLATDIR): - fi; \ - cd $(srcdir)/Lib/$(PLATDIR); $(RUNSHARED) ./regen - --python-config: $(srcdir)/Misc/python-config.in -+python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh - # Substitution happens here, as the completely-expanded BINDIR - # is not available in configure -- sed -e "s, at EXENAME@,$(BINDIR)/python$(VERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config -+ sed -e "s, at EXENAME@,$(BINDIR)/python$(VERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config.py -+ # Replace makefile compat. variable references with shell script compat. ones; $(VAR) -> ${VAR} -+ sed -e 's,\$$(\([A-Za-z0-9_]*\)),\$$\{\1\},g' Misc/python-config.sh >python-config - - # Install the include files - INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY) -@@ -1252,7 +1254,7 @@ libainstall: @DEF_MAKE_RULE@ python-config - $(INSTALL_SCRIPT) $(srcdir)/Modules/makesetup $(DESTDIR)$(LIBPL)/makesetup - $(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh - $(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(VERSION)-config -- rm python-config -+ $(INSTALL_SCRIPT) python-config.py $(DESTDIR)$(LIBPL)/python-config.py - @if [ -s Modules/python.exp -a \ - "`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \ - echo; echo "Installing support files for building shared extension modules on AIX:"; \ -@@ -1434,6 +1436,7 @@ clobber: clean profile-removal - config.cache config.log pyconfig.h Modules/config.c - -rm -rf build platform - -rm -rf $(PYTHONFRAMEWORKDIR) -+ -rm -f python-config.py python-config - - # Make things extra clean, before making a distribution: - # remove all generated files, even Makefile[.pre] -diff --git a/Misc/python-config.sh.in b/Misc/python-config.sh.in -new file mode 100644 -index 0000000000..10db4c12eb ---- /dev/null -+++ b/Misc/python-config.sh.in -@@ -0,0 +1,102 @@ -+#!/bin/sh -+ -+exit_with_usage () -+{ -+ echo "Usage: $0 --prefix|--exec-prefix|--includes|--libs|--cflags|--ldflags|--extension-suffix|--help|--configdir" -+ exit $1 -+} -+ -+if [ "$1" = "" ] ; then -+ exit_with_usage 1 -+fi -+ -+# Returns the actual prefix where this script was installed to. -+installed_prefix () -+{ -+ RESULT=$(dirname $(cd $(dirname "$1") && pwd -P)) -+ if which readlink >/dev/null 2>&1 ; then -+ RESULT=$(readlink -f "$RESULT") -+ fi -+ echo $RESULT -+} -+ -+prefix_build="@prefix@" -+prefix_real=$(installed_prefix "$0") -+ -+# Use sed to fix paths from their built to locations to their installed to locations. -+prefix=$(echo "$prefix_build" | sed "s#$prefix_build#$prefix_real#") -+exec_prefix_build="@exec_prefix@" -+exec_prefix=$(echo "$exec_prefix_build" | sed "s#$exec_prefix_build#$prefix_real#") -+includedir=$(echo "@includedir@") -+libdir=$(echo "@libdir@" | sed "s#$prefix_build#$prefix_real#") -+CFLAGS=$(echo "@CFLAGS@" | sed "s#$prefix_build#$prefix_real#") -+VERSION="@VERSION@" -+LIBM="@LIBM@" -+LIBC="@LIBC@" -+SYSLIBS="$LIBM $LIBC" -+LIBS="@LIBS@ $SYSLIBS -lpython${VERSION}" -+BASECFLAGS="@BASECFLAGS@" -+LDLIBRARY="@LDLIBRARY@" -+LINKFORSHARED="@LINKFORSHARED@" -+OPT="@OPT@" -+PY_ENABLE_SHARED="@PY_ENABLE_SHARED@" -+LDVERSION="@LDVERSION@" -+LIBDEST=${prefix}/lib/python${VERSION} -+LIBPL=$(echo "@LIBPL@" | sed "s#$prefix_build#$prefix_real#") -+SO="@SO@" -+PYTHONFRAMEWORK="@PYTHONFRAMEWORK@" -+INCDIR="-I$includedir/python${VERSION}" -+PLATINCDIR="-I$includedir/python${VERSION}" -+ -+# Scan for --help or unknown argument. -+for ARG in $* -+do -+ case $ARG in -+ --help) -+ exit_with_usage 0 -+ ;; -+ --prefix|--exec-prefix|--includes|--libs|--cflags|--ldflags|--extension-suffix|--abiflags|--configdir) -+ ;; -+ *) -+ exit_with_usage 1 -+ ;; -+esac -+done -+ -+for ARG in "$@" -+do -+ case "$ARG" in -+ --prefix) -+ echo "$prefix" -+ ;; -+ --exec-prefix) -+ echo "$exec_prefix" -+ ;; -+ --includes) -+ echo "$INCDIR $PLATINCDIR" -+ ;; -+ --cflags) -+ echo "$INCDIR $PLATINCDIR $BASECFLAGS $CFLAGS $OPT" -+ ;; -+ --libs) -+ echo "$LIBS" -+ ;; -+ --ldflags) -+ LINKFORSHAREDUSED= -+ if [ -z "$PYTHONFRAMEWORK" ] ; then -+ LINKFORSHAREDUSED=$LINKFORSHARED -+ fi -+ LIBPLUSED= -+ if [ "$PY_ENABLE_SHARED" = "0" ] ; then -+ LIBPLUSED="-L$LIBPL" -+ fi -+ echo "$LIBPLUSED -L$libdir $LIBS $LINKFORSHAREDUSED" -+ ;; -+ --extension-suffix) -+ echo "$SO" -+ ;; -+ --configdir) -+ echo "$LIBPL" -+ ;; -+esac -+done -diff --git a/configure.ac b/configure.ac -index 13f90b3ddd..3f28ef1371 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -919,6 +919,7 @@ fi - - # Other platforms follow - if test $enable_shared = "yes"; then -+ PY_ENABLE_SHARED=1 - AC_DEFINE(Py_ENABLE_SHARED, 1, [Defined if Python is built as a shared library.]) - case $ac_sys_system in - BeOS*) -@@ -979,6 +980,7 @@ if test $enable_shared = "yes"; then - - esac - else # shared is disabled -+ PY_ENABLE_SHARED=0 - case $ac_sys_system in - CYGWIN*) - BLDLIBRARY='$(LIBRARY)' -@@ -2128,6 +2130,9 @@ AC_SUBST(LDCXXSHARED) - AC_SUBST(BLDSHARED) - AC_SUBST(CCSHARED) - AC_SUBST(LINKFORSHARED) -+AC_SUBST(PY_ENABLE_SHARED) -+LIBPL="${prefix}/lib/python${VERSION}/config" -+AC_SUBST(LIBPL) - # SO is the extension of shared libraries `(including the dot!) - # -- usually .so, .sl on HP-UX, .dll on Cygwin - AC_MSG_CHECKING(SO) -@@ -4944,7 +4949,7 @@ AC_MSG_RESULT($ENSUREPIP) - AC_SUBST(ENSUREPIP) - - # generate output files --AC_CONFIG_FILES(Makefile.pre Modules/Setup.config Misc/python.pc) -+AC_CONFIG_FILES(Makefile.pre Modules/Setup.config Misc/python.pc Misc/python-config.sh) - AC_CONFIG_FILES([Modules/ld_so_aix], [chmod +x Modules/ld_so_aix]) - AC_OUTPUT - --- -2.11.0 - diff --git a/package/python/0010-Remove-the-python-symlink-install-rules.patch b/package/python/0010-Remove-the-python-symlink-install-rules.patch deleted file mode 100644 index 4a2116b1b0..0000000000 --- a/package/python/0010-Remove-the-python-symlink-install-rules.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 706d62599fb3c3cb9b9941364aaf4a1ef4ebd276 Mon Sep 17 00:00:00 2001 -From: Samuel Martin -Date: Tue, 7 Mar 2017 22:23:58 +0100 -Subject: [PATCH] Remove the python symlink install rules - -The python symlink installation will be handled by Buildroot itself, -because Buildroot needs to control to what python interpreter (python2 -or python3) the python symlink points to. - -Signed-off-by: Samuel Martin -[Bernd: rebased against version 2.7.12.] -Signed-off-by: Bernd Kuhls -[Peter: update for 2.7.16] -Signed-off-by: Peter Korsgaard ---- - Makefile.pre.in | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 727a92af42..37b2ff3a5f 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -978,17 +978,10 @@ bininstall: altbininstall - echo "Creating directory $(LIBPC)"; \ - $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(LIBPC); \ - fi -- -if test -f $(DESTDIR)$(BINDIR)/$(PYTHON) -o -h $(DESTDIR)$(BINDIR)/$(PYTHON); \ -- then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON); \ -- else true; \ -- fi -- (cd $(DESTDIR)$(BINDIR); $(LN) -s python2$(EXE) $(PYTHON)) - -rm -f $(DESTDIR)$(BINDIR)/python2$(EXE) - (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(EXE) python2$(EXE)) - -rm -f $(DESTDIR)$(BINDIR)/python2-config - (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python2-config) -- -rm -f $(DESTDIR)$(BINDIR)/python-config -- (cd $(DESTDIR)$(BINDIR); $(LN) -s python2-config python-config) - -test -d $(DESTDIR)$(LIBPC) || $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(LIBPC) - -rm -f $(DESTDIR)$(LIBPC)/python2.pc - (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python2.pc) --- -2.11.0 - diff --git a/package/python/0011-Don-t-add-multiarch-paths.patch b/package/python/0011-Don-t-add-multiarch-paths.patch deleted file mode 100644 index b84c9077c9..0000000000 --- a/package/python/0011-Don-t-add-multiarch-paths.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 50a243a9c90f95e9248ac720e42e802b5922ab90 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 22:24:28 +0100 -Subject: [PATCH] Don't add multiarch paths - -The add_multiarch_paths() function leads, in certain build -environments, to the addition of host header paths to the CFLAGS, -which is not appropriate for cross-compilation. This patch fixes that -by simply removing the call to add_multiarch_paths() when we're -cross-compiling. - -Investigation done by David . - -Signed-off-by: Thomas Petazzoni ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index fa32532..0b9ea57 100644 ---- a/setup.py -+++ b/setup.py -@@ -461,9 +461,9 @@ 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') -+ self.add_multiarch_paths() - if cross_compiling: - self.add_gcc_paths() -- self.add_multiarch_paths() - - # Add paths specified in the environment variables LDFLAGS and - # CPPFLAGS for header and library files. --- -2.7.4 - diff --git a/package/python/0012-Abort-on-failed-module-build.patch b/package/python/0012-Abort-on-failed-module-build.patch deleted file mode 100644 index 7d952ca5c2..0000000000 --- a/package/python/0012-Abort-on-failed-module-build.patch +++ /dev/null @@ -1,30 +0,0 @@ -From a131e2ff219872d97eef6585117bd2f8ff9e310d Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 22:24:48 +0100 -Subject: [PATCH] Abort on failed module build - -When building a Python module fails, the setup.py script currently -doesn't exit with an error, and simply continues. This is not a really -nice behavior, so this patch changes setup.py to abort with an error, -so that the build issue is clearly noticeable. - -Signed-off-by: Thomas Petazzoni ---- - setup.py | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/setup.py b/setup.py -index 0b9ea57..9a5c2b8 100644 ---- a/setup.py -+++ b/setup.py -@@ -299,6 +299,7 @@ class PyBuildExt(build_ext): - print "Failed to build these modules:" - print_three_column(failed) - print -+ sys.exit(1) - - def build_extension(self, ext): - --- -2.7.4 - diff --git a/package/python/0013-sqlite3-fix-build-when-threads-are-not-used-availabl.patch b/package/python/0013-sqlite3-fix-build-when-threads-are-not-used-availabl.patch deleted file mode 100644 index dfc11efc7e..0000000000 --- a/package/python/0013-sqlite3-fix-build-when-threads-are-not-used-availabl.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 0f0be88526ece7d2f6ee21c1f59b1546ec6dc7c0 Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Tue, 7 Mar 2017 22:25:14 +0100 -Subject: [PATCH] sqlite3: fix build when threads are not used/available - -When threads are not used/available, a function in the sqlite3 extension -ends up with a label at the end: - - void _pysqlite_final_callback(sqlite3_context* context) - { - PyObject* function_result; - PyObject** aggregate_instance; - int ok; - - #ifdef WITH_THREAD - PyGILState_STATE threadstate; - - threadstate = PyGILState_Ensure(); - #endif - - aggregate_instance = (PyObject**)sqlite3_aggregate_context(context, sizeof(PyObject*)); - if (!*aggregate_instance) { - goto error; - } - - [......] - - error: - #ifdef WITH_THREAD - PyGILState_Release(threadstate); - #endif - } - -This is not valid, and gcc complains. - -Fix that by adding a dummy statement after the label, so that the label -is never the last statement of the function. - -Signed-off-by: "Yann E. MORIN" ---- - Modules/_sqlite/connection.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c -index 237d6e4..cdf69ab 100644 ---- a/Modules/_sqlite/connection.c -+++ b/Modules/_sqlite/connection.c -@@ -794,6 +794,7 @@ error: - #ifdef WITH_THREAD - PyGILState_Release(threadstate); - #endif -+ ; /* Make gcc happy: a label can't be at the end of a function */ - } - - static void _pysqlite_drop_unused_statement_references(pysqlite_Connection* self) --- -2.7.4 - diff --git a/package/python/0014-Serial-ioctl-workaround.patch b/package/python/0014-Serial-ioctl-workaround.patch deleted file mode 100644 index 468d535ac3..0000000000 --- a/package/python/0014-Serial-ioctl-workaround.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 22e5a4c5d29ddf0856d7f68f5a613aec00e26168 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Tue, 7 Mar 2017 22:25:36 +0100 -Subject: [PATCH] Serial ioctl() workaround - -The ioctls.h of some architectures (notably xtensa) references structs from -linux/serial.h. Make sure to include this header as well. - -Also, undef TIOCTTYGSTRUCT that require reference to internal kernel tty_struct, -but isn't actually referenced in modern kernels. - -Signed-off-by: Baruch Siach ---- - Modules/termios.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Modules/termios.c b/Modules/termios.c -index 57f30dc..a8c9855 100644 ---- a/Modules/termios.c -+++ b/Modules/termios.c -@@ -16,7 +16,9 @@ - * so this needs to be included first on that platform. */ - #include - #endif -+#include - #include -+#undef TIOCTTYGSTRUCT - - /* HP-UX requires that this be included to pick up MDCD, MCTS, MDSR, - * MDTR, MRI, and MRTS (appearantly used internally by some things --- -2.7.4 - diff --git a/package/python/0015-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch b/package/python/0015-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch deleted file mode 100644 index fecf29f4d6..0000000000 --- a/package/python/0015-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 70049366ddf1fc9084bb02cf4459380976cdf8f7 Mon Sep 17 00:00:00 2001 -From: Christophe Vu-Brugier -Date: Tue, 7 Mar 2017 22:26:09 +0100 -Subject: [PATCH] Do not adjust the shebang of Python scripts for - cross-compilation - -The copy_scripts() method in distutils copies the scripts listed in -the setup file and adjusts the first line to refer to the current -Python interpreter. When cross-compiling, this means that the adjusted -shebang refers to the host Python interpreter. - -This patch modifies copy_scripts() to preserve the shebang when -cross-compilation is detected. - -Signed-off-by: Christophe Vu-Brugier ---- - Lib/distutils/command/build_scripts.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Lib/distutils/command/build_scripts.py b/Lib/distutils/command/build_scripts.py -index 567df65..4922d50 100644 ---- a/Lib/distutils/command/build_scripts.py -+++ b/Lib/distutils/command/build_scripts.py -@@ -89,7 +89,7 @@ class build_scripts (Command): - adjust = 1 - post_interp = match.group(1) or '' - -- if adjust: -+ if adjust and not '_python_sysroot' in os.environ: - log.info("copying and adjusting %s -> %s", script, - self.build_dir) - if not self.dry_run: --- -2.7.4 - diff --git a/package/python/0016-Add-an-option-to-disable-installation-of-test-module.patch b/package/python/0016-Add-an-option-to-disable-installation-of-test-module.patch deleted file mode 100644 index 600fc40b69..0000000000 --- a/package/python/0016-Add-an-option-to-disable-installation-of-test-module.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 2c1810fb002128a6d33cc3a391a157e316479d15 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 22:27:16 +0100 -Subject: [PATCH] Add an option to disable installation of test modules - -The Python standard distribution comes with many test modules, that -are not necessarly useful on embedded targets. - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Samuel Martin -[Bernd: rebased against version 2.7.14] -Signed-off-by: Bernd Kuhls -[Peter: update for 2.7.16] -Signed-off-by: Peter Korsgaard ---- - Makefile.pre.in | 50 +++++++++++++++++++++++++++++++++----------------- - configure.ac | 6 ++++++ - 2 files changed, 39 insertions(+), 17 deletions(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 37b2ff3a5f..2a5e8adc61 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -1048,28 +1048,44 @@ PLATMACDIRS= plat-mac plat-mac/Carbon plat-mac/lib-scriptpackages \ - plat-mac/lib-scriptpackages/SystemEvents \ - plat-mac/lib-scriptpackages/Terminal - PLATMACPATH=:plat-mac:plat-mac/lib-scriptpackages --LIBSUBDIRS= lib-tk lib-tk/test lib-tk/test/test_tkinter \ -- lib-tk/test/test_ttk site-packages test test/audiodata test/capath \ -- test/data test/cjkencodings test/decimaltestdata test/xmltestdata \ -- test/imghdrdata \ -- test/subprocessdata \ -- test/support \ -- test/tracedmodules \ -+LIBSUBDIRS= lib-tk site-packages \ - encodings compiler hotshot \ -- email email/mime email/test email/test/data \ -+ email email/mime \ - ensurepip ensurepip/_bundled \ -- json json/tests \ -- sqlite3 sqlite3/test \ -- logging bsddb bsddb/test csv importlib wsgiref \ -- lib2to3 lib2to3/fixes lib2to3/pgen2 lib2to3/tests \ -- lib2to3/tests/data lib2to3/tests/data/fixers lib2to3/tests/data/fixers/myfixes \ -- ctypes ctypes/test ctypes/macholib \ -- idlelib idlelib/Icons idlelib/idle_test \ -- distutils distutils/command distutils/tests $(XMLLIBSUBDIRS) \ -+ json \ -+ sqlite3 \ -+ logging bsddb csv importlib wsgiref \ -+ lib2to3 lib2to3/fixes lib2to3/pgen2 \ -+ ctypes ctypes/macholib \ -+ idlelib idlelib/Icons \ -+ distutils distutils/command $(XMLLIBSUBDIRS) \ - multiprocessing multiprocessing/dummy \ -- unittest unittest/test \ -+ unittest \ - lib-old \ - curses pydoc_data $(MACHDEPS) -+ -+TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \ -+ lib-tk/test/test_ttk test test/audiodata test/capath test/data \ -+ test/cjkencodings test/decimaltestdata test/xmltestdata \ -+ test/imghdrdata \ -+ test/subprocessdata \ -+ test/support \ -+ test/tracedmodules \ -+ email/test email/test/data \ -+ json/tests \ -+ sqlite3/test \ -+ bsddb/test \ -+ lib2to3/tests \ -+ lib2to3/tests/data lib2to3/tests/data/fixers lib2to3/tests/data/fixers/myfixes \ -+ ctypes/test \ -+ idlelib/idle_test \ -+ distutils/tests \ -+ unittest/test -+ -+ifeq (@TEST_MODULES@,yes) -+LIBSUBDIRS += $(TESTSUBDIRS) -+endif -+ - libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c - @for i in $(SCRIPTDIR) $(LIBDEST); \ - do \ -diff --git a/configure.ac b/configure.ac -index 3f28ef1371..f257a25620 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2835,6 +2835,12 @@ if test "$posix_threads" = "yes"; then - fi - - -+AC_SUBST(TEST_MODULES) -+ -+AC_ARG_ENABLE(test-modules, -+ AS_HELP_STRING([--disable-test-modules], [disable test modules]), -+ [ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ]) -+ - # Check for enable-ipv6 - AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified]) - AC_MSG_CHECKING([if --enable-ipv6 is specified]) --- -2.11.0 - diff --git a/package/python/0017-Add-an-option-to-disable-pydoc.patch b/package/python/0017-Add-an-option-to-disable-pydoc.patch deleted file mode 100644 index 48c1b570df..0000000000 --- a/package/python/0017-Add-an-option-to-disable-pydoc.patch +++ /dev/null @@ -1,89 +0,0 @@ -From f98c3f981643411449aba6f93178b2ca14f9a68c Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 22:27:34 +0100 -Subject: [PATCH] Add an option to disable pydoc - -It removes 0.5 MB of data from the target plus the pydoc script -itself. - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Samuel Martin -[Peter: update for 2.7.16] -Signed-off-by: Peter Korsgaard ---- - Makefile.pre.in | 6 +++++- - configure.ac | 5 +++++ - setup.py | 10 +++++++--- - 3 files changed, 17 insertions(+), 4 deletions(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 2a5e8adc61..d3ba1aeb4e 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -1062,7 +1062,7 @@ LIBSUBDIRS= lib-tk site-packages \ - multiprocessing multiprocessing/dummy \ - unittest \ - lib-old \ -- curses pydoc_data $(MACHDEPS) -+ curses $(MACHDEPS) - - TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \ - lib-tk/test/test_ttk test test/audiodata test/capath test/data \ -@@ -1086,6 +1086,10 @@ ifeq (@TEST_MODULES@,yes) - LIBSUBDIRS += $(TESTSUBDIRS) - endif - -+ifeq (@PYDOC@,yes) -+LIBSUBDIRS += pydoc_data -+endif -+ - libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c - @for i in $(SCRIPTDIR) $(LIBDEST); \ - do \ -diff --git a/configure.ac b/configure.ac -index f257a25620..2ed4119478 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2834,6 +2834,11 @@ if test "$posix_threads" = "yes"; then - AC_CHECK_FUNCS(pthread_atfork) - fi - -+AC_SUBST(PYDOC) -+ -+AC_ARG_ENABLE(pydoc, -+ AS_HELP_STRING([--disable-pydoc], [disable pydoc]), -+ [ PYDOC="${enableval}" ], [ PYDOC=yes ]) - - AC_SUBST(TEST_MODULES) - -diff --git a/setup.py b/setup.py -index 2ef5b07189..49f810f72e 100644 ---- a/setup.py -+++ b/setup.py -@@ -2277,6 +2277,12 @@ def main(): - # turn off warnings when deprecated modules are imported - import warnings - warnings.filterwarnings("ignore",category=DeprecationWarning) -+ -+ scripts = ['Tools/scripts/idle', 'Tools/scripts/2to3', -+ 'Lib/smtpd.py'] -+ if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"): -+ scripts += [ 'Tools/scripts/pydoc' ] -+ - setup(# PyPI Metadata (PEP 301) - name = "Python", - version = sys.version.split()[0], -@@ -2297,9 +2303,7 @@ def main(): - ext_modules=[Extension('_struct', ['_struct.c'])], - - # Scripts to install -- scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle', -- 'Tools/scripts/2to3', -- 'Lib/smtpd.py'] -+ scripts = scripts, - ) - - # --install-platlib --- -2.11.0 - diff --git a/package/python/0018-Add-an-option-to-disable-lib2to3.patch b/package/python/0018-Add-an-option-to-disable-lib2to3.patch deleted file mode 100644 index 2c539fac35..0000000000 --- a/package/python/0018-Add-an-option-to-disable-lib2to3.patch +++ /dev/null @@ -1,92 +0,0 @@ -From d7f419246681e12f05e2eefc79286959c6aa18ab Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 22:27:49 +0100 -Subject: [PATCH] Add an option to disable lib2to3 - -lib2to3 is a library to convert Python 2.x code to Python 3.x. As -such, it is probably not very useful on embedded system targets. - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Samuel Martin -[Peter: update for 2.7.16] -Signed-off-by: Peter Korsgaard ---- - Makefile.pre.in | 11 ++++++++--- - configure.ac | 6 ++++++ - setup.py | 5 +++-- - 3 files changed, 17 insertions(+), 5 deletions(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index d3ba1aeb4e..0e15b6d6f4 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -1055,7 +1055,6 @@ LIBSUBDIRS= lib-tk site-packages \ - json \ - sqlite3 \ - logging bsddb csv importlib wsgiref \ -- lib2to3 lib2to3/fixes lib2to3/pgen2 \ - ctypes ctypes/macholib \ - idlelib idlelib/Icons \ - distutils distutils/command $(XMLLIBSUBDIRS) \ -@@ -1075,8 +1074,6 @@ TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \ - json/tests \ - sqlite3/test \ - bsddb/test \ -- lib2to3/tests \ -- lib2to3/tests/data lib2to3/tests/data/fixers lib2to3/tests/data/fixers/myfixes \ - ctypes/test \ - idlelib/idle_test \ - distutils/tests \ -@@ -1090,6 +1087,14 @@ ifeq (@PYDOC@,yes) - LIBSUBDIRS += pydoc_data - endif - -+ifeq (@LIB2TO3@,yes) -+LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2 -+TESTSUBDIRS += lib2to3/tests \ -+ lib2to3/tests/data \ -+ lib2to3/tests/data/fixers \ -+ lib2to3/tests/data/fixers/myfixes -+endif -+ - libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c - @for i in $(SCRIPTDIR) $(LIBDEST); \ - do \ -diff --git a/configure.ac b/configure.ac -index 2ed4119478..a2810ab8ed 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2846,6 +2846,12 @@ AC_ARG_ENABLE(test-modules, - AS_HELP_STRING([--disable-test-modules], [disable test modules]), - [ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ]) - -+AC_SUBST(LIB2TO3) -+ -+AC_ARG_ENABLE(lib2to3, -+ AS_HELP_STRING([--disable-lib2to3], [disable lib2to3]), -+ [ LIB2TO3="${enableval}" ], [ LIB2TO3=yes ]) -+ - # Check for enable-ipv6 - 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 49f810f72e..9130819454 100644 ---- a/setup.py -+++ b/setup.py -@@ -2278,10 +2278,11 @@ def main(): - import warnings - warnings.filterwarnings("ignore",category=DeprecationWarning) - -- scripts = ['Tools/scripts/idle', 'Tools/scripts/2to3', -- 'Lib/smtpd.py'] -+ scripts = ['Tools/scripts/idle', 'Lib/smtpd.py'] - if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"): - scripts += [ 'Tools/scripts/pydoc' ] -+ if not '--disable-lib2to3' in sysconfig.get_config_var("CONFIG_ARGS"): -+ scripts += [ 'Tools/scripts/2to3' ] - - setup(# PyPI Metadata (PEP 301) - name = "Python", --- -2.11.0 - diff --git a/package/python/0019-Add-option-to-disable-the-sqlite3-module.patch b/package/python/0019-Add-option-to-disable-the-sqlite3-module.patch deleted file mode 100644 index 433bb2973e..0000000000 --- a/package/python/0019-Add-option-to-disable-the-sqlite3-module.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 123ecc50932e3ad3f7a2d90d430b74822c9695d4 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 22:28:06 +0100 -Subject: [PATCH] Add option to disable the sqlite3 module - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Samuel Martin -[Peter: update for 2.7.16] -Signed-off-by: Peter Korsgaard ---- - Makefile.pre.in | 7 +++++-- - configure.ac | 9 +++++++++ - 2 files changed, 14 insertions(+), 2 deletions(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 0e15b6d6f4..a2e5ac6d41 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -1053,7 +1053,6 @@ LIBSUBDIRS= lib-tk site-packages \ - email email/mime \ - ensurepip ensurepip/_bundled \ - json \ -- sqlite3 \ - logging bsddb csv importlib wsgiref \ - ctypes ctypes/macholib \ - idlelib idlelib/Icons \ -@@ -1072,7 +1071,6 @@ TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \ - test/tracedmodules \ - email/test email/test/data \ - json/tests \ -- sqlite3/test \ - bsddb/test \ - ctypes/test \ - idlelib/idle_test \ -@@ -1095,6 +1093,11 @@ TESTSUBDIRS += lib2to3/tests \ - lib2to3/tests/data/fixers/myfixes - endif - -+ifeq (@SQLITE3@,yes) -+LIBSUBDIRS += sqlite3 -+TESTSUBDIRS += sqlite3/test -+endif -+ - libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c - @for i in $(SCRIPTDIR) $(LIBDEST); \ - do \ -diff --git a/configure.ac b/configure.ac -index a2810ab8ed..4ee3c60501 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2834,6 +2834,15 @@ if test "$posix_threads" = "yes"; then - AC_CHECK_FUNCS(pthread_atfork) - fi - -+AC_SUBST(SQLITE3) -+AC_ARG_ENABLE(sqlite3, -+ AS_HELP_STRING([--disable-sqlite3], [disable sqlite3]), -+ [ SQLITE3="${enableval}" ], [ SQLITE3=yes ]) -+ -+if test "$SQLITE3" = "no" ; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" -+fi -+ - AC_SUBST(PYDOC) - - AC_ARG_ENABLE(pydoc, --- -2.11.0 - diff --git a/package/python/0020-Add-an-option-to-disable-the-tk-module.patch b/package/python/0020-Add-an-option-to-disable-the-tk-module.patch deleted file mode 100644 index 26ae1799f8..0000000000 --- a/package/python/0020-Add-an-option-to-disable-the-tk-module.patch +++ /dev/null @@ -1,73 +0,0 @@ -From f0dc1198360c6875ed846a961e85dc41e239aa29 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 22:28:57 +0100 -Subject: [PATCH] Add an option to disable the tk module - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Samuel Martin -[Peter: update for 2.7.16] -Signed-off-by: Peter Korsgaard ---- - Makefile.pre.in | 11 ++++++++--- - configure.ac | 9 +++++++++ - 2 files changed, 17 insertions(+), 3 deletions(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index a2e5ac6d41..37ed70ab1d 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -1048,7 +1048,7 @@ PLATMACDIRS= plat-mac plat-mac/Carbon plat-mac/lib-scriptpackages \ - plat-mac/lib-scriptpackages/SystemEvents \ - plat-mac/lib-scriptpackages/Terminal - PLATMACPATH=:plat-mac:plat-mac/lib-scriptpackages --LIBSUBDIRS= lib-tk site-packages \ -+LIBSUBDIRS= site-packages \ - encodings compiler hotshot \ - email email/mime \ - ensurepip ensurepip/_bundled \ -@@ -1062,8 +1062,7 @@ LIBSUBDIRS= lib-tk site-packages \ - lib-old \ - curses $(MACHDEPS) - --TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \ -- lib-tk/test/test_ttk test test/audiodata test/capath test/data \ -+TESTSUBDIRS = test test/audiodata test/capath test/data \ - test/cjkencodings test/decimaltestdata test/xmltestdata \ - test/imghdrdata \ - test/subprocessdata \ -@@ -1098,6 +1097,12 @@ LIBSUBDIRS += sqlite3 - TESTSUBDIRS += sqlite3/test - endif - -+ifeq (@TK@,yes) -+LIBSUBDIRS += lib-tk -+TESTSUBDIRS += lib-tk/test lib-tk/test/test_tkinter \ -+ lib-tk/test/test_ttk -+endif -+ - libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c - @for i in $(SCRIPTDIR) $(LIBDEST); \ - do \ -diff --git a/configure.ac b/configure.ac -index 4ee3c60501..2c20f826c5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2843,6 +2843,15 @@ if test "$SQLITE3" = "no" ; then - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" - fi - -+AC_SUBST(TK) -+AC_ARG_ENABLE(tk, -+ AS_HELP_STRING([--disable-tk], [disable tk]), -+ [ TK="${enableval}" ], [ TK=yes ]) -+ -+if test "$TK" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter" -+fi -+ - AC_SUBST(PYDOC) - - AC_ARG_ENABLE(pydoc, --- -2.11.0 - diff --git a/package/python/0021-Add-an-option-to-disable-the-curses-module.patch b/package/python/0021-Add-an-option-to-disable-the-curses-module.patch deleted file mode 100644 index 3b1ab7fb4c..0000000000 --- a/package/python/0021-Add-an-option-to-disable-the-curses-module.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 3e51eef24c51b986c37b354f3de98218eb76909c Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 22:29:06 +0100 -Subject: [PATCH] Add an option to disable the curses module - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Samuel Martin -[Peter: update for 2.7.16] -Signed-off-by: Peter Korsgaard ---- - Makefile.pre.in | 6 +++++- - configure.ac | 9 +++++++++ - 2 files changed, 14 insertions(+), 1 deletion(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 37ed70ab1d..458f4ad55b 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -1060,7 +1060,7 @@ LIBSUBDIRS= site-packages \ - multiprocessing multiprocessing/dummy \ - unittest \ - lib-old \ -- curses $(MACHDEPS) -+ $(MACHDEPS) - - TESTSUBDIRS = test test/audiodata test/capath test/data \ - test/cjkencodings test/decimaltestdata test/xmltestdata \ -@@ -1103,6 +1103,10 @@ TESTSUBDIRS += lib-tk/test lib-tk/test/test_tkinter \ - lib-tk/test/test_ttk - endif - -+ifeq (@CURSES@,yes) -+LIBSUBDIRS += curses -+endif -+ - libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c - @for i in $(SCRIPTDIR) $(LIBDEST); \ - do \ -diff --git a/configure.ac b/configure.ac -index 2c20f826c5..a7ebcd091e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2852,6 +2852,15 @@ if test "$TK" = "no"; then - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter" - fi - -+AC_SUBST(CURSES) -+AC_ARG_ENABLE(curses, -+ AS_HELP_STRING([--disable-curses], [disable curses]), -+ [ CURSES="${enableval}" ], [ CURSES=yes ]) -+ -+if test "$CURSES" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _curses _curses_panel" -+fi -+ - AC_SUBST(PYDOC) - - AC_ARG_ENABLE(pydoc, --- -2.11.0 - diff --git a/package/python/0022-Add-an-option-to-disable-expat.patch b/package/python/0022-Add-an-option-to-disable-expat.patch deleted file mode 100644 index 2ebe7eabda..0000000000 --- a/package/python/0022-Add-an-option-to-disable-expat.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 548413a659cc5320560d6b794fe8edd06dd1d22e Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 22:29:20 +0100 -Subject: [PATCH] Add an option to disable expat - -This patch replaces the existing --with-system-expat option with a ---with-expat={system,builtin,none} option, which allows to tell Python -whether we want to use the system expat (already installed), the expat -builtin the Python sources, or no expat at all (which disables the -installation of XML modules). - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Samuel Martin -[Peter: update for 2.7.16] -Signed-off-by: Peter Korsgaard ---- - Makefile.pre.in | 6 +++++- - configure.ac | 18 +++++++++++++----- - setup.py | 2 +- - 3 files changed, 19 insertions(+), 7 deletions(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 458f4ad55b..8dee345539 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -1056,7 +1056,7 @@ LIBSUBDIRS= site-packages \ - logging bsddb csv importlib wsgiref \ - ctypes ctypes/macholib \ - idlelib idlelib/Icons \ -- distutils distutils/command $(XMLLIBSUBDIRS) \ -+ distutils distutils/command \ - multiprocessing multiprocessing/dummy \ - unittest \ - lib-old \ -@@ -1107,6 +1107,10 @@ ifeq (@CURSES@,yes) - LIBSUBDIRS += curses - endif - -+ifeq (@EXPAT@,yes) -+LIBSUBDIRS += $(XMLLIBSUBDIRS) -+endif -+ - libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c - @for i in $(SCRIPTDIR) $(LIBDEST); \ - do \ -diff --git a/configure.ac b/configure.ac -index a7ebcd091e..2f5759a890 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2499,13 +2499,21 @@ PKG_PROG_PKG_CONFIG - AC_SUBST(DISABLED_EXTENSIONS) - - # Check for use of the system expat library --AC_MSG_CHECKING(for --with-system-expat) --AC_ARG_WITH(system_expat, -- AS_HELP_STRING([--with-system-expat], [build pyexpat module using an installed expat library]), -+AC_MSG_CHECKING(for --with-expat) -+AC_ARG_WITH(expat, -+ AS_HELP_STRING([--with-expat], [select which expat version to use: system, builtin, none]), - [], -- [with_system_expat="no"]) -+ [with_expat="builtin"]) - --AC_MSG_RESULT($with_system_expat) -+AC_MSG_RESULT($with_expat) -+ -+if test "$with_expat" != "none"; then -+ EXPAT=yes -+else -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} pyexpat" -+ EXPAT=no -+fi -+AC_SUBST(EXPAT) - - # Check for use of the system libffi library - AC_MSG_CHECKING(for --with-system-ffi) -diff --git a/setup.py b/setup.py -index 9130819454..f439cbadc2 100644 ---- a/setup.py -+++ b/setup.py -@@ -1475,7 +1475,7 @@ class PyBuildExt(build_ext): - # - # More information on Expat can be found at www.libexpat.org. - # -- if '--with-system-expat' in sysconfig.get_config_var("CONFIG_ARGS"): -+ if '--with-expat=system' in sysconfig.get_config_var("CONFIG_ARGS"): - expat_inc = [] - define_macros = [] - expat_lib = ['expat'] --- -2.11.0 - diff --git a/package/python/0023-Add-an-option-to-disable-CJK-codecs.patch b/package/python/0023-Add-an-option-to-disable-CJK-codecs.patch deleted file mode 100644 index 3ee77fec36..0000000000 --- a/package/python/0023-Add-an-option-to-disable-CJK-codecs.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 6761066addfb6028e183d7fe4322b283af18117f Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 22:29:31 +0100 -Subject: [PATCH] Add an option to disable CJK codecs - -Signed-off-by: Thomas Petazzoni -[Peter: update for 2.7.16] -Signed-off-by: Peter Korsgaard ---- - configure.ac | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 2f5759a890..862c8ae516 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2851,6 +2851,12 @@ if test "$SQLITE3" = "no" ; then - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" - fi - -+AC_ARG_ENABLE(codecs-cjk, -+ AS_HELP_STRING([--disable-codecs-cjk], [disable CJK codecs]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk" -+ fi]) -+ - AC_SUBST(TK) - AC_ARG_ENABLE(tk, - AS_HELP_STRING([--disable-tk], [disable tk]), --- -2.11.0 - diff --git a/package/python/0024-Add-an-option-to-disable-NIS.patch b/package/python/0024-Add-an-option-to-disable-NIS.patch deleted file mode 100644 index bad4ba68dc..0000000000 --- a/package/python/0024-Add-an-option-to-disable-NIS.patch +++ /dev/null @@ -1,35 +0,0 @@ -From ecd8e926bd364d866f492df87d7c46d029445480 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 22:29:41 +0100 -Subject: [PATCH] Add an option to disable NIS - -NIS is not necessarily available in uClibc, so we need an option to -not compile support for it. - -Signed-off-by: Thomas Petazzoni -[Peter: update for 2.7.16] -Signed-off-by: Peter Korsgaard ---- - configure.ac | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 862c8ae516..354212fb16 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2857,6 +2857,12 @@ AC_ARG_ENABLE(codecs-cjk, - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk" - fi]) - -+AC_ARG_ENABLE(nis, -+ AS_HELP_STRING([--disable-nis], [disable NIS]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis" -+ fi]) -+ - AC_SUBST(TK) - AC_ARG_ENABLE(tk, - AS_HELP_STRING([--disable-tk], [disable tk]), --- -2.11.0 - diff --git a/package/python/0025-Add-an-option-to-disable-unicodedata.patch b/package/python/0025-Add-an-option-to-disable-unicodedata.patch deleted file mode 100644 index 687ea5027e..0000000000 --- a/package/python/0025-Add-an-option-to-disable-unicodedata.patch +++ /dev/null @@ -1,32 +0,0 @@ -From dc99b7a0331fe75d70ccb87dc0877ac5bbba51ca Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 22:29:52 +0100 -Subject: [PATCH] Add an option to disable unicodedata - -Signed-off-by: Thomas Petazzoni -[Peter: update for 2.7.16] -Signed-off-by: Peter Korsgaard ---- - configure.ac | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 354212fb16..4e430d82b8 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2863,6 +2863,12 @@ AC_ARG_ENABLE(nis, - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis" - fi]) - -+AC_ARG_ENABLE(unicodedata, -+ AS_HELP_STRING([--disable-unicodedata], [disable unicodedata]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} unicodedata" -+ fi]) -+ - AC_SUBST(TK) - AC_ARG_ENABLE(tk, - AS_HELP_STRING([--disable-tk], [disable tk]), --- -2.11.0 - diff --git a/package/python/0026-Add-an-option-to-disable-bsddb.patch b/package/python/0026-Add-an-option-to-disable-bsddb.patch deleted file mode 100644 index f216e8bb57..0000000000 --- a/package/python/0026-Add-an-option-to-disable-bsddb.patch +++ /dev/null @@ -1,87 +0,0 @@ -From a4bbbf0c5f1f68298d5f4e2c2cd80de7e758763c Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 22:30:06 +0100 -Subject: [PATCH] Add an option to disable bsddb - -bsddb has an external dependency on Berkeley DB. Since we want to be -able to build Python without it, this patch adds an option to disable -the build/installation of this Python module. - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Samuel Martin -[Peter: update for 2.7.16] -Signed-off-by: Peter Korsgaard ---- - Makefile.pre.in | 8 ++++++-- - configure.ac | 22 ++++++++++++++++++++++ - 2 files changed, 28 insertions(+), 2 deletions(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 8dee345539..a0473096c1 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -1053,7 +1053,7 @@ LIBSUBDIRS= site-packages \ - email email/mime \ - ensurepip ensurepip/_bundled \ - json \ -- logging bsddb csv importlib wsgiref \ -+ logging csv importlib wsgiref \ - ctypes ctypes/macholib \ - idlelib idlelib/Icons \ - distutils distutils/command \ -@@ -1070,7 +1070,6 @@ TESTSUBDIRS = test test/audiodata test/capath test/data \ - test/tracedmodules \ - email/test email/test/data \ - json/tests \ -- bsddb/test \ - ctypes/test \ - idlelib/idle_test \ - distutils/tests \ -@@ -1111,6 +1110,11 @@ ifeq (@EXPAT@,yes) - LIBSUBDIRS += $(XMLLIBSUBDIRS) - endif - -+ifeq (@BSDDB@,yes) -+LIBSUBDIRS += bsddb -+TESTSUBDIRS += bsddb/test -+endif -+ - libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c - @for i in $(SCRIPTDIR) $(LIBDEST); \ - do \ -diff --git a/configure.ac b/configure.ac -index 4e430d82b8..361e8c120e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2863,6 +2863,28 @@ AC_ARG_ENABLE(nis, - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis" - fi]) - -+AC_ARG_ENABLE(dbm, -+ AS_HELP_STRING([--disable-dbm], [disable DBM]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} dbm" -+ fi]) -+ -+AC_ARG_ENABLE(gdbm, -+ AS_HELP_STRING([--disable-gdbm], [disable GDBM]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} gdbm" -+ fi]) -+ -+AC_SUBST(BSDDB) -+AC_ARG_ENABLE(bsddb, -+ AS_HELP_STRING([--disable-bsddb], [disable BerkeyleyDB]), -+ [ if test "$enableval" = "no"; then -+ BSDDB=no -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _bsddb" -+ else -+ BSDDB=yes -+ fi], [ BSDDB=yes ]) -+ - AC_ARG_ENABLE(unicodedata, - AS_HELP_STRING([--disable-unicodedata], [disable unicodedata]), - [ if test "$enableval" = "no"; then --- -2.11.0 - diff --git a/package/python/0027-Add-an-option-to-disable-the-ssl-module.patch b/package/python/0027-Add-an-option-to-disable-the-ssl-module.patch deleted file mode 100644 index d62408e4e9..0000000000 --- a/package/python/0027-Add-an-option-to-disable-the-ssl-module.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a0e56b96c3bfb04a5c8ecc0987cdd294d8ce116b Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 22:30:22 +0100 -Subject: [PATCH] Add an option to disable the ssl module - -Signed-off-by: Thomas Petazzoni -[Peter: update for 2.7.16] -Signed-off-by: Peter Korsgaard ---- - configure.ac | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 361e8c120e..8fe47d8c37 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2863,6 +2863,12 @@ AC_ARG_ENABLE(nis, - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis" - fi]) - -+AC_ARG_ENABLE(ssl, -+ AS_HELP_STRING([--disable-ssl], [disable SSL]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _ssl" -+ fi]) -+ - AC_ARG_ENABLE(dbm, - AS_HELP_STRING([--disable-dbm], [disable DBM]), - [ if test "$enableval" = "no"; then --- -2.11.0 - diff --git a/package/python/0028-Add-an-option-to-disable-the-bz2-module.patch b/package/python/0028-Add-an-option-to-disable-the-bz2-module.patch deleted file mode 100644 index 5b89e8ef87..0000000000 --- a/package/python/0028-Add-an-option-to-disable-the-bz2-module.patch +++ /dev/null @@ -1,32 +0,0 @@ -From d1236c6f4d8d893709fa36f751af47b8ad9055c1 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 22:30:33 +0100 -Subject: [PATCH] Add an option to disable the bz2 module - -Signed-off-by: Thomas Petazzoni -[Peter: update for 2.7.16] -Signed-off-by: Peter Korsgaard ---- - configure.ac | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 8fe47d8c37..85df7b1478 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2869,6 +2869,12 @@ AC_ARG_ENABLE(ssl, - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _ssl" - fi]) - -+AC_ARG_ENABLE(bz2, -+ AS_HELP_STRING([--disable-bz2], [disable BZIP2]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} bz2" -+ fi]) -+ - AC_ARG_ENABLE(dbm, - AS_HELP_STRING([--disable-dbm], [disable DBM]), - [ if test "$enableval" = "no"; then --- -2.11.0 - diff --git a/package/python/0029-Add-an-option-to-disable-the-zlib-module.patch b/package/python/0029-Add-an-option-to-disable-the-zlib-module.patch deleted file mode 100644 index 95da586e46..0000000000 --- a/package/python/0029-Add-an-option-to-disable-the-zlib-module.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a9c7314e069036f74b503dfaef261e5f45477b7e Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 22:30:45 +0100 -Subject: [PATCH] Add an option to disable the zlib module - -Signed-off-by: Thomas Petazzoni -[Peter: update for 2.7.16] -Signed-off-by: Peter Korsgaard ---- - configure.ac | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 85df7b1478..3848b16b9f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2875,6 +2875,12 @@ AC_ARG_ENABLE(bz2, - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} bz2" - fi]) - -+AC_ARG_ENABLE(zlib, -+ AS_HELP_STRING([--disable-zlib], [disable ZLIB]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} zlib" -+ fi]) -+ - AC_ARG_ENABLE(dbm, - AS_HELP_STRING([--disable-dbm], [disable DBM]), - [ if test "$enableval" = "no"; then --- -2.11.0 - diff --git a/package/python/0030-Do-not-install-the-idle-editor.patch b/package/python/0030-Do-not-install-the-idle-editor.patch deleted file mode 100644 index e101e6a12c..0000000000 --- a/package/python/0030-Do-not-install-the-idle-editor.patch +++ /dev/null @@ -1,55 +0,0 @@ -From e789487c783f75c17a8951bd5324c86ceefde407 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 22:30:56 +0100 -Subject: [PATCH] Do not install the idle editor - -IDLE is the Python IDE built with the tkinter GUI toolkit. Since it's -highly unlikely to ever be useful in an embedded Linux system -generated by Buildroot, this patch simply disables the installation of -idle and the related Python modules. It saves 800 KB-900 KB of -installed .pyc files. - -Signed-off-by: Thomas Petazzoni -[Peter: update for 2.7.16] -Signed-off-by: Peter Korsgaard ---- - Makefile.pre.in | 2 -- - setup.py | 2 +- - 2 files changed, 1 insertion(+), 3 deletions(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index a0473096c1..750057fb96 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -1055,7 +1055,6 @@ LIBSUBDIRS= site-packages \ - json \ - logging csv importlib wsgiref \ - ctypes ctypes/macholib \ -- idlelib idlelib/Icons \ - distutils distutils/command \ - multiprocessing multiprocessing/dummy \ - unittest \ -@@ -1071,7 +1070,6 @@ TESTSUBDIRS = test test/audiodata test/capath test/data \ - email/test email/test/data \ - json/tests \ - ctypes/test \ -- idlelib/idle_test \ - distutils/tests \ - unittest/test - -diff --git a/setup.py b/setup.py -index f439cbadc2..227187681e 100644 ---- a/setup.py -+++ b/setup.py -@@ -2278,7 +2278,7 @@ def main(): - import warnings - warnings.filterwarnings("ignore",category=DeprecationWarning) - -- scripts = ['Tools/scripts/idle', 'Lib/smtpd.py'] -+ scripts = ['Lib/smtpd.py'] - if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"): - scripts += [ 'Tools/scripts/pydoc' ] - if not '--disable-lib2to3' in sysconfig.get_config_var("CONFIG_ARGS"): --- -2.11.0 - diff --git a/package/python/0031-Add-an-option-to-disable-the-ossaudiodev-module.patch b/package/python/0031-Add-an-option-to-disable-the-ossaudiodev-module.patch deleted file mode 100644 index 9768faf676..0000000000 --- a/package/python/0031-Add-an-option-to-disable-the-ossaudiodev-module.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 4ab280b8a7626de2565cf4ef6cf08a5c7326574b Mon Sep 17 00:00:00 2001 -From: Zoltan Gyarmati -Date: Tue, 7 Mar 2017 22:31:22 +0100 -Subject: [PATCH] Add an option to disable the ossaudiodev module - -Signed-off-by: Zoltan Gyarmati -[Peter: update for 2.7.16] -Signed-off-by: Peter Korsgaard ---- - configure.ac | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 3848b16b9f..6d19cdee95 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2927,6 +2927,12 @@ if test "$CURSES" = "no"; then - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _curses _curses_panel" - fi - -+AC_ARG_ENABLE(ossaudiodev, -+ AS_HELP_STRING([--disable-ossaudiodev], [disable OSSAUDIODEV]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ossaudiodev" -+ fi]) -+ - AC_SUBST(PYDOC) - - AC_ARG_ENABLE(pydoc, --- -2.11.0 - diff --git a/package/python/0032-Add-option-to-disable-the-hashlib-module.patch b/package/python/0032-Add-option-to-disable-the-hashlib-module.patch deleted file mode 100644 index 82ef3a13f7..0000000000 --- a/package/python/0032-Add-option-to-disable-the-hashlib-module.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 479bef8182c4f6b678a86820ccc06760ca60c286 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 22:33:02 +0100 -Subject: [PATCH] Add option to disable the hashlib module - -Signed-off-by: Thomas Petazzoni -[Peter: update for 2.7.16] -Signed-off-by: Peter Korsgaard ---- - configure.ac | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 6d19cdee95..ddccc79c2c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2869,6 +2869,12 @@ AC_ARG_ENABLE(ssl, - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _ssl" - fi]) - -+AC_ARG_ENABLE(hashlib, -+ AS_HELP_STRING([--disable-hashlib], [disable hashlib]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _hashlib" -+ fi]) -+ - AC_ARG_ENABLE(bz2, - AS_HELP_STRING([--disable-bz2], [disable BZIP2]), - [ if test "$enableval" = "no"; then --- -2.11.0 - diff --git a/package/python/0033-Add-an-option-to-disable-readline-module.patch b/package/python/0033-Add-an-option-to-disable-readline-module.patch deleted file mode 100644 index 02b1315179..0000000000 --- a/package/python/0033-Add-an-option-to-disable-readline-module.patch +++ /dev/null @@ -1,32 +0,0 @@ -From abea92958b073dfbf0c78bcb31ce9cfc709c20ca Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 22:33:55 +0100 -Subject: [PATCH] Add an option to disable readline module - -Signed-off-by: Thomas Petazzoni -[Peter: update for 2.7.16] -Signed-off-by: Peter Korsgaard ---- - configure.ac | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/configure.ac b/configure.ac -index ddccc79c2c..dae266326e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2875,6 +2875,12 @@ AC_ARG_ENABLE(hashlib, - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _hashlib" - fi]) - -+AC_ARG_ENABLE(readline, -+ AS_HELP_STRING([--disable-readline], [disable readline]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} readline" -+ fi]) -+ - AC_ARG_ENABLE(bz2, - AS_HELP_STRING([--disable-bz2], [disable BZIP2]), - [ if test "$enableval" = "no"; then --- -2.11.0 - diff --git a/package/python/0034-Override-system-locale-and-set-to-default-when-addin.patch b/package/python/0034-Override-system-locale-and-set-to-default-when-addin.patch deleted file mode 100644 index 8fe722bc6c..0000000000 --- a/package/python/0034-Override-system-locale-and-set-to-default-when-addin.patch +++ /dev/null @@ -1,37 +0,0 @@ -From d2bfa8805206db8c57c182094396d20a9d94bd8f Mon Sep 17 00:00:00 2001 -From: Samuel Cabrero -Date: Sat, 1 Apr 2017 09:31:52 +0200 -Subject: [PATCH] Override system locale and set to default when adding gcc - paths - -Forces the use of the default locale in the function -add_gcc_paths, which is called when cross compiling to add the -include and library paths. This is necessary because otherwise -the gcc output is localized and the output parsing fails, which -results in no paths added and detect_modules not able to find -any system library (eg. libz, libssl, etc.) - -[Thomas: patch taken from https://bugs.python.org/issue23767.] - -Signed-off-by: Samuel Cabrero -Signed-off-by: Thomas Petazzoni ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 8045a9b..c14f4ab 100644 ---- a/setup.py -+++ b/setup.py -@@ -430,7 +430,7 @@ class PyBuildExt(build_ext): - tmpfile = os.path.join(self.build_temp, 'gccpaths') - if not os.path.exists(self.build_temp): - os.makedirs(self.build_temp) -- ret = os.system('%s -E -v - %s 1>/dev/null' % (gcc, tmpfile)) -+ ret = os.system('LC_ALL=C %s -E -v - %s 1>/dev/null' % (gcc, tmpfile)) - is_gcc = False - in_incdirs = False - inc_dirs = [] --- -2.7.4 - diff --git a/package/python/Config.in.host b/package/python/Config.in.host deleted file mode 100644 index 724e5e223a..0000000000 --- a/package/python/Config.in.host +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_HOST_PYTHON - bool "host python" - help - The python language interpreter. Host package. - - http://www.python.org/ - -if BR2_PACKAGE_HOST_PYTHON - -config BR2_PACKAGE_HOST_PYTHON_SSL - bool "ssl" - select BR2_PACKAGE_HOST_OPENSSL - help - _ssl module for host Python. - -endif diff --git a/package/python/python.hash b/package/python/python.hash deleted file mode 100644 index f5e51d9638..0000000000 --- a/package/python/python.hash +++ /dev/null @@ -1,5 +0,0 @@ -# From https://www.python.org/downloads/release/python-2718/ -md5 fd6cc8ec0a78c44036f825e739f36e5a Python-2.7.18.tar.xz -# Locally calculated -sha256 b62c0e7937551d0cc02b8fd5cb0f544f9405bafc9a54d3808ed4594812edef43 Python-2.7.18.tar.xz -sha256 de4d1f2d2ad5ad0cfd1657a106476b31cb5db5ef9d1ff842b237c0c81f0c8a23 LICENSE diff --git a/package/python/python.mk b/package/python/python.mk deleted file mode 100644 index ae99f382f9..0000000000 --- a/package/python/python.mk +++ /dev/null @@ -1,302 +0,0 @@ -################################################################################ -# -# python -# -################################################################################ - -PYTHON_VERSION_MAJOR = 2.7 -PYTHON_VERSION = $(PYTHON_VERSION_MAJOR).18 -PYTHON_SOURCE = Python-$(PYTHON_VERSION).tar.xz -PYTHON_SITE = https://python.org/ftp/python/$(PYTHON_VERSION) -PYTHON_LICENSE = Python-2.0, others -PYTHON_LICENSE_FILES = LICENSE -PYTHON_CPE_ID_VENDOR = python -PYTHON_LIBTOOL_PATCH = NO - -# Python needs itself to be built, so in order to cross-compile -# Python, we need to build a host Python first. This host Python is -# also installed in $(HOST_DIR), as it is needed when cross-compiling -# third-party Python modules. - -HOST_PYTHON_CONF_OPTS += \ - --enable-static \ - --without-cxx-main \ - --disable-sqlite3 \ - --disable-tk \ - --with-expat=system \ - --with-system-ffi \ - --disable-curses \ - --disable-codecs-cjk \ - --disable-nis \ - --enable-unicodedata \ - --disable-dbm \ - --disable-gdbm \ - --disable-bsddb \ - --disable-test-modules \ - --disable-bz2 \ - --disable-ossaudiodev \ - --disable-pyo-build - -# Make sure that LD_LIBRARY_PATH overrides -rpath. -# This is needed because libpython may be installed at the same time that -# python is called. -# Make python believe we don't have 'hg' and 'svn', so that it doesn't -# try to communicate over the network during the build. -HOST_PYTHON_CONF_ENV += \ - LDFLAGS="$(HOST_LDFLAGS) -Wl,--enable-new-dtags" \ - ac_cv_prog_HAS_HG=/bin/false \ - ac_cv_prog_SVNVERSION=/bin/false - -# Building host python in parallel sometimes triggers a "Bus error" -# during the execution of "./python setup.py build" in the -# installation step. It is probably due to the installation of a -# shared library taking place in parallel to the execution of -# ./python, causing spurious Bus error. Building host-python with -# MAKE1 has shown to workaround the problem. -HOST_PYTHON_MAKE = $(MAKE1) - -PYTHON_DEPENDENCIES = host-python libffi $(TARGET_NLS_DEPENDENCIES) - -HOST_PYTHON_DEPENDENCIES = host-expat host-libffi host-zlib - -ifeq ($(BR2_PACKAGE_HOST_PYTHON_SSL),y) -HOST_PYTHON_DEPENDENCIES += host-openssl -else -HOST_PYTHON_CONF_OPTS += --disable-ssl -endif - -PYTHON_INSTALL_STAGING = YES - -ifeq ($(BR2_PACKAGE_PYTHON_READLINE),y) -PYTHON_DEPENDENCIES += readline -else -PYTHON_CONF_OPTS += --disable-readline -endif - -ifeq ($(BR2_PACKAGE_PYTHON_CURSES),y) -PYTHON_DEPENDENCIES += ncurses -else -PYTHON_CONF_OPTS += --disable-curses -endif - -ifeq ($(BR2_PACKAGE_PYTHON_PYEXPAT),y) -PYTHON_DEPENDENCIES += expat -PYTHON_CONF_OPTS += --with-expat=system -else -PYTHON_CONF_OPTS += --with-expat=none -endif - -ifeq ($(BR2_PACKAGE_PYTHON_BSDDB),y) -PYTHON_DEPENDENCIES += berkeleydb -else -PYTHON_CONF_OPTS += --disable-bsddb -endif - -ifeq ($(BR2_PACKAGE_PYTHON_SQLITE),y) -PYTHON_DEPENDENCIES += sqlite -else -PYTHON_CONF_OPTS += --disable-sqlite3 -endif - -ifeq ($(BR2_PACKAGE_PYTHON_SSL),y) -PYTHON_DEPENDENCIES += openssl -else -PYTHON_CONF_OPTS += --disable-ssl -endif - -ifneq ($(BR2_PACKAGE_PYTHON_CODECSCJK),y) -PYTHON_CONF_OPTS += --disable-codecs-cjk -endif - -ifneq ($(BR2_PACKAGE_PYTHON_UNICODEDATA),y) -PYTHON_CONF_OPTS += --disable-unicodedata -endif - -# Default is UCS2 w/o a conf opt -ifeq ($(BR2_PACKAGE_PYTHON_UCS4),y) -# host-python must have the same UCS2/4 configuration as the target -# python -HOST_PYTHON_CONF_OPTS += --enable-unicode=ucs4 -PYTHON_CONF_OPTS += --enable-unicode=ucs4 -endif - -ifeq ($(BR2_PACKAGE_PYTHON_2TO3),y) -PYTHON_CONF_OPTS += --enable-lib2to3 -else -PYTHON_CONF_OPTS += --disable-lib2to3 -endif - -ifeq ($(BR2_PACKAGE_PYTHON_BZIP2),y) -PYTHON_DEPENDENCIES += bzip2 -else -PYTHON_CONF_OPTS += --disable-bz2 -endif - -ifeq ($(BR2_PACKAGE_PYTHON_ZLIB),y) -PYTHON_DEPENDENCIES += zlib -else -PYTHON_CONF_OPTS += --disable-zlib -endif - -ifeq ($(BR2_PACKAGE_PYTHON_HASHLIB),y) -PYTHON_DEPENDENCIES += openssl -else -PYTHON_CONF_OPTS += --disable-hashlib -endif - -ifeq ($(BR2_PACKAGE_PYTHON_OSSAUDIODEV),y) -PYTHON_CONF_OPTS += --enable-ossaudiodev -else -PYTHON_CONF_OPTS += --disable-ossaudiodev -endif - -# Make python believe we don't have 'hg' and 'svn', so that it doesn't -# try to communicate over the network during the build. -PYTHON_CONF_ENV += \ - ac_cv_have_long_long_format=yes \ - ac_cv_file__dev_ptmx=yes \ - ac_cv_file__dev_ptc=yes \ - ac_cv_working_tzset=yes \ - ac_cv_prog_HAS_HG=/bin/false \ - ac_cv_prog_SVNVERSION=/bin/false - -# GCC is always compliant with IEEE754 -ifeq ($(BR2_ENDIAN),"LITTLE") -PYTHON_CONF_ENV += ac_cv_little_endian_double=yes -else -PYTHON_CONF_ENV += ac_cv_big_endian_double=yes -endif - -PYTHON_CONF_OPTS += \ - --without-cxx-main \ - --without-doc-strings \ - --with-system-ffi \ - --disable-pydoc \ - --disable-test-modules \ - --disable-gdbm \ - --disable-tk \ - --disable-nis \ - --disable-dbm \ - --disable-pyo-build \ - --disable-pyc-build - -# This is needed to make sure the Python build process doesn't try to -# regenerate those files with the pgen program. Otherwise, it builds -# pgen for the target, and tries to run it on the host. - -define PYTHON_TOUCH_GRAMMAR_FILES - touch $(@D)/Include/graminit.h $(@D)/Python/graminit.c -endef - -PYTHON_POST_PATCH_HOOKS += PYTHON_TOUCH_GRAMMAR_FILES - -# -# Remove useless files. In the config/ directory, only the Makefile -# and the pyconfig.h files are needed at runtime. -# -# idle & smtpd.py have bad shebangs and are mostly samples -# -define PYTHON_REMOVE_USELESS_FILES - rm -f $(TARGET_DIR)/usr/bin/python$(PYTHON_VERSION_MAJOR)-config - rm -f $(TARGET_DIR)/usr/bin/python2-config - rm -f $(TARGET_DIR)/usr/bin/python-config - rm -f $(TARGET_DIR)/usr/bin/smtpd.py - rm -f $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/distutils/command/wininst*.exe - for i in `find $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/config/ \ - -type f -not -name pyconfig.h -a -not -name Makefile` ; do \ - rm -f $$i ; \ - done -endef - -PYTHON_POST_INSTALL_TARGET_HOOKS += PYTHON_REMOVE_USELESS_FILES - -# -# Make sure libpython gets stripped out on target -# -define PYTHON_ENSURE_LIBPYTHON_STRIPPED - chmod u+w $(TARGET_DIR)/usr/lib/libpython$(PYTHON_VERSION_MAJOR)*.so -endef - -PYTHON_POST_INSTALL_TARGET_HOOKS += PYTHON_ENSURE_LIBPYTHON_STRIPPED - -# Always install the python symlink in the target tree -define PYTHON_INSTALL_TARGET_PYTHON_SYMLINK - ln -sf python2 $(TARGET_DIR)/usr/bin/python -endef - -PYTHON_POST_INSTALL_TARGET_HOOKS += PYTHON_INSTALL_TARGET_PYTHON_SYMLINK - -# Always install the python-config symlink in the staging tree -define PYTHON_INSTALL_STAGING_PYTHON_CONFIG_SYMLINK - ln -sf python2-config $(STAGING_DIR)/usr/bin/python-config -endef - -PYTHON_POST_INSTALL_STAGING_HOOKS += PYTHON_INSTALL_STAGING_PYTHON_CONFIG_SYMLINK - -PYTHON_AUTORECONF = YES - -# Some packages may have build scripts requiring python2. -# Only install the python symlink in the host tree if python3 is not enabled -# for the target, otherwise the default python program may be missing. -ifneq ($(BR2_PACKAGE_PYTHON3),y) -define HOST_PYTHON_INSTALL_PYTHON_SYMLINK - ln -sf python2 $(HOST_DIR)/bin/python - ln -sf python2-config $(HOST_DIR)/bin/python-config -endef - -HOST_PYTHON_POST_INSTALL_HOOKS += HOST_PYTHON_INSTALL_PYTHON_SYMLINK -endif - -# Provided to other packages -PYTHON_PATH = $(STAGING_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/sysconfigdata/ - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) - -ifeq ($(BR2_REPRODUCIBLE),y) -define PYTHON_FIX_TIME - find $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR) -name '*.py' -print0 | \ - xargs -0 --no-run-if-empty touch -d @$(SOURCE_DATE_EPOCH) -endef -endif - -define PYTHON_CREATE_PYC_FILES - $(PYTHON_FIX_TIME) - PYTHONPATH="$(PYTHON_PATH)" \ - $(HOST_DIR)/bin/python$(PYTHON_VERSION_MAJOR) \ - $(TOPDIR)/support/scripts/pycompile.py \ - $(if $(VERBOSE),--verbose) \ - --strip-root $(TARGET_DIR) \ - $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR) -endef - -ifeq ($(BR2_PACKAGE_PYTHON_PYC_ONLY)$(BR2_PACKAGE_PYTHON_PY_PYC),y) -PYTHON_TARGET_FINALIZE_HOOKS += PYTHON_CREATE_PYC_FILES -endif - -ifeq ($(BR2_PACKAGE_PYTHON_PYC_ONLY),y) -define PYTHON_REMOVE_PY_FILES - find $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR) -name '*.py' \ - $(if $(strip $(KEEP_PYTHON_PY_FILES)),-not \( $(call finddirclauses,$(TARGET_DIR),$(KEEP_PYTHON_PY_FILES)) \) ) \ - -print0 | \ - xargs -0 --no-run-if-empty rm -f -endef -PYTHON_TARGET_FINALIZE_HOOKS += PYTHON_REMOVE_PY_FILES -endif - -# Normally, *.pyc files should not have been compiled, but just in -# case, we make sure we remove all of them. -ifeq ($(BR2_PACKAGE_PYTHON_PY_ONLY),y) -define PYTHON_REMOVE_PYC_FILES - find $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR) -name '*.pyc' -print0 | \ - xargs -0 --no-run-if-empty rm -f -endef -PYTHON_TARGET_FINALIZE_HOOKS += PYTHON_REMOVE_PYC_FILES -endif - -# In all cases, we don't want to keep the optimized .pyo files -define PYTHON_REMOVE_PYO_FILES - find $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR) -name '*.pyo' -print0 | \ - xargs -0 --no-run-if-empty rm -f -endef -PYTHON_TARGET_FINALIZE_HOOKS += PYTHON_REMOVE_PYO_FILES -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:57 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:57 +0100 Subject: [Buildroot] [PATCH 091/107] package/python-ipaddress: drop python2 specific package In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-92-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++++ package/Config.in | 1 - package/python-ipaddress/Config.in | 7 ------- package/python-ipaddress/python-ipaddress.hash | 5 ----- package/python-ipaddress/python-ipaddress.mk | 14 -------------- 5 files changed, 6 insertions(+), 27 deletions(-) delete mode 100644 package/python-ipaddress/Config.in delete mode 100644 package/python-ipaddress/python-ipaddress.hash delete mode 100644 package/python-ipaddress/python-ipaddress.mk diff --git a/Config.in.legacy b/Config.in.legacy index c78fb20756..14b26408fe 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_IPADDRESS + bool "python-ipaddress removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_IPADDR bool "python-ipaddr removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index 611a8f6aa8..50c0e13510 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1058,7 +1058,6 @@ menu "External python modules" source "package/python-iniparse/Config.in" source "package/python-intelhex/Config.in" source "package/python-iowait/Config.in" - source "package/python-ipaddress/Config.in" source "package/python-ipdb/Config.in" source "package/python-iptables/Config.in" source "package/python-ipy/Config.in" diff --git a/package/python-ipaddress/Config.in b/package/python-ipaddress/Config.in deleted file mode 100644 index b2b9f0b1c3..0000000000 --- a/package/python-ipaddress/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_IPADDRESS - bool "python-ipaddress" - depends on BR2_PACKAGE_PYTHON - help - Python 3.3's ipaddress for older Python versions. - - https://github.com/phihag/ipaddress diff --git a/package/python-ipaddress/python-ipaddress.hash b/package/python-ipaddress/python-ipaddress.hash deleted file mode 100644 index e61835e192..0000000000 --- a/package/python-ipaddress/python-ipaddress.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/ipaddress/json -md5 aaee67a8026782af1831148beb0d9060 ipaddress-1.0.23.tar.gz -sha256 b7f8e0369580bb4a24d5ba1d7cc29660a4a6987763faf1d8a8046830e020e7e2 ipaddress-1.0.23.tar.gz -# Locally computed sha256 checksums -sha256 38675419eb4a79ec616396d70f1254b3a433fb7088fb3f4cc9b6c0bcdcec6162 LICENSE diff --git a/package/python-ipaddress/python-ipaddress.mk b/package/python-ipaddress/python-ipaddress.mk deleted file mode 100644 index 8f1ad5ffc7..0000000000 --- a/package/python-ipaddress/python-ipaddress.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-ipaddress -# -################################################################################ - -PYTHON_IPADDRESS_VERSION = 1.0.23 -PYTHON_IPADDRESS_SOURCE = ipaddress-$(PYTHON_IPADDRESS_VERSION).tar.gz -PYTHON_IPADDRESS_SITE = https://files.pythonhosted.org/packages/b9/9a/3e9da40ea28b8210dd6504d3fe9fe7e013b62bf45902b458d1cdc3c34ed9 -PYTHON_IPADDRESS_LICENSE = Python-2.0 -PYTHON_IPADDRESS_LICENSE_FILES = LICENSE -PYTHON_IPADDRESS_SETUP_TYPE = setuptools - -$(eval $(python-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:52:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:52:03 +0100 Subject: [Buildroot] [PATCH 097/107] package/python-pyro: drop python2 specific package In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-98-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++++ package/Config.in | 1 - package/python-pyro/Config.in | 10 ---------- package/python-pyro/python-pyro.hash | 5 ----- package/python-pyro/python-pyro.mk | 16 ---------------- 5 files changed, 6 insertions(+), 32 deletions(-) delete mode 100644 package/python-pyro/Config.in delete mode 100644 package/python-pyro/python-pyro.hash delete mode 100644 package/python-pyro/python-pyro.mk diff --git a/Config.in.legacy b/Config.in.legacy index f99535411d..319057f748 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_PYRO + bool "python-pyro removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_PYPCAP bool "python-pypcap removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index d406d372d3..0d8ff0d4d1 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1176,7 +1176,6 @@ menu "External python modules" source "package/python-pyqrcode/Config.in" source "package/python-pyqt5/Config.in" source "package/python-pyratemp/Config.in" - source "package/python-pyro/Config.in" source "package/python-pyroute2/Config.in" source "package/python-pysendfile/Config.in" source "package/python-pysftp/Config.in" diff --git a/package/python-pyro/Config.in b/package/python-pyro/Config.in deleted file mode 100644 index 6372a1d376..0000000000 --- a/package/python-pyro/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYRO - bool "python-pyro" - depends on BR2_PACKAGE_PYTHON - help - python-pyro is a Python library stands for PYthon Remote - Objects. It is an advanced and powerful Distributed Object - Technology system written entirely in Python, that is - designed to be very easy to use.. - - https://pypi.python.org/pypi/Pyro/ diff --git a/package/python-pyro/python-pyro.hash b/package/python-pyro/python-pyro.hash deleted file mode 100644 index c22b66ddc4..0000000000 --- a/package/python-pyro/python-pyro.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5 from https://pypi.python.org/pypi/pyro/json -md5 59d4d3f4a8786776c9d7f9051b8f1a69 Pyro-3.16.tar.gz -# Locally computed -sha256 1bed508453ef7a7556b51424a58101af2349b662baab7e7331c5cb85dbe7e578 Pyro-3.16.tar.gz -sha256 7c14017a2f543384bfcde86043758b68d023b47bf09700a7df6dacbae9c82103 LICENSE diff --git a/package/python-pyro/python-pyro.mk b/package/python-pyro/python-pyro.mk deleted file mode 100644 index 235575c195..0000000000 --- a/package/python-pyro/python-pyro.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# python-pyro -# -################################################################################ - -PYTHON_PYRO_VERSION = 3.16 -PYTHON_PYRO_SOURCE = Pyro-$(PYTHON_PYRO_VERSION).tar.gz -PYTHON_PYRO_SITE = https://pypi.python.org/packages/61/68/0978adae315261b87acd216517c2c7f00780396e4d1426c5412458c6a28f -PYTHON_PYRO_LICENSE = MIT -PYTHON_PYRO_LICENSE_FILES = LICENSE -PYTHON_PYRO_CPE_ID_VENDOR = pyro_project -PYTHON_PYRO_CPE_ID_PRODUCT = pyro -PYTHON_PYRO_SETUP_TYPE = setuptools - -$(eval $(python-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:52:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:52:00 +0100 Subject: [Buildroot] [PATCH 094/107] package/python-pam: drop python2 specific package In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-95-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 + DEVELOPERS | 1 - package/Config.in | 1 - package/python-pam/0001-dealloc.patch | 25 ---- package/python-pam/0002-nofree.patch | 68 --------- .../0003-memory-errors-CVE2012-1502.patch | 136 ------------------ package/python-pam/Config.in | 16 --- package/python-pam/python-pam.hash | 3 - package/python-pam/python-pam.mk | 16 --- 9 files changed, 6 insertions(+), 266 deletions(-) delete mode 100644 package/python-pam/0001-dealloc.patch delete mode 100644 package/python-pam/0002-nofree.patch delete mode 100644 package/python-pam/0003-memory-errors-CVE2012-1502.patch delete mode 100644 package/python-pam/Config.in delete mode 100644 package/python-pam/python-pam.hash delete mode 100644 package/python-pam/python-pam.mk diff --git a/Config.in.legacy b/Config.in.legacy index 80adf521f8..386f94e72b 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_PAM + bool "python-pam removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_NFC bool "python-nfc removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 7b38d3c0f7..a6ea3793ea 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2248,7 +2248,6 @@ F: package/python-docker-pycreds/ F: package/python-enum/ F: package/python-enum34/ F: package/python-functools32/ -F: package/python-pam/ F: package/python-psutil/ F: package/python-request-id/ F: package/python-semver/ diff --git a/package/Config.in b/package/Config.in index 8dc91becb0..73e8901a1d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1115,7 +1115,6 @@ menu "External python modules" source "package/python-opcua-asyncio/Config.in" source "package/python-packaging/Config.in" source "package/python-paho-mqtt/Config.in" - source "package/python-pam/Config.in" source "package/python-paramiko/Config.in" source "package/python-parso/Config.in" source "package/python-passlib/Config.in" diff --git a/package/python-pam/0001-dealloc.patch b/package/python-pam/0001-dealloc.patch deleted file mode 100644 index dd4f9610c7..0000000000 --- a/package/python-pam/0001-dealloc.patch +++ /dev/null @@ -1,25 +0,0 @@ -[PATCH] fix two bugs in the PAM object deallocation - -Fixes https://bugzilla.redhat.com/show_bug.cgi?id=658955 - -Downloaded from: -http://pkgs.fedoraproject.org/cgit/PyPAM.git/plain/PyPAM-0.5.0-dealloc.patch - -Signed-off-by: Peter Korsgaard -diff -up PyPAM-0.5.0/PAMmodule.c.dealloc PyPAM-0.5.0/PAMmodule.c ---- PyPAM-0.5.0/PAMmodule.c.dealloc 2011-01-17 22:48:22.000000000 +0100 -+++ PyPAM-0.5.0/PAMmodule.c 2011-01-18 21:24:59.000000000 +0100 -@@ -538,10 +538,11 @@ static void PyPAM_dealloc(PyPAMObject *s - free(self->service); - free(self->user); - free(self->conv); -- pam_end(self->pamh, PAM_SUCCESS); -+ if (self->pamh) -+ pam_end(self->pamh, PAM_SUCCESS); - dlclose(self->dlh2); - dlclose(self->dlh1); -- PyMem_DEL(self); -+ PyObject_Del(self); - } - - static PyObject * PyPAM_getattr(PyPAMObject *self, char *name) diff --git a/package/python-pam/0002-nofree.patch b/package/python-pam/0002-nofree.patch deleted file mode 100644 index 7de8801707..0000000000 --- a/package/python-pam/0002-nofree.patch +++ /dev/null @@ -1,68 +0,0 @@ -[PATCH] deallocate the conversation response only in case of error - -Fixes https://bugzilla.redhat.com/show_bug.cgi?id=679714 - -Downloaded from: -http://pkgs.fedoraproject.org/cgit/PyPAM.git/plain/PyPAM-0.5.0-nofree.patch - -Signed-off-by: Peter Korsgaard -diff --git a/PAMmodule.c b/PAMmodule.c -index 03cb799..a7ff8a5 100644 ---- a/PAMmodule.c -+++ b/PAMmodule.c -@@ -24,8 +24,6 @@ typedef struct { - char *service; - char *user; - PyObject *callback; -- struct pam_response *response_data; -- int response_len; - PyObject *user_data; - void *dlh1, *dlh2; - } PyPAMObject; -@@ -54,15 +52,6 @@ static int PyPAM_conv(int num_msg, const struct pam_message **msg, - - Py_INCREF(self); - -- if (NULL != self->response_data) { -- for (int i = 0; i < self->response_len; i++) { -- free(self->response_data[0].resp); -- } -- free(self->response_data); -- self->response_data = NULL; -- self->response_len = 0; -- } -- - PyObject* msgList = PyList_New(num_msg); - - for (int i = 0; i < num_msg; i++) { -@@ -92,6 +81,10 @@ static int PyPAM_conv(int num_msg, const struct pam_message **msg, - char* resp_text; - int resp_retcode = 0; - if (!PyArg_ParseTuple(respTuple, "si", &resp_text, &resp_retcode)) { -+ while (i > 0) { -+ free((--spr)->resp); -+ --i; -+ } - free(*resp); - Py_DECREF(respList); - return PAM_CONV_ERR; -@@ -100,10 +93,6 @@ static int PyPAM_conv(int num_msg, const struct pam_message **msg, - spr->resp_retcode = resp_retcode; - Py_DECREF(respTuple); - } -- -- // Save this so we can free it later. -- self->response_data = *resp; -- self->response_len = PyList_Size(respList); - - Py_DECREF(respList); - -@@ -144,8 +133,6 @@ static PyObject * PyPAM_pam(PyObject *self, PyObject *args) - p->user = NULL; - Py_INCREF(Py_None); - p->callback = Py_None; -- p->response_data = NULL; -- p->response_len = 0; - Py_INCREF(Py_None); - p->user_data = Py_None; - diff --git a/package/python-pam/0003-memory-errors-CVE2012-1502.patch b/package/python-pam/0003-memory-errors-CVE2012-1502.patch deleted file mode 100644 index 62405db058..0000000000 --- a/package/python-pam/0003-memory-errors-CVE2012-1502.patch +++ /dev/null @@ -1,136 +0,0 @@ -[PATCH] Fix Double Free Corruption (CVE2012-1502) - -Downloaded from: -http://pkgs.fedoraproject.org/cgit/PyPAM.git/plain/PyPAM-0.5.0-memory-errors.patch - -For details, see: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-1502 - -Signed-off-by: Peter Korsgaard -diff -up PyPAM-0.5.0/PAMmodule.c.memory PyPAM-0.5.0/PAMmodule.c ---- PyPAM-0.5.0/PAMmodule.c.memory 2012-05-07 17:22:54.503914026 +0200 -+++ PyPAM-0.5.0/PAMmodule.c 2012-05-07 17:23:15.644381942 +0200 -@@ -37,33 +37,48 @@ static void PyPAM_Err(PyPAMObject *self, - - err_msg = pam_strerror(self->pamh, result); - error = Py_BuildValue("(si)", err_msg, result); -- Py_INCREF(PyPAM_Error); - PyErr_SetObject(PyPAM_Error, error); -+ Py_XDECREF(error); - } - - static int PyPAM_conv(int num_msg, const struct pam_message **msg, - struct pam_response **resp, void *appdata_ptr) - { -- PyObject *args; -- -+ PyObject *args, *msgList, *respList, *item; -+ struct pam_response *response, *spr; - PyPAMObject* self = (PyPAMObject *) appdata_ptr; -+ - if (self->callback == NULL) - return PAM_CONV_ERR; - - Py_INCREF(self); - -- PyObject* msgList = PyList_New(num_msg); -- -+ msgList = PyList_New(num_msg); -+ if (msgList == NULL) { -+ Py_DECREF(self); -+ return PAM_CONV_ERR; -+ } -+ - for (int i = 0; i < num_msg; i++) { -- PyList_SetItem(msgList, i, -- Py_BuildValue("(si)", msg[i]->msg, msg[i]->msg_style)); -+ item = Py_BuildValue("(si)", msg[i]->msg, msg[i]->msg_style); -+ if (item == NULL) { -+ Py_DECREF(msgList); -+ Py_DECREF(self); -+ return PAM_CONV_ERR; -+ } -+ PyList_SetItem(msgList, i, item); - } -- -+ - args = Py_BuildValue("(OO)", self, msgList); -- PyObject* respList = PyEval_CallObject(self->callback, args); -+ if (args == NULL) { -+ Py_DECREF(self); -+ Py_DECREF(msgList); -+ return PAM_CONV_ERR; -+ } -+ respList = PyEval_CallObject(self->callback, args); - Py_DECREF(args); - Py_DECREF(self); -- -+ - if (respList == NULL) - return PAM_CONV_ERR; - -@@ -71,11 +86,15 @@ static int PyPAM_conv(int num_msg, const - Py_DECREF(respList); - return PAM_CONV_ERR; - } -- -- *resp = (struct pam_response *) malloc( -+ -+ response = (struct pam_response *) malloc( - PyList_Size(respList) * sizeof(struct pam_response)); -+ if (response == NULL) { -+ Py_DECREF(respList); -+ return PAM_CONV_ERR; -+ } -+ spr = response; - -- struct pam_response* spr = *resp; - for (int i = 0; i < PyList_Size(respList); i++, spr++) { - PyObject* respTuple = PyList_GetItem(respList, i); - char* resp_text; -@@ -85,7 +104,7 @@ static int PyPAM_conv(int num_msg, const - free((--spr)->resp); - --i; - } -- free(*resp); -+ free(response); - Py_DECREF(respList); - return PAM_CONV_ERR; - } -@@ -95,7 +114,8 @@ static int PyPAM_conv(int num_msg, const - } - - Py_DECREF(respList); -- -+ *resp = response; -+ - return PAM_SUCCESS; - } - -@@ -122,7 +142,11 @@ static PyObject * PyPAM_pam(PyObject *se - PyPAMObject_Type.ob_type = &PyType_Type; - p = (PyPAMObject *) PyObject_NEW(PyPAMObject, &PyPAMObject_Type); - -+ if (p == NULL) -+ return NULL; -+ - if ((spc = (struct pam_conv *) malloc(sizeof(struct pam_conv))) == NULL) { -+ Py_DECREF((PyObject *)p); - PyErr_SetString(PyExc_MemoryError, "out of memory"); - return NULL; - } -@@ -455,9 +479,15 @@ static PyObject * PyPAM_getenvlist(PyObj - } - - retval = PyList_New(0); -+ if (retval == NULL) -+ return NULL; - - while ((cp = *(result++)) != NULL) { - entry = Py_BuildValue("s", cp); -+ if (entry == NULL) { -+ Py_DECREF(retval); -+ return NULL; -+ } - PyList_Append(retval, entry); - Py_DECREF(entry); - } diff --git a/package/python-pam/Config.in b/package/python-pam/Config.in deleted file mode 100644 index 92ba105ebf..0000000000 --- a/package/python-pam/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -comment "python-pam needs a toolchain w/ wchar, locale, dynamic library" - depends on BR2_PACKAGE_PYTHON - depends on !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR || BR2_STATIC_LIBS - -config BR2_PACKAGE_PYTHON_PAM - bool "python-pam" - depends on BR2_PACKAGE_PYTHON # C extension not compatible with python3 - depends on BR2_ENABLE_LOCALE # linux-pam - depends on BR2_USE_WCHAR # linux-pam - depends on BR2_USE_MMU # linux-pam - depends on !BR2_STATIC_LIBS # linux-pam - select BR2_PACKAGE_LINUX_PAM - help - PAM (Pluggable Authentication Module) bindings for Python. - - https://admin.fedoraproject.org/pkgdb/package/PyPAM/ diff --git a/package/python-pam/python-pam.hash b/package/python-pam/python-pam.hash deleted file mode 100644 index 303455ae2f..0000000000 --- a/package/python-pam/python-pam.hash +++ /dev/null @@ -1,3 +0,0 @@ -# locally computed -sha256 796ac019b9ee805696d0d277d8fb912fa2391b6ac070dc6f9f1a9a0fadbc3a5a PyPAM-0.5.0.tar.gz -sha256 ca0061fc1381a3ab242310e4b3f56389f28e3d460eb2fd822ed7a21c6f030532 COPYING diff --git a/package/python-pam/python-pam.mk b/package/python-pam/python-pam.mk deleted file mode 100644 index 943e01dd64..0000000000 --- a/package/python-pam/python-pam.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# python-pam -# -################################################################################ - -PYTHON_PAM_VERSION = 0.5.0 -PYTHON_PAM_SOURCE = PyPAM-$(PYTHON_PAM_VERSION).tar.gz -# pangalactic.org gone -PYTHON_PAM_SITE = http://pkgs.fedoraproject.org/repo/pkgs/PyPAM/PyPAM-0.5.0.tar.gz/f1e7c2c56421dda28a75ace59a3c8871 -PYTHON_PAM_SETUP_TYPE = distutils -PYTHON_PAM_LICENSE = LGPL-2.1 -PYTHON_PAM_LICENSE_FILES = COPYING -PYTHON_PAM_DEPENDENCIES = linux-pam - -$(eval $(python-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:52:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:52:07 +0100 Subject: [Buildroot] [PATCH 101/107] package/python-yieldfrom: drop python2 specific package In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-102-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++++ package/Config.in | 1 - package/python-yieldfrom/Config.in | 8 -------- package/python-yieldfrom/python-yieldfrom.hash | 5 ----- package/python-yieldfrom/python-yieldfrom.mk | 15 --------------- 5 files changed, 6 insertions(+), 29 deletions(-) delete mode 100644 package/python-yieldfrom/Config.in delete mode 100644 package/python-yieldfrom/python-yieldfrom.hash delete mode 100644 package/python-yieldfrom/python-yieldfrom.mk diff --git a/Config.in.legacy b/Config.in.legacy index 998ea6b231..47e8d696e0 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_YIELDFROM + bool "python-yieldfrom removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_TYPING bool "python-typing removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index cfc4522be9..6fb62caa4c 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1300,7 +1300,6 @@ menu "External python modules" source "package/python-xmodem/Config.in" source "package/python-yarl/Config.in" source "package/python-yatl/Config.in" - source "package/python-yieldfrom/Config.in" source "package/python-zc-lockfile/Config.in" source "package/python-zeroconf/Config.in" source "package/python-zope-interface/Config.in" diff --git a/package/python-yieldfrom/Config.in b/package/python-yieldfrom/Config.in deleted file mode 100644 index 1a063d3128..0000000000 --- a/package/python-yieldfrom/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PYTHON_YIELDFROM - bool "python-yieldfrom" - depends on BR2_PACKAGE_PYTHON - help - A backport of the `yield from` semantic from Python 3.x to - Python 2.7. - - https://github.com/Nurdok/yieldfrom/ diff --git a/package/python-yieldfrom/python-yieldfrom.hash b/package/python-yieldfrom/python-yieldfrom.hash deleted file mode 100644 index 7730a1e578..0000000000 --- a/package/python-yieldfrom/python-yieldfrom.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/yieldfrom/json -md5 fd94120625ac1e69bb5946d5e63182da yieldfrom-1.0.5.tar.gz -sha256 eb75e58641410f06083f85013a438f28bceaabfe5af9c3206d5049362c37aca0 yieldfrom-1.0.5.tar.gz -# Locally computed sha256 checksums -sha256 b3092d61cce29e25f3799285495095d220e5e015b88c1c70e1e72dae052f21e8 LICENSE diff --git a/package/python-yieldfrom/python-yieldfrom.mk b/package/python-yieldfrom/python-yieldfrom.mk deleted file mode 100644 index c926936ae8..0000000000 --- a/package/python-yieldfrom/python-yieldfrom.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# python-yieldfrom -# -################################################################################ - -PYTHON_YIELDFROM_VERSION = 1.0.5 -PYTHON_YIELDFROM_SOURCE = yieldfrom-$(PYTHON_YIELDFROM_VERSION).tar.gz -PYTHON_YIELDFROM_SITE = https://files.pythonhosted.org/packages/4d/f9/395917f574ace618eb234bcbae8df3fabaa9624532d96d1fbd3a20678b1e -PYTHON_YIELDFROM_SETUP_TYPE = setuptools -PYTHON_YIELDFROM_LICENSE = MIT -PYTHON_YIELDFROM_LICENSE_FILES = LICENSE - -$(eval $(python-package)) -$(eval $(host-python-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:52:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:52:04 +0100 Subject: [Buildroot] [PATCH 098/107] package/python-singledispatch: drop python2 specific package In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-99-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++++ package/Config.in | 1 - package/python-singledispatch/Config.in | 9 --------- .../python-singledispatch.hash | 5 ----- .../python-singledispatch/python-singledispatch.mk | 14 -------------- 5 files changed, 6 insertions(+), 29 deletions(-) delete mode 100644 package/python-singledispatch/Config.in delete mode 100644 package/python-singledispatch/python-singledispatch.hash delete mode 100644 package/python-singledispatch/python-singledispatch.mk diff --git a/Config.in.legacy b/Config.in.legacy index 319057f748..3cd78ccf1c 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_SINGLEDISPATCH + bool "python-singledispatch removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_PYRO bool "python-pyro removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index 0d8ff0d4d1..0261463f45 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1229,7 +1229,6 @@ menu "External python modules" source "package/python-simplejson/Config.in" source "package/python-simplelogging/Config.in" source "package/python-simplesqlite/Config.in" - source "package/python-singledispatch/Config.in" source "package/python-sip/Config.in" source "package/python-six/Config.in" source "package/python-slob/Config.in" diff --git a/package/python-singledispatch/Config.in b/package/python-singledispatch/Config.in deleted file mode 100644 index 4abc219f95..0000000000 --- a/package/python-singledispatch/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PYTHON_SINGLEDISPATCH - bool "python-singledispatch" - depends on BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON_SIX # runtime - help - This library brings functools.singledispatch from - Python 3.4 to Python 2.6-3.3 - - https://pypi.python.org/pypi/singledispatch diff --git a/package/python-singledispatch/python-singledispatch.hash b/package/python-singledispatch/python-singledispatch.hash deleted file mode 100644 index c4eec53e30..0000000000 --- a/package/python-singledispatch/python-singledispatch.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=af2fc6a3d6cc5a02d0bf54d909785fcb -md5 af2fc6a3d6cc5a02d0bf54d909785fcb singledispatch-3.4.0.3.tar.gz -# Locally computed -sha256 5b06af87df13818d14f08a028e42f566640aef80805c3b50c5056b086e3c2b9c singledispatch-3.4.0.3.tar.gz -sha256 5a724c436f88585973787af91cecf58503cbf09e5c1721c516880614700767ef setup.py diff --git a/package/python-singledispatch/python-singledispatch.mk b/package/python-singledispatch/python-singledispatch.mk deleted file mode 100644 index 7e1d5ac8e0..0000000000 --- a/package/python-singledispatch/python-singledispatch.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-singledispatch -# -################################################################################ - -PYTHON_SINGLEDISPATCH_VERSION = 3.4.0.3 -PYTHON_SINGLEDISPATCH_SOURCE = singledispatch-$(PYTHON_SINGLEDISPATCH_VERSION).tar.gz -PYTHON_SINGLEDISPATCH_SITE = https://pypi.python.org/packages/source/s/singledispatch -PYTHON_SINGLEDISPATCH_LICENSE = MIT -PYTHON_SINGLEDISPATCH_LICENSE_FILES = setup.py -PYTHON_SINGLEDISPATCH_SETUP_TYPE = setuptools - -$(eval $(python-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:52:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:52:10 +0100 Subject: [Buildroot] [PATCH 104/107] package/python-enum: drop python2 specific package In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-105-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/python-enum/Config.in | 12 ------------ package/python-enum/python-enum.hash | 5 ----- package/python-enum/python-enum.mk | 14 -------------- 6 files changed, 6 insertions(+), 33 deletions(-) delete mode 100644 package/python-enum/Config.in delete mode 100644 package/python-enum/python-enum.hash delete mode 100644 package/python-enum/python-enum.mk diff --git a/Config.in.legacy b/Config.in.legacy index 630194edba..bc5df0e489 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_ENUM + bool "python-enum removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_DIALOG bool "python-dialog removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 8112873f14..0716729cee 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2243,7 +2243,6 @@ F: package/python-cached-property/ F: package/python-docker/ F: package/python-dockerpty/ F: package/python-docker-pycreds/ -F: package/python-enum/ F: package/python-enum34/ F: package/python-functools32/ F: package/python-psutil/ diff --git a/package/Config.in b/package/Config.in index b91e190c8e..f134b626be 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1010,7 +1010,6 @@ menu "External python modules" source "package/python-ecdsa/Config.in" source "package/python-engineio/Config.in" source "package/python-entrypoints/Config.in" - source "package/python-enum/Config.in" source "package/python-enum34/Config.in" source "package/python-esptool/Config.in" source "package/python-falcon/Config.in" diff --git a/package/python-enum/Config.in b/package/python-enum/Config.in deleted file mode 100644 index e26ae8bf97..0000000000 --- a/package/python-enum/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_PYTHON_ENUM - bool "python-enum" - depends on BR2_PACKAGE_PYTHON - help - Robust enumerated type support in Python - - An enumeration object is an immutable sequence object built - from a sequence of strings. Each value is also available as - an attribute. Such values are constant. Comparisons and - enumeration are supported. - - https://pypi.python.org/pypi/enum diff --git a/package/python-enum/python-enum.hash b/package/python-enum/python-enum.hash deleted file mode 100644 index 4b4b369e34..0000000000 --- a/package/python-enum/python-enum.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/enum/json -md5 e7d170e3f84435b77058de625c96ef58 enum-0.4.7.tar.gz -sha256 8c7cf3587eda51008bcc1eed99ea2c331ccd265c231dbaa95ec5258d3dc03100 enum-0.4.7.tar.gz -# Locally computed sha256 checksums -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL-3 diff --git a/package/python-enum/python-enum.mk b/package/python-enum/python-enum.mk deleted file mode 100644 index f1de8a9312..0000000000 --- a/package/python-enum/python-enum.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-enum -# -################################################################################ - -PYTHON_ENUM_VERSION = 0.4.7 -PYTHON_ENUM_SOURCE = enum-$(PYTHON_ENUM_VERSION).tar.gz -PYTHON_ENUM_SITE = https://files.pythonhosted.org/packages/02/a0/32e1d5a21b703f600183e205aafc6773577e16429af5ad3c3f9b956b07ca -PYTHON_ENUM_SETUP_TYPE = setuptools -PYTHON_ENUM_LICENSE = GPL-3.0+ -PYTHON_ENUM_LICENSE_FILES = LICENSE.GPL-3 - -$(eval $(python-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:52:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:52:05 +0100 Subject: [Buildroot] [PATCH 099/107] package/python-subprocess32: drop python2 specific package In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-100-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++ package/Config.in | 1 - package/python-subprocess32/Config.in | 13 -------- .../python-subprocess32.hash | 5 --- .../python-subprocess32.mk | 31 ------------------- 5 files changed, 6 insertions(+), 50 deletions(-) delete mode 100644 package/python-subprocess32/Config.in delete mode 100644 package/python-subprocess32/python-subprocess32.hash delete mode 100644 package/python-subprocess32/python-subprocess32.mk diff --git a/Config.in.legacy b/Config.in.legacy index 3cd78ccf1c..8db9558ed4 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_SUBPROCESS32 + bool "python-subprocess32 removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_SINGLEDISPATCH bool "python-singledispatch removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index 0261463f45..18de2a32a5 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1243,7 +1243,6 @@ menu "External python modules" source "package/python-sqlalchemy/Config.in" source "package/python-sqliteschema/Config.in" source "package/python-sqlparse/Config.in" - source "package/python-subprocess32/Config.in" source "package/python-systemd/Config.in" source "package/python-tabledata/Config.in" source "package/python-tempora/Config.in" diff --git a/package/python-subprocess32/Config.in b/package/python-subprocess32/Config.in deleted file mode 100644 index d7fe84f1e6..0000000000 --- a/package/python-subprocess32/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_PYTHON_SUBPROCESS32 - bool "python-subprocess32" - depends on BR2_PACKAGE_PYTHON - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 || !BR2_MIPS_NABI64 - help - A backport of the Python 3 subprocess module for use - on Python 2. - - https://github.com/google/python-subprocess32 - -comment "python-subprocess32 needs a toolchain w/ headers >= 3.10 on MIPS N64" - depends on BR2_MIPS_NABI64 - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 diff --git a/package/python-subprocess32/python-subprocess32.hash b/package/python-subprocess32/python-subprocess32.hash deleted file mode 100644 index 65d18763d1..0000000000 --- a/package/python-subprocess32/python-subprocess32.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/subprocess32/json -md5 748844d560be5f0c707931cba1cdb48b subprocess32-3.5.4.tar.gz -sha256 eb2937c80497978d181efa1b839ec2d9622cf9600a039a79d0e108d1f9aec79d subprocess32-3.5.4.tar.gz -# Locally computed sha256 checksums -sha256 826b43437249d39422642f695154d064da64de92eb1476048a615f50bc1beb4a LICENSE diff --git a/package/python-subprocess32/python-subprocess32.mk b/package/python-subprocess32/python-subprocess32.mk deleted file mode 100644 index fb8a47f974..0000000000 --- a/package/python-subprocess32/python-subprocess32.mk +++ /dev/null @@ -1,31 +0,0 @@ -################################################################################ -# -# python-subprocess32 -# -################################################################################ - -PYTHON_SUBPROCESS32_VERSION = 3.5.4 -PYTHON_SUBPROCESS32_SOURCE = subprocess32-$(PYTHON_SUBPROCESS32_VERSION).tar.gz -PYTHON_SUBPROCESS32_SITE = https://files.pythonhosted.org/packages/32/c8/564be4d12629b912ea431f1a50eb8b3b9d00f1a0b1ceff17f266be190007 -PYTHON_SUBPROCESS32_SETUP_TYPE = setuptools -PYTHON_SUBPROCESS32_LICENSE = Python-2.0 -PYTHON_SUBPROCESS32_LICENSE_FILES = LICENSE - -# The configure step needs to be run outside of the setup.py since it isn't -# run correctly for cross-compiling -define PYTHON_SUBPROCESS32_CONFIGURE_CMDS - (cd $(@D) && \ - $(TARGET_CONFIGURE_OPTS) \ - $(TARGET_CONFIGURE_ARGS) \ - ./configure \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - --prefix=/usr \ - --exec-prefix=/usr \ - --sysconfdir=/etc \ - --program-prefix="" \ - ) -endef - -$(eval $(python-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:52:12 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:52:12 +0100 Subject: [Buildroot] [PATCH 106/107] package/python-functools32: drop python2 specific package In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-107-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/python-functools32/Config.in | 8 -------- package/python-functools32/python-functools32.hash | 4 ---- package/python-functools32/python-functools32.mk | 14 -------------- 6 files changed, 6 insertions(+), 28 deletions(-) delete mode 100644 package/python-functools32/Config.in delete mode 100644 package/python-functools32/python-functools32.hash delete mode 100644 package/python-functools32/python-functools32.mk diff --git a/Config.in.legacy b/Config.in.legacy index 7df95691ca..49c24e61bf 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_FUNCTOOLS32 + bool "python-functools32 removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_ENUM34 bool "python-enum34 removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 92abe8a6dd..0e759bc168 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2243,7 +2243,6 @@ F: package/python-cached-property/ F: package/python-docker/ F: package/python-dockerpty/ F: package/python-docker-pycreds/ -F: package/python-functools32/ F: package/python-psutil/ F: package/python-request-id/ F: package/python-semver/ diff --git a/package/Config.in b/package/Config.in index 18388f82c3..1a9f3e29d8 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1026,7 +1026,6 @@ menu "External python modules" source "package/python-flup/Config.in" source "package/python-fonttools/Config.in" source "package/python-frozenlist/Config.in" - source "package/python-functools32/Config.in" source "package/python-future/Config.in" source "package/python-git/Config.in" source "package/python-gitdb2/Config.in" diff --git a/package/python-functools32/Config.in b/package/python-functools32/Config.in deleted file mode 100644 index 606341d828..0000000000 --- a/package/python-functools32/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PYTHON_FUNCTOOLS32 - bool "python-functools32" - depends on BR2_PACKAGE_PYTHON - help - Backport of the functools module from Python 3.2.3 for use on - 2.7 and PyPy. - - https://github.com/MiCHiLU/python-functools32 diff --git a/package/python-functools32/python-functools32.hash b/package/python-functools32/python-functools32.hash deleted file mode 100644 index 606de81774..0000000000 --- a/package/python-functools32/python-functools32.hash +++ /dev/null @@ -1,4 +0,0 @@ -# md5 from https://pypi.python.org/pypi/functools32/json, sha256 locally computed -md5 09f24ffd9af9f6cd0f63cb9f4e23d4b2 functools32-3.2.3-2.tar.gz -sha256 f6253dfbe0538ad2e387bd8fdfd9293c925d63553f5813c4e587745416501e6d functools32-3.2.3-2.tar.gz -sha256 3f9ea6b89abe1556b72aff67b987d64c8272564815cd6a2832e6c4f6abdfe3b1 LICENSE diff --git a/package/python-functools32/python-functools32.mk b/package/python-functools32/python-functools32.mk deleted file mode 100644 index 8a88bb2a7f..0000000000 --- a/package/python-functools32/python-functools32.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-functools32 -# -################################################################################ - -PYTHON_FUNCTOOLS32_VERSION = 3.2.3-2 -PYTHON_FUNCTOOLS32_SOURCE = functools32-$(PYTHON_FUNCTOOLS32_VERSION).tar.gz -PYTHON_FUNCTOOLS32_SITE = https://pypi.python.org/packages/c5/60/6ac26ad05857c601308d8fb9e87fa36d0ebf889423f47c3502ef034365db -PYTHON_FUNCTOOLS32_SETUP_TYPE = distutils -PYTHON_FUNCTOOLS32_LICENSE = Python-2.0 -PYTHON_FUNCTOOLS32_LICENSE_FILES = LICENSE - -$(eval $(python-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:52:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:52:09 +0100 Subject: [Buildroot] [PATCH 103/107] package/python-dialog: drop python2 specific package In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-104-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++++ package/Config.in | 1 - package/python-dialog/Config.in | 10 ---------- package/python-dialog/python-dialog.hash | 5 ----- package/python-dialog/python-dialog.mk | 15 --------------- 5 files changed, 6 insertions(+), 31 deletions(-) delete mode 100644 package/python-dialog/Config.in delete mode 100644 package/python-dialog/python-dialog.hash delete mode 100644 package/python-dialog/python-dialog.mk diff --git a/Config.in.legacy b/Config.in.legacy index 6776048fc4..630194edba 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_DIALOG + bool "python-dialog removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_CONFIGOBJ bool "python-configobj removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index 478a4e6b90..b91e190c8e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -994,7 +994,6 @@ menu "External python modules" source "package/python-dbus-next/Config.in" source "package/python-decorator/Config.in" source "package/python-defusedxml/Config.in" - source "package/python-dialog/Config.in" source "package/python-dialog3/Config.in" source "package/python-dicttoxml/Config.in" source "package/python-distro/Config.in" diff --git a/package/python-dialog/Config.in b/package/python-dialog/Config.in deleted file mode 100644 index c1fdb23723..0000000000 --- a/package/python-dialog/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_PYTHON_DIALOG - bool "python-dialog" - depends on BR2_PACKAGE_PYTHON - depends on BR2_USE_MMU # dialog - select BR2_PACKAGE_DIALOG - help - A Python interface to the UNIX dialog utility and - mostly-compatible programs. - - http://pythondialog.sourceforge.net/ diff --git a/package/python-dialog/python-dialog.hash b/package/python-dialog/python-dialog.hash deleted file mode 100644 index 8f84e198b2..0000000000 --- a/package/python-dialog/python-dialog.hash +++ /dev/null @@ -1,5 +0,0 @@ -# Locally computed after verifying -# https://sourceforge.net/projects/pythondialog/files/pythondialog/3.4.0/python3-pythondialog-3.4.0.tar.bz2.asc -# with key 9B6F19FB52965E6C21FE76142A205688F8489BDD -sha256 8978d355c8db6728eeb9e23b39449b14597f1c76cb06dc72462642ca7cde46a0 python2-pythondialog-3.4.0.tar.bz2 -sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING diff --git a/package/python-dialog/python-dialog.mk b/package/python-dialog/python-dialog.mk deleted file mode 100644 index d5d4a4ceb5..0000000000 --- a/package/python-dialog/python-dialog.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# python-dialog -# -################################################################################ - -PYTHON_DIALOG_VERSION = 3.4.0 -PYTHON_DIALOG_SOURCE = python2-pythondialog-$(PYTHON_DIALOG_VERSION).tar.bz2 -PYTHON_DIALOG_SITE = http://downloads.sourceforge.net/project/pythondialog/pythondialog/$(PYTHON_DIALOG_VERSION) -PYTHON_DIALOG_LICENSE = LGPL-2.1+ -PYTHON_DIALOG_LICENSE_FILES = COPYING -PYTHON_DIALOG_SETUP_TYPE = distutils -PYTHON_DIALOG_DEPENDENCIES = dialog - -$(eval $(python-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:52:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:52:06 +0100 Subject: [Buildroot] [PATCH 100/107] package/python-typing: drop python2 specific package In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-101-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++++ package/Config.in | 1 - package/python-typing/Config.in | 8 -------- package/python-typing/python-typing.hash | 5 ----- package/python-typing/python-typing.mk | 15 --------------- 5 files changed, 6 insertions(+), 29 deletions(-) delete mode 100644 package/python-typing/Config.in delete mode 100644 package/python-typing/python-typing.hash delete mode 100644 package/python-typing/python-typing.mk diff --git a/Config.in.legacy b/Config.in.legacy index 8db9558ed4..998ea6b231 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_TYPING + bool "python-typing removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_SUBPROCESS32 bool "python-subprocess32 removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index 18de2a32a5..cfc4522be9 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1264,7 +1264,6 @@ menu "External python modules" source "package/python-txdbus/Config.in" source "package/python-txtorcon/Config.in" source "package/python-typepy/Config.in" - source "package/python-typing/Config.in" source "package/python-typing-extensions/Config.in" source "package/python-u-msgpack/Config.in" source "package/python-ubjson/Config.in" diff --git a/package/python-typing/Config.in b/package/python-typing/Config.in deleted file mode 100644 index 81b7d71b4b..0000000000 --- a/package/python-typing/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PYTHON_TYPING - bool "python-typing" - depends on BR2_PACKAGE_PYTHON - help - Type Hints for Python. This is a backport of the standard - library typing module to Python versions older than 3.5. - - https://docs.python.org/3/library/typing.html diff --git a/package/python-typing/python-typing.hash b/package/python-typing/python-typing.hash deleted file mode 100644 index f587eb7bfa..0000000000 --- a/package/python-typing/python-typing.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/typing/json -md5 d6dd450cfe0c8c6547eef09a0491775d typing-3.10.0.0.tar.gz -sha256 13b4ad211f54ddbf93e5901a9967b1e07720c1d1b78d596ac6a439641aa1b130 typing-3.10.0.0.tar.gz -# Locally computed sha256 checksums -sha256 ff17ce94e102024deb68773eb1cc74ca76da4e658f373531f0ac22d68a6bb1ad LICENSE diff --git a/package/python-typing/python-typing.mk b/package/python-typing/python-typing.mk deleted file mode 100644 index dd1d8f29b5..0000000000 --- a/package/python-typing/python-typing.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# python-typing -# -################################################################################ - -PYTHON_TYPING_VERSION = 3.10.0.0 -PYTHON_TYPING_SOURCE = typing-$(PYTHON_TYPING_VERSION).tar.gz -PYTHON_TYPING_SITE = https://files.pythonhosted.org/packages/b0/1b/835d4431805939d2996f8772aca1d2313a57e8860fec0e48e8e7dfe3a477 -PYTHON_TYPING_SETUP_TYPE = setuptools -PYTHON_TYPING_LICENSE = Python-2.0, others -PYTHON_TYPING_LICENSE_FILES = LICENSE - -$(eval $(python-package)) -$(eval $(host-python-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:52:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:52:02 +0100 Subject: [Buildroot] [PATCH 096/107] package/python-pypcap: drop python2 specific package In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-97-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/python-pypcap/Config.in | 9 --------- package/python-pypcap/python-pypcap.hash | 3 --- package/python-pypcap/python-pypcap.mk | 21 --------------------- 6 files changed, 6 insertions(+), 35 deletions(-) delete mode 100644 package/python-pypcap/Config.in delete mode 100644 package/python-pypcap/python-pypcap.hash delete mode 100644 package/python-pypcap/python-pypcap.mk diff --git a/Config.in.legacy b/Config.in.legacy index 74317a2d7c..f99535411d 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_PYPCAP + bool "python-pypcap removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_PATHLIB2 bool "python-pathlib2 removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 07f9304766..9c1411648e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1934,7 +1934,6 @@ F: package/python-ipy/ F: package/python-iwlib/ F: package/python-posix-ipc/ F: package/python-pycairo/ -F: package/python-pypcap/ F: package/python-pyrex/ F: package/python-pysftp/ F: package/python-tinyrpc/ diff --git a/package/Config.in b/package/Config.in index 3c55dec6c5..d406d372d3 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1172,7 +1172,6 @@ menu "External python modules" source "package/python-pyopenssl/Config.in" source "package/python-pyparsing/Config.in" source "package/python-pyparted/Config.in" - source "package/python-pypcap/Config.in" source "package/python-pyphen/Config.in" source "package/python-pyqrcode/Config.in" source "package/python-pyqt5/Config.in" diff --git a/package/python-pypcap/Config.in b/package/python-pypcap/Config.in deleted file mode 100644 index 9b410ecc2b..0000000000 --- a/package/python-pypcap/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYPCAP - bool "python-pypcap" - depends on BR2_PACKAGE_PYTHON - select BR2_PACKAGE_LIBPCAP - help - The pypcap module is an object-oriented wrapper of the C - libpcap library. - - https://github.com/dugsong/pypcap diff --git a/package/python-pypcap/python-pypcap.hash b/package/python-pypcap/python-pypcap.hash deleted file mode 100644 index 40db6b4f33..0000000000 --- a/package/python-pypcap/python-pypcap.hash +++ /dev/null @@ -1,3 +0,0 @@ -# locally computed -sha256 5716d97b39d40b79daf7b0c6a8c8c514f5f1de8f20561c8621ee62a90b93fb03 python-pypcap-6f46e7bf29a648256ddc732a7d0ec83d3ffca390.tar.gz -sha256 48306c284fdbdf836b880528c3bdd658deac47ed78ffeb24a4ca5a8c39a39304 LICENSE diff --git a/package/python-pypcap/python-pypcap.mk b/package/python-pypcap/python-pypcap.mk deleted file mode 100644 index fc6fc6ed92..0000000000 --- a/package/python-pypcap/python-pypcap.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# python-pypcap -# -################################################################################ - -PYTHON_PYPCAP_VERSION = 6f46e7bf29a648256ddc732a7d0ec83d3ffca390 -PYTHON_PYPCAP_SITE = $(call github,dugsong,pypcap,$(PYTHON_PYPCAP_VERSION)) -PYTHON_PYPCAP_LICENSE = BSD-3-Clause -PYTHON_PYPCAP_LICENSE_FILES = LICENSE -PYTHON_PYPCAP_SETUP_TYPE = distutils -PYTHON_PYPCAP_DEPENDENCIES = host-python-pyrex libpcap - -define PYTHON_PYPCAP_CONFIGURE_CMDS - $(HOST_DIR)/bin/python2 $(HOST_DIR)/bin/pyrexc $(@D)/pcap.pyx - (cd $(@D); \ - $(HOST_DIR)/bin/python setup.py \ - config --with-pcap=$(STAGING_DIR)/usr) -endef - -$(eval $(python-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:52:11 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:52:11 +0100 Subject: [Buildroot] [PATCH 105/107] package/python-enum34: drop python2 specific package In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-106-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/python-enum34/Config.in | 12 ------------ package/python-enum34/python-enum34.hash | 5 ----- package/python-enum34/python-enum34.mk | 17 ----------------- 6 files changed, 6 insertions(+), 36 deletions(-) delete mode 100644 package/python-enum34/Config.in delete mode 100644 package/python-enum34/python-enum34.hash delete mode 100644 package/python-enum34/python-enum34.mk diff --git a/Config.in.legacy b/Config.in.legacy index bc5df0e489..7df95691ca 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_ENUM34 + bool "python-enum34 removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_ENUM bool "python-enum removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 0716729cee..92abe8a6dd 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2243,7 +2243,6 @@ F: package/python-cached-property/ F: package/python-docker/ F: package/python-dockerpty/ F: package/python-docker-pycreds/ -F: package/python-enum34/ F: package/python-functools32/ F: package/python-psutil/ F: package/python-request-id/ diff --git a/package/Config.in b/package/Config.in index f134b626be..18388f82c3 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1010,7 +1010,6 @@ menu "External python modules" source "package/python-ecdsa/Config.in" source "package/python-engineio/Config.in" source "package/python-entrypoints/Config.in" - source "package/python-enum34/Config.in" source "package/python-esptool/Config.in" source "package/python-falcon/Config.in" source "package/python-filelock/Config.in" diff --git a/package/python-enum34/Config.in b/package/python-enum34/Config.in deleted file mode 100644 index 2511a350e0..0000000000 --- a/package/python-enum34/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_PYTHON_ENUM34 - bool "python-enum34" - depends on BR2_PACKAGE_PYTHON - help - Python 3.4 Enum backported to 2.x. - - An enumeration is a set of symbolic names (members) bound to - unique, constant values. Within an enumeration, the members - can be compared by identity, and the enumeration itself can - be iterated over. - - https://pypi.python.org/pypi/enum34 diff --git a/package/python-enum34/python-enum34.hash b/package/python-enum34/python-enum34.hash deleted file mode 100644 index e43e00a5fe..0000000000 --- a/package/python-enum34/python-enum34.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5 from https://pypi.python.org/pypi/enum34/json -md5 b5ac0bb5ea9e830029599e410d09d3b5 enum34-1.1.10.tar.gz -# Locally computed -sha256 cce6a7477ed816bd2542d03d53db9f0db935dd013b70f336a95c73979289f248 enum34-1.1.10.tar.gz -sha256 88ec6a6c8eafa3b9757e745783938bef3f5e4d5e3c76b1db576aa3ab520e5e1d enum/LICENSE diff --git a/package/python-enum34/python-enum34.mk b/package/python-enum34/python-enum34.mk deleted file mode 100644 index 0bd00508aa..0000000000 --- a/package/python-enum34/python-enum34.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# python-enum34 -# -################################################################################ - -PYTHON_ENUM34_VERSION = 1.1.10 -PYTHON_ENUM34_SOURCE = enum34-$(PYTHON_ENUM34_VERSION).tar.gz -PYTHON_ENUM34_SITE = https://files.pythonhosted.org/packages/11/c4/2da1f4952ba476677a42f25cd32ab8aaf0e1c0d0e00b89822b835c7e654c -PYTHON_ENUM34_SETUP_TYPE = setuptools -PYTHON_ENUM34_LICENSE = BSD-3-Clause -PYTHON_ENUM34_LICENSE_FILES = enum/LICENSE -PYTHON_ENUM34_CPE_ID_VENDOR = python -PYTHON_ENUM34_CPE_ID_PRODUCT = enum34 - -$(eval $(python-package)) -$(eval $(host-python-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:52:13 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:52:13 +0100 Subject: [Buildroot] [PATCH 107/107] docs/manual: drop python2 references In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-108-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- docs/manual/adding-packages-python.txt | 8 -------- docs/manual/writing-rules.txt | 8 ++++---- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/docs/manual/adding-packages-python.txt b/docs/manual/adding-packages-python.txt index 0c100859be..cfd2f88920 100644 --- a/docs/manual/adding-packages-python.txt +++ b/docs/manual/adding-packages-python.txt @@ -67,14 +67,6 @@ Python build system, but are not Python modules, can freely choose their name (existing examples in Buildroot are +scons+ and +supervisor+). -Packages that are only compatible with one version of Python (as in: -Python 2 or Python 3) should depend on that version explicitely in -their +Config.in+ file (+BR2_PACKAGE_PYTHON+ for Python 2, -+BR2_PACKAGE_PYTHON3+ for Python 3). Packages that are compatible -with both versions should not explicitely depend on them in their -+Config.in+ file, since that condition is already expressed for the -whole "External python modules" menu. - The main macro of the Python package infrastructure is +python-package+. It is similar to the +generic-package+ macro. It is also possible to create Python host packages with the diff --git a/docs/manual/writing-rules.txt b/docs/manual/writing-rules.txt index 3eec095d0e..6255a08c1c 100644 --- a/docs/manual/writing-rules.txt +++ b/docs/manual/writing-rules.txt @@ -93,9 +93,9 @@ so _make_ recognizes them as commands. YES: + --------------------- -ifeq ($(BR2_PACKAGE_PYTHON),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) LIBFOO_CONF_OPTS += --with-python-support -LIBFOO_DEPENDENCIES += python +LIBFOO_DEPENDENCIES += python3 else LIBFOO_CONF_OPTS += --without-python-support endif @@ -104,8 +104,8 @@ endif NO: + --------------------- -LIBFOO_CONF_OPTS += --with$(if $(BR2_PACKAGE_PYTHON),,out)-python-support -LIBFOO_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,) +LIBFOO_CONF_OPTS += --with$(if $(BR2_PACKAGE_PYTHON3),,out)-python-support +LIBFOO_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON3),python3,) --------------------- ** Keep configure options and dependencies close together. -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:52:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:52:08 +0100 Subject: [Buildroot] [PATCH 102/107] package/python-configobj: drop python2 specific package In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-103-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++++ DEVELOPERS | 2 -- package/Config.in | 1 - package/Config.in.host | 1 - package/python-configobj/Config.in | 10 ---------- package/python-configobj/python-configobj.hash | 3 --- package/python-configobj/python-configobj.mk | 14 -------------- 7 files changed, 6 insertions(+), 31 deletions(-) delete mode 100644 package/python-configobj/Config.in delete mode 100644 package/python-configobj/python-configobj.hash delete mode 100644 package/python-configobj/python-configobj.mk diff --git a/Config.in.legacy b/Config.in.legacy index 47e8d696e0..6776048fc4 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_CONFIGOBJ + bool "python-configobj removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_YIELDFROM bool "python-yieldfrom removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 9c1411648e..8112873f14 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2796,7 +2796,6 @@ F: package/ne10/ F: package/pkg-python.mk F: package/pkg-autotools.mk F: package/pkg-generic.mk -F: package/python/ F: package/python3/ F: package/python-augeas/ F: package/python-flask-expects-json/ @@ -3034,7 +3033,6 @@ F: package/grantlee/ F: package/libusb/ F: package/libusb-compat/ F: package/proj/ -F: package/python-configobj/ F: package/python-iniparse/ F: package/qjson/ F: package/quazip/ diff --git a/package/Config.in b/package/Config.in index 6fb62caa4c..478a4e6b90 100644 --- a/package/Config.in +++ b/package/Config.in @@ -973,7 +973,6 @@ menu "External python modules" source "package/python-colorama/Config.in" source "package/python-colorlog/Config.in" source "package/python-colorzero/Config.in" - source "package/python-configobj/Config.in" source "package/python-configshell-fb/Config.in" source "package/python-constantly/Config.in" source "package/python-couchdb/Config.in" diff --git a/package/Config.in.host b/package/Config.in.host index 341e24926b..e5fbb07fc2 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -69,7 +69,6 @@ menu "Host utilities" source "package/pkgconf/Config.in.host" source "package/pru-software-support/Config.in.host" 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" diff --git a/package/python-configobj/Config.in b/package/python-configobj/Config.in deleted file mode 100644 index fc57e26f1c..0000000000 --- a/package/python-configobj/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_PYTHON_CONFIGOBJ - bool "python-configobj" - depends on BR2_PACKAGE_PYTHON - help - ConfigObj is a simple but powerful config file reader and - writer: an ini file round tripper. Its main feature is that - it is very easy to use, with a straightforward programmer's - interface and a simple syntax for config files. - - http://www.voidspace.org.uk/python/configobj.html diff --git a/package/python-configobj/python-configobj.hash b/package/python-configobj/python-configobj.hash deleted file mode 100644 index d43c453796..0000000000 --- a/package/python-configobj/python-configobj.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/configobj/json, sha256 locally computed -md5 e472a3a1c2a67bb0ec9b5d54c13a47d6 configobj-5.0.6.tar.gz -sha256 a2f5650770e1c87fb335af19a9b7eb73fc05ccf22144eb68db7d00cd2bcb0902 configobj-5.0.6.tar.gz diff --git a/package/python-configobj/python-configobj.mk b/package/python-configobj/python-configobj.mk deleted file mode 100644 index 9e281d28e7..0000000000 --- a/package/python-configobj/python-configobj.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-configobj -# -################################################################################ - -PYTHON_CONFIGOBJ_VERSION = 5.0.6 -PYTHON_CONFIGOBJ_SOURCE = configobj-$(PYTHON_CONFIGOBJ_VERSION).tar.gz -PYTHON_CONFIGOBJ_SITE = https://pypi.python.org/packages/64/61/079eb60459c44929e684fa7d9e2fdca403f67d64dd9dbac27296be2e0fab -PYTHON_CONFIGOBJ_LICENSE = BSD-3-Clause -# License only mentioned in the source -PYTHON_CONFIGOBJ_SETUP_TYPE = distutils - -$(eval $(python-package)) -- 2.20.1 From giulio.benetti at benettiengineering.com Wed Feb 9 16:57:48 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 9 Feb 2022 17:57:48 +0100 Subject: [Buildroot] [PATCH 1/2] configs/zynqmp_zcu106: Bump ATF/U-Boot/Linux to Xilinx 2022 -v2 In-Reply-To: <20220209082821.72879-1-neal.frager@xilinx.com> References: <20220209082821.72879-1-neal.frager@xilinx.com> Message-ID: Hi Neal, the subject doesn't need "-v2" in it. I'm pretty sure you've used the wrong command to generate the V2 patchset. This are the correct commands: # cd buildroot # git format-patch -s -M -o . -2 then retrieve who to send to with: # ./utils/get-developers *.patch take the output and add people alredy in Cc for the rest On 09/02/22 09:28, Neal Frager wrote: > This patch: > - bumps configs/zynqmp_zcu106_defconfig to Xilinx 2022 What does this ^^^ line means? Xilinx 2022? Maybe it is what it's already below, Linux, u-boot, ATF. So I think you can drop it > - bumps ATF to Xilinx v2.6: mainline v2.6 requires patch to build > - bumps U-Boot to Xilinx 2022.01: important drivers not in mainline > - bumps Linux to Xilinx 5.15: important drivers not in mainline > - deletes board/zynqmp/patches directory: patches already in mainline as you see below, this patch doesn't delete those patches and folder > - modifies board/zynqmp/genimage.cfg: U-Boot 2022.01 uses u-boot.itb format > - adds extlinux.conf to vfat bootfs it's worth mentioning that it switches from boot.scr to extlinux.conf also > - modifies U-Boot to unified xilinx_zynqmp_virt_defconfig (supports all boards) > - adds support for SPL pm_cfg_obj.c loading to PMU firmware > - adds support for host machines without SSL ^^^ - enable support for host machines without OpenSSL required by u-boot Because you don't add support and it's OpenSSL that is required by u-boot > > Signed-off-by: Neal Frager > --- > board/zynqmp/extlinux.conf | 4 + > board/zynqmp/genimage.cfg | 6 +- > board/zynqmp/pm_cfg_obj.c | 614 ++++++++++++++++++++++++++++++++ > board/zynqmp/post-build.sh | 10 + > board/zynqmp/post-image.sh | 4 +- > board/zynqmp/readme.txt | 23 +- > configs/zynqmp_zcu106_defconfig | 23 +- > 7 files changed, 665 insertions(+), 19 deletions(-) > create mode 100644 board/zynqmp/extlinux.conf > create mode 100644 board/zynqmp/pm_cfg_obj.c > create mode 100755 board/zynqmp/post-build.sh As mentioned above deletes are missing > diff --git a/board/zynqmp/extlinux.conf b/board/zynqmp/extlinux.conf > new file mode 100644 > index 0000000000..15ef707ea2 > --- /dev/null > +++ b/board/zynqmp/extlinux.conf > @@ -0,0 +1,4 @@ > +label linux > + kernel /Image > + devicetree /system.dtb > + append console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait > diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg > index ed202f4550..20d8352c08 100644 > --- a/board/zynqmp/genimage.cfg > +++ b/board/zynqmp/genimage.cfg > @@ -2,11 +2,13 @@ image boot.vfat { > vfat { > files = { > "boot.bin", > - "u-boot.bin", > - "atf-uboot.ub", > + "u-boot.itb", > "system.dtb", > "Image" > } > + file extlinux/extlinux.conf { > + image = extlinux.conf > + } > } > > size = 32M > diff --git a/board/zynqmp/pm_cfg_obj.c b/board/zynqmp/pm_cfg_obj.c > new file mode 100644 > index 0000000000..7566b3236a > --- /dev/null > +++ b/board/zynqmp/pm_cfg_obj.c > @@ -0,0 +1,614 @@ > +/****************************************************************************** > +* Copyright (c) 2017 - 2020 Xilinx, Inc. All rights reserved. > +* SPDX-License-Identifier: MIT > +******************************************************************************/ > + > + > +#include "xil_types.h" > +#include "pm_defs.h" > + > +#define PM_CONFIG_MASTER_SECTION_ID 0x101U > +#define PM_CONFIG_SLAVE_SECTION_ID 0x102U > +#define PM_CONFIG_PREALLOC_SECTION_ID 0x103U > +#define PM_CONFIG_POWER_SECTION_ID 0x104U > +#define PM_CONFIG_RESET_SECTION_ID 0x105U > +#define PM_CONFIG_SHUTDOWN_SECTION_ID 0x106U > +#define PM_CONFIG_SET_CONFIG_SECTION_ID 0x107U > +#define PM_CONFIG_GPO_SECTION_ID 0x108U > + > +#define PM_SLAVE_FLAG_IS_SHAREABLE 0x1U > +#define PM_MASTER_USING_SLAVE_MASK 0x2U > + > +#define PM_CONFIG_GPO1_MIO_PIN_34_MAP (1U << 10U) > +#define PM_CONFIG_GPO1_MIO_PIN_35_MAP (1U << 11U) > +#define PM_CONFIG_GPO1_MIO_PIN_36_MAP (1U << 12U) > +#define PM_CONFIG_GPO1_MIO_PIN_37_MAP (1U << 13U) > + > +#define PM_CONFIG_GPO1_BIT_2_MASK (1U << 2U) > +#define PM_CONFIG_GPO1_BIT_3_MASK (1U << 3U) > +#define PM_CONFIG_GPO1_BIT_4_MASK (1U << 4U) > +#define PM_CONFIG_GPO1_BIT_5_MASK (1U << 5U) > + > +#define SUSPEND_TIMEOUT 0xFFFFFFFFU > + > + > +#define PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK 0x00000001 > +#define PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK 0x00000100 > +#define PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK 0x00000200 > + > + > + > +#if defined (__ICCARM__) > +#pragma language=save > +#pragma language=extended > +#endif > +#if defined (__GNUC__) > + const u32 XPm_ConfigObject[] __attribute__((used, section(".sys_cfg_data"))) = > +#elif defined (__ICCARM__) > +#pragma location = ".sys_cfg_data" > +__root const u32 XPm_ConfigObject[] = > +#endif > +{ > + /**********************************************************************/ > + /* HEADER */ > + 1, /* Number of remaining words in the header */ > + 8, /* Number of sections included in config object */ > + /**********************************************************************/ > + /* MASTER SECTION */ > + PM_CONFIG_MASTER_SECTION_ID, /* Master SectionID */ > + 3U, /* No. of Masters*/ > + > + NODE_APU, /* Master Node ID */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask of this master */ > + SUSPEND_TIMEOUT, /* Suspend timeout */ > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ > + > + NODE_RPU_0, /* Master Node ID */ > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask of this master */ > + SUSPEND_TIMEOUT, /* Suspend timeout */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ > + > + NODE_RPU_1, /* Master Node ID */ > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask of this master */ > + SUSPEND_TIMEOUT, /* Suspend timeout */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Suspend permissions */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Wake permissions */ > + > + > + /**********************************************************************/ > + /* SLAVE SECTION */ > + > + > + PM_CONFIG_SLAVE_SECTION_ID, /* Section ID */ > + 49, /* Number of slaves */ > + > + NODE_OCM_BANK_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_OCM_BANK_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_OCM_BANK_2, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_OCM_BANK_3, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_TCM_0_A, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ > + > + NODE_TCM_0_B, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ > + > + NODE_TCM_1_A, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_TCM_1_B, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_L2, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_GPU_PP_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_GPU_PP_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_USB_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_USB_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_TTC_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_TTC_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_TTC_2, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_TTC_3, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_SATA, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_ETH_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_ETH_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_ETH_2, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_ETH_3, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_UART_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_UART_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_SPI_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_SPI_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_I2C_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_I2C_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_SD_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_SD_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_DP, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_GDMA, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_ADMA, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_NAND, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_QSPI, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_GPIO, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_CAN_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_CAN_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_EXTERN, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_DDR, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_IPI_APU, > + 0U, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask */ > + > + NODE_IPI_RPU_0, > + 0U, > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ > + > + NODE_IPI_RPU_1, > + 0U, > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_GPU, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_PCIE, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_PCAP, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_RTC, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_VCU, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_PL, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + > + /**********************************************************************/ > + /* PREALLOC SECTION */ > + > + PM_CONFIG_PREALLOC_SECTION_ID, /* Preallaoc SectionID */ > + 3U, /* No. of Masters*/ > + > +/* Prealloc for psu_cortexa53_0 */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, > + 12, > + NODE_DDR, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_L2, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_0, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_2, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_3, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_I2C_0, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_I2C_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_SD_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_QSPI, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_PL, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_IPI_APU, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + > + /* Prealloc for psu_cortexr5_0 */ > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, > + 14, > + NODE_TCM_0_A, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_TCM_0_B, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_DDR, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_0, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_2, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_3, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_I2C_0, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_I2C_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_SD_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_QSPI, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_PL, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_ADMA, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_IPI_RPU_0, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + > + /* Prealloc for psu_cortexr5_1 */ > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + 3, > + NODE_TCM_1_A, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_TCM_1_B, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_IPI_RPU_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + > + /**********************************************************************/ > + /* POWER SECTION */ > + > + PM_CONFIG_POWER_SECTION_ID, /* Power Section ID */ > + 4U, /* Number of power nodes */ > + > + NODE_APU, /* Power node ID */ > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ > + > + NODE_RPU, /* Power node ID */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ > + > + NODE_FPD, /* Power node ID */ > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ > + > + NODE_PLD, /* Power node ID */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ > + > + > + /**********************************************************************/ > + /* RESET SECTION */ > + > + PM_CONFIG_RESET_SECTION_ID, /* Reset Section ID */ > + 120U, /* Number of resets */ > + > + XILPM_RESET_PCIE_CFG, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_PCIE_BRIDGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_PCIE_CTRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_DP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SWDT_CRF, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_AFI_FM5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_AFI_FM4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_AFI_FM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_AFI_FM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_AFI_FM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_AFI_FM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GDMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPU_PP1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPU_PP0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPU, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SATA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU3_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU2_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU1_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU0_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_APU_L2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_DDR, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_APM_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SOFT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GEM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GEM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GEM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GEM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_QSPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_UART0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_UART1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SPI0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SPI1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SDIO0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SDIO1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_CAN0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_CAN1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_I2C0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_I2C1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_TTC0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_TTC1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_TTC2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_TTC3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SWDT_CRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_NAND, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ADMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPIO, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_IOU_CC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_TIMESTAMP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPU_R50, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPU_R51, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPU_AMBA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_OCM, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPU_PGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_USB0_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_USB1_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_USB0_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_USB1_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_USB0_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_USB1_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_IPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_APM_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RTC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SYSMON, 0, > + XILPM_RESET_AFI_FM6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_LPD_SWDT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_FPD, PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, > + XILPM_RESET_RPU_DBG1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPU_DBG0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_DBG_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_DBG_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_APLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_DPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_VPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_IOPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_7, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_8, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_9, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_10, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_11, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_12, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_13, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_14, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_15, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_16, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_17, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_18, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_19, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_20, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_21, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_22, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_23, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_24, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_25, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_26, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_27, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_28, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_29, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_30, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_31, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPU_LS, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_PS_ONLY, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_PL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPIO5_EMIO_92, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPIO5_EMIO_93, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPIO5_EMIO_94, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPIO5_EMIO_95, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + > + /**********************************************************************/ > + /* SET CONFIG SECTION */ > + PM_CONFIG_SET_CONFIG_SECTION_ID, /* Section ID */ > + 0, /* Permissions to set config */ > + /**********************************************************************/ > + /* SHUTDOWN SECTION */ > + PM_CONFIG_SHUTDOWN_SECTION_ID, /* Section ID */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* System Shutdown/Restart Permission */ > + > + /**********************************************************************/ > + /* GPO SECTION */ > + PM_CONFIG_GPO_SECTION_ID, /* GPO Section ID */ > + PM_CONFIG_GPO1_BIT_2_MASK | > + PM_CONFIG_GPO1_MIO_PIN_34_MAP | > + PM_CONFIG_GPO1_MIO_PIN_35_MAP | > + PM_CONFIG_GPO1_MIO_PIN_36_MAP | > + PM_CONFIG_GPO1_MIO_PIN_37_MAP | > + 0, /* State of GPO pins */ > +}; > +#if defined (__ICCARM__) > +#pragma language=restore > +#endif > diff --git a/board/zynqmp/post-build.sh b/board/zynqmp/post-build.sh > new file mode 100755 > index 0000000000..ef55f49376 > --- /dev/null > +++ b/board/zynqmp/post-build.sh > @@ -0,0 +1,10 @@ > +#!/bin/sh > + > +# genimage will need to find the extlinux.conf > +# in the binaries directory > + > +BOARD_DIR="$(dirname $0)" > + > +install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux.conf > + > + please remove useless whiteline, we only need 1 at the end of the file > diff --git a/board/zynqmp/post-image.sh b/board/zynqmp/post-image.sh > index b2b99fed01..ed6dbe188c 100755 > --- a/board/zynqmp/post-image.sh > +++ b/board/zynqmp/post-image.sh > @@ -10,4 +10,6 @@ FIRST_DT=$(sed -nr \ > > [ -z "${FIRST_DT}" ] || ln -fs ${FIRST_DT}.dtb ${BINARIES_DIR}/system.dtb > > -support/scripts/genimage.sh -c board/zynqmp/genimage.cfg > +BOARD_DIR="$(dirname $0)" > + > +support/scripts/genimage.sh -c $BOARD_DIR/genimage.cfg > diff --git a/board/zynqmp/readme.txt b/board/zynqmp/readme.txt > index da37f4ccc9..0dc1793e03 100644 > --- a/board/zynqmp/readme.txt > +++ b/board/zynqmp/readme.txt > @@ -1,10 +1,19 @@ > -******************************** > -Xilinx ZCU106 board - ZynqMP SoC > -******************************** > +****************************************** > +Xilinx ZCU102 / ZCU106 boards - ZynqMP SoC > +****************************************** This ^^^ must be moved to next patch since this patch only deals with zcu106 and not with zcu102 > + > +This document describes the Buildroot support for the ZCU102 and ZCU106 > +boards by Xilinx, based on the Zynq UltraScale+ MPSoC (aka ZynqMP). > +It has been tested with the ZCU102 and ZCU106 production boards. Same here ^^^ > + > +Evaluation board features can be found here with the links below. > + > +ZCU102: > +https://www.xilinx.com/products/boards-and-kits/zcu102.html Ditto > +ZCU106: > +https://www.xilinx.com/products/boards-and-kits/zcu106.html > > -This document describes the Buildroot support for the ZCU106 board by > -Xilinx, based on the Zynq UltraScale+ MPSoC (aka ZynqMP). It has been > -tested with the EK-U1-ZCU106-ES2 pre-production board. > > How to build it > =============== > @@ -32,7 +41,7 @@ After building, you should get a tree like this: > +-- rootfs.ext4 -> rootfs.ext2 > +-- sdcard.img > +-- system.dtb -> zynqmp-zcu106-revA.dtb > - +-- u-boot.bin > + +-- u-boot.itb > `-- zynqmp-zcu106-revA.dtb > > How to write the SD card > diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig > index bee7c1daf7..2026f60bd1 100644 > --- a/configs/zynqmp_zcu106_defconfig > +++ b/configs/zynqmp_zcu106_defconfig > @@ -1,34 +1,39 @@ > BR2_aarch64=y > -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_GIT=y > BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" > -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.15" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > # BR2_TARGET_ROOTFS_TAR is not set > BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.6" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" > -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7" > -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA" > +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2022.01" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" > BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > BR2_TARGET_UBOOT_SPL=y > BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" > BR2_TARGET_UBOOT_ZYNQMP=y > -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/53fdb7b6c92860ceb0ec5fd14deee302f4a84269/bin/pmufw-zcu106-default-v2017.4.bin" > +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/v2021.2/bin/pmufw-v2021.2.bin" > +BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/pm_cfg_obj.c" > +BR2_TARGET_UBOOT_FORMAT_ITB=y > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > BR2_PACKAGE_HOST_DOSFSTOOLS=y > BR2_PACKAGE_HOST_GENIMAGE=y > BR2_PACKAGE_HOST_MTOOLS=y For the rest it looks good to me and it builds correctly using docker. Best regards -- Giulio Benetti Benetti Engineering sas From peter at korsgaard.com Wed Feb 9 16:50:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:33 +0100 Subject: [Buildroot] [PATCH 007/107] package/cracklib: move python support to python3 In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-8-peter@korsgaard.com> The configure script needs a bit of help to detect the python version. Signed-off-by: Peter Korsgaard --- package/cracklib/cracklib.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/package/cracklib/cracklib.mk b/package/cracklib/cracklib.mk index 8e6a844f11..46917b7926 100644 --- a/package/cracklib/cracklib.mk +++ b/package/cracklib/cracklib.mk @@ -20,9 +20,12 @@ else CRACKLIB_CONF_OPTS += --without-zlib endif -ifeq ($(BR2_PACKAGE_PYTHON),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) CRACKLIB_CONF_OPTS += --with-python -CRACKLIB_DEPENDENCIES += python +CRACKLIB_CONF_ENV += \ + ac_cv_path_PYTHON=$(HOST_DIR)/bin/python3 \ + am_cv_python_version=$(PYTHON3_VERSION_MAJOR) +CRACKLIB_DEPENDENCIES += python3 else CRACKLIB_CONF_OPTS += --without-python endif -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:31 +0100 Subject: [Buildroot] [PATCH 005/107] package/boost: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-6-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/boost/Config.in | 2 +- package/boost/boost.mk | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/package/boost/Config.in b/package/boost/Config.in index 2c458bf88a..33a5337096 100644 --- a/package/boost/Config.in +++ b/package/boost/Config.in @@ -296,7 +296,7 @@ config BR2_PACKAGE_BOOST_PROGRAM_OPTIONS config BR2_PACKAGE_BOOST_PYTHON bool "boost-python" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 help The Boost Python Library is a framework for interfacing Python and C++. It allows you to quickly and seamlessly expose C++ diff --git a/package/boost/boost.mk b/package/boost/boost.mk index b6681b0ad3..032ba5c820 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -68,16 +68,11 @@ BOOST_DEPENDENCIES += bzip2 zlib endif ifeq ($(BR2_PACKAGE_BOOST_PYTHON),y) -BOOST_FLAGS += --with-python-root=$(HOST_DIR) -ifeq ($(BR2_PACKAGE_PYTHON3),y) -BOOST_FLAGS += --with-python=$(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) +BOOST_FLAGS += \ + --with-python-root=$(HOST_DIR) \ + --with-python=$(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) BOOST_TARGET_CXXFLAGS += -I$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) BOOST_DEPENDENCIES += python3 -else -BOOST_FLAGS += --with-python=$(HOST_DIR)/bin/python$(PYTHON_VERSION_MAJOR) -BOOST_TARGET_CXXFLAGS += -I$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) -BOOST_DEPENDENCIES += python -endif endif HOST_BOOST_OPTS += --no-cmake-config toolset=gcc threading=multi \ -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:38 +0100 Subject: [Buildroot] [PATCH 012/107] package/evemu: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-13-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/evemu/evemu.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/evemu/evemu.mk b/package/evemu/evemu.mk index 02e5abdb8f..b27033afa4 100644 --- a/package/evemu/evemu.mk +++ b/package/evemu/evemu.mk @@ -22,9 +22,9 @@ EVEMU_CONF_OPTS += --disable-tests EVEMU_DEPENDENCIES = host-pkgconf libevdev # Check for target python -ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) EVEMU_CONF_OPTS += --enable-python-bindings -EVEMU_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON3),python3,python) +EVEMU_DEPENDENCIES += python3 else EVEMU_CONF_OPTS += --disable-python-bindings endif -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:28 +0100 Subject: [Buildroot] [PATCH 002/107] package/python: drop target package In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-3-peter@korsgaard.com> Python 2.7 is EOL since April 2020, so drop support for the target package. https://www.python.org/dev/peps/pep-0373/ Signed-off-by: Peter Korsgaard --- Config.in.legacy | 8 +++ package/Config.in | 3 +- package/python/Config.in | 139 --------------------------------------- 3 files changed, 9 insertions(+), 141 deletions(-) delete mode 100644 package/python/Config.in diff --git a/Config.in.legacy b/Config.in.legacy index 34d8c71cc8..6bc3803a5c 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,14 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON + bool "python2.7 package removed" + select BR2_LEGACY + help + Python 2.7 is EOL since April 2020 and has been removed. + + https://www.python.org/dev/peps/pep-0373/ + config BR2_TARGET_UBOOT_ZYNQ_IMAGE bool "Generate image for Xilinx Zynq" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index d631ed784a..ca2fb363e3 100644 --- a/package/Config.in +++ b/package/Config.in @@ -897,9 +897,8 @@ if BR2_STATIC_LIBS comment "External PHP extensions need a toolchain w/ dynamic library" endif endif - source "package/python/Config.in" source "package/python3/Config.in" -if BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 +if BR2_PACKAGE_PYTHON3 menu "External python modules" source "package/python-aenum/Config.in" source "package/python-aexpect/Config.in" diff --git a/package/python/Config.in b/package/python/Config.in deleted file mode 100644 index ab6950cae8..0000000000 --- a/package/python/Config.in +++ /dev/null @@ -1,139 +0,0 @@ -comment "python needs a toolchain w/ wchar, threads, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS - -config BR2_PACKAGE_PYTHON - bool "python2.7 (deprecated)" - depends on BR2_USE_WCHAR - # uses fork() - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_THREADS # libffi - depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_LIBFFI - help - The python language interpreter. - - http://www.python.org/ - -if BR2_PACKAGE_PYTHON - -choice - prompt "python module format to install" - default BR2_PACKAGE_PYTHON_PYC_ONLY - help - Select Python module format to install on target (py, pyc or - both) - -config BR2_PACKAGE_PYTHON_PY_ONLY - bool ".py sources only" - -config BR2_PACKAGE_PYTHON_PYC_ONLY - bool ".pyc compiled sources only" - -config BR2_PACKAGE_PYTHON_PY_PYC - bool ".py sources and .pyc compiled" - -endchoice - -menu "core python modules" - -comment "The following modules are unusual or require extra libraries" - -config BR2_PACKAGE_PYTHON_2TO3 - bool "2to3 module" - help - code translation from python 2 to 3 - -config BR2_PACKAGE_PYTHON_BZIP2 - bool "bzip2 module" - select BR2_PACKAGE_BZIP2 - help - bzip2 module for Python - -config BR2_PACKAGE_PYTHON_BSDDB - bool "bsddb module" - select BR2_PACKAGE_BERKELEYDB - help - bsddb module for Python. - -config BR2_PACKAGE_PYTHON_CODECSCJK - bool "codecscjk module" - help - Chinese/Japanese/Korean codecs module for Python (large). - -config BR2_PACKAGE_PYTHON_CURSES - bool "curses module" - select BR2_PACKAGE_NCURSES - help - curses module for Python. - -config BR2_PACKAGE_PYTHON_OSSAUDIODEV - bool "ossaudiodev module" - help - ossaudiodev module for Python. - -config BR2_PACKAGE_PYTHON_READLINE - bool "readline" - select BR2_PACKAGE_READLINE - help - readline module for Python (required for command-line - editing in the Python shell). - -config BR2_PACKAGE_PYTHON_SSL - bool "ssl" - select BR2_PACKAGE_OPENSSL - help - _ssl module for Python (required for https in urllib etc). - -config BR2_PACKAGE_PYTHON_UNICODEDATA - bool "unicodedata module" - default y - help - Unicode character database (used by stringprep module) - (large). - -if BR2_PACKAGE_PYTHON_UNICODEDATA - -choice - prompt "Python unicode database format" - default BR2_PACKAGE_PYTHON_UCS2 - help - Select Python unicode database format for target - -config BR2_PACKAGE_PYTHON_UCS2 - bool "Universal Character Set 2-byte (UCS2)" - -config BR2_PACKAGE_PYTHON_UCS4 - bool "Universal Character Set 4-byte (UCS4)" - -endchoice - -endif - -config BR2_PACKAGE_PYTHON_SQLITE - bool "sqlite module" - select BR2_PACKAGE_SQLITE - help - SQLite database support - -config BR2_PACKAGE_PYTHON_PYEXPAT - bool "xml module" - select BR2_PACKAGE_EXPAT - help - pyexpat and xml libraries for Python - -config BR2_PACKAGE_PYTHON_ZLIB - bool "zlib module" - select BR2_PACKAGE_ZLIB - help - zlib support in Python - -config BR2_PACKAGE_PYTHON_HASHLIB - bool "hashlib module" - select BR2_PACKAGE_OPENSSL - help - hashlib support in Python - -endmenu - -endif -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:27 +0100 Subject: [Buildroot] [PATCH 001/107] support/testing: drop python2 tests In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-2-peter@korsgaard.com> Python2 for the target is about to get removed, so drop the tests using it. Signed-off-by: Peter Korsgaard --- .../tests/package/sample_python_subprocess32.py | 6 ------ support/testing/tests/package/test_bmap_tools.py | 8 -------- support/testing/tests/package/test_crudini.py | 8 -------- support/testing/tests/package/test_libftdi1.py | 12 ------------ support/testing/tests/package/test_python.py | 14 -------------- support/testing/tests/package/test_python_argh.py | 9 --------- .../testing/tests/package/test_python_bitstring.py | 10 ---------- support/testing/tests/package/test_python_can.py | 11 ----------- support/testing/tests/package/test_python_cbor.py | 11 ----------- support/testing/tests/package/test_python_click.py | 9 --------- .../tests/package/test_python_constantly.py | 10 ---------- support/testing/tests/package/test_python_gnupg.py | 10 ---------- .../tests/package/test_python_incremental.py | 11 ----------- .../testing/tests/package/test_python_passlib.py | 11 ----------- .../testing/tests/package/test_python_pexpect.py | 10 ---------- .../testing/tests/package/test_python_pynacl.py | 11 ----------- .../testing/tests/package/test_python_pyyaml.py | 11 ----------- .../tests/package/test_python_subprocess32.py | 11 ----------- .../testing/tests/package/test_python_ubjson.py | 11 ----------- 19 files changed, 194 deletions(-) delete mode 100644 support/testing/tests/package/sample_python_subprocess32.py delete mode 100644 support/testing/tests/package/test_python_subprocess32.py diff --git a/support/testing/tests/package/sample_python_subprocess32.py b/support/testing/tests/package/sample_python_subprocess32.py deleted file mode 100644 index 8579745cc8..0000000000 --- a/support/testing/tests/package/sample_python_subprocess32.py +++ /dev/null @@ -1,6 +0,0 @@ -import subprocess32 - -output = subprocess32.check_output(["ls", "-l", "/dev/null"]) -print(output) -assert("/dev/null" in output) -assert("No such" not in output) diff --git a/support/testing/tests/package/test_bmap_tools.py b/support/testing/tests/package/test_bmap_tools.py index baa23154f8..a179027633 100644 --- a/support/testing/tests/package/test_bmap_tools.py +++ b/support/testing/tests/package/test_bmap_tools.py @@ -45,14 +45,6 @@ class TestBmapTools(BRTest): self.assertRunOk(cmd, timeout=20) -class TestPy2BmapTools(TestBmapTools): - __test__ = True - config = TestBmapTools.config + \ - """ - BR2_PACKAGE_PYTHON=y - """ - - class TestPy3BmapTools(TestBmapTools): __test__ = True config = TestBmapTools.config + \ diff --git a/support/testing/tests/package/test_crudini.py b/support/testing/tests/package/test_crudini.py index e320d3207e..470a714eb6 100644 --- a/support/testing/tests/package/test_crudini.py +++ b/support/testing/tests/package/test_crudini.py @@ -33,14 +33,6 @@ class TestCrudiniBase(TestPythonPackageBase): self.assertEqual(out, ['this-is-the-magic-value']) -class TestCrudiniPy2(TestCrudiniBase): - __test__ = True - config = TestCrudiniBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - """ - - class TestCrudiniPy3(TestCrudiniBase): __test__ = True config = TestCrudiniBase.config + \ diff --git a/support/testing/tests/package/test_libftdi1.py b/support/testing/tests/package/test_libftdi1.py index 78c928484c..5c29dea04f 100644 --- a/support/testing/tests/package/test_libftdi1.py +++ b/support/testing/tests/package/test_libftdi1.py @@ -1,18 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Libftdi1(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_LIBFTDI1=y - BR2_PACKAGE_LIBFTDI1_PYTHON_BINDINGS=y - """ - sample_scripts = ["tests/package/sample_libftdi1.py"] - timeout = 40 - - class TestPythonPy3Libftdi1(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python.py b/support/testing/tests/package/test_python.py index 60da8765c4..f29aff6624 100644 --- a/support/testing/tests/package/test_python.py +++ b/support/testing/tests/package/test_python.py @@ -39,20 +39,6 @@ class TestPythonBase(infra.basetest.BRTest): self.assertEqual(exit_code, 1) -class TestPython2(TestPythonBase): - config = TestPythonBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - """ - - def test_run(self): - self.login() - self.version_test("Python 2") - self.math_floor_test() - self.libc_time_test() - self.zlib_test() - - class TestPython3(TestPythonBase): config = TestPythonBase.config + \ """ diff --git a/support/testing/tests/package/test_python_argh.py b/support/testing/tests/package/test_python_argh.py index de4b4cbe74..887d9acd46 100644 --- a/support/testing/tests/package/test_python_argh.py +++ b/support/testing/tests/package/test_python_argh.py @@ -27,15 +27,6 @@ class TestPythonArgh(TestPythonPackageBase): self.assertEqual(exit_code, 2) -class TestPythonPy2Argh(TestPythonArgh): - __test__ = True - config = TestPythonArgh.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_ARGH=y - """ - - class TestPythonPy3Argh(TestPythonArgh): __test__ = True config = TestPythonArgh.config + \ diff --git a/support/testing/tests/package/test_python_bitstring.py b/support/testing/tests/package/test_python_bitstring.py index 63b3fdb69c..bd358a2fc5 100644 --- a/support/testing/tests/package/test_python_bitstring.py +++ b/support/testing/tests/package/test_python_bitstring.py @@ -1,16 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Bitstring(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_BITSTRING=y - """ - sample_scripts = ["tests/package/sample_python_bitstring.py"] - - class TestPythonPy3Bitstring(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python_can.py b/support/testing/tests/package/test_python_can.py index d509d05dbb..dba5539c5d 100644 --- a/support/testing/tests/package/test_python_can.py +++ b/support/testing/tests/package/test_python_can.py @@ -1,17 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Can(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_CAN=y - """ - sample_scripts = ["tests/package/sample_python_can.py"] - timeout = 40 - - class TestPythonPy3Can(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python_cbor.py b/support/testing/tests/package/test_python_cbor.py index 9da3503763..23a1e3e701 100644 --- a/support/testing/tests/package/test_python_cbor.py +++ b/support/testing/tests/package/test_python_cbor.py @@ -1,17 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Cbor(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_CBOR=y - """ - sample_scripts = ["tests/package/sample_python_cbor_enc.py", - "tests/package/sample_python_cbor_dec.py"] - - class TestPythonPy3Cbor(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python_click.py b/support/testing/tests/package/test_python_click.py index db57d3aa9f..0ee9702cce 100644 --- a/support/testing/tests/package/test_python_click.py +++ b/support/testing/tests/package/test_python_click.py @@ -26,15 +26,6 @@ class TestPythonClick(TestPythonPackageBase): self.assertEqual(exit_code, 2) -class TestPythonPy2Click(TestPythonClick): - __test__ = True - config = TestPythonClick.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_CLICK=y - """ - - class TestPythonPy3Click(TestPythonClick): __test__ = True config = TestPythonClick.config + \ diff --git a/support/testing/tests/package/test_python_constantly.py b/support/testing/tests/package/test_python_constantly.py index 5be01c4f8c..edcb9bfd69 100644 --- a/support/testing/tests/package/test_python_constantly.py +++ b/support/testing/tests/package/test_python_constantly.py @@ -1,16 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Constantly(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_CONSTANTLY=y - """ - sample_scripts = ["tests/package/sample_python_constantly.py"] - - class TestPythonPy3Constantly(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python_gnupg.py b/support/testing/tests/package/test_python_gnupg.py index 0c71f6b6d0..8861115130 100644 --- a/support/testing/tests/package/test_python_gnupg.py +++ b/support/testing/tests/package/test_python_gnupg.py @@ -1,16 +1,6 @@ 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 + \ diff --git a/support/testing/tests/package/test_python_incremental.py b/support/testing/tests/package/test_python_incremental.py index 49800d8937..4c53d61321 100644 --- a/support/testing/tests/package/test_python_incremental.py +++ b/support/testing/tests/package/test_python_incremental.py @@ -1,17 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Incremental(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_INCREMENTAL=y - """ - sample_scripts = ["tests/package/sample_python_incremental.py"] - timeout = 30 - - class TestPythonPy3Incremental(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python_passlib.py b/support/testing/tests/package/test_python_passlib.py index 7c85882bf8..e12e86d91b 100644 --- a/support/testing/tests/package/test_python_passlib.py +++ b/support/testing/tests/package/test_python_passlib.py @@ -1,17 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Passlib(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_PASSLIB=y - """ - sample_scripts = ["tests/package/sample_python_passlib.py"] - timeout = 30 - - class TestPythonPy3Passlib(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python_pexpect.py b/support/testing/tests/package/test_python_pexpect.py index ba31cdbdbe..70037a7d3c 100644 --- a/support/testing/tests/package/test_python_pexpect.py +++ b/support/testing/tests/package/test_python_pexpect.py @@ -1,16 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Pexpect(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_PEXPECT=y - """ - sample_scripts = ["tests/package/sample_python_pexpect.py"] - - class TestPythonPy3Pexpect(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python_pynacl.py b/support/testing/tests/package/test_python_pynacl.py index f4dd54940a..cef8a7e780 100644 --- a/support/testing/tests/package/test_python_pynacl.py +++ b/support/testing/tests/package/test_python_pynacl.py @@ -1,17 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Pynacl(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_PYNACL=y - """ - sample_scripts = ["tests/package/sample_python_pynacl.py"] - timeout = 10 - - class TestPythonPy3Pynacl(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python_pyyaml.py b/support/testing/tests/package/test_python_pyyaml.py index cd45a57b86..9d0a351f72 100644 --- a/support/testing/tests/package/test_python_pyyaml.py +++ b/support/testing/tests/package/test_python_pyyaml.py @@ -1,17 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Pyyaml(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_PYYAML=y - """ - sample_scripts = ["tests/package/sample_python_pyyaml_enc.py", - "tests/package/sample_python_pyyaml_dec.py"] - - class TestPythonPy3Pyyaml(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python_subprocess32.py b/support/testing/tests/package/test_python_subprocess32.py deleted file mode 100644 index d2878046d1..0000000000 --- a/support/testing/tests/package/test_python_subprocess32.py +++ /dev/null @@ -1,11 +0,0 @@ -from tests.package.test_python import TestPythonPackageBase - - -class TestPythonPy2Subprocess32(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_SUBPROCESS32=y - """ - sample_scripts = ["tests/package/sample_python_subprocess32.py"] diff --git a/support/testing/tests/package/test_python_ubjson.py b/support/testing/tests/package/test_python_ubjson.py index 85c707e292..a15dbd54b8 100644 --- a/support/testing/tests/package/test_python_ubjson.py +++ b/support/testing/tests/package/test_python_ubjson.py @@ -1,17 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Ubjson(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_UBJSON=y - """ - sample_scripts = ["tests/package/sample_python_ubjson_enc.py", - "tests/package/sample_python_ubjson_dec.py"] - - class TestPythonPy3Ubjson(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:51 +0100 Subject: [Buildroot] [PATCH 025/107] package/libpwquality: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-26-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/libpwquality/libpwquality.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libpwquality/libpwquality.mk b/package/libpwquality/libpwquality.mk index 54a03be453..d4f7a47120 100644 --- a/package/libpwquality/libpwquality.mk +++ b/package/libpwquality/libpwquality.mk @@ -12,9 +12,9 @@ LIBPWQUALITY_INSTALL_STAGING = YES LIBPWQUALITY_DEPENDENCIES = cracklib LIBPWQUALITY_LICENSE_FILES = COPYING -ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) LIBPWQUALITY_CONF_OPTS += --enable-python-bindings -LIBPWQUALITY_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON3),python3,python) +LIBPWQUALITY_DEPENDENCIES += python3 LIBPWQUALITY_MAKE_ENV += $(PKG_PYTHON_DISTUTILS_ENV) else LIBPWQUALITY_CONF_OPTS += --disable-python-bindings -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:50:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:50:43 +0100 Subject: [Buildroot] [PATCH 017/107] package/i2c-tools: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-18-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/i2c-tools/i2c-tools.mk | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/package/i2c-tools/i2c-tools.mk b/package/i2c-tools/i2c-tools.mk index 7565349f5e..5c9ce26628 100644 --- a/package/i2c-tools/i2c-tools.mk +++ b/package/i2c-tools/i2c-tools.mk @@ -13,10 +13,6 @@ I2C_TOOLS_CPE_ID_VENDOR = i2c-tools_project I2C_TOOLS_MAKE_OPTS = EXTRA=eeprog I2C_TOOLS_INSTALL_STAGING = YES -ifeq ($(BR2_PACKAGE_PYTHON),y) -I2C_TOOLS_DEPENDENCIES += python -endif - ifeq ($(BR2_PACKAGE_PYTHON3),y) I2C_TOOLS_DEPENDENCIES += python3 endif @@ -31,7 +27,7 @@ endif # Build/install steps mirror the distutil python package type in the python package # infrastructure -ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) # BASE_ENV taken from PKG_PYTHON_DISTUTILS_ENV in package/pkg-python.mk I2C_TOOLS_PYTHON_BASE_ENV = \ $(PKG_PYTHON_DISTUTILS_ENV) \ @@ -51,7 +47,7 @@ define I2C_TOOLS_INSTALL_PYSMBUS $(PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS)) endef -endif # BR2_PACKAGE_PYTHON +endif # BR2_PACKAGE_PYTHON3 define I2C_TOOLS_BUILD_CMDS $(MAKE) $(TARGET_CONFIGURE_OPTS) $(I2C_TOOLS_MAKE_OPTS) -C $(@D) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:12 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:12 +0100 Subject: [Buildroot] [PATCH 046/107] package/python-logbook: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-47-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-logbook/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-logbook/Config.in b/package/python-logbook/Config.in index d4fbf0fe67..99996b6517 100644 --- a/package/python-logbook/Config.in +++ b/package/python-logbook/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_LOGBOOK bool "python-logbook" - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_ZLIB help A logging replacement for Python. -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:11 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:11 +0100 Subject: [Buildroot] [PATCH 045/107] package/python-libconfig: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-46-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-libconfig/python-libconfig.mk | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/package/python-libconfig/python-libconfig.mk b/package/python-libconfig/python-libconfig.mk index 2db7e99cf3..c7d87f408a 100644 --- a/package/python-libconfig/python-libconfig.mk +++ b/package/python-libconfig/python-libconfig.mk @@ -14,14 +14,8 @@ PYTHON_LIBCONFIG_SETUP_TYPE = setuptools PYTHON_LIBCONFIG_DEPENDENCIES = libconfig boost -ifeq ($(BR2_PACKAGE_PYTHON),y) -PYTHON_LIBCONFIG_PYVER = $(PYTHON_VERSION_MAJOR) -else ifeq ($(BR2_PACKAGE_PYTHON3),y) -PYTHON_LIBCONFIG_PYVER = $(PYTHON3_VERSION_MAJOR) -endif - define PYTHON_LIBCONFIG_FIX_SETUP - $(SED) 's/boost_python/boost_python$(subst .,,$(PYTHON_LIBCONFIG_PYVER))/g' \ + $(SED) 's/boost_python/boost_python$(subst .,,$(PYTHON3_VERSION_MAJOR))/g' \ $(@D)/setup.py endef PYTHON_LIBCONFIG_POST_PATCH_HOOKS += PYTHON_LIBCONFIG_FIX_SETUP -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:42 +0100 Subject: [Buildroot] [PATCH 076/107] package/snmpclitools: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-77-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/snmpclitools/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/snmpclitools/Config.in b/package/snmpclitools/Config.in index 00bf5994d1..bf3668a89b 100644 --- a/package/snmpclitools/Config.in +++ b/package/snmpclitools/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_SNMPCLITOOLS bool "snmpclitools" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_PYSMI # runtime select BR2_PACKAGE_PYTHON_PYSNMP # runtime help -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:00 +0100 Subject: [Buildroot] [PATCH 034/107] package/python-aenum: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-35-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-aenum/python-aenum.mk | 9 --------- 1 file changed, 9 deletions(-) diff --git a/package/python-aenum/python-aenum.mk b/package/python-aenum/python-aenum.mk index 98695d99ce..72eaa1db2b 100644 --- a/package/python-aenum/python-aenum.mk +++ b/package/python-aenum/python-aenum.mk @@ -11,13 +11,4 @@ PYTHON_AENUM_SETUP_TYPE = setuptools PYTHON_AENUM_LICENSE = BSD-3-Clause PYTHON_AENUM_LICENSE_FILES = aenum/LICENSE -ifeq ($(BR2_PACKAGE_PYTHON),y) -# only needed/valid for python 3.x -define PYTHON_AENUM_RM_PY3_FILE - rm -f $(TARGET_DIR)/usr/lib/python*/site-packages/aenum/test_v3.py -endef - -PYTHON_AENUM_POST_INSTALL_TARGET_HOOKS += PYTHON_AENUM_RM_PY3_FILE -endif - $(eval $(python-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:55 +0100 Subject: [Buildroot] [PATCH 089/107] package/python-id3: drop python2 specific package In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-90-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/python-id3/Config.in | 9 --------- package/python-id3/python-id3.hash | 3 --- package/python-id3/python-id3.mk | 14 -------------- 6 files changed, 6 insertions(+), 28 deletions(-) delete mode 100644 package/python-id3/Config.in delete mode 100644 package/python-id3/python-id3.hash delete mode 100644 package/python-id3/python-id3.mk diff --git a/Config.in.legacy b/Config.in.legacy index 7e85e4cf63..03ea14a512 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_ID3 + bool "python-id3 removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_FUTURES bool "python-futures removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index d2ed22dac0..985f43b614 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -729,7 +729,6 @@ F: package/wireless-regdb/ N: Dominik Faessler F: package/logsurfer/ -F: package/python-id3/ N: Doug Kehn F: package/nss-pam-ldapd/ diff --git a/package/Config.in b/package/Config.in index b18d298a1b..0ee1c8ddb4 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1049,7 +1049,6 @@ menu "External python modules" source "package/python-hyperframe/Config.in" source "package/python-hyperlink/Config.in" source "package/python-ibmiotf/Config.in" - source "package/python-id3/Config.in" source "package/python-idna/Config.in" source "package/python-ifaddr/Config.in" source "package/python-incremental/Config.in" diff --git a/package/python-id3/Config.in b/package/python-id3/Config.in deleted file mode 100644 index 6ddfd541bd..0000000000 --- a/package/python-id3/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PYTHON_ID3 - bool "python-id3" - depends on BR2_PACKAGE_PYTHON - help - This module allows one to read and manipulate so-called ID3 - informational tags on MP3 files through an object-oriented - Python interface. - - http://id3-py.sourceforge.net/ diff --git a/package/python-id3/python-id3.hash b/package/python-id3/python-id3.hash deleted file mode 100644 index c83b34a2d9..0000000000 --- a/package/python-id3/python-id3.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed: -sha256 ba612342b59a49cbf9a7eb23a646667757ffda96dc23b67245fc6cd8d90c2022 id3-py_1.2.tar.gz -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/python-id3/python-id3.mk b/package/python-id3/python-id3.mk deleted file mode 100644 index d4cdded00c..0000000000 --- a/package/python-id3/python-id3.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-id3 -# -################################################################################ - -PYTHON_ID3_VERSION = 1.2 -PYTHON_ID3_SOURCE = id3-py_$(PYTHON_ID3_VERSION).tar.gz -PYTHON_ID3_SITE = http://downloads.sourceforge.net/project/id3-py/id3-py/$(PYTHON_ID3_VERSION) -PYTHON_ID3_SETUP_TYPE = distutils -PYTHON_ID3_LICENSE = GPL-2.0+ -PYTHON_ID3_LICENSE_FILES = COPYING - -$(eval $(python-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:45 +0100 Subject: [Buildroot] [PATCH 079/107] package/syslog-ng: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-80-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/syslog-ng/syslog-ng.mk | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/package/syslog-ng/syslog-ng.mk b/package/syslog-ng/syslog-ng.mk index f37e7c2ea5..c05ec9785c 100644 --- a/package/syslog-ng/syslog-ng.mk +++ b/package/syslog-ng/syslog-ng.mk @@ -32,12 +32,7 @@ else SYSLOG_NG_CONF_OPTS += --disable-linux-caps endif -ifeq ($(BR2_PACKAGE_PYTHON),y) -SYSLOG_NG_DEPENDENCIES += python -SYSLOG_NG_CONF_OPTS += \ - --enable-python \ - --with-python=$(PYTHON_VERSION_MAJOR) -else ifeq ($(BR2_PACKAGE_PYTHON3),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) SYSLOG_NG_DEPENDENCIES += python3 SYSLOG_NG_CONF_OPTS += \ --enable-python \ -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:52:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:52:01 +0100 Subject: [Buildroot] [PATCH 095/107] package/python-pathlib2: drop python2 specific package In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-96-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/python-pathlib2/Config.in | 13 ------------- package/python-pathlib2/python-pathlib2.hash | 5 ----- package/python-pathlib2/python-pathlib2.mk | 14 -------------- 6 files changed, 6 insertions(+), 34 deletions(-) delete mode 100644 package/python-pathlib2/Config.in delete mode 100644 package/python-pathlib2/python-pathlib2.hash delete mode 100644 package/python-pathlib2/python-pathlib2.mk diff --git a/Config.in.legacy b/Config.in.legacy index 386f94e72b..74317a2d7c 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_PATHLIB2 + bool "python-pathlib2 removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_PAM bool "python-pam removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index a6ea3793ea..07f9304766 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -145,7 +145,6 @@ F: package/mpd/ N: Andrey Smirnov F: package/python-decorator/ F: package/python-ipython-genutils/ -F: package/python-pathlib2/ F: package/python-pickleshare/ F: package/python-scandir/ F: package/python-simplegeneric/ diff --git a/package/Config.in b/package/Config.in index 73e8901a1d..3c55dec6c5 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1118,7 +1118,6 @@ menu "External python modules" source "package/python-paramiko/Config.in" source "package/python-parso/Config.in" source "package/python-passlib/Config.in" - source "package/python-pathlib2/Config.in" source "package/python-pathpy/Config.in" source "package/python-pathtools/Config.in" source "package/python-pathvalidate/Config.in" diff --git a/package/python-pathlib2/Config.in b/package/python-pathlib2/Config.in deleted file mode 100644 index e28de4c12e..0000000000 --- a/package/python-pathlib2/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_PYTHON_PATHLIB2 - bool "python-pathlib2" - depends on BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON_SIX # runtime - help - Object-oriented filesystem paths. - - The goal of pathlib2 is to provide a backport of standard - pathlib module which tracks the standard library module, so - all the newest features of the standard pathlib can be used - also on older Python versions. - - https://pypi.python.org/pypi/pathlib2 diff --git a/package/python-pathlib2/python-pathlib2.hash b/package/python-pathlib2/python-pathlib2.hash deleted file mode 100644 index ebd197b62e..0000000000 --- a/package/python-pathlib2/python-pathlib2.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/pathlib2/json -md5 e50a0cf94e406c5110b3aed535626e9e pathlib2-2.3.6.tar.gz -sha256 7d8bcb5555003cdf4a8d2872c538faa3a0f5d20630cb360e518ca3b981795e5f pathlib2-2.3.6.tar.gz -# Locally computed sha256 checksums -sha256 861f813004a151ac77024ad445794653809ddf8a7572aee7bab18d11df2ba1c6 LICENSE.rst diff --git a/package/python-pathlib2/python-pathlib2.mk b/package/python-pathlib2/python-pathlib2.mk deleted file mode 100644 index 4bcfea78fb..0000000000 --- a/package/python-pathlib2/python-pathlib2.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-pathlib2 -# -################################################################################ - -PYTHON_PATHLIB2_VERSION = 2.3.6 -PYTHON_PATHLIB2_SOURCE = pathlib2-$(PYTHON_PATHLIB2_VERSION).tar.gz -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 - -$(eval $(python-package)) -- 2.20.1 From nealf at xilinx.com Wed Feb 9 17:15:16 2022 From: nealf at xilinx.com (Neal Frager) Date: Wed, 9 Feb 2022 17:15:16 +0000 Subject: [Buildroot] [PATCH 1/2] configs/zynqmp_zcu106: Bump ATF/U-Boot/Linux to Xilinx 2022 -v2 In-Reply-To: References: <20220209082821.72879-1-neal.frager@xilinx.com> Message-ID: Hi Giulio, > the subject doesn't need "-v2" in it. I'm pretty sure you've used the wrong command to generate the V2 patchset. > This are the correct commands: > # cd buildroot > # git format-patch -s -M -o . -2 Thank you for the command. I misunderstood what you meant in your previous email, as I was just creating the whole patch set again from the beginning. On 09/02/22 09:28, Neal Frager wrote: > This patch: > - bumps configs/zynqmp_zcu106_defconfig to Xilinx 2022 > What does this ^^^ line means? Xilinx 2022? Maybe it is what it's already below, Linux, u-boot, ATF. So I think you can drop it I wanted the defconfigs to match a Xilinx software release. We have two releases per year, 2022.1 and 2022.2. Neither of these has happened yet, which is why originally, I wanted to just bump buildroot to 2021.2. Unfortunately, to get a perfectly clean build without the patches directory, I needed the updated pm_cfg_obj_convert.py script, which forced me into U-Boot 2022.01. So in the end, these defconfigs use all Xilinx software versions (ATF, U-Boot and Linux) that will eventually come with Xilinx 2022.1. My long term plan is to maintain these zynqmp_zcu10x_defconfigs with each Xilinx software release. Eventually, I will be bumping to Xilinx 2022.1 and Xilinx 2022.2, etc. Since these current patches are not tied directly to a Xilinx software release, I suppose it is easier to just remove this comment from the log. > - bumps ATF to Xilinx v2.6: mainline v2.6 requires patch to build > - bumps U-Boot to Xilinx 2022.01: important drivers not in mainline > - bumps Linux to Xilinx 5.15: important drivers not in mainline > - deletes board/zynqmp/patches directory: patches already in mainline > as you see below, this patch doesn't delete those patches and folder With v3 that I will be sending shortly, I am going to fix this. > - modifies board/zynqmp/genimage.cfg: U-Boot 2022.01 uses u-boot.itb > format > - adds extlinux.conf to vfat bootfs > it's worth mentioning that it switches from boot.scr to extlinux.conf also How come? boot.scr was never used with the zynqmp devices on buildroot before. I was considering using boot.scr, but since this was never part of buildroot, why mention it? > - modifies U-Boot to unified xilinx_zynqmp_virt_defconfig (supports > all boards) > - adds support for SPL pm_cfg_obj.c loading to PMU firmware > - adds support for host machines without SSL > ^^^ - enable support for host machines without OpenSSL required by u-boot Because you don't add support and it's OpenSSL that is required by u-boot Ok. I will update this comment. > > Signed-off-by: Neal Frager > --- > board/zynqmp/extlinux.conf | 4 + > board/zynqmp/genimage.cfg | 6 +- > board/zynqmp/pm_cfg_obj.c | 614 ++++++++++++++++++++++++++++++++ > board/zynqmp/post-build.sh | 10 + > board/zynqmp/post-image.sh | 4 +- > board/zynqmp/readme.txt | 23 +- > configs/zynqmp_zcu106_defconfig | 23 +- > 7 files changed, 665 insertions(+), 19 deletions(-) > create mode 100644 board/zynqmp/extlinux.conf > create mode 100644 board/zynqmp/pm_cfg_obj.c > create mode 100755 board/zynqmp/post-build.sh > As mentioned above deletes are missing As mentioned, I will fix this with v3. > diff --git a/board/zynqmp/extlinux.conf b/board/zynqmp/extlinux.conf > new file mode 100644 index 0000000000..15ef707ea2 > --- /dev/null > +++ b/board/zynqmp/extlinux.conf > @@ -0,0 +1,4 @@ > +label linux > + kernel /Image > + devicetree /system.dtb > + append console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait > diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg > index ed202f4550..20d8352c08 100644 > --- a/board/zynqmp/genimage.cfg > +++ b/board/zynqmp/genimage.cfg > @@ -2,11 +2,13 @@ image boot.vfat { > vfat { > files = { > "boot.bin", > - "u-boot.bin", > - "atf-uboot.ub", > + "u-boot.itb", > "system.dtb", > "Image" > } > + file extlinux/extlinux.conf { > + image = extlinux.conf > + } > } > > size = 32M > diff --git a/board/zynqmp/pm_cfg_obj.c b/board/zynqmp/pm_cfg_obj.c new > file mode 100644 index 0000000000..7566b3236a > --- /dev/null > +++ b/board/zynqmp/pm_cfg_obj.c > @@ -0,0 +1,614 @@ > +/******************************************************************** > +********** > +* Copyright (c) 2017 - 2020 Xilinx, Inc. All rights reserved. > +* SPDX-License-Identifier: MIT > +********************************************************************* > +*********/ > + > + > +#include "xil_types.h" > +#include "pm_defs.h" > + > +#define PM_CONFIG_MASTER_SECTION_ID 0x101U > +#define PM_CONFIG_SLAVE_SECTION_ID 0x102U > +#define PM_CONFIG_PREALLOC_SECTION_ID 0x103U > +#define PM_CONFIG_POWER_SECTION_ID 0x104U > +#define PM_CONFIG_RESET_SECTION_ID 0x105U > +#define PM_CONFIG_SHUTDOWN_SECTION_ID 0x106U > +#define PM_CONFIG_SET_CONFIG_SECTION_ID 0x107U > +#define PM_CONFIG_GPO_SECTION_ID 0x108U > + > +#define PM_SLAVE_FLAG_IS_SHAREABLE 0x1U > +#define PM_MASTER_USING_SLAVE_MASK 0x2U > + > +#define PM_CONFIG_GPO1_MIO_PIN_34_MAP (1U << 10U) > +#define PM_CONFIG_GPO1_MIO_PIN_35_MAP (1U << 11U) > +#define PM_CONFIG_GPO1_MIO_PIN_36_MAP (1U << 12U) > +#define PM_CONFIG_GPO1_MIO_PIN_37_MAP (1U << 13U) > + > +#define PM_CONFIG_GPO1_BIT_2_MASK (1U << 2U) > +#define PM_CONFIG_GPO1_BIT_3_MASK (1U << 3U) > +#define PM_CONFIG_GPO1_BIT_4_MASK (1U << 4U) > +#define PM_CONFIG_GPO1_BIT_5_MASK (1U << 5U) > + > +#define SUSPEND_TIMEOUT 0xFFFFFFFFU > + > + > +#define PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK 0x00000001 > +#define PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK 0x00000100 > +#define PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK 0x00000200 > + > + > + > +#if defined (__ICCARM__) > +#pragma language=save > +#pragma language=extended > +#endif > +#if defined (__GNUC__) > + const u32 XPm_ConfigObject[] __attribute__((used, > +section(".sys_cfg_data"))) = #elif defined (__ICCARM__) #pragma > +location = ".sys_cfg_data" > +__root const u32 XPm_ConfigObject[] = #endif { > + /**********************************************************************/ > + /* HEADER */ > + 1, /* Number of remaining words in the header */ > + 8, /* Number of sections included in config object */ > + /**********************************************************************/ > + /* MASTER SECTION */ > + PM_CONFIG_MASTER_SECTION_ID, /* Master SectionID */ > + 3U, /* No. of Masters*/ > + > + NODE_APU, /* Master Node ID */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask of this master */ > + SUSPEND_TIMEOUT, /* Suspend timeout */ > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ > + > + NODE_RPU_0, /* Master Node ID */ > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask of this master */ > + SUSPEND_TIMEOUT, /* Suspend timeout */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ > + > + NODE_RPU_1, /* Master Node ID */ > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask of this master */ > + SUSPEND_TIMEOUT, /* Suspend timeout */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Suspend permissions */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Wake permissions */ > + > + > + /**********************************************************************/ > + /* SLAVE SECTION */ > + > + > + PM_CONFIG_SLAVE_SECTION_ID, /* Section ID */ > + 49, /* Number of slaves */ > + > + NODE_OCM_BANK_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_OCM_BANK_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_OCM_BANK_2, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_OCM_BANK_3, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_TCM_0_A, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ > + > + NODE_TCM_0_B, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ > + > + NODE_TCM_1_A, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_TCM_1_B, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_L2, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_GPU_PP_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_GPU_PP_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_USB_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_USB_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_TTC_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_TTC_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_TTC_2, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_TTC_3, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_SATA, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_ETH_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_ETH_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_ETH_2, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_ETH_3, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_UART_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_UART_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_SPI_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_SPI_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_I2C_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_I2C_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_SD_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_SD_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_DP, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_GDMA, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_ADMA, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_NAND, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_QSPI, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_GPIO, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_CAN_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_CAN_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_EXTERN, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_DDR, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_IPI_APU, > + 0U, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask */ > + > + NODE_IPI_RPU_0, > + 0U, > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ > + > + NODE_IPI_RPU_1, > + 0U, > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_GPU, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_PCIE, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_PCAP, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_RTC, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_VCU, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_PL, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + > + /**********************************************************************/ > + /* PREALLOC SECTION */ > + > + PM_CONFIG_PREALLOC_SECTION_ID, /* Preallaoc SectionID */ > + 3U, /* No. of Masters*/ > + > +/* Prealloc for psu_cortexa53_0 */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, > + 12, > + NODE_DDR, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_L2, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_0, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_2, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_3, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_I2C_0, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_I2C_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_SD_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_QSPI, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_PL, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_IPI_APU, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + > + /* Prealloc for psu_cortexr5_0 */ > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, > + 14, > + NODE_TCM_0_A, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_TCM_0_B, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_DDR, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_0, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_2, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_3, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_I2C_0, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_I2C_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_SD_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_QSPI, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_PL, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_ADMA, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_IPI_RPU_0, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + > + /* Prealloc for psu_cortexr5_1 */ > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + 3, > + NODE_TCM_1_A, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_TCM_1_B, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_IPI_RPU_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + > + /**********************************************************************/ > + /* POWER SECTION */ > + > + PM_CONFIG_POWER_SECTION_ID, /* Power Section ID */ > + 4U, /* Number of power nodes */ > + > + NODE_APU, /* Power node ID */ > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions > + */ > + > + NODE_RPU, /* Power node ID */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions > + */ > + > + NODE_FPD, /* Power node ID */ > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions > + */ > + > + NODE_PLD, /* Power node ID */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions > + */ > + > + > + /**********************************************************************/ > + /* RESET SECTION */ > + > + PM_CONFIG_RESET_SECTION_ID, /* Reset Section ID */ > + 120U, /* Number of resets */ > + > + XILPM_RESET_PCIE_CFG, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_PCIE_BRIDGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_PCIE_CTRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_DP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SWDT_CRF, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_AFI_FM5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_AFI_FM4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_AFI_FM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_AFI_FM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_AFI_FM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_AFI_FM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GDMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPU_PP1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPU_PP0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPU, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SATA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU3_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU2_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU1_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU0_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_APU_L2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_DDR, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_APM_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SOFT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GEM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GEM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GEM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GEM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_QSPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_UART0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_UART1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SPI0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SPI1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SDIO0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SDIO1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_CAN0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_CAN1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_I2C0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_I2C1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_TTC0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_TTC1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_TTC2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_TTC3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SWDT_CRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_NAND, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ADMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPIO, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_IOU_CC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_TIMESTAMP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPU_R50, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPU_R51, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPU_AMBA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_OCM, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPU_PGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_USB0_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_USB1_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_USB0_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_USB1_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_USB0_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_USB1_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_IPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_APM_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RTC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SYSMON, 0, > + XILPM_RESET_AFI_FM6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_LPD_SWDT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_FPD, PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, > + XILPM_RESET_RPU_DBG1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPU_DBG0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_DBG_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_DBG_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_APLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_DPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_VPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_IOPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_7, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_8, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_9, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_10, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_11, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_12, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_13, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_14, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_15, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_16, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_17, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_18, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_19, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_20, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_21, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_22, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_23, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_24, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_25, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_26, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_27, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_28, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_29, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_30, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_31, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPU_LS, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_PS_ONLY, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_PL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPIO5_EMIO_92, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPIO5_EMIO_93, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPIO5_EMIO_94, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPIO5_EMIO_95, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + > + /**********************************************************************/ > + /* SET CONFIG SECTION */ > + PM_CONFIG_SET_CONFIG_SECTION_ID, /* Section ID */ > + 0, /* Permissions to set config */ > + /**********************************************************************/ > + /* SHUTDOWN SECTION */ > + PM_CONFIG_SHUTDOWN_SECTION_ID, /* Section ID */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* System Shutdown/Restart > + Permission */ > + > + /**********************************************************************/ > + /* GPO SECTION */ > + PM_CONFIG_GPO_SECTION_ID, /* GPO Section ID */ > + PM_CONFIG_GPO1_BIT_2_MASK | > + PM_CONFIG_GPO1_MIO_PIN_34_MAP | > + PM_CONFIG_GPO1_MIO_PIN_35_MAP | > + PM_CONFIG_GPO1_MIO_PIN_36_MAP | > + PM_CONFIG_GPO1_MIO_PIN_37_MAP | > + 0, /* State of GPO pins */ > +}; > +#if defined (__ICCARM__) > +#pragma language=restore > +#endif > diff --git a/board/zynqmp/post-build.sh b/board/zynqmp/post-build.sh > new file mode 100755 index 0000000000..ef55f49376 > --- /dev/null > +++ b/board/zynqmp/post-build.sh > @@ -0,0 +1,10 @@ > +#!/bin/sh > + > +# genimage will need to find the extlinux.conf # in the binaries > +directory > + > +BOARD_DIR="$(dirname $0)" > + > +install -m 0644 -D $BOARD_DIR/extlinux.conf > +$BINARIES_DIR/extlinux.conf > + > + > please remove useless whiteline, we only need 1 at the end of the file Ok, no problem. > diff --git a/board/zynqmp/post-image.sh b/board/zynqmp/post-image.sh > index b2b99fed01..ed6dbe188c 100755 > --- a/board/zynqmp/post-image.sh > +++ b/board/zynqmp/post-image.sh > @@ -10,4 +10,6 @@ FIRST_DT=$(sed -nr \ > > [ -z "${FIRST_DT}" ] || ln -fs ${FIRST_DT}.dtb > ${BINARIES_DIR}/system.dtb > > -support/scripts/genimage.sh -c board/zynqmp/genimage.cfg > +BOARD_DIR="$(dirname $0)" > + > +support/scripts/genimage.sh -c $BOARD_DIR/genimage.cfg > diff --git a/board/zynqmp/readme.txt b/board/zynqmp/readme.txt index > da37f4ccc9..0dc1793e03 100644 > --- a/board/zynqmp/readme.txt > +++ b/board/zynqmp/readme.txt > @@ -1,10 +1,19 @@ > -******************************** > -Xilinx ZCU106 board - ZynqMP SoC > -******************************** > +****************************************** > +Xilinx ZCU102 / ZCU106 boards - ZynqMP SoC > +****************************************** > This ^^^ must be moved to next patch since this patch only deals with > zcu106 and not with zcu102 Good catch. I will move the updated readme.txt file into the zcu102 patch with v3. > + > +This document describes the Buildroot support for the ZCU102 and > +ZCU106 boards by Xilinx, based on the Zynq UltraScale+ MPSoC (aka ZynqMP). > +It has been tested with the ZCU102 and ZCU106 production boards. > Same here ^^^ > + > +Evaluation board features can be found here with the links below. > + > +ZCU102: > +https://www.xilinx.com/products/boards-and-kits/zcu102.html > Ditto > +ZCU106: > +https://www.xilinx.com/products/boards-and-kits/zcu106.html > > -This document describes the Buildroot support for the ZCU106 board by > -Xilinx, based on the Zynq UltraScale+ MPSoC (aka ZynqMP). It has been > -tested with the EK-U1-ZCU106-ES2 pre-production board. > > How to build it > =============== > @@ -32,7 +41,7 @@ After building, you should get a tree like this: > +-- rootfs.ext4 -> rootfs.ext2 > +-- sdcard.img > +-- system.dtb -> zynqmp-zcu106-revA.dtb > - +-- u-boot.bin > + +-- u-boot.itb > `-- zynqmp-zcu106-revA.dtb > > How to write the SD card > diff --git a/configs/zynqmp_zcu106_defconfig > b/configs/zynqmp_zcu106_defconfig index bee7c1daf7..2026f60bd1 100644 > --- a/configs/zynqmp_zcu106_defconfig > +++ b/configs/zynqmp_zcu106_defconfig > @@ -1,34 +1,39 @@ > BR2_aarch64=y > -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_GIT=y > BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" > -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.15" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > # BR2_TARGET_ROOTFS_TAR is not set > BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.6" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" > -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7" > -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA" > +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2022.01" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" > BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > BR2_TARGET_UBOOT_SPL=y > BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" > BR2_TARGET_UBOOT_ZYNQMP=y > -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/53fdb7b6c92860ceb0ec5fd14deee302f4a84269/bin/pmufw-zcu106-default-v2017.4.bin" > +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/v2021.2/bin/pmufw-v2021.2.bin" > +BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/pm_cfg_obj.c" > +BR2_TARGET_UBOOT_FORMAT_ITB=y > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > BR2_PACKAGE_HOST_DOSFSTOOLS=y > BR2_PACKAGE_HOST_GENIMAGE=y > BR2_PACKAGE_HOST_MTOOLS=y > For the rest it looks good to me and it builds correctly using docker. Thanks for your help! Best regards, Neal Frager Xilinx From neal.frager at xilinx.com Wed Feb 9 18:03:06 2022 From: neal.frager at xilinx.com (Neal Frager) Date: Wed, 9 Feb 2022 11:03:06 -0700 Subject: [Buildroot] [PATCH v3 2/2] add configs/zynqmp_zcu102_defconfig In-Reply-To: <20220209180306.2629180-1-neal.frager@xilinx.com> References: <20220209180306.2629180-1-neal.frager@xilinx.com> Message-ID: <20220209180306.2629180-2-neal.frager@xilinx.com> This patch: - adds support for Xilinx ZCU102 evaluation board - ZCU102 features can be found here: - https://www.xilinx.com/products/boards-and-kits/zcu102.html Signed-off-by: Neal Frager --- board/zynqmp/readme.txt | 23 +++++++++++++------ configs/zynqmp_zcu102_defconfig | 39 +++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 7 deletions(-) create mode 100644 configs/zynqmp_zcu102_defconfig diff --git a/board/zynqmp/readme.txt b/board/zynqmp/readme.txt index da37f4ccc9..0dc1793e03 100644 --- a/board/zynqmp/readme.txt +++ b/board/zynqmp/readme.txt @@ -1,10 +1,19 @@ -******************************** -Xilinx ZCU106 board - ZynqMP SoC -******************************** +****************************************** +Xilinx ZCU102 / ZCU106 boards - ZynqMP SoC +****************************************** + +This document describes the Buildroot support for the ZCU102 and ZCU106 +boards by Xilinx, based on the Zynq UltraScale+ MPSoC (aka ZynqMP). +It has been tested with the ZCU102 and ZCU106 production boards. + +Evaluation board features can be found here with the links below. + +ZCU102: +https://www.xilinx.com/products/boards-and-kits/zcu102.html + +ZCU106: +https://www.xilinx.com/products/boards-and-kits/zcu106.html -This document describes the Buildroot support for the ZCU106 board by -Xilinx, based on the Zynq UltraScale+ MPSoC (aka ZynqMP). It has been -tested with the EK-U1-ZCU106-ES2 pre-production board. How to build it =============== @@ -32,7 +41,7 @@ After building, you should get a tree like this: +-- rootfs.ext4 -> rootfs.ext2 +-- sdcard.img +-- system.dtb -> zynqmp-zcu106-revA.dtb - +-- u-boot.bin + +-- u-boot.itb `-- zynqmp-zcu106-revA.dtb How to write the SD card diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig new file mode 100644 index 0000000000..acffda64bf --- /dev/null +++ b/configs/zynqmp_zcu102_defconfig @@ -0,0 +1,39 @@ +BR2_aarch64=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.15" +BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.6" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/Xilinx/u-boot-xlnx.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2022.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" +BR2_TARGET_UBOOT_ZYNQMP=y +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/v2021.2/bin/pmufw-v2021.2.bin" +BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/pm_cfg_obj.c" +BR2_TARGET_UBOOT_FORMAT_ITB=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y -- 2.17.1 From neal.frager at xilinx.com Wed Feb 9 18:03:05 2022 From: neal.frager at xilinx.com (Neal Frager) Date: Wed, 9 Feb 2022 11:03:05 -0700 Subject: [Buildroot] [PATCH v3 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 Message-ID: <20220209180306.2629180-1-neal.frager@xilinx.com> This patch: - bumps ATF to Xilinx v2.6: mainline v2.6 requires patch to build - bumps U-Boot to Xilinx 2022.01: important drivers not in mainline - bumps Linux to Xilinx 5.15: important drivers not in mainline - deletes board/zynqmp/patches directory: patches already in mainline - modifies board/zynqmp/genimage.cfg: U-Boot 2022.01 uses u-boot.itb format - adds extlinux.conf to vfat bootfs - modifies U-Boot to unified xilinx_zynqmp_virt_defconfig (supports all boards) - adds support for SPL pm_cfg_obj.c loading to PMU firmware - enables support for host machines without OpenSSL required by u-boot Signed-off-by: Neal Frager --- board/zynqmp/extlinux.conf | 5 + board/zynqmp/genimage.cfg | 6 +- ...-fix-Remove-GGC-ignore-Warray-bounds.patch | 68 -- ...64-zynqmp-zcu106-fix-SPL-MMC-booting.patch | 52 -- ...2-arm64-zynqmp-Enable-booting-to-ATF.patch | 114 ---- ...ept-an-absolute-path-for-PMUFW_INIT_.patch | 68 -- ...ynqmp-pass-the-PS-init-file-as-a-kco.patch | 175 ----- board/zynqmp/pm_cfg_obj.c | 614 ++++++++++++++++++ board/zynqmp/post-build.sh | 8 + board/zynqmp/post-image.sh | 4 +- configs/zynqmp_zcu106_defconfig | 23 +- 11 files changed, 648 insertions(+), 489 deletions(-) create mode 100644 board/zynqmp/extlinux.conf delete mode 100644 board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch delete mode 100644 board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch delete mode 100644 board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch delete mode 100644 board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch delete mode 100644 board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch create mode 100644 board/zynqmp/pm_cfg_obj.c create mode 100755 board/zynqmp/post-build.sh diff --git a/board/zynqmp/extlinux.conf b/board/zynqmp/extlinux.conf new file mode 100644 index 0000000000..a69a2e1963 --- /dev/null +++ b/board/zynqmp/extlinux.conf @@ -0,0 +1,5 @@ +label linux + kernel /Image + devicetree /system.dtb + append console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait + \ No newline at end of file diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg index ed202f4550..20d8352c08 100644 --- a/board/zynqmp/genimage.cfg +++ b/board/zynqmp/genimage.cfg @@ -2,11 +2,13 @@ image boot.vfat { vfat { files = { "boot.bin", - "u-boot.bin", - "atf-uboot.ub", + "u-boot.itb", "system.dtb", "Image" } + file extlinux/extlinux.conf { + image = extlinux.conf + } } size = 32M diff --git a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch b/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch deleted file mode 100644 index 0c1a9ba2a4..0000000000 --- a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch +++ /dev/null @@ -1,68 +0,0 @@ -From da003e6ada7d0217fe99dc7c649a731f8ebd3c34 Mon Sep 17 00:00:00 2001 -From: Deepika Bhavnani -Date: Thu, 15 Aug 2019 00:56:46 +0300 -Subject: [PATCH] Coverity fix: Remove GGC ignore -Warray-bounds - -GCC diagnostics were added to ignore array boundaries, instead -of ignoring GCC warning current code will check for array boundaries -and perform and array update only for valid elements. - -Resolves: `CID 246574` `CID 246710` `CID 246651` - -Signed-off-by: Deepika Bhavnani -Change-Id: I7530ecf7a1707351c6ee87e90cc3d33574088f57 - -Backported from: 41af05154abe136938bcfb5f26c969933784bbef -[Adapted to apply on 1.5] - ---- - lib/psci/psci_common.c | 20 ++++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) - -diff --git a/lib/psci/psci_common.c b/lib/psci/psci_common.c -index 2220a745cd6e..6282d992a2f0 100644 ---- a/lib/psci/psci_common.c -+++ b/lib/psci/psci_common.c -@@ -188,21 +188,17 @@ static unsigned int get_power_on_target_pwrlvl(void) - /****************************************************************************** - * Helper function to update the requested local power state array. This array - * does not store the requested state for the CPU power level. Hence an -- * assertion is added to prevent us from accessing the wrong index. -+ * assertion is added to prevent us from accessing the CPU power level. - *****************************************************************************/ - static void psci_set_req_local_pwr_state(unsigned int pwrlvl, - unsigned int cpu_idx, - plat_local_state_t req_pwr_state) - { -- /* -- * This should never happen, we have this here to avoid -- * "array subscript is above array bounds" errors in GCC. -- */ - assert(pwrlvl > PSCI_CPU_PWR_LVL); --#pragma GCC diagnostic push --#pragma GCC diagnostic ignored "-Warray-bounds" -- psci_req_local_pwr_states[pwrlvl - 1][cpu_idx] = req_pwr_state; --#pragma GCC diagnostic pop -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && -+ (cpu_idx < PLATFORM_CORE_COUNT)) { -+ psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx] = req_pwr_state; -+ } - } - - /****************************************************************************** -@@ -228,7 +224,11 @@ static plat_local_state_t *psci_get_req_local_pwr_states(unsigned int pwrlvl, - { - assert(pwrlvl > PSCI_CPU_PWR_LVL); - -- return &psci_req_local_pwr_states[pwrlvl - 1][cpu_idx]; -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && -+ (cpu_idx < PLATFORM_CORE_COUNT)) { -+ return &psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx]; -+ } else -+ return NULL; - } - - /* --- -2.34.0 - diff --git a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch b/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch deleted file mode 100644 index 4d85e1bb12..0000000000 --- a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch +++ /dev/null @@ -1,52 +0,0 @@ -From e5d72ed8339eb05285448aad3c89d21e4d18fd29 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Mon, 26 Feb 2018 09:40:34 +0100 -Subject: [PATCH] arm64: zynqmp: zcu106: fix SPL MMC booting - -The U-Boot SPL generated with the current zcu106 defconfig cannot boot -from MMC: - - [...] - U-Boot SPL 2018.01 (Feb 21 2018 - 17:47:14) - EL Level: EL3 - Trying to boot from MMC1 - sdhci_transfer_data: Error detected in status(0x408020)! - spl_load_image_fat_os: error reading image u-boot.bin, err - -2 - spl_load_image_fat: error reading image u-boot.img, err - -6 - SPL: failed to boot from all boot devices - ### ERROR ### Please RESET the board ### - -Fix by lowering the rpll value. The new value for the RPLL_CTRL -register comes from the current psu_init_gpl.c from the HDF file at -https://github.com/xilinx/hdf-examples/tree/01ad8ea5fd1989abf4ea5a072d019a16cb2bc546/zcu106-zynqmp -(generated by Vivado v2017.4). - -RPLL and sdio1_ref clocks before and after this change: - - - Old values: RPLL 1.36 GHz, sdio1_ref 272 MHz - - New values: RPLL 1.16 GHz, sdio1_ref 233 MHz - -Signed-off-by: Luca Ceresoli -Cc: Michal Simek -Upstream-status: accepted upstream in a different form ---- - - board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -index 4d18abe000ca..e6fa477e53e7 100644 ---- a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -+++ b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -@@ -10,7 +10,7 @@ - static unsigned long psu_pll_init_data(void) - { - psu_mask_write(0xFF5E0034, 0xFE7FEDEFU, 0x7E4E2C62U); -- psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00013C00U); -+ psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00014600U); - psu_mask_write(0xFF5E0030, 0x00000008U, 0x00000008U); - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000001U); - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000000U); --- -2.7.4 - diff --git a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch b/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch deleted file mode 100644 index 487fff6812..0000000000 --- a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 5e3cac50cc981e01d9072241035a8d4162560c71 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Mon, 12 Mar 2018 17:18:38 +0100 -Subject: [PATCH] arm64: zynqmp: Enable booting to ATF - -U-Boot is now able to boot to ARM Trusted Firmware (ATF). The boot -flow is SPL(EL3) loads ATF and full u-boot and jump to ATF(EL3) which -pass control to full u-boot(EL2). This has been tested on zcu106, so -enable it in this defconfig. - -To generate an image that triggers this booting flow, you need to pass -'-O arm-trusted-firmware' to mkimage. - -Signed-off-by: Luca Ceresoli -Signed-off-by: Michal Simek -Backported from upstream: http://git.denx.de/?p=u-boot.git;a=commit;h=5e3cac50cc981e01d9072241035a8d4162560c71 ---- - - configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 + - configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 + - configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 + - configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 + - configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 1 + - configs/xilinx_zynqmp_zcu102_revA_defconfig | 1 + - configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 + - 7 files changed, 7 insertions(+) - -diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig -index c5bfa2b12638..488c72258b0e 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig -index f86dce403a42..5d501eec0edd 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig -@@ -20,6 +20,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig -index 6e947cf56827..6f7eaebd7676 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig -@@ -16,6 +16,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_CMD_MEMTEST=y - CONFIG_SYS_ALT_MEMTEST=y -diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig -index 1c934858c61c..7a3806cba4b5 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig -@@ -17,6 +17,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_CMD_MEMTEST=y - CONFIG_SYS_ALT_MEMTEST=y -diff --git a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig -index e13c7c56f310..e4408f182ca0 100644 ---- a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig -+++ b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig b/configs/xilinx_zynqmp_zcu102_revA_defconfig -index 5b2cd495ee85..b52f6789fd4b 100644 ---- a/configs/xilinx_zynqmp_zcu102_revA_defconfig -+++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig -index e6530fbfe7ff..80592554f682 100644 ---- a/configs/xilinx_zynqmp_zcu102_revB_defconfig -+++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y --- -2.7.4 - diff --git a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch b/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch deleted file mode 100644 index 95ab7b3b75..0000000000 --- a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch +++ /dev/null @@ -1,68 +0,0 @@ -From c7df098a71e05dc81cee818747759e8060b59626 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Mon, 4 Jun 2018 12:21:01 +0200 -Subject: [PATCH] arm64: zynqmp: accept an absolute path for PMUFW_INIT_FILE - -The value of PMUFW_INIT_FILE is prefixed with "$(srctree)/", thus -forcing it to be a relative path inside the U-Boot source tree. Since -the PMUFW is a binary file generated outside of U-Boot, the PMUFW -binary must be copied inside the U-Boot source tree before the -build. - -This generates a few problems: - - * if the source tree is shared among different out-of-tree builds, - they will pollute (and potentially corrupt) each other - * the source tree cannot be read-only - * any buildsystem must add a command to copy the PMUFW binary - * putting an externally-generated binary in the source tree is ugly - as hell - -Avoid these problems by accepting an absolute path for -PMUFW_INIT_FILE. This would be as simple as removing the "$(srctree)/" -prefix, but in order to keep backward compatibility we rather use the -shell and readlink to get the absolute path even when starting from a -relative path. - -Since 'readlink -f' produces an empty string if the file does not -exist, we also add a check to ensure the file configured in -PMUFW_INIT_FILE exists. Otherwise the build would exit successfully, -but produce a boot.bin without PMUFW as if PMUFW_INIT_FILE were empty. - -Tested in the 12 possible combinations of: - - PMUFW_INIT_FILE empty, relative, absolute, non-existing - - building in-tree, in subdir, in other directory - -Signed-off-by: Luca Ceresoli -Cc: Michal Simek -Cc: Simon Glass -Cc: Emmanuel Vadot -Signed-off-by: Michal Simek -Backported from upstream: https://git.denx.de/?p=u-boot.git;a=commit;h=c7df098a71e05dc81cee818747759e8060b59626 ---- - scripts/Makefile.spl | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl -index ef018b5b4056..252f13826d4c 100644 ---- a/scripts/Makefile.spl -+++ b/scripts/Makefile.spl -@@ -167,8 +167,14 @@ ifdef CONFIG_ARCH_ZYNQ - MKIMAGEFLAGS_boot.bin = -T zynqimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) - endif - ifdef CONFIG_ARCH_ZYNQMP -+ifneq ($(CONFIG_PMUFW_INIT_FILE),"") -+spl/boot.bin: zynqmp-check-pmufw -+zynqmp-check-pmufw: FORCE -+ ( cd $(srctree) && test -r $(CONFIG_PMUFW_INIT_FILE) ) \ -+ || ( echo "Cannot read $(CONFIG_PMUFW_INIT_FILE)" && false ) -+endif - MKIMAGEFLAGS_boot.bin = -T zynqmpimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) \ -- -n $(srctree)/$(CONFIG_PMUFW_INIT_FILE) -+ -n "$(shell cd $(srctree); readlink -f $(CONFIG_PMUFW_INIT_FILE))" - endif - - spl/boot.bin: $(obj)/u-boot-spl.bin FORCE --- -2.7.4 - diff --git a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch b/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch deleted file mode 100644 index b32e162780..0000000000 --- a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch +++ /dev/null @@ -1,175 +0,0 @@ -From 4c9d54ab5a41d65000c8d249b6fb1b76056f1812 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Wed, 20 Jun 2018 12:11:50 +0200 -Subject: [PATCH] arm/arm64: zynq/zynqmp: pass the PS init file as a kconfig - variable - -U-Boot needs to link ps7_init_gpl.c on Zynq or psu_init_gpl.c on -ZynqMP (PS init for short). The current logic to locate this file for -both platforms is: - - 1. if a board-specific file exists in - board/xilinx/zynq[mp]/$(CONFIG_DEFAULT_DEVICE_TREE)/ps?_init_gpl.c - then use it - 2. otherwise use board/xilinx/zynq/ps?_init_gpl.c - -In the latter case the file does not exist in the U-Boot sources and -must be copied in the source tree from the outside before starting the -build. This is typical when it is generated from Xilinx tools while -developing a custom hardware. However making sure that a -board-specific file is _not_ found (and used) requires some trickery -such as removing or overwriting all PS init files (e.g.: the current -meta-xilinx yocto layer [0]). - -This generates a few problems: - - * if the source tree is shared among different out-of-tree builds, - they will pollute (and potentially corrupt) each other - * the source tree cannot be read-only - * any buildsystem must add a command to copy the PS init file binary - * overwriting or deleting files in the source tree is ugly as hell - -Simplify usage by allowing to pass the path to the desired PS init -file in kconfig variable XILINX_PS_INIT_FILE. It can be an absolute -path or relative to $(srctree). If the variable is set, the -user-specified file will always be used without being copied -around. If the the variable is left empty, for backward compatibility -fall back to the old behaviour. - -Since the issue is the same for Zynq and ZynqMP, add one kconfig -variable in a common place and use it for both. - -Also use the new kconfig help text to document all the ways to give -U-Boot the PS init file. - -Build-tested with all combinations of: - - platform: zynq or zynqmp - - PS init file: from XILINX_PS_INIT_FILE (absolute, relative path, - non-existing), in-tree board-specific, in board/xilinx/zynq[mp]/ - - building in-tree, in subdir, in other directory - -[0] https://github.com/Xilinx/meta-xilinx/blob/b2f74cc7fe5c4881589d5e440a17cb51fc66a7ab/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init.inc#L9 - -Signed-off-by: Luca Ceresoli -Cc: Albert Aribaud -Cc: Michal Simek -Cc: Nathan Rossi -Backported from upstream: https://git.denx.de/?p=u-boot.git;a=commit;h=6da4f67ad09cd8b311d77b2b04e557b7ef65b56c ---- - arch/arm/Kconfig | 1 + - board/xilinx/Kconfig | 41 +++++++++++++++++++++++++++++++++++++++++ - board/xilinx/zynq/Makefile | 10 +++++++++- - board/xilinx/zynqmp/Makefile | 10 +++++++++- - 4 files changed, 60 insertions(+), 2 deletions(-) - create mode 100644 board/xilinx/Kconfig - -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 22234cde2ab6..e04979d0ef7e 100644 ---- a/arch/arm/Kconfig -+++ b/arch/arm/Kconfig -@@ -1293,4 +1293,5 @@ source "board/technologic/ts4600/Kconfig" - source "board/vscom/baltos/Kconfig" - source "board/woodburn/Kconfig" - source "board/work-microwave/work_92105/Kconfig" -+source "board/xilinx/Kconfig" - source "board/zipitz2/Kconfig" - - source "arch/arm/Kconfig.debug" -diff --git a/board/xilinx/Kconfig b/board/xilinx/Kconfig -new file mode 100644 -index 000000000000..aa3fa061edef ---- /dev/null -+++ b/board/xilinx/Kconfig -@@ -0,0 +1,41 @@ -+# Copyright (c) 2018, Luca Ceresoli -+# -+# SPDX-License-Identifier: GPL-2.0 -+ -+if ARCH_ZYNQ || ARCH_ZYNQMP -+ -+config XILINX_PS_INIT_FILE -+ string "Zynq/ZynqMP PS init file(s) location" -+ help -+ On Zynq and ZynqMP U-Boot SPL (or U-Boot proper if -+ ZYNQMP_PSU_INIT_ENABLED is set) is responsible for some -+ basic initializations, such as enabling peripherals and -+ configuring pinmuxes. The PS init file (called -+ psu_init_gpl.c on ZynqMP, ps7_init_gpl.c for Zynq-7000) -+ contains the code for such initializations. -+ -+ U-Boot contains PS init files for some boards, but each of -+ them describes only one specific configuration. Users of a -+ different board, or needing a different configuration, can -+ generate custom files using the Xilinx development tools. -+ -+ There are three ways to give a PS init file to U-Boot: -+ -+ 1. Set this variable to the path, either relative to the -+ source tree or absolute, where the psu_init_gpl.c or -+ ps7_init_gpl.c file is located. U-Boot will build this -+ file. -+ -+ 2. If you leave an empty string here, U-Boot will use -+ board/xilinx/zynq/$(CONFIG_DEFAULT_DEVICE_TREE)/ps7_init_gpl.c -+ for Zynq-7000, or -+ board/xilinx/zynqmp/$(CONFIG_DEFAULT_DEVICE_TREE)/psu_init_gpl.c -+ for ZynqMP. -+ -+ 3. If the above file does not exist, U-Boot will use -+ board/xilinx/zynq/ps7_init_gpl.c for Zynq-7000, or -+ board/xilinx/zynqmp/psu_init_gpl.c for ZynqMP. This file -+ is not provided by U-Boot, you have to copy it there -+ before the build. -+ -+endif -diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile -index 5a76a26720cd..03ad5f0532ee 100644 ---- a/board/xilinx/zynq/Makefile -+++ b/board/xilinx/zynq/Makefile -@@ -5,10 +5,18 @@ - - obj-y := board.o - --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE)) -+init-objs := ps_init_gpl.o -+spl/board/xilinx/zynq/ps_init_gpl.o board/xilinx/zynq/ps_init_gpl.o: $(PS_INIT_FILE) -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ -+endif - -+ifeq ($(init-objs),) -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/ps7_init_gpl.c),\ - $(hw-platform-y)/ps7_init_gpl.o) -+endif - - ifeq ($(init-objs),) - ifneq ($(wildcard $(srctree)/$(src)/ps7_init_gpl.c),) -diff --git a/board/xilinx/zynqmp/Makefile b/board/xilinx/zynqmp/Makefile -index 05ccd25dcef3..960b81fc5853 100644 ---- a/board/xilinx/zynqmp/Makefile -+++ b/board/xilinx/zynqmp/Makefile -@@ -5,10 +5,18 @@ - - obj-y := zynqmp.o - --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE)) -+init-objs := ps_init_gpl.o -+spl/board/xilinx/zynqmp/ps_init_gpl.o board/xilinx/zynqmp/ps_init_gpl.o: $(PS_INIT_FILE) -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ -+endif - -+ifeq ($(init-objs),) -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/psu_init_gpl.c),\ - $(hw-platform-y)/psu_init_gpl.o) -+endif - - ifeq ($(init-objs),) - ifneq ($(wildcard $(srctree)/$(src)/psu_init_gpl.c),) --- -2.7.4 - diff --git a/board/zynqmp/pm_cfg_obj.c b/board/zynqmp/pm_cfg_obj.c new file mode 100644 index 0000000000..7566b3236a --- /dev/null +++ b/board/zynqmp/pm_cfg_obj.c @@ -0,0 +1,614 @@ +/****************************************************************************** +* Copyright (c) 2017 - 2020 Xilinx, Inc. All rights reserved. +* SPDX-License-Identifier: MIT +******************************************************************************/ + + +#include "xil_types.h" +#include "pm_defs.h" + +#define PM_CONFIG_MASTER_SECTION_ID 0x101U +#define PM_CONFIG_SLAVE_SECTION_ID 0x102U +#define PM_CONFIG_PREALLOC_SECTION_ID 0x103U +#define PM_CONFIG_POWER_SECTION_ID 0x104U +#define PM_CONFIG_RESET_SECTION_ID 0x105U +#define PM_CONFIG_SHUTDOWN_SECTION_ID 0x106U +#define PM_CONFIG_SET_CONFIG_SECTION_ID 0x107U +#define PM_CONFIG_GPO_SECTION_ID 0x108U + +#define PM_SLAVE_FLAG_IS_SHAREABLE 0x1U +#define PM_MASTER_USING_SLAVE_MASK 0x2U + +#define PM_CONFIG_GPO1_MIO_PIN_34_MAP (1U << 10U) +#define PM_CONFIG_GPO1_MIO_PIN_35_MAP (1U << 11U) +#define PM_CONFIG_GPO1_MIO_PIN_36_MAP (1U << 12U) +#define PM_CONFIG_GPO1_MIO_PIN_37_MAP (1U << 13U) + +#define PM_CONFIG_GPO1_BIT_2_MASK (1U << 2U) +#define PM_CONFIG_GPO1_BIT_3_MASK (1U << 3U) +#define PM_CONFIG_GPO1_BIT_4_MASK (1U << 4U) +#define PM_CONFIG_GPO1_BIT_5_MASK (1U << 5U) + +#define SUSPEND_TIMEOUT 0xFFFFFFFFU + + +#define PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK 0x00000001 +#define PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK 0x00000100 +#define PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK 0x00000200 + + + +#if defined (__ICCARM__) +#pragma language=save +#pragma language=extended +#endif +#if defined (__GNUC__) + const u32 XPm_ConfigObject[] __attribute__((used, section(".sys_cfg_data"))) = +#elif defined (__ICCARM__) +#pragma location = ".sys_cfg_data" +__root const u32 XPm_ConfigObject[] = +#endif +{ + /**********************************************************************/ + /* HEADER */ + 1, /* Number of remaining words in the header */ + 8, /* Number of sections included in config object */ + /**********************************************************************/ + /* MASTER SECTION */ + PM_CONFIG_MASTER_SECTION_ID, /* Master SectionID */ + 3U, /* No. of Masters*/ + + NODE_APU, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_0, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_1, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Wake permissions */ + + + /**********************************************************************/ + /* SLAVE SECTION */ + + + PM_CONFIG_SLAVE_SECTION_ID, /* Section ID */ + 49, /* Number of slaves */ + + NODE_OCM_BANK_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TCM_0_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_0_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_1_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TCM_1_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_L2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU_PP_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU_PP_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_USB_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_USB_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_TTC_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SATA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_ETH_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_UART_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_UART_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SPI_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_SPI_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_I2C_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_I2C_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SD_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_SD_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_DP, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GDMA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_ADMA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_NAND, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_QSPI, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPIO, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_CAN_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_CAN_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_EXTERN, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_DDR, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_IPI_APU, + 0U, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_0, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_1, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_PCIE, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_PCAP, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_RTC, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_VCU, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_PL, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + + /**********************************************************************/ + /* PREALLOC SECTION */ + + PM_CONFIG_PREALLOC_SECTION_ID, /* Preallaoc SectionID */ + 3U, /* No. of Masters*/ + +/* Prealloc for psu_cortexa53_0 */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, + 12, + NODE_DDR, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_L2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_3, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_SD_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_QSPI, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_PL, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_APU, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_0 */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + 14, + NODE_TCM_0_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_0_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_DDR, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_3, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_SD_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_QSPI, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_PL, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_ADMA, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_1 */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + 3, + NODE_TCM_1_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_1_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /**********************************************************************/ + /* POWER SECTION */ + + PM_CONFIG_POWER_SECTION_ID, /* Power Section ID */ + 4U, /* Number of power nodes */ + + NODE_APU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_RPU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_FPD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_PLD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + + /**********************************************************************/ + /* RESET SECTION */ + + PM_CONFIG_RESET_SECTION_ID, /* Reset Section ID */ + 120U, /* Number of resets */ + + XILPM_RESET_PCIE_CFG, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_BRIDGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_CTRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRF, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GDMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SATA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APU_L2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DDR, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SOFT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_QSPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_NAND, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ADMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOU_CC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TIMESTAMP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R50, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R51, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_AMBA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_OCM, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_PGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RTC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SYSMON, 0, + XILPM_RESET_AFI_FM6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_LPD_SWDT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_FPD, PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + XILPM_RESET_RPU_DBG1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_DBG0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_VPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_7, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_8, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_9, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_10, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_11, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_12, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_13, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_14, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_15, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_16, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_17, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_18, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_19, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_20, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_21, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_22, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_23, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_24, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_25, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_26, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_27, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_28, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_29, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_30, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_31, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_LS, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PS_ONLY, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_92, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_93, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_94, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_95, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + + /**********************************************************************/ + /* SET CONFIG SECTION */ + PM_CONFIG_SET_CONFIG_SECTION_ID, /* Section ID */ + 0, /* Permissions to set config */ + /**********************************************************************/ + /* SHUTDOWN SECTION */ + PM_CONFIG_SHUTDOWN_SECTION_ID, /* Section ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* System Shutdown/Restart Permission */ + + /**********************************************************************/ + /* GPO SECTION */ + PM_CONFIG_GPO_SECTION_ID, /* GPO Section ID */ + PM_CONFIG_GPO1_BIT_2_MASK | + PM_CONFIG_GPO1_MIO_PIN_34_MAP | + PM_CONFIG_GPO1_MIO_PIN_35_MAP | + PM_CONFIG_GPO1_MIO_PIN_36_MAP | + PM_CONFIG_GPO1_MIO_PIN_37_MAP | + 0, /* State of GPO pins */ +}; +#if defined (__ICCARM__) +#pragma language=restore +#endif diff --git a/board/zynqmp/post-build.sh b/board/zynqmp/post-build.sh new file mode 100755 index 0000000000..9fd8bbf2c8 --- /dev/null +++ b/board/zynqmp/post-build.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +# genimage will need to find the extlinux.conf +# in the binaries directory + +BOARD_DIR="$(dirname $0)" + +install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux.conf diff --git a/board/zynqmp/post-image.sh b/board/zynqmp/post-image.sh index b2b99fed01..ed6dbe188c 100755 --- a/board/zynqmp/post-image.sh +++ b/board/zynqmp/post-image.sh @@ -10,4 +10,6 @@ FIRST_DT=$(sed -nr \ [ -z "${FIRST_DT}" ] || ln -fs ${FIRST_DT}.dtb ${BINARIES_DIR}/system.dtb -support/scripts/genimage.sh -c board/zynqmp/genimage.cfg +BOARD_DIR="$(dirname $0)" + +support/scripts/genimage.sh -c $BOARD_DIR/genimage.cfg diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index bee7c1daf7..2026f60bd1 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -1,34 +1,39 @@ BR2_aarch64=y -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.15" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.6" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA" +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2022.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/53fdb7b6c92860ceb0ec5fd14deee302f4a84269/bin/pmufw-zcu106-default-v2017.4.bin" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/v2021.2/bin/pmufw-v2021.2.bin" +BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/pm_cfg_obj.c" +BR2_TARGET_UBOOT_FORMAT_ITB=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -- 2.17.1 From peter at korsgaard.com Wed Feb 9 16:51:29 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:29 +0100 Subject: [Buildroot] [PATCH 063/107] package/python-txtorcon: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-64-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-txtorcon/python-txtorcon.mk | 9 --------- 1 file changed, 9 deletions(-) diff --git a/package/python-txtorcon/python-txtorcon.mk b/package/python-txtorcon/python-txtorcon.mk index b8414d96d0..acf586cb8c 100644 --- a/package/python-txtorcon/python-txtorcon.mk +++ b/package/python-txtorcon/python-txtorcon.mk @@ -11,13 +11,4 @@ PYTHON_TXTORCON_SETUP_TYPE = setuptools PYTHON_TXTORCON_LICENSE = MIT PYTHON_TXTORCON_LICENSE_FILES = LICENSE -ifeq ($(BR2_PACKAGE_PYTHON),y) -# only needed/valid for python 3.x -define PYTHON_TXTORCON_RM_PY3_FILE - rm -f $(TARGET_DIR)/usr/lib/python*/site-packages/txtorcon/controller_py3.py -endef - -PYTHON_TXTORCON_POST_INSTALL_TARGET_HOOKS += PYTHON_TXTORCON_RM_PY3_FILE -endif - $(eval $(python-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:30 +0100 Subject: [Buildroot] [PATCH 064/107] package/python-typing-extensions: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-65-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-typing-extensions/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/python-typing-extensions/Config.in b/package/python-typing-extensions/Config.in index 0c7c74c5fa..b59693282f 100644 --- a/package/python-typing-extensions/Config.in +++ b/package/python-typing-extensions/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS bool "python-typing-extensions" - select BR2_PACKAGE_PYTHON_TYPING if BR2_PACKAGE_PYTHON # runtime help Backported and Experimental Type Hints for Python 3.5+. -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:34 +0100 Subject: [Buildroot] [PATCH 068/107] package/python-websocket-client: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-69-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-websocket-client/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-websocket-client/Config.in b/package/python-websocket-client/Config.in index 0fbb15b328..519e506615 100644 --- a/package/python-websocket-client/Config.in +++ b/package/python-websocket-client/Config.in @@ -1,8 +1,7 @@ config BR2_PACKAGE_PYTHON_WEBSOCKET_CLIENT bool "python-websocket-client" select BR2_PACKAGE_PYTHON_SIX # runtime - select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_SSL # runtime help WebSocket client for python. hybi13 is supported. -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:27 +0100 Subject: [Buildroot] [PATCH 061/107] package/python-setuptools: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-62-peter@korsgaard.com> For the target. Signed-off-by: Peter Korsgaard --- package/python-setuptools/Config.in | 6 ++---- package/python-setuptools/python-setuptools.mk | 16 ---------------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/package/python-setuptools/Config.in b/package/python-setuptools/Config.in index f203d0f814..28228534f8 100644 --- a/package/python-setuptools/Config.in +++ b/package/python-setuptools/Config.in @@ -1,9 +1,7 @@ config BR2_PACKAGE_PYTHON_SETUPTOOLS bool "python-setuptools" - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_ZLIB # runtime + select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime help Download, build, install, upgrade, and uninstall Python packages. diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk index 8bca852fe2..04b872fb79 100644 --- a/package/python-setuptools/python-setuptools.mk +++ b/package/python-setuptools/python-setuptools.mk @@ -4,19 +4,11 @@ # ################################################################################ -# For the target variant, we adapt the version depending on whether -# Python 3.x or 2.x is selected for the target. -ifeq ($(BR2_PACKAGE_PYTHON3),y) # Please keep in sync with # package/python3-setuptools/python3-setuptools.mk PYTHON_SETUPTOOLS_VERSION = 60.7.0 PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON3_SETUPTOOLS_VERSION).tar.gz PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/29/dd/48d662bb93e5e51e72265ef612f869947d4ae4126328d7156824cd50d440 -else # Python -PYTHON_SETUPTOOLS_VERSION = 44.0.0 -PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).zip -PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/b0/f3/44da7482ac6da3f36f68e253cb04de37365b3dba9036a3c70773b778b485 -endif # The host variant is only for Python 2.x, so we need to use 44.0.0. HOST_PYTHON_SETUPTOOLS_VERSION = 44.0.0 @@ -30,14 +22,6 @@ PYTHON_SETUPTOOLS_CPE_ID_VENDOR = python PYTHON_SETUPTOOLS_CPE_ID_PRODUCT = setuptools PYTHON_SETUPTOOLS_SETUP_TYPE = setuptools -ifeq ($(BR2_PACKAGE_PYTHON),y) -define PYTHON_SETUPTOOLS_EXTRACT_CMDS - $(UNZIP) -d $(@D) $(PYTHON_SETUPTOOLS_DL_DIR)/$(PYTHON_SETUPTOOLS_SOURCE) - mv $(@D)/setuptools-$(PYTHON_SETUPTOOLS_VERSION)/* $(@D) - $(RM) -r $(@D)/setuptools-$(PYTHON_SETUPTOOLS_VERSION) -endef -endif - define HOST_PYTHON_SETUPTOOLS_EXTRACT_CMDS $(UNZIP) -d $(@D) $(HOST_PYTHON_SETUPTOOLS_DL_DIR)/$(HOST_PYTHON_SETUPTOOLS_SOURCE) mv $(@D)/setuptools-$(HOST_PYTHON_SETUPTOOLS_VERSION)/* $(@D) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:28 +0100 Subject: [Buildroot] [PATCH 062/107] package/python-sip: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-63-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-sip/python-sip.mk | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/package/python-sip/python-sip.mk b/package/python-sip/python-sip.mk index 1d6c205396..01ccb1ddd5 100644 --- a/package/python-sip/python-sip.mk +++ b/package/python-sip/python-sip.mk @@ -10,19 +10,8 @@ PYTHON_SIP_SITE = http://downloads.sourceforge.net/project/pyqt/sip/sip-$(PYTHON PYTHON_SIP_LICENSE = SIP license or GPL-2.0 or GPL-3.0 PYTHON_SIP_LICENSE_FILES = LICENSE LICENSE-GPL2 LICENSE-GPL3 -PYTHON_SIP_DEPENDENCIES = qt5base - -ifeq ($(BR2_PACKAGE_PYTHON),y) -PYTHON_SIP_DEPENDENCIES += python -HOST_PYTHON_SIP_DEPENDENCIES += host-python -PYTHON_SIP_LIB_DIR = usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages -PYTHON_SIP_INCLUDE_DIR = usr/include/python$(PYTHON_VERSION_MAJOR) -else ifeq ($(BR2_PACKAGE_PYTHON3),y) -PYTHON_SIP_DEPENDENCIES += python3 -HOST_PYTHON_SIP_DEPENDENCIES += host-python3 -PYTHON_SIP_LIB_DIR = usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages -PYTHON_SIP_INCLUDE_DIR = usr/include/python$(PYTHON3_VERSION_MAJOR) -endif +PYTHON_SIP_DEPENDENCIES = python3 qt5base +HOST_PYTHON_SIP_DEPENDENCIES = host-python3 define HOST_PYTHON_SIP_CONFIGURE_CMDS (cd $(@D); \ @@ -41,8 +30,8 @@ define PYTHON_SIP_CONFIGURE_CMDS (cd $(@D); \ $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(HOST_DIR)/bin/python configure.py \ --bindir $(TARGET_DIR)/usr/bin \ - --destdir $(TARGET_DIR)/$(PYTHON_SIP_LIB_DIR) \ - --incdir $(STAGING_DIR)/$(PYTHON_SIP_INCLUDE_DIR) \ + --destdir $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --incdir $(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --sipdir $(TARGET_DIR)/usr/share/sip \ --sysroot $(STAGING_DIR)/usr \ --use-qmake && \ -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:31 +0100 Subject: [Buildroot] [PATCH 065/107] package/python-urllib3: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-66-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-urllib3/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-urllib3/Config.in b/package/python-urllib3/Config.in index 21d3f6748e..90e10b7969 100644 --- a/package/python-urllib3/Config.in +++ b/package/python-urllib3/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_URLLIB3 bool "python-urllib3" - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_ZLIB # runtime help Python HTTP library with thread-safe connection pooling, file post support, sanity friendly, and more. -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:37 +0100 Subject: [Buildroot] [PATCH 071/107] package/python-xlrd: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-72-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-xlrd/Config.in | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package/python-xlrd/Config.in b/package/python-xlrd/Config.in index 40920f7b02..264ee93e78 100644 --- a/package/python-xlrd/Config.in +++ b/package/python-xlrd/Config.in @@ -1,9 +1,7 @@ config BR2_PACKAGE_PYTHON_XLRD bool "python-xlrd" - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_PYEXPAT + select BR2_PACKAGE_PYTHON3_ZLIB help Library for developers to extract data from Microsoft Excel(tm) spreadsheet files. -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:24 +0100 Subject: [Buildroot] [PATCH 058/107] package/python-remi: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-59-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-remi/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-remi/Config.in b/package/python-remi/Config.in index e0c5e9bfe1..da2c2f4cfb 100644 --- a/package/python-remi/Config.in +++ b/package/python-remi/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_REMI bool "python-remi" - select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_SSL # runtime select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime help Remi is a GUI library for Python applications which transpiles -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:26 +0100 Subject: [Buildroot] [PATCH 060/107] package/python-sentry-sdk: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-61-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-sentry-sdk/python-sentry-sdk.mk | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/package/python-sentry-sdk/python-sentry-sdk.mk b/package/python-sentry-sdk/python-sentry-sdk.mk index 556f03e137..9238b7fb1c 100644 --- a/package/python-sentry-sdk/python-sentry-sdk.mk +++ b/package/python-sentry-sdk/python-sentry-sdk.mk @@ -11,14 +11,4 @@ PYTHON_SENTRY_SDK_SETUP_TYPE = setuptools PYTHON_SENTRY_SDK_LICENSE = BSD-2-Clause PYTHON_SENTRY_SDK_LICENSE_FILES = LICENSE -ifeq ($(BR2_PACKAGE_PYTHON),y) -# only needed/valid for python 3.x -define PYTHON_SENTRY_SDK_RM_PY3_FILES - rm -f $(addprefix $(TARGET_DIR)/usr/lib/python*/site-packages/sentry_sdk/integrations/,\ - aiohttp.py asgi.py django/asgi.py httpx.py sanic.py tornado.py) -endef - -PYTHON_SENTRY_SDK_POST_INSTALL_TARGET_HOOKS += PYTHON_SENTRY_SDK_RM_PY3_FILES -endif - $(eval $(python-package)) -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:22 +0100 Subject: [Buildroot] [PATCH 056/107] package/python-raven: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-57-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-raven/Config.in | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/package/python-raven/Config.in b/package/python-raven/Config.in index 0d4b26c054..d02232cfd8 100644 --- a/package/python-raven/Config.in +++ b/package/python-raven/Config.in @@ -1,11 +1,8 @@ config BR2_PACKAGE_PYTHON_RAVEN bool "python-raven" - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 - select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 - select BR2_PACKAGE_PYTHON_UNICODEDATA if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_UNICODEDATA if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_ZLIB + select BR2_PACKAGE_PYTHON3_SSL + select BR2_PACKAGE_PYTHON3_UNICODEDATA help Raven is a client for Sentry (https://getsentry.com). -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:39 +0100 Subject: [Buildroot] [PATCH 073/107] package/python3: drop references to python2 In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-74-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python3/Config.in | 1 - package/python3/python3.mk | 2 -- 2 files changed, 3 deletions(-) diff --git a/package/python3/Config.in b/package/python3/Config.in index 7714518edc..61470c2944 100644 --- a/package/python3/Config.in +++ b/package/python3/Config.in @@ -4,7 +4,6 @@ comment "python3 needs a toolchain w/ wchar, threads, dynamic library" config BR2_PACKAGE_PYTHON3 bool "python3" - depends on !BR2_PACKAGE_PYTHON depends on BR2_USE_WCHAR # uses fork() depends on BR2_USE_MMU diff --git a/package/python3/python3.mk b/package/python3/python3.mk index f9afcd5097..6af7488ddd 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -260,9 +260,7 @@ define PYTHON3_INSTALL_SYMLINK ln -fs python3 $(TARGET_DIR)/usr/bin/python endef -ifneq ($(BR2_PACKAGE_PYTHON),y) PYTHON3_POST_INSTALL_TARGET_HOOKS += PYTHON3_INSTALL_SYMLINK -endif # Some packages may have build scripts requiring python3, whatever is the # python version chosen for the target. -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:38 +0100 Subject: [Buildroot] [PATCH 072/107] package/python-xmltodict: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-73-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-xmltodict/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-xmltodict/Config.in b/package/python-xmltodict/Config.in index cb12392c93..af2bbbf489 100644 --- a/package/python-xmltodict/Config.in +++ b/package/python-xmltodict/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_XMLTODICT bool "python-xmltodict" - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime help Makes working with XML feel like you are working with JSON. -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:25 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:25 +0100 Subject: [Buildroot] [PATCH 059/107] package/python-scapy: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-60-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-scapy/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-scapy/Config.in b/package/python-scapy/Config.in index 6575a33af3..517fb51714 100644 --- a/package/python-scapy/Config.in +++ b/package/python-scapy/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_SCAPY bool "python-scapy" - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_ZLIB help Scapy: interactive packet manipulation tool. -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:23 +0100 Subject: [Buildroot] [PATCH 057/107] package/python-reentry: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-58-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-reentry/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/python-reentry/Config.in b/package/python-reentry/Config.in index 8ebbe395c8..07d8988a18 100644 --- a/package/python-reentry/Config.in +++ b/package/python-reentry/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_PYTHON_REENTRY select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime select BR2_PACKAGE_PYTHON_CLICK # runtime select BR2_PACKAGE_PYTHON_SIX # runtime - select BR2_PACKAGE_PYTHON_PATHLIB2 if BR2_PACKAGE_PYTHON # runtime help A plugin manager based on setuptools entry points mechanism. -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:33 +0100 Subject: [Buildroot] [PATCH 067/107] package/python-webob: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-68-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-webob/Config.in | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package/python-webob/Config.in b/package/python-webob/Config.in index fe77723f95..d3397587a1 100644 --- a/package/python-webob/Config.in +++ b/package/python-webob/Config.in @@ -1,8 +1,6 @@ config BR2_PACKAGE_PYTHON_WEBOB bool "python-webob" - select BR2_PACKAGE_PYTHON_HASHLIB if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_ZLIB # runtime help WSGI request and response object. -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:35 +0100 Subject: [Buildroot] [PATCH 069/107] package/python-werkzeug: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-70-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-werkzeug/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-werkzeug/Config.in b/package/python-werkzeug/Config.in index 79e9a4561e..27b2fdeaab 100644 --- a/package/python-werkzeug/Config.in +++ b/package/python-werkzeug/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_WERKZEUG bool "python-werkzeug" - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_ZLIB # runtime help Werkzeug is a WSGI utility library for Python. It's widely used and BSD licensed. -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:32 +0100 Subject: [Buildroot] [PATCH 066/107] package/python-web2py: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-67-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-web2py/Config.in | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/package/python-web2py/Config.in b/package/python-web2py/Config.in index a0452060ba..bb455dfa7a 100644 --- a/package/python-web2py/Config.in +++ b/package/python-web2py/Config.in @@ -1,12 +1,9 @@ config BR2_PACKAGE_PYTHON_WEB2PY bool "python-web2py" select BR2_PACKAGE_PYTHON_PYDAL # runtime - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime - select BR2_PACKAGE_PYTHON_SQLITE if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_SQLITE if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_ZLIB # runtime + select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime + select BR2_PACKAGE_PYTHON3_SQLITE # runtime select BR2_PACKAGE_PYTHON_YATL # runtime help web2py is a free open source full-stack framework for rapid -- 2.20.1 From peter at korsgaard.com Wed Feb 9 16:51:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Feb 2022 17:51:36 +0100 Subject: [Buildroot] [PATCH 070/107] package/python-whoosh: drop python2 support In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209165213.4498-71-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- package/python-whoosh/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-whoosh/Config.in b/package/python-whoosh/Config.in index 1128ce6417..e1fb144985 100644 --- a/package/python-whoosh/Config.in +++ b/package/python-whoosh/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_WHOOSH bool "python-whoosh" - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_ZLIB # runtime help Whoosh is a fast, pure-Python full text indexing, search and spell checking library. -- 2.20.1 From fontaine.fabrice at gmail.com Wed Feb 9 19:13:27 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 9 Feb 2022 20:13:27 +0100 Subject: [Buildroot] [PATCH 1/3] package/sdl2_ttf: drop FREETYPE_CONFIG Message-ID: <20220209191329.201362-1-fontaine.fabrice@gmail.com> FREETYPE_CONFIG is not used since version 2.0.15 and https://github.com/libsdl-org/SDL_ttf/commit/50d72e55315e25d34f4209824275e3b1cbe6c6f8 Signed-off-by: Fabrice Fontaine --- package/sdl2_ttf/sdl2_ttf.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/sdl2_ttf/sdl2_ttf.mk b/package/sdl2_ttf/sdl2_ttf.mk index 1fe7c0a075..3b2b35e157 100644 --- a/package/sdl2_ttf/sdl2_ttf.mk +++ b/package/sdl2_ttf/sdl2_ttf.mk @@ -12,9 +12,6 @@ SDL2_TTF_LICENSE_FILES = COPYING.txt SDL2_TTF_INSTALL_STAGING = YES SDL2_TTF_DEPENDENCIES = sdl2 freetype host-pkgconf -SDL2_TTF_CONF_ENV = \ - FREETYPE_CONFIG=$(STAGING_DIR)/usr/bin/freetype-config - # x-includes and x-libraries must be set for cross-compiling # By default x_includes and x_libraries contains unsafe paths. # (/usr/include and /usr/lib) -- 2.34.1 From fontaine.fabrice at gmail.com Wed Feb 9 19:13:28 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 9 Feb 2022 20:13:28 +0100 Subject: [Buildroot] [PATCH 2/3] package/sdl2_ttf: disable builtin freetype2 In-Reply-To: <20220209191329.201362-1-fontaine.fabrice@gmail.com> References: <20220209191329.201362-1-fontaine.fabrice@gmail.com> Message-ID: <20220209191329.201362-2-fontaine.fabrice@gmail.com> Disable builtin freetype2 which is enabled by default since bump to version 2.0.18 in commit f4da031a77f200515bcc5b2e0fe665a7b4f2a780 and https://github.com/libsdl-org/SDL_ttf/commit/834ec54127dc9c2a12928f5fe32cf110ec4c7a7f Signed-off-by: Fabrice Fontaine --- package/sdl2_ttf/sdl2_ttf.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/sdl2_ttf/sdl2_ttf.mk b/package/sdl2_ttf/sdl2_ttf.mk index 3b2b35e157..e9397d8505 100644 --- a/package/sdl2_ttf/sdl2_ttf.mk +++ b/package/sdl2_ttf/sdl2_ttf.mk @@ -11,6 +11,7 @@ SDL2_TTF_LICENSE = Zlib SDL2_TTF_LICENSE_FILES = COPYING.txt SDL2_TTF_INSTALL_STAGING = YES SDL2_TTF_DEPENDENCIES = sdl2 freetype host-pkgconf +SDL2_TTF_CONF_OPTS = --disable-freetype-builtin # x-includes and x-libraries must be set for cross-compiling # By default x_includes and x_libraries contains unsafe paths. -- 2.34.1 From fontaine.fabrice at gmail.com Wed Feb 9 19:13:29 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 9 Feb 2022 20:13:29 +0100 Subject: [Buildroot] [PATCH 3/3] package/sdl2_ttf: add harfbuzz optional dependency In-Reply-To: <20220209191329.201362-1-fontaine.fabrice@gmail.com> References: <20220209191329.201362-1-fontaine.fabrice@gmail.com> Message-ID: <20220209191329.201362-3-fontaine.fabrice@gmail.com> harfbuzz is an optional dependency (which is enabled by default) since version 2.0.18 and https://github.com/libsdl-org/SDL_ttf/commit/328bbed78db496ff36720e8a809661ffb236e673 If harfbuzz is not disabled and not found, builtin harfbuzz is enabled resulting in the following build failure without C++ since commit f4da031a77f200515bcc5b2e0fe665a7b4f2a780 and https://github.com/libsdl-org/SDL_ttf/commit/9a7ef3fb640a1f086d9b02954c3b4bbfb3578871: configure: error: *** A compiler with support for C++11 language features is required. Fixes: - http://autobuild.buildroot.org/results/3fecb96a8063b1a28703682e9373714c1c9cfa24 Signed-off-by: Fabrice Fontaine --- package/sdl2_ttf/sdl2_ttf.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/sdl2_ttf/sdl2_ttf.mk b/package/sdl2_ttf/sdl2_ttf.mk index e9397d8505..54e76815f1 100644 --- a/package/sdl2_ttf/sdl2_ttf.mk +++ b/package/sdl2_ttf/sdl2_ttf.mk @@ -13,6 +13,13 @@ SDL2_TTF_INSTALL_STAGING = YES SDL2_TTF_DEPENDENCIES = sdl2 freetype host-pkgconf SDL2_TTF_CONF_OPTS = --disable-freetype-builtin +ifeq ($(BR2_PACKAGE_HARFBUZZ),y) +SDL2_TTF_DEPENDENCIES += harfbuzz +SDL2_TTF_CONF_OPTS += --enable-harfbuzz +else +SDL2_TTF_CONF_OPTS += --disable-harfbuzz +endif + # x-includes and x-libraries must be set for cross-compiling # By default x_includes and x_libraries contains unsafe paths. # (/usr/include and /usr/lib) -- 2.34.1 From fontaine.fabrice at gmail.com Wed Feb 9 19:20:48 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 9 Feb 2022 20:20:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/mongrel2: fix build with gcc 4.8 Message-ID: <20220209192048.319559-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump to version 1.13.0 in commit b0a7bffad9e041d9920171802621b67903f9389e: arm-none-linux-gnueabi-gcc: error: unrecognized command line option '-Wimplicit-fallthrough=0' Fixes: - http://autobuild.buildroot.org/results/de324b733e09057c87352220069fe65f6e535eb8 Signed-off-by: Fabrice Fontaine --- .../0003-fix-build-with-gcc-4.8.patch | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 package/mongrel2/0003-fix-build-with-gcc-4.8.patch diff --git a/package/mongrel2/0003-fix-build-with-gcc-4.8.patch b/package/mongrel2/0003-fix-build-with-gcc-4.8.patch new file mode 100644 index 0000000000..eebfce0487 --- /dev/null +++ b/package/mongrel2/0003-fix-build-with-gcc-4.8.patch @@ -0,0 +1,60 @@ +From cc2dd3995dc9a9e6f0e705e11e791f3f3c7d7326 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 18 Jan 2022 22:41:36 +0100 +Subject: [PATCH] fix build with gcc 4.8 + +Drop "-Wno-unused-const-variable -Wimplicit-fallthrough=0" as +"-Wno-implicit-fallthrough -Wno-unused-const-variable" is already set in +CFLAGS. This will avoid the following build failure with gcc 4.8 raised +since version 1.13.0 and +https://github.com/mongrel2/mongrel2/commit/725209578599bd7784753d86aee34f6441ff78a5: + +arm-none-linux-gnueabi-gcc: error: unrecognized command line option '-Wimplicit-fallthrough=0' + +Fixes: + - http://autobuild.buildroot.org/results/de324b733e09057c87352220069fe65f6e535eb8 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/mongrel2/mongrel2/pull/354] +--- + Makefile | 1 - + tools/m2sh/Makefile | 4 ++-- + 2 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index f6627ed..fb8d028 100644 +--- a/Makefile ++++ b/Makefile +@@ -22,7 +22,6 @@ all: bin/mongrel2 tests m2sh procer + + ${OBJECTS_NOEXT}: CFLAGS += ${NOEXTCFLAGS} + ${OBJECTS}: | builddirs +-$(RAGEL_OBJECTS): CFLAGS += -Wno-unused-const-variable -Wimplicit-fallthrough=0 + + .PHONY: builddirs + builddirs: +diff --git a/tools/m2sh/Makefile b/tools/m2sh/Makefile +index 83e7ae4..86364af 100644 +--- a/tools/m2sh/Makefile ++++ b/tools/m2sh/Makefile +@@ -10,7 +10,7 @@ LIB_SRC=$(filter-out src/m2sh.c,${SOURCES}) + LIB_OBJ=$(filter-out src/m2sh.o,${OBJECTS}) + RAGEL_OBJECTS=src/lexer.o src/cli.o + +-$(RAGEL_OBJECTS): CFLAGS += -Wno-unused-const-variable -Wimplicit-fallthrough=0 -Wno-unused-parameter ++$(RAGEL_OBJECTS): CFLAGS += -Wno-unused-parameter + + all: ../lemon/lemon tests build/m2sh + +@@ -20,7 +20,7 @@ dev: all + install: build/m2sh + install build/m2sh ${DESTDIR}${PREFIX}/bin + +-src/parser.o: CFLAGS += -Wno-unused-const-variable -Wno-unused-parameter ++src/parser.o: CFLAGS += -Wno-unused-parameter + + build/libm2sh.a: ${LIB_OBJ} + mkdir -p build +-- +2.34.1 + -- 2.34.1 From fontaine.fabrice at gmail.com Wed Feb 9 19:24:36 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 9 Feb 2022 20:24:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/rng-tools: bump to version 6.15 Message-ID: <20220209192436.319769-1-fontaine.fabrice@gmail.com> Drop patches (already in version) https://github.com/nhorman/rng-tools/releases/tag/v6.15 Signed-off-by: Fabrice Fontaine --- ...ct-non-posix-extensions-for-pthreads.patch | 43 ---------------- ...-either-pthread-affinity-set-methods.patch | 49 ------------------- package/rng-tools/rng-tools.hash | 2 +- package/rng-tools/rng-tools.mk | 2 +- 4 files changed, 2 insertions(+), 94 deletions(-) delete mode 100644 package/rng-tools/0001-Adding-ability-to-detect-non-posix-extensions-for-pthreads.patch delete mode 100644 package/rng-tools/0002-Allow-for-use-of-either-pthread-affinity-set-methods.patch 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 deleted file mode 100644 index ba6cf63d7c..0000000000 --- a/package/rng-tools/0001-Adding-ability-to-detect-non-posix-extensions-for-pthreads.patch +++ /dev/null @@ -1,43 +0,0 @@ -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 deleted file mode 100644 index 17285baa6a..0000000000 --- a/package/rng-tools/0002-Allow-for-use-of-either-pthread-affinity-set-methods.patch +++ /dev/null @@ -1,49 +0,0 @@ -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; - } diff --git a/package/rng-tools/rng-tools.hash b/package/rng-tools/rng-tools.hash index 6806a99fc6..be2ee13969 100644 --- a/package/rng-tools/rng-tools.hash +++ b/package/rng-tools/rng-tools.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4dd86f6ae37d917a8489f44070d39d7feddcc622429b95efd7aa85a1f3cfdf81 rng-tools-6.14.tar.gz +sha256 bff0c58dff90ec10bd61f672e48618e045155eabd60b32d63a9c4ffbdad05f3a rng-tools-6.15.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/rng-tools/rng-tools.mk b/package/rng-tools/rng-tools.mk index 8db97569d4..8b195ea875 100644 --- a/package/rng-tools/rng-tools.mk +++ b/package/rng-tools/rng-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -RNG_TOOLS_VERSION = 6.14 +RNG_TOOLS_VERSION = 6.15 RNG_TOOLS_SITE = $(call github,nhorman,$(RNG_TOOLS_NAME),v$(RNG_TOOLS_VERSION)) RNG_TOOLS_LICENSE = GPL-2.0 RNG_TOOLS_LICENSE_FILES = COPYING -- 2.34.1 From fontaine.fabrice at gmail.com Wed Feb 9 19:36:14 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 9 Feb 2022 20:36:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/libarchive: security bump to version 3.5.3 Message-ID: <20220209193614.330861-1-fontaine.fabrice@gmail.com> Libarchive 3.5.3 is a security release Security Fixes: - extended fix for following symlinks when processing the fixup list (CVE-2021-31566) - fix invalid memory access and out of bounds read in RAR5 reader (CVE-2021-36976) https://github.com/libarchive/libarchive/releases/tag/v3.5.3 Signed-off-by: Fabrice Fontaine --- package/libarchive/libarchive.hash | 2 +- package/libarchive/libarchive.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libarchive/libarchive.hash b/package/libarchive/libarchive.hash index d31e9f55f4..5dd8e5c167 100644 --- a/package/libarchive/libarchive.hash +++ b/package/libarchive/libarchive.hash @@ -1,4 +1,4 @@ # From https://www.libarchive.de/downloads/sha256sums -sha256 f0b19ff39c3c9a5898a219497ababbadab99d8178acc980155c7e1271089b5a0 libarchive-3.5.2.tar.xz +sha256 5cac725dd4be31c4a10b65d30f29dc957ea29ef3d758df6e46e8ae90a996a19a libarchive-3.5.3.tar.xz # Locally computed: sha256 b2cdf763345de2de34cebf54394df3c61a105c3b71288603c251f2fa638200ba COPYING diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk index eec256ba75..cf16c27e67 100644 --- a/package/libarchive/libarchive.mk +++ b/package/libarchive/libarchive.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBARCHIVE_VERSION = 3.5.2 +LIBARCHIVE_VERSION = 3.5.3 LIBARCHIVE_SOURCE = libarchive-$(LIBARCHIVE_VERSION).tar.xz LIBARCHIVE_SITE = https://www.libarchive.de/downloads LIBARCHIVE_INSTALL_STAGING = YES -- 2.34.1 From giulio.benetti at benettiengineering.com Wed Feb 9 19:38:06 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 9 Feb 2022 20:38:06 +0100 Subject: [Buildroot] [PATCH v3 2/2] add configs/zynqmp_zcu102_defconfig In-Reply-To: <20220209180306.2629180-2-neal.frager@xilinx.com> References: <20220209180306.2629180-1-neal.frager@xilinx.com> <20220209180306.2629180-2-neal.frager@xilinx.com> Message-ID: <6de61d14-67ba-2c21-ad51-b23690420009@benettiengineering.com> Hi Neal, On 09/02/22 19:03, Neal Frager wrote: > This patch: > - adds support for Xilinx ZCU102 evaluation board > - ZCU102 features can be found here: > - https://www.xilinx.com/products/boards-and-kits/zcu102.html ^^^ please remove the dash > > Signed-off-by: Neal Frager Here like on previous patch add: --- V1->V2: * etc. > --- > board/zynqmp/readme.txt | 23 +++++++++++++------ > configs/zynqmp_zcu102_defconfig | 39 +++++++++++++++++++++++++++++++++ > 2 files changed, 55 insertions(+), 7 deletions(-) > create mode 100644 configs/zynqmp_zcu102_defconfig > > diff --git a/board/zynqmp/readme.txt b/board/zynqmp/readme.txt > index da37f4ccc9..0dc1793e03 100644 > --- a/board/zynqmp/readme.txt > +++ b/board/zynqmp/readme.txt > @@ -1,10 +1,19 @@ > -******************************** > -Xilinx ZCU106 board - ZynqMP SoC > -******************************** > +****************************************** > +Xilinx ZCU102 / ZCU106 boards - ZynqMP SoC > +****************************************** > + > +This document describes the Buildroot support for the ZCU102 and ZCU106 > +boards by Xilinx, based on the Zynq UltraScale+ MPSoC (aka ZynqMP). > +It has been tested with the ZCU102 and ZCU106 production boards. > + > +Evaluation board features can be found here with the links below. > + > +ZCU102: > +https://www.xilinx.com/products/boards-and-kits/zcu102.html > + > +ZCU106: > +https://www.xilinx.com/products/boards-and-kits/zcu106.html > > -This document describes the Buildroot support for the ZCU106 board by > -Xilinx, based on the Zynq UltraScale+ MPSoC (aka ZynqMP). It has been > -tested with the EK-U1-ZCU106-ES2 pre-production board. > > How to build it > =============== > @@ -32,7 +41,7 @@ After building, you should get a tree like this: > +-- rootfs.ext4 -> rootfs.ext2 > +-- sdcard.img > +-- system.dtb -> zynqmp-zcu106-revA.dtb > - +-- u-boot.bin > + +-- u-boot.itb > `-- zynqmp-zcu106-revA.dtb > > How to write the SD card > diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig > new file mode 100644 > index 0000000000..acffda64bf > --- /dev/null > +++ b/configs/zynqmp_zcu102_defconfig > @@ -0,0 +1,39 @@ > +BR2_aarch64=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_GIT=y > +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.15" > +BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +# BR2_TARGET_ROOTFS_TAR is not set > +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.6" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/Xilinx/u-boot-xlnx.git" > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2022.01" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > +BR2_TARGET_UBOOT_SPL=y > +BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" > +BR2_TARGET_UBOOT_ZYNQMP=y > +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/v2021.2/bin/pmufw-v2021.2.bin" > +BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/pm_cfg_obj.c" > +BR2_TARGET_UBOOT_FORMAT_ITB=y > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_MTOOLS=y Please send a V4 with the few requested changes and add in commit log like this: ``` Signed-off-by: Neal Frager Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti [Giulio: only build tested] ``` Thank you! Best regards -- Giulio Benetti Benetti Engineering sas From fontaine.fabrice at gmail.com Wed Feb 9 19:44:54 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 9 Feb 2022 20:44:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/audit: bump to version 3.0.7 Message-ID: <20220209194454.344276-1-fontaine.fabrice@gmail.com> https://github.com/linux-audit/audit-userspace/releases/tag/v3.0.7 Signed-off-by: Fabrice Fontaine --- package/audit/audit.hash | 2 +- package/audit/audit.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/audit/audit.hash b/package/audit/audit.hash index 9e16a339d6..6260f158d8 100644 --- a/package/audit/audit.hash +++ b/package/audit/audit.hash @@ -1,4 +1,4 @@ #Locally computed -sha256 c3e44d77513a42401d417dd0ceb203cf23886cb89402dea7b9494faa3f4fcc5e audit-3.0.6.tar.gz +sha256 8b4c78632a9301a1c7f859b0e38fc0b9c260b8214d6b7c771bf28b3d73a62597 audit-3.0.7.tar.gz sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING sha256 f18a0811fa0e220ccbc42f661545e77f0388631e209585ed582a1c693029c6aa COPYING.LIB diff --git a/package/audit/audit.mk b/package/audit/audit.mk index 7f364ab010..cbb174b980 100644 --- a/package/audit/audit.mk +++ b/package/audit/audit.mk @@ -4,7 +4,7 @@ # ################################################################################ -AUDIT_VERSION = 3.0.6 +AUDIT_VERSION = 3.0.7 AUDIT_SITE = http://people.redhat.com/sgrubb/audit AUDIT_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) AUDIT_LICENSE_FILES = COPYING COPYING.LIB -- 2.34.1 From thomas.petazzoni at bootlin.com Wed Feb 9 19:50:57 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 9 Feb 2022 20:50:57 +0100 Subject: [Buildroot] [PATCH 1/5 v2] package/pkg-cargo: allow packages to define download environment In-Reply-To: <9354_1644422930_6203E712_9354_383_11_2d5b77c2a90cf722e007a5bf3ed4227d2bd1fda6.1644422916.git.yann.morin@orange.com> References: <9354_1644422930_6203E712_9354_383_11_2d5b77c2a90cf722e007a5bf3ed4227d2bd1fda6.1644422916.git.yann.morin@orange.com> Message-ID: <20220209205057.57a6d1ce@windsurf> On Wed, 9 Feb 2022 17:08:43 +0100 wrote: > From: "Yann E. MORIN" > > Currently, the cargo infrastructure forcibly sets the package _DL_ENV > variable, instead of appending to it, which prevents packages from > providing their own download environment variables. > > We fix that by using an append-assignment. > > Note: when introduced, that variable was explicitly not documented, and > is supposed to only be used by packages infrastructures. However, that > variable exists, and it can be (ab)used by br2-external packages (most > probably to ill effects, but heh!). We anyway leave it undocumented, > like _ROOTFS_PRE_CMD_HOOKS. > > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni Acked-by: Thomas Petazzoni -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From fontaine.fabrice at gmail.com Wed Feb 9 19:52:40 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 9 Feb 2022 20:52:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/fatcat: bump to version 1.1.1 Message-ID: <20220209195240.346534-1-fontaine.fabrice@gmail.com> Update indentation in hash file (two spaces) https://github.com/Gregwar/fatcat/compare/v1.1.0...v1.1.1 Signed-off-by: Fabrice Fontaine --- package/fatcat/fatcat.hash | 4 ++-- package/fatcat/fatcat.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/fatcat/fatcat.hash b/package/fatcat/fatcat.hash index 66823e2d9e..56f89edd50 100644 --- a/package/fatcat/fatcat.hash +++ b/package/fatcat/fatcat.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 303efe2aa73cbfe6fbc5d8af346d0f2c70b3f996fc891e8859213a58b95ad88c fatcat-1.1.0.tar.gz -sha256 3ea03755e32cf7f5b12981de92a0fdad396448195fe0024990c9cbc388e9866c LICENSE +sha256 5574f715f62a9feda7fffc8099f8bca7134ff4f1274bb1bc0db96a2969eea206 fatcat-1.1.1.tar.gz +sha256 3ea03755e32cf7f5b12981de92a0fdad396448195fe0024990c9cbc388e9866c LICENSE diff --git a/package/fatcat/fatcat.mk b/package/fatcat/fatcat.mk index 1a2e5aacae..0dff53fa65 100644 --- a/package/fatcat/fatcat.mk +++ b/package/fatcat/fatcat.mk @@ -4,7 +4,7 @@ # ################################################################################ -FATCAT_VERSION = 1.1.0 +FATCAT_VERSION = 1.1.1 FATCAT_SITE = $(call github,Gregwar,fatcat,v$(FATCAT_VERSION)) FATCAT_LICENSE = MIT FATCAT_LICENSE_FILES = LICENSE -- 2.34.1 From thomas.petazzoni at bootlin.com Wed Feb 9 19:52:59 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 9 Feb 2022 20:52:59 +0100 Subject: [Buildroot] [PATCH 1/5 v2] package/pkg-cargo: allow packages to define download environment In-Reply-To: <9354_1644422930_6203E712_9354_383_11_2d5b77c2a90cf722e007a5bf3ed4227d2bd1fda6.1644422916.git.yann.morin@orange.com> References: <9354_1644422930_6203E712_9354_383_11_2d5b77c2a90cf722e007a5bf3ed4227d2bd1fda6.1644422916.git.yann.morin@orange.com> Message-ID: <20220209205259.725e17c2@windsurf> On Wed, 9 Feb 2022 17:08:43 +0100 wrote: > $(2)_DOWNLOAD_POST_PROCESS = cargo > -$(2)_DL_ENV = CARGO_HOME=$$(HOST_DIR)/share/cargo > +$(2)_DL_ENV += CARGO_HOME=$$(HOST_DIR)/share/cargo But, but, then, how is: PYTHON_CRYPTOGRAPHY_DL_ENV = \ BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml currently working? Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 9 19:54:10 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 9 Feb 2022 20:54:10 +0100 Subject: [Buildroot] [PATCH 2/5 v2] package/pkg-cargo: allow building in a sub-directory In-Reply-To: <20175_1644422934_6203E716_20175_175_1_fea7d1545892211e01cb6660dc5fba16b0851c47.1644422916.git.yann.morin@orange.com> References: <20175_1644422934_6203E716_20175_175_1_fea7d1545892211e01cb6660dc5fba16b0851c47.1644422916.git.yann.morin@orange.com> Message-ID: <20220209205410.071f193a@windsurf> On Wed, 9 Feb 2022 17:08:44 +0100 wrote: > +# If building in a sub directory, use that to find the Cargo.toml, unless > +# the package already provided its location. > +ifneq ($$($(2)_SUBDIR),) > +ifeq ($$(filter BR_CARGO_MANIFEST_PATH=%,$$($(2)_DL_ENV)),) > +$(2)_DL_ENV += BR_CARGO_MANIFEST_PATH=$$($(2)_SUBDIR)/Cargo.toml I find that a bit "meh". Should we have an explicit package variable that tells the location of the Cargo.toml, instead of directly have packages pass this "magic" BR_CARGO_MANIFEST_PATH variable ? Should $(2)_SUBDIR be documented for the cargo-package infra in the documentation ? Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 9 19:55:18 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 9 Feb 2022 20:55:18 +0100 Subject: [Buildroot] [PATCH 3/5 v2] package/pkg-cargo: host-rustc is also a build dependency In-Reply-To: <9430_1644422939_6203E71B_9430_485_1_951512fc2010b31a4d2d50fe12c2ad86f3a0c1a1.1644422916.git.yann.morin@orange.com> References: <9430_1644422939_6203E71B_9430_485_1_951512fc2010b31a4d2d50fe12c2ad86f3a0c1a1.1644422916.git.yann.morin@orange.com> Message-ID: <20220209205518.18d720ef@windsurf> On Wed, 9 Feb 2022 17:08:45 +0100 wrote: > From: "Yann E. MORIN" > > Currently, host-rustc is a download dependency, because we need cargo > for the vendoring during the downlaod step. ^^^^^^^^ download > However, when using a package in override-srcdir, there is no download > step, so host-rustc is not pulled in as a dependency which breaks > running the build of a single pcakge from scratch: ^^^^^^ package > $ make clean > $ make my-rust-package > [...] > [...] cargo build --offline --release --manifest-path Cargo.toml --locked > /bin/sh: cargo: command not found > > We fix that by adding host-rustc as a standard dependency too. > > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni Acked-by: Thomas Petazzoni -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 9 19:55:44 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 9 Feb 2022 20:55:44 +0100 Subject: [Buildroot] [PATCH 4/5 v2] package/pkg-golang: allow packages to define download environment In-Reply-To: <20175_1644422945_6203E721_20175_189_1_2f2cfe45bc7a546997c16e84a6e617dc0752a731.1644422916.git.yann.morin@orange.com> References: <20175_1644422945_6203E721_20175_189_1_2f2cfe45bc7a546997c16e84a6e617dc0752a731.1644422916.git.yann.morin@orange.com> Message-ID: <20220209205544.6a944b47@windsurf> On Wed, 9 Feb 2022 17:08:46 +0100 wrote: > From: "Yann E. MORIN" > > Currently, the golang infrastructure forcibly sets the package _DL_ENV > variable, instead of appending to it, which prevents packages from > providing their own download environment variables. > > We fix that by using an append-assignment. > > Note: when introduced, that variable was explicitly not documented, and > is supposed to only be used by packages infrastructures. However, that > variable exists, and it can be (ab)used by br2-external packages (most > probably to ill effects, but heh!). We anyway leave it undocumented, > like _ROOTFS_PRE_CMD_HOOKS. > > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni > Cc: Christian Stewart > Cc: Anisse Astier Acked-by: Thomas Petazzoni -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From fontaine.fabrice at gmail.com Wed Feb 9 19:59:30 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 9 Feb 2022 20:59:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/fping: bump to version 5.1 Message-ID: <20220209195930.349179-1-fontaine.fabrice@gmail.com> https://github.com/schweikert/fping/releases/tag/v5.1 Signed-off-by: Fabrice Fontaine --- package/fping/fping.hash | 2 +- package/fping/fping.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/fping/fping.hash b/package/fping/fping.hash index 0b2233f379..4671cd77cf 100644 --- a/package/fping/fping.hash +++ b/package/fping/fping.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 ed38c0b9b64686a05d1b3bc1d66066114a492e04e44eef1821d43b1263cd57b8 fping-5.0.tar.gz +sha256 1ee5268c063d76646af2b4426052e7d81a42b657e6a77d8e7d3d2e60fd7409fe fping-5.1.tar.gz # Hash for license file sha256 6051b27e4b4a648f7bc8b329024da53a6e95ce88fcf0ccc259c371a74b741757 COPYING diff --git a/package/fping/fping.mk b/package/fping/fping.mk index 0a03c1dfdc..5986d05b93 100644 --- a/package/fping/fping.mk +++ b/package/fping/fping.mk @@ -4,7 +4,7 @@ # ################################################################################ -FPING_VERSION = 5.0 +FPING_VERSION = 5.1 FPING_SITE = http://fping.org/dist FPING_LICENSE = BSD-like FPING_LICENSE_FILES = COPYING -- 2.34.1 From thomas.petazzoni at bootlin.com Wed Feb 9 20:03:42 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 9 Feb 2022 21:03:42 +0100 Subject: [Buildroot] [PATCH 5/5 v2] package/pkg-golang: host-go is also a build dependency In-Reply-To: <25580_1644422947_6203E723_25580_17_1_a1a52ce7fd9920435f8cc9e82513d62f9badd738.1644422916.git.yann.morin@orange.com> References: <25580_1644422947_6203E723_25580_17_1_a1a52ce7fd9920435f8cc9e82513d62f9badd738.1644422916.git.yann.morin@orange.com> Message-ID: <20220209210342.604b2661@windsurf> On Wed, 9 Feb 2022 17:08:47 +0100 wrote: > From: "Yann E. MORIN" > > Currently, host-go is a download dependency, because we need go for the > vendoring during the downlaod step. > > However, when using a package in override-srcdir, there is no download > step, so host-go is not pulled in as a dependency, which will break the > build of a single package from scratch. > > We fix that by adding host-go as a standard dependency too. > > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni > Cc: Christian Stewart > Cc: Anisse Astier Acked-by: Thomas Petazzoni -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From christian at paral.in Wed Feb 9 20:11:37 2022 From: christian at paral.in (Christian Stewart) Date: Wed, 9 Feb 2022 12:11:37 -0800 Subject: [Buildroot] [PATCH 5/5 v2] package/pkg-golang: host-go is also a build dependency In-Reply-To: <25580_1644422947_6203E723_25580_17_1_a1a52ce7fd9920435f8cc9e82513d62f9badd738.1644422916.git.yann.morin@orange.com> References: <25580_1644422947_6203E723_25580_17_1_a1a52ce7fd9920435f8cc9e82513d62f9badd738.1644422916.git.yann.morin@orange.com> Message-ID: On Wed, Feb 9, 2022 at 8:09 AM wrote: > > From: "Yann E. MORIN" > > Currently, host-go is a download dependency, because we need go for the > vendoring during the downlaod step. > > However, when using a package in override-srcdir, there is no download > step, so host-go is not pulled in as a dependency, which will break the > build of a single package from scratch. > > We fix that by adding host-go as a standard dependency too. > > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni > Cc: Christian Stewart > Cc: Anisse Astier > --- > package/pkg-golang.mk | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk > index 69eae02830..ddefdf1214 100644 Reviewed-by: Christian Stewart Best, Christian From christian at paral.in Wed Feb 9 20:12:11 2022 From: christian at paral.in (Christian Stewart) Date: Wed, 9 Feb 2022 12:12:11 -0800 Subject: [Buildroot] [PATCH 4/5 v2] package/pkg-golang: allow packages to define download environment In-Reply-To: <20175_1644422945_6203E721_20175_189_1_2f2cfe45bc7a546997c16e84a6e617dc0752a731.1644422916.git.yann.morin@orange.com> References: <20175_1644422945_6203E721_20175_189_1_2f2cfe45bc7a546997c16e84a6e617dc0752a731.1644422916.git.yann.morin@orange.com> Message-ID: Hi, On Wed, Feb 9, 2022 at 8:09 AM wrote: > > From: "Yann E. MORIN" > > Currently, the golang infrastructure forcibly sets the package _DL_ENV > variable, instead of appending to it, which prevents packages from > providing their own download environment variables. > > We fix that by using an append-assignment. > > Note: when introduced, that variable was explicitly not documented, and > is supposed to only be used by packages infrastructures. However, that > variable exists, and it can be (ab)used by br2-external packages (most > probably to ill effects, but heh!). We anyway leave it undocumented, > like _ROOTFS_PRE_CMD_HOOKS. > > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni > Cc: Christian Stewart > Cc: Anisse Astier > --- > 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..69eae02830 100644 Reviewed-by: Christian Stewart Best, Christian From fontaine.fabrice at gmail.com Wed Feb 9 20:14:44 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 9 Feb 2022 21:14:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/gauche: drop autoreconf Message-ID: <20220209201444.352250-1-fontaine.fabrice@gmail.com> Commit 11cb72be570409be77d4bb49c17b4a2feef31be7 forgot to drop autoreconf Signed-off-by: Fabrice Fontaine --- package/gauche/gauche.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/gauche/gauche.mk b/package/gauche/gauche.mk index 2520379369..fe0a613a9d 100644 --- a/package/gauche/gauche.mk +++ b/package/gauche/gauche.mk @@ -10,8 +10,6 @@ GAUCHE_SITE = http://downloads.sourceforge.net/project/gauche/Gauche GAUCHE_LICENSE = BSD-3-Clause, Boehm-gc, SRFI (srfi-11.scm), reload (reload.scm) GAUCHE_LICENSE_FILES = COPYING GAUCHE_DEPENDENCIES = host-gauche -# We're patching configure.ac -GAUCHE_AUTORECONF = YES HOST_GAUCHE_CONF_OPTS = --without-zlib GAUCHE_CONF_OPTS = --without-libatomic-ops -- 2.34.1 From fontaine.fabrice at gmail.com Wed Feb 9 20:21:23 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 9 Feb 2022 21:21:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/jo: bump to version 1.6 Message-ID: <20220209202123.354897-1-fontaine.fabrice@gmail.com> https://github.com/jpmens/jo/blob/1.6/ChangeLog Signed-off-by: Fabrice Fontaine --- package/jo/jo.hash | 2 +- package/jo/jo.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/jo/jo.hash b/package/jo/jo.hash index 8f1cc8fcd9..efad8228a7 100644 --- a/package/jo/jo.hash +++ b/package/jo/jo.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 24c64d2eb863900947f58f32b502c95fec8f086105fd31151b91f54b7b5256a2 jo-1.4.tar.gz +sha256 eb15592f1ba6d5a77468a1438a20e3d21c3d63bb7d045fb3544f223340fcd1a1 jo-1.6.tar.gz sha256 41d8b23dc6e76731f4920b9ce42d0d4a248d243a510319e2441d174a115f35cf COPYING diff --git a/package/jo/jo.mk b/package/jo/jo.mk index 24b499f345..dd5dd03ddb 100644 --- a/package/jo/jo.mk +++ b/package/jo/jo.mk @@ -4,7 +4,7 @@ # ################################################################################ -JO_VERSION = 1.4 +JO_VERSION = 1.6 JO_SITE = https://github.com/jpmens/jo/releases/download/$(JO_VERSION) JO_LICENSE = MIT (json.[ch]), GPL-2.0+ (rest) JO_LICENSE_FILES = COPYING -- 2.34.1 From fontaine.fabrice at gmail.com Wed Feb 9 20:28:25 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 9 Feb 2022 21:28:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/libmodbus: bump to version 3.1.7 Message-ID: <20220209202825.359811-1-fontaine.fabrice@gmail.com> https://github.com/stephane/libmodbus/releases/tag/v3.1.7 Signed-off-by: Fabrice Fontaine --- package/libmodbus/libmodbus.hash | 2 +- package/libmodbus/libmodbus.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libmodbus/libmodbus.hash b/package/libmodbus/libmodbus.hash index 2931f3f3d7..b676d261de 100644 --- a/package/libmodbus/libmodbus.hash +++ b/package/libmodbus/libmodbus.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d7d9fa94a16edb094e5fdf5d87ae17a0dc3f3e3d687fead81835d9572cf87c16 libmodbus-3.1.6.tar.gz +sha256 7dfe958431d0570b271e1a5b329b76a658e89c614cf119eb5aadb725c87f8fbd libmodbus-3.1.7.tar.gz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LESSER diff --git a/package/libmodbus/libmodbus.mk b/package/libmodbus/libmodbus.mk index 52eb318a99..46eb860392 100644 --- a/package/libmodbus/libmodbus.mk +++ b/package/libmodbus/libmodbus.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMODBUS_VERSION = 3.1.6 +LIBMODBUS_VERSION = 3.1.7 LIBMODBUS_SITE = http://libmodbus.org/releases LIBMODBUS_LICENSE = LGPL-2.1+ LIBMODBUS_LICENSE_FILES = COPYING.LESSER -- 2.34.1 From yann.morin.1998 at free.fr Wed Feb 9 20:30:26 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 21:30:26 +0100 Subject: [Buildroot] [PATCH] support/scripts/graph-build-time: add support for timeline graphing Message-ID: <20220209203026.3724993-1-yann.morin.1998@free.fr> From: Thomas Petazzoni This commit adds support for a new type of graph, showing the timeline of a build. It shows, with one line per package, when each of this package steps started/ended, and therefore allows to see the sequencing of the package builds. For a fully serialized build like we have today, this is not super useful (except to show that everything is serialized), but it becomes much more useful in the context of top-level parallel build. We chose to order the graph by the time-of-configure, as it is the closest to the actual cascade-style of a true dependency graph, which is tiny bit more complex to achieve properly. The actual result still looks pretty good. The graph-build make target is extended to also generate this new timeline graph. Signed-off-by: Thomas Petazzoni [yann.morin.1998 at free.fr: - sort by start-of-configure time - re-use existing colorsets (default or alternate) - fix python2isms - fix check-package ] Signed-off-by: Yann E. MORIN --- Makefile | 3 ++ support/scripts/graph-build-time | 63 +++++++++++++++++++++++++++++++- 2 files changed, 65 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8a4ec4ef85..da2dd8cfba 100644 --- a/Makefile +++ b/Makefile @@ -872,6 +872,9 @@ graph-build: $(O)/build/build-time.log --type=pie-$(t) --input=$(<) \ --output=$(GRAPHS_DIR)/build.pie-$(t).$(BR_GRAPH_OUT) \ $(if $(BR2_GRAPH_ALT),--alternate-colors)$(sep)) + ./support/scripts/graph-build-time --type=timeline --input=$(<) \ + --output=$(GRAPHS_DIR)/build.timeline.$(BR_GRAPH_OUT) \ + $(if $(BR2_GRAPH_ALT),--alternate-colors) .PHONY: graph-depends-requirements graph-depends-requirements: diff --git a/support/scripts/graph-build-time b/support/scripts/graph-build-time index 742c9a7a50..1edc3b3c00 100755 --- a/support/scripts/graph-build-time +++ b/support/scripts/graph-build-time @@ -241,6 +241,65 @@ def pkg_pie_time_per_step(data, output): plt.savefig(output) +def pkg_timeline(data, output): + start = 0 + end = 0 + + # Find the first timestamp and the last timestamp + for p in data: + for k, v in p.steps_start.items(): + if start == 0 or v < start: + start = v + if end < v: + end = v + + # Readjust all timestamps so that 0 is the start of the build + # instead of being Epoch + for p in data: + for k, v in p.steps_start.items(): + p.steps_start[k] = v - start + for k, v in p.steps_end.items(): + p.steps_end[k] = v - start + + plt.figure() + + i = 0 + labels_names = [] + labels_coords = [] + # put last packages that started to configure last; this does not + # give the proper dependency chain, but still provides a good-enough + # cascade graph. + for p in sorted(data, reverse=True, key=lambda x: x.steps_start['configure']): + durations = [] + facecolors = [] + for step in steps: + if step not in p.steps_start or step not in p.steps_end: + continue + durations.append((p.steps_start[step], + p.steps_end[step] - p.steps_start[step])) + facecolors.append(colors[steps.index(step)]) + plt.broken_barh(durations, (i, 6), facecolors=facecolors) + labels_coords.append(i + 3) + labels_names.append(p.name) + i += 10 + + axes = plt.gcf().gca() + + axes.set_ylim(0, i + 10) + axes.set_xlim(0, end - start) + axes.set_xlabel('seconds since start') + axes.set_yticks(labels_coords) + axes.set_yticklabels(labels_names) + axes.set_axisbelow(True) + axes.grid(True, linewidth=0.2, zorder=-1) + + plt.gcf().subplots_adjust(left=0.2) + + plt.tick_params(axis='y', which='both', labelsize=6) + plt.title('Timeline') + plt.savefig(output, dpi=300) + + # Parses the csv file passed on standard input and returns a list of # Package objects, filed with the duration of each step and the total # duration of the package. @@ -277,7 +336,7 @@ def read_data(input_file): parser = argparse.ArgumentParser(description='Draw build time graphs') parser.add_argument("--type", '-t', metavar="GRAPH_TYPE", - help="Type of graph (histogram, pie-packages, pie-steps)") + help="Type of graph (histogram, pie-packages, pie-steps, timeline)") parser.add_argument("--order", '-O', metavar="GRAPH_ORDER", help="Ordering of packages: build or duration (for histogram only)") parser.add_argument("--alternate-colors", '-c', action="store_true", @@ -307,6 +366,8 @@ elif args.type == "pie-packages": pkg_pie_time_per_package(d, args.output) elif args.type == "pie-steps": pkg_pie_time_per_step(d, args.output) +elif args.type == "timeline": + pkg_timeline(d, args.output) else: sys.stderr.write("Unknown type: %s\n" % args.type) exit(1) -- 2.25.1 From yann.morin.1998 at free.fr Wed Feb 9 20:33:36 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 21:33:36 +0100 Subject: [Buildroot] [PATCH] package/python-pyzmq: drop python2 dependency for comment In-Reply-To: <20220209152606.20762-1-peter@korsgaard.com> References: <20220209152606.20762-1-peter@korsgaard.com> Message-ID: <20220209203336.GC2249818@scaer> Peter, All, On 2022-02-09 16:26 +0100, Peter Korsgaard spake thusly: > The package was updated to support python3 in commit 4a8bedc51d9 > (python-pyzmq: enable PyZMQ for Python 3), but the comment dependency was > missed. > > Signed-off-by: Peter Korsgaard Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/python-pyzmq/Config.in | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/package/python-pyzmq/Config.in b/package/python-pyzmq/Config.in > index 8f33a635c8..f8ce52f844 100644 > --- a/package/python-pyzmq/Config.in > +++ b/package/python-pyzmq/Config.in > @@ -9,5 +9,4 @@ config BR2_PACKAGE_PYTHON_PYZMQ > http://zeromq.org/bindings:python > > comment "python-pyzmq needs a toolchain w/ C++, threads" > - depends on BR2_PACKAGE_PYTHON > depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS) > -- > 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 Feb 9 20:31:36 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 21:31:36 +0100 Subject: [Buildroot] [git commit] package/python-pyzmq: drop python2 dependency for comment Message-ID: <20220209202625.6067482B8F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6e9ecaa0c9d9aea41212566a58ffab5e25e52bda branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The package was updated to support python3 in commit 4a8bedc51d9 (python-pyzmq: enable PyZMQ for Python 3), but the comment dependency was missed. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-pyzmq/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/python-pyzmq/Config.in b/package/python-pyzmq/Config.in index 8f33a635c8..f8ce52f844 100644 --- a/package/python-pyzmq/Config.in +++ b/package/python-pyzmq/Config.in @@ -9,5 +9,4 @@ config BR2_PACKAGE_PYTHON_PYZMQ http://zeromq.org/bindings:python comment "python-pyzmq needs a toolchain w/ C++, threads" - depends on BR2_PACKAGE_PYTHON depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS) From fontaine.fabrice at gmail.com Wed Feb 9 20:35:35 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 9 Feb 2022 21:35:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/lzip: bump to version 1.23 Message-ID: <20220209203535.361814-1-fontaine.fabrice@gmail.com> https://lists.nongnu.org/archive/html/lzip-bug/2022-02/msg00000.html Signed-off-by: Fabrice Fontaine --- package/lzip/lzip.hash | 4 ++-- package/lzip/lzip.mk | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/lzip/lzip.hash b/package/lzip/lzip.hash index 57e7eb43f4..5e285a5ad8 100644 --- a/package/lzip/lzip.hash +++ b/package/lzip/lzip.hash @@ -1,4 +1,4 @@ -# From https://lists.nongnu.org/archive/html/lzip-bug/2021-01/msg00008.html -sha256 c3342d42e67139c165b8b128d033b5c96893a13ac5f25933190315214e87a948 lzip-1.22.tar.gz +# From https://lists.nongnu.org/archive/html/lzip-bug/2022-02/msg00000.html +sha256 ea02b9e6fb25d0e1a1d3ef4fdeb6ab26b931f1ece66fa1cee2983c95215e930a lzip-1.23.tar.lz # Locally calculated sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef COPYING diff --git a/package/lzip/lzip.mk b/package/lzip/lzip.mk index cca6da07d0..e3cc86b956 100644 --- a/package/lzip/lzip.mk +++ b/package/lzip/lzip.mk @@ -4,7 +4,8 @@ # ################################################################################ -LZIP_VERSION = 1.22 +LZIP_VERSION = 1.23 +LZIP_SOURCE = lzip-$(LZIP_VERSION).tar.lz LZIP_SITE = http://download.savannah.gnu.org/releases/lzip LZIP_LICENSE = GPL-2.0+ LZIP_LICENSE_FILES = COPYING -- 2.34.1 From giulio.benetti at benettiengineering.com Wed Feb 9 20:38:53 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 9 Feb 2022 21:38:53 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/guile: Add BR2_ENABLE_LOCALE as dependency. In-Reply-To: References: Message-ID: <3147FE8A-CB1B-4CB0-A92B-48767C06ED92@benettiengineering.com> Ah last thing, please register on patchwork and mark your V1 and v2 patches as superseded: https://patchwork.ozlabs.org/project/buildroot/list/?submitter=64998 Best regards Giulio Inviato da iPhone > Il giorno 8 feb 2022, alle ore 23:54, Giulio Benetti ha scritto: > > ?Hi again Pedro, > > I've reproduced the build failure with your previous attached .config file and this patch fixes it. So below... > >> On 08/02/22 23:06, Giulio Benetti wrote: >> Hi Pedro, >>> On 08/02/22 22:37, Pedro Aguilar wrote: >>> If it's not present, enable libiconv. >> Here it's missing: >> Fixes: >> URL to autobuilder failure > > ...please provide the autobuilder failure URL and if it doesn't exist than we don't need it. > > So once done this I can give you my Review. > > Waiting for V2 with improved commit log then. > > Thank you! > Best regards > -- > Giulio Benetti > Benetti Engineering sas > >> And also I can't find guile failing due to LIBICONV. >> At least, I only find: >> http://autobuild.buildroot.net/?reason=guile-3.0.7 >> But it seems to be about another problem(to be solved too). >> Can you please point the autobuilder failure? >> Otherwise I can't test/review your patch. >> Thank you! >> Best regards >> -- Giulio Benetti Benetti Engineering sas >>> Signed-off-by: Pedro Aguilar >>> >>> --- >>> Changes v1 -> v2: >>> - Use BR2_ENABLE_LOCALE if selected, otherwise use libiconv >>> as before (pointed out by Thomas and Giulio) >>> --- >>> package/guile/Config.in | 1 + >>> package/guile/guile.mk | 4 ++++ >>> 2 files changed, 5 insertions(+) >>> >>> diff --git a/package/guile/Config.in b/package/guile/Config.in >>> index b1182a4cee..f70e674018 100644 >>> --- a/package/guile/Config.in >>> +++ b/package/guile/Config.in >>> @@ -9,6 +9,7 @@ config BR2_PACKAGE_GUILE >>> select BR2_PACKAGE_LIBFFI >>> select BR2_PACKAGE_GMP >>> select BR2_PACKAGE_BDWGC >>> + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE >>> help >>> Guile is an interpreter and compiler for the Scheme >>> programming language, a clean and elegant dialect of Lisp. >>> diff --git a/package/guile/guile.mk b/package/guile/guile.mk >>> index 0f245fca76..03420407f8 100644 >>> --- a/package/guile/guile.mk >>> +++ b/package/guile/guile.mk >>> @@ -18,6 +18,10 @@ GUILE_CPE_ID_VENDOR = gnu >>> GUILE_DEPENDENCIES = host-guile libunistring libffi gmp bdwgc host-pkgconf >>> HOST_GUILE_DEPENDENCIES = host-libunistring host-libffi host-gmp host-bdwgc host-flex host-pkgconf host-gettext >>> +ifeq ($(BR2_ENABLE_LOCALE),) >>> +GUILE_DEPENDENCIES += libiconv >>> +endif >>> + >>> # The HAVE_GC* CFLAGS specify that we will use internal callbacks >>> # instead of the ones provided by >>> # bdwgc. Eg. HAVE_GC_SET_FINALIZER_NOTIFIER specifies that we won't >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > -------------- next part -------------- An HTML attachment was scrubbed... URL: From giulio.benetti at benettiengineering.com Wed Feb 9 20:46:42 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 9 Feb 2022 21:46:42 +0100 Subject: [Buildroot] [PATCH v3 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <20220209180306.2629180-1-neal.frager@xilinx.com> References: <20220209180306.2629180-1-neal.frager@xilinx.com> Message-ID: Hi Neal, > Il giorno 9 feb 2022, alle ore 19:04, Neal Frager ha scritto: > > ?This patch: > - bumps ATF to Xilinx v2.6: mainline v2.6 requires patch to build > - bumps U-Boot to Xilinx 2022.01: important drivers not in mainline > - bumps Linux to Xilinx 5.15: important drivers not in mainline > - deletes board/zynqmp/patches directory: patches already in mainline > - modifies board/zynqmp/genimage.cfg: U-Boot 2022.01 uses u-boot.itb format > - adds extlinux.conf to vfat bootfs > - modifies U-Boot to unified xilinx_zynqmp_virt_defconfig (supports all boards) > - adds support for SPL pm_cfg_obj.c loading to PMU firmware > - enables support for host machines without OpenSSL required by u-boot > > Signed-off-by: Neal Frager > --- > board/zynqmp/extlinux.conf | 5 + > board/zynqmp/genimage.cfg | 6 +- > ...-fix-Remove-GGC-ignore-Warray-bounds.patch | 68 -- > ...64-zynqmp-zcu106-fix-SPL-MMC-booting.patch | 52 -- > ...2-arm64-zynqmp-Enable-booting-to-ATF.patch | 114 ---- > ...ept-an-absolute-path-for-PMUFW_INIT_.patch | 68 -- > ...ynqmp-pass-the-PS-init-file-as-a-kco.patch | 175 ----- > board/zynqmp/pm_cfg_obj.c | 614 ++++++++++++++++++ > board/zynqmp/post-build.sh | 8 + > board/zynqmp/post-image.sh | 4 +- > configs/zynqmp_zcu106_defconfig | 23 +- > 11 files changed, 648 insertions(+), 489 deletions(-) > create mode 100644 board/zynqmp/extlinux.conf > delete mode 100644 board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch > delete mode 100644 board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch > delete mode 100644 board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch > delete mode 100644 board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch > delete mode 100644 board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch > create mode 100644 board/zynqmp/pm_cfg_obj.c > create mode 100755 board/zynqmp/post-build.sh > > diff --git a/board/zynqmp/extlinux.conf b/board/zynqmp/extlinux.conf > new file mode 100644 > index 0000000000..a69a2e1963 > --- /dev/null > +++ b/board/zynqmp/extlinux.conf > @@ -0,0 +1,5 @@ > +label linux > + kernel /Image > + devicetree /system.dtb > + append console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait > + > \ No newline at end of file Here ^^^ please remove the 2 spaces so it will be recognized as a newline. > diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg > index ed202f4550..20d8352c08 100644 > --- a/board/zynqmp/genimage.cfg > +++ b/board/zynqmp/genimage.cfg > @@ -2,11 +2,13 @@ image boot.vfat { > vfat { > files = { > "boot.bin", > - "u-boot.bin", > - "atf-uboot.ub", > + "u-boot.itb", > "system.dtb", > "Image" > } > + file extlinux/extlinux.conf { > + image = extlinux.conf > + } > } > > size = 32M > diff --git a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch b/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch > deleted file mode 100644 > index 0c1a9ba2a4..0000000000 > --- a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch > +++ /dev/null > @@ -1,68 +0,0 @@ > -From da003e6ada7d0217fe99dc7c649a731f8ebd3c34 Mon Sep 17 00:00:00 2001 > -From: Deepika Bhavnani > -Date: Thu, 15 Aug 2019 00:56:46 +0300 > -Subject: [PATCH] Coverity fix: Remove GGC ignore -Warray-bounds > - > -GCC diagnostics were added to ignore array boundaries, instead > -of ignoring GCC warning current code will check for array boundaries > -and perform and array update only for valid elements. > - > -Resolves: `CID 246574` `CID 246710` `CID 246651` > - > -Signed-off-by: Deepika Bhavnani > -Change-Id: I7530ecf7a1707351c6ee87e90cc3d33574088f57 > - > -Backported from: 41af05154abe136938bcfb5f26c969933784bbef > -[Adapted to apply on 1.5] > - > ---- > - lib/psci/psci_common.c | 20 ++++++++++---------- > - 1 file changed, 10 insertions(+), 10 deletions(-) > - > -diff --git a/lib/psci/psci_common.c b/lib/psci/psci_common.c > -index 2220a745cd6e..6282d992a2f0 100644 > ---- a/lib/psci/psci_common.c > -+++ b/lib/psci/psci_common.c > -@@ -188,21 +188,17 @@ static unsigned int get_power_on_target_pwrlvl(void) > - /****************************************************************************** > - * Helper function to update the requested local power state array. This array > - * does not store the requested state for the CPU power level. Hence an > -- * assertion is added to prevent us from accessing the wrong index. > -+ * assertion is added to prevent us from accessing the CPU power level. > - *****************************************************************************/ > - static void psci_set_req_local_pwr_state(unsigned int pwrlvl, > - unsigned int cpu_idx, > - plat_local_state_t req_pwr_state) > - { > -- /* > -- * This should never happen, we have this here to avoid > -- * "array subscript is above array bounds" errors in GCC. > -- */ > - assert(pwrlvl > PSCI_CPU_PWR_LVL); > --#pragma GCC diagnostic push > --#pragma GCC diagnostic ignored "-Warray-bounds" > -- psci_req_local_pwr_states[pwrlvl - 1][cpu_idx] = req_pwr_state; > --#pragma GCC diagnostic pop > -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && > -+ (cpu_idx < PLATFORM_CORE_COUNT)) { > -+ psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx] = req_pwr_state; > -+ } > - } > - > - /****************************************************************************** > -@@ -228,7 +224,11 @@ static plat_local_state_t *psci_get_req_local_pwr_states(unsigned int pwrlvl, > - { > - assert(pwrlvl > PSCI_CPU_PWR_LVL); > - > -- return &psci_req_local_pwr_states[pwrlvl - 1][cpu_idx]; > -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && > -+ (cpu_idx < PLATFORM_CORE_COUNT)) { > -+ return &psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx]; > -+ } else > -+ return NULL; > - } > - > - /* > --- > -2.34.0 > - > diff --git a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch b/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch > deleted file mode 100644 > index 4d85e1bb12..0000000000 > --- a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch > +++ /dev/null > @@ -1,52 +0,0 @@ > -From e5d72ed8339eb05285448aad3c89d21e4d18fd29 Mon Sep 17 00:00:00 2001 > -From: Luca Ceresoli > -Date: Mon, 26 Feb 2018 09:40:34 +0100 > -Subject: [PATCH] arm64: zynqmp: zcu106: fix SPL MMC booting > - > -The U-Boot SPL generated with the current zcu106 defconfig cannot boot > -from MMC: > - > - [...] > - U-Boot SPL 2018.01 (Feb 21 2018 - 17:47:14) > - EL Level: EL3 > - Trying to boot from MMC1 > - sdhci_transfer_data: Error detected in status(0x408020)! > - spl_load_image_fat_os: error reading image u-boot.bin, err - -2 > - spl_load_image_fat: error reading image u-boot.img, err - -6 > - SPL: failed to boot from all boot devices > - ### ERROR ### Please RESET the board ### > - > -Fix by lowering the rpll value. The new value for the RPLL_CTRL > -register comes from the current psu_init_gpl.c from the HDF file at > -https://github.com/xilinx/hdf-examples/tree/01ad8ea5fd1989abf4ea5a072d019a16cb2bc546/zcu106-zynqmp > -(generated by Vivado v2017.4). > - > -RPLL and sdio1_ref clocks before and after this change: > - > - - Old values: RPLL 1.36 GHz, sdio1_ref 272 MHz > - - New values: RPLL 1.16 GHz, sdio1_ref 233 MHz > - > -Signed-off-by: Luca Ceresoli > -Cc: Michal Simek > -Upstream-status: accepted upstream in a different form > ---- > - > - board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c > -index 4d18abe000ca..e6fa477e53e7 100644 > ---- a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c > -+++ b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c > -@@ -10,7 +10,7 @@ > - static unsigned long psu_pll_init_data(void) > - { > - psu_mask_write(0xFF5E0034, 0xFE7FEDEFU, 0x7E4E2C62U); > -- psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00013C00U); > -+ psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00014600U); > - psu_mask_write(0xFF5E0030, 0x00000008U, 0x00000008U); > - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000001U); > - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000000U); > --- > -2.7.4 > - > diff --git a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch b/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch > deleted file mode 100644 > index 487fff6812..0000000000 > --- a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch > +++ /dev/null > @@ -1,114 +0,0 @@ > -From 5e3cac50cc981e01d9072241035a8d4162560c71 Mon Sep 17 00:00:00 2001 > -From: Luca Ceresoli > -Date: Mon, 12 Mar 2018 17:18:38 +0100 > -Subject: [PATCH] arm64: zynqmp: Enable booting to ATF > - > -U-Boot is now able to boot to ARM Trusted Firmware (ATF). The boot > -flow is SPL(EL3) loads ATF and full u-boot and jump to ATF(EL3) which > -pass control to full u-boot(EL2). This has been tested on zcu106, so > -enable it in this defconfig. > - > -To generate an image that triggers this booting flow, you need to pass > -'-O arm-trusted-firmware' to mkimage. > - > -Signed-off-by: Luca Ceresoli > -Signed-off-by: Michal Simek > -Backported from upstream: http://git.denx.de/?p=u-boot.git;a=commit;h=5e3cac50cc981e01d9072241035a8d4162560c71 > ---- > - > - configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 + > - configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 + > - configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 + > - configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 + > - configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 1 + > - configs/xilinx_zynqmp_zcu102_revA_defconfig | 1 + > - configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 + > - 7 files changed, 7 insertions(+) > - > -diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig > -index c5bfa2b12638..488c72258b0e 100644 > ---- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig > -+++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig > -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_FASTBOOT=y > - CONFIG_FASTBOOT_FLASH=y > -diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig > -index f86dce403a42..5d501eec0edd 100644 > ---- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig > -+++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig > -@@ -20,6 +20,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_FASTBOOT=y > - CONFIG_FASTBOOT_FLASH=y > -diff --git a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig > -index 6e947cf56827..6f7eaebd7676 100644 > ---- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig > -+++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig > -@@ -16,6 +16,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_CMD_MEMTEST=y > - CONFIG_SYS_ALT_MEMTEST=y > -diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig > -index 1c934858c61c..7a3806cba4b5 100644 > ---- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig > -+++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig > -@@ -17,6 +17,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_CMD_MEMTEST=y > - CONFIG_SYS_ALT_MEMTEST=y > -diff --git a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig > -index e13c7c56f310..e4408f182ca0 100644 > ---- a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig > -+++ b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig > -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_FASTBOOT=y > - CONFIG_FASTBOOT_FLASH=y > -diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig b/configs/xilinx_zynqmp_zcu102_revA_defconfig > -index 5b2cd495ee85..b52f6789fd4b 100644 > ---- a/configs/xilinx_zynqmp_zcu102_revA_defconfig > -+++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig > -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_FASTBOOT=y > - CONFIG_FASTBOOT_FLASH=y > -diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig > -index e6530fbfe7ff..80592554f682 100644 > ---- a/configs/xilinx_zynqmp_zcu102_revB_defconfig > -+++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig > -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_FASTBOOT=y > - CONFIG_FASTBOOT_FLASH=y > --- > -2.7.4 > - > diff --git a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch b/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch > deleted file mode 100644 > index 95ab7b3b75..0000000000 > --- a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch > +++ /dev/null > @@ -1,68 +0,0 @@ > -From c7df098a71e05dc81cee818747759e8060b59626 Mon Sep 17 00:00:00 2001 > -From: Luca Ceresoli > -Date: Mon, 4 Jun 2018 12:21:01 +0200 > -Subject: [PATCH] arm64: zynqmp: accept an absolute path for PMUFW_INIT_FILE > - > -The value of PMUFW_INIT_FILE is prefixed with "$(srctree)/", thus > -forcing it to be a relative path inside the U-Boot source tree. Since > -the PMUFW is a binary file generated outside of U-Boot, the PMUFW > -binary must be copied inside the U-Boot source tree before the > -build. > - > -This generates a few problems: > - > - * if the source tree is shared among different out-of-tree builds, > - they will pollute (and potentially corrupt) each other > - * the source tree cannot be read-only > - * any buildsystem must add a command to copy the PMUFW binary > - * putting an externally-generated binary in the source tree is ugly > - as hell > - > -Avoid these problems by accepting an absolute path for > -PMUFW_INIT_FILE. This would be as simple as removing the "$(srctree)/" > -prefix, but in order to keep backward compatibility we rather use the > -shell and readlink to get the absolute path even when starting from a > -relative path. > - > -Since 'readlink -f' produces an empty string if the file does not > -exist, we also add a check to ensure the file configured in > -PMUFW_INIT_FILE exists. Otherwise the build would exit successfully, > -but produce a boot.bin without PMUFW as if PMUFW_INIT_FILE were empty. > - > -Tested in the 12 possible combinations of: > - - PMUFW_INIT_FILE empty, relative, absolute, non-existing > - - building in-tree, in subdir, in other directory > - > -Signed-off-by: Luca Ceresoli > -Cc: Michal Simek > -Cc: Simon Glass > -Cc: Emmanuel Vadot > -Signed-off-by: Michal Simek > -Backported from upstream: https://git.denx.de/?p=u-boot.git;a=commit;h=c7df098a71e05dc81cee818747759e8060b59626 > ---- > - scripts/Makefile.spl | 8 +++++++- > - 1 file changed, 7 insertions(+), 1 deletion(-) > - > -diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl > -index ef018b5b4056..252f13826d4c 100644 > ---- a/scripts/Makefile.spl > -+++ b/scripts/Makefile.spl > -@@ -167,8 +167,14 @@ ifdef CONFIG_ARCH_ZYNQ > - MKIMAGEFLAGS_boot.bin = -T zynqimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) > - endif > - ifdef CONFIG_ARCH_ZYNQMP > -+ifneq ($(CONFIG_PMUFW_INIT_FILE),"") > -+spl/boot.bin: zynqmp-check-pmufw > -+zynqmp-check-pmufw: FORCE > -+ ( cd $(srctree) && test -r $(CONFIG_PMUFW_INIT_FILE) ) \ > -+ || ( echo "Cannot read $(CONFIG_PMUFW_INIT_FILE)" && false ) > -+endif > - MKIMAGEFLAGS_boot.bin = -T zynqmpimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) \ > -- -n $(srctree)/$(CONFIG_PMUFW_INIT_FILE) > -+ -n "$(shell cd $(srctree); readlink -f $(CONFIG_PMUFW_INIT_FILE))" > - endif > - > - spl/boot.bin: $(obj)/u-boot-spl.bin FORCE > --- > -2.7.4 > - > diff --git a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch b/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch > deleted file mode 100644 > index b32e162780..0000000000 > --- a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch > +++ /dev/null > @@ -1,175 +0,0 @@ > -From 4c9d54ab5a41d65000c8d249b6fb1b76056f1812 Mon Sep 17 00:00:00 2001 > -From: Luca Ceresoli > -Date: Wed, 20 Jun 2018 12:11:50 +0200 > -Subject: [PATCH] arm/arm64: zynq/zynqmp: pass the PS init file as a kconfig > - variable > - > -U-Boot needs to link ps7_init_gpl.c on Zynq or psu_init_gpl.c on > -ZynqMP (PS init for short). The current logic to locate this file for > -both platforms is: > - > - 1. if a board-specific file exists in > - board/xilinx/zynq[mp]/$(CONFIG_DEFAULT_DEVICE_TREE)/ps?_init_gpl.c > - then use it > - 2. otherwise use board/xilinx/zynq/ps?_init_gpl.c > - > -In the latter case the file does not exist in the U-Boot sources and > -must be copied in the source tree from the outside before starting the > -build. This is typical when it is generated from Xilinx tools while > -developing a custom hardware. However making sure that a > -board-specific file is _not_ found (and used) requires some trickery > -such as removing or overwriting all PS init files (e.g.: the current > -meta-xilinx yocto layer [0]). > - > -This generates a few problems: > - > - * if the source tree is shared among different out-of-tree builds, > - they will pollute (and potentially corrupt) each other > - * the source tree cannot be read-only > - * any buildsystem must add a command to copy the PS init file binary > - * overwriting or deleting files in the source tree is ugly as hell > - > -Simplify usage by allowing to pass the path to the desired PS init > -file in kconfig variable XILINX_PS_INIT_FILE. It can be an absolute > -path or relative to $(srctree). If the variable is set, the > -user-specified file will always be used without being copied > -around. If the the variable is left empty, for backward compatibility > -fall back to the old behaviour. > - > -Since the issue is the same for Zynq and ZynqMP, add one kconfig > -variable in a common place and use it for both. > - > -Also use the new kconfig help text to document all the ways to give > -U-Boot the PS init file. > - > -Build-tested with all combinations of: > - - platform: zynq or zynqmp > - - PS init file: from XILINX_PS_INIT_FILE (absolute, relative path, > - non-existing), in-tree board-specific, in board/xilinx/zynq[mp]/ > - - building in-tree, in subdir, in other directory > - > -[0] https://github.com/Xilinx/meta-xilinx/blob/b2f74cc7fe5c4881589d5e440a17cb51fc66a7ab/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init.inc#L9 > - > -Signed-off-by: Luca Ceresoli > -Cc: Albert Aribaud > -Cc: Michal Simek > -Cc: Nathan Rossi > -Backported from upstream: https://git.denx.de/?p=u-boot.git;a=commit;h=6da4f67ad09cd8b311d77b2b04e557b7ef65b56c > ---- > - arch/arm/Kconfig | 1 + > - board/xilinx/Kconfig | 41 +++++++++++++++++++++++++++++++++++++++++ > - board/xilinx/zynq/Makefile | 10 +++++++++- > - board/xilinx/zynqmp/Makefile | 10 +++++++++- > - 4 files changed, 60 insertions(+), 2 deletions(-) > - create mode 100644 board/xilinx/Kconfig > - > -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig > -index 22234cde2ab6..e04979d0ef7e 100644 > ---- a/arch/arm/Kconfig > -+++ b/arch/arm/Kconfig > -@@ -1293,4 +1293,5 @@ source "board/technologic/ts4600/Kconfig" > - source "board/vscom/baltos/Kconfig" > - source "board/woodburn/Kconfig" > - source "board/work-microwave/work_92105/Kconfig" > -+source "board/xilinx/Kconfig" > - source "board/zipitz2/Kconfig" > - > - source "arch/arm/Kconfig.debug" > -diff --git a/board/xilinx/Kconfig b/board/xilinx/Kconfig > -new file mode 100644 > -index 000000000000..aa3fa061edef > ---- /dev/null > -+++ b/board/xilinx/Kconfig > -@@ -0,0 +1,41 @@ > -+# Copyright (c) 2018, Luca Ceresoli > -+# > -+# SPDX-License-Identifier: GPL-2.0 > -+ > -+if ARCH_ZYNQ || ARCH_ZYNQMP > -+ > -+config XILINX_PS_INIT_FILE > -+ string "Zynq/ZynqMP PS init file(s) location" > -+ help > -+ On Zynq and ZynqMP U-Boot SPL (or U-Boot proper if > -+ ZYNQMP_PSU_INIT_ENABLED is set) is responsible for some > -+ basic initializations, such as enabling peripherals and > -+ configuring pinmuxes. The PS init file (called > -+ psu_init_gpl.c on ZynqMP, ps7_init_gpl.c for Zynq-7000) > -+ contains the code for such initializations. > -+ > -+ U-Boot contains PS init files for some boards, but each of > -+ them describes only one specific configuration. Users of a > -+ different board, or needing a different configuration, can > -+ generate custom files using the Xilinx development tools. > -+ > -+ There are three ways to give a PS init file to U-Boot: > -+ > -+ 1. Set this variable to the path, either relative to the > -+ source tree or absolute, where the psu_init_gpl.c or > -+ ps7_init_gpl.c file is located. U-Boot will build this > -+ file. > -+ > -+ 2. If you leave an empty string here, U-Boot will use > -+ board/xilinx/zynq/$(CONFIG_DEFAULT_DEVICE_TREE)/ps7_init_gpl.c > -+ for Zynq-7000, or > -+ board/xilinx/zynqmp/$(CONFIG_DEFAULT_DEVICE_TREE)/psu_init_gpl.c > -+ for ZynqMP. > -+ > -+ 3. If the above file does not exist, U-Boot will use > -+ board/xilinx/zynq/ps7_init_gpl.c for Zynq-7000, or > -+ board/xilinx/zynqmp/psu_init_gpl.c for ZynqMP. This file > -+ is not provided by U-Boot, you have to copy it there > -+ before the build. > -+ > -+endif > -diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile > -index 5a76a26720cd..03ad5f0532ee 100644 > ---- a/board/xilinx/zynq/Makefile > -+++ b/board/xilinx/zynq/Makefile > -@@ -5,10 +5,18 @@ > - > - obj-y := board.o > - > --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) > -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") > -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE)) > -+init-objs := ps_init_gpl.o > -+spl/board/xilinx/zynq/ps_init_gpl.o board/xilinx/zynq/ps_init_gpl.o: $(PS_INIT_FILE) > -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ > -+endif > - > -+ifeq ($(init-objs),) > -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) > - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/ps7_init_gpl.c),\ > - $(hw-platform-y)/ps7_init_gpl.o) > -+endif > - > - ifeq ($(init-objs),) > - ifneq ($(wildcard $(srctree)/$(src)/ps7_init_gpl.c),) > -diff --git a/board/xilinx/zynqmp/Makefile b/board/xilinx/zynqmp/Makefile > -index 05ccd25dcef3..960b81fc5853 100644 > ---- a/board/xilinx/zynqmp/Makefile > -+++ b/board/xilinx/zynqmp/Makefile > -@@ -5,10 +5,18 @@ > - > - obj-y := zynqmp.o > - > --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) > -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") > -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE)) > -+init-objs := ps_init_gpl.o > -+spl/board/xilinx/zynqmp/ps_init_gpl.o board/xilinx/zynqmp/ps_init_gpl.o: $(PS_INIT_FILE) > -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ > -+endif > - > -+ifeq ($(init-objs),) > -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) > - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/psu_init_gpl.c),\ > - $(hw-platform-y)/psu_init_gpl.o) > -+endif > - > - ifeq ($(init-objs),) > - ifneq ($(wildcard $(srctree)/$(src)/psu_init_gpl.c),) > --- > -2.7.4 > - > diff --git a/board/zynqmp/pm_cfg_obj.c b/board/zynqmp/pm_cfg_obj.c > new file mode 100644 > index 0000000000..7566b3236a > --- /dev/null > +++ b/board/zynqmp/pm_cfg_obj.c > @@ -0,0 +1,614 @@ > +/****************************************************************************** > +* Copyright (c) 2017 - 2020 Xilinx, Inc. All rights reserved. > +* SPDX-License-Identifier: MIT > +******************************************************************************/ > + > + > +#include "xil_types.h" > +#include "pm_defs.h" > + > +#define PM_CONFIG_MASTER_SECTION_ID 0x101U > +#define PM_CONFIG_SLAVE_SECTION_ID 0x102U > +#define PM_CONFIG_PREALLOC_SECTION_ID 0x103U > +#define PM_CONFIG_POWER_SECTION_ID 0x104U > +#define PM_CONFIG_RESET_SECTION_ID 0x105U > +#define PM_CONFIG_SHUTDOWN_SECTION_ID 0x106U > +#define PM_CONFIG_SET_CONFIG_SECTION_ID 0x107U > +#define PM_CONFIG_GPO_SECTION_ID 0x108U > + > +#define PM_SLAVE_FLAG_IS_SHAREABLE 0x1U > +#define PM_MASTER_USING_SLAVE_MASK 0x2U > + > +#define PM_CONFIG_GPO1_MIO_PIN_34_MAP (1U << 10U) > +#define PM_CONFIG_GPO1_MIO_PIN_35_MAP (1U << 11U) > +#define PM_CONFIG_GPO1_MIO_PIN_36_MAP (1U << 12U) > +#define PM_CONFIG_GPO1_MIO_PIN_37_MAP (1U << 13U) > + > +#define PM_CONFIG_GPO1_BIT_2_MASK (1U << 2U) > +#define PM_CONFIG_GPO1_BIT_3_MASK (1U << 3U) > +#define PM_CONFIG_GPO1_BIT_4_MASK (1U << 4U) > +#define PM_CONFIG_GPO1_BIT_5_MASK (1U << 5U) > + > +#define SUSPEND_TIMEOUT 0xFFFFFFFFU > + > + > +#define PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK 0x00000001 > +#define PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK 0x00000100 > +#define PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK 0x00000200 > + > + > + > +#if defined (__ICCARM__) > +#pragma language=save > +#pragma language=extended > +#endif > +#if defined (__GNUC__) > + const u32 XPm_ConfigObject[] __attribute__((used, section(".sys_cfg_data"))) = > +#elif defined (__ICCARM__) > +#pragma location = ".sys_cfg_data" > +__root const u32 XPm_ConfigObject[] = > +#endif > +{ > + /**********************************************************************/ > + /* HEADER */ > + 1, /* Number of remaining words in the header */ > + 8, /* Number of sections included in config object */ > + /**********************************************************************/ > + /* MASTER SECTION */ > + PM_CONFIG_MASTER_SECTION_ID, /* Master SectionID */ > + 3U, /* No. of Masters*/ > + > + NODE_APU, /* Master Node ID */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask of this master */ > + SUSPEND_TIMEOUT, /* Suspend timeout */ > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ > + > + NODE_RPU_0, /* Master Node ID */ > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask of this master */ > + SUSPEND_TIMEOUT, /* Suspend timeout */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ > + > + NODE_RPU_1, /* Master Node ID */ > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask of this master */ > + SUSPEND_TIMEOUT, /* Suspend timeout */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Suspend permissions */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Wake permissions */ > + > + > + /**********************************************************************/ > + /* SLAVE SECTION */ > + > + > + PM_CONFIG_SLAVE_SECTION_ID, /* Section ID */ > + 49, /* Number of slaves */ > + > + NODE_OCM_BANK_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_OCM_BANK_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_OCM_BANK_2, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_OCM_BANK_3, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_TCM_0_A, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ > + > + NODE_TCM_0_B, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ > + > + NODE_TCM_1_A, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_TCM_1_B, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_L2, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_GPU_PP_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_GPU_PP_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_USB_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_USB_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_TTC_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_TTC_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_TTC_2, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_TTC_3, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_SATA, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_ETH_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_ETH_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_ETH_2, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_ETH_3, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_UART_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_UART_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_SPI_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_SPI_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_I2C_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_I2C_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_SD_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_SD_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_DP, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_GDMA, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_ADMA, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_NAND, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_QSPI, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_GPIO, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_CAN_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_CAN_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_EXTERN, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_DDR, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_IPI_APU, > + 0U, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask */ > + > + NODE_IPI_RPU_0, > + 0U, > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ > + > + NODE_IPI_RPU_1, > + 0U, > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_GPU, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_PCIE, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_PCAP, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_RTC, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_VCU, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_PL, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + > + /**********************************************************************/ > + /* PREALLOC SECTION */ > + > + PM_CONFIG_PREALLOC_SECTION_ID, /* Preallaoc SectionID */ > + 3U, /* No. of Masters*/ > + > +/* Prealloc for psu_cortexa53_0 */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, > + 12, > + NODE_DDR, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_L2, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_0, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_2, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_3, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_I2C_0, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_I2C_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_SD_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_QSPI, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_PL, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_IPI_APU, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + > + /* Prealloc for psu_cortexr5_0 */ > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, > + 14, > + NODE_TCM_0_A, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_TCM_0_B, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_DDR, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_0, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_2, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_3, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_I2C_0, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_I2C_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_SD_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_QSPI, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_PL, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_ADMA, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_IPI_RPU_0, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + > + /* Prealloc for psu_cortexr5_1 */ > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + 3, > + NODE_TCM_1_A, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_TCM_1_B, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_IPI_RPU_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + > + /**********************************************************************/ > + /* POWER SECTION */ > + > + PM_CONFIG_POWER_SECTION_ID, /* Power Section ID */ > + 4U, /* Number of power nodes */ > + > + NODE_APU, /* Power node ID */ > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ > + > + NODE_RPU, /* Power node ID */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ > + > + NODE_FPD, /* Power node ID */ > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ > + > + NODE_PLD, /* Power node ID */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ > + > + > + /**********************************************************************/ > + /* RESET SECTION */ > + > + PM_CONFIG_RESET_SECTION_ID, /* Reset Section ID */ > + 120U, /* Number of resets */ > + > + XILPM_RESET_PCIE_CFG, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_PCIE_BRIDGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_PCIE_CTRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_DP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SWDT_CRF, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_AFI_FM5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_AFI_FM4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_AFI_FM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_AFI_FM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_AFI_FM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_AFI_FM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GDMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPU_PP1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPU_PP0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPU, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SATA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU3_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU2_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU1_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU0_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_APU_L2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_DDR, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_APM_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SOFT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GEM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GEM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GEM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GEM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_QSPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_UART0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_UART1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SPI0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SPI1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SDIO0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SDIO1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_CAN0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_CAN1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_I2C0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_I2C1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_TTC0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_TTC1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_TTC2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_TTC3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SWDT_CRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_NAND, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ADMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPIO, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_IOU_CC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_TIMESTAMP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPU_R50, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPU_R51, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPU_AMBA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_OCM, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPU_PGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_USB0_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_USB1_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_USB0_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_USB1_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_USB0_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_USB1_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_IPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_APM_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RTC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SYSMON, 0, > + XILPM_RESET_AFI_FM6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_LPD_SWDT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_FPD, PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, > + XILPM_RESET_RPU_DBG1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPU_DBG0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_DBG_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_DBG_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_APLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_DPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_VPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_IOPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_7, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_8, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_9, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_10, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_11, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_12, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_13, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_14, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_15, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_16, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_17, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_18, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_19, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_20, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_21, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_22, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_23, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_24, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_25, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_26, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_27, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_28, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_29, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_30, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_31, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPU_LS, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_PS_ONLY, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_PL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPIO5_EMIO_92, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPIO5_EMIO_93, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPIO5_EMIO_94, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPIO5_EMIO_95, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + > + /**********************************************************************/ > + /* SET CONFIG SECTION */ > + PM_CONFIG_SET_CONFIG_SECTION_ID, /* Section ID */ > + 0, /* Permissions to set config */ > + /**********************************************************************/ > + /* SHUTDOWN SECTION */ > + PM_CONFIG_SHUTDOWN_SECTION_ID, /* Section ID */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* System Shutdown/Restart Permission */ > + > + /**********************************************************************/ > + /* GPO SECTION */ > + PM_CONFIG_GPO_SECTION_ID, /* GPO Section ID */ > + PM_CONFIG_GPO1_BIT_2_MASK | > + PM_CONFIG_GPO1_MIO_PIN_34_MAP | > + PM_CONFIG_GPO1_MIO_PIN_35_MAP | > + PM_CONFIG_GPO1_MIO_PIN_36_MAP | > + PM_CONFIG_GPO1_MIO_PIN_37_MAP | > + 0, /* State of GPO pins */ > +}; > +#if defined (__ICCARM__) > +#pragma language=restore > +#endif > diff --git a/board/zynqmp/post-build.sh b/board/zynqmp/post-build.sh > new file mode 100755 > index 0000000000..9fd8bbf2c8 > --- /dev/null > +++ b/board/zynqmp/post-build.sh > @@ -0,0 +1,8 @@ > +#!/bin/sh > + > +# genimage will need to find the extlinux.conf > +# in the binaries directory > + > +BOARD_DIR="$(dirname $0)" > + > +install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux.conf > diff --git a/board/zynqmp/post-image.sh b/board/zynqmp/post-image.sh > index b2b99fed01..ed6dbe188c 100755 > --- a/board/zynqmp/post-image.sh > +++ b/board/zynqmp/post-image.sh > @@ -10,4 +10,6 @@ FIRST_DT=$(sed -nr \ > > [ -z "${FIRST_DT}" ] || ln -fs ${FIRST_DT}.dtb ${BINARIES_DIR}/system.dtb > > -support/scripts/genimage.sh -c board/zynqmp/genimage.cfg > +BOARD_DIR="$(dirname $0)" > + > +support/scripts/genimage.sh -c $BOARD_DIR/genimage.cfg > diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig > index bee7c1daf7..2026f60bd1 100644 > --- a/configs/zynqmp_zcu106_defconfig > +++ b/configs/zynqmp_zcu106_defconfig > @@ -1,34 +1,39 @@ > BR2_aarch64=y > -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_GIT=y > BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" > -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.15" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > # BR2_TARGET_ROOTFS_TAR is not set > BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.6" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" > -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7" > -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA" > +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2022.01" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" > BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > BR2_TARGET_UBOOT_SPL=y > BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" > BR2_TARGET_UBOOT_ZYNQMP=y > -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/53fdb7b6c92860ceb0ec5fd14deee302f4a84269/bin/pmufw-zcu106-default-v2017.4.bin" > +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/v2021.2/bin/pmufw-v2021.2.bin" > +BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/pm_cfg_obj.c" > +BR2_TARGET_UBOOT_FORMAT_ITB=y > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > BR2_PACKAGE_HOST_DOSFSTOOLS=y > BR2_PACKAGE_HOST_GENIMAGE=y > BR2_PACKAGE_HOST_MTOOLS=y > -- > 2.17.1 > As other patch please send V4 and add my Reviewed-by and Tested-by Thank you! Best regards Giulio From yann.morin.1998 at free.fr Wed Feb 9 20:55:27 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 21:55:27 +0100 Subject: [Buildroot] [PATCH 1/5 v2] package/pkg-cargo: allow packages to define download environment In-Reply-To: <20220209205259.725e17c2@windsurf> References: <9354_1644422930_6203E712_9354_383_11_2d5b77c2a90cf722e007a5bf3ed4227d2bd1fda6.1644422916.git.yann.morin@orange.com> <20220209205259.725e17c2@windsurf> Message-ID: <20220209205527.GD2249818@scaer> Thomas, All, On 2022-02-09 20:52 +0100, Thomas Petazzoni via buildroot spake thusly: > On Wed, 9 Feb 2022 17:08:43 +0100 > wrote: > > $(2)_DOWNLOAD_POST_PROCESS = cargo > > -$(2)_DL_ENV = CARGO_HOME=$$(HOST_DIR)/share/cargo > > +$(2)_DL_ENV += CARGO_HOME=$$(HOST_DIR)/share/cargo > > But, but, then, how is: > > PYTHON_CRYPTOGRAPHY_DL_ENV = \ > BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml > > currently working? Because, its the name implies, it is a python-package, not a cargo-package. Yeah, I got puzzled too. ;-) Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Feb 9 21:33:12 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:33:12 +0100 Subject: [Buildroot] [PATCH 000/107] Drop python 2.7 In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> Message-ID: <20220209213312.GE2249818@scaer> Peter ,All, On 2022-02-09 17:50 +0100, Peter Korsgaard spake thusly: > Python 2.7 is EOL since April 2020 and almost all packages support > python 3, so drop it before the 2022.02 release. > > It is a big series, but the changes are mainly mechanical in nature. > > There is still some cleanup to do, E.G. the python2 support in > pkg-python and the host python-setuptools package - But this is IMHO > the minimum changes before -rc1. > > Peter Korsgaard (107): ... > package/python: drop target package ... > package/python: drop host package ... > docs/manual: drop python2 references All 107 patches applied, thanks! I'll reply further to two of them, with ultra-minor nits. Pfew, 21st century, here we come at last! ;-) Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Feb 9 21:07:45 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:07:45 +0100 Subject: [Buildroot] [git commit] package/cifs-utils: drop python2 support Message-ID: <20220209212559.6E9458323E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=66dbb7476390ddc939dc3ae7f7ea1ea71fa6153e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/cifs-utils/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/cifs-utils/Config.in b/package/cifs-utils/Config.in index f15d1e3dc4..d1b1406a3e 100644 --- a/package/cifs-utils/Config.in +++ b/package/cifs-utils/Config.in @@ -21,7 +21,7 @@ config BR2_PACKAGE_CIFS_UTILS_SMBTOOLS depends on BR2_USE_WCHAR # python3 depends on BR2_TOOLCHAIN_HAS_THREADS # python3 depends on !BR2_STATIC_LIBS # python3 - select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON # runtime + select BR2_PACKAGE_PYTHON3 # runtime help Install the smb tools smbinfo and smb2-quota (python implementations). From yann.morin.1998 at free.fr Wed Feb 9 21:07:40 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:07:40 +0100 Subject: [Buildroot] [git commit] package/bmap-tools: drop python2 support Message-ID: <20220209212559.5C9AB81335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=611e04609bea5fbe9f3616504d04f747653a789e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/bmap-tools/Config.in | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package/bmap-tools/Config.in b/package/bmap-tools/Config.in index 83b4d92786..91081069c7 100644 --- a/package/bmap-tools/Config.in +++ b/package/bmap-tools/Config.in @@ -1,8 +1,7 @@ config BR2_PACKAGE_BMAP_TOOLS bool "bmap-tools" - depends on BR2_PACKAGE_PYTHON3 || BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime, pkg_resources select BR2_PACKAGE_PYTHON_SIX # runtime help From yann.morin.1998 at free.fr Wed Feb 9 21:08:08 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:08:08 +0100 Subject: [Buildroot] [git commit] package/gst1-devtools: drop python2 support Message-ID: <20220209212559.C3BAD81335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c4bbd6da50488944debba29e195557e5b345f2b1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/gstreamer1/gst1-devtools/Config.in | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package/gstreamer1/gst1-devtools/Config.in b/package/gstreamer1/gst1-devtools/Config.in index 55cf25d53e..3f39beff53 100644 --- a/package/gstreamer1/gst1-devtools/Config.in +++ b/package/gstreamer1/gst1-devtools/Config.in @@ -1,11 +1,10 @@ config BR2_PACKAGE_GST1_DEVTOOLS bool "gst1-devtools" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_GSTREAMER1_CHECK select BR2_PACKAGE_GST1_PLUGINS_BASE select BR2_PACKAGE_JSON_GLIB - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_PYEXPAT # cairo is autodetected but needs PNG support select BR2_PACKAGE_CAIRO_PNG if BR2_PACKAGE_CAIRO help @@ -14,5 +13,4 @@ config BR2_PACKAGE_GST1_DEVTOOLS https://gstreamer.freedesktop.org comment "gst1-devtools depends on python" - depends on !BR2_PACKAGE_PYTHON depends on !BR2_PACKAGE_PYTHON3 From yann.morin.1998 at free.fr Wed Feb 9 21:08:26 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:08:26 +0100 Subject: [Buildroot] [git commit] package/libiio: drop python2 support Message-ID: <20220209212600.1192C8323E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5ac65831d5b6434dfaa42c0278cb0ae19bdc1d4e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/libiio/Config.in | 2 +- package/libiio/libiio.mk | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/package/libiio/Config.in b/package/libiio/Config.in index 0d89331c89..98d663e203 100644 --- a/package/libiio/Config.in +++ b/package/libiio/Config.in @@ -91,7 +91,7 @@ config BR2_PACKAGE_LIBIIO_BINDINGS_CSHARP config BR2_PACKAGE_LIBIIO_BINDINGS_PYTHON bool "Install Python bindings" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 help Install the Python bindings. diff --git a/package/libiio/libiio.mk b/package/libiio/libiio.mk index a4fe0d4541..48e2f385e3 100644 --- a/package/libiio/libiio.mk +++ b/package/libiio/libiio.mk @@ -73,14 +73,10 @@ LIBIIO_CONF_OPTS += -DHAVE_DNS_SD=OFF 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 +LIBIIO_CONF_OPTS += \ + -DPYTHON_BINDINGS=ON + -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 else LIBIIO_CONF_OPTS += -DPYTHON_BINDINGS=OFF endif From yann.morin.1998 at free.fr Wed Feb 9 21:07:38 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:07:38 +0100 Subject: [Buildroot] [git commit] package/alsa-lib: drop python2 support Message-ID: <20220209212559.52ACA8323E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5dd2cdd10f579059d01167d9a427b5cfea0bea2d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/alsa-lib/Config.in | 2 +- package/alsa-lib/alsa-lib.mk | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/package/alsa-lib/Config.in b/package/alsa-lib/Config.in index 4168d1f220..af3de984d9 100644 --- a/package/alsa-lib/Config.in +++ b/package/alsa-lib/Config.in @@ -22,7 +22,7 @@ if BR2_PACKAGE_ALSA_LIB config BR2_PACKAGE_ALSA_LIB_PYTHON bool "Python support for alsa-lib" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 help Add python support for alsa-lib. Python will be built and libpython will be installed diff --git a/package/alsa-lib/alsa-lib.mk b/package/alsa-lib/alsa-lib.mk index b5cd3f0d13..5d12f5e6d8 100644 --- a/package/alsa-lib/alsa-lib.mk +++ b/package/alsa-lib/alsa-lib.mk @@ -61,20 +61,11 @@ endif ifeq ($(BR2_PACKAGE_ALSA_LIB_PYTHON),y) ALSA_LIB_CONF_OPTS += \ - --enable-mixer-pymods -ifeq ($(BR2_PACKAGE_PYTHON),y) -ALSA_LIB_CONF_OPTS += \ - --with-pythonlibs=-lpython$(PYTHON_VERSION_MAJOR) \ - --with-pythonincludes=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) -ALSA_LIB_CFLAGS += -I$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) -ALSA_LIB_DEPENDENCIES += python -else -ALSA_LIB_CONF_OPTS += \ + --enable-mixer-pymods \ --with-pythonlibs=-lpython$(PYTHON3_VERSION_MAJOR) \ --with-pythonincludes=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) ALSA_LIB_CFLAGS += -I$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) ALSA_LIB_DEPENDENCIES += python3 -endif else ALSA_LIB_CONF_OPTS += --disable-python endif From yann.morin.1998 at free.fr Wed Feb 9 21:07:35 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:07:35 +0100 Subject: [Buildroot] [git commit] package/python: drop target package Message-ID: <20220209212559.48F1E8323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=306839586bbff4b026aae7fee5a8d551f223f63f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Python 2.7 is EOL since April 2020, so drop support for the target package. https://www.python.org/dev/peps/pep-0373/ Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Config.in.legacy | 8 +++ package/Config.in | 3 +- package/python/Config.in | 139 ----------------------------------------------- 3 files changed, 9 insertions(+), 141 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 34d8c71cc8..6bc3803a5c 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,14 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON + bool "python2.7 package removed" + select BR2_LEGACY + help + Python 2.7 is EOL since April 2020 and has been removed. + + https://www.python.org/dev/peps/pep-0373/ + config BR2_TARGET_UBOOT_ZYNQ_IMAGE bool "Generate image for Xilinx Zynq" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index d631ed784a..ca2fb363e3 100644 --- a/package/Config.in +++ b/package/Config.in @@ -897,9 +897,8 @@ if BR2_STATIC_LIBS comment "External PHP extensions need a toolchain w/ dynamic library" endif endif - source "package/python/Config.in" source "package/python3/Config.in" -if BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 +if BR2_PACKAGE_PYTHON3 menu "External python modules" source "package/python-aenum/Config.in" source "package/python-aexpect/Config.in" diff --git a/package/python/Config.in b/package/python/Config.in deleted file mode 100644 index ab6950cae8..0000000000 --- a/package/python/Config.in +++ /dev/null @@ -1,139 +0,0 @@ -comment "python needs a toolchain w/ wchar, threads, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS - -config BR2_PACKAGE_PYTHON - bool "python2.7 (deprecated)" - depends on BR2_USE_WCHAR - # uses fork() - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_THREADS # libffi - depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_LIBFFI - help - The python language interpreter. - - http://www.python.org/ - -if BR2_PACKAGE_PYTHON - -choice - prompt "python module format to install" - default BR2_PACKAGE_PYTHON_PYC_ONLY - help - Select Python module format to install on target (py, pyc or - both) - -config BR2_PACKAGE_PYTHON_PY_ONLY - bool ".py sources only" - -config BR2_PACKAGE_PYTHON_PYC_ONLY - bool ".pyc compiled sources only" - -config BR2_PACKAGE_PYTHON_PY_PYC - bool ".py sources and .pyc compiled" - -endchoice - -menu "core python modules" - -comment "The following modules are unusual or require extra libraries" - -config BR2_PACKAGE_PYTHON_2TO3 - bool "2to3 module" - help - code translation from python 2 to 3 - -config BR2_PACKAGE_PYTHON_BZIP2 - bool "bzip2 module" - select BR2_PACKAGE_BZIP2 - help - bzip2 module for Python - -config BR2_PACKAGE_PYTHON_BSDDB - bool "bsddb module" - select BR2_PACKAGE_BERKELEYDB - help - bsddb module for Python. - -config BR2_PACKAGE_PYTHON_CODECSCJK - bool "codecscjk module" - help - Chinese/Japanese/Korean codecs module for Python (large). - -config BR2_PACKAGE_PYTHON_CURSES - bool "curses module" - select BR2_PACKAGE_NCURSES - help - curses module for Python. - -config BR2_PACKAGE_PYTHON_OSSAUDIODEV - bool "ossaudiodev module" - help - ossaudiodev module for Python. - -config BR2_PACKAGE_PYTHON_READLINE - bool "readline" - select BR2_PACKAGE_READLINE - help - readline module for Python (required for command-line - editing in the Python shell). - -config BR2_PACKAGE_PYTHON_SSL - bool "ssl" - select BR2_PACKAGE_OPENSSL - help - _ssl module for Python (required for https in urllib etc). - -config BR2_PACKAGE_PYTHON_UNICODEDATA - bool "unicodedata module" - default y - help - Unicode character database (used by stringprep module) - (large). - -if BR2_PACKAGE_PYTHON_UNICODEDATA - -choice - prompt "Python unicode database format" - default BR2_PACKAGE_PYTHON_UCS2 - help - Select Python unicode database format for target - -config BR2_PACKAGE_PYTHON_UCS2 - bool "Universal Character Set 2-byte (UCS2)" - -config BR2_PACKAGE_PYTHON_UCS4 - bool "Universal Character Set 4-byte (UCS4)" - -endchoice - -endif - -config BR2_PACKAGE_PYTHON_SQLITE - bool "sqlite module" - select BR2_PACKAGE_SQLITE - help - SQLite database support - -config BR2_PACKAGE_PYTHON_PYEXPAT - bool "xml module" - select BR2_PACKAGE_EXPAT - help - pyexpat and xml libraries for Python - -config BR2_PACKAGE_PYTHON_ZLIB - bool "zlib module" - select BR2_PACKAGE_ZLIB - help - zlib support in Python - -config BR2_PACKAGE_PYTHON_HASHLIB - bool "hashlib module" - select BR2_PACKAGE_OPENSSL - help - hashlib support in Python - -endmenu - -endif From yann.morin.1998 at free.fr Wed Feb 9 21:08:24 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:08:24 +0100 Subject: [Buildroot] [git commit] package/libftdi1: drop python2 support Message-ID: <20220209212600.09EE68323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1a1db54c309ac1509ddffd26da35313ac923202a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/libftdi1/Config.in | 2 +- package/libftdi1/libftdi1.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libftdi1/Config.in b/package/libftdi1/Config.in index 2d32573563..ec91366115 100644 --- a/package/libftdi1/Config.in +++ b/package/libftdi1/Config.in @@ -24,7 +24,7 @@ comment "libftdipp1 needs a toolchain w/ C++, wchar" config BR2_PACKAGE_LIBFTDI1_PYTHON_BINDINGS bool "python bindings" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 help Python bindings for libftdi diff --git a/package/libftdi1/libftdi1.mk b/package/libftdi1/libftdi1.mk index 6688694b47..d2e3f42e14 100644 --- a/package/libftdi1/libftdi1.mk +++ b/package/libftdi1/libftdi1.mk @@ -24,7 +24,7 @@ LIBFTDI1_CONF_OPTS += -DFTDIPP=OFF endif ifeq ($(BR2_PACKAGE_LIBFTDI1_PYTHON_BINDINGS),y) -LIBFTDI1_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,python3) host-swig +LIBFTDI1_DEPENDENCIES += python3 host-swig LIBFTDI1_CONF_OPTS += -DPYTHON_BINDINGS=ON else LIBFTDI1_CONF_OPTS += -DPYTHON_BINDINGS=OFF From yann.morin.1998 at free.fr Wed Feb 9 21:08:36 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:08:36 +0100 Subject: [Buildroot] [git commit] package/lttng-libust: drop python2 support Message-ID: <20220209212600.356218323E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ba163dea744630f6af915c3428f5f5d510437e0e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/lttng-libust/lttng-libust.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/package/lttng-libust/lttng-libust.mk b/package/lttng-libust/lttng-libust.mk index ef7d1a6200..7ead28052e 100644 --- a/package/lttng-libust/lttng-libust.mk +++ b/package/lttng-libust/lttng-libust.mk @@ -20,10 +20,7 @@ LTTNG_LIBUST_AUTORECONF = YES # https://www.mail-archive.com/lttng-dev at lists.lttng.org/msg12950.html LTTNG_LIBUST_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -DUATOMIC_NO_LINK_ERROR" -ifeq ($(BR2_PACKAGE_PYTHON),y) -LTTNG_LIBUST_DEPENDENCIES += python -LTTNG_LIBUST_CONF_OPTS += --enable-python-agent -else ifeq ($(BR2_PACKAGE_PYTHON3),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) LTTNG_LIBUST_DEPENDENCIES += python3 LTTNG_LIBUST_CONF_OPTS += --enable-python-agent else From yann.morin.1998 at free.fr Wed Feb 9 21:07:47 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:07:47 +0100 Subject: [Buildroot] [git commit] package/cracklib: move python support to python3 Message-ID: <20220209212559.76D6283245@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6ab41d540ef7b88496bf3fe9cb39a1c747f29f3e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The configure script needs a bit of help to detect the python version. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/cracklib/cracklib.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/package/cracklib/cracklib.mk b/package/cracklib/cracklib.mk index 8e6a844f11..46917b7926 100644 --- a/package/cracklib/cracklib.mk +++ b/package/cracklib/cracklib.mk @@ -20,9 +20,12 @@ else CRACKLIB_CONF_OPTS += --without-zlib endif -ifeq ($(BR2_PACKAGE_PYTHON),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) CRACKLIB_CONF_OPTS += --with-python -CRACKLIB_DEPENDENCIES += python +CRACKLIB_CONF_ENV += \ + ac_cv_path_PYTHON=$(HOST_DIR)/bin/python3 \ + am_cv_python_version=$(PYTHON3_VERSION_MAJOR) +CRACKLIB_DEPENDENCIES += python3 else CRACKLIB_CONF_OPTS += --without-python endif From yann.morin.1998 at free.fr Wed Feb 9 21:07:52 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:07:52 +0100 Subject: [Buildroot] [git commit] package/dbus-python: drop python2 support Message-ID: <20220209212559.87CDF8323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cf47c53f80a6ab82971b70b5475ecc26beffeef7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/dbus-python/Config.in | 8 +++----- package/dbus-python/dbus-python.mk | 28 ++++------------------------ 2 files changed, 7 insertions(+), 29 deletions(-) diff --git a/package/dbus-python/Config.in b/package/dbus-python/Config.in index 4bfb59ed91..76453e168a 100644 --- a/package/dbus-python/Config.in +++ b/package/dbus-python/Config.in @@ -3,16 +3,14 @@ config BR2_PACKAGE_DBUS_PYTHON depends on BR2_USE_WCHAR # glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 depends on BR2_PACKAGE_DBUS - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_LIBGLIB2 - # pyexpat: runtime dependency only - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime help Python bindings for D-Bus http://dbus.freedesktop.org/doc/dbus-python/ comment "dbus-python needs a toolchain w/ wchar, threads" - depends on BR2_PACKAGE_DBUS && (BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3) + depends on BR2_PACKAGE_DBUS && BR2_PACKAGE_PYTHON3 depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/dbus-python/dbus-python.mk b/package/dbus-python/dbus-python.mk index 3e28aed25c..d9bb30ed67 100644 --- a/package/dbus-python/dbus-python.mk +++ b/package/dbus-python/dbus-python.mk @@ -9,40 +9,20 @@ DBUS_PYTHON_SITE = http://dbus.freedesktop.org/releases/dbus-python DBUS_PYTHON_INSTALL_STAGING = YES DBUS_PYTHON_LICENSE = MIT (dbus-python), AFL-2.1 or GPL-2.0+ (dbus-gmain) DBUS_PYTHON_LICENSE_FILES = COPYING dbus-gmain/COPYING -DBUS_PYTHON_DEPENDENCIES = dbus libglib2 -HOST_DBUS_PYTHON_DEPENDENCIES = host-dbus host-libglib2 +DBUS_PYTHON_DEPENDENCIES = dbus libglib2 python3 host-python3 +HOST_DBUS_PYTHON_DEPENDENCIES = host-dbus host-libglib2 host-python3 -ifeq ($(BR2_PACKAGE_PYTHON),y) -DBUS_PYTHON_DEPENDENCIES += python host-python - -DBUS_PYTHON_CONF_ENV += \ - PYTHON=$(HOST_DIR)/bin/python2 \ - PYTHON_INCLUDES="`$(STAGING_DIR)/usr/bin/python2-config --includes`" \ - PYTHON_LIBS="`$(STAGING_DIR)/usr/bin/python2-config --ldflags`" - -HOST_DBUS_PYTHON_DEPENDENCIES += host-python - -HOST_DBUS_PYTHON_CONF_ENV += \ - PYTHON=$(HOST_DIR)/bin/python2 \ - PYTHON_INCLUDES="`$(HOST_DIR)/usr/bin/python2-config --includes`" \ - PYTHON_LIBS="`$(HOST_DIR)/usr/bin/python2-config --ldflags`" -else -DBUS_PYTHON_DEPENDENCIES += python3 host-python3 - -DBUS_PYTHON_CONF_ENV += \ +DBUS_PYTHON_CONF_ENV = \ PYTHON=$(HOST_DIR)/bin/python3 \ PYTHON_INCLUDES="`$(STAGING_DIR)/usr/bin/python3-config --includes`" \ PYTHON_LIBS="`$(STAGING_DIR)/usr/bin/python3-config --ldflags`" \ PYTHON_EXTRA_LIBS="`$(STAGING_DIR)/usr/bin/python3-config --libs --embed`" -HOST_DBUS_PYTHON_DEPENDENCIES += host-python3 - -HOST_DBUS_PYTHON_CONF_ENV += \ +HOST_DBUS_PYTHON_CONF_ENV = \ PYTHON=$(HOST_DIR)/bin/python3 \ PYTHON_INCLUDES="`$(HOST_DIR)/usr/bin/python3-config --includes`" \ PYTHON_LIBS="`$(HOST_DIR)/usr/bin/python3-config --ldflags`" \ PYTHON_EXTRA_LIBS="`$(HOST_DIR)/usr/bin/python3-config --libs --embed`" -endif $(eval $(autotools-package)) $(eval $(host-autotools-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:08:45 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:08:45 +0100 Subject: [Buildroot] [git commit] package/opkg-utils: drop reference to python2 Message-ID: <20220209212600.553CE8323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=36f31032087332806342fcc6eb97a94b80201f49 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/opkg-utils/Config.in | 6 ------ 1 file changed, 6 deletions(-) diff --git a/package/opkg-utils/Config.in b/package/opkg-utils/Config.in index 3c5a3ee347..2973055baf 100644 --- a/package/opkg-utils/Config.in +++ b/package/opkg-utils/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_OPKG_UTILS depends on BR2_USE_WCHAR # python3 depends on BR2_TOOLCHAIN_HAS_THREADS # python3 <- libffi depends on !BR2_STATIC_LIBS # python3 - depends on !BR2_PACKAGE_PYTHON # python3 select BR2_PACKAGE_BINUTILS if !BR2_PACKAGE_BUSYBOX # runtime select BR2_PACKAGE_BINUTILS_TARGET if !BR2_PACKAGE_BUSYBOX # runtime select BR2_PACKAGE_COREUTILS if !BR2_PACKAGE_BUSYBOX # runtime @@ -27,8 +26,3 @@ comment "opkg-utils needs a toolchain w/ wchar, threads, dynamic library" depends on !BR2_nios2 || BR2_PACKAGE_BUSYBOX depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS - -comment "opkg-utils needs python3" - depends on !BR2_nios2 || BR2_PACKAGE_BUSYBOX - depends on BR2_USE_MMU - depends on BR2_PACKAGE_PYTHON From yann.morin.1998 at free.fr Wed Feb 9 21:09:12 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:09:12 +0100 Subject: [Buildroot] [git commit] package/python-jsonschema: drop python2 support Message-ID: <20220209212600.C6FEB8323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=baa88adcc66c8107fd8524186150bdbf09923532 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-jsonschema/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/python-jsonschema/Config.in b/package/python-jsonschema/Config.in index b547f4ae1a..7002653722 100644 --- a/package/python-jsonschema/Config.in +++ b/package/python-jsonschema/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_JSONSCHEMA bool "python-jsonschema" - select BR2_PACKAGE_PYTHON_FUNCTOOLS32 if BR2_PACKAGE_PYTHON # runtime help An implementation of JSON Schema validation for Python. From yann.morin.1998 at free.fr Wed Feb 9 21:07:42 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:07:42 +0100 Subject: [Buildroot] [git commit] package/boost: drop python2 support Message-ID: <20220209212559.6673E8323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=82fc920fbe0dc774e2cf8639b450ac9e0b29d56a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/boost/Config.in | 2 +- package/boost/boost.mk | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/package/boost/Config.in b/package/boost/Config.in index 2c458bf88a..33a5337096 100644 --- a/package/boost/Config.in +++ b/package/boost/Config.in @@ -296,7 +296,7 @@ config BR2_PACKAGE_BOOST_PROGRAM_OPTIONS config BR2_PACKAGE_BOOST_PYTHON bool "boost-python" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 help The Boost Python Library is a framework for interfacing Python and C++. It allows you to quickly and seamlessly expose C++ diff --git a/package/boost/boost.mk b/package/boost/boost.mk index b6681b0ad3..032ba5c820 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -68,16 +68,11 @@ BOOST_DEPENDENCIES += bzip2 zlib endif ifeq ($(BR2_PACKAGE_BOOST_PYTHON),y) -BOOST_FLAGS += --with-python-root=$(HOST_DIR) -ifeq ($(BR2_PACKAGE_PYTHON3),y) -BOOST_FLAGS += --with-python=$(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) +BOOST_FLAGS += \ + --with-python-root=$(HOST_DIR) \ + --with-python=$(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) BOOST_TARGET_CXXFLAGS += -I$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) BOOST_DEPENDENCIES += python3 -else -BOOST_FLAGS += --with-python=$(HOST_DIR)/bin/python$(PYTHON_VERSION_MAJOR) -BOOST_TARGET_CXXFLAGS += -I$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) -BOOST_DEPENDENCIES += python -endif endif HOST_BOOST_OPTS += --no-cmake-config toolset=gcc threading=multi \ From yann.morin.1998 at free.fr Wed Feb 9 21:10:26 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:10:26 +0100 Subject: [Buildroot] [git commit] package/snmpclitools: drop python2 support Message-ID: <20220209212601.F2EAD8323E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4ba81e68398d1c5c71403b38c007d4091b4b74b8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/snmpclitools/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/snmpclitools/Config.in b/package/snmpclitools/Config.in index 00bf5994d1..bf3668a89b 100644 --- a/package/snmpclitools/Config.in +++ b/package/snmpclitools/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_SNMPCLITOOLS bool "snmpclitools" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_PYSMI # runtime select BR2_PACKAGE_PYTHON_PYSNMP # runtime help From yann.morin.1998 at free.fr Wed Feb 9 21:08:47 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:08:47 +0100 Subject: [Buildroot] [git commit] package/owfs: drop python support Message-ID: <20220209212600.5DF4A8323E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5f479fbffba50768dd6add82d83aad50104c3843 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The python support only works with python2, so drop it. Notice that there is a PR adding python3 support, but it is not yet merged: https://github.com/owfs/owfs/pull/32 Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/owfs/owfs.mk | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/package/owfs/owfs.mk b/package/owfs/owfs.mk index 7c69a5251b..986dca921a 100644 --- a/package/owfs/owfs.mk +++ b/package/owfs/owfs.mk @@ -67,30 +67,8 @@ else OWFS_CONF_OPTS += --disable-avahi endif -# setup.py isn't python3 compliant -ifeq ($(BR2_PACKAGE_PYTHON),y) -OWFS_CONF_OPTS += \ - --enable-owpython \ - --with-python \ - --with-pythonconfig=$(STAGING_DIR)/usr/bin/python-config -OWFS_MAKE_ENV += \ - CC="$(TARGET_CC)" \ - PYTHONPATH="$(PYTHON_PATH)" \ - _python_sysroot=$(STAGING_DIR) \ - _python_prefix=/usr \ - _python_exec_prefix=/usr -OWFS_DEPENDENCIES += python host-swig -# The configure scripts finds PYSITEDIR as the python_lib directory of -# host-python, and then prepends DESTDIR in front of it. So we end up -# installing things in $(TARGET_DIR)/$(HOST_DIR)/lib/python which is -# clearly wrong. -# Patching owfs to do the right thing is not trivial, it's much easier to -# override the PYSITEDIR variable in make. -OWFS_EXTRA_MAKE_OPTS += PYSITEDIR=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages - -else +# python2 only (https://github.com/owfs/owfs/pull/32) OWFS_CONF_OPTS += --disable-owpython --without-python -endif ifeq ($(BR2_STATIC_LIBS),y) # zeroconf support uses dlopen() From yann.morin.1998 at free.fr Wed Feb 9 21:07:56 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:07:56 +0100 Subject: [Buildroot] [git commit] package/dstat: drop python2 support Message-ID: <20220209212559.9879B8323E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1682e9b23b6aa8cd4f93a56c0efc8d7ec3566b42 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/dstat/Config.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package/dstat/Config.in b/package/dstat/Config.in index 647a7033c6..09d1970f73 100644 --- a/package/dstat/Config.in +++ b/package/dstat/Config.in @@ -1,10 +1,10 @@ config BR2_PACKAGE_DSTAT bool "dstat" - depends on BR2_USE_WCHAR # python - depends on BR2_USE_MMU # python - depends on BR2_TOOLCHAIN_HAS_THREADS # python - depends on !BR2_STATIC_LIBS # python - select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON + depends on BR2_USE_WCHAR # python3 + depends on BR2_USE_MMU # python3 + depends on BR2_TOOLCHAIN_HAS_THREADS # python3 + depends on !BR2_STATIC_LIBS # python3 + select BR2_PACKAGE_PYTHON3 # runtime help Dstat, written in Python, is a versatile replacement for vmstat, iostat, netstat and ifstat. Dstat overcomes some of From yann.morin.1998 at free.fr Wed Feb 9 21:09:03 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:09:03 +0100 Subject: [Buildroot] [git commit] package/python-dpkt: drop python2 support Message-ID: <20220209212600.A001A8323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a0544dab33b8ca5b5f8d2f46ded5106ceb636e5f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-dpkt/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-dpkt/Config.in b/package/python-dpkt/Config.in index 9bd7a98d26..819d0fb613 100644 --- a/package/python-dpkt/Config.in +++ b/package/python-dpkt/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_DPKT bool "python-dpkt" - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_ZLIB # runtime help Fast, simple packet creation / parsing, with definitions for the basic TCP/IP protocols. From yann.morin.1998 at free.fr Wed Feb 9 21:07:33 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:07:33 +0100 Subject: [Buildroot] [git commit] support/testing: drop python2 tests Message-ID: <20220209212559.3C7CE81335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f697096a770ff4704ac6917d7841dfaa02a945a0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Python2 for the target is about to get removed, so drop the tests using it. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- .../testing/tests/package/sample_python_subprocess32.py | 6 ------ support/testing/tests/package/test_bmap_tools.py | 8 -------- support/testing/tests/package/test_crudini.py | 8 -------- support/testing/tests/package/test_libftdi1.py | 12 ------------ support/testing/tests/package/test_python.py | 14 -------------- support/testing/tests/package/test_python_argh.py | 9 --------- support/testing/tests/package/test_python_bitstring.py | 10 ---------- support/testing/tests/package/test_python_can.py | 11 ----------- support/testing/tests/package/test_python_cbor.py | 11 ----------- support/testing/tests/package/test_python_click.py | 9 --------- support/testing/tests/package/test_python_constantly.py | 10 ---------- support/testing/tests/package/test_python_gnupg.py | 10 ---------- support/testing/tests/package/test_python_incremental.py | 11 ----------- support/testing/tests/package/test_python_passlib.py | 11 ----------- support/testing/tests/package/test_python_pexpect.py | 10 ---------- support/testing/tests/package/test_python_pynacl.py | 11 ----------- support/testing/tests/package/test_python_pyyaml.py | 11 ----------- support/testing/tests/package/test_python_subprocess32.py | 11 ----------- support/testing/tests/package/test_python_ubjson.py | 11 ----------- 19 files changed, 194 deletions(-) diff --git a/support/testing/tests/package/sample_python_subprocess32.py b/support/testing/tests/package/sample_python_subprocess32.py deleted file mode 100644 index 8579745cc8..0000000000 --- a/support/testing/tests/package/sample_python_subprocess32.py +++ /dev/null @@ -1,6 +0,0 @@ -import subprocess32 - -output = subprocess32.check_output(["ls", "-l", "/dev/null"]) -print(output) -assert("/dev/null" in output) -assert("No such" not in output) diff --git a/support/testing/tests/package/test_bmap_tools.py b/support/testing/tests/package/test_bmap_tools.py index baa23154f8..a179027633 100644 --- a/support/testing/tests/package/test_bmap_tools.py +++ b/support/testing/tests/package/test_bmap_tools.py @@ -45,14 +45,6 @@ class TestBmapTools(BRTest): self.assertRunOk(cmd, timeout=20) -class TestPy2BmapTools(TestBmapTools): - __test__ = True - config = TestBmapTools.config + \ - """ - BR2_PACKAGE_PYTHON=y - """ - - class TestPy3BmapTools(TestBmapTools): __test__ = True config = TestBmapTools.config + \ diff --git a/support/testing/tests/package/test_crudini.py b/support/testing/tests/package/test_crudini.py index e320d3207e..470a714eb6 100644 --- a/support/testing/tests/package/test_crudini.py +++ b/support/testing/tests/package/test_crudini.py @@ -33,14 +33,6 @@ class TestCrudiniBase(TestPythonPackageBase): self.assertEqual(out, ['this-is-the-magic-value']) -class TestCrudiniPy2(TestCrudiniBase): - __test__ = True - config = TestCrudiniBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - """ - - class TestCrudiniPy3(TestCrudiniBase): __test__ = True config = TestCrudiniBase.config + \ diff --git a/support/testing/tests/package/test_libftdi1.py b/support/testing/tests/package/test_libftdi1.py index 78c928484c..5c29dea04f 100644 --- a/support/testing/tests/package/test_libftdi1.py +++ b/support/testing/tests/package/test_libftdi1.py @@ -1,18 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Libftdi1(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_LIBFTDI1=y - BR2_PACKAGE_LIBFTDI1_PYTHON_BINDINGS=y - """ - sample_scripts = ["tests/package/sample_libftdi1.py"] - timeout = 40 - - class TestPythonPy3Libftdi1(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python.py b/support/testing/tests/package/test_python.py index 60da8765c4..f29aff6624 100644 --- a/support/testing/tests/package/test_python.py +++ b/support/testing/tests/package/test_python.py @@ -39,20 +39,6 @@ class TestPythonBase(infra.basetest.BRTest): self.assertEqual(exit_code, 1) -class TestPython2(TestPythonBase): - config = TestPythonBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - """ - - def test_run(self): - self.login() - self.version_test("Python 2") - self.math_floor_test() - self.libc_time_test() - self.zlib_test() - - class TestPython3(TestPythonBase): config = TestPythonBase.config + \ """ diff --git a/support/testing/tests/package/test_python_argh.py b/support/testing/tests/package/test_python_argh.py index de4b4cbe74..887d9acd46 100644 --- a/support/testing/tests/package/test_python_argh.py +++ b/support/testing/tests/package/test_python_argh.py @@ -27,15 +27,6 @@ class TestPythonArgh(TestPythonPackageBase): self.assertEqual(exit_code, 2) -class TestPythonPy2Argh(TestPythonArgh): - __test__ = True - config = TestPythonArgh.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_ARGH=y - """ - - class TestPythonPy3Argh(TestPythonArgh): __test__ = True config = TestPythonArgh.config + \ diff --git a/support/testing/tests/package/test_python_bitstring.py b/support/testing/tests/package/test_python_bitstring.py index 63b3fdb69c..bd358a2fc5 100644 --- a/support/testing/tests/package/test_python_bitstring.py +++ b/support/testing/tests/package/test_python_bitstring.py @@ -1,16 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Bitstring(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_BITSTRING=y - """ - sample_scripts = ["tests/package/sample_python_bitstring.py"] - - class TestPythonPy3Bitstring(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python_can.py b/support/testing/tests/package/test_python_can.py index d509d05dbb..dba5539c5d 100644 --- a/support/testing/tests/package/test_python_can.py +++ b/support/testing/tests/package/test_python_can.py @@ -1,17 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Can(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_CAN=y - """ - sample_scripts = ["tests/package/sample_python_can.py"] - timeout = 40 - - class TestPythonPy3Can(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python_cbor.py b/support/testing/tests/package/test_python_cbor.py index 9da3503763..23a1e3e701 100644 --- a/support/testing/tests/package/test_python_cbor.py +++ b/support/testing/tests/package/test_python_cbor.py @@ -1,17 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Cbor(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_CBOR=y - """ - sample_scripts = ["tests/package/sample_python_cbor_enc.py", - "tests/package/sample_python_cbor_dec.py"] - - class TestPythonPy3Cbor(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python_click.py b/support/testing/tests/package/test_python_click.py index db57d3aa9f..0ee9702cce 100644 --- a/support/testing/tests/package/test_python_click.py +++ b/support/testing/tests/package/test_python_click.py @@ -26,15 +26,6 @@ class TestPythonClick(TestPythonPackageBase): self.assertEqual(exit_code, 2) -class TestPythonPy2Click(TestPythonClick): - __test__ = True - config = TestPythonClick.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_CLICK=y - """ - - class TestPythonPy3Click(TestPythonClick): __test__ = True config = TestPythonClick.config + \ diff --git a/support/testing/tests/package/test_python_constantly.py b/support/testing/tests/package/test_python_constantly.py index 5be01c4f8c..edcb9bfd69 100644 --- a/support/testing/tests/package/test_python_constantly.py +++ b/support/testing/tests/package/test_python_constantly.py @@ -1,16 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Constantly(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_CONSTANTLY=y - """ - sample_scripts = ["tests/package/sample_python_constantly.py"] - - class TestPythonPy3Constantly(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python_gnupg.py b/support/testing/tests/package/test_python_gnupg.py index 0c71f6b6d0..8861115130 100644 --- a/support/testing/tests/package/test_python_gnupg.py +++ b/support/testing/tests/package/test_python_gnupg.py @@ -1,16 +1,6 @@ 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 + \ diff --git a/support/testing/tests/package/test_python_incremental.py b/support/testing/tests/package/test_python_incremental.py index 49800d8937..4c53d61321 100644 --- a/support/testing/tests/package/test_python_incremental.py +++ b/support/testing/tests/package/test_python_incremental.py @@ -1,17 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Incremental(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_INCREMENTAL=y - """ - sample_scripts = ["tests/package/sample_python_incremental.py"] - timeout = 30 - - class TestPythonPy3Incremental(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python_passlib.py b/support/testing/tests/package/test_python_passlib.py index 7c85882bf8..e12e86d91b 100644 --- a/support/testing/tests/package/test_python_passlib.py +++ b/support/testing/tests/package/test_python_passlib.py @@ -1,17 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Passlib(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_PASSLIB=y - """ - sample_scripts = ["tests/package/sample_python_passlib.py"] - timeout = 30 - - class TestPythonPy3Passlib(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python_pexpect.py b/support/testing/tests/package/test_python_pexpect.py index ba31cdbdbe..70037a7d3c 100644 --- a/support/testing/tests/package/test_python_pexpect.py +++ b/support/testing/tests/package/test_python_pexpect.py @@ -1,16 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Pexpect(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_PEXPECT=y - """ - sample_scripts = ["tests/package/sample_python_pexpect.py"] - - class TestPythonPy3Pexpect(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python_pynacl.py b/support/testing/tests/package/test_python_pynacl.py index f4dd54940a..cef8a7e780 100644 --- a/support/testing/tests/package/test_python_pynacl.py +++ b/support/testing/tests/package/test_python_pynacl.py @@ -1,17 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Pynacl(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_PYNACL=y - """ - sample_scripts = ["tests/package/sample_python_pynacl.py"] - timeout = 10 - - class TestPythonPy3Pynacl(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python_pyyaml.py b/support/testing/tests/package/test_python_pyyaml.py index cd45a57b86..9d0a351f72 100644 --- a/support/testing/tests/package/test_python_pyyaml.py +++ b/support/testing/tests/package/test_python_pyyaml.py @@ -1,17 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Pyyaml(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_PYYAML=y - """ - sample_scripts = ["tests/package/sample_python_pyyaml_enc.py", - "tests/package/sample_python_pyyaml_dec.py"] - - class TestPythonPy3Pyyaml(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python_subprocess32.py b/support/testing/tests/package/test_python_subprocess32.py deleted file mode 100644 index d2878046d1..0000000000 --- a/support/testing/tests/package/test_python_subprocess32.py +++ /dev/null @@ -1,11 +0,0 @@ -from tests.package.test_python import TestPythonPackageBase - - -class TestPythonPy2Subprocess32(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_SUBPROCESS32=y - """ - sample_scripts = ["tests/package/sample_python_subprocess32.py"] diff --git a/support/testing/tests/package/test_python_ubjson.py b/support/testing/tests/package/test_python_ubjson.py index 85c707e292..a15dbd54b8 100644 --- a/support/testing/tests/package/test_python_ubjson.py +++ b/support/testing/tests/package/test_python_ubjson.py @@ -1,17 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Ubjson(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_UBJSON=y - """ - sample_scripts = ["tests/package/sample_python_ubjson_enc.py", - "tests/package/sample_python_ubjson_dec.py"] - - class TestPythonPy3Ubjson(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ From yann.morin.1998 at free.fr Wed Feb 9 21:13:18 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:13:18 +0100 Subject: [Buildroot] [git commit] package/python-backports-abc: drop python2 specific package Message-ID: <20220209212602.558528323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=532dd66e0477968cbed59f380924e9849bfbd04b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Config.in.legacy | 6 ++++++ package/Config.in | 1 - package/python-backports-abc/Config.in | 8 -------- package/python-backports-abc/python-backports-abc.hash | 5 ----- package/python-backports-abc/python-backports-abc.mk | 14 -------------- 5 files changed, 6 insertions(+), 28 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 6bc3803a5c..cc1ed8f9d5 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_BACKPORTS_ABC + bool "python-backports-abc removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON bool "python2.7 package removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index ca2fb363e3..46e6b30cdf 100644 --- a/package/Config.in +++ b/package/Config.in @@ -941,7 +941,6 @@ menu "External python modules" source "package/python-avro/Config.in" source "package/python-babel/Config.in" source "package/python-backcall/Config.in" - source "package/python-backports-abc/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-abc/Config.in b/package/python-backports-abc/Config.in deleted file mode 100644 index 43566279e8..0000000000 --- a/package/python-backports-abc/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PYTHON_BACKPORTS_ABC - bool "python-backports-abc" - depends on BR2_PACKAGE_PYTHON - help - A backport of recent additions to the 'collections.abc' - module. - - https://pypi.python.org/pypi/backports_abc diff --git a/package/python-backports-abc/python-backports-abc.hash b/package/python-backports-abc/python-backports-abc.hash deleted file mode 100644 index 4f4c9bd1fe..0000000000 --- a/package/python-backports-abc/python-backports-abc.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5 from https://pypi.python.org/pypi/backports_abc/json -md5 7d1936ec183a3586290adf60f6f96764 backports_abc-0.5.tar.gz -# Locally computed -sha256 033be54514a03e255df75c5aee8f9e672f663f93abb723444caec8fe43437bde backports_abc-0.5.tar.gz -sha256 0a4f3b38055f50f047a42521568fa6ddb9a5976c2884f6ae138796d0f71150ca LICENSE diff --git a/package/python-backports-abc/python-backports-abc.mk b/package/python-backports-abc/python-backports-abc.mk deleted file mode 100644 index 66cea1703e..0000000000 --- a/package/python-backports-abc/python-backports-abc.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-backports-abc -# -################################################################################ - -PYTHON_BACKPORTS_ABC_VERSION = 0.5 -PYTHON_BACKPORTS_ABC_SOURCE = backports_abc-$(PYTHON_BACKPORTS_ABC_VERSION).tar.gz -PYTHON_BACKPORTS_ABC_SITE = https://pypi.python.org/packages/68/3c/1317a9113c377d1e33711ca8de1e80afbaf4a3c950dd0edfaf61f9bfe6d8 -PYTHON_BACKPORTS_ABC_LICENSE = Python-2.0 -PYTHON_BACKPORTS_ABC_LICENSE_FILES = LICENSE -PYTHON_BACKPORTS_ABC_SETUP_TYPE = setuptools - -$(eval $(python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:08:20 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:08:20 +0100 Subject: [Buildroot] [git commit] package/libcec: drop python2 support Message-ID: <20220209212559.EE0DB8323E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=83ed2d60ccc775aa02585f8e6ab5edee6b8d51f9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/libcec/libcec.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libcec/libcec.mk b/package/libcec/libcec.mk index 6591bc009a..8b5d70d008 100644 --- a/package/libcec/libcec.mk +++ b/package/libcec/libcec.mk @@ -20,8 +20,8 @@ ifeq ($(BR2_PACKAGE_HAS_UDEV),y) LIBCEC_DEPENDENCIES += udev endif -ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) -LIBCEC_DEPENDENCIES += host-swig $(if $(BR2_PACKAGE_PYTHON3),python3,python) +ifeq ($(BR2_PACKAGE_PYTHON3),y) +LIBCEC_DEPENDENCIES += host-swig python3 endif ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) From yann.morin.1998 at free.fr Wed Feb 9 21:09:35 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:09:35 +0100 Subject: [Buildroot] [git commit] package/python-pyroute2: drop python2 support Message-ID: <20220209212601.35B988323E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c449ceaae2044c7ecf30fc769a51d2b02c3ab2f1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-pyroute2/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-pyroute2/Config.in b/package/python-pyroute2/Config.in index 5df0a63d4b..9e685f9d1e 100644 --- a/package/python-pyroute2/Config.in +++ b/package/python-pyroute2/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_PYROUTE2 bool "python-pyroute2" - select BR2_PACKAGE_PYTHON_SQLITE if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_SQLITE if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_SQLITE help Python netlink library - Linux network / netns / wireless / ipset configuration. From yann.morin.1998 at free.fr Wed Feb 9 21:07:54 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:07:54 +0100 Subject: [Buildroot] [git commit] package/docker-compose: drop reference to BR2_PACKAGE_PYTHON Message-ID: <20220209212559.905788323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=459dd7a9850c7b3be519ae6bf7cc6a689c22cd32 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master And adjust the comments to clarify that the toolchain dependencies are from python3. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/docker-compose/Config.in | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/package/docker-compose/Config.in b/package/docker-compose/Config.in index 761befea4d..f82a0c4bc2 100644 --- a/package/docker-compose/Config.in +++ b/package/docker-compose/Config.in @@ -1,10 +1,9 @@ config BR2_PACKAGE_DOCKER_COMPOSE bool "docker-compose" - depends on !BR2_PACKAGE_PYTHON # python-paramiko -> python-bcrypt - depends on BR2_USE_MMU # python - depends on BR2_USE_WCHAR # python - depends on BR2_TOOLCHAIN_HAS_THREADS # python - depends on !BR2_STATIC_LIBS # python + depends on BR2_USE_MMU # python3 + depends on BR2_USE_WCHAR # python3 + depends on BR2_TOOLCHAIN_HAS_THREADS # python3 + depends on !BR2_STATIC_LIBS # python3 # python-paramiko -> python-cryptography depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS select BR2_PACKAGE_PYTHON3 From yann.morin.1998 at free.fr Wed Feb 9 21:09:56 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:09:56 +0100 Subject: [Buildroot] [git commit] package/python-txtorcon: drop python2 support Message-ID: <20220209212601.8290F8323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c45680dd66f8fab32d24963bf8eacb48211c48a2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-txtorcon/python-txtorcon.mk | 9 --------- 1 file changed, 9 deletions(-) diff --git a/package/python-txtorcon/python-txtorcon.mk b/package/python-txtorcon/python-txtorcon.mk index b8414d96d0..acf586cb8c 100644 --- a/package/python-txtorcon/python-txtorcon.mk +++ b/package/python-txtorcon/python-txtorcon.mk @@ -11,13 +11,4 @@ PYTHON_TXTORCON_SETUP_TYPE = setuptools PYTHON_TXTORCON_LICENSE = MIT PYTHON_TXTORCON_LICENSE_FILES = LICENSE -ifeq ($(BR2_PACKAGE_PYTHON),y) -# only needed/valid for python 3.x -define PYTHON_TXTORCON_RM_PY3_FILE - rm -f $(TARGET_DIR)/usr/lib/python*/site-packages/txtorcon/controller_py3.py -endef - -PYTHON_TXTORCON_POST_INSTALL_TARGET_HOOKS += PYTHON_TXTORCON_RM_PY3_FILE -endif - $(eval $(python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:08:33 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:08:33 +0100 Subject: [Buildroot] [git commit] package/libsoc: drop python2 support Message-ID: <20220209212600.2D0378323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a642bb925de97fb0afcbba0bee31bcb73d997c20 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/libsoc/libsoc.mk | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/package/libsoc/libsoc.mk b/package/libsoc/libsoc.mk index bbc33143cc..95753b8b68 100644 --- a/package/libsoc/libsoc.mk +++ b/package/libsoc/libsoc.mk @@ -12,12 +12,8 @@ LIBSOC_AUTORECONF = YES LIBSOC_INSTALL_STAGING = YES LIBSOC_DEPENDENCIES = host-pkgconf -# Install Python 2 bindings -ifeq ($(BR2_PACKAGE_PYTHON),y) -LIBSOC_DEPENDENCIES += python -LIBSOC_CONF_OPTS += --enable-python=2 # Install Python 3 bindings -else ifeq ($(BR2_PACKAGE_PYTHON3),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) LIBSOC_DEPENDENCIES += python3 LIBSOC_CONF_OPTS += --enable-python=3 else From yann.morin.1998 at free.fr Wed Feb 9 21:13:46 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:13:46 +0100 Subject: [Buildroot] [git commit] package/python-pypcap: drop python2 specific package Message-ID: <20220209212602.DC93C81335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=aec1a69a202352e61264a20561dcd729b733eb54 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Config.in.legacy | 6 ++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/python-pypcap/Config.in | 9 --------- package/python-pypcap/python-pypcap.hash | 3 --- package/python-pypcap/python-pypcap.mk | 21 --------------------- 6 files changed, 6 insertions(+), 35 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 74317a2d7c..f99535411d 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_PYPCAP + bool "python-pypcap removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_PATHLIB2 bool "python-pathlib2 removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 4bb8821563..90988478f9 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1934,7 +1934,6 @@ F: package/python-ipy/ F: package/python-iwlib/ F: package/python-posix-ipc/ F: package/python-pycairo/ -F: package/python-pypcap/ F: package/python-pyrex/ F: package/python-pysftp/ F: package/python-tinyrpc/ diff --git a/package/Config.in b/package/Config.in index 3c55dec6c5..d406d372d3 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1172,7 +1172,6 @@ menu "External python modules" source "package/python-pyopenssl/Config.in" source "package/python-pyparsing/Config.in" source "package/python-pyparted/Config.in" - source "package/python-pypcap/Config.in" source "package/python-pyphen/Config.in" source "package/python-pyqrcode/Config.in" source "package/python-pyqt5/Config.in" diff --git a/package/python-pypcap/Config.in b/package/python-pypcap/Config.in deleted file mode 100644 index 9b410ecc2b..0000000000 --- a/package/python-pypcap/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYPCAP - bool "python-pypcap" - depends on BR2_PACKAGE_PYTHON - select BR2_PACKAGE_LIBPCAP - help - The pypcap module is an object-oriented wrapper of the C - libpcap library. - - https://github.com/dugsong/pypcap diff --git a/package/python-pypcap/python-pypcap.hash b/package/python-pypcap/python-pypcap.hash deleted file mode 100644 index 40db6b4f33..0000000000 --- a/package/python-pypcap/python-pypcap.hash +++ /dev/null @@ -1,3 +0,0 @@ -# locally computed -sha256 5716d97b39d40b79daf7b0c6a8c8c514f5f1de8f20561c8621ee62a90b93fb03 python-pypcap-6f46e7bf29a648256ddc732a7d0ec83d3ffca390.tar.gz -sha256 48306c284fdbdf836b880528c3bdd658deac47ed78ffeb24a4ca5a8c39a39304 LICENSE diff --git a/package/python-pypcap/python-pypcap.mk b/package/python-pypcap/python-pypcap.mk deleted file mode 100644 index fc6fc6ed92..0000000000 --- a/package/python-pypcap/python-pypcap.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# python-pypcap -# -################################################################################ - -PYTHON_PYPCAP_VERSION = 6f46e7bf29a648256ddc732a7d0ec83d3ffca390 -PYTHON_PYPCAP_SITE = $(call github,dugsong,pypcap,$(PYTHON_PYPCAP_VERSION)) -PYTHON_PYPCAP_LICENSE = BSD-3-Clause -PYTHON_PYPCAP_LICENSE_FILES = LICENSE -PYTHON_PYPCAP_SETUP_TYPE = distutils -PYTHON_PYPCAP_DEPENDENCIES = host-python-pyrex libpcap - -define PYTHON_PYPCAP_CONFIGURE_CMDS - $(HOST_DIR)/bin/python2 $(HOST_DIR)/bin/pyrexc $(@D)/pcap.pyx - (cd $(@D); \ - $(HOST_DIR)/bin/python setup.py \ - config --with-pcap=$(STAGING_DIR)/usr) -endef - -$(eval $(python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:08:03 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:08:03 +0100 Subject: [Buildroot] [git commit] package/glsandbox-player: drop reference to python2 Message-ID: <20220209212559.B0D0B83245@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d27906769fa6cf2bce268ea957527579165e2d8e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/glslsandbox-player/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/glslsandbox-player/Config.in b/package/glslsandbox-player/Config.in index 2d15a7e270..317eb62898 100644 --- a/package/glslsandbox-player/Config.in +++ b/package/glslsandbox-player/Config.in @@ -33,7 +33,6 @@ config BR2_PACKAGE_GLSLSANDBOX_PLAYER_TESTING config BR2_PACKAGE_GLSLSANDBOX_PLAYER_SCRIPTS bool "Install scripts" - depends on !BR2_PACKAGE_PYTHON # python3 depends on !BR2_STATIC_LIBS # python3 depends on BR2_TOOLCHAIN_HAS_THREADS # python3 depends on BR2_USE_MMU # bash, python3 From yann.morin.1998 at free.fr Wed Feb 9 21:07:49 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:07:49 +0100 Subject: [Buildroot] [git commit] package/crudini: drop python2 support Message-ID: <20220209212559.7F98D81335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=246077a8890c96283419f93d7df4ca85f190b2c0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/crudini/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/crudini/Config.in b/package/crudini/Config.in index 240848dffc..ff4c98d579 100644 --- a/package/crudini/Config.in +++ b/package/crudini/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_CRUDINI bool "crudini" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_INIPARSE # runtime help A utility for handling ini files from the command line and From yann.morin.1998 at free.fr Wed Feb 9 21:12:39 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:12:39 +0100 Subject: [Buildroot] [git commit] package/python: drop host package Message-ID: <20220209212602.4A76581335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2743ce00ca61fde1537b64a165a69d497052be58 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard [yann.morin.1998 at free.fr: drop from DEVELOPERS] Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 - ...up.py-do-not-add-invalid-header-locations.patch | 42 --- ...-Fix-get_python_inc-for-cross-compilation.patch | 48 ---- ...the-install-location-of-_sysconfigdata.py.patch | 88 ------ ...-compilation-of-.pyc-and-.pyo-conditional.patch | 78 ------ ...st-getaddrinfo-test-for-cross-compilation.patch | 31 --- ...-infrastructure-to-be-able-to-disable-ext.patch | 81 ------ ...ibrary-header-paths-for-cross-compilation.patch | 64 ----- ...n-t-look-in-usr-lib-termcap-for-libraries.patch | 31 --- .../0009-Fix-python-config-for-cross-builds.patch | 229 ---------------- ...0-Remove-the-python-symlink-install-rules.patch | 43 --- .../python/0011-Don-t-add-multiarch-paths.patch | 36 --- .../python/0012-Abort-on-failed-module-build.patch | 30 -- ...-build-when-threads-are-not-used-availabl.patch | 58 ---- package/python/0014-Serial-ioctl-workaround.patch | 33 --- ...st-the-shebang-of-Python-scripts-for-cros.patch | 35 --- ...on-to-disable-installation-of-test-module.patch | 105 ------- .../0017-Add-an-option-to-disable-pydoc.patch | 89 ------ .../0018-Add-an-option-to-disable-lib2to3.patch | 92 ------- ...-Add-option-to-disable-the-sqlite3-module.patch | 69 ----- ...20-Add-an-option-to-disable-the-tk-module.patch | 73 ----- ...dd-an-option-to-disable-the-curses-module.patch | 61 ----- .../0022-Add-an-option-to-disable-expat.patch | 92 ------- .../0023-Add-an-option-to-disable-CJK-codecs.patch | 32 --- .../python/0024-Add-an-option-to-disable-NIS.patch | 35 --- ...0025-Add-an-option-to-disable-unicodedata.patch | 32 --- .../0026-Add-an-option-to-disable-bsddb.patch | 87 ------ ...7-Add-an-option-to-disable-the-ssl-module.patch | 32 --- ...8-Add-an-option-to-disable-the-bz2-module.patch | 32 --- ...-Add-an-option-to-disable-the-zlib-module.patch | 32 --- .../0030-Do-not-install-the-idle-editor.patch | 55 ---- ...-option-to-disable-the-ossaudiodev-module.patch | 32 --- ...-Add-option-to-disable-the-hashlib-module.patch | 32 --- ...-Add-an-option-to-disable-readline-module.patch | 32 --- ...stem-locale-and-set-to-default-when-addin.patch | 37 --- package/python/Config.in.host | 16 -- package/python/python.hash | 5 - package/python/python.mk | 302 --------------------- 38 files changed, 2302 deletions(-) Patch is too large, so refusing to show it From yann.morin.1998 at free.fr Wed Feb 9 21:08:56 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:08:56 +0100 Subject: [Buildroot] [git commit] package/python-can: drop python2 support Message-ID: <20220209212600.8333180196@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=07ac57eab1409b9255300126280ed43c89a88fdd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-can/Config.in | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/package/python-can/Config.in b/package/python-can/Config.in index 3d06374c6a..dc9eb0ae4e 100644 --- a/package/python-can/Config.in +++ b/package/python-can/Config.in @@ -1,13 +1,10 @@ config BR2_PACKAGE_PYTHON_CAN bool "python-can" select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime - select BR2_PACKAGE_PYTHON_SQLITE if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_SQLITE if BR2_PACKAGE_PYTHON3 # runtime - select BR2_PACKAGE_PYTHON_TYPING if BR2_PACKAGE_PYTHON # runtime + select BR2_PACKAGE_PYTHON3_SQLITE # runtime select BR2_PACKAGE_PYTHON_AENUM # runtime select BR2_PACKAGE_PYTHON_WRAPT # runtime - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_ZLIB help This module provides controller area network support for Python. From yann.morin.1998 at free.fr Wed Feb 9 21:13:48 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:13:48 +0100 Subject: [Buildroot] [git commit] package/python-pyro: drop python2 specific package Message-ID: <20220209212602.E67478323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6449cc73ca442aa5c6381552b3725809801df274 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Config.in.legacy | 6 ++++++ package/Config.in | 1 - package/python-pyro/Config.in | 10 ---------- package/python-pyro/python-pyro.hash | 5 ----- package/python-pyro/python-pyro.mk | 16 ---------------- 5 files changed, 6 insertions(+), 32 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index f99535411d..319057f748 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_PYRO + bool "python-pyro removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_PYPCAP bool "python-pypcap removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index d406d372d3..0d8ff0d4d1 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1176,7 +1176,6 @@ menu "External python modules" source "package/python-pyqrcode/Config.in" source "package/python-pyqt5/Config.in" source "package/python-pyratemp/Config.in" - source "package/python-pyro/Config.in" source "package/python-pyroute2/Config.in" source "package/python-pysendfile/Config.in" source "package/python-pysftp/Config.in" diff --git a/package/python-pyro/Config.in b/package/python-pyro/Config.in deleted file mode 100644 index 6372a1d376..0000000000 --- a/package/python-pyro/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYRO - bool "python-pyro" - depends on BR2_PACKAGE_PYTHON - help - python-pyro is a Python library stands for PYthon Remote - Objects. It is an advanced and powerful Distributed Object - Technology system written entirely in Python, that is - designed to be very easy to use.. - - https://pypi.python.org/pypi/Pyro/ diff --git a/package/python-pyro/python-pyro.hash b/package/python-pyro/python-pyro.hash deleted file mode 100644 index c22b66ddc4..0000000000 --- a/package/python-pyro/python-pyro.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5 from https://pypi.python.org/pypi/pyro/json -md5 59d4d3f4a8786776c9d7f9051b8f1a69 Pyro-3.16.tar.gz -# Locally computed -sha256 1bed508453ef7a7556b51424a58101af2349b662baab7e7331c5cb85dbe7e578 Pyro-3.16.tar.gz -sha256 7c14017a2f543384bfcde86043758b68d023b47bf09700a7df6dacbae9c82103 LICENSE diff --git a/package/python-pyro/python-pyro.mk b/package/python-pyro/python-pyro.mk deleted file mode 100644 index 235575c195..0000000000 --- a/package/python-pyro/python-pyro.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# python-pyro -# -################################################################################ - -PYTHON_PYRO_VERSION = 3.16 -PYTHON_PYRO_SOURCE = Pyro-$(PYTHON_PYRO_VERSION).tar.gz -PYTHON_PYRO_SITE = https://pypi.python.org/packages/61/68/0978adae315261b87acd216517c2c7f00780396e4d1426c5412458c6a28f -PYTHON_PYRO_LICENSE = MIT -PYTHON_PYRO_LICENSE_FILES = LICENSE -PYTHON_PYRO_CPE_ID_VENDOR = pyro_project -PYTHON_PYRO_CPE_ID_PRODUCT = pyro -PYTHON_PYRO_SETUP_TYPE = setuptools - -$(eval $(python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:08:01 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:08:01 +0100 Subject: [Buildroot] [git commit] package/fail2ban: drop python2 support Message-ID: <20220209212559.A8E9F8323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=109ff80fc1159df11ca58df6d3e9669685862cad branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/fail2ban/Config.in | 2 +- package/fail2ban/fail2ban.mk | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/package/fail2ban/Config.in b/package/fail2ban/Config.in index 86e6233793..8a48a8c1d0 100644 --- a/package/fail2ban/Config.in +++ b/package/fail2ban/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_FAIL2BAN bool "fail2ban" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_SYSTEMD if BR2_PACKAGE_SYSTEMD help Fail2ban scans log files (e.g. /var/log/apache/error_log) and diff --git a/package/fail2ban/fail2ban.mk b/package/fail2ban/fail2ban.mk index 9202dc1ddd..4a08981a97 100644 --- a/package/fail2ban/fail2ban.mk +++ b/package/fail2ban/fail2ban.mk @@ -15,15 +15,13 @@ FAIL2BAN_SETUP_TYPE = distutils # 0001-fixed-possible-RCE-vulnerability-unset-escape-variable.patch FAIL2BAN_IGNORE_CVES += CVE-2021-32749 -ifeq ($(BR2_PACKAGE_PYTHON3),y) define FAIL2BAN_PYTHON_2TO3 $(HOST_DIR)/bin/2to3 --write --nobackups --no-diffs $(@D)/bin/* $(@D)/fail2ban endef -FAIL2BAN_DEPENDENCIES += host-python3 +FAIL2BAN_DEPENDENCIES = host-python3 # We can't use _POST_PATCH_HOOKS because dependencies are not guaranteed # to build and install before _POST_PATCH_HOOKS run. FAIL2BAN_PRE_CONFIGURE_HOOKS += FAIL2BAN_PYTHON_2TO3 -endif define FAIL2BAN_FIX_DEFAULT_CONFIG $(SED) '/^socket/c\socket = /run/fail2ban.sock' $(TARGET_DIR)/etc/fail2ban/fail2ban.conf @@ -34,8 +32,7 @@ FAIL2BAN_POST_INSTALL_TARGET_HOOKS += FAIL2BAN_FIX_DEFAULT_CONFIG # fail2ban-python points to host python define FAIL2BAN_FIX_FAIL2BAN_PYTHON_SYMLINK - ln -snf $(if $(BR2_PACKAGE_PYTHON),python,python3) \ - $(TARGET_DIR)/usr/bin/fail2ban-python + ln -snf python3 $(TARGET_DIR)/usr/bin/fail2ban-python endef FAIL2BAN_POST_INSTALL_TARGET_HOOKS += FAIL2BAN_FIX_FAIL2BAN_PYTHON_SYMLINK From yann.morin.1998 at free.fr Wed Feb 9 21:13:23 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:13:23 +0100 Subject: [Buildroot] [git commit] package/python-backports-ssl-match-hostname: drop python2 specific package Message-ID: <20220209212602.6E74481335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ee520d5a0f5b117534a038399d1bfa4e5fbf97a5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Config.in.legacy | 6 ++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/python-backports-ssl-match-hostname/Config.in | 7 ------- .../python-backports-ssl-match-hostname.hash | 5 ----- .../python-backports-ssl-match-hostname.mk | 14 -------------- 6 files changed, 6 insertions(+), 28 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 89c095a388..10476a2adf 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME + bool "python-backports-ssl-match-hostname removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE bool "python-backports-shutil-get-terminal-size removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 7fe7e4287a..ebdf388d09 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2243,7 +2243,6 @@ F: package/lzop/ F: package/memtool/ F: package/mosquitto/ F: package/python-alsaaudio/ -F: package/python-backports-ssl-match-hostname/ F: package/python-cached-property/ F: package/python-docker/ F: package/python-dockerpty/ diff --git a/package/Config.in b/package/Config.in index fbfc876d89..73f266504a 100644 --- a/package/Config.in +++ b/package/Config.in @@ -941,7 +941,6 @@ menu "External python modules" source "package/python-avro/Config.in" source "package/python-babel/Config.in" source "package/python-backcall/Config.in" - source "package/python-backports-ssl-match-hostname/Config.in" source "package/python-bcrypt/Config.in" source "package/python-beautifulsoup4/Config.in" source "package/python-bidict/Config.in" diff --git a/package/python-backports-ssl-match-hostname/Config.in b/package/python-backports-ssl-match-hostname/Config.in deleted file mode 100644 index 8e55191a9e..0000000000 --- a/package/python-backports-ssl-match-hostname/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME - bool "python-backports-ssl-match-hostname" - depends on BR2_PACKAGE_PYTHON - help - The ssl.match_hostname() function from Python 3.5. - - http://bitbucket.org/brandon/backports.ssl_match_hostname diff --git a/package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.hash b/package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.hash deleted file mode 100644 index 145174cd5b..0000000000 --- a/package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/backports.ssl_match_hostname/json -md5 32d2f593af01a046bec3d2f5181a420a backports.ssl_match_hostname-3.7.0.1.tar.gz -sha256 bb82e60f9fbf4c080eabd957c39f0641f0fc247d9a16e31e26d594d8f42b9fd2 backports.ssl_match_hostname-3.7.0.1.tar.gz -# Locally computed sha256 checksums -sha256 bfc8a75a4b9aec224aa7973c0c9d7cc0134bdcbf8eefd008936b58554d66e97e LICENSE.txt diff --git a/package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.mk b/package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.mk deleted file mode 100644 index 300961662d..0000000000 --- a/package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-backports-ssl-match-hostname -# -################################################################################ - -PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_VERSION = 3.7.0.1 -PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_SOURCE = backports.ssl_match_hostname-$(PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_VERSION).tar.gz -PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_SITE = https://files.pythonhosted.org/packages/ff/2b/8265224812912bc5b7a607c44bf7b027554e1b9775e9ee0de8032e3de4b2 -PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_SETUP_TYPE = distutils -PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_LICENSE = Python-2.0 -PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_LICENSE_FILES = LICENSE.txt - -$(eval $(python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:08:15 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:08:15 +0100 Subject: [Buildroot] [git commit] package/jack2: drop python2 support Message-ID: <20220209212559.DEAF881335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c1ba0b8757c8919f77a931d2b04d3c1e9f6f1830 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/jack2/Config.in | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package/jack2/Config.in b/package/jack2/Config.in index f9de7be041..bc883190d5 100644 --- a/package/jack2/Config.in +++ b/package/jack2/Config.in @@ -37,9 +37,8 @@ config BR2_PACKAGE_JACK2_DBUS depends on BR2_USE_WCHAR # dbus-python, python select BR2_PACKAGE_DBUS select BR2_PACKAGE_DBUS_PYTHON - select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime help Build and use jackdbus. From yann.morin.1998 at free.fr Wed Feb 9 21:09:01 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:09:01 +0100 Subject: [Buildroot] [git commit] package/python-dicttoxml: drop python2 support Message-ID: <20220209212600.967A480196@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=25fe06d41df4fd240eceb361e54828eafe8b22ea branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-dicttoxml/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-dicttoxml/Config.in b/package/python-dicttoxml/Config.in index e38a5f7909..145887eddc 100644 --- a/package/python-dicttoxml/Config.in +++ b/package/python-dicttoxml/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_DICTTOXML bool "python-dicttoxml" - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_PYEXPAT help Converts a Python dictionary or other native data type into a valid XML string. From yann.morin.1998 at free.fr Wed Feb 9 21:13:55 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:13:55 +0100 Subject: [Buildroot] [git commit] package/python-typing: drop python2 specific package Message-ID: <20220209212603.14B5E81335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=53b288cbe03b6a197af820caad0d77c24678f2ef branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Config.in.legacy | 6 ++++++ package/Config.in | 1 - package/python-typing/Config.in | 8 -------- package/python-typing/python-typing.hash | 5 ----- package/python-typing/python-typing.mk | 15 --------------- 5 files changed, 6 insertions(+), 29 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 8db9558ed4..998ea6b231 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_TYPING + bool "python-typing removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_SUBPROCESS32 bool "python-subprocess32 removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index 18de2a32a5..cfc4522be9 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1264,7 +1264,6 @@ menu "External python modules" source "package/python-txdbus/Config.in" source "package/python-txtorcon/Config.in" source "package/python-typepy/Config.in" - source "package/python-typing/Config.in" source "package/python-typing-extensions/Config.in" source "package/python-u-msgpack/Config.in" source "package/python-ubjson/Config.in" diff --git a/package/python-typing/Config.in b/package/python-typing/Config.in deleted file mode 100644 index 81b7d71b4b..0000000000 --- a/package/python-typing/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PYTHON_TYPING - bool "python-typing" - depends on BR2_PACKAGE_PYTHON - help - Type Hints for Python. This is a backport of the standard - library typing module to Python versions older than 3.5. - - https://docs.python.org/3/library/typing.html diff --git a/package/python-typing/python-typing.hash b/package/python-typing/python-typing.hash deleted file mode 100644 index f587eb7bfa..0000000000 --- a/package/python-typing/python-typing.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/typing/json -md5 d6dd450cfe0c8c6547eef09a0491775d typing-3.10.0.0.tar.gz -sha256 13b4ad211f54ddbf93e5901a9967b1e07720c1d1b78d596ac6a439641aa1b130 typing-3.10.0.0.tar.gz -# Locally computed sha256 checksums -sha256 ff17ce94e102024deb68773eb1cc74ca76da4e658f373531f0ac22d68a6bb1ad LICENSE diff --git a/package/python-typing/python-typing.mk b/package/python-typing/python-typing.mk deleted file mode 100644 index dd1d8f29b5..0000000000 --- a/package/python-typing/python-typing.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# python-typing -# -################################################################################ - -PYTHON_TYPING_VERSION = 3.10.0.0 -PYTHON_TYPING_SOURCE = typing-$(PYTHON_TYPING_VERSION).tar.gz -PYTHON_TYPING_SITE = https://files.pythonhosted.org/packages/b0/1b/835d4431805939d2996f8772aca1d2313a57e8860fec0e48e8e7dfe3a477 -PYTHON_TYPING_SETUP_TYPE = setuptools -PYTHON_TYPING_LICENSE = Python-2.0, others -PYTHON_TYPING_LICENSE_FILES = LICENSE - -$(eval $(python-package)) -$(eval $(host-python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:13:41 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:13:41 +0100 Subject: [Buildroot] [git commit] package/python-pam: drop python2 specific package Message-ID: <20220209212602.C5C7A8323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c8ab303417e95a804719d1e1d76df8849e86d2b0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Config.in.legacy | 6 + DEVELOPERS | 1 - package/Config.in | 1 - package/python-pam/0001-dealloc.patch | 25 ---- package/python-pam/0002-nofree.patch | 68 ----------- .../0003-memory-errors-CVE2012-1502.patch | 136 --------------------- package/python-pam/Config.in | 16 --- package/python-pam/python-pam.hash | 3 - package/python-pam/python-pam.mk | 16 --- 9 files changed, 6 insertions(+), 266 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 80adf521f8..386f94e72b 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_PAM + bool "python-pam removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_NFC bool "python-nfc removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index d661693e4d..0ca1ee9f38 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2248,7 +2248,6 @@ F: package/python-docker-pycreds/ F: package/python-enum/ F: package/python-enum34/ F: package/python-functools32/ -F: package/python-pam/ F: package/python-psutil/ F: package/python-request-id/ F: package/python-semver/ diff --git a/package/Config.in b/package/Config.in index 8dc91becb0..73e8901a1d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1115,7 +1115,6 @@ menu "External python modules" source "package/python-opcua-asyncio/Config.in" source "package/python-packaging/Config.in" source "package/python-paho-mqtt/Config.in" - source "package/python-pam/Config.in" source "package/python-paramiko/Config.in" source "package/python-parso/Config.in" source "package/python-passlib/Config.in" diff --git a/package/python-pam/0001-dealloc.patch b/package/python-pam/0001-dealloc.patch deleted file mode 100644 index dd4f9610c7..0000000000 --- a/package/python-pam/0001-dealloc.patch +++ /dev/null @@ -1,25 +0,0 @@ -[PATCH] fix two bugs in the PAM object deallocation - -Fixes https://bugzilla.redhat.com/show_bug.cgi?id=658955 - -Downloaded from: -http://pkgs.fedoraproject.org/cgit/PyPAM.git/plain/PyPAM-0.5.0-dealloc.patch - -Signed-off-by: Peter Korsgaard -diff -up PyPAM-0.5.0/PAMmodule.c.dealloc PyPAM-0.5.0/PAMmodule.c ---- PyPAM-0.5.0/PAMmodule.c.dealloc 2011-01-17 22:48:22.000000000 +0100 -+++ PyPAM-0.5.0/PAMmodule.c 2011-01-18 21:24:59.000000000 +0100 -@@ -538,10 +538,11 @@ static void PyPAM_dealloc(PyPAMObject *s - free(self->service); - free(self->user); - free(self->conv); -- pam_end(self->pamh, PAM_SUCCESS); -+ if (self->pamh) -+ pam_end(self->pamh, PAM_SUCCESS); - dlclose(self->dlh2); - dlclose(self->dlh1); -- PyMem_DEL(self); -+ PyObject_Del(self); - } - - static PyObject * PyPAM_getattr(PyPAMObject *self, char *name) diff --git a/package/python-pam/0002-nofree.patch b/package/python-pam/0002-nofree.patch deleted file mode 100644 index 7de8801707..0000000000 --- a/package/python-pam/0002-nofree.patch +++ /dev/null @@ -1,68 +0,0 @@ -[PATCH] deallocate the conversation response only in case of error - -Fixes https://bugzilla.redhat.com/show_bug.cgi?id=679714 - -Downloaded from: -http://pkgs.fedoraproject.org/cgit/PyPAM.git/plain/PyPAM-0.5.0-nofree.patch - -Signed-off-by: Peter Korsgaard -diff --git a/PAMmodule.c b/PAMmodule.c -index 03cb799..a7ff8a5 100644 ---- a/PAMmodule.c -+++ b/PAMmodule.c -@@ -24,8 +24,6 @@ typedef struct { - char *service; - char *user; - PyObject *callback; -- struct pam_response *response_data; -- int response_len; - PyObject *user_data; - void *dlh1, *dlh2; - } PyPAMObject; -@@ -54,15 +52,6 @@ static int PyPAM_conv(int num_msg, const struct pam_message **msg, - - Py_INCREF(self); - -- if (NULL != self->response_data) { -- for (int i = 0; i < self->response_len; i++) { -- free(self->response_data[0].resp); -- } -- free(self->response_data); -- self->response_data = NULL; -- self->response_len = 0; -- } -- - PyObject* msgList = PyList_New(num_msg); - - for (int i = 0; i < num_msg; i++) { -@@ -92,6 +81,10 @@ static int PyPAM_conv(int num_msg, const struct pam_message **msg, - char* resp_text; - int resp_retcode = 0; - if (!PyArg_ParseTuple(respTuple, "si", &resp_text, &resp_retcode)) { -+ while (i > 0) { -+ free((--spr)->resp); -+ --i; -+ } - free(*resp); - Py_DECREF(respList); - return PAM_CONV_ERR; -@@ -100,10 +93,6 @@ static int PyPAM_conv(int num_msg, const struct pam_message **msg, - spr->resp_retcode = resp_retcode; - Py_DECREF(respTuple); - } -- -- // Save this so we can free it later. -- self->response_data = *resp; -- self->response_len = PyList_Size(respList); - - Py_DECREF(respList); - -@@ -144,8 +133,6 @@ static PyObject * PyPAM_pam(PyObject *self, PyObject *args) - p->user = NULL; - Py_INCREF(Py_None); - p->callback = Py_None; -- p->response_data = NULL; -- p->response_len = 0; - Py_INCREF(Py_None); - p->user_data = Py_None; - diff --git a/package/python-pam/0003-memory-errors-CVE2012-1502.patch b/package/python-pam/0003-memory-errors-CVE2012-1502.patch deleted file mode 100644 index 62405db058..0000000000 --- a/package/python-pam/0003-memory-errors-CVE2012-1502.patch +++ /dev/null @@ -1,136 +0,0 @@ -[PATCH] Fix Double Free Corruption (CVE2012-1502) - -Downloaded from: -http://pkgs.fedoraproject.org/cgit/PyPAM.git/plain/PyPAM-0.5.0-memory-errors.patch - -For details, see: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-1502 - -Signed-off-by: Peter Korsgaard -diff -up PyPAM-0.5.0/PAMmodule.c.memory PyPAM-0.5.0/PAMmodule.c ---- PyPAM-0.5.0/PAMmodule.c.memory 2012-05-07 17:22:54.503914026 +0200 -+++ PyPAM-0.5.0/PAMmodule.c 2012-05-07 17:23:15.644381942 +0200 -@@ -37,33 +37,48 @@ static void PyPAM_Err(PyPAMObject *self, - - err_msg = pam_strerror(self->pamh, result); - error = Py_BuildValue("(si)", err_msg, result); -- Py_INCREF(PyPAM_Error); - PyErr_SetObject(PyPAM_Error, error); -+ Py_XDECREF(error); - } - - static int PyPAM_conv(int num_msg, const struct pam_message **msg, - struct pam_response **resp, void *appdata_ptr) - { -- PyObject *args; -- -+ PyObject *args, *msgList, *respList, *item; -+ struct pam_response *response, *spr; - PyPAMObject* self = (PyPAMObject *) appdata_ptr; -+ - if (self->callback == NULL) - return PAM_CONV_ERR; - - Py_INCREF(self); - -- PyObject* msgList = PyList_New(num_msg); -- -+ msgList = PyList_New(num_msg); -+ if (msgList == NULL) { -+ Py_DECREF(self); -+ return PAM_CONV_ERR; -+ } -+ - for (int i = 0; i < num_msg; i++) { -- PyList_SetItem(msgList, i, -- Py_BuildValue("(si)", msg[i]->msg, msg[i]->msg_style)); -+ item = Py_BuildValue("(si)", msg[i]->msg, msg[i]->msg_style); -+ if (item == NULL) { -+ Py_DECREF(msgList); -+ Py_DECREF(self); -+ return PAM_CONV_ERR; -+ } -+ PyList_SetItem(msgList, i, item); - } -- -+ - args = Py_BuildValue("(OO)", self, msgList); -- PyObject* respList = PyEval_CallObject(self->callback, args); -+ if (args == NULL) { -+ Py_DECREF(self); -+ Py_DECREF(msgList); -+ return PAM_CONV_ERR; -+ } -+ respList = PyEval_CallObject(self->callback, args); - Py_DECREF(args); - Py_DECREF(self); -- -+ - if (respList == NULL) - return PAM_CONV_ERR; - -@@ -71,11 +86,15 @@ static int PyPAM_conv(int num_msg, const - Py_DECREF(respList); - return PAM_CONV_ERR; - } -- -- *resp = (struct pam_response *) malloc( -+ -+ response = (struct pam_response *) malloc( - PyList_Size(respList) * sizeof(struct pam_response)); -+ if (response == NULL) { -+ Py_DECREF(respList); -+ return PAM_CONV_ERR; -+ } -+ spr = response; - -- struct pam_response* spr = *resp; - for (int i = 0; i < PyList_Size(respList); i++, spr++) { - PyObject* respTuple = PyList_GetItem(respList, i); - char* resp_text; -@@ -85,7 +104,7 @@ static int PyPAM_conv(int num_msg, const - free((--spr)->resp); - --i; - } -- free(*resp); -+ free(response); - Py_DECREF(respList); - return PAM_CONV_ERR; - } -@@ -95,7 +114,8 @@ static int PyPAM_conv(int num_msg, const - } - - Py_DECREF(respList); -- -+ *resp = response; -+ - return PAM_SUCCESS; - } - -@@ -122,7 +142,11 @@ static PyObject * PyPAM_pam(PyObject *se - PyPAMObject_Type.ob_type = &PyType_Type; - p = (PyPAMObject *) PyObject_NEW(PyPAMObject, &PyPAMObject_Type); - -+ if (p == NULL) -+ return NULL; -+ - if ((spc = (struct pam_conv *) malloc(sizeof(struct pam_conv))) == NULL) { -+ Py_DECREF((PyObject *)p); - PyErr_SetString(PyExc_MemoryError, "out of memory"); - return NULL; - } -@@ -455,9 +479,15 @@ static PyObject * PyPAM_getenvlist(PyObj - } - - retval = PyList_New(0); -+ if (retval == NULL) -+ return NULL; - - while ((cp = *(result++)) != NULL) { - entry = Py_BuildValue("s", cp); -+ if (entry == NULL) { -+ Py_DECREF(retval); -+ return NULL; -+ } - PyList_Append(retval, entry); - Py_DECREF(entry); - } diff --git a/package/python-pam/Config.in b/package/python-pam/Config.in deleted file mode 100644 index 92ba105ebf..0000000000 --- a/package/python-pam/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -comment "python-pam needs a toolchain w/ wchar, locale, dynamic library" - depends on BR2_PACKAGE_PYTHON - depends on !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR || BR2_STATIC_LIBS - -config BR2_PACKAGE_PYTHON_PAM - bool "python-pam" - depends on BR2_PACKAGE_PYTHON # C extension not compatible with python3 - depends on BR2_ENABLE_LOCALE # linux-pam - depends on BR2_USE_WCHAR # linux-pam - depends on BR2_USE_MMU # linux-pam - depends on !BR2_STATIC_LIBS # linux-pam - select BR2_PACKAGE_LINUX_PAM - help - PAM (Pluggable Authentication Module) bindings for Python. - - https://admin.fedoraproject.org/pkgdb/package/PyPAM/ diff --git a/package/python-pam/python-pam.hash b/package/python-pam/python-pam.hash deleted file mode 100644 index 303455ae2f..0000000000 --- a/package/python-pam/python-pam.hash +++ /dev/null @@ -1,3 +0,0 @@ -# locally computed -sha256 796ac019b9ee805696d0d277d8fb912fa2391b6ac070dc6f9f1a9a0fadbc3a5a PyPAM-0.5.0.tar.gz -sha256 ca0061fc1381a3ab242310e4b3f56389f28e3d460eb2fd822ed7a21c6f030532 COPYING diff --git a/package/python-pam/python-pam.mk b/package/python-pam/python-pam.mk deleted file mode 100644 index 943e01dd64..0000000000 --- a/package/python-pam/python-pam.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# python-pam -# -################################################################################ - -PYTHON_PAM_VERSION = 0.5.0 -PYTHON_PAM_SOURCE = PyPAM-$(PYTHON_PAM_VERSION).tar.gz -# pangalactic.org gone -PYTHON_PAM_SITE = http://pkgs.fedoraproject.org/repo/pkgs/PyPAM/PyPAM-0.5.0.tar.gz/f1e7c2c56421dda28a75ace59a3c8871 -PYTHON_PAM_SETUP_TYPE = distutils -PYTHON_PAM_LICENSE = LGPL-2.1 -PYTHON_PAM_LICENSE_FILES = COPYING -PYTHON_PAM_DEPENDENCIES = linux-pam - -$(eval $(python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:09:10 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:09:10 +0100 Subject: [Buildroot] [git commit] package/python-flask: drop python2 support Message-ID: <20220209212600.BDE9980196@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=458bdb7f02144ab85729743b4506741601cb3d84 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The package alredy depended on python3, so no functional change. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-flask/Config.in | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/package/python-flask/Config.in b/package/python-flask/Config.in index 56bfe10f01..8a44bf2db4 100644 --- a/package/python-flask/Config.in +++ b/package/python-flask/Config.in @@ -1,15 +1,12 @@ config BR2_PACKAGE_PYTHON_FLASK bool "python-flask" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_CLICK # runtime select BR2_PACKAGE_PYTHON_JINJA2 # runtime select BR2_PACKAGE_PYTHON_WERKZEUG # runtime select BR2_PACKAGE_PYTHON_ITSDANGEROUS # runtime select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime - select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_SSL + select BR2_PACKAGE_PYTHON3_ZLIB help Flask is a microframework for Python based on Werkzeug, Jinja 2 and good intentions. From yann.morin.1998 at free.fr Wed Feb 9 21:08:12 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:08:12 +0100 Subject: [Buildroot] [git commit] package/iotop: drop python2 support Message-ID: <20220209212559.D2C5D8323E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bdc286aa907c7b682777254ec1256c981391b525 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/iotop/Config.in | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/package/iotop/Config.in b/package/iotop/Config.in index ada6131606..460503b9d7 100644 --- a/package/iotop/Config.in +++ b/package/iotop/Config.in @@ -1,11 +1,10 @@ -comment "iotop depends on python or python3" - depends on !BR2_PACKAGE_PYTHON && !BR2_PACKAGE_PYTHON3 +comment "iotop depends on python3" + depends on !BR2_PACKAGE_PYTHON3 config BR2_PACKAGE_IOTOP bool "iotop" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 - select BR2_PACKAGE_PYTHON_CURSES if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_CURSES if BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_CURSES help iotop does for I/O usage what top does for CPU usage. From yann.morin.1998 at free.fr Wed Feb 9 21:13:58 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:13:58 +0100 Subject: [Buildroot] [git commit] package/python-yieldfrom: drop python2 specific package Message-ID: <20220209212603.202918323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ecee967c03d8215ff3a40eed7c4faa42a14fd137 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Config.in.legacy | 6 ++++++ package/Config.in | 1 - package/python-yieldfrom/Config.in | 8 -------- package/python-yieldfrom/python-yieldfrom.hash | 5 ----- package/python-yieldfrom/python-yieldfrom.mk | 15 --------------- 5 files changed, 6 insertions(+), 29 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 998ea6b231..47e8d696e0 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_YIELDFROM + bool "python-yieldfrom removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_TYPING bool "python-typing removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index cfc4522be9..6fb62caa4c 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1300,7 +1300,6 @@ menu "External python modules" source "package/python-xmodem/Config.in" source "package/python-yarl/Config.in" source "package/python-yatl/Config.in" - source "package/python-yieldfrom/Config.in" source "package/python-zc-lockfile/Config.in" source "package/python-zeroconf/Config.in" source "package/python-zope-interface/Config.in" diff --git a/package/python-yieldfrom/Config.in b/package/python-yieldfrom/Config.in deleted file mode 100644 index 1a063d3128..0000000000 --- a/package/python-yieldfrom/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PYTHON_YIELDFROM - bool "python-yieldfrom" - depends on BR2_PACKAGE_PYTHON - help - A backport of the `yield from` semantic from Python 3.x to - Python 2.7. - - https://github.com/Nurdok/yieldfrom/ diff --git a/package/python-yieldfrom/python-yieldfrom.hash b/package/python-yieldfrom/python-yieldfrom.hash deleted file mode 100644 index 7730a1e578..0000000000 --- a/package/python-yieldfrom/python-yieldfrom.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/yieldfrom/json -md5 fd94120625ac1e69bb5946d5e63182da yieldfrom-1.0.5.tar.gz -sha256 eb75e58641410f06083f85013a438f28bceaabfe5af9c3206d5049362c37aca0 yieldfrom-1.0.5.tar.gz -# Locally computed sha256 checksums -sha256 b3092d61cce29e25f3799285495095d220e5e015b88c1c70e1e72dae052f21e8 LICENSE diff --git a/package/python-yieldfrom/python-yieldfrom.mk b/package/python-yieldfrom/python-yieldfrom.mk deleted file mode 100644 index c926936ae8..0000000000 --- a/package/python-yieldfrom/python-yieldfrom.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# python-yieldfrom -# -################################################################################ - -PYTHON_YIELDFROM_VERSION = 1.0.5 -PYTHON_YIELDFROM_SOURCE = yieldfrom-$(PYTHON_YIELDFROM_VERSION).tar.gz -PYTHON_YIELDFROM_SITE = https://files.pythonhosted.org/packages/4d/f9/395917f574ace618eb234bcbae8df3fabaa9624532d96d1fbd3a20678b1e -PYTHON_YIELDFROM_SETUP_TYPE = setuptools -PYTHON_YIELDFROM_LICENSE = MIT -PYTHON_YIELDFROM_LICENSE_FILES = LICENSE - -$(eval $(python-package)) -$(eval $(host-python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:16:23 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:16:23 +0100 Subject: [Buildroot] [git commit] package/python-enum34: drop python2 specific package Message-ID: <20220209212603.4CA068323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cbd2900ba81c4bb0ce9664850fcd1c3ec7de2a60 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Config.in.legacy | 6 ++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/python-enum34/Config.in | 12 ------------ package/python-enum34/python-enum34.hash | 5 ----- package/python-enum34/python-enum34.mk | 17 ----------------- 6 files changed, 6 insertions(+), 36 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index bc5df0e489..7df95691ca 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_ENUM34 + bool "python-enum34 removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_ENUM bool "python-enum removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 0716729cee..92abe8a6dd 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2243,7 +2243,6 @@ F: package/python-cached-property/ F: package/python-docker/ F: package/python-dockerpty/ F: package/python-docker-pycreds/ -F: package/python-enum34/ F: package/python-functools32/ F: package/python-psutil/ F: package/python-request-id/ diff --git a/package/Config.in b/package/Config.in index f134b626be..18388f82c3 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1010,7 +1010,6 @@ menu "External python modules" source "package/python-ecdsa/Config.in" source "package/python-engineio/Config.in" source "package/python-entrypoints/Config.in" - source "package/python-enum34/Config.in" source "package/python-esptool/Config.in" source "package/python-falcon/Config.in" source "package/python-filelock/Config.in" diff --git a/package/python-enum34/Config.in b/package/python-enum34/Config.in deleted file mode 100644 index 2511a350e0..0000000000 --- a/package/python-enum34/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_PYTHON_ENUM34 - bool "python-enum34" - depends on BR2_PACKAGE_PYTHON - help - Python 3.4 Enum backported to 2.x. - - An enumeration is a set of symbolic names (members) bound to - unique, constant values. Within an enumeration, the members - can be compared by identity, and the enumeration itself can - be iterated over. - - https://pypi.python.org/pypi/enum34 diff --git a/package/python-enum34/python-enum34.hash b/package/python-enum34/python-enum34.hash deleted file mode 100644 index e43e00a5fe..0000000000 --- a/package/python-enum34/python-enum34.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5 from https://pypi.python.org/pypi/enum34/json -md5 b5ac0bb5ea9e830029599e410d09d3b5 enum34-1.1.10.tar.gz -# Locally computed -sha256 cce6a7477ed816bd2542d03d53db9f0db935dd013b70f336a95c73979289f248 enum34-1.1.10.tar.gz -sha256 88ec6a6c8eafa3b9757e745783938bef3f5e4d5e3c76b1db576aa3ab520e5e1d enum/LICENSE diff --git a/package/python-enum34/python-enum34.mk b/package/python-enum34/python-enum34.mk deleted file mode 100644 index 0bd00508aa..0000000000 --- a/package/python-enum34/python-enum34.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# python-enum34 -# -################################################################################ - -PYTHON_ENUM34_VERSION = 1.1.10 -PYTHON_ENUM34_SOURCE = enum34-$(PYTHON_ENUM34_VERSION).tar.gz -PYTHON_ENUM34_SITE = https://files.pythonhosted.org/packages/11/c4/2da1f4952ba476677a42f25cd32ab8aaf0e1c0d0e00b89822b835c7e654c -PYTHON_ENUM34_SETUP_TYPE = setuptools -PYTHON_ENUM34_LICENSE = BSD-3-Clause -PYTHON_ENUM34_LICENSE_FILES = enum/LICENSE -PYTHON_ENUM34_CPE_ID_VENDOR = python -PYTHON_ENUM34_CPE_ID_PRODUCT = enum34 - -$(eval $(python-package)) -$(eval $(host-python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:07:59 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:07:59 +0100 Subject: [Buildroot] [git commit] package/evemu: drop python2 support Message-ID: <20220209212559.A0BA681335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8af1b5df85d0e9eac8926b1b967d2737d1947a74 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/evemu/evemu.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/evemu/evemu.mk b/package/evemu/evemu.mk index 02e5abdb8f..b27033afa4 100644 --- a/package/evemu/evemu.mk +++ b/package/evemu/evemu.mk @@ -22,9 +22,9 @@ EVEMU_CONF_OPTS += --disable-tests EVEMU_DEPENDENCIES = host-pkgconf libevdev # Check for target python -ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) EVEMU_CONF_OPTS += --enable-python-bindings -EVEMU_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON3),python3,python) +EVEMU_DEPENDENCIES += python3 else EVEMU_CONF_OPTS += --disable-python-bindings endif From yann.morin.1998 at free.fr Wed Feb 9 21:09:15 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:09:15 +0100 Subject: [Buildroot] [git commit] package/python-libconfig: drop python2 support Message-ID: <20220209212600.D07228323E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8d73a7adde447b730e11fea5a2938f7737f47b95 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-libconfig/python-libconfig.mk | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/package/python-libconfig/python-libconfig.mk b/package/python-libconfig/python-libconfig.mk index 2db7e99cf3..c7d87f408a 100644 --- a/package/python-libconfig/python-libconfig.mk +++ b/package/python-libconfig/python-libconfig.mk @@ -14,14 +14,8 @@ PYTHON_LIBCONFIG_SETUP_TYPE = setuptools PYTHON_LIBCONFIG_DEPENDENCIES = libconfig boost -ifeq ($(BR2_PACKAGE_PYTHON),y) -PYTHON_LIBCONFIG_PYVER = $(PYTHON_VERSION_MAJOR) -else ifeq ($(BR2_PACKAGE_PYTHON3),y) -PYTHON_LIBCONFIG_PYVER = $(PYTHON3_VERSION_MAJOR) -endif - define PYTHON_LIBCONFIG_FIX_SETUP - $(SED) 's/boost_python/boost_python$(subst .,,$(PYTHON_LIBCONFIG_PYVER))/g' \ + $(SED) 's/boost_python/boost_python$(subst .,,$(PYTHON3_VERSION_MAJOR))/g' \ $(@D)/setup.py endef PYTHON_LIBCONFIG_POST_PATCH_HOOKS += PYTHON_LIBCONFIG_FIX_SETUP From yann.morin.1998 at free.fr Wed Feb 9 21:09:24 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:09:24 +0100 Subject: [Buildroot] [git commit] package/python-pexpect: drop python2 support Message-ID: <20220209212601.049108323E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=480f54219da1593c16018c3f8c61a411eb9e1c04 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-pexpect/python-pexpect.mk | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/package/python-pexpect/python-pexpect.mk b/package/python-pexpect/python-pexpect.mk index a9609cbe79..3efda26825 100644 --- a/package/python-pexpect/python-pexpect.mk +++ b/package/python-pexpect/python-pexpect.mk @@ -11,14 +11,4 @@ PYTHON_PEXPECT_LICENSE = ISC PYTHON_PEXPECT_LICENSE_FILES = LICENSE PYTHON_PEXPECT_SETUP_TYPE = distutils -# async.py is not usable with Python 2, and removing is the solution -# recommended by upstream: -# https://github.com/pexpect/pexpect/issues/290 -ifeq ($(BR2_PACKAGE_PYTHON),y) -define PYTHON_PEXPECT_REMOVE_ASYNC_PY - $(RM) $(@D)/pexpect/_async.py -endef -PYTHON_PEXPECT_POST_PATCH_HOOKS += PYTHON_PEXPECT_REMOVE_ASYNC_PY -endif - $(eval $(python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:16:21 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:16:21 +0100 Subject: [Buildroot] [git commit] package/python-enum: drop python2 specific package Message-ID: <20220209212603.4132081335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ef2c5ce5d1687384f7fb0cce019af8168e3e04df branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Config.in.legacy | 6 ++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/python-enum/Config.in | 12 ------------ package/python-enum/python-enum.hash | 5 ----- package/python-enum/python-enum.mk | 14 -------------- 6 files changed, 6 insertions(+), 33 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 630194edba..bc5df0e489 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_ENUM + bool "python-enum removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_DIALOG bool "python-dialog removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 8112873f14..0716729cee 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2243,7 +2243,6 @@ F: package/python-cached-property/ F: package/python-docker/ F: package/python-dockerpty/ F: package/python-docker-pycreds/ -F: package/python-enum/ F: package/python-enum34/ F: package/python-functools32/ F: package/python-psutil/ diff --git a/package/Config.in b/package/Config.in index b91e190c8e..f134b626be 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1010,7 +1010,6 @@ menu "External python modules" source "package/python-ecdsa/Config.in" source "package/python-engineio/Config.in" source "package/python-entrypoints/Config.in" - source "package/python-enum/Config.in" source "package/python-enum34/Config.in" source "package/python-esptool/Config.in" source "package/python-falcon/Config.in" diff --git a/package/python-enum/Config.in b/package/python-enum/Config.in deleted file mode 100644 index e26ae8bf97..0000000000 --- a/package/python-enum/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_PYTHON_ENUM - bool "python-enum" - depends on BR2_PACKAGE_PYTHON - help - Robust enumerated type support in Python - - An enumeration object is an immutable sequence object built - from a sequence of strings. Each value is also available as - an attribute. Such values are constant. Comparisons and - enumeration are supported. - - https://pypi.python.org/pypi/enum diff --git a/package/python-enum/python-enum.hash b/package/python-enum/python-enum.hash deleted file mode 100644 index 4b4b369e34..0000000000 --- a/package/python-enum/python-enum.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/enum/json -md5 e7d170e3f84435b77058de625c96ef58 enum-0.4.7.tar.gz -sha256 8c7cf3587eda51008bcc1eed99ea2c331ccd265c231dbaa95ec5258d3dc03100 enum-0.4.7.tar.gz -# Locally computed sha256 checksums -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL-3 diff --git a/package/python-enum/python-enum.mk b/package/python-enum/python-enum.mk deleted file mode 100644 index f1de8a9312..0000000000 --- a/package/python-enum/python-enum.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-enum -# -################################################################################ - -PYTHON_ENUM_VERSION = 0.4.7 -PYTHON_ENUM_SOURCE = enum-$(PYTHON_ENUM_VERSION).tar.gz -PYTHON_ENUM_SITE = https://files.pythonhosted.org/packages/02/a0/32e1d5a21b703f600183e205aafc6773577e16429af5ad3c3f9b956b07ca -PYTHON_ENUM_SETUP_TYPE = setuptools -PYTHON_ENUM_LICENSE = GPL-3.0+ -PYTHON_ENUM_LICENSE_FILES = LICENSE.GPL-3 - -$(eval $(python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:08:10 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:08:10 +0100 Subject: [Buildroot] [git commit] package/i2c-tools: drop python2 support Message-ID: <20220209212559.CB3038323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f8c3859b6f351aab631e1b3abdb87ce8fa930d3d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/i2c-tools/i2c-tools.mk | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/package/i2c-tools/i2c-tools.mk b/package/i2c-tools/i2c-tools.mk index 7565349f5e..5c9ce26628 100644 --- a/package/i2c-tools/i2c-tools.mk +++ b/package/i2c-tools/i2c-tools.mk @@ -13,10 +13,6 @@ I2C_TOOLS_CPE_ID_VENDOR = i2c-tools_project I2C_TOOLS_MAKE_OPTS = EXTRA=eeprog I2C_TOOLS_INSTALL_STAGING = YES -ifeq ($(BR2_PACKAGE_PYTHON),y) -I2C_TOOLS_DEPENDENCIES += python -endif - ifeq ($(BR2_PACKAGE_PYTHON3),y) I2C_TOOLS_DEPENDENCIES += python3 endif @@ -31,7 +27,7 @@ endif # Build/install steps mirror the distutil python package type in the python package # infrastructure -ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) # BASE_ENV taken from PKG_PYTHON_DISTUTILS_ENV in package/pkg-python.mk I2C_TOOLS_PYTHON_BASE_ENV = \ $(PKG_PYTHON_DISTUTILS_ENV) \ @@ -51,7 +47,7 @@ define I2C_TOOLS_INSTALL_PYSMBUS $(PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS)) endef -endif # BR2_PACKAGE_PYTHON +endif # BR2_PACKAGE_PYTHON3 define I2C_TOOLS_BUILD_CMDS $(MAKE) $(TARGET_CONFIGURE_OPTS) $(I2C_TOOLS_MAKE_OPTS) -C $(@D) From yann.morin.1998 at free.fr Wed Feb 9 21:09:28 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:09:28 +0100 Subject: [Buildroot] [git commit] package/python-pymodbus: drop python2 support Message-ID: <20220209212601.174DD8323E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6cf1e50c952486e175abdbb8ce909fa8087eabb3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-pymodbus/python-pymodbus.mk | 9 --------- 1 file changed, 9 deletions(-) diff --git a/package/python-pymodbus/python-pymodbus.mk b/package/python-pymodbus/python-pymodbus.mk index 9135a4d0c4..d96e21a55c 100644 --- a/package/python-pymodbus/python-pymodbus.mk +++ b/package/python-pymodbus/python-pymodbus.mk @@ -11,13 +11,4 @@ PYTHON_PYMODBUS_SETUP_TYPE = setuptools PYTHON_PYMODBUS_LICENSE = BSD-3-Clause PYTHON_PYMODBUS_LICENSE_FILES = doc/LICENSE -ifeq ($(BR2_PACKAGE_PYTHON),y) -# only needed/valid for python 3.x -define PYTHON_PYMODBUS_RM_PY3_FILES - rm -rf $(TARGET_DIR)/usr/lib/python*/site-packages/pymodbus/client/asynchronous/asyncio -endef - -PYTHON_PYMODBUS_POST_INSTALL_TARGET_HOOKS += PYTHON_PYMODBUS_RM_PY3_FILES -endif - $(eval $(python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:08:05 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:08:05 +0100 Subject: [Buildroot] [git commit] package/gpsd: drop python2 support Message-ID: <20220209212559.BB9658323E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e643be1bfc3dccd82e0940d61c5f6954f4033a21 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/gpsd/Config.in | 4 ++-- package/gpsd/gpsd.mk | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/package/gpsd/Config.in b/package/gpsd/Config.in index 1da9a5ce2a..b66d0952dd 100644 --- a/package/gpsd/Config.in +++ b/package/gpsd/Config.in @@ -81,8 +81,8 @@ config BR2_PACKAGE_GPSD_SQUELCH config BR2_PACKAGE_GPSD_PYTHON bool "build Python support and modules" - depends on BR2_USE_WCHAR # python - select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON + depends on BR2_USE_WCHAR # python3 + select BR2_PACKAGE_PYTHON3 help Python libraries and tools for the gpsd service daemon including gpsfake test harness. diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk index 636c6c95ba..4388b7e24d 100644 --- a/package/gpsd/gpsd.mk +++ b/package/gpsd/gpsd.mk @@ -194,10 +194,6 @@ ifeq ($(BR2_PACKAGE_PYTHON3),y) GPSD_SCONS_OPTS += \ python=yes \ python_libdir="/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages" -else ifeq ($(BR2_PACKAGE_PYTHON),y) -GPSD_SCONS_OPTS += \ - python=yes \ - python_libdir="/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages" else GPSD_SCONS_OPTS += python=no endif From yann.morin.1998 at free.fr Wed Feb 9 21:08:17 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:08:17 +0100 Subject: [Buildroot] [git commit] package/kmod: drop python2 support Message-ID: <20220209212559.E67A18323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7f0c0f3bc2431a38d38de22e922c5c55a9773fce branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/kmod/kmod.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk index c7f510ec0f..82e8597759 100644 --- a/package/kmod/kmod.mk +++ b/package/kmod/kmod.mk @@ -62,8 +62,8 @@ else KMOD_CONF_OPTS += --without-openssl endif -ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) -KMOD_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,python3) +ifeq ($(BR2_PACKAGE_PYTHON3),y) +KMOD_DEPENDENCIES += python3 KMOD_CONF_OPTS += --enable-python endif From yann.morin.1998 at free.fr Wed Feb 9 21:09:42 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:09:42 +0100 Subject: [Buildroot] [git commit] package/python-reentry: drop python2 support Message-ID: <20220209212601.4F2BA8323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8bdfa708578d72c05797f34ea96e81f4abce83a9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-reentry/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/python-reentry/Config.in b/package/python-reentry/Config.in index 8ebbe395c8..07d8988a18 100644 --- a/package/python-reentry/Config.in +++ b/package/python-reentry/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_PYTHON_REENTRY select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime select BR2_PACKAGE_PYTHON_CLICK # runtime select BR2_PACKAGE_PYTHON_SIX # runtime - select BR2_PACKAGE_PYTHON_PATHLIB2 if BR2_PACKAGE_PYTHON # runtime help A plugin manager based on setuptools entry points mechanism. From yann.morin.1998 at free.fr Wed Feb 9 21:09:49 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:09:49 +0100 Subject: [Buildroot] [git commit] package/python-sentry-sdk: drop python2 support Message-ID: <20220209212601.68C598323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0cdc510d7b62562ae1e9018cec26a50f4b33dba6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-sentry-sdk/python-sentry-sdk.mk | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/package/python-sentry-sdk/python-sentry-sdk.mk b/package/python-sentry-sdk/python-sentry-sdk.mk index 556f03e137..9238b7fb1c 100644 --- a/package/python-sentry-sdk/python-sentry-sdk.mk +++ b/package/python-sentry-sdk/python-sentry-sdk.mk @@ -11,14 +11,4 @@ PYTHON_SENTRY_SDK_SETUP_TYPE = setuptools PYTHON_SENTRY_SDK_LICENSE = BSD-2-Clause PYTHON_SENTRY_SDK_LICENSE_FILES = LICENSE -ifeq ($(BR2_PACKAGE_PYTHON),y) -# only needed/valid for python 3.x -define PYTHON_SENTRY_SDK_RM_PY3_FILES - rm -f $(addprefix $(TARGET_DIR)/usr/lib/python*/site-packages/sentry_sdk/integrations/,\ - aiohttp.py asgi.py django/asgi.py httpx.py sanic.py tornado.py) -endef - -PYTHON_SENTRY_SDK_POST_INSTALL_TARGET_HOOKS += PYTHON_SENTRY_SDK_RM_PY3_FILES -endif - $(eval $(python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:08:22 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:08:22 +0100 Subject: [Buildroot] [git commit] package/libevent: drop python2 support Message-ID: <20220209212600.01E5981335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=538dc7f0270485675d8d88d0a7be3ab21901f0b0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/libevent/libevent.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libevent/libevent.mk b/package/libevent/libevent.mk index 93ba88ca88..4c23156f72 100644 --- a/package/libevent/libevent.mk +++ b/package/libevent/libevent.mk @@ -25,7 +25,7 @@ endef # libevent installs a python script to target - get rid of it if we # don't have python support enabled -ifneq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) +ifneq ($(BR2_PACKAGE_PYTHON3),y) LIBEVENT_POST_INSTALL_TARGET_HOOKS += LIBEVENT_REMOVE_PYSCRIPT endif From yann.morin.1998 at free.fr Wed Feb 9 21:09:52 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:09:52 +0100 Subject: [Buildroot] [git commit] package/python-setuptools: drop python2 support Message-ID: <20220209212601.7147B8323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d83f1f933f45ad5824c594aa939c2772cdb184eb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For the target. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-setuptools/Config.in | 6 ++---- package/python-setuptools/python-setuptools.mk | 16 ---------------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/package/python-setuptools/Config.in b/package/python-setuptools/Config.in index f203d0f814..28228534f8 100644 --- a/package/python-setuptools/Config.in +++ b/package/python-setuptools/Config.in @@ -1,9 +1,7 @@ config BR2_PACKAGE_PYTHON_SETUPTOOLS bool "python-setuptools" - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_ZLIB # runtime + select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime help Download, build, install, upgrade, and uninstall Python packages. diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk index 8bca852fe2..04b872fb79 100644 --- a/package/python-setuptools/python-setuptools.mk +++ b/package/python-setuptools/python-setuptools.mk @@ -4,19 +4,11 @@ # ################################################################################ -# For the target variant, we adapt the version depending on whether -# Python 3.x or 2.x is selected for the target. -ifeq ($(BR2_PACKAGE_PYTHON3),y) # Please keep in sync with # package/python3-setuptools/python3-setuptools.mk PYTHON_SETUPTOOLS_VERSION = 60.7.0 PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON3_SETUPTOOLS_VERSION).tar.gz PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/29/dd/48d662bb93e5e51e72265ef612f869947d4ae4126328d7156824cd50d440 -else # Python -PYTHON_SETUPTOOLS_VERSION = 44.0.0 -PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).zip -PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/b0/f3/44da7482ac6da3f36f68e253cb04de37365b3dba9036a3c70773b778b485 -endif # The host variant is only for Python 2.x, so we need to use 44.0.0. HOST_PYTHON_SETUPTOOLS_VERSION = 44.0.0 @@ -30,14 +22,6 @@ PYTHON_SETUPTOOLS_CPE_ID_VENDOR = python PYTHON_SETUPTOOLS_CPE_ID_PRODUCT = setuptools PYTHON_SETUPTOOLS_SETUP_TYPE = setuptools -ifeq ($(BR2_PACKAGE_PYTHON),y) -define PYTHON_SETUPTOOLS_EXTRACT_CMDS - $(UNZIP) -d $(@D) $(PYTHON_SETUPTOOLS_DL_DIR)/$(PYTHON_SETUPTOOLS_SOURCE) - mv $(@D)/setuptools-$(PYTHON_SETUPTOOLS_VERSION)/* $(@D) - $(RM) -r $(@D)/setuptools-$(PYTHON_SETUPTOOLS_VERSION) -endef -endif - define HOST_PYTHON_SETUPTOOLS_EXTRACT_CMDS $(UNZIP) -d $(@D) $(HOST_PYTHON_SETUPTOOLS_DL_DIR)/$(HOST_PYTHON_SETUPTOOLS_SOURCE) mv $(@D)/setuptools-$(HOST_PYTHON_SETUPTOOLS_VERSION)/* $(@D) From yann.morin.1998 at free.fr Wed Feb 9 21:08:29 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:08:29 +0100 Subject: [Buildroot] [git commit] package/libpwquality: drop python2 support Message-ID: <20220209212600.1A1B181335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fe70e4987e6fbcb986b28790c9311d1f3b56f8d1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/libpwquality/libpwquality.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libpwquality/libpwquality.mk b/package/libpwquality/libpwquality.mk index 54a03be453..d4f7a47120 100644 --- a/package/libpwquality/libpwquality.mk +++ b/package/libpwquality/libpwquality.mk @@ -12,9 +12,9 @@ LIBPWQUALITY_INSTALL_STAGING = YES LIBPWQUALITY_DEPENDENCIES = cracklib LIBPWQUALITY_LICENSE_FILES = COPYING -ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) LIBPWQUALITY_CONF_OPTS += --enable-python-bindings -LIBPWQUALITY_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON3),python3,python) +LIBPWQUALITY_DEPENDENCIES += python3 LIBPWQUALITY_MAKE_ENV += $(PKG_PYTHON_DISTUTILS_ENV) else LIBPWQUALITY_CONF_OPTS += --disable-python-bindings From yann.morin.1998 at free.fr Wed Feb 9 21:09:58 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:09:58 +0100 Subject: [Buildroot] [git commit] package/python-typing-extensions: drop python2 support Message-ID: <20220209212601.8B0EB8323E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=26ddbe11ab24a0dd33d920c088393728d5821030 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-typing-extensions/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/python-typing-extensions/Config.in b/package/python-typing-extensions/Config.in index 0c7c74c5fa..b59693282f 100644 --- a/package/python-typing-extensions/Config.in +++ b/package/python-typing-extensions/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS bool "python-typing-extensions" - select BR2_PACKAGE_PYTHON_TYPING if BR2_PACKAGE_PYTHON # runtime help Backported and Experimental Type Hints for Python 3.5+. From yann.morin.1998 at free.fr Wed Feb 9 21:08:31 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:08:31 +0100 Subject: [Buildroot] [git commit] package/libsigrokdecode: drop reference to python2 Message-ID: <20220209212600.2304D81335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ae86cd8dba6579443559a03058bf02e08a8fae38 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/libsigrokdecode/Config.in | 6 ------ 1 file changed, 6 deletions(-) diff --git a/package/libsigrokdecode/Config.in b/package/libsigrokdecode/Config.in index 28cbb5ca5e..b58c8a2a29 100644 --- a/package/libsigrokdecode/Config.in +++ b/package/libsigrokdecode/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_LIBSIGROKDECODE bool "libsigrokdecode" - depends on !BR2_PACKAGE_PYTHON # python3 depends on BR2_USE_WCHAR # libglib2/python3 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2/python3 depends on BR2_USE_MMU # libglib2/python3 @@ -19,9 +18,4 @@ config BR2_PACKAGE_LIBSIGROKDECODE comment "libsigrokdecode needs a toolchain w/ wchar, threads, dynamic library" depends on BR2_USE_MMU - depends on !BR2_PACKAGE_PYTHON depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS - -comment "libsigrokdecode is not compatible with python" - depends on BR2_USE_MMU - depends on BR2_PACKAGE_PYTHON From yann.morin.1998 at free.fr Wed Feb 9 21:10:08 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:10:08 +0100 Subject: [Buildroot] [git commit] package/python-websocket-client: drop python2 support Message-ID: <20220209212601.AD1EC8323E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=30cb3dfab2ffe0c69b95b0f29363613b38d1ba52 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-websocket-client/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-websocket-client/Config.in b/package/python-websocket-client/Config.in index 0fbb15b328..519e506615 100644 --- a/package/python-websocket-client/Config.in +++ b/package/python-websocket-client/Config.in @@ -1,8 +1,7 @@ config BR2_PACKAGE_PYTHON_WEBSOCKET_CLIENT bool "python-websocket-client" select BR2_PACKAGE_PYTHON_SIX # runtime - select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_SSL # runtime help WebSocket client for python. hybi13 is supported. From yann.morin.1998 at free.fr Wed Feb 9 21:08:40 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:08:40 +0100 Subject: [Buildroot] [git commit] package/nftables: drop python2 support Message-ID: <20220209212600.458A981335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e45321b19cd193ba333012cfc56439650a8907e3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/nftables/nftables.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/nftables/nftables.mk b/package/nftables/nftables.mk index d5c16ac2be..232d541488 100644 --- a/package/nftables/nftables.mk +++ b/package/nftables/nftables.mk @@ -35,9 +35,9 @@ else NFTABLES_CONF_OPTS += --without-json endif -ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) NFTABLES_CONF_OPTS += --enable-python -NFTABLES_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,python3) +NFTABLES_DEPENDENCIES += python3 else NFTABLES_CONF_OPTS += --disable-python endif From yann.morin.1998 at free.fr Wed Feb 9 21:10:14 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:10:14 +0100 Subject: [Buildroot] [git commit] package/python-xlrd: drop python2 support Message-ID: <20220209212601.C5B3B8323E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a7590ba6300a86206defe86646cafe5730cc5391 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-xlrd/Config.in | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package/python-xlrd/Config.in b/package/python-xlrd/Config.in index 40920f7b02..264ee93e78 100644 --- a/package/python-xlrd/Config.in +++ b/package/python-xlrd/Config.in @@ -1,9 +1,7 @@ config BR2_PACKAGE_PYTHON_XLRD bool "python-xlrd" - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_PYEXPAT + select BR2_PACKAGE_PYTHON3_ZLIB help Library for developers to extract data from Microsoft Excel(tm) spreadsheet files. From yann.morin.1998 at free.fr Wed Feb 9 21:08:38 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:08:38 +0100 Subject: [Buildroot] [git commit] package/networkd-dispatcher: drop reference to python2 Message-ID: <20220209212600.3D34981335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=02a067680373b8e1073e64a5bed99a3c0a62b8b2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/networkd-dispatcher/Config.in | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/networkd-dispatcher/Config.in b/package/networkd-dispatcher/Config.in index ab8c473951..54b48e4ca8 100644 --- a/package/networkd-dispatcher/Config.in +++ b/package/networkd-dispatcher/Config.in @@ -4,7 +4,6 @@ config BR2_PACKAGE_NETWORKD_DISPATCHER 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 @@ -23,7 +22,6 @@ config BR2_PACKAGE_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 From yann.morin.1998 at free.fr Wed Feb 9 21:10:17 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:10:17 +0100 Subject: [Buildroot] [git commit] package/python-xmltodict: drop python2 support Message-ID: <20220209212601.CDC608323E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5fbafe603554c741d54792f87e60f2aa943b5a6c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-xmltodict/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-xmltodict/Config.in b/package/python-xmltodict/Config.in index cb12392c93..af2bbbf489 100644 --- a/package/python-xmltodict/Config.in +++ b/package/python-xmltodict/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_XMLTODICT bool "python-xmltodict" - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime help Makes working with XML feel like you are working with JSON. From yann.morin.1998 at free.fr Wed Feb 9 21:08:49 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:08:49 +0100 Subject: [Buildroot] [git commit] package/python-aenum: drop python2 support Message-ID: <20220209212600.677A181335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8c08ac2eb33a738456eb268b83dffd2027405ae8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-aenum/python-aenum.mk | 9 --------- 1 file changed, 9 deletions(-) diff --git a/package/python-aenum/python-aenum.mk b/package/python-aenum/python-aenum.mk index 98695d99ce..72eaa1db2b 100644 --- a/package/python-aenum/python-aenum.mk +++ b/package/python-aenum/python-aenum.mk @@ -11,13 +11,4 @@ PYTHON_AENUM_SETUP_TYPE = setuptools PYTHON_AENUM_LICENSE = BSD-3-Clause PYTHON_AENUM_LICENSE_FILES = aenum/LICENSE -ifeq ($(BR2_PACKAGE_PYTHON),y) -# only needed/valid for python 3.x -define PYTHON_AENUM_RM_PY3_FILE - rm -f $(TARGET_DIR)/usr/lib/python*/site-packages/aenum/test_v3.py -endef - -PYTHON_AENUM_POST_INSTALL_TARGET_HOOKS += PYTHON_AENUM_RM_PY3_FILE -endif - $(eval $(python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:10:21 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:10:21 +0100 Subject: [Buildroot] [git commit] package/ranger: drop python2 support Message-ID: <20220209212601.E23BA81335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f26bd4e9196a1d242a0a98207e2911c50c4f878f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/ranger/Config.in | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package/ranger/Config.in b/package/ranger/Config.in index ee0ffecd13..a379002f95 100644 --- a/package/ranger/Config.in +++ b/package/ranger/Config.in @@ -4,9 +4,8 @@ config BR2_PACKAGE_RANGER depends on BR2_USE_WCHAR # python3 depends on BR2_TOOLCHAIN_HAS_THREADS # python3 depends on !BR2_STATIC_LIBS # python3 - select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON_CURSES if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_CURSES if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_CURSES help ranger is a console file manager with VI key bindings. It provides a minimalistic and nice curses interface with a From yann.morin.1998 at free.fr Wed Feb 9 21:08:59 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:08:59 +0100 Subject: [Buildroot] [git commit] package/python-couchdb: drop python2 support Message-ID: <20220209212600.8EE9481335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a10ad866364b4474f25233bac13676bc53d6cf0f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-couchdb/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-couchdb/Config.in b/package/python-couchdb/Config.in index 9156883b38..5bff75750b 100644 --- a/package/python-couchdb/Config.in +++ b/package/python-couchdb/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_COUCHDB bool "python-couchdb" - select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_SSL # runtime help Python client library for working with CouchDB. From yann.morin.1998 at free.fr Wed Feb 9 21:10:24 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:10:24 +0100 Subject: [Buildroot] [git commit] package/selinux-python: drop reference to python2 Message-ID: <20220209212601.E9C298323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=96cda325b1c9873bec520752507841318fd1f78c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/selinux-python/Config.in | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/selinux-python/Config.in b/package/selinux-python/Config.in index 6a518f97d4..ad50cc0735 100644 --- a/package/selinux-python/Config.in +++ b/package/selinux-python/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_SELINUX_PYTHON bool "selinux-python" - depends on !BR2_PACKAGE_PYTHON depends on BR2_USE_MMU depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS @@ -46,10 +45,6 @@ comment "sepolgen needs a toolchain w/ gcc 5" endif -comment "selinux-python needs python3" - depends on BR2_USE_MMU - depends on BR2_PACKAGE_PYTHON - comment "selinux-python packages needs a toolchain w/ wchar, threads, dynamic library" depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ From yann.morin.1998 at free.fr Wed Feb 9 21:08:52 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:08:52 +0100 Subject: [Buildroot] [git commit] package/python-argon2-cffi: drop python2 support Message-ID: <20220209212600.6F5BF81335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f11a922b3b90e11bb85f9d4c211b487188389790 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-argon2-cffi/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/python-argon2-cffi/Config.in b/package/python-argon2-cffi/Config.in index 16bbe6c4e3..5cddb3314e 100644 --- a/package/python-argon2-cffi/Config.in +++ b/package/python-argon2-cffi/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_PYTHON_ARGON2_CFFI depends on BR2_USE_MMU # libargon2 depends on !BR2_STATIC_LIBS # libargon2 select BR2_PACKAGE_PYTHON_CFFI # runtime - select BR2_PACKAGE_PYTHON_ENUM34 if BR2_PACKAGE_PYTHON # runtime select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_LIBARGON2 help From yann.morin.1998 at free.fr Wed Feb 9 21:10:37 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:10:37 +0100 Subject: [Buildroot] [git commit] package/trace-cmd: drop python2 support Message-ID: <20220209212602.284A88323E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8d6b607962404e343910b2222ad78553d5485c0e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/trace-cmd/trace-cmd.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/package/trace-cmd/trace-cmd.mk b/package/trace-cmd/trace-cmd.mk index d9ed417f20..fe0cd71ec4 100644 --- a/package/trace-cmd/trace-cmd.mk +++ b/package/trace-cmd/trace-cmd.mk @@ -18,10 +18,7 @@ ifeq ($(BR2_PACKAGE_AUDIT),y) TRACE_CMD_DEPENDENCIES += audit endif -ifeq ($(BR2_PACKAGE_PYTHON),y) -TRACE_CMD_DEPENDENCIES += python host-swig -TRACE_CMD_MAKE_OPTS += PYTHON_VERS=python -else ifeq ($(BR2_PACKAGE_PYTHON3),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) TRACE_CMD_DEPENDENCIES += python3 host-swig TRACE_CMD_MAKE_OPTS += PYTHON_VERS=python3 else From yann.morin.1998 at free.fr Wed Feb 9 21:08:42 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:08:42 +0100 Subject: [Buildroot] [git commit] package/ogre: drop python2 support Message-ID: <20220209212600.4D84E81335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2d7b5748bd5ef76d1229f7ac0149bf2934a60a86 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/ogre/ogre.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package/ogre/ogre.mk b/package/ogre/ogre.mk index 72fd616c0c..3fd2fc4650 100644 --- a/package/ogre/ogre.mk +++ b/package/ogre/ogre.mk @@ -42,9 +42,8 @@ OGRE_CONF_OPTS = -DOGRE_BUILD_DEPENDENCIES=OFF \ -DCMAKE_CXX_FLAGS="$(OGRE_CXXFLAGS)" # Enable optional python component if python interpreter is present on the target. -ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) -OGRE_DEPENDENCIES += host-swig \ - $(if $(BR2_PACKAGE_PYTHON3),host-python3,host-python) +ifeq ($(BR2_PACKAGE_PYTHON3),y) +OGRE_DEPENDENCIES += host-swig host-python3 OGRE_CONF_OPTS += -DOGRE_BUILD_COMPONENT_PYTHON=ON else OGRE_CONF_OPTS += -DOGRE_BUILD_COMPONENT_PYTHON=OFF From yann.morin.1998 at free.fr Wed Feb 9 21:13:36 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:13:36 +0100 Subject: [Buildroot] [git commit] package/python-mad: drop python2 specific package Message-ID: <20220209212602.A79418323E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=82e096a23e67961feef3e41a326aefe34cc974b8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Config.in.legacy | 6 ++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/python-mad/Config.in | 9 --------- package/python-mad/python-mad.hash | 3 --- package/python-mad/python-mad.mk | 29 ----------------------------- 6 files changed, 6 insertions(+), 43 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 14b26408fe..f6607deeeb 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_MAD + bool "python-mad removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_IPADDRESS bool "python-ipaddress removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index dbed9df4b5..9fb51b4481 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2804,7 +2804,6 @@ F: package/python3/ F: package/python-augeas/ F: package/python-flask-expects-json/ F: package/python-git/ -F: package/python-mad/ F: package/python-serial/ F: package/python-unittest-xml-reporting/ F: package/qextserialport/ diff --git a/package/Config.in b/package/Config.in index 50c0e13510..d5c46ef997 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1086,7 +1086,6 @@ menu "External python modules" source "package/python-lxml/Config.in" source "package/python-m2crypto/Config.in" source "package/python-m2r/Config.in" - source "package/python-mad/Config.in" source "package/python-mako/Config.in" source "package/python-markdown/Config.in" source "package/python-markdown2/Config.in" diff --git a/package/python-mad/Config.in b/package/python-mad/Config.in deleted file mode 100644 index 25354213d6..0000000000 --- a/package/python-mad/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PYTHON_MAD - bool "python-mad" - depends on BR2_PACKAGE_PYTHON - select BR2_PACKAGE_LIBMAD - help - python-mad is a Python binding for the MAD library, a - high-quality integer-only MPEG decoder. - - http://spacepants.org/src/pymad/ diff --git a/package/python-mad/python-mad.hash b/package/python-mad/python-mad.hash deleted file mode 100644 index 7b19ae5a44..0000000000 --- a/package/python-mad/python-mad.hash +++ /dev/null @@ -1,3 +0,0 @@ -# locally computed -sha256 1c9fc529b78de7d26e9e47cf182c9f8bf43838d8f62a9c1773540d57f5ebc522 pymad-0.6.tar.gz -sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING diff --git a/package/python-mad/python-mad.mk b/package/python-mad/python-mad.mk deleted file mode 100644 index a22214876f..0000000000 --- a/package/python-mad/python-mad.mk +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# -# python-mad -# -################################################################################ - -PYTHON_MAD_VERSION = 0.6 -PYTHON_MAD_SOURCE = pymad-$(PYTHON_MAD_VERSION).tar.gz -PYTHON_MAD_SITE = http://spacepants.org/src/pymad/download -PYTHON_MAD_SETUP_TYPE = distutils -PYTHON_MAD_LICENSE = GPL-2.0+ -PYTHON_MAD_LICENSE_FILES = COPYING - -PYTHON_MAD_DEPENDENCIES = libmad - -ifeq ($(BR2_ENDIAN),"LITTLE") -PYTHON_MAD_ENDIAN = little -else -PYTHON_MAD_ENDIAN = big -endif - -define PYTHON_MAD_CONFIGURE_CMDS - echo "endian = $(PYTHON_MAD_ENDIAN)" > $(@D)/Setup - echo "mad_libs = mad" >> $(@D)/Setup - echo "mad_lib_dir = $(STAGING_DIR)/usr/lib" >> $(@D)/Setup - echo "mad_include_dir = $(STAGING_DIR)/usr/include" >> $(@D)/Setup -endef - -$(eval $(python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:08:54 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:08:54 +0100 Subject: [Buildroot] [git commit] package/python-bsdiff4: drop python2 support Message-ID: <20220209212600.7AFCC8323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f84db1ef5537e27afffce2df9ec60702c013a6e3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-bsdiff4/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-bsdiff4/Config.in b/package/python-bsdiff4/Config.in index a383cda0f5..32070fb9a8 100644 --- a/package/python-bsdiff4/Config.in +++ b/package/python-bsdiff4/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_BSDIFF4 bool "python-bsdiff4" - select BR2_PACKAGE_PYTHON_BZIP2 if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_BZIP2 if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_BZIP2 # runtime help binary diff and patch using the BSDIFF4-format. From yann.morin.1998 at free.fr Wed Feb 9 21:09:05 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:09:05 +0100 Subject: [Buildroot] [git commit] package/python-esptool: drop python2 support Message-ID: <20220209212600.AB68780196@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9dc598a7e6f56b46cf3f6c16d13286bf82aab870 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-esptool/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-esptool/Config.in b/package/python-esptool/Config.in index 570f9aa42f..b21ccd72d5 100644 --- a/package/python-esptool/Config.in +++ b/package/python-esptool/Config.in @@ -3,8 +3,7 @@ config BR2_PACKAGE_PYTHON_ESPTOOL select BR2_PACKAGE_PYTHON_ECDSA # runtime select BR2_PACKAGE_PYTHON_PYAES # runtime select BR2_PACKAGE_PYTHON_SERIAL # runtime - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_ZLIB help A serial utility to communicate & flash code to Espressif ESP8266 & ESP32 chips. From yann.morin.1998 at free.fr Wed Feb 9 21:09:19 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:09:19 +0100 Subject: [Buildroot] [git commit] package/python-lxml: drop python2 support Message-ID: <20220209212600.E281880196@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=36ff042eab959a3113a76f72923a3a1544a1e0c3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-lxml/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-lxml/Config.in b/package/python-lxml/Config.in index fcb30d56ee..3f3cb5c550 100644 --- a/package/python-lxml/Config.in +++ b/package/python-lxml/Config.in @@ -2,8 +2,7 @@ config BR2_PACKAGE_PYTHON_LXML bool "python-lxml" select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_LIBXSLT - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_ZLIB help The lxml XML toolkit is a Pythonic binding for the C libraries libxml2 and libxslt. From yann.morin.1998 at free.fr Wed Feb 9 21:09:22 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:09:22 +0100 Subject: [Buildroot] [git commit] package/python-m2crypto: drop python2 support Message-ID: <20220209212600.F048D8323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=445726415ad7d44dbdd326facc86865f245b1c17 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-m2crypto/Config.in | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/package/python-m2crypto/Config.in b/package/python-m2crypto/Config.in index 7481d49e5c..af710d5351 100644 --- a/package/python-m2crypto/Config.in +++ b/package/python-m2crypto/Config.in @@ -1,11 +1,8 @@ config BR2_PACKAGE_PYTHON_M2CRYPTO bool "python-m2crypto" select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime - select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 # runtime - select BR2_PACKAGE_PYTHON_TYPING if BR2_PACKAGE_PYTHON # runtime + select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime + select BR2_PACKAGE_PYTHON3_SSL # runtime help M2Crypto: A Python crypto and SSL toolkit. From yann.morin.1998 at free.fr Wed Feb 9 21:09:17 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:09:17 +0100 Subject: [Buildroot] [git commit] package/python-logbook: drop python2 support Message-ID: <20220209212600.D926A80196@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=44198eee393fa90a8f24867ed7813d658410e897 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-logbook/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-logbook/Config.in b/package/python-logbook/Config.in index d4fbf0fe67..99996b6517 100644 --- a/package/python-logbook/Config.in +++ b/package/python-logbook/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_LOGBOOK bool "python-logbook" - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_ZLIB help A logging replacement for Python. From yann.morin.1998 at free.fr Wed Feb 9 21:09:31 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:09:31 +0100 Subject: [Buildroot] [git commit] package/python-pyqrcode: drop python2 support Message-ID: <20220209212601.2420181335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9dc8526170bdf308c353eaa7d67cc7f31b8ad555 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-pyqrcode/Config.in | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package/python-pyqrcode/Config.in b/package/python-pyqrcode/Config.in index 01b7ae8132..d07ab4965a 100644 --- a/package/python-pyqrcode/Config.in +++ b/package/python-pyqrcode/Config.in @@ -1,9 +1,7 @@ config BR2_PACKAGE_PYTHON_PYQRCODE bool "python-pyqrcode" - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime - select BR2_PACKAGE_PYTHON_CODECSCJK if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_CODECSCJK if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime + select BR2_PACKAGE_PYTHON3_CODECSCJK # runtime help A QR code generator written purely in Python with SVG, EPS, PNG and terminal output. From yann.morin.1998 at free.fr Wed Feb 9 21:09:26 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:09:26 +0100 Subject: [Buildroot] [git commit] package/python-pickleshare: drop python2 support Message-ID: <20220209212601.0E0AC81335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7affa6a59b0b7834cebff4079983603ff134f4c3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-pickleshare/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/python-pickleshare/Config.in b/package/python-pickleshare/Config.in index 35a26637a5..18391b7ce8 100644 --- a/package/python-pickleshare/Config.in +++ b/package/python-pickleshare/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PICKLESHARE bool "python-pickleshare" - select BR2_PACKAGE_PYTHON_PATHLIB2 if BR2_PACKAGE_PYTHON # runtime help Tiny 'shelve'-like database with concurrency support From yann.morin.1998 at free.fr Wed Feb 9 21:09:08 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:09:08 +0100 Subject: [Buildroot] [git commit] package/python-fire: drop python2 support Message-ID: <20220209212600.B43D48323E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=87a84dfc6c7b3081d18807cfdddc3fc9a5fec3f1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-fire/Config.in | 1 - package/python-fire/python-fire.mk | 9 --------- 2 files changed, 10 deletions(-) diff --git a/package/python-fire/Config.in b/package/python-fire/Config.in index b718ddac5e..9c816b0fd0 100644 --- a/package/python-fire/Config.in +++ b/package/python-fire/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_PYTHON_FIRE bool "python-fire" select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_TERMCOLOR # runtime - select BR2_PACKAGE_PYTHON_ENUM34 if BR2_PACKAGE_PYTHON # runtime help A library for automatically generating command line interfaces. diff --git a/package/python-fire/python-fire.mk b/package/python-fire/python-fire.mk index 7ba971abc4..40631fce86 100644 --- a/package/python-fire/python-fire.mk +++ b/package/python-fire/python-fire.mk @@ -11,13 +11,4 @@ PYTHON_FIRE_SETUP_TYPE = setuptools PYTHON_FIRE_LICENSE = Apache-2.0 PYTHON_FIRE_LICENSE_FILES = LICENSE -ifeq ($(BR2_PACKAGE_PYTHON),y) -# only needed/valid for python 3.x -define PYTHON_FIRE_RM_PY3_FILE - rm -f $(TARGET_DIR)/usr/lib/python*/site-packages/fire/test_components_py3.py -endef - -PYTHON_FIRE_POST_INSTALL_TARGET_HOOKS += PYTHON_FIRE_RM_PY3_FILE -endif - $(eval $(python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:09:33 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:09:33 +0100 Subject: [Buildroot] [git commit] package/python-pyqt5: drop python2 support Message-ID: <20220209212601.2D5F18323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7e346f494c1507648f60c0e0174f06bd35ca84e3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-pyqt5/python-pyqt5.mk | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/package/python-pyqt5/python-pyqt5.mk b/package/python-pyqt5/python-pyqt5.mk index b05043563e..af32f63796 100644 --- a/package/python-pyqt5/python-pyqt5.mk +++ b/package/python-pyqt5/python-pyqt5.mk @@ -19,14 +19,6 @@ PYTHON_PYQT5_MODULES = \ $(if $(BR2_PACKAGE_QT5BASE_PRINTSUPPORT),QtPrintSupport) \ $(if $(BR2_PACKAGE_QT5BASE_XML),QtXml) -ifeq ($(BR2_PACKAGE_PYTHON),y) -PYTHON_PYQT5_PYTHON_DIR = python$(PYTHON_VERSION_MAJOR) -PYTHON_PYQT5_RM_PORT_BASE = port_v3 -else ifeq ($(BR2_PACKAGE_PYTHON3),y) -PYTHON_PYQT5_PYTHON_DIR = python$(PYTHON3_VERSION_MAJOR) -PYTHON_PYQT5_RM_PORT_BASE = port_v2 -endif - ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS),y) PYTHON_PYQT5_MODULES += QtWidgets @@ -159,7 +151,7 @@ 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 \ + --destdir $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ --qmake $(HOST_DIR)/bin/qmake \ --sysroot $(STAGING_DIR)/usr \ -w --confirm-license \ @@ -186,8 +178,8 @@ endef # __init__.pyc is needed if BR2_PACKAGE_PYTHON_PYC_ONLY is set define PYTHON_PYQT5_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) install - touch $(TARGET_DIR)/usr/lib/$(PYTHON_PYQT5_PYTHON_DIR)/site-packages/PyQt5/__init__.py - $(RM) -rf $(TARGET_DIR)/usr/lib/$(PYTHON_PYQT5_PYTHON_DIR)/site-packages/PyQt5/uic/$(PYTHON_PYQT5_RM_PORT_BASE) + touch $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/PyQt5/__init__.py + $(RM) -rf $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/PyQt5/uic/port_v2 endef $(eval $(generic-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:09:38 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:09:38 +0100 Subject: [Buildroot] [git commit] package/python-pyudev: drop python2 support Message-ID: <20220209212601.3E6A781335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3aa1a0dfd0eee8c356eaba8bca51881eec219fa0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-pyudev/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-pyudev/Config.in b/package/python-pyudev/Config.in index fb853956e8..e0da067cc2 100644 --- a/package/python-pyudev/Config.in +++ b/package/python-pyudev/Config.in @@ -1,8 +1,7 @@ config BR2_PACKAGE_PYTHON_PYUDEV bool "python-pyudev" depends on BR2_PACKAGE_HAS_UDEV - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_ZLIB # runtime select BR2_PACKAGE_PYTHON_SIX # runtime help pyudev is a LGPL licenced, pure Python 2/3 binding to From yann.morin.1998 at free.fr Wed Feb 9 21:09:47 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:09:47 +0100 Subject: [Buildroot] [git commit] package/python-scapy: drop python2 support Message-ID: <20220209212601.6038F81335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=47e031b9b68bf6a8143dfbd1b0c2953eaecf2a95 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-scapy/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-scapy/Config.in b/package/python-scapy/Config.in index 6575a33af3..517fb51714 100644 --- a/package/python-scapy/Config.in +++ b/package/python-scapy/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_SCAPY bool "python-scapy" - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_ZLIB help Scapy: interactive packet manipulation tool. From yann.morin.1998 at free.fr Wed Feb 9 21:09:45 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:09:45 +0100 Subject: [Buildroot] [git commit] package/python-remi: drop python2 support Message-ID: <20220209212601.576838323E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0d01e5eb3d4bc834c16b34e2419648bda1b53c47 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-remi/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-remi/Config.in b/package/python-remi/Config.in index e0c5e9bfe1..da2c2f4cfb 100644 --- a/package/python-remi/Config.in +++ b/package/python-remi/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_REMI bool "python-remi" - select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_SSL # runtime select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime help Remi is a GUI library for Python applications which transpiles From yann.morin.1998 at free.fr Wed Feb 9 21:09:40 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:09:40 +0100 Subject: [Buildroot] [git commit] package/python-raven: drop python2 support Message-ID: <20220209212601.46C5D83245@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d3d2aff4a56317dbda466374c0919ad1936342ff branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-raven/Config.in | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/package/python-raven/Config.in b/package/python-raven/Config.in index 0d4b26c054..d02232cfd8 100644 --- a/package/python-raven/Config.in +++ b/package/python-raven/Config.in @@ -1,11 +1,8 @@ config BR2_PACKAGE_PYTHON_RAVEN bool "python-raven" - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 - select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 - select BR2_PACKAGE_PYTHON_UNICODEDATA if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_UNICODEDATA if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_ZLIB + select BR2_PACKAGE_PYTHON3_SSL + select BR2_PACKAGE_PYTHON3_UNICODEDATA help Raven is a client for Sentry (https://getsentry.com). From yann.morin.1998 at free.fr Wed Feb 9 21:09:54 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:09:54 +0100 Subject: [Buildroot] [git commit] package/python-sip: drop python2 support Message-ID: <20220209212601.7A6A281335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=67a90aa2065ad87605e5c37a8f206ed4b6f52fdd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-sip/python-sip.mk | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/package/python-sip/python-sip.mk b/package/python-sip/python-sip.mk index 1d6c205396..01ccb1ddd5 100644 --- a/package/python-sip/python-sip.mk +++ b/package/python-sip/python-sip.mk @@ -10,19 +10,8 @@ PYTHON_SIP_SITE = http://downloads.sourceforge.net/project/pyqt/sip/sip-$(PYTHON PYTHON_SIP_LICENSE = SIP license or GPL-2.0 or GPL-3.0 PYTHON_SIP_LICENSE_FILES = LICENSE LICENSE-GPL2 LICENSE-GPL3 -PYTHON_SIP_DEPENDENCIES = qt5base - -ifeq ($(BR2_PACKAGE_PYTHON),y) -PYTHON_SIP_DEPENDENCIES += python -HOST_PYTHON_SIP_DEPENDENCIES += host-python -PYTHON_SIP_LIB_DIR = usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages -PYTHON_SIP_INCLUDE_DIR = usr/include/python$(PYTHON_VERSION_MAJOR) -else ifeq ($(BR2_PACKAGE_PYTHON3),y) -PYTHON_SIP_DEPENDENCIES += python3 -HOST_PYTHON_SIP_DEPENDENCIES += host-python3 -PYTHON_SIP_LIB_DIR = usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages -PYTHON_SIP_INCLUDE_DIR = usr/include/python$(PYTHON3_VERSION_MAJOR) -endif +PYTHON_SIP_DEPENDENCIES = python3 qt5base +HOST_PYTHON_SIP_DEPENDENCIES = host-python3 define HOST_PYTHON_SIP_CONFIGURE_CMDS (cd $(@D); \ @@ -41,8 +30,8 @@ define PYTHON_SIP_CONFIGURE_CMDS (cd $(@D); \ $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(HOST_DIR)/bin/python configure.py \ --bindir $(TARGET_DIR)/usr/bin \ - --destdir $(TARGET_DIR)/$(PYTHON_SIP_LIB_DIR) \ - --incdir $(STAGING_DIR)/$(PYTHON_SIP_INCLUDE_DIR) \ + --destdir $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --incdir $(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --sipdir $(TARGET_DIR)/usr/share/sip \ --sysroot $(STAGING_DIR)/usr \ --use-qmake && \ From yann.morin.1998 at free.fr Wed Feb 9 21:10:01 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:10:01 +0100 Subject: [Buildroot] [git commit] package/python-urllib3: drop python2 support Message-ID: <20220209212601.934AA81335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=60cb89675489553853304dd92a99cf2a7a92fd43 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-urllib3/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-urllib3/Config.in b/package/python-urllib3/Config.in index 21d3f6748e..90e10b7969 100644 --- a/package/python-urllib3/Config.in +++ b/package/python-urllib3/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_URLLIB3 bool "python-urllib3" - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_ZLIB # runtime help Python HTTP library with thread-safe connection pooling, file post support, sanity friendly, and more. From yann.morin.1998 at free.fr Wed Feb 9 21:10:30 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:10:30 +0100 Subject: [Buildroot] [git commit] package/suricata: drop python2 support Message-ID: <20220209212602.0EB3781335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6051682d9e4d216fca0d39b3ece51381f2cfd85e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/suricata/suricata.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/suricata/suricata.mk b/package/suricata/suricata.mk index 3255fd35a1..86d8970178 100644 --- a/package/suricata/suricata.mk +++ b/package/suricata/suricata.mk @@ -116,9 +116,9 @@ else SURICATA_CONF_OPTS += --disable-luajit endif -ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) SURICATA_CONF_OPTS += --enable-python -SURICATA_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,python3) +SURICATA_DEPENDENCIES += python3 else SURICATA_CONF_OPTS += --disable-python endif From yann.morin.1998 at free.fr Wed Feb 9 21:10:12 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:10:12 +0100 Subject: [Buildroot] [git commit] package/python-whoosh: drop python2 support Message-ID: <20220209212601.BDEE781335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=47cd94a11530348c4a3707e21edf412f1c3aa7da branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-whoosh/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-whoosh/Config.in b/package/python-whoosh/Config.in index 1128ce6417..e1fb144985 100644 --- a/package/python-whoosh/Config.in +++ b/package/python-whoosh/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_WHOOSH bool "python-whoosh" - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_ZLIB # runtime help Whoosh is a fast, pure-Python full text indexing, search and spell checking library. From yann.morin.1998 at free.fr Wed Feb 9 21:10:03 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:10:03 +0100 Subject: [Buildroot] [git commit] package/python-web2py: drop python2 support Message-ID: <20220209212601.9BD2281335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=53c6323ef6361527b2735867e879e1559cb3027a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-web2py/Config.in | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/package/python-web2py/Config.in b/package/python-web2py/Config.in index a0452060ba..bb455dfa7a 100644 --- a/package/python-web2py/Config.in +++ b/package/python-web2py/Config.in @@ -1,12 +1,9 @@ config BR2_PACKAGE_PYTHON_WEB2PY bool "python-web2py" select BR2_PACKAGE_PYTHON_PYDAL # runtime - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime - select BR2_PACKAGE_PYTHON_SQLITE if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_SQLITE if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_ZLIB # runtime + select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime + select BR2_PACKAGE_PYTHON3_SQLITE # runtime select BR2_PACKAGE_PYTHON_YATL # runtime help web2py is a free open source full-stack framework for rapid From yann.morin.1998 at free.fr Wed Feb 9 21:10:33 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:10:33 +0100 Subject: [Buildroot] [git commit] package/syslog-ng: drop python2 support Message-ID: <20220209212602.16F0D81335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c1b79cbc68826924d3a324c5611721f377e46ae4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/syslog-ng/syslog-ng.mk | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/package/syslog-ng/syslog-ng.mk b/package/syslog-ng/syslog-ng.mk index f37e7c2ea5..c05ec9785c 100644 --- a/package/syslog-ng/syslog-ng.mk +++ b/package/syslog-ng/syslog-ng.mk @@ -32,12 +32,7 @@ else SYSLOG_NG_CONF_OPTS += --disable-linux-caps endif -ifeq ($(BR2_PACKAGE_PYTHON),y) -SYSLOG_NG_DEPENDENCIES += python -SYSLOG_NG_CONF_OPTS += \ - --enable-python \ - --with-python=$(PYTHON_VERSION_MAJOR) -else ifeq ($(BR2_PACKAGE_PYTHON3),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) SYSLOG_NG_DEPENDENCIES += python3 SYSLOG_NG_CONF_OPTS += \ --enable-python \ From yann.morin.1998 at free.fr Wed Feb 9 21:10:40 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:10:40 +0100 Subject: [Buildroot] [git commit] package/util-linux: drop python2 support Message-ID: <20220209212602.3175C8323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cb4ac01d5a282a1edd647b09576379094c5ed1d8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/util-linux/util-linux.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 5a4ff64d01..1ca605f3fb 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -241,9 +241,9 @@ HOST_UTIL_LINUX_CONF_OPTS += --disable-all-programs endif # Install libmount Python bindings -ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) UTIL_LINUX_CONF_OPTS += --with-python -UTIL_LINUX_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,python3) +UTIL_LINUX_DEPENDENCIES += python3 ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBMOUNT),y) UTIL_LINUX_CONF_OPTS += --enable-pylibmount else From yann.morin.1998 at free.fr Wed Feb 9 21:10:05 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:10:05 +0100 Subject: [Buildroot] [git commit] package/python-webob: drop python2 support Message-ID: <20220209212601.A48708323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=35fb719b57ee5e4e872e954d8217cea2a833a6b2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-webob/Config.in | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package/python-webob/Config.in b/package/python-webob/Config.in index fe77723f95..d3397587a1 100644 --- a/package/python-webob/Config.in +++ b/package/python-webob/Config.in @@ -1,8 +1,6 @@ config BR2_PACKAGE_PYTHON_WEBOB bool "python-webob" - select BR2_PACKAGE_PYTHON_HASHLIB if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_ZLIB # runtime help WSGI request and response object. From yann.morin.1998 at free.fr Wed Feb 9 21:10:10 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:10:10 +0100 Subject: [Buildroot] [git commit] package/python-werkzeug: drop python2 support Message-ID: <20220209212601.B5FA58323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=db41ae375613edf94892a131c7b5507a0e2a9e53 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-werkzeug/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-werkzeug/Config.in b/package/python-werkzeug/Config.in index 79e9a4561e..27b2fdeaab 100644 --- a/package/python-werkzeug/Config.in +++ b/package/python-werkzeug/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_WERKZEUG bool "python-werkzeug" - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_ZLIB # runtime help Werkzeug is a WSGI utility library for Python. It's widely used and BSD licensed. From yann.morin.1998 at free.fr Wed Feb 9 21:10:19 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:10:19 +0100 Subject: [Buildroot] [git commit] package/python3: drop references to python2 Message-ID: <20220209212601.D587181335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=15c47b462e0065a96c7b0436ec70f9be08d623c4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python3/Config.in | 1 - package/python3/python3.mk | 2 -- 2 files changed, 3 deletions(-) diff --git a/package/python3/Config.in b/package/python3/Config.in index 7714518edc..61470c2944 100644 --- a/package/python3/Config.in +++ b/package/python3/Config.in @@ -4,7 +4,6 @@ comment "python3 needs a toolchain w/ wchar, threads, dynamic library" config BR2_PACKAGE_PYTHON3 bool "python3" - depends on !BR2_PACKAGE_PYTHON depends on BR2_USE_WCHAR # uses fork() depends on BR2_USE_MMU diff --git a/package/python3/python3.mk b/package/python3/python3.mk index f9afcd5097..6af7488ddd 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -260,9 +260,7 @@ define PYTHON3_INSTALL_SYMLINK ln -fs python3 $(TARGET_DIR)/usr/bin/python endef -ifneq ($(BR2_PACKAGE_PYTHON),y) PYTHON3_POST_INSTALL_TARGET_HOOKS += PYTHON3_INSTALL_SYMLINK -endif # Some packages may have build scripts requiring python3, whatever is the # python version chosen for the target. From yann.morin.1998 at free.fr Wed Feb 9 21:10:28 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:10:28 +0100 Subject: [Buildroot] [git commit] package/supervisor: drop python2 support Message-ID: <20220209212602.0651683245@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=edfea809a2d22aea31fcd7f48dace4341650893a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/supervisor/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/supervisor/Config.in b/package/supervisor/Config.in index 7ca3cae134..8ba19dc000 100644 --- a/package/supervisor/Config.in +++ b/package/supervisor/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_SUPERVISOR bool "supervisor" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime dependency help A client/server system that allows its users to control a @@ -9,5 +9,4 @@ config BR2_PACKAGE_SUPERVISOR http://supervisord.org/ comment "supervisor needs a python interpreter" - depends on !BR2_PACKAGE_PYTHON depends on !BR2_PACKAGE_PYTHON3 From yann.morin.1998 at free.fr Wed Feb 9 21:10:35 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:10:35 +0100 Subject: [Buildroot] [git commit] package/tovid: drop python2 support Message-ID: <20220209212602.1F5AA8323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5f0b3c48f3fea31d4c5dd80063387324839a6ff7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/tovid/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/tovid/Config.in b/package/tovid/Config.in index f972e18852..3dbb0e229e 100644 --- a/package/tovid/Config.in +++ b/package/tovid/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_TOVID depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # mpv depends on BR2_TOOLCHAIN_HAS_ATOMIC # mpv @@ -40,8 +40,8 @@ comment "tovid needs a toolchain w/ threads, C++, wchar, gcc >= 4.9" || !BR2_USE_WCHAR depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC -comment "tovid depends on python or python3" - depends on !BR2_PACKAGE_PYTHON && !BR2_PACKAGE_PYTHON3 +comment "tovid depends on python3" + depends on !BR2_PACKAGE_PYTHON3 depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_TOOLCHAIN_HAS_SYNC_4 From yann.morin.1998 at free.fr Wed Feb 9 21:13:28 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:13:28 +0100 Subject: [Buildroot] [git commit] package/python-id3: drop python2 specific package Message-ID: <20220209212602.84CF481335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6ad80649c769e0ebc7f30392da493e26d00d9299 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Config.in.legacy | 6 ++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/python-id3/Config.in | 9 --------- package/python-id3/python-id3.hash | 3 --- package/python-id3/python-id3.mk | 14 -------------- 6 files changed, 6 insertions(+), 28 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 7e85e4cf63..03ea14a512 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_ID3 + bool "python-id3 removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_FUTURES bool "python-futures removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index f09990c544..371a0aab9a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -729,7 +729,6 @@ F: package/wireless-regdb/ N: Dominik Faessler F: package/logsurfer/ -F: package/python-id3/ N: Doug Kehn F: package/nss-pam-ldapd/ diff --git a/package/Config.in b/package/Config.in index b18d298a1b..0ee1c8ddb4 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1049,7 +1049,6 @@ menu "External python modules" source "package/python-hyperframe/Config.in" source "package/python-hyperlink/Config.in" source "package/python-ibmiotf/Config.in" - source "package/python-id3/Config.in" source "package/python-idna/Config.in" source "package/python-ifaddr/Config.in" source "package/python-incremental/Config.in" diff --git a/package/python-id3/Config.in b/package/python-id3/Config.in deleted file mode 100644 index 6ddfd541bd..0000000000 --- a/package/python-id3/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PYTHON_ID3 - bool "python-id3" - depends on BR2_PACKAGE_PYTHON - help - This module allows one to read and manipulate so-called ID3 - informational tags on MP3 files through an object-oriented - Python interface. - - http://id3-py.sourceforge.net/ diff --git a/package/python-id3/python-id3.hash b/package/python-id3/python-id3.hash deleted file mode 100644 index c83b34a2d9..0000000000 --- a/package/python-id3/python-id3.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed: -sha256 ba612342b59a49cbf9a7eb23a646667757ffda96dc23b67245fc6cd8d90c2022 id3-py_1.2.tar.gz -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/python-id3/python-id3.mk b/package/python-id3/python-id3.mk deleted file mode 100644 index d4cdded00c..0000000000 --- a/package/python-id3/python-id3.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-id3 -# -################################################################################ - -PYTHON_ID3_VERSION = 1.2 -PYTHON_ID3_SOURCE = id3-py_$(PYTHON_ID3_VERSION).tar.gz -PYTHON_ID3_SITE = http://downloads.sourceforge.net/project/id3-py/id3-py/$(PYTHON_ID3_VERSION) -PYTHON_ID3_SETUP_TYPE = distutils -PYTHON_ID3_LICENSE = GPL-2.0+ -PYTHON_ID3_LICENSE_FILES = COPYING - -$(eval $(python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:10:42 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:10:42 +0100 Subject: [Buildroot] [git commit] package/zfs: drop python2 support Message-ID: <20220209212602.3A93F81335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=55df30f8b1fb2fff0dd4dce1cab83d6bf55b9527 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/zfs/zfs.mk | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/package/zfs/zfs.mk b/package/zfs/zfs.mk index 0e7e3e4e74..6b542f5c05 100644 --- a/package/zfs/zfs.mk +++ b/package/zfs/zfs.mk @@ -37,17 +37,7 @@ else ZFS_CONF_OPTS += --disable-systemd 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 host-python-packaging -ZFS_CONF_ENV += \ - PYTHON=$(HOST_DIR)/usr/bin/python2 \ - PYTHON_CPPFLAGS="`$(STAGING_DIR)/usr/bin/python2-config --includes`" \ - PYTHON_LIBS="`$(STAGING_DIR)/usr/bin/python2-config --ldflags`" \ - PYTHON_SITE_PKG="/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages" -ZFS_CONF_OPTS += --enable-pyzfs -else ifeq ($(BR2_PACKAGE_PYTHON3),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) ZFS_DEPENDENCIES += python3 python-setuptools host-python-cffi host-python-packaging ZFS_CONF_ENV += \ PYTHON=$(HOST_DIR)/usr/bin/python3 \ From yann.morin.1998 at free.fr Wed Feb 9 21:13:38 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:13:38 +0100 Subject: [Buildroot] [git commit] package/python-nfc: drop python2 specific package Message-ID: <20220209212602.B948481335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=67aad59d5eebd9150d5787780f754df9703eff84 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Config.in.legacy | 6 ++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/python-nfc/Config.in | 16 ---------------- package/python-nfc/python-nfc.hash | 3 --- package/python-nfc/python-nfc.mk | 14 -------------- 6 files changed, 6 insertions(+), 35 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index f6607deeeb..80adf521f8 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_NFC + bool "python-nfc removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_MAD bool "python-mad removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 9fb51b4481..d661693e4d 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2598,7 +2598,6 @@ F: package/nanocom/ F: package/neard/ F: package/neardal/ F: package/owl-linux/ -F: package/python-nfc/ F: package/rapidjson/ F: package/sconeserver/ F: package/sound-theme-borealis/ diff --git a/package/Config.in b/package/Config.in index d5c46ef997..8dc91becb0 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1110,7 +1110,6 @@ menu "External python modules" source "package/python-netifaces/Config.in" source "package/python-networkmanager/Config.in" source "package/python-networkx/Config.in" - source "package/python-nfc/Config.in" source "package/python-numpy/Config.in" source "package/python-oauthlib/Config.in" source "package/python-opcua-asyncio/Config.in" diff --git a/package/python-nfc/Config.in b/package/python-nfc/Config.in deleted file mode 100644 index 7008723f60..0000000000 --- a/package/python-nfc/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_PYTHON_NFC - bool "python-nfc" - depends on BR2_PACKAGE_PYTHON - depends on BR2_TOOLCHAIN_HAS_THREADS # libusb - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb - select BR2_PACKAGE_LIBUSB - select BR2_PACKAGE_LIBUSB_COMPAT - help - Python module for near field communication. - - https://launchpad.net/nfcpy - -comment "python-nfc needs a toolchain w/ threads, gcc >= 4.9" - depends on BR2_PACKAGE_PYTHON - depends on !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/python-nfc/python-nfc.hash b/package/python-nfc/python-nfc.hash deleted file mode 100644 index 6514973f53..0000000000 --- a/package/python-nfc/python-nfc.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed: -sha256 7ff9265e393e9e70173ecef5a1f9124e67d3b6e481c2dc3a9537b6a769ebe16f python-nfc-0.13.5.tar.gz -sha256 0dc4b0a3362f197e250604567a6b4eb16bbc34c186425401e2201a193a82549f LICENSE diff --git a/package/python-nfc/python-nfc.mk b/package/python-nfc/python-nfc.mk deleted file mode 100644 index f5417410c9..0000000000 --- a/package/python-nfc/python-nfc.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-nfc -# -################################################################################ - -PYTHON_NFC_VERSION = 0.13.5 -PYTHON_NFC_SITE = $(call github,nfcpy,nfcpy,v$(PYTHON_NFC_VERSION)) -PYTHON_NFC_DEPENDENCIES = libusb libusb-compat -PYTHON_NFC_SETUP_TYPE = setuptools -PYTHON_NFC_LICENSE = EUPL-1.1+ -PYTHON_NFC_LICENSE_FILES = LICENSE - -$(eval $(python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:13:26 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:13:26 +0100 Subject: [Buildroot] [git commit] package/python-futures: drop python2 specific package Message-ID: <20220209212602.799CC8323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c24cc667978fb7850b45c84dfec9b7c1d884bd9e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Config.in.legacy | 6 ++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/python-futures/Config.in | 7 ------- package/python-futures/python-futures.hash | 5 ----- package/python-futures/python-futures.mk | 14 -------------- 6 files changed, 6 insertions(+), 28 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 10476a2adf..7e85e4cf63 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_FUTURES + bool "python-futures removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME bool "python-backports-ssl-match-hostname removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index ebdf388d09..f09990c544 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -436,7 +436,6 @@ F: package/pulseaudio/ F: package/pure-ftpd/ F: package/python-couchdb/ F: package/python-cssutils/ -F: package/python-futures/ F: package/python-mwclient/ F: package/python-mwscrape/ F: package/python-mwscrape2slob/ diff --git a/package/Config.in b/package/Config.in index 73f266504a..b18d298a1b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1032,7 +1032,6 @@ menu "External python modules" source "package/python-frozenlist/Config.in" source "package/python-functools32/Config.in" source "package/python-future/Config.in" - source "package/python-futures/Config.in" source "package/python-git/Config.in" source "package/python-gitdb2/Config.in" source "package/python-gnupg/Config.in" diff --git a/package/python-futures/Config.in b/package/python-futures/Config.in deleted file mode 100644 index 2eb40e93bd..0000000000 --- a/package/python-futures/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_FUTURES - bool "python-futures" - depends on BR2_PACKAGE_PYTHON # not needed for python3 - help - Backport of the concurrent.futures package from Python 3.2. - - https://github.com/agronholm/pythonfutures diff --git a/package/python-futures/python-futures.hash b/package/python-futures/python-futures.hash deleted file mode 100644 index a4fbdf4fe9..0000000000 --- a/package/python-futures/python-futures.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/futures/json -md5 b43a39ae1475e3fd6940f2b4f7214675 futures-3.3.0.tar.gz -sha256 7e033af76a5e35f58e56da7a91e687706faf4e7bdfb2cbc3f2cca6b9bcda9794 futures-3.3.0.tar.gz -# Locally computed sha256 checksums -sha256 a698bd5d441e4a16af6c992b8e80cbfa12755d72d910854fa1fb11d4deb0059a LICENSE diff --git a/package/python-futures/python-futures.mk b/package/python-futures/python-futures.mk deleted file mode 100644 index 0666948115..0000000000 --- a/package/python-futures/python-futures.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-futures -# -################################################################################ - -PYTHON_FUTURES_VERSION = 3.3.0 -PYTHON_FUTURES_SOURCE = futures-$(PYTHON_FUTURES_VERSION).tar.gz -PYTHON_FUTURES_SITE = https://files.pythonhosted.org/packages/47/04/5fc6c74ad114032cd2c544c575bffc17582295e9cd6a851d6026ab4b2c00 -PYTHON_FUTURES_SETUP_TYPE = setuptools -PYTHON_FUTURES_LICENSE = BSD-2-Clause -PYTHON_FUTURES_LICENSE_FILES = LICENSE - -$(eval $(python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:13:21 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:13:21 +0100 Subject: [Buildroot] [git commit] package/python-backports-shutil-get-terminal-size: drop python2 specific package Message-ID: <20220209212602.631B881335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1727e80dfface4dbddbc84604ed781c12b0174d2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Config.in.legacy | 6 ++++++ DEVELOPERS | 1 - package/Config.in | 1 - .../python-backports-shutil-get-terminal-size/Config.in | 8 -------- .../python-backports-shutil-get-terminal-size.hash | 5 ----- .../python-backports-shutil-get-terminal-size.mk | 14 -------------- 6 files changed, 6 insertions(+), 29 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index cc1ed8f9d5..89c095a388 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE + bool "python-backports-shutil-get-terminal-size removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_BACKPORTS_ABC bool "python-backports-abc removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index f92bd32a9f..7fe7e4287a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -143,7 +143,6 @@ N: Andreas Ziegler F: package/mpd/ N: Andrey Smirnov -F: package/python-backports-shutil-get-terminal-size/ F: package/python-decorator/ F: package/python-ipython-genutils/ F: package/python-pathlib2/ diff --git a/package/Config.in b/package/Config.in index 46e6b30cdf..fbfc876d89 100644 --- a/package/Config.in +++ b/package/Config.in @@ -941,7 +941,6 @@ menu "External python modules" source "package/python-avro/Config.in" source "package/python-babel/Config.in" source "package/python-backcall/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" source "package/python-beautifulsoup4/Config.in" diff --git a/package/python-backports-shutil-get-terminal-size/Config.in b/package/python-backports-shutil-get-terminal-size/Config.in deleted file mode 100644 index 392e05a282..0000000000 --- a/package/python-backports-shutil-get-terminal-size/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE - bool "python-backports-shutil-get-terminal-size" - depends on BR2_PACKAGE_PYTHON - help - A backport of the get_terminal_size function from Python - 3.3's shutil. - - https://pypi.python.org/pypi/backports.shutil_get_terminal_size diff --git a/package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.hash b/package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.hash deleted file mode 100644 index 40883a4e3b..0000000000 --- a/package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5 from https://pypi.python.org/pypi/backports.shutil_get_terminal_size/json -md5 03267762480bd86b50580dc19dff3c66 backports.shutil_get_terminal_size-1.0.0.tar.gz -# Locally computed -sha256 713e7a8228ae80341c70586d1cc0a8caa5207346927e23d09dcbcaf18eadec80 backports.shutil_get_terminal_size-1.0.0.tar.gz -sha256 9edd99f8c339cddbfe36a9707e671fccf245b3e50b80eec0877dccec87a2dfe4 LICENSE diff --git a/package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.mk b/package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.mk deleted file mode 100644 index 7c24b196f2..0000000000 --- a/package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-backports-shutil-get-terminal-size -# -################################################################################ - -PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE_VERSION = 1.0.0 -PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE_SOURCE = backports.shutil_get_terminal_size-$(PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE_VERSION).tar.gz -PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE_SITE = https://pypi.python.org/packages/ec/9c/368086faa9c016efce5da3e0e13ba392c9db79e3ab740b763fe28620b18b -PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE_SETUP_TYPE = setuptools -PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE_LICENSE = MIT -PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE_LICENSE_FILES = LICENSE - -$(eval $(python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:13:33 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:13:33 +0100 Subject: [Buildroot] [git commit] package/python-ipaddress: drop python2 specific package Message-ID: <20220209212602.9AEF18323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e990a926797edadb6b0e8b94c85b9d52a79f47ae branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Config.in.legacy | 6 ++++++ package/Config.in | 1 - package/python-ipaddress/Config.in | 7 ------- package/python-ipaddress/python-ipaddress.hash | 5 ----- package/python-ipaddress/python-ipaddress.mk | 14 -------------- 5 files changed, 6 insertions(+), 27 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index c78fb20756..14b26408fe 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_IPADDRESS + bool "python-ipaddress removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_IPADDR bool "python-ipaddr removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index 611a8f6aa8..50c0e13510 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1058,7 +1058,6 @@ menu "External python modules" source "package/python-iniparse/Config.in" source "package/python-intelhex/Config.in" source "package/python-iowait/Config.in" - source "package/python-ipaddress/Config.in" source "package/python-ipdb/Config.in" source "package/python-iptables/Config.in" source "package/python-ipy/Config.in" diff --git a/package/python-ipaddress/Config.in b/package/python-ipaddress/Config.in deleted file mode 100644 index b2b9f0b1c3..0000000000 --- a/package/python-ipaddress/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_IPADDRESS - bool "python-ipaddress" - depends on BR2_PACKAGE_PYTHON - help - Python 3.3's ipaddress for older Python versions. - - https://github.com/phihag/ipaddress diff --git a/package/python-ipaddress/python-ipaddress.hash b/package/python-ipaddress/python-ipaddress.hash deleted file mode 100644 index e61835e192..0000000000 --- a/package/python-ipaddress/python-ipaddress.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/ipaddress/json -md5 aaee67a8026782af1831148beb0d9060 ipaddress-1.0.23.tar.gz -sha256 b7f8e0369580bb4a24d5ba1d7cc29660a4a6987763faf1d8a8046830e020e7e2 ipaddress-1.0.23.tar.gz -# Locally computed sha256 checksums -sha256 38675419eb4a79ec616396d70f1254b3a433fb7088fb3f4cc9b6c0bcdcec6162 LICENSE diff --git a/package/python-ipaddress/python-ipaddress.mk b/package/python-ipaddress/python-ipaddress.mk deleted file mode 100644 index 8f1ad5ffc7..0000000000 --- a/package/python-ipaddress/python-ipaddress.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-ipaddress -# -################################################################################ - -PYTHON_IPADDRESS_VERSION = 1.0.23 -PYTHON_IPADDRESS_SOURCE = ipaddress-$(PYTHON_IPADDRESS_VERSION).tar.gz -PYTHON_IPADDRESS_SITE = https://files.pythonhosted.org/packages/b9/9a/3e9da40ea28b8210dd6504d3fe9fe7e013b62bf45902b458d1cdc3c34ed9 -PYTHON_IPADDRESS_LICENSE = Python-2.0 -PYTHON_IPADDRESS_LICENSE_FILES = LICENSE -PYTHON_IPADDRESS_SETUP_TYPE = setuptools - -$(eval $(python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:13:31 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:13:31 +0100 Subject: [Buildroot] [git commit] package/python-ipaddr: drop python2 specific package Message-ID: <20220209212602.8FD8581335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=da9233cee3c93a7e903794008f35e87839aed746 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Config.in.legacy | 6 ++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/python-ipaddr/Config.in | 9 --------- package/python-ipaddr/python-ipaddr.hash | 5 ----- package/python-ipaddr/python-ipaddr.mk | 14 -------------- 6 files changed, 6 insertions(+), 30 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 03ea14a512..c78fb20756 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_IPADDR + bool "python-ipaddr removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_ID3 bool "python-id3 removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 371a0aab9a..dbed9df4b5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2248,7 +2248,6 @@ F: package/python-docker-pycreds/ F: package/python-enum/ F: package/python-enum34/ F: package/python-functools32/ -F: package/python-ipaddr/ F: package/python-pam/ F: package/python-psutil/ F: package/python-request-id/ diff --git a/package/Config.in b/package/Config.in index 0ee1c8ddb4..611a8f6aa8 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1058,7 +1058,6 @@ menu "External python modules" source "package/python-iniparse/Config.in" source "package/python-intelhex/Config.in" source "package/python-iowait/Config.in" - source "package/python-ipaddr/Config.in" source "package/python-ipaddress/Config.in" source "package/python-ipdb/Config.in" source "package/python-iptables/Config.in" diff --git a/package/python-ipaddr/Config.in b/package/python-ipaddr/Config.in deleted file mode 100644 index 57279273f9..0000000000 --- a/package/python-ipaddr/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PYTHON_IPADDR - bool "python-ipaddr" - depends on BR2_PACKAGE_PYTHON # included since python3.3 - help - An IPv4/IPv6 manipulation library in Python. This library is - used to create/poke/manipulate IPv4 and IPv6 addresses and - prefixes. - - https://github.com/google/ipaddr-py diff --git a/package/python-ipaddr/python-ipaddr.hash b/package/python-ipaddr/python-ipaddr.hash deleted file mode 100644 index d9963a2933..0000000000 --- a/package/python-ipaddr/python-ipaddr.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/ipaddr/json -md5 f88353e40dec06410acfa075b8209b27 ipaddr-2.2.0.tar.gz -sha256 4092dfe667588d16aa12b59acb7c8a4024e5dcb23a681cd0b0b602373eca88d6 ipaddr-2.2.0.tar.gz -# Locally computed sha256 checksums -sha256 175b3b509d5c840db72ad8c22d22a690d15c67b317f34de8a8bb0a66059e8215 COPYING diff --git a/package/python-ipaddr/python-ipaddr.mk b/package/python-ipaddr/python-ipaddr.mk deleted file mode 100644 index 9a5d147533..0000000000 --- a/package/python-ipaddr/python-ipaddr.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-ipaddr -# -################################################################################ - -PYTHON_IPADDR_VERSION = 2.2.0 -PYTHON_IPADDR_SOURCE = ipaddr-$(PYTHON_IPADDR_VERSION).tar.gz -PYTHON_IPADDR_SITE = https://files.pythonhosted.org/packages/9d/a7/1b39a16cb90dfe491f57e1cab3103a15d4e8dd9a150872744f531b1106c1 -PYTHON_IPADDR_SETUP_TYPE = distutils -PYTHON_IPADDR_LICENSE = Apache-2.0 -PYTHON_IPADDR_LICENSE_FILES = COPYING - -$(eval $(python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:16:26 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:16:26 +0100 Subject: [Buildroot] [git commit] package/python-functools32: drop python2 specific package Message-ID: <20220209212603.57DD581335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=71d5d8c1082bfd94ce066a9d5b03e5d573799e8b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Config.in.legacy | 6 ++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/python-functools32/Config.in | 8 -------- package/python-functools32/python-functools32.hash | 4 ---- package/python-functools32/python-functools32.mk | 14 -------------- 6 files changed, 6 insertions(+), 28 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 7df95691ca..49c24e61bf 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_FUNCTOOLS32 + bool "python-functools32 removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_ENUM34 bool "python-enum34 removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 92abe8a6dd..0e759bc168 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2243,7 +2243,6 @@ F: package/python-cached-property/ F: package/python-docker/ F: package/python-dockerpty/ F: package/python-docker-pycreds/ -F: package/python-functools32/ F: package/python-psutil/ F: package/python-request-id/ F: package/python-semver/ diff --git a/package/Config.in b/package/Config.in index 18388f82c3..1a9f3e29d8 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1026,7 +1026,6 @@ menu "External python modules" source "package/python-flup/Config.in" source "package/python-fonttools/Config.in" source "package/python-frozenlist/Config.in" - source "package/python-functools32/Config.in" source "package/python-future/Config.in" source "package/python-git/Config.in" source "package/python-gitdb2/Config.in" diff --git a/package/python-functools32/Config.in b/package/python-functools32/Config.in deleted file mode 100644 index 606341d828..0000000000 --- a/package/python-functools32/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PYTHON_FUNCTOOLS32 - bool "python-functools32" - depends on BR2_PACKAGE_PYTHON - help - Backport of the functools module from Python 3.2.3 for use on - 2.7 and PyPy. - - https://github.com/MiCHiLU/python-functools32 diff --git a/package/python-functools32/python-functools32.hash b/package/python-functools32/python-functools32.hash deleted file mode 100644 index 606de81774..0000000000 --- a/package/python-functools32/python-functools32.hash +++ /dev/null @@ -1,4 +0,0 @@ -# md5 from https://pypi.python.org/pypi/functools32/json, sha256 locally computed -md5 09f24ffd9af9f6cd0f63cb9f4e23d4b2 functools32-3.2.3-2.tar.gz -sha256 f6253dfbe0538ad2e387bd8fdfd9293c925d63553f5813c4e587745416501e6d functools32-3.2.3-2.tar.gz -sha256 3f9ea6b89abe1556b72aff67b987d64c8272564815cd6a2832e6c4f6abdfe3b1 LICENSE diff --git a/package/python-functools32/python-functools32.mk b/package/python-functools32/python-functools32.mk deleted file mode 100644 index 8a88bb2a7f..0000000000 --- a/package/python-functools32/python-functools32.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-functools32 -# -################################################################################ - -PYTHON_FUNCTOOLS32_VERSION = 3.2.3-2 -PYTHON_FUNCTOOLS32_SOURCE = functools32-$(PYTHON_FUNCTOOLS32_VERSION).tar.gz -PYTHON_FUNCTOOLS32_SITE = https://pypi.python.org/packages/c5/60/6ac26ad05857c601308d8fb9e87fa36d0ebf889423f47c3502ef034365db -PYTHON_FUNCTOOLS32_SETUP_TYPE = distutils -PYTHON_FUNCTOOLS32_LICENSE = Python-2.0 -PYTHON_FUNCTOOLS32_LICENSE_FILES = LICENSE - -$(eval $(python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:13:51 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:13:51 +0100 Subject: [Buildroot] [git commit] package/python-singledispatch: drop python2 specific package Message-ID: <20220209212602.F327681335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5fce56ae9b98e061706e6a57005a7b411b6db77f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Config.in.legacy | 6 ++++++ package/Config.in | 1 - package/python-singledispatch/Config.in | 9 --------- package/python-singledispatch/python-singledispatch.hash | 5 ----- package/python-singledispatch/python-singledispatch.mk | 14 -------------- 5 files changed, 6 insertions(+), 29 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 319057f748..3cd78ccf1c 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_SINGLEDISPATCH + bool "python-singledispatch removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_PYRO bool "python-pyro removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index 0d8ff0d4d1..0261463f45 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1229,7 +1229,6 @@ menu "External python modules" source "package/python-simplejson/Config.in" source "package/python-simplelogging/Config.in" source "package/python-simplesqlite/Config.in" - source "package/python-singledispatch/Config.in" source "package/python-sip/Config.in" source "package/python-six/Config.in" source "package/python-slob/Config.in" diff --git a/package/python-singledispatch/Config.in b/package/python-singledispatch/Config.in deleted file mode 100644 index 4abc219f95..0000000000 --- a/package/python-singledispatch/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PYTHON_SINGLEDISPATCH - bool "python-singledispatch" - depends on BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON_SIX # runtime - help - This library brings functools.singledispatch from - Python 3.4 to Python 2.6-3.3 - - https://pypi.python.org/pypi/singledispatch diff --git a/package/python-singledispatch/python-singledispatch.hash b/package/python-singledispatch/python-singledispatch.hash deleted file mode 100644 index c4eec53e30..0000000000 --- a/package/python-singledispatch/python-singledispatch.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=af2fc6a3d6cc5a02d0bf54d909785fcb -md5 af2fc6a3d6cc5a02d0bf54d909785fcb singledispatch-3.4.0.3.tar.gz -# Locally computed -sha256 5b06af87df13818d14f08a028e42f566640aef80805c3b50c5056b086e3c2b9c singledispatch-3.4.0.3.tar.gz -sha256 5a724c436f88585973787af91cecf58503cbf09e5c1721c516880614700767ef setup.py diff --git a/package/python-singledispatch/python-singledispatch.mk b/package/python-singledispatch/python-singledispatch.mk deleted file mode 100644 index 7e1d5ac8e0..0000000000 --- a/package/python-singledispatch/python-singledispatch.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-singledispatch -# -################################################################################ - -PYTHON_SINGLEDISPATCH_VERSION = 3.4.0.3 -PYTHON_SINGLEDISPATCH_SOURCE = singledispatch-$(PYTHON_SINGLEDISPATCH_VERSION).tar.gz -PYTHON_SINGLEDISPATCH_SITE = https://pypi.python.org/packages/source/s/singledispatch -PYTHON_SINGLEDISPATCH_LICENSE = MIT -PYTHON_SINGLEDISPATCH_LICENSE_FILES = setup.py -PYTHON_SINGLEDISPATCH_SETUP_TYPE = setuptools - -$(eval $(python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:16:28 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:16:28 +0100 Subject: [Buildroot] [git commit] docs/manual: drop python2 references Message-ID: <20220209212603.5F5EF81335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=da9f2a8fda2a746cd7f387d3335f28be6afd6e37 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- docs/manual/adding-packages-python.txt | 8 -------- docs/manual/writing-rules.txt | 8 ++++---- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/docs/manual/adding-packages-python.txt b/docs/manual/adding-packages-python.txt index 0c100859be..cfd2f88920 100644 --- a/docs/manual/adding-packages-python.txt +++ b/docs/manual/adding-packages-python.txt @@ -67,14 +67,6 @@ Python build system, but are not Python modules, can freely choose their name (existing examples in Buildroot are +scons+ and +supervisor+). -Packages that are only compatible with one version of Python (as in: -Python 2 or Python 3) should depend on that version explicitely in -their +Config.in+ file (+BR2_PACKAGE_PYTHON+ for Python 2, -+BR2_PACKAGE_PYTHON3+ for Python 3). Packages that are compatible -with both versions should not explicitely depend on them in their -+Config.in+ file, since that condition is already expressed for the -whole "External python modules" menu. - The main macro of the Python package infrastructure is +python-package+. It is similar to the +generic-package+ macro. It is also possible to create Python host packages with the diff --git a/docs/manual/writing-rules.txt b/docs/manual/writing-rules.txt index 3eec095d0e..6255a08c1c 100644 --- a/docs/manual/writing-rules.txt +++ b/docs/manual/writing-rules.txt @@ -93,9 +93,9 @@ so _make_ recognizes them as commands. YES: + --------------------- -ifeq ($(BR2_PACKAGE_PYTHON),y) +ifeq ($(BR2_PACKAGE_PYTHON3),y) LIBFOO_CONF_OPTS += --with-python-support -LIBFOO_DEPENDENCIES += python +LIBFOO_DEPENDENCIES += python3 else LIBFOO_CONF_OPTS += --without-python-support endif @@ -104,8 +104,8 @@ endif NO: + --------------------- -LIBFOO_CONF_OPTS += --with$(if $(BR2_PACKAGE_PYTHON),,out)-python-support -LIBFOO_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,) +LIBFOO_CONF_OPTS += --with$(if $(BR2_PACKAGE_PYTHON3),,out)-python-support +LIBFOO_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON3),python3,) --------------------- ** Keep configure options and dependencies close together. From yann.morin.1998 at free.fr Wed Feb 9 21:16:19 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:16:19 +0100 Subject: [Buildroot] [git commit] package/python-dialog: drop python2 specific package Message-ID: <20220209212603.359348323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1e44c7bcd928148ed31ade22512635e562bda7b2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Config.in.legacy | 6 ++++++ package/Config.in | 1 - package/python-dialog/Config.in | 10 ---------- package/python-dialog/python-dialog.hash | 5 ----- package/python-dialog/python-dialog.mk | 15 --------------- 5 files changed, 6 insertions(+), 31 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 6776048fc4..630194edba 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_DIALOG + bool "python-dialog removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_CONFIGOBJ bool "python-configobj removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index 478a4e6b90..b91e190c8e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -994,7 +994,6 @@ menu "External python modules" source "package/python-dbus-next/Config.in" source "package/python-decorator/Config.in" source "package/python-defusedxml/Config.in" - source "package/python-dialog/Config.in" source "package/python-dialog3/Config.in" source "package/python-dicttoxml/Config.in" source "package/python-distro/Config.in" diff --git a/package/python-dialog/Config.in b/package/python-dialog/Config.in deleted file mode 100644 index c1fdb23723..0000000000 --- a/package/python-dialog/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_PYTHON_DIALOG - bool "python-dialog" - depends on BR2_PACKAGE_PYTHON - depends on BR2_USE_MMU # dialog - select BR2_PACKAGE_DIALOG - help - A Python interface to the UNIX dialog utility and - mostly-compatible programs. - - http://pythondialog.sourceforge.net/ diff --git a/package/python-dialog/python-dialog.hash b/package/python-dialog/python-dialog.hash deleted file mode 100644 index 8f84e198b2..0000000000 --- a/package/python-dialog/python-dialog.hash +++ /dev/null @@ -1,5 +0,0 @@ -# Locally computed after verifying -# https://sourceforge.net/projects/pythondialog/files/pythondialog/3.4.0/python3-pythondialog-3.4.0.tar.bz2.asc -# with key 9B6F19FB52965E6C21FE76142A205688F8489BDD -sha256 8978d355c8db6728eeb9e23b39449b14597f1c76cb06dc72462642ca7cde46a0 python2-pythondialog-3.4.0.tar.bz2 -sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING diff --git a/package/python-dialog/python-dialog.mk b/package/python-dialog/python-dialog.mk deleted file mode 100644 index d5d4a4ceb5..0000000000 --- a/package/python-dialog/python-dialog.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# python-dialog -# -################################################################################ - -PYTHON_DIALOG_VERSION = 3.4.0 -PYTHON_DIALOG_SOURCE = python2-pythondialog-$(PYTHON_DIALOG_VERSION).tar.bz2 -PYTHON_DIALOG_SITE = http://downloads.sourceforge.net/project/pythondialog/pythondialog/$(PYTHON_DIALOG_VERSION) -PYTHON_DIALOG_LICENSE = LGPL-2.1+ -PYTHON_DIALOG_LICENSE_FILES = COPYING -PYTHON_DIALOG_SETUP_TYPE = distutils -PYTHON_DIALOG_DEPENDENCIES = dialog - -$(eval $(python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:13:53 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:13:53 +0100 Subject: [Buildroot] [git commit] package/python-subprocess32: drop python2 specific package Message-ID: <20220209212603.0A91D8323C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c2d0a365decdaf56f62ee39420c63c3d0953b721 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Config.in.legacy | 6 +++++ package/Config.in | 1 - package/python-subprocess32/Config.in | 13 --------- .../python-subprocess32/python-subprocess32.hash | 5 ---- package/python-subprocess32/python-subprocess32.mk | 31 ---------------------- 5 files changed, 6 insertions(+), 50 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 3cd78ccf1c..8db9558ed4 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_SUBPROCESS32 + bool "python-subprocess32 removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_SINGLEDISPATCH bool "python-singledispatch removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index 0261463f45..18de2a32a5 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1243,7 +1243,6 @@ menu "External python modules" source "package/python-sqlalchemy/Config.in" source "package/python-sqliteschema/Config.in" source "package/python-sqlparse/Config.in" - source "package/python-subprocess32/Config.in" source "package/python-systemd/Config.in" source "package/python-tabledata/Config.in" source "package/python-tempora/Config.in" diff --git a/package/python-subprocess32/Config.in b/package/python-subprocess32/Config.in deleted file mode 100644 index d7fe84f1e6..0000000000 --- a/package/python-subprocess32/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_PYTHON_SUBPROCESS32 - bool "python-subprocess32" - depends on BR2_PACKAGE_PYTHON - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 || !BR2_MIPS_NABI64 - help - A backport of the Python 3 subprocess module for use - on Python 2. - - https://github.com/google/python-subprocess32 - -comment "python-subprocess32 needs a toolchain w/ headers >= 3.10 on MIPS N64" - depends on BR2_MIPS_NABI64 - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 diff --git a/package/python-subprocess32/python-subprocess32.hash b/package/python-subprocess32/python-subprocess32.hash deleted file mode 100644 index 65d18763d1..0000000000 --- a/package/python-subprocess32/python-subprocess32.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/subprocess32/json -md5 748844d560be5f0c707931cba1cdb48b subprocess32-3.5.4.tar.gz -sha256 eb2937c80497978d181efa1b839ec2d9622cf9600a039a79d0e108d1f9aec79d subprocess32-3.5.4.tar.gz -# Locally computed sha256 checksums -sha256 826b43437249d39422642f695154d064da64de92eb1476048a615f50bc1beb4a LICENSE diff --git a/package/python-subprocess32/python-subprocess32.mk b/package/python-subprocess32/python-subprocess32.mk deleted file mode 100644 index fb8a47f974..0000000000 --- a/package/python-subprocess32/python-subprocess32.mk +++ /dev/null @@ -1,31 +0,0 @@ -################################################################################ -# -# python-subprocess32 -# -################################################################################ - -PYTHON_SUBPROCESS32_VERSION = 3.5.4 -PYTHON_SUBPROCESS32_SOURCE = subprocess32-$(PYTHON_SUBPROCESS32_VERSION).tar.gz -PYTHON_SUBPROCESS32_SITE = https://files.pythonhosted.org/packages/32/c8/564be4d12629b912ea431f1a50eb8b3b9d00f1a0b1ceff17f266be190007 -PYTHON_SUBPROCESS32_SETUP_TYPE = setuptools -PYTHON_SUBPROCESS32_LICENSE = Python-2.0 -PYTHON_SUBPROCESS32_LICENSE_FILES = LICENSE - -# The configure step needs to be run outside of the setup.py since it isn't -# run correctly for cross-compiling -define PYTHON_SUBPROCESS32_CONFIGURE_CMDS - (cd $(@D) && \ - $(TARGET_CONFIGURE_OPTS) \ - $(TARGET_CONFIGURE_ARGS) \ - ./configure \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - --prefix=/usr \ - --exec-prefix=/usr \ - --sysconfdir=/etc \ - --program-prefix="" \ - ) -endef - -$(eval $(python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:13:43 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:13:43 +0100 Subject: [Buildroot] [git commit] package/python-pathlib2: drop python2 specific package Message-ID: <20220209212602.D19E181335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cc3eda104a340f0a5a0ad96a74ffb31574a6df47 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Config.in.legacy | 6 ++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/python-pathlib2/Config.in | 13 ------------- package/python-pathlib2/python-pathlib2.hash | 5 ----- package/python-pathlib2/python-pathlib2.mk | 14 -------------- 6 files changed, 6 insertions(+), 34 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 386f94e72b..74317a2d7c 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_PATHLIB2 + bool "python-pathlib2 removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_PAM bool "python-pam removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 0ca1ee9f38..4bb8821563 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -145,7 +145,6 @@ F: package/mpd/ N: Andrey Smirnov F: package/python-decorator/ F: package/python-ipython-genutils/ -F: package/python-pathlib2/ F: package/python-pickleshare/ F: package/python-scandir/ F: package/python-simplegeneric/ diff --git a/package/Config.in b/package/Config.in index 73e8901a1d..3c55dec6c5 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1118,7 +1118,6 @@ menu "External python modules" source "package/python-paramiko/Config.in" source "package/python-parso/Config.in" source "package/python-passlib/Config.in" - source "package/python-pathlib2/Config.in" source "package/python-pathpy/Config.in" source "package/python-pathtools/Config.in" source "package/python-pathvalidate/Config.in" diff --git a/package/python-pathlib2/Config.in b/package/python-pathlib2/Config.in deleted file mode 100644 index e28de4c12e..0000000000 --- a/package/python-pathlib2/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_PYTHON_PATHLIB2 - bool "python-pathlib2" - depends on BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON_SIX # runtime - help - Object-oriented filesystem paths. - - The goal of pathlib2 is to provide a backport of standard - pathlib module which tracks the standard library module, so - all the newest features of the standard pathlib can be used - also on older Python versions. - - https://pypi.python.org/pypi/pathlib2 diff --git a/package/python-pathlib2/python-pathlib2.hash b/package/python-pathlib2/python-pathlib2.hash deleted file mode 100644 index ebd197b62e..0000000000 --- a/package/python-pathlib2/python-pathlib2.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/pathlib2/json -md5 e50a0cf94e406c5110b3aed535626e9e pathlib2-2.3.6.tar.gz -sha256 7d8bcb5555003cdf4a8d2872c538faa3a0f5d20630cb360e518ca3b981795e5f pathlib2-2.3.6.tar.gz -# Locally computed sha256 checksums -sha256 861f813004a151ac77024ad445794653809ddf8a7572aee7bab18d11df2ba1c6 LICENSE.rst diff --git a/package/python-pathlib2/python-pathlib2.mk b/package/python-pathlib2/python-pathlib2.mk deleted file mode 100644 index 4bcfea78fb..0000000000 --- a/package/python-pathlib2/python-pathlib2.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-pathlib2 -# -################################################################################ - -PYTHON_PATHLIB2_VERSION = 2.3.6 -PYTHON_PATHLIB2_SOURCE = pathlib2-$(PYTHON_PATHLIB2_VERSION).tar.gz -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 - -$(eval $(python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:15:56 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:15:56 +0100 Subject: [Buildroot] [git commit] package/python-configobj: drop python2 specific package Message-ID: <20220209212603.2B44081335@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8d264a96172cfa1c1f515d1160b921c013fa3bd7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Config.in.legacy | 6 ++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/Config.in.host | 1 - package/python-configobj/Config.in | 10 ---------- package/python-configobj/python-configobj.hash | 3 --- package/python-configobj/python-configobj.mk | 14 -------------- 7 files changed, 6 insertions(+), 30 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 47e8d696e0..6776048fc4 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_CONFIGOBJ + bool "python-configobj removed" + select BR2_LEGACY + help + Package was removed together with python 2.7 support. + config BR2_PACKAGE_PYTHON_YIELDFROM bool "python-yieldfrom removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 90988478f9..8112873f14 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -3033,7 +3033,6 @@ F: package/grantlee/ F: package/libusb/ F: package/libusb-compat/ F: package/proj/ -F: package/python-configobj/ F: package/python-iniparse/ F: package/qjson/ F: package/quazip/ diff --git a/package/Config.in b/package/Config.in index 6fb62caa4c..478a4e6b90 100644 --- a/package/Config.in +++ b/package/Config.in @@ -973,7 +973,6 @@ menu "External python modules" source "package/python-colorama/Config.in" source "package/python-colorlog/Config.in" source "package/python-colorzero/Config.in" - source "package/python-configobj/Config.in" source "package/python-configshell-fb/Config.in" source "package/python-constantly/Config.in" source "package/python-couchdb/Config.in" diff --git a/package/Config.in.host b/package/Config.in.host index 341e24926b..e5fbb07fc2 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -69,7 +69,6 @@ menu "Host utilities" source "package/pkgconf/Config.in.host" source "package/pru-software-support/Config.in.host" 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" diff --git a/package/python-configobj/Config.in b/package/python-configobj/Config.in deleted file mode 100644 index fc57e26f1c..0000000000 --- a/package/python-configobj/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_PYTHON_CONFIGOBJ - bool "python-configobj" - depends on BR2_PACKAGE_PYTHON - help - ConfigObj is a simple but powerful config file reader and - writer: an ini file round tripper. Its main feature is that - it is very easy to use, with a straightforward programmer's - interface and a simple syntax for config files. - - http://www.voidspace.org.uk/python/configobj.html diff --git a/package/python-configobj/python-configobj.hash b/package/python-configobj/python-configobj.hash deleted file mode 100644 index d43c453796..0000000000 --- a/package/python-configobj/python-configobj.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/configobj/json, sha256 locally computed -md5 e472a3a1c2a67bb0ec9b5d54c13a47d6 configobj-5.0.6.tar.gz -sha256 a2f5650770e1c87fb335af19a9b7eb73fc05ccf22144eb68db7d00cd2bcb0902 configobj-5.0.6.tar.gz diff --git a/package/python-configobj/python-configobj.mk b/package/python-configobj/python-configobj.mk deleted file mode 100644 index 9e281d28e7..0000000000 --- a/package/python-configobj/python-configobj.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-configobj -# -################################################################################ - -PYTHON_CONFIGOBJ_VERSION = 5.0.6 -PYTHON_CONFIGOBJ_SOURCE = configobj-$(PYTHON_CONFIGOBJ_VERSION).tar.gz -PYTHON_CONFIGOBJ_SITE = https://pypi.python.org/packages/64/61/079eb60459c44929e684fa7d9e2fdca403f67d64dd9dbac27296be2e0fab -PYTHON_CONFIGOBJ_LICENSE = BSD-3-Clause -# License only mentioned in the source -PYTHON_CONFIGOBJ_SETUP_TYPE = distutils - -$(eval $(python-package)) From yann.morin.1998 at free.fr Wed Feb 9 21:34:37 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:34:37 +0100 Subject: [Buildroot] [PATCH 084/107] package/python: drop host package In-Reply-To: <20220209165213.4498-85-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> <20220209165213.4498-85-peter@korsgaard.com> Message-ID: <20220209213437.GF2249818@scaer> Peter, All, On 2022-02-09 17:51 +0100, Peter Korsgaard spake thusly: > Signed-off-by: Peter Korsgaard > --- ... > package/python/Config.in.host | 16 - > package/python/python.hash | 5 - > package/python/python.mk | 302 ------------------ > 37 files changed, 2301 deletions(-) You forgot to update DEVELOPPERS, so I cherry-picked the hunk from patch 102 and applied it here. 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 paguilar at paguilar.org Wed Feb 9 21:35:58 2022 From: paguilar at paguilar.org (Pedro Aguilar) Date: Wed, 9 Feb 2022 22:35:58 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/guile: Add BR2_ENABLE_LOCALE as dependency. In-Reply-To: References: <20220208213722.836257-1-paguilar@paguilar.org> <5f710ea1-3f98-9435-c033-e73e70e86342@benettiengineering.com> Message-ID: <890b73ae-305c-2674-ed03-c06562983328@paguilar.org> Hi Giulio, On 2/8/22 23:54, Giulio Benetti wrote: > Hi again Pedro, > > I've reproduced the build failure with your previous attached .config > file and this patch fixes it. So below... > > On 08/02/22 23:06, Giulio Benetti wrote: >> Hi Pedro, >> >> On 08/02/22 22:37, Pedro Aguilar wrote: >>> If it's not present, enable libiconv. >> Here it's missing: >> Fixes: >> URL to autobuilder failure > > ...please provide the autobuilder failure URL and if it doesn't exist > than we don't need it. AFAIK, the build failure fixed by this patch was not reported by the autobuilder, so I'm afraid there isn't any URL to share. In a previous email I wrongly mentioned that it fixed an autobuilder failure, but all those failures are linked to another issue that seems to be fixed by a patch sent by Fabrice, although I haven't tested it: https://lists.buildroot.org/pipermail/buildroot/2022-February/636041.html May be the commit message of the current v2 patch can remain as is. Thanks! > So once done this I can give you my Review. > > Waiting for V2 with improved commit log then. > > Thank you! > Best regards Regards, -- Pedro Aguilar https://paguilar.org From yann.morin.1998 at free.fr Wed Feb 9 21:36:35 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Feb 2022 22:36:35 +0100 Subject: [Buildroot] [PATCH 102/107] package/python-configobj: drop python2 specific package In-Reply-To: <20220209165213.4498-103-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> <20220209165213.4498-103-peter@korsgaard.com> Message-ID: <20220209213635.GG2249818@scaer> Peter, All, On 2022-02-09 17:52 +0100, Peter Korsgaard spake thusly: > Signed-off-by: Peter Korsgaard > --- [--SNIP--] > diff --git a/DEVELOPERS b/DEVELOPERS > index 9c1411648e..8112873f14 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -2796,7 +2796,6 @@ F: package/ne10/ > F: package/pkg-python.mk > F: package/pkg-autotools.mk > F: package/pkg-generic.mk > -F: package/python/ Not sure how you managed to have this hunk in this patch, but given the tediousness of this series, I am not going to ask you to fix and respin, so, as I replied to patch 84, I cherry-picked this hunk in to that previous patch, and so dropped it here. 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 heiko.thiery at gmail.com Wed Feb 9 21:43:27 2022 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Wed, 9 Feb 2022 22:43:27 +0100 Subject: [Buildroot] [PATCH] package/rauc: bump to version 1.6 Message-ID: <20220209214326.21671-1-heiko.thiery@gmail.com> For release notes see: https://github.com/rauc/rauc/releases/tag/v1.6 Signed-off-by: Heiko Thiery --- # utils/test-pkg -p rauc 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 package/rauc/rauc.hash | 4 ++-- package/rauc/rauc.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/rauc/rauc.hash b/package/rauc/rauc.hash index a025257845..f6c1446de4 100644 --- a/package/rauc/rauc.hash +++ b/package/rauc/rauc.hash @@ -1,4 +1,4 @@ # Locally calculated, after verifying against -# https://github.com/rauc/rauc/releases/download/v1.5.1/rauc-1.5.1.tar.xz.asc -sha256 d4ea009ce702bcb083d942398ccfedec959c6bbb7adc0fd77ae9314ce11d9d91 rauc-1.5.1.tar.xz +# https://github.com/rauc/rauc/releases/download/v1.6/rauc-1.6.tar.xz.asc +sha256 86013788dd02321b7c3f913ad3a1f8802afbc784ec076fa278524a9e1ef9e7b0 rauc-1.6.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/rauc/rauc.mk b/package/rauc/rauc.mk index 99efc16c2f..39f5255812 100644 --- a/package/rauc/rauc.mk +++ b/package/rauc/rauc.mk @@ -4,7 +4,7 @@ # ################################################################################ -RAUC_VERSION = 1.5.1 +RAUC_VERSION = 1.6 RAUC_SITE = https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION) RAUC_SOURCE = rauc-$(RAUC_VERSION).tar.xz RAUC_LICENSE = LGPL-2.1 -- 2.20.1 From thomas.petazzoni at bootlin.com Wed Feb 9 21:48:00 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 9 Feb 2022 22:48:00 +0100 Subject: [Buildroot] [PATCH 1/5 v2] package/pkg-cargo: allow packages to define download environment In-Reply-To: <20220209205527.GD2249818@scaer> References: <9354_1644422930_6203E712_9354_383_11_2d5b77c2a90cf722e007a5bf3ed4227d2bd1fda6.1644422916.git.yann.morin@orange.com> <20220209205259.725e17c2@windsurf> <20220209205527.GD2249818@scaer> Message-ID: <20220209224800.7717a488@windsurf> On Wed, 9 Feb 2022 21:55:27 +0100 "Yann E. MORIN" wrote: > > But, but, then, how is: > > > > PYTHON_CRYPTOGRAPHY_DL_ENV = \ > > BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml > > > > currently working? > > Because, its the name implies, it is a python-package, not a > cargo-package. > > Yeah, I got puzzled too. ;-) Aah, yes. Indeed. A python-package that builds Rust stuff. I wonder how it's possible for me to forget this, after having spent so many hours on this particular package! :-) Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From marcus.hoffmann at othermo.de Wed Feb 9 21:43:05 2022 From: marcus.hoffmann at othermo.de (Marcus Hoffmann) Date: Wed, 9 Feb 2022 22:43:05 +0100 Subject: [Buildroot] [PATCH] package/libqmi: fix build failure without host-python Message-ID: <20220209214305.314272-1-marcus.hoffmann@othermo.de> Add an upstream patch to use python3 instead of just python during the libqmi build. Fixes a build error with the following defconfig inside the buildroot:base docker image. BR2_aarch64=y BR2_cortex_a72=y BR2_ARM_FPU_VFPV4=y BR2_TOOLCHAIN_BUILDROOT_WCHAR=y BR2_PACKAGE_LIBQMI=y Fixes: FAILED: src/libqmi-glib/generated/qmi-ctl.c src/libqmi-glib/generated/qmi-ctl.h src/libqmi-glib/generated/qmi-ctl.sections /builds/othermo/buildroot/output/build/libqmi-1.30.2/build-aux/qmi-codegen/qmi-codegen --input /builds/othermo/buildroot/output/build/libqmi-1.30.2/data/qmi-service-ctl.json --include /builds/othermo/buildroot/output/build/libqmi-1.30.2/data/qmi-common.json --output src/libqmi-glib/generated/qmi-ctl /usr/bin/env: 'python': No such file or directory Signed-off-by: Marcus Hoffmann --- package/libqmi/libqmi.hash | 1 + package/libqmi/libqmi.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/package/libqmi/libqmi.hash b/package/libqmi/libqmi.hash index 1f2da45ac0..854de8512c 100644 --- a/package/libqmi/libqmi.hash +++ b/package/libqmi/libqmi.hash @@ -2,3 +2,4 @@ sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB sha256 2eb7c7971b91a64ad830643b0170cff692a69bf0f093ca61d72d3f466a0272d4 libqmi-1.30.2.tar.gz +sha256 1fb80064cddc9a0a2a2abeb622acc535c3f1c74795bdee48c81f32e15442d7d7 17c604d7bd78dd081868798a702db0eaa8abb169.patch diff --git a/package/libqmi/libqmi.mk b/package/libqmi/libqmi.mk index a4839f1efb..f3c51f7486 100644 --- a/package/libqmi/libqmi.mk +++ b/package/libqmi/libqmi.mk @@ -6,6 +6,7 @@ LIBQMI_VERSION = 1.30.2 LIBQMI_SITE = https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/archive/$(LIBQMI_VERSION) +LIBQMI_PATCH = https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/commit/17c604d7bd78dd081868798a702db0eaa8abb169.patch LIBQMI_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (programs) LIBQMI_LICENSE_FILES = COPYING COPYING.LIB LIBQMI_CPE_ID_VENDOR = libqmi_project -- 2.25.1 From peter at korsgaard.com Wed Feb 9 21:56:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 09 Feb 2022 22:56:49 +0100 Subject: [Buildroot] [PATCH 102/107] package/python-configobj: drop python2 specific package In-Reply-To: <20220209213635.GG2249818@scaer> (Yann E. MORIN's message of "Wed, 9 Feb 2022 22:36:35 +0100") References: <20220209165213.4498-1-peter@korsgaard.com> <20220209165213.4498-103-peter@korsgaard.com> <20220209213635.GG2249818@scaer> Message-ID: <874k57ya8u.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Peter, All, > On 2022-02-09 17:52 +0100, Peter Korsgaard spake thusly: >> Signed-off-by: Peter Korsgaard >> --- > [--SNIP--] >> diff --git a/DEVELOPERS b/DEVELOPERS >> index 9c1411648e..8112873f14 100644 >> --- a/DEVELOPERS >> +++ b/DEVELOPERS >> @@ -2796,7 +2796,6 @@ F: package/ne10/ >> F: package/pkg-python.mk >> F: package/pkg-autotools.mk >> F: package/pkg-generic.mk >> -F: package/python/ > Not sure how you managed to have this hunk in this patch, but given the > tediousness of this series, I am not going to ask you to fix and respin, > so, as I replied to patch 84, I cherry-picked this hunk in to that > previous patch, and so dropped it here. Ups, thanks for fixing it. I originally had the python host package after these (but somehow forgot to amend the DEVELOPERS change), which is why it ended up here. > Applied to master, thanks. Thanks! -- Bye, Peter Korsgaard From mdurrant at arcturusnetworks.com Wed Feb 9 22:17:31 2022 From: mdurrant at arcturusnetworks.com (Michael PDQ) Date: Wed, 9 Feb 2022 17:17:31 -0500 Subject: [Buildroot] [PATCH v2] board/arcturus/aarch64-ucls1012a: bump u-boot and kernel version Message-ID: <20220209221731.51116-1-mdurrant@arcturusnetworks.com> From: Oleksandr G Zhadan --- V1->V2: - Bump the kernel to "Linux version 5.4.137" - Bootloader version is still "U-Boot 2019.10" but new targets added. - Remove the /etc/init.d/S09modload script to load the pfe firmware module because now the pfe firmware module is loaded by the kernel - New compressed Image.gz is used --- Signed-off-by: Oleksandr Zhadan Signed-off-by: Michael Durrant --- board/arcturus/aarch64-ucls1012a/post-build.sh | 2 -- board/arcturus/aarch64-ucls1012a/readme.txt | 5 +++-- .../rootfs_overlay/etc/init.d/S09modload | 14 -------------- configs/arcturus_ucls1012a_defconfig | 9 ++++----- 4 files changed, 7 insertions(+), 23 deletions(-) delete mode 100755 board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload diff --git a/board/arcturus/aarch64-ucls1012a/post-build.sh b/board/arcturus/aarch64-ucls1012a/post-build.sh index f8ba78095f..ca3862988d 100755 --- a/board/arcturus/aarch64-ucls1012a/post-build.sh +++ b/board/arcturus/aarch64-ucls1012a/post-build.sh @@ -1,5 +1,3 @@ #!/bin/sh -mkdir -p ${TARGET_DIR}/lib/firmware -cp -f ${BUILD_DIR}/linux-custom/firmware/ppfe/* ${TARGET_DIR}/lib/firmware/ cp -f ${BUILD_DIR}/linux-custom/br2-ucls1012a.its ${BINARIES_DIR}/ diff --git a/board/arcturus/aarch64-ucls1012a/readme.txt b/board/arcturus/aarch64-ucls1012a/readme.txt index 483d5e9aef..cb91716b34 100644 --- a/board/arcturus/aarch64-ucls1012a/readme.txt +++ b/board/arcturus/aarch64-ucls1012a/readme.txt @@ -23,14 +23,15 @@ Result of the build After building, you should obtain this tree: output/images/ + +-- Image.gz +-- arc-ucls1012a.dtb - +-- Image + +-- br2-ucls1012a.its +-- part0-000000.itb +-- rootfs.cpio +-- rootfs.cpio.gz +-- rootfs.tar +-- u-boot.bin - +-- ucls1012a.its + Flashing -------- diff --git a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload b/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload deleted file mode 100755 index c87ffda14f..0000000000 --- a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -# -case "$1" in - start) - modprobe pfe - ;; - stop) - ;; - restart|reload) - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac diff --git a/configs/arcturus_ucls1012a_defconfig b/configs/arcturus_ucls1012a_defconfig index fd33ebf1f6..2a9c1e0582 100644 --- a/configs/arcturus_ucls1012a_defconfig +++ b/configs/arcturus_ucls1012a_defconfig @@ -1,22 +1,21 @@ # Architecture BR2_aarch64=y -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # System settings BR2_TARGET_GENERIC_HOSTNAME="ucls1012a" BR2_TARGET_GENERIC_ISSUE="Welcome to uCLS1012A-SOM" BR2_SYSTEM_DHCP="eth0" -BR2_ROOTFS_OVERLAY="board/arcturus/aarch64-ucls1012a/rootfs_overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="board/arcturus/aarch64-ucls1012a/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/arcturus/aarch64-ucls1012a/post-image.sh" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-kernel,v.20.31)/linux-v.20.31.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-kernel,v.22.06)/linux-v.22.06.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="ucls1012a" +BR2_LINUX_KERNEL_IMAGEGZ=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="arcturus/arc-ucls1012a" @@ -28,7 +27,7 @@ BR2_TARGET_ROOTFS_CPIO_GZIP=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-uboot,v.20.31)/uboot-v.20.31.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-uboot,v.22.06)/uboot-v.22.06.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="UCLS1012A_QSPI128" # Tools -- 2.26.2 From giulio.benetti at benettiengineering.com Wed Feb 9 22:27:08 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 9 Feb 2022 23:27:08 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/guile: Add BR2_ENABLE_LOCALE as dependency. In-Reply-To: <890b73ae-305c-2674-ed03-c06562983328@paguilar.org> References: <20220208213722.836257-1-paguilar@paguilar.org> <5f710ea1-3f98-9435-c033-e73e70e86342@benettiengineering.com> <890b73ae-305c-2674-ed03-c06562983328@paguilar.org> Message-ID: <8d1e16bc-d34f-1760-74c4-2d98b600321d@benettiengineering.com> Hi Pedro, On 09/02/22 22:35, Pedro Aguilar wrote: > Hi Giulio, > > On 2/8/22 23:54, Giulio Benetti wrote: >> Hi again Pedro, >> >> I've reproduced the build failure with your previous attached .config >> file and this patch fixes it. So below... >> >> On 08/02/22 23:06, Giulio Benetti wrote: >>> Hi Pedro, >>> >>> On 08/02/22 22:37, Pedro Aguilar wrote: >>>> If it's not present, enable libiconv. >>> Here it's missing: >>> Fixes: >>> URL to autobuilder failure >> >> ...please provide the autobuilder failure URL and if it doesn't exist >> than we don't need it. > > AFAIK, the build failure fixed by this patch was not reported by the > autobuilder, so I'm afraid there isn't any URL to share. > > In a previous email I wrongly mentioned that it fixed an autobuilder > failure, but all those failures are linked to another issue that seems > to be fixed by a patch sent by Fabrice, although I haven't tested it: > > https://lists.buildroot.org/pipermail/buildroot/2022-February/636041.html Ok, so no autobuilder failure. > May be the commit message of the current v2 patch can remain as is. Can you improve the commit log a bit? Try to 'git log --grep=' some file which has that fix, or git blame it so you can find the commit log and imitate it. That's the best way to learn how to write commit logs. Because "Add BR2_ENABLE_LOCALE as dependency." doesn't mean that much, and "If it's not present, enable libiconv." doesn't sound so good. What about: ``` package/guile: fix build failure due to missing libiconv When building package guile with BR2_ENABLE_LOCALE=n we get the following error: ``` In file included from filesys.c:95: ports-internal.h:26:10: fatal error: iconv.h: No such file or directory 26 | #include | ^~~~~~~~~ compilation terminated. ``` So let's fix it by selecting BR2_PACKAGE_LIBICONV and adding libiconv package as dependency. Signed-off-by: Pedro... ``` Can you please a V3 with this also pointing the V1->V2, V2->V3 changes? Thank you! Best regards -- Giulio Benetti Benetti Engineering sas From james.hilliard1 at gmail.com Wed Feb 9 22:35:51 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 9 Feb 2022 15:35:51 -0700 Subject: [Buildroot] [PATCH 1/1] package/gst1-devtools: drop python2 build dependencies Message-ID: <20220209223551.772606-1-james.hilliard1@gmail.com> Looks like this was missed in c4bbd6da50488944debba29e195557e5b345f2b1 Signed-off-by: James Hilliard --- package/gstreamer1/gst1-devtools/gst1-devtools.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.mk b/package/gstreamer1/gst1-devtools/gst1-devtools.mk index 66b509ae2c..390b20de16 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.mk +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.mk @@ -17,11 +17,7 @@ GST1_DEVTOOLS_DEPENDENCIES = \ json-glib \ $(if $(BR2_PACKAGE_CAIRO),cairo) -ifeq ($(BR2_PACKAGE_PYTHON3),y) GST1_DEVTOOLS_DEPENDENCIES += host-python3 python3 -else -GST1_DEVTOOLS_DEPENDENCIES += host-python python -endif ifeq ($(BR2_PACKAGE_GST1_RTSP_SERVER),y) GST1_DEVTOOLS_DEPENDENCIES += gst1-rtsp-server -- 2.25.1 From james.hilliard1 at gmail.com Wed Feb 9 22:41:05 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 9 Feb 2022 15:41:05 -0700 Subject: [Buildroot] [PATCH 1/1] package/gtest: drop host python2 support Message-ID: <20220209224105.772909-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/gtest/gtest.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/gtest/gtest.mk b/package/gtest/gtest.mk index 673e626c45..5bad1fb5f7 100644 --- a/package/gtest/gtest.mk +++ b/package/gtest/gtest.mk @@ -19,13 +19,8 @@ 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 -- 2.25.1 From giulio.benetti at benettiengineering.com Wed Feb 9 22:42:59 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 9 Feb 2022 23:42:59 +0100 Subject: [Buildroot] Patch state of andes/ae350 In-Reply-To: References: Message-ID: <5D73A104-6D13-4082-9A55-E22215647C87@benettiengineering.com> Hi Peter, I?m going to review this patch soon. Sorry I?ve skipped your board that came before other I?ve reviewed. Best regards ?- Giulio Benetti Benetti Engineering sas > Il giorno 9 feb 2022, alle ore 04:57, Yu Chien Peter Lin ha scritto: > > ?Hi Thomas, > > I would like to follow up on my patches last month. > Are they still under review? Please let me know if > I missed something that needs to be fixed. > > Regards, > Yu-Chien Peter Lin > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From giulio.benetti at benettiengineering.com Wed Feb 9 22:54:31 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 9 Feb 2022 23:54:31 +0100 Subject: [Buildroot] [PATCH v2] board/arcturus/aarch64-ucls1012a: bump u-boot and kernel version In-Reply-To: <20220209221731.51116-1-mdurrant@arcturusnetworks.com> References: <20220209221731.51116-1-mdurrant@arcturusnetworks.com> Message-ID: Hi Oleksander, On 09/02/22 23:17, Michael PDQ wrote: > From: Oleksandr G Zhadan > [0] > --- > V1->V2: > - Bump the kernel to "Linux version 5.4.137" > - Bootloader version is still "U-Boot 2019.10" but new targets added. > - Remove the /etc/init.d/S09modload script to load the pfe firmware > module because now the pfe firmware module is loaded by the kernel > - New compressed Image.gz is used > > --- Please move the 2 SoBs above [0], otherwise they will be dropped since everything after the 3 dashes will be dropped and it's only useful for patch reviewing. > Signed-off-by: Oleksandr Zhadan > Signed-off-by: Michael Durrant > --- > board/arcturus/aarch64-ucls1012a/post-build.sh | 2 -- > board/arcturus/aarch64-ucls1012a/readme.txt | 5 +++-- > .../rootfs_overlay/etc/init.d/S09modload | 14 -------------- > configs/arcturus_ucls1012a_defconfig | 9 ++++----- > 4 files changed, 7 insertions(+), 23 deletions(-) > delete mode 100755 board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload > > diff --git a/board/arcturus/aarch64-ucls1012a/post-build.sh b/board/arcturus/aarch64-ucls1012a/post-build.sh > index f8ba78095f..ca3862988d 100755 > --- a/board/arcturus/aarch64-ucls1012a/post-build.sh > +++ b/board/arcturus/aarch64-ucls1012a/post-build.sh > @@ -1,5 +1,3 @@ > #!/bin/sh > > -mkdir -p ${TARGET_DIR}/lib/firmware > -cp -f ${BUILD_DIR}/linux-custom/firmware/ppfe/* ${TARGET_DIR}/lib/firmware/ > cp -f ${BUILD_DIR}/linux-custom/br2-ucls1012a.its ${BINARIES_DIR}/ > diff --git a/board/arcturus/aarch64-ucls1012a/readme.txt b/board/arcturus/aarch64-ucls1012a/readme.txt > index 483d5e9aef..cb91716b34 100644 > --- a/board/arcturus/aarch64-ucls1012a/readme.txt > +++ b/board/arcturus/aarch64-ucls1012a/readme.txt > @@ -23,14 +23,15 @@ Result of the build > After building, you should obtain this tree: > > output/images/ > + +-- Image.gz This change ^^^ is worth to be mention in commit log > +-- arc-ucls1012a.dtb > - +-- Image > + +-- br2-ucls1012a.its Is there a reason why .its file changes name? If yes can you please write it in commit log? > +-- part0-000000.itb > +-- rootfs.cpio > +-- rootfs.cpio.gz > +-- rootfs.tar > +-- u-boot.bin > - +-- ucls1012a.its > + This ^^^ newline is useless, please drop it > Flashing > -------- > diff --git a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload b/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload > deleted file mode 100755 > index c87ffda14f..0000000000 > --- a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload > +++ /dev/null > @@ -1,14 +0,0 @@ > -#!/bin/sh > -# > -case "$1" in > - start) > - modprobe pfe > - ;; > - stop) > - ;; > - restart|reload) > - ;; > - *) > - echo "Usage: $0 {start|stop|restart}" > - exit 1 > -esac You're removing this script and... > diff --git a/configs/arcturus_ucls1012a_defconfig b/configs/arcturus_ucls1012a_defconfig > index fd33ebf1f6..2a9c1e0582 100644 > --- a/configs/arcturus_ucls1012a_defconfig > +++ b/configs/arcturus_ucls1012a_defconfig > @@ -1,22 +1,21 @@ > # Architecture > BR2_aarch64=y > > -# Linux headers same as kernel, a 4.14 series > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y > > # System settings > BR2_TARGET_GENERIC_HOSTNAME="ucls1012a" > BR2_TARGET_GENERIC_ISSUE="Welcome to uCLS1012A-SOM" > BR2_SYSTEM_DHCP="eth0" > -BR2_ROOTFS_OVERLAY="board/arcturus/aarch64-ucls1012a/rootfs_overlay" ...the overlay directory, can you explain why in commit log? > BR2_ROOTFS_POST_BUILD_SCRIPT="board/arcturus/aarch64-ucls1012a/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/arcturus/aarch64-ucls1012a/post-image.sh" > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-kernel,v.20.31)/linux-v.20.31.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-kernel,v.22.06)/linux-v.22.06.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="ucls1012a" > +BR2_LINUX_KERNEL_IMAGEGZ=y This ^^^ is the reason of renaming to Image.gz but it's worth mention it in commit log > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="arcturus/arc-ucls1012a" > > @@ -28,7 +27,7 @@ BR2_TARGET_ROOTFS_CPIO_GZIP=y > BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > BR2_TARGET_UBOOT_CUSTOM_TARBALL=y > -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-uboot,v.20.31)/uboot-v.20.31.tar.gz" > +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-uboot,v.22.06)/uboot-v.22.06.tar.gz" > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="UCLS1012A_QSPI128" > > # Tools I've built it successfully in gitlab-ci docker, so I think you only need to fix those few stuff and send a V3 so I can re-test and give you my Reviewed-by and Tested-by: Thank you! Best regards -- Giulio Benetti Benetti Engineering sas From giulio.benetti at benettiengineering.com Wed Feb 9 22:58:04 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 9 Feb 2022 23:58:04 +0100 Subject: [Buildroot] [PATCH v2 1/3] board/andes: rearrange nds32 folder structure In-Reply-To: <20220125054956.27492-1-peterlin@andestech.com> References: <20220125054956.27492-1-peterlin@andestech.com> Message-ID: <2135e397-ab3a-8f85-0715-671b8c7382b7@benettiengineering.com> Hi Peter, On 25/01/22 06:49, Yu Chien Peter Lin wrote: I would add also: "Rearrange nds32 folder structure to add different boards"(or SoCs) > 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 Best regards -- Giulio Benetti Benetti Engineering sas From paguilar at paguilar.org Wed Feb 9 22:59:57 2022 From: paguilar at paguilar.org (Pedro Aguilar) Date: Wed, 9 Feb 2022 23:59:57 +0100 Subject: [Buildroot] [PATCH v3 1/1] package/guile: Fix build failure due to missing libiconv Message-ID: <20220209225957.1257630-1-paguilar@paguilar.org> When building package guile with BR2_ENABLE_LOCALE=n we get the following error: ``` In file included from filesys.c:95: ports-internal.h:26:10: fatal error: iconv.h: No such file or directory 26 | #include | ^~~~~~~~~ compilation terminated. ``` So let's fix it by selecting BR2_PACKAGE_LIBICONV and adding libiconv package as dependency. Signed-off-by: Pedro Aguilar --- Changes v2 -> v3: - Improve commit message (thanks to Giulio comments) Changes v1 -> v2: - Use BR2_ENABLE_LOCALE if selected, otherwise use libiconv as before (pointed out by Thomas and Giulio) --- package/guile/Config.in | 1 + package/guile/guile.mk | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/package/guile/Config.in b/package/guile/Config.in index b1182a4cee..f70e674018 100644 --- a/package/guile/Config.in +++ b/package/guile/Config.in @@ -9,6 +9,7 @@ config BR2_PACKAGE_GUILE select BR2_PACKAGE_LIBFFI select BR2_PACKAGE_GMP select BR2_PACKAGE_BDWGC + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE help Guile is an interpreter and compiler for the Scheme programming language, a clean and elegant dialect of Lisp. diff --git a/package/guile/guile.mk b/package/guile/guile.mk index 0f245fca76..03420407f8 100644 --- a/package/guile/guile.mk +++ b/package/guile/guile.mk @@ -18,6 +18,10 @@ GUILE_CPE_ID_VENDOR = gnu GUILE_DEPENDENCIES = host-guile libunistring libffi gmp bdwgc host-pkgconf HOST_GUILE_DEPENDENCIES = host-libunistring host-libffi host-gmp host-bdwgc host-flex host-pkgconf host-gettext +ifeq ($(BR2_ENABLE_LOCALE),) +GUILE_DEPENDENCIES += libiconv +endif + # The HAVE_GC* CFLAGS specify that we will use internal callbacks # instead of the ones provided by # bdwgc. Eg. HAVE_GC_SET_FINALIZER_NOTIFIER specifies that we won't -- 2.25.1 From giulio.benetti at benettiengineering.com Wed Feb 9 23:09:27 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 10 Feb 2022 00:09:27 +0100 Subject: [Buildroot] [PATCH v2 3/3] DEVELOPERS: add Yu-Chien Lin to board/andes In-Reply-To: <20220125054956.27492-3-peterlin@andestech.com> References: <20220125054956.27492-1-peterlin@andestech.com> <20220125054956.27492-3-peterlin@andestech.com> Message-ID: <674c1c83-4bcf-3740-8f79-184c1a86cda3@benettiengineering.com> Hi Peter, On 25/01/22 06:49, Yu Chien Peter Lin wrote: > 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 This ^^^ line goes before its previous one for alphabetical order > F: toolchain/toolchain-external/toolchain-external-andes-nds32/ > > N: Olaf Rempel Best regards -- Giulio Benetti Benetti Engineering sas From giulio.benetti at benettiengineering.com Wed Feb 9 23:16:03 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 10 Feb 2022 00:16:03 +0100 Subject: [Buildroot] [PATCH v3 1/1] package/guile: Fix build failure due to missing libiconv In-Reply-To: <20220209225957.1257630-1-paguilar@paguilar.org> References: <20220209225957.1257630-1-paguilar@paguilar.org> Message-ID: <966178a8-693f-fdf7-b438-8e6c1302258c@benettiengineering.com> Hi Pedro, On 09/02/22 23:59, Pedro Aguilar wrote: > When building package guile with BR2_ENABLE_LOCALE=n > we get the following error: > > ``` > In file included from filesys.c:95: > ports-internal.h:26:10: fatal error: iconv.h: No such file or directory > 26 | #include > | ^~~~~~~~~ > compilation terminated. > ``` > > So let's fix it by selecting BR2_PACKAGE_LIBICONV and > adding libiconv package as dependency. > > Signed-off-by: Pedro Aguilar Reviewed-by: Giulio Benetti Thank you! Best regards -- Giulio Benetti Benetti Engineering sas > --- > Changes v2 -> v3: > - Improve commit message (thanks to Giulio comments) > Changes v1 -> v2: > - Use BR2_ENABLE_LOCALE if selected, otherwise use libiconv > as before (pointed out by Thomas and Giulio) > --- > package/guile/Config.in | 1 + > package/guile/guile.mk | 4 ++++ > 2 files changed, 5 insertions(+) > > diff --git a/package/guile/Config.in b/package/guile/Config.in > index b1182a4cee..f70e674018 100644 > --- a/package/guile/Config.in > +++ b/package/guile/Config.in > @@ -9,6 +9,7 @@ config BR2_PACKAGE_GUILE > select BR2_PACKAGE_LIBFFI > select BR2_PACKAGE_GMP > select BR2_PACKAGE_BDWGC > + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE > help > Guile is an interpreter and compiler for the Scheme > programming language, a clean and elegant dialect of Lisp. > diff --git a/package/guile/guile.mk b/package/guile/guile.mk > index 0f245fca76..03420407f8 100644 > --- a/package/guile/guile.mk > +++ b/package/guile/guile.mk > @@ -18,6 +18,10 @@ GUILE_CPE_ID_VENDOR = gnu > GUILE_DEPENDENCIES = host-guile libunistring libffi gmp bdwgc host-pkgconf > HOST_GUILE_DEPENDENCIES = host-libunistring host-libffi host-gmp host-bdwgc host-flex host-pkgconf host-gettext > > +ifeq ($(BR2_ENABLE_LOCALE),) > +GUILE_DEPENDENCIES += libiconv > +endif > + > # The HAVE_GC* CFLAGS specify that we will use internal callbacks > # instead of the ones provided by > # bdwgc. Eg. HAVE_GC_SET_FINALIZER_NOTIFIER specifies that we won't From giulio.benetti at benettiengineering.com Wed Feb 9 23:17:01 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 10 Feb 2022 00:17:01 +0100 Subject: [Buildroot] [PATCH v3 1/1] package/guile: Fix build failure due to missing libiconv In-Reply-To: <20220209225957.1257630-1-paguilar@paguilar.org> References: <20220209225957.1257630-1-paguilar@paguilar.org> Message-ID: <26f60dc2-965b-08b1-bbd1-2a042a09bd0d@benettiengineering.com> On 09/02/22 23:59, Pedro Aguilar wrote: > When building package guile with BR2_ENABLE_LOCALE=n > we get the following error: > > ``` > In file included from filesys.c:95: > ports-internal.h:26:10: fatal error: iconv.h: No such file or directory > 26 | #include > | ^~~~~~~~~ > compilation terminated. > ``` > > So let's fix it by selecting BR2_PACKAGE_LIBICONV and > adding libiconv package as dependency. > > Signed-off-by: Pedro Aguilar And forgotten: Tested-by: Giulio Benetti Best regards -- Giulio Benetti Benetti Engineering sas > --- > Changes v2 -> v3: > - Improve commit message (thanks to Giulio comments) > Changes v1 -> v2: > - Use BR2_ENABLE_LOCALE if selected, otherwise use libiconv > as before (pointed out by Thomas and Giulio) > --- > package/guile/Config.in | 1 + > package/guile/guile.mk | 4 ++++ > 2 files changed, 5 insertions(+) > > diff --git a/package/guile/Config.in b/package/guile/Config.in > index b1182a4cee..f70e674018 100644 > --- a/package/guile/Config.in > +++ b/package/guile/Config.in > @@ -9,6 +9,7 @@ config BR2_PACKAGE_GUILE > select BR2_PACKAGE_LIBFFI > select BR2_PACKAGE_GMP > select BR2_PACKAGE_BDWGC > + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE > help > Guile is an interpreter and compiler for the Scheme > programming language, a clean and elegant dialect of Lisp. > diff --git a/package/guile/guile.mk b/package/guile/guile.mk > index 0f245fca76..03420407f8 100644 > --- a/package/guile/guile.mk > +++ b/package/guile/guile.mk > @@ -18,6 +18,10 @@ GUILE_CPE_ID_VENDOR = gnu > GUILE_DEPENDENCIES = host-guile libunistring libffi gmp bdwgc host-pkgconf > HOST_GUILE_DEPENDENCIES = host-libunistring host-libffi host-gmp host-bdwgc host-flex host-pkgconf host-gettext > > +ifeq ($(BR2_ENABLE_LOCALE),) > +GUILE_DEPENDENCIES += libiconv > +endif > + > # The HAVE_GC* CFLAGS specify that we will use internal callbacks > # instead of the ones provided by > # bdwgc. Eg. HAVE_GC_SET_FINALIZER_NOTIFIER specifies that we won't From giulio.benetti at benettiengineering.com Wed Feb 9 23:39:07 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 10 Feb 2022 00:39:07 +0100 Subject: [Buildroot] [PATCH v2 2/3] board/andes/ae350: add support for Andes AE350 In-Reply-To: <20220125054956.27492-2-peterlin@andestech.com> References: <20220125054956.27492-1-peterlin@andestech.com> <20220125054956.27492-2-peterlin@andestech.com> Message-ID: <7f565a32-0e66-d828-3d38-4e91577e88ff@benettiengineering.com> Hi Peter, I review it now, On 25/01/22 06:49, 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 Here you need to write the changes from previous patches like: --- V1->V2: * done this * done that V2->V3: * done this * done that > --- > 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 Would it be possible for you to upstream these patches? I mean, do you maintain the uboot, opensbi repositories so you can do that? If yes it would be great having no patches at all here. > 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; > + }; > + }; > + }; > +}; It's a bit out of topic, but with this .dts ^^^ you define and entire SoC+board, shouldn't it be like a .dtsi file for SoC and a .dts file for board? > 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 This is ok, but during the last 15-20 days I've seen the increasing wish to go for extlinux.conf instead of boot.scr because it's easier to debug. Then nothing prevents one to customize the defconfig and use the boot.scr in production, where for example I find checksum very important. But please use extlinux.conf here. > 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" > + } > +} This file ^^^ doesn't respect the standard I've defined in Buildroot manual: https://buildroot.org/downloads/manual/manual.html#writing-genimage-cfg It's some time I have to write a Linter for it, but time is always few and I will take some other time :-/ > 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 Here please add: $ sudo sync > + > +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. "it should boot..." > 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" I've just built your defconfig using gitlab-ci docker but it fails because you need to add also: BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y > +# BR2_TARGET_UBOOT_FORMAT_BIN is not set > +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.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" For the rest it looks good to me. So I wait the V3 from you. Thank you! Best regards -- Giulio Benetti Benetti Engineering sas From baruch at tkos.co.il Thu Feb 10 05:42:19 2022 From: baruch at tkos.co.il (Baruch Siach) Date: Thu, 10 Feb 2022 07:42:19 +0200 Subject: [Buildroot] [PATCH 1/1] package/gst1-devtools: drop python2 build dependencies In-Reply-To: <20220209223551.772606-1-james.hilliard1@gmail.com> References: <20220209223551.772606-1-james.hilliard1@gmail.com> Message-ID: <87wni3b7iq.fsf@tarshish> Hi James, On Wed, Feb 09 2022, James Hilliard wrote: > Looks like this was missed in c4bbd6da50488944debba29e195557e5b345f2b1 > > Signed-off-by: James Hilliard > --- > package/gstreamer1/gst1-devtools/gst1-devtools.mk | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.mk b/package/gstreamer1/gst1-devtools/gst1-devtools.mk > index 66b509ae2c..390b20de16 100644 > --- a/package/gstreamer1/gst1-devtools/gst1-devtools.mk > +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.mk > @@ -17,11 +17,7 @@ GST1_DEVTOOLS_DEPENDENCIES = \ > json-glib \ > $(if $(BR2_PACKAGE_CAIRO),cairo) > > -ifeq ($(BR2_PACKAGE_PYTHON3),y) > GST1_DEVTOOLS_DEPENDENCIES += host-python3 python3 Maybe better add this to the list of unconditional dependencies above? baruch > -else > -GST1_DEVTOOLS_DEPENDENCIES += host-python python > -endif > > ifeq ($(BR2_PACKAGE_GST1_RTSP_SERVER),y) > GST1_DEVTOOLS_DEPENDENCIES += gst1-rtsp-server -- ~. .~ Tk Open Systems =}------------------------------------------------ooO--U--Ooo------------{= - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il - From james.hilliard1 at gmail.com Thu Feb 10 06:11:00 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 9 Feb 2022 23:11:00 -0700 Subject: [Buildroot] [PATCH v2 1/1] package/gst1-devtools: drop python2 build dependencies Message-ID: <20220210061100.810772-1-james.hilliard1@gmail.com> Looks like this was missed in c4bbd6da50488944debba29e195557e5b345f2b1 Signed-off-by: James Hilliard --- Changes v1 -> v2: - move python3 deps to unconditional deps list --- package/gstreamer1/gst1-devtools/gst1-devtools.mk | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.mk b/package/gstreamer1/gst1-devtools/gst1-devtools.mk index 66b509ae2c..9089b12188 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.mk +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.mk @@ -12,17 +12,13 @@ GST1_DEVTOOLS_LICENSE_FILES = validate/COPYING GST1_DEVTOOLS_INSTALL_STAGING = YES GST1_DEVTOOLS_DEPENDENCIES = \ + host-python3 \ + python3 \ gstreamer1 \ gst1-plugins-base \ json-glib \ $(if $(BR2_PACKAGE_CAIRO),cairo) -ifeq ($(BR2_PACKAGE_PYTHON3),y) -GST1_DEVTOOLS_DEPENDENCIES += host-python3 python3 -else -GST1_DEVTOOLS_DEPENDENCIES += host-python python -endif - ifeq ($(BR2_PACKAGE_GST1_RTSP_SERVER),y) GST1_DEVTOOLS_DEPENDENCIES += gst1-rtsp-server endif -- 2.25.1 From a.marud at post.pl Thu Feb 10 06:23:39 2022 From: a.marud at post.pl (Arek Marud) Date: Thu, 10 Feb 2022 07:23:39 +0100 Subject: [Buildroot] I have a problem adding new package In-Reply-To: References: <20220130234800.14da56ca@windsurf> Message-ID: Hi Arnout, > Hi Arek, > > Please don't top-post, but reply inline like I do below. > > On 04/02/2022 11:22, Arek Marud wrote: > > Helo Thomas, > > > > Thank you for your answer. > > I had a problem with libonvif compilation. Compiler complaing about > > unsafe include path (details pasted below). > > > > I was able to compile project ONLY when --includedir parameter was set, > > without it - compiler complains about include path. > > > > https://gist.github.com/arekmd/11e9621ae3fc476cf37e80150d15b177 > > > > I pasted build log without LIBONVIF_CONF_OPTS line. > > > > > > myname buildroot$> make libonvif-build > > WARNING: no hash file for v1.1.1.tar.gz > > > > > libonvif 1.1.1 Extracting > [snip] > > make[3]: Entering directory '/home/myname/workbench/resources/development/myproj/bu > > ildroot/buildroot/output/build/libonvif-1.1.1/build' > > /bin/sh ../libtool --tag=CC --mode=compile /home/myname/workbench/resources/dev > > elopment/myproj/buildroot/buildroot/output/host/bin/aarch64-myproj-linux-gnu-gcc - > > DHAVE_CONFIG_H -I. -I.. -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFS > > ET_BITS=64 -I/usr/include -I/usr/include/libxml2 -I../source -D_LARGEFILE_SOURCE > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > > This is what is wrong. > > It is caused by the following lines in build/Makefile.am [1] > > AM_CFLAGS = -I$(INCLUDE) -I$(INCLUDE)/libxml2 -I../source > ... > INCLUDE = @includedir@ > LIB = @libdir@ > > That is just simply wrong. > > The proper fix is to patch the project and > > - Remove the -I stuff from AM_CFLAGS, instead just set AM_CFLAGS = -I../source > - Remove the INCLUDE and LIB assignments > - Do proper discovery of libxml2 in configure.ac > - Add the libxml2 include and lib directories to CFLAGS and LIBS either in > configure.ac or in build/Makefile.am > > > But it seems that this project is pretty dead, so the easier approach is to > just add > > LIBONVIF_MAKE_OPTS = \ > INCLUDE=$(STAGING_DIR)/usr/include \ > LIBS=$(STAGING_DIR)/usr/lib That worked. Library successfully compile and install. > > Regards, > Arnout > > [1] https://github.com/sr99622/libonvif/blob/76961fb9f3ece462724a4a6c09b4bd7cc051b759/build/Makefile.am#L7 > Thank your for your help. -- Best regards, Arek From br015 at umbiko.net Thu Feb 10 06:42:57 2022 From: br015 at umbiko.net (Andreas Ziegler) Date: Thu, 10 Feb 2022 06:42:57 +0000 Subject: [Buildroot] [PATCH 000/107] Drop python 2.7 In-Reply-To: References: Message-ID: <2378b58c9e724d2bb27ec019e165798e@umbiko.net> Hi Yann, Hi Peter, On 2022-02-09 21:34, Yann E. MORIN wrote: > Peter ,All, > > On 2022-02-09 17:50 +0100, Peter Korsgaard spake thusly: >> Python 2.7 is EOL since April 2020 and almost all packages support >> python 3, so drop it before the 2022.02 release. >> >> It is a big series, but the changes are mainly mechanical in nature. >> >> There is still some cleanup to do, E.G. the python2 support in >> pkg-python and the host python-setuptools package - But this is IMHO >> the minimum changes before -rc1. There seem to be some more references to python(2) in packages; this build failure is from package/crda: # make clean && make ... make[1]: *** No rule to make target 'host-python', needed by '/home/data/buildroot.x86_64/build/host-python-pycryptodomex-3.13.0/.stamp_configured'. Stop. make: *** [Makefile:23: _all] Error 2 $ grep python-pycryptodomex */*.mk crda/crda.mk:CRDA_DEPENDENCIES = host-pkgconf host-python-pycryptodomex libnl libgcrypt python3-pycryptodomex/python3-pycryptodomex.mk:# Please keep in sync with package/python-pycryptodomex/python-pycryptodomex.mk python3-pycryptodomex/python3-pycryptodomex.mk:HOST_PYTHON3_PYCRYPTODOMEX_DL_SUBDIR = python-pycryptodomex python-pycryptodomex/python-pycryptodomex.mk:# python-pycryptodomex Kind regards, Andreas >> Peter Korsgaard (107): > ... >> package/python: drop target package > ... >> package/python: drop host package > ... >> docs/manual: drop python2 references > > All 107 patches applied, thanks! > > I'll reply further to two of them, with ultra-minor nits. > > Pfew, 21st century, here we come at last! ;-) > > Regards, > Yann E. MORIN. From thomas.petazzoni at bootlin.com Thu Feb 10 07:22:42 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 10 Feb 2022 07:22:42 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-02-09 Message-ID: <20220210072247.8A7AB60E79@smtp3.osuosl.org> Hello, Autobuild statistics for 2022-02-09 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 47 | 7 | 0 | 54 | 2021.11.x | 17 | 0 | 0 | 17 | master | 57 | 49 | 0 | 106 | Classification of failures by reason for master ----------------------------------------------- bluez5_utils-5.63 | 9 host-grpc-1.43.0 | 5 host-libselinux-3.3 | 5 gerbera-1.9.2 | 4 host-python-docutils-0.15.2 | 3 unknown | 3 mongrel2-1.13.0 | 2 qt5webkit-5.212.0-alpha4 | 2 rygel-0.40.2 | 2 sg3_utils-1.47 | 2 wavemon-0.9.4 | 2 bat-0.19.0 | 1 belle-sip-4.4.8 | 1 cryptsetup-2.4.2 | 1 frr-8.1 | 1 google-breakpad-7515ab13768... | 1 luasyslog-2.2.0 | 1 python-docutils-0.15.2 | 1 sdl2_ttf-2.0.18 | 1 target-finalize | 1 tovid-87c676f4aadb7303d2cd9... | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | bat-0.19.0 | NOK | http://autobuild.buildroot.net/results/8018316713099d5463e02d5887bfab38faa4f9af | xtensa | belle-sip-4.4.8 | NOK | http://autobuild.buildroot.net/results/2cf6fa7f585238132353e85c3cf12d8b03aa53e2 | mips64el | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/8f29828d2e5e086e0c38731a1e57e78a03cdcaf9 | nios2 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/2acd2b4213e9daf1c99a5bff6a7fad03ca80ce57 | riscv64 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/66bf0da754768aa93c7d5ff9479bf88157300be1 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/3eba47dde018c21537d1636e532f719a0743bd67 | or1k | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/19ff00944d01159cbccfaf3d8ad5d3b92163b957 | mips64el | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/dfb6eb9903441b1fdebeef806983b5c07eb74b55 | sparc64 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/17d0cc94c02f77158892cb2084092e12e6c59544 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/13a739a14e04379ffc4d7d232ed9bb03aac7a6f3 | mips64el | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/063bca06fb3c292edc688cfa04bf82ebcc86cead | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/5a20fb24d9f35b89b119b1b7e15b3a76db0da087 | xtensa | frr-8.1 | NOK | http://autobuild.buildroot.net/results/1fee99de78187d70cdc755e8bcfc2a98df8d751d | powerpc | gerbera-1.9.2 | NOK | http://autobuild.buildroot.net/results/2195632ac503ef69792dfbe497ca5da8749a28c5 | arm | gerbera-1.9.2 | NOK | http://autobuild.buildroot.net/results/76527c72fb9f88a726afb6af7437d799e8b852c1 | arc | gerbera-1.9.2 | NOK | http://autobuild.buildroot.net/results/13774bf24f4dc22dc860d921a54829398f7b8a40 | s390x | gerbera-1.9.2 | NOK | http://autobuild.buildroot.net/results/b9eb00edc7fa3e38df4f05219f7fa40be237489b | mipsel | google-breakpad-7515ab13768... | NOK | http://autobuild.buildroot.net/results/4bc37008fe12a21007f543a3c4de39a2b709b433 | arm | host-grpc-1.43.0 | NOK | http://autobuild.buildroot.net/results/a4f15d2acf57ab352a89916f2424283d63b8dfc3 | arm | host-grpc-1.43.0 | NOK | http://autobuild.buildroot.net/results/d5430c68b6cea214f8f277a096016b0b2427d803 | riscv64 | host-grpc-1.43.0 | NOK | http://autobuild.buildroot.net/results/7171f69f51f85a3e3f92bec65dd6bbbf7806ec11 | mips64el | host-grpc-1.43.0 | NOK | http://autobuild.buildroot.net/results/574bfde8739b9ba3daa928b82556df6818746316 | mips64el | host-grpc-1.43.0 | NOK | http://autobuild.buildroot.net/results/50387c4fb591a12d818fdbf361fe78a17959536c | mipsel | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/b7cdc5da21cde72de06177d8fb03a892fc22661e | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/56821dbcef76c80a7c523fe82586d61fec85c4bb | i586 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/bda8c8084fa268058ecf198cbd5e30513bd10461 | m68k | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/d84ef6090b9c0fbf80a6450367b1873e6e65f583 | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/b4b7d70f285f0264c23430b8f413f9e7bcf782d3 | arm | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/48ab2eedf9bf80293e152a095a6d08b7e284f914 | aarch64 | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/59ad72cecefee98d62b2ca7686d4f905954d3b32 | or1k | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/b65a9974017724a2cb4a0550513398020a72df53 | powerpc64 | luasyslog-2.2.0 | NOK | http://autobuild.buildroot.net/results/df2aabcf2ae07cad66b869ec4ac76702d2c32dc5 | arm | mongrel2-1.13.0 | NOK | http://autobuild.buildroot.net/results/dcb2c5cbdd6a703eb9cb3fb44c814bfcb86dbbaa | arm | mongrel2-1.13.0 | NOK | http://autobuild.buildroot.net/results/b9dd4b65444a2cff4cb68844d97bdb40f1681b9d | mipsel | python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/f071f406feef00732f69d998453a3d4472eb82ef | arm | qt5webkit-5.212.0-alpha4 | NOK | http://autobuild.buildroot.net/results/ea44b4ca9d851f21f75afbda9f4bc97557cc8a72 | arm | qt5webkit-5.212.0-alpha4 | NOK | http://autobuild.buildroot.net/results/5d1ecf9585025f3fa7cb0d06bf0a7e0600586dc7 | arc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/6696bb7570fd988055088daf0fbff00e1945724e | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/c4897e6086036963b3b6ef4cc4d027a6b17d9656 | arm | sdl2_ttf-2.0.18 | NOK | http://autobuild.buildroot.net/results/3fecb96a8063b1a28703682e9373714c1c9cfa24 | m68k | sg3_utils-1.47 | NOK | http://autobuild.buildroot.net/results/db2eef5351bf6f50664a5d9d306c9207257e92cd | m68k | sg3_utils-1.47 | NOK | http://autobuild.buildroot.net/results/34c3c48e2574d1684b0621e7fa59ae9a2249c139 | powerpc | target-finalize | NOK | http://autobuild.buildroot.net/results/5454298ea61c4d59e4936cba084b8159d8e3c91e | arc | tovid-87c676f4aadb7303d2cd9... | NOK | http://autobuild.buildroot.net/results/e01b393b78c4c81e8dc17fabd61cbee7e6000fba | powerpc64 | unknown | NOK | http://autobuild.buildroot.net/results/1eb464ddafc85cc24ecf97f646dc6e277e58e280 | aarch64 | unknown | NOK | http://autobuild.buildroot.net/results/cf3ddf408b26fa8f86a545588b24882b4a7ac257 | sh4 | unknown | NOK | http://autobuild.buildroot.net/results/31dfc54636c76f2b5a13373e9d420f7b01d78cec | mips64el | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/edec191fc961fff3b5669c464395474cff67af96 | riscv64 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/2341cb5c97085d4fe5c065477e9212330d604c4c | Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 2 openal-1.20.1 | 2 erlang-jiffy-1.0.6 | 1 monkey-f54856ce250c4e257354... | 1 unknown | 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/e66956c1179a7f5a9868511c8459429d9091faea | m68k | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/17f56c0d4ba7c66003d31886fe2aab17e1a2123f | arm | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/2ccb85a89c9adf912704f573858425612270abc4 | aarch64 | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/9f9f8d470bff55c0a223b9471df95b6eedeb87be | or1k | openal-1.20.1 | NOK | http://autobuild.buildroot.net/results/7d532a48093aef35eee2293e8049796eb8500823 | or1k | openal-1.20.1 | NOK | http://autobuild.buildroot.net/results/7239e5ebbdf2754fdb955de61a73b6cceef03f4f | i586 | unknown | NOK | http://autobuild.buildroot.net/results/5155f6513a60c43843b9c2101a1b2c33de06f41c | Gitlab CI results for 2022-02-09 ================================ -- http://autobuild.buildroot.net From peter at korsgaard.com Thu Feb 10 07:24:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 08:24:21 +0100 Subject: [Buildroot] [PATCH 000/107] Drop python 2.7 In-Reply-To: <2378b58c9e724d2bb27ec019e165798e@umbiko.net> (Andreas Ziegler's message of "Thu, 10 Feb 2022 06:42:57 +0000") References: <2378b58c9e724d2bb27ec019e165798e@umbiko.net> Message-ID: <87zgmzw5ei.fsf@dell.be.48ers.dk> >>>>> "Andreas" == Andreas Ziegler writes: > Hi Yann, > Hi Peter, > On 2022-02-09 21:34, Yann E. MORIN wrote: >> Peter ,All, >> >> On 2022-02-09 17:50 +0100, Peter Korsgaard spake thusly: >>> Python 2.7 is EOL since April 2020 and almost all packages support >>> python 3, so drop it before the 2022.02 release. >>> >>> It is a big series, but the changes are mainly mechanical in nature. >>> >>> There is still some cleanup to do, E.G. the python2 support in >>> pkg-python and the host python-setuptools package - But this is IMHO >>> the minimum changes before -rc1. > There seem to be some more references to python(2) in packages; this > build failure is from package/crda: > # make clean && make > ... > make[1]: *** No rule to make target 'host-python', needed by > '/home/data/buildroot.x86_64/build/host-python-pycryptodomex-3.13.0/.stamp_configured'. Stop. > make: *** [Makefile:23: _all] Error 2 Ahh yes, that is because we end up in package/pkg-python.mk with: ifeq ($$($(2)_NEEDS_HOST_PYTHON),) $(2)_DEPENDENCIES += $$(if $$(BR2_PACKAGE_PYTHON3),host-python3,host-python) And you (presumably) don't have python3 enabled. I'll send a fix. -- Bye, Peter Korsgaard From br015 at umbiko.net Thu Feb 10 07:56:36 2022 From: br015 at umbiko.net (Andreas Ziegler) Date: Thu, 10 Feb 2022 07:56:36 +0000 Subject: [Buildroot] [PATCH 000/107] Drop python 2.7 In-Reply-To: <87zgmzw5ei.fsf@dell.be.48ers.dk> References: <2378b58c9e724d2bb27ec019e165798e@umbiko.net> <87zgmzw5ei.fsf@dell.be.48ers.dk> Message-ID: <0ae21fe17b6d8e56be3d19feb0480e3c@umbiko.net> Hi Peter, On 2022-02-10 07:24, Peter Korsgaard wrote: >>>>>> "Andreas" == Andreas Ziegler writes: > > > Hi Yann, > > Hi Peter, > > > On 2022-02-09 21:34, Yann E. MORIN wrote: > >> Peter ,All, > >> > >> On 2022-02-09 17:50 +0100, Peter Korsgaard spake thusly: > >>> Python 2.7 is EOL since April 2020 and almost all packages support > >>> python 3, so drop it before the 2022.02 release. > >>> > >>> It is a big series, but the changes are mainly mechanical in > nature. > >>> > >>> There is still some cleanup to do, E.G. the python2 support in > >>> pkg-python and the host python-setuptools package - But this is > IMHO > >>> the minimum changes before -rc1. > > > There seem to be some more references to python(2) in packages; this > > build failure is from package/crda: > > > # make clean && make > > ... > > make[1]: *** No rule to make target 'host-python', needed by > > > '/home/data/buildroot.x86_64/build/host-python-pycryptodomex-3.13.0/.stamp_configured'. > Stop. > > make: *** [Makefile:23: _all] Error 2 > > Ahh yes, that is because we end up in package/pkg-python.mk with: > > ifeq ($$($(2)_NEEDS_HOST_PYTHON),) > $(2)_DEPENDENCIES += $$(if > $$(BR2_PACKAGE_PYTHON3),host-python3,host-python) Ah, this may be the reason I have two sets of host-python packages in my build tree :-D > > And you (presumably) don't have python3 enabled. I'll send a fix. Correct, I do not use Python on the target, but (at lest) one package insists on having host-python. I'm currently testing by changing host-python to host-python3 in package/crda, and found another issue; this probably also needs a change: [python3.mk] # Some packages may have build scripts requiring python3, whatever is the # python version chosen for the target. # Only install the python symlink in the host tree if python3 is enabled # for the target. ifeq ($(BR2_PACKAGE_PYTHON3),y) define HOST_PYTHON3_INSTALL_SYMLINK ln -fs python3 $(HOST_DIR)/bin/python ln -fs python3-config $(HOST_DIR)/bin/python-config endef Is there any need of keeping separate python3 packages, now that python == python3? Kind regards, Andreas > -- > Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Thu Feb 10 07:58:21 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 10 Feb 2022 08:58:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/omniorb: switch to host-python3 Message-ID: <20220210075821.493485-1-fontaine.fabrice@gmail.com> Switch to host-python3 which is supported since version 4.2.1 and https://sourceforge.net/p/omniorb/svn/HEAD/tree/tags/4_2_1/omniORBpy/update.log to avoid the following build failure since removal of host-python in commit 2743ce00ca61fde1537b64a165a69d497052be58: make: *** No rule to make target 'host-python', needed by '/home/buildroot/autobuild/instance-1/output-1/build/host-omniorb-4.3.0/.stamp_configured'. Stop. Fixes: - http://autobuild.buildroot.org/results/d415c2501b27cacf2356f0f6924ee7706d7a4070 Signed-off-by: Fabrice Fontaine --- package/omniorb/omniorb.mk | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/package/omniorb/omniorb.mk b/package/omniorb/omniorb.mk index a1943968f1..b44ec53fd5 100644 --- a/package/omniorb/omniorb.mk +++ b/package/omniorb/omniorb.mk @@ -11,11 +11,7 @@ OMNIORB_INSTALL_STAGING = YES OMNIORB_LICENSE = GPL2+, LGPL-2.1+ OMNIORB_LICENSE_FILES = COPYING COPYING.LIB OMNIORB_DEPENDENCIES = host-omniorb -HOST_OMNIORB_DEPENDENCIES = host-python - -# omniorb is not python3 friendly, so force the python interpreter -OMNIORB_CONF_OPTS = ac_cv_path_PYTHON=$(HOST_DIR)/bin/python2 -HOST_OMNIORB_CONF_OPTS = ac_cv_path_PYTHON=$(HOST_DIR)/bin/python2 +HOST_OMNIORB_DEPENDENCIES = host-python3 # Defaulting long double support to a safe option for the # mix of embedded targets, this could later be automated -- 2.34.1 From neal.frager at xilinx.com Thu Feb 10 08:19:31 2022 From: neal.frager at xilinx.com (Neal Frager) Date: Thu, 10 Feb 2022 01:19:31 -0700 Subject: [Buildroot] [PATCH v4 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 Message-ID: <20220210081932.3114763-1-neal.frager@xilinx.com> This patch: - bumps ATF to Xilinx v2.6: mainline v2.6 requires patch to build - bumps U-Boot to Xilinx 2022.01: important drivers not in mainline - bumps Linux to Xilinx 5.15: important drivers not in mainline - deletes board/zynqmp/patches directory: patches already in mainline - modifies board/zynqmp/genimage.cfg: U-Boot 2022.01 uses u-boot.itb format - adds extlinux.conf to vfat bootfs - modifies U-Boot to unified xilinx_zynqmp_virt_defconfig (supports all boards) - adds support for SPL pm_cfg_obj.c loading to PMU firmware - enables support for host machines without OpenSSL required by U-Boot and Linux --- V1->V2: * fixed general build issues * added extlinux.conf for run-time boot issue V2->V3: * enabled support for host machines without OpenSSL required by U-Boot and Linux * moved readme.txt update to zynqmp_zcu102_defconfig patch 2/2 V3->V4: * cleaned up commit log messages * added version history --- Signed-off-by: Neal Frager Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti [Giulio: only build tested] Signed-off-by: Neal Frager --- board/zynqmp/extlinux.conf | 5 + board/zynqmp/genimage.cfg | 6 +- ...-fix-Remove-GGC-ignore-Warray-bounds.patch | 68 -- ...64-zynqmp-zcu106-fix-SPL-MMC-booting.patch | 52 -- ...2-arm64-zynqmp-Enable-booting-to-ATF.patch | 114 ---- ...ept-an-absolute-path-for-PMUFW_INIT_.patch | 68 -- ...ynqmp-pass-the-PS-init-file-as-a-kco.patch | 175 ----- board/zynqmp/pm_cfg_obj.c | 614 ++++++++++++++++++ board/zynqmp/post-build.sh | 8 + board/zynqmp/post-image.sh | 4 +- configs/zynqmp_zcu106_defconfig | 23 +- 11 files changed, 648 insertions(+), 489 deletions(-) create mode 100644 board/zynqmp/extlinux.conf delete mode 100644 board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch delete mode 100644 board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch delete mode 100644 board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch delete mode 100644 board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch delete mode 100644 board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch create mode 100644 board/zynqmp/pm_cfg_obj.c create mode 100755 board/zynqmp/post-build.sh diff --git a/board/zynqmp/extlinux.conf b/board/zynqmp/extlinux.conf new file mode 100644 index 0000000000..ae3ec8614a --- /dev/null +++ b/board/zynqmp/extlinux.conf @@ -0,0 +1,5 @@ +label linux + kernel /Image + devicetree /system.dtb + append console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait + diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg index ed202f4550..20d8352c08 100644 --- a/board/zynqmp/genimage.cfg +++ b/board/zynqmp/genimage.cfg @@ -2,11 +2,13 @@ image boot.vfat { vfat { files = { "boot.bin", - "u-boot.bin", - "atf-uboot.ub", + "u-boot.itb", "system.dtb", "Image" } + file extlinux/extlinux.conf { + image = extlinux.conf + } } size = 32M diff --git a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch b/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch deleted file mode 100644 index 0c1a9ba2a4..0000000000 --- a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch +++ /dev/null @@ -1,68 +0,0 @@ -From da003e6ada7d0217fe99dc7c649a731f8ebd3c34 Mon Sep 17 00:00:00 2001 -From: Deepika Bhavnani -Date: Thu, 15 Aug 2019 00:56:46 +0300 -Subject: [PATCH] Coverity fix: Remove GGC ignore -Warray-bounds - -GCC diagnostics were added to ignore array boundaries, instead -of ignoring GCC warning current code will check for array boundaries -and perform and array update only for valid elements. - -Resolves: `CID 246574` `CID 246710` `CID 246651` - -Signed-off-by: Deepika Bhavnani -Change-Id: I7530ecf7a1707351c6ee87e90cc3d33574088f57 - -Backported from: 41af05154abe136938bcfb5f26c969933784bbef -[Adapted to apply on 1.5] - ---- - lib/psci/psci_common.c | 20 ++++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) - -diff --git a/lib/psci/psci_common.c b/lib/psci/psci_common.c -index 2220a745cd6e..6282d992a2f0 100644 ---- a/lib/psci/psci_common.c -+++ b/lib/psci/psci_common.c -@@ -188,21 +188,17 @@ static unsigned int get_power_on_target_pwrlvl(void) - /****************************************************************************** - * Helper function to update the requested local power state array. This array - * does not store the requested state for the CPU power level. Hence an -- * assertion is added to prevent us from accessing the wrong index. -+ * assertion is added to prevent us from accessing the CPU power level. - *****************************************************************************/ - static void psci_set_req_local_pwr_state(unsigned int pwrlvl, - unsigned int cpu_idx, - plat_local_state_t req_pwr_state) - { -- /* -- * This should never happen, we have this here to avoid -- * "array subscript is above array bounds" errors in GCC. -- */ - assert(pwrlvl > PSCI_CPU_PWR_LVL); --#pragma GCC diagnostic push --#pragma GCC diagnostic ignored "-Warray-bounds" -- psci_req_local_pwr_states[pwrlvl - 1][cpu_idx] = req_pwr_state; --#pragma GCC diagnostic pop -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && -+ (cpu_idx < PLATFORM_CORE_COUNT)) { -+ psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx] = req_pwr_state; -+ } - } - - /****************************************************************************** -@@ -228,7 +224,11 @@ static plat_local_state_t *psci_get_req_local_pwr_states(unsigned int pwrlvl, - { - assert(pwrlvl > PSCI_CPU_PWR_LVL); - -- return &psci_req_local_pwr_states[pwrlvl - 1][cpu_idx]; -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && -+ (cpu_idx < PLATFORM_CORE_COUNT)) { -+ return &psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx]; -+ } else -+ return NULL; - } - - /* --- -2.34.0 - diff --git a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch b/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch deleted file mode 100644 index 4d85e1bb12..0000000000 --- a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch +++ /dev/null @@ -1,52 +0,0 @@ -From e5d72ed8339eb05285448aad3c89d21e4d18fd29 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Mon, 26 Feb 2018 09:40:34 +0100 -Subject: [PATCH] arm64: zynqmp: zcu106: fix SPL MMC booting - -The U-Boot SPL generated with the current zcu106 defconfig cannot boot -from MMC: - - [...] - U-Boot SPL 2018.01 (Feb 21 2018 - 17:47:14) - EL Level: EL3 - Trying to boot from MMC1 - sdhci_transfer_data: Error detected in status(0x408020)! - spl_load_image_fat_os: error reading image u-boot.bin, err - -2 - spl_load_image_fat: error reading image u-boot.img, err - -6 - SPL: failed to boot from all boot devices - ### ERROR ### Please RESET the board ### - -Fix by lowering the rpll value. The new value for the RPLL_CTRL -register comes from the current psu_init_gpl.c from the HDF file at -https://github.com/xilinx/hdf-examples/tree/01ad8ea5fd1989abf4ea5a072d019a16cb2bc546/zcu106-zynqmp -(generated by Vivado v2017.4). - -RPLL and sdio1_ref clocks before and after this change: - - - Old values: RPLL 1.36 GHz, sdio1_ref 272 MHz - - New values: RPLL 1.16 GHz, sdio1_ref 233 MHz - -Signed-off-by: Luca Ceresoli -Cc: Michal Simek -Upstream-status: accepted upstream in a different form ---- - - board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -index 4d18abe000ca..e6fa477e53e7 100644 ---- a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -+++ b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -@@ -10,7 +10,7 @@ - static unsigned long psu_pll_init_data(void) - { - psu_mask_write(0xFF5E0034, 0xFE7FEDEFU, 0x7E4E2C62U); -- psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00013C00U); -+ psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00014600U); - psu_mask_write(0xFF5E0030, 0x00000008U, 0x00000008U); - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000001U); - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000000U); --- -2.7.4 - diff --git a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch b/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch deleted file mode 100644 index 487fff6812..0000000000 --- a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 5e3cac50cc981e01d9072241035a8d4162560c71 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Mon, 12 Mar 2018 17:18:38 +0100 -Subject: [PATCH] arm64: zynqmp: Enable booting to ATF - -U-Boot is now able to boot to ARM Trusted Firmware (ATF). The boot -flow is SPL(EL3) loads ATF and full u-boot and jump to ATF(EL3) which -pass control to full u-boot(EL2). This has been tested on zcu106, so -enable it in this defconfig. - -To generate an image that triggers this booting flow, you need to pass -'-O arm-trusted-firmware' to mkimage. - -Signed-off-by: Luca Ceresoli -Signed-off-by: Michal Simek -Backported from upstream: http://git.denx.de/?p=u-boot.git;a=commit;h=5e3cac50cc981e01d9072241035a8d4162560c71 ---- - - configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 + - configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 + - configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 + - configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 + - configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 1 + - configs/xilinx_zynqmp_zcu102_revA_defconfig | 1 + - configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 + - 7 files changed, 7 insertions(+) - -diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig -index c5bfa2b12638..488c72258b0e 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig -index f86dce403a42..5d501eec0edd 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig -@@ -20,6 +20,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig -index 6e947cf56827..6f7eaebd7676 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig -@@ -16,6 +16,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_CMD_MEMTEST=y - CONFIG_SYS_ALT_MEMTEST=y -diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig -index 1c934858c61c..7a3806cba4b5 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig -@@ -17,6 +17,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_CMD_MEMTEST=y - CONFIG_SYS_ALT_MEMTEST=y -diff --git a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig -index e13c7c56f310..e4408f182ca0 100644 ---- a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig -+++ b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig b/configs/xilinx_zynqmp_zcu102_revA_defconfig -index 5b2cd495ee85..b52f6789fd4b 100644 ---- a/configs/xilinx_zynqmp_zcu102_revA_defconfig -+++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig -index e6530fbfe7ff..80592554f682 100644 ---- a/configs/xilinx_zynqmp_zcu102_revB_defconfig -+++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y --- -2.7.4 - diff --git a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch b/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch deleted file mode 100644 index 95ab7b3b75..0000000000 --- a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch +++ /dev/null @@ -1,68 +0,0 @@ -From c7df098a71e05dc81cee818747759e8060b59626 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Mon, 4 Jun 2018 12:21:01 +0200 -Subject: [PATCH] arm64: zynqmp: accept an absolute path for PMUFW_INIT_FILE - -The value of PMUFW_INIT_FILE is prefixed with "$(srctree)/", thus -forcing it to be a relative path inside the U-Boot source tree. Since -the PMUFW is a binary file generated outside of U-Boot, the PMUFW -binary must be copied inside the U-Boot source tree before the -build. - -This generates a few problems: - - * if the source tree is shared among different out-of-tree builds, - they will pollute (and potentially corrupt) each other - * the source tree cannot be read-only - * any buildsystem must add a command to copy the PMUFW binary - * putting an externally-generated binary in the source tree is ugly - as hell - -Avoid these problems by accepting an absolute path for -PMUFW_INIT_FILE. This would be as simple as removing the "$(srctree)/" -prefix, but in order to keep backward compatibility we rather use the -shell and readlink to get the absolute path even when starting from a -relative path. - -Since 'readlink -f' produces an empty string if the file does not -exist, we also add a check to ensure the file configured in -PMUFW_INIT_FILE exists. Otherwise the build would exit successfully, -but produce a boot.bin without PMUFW as if PMUFW_INIT_FILE were empty. - -Tested in the 12 possible combinations of: - - PMUFW_INIT_FILE empty, relative, absolute, non-existing - - building in-tree, in subdir, in other directory - -Signed-off-by: Luca Ceresoli -Cc: Michal Simek -Cc: Simon Glass -Cc: Emmanuel Vadot -Signed-off-by: Michal Simek -Backported from upstream: https://git.denx.de/?p=u-boot.git;a=commit;h=c7df098a71e05dc81cee818747759e8060b59626 ---- - scripts/Makefile.spl | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl -index ef018b5b4056..252f13826d4c 100644 ---- a/scripts/Makefile.spl -+++ b/scripts/Makefile.spl -@@ -167,8 +167,14 @@ ifdef CONFIG_ARCH_ZYNQ - MKIMAGEFLAGS_boot.bin = -T zynqimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) - endif - ifdef CONFIG_ARCH_ZYNQMP -+ifneq ($(CONFIG_PMUFW_INIT_FILE),"") -+spl/boot.bin: zynqmp-check-pmufw -+zynqmp-check-pmufw: FORCE -+ ( cd $(srctree) && test -r $(CONFIG_PMUFW_INIT_FILE) ) \ -+ || ( echo "Cannot read $(CONFIG_PMUFW_INIT_FILE)" && false ) -+endif - MKIMAGEFLAGS_boot.bin = -T zynqmpimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) \ -- -n $(srctree)/$(CONFIG_PMUFW_INIT_FILE) -+ -n "$(shell cd $(srctree); readlink -f $(CONFIG_PMUFW_INIT_FILE))" - endif - - spl/boot.bin: $(obj)/u-boot-spl.bin FORCE --- -2.7.4 - diff --git a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch b/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch deleted file mode 100644 index b32e162780..0000000000 --- a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch +++ /dev/null @@ -1,175 +0,0 @@ -From 4c9d54ab5a41d65000c8d249b6fb1b76056f1812 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Wed, 20 Jun 2018 12:11:50 +0200 -Subject: [PATCH] arm/arm64: zynq/zynqmp: pass the PS init file as a kconfig - variable - -U-Boot needs to link ps7_init_gpl.c on Zynq or psu_init_gpl.c on -ZynqMP (PS init for short). The current logic to locate this file for -both platforms is: - - 1. if a board-specific file exists in - board/xilinx/zynq[mp]/$(CONFIG_DEFAULT_DEVICE_TREE)/ps?_init_gpl.c - then use it - 2. otherwise use board/xilinx/zynq/ps?_init_gpl.c - -In the latter case the file does not exist in the U-Boot sources and -must be copied in the source tree from the outside before starting the -build. This is typical when it is generated from Xilinx tools while -developing a custom hardware. However making sure that a -board-specific file is _not_ found (and used) requires some trickery -such as removing or overwriting all PS init files (e.g.: the current -meta-xilinx yocto layer [0]). - -This generates a few problems: - - * if the source tree is shared among different out-of-tree builds, - they will pollute (and potentially corrupt) each other - * the source tree cannot be read-only - * any buildsystem must add a command to copy the PS init file binary - * overwriting or deleting files in the source tree is ugly as hell - -Simplify usage by allowing to pass the path to the desired PS init -file in kconfig variable XILINX_PS_INIT_FILE. It can be an absolute -path or relative to $(srctree). If the variable is set, the -user-specified file will always be used without being copied -around. If the the variable is left empty, for backward compatibility -fall back to the old behaviour. - -Since the issue is the same for Zynq and ZynqMP, add one kconfig -variable in a common place and use it for both. - -Also use the new kconfig help text to document all the ways to give -U-Boot the PS init file. - -Build-tested with all combinations of: - - platform: zynq or zynqmp - - PS init file: from XILINX_PS_INIT_FILE (absolute, relative path, - non-existing), in-tree board-specific, in board/xilinx/zynq[mp]/ - - building in-tree, in subdir, in other directory - -[0] https://github.com/Xilinx/meta-xilinx/blob/b2f74cc7fe5c4881589d5e440a17cb51fc66a7ab/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init.inc#L9 - -Signed-off-by: Luca Ceresoli -Cc: Albert Aribaud -Cc: Michal Simek -Cc: Nathan Rossi -Backported from upstream: https://git.denx.de/?p=u-boot.git;a=commit;h=6da4f67ad09cd8b311d77b2b04e557b7ef65b56c ---- - arch/arm/Kconfig | 1 + - board/xilinx/Kconfig | 41 +++++++++++++++++++++++++++++++++++++++++ - board/xilinx/zynq/Makefile | 10 +++++++++- - board/xilinx/zynqmp/Makefile | 10 +++++++++- - 4 files changed, 60 insertions(+), 2 deletions(-) - create mode 100644 board/xilinx/Kconfig - -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 22234cde2ab6..e04979d0ef7e 100644 ---- a/arch/arm/Kconfig -+++ b/arch/arm/Kconfig -@@ -1293,4 +1293,5 @@ source "board/technologic/ts4600/Kconfig" - source "board/vscom/baltos/Kconfig" - source "board/woodburn/Kconfig" - source "board/work-microwave/work_92105/Kconfig" -+source "board/xilinx/Kconfig" - source "board/zipitz2/Kconfig" - - source "arch/arm/Kconfig.debug" -diff --git a/board/xilinx/Kconfig b/board/xilinx/Kconfig -new file mode 100644 -index 000000000000..aa3fa061edef ---- /dev/null -+++ b/board/xilinx/Kconfig -@@ -0,0 +1,41 @@ -+# Copyright (c) 2018, Luca Ceresoli -+# -+# SPDX-License-Identifier: GPL-2.0 -+ -+if ARCH_ZYNQ || ARCH_ZYNQMP -+ -+config XILINX_PS_INIT_FILE -+ string "Zynq/ZynqMP PS init file(s) location" -+ help -+ On Zynq and ZynqMP U-Boot SPL (or U-Boot proper if -+ ZYNQMP_PSU_INIT_ENABLED is set) is responsible for some -+ basic initializations, such as enabling peripherals and -+ configuring pinmuxes. The PS init file (called -+ psu_init_gpl.c on ZynqMP, ps7_init_gpl.c for Zynq-7000) -+ contains the code for such initializations. -+ -+ U-Boot contains PS init files for some boards, but each of -+ them describes only one specific configuration. Users of a -+ different board, or needing a different configuration, can -+ generate custom files using the Xilinx development tools. -+ -+ There are three ways to give a PS init file to U-Boot: -+ -+ 1. Set this variable to the path, either relative to the -+ source tree or absolute, where the psu_init_gpl.c or -+ ps7_init_gpl.c file is located. U-Boot will build this -+ file. -+ -+ 2. If you leave an empty string here, U-Boot will use -+ board/xilinx/zynq/$(CONFIG_DEFAULT_DEVICE_TREE)/ps7_init_gpl.c -+ for Zynq-7000, or -+ board/xilinx/zynqmp/$(CONFIG_DEFAULT_DEVICE_TREE)/psu_init_gpl.c -+ for ZynqMP. -+ -+ 3. If the above file does not exist, U-Boot will use -+ board/xilinx/zynq/ps7_init_gpl.c for Zynq-7000, or -+ board/xilinx/zynqmp/psu_init_gpl.c for ZynqMP. This file -+ is not provided by U-Boot, you have to copy it there -+ before the build. -+ -+endif -diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile -index 5a76a26720cd..03ad5f0532ee 100644 ---- a/board/xilinx/zynq/Makefile -+++ b/board/xilinx/zynq/Makefile -@@ -5,10 +5,18 @@ - - obj-y := board.o - --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE)) -+init-objs := ps_init_gpl.o -+spl/board/xilinx/zynq/ps_init_gpl.o board/xilinx/zynq/ps_init_gpl.o: $(PS_INIT_FILE) -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ -+endif - -+ifeq ($(init-objs),) -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/ps7_init_gpl.c),\ - $(hw-platform-y)/ps7_init_gpl.o) -+endif - - ifeq ($(init-objs),) - ifneq ($(wildcard $(srctree)/$(src)/ps7_init_gpl.c),) -diff --git a/board/xilinx/zynqmp/Makefile b/board/xilinx/zynqmp/Makefile -index 05ccd25dcef3..960b81fc5853 100644 ---- a/board/xilinx/zynqmp/Makefile -+++ b/board/xilinx/zynqmp/Makefile -@@ -5,10 +5,18 @@ - - obj-y := zynqmp.o - --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE)) -+init-objs := ps_init_gpl.o -+spl/board/xilinx/zynqmp/ps_init_gpl.o board/xilinx/zynqmp/ps_init_gpl.o: $(PS_INIT_FILE) -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ -+endif - -+ifeq ($(init-objs),) -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/psu_init_gpl.c),\ - $(hw-platform-y)/psu_init_gpl.o) -+endif - - ifeq ($(init-objs),) - ifneq ($(wildcard $(srctree)/$(src)/psu_init_gpl.c),) --- -2.7.4 - diff --git a/board/zynqmp/pm_cfg_obj.c b/board/zynqmp/pm_cfg_obj.c new file mode 100644 index 0000000000..7566b3236a --- /dev/null +++ b/board/zynqmp/pm_cfg_obj.c @@ -0,0 +1,614 @@ +/****************************************************************************** +* Copyright (c) 2017 - 2020 Xilinx, Inc. All rights reserved. +* SPDX-License-Identifier: MIT +******************************************************************************/ + + +#include "xil_types.h" +#include "pm_defs.h" + +#define PM_CONFIG_MASTER_SECTION_ID 0x101U +#define PM_CONFIG_SLAVE_SECTION_ID 0x102U +#define PM_CONFIG_PREALLOC_SECTION_ID 0x103U +#define PM_CONFIG_POWER_SECTION_ID 0x104U +#define PM_CONFIG_RESET_SECTION_ID 0x105U +#define PM_CONFIG_SHUTDOWN_SECTION_ID 0x106U +#define PM_CONFIG_SET_CONFIG_SECTION_ID 0x107U +#define PM_CONFIG_GPO_SECTION_ID 0x108U + +#define PM_SLAVE_FLAG_IS_SHAREABLE 0x1U +#define PM_MASTER_USING_SLAVE_MASK 0x2U + +#define PM_CONFIG_GPO1_MIO_PIN_34_MAP (1U << 10U) +#define PM_CONFIG_GPO1_MIO_PIN_35_MAP (1U << 11U) +#define PM_CONFIG_GPO1_MIO_PIN_36_MAP (1U << 12U) +#define PM_CONFIG_GPO1_MIO_PIN_37_MAP (1U << 13U) + +#define PM_CONFIG_GPO1_BIT_2_MASK (1U << 2U) +#define PM_CONFIG_GPO1_BIT_3_MASK (1U << 3U) +#define PM_CONFIG_GPO1_BIT_4_MASK (1U << 4U) +#define PM_CONFIG_GPO1_BIT_5_MASK (1U << 5U) + +#define SUSPEND_TIMEOUT 0xFFFFFFFFU + + +#define PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK 0x00000001 +#define PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK 0x00000100 +#define PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK 0x00000200 + + + +#if defined (__ICCARM__) +#pragma language=save +#pragma language=extended +#endif +#if defined (__GNUC__) + const u32 XPm_ConfigObject[] __attribute__((used, section(".sys_cfg_data"))) = +#elif defined (__ICCARM__) +#pragma location = ".sys_cfg_data" +__root const u32 XPm_ConfigObject[] = +#endif +{ + /**********************************************************************/ + /* HEADER */ + 1, /* Number of remaining words in the header */ + 8, /* Number of sections included in config object */ + /**********************************************************************/ + /* MASTER SECTION */ + PM_CONFIG_MASTER_SECTION_ID, /* Master SectionID */ + 3U, /* No. of Masters*/ + + NODE_APU, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_0, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_1, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Wake permissions */ + + + /**********************************************************************/ + /* SLAVE SECTION */ + + + PM_CONFIG_SLAVE_SECTION_ID, /* Section ID */ + 49, /* Number of slaves */ + + NODE_OCM_BANK_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TCM_0_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_0_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_1_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TCM_1_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_L2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU_PP_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU_PP_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_USB_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_USB_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_TTC_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SATA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_ETH_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_UART_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_UART_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SPI_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_SPI_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_I2C_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_I2C_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SD_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_SD_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_DP, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GDMA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_ADMA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_NAND, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_QSPI, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPIO, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_CAN_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_CAN_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_EXTERN, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_DDR, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_IPI_APU, + 0U, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_0, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_1, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_PCIE, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_PCAP, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_RTC, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_VCU, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_PL, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + + /**********************************************************************/ + /* PREALLOC SECTION */ + + PM_CONFIG_PREALLOC_SECTION_ID, /* Preallaoc SectionID */ + 3U, /* No. of Masters*/ + +/* Prealloc for psu_cortexa53_0 */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, + 12, + NODE_DDR, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_L2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_3, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_SD_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_QSPI, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_PL, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_APU, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_0 */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + 14, + NODE_TCM_0_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_0_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_DDR, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_3, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_SD_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_QSPI, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_PL, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_ADMA, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_1 */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + 3, + NODE_TCM_1_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_1_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /**********************************************************************/ + /* POWER SECTION */ + + PM_CONFIG_POWER_SECTION_ID, /* Power Section ID */ + 4U, /* Number of power nodes */ + + NODE_APU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_RPU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_FPD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_PLD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + + /**********************************************************************/ + /* RESET SECTION */ + + PM_CONFIG_RESET_SECTION_ID, /* Reset Section ID */ + 120U, /* Number of resets */ + + XILPM_RESET_PCIE_CFG, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_BRIDGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_CTRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRF, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GDMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SATA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APU_L2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DDR, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SOFT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_QSPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_NAND, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ADMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOU_CC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TIMESTAMP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R50, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R51, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_AMBA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_OCM, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_PGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RTC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SYSMON, 0, + XILPM_RESET_AFI_FM6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_LPD_SWDT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_FPD, PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + XILPM_RESET_RPU_DBG1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_DBG0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_VPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_7, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_8, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_9, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_10, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_11, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_12, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_13, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_14, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_15, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_16, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_17, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_18, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_19, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_20, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_21, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_22, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_23, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_24, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_25, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_26, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_27, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_28, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_29, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_30, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_31, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_LS, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PS_ONLY, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_92, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_93, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_94, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_95, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + + /**********************************************************************/ + /* SET CONFIG SECTION */ + PM_CONFIG_SET_CONFIG_SECTION_ID, /* Section ID */ + 0, /* Permissions to set config */ + /**********************************************************************/ + /* SHUTDOWN SECTION */ + PM_CONFIG_SHUTDOWN_SECTION_ID, /* Section ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* System Shutdown/Restart Permission */ + + /**********************************************************************/ + /* GPO SECTION */ + PM_CONFIG_GPO_SECTION_ID, /* GPO Section ID */ + PM_CONFIG_GPO1_BIT_2_MASK | + PM_CONFIG_GPO1_MIO_PIN_34_MAP | + PM_CONFIG_GPO1_MIO_PIN_35_MAP | + PM_CONFIG_GPO1_MIO_PIN_36_MAP | + PM_CONFIG_GPO1_MIO_PIN_37_MAP | + 0, /* State of GPO pins */ +}; +#if defined (__ICCARM__) +#pragma language=restore +#endif diff --git a/board/zynqmp/post-build.sh b/board/zynqmp/post-build.sh new file mode 100755 index 0000000000..9fd8bbf2c8 --- /dev/null +++ b/board/zynqmp/post-build.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +# genimage will need to find the extlinux.conf +# in the binaries directory + +BOARD_DIR="$(dirname $0)" + +install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux.conf diff --git a/board/zynqmp/post-image.sh b/board/zynqmp/post-image.sh index b2b99fed01..ed6dbe188c 100755 --- a/board/zynqmp/post-image.sh +++ b/board/zynqmp/post-image.sh @@ -10,4 +10,6 @@ FIRST_DT=$(sed -nr \ [ -z "${FIRST_DT}" ] || ln -fs ${FIRST_DT}.dtb ${BINARIES_DIR}/system.dtb -support/scripts/genimage.sh -c board/zynqmp/genimage.cfg +BOARD_DIR="$(dirname $0)" + +support/scripts/genimage.sh -c $BOARD_DIR/genimage.cfg diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index bee7c1daf7..2026f60bd1 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -1,34 +1,39 @@ BR2_aarch64=y -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.15" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.6" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA" +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2022.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/53fdb7b6c92860ceb0ec5fd14deee302f4a84269/bin/pmufw-zcu106-default-v2017.4.bin" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/v2021.2/bin/pmufw-v2021.2.bin" +BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/pm_cfg_obj.c" +BR2_TARGET_UBOOT_FORMAT_ITB=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -- 2.17.1 From neal.frager at xilinx.com Thu Feb 10 08:19:32 2022 From: neal.frager at xilinx.com (Neal Frager) Date: Thu, 10 Feb 2022 01:19:32 -0700 Subject: [Buildroot] [PATCH v4 2/2] add configs/zynqmp_zcu102_defconfig In-Reply-To: <20220210081932.3114763-1-neal.frager@xilinx.com> References: <20220210081932.3114763-1-neal.frager@xilinx.com> Message-ID: <20220210081932.3114763-2-neal.frager@xilinx.com> This patch: - adds support for Xilinx ZCU102 evaluation board - ZCU102 features can be found here: https://www.xilinx.com/products/boards-and-kits/zcu102.html --- V1->V2: * fixed general build issues * added extlinux.conf for run-time boot issue V2->V3: * enabled support for host machines without OpenSSL required by U-Boot and Linux * moved board/zynqmp/readme.txt update to zynqmp_zcu102_defconfig patch 2/2 V3->V4: * cleaned up commit log messages * added version history --- Signed-off-by: Neal Frager Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti [Giulio: only build tested] Signed-off-by: Neal Frager --- board/zynqmp/readme.txt | 23 +++++++++++++------ configs/zynqmp_zcu102_defconfig | 39 +++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 7 deletions(-) create mode 100644 configs/zynqmp_zcu102_defconfig diff --git a/board/zynqmp/readme.txt b/board/zynqmp/readme.txt index da37f4ccc9..0dc1793e03 100644 --- a/board/zynqmp/readme.txt +++ b/board/zynqmp/readme.txt @@ -1,10 +1,19 @@ -******************************** -Xilinx ZCU106 board - ZynqMP SoC -******************************** +****************************************** +Xilinx ZCU102 / ZCU106 boards - ZynqMP SoC +****************************************** + +This document describes the Buildroot support for the ZCU102 and ZCU106 +boards by Xilinx, based on the Zynq UltraScale+ MPSoC (aka ZynqMP). +It has been tested with the ZCU102 and ZCU106 production boards. + +Evaluation board features can be found here with the links below. + +ZCU102: +https://www.xilinx.com/products/boards-and-kits/zcu102.html + +ZCU106: +https://www.xilinx.com/products/boards-and-kits/zcu106.html -This document describes the Buildroot support for the ZCU106 board by -Xilinx, based on the Zynq UltraScale+ MPSoC (aka ZynqMP). It has been -tested with the EK-U1-ZCU106-ES2 pre-production board. How to build it =============== @@ -32,7 +41,7 @@ After building, you should get a tree like this: +-- rootfs.ext4 -> rootfs.ext2 +-- sdcard.img +-- system.dtb -> zynqmp-zcu106-revA.dtb - +-- u-boot.bin + +-- u-boot.itb `-- zynqmp-zcu106-revA.dtb How to write the SD card diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig new file mode 100644 index 0000000000..acffda64bf --- /dev/null +++ b/configs/zynqmp_zcu102_defconfig @@ -0,0 +1,39 @@ +BR2_aarch64=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.15" +BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.6" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/Xilinx/u-boot-xlnx.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2022.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" +BR2_TARGET_UBOOT_ZYNQMP=y +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/v2021.2/bin/pmufw-v2021.2.bin" +BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/pm_cfg_obj.c" +BR2_TARGET_UBOOT_FORMAT_ITB=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y -- 2.17.1 From nealf at xilinx.com Thu Feb 10 08:24:54 2022 From: nealf at xilinx.com (Neal Frager) Date: Thu, 10 Feb 2022 08:24:54 +0000 Subject: [Buildroot] [PATCH v3 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: References: <20220209180306.2629180-1-neal.frager@xilinx.com> Message-ID: Hi Giulio, > As other patch please send V4 and add my > Reviewed-by and Tested-by I have submitted v4 of the patch set including your feedback. Please let me know if you find anything else. Best regards, Neal Frager Xilinx From buildroot at heine.tech Thu Feb 10 11:05:38 2022 From: buildroot at heine.tech (Michael Nosthoff) Date: Thu, 10 Feb 2022 12:05:38 +0100 Subject: [Buildroot] [PATCH] package/re2: bump version to 2022-02-01 Message-ID: <20220210110546.345600-1-buildroot@heine.tech> Signed-off-by: Michael Nosthoff --- package/re2/re2.hash | 2 +- package/re2/re2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/re2/re2.hash b/package/re2/re2.hash index a0a7d15938..7cfece5d5e 100644 --- a/package/re2/re2.hash +++ b/package/re2/re2.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 8c45f7fba029ab41f2a7e6545058d9eec94eef97ce70df58e92d85cfc08b4669 re2-2021-11-01.tar.gz +sha256 9c1e6acfd0fed71f40b025a7a1dabaf3ee2ebb74d64ced1f9ee1b0b01d22fd27 re2-2022-02-01.tar.gz sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 LICENSE diff --git a/package/re2/re2.mk b/package/re2/re2.mk index b562d5d7ef..31252ee82f 100644 --- a/package/re2/re2.mk +++ b/package/re2/re2.mk @@ -4,7 +4,7 @@ # ################################################################################ -RE2_VERSION = 2021-11-01 +RE2_VERSION = 2022-02-01 RE2_SITE = $(call github,google,re2,$(RE2_VERSION)) RE2_LICENSE = BSD-3-Clause RE2_LICENSE_FILES = LICENSE -- 2.25.1 From buildroot at uclibc.org Thu Feb 10 12:24:45 2022 From: buildroot at uclibc.org (=?UTF-8?Q?=E2=9D=A4=EF=B8=8F_Rachel_want_to_meet_you!_Click_Here=3A_https?= =?UTF-8?Q?=3A//cutt=2Eus/Yb2mo=3Fkb83_=E2=9D=A4=EF=B8=8F?=) Date: Thu, 10 Feb 2022 12:24:45 +0000 Subject: [Buildroot] =?utf-8?b?44GK5ZWP5ZCI44Gb44GC44KK44GM44Go44GG44GU?= =?utf-8?b?44GW44GE44G+44GX44Gf44CC44CQ44CR?= Message-ID: <0def24c43e515508a153e72856e4dc10@boi-reves.com> ?? Rachel want to meet you! Click Here: https://cutt.us/Yb2mo?kb83 ??? ????????????????????????? ????????????????????? ?????????????????? ---------------------------------------------------- [textarea your-message class:mess 90x10 ] ---------------------------------------------------- ?? Rachel want to meet you! Click Here: https://cutt.us/Yb2mo?kb83 ????????????????? 3?4??????????????????????? ???????????????????? From bugzilla at busybox.net Thu Feb 10 13:46:58 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Thu, 10 Feb 2022 13:46:58 +0000 Subject: [Buildroot] [Bug 14581] New: qemu-system-ppc -M mac99 does not boot for glibc system Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14581 Bug ID: 14581 Summary: qemu-system-ppc -M mac99 does not boot for glibc system Product: buildroot Version: unspecified Hardware: All OS: Linux Status: NEW Severity: normal Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: wbx at openadk.org CC: buildroot at uclibc.org Target Milestone: --- Hi, you get following error when trying to boot a glibc system in qemu-system-ppc: Run /sbin/init as init process init[1]: segfault (11) at 7369693e nip 7eb024 lr 7ead8c code 1 in libc.so.6[772000+1fa000] init[1]: code: 7d5d5378 815efd38 39200000 913f0000 814a0000 813f000c 75291fbf 2c0a0000 init[1]: code: 913f000c 41e2fe94 893d0000 5529103a <7d2a482e> 2c090000 41c2fe80 7fe4fb78 Kernel panic - not syncing: Attempted to kill init! exitcode=0x0000000b CPU: 0 PID: 1 Comm: init Not tainted 5.15.0 #1 Call Trace: [f1019d80] [c004c054] panic+0x124/0x308 (unreliable) [f1019de0] [c004eadc] do_exit+0x910/0x918 [f1019e30] [c004fb38] do_group_exit+0x34/0xa8 [f1019e50] [c005e550] get_signal+0x1ec/0x86c [f1019eb0] [c000cdcc] do_notify_resume+0x78/0x304 [f1019f10] [c00128a0] interrupt_exit_user_prepare_main+0xf8/0x130 [f1019f30] [c0019224] interrupt_return+0x14/0x144 --- interrupt: 300 at 0x7eb024 NIP: 007eb024 LR: 007ead8c CTR: 007ff680 REGS: f1019f40 TRAP: 0300 Not tainted (5.15.0) MSR: 0000d032 CR: 48002424 XER: 20000000 DAR: 7369693e DSISR: 40000000 GPR00: 007e16a0 af9058c0 a7b8a430 00ab1879 00000000 af905d20 af906138 af906630 GPR08: 00000030 000001cc 73696772 00000000 48002424 00acfa54 00000000 af905d20 GPR16: 00000000 00ab1879 af905d20 00000000 00000000 4ec40000 af906630 00000000 GPR24: af906138 af9066f8 af906138 00000000 00000000 00ab187a 00981fb8 af905d20 NIP [007eb024] 0x7eb024 LR [007ead8c] 0x7ead8c --- interrupt: 300 Rebooting in 180 seconds.. best regards Waldemar -- You are receiving this mail because: You are on the CC list for the bug. From giulio.benetti at benettiengineering.com Thu Feb 10 13:47:46 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 10 Feb 2022 14:47:46 +0100 Subject: [Buildroot] [PATCH v3 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: References: <20220209180306.2629180-1-neal.frager@xilinx.com> Message-ID: Hi Neal, On 10/02/22 09:24, Neal Frager wrote: > Hi Giulio, > >> As other patch please send V4 and add my >> Reviewed-by and Tested-by > > I have submitted v4 of the patch set including your feedback. Please let me know if you find anything else. I've rebuilt both of them and now they have my tags so they are ready to be committed! Best regards -- Giulio Benetti Benetti Engineering sas From nealf at xilinx.com Thu Feb 10 14:19:02 2022 From: nealf at xilinx.com (Neal Frager) Date: Thu, 10 Feb 2022 14:19:02 +0000 Subject: [Buildroot] [PATCH v3 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: References: <20220209180306.2629180-1-neal.frager@xilinx.com> Message-ID: Hi Giulio, > I've rebuilt both of them and now they have my tags so they are ready to be committed! Fantastic! Thank you so much for your reactivity and support. Now that we have done this once, future version bumps will be much easier. Please let me know when the patches are committed, so that I can clone the new tree. Best regards, Neal Frager Xilinx From giulio.benetti at benettiengineering.com Thu Feb 10 14:32:25 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 10 Feb 2022 15:32:25 +0100 Subject: [Buildroot] [PATCH v3 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: References: Message-ID: <92FA06A8-01FB-46CC-A9B8-8883406C1D11@benettiengineering.com> Hi Neal, > Il giorno 10 feb 2022, alle ore 15:21, Neal Frager ha scritto: > > ?Hi Giulio, > >> I've rebuilt both of them and now they have my tags so they are ready to be committed! > > Fantastic! Thank you so much for your reactivity and support. Now that we have done this once, future version bumps will be much easier. Yes :-) > Please let me know when the patches are commiste, so that I can clone the new tree. You will be in Cc once committed. Best regards Giulio > > Best regards, > Neal Frager > Xilinx > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From yann.morin at orange.com Thu Feb 10 15:08:50 2022 From: yann.morin at orange.com (yann.morin at orange.com) Date: Thu, 10 Feb 2022 16:08:50 +0100 Subject: [Buildroot] [PATCH 2/5 v2] package/pkg-cargo: allow building in a sub-directory In-Reply-To: <20220209205410.071f193a@windsurf> References: <20220209205410.071f193a@windsurf> Message-ID: <11338_1644505732_62052A83_11338_59_1_20220210150850.GA2599@tl-lnx-nyma7486> Thomas, All, On 2022-02-09 20:54 +0100, Thomas Petazzoni spake thusly: > On Wed, 9 Feb 2022 17:08:44 +0100 > wrote: > > +# If building in a sub directory, use that to find the Cargo.toml, unless > > +# the package already provided its location. > > +ifneq ($$($(2)_SUBDIR),) > > +ifeq ($$(filter BR_CARGO_MANIFEST_PATH=%,$$($(2)_DL_ENV)),) > > +$(2)_DL_ENV += BR_CARGO_MANIFEST_PATH=$$($(2)_SUBDIR)/Cargo.toml > > I find that a bit "meh". I too am not fond of it, to be honest... But I am not a rust/cargo expert, by far, I wanted not to break any existing setup. However, the cargo infra is brand new, and BR_CARGO_MANIFEST_PATH was not even advertised either, so we should probably not have to expect any package to actually use it already. > Should we have an explicit package variable > that tells the location of the Cargo.toml, instead of directly have > packages pass this "magic" BR_CARGO_MANIFEST_PATH variable ? I was wondering if that would even make sense to have a different _SUBDIR and BR_CARGO_MANIFEST_PATH to begin with? We have a package here that seems to be in such a situation, though: https://github.com/Orange-OpenSource/its-client The Cargo.toml is in rust/ but we need to do the build in rust/its-client/ ("cargo build" works perfectly well with a virtual workspace, like is used here, but "cargo install" refuses to work, muahaha...) Still, because of a missing Cargo.lock in that package, vendoring by Buildroot does not work eother (we'll fix that later). So, for now, I suggest we just expect that BR_CARGO_MANIFEST_PATH is the same as _SUBDIR, and thus the conditional assignment is not needed. If in the future we do have an actual, working situation where they differ, then we may add the necessary infra, seems like a plan? In the meantime, I'll respin the series with the ugly conditional removed. > Should $(2)_SUBDIR be documented for the cargo-package infra in the > documentation ? It is not documented for any of the other infras that make use of it (autotools, cmake, python, etc...). The only mention of _SUBDIR in the manual is about _SUBDIRS (plural) for the kernel-module sub-infra. Thanks for the review! Regards, Yann E. MORIN. > 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 | | +33 534.541.179 | Software Designer | _/ - /' | \ / CAMPAIGN | | +33 638.411.245 '--------------------: (_ `--, | X AGAINST | | yann.morin (at) orange.com |_=" ,--' | / \ HTML MAIL | '--------------------------------------:______/_____:------------------' _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From luca at lucaceresoli.net Thu Feb 10 15:14:09 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Thu, 10 Feb 2022 16:14:09 +0100 Subject: [Buildroot] [PATCH 1/2] configs/zynqmp_zcu106: Bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: References: <20220208071559.2862411-1-neal.frager@xilinx.com> <69efa9da-ae55-6795-8724-ed7105083924@benettiengineering.com> <32cc1c12-1496-7db9-5e32-1b99404a4fe3@benettiengineering.com> <690d8e1b-fb6d-7c36-b07f-4ed9ca61b768@lucaceresoli.net> Message-ID: <489a02df-4f2b-a46c-aa49-15c3c545f8f2@lucaceresoli.net> Hi Neal, apologies for the delay in replies. Too busy. On 08/02/22 14:56, Neal Frager wrote: [...] >>> Is this something that can easily be updated? If not, perhaps it >>> makes sense to move forward with my patch set as is for now, and then >>> I can include a new update once the BR2_TARGET_UBOOT_ZYNQMP_PM_CFG >>> configuration accepts URL inputs. >>> >>> What are your thoughts on this? >> >> I think you should go with local patch honestly. >> As the patch is now. > >> I agree with Giulio, it's probably better to add the file to Buildroot. > >> Here's the rationale. > >> Downloading files instead of versioning them is not necessarily a bad idea. However pm_cfg_obj.c is unavoidably a configuration-dependent file, meaning each user making their _project_ (project = a specific configuration of a specific hardware) will have a different pm_cfg_obj.c. This is different from downloading a patch, or a pmufw.bin, which are reusable across several projects. > >> Theoretically, it might make sense to have a repo hosting pm_cfg_obj.c only if that repo contains all project-specific material for the _project_ : schematics, FPGA design etc. But this is not the case here. > >> BTW pm_cfg_obj.c is a 32 kB text file that compresses to 2 kB. Not a big deal. > > I agree with your rationale. However, not every FPGA design will have a new pm_cfg_obj.c. While it is possible to do some customizations with this file, all of the Xilinx evaluation boards now use the same one. I would expect most developers never even touch this file, to be honest. So in a high percentage of cases, the pm_cfg_obj.c is really coming from a specific Xilinx embeddedsw release branch which developers should want to be the same release version as the PMU firmware binary. Interesting, I'm curious how this works. The pm_cfg_obj.c at the URL you provided, as well as in the patches you sent, has some peripherals disabled: USB1, ETH0/1/2, both SPIs, NAND, CAN0, VCU and more. Do current kernels implement enabling these at runtime, making appropriate requests to PMUFW? This wasn't the case last time I looked into that, it would be very interesting if it has happened in the meantime. Otherwise one would need to provide a per-configuration pmu config or a "wildcard" config, but I'm not sure whether it would cover all potential use cases. Even though Buildroot has [almost] only defconfigs for well-known evaluation boards, it is really meant to be used by custom designs, thus we want to be able to use other configurations than those useful for Xilinx boards. -- Luca From yann.morin at orange.com Thu Feb 10 15:19:16 2022 From: yann.morin at orange.com (yann.morin at orange.com) Date: Thu, 10 Feb 2022 16:19:16 +0100 Subject: [Buildroot] [PATCH 2/5 v2] package/pkg-cargo: allow building in a sub-directory In-Reply-To: <20220210150850.GA2599@tl-lnx-nyma7486> References: <20220209205410.071f193a@windsurf> <20220210150850.GA2599@tl-lnx-nyma7486> Message-ID: <7033_1644506358_62052CF5_7033_331_1_20220210151916.GB2599@tl-lnx-nyma7486> Thomas, Alll, On 2022-02-10 16:08 +0100, MORIN Yann INNOV/IT-S spake thusly: > On 2022-02-09 20:54 +0100, Thomas Petazzoni spake thusly: > > Should $(2)_SUBDIR be documented for the cargo-package infra in the > > documentation ? > It is not documented for any of the other infras that make use of it > (autotools, cmake, python, etc...). > The only mention of _SUBDIR in the manual is about _SUBDIRS (plural) for > the kernel-module sub-infra. Scratch that, I seem to be unable to do a proper search in a webpage... :-( I'll add it to the cargo part of the manual. Cordialement, Yann E. MORIN. -- ____________ .-----------------.--------------------: _ :------------------. | Yann E. MORIN | Real-Time Embedded | __/ ) | /"\ ASCII RIBBON | | +33 534.541.179 | Software Designer | _/ - /' | \ / CAMPAIGN | | +33 638.411.245 '--------------------: (_ `--, | X AGAINST | | yann.morin (at) orange.com |_=" ,--' | / \ HTML MAIL | '--------------------------------------:______/_____:------------------' _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From yann.morin at orange.com Thu Feb 10 15:29:25 2022 From: yann.morin at orange.com (yann.morin at orange.com) Date: Thu, 10 Feb 2022 16:29:25 +0100 Subject: [Buildroot] [PATCH 0/5 v3] package/pkg-{cargo, golang}: enhance build process Message-ID: <3778_1644506967_62052F57_3778_468_1_cover.1644506959.git.yann.morin@orange.com> From: "Yann E. MORIN" Hello All! This five-patch series enhances the cargo- and golang-based package infrastructures: - allow building cargo packages in a sub-directory of the package source tree; - fix dependencies when using override-srcdir - allow passing arbitrary _DL_ENV The golang-related changes are not tested, by lack of a go package to test them against, but the changes look obvious and simple enough (note: they were spotted as the two infras got in simultaneously recently, so it looked like a good idea to fix both in the same series). Changes v2 -> v3: - always use _SUBDIR to find Cargo.toml - add _SUBDIR for cargo infra in the manual - carry tags from Christian and Thomas where appropriate (Thanks!) Changes v1 -> v2: - fix conditional in the sub-directory patch - add patch to allow building with override-srcdir Regards, Yann E. MORIN. The following changes since commit 4419123f9c5e93fe6247e522c6b27800a36893c5 package/doc-asciidoc: fix build for out-of-tree documents (2022-02-10 13:44:03 +0100) are available as patches in this mail series, for you to apply patches up to 1cfdf4aa3ac96d2d2cf246385325f93b451d773b package/pkg-golang: host-go is also a build dependency (2022-02-10 16:22:45 +0100) ---------------------------------------------------------------- Yann E. MORIN (5): package/pkg-cargo: allow packages to define download environment package/pkg-cargo: allow building in a sub-directory package/pkg-cargo: host-rustc is also a build dependency package/pkg-golang: allow packages to define download environment package/pkg-golang: host-go is also a build dependency docs/manual/adding-packages-cargo.txt | 5 +++++ package/pkg-cargo.mk | 19 +++++++++++++------ package/pkg-golang.mk | 6 ++++-- 3 files changed, 22 insertions(+), 8 deletions(-) -- ____________ .-----------------.--------------------: _ :------------------. | Yann E. MORIN | Real-Time Embedded | __/ ) | /"\ ASCII RIBBON | | +33 534.541.179 | Software Designer | _/ - /' | \ / CAMPAIGN | | +33 638.411.245 '--------------------: (_ `--, | X AGAINST | | yann.morin (at) orange.com |_=" ,--' | / \ HTML MAIL | '--------------------------------------:______/_____:------------------' _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From yann.morin at orange.com Thu Feb 10 15:29:24 2022 From: yann.morin at orange.com (yann.morin at orange.com) Date: Thu, 10 Feb 2022 16:29:24 +0100 Subject: [Buildroot] [PATCH 1/5 v3] package/pkg-cargo: allow packages to define download environment In-Reply-To: References: Message-ID: <19116_1644506970_62052F5A_19116_77_1_cb2a6466cea018c4bf8b8877140a9f389bb7918f.1644506959.git.yann.morin@orange.com> From: "Yann E. MORIN" Currently, the cargo infrastructure forcibly sets the package _DL_ENV variable, instead of appending to it, which prevents packages from providing their own download environment variables. We fix that by using an append-assignment. Note: when introduced, that variable was explicitly not documented, and is supposed to only be used by packages infrastructures. However, that variable exists, and it can be (ab)used by br2-external packages (most probably to ill effects, but heh!). We anyway leave it undocumented, like _ROOTFS_PRE_CMD_HOOKS. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Acked-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 e74a8358bc..66bea513e0 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -69,7 +69,7 @@ define inner-cargo-package $(2)_DOWNLOAD_DEPENDENCIES += host-rustc $(2)_DOWNLOAD_POST_PROCESS = cargo -$(2)_DL_ENV = CARGO_HOME=$$(HOST_DIR)/share/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.25.1 _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From yann.morin at orange.com Thu Feb 10 15:29:25 2022 From: yann.morin at orange.com (yann.morin at orange.com) Date: Thu, 10 Feb 2022 16:29:25 +0100 Subject: [Buildroot] [PATCH 2/5 v3] package/pkg-cargo: allow building in a sub-directory In-Reply-To: References: Message-ID: <11477_1644506971_62052F5B_11477_140_26_81fca21f2b24da16bb9e6d3af5add173f382f242.1644506959.git.yann.morin@orange.com> From: "Yann E. MORIN" Some packages have their rust sources as a sub-directory, rather than at the root of the source tree. Do like we do for autotools-package, and use the package's _SRCDIR rather than the top-level directory $(@D). Additionally, in such a situation, it is more than probable that the Cargo.toml is also present in that sub-directory, so use that when vendoring the package. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni --- Changes v2 -> v3: - always consider Cargo.toml to be in _SUBDIR (Thomas) - add _SUBDIR to the manual (Thomas) Changes v1 -> v2: - fix conditional (inverted logic) - fix syntax in conditional (missing comma) --- docs/manual/adding-packages-cargo.txt | 5 +++++ package/pkg-cargo.mk | 13 +++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/docs/manual/adding-packages-cargo.txt b/docs/manual/adding-packages-cargo.txt index 5343fbd4e6..e18fd9ce23 100644 --- a/docs/manual/adding-packages-cargo.txt +++ b/docs/manual/adding-packages-cargo.txt @@ -73,6 +73,11 @@ 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_SUBDIR+ may contain the name of a subdirectory inside the package + that contains the Cargo.toml file. This is useful, if for example, it + is not at the root of the tree extracted by the tarball. If + +HOST_FOO_SUBDIR+ is not specified, it defaults to +FOO_SUBDIR+. + * +FOO_CARGO_ENV+ can be used to pass additional variables in the environment of +cargo+ invocations. It used at both build and installation time diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index 66bea513e0..8b246abfed 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -71,6 +71,11 @@ $(2)_DOWNLOAD_DEPENDENCIES += host-rustc $(2)_DOWNLOAD_POST_PROCESS = cargo $(2)_DL_ENV += CARGO_HOME=$$(HOST_DIR)/share/cargo +# If building in a sub directory, use that to find the Cargo.toml +ifneq ($$($(2)_SUBDIR),) +$(2)_DL_ENV += BR_CARGO_MANIFEST_PATH=$$($(2)_SUBDIR)/Cargo.toml +endif + # Due to vendoring, it is pretty likely that not all licenses are # listed in _LICENSE. $(2)_LICENSE += , vendored dependencies licenses probably not listed @@ -97,7 +102,7 @@ $(2)_LICENSE += , vendored dependencies licenses probably not listed ifndef $(2)_BUILD_CMDS ifeq ($(4),target) define $(2)_BUILD_CMDS - cd $$(@D) && \ + cd $$($$(PKG)_SRCDIR) && \ $$(TARGET_MAKE_ENV) \ $$(TARGET_CONFIGURE_OPTS) \ $$(PKG_CARGO_ENV) \ @@ -111,7 +116,7 @@ define $(2)_BUILD_CMDS endef else # ifeq ($(4),target) define $(2)_BUILD_CMDS - cd $$(@D) && \ + cd $$($$(PKG)_SRCDIR) && \ $$(HOST_MAKE_ENV) \ RUSTFLAGS="$$(addprefix -C link-args=,$$(HOST_LDFLAGS))" \ $$(HOST_CONFIGURE_OPTS) \ @@ -133,7 +138,7 @@ endif # ifndef $(2)_BUILD_CMDS # ifndef $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS - cd $$(@D) && \ + cd $$($$(PKG)_SRCDIR) && \ $$(TARGET_MAKE_ENV) \ $$(TARGET_CONFIGURE_OPTS) \ $$(PKG_CARGO_ENV) \ @@ -152,7 +157,7 @@ endif ifndef $(2)_INSTALL_CMDS define $(2)_INSTALL_CMDS - cd $$(@D) && \ + cd $$($$(PKG)_SRCDIR) && \ $$(HOST_MAKE_ENV) \ RUSTFLAGS="$$(addprefix -C link-args=,$$(HOST_LDFLAGS))" \ $$(HOST_CONFIGURE_OPTS) \ -- 2.25.1 _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From yann.morin at orange.com Thu Feb 10 15:29:26 2022 From: yann.morin at orange.com (yann.morin at orange.com) Date: Thu, 10 Feb 2022 16:29:26 +0100 Subject: [Buildroot] [PATCH 3/5 v3] package/pkg-cargo: host-rustc is also a build dependency In-Reply-To: References: Message-ID: <11363_1644506973_62052F5D_11363_173_9_da4c09036712600e0ab76db801a5a5c693bfa267.1644506959.git.yann.morin@orange.com> From: "Yann E. MORIN" Currently, host-rustc is a download dependency, because we need cargo for the vendoring during the download step. However, when using a package in override-srcdir, there is no download step, so host-rustc is not pulled in as a dependency which breaks running the build of a single package from scratch: $ make clean $ make my-rust-package [...] [...] cargo build --offline --release --manifest-path Cargo.toml --locked /bin/sh: cargo: command not found We fix that by adding host-rustc as a standard dependency too. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Acked-by: Thomas Petazzoni --- package/pkg-cargo.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index 8b246abfed..6f5125f1d4 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -65,8 +65,10 @@ HOST_PKG_CARGO_ENV = \ define inner-cargo-package -# We need host-rustc to run cargo +# We need host-rustc to run cargo at download time (for vendoring), +# and at build and install time. $(2)_DOWNLOAD_DEPENDENCIES += host-rustc +$(2)_DEPENDENCIES += host-rustc $(2)_DOWNLOAD_POST_PROCESS = cargo $(2)_DL_ENV += CARGO_HOME=$$(HOST_DIR)/share/cargo -- 2.25.1 _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From yann.morin at orange.com Thu Feb 10 15:29:27 2022 From: yann.morin at orange.com (yann.morin at orange.com) Date: Thu, 10 Feb 2022 16:29:27 +0100 Subject: [Buildroot] [PATCH 4/5 v3] package/pkg-golang: allow packages to define download environment In-Reply-To: References: Message-ID: <1449_1644506975_62052F5F_1449_399_1_68889e1f1d960c99ade7457d58a115bf955a7b64.1644506959.git.yann.morin@orange.com> From: "Yann E. MORIN" Currently, the golang infrastructure forcibly sets the package _DL_ENV variable, instead of appending to it, which prevents packages from providing their own download environment variables. We fix that by using an append-assignment. Note: when introduced, that variable was explicitly not documented, and is supposed to only be used by packages infrastructures. However, that variable exists, and it can be (ab)used by br2-external packages (most probably to ill effects, but heh!). We anyway leave it undocumented, like _ROOTFS_PRE_CMD_HOOKS. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Christian Stewart Cc: Anisse Astier Acked-by: Thomas Petazzoni Reviewed-by: Christian Stewart --- 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..69eae02830 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -83,7 +83,7 @@ endef $(2)_POST_PATCH_HOOKS += $(2)_GEN_GOMOD $(2)_DOWNLOAD_POST_PROCESS = go -$(2)_DL_ENV = \ +$(2)_DL_ENV += \ $(HOST_GO_COMMON_ENV) \ GOPROXY=direct \ BR_GOMOD=$$($(2)_GOMOD) -- 2.25.1 _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From yann.morin at orange.com Thu Feb 10 15:29:28 2022 From: yann.morin at orange.com (yann.morin at orange.com) Date: Thu, 10 Feb 2022 16:29:28 +0100 Subject: [Buildroot] [PATCH 5/5 v3] package/pkg-golang: host-go is also a build dependency In-Reply-To: References: Message-ID: <11477_1644506977_62052F61_11477_142_1_1cfdf4aa3ac96d2d2cf246385325f93b451d773b.1644506959.git.yann.morin@orange.com> From: "Yann E. MORIN" Currently, host-go is a download dependency, because we need go for the vendoring during the download step. However, when using a package in override-srcdir, there is no download step, so host-go is not pulled in as a dependency, which will break the build of a single package from scratch. We fix that by adding host-go as a standard dependency too. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Christian Stewart Cc: Anisse Astier Acked-by: Thomas Petazzoni Reviewed-by: Christian Stewart --- package/pkg-golang.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk index 69eae02830..ddefdf1214 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -47,8 +47,10 @@ $(2)_BUILD_OPTS += \ -trimpath \ -p $(PARALLEL_JOBS) -# Target packages need the Go compiler on the host. +# Target packages need the Go compiler on the host at download time (for +# vendoring), and at build and install time. $(2)_DOWNLOAD_DEPENDENCIES += host-go +$(2)_DEPENDENCIES += host-go $(2)_BUILD_TARGETS ?= . -- 2.25.1 _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From nealf at xilinx.com Thu Feb 10 15:46:41 2022 From: nealf at xilinx.com (Neal Frager) Date: Thu, 10 Feb 2022 15:46:41 +0000 Subject: [Buildroot] [PATCH 1/2] configs/zynqmp_zcu106: Bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <489a02df-4f2b-a46c-aa49-15c3c545f8f2@lucaceresoli.net> References: <20220208071559.2862411-1-neal.frager@xilinx.com> <69efa9da-ae55-6795-8724-ed7105083924@benettiengineering.com> <32cc1c12-1496-7db9-5e32-1b99404a4fe3@benettiengineering.com> <690d8e1b-fb6d-7c36-b07f-4ed9ca61b768@lucaceresoli.net> <489a02df-4f2b-a46c-aa49-15c3c545f8f2@lucaceresoli.net> Message-ID: Hi Luca, > Interesting, I'm curious how this works. The pm_cfg_obj.c at the URL you provided, as well as in the patches you sent, has some peripherals > disabled: USB1, ETH0/1/2, both SPIs, NAND, CAN0, VCU and more. Do current kernels implement enabling these at runtime, making appropriate requests to PMUFW? This wasn't the case last time I looked into that, it would be very interesting if it has happened in the meantime. > Otherwise one would need to provide a per-configuration pmu config or a "wildcard" config, but I'm not sure whether it would cover all potential use cases. Even though Buildroot has [almost] only defconfigs for well-known evaluation boards, it is really meant to be used by custom designs, thus we want to be able to use other configurations than those useful for Xilinx boards. I took a closer look at the pm_cfg_obj.c, and I see what you mean. What confused me is that Vivado does not generate this file when you create an xsa or hdf file for the hardware design like the psu_init.c files. So I thought the file was always the same regardless of the hardware. Instead, users have two choices. They can either use Vitis to generate a FSBL which will have a pm_cfg_obj.c file in it, or they can modify this example file manually. The pm_cfg_obj.c that I have included with buildroot enables all of the peripherals that are enabled on the ZCU102 and ZCU106 boards, so I think it is fine for having an out of box example for our customers. Perhaps a good solution would be adding a readme file for the pm_cfg_obj.c alerting developers that they will need to modify this file for building designs for custom hardware. In any case, we need to have an example pm_cfg_obj.c file in order for the buildroot examples to build and run. And I think the pm_cfg_obj.c is only one of many things developers will need to modify when moving from an evaluation board to their own custom hardware. What are your thoughts? You have been working with this issue much longer than I have. Thank you for your feedback and support! Best regards, Neal Frager Xilinx From giulio.benetti at benettiengineering.com Thu Feb 10 16:31:20 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 10 Feb 2022 17:31:20 +0100 Subject: [Buildroot] [PATCH 1/2] configs/zynqmp_zcu106: Bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: References: <20220208071559.2862411-1-neal.frager@xilinx.com> <69efa9da-ae55-6795-8724-ed7105083924@benettiengineering.com> <32cc1c12-1496-7db9-5e32-1b99404a4fe3@benettiengineering.com> <690d8e1b-fb6d-7c36-b07f-4ed9ca61b768@lucaceresoli.net> <489a02df-4f2b-a46c-aa49-15c3c545f8f2@lucaceresoli.net> Message-ID: Hi Neal and Luca, On 10/02/22 16:46, Neal Frager wrote: > Hi Luca, > >> Interesting, I'm curious how this works. The pm_cfg_obj.c at the URL you provided, as well as in the patches you sent, has some peripherals >> disabled: USB1, ETH0/1/2, both SPIs, NAND, CAN0, VCU and more. Do current kernels implement enabling these at runtime, making appropriate requests to PMUFW? This wasn't the case last time I looked into that, it would be very interesting if it has happened in the meantime. Neal, can you reply about this ^^^. At least, are USB1, ETH0/1/2, both SPIs, NAND, CAN0, VCU present on those 2 boards? >> Otherwise one would need to provide a per-configuration pmu config or a "wildcard" config, but I'm not sure whether it would cover all potential use cases. I agree. > Even though Buildroot has [almost] only defconfigs for well-known evaluation boards, it is really meant to be used by custom designs, thus we want to be able to use other configurations than those useful for Xilinx boards. No, it's not meant to be used for custom boards, the goal is having the 2 BSP for the 2 boards and that's it. The ones who will need to create custom BSP will ad new BSPs starting from your reference. So here again what Luca pointed above about a wildcard config is true: we don't know if it will really cover all cases. Since this is not the goal of Buildroot I would narrow things to deal with the 2 actual boards peripherals only. > I took a closer look at the pm_cfg_obj.c, and I see what you mean. What confused me is that Vivado does not generate this file when you create an xsa or hdf file for the hardware design like the psu_init.c files. So I thought the file was always the same regardless of the hardware. > > Instead, users have two choices. They can either use Vitis to generate a FSBL which will have a pm_cfg_obj.c file in it, or they can modify this example file manually. The pm_cfg_obj.c that I have included with buildroot enables all of the peripherals that are enabled on the ZCU102 and ZCU106 boards, so I think it is fine for having an out of box example for our customers. I agree that here we need to deal with those 2 specific boards. > Perhaps a good solution would be adding a readme file for the pm_cfg_obj.c alerting developers that they will need to modify this file for building designs for custom hardware. This is implicit > In any case, we need to have an example pm_cfg_obj.c file in order for the buildroot examples to build and run. And I think the pm_cfg_obj.c is only one of many things developers will need to modify when moving from an evaluation board to their own custom hardware. This is out of scope here. As patch names point you're bumping or adding 2 specific boards, so I wouldn't worry about eventual custom boards. If someone will deal with it I think they will also deal with Vivado to create specific config files. At least that is what I would do while approaching these 2 FPGAs. > > What are your thoughts? You have been working with this issue much longer than I have. Thank you for your feedback and support! > > Best regards, > Neal Frager > Xilinx Neal, please use 72 wrapping on your e-mail client, otherwise lines are very long :-) Thank you! Best regards -- Giulio Benetti Benetti Engineering sas From giulio.benetti at benettiengineering.com Thu Feb 10 16:39:34 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 10 Feb 2022 17:39:34 +0100 Subject: [Buildroot] [PATCH v4 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <20220210081932.3114763-1-neal.frager@xilinx.com> References: <20220210081932.3114763-1-neal.frager@xilinx.com> Message-ID: <7ed72b26-0729-93c7-e1c7-c429e2a5fb87@benettiengineering.com> Hi Neal, On 10/02/22 09:19, Neal Frager wrote: > This patch: > - bumps ATF to Xilinx v2.6: mainline v2.6 requires patch to build > - bumps U-Boot to Xilinx 2022.01: important drivers not in mainline > - bumps Linux to Xilinx 5.15: important drivers not in mainline > - deletes board/zynqmp/patches directory: patches already in mainline > - modifies board/zynqmp/genimage.cfg: U-Boot 2022.01 uses u-boot.itb format > - adds extlinux.conf to vfat bootfs > - modifies U-Boot to unified xilinx_zynqmp_virt_defconfig (supports all boards) > - adds support for SPL pm_cfg_obj.c loading to PMU firmware > - enables support for host machines without OpenSSL required by U-Boot and Linux > If you put the 3 dashes below, everything after them will be ignored, so you need to put here... > --- > V1->V2: > * fixed general build issues > * added extlinux.conf for run-time boot issue > V2->V3: > * enabled support for host machines without OpenSSL required by U-Boot and Linux > * moved readme.txt update to zynqmp_zcu102_defconfig patch 2/2 > V3->V4: > * cleaned up commit log messages > * added version history > --- > > Signed-off-by: Neal Frager > Reviewed-by: Giulio Benetti > Tested-by: Giulio Benetti > [Giulio: only build tested] These ^^^ > Signed-off-by: Neal Frager And drop this ^^^ that is already part of the patch. Same goes for patch 2/2 And I would shrink pm_cfg_obj.c down to what boards really sport without thinking too much about eventual custom boards as discussed here: https://lists.buildroot.org/pipermail/buildroot/2022-February/636513.html > --- > board/zynqmp/extlinux.conf | 5 + > board/zynqmp/genimage.cfg | 6 +- > ...-fix-Remove-GGC-ignore-Warray-bounds.patch | 68 -- > ...64-zynqmp-zcu106-fix-SPL-MMC-booting.patch | 52 -- > ...2-arm64-zynqmp-Enable-booting-to-ATF.patch | 114 ---- > ...ept-an-absolute-path-for-PMUFW_INIT_.patch | 68 -- > ...ynqmp-pass-the-PS-init-file-as-a-kco.patch | 175 ----- > board/zynqmp/pm_cfg_obj.c | 614 ++++++++++++++++++ But here I see you only have one pm_cfg_obj.c for both z102 and z106, is that sufficient? I mean, have they so common peripherals? I see we have to deal with: Zynq UltraScale+ XCZU7EV-2FFVC1156 MPSoC for z106 and Zynq UltraScale+ XCZU9EG-2FFVB1156 MPSoC for z102 so I don't know if having a common pm_cfg_obj.c should be a good idea. I know few about FPGAs, but I don't know if they are really compatible. What you and Luca think about this? Btw, thank you Luca for noticing it! Best regards -- Giulio Benetti Benetti Engineering sas > board/zynqmp/post-build.sh | 8 + > board/zynqmp/post-image.sh | 4 +- > configs/zynqmp_zcu106_defconfig | 23 +- > 11 files changed, 648 insertions(+), 489 deletions(-) > create mode 100644 board/zynqmp/extlinux.conf > delete mode 100644 board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch > delete mode 100644 board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch > delete mode 100644 board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch > delete mode 100644 board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch > delete mode 100644 board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch > create mode 100644 board/zynqmp/pm_cfg_obj.c > create mode 100755 board/zynqmp/post-build.sh > > diff --git a/board/zynqmp/extlinux.conf b/board/zynqmp/extlinux.conf > new file mode 100644 > index 0000000000..ae3ec8614a > --- /dev/null > +++ b/board/zynqmp/extlinux.conf > @@ -0,0 +1,5 @@ > +label linux > + kernel /Image > + devicetree /system.dtb > + append console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait > + > diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg > index ed202f4550..20d8352c08 100644 > --- a/board/zynqmp/genimage.cfg > +++ b/board/zynqmp/genimage.cfg > @@ -2,11 +2,13 @@ image boot.vfat { > vfat { > files = { > "boot.bin", > - "u-boot.bin", > - "atf-uboot.ub", > + "u-boot.itb", > "system.dtb", > "Image" > } > + file extlinux/extlinux.conf { > + image = extlinux.conf > + } > } > > size = 32M > diff --git a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch b/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch > deleted file mode 100644 > index 0c1a9ba2a4..0000000000 > --- a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch > +++ /dev/null > @@ -1,68 +0,0 @@ > -From da003e6ada7d0217fe99dc7c649a731f8ebd3c34 Mon Sep 17 00:00:00 2001 > -From: Deepika Bhavnani > -Date: Thu, 15 Aug 2019 00:56:46 +0300 > -Subject: [PATCH] Coverity fix: Remove GGC ignore -Warray-bounds > - > -GCC diagnostics were added to ignore array boundaries, instead > -of ignoring GCC warning current code will check for array boundaries > -and perform and array update only for valid elements. > - > -Resolves: `CID 246574` `CID 246710` `CID 246651` > - > -Signed-off-by: Deepika Bhavnani > -Change-Id: I7530ecf7a1707351c6ee87e90cc3d33574088f57 > - > -Backported from: 41af05154abe136938bcfb5f26c969933784bbef > -[Adapted to apply on 1.5] > - > ---- > - lib/psci/psci_common.c | 20 ++++++++++---------- > - 1 file changed, 10 insertions(+), 10 deletions(-) > - > -diff --git a/lib/psci/psci_common.c b/lib/psci/psci_common.c > -index 2220a745cd6e..6282d992a2f0 100644 > ---- a/lib/psci/psci_common.c > -+++ b/lib/psci/psci_common.c > -@@ -188,21 +188,17 @@ static unsigned int get_power_on_target_pwrlvl(void) > - /****************************************************************************** > - * Helper function to update the requested local power state array. This array > - * does not store the requested state for the CPU power level. Hence an > -- * assertion is added to prevent us from accessing the wrong index. > -+ * assertion is added to prevent us from accessing the CPU power level. > - *****************************************************************************/ > - static void psci_set_req_local_pwr_state(unsigned int pwrlvl, > - unsigned int cpu_idx, > - plat_local_state_t req_pwr_state) > - { > -- /* > -- * This should never happen, we have this here to avoid > -- * "array subscript is above array bounds" errors in GCC. > -- */ > - assert(pwrlvl > PSCI_CPU_PWR_LVL); > --#pragma GCC diagnostic push > --#pragma GCC diagnostic ignored "-Warray-bounds" > -- psci_req_local_pwr_states[pwrlvl - 1][cpu_idx] = req_pwr_state; > --#pragma GCC diagnostic pop > -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && > -+ (cpu_idx < PLATFORM_CORE_COUNT)) { > -+ psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx] = req_pwr_state; > -+ } > - } > - > - /****************************************************************************** > -@@ -228,7 +224,11 @@ static plat_local_state_t *psci_get_req_local_pwr_states(unsigned int pwrlvl, > - { > - assert(pwrlvl > PSCI_CPU_PWR_LVL); > - > -- return &psci_req_local_pwr_states[pwrlvl - 1][cpu_idx]; > -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && > -+ (cpu_idx < PLATFORM_CORE_COUNT)) { > -+ return &psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx]; > -+ } else > -+ return NULL; > - } > - > - /* > --- > -2.34.0 > - > diff --git a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch b/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch > deleted file mode 100644 > index 4d85e1bb12..0000000000 > --- a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch > +++ /dev/null > @@ -1,52 +0,0 @@ > -From e5d72ed8339eb05285448aad3c89d21e4d18fd29 Mon Sep 17 00:00:00 2001 > -From: Luca Ceresoli > -Date: Mon, 26 Feb 2018 09:40:34 +0100 > -Subject: [PATCH] arm64: zynqmp: zcu106: fix SPL MMC booting > - > -The U-Boot SPL generated with the current zcu106 defconfig cannot boot > -from MMC: > - > - [...] > - U-Boot SPL 2018.01 (Feb 21 2018 - 17:47:14) > - EL Level: EL3 > - Trying to boot from MMC1 > - sdhci_transfer_data: Error detected in status(0x408020)! > - spl_load_image_fat_os: error reading image u-boot.bin, err - -2 > - spl_load_image_fat: error reading image u-boot.img, err - -6 > - SPL: failed to boot from all boot devices > - ### ERROR ### Please RESET the board ### > - > -Fix by lowering the rpll value. The new value for the RPLL_CTRL > -register comes from the current psu_init_gpl.c from the HDF file at > -https://github.com/xilinx/hdf-examples/tree/01ad8ea5fd1989abf4ea5a072d019a16cb2bc546/zcu106-zynqmp > -(generated by Vivado v2017.4). > - > -RPLL and sdio1_ref clocks before and after this change: > - > - - Old values: RPLL 1.36 GHz, sdio1_ref 272 MHz > - - New values: RPLL 1.16 GHz, sdio1_ref 233 MHz > - > -Signed-off-by: Luca Ceresoli > -Cc: Michal Simek > -Upstream-status: accepted upstream in a different form > ---- > - > - board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c > -index 4d18abe000ca..e6fa477e53e7 100644 > ---- a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c > -+++ b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c > -@@ -10,7 +10,7 @@ > - static unsigned long psu_pll_init_data(void) > - { > - psu_mask_write(0xFF5E0034, 0xFE7FEDEFU, 0x7E4E2C62U); > -- psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00013C00U); > -+ psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00014600U); > - psu_mask_write(0xFF5E0030, 0x00000008U, 0x00000008U); > - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000001U); > - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000000U); > --- > -2.7.4 > - > diff --git a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch b/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch > deleted file mode 100644 > index 487fff6812..0000000000 > --- a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch > +++ /dev/null > @@ -1,114 +0,0 @@ > -From 5e3cac50cc981e01d9072241035a8d4162560c71 Mon Sep 17 00:00:00 2001 > -From: Luca Ceresoli > -Date: Mon, 12 Mar 2018 17:18:38 +0100 > -Subject: [PATCH] arm64: zynqmp: Enable booting to ATF > - > -U-Boot is now able to boot to ARM Trusted Firmware (ATF). The boot > -flow is SPL(EL3) loads ATF and full u-boot and jump to ATF(EL3) which > -pass control to full u-boot(EL2). This has been tested on zcu106, so > -enable it in this defconfig. > - > -To generate an image that triggers this booting flow, you need to pass > -'-O arm-trusted-firmware' to mkimage. > - > -Signed-off-by: Luca Ceresoli > -Signed-off-by: Michal Simek > -Backported from upstream: http://git.denx.de/?p=u-boot.git;a=commit;h=5e3cac50cc981e01d9072241035a8d4162560c71 > ---- > - > - configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 + > - configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 + > - configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 + > - configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 + > - configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 1 + > - configs/xilinx_zynqmp_zcu102_revA_defconfig | 1 + > - configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 + > - 7 files changed, 7 insertions(+) > - > -diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig > -index c5bfa2b12638..488c72258b0e 100644 > ---- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig > -+++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig > -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_FASTBOOT=y > - CONFIG_FASTBOOT_FLASH=y > -diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig > -index f86dce403a42..5d501eec0edd 100644 > ---- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig > -+++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig > -@@ -20,6 +20,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_FASTBOOT=y > - CONFIG_FASTBOOT_FLASH=y > -diff --git a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig > -index 6e947cf56827..6f7eaebd7676 100644 > ---- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig > -+++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig > -@@ -16,6 +16,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_CMD_MEMTEST=y > - CONFIG_SYS_ALT_MEMTEST=y > -diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig > -index 1c934858c61c..7a3806cba4b5 100644 > ---- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig > -+++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig > -@@ -17,6 +17,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_CMD_MEMTEST=y > - CONFIG_SYS_ALT_MEMTEST=y > -diff --git a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig > -index e13c7c56f310..e4408f182ca0 100644 > ---- a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig > -+++ b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig > -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_FASTBOOT=y > - CONFIG_FASTBOOT_FLASH=y > -diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig b/configs/xilinx_zynqmp_zcu102_revA_defconfig > -index 5b2cd495ee85..b52f6789fd4b 100644 > ---- a/configs/xilinx_zynqmp_zcu102_revA_defconfig > -+++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig > -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_FASTBOOT=y > - CONFIG_FASTBOOT_FLASH=y > -diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig > -index e6530fbfe7ff..80592554f682 100644 > ---- a/configs/xilinx_zynqmp_zcu102_revB_defconfig > -+++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig > -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y > - CONFIG_SPL_OS_BOOT=y > - CONFIG_SPL_RAM_SUPPORT=y > - CONFIG_SPL_RAM_DEVICE=y > -+CONFIG_SPL_ATF=y > - CONFIG_SYS_PROMPT="ZynqMP> " > - CONFIG_FASTBOOT=y > - CONFIG_FASTBOOT_FLASH=y > --- > -2.7.4 > - > diff --git a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch b/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch > deleted file mode 100644 > index 95ab7b3b75..0000000000 > --- a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch > +++ /dev/null > @@ -1,68 +0,0 @@ > -From c7df098a71e05dc81cee818747759e8060b59626 Mon Sep 17 00:00:00 2001 > -From: Luca Ceresoli > -Date: Mon, 4 Jun 2018 12:21:01 +0200 > -Subject: [PATCH] arm64: zynqmp: accept an absolute path for PMUFW_INIT_FILE > - > -The value of PMUFW_INIT_FILE is prefixed with "$(srctree)/", thus > -forcing it to be a relative path inside the U-Boot source tree. Since > -the PMUFW is a binary file generated outside of U-Boot, the PMUFW > -binary must be copied inside the U-Boot source tree before the > -build. > - > -This generates a few problems: > - > - * if the source tree is shared among different out-of-tree builds, > - they will pollute (and potentially corrupt) each other > - * the source tree cannot be read-only > - * any buildsystem must add a command to copy the PMUFW binary > - * putting an externally-generated binary in the source tree is ugly > - as hell > - > -Avoid these problems by accepting an absolute path for > -PMUFW_INIT_FILE. This would be as simple as removing the "$(srctree)/" > -prefix, but in order to keep backward compatibility we rather use the > -shell and readlink to get the absolute path even when starting from a > -relative path. > - > -Since 'readlink -f' produces an empty string if the file does not > -exist, we also add a check to ensure the file configured in > -PMUFW_INIT_FILE exists. Otherwise the build would exit successfully, > -but produce a boot.bin without PMUFW as if PMUFW_INIT_FILE were empty. > - > -Tested in the 12 possible combinations of: > - - PMUFW_INIT_FILE empty, relative, absolute, non-existing > - - building in-tree, in subdir, in other directory > - > -Signed-off-by: Luca Ceresoli > -Cc: Michal Simek > -Cc: Simon Glass > -Cc: Emmanuel Vadot > -Signed-off-by: Michal Simek > -Backported from upstream: https://git.denx.de/?p=u-boot.git;a=commit;h=c7df098a71e05dc81cee818747759e8060b59626 > ---- > - scripts/Makefile.spl | 8 +++++++- > - 1 file changed, 7 insertions(+), 1 deletion(-) > - > -diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl > -index ef018b5b4056..252f13826d4c 100644 > ---- a/scripts/Makefile.spl > -+++ b/scripts/Makefile.spl > -@@ -167,8 +167,14 @@ ifdef CONFIG_ARCH_ZYNQ > - MKIMAGEFLAGS_boot.bin = -T zynqimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) > - endif > - ifdef CONFIG_ARCH_ZYNQMP > -+ifneq ($(CONFIG_PMUFW_INIT_FILE),"") > -+spl/boot.bin: zynqmp-check-pmufw > -+zynqmp-check-pmufw: FORCE > -+ ( cd $(srctree) && test -r $(CONFIG_PMUFW_INIT_FILE) ) \ > -+ || ( echo "Cannot read $(CONFIG_PMUFW_INIT_FILE)" && false ) > -+endif > - MKIMAGEFLAGS_boot.bin = -T zynqmpimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) \ > -- -n $(srctree)/$(CONFIG_PMUFW_INIT_FILE) > -+ -n "$(shell cd $(srctree); readlink -f $(CONFIG_PMUFW_INIT_FILE))" > - endif > - > - spl/boot.bin: $(obj)/u-boot-spl.bin FORCE > --- > -2.7.4 > - > diff --git a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch b/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch > deleted file mode 100644 > index b32e162780..0000000000 > --- a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch > +++ /dev/null > @@ -1,175 +0,0 @@ > -From 4c9d54ab5a41d65000c8d249b6fb1b76056f1812 Mon Sep 17 00:00:00 2001 > -From: Luca Ceresoli > -Date: Wed, 20 Jun 2018 12:11:50 +0200 > -Subject: [PATCH] arm/arm64: zynq/zynqmp: pass the PS init file as a kconfig > - variable > - > -U-Boot needs to link ps7_init_gpl.c on Zynq or psu_init_gpl.c on > -ZynqMP (PS init for short). The current logic to locate this file for > -both platforms is: > - > - 1. if a board-specific file exists in > - board/xilinx/zynq[mp]/$(CONFIG_DEFAULT_DEVICE_TREE)/ps?_init_gpl.c > - then use it > - 2. otherwise use board/xilinx/zynq/ps?_init_gpl.c > - > -In the latter case the file does not exist in the U-Boot sources and > -must be copied in the source tree from the outside before starting the > -build. This is typical when it is generated from Xilinx tools while > -developing a custom hardware. However making sure that a > -board-specific file is _not_ found (and used) requires some trickery > -such as removing or overwriting all PS init files (e.g.: the current > -meta-xilinx yocto layer [0]). > - > -This generates a few problems: > - > - * if the source tree is shared among different out-of-tree builds, > - they will pollute (and potentially corrupt) each other > - * the source tree cannot be read-only > - * any buildsystem must add a command to copy the PS init file binary > - * overwriting or deleting files in the source tree is ugly as hell > - > -Simplify usage by allowing to pass the path to the desired PS init > -file in kconfig variable XILINX_PS_INIT_FILE. It can be an absolute > -path or relative to $(srctree). If the variable is set, the > -user-specified file will always be used without being copied > -around. If the the variable is left empty, for backward compatibility > -fall back to the old behaviour. > - > -Since the issue is the same for Zynq and ZynqMP, add one kconfig > -variable in a common place and use it for both. > - > -Also use the new kconfig help text to document all the ways to give > -U-Boot the PS init file. > - > -Build-tested with all combinations of: > - - platform: zynq or zynqmp > - - PS init file: from XILINX_PS_INIT_FILE (absolute, relative path, > - non-existing), in-tree board-specific, in board/xilinx/zynq[mp]/ > - - building in-tree, in subdir, in other directory > - > -[0] https://github.com/Xilinx/meta-xilinx/blob/b2f74cc7fe5c4881589d5e440a17cb51fc66a7ab/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init.inc#L9 > - > -Signed-off-by: Luca Ceresoli > -Cc: Albert Aribaud > -Cc: Michal Simek > -Cc: Nathan Rossi > -Backported from upstream: https://git.denx.de/?p=u-boot.git;a=commit;h=6da4f67ad09cd8b311d77b2b04e557b7ef65b56c > ---- > - arch/arm/Kconfig | 1 + > - board/xilinx/Kconfig | 41 +++++++++++++++++++++++++++++++++++++++++ > - board/xilinx/zynq/Makefile | 10 +++++++++- > - board/xilinx/zynqmp/Makefile | 10 +++++++++- > - 4 files changed, 60 insertions(+), 2 deletions(-) > - create mode 100644 board/xilinx/Kconfig > - > -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig > -index 22234cde2ab6..e04979d0ef7e 100644 > ---- a/arch/arm/Kconfig > -+++ b/arch/arm/Kconfig > -@@ -1293,4 +1293,5 @@ source "board/technologic/ts4600/Kconfig" > - source "board/vscom/baltos/Kconfig" > - source "board/woodburn/Kconfig" > - source "board/work-microwave/work_92105/Kconfig" > -+source "board/xilinx/Kconfig" > - source "board/zipitz2/Kconfig" > - > - source "arch/arm/Kconfig.debug" > -diff --git a/board/xilinx/Kconfig b/board/xilinx/Kconfig > -new file mode 100644 > -index 000000000000..aa3fa061edef > ---- /dev/null > -+++ b/board/xilinx/Kconfig > -@@ -0,0 +1,41 @@ > -+# Copyright (c) 2018, Luca Ceresoli > -+# > -+# SPDX-License-Identifier: GPL-2.0 > -+ > -+if ARCH_ZYNQ || ARCH_ZYNQMP > -+ > -+config XILINX_PS_INIT_FILE > -+ string "Zynq/ZynqMP PS init file(s) location" > -+ help > -+ On Zynq and ZynqMP U-Boot SPL (or U-Boot proper if > -+ ZYNQMP_PSU_INIT_ENABLED is set) is responsible for some > -+ basic initializations, such as enabling peripherals and > -+ configuring pinmuxes. The PS init file (called > -+ psu_init_gpl.c on ZynqMP, ps7_init_gpl.c for Zynq-7000) > -+ contains the code for such initializations. > -+ > -+ U-Boot contains PS init files for some boards, but each of > -+ them describes only one specific configuration. Users of a > -+ different board, or needing a different configuration, can > -+ generate custom files using the Xilinx development tools. > -+ > -+ There are three ways to give a PS init file to U-Boot: > -+ > -+ 1. Set this variable to the path, either relative to the > -+ source tree or absolute, where the psu_init_gpl.c or > -+ ps7_init_gpl.c file is located. U-Boot will build this > -+ file. > -+ > -+ 2. If you leave an empty string here, U-Boot will use > -+ board/xilinx/zynq/$(CONFIG_DEFAULT_DEVICE_TREE)/ps7_init_gpl.c > -+ for Zynq-7000, or > -+ board/xilinx/zynqmp/$(CONFIG_DEFAULT_DEVICE_TREE)/psu_init_gpl.c > -+ for ZynqMP. > -+ > -+ 3. If the above file does not exist, U-Boot will use > -+ board/xilinx/zynq/ps7_init_gpl.c for Zynq-7000, or > -+ board/xilinx/zynqmp/psu_init_gpl.c for ZynqMP. This file > -+ is not provided by U-Boot, you have to copy it there > -+ before the build. > -+ > -+endif > -diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile > -index 5a76a26720cd..03ad5f0532ee 100644 > ---- a/board/xilinx/zynq/Makefile > -+++ b/board/xilinx/zynq/Makefile > -@@ -5,10 +5,18 @@ > - > - obj-y := board.o > - > --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) > -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") > -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE)) > -+init-objs := ps_init_gpl.o > -+spl/board/xilinx/zynq/ps_init_gpl.o board/xilinx/zynq/ps_init_gpl.o: $(PS_INIT_FILE) > -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ > -+endif > - > -+ifeq ($(init-objs),) > -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) > - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/ps7_init_gpl.c),\ > - $(hw-platform-y)/ps7_init_gpl.o) > -+endif > - > - ifeq ($(init-objs),) > - ifneq ($(wildcard $(srctree)/$(src)/ps7_init_gpl.c),) > -diff --git a/board/xilinx/zynqmp/Makefile b/board/xilinx/zynqmp/Makefile > -index 05ccd25dcef3..960b81fc5853 100644 > ---- a/board/xilinx/zynqmp/Makefile > -+++ b/board/xilinx/zynqmp/Makefile > -@@ -5,10 +5,18 @@ > - > - obj-y := zynqmp.o > - > --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) > -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") > -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE)) > -+init-objs := ps_init_gpl.o > -+spl/board/xilinx/zynqmp/ps_init_gpl.o board/xilinx/zynqmp/ps_init_gpl.o: $(PS_INIT_FILE) > -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ > -+endif > - > -+ifeq ($(init-objs),) > -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) > - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/psu_init_gpl.c),\ > - $(hw-platform-y)/psu_init_gpl.o) > -+endif > - > - ifeq ($(init-objs),) > - ifneq ($(wildcard $(srctree)/$(src)/psu_init_gpl.c),) > --- > -2.7.4 > - > diff --git a/board/zynqmp/pm_cfg_obj.c b/board/zynqmp/pm_cfg_obj.c > new file mode 100644 > index 0000000000..7566b3236a > --- /dev/null > +++ b/board/zynqmp/pm_cfg_obj.c > @@ -0,0 +1,614 @@ > +/****************************************************************************** > +* Copyright (c) 2017 - 2020 Xilinx, Inc. All rights reserved. > +* SPDX-License-Identifier: MIT > +******************************************************************************/ > + > + > +#include "xil_types.h" > +#include "pm_defs.h" > + > +#define PM_CONFIG_MASTER_SECTION_ID 0x101U > +#define PM_CONFIG_SLAVE_SECTION_ID 0x102U > +#define PM_CONFIG_PREALLOC_SECTION_ID 0x103U > +#define PM_CONFIG_POWER_SECTION_ID 0x104U > +#define PM_CONFIG_RESET_SECTION_ID 0x105U > +#define PM_CONFIG_SHUTDOWN_SECTION_ID 0x106U > +#define PM_CONFIG_SET_CONFIG_SECTION_ID 0x107U > +#define PM_CONFIG_GPO_SECTION_ID 0x108U > + > +#define PM_SLAVE_FLAG_IS_SHAREABLE 0x1U > +#define PM_MASTER_USING_SLAVE_MASK 0x2U > + > +#define PM_CONFIG_GPO1_MIO_PIN_34_MAP (1U << 10U) > +#define PM_CONFIG_GPO1_MIO_PIN_35_MAP (1U << 11U) > +#define PM_CONFIG_GPO1_MIO_PIN_36_MAP (1U << 12U) > +#define PM_CONFIG_GPO1_MIO_PIN_37_MAP (1U << 13U) > + > +#define PM_CONFIG_GPO1_BIT_2_MASK (1U << 2U) > +#define PM_CONFIG_GPO1_BIT_3_MASK (1U << 3U) > +#define PM_CONFIG_GPO1_BIT_4_MASK (1U << 4U) > +#define PM_CONFIG_GPO1_BIT_5_MASK (1U << 5U) > + > +#define SUSPEND_TIMEOUT 0xFFFFFFFFU > + > + > +#define PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK 0x00000001 > +#define PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK 0x00000100 > +#define PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK 0x00000200 > + > + > + > +#if defined (__ICCARM__) > +#pragma language=save > +#pragma language=extended > +#endif > +#if defined (__GNUC__) > + const u32 XPm_ConfigObject[] __attribute__((used, section(".sys_cfg_data"))) = > +#elif defined (__ICCARM__) > +#pragma location = ".sys_cfg_data" > +__root const u32 XPm_ConfigObject[] = > +#endif > +{ > + /**********************************************************************/ > + /* HEADER */ > + 1, /* Number of remaining words in the header */ > + 8, /* Number of sections included in config object */ > + /**********************************************************************/ > + /* MASTER SECTION */ > + PM_CONFIG_MASTER_SECTION_ID, /* Master SectionID */ > + 3U, /* No. of Masters*/ > + > + NODE_APU, /* Master Node ID */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask of this master */ > + SUSPEND_TIMEOUT, /* Suspend timeout */ > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ > + > + NODE_RPU_0, /* Master Node ID */ > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask of this master */ > + SUSPEND_TIMEOUT, /* Suspend timeout */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ > + > + NODE_RPU_1, /* Master Node ID */ > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask of this master */ > + SUSPEND_TIMEOUT, /* Suspend timeout */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Suspend permissions */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Wake permissions */ > + > + > + /**********************************************************************/ > + /* SLAVE SECTION */ > + > + > + PM_CONFIG_SLAVE_SECTION_ID, /* Section ID */ > + 49, /* Number of slaves */ > + > + NODE_OCM_BANK_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_OCM_BANK_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_OCM_BANK_2, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_OCM_BANK_3, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_TCM_0_A, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ > + > + NODE_TCM_0_B, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ > + > + NODE_TCM_1_A, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_TCM_1_B, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_L2, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_GPU_PP_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_GPU_PP_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_USB_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_USB_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_TTC_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_TTC_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_TTC_2, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_TTC_3, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_SATA, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_ETH_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_ETH_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_ETH_2, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_ETH_3, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_UART_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_UART_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_SPI_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_SPI_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_I2C_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_I2C_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_SD_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_SD_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_DP, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_GDMA, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_ADMA, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_NAND, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_QSPI, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_GPIO, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_CAN_0, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_CAN_1, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_EXTERN, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_DDR, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_IPI_APU, > + 0U, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask */ > + > + NODE_IPI_RPU_0, > + 0U, > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ > + > + NODE_IPI_RPU_1, > + 0U, > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_GPU, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_PCIE, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_PCAP, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_RTC, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + NODE_VCU, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + 0U, /* IPI Mask */ > + > + NODE_PL, > + PM_SLAVE_FLAG_IS_SHAREABLE, > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ > + > + > + /**********************************************************************/ > + /* PREALLOC SECTION */ > + > + PM_CONFIG_PREALLOC_SECTION_ID, /* Preallaoc SectionID */ > + 3U, /* No. of Masters*/ > + > +/* Prealloc for psu_cortexa53_0 */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, > + 12, > + NODE_DDR, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_L2, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_0, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_2, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_3, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_I2C_0, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_I2C_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_SD_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_QSPI, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_PL, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_IPI_APU, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + > + /* Prealloc for psu_cortexr5_0 */ > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, > + 14, > + NODE_TCM_0_A, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_TCM_0_B, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_DDR, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_0, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_2, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_OCM_BANK_3, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_I2C_0, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_I2C_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_SD_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_QSPI, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_PL, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_ADMA, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_IPI_RPU_0, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + > + /* Prealloc for psu_cortexr5_1 */ > + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + 3, > + NODE_TCM_1_A, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_TCM_1_B, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + NODE_IPI_RPU_1, > + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ > + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ > + > + > + /**********************************************************************/ > + /* POWER SECTION */ > + > + PM_CONFIG_POWER_SECTION_ID, /* Power Section ID */ > + 4U, /* Number of power nodes */ > + > + NODE_APU, /* Power node ID */ > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ > + > + NODE_RPU, /* Power node ID */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ > + > + NODE_FPD, /* Power node ID */ > + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ > + > + NODE_PLD, /* Power node ID */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ > + > + > + /**********************************************************************/ > + /* RESET SECTION */ > + > + PM_CONFIG_RESET_SECTION_ID, /* Reset Section ID */ > + 120U, /* Number of resets */ > + > + XILPM_RESET_PCIE_CFG, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_PCIE_BRIDGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_PCIE_CTRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_DP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SWDT_CRF, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_AFI_FM5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_AFI_FM4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_AFI_FM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_AFI_FM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_AFI_FM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_AFI_FM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GDMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPU_PP1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPU_PP0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPU, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SATA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU3_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU2_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU1_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU0_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_APU_L2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ACPU0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_DDR, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_APM_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SOFT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GEM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GEM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GEM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GEM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_QSPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_UART0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_UART1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SPI0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SPI1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SDIO0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SDIO1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_CAN0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_CAN1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_I2C0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_I2C1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_TTC0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_TTC1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_TTC2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_TTC3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SWDT_CRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_NAND, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_ADMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPIO, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_IOU_CC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_TIMESTAMP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPU_R50, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPU_R51, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPU_AMBA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_OCM, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPU_PGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_USB0_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_USB1_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_USB0_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_USB1_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_USB0_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_USB1_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_IPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_APM_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RTC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_SYSMON, 0, > + XILPM_RESET_AFI_FM6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_LPD_SWDT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_FPD, PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, > + XILPM_RESET_RPU_DBG1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPU_DBG0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_DBG_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_DBG_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_APLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_DPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_VPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_IOPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_7, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_8, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_9, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_10, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_11, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_12, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_13, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_14, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_15, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_16, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_17, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_18, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_19, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_20, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_21, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_22, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_23, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_24, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_25, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_26, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_27, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_28, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_29, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_30, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPO3_PL_31, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_RPU_LS, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_PS_ONLY, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_PL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPIO5_EMIO_92, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPIO5_EMIO_93, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPIO5_EMIO_94, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + XILPM_RESET_GPIO5_EMIO_95, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, > + > + /**********************************************************************/ > + /* SET CONFIG SECTION */ > + PM_CONFIG_SET_CONFIG_SECTION_ID, /* Section ID */ > + 0, /* Permissions to set config */ > + /**********************************************************************/ > + /* SHUTDOWN SECTION */ > + PM_CONFIG_SHUTDOWN_SECTION_ID, /* Section ID */ > + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* System Shutdown/Restart Permission */ > + > + /**********************************************************************/ > + /* GPO SECTION */ > + PM_CONFIG_GPO_SECTION_ID, /* GPO Section ID */ > + PM_CONFIG_GPO1_BIT_2_MASK | > + PM_CONFIG_GPO1_MIO_PIN_34_MAP | > + PM_CONFIG_GPO1_MIO_PIN_35_MAP | > + PM_CONFIG_GPO1_MIO_PIN_36_MAP | > + PM_CONFIG_GPO1_MIO_PIN_37_MAP | > + 0, /* State of GPO pins */ > +}; > +#if defined (__ICCARM__) > +#pragma language=restore > +#endif > diff --git a/board/zynqmp/post-build.sh b/board/zynqmp/post-build.sh > new file mode 100755 > index 0000000000..9fd8bbf2c8 > --- /dev/null > +++ b/board/zynqmp/post-build.sh > @@ -0,0 +1,8 @@ > +#!/bin/sh > + > +# genimage will need to find the extlinux.conf > +# in the binaries directory > + > +BOARD_DIR="$(dirname $0)" > + > +install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux.conf > diff --git a/board/zynqmp/post-image.sh b/board/zynqmp/post-image.sh > index b2b99fed01..ed6dbe188c 100755 > --- a/board/zynqmp/post-image.sh > +++ b/board/zynqmp/post-image.sh > @@ -10,4 +10,6 @@ FIRST_DT=$(sed -nr \ > > [ -z "${FIRST_DT}" ] || ln -fs ${FIRST_DT}.dtb ${BINARIES_DIR}/system.dtb > > -support/scripts/genimage.sh -c board/zynqmp/genimage.cfg > +BOARD_DIR="$(dirname $0)" > + > +support/scripts/genimage.sh -c $BOARD_DIR/genimage.cfg > diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig > index bee7c1daf7..2026f60bd1 100644 > --- a/configs/zynqmp_zcu106_defconfig > +++ b/configs/zynqmp_zcu106_defconfig > @@ -1,34 +1,39 @@ > BR2_aarch64=y > -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_GIT=y > BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" > -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.15" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > # BR2_TARGET_ROOTFS_TAR is not set > BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.6" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" > -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7" > -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA" > +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2022.01" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" > BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > BR2_TARGET_UBOOT_SPL=y > BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" > BR2_TARGET_UBOOT_ZYNQMP=y > -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/53fdb7b6c92860ceb0ec5fd14deee302f4a84269/bin/pmufw-zcu106-default-v2017.4.bin" > +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/v2021.2/bin/pmufw-v2021.2.bin" > +BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/pm_cfg_obj.c" > +BR2_TARGET_UBOOT_FORMAT_ITB=y > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > BR2_PACKAGE_HOST_DOSFSTOOLS=y > BR2_PACKAGE_HOST_GENIMAGE=y > BR2_PACKAGE_HOST_MTOOLS=y From nealf at xilinx.com Thu Feb 10 16:44:02 2022 From: nealf at xilinx.com (Neal Frager) Date: Thu, 10 Feb 2022 16:44:02 +0000 Subject: [Buildroot] [PATCH 1/2] configs/zynqmp_zcu106: Bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: References: <20220208071559.2862411-1-neal.frager@xilinx.com> <69efa9da-ae55-6795-8724-ed7105083924@benettiengineering.com> <32cc1c12-1496-7db9-5e32-1b99404a4fe3@benettiengineering.com> <690d8e1b-fb6d-7c36-b07f-4ed9ca61b768@lucaceresoli.net> <489a02df-4f2b-a46c-aa49-15c3c545f8f2@lucaceresoli.net> Message-ID: <1EC54279-220E-4043-AFBA-953D2CF5E54A@xilinx.com> Hi Giulio, Luca, > > Neal, can you reply about this ^^^. At least, are USB1, ETH0/1/2, both > SPIs, NAND, CAN0, VCU present on those 2 boards? I confirm that the pm_cfg_obj.c file provided is correct for the ZCU102 and ZCU106 boards. These boards use USB0 and ETH3 for these respective peripherals. The peripherals disabled are not connected on either board. To clarify things, I may send another patch with two separate pm_cfg_obj.c files including the board names in the file names. One thing that is different is that the ZCU106 comes with silicon that supports the VCU whereas the ZCU102 does not. So I could create a ZCU106 version of this file which enables the VCU. I think this would be a good example by having two different boards with different pm_cfg_obj.c files, so developers know they will need to modify this file for their custom hardware. Best regards, Neal Frager Xilinx From giulio.benetti at benettiengineering.com Thu Feb 10 16:44:52 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 10 Feb 2022 17:44:52 +0100 Subject: [Buildroot] [PATCH 1/1] board/arcturus/aarch64-ucls1012a: bump u-boot and kernel version In-Reply-To: <2920974c-149f-ea4c-9b79-9a1b862fce95@benettiengineering.com> References: <4b667326-5aca-538b-9b36-7f0d5a400e9f@arcturusnetworks.com> <2920974c-149f-ea4c-9b79-9a1b862fce95@benettiengineering.com> Message-ID: <05091af5-9095-1b40-29c5-b2480b859ae2@benettiengineering.com> Hi Oleksandr, On 08/02/22 19:25, Giulio Benetti wrote: > Hi Oleksandr, > > On 08/02/22 18:31, Oleksandr G Zhadan wrote: >> Hi Giulio, >> >> Thanks for the quick response and your notes. >> >> New V2 patch file attached. The patches are based on today's `git clone >> https://git.buildroot.net/buildroot`. > > good > >> Patches created with the options you suggested: `git format-patch -M -s >> -o . -1` > > Ok, but you also need the flag -v2, so this is the command: > # git format-patch -M -s -o . -1 -v2 > > And then you need to add what's changed after the 3 dashes. Check this > patch as an example: > https://lists.buildroot.org/pipermail/buildroot/2022-February/635926.html > > Take care of adding 3 dashes and listing: > --- > V1->V2: > * changed this > * changed that > --- > >> Unfortunately I can't send it now with 'git send-email --to "buildroot >> " 0001-xxxx.patch`. If it doesn't work for you, >> we'll send it later. > > Yes, we need it sent like that for reviewing. > Anyway I've checked that the attached patch now applies correctly, so > you're on the right path! > > Best regards also, please register to patchwork: https://patchwork.ozlabs.org/project/buildroot/list/ and tag your previous patch as superseded: https://patchwork.ozlabs.org/project/buildroot/patch/4b667326-5aca-538b-9b36-7f0d5a400e9f at arcturusnetworks.com/ and also the V2 since you've been requested for Changes, so you can tag as Change Request now and once sent V3 as superseded. Thank you! Best regards -- Giulio Benetti Benetti Engineering sas From giulio.benetti at benettiengineering.com Thu Feb 10 16:54:25 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 10 Feb 2022 17:54:25 +0100 Subject: [Buildroot] [PATCH 1/2] configs/zynqmp_zcu106: Bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <1EC54279-220E-4043-AFBA-953D2CF5E54A@xilinx.com> References: <20220208071559.2862411-1-neal.frager@xilinx.com> <69efa9da-ae55-6795-8724-ed7105083924@benettiengineering.com> <32cc1c12-1496-7db9-5e32-1b99404a4fe3@benettiengineering.com> <690d8e1b-fb6d-7c36-b07f-4ed9ca61b768@lucaceresoli.net> <489a02df-4f2b-a46c-aa49-15c3c545f8f2@lucaceresoli.net> <1EC54279-220E-4043-AFBA-953D2CF5E54A@xilinx.com> Message-ID: <099dd7ff-c841-f7b5-88b7-f036ebc02a66@benettiengineering.com> Hi Neal, On 10/02/22 17:44, Neal Frager wrote: > Hi Giulio, Luca, > >> >> Neal, can you reply about this ^^^. At least, are USB1, ETH0/1/2, both >> SPIs, NAND, CAN0, VCU present on those 2 boards? > > I confirm that the pm_cfg_obj.c file provided is correct for the ZCU102 and ZCU106 boards. These boards use USB0 and ETH3 for these respective peripherals. The peripherals disabled are not connected on either board. So I would keep the pm_cfg_obj.c as is, but so why .dts file disable peripherals that are not present? > To clarify things, I may send another patch with two separate pm_cfg_obj.c files including the board names in the file names. One thing that is different is that the ZCU106 comes with silicon that supports the VCU whereas the ZCU102 does not. So I could create a ZCU106 version of this file which enables the VCU. I would definitely do that, so 2 pm_cfg_obj.c for 2 FPGAs > I think this would be a good example by having two different boards with different pm_cfg_obj.c files, so developers know they will need to modify this file for their custom hardware. Exactly! PS: please wrap lines at 72 characters! :-) Thank you! Best regards -- Giulio Benetti Benetti Engineering sas From arnout at mind.be Thu Feb 10 17:15:11 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 10 Feb 2022 18:15:11 +0100 Subject: [Buildroot] [PATCH 000/107] Drop python 2.7 In-Reply-To: <20220209213312.GE2249818@scaer> References: <20220209165213.4498-1-peter@korsgaard.com> <20220209213312.GE2249818@scaer> Message-ID: <2cba2cd6-ca70-6336-f2fe-60649a0f1a0d@mind.be> On 09/02/2022 22:33, Yann E. MORIN wrote: > Peter ,All, > > On 2022-02-09 17:50 +0100, Peter Korsgaard spake thusly: >> Python 2.7 is EOL since April 2020 and almost all packages support >> python 3, so drop it before the 2022.02 release. >> >> It is a big series, but the changes are mainly mechanical in nature. >> >> There is still some cleanup to do, E.G. the python2 support in >> pkg-python and the host python-setuptools package - But this is IMHO >> the minimum changes before -rc1. >> >> Peter Korsgaard (107): > ... >> package/python: drop target package > ... >> package/python: drop host package > ... >> docs/manual: drop python2 references > > All 107 patches applied, thanks! > > I'll reply further to two of them, with ultra-minor nits. > > Pfew, 21st century, here we come at last! ;-) Thank you Peter and Yann for handling this! I did a bit of grepping for leftovers and found these: package/pkg-python.mk:# BR2_PACKAGE_PYTHON=y, or a host-package with neither package/pkg-python.mk:# BR2_PACKAGE_PYTHON3=y or BR2_PACKAGE_PYTHON=y. docs/manual/adding-packages-python.txt: * It is not necessary to add +python+ or +host-python+ in the package/gstreamer1/gst1-devtools/gst1-devtools.mk:GST1_DEVTOOLS_DEPENDENCIES += host-python python package/omniorb/omniorb.mk:# omniorb is not python3 friendly, so force the python interpreter package/omniorb/omniorb.mk:OMNIORB_CONF_OPTS = ac_cv_path_PYTHON=$(HOST_DIR)/bin/python2 package/omniorb/omniorb.mk:HOST_OMNIORB_CONF_OPTS = ac_cv_path_PYTHON=$(HOST_DIR)/bin/python2 package/pkg-python.mk:$(2)_DEPENDENCIES += $$(if $$(BR2_PACKAGE_PYTHON3),host-python3 python3,host-python python) package/pkg-python.mk:ifeq ($$($(2)_NEEDS_HOST_PYTHON),python2) package/pkg-python.mk:# setuptools for python2. package/pkg-python.mk:# In all other cases, we install setuptools for python2. Those other package/pkg-python.mk:else ifeq ($(4):$$($(2)_NEEDS_HOST_PYTHON),host:python2) package/pkg-python.mk:# We may want to specify the python interpreter to be used for building a package/pkg-python.mk:# - for target packages, we always use the default python interpreter (which package/python-pyrex/python-pyrex.mk:HOST_PYTHON_PYREX_NEEDS_HOST_PYTHON = python2 package/python-setuptools/python-setuptools.mk:HOST_PYTHON_SETUPTOOLS_NEEDS_HOST_PYTHON = python2 package/python-web2py/python-web2py.mk:PYTHON_WEB2PY_DEPENDENCIES = $(if $(BR2_PACKAGE_PYTHON3),host-python3 python3,host-python python) \ package/python3/python3.mk:# python version chosen for the target. package/python3/python3.mk:# Only install the python symlink in the host tree if python3 is enabled package/python3/python3.mk: ln -fs python3 $(HOST_DIR)/bin/python package/qt5/qt5webengine/qt5webengine.mk:# QtWebengine's build system uses python, but only supports python2. We work package/qt5/qt5webengine/qt5webengine.mk:# around this by forcing python2 early in the PATH, via a python->python2 package/qt5/qt5webengine/qt5webengine.mk: ln -sf $(HOST_DIR)/bin/python2 $(@D)/host-bin/python package/rust/rust.mk: echo 'python = "$(HOST_DIR)/bin/python$(HOST_RUST_PYTHON_VERSION)"'; \ The ones in gst1-devtools.mk and omniorb.mk look important, the rest is just cleanup. qt5webengine is also a bit worrisome... Also, some cleanups that I think are needed: - get rid of HOST_PYTHON_FOO_NEEDS_HOST_PYTHON - symlink $(HOST_DIR)/bin/python to python3, and get rid of the workarounds in e.g. nodejs Regards, Arnout From giulio.benetti at benettiengineering.com Thu Feb 10 17:26:31 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 10 Feb 2022 18:26:31 +0100 Subject: [Buildroot] Various questions for Buildroot contributing In-Reply-To: References: Message-ID: Hi Peter, I add ML in Cc, since these informations are too precious to not be shared, and I've changed Subject and removed some personal questions from Peter to me, On 10/02/22 07:38, Peter Thompson wrote: > Hi Giulio, > > Thanks so much for helping me with buildroot.??? I have a few nit-picky > items that I don't understand and if you have easy solutions, it would > be appreciated.?? Do not worry if you do not know. Sure, np. > > Question #1 > I am now registered on patchwork/buildroot under PeterThompson (instead > of Peter Thompson).???? Somehow PeterThompson was in .gitconfig and when > I correct it to Peter Thompson it removes the From: Peter Thompson in > the git-send message.? Is it possible I have it wrong in duplicate > .gitconfig?? Other suggestions? Mmh, yes, you defintely have problem in .gitconfig What you can do to fix this is updating Name in git with: # git config --global user.name "Peter Thompson" I understand it's a git problem because your SoB are with "PeterThompson". So once done it should be fine with patchwork, because it matches only by e-mail and not by name. > > Question #2 > Patchwork/Buildroot seems to have? only one incorrect patch for me. > [1/1] bump version to 2.0.18 > . > The others seem to have disappeared. Probably because some maintainer tagged them as superseded or rejected, please try to filter less by unchecking: State = Action Required and Archived = No That way you will see all yours. Of course you need to filter for Submitter(that is you). And you will see all your patches. > ? ? I am reluctant to mark the > patch as superseded until I have a better understanding of what is > happening. I think problem is solved with above instructions > Question #3 > When fixing Buildroot, I normally follow happenings on the mailing list. > ? I know others (eg Peter Korsgaard) are doing things in the background > to approve, Reviewers: that can be Maintainers or other people like me or Romain or someone else, even you! > then move my patch submission to a branch commit and then > test the build with the changes (Fabrice Fontaine). Yes, but what Fabrice and other people do is fixing bugs taken from autobuilders: http://autobuild.buildroot.net/ and send patches for them. What you mean instead is done by Maintainers that are the ones that can basically push commits into Buildroot's repository. > ? I do not want to > do anything in Patchwork to mess them up. You simply can't, because you can't touch other's patches status, only Maintainers and Romain as I know. > ? It seems everything is in > order for the next push which I assume is Mar 1. Nay, you need to fix what I've asked you and send a V2 patch, check what I've written below about commit log: https://patchwork.ozlabs.org/project/buildroot/patch/20220205181259.5831-1-peter.macleod.thompson at gmail.com/ > [Buildroot] [git commit] package/sdl2_ttf: bump version to 2.0.18 > /Peter > Korsgaard/ > > * [Buildroot] [PATCH 1/1] bump version to 2.0.18 > /Peter > Thompson / > * [Buildroot] [PATCH 1/1] bump version to 2.0.18 > /Yegor > Yefremov / > * [Buildroot] [PATCH 1/1] bump version to 2.0.18 > /Peter > Thompson / > * [Buildroot] [PATCH 1/1] bump version to 2.0.18 > /Giulio > Benetti/ > > * [Buildroot] [PATCH 1/1] package/sdl2_ttf: bump version to 2.0.18 > /Peter > Thompson / > * [Buildroot] [PATCH 1/1] package/sdl2_ttf: bump version to 2.0.18 > /Peter > Korsgaard / > * [Buildroot] [PATCH 1/1] package/sdl2_ttf: bump version to 2.0.18 > /PeterThompson > / > > > > > Question #4 > # [Buildroot] [PATCH 1/1] package/sdl2: bump version to 2.0.20 > /Arnout > Vandecappelle / > # > > When the license hash changes, please explain in the commit message why it > changed. I added: > > Copyright year updated in LICENSE.txt. > > > Applied to master, thanks. > > Regards, > Arnout > > Arnout added the above re changing the hash. Yes, because the package's LICENSE.txt has actually changed after bumping, so it's worth mention what changed in LICENSE.txt file because it could be that you have to update SDL2_LICENSE = Zlib to something else or it's simply good as it is, but need to mention it. >??? My reason for changing > the hash was different.... I thought the hash was a cross-check to make > sure the whole file was downloaded correctly. It is >?? Hence when you bump to a > new version - you had to re-do the hash. Yes >?? Peter K asked me the same > question and I answered differently? saying it was a needed cross check > for the download.?? ? Are we both correct? It should be like above patch requested by Arnout and Peter told he did it for you: https://patchwork.ozlabs.org/project/buildroot/patch/20220206055330.11218-1-peter.macleod.thompson at gmail.com/ resulting in: https://git.buildroot.net/buildroot/commit/?id=f4da031a77f200515bcc5b2e0fe665a7b4f2a780 ``` - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga ``` > Question #5 > After the commit (to a branch presumably) they (Fabrice Fontaine) found > a build error that I feel badly about and feel I should have caught. You won't be able to caught them all. But what you can do to be "more sure" is to issue: # ./utils/test-pkg -p sdl2_ttf -d ../test-sdl2_ttf -a With -a flash you build for a lot of architectures, while without you only build for 6. But don't mind, it's normal other bugs come out, that's why autobuilders are there always building. But anyway, if you are the maintainer you should fix the bug. And issuing test-pkg -a is something more, but it requires a lot of time too. So go for test-pkg -a for a while and when you feel comfortable use it without -a. If it gives you SKIPPED, it means you need a config fragment by passing a file with library depedency with -c flag. Like a mini-defconfig with only the dependency for sdl2_ttf to build. > # [Buildroot] [PATCH 1/3] package/sdl2_ttf: drop FREETYPE_CONFIG > /Fabrice > Fontaine / > [Buildroot] [PATCH 2/3] package/sdl2_ttf: disable builtin freetype2 > /Fabrice > Fontaine/ > /[Buildroot] [PATCH 3/3] package/sdl2_ttf: add harfbuzz optional > dependency > /Fabrice > Fontaine// > > My challenge is that I do not have a copy of the exact build they use to > catch the error and for me to try all the possible builds is a huge > job. Pointed above >?? I had this issue before when something in SDL2 broke and I could > not replicate the issue (ie it worked fine on my personal build). > Again, I was at a loss at how to help.? ? Is there an easy way to test > changes and replicate problems in buildroot? Sure there is! Check this out: http://autobuild.buildroot.net/ and download: http://git.buildroot.net/buildroot-test/plain/utils/br-reproduce-build with that script you can reproduce the exact problem. Also take care that someone else already fixed it in Patchwork. I always check the NOK and reproduce them with that script, pull the buildroot to latest master or branch where error occurs, fix it, create patch and git send-email. -- Giulio Benetti Benetti Engineering sas From marcus.hoffmann at othermo.de Thu Feb 10 17:31:38 2022 From: marcus.hoffmann at othermo.de (Marcus Hoffmann) Date: Thu, 10 Feb 2022 18:31:38 +0100 Subject: [Buildroot] [PATCH 000/107] Drop python 2.7 In-Reply-To: <2cba2cd6-ca70-6336-f2fe-60649a0f1a0d@mind.be> References: <20220209165213.4498-1-peter@korsgaard.com> <20220209213312.GE2249818@scaer> <2cba2cd6-ca70-6336-f2fe-60649a0f1a0d@mind.be> Message-ID: <9be8fa8f-44d8-6025-3161-dd1818d9c323@othermo.de> Hi all! On 10.02.22 18:15, Arnout Vandecappelle wrote: [...] > > > The ones in gst1-devtools.mk and omniorb.mk look important, the rest is > just cleanup. qt5webengine is also a bit worrisome... > > Also, some cleanups that I think are needed: > - get rid of HOST_PYTHON_FOO_NEEDS_HOST_PYTHON > - symlink $(HOST_DIR)/bin/python to python3, and get rid of the > workarounds in e.g. nodejs This last bit would actually supersede the patch I send yesterday :-) http://patchwork.ozlabs.org/project/buildroot/patch/20220209214305.314272-1-marcus.hoffmann at othermo.de/ > > > ?Regards, > ?Arnout Best, Marcus From marcus.hoffmann at othermo.de Thu Feb 10 17:37:54 2022 From: marcus.hoffmann at othermo.de (Marcus Hoffmann) Date: Thu, 10 Feb 2022 18:37:54 +0100 Subject: [Buildroot] [PATCH] package/rauc: bump to version 1.6 In-Reply-To: <20220209214326.21671-1-heiko.thiery@gmail.com> References: <20220209214326.21671-1-heiko.thiery@gmail.com> Message-ID: Hi! On 09.02.22 22:43, Heiko Thiery wrote: > For release notes see: https://github.com/rauc/rauc/releases/tag/v1.6 > > Signed-off-by: Heiko Thiery Builds and works fine on a raspberrypi CM4. Tested-by: Marcus Hoffmann From luca at lucaceresoli.net Thu Feb 10 17:38:49 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Thu, 10 Feb 2022 18:38:49 +0100 Subject: [Buildroot] [PATCH 1/2] configs/zynqmp_zcu106: Bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: References: <20220208071559.2862411-1-neal.frager@xilinx.com> <69efa9da-ae55-6795-8724-ed7105083924@benettiengineering.com> <32cc1c12-1496-7db9-5e32-1b99404a4fe3@benettiengineering.com> <690d8e1b-fb6d-7c36-b07f-4ed9ca61b768@lucaceresoli.net> <489a02df-4f2b-a46c-aa49-15c3c545f8f2@lucaceresoli.net> Message-ID: <261c3a21-23cb-4217-e396-a85dc605d4d1@lucaceresoli.net> Hi Giulio, Neal, On 10/02/22 17:31, Giulio Benetti wrote: > Hi Neal and Luca, > > On 10/02/22 16:46, Neal Frager wrote: >> Hi Luca, >> >>> Interesting, I'm curious how this works. The pm_cfg_obj.c at the URL >>> you provided, as well as in the patches you sent, has some peripherals >>> disabled: USB1, ETH0/1/2, both SPIs, NAND, CAN0, VCU and more. Do >>> current kernels implement enabling these at runtime, making >>> appropriate requests to PMUFW? This wasn't the case last time I >>> looked into that, it would be very interesting if it? has happened in >>> the meantime. > > Neal, can you reply about this ^^^. At least, are USB1, ETH0/1/2, both > SPIs, NAND, CAN0, VCU present on those 2 boards? > >>> Otherwise one would need to provide a per-configuration pmu config or >>> a "wildcard" config, but I'm not sure whether it would cover all >>> potential use cases. > > I agree. > >> Even though Buildroot has [almost] only defconfigs for well-known >> evaluation boards, it is really meant to be used by custom designs, >> thus we want to be able to use other configurations than those useful >> for Xilinx boards. > > No, it's not meant to be used for custom boards, the goal is having the > 2 BSP for the 2 boards and that's it. The ones who will need to create > custom BSP will ad new BSPs starting from your reference. So here again > what Luca pointed above about a wildcard config is true: we don't know > if it will really cover all cases. Either I didn't explain clearly or we completely disagree. :) What I mean is: the goal *of Buildroot* is to build the software to run embedded Linux systems. Any embedded Linux system, first and foremost the electronic products that many companies make, and that I call "custom designs". Development/evaluation boards are a small subset of the above, however Buildroot defconfigs tend to cover those boards because they are publicly available and commonly used by embedded developers. Of course I agree that the goal *of Neal's patches* is to support two specific evaluation boards. Back to the initial discussion topic, we need Buildroot to be able to contain a pm_cfg_obj.c for each "project" (project ~= defconfig). E.g. a company makes two zynqmp products, one having 2 USB ports and one having 0 USB ports: they'll need two pm_cfg_obj.c files accordingly and none of them will be equal to the file(s) provided by Neal's patches which enable 1 USB. I hope it is clearer now. > Since this is not the goal of Buildroot I would narrow things to deal > with the 2 actual boards peripherals only. > >> I took a closer look at the pm_cfg_obj.c, and I see what you mean.? >> What confused me is that Vivado does not generate this file when you >> create an xsa or hdf file for the hardware design like the psu_init.c >> files.? So I thought the file was always the same regardless of the >> hardware. >> >> Instead, users have two choices.? They can either use Vitis to >> generate a FSBL which will have a pm_cfg_obj.c file in it, or they can >> modify this example file manually.? The pm_cfg_obj.c that I have >> included with buildroot enables all of the peripherals that are >> enabled on the ZCU102 and ZCU106 boards, so I think it is fine for >> having an out of box example for our customers. > > I agree that here we need to deal with those 2 specific boards. > >> Perhaps a good solution would be adding a readme file for the >> pm_cfg_obj.c alerting developers that they will need to modify this >> file for building designs for custom hardware. > > This is implicit I agree this is implicit, meaning it is not the duty of Buildroot to explain people how Xilinx tools work. Or at least Buildroot should at most give a pointer on what the users should do and leave them their homework. Anyway the help for BR2_TARGET_UBOOT_ZYNQMP_PM_CFG already give enough hints IMO. >> In any case, we need to have an example pm_cfg_obj.c file in order for >> the buildroot examples to build and run.? And I think the pm_cfg_obj.c >> is only one of many things developers will need to modify when moving >> from an evaluation board to their own custom hardware. > > This is out of scope here. As patch names point you're bumping or adding > 2 specific boards, so I wouldn't worry about eventual custom boards. > > If someone will deal with it I think they will also deal with Vivado to > create specific config files. At least that is what I would do while > approaching these 2 FPGAs. Exactly. -- Luca From luca at lucaceresoli.net Thu Feb 10 17:42:05 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Thu, 10 Feb 2022 18:42:05 +0100 Subject: [Buildroot] [PATCH 1/2] configs/zynqmp_zcu106: Bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <1EC54279-220E-4043-AFBA-953D2CF5E54A@xilinx.com> References: <20220208071559.2862411-1-neal.frager@xilinx.com> <69efa9da-ae55-6795-8724-ed7105083924@benettiengineering.com> <32cc1c12-1496-7db9-5e32-1b99404a4fe3@benettiengineering.com> <690d8e1b-fb6d-7c36-b07f-4ed9ca61b768@lucaceresoli.net> <489a02df-4f2b-a46c-aa49-15c3c545f8f2@lucaceresoli.net> <1EC54279-220E-4043-AFBA-953D2CF5E54A@xilinx.com> Message-ID: <1f0c37e0-6d9e-97d7-0421-58228d52405b@lucaceresoli.net> Hi Neal, On 10/02/22 17:44, Neal Frager wrote: > Hi Giulio, Luca, > >> >> Neal, can you reply about this ^^^. At least, are USB1, ETH0/1/2, both >> SPIs, NAND, CAN0, VCU present on those 2 boards? > > I confirm that the pm_cfg_obj.c file provided is correct for the ZCU102 and ZCU106 boards. These boards use USB0 and ETH3 for these respective peripherals. The peripherals disabled are not connected on either board. > > To clarify things, I may send another patch with two separate pm_cfg_obj.c files including the board names in the file names. OK, but it's better to use a subdirectory per board and leave the filename as is, as per board/zynqmp/zcu102/pm_cfg_obj.c board/zynqmp/zcu106/pm_cfg_obj.c > One thing that is different is that the ZCU106 comes with silicon that supports the VCU whereas the ZCU102 does not. So I could create a ZCU106 version of this file which enables the VCU. Good point. > I think this would be a good example by having two different boards with different pm_cfg_obj.c files, so developers know they will need to modify this file for their custom hardware. Yes. -- Luca From bernd.kuhls at t-online.de Thu Feb 10 17:46:24 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Thu, 10 Feb 2022 18:46:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi-inputstream-adaptive: bump version to 19.0.3-Matrix Message-ID: <20220210174624.288510-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 c7a081f887..74aefe2138 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 f2285e77043a0c9160d1ab11dd5943cc584be17a2f7920be3002751ff697ec7b kodi-inputstream-adaptive-19.0.2-Matrix.tar.gz +sha256 1549422ac1386929dfc1a479898d6311440d1f8bfd1bc94e1fe5da9cc2db805c kodi-inputstream-adaptive-19.0.3-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 f632a42adb..83ac897037 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.2-Matrix +KODI_INPUTSTREAM_ADAPTIVE_VERSION = 19.0.3-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 mdurrant at arcturusnetworks.com Thu Feb 10 17:47:39 2022 From: mdurrant at arcturusnetworks.com (Michael Durrant) Date: Thu, 10 Feb 2022 12:47:39 -0500 Subject: [Buildroot] [PATCH v3] board/arcturus/aarch64-ucls1012a: bump u-boot and kernel version Message-ID: <20220210174739.15866-1-mdurrant@arcturusnetworks.com> From: Oleksandr G Zhadan Signed-off-by: Oleksandr Zhadan Signed-off-by: Michael Durrant --- V1->V2: - Bump the kernel to "Linux version 5.4.137" - Bootloader version is still "U-Boot 2019.10" but new targets added. - Remove the /etc/init.d/S09modload script to load the pfe firmware module because now the pfe firmware module is loaded by the kernel - New compressed Image.gz is used V2->V3: - Moved SoB to top of patch - The use of Image.gz replace Image to force use of compression. - Our scripts use br2-ucls1012a.its in error ucls1012a.its was used in original readme. - Removing extra newline - The NXP Packet Forward Engine (PFE) firmware loader was the only file used in the overlay. As the PFE is now loaded directly by the kernel the BR2_ROOTFS_OVERLAY script has been removed. --- board/arcturus/aarch64-ucls1012a/post-build.sh | 2 -- board/arcturus/aarch64-ucls1012a/readme.txt | 5 +++-- .../rootfs_overlay/etc/init.d/S09modload | 14 -------------- configs/arcturus_ucls1012a_defconfig | 9 ++++----- 4 files changed, 7 insertions(+), 23 deletions(-) delete mode 100755 board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload diff --git a/board/arcturus/aarch64-ucls1012a/post-build.sh b/board/arcturus/aarch64-ucls1012a/post-build.sh index f8ba78095f..ca3862988d 100755 --- a/board/arcturus/aarch64-ucls1012a/post-build.sh +++ b/board/arcturus/aarch64-ucls1012a/post-build.sh @@ -1,5 +1,3 @@ #!/bin/sh -mkdir -p ${TARGET_DIR}/lib/firmware -cp -f ${BUILD_DIR}/linux-custom/firmware/ppfe/* ${TARGET_DIR}/lib/firmware/ cp -f ${BUILD_DIR}/linux-custom/br2-ucls1012a.its ${BINARIES_DIR}/ diff --git a/board/arcturus/aarch64-ucls1012a/readme.txt b/board/arcturus/aarch64-ucls1012a/readme.txt index 483d5e9aef..cb91716b34 100644 --- a/board/arcturus/aarch64-ucls1012a/readme.txt +++ b/board/arcturus/aarch64-ucls1012a/readme.txt @@ -23,14 +23,15 @@ Result of the build After building, you should obtain this tree: output/images/ + +-- Image.gz +-- arc-ucls1012a.dtb - +-- Image + +-- br2-ucls1012a.its +-- part0-000000.itb +-- rootfs.cpio +-- rootfs.cpio.gz +-- rootfs.tar +-- u-boot.bin - +-- ucls1012a.its Flashing -------- diff --git a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload b/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload deleted file mode 100755 index c87ffda14f..0000000000 --- a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -# -case "$1" in - start) - modprobe pfe - ;; - stop) - ;; - restart|reload) - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac diff --git a/configs/arcturus_ucls1012a_defconfig b/configs/arcturus_ucls1012a_defconfig index fd33ebf1f6..2a9c1e0582 100644 --- a/configs/arcturus_ucls1012a_defconfig +++ b/configs/arcturus_ucls1012a_defconfig @@ -1,22 +1,21 @@ # Architecture BR2_aarch64=y -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # System settings BR2_TARGET_GENERIC_HOSTNAME="ucls1012a" BR2_TARGET_GENERIC_ISSUE="Welcome to uCLS1012A-SOM" BR2_SYSTEM_DHCP="eth0" -BR2_ROOTFS_OVERLAY="board/arcturus/aarch64-ucls1012a/rootfs_overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="board/arcturus/aarch64-ucls1012a/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/arcturus/aarch64-ucls1012a/post-image.sh" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-kernel,v.20.31)/linux-v.20.31.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-kernel,v.22.06)/linux-v.22.06.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="ucls1012a" +BR2_LINUX_KERNEL_IMAGEGZ=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="arcturus/arc-ucls1012a" @@ -28,7 +27,7 @@ BR2_TARGET_ROOTFS_CPIO_GZIP=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-uboot,v.20.31)/uboot-v.20.31.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-uboot,v.22.06)/uboot-v.22.06.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="UCLS1012A_QSPI128" # Tools -- 2.26.2 From marcus.hoffmann at othermo.de Thu Feb 10 17:47:40 2022 From: marcus.hoffmann at othermo.de (Marcus Hoffmann) Date: Thu, 10 Feb 2022 18:47:40 +0100 Subject: [Buildroot] [PATCH] package/rauc: bump to version 1.6 In-Reply-To: References: <20220209214326.21671-1-heiko.thiery@gmail.com> Message-ID: On 10.02.22 18:37, Marcus Hoffmann wrote: > Hi! > > On 09.02.22 22:43, Heiko Thiery wrote: >> For release notes see: https://github.com/rauc/rauc/releases/tag/v1.6 >> >> Signed-off-by: Heiko Thiery > > Builds and works fine on a raspberrypi CM4. Rereading that, this sounds slightly off... built *for* raspberrypi cm4. > > Tested-by: Marcus Hoffmann > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From giulio.benetti at benettiengineering.com Thu Feb 10 18:21:16 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 10 Feb 2022 19:21:16 +0100 Subject: [Buildroot] [PATCH v3] board/arcturus/aarch64-ucls1012a: bump u-boot and kernel version In-Reply-To: <20220210174739.15866-1-mdurrant@arcturusnetworks.com> References: <20220210174739.15866-1-mdurrant@arcturusnetworks.com> Message-ID: <6450c1a7-6448-a6b4-78fb-a27d53b268a7@benettiengineering.com> Hi Michale, Oleksandr, On 10/02/22 18:47, Michael Durrant wrote: > From: Oleksandr G Zhadan Here we're missing the real commit log. I think you've added only to change log some stuff that should go here. Below you only need to point the changes between patches. But here there will be the commit log. So please list here what this patch changes and below only the changes between patches(that looks good actually). What about: ``` - Bump Linux to version 5.4.137 - Bump U-Boot to add new targets, version remains the same - Drop BR2_ROOTFS_OVERLAY and remove S09modload script because it was only used by PFE and now PFE is loaded directly by the kernel - Use Image.gz instead of Image to have a compressed kernel - Rename ucls1012a.its to br2-ucls1012a.its since post-build.sh and post-image.sh use different name. This fixes the actual bug that didn't allow to obtain part0-000000.itb file ``` > Signed-off-by: Oleksandr Zhadan > Signed-off-by: Michael Durrant > --- > V1->V2: > - Bump the kernel to "Linux version 5.4.137" > - Bootloader version is still "U-Boot 2019.10" but new targets added. Why do you need new targets? I mean, this defconfig build for only 1 target, isn't it? > - Remove the /etc/init.d/S09modload script to load the pfe firmware > module because now the pfe firmware module is loaded by the kernel > - New compressed Image.gz is used > V2->V3: > - Moved SoB to top of patch > - The use of Image.gz replace Image to force use of compression. > - Our scripts use br2-ucls1012a.its in error ucls1012a.its was used > in original readme. Ah, so actually this board doesn't work, right? > - Removing extra newline > - The NXP Packet Forward Engine (PFE) firmware loader was the only > file used in the overlay. As the PFE is now loaded directly by > the kernel the BR2_ROOTFS_OVERLAY script has been removed. So here on V4 you only need to write: V3->V4: - Improved commit log by listing all the changed as suggested by Giulio I also see that you have post-build.sh and post-image.sh, but you can move the content of post-build.sh into post-image.sh, or better, the content of post-image.sh back to post-build.sh. This because you don't actually create a final image(like image.img or something else) as I can see. For the rest it looks good to me. I wait for V4. PS: have you thought about also creating a final image by using genimage? That way you could flash the NOR using only 1 file. Does NXP QorIQ? LS1012A processor has some kind of tool to flash directly NOR? Thank you! Best regards -- Giulio Benetti Benetti Engineering sas > --- > board/arcturus/aarch64-ucls1012a/post-build.sh | 2 -- > board/arcturus/aarch64-ucls1012a/readme.txt | 5 +++-- > .../rootfs_overlay/etc/init.d/S09modload | 14 -------------- > configs/arcturus_ucls1012a_defconfig | 9 ++++----- > 4 files changed, 7 insertions(+), 23 deletions(-) > delete mode 100755 board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload > > diff --git a/board/arcturus/aarch64-ucls1012a/post-build.sh b/board/arcturus/aarch64-ucls1012a/post-build.sh > index f8ba78095f..ca3862988d 100755 > --- a/board/arcturus/aarch64-ucls1012a/post-build.sh > +++ b/board/arcturus/aarch64-ucls1012a/post-build.sh > @@ -1,5 +1,3 @@ > #!/bin/sh > > -mkdir -p ${TARGET_DIR}/lib/firmware > -cp -f ${BUILD_DIR}/linux-custom/firmware/ppfe/* ${TARGET_DIR}/lib/firmware/ > cp -f ${BUILD_DIR}/linux-custom/br2-ucls1012a.its ${BINARIES_DIR}/ > diff --git a/board/arcturus/aarch64-ucls1012a/readme.txt b/board/arcturus/aarch64-ucls1012a/readme.txt > index 483d5e9aef..cb91716b34 100644 > --- a/board/arcturus/aarch64-ucls1012a/readme.txt > +++ b/board/arcturus/aarch64-ucls1012a/readme.txt > @@ -23,14 +23,15 @@ Result of the build > After building, you should obtain this tree: > > output/images/ > + +-- Image.gz > +-- arc-ucls1012a.dtb > - +-- Image > + +-- br2-ucls1012a.its > +-- part0-000000.itb > +-- rootfs.cpio > +-- rootfs.cpio.gz > +-- rootfs.tar > +-- u-boot.bin > - +-- ucls1012a.its > > Flashing > -------- > diff --git a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload b/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload > deleted file mode 100755 > index c87ffda14f..0000000000 > --- a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload > +++ /dev/null > @@ -1,14 +0,0 @@ > -#!/bin/sh > -# > -case "$1" in > - start) > - modprobe pfe > - ;; > - stop) > - ;; > - restart|reload) > - ;; > - *) > - echo "Usage: $0 {start|stop|restart}" > - exit 1 > -esac > diff --git a/configs/arcturus_ucls1012a_defconfig b/configs/arcturus_ucls1012a_defconfig > index fd33ebf1f6..2a9c1e0582 100644 > --- a/configs/arcturus_ucls1012a_defconfig > +++ b/configs/arcturus_ucls1012a_defconfig > @@ -1,22 +1,21 @@ > # Architecture > BR2_aarch64=y > > -# Linux headers same as kernel, a 4.14 series > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y > > # System settings > BR2_TARGET_GENERIC_HOSTNAME="ucls1012a" > BR2_TARGET_GENERIC_ISSUE="Welcome to uCLS1012A-SOM" > BR2_SYSTEM_DHCP="eth0" > -BR2_ROOTFS_OVERLAY="board/arcturus/aarch64-ucls1012a/rootfs_overlay" > BR2_ROOTFS_POST_BUILD_SCRIPT="board/arcturus/aarch64-ucls1012a/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/arcturus/aarch64-ucls1012a/post-image.sh" > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-kernel,v.20.31)/linux-v.20.31.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-kernel,v.22.06)/linux-v.22.06.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="ucls1012a" > +BR2_LINUX_KERNEL_IMAGEGZ=y > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="arcturus/arc-ucls1012a" > > @@ -28,7 +27,7 @@ BR2_TARGET_ROOTFS_CPIO_GZIP=y > BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > BR2_TARGET_UBOOT_CUSTOM_TARBALL=y > -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-uboot,v.20.31)/uboot-v.20.31.tar.gz" > +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-uboot,v.22.06)/uboot-v.22.06.tar.gz" > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="UCLS1012A_QSPI128" > > # Tools From peter at korsgaard.com Thu Feb 10 18:56:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 19:56:16 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/gst1-devtools: drop python2 build dependencies In-Reply-To: <20220210061100.810772-1-james.hilliard1@gmail.com> (James Hilliard's message of "Wed, 9 Feb 2022 23:11:00 -0700") References: <20220210061100.810772-1-james.hilliard1@gmail.com> Message-ID: <87leyiwnxr.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Looks like this was missed in c4bbd6da50488944debba29e195557e5b345f2b1 > Signed-off-by: James Hilliard > --- > Changes v1 -> v2: > - move python3 deps to unconditional deps list Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 10 18:56:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 19:56:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/omniorb: switch to host-python3 In-Reply-To: <20220210075821.493485-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 10 Feb 2022 08:58:21 +0100") References: <20220210075821.493485-1-fontaine.fabrice@gmail.com> Message-ID: <87h796wnwy.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Switch to host-python3 which is supported since version 4.2.1 and > https://sourceforge.net/p/omniorb/svn/HEAD/tree/tags/4_2_1/omniORBpy/update.log > to avoid the following build failure since removal of host-python in > commit 2743ce00ca61fde1537b64a165a69d497052be58: > make: *** No rule to make target 'host-python', needed by > '/home/buildroot/autobuild/instance-1/output-1/build/host-omniorb-4.3.0/.stamp_configured'. > Stop. > Fixes: > - http://autobuild.buildroot.org/results/d415c2501b27cacf2356f0f6924ee7706d7a4070 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 10 18:54:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 19:54:01 +0100 Subject: [Buildroot] [git commit] package/gst1-devtools: drop python2 build dependencies Message-ID: <20220210185001.CB92D8275E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=54ee9dc4f88c021f5501a0ae90a5b219736b56f5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Looks like this was missed in c4bbd6da50488944debba29e195557e5b345f2b1 Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-devtools/gst1-devtools.mk | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.mk b/package/gstreamer1/gst1-devtools/gst1-devtools.mk index 66b509ae2c..9089b12188 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.mk +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.mk @@ -12,17 +12,13 @@ GST1_DEVTOOLS_LICENSE_FILES = validate/COPYING GST1_DEVTOOLS_INSTALL_STAGING = YES GST1_DEVTOOLS_DEPENDENCIES = \ + host-python3 \ + python3 \ gstreamer1 \ gst1-plugins-base \ json-glib \ $(if $(BR2_PACKAGE_CAIRO),cairo) -ifeq ($(BR2_PACKAGE_PYTHON3),y) -GST1_DEVTOOLS_DEPENDENCIES += host-python3 python3 -else -GST1_DEVTOOLS_DEPENDENCIES += host-python python -endif - ifeq ($(BR2_PACKAGE_GST1_RTSP_SERVER),y) GST1_DEVTOOLS_DEPENDENCIES += gst1-rtsp-server endif From peter at korsgaard.com Thu Feb 10 18:56:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 19:56:26 +0100 Subject: [Buildroot] [git commit] package/omniorb: switch to host-python3 Message-ID: <20220210185001.D424281319@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f32a2b04c89b6fbcd2cccf22b34fcfebfbcc1f2d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Switch to host-python3 which is supported since version 4.2.1 and https://sourceforge.net/p/omniorb/svn/HEAD/tree/tags/4_2_1/omniORBpy/update.log to avoid the following build failure since removal of host-python in commit 2743ce00ca61fde1537b64a165a69d497052be58: make: *** No rule to make target 'host-python', needed by '/home/buildroot/autobuild/instance-1/output-1/build/host-omniorb-4.3.0/.stamp_configured'. Stop. Fixes: - http://autobuild.buildroot.org/results/d415c2501b27cacf2356f0f6924ee7706d7a4070 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/omniorb/omniorb.mk | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/package/omniorb/omniorb.mk b/package/omniorb/omniorb.mk index a1943968f1..b44ec53fd5 100644 --- a/package/omniorb/omniorb.mk +++ b/package/omniorb/omniorb.mk @@ -11,11 +11,7 @@ OMNIORB_INSTALL_STAGING = YES OMNIORB_LICENSE = GPL2+, LGPL-2.1+ OMNIORB_LICENSE_FILES = COPYING COPYING.LIB OMNIORB_DEPENDENCIES = host-omniorb -HOST_OMNIORB_DEPENDENCIES = host-python - -# omniorb is not python3 friendly, so force the python interpreter -OMNIORB_CONF_OPTS = ac_cv_path_PYTHON=$(HOST_DIR)/bin/python2 -HOST_OMNIORB_CONF_OPTS = ac_cv_path_PYTHON=$(HOST_DIR)/bin/python2 +HOST_OMNIORB_DEPENDENCIES = host-python3 # Defaulting long double support to a safe option for the # mix of embedded targets, this could later be automated From peter at korsgaard.com Thu Feb 10 19:14:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 20:14:00 +0100 Subject: [Buildroot] [PATCH] package/gtest: drop python2 host support Message-ID: <20220210191401.13822-1-peter@korsgaard.com> And simplify the package a bit while we're at it. Signed-off-by: Peter Korsgaard --- package/gtest/gtest.mk | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/package/gtest/gtest.mk b/package/gtest/gtest.mk index 673e626c45..e7ce89a3f4 100644 --- a/package/gtest/gtest.mk +++ b/package/gtest/gtest.mk @@ -19,16 +19,7 @@ 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 +HOST_GTEST_DEPENDENCIES = host-python3 # 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 @@ -56,7 +47,7 @@ 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) + $(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages endef HOST_GTEST_POST_INSTALL_HOOKS += HOST_GTEST_POST_INSTALL_PYTHON -- 2.20.1 From peter at korsgaard.com Thu Feb 10 19:17:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 20:17:47 +0100 Subject: [Buildroot] [PATCH] package/python-web2py: drop python2 host support Message-ID: <20220210191748.14603-1-peter@korsgaard.com> With host-python gone, BR2_PACKAGE_PYTHON3 will always be enabled for a python package, so drop the legacy logic. Signed-off-by: Peter Korsgaard --- package/python-web2py/python-web2py.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-web2py/python-web2py.mk b/package/python-web2py/python-web2py.mk index 5ea46fbfd9..3e453282a9 100644 --- a/package/python-web2py/python-web2py.mk +++ b/package/python-web2py/python-web2py.mk @@ -10,7 +10,7 @@ PYTHON_WEB2PY_LICENSE = LGPL-3.0 PYTHON_WEB2PY_LICENSE_FILES = LICENSE PYTHON_WEB2PY_CPE_ID_VENDOR = web2py PYTHON_WEB2PY_CPE_ID_PRODUCT = web2py -PYTHON_WEB2PY_DEPENDENCIES = $(if $(BR2_PACKAGE_PYTHON3),host-python3 python3,host-python python) \ +PYTHON_WEB2PY_DEPENDENCIES = host-python3 python3 \ host-python-pydal host-python-yatl PYTHON_WEB2PY_EXCLUSIONS = \ -- 2.20.1 From peter at korsgaard.com Thu Feb 10 19:22:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 20:22:02 +0100 Subject: [Buildroot] [PATCH] package/rust: drop host-python2 support Message-ID: <20220210192203.15626-1-peter@korsgaard.com> host-python2 is gone, so always use host-python3. Signed-off-by: Peter Korsgaard --- package/rust/rust.mk | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/package/rust/rust.mk b/package/rust/rust.mk index 5fad7d404c..46487fe4b7 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -14,18 +14,11 @@ HOST_RUST_PROVIDES = host-rustc HOST_RUST_DEPENDENCIES = \ toolchain \ + host-python3 \ host-rust-bin \ host-openssl \ $(BR2_CMAKE_HOST_DEPENDENCY) -ifeq ($(BR2_PACKAGE_PYTHON3),y) -HOST_RUST_PYTHON_VERSION = $(PYTHON3_VERSION_MAJOR) -HOST_RUST_DEPENDENCIES += host-python3 -else -HOST_RUST_PYTHON_VERSION = $(PYTHON_VERSION_MAJOR) -HOST_RUST_DEPENDENCIES += host-python -endif - HOST_RUST_VERBOSITY = $(if $(VERBOSE),2,0) # Some vendor crates contain Cargo.toml.orig files. The associated @@ -50,7 +43,7 @@ define HOST_RUST_CONFIGURE_CMDS echo 'target = ["$(RUSTC_TARGET_NAME)"]'; \ echo 'cargo = "$(HOST_RUST_BIN_DIR)/cargo/bin/cargo"'; \ echo 'rustc = "$(HOST_RUST_BIN_DIR)/rustc/bin/rustc"'; \ - echo 'python = "$(HOST_DIR)/bin/python$(HOST_RUST_PYTHON_VERSION)"'; \ + echo 'python = "$(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR)"'; \ echo 'submodules = false'; \ echo 'vendor = true'; \ echo 'extended = true'; \ @@ -71,12 +64,12 @@ define HOST_RUST_CONFIGURE_CMDS endef define HOST_RUST_BUILD_CMDS - cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(HOST_RUST_PYTHON_VERSION) x.py build + cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py build endef define HOST_RUST_INSTALL_CMDS - cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(HOST_RUST_PYTHON_VERSION) x.py dist - cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(HOST_RUST_PYTHON_VERSION) x.py install + cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py dist + cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py install endef $(eval $(host-generic-package)) -- 2.20.1 From peter at korsgaard.com Thu Feb 10 19:23:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 20:23:32 +0100 Subject: [Buildroot] [PATCH] package/libsigrok: drop host-python2 support Message-ID: <20220210192333.15993-1-peter@korsgaard.com> host-python2 is gone, so always use host-python3. Signed-off-by: Peter Korsgaard --- package/libsigrok/libsigrok.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libsigrok/libsigrok.mk b/package/libsigrok/libsigrok.mk index 2a26518614..639ee4dc25 100644 --- a/package/libsigrok/libsigrok.mk +++ b/package/libsigrok/libsigrok.mk @@ -60,7 +60,7 @@ LIBSIGROK_CONF_OPTS += --enable-cxx LIBSIGROK_DEPENDENCIES += \ glibmm \ host-doxygen \ - $(if $(BR2_PACKAGE_PYTHON3),host-python3,host-python) + host-python3 else LIBSIGROK_CONF_OPTS += --disable-cxx endif -- 2.20.1 From ps.report at gmx.net Thu Feb 10 19:28:52 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 10 Feb 2022 20:28:52 +0100 Subject: [Buildroot] [PATCH v2 00/13] package/gstreamer1/*: bump version to 1.20.0 Message-ID: <20220210192905.4500-1-ps.report@gmx.net> For details see [1] and [2]. [1] https://lists.freedesktop.org/archives/gstreamer-devel/2022-February/079534.html [2] https://gstreamer.freedesktop.org/releases/1.20/ Changes v1 -> v2: - package/gst1-plugins-bad: bump version to 1.20.0: fix rebase/merge artefact in Config.in.legacy (Baruch Siach) Peter Seiderer (13): package/gstreamer1: bump version to 1.20.0 package/gst1-plugins-base: bump version to 1.20.0 package/gst1-plugins-good: bump version to 1.20.0 package/gst1-plugins-bad: bump version to 1.20.0 package/gst1-plugins-ugly: bump version to 1.20.0 package/gst1-devtools: bump version to 1.20.0 package/gst1-libav: bump version to 1.20.0 package/gst1-vaapi: bump version to 1.20.0 package/gst1-rtsp-server: bump version to 1.20.0 package/gstreamer1-editing-services: bump version to 1.20.0 package/gst-omx: bump version to 1.20.0 package/gst1-python: bump version to 1.20.0 package/gst1-plugins-bayer2rgb-neon: fix plugin install Config.in.legacy | 8 ++++ package/gstreamer1/gst-omx/gst-omx.hash | 4 +- package/gstreamer1/gst-omx/gst-omx.mk | 2 +- .../gst1-devtools/gst1-devtools.hash | 4 +- .../gstreamer1/gst1-devtools/gst1-devtools.mk | 13 ++++-- package/gstreamer1/gst1-libav/gst1-libav.hash | 6 +-- package/gstreamer1/gst1-libav/gst1-libav.mk | 4 +- ...n-Allow-building-against-neon-0-32-x.patch | 29 ------------- package/gstreamer1/gst1-plugins-bad/Config.in | 31 +++++++++----- .../gst1-plugins-bad/gst1-plugins-bad.hash | 4 +- .../gst1-plugins-bad/gst1-plugins-bad.mk | 36 ++++++++++++---- .../gst1-plugins-base/gst1-plugins-base.hash | 6 +-- .../gst1-plugins-base/gst1-plugins-base.mk | 5 ++- .../gst1-plugins-bayer2rgb-neon.mk | 4 +- .../gst1-plugins-good/gst1-plugins-good.hash | 4 +- .../gst1-plugins-good/gst1-plugins-good.mk | 2 +- .../gst1-plugins-ugly/gst1-plugins-ugly.hash | 4 +- .../gst1-plugins-ugly/gst1-plugins-ugly.mk | 3 +- .../gstreamer1/gst1-python/gst1-python.hash | 4 +- package/gstreamer1/gst1-python/gst1-python.mk | 2 +- ...-rtsp-server-meson.build-add-gst_dep.patch | 41 ------------------- .../gst1-rtsp-server/gst1-rtsp-server.hash | 8 ++-- .../gst1-rtsp-server/gst1-rtsp-server.mk | 4 +- package/gstreamer1/gst1-vaapi/gst1-vaapi.hash | 4 +- package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 2 +- .../gstreamer1-editing-services.hash | 4 +- .../gstreamer1-editing-services.mk | 2 +- package/gstreamer1/gstreamer1/gstreamer1.hash | 6 +-- package/gstreamer1/gstreamer1/gstreamer1.mk | 5 +-- 29 files changed, 112 insertions(+), 139 deletions(-) delete mode 100644 package/gstreamer1/gst1-plugins-bad/0001-neon-Allow-building-against-neon-0-32-x.patch delete mode 100644 package/gstreamer1/gst1-rtsp-server/0001-gst-rtsp-server-meson.build-add-gst_dep.patch -- 2.34.1 From ps.report at gmx.net Thu Feb 10 19:28:59 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 10 Feb 2022 20:28:59 +0100 Subject: [Buildroot] [PATCH v2 07/13] package/gst1-libav: bump version to 1.20.0 In-Reply-To: <20220210192905.4500-1-ps.report@gmx.net> References: <20220210192905.4500-1-ps.report@gmx.net> Message-ID: <20220210192905.4500-8-ps.report@gmx.net> - update COPYING hash (license text update from LGPL-2.0+ to LGPL-2.1+, see [1]) and adjust GST1_LIBAV_LICENSE accordingly [1] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/d157b23fb0ce175b167611a4cb019599d9017042.patch Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-libav/gst1-libav.hash | 6 +++--- package/gstreamer1/gst1-libav/gst1-libav.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/gstreamer1/gst1-libav/gst1-libav.hash b/package/gstreamer1/gst1-libav/gst1-libav.hash index 5fb39a0b3e..3204de3c14 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.hash +++ b/package/gstreamer1/gst1-libav/gst1-libav.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.18.6.tar.xz.sha256sum -sha256 e4e50dcd5a29441ae34de60d2221057e8064ed824bb6ca4dc0fd9ee88fbe9b81 gst-libav-1.18.6.tar.xz -sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING +# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.20.0.tar.xz.sha256sum +sha256 5eee5ed8d5082a31b500448e41535c722ee30cd5f8224f32982bbaba2eedef17 gst-libav-1.20.0.tar.xz +sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gst1-libav/gst1-libav.mk b/package/gstreamer1/gst1-libav/gst1-libav.mk index 55c6e06e0e..f07e5061b4 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.mk +++ b/package/gstreamer1/gst1-libav/gst1-libav.mk @@ -4,10 +4,10 @@ # ################################################################################ -GST1_LIBAV_VERSION = 1.18.6 +GST1_LIBAV_VERSION = 1.20.0 GST1_LIBAV_SOURCE = gst-libav-$(GST1_LIBAV_VERSION).tar.xz GST1_LIBAV_SITE = https://gstreamer.freedesktop.org/src/gst-libav -GST1_LIBAV_LICENSE = LGPL-2.0+ +GST1_LIBAV_LICENSE = LGPL-2.1+ GST1_LIBAV_LICENSE_FILES = COPYING GST1_LIBAV_DEPENDENCIES = host-pkgconf ffmpeg gstreamer1 gst1-plugins-base GST1_LIBAV_CONF_OPTS = -Ddoc=disabled -- 2.34.1 From ps.report at gmx.net Thu Feb 10 19:28:54 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 10 Feb 2022 20:28:54 +0100 Subject: [Buildroot] [PATCH v2 02/13] package/gst1-plugins-base: bump version to 1.20.0 In-Reply-To: <20220210192905.4500-1-ps.report@gmx.net> References: <20220210192905.4500-1-ps.report@gmx.net> Message-ID: <20220210192905.4500-3-ps.report@gmx.net> - disable new qt5 (Qt5 QML examples) option (suboption of already disabled tests/examples) - update COPYING hash (license text update from LGPL-2.0+ to LGPL-2.1+, see [1]) and adjust GST1_PLUGINS_BASE_LICENSE accordingly [1] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/d157b23fb0ce175b167611a4cb019599d9017042.patch Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash | 6 +++--- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash index 081dc6f213..ffc3445cda 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.18.6.tar.xz.sha256sum -sha256 56a9ff2fe9e6603b9e658cf6897d412a173d2180829fe01e92568549c6bd0f5b gst-plugins-base-1.18.6.tar.xz -sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING +# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.20.0.tar.xz.sha256sum +sha256 4cb66fccf730b1037e6533862c2128990912a6db4e5bbd14e0ef914450eb4c7c gst-plugins-base-1.20.0.tar.xz +sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk index c99eeb6c59..68281738fa 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk @@ -4,12 +4,12 @@ # ################################################################################ -GST1_PLUGINS_BASE_VERSION = 1.18.6 +GST1_PLUGINS_BASE_VERSION = 1.20.0 GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz GST1_PLUGINS_BASE_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-base GST1_PLUGINS_BASE_INSTALL_STAGING = YES GST1_PLUGINS_BASE_LICENSE_FILES = COPYING -GST1_PLUGINS_BASE_LICENSE = LGPL-2.0+, LGPL-2.1+ +GST1_PLUGINS_BASE_LICENSE = LGPL-2.1+ GST1_PLUGINS_BASE_CONF_OPTS = \ -Dexamples=disabled \ @@ -17,6 +17,7 @@ GST1_PLUGINS_BASE_CONF_OPTS = \ -Dgobject-cast-checks=disabled \ -Dglib-asserts=disabled \ -Dglib-checks=disabled \ + -Dqt5=disabled \ -Ddoc=disabled # Options which require currently unpackaged libraries -- 2.34.1 From ps.report at gmx.net Thu Feb 10 19:28:53 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 10 Feb 2022 20:28:53 +0100 Subject: [Buildroot] [PATCH v2 01/13] package/gstreamer1: bump version to 1.20.0 In-Reply-To: <20220210192905.4500-1-ps.report@gmx.net> References: <20220210192905.4500-1-ps.report@gmx.net> Message-ID: <20220210192905.4500-2-ps.report@gmx.net> - meson option gtk_doc removed ([1]) - update COPYING hash (license text update from LGPL-2.0+ to LGPL-2.1+, see [2]) and adjust GSTREAMER1_LICENSE accordingly [1] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/f5ee12395832d4305bb8dbdf4751552d03430d6d.patch [2] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/d157b23fb0ce175b167611a4cb019599d9017042.patch Signed-off-by: Peter Seiderer --- package/gstreamer1/gstreamer1/gstreamer1.hash | 6 +++--- package/gstreamer1/gstreamer1/gstreamer1.mk | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/gstreamer1/gstreamer1/gstreamer1.hash b/package/gstreamer1/gstreamer1/gstreamer1.hash index 1202bf2c50..f4a74a6125 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.hash +++ b/package/gstreamer1/gstreamer1/gstreamer1.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.18.6.tar.xz.sha256sum -sha256 4ec816010dd4d3a93cf470ad0a6f25315f52b204eb1d71dfa70ab8a1c3bd06e6 gstreamer-1.18.6.tar.xz -sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING +# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.20.0.tar.xz.sha256sum +sha256 edf4bffff85591d4fff7b21bb9ed7f0feabc123ac4a4eff29e73cbce454f9db7 gstreamer-1.20.0.tar.xz +sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk index 27745f3bf9..86df5d6cf6 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -4,12 +4,12 @@ # ################################################################################ -GSTREAMER1_VERSION = 1.18.6 +GSTREAMER1_VERSION = 1.20.0 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer GSTREAMER1_INSTALL_STAGING = YES GSTREAMER1_LICENSE_FILES = COPYING -GSTREAMER1_LICENSE = LGPL-2.0+, LGPL-2.1+ +GSTREAMER1_LICENSE = LGPL-2.1+ GSTREAMER1_CPE_ID_VENDOR = gstreamer_project GSTREAMER1_CPE_ID_PRODUCT = gstreamer @@ -18,7 +18,6 @@ GSTREAMER1_CONF_OPTS = \ -Dtests=disabled \ -Dbenchmarks=disabled \ -Dtools=$(if $(BR2_PACKAGE_GSTREAMER1_INSTALL_TOOLS),enabled,disabled) \ - -Dgtk_doc=disabled \ -Dgobject-cast-checks=disabled \ -Dglib-asserts=disabled \ -Dglib-checks=disabled \ -- 2.34.1 From ps.report at gmx.net Thu Feb 10 19:28:56 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 10 Feb 2022 20:28:56 +0100 Subject: [Buildroot] [PATCH v2 04/13] package/gst1-plugins-bad: bump version to 1.20.0 In-Reply-To: <20220210192905.4500-1-ps.report@gmx.net> References: <20220210192905.4500-1-ps.report@gmx.net> Message-ID: <20220210192905.4500-5-ps.report@gmx.net> - removed 0001-neon-Allow-building-against-neon-0-32-x.patch (from upstream [1]) - add codecalpha option (VP8/VP9 alpha support) - add qroverlay option (overlay data on top of video in the form of a QR code) with json-glib and libqrencode dependencies (omit json-glib explicit dependencies as they are the same as for gstreamer1, glib2 BR2_USE_WCHAR, BR2_TOOLCHAIN_HAS_THREADS and BR2_USE_MMU), place instead to 'plugins without external deps' section into 'plugins that need external deps' section as it clearly has dependencies (prelimary to upstream commit [2]) - add aes option (AES encryption/decryption plugin) - disable new option asio (Steinberg Audio Streaming, windows only) - disable new option gs (Google Cloud Storage, needs storage_client library) - disable new option ldac (LDAC bluetooth audio codec, needs ldacBT-enc library) - remove legacy option ofa (disabled) - disable new option onnx (ONNX neural network, needs libonnxruntime library) - disable new option isac (iSAC plugin, needs webrtc-audio-coding-1 library) - removed libmms ('Microsoft Multi Media Server streaming protocol' option, add Config.in.legacy entry - enable new gpl option ('Allow build plugins that have (A)GPL-licensed dependencies') in case gpl plugin enabled [1] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/b83e85ab677c79b46f520abebd1ee031e3a139c0.patch [2] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/5d70c168b356691073a0d22f7ce3ea7efb20641c.patch Signed-off-by: Peter Seiderer --- Changes v1 -> v2: - fix rebase/merge artefact in Config.in.legacy (Baruch Siach) --- Config.in.legacy | 8 +++++ ...n-Allow-building-against-neon-0-32-x.patch | 29 --------------- package/gstreamer1/gst1-plugins-bad/Config.in | 31 ++++++++++------ .../gst1-plugins-bad/gst1-plugins-bad.hash | 4 +-- .../gst1-plugins-bad/gst1-plugins-bad.mk | 36 ++++++++++++++----- 5 files changed, 57 insertions(+), 51 deletions(-) delete mode 100644 package/gstreamer1/gst1-plugins-bad/0001-neon-Allow-building-against-neon-0-32-x.patch diff --git a/Config.in.legacy b/Config.in.legacy index 49c24e61bf..2b1fd48de5 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,14 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBMMS + bool "gst1-plugins-bad plugin libmms was removed" + depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_LEGACY + help + This plugin was removed with gst1-plugins-bad-1.20.0. + config BR2_PACKAGE_PYTHON_FUNCTOOLS32 bool "python-functools32 removed" select BR2_LEGACY 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 deleted file mode 100644 index e995a8cb91..0000000000 --- a/package/gstreamer1/gst1-plugins-bad/0001-neon-Allow-building-against-neon-0-32-x.patch +++ /dev/null @@ -1,29 +0,0 @@ -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 - diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in index b793cb8eb1..234d57636b 100644 --- a/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/package/gstreamer1/gst1-plugins-bad/Config.in @@ -76,6 +76,12 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CAMERABIN2 help Take image snapshots and record movies from camera +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CODECALPHA + bool "codecalpha" + help + Elements for VP8/VP9 alpha support (codecalphademux, + alphacombine, vp8alphadecodebin, vp9alphadecodebin) + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_COLOREFFECTS bool "coloreffects" help @@ -324,6 +330,12 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_Y4M comment "plugins with external dependencies" +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AES + bool "aes" + select BR2_PACKAGE_OPENSSL + help + "AES encryption/decryption plugin" + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASSRENDER bool "assrender" depends on BR2_INSTALL_LIBSTDCPP # libass -> harfbuzz @@ -458,17 +470,6 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_KMS help KMS video sink -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBMMS - bool "libmms" - depends on BR2_USE_WCHAR # libmms -> libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libmms -> libglib2 - select BR2_PACKAGE_LIBMMS - help - Microsoft Multi Media Server streaming protocol support - -comment "libmms needs a toolchain w/ wchar, threads" - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS - config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DTLS bool "dtls" select BR2_PACKAGE_OPENSSL @@ -558,6 +559,14 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPUS help OPUS plugin library +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_QROVERLAY + bool "qroverlay" + select BR2_PACKAGE_JSON_GLIB + select BR2_PACKAGE_LIBQRENCODE + help + Elements qroverlay, debugqroverlay (overlay data on top of + video in the form of a QR code) + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RSVG bool "rsvg" depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # librsvg diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash index d31a78981e..72c9624b94 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.6.tar.xz.sha256sum -sha256 0b1b50ac6311f0c510248b6cd64d6d3c94369344828baa602db85ded5bc70ec9 gst-plugins-bad-1.18.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.20.0.tar.xz.sha256sum +sha256 015b8d4d9a395ebf444d40876867a2034dd3304b3ad48bc3a0dd0c1ee71dc11d gst-plugins-bad-1.20.0.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index d02ca1ba74..24fd9dd312 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BAD_VERSION = 1.18.6 +GST1_PLUGINS_BAD_VERSION = 1.20.0 GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz GST1_PLUGINS_BAD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-bad GST1_PLUGINS_BAD_INSTALL_STAGING = YES @@ -34,6 +34,7 @@ GST1_PLUGINS_BAD_CONF_OPTS = \ # Options which require currently unpackaged libraries GST1_PLUGINS_BAD_CONF_OPTS += \ + -Dasio=disabled \ -Davtp=disabled \ -Dopensles=disabled \ -Dmsdk=disabled \ @@ -46,16 +47,18 @@ GST1_PLUGINS_BAD_CONF_OPTS += \ -Dresindvd=disabled \ -Dfaac=disabled \ -Dflite=disabled \ + -Dgs=disabled \ -Dgsm=disabled \ -Dkate=disabled \ -Dladspa=disabled \ + -Dldac=disabled \ -Dlv2=disabled \ -Dmediafoundation=disabled \ -Dmicrodns=disabled \ -Dlibde265=disabled \ -Dmodplug=disabled \ -Dmplex=disabled \ - -Dofa=disabled \ + -Donnx=disabled \ -Dopenexr=disabled \ -Dopenni2=disabled \ -Dteletext=disabled \ @@ -69,6 +72,7 @@ GST1_PLUGINS_BAD_CONF_OPTS += \ -Dwasapi2=disabled \ -Dzxing=disabled \ -Dmagicleap=disabled \ + -Disac=disabled \ -Diqa=disabled \ -Dopencv=disabled @@ -180,6 +184,12 @@ else GST1_PLUGINS_BAD_CONF_OPTS += -Dcamerabin2=disabled endif +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CODECALPHA),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Dcodecalpha=enabled +else +GST1_PLUGINS_BAD_CONF_OPTS += -Dcodecalpha=disabled +endif + ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_COLOREFFECTS),y) GST1_PLUGINS_BAD_CONF_OPTS += -Dcoloreffects=enabled else @@ -497,6 +507,13 @@ endif # Plugins with dependencies +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AES),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Daes=enabled +GST1_PLUGINS_BAD_DEPENDENCIES += openssl +else +GST1_PLUGINS_BAD_CONF_OPTS += -Daes=disabled +endif + ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASSRENDER),y) GST1_PLUGINS_BAD_CONF_OPTS += -Dassrender=enabled GST1_PLUGINS_BAD_DEPENDENCIES += libass @@ -604,13 +621,6 @@ else GST1_PLUGINS_BAD_CONF_OPTS += -Dkms=disabled endif -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBMMS),y) -GST1_PLUGINS_BAD_CONF_OPTS += -Dlibmms=enabled -GST1_PLUGINS_BAD_DEPENDENCIES += libmms -else -GST1_PLUGINS_BAD_CONF_OPTS += -Dlibmms=disabled -endif - ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DTLS),y) GST1_PLUGINS_BAD_CONF_OPTS += -Ddtls=enabled GST1_PLUGINS_BAD_DEPENDENCIES += openssl @@ -677,6 +687,13 @@ else GST1_PLUGINS_BAD_CONF_OPTS += -Dopus=disabled endif +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_QROVERLAY),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Dqroverlay=enabled +GST1_PLUGINS_BAD_DEPENDENCIES += json-glib libqrencode +else +GST1_PLUGINS_BAD_CONF_OPTS += -Dqroverlay=disabled +endif + ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RSVG),y) GST1_PLUGINS_BAD_CONF_OPTS += -Drsvg=enabled GST1_PLUGINS_BAD_DEPENDENCIES += librsvg @@ -787,6 +804,7 @@ endif # Add GPL license if GPL licensed plugins enabled. ifeq ($(GST1_PLUGINS_BAD_HAS_GPL_LICENSE),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Dgpl=enabled GST1_PLUGINS_BAD_LICENSE += , GPL-2.0+ GST1_PLUGINS_BAD_LICENSE_FILES += COPYING endif -- 2.34.1 From ps.report at gmx.net Thu Feb 10 19:29:03 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 10 Feb 2022 20:29:03 +0100 Subject: [Buildroot] [PATCH v2 11/13] package/gst-omx: bump version to 1.20.0 In-Reply-To: <20220210192905.4500-1-ps.report@gmx.net> References: <20220210192905.4500-1-ps.report@gmx.net> Message-ID: <20220210192905.4500-12-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gst-omx/gst-omx.hash | 4 ++-- package/gstreamer1/gst-omx/gst-omx.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst-omx/gst-omx.hash b/package/gstreamer1/gst-omx/gst-omx.hash index 47f7cb5893..0b95505c5f 100644 --- a/package/gstreamer1/gst-omx/gst-omx.hash +++ b/package/gstreamer1/gst-omx/gst-omx.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.18.6.tar.xz.sha256sum -sha256 b5281c938e959fd2418e989cfb6065fdd9fe5f6f87ee86236c9427166e708163 gst-omx-1.18.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.20.0.tar.xz.sha256sum +sha256 c1e46b70ac379ac7b3646506370c9e1007b56ae293f4d334bc0e724c76c345dd gst-omx-1.20.0.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst-omx/gst-omx.mk b/package/gstreamer1/gst-omx/gst-omx.mk index dc65509244..f71e1242ff 100644 --- a/package/gstreamer1/gst-omx/gst-omx.mk +++ b/package/gstreamer1/gst-omx/gst-omx.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST_OMX_VERSION = 1.18.6 +GST_OMX_VERSION = 1.20.0 GST_OMX_SOURCE = gst-omx-$(GST_OMX_VERSION).tar.xz GST_OMX_SITE = https://gstreamer.freedesktop.org/src/gst-omx -- 2.34.1 From ps.report at gmx.net Thu Feb 10 19:29:01 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 10 Feb 2022 20:29:01 +0100 Subject: [Buildroot] [PATCH v2 09/13] package/gst1-rtsp-server: bump version to 1.20.0 In-Reply-To: <20220210192905.4500-1-ps.report@gmx.net> References: <20220210192905.4500-1-ps.report@gmx.net> Message-ID: <20220210192905.4500-10-ps.report@gmx.net> - removed 0001-gst-rtsp-server-meson.build-add-gst_dep.patch (upstream accepted [1]) - update COPYING/COPYING.LIB hash (license text update from LGPL-2.0+ to LGPL-2.1+, see [2]) and adjust GST1_RTSP_SERVER_LICENSE accordingly [1] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/e637aae629f5b95b748a6f23abecc2b502272822.patch [2] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/cc5cdab0165e3bdf5f4f748b3ba2a3493d304e70.patch Signed-off-by: Peter Seiderer --- ...-rtsp-server-meson.build-add-gst_dep.patch | 41 ------------------- .../gst1-rtsp-server/gst1-rtsp-server.hash | 8 ++-- .../gst1-rtsp-server/gst1-rtsp-server.mk | 4 +- 3 files changed, 6 insertions(+), 47 deletions(-) delete mode 100644 package/gstreamer1/gst1-rtsp-server/0001-gst-rtsp-server-meson.build-add-gst_dep.patch 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 deleted file mode 100644 index b63f634598..0000000000 --- a/package/gstreamer1/gst1-rtsp-server/0001-gst-rtsp-server-meson.build-add-gst_dep.patch +++ /dev/null @@ -1,41 +0,0 @@ -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 - diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash index fadef41351..00ff974c6e 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash @@ -1,4 +1,4 @@ -# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.18.6.tar.xz.sha256sum -sha256 826f32afbcf94b823541efcac4a0dacdb62f6145ef58f363095749f440262be9 gst-rtsp-server-1.18.6.tar.xz -sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING -sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING.LIB +# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.20.0.tar.xz.sha256sum +sha256 c209f5ed906da713fdd44a8844e909aa6c8af3dfb630259b092cfb77a7755843 gst-rtsp-server-1.20.0.tar.xz +sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING +sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING.LIB diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk index 55403754f3..d22dd5e7cc 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk @@ -4,10 +4,10 @@ # ################################################################################ -GST1_RTSP_SERVER_VERSION = 1.18.6 +GST1_RTSP_SERVER_VERSION = 1.20.0 GST1_RTSP_SERVER_SOURCE = gst-rtsp-server-$(GST1_RTSP_SERVER_VERSION).tar.xz GST1_RTSP_SERVER_SITE = http://gstreamer.freedesktop.org/src/gst-rtsp-server -GST1_RTSP_SERVER_LICENSE = LGPL-2.0+ +GST1_RTSP_SERVER_LICENSE = LGPL-2.1+ GST1_RTSP_SERVER_LICENSE_FILES = COPYING COPYING.LIB GST1_RTSP_SERVER_CPE_ID_VENDOR = gstreamer_project GST1_RTSP_SERVER_CPE_ID_PRODUCT = gst-rtsp-server -- 2.34.1 From ps.report at gmx.net Thu Feb 10 19:28:55 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 10 Feb 2022 20:28:55 +0100 Subject: [Buildroot] [PATCH v2 03/13] package/gst1-plugins-good: bump version to 1.20.0 In-Reply-To: <20220210192905.4500-1-ps.report@gmx.net> References: <20220210192905.4500-1-ps.report@gmx.net> Message-ID: <20220210192905.4500-4-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash | 4 ++-- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash index e342bd133e..9ad1d7bf46 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.6.tar.xz.sha256sum -sha256 26723ac01fcb360ade1f41d168c7c322d8af4ceb7e55c8c12ed2690d06a76eed gst-plugins-good-1.18.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.20.0.tar.xz.sha256sum +sha256 2d119c15ab8c9e79f8cd3c6bf582ff7a050b28ccae52ab4865e1a1464991659c gst-plugins-good-1.20.0.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk index e0ca29c5fd..6298d578ed 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_GOOD_VERSION = 1.18.6 +GST1_PLUGINS_GOOD_VERSION = 1.20.0 GST1_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST1_PLUGINS_GOOD_VERSION).tar.xz GST1_PLUGINS_GOOD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-good GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING -- 2.34.1 From ps.report at gmx.net Thu Feb 10 19:29:05 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 10 Feb 2022 20:29:05 +0100 Subject: [Buildroot] [PATCH v2 13/13] package/gst1-plugins-bayer2rgb-neon: fix plugin install In-Reply-To: <20220210192905.4500-1-ps.report@gmx.net> References: <20220210192905.4500-1-ps.report@gmx.net> Message-ID: <20220210192905.4500-14-ps.report@gmx.net> - fix plugin install path, add '-with-plugindir=/usr/lib/gstreamer-1.0', otherwise the plugins are installed with duplicated build path (as detected by step_check_build_dir) - remove GST1_PLUGINS_BAYER2RGB_NEON_INSTALL_STAGING (no need to install the plugin to staging) Signed-off-by: Peter Seiderer --- .../gst1-plugins-bayer2rgb-neon.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.mk b/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.mk index 815099e315..0d4aeac7f5 100644 --- a/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.mk +++ b/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.mk @@ -10,8 +10,6 @@ GST1_PLUGINS_BAYER2RGB_NEON_SITE_METHOD = git GST1_PLUGINS_BAYER2RGB_NEON_LICENSE = GPL-3.0 GST1_PLUGINS_BAYER2RGB_NEON_LICENSE_FILES = COPYING -GST1_PLUGINS_BAYER2RGB_NEON_INSTALL_STAGING = YES - GST1_PLUGINS_BAYER2RGB_NEON_DEPENDENCIES = \ host-pkgconf \ gstreamer1 \ @@ -20,4 +18,6 @@ GST1_PLUGINS_BAYER2RGB_NEON_DEPENDENCIES = \ GST1_PLUGINS_BAYER2RGB_NEON_AUTORECONF = YES +GST1_PLUGINS_BAYER2RGB_NEON_CONF_OPTS = --with-plugindir=/usr/lib/gstreamer-1.0 + $(eval $(autotools-package)) -- 2.34.1 From ps.report at gmx.net Thu Feb 10 19:28:58 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 10 Feb 2022 20:28:58 +0100 Subject: [Buildroot] [PATCH v2 06/13] package/gst1-devtools: bump version to 1.20.0 In-Reply-To: <20220210192905.4500-1-ps.report@gmx.net> References: <20220210192905.4500-1-ps.report@gmx.net> Message-ID: <20220210192905.4500-7-ps.report@gmx.net> - use new option cairo ('Build GstValidateVideo') instead pure optional dependency on packet cairo Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-devtools/gst1-devtools.hash | 4 ++-- package/gstreamer1/gst1-devtools/gst1-devtools.mk | 13 ++++++++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.hash b/package/gstreamer1/gst1-devtools/gst1-devtools.hash index 011385e757..dd09280a9c 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.hash +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.18.6.tar.xz.sha256sum -sha256 3725622c740a635452e54b79d065f963ab7706ca2403de6c43072ae7610a0de4 gst-devtools-1.18.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.20.0.tar.xz.sha256sum +sha256 69fc8756ec9d93e5c5258c99088434f203e91fdbc5af28d1f2c583fd819b7a1d gst-devtools-1.20.0.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 validate/COPYING diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.mk b/package/gstreamer1/gst1-devtools/gst1-devtools.mk index 9089b12188..f72df9cf71 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.mk +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_DEVTOOLS_VERSION = 1.18.6 +GST1_DEVTOOLS_VERSION = 1.20.0 GST1_DEVTOOLS_SOURCE = gst-devtools-$(GST1_DEVTOOLS_VERSION).tar.xz GST1_DEVTOOLS_SITE = https://gstreamer.freedesktop.org/src/gst-devtools GST1_DEVTOOLS_LICENSE = LGPL-2.1+ @@ -16,8 +16,7 @@ GST1_DEVTOOLS_DEPENDENCIES = \ python3 \ gstreamer1 \ gst1-plugins-base \ - json-glib \ - $(if $(BR2_PACKAGE_CAIRO),cairo) + json-glib ifeq ($(BR2_PACKAGE_GST1_RTSP_SERVER),y) GST1_DEVTOOLS_DEPENDENCIES += gst1-rtsp-server @@ -30,4 +29,12 @@ GST1_DEVTOOLS_CONF_OPTS = \ -Dtests=disabled \ -Ddoc=disabled +# build GstValidateVideo +ifeq ($(BR2_PACKAGE_CAIRO),y) +GST1_DEVTOOLS_CONF_OPTS += -Dcairo=enabled +GST1_DEVTOOLS_DEPENDENCIES += cairo +else +GST1_DEVTOOLS_CONF_OPTS += -Dcairo=disabled +endif + $(eval $(meson-package)) -- 2.34.1 From ps.report at gmx.net Thu Feb 10 19:28:57 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 10 Feb 2022 20:28:57 +0100 Subject: [Buildroot] [PATCH v2 05/13] package/gst1-plugins-ugly: bump version to 1.20.0 In-Reply-To: <20220210192905.4500-1-ps.report@gmx.net> References: <20220210192905.4500-1-ps.report@gmx.net> Message-ID: <20220210192905.4500-6-ps.report@gmx.net> - enable new gpl option ('Allow build plugins that have GPL-licensed dependencies') in case gpl plugin enabled Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash | 4 ++-- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash index 26fd0fd9ac..d16134f24b 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.18.6.tar.xz.sha256sum -sha256 4969c409cb6a88317d2108b8577108e18623b2333d7b587ae3f39459c70e3a7f gst-plugins-ugly-1.18.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.20.0.tar.xz.sha256sum +sha256 4e8dcb5d26552f0a4937f6bc6279bd9070f55ca6ae0eaa32d72d264c44001c2e gst-plugins-ugly-1.20.0.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk index 7f483deb81..05b1fab304 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_UGLY_VERSION = 1.18.6 +GST1_PLUGINS_UGLY_VERSION = 1.20.0 GST1_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST1_PLUGINS_UGLY_VERSION).tar.xz GST1_PLUGINS_UGLY_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-ugly GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING @@ -89,6 +89,7 @@ endif # Add GPL license if GPL plugins enabled. ifeq ($(GST1_PLUGINS_UGLY_HAS_GPL_LICENSE),y) +GST1_PLUGINS_UGLY_CONF_OPTS += -Dgpl=enabled GST1_PLUGINS_UGLY_LICENSE += , GPL-2.0 endif -- 2.34.1 From ps.report at gmx.net Thu Feb 10 19:29:04 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 10 Feb 2022 20:29:04 +0100 Subject: [Buildroot] [PATCH v2 12/13] package/gst1-python: bump version to 1.20.0 In-Reply-To: <20220210192905.4500-1-ps.report@gmx.net> References: <20220210192905.4500-1-ps.report@gmx.net> Message-ID: <20220210192905.4500-13-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-python/gst1-python.hash | 4 ++-- package/gstreamer1/gst1-python/gst1-python.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-python/gst1-python.hash b/package/gstreamer1/gst1-python/gst1-python.hash index a760e53e7d..a2f17583fd 100644 --- a/package/gstreamer1/gst1-python/gst1-python.hash +++ b/package/gstreamer1/gst1-python/gst1-python.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.18.6.tar.xz.sha256sum -sha256 bdc0ea22fbd7335ad9decc151561aacc53c51206a9735b81eac700ce5b0bbd4a gst-python-1.18.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.20.0.tar.xz.sha256sum +sha256 8f67bdc5606ba33606c6bc896e89de7dcd8cf4fca459f71389b1b6fe075b5e54 gst-python-1.20.0.tar.xz sha256 ea3ad127610e5ded2210b3a86a46314f2b3b28e438eccffdae19a4d6fbcdb0c2 COPYING diff --git a/package/gstreamer1/gst1-python/gst1-python.mk b/package/gstreamer1/gst1-python/gst1-python.mk index 7faab752cd..a9cc32d1d7 100644 --- a/package/gstreamer1/gst1-python/gst1-python.mk +++ b/package/gstreamer1/gst1-python/gst1-python.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PYTHON_VERSION = 1.18.6 +GST1_PYTHON_VERSION = 1.20.0 GST1_PYTHON_SOURCE = gst-python-$(GST1_PYTHON_VERSION).tar.xz GST1_PYTHON_SITE = https://gstreamer.freedesktop.org/src/gst-python GST1_PYTHON_INSTALL_STAGING = YES -- 2.34.1 From ps.report at gmx.net Thu Feb 10 19:29:00 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 10 Feb 2022 20:29:00 +0100 Subject: [Buildroot] [PATCH v2 08/13] package/gst1-vaapi: bump version to 1.20.0 In-Reply-To: <20220210192905.4500-1-ps.report@gmx.net> References: <20220210192905.4500-1-ps.report@gmx.net> Message-ID: <20220210192905.4500-9-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-vaapi/gst1-vaapi.hash | 4 ++-- package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash index 7e22774c11..b32d91e1e2 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.18.6.tar.xz.sha256sum -sha256 ab6270f1e5e4546fbe6f5ea246d86ca3d196282eb863d46e6cdcc96f867449e0 gstreamer-vaapi-1.18.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.20.0.tar.xz.sha256sum +sha256 f79a47346dfd5e585e063e77078e5fc498b06dee895bfcbf47d8863fcac9ea32 gstreamer-vaapi-1.20.0.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk index 6af851602f..19ee625703 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_VAAPI_VERSION = 1.18.6 +GST1_VAAPI_VERSION = 1.20.0 GST1_VAAPI_SITE = https://gstreamer.freedesktop.org/src/gstreamer-vaapi GST1_VAAPI_SOURCE = gstreamer-vaapi-$(GST1_VAAPI_VERSION).tar.xz GST1_VAAPI_LICENSE = LGPL-2.1+ -- 2.34.1 From ps.report at gmx.net Thu Feb 10 19:29:02 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 10 Feb 2022 20:29:02 +0100 Subject: [Buildroot] [PATCH v2 10/13] package/gstreamer1-editing-services: bump version to 1.20.0 In-Reply-To: <20220210192905.4500-1-ps.report@gmx.net> References: <20220210192905.4500-1-ps.report@gmx.net> Message-ID: <20220210192905.4500-11-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- .../gstreamer1-editing-services.hash | 4 ++-- .../gstreamer1-editing-services.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash index e29dc112ce..9662e6b8fb 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash @@ -1,5 +1,5 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.18.6.tar.xz.sha256sum -sha256 fe10d14ef896aa21038317f6f81e1158ccc6caaed9b0d5a29ae5bdd63074582c gst-editing-services-1.18.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.20.0.tar.xz.sha256sum +sha256 f837adcf4073d19a5908984e879cd039f4192ca368e71d39e8ccd8a56b9feedf gst-editing-services-1.20.0.tar.xz # Hashes for license files: sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk index a3722cbbca..5e03c08ae7 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_EDITING_SERVICES_VERSION = 1.18.6 +GSTREAMER1_EDITING_SERVICES_VERSION = 1.20.0 GSTREAMER1_EDITING_SERVICES_SOURCE = gst-editing-services-$(GSTREAMER1_EDITING_SERVICES_VERSION).tar.xz GSTREAMER1_EDITING_SERVICES_SITE = https://gstreamer.freedesktop.org/src/gstreamer-editing-services GSTREAMER1_EDITING_SERVICES_LICENSE = LGPL-2.0+ -- 2.34.1 From giulio.benetti at benettiengineering.com Thu Feb 10 20:01:02 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 10 Feb 2022 21:01:02 +0100 Subject: [Buildroot] [PATCH v4 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <20cfc8a7-9e51-8e16-3db6-775658503a75@xilinx.com> References: <20220210081932.3114763-1-neal.frager@xilinx.com> <7ed72b26-0729-93c7-e1c7-c429e2a5fb87@benettiengineering.com> <20cfc8a7-9e51-8e16-3db6-775658503a75@xilinx.com> Message-ID: Hi Michal, On 10/02/22 19:41, Michal Simek wrote: > > > On 2/10/22 17:39, Giulio Benetti wrote: >> Hi Neal, >> >> On 10/02/22 09:19, Neal Frager wrote: >>> This patch: >>> - bumps ATF to Xilinx v2.6: mainline v2.6 requires patch to build >>> - bumps U-Boot to Xilinx 2022.01: important drivers not in mainline >>> - bumps Linux to Xilinx 5.15: important drivers not in mainline >>> - deletes board/zynqmp/patches directory: patches already in mainline >>> - modifies board/zynqmp/genimage.cfg: U-Boot 2022.01 uses u-boot.itb format >>> - adds extlinux.conf to vfat bootfs >>> - modifies U-Boot to unified xilinx_zynqmp_virt_defconfig (supports all boards) >>> - adds support for SPL pm_cfg_obj.c loading to PMU firmware >>> - enables support for host machines without OpenSSL required by U-Boot and Linux >>> >> >> If you put the 3 dashes below, everything after them will be ignored, so you >> need to put here... >> >>> --- >>> V1->V2: >>> * fixed general build issues >>> * added extlinux.conf for run-time boot issue >>> V2->V3: >>> * enabled support for host machines without OpenSSL required by U-Boot and Linux >>> * moved readme.txt update to zynqmp_zcu102_defconfig patch 2/2 >>> V3->V4: >>> * cleaned up commit log messages >>> * added version history >>> --- >>> >>> Signed-off-by: Neal Frager >>> Reviewed-by: Giulio Benetti >>> Tested-by: Giulio Benetti >>> [Giulio: only build tested] >> >> These ^^^ >> >>> Signed-off-by: Neal Frager >> >> And drop this ^^^ that is already part of the patch. >> >> Same goes for patch 2/2 >> >> And I would shrink pm_cfg_obj.c down to what boards really sport without >> thinking too much about eventual custom boards as discussed here: >> https://lists.buildroot.org/pipermail/buildroot/2022-February/636513.html >> >>> --- >>> ? board/zynqmp/extlinux.conf??????????????????? |?? 5 + >>> ? board/zynqmp/genimage.cfg???????????????????? |?? 6 +- >>> ? ...-fix-Remove-GGC-ignore-Warray-bounds.patch |? 68 -- >>> ? ...64-zynqmp-zcu106-fix-SPL-MMC-booting.patch |? 52 -- >>> ? ...2-arm64-zynqmp-Enable-booting-to-ATF.patch | 114 ---- >>> ? ...ept-an-absolute-path-for-PMUFW_INIT_.patch |? 68 -- >>> ? ...ynqmp-pass-the-PS-init-file-as-a-kco.patch | 175 ----- >>> ? board/zynqmp/pm_cfg_obj.c???????????????????? | 614 ++++++++++++++++++ >> >> But here I see you only have one pm_cfg_obj.c for both z102 and z106, is that >> sufficient? I mean, have they so common peripherals? >> >> I see we have to deal with: >> Zynq UltraScale+ XCZU7EV-2FFVC1156 MPSoC for z106 >> and >> Zynq UltraScale+ XCZU9EG-2FFVB1156 MPSoC for z102 >> >> so I don't know if having a common pm_cfg_obj.c should be a good idea. >> >> I know few about FPGAs, but I don't know if they are really compatible. > > These boards can use the same config object. But it all the time depends on > configurations you want. But default every board/config/bitstream can require > different config object. Yes, so it's better using different pm_cfg_obj.c in different directories. This way if you will add another FPGA it will have its own bistream(pm_cfg_obj.c AFAICU). Thank you! Best regards -- Giulio Benetti Benetti Engineering sas From yann.morin.1998 at free.fr Thu Feb 10 20:37:19 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 10 Feb 2022 21:37:19 +0100 Subject: [Buildroot] [PATCH 000/107] Drop python 2.7 In-Reply-To: <2cba2cd6-ca70-6336-f2fe-60649a0f1a0d@mind.be> References: <20220209165213.4498-1-peter@korsgaard.com> <20220209213312.GE2249818@scaer> <2cba2cd6-ca70-6336-f2fe-60649a0f1a0d@mind.be> Message-ID: <20220210203719.GA3752867@scaer> Arnout, All, On 2022-02-10 18:15 +0100, Arnout Vandecappelle spake thusly: > On 09/02/2022 22:33, Yann E. MORIN wrote: > >On 2022-02-09 17:50 +0100, Peter Korsgaard spake thusly: > >>Python 2.7 is EOL since April 2020 and almost all packages support > >>python 3, so drop it before the 2022.02 release. [--SNIP--] > I did a bit of grepping for leftovers and found these: [--SNIP--] Yeah, I knew we had missed a few things, and Peter had already noticed a few in the cover-letter, but we needed to move forward quick, at the risk of breaking things. After all, the post-rc1 period is actually to fix things we broke! ;-) > The ones in gst1-devtools.mk and omniorb.mk look important, the rest is just > cleanup. qt5webengine is also a bit worrisome... For qt5webengine, IIRC James and Adam were working on it, and may have a pending change ready? I was thinking maybe about this: https://patchwork.ozlabs.org/project/buildroot/list/?series=284619 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 Thu Feb 10 20:44:30 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 10 Feb 2022 21:44:30 +0100 Subject: [Buildroot] [git commit] package/gtest: drop python2 host support Message-ID: <20220210203748.6253F82984@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=aa01b17862ab3af9d95a05018bf8ccf5e875057b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master And simplify the package a bit while we're at it. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/gtest/gtest.mk | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/package/gtest/gtest.mk b/package/gtest/gtest.mk index 673e626c45..e7ce89a3f4 100644 --- a/package/gtest/gtest.mk +++ b/package/gtest/gtest.mk @@ -19,16 +19,7 @@ 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 +HOST_GTEST_DEPENDENCIES = host-python3 # 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 @@ -56,7 +47,7 @@ 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) + $(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages endef HOST_GTEST_POST_INSTALL_HOOKS += HOST_GTEST_POST_INSTALL_PYTHON From yann.morin.1998 at free.fr Thu Feb 10 20:44:35 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 10 Feb 2022 21:44:35 +0100 Subject: [Buildroot] [git commit] package/rust: drop host-python2 support Message-ID: <20220210203748.75FE982DF5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4c8ae13e7ce84d76e7ed06d05322a49b26bd3c7f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master host-python2 is gone, so always use host-python3. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/rust/rust.mk | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/package/rust/rust.mk b/package/rust/rust.mk index 5fad7d404c..46487fe4b7 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -14,18 +14,11 @@ HOST_RUST_PROVIDES = host-rustc HOST_RUST_DEPENDENCIES = \ toolchain \ + host-python3 \ host-rust-bin \ host-openssl \ $(BR2_CMAKE_HOST_DEPENDENCY) -ifeq ($(BR2_PACKAGE_PYTHON3),y) -HOST_RUST_PYTHON_VERSION = $(PYTHON3_VERSION_MAJOR) -HOST_RUST_DEPENDENCIES += host-python3 -else -HOST_RUST_PYTHON_VERSION = $(PYTHON_VERSION_MAJOR) -HOST_RUST_DEPENDENCIES += host-python -endif - HOST_RUST_VERBOSITY = $(if $(VERBOSE),2,0) # Some vendor crates contain Cargo.toml.orig files. The associated @@ -50,7 +43,7 @@ define HOST_RUST_CONFIGURE_CMDS echo 'target = ["$(RUSTC_TARGET_NAME)"]'; \ echo 'cargo = "$(HOST_RUST_BIN_DIR)/cargo/bin/cargo"'; \ echo 'rustc = "$(HOST_RUST_BIN_DIR)/rustc/bin/rustc"'; \ - echo 'python = "$(HOST_DIR)/bin/python$(HOST_RUST_PYTHON_VERSION)"'; \ + echo 'python = "$(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR)"'; \ echo 'submodules = false'; \ echo 'vendor = true'; \ echo 'extended = true'; \ @@ -71,12 +64,12 @@ define HOST_RUST_CONFIGURE_CMDS endef define HOST_RUST_BUILD_CMDS - cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(HOST_RUST_PYTHON_VERSION) x.py build + cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py build endef define HOST_RUST_INSTALL_CMDS - cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(HOST_RUST_PYTHON_VERSION) x.py dist - cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(HOST_RUST_PYTHON_VERSION) x.py install + cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py dist + cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py install endef $(eval $(host-generic-package)) From yann.morin.1998 at free.fr Thu Feb 10 20:44:37 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 10 Feb 2022 21:44:37 +0100 Subject: [Buildroot] [git commit] package/libsigrok: drop host-python2 support Message-ID: <20220210203748.8158582DBD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0309124a499b37c3fb253386ad88eca19fa065ef branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master host-python2 is gone, so always use host-python3. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/libsigrok/libsigrok.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libsigrok/libsigrok.mk b/package/libsigrok/libsigrok.mk index 2a26518614..639ee4dc25 100644 --- a/package/libsigrok/libsigrok.mk +++ b/package/libsigrok/libsigrok.mk @@ -60,7 +60,7 @@ LIBSIGROK_CONF_OPTS += --enable-cxx LIBSIGROK_DEPENDENCIES += \ glibmm \ host-doxygen \ - $(if $(BR2_PACKAGE_PYTHON3),host-python3,host-python) + host-python3 else LIBSIGROK_CONF_OPTS += --disable-cxx endif From yann.morin.1998 at free.fr Thu Feb 10 20:44:32 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 10 Feb 2022 21:44:32 +0100 Subject: [Buildroot] [git commit] package/python-web2py: drop python2 host support Message-ID: <20220210203748.6C1ED81392@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=39b025258539b8686eb5615a6df10e2c06b5c228 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master With host-python gone, BR2_PACKAGE_PYTHON3 will always be enabled for a python package, so drop the legacy logic. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-web2py/python-web2py.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-web2py/python-web2py.mk b/package/python-web2py/python-web2py.mk index 5ea46fbfd9..3e453282a9 100644 --- a/package/python-web2py/python-web2py.mk +++ b/package/python-web2py/python-web2py.mk @@ -10,7 +10,7 @@ PYTHON_WEB2PY_LICENSE = LGPL-3.0 PYTHON_WEB2PY_LICENSE_FILES = LICENSE PYTHON_WEB2PY_CPE_ID_VENDOR = web2py PYTHON_WEB2PY_CPE_ID_PRODUCT = web2py -PYTHON_WEB2PY_DEPENDENCIES = $(if $(BR2_PACKAGE_PYTHON3),host-python3 python3,host-python python) \ +PYTHON_WEB2PY_DEPENDENCIES = host-python3 python3 \ host-python-pydal host-python-yatl PYTHON_WEB2PY_EXCLUSIONS = \ From yann.morin.1998 at free.fr Thu Feb 10 20:46:20 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 10 Feb 2022 21:46:20 +0100 Subject: [Buildroot] [PATCH] package/gtest: drop python2 host support In-Reply-To: <20220210191401.13822-1-peter@korsgaard.com> References: <20220210191401.13822-1-peter@korsgaard.com> Message-ID: <20220210204620.GB3752867@scaer> Peter, All, On 2022-02-10 20:14 +0100, Peter Korsgaard spake thusly: > And simplify the package a bit while we're at it. > > Signed-off-by: Peter Korsgaard Appied to master, along with your three other python-related patches. Regards, Yann E. MORIN. > --- > package/gtest/gtest.mk | 13 ++----------- > 1 file changed, 2 insertions(+), 11 deletions(-) > > diff --git a/package/gtest/gtest.mk b/package/gtest/gtest.mk > index 673e626c45..e7ce89a3f4 100644 > --- a/package/gtest/gtest.mk > +++ b/package/gtest/gtest.mk > @@ -19,16 +19,7 @@ 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 > +HOST_GTEST_DEPENDENCIES = host-python3 > > # 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 > @@ -56,7 +47,7 @@ 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) > + $(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages > endef > > HOST_GTEST_POST_INSTALL_HOOKS += HOST_GTEST_POST_INSTALL_PYTHON > -- > 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 Feb 10 20:48:16 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 10 Feb 2022 21:48:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/gtest: drop host python2 support In-Reply-To: <20220209224105.772909-1-james.hilliard1@gmail.com> References: <20220209224105.772909-1-james.hilliard1@gmail.com> Message-ID: <20220210204816.GC3752867@scaer> James, All, On 2022-02-09 15:41 -0700, James Hilliard spake thusly: > Signed-off-by: James Hilliard Thanks for your patch. I've instead applied Peter's patch, that did go the extra length of cleaning up now-unnecessary variables too. Thanks! ;-) Regards, Yann E. MORIN. > --- > package/gtest/gtest.mk | 5 ----- > 1 file changed, 5 deletions(-) > > diff --git a/package/gtest/gtest.mk b/package/gtest/gtest.mk > index 673e626c45..5bad1fb5f7 100644 > --- a/package/gtest/gtest.mk > +++ b/package/gtest/gtest.mk > @@ -19,13 +19,8 @@ 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 > -- > 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 peter at korsgaard.com Thu Feb 10 21:18:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:18:44 +0100 Subject: [Buildroot] [PATCH 000/107] Drop python 2.7 In-Reply-To: <20220210203719.GA3752867@scaer> (Yann E. MORIN's message of "Thu, 10 Feb 2022 21:37:19 +0100") References: <20220209165213.4498-1-peter@korsgaard.com> <20220209213312.GE2249818@scaer> <2cba2cd6-ca70-6336-f2fe-60649a0f1a0d@mind.be> <20220210203719.GA3752867@scaer> Message-ID: <87czjuwhcb.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: Hi, > Arnout, All, > On 2022-02-10 18:15 +0100, Arnout Vandecappelle spake thusly: >> On 09/02/2022 22:33, Yann E. MORIN wrote: >> >On 2022-02-09 17:50 +0100, Peter Korsgaard spake thusly: >> >>Python 2.7 is EOL since April 2020 and almost all packages support >> >>python 3, so drop it before the 2022.02 release. > [--SNIP--] >> I did a bit of grepping for leftovers and found these: > [--SNIP--] > Yeah, I knew we had missed a few things, and Peter had already noticed a > few in the cover-letter, but we needed to move forward quick, at the > risk of breaking things. > After all, the post-rc1 period is actually to fix things we broke! ;-) Indeed ;) >> The ones in gst1-devtools.mk and omniorb.mk look important, the rest is just >> cleanup. qt5webengine is also a bit worrisome... > For qt5webengine, IIRC James and Adam were working on it, and may have a > pending change ready? > I was thinking maybe about this: > https://patchwork.ozlabs.org/project/buildroot/list/?series=284619 Yes, I guess we'll need something like that. I did a quick test to see if the current qt5webengine version works with python3 - But it doesn't :/ -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 10 21:21:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:21:15 +0100 Subject: [Buildroot] [PATCH] package/rauc: bump to version 1.6 In-Reply-To: <20220209214326.21671-1-heiko.thiery@gmail.com> (Heiko Thiery's message of "Wed, 9 Feb 2022 22:43:27 +0100") References: <20220209214326.21671-1-heiko.thiery@gmail.com> Message-ID: <878ruiwh84.fsf@dell.be.48ers.dk> >>>>> "Heiko" == Heiko Thiery writes: > For release notes see: https://github.com/rauc/rauc/releases/tag/v1.6 > Signed-off-by: Heiko Thiery > --- > # utils/test-pkg -p rauc > 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 Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 10 21:20:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:20:35 +0100 Subject: [Buildroot] [git commit] package/rauc: bump to version 1.6 Message-ID: <20220210211521.34BE882235@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c24eff63a8f5f4f06e95ed6c899e1813287e33a4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For release notes see: https://github.com/rauc/rauc/releases/tag/v1.6 Signed-off-by: Heiko Thiery Tested-by: Marcus Hoffmann Signed-off-by: Peter Korsgaard --- package/rauc/rauc.hash | 4 ++-- package/rauc/rauc.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/rauc/rauc.hash b/package/rauc/rauc.hash index a025257845..f6c1446de4 100644 --- a/package/rauc/rauc.hash +++ b/package/rauc/rauc.hash @@ -1,4 +1,4 @@ # Locally calculated, after verifying against -# https://github.com/rauc/rauc/releases/download/v1.5.1/rauc-1.5.1.tar.xz.asc -sha256 d4ea009ce702bcb083d942398ccfedec959c6bbb7adc0fd77ae9314ce11d9d91 rauc-1.5.1.tar.xz +# https://github.com/rauc/rauc/releases/download/v1.6/rauc-1.6.tar.xz.asc +sha256 86013788dd02321b7c3f913ad3a1f8802afbc784ec076fa278524a9e1ef9e7b0 rauc-1.6.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/rauc/rauc.mk b/package/rauc/rauc.mk index 99efc16c2f..39f5255812 100644 --- a/package/rauc/rauc.mk +++ b/package/rauc/rauc.mk @@ -4,7 +4,7 @@ # ################################################################################ -RAUC_VERSION = 1.5.1 +RAUC_VERSION = 1.6 RAUC_SITE = https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION) RAUC_SOURCE = rauc-$(RAUC_VERSION).tar.xz RAUC_LICENSE = LGPL-2.1 From peter at korsgaard.com Thu Feb 10 21:24:29 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:24:29 +0100 Subject: [Buildroot] [PATCH] package/python3: unconditionally install python{, -config} symlinks Message-ID: <20220210212429.31856-1-peter@korsgaard.com> Now that host-python2 is gone, it makes sense to unconditionally install the symlinks for the host, similar to how it is done for the target. Signed-off-by: Peter Korsgaard --- package/python3/python3.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 6af7488ddd..3a334fb28d 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -262,18 +262,12 @@ endef PYTHON3_POST_INSTALL_TARGET_HOOKS += PYTHON3_INSTALL_SYMLINK -# Some packages may have build scripts requiring python3, whatever is the -# python version chosen for the target. -# Only install the python symlink in the host tree if python3 is enabled -# for the target. -ifeq ($(BR2_PACKAGE_PYTHON3),y) define HOST_PYTHON3_INSTALL_SYMLINK ln -fs python3 $(HOST_DIR)/bin/python ln -fs python3-config $(HOST_DIR)/bin/python-config endef HOST_PYTHON3_POST_INSTALL_HOOKS += HOST_PYTHON3_INSTALL_SYMLINK -endif # Provided to other packages PYTHON3_PATH = $(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/ -- 2.20.1 From peter at korsgaard.com Thu Feb 10 21:31:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:31:39 +0100 Subject: [Buildroot] [PATCH v4 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <20220210081932.3114763-1-neal.frager@xilinx.com> (Neal Frager's message of "Thu, 10 Feb 2022 01:19:31 -0700") References: <20220210081932.3114763-1-neal.frager@xilinx.com> Message-ID: <874k56wgqs.fsf@dell.be.48ers.dk> >>>>> "Neal" == Neal Frager writes: > This patch: > - bumps ATF to Xilinx v2.6: mainline v2.6 requires patch to build > - bumps U-Boot to Xilinx 2022.01: important drivers not in mainline > - bumps Linux to Xilinx 5.15: important drivers not in mainline > - deletes board/zynqmp/patches directory: patches already in mainline > - modifies board/zynqmp/genimage.cfg: U-Boot 2022.01 uses u-boot.itb format > - adds extlinux.conf to vfat bootfs > - modifies U-Boot to unified xilinx_zynqmp_virt_defconfig (supports all boards) > - adds support for SPL pm_cfg_obj.c loading to PMU firmware > - enables support for host machines without OpenSSL required by U-Boot and Linux > V3-> V4: > * cleaned up commit log messages > * added version history > --- [snip] > +++ b/configs/zynqmp_zcu106_defconfig > @@ -1,34 +1,39 @@ > BR2_aarch64=y > -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_GIT=y > BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" > -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.15" xlnx_rebase_v5.15 is a branch. A git version should point to a tag og a sha1 so the build is reproducible. > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.6" Same for xlnx_rebase_v2.6 > BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" > -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7" > -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA" > +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2022.01" And xlnx_rebase_v2022.01 I think I earlier asked you not to change the URL when it is not needed, please leave the existing /xilinx/ URL. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 10 21:32:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:32:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi-inputstream-adaptive: bump version to 19.0.3-Matrix In-Reply-To: <20220210174624.288510-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Thu, 10 Feb 2022 18:46:24 +0100") References: <20220210174624.288510-1-bernd.kuhls@t-online.de> Message-ID: <87zgmyv24j.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 10 21:33:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:33:07 +0100 Subject: [Buildroot] [PATCH] package/re2: bump version to 2022-02-01 In-Reply-To: <20220210110546.345600-1-buildroot@heine.tech> (Michael Nosthoff via buildroot's message of "Thu, 10 Feb 2022 12:05:38 +0100") References: <20220210110546.345600-1-buildroot@heine.tech> Message-ID: <87v8xmv23w.fsf@dell.be.48ers.dk> >>>>> "Michael" == Michael Nosthoff via buildroot writes: > Signed-off-by: Michael Nosthoff Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 10 21:34:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:34:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/libarchive: security bump to version 3.5.3 In-Reply-To: <20220209193614.330861-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 9 Feb 2022 20:36:14 +0100") References: <20220209193614.330861-1-fontaine.fabrice@gmail.com> Message-ID: <87r18av21r.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Libarchive 3.5.3 is a security release > Security Fixes: > - extended fix for following symlinks when processing the fixup list > (CVE-2021-31566) > - fix invalid memory access and out of bounds read in RAR5 reader > (CVE-2021-36976) > https://github.com/libarchive/libarchive/releases/tag/v3.5.3 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 10 21:34:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:34:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/audit: bump to version 3.0.7 In-Reply-To: <20220209194454.344276-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 9 Feb 2022 20:44:54 +0100") References: <20220209194454.344276-1-fontaine.fabrice@gmail.com> Message-ID: <87mtiyv219.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://github.com/linux-audit/audit-userspace/releases/tag/v3.0.7 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 10 21:34:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:34:58 +0100 Subject: [Buildroot] [PATCH 1/1] package/fping: bump to version 5.1 In-Reply-To: <20220209195930.349179-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 9 Feb 2022 20:59:30 +0100") References: <20220209195930.349179-1-fontaine.fabrice@gmail.com> Message-ID: <87iltmv20t.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://github.com/schweikert/fping/releases/tag/v5.1 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 10 21:35:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:35:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/gauche: drop autoreconf In-Reply-To: <20220209201444.352250-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 9 Feb 2022 21:14:44 +0100") References: <20220209201444.352250-1-fontaine.fabrice@gmail.com> Message-ID: <87ee4av204.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Commit 11cb72be570409be77d4bb49c17b4a2feef31be7 forgot to drop > autoreconf > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 10 21:35:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:35:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/libmodbus: bump to version 3.1.7 In-Reply-To: <20220209202825.359811-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 9 Feb 2022 21:28:25 +0100") References: <20220209202825.359811-1-fontaine.fabrice@gmail.com> Message-ID: <87a6eyv1zr.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://github.com/stephane/libmodbus/releases/tag/v3.1.7 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From nealf at xilinx.com Thu Feb 10 21:36:26 2022 From: nealf at xilinx.com (Neal Frager) Date: Thu, 10 Feb 2022 21:36:26 +0000 Subject: [Buildroot] [PATCH 1/2] configs/zynqmp_zcu106: Bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <1f0c37e0-6d9e-97d7-0421-58228d52405b@lucaceresoli.net> References: <20220208071559.2862411-1-neal.frager@xilinx.com> <69efa9da-ae55-6795-8724-ed7105083924@benettiengineering.com> <32cc1c12-1496-7db9-5e32-1b99404a4fe3@benettiengineering.com> <690d8e1b-fb6d-7c36-b07f-4ed9ca61b768@lucaceresoli.net> <489a02df-4f2b-a46c-aa49-15c3c545f8f2@lucaceresoli.net> <1EC54279-220E-4043-AFBA-953D2CF5E54A@xilinx.com> <1f0c37e0-6d9e-97d7-0421-58228d52405b@lucaceresoli.net> Message-ID: Hi Luca, > > OK, but it's better to use a subdirectory per board and leave the > filename as is, as per > > board/zynqmp/zcu102/pm_cfg_obj.c > board/zynqmp/zcu106/pm_cfg_obj.c > Good idea. We actually do agree on the purpose of buildroot. The whole point behind updating the zynqmp_zcu10x_defconfig files is to give buildroot users a better example to start from. In addition to evaluation boards being common and available, they are usually where developers get their starting example. That said, I will update the patch using Vitis 2021.2 generated pm_cfg_obj.c files for each board. I like your directory structure idea and will add the files this way. By having two examples, it should be clear for developers that the pm_cfg_obj.c file is something they will probably need to modify for their target hardware. All of this being said, I will make another version of the patch to incorporate this. Best regards, Neal Frager Xilinx From peter at korsgaard.com Thu Feb 10 21:37:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:37:28 +0100 Subject: [Buildroot] [PATCH 1/1] package/lzip: bump to version 1.23 In-Reply-To: <20220209203535.361814-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 9 Feb 2022 21:35:35 +0100") References: <20220209203535.361814-1-fontaine.fabrice@gmail.com> Message-ID: <875ypmv1wn.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://lists.nongnu.org/archive/html/lzip-bug/2022-02/msg00000.html > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 10 21:32:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:32:31 +0100 Subject: [Buildroot] [git commit] package/kodi-inputstream-adaptive: bump version to 19.0.3-Matrix Message-ID: <20220210213036.ABD5C82DE9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5eac014874d0d5be36f0d9a580b6fc9378678e35 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash | 2 +- package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash index c7a081f887..74aefe2138 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 f2285e77043a0c9160d1ab11dd5943cc584be17a2f7920be3002751ff697ec7b kodi-inputstream-adaptive-19.0.2-Matrix.tar.gz +sha256 1549422ac1386929dfc1a479898d6311440d1f8bfd1bc94e1fe5da9cc2db805c kodi-inputstream-adaptive-19.0.3-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 f632a42adb..83ac897037 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.2-Matrix +KODI_INPUTSTREAM_ADAPTIVE_VERSION = 19.0.3-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 peter at korsgaard.com Thu Feb 10 21:34:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:34:17 +0100 Subject: [Buildroot] [git commit] package/libarchive: security bump to version 3.5.3 Message-ID: <20220210213036.C395082DE9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=99d3d6afe7a5df12552d0d305743f64abdd155c4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Libarchive 3.5.3 is a security release Security Fixes: - extended fix for following symlinks when processing the fixup list (CVE-2021-31566) - fix invalid memory access and out of bounds read in RAR5 reader (CVE-2021-36976) https://github.com/libarchive/libarchive/releases/tag/v3.5.3 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libarchive/libarchive.hash | 2 +- package/libarchive/libarchive.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libarchive/libarchive.hash b/package/libarchive/libarchive.hash index d31e9f55f4..5dd8e5c167 100644 --- a/package/libarchive/libarchive.hash +++ b/package/libarchive/libarchive.hash @@ -1,4 +1,4 @@ # From https://www.libarchive.de/downloads/sha256sums -sha256 f0b19ff39c3c9a5898a219497ababbadab99d8178acc980155c7e1271089b5a0 libarchive-3.5.2.tar.xz +sha256 5cac725dd4be31c4a10b65d30f29dc957ea29ef3d758df6e46e8ae90a996a19a libarchive-3.5.3.tar.xz # Locally computed: sha256 b2cdf763345de2de34cebf54394df3c61a105c3b71288603c251f2fa638200ba COPYING diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk index eec256ba75..cf16c27e67 100644 --- a/package/libarchive/libarchive.mk +++ b/package/libarchive/libarchive.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBARCHIVE_VERSION = 3.5.2 +LIBARCHIVE_VERSION = 3.5.3 LIBARCHIVE_SOURCE = libarchive-$(LIBARCHIVE_VERSION).tar.xz LIBARCHIVE_SITE = https://www.libarchive.de/downloads LIBARCHIVE_INSTALL_STAGING = YES From peter at korsgaard.com Thu Feb 10 21:33:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:33:02 +0100 Subject: [Buildroot] [git commit] package/re2: bump version to 2022-02-01 Message-ID: <20220210213036.B72B882DFF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d2cf91e0c6a082261cc7ebb06dfdbd7bc2c2956f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Michael Nosthoff Signed-off-by: Peter Korsgaard --- package/re2/re2.hash | 2 +- package/re2/re2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/re2/re2.hash b/package/re2/re2.hash index a0a7d15938..7cfece5d5e 100644 --- a/package/re2/re2.hash +++ b/package/re2/re2.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 8c45f7fba029ab41f2a7e6545058d9eec94eef97ce70df58e92d85cfc08b4669 re2-2021-11-01.tar.gz +sha256 9c1e6acfd0fed71f40b025a7a1dabaf3ee2ebb74d64ced1f9ee1b0b01d22fd27 re2-2022-02-01.tar.gz sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 LICENSE diff --git a/package/re2/re2.mk b/package/re2/re2.mk index b562d5d7ef..31252ee82f 100644 --- a/package/re2/re2.mk +++ b/package/re2/re2.mk @@ -4,7 +4,7 @@ # ################################################################################ -RE2_VERSION = 2021-11-01 +RE2_VERSION = 2022-02-01 RE2_SITE = $(call github,google,re2,$(RE2_VERSION)) RE2_LICENSE = BSD-3-Clause RE2_LICENSE_FILES = LICENSE From peter at korsgaard.com Thu Feb 10 21:34:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:34:32 +0100 Subject: [Buildroot] [git commit] package/audit: bump to version 3.0.7 Message-ID: <20220210213036.CD1E482DFF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=de2df3109aaf4bcd2424bea0711b699c11bfb2d4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/linux-audit/audit-userspace/releases/tag/v3.0.7 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/audit/audit.hash | 2 +- package/audit/audit.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/audit/audit.hash b/package/audit/audit.hash index 9e16a339d6..6260f158d8 100644 --- a/package/audit/audit.hash +++ b/package/audit/audit.hash @@ -1,4 +1,4 @@ #Locally computed -sha256 c3e44d77513a42401d417dd0ceb203cf23886cb89402dea7b9494faa3f4fcc5e audit-3.0.6.tar.gz +sha256 8b4c78632a9301a1c7f859b0e38fc0b9c260b8214d6b7c771bf28b3d73a62597 audit-3.0.7.tar.gz sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING sha256 f18a0811fa0e220ccbc42f661545e77f0388631e209585ed582a1c693029c6aa COPYING.LIB diff --git a/package/audit/audit.mk b/package/audit/audit.mk index c89404f570..aa8ef515e6 100644 --- a/package/audit/audit.mk +++ b/package/audit/audit.mk @@ -4,7 +4,7 @@ # ################################################################################ -AUDIT_VERSION = 3.0.6 +AUDIT_VERSION = 3.0.7 AUDIT_SITE = http://people.redhat.com/sgrubb/audit AUDIT_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) AUDIT_LICENSE_FILES = COPYING COPYING.LIB From peter at korsgaard.com Thu Feb 10 21:34:52 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:34:52 +0100 Subject: [Buildroot] [git commit] package/fping: bump to version 5.1 Message-ID: <20220210213036.D62A382E01@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cde834f4777be4a855755703a291452ed6a5b052 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/schweikert/fping/releases/tag/v5.1 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/fping/fping.hash | 2 +- package/fping/fping.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/fping/fping.hash b/package/fping/fping.hash index 0b2233f379..4671cd77cf 100644 --- a/package/fping/fping.hash +++ b/package/fping/fping.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 ed38c0b9b64686a05d1b3bc1d66066114a492e04e44eef1821d43b1263cd57b8 fping-5.0.tar.gz +sha256 1ee5268c063d76646af2b4426052e7d81a42b657e6a77d8e7d3d2e60fd7409fe fping-5.1.tar.gz # Hash for license file sha256 6051b27e4b4a648f7bc8b329024da53a6e95ce88fcf0ccc259c371a74b741757 COPYING diff --git a/package/fping/fping.mk b/package/fping/fping.mk index 0a03c1dfdc..5986d05b93 100644 --- a/package/fping/fping.mk +++ b/package/fping/fping.mk @@ -4,7 +4,7 @@ # ################################################################################ -FPING_VERSION = 5.0 +FPING_VERSION = 5.1 FPING_SITE = http://fping.org/dist FPING_LICENSE = BSD-like FPING_LICENSE_FILES = COPYING From peter at korsgaard.com Thu Feb 10 21:35:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:35:31 +0100 Subject: [Buildroot] [git commit] package/libmodbus: bump to version 3.1.7 Message-ID: <20220210213036.E95D782DE9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ac89223b747add3b1bc15fa45d876d545c50cdd3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/stephane/libmodbus/releases/tag/v3.1.7 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libmodbus/libmodbus.hash | 2 +- package/libmodbus/libmodbus.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libmodbus/libmodbus.hash b/package/libmodbus/libmodbus.hash index 2931f3f3d7..b676d261de 100644 --- a/package/libmodbus/libmodbus.hash +++ b/package/libmodbus/libmodbus.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d7d9fa94a16edb094e5fdf5d87ae17a0dc3f3e3d687fead81835d9572cf87c16 libmodbus-3.1.6.tar.gz +sha256 7dfe958431d0570b271e1a5b329b76a658e89c614cf119eb5aadb725c87f8fbd libmodbus-3.1.7.tar.gz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LESSER diff --git a/package/libmodbus/libmodbus.mk b/package/libmodbus/libmodbus.mk index 52eb318a99..46eb860392 100644 --- a/package/libmodbus/libmodbus.mk +++ b/package/libmodbus/libmodbus.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMODBUS_VERSION = 3.1.6 +LIBMODBUS_VERSION = 3.1.7 LIBMODBUS_SITE = http://libmodbus.org/releases LIBMODBUS_LICENSE = LGPL-2.1+ LIBMODBUS_LICENSE_FILES = COPYING.LESSER From peter at korsgaard.com Thu Feb 10 21:37:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:37:23 +0100 Subject: [Buildroot] [git commit] package/lzip: bump to version 1.23 Message-ID: <20220210213036.F2A0582DFF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4648090a89a2478a4b0fa8cc43a49bc94668622c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://lists.nongnu.org/archive/html/lzip-bug/2022-02/msg00000.html Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/lzip/lzip.hash | 4 ++-- package/lzip/lzip.mk | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/lzip/lzip.hash b/package/lzip/lzip.hash index 57e7eb43f4..5e285a5ad8 100644 --- a/package/lzip/lzip.hash +++ b/package/lzip/lzip.hash @@ -1,4 +1,4 @@ -# From https://lists.nongnu.org/archive/html/lzip-bug/2021-01/msg00008.html -sha256 c3342d42e67139c165b8b128d033b5c96893a13ac5f25933190315214e87a948 lzip-1.22.tar.gz +# From https://lists.nongnu.org/archive/html/lzip-bug/2022-02/msg00000.html +sha256 ea02b9e6fb25d0e1a1d3ef4fdeb6ab26b931f1ece66fa1cee2983c95215e930a lzip-1.23.tar.lz # Locally calculated sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef COPYING diff --git a/package/lzip/lzip.mk b/package/lzip/lzip.mk index cca6da07d0..e3cc86b956 100644 --- a/package/lzip/lzip.mk +++ b/package/lzip/lzip.mk @@ -4,7 +4,8 @@ # ################################################################################ -LZIP_VERSION = 1.22 +LZIP_VERSION = 1.23 +LZIP_SOURCE = lzip-$(LZIP_VERSION).tar.lz LZIP_SITE = http://download.savannah.gnu.org/releases/lzip LZIP_LICENSE = GPL-2.0+ LZIP_LICENSE_FILES = COPYING From peter at korsgaard.com Thu Feb 10 21:35:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:35:17 +0100 Subject: [Buildroot] [git commit] package/gauche: drop autoreconf Message-ID: <20220210213036.E068482DE9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5f703276e0713b746f2c937c4c4fc02ef6ad1d77 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 11cb72be570409be77d4bb49c17b4a2feef31be7 forgot to drop autoreconf Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/gauche/gauche.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/gauche/gauche.mk b/package/gauche/gauche.mk index 2520379369..fe0a613a9d 100644 --- a/package/gauche/gauche.mk +++ b/package/gauche/gauche.mk @@ -10,8 +10,6 @@ GAUCHE_SITE = http://downloads.sourceforge.net/project/gauche/Gauche GAUCHE_LICENSE = BSD-3-Clause, Boehm-gc, SRFI (srfi-11.scm), reload (reload.scm) GAUCHE_LICENSE_FILES = COPYING GAUCHE_DEPENDENCIES = host-gauche -# We're patching configure.ac -GAUCHE_AUTORECONF = YES HOST_GAUCHE_CONF_OPTS = --without-zlib GAUCHE_CONF_OPTS = --without-libatomic-ops From peter at korsgaard.com Thu Feb 10 21:48:41 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:48:41 +0100 Subject: [Buildroot] [PATCH v2 07/13] package/gst1-libav: bump version to 1.20.0 In-Reply-To: <20220210192905.4500-8-ps.report@gmx.net> (Peter Seiderer's message of "Thu, 10 Feb 2022 20:28:59 +0100") References: <20220210192905.4500-1-ps.report@gmx.net> <20220210192905.4500-8-ps.report@gmx.net> Message-ID: <87y22itmti.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > - update COPYING hash (license text update from LGPL-2.0+ to LGPL-2.1+, > see [1]) and adjust GST1_LIBAV_LICENSE accordingly > [1] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/d157b23fb0ce175b167611a4cb019599d9017042.patch > Signed-off-by: Peter Seiderer Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 10 21:48:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:48:46 +0100 Subject: [Buildroot] [PATCH v2 02/13] package/gst1-plugins-base: bump version to 1.20.0 In-Reply-To: <20220210192905.4500-3-ps.report@gmx.net> (Peter Seiderer's message of "Thu, 10 Feb 2022 20:28:54 +0100") References: <20220210192905.4500-1-ps.report@gmx.net> <20220210192905.4500-3-ps.report@gmx.net> Message-ID: <87tud6tmtd.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > - disable new qt5 (Qt5 QML examples) option (suboption of already disabled > tests/examples) > - update COPYING hash (license text update from LGPL-2.0+ to LGPL-2.1+, > see [1]) and adjust GST1_PLUGINS_BASE_LICENSE accordingly > [1] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/d157b23fb0ce175b167611a4cb019599d9017042.patch > Signed-off-by: Peter Seiderer Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 10 21:48:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:48:51 +0100 Subject: [Buildroot] [PATCH v2 01/13] package/gstreamer1: bump version to 1.20.0 In-Reply-To: <20220210192905.4500-2-ps.report@gmx.net> (Peter Seiderer's message of "Thu, 10 Feb 2022 20:28:53 +0100") References: <20220210192905.4500-1-ps.report@gmx.net> <20220210192905.4500-2-ps.report@gmx.net> Message-ID: <87pmnutmt8.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > - meson option gtk_doc removed ([1]) > - update COPYING hash (license text update from LGPL-2.0+ to LGPL-2.1+, > see [2]) and adjust GSTREAMER1_LICENSE accordingly > [1] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/f5ee12395832d4305bb8dbdf4751552d03430d6d.patch > [2] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/d157b23fb0ce175b167611a4cb019599d9017042.patch > Signed-off-by: Peter Seiderer Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 10 21:49:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:49:10 +0100 Subject: [Buildroot] [PATCH v2 04/13] package/gst1-plugins-bad: bump version to 1.20.0 In-Reply-To: <20220210192905.4500-5-ps.report@gmx.net> (Peter Seiderer's message of "Thu, 10 Feb 2022 20:28:56 +0100") References: <20220210192905.4500-1-ps.report@gmx.net> <20220210192905.4500-5-ps.report@gmx.net> Message-ID: <87leyitmsp.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > - removed 0001-neon-Allow-building-against-neon-0-32-x.patch > (from upstream [1]) > - add codecalpha option (VP8/VP9 alpha support) > - add qroverlay option (overlay data on top of video in the form of a QR code) > with json-glib and libqrencode dependencies (omit json-glib explicit > dependencies as they are the same as for gstreamer1, glib2 BR2_USE_WCHAR, > BR2_TOOLCHAIN_HAS_THREADS and BR2_USE_MMU), place instead to 'plugins without > external deps' section into 'plugins that need external deps' section as it > clearly has dependencies (prelimary to upstream commit [2]) > - add aes option (AES encryption/decryption plugin) > - disable new option asio (Steinberg Audio Streaming, windows only) > - disable new option gs (Google Cloud Storage, needs storage_client library) > - disable new option ldac (LDAC bluetooth audio codec, needs ldacBT-enc library) > - remove legacy option ofa (disabled) > - disable new option onnx (ONNX neural network, needs libonnxruntime library) > - disable new option isac (iSAC plugin, needs webrtc-audio-coding-1 library) > - removed libmms ('Microsoft Multi Media Server streaming protocol' option, > add Config.in.legacy entry > - enable new gpl option ('Allow build plugins that have (A)GPL-licensed > dependencies') in case gpl plugin enabled > [1] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/b83e85ab677c79b46f520abebd1ee031e3a139c0.patch > [2] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/5d70c168b356691073a0d22f7ce3ea7efb20641c.patch > Signed-off-by: Peter Seiderer > --- > Changes v1 -> v2: > - fix rebase/merge artefact in Config.in.legacy (Baruch Siach) Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 10 21:49:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:49:16 +0100 Subject: [Buildroot] [PATCH v2 11/13] package/gst-omx: bump version to 1.20.0 In-Reply-To: <20220210192905.4500-12-ps.report@gmx.net> (Peter Seiderer's message of "Thu, 10 Feb 2022 20:29:03 +0100") References: <20220210192905.4500-1-ps.report@gmx.net> <20220210192905.4500-12-ps.report@gmx.net> Message-ID: <87h796tmsj.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > Signed-off-by: Peter Seiderer Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 10 21:49:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:49:23 +0100 Subject: [Buildroot] [PATCH v2 09/13] package/gst1-rtsp-server: bump version to 1.20.0 In-Reply-To: <20220210192905.4500-10-ps.report@gmx.net> (Peter Seiderer's message of "Thu, 10 Feb 2022 20:29:01 +0100") References: <20220210192905.4500-1-ps.report@gmx.net> <20220210192905.4500-10-ps.report@gmx.net> Message-ID: <87czjutmsc.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > - removed 0001-gst-rtsp-server-meson.build-add-gst_dep.patch > (upstream accepted [1]) > - update COPYING/COPYING.LIB hash (license text update from LGPL-2.0+ to > LGPL-2.1+, see [2]) and adjust GST1_RTSP_SERVER_LICENSE accordingly > [1] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/e637aae629f5b95b748a6f23abecc2b502272822.patch > [2] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/cc5cdab0165e3bdf5f4f748b3ba2a3493d304e70.patch > Signed-off-by: Peter Seiderer Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 10 21:49:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:49:28 +0100 Subject: [Buildroot] [PATCH v2 03/13] package/gst1-plugins-good: bump version to 1.20.0 In-Reply-To: <20220210192905.4500-4-ps.report@gmx.net> (Peter Seiderer's message of "Thu, 10 Feb 2022 20:28:55 +0100") References: <20220210192905.4500-1-ps.report@gmx.net> <20220210192905.4500-4-ps.report@gmx.net> Message-ID: <878ruitms7.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > Signed-off-by: Peter Seiderer Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 10 21:50:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:50:17 +0100 Subject: [Buildroot] [PATCH v2 13/13] package/gst1-plugins-bayer2rgb-neon: fix plugin install In-Reply-To: <20220210192905.4500-14-ps.report@gmx.net> (Peter Seiderer's message of "Thu, 10 Feb 2022 20:29:05 +0100") References: <20220210192905.4500-1-ps.report@gmx.net> <20220210192905.4500-14-ps.report@gmx.net> Message-ID: <874k56tmqu.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > - fix plugin install path, add '-with-plugindir=/usr/lib/gstreamer-1.0', > otherwise the plugins are installed with duplicated build path > (as detected by step_check_build_dir) > - remove GST1_PLUGINS_BAYER2RGB_NEON_INSTALL_STAGING (no need to install > the plugin to staging) > Signed-off-by: Peter Seiderer Committed, thanks. You have this as the last patch of the series, but is it related to the 1.20 bump or is this a fix that should also be backported to the LTS branch? -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 10 21:50:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:50:21 +0100 Subject: [Buildroot] [PATCH v2 06/13] package/gst1-devtools: bump version to 1.20.0 In-Reply-To: <20220210192905.4500-7-ps.report@gmx.net> (Peter Seiderer's message of "Thu, 10 Feb 2022 20:28:58 +0100") References: <20220210192905.4500-1-ps.report@gmx.net> <20220210192905.4500-7-ps.report@gmx.net> Message-ID: <87zgmys86a.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > - use new option cairo ('Build GstValidateVideo') instead pure optional > dependency on packet cairo > Signed-off-by: Peter Seiderer Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 10 21:50:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:50:26 +0100 Subject: [Buildroot] [PATCH v2 05/13] package/gst1-plugins-ugly: bump version to 1.20.0 In-Reply-To: <20220210192905.4500-6-ps.report@gmx.net> (Peter Seiderer's message of "Thu, 10 Feb 2022 20:28:57 +0100") References: <20220210192905.4500-1-ps.report@gmx.net> <20220210192905.4500-6-ps.report@gmx.net> Message-ID: <87v8xms865.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > - enable new gpl option ('Allow build plugins that have GPL-licensed > dependencies') in case gpl plugin enabled > Signed-off-by: Peter Seiderer Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 10 21:50:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:50:30 +0100 Subject: [Buildroot] [PATCH v2 12/13] package/gst1-python: bump version to 1.20.0 In-Reply-To: <20220210192905.4500-13-ps.report@gmx.net> (Peter Seiderer's message of "Thu, 10 Feb 2022 20:29:04 +0100") References: <20220210192905.4500-1-ps.report@gmx.net> <20220210192905.4500-13-ps.report@gmx.net> Message-ID: <87r18as861.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > Signed-off-by: Peter Seiderer Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 10 21:50:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:50:34 +0100 Subject: [Buildroot] [PATCH v2 08/13] package/gst1-vaapi: bump version to 1.20.0 In-Reply-To: <20220210192905.4500-9-ps.report@gmx.net> (Peter Seiderer's message of "Thu, 10 Feb 2022 20:29:00 +0100") References: <20220210192905.4500-1-ps.report@gmx.net> <20220210192905.4500-9-ps.report@gmx.net> Message-ID: <87mtiys85x.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > Signed-off-by: Peter Seiderer Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 10 21:50:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:50:38 +0100 Subject: [Buildroot] [PATCH v2 10/13] package/gstreamer1-editing-services: bump version to 1.20.0 In-Reply-To: <20220210192905.4500-11-ps.report@gmx.net> (Peter Seiderer's message of "Thu, 10 Feb 2022 20:29:02 +0100") References: <20220210192905.4500-1-ps.report@gmx.net> <20220210192905.4500-11-ps.report@gmx.net> Message-ID: <87iltms85t.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > Signed-off-by: Peter Seiderer Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 10 21:44:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:44:23 +0100 Subject: [Buildroot] [git commit] package/gst1-plugins-good: bump version to 1.20.0 Message-ID: <20220210214419.DF0DC82E01@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=34317969278d7b6d923d4889fb4235f112b2b201 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash | 4 ++-- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash index e342bd133e..9ad1d7bf46 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.6.tar.xz.sha256sum -sha256 26723ac01fcb360ade1f41d168c7c322d8af4ceb7e55c8c12ed2690d06a76eed gst-plugins-good-1.18.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.20.0.tar.xz.sha256sum +sha256 2d119c15ab8c9e79f8cd3c6bf582ff7a050b28ccae52ab4865e1a1464991659c gst-plugins-good-1.20.0.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk index e0ca29c5fd..6298d578ed 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_GOOD_VERSION = 1.18.6 +GST1_PLUGINS_GOOD_VERSION = 1.20.0 GST1_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST1_PLUGINS_GOOD_VERSION).tar.xz GST1_PLUGINS_GOOD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-good GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING From peter at korsgaard.com Thu Feb 10 21:44:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:44:05 +0100 Subject: [Buildroot] [git commit] package/gst1-plugins-base: bump version to 1.20.0 Message-ID: <20220210214419.D47BC828EF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=801131157dcef2c97e947a1d3e8c9bfa7aa3d870 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - disable new qt5 (Qt5 QML examples) option (suboption of already disabled tests/examples) - update COPYING hash (license text update from LGPL-2.0+ to LGPL-2.1+, see [1]) and adjust GST1_PLUGINS_BASE_LICENSE accordingly [1] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/d157b23fb0ce175b167611a4cb019599d9017042.patch Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash | 6 +++--- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash index 081dc6f213..ffc3445cda 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.18.6.tar.xz.sha256sum -sha256 56a9ff2fe9e6603b9e658cf6897d412a173d2180829fe01e92568549c6bd0f5b gst-plugins-base-1.18.6.tar.xz -sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING +# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.20.0.tar.xz.sha256sum +sha256 4cb66fccf730b1037e6533862c2128990912a6db4e5bbd14e0ef914450eb4c7c gst-plugins-base-1.20.0.tar.xz +sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk index c99eeb6c59..68281738fa 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk @@ -4,12 +4,12 @@ # ################################################################################ -GST1_PLUGINS_BASE_VERSION = 1.18.6 +GST1_PLUGINS_BASE_VERSION = 1.20.0 GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz GST1_PLUGINS_BASE_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-base GST1_PLUGINS_BASE_INSTALL_STAGING = YES GST1_PLUGINS_BASE_LICENSE_FILES = COPYING -GST1_PLUGINS_BASE_LICENSE = LGPL-2.0+, LGPL-2.1+ +GST1_PLUGINS_BASE_LICENSE = LGPL-2.1+ GST1_PLUGINS_BASE_CONF_OPTS = \ -Dexamples=disabled \ @@ -17,6 +17,7 @@ GST1_PLUGINS_BASE_CONF_OPTS = \ -Dgobject-cast-checks=disabled \ -Dglib-asserts=disabled \ -Dglib-checks=disabled \ + -Dqt5=disabled \ -Ddoc=disabled # Options which require currently unpackaged libraries From peter at korsgaard.com Thu Feb 10 21:47:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:47:01 +0100 Subject: [Buildroot] [git commit] package/gst1-vaapi: bump version to 1.20.0 Message-ID: <20220210214420.1DA4882E01@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4ca3cee910a174412a30bc87aa1b9b7cf41c15f0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-vaapi/gst1-vaapi.hash | 4 ++-- package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash index 7e22774c11..b32d91e1e2 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.18.6.tar.xz.sha256sum -sha256 ab6270f1e5e4546fbe6f5ea246d86ca3d196282eb863d46e6cdcc96f867449e0 gstreamer-vaapi-1.18.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.20.0.tar.xz.sha256sum +sha256 f79a47346dfd5e585e063e77078e5fc498b06dee895bfcbf47d8863fcac9ea32 gstreamer-vaapi-1.20.0.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk index 6af851602f..19ee625703 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_VAAPI_VERSION = 1.18.6 +GST1_VAAPI_VERSION = 1.20.0 GST1_VAAPI_SITE = https://gstreamer.freedesktop.org/src/gstreamer-vaapi GST1_VAAPI_SOURCE = gstreamer-vaapi-$(GST1_VAAPI_VERSION).tar.xz GST1_VAAPI_LICENSE = LGPL-2.1+ From peter at korsgaard.com Thu Feb 10 21:47:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:47:24 +0100 Subject: [Buildroot] [git commit] package/gstreamer1-editing-services: bump version to 1.20.0 Message-ID: <20220210214420.32B83826C1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=94aad30ba9893c6addef13c643646d46972af3d7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- .../gstreamer1-editing-services/gstreamer1-editing-services.hash | 4 ++-- .../gstreamer1-editing-services/gstreamer1-editing-services.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash index e29dc112ce..9662e6b8fb 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash @@ -1,5 +1,5 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.18.6.tar.xz.sha256sum -sha256 fe10d14ef896aa21038317f6f81e1158ccc6caaed9b0d5a29ae5bdd63074582c gst-editing-services-1.18.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.20.0.tar.xz.sha256sum +sha256 f837adcf4073d19a5908984e879cd039f4192ca368e71d39e8ccd8a56b9feedf gst-editing-services-1.20.0.tar.xz # Hashes for license files: sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk index a3722cbbca..5e03c08ae7 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_EDITING_SERVICES_VERSION = 1.18.6 +GSTREAMER1_EDITING_SERVICES_VERSION = 1.20.0 GSTREAMER1_EDITING_SERVICES_SOURCE = gst-editing-services-$(GSTREAMER1_EDITING_SERVICES_VERSION).tar.xz GSTREAMER1_EDITING_SERVICES_SITE = https://gstreamer.freedesktop.org/src/gstreamer-editing-services GSTREAMER1_EDITING_SERVICES_LICENSE = LGPL-2.0+ From peter at korsgaard.com Thu Feb 10 21:46:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:46:00 +0100 Subject: [Buildroot] [git commit] package/gst1-plugins-ugly: bump version to 1.20.0 Message-ID: <20220210214420.01780828EF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=40d94d268e2d658304e848f66d9264795ae8f637 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - enable new gpl option ('Allow build plugins that have GPL-licensed dependencies') in case gpl plugin enabled Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash | 4 ++-- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash index 26fd0fd9ac..d16134f24b 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.18.6.tar.xz.sha256sum -sha256 4969c409cb6a88317d2108b8577108e18623b2333d7b587ae3f39459c70e3a7f gst-plugins-ugly-1.18.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.20.0.tar.xz.sha256sum +sha256 4e8dcb5d26552f0a4937f6bc6279bd9070f55ca6ae0eaa32d72d264c44001c2e gst-plugins-ugly-1.20.0.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk index 7f483deb81..05b1fab304 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_UGLY_VERSION = 1.18.6 +GST1_PLUGINS_UGLY_VERSION = 1.20.0 GST1_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST1_PLUGINS_UGLY_VERSION).tar.xz GST1_PLUGINS_UGLY_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-ugly GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING @@ -89,6 +89,7 @@ endif # Add GPL license if GPL plugins enabled. ifeq ($(GST1_PLUGINS_UGLY_HAS_GPL_LICENSE),y) +GST1_PLUGINS_UGLY_CONF_OPTS += -Dgpl=enabled GST1_PLUGINS_UGLY_LICENSE += , GPL-2.0 endif From peter at korsgaard.com Thu Feb 10 21:46:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:46:44 +0100 Subject: [Buildroot] [git commit] package/gst1-libav: bump version to 1.20.0 Message-ID: <20220210214420.148C3828EF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1509fbe0689f37d002ec91a02068a942085b978b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - update COPYING hash (license text update from LGPL-2.0+ to LGPL-2.1+, see [1]) and adjust GST1_LIBAV_LICENSE accordingly [1] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/d157b23fb0ce175b167611a4cb019599d9017042.patch Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-libav/gst1-libav.hash | 6 +++--- package/gstreamer1/gst1-libav/gst1-libav.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/gstreamer1/gst1-libav/gst1-libav.hash b/package/gstreamer1/gst1-libav/gst1-libav.hash index 5fb39a0b3e..3204de3c14 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.hash +++ b/package/gstreamer1/gst1-libav/gst1-libav.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.18.6.tar.xz.sha256sum -sha256 e4e50dcd5a29441ae34de60d2221057e8064ed824bb6ca4dc0fd9ee88fbe9b81 gst-libav-1.18.6.tar.xz -sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING +# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.20.0.tar.xz.sha256sum +sha256 5eee5ed8d5082a31b500448e41535c722ee30cd5f8224f32982bbaba2eedef17 gst-libav-1.20.0.tar.xz +sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gst1-libav/gst1-libav.mk b/package/gstreamer1/gst1-libav/gst1-libav.mk index 55c6e06e0e..f07e5061b4 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.mk +++ b/package/gstreamer1/gst1-libav/gst1-libav.mk @@ -4,10 +4,10 @@ # ################################################################################ -GST1_LIBAV_VERSION = 1.18.6 +GST1_LIBAV_VERSION = 1.20.0 GST1_LIBAV_SOURCE = gst-libav-$(GST1_LIBAV_VERSION).tar.xz GST1_LIBAV_SITE = https://gstreamer.freedesktop.org/src/gst-libav -GST1_LIBAV_LICENSE = LGPL-2.0+ +GST1_LIBAV_LICENSE = LGPL-2.1+ GST1_LIBAV_LICENSE_FILES = COPYING GST1_LIBAV_DEPENDENCIES = host-pkgconf ffmpeg gstreamer1 gst1-plugins-base GST1_LIBAV_CONF_OPTS = -Ddoc=disabled From peter at korsgaard.com Thu Feb 10 21:47:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:47:46 +0100 Subject: [Buildroot] [git commit] package/gst1-python: bump version to 1.20.0 Message-ID: <20220210214420.4545C826C1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=68f93d3a8a6400190e6dc6bba691317062bf18b7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-python/gst1-python.hash | 4 ++-- package/gstreamer1/gst1-python/gst1-python.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-python/gst1-python.hash b/package/gstreamer1/gst1-python/gst1-python.hash index a760e53e7d..a2f17583fd 100644 --- a/package/gstreamer1/gst1-python/gst1-python.hash +++ b/package/gstreamer1/gst1-python/gst1-python.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.18.6.tar.xz.sha256sum -sha256 bdc0ea22fbd7335ad9decc151561aacc53c51206a9735b81eac700ce5b0bbd4a gst-python-1.18.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.20.0.tar.xz.sha256sum +sha256 8f67bdc5606ba33606c6bc896e89de7dcd8cf4fca459f71389b1b6fe075b5e54 gst-python-1.20.0.tar.xz sha256 ea3ad127610e5ded2210b3a86a46314f2b3b28e438eccffdae19a4d6fbcdb0c2 COPYING diff --git a/package/gstreamer1/gst1-python/gst1-python.mk b/package/gstreamer1/gst1-python/gst1-python.mk index 7faab752cd..a9cc32d1d7 100644 --- a/package/gstreamer1/gst1-python/gst1-python.mk +++ b/package/gstreamer1/gst1-python/gst1-python.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PYTHON_VERSION = 1.18.6 +GST1_PYTHON_VERSION = 1.20.0 GST1_PYTHON_SOURCE = gst-python-$(GST1_PYTHON_VERSION).tar.xz GST1_PYTHON_SITE = https://gstreamer.freedesktop.org/src/gst-python GST1_PYTHON_INSTALL_STAGING = YES From peter at korsgaard.com Thu Feb 10 21:47:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:47:35 +0100 Subject: [Buildroot] [git commit] package/gst-omx: bump version to 1.20.0 Message-ID: <20220210214420.3C025828EF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=19278dc72f887377980d3f704fecf1858766fbb5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst-omx/gst-omx.hash | 4 ++-- package/gstreamer1/gst-omx/gst-omx.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst-omx/gst-omx.hash b/package/gstreamer1/gst-omx/gst-omx.hash index 47f7cb5893..0b95505c5f 100644 --- a/package/gstreamer1/gst-omx/gst-omx.hash +++ b/package/gstreamer1/gst-omx/gst-omx.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.18.6.tar.xz.sha256sum -sha256 b5281c938e959fd2418e989cfb6065fdd9fe5f6f87ee86236c9427166e708163 gst-omx-1.18.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.20.0.tar.xz.sha256sum +sha256 c1e46b70ac379ac7b3646506370c9e1007b56ae293f4d334bc0e724c76c345dd gst-omx-1.20.0.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst-omx/gst-omx.mk b/package/gstreamer1/gst-omx/gst-omx.mk index dc65509244..f71e1242ff 100644 --- a/package/gstreamer1/gst-omx/gst-omx.mk +++ b/package/gstreamer1/gst-omx/gst-omx.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST_OMX_VERSION = 1.18.6 +GST_OMX_VERSION = 1.20.0 GST_OMX_SOURCE = gst-omx-$(GST_OMX_VERSION).tar.xz GST_OMX_SITE = https://gstreamer.freedesktop.org/src/gst-omx From peter at korsgaard.com Thu Feb 10 21:46:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:46:16 +0100 Subject: [Buildroot] [git commit] package/gst1-devtools: bump version to 1.20.0 Message-ID: <20220210214420.0B490826C1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b286cd169c57eb456ff8c540cafe8b314768aa72 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - use new option cairo ('Build GstValidateVideo') instead pure optional dependency on packet cairo Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-devtools/gst1-devtools.hash | 4 ++-- package/gstreamer1/gst1-devtools/gst1-devtools.mk | 13 ++++++++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.hash b/package/gstreamer1/gst1-devtools/gst1-devtools.hash index 011385e757..dd09280a9c 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.hash +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.18.6.tar.xz.sha256sum -sha256 3725622c740a635452e54b79d065f963ab7706ca2403de6c43072ae7610a0de4 gst-devtools-1.18.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.20.0.tar.xz.sha256sum +sha256 69fc8756ec9d93e5c5258c99088434f203e91fdbc5af28d1f2c583fd819b7a1d gst-devtools-1.20.0.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 validate/COPYING diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.mk b/package/gstreamer1/gst1-devtools/gst1-devtools.mk index 9089b12188..f72df9cf71 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.mk +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_DEVTOOLS_VERSION = 1.18.6 +GST1_DEVTOOLS_VERSION = 1.20.0 GST1_DEVTOOLS_SOURCE = gst-devtools-$(GST1_DEVTOOLS_VERSION).tar.xz GST1_DEVTOOLS_SITE = https://gstreamer.freedesktop.org/src/gst-devtools GST1_DEVTOOLS_LICENSE = LGPL-2.1+ @@ -16,8 +16,7 @@ GST1_DEVTOOLS_DEPENDENCIES = \ python3 \ gstreamer1 \ gst1-plugins-base \ - json-glib \ - $(if $(BR2_PACKAGE_CAIRO),cairo) + json-glib ifeq ($(BR2_PACKAGE_GST1_RTSP_SERVER),y) GST1_DEVTOOLS_DEPENDENCIES += gst1-rtsp-server @@ -30,4 +29,12 @@ GST1_DEVTOOLS_CONF_OPTS = \ -Dtests=disabled \ -Ddoc=disabled +# build GstValidateVideo +ifeq ($(BR2_PACKAGE_CAIRO),y) +GST1_DEVTOOLS_CONF_OPTS += -Dcairo=enabled +GST1_DEVTOOLS_DEPENDENCIES += cairo +else +GST1_DEVTOOLS_CONF_OPTS += -Dcairo=disabled +endif + $(eval $(meson-package)) From peter at korsgaard.com Thu Feb 10 21:44:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:44:35 +0100 Subject: [Buildroot] [git commit] package/gst1-plugins-bad: bump version to 1.20.0 Message-ID: <20220210214419.EC0F2826C1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3aa07290678aba1159341ab463d9a8936a896492 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - removed 0001-neon-Allow-building-against-neon-0-32-x.patch (from upstream [1]) - add codecalpha option (VP8/VP9 alpha support) - add qroverlay option (overlay data on top of video in the form of a QR code) with json-glib and libqrencode dependencies (omit json-glib explicit dependencies as they are the same as for gstreamer1, glib2 BR2_USE_WCHAR, BR2_TOOLCHAIN_HAS_THREADS and BR2_USE_MMU), place instead to 'plugins without external deps' section into 'plugins that need external deps' section as it clearly has dependencies (prelimary to upstream commit [2]) - add aes option (AES encryption/decryption plugin) - disable new option asio (Steinberg Audio Streaming, windows only) - disable new option gs (Google Cloud Storage, needs storage_client library) - disable new option ldac (LDAC bluetooth audio codec, needs ldacBT-enc library) - remove legacy option ofa (disabled) - disable new option onnx (ONNX neural network, needs libonnxruntime library) - disable new option isac (iSAC plugin, needs webrtc-audio-coding-1 library) - removed libmms ('Microsoft Multi Media Server streaming protocol' option, add Config.in.legacy entry - enable new gpl option ('Allow build plugins that have (A)GPL-licensed dependencies') in case gpl plugin enabled [1] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/b83e85ab677c79b46f520abebd1ee031e3a139c0.patch [2] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/5d70c168b356691073a0d22f7ce3ea7efb20641c.patch Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- Config.in.legacy | 8 +++++ ...1-neon-Allow-building-against-neon-0-32-x.patch | 29 ----------------- package/gstreamer1/gst1-plugins-bad/Config.in | 31 ++++++++++++------- .../gst1-plugins-bad/gst1-plugins-bad.hash | 4 +-- .../gst1-plugins-bad/gst1-plugins-bad.mk | 36 ++++++++++++++++------ 5 files changed, 57 insertions(+), 51 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 49c24e61bf..2b1fd48de5 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,14 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBMMS + bool "gst1-plugins-bad plugin libmms was removed" + depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_LEGACY + help + This plugin was removed with gst1-plugins-bad-1.20.0. + config BR2_PACKAGE_PYTHON_FUNCTOOLS32 bool "python-functools32 removed" select BR2_LEGACY 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 deleted file mode 100644 index e995a8cb91..0000000000 --- a/package/gstreamer1/gst1-plugins-bad/0001-neon-Allow-building-against-neon-0-32-x.patch +++ /dev/null @@ -1,29 +0,0 @@ -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 - diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in index b793cb8eb1..234d57636b 100644 --- a/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/package/gstreamer1/gst1-plugins-bad/Config.in @@ -76,6 +76,12 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CAMERABIN2 help Take image snapshots and record movies from camera +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CODECALPHA + bool "codecalpha" + help + Elements for VP8/VP9 alpha support (codecalphademux, + alphacombine, vp8alphadecodebin, vp9alphadecodebin) + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_COLOREFFECTS bool "coloreffects" help @@ -324,6 +330,12 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_Y4M comment "plugins with external dependencies" +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AES + bool "aes" + select BR2_PACKAGE_OPENSSL + help + "AES encryption/decryption plugin" + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASSRENDER bool "assrender" depends on BR2_INSTALL_LIBSTDCPP # libass -> harfbuzz @@ -458,17 +470,6 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_KMS help KMS video sink -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBMMS - bool "libmms" - depends on BR2_USE_WCHAR # libmms -> libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libmms -> libglib2 - select BR2_PACKAGE_LIBMMS - help - Microsoft Multi Media Server streaming protocol support - -comment "libmms needs a toolchain w/ wchar, threads" - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS - config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DTLS bool "dtls" select BR2_PACKAGE_OPENSSL @@ -558,6 +559,14 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPUS help OPUS plugin library +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_QROVERLAY + bool "qroverlay" + select BR2_PACKAGE_JSON_GLIB + select BR2_PACKAGE_LIBQRENCODE + help + Elements qroverlay, debugqroverlay (overlay data on top of + video in the form of a QR code) + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RSVG bool "rsvg" depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # librsvg diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash index d31a78981e..72c9624b94 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.6.tar.xz.sha256sum -sha256 0b1b50ac6311f0c510248b6cd64d6d3c94369344828baa602db85ded5bc70ec9 gst-plugins-bad-1.18.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.20.0.tar.xz.sha256sum +sha256 015b8d4d9a395ebf444d40876867a2034dd3304b3ad48bc3a0dd0c1ee71dc11d gst-plugins-bad-1.20.0.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index d02ca1ba74..24fd9dd312 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BAD_VERSION = 1.18.6 +GST1_PLUGINS_BAD_VERSION = 1.20.0 GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz GST1_PLUGINS_BAD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-bad GST1_PLUGINS_BAD_INSTALL_STAGING = YES @@ -34,6 +34,7 @@ GST1_PLUGINS_BAD_CONF_OPTS = \ # Options which require currently unpackaged libraries GST1_PLUGINS_BAD_CONF_OPTS += \ + -Dasio=disabled \ -Davtp=disabled \ -Dopensles=disabled \ -Dmsdk=disabled \ @@ -46,16 +47,18 @@ GST1_PLUGINS_BAD_CONF_OPTS += \ -Dresindvd=disabled \ -Dfaac=disabled \ -Dflite=disabled \ + -Dgs=disabled \ -Dgsm=disabled \ -Dkate=disabled \ -Dladspa=disabled \ + -Dldac=disabled \ -Dlv2=disabled \ -Dmediafoundation=disabled \ -Dmicrodns=disabled \ -Dlibde265=disabled \ -Dmodplug=disabled \ -Dmplex=disabled \ - -Dofa=disabled \ + -Donnx=disabled \ -Dopenexr=disabled \ -Dopenni2=disabled \ -Dteletext=disabled \ @@ -69,6 +72,7 @@ GST1_PLUGINS_BAD_CONF_OPTS += \ -Dwasapi2=disabled \ -Dzxing=disabled \ -Dmagicleap=disabled \ + -Disac=disabled \ -Diqa=disabled \ -Dopencv=disabled @@ -180,6 +184,12 @@ else GST1_PLUGINS_BAD_CONF_OPTS += -Dcamerabin2=disabled endif +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CODECALPHA),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Dcodecalpha=enabled +else +GST1_PLUGINS_BAD_CONF_OPTS += -Dcodecalpha=disabled +endif + ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_COLOREFFECTS),y) GST1_PLUGINS_BAD_CONF_OPTS += -Dcoloreffects=enabled else @@ -497,6 +507,13 @@ endif # Plugins with dependencies +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AES),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Daes=enabled +GST1_PLUGINS_BAD_DEPENDENCIES += openssl +else +GST1_PLUGINS_BAD_CONF_OPTS += -Daes=disabled +endif + ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASSRENDER),y) GST1_PLUGINS_BAD_CONF_OPTS += -Dassrender=enabled GST1_PLUGINS_BAD_DEPENDENCIES += libass @@ -604,13 +621,6 @@ else GST1_PLUGINS_BAD_CONF_OPTS += -Dkms=disabled endif -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBMMS),y) -GST1_PLUGINS_BAD_CONF_OPTS += -Dlibmms=enabled -GST1_PLUGINS_BAD_DEPENDENCIES += libmms -else -GST1_PLUGINS_BAD_CONF_OPTS += -Dlibmms=disabled -endif - ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DTLS),y) GST1_PLUGINS_BAD_CONF_OPTS += -Ddtls=enabled GST1_PLUGINS_BAD_DEPENDENCIES += openssl @@ -677,6 +687,13 @@ else GST1_PLUGINS_BAD_CONF_OPTS += -Dopus=disabled endif +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_QROVERLAY),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Dqroverlay=enabled +GST1_PLUGINS_BAD_DEPENDENCIES += json-glib libqrencode +else +GST1_PLUGINS_BAD_CONF_OPTS += -Dqroverlay=disabled +endif + ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RSVG),y) GST1_PLUGINS_BAD_CONF_OPTS += -Drsvg=enabled GST1_PLUGINS_BAD_DEPENDENCIES += librsvg @@ -787,6 +804,7 @@ endif # Add GPL license if GPL licensed plugins enabled. ifeq ($(GST1_PLUGINS_BAD_HAS_GPL_LICENSE),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Dgpl=enabled GST1_PLUGINS_BAD_LICENSE += , GPL-2.0+ GST1_PLUGINS_BAD_LICENSE_FILES += COPYING endif From peter at korsgaard.com Thu Feb 10 21:47:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:47:10 +0100 Subject: [Buildroot] [git commit] package/gst1-rtsp-server: bump version to 1.20.0 Message-ID: <20220210214420.29001826C1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f68a5faf201ea176361055517ff655b6e59c9c3b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - removed 0001-gst-rtsp-server-meson.build-add-gst_dep.patch (upstream accepted [1]) - update COPYING/COPYING.LIB hash (license text update from LGPL-2.0+ to LGPL-2.1+, see [2]) and adjust GST1_RTSP_SERVER_LICENSE accordingly [1] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/e637aae629f5b95b748a6f23abecc2b502272822.patch [2] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/cc5cdab0165e3bdf5f4f748b3ba2a3493d304e70.patch Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- ...1-gst-rtsp-server-meson.build-add-gst_dep.patch | 41 ---------------------- .../gst1-rtsp-server/gst1-rtsp-server.hash | 8 ++--- .../gst1-rtsp-server/gst1-rtsp-server.mk | 4 +-- 3 files changed, 6 insertions(+), 47 deletions(-) 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 deleted file mode 100644 index b63f634598..0000000000 --- a/package/gstreamer1/gst1-rtsp-server/0001-gst-rtsp-server-meson.build-add-gst_dep.patch +++ /dev/null @@ -1,41 +0,0 @@ -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 - diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash index fadef41351..00ff974c6e 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash @@ -1,4 +1,4 @@ -# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.18.6.tar.xz.sha256sum -sha256 826f32afbcf94b823541efcac4a0dacdb62f6145ef58f363095749f440262be9 gst-rtsp-server-1.18.6.tar.xz -sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING -sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING.LIB +# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.20.0.tar.xz.sha256sum +sha256 c209f5ed906da713fdd44a8844e909aa6c8af3dfb630259b092cfb77a7755843 gst-rtsp-server-1.20.0.tar.xz +sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING +sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING.LIB diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk index 55403754f3..d22dd5e7cc 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk @@ -4,10 +4,10 @@ # ################################################################################ -GST1_RTSP_SERVER_VERSION = 1.18.6 +GST1_RTSP_SERVER_VERSION = 1.20.0 GST1_RTSP_SERVER_SOURCE = gst-rtsp-server-$(GST1_RTSP_SERVER_VERSION).tar.xz GST1_RTSP_SERVER_SITE = http://gstreamer.freedesktop.org/src/gst-rtsp-server -GST1_RTSP_SERVER_LICENSE = LGPL-2.0+ +GST1_RTSP_SERVER_LICENSE = LGPL-2.1+ GST1_RTSP_SERVER_LICENSE_FILES = COPYING COPYING.LIB GST1_RTSP_SERVER_CPE_ID_VENDOR = gstreamer_project GST1_RTSP_SERVER_CPE_ID_PRODUCT = gst-rtsp-server From peter at korsgaard.com Thu Feb 10 21:42:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:42:21 +0100 Subject: [Buildroot] [git commit] package/gstreamer1: bump version to 1.20.0 Message-ID: <20220210214419.CA1A0826C1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c88a382c55840a71b7b56c8fffdfb2b64eb701d2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - meson option gtk_doc removed ([1]) - update COPYING hash (license text update from LGPL-2.0+ to LGPL-2.1+, see [2]) and adjust GSTREAMER1_LICENSE accordingly [1] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/f5ee12395832d4305bb8dbdf4751552d03430d6d.patch [2] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/d157b23fb0ce175b167611a4cb019599d9017042.patch Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/gstreamer1/gstreamer1/gstreamer1.hash | 6 +++--- package/gstreamer1/gstreamer1/gstreamer1.mk | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/gstreamer1/gstreamer1/gstreamer1.hash b/package/gstreamer1/gstreamer1/gstreamer1.hash index 1202bf2c50..f4a74a6125 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.hash +++ b/package/gstreamer1/gstreamer1/gstreamer1.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.18.6.tar.xz.sha256sum -sha256 4ec816010dd4d3a93cf470ad0a6f25315f52b204eb1d71dfa70ab8a1c3bd06e6 gstreamer-1.18.6.tar.xz -sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING +# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.20.0.tar.xz.sha256sum +sha256 edf4bffff85591d4fff7b21bb9ed7f0feabc123ac4a4eff29e73cbce454f9db7 gstreamer-1.20.0.tar.xz +sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk index 27745f3bf9..86df5d6cf6 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -4,12 +4,12 @@ # ################################################################################ -GSTREAMER1_VERSION = 1.18.6 +GSTREAMER1_VERSION = 1.20.0 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer GSTREAMER1_INSTALL_STAGING = YES GSTREAMER1_LICENSE_FILES = COPYING -GSTREAMER1_LICENSE = LGPL-2.0+, LGPL-2.1+ +GSTREAMER1_LICENSE = LGPL-2.1+ GSTREAMER1_CPE_ID_VENDOR = gstreamer_project GSTREAMER1_CPE_ID_PRODUCT = gstreamer @@ -18,7 +18,6 @@ GSTREAMER1_CONF_OPTS = \ -Dtests=disabled \ -Dbenchmarks=disabled \ -Dtools=$(if $(BR2_PACKAGE_GSTREAMER1_INSTALL_TOOLS),enabled,disabled) \ - -Dgtk_doc=disabled \ -Dgobject-cast-checks=disabled \ -Dglib-asserts=disabled \ -Dglib-checks=disabled \ From peter at korsgaard.com Thu Feb 10 21:47:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:47:54 +0100 Subject: [Buildroot] [git commit] package/gst1-plugins-bayer2rgb-neon: fix plugin install Message-ID: <20220210214420.4F108828EF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2db52eed25f20bf0b56a6fa146f384c9139d8f83 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - fix plugin install path, add '-with-plugindir=/usr/lib/gstreamer-1.0', otherwise the plugins are installed with duplicated build path (as detected by step_check_build_dir) - remove GST1_PLUGINS_BAYER2RGB_NEON_INSTALL_STAGING (no need to install the plugin to staging) Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- .../gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.mk b/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.mk index 815099e315..0d4aeac7f5 100644 --- a/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.mk +++ b/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.mk @@ -10,8 +10,6 @@ GST1_PLUGINS_BAYER2RGB_NEON_SITE_METHOD = git GST1_PLUGINS_BAYER2RGB_NEON_LICENSE = GPL-3.0 GST1_PLUGINS_BAYER2RGB_NEON_LICENSE_FILES = COPYING -GST1_PLUGINS_BAYER2RGB_NEON_INSTALL_STAGING = YES - GST1_PLUGINS_BAYER2RGB_NEON_DEPENDENCIES = \ host-pkgconf \ gstreamer1 \ @@ -20,4 +18,6 @@ GST1_PLUGINS_BAYER2RGB_NEON_DEPENDENCIES = \ GST1_PLUGINS_BAYER2RGB_NEON_AUTORECONF = YES +GST1_PLUGINS_BAYER2RGB_NEON_CONF_OPTS = --with-plugindir=/usr/lib/gstreamer-1.0 + $(eval $(autotools-package)) From peter at korsgaard.com Thu Feb 10 21:55:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 22:55:46 +0100 Subject: [Buildroot] [PATCH 000/107] Drop python 2.7 In-Reply-To: <9be8fa8f-44d8-6025-3161-dd1818d9c323@othermo.de> (Marcus Hoffmann's message of "Thu, 10 Feb 2022 18:31:38 +0100") References: <20220209165213.4498-1-peter@korsgaard.com> <20220209213312.GE2249818@scaer> <2cba2cd6-ca70-6336-f2fe-60649a0f1a0d@mind.be> <9be8fa8f-44d8-6025-3161-dd1818d9c323@othermo.de> Message-ID: <87bkzes7x9.fsf@dell.be.48ers.dk> >>>>> "Marcus" == Marcus Hoffmann writes: > Hi all! > On 10.02.22 18:15, Arnout Vandecappelle wrote: > [...] >> >> >> The ones in gst1-devtools.mk and omniorb.mk look important, the rest >> is just cleanup. qt5webengine is also a bit worrisome... >> >> Also, some cleanups that I think are needed: >> - get rid of HOST_PYTHON_FOO_NEEDS_HOST_PYTHON >> - symlink $(HOST_DIR)/bin/python to python3, and get rid of the >> workarounds in e.g. nodejs > This last bit would actually supersede the patch I send yesterday :-) > http://patchwork.ozlabs.org/project/buildroot/patch/20220209214305.314272-1-marcus.hoffmann at othermo.de/ Yes, I've sent a patch doing that and marked your patch as superseeded: https://patchwork.ozlabs.org/project/buildroot/patch/20220210212429.31856-1-peter at korsgaard.com/ -- Bye, Peter Korsgaard From james.hilliard1 at gmail.com Thu Feb 10 21:59:09 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 10 Feb 2022 14:59:09 -0700 Subject: [Buildroot] [PATCH 000/107] Drop python 2.7 In-Reply-To: <87czjuwhcb.fsf@dell.be.48ers.dk> References: <20220209165213.4498-1-peter@korsgaard.com> <20220209213312.GE2249818@scaer> <2cba2cd6-ca70-6336-f2fe-60649a0f1a0d@mind.be> <20220210203719.GA3752867@scaer> <87czjuwhcb.fsf@dell.be.48ers.dk> Message-ID: On Thu, Feb 10, 2022 at 2:19 PM Peter Korsgaard wrote: > > >>>>> "Yann" == Yann E MORIN writes: > > Hi, > > > Arnout, All, > > On 2022-02-10 18:15 +0100, Arnout Vandecappelle spake thusly: > >> On 09/02/2022 22:33, Yann E. MORIN wrote: > >> >On 2022-02-09 17:50 +0100, Peter Korsgaard spake thusly: > >> >>Python 2.7 is EOL since April 2020 and almost all packages support > >> >>python 3, so drop it before the 2022.02 release. > > [--SNIP--] > >> I did a bit of grepping for leftovers and found these: > > [--SNIP--] > > > Yeah, I knew we had missed a few things, and Peter had already noticed a > > few in the cover-letter, but we needed to move forward quick, at the > > risk of breaking things. > > > After all, the post-rc1 period is actually to fix things we broke! ;-) > > Indeed ;) > > >> The ones in gst1-devtools.mk and omniorb.mk look important, the rest is just > >> cleanup. qt5webengine is also a bit worrisome... > > > For qt5webengine, IIRC James and Adam were working on it, and may have a > > pending change ready? > > > I was thinking maybe about this: > > https://patchwork.ozlabs.org/project/buildroot/list/?series=284619 > > Yes, I guess we'll need something like that. I did a quick test to see > if the current qt5webengine version works with python3 - But it doesn't Yeah, that should get qt5webengine working on python3, there's a bunch of other issues it should fix as well relating to handling the host/target pkg-config split. > :/ > > -- > Bye, Peter Korsgaard > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From ps.report at gmx.net Thu Feb 10 22:18:13 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 10 Feb 2022 23:18:13 +0100 Subject: [Buildroot] [PATCH v2 13/13] package/gst1-plugins-bayer2rgb-neon: fix plugin install In-Reply-To: <874k56tmqu.fsf@dell.be.48ers.dk> References: <20220210192905.4500-1-ps.report@gmx.net> <20220210192905.4500-14-ps.report@gmx.net> <874k56tmqu.fsf@dell.be.48ers.dk> Message-ID: <20220210231813.236e2aae@gmx.net> Hello Peter, On Thu, 10 Feb 2022 22:50:17 +0100, Peter Korsgaard wrote: > >>>>> "Peter" == Peter Seiderer writes: > > > - fix plugin install path, add '-with-plugindir=/usr/lib/gstreamer-1.0', > > otherwise the plugins are installed with duplicated build path > > (as detected by step_check_build_dir) > > > - remove GST1_PLUGINS_BAYER2RGB_NEON_INSTALL_STAGING (no need to install > > the plugin to staging) > > > Signed-off-by: Peter Seiderer > > Committed, thanks. > > You have this as the last patch of the series, but is it related to the > 1.20 bump or is this a fix that should also be backported to the LTS > branch? > Observed the failure only after the 1.20.0 version bump..., but did not find any explanation why the failure should depend (or not depend) on the version bump...., but I think the patch should do no harm for the 1.18.x version..., so should be save for the LTS branch (specially the drop of install staging)... Regards, Peter From peter at korsgaard.com Thu Feb 10 22:31:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 23:31:27 +0100 Subject: [Buildroot] [PATCH] package/python3-pycparser: drop unused host package Message-ID: <20220210223128.11002-1-peter@korsgaard.com> Commit d9bf97cf16fa6945466a67 (package/python-cryptography: drop host variant) dropped the dependency on host-python3-pycparser, so it is now unused. Drop it. Signed-off-by: Peter Korsgaard --- package/python-pycparser/python-pycparser.mk | 1 - .../python3-pycparser/python3-pycparser.hash | 1 - package/python3-pycparser/python3-pycparser.mk | 17 ----------------- 3 files changed, 19 deletions(-) delete mode 120000 package/python3-pycparser/python3-pycparser.hash delete mode 100644 package/python3-pycparser/python3-pycparser.mk diff --git a/package/python-pycparser/python-pycparser.mk b/package/python-pycparser/python-pycparser.mk index 20c3f641a9..1737c99a32 100644 --- a/package/python-pycparser/python-pycparser.mk +++ b/package/python-pycparser/python-pycparser.mk @@ -4,7 +4,6 @@ # ################################################################################ -# Please keep in sync with package/python3-pycparser/python3-pycparser.mk PYTHON_PYCPARSER_VERSION = 2.21 PYTHON_PYCPARSER_SOURCE = pycparser-$(PYTHON_PYCPARSER_VERSION).tar.gz PYTHON_PYCPARSER_SITE = https://files.pythonhosted.org/packages/5e/0b/95d387f5f4433cb0f53ff7ad859bd2c6051051cebbb564f139a999ab46de diff --git a/package/python3-pycparser/python3-pycparser.hash b/package/python3-pycparser/python3-pycparser.hash deleted file mode 120000 index 7a1912cad2..0000000000 --- a/package/python3-pycparser/python3-pycparser.hash +++ /dev/null @@ -1 +0,0 @@ -../python-pycparser/python-pycparser.hash \ No newline at end of file diff --git a/package/python3-pycparser/python3-pycparser.mk b/package/python3-pycparser/python3-pycparser.mk deleted file mode 100644 index 4075f4a38f..0000000000 --- a/package/python3-pycparser/python3-pycparser.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# python3-pycparser -# -################################################################################ - -# Please keep in sync with package/python-pycparser/python-pycparser.mk -PYTHON3_PYCPARSER_VERSION = 2.21 -PYTHON3_PYCPARSER_SOURCE = pycparser-$(PYTHON3_PYCPARSER_VERSION).tar.gz -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 -HOST_PYTHON3_PYCPARSER_DL_SUBDIR = python-pycparser -HOST_PYTHON3_PYCPARSER_NEEDS_HOST_PYTHON = python3 - -$(eval $(host-python-package)) -- 2.20.1 From peter at korsgaard.com Thu Feb 10 22:40:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 23:40:43 +0100 Subject: [Buildroot] [PATCH 2/5] package/python3-cheetah: drop host package In-Reply-To: <20220210224047.11992-1-peter@korsgaard.com> References: <20220210224047.11992-1-peter@korsgaard.com> Message-ID: <20220210224047.11992-2-peter@korsgaard.com> Now that host-python2 is gone, the custom python3 variant can be dropped. Signed-off-by: Peter Korsgaard --- package/mongodb/mongodb.mk | 2 +- package/python-cheetah/python-cheetah.mk | 1 - package/python3-cheetah/python3-cheetah.hash | 1 - package/python3-cheetah/python3-cheetah.mk | 18 ------------------ 4 files changed, 1 insertion(+), 21 deletions(-) delete mode 120000 package/python3-cheetah/python3-cheetah.hash delete mode 100644 package/python3-cheetah/python3-cheetah.mk diff --git a/package/mongodb/mongodb.mk b/package/mongodb/mongodb.mk index 311b9de14e..2a5e00be79 100644 --- a/package/mongodb/mongodb.mk +++ b/package/mongodb/mongodb.mk @@ -16,7 +16,7 @@ MONGODB_SELINUX_MODULES = mongodb MONGODB_DEPENDENCIES = \ boost \ - host-python3-cheetah \ + host-python-cheetah \ host-python3-psutil \ host-python-pyyaml \ host-python3-regex \ diff --git a/package/python-cheetah/python-cheetah.mk b/package/python-cheetah/python-cheetah.mk index 02877e03c4..92688f6ced 100644 --- a/package/python-cheetah/python-cheetah.mk +++ b/package/python-cheetah/python-cheetah.mk @@ -4,7 +4,6 @@ # ################################################################################ -# Please keep in sync with package/python3-cheetah/python3-cheetah.mk PYTHON_CHEETAH_VERSION = 3.2.6.post2 PYTHON_CHEETAH_SOURCE = Cheetah3-$(PYTHON_CHEETAH_VERSION).tar.gz PYTHON_CHEETAH_SITE = https://files.pythonhosted.org/packages/c0/97/c3fa47e223207e6ca6b501a954c5c959ed3e99f2a1ceec9918238ce38418 diff --git a/package/python3-cheetah/python3-cheetah.hash b/package/python3-cheetah/python3-cheetah.hash deleted file mode 120000 index c29a76ea80..0000000000 --- a/package/python3-cheetah/python3-cheetah.hash +++ /dev/null @@ -1 +0,0 @@ -../python-cheetah/python-cheetah.hash \ No newline at end of file diff --git a/package/python3-cheetah/python3-cheetah.mk b/package/python3-cheetah/python3-cheetah.mk deleted file mode 100644 index 93d16201aa..0000000000 --- a/package/python3-cheetah/python3-cheetah.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# python3-cheetah -# -################################################################################ - -# Please keep in sync with -# package/python-cheetah/python-cheetah.mk -PYTHON3_CHEETAH_VERSION = 3.2.6.post2 -PYTHON3_CHEETAH_SOURCE = Cheetah3-$(PYTHON3_CHEETAH_VERSION).tar.gz -PYTHON3_CHEETAH_SITE = https://files.pythonhosted.org/packages/c0/97/c3fa47e223207e6ca6b501a954c5c959ed3e99f2a1ceec9918238ce38418 -PYTHON3_CHEETAH_LICENSE = MIT -PYTHON3_CHEETAH_LICENSE_FILES = LICENSE -PYTHON3_CHEETAH_SETUP_TYPE = setuptools -HOST_PYTHON3_CHEETAH_DL_SUBDIR = python-cheetah -HOST_PYTHON3_CHEETAH_NEEDS_HOST_PYTHON = python3 - -$(eval $(host-python-package)) -- 2.20.1 From peter at korsgaard.com Thu Feb 10 22:40:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 23:40:42 +0100 Subject: [Buildroot] [PATCH 1/5] package/python3-cffi: drop unused host package Message-ID: <20220210224047.11992-1-peter@korsgaard.com> Commit d9bf97cf16fa6945466a67 (package/python-cryptography: drop host variant) dropped the dependency on host-python3-cffi, so it is now unused. Drop it. Signed-off-by: Peter Korsgaard --- package/python-cffi/python-cffi.mk | 1 - package/python3-cffi/python3-cffi.hash | 1 - package/python3-cffi/python3-cffi.mk | 29 -------------------------- 3 files changed, 31 deletions(-) delete mode 120000 package/python3-cffi/python3-cffi.hash delete mode 100644 package/python3-cffi/python3-cffi.mk diff --git a/package/python-cffi/python-cffi.mk b/package/python-cffi/python-cffi.mk index b14dce8225..83a21cb75a 100644 --- a/package/python-cffi/python-cffi.mk +++ b/package/python-cffi/python-cffi.mk @@ -4,7 +4,6 @@ # ################################################################################ -# Please keep in sync with package/python3-cffi/python3-cffi.mk PYTHON_CFFI_VERSION = 1.15.0 PYTHON_CFFI_SOURCE = cffi-$(PYTHON_CFFI_VERSION).tar.gz PYTHON_CFFI_SITE = https://files.pythonhosted.org/packages/00/9e/92de7e1217ccc3d5f352ba21e52398372525765b2e0c4530e6eb2ba9282a diff --git a/package/python3-cffi/python3-cffi.hash b/package/python3-cffi/python3-cffi.hash deleted file mode 120000 index 1f98d8df9c..0000000000 --- a/package/python3-cffi/python3-cffi.hash +++ /dev/null @@ -1 +0,0 @@ -../python-cffi/python-cffi.hash \ No newline at end of file diff --git a/package/python3-cffi/python3-cffi.mk b/package/python3-cffi/python3-cffi.mk deleted file mode 100644 index 2770eda93e..0000000000 --- a/package/python3-cffi/python3-cffi.mk +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# -# python3-cffi -# -################################################################################ - -# Please keep in sync with package/python-cffi/python-cffi.mk -PYTHON3_CFFI_VERSION = 1.15.0 -PYTHON3_CFFI_SOURCE = cffi-$(PYTHON3_CFFI_VERSION).tar.gz -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 - -# This host package uses pkg-config to find libffi, so we have to -# provide the proper hints for pkg-config to behave properly for host -# packages. -HOST_PYTHON3_CFFI_ENV = \ - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ - PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \ - PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ - PKG_CONFIG_SYSROOT_DIR="/" \ - PKG_CONFIG_LIBDIR="$(HOST_DIR)/lib/pkgconfig:$(HOST_DIR)/share/pkgconfig" -HOST_PYTHON3_CFFI_DEPENDENCIES = host-pkgconf host-python3-pycparser host-libffi - -HOST_PYTHON3_CFFI_DL_SUBDIR = python-cffi -HOST_PYTHON3_CFFI_NEEDS_HOST_PYTHON = python3 - -$(eval $(host-python-package)) -- 2.20.1 From peter at korsgaard.com Thu Feb 10 22:40:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 23:40:44 +0100 Subject: [Buildroot] [PATCH 3/5] package/python3-cython: drop host package In-Reply-To: <20220210224047.11992-1-peter@korsgaard.com> References: <20220210224047.11992-1-peter@korsgaard.com> Message-ID: <20220210224047.11992-3-peter@korsgaard.com> Now that host-python2 is gone, the custom python3 variant can be dropped. Signed-off-by: Peter Korsgaard --- package/libdnet/libdnet.mk | 2 +- package/python-cython/python-cython.mk | 1 - package/python-fonttools/python-fonttools.mk | 2 +- package/python3-cython/python3-cython.hash | 1 - package/python3-cython/python3-cython.mk | 16 ---------------- package/setools/setools.mk | 2 +- 6 files changed, 3 insertions(+), 21 deletions(-) delete mode 120000 package/python3-cython/python3-cython.hash delete mode 100644 package/python3-cython/python3-cython.mk diff --git a/package/libdnet/libdnet.mk b/package/libdnet/libdnet.mk index e9a57d6ed2..4c58ea20a5 100644 --- a/package/libdnet/libdnet.mk +++ b/package/libdnet/libdnet.mk @@ -16,7 +16,7 @@ LIBDNET_CONF_OPTS = \ LIBDNET_CONFIG_SCRIPTS = dnet-config ifeq ($(BR2_PACKAGE_LIBDNET_PYTHON),y) -LIBDNET_DEPENDENCIES += host-python3-cython python3 +LIBDNET_DEPENDENCIES += host-python-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 diff --git a/package/python-cython/python-cython.mk b/package/python-cython/python-cython.mk index 89708cb9a8..b9fbf7b11a 100644 --- a/package/python-cython/python-cython.mk +++ b/package/python-cython/python-cython.mk @@ -4,7 +4,6 @@ # ################################################################################ -# Please keep in sync with package/python3-cython/python3-cython.mk PYTHON_CYTHON_VERSION = 0.29.27 PYTHON_CYTHON_SOURCE = Cython-$(PYTHON_CYTHON_VERSION).tar.gz PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/eb/46/80dd9e5ad67ebc766ff3229901bde4a7bc82907efe93cd7007c4df458dd5 diff --git a/package/python-fonttools/python-fonttools.mk b/package/python-fonttools/python-fonttools.mk index d5c4cdf8e5..c07011daa0 100644 --- a/package/python-fonttools/python-fonttools.mk +++ b/package/python-fonttools/python-fonttools.mk @@ -10,7 +10,7 @@ PYTHON_FONTTOOLS_SITE = https://files.pythonhosted.org/packages/2d/4c/49ba863863 PYTHON_FONTTOOLS_SETUP_TYPE = setuptools PYTHON_FONTTOOLS_LICENSE = MIT PYTHON_FONTTOOLS_LICENSE_FILES = LICENSE -PYTHON_FONTTOOLS_DEPENDENCIES = host-python3-cython +PYTHON_FONTTOOLS_DEPENDENCIES = host-python-cython PYTHON_FONTTOOLS_ENV = FONTTOOLS_WITH_CYTHON=1 define PYTHON_FONTTOOLS_EXTRACT_CMDS diff --git a/package/python3-cython/python3-cython.hash b/package/python3-cython/python3-cython.hash deleted file mode 120000 index 70dde64105..0000000000 --- a/package/python3-cython/python3-cython.hash +++ /dev/null @@ -1 +0,0 @@ -../python-cython/python-cython.hash \ No newline at end of file diff --git a/package/python3-cython/python3-cython.mk b/package/python3-cython/python3-cython.mk deleted file mode 100644 index 56d88b5bf7..0000000000 --- a/package/python3-cython/python3-cython.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# python3-cython -# -################################################################################ - -# Please keep in sync with package/python-cython/python-cython.mk -PYTHON3_CYTHON_VERSION = 0.29.27 -PYTHON3_CYTHON_SOURCE = Cython-$(PYTHON3_CYTHON_VERSION).tar.gz -PYTHON3_CYTHON_SITE = https://files.pythonhosted.org/packages/eb/46/80dd9e5ad67ebc766ff3229901bde4a7bc82907efe93cd7007c4df458dd5 -PYTHON3_CYTHON_SETUP_TYPE = setuptools -PYTHON3_CYTHON_LICENSE = Apache-2.0 -PYTHON3_CYTHON_LICENSE_FILES = COPYING.txt LICENSE.txt -HOST_PYTHON3_CYTHON_NEEDS_HOST_PYTHON = python3 - -$(eval $(host-python-package)) diff --git a/package/setools/setools.mk b/package/setools/setools.mk index 8e1c0d2cc6..5b4b4e30d8 100644 --- a/package/setools/setools.mk +++ b/package/setools/setools.mk @@ -12,7 +12,7 @@ SETOOLS_LICENSE = GPL-2.0+, LGPL-2.1+ SETOOLS_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL SETOOLS_CPE_ID_VENDOR = selinuxproject SETOOLS_SETUP_TYPE = setuptools -HOST_SETOOLS_DEPENDENCIES = host-python3-cython host-libselinux host-libsepol host-python-networkx +HOST_SETOOLS_DEPENDENCIES = host-python-cython host-libselinux host-libsepol host-python-networkx HOST_SETOOLS_NEEDS_HOST_PYTHON = python3 define SETOOLS_FIX_SETUP -- 2.20.1 From peter at korsgaard.com Thu Feb 10 22:40:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 23:40:46 +0100 Subject: [Buildroot] [PATCH 5/5] package/python3-psutil: drop host package In-Reply-To: <20220210224047.11992-1-peter@korsgaard.com> References: <20220210224047.11992-1-peter@korsgaard.com> Message-ID: <20220210224047.11992-5-peter@korsgaard.com> Now that host-python2 is gone, the custom python3 variant can be dropped. Signed-off-by: Peter Korsgaard --- package/mongodb/mongodb.mk | 2 +- package/python-psutil/python-psutil.mk | 1 - package/python3-psutil/python3-psutil.hash | 1 - package/python3-psutil/python3-psutil.mk | 19 ------------------- 4 files changed, 1 insertion(+), 22 deletions(-) delete mode 120000 package/python3-psutil/python3-psutil.hash delete mode 100644 package/python3-psutil/python3-psutil.mk diff --git a/package/mongodb/mongodb.mk b/package/mongodb/mongodb.mk index 2a5e00be79..e2a58a5f4e 100644 --- a/package/mongodb/mongodb.mk +++ b/package/mongodb/mongodb.mk @@ -17,7 +17,7 @@ MONGODB_SELINUX_MODULES = mongodb MONGODB_DEPENDENCIES = \ boost \ host-python-cheetah \ - host-python3-psutil \ + host-python-psutil \ host-python-pyyaml \ host-python3-regex \ host-python-requests \ diff --git a/package/python-psutil/python-psutil.mk b/package/python-psutil/python-psutil.mk index 3bba7ca343..413fc8a391 100644 --- a/package/python-psutil/python-psutil.mk +++ b/package/python-psutil/python-psutil.mk @@ -4,7 +4,6 @@ # ################################################################################ -# Please keep in sync with package/python3-psutil/python3-psutil.mk PYTHON_PSUTIL_VERSION = 5.8.0 PYTHON_PSUTIL_SOURCE = psutil-$(PYTHON_PSUTIL_VERSION).tar.gz PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/e1/b0/7276de53321c12981717490516b7e612364f2cb372ee8901bd4a66a000d7 diff --git a/package/python3-psutil/python3-psutil.hash b/package/python3-psutil/python3-psutil.hash deleted file mode 120000 index ff688fab28..0000000000 --- a/package/python3-psutil/python3-psutil.hash +++ /dev/null @@ -1 +0,0 @@ -../python-psutil/python-psutil.hash \ No newline at end of file diff --git a/package/python3-psutil/python3-psutil.mk b/package/python3-psutil/python3-psutil.mk deleted file mode 100644 index 1304124f57..0000000000 --- a/package/python3-psutil/python3-psutil.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# python3-psutil -# -################################################################################ - -# Please keep in sync with package/python-psutil/python-psutil.mk -PYTHON3_PSUTIL_VERSION = 5.8.0 -PYTHON3_PSUTIL_SOURCE = psutil-$(PYTHON3_PSUTIL_VERSION).tar.gz -PYTHON3_PSUTIL_SITE = https://files.pythonhosted.org/packages/e1/b0/7276de53321c12981717490516b7e612364f2cb372ee8901bd4a66a000d7 -PYTHON3_PSUTIL_SETUP_TYPE = setuptools -PYTHON3_PSUTIL_LICENSE = BSD-3-Clause -PYTHON3_PSUTIL_LICENSE_FILES = LICENSE -PYTHON3_PSUTIL_CPE_ID_VENDOR = psutil_project -PYTHON3_PSUTIL_CPE_ID_PRODUCT = psutil -HOST_PYTHON3_PSUTIL_DL_SUBDIR = python-psutil -HOST_PYTHON3_PSUTIL_NEEDS_HOST_PYTHON = python3 - -$(eval $(host-python-package)) -- 2.20.1 From peter at korsgaard.com Thu Feb 10 22:40:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Feb 2022 23:40:45 +0100 Subject: [Buildroot] [PATCH 4/5] package/python3-ply: drop host package In-Reply-To: <20220210224047.11992-1-peter@korsgaard.com> References: <20220210224047.11992-1-peter@korsgaard.com> Message-ID: <20220210224047.11992-4-peter@korsgaard.com> Now that host-python2 is gone, the custom python3 variant can be dropped. Signed-off-by: Peter Korsgaard --- package/libcamera/libcamera.mk | 2 +- package/python-ply/python-ply.mk | 1 - package/python3-ply/python3-ply.hash | 1 - package/python3-ply/python3-ply.mk | 16 ---------------- 4 files changed, 1 insertion(+), 19 deletions(-) delete mode 120000 package/python3-ply/python3-ply.hash delete mode 100644 package/python3-ply/python3-ply.mk diff --git a/package/libcamera/libcamera.mk b/package/libcamera/libcamera.mk index 534d8d2637..7cd4bfa758 100644 --- a/package/libcamera/libcamera.mk +++ b/package/libcamera/libcamera.mk @@ -11,7 +11,7 @@ LIBCAMERA_DEPENDENCIES = \ host-openssl \ host-pkgconf \ host-python-jinja2 \ - host-python3-ply \ + host-python-ply \ host-python-pyyaml \ gnutls LIBCAMERA_CONF_OPTS = \ diff --git a/package/python-ply/python-ply.mk b/package/python-ply/python-ply.mk index 50a3e32bc2..5dc7964d5f 100644 --- a/package/python-ply/python-ply.mk +++ b/package/python-ply/python-ply.mk @@ -4,7 +4,6 @@ # ################################################################################ -# Please keep in sync with package/python3-ply/python3-ply.mk PYTHON_PLY_VERSION = 3.11 PYTHON_PLY_SOURCE = ply-$(PYTHON_PLY_VERSION).tar.gz PYTHON_PLY_SITE = https://files.pythonhosted.org/packages/e5/69/882ee5c9d017149285cab114ebeab373308ef0f874fcdac9beb90e0ac4da diff --git a/package/python3-ply/python3-ply.hash b/package/python3-ply/python3-ply.hash deleted file mode 120000 index 5e07165c93..0000000000 --- a/package/python3-ply/python3-ply.hash +++ /dev/null @@ -1 +0,0 @@ -../python-ply/python-ply.hash \ No newline at end of file diff --git a/package/python3-ply/python3-ply.mk b/package/python3-ply/python3-ply.mk deleted file mode 100644 index 15f66a49db..0000000000 --- a/package/python3-ply/python3-ply.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# python3-ply -# -################################################################################ - -PYTHON3_PLY_VERSION = 3.11 -PYTHON3_PLY_SOURCE = ply-$(PYTHON3_PLY_VERSION).tar.gz -PYTHON3_PLY_SITE = https://files.pythonhosted.org/packages/e5/69/882ee5c9d017149285cab114ebeab373308ef0f874fcdac9beb90e0ac4da -PYTHON3_PLY_SETUP_TYPE = setuptools -PYTHON3_PLY_LICENSE = BSD-3-Clause -PYTHON3_PLY_LICENSE_FILES = README.md - -HOST_PYTHON3_PLY_NEEDS_HOST_PYTHON = python3 - -$(eval $(host-python-package)) -- 2.20.1 From clayton.shotwell at rockwellcollins.com Thu Feb 10 23:23:27 2022 From: clayton.shotwell at rockwellcollins.com (Clayton Shotwell) Date: Thu, 10 Feb 2022 17:23:27 -0600 Subject: [Buildroot] [PATCH] support/download/post-process-helpers: adjust for older coreutils versions Message-ID: <20220210232327.119488-1-clayton.shotwell@rockwellcollins.com> From: Clayton Shotwell Ran into an issue with the post_process_unpack function using "head -z" on a RHEL box which is using an older version or coreutils. The "-z" flag was added in coreutils v8.25 but my IT managed RHEL box is only using v8.22. The fix I have implemented relies on the null terminated list and sed to remove the first null character and everthing afterwards. Signed-off-by: Clayton Shotwell --- support/download/helpers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/download/helpers b/support/download/helpers index ab31e27..90a7d6c 100755 --- a/support/download/helpers +++ b/support/download/helpers @@ -79,7 +79,7 @@ post_process_unpack() { mkdir "${dest}" 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")" + one_file="$(find "${dest}" -type f -print0 |LC_ALL=C sort -z |sed 's/\x0.*//')" touch -r "${one_file}" "${dest}.timestamp" } -- 1.8.3.1 From christian at paral.in Thu Feb 10 23:59:06 2022 From: christian at paral.in (Christian Stewart) Date: Thu, 10 Feb 2022 15:59:06 -0800 Subject: [Buildroot] [PATCH 1/1] package/go: security bump to 1.17.7 Message-ID: <20220210235906.23355-1-christian@paral.in> go1.17.7 includes security fixes to the crypto/elliptic, math/big packages and to the go command, as well as bug fixes to the compiler, linker, runtime, the go command, and the debug/macho, debug/pe, and net/http/httptest packages. https://github.com/golang/go/issues?q=milestone%3AGo1.17.7+label%3ACherryPickApproved 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 9111c8c9aa..fdf342e602 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://golang.org/dl/ -sha256 4dc1bbf3ff61f0c1ff2b19355e6d88151a70126268a47c761477686ef94748c8 go1.17.6.src.tar.gz +sha256 c108cd33b73b1911a02b697741df3dea43e01a5c4e08e409e8b3a0e3745d2b4d go1.17.7.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 062bec378c..56a21dfe55 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.17.6 +GO_VERSION = 1.17.7 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz -- 2.35.1 From giulio.benetti at benettiengineering.com Fri Feb 11 05:08:46 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 11 Feb 2022 06:08:46 +0100 Subject: [Buildroot] [PATCH v4 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <874k56wgqs.fsf@dell.be.48ers.dk> References: <20220210081932.3114763-1-neal.frager@xilinx.com> <874k56wgqs.fsf@dell.be.48ers.dk> Message-ID: Hi All, On 10/02/22 22:31, Peter Korsgaard wrote: >>>>>> "Neal" == Neal Frager writes: > > > This patch: > > - bumps ATF to Xilinx v2.6: mainline v2.6 requires patch to build > > - bumps U-Boot to Xilinx 2022.01: important drivers not in mainline > > - bumps Linux to Xilinx 5.15: important drivers not in mainline > > - deletes board/zynqmp/patches directory: patches already in mainline > > - modifies board/zynqmp/genimage.cfg: U-Boot 2022.01 uses u-boot.itb format > > - adds extlinux.conf to vfat bootfs > > - modifies U-Boot to unified xilinx_zynqmp_virt_defconfig (supports all boards) > > - adds support for SPL pm_cfg_obj.c loading to PMU firmware > > - enables support for host machines without OpenSSL required by U-Boot and Linux > > > V3-> V4: > > * cleaned up commit log messages > > * added version history > > --- > > [snip] > > > +++ b/configs/zynqmp_zcu106_defconfig > > @@ -1,34 +1,39 @@ > > BR2_aarch64=y > > -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" > > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y > > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" > > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > > BR2_LINUX_KERNEL=y > > BR2_LINUX_KERNEL_CUSTOM_GIT=y > > BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" > > -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" > > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.15" > > xlnx_rebase_v5.15 is a branch. A git version should point to a tag og a > sha1 so the build is reproducible. Thank you Peter! I've missed this, and for completeness I point where manual talks about it: https://buildroot.org/downloads/manual/manual.html#generic-package-reference ``` Note: Using a branch name as FOO_VERSION is not supported, because it does not and can not work as people would expect it should: 1. due to local caching, Buildroot will not re-fetch the repository, so people who expect to be able to follow the remote repository would be quite surprised and disappointed; 2. because two builds can never be perfectly simultaneous, and because the remote repository may get new commits on the branch anytime, two users, using the same Buildroot tree and building the same configuration, may get different source, thus rendering the build non reproducible, and people would be quite surprised and disappointed. ``` Best regards -- Giulio Benetti Benetti Engineering sas > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.6" > > Same for xlnx_rebase_v2.6 > > > BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" > > BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" > > -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7" > > -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA" > > +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" > > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2022.01" > > And xlnx_rebase_v2022.01 > > I think I earlier asked you not to change the URL when it is not needed, > please leave the existing /xilinx/ URL. > From giulio.benetti at benettiengineering.com Fri Feb 11 05:26:29 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 11 Feb 2022 06:26:29 +0100 Subject: [Buildroot] [PATCH] docs/manual/adding-packages-generic: remove useless carriage return Message-ID: <20220211052629.2289507-1-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- docs/manual/adding-packages-generic.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt index 8723da214a..fbe37f9ca9 100644 --- a/docs/manual/adding-packages-generic.txt +++ b/docs/manual/adding-packages-generic.txt @@ -316,8 +316,7 @@ not and can not work as people would expect it should: 13:45+01" see "man cvs" for further details). ** +git+ for retrieving source code from a Git repository. Used by default when +LIBFOO_SITE+ begins with +git://+. The downloaded - source code is cached as with the +svn+ - method. + source code is cached as with the +svn+ method. ** +hg+ for retrieving source code from a Mercurial repository. One 'must' specify +LIBFOO_SITE_METHOD=hg+ when +LIBFOO_SITE+ contains a Mercurial repository URL. The downloaded source code -- 2.25.1 From thomas.petazzoni at bootlin.com Fri Feb 11 07:11:13 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 11 Feb 2022 07:11:13 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-02-10 Message-ID: <20220211071118.6921F40124@smtp2.osuosl.org> Hello, Autobuild statistics for 2022-02-10 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 42 | 4 | 0 | 46 | 2021.11.x | 18 | 1 | 0 | 19 | master | 30 | 61 | 0 | 91 | Classification of failures by reason for master ----------------------------------------------- bluez5_utils-5.63 | 6 host-omniorb-4.3.0 | 6 host-cxxtest-4.4 | 5 host-bmap-tools-3.6 | 4 host-libselinux-3.3 | 4 host-grpc-1.43.0 | 3 host-python-pycryptodomex-3... | 3 bat-0.19.0 | 2 frr-8.1 | 2 gerbera-1.9.2 | 2 host-python-cython-0.29.27 | 2 host-python-docutils-0.15.2 | 2 host-python-greenlet-1.1.2 | 2 host-python-lxml-4.6.5 | 2 rygel-0.40.2 | 2 unknown | 2 file-5.41 | 1 guile-3.0.7 | 1 host-binutils-2.36.1 | 1 host-clang-9.0.1 | 1 ibrdtnd-1.0.1 | 1 libopenssl-1.1.1m | 1 libv4l-1.22.1 | 1 libwpe-1.12.0 | 1 mp4v2-5.0.1 | 1 pulseview-0.4.2 | 1 python-docutils-0.15.2 | 1 ulog-0389d243352255f6182326... | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- i586 | bat-0.19.0 | NOK | http://autobuild.buildroot.net/results/a73a9122fffa494bae8e47ad4e445516fb0cf2ee | i586 | bat-0.19.0 | NOK | http://autobuild.buildroot.net/results/1891b6da5575ed8e4070c8ac054f75b04ae13d42 | mips | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/4b1d67f001fcad5727aad2bbd2c73adbdb78acb3 | mips | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/541cf1365b446b2c9dffdeb50e34b5bc7ec10627 | x86_64 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/d94c3c2dcbc2e226b3bafae507c444be4c4e99b0 | x86_64 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/c722e4b1e962bd02942cd0b119997d2ad9d6e758 | arc | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/5d04a4af76b9bc89450f727e145fa6eba48298ff | powerpc | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/e2f77f4f1be19f7b62a9982061c96aab129306c1 | arm | file-5.41 | NOK | http://autobuild.buildroot.net/results/f082c2f95550d6a7457e55e34c1ed297a85f22a8 | ORPH arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/83c8ec262cdf35ca403ec15eaad38de4394876b0 | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/0c2891943111b721a3d615fe2875b8092e7652ad | s390x | gerbera-1.9.2 | NOK | http://autobuild.buildroot.net/results/37bc85d8b41f36f885e6adfacef1fc972e811ec1 | arc | gerbera-1.9.2 | NOK | http://autobuild.buildroot.net/results/4efc15d79682e14232945226ead18c45ac2a5c39 | arm | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/098b2f3917aebf1e415df9592bed7d1a06004e22 | arm | host-binutils-2.36.1 | NOK | http://autobuild.buildroot.net/results/ef5469e3e0158302f25f321bf58d516e9331eed3 | arm | host-bmap-tools-3.6 | NOK | http://autobuild.buildroot.net/results/df591e0a88e767622780441ef404160d2787d50a | arm | host-bmap-tools-3.6 | NOK | http://autobuild.buildroot.net/results/02a54bb47f780ee47fb633b7aa18437fc87d190b | microblazeel | host-bmap-tools-3.6 | NOK | http://autobuild.buildroot.net/results/c2314927f595907c8ce1fa0bcb36c1f03fc26c56 | powerpc | host-bmap-tools-3.6 | NOK | http://autobuild.buildroot.net/results/b431c240567bc80e390a81abdd0f6c71b1f633e7 | arm | host-clang-9.0.1 | NOK | http://autobuild.buildroot.net/results/a118ee0b4ccbac2c0dd0e9bb85a2b318499a3262 | arm | host-cxxtest-4.4 | NOK | http://autobuild.buildroot.net/results/f31b8f94d9512fb7f8d973a9a8595fc6bc306403 | x86_64 | host-cxxtest-4.4 | NOK | http://autobuild.buildroot.net/results/6d87e0a89554b742684bcda905958c34468095fb | x86_64 | host-cxxtest-4.4 | NOK | http://autobuild.buildroot.net/results/3b43cd6d1540f2b7aaf97e417e47908a0b9cb45d | arm | host-cxxtest-4.4 | NOK | http://autobuild.buildroot.net/results/d3c30978368ce1657551aaa4c2202e8f0ce05fe1 | arm | host-cxxtest-4.4 | NOK | http://autobuild.buildroot.net/results/f98a27d92f7d9e3763a980cc9fd75c49d082ecf4 | arm | host-grpc-1.43.0 | NOK | http://autobuild.buildroot.net/results/acdc905fc688f2e02e2f600e6746be9f4c407942 | aarch64 | host-grpc-1.43.0 | NOK | http://autobuild.buildroot.net/results/f5d501274d3fa139e3d3147ad37a58ba7dec64da | mips | host-grpc-1.43.0 | NOK | http://autobuild.buildroot.net/results/0c99b5a9b2334ab8ce283608dd6db8df4d226d01 | microblazeel | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/e91bdf6bffb019f168dd61d36b5de3c09f084386 | m68k | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/0e330ee5faf6ecefee4bf7b626d2c00036b923e3 | mipsel | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/ec6614f24d4b84c85a9b0c3bf6959a96e7d9653f | xtensa | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/e5059ff1e63a8717a29f1e9aa6a53e0b09ca72c8 | microblazeel | host-omniorb-4.3.0 | NOK | http://autobuild.buildroot.net/results/d415c2501b27cacf2356f0f6924ee7706d7a4070 | arm | host-omniorb-4.3.0 | NOK | http://autobuild.buildroot.net/results/9d2e3c692cda8f75780b75dd15f82f5650590bc4 | i686 | host-omniorb-4.3.0 | NOK | http://autobuild.buildroot.net/results/060518df089d51bc4abd7c27757cdcee0d836305 | powerpc | host-omniorb-4.3.0 | NOK | http://autobuild.buildroot.net/results/3e873090c0a4eacb98ba728ff4ba8bda667b1485 | powerpc | host-omniorb-4.3.0 | NOK | http://autobuild.buildroot.net/results/1fadafbc2f085bf4341bace2a233729315bb2c5e | xtensa | host-omniorb-4.3.0 | NOK | http://autobuild.buildroot.net/results/34ff6e6cff0cb973dc7b8a17e58c2fc43d227401 | arc | host-python-cython-0.29.27 | NOK | http://autobuild.buildroot.net/results/bb71485bc1dc5c87578537d54ae3ea895b2f6aed | nds32le | host-python-cython-0.29.27 | NOK | http://autobuild.buildroot.net/results/3f2f9995f57a5f47d521a539961f493a5f3a3418 | aarch64 | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/0d4d52f3b935d7a17241a6e9f351b98be09bf707 | sparc64 | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/d32c6dece11a6410db9596ca7217e28aecc023bb | m68k | host-python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/e408b45a3b633e23e96cb0e58d80a93734384d40 | aarch64 | host-python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/501dadc1d4a07dc643047eef10336f6e82179dae | arm | host-python-lxml-4.6.5 | NOK | http://autobuild.buildroot.net/results/8347c3d92b9b1df6da94941936a543e5fb52f8eb | nds32le | host-python-lxml-4.6.5 | NOK | http://autobuild.buildroot.net/results/33a6b0d44db36690a5258ed401eb1a08a2f25aa2 | aarch64 | host-python-pycryptodomex-3... | NOK | http://autobuild.buildroot.net/results/90cc2c3416c4b2b60e0992206804e344df7ecbf3 | powerpc | host-python-pycryptodomex-3... | NOK | http://autobuild.buildroot.net/results/2d56e80824e9b5dd6350598220932530ee61bc6e | nios2 | host-python-pycryptodomex-3... | NOK | http://autobuild.buildroot.net/results/12b8a70310967aaa4d0c26cc587fc5e16657377c | aarch64 | ibrdtnd-1.0.1 | NOK | http://autobuild.buildroot.net/results/a7a254c92215a89bb18c71120d7c7980caaf830a | ORPH s390x | libopenssl-1.1.1m | NOK | http://autobuild.buildroot.net/results/0f14b7d0f55801c6ee644cc89bbbbd5e60dc0223 | arm | libv4l-1.22.1 | NOK | http://autobuild.buildroot.net/results/cacd73e08cfb359d608bca807189b7bd3c5c79bd | powerpc | libwpe-1.12.0 | NOK | http://autobuild.buildroot.net/results/0500187cf51dc96ae1f8dbce03165df08e77019c | arm | mp4v2-5.0.1 | NOK | http://autobuild.buildroot.net/results/126fe37b729cb66702a8650cfa119aa5f1745b9a | ORPH xtensa | pulseview-0.4.2 | NOK | http://autobuild.buildroot.net/results/f7a41f23bc3e46d5e2973a20abce197248c2d915 | riscv32 | python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/03575ee0f3d6390780652cfd97efd15cfea5d780 | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/e7f38e2a2d81be907eedbe462e3c14f382edb4fe | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/dbec470842e7fd3d0ee8aa6100625dfeb8d65a14 | arm | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/0a163fc75a5bdea4a28f83cce6539e13fca099a5 | riscv64 | unknown | NOK | http://autobuild.buildroot.net/results/85544591733b07ed1cc80c9f4cc56dea102f6259 | i686 | unknown | NOK | http://autobuild.buildroot.net/results/4acb608ef98a11f3bd300f0700ff96dcddbb149d | Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 2 unknown | 1 zeromq-4.3.4 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/1694ba94102b3e92b9a9c3892ff73f3f955db915 | mips64el | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/3b5ac2b9774b542bfab23e8505923d0558ff60df | mips64el | unknown | NOK | http://autobuild.buildroot.net/results/e08b44e3f9e518e8d743c3faa0908897f5e7b7bc | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/7447eeee52cf2417af30efb5b961f0b343167fad | 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/18fcd39612ab725e56b8956cf59376f00eac7664 | Gitlab CI results for 2022-02-10 ================================ -- http://autobuild.buildroot.net From jorgen.sigvardsson at gmail.com Fri Feb 11 08:13:57 2022 From: jorgen.sigvardsson at gmail.com (=?UTF-8?q?J=C3=B6rgen=20Sigvardsson?=) Date: Fri, 11 Feb 2022 09:13:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/libwebsockets: option for building with LWS_WITH_ZIP_FOPS Message-ID: <20220211081357.40439-1-jorgen.sigvardsson@gmail.com> Signed-off-by: J?rgen Sigvardsson --- package/libwebsockets/Config.in | 14 ++++++++++++++ package/libwebsockets/libwebsockets.mk | 4 ++++ 2 files changed, 18 insertions(+) diff --git a/package/libwebsockets/Config.in b/package/libwebsockets/Config.in index d7b529cafd..8db1d8b975 100644 --- a/package/libwebsockets/Config.in +++ b/package/libwebsockets/Config.in @@ -9,5 +9,19 @@ config BR2_PACKAGE_LIBWEBSOCKETS https://libwebsockets.org/ +if BR2_PACKAGE_LIBWEBSOCKETS + +config BR2_PACKAGE_LIBWEBSOCKETS_ZIP_FOPS + bool "enable serving files from zip archives" + default y + help + By enabling this flag, files can be served from a (preferably + uncompressed) zip file. Furthermore, the contained files can + be gzipped. Gzipped files may be delivered as-is (no deflation + needed) to clients that accept gzipped encoded contents (all + modern browsers do that). + +endif + comment "libwebsockets needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS diff --git a/package/libwebsockets/libwebsockets.mk b/package/libwebsockets/libwebsockets.mk index c25686d385..a62f1c70d9 100644 --- a/package/libwebsockets/libwebsockets.mk +++ b/package/libwebsockets/libwebsockets.mk @@ -73,4 +73,8 @@ ifeq ($(BR2_SHARED_LIBS),y) LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_STATIC=OFF endif +ifeq ($(BR2_PACKAGE_LIBWEBSOCKETS_ZIP_FOPS),y) +LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_ZIP_FOPS=ON +endif + $(eval $(cmake-package)) -- 2.32.0 From peter at korsgaard.com Fri Feb 11 08:17:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 09:17:26 +0100 Subject: [Buildroot] [PATCH 2/5] boot/uboot: drop host-python2 support In-Reply-To: <20220211081730.23068-1-peter@korsgaard.com> References: <20220211081730.23068-1-peter@korsgaard.com> Message-ID: <20220211081730.23068-2-peter@korsgaard.com> host-python2 is gone, so drop the _NEEDS_PYTHON2 logic. Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++++ boot/uboot/Config.in | 28 +++------------------------- boot/uboot/uboot.mk | 8 +------- 3 files changed, 10 insertions(+), 32 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 2b1fd48de5..0794813a97 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_TARGET_UBOOT_NEEDS_PYTHON2 + bool "host-python 2.7 support for U-Boot was removed" + select BR2_LEGACY + help + Option was removed together with python 2.7 support. + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBMMS bool "gst1-plugins-bad plugin libmms was removed" depends on BR2_USE_WCHAR diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index 1fd4dede92..953c36135e 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -143,45 +143,23 @@ config BR2_TARGET_UBOOT_NEEDS_DTC Select this option if your U-Boot board configuration requires the Device Tree compiler to be available. -config BR2_TARGET_UBOOT_NEEDS_PYTHON - bool - -choice - bool "U-Boot needs host Python" - -config BR2_TARGET_UBOOT_NEEDS_PYTHON_NONE - bool "no" - depends on !BR2_TARGET_UBOOT_NEEDS_PYTHON - help - Select this option if U-Boot does not need any - host python to build. - -config BR2_TARGET_UBOOT_NEEDS_PYTHON2 - bool "python 2.x" - help - Select this option if U-Boot needs a host Python 2.x - interpreter. This is the case for some U-Boot - configurations, prior to U-Boot 2020.01. - config BR2_TARGET_UBOOT_NEEDS_PYTHON3 - bool "python 3.x" + bool "U-Boot needs host python 3.x" help Select this option if U-Boot needs a host Python 3.x interpreter. This is the case for some U-Boot configurations, after U-Boot 2020.01. -endchoice - config BR2_TARGET_UBOOT_NEEDS_PYLIBFDT bool "U-Boot needs pylibfdt" - select BR2_TARGET_UBOOT_NEEDS_PYTHON + select BR2_TARGET_UBOOT_NEEDS_PYTHON3 help Select this option if your U-Boot board configuration requires the Python libfdt library to be available. config BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS bool "U-Boot needs pyelftools" - select BR2_TARGET_UBOOT_NEEDS_PYTHON + select BR2_TARGET_UBOOT_NEEDS_PYTHON3 help Select this option if your U-Boot board configuration requires the Python pyelftools library to be available. diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index d05b9bb479..9e227fed91 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -207,9 +207,7 @@ ifeq ($(BR2_TARGET_UBOOT_NEEDS_DTC),y) UBOOT_DEPENDENCIES += host-dtc endif -ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON2),y) -UBOOT_DEPENDENCIES += host-python host-python-setuptools -else ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON3),y) +ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON3),y) UBOOT_DEPENDENCIES += host-python3 host-python3-setuptools endif @@ -218,12 +216,8 @@ UBOOT_DEPENDENCIES += host-swig endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS),y) -ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON2),y) -UBOOT_DEPENDENCIES += host-python-pyelftools -else ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON3),y) UBOOT_DEPENDENCIES += host-python3-pyelftools endif -endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSSL),y) UBOOT_DEPENDENCIES += host-openssl -- 2.20.1 From peter at korsgaard.com Fri Feb 11 08:17:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 09:17:28 +0100 Subject: [Buildroot] [PATCH 4/5] package/python3-regex: drop host package In-Reply-To: <20220211081730.23068-1-peter@korsgaard.com> References: <20220211081730.23068-1-peter@korsgaard.com> Message-ID: <20220211081730.23068-4-peter@korsgaard.com> Now that host-python2 is gone, the custom python3 variant can be dropped and instead host support added to python-regex. Signed-off-by: Peter Korsgaard --- package/mongodb/mongodb.mk | 2 +- package/python-regex/python-regex.mk | 1 + package/python3-regex/python3-regex.hash | 1 - package/python3-regex/python3-regex.mk | 16 ---------------- 4 files changed, 2 insertions(+), 18 deletions(-) delete mode 120000 package/python3-regex/python3-regex.hash delete mode 100644 package/python3-regex/python3-regex.mk diff --git a/package/mongodb/mongodb.mk b/package/mongodb/mongodb.mk index e2a58a5f4e..9f6c7d31b8 100644 --- a/package/mongodb/mongodb.mk +++ b/package/mongodb/mongodb.mk @@ -19,7 +19,7 @@ MONGODB_DEPENDENCIES = \ host-python-cheetah \ host-python-psutil \ host-python-pyyaml \ - host-python3-regex \ + host-python-regex \ host-python-requests \ host-scons \ pcre \ diff --git a/package/python-regex/python-regex.mk b/package/python-regex/python-regex.mk index c46c4d1614..a90fd579ac 100644 --- a/package/python-regex/python-regex.mk +++ b/package/python-regex/python-regex.mk @@ -12,3 +12,4 @@ PYTHON_REGEX_SETUP_TYPE = setuptools PYTHON_REGEX_LICENSE = CNRI-Python $(eval $(python-package)) +$(eval $(host-python-package)) diff --git a/package/python3-regex/python3-regex.hash b/package/python3-regex/python3-regex.hash deleted file mode 120000 index 274f4dc277..0000000000 --- a/package/python3-regex/python3-regex.hash +++ /dev/null @@ -1 +0,0 @@ -../python-regex/python-regex.hash \ No newline at end of file diff --git a/package/python3-regex/python3-regex.mk b/package/python3-regex/python3-regex.mk deleted file mode 100644 index 0b71768e9d..0000000000 --- a/package/python3-regex/python3-regex.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# python3-regex -# -################################################################################ - -# Please keep in sync with package/python-regex/python-regex.mk -PYTHON3_REGEX_VERSION = 2021.4.4 -PYTHON3_REGEX_SOURCE = regex-$(PYTHON3_REGEX_VERSION).tar.gz -PYTHON3_REGEX_SITE = https://files.pythonhosted.org/packages/38/3f/4c42a98c9ad7d08c16e7d23b2194a0e4f3b2914662da8bc88986e4e6de1f -PYTHON3_REGEX_SETUP_TYPE = setuptools -PYTHON3_REGEX_LICENSE = CNRI-Python -HOST_PYTHON3_REGEX_DL_SUBDIR = python-regex -HOST_PYTHON3_REGEX_NEEDS_HOST_PYTHON = python3 - -$(eval $(host-python-package)) -- 2.20.1 From peter at korsgaard.com Fri Feb 11 08:17:25 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 09:17:25 +0100 Subject: [Buildroot] [PATCH 1/5] package/python3-pycryptodomex: drop host package Message-ID: <20220211081730.23068-1-peter@korsgaard.com> Now that host-python2 is gone, the custom python3 variant can be dropped. Signed-off-by: Peter Korsgaard --- boot/optee-os/optee-os.mk | 2 +- .../python-pycryptodomex.mk | 1 - .../python3-pycryptodomex.hash | 1 - .../python3-pycryptodomex.mk | 19 ------------------- 4 files changed, 1 insertion(+), 22 deletions(-) delete mode 120000 package/python3-pycryptodomex/python3-pycryptodomex.hash delete mode 100644 package/python3-pycryptodomex/python3-pycryptodomex.mk diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk index 03ce08ffb2..2884b48513 100644 --- a/boot/optee-os/optee-os.mk +++ b/boot/optee-os/optee-os.mk @@ -21,7 +21,7 @@ else OPTEE_OS_SITE = $(call github,OP-TEE,optee_os,$(OPTEE_OS_VERSION)) endif -OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python3-pycryptodomex host-python3-pyelftools +OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pycryptodomex host-python3-pyelftools # On 64bit targets, OP-TEE OS can be built in 32bit mode, or # can be built in 64bit mode and support 32bit and 64bit diff --git a/package/python-pycryptodomex/python-pycryptodomex.mk b/package/python-pycryptodomex/python-pycryptodomex.mk index 92780327a1..d752122550 100644 --- a/package/python-pycryptodomex/python-pycryptodomex.mk +++ b/package/python-pycryptodomex/python-pycryptodomex.mk @@ -4,7 +4,6 @@ # ################################################################################ -# Please keep in sync with package/python3-pycryptodomex/python3-pycryptodomex.mk PYTHON_PYCRYPTODOMEX_VERSION = 3.13.0 PYTHON_PYCRYPTODOMEX_SOURCE = pycryptodomex-$(PYTHON_PYCRYPTODOMEX_VERSION).tar.gz PYTHON_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/7a/21/f399ba8dfd6e40eee444151af3237af22788b8b16077c75ec0419125f619 diff --git a/package/python3-pycryptodomex/python3-pycryptodomex.hash b/package/python3-pycryptodomex/python3-pycryptodomex.hash deleted file mode 120000 index 0c6761d8a4..0000000000 --- a/package/python3-pycryptodomex/python3-pycryptodomex.hash +++ /dev/null @@ -1 +0,0 @@ -../python-pycryptodomex/python-pycryptodomex.hash \ No newline at end of file diff --git a/package/python3-pycryptodomex/python3-pycryptodomex.mk b/package/python3-pycryptodomex/python3-pycryptodomex.mk deleted file mode 100644 index 06a46cdf63..0000000000 --- a/package/python3-pycryptodomex/python3-pycryptodomex.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# python3-pycryptodomex -# -################################################################################ - -# Please keep in sync with package/python-pycryptodomex/python-pycryptodomex.mk -PYTHON3_PYCRYPTODOMEX_VERSION = 3.13.0 -PYTHON3_PYCRYPTODOMEX_SOURCE = pycryptodomex-$(PYTHON3_PYCRYPTODOMEX_VERSION).tar.gz -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) -PYTHON3_PYCRYPTODOMEX_LICENSE_FILES = LICENSE.rst Doc/LEGAL/COPYRIGHT.pycrypto -HOST_PYTHON3_PYCRYPTODOMEX_DL_SUBDIR = python-pycryptodomex -HOST_PYTHON3_PYCRYPTODOMEX_NEEDS_HOST_PYTHON = python3 - -$(eval $(host-python-package)) -- 2.20.1 From peter at korsgaard.com Fri Feb 11 08:17:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 09:17:27 +0100 Subject: [Buildroot] [PATCH 3/5] package/python3-pyelftools: drop host package In-Reply-To: <20220211081730.23068-1-peter@korsgaard.com> References: <20220211081730.23068-1-peter@korsgaard.com> Message-ID: <20220211081730.23068-3-peter@korsgaard.com> Now that host-python2 is gone, the custom python3 variant can be dropped. Signed-off-by: Peter Korsgaard --- boot/optee-os/optee-os.mk | 2 +- boot/uboot/uboot.mk | 2 +- package/python-pyelftools/python-pyelftools.mk | 1 - .../python3-pyelftools/python3-pyelftools.hash | 1 - .../python3-pyelftools/python3-pyelftools.mk | 17 ----------------- 5 files changed, 2 insertions(+), 21 deletions(-) delete mode 120000 package/python3-pyelftools/python3-pyelftools.hash delete mode 100644 package/python3-pyelftools/python3-pyelftools.mk diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk index 2884b48513..166b5e693c 100644 --- a/boot/optee-os/optee-os.mk +++ b/boot/optee-os/optee-os.mk @@ -21,7 +21,7 @@ else OPTEE_OS_SITE = $(call github,OP-TEE,optee_os,$(OPTEE_OS_VERSION)) endif -OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pycryptodomex host-python3-pyelftools +OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pycryptodomex host-python-pyelftools # On 64bit targets, OP-TEE OS can be built in 32bit mode, or # can be built in 64bit mode and support 32bit and 64bit diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 9e227fed91..9e569906ce 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -216,7 +216,7 @@ UBOOT_DEPENDENCIES += host-swig endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS),y) -UBOOT_DEPENDENCIES += host-python3-pyelftools +UBOOT_DEPENDENCIES += host-python-pyelftools endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSSL),y) diff --git a/package/python-pyelftools/python-pyelftools.mk b/package/python-pyelftools/python-pyelftools.mk index 3ae0a4ffc2..5bfdcd33ae 100644 --- a/package/python-pyelftools/python-pyelftools.mk +++ b/package/python-pyelftools/python-pyelftools.mk @@ -4,7 +4,6 @@ # ################################################################################ -# Please keep in sync with package/python3-pyelftools/python3-pyelftools.mk PYTHON_PYELFTOOLS_VERSION = 0.27 PYTHON_PYELFTOOLS_SOURCE = pyelftools-$(PYTHON_PYELFTOOLS_VERSION).tar.gz PYTHON_PYELFTOOLS_SITE = https://files.pythonhosted.org/packages/6b/b5/f7022f2d950327ba970ec85fb8f85c79244031092c129b6f34ab17514ae0 diff --git a/package/python3-pyelftools/python3-pyelftools.hash b/package/python3-pyelftools/python3-pyelftools.hash deleted file mode 120000 index e8eebeda9f..0000000000 --- a/package/python3-pyelftools/python3-pyelftools.hash +++ /dev/null @@ -1 +0,0 @@ -../python-pyelftools/python-pyelftools.hash \ No newline at end of file diff --git a/package/python3-pyelftools/python3-pyelftools.mk b/package/python3-pyelftools/python3-pyelftools.mk deleted file mode 100644 index 3d21d3040e..0000000000 --- a/package/python3-pyelftools/python3-pyelftools.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# python3-pyelftools -# -################################################################################ - -# Please keep in sync with package/python-pyelftools/python-pyelftools.mk -PYTHON3_PYELFTOOLS_VERSION = 0.27 -PYTHON3_PYELFTOOLS_SOURCE = pyelftools-$(PYTHON3_PYELFTOOLS_VERSION).tar.gz -PYTHON3_PYELFTOOLS_SITE = https://files.pythonhosted.org/packages/6b/b5/f7022f2d950327ba970ec85fb8f85c79244031092c129b6f34ab17514ae0 -PYTHON3_PYELFTOOLS_LICENSE = Public domain -PYTHON3_PYELFTOOLS_LICENSE_FILES = LICENSE -PYTHON3_PYELFTOOLS_SETUP_TYPE = setuptools -HOST_PYTHON3_PYELFTOOLS_DL_SUBDIR = python-pyelftools -HOST_PYTHON3_PYELFTOOLS_NEEDS_HOST_PYTHON = python3 - -$(eval $(host-python-package)) -- 2.20.1 From peter at korsgaard.com Fri Feb 11 08:17:29 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 09:17:29 +0100 Subject: [Buildroot] [PATCH 5/5] package/python3-six: drop host package In-Reply-To: <20220211081730.23068-1-peter@korsgaard.com> References: <20220211081730.23068-1-peter@korsgaard.com> Message-ID: <20220211081730.23068-5-peter@korsgaard.com> Now that host-python2 is gone, the custom python3 variant can be dropped. Signed-off-by: Peter Korsgaard --- package/gnuradio/gnuradio.mk | 2 +- package/python-six/python-six.mk | 1 - package/python3-six/python3-six.hash | 1 - package/python3-six/python3-six.mk | 17 ----------------- 4 files changed, 1 insertion(+), 20 deletions(-) delete mode 120000 package/python3-six/python3-six.hash delete mode 100644 package/python3-six/python3-six.mk diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index 417a51e067..49e3b95191 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -15,7 +15,7 @@ GNURADIO_SUPPORTS_IN_SOURCE_BUILD = NO GNURADIO_DEPENDENCIES = \ host-python3 \ host-python-mako \ - host-python3-six \ + host-python-six \ host-swig \ boost \ log4cpp \ diff --git a/package/python-six/python-six.mk b/package/python-six/python-six.mk index 41ef41d0ba..9e3e5fcf50 100644 --- a/package/python-six/python-six.mk +++ b/package/python-six/python-six.mk @@ -4,7 +4,6 @@ # ################################################################################ -# Please keep in sync with package/python3-six/python3-six.mk PYTHON_SIX_VERSION = 1.16.0 PYTHON_SIX_SOURCE = six-$(PYTHON_SIX_VERSION).tar.gz PYTHON_SIX_SITE = https://files.pythonhosted.org/packages/71/39/171f1c67cd00715f190ba0b100d606d440a28c93c7714febeca8b79af85e diff --git a/package/python3-six/python3-six.hash b/package/python3-six/python3-six.hash deleted file mode 120000 index ed8cb89a6b..0000000000 --- a/package/python3-six/python3-six.hash +++ /dev/null @@ -1 +0,0 @@ -../python-six/python-six.hash \ No newline at end of file diff --git a/package/python3-six/python3-six.mk b/package/python3-six/python3-six.mk deleted file mode 100644 index ee9dc818ee..0000000000 --- a/package/python3-six/python3-six.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# python3-six -# -################################################################################ - -# Please keep in sync with package/python-six/python-six.mk -PYTHON3_SIX_VERSION = 1.16.0 -PYTHON3_SIX_SOURCE = six-$(PYTHON3_SIX_VERSION).tar.gz -PYTHON3_SIX_SITE = https://files.pythonhosted.org/packages/71/39/171f1c67cd00715f190ba0b100d606d440a28c93c7714febeca8b79af85e -PYTHON3_SIX_SETUP_TYPE = setuptools -PYTHON3_SIX_LICENSE = MIT -PYTHON3_SIX_LICENSE_FILES = LICENSE -HOST_PYTHON3_SIX_DL_SUBDIR = python-six -HOST_PYTHON3_SIX_NEEDS_HOST_PYTHON = python3 - -$(eval $(host-python-package)) -- 2.20.1 From peter at korsgaard.com Fri Feb 11 09:10:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 10:10:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/go: security bump to 1.17.7 In-Reply-To: <20220210235906.23355-1-christian@paral.in> (Christian Stewart's message of "Thu, 10 Feb 2022 15:59:06 -0800") References: <20220210235906.23355-1-christian@paral.in> Message-ID: <877da1sr8x.fsf@dell.be.48ers.dk> >>>>> "Christian" == Christian Stewart writes: > go1.17.7 includes security fixes to the crypto/elliptic, math/big packages and > to the go command, as well as bug fixes to the compiler, linker, runtime, the go > command, and the debug/macho, debug/pe, and net/http/httptest packages. > https://github.com/golang/go/issues?q=milestone%3AGo1.17.7+label%3ACherryPickApproved > Signed-off-by: Christian Stewart Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 11 09:10:59 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 10:10:59 +0100 Subject: [Buildroot] [PATCH] docs/manual/adding-packages-generic: remove useless carriage return In-Reply-To: <20220211052629.2289507-1-giulio.benetti@benettiengineering.com> (Giulio Benetti's message of "Fri, 11 Feb 2022 06:26:29 +0100") References: <20220211052629.2289507-1-giulio.benetti@benettiengineering.com> Message-ID: <8735kpsr8c.fsf@dell.be.48ers.dk> >>>>> "Giulio" == Giulio Benetti writes: > Signed-off-by: Giulio Benetti Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 11 09:10:18 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 10:10:18 +0100 Subject: [Buildroot] [git commit] docs/manual/adding-packages-generic: remove useless carriage return Message-ID: <20220211090341.5189482DDC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a3529b8020a8c8b61d9eadc455f38ce892a7c6f3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- docs/manual/adding-packages-generic.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt index 8723da214a..fbe37f9ca9 100644 --- a/docs/manual/adding-packages-generic.txt +++ b/docs/manual/adding-packages-generic.txt @@ -316,8 +316,7 @@ not and can not work as people would expect it should: 13:45+01" see "man cvs" for further details). ** +git+ for retrieving source code from a Git repository. Used by default when +LIBFOO_SITE+ begins with +git://+. The downloaded - source code is cached as with the +svn+ - method. + source code is cached as with the +svn+ method. ** +hg+ for retrieving source code from a Mercurial repository. One 'must' specify +LIBFOO_SITE_METHOD=hg+ when +LIBFOO_SITE+ contains a Mercurial repository URL. The downloaded source code From peter at korsgaard.com Fri Feb 11 09:10:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 10:10:06 +0100 Subject: [Buildroot] [git commit] package/go: security bump to 1.17.7 Message-ID: <20220211090341.48977811FB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=362b2822eea66b0775d9eba94d22c85939d2c8c9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master go1.17.7 includes security fixes to the crypto/elliptic, math/big packages and to the go command, as well as bug fixes to the compiler, linker, runtime, the go command, and the debug/macho, debug/pe, and net/http/httptest packages. https://github.com/golang/go/issues?q=milestone%3AGo1.17.7+label%3ACherryPickApproved 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 9111c8c9aa..fdf342e602 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://golang.org/dl/ -sha256 4dc1bbf3ff61f0c1ff2b19355e6d88151a70126268a47c761477686ef94748c8 go1.17.6.src.tar.gz +sha256 c108cd33b73b1911a02b697741df3dea43e01a5c4e08e409e8b3a0e3745d2b4d go1.17.7.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 062bec378c..56a21dfe55 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.17.6 +GO_VERSION = 1.17.7 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From nealf at xilinx.com Fri Feb 11 09:36:47 2022 From: nealf at xilinx.com (Neal Frager) Date: Fri, 11 Feb 2022 09:36:47 +0000 Subject: [Buildroot] [PATCH v4 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <874k56wgqs.fsf@dell.be.48ers.dk> References: <20220210081932.3114763-1-neal.frager@xilinx.com> <874k56wgqs.fsf@dell.be.48ers.dk> Message-ID: Hi Peter, > +++ b/configs/zynqmp_zcu106_defconfig > @@ -1,34 +1,39 @@ > BR2_aarch64=y > -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_GIT=y > BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" > -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.15" > xlnx_rebase_v5.15 is a branch. A git version should point to a tag og a > sha1 so the build is reproducible. Ok. I will correct this for ATF, U-Boot and Linux. > I think I earlier asked you not to change the URL when it is not needed, please leave the existing /xilinx/ URL. Yes, we did discuss this earlier. But after thinking about it, don't you think the defconfigs will look cleaner if the URL is the same format for ATF, U-Boot and the Linux kernel? It is strictly a cosmetic thing. My preference would be for all 3 to be either "Xilinx" or "xilinx". Do you prefer uppercase or lowercase? Thank for your review and support. Best regards, Neal Frager Xilinx From peter at korsgaard.com Fri Feb 11 10:08:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 11:08:16 +0100 Subject: [Buildroot] [PATCH v4 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: (Neal Frager's message of "Fri, 11 Feb 2022 09:36:47 +0000") References: <20220210081932.3114763-1-neal.frager@xilinx.com> <874k56wgqs.fsf@dell.be.48ers.dk> Message-ID: <87y22hra0f.fsf@dell.be.48ers.dk> >>>>> "Neal" == Neal Frager writes: > Hi Peter, >> +++ b/configs/zynqmp_zcu106_defconfig > @@ -1,34 +1,39 @@ > >> BR2_aarch64=y > -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" >> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y >> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y >> +BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" >> BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" >> BR2_LINUX_KERNEL=y >> BR2_LINUX_KERNEL_CUSTOM_GIT=y >> BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" >> -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" >> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.15" >> xlnx_rebase_v5.15 is a branch. A git version should point to a tag og a >> sha1 so the build is reproducible. > Ok. I will correct this for ATF, U-Boot and Linux. Good! >> I think I earlier asked you not to change the URL when it is not needed, please leave the existing /xilinx/ URL. > Yes, we did discuss this earlier. But after thinking about it, don't > you think the defconfigs will look cleaner if the URL is the same > format for ATF, U-Boot and the Linux kernel? > It is strictly a cosmetic thing. My preference would be for all 3 to > be either "Xilinx" or "xilinx". Do you prefer uppercase or lowercase? Ahh yes, agreed. The "official" URLs on Github seems to use Xilinx, so perhaps that is the best approach. -- Bye, Peter Korsgaard From nealf at xilinx.com Fri Feb 11 10:37:38 2022 From: nealf at xilinx.com (Neal Frager) Date: Fri, 11 Feb 2022 10:37:38 +0000 Subject: [Buildroot] [PATCH 1/2] configs/zynqmp_zcu106: Bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <1f0c37e0-6d9e-97d7-0421-58228d52405b@lucaceresoli.net> References: <20220208071559.2862411-1-neal.frager@xilinx.com> <69efa9da-ae55-6795-8724-ed7105083924@benettiengineering.com> <32cc1c12-1496-7db9-5e32-1b99404a4fe3@benettiengineering.com> <690d8e1b-fb6d-7c36-b07f-4ed9ca61b768@lucaceresoli.net> <489a02df-4f2b-a46c-aa49-15c3c545f8f2@lucaceresoli.net> <1EC54279-220E-4043-AFBA-953D2CF5E54A@xilinx.com> <1f0c37e0-6d9e-97d7-0421-58228d52405b@lucaceresoli.net> Message-ID: Hi Luca, I used Vitis 2021.2 to generate the pm_cfg_obj.c automatically for the zcu102 and zcu106 boards. You are correct that the files are not completely identical, so I will make sure to use the Vitis generated files in each case. board/zynqmp/zcu102/pm_cfg_obj.c board/zynqmp/zcu106/pm_cfg_obj.c For reference, there are 3 differences between the two boards when it comes to the pm_cfg_obj.c file: 1. zcu102 has pcie and zcu106 does not. 2. zcu106 has vcu and zcu102 does not. 3. zcu102 pmu uses gpio1.2 and zcu106 does not. While the two boards are similar enough to run from the same pm_cfg_obj, if these 3 features are not used, I agree that it is best to use the Vitis generated pm_cfg_obj.c files in each case. That is what I will use for these files in the next patch release. Thank you for catching this! Best regards, Neal Frager Xilinx From kieran.bingham at ideasonboard.com Fri Feb 11 11:22:45 2022 From: kieran.bingham at ideasonboard.com (Kieran Bingham) Date: Fri, 11 Feb 2022 11:22:45 +0000 Subject: [Buildroot] [PATCH] package/libcamera bump to 1966b9a58436fab51f8270aad6a228b935e4fac4 Message-ID: <20220211112245.1357817-1-kieran.bingham@ideasonboard.com> Update to the latest libcamera commit. This incorporates fixes and improvements for Raspberry Pi which will be needed to go along side the new libcamera-apps package. Signed-off-by: Kieran Bingham --- package/libcamera/libcamera.hash | 2 +- package/libcamera/libcamera.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libcamera/libcamera.hash b/package/libcamera/libcamera.hash index a7ca27a96b7f..8d5abf0e621c 100644 --- a/package/libcamera/libcamera.hash +++ b/package/libcamera/libcamera.hash @@ -1,4 +1,4 @@ -sha256 305e6f458d2bf3d4b697ffe33e104b696db6b1492bb5422e2cce1937e58516f1 libcamera-40f5fddca7f774944a53f58eeaebc4db79c373d8-br1.tar.gz +sha256 3624c71ba492c602c5335aab3dc87798193f7596c6cc75f7cfb847165f180930 libcamera-1966b9a58436fab51f8270aad6a228b935e4fac4-br1.tar.gz # license files sha256 fd38b2c053c0cce46d9c5ef3545a6e34d157a240ba99c9b8dca5d37a8147da6c LICENSES/BSD-2-Clause.txt diff --git a/package/libcamera/libcamera.mk b/package/libcamera/libcamera.mk index 534d8d26371f..cf1af5aaf065 100644 --- a/package/libcamera/libcamera.mk +++ b/package/libcamera/libcamera.mk @@ -5,7 +5,7 @@ ################################################################################ LIBCAMERA_SITE = https://git.linuxtv.org/libcamera.git -LIBCAMERA_VERSION = 40f5fddca7f774944a53f58eeaebc4db79c373d8 +LIBCAMERA_VERSION = 1966b9a58436fab51f8270aad6a228b935e4fac4 LIBCAMERA_SITE_METHOD = git LIBCAMERA_DEPENDENCIES = \ host-openssl \ -- 2.32.0 From wbx at openadk.org Fri Feb 11 11:56:06 2022 From: wbx at openadk.org (Waldemar Brodkorb) Date: Fri, 11 Feb 2022 12:56:06 +0100 Subject: [Buildroot] [git commit] package/lzip: bump to version 1.23 In-Reply-To: <20220210213036.F2A0582DFF@busybox.osuosl.org> References: <20220210213036.F2A0582DFF@busybox.osuosl.org> Message-ID: Hi Peter, Peter Korsgaard wrote, > commit: https://git.buildroot.net/buildroot/commit/?id=4648090a89a2478a4b0fa8cc43a49bc94668622c > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > > https://lists.nongnu.org/archive/html/lzip-bug/2022-02/msg00000.html > > Signed-off-by: Fabrice Fontaine > Signed-off-by: Peter Korsgaard > --- > package/lzip/lzip.hash | 4 ++-- > package/lzip/lzip.mk | 3 ++- > 2 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/package/lzip/lzip.hash b/package/lzip/lzip.hash > index 57e7eb43f4..5e285a5ad8 100644 > --- a/package/lzip/lzip.hash > +++ b/package/lzip/lzip.hash > @@ -1,4 +1,4 @@ > -# From https://lists.nongnu.org/archive/html/lzip-bug/2021-01/msg00008.html > -sha256 c3342d42e67139c165b8b128d033b5c96893a13ac5f25933190315214e87a948 lzip-1.22.tar.gz > +# From https://lists.nongnu.org/archive/html/lzip-bug/2022-02/msg00000.html > +sha256 ea02b9e6fb25d0e1a1d3ef4fdeb6ab26b931f1ece66fa1cee2983c95215e930a lzip-1.23.tar.lz > # Locally calculated > sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef COPYING > diff --git a/package/lzip/lzip.mk b/package/lzip/lzip.mk > index cca6da07d0..e3cc86b956 100644 > --- a/package/lzip/lzip.mk > +++ b/package/lzip/lzip.mk > @@ -4,7 +4,8 @@ > # > ################################################################################ > > -LZIP_VERSION = 1.22 > +LZIP_VERSION = 1.23 > +LZIP_SOURCE = lzip-$(LZIP_VERSION).tar.lz ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ This seems to break the build for at least snps_archs38_hsdk_defconfig, when no lzip is installed on the host. Kind of chicken-egg problem. https://pastebin.com/cyt1UsuG best regards Waldemar From neal.frager at xilinx.com Fri Feb 11 12:17:39 2022 From: neal.frager at xilinx.com (Neal Frager) Date: Fri, 11 Feb 2022 05:17:39 -0700 Subject: [Buildroot] [PATCH v5 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 Message-ID: <20220211121740.1257919-1-neal.frager@xilinx.com> This patch: - bumps ATF to Xilinx v2.6: mainline v2.6 requires patch to build - bumps U-Boot to Xilinx 2022.01: important drivers not in mainline - bumps Linux to Xilinx 5.15: important drivers not in mainline - deletes board/zynqmp/patches directory: patches already in mainline - modifies board/zynqmp/genimage.cfg: U-Boot 2022.01 uses u-boot.itb format - adds extlinux.conf to vfat bootfs - modifies U-Boot to unified xilinx_zynqmp_virt_defconfig (supports all boards) - adds support for SPL pm_cfg_obj.c loading to PMU firmware - enables support for host machines without OpenSSL required by U-Boot and Linux Signed-off-by: Neal Frager Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti [Giulio: only build tested] --- V1->V2: * fixed general build issues * added extlinux.conf for run-time boot issue V2->V3: * enabled support for host machines without OpenSSL required by U-Boot and Linux * moved readme.txt update to zynqmp_zcu102_defconfig patch 2/2 V3->V4: * cleaned up commit log messages * added version history V4->V5: * switched to sha1 urls to make ATF, U-Boot and Linux builds reproducible * generated board specific pm_cfg_obj.c files with vitis 2021.2 --- --- board/zynqmp/extlinux.conf | 5 + board/zynqmp/genimage.cfg | 6 +- ...-fix-Remove-GGC-ignore-Warray-bounds.patch | 68 --- ...64-zynqmp-zcu106-fix-SPL-MMC-booting.patch | 52 -- ...2-arm64-zynqmp-Enable-booting-to-ATF.patch | 114 ---- ...ept-an-absolute-path-for-PMUFW_INIT_.patch | 68 --- ...ynqmp-pass-the-PS-init-file-as-a-kco.patch | 175 ------ board/zynqmp/post-build.sh | 8 + board/zynqmp/post-image.sh | 4 +- board/zynqmp/zcu106/pm_cfg_obj.c | 565 ++++++++++++++++++ configs/zynqmp_zcu106_defconfig | 23 +- 11 files changed, 599 insertions(+), 489 deletions(-) create mode 100644 board/zynqmp/extlinux.conf delete mode 100644 board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch delete mode 100644 board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch delete mode 100644 board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch delete mode 100644 board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch delete mode 100644 board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch create mode 100755 board/zynqmp/post-build.sh create mode 100644 board/zynqmp/zcu106/pm_cfg_obj.c diff --git a/board/zynqmp/extlinux.conf b/board/zynqmp/extlinux.conf new file mode 100644 index 0000000000..ae3ec8614a --- /dev/null +++ b/board/zynqmp/extlinux.conf @@ -0,0 +1,5 @@ +label linux + kernel /Image + devicetree /system.dtb + append console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait + diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg index ed202f4550..20d8352c08 100644 --- a/board/zynqmp/genimage.cfg +++ b/board/zynqmp/genimage.cfg @@ -2,11 +2,13 @@ image boot.vfat { vfat { files = { "boot.bin", - "u-boot.bin", - "atf-uboot.ub", + "u-boot.itb", "system.dtb", "Image" } + file extlinux/extlinux.conf { + image = extlinux.conf + } } size = 32M diff --git a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch b/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch deleted file mode 100644 index 0c1a9ba2a4..0000000000 --- a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch +++ /dev/null @@ -1,68 +0,0 @@ -From da003e6ada7d0217fe99dc7c649a731f8ebd3c34 Mon Sep 17 00:00:00 2001 -From: Deepika Bhavnani -Date: Thu, 15 Aug 2019 00:56:46 +0300 -Subject: [PATCH] Coverity fix: Remove GGC ignore -Warray-bounds - -GCC diagnostics were added to ignore array boundaries, instead -of ignoring GCC warning current code will check for array boundaries -and perform and array update only for valid elements. - -Resolves: `CID 246574` `CID 246710` `CID 246651` - -Signed-off-by: Deepika Bhavnani -Change-Id: I7530ecf7a1707351c6ee87e90cc3d33574088f57 - -Backported from: 41af05154abe136938bcfb5f26c969933784bbef -[Adapted to apply on 1.5] - ---- - lib/psci/psci_common.c | 20 ++++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) - -diff --git a/lib/psci/psci_common.c b/lib/psci/psci_common.c -index 2220a745cd6e..6282d992a2f0 100644 ---- a/lib/psci/psci_common.c -+++ b/lib/psci/psci_common.c -@@ -188,21 +188,17 @@ static unsigned int get_power_on_target_pwrlvl(void) - /****************************************************************************** - * Helper function to update the requested local power state array. This array - * does not store the requested state for the CPU power level. Hence an -- * assertion is added to prevent us from accessing the wrong index. -+ * assertion is added to prevent us from accessing the CPU power level. - *****************************************************************************/ - static void psci_set_req_local_pwr_state(unsigned int pwrlvl, - unsigned int cpu_idx, - plat_local_state_t req_pwr_state) - { -- /* -- * This should never happen, we have this here to avoid -- * "array subscript is above array bounds" errors in GCC. -- */ - assert(pwrlvl > PSCI_CPU_PWR_LVL); --#pragma GCC diagnostic push --#pragma GCC diagnostic ignored "-Warray-bounds" -- psci_req_local_pwr_states[pwrlvl - 1][cpu_idx] = req_pwr_state; --#pragma GCC diagnostic pop -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && -+ (cpu_idx < PLATFORM_CORE_COUNT)) { -+ psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx] = req_pwr_state; -+ } - } - - /****************************************************************************** -@@ -228,7 +224,11 @@ static plat_local_state_t *psci_get_req_local_pwr_states(unsigned int pwrlvl, - { - assert(pwrlvl > PSCI_CPU_PWR_LVL); - -- return &psci_req_local_pwr_states[pwrlvl - 1][cpu_idx]; -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && -+ (cpu_idx < PLATFORM_CORE_COUNT)) { -+ return &psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx]; -+ } else -+ return NULL; - } - - /* --- -2.34.0 - diff --git a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch b/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch deleted file mode 100644 index 4d85e1bb12..0000000000 --- a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch +++ /dev/null @@ -1,52 +0,0 @@ -From e5d72ed8339eb05285448aad3c89d21e4d18fd29 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Mon, 26 Feb 2018 09:40:34 +0100 -Subject: [PATCH] arm64: zynqmp: zcu106: fix SPL MMC booting - -The U-Boot SPL generated with the current zcu106 defconfig cannot boot -from MMC: - - [...] - U-Boot SPL 2018.01 (Feb 21 2018 - 17:47:14) - EL Level: EL3 - Trying to boot from MMC1 - sdhci_transfer_data: Error detected in status(0x408020)! - spl_load_image_fat_os: error reading image u-boot.bin, err - -2 - spl_load_image_fat: error reading image u-boot.img, err - -6 - SPL: failed to boot from all boot devices - ### ERROR ### Please RESET the board ### - -Fix by lowering the rpll value. The new value for the RPLL_CTRL -register comes from the current psu_init_gpl.c from the HDF file at -https://github.com/xilinx/hdf-examples/tree/01ad8ea5fd1989abf4ea5a072d019a16cb2bc546/zcu106-zynqmp -(generated by Vivado v2017.4). - -RPLL and sdio1_ref clocks before and after this change: - - - Old values: RPLL 1.36 GHz, sdio1_ref 272 MHz - - New values: RPLL 1.16 GHz, sdio1_ref 233 MHz - -Signed-off-by: Luca Ceresoli -Cc: Michal Simek -Upstream-status: accepted upstream in a different form ---- - - board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -index 4d18abe000ca..e6fa477e53e7 100644 ---- a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -+++ b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -@@ -10,7 +10,7 @@ - static unsigned long psu_pll_init_data(void) - { - psu_mask_write(0xFF5E0034, 0xFE7FEDEFU, 0x7E4E2C62U); -- psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00013C00U); -+ psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00014600U); - psu_mask_write(0xFF5E0030, 0x00000008U, 0x00000008U); - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000001U); - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000000U); --- -2.7.4 - diff --git a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch b/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch deleted file mode 100644 index 487fff6812..0000000000 --- a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 5e3cac50cc981e01d9072241035a8d4162560c71 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Mon, 12 Mar 2018 17:18:38 +0100 -Subject: [PATCH] arm64: zynqmp: Enable booting to ATF - -U-Boot is now able to boot to ARM Trusted Firmware (ATF). The boot -flow is SPL(EL3) loads ATF and full u-boot and jump to ATF(EL3) which -pass control to full u-boot(EL2). This has been tested on zcu106, so -enable it in this defconfig. - -To generate an image that triggers this booting flow, you need to pass -'-O arm-trusted-firmware' to mkimage. - -Signed-off-by: Luca Ceresoli -Signed-off-by: Michal Simek -Backported from upstream: http://git.denx.de/?p=u-boot.git;a=commit;h=5e3cac50cc981e01d9072241035a8d4162560c71 ---- - - configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 + - configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 + - configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 + - configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 + - configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 1 + - configs/xilinx_zynqmp_zcu102_revA_defconfig | 1 + - configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 + - 7 files changed, 7 insertions(+) - -diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig -index c5bfa2b12638..488c72258b0e 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig -index f86dce403a42..5d501eec0edd 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig -@@ -20,6 +20,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig -index 6e947cf56827..6f7eaebd7676 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig -@@ -16,6 +16,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_CMD_MEMTEST=y - CONFIG_SYS_ALT_MEMTEST=y -diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig -index 1c934858c61c..7a3806cba4b5 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig -@@ -17,6 +17,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_CMD_MEMTEST=y - CONFIG_SYS_ALT_MEMTEST=y -diff --git a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig -index e13c7c56f310..e4408f182ca0 100644 ---- a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig -+++ b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig b/configs/xilinx_zynqmp_zcu102_revA_defconfig -index 5b2cd495ee85..b52f6789fd4b 100644 ---- a/configs/xilinx_zynqmp_zcu102_revA_defconfig -+++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig -index e6530fbfe7ff..80592554f682 100644 ---- a/configs/xilinx_zynqmp_zcu102_revB_defconfig -+++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y --- -2.7.4 - diff --git a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch b/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch deleted file mode 100644 index 95ab7b3b75..0000000000 --- a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch +++ /dev/null @@ -1,68 +0,0 @@ -From c7df098a71e05dc81cee818747759e8060b59626 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Mon, 4 Jun 2018 12:21:01 +0200 -Subject: [PATCH] arm64: zynqmp: accept an absolute path for PMUFW_INIT_FILE - -The value of PMUFW_INIT_FILE is prefixed with "$(srctree)/", thus -forcing it to be a relative path inside the U-Boot source tree. Since -the PMUFW is a binary file generated outside of U-Boot, the PMUFW -binary must be copied inside the U-Boot source tree before the -build. - -This generates a few problems: - - * if the source tree is shared among different out-of-tree builds, - they will pollute (and potentially corrupt) each other - * the source tree cannot be read-only - * any buildsystem must add a command to copy the PMUFW binary - * putting an externally-generated binary in the source tree is ugly - as hell - -Avoid these problems by accepting an absolute path for -PMUFW_INIT_FILE. This would be as simple as removing the "$(srctree)/" -prefix, but in order to keep backward compatibility we rather use the -shell and readlink to get the absolute path even when starting from a -relative path. - -Since 'readlink -f' produces an empty string if the file does not -exist, we also add a check to ensure the file configured in -PMUFW_INIT_FILE exists. Otherwise the build would exit successfully, -but produce a boot.bin without PMUFW as if PMUFW_INIT_FILE were empty. - -Tested in the 12 possible combinations of: - - PMUFW_INIT_FILE empty, relative, absolute, non-existing - - building in-tree, in subdir, in other directory - -Signed-off-by: Luca Ceresoli -Cc: Michal Simek -Cc: Simon Glass -Cc: Emmanuel Vadot -Signed-off-by: Michal Simek -Backported from upstream: https://git.denx.de/?p=u-boot.git;a=commit;h=c7df098a71e05dc81cee818747759e8060b59626 ---- - scripts/Makefile.spl | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl -index ef018b5b4056..252f13826d4c 100644 ---- a/scripts/Makefile.spl -+++ b/scripts/Makefile.spl -@@ -167,8 +167,14 @@ ifdef CONFIG_ARCH_ZYNQ - MKIMAGEFLAGS_boot.bin = -T zynqimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) - endif - ifdef CONFIG_ARCH_ZYNQMP -+ifneq ($(CONFIG_PMUFW_INIT_FILE),"") -+spl/boot.bin: zynqmp-check-pmufw -+zynqmp-check-pmufw: FORCE -+ ( cd $(srctree) && test -r $(CONFIG_PMUFW_INIT_FILE) ) \ -+ || ( echo "Cannot read $(CONFIG_PMUFW_INIT_FILE)" && false ) -+endif - MKIMAGEFLAGS_boot.bin = -T zynqmpimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) \ -- -n $(srctree)/$(CONFIG_PMUFW_INIT_FILE) -+ -n "$(shell cd $(srctree); readlink -f $(CONFIG_PMUFW_INIT_FILE))" - endif - - spl/boot.bin: $(obj)/u-boot-spl.bin FORCE --- -2.7.4 - diff --git a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch b/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch deleted file mode 100644 index b32e162780..0000000000 --- a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch +++ /dev/null @@ -1,175 +0,0 @@ -From 4c9d54ab5a41d65000c8d249b6fb1b76056f1812 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Wed, 20 Jun 2018 12:11:50 +0200 -Subject: [PATCH] arm/arm64: zynq/zynqmp: pass the PS init file as a kconfig - variable - -U-Boot needs to link ps7_init_gpl.c on Zynq or psu_init_gpl.c on -ZynqMP (PS init for short). The current logic to locate this file for -both platforms is: - - 1. if a board-specific file exists in - board/xilinx/zynq[mp]/$(CONFIG_DEFAULT_DEVICE_TREE)/ps?_init_gpl.c - then use it - 2. otherwise use board/xilinx/zynq/ps?_init_gpl.c - -In the latter case the file does not exist in the U-Boot sources and -must be copied in the source tree from the outside before starting the -build. This is typical when it is generated from Xilinx tools while -developing a custom hardware. However making sure that a -board-specific file is _not_ found (and used) requires some trickery -such as removing or overwriting all PS init files (e.g.: the current -meta-xilinx yocto layer [0]). - -This generates a few problems: - - * if the source tree is shared among different out-of-tree builds, - they will pollute (and potentially corrupt) each other - * the source tree cannot be read-only - * any buildsystem must add a command to copy the PS init file binary - * overwriting or deleting files in the source tree is ugly as hell - -Simplify usage by allowing to pass the path to the desired PS init -file in kconfig variable XILINX_PS_INIT_FILE. It can be an absolute -path or relative to $(srctree). If the variable is set, the -user-specified file will always be used without being copied -around. If the the variable is left empty, for backward compatibility -fall back to the old behaviour. - -Since the issue is the same for Zynq and ZynqMP, add one kconfig -variable in a common place and use it for both. - -Also use the new kconfig help text to document all the ways to give -U-Boot the PS init file. - -Build-tested with all combinations of: - - platform: zynq or zynqmp - - PS init file: from XILINX_PS_INIT_FILE (absolute, relative path, - non-existing), in-tree board-specific, in board/xilinx/zynq[mp]/ - - building in-tree, in subdir, in other directory - -[0] https://github.com/Xilinx/meta-xilinx/blob/b2f74cc7fe5c4881589d5e440a17cb51fc66a7ab/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init.inc#L9 - -Signed-off-by: Luca Ceresoli -Cc: Albert Aribaud -Cc: Michal Simek -Cc: Nathan Rossi -Backported from upstream: https://git.denx.de/?p=u-boot.git;a=commit;h=6da4f67ad09cd8b311d77b2b04e557b7ef65b56c ---- - arch/arm/Kconfig | 1 + - board/xilinx/Kconfig | 41 +++++++++++++++++++++++++++++++++++++++++ - board/xilinx/zynq/Makefile | 10 +++++++++- - board/xilinx/zynqmp/Makefile | 10 +++++++++- - 4 files changed, 60 insertions(+), 2 deletions(-) - create mode 100644 board/xilinx/Kconfig - -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 22234cde2ab6..e04979d0ef7e 100644 ---- a/arch/arm/Kconfig -+++ b/arch/arm/Kconfig -@@ -1293,4 +1293,5 @@ source "board/technologic/ts4600/Kconfig" - source "board/vscom/baltos/Kconfig" - source "board/woodburn/Kconfig" - source "board/work-microwave/work_92105/Kconfig" -+source "board/xilinx/Kconfig" - source "board/zipitz2/Kconfig" - - source "arch/arm/Kconfig.debug" -diff --git a/board/xilinx/Kconfig b/board/xilinx/Kconfig -new file mode 100644 -index 000000000000..aa3fa061edef ---- /dev/null -+++ b/board/xilinx/Kconfig -@@ -0,0 +1,41 @@ -+# Copyright (c) 2018, Luca Ceresoli -+# -+# SPDX-License-Identifier: GPL-2.0 -+ -+if ARCH_ZYNQ || ARCH_ZYNQMP -+ -+config XILINX_PS_INIT_FILE -+ string "Zynq/ZynqMP PS init file(s) location" -+ help -+ On Zynq and ZynqMP U-Boot SPL (or U-Boot proper if -+ ZYNQMP_PSU_INIT_ENABLED is set) is responsible for some -+ basic initializations, such as enabling peripherals and -+ configuring pinmuxes. The PS init file (called -+ psu_init_gpl.c on ZynqMP, ps7_init_gpl.c for Zynq-7000) -+ contains the code for such initializations. -+ -+ U-Boot contains PS init files for some boards, but each of -+ them describes only one specific configuration. Users of a -+ different board, or needing a different configuration, can -+ generate custom files using the Xilinx development tools. -+ -+ There are three ways to give a PS init file to U-Boot: -+ -+ 1. Set this variable to the path, either relative to the -+ source tree or absolute, where the psu_init_gpl.c or -+ ps7_init_gpl.c file is located. U-Boot will build this -+ file. -+ -+ 2. If you leave an empty string here, U-Boot will use -+ board/xilinx/zynq/$(CONFIG_DEFAULT_DEVICE_TREE)/ps7_init_gpl.c -+ for Zynq-7000, or -+ board/xilinx/zynqmp/$(CONFIG_DEFAULT_DEVICE_TREE)/psu_init_gpl.c -+ for ZynqMP. -+ -+ 3. If the above file does not exist, U-Boot will use -+ board/xilinx/zynq/ps7_init_gpl.c for Zynq-7000, or -+ board/xilinx/zynqmp/psu_init_gpl.c for ZynqMP. This file -+ is not provided by U-Boot, you have to copy it there -+ before the build. -+ -+endif -diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile -index 5a76a26720cd..03ad5f0532ee 100644 ---- a/board/xilinx/zynq/Makefile -+++ b/board/xilinx/zynq/Makefile -@@ -5,10 +5,18 @@ - - obj-y := board.o - --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE)) -+init-objs := ps_init_gpl.o -+spl/board/xilinx/zynq/ps_init_gpl.o board/xilinx/zynq/ps_init_gpl.o: $(PS_INIT_FILE) -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ -+endif - -+ifeq ($(init-objs),) -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/ps7_init_gpl.c),\ - $(hw-platform-y)/ps7_init_gpl.o) -+endif - - ifeq ($(init-objs),) - ifneq ($(wildcard $(srctree)/$(src)/ps7_init_gpl.c),) -diff --git a/board/xilinx/zynqmp/Makefile b/board/xilinx/zynqmp/Makefile -index 05ccd25dcef3..960b81fc5853 100644 ---- a/board/xilinx/zynqmp/Makefile -+++ b/board/xilinx/zynqmp/Makefile -@@ -5,10 +5,18 @@ - - obj-y := zynqmp.o - --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE)) -+init-objs := ps_init_gpl.o -+spl/board/xilinx/zynqmp/ps_init_gpl.o board/xilinx/zynqmp/ps_init_gpl.o: $(PS_INIT_FILE) -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ -+endif - -+ifeq ($(init-objs),) -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/psu_init_gpl.c),\ - $(hw-platform-y)/psu_init_gpl.o) -+endif - - ifeq ($(init-objs),) - ifneq ($(wildcard $(srctree)/$(src)/psu_init_gpl.c),) --- -2.7.4 - diff --git a/board/zynqmp/post-build.sh b/board/zynqmp/post-build.sh new file mode 100755 index 0000000000..9fd8bbf2c8 --- /dev/null +++ b/board/zynqmp/post-build.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +# genimage will need to find the extlinux.conf +# in the binaries directory + +BOARD_DIR="$(dirname $0)" + +install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux.conf diff --git a/board/zynqmp/post-image.sh b/board/zynqmp/post-image.sh index b2b99fed01..ed6dbe188c 100755 --- a/board/zynqmp/post-image.sh +++ b/board/zynqmp/post-image.sh @@ -10,4 +10,6 @@ FIRST_DT=$(sed -nr \ [ -z "${FIRST_DT}" ] || ln -fs ${FIRST_DT}.dtb ${BINARIES_DIR}/system.dtb -support/scripts/genimage.sh -c board/zynqmp/genimage.cfg +BOARD_DIR="$(dirname $0)" + +support/scripts/genimage.sh -c $BOARD_DIR/genimage.cfg diff --git a/board/zynqmp/zcu106/pm_cfg_obj.c b/board/zynqmp/zcu106/pm_cfg_obj.c new file mode 100644 index 0000000000..fd4f2d3304 --- /dev/null +++ b/board/zynqmp/zcu106/pm_cfg_obj.c @@ -0,0 +1,565 @@ +/****************************************************************************** +* Copyright (c) 2017 - 2021 Xilinx, Inc. All rights reserved. +* SPDX-License-Identifier: MIT +******************************************************************************/ + +#include "xil_types.h" +#include "pm_defs.h" + +#define PM_CONFIG_MASTER_SECTION_ID 0x101U +#define PM_CONFIG_SLAVE_SECTION_ID 0x102U +#define PM_CONFIG_PREALLOC_SECTION_ID 0x103U +#define PM_CONFIG_POWER_SECTION_ID 0x104U +#define PM_CONFIG_RESET_SECTION_ID 0x105U +#define PM_CONFIG_SHUTDOWN_SECTION_ID 0x106U +#define PM_CONFIG_SET_CONFIG_SECTION_ID 0x107U +#define PM_CONFIG_GPO_SECTION_ID 0x108U + +#define PM_SLAVE_FLAG_IS_SHAREABLE 0x1U +#define PM_MASTER_USING_SLAVE_MASK 0x2U + +#define PM_CONFIG_GPO1_MIO_PIN_34_MAP (1U << 10U) +#define PM_CONFIG_GPO1_MIO_PIN_35_MAP (1U << 11U) +#define PM_CONFIG_GPO1_MIO_PIN_36_MAP (1U << 12U) +#define PM_CONFIG_GPO1_MIO_PIN_37_MAP (1U << 13U) + +#define PM_CONFIG_GPO1_BIT_2_MASK (1U << 2U) +#define PM_CONFIG_GPO1_BIT_3_MASK (1U << 3U) +#define PM_CONFIG_GPO1_BIT_4_MASK (1U << 4U) +#define PM_CONFIG_GPO1_BIT_5_MASK (1U << 5U) + +#define SUSPEND_TIMEOUT 0xFFFFFFFFU + +#define PM_CONFIG_OBJECT_TYPE_BASE 0x1U + + +#define PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK 0x00000001 +#define PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK 0x00000100 +#define PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK 0x00000200 + + + +#if defined (__ICCARM__) +#pragma language=save +#pragma language=extended +#endif +#if defined (__GNUC__) + const u32 XPm_ConfigObject[] __attribute__((used, section(".sys_cfg_data"))) = +#elif defined (__ICCARM__) +#pragma location = ".sys_cfg_data" +__root const u32 XPm_ConfigObject[] = +#endif +{ + /**********************************************************************/ + /* HEADER */ + 2, /* Number of remaining words in the header */ + 8, /* Number of sections included in config object */ + PM_CONFIG_OBJECT_TYPE_BASE, /* Type of config object as base */ + /**********************************************************************/ + /* MASTER SECTION */ + PM_CONFIG_MASTER_SECTION_ID, /* Master SectionID */ + 3U, /* No. of Masters*/ + + NODE_APU, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_0, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_1, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Wake permissions */ + + + /**********************************************************************/ + /* SLAVE SECTION */ + + + PM_CONFIG_SLAVE_SECTION_ID, /* Section ID */ + 49, /* Number of slaves */ + + NODE_OCM_BANK_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TCM_0_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_0_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_1_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TCM_1_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_L2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU_PP_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU_PP_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_USB_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_USB_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_TTC_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SATA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_ETH_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_UART_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_UART_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SPI_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_SPI_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_I2C_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_I2C_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SD_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_SD_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_DP, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GDMA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_ADMA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_NAND, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_QSPI, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPIO, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_CAN_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_CAN_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_EXTERN, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_DDR, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_IPI_APU, + 0U, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_0, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_1, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_PCIE, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_PCAP, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_RTC, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_VCU, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_PL, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + + /**********************************************************************/ + /* PREALLOC SECTION */ + + PM_CONFIG_PREALLOC_SECTION_ID, /* Preallaoc SectionID */ + 3U, /* No. of Masters*/ + +/* Prealloc for psu_cortexa53_0 */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, + 12, + NODE_DDR, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_L2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_3, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_SD_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_QSPI, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_PL, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_APU, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_0 */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + 3, + NODE_TCM_0_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_0_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_1 */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + 3, + NODE_TCM_1_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_1_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + + /**********************************************************************/ + /* POWER SECTION */ + + PM_CONFIG_POWER_SECTION_ID, /* Power Section ID */ + 4U, /* Number of power nodes */ + + NODE_APU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_RPU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_FPD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_PLD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + + /**********************************************************************/ + /* RESET SECTION */ + + PM_CONFIG_RESET_SECTION_ID, /* Reset Section ID */ + 120U, /* Number of resets */ + + XILPM_RESET_PCIE_CFG, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_BRIDGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_CTRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRF, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GDMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SATA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APU_L2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DDR, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SOFT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_QSPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_NAND, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ADMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOU_CC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TIMESTAMP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R50, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R51, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_AMBA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_OCM, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_PGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RTC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SYSMON, 0, + XILPM_RESET_AFI_FM6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_LPD_SWDT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_FPD, PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + XILPM_RESET_RPU_DBG1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_DBG0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_VPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_7, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_8, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_9, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_10, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_11, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_12, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_13, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_14, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_15, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_16, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_17, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_18, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_19, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_20, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_21, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_22, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_23, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_24, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_25, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_26, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_27, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_28, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_29, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_30, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_31, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_LS, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PS_ONLY, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_92, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_93, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_94, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_95, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + + /**********************************************************************/ + /* SET CONFIG SECTION */ + PM_CONFIG_SET_CONFIG_SECTION_ID, /* Set Config Section ID */ + 0U, /* Permissions to load base config object */ + 0U, /* Permissions to load overlay config object */ + + /**********************************************************************/ + /* SHUTDOWN SECTION */ + + PM_CONFIG_SHUTDOWN_SECTION_ID, /* Shutdown Section ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* System Shutdown/Restart Permission */ + + /**********************************************************************/ + /* GPO SECTION */ + PM_CONFIG_GPO_SECTION_ID, /* GPO Section ID */ + PM_CONFIG_GPO1_MIO_PIN_34_MAP | + PM_CONFIG_GPO1_MIO_PIN_35_MAP | + PM_CONFIG_GPO1_MIO_PIN_36_MAP | + PM_CONFIG_GPO1_MIO_PIN_37_MAP | + 0, /* State of GPO pins */ +}; +#if defined (__ICCARM__) +#pragma language=restore +#endif + diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index bee7c1daf7..4910252f78 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -1,34 +1,39 @@ BR2_aarch64=y -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="966124532656bc95d781abf57531e4cd4f962237" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="e678d5ddc475f34dea8f5004fb6ebde118621784" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA" +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="667001319cbe511ce6353195fb4910ae5cb041ce" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/53fdb7b6c92860ceb0ec5fd14deee302f4a84269/bin/pmufw-zcu106-default-v2017.4.bin" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/v2021.2/bin/pmufw-v2021.2.bin" +BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/zcu106/pm_cfg_obj.c" +BR2_TARGET_UBOOT_FORMAT_ITB=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -- 2.17.1 From neal.frager at xilinx.com Fri Feb 11 12:17:40 2022 From: neal.frager at xilinx.com (Neal Frager) Date: Fri, 11 Feb 2022 05:17:40 -0700 Subject: [Buildroot] [PATCH v5 2/2] add configs/zynqmp_zcu102_defconfig In-Reply-To: <20220211121740.1257919-1-neal.frager@xilinx.com> References: <20220211121740.1257919-1-neal.frager@xilinx.com> Message-ID: <20220211121740.1257919-2-neal.frager@xilinx.com> This patch: - adds support for Xilinx ZCU102 evaluation board - ZCU102 features can be found here: https://www.xilinx.com/products/boards-and-kits/zcu102.html Signed-off-by: Neal Frager Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti [Giulio: only build tested] --- V1->V2: * fixed general build issues * added extlinux.conf for run-time boot issue V2->V3: * enabled support for host machines without OpenSSL required by U-Boot and Linux * moved readme.txt update to zynqmp_zcu102_defconfig patch 2/2 V3->V4: * cleaned up commit log messages * added version history V4->V5: * switched to sha1 urls to make ATF, U-Boot and Linux builds reproducible * generated board specific pm_cfg_obj.c files with vitis 2021.2 --- --- board/zynqmp/readme.txt | 23 +- board/zynqmp/zcu102/pm_cfg_obj.c | 566 +++++++++++++++++++++++++++++++ configs/zynqmp_zcu102_defconfig | 39 +++ 3 files changed, 621 insertions(+), 7 deletions(-) create mode 100644 board/zynqmp/zcu102/pm_cfg_obj.c create mode 100644 configs/zynqmp_zcu102_defconfig diff --git a/board/zynqmp/readme.txt b/board/zynqmp/readme.txt index da37f4ccc9..0dc1793e03 100644 --- a/board/zynqmp/readme.txt +++ b/board/zynqmp/readme.txt @@ -1,10 +1,19 @@ -******************************** -Xilinx ZCU106 board - ZynqMP SoC -******************************** +****************************************** +Xilinx ZCU102 / ZCU106 boards - ZynqMP SoC +****************************************** + +This document describes the Buildroot support for the ZCU102 and ZCU106 +boards by Xilinx, based on the Zynq UltraScale+ MPSoC (aka ZynqMP). +It has been tested with the ZCU102 and ZCU106 production boards. + +Evaluation board features can be found here with the links below. + +ZCU102: +https://www.xilinx.com/products/boards-and-kits/zcu102.html + +ZCU106: +https://www.xilinx.com/products/boards-and-kits/zcu106.html -This document describes the Buildroot support for the ZCU106 board by -Xilinx, based on the Zynq UltraScale+ MPSoC (aka ZynqMP). It has been -tested with the EK-U1-ZCU106-ES2 pre-production board. How to build it =============== @@ -32,7 +41,7 @@ After building, you should get a tree like this: +-- rootfs.ext4 -> rootfs.ext2 +-- sdcard.img +-- system.dtb -> zynqmp-zcu106-revA.dtb - +-- u-boot.bin + +-- u-boot.itb `-- zynqmp-zcu106-revA.dtb How to write the SD card diff --git a/board/zynqmp/zcu102/pm_cfg_obj.c b/board/zynqmp/zcu102/pm_cfg_obj.c new file mode 100644 index 0000000000..d93e1746e6 --- /dev/null +++ b/board/zynqmp/zcu102/pm_cfg_obj.c @@ -0,0 +1,566 @@ +/****************************************************************************** +* Copyright (c) 2017 - 2021 Xilinx, Inc. All rights reserved. +* SPDX-License-Identifier: MIT +******************************************************************************/ + +#include "xil_types.h" +#include "pm_defs.h" + +#define PM_CONFIG_MASTER_SECTION_ID 0x101U +#define PM_CONFIG_SLAVE_SECTION_ID 0x102U +#define PM_CONFIG_PREALLOC_SECTION_ID 0x103U +#define PM_CONFIG_POWER_SECTION_ID 0x104U +#define PM_CONFIG_RESET_SECTION_ID 0x105U +#define PM_CONFIG_SHUTDOWN_SECTION_ID 0x106U +#define PM_CONFIG_SET_CONFIG_SECTION_ID 0x107U +#define PM_CONFIG_GPO_SECTION_ID 0x108U + +#define PM_SLAVE_FLAG_IS_SHAREABLE 0x1U +#define PM_MASTER_USING_SLAVE_MASK 0x2U + +#define PM_CONFIG_GPO1_MIO_PIN_34_MAP (1U << 10U) +#define PM_CONFIG_GPO1_MIO_PIN_35_MAP (1U << 11U) +#define PM_CONFIG_GPO1_MIO_PIN_36_MAP (1U << 12U) +#define PM_CONFIG_GPO1_MIO_PIN_37_MAP (1U << 13U) + +#define PM_CONFIG_GPO1_BIT_2_MASK (1U << 2U) +#define PM_CONFIG_GPO1_BIT_3_MASK (1U << 3U) +#define PM_CONFIG_GPO1_BIT_4_MASK (1U << 4U) +#define PM_CONFIG_GPO1_BIT_5_MASK (1U << 5U) + +#define SUSPEND_TIMEOUT 0xFFFFFFFFU + +#define PM_CONFIG_OBJECT_TYPE_BASE 0x1U + + +#define PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK 0x00000001 +#define PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK 0x00000100 +#define PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK 0x00000200 + + + +#if defined (__ICCARM__) +#pragma language=save +#pragma language=extended +#endif +#if defined (__GNUC__) + const u32 XPm_ConfigObject[] __attribute__((used, section(".sys_cfg_data"))) = +#elif defined (__ICCARM__) +#pragma location = ".sys_cfg_data" +__root const u32 XPm_ConfigObject[] = +#endif +{ + /**********************************************************************/ + /* HEADER */ + 2, /* Number of remaining words in the header */ + 8, /* Number of sections included in config object */ + PM_CONFIG_OBJECT_TYPE_BASE, /* Type of config object as base */ + /**********************************************************************/ + /* MASTER SECTION */ + PM_CONFIG_MASTER_SECTION_ID, /* Master SectionID */ + 3U, /* No. of Masters*/ + + NODE_APU, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_0, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_1, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Wake permissions */ + + + /**********************************************************************/ + /* SLAVE SECTION */ + + + PM_CONFIG_SLAVE_SECTION_ID, /* Section ID */ + 49, /* Number of slaves */ + + NODE_OCM_BANK_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TCM_0_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_0_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_1_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TCM_1_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_L2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU_PP_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU_PP_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_USB_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_USB_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_TTC_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SATA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_ETH_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_UART_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_UART_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SPI_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_SPI_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_I2C_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_I2C_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SD_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_SD_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_DP, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GDMA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_ADMA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_NAND, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_QSPI, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPIO, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_CAN_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_CAN_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_EXTERN, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_DDR, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_IPI_APU, + 0U, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_0, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_1, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_PCIE, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_PCAP, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_RTC, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_VCU, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_PL, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + + /**********************************************************************/ + /* PREALLOC SECTION */ + + PM_CONFIG_PREALLOC_SECTION_ID, /* Preallaoc SectionID */ + 3U, /* No. of Masters*/ + +/* Prealloc for psu_cortexa53_0 */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, + 12, + NODE_DDR, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_L2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_3, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_SD_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_QSPI, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_PL, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_APU, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_0 */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + 3, + NODE_TCM_0_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_0_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_1 */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + 3, + NODE_TCM_1_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_1_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + + /**********************************************************************/ + /* POWER SECTION */ + + PM_CONFIG_POWER_SECTION_ID, /* Power Section ID */ + 4U, /* Number of power nodes */ + + NODE_APU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_RPU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_FPD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_PLD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + + /**********************************************************************/ + /* RESET SECTION */ + + PM_CONFIG_RESET_SECTION_ID, /* Reset Section ID */ + 120U, /* Number of resets */ + + XILPM_RESET_PCIE_CFG, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_BRIDGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_CTRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRF, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GDMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SATA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APU_L2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DDR, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SOFT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_QSPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_NAND, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ADMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOU_CC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TIMESTAMP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R50, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R51, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_AMBA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_OCM, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_PGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RTC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SYSMON, 0, + XILPM_RESET_AFI_FM6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_LPD_SWDT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_FPD, PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + XILPM_RESET_RPU_DBG1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_DBG0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_VPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_7, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_8, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_9, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_10, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_11, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_12, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_13, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_14, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_15, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_16, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_17, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_18, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_19, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_20, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_21, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_22, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_23, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_24, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_25, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_26, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_27, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_28, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_29, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_30, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_31, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_LS, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PS_ONLY, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_92, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_93, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_94, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_95, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + + /**********************************************************************/ + /* SET CONFIG SECTION */ + PM_CONFIG_SET_CONFIG_SECTION_ID, /* Set Config Section ID */ + 0U, /* Permissions to load base config object */ + 0U, /* Permissions to load overlay config object */ + + /**********************************************************************/ + /* SHUTDOWN SECTION */ + + PM_CONFIG_SHUTDOWN_SECTION_ID, /* Shutdown Section ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* System Shutdown/Restart Permission */ + + /**********************************************************************/ + /* GPO SECTION */ + PM_CONFIG_GPO_SECTION_ID, /* GPO Section ID */ + PM_CONFIG_GPO1_BIT_2_MASK | + PM_CONFIG_GPO1_MIO_PIN_34_MAP | + PM_CONFIG_GPO1_MIO_PIN_35_MAP | + PM_CONFIG_GPO1_MIO_PIN_36_MAP | + PM_CONFIG_GPO1_MIO_PIN_37_MAP | + 0, /* State of GPO pins */ +}; +#if defined (__ICCARM__) +#pragma language=restore +#endif + diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig new file mode 100644 index 0000000000..6e9e50ca77 --- /dev/null +++ b/configs/zynqmp_zcu102_defconfig @@ -0,0 +1,39 @@ +BR2_aarch64=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="966124532656bc95d781abf57531e4cd4f962237" +BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="e678d5ddc475f34dea8f5004fb6ebde118621784" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/Xilinx/u-boot-xlnx.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="667001319cbe511ce6353195fb4910ae5cb041ce" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" +BR2_TARGET_UBOOT_ZYNQMP=y +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/v2021.2/bin/pmufw-v2021.2.bin" +BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/zcu102/pm_cfg_obj.c" +BR2_TARGET_UBOOT_FORMAT_ITB=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y -- 2.17.1 From peter at korsgaard.com Fri Feb 11 12:17:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 13:17:05 +0100 Subject: [Buildroot] [git commit] package/lzip: use .tar.gz format for source Message-ID: <20220211121158.D0B9D81392@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=618c5f7671643516432c1ec6b9f7b203313763a7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Using a lzip compressed tarball to build host-lzip so lzip compressed tarballs can be extracted naturally doesn't work. Use the .tar.gz format instead. Reported-by: Waldemar Brodkorb Signed-off-by: Peter Korsgaard --- package/lzip/lzip.hash | 2 +- package/lzip/lzip.mk | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/package/lzip/lzip.hash b/package/lzip/lzip.hash index 5e285a5ad8..48ee8175ca 100644 --- a/package/lzip/lzip.hash +++ b/package/lzip/lzip.hash @@ -1,4 +1,4 @@ # From https://lists.nongnu.org/archive/html/lzip-bug/2022-02/msg00000.html -sha256 ea02b9e6fb25d0e1a1d3ef4fdeb6ab26b931f1ece66fa1cee2983c95215e930a lzip-1.23.tar.lz +sha256 4792c047ddf15ef29d55ba8e68a1a21e0cb7692d87ecdf7204419864582f280d lzip-1.23.tar.gz # Locally calculated sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef COPYING diff --git a/package/lzip/lzip.mk b/package/lzip/lzip.mk index e3cc86b956..31b5750767 100644 --- a/package/lzip/lzip.mk +++ b/package/lzip/lzip.mk @@ -5,7 +5,6 @@ ################################################################################ LZIP_VERSION = 1.23 -LZIP_SOURCE = lzip-$(LZIP_VERSION).tar.lz LZIP_SITE = http://download.savannah.gnu.org/releases/lzip LZIP_LICENSE = GPL-2.0+ LZIP_LICENSE_FILES = COPYING From peter at korsgaard.com Fri Feb 11 12:19:25 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 13:19:25 +0100 Subject: [Buildroot] [git commit] package/lzip: bump to version 1.23 In-Reply-To: (Waldemar Brodkorb's message of "Fri, 11 Feb 2022 12:56:06 +0100") References: <20220210213036.F2A0582DFF@busybox.osuosl.org> Message-ID: <87tud5r3xu.fsf@dell.be.48ers.dk> >>>>> "Waldemar" == Waldemar Brodkorb writes: > Hi Peter, > Peter Korsgaard wrote, >> commit: https://git.buildroot.net/buildroot/commit/?id=4648090a89a2478a4b0fa8cc43a49bc94668622c >> branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master >> >> https://lists.nongnu.org/archive/html/lzip-bug/2022-02/msg00000.html >> >> Signed-off-by: Fabrice Fontaine >> Signed-off-by: Peter Korsgaard >> --- >> package/lzip/lzip.hash | 4 ++-- >> package/lzip/lzip.mk | 3 ++- >> 2 files changed, 4 insertions(+), 3 deletions(-) >> >> diff --git a/package/lzip/lzip.hash b/package/lzip/lzip.hash >> index 57e7eb43f4..5e285a5ad8 100644 >> --- a/package/lzip/lzip.hash >> +++ b/package/lzip/lzip.hash >> @@ -1,4 +1,4 @@ >> -# From https://lists.nongnu.org/archive/html/lzip-bug/2021-01/msg00008.html >> -sha256 c3342d42e67139c165b8b128d033b5c96893a13ac5f25933190315214e87a948 lzip-1.22.tar.gz >> +# From https://lists.nongnu.org/archive/html/lzip-bug/2022-02/msg00000.html >> +sha256 ea02b9e6fb25d0e1a1d3ef4fdeb6ab26b931f1ece66fa1cee2983c95215e930a lzip-1.23.tar.lz >> # Locally calculated >> sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef COPYING >> diff --git a/package/lzip/lzip.mk b/package/lzip/lzip.mk >> index cca6da07d0..e3cc86b956 100644 >> --- a/package/lzip/lzip.mk >> +++ b/package/lzip/lzip.mk >> @@ -4,7 +4,8 @@ >> # >> ################################################################################ >> >> -LZIP_VERSION = 1.22 >> +LZIP_VERSION = 1.23 >> +LZIP_SOURCE = lzip-$(LZIP_VERSION).tar.lz > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > This seems to break the build for at least snps_archs38_hsdk_defconfig, when no > lzip is installed on the host. Kind of chicken-egg problem. > https://pastebin.com/cyt1UsuG Doh, indeed - I've pushed a change to use the .tar.gz instead. -- Bye, Peter Korsgaard From nealf at xilinx.com Fri Feb 11 13:16:14 2022 From: nealf at xilinx.com (Neal Frager) Date: Fri, 11 Feb 2022 13:16:14 +0000 Subject: [Buildroot] [PATCH v5 2/2] add configs/zynqmp_zcu102_defconfig In-Reply-To: <20220211121740.1257919-2-neal.frager@xilinx.com> References: <20220211121740.1257919-1-neal.frager@xilinx.com> <20220211121740.1257919-2-neal.frager@xilinx.com> Message-ID: Hi Luca, I have encountered yet another issue. If the pm_cfg_obj.c file is generated with Vitis 2021.2, it looks like the following: There is a new "#define PM_CONFIG_OBJECT_TYPE_BASE 0x1U" which breaks the pm_cfg_obj_convert.py. Could you generate a new version of the script that supports the Vitis 2021 file format? I have attached an example which is what Vitis generates for the zcu106 evaluation board. /****************************************************************************** * Copyright (c) 2017 - 2021 Xilinx, Inc. All rights reserved. * SPDX-License-Identifier: MIT ******************************************************************************/ #include "xil_types.h" #include "pm_defs.h" #define PM_CONFIG_MASTER_SECTION_ID 0x101U #define PM_CONFIG_SLAVE_SECTION_ID 0x102U #define PM_CONFIG_PREALLOC_SECTION_ID 0x103U #define PM_CONFIG_POWER_SECTION_ID 0x104U #define PM_CONFIG_RESET_SECTION_ID 0x105U #define PM_CONFIG_SHUTDOWN_SECTION_ID 0x106U #define PM_CONFIG_SET_CONFIG_SECTION_ID 0x107U #define PM_CONFIG_GPO_SECTION_ID 0x108U #define PM_SLAVE_FLAG_IS_SHAREABLE 0x1U #define PM_MASTER_USING_SLAVE_MASK 0x2U #define PM_CONFIG_GPO1_MIO_PIN_34_MAP (1U << 10U) #define PM_CONFIG_GPO1_MIO_PIN_35_MAP (1U << 11U) #define PM_CONFIG_GPO1_MIO_PIN_36_MAP (1U << 12U) #define PM_CONFIG_GPO1_MIO_PIN_37_MAP (1U << 13U) #define PM_CONFIG_GPO1_BIT_2_MASK (1U << 2U) #define PM_CONFIG_GPO1_BIT_3_MASK (1U << 3U) #define PM_CONFIG_GPO1_BIT_4_MASK (1U << 4U) #define PM_CONFIG_GPO1_BIT_5_MASK (1U << 5U) #define SUSPEND_TIMEOUT 0xFFFFFFFFU #define PM_CONFIG_OBJECT_TYPE_BASE 0x1U #define PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK 0x00000001 #define PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK 0x00000100 #define PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK 0x00000200 #if defined (__ICCARM__) #pragma language=save #pragma language=extended #endif #if defined (__GNUC__) const u32 XPm_ConfigObject[] __attribute__((used, section(".sys_cfg_data"))) = #elif defined (__ICCARM__) #pragma location = ".sys_cfg_data" __root const u32 XPm_ConfigObject[] = #endif { Best regards, Neal Frager Xilinx -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: pm_cfg_obj.c URL: From nealf at xilinx.com Fri Feb 11 13:20:30 2022 From: nealf at xilinx.com (Neal Frager) Date: Fri, 11 Feb 2022 13:20:30 +0000 Subject: [Buildroot] [PATCH v5 2/2] add configs/zynqmp_zcu102_defconfig In-Reply-To: References: <20220211121740.1257919-1-neal.frager@xilinx.com> <20220211121740.1257919-2-neal.frager@xilinx.com> Message-ID: Hi Giulio, Luca, As PM_CONFIG_OBJECT_TYPE_BASE is used only a single time in the pm_cfg_obj.c, I am going to solve this by removing the define and replacing it with the value 0x1U. In the meantime, it would be great if Luca could update the script in mainline to handle new Vitis generated pm_cfg_obj.c files. Best regards, Neal Frager Xilinx From ps.report at gmx.net Fri Feb 11 13:37:42 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 11 Feb 2022 14:37:42 +0100 Subject: [Buildroot] [PATCH] package/libcamera bump to 1966b9a58436fab51f8270aad6a228b935e4fac4 In-Reply-To: <20220211112245.1357817-1-kieran.bingham@ideasonboard.com> References: <20220211112245.1357817-1-kieran.bingham@ideasonboard.com> Message-ID: <20220211143742.1fdec542@gmx.net> Hello Kieran, one nitpick: the patch subject should be 'package/libcamera: bump to ...' (instead of 'package/libcamera bump to ...').... On Fri, 11 Feb 2022 11:22:45 +0000, Kieran Bingham wrote: > Update to the latest libcamera commit. > > This incorporates fixes and improvements for Raspberry Pi which will be > needed to go along side the new libcamera-apps package. > > Signed-off-by: Kieran Bingham Reviewed-by: Peter Seiderer Tested-by: Peter Seiderer Regards, Peter > --- > package/libcamera/libcamera.hash | 2 +- > package/libcamera/libcamera.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/libcamera/libcamera.hash b/package/libcamera/libcamera.hash > index a7ca27a96b7f..8d5abf0e621c 100644 > --- a/package/libcamera/libcamera.hash > +++ b/package/libcamera/libcamera.hash > @@ -1,4 +1,4 @@ > -sha256 305e6f458d2bf3d4b697ffe33e104b696db6b1492bb5422e2cce1937e58516f1 libcamera-40f5fddca7f774944a53f58eeaebc4db79c373d8-br1.tar.gz > +sha256 3624c71ba492c602c5335aab3dc87798193f7596c6cc75f7cfb847165f180930 libcamera-1966b9a58436fab51f8270aad6a228b935e4fac4-br1.tar.gz > > # license files > sha256 fd38b2c053c0cce46d9c5ef3545a6e34d157a240ba99c9b8dca5d37a8147da6c LICENSES/BSD-2-Clause.txt > diff --git a/package/libcamera/libcamera.mk b/package/libcamera/libcamera.mk > index 534d8d26371f..cf1af5aaf065 100644 > --- a/package/libcamera/libcamera.mk > +++ b/package/libcamera/libcamera.mk > @@ -5,7 +5,7 @@ > ################################################################################ > > LIBCAMERA_SITE = https://git.linuxtv.org/libcamera.git > -LIBCAMERA_VERSION = 40f5fddca7f774944a53f58eeaebc4db79c373d8 > +LIBCAMERA_VERSION = 1966b9a58436fab51f8270aad6a228b935e4fac4 > LIBCAMERA_SITE_METHOD = git > LIBCAMERA_DEPENDENCIES = \ > host-openssl \ From ps.report at gmx.net Fri Feb 11 13:49:06 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 11 Feb 2022 14:49:06 +0100 Subject: [Buildroot] [PATCH v1] package/libv4l: v4l-utils needs C++11 support Message-ID: <20220211134906.18280-1-ps.report@gmx.net> Fixes: - http://autobuild.buildroot.net/results/cacd73e08cfb359d608bca807189b7bd3c5c79bd v4l2-ctl.cpp:53:2: warning: identifier 'nullptr' is a keyword in C++11 [-Wc++0x-compat] v4l2-ctl.cpp:53:37: error: 'nullptr' was not declared in this scope [...] v4l2-ctl-tuner.cpp: In function 'void parse_freq_seek(char*, v4l2_hw_freq_seek&)': v4l2-ctl-tuner.cpp:160:10: error: 'constexpr' does not name a type static constexpr const char *subopts[] = { ^ v4l2-ctl-tuner.cpp:160:10: note: C++11 'constexpr' only available with -std=c++11 or -std=gnu++11 Signed-off-by: Peter Seiderer --- package/libv4l/Config.in | 4 ++++ package/libv4l/libv4l.mk | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/package/libv4l/Config.in b/package/libv4l/Config.in index 57ddde1dfb..c88f280c3b 100644 --- a/package/libv4l/Config.in +++ b/package/libv4l/Config.in @@ -20,6 +20,7 @@ comment "libv4l JPEG support not enabled" config BR2_PACKAGE_LIBV4L_UTILS bool "v4l-utils tools" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 help v4l-utils is a collection of various video4linux and DVB utilities. @@ -35,6 +36,9 @@ config BR2_PACKAGE_LIBV4L_UTILS - rds-ctl - qv4l2 (if Qt is enabled) +comment "v4l-utils tools needs a toolchain w/ C++11" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + endif comment "libv4l needs a toolchain w/ threads, C++ and headers >= 3.0" diff --git a/package/libv4l/libv4l.mk b/package/libv4l/libv4l.mk index 4dc0f15f94..ee5a1f2241 100644 --- a/package/libv4l/libv4l.mk +++ b/package/libv4l/libv4l.mk @@ -59,6 +59,10 @@ ifeq ($(BR2_PACKAGE_LIBV4L_UTILS),y) LIBV4L_CONF_OPTS += --enable-v4l-utils LIBV4L_DEPENDENCIES += $(TARGET_NLS_DEPENDENCIES) +# v4l2-ctl needs c++11, qt5 needs c++11 (since qt-5.7)/use gnu++11 for +# typeof support +LIBV4L_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=gnu++11" + # IR BPF decoder support needs toolchain with linux-headers >= 3.18 # libelf and clang support LIBV4L_CONF_OPTS += --disable-bpf @@ -71,8 +75,6 @@ LIBV4L_CONF_ENV += \ ac_cv_prog_MOC=$(HOST_DIR)/bin/moc \ ac_cv_prog_RCC=$(HOST_DIR)/bin/rcc \ ac_cv_prog_UIC=$(HOST_DIR)/bin/uic -# qt5 needs c++11 (since qt-5.7)/use gnu++11 for typeof support -LIBV4L_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=gnu++11" else LIBV4L_CONF_OPTS += --disable-qv4l2 endif -- 2.34.1 From kieran.bingham at ideasonboard.com Fri Feb 11 13:50:00 2022 From: kieran.bingham at ideasonboard.com (Kieran Bingham) Date: Fri, 11 Feb 2022 13:50:00 +0000 Subject: [Buildroot] [PATCH] package/libcamera bump to 1966b9a58436fab51f8270aad6a228b935e4fac4 In-Reply-To: <20220211143742.1fdec542@gmx.net> References: <20220211112245.1357817-1-kieran.bingham@ideasonboard.com> <20220211143742.1fdec542@gmx.net> Message-ID: <164458740032.83878.10164451267230898478@Monstersaurus> Hi Peter, Quoting Peter Seiderer (2022-02-11 13:37:42) > Hello Kieran, > > one nitpick: the patch subject should be 'package/libcamera: bump to ...' > (instead of 'package/libcamera bump to ...').... Completely agreed, I think I'd call that a typo ... or a not-typoed ;-) If it can be fixed while applying that's fine, otherwise I'll resend. > On Fri, 11 Feb 2022 11:22:45 +0000, Kieran Bingham wrote: > > > Update to the latest libcamera commit. > > > > This incorporates fixes and improvements for Raspberry Pi which will be > > needed to go along side the new libcamera-apps package. > > > > Signed-off-by: Kieran Bingham > > Reviewed-by: Peter Seiderer > Tested-by: Peter Seiderer > Thanks Kieran > Regards, > Peter > > > --- > > package/libcamera/libcamera.hash | 2 +- > > package/libcamera/libcamera.mk | 2 +- > > 2 files changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/package/libcamera/libcamera.hash b/package/libcamera/libcamera.hash > > index a7ca27a96b7f..8d5abf0e621c 100644 > > --- a/package/libcamera/libcamera.hash > > +++ b/package/libcamera/libcamera.hash > > @@ -1,4 +1,4 @@ > > -sha256 305e6f458d2bf3d4b697ffe33e104b696db6b1492bb5422e2cce1937e58516f1 libcamera-40f5fddca7f774944a53f58eeaebc4db79c373d8-br1.tar.gz > > +sha256 3624c71ba492c602c5335aab3dc87798193f7596c6cc75f7cfb847165f180930 libcamera-1966b9a58436fab51f8270aad6a228b935e4fac4-br1.tar.gz > > > > # license files > > sha256 fd38b2c053c0cce46d9c5ef3545a6e34d157a240ba99c9b8dca5d37a8147da6c LICENSES/BSD-2-Clause.txt > > diff --git a/package/libcamera/libcamera.mk b/package/libcamera/libcamera.mk > > index 534d8d26371f..cf1af5aaf065 100644 > > --- a/package/libcamera/libcamera.mk > > +++ b/package/libcamera/libcamera.mk > > @@ -5,7 +5,7 @@ > > ################################################################################ > > > > LIBCAMERA_SITE = https://git.linuxtv.org/libcamera.git > > -LIBCAMERA_VERSION = 40f5fddca7f774944a53f58eeaebc4db79c373d8 > > +LIBCAMERA_VERSION = 1966b9a58436fab51f8270aad6a228b935e4fac4 > > LIBCAMERA_SITE_METHOD = git > > LIBCAMERA_DEPENDENCIES = \ > > host-openssl \ > From eugen.hristev at microchip.com Fri Feb 11 14:08:55 2022 From: eugen.hristev at microchip.com (Eugen Hristev) Date: Fri, 11 Feb 2022 16:08:55 +0200 Subject: [Buildroot] [PATCH] configs/microchip_sama7g5ek_mmc_dev_defconfig: add rng tools Message-ID: <20220211140855.917229-1-eugen.hristev@microchip.com> Add rng tools. Without this, when booting, prompt will not appear until 'random: crng init done' appears. Avoid this by using rng tools without the libjitterentropy. Libjitterentropy is a jitter source of entropy which does not help for AT91 cpus as the jitter does not have enough variance to generate fast enough entropy. Signed-off-by: Eugen Hristev --- Hi, This should go for 2022.02 in my opinion. Thanks, configs/microchip_sama7g5ek_mmc_dev_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/microchip_sama7g5ek_mmc_dev_defconfig b/configs/microchip_sama7g5ek_mmc_dev_defconfig index 3253bce401..895e63edcd 100644 --- a/configs/microchip_sama7g5ek_mmc_dev_defconfig +++ b/configs/microchip_sama7g5ek_mmc_dev_defconfig @@ -27,6 +27,8 @@ BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y BR2_PACKAGE_EVTEST=y +BR2_PACKAGE_RNG_TOOLS=y +# BR2_PACKAGE_RNG_TOOLS_JITTERENTROPY_LIBRARY is not set BR2_PACKAGE_SETSERIAL=y BR2_PACKAGE_SPI_TOOLS=y BR2_PACKAGE_USBUTILS=y -- 2.33.0 From giulio.benetti at benettiengineering.com Fri Feb 11 14:31:53 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 11 Feb 2022 15:31:53 +0100 Subject: [Buildroot] [PATCH] configs/microchip_sama7g5ek_mmc_dev_defconfig: add rng tools In-Reply-To: <20220211140855.917229-1-eugen.hristev@microchip.com> References: <20220211140855.917229-1-eugen.hristev@microchip.com> Message-ID: Hi Engin, All, sorry for html but I?m on mobile, > Il giorno 11 feb 2022, alle ore 15:09, Eugen Hristev via buildroot ha scritto: > > ?Add rng tools. Without this, when booting, prompt will not > appear until 'random: crng init done' appears. > Avoid this by using rng tools without the libjitterentropy. > Libjitterentropy is a jitter source of entropy which does > not help for AT91 cpus as the jitter does not have > enough variance to generate fast enough entropy. > > Signed-off-by: Eugen Hristev > --- > Hi, > > This should go for 2022.02 in my opinion. > > Thanks, Here you should add other 3 dashes more. Thank you for providing such fix. Unfortunately I didn?t have the hardware to test and fix it. Reviewed-by: Giulio Benetti Best regards ?- Giulio Benetti Benetti Engineering sas > > configs/microchip_sama7g5ek_mmc_dev_defconfig | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/configs/microchip_sama7g5ek_mmc_dev_defconfig b/configs/microchip_sama7g5ek_mmc_dev_defconfig > index 3253bce401..895e63edcd 100644 > --- a/configs/microchip_sama7g5ek_mmc_dev_defconfig > +++ b/configs/microchip_sama7g5ek_mmc_dev_defconfig > @@ -27,6 +27,8 @@ BR2_PACKAGE_MMC_UTILS=y > BR2_PACKAGE_MTD=y > BR2_PACKAGE_WILC1000_FIRMWARE=y > BR2_PACKAGE_EVTEST=y > +BR2_PACKAGE_RNG_TOOLS=y > +# BR2_PACKAGE_RNG_TOOLS_JITTERENTROPY_LIBRARY is not set > BR2_PACKAGE_SETSERIAL=y > BR2_PACKAGE_SPI_TOOLS=y > BR2_PACKAGE_USBUTILS=y > -- > 2.33.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From neal.frager at xilinx.com Fri Feb 11 14:44:02 2022 From: neal.frager at xilinx.com (Neal Frager) Date: Fri, 11 Feb 2022 07:44:02 -0700 Subject: [Buildroot] [PATCH v6 2/2] add configs/zynqmp_zcu102_defconfig In-Reply-To: <20220211144402.1626443-1-neal.frager@xilinx.com> References: <20220211144402.1626443-1-neal.frager@xilinx.com> Message-ID: <20220211144402.1626443-2-neal.frager@xilinx.com> This patch: - adds support for Xilinx ZCU102 evaluation board - ZCU102 features can be found here: https://www.xilinx.com/products/boards-and-kits/zcu102.html Signed-off-by: Neal Frager Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti [Giulio: only build tested] --- V1->V2: * fixed general build issues * added extlinux.conf for run-time boot issue V2->V3: * enabled support for host machines without OpenSSL required by U-Boot and Linux * moved readme.txt update to zynqmp_zcu102_defconfig patch 2/2 V3->V4: * cleaned up commit log messages * added version history V4->V5: * switched to sha1 urls to make ATF, U-Boot and Linux builds reproducible * generated board specific pm_cfg_obj.c files with vitis 2021.2 V5->V6: * fixed build issue with pm_cfg_obj.c files --- --- board/zynqmp/readme.txt | 23 +- board/zynqmp/zcu102/pm_cfg_obj.c | 563 +++++++++++++++++++++++++++++++ configs/zynqmp_zcu102_defconfig | 39 +++ 3 files changed, 618 insertions(+), 7 deletions(-) create mode 100644 board/zynqmp/zcu102/pm_cfg_obj.c create mode 100644 configs/zynqmp_zcu102_defconfig diff --git a/board/zynqmp/readme.txt b/board/zynqmp/readme.txt index da37f4ccc9..0dc1793e03 100644 --- a/board/zynqmp/readme.txt +++ b/board/zynqmp/readme.txt @@ -1,10 +1,19 @@ -******************************** -Xilinx ZCU106 board - ZynqMP SoC -******************************** +****************************************** +Xilinx ZCU102 / ZCU106 boards - ZynqMP SoC +****************************************** + +This document describes the Buildroot support for the ZCU102 and ZCU106 +boards by Xilinx, based on the Zynq UltraScale+ MPSoC (aka ZynqMP). +It has been tested with the ZCU102 and ZCU106 production boards. + +Evaluation board features can be found here with the links below. + +ZCU102: +https://www.xilinx.com/products/boards-and-kits/zcu102.html + +ZCU106: +https://www.xilinx.com/products/boards-and-kits/zcu106.html -This document describes the Buildroot support for the ZCU106 board by -Xilinx, based on the Zynq UltraScale+ MPSoC (aka ZynqMP). It has been -tested with the EK-U1-ZCU106-ES2 pre-production board. How to build it =============== @@ -32,7 +41,7 @@ After building, you should get a tree like this: +-- rootfs.ext4 -> rootfs.ext2 +-- sdcard.img +-- system.dtb -> zynqmp-zcu106-revA.dtb - +-- u-boot.bin + +-- u-boot.itb `-- zynqmp-zcu106-revA.dtb How to write the SD card diff --git a/board/zynqmp/zcu102/pm_cfg_obj.c b/board/zynqmp/zcu102/pm_cfg_obj.c new file mode 100644 index 0000000000..68557c4cb4 --- /dev/null +++ b/board/zynqmp/zcu102/pm_cfg_obj.c @@ -0,0 +1,563 @@ +/****************************************************************************** +* Copyright (c) 2017 - 2021 Xilinx, Inc. All rights reserved. +* SPDX-License-Identifier: MIT +******************************************************************************/ + +#include "xil_types.h" +#include "pm_defs.h" + +#define PM_CONFIG_MASTER_SECTION_ID 0x101U +#define PM_CONFIG_SLAVE_SECTION_ID 0x102U +#define PM_CONFIG_PREALLOC_SECTION_ID 0x103U +#define PM_CONFIG_POWER_SECTION_ID 0x104U +#define PM_CONFIG_RESET_SECTION_ID 0x105U +#define PM_CONFIG_SHUTDOWN_SECTION_ID 0x106U +#define PM_CONFIG_SET_CONFIG_SECTION_ID 0x107U +#define PM_CONFIG_GPO_SECTION_ID 0x108U + +#define PM_SLAVE_FLAG_IS_SHAREABLE 0x1U +#define PM_MASTER_USING_SLAVE_MASK 0x2U + +#define PM_CONFIG_GPO1_MIO_PIN_34_MAP (1U << 10U) +#define PM_CONFIG_GPO1_MIO_PIN_35_MAP (1U << 11U) +#define PM_CONFIG_GPO1_MIO_PIN_36_MAP (1U << 12U) +#define PM_CONFIG_GPO1_MIO_PIN_37_MAP (1U << 13U) + +#define PM_CONFIG_GPO1_BIT_2_MASK (1U << 2U) +#define PM_CONFIG_GPO1_BIT_3_MASK (1U << 3U) +#define PM_CONFIG_GPO1_BIT_4_MASK (1U << 4U) +#define PM_CONFIG_GPO1_BIT_5_MASK (1U << 5U) + +#define SUSPEND_TIMEOUT 0xFFFFFFFFU + +#define PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK 0x00000001 +#define PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK 0x00000100 +#define PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK 0x00000200 + + + +#if defined (__ICCARM__) +#pragma language=save +#pragma language=extended +#endif +#if defined (__GNUC__) + const u32 XPm_ConfigObject[] __attribute__((used, section(".sys_cfg_data"))) = +#elif defined (__ICCARM__) +#pragma location = ".sys_cfg_data" +__root const u32 XPm_ConfigObject[] = +#endif +{ + /**********************************************************************/ + /* HEADER */ + 2, /* Number of remaining words in the header */ + 8, /* Number of sections included in config object */ + 1U, /* Type of config object as base */ + /**********************************************************************/ + /* MASTER SECTION */ + PM_CONFIG_MASTER_SECTION_ID, /* Master SectionID */ + 3U, /* No. of Masters*/ + + NODE_APU, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_0, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_1, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Wake permissions */ + + + /**********************************************************************/ + /* SLAVE SECTION */ + + + PM_CONFIG_SLAVE_SECTION_ID, /* Section ID */ + 49, /* Number of slaves */ + + NODE_OCM_BANK_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TCM_0_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_0_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_1_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TCM_1_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_L2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU_PP_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU_PP_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_USB_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_USB_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_TTC_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SATA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_ETH_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_UART_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_UART_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SPI_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_SPI_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_I2C_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_I2C_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SD_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_SD_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_DP, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GDMA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_ADMA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_NAND, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_QSPI, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPIO, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_CAN_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_CAN_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_EXTERN, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_DDR, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_IPI_APU, + 0U, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_0, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_1, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_PCIE, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_PCAP, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_RTC, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_VCU, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_PL, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + + /**********************************************************************/ + /* PREALLOC SECTION */ + + PM_CONFIG_PREALLOC_SECTION_ID, /* Preallaoc SectionID */ + 3U, /* No. of Masters*/ + +/* Prealloc for psu_cortexa53_0 */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, + 12, + NODE_DDR, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_L2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_3, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_SD_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_QSPI, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_PL, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_APU, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_0 */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + 3, + NODE_TCM_0_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_0_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_1 */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + 3, + NODE_TCM_1_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_1_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + + /**********************************************************************/ + /* POWER SECTION */ + + PM_CONFIG_POWER_SECTION_ID, /* Power Section ID */ + 4U, /* Number of power nodes */ + + NODE_APU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_RPU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_FPD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_PLD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + + /**********************************************************************/ + /* RESET SECTION */ + + PM_CONFIG_RESET_SECTION_ID, /* Reset Section ID */ + 120U, /* Number of resets */ + + XILPM_RESET_PCIE_CFG, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_BRIDGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_CTRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRF, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GDMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SATA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APU_L2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DDR, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SOFT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_QSPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_NAND, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ADMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOU_CC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TIMESTAMP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R50, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R51, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_AMBA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_OCM, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_PGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RTC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SYSMON, 0, + XILPM_RESET_AFI_FM6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_LPD_SWDT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_FPD, PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + XILPM_RESET_RPU_DBG1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_DBG0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_VPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_7, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_8, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_9, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_10, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_11, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_12, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_13, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_14, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_15, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_16, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_17, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_18, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_19, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_20, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_21, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_22, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_23, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_24, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_25, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_26, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_27, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_28, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_29, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_30, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_31, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_LS, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PS_ONLY, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_92, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_93, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_94, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_95, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + + /**********************************************************************/ + /* SET CONFIG SECTION */ + PM_CONFIG_SET_CONFIG_SECTION_ID, /* Set Config Section ID */ + 0U, /* Permissions to load base config object */ + 0U, /* Permissions to load overlay config object */ + + /**********************************************************************/ + /* SHUTDOWN SECTION */ + + PM_CONFIG_SHUTDOWN_SECTION_ID, /* Shutdown Section ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* System Shutdown/Restart Permission */ + + /**********************************************************************/ + /* GPO SECTION */ + PM_CONFIG_GPO_SECTION_ID, /* GPO Section ID */ + PM_CONFIG_GPO1_BIT_2_MASK | + PM_CONFIG_GPO1_MIO_PIN_34_MAP | + PM_CONFIG_GPO1_MIO_PIN_35_MAP | + PM_CONFIG_GPO1_MIO_PIN_36_MAP | + PM_CONFIG_GPO1_MIO_PIN_37_MAP | + 0, /* State of GPO pins */ +}; +#if defined (__ICCARM__) +#pragma language=restore +#endif + diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig new file mode 100644 index 0000000000..6e9e50ca77 --- /dev/null +++ b/configs/zynqmp_zcu102_defconfig @@ -0,0 +1,39 @@ +BR2_aarch64=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="966124532656bc95d781abf57531e4cd4f962237" +BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="e678d5ddc475f34dea8f5004fb6ebde118621784" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/Xilinx/u-boot-xlnx.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="667001319cbe511ce6353195fb4910ae5cb041ce" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" +BR2_TARGET_UBOOT_ZYNQMP=y +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/v2021.2/bin/pmufw-v2021.2.bin" +BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/zcu102/pm_cfg_obj.c" +BR2_TARGET_UBOOT_FORMAT_ITB=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y -- 2.17.1 From neal.frager at xilinx.com Fri Feb 11 14:44:01 2022 From: neal.frager at xilinx.com (Neal Frager) Date: Fri, 11 Feb 2022 07:44:01 -0700 Subject: [Buildroot] [PATCH v6 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 Message-ID: <20220211144402.1626443-1-neal.frager@xilinx.com> This patch: - bumps ATF to Xilinx v2.6: mainline v2.6 requires patch to build - bumps U-Boot to Xilinx 2022.01: important drivers not in mainline - bumps Linux to Xilinx 5.15: important drivers not in mainline - deletes board/zynqmp/patches directory: patches already in mainline - modifies board/zynqmp/genimage.cfg: U-Boot 2022.01 uses u-boot.itb format - adds extlinux.conf to vfat bootfs - modifies U-Boot to unified xilinx_zynqmp_virt_defconfig (supports all boards) - adds support for SPL pm_cfg_obj.c loading to PMU firmware - enables support for host machines without OpenSSL required by U-Boot and Linux Signed-off-by: Neal Frager Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti [Giulio: only build tested] --- V1->V2: * fixed general build issues * added extlinux.conf for run-time boot issue V2->V3: * enabled support for host machines without OpenSSL required by U-Boot and Linux * moved readme.txt update to zynqmp_zcu102_defconfig patch 2/2 V3->V4: * cleaned up commit log messages * added version history V4->V5: * switched to sha1 urls to make ATF, U-Boot and Linux builds reproducible * generated board specific pm_cfg_obj.c files with vitis 2021.2 V5->V6: * fixed build issue with pm_cfg_obj.c files --- --- board/zynqmp/extlinux.conf | 5 + board/zynqmp/genimage.cfg | 6 +- ...-fix-Remove-GGC-ignore-Warray-bounds.patch | 68 --- ...64-zynqmp-zcu106-fix-SPL-MMC-booting.patch | 52 -- ...2-arm64-zynqmp-Enable-booting-to-ATF.patch | 114 ---- ...ept-an-absolute-path-for-PMUFW_INIT_.patch | 68 --- ...ynqmp-pass-the-PS-init-file-as-a-kco.patch | 175 ------ board/zynqmp/post-build.sh | 8 + board/zynqmp/post-image.sh | 4 +- board/zynqmp/zcu106/pm_cfg_obj.c | 562 ++++++++++++++++++ configs/zynqmp_zcu106_defconfig | 23 +- 11 files changed, 596 insertions(+), 489 deletions(-) create mode 100644 board/zynqmp/extlinux.conf delete mode 100644 board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch delete mode 100644 board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch delete mode 100644 board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch delete mode 100644 board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch delete mode 100644 board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch create mode 100755 board/zynqmp/post-build.sh create mode 100644 board/zynqmp/zcu106/pm_cfg_obj.c diff --git a/board/zynqmp/extlinux.conf b/board/zynqmp/extlinux.conf new file mode 100644 index 0000000000..ae3ec8614a --- /dev/null +++ b/board/zynqmp/extlinux.conf @@ -0,0 +1,5 @@ +label linux + kernel /Image + devicetree /system.dtb + append console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait + diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg index ed202f4550..20d8352c08 100644 --- a/board/zynqmp/genimage.cfg +++ b/board/zynqmp/genimage.cfg @@ -2,11 +2,13 @@ image boot.vfat { vfat { files = { "boot.bin", - "u-boot.bin", - "atf-uboot.ub", + "u-boot.itb", "system.dtb", "Image" } + file extlinux/extlinux.conf { + image = extlinux.conf + } } size = 32M diff --git a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch b/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch deleted file mode 100644 index 0c1a9ba2a4..0000000000 --- a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch +++ /dev/null @@ -1,68 +0,0 @@ -From da003e6ada7d0217fe99dc7c649a731f8ebd3c34 Mon Sep 17 00:00:00 2001 -From: Deepika Bhavnani -Date: Thu, 15 Aug 2019 00:56:46 +0300 -Subject: [PATCH] Coverity fix: Remove GGC ignore -Warray-bounds - -GCC diagnostics were added to ignore array boundaries, instead -of ignoring GCC warning current code will check for array boundaries -and perform and array update only for valid elements. - -Resolves: `CID 246574` `CID 246710` `CID 246651` - -Signed-off-by: Deepika Bhavnani -Change-Id: I7530ecf7a1707351c6ee87e90cc3d33574088f57 - -Backported from: 41af05154abe136938bcfb5f26c969933784bbef -[Adapted to apply on 1.5] - ---- - lib/psci/psci_common.c | 20 ++++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) - -diff --git a/lib/psci/psci_common.c b/lib/psci/psci_common.c -index 2220a745cd6e..6282d992a2f0 100644 ---- a/lib/psci/psci_common.c -+++ b/lib/psci/psci_common.c -@@ -188,21 +188,17 @@ static unsigned int get_power_on_target_pwrlvl(void) - /****************************************************************************** - * Helper function to update the requested local power state array. This array - * does not store the requested state for the CPU power level. Hence an -- * assertion is added to prevent us from accessing the wrong index. -+ * assertion is added to prevent us from accessing the CPU power level. - *****************************************************************************/ - static void psci_set_req_local_pwr_state(unsigned int pwrlvl, - unsigned int cpu_idx, - plat_local_state_t req_pwr_state) - { -- /* -- * This should never happen, we have this here to avoid -- * "array subscript is above array bounds" errors in GCC. -- */ - assert(pwrlvl > PSCI_CPU_PWR_LVL); --#pragma GCC diagnostic push --#pragma GCC diagnostic ignored "-Warray-bounds" -- psci_req_local_pwr_states[pwrlvl - 1][cpu_idx] = req_pwr_state; --#pragma GCC diagnostic pop -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && -+ (cpu_idx < PLATFORM_CORE_COUNT)) { -+ psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx] = req_pwr_state; -+ } - } - - /****************************************************************************** -@@ -228,7 +224,11 @@ static plat_local_state_t *psci_get_req_local_pwr_states(unsigned int pwrlvl, - { - assert(pwrlvl > PSCI_CPU_PWR_LVL); - -- return &psci_req_local_pwr_states[pwrlvl - 1][cpu_idx]; -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && -+ (cpu_idx < PLATFORM_CORE_COUNT)) { -+ return &psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx]; -+ } else -+ return NULL; - } - - /* --- -2.34.0 - diff --git a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch b/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch deleted file mode 100644 index 4d85e1bb12..0000000000 --- a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch +++ /dev/null @@ -1,52 +0,0 @@ -From e5d72ed8339eb05285448aad3c89d21e4d18fd29 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Mon, 26 Feb 2018 09:40:34 +0100 -Subject: [PATCH] arm64: zynqmp: zcu106: fix SPL MMC booting - -The U-Boot SPL generated with the current zcu106 defconfig cannot boot -from MMC: - - [...] - U-Boot SPL 2018.01 (Feb 21 2018 - 17:47:14) - EL Level: EL3 - Trying to boot from MMC1 - sdhci_transfer_data: Error detected in status(0x408020)! - spl_load_image_fat_os: error reading image u-boot.bin, err - -2 - spl_load_image_fat: error reading image u-boot.img, err - -6 - SPL: failed to boot from all boot devices - ### ERROR ### Please RESET the board ### - -Fix by lowering the rpll value. The new value for the RPLL_CTRL -register comes from the current psu_init_gpl.c from the HDF file at -https://github.com/xilinx/hdf-examples/tree/01ad8ea5fd1989abf4ea5a072d019a16cb2bc546/zcu106-zynqmp -(generated by Vivado v2017.4). - -RPLL and sdio1_ref clocks before and after this change: - - - Old values: RPLL 1.36 GHz, sdio1_ref 272 MHz - - New values: RPLL 1.16 GHz, sdio1_ref 233 MHz - -Signed-off-by: Luca Ceresoli -Cc: Michal Simek -Upstream-status: accepted upstream in a different form ---- - - board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -index 4d18abe000ca..e6fa477e53e7 100644 ---- a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -+++ b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -@@ -10,7 +10,7 @@ - static unsigned long psu_pll_init_data(void) - { - psu_mask_write(0xFF5E0034, 0xFE7FEDEFU, 0x7E4E2C62U); -- psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00013C00U); -+ psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00014600U); - psu_mask_write(0xFF5E0030, 0x00000008U, 0x00000008U); - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000001U); - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000000U); --- -2.7.4 - diff --git a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch b/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch deleted file mode 100644 index 487fff6812..0000000000 --- a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 5e3cac50cc981e01d9072241035a8d4162560c71 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Mon, 12 Mar 2018 17:18:38 +0100 -Subject: [PATCH] arm64: zynqmp: Enable booting to ATF - -U-Boot is now able to boot to ARM Trusted Firmware (ATF). The boot -flow is SPL(EL3) loads ATF and full u-boot and jump to ATF(EL3) which -pass control to full u-boot(EL2). This has been tested on zcu106, so -enable it in this defconfig. - -To generate an image that triggers this booting flow, you need to pass -'-O arm-trusted-firmware' to mkimage. - -Signed-off-by: Luca Ceresoli -Signed-off-by: Michal Simek -Backported from upstream: http://git.denx.de/?p=u-boot.git;a=commit;h=5e3cac50cc981e01d9072241035a8d4162560c71 ---- - - configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 + - configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 + - configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 + - configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 + - configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 1 + - configs/xilinx_zynqmp_zcu102_revA_defconfig | 1 + - configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 + - 7 files changed, 7 insertions(+) - -diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig -index c5bfa2b12638..488c72258b0e 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig -index f86dce403a42..5d501eec0edd 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig -@@ -20,6 +20,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig -index 6e947cf56827..6f7eaebd7676 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig -@@ -16,6 +16,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_CMD_MEMTEST=y - CONFIG_SYS_ALT_MEMTEST=y -diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig -index 1c934858c61c..7a3806cba4b5 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig -@@ -17,6 +17,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_CMD_MEMTEST=y - CONFIG_SYS_ALT_MEMTEST=y -diff --git a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig -index e13c7c56f310..e4408f182ca0 100644 ---- a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig -+++ b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig b/configs/xilinx_zynqmp_zcu102_revA_defconfig -index 5b2cd495ee85..b52f6789fd4b 100644 ---- a/configs/xilinx_zynqmp_zcu102_revA_defconfig -+++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig -index e6530fbfe7ff..80592554f682 100644 ---- a/configs/xilinx_zynqmp_zcu102_revB_defconfig -+++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y --- -2.7.4 - diff --git a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch b/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch deleted file mode 100644 index 95ab7b3b75..0000000000 --- a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch +++ /dev/null @@ -1,68 +0,0 @@ -From c7df098a71e05dc81cee818747759e8060b59626 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Mon, 4 Jun 2018 12:21:01 +0200 -Subject: [PATCH] arm64: zynqmp: accept an absolute path for PMUFW_INIT_FILE - -The value of PMUFW_INIT_FILE is prefixed with "$(srctree)/", thus -forcing it to be a relative path inside the U-Boot source tree. Since -the PMUFW is a binary file generated outside of U-Boot, the PMUFW -binary must be copied inside the U-Boot source tree before the -build. - -This generates a few problems: - - * if the source tree is shared among different out-of-tree builds, - they will pollute (and potentially corrupt) each other - * the source tree cannot be read-only - * any buildsystem must add a command to copy the PMUFW binary - * putting an externally-generated binary in the source tree is ugly - as hell - -Avoid these problems by accepting an absolute path for -PMUFW_INIT_FILE. This would be as simple as removing the "$(srctree)/" -prefix, but in order to keep backward compatibility we rather use the -shell and readlink to get the absolute path even when starting from a -relative path. - -Since 'readlink -f' produces an empty string if the file does not -exist, we also add a check to ensure the file configured in -PMUFW_INIT_FILE exists. Otherwise the build would exit successfully, -but produce a boot.bin without PMUFW as if PMUFW_INIT_FILE were empty. - -Tested in the 12 possible combinations of: - - PMUFW_INIT_FILE empty, relative, absolute, non-existing - - building in-tree, in subdir, in other directory - -Signed-off-by: Luca Ceresoli -Cc: Michal Simek -Cc: Simon Glass -Cc: Emmanuel Vadot -Signed-off-by: Michal Simek -Backported from upstream: https://git.denx.de/?p=u-boot.git;a=commit;h=c7df098a71e05dc81cee818747759e8060b59626 ---- - scripts/Makefile.spl | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl -index ef018b5b4056..252f13826d4c 100644 ---- a/scripts/Makefile.spl -+++ b/scripts/Makefile.spl -@@ -167,8 +167,14 @@ ifdef CONFIG_ARCH_ZYNQ - MKIMAGEFLAGS_boot.bin = -T zynqimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) - endif - ifdef CONFIG_ARCH_ZYNQMP -+ifneq ($(CONFIG_PMUFW_INIT_FILE),"") -+spl/boot.bin: zynqmp-check-pmufw -+zynqmp-check-pmufw: FORCE -+ ( cd $(srctree) && test -r $(CONFIG_PMUFW_INIT_FILE) ) \ -+ || ( echo "Cannot read $(CONFIG_PMUFW_INIT_FILE)" && false ) -+endif - MKIMAGEFLAGS_boot.bin = -T zynqmpimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) \ -- -n $(srctree)/$(CONFIG_PMUFW_INIT_FILE) -+ -n "$(shell cd $(srctree); readlink -f $(CONFIG_PMUFW_INIT_FILE))" - endif - - spl/boot.bin: $(obj)/u-boot-spl.bin FORCE --- -2.7.4 - diff --git a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch b/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch deleted file mode 100644 index b32e162780..0000000000 --- a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch +++ /dev/null @@ -1,175 +0,0 @@ -From 4c9d54ab5a41d65000c8d249b6fb1b76056f1812 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Wed, 20 Jun 2018 12:11:50 +0200 -Subject: [PATCH] arm/arm64: zynq/zynqmp: pass the PS init file as a kconfig - variable - -U-Boot needs to link ps7_init_gpl.c on Zynq or psu_init_gpl.c on -ZynqMP (PS init for short). The current logic to locate this file for -both platforms is: - - 1. if a board-specific file exists in - board/xilinx/zynq[mp]/$(CONFIG_DEFAULT_DEVICE_TREE)/ps?_init_gpl.c - then use it - 2. otherwise use board/xilinx/zynq/ps?_init_gpl.c - -In the latter case the file does not exist in the U-Boot sources and -must be copied in the source tree from the outside before starting the -build. This is typical when it is generated from Xilinx tools while -developing a custom hardware. However making sure that a -board-specific file is _not_ found (and used) requires some trickery -such as removing or overwriting all PS init files (e.g.: the current -meta-xilinx yocto layer [0]). - -This generates a few problems: - - * if the source tree is shared among different out-of-tree builds, - they will pollute (and potentially corrupt) each other - * the source tree cannot be read-only - * any buildsystem must add a command to copy the PS init file binary - * overwriting or deleting files in the source tree is ugly as hell - -Simplify usage by allowing to pass the path to the desired PS init -file in kconfig variable XILINX_PS_INIT_FILE. It can be an absolute -path or relative to $(srctree). If the variable is set, the -user-specified file will always be used without being copied -around. If the the variable is left empty, for backward compatibility -fall back to the old behaviour. - -Since the issue is the same for Zynq and ZynqMP, add one kconfig -variable in a common place and use it for both. - -Also use the new kconfig help text to document all the ways to give -U-Boot the PS init file. - -Build-tested with all combinations of: - - platform: zynq or zynqmp - - PS init file: from XILINX_PS_INIT_FILE (absolute, relative path, - non-existing), in-tree board-specific, in board/xilinx/zynq[mp]/ - - building in-tree, in subdir, in other directory - -[0] https://github.com/Xilinx/meta-xilinx/blob/b2f74cc7fe5c4881589d5e440a17cb51fc66a7ab/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init.inc#L9 - -Signed-off-by: Luca Ceresoli -Cc: Albert Aribaud -Cc: Michal Simek -Cc: Nathan Rossi -Backported from upstream: https://git.denx.de/?p=u-boot.git;a=commit;h=6da4f67ad09cd8b311d77b2b04e557b7ef65b56c ---- - arch/arm/Kconfig | 1 + - board/xilinx/Kconfig | 41 +++++++++++++++++++++++++++++++++++++++++ - board/xilinx/zynq/Makefile | 10 +++++++++- - board/xilinx/zynqmp/Makefile | 10 +++++++++- - 4 files changed, 60 insertions(+), 2 deletions(-) - create mode 100644 board/xilinx/Kconfig - -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 22234cde2ab6..e04979d0ef7e 100644 ---- a/arch/arm/Kconfig -+++ b/arch/arm/Kconfig -@@ -1293,4 +1293,5 @@ source "board/technologic/ts4600/Kconfig" - source "board/vscom/baltos/Kconfig" - source "board/woodburn/Kconfig" - source "board/work-microwave/work_92105/Kconfig" -+source "board/xilinx/Kconfig" - source "board/zipitz2/Kconfig" - - source "arch/arm/Kconfig.debug" -diff --git a/board/xilinx/Kconfig b/board/xilinx/Kconfig -new file mode 100644 -index 000000000000..aa3fa061edef ---- /dev/null -+++ b/board/xilinx/Kconfig -@@ -0,0 +1,41 @@ -+# Copyright (c) 2018, Luca Ceresoli -+# -+# SPDX-License-Identifier: GPL-2.0 -+ -+if ARCH_ZYNQ || ARCH_ZYNQMP -+ -+config XILINX_PS_INIT_FILE -+ string "Zynq/ZynqMP PS init file(s) location" -+ help -+ On Zynq and ZynqMP U-Boot SPL (or U-Boot proper if -+ ZYNQMP_PSU_INIT_ENABLED is set) is responsible for some -+ basic initializations, such as enabling peripherals and -+ configuring pinmuxes. The PS init file (called -+ psu_init_gpl.c on ZynqMP, ps7_init_gpl.c for Zynq-7000) -+ contains the code for such initializations. -+ -+ U-Boot contains PS init files for some boards, but each of -+ them describes only one specific configuration. Users of a -+ different board, or needing a different configuration, can -+ generate custom files using the Xilinx development tools. -+ -+ There are three ways to give a PS init file to U-Boot: -+ -+ 1. Set this variable to the path, either relative to the -+ source tree or absolute, where the psu_init_gpl.c or -+ ps7_init_gpl.c file is located. U-Boot will build this -+ file. -+ -+ 2. If you leave an empty string here, U-Boot will use -+ board/xilinx/zynq/$(CONFIG_DEFAULT_DEVICE_TREE)/ps7_init_gpl.c -+ for Zynq-7000, or -+ board/xilinx/zynqmp/$(CONFIG_DEFAULT_DEVICE_TREE)/psu_init_gpl.c -+ for ZynqMP. -+ -+ 3. If the above file does not exist, U-Boot will use -+ board/xilinx/zynq/ps7_init_gpl.c for Zynq-7000, or -+ board/xilinx/zynqmp/psu_init_gpl.c for ZynqMP. This file -+ is not provided by U-Boot, you have to copy it there -+ before the build. -+ -+endif -diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile -index 5a76a26720cd..03ad5f0532ee 100644 ---- a/board/xilinx/zynq/Makefile -+++ b/board/xilinx/zynq/Makefile -@@ -5,10 +5,18 @@ - - obj-y := board.o - --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE)) -+init-objs := ps_init_gpl.o -+spl/board/xilinx/zynq/ps_init_gpl.o board/xilinx/zynq/ps_init_gpl.o: $(PS_INIT_FILE) -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ -+endif - -+ifeq ($(init-objs),) -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/ps7_init_gpl.c),\ - $(hw-platform-y)/ps7_init_gpl.o) -+endif - - ifeq ($(init-objs),) - ifneq ($(wildcard $(srctree)/$(src)/ps7_init_gpl.c),) -diff --git a/board/xilinx/zynqmp/Makefile b/board/xilinx/zynqmp/Makefile -index 05ccd25dcef3..960b81fc5853 100644 ---- a/board/xilinx/zynqmp/Makefile -+++ b/board/xilinx/zynqmp/Makefile -@@ -5,10 +5,18 @@ - - obj-y := zynqmp.o - --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE)) -+init-objs := ps_init_gpl.o -+spl/board/xilinx/zynqmp/ps_init_gpl.o board/xilinx/zynqmp/ps_init_gpl.o: $(PS_INIT_FILE) -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ -+endif - -+ifeq ($(init-objs),) -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/psu_init_gpl.c),\ - $(hw-platform-y)/psu_init_gpl.o) -+endif - - ifeq ($(init-objs),) - ifneq ($(wildcard $(srctree)/$(src)/psu_init_gpl.c),) --- -2.7.4 - diff --git a/board/zynqmp/post-build.sh b/board/zynqmp/post-build.sh new file mode 100755 index 0000000000..9fd8bbf2c8 --- /dev/null +++ b/board/zynqmp/post-build.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +# genimage will need to find the extlinux.conf +# in the binaries directory + +BOARD_DIR="$(dirname $0)" + +install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux.conf diff --git a/board/zynqmp/post-image.sh b/board/zynqmp/post-image.sh index b2b99fed01..ed6dbe188c 100755 --- a/board/zynqmp/post-image.sh +++ b/board/zynqmp/post-image.sh @@ -10,4 +10,6 @@ FIRST_DT=$(sed -nr \ [ -z "${FIRST_DT}" ] || ln -fs ${FIRST_DT}.dtb ${BINARIES_DIR}/system.dtb -support/scripts/genimage.sh -c board/zynqmp/genimage.cfg +BOARD_DIR="$(dirname $0)" + +support/scripts/genimage.sh -c $BOARD_DIR/genimage.cfg diff --git a/board/zynqmp/zcu106/pm_cfg_obj.c b/board/zynqmp/zcu106/pm_cfg_obj.c new file mode 100644 index 0000000000..6d15d510e9 --- /dev/null +++ b/board/zynqmp/zcu106/pm_cfg_obj.c @@ -0,0 +1,562 @@ +/****************************************************************************** +* Copyright (c) 2017 - 2021 Xilinx, Inc. All rights reserved. +* SPDX-License-Identifier: MIT +******************************************************************************/ + +#include "xil_types.h" +#include "pm_defs.h" + +#define PM_CONFIG_MASTER_SECTION_ID 0x101U +#define PM_CONFIG_SLAVE_SECTION_ID 0x102U +#define PM_CONFIG_PREALLOC_SECTION_ID 0x103U +#define PM_CONFIG_POWER_SECTION_ID 0x104U +#define PM_CONFIG_RESET_SECTION_ID 0x105U +#define PM_CONFIG_SHUTDOWN_SECTION_ID 0x106U +#define PM_CONFIG_SET_CONFIG_SECTION_ID 0x107U +#define PM_CONFIG_GPO_SECTION_ID 0x108U + +#define PM_SLAVE_FLAG_IS_SHAREABLE 0x1U +#define PM_MASTER_USING_SLAVE_MASK 0x2U + +#define PM_CONFIG_GPO1_MIO_PIN_34_MAP (1U << 10U) +#define PM_CONFIG_GPO1_MIO_PIN_35_MAP (1U << 11U) +#define PM_CONFIG_GPO1_MIO_PIN_36_MAP (1U << 12U) +#define PM_CONFIG_GPO1_MIO_PIN_37_MAP (1U << 13U) + +#define PM_CONFIG_GPO1_BIT_2_MASK (1U << 2U) +#define PM_CONFIG_GPO1_BIT_3_MASK (1U << 3U) +#define PM_CONFIG_GPO1_BIT_4_MASK (1U << 4U) +#define PM_CONFIG_GPO1_BIT_5_MASK (1U << 5U) + +#define SUSPEND_TIMEOUT 0xFFFFFFFFU + +#define PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK 0x00000001 +#define PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK 0x00000100 +#define PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK 0x00000200 + + + +#if defined (__ICCARM__) +#pragma language=save +#pragma language=extended +#endif +#if defined (__GNUC__) + const u32 XPm_ConfigObject[] __attribute__((used, section(".sys_cfg_data"))) = +#elif defined (__ICCARM__) +#pragma location = ".sys_cfg_data" +__root const u32 XPm_ConfigObject[] = +#endif +{ + /**********************************************************************/ + /* HEADER */ + 2, /* Number of remaining words in the header */ + 8, /* Number of sections included in config object */ + 1U, /* Type of config object as base */ + /**********************************************************************/ + /* MASTER SECTION */ + PM_CONFIG_MASTER_SECTION_ID, /* Master SectionID */ + 3U, /* No. of Masters*/ + + NODE_APU, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_0, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_1, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Wake permissions */ + + + /**********************************************************************/ + /* SLAVE SECTION */ + + + PM_CONFIG_SLAVE_SECTION_ID, /* Section ID */ + 49, /* Number of slaves */ + + NODE_OCM_BANK_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TCM_0_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_0_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_1_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TCM_1_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_L2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU_PP_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU_PP_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_USB_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_USB_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_TTC_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SATA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_ETH_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_UART_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_UART_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SPI_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_SPI_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_I2C_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_I2C_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SD_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_SD_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_DP, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GDMA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_ADMA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_NAND, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_QSPI, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPIO, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_CAN_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_CAN_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_EXTERN, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_DDR, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_IPI_APU, + 0U, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_0, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_1, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_PCIE, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_PCAP, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_RTC, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_VCU, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_PL, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + + /**********************************************************************/ + /* PREALLOC SECTION */ + + PM_CONFIG_PREALLOC_SECTION_ID, /* Preallaoc SectionID */ + 3U, /* No. of Masters*/ + +/* Prealloc for psu_cortexa53_0 */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, + 12, + NODE_DDR, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_L2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_3, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_SD_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_QSPI, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_PL, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_APU, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_0 */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + 3, + NODE_TCM_0_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_0_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_1 */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + 3, + NODE_TCM_1_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_1_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + + /**********************************************************************/ + /* POWER SECTION */ + + PM_CONFIG_POWER_SECTION_ID, /* Power Section ID */ + 4U, /* Number of power nodes */ + + NODE_APU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_RPU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_FPD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_PLD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + + /**********************************************************************/ + /* RESET SECTION */ + + PM_CONFIG_RESET_SECTION_ID, /* Reset Section ID */ + 120U, /* Number of resets */ + + XILPM_RESET_PCIE_CFG, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_BRIDGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_CTRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRF, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GDMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SATA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APU_L2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DDR, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SOFT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_QSPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_NAND, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ADMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOU_CC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TIMESTAMP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R50, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R51, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_AMBA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_OCM, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_PGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RTC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SYSMON, 0, + XILPM_RESET_AFI_FM6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_LPD_SWDT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_FPD, PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + XILPM_RESET_RPU_DBG1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_DBG0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_VPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_7, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_8, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_9, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_10, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_11, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_12, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_13, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_14, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_15, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_16, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_17, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_18, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_19, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_20, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_21, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_22, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_23, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_24, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_25, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_26, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_27, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_28, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_29, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_30, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_31, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_LS, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PS_ONLY, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_92, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_93, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_94, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_95, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + + /**********************************************************************/ + /* SET CONFIG SECTION */ + PM_CONFIG_SET_CONFIG_SECTION_ID, /* Set Config Section ID */ + 0U, /* Permissions to load base config object */ + 0U, /* Permissions to load overlay config object */ + + /**********************************************************************/ + /* SHUTDOWN SECTION */ + + PM_CONFIG_SHUTDOWN_SECTION_ID, /* Shutdown Section ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* System Shutdown/Restart Permission */ + + /**********************************************************************/ + /* GPO SECTION */ + PM_CONFIG_GPO_SECTION_ID, /* GPO Section ID */ + PM_CONFIG_GPO1_MIO_PIN_34_MAP | + PM_CONFIG_GPO1_MIO_PIN_35_MAP | + PM_CONFIG_GPO1_MIO_PIN_36_MAP | + PM_CONFIG_GPO1_MIO_PIN_37_MAP | + 0, /* State of GPO pins */ +}; +#if defined (__ICCARM__) +#pragma language=restore +#endif + diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index bee7c1daf7..4910252f78 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -1,34 +1,39 @@ BR2_aarch64=y -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="966124532656bc95d781abf57531e4cd4f962237" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="e678d5ddc475f34dea8f5004fb6ebde118621784" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA" +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="667001319cbe511ce6353195fb4910ae5cb041ce" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/53fdb7b6c92860ceb0ec5fd14deee302f4a84269/bin/pmufw-zcu106-default-v2017.4.bin" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/v2021.2/bin/pmufw-v2021.2.bin" +BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/zcu106/pm_cfg_obj.c" +BR2_TARGET_UBOOT_FORMAT_ITB=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -- 2.17.1 From Eugen.Hristev at microchip.com Fri Feb 11 14:53:36 2022 From: Eugen.Hristev at microchip.com (Eugen.Hristev at microchip.com) Date: Fri, 11 Feb 2022 14:53:36 +0000 Subject: [Buildroot] [PATCH] configs/microchip_sama7g5ek_mmc_dev_defconfig: add rng tools In-Reply-To: References: <20220211140855.917229-1-eugen.hristev@microchip.com> Message-ID: On 2/11/22 4:31 PM, Giulio Benetti wrote: > Hi Engin, All, > > sorry for html but I?m on mobile, > >> Il giorno 11 feb 2022, alle ore 15:09, Eugen Hristev via buildroot ha scritto: >> >> ?Add rng tools. Without this, when booting, prompt will not >> appear until 'random: crng init done' appears. >> Avoid this by using rng tools without the libjitterentropy. >> Libjitterentropy is a jitter source of entropy which does >> not help for AT91 cpus as the jitter does not have >> enough variance to generate fast enough entropy. >> >> Signed-off-by: Eugen Hristev >> --- >> Hi, >> >> This should go for 2022.02 in my opinion. >> >> Thanks, > > Here you should add other 3 dashes more. > > Thank you for providing such fix. Unfortunately I didn?t have the hardware to test and fix it. I tested it on the real board, on top of your pending fix for the kernel build which I also tested earlier this week. > > Reviewed-by: Giulio Benetti > > Best regards > ?- > Giulio Benetti > Benetti Engineering sas > >> >> configs/microchip_sama7g5ek_mmc_dev_defconfig | 2 ++ >> 1 file changed, 2 insertions(+) >> >> diff --git a/configs/microchip_sama7g5ek_mmc_dev_defconfig b/configs/microchip_sama7g5ek_mmc_dev_defconfig >> index 3253bce401..895e63edcd 100644 >> --- a/configs/microchip_sama7g5ek_mmc_dev_defconfig >> +++ b/configs/microchip_sama7g5ek_mmc_dev_defconfig >> @@ -27,6 +27,8 @@ BR2_PACKAGE_MMC_UTILS=y >> BR2_PACKAGE_MTD=y >> BR2_PACKAGE_WILC1000_FIRMWARE=y >> BR2_PACKAGE_EVTEST=y >> +BR2_PACKAGE_RNG_TOOLS=y >> +# BR2_PACKAGE_RNG_TOOLS_JITTERENTROPY_LIBRARY is not set >> BR2_PACKAGE_SETSERIAL=y >> BR2_PACKAGE_SPI_TOOLS=y >> BR2_PACKAGE_USBUTILS=y >> -- >> 2.33.0 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > From ps.report at gmx.net Fri Feb 11 15:06:03 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 11 Feb 2022 16:06:03 +0100 Subject: [Buildroot] [PATCH v6 0/1] package/libcamera-apps: new package Message-ID: <20220211150604.23489-1-ps.report@gmx.net> - patch on top of latest libcamera version bump ([1]) - tested with test-pkg and the following test config BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER=y BR2_PACKAGE_MESA3D_DRIVER=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y BR2_PACKAGE_MESA3D_GBM=y BR2_PACKAGE_MESA3D_OPENGL_EGL=y BR2_PACKAGE_XORG7=y BR2_PACKAGE_XLIB_LIBX11=y BR2_PACKAGE_LIBEPOXY=y BR2_PACKAGE_LIBDRM=y BR2_PACKAGE_BOOST=y BR2_PACKAGE_BOOST_PROGRAM_OPTIONS=y BR2_PACKAGE_LIBEXIF=y BR2_PACKAGE_JPEG=y BR2_PACKAGE_TIFF=y BR2_PACKAGE_LIBPNG=y BR2_PACKAGE_LIBCAMERA=y BR2_PACKAGE_LIBCAMERA_V4L2=y - runtime tested on RPi3-b-plus/Pi-Camaera-v2.1) with the followig defconfig (raspberrypi3_64_defconfig based) 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_MTOOLS=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_PACKAGE_LIBXKBCOMMON=y BR2_PACKAGE_LIBCAMERA_V4L2=y BR2_PACKAGE_LIBCAMERA_PIPELINE_RASPBERRYPI=y BR2_PACKAGE_LIBCAMERA_PIPELINE_RKISP1=y BR2_PACKAGE_LIBCAMERA_PIPELINE_SIMPLE=y BR2_PACKAGE_LIBCAMERA_PIPELINE_UVCVIDEO=y BR2_PACKAGE_LIBCAMERA_PIPELINE_VIMC=y BR2_PACKAGE_LIBCAMERA_COMPLIANCE=y BR2_PACKAGE_LIBCAMERA_APPS=y BR2_PACKAGE_DDRESCUE=y 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 and the additional /boot/config.txt entries dtoverlay=vc4-kms-v3d dtoverlay=imx219 and the followig change in the kernel config to fix imx219 camera detection ('imx219 10-0010: failed to get regulators') @@ -3485,7 +3485,7 @@ CONFIG_REGULATOR=y # CONFIG_REGULATOR_DEBUG is not set -# CONFIG_REGULATOR_FIXED_VOLTAGE is not set +CONFIG_REGULATOR_FIXED_VOLTAGE=y # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set # CONFIG_REGULATOR_USERSPACE_CONSUMER is not set # CONFIG_REGULATOR_88PG86X is not set and the following libcamera patch to disable the signature check (see [2] and [3] for details) diff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp index ad05b9c9..66d4ea48 100644 --- a/src/libcamera/ipa_manager.cpp +++ b/src/libcamera/ipa_manager.cpp @@ -302,6 +302,9 @@ std::unique_ptr IPAManager::createIPA(PipelineHandler *pipe, bool IPAManager::isSignatureValid([[maybe_unused]] IPAModule *ipa) const { +#if 1 + return true; +#else #if HAVE_IPA_PUBKEY File file{ ipa->path() }; if (!file.open(File::ReadOnly)) @@ -321,6 +324,7 @@ bool IPAManager::isSignatureValid([[maybe_unused]] IPAModule *ipa) const #else return false; #endif +#endif } } /* namespace libcamera */ [1] https://patchwork.ozlabs.org/project/buildroot/patch/20220211112245.1357817-1-kieran.bingham at ideasonboard.com/ [2] https://lists.buildroot.org/pipermail/buildroot/2020-June/284963.html [3] http://lists.busybox.net/pipermail/buildroot/2021-January/302373.html Peter Seiderer (1): package/libcamera-apps: new package DEVELOPERS | 1 + package/Config.in | 1 + ...ror-and-Wfatal-errors-compiler-comma.patch | 37 +++++++++++++++ package/libcamera-apps/Config.in | 30 ++++++++++++ package/libcamera-apps/libcamera-apps.hash | 3 ++ package/libcamera-apps/libcamera-apps.mk | 46 +++++++++++++++++++ 6 files changed, 118 insertions(+) create mode 100644 package/libcamera-apps/0001-cmake-remove-Werror-and-Wfatal-errors-compiler-comma.patch create mode 100644 package/libcamera-apps/Config.in create mode 100644 package/libcamera-apps/libcamera-apps.hash create mode 100644 package/libcamera-apps/libcamera-apps.mk -- 2.34.1 From ps.report at gmx.net Fri Feb 11 15:06:04 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 11 Feb 2022 16:06:04 +0100 Subject: [Buildroot] [PATCH v6 1/1] package/libcamera-apps: new package In-Reply-To: <20220211150604.23489-1-ps.report@gmx.net> References: <20220211150604.23489-1-ps.report@gmx.net> Message-ID: <20220211150604.23489-2-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- Changes v5 -> v6: - bump version to 2d1009e - refresh 0001-cmake-remove-Werror-and-Wfatal-errors-compiler-comma.patch update to remove -Werror and -Wfatal-errors and add failure description - libdrm, libepoxy, xlib_libX11 are now optional - disable opencv (opencv2) and tflite support - optional libdrm support - optional X11 support - optional Qt5 support Changes v4 -> v5: - rebased on master, updated version to 326fdfd Changes v3 -> v4: - bump version - remove 14 upstream applied patches Changes v2 -> v3: - bump version - add license file entry/hash - exchange patch 0002-cmake-remove-unrecognized-gcc-command-line-option.patch with 0002-cmake-add-option-ENABLE_COMPILE_FLAGS_FOR_TARGET.patch (a upstream suggested solution) and add cmake configure option accordingly Changes v1 -> v2: - fix Config.in indent (Thomas Petazzoni) - fix Config.in select ordering (Thomas Petazzoni) - fix Config.in comment regarding OpenGL - change download to use github macro (Thomas Petazzoni) - update 0001-cmake-remove-unsafe-host-include-path-for-libdrm-use.patch (add upstream link) - update 0002-cmake-remove-unrecognized-gcc-command-line-option.patch (add upstream link) - update 0003-cmake-remove-Wfatal-errors-compiler-command-line-opt.patch (new patch) - update 0004-libcamera_vid-fix-getline-call-needs-size_t.patch (add upstream link) - update 0005-libcamera_still-fix-getline-call-needs-size_t.patch (add upstream link) - update 0006-libcamera_app-fix-int64_t-constants.patch (add upstream link) - update 0007-cmake-fix-linking-with-exif-jpeg.patch (add upstream link) - update 0008-cmake-add-install-target.patch (add upstream link, update on upstream request to support older cmake versions - add DESTINATION defaults) - update 0009-cmake-no-need-to-link-against-ipa_rpi.so.patch (add upstream link) - update 0010-circular_output-fix-size_t-vs.-unsigned-int-narrowin.patch (new patch) - update 0011-egl_preview-fix-XVisualInfo-initializer.patch (new patch) - update 0012-jpeg-fix-long-unsigned-int-vs.-size_t-mismatch.patch (new patch) - update 0013-jpeg-fix-bool-vs.-boolean-mismatch.patch (new patch) - update 0014-mjpeg_encoder-fix-long-unsigned-int-vs.-size_t-misma.patch (new patch) - update 0015-mjpeg_encoder-fix-bool-vs.-boolean-mismatch.patch (new patch) --- DEVELOPERS | 1 + package/Config.in | 1 + ...ror-and-Wfatal-errors-compiler-comma.patch | 37 +++++++++++++++ package/libcamera-apps/Config.in | 30 ++++++++++++ package/libcamera-apps/libcamera-apps.hash | 3 ++ package/libcamera-apps/libcamera-apps.mk | 46 +++++++++++++++++++ 6 files changed, 118 insertions(+) create mode 100644 package/libcamera-apps/0001-cmake-remove-Werror-and-Wfatal-errors-compiler-comma.patch create mode 100644 package/libcamera-apps/Config.in create mode 100644 package/libcamera-apps/libcamera-apps.hash create mode 100644 package/libcamera-apps/libcamera-apps.mk diff --git a/DEVELOPERS b/DEVELOPERS index 0e759bc168..acf8438ab8 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2272,6 +2272,7 @@ F: package/gstreamer1/gst1-devtools/ F: package/gstreamer1/gst1-interpipe/ F: package/gstreamer1/gstreamer1-editing-services/ F: package/iwd/ +F: package/libcamera-apps/ F: package/libevdev/ F: package/libuev/ F: package/log4cplus/ diff --git a/package/Config.in b/package/Config.in index 1a9f3e29d8..0dfd2e89db 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1731,6 +1731,7 @@ menu "Multimedia" source "package/libbdplus/Config.in" source "package/libbluray/Config.in" source "package/libcamera/Config.in" + source "package/libcamera-apps/Config.in" source "package/libdcadec/Config.in" source "package/libdvbcsa/Config.in" source "package/libdvbpsi/Config.in" diff --git a/package/libcamera-apps/0001-cmake-remove-Werror-and-Wfatal-errors-compiler-comma.patch b/package/libcamera-apps/0001-cmake-remove-Werror-and-Wfatal-errors-compiler-comma.patch new file mode 100644 index 0000000000..988d89cca3 --- /dev/null +++ b/package/libcamera-apps/0001-cmake-remove-Werror-and-Wfatal-errors-compiler-comma.patch @@ -0,0 +1,37 @@ +From 6bd733b52f0b4039407c676cd3126a9e2f79456b Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Fri, 5 Feb 2021 18:24:08 +0100 +Subject: [PATCH] cmake: remove -Werror and -Wfatal-errors compiler command + line option +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes (with bootlin-riscv64-musl toolchain): + + .../build/libcamera-apps-2d1009e3badcc8047361ff81149ad6cba3b911b5/core/libcamera_app.cpp:30:22: error: overflow in conversion from ?long unsigned int? to ?int? changes value from ?2154321408? to ?-2140645888? [-Werror=overflow] + 30 | int ret = ioctl(fd, VIDIOC_QUERYCAP, &caps); + | ^~~~~~~~~~~~~~~ + cc1plus: all warnings being treated as errors + +Signed-off-by: Peter Seiderer +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 748c6dd..1ca1e39 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -11,7 +11,7 @@ endif() + + set (CMAKE_EXPORT_COMPILE_COMMANDS ON) + set (CMAKE_CXX_STANDARD 17) +-add_compile_options(-Wall -Wextra -pedantic -Wno-unused-parameter -faligned-new -Werror -Wfatal-errors) ++add_compile_options(-Wall -Wextra -pedantic -Wno-unused-parameter -faligned-new) + add_definitions(-D_FILE_OFFSET_BITS=64) + + if (CMAKE_COMPILER_IS_GNUCXX) +-- +2.34.1 + diff --git a/package/libcamera-apps/Config.in b/package/libcamera-apps/Config.in new file mode 100644 index 0000000000..75807b9c01 --- /dev/null +++ b/package/libcamera-apps/Config.in @@ -0,0 +1,30 @@ +config BR2_PACKAGE_LIBCAMERA_APPS + bool "libcamera-apps" + depends on BR2_PACKAGE_LIBCAMERA_ARCH_SUPPORTS # libcamera + depends on BR2_INSTALL_LIBSTDCPP # libcamera/boost + depends on BR2_TOOLCHAIN_HAS_THREADS # libcamera/boost + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17/libcamera + depends on !BR2_STATIC_LIBS # gnutls/libcamera + depends on BR2_USE_WCHAR # gnutls/libcamera/boost + select BR2_PACKAGE_BOOST + select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS + select BR2_PACKAGE_JPEG + select BR2_PACKAGE_LIBCAMERA + select BR2_PACKAGE_LIBEXIF + select BR2_PACKAGE_LIBPNG + select BR2_PACKAGE_TIFF + select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 && (BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL) + select BR2_PACKAGE_LIBEPOXY if BR2_PACKAGE_XORG7 && (BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL) + select BR2_PACKAGE_QT5BASE_GUI if BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT5BASE_WIDGETS if BR2_PACKAGE_QT5 + + help + This is a small suite of libcamera-based apps that aim to copy + the functionality of the existing "raspicam" apps. + + https://github.com/raspberrypi/libcamera-apps + +comment "libcamera-apps needs a toolchain w/ C++, threads, wchar, dynamic library, gcc >= 7" + 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 diff --git a/package/libcamera-apps/libcamera-apps.hash b/package/libcamera-apps/libcamera-apps.hash new file mode 100644 index 0000000000..2dbb74d463 --- /dev/null +++ b/package/libcamera-apps/libcamera-apps.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 611aec06dd24de6586580164d9b7c55da0698ac4cf129944b2fc41fe67210597 libcamera-apps-2d1009e3badcc8047361ff81149ad6cba3b911b5.tar.gz +sha256 36dfed86bdef661a0a14ec1a1cc84c771d5a06b6f9b92e9ebb610ba711bd528a license.txt diff --git a/package/libcamera-apps/libcamera-apps.mk b/package/libcamera-apps/libcamera-apps.mk new file mode 100644 index 0000000000..23cc02793d --- /dev/null +++ b/package/libcamera-apps/libcamera-apps.mk @@ -0,0 +1,46 @@ +################################################################################ +# +# libcamera-apps +# +################################################################################ + +LIBCAMERA_APPS_VERSION = 2d1009e3badcc8047361ff81149ad6cba3b911b5 +LIBCAMERA_APPS_SITE = $(call github,raspberrypi,libcamera-apps,$(LIBCAMERA_APPS_VERSION)) +LIBCAMERA_APPS_LICENSE = BSD-2-Clause +LIBCAMERA_APPS_LICENSE_FILES = license.txt +LIBCAMERA_APPS_DEPENDENCIES = \ + host-pkgconf \ + boost \ + jpeg \ + libcamera \ + libexif \ + libpng \ + tiff + +LIBCAMERA_APPS_CONF_OPTS = \ + -DENABLE_COMPILE_FLAGS_FOR_TARGET=disabled \ + -DENABLE_OPENCV=0 \ + -DENABLE_TFLITE=0 + +ifeq ($(BR2_PACKAGE_LIBDRM),y) +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_DRM=1 +LIBCAMERA_APPS_DEPENDENCIES += libdrm +else +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_DRM=0 +endif + +ifeq ($(BR2_PACKAGE_XORG7)$(BR2_PACKAGE_LIBEPOXY),yy) +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_X11=1 +LIBCAMERA_APPS_DEPENDENCIES += libepoxy xlib_libX11 +else +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_X11=0 +endif + +ifeq ($(BR2_PACKAGE_QT5)$(BR2_PACKAGE_QT5BASE_GUI)$(BR2_PACKAGE_QT5BASE_WIDGETS),yyy) +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_QT=1 +LIBCAMERA_APPS_DEPENDENCIES += qt5base +else +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_QT=0 +endif + +$(eval $(cmake-package)) -- 2.34.1 From yann.morin.1998 at free.fr Fri Feb 11 16:25:24 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 11 Feb 2022 17:25:24 +0100 Subject: [Buildroot] [git commit] support/download/helpers: adjust for older coreutils versions Message-ID: <20220211170444.4CABA82DEA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6e40891a6679bc0dd87af32d5e672180751987b9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The -z option for head was only added in coreutils 8.25, but some older enterprise-grade distributions (e.g. the oldest still maintained RHEL 7) only have nothing more recent than coreutils 8.22. We fix that by using sed to remove everything that starts with the first NULL byte, \x00. Signed-off-by: Clayton Shotwell [yann.morin.1998 at free.fr: hex is \xHH, not \xH, reword commit log] Signed-off-by: Yann E. MORIN --- support/download/helpers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/download/helpers b/support/download/helpers index ab31e27a69..90a7d6c1ec 100755 --- a/support/download/helpers +++ b/support/download/helpers @@ -79,7 +79,7 @@ post_process_unpack() { mkdir "${dest}" 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")" + one_file="$(find "${dest}" -type f -print0 |LC_ALL=C sort -z |sed 's/\x0.*//')" touch -r "${one_file}" "${dest}.timestamp" } From yann.morin.1998 at free.fr Fri Feb 11 17:12:13 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 11 Feb 2022 18:12:13 +0100 Subject: [Buildroot] [PATCH] support/download/post-process-helpers: adjust for older coreutils versions In-Reply-To: <20220210232327.119488-1-clayton.shotwell@rockwellcollins.com> References: <20220210232327.119488-1-clayton.shotwell@rockwellcollins.com> Message-ID: <20220211171213.GD3752867@scaer> Clayton, All, On 2022-02-10 17:23 -0600, Clayton Shotwell spake thusly: > From: Clayton Shotwell > > Ran into an issue with the post_process_unpack function using "head -z" > on a RHEL box which is using an older version or coreutils. The "-z" > flag was added in coreutils v8.25 but my IT managed RHEL box is only > using v8.22. The fix I have implemented relies on the null terminated > list and sed to remove the first null character and everthing > afterwards. coreutils v8.25 were released 2016-01-20, more than 6 years ago now, and v8.22 were released 2013-12-13, more than eight years ago. That is sad that you have to use an up-to-date Buildroot (even one that is not even yet released!) with such an old system... :-/ > Signed-off-by: Clayton Shotwell > --- > support/download/helpers | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/support/download/helpers b/support/download/helpers > index ab31e27..90a7d6c 100755 > --- a/support/download/helpers > +++ b/support/download/helpers > @@ -79,7 +79,7 @@ post_process_unpack() { > > mkdir "${dest}" > 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")" > + one_file="$(find "${dest}" -type f -print0 |LC_ALL=C sort -z |sed 's/\x0.*//')" As far as I know, hexa needs two digits to represent a byte, so \x00 http://sed.sourceforge.net/grabbag/tutorials/sedfaq.txt 4.2. How do I represent control-codes or nonprintable characters? Several versions of sed support the notation \xHH, where "HH" are two hex digits, 00-FF [...] So I fixed that, and applied to master, with a rewokred commit log, thanks. Regards, Yann E. MORIN. > touch -r "${one_file}" "${dest}.timestamp" > } > > -- > 1.8.3.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 wbx at openadk.org Fri Feb 11 18:06:51 2022 From: wbx at openadk.org (Waldemar Brodkorb) Date: Fri, 11 Feb 2022 19:06:51 +0100 Subject: [Buildroot] [PATCH 1/2] package/binutils: fixes glibc build compiled with -Os on x86 Message-ID: See here: https://sourceware.org/bugzilla/show_bug.cgi?id=28870 Signed-off-by: Waldemar Brodkorb --- ...OT32-relocations-against-ABS-symbols.patch | 46 ++++++++++++++++ ...OT32-relocations-against-ABS-symbols.patch | 53 +++++++++++++++++++ ...OT32-relocations-against-ABS-symbols.patch | 47 ++++++++++++++++ 3 files changed, 146 insertions(+) create mode 100644 package/binutils/2.35.2/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch create mode 100644 package/binutils/2.36.1/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch create mode 100644 package/binutils/2.37/0007-i386-Allow-GOT32-relocations-against-ABS-symbols.patch diff --git a/package/binutils/2.35.2/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch b/package/binutils/2.35.2/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch new file mode 100644 index 0000000000..e95eb1e7c5 --- /dev/null +++ b/package/binutils/2.35.2/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch @@ -0,0 +1,46 @@ +From 30a954525f4e53a9cd50a1a8a6f201c7cf6595c7 Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" +Date: Mon, 7 Feb 2022 15:22:19 -0800 +Subject: [PATCH] i386: Allow GOT32 relocations against ABS symbols + +GOT32 relocations are allowed since absolute value + addend is stored in +the GOT slot. + +Tested on glibc 2.35 build with GCC 11.2 and -Os. + +bfd/ + + PR ld/28870 + * elfxx-x86.c (_bfd_elf_x86_valid_reloc_p): Also allow GOT32 + relocations. + +Signed-off-by: Waldemar Brodkorb + +diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c +index 7ac2411fc80..d00dc45677b 100644 +--- a/bfd/elfxx-x86.c ++++ b/bfd/elfxx-x86.c +@@ -1942,9 +1942,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section, + irel = *rel; + + /* Only allow relocations against absolute symbol, which can be +- resolved as absolute value + addend. GOTPCREL relocations +- are allowed since absolute value + addend is stored in the +- GOT slot. */ ++ resolved as absolute value + addend. GOTPCREL and GOT32 ++ relocations are allowed since absolute value + addend is ++ stored in the GOT slot. */ + if (bed->target_id == X86_64_ELF_DATA) + { + r_type &= ~R_X86_64_converted_reloc_bit; +@@ -1965,7 +1965,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section, + else + valid_p = (r_type == R_386_32 + || r_type == R_386_16 +- || r_type == R_386_8); ++ || r_type == R_386_8 ++ || r_type == R_386_GOT32 ++ || r_type == R_386_GOT32X); + + if (valid_p) + *no_dynreloc_p = true; diff --git a/package/binutils/2.36.1/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch b/package/binutils/2.36.1/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch new file mode 100644 index 0000000000..af96f1a0f0 --- /dev/null +++ b/package/binutils/2.36.1/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch @@ -0,0 +1,53 @@ +From 30a954525f4e53a9cd50a1a8a6f201c7cf6595c7 Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" +Date: Mon, 7 Feb 2022 15:22:19 -0800 +Subject: [PATCH] i386: Allow GOT32 relocations against ABS symbols + +GOT32 relocations are allowed since absolute value + addend is stored in +the GOT slot. + +Tested on glibc 2.35 build with GCC 11.2 and -Os. + +bfd/ + + PR ld/28870 + * elfxx-x86.c (_bfd_elf_x86_valid_reloc_p): Also allow GOT32 + relocations. + +ld/ + + PR ld/28870 + * testsuite/ld-i386/i386.exp: Run pr28870. + * testsuite/ld-i386/pr28870.d: New file. + * testsuite/ld-i386/pr28870.s: Likewise. + +Signed-off-by: Waldemar Brodkorb + +diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c +index 7ac2411fc80..d00dc45677b 100644 +--- a/bfd/elfxx-x86.c ++++ b/bfd/elfxx-x86.c +@@ -1942,9 +1942,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section, + irel = *rel; + + /* Only allow relocations against absolute symbol, which can be +- resolved as absolute value + addend. GOTPCREL relocations +- are allowed since absolute value + addend is stored in the +- GOT slot. */ ++ resolved as absolute value + addend. GOTPCREL and GOT32 ++ relocations are allowed since absolute value + addend is ++ stored in the GOT slot. */ + if (bed->target_id == X86_64_ELF_DATA) + { + r_type &= ~R_X86_64_converted_reloc_bit; +@@ -1965,7 +1965,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section, + else + valid_p = (r_type == R_386_32 + || r_type == R_386_16 +- || r_type == R_386_8); ++ || r_type == R_386_8 ++ || r_type == R_386_GOT32 ++ || r_type == R_386_GOT32X); + + if (valid_p) + *no_dynreloc_p = true; diff --git a/package/binutils/2.37/0007-i386-Allow-GOT32-relocations-against-ABS-symbols.patch b/package/binutils/2.37/0007-i386-Allow-GOT32-relocations-against-ABS-symbols.patch new file mode 100644 index 0000000000..3e29282261 --- /dev/null +++ b/package/binutils/2.37/0007-i386-Allow-GOT32-relocations-against-ABS-symbols.patch @@ -0,0 +1,47 @@ +From 30a954525f4e53a9cd50a1a8a6f201c7cf6595c7 Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" +Date: Mon, 7 Feb 2022 15:22:19 -0800 +Subject: [PATCH] i386: Allow GOT32 relocations against ABS symbols + +GOT32 relocations are allowed since absolute value + addend is stored in +the GOT slot. + +Tested on glibc 2.35 build with GCC 11.2 and -Os. + +bfd/ + + PR ld/28870 + * elfxx-x86.c (_bfd_elf_x86_valid_reloc_p): Also allow GOT32 + relocations. + + +Signed-off-by: Waldemar Brodkorb + +diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c +index 7ac2411fc80..d00dc45677b 100644 +--- a/bfd/elfxx-x86.c ++++ b/bfd/elfxx-x86.c +@@ -1942,9 +1942,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section, + irel = *rel; + + /* Only allow relocations against absolute symbol, which can be +- resolved as absolute value + addend. GOTPCREL relocations +- are allowed since absolute value + addend is stored in the +- GOT slot. */ ++ resolved as absolute value + addend. GOTPCREL and GOT32 ++ relocations are allowed since absolute value + addend is ++ stored in the GOT slot. */ + if (bed->target_id == X86_64_ELF_DATA) + { + r_type &= ~R_X86_64_converted_reloc_bit; +@@ -1965,7 +1965,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section, + else + valid_p = (r_type == R_386_32 + || r_type == R_386_16 +- || r_type == R_386_8); ++ || r_type == R_386_8 ++ || r_type == R_386_GOT32 ++ || r_type == R_386_GOT32X); + + if (valid_p) + *no_dynreloc_p = true; -- 2.30.2 From wbx at openadk.org Fri Feb 11 18:08:07 2022 From: wbx at openadk.org (Waldemar Brodkorb) Date: Fri, 11 Feb 2022 19:08:07 +0100 Subject: [Buildroot] [PATCH 2/2] package/{glibc, localedef}: update to 2.35 Message-ID: https://sourceware.org/pipermail/libc-alpha/2022-February/136040.html - allow to use optimization CFLAGS (not CPPFLAGS) which are nowadays supported by upstream (except nios2) - enable support for or1k, which is now included upstream - runtime tested with qemu-system for aarch64/arm/microblaze/mips/mips64/nios2/ or1k/powerpc/powerpc64/powerpc64le/riscv32/riscv64/s390x/sh4/sparc64/x86/x86_64 Signed-off-by: Waldemar Brodkorb --- ...v-linux-microblaze-pselect32.c-add-m.patch | 85 ------------------- .../glibc.hash | 2 +- package/glibc/glibc.mk | 16 ++-- ...ACK-only-build-and-install-localedef.patch | 0 ...y-on-GCC-to-4.8-and-binutils-to-2.24.patch | 0 .../localedef.hash | 2 +- package/localedef/localedef.mk | 2 +- toolchain/toolchain-buildroot/Config.in | 3 +- 8 files changed, 15 insertions(+), 95 deletions(-) delete mode 100644 package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch rename package/glibc/{2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c => 2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586}/glibc.hash (70%) rename package/localedef/{2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c => 2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586}/0001-HACK-only-build-and-install-localedef.patch (100%) rename package/localedef/{2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c => 2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586}/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch (100%) rename package/localedef/{2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c => 2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586}/localedef.hash (70%) diff --git a/package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch b/package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch deleted file mode 100644 index 3597cd6a11..0000000000 --- a/package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch +++ /dev/null @@ -1,85 +0,0 @@ -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 - diff --git a/package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/glibc.hash b/package/glibc/2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586/glibc.hash similarity index 70% rename from package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/glibc.hash rename to package/glibc/2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586/glibc.hash index dfd939020f..f28c15c2a3 100644 --- a/package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/glibc.hash +++ b/package/glibc/2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586/glibc.hash @@ -1,5 +1,5 @@ # Locally calculated (fetched from Github) -sha256 3c299a21468a80356b848ca341f45551616c4928a6c871e6d45cee942e8b0f24 glibc-2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c.tar.gz +sha256 0ca43b2a6cd74609519554303a16e350abdac0e66943c5d98d91228233c826a0 glibc-2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586.tar.gz # Hashes for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index 2702994c6b..f258f33c96 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -7,7 +7,7 @@ # Generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- # When updating the version, please also update localedef -GLIBC_VERSION = 2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c +GLIBC_VERSION = 2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586 # Upstream doesn't officially provide an https download link. # There is one (https://sourceware.org/git/glibc.git) but it's not reliable, # sometimes the connection times out. So use an unofficial github mirror. @@ -110,16 +110,20 @@ endif # # 2. We have to execute the configure script with bash and not sh. # -# Note that as mentionned in -# http://patches.openembedded.org/patch/38849/, glibc must be -# built with -O2, so we pass our own CFLAGS and CXXFLAGS below. +# Glibc nowadays can be build with optimization flags f.e. -Os + +# crash in qemu-system-nios2 with -Os +ifeq ($(BR2_nios2),y) +TARGET_FCFLAGS := -O2 +endif + define GLIBC_CONFIGURE_CMDS mkdir -p $(@D)/build # Do the configuration (cd $(@D)/build; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="-O2 $(GLIBC_EXTRA_CFLAGS)" CPPFLAGS="" \ - CXXFLAGS="-O2 $(GLIBC_EXTRA_CFLAGS)" \ + CFLAGS="$(TARGET_FCFLAGS) $(GLIBC_EXTRA_CFLAGS)" CPPFLAGS="" \ + CXXFLAGS="$(TARGET_FCFLAGS) $(GLIBC_EXTRA_CFLAGS)" \ $(GLIBC_CONF_ENV) \ $(SHELL) $(@D)/configure \ --target=$(GNU_TARGET_NAME) \ diff --git a/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-HACK-only-build-and-install-localedef.patch b/package/localedef/2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586/0001-HACK-only-build-and-install-localedef.patch similarity index 100% rename from package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-HACK-only-build-and-install-localedef.patch rename to package/localedef/2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586/0001-HACK-only-build-and-install-localedef.patch diff --git a/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch b/package/localedef/2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch similarity index 100% rename from package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch rename to package/localedef/2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch diff --git a/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/localedef.hash b/package/localedef/2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586/localedef.hash similarity index 70% rename from package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/localedef.hash rename to package/localedef/2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586/localedef.hash index dfd939020f..f28c15c2a3 100644 --- a/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/localedef.hash +++ b/package/localedef/2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586/localedef.hash @@ -1,5 +1,5 @@ # Locally calculated (fetched from Github) -sha256 3c299a21468a80356b848ca341f45551616c4928a6c871e6d45cee942e8b0f24 glibc-2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c.tar.gz +sha256 0ca43b2a6cd74609519554303a16e350abdac0e66943c5d98d91228233c826a0 glibc-2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586.tar.gz # Hashes for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/localedef/localedef.mk b/package/localedef/localedef.mk index f8f0b42984..fb5edde0c2 100644 --- a/package/localedef/localedef.mk +++ b/package/localedef/localedef.mk @@ -7,7 +7,7 @@ # Use the same VERSION and SITE as target glibc # As in glibc.mk, generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- -LOCALEDEF_VERSION = 2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c +LOCALEDEF_VERSION = 2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586 LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION).tar.gz LOCALEDEF_SITE = $(call github,bminor,glibc,$(LOCALEDEF_VERSION)) HOST_LOCALEDEF_DL_SUBDIR = glibc diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in index 4004c0edf8..437daafa74 100644 --- a/toolchain/toolchain-buildroot/Config.in +++ b/toolchain/toolchain-buildroot/Config.in @@ -49,7 +49,8 @@ config BR2_TOOLCHAIN_BUILDROOT_GLIBC BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le || \ BR2_riscv || BR2_s390x || BR2_sh || \ BR2_sparc64 || BR2_x86_64 || BR2_microblaze || \ - BR2_nios2 || (BR2_arc && BR2_ARC_ATOMIC_EXT) || BR2_csky + BR2_nios2 || (BR2_arc && BR2_ARC_ATOMIC_EXT) || \ + BR2_csky || BR2_or1k depends on BR2_USE_MMU depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 -- 2.30.2 From nunojpg at gmail.com Fri Feb 11 18:22:03 2022 From: nunojpg at gmail.com (=?UTF-8?Q?Nuno_Gon=C3=A7alves?=) Date: Fri, 11 Feb 2022 18:22:03 +0000 Subject: [Buildroot] [PATCH] package/casync: fix zstd dependency to correct package name In-Reply-To: References: Message-ID: Signed-off-by: Nuno Goncalves --- package/casync/casync.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/casync/casync.mk b/package/casync/casync.mk index d74cb1bfe8..bb9bd8ccac 100644 --- a/package/casync/casync.mk +++ b/package/casync/casync.mk @@ -40,8 +40,8 @@ else CASYNC_CONF_OPTS += -Dudev=false endif -ifeq ($(BR2_PACKAGE_LIBZSTD),y) -CASYNC_DEPENDENCIES += libzstd +ifeq ($(BR2_PACKAGE_ZSTD),y) +CASYNC_DEPENDENCIES += zstd CASYNC_CONF_OPTS += -Dlibzstd=enabled else CASYNC_CONF_OPTS += -Dlibzstd=disabled -- 2.32.0 From peter at korsgaard.com Fri Feb 11 19:08:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 20:08:46 +0100 Subject: [Buildroot] [PATCH] package/python3: unconditionally install python{, -config} symlinks In-Reply-To: <20220210212429.31856-1-peter@korsgaard.com> (Peter Korsgaard's message of "Thu, 10 Feb 2022 22:24:29 +0100") References: <20220210212429.31856-1-peter@korsgaard.com> Message-ID: <87mtixqkzl.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Now that host-python2 is gone, it makes sense to unconditionally install the > symlinks for the host, similar to how it is done for the target. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 11 19:08:52 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 20:08:52 +0100 Subject: [Buildroot] [PATCH] package/python3-pycparser: drop unused host package In-Reply-To: <20220210223128.11002-1-peter@korsgaard.com> (Peter Korsgaard's message of "Thu, 10 Feb 2022 23:31:27 +0100") References: <20220210223128.11002-1-peter@korsgaard.com> Message-ID: <87iltlqkzf.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Commit d9bf97cf16fa6945466a67 (package/python-cryptography: drop host > variant) dropped the dependency on host-python3-pycparser, so it is now > unused. Drop it. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 11 19:08:59 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 20:08:59 +0100 Subject: [Buildroot] [PATCH 1/5] package/python3-cffi: drop unused host package In-Reply-To: <20220210224047.11992-1-peter@korsgaard.com> (Peter Korsgaard's message of "Thu, 10 Feb 2022 23:40:42 +0100") References: <20220210224047.11992-1-peter@korsgaard.com> Message-ID: <87ee49qkz8.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Commit d9bf97cf16fa6945466a67 (package/python-cryptography: drop host > variant) dropped the dependency on host-python3-cffi, so it is now unused. > Drop it. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 11 19:09:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 20:09:04 +0100 Subject: [Buildroot] [PATCH 2/5] package/python3-cheetah: drop host package In-Reply-To: <20220210224047.11992-2-peter@korsgaard.com> (Peter Korsgaard's message of "Thu, 10 Feb 2022 23:40:43 +0100") References: <20220210224047.11992-1-peter@korsgaard.com> <20220210224047.11992-2-peter@korsgaard.com> Message-ID: <87a6exqkz3.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Now that host-python2 is gone, the custom python3 variant can be dropped. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 11 19:09:13 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 20:09:13 +0100 Subject: [Buildroot] [PATCH 3/5] package/python3-cython: drop host package In-Reply-To: <20220210224047.11992-3-peter@korsgaard.com> (Peter Korsgaard's message of "Thu, 10 Feb 2022 23:40:44 +0100") References: <20220210224047.11992-1-peter@korsgaard.com> <20220210224047.11992-3-peter@korsgaard.com> Message-ID: <875yplqkyu.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Now that host-python2 is gone, the custom python3 variant can be dropped. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 11 19:09:18 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 20:09:18 +0100 Subject: [Buildroot] [PATCH 5/5] package/python3-psutil: drop host package In-Reply-To: <20220210224047.11992-5-peter@korsgaard.com> (Peter Korsgaard's message of "Thu, 10 Feb 2022 23:40:46 +0100") References: <20220210224047.11992-1-peter@korsgaard.com> <20220210224047.11992-5-peter@korsgaard.com> Message-ID: <871r09qkyp.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Now that host-python2 is gone, the custom python3 variant can be dropped. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 11 19:09:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 20:09:26 +0100 Subject: [Buildroot] [PATCH 4/5] package/python3-ply: drop host package In-Reply-To: <20220210224047.11992-4-peter@korsgaard.com> (Peter Korsgaard's message of "Thu, 10 Feb 2022 23:40:45 +0100") References: <20220210224047.11992-1-peter@korsgaard.com> <20220210224047.11992-4-peter@korsgaard.com> Message-ID: <87wni1p6e1.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Now that host-python2 is gone, the custom python3 variant can be dropped. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 11 19:09:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 20:09:37 +0100 Subject: [Buildroot] [PATCH 1/5] package/python3-pycryptodomex: drop host package In-Reply-To: <20220211081730.23068-1-peter@korsgaard.com> (Peter Korsgaard's message of "Fri, 11 Feb 2022 09:17:25 +0100") References: <20220211081730.23068-1-peter@korsgaard.com> Message-ID: <87sfspp6dq.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Now that host-python2 is gone, the custom python3 variant can be dropped. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 11 19:09:41 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 20:09:41 +0100 Subject: [Buildroot] [PATCH 2/5] boot/uboot: drop host-python2 support In-Reply-To: <20220211081730.23068-2-peter@korsgaard.com> (Peter Korsgaard's message of "Fri, 11 Feb 2022 09:17:26 +0100") References: <20220211081730.23068-1-peter@korsgaard.com> <20220211081730.23068-2-peter@korsgaard.com> Message-ID: <87o83dp6dm.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > host-python2 is gone, so drop the _NEEDS_PYTHON2 logic. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 11 19:09:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 20:09:45 +0100 Subject: [Buildroot] [PATCH 4/5] package/python3-regex: drop host package In-Reply-To: <20220211081730.23068-4-peter@korsgaard.com> (Peter Korsgaard's message of "Fri, 11 Feb 2022 09:17:28 +0100") References: <20220211081730.23068-1-peter@korsgaard.com> <20220211081730.23068-4-peter@korsgaard.com> Message-ID: <87k0e1p6di.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Now that host-python2 is gone, the custom python3 variant can be dropped and > instead host support added to python-regex. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 11 19:09:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 20:09:49 +0100 Subject: [Buildroot] [PATCH 3/5] package/python3-pyelftools: drop host package In-Reply-To: <20220211081730.23068-3-peter@korsgaard.com> (Peter Korsgaard's message of "Fri, 11 Feb 2022 09:17:27 +0100") References: <20220211081730.23068-1-peter@korsgaard.com> <20220211081730.23068-3-peter@korsgaard.com> Message-ID: <87fsopp6de.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Now that host-python2 is gone, the custom python3 variant can be dropped. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 11 19:09:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 20:09:53 +0100 Subject: [Buildroot] [PATCH 5/5] package/python3-six: drop host package In-Reply-To: <20220211081730.23068-5-peter@korsgaard.com> (Peter Korsgaard's message of "Fri, 11 Feb 2022 09:17:29 +0100") References: <20220211081730.23068-1-peter@korsgaard.com> <20220211081730.23068-5-peter@korsgaard.com> Message-ID: <87bkzdp6da.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Now that host-python2 is gone, the custom python3 variant can be dropped. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 11 19:06:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 20:06:50 +0100 Subject: [Buildroot] [git commit] package/python3-cheetah: drop host package Message-ID: <20220211190258.EB22582DDC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=255e7030f199ebb98ce6e6f283289a95c8f0f0a8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Now that host-python2 is gone, the custom python3 variant can be dropped. Signed-off-by: Peter Korsgaard --- package/mongodb/mongodb.mk | 2 +- package/python-cheetah/python-cheetah.mk | 1 - package/python3-cheetah/python3-cheetah.hash | 1 - package/python3-cheetah/python3-cheetah.mk | 18 ------------------ 4 files changed, 1 insertion(+), 21 deletions(-) diff --git a/package/mongodb/mongodb.mk b/package/mongodb/mongodb.mk index 311b9de14e..2a5e00be79 100644 --- a/package/mongodb/mongodb.mk +++ b/package/mongodb/mongodb.mk @@ -16,7 +16,7 @@ MONGODB_SELINUX_MODULES = mongodb MONGODB_DEPENDENCIES = \ boost \ - host-python3-cheetah \ + host-python-cheetah \ host-python3-psutil \ host-python-pyyaml \ host-python3-regex \ diff --git a/package/python-cheetah/python-cheetah.mk b/package/python-cheetah/python-cheetah.mk index 02877e03c4..92688f6ced 100644 --- a/package/python-cheetah/python-cheetah.mk +++ b/package/python-cheetah/python-cheetah.mk @@ -4,7 +4,6 @@ # ################################################################################ -# Please keep in sync with package/python3-cheetah/python3-cheetah.mk PYTHON_CHEETAH_VERSION = 3.2.6.post2 PYTHON_CHEETAH_SOURCE = Cheetah3-$(PYTHON_CHEETAH_VERSION).tar.gz PYTHON_CHEETAH_SITE = https://files.pythonhosted.org/packages/c0/97/c3fa47e223207e6ca6b501a954c5c959ed3e99f2a1ceec9918238ce38418 diff --git a/package/python3-cheetah/python3-cheetah.hash b/package/python3-cheetah/python3-cheetah.hash deleted file mode 120000 index c29a76ea80..0000000000 --- a/package/python3-cheetah/python3-cheetah.hash +++ /dev/null @@ -1 +0,0 @@ -../python-cheetah/python-cheetah.hash \ No newline at end of file diff --git a/package/python3-cheetah/python3-cheetah.mk b/package/python3-cheetah/python3-cheetah.mk deleted file mode 100644 index 93d16201aa..0000000000 --- a/package/python3-cheetah/python3-cheetah.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# python3-cheetah -# -################################################################################ - -# Please keep in sync with -# package/python-cheetah/python-cheetah.mk -PYTHON3_CHEETAH_VERSION = 3.2.6.post2 -PYTHON3_CHEETAH_SOURCE = Cheetah3-$(PYTHON3_CHEETAH_VERSION).tar.gz -PYTHON3_CHEETAH_SITE = https://files.pythonhosted.org/packages/c0/97/c3fa47e223207e6ca6b501a954c5c959ed3e99f2a1ceec9918238ce38418 -PYTHON3_CHEETAH_LICENSE = MIT -PYTHON3_CHEETAH_LICENSE_FILES = LICENSE -PYTHON3_CHEETAH_SETUP_TYPE = setuptools -HOST_PYTHON3_CHEETAH_DL_SUBDIR = python-cheetah -HOST_PYTHON3_CHEETAH_NEEDS_HOST_PYTHON = python3 - -$(eval $(host-python-package)) From peter at korsgaard.com Fri Feb 11 19:06:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 20:06:56 +0100 Subject: [Buildroot] [git commit] package/python3-cython: drop host package Message-ID: <20220211190259.01460832DA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=866b42ce4985affd0ab578e15b77eac1dc6533a5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Now that host-python2 is gone, the custom python3 variant can be dropped. Signed-off-by: Peter Korsgaard --- package/libdnet/libdnet.mk | 2 +- package/python-cython/python-cython.mk | 1 - package/python-fonttools/python-fonttools.mk | 2 +- package/python3-cython/python3-cython.hash | 1 - package/python3-cython/python3-cython.mk | 16 ---------------- package/setools/setools.mk | 2 +- 6 files changed, 3 insertions(+), 21 deletions(-) diff --git a/package/libdnet/libdnet.mk b/package/libdnet/libdnet.mk index e9a57d6ed2..4c58ea20a5 100644 --- a/package/libdnet/libdnet.mk +++ b/package/libdnet/libdnet.mk @@ -16,7 +16,7 @@ LIBDNET_CONF_OPTS = \ LIBDNET_CONFIG_SCRIPTS = dnet-config ifeq ($(BR2_PACKAGE_LIBDNET_PYTHON),y) -LIBDNET_DEPENDENCIES += host-python3-cython python3 +LIBDNET_DEPENDENCIES += host-python-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 diff --git a/package/python-cython/python-cython.mk b/package/python-cython/python-cython.mk index 89708cb9a8..b9fbf7b11a 100644 --- a/package/python-cython/python-cython.mk +++ b/package/python-cython/python-cython.mk @@ -4,7 +4,6 @@ # ################################################################################ -# Please keep in sync with package/python3-cython/python3-cython.mk PYTHON_CYTHON_VERSION = 0.29.27 PYTHON_CYTHON_SOURCE = Cython-$(PYTHON_CYTHON_VERSION).tar.gz PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/eb/46/80dd9e5ad67ebc766ff3229901bde4a7bc82907efe93cd7007c4df458dd5 diff --git a/package/python-fonttools/python-fonttools.mk b/package/python-fonttools/python-fonttools.mk index d5c4cdf8e5..c07011daa0 100644 --- a/package/python-fonttools/python-fonttools.mk +++ b/package/python-fonttools/python-fonttools.mk @@ -10,7 +10,7 @@ PYTHON_FONTTOOLS_SITE = https://files.pythonhosted.org/packages/2d/4c/49ba863863 PYTHON_FONTTOOLS_SETUP_TYPE = setuptools PYTHON_FONTTOOLS_LICENSE = MIT PYTHON_FONTTOOLS_LICENSE_FILES = LICENSE -PYTHON_FONTTOOLS_DEPENDENCIES = host-python3-cython +PYTHON_FONTTOOLS_DEPENDENCIES = host-python-cython PYTHON_FONTTOOLS_ENV = FONTTOOLS_WITH_CYTHON=1 define PYTHON_FONTTOOLS_EXTRACT_CMDS diff --git a/package/python3-cython/python3-cython.hash b/package/python3-cython/python3-cython.hash deleted file mode 120000 index 70dde64105..0000000000 --- a/package/python3-cython/python3-cython.hash +++ /dev/null @@ -1 +0,0 @@ -../python-cython/python-cython.hash \ No newline at end of file diff --git a/package/python3-cython/python3-cython.mk b/package/python3-cython/python3-cython.mk deleted file mode 100644 index 56d88b5bf7..0000000000 --- a/package/python3-cython/python3-cython.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# python3-cython -# -################################################################################ - -# Please keep in sync with package/python-cython/python-cython.mk -PYTHON3_CYTHON_VERSION = 0.29.27 -PYTHON3_CYTHON_SOURCE = Cython-$(PYTHON3_CYTHON_VERSION).tar.gz -PYTHON3_CYTHON_SITE = https://files.pythonhosted.org/packages/eb/46/80dd9e5ad67ebc766ff3229901bde4a7bc82907efe93cd7007c4df458dd5 -PYTHON3_CYTHON_SETUP_TYPE = setuptools -PYTHON3_CYTHON_LICENSE = Apache-2.0 -PYTHON3_CYTHON_LICENSE_FILES = COPYING.txt LICENSE.txt -HOST_PYTHON3_CYTHON_NEEDS_HOST_PYTHON = python3 - -$(eval $(host-python-package)) diff --git a/package/setools/setools.mk b/package/setools/setools.mk index 8e1c0d2cc6..5b4b4e30d8 100644 --- a/package/setools/setools.mk +++ b/package/setools/setools.mk @@ -12,7 +12,7 @@ SETOOLS_LICENSE = GPL-2.0+, LGPL-2.1+ SETOOLS_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL SETOOLS_CPE_ID_VENDOR = selinuxproject SETOOLS_SETUP_TYPE = setuptools -HOST_SETOOLS_DEPENDENCIES = host-python3-cython host-libselinux host-libsepol host-python-networkx +HOST_SETOOLS_DEPENDENCIES = host-python-cython host-libselinux host-libsepol host-python-networkx HOST_SETOOLS_NEEDS_HOST_PYTHON = python3 define SETOOLS_FIX_SETUP From peter at korsgaard.com Fri Feb 11 19:08:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 20:08:39 +0100 Subject: [Buildroot] [git commit] package/python3: unconditionally install python{, -config} symlinks Message-ID: <20220211190259.5CF9482DDC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b6ff83722f96f71c8b883c63dde37fe9867c1bdc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Now that host-python2 is gone, it makes sense to unconditionally install the symlinks for the host, similar to how it is done for the target. Signed-off-by: Peter Korsgaard --- package/python3/python3.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 6af7488ddd..3a334fb28d 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -262,18 +262,12 @@ endef PYTHON3_POST_INSTALL_TARGET_HOOKS += PYTHON3_INSTALL_SYMLINK -# Some packages may have build scripts requiring python3, whatever is the -# python version chosen for the target. -# Only install the python symlink in the host tree if python3 is enabled -# for the target. -ifeq ($(BR2_PACKAGE_PYTHON3),y) define HOST_PYTHON3_INSTALL_SYMLINK ln -fs python3 $(HOST_DIR)/bin/python ln -fs python3-config $(HOST_DIR)/bin/python-config endef HOST_PYTHON3_POST_INSTALL_HOOKS += HOST_PYTHON3_INSTALL_SYMLINK -endif # Provided to other packages PYTHON3_PATH = $(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/ From peter at korsgaard.com Fri Feb 11 19:07:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 20:07:51 +0100 Subject: [Buildroot] [git commit] boot/uboot: drop host-python2 support Message-ID: <20220211190259.3452E82DDC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ea6a0a60e28f3047e762806a0cef3b4d55d7b576 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master host-python2 is gone, so drop the _NEEDS_PYTHON2 logic. Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++++ boot/uboot/Config.in | 28 +++------------------------- boot/uboot/uboot.mk | 8 +------- 3 files changed, 10 insertions(+), 32 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 2b1fd48de5..0794813a97 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_TARGET_UBOOT_NEEDS_PYTHON2 + bool "host-python 2.7 support for U-Boot was removed" + select BR2_LEGACY + help + Option was removed together with python 2.7 support. + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBMMS bool "gst1-plugins-bad plugin libmms was removed" depends on BR2_USE_WCHAR diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index 1fd4dede92..953c36135e 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -143,45 +143,23 @@ config BR2_TARGET_UBOOT_NEEDS_DTC Select this option if your U-Boot board configuration requires the Device Tree compiler to be available. -config BR2_TARGET_UBOOT_NEEDS_PYTHON - bool - -choice - bool "U-Boot needs host Python" - -config BR2_TARGET_UBOOT_NEEDS_PYTHON_NONE - bool "no" - depends on !BR2_TARGET_UBOOT_NEEDS_PYTHON - help - Select this option if U-Boot does not need any - host python to build. - -config BR2_TARGET_UBOOT_NEEDS_PYTHON2 - bool "python 2.x" - help - Select this option if U-Boot needs a host Python 2.x - interpreter. This is the case for some U-Boot - configurations, prior to U-Boot 2020.01. - config BR2_TARGET_UBOOT_NEEDS_PYTHON3 - bool "python 3.x" + bool "U-Boot needs host python 3.x" help Select this option if U-Boot needs a host Python 3.x interpreter. This is the case for some U-Boot configurations, after U-Boot 2020.01. -endchoice - config BR2_TARGET_UBOOT_NEEDS_PYLIBFDT bool "U-Boot needs pylibfdt" - select BR2_TARGET_UBOOT_NEEDS_PYTHON + select BR2_TARGET_UBOOT_NEEDS_PYTHON3 help Select this option if your U-Boot board configuration requires the Python libfdt library to be available. config BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS bool "U-Boot needs pyelftools" - select BR2_TARGET_UBOOT_NEEDS_PYTHON + select BR2_TARGET_UBOOT_NEEDS_PYTHON3 help Select this option if your U-Boot board configuration requires the Python pyelftools library to be available. diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index d05b9bb479..9e227fed91 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -207,9 +207,7 @@ ifeq ($(BR2_TARGET_UBOOT_NEEDS_DTC),y) UBOOT_DEPENDENCIES += host-dtc endif -ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON2),y) -UBOOT_DEPENDENCIES += host-python host-python-setuptools -else ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON3),y) +ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON3),y) UBOOT_DEPENDENCIES += host-python3 host-python3-setuptools endif @@ -218,12 +216,8 @@ UBOOT_DEPENDENCIES += host-swig endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS),y) -ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON2),y) -UBOOT_DEPENDENCIES += host-python-pyelftools -else ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON3),y) UBOOT_DEPENDENCIES += host-python3-pyelftools endif -endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSSL),y) UBOOT_DEPENDENCIES += host-openssl From peter at korsgaard.com Fri Feb 11 19:07:57 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 20:07:57 +0100 Subject: [Buildroot] [git commit] package/python3-pyelftools: drop host package Message-ID: <20220211190259.3EF11832DA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d3730ae991107d338b4acab5e617c9ff0cd754a4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Now that host-python2 is gone, the custom python3 variant can be dropped. Signed-off-by: Peter Korsgaard --- boot/optee-os/optee-os.mk | 2 +- boot/uboot/uboot.mk | 2 +- package/python-pyelftools/python-pyelftools.mk | 1 - package/python3-pyelftools/python3-pyelftools.hash | 1 - package/python3-pyelftools/python3-pyelftools.mk | 17 ----------------- 5 files changed, 2 insertions(+), 21 deletions(-) diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk index 2884b48513..166b5e693c 100644 --- a/boot/optee-os/optee-os.mk +++ b/boot/optee-os/optee-os.mk @@ -21,7 +21,7 @@ else OPTEE_OS_SITE = $(call github,OP-TEE,optee_os,$(OPTEE_OS_VERSION)) endif -OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pycryptodomex host-python3-pyelftools +OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pycryptodomex host-python-pyelftools # On 64bit targets, OP-TEE OS can be built in 32bit mode, or # can be built in 64bit mode and support 32bit and 64bit diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 9e227fed91..9e569906ce 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -216,7 +216,7 @@ UBOOT_DEPENDENCIES += host-swig endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS),y) -UBOOT_DEPENDENCIES += host-python3-pyelftools +UBOOT_DEPENDENCIES += host-python-pyelftools endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSSL),y) diff --git a/package/python-pyelftools/python-pyelftools.mk b/package/python-pyelftools/python-pyelftools.mk index 3ae0a4ffc2..5bfdcd33ae 100644 --- a/package/python-pyelftools/python-pyelftools.mk +++ b/package/python-pyelftools/python-pyelftools.mk @@ -4,7 +4,6 @@ # ################################################################################ -# Please keep in sync with package/python3-pyelftools/python3-pyelftools.mk PYTHON_PYELFTOOLS_VERSION = 0.27 PYTHON_PYELFTOOLS_SOURCE = pyelftools-$(PYTHON_PYELFTOOLS_VERSION).tar.gz PYTHON_PYELFTOOLS_SITE = https://files.pythonhosted.org/packages/6b/b5/f7022f2d950327ba970ec85fb8f85c79244031092c129b6f34ab17514ae0 diff --git a/package/python3-pyelftools/python3-pyelftools.hash b/package/python3-pyelftools/python3-pyelftools.hash deleted file mode 120000 index e8eebeda9f..0000000000 --- a/package/python3-pyelftools/python3-pyelftools.hash +++ /dev/null @@ -1 +0,0 @@ -../python-pyelftools/python-pyelftools.hash \ No newline at end of file diff --git a/package/python3-pyelftools/python3-pyelftools.mk b/package/python3-pyelftools/python3-pyelftools.mk deleted file mode 100644 index 3d21d3040e..0000000000 --- a/package/python3-pyelftools/python3-pyelftools.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# python3-pyelftools -# -################################################################################ - -# Please keep in sync with package/python-pyelftools/python-pyelftools.mk -PYTHON3_PYELFTOOLS_VERSION = 0.27 -PYTHON3_PYELFTOOLS_SOURCE = pyelftools-$(PYTHON3_PYELFTOOLS_VERSION).tar.gz -PYTHON3_PYELFTOOLS_SITE = https://files.pythonhosted.org/packages/6b/b5/f7022f2d950327ba970ec85fb8f85c79244031092c129b6f34ab17514ae0 -PYTHON3_PYELFTOOLS_LICENSE = Public domain -PYTHON3_PYELFTOOLS_LICENSE_FILES = LICENSE -PYTHON3_PYELFTOOLS_SETUP_TYPE = setuptools -HOST_PYTHON3_PYELFTOOLS_DL_SUBDIR = python-pyelftools -HOST_PYTHON3_PYELFTOOLS_NEEDS_HOST_PYTHON = python3 - -$(eval $(host-python-package)) From peter at korsgaard.com Fri Feb 11 19:07:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 20:07:42 +0100 Subject: [Buildroot] [git commit] package/python3-pycryptodomex: drop host package Message-ID: <20220211190259.287F0825B5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1fc1b258d39b215194b868eb002200871e535595 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Now that host-python2 is gone, the custom python3 variant can be dropped. Signed-off-by: Peter Korsgaard --- boot/optee-os/optee-os.mk | 2 +- package/python-pycryptodomex/python-pycryptodomex.mk | 1 - .../python3-pycryptodomex/python3-pycryptodomex.hash | 1 - .../python3-pycryptodomex/python3-pycryptodomex.mk | 19 ------------------- 4 files changed, 1 insertion(+), 22 deletions(-) diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk index 03ce08ffb2..2884b48513 100644 --- a/boot/optee-os/optee-os.mk +++ b/boot/optee-os/optee-os.mk @@ -21,7 +21,7 @@ else OPTEE_OS_SITE = $(call github,OP-TEE,optee_os,$(OPTEE_OS_VERSION)) endif -OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python3-pycryptodomex host-python3-pyelftools +OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pycryptodomex host-python3-pyelftools # On 64bit targets, OP-TEE OS can be built in 32bit mode, or # can be built in 64bit mode and support 32bit and 64bit diff --git a/package/python-pycryptodomex/python-pycryptodomex.mk b/package/python-pycryptodomex/python-pycryptodomex.mk index 92780327a1..d752122550 100644 --- a/package/python-pycryptodomex/python-pycryptodomex.mk +++ b/package/python-pycryptodomex/python-pycryptodomex.mk @@ -4,7 +4,6 @@ # ################################################################################ -# Please keep in sync with package/python3-pycryptodomex/python3-pycryptodomex.mk PYTHON_PYCRYPTODOMEX_VERSION = 3.13.0 PYTHON_PYCRYPTODOMEX_SOURCE = pycryptodomex-$(PYTHON_PYCRYPTODOMEX_VERSION).tar.gz PYTHON_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/7a/21/f399ba8dfd6e40eee444151af3237af22788b8b16077c75ec0419125f619 diff --git a/package/python3-pycryptodomex/python3-pycryptodomex.hash b/package/python3-pycryptodomex/python3-pycryptodomex.hash deleted file mode 120000 index 0c6761d8a4..0000000000 --- a/package/python3-pycryptodomex/python3-pycryptodomex.hash +++ /dev/null @@ -1 +0,0 @@ -../python-pycryptodomex/python-pycryptodomex.hash \ No newline at end of file diff --git a/package/python3-pycryptodomex/python3-pycryptodomex.mk b/package/python3-pycryptodomex/python3-pycryptodomex.mk deleted file mode 100644 index 06a46cdf63..0000000000 --- a/package/python3-pycryptodomex/python3-pycryptodomex.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# python3-pycryptodomex -# -################################################################################ - -# Please keep in sync with package/python-pycryptodomex/python-pycryptodomex.mk -PYTHON3_PYCRYPTODOMEX_VERSION = 3.13.0 -PYTHON3_PYCRYPTODOMEX_SOURCE = pycryptodomex-$(PYTHON3_PYCRYPTODOMEX_VERSION).tar.gz -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) -PYTHON3_PYCRYPTODOMEX_LICENSE_FILES = LICENSE.rst Doc/LEGAL/COPYRIGHT.pycrypto -HOST_PYTHON3_PYCRYPTODOMEX_DL_SUBDIR = python-pycryptodomex -HOST_PYTHON3_PYCRYPTODOMEX_NEEDS_HOST_PYTHON = python3 - -$(eval $(host-python-package)) From peter at korsgaard.com Fri Feb 11 19:07:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 20:07:08 +0100 Subject: [Buildroot] [git commit] package/python3-psutil: drop host package Message-ID: <20220211190259.1655482DDC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=aab7bc4a1d499b3f926464290eee3d6459d0e816 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Now that host-python2 is gone, the custom python3 variant can be dropped. Signed-off-by: Peter Korsgaard --- package/mongodb/mongodb.mk | 2 +- package/python-psutil/python-psutil.mk | 1 - package/python3-psutil/python3-psutil.hash | 1 - package/python3-psutil/python3-psutil.mk | 19 ------------------- 4 files changed, 1 insertion(+), 22 deletions(-) diff --git a/package/mongodb/mongodb.mk b/package/mongodb/mongodb.mk index 2a5e00be79..e2a58a5f4e 100644 --- a/package/mongodb/mongodb.mk +++ b/package/mongodb/mongodb.mk @@ -17,7 +17,7 @@ MONGODB_SELINUX_MODULES = mongodb MONGODB_DEPENDENCIES = \ boost \ host-python-cheetah \ - host-python3-psutil \ + host-python-psutil \ host-python-pyyaml \ host-python3-regex \ host-python-requests \ diff --git a/package/python-psutil/python-psutil.mk b/package/python-psutil/python-psutil.mk index 3bba7ca343..413fc8a391 100644 --- a/package/python-psutil/python-psutil.mk +++ b/package/python-psutil/python-psutil.mk @@ -4,7 +4,6 @@ # ################################################################################ -# Please keep in sync with package/python3-psutil/python3-psutil.mk PYTHON_PSUTIL_VERSION = 5.8.0 PYTHON_PSUTIL_SOURCE = psutil-$(PYTHON_PSUTIL_VERSION).tar.gz PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/e1/b0/7276de53321c12981717490516b7e612364f2cb372ee8901bd4a66a000d7 diff --git a/package/python3-psutil/python3-psutil.hash b/package/python3-psutil/python3-psutil.hash deleted file mode 120000 index ff688fab28..0000000000 --- a/package/python3-psutil/python3-psutil.hash +++ /dev/null @@ -1 +0,0 @@ -../python-psutil/python-psutil.hash \ No newline at end of file diff --git a/package/python3-psutil/python3-psutil.mk b/package/python3-psutil/python3-psutil.mk deleted file mode 100644 index 1304124f57..0000000000 --- a/package/python3-psutil/python3-psutil.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# python3-psutil -# -################################################################################ - -# Please keep in sync with package/python-psutil/python-psutil.mk -PYTHON3_PSUTIL_VERSION = 5.8.0 -PYTHON3_PSUTIL_SOURCE = psutil-$(PYTHON3_PSUTIL_VERSION).tar.gz -PYTHON3_PSUTIL_SITE = https://files.pythonhosted.org/packages/e1/b0/7276de53321c12981717490516b7e612364f2cb372ee8901bd4a66a000d7 -PYTHON3_PSUTIL_SETUP_TYPE = setuptools -PYTHON3_PSUTIL_LICENSE = BSD-3-Clause -PYTHON3_PSUTIL_LICENSE_FILES = LICENSE -PYTHON3_PSUTIL_CPE_ID_VENDOR = psutil_project -PYTHON3_PSUTIL_CPE_ID_PRODUCT = psutil -HOST_PYTHON3_PSUTIL_DL_SUBDIR = python-psutil -HOST_PYTHON3_PSUTIL_NEEDS_HOST_PYTHON = python3 - -$(eval $(host-python-package)) From peter at korsgaard.com Fri Feb 11 19:07:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 20:07:01 +0100 Subject: [Buildroot] [git commit] package/python3-ply: drop host package Message-ID: <20220211190259.0AEBA825B5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f2b862405abbafd68520f167ccb8b03975dc3aea branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Now that host-python2 is gone, the custom python3 variant can be dropped. Signed-off-by: Peter Korsgaard --- package/libcamera/libcamera.mk | 2 +- package/python-ply/python-ply.mk | 1 - package/python3-ply/python3-ply.hash | 1 - package/python3-ply/python3-ply.mk | 16 ---------------- 4 files changed, 1 insertion(+), 19 deletions(-) diff --git a/package/libcamera/libcamera.mk b/package/libcamera/libcamera.mk index 534d8d2637..7cd4bfa758 100644 --- a/package/libcamera/libcamera.mk +++ b/package/libcamera/libcamera.mk @@ -11,7 +11,7 @@ LIBCAMERA_DEPENDENCIES = \ host-openssl \ host-pkgconf \ host-python-jinja2 \ - host-python3-ply \ + host-python-ply \ host-python-pyyaml \ gnutls LIBCAMERA_CONF_OPTS = \ diff --git a/package/python-ply/python-ply.mk b/package/python-ply/python-ply.mk index 50a3e32bc2..5dc7964d5f 100644 --- a/package/python-ply/python-ply.mk +++ b/package/python-ply/python-ply.mk @@ -4,7 +4,6 @@ # ################################################################################ -# Please keep in sync with package/python3-ply/python3-ply.mk PYTHON_PLY_VERSION = 3.11 PYTHON_PLY_SOURCE = ply-$(PYTHON_PLY_VERSION).tar.gz PYTHON_PLY_SITE = https://files.pythonhosted.org/packages/e5/69/882ee5c9d017149285cab114ebeab373308ef0f874fcdac9beb90e0ac4da diff --git a/package/python3-ply/python3-ply.hash b/package/python3-ply/python3-ply.hash deleted file mode 120000 index 5e07165c93..0000000000 --- a/package/python3-ply/python3-ply.hash +++ /dev/null @@ -1 +0,0 @@ -../python-ply/python-ply.hash \ No newline at end of file diff --git a/package/python3-ply/python3-ply.mk b/package/python3-ply/python3-ply.mk deleted file mode 100644 index 15f66a49db..0000000000 --- a/package/python3-ply/python3-ply.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# python3-ply -# -################################################################################ - -PYTHON3_PLY_VERSION = 3.11 -PYTHON3_PLY_SOURCE = ply-$(PYTHON3_PLY_VERSION).tar.gz -PYTHON3_PLY_SITE = https://files.pythonhosted.org/packages/e5/69/882ee5c9d017149285cab114ebeab373308ef0f874fcdac9beb90e0ac4da -PYTHON3_PLY_SETUP_TYPE = setuptools -PYTHON3_PLY_LICENSE = BSD-3-Clause -PYTHON3_PLY_LICENSE_FILES = README.md - -HOST_PYTHON3_PLY_NEEDS_HOST_PYTHON = python3 - -$(eval $(host-python-package)) From peter at korsgaard.com Fri Feb 11 19:08:14 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 20:08:14 +0100 Subject: [Buildroot] [git commit] package/python3-six: drop host package Message-ID: <20220211190259.52FC9825B5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f4f0e2a63726efe84032c69b4f2b41a883c5e822 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Now that host-python2 is gone, the custom python3 variant can be dropped. Signed-off-by: Peter Korsgaard --- package/gnuradio/gnuradio.mk | 2 +- package/python-six/python-six.mk | 1 - package/python3-six/python3-six.hash | 1 - package/python3-six/python3-six.mk | 17 ----------------- 4 files changed, 1 insertion(+), 20 deletions(-) diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index 417a51e067..49e3b95191 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -15,7 +15,7 @@ GNURADIO_SUPPORTS_IN_SOURCE_BUILD = NO GNURADIO_DEPENDENCIES = \ host-python3 \ host-python-mako \ - host-python3-six \ + host-python-six \ host-swig \ boost \ log4cpp \ diff --git a/package/python-six/python-six.mk b/package/python-six/python-six.mk index 41ef41d0ba..9e3e5fcf50 100644 --- a/package/python-six/python-six.mk +++ b/package/python-six/python-six.mk @@ -4,7 +4,6 @@ # ################################################################################ -# Please keep in sync with package/python3-six/python3-six.mk PYTHON_SIX_VERSION = 1.16.0 PYTHON_SIX_SOURCE = six-$(PYTHON_SIX_VERSION).tar.gz PYTHON_SIX_SITE = https://files.pythonhosted.org/packages/71/39/171f1c67cd00715f190ba0b100d606d440a28c93c7714febeca8b79af85e diff --git a/package/python3-six/python3-six.hash b/package/python3-six/python3-six.hash deleted file mode 120000 index ed8cb89a6b..0000000000 --- a/package/python3-six/python3-six.hash +++ /dev/null @@ -1 +0,0 @@ -../python-six/python-six.hash \ No newline at end of file diff --git a/package/python3-six/python3-six.mk b/package/python3-six/python3-six.mk deleted file mode 100644 index ee9dc818ee..0000000000 --- a/package/python3-six/python3-six.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# python3-six -# -################################################################################ - -# Please keep in sync with package/python-six/python-six.mk -PYTHON3_SIX_VERSION = 1.16.0 -PYTHON3_SIX_SOURCE = six-$(PYTHON3_SIX_VERSION).tar.gz -PYTHON3_SIX_SITE = https://files.pythonhosted.org/packages/71/39/171f1c67cd00715f190ba0b100d606d440a28c93c7714febeca8b79af85e -PYTHON3_SIX_SETUP_TYPE = setuptools -PYTHON3_SIX_LICENSE = MIT -PYTHON3_SIX_LICENSE_FILES = LICENSE -HOST_PYTHON3_SIX_DL_SUBDIR = python-six -HOST_PYTHON3_SIX_NEEDS_HOST_PYTHON = python3 - -$(eval $(host-python-package)) From peter at korsgaard.com Fri Feb 11 19:07:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 20:07:17 +0100 Subject: [Buildroot] [git commit] package/python3-pycparser: drop unused host package Message-ID: <20220211190259.1F9E0825B5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5211de7d789ba8c9eaf649612711a40d02f3eec9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit d9bf97cf16fa6945466a67 (package/python-cryptography: drop host variant) dropped the dependency on host-python3-pycparser, so it is now unused. Drop it. Signed-off-by: Peter Korsgaard --- package/python-pycparser/python-pycparser.mk | 1 - package/python3-pycparser/python3-pycparser.hash | 1 - package/python3-pycparser/python3-pycparser.mk | 17 ----------------- 3 files changed, 19 deletions(-) diff --git a/package/python-pycparser/python-pycparser.mk b/package/python-pycparser/python-pycparser.mk index 20c3f641a9..1737c99a32 100644 --- a/package/python-pycparser/python-pycparser.mk +++ b/package/python-pycparser/python-pycparser.mk @@ -4,7 +4,6 @@ # ################################################################################ -# Please keep in sync with package/python3-pycparser/python3-pycparser.mk PYTHON_PYCPARSER_VERSION = 2.21 PYTHON_PYCPARSER_SOURCE = pycparser-$(PYTHON_PYCPARSER_VERSION).tar.gz PYTHON_PYCPARSER_SITE = https://files.pythonhosted.org/packages/5e/0b/95d387f5f4433cb0f53ff7ad859bd2c6051051cebbb564f139a999ab46de diff --git a/package/python3-pycparser/python3-pycparser.hash b/package/python3-pycparser/python3-pycparser.hash deleted file mode 120000 index 7a1912cad2..0000000000 --- a/package/python3-pycparser/python3-pycparser.hash +++ /dev/null @@ -1 +0,0 @@ -../python-pycparser/python-pycparser.hash \ No newline at end of file diff --git a/package/python3-pycparser/python3-pycparser.mk b/package/python3-pycparser/python3-pycparser.mk deleted file mode 100644 index 4075f4a38f..0000000000 --- a/package/python3-pycparser/python3-pycparser.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# python3-pycparser -# -################################################################################ - -# Please keep in sync with package/python-pycparser/python-pycparser.mk -PYTHON3_PYCPARSER_VERSION = 2.21 -PYTHON3_PYCPARSER_SOURCE = pycparser-$(PYTHON3_PYCPARSER_VERSION).tar.gz -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 -HOST_PYTHON3_PYCPARSER_DL_SUBDIR = python-pycparser -HOST_PYTHON3_PYCPARSER_NEEDS_HOST_PYTHON = python3 - -$(eval $(host-python-package)) From peter at korsgaard.com Fri Feb 11 19:06:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 20:06:44 +0100 Subject: [Buildroot] [git commit] package/python3-cffi: drop unused host package Message-ID: <20220211190258.E2E3F825B5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=caca05020d1e2cc1d9ab9202abab44e13bda73fd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit d9bf97cf16fa6945466a67 (package/python-cryptography: drop host variant) dropped the dependency on host-python3-cffi, so it is now unused. Drop it. Signed-off-by: Peter Korsgaard --- package/python-cffi/python-cffi.mk | 1 - package/python3-cffi/python3-cffi.hash | 1 - package/python3-cffi/python3-cffi.mk | 29 ----------------------------- 3 files changed, 31 deletions(-) diff --git a/package/python-cffi/python-cffi.mk b/package/python-cffi/python-cffi.mk index b14dce8225..83a21cb75a 100644 --- a/package/python-cffi/python-cffi.mk +++ b/package/python-cffi/python-cffi.mk @@ -4,7 +4,6 @@ # ################################################################################ -# Please keep in sync with package/python3-cffi/python3-cffi.mk PYTHON_CFFI_VERSION = 1.15.0 PYTHON_CFFI_SOURCE = cffi-$(PYTHON_CFFI_VERSION).tar.gz PYTHON_CFFI_SITE = https://files.pythonhosted.org/packages/00/9e/92de7e1217ccc3d5f352ba21e52398372525765b2e0c4530e6eb2ba9282a diff --git a/package/python3-cffi/python3-cffi.hash b/package/python3-cffi/python3-cffi.hash deleted file mode 120000 index 1f98d8df9c..0000000000 --- a/package/python3-cffi/python3-cffi.hash +++ /dev/null @@ -1 +0,0 @@ -../python-cffi/python-cffi.hash \ No newline at end of file diff --git a/package/python3-cffi/python3-cffi.mk b/package/python3-cffi/python3-cffi.mk deleted file mode 100644 index 2770eda93e..0000000000 --- a/package/python3-cffi/python3-cffi.mk +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# -# python3-cffi -# -################################################################################ - -# Please keep in sync with package/python-cffi/python-cffi.mk -PYTHON3_CFFI_VERSION = 1.15.0 -PYTHON3_CFFI_SOURCE = cffi-$(PYTHON3_CFFI_VERSION).tar.gz -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 - -# This host package uses pkg-config to find libffi, so we have to -# provide the proper hints for pkg-config to behave properly for host -# packages. -HOST_PYTHON3_CFFI_ENV = \ - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ - PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \ - PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ - PKG_CONFIG_SYSROOT_DIR="/" \ - PKG_CONFIG_LIBDIR="$(HOST_DIR)/lib/pkgconfig:$(HOST_DIR)/share/pkgconfig" -HOST_PYTHON3_CFFI_DEPENDENCIES = host-pkgconf host-python3-pycparser host-libffi - -HOST_PYTHON3_CFFI_DL_SUBDIR = python-cffi -HOST_PYTHON3_CFFI_NEEDS_HOST_PYTHON = python3 - -$(eval $(host-python-package)) From peter at korsgaard.com Fri Feb 11 19:08:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 20:08:03 +0100 Subject: [Buildroot] [git commit] package/python3-regex: drop host package Message-ID: <20220211190259.484B2825B5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2a8cea2ebcadb53d0b7545e9dd489344064d90d5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Now that host-python2 is gone, the custom python3 variant can be dropped and instead host support added to python-regex. Signed-off-by: Peter Korsgaard --- package/mongodb/mongodb.mk | 2 +- package/python-regex/python-regex.mk | 1 + package/python3-regex/python3-regex.hash | 1 - package/python3-regex/python3-regex.mk | 16 ---------------- 4 files changed, 2 insertions(+), 18 deletions(-) diff --git a/package/mongodb/mongodb.mk b/package/mongodb/mongodb.mk index e2a58a5f4e..9f6c7d31b8 100644 --- a/package/mongodb/mongodb.mk +++ b/package/mongodb/mongodb.mk @@ -19,7 +19,7 @@ MONGODB_DEPENDENCIES = \ host-python-cheetah \ host-python-psutil \ host-python-pyyaml \ - host-python3-regex \ + host-python-regex \ host-python-requests \ host-scons \ pcre \ diff --git a/package/python-regex/python-regex.mk b/package/python-regex/python-regex.mk index c46c4d1614..a90fd579ac 100644 --- a/package/python-regex/python-regex.mk +++ b/package/python-regex/python-regex.mk @@ -12,3 +12,4 @@ PYTHON_REGEX_SETUP_TYPE = setuptools PYTHON_REGEX_LICENSE = CNRI-Python $(eval $(python-package)) +$(eval $(host-python-package)) diff --git a/package/python3-regex/python3-regex.hash b/package/python3-regex/python3-regex.hash deleted file mode 120000 index 274f4dc277..0000000000 --- a/package/python3-regex/python3-regex.hash +++ /dev/null @@ -1 +0,0 @@ -../python-regex/python-regex.hash \ No newline at end of file diff --git a/package/python3-regex/python3-regex.mk b/package/python3-regex/python3-regex.mk deleted file mode 100644 index 0b71768e9d..0000000000 --- a/package/python3-regex/python3-regex.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# python3-regex -# -################################################################################ - -# Please keep in sync with package/python-regex/python-regex.mk -PYTHON3_REGEX_VERSION = 2021.4.4 -PYTHON3_REGEX_SOURCE = regex-$(PYTHON3_REGEX_VERSION).tar.gz -PYTHON3_REGEX_SITE = https://files.pythonhosted.org/packages/38/3f/4c42a98c9ad7d08c16e7d23b2194a0e4f3b2914662da8bc88986e4e6de1f -PYTHON3_REGEX_SETUP_TYPE = setuptools -PYTHON3_REGEX_LICENSE = CNRI-Python -HOST_PYTHON3_REGEX_DL_SUBDIR = python-regex -HOST_PYTHON3_REGEX_NEEDS_HOST_PYTHON = python3 - -$(eval $(host-python-package)) From fontaine.fabrice at gmail.com Fri Feb 11 20:31:43 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 11 Feb 2022 21:31:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/lzip: switch to tar.gz tarball Message-ID: <20220211203143.603357-1-fontaine.fabrice@gmail.com> One of the autobuilder seems to have an issue with tar.lz tarball so switch to tar.gz to avoid the following build failure since bump to version 1.23 in commit 4648090a89a2478a4b0fa8cc43a49bc94668622c: tar: This does not look like a tar archive Fixes: - http://autobuild.buildroot.org/results/76d8afa81e478cb4f408292484f67898236ca5a0 Signed-off-by: Fabrice Fontaine --- package/lzip/lzip.hash | 2 +- package/lzip/lzip.mk | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/package/lzip/lzip.hash b/package/lzip/lzip.hash index 5e285a5ad8..48ee8175ca 100644 --- a/package/lzip/lzip.hash +++ b/package/lzip/lzip.hash @@ -1,4 +1,4 @@ # From https://lists.nongnu.org/archive/html/lzip-bug/2022-02/msg00000.html -sha256 ea02b9e6fb25d0e1a1d3ef4fdeb6ab26b931f1ece66fa1cee2983c95215e930a lzip-1.23.tar.lz +sha256 4792c047ddf15ef29d55ba8e68a1a21e0cb7692d87ecdf7204419864582f280d lzip-1.23.tar.gz # Locally calculated sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef COPYING diff --git a/package/lzip/lzip.mk b/package/lzip/lzip.mk index e3cc86b956..31b5750767 100644 --- a/package/lzip/lzip.mk +++ b/package/lzip/lzip.mk @@ -5,7 +5,6 @@ ################################################################################ LZIP_VERSION = 1.23 -LZIP_SOURCE = lzip-$(LZIP_VERSION).tar.lz LZIP_SITE = http://download.savannah.gnu.org/releases/lzip LZIP_LICENSE = GPL-2.0+ LZIP_LICENSE_FILES = COPYING -- 2.34.1 From fontaine.fabrice at gmail.com Fri Feb 11 20:35:44 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 11 Feb 2022 21:35:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pyrex: drop package Message-ID: <20220211203544.603682-1-fontaine.fabrice@gmail.com> Drop package which is not used by anyone and can't be built since drop of host-python in commit 2743ce00ca61fde1537b64a165a69d497052be58 Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine --- DEVELOPERS | 1 - package/python-pyrex/python-pyrex.hash | 3 --- package/python-pyrex/python-pyrex.mk | 15 --------------- 3 files changed, 19 deletions(-) delete mode 100644 package/python-pyrex/python-pyrex.hash delete mode 100644 package/python-pyrex/python-pyrex.mk diff --git a/DEVELOPERS b/DEVELOPERS index 0e759bc168..eb073c41f1 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1934,7 +1934,6 @@ F: package/python-ipy/ F: package/python-iwlib/ F: package/python-posix-ipc/ F: package/python-pycairo/ -F: package/python-pyrex/ F: package/python-pysftp/ F: package/python-tinyrpc/ F: package/python-txdbus/ diff --git a/package/python-pyrex/python-pyrex.hash b/package/python-pyrex/python-pyrex.hash deleted file mode 100644 index e8963558fc..0000000000 --- a/package/python-pyrex/python-pyrex.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 5f87df06831d0b3412eb4bc9d3fc2ee7bfae1b913d7da8c23ab2bf5699fb6b50 Pyrex-0.9.9.tar.gz -sha256 5c1aec55fc8c399ec23968ddb2117eec8f7a53f002c15472a8b0aa7426790700 LICENSE.txt diff --git a/package/python-pyrex/python-pyrex.mk b/package/python-pyrex/python-pyrex.mk deleted file mode 100644 index 6284a5f228..0000000000 --- a/package/python-pyrex/python-pyrex.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# python-pyrex -# -################################################################################ - -PYTHON_PYREX_VERSION = 0.9.9 -PYTHON_PYREX_SOURCE = Pyrex-$(PYTHON_PYREX_VERSION).tar.gz -PYTHON_PYREX_SITE = http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex -PYTHON_PYREX_LICENSE = Apache-2.0 -PYTHON_PYREX_LICENSE_FILES = LICENSE.txt -PYTHON_PYREX_SETUP_TYPE = distutils -HOST_PYTHON_PYREX_NEEDS_HOST_PYTHON = python2 - -$(eval $(host-python-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Fri Feb 11 21:12:07 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 11 Feb 2022 22:12:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/gstreamer1/gst1-plugins-base: fix build with gcc 4.8 Message-ID: <20220211211207.762485-1-fontaine.fabrice@gmail.com> Fix the following build failure with gcc 4.8 raised since bump to version 1.20.0 in commit 801131157dcef2c97e947a1d3e8c9bfa7aa3d870: ../gst-libs/gst/video/video-converter.c: In function 'convert_I420_v210': ../gst-libs/gst/video/video-converter.c:3771:7: error: 'for' loop initial declarations are only allowed in C99 mode for (int j = width * 4 - 1; j >= 0; j--) { ^ Fixes: - http://autobuild.buildroot.org/results/c4b1449f35debcbabff7e42abe239695d4ad4d21 Signed-off-by: Fabrice Fontaine --- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk index 68281738fa..08aac850cd 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk @@ -11,6 +11,8 @@ GST1_PLUGINS_BASE_INSTALL_STAGING = YES GST1_PLUGINS_BASE_LICENSE_FILES = COPYING GST1_PLUGINS_BASE_LICENSE = LGPL-2.1+ +GST1_PLUGINS_BASE_CFLAGS = $(TARGET_CFLAGS) -std=gnu99 + GST1_PLUGINS_BASE_CONF_OPTS = \ -Dexamples=disabled \ -Dtests=disabled \ -- 2.34.1 From peter at korsgaard.com Fri Feb 11 22:26:12 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 23:26:12 +0100 Subject: [Buildroot] [PATCH] package/casync: fix zstd dependency to correct package name In-Reply-To: ("Nuno =?utf-8?Q?Gon=C3=A7alves=22's?= message of "Fri, 11 Feb 2022 18:22:03 +0000") References: Message-ID: <877da1oxa3.fsf@dell.be.48ers.dk> >>>>> "Nuno" == Nuno Gon?alves writes: > Signed-off-by: Nuno Goncalves Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 11 22:27:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 23:27:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/lzip: switch to tar.gz tarball In-Reply-To: <20220211203143.603357-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 11 Feb 2022 21:31:43 +0100") References: <20220211203143.603357-1-fontaine.fabrice@gmail.com> Message-ID: <8735kpox86.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > One of the autobuilder seems to have an issue with tar.lz tarball so > switch to tar.gz to avoid the following build failure since bump to > version 1.23 in commit 4648090a89a2478a4b0fa8cc43a49bc94668622c: > tar: This does not look like a tar archive > Fixes: > - http://autobuild.buildroot.org/results/76d8afa81e478cb4f408292484f67898236ca5a0 > Signed-off-by: Fabrice Fontaine This is already fixed by https://git.buildroot.net/buildroot/commit/?id=618c5f7671643516432c1ec6b9f7b203313763a7 so I have marked it as superseeded. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 11 22:26:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 23:26:01 +0100 Subject: [Buildroot] [git commit] package/casync: fix zstd dependency to correct package name Message-ID: <20220211222017.0DC4C82DDC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=807bf505f42997f98f8acb7c7046ca5f97df08bb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Nuno Goncalves Signed-off-by: Peter Korsgaard --- package/casync/casync.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/casync/casync.mk b/package/casync/casync.mk index d74cb1bfe8..bb9bd8ccac 100644 --- a/package/casync/casync.mk +++ b/package/casync/casync.mk @@ -40,8 +40,8 @@ else CASYNC_CONF_OPTS += -Dudev=false endif -ifeq ($(BR2_PACKAGE_LIBZSTD),y) -CASYNC_DEPENDENCIES += libzstd +ifeq ($(BR2_PACKAGE_ZSTD),y) +CASYNC_DEPENDENCIES += zstd CASYNC_CONF_OPTS += -Dlibzstd=enabled else CASYNC_CONF_OPTS += -Dlibzstd=disabled From peter at korsgaard.com Fri Feb 11 22:41:52 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 23:41:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pyrex: drop package In-Reply-To: <20220211203544.603682-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 11 Feb 2022 21:35:44 +0100") References: <20220211203544.603682-1-fontaine.fabrice@gmail.com> Message-ID: <87y22hnhzj.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Drop package which is not used by anyone and can't be built since drop > of host-python in commit 2743ce00ca61fde1537b64a165a69d497052be58 > Fixes: > - No autobuilder failures (yet) > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 11 22:41:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Feb 2022 23:41:22 +0100 Subject: [Buildroot] [git commit] package/python-pyrex: drop package Message-ID: <20220211223443.3A77B82B88@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c26eab78ab17bcc507b28a7e9eb70a08ffe88ef3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop package which is not used by anyone and can't be built since drop of host-python in commit 2743ce00ca61fde1537b64a165a69d497052be58 Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 - package/python-pyrex/python-pyrex.hash | 3 --- package/python-pyrex/python-pyrex.mk | 15 --------------- 3 files changed, 19 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 0e759bc168..eb073c41f1 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1934,7 +1934,6 @@ F: package/python-ipy/ F: package/python-iwlib/ F: package/python-posix-ipc/ F: package/python-pycairo/ -F: package/python-pyrex/ F: package/python-pysftp/ F: package/python-tinyrpc/ F: package/python-txdbus/ diff --git a/package/python-pyrex/python-pyrex.hash b/package/python-pyrex/python-pyrex.hash deleted file mode 100644 index e8963558fc..0000000000 --- a/package/python-pyrex/python-pyrex.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 5f87df06831d0b3412eb4bc9d3fc2ee7bfae1b913d7da8c23ab2bf5699fb6b50 Pyrex-0.9.9.tar.gz -sha256 5c1aec55fc8c399ec23968ddb2117eec8f7a53f002c15472a8b0aa7426790700 LICENSE.txt diff --git a/package/python-pyrex/python-pyrex.mk b/package/python-pyrex/python-pyrex.mk deleted file mode 100644 index 6284a5f228..0000000000 --- a/package/python-pyrex/python-pyrex.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# python-pyrex -# -################################################################################ - -PYTHON_PYREX_VERSION = 0.9.9 -PYTHON_PYREX_SOURCE = Pyrex-$(PYTHON_PYREX_VERSION).tar.gz -PYTHON_PYREX_SITE = http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex -PYTHON_PYREX_LICENSE = Apache-2.0 -PYTHON_PYREX_LICENSE_FILES = LICENSE.txt -PYTHON_PYREX_SETUP_TYPE = distutils -HOST_PYTHON_PYREX_NEEDS_HOST_PYTHON = python2 - -$(eval $(host-python-package)) From james.hilliard1 at gmail.com Sat Feb 12 05:42:27 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 11 Feb 2022 22:42:27 -0700 Subject: [Buildroot] [PATCH 1/1] package/pkg-python: drop python2 host/setuptools support Message-ID: <20220212054227.1207008-1-james.hilliard1@gmail.com> Drop conditonal python version handling now that python2 has been removed. Remove python3-setuptools and replace usage with python3 only python-setuptools. Signed-off-by: James Hilliard --- package/libapparmor/libapparmor.mk | 2 +- package/libiio/libiio.mk | 2 +- package/lirc-tools/lirc-tools.mk | 2 +- package/pkg-python.mk | 66 +---------------- .../{60.7.0 => }/0001-add-executable.patch | 0 .../44.0.0/0001-add-executable.patch | 72 ------------------- .../44.0.0/python-setuptools.hash | 4 -- .../{60.7.0 => }/python-setuptools.hash | 0 .../python-setuptools/python-setuptools.mk | 17 +---- .../0001-add-executable.patch | 1 - .../python3-setuptools.hash | 1 - .../python3-setuptools/python3-setuptools.mk | 20 ------ 12 files changed, 6 insertions(+), 181 deletions(-) rename package/python-setuptools/{60.7.0 => }/0001-add-executable.patch (100%) delete mode 100644 package/python-setuptools/44.0.0/0001-add-executable.patch delete mode 100644 package/python-setuptools/44.0.0/python-setuptools.hash rename package/python-setuptools/{60.7.0 => }/python-setuptools.hash (100%) delete mode 120000 package/python3-setuptools/0001-add-executable.patch delete mode 120000 package/python3-setuptools/python3-setuptools.hash delete mode 100644 package/python3-setuptools/python3-setuptools.mk diff --git a/package/libapparmor/libapparmor.mk b/package/libapparmor/libapparmor.mk index f3d744e3e7..7bb849ab94 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-python3-setuptools host-swig python3 +LIBAPPARMOR_DEPENDENCIES += host-python3 host-python-setuptools host-swig python3 LIBAPPARMOR_CONF_OPTS += \ --with-python \ PYTHON=$(HOST_DIR)/usr/bin/python3 \ diff --git a/package/libiio/libiio.mk b/package/libiio/libiio.mk index 48e2f385e3..9464a44ae7 100644 --- a/package/libiio/libiio.mk +++ b/package/libiio/libiio.mk @@ -73,7 +73,7 @@ LIBIIO_CONF_OPTS += -DHAVE_DNS_SD=OFF endif ifeq ($(BR2_PACKAGE_LIBIIO_BINDINGS_PYTHON),y) -LIBIIO_DEPENDENCIES += host-python3-setuptools python3 +LIBIIO_DEPENDENCIES += host-python-setuptools python3 LIBIIO_CONF_OPTS += \ -DPYTHON_BINDINGS=ON -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 diff --git a/package/lirc-tools/lirc-tools.mk b/package/lirc-tools/lirc-tools.mk index 27aa5b97cc..05f20f5726 100644 --- a/package/lirc-tools/lirc-tools.mk +++ b/package/lirc-tools/lirc-tools.mk @@ -47,7 +47,7 @@ LIRC_TOOLS_DEPENDENCIES += libftdi1 endif ifeq ($(BR2_PACKAGE_PYTHON3),y) -LIRC_TOOLS_DEPENDENCIES += python3 host-python3-setuptools +LIRC_TOOLS_DEPENDENCIES += python3 host-python-setuptools LIRC_TOOLS_MAKE_ENV += SETUPTOOLS_ENV='$(PKG_PYTHON_SETUPTOOLS_ENV)' endif diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 00bdb9150a..bf0649fc9c 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -150,86 +150,24 @@ endif # Target packages need both the python interpreter on the target (for # runtime) and the python interpreter on the host (for # compilation). However, host packages only need the python -# interpreter on the host, whose version may be enforced by setting -# the *_NEEDS_HOST_PYTHON variable. -# -# So: -# - 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 use the default -# interpreter; -# - otherwise, we depend on the one requested by *_NEEDS_HOST_PYTHON. +# interpreter on the host. # ifeq ($(4),target) -$(2)_DEPENDENCIES += $$(if $$(BR2_PACKAGE_PYTHON3),host-python3 python3,host-python python) -else -ifeq ($$($(2)_NEEDS_HOST_PYTHON),) -$(2)_DEPENDENCIES += $$(if $$(BR2_PACKAGE_PYTHON3),host-python3,host-python) +$(2)_DEPENDENCIES += host-python3 python3 else -ifeq ($$($(2)_NEEDS_HOST_PYTHON),python2) -$(2)_DEPENDENCIES += host-python -else ifeq ($$($(2)_NEEDS_HOST_PYTHON),python3) $(2)_DEPENDENCIES += host-python3 -else -$$(error Incorrect value '$$($(2)_NEEDS_HOST_PYTHON)' for $(2)_NEEDS_HOST_PYTHON) -endif -endif # ($$($(2)_NEEDS_HOST_PYTHON),) endif # ($(4),target) # Setuptools based packages will need setuptools for the host Python # interpreter (both host and target). # -# If we have a host package that says "I need Python 3", we install -# setuptools for python3. -# -# If we have a host packge that says "I need Python 2", we install -# setuptools for python2. -# -# If we have a target package, or a host package that doesn't have any -# _NEEDS_HOST_PYTHON, and BR2_PACKAGE_PYTHON3 is used, then -# Python 3.x is the default Python interpreter, so we install -# setuptools for python3. -# -# In all other cases, we install setuptools for python2. Those other -# cases are: a target package or host package with -# BR2_PACKAGE_PYTHON=y, or a host-package with neither -# BR2_PACKAGE_PYTHON3=y or BR2_PACKAGE_PYTHON=y. ifeq ($$($(2)_SETUP_TYPE),setuptools) -ifeq ($(4):$$($(2)_NEEDS_HOST_PYTHON),host:python3) -$(2)_DEPENDENCIES += $$(if $$(filter host-python3-setuptools,$(1)),,host-python3-setuptools) -else ifeq ($(4):$$($(2)_NEEDS_HOST_PYTHON),host:python2) -$(2)_DEPENDENCIES += $$(if $$(filter host-python-setuptools,$(1)),,host-python-setuptools) -else ifeq ($$(BR2_PACKAGE_PYTHON3),y) -$(2)_DEPENDENCIES += $$(if $$(filter host-python3-setuptools,$(1)),,host-python3-setuptools) -else $(2)_DEPENDENCIES += $$(if $$(filter host-python-setuptools,$(1)),,host-python-setuptools) -endif endif # SETUP_TYPE # Python interpreter to use for building the package. # -# We may want to specify the python interpreter to be used for building a -# package, especially for host-packages (target packages must be built using -# the same version of the interpreter as the one installed on the target). -# -# So: -# - 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 the default -# interpreter; -# - otherwise, we use the one requested by *_NEEDS_HOST_PYTHON. -# -ifeq ($(4),target) $(2)_PYTHON_INTERPRETER = $$(HOST_DIR)/bin/python -else -ifeq ($$($(2)_NEEDS_HOST_PYTHON),) -$(2)_PYTHON_INTERPRETER = $$(HOST_DIR)/bin/python -else -$(2)_PYTHON_INTERPRETER = $$(HOST_DIR)/bin/$$($(2)_NEEDS_HOST_PYTHON) -endif -endif # # Build step. Only define it if not already defined by the package .mk diff --git a/package/python-setuptools/60.7.0/0001-add-executable.patch b/package/python-setuptools/0001-add-executable.patch similarity index 100% rename from package/python-setuptools/60.7.0/0001-add-executable.patch rename to package/python-setuptools/0001-add-executable.patch diff --git a/package/python-setuptools/44.0.0/0001-add-executable.patch b/package/python-setuptools/44.0.0/0001-add-executable.patch deleted file mode 100644 index 8a59f5a4d8..0000000000 --- a/package/python-setuptools/44.0.0/0001-add-executable.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 9b3d307f8f6a1af88f3f810f5a6cf0835830e1e8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Mon, 7 Dec 2015 01:14:33 +0100 -Subject: [PATCH] add executable -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Add a new --executable option to distribute so that we can -force the shebang line in installed python scripts. - -[Thomas: refresh for setuptools 5.8.] -[J?rg: refresh for setuptools 18.7.1] - -Signed-off-by: Gustavo Zacarias -Signed-off-by: Thomas Petazzoni -Signed-off-by: J?rg Krause ---- - setuptools/command/install.py | 2 ++ - setuptools/command/install_scripts.py | 9 +++++++++ - 2 files changed, 11 insertions(+) - -diff --git a/setuptools/command/install.py b/setuptools/command/install.py -index d2bca2e..b60ef19 100644 ---- a/setuptools/command/install.py -+++ b/setuptools/command/install.py -@@ -16,6 +16,7 @@ class install(orig.install): - """Use easy_install to install the package, w/dependencies""" - - user_options = orig.install.user_options + [ -+ ('executable=', 'e', "specify final destination interpreter path"), - ('old-and-unmanageable', None, "Try not to use this!"), - ('single-version-externally-managed', None, - "used by system package builders to create 'flat' eggs"), -@@ -31,6 +32,7 @@ class install(orig.install): - - def initialize_options(self): - orig.install.initialize_options(self) -+ self.executable = None - self.old_and_unmanageable = None - self.single_version_externally_managed = None - -diff --git a/setuptools/command/install_scripts.py b/setuptools/command/install_scripts.py -index be66cb2..07afaf8 100755 ---- a/setuptools/command/install_scripts.py -+++ b/setuptools/command/install_scripts.py -@@ -11,6 +11,13 @@ class install_scripts(orig.install_scripts): - def initialize_options(self): - orig.install_scripts.initialize_options(self) - self.no_ep = False -+ self.executable = None -+ -+ def finalize_options(self): -+ orig.install_scripts.finalize_options(self) -+ self.set_undefined_options('install', -+ ('executable','executable') -+ ) - - def run(self): - import setuptools.command.easy_install as ei -@@ -31,6 +38,8 @@ class install_scripts(orig.install_scripts): - ) - bs_cmd = self.get_finalized_command('build_scripts') - exec_param = getattr(bs_cmd, 'executable', None) -+ if self.executable is not None: -+ exec_param = self.executable - bw_cmd = self.get_finalized_command("bdist_wininst") - is_wininst = getattr(bw_cmd, '_is_running', False) - writer = ei.ScriptWriter --- -2.6.3 - diff --git a/package/python-setuptools/44.0.0/python-setuptools.hash b/package/python-setuptools/44.0.0/python-setuptools.hash deleted file mode 100644 index 769b68c35d..0000000000 --- a/package/python-setuptools/44.0.0/python-setuptools.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From https://pypi.org/pypi/setuptools/json -md5 32b6cdce670ce462086d246bea181e9d setuptools-44.0.0.zip -sha256 e5baf7723e5bb8382fc146e33032b241efc63314211a3a120aaa55d62d2bb008 setuptools-44.0.0.zip -sha256 c32a3ac395af6321efd28be73d06a00f0db6ab887d1c21d4fec46128d2056d5a LICENSE diff --git a/package/python-setuptools/60.7.0/python-setuptools.hash b/package/python-setuptools/python-setuptools.hash similarity index 100% rename from package/python-setuptools/60.7.0/python-setuptools.hash rename to package/python-setuptools/python-setuptools.hash diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk index 04b872fb79..584f83f7a0 100644 --- a/package/python-setuptools/python-setuptools.mk +++ b/package/python-setuptools/python-setuptools.mk @@ -4,29 +4,14 @@ # ################################################################################ -# Please keep in sync with -# package/python3-setuptools/python3-setuptools.mk PYTHON_SETUPTOOLS_VERSION = 60.7.0 -PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON3_SETUPTOOLS_VERSION).tar.gz +PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).tar.gz PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/29/dd/48d662bb93e5e51e72265ef612f869947d4ae4126328d7156824cd50d440 - -# The host variant is only for Python 2.x, so we need to use 44.0.0. -HOST_PYTHON_SETUPTOOLS_VERSION = 44.0.0 -HOST_PYTHON_SETUPTOOLS_SOURCE = setuptools-$(HOST_PYTHON_SETUPTOOLS_VERSION).zip -HOST_PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/b0/f3/44da7482ac6da3f36f68e253cb04de37365b3dba9036a3c70773b778b485 -HOST_PYTHON_SETUPTOOLS_NEEDS_HOST_PYTHON = python2 - PYTHON_SETUPTOOLS_LICENSE = MIT PYTHON_SETUPTOOLS_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_CPE_ID_VENDOR = python PYTHON_SETUPTOOLS_CPE_ID_PRODUCT = setuptools PYTHON_SETUPTOOLS_SETUP_TYPE = setuptools -define HOST_PYTHON_SETUPTOOLS_EXTRACT_CMDS - $(UNZIP) -d $(@D) $(HOST_PYTHON_SETUPTOOLS_DL_DIR)/$(HOST_PYTHON_SETUPTOOLS_SOURCE) - mv $(@D)/setuptools-$(HOST_PYTHON_SETUPTOOLS_VERSION)/* $(@D) - $(RM) -r $(@D)/setuptools-$(HOST_PYTHON_SETUPTOOLS_VERSION) -endef - $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python3-setuptools/0001-add-executable.patch b/package/python3-setuptools/0001-add-executable.patch deleted file mode 120000 index 46b5935d33..0000000000 --- a/package/python3-setuptools/0001-add-executable.patch +++ /dev/null @@ -1 +0,0 @@ -../python-setuptools/60.7.0/0001-add-executable.patch \ No newline at end of file diff --git a/package/python3-setuptools/python3-setuptools.hash b/package/python3-setuptools/python3-setuptools.hash deleted file mode 120000 index 2c9d3614d5..0000000000 --- a/package/python3-setuptools/python3-setuptools.hash +++ /dev/null @@ -1 +0,0 @@ -../python-setuptools/60.7.0/python-setuptools.hash \ No newline at end of file diff --git a/package/python3-setuptools/python3-setuptools.mk b/package/python3-setuptools/python3-setuptools.mk deleted file mode 100644 index d5aaa01918..0000000000 --- a/package/python3-setuptools/python3-setuptools.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# python3-setuptools -# -################################################################################ - -# Please keep in sync with -# package/python-setuptools/python-setuptools.mk -PYTHON3_SETUPTOOLS_VERSION = 60.7.0 -PYTHON3_SETUPTOOLS_SOURCE = setuptools-$(PYTHON3_SETUPTOOLS_VERSION).tar.gz -PYTHON3_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/29/dd/48d662bb93e5e51e72265ef612f869947d4ae4126328d7156824cd50d440 -PYTHON3_SETUPTOOLS_LICENSE = MIT -PYTHON3_SETUPTOOLS_LICENSE_FILES = LICENSE -PYTHON3_SETUPTOOLS_CPE_ID_VENDOR = python -PYTHON3_SETUPTOOLS_CPE_ID_PRODUCT = setuptools -PYTHON3_SETUPTOOLS_SETUP_TYPE = setuptools -HOST_PYTHON3_SETUPTOOLS_DL_SUBDIR = python-setuptools -HOST_PYTHON3_SETUPTOOLS_NEEDS_HOST_PYTHON = python3 - -$(eval $(host-python-package)) -- 2.25.1 From bernd.kuhls at t-online.de Sat Feb 12 06:22:20 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 12 Feb 2022 07:22:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/xmrig: bump version to 6.16.4 Message-ID: <20220212062220.611561-1-bernd.kuhls@t-online.de> 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 36b0c8c8a1..ff5f80a67b 100644 --- a/package/xmrig/xmrig.hash +++ b/package/xmrig/xmrig.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d413b6a20a0ce30410388d330e1056715333e0863165369668dda596766e9d5b xmrig-6.16.3.tar.gz +sha256 245ba47a6b8ae8e9a9df1c055e90f22f944a7d1219416cb30268881d0c0d377b xmrig-6.16.4.tar.gz sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE diff --git a/package/xmrig/xmrig.mk b/package/xmrig/xmrig.mk index 7fa638a54c..1feab499fc 100644 --- a/package/xmrig/xmrig.mk +++ b/package/xmrig/xmrig.mk @@ -4,7 +4,7 @@ # ################################################################################ -XMRIG_VERSION = 6.16.3 +XMRIG_VERSION = 6.16.4 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 Sat Feb 12 08:02:33 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 12 Feb 2022 08:02:33 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-02-11 Message-ID: <20220212080238.E802C83E96@smtp1.osuosl.org> Hello, Autobuild statistics for 2022-02-11 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 54 | 8 | 0 | 62 | 2021.11.x | 19 | 1 | 0 | 20 | master | 26 | 60 | 0 | 86 | Classification of failures by reason for master ----------------------------------------------- host-lzip-1.23 | 18 bluez5_utils-5.63 | 7 host-cxxtest-4.4 | 5 host-python-greenlet-1.1.2 | 4 host-python-six-1.16.0 | 4 gst1-plugins-base-1.20.0 | 2 host-bmap-tools-3.6 | 2 host-grpc-1.43.0 | 2 host-python-cython-0.29.27 | 2 host-python-docutils-0.15.2 | 2 host-python-pycryptodomex-3... | 2 bat-0.19.0 | 1 frr-8.1 | 1 gerbera-1.9.2 | 1 google-breakpad-7515ab13768... | 1 host-python-lxml-4.6.5 | 1 host-python-xlrd-2.0.1 | 1 mpdecimal-2.5.1 | 1 python-docutils-0.15.2 | 1 target-finalize | 1 unknown | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | bat-0.19.0 | NOK | http://autobuild.buildroot.net/results/233c48db483d771ec79433f7d8c956757619c29b | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/b514a5d49ceeba7d87191e80fd9e790e2331a688 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/decb0e0fd5234d339ef1f2a6083b5ae5eb16f9ab | powerpc | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/731da7effd1a6f09d2d930518b25deb5b698d91a | nios2 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/7b5361d9e0160db8c1c42202c2f819c88b9ed712 | i586 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/9e6c817ed1294b32704d302150210e2d18380db4 | riscv64 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/bce5cdd062f8ed00dadc209f50eab44a49d196e7 | riscv64 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/25ca25c5ac0422fb31f1506744c1081da6220d36 | nios2 | frr-8.1 | NOK | http://autobuild.buildroot.net/results/9ea759fc4177cc70c650d79fabe3e439dc5d0a9d | arc | gerbera-1.9.2 | NOK | http://autobuild.buildroot.net/results/0606c01f099f3d44d9e4d6c9dc2edf2afb2d7a72 | mipsel | google-breakpad-7515ab13768... | NOK | http://autobuild.buildroot.net/results/0b2dc409a8d9c0f30563c14654f1bbbdd39926e4 | arm | gst1-plugins-base-1.20.0 | NOK | http://autobuild.buildroot.net/results/c4b1449f35debcbabff7e42abe239695d4ad4d21 | ORPH arm | gst1-plugins-base-1.20.0 | NOK | http://autobuild.buildroot.net/results/4d4f6533e275f3f420221424d49efe1106b79248 | ORPH x86_64 | host-bmap-tools-3.6 | NOK | http://autobuild.buildroot.net/results/d99c4c6824244085941ba1b8b8a19428893adbbf | m68k | host-bmap-tools-3.6 | NOK | http://autobuild.buildroot.net/results/3dde991f3fc971ef7db888ba9e9731092f2fdd04 | m68k | host-cxxtest-4.4 | NOK | http://autobuild.buildroot.net/results/d4f4f272788fb7b2a50df4aed1cae56fef3cf7e6 | powerpc64 | host-cxxtest-4.4 | NOK | http://autobuild.buildroot.net/results/1f504875be72d5bbc8c2d181eeddb5b0ed19519b | arm | host-cxxtest-4.4 | NOK | http://autobuild.buildroot.net/results/d4e450a75fa6673003a4f50d8effc4b23f62bac8 | mipsel | host-cxxtest-4.4 | NOK | http://autobuild.buildroot.net/results/0e6f0e8f9902bfbf98b1db88c61df70cfc022868 | i686 | host-cxxtest-4.4 | NOK | http://autobuild.buildroot.net/results/a70fa6f9a8829cc86d7e1fdcbecb97e451a564ba | riscv64 | host-grpc-1.43.0 | NOK | http://autobuild.buildroot.net/results/c4a3b10cfbdb781136ec22915fe11df2c65e4ad3 | i686 | host-grpc-1.43.0 | NOK | http://autobuild.buildroot.net/results/9355d10fb99f197248a5f5825f1b2c661f89fb20 | sparc64 | host-lzip-1.23 | NOK | http://autobuild.buildroot.net/results/4ac1de927d4b988c6b9b1d51e3a06c37f33109eb | ORPH microblazeel | host-lzip-1.23 | NOK | http://autobuild.buildroot.net/results/291bded53473f87f604e054b1473aac1e0080327 | ORPH arm | host-lzip-1.23 | NOK | http://autobuild.buildroot.net/results/59c517407f890de89916b0c5b01d217f2bac88ef | ORPH arm | host-lzip-1.23 | NOK | http://autobuild.buildroot.net/results/1ebc53a1c1307567b31cc08d0e542d68f09fdd20 | ORPH arm | host-lzip-1.23 | NOK | http://autobuild.buildroot.net/results/afe026f053a9f8184ba0346d994f8dbad8e96c19 | ORPH arm | host-lzip-1.23 | NOK | http://autobuild.buildroot.net/results/fe27629126d383eded056a8808778d2f6d3661f6 | ORPH arm | host-lzip-1.23 | NOK | http://autobuild.buildroot.net/results/76d8afa81e478cb4f408292484f67898236ca5a0 | ORPH riscv64 | host-lzip-1.23 | NOK | http://autobuild.buildroot.net/results/feaad6b96bd4083bd42c4ceb46831d8adabca7ca | ORPH sparc | host-lzip-1.23 | NOK | http://autobuild.buildroot.net/results/c5f90590e95d71d4df893c90d31ca0567337602d | ORPH mips64el | host-lzip-1.23 | NOK | http://autobuild.buildroot.net/results/9f1377daa4682d8881048819222158e4d402324d | ORPH riscv64 | host-lzip-1.23 | NOK | http://autobuild.buildroot.net/results/bc2c91f1020b124aee972e357a4ea36302c0f236 | ORPH arm | host-lzip-1.23 | NOK | http://autobuild.buildroot.net/results/8c587a9b122a6be4cf2d072b6f4f8d1ea0a2e559 | ORPH riscv64 | host-lzip-1.23 | NOK | http://autobuild.buildroot.net/results/d1512d274fe36a77c87844714edb28c333d711d1 | ORPH mips64el | host-lzip-1.23 | NOK | http://autobuild.buildroot.net/results/289caf01c243a4fe5427db81e132161e8fab3721 | ORPH m68k | host-lzip-1.23 | NOK | http://autobuild.buildroot.net/results/61afee5b7f1250ce1540a4128a6c0dceec5349eb | ORPH riscv64 | host-lzip-1.23 | NOK | http://autobuild.buildroot.net/results/1abfe907c4cab333f9b40a9c3fe0b4ab969a850d | ORPH mips64el | host-lzip-1.23 | NOK | http://autobuild.buildroot.net/results/cf5a59b0322e9fe359ef2053370840944e222b26 | ORPH arc | host-lzip-1.23 | NOK | http://autobuild.buildroot.net/results/49b598458fcfd20f3d185f57019dc2225c8f6ced | ORPH nds32le | host-python-cython-0.29.27 | NOK | http://autobuild.buildroot.net/results/f9c7da94e38ea83f4db37de3862d7685fcfef514 | arm | host-python-cython-0.29.27 | NOK | http://autobuild.buildroot.net/results/8b405edb03e0e869ffec2d95a54b97dc1bd5fa4c | riscv64 | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/937ccd09532ff966c070da7fdb863a742d115b86 | x86_64 | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/c2f9a8a2d0d7c29695ae94106f5684def2a52a63 | arc | host-python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/5f2f334b7a93da7213f7535410ac2bc7eb161449 | riscv32 | host-python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/df691de7749b5e998ee824c67eff46885a83b4c8 | arm | host-python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/c90060446e8f73c9bc510fb27626fb309ae4ada1 | arm | host-python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/f012d6c16e518ffc9e3a784d0a9486058463e8f6 | microblazeel | host-python-lxml-4.6.5 | NOK | http://autobuild.buildroot.net/results/7a54e772510b0b407243599c69de7aa4b10943de | arm | host-python-pycryptodomex-3... | NOK | http://autobuild.buildroot.net/results/1255ad0d0cbcd7048221643b8d2388edb2fdef74 | riscv64 | host-python-pycryptodomex-3... | NOK | http://autobuild.buildroot.net/results/56ff2c33aa0e36e7a9bf3e3fe83de149493c1cd4 | arc | host-python-six-1.16.0 | NOK | http://autobuild.buildroot.net/results/da51646656640c0ae7a18097212b48790065406f | arm | host-python-six-1.16.0 | NOK | http://autobuild.buildroot.net/results/97e36712c5138552778149f5ebf91f63e533047e | riscv64 | host-python-six-1.16.0 | NOK | http://autobuild.buildroot.net/results/fb9e8d595f66f33d9bc9365f8eba6abd16e31afb | riscv64 | host-python-six-1.16.0 | NOK | http://autobuild.buildroot.net/results/79e0e8e12420a5fb98144e44805581b643f238c9 | arm | host-python-xlrd-2.0.1 | NOK | http://autobuild.buildroot.net/results/8806c24202a81dab011a45011afb0956c1871e7b | arm | mpdecimal-2.5.1 | NOK | http://autobuild.buildroot.net/results/38174e993635677a63061e97993e5eee8645cc32 | or1k | python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/ed3e196841c1d02787f7fa102cd52456e09d58fd | arm | target-finalize | NOK | http://autobuild.buildroot.net/results/46a9750de4b98be96a480231acf9ca15b86d64bd | arm | unknown | NOK | http://autobuild.buildroot.net/results/590e256491926126388121fc5062721569149041 | Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 3 monkey-f54856ce250c4e257354... | 2 gerbera-1.6.4 | 1 unknown | 1 zeromq-4.3.4 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- riscv64 | gerbera-1.6.4 | NOK | http://autobuild.buildroot.net/results/737def3cb23c2e802ddc0a3a36cf0543f4d67583 | riscv64 | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/0ed9ab091a22a7b2135e06d25001ebe3c662fa96 | powerpc | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/01cfdf1c3cdadb6055bd477c5ccdf9f5a52e8bd1 | arc | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/7f35f70f00539110cb6b825565e6005f7041c018 | arm | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/376dc3a093dc2c63e571462ae82139aaa3e32cb4 | powerpc64le | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/c8aa7278008745b462c00d4e44bc49e6973da11b | riscv64 | unknown | NOK | http://autobuild.buildroot.net/results/ee582b3937cbbfb83d25146caa5b763acffb771b | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/1d2d94ac74d8db5d1abad6604cc19f24f7dcd07c | Classification of failures by reason for 2021.11.x -------------------------------------------------- zeromq-4.3.4 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/429d2dd34e5d8e2fff40ce7707fa1bb18260f3d6 | Gitlab CI results for 2022-02-11 ================================ Detail of defconfig failures for master --------------------------------------- defconfig | link to the job | orph? ----------------------------------+---------------------------------------------------------------+------ amarula_a64_relic | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076474884 | arcturus_ucls1012a | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076474890 | arcturus_ucp1020 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076474895 | arm_juno | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076474910 | armadeus_apf27 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076474912 | at91sam9260eknf | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076474927 | at91sam9g20dfc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076474931 | at91sam9g45m10ek | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076474936 | at91sam9rlek | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076474940 | at91sam9x5ek | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076474944 | at91sam9x5ek_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076474946 | at91sam9x5ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076474949 | at91sam9x5ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076474951 | atmel_sama5d27_som1_ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076474954 | atmel_sama5d2_xplained_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076474957 | atmel_sama5d2_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076474960 | atmel_sama5d3_xplained | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076474964 | atmel_sama5d3_xplained_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076474966 | atmel_sama5d3_xplained_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076474968 | atmel_sama5d3_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076474972 | atmel_sama5d3xek | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076474973 | atmel_sama5d4_xplained | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076474984 | atmel_sama5d4_xplained_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076474988 | atmel_sama5d4_xplained_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076474990 | atmel_sama5d4_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076474993 | bananapi_m1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475005 | bananapi_m1_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475009 | bananapi_m2_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475012 | bananapi_m2_ultra | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475014 | bananapi_m64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475020 | bananapro | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475021 | beagleboardx15 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475022 | beaglebone_qt5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475025 | beelink_gs1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475033 | chromebook_snow | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475038 | csky_gx6605s | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475043 | engicam_imx6qdl_icore | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475048 | engicam_imx6qdl_icore_qt5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475049 | engicam_imx6qdl_icore_rqs | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475053 | engicam_imx6ul_geam | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475055 | engicam_imx6ul_isiot | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475058 | freescale_imx6dlsabreauto | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475062 | freescale_imx8mpevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475082 | freescale_imx8qxpmek | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475085 | freescale_p1025twr | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475086 | freescale_t1040d4rdb | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475087 | freescale_t2080_qds_rdb | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475088 | friendlyarm_nanopi_a64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475091 | friendlyarm_nanopi_m1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475092 | ORPH friendlyarm_nanopi_m1_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475093 | ORPH friendlyarm_nanopi_m4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475094 | friendlyarm_nanopi_neo | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475098 | friendlyarm_nanopi_neo2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475095 | friendlyarm_nanopi_neo4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475097 | friendlyarm_nanopi_neo_plus2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475099 | friendlyarm_nanopi_r1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475101 | galileo | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475103 | imx23evk | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475113 | imx8mmpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475134 | imx8mpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475137 | lego_ev3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475143 | licheepi_zero | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475145 | microchip_sam9x60ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475147 | microchip_sam9x60ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475150 | microchip_sama5d27_wlsom1_ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475153 | ...hip_sama5d27_wlsom1_ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475154 | microchip_sama7g5ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475161 | microchip_sama7g5ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475162 | minnowboard_max-graphical | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475164 | mx25pdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475170 | odroidxu4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475225 | olimex_a20_olinuxino_lime2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475232 | olimex_imx233_olinuxino | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475245 | orangepi_lite2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475263 | orangepi_one_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475273 | orangepi_pc2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475275 | orangepi_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475280 | ORPH orangepi_prime | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475285 | orangepi_rk3399 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475294 | orangepi_win | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475299 | pc_x86_64_bios | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475326 | pcengines_apu2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475329 | pine64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475330 | pine64_sopine | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475334 | raspberrypi3_qt5we | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475425 | riotboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475437 | roc_pc_rk3399 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475438 | rock_pi_n8 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475447 | s6lx9_microboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475454 | snps_aarch64_vdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475459 | snps_arc700_axs101 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475461 | snps_archs38_axs103 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475464 | snps_archs38_hsdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475467 | socrates_cyclone5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475472 | solidrun_clearfog | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475475 | toradex_apalis_imx6 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475493 | ts4900 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475495 | ts7680 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475498 | warpboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475506 | zynq_microzed | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475507 | zynq_qmtech | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475508 | zynq_zc706 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475509 | zynq_zed | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475510 | zynqmp_zcu106 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2076475511 | -- http://autobuild.buildroot.net From michael at amarulasolutions.com Sat Feb 12 10:12:08 2022 From: michael at amarulasolutions.com (Michael Nazzareno Trimarchi) Date: Sat, 12 Feb 2022 11:12:08 +0100 Subject: [Buildroot] [PATCH V3] board: Add support for iMX8MN BSH SMM S2 PRO In-Reply-To: References: <20220131145555.2819020-1-michael@amarulasolutions.com> Message-ID: Hi all Should I need to resend? anything is missing now? Michael On Mon, Jan 31, 2022 at 5:20 PM Ariel D'Alessandro wrote: > > 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 -- 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 michael at amarulasolutions.com Sat Feb 12 10:13:25 2022 From: michael at amarulasolutions.com (Michael Nazzareno Trimarchi) Date: Sat, 12 Feb 2022 11:13:25 +0100 Subject: [Buildroot] [PATCH] package/freescale-imx: Add installation of easrc-imx8mn.bin firmware In-Reply-To: <20220129140831.1284832-1-michael@amarulasolutions.com> References: <20220129140831.1284832-1-michael@amarulasolutions.com> Message-ID: Hi On Sat, Jan 29, 2022 at 3:08 PM Michael Trimarchi wrote: > > 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) Is something missing here? Michael > -- > 2.25.1 > -- 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 peter at korsgaard.com Sat Feb 12 10:12:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 12 Feb 2022 11:12:33 +0100 Subject: [Buildroot] [git commit] package/libiio: add missing backslash to python binding logic Message-ID: <20220212100722.3D73D82AA2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0baf647329010270ccdd91dfe65a819886a4a21f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 5ac65831d5b6434dfa (package/libiio: drop python2 support) combined two LIBIIO_CONF_OPTS lines, but forgot the backslash at the end of the line. Fix that. Signed-off-by: Peter Korsgaard --- package/libiio/libiio.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libiio/libiio.mk b/package/libiio/libiio.mk index 48e2f385e3..e15d276b44 100644 --- a/package/libiio/libiio.mk +++ b/package/libiio/libiio.mk @@ -75,7 +75,7 @@ endif ifeq ($(BR2_PACKAGE_LIBIIO_BINDINGS_PYTHON),y) LIBIIO_DEPENDENCIES += host-python3-setuptools python3 LIBIIO_CONF_OPTS += \ - -DPYTHON_BINDINGS=ON + -DPYTHON_BINDINGS=ON \ -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 else LIBIIO_CONF_OPTS += -DPYTHON_BINDINGS=OFF From peter at korsgaard.com Sat Feb 12 10:24:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 12 Feb 2022 11:24:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/pkg-python: drop python2 host/setuptools support In-Reply-To: <20220212054227.1207008-1-james.hilliard1@gmail.com> (James Hilliard's message of "Fri, 11 Feb 2022 22:42:27 -0700") References: <20220212054227.1207008-1-james.hilliard1@gmail.com> Message-ID: <87tud4o01o.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Drop conditonal python version handling now that python2 has been > removed. > Remove python3-setuptools and replace usage with python3 only > python-setuptools. > Signed-off-by: James Hilliard Committed, thanks. I will send a patch to also update the documentation. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 12 10:15:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 12 Feb 2022 11:15:01 +0100 Subject: [Buildroot] [git commit] package/pkg-python: drop python2 host/setuptools support Message-ID: <20220212101743.115D882435@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=697acda00d9f6fc601e6724da36f0e0b96aeee09 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop conditonal python version handling now that python2 has been removed. Remove python3-setuptools and replace usage with python3 only python-setuptools. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/libapparmor/libapparmor.mk | 2 +- package/libiio/libiio.mk | 2 +- package/lirc-tools/lirc-tools.mk | 2 +- package/pkg-python.mk | 66 +------------------- .../{60.7.0 => }/0001-add-executable.patch | 0 .../44.0.0/0001-add-executable.patch | 72 ---------------------- .../44.0.0/python-setuptools.hash | 4 -- .../{60.7.0 => }/python-setuptools.hash | 0 package/python-setuptools/python-setuptools.mk | 17 +---- .../python3-setuptools/0001-add-executable.patch | 1 - package/python3-setuptools/python3-setuptools.hash | 1 - package/python3-setuptools/python3-setuptools.mk | 20 ------ 12 files changed, 6 insertions(+), 181 deletions(-) diff --git a/package/libapparmor/libapparmor.mk b/package/libapparmor/libapparmor.mk index f3d744e3e7..7bb849ab94 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-python3-setuptools host-swig python3 +LIBAPPARMOR_DEPENDENCIES += host-python3 host-python-setuptools host-swig python3 LIBAPPARMOR_CONF_OPTS += \ --with-python \ PYTHON=$(HOST_DIR)/usr/bin/python3 \ diff --git a/package/libiio/libiio.mk b/package/libiio/libiio.mk index e15d276b44..cfae34b2b7 100644 --- a/package/libiio/libiio.mk +++ b/package/libiio/libiio.mk @@ -73,7 +73,7 @@ LIBIIO_CONF_OPTS += -DHAVE_DNS_SD=OFF endif ifeq ($(BR2_PACKAGE_LIBIIO_BINDINGS_PYTHON),y) -LIBIIO_DEPENDENCIES += host-python3-setuptools python3 +LIBIIO_DEPENDENCIES += host-python-setuptools python3 LIBIIO_CONF_OPTS += \ -DPYTHON_BINDINGS=ON \ -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 diff --git a/package/lirc-tools/lirc-tools.mk b/package/lirc-tools/lirc-tools.mk index 27aa5b97cc..05f20f5726 100644 --- a/package/lirc-tools/lirc-tools.mk +++ b/package/lirc-tools/lirc-tools.mk @@ -47,7 +47,7 @@ LIRC_TOOLS_DEPENDENCIES += libftdi1 endif ifeq ($(BR2_PACKAGE_PYTHON3),y) -LIRC_TOOLS_DEPENDENCIES += python3 host-python3-setuptools +LIRC_TOOLS_DEPENDENCIES += python3 host-python-setuptools LIRC_TOOLS_MAKE_ENV += SETUPTOOLS_ENV='$(PKG_PYTHON_SETUPTOOLS_ENV)' endif diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 00bdb9150a..bf0649fc9c 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -150,86 +150,24 @@ endif # Target packages need both the python interpreter on the target (for # runtime) and the python interpreter on the host (for # compilation). However, host packages only need the python -# interpreter on the host, whose version may be enforced by setting -# the *_NEEDS_HOST_PYTHON variable. -# -# So: -# - 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 use the default -# interpreter; -# - otherwise, we depend on the one requested by *_NEEDS_HOST_PYTHON. +# interpreter on the host. # ifeq ($(4),target) -$(2)_DEPENDENCIES += $$(if $$(BR2_PACKAGE_PYTHON3),host-python3 python3,host-python python) -else -ifeq ($$($(2)_NEEDS_HOST_PYTHON),) -$(2)_DEPENDENCIES += $$(if $$(BR2_PACKAGE_PYTHON3),host-python3,host-python) +$(2)_DEPENDENCIES += host-python3 python3 else -ifeq ($$($(2)_NEEDS_HOST_PYTHON),python2) -$(2)_DEPENDENCIES += host-python -else ifeq ($$($(2)_NEEDS_HOST_PYTHON),python3) $(2)_DEPENDENCIES += host-python3 -else -$$(error Incorrect value '$$($(2)_NEEDS_HOST_PYTHON)' for $(2)_NEEDS_HOST_PYTHON) -endif -endif # ($$($(2)_NEEDS_HOST_PYTHON),) endif # ($(4),target) # Setuptools based packages will need setuptools for the host Python # interpreter (both host and target). # -# If we have a host package that says "I need Python 3", we install -# setuptools for python3. -# -# If we have a host packge that says "I need Python 2", we install -# setuptools for python2. -# -# If we have a target package, or a host package that doesn't have any -# _NEEDS_HOST_PYTHON, and BR2_PACKAGE_PYTHON3 is used, then -# Python 3.x is the default Python interpreter, so we install -# setuptools for python3. -# -# In all other cases, we install setuptools for python2. Those other -# cases are: a target package or host package with -# BR2_PACKAGE_PYTHON=y, or a host-package with neither -# BR2_PACKAGE_PYTHON3=y or BR2_PACKAGE_PYTHON=y. ifeq ($$($(2)_SETUP_TYPE),setuptools) -ifeq ($(4):$$($(2)_NEEDS_HOST_PYTHON),host:python3) -$(2)_DEPENDENCIES += $$(if $$(filter host-python3-setuptools,$(1)),,host-python3-setuptools) -else ifeq ($(4):$$($(2)_NEEDS_HOST_PYTHON),host:python2) -$(2)_DEPENDENCIES += $$(if $$(filter host-python-setuptools,$(1)),,host-python-setuptools) -else ifeq ($$(BR2_PACKAGE_PYTHON3),y) -$(2)_DEPENDENCIES += $$(if $$(filter host-python3-setuptools,$(1)),,host-python3-setuptools) -else $(2)_DEPENDENCIES += $$(if $$(filter host-python-setuptools,$(1)),,host-python-setuptools) -endif endif # SETUP_TYPE # Python interpreter to use for building the package. # -# We may want to specify the python interpreter to be used for building a -# package, especially for host-packages (target packages must be built using -# the same version of the interpreter as the one installed on the target). -# -# So: -# - 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 the default -# interpreter; -# - otherwise, we use the one requested by *_NEEDS_HOST_PYTHON. -# -ifeq ($(4),target) $(2)_PYTHON_INTERPRETER = $$(HOST_DIR)/bin/python -else -ifeq ($$($(2)_NEEDS_HOST_PYTHON),) -$(2)_PYTHON_INTERPRETER = $$(HOST_DIR)/bin/python -else -$(2)_PYTHON_INTERPRETER = $$(HOST_DIR)/bin/$$($(2)_NEEDS_HOST_PYTHON) -endif -endif # # Build step. Only define it if not already defined by the package .mk diff --git a/package/python-setuptools/60.7.0/0001-add-executable.patch b/package/python-setuptools/0001-add-executable.patch similarity index 100% rename from package/python-setuptools/60.7.0/0001-add-executable.patch rename to package/python-setuptools/0001-add-executable.patch diff --git a/package/python-setuptools/44.0.0/0001-add-executable.patch b/package/python-setuptools/44.0.0/0001-add-executable.patch deleted file mode 100644 index 8a59f5a4d8..0000000000 --- a/package/python-setuptools/44.0.0/0001-add-executable.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 9b3d307f8f6a1af88f3f810f5a6cf0835830e1e8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Mon, 7 Dec 2015 01:14:33 +0100 -Subject: [PATCH] add executable -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Add a new --executable option to distribute so that we can -force the shebang line in installed python scripts. - -[Thomas: refresh for setuptools 5.8.] -[J??rg: refresh for setuptools 18.7.1] - -Signed-off-by: Gustavo Zacarias -Signed-off-by: Thomas Petazzoni -Signed-off-by: J??rg Krause ---- - setuptools/command/install.py | 2 ++ - setuptools/command/install_scripts.py | 9 +++++++++ - 2 files changed, 11 insertions(+) - -diff --git a/setuptools/command/install.py b/setuptools/command/install.py -index d2bca2e..b60ef19 100644 ---- a/setuptools/command/install.py -+++ b/setuptools/command/install.py -@@ -16,6 +16,7 @@ class install(orig.install): - """Use easy_install to install the package, w/dependencies""" - - user_options = orig.install.user_options + [ -+ ('executable=', 'e', "specify final destination interpreter path"), - ('old-and-unmanageable', None, "Try not to use this!"), - ('single-version-externally-managed', None, - "used by system package builders to create 'flat' eggs"), -@@ -31,6 +32,7 @@ class install(orig.install): - - def initialize_options(self): - orig.install.initialize_options(self) -+ self.executable = None - self.old_and_unmanageable = None - self.single_version_externally_managed = None - -diff --git a/setuptools/command/install_scripts.py b/setuptools/command/install_scripts.py -index be66cb2..07afaf8 100755 ---- a/setuptools/command/install_scripts.py -+++ b/setuptools/command/install_scripts.py -@@ -11,6 +11,13 @@ class install_scripts(orig.install_scripts): - def initialize_options(self): - orig.install_scripts.initialize_options(self) - self.no_ep = False -+ self.executable = None -+ -+ def finalize_options(self): -+ orig.install_scripts.finalize_options(self) -+ self.set_undefined_options('install', -+ ('executable','executable') -+ ) - - def run(self): - import setuptools.command.easy_install as ei -@@ -31,6 +38,8 @@ class install_scripts(orig.install_scripts): - ) - bs_cmd = self.get_finalized_command('build_scripts') - exec_param = getattr(bs_cmd, 'executable', None) -+ if self.executable is not None: -+ exec_param = self.executable - bw_cmd = self.get_finalized_command("bdist_wininst") - is_wininst = getattr(bw_cmd, '_is_running', False) - writer = ei.ScriptWriter --- -2.6.3 - diff --git a/package/python-setuptools/44.0.0/python-setuptools.hash b/package/python-setuptools/44.0.0/python-setuptools.hash deleted file mode 100644 index 769b68c35d..0000000000 --- a/package/python-setuptools/44.0.0/python-setuptools.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From https://pypi.org/pypi/setuptools/json -md5 32b6cdce670ce462086d246bea181e9d setuptools-44.0.0.zip -sha256 e5baf7723e5bb8382fc146e33032b241efc63314211a3a120aaa55d62d2bb008 setuptools-44.0.0.zip -sha256 c32a3ac395af6321efd28be73d06a00f0db6ab887d1c21d4fec46128d2056d5a LICENSE diff --git a/package/python-setuptools/60.7.0/python-setuptools.hash b/package/python-setuptools/python-setuptools.hash similarity index 100% rename from package/python-setuptools/60.7.0/python-setuptools.hash rename to package/python-setuptools/python-setuptools.hash diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk index 04b872fb79..584f83f7a0 100644 --- a/package/python-setuptools/python-setuptools.mk +++ b/package/python-setuptools/python-setuptools.mk @@ -4,29 +4,14 @@ # ################################################################################ -# Please keep in sync with -# package/python3-setuptools/python3-setuptools.mk PYTHON_SETUPTOOLS_VERSION = 60.7.0 -PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON3_SETUPTOOLS_VERSION).tar.gz +PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).tar.gz PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/29/dd/48d662bb93e5e51e72265ef612f869947d4ae4126328d7156824cd50d440 - -# The host variant is only for Python 2.x, so we need to use 44.0.0. -HOST_PYTHON_SETUPTOOLS_VERSION = 44.0.0 -HOST_PYTHON_SETUPTOOLS_SOURCE = setuptools-$(HOST_PYTHON_SETUPTOOLS_VERSION).zip -HOST_PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/b0/f3/44da7482ac6da3f36f68e253cb04de37365b3dba9036a3c70773b778b485 -HOST_PYTHON_SETUPTOOLS_NEEDS_HOST_PYTHON = python2 - PYTHON_SETUPTOOLS_LICENSE = MIT PYTHON_SETUPTOOLS_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_CPE_ID_VENDOR = python PYTHON_SETUPTOOLS_CPE_ID_PRODUCT = setuptools PYTHON_SETUPTOOLS_SETUP_TYPE = setuptools -define HOST_PYTHON_SETUPTOOLS_EXTRACT_CMDS - $(UNZIP) -d $(@D) $(HOST_PYTHON_SETUPTOOLS_DL_DIR)/$(HOST_PYTHON_SETUPTOOLS_SOURCE) - mv $(@D)/setuptools-$(HOST_PYTHON_SETUPTOOLS_VERSION)/* $(@D) - $(RM) -r $(@D)/setuptools-$(HOST_PYTHON_SETUPTOOLS_VERSION) -endef - $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python3-setuptools/0001-add-executable.patch b/package/python3-setuptools/0001-add-executable.patch deleted file mode 120000 index 46b5935d33..0000000000 --- a/package/python3-setuptools/0001-add-executable.patch +++ /dev/null @@ -1 +0,0 @@ -../python-setuptools/60.7.0/0001-add-executable.patch \ No newline at end of file diff --git a/package/python3-setuptools/python3-setuptools.hash b/package/python3-setuptools/python3-setuptools.hash deleted file mode 120000 index 2c9d3614d5..0000000000 --- a/package/python3-setuptools/python3-setuptools.hash +++ /dev/null @@ -1 +0,0 @@ -../python-setuptools/60.7.0/python-setuptools.hash \ No newline at end of file diff --git a/package/python3-setuptools/python3-setuptools.mk b/package/python3-setuptools/python3-setuptools.mk deleted file mode 100644 index d5aaa01918..0000000000 --- a/package/python3-setuptools/python3-setuptools.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# python3-setuptools -# -################################################################################ - -# Please keep in sync with -# package/python-setuptools/python-setuptools.mk -PYTHON3_SETUPTOOLS_VERSION = 60.7.0 -PYTHON3_SETUPTOOLS_SOURCE = setuptools-$(PYTHON3_SETUPTOOLS_VERSION).tar.gz -PYTHON3_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/29/dd/48d662bb93e5e51e72265ef612f869947d4ae4126328d7156824cd50d440 -PYTHON3_SETUPTOOLS_LICENSE = MIT -PYTHON3_SETUPTOOLS_LICENSE_FILES = LICENSE -PYTHON3_SETUPTOOLS_CPE_ID_VENDOR = python -PYTHON3_SETUPTOOLS_CPE_ID_PRODUCT = setuptools -PYTHON3_SETUPTOOLS_SETUP_TYPE = setuptools -HOST_PYTHON3_SETUPTOOLS_DL_SUBDIR = python-setuptools -HOST_PYTHON3_SETUPTOOLS_NEEDS_HOST_PYTHON = python3 - -$(eval $(host-python-package)) From peter at korsgaard.com Sat Feb 12 10:34:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 12 Feb 2022 11:34:20 +0100 Subject: [Buildroot] [PATCH 2/2] docs/manual/adding-packages-python.txt: drop _NEEDS_HOST_PYTHON In-Reply-To: <20220212103421.1351-1-peter@korsgaard.com> References: <20220212103421.1351-1-peter@korsgaard.com> Message-ID: <20220212103421.1351-2-peter@korsgaard.com> Now that host-python2 is gone and the corresponding logic in pkg-python. Signed-off-by: Peter Korsgaard --- docs/manual/adding-packages-python.txt | 7 ------- 1 file changed, 7 deletions(-) diff --git a/docs/manual/adding-packages-python.txt b/docs/manual/adding-packages-python.txt index cfd2f88920..0141fea85b 100644 --- a/docs/manual/adding-packages-python.txt +++ b/docs/manual/adding-packages-python.txt @@ -141,13 +141,6 @@ therefore only use a few of them, or none. packages) and +HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS+ (for host setuptools packages). -* +HOST_PYTHON_FOO_NEEDS_HOST_PYTHON+, to define the host python - interpreter. The usage of this variable is limited to host - packages. The two supported value are +python2+ and +python3+. It - will ensure the right host python package is available and will - invoke it for the build. If some build steps are overloaded, the - right python interpreter must be explicitly called in the commands. - With the Python infrastructure, all the steps required to build and install the packages are already defined, and they generally work well for most Python-based packages. However, when required, it is still -- 2.20.1 From peter at korsgaard.com Sat Feb 12 10:34:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 12 Feb 2022 11:34:19 +0100 Subject: [Buildroot] [PATCH 1/2] package: drop _NEEDS_HOST_PYTHON Message-ID: <20220212103421.1351-1-peter@korsgaard.com> Now that host-python2 is gone and the corresponding logic in pkg-python. Signed-off-by: Peter Korsgaard --- package/meson/meson.mk | 1 - package/python-charset-normalizer/python-charset-normalizer.mk | 1 - package/python-decorator/python-decorator.mk | 1 - package/python-idna/python-idna.mk | 1 - package/python-inflection/python-inflection.mk | 1 - package/python-installer/python-installer.mk | 1 - package/python-jinja2/python-jinja2.mk | 2 -- package/python-mako/python-mako.mk | 2 -- package/python-markupsafe/python-markupsafe.mk | 2 -- package/python-networkx/python-networkx.mk | 1 - package/python-packaging/python-packaging.mk | 1 - package/python-pep517/python-pep517.mk | 1 - package/python-pypa-build/python-pypa-build.mk | 1 - package/python-pyparsing/python-pyparsing.mk | 1 - package/python-pyyaml/python-pyyaml.mk | 1 - package/python-requests/python-requests.mk | 1 - package/python-setuptools-rust/python-setuptools-rust.mk | 1 - .../python-setuptools-scm-git-archive.mk | 1 - package/python-setuptools-scm/python-setuptools-scm.mk | 1 - package/python-tomli/python-tomli.mk | 1 - package/python-typing-extensions/python-typing-extensions.mk | 1 - package/python-urllib3/python-urllib3.mk | 1 - package/scons/scons.mk | 2 -- package/setools/setools.mk | 1 - 24 files changed, 28 deletions(-) diff --git a/package/meson/meson.mk b/package/meson/meson.mk index ad15e3f91e..125488dd46 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -11,7 +11,6 @@ MESON_LICENSE_FILES = COPYING MESON_SETUP_TYPE = setuptools HOST_MESON_DEPENDENCIES = host-ninja -HOST_MESON_NEEDS_HOST_PYTHON = python3 # Avoid interpreter shebang longer than 128 chars define HOST_MESON_SET_INTERPRETER diff --git a/package/python-charset-normalizer/python-charset-normalizer.mk b/package/python-charset-normalizer/python-charset-normalizer.mk index 0a96a6b078..c37b068b36 100644 --- a/package/python-charset-normalizer/python-charset-normalizer.mk +++ b/package/python-charset-normalizer/python-charset-normalizer.mk @@ -10,7 +10,6 @@ PYTHON_CHARSET_NORMALIZER_SITE = https://files.pythonhosted.org/packages/e8/e8/b 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)) diff --git a/package/python-decorator/python-decorator.mk b/package/python-decorator/python-decorator.mk index a7e338bdc0..a61f045e2a 100644 --- a/package/python-decorator/python-decorator.mk +++ b/package/python-decorator/python-decorator.mk @@ -12,7 +12,6 @@ PYTHON_DECORATOR_LICENSE_FILES = LICENSE.txt PYTHON_DECORATOR_CPE_ID_VENDOR = python PYTHON_DECORATOR_CPE_ID_PRODUCT = decorator PYTHON_DECORATOR_SETUP_TYPE = setuptools -HOST_PYTHON_DECORATOR_NEEDS_HOST_PYTHON = python3 $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python-idna/python-idna.mk b/package/python-idna/python-idna.mk index 2a1ec8314b..6f416156d0 100644 --- a/package/python-idna/python-idna.mk +++ b/package/python-idna/python-idna.mk @@ -10,7 +10,6 @@ PYTHON_IDNA_SITE = https://files.pythonhosted.org/packages/62/08/e3fc7c8161090f7 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)) diff --git a/package/python-inflection/python-inflection.mk b/package/python-inflection/python-inflection.mk index 59f35aa135..7c030e99b9 100644 --- a/package/python-inflection/python-inflection.mk +++ b/package/python-inflection/python-inflection.mk @@ -10,7 +10,6 @@ PYTHON_INFLECTION_SITE = https://files.pythonhosted.org/packages/e1/7e/691d061b7 PYTHON_INFLECTION_SETUP_TYPE = setuptools PYTHON_INFLECTION_LICENSE = MIT PYTHON_INFLECTION_LICENSE_FILES = LICENSE -HOST_PYTHON_INFLECTION_NEEDS_HOST_PYTHON = python3 $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python-installer/python-installer.mk b/package/python-installer/python-installer.mk index 2c1d371dab..82739a8003 100644 --- a/package/python-installer/python-installer.mk +++ b/package/python-installer/python-installer.mk @@ -10,6 +10,5 @@ PYTHON_INSTALLER_SITE = https://files.pythonhosted.org/packages/71/9a/8d7c724b0d 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)) diff --git a/package/python-jinja2/python-jinja2.mk b/package/python-jinja2/python-jinja2.mk index 752daf653c..0503984bef 100644 --- a/package/python-jinja2/python-jinja2.mk +++ b/package/python-jinja2/python-jinja2.mk @@ -17,7 +17,5 @@ PYTHON_JINJA2_CPE_ID_PRODUCT = jinja2 PYTHON_JINJA2_DEPENDENCIES = host-python-markupsafe HOST_PYTHON_JINJA2_DEPENDENCIES = host-python-markupsafe -HOST_PYTHON_JINJA2_NEEDS_HOST_PYTHON = python3 - $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python-mako/python-mako.mk b/package/python-mako/python-mako.mk index 26fe95c606..553c4a5339 100644 --- a/package/python-mako/python-mako.mk +++ b/package/python-mako/python-mako.mk @@ -11,8 +11,6 @@ PYTHON_MAKO_SETUP_TYPE = setuptools PYTHON_MAKO_LICENSE = MIT PYTHON_MAKO_LICENSE_FILES = LICENSE -HOST_PYTHON_MAKO_NEEDS_HOST_PYTHON = python3 - # In host build, setup.py tries to download markupsafe if it is not installed HOST_PYTHON_MAKO_DEPENDENCIES = host-python-markupsafe diff --git a/package/python-markupsafe/python-markupsafe.mk b/package/python-markupsafe/python-markupsafe.mk index 14a8d06dfe..e0e689f5a1 100644 --- a/package/python-markupsafe/python-markupsafe.mk +++ b/package/python-markupsafe/python-markupsafe.mk @@ -11,7 +11,5 @@ PYTHON_MARKUPSAFE_SETUP_TYPE = setuptools PYTHON_MARKUPSAFE_LICENSE = BSD-3-Clause PYTHON_MARKUPSAFE_LICENSE_FILES = LICENSE.rst -HOST_PYTHON_MARKUPSAFE_NEEDS_HOST_PYTHON = python3 - $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python-networkx/python-networkx.mk b/package/python-networkx/python-networkx.mk index 3b05011eb9..1908ed8f93 100644 --- a/package/python-networkx/python-networkx.mk +++ b/package/python-networkx/python-networkx.mk @@ -13,7 +13,6 @@ PYTHON_NETWORKX_CPE_ID_VENDOR = python PYTHON_NETWORKX_CPE_ID_PRODUCT = networkx PYTHON_NETWORKX_SETUP_TYPE = setuptools HOST_PYTHON_NETWORKX_DEPENDENCIES = host-python-decorator -HOST_PYTHON_NETWORKX_NEEDS_HOST_PYTHON = python3 $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python-packaging/python-packaging.mk b/package/python-packaging/python-packaging.mk index 569dc0bf58..74b5803525 100644 --- a/package/python-packaging/python-packaging.mk +++ b/package/python-packaging/python-packaging.mk @@ -10,7 +10,6 @@ PYTHON_PACKAGING_SITE = https://files.pythonhosted.org/packages/df/9e/d1a7217f69 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)) diff --git a/package/python-pep517/python-pep517.mk b/package/python-pep517/python-pep517.mk index da0431a637..99aa62d51d 100644 --- a/package/python-pep517/python-pep517.mk +++ b/package/python-pep517/python-pep517.mk @@ -10,7 +10,6 @@ PYTHON_PEP517_SITE = https://files.pythonhosted.org/packages/0a/65/6e656d49c6791 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)) diff --git a/package/python-pypa-build/python-pypa-build.mk b/package/python-pypa-build/python-pypa-build.mk index 6babade672..dc8363f59e 100644 --- a/package/python-pypa-build/python-pypa-build.mk +++ b/package/python-pypa-build/python-pypa-build.mk @@ -10,7 +10,6 @@ PYTHON_PYPA_BUILD_SITE = https://files.pythonhosted.org/packages/f0/62/c73b77521 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 \ diff --git a/package/python-pyparsing/python-pyparsing.mk b/package/python-pyparsing/python-pyparsing.mk index e33541bdb7..2fb705bc7a 100644 --- a/package/python-pyparsing/python-pyparsing.mk +++ b/package/python-pyparsing/python-pyparsing.mk @@ -10,7 +10,6 @@ PYTHON_PYPARSING_SITE = https://files.pythonhosted.org/packages/d6/60/9bed18f432 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)) diff --git a/package/python-pyyaml/python-pyyaml.mk b/package/python-pyyaml/python-pyyaml.mk index 8f5a2d269e..067af8ea7d 100644 --- a/package/python-pyyaml/python-pyyaml.mk +++ b/package/python-pyyaml/python-pyyaml.mk @@ -15,7 +15,6 @@ PYTHON_PYYAML_CPE_ID_PRODUCT = pyyaml PYTHON_PYYAML_DEPENDENCIES = host-python-cython libyaml PYTHON_PYYAML_ENV = PYYAML_FORCE_CYTHON=1 HOST_PYTHON_PYYAML_DEPENDENCIES = host-libyaml -HOST_PYTHON_PYYAML_NEEDS_HOST_PYTHON = python3 $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python-requests/python-requests.mk b/package/python-requests/python-requests.mk index 962646516e..9613a2c47c 100644 --- a/package/python-requests/python-requests.mk +++ b/package/python-requests/python-requests.mk @@ -12,7 +12,6 @@ PYTHON_REQUESTS_LICENSE = Apache-2.0 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 \ diff --git a/package/python-setuptools-rust/python-setuptools-rust.mk b/package/python-setuptools-rust/python-setuptools-rust.mk index c87a0da3c7..394789b056 100644 --- a/package/python-setuptools-rust/python-setuptools-rust.mk +++ b/package/python-setuptools-rust/python-setuptools-rust.mk @@ -11,6 +11,5 @@ 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-typing-extensions -HOST_PYTHON_SETUPTOOLS_RUST_NEEDS_HOST_PYTHON = python3 $(eval $(host-python-package)) diff --git a/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk b/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk index 48ca9c89ae..032e2d3fc9 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,6 +11,5 @@ 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 8c5229e1a6..132eb398aa 100644 --- a/package/python-setuptools-scm/python-setuptools-scm.mk +++ b/package/python-setuptools-scm/python-setuptools-scm.mk @@ -11,6 +11,5 @@ 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-tomli/python-tomli.mk b/package/python-tomli/python-tomli.mk index 4e6b023ef7..b8c20ca736 100644 --- a/package/python-tomli/python-tomli.mk +++ b/package/python-tomli/python-tomli.mk @@ -10,7 +10,6 @@ PYTHON_TOMLI_SITE = https://files.pythonhosted.org/packages/ec/38/8eccdc662c61ae 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)) diff --git a/package/python-typing-extensions/python-typing-extensions.mk b/package/python-typing-extensions/python-typing-extensions.mk index 407fe99b54..668071e025 100644 --- a/package/python-typing-extensions/python-typing-extensions.mk +++ b/package/python-typing-extensions/python-typing-extensions.mk @@ -10,7 +10,6 @@ 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)) diff --git a/package/python-urllib3/python-urllib3.mk b/package/python-urllib3/python-urllib3.mk index c9c8a912d1..d94c97b4ed 100644 --- a/package/python-urllib3/python-urllib3.mk +++ b/package/python-urllib3/python-urllib3.mk @@ -12,7 +12,6 @@ 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)) diff --git a/package/scons/scons.mk b/package/scons/scons.mk index bc5d2a1ef9..6b75d3ddca 100644 --- a/package/scons/scons.mk +++ b/package/scons/scons.mk @@ -10,8 +10,6 @@ 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) diff --git a/package/setools/setools.mk b/package/setools/setools.mk index 5b4b4e30d8..ea355f10c8 100644 --- a/package/setools/setools.mk +++ b/package/setools/setools.mk @@ -13,7 +13,6 @@ SETOOLS_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL SETOOLS_CPE_ID_VENDOR = selinuxproject SETOOLS_SETUP_TYPE = setuptools HOST_SETOOLS_DEPENDENCIES = host-python-cython host-libselinux host-libsepol host-python-networkx -HOST_SETOOLS_NEEDS_HOST_PYTHON = python3 define SETOOLS_FIX_SETUP # By default, setup.py will look for libsepol.a in the host machines -- 2.20.1 From peter at korsgaard.com Sat Feb 12 10:43:48 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 12 Feb 2022 11:43:48 +0100 Subject: [Buildroot] [PATCH] package/python-*: drop python3 dependency Message-ID: <20220212104349.6015-1-peter@korsgaard.com> All the python packages are inside an if BR2_PACKAGE_PYTHON3, so with the removal of python2 support, the explicit python3 dependency is redundant. Remove it. Signed-off-by: Peter Korsgaard --- package/python-aexpect/Config.in | 1 - package/python-aioblescan/Config.in | 1 - package/python-aiocoap/Config.in | 1 - package/python-aioconsole/Config.in | 1 - package/python-aiodns/Config.in | 1 - package/python-aiofiles/Config.in | 1 - package/python-aiohttp-cors/Config.in | 1 - package/python-aiohttp-debugtoolbar/Config.in | 1 - package/python-aiohttp-jinja2/Config.in | 1 - package/python-aiohttp-mako/Config.in | 1 - package/python-aiohttp-remotes/Config.in | 1 - package/python-aiohttp-security/Config.in | 1 - package/python-aiohttp-session/Config.in | 1 - package/python-aiohttp-sse/Config.in | 1 - package/python-aiohttp/Config.in | 1 - package/python-aiojobs/Config.in | 1 - package/python-aiologstash/Config.in | 1 - package/python-aiomonitor/Config.in | 1 - package/python-aioprocessing/Config.in | 1 - package/python-aioredis/Config.in | 1 - package/python-aiorwlock/Config.in | 1 - package/python-aiosignal/Config.in | 1 - package/python-aiozipkin/Config.in | 1 - package/python-argon2-cffi-bindings/Config.in | 1 - package/python-arrow/Config.in | 1 - package/python-asgiref/Config.in | 1 - package/python-async-lru/Config.in | 1 - package/python-async-timeout/Config.in | 1 - package/python-attrs/Config.in | 1 - package/python-autobahn/Config.in | 1 - package/python-automat/Config.in | 1 - package/python-avro/Config.in | 1 - package/python-bcrypt/Config.in | 1 - package/python-beautifulsoup4/Config.in | 1 - package/python-bidict/Config.in | 1 - package/python-bleak/Config.in | 1 - package/python-bluezero/Config.in | 2 -- package/python-boto3/Config.in | 1 - package/python-botocore/Config.in | 1 - package/python-cbor2/Config.in | 1 - package/python-cchardet/Config.in | 2 -- package/python-channels-redis/Config.in | 1 - package/python-channels/Config.in | 1 - package/python-charset-normalizer/Config.in | 1 - package/python-cheroot/Config.in | 1 - package/python-cherrypy/Config.in | 1 - package/python-colorlog/Config.in | 1 - package/python-colorzero/Config.in | 1 - package/python-configshell-fb/Config.in | 1 - package/python-crayons/Config.in | 1 - package/python-crontab/Config.in | 1 - package/python-crossbar/Config.in | 1 - package/python-cryptography/Config.in | 1 - package/python-cssselect2/Config.in | 1 - package/python-cssutils/Config.in | 1 - package/python-cycler/Config.in | 1 - package/python-daphne/Config.in | 1 - package/python-dataproperty/Config.in | 1 - package/python-dateutil/Config.in | 1 - package/python-dbus-next/Config.in | 1 - package/python-decorator/Config.in | 1 - package/python-dialog3/Config.in | 1 - package/python-django-enumfields/Config.in | 1 - package/python-django/Config.in | 1 - package/python-dnspython/Config.in | 1 - package/python-docker/Config.in | 1 - package/python-engineio/Config.in | 1 - package/python-falcon/Config.in | 1 - package/python-filelock/Config.in | 1 - package/python-flask-babel/Config.in | 1 - package/python-flask-cors/Config.in | 1 - package/python-flask-expects-json/Config.in | 1 - package/python-flask-jsonrpc/Config.in | 1 - package/python-flask-login/Config.in | 1 - package/python-flask-sqlalchemy/Config.in | 1 - package/python-flask-wtf/Config.in | 1 - package/python-flup/Config.in | 1 - package/python-fonttools/Config.in | 1 - package/python-frozenlist/Config.in | 1 - package/python-git/Config.in | 1 - package/python-gitdb2/Config.in | 1 - package/python-gobject/Config.in | 1 - package/python-gpiozero/Config.in | 1 - package/python-gunicorn/Config.in | 1 - package/python-h2/Config.in | 1 - package/python-hiredis/Config.in | 1 - package/python-hpack/Config.in | 1 - package/python-httplib2/Config.in | 1 - package/python-humanize/Config.in | 1 - package/python-hyperframe/Config.in | 1 - package/python-hyperlink/Config.in | 1 - package/python-ibmiotf/Config.in | 1 - package/python-idna/Config.in | 1 - package/python-inflection/Config.in | 1 - package/python-influxdb/Config.in | 1 - package/python-ipdb/Config.in | 1 - package/python-ipython/Config.in | 1 - package/python-itsdangerous/Config.in | 1 - package/python-janus/Config.in | 1 - package/python-jaraco-classes/Config.in | 1 - package/python-jaraco-functools/Config.in | 1 - package/python-jedi/Config.in | 1 - package/python-jinja2/Config.in | 1 - package/python-jsonmodels/Config.in | 1 - package/python-keyring/Config.in | 1 - package/python-libusb1/Config.in | 2 -- package/python-markdown/Config.in | 1 - package/python-markdown2/Config.in | 1 - package/python-markupsafe/Config.in | 1 - package/python-matplotlib/Config.in | 1 - package/python-mbstrdecoder/Config.in | 1 - package/python-memory-profiler/Config.in | 1 - package/python-more-itertools/Config.in | 1 - package/python-mpd2/Config.in | 1 - package/python-msgfy/Config.in | 1 - package/python-multidict/Config.in | 1 - package/python-mutagen/Config.in | 1 - package/python-mwclient/Config.in | 1 - package/python-mwscrape/Config.in | 1 - package/python-mwscrape2slob/Config.in | 2 -- package/python-networkx/Config.in | 1 - package/python-numpy/Config.in | 2 -- package/python-oauthlib/Config.in | 1 - package/python-opcua-asyncio/Config.in | 1 - package/python-packaging/Config.in | 1 - package/python-paramiko/Config.in | 1 - package/python-parso/Config.in | 1 - package/python-pathpy/Config.in | 1 - package/python-pathvalidate/Config.in | 1 - package/python-piexif/Config.in | 1 - package/python-pillow/Config.in | 1 - package/python-pip/Config.in | 1 - package/python-pluggy/Config.in | 1 - package/python-portend/Config.in | 1 - package/python-priority/Config.in | 1 - package/python-prompt-toolkit/Config.in | 1 - package/python-protobuf/Config.in | 1 - package/python-psycopg2/Config.in | 2 -- package/python-pudb/Config.in | 1 - package/python-py/Config.in | 1 - package/python-pybind/Config.in | 1 - package/python-pycairo/Config.in | 1 - package/python-pycares/Config.in | 1 - package/python-pycups/Config.in | 1 - package/python-pydantic/Config.in | 1 - package/python-pydyf/Config.in | 1 - package/python-pygments/Config.in | 1 - package/python-pyhamcrest/Config.in | 1 - package/python-pyjwt/Config.in | 1 - package/python-pymupdf/Config.in | 3 --- package/python-pymysql/Config.in | 1 - package/python-pynacl/Config.in | 1 - package/python-pyndiff/Config.in | 1 - package/python-pyopenssl/Config.in | 1 - package/python-pyparsing/Config.in | 1 - package/python-pyparted/Config.in | 2 -- package/python-pyphen/Config.in | 1 - package/python-pysftp/Config.in | 1 - package/python-pytablereader/Config.in | 1 - package/python-pytablewriter/Config.in | 1 - package/python-pytest-asyncio/Config.in | 1 - package/python-pytest/Config.in | 1 - package/python-pytrie/Config.in | 1 - package/python-pyusb/Config.in | 1 - package/python-pyyaml/Config.in | 1 - package/python-requests-oauthlib/Config.in | 1 - package/python-requests-toolbelt/Config.in | 1 - package/python-requests/Config.in | 1 - package/python-rsa/Config.in | 1 - package/python-s3transfer/Config.in | 1 - package/python-schedule/Config.in | 1 - package/python-secretstorage/Config.in | 1 - package/python-serial-asyncio/Config.in | 1 - package/python-service-identity/Config.in | 1 - package/python-setproctitle/Config.in | 1 - package/python-simpleaudio/Config.in | 1 - package/python-simplelogging/Config.in | 1 - package/python-simplesqlite/Config.in | 1 - package/python-slob/Config.in | 2 -- package/python-smmap2/Config.in | 1 - package/python-socketio/Config.in | 1 - package/python-sockjs/Config.in | 1 - package/python-soupsieve/Config.in | 1 - package/python-sqliteschema/Config.in | 1 - package/python-tabledata/Config.in | 1 - package/python-tempora/Config.in | 1 - package/python-tinycss2/Config.in | 1 - package/python-tinyrpc/Config.in | 1 - package/python-tomako/Config.in | 1 - package/python-tomli/Config.in | 1 - package/python-tornado/Config.in | 1 - package/python-traitlets/Config.in | 1 - package/python-treq/Config.in | 1 - package/python-twisted/Config.in | 1 - package/python-txaio/Config.in | 1 - package/python-txdbus/Config.in | 1 - package/python-txtorcon/Config.in | 1 - package/python-typepy/Config.in | 1 - package/python-ujson/Config.in | 1 - package/python-unittest-xml-reporting/Config.in | 1 - package/python-urwid/Config.in | 1 - package/python-uvloop/Config.in | 1 - package/python-validators/Config.in | 1 - package/python-watchdog/Config.in | 1 - package/python-weasyprint/Config.in | 1 - package/python-webpy/Config.in | 1 - package/python-websockets/Config.in | 1 - package/python-wtforms/Config.in | 1 - package/python-xlib/Config.in | 1 - package/python-xlsxwriter/Config.in | 1 - package/python-yarl/Config.in | 1 - package/python-zeroconf/Config.in | 1 - package/python-zopfli/Config.in | 1 - 213 files changed, 223 deletions(-) diff --git a/package/python-aexpect/Config.in b/package/python-aexpect/Config.in index eddba8e0b7..cc805da657 100644 --- a/package/python-aexpect/Config.in +++ b/package/python-aexpect/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_AEXPECT bool "python-aexpect" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_SIX # runtime help Aexpect. diff --git a/package/python-aioblescan/Config.in b/package/python-aioblescan/Config.in index dd1acfa095..8f6db48a8b 100644 --- a/package/python-aioblescan/Config.in +++ b/package/python-aioblescan/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_AIOBLESCAN bool "python-aioblescan" - depends on BR2_PACKAGE_PYTHON3 help Scanning Bluetooth for advertised info with asyncio. diff --git a/package/python-aiocoap/Config.in b/package/python-aiocoap/Config.in index cf5ca4e844..c46614324f 100644 --- a/package/python-aiocoap/Config.in +++ b/package/python-aiocoap/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_AIOCOAP bool "python-aiocoap" - depends on BR2_PACKAGE_PYTHON3 help Python CoAP library. diff --git a/package/python-aioconsole/Config.in b/package/python-aioconsole/Config.in index cd52eecf32..6b2a15e115 100644 --- a/package/python-aioconsole/Config.in +++ b/package/python-aioconsole/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_AIOCONSOLE bool "python-aioconsole" - depends on BR2_PACKAGE_PYTHON3 help Asynchronous console and interfaces for asyncio. diff --git a/package/python-aiodns/Config.in b/package/python-aiodns/Config.in index aa5970598f..63c2429390 100644 --- a/package/python-aiodns/Config.in +++ b/package/python-aiodns/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_AIODNS bool "python-aiodns" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_PYCARES # runtime help Simple DNS resolver for asyncio. diff --git a/package/python-aiofiles/Config.in b/package/python-aiofiles/Config.in index 9cc3d7fe59..1e6add5358 100644 --- a/package/python-aiofiles/Config.in +++ b/package/python-aiofiles/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_AIOFILES bool "python-aiofiles" - depends on BR2_PACKAGE_PYTHON3 help aiofiles aims to handle local disk files in asyncio applications. diff --git a/package/python-aiohttp-cors/Config.in b/package/python-aiohttp-cors/Config.in index 1c97cf3f87..dea3b44080 100644 --- a/package/python-aiohttp-cors/Config.in +++ b/package/python-aiohttp-cors/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_AIOHTTP_CORS bool "python-aiohttp-cors" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_AIOHTTP # runtime help CORS support for aiohttp. diff --git a/package/python-aiohttp-debugtoolbar/Config.in b/package/python-aiohttp-debugtoolbar/Config.in index b22d2cf946..e2fede8065 100644 --- a/package/python-aiohttp-debugtoolbar/Config.in +++ b/package/python-aiohttp-debugtoolbar/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_AIOHTTP_DEBUGTOOLBAR bool "python-aiohttp-debugtoolbar" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_AIOHTTP # runtime select BR2_PACKAGE_PYTHON_AIOHTTP_JINJA2 # runtime help diff --git a/package/python-aiohttp-jinja2/Config.in b/package/python-aiohttp-jinja2/Config.in index dd4bb0d23b..a536825b7e 100644 --- a/package/python-aiohttp-jinja2/Config.in +++ b/package/python-aiohttp-jinja2/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_AIOHTTP_JINJA2 bool "python-aiohttp-jinja2" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_AIOHTTP # runtime select BR2_PACKAGE_PYTHON_JINJA2 # runtime help diff --git a/package/python-aiohttp-mako/Config.in b/package/python-aiohttp-mako/Config.in index 8c5df6a481..4dae5d95ad 100644 --- a/package/python-aiohttp-mako/Config.in +++ b/package/python-aiohttp-mako/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_AIOHTTP_MAKO bool "python-aiohttp-mako" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_AIOHTTP # runtime select BR2_PACKAGE_PYTHON_MAKO # runtime help diff --git a/package/python-aiohttp-remotes/Config.in b/package/python-aiohttp-remotes/Config.in index e44696ba1e..7208e373ad 100644 --- a/package/python-aiohttp-remotes/Config.in +++ b/package/python-aiohttp-remotes/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_AIOHTTP_REMOTES bool "python-aiohttp-remotes" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_AIOHTTP # runtime help Control remote side information. diff --git a/package/python-aiohttp-security/Config.in b/package/python-aiohttp-security/Config.in index f92c458584..96204d7e22 100644 --- a/package/python-aiohttp-security/Config.in +++ b/package/python-aiohttp-security/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_AIOHTTP_SECURITY bool "python-aiohttp-security" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_AIOHTTP # runtime help Security for aiohttp.web. diff --git a/package/python-aiohttp-session/Config.in b/package/python-aiohttp-session/Config.in index c148165f00..99c01794a7 100644 --- a/package/python-aiohttp-session/Config.in +++ b/package/python-aiohttp-session/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_AIOHTTP_SESSION bool "python-aiohttp-session" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_AIOHTTP # runtime help Sessions for aiohttp.web. diff --git a/package/python-aiohttp-sse/Config.in b/package/python-aiohttp-sse/Config.in index 781bbf4de7..6e408b7e12 100644 --- a/package/python-aiohttp-sse/Config.in +++ b/package/python-aiohttp-sse/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_AIOHTTP_SSE bool "python-aiohttp-sse" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_AIOHTTP # runtime help Server-sent events support for aiohttp. diff --git a/package/python-aiohttp/Config.in b/package/python-aiohttp/Config.in index 85a6862141..35c162b948 100644 --- a/package/python-aiohttp/Config.in +++ b/package/python-aiohttp/Config.in @@ -1,6 +1,5 @@ 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 diff --git a/package/python-aiojobs/Config.in b/package/python-aiojobs/Config.in index ab61985164..0cdd1c106f 100644 --- a/package/python-aiojobs/Config.in +++ b/package/python-aiojobs/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_AIOJOBS bool "python-aiojobs" - depends on BR2_PACKAGE_PYTHON3 help Jobs scheduler for managing background task (asyncio). diff --git a/package/python-aiologstash/Config.in b/package/python-aiologstash/Config.in index e70c232fd2..ce7ebe03cd 100644 --- a/package/python-aiologstash/Config.in +++ b/package/python-aiologstash/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_AIOLOGSTASH bool "python-aiologstash" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_ASYNC_TIMEOUT # runtime select BR2_PACKAGE_PYTHON_LOGSTASH # runtime help diff --git a/package/python-aiomonitor/Config.in b/package/python-aiomonitor/Config.in index c76c952c82..435900ae32 100644 --- a/package/python-aiomonitor/Config.in +++ b/package/python-aiomonitor/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_AIOMONITOR bool "python-aiomonitor" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_TERMINALTABLES # runtime select BR2_PACKAGE_PYTHON_AIOCONSOLE # runtime help diff --git a/package/python-aioprocessing/Config.in b/package/python-aioprocessing/Config.in index 2e76bc562b..381805c759 100644 --- a/package/python-aioprocessing/Config.in +++ b/package/python-aioprocessing/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_AIOPROCESSING bool "python-aioprocessing" - depends on BR2_PACKAGE_PYTHON3 help A Python 3.5+ library that integrates the multiprocessing module with asyncio. diff --git a/package/python-aioredis/Config.in b/package/python-aioredis/Config.in index dc2ee01d9a..46ed2c7a46 100644 --- a/package/python-aioredis/Config.in +++ b/package/python-aioredis/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_AIOREDIS bool "python-aioredis" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_ASYNC_TIMEOUT # runtime select BR2_PACKAGE_PYTHON_HIREDIS # runtime help diff --git a/package/python-aiorwlock/Config.in b/package/python-aiorwlock/Config.in index afdc27dd6f..3b61890555 100644 --- a/package/python-aiorwlock/Config.in +++ b/package/python-aiorwlock/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_AIORWLOCK bool "python-aiorwlock" - depends on BR2_PACKAGE_PYTHON3 help Read write lock for asyncio. diff --git a/package/python-aiosignal/Config.in b/package/python-aiosignal/Config.in index 6b7753defd..9bb2998304 100644 --- a/package/python-aiosignal/Config.in +++ b/package/python-aiosignal/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_AIOSIGNAL bool "python-aiosignal" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_FROZENLIST # runtime help aiosignal: a list of registered asynchronous callbacks. diff --git a/package/python-aiozipkin/Config.in b/package/python-aiozipkin/Config.in index 643fc9a4da..6ce6d86b6e 100644 --- a/package/python-aiozipkin/Config.in +++ b/package/python-aiozipkin/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_AIOZIPKIN bool "python-aiozipkin" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_AIOHTTP # runtime help Distributed tracing instrumentation for asyncio application diff --git a/package/python-argon2-cffi-bindings/Config.in b/package/python-argon2-cffi-bindings/Config.in index 3d409759e0..2e6a4a6c96 100644 --- a/package/python-argon2-cffi-bindings/Config.in +++ b/package/python-argon2-cffi-bindings/Config.in @@ -1,6 +1,5 @@ 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 diff --git a/package/python-arrow/Config.in b/package/python-arrow/Config.in index aed9a682ff..244956879c 100644 --- a/package/python-arrow/Config.in +++ b/package/python-arrow/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_ARROW bool "python-arrow" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_DATEUTIL # runtime help Better dates and times for Python. diff --git a/package/python-asgiref/Config.in b/package/python-asgiref/Config.in index e131f476c2..d0b816c369 100644 --- a/package/python-asgiref/Config.in +++ b/package/python-asgiref/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_ASGIREF bool "python-asgiref" - depends on BR2_PACKAGE_PYTHON3 help ASGI is a standard for Python asynchronous web apps and servers to communicate with each other, and positioned as diff --git a/package/python-async-lru/Config.in b/package/python-async-lru/Config.in index 794f504e5e..dc44e8cd11 100644 --- a/package/python-async-lru/Config.in +++ b/package/python-async-lru/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_ASYNC_LRU bool "python-async-lru" - depends on BR2_PACKAGE_PYTHON3 help Simple lru_cache for asyncio. diff --git a/package/python-async-timeout/Config.in b/package/python-async-timeout/Config.in index 27cfe51f7b..d19f15b3c6 100644 --- a/package/python-async-timeout/Config.in +++ b/package/python-async-timeout/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_ASYNC_TIMEOUT bool "python-async-timeout" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime help asyncio-compatible timeout context manager. diff --git a/package/python-attrs/Config.in b/package/python-attrs/Config.in index b1a69d0e3e..fb0ab248fa 100644 --- a/package/python-attrs/Config.in +++ b/package/python-attrs/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_ATTRS bool "python-attrs" - depends on BR2_PACKAGE_PYTHON3 help attrs is the Python package that will bring back the joy of writing classes by relieving you from the drudgery of diff --git a/package/python-autobahn/Config.in b/package/python-autobahn/Config.in index 92ddad0ea4..627bcd73e5 100644 --- a/package/python-autobahn/Config.in +++ b/package/python-autobahn/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_AUTOBAHN bool "python-autobahn" 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 select BR2_PACKAGE_PYTHON_HYPERLINK # runtime diff --git a/package/python-automat/Config.in b/package/python-automat/Config.in index 9d22276c2c..ee02d22b5b 100644 --- a/package/python-automat/Config.in +++ b/package/python-automat/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_AUTOMAT bool "python-automat" - depends on BR2_PACKAGE_PYTHON3 # python-attrs select BR2_PACKAGE_PYTHON_ATTRS # runtime select BR2_PACKAGE_PYTHON_SIX # runtime help diff --git a/package/python-avro/Config.in b/package/python-avro/Config.in index e1d7fc832c..1f67732ce0 100644 --- a/package/python-avro/Config.in +++ b/package/python-avro/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_AVRO bool "python-avro" - depends on BR2_PACKAGE_PYTHON3 help Select this option to install the Avro Python3 language bindings, and the `avro` command line tool diff --git a/package/python-bcrypt/Config.in b/package/python-bcrypt/Config.in index 81becad322..9e9864e9d2 100644 --- a/package/python-bcrypt/Config.in +++ b/package/python-bcrypt/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_BCRYPT bool "python-bcrypt" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_CFFI # runtime help Modern password hashing for your software and your servers. diff --git a/package/python-beautifulsoup4/Config.in b/package/python-beautifulsoup4/Config.in index 93fa540a73..eb7d2ba673 100644 --- a/package/python-beautifulsoup4/Config.in +++ b/package/python-beautifulsoup4/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_BEAUTIFULSOUP4 bool "python-beautifulsoup4" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_SOUPSIEVE # runtime help Beautiful Soup is a Python library for pulling data out of diff --git a/package/python-bidict/Config.in b/package/python-bidict/Config.in index adbfda69b8..dfc55b87dd 100644 --- a/package/python-bidict/Config.in +++ b/package/python-bidict/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_BIDICT bool "python-bidict" - depends on BR2_PACKAGE_PYTHON3 help The bidirectional mapping library for Python. diff --git a/package/python-bleak/Config.in b/package/python-bleak/Config.in index 43ed65d752..085c16fae8 100644 --- a/package/python-bleak/Config.in +++ b/package/python-bleak/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_BLEAK bool "python-bleak" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_DBUS_NEXT # runtime help Bluetooth Low Energy platform Agnostic Klient. diff --git a/package/python-bluezero/Config.in b/package/python-bluezero/Config.in index d617b96d67..fa0998a298 100644 --- a/package/python-bluezero/Config.in +++ b/package/python-bluezero/Config.in @@ -4,7 +4,6 @@ config BR2_PACKAGE_PYTHON_BLUEZERO depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # python-gobject -> gobject-introspection 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_PYTHON3 select BR2_PACKAGE_DBUS # runtime select BR2_PACKAGE_DBUS_PYTHON # runtime select BR2_PACKAGE_PYTHON_GOBJECT # runtime @@ -14,7 +13,6 @@ config BR2_PACKAGE_PYTHON_BLUEZERO https://github.com/ukBaz/python-bluezero comment "python-bluezero needs a glibc toolchain, gcc >= 4.9, host gcc >= 8" - depends on BR2_PACKAGE_PYTHON3 depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_USES_GLIBC || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ diff --git a/package/python-boto3/Config.in b/package/python-boto3/Config.in index 1cb1ebfd12..67b1420388 100644 --- a/package/python-boto3/Config.in +++ b/package/python-boto3/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_BOTO3 bool "python-boto3" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_BOTOCORE # runtime select BR2_PACKAGE_PYTHON_JMESPATH # runtime select BR2_PACKAGE_PYTHON_S3TRANSFER # runtime diff --git a/package/python-botocore/Config.in b/package/python-botocore/Config.in index 51cb660477..cc5e32b504 100644 --- a/package/python-botocore/Config.in +++ b/package/python-botocore/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_BOTOCORE bool "python-botocore" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_DATEUTIL # runtime select BR2_PACKAGE_PYTHON_JMESPATH # runtime select BR2_PACKAGE_PYTHON_URLLIB3 # runtime diff --git a/package/python-cbor2/Config.in b/package/python-cbor2/Config.in index e35e37f018..ba9383f787 100644 --- a/package/python-cbor2/Config.in +++ b/package/python-cbor2/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_CBOR2 bool "python-cbor2" - depends on BR2_PACKAGE_PYTHON3 help Pure Python CBOR (de)serializer with extensive tag support. diff --git a/package/python-cchardet/Config.in b/package/python-cchardet/Config.in index 0f8645aafe..74153126fb 100644 --- a/package/python-cchardet/Config.in +++ b/package/python-cchardet/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_CCHARDET bool "python-cchardet" - depends on BR2_PACKAGE_PYTHON3 depends on BR2_INSTALL_LIBSTDCPP help cChardet is high speed universal character encoding @@ -9,5 +8,4 @@ config BR2_PACKAGE_PYTHON_CCHARDET https://github.com/PyYoshi/cChardet comment "python-cchardet needs a toolchain w/ C++" - depends on BR2_PACKAGE_PYTHON3 depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-channels-redis/Config.in b/package/python-channels-redis/Config.in index bab801d2a9..d25f8ffe31 100644 --- a/package/python-channels-redis/Config.in +++ b/package/python-channels-redis/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_PYTHON_CHANNELS_REDIS bool "python-channels-redis" # 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 select BR2_PACKAGE_PYTHON_CHANNELS # runtime diff --git a/package/python-channels/Config.in b/package/python-channels/Config.in index 6cd6e5f60d..b94f53ceaa 100644 --- a/package/python-channels/Config.in +++ b/package/python-channels/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_PYTHON_CHANNELS bool "python-channels" # 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 select BR2_PACKAGE_PYTHON_DJANGO # runtime diff --git a/package/python-charset-normalizer/Config.in b/package/python-charset-normalizer/Config.in index c4c40fc99b..63e04a7a33 100644 --- a/package/python-charset-normalizer/Config.in +++ b/package/python-charset-normalizer/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_CHARSET_NORMALIZER bool "python-charset-normalizer" - depends on BR2_PACKAGE_PYTHON3 help The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet. diff --git a/package/python-cheroot/Config.in b/package/python-cheroot/Config.in index 45dd2d8a11..bb9b4abbc3 100644 --- a/package/python-cheroot/Config.in +++ b/package/python-cheroot/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_CHEROOT bool "python-cheroot" - depends on BR2_PACKAGE_PYTHON3 # python-more-itertools, python-jaraco-functools select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_MORE_ITERTOOLS # runtime select BR2_PACKAGE_PYTHON_JARACO_FUNCTOOLS # runtime diff --git a/package/python-cherrypy/Config.in b/package/python-cherrypy/Config.in index eb83054be3..7548dcf91b 100644 --- a/package/python-cherrypy/Config.in +++ b/package/python-cherrypy/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_CHERRYPY bool "python-cherrypy" - depends on BR2_PACKAGE_PYTHON3 # python-cheroot, python-portend select BR2_PACKAGE_PYTHON_CHEROOT # runtime select BR2_PACKAGE_PYTHON_JARACO_CLASSES # runtime select BR2_PACKAGE_PYTHON_PORTEND # runtime diff --git a/package/python-colorlog/Config.in b/package/python-colorlog/Config.in index e191ae82ac..673f97aad2 100644 --- a/package/python-colorlog/Config.in +++ b/package/python-colorlog/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_COLORLOG bool "python-colorlog" - depends on BR2_PACKAGE_PYTHON3 help Log formatting with colors. diff --git a/package/python-colorzero/Config.in b/package/python-colorzero/Config.in index a1deada5fc..b2ef711fbe 100644 --- a/package/python-colorzero/Config.in +++ b/package/python-colorzero/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_COLORZERO bool "python-colorzero" - depends on BR2_PACKAGE_PYTHON3 help A color manipulation library for Python. diff --git a/package/python-configshell-fb/Config.in b/package/python-configshell-fb/Config.in index a0326e9150..ed7f9e0234 100644 --- a/package/python-configshell-fb/Config.in +++ b/package/python-configshell-fb/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_CONFIGSHELL_FB bool "python-configshell-fb" - depends on BR2_PACKAGE_PYTHON3 # python-urwid select BR2_PACKAGE_PYTHON_PYPARSING select BR2_PACKAGE_PYTHON3_READLINE select BR2_PACKAGE_PYTHON_SIX diff --git a/package/python-crayons/Config.in b/package/python-crayons/Config.in index 10f3ece009..865a142b4c 100644 --- a/package/python-crayons/Config.in +++ b/package/python-crayons/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_CRAYONS bool "python-crayons" - depends on BR2_PACKAGE_PYTHON3 help This module is really simple, it gives you colored strings for terminal usage. diff --git a/package/python-crontab/Config.in b/package/python-crontab/Config.in index 7514a3866b..102dbbdb6b 100644 --- a/package/python-crontab/Config.in +++ b/package/python-crontab/Config.in @@ -1,6 +1,5 @@ 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-crossbar/Config.in b/package/python-crossbar/Config.in index b72d64c19d..9625d9ce8e 100644 --- a/package/python-crossbar/Config.in +++ b/package/python-crossbar/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_CROSSBAR bool "python-crossbar" 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 select BR2_PACKAGE_PYTHON_AUTOBAHN diff --git a/package/python-cryptography/Config.in b/package/python-cryptography/Config.in index 07a22bf846..213aa24fa8 100644 --- a/package/python-cryptography/Config.in +++ b/package/python-cryptography/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_CRYPTOGRAPHY bool "python-cryptography" - depends on BR2_PACKAGE_PYTHON3 depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_PYTHON_CFFI # runtime diff --git a/package/python-cssselect2/Config.in b/package/python-cssselect2/Config.in index 0196471253..030d6df0de 100644 --- a/package/python-cssselect2/Config.in +++ b/package/python-cssselect2/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_CSSSELECT2 bool "python-cssselect2" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_TINYCSS2 # runtime select BR2_PACKAGE_PYTHON_WEBENCODINGS # runtime help diff --git a/package/python-cssutils/Config.in b/package/python-cssutils/Config.in index 141561901c..1c23a587f6 100644 --- a/package/python-cssutils/Config.in +++ b/package/python-cssutils/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_CSSUTILS bool "python-cssutils" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime help A CSS Cascading Style Sheets library for Python. diff --git a/package/python-cycler/Config.in b/package/python-cycler/Config.in index 39ff23e45f..813bc69dd4 100644 --- a/package/python-cycler/Config.in +++ b/package/python-cycler/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_CYCLER bool "python-cycler" - depends on BR2_PACKAGE_PYTHON3 help Creates a Cycler objects much like cycler, but includes input validation. diff --git a/package/python-daphne/Config.in b/package/python-daphne/Config.in index c4479417e9..51c66532f0 100644 --- a/package/python-daphne/Config.in +++ b/package/python-daphne/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_PYTHON_DAPHNE bool "python-daphne" # 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 select BR2_PACKAGE_PYTHON_TWISTED # runtime diff --git a/package/python-dataproperty/Config.in b/package/python-dataproperty/Config.in index 3de9cc685e..9dab9e4f64 100644 --- a/package/python-dataproperty/Config.in +++ b/package/python-dataproperty/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_DATAPROPERTY bool "python-dataproperty" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime select BR2_PACKAGE_PYTHON_TYPEPY # runtime help diff --git a/package/python-dateutil/Config.in b/package/python-dateutil/Config.in index bbf61f6813..1a36a150b1 100644 --- a/package/python-dateutil/Config.in +++ b/package/python-dateutil/Config.in @@ -1,6 +1,5 @@ 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-dbus-next/Config.in b/package/python-dbus-next/Config.in index bafead8986..6b00e70765 100644 --- a/package/python-dbus-next/Config.in +++ b/package/python-dbus-next/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_DBUS_NEXT bool "python-dbus-next" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime help A zero-dependency DBus library for Python with asyncio diff --git a/package/python-decorator/Config.in b/package/python-decorator/Config.in index 0e84840657..e7ec00cd69 100644 --- a/package/python-decorator/Config.in +++ b/package/python-decorator/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_DECORATOR bool "python-decorator" - depends on BR2_PACKAGE_PYTHON3 help Better living through Python with decorators diff --git a/package/python-dialog3/Config.in b/package/python-dialog3/Config.in index cd0760854b..86812d2764 100644 --- a/package/python-dialog3/Config.in +++ b/package/python-dialog3/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_DIALOG3 bool "python-dialog3" - depends on BR2_PACKAGE_PYTHON3 depends on BR2_USE_MMU # dialog select BR2_PACKAGE_DIALOG help diff --git a/package/python-django-enumfields/Config.in b/package/python-django-enumfields/Config.in index 51efbcbf53..e7236d130a 100644 --- a/package/python-django-enumfields/Config.in +++ b/package/python-django-enumfields/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_DJANGO_ENUMFIELDS bool "python-django-enumfields" - depends on BR2_PACKAGE_PYTHON3 help Real Python Enums for Django. diff --git a/package/python-django/Config.in b/package/python-django/Config.in index 6748d42e1a..8ffceb7275 100644 --- a/package/python-django/Config.in +++ b/package/python-django/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_DJANGO bool "python-django" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON3_UNICODEDATA select BR2_PACKAGE_PYTHON3_PYEXPAT select BR2_PACKAGE_PYTHON_ASGIREF # runtime diff --git a/package/python-dnspython/Config.in b/package/python-dnspython/Config.in index da9b959366..99fd6a9a5f 100644 --- a/package/python-dnspython/Config.in +++ b/package/python-dnspython/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_DNSPYTHON bool "python-dnspython" - depends on BR2_PACKAGE_PYTHON3 help A powerful DNS toolkit for python. diff --git a/package/python-docker/Config.in b/package/python-docker/Config.in index 41b4aacd5e..b2296f42eb 100644 --- a/package/python-docker/Config.in +++ b/package/python-docker/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_DOCKER bool "python-docker" - depends on BR2_PACKAGE_PYTHON3 # python-requests -> python-idna # docker-engine may be running on another host, so no other dependency select BR2_PACKAGE_PYTHON3_SSL # runtime select BR2_PACKAGE_PYTHON_REQUESTS # runtime diff --git a/package/python-engineio/Config.in b/package/python-engineio/Config.in index 48f3391e53..b42b609e0d 100644 --- a/package/python-engineio/Config.in +++ b/package/python-engineio/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_ENGINEIO bool "python-engineio" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON3_ZLIB help Engine.IO server. diff --git a/package/python-falcon/Config.in b/package/python-falcon/Config.in index f90ef55b30..1bf93064bb 100644 --- a/package/python-falcon/Config.in +++ b/package/python-falcon/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_FALCON bool "python-falcon" - depends on BR2_PACKAGE_PYTHON3 help An unladen web framework for building APIs and app backends. diff --git a/package/python-filelock/Config.in b/package/python-filelock/Config.in index bda4582ac1..57ec039400 100644 --- a/package/python-filelock/Config.in +++ b/package/python-filelock/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_FILELOCK bool "python-filelock" - depends on BR2_PACKAGE_PYTHON3 help A platform independent file lock. diff --git a/package/python-flask-babel/Config.in b/package/python-flask-babel/Config.in index 52f05f1e6a..272d9ef1c1 100644 --- a/package/python-flask-babel/Config.in +++ b/package/python-flask-babel/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_FLASK_BABEL bool "python-flask-babel" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_FLASK # runtime select BR2_PACKAGE_PYTHON_BABEL # runtime select BR2_PACKAGE_PYTHON_JINJA2 # runtime diff --git a/package/python-flask-cors/Config.in b/package/python-flask-cors/Config.in index f34f77e5b0..e2e84797f9 100644 --- a/package/python-flask-cors/Config.in +++ b/package/python-flask-cors/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_FLASK_CORS bool "python-flask-cors" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_FLASK # runtime select BR2_PACKAGE_PYTHON_SIX # runtime help diff --git a/package/python-flask-expects-json/Config.in b/package/python-flask-expects-json/Config.in index efe4c248d3..901234762e 100644 --- a/package/python-flask-expects-json/Config.in +++ b/package/python-flask-expects-json/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_FLASK_EXPECTS_JSON bool "python-flask-expects-json" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_FLASK # runtime select BR2_PACKAGE_PYTHON_JSONSCHEMA # runtime help diff --git a/package/python-flask-jsonrpc/Config.in b/package/python-flask-jsonrpc/Config.in index 4bc13f9bcb..c8ecd854b3 100644 --- a/package/python-flask-jsonrpc/Config.in +++ b/package/python-flask-jsonrpc/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_FLASK_JSONRPC bool "python-flask-jsonrpc" - depends on BR2_PACKAGE_PYTHON3 # runtime dependency select BR2_PACKAGE_PYTHON_FLASK help diff --git a/package/python-flask-login/Config.in b/package/python-flask-login/Config.in index 00fa58d783..88c413e2a2 100644 --- a/package/python-flask-login/Config.in +++ b/package/python-flask-login/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_FLASK_LOGIN bool "python-flask-login" - depends on BR2_PACKAGE_PYTHON3 # runtime dependency select BR2_PACKAGE_PYTHON_FLASK help diff --git a/package/python-flask-sqlalchemy/Config.in b/package/python-flask-sqlalchemy/Config.in index e96bd7078c..fa4a035110 100644 --- a/package/python-flask-sqlalchemy/Config.in +++ b/package/python-flask-sqlalchemy/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_FLASK_SQLALCHEMY bool "python-flask-sqlalchemy" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_FLASK # runtime select BR2_PACKAGE_PYTHON_SQLALCHEMY # runtime help diff --git a/package/python-flask-wtf/Config.in b/package/python-flask-wtf/Config.in index 18329d0776..4a8566a26a 100644 --- a/package/python-flask-wtf/Config.in +++ b/package/python-flask-wtf/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_FLASK_WTF bool "python-flask-wtf" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_FLASK # runtime select BR2_PACKAGE_PYTHON_ITSDANGEROUS # runtime select BR2_PACKAGE_PYTHON_WTFORMS # runtime diff --git a/package/python-flup/Config.in b/package/python-flup/Config.in index f40f250163..50d1dfa3ac 100644 --- a/package/python-flup/Config.in +++ b/package/python-flup/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_FLUP bool "python-flup" - depends on BR2_PACKAGE_PYTHON3 help flup provides of a collection of WSGI modules for Python. It allows a webserver to use scgi-mod and fastcgi-mod diff --git a/package/python-fonttools/Config.in b/package/python-fonttools/Config.in index 714f547430..64de1efe5f 100644 --- a/package/python-fonttools/Config.in +++ b/package/python-fonttools/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_FONTTOOLS bool "python-fonttools" - depends on BR2_PACKAGE_PYTHON3 help Tools to manipulate font files. diff --git a/package/python-frozenlist/Config.in b/package/python-frozenlist/Config.in index 67a58b40ca..05714199ca 100644 --- a/package/python-frozenlist/Config.in +++ b/package/python-frozenlist/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_FROZENLIST bool "python-frozenlist" - depends on BR2_PACKAGE_PYTHON3 help A list-like structure which implements collections.abc.MutableSequence. diff --git a/package/python-git/Config.in b/package/python-git/Config.in index b8dbc3a6c1..3c23f91c36 100644 --- a/package/python-git/Config.in +++ b/package/python-git/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_GIT bool "python-git" - depends on BR2_PACKAGE_PYTHON3 depends on BR2_USE_MMU # git select BR2_PACKAGE_GIT # runtime select BR2_PACKAGE_PYTHON_GITDB2 # runtime diff --git a/package/python-gitdb2/Config.in b/package/python-gitdb2/Config.in index 158e4b6980..4a87cc8e8d 100644 --- a/package/python-gitdb2/Config.in +++ b/package/python-gitdb2/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_GITDB2 bool "python-gitdb2" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_SMMAP2 # runtime select BR2_PACKAGE_PYTHON3_ZLIB help diff --git a/package/python-gobject/Config.in b/package/python-gobject/Config.in index efc781a1ff..3354535637 100644 --- a/package/python-gobject/Config.in +++ b/package/python-gobject/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_PYTHON_GOBJECT depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # gobject-introspection depends on BR2_HOST_GCC_AT_LEAST_8 # gobject-introspection -> host-qemu depends on BR2_TOOLCHAIN_USES_GLIBC # gobject-introspection - depends on BR2_PACKAGE_PYTHON3 # gobject-introspection select BR2_PACKAGE_GOBJECT_INTROSPECTION select BR2_PACKAGE_LIBGLIB2 help diff --git a/package/python-gpiozero/Config.in b/package/python-gpiozero/Config.in index 13506ae45f..93e5de3e55 100644 --- a/package/python-gpiozero/Config.in +++ b/package/python-gpiozero/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_GPIOZERO bool "python-gpiozero" depends on BR2_arm - depends on BR2_PACKAGE_PYTHON3 # python-colorzero select BR2_PACKAGE_PYTHON_COLORZERO # runtime select BR2_PACKAGE_PYTHON_RPI_GPIO # runtime select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime diff --git a/package/python-gunicorn/Config.in b/package/python-gunicorn/Config.in index 4e7c0179a5..18f0c034ba 100644 --- a/package/python-gunicorn/Config.in +++ b/package/python-gunicorn/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_GUNICORN bool "python-gunicorn" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime select BR2_PACKAGE_PYTHON3_SSL # runtime help diff --git a/package/python-h2/Config.in b/package/python-h2/Config.in index d88ad36761..74a6b2ad08 100644 --- a/package/python-h2/Config.in +++ b/package/python-h2/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_H2 bool "python-h2" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_HPACK # runtime select BR2_PACKAGE_PYTHON_HYPERFRAME # runtime help diff --git a/package/python-hiredis/Config.in b/package/python-hiredis/Config.in index aacdc87cd2..a401de055d 100644 --- a/package/python-hiredis/Config.in +++ b/package/python-hiredis/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_HIREDIS bool "python-hiredis" - depends on BR2_PACKAGE_PYTHON3 help Python wrapper for hiredis. diff --git a/package/python-hpack/Config.in b/package/python-hpack/Config.in index 0608f97281..b34a3f31fa 100644 --- a/package/python-hpack/Config.in +++ b/package/python-hpack/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_HPACK bool "python-hpack" - depends on BR2_PACKAGE_PYTHON3 help Pure-Python HPACK header compression. diff --git a/package/python-httplib2/Config.in b/package/python-httplib2/Config.in index 0095d95b51..a029814f03 100644 --- a/package/python-httplib2/Config.in +++ b/package/python-httplib2/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_HTTPLIB2 bool "python-httplib2" - depends on BR2_PACKAGE_PYTHON3 # python-pyparsing select BR2_PACKAGE_PYTHON3_ZLIB select BR2_PACKAGE_PYTHON3_SSL select BR2_PACKAGE_PYTHON_PYPARSING # runtime diff --git a/package/python-humanize/Config.in b/package/python-humanize/Config.in index ec63be9b35..f4f4e67b65 100644 --- a/package/python-humanize/Config.in +++ b/package/python-humanize/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_HUMANIZE bool "python-humanize" - depends on BR2_PACKAGE_PYTHON3 help Python humanize package contains various common humanization utilities, like turning a number into a fuzzy human readable diff --git a/package/python-hyperframe/Config.in b/package/python-hyperframe/Config.in index 30457fe86e..fb83c895af 100644 --- a/package/python-hyperframe/Config.in +++ b/package/python-hyperframe/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_HYPERFRAME bool "python-hyperframe" - depends on BR2_PACKAGE_PYTHON3 help HTTP/2 framing layer for Python. diff --git a/package/python-hyperlink/Config.in b/package/python-hyperlink/Config.in index 3a85e6f461..8dad0af19a 100644 --- a/package/python-hyperlink/Config.in +++ b/package/python-hyperlink/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_HYPERLINK bool "python-hyperlink" - depends on BR2_PACKAGE_PYTHON3 # python-idna select BR2_PACKAGE_PYTHON_IDNA # runtime help A featureful, correct URL for Python. diff --git a/package/python-ibmiotf/Config.in b/package/python-ibmiotf/Config.in index 3f3f7e1965..64362db998 100644 --- a/package/python-ibmiotf/Config.in +++ b/package/python-ibmiotf/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_IBMIOTF bool "python-ibmiotf" - depends on BR2_PACKAGE_PYTHON3 # python-requests -> python-idna select BR2_PACKAGE_PYTHON_ISO8601 # runtime select BR2_PACKAGE_PYTHON_PAHO_MQTT # runtime select BR2_PACKAGE_PYTHON_PYTZ # runtime diff --git a/package/python-idna/Config.in b/package/python-idna/Config.in index 3df634f9bf..ddc2cd7d17 100644 --- a/package/python-idna/Config.in +++ b/package/python-idna/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_IDNA bool "python-idna" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON3_UNICODEDATA help A library to support the Internationalised Domain Names in diff --git a/package/python-inflection/Config.in b/package/python-inflection/Config.in index 5b6a26fead..84240060fd 100644 --- a/package/python-inflection/Config.in +++ b/package/python-inflection/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_INFLECTION bool "python-inflection" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON3_UNICODEDATA help A string transformation library that singularizes and diff --git a/package/python-influxdb/Config.in b/package/python-influxdb/Config.in index 48c300f90d..6ebbd4aa9c 100644 --- a/package/python-influxdb/Config.in +++ b/package/python-influxdb/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_INFLUXDB bool "python-influxdb" - depends on BR2_PACKAGE_PYTHON3 # python-requests -> python-idna select BR2_PACKAGE_PYTHON_DATEUTIL # runtime select BR2_PACKAGE_PYTHON_MSGPACK # runtime select BR2_PACKAGE_PYTHON_PYTZ # runtime diff --git a/package/python-ipdb/Config.in b/package/python-ipdb/Config.in index 4a89bf75de..a9d6af1684 100644 --- a/package/python-ipdb/Config.in +++ b/package/python-ipdb/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_IPDB bool "python-ipdb" - depends on BR2_PACKAGE_PYTHON3 # python-ipython select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime select BR2_PACKAGE_PYTHON_IPYTHON # runtime help diff --git a/package/python-ipython/Config.in b/package/python-ipython/Config.in index c151ac2dd2..3de49ae574 100644 --- a/package/python-ipython/Config.in +++ b/package/python-ipython/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_IPYTHON bool "python-ipython" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_BACKCALL # runtime select BR2_PACKAGE_PYTHON_DECORATOR # runtime select BR2_PACKAGE_PYTHON_JEDI # runtime diff --git a/package/python-itsdangerous/Config.in b/package/python-itsdangerous/Config.in index 72aa9165f8..fc0cfe1591 100644 --- a/package/python-itsdangerous/Config.in +++ b/package/python-itsdangerous/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_ITSDANGEROUS bool "python-itsdangerous" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON3_ZLIB # runtime help Itsdangerous contains various helpers to pass data to diff --git a/package/python-janus/Config.in b/package/python-janus/Config.in index 38e4b7217f..924c1fa97d 100644 --- a/package/python-janus/Config.in +++ b/package/python-janus/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_JANUS bool "python-janus" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime help Mixed sync-async queue to interoperate between asyncio diff --git a/package/python-jaraco-classes/Config.in b/package/python-jaraco-classes/Config.in index 271e085c6f..05c11237ab 100644 --- a/package/python-jaraco-classes/Config.in +++ b/package/python-jaraco-classes/Config.in @@ -1,6 +1,5 @@ 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-jaraco-functools/Config.in b/package/python-jaraco-functools/Config.in index 6c914f3851..f65664018d 100644 --- a/package/python-jaraco-functools/Config.in +++ b/package/python-jaraco-functools/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_JARACO_FUNCTOOLS bool "python-jaraco-functools" - depends on BR2_PACKAGE_PYTHON3 # python-more-itertools select BR2_PACKAGE_PYTHON_MORE_ITERTOOLS # runtime help Additional functools in the spirit of stdlib?s diff --git a/package/python-jedi/Config.in b/package/python-jedi/Config.in index e14fa54ffb..8ceaa1530c 100644 --- a/package/python-jedi/Config.in +++ b/package/python-jedi/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_JEDI bool "python-jedi" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_PARSO # runtime help An autocompletion tool for Python that can be used for text diff --git a/package/python-jinja2/Config.in b/package/python-jinja2/Config.in index 8ba2fa4df8..84a46bd264 100644 --- a/package/python-jinja2/Config.in +++ b/package/python-jinja2/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_JINJA2 bool "python-jinja2" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_MARKUPSAFE # runtime select BR2_PACKAGE_PYTHON3_UNICODEDATA help diff --git a/package/python-jsonmodels/Config.in b/package/python-jsonmodels/Config.in index 84a269f171..f66982874a 100644 --- a/package/python-jsonmodels/Config.in +++ b/package/python-jsonmodels/Config.in @@ -1,6 +1,5 @@ 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-keyring/Config.in b/package/python-keyring/Config.in index 61cb98952f..6b33686cbe 100644 --- a/package/python-keyring/Config.in +++ b/package/python-keyring/Config.in @@ -2,7 +2,6 @@ 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 select BR2_PACKAGE_PYTHON_ENTRYPOINTS # runtime select BR2_PACKAGE_PYTHON_SECRETSTORAGE # runtime help diff --git a/package/python-libusb1/Config.in b/package/python-libusb1/Config.in index fbad70c375..e464a0394d 100644 --- a/package/python-libusb1/Config.in +++ b/package/python-libusb1/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_LIBUSB1 bool "python-libusb1" - depends on BR2_PACKAGE_PYTHON3 depends on BR2_TOOLCHAIN_HAS_THREADS # libusb depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB @@ -10,6 +9,5 @@ config BR2_PACKAGE_PYTHON_LIBUSB1 http://github.com/vpelletier/python-libusb1 comment "python-libusb1 needs a toolchain w/ threads, gcc >= 4.9" - depends on BR2_PACKAGE_PYTHON3 depends on !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/python-markdown/Config.in b/package/python-markdown/Config.in index 454c2729bd..4963ec6560 100644 --- a/package/python-markdown/Config.in +++ b/package/python-markdown/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_MARKDOWN bool "python-markdown" - depends on BR2_PACKAGE_PYTHON3 # runtime dependency on Python's xml module select BR2_PACKAGE_PYTHON3_PYEXPAT help diff --git a/package/python-markdown2/Config.in b/package/python-markdown2/Config.in index 5513219a40..8fe2332491 100644 --- a/package/python-markdown2/Config.in +++ b/package/python-markdown2/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_MARKDOWN2 bool "python-markdown2" - depends on BR2_PACKAGE_PYTHON3 help A fast and complete Python implementation of Markdown. diff --git a/package/python-markupsafe/Config.in b/package/python-markupsafe/Config.in index cd7cb2d8e9..48421e0a32 100644 --- a/package/python-markupsafe/Config.in +++ b/package/python-markupsafe/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_MARKUPSAFE bool "python-markupsafe" - depends on BR2_PACKAGE_PYTHON3 help MarkupSafe implements a XML/HTML/XHTML Markup safe string for Python. diff --git a/package/python-matplotlib/Config.in b/package/python-matplotlib/Config.in index e5a4064538..b936777662 100644 --- a/package/python-matplotlib/Config.in +++ b/package/python-matplotlib/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_MATPLOTLIB bool "python-matplotlib" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_PACKAGE_PYTHON3 depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy select BR2_PACKAGE_FREETYPE # runtime diff --git a/package/python-mbstrdecoder/Config.in b/package/python-mbstrdecoder/Config.in index 5ba3a19cc4..0ff0a310a5 100644 --- a/package/python-mbstrdecoder/Config.in +++ b/package/python-mbstrdecoder/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_MBSTRDECODER bool "python-mbstrdecoder" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_CHARDET # runtime help multi-byte character string decoder. diff --git a/package/python-memory-profiler/Config.in b/package/python-memory-profiler/Config.in index 60833304ae..9d29e5f1ca 100644 --- a/package/python-memory-profiler/Config.in +++ b/package/python-memory-profiler/Config.in @@ -1,6 +1,5 @@ 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. diff --git a/package/python-more-itertools/Config.in b/package/python-more-itertools/Config.in index f54b52d1f0..5a74f95d59 100644 --- a/package/python-more-itertools/Config.in +++ b/package/python-more-itertools/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_MORE_ITERTOOLS bool "python-more-itertools" - depends on BR2_PACKAGE_PYTHON3 help More routines for operating on iterables, beyond itertools. diff --git a/package/python-mpd2/Config.in b/package/python-mpd2/Config.in index 823c82e52d..52dcbf0096 100644 --- a/package/python-mpd2/Config.in +++ b/package/python-mpd2/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_MPD2 bool "python-mpd2" - depends on BR2_PACKAGE_PYTHON3 help A Python MPD client library. diff --git a/package/python-msgfy/Config.in b/package/python-msgfy/Config.in index f5a471633a..7875379e9e 100644 --- a/package/python-msgfy/Config.in +++ b/package/python-msgfy/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_MSGFY bool "python-msgfy" - depends on BR2_PACKAGE_PYTHON3 help msgfy is a Python library for convert Exception instance to a human-readable error message. diff --git a/package/python-multidict/Config.in b/package/python-multidict/Config.in index 7bfaa36db2..9a92a6d396 100644 --- a/package/python-multidict/Config.in +++ b/package/python-multidict/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_MULTIDICT bool "python-multidict" - depends on BR2_PACKAGE_PYTHON3 help Multidict is dict-like collection of key-value pairs where a key may occur more than once in the container. diff --git a/package/python-mutagen/Config.in b/package/python-mutagen/Config.in index 655562893f..dc183a6e4e 100644 --- a/package/python-mutagen/Config.in +++ b/package/python-mutagen/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_MUTAGEN bool "python-mutagen" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime select BR2_PACKAGE_PYTHON3_ZLIB # runtime help diff --git a/package/python-mwclient/Config.in b/package/python-mwclient/Config.in index 1af60fdcd0..dc93e6c0df 100644 --- a/package/python-mwclient/Config.in +++ b/package/python-mwclient/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_MWCLIENT bool "python-mwclient" - depends on BR2_PACKAGE_PYTHON3 # python-requests-oauthlib -> python-requests -> python-idna select BR2_PACKAGE_PYTHON_REQUESTS_OAUTHLIB # runtime select BR2_PACKAGE_PYTHON_SIX # runtime help diff --git a/package/python-mwscrape/Config.in b/package/python-mwscrape/Config.in index cb1e30506f..fc9d5223f2 100644 --- a/package/python-mwscrape/Config.in +++ b/package/python-mwscrape/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_MWSCRAPE bool "python-mwscrape" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_COUCHDB # runtime select BR2_PACKAGE_PYTHON_MWCLIENT # runtime select BR2_PACKAGE_PYTHON_PYLRU # runtime diff --git a/package/python-mwscrape2slob/Config.in b/package/python-mwscrape2slob/Config.in index 6d543bda28..6ced253451 100644 --- a/package/python-mwscrape2slob/Config.in +++ b/package/python-mwscrape2slob/Config.in @@ -4,7 +4,6 @@ config BR2_PACKAGE_PYTHON_MWSCRAPE2SLOB depends on BR2_HOST_GCC_AT_LEAST_4_9 # python-slob -> python-pyicu -> icu depends on BR2_INSTALL_LIBSTDCPP # python-slob -> python-pyicu -> icu depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # python-slob -> python-pyicu -> icu - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_COUCHDB # runtime select BR2_PACKAGE_PYTHON_CSSSELECT # runtime select BR2_PACKAGE_PYTHON_CSSUTILS # runtime @@ -17,7 +16,6 @@ config BR2_PACKAGE_PYTHON_MWSCRAPE2SLOB https://github.com/itkach/mwscrape2slob comment "python-mwscrape2slob needs a toolchain w/ C++, gcc >= 4.9, host gcc >= 4.9" - depends on BR2_PACKAGE_PYTHON3 && !BR2_BINFMT_FLAT depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ !BR2_HOST_GCC_AT_LEAST_4_9 diff --git a/package/python-networkx/Config.in b/package/python-networkx/Config.in index 2ae3841dfa..0f3e86f497 100644 --- a/package/python-networkx/Config.in +++ b/package/python-networkx/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_NETWORKX bool "python-networkx" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_DECORATOR # runtime help A Python package for the creation, manipulation, diff --git a/package/python-numpy/Config.in b/package/python-numpy/Config.in index 23dcbc7986..a65164d9d5 100644 --- a/package/python-numpy/Config.in +++ b/package/python-numpy/Config.in @@ -15,7 +15,6 @@ config BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS config BR2_PACKAGE_PYTHON_NUMPY bool "python-numpy" - depends on BR2_PACKAGE_PYTHON3 depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS # python-numpy needs fenv.h which is not provided by uclibc depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL @@ -29,6 +28,5 @@ config BR2_PACKAGE_PYTHON_NUMPY http://www.numpy.org/ comment "python-numpy needs glibc or musl" - depends on BR2_PACKAGE_PYTHON3 depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) diff --git a/package/python-oauthlib/Config.in b/package/python-oauthlib/Config.in index 0084e7cbd9..65016c1d08 100644 --- a/package/python-oauthlib/Config.in +++ b/package/python-oauthlib/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_OAUTHLIB bool "python-oauthlib" - depends on BR2_PACKAGE_PYTHON3 help A generic, spec-compliant, thorough implementation of the OAuth request-signing logic. diff --git a/package/python-opcua-asyncio/Config.in b/package/python-opcua-asyncio/Config.in index 95715fdd08..e5b8623f0d 100644 --- a/package/python-opcua-asyncio/Config.in +++ b/package/python-opcua-asyncio/Config.in @@ -1,7 +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 select BR2_PACKAGE_PYTHON_DATEUTIL # runtime diff --git a/package/python-packaging/Config.in b/package/python-packaging/Config.in index 74d5205e8d..12170df84e 100644 --- a/package/python-packaging/Config.in +++ b/package/python-packaging/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PACKAGING bool "python-packaging" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_PYPARSING # runtime help Core utilities for Python packages. diff --git a/package/python-paramiko/Config.in b/package/python-paramiko/Config.in index d48051bd22..a07af19a4b 100644 --- a/package/python-paramiko/Config.in +++ b/package/python-paramiko/Config.in @@ -1,7 +1,6 @@ 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, 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-parso/Config.in b/package/python-parso/Config.in index 4f5482d8a0..ea1c5a4732 100644 --- a/package/python-parso/Config.in +++ b/package/python-parso/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PARSO bool "python-parso" - depends on BR2_PACKAGE_PYTHON3 help A Python Parser. diff --git a/package/python-pathpy/Config.in b/package/python-pathpy/Config.in index 7c7ffc9e92..98c05126bf 100644 --- a/package/python-pathpy/Config.in +++ b/package/python-pathpy/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PATHPY bool "python-pathpy" - depends on BR2_PACKAGE_PYTHON3 help path.py implements a path objects as first-class entities, allowing common operations on files to diff --git a/package/python-pathvalidate/Config.in b/package/python-pathvalidate/Config.in index f8658e6165..8606696e1b 100644 --- a/package/python-pathvalidate/Config.in +++ b/package/python-pathvalidate/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PATHVALIDATE bool "python-pathvalidate" - depends on BR2_PACKAGE_PYTHON3 help pathvalidate is a python library to validate/sanitize a string such as filename/variable-name. diff --git a/package/python-piexif/Config.in b/package/python-piexif/Config.in index 2f7eff80b5..1c8c31b9c6 100644 --- a/package/python-piexif/Config.in +++ b/package/python-piexif/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PIEXIF bool "python-piexif" - depends on BR2_PACKAGE_PYTHON3 help Piexif simplifies interacting with EXIF data in Python. It includes the tools necessary for extracting, creating, diff --git a/package/python-pillow/Config.in b/package/python-pillow/Config.in index ae6d8c8346..126cb452fa 100644 --- a/package/python-pillow/Config.in +++ b/package/python-pillow/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PILLOW bool "python-pillow" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime select BR2_PACKAGE_PYTHON3_ZLIB help diff --git a/package/python-pip/Config.in b/package/python-pip/Config.in index 92c3e3bd46..805dc01545 100644 --- a/package/python-pip/Config.in +++ b/package/python-pip/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PIP bool "python-pip" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime select BR2_PACKAGE_PYTHON3_SSL help diff --git a/package/python-pluggy/Config.in b/package/python-pluggy/Config.in index 7179bc427c..35b18c824f 100644 --- a/package/python-pluggy/Config.in +++ b/package/python-pluggy/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PLUGGY bool "python-pluggy" - depends on BR2_PACKAGE_PYTHON3 help plugin and hook calling mechanisms for python. diff --git a/package/python-portend/Config.in b/package/python-portend/Config.in index 30a50c7f61..6b21078caa 100644 --- a/package/python-portend/Config.in +++ b/package/python-portend/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PORTEND bool "python-portend" - depends on BR2_PACKAGE_PYTHON3 # python-tempora select BR2_PACKAGE_PYTHON_TEMPORA # runtime help TCP port monitoring utilities. diff --git a/package/python-priority/Config.in b/package/python-priority/Config.in index 8ac2d13824..b73b7e2ad4 100644 --- a/package/python-priority/Config.in +++ b/package/python-priority/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PRIORITY bool "python-priority" - depends on BR2_PACKAGE_PYTHON3 help A pure-Python implementation of the HTTP/2 priority tree. diff --git a/package/python-prompt-toolkit/Config.in b/package/python-prompt-toolkit/Config.in index a16ac13d53..ad4f8162de 100644 --- a/package/python-prompt-toolkit/Config.in +++ b/package/python-prompt-toolkit/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PROMPT_TOOLKIT bool "python-prompt-toolkit" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_WCWIDTH # runtime select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime diff --git a/package/python-protobuf/Config.in b/package/python-protobuf/Config.in index 9b20881196..1af82112b4 100644 --- a/package/python-protobuf/Config.in +++ b/package/python-protobuf/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_PYTHON_PROTOBUF bool "python-protobuf" # host-protobuf only builds on certain architectures depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_SIX # runtime help Python implementation of the Google Protocol Buffers. diff --git a/package/python-psycopg2/Config.in b/package/python-psycopg2/Config.in index fba781c014..ec27d706de 100644 --- a/package/python-psycopg2/Config.in +++ b/package/python-psycopg2/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PSYCOPG2 bool "python-psycopg2" - depends on BR2_PACKAGE_PYTHON3 depends on BR2_USE_WCHAR # postgresql select BR2_PACKAGE_POSTGRESQL help @@ -24,5 +23,4 @@ config BR2_PACKAGE_PYTHON_PSYCOPG2 http://initd.org/psycopg/ comment "python-psycopg2 needs a toolchain w/ wchar" - depends on BR2_PACKAGE_PYTHON3 depends on !BR2_USE_WCHAR diff --git a/package/python-pudb/Config.in b/package/python-pudb/Config.in index 64789021d1..06f1b20c26 100644 --- a/package/python-pudb/Config.in +++ b/package/python-pudb/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PUDB bool "python-pudb" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_URWID # runtime select BR2_PACKAGE_PYTHON_JEDI # runtime select BR2_PACKAGE_PYTHON_PYGMENTS # runtime diff --git a/package/python-py/Config.in b/package/python-py/Config.in index 0e3c3390a0..354372f5b4 100644 --- a/package/python-py/Config.in +++ b/package/python-py/Config.in @@ -1,6 +1,5 @@ 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-pybind/Config.in b/package/python-pybind/Config.in index 27bc196e32..604cb9ee67 100644 --- a/package/python-pybind/Config.in +++ b/package/python-pybind/Config.in @@ -1,6 +1,5 @@ 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-pycairo/Config.in b/package/python-pycairo/Config.in index a44a0421e6..0d8de977e1 100644 --- a/package/python-pycairo/Config.in +++ b/package/python-pycairo/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PYCAIRO bool "python-pycairo" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_CAIRO help Python interface for cairo. diff --git a/package/python-pycares/Config.in b/package/python-pycares/Config.in index 3452ae6b10..889e0943be 100644 --- a/package/python-pycares/Config.in +++ b/package/python-pycares/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PYCARES bool "python-pycares" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_CFFI # runtime help Python interface for c-ares. diff --git a/package/python-pycups/Config.in b/package/python-pycups/Config.in index 61c2ba21d1..eeaf70c9e6 100644 --- a/package/python-pycups/Config.in +++ b/package/python-pycups/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_PYCUPS bool "python-pycups" depends on BR2_PACKAGE_CUPS - depends on BR2_PACKAGE_PYTHON3 help Python bindings for libcups. diff --git a/package/python-pydantic/Config.in b/package/python-pydantic/Config.in index ac81aeb342..41ec43adf4 100644 --- a/package/python-pydantic/Config.in +++ b/package/python-pydantic/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PYDANTIC bool "python-pydantic" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime help Data validation and settings management using python 3.6 diff --git a/package/python-pydyf/Config.in b/package/python-pydyf/Config.in index f283a6d6aa..42530eafbb 100644 --- a/package/python-pydyf/Config.in +++ b/package/python-pydyf/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PYDYF bool "python-pydyf" - depends on BR2_PACKAGE_PYTHON3 help A low-level PDF generator. diff --git a/package/python-pygments/Config.in b/package/python-pygments/Config.in index d74e53d4c8..f097c52397 100644 --- a/package/python-pygments/Config.in +++ b/package/python-pygments/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PYGMENTS bool "python-pygments" - depends on BR2_PACKAGE_PYTHON3 help Pygments is a syntax highlighting package written in Python. diff --git a/package/python-pyhamcrest/Config.in b/package/python-pyhamcrest/Config.in index 1bbae3fec7..c2a4dc06f7 100644 --- a/package/python-pyhamcrest/Config.in +++ b/package/python-pyhamcrest/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PYHAMCREST bool "python-pyhamcrest" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime select BR2_PACKAGE_PYTHON_SIX # runtime help diff --git a/package/python-pyjwt/Config.in b/package/python-pyjwt/Config.in index f8d4f8a9b8..510875ce2f 100644 --- a/package/python-pyjwt/Config.in +++ b/package/python-pyjwt/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PYJWT bool "python-pyjwt" - depends on BR2_PACKAGE_PYTHON3 help JSON Web Token implementation in Python. diff --git a/package/python-pymupdf/Config.in b/package/python-pymupdf/Config.in index 0ecb288922..b3f9565238 100644 --- a/package/python-pymupdf/Config.in +++ b/package/python-pymupdf/Config.in @@ -4,7 +4,6 @@ config BR2_PACKAGE_PYTHON_PYMUPDF depends on BR2_TOOLCHAIN_HAS_SYNC_4 # mupdf -> harfbuzz depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # mupdf -> harfbuzz depends on BR2_PACKAGE_XORG7 - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_MUPDF select BR2_PACKAGE_ZLIB @@ -14,12 +13,10 @@ config BR2_PACKAGE_PYTHON_PYMUPDF https://github.com/pymupdf/PyMuPDF comment "python-pymupdf needs Xorg" - depends on BR2_PACKAGE_PYTHON3 depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_PACKAGE_XORG7 comment "python-pymupdf needs a toolchain w/ C++, gcc >= 4.9" - depends on BR2_PACKAGE_PYTHON3 depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/python-pymysql/Config.in b/package/python-pymysql/Config.in index 69ba485e77..75b447cbd1 100644 --- a/package/python-pymysql/Config.in +++ b/package/python-pymysql/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PYMYSQL bool "python-pymysql" - depends on BR2_PACKAGE_PYTHON3 help PyMySQL is a pure-Python MySQL client library. It follows the DB-API 2.0. diff --git a/package/python-pynacl/Config.in b/package/python-pynacl/Config.in index 3bb4e29630..0553d82ce9 100644 --- a/package/python-pynacl/Config.in +++ b/package/python-pynacl/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PYNACL bool "python-pynacl" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_LIBSODIUM select BR2_PACKAGE_PYTHON_CFFI # runtime help diff --git a/package/python-pyndiff/Config.in b/package/python-pyndiff/Config.in index cd13056d79..58ca35ba97 100644 --- a/package/python-pyndiff/Config.in +++ b/package/python-pyndiff/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PYNDIFF bool "python-pyndiff" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_XMLJSON # runtime select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime help diff --git a/package/python-pyopenssl/Config.in b/package/python-pyopenssl/Config.in index 65d516813f..1a6fbd2147 100644 --- a/package/python-pyopenssl/Config.in +++ b/package/python-pyopenssl/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_PYOPENSSL bool "python-pyopenssl" 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 diff --git a/package/python-pyparsing/Config.in b/package/python-pyparsing/Config.in index 9b5894116d..926ca07ed7 100644 --- a/package/python-pyparsing/Config.in +++ b/package/python-pyparsing/Config.in @@ -1,6 +1,5 @@ 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 diff --git a/package/python-pyparted/Config.in b/package/python-pyparted/Config.in index 0ed24f8836..60f54a5484 100644 --- a/package/python-pyparted/Config.in +++ b/package/python-pyparted/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PYPARTED bool "python-pyparted" - depends on BR2_PACKAGE_PYTHON3 depends on BR2_ENABLE_LOCALE # parted depends on BR2_USE_WCHAR select BR2_PACKAGE_PARTED @@ -10,5 +9,4 @@ config BR2_PACKAGE_PYTHON_PYPARTED https://github.com/rhinstaller/pyparted comment "pyparted needs a toolchain w/ locale, wchar" - depends on BR2_PACKAGE_PYTHON3 depends on !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR diff --git a/package/python-pyphen/Config.in b/package/python-pyphen/Config.in index 30ccafcda4..e4707ff036 100644 --- a/package/python-pyphen/Config.in +++ b/package/python-pyphen/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PYPHEN bool "python-pyphen" - depends on BR2_PACKAGE_PYTHON3 help Pure Python module to hyphenate text. diff --git a/package/python-pysftp/Config.in b/package/python-pysftp/Config.in index c65369b667..fc4fdd972d 100644 --- a/package/python-pysftp/Config.in +++ b/package/python-pysftp/Config.in @@ -1,7 +1,6 @@ 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 select BR2_PACKAGE_PYTHON_PARAMIKO # runtime help A friendly face on SFTP. diff --git a/package/python-pytablereader/Config.in b/package/python-pytablereader/Config.in index 1c3f2af82f..889cb79820 100644 --- a/package/python-pytablereader/Config.in +++ b/package/python-pytablereader/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PYTABLEREADER bool "python-pytablereader" - depends on BR2_PACKAGE_PYTHON3 # python-mbstrdecoder, python-pathpy, python-beautifulsoup4, python-pathvalidate select BR2_PACKAGE_PYTHON_BEAUTIFULSOUP4 # runtime select BR2_PACKAGE_PYTHON_DATAPROPERTY # runtime select BR2_PACKAGE_PYTHON_JSONSCHEMA # runtime diff --git a/package/python-pytablewriter/Config.in b/package/python-pytablewriter/Config.in index e0405d12c8..041c30eb6c 100644 --- a/package/python-pytablewriter/Config.in +++ b/package/python-pytablewriter/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PYTABLEWRITER bool "python-pytablewriter" - depends on BR2_PACKAGE_PYTHON3 # python-dataproperty, python-mbstrdecoder, python-pathvalidate select BR2_PACKAGE_PYTHON_DATAPROPERTY # runtime select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime select BR2_PACKAGE_PYTHON_MSGFY # runtime diff --git a/package/python-pytest-asyncio/Config.in b/package/python-pytest-asyncio/Config.in index 3fa90e4e18..2088a8bdbf 100644 --- a/package/python-pytest-asyncio/Config.in +++ b/package/python-pytest-asyncio/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PYTEST_ASYNCIO bool "python-pytest-asyncio" - depends on BR2_PACKAGE_PYTHON3 # pytest select BR2_PACKAGE_PYTHON_PYTEST # runtime help Pytest support for asyncio. diff --git a/package/python-pytest/Config.in b/package/python-pytest/Config.in index ebbaeeea58..c3956c76d2 100644 --- a/package/python-pytest/Config.in +++ b/package/python-pytest/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PYTEST bool "python-pytest" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_ATTRS # runtime select BR2_PACKAGE_PYTHON_INICONFIG # runtime select BR2_PACKAGE_PYTHON_PACKAGING # runtime diff --git a/package/python-pytrie/Config.in b/package/python-pytrie/Config.in index 722d263d7e..156638476c 100644 --- a/package/python-pytrie/Config.in +++ b/package/python-pytrie/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PYTRIE bool "python-pytrie" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_SORTEDCONTAINERS # runtime help A pure Python implementation of the trie data structure. diff --git a/package/python-pyusb/Config.in b/package/python-pyusb/Config.in index 13080a9fde..bba3480a1b 100644 --- a/package/python-pyusb/Config.in +++ b/package/python-pyusb/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PYUSB bool "python-pyusb" - depends on BR2_PACKAGE_PYTHON3 depends on BR2_TOOLCHAIN_HAS_THREADS # libusb depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB diff --git a/package/python-pyyaml/Config.in b/package/python-pyyaml/Config.in index eb073b9c03..45e818b7e7 100644 --- a/package/python-pyyaml/Config.in +++ b/package/python-pyyaml/Config.in @@ -1,6 +1,5 @@ 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-requests-oauthlib/Config.in b/package/python-requests-oauthlib/Config.in index 2510644bd1..85283b209c 100644 --- a/package/python-requests-oauthlib/Config.in +++ b/package/python-requests-oauthlib/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_REQUESTS_OAUTHLIB bool "python-requests-oauthlib" - depends on BR2_PACKAGE_PYTHON3 # python-requests -> python-idna select BR2_PACKAGE_PYTHON_OAUTHLIB # runtime select BR2_PACKAGE_PYTHON_REQUESTS # runtime help diff --git a/package/python-requests-toolbelt/Config.in b/package/python-requests-toolbelt/Config.in index 47141c2c8a..ba2b95152e 100644 --- a/package/python-requests-toolbelt/Config.in +++ b/package/python-requests-toolbelt/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_REQUESTS_TOOLBELT bool "python-requests-toolbelt" - depends on BR2_PACKAGE_PYTHON3 # python-requests -> python-idna select BR2_PACKAGE_PYTHON_REQUESTS # runtime help A utility belt for advanced users of python-requests. diff --git a/package/python-requests/Config.in b/package/python-requests/Config.in index 9b04c07fc9..94a44682f4 100644 --- a/package/python-requests/Config.in +++ b/package/python-requests/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_REQUESTS bool "python-requests" - depends on BR2_PACKAGE_PYTHON3 # python-idna select BR2_PACKAGE_PYTHON_CERTIFI # runtime select BR2_PACKAGE_PYTHON_CHARSET_NORMALIZER # runtime select BR2_PACKAGE_PYTHON_IDNA # runtime diff --git a/package/python-rsa/Config.in b/package/python-rsa/Config.in index bc9ec2feab..5cafd8215f 100644 --- a/package/python-rsa/Config.in +++ b/package/python-rsa/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_RSA bool "python-rsa" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_PYASN1 # runtime help Python-RSA is a pure-Python RSA implementation. It supports diff --git a/package/python-s3transfer/Config.in b/package/python-s3transfer/Config.in index ad3a673938..a7f85b146c 100644 --- a/package/python-s3transfer/Config.in +++ b/package/python-s3transfer/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_S3TRANSFER bool "python-s3transfer" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_BOTOCORE # runtime help An Amazon S3 Transfer Manager. diff --git a/package/python-schedule/Config.in b/package/python-schedule/Config.in index a0f800e364..d00c245948 100644 --- a/package/python-schedule/Config.in +++ b/package/python-schedule/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_SCHEDULE bool "python-schedule" - depends on BR2_PACKAGE_PYTHON3 help Job scheduling for humans. diff --git a/package/python-secretstorage/Config.in b/package/python-secretstorage/Config.in index 059ea097bb..f0a8689ecd 100644 --- a/package/python-secretstorage/Config.in +++ b/package/python-secretstorage/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_SECRETSTORAGE bool "python-secretstorage" - depends on BR2_PACKAGE_PYTHON3 depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime help diff --git a/package/python-serial-asyncio/Config.in b/package/python-serial-asyncio/Config.in index 5520b72506..08396a0eeb 100644 --- a/package/python-serial-asyncio/Config.in +++ b/package/python-serial-asyncio/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_SERIAL_ASYNCIO bool "python-serial-asyncio" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_SERIAL help asyncio extension package for pyserial. diff --git a/package/python-service-identity/Config.in b/package/python-service-identity/Config.in index c571065e92..aa6d0fe715 100644 --- a/package/python-service-identity/Config.in +++ b/package/python-service-identity/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_PYTHON_SERVICE_IDENTITY # 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 diff --git a/package/python-setproctitle/Config.in b/package/python-setproctitle/Config.in index a901fd7055..d13afaa401 100644 --- a/package/python-setproctitle/Config.in +++ b/package/python-setproctitle/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_SETPROCTITLE bool "python-setproctitle" - depends on BR2_PACKAGE_PYTHON3 help A Python module to customize the process title. diff --git a/package/python-simpleaudio/Config.in b/package/python-simpleaudio/Config.in index c6fcd8b07a..1169342be7 100644 --- a/package/python-simpleaudio/Config.in +++ b/package/python-simpleaudio/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_SIMPLEAUDIO bool "python-simpleaudio" - depends on BR2_PACKAGE_PYTHON3 depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib select BR2_PACKAGE_ALSA_LIB help diff --git a/package/python-simplelogging/Config.in b/package/python-simplelogging/Config.in index 7f58791836..db95efa25f 100644 --- a/package/python-simplelogging/Config.in +++ b/package/python-simplelogging/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_SIMPLELOGGING bool "python-simplelogging" - depends on BR2_PACKAGE_PYTHON3 # python-colorlog select BR2_PACKAGE_PYTHON_COLORLOG # runtime help Logging made simple, no excuse for any debug print call. diff --git a/package/python-simplesqlite/Config.in b/package/python-simplesqlite/Config.in index 5a9fa4a5db..81501c9e83 100644 --- a/package/python-simplesqlite/Config.in +++ b/package/python-simplesqlite/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_SIMPLESQLITE bool "python-simplesqlite" - depends on BR2_PACKAGE_PYTHON3 # python-mbstrdecoder, python-pathvalidate select BR2_PACKAGE_PYTHON_DATAPROPERTY # runtime select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime select BR2_PACKAGE_PYTHON_PATHVALIDATE # runtime diff --git a/package/python-slob/Config.in b/package/python-slob/Config.in index 07d04d49a2..c06f544534 100644 --- a/package/python-slob/Config.in +++ b/package/python-slob/Config.in @@ -4,7 +4,6 @@ config BR2_PACKAGE_PYTHON_SLOB depends on BR2_HOST_GCC_AT_LEAST_4_9 # python-pyicu -> icu depends on BR2_INSTALL_LIBSTDCPP # python-pyicu -> icu depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # python-pyicu -> icu - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_PYICU # runtime # although optional, it is used as default compression select BR2_PACKAGE_PYTHON3_XZ # runtime @@ -15,7 +14,6 @@ config BR2_PACKAGE_PYTHON_SLOB https://github.com/itkach/slob comment "python-slob needs a toolchain w/ C++, gcc >= 4.9, host gcc >= 4.9" - depends on BR2_PACKAGE_PYTHON3 && !BR2_BINFMT_FLAT depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ !BR2_HOST_GCC_AT_LEAST_4_9 diff --git a/package/python-smmap2/Config.in b/package/python-smmap2/Config.in index 1d4b1fabbe..21a3bdb613 100644 --- a/package/python-smmap2/Config.in +++ b/package/python-smmap2/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_SMMAP2 bool "python-smmap2" - depends on BR2_PACKAGE_PYTHON3 help Smmap wraps an interface around mmap and tracks the mapped files as well as the amount of clients who use it. If the diff --git a/package/python-socketio/Config.in b/package/python-socketio/Config.in index 89d23b6ddf..a34853ec10 100644 --- a/package/python-socketio/Config.in +++ b/package/python-socketio/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_SOCKETIO bool "python-socketio" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_BIDICT # runtime select BR2_PACKAGE_PYTHON_ENGINEIO # runtime help diff --git a/package/python-sockjs/Config.in b/package/python-sockjs/Config.in index 583d7ec741..92489ec71f 100644 --- a/package/python-sockjs/Config.in +++ b/package/python-sockjs/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_SOCKJS bool "python-sockjs" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_AIOHTTP # runtime help SockJS server implementation for aiohttp. diff --git a/package/python-soupsieve/Config.in b/package/python-soupsieve/Config.in index eeac0ee36e..3cb7f8d0c5 100644 --- a/package/python-soupsieve/Config.in +++ b/package/python-soupsieve/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_SOUPSIEVE bool "python-soupsieve" - depends on BR2_PACKAGE_PYTHON3 help A modern CSS selector implementation for Beautiful Soup. diff --git a/package/python-sqliteschema/Config.in b/package/python-sqliteschema/Config.in index b8fed33c49..102a615765 100644 --- a/package/python-sqliteschema/Config.in +++ b/package/python-sqliteschema/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_SQLITESCHEMA bool "python-sqliteschema" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime select BR2_PACKAGE_PYTHON_TABLEDATA # runtime diff --git a/package/python-tabledata/Config.in b/package/python-tabledata/Config.in index a73207f9c0..9947f41af6 100644 --- a/package/python-tabledata/Config.in +++ b/package/python-tabledata/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_TABLEDATA bool "python-tabledata" - depends on BR2_PACKAGE_PYTHON3 # python-dataproperty, python-typepy select BR2_PACKAGE_PYTHON_DATAPROPERTY # runtime select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime select BR2_PACKAGE_PYTHON_SIX # runtime diff --git a/package/python-tempora/Config.in b/package/python-tempora/Config.in index 06ccbfc283..508cbae3f3 100644 --- a/package/python-tempora/Config.in +++ b/package/python-tempora/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_TEMPORA bool "python-tempora" - depends on BR2_PACKAGE_PYTHON3 # python-jaraco-functools select BR2_PACKAGE_PYTHON_JARACO_FUNCTOOLS # runtime select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_PYTZ # runtime diff --git a/package/python-tinycss2/Config.in b/package/python-tinycss2/Config.in index e6c992b8c5..a34717e002 100644 --- a/package/python-tinycss2/Config.in +++ b/package/python-tinycss2/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_TINYCSS2 bool "python-tinycss2" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_WEBENCODINGS # runtime help A tiny CSS parser. diff --git a/package/python-tinyrpc/Config.in b/package/python-tinyrpc/Config.in index 3194b7825a..3c643c754a 100644 --- a/package/python-tinyrpc/Config.in +++ b/package/python-tinyrpc/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_TINYRPC bool "python-tinyrpc" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_SIX # runtime help A small, modular, transport and protocol neutral RPC diff --git a/package/python-tomako/Config.in b/package/python-tomako/Config.in index 1521035bb6..bd6d29982a 100644 --- a/package/python-tomako/Config.in +++ b/package/python-tomako/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_TOMAKO bool "python-tomako" - depends on BR2_PACKAGE_PYTHON3 # python-tornado select BR2_PACKAGE_PYTHON_TORNADO # runtime select BR2_PACKAGE_PYTHON_MAKO # runtime help diff --git a/package/python-tomli/Config.in b/package/python-tomli/Config.in index e1cecaaa36..d2ae49a45f 100644 --- a/package/python-tomli/Config.in +++ b/package/python-tomli/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_TOMLI bool "python-tomli" - depends on BR2_PACKAGE_PYTHON3 help A lil' TOML parser. diff --git a/package/python-tornado/Config.in b/package/python-tornado/Config.in index e1bf8343f0..b5c59e970d 100644 --- a/package/python-tornado/Config.in +++ b/package/python-tornado/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_TORNADO bool "python-tornado" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON3_ZLIB select BR2_PACKAGE_PYTHON3_SSL help diff --git a/package/python-traitlets/Config.in b/package/python-traitlets/Config.in index 6515cdf8d1..a273601163 100644 --- a/package/python-traitlets/Config.in +++ b/package/python-traitlets/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_TRAITLETS bool "python-traitlets" - depends on BR2_PACKAGE_PYTHON3 help A configuration system for Python applications. diff --git a/package/python-treq/Config.in b/package/python-treq/Config.in index 6e54c19e16..f781b37305 100644 --- a/package/python-treq/Config.in +++ b/package/python-treq/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_PYTHON_TREQ # 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 diff --git a/package/python-twisted/Config.in b/package/python-twisted/Config.in index 89298b2e0c..49a21c4204 100644 --- a/package/python-twisted/Config.in +++ b/package/python-twisted/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_TWISTED bool "python-twisted" - depends on BR2_PACKAGE_PYTHON3 # python-pyhamcrest; python-hyperlink -> python-idna select BR2_PACKAGE_PYTHON_INCREMENTAL select BR2_PACKAGE_PYTHON_ATTRS # runtime select BR2_PACKAGE_PYTHON_AUTOMAT # runtime diff --git a/package/python-txaio/Config.in b/package/python-txaio/Config.in index 19a318a902..eddd983ea6 100644 --- a/package/python-txaio/Config.in +++ b/package/python-txaio/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_TXAIO bool "python-txaio" - depends on BR2_PACKAGE_PYTHON3 help Compatibility API between asyncio/Twisted/Trollius. diff --git a/package/python-txdbus/Config.in b/package/python-txdbus/Config.in index ffd00f153e..f3ea4c78d6 100644 --- a/package/python-txdbus/Config.in +++ b/package/python-txdbus/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_PYTHON_TXDBUS # 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 0606e5f442..fbea7be8cf 100644 --- a/package/python-txtorcon/Config.in +++ b/package/python-txtorcon/Config.in @@ -2,7 +2,6 @@ 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 select BR2_PACKAGE_PYTHON_AUTOMAT # runtime select BR2_PACKAGE_PYTHON_IDNA # runtime select BR2_PACKAGE_PYTHON_INCREMENTAL # runtime diff --git a/package/python-typepy/Config.in b/package/python-typepy/Config.in index fd3b983186..3438e74475 100644 --- a/package/python-typepy/Config.in +++ b/package/python-typepy/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_TYPEPY bool "python-typepy" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime help A Python library for variable type diff --git a/package/python-ujson/Config.in b/package/python-ujson/Config.in index aee1d75fce..81d1bc457c 100644 --- a/package/python-ujson/Config.in +++ b/package/python-ujson/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_UJSON bool "python-ujson" - depends on BR2_PACKAGE_PYTHON3 help UltraJSON is an ultra fast JSON encoder and decoder written in pure C with bindings for Python 3. diff --git a/package/python-unittest-xml-reporting/Config.in b/package/python-unittest-xml-reporting/Config.in index b1a6244dd3..43b054faa7 100644 --- a/package/python-unittest-xml-reporting/Config.in +++ b/package/python-unittest-xml-reporting/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_UNITTEST_XML_REPORTING bool "python-unittest-xml-reporting" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON3_PYEXPAT help unittest-based test runner with Ant/JUnit like XML diff --git a/package/python-urwid/Config.in b/package/python-urwid/Config.in index c141e8c0bd..f584a9258d 100644 --- a/package/python-urwid/Config.in +++ b/package/python-urwid/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_URWID bool "python-urwid" - depends on BR2_PACKAGE_PYTHON3 help Urwid is a console user interface library for Python diff --git a/package/python-uvloop/Config.in b/package/python-uvloop/Config.in index 76e06ac3f4..b3fb275091 100644 --- a/package/python-uvloop/Config.in +++ b/package/python-uvloop/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_UVLOOP bool "python-uvloop" - depends on BR2_PACKAGE_PYTHON3 depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv depends on BR2_USE_MMU # libuv depends on !BR2_STATIC_LIBS # libuv diff --git a/package/python-validators/Config.in b/package/python-validators/Config.in index 802b1dde5b..e700369910 100644 --- a/package/python-validators/Config.in +++ b/package/python-validators/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_VALIDATORS bool "python-validators" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_DECORATOR # runtime help diff --git a/package/python-watchdog/Config.in b/package/python-watchdog/Config.in index 6f0dd62073..18f569ee44 100644 --- a/package/python-watchdog/Config.in +++ b/package/python-watchdog/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_WATCHDOG bool "python-watchdog" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_ARGH # runtime select BR2_PACKAGE_PYTHON_PATHTOOLS # runtime select BR2_PACKAGE_PYTHON_PYYAML # runtime diff --git a/package/python-weasyprint/Config.in b/package/python-weasyprint/Config.in index de68fe2f5b..4a7e5a513d 100644 --- a/package/python-weasyprint/Config.in +++ b/package/python-weasyprint/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_WEASYPRINT bool "python-weasyprint" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_BROTLI # runtime select BR2_PACKAGE_PYTHON_CFFI # runtime select BR2_PACKAGE_PYTHON_CSSSELECT2 # runtime diff --git a/package/python-webpy/Config.in b/package/python-webpy/Config.in index 419a4a180f..ed78409572 100644 --- a/package/python-webpy/Config.in +++ b/package/python-webpy/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_WEBPY bool "python-webpy" - depends on BR2_PACKAGE_PYTHON3 # python-cheroot select BR2_PACKAGE_PYTHON_CHEROOT # runtime select BR2_PACKAGE_PYTHON_MARKDOWN # runtime help diff --git a/package/python-websockets/Config.in b/package/python-websockets/Config.in index 888bec616f..60495b6284 100644 --- a/package/python-websockets/Config.in +++ b/package/python-websockets/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_WEBSOCKETS bool "python-websockets" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON3_ZLIB select BR2_PACKAGE_PYTHON3_SSL help diff --git a/package/python-wtforms/Config.in b/package/python-wtforms/Config.in index 0cc136fc13..33a17d3d37 100644 --- a/package/python-wtforms/Config.in +++ b/package/python-wtforms/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_WTFORMS bool "python-wtforms" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_MARKUPSAFE # runtime help A flexible forms validation and rendering library for diff --git a/package/python-xlib/Config.in b/package/python-xlib/Config.in index 20e585db9a..081af6a2fc 100644 --- a/package/python-xlib/Config.in +++ b/package/python-xlib/Config.in @@ -1,6 +1,5 @@ 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) diff --git a/package/python-xlsxwriter/Config.in b/package/python-xlsxwriter/Config.in index b5da7f3f1a..59fe3ba91c 100644 --- a/package/python-xlsxwriter/Config.in +++ b/package/python-xlsxwriter/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_XLSXWRITER bool "python-xlsxwriter" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON3_ZLIB help A Python module for creating Excel XLSX files. diff --git a/package/python-yarl/Config.in b/package/python-yarl/Config.in index e52050451d..84e14ce92e 100644 --- a/package/python-yarl/Config.in +++ b/package/python-yarl/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_YARL bool "python-yarl" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_MULTIDICT select BR2_PACKAGE_PYTHON_IDNA help diff --git a/package/python-zeroconf/Config.in b/package/python-zeroconf/Config.in index a56bf7c16c..1570674f59 100644 --- a/package/python-zeroconf/Config.in +++ b/package/python-zeroconf/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_ZEROCONF bool "python-zeroconf" - depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_IFADDR # runtime help Pure Python Multicast DNS Service Discovery Library diff --git a/package/python-zopfli/Config.in b/package/python-zopfli/Config.in index 69d4b8b514..0b1ebca85c 100644 --- a/package/python-zopfli/Config.in +++ b/package/python-zopfli/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_ZOPFLI bool "python-zopfli" - depends on BR2_PACKAGE_PYTHON3 help Zopfli module for python. -- 2.20.1 From peron.clem at gmail.com Sat Feb 12 11:17:10 2022 From: peron.clem at gmail.com (=?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?=) Date: Sat, 12 Feb 2022 12:17:10 +0100 Subject: [Buildroot] [PATCH] configs/beelink_gs1: select BR2_TARGET_UBOOT_NEEDS_OPENSSL Message-ID: <20220212111710.22559-1-peron.clem@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/2076475033 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 ca953df3ea..b7b7eb84d0 100644 --- a/configs/beelink_gs1_defconfig +++ b/configs/beelink_gs1_defconfig @@ -39,6 +39,7 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y 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_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -- 2.32.0 From james.hilliard1 at gmail.com Sat Feb 12 11:18:43 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 12 Feb 2022 04:18:43 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-setuptools: bump to version 60.8.2 Message-ID: <20220212111843.1210441-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-setuptools/python-setuptools.hash | 4 ++-- package/python-setuptools/python-setuptools.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-setuptools/python-setuptools.hash b/package/python-setuptools/python-setuptools.hash index 8df7155d4c..e04235e041 100644 --- a/package/python-setuptools/python-setuptools.hash +++ b/package/python-setuptools/python-setuptools.hash @@ -1,4 +1,4 @@ # From https://pypi.org/pypi/setuptools/json -md5 082637e8fbc2e1fd9c637665d8fcccd8 setuptools-60.7.0.tar.gz -sha256 b83cf328a4f6a987c95610e76b29a30778db05174eef71f771776c48f8f25d1b setuptools-60.7.0.tar.gz +md5 f47a5750f6084cce3418f213a9d97785 setuptools-60.8.2.tar.gz +sha256 66b8598da112b8dc8cd941d54cf63ef91d3b50657b374457eda5851f3ff6a899 setuptools-60.8.2.tar.gz sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk index 584f83f7a0..8653c42259 100644 --- a/package/python-setuptools/python-setuptools.mk +++ b/package/python-setuptools/python-setuptools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SETUPTOOLS_VERSION = 60.7.0 +PYTHON_SETUPTOOLS_VERSION = 60.8.2 PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).tar.gz -PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/29/dd/48d662bb93e5e51e72265ef612f869947d4ae4126328d7156824cd50d440 +PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/ae/0b/e458b0d07dced3d7fa2d21d828e708f374ef82040f2012c05d35f47f9af3 PYTHON_SETUPTOOLS_LICENSE = MIT PYTHON_SETUPTOOLS_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_CPE_ID_VENDOR = python -- 2.25.1 From james.hilliard1 at gmail.com Sat Feb 12 11:20:57 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 12 Feb 2022 04:20:57 -0700 Subject: [Buildroot] [PATCH] package/python-*: drop python3 dependency In-Reply-To: <20220212104349.6015-1-peter@korsgaard.com> References: <20220212104349.6015-1-peter@korsgaard.com> Message-ID: On Sat, Feb 12, 2022 at 3:44 AM Peter Korsgaard wrote: > > All the python packages are inside an if BR2_PACKAGE_PYTHON3, so with the > removal of python2 support, the explicit python3 dependency is redundant. > Remove it. > > Signed-off-by: Peter Korsgaard Reviewed-by: James Hilliard > --- > package/python-aexpect/Config.in | 1 - > package/python-aioblescan/Config.in | 1 - > package/python-aiocoap/Config.in | 1 - > package/python-aioconsole/Config.in | 1 - > package/python-aiodns/Config.in | 1 - > package/python-aiofiles/Config.in | 1 - > package/python-aiohttp-cors/Config.in | 1 - > package/python-aiohttp-debugtoolbar/Config.in | 1 - > package/python-aiohttp-jinja2/Config.in | 1 - > package/python-aiohttp-mako/Config.in | 1 - > package/python-aiohttp-remotes/Config.in | 1 - > package/python-aiohttp-security/Config.in | 1 - > package/python-aiohttp-session/Config.in | 1 - > package/python-aiohttp-sse/Config.in | 1 - > package/python-aiohttp/Config.in | 1 - > package/python-aiojobs/Config.in | 1 - > package/python-aiologstash/Config.in | 1 - > package/python-aiomonitor/Config.in | 1 - > package/python-aioprocessing/Config.in | 1 - > package/python-aioredis/Config.in | 1 - > package/python-aiorwlock/Config.in | 1 - > package/python-aiosignal/Config.in | 1 - > package/python-aiozipkin/Config.in | 1 - > package/python-argon2-cffi-bindings/Config.in | 1 - > package/python-arrow/Config.in | 1 - > package/python-asgiref/Config.in | 1 - > package/python-async-lru/Config.in | 1 - > package/python-async-timeout/Config.in | 1 - > package/python-attrs/Config.in | 1 - > package/python-autobahn/Config.in | 1 - > package/python-automat/Config.in | 1 - > package/python-avro/Config.in | 1 - > package/python-bcrypt/Config.in | 1 - > package/python-beautifulsoup4/Config.in | 1 - > package/python-bidict/Config.in | 1 - > package/python-bleak/Config.in | 1 - > package/python-bluezero/Config.in | 2 -- > package/python-boto3/Config.in | 1 - > package/python-botocore/Config.in | 1 - > package/python-cbor2/Config.in | 1 - > package/python-cchardet/Config.in | 2 -- > package/python-channels-redis/Config.in | 1 - > package/python-channels/Config.in | 1 - > package/python-charset-normalizer/Config.in | 1 - > package/python-cheroot/Config.in | 1 - > package/python-cherrypy/Config.in | 1 - > package/python-colorlog/Config.in | 1 - > package/python-colorzero/Config.in | 1 - > package/python-configshell-fb/Config.in | 1 - > package/python-crayons/Config.in | 1 - > package/python-crontab/Config.in | 1 - > package/python-crossbar/Config.in | 1 - > package/python-cryptography/Config.in | 1 - > package/python-cssselect2/Config.in | 1 - > package/python-cssutils/Config.in | 1 - > package/python-cycler/Config.in | 1 - > package/python-daphne/Config.in | 1 - > package/python-dataproperty/Config.in | 1 - > package/python-dateutil/Config.in | 1 - > package/python-dbus-next/Config.in | 1 - > package/python-decorator/Config.in | 1 - > package/python-dialog3/Config.in | 1 - > package/python-django-enumfields/Config.in | 1 - > package/python-django/Config.in | 1 - > package/python-dnspython/Config.in | 1 - > package/python-docker/Config.in | 1 - > package/python-engineio/Config.in | 1 - > package/python-falcon/Config.in | 1 - > package/python-filelock/Config.in | 1 - > package/python-flask-babel/Config.in | 1 - > package/python-flask-cors/Config.in | 1 - > package/python-flask-expects-json/Config.in | 1 - > package/python-flask-jsonrpc/Config.in | 1 - > package/python-flask-login/Config.in | 1 - > package/python-flask-sqlalchemy/Config.in | 1 - > package/python-flask-wtf/Config.in | 1 - > package/python-flup/Config.in | 1 - > package/python-fonttools/Config.in | 1 - > package/python-frozenlist/Config.in | 1 - > package/python-git/Config.in | 1 - > package/python-gitdb2/Config.in | 1 - > package/python-gobject/Config.in | 1 - > package/python-gpiozero/Config.in | 1 - > package/python-gunicorn/Config.in | 1 - > package/python-h2/Config.in | 1 - > package/python-hiredis/Config.in | 1 - > package/python-hpack/Config.in | 1 - > package/python-httplib2/Config.in | 1 - > package/python-humanize/Config.in | 1 - > package/python-hyperframe/Config.in | 1 - > package/python-hyperlink/Config.in | 1 - > package/python-ibmiotf/Config.in | 1 - > package/python-idna/Config.in | 1 - > package/python-inflection/Config.in | 1 - > package/python-influxdb/Config.in | 1 - > package/python-ipdb/Config.in | 1 - > package/python-ipython/Config.in | 1 - > package/python-itsdangerous/Config.in | 1 - > package/python-janus/Config.in | 1 - > package/python-jaraco-classes/Config.in | 1 - > package/python-jaraco-functools/Config.in | 1 - > package/python-jedi/Config.in | 1 - > package/python-jinja2/Config.in | 1 - > package/python-jsonmodels/Config.in | 1 - > package/python-keyring/Config.in | 1 - > package/python-libusb1/Config.in | 2 -- > package/python-markdown/Config.in | 1 - > package/python-markdown2/Config.in | 1 - > package/python-markupsafe/Config.in | 1 - > package/python-matplotlib/Config.in | 1 - > package/python-mbstrdecoder/Config.in | 1 - > package/python-memory-profiler/Config.in | 1 - > package/python-more-itertools/Config.in | 1 - > package/python-mpd2/Config.in | 1 - > package/python-msgfy/Config.in | 1 - > package/python-multidict/Config.in | 1 - > package/python-mutagen/Config.in | 1 - > package/python-mwclient/Config.in | 1 - > package/python-mwscrape/Config.in | 1 - > package/python-mwscrape2slob/Config.in | 2 -- > package/python-networkx/Config.in | 1 - > package/python-numpy/Config.in | 2 -- > package/python-oauthlib/Config.in | 1 - > package/python-opcua-asyncio/Config.in | 1 - > package/python-packaging/Config.in | 1 - > package/python-paramiko/Config.in | 1 - > package/python-parso/Config.in | 1 - > package/python-pathpy/Config.in | 1 - > package/python-pathvalidate/Config.in | 1 - > package/python-piexif/Config.in | 1 - > package/python-pillow/Config.in | 1 - > package/python-pip/Config.in | 1 - > package/python-pluggy/Config.in | 1 - > package/python-portend/Config.in | 1 - > package/python-priority/Config.in | 1 - > package/python-prompt-toolkit/Config.in | 1 - > package/python-protobuf/Config.in | 1 - > package/python-psycopg2/Config.in | 2 -- > package/python-pudb/Config.in | 1 - > package/python-py/Config.in | 1 - > package/python-pybind/Config.in | 1 - > package/python-pycairo/Config.in | 1 - > package/python-pycares/Config.in | 1 - > package/python-pycups/Config.in | 1 - > package/python-pydantic/Config.in | 1 - > package/python-pydyf/Config.in | 1 - > package/python-pygments/Config.in | 1 - > package/python-pyhamcrest/Config.in | 1 - > package/python-pyjwt/Config.in | 1 - > package/python-pymupdf/Config.in | 3 --- > package/python-pymysql/Config.in | 1 - > package/python-pynacl/Config.in | 1 - > package/python-pyndiff/Config.in | 1 - > package/python-pyopenssl/Config.in | 1 - > package/python-pyparsing/Config.in | 1 - > package/python-pyparted/Config.in | 2 -- > package/python-pyphen/Config.in | 1 - > package/python-pysftp/Config.in | 1 - > package/python-pytablereader/Config.in | 1 - > package/python-pytablewriter/Config.in | 1 - > package/python-pytest-asyncio/Config.in | 1 - > package/python-pytest/Config.in | 1 - > package/python-pytrie/Config.in | 1 - > package/python-pyusb/Config.in | 1 - > package/python-pyyaml/Config.in | 1 - > package/python-requests-oauthlib/Config.in | 1 - > package/python-requests-toolbelt/Config.in | 1 - > package/python-requests/Config.in | 1 - > package/python-rsa/Config.in | 1 - > package/python-s3transfer/Config.in | 1 - > package/python-schedule/Config.in | 1 - > package/python-secretstorage/Config.in | 1 - > package/python-serial-asyncio/Config.in | 1 - > package/python-service-identity/Config.in | 1 - > package/python-setproctitle/Config.in | 1 - > package/python-simpleaudio/Config.in | 1 - > package/python-simplelogging/Config.in | 1 - > package/python-simplesqlite/Config.in | 1 - > package/python-slob/Config.in | 2 -- > package/python-smmap2/Config.in | 1 - > package/python-socketio/Config.in | 1 - > package/python-sockjs/Config.in | 1 - > package/python-soupsieve/Config.in | 1 - > package/python-sqliteschema/Config.in | 1 - > package/python-tabledata/Config.in | 1 - > package/python-tempora/Config.in | 1 - > package/python-tinycss2/Config.in | 1 - > package/python-tinyrpc/Config.in | 1 - > package/python-tomako/Config.in | 1 - > package/python-tomli/Config.in | 1 - > package/python-tornado/Config.in | 1 - > package/python-traitlets/Config.in | 1 - > package/python-treq/Config.in | 1 - > package/python-twisted/Config.in | 1 - > package/python-txaio/Config.in | 1 - > package/python-txdbus/Config.in | 1 - > package/python-txtorcon/Config.in | 1 - > package/python-typepy/Config.in | 1 - > package/python-ujson/Config.in | 1 - > package/python-unittest-xml-reporting/Config.in | 1 - > package/python-urwid/Config.in | 1 - > package/python-uvloop/Config.in | 1 - > package/python-validators/Config.in | 1 - > package/python-watchdog/Config.in | 1 - > package/python-weasyprint/Config.in | 1 - > package/python-webpy/Config.in | 1 - > package/python-websockets/Config.in | 1 - > package/python-wtforms/Config.in | 1 - > package/python-xlib/Config.in | 1 - > package/python-xlsxwriter/Config.in | 1 - > package/python-yarl/Config.in | 1 - > package/python-zeroconf/Config.in | 1 - > package/python-zopfli/Config.in | 1 - > 213 files changed, 223 deletions(-) > > diff --git a/package/python-aexpect/Config.in b/package/python-aexpect/Config.in > index eddba8e0b7..cc805da657 100644 > --- a/package/python-aexpect/Config.in > +++ b/package/python-aexpect/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_AEXPECT > bool "python-aexpect" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_SIX # runtime > help > Aexpect. > diff --git a/package/python-aioblescan/Config.in b/package/python-aioblescan/Config.in > index dd1acfa095..8f6db48a8b 100644 > --- a/package/python-aioblescan/Config.in > +++ b/package/python-aioblescan/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_AIOBLESCAN > bool "python-aioblescan" > - depends on BR2_PACKAGE_PYTHON3 > help > Scanning Bluetooth for advertised info with asyncio. > > diff --git a/package/python-aiocoap/Config.in b/package/python-aiocoap/Config.in > index cf5ca4e844..c46614324f 100644 > --- a/package/python-aiocoap/Config.in > +++ b/package/python-aiocoap/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_AIOCOAP > bool "python-aiocoap" > - depends on BR2_PACKAGE_PYTHON3 > help > Python CoAP library. > > diff --git a/package/python-aioconsole/Config.in b/package/python-aioconsole/Config.in > index cd52eecf32..6b2a15e115 100644 > --- a/package/python-aioconsole/Config.in > +++ b/package/python-aioconsole/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_AIOCONSOLE > bool "python-aioconsole" > - depends on BR2_PACKAGE_PYTHON3 > help > Asynchronous console and interfaces for asyncio. > > diff --git a/package/python-aiodns/Config.in b/package/python-aiodns/Config.in > index aa5970598f..63c2429390 100644 > --- a/package/python-aiodns/Config.in > +++ b/package/python-aiodns/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_AIODNS > bool "python-aiodns" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_PYCARES # runtime > help > Simple DNS resolver for asyncio. > diff --git a/package/python-aiofiles/Config.in b/package/python-aiofiles/Config.in > index 9cc3d7fe59..1e6add5358 100644 > --- a/package/python-aiofiles/Config.in > +++ b/package/python-aiofiles/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_AIOFILES > bool "python-aiofiles" > - depends on BR2_PACKAGE_PYTHON3 > help > aiofiles aims to handle local disk files in > asyncio applications. > diff --git a/package/python-aiohttp-cors/Config.in b/package/python-aiohttp-cors/Config.in > index 1c97cf3f87..dea3b44080 100644 > --- a/package/python-aiohttp-cors/Config.in > +++ b/package/python-aiohttp-cors/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_AIOHTTP_CORS > bool "python-aiohttp-cors" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_AIOHTTP # runtime > help > CORS support for aiohttp. > diff --git a/package/python-aiohttp-debugtoolbar/Config.in b/package/python-aiohttp-debugtoolbar/Config.in > index b22d2cf946..e2fede8065 100644 > --- a/package/python-aiohttp-debugtoolbar/Config.in > +++ b/package/python-aiohttp-debugtoolbar/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_AIOHTTP_DEBUGTOOLBAR > bool "python-aiohttp-debugtoolbar" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_AIOHTTP # runtime > select BR2_PACKAGE_PYTHON_AIOHTTP_JINJA2 # runtime > help > diff --git a/package/python-aiohttp-jinja2/Config.in b/package/python-aiohttp-jinja2/Config.in > index dd4bb0d23b..a536825b7e 100644 > --- a/package/python-aiohttp-jinja2/Config.in > +++ b/package/python-aiohttp-jinja2/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_AIOHTTP_JINJA2 > bool "python-aiohttp-jinja2" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_AIOHTTP # runtime > select BR2_PACKAGE_PYTHON_JINJA2 # runtime > help > diff --git a/package/python-aiohttp-mako/Config.in b/package/python-aiohttp-mako/Config.in > index 8c5df6a481..4dae5d95ad 100644 > --- a/package/python-aiohttp-mako/Config.in > +++ b/package/python-aiohttp-mako/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_AIOHTTP_MAKO > bool "python-aiohttp-mako" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_AIOHTTP # runtime > select BR2_PACKAGE_PYTHON_MAKO # runtime > help > diff --git a/package/python-aiohttp-remotes/Config.in b/package/python-aiohttp-remotes/Config.in > index e44696ba1e..7208e373ad 100644 > --- a/package/python-aiohttp-remotes/Config.in > +++ b/package/python-aiohttp-remotes/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_AIOHTTP_REMOTES > bool "python-aiohttp-remotes" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_AIOHTTP # runtime > help > Control remote side information. > diff --git a/package/python-aiohttp-security/Config.in b/package/python-aiohttp-security/Config.in > index f92c458584..96204d7e22 100644 > --- a/package/python-aiohttp-security/Config.in > +++ b/package/python-aiohttp-security/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_AIOHTTP_SECURITY > bool "python-aiohttp-security" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_AIOHTTP # runtime > help > Security for aiohttp.web. > diff --git a/package/python-aiohttp-session/Config.in b/package/python-aiohttp-session/Config.in > index c148165f00..99c01794a7 100644 > --- a/package/python-aiohttp-session/Config.in > +++ b/package/python-aiohttp-session/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_AIOHTTP_SESSION > bool "python-aiohttp-session" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_AIOHTTP # runtime > help > Sessions for aiohttp.web. > diff --git a/package/python-aiohttp-sse/Config.in b/package/python-aiohttp-sse/Config.in > index 781bbf4de7..6e408b7e12 100644 > --- a/package/python-aiohttp-sse/Config.in > +++ b/package/python-aiohttp-sse/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_AIOHTTP_SSE > bool "python-aiohttp-sse" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_AIOHTTP # runtime > help > Server-sent events support for aiohttp. > diff --git a/package/python-aiohttp/Config.in b/package/python-aiohttp/Config.in > index 85a6862141..35c162b948 100644 > --- a/package/python-aiohttp/Config.in > +++ b/package/python-aiohttp/Config.in > @@ -1,6 +1,5 @@ > 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 > diff --git a/package/python-aiojobs/Config.in b/package/python-aiojobs/Config.in > index ab61985164..0cdd1c106f 100644 > --- a/package/python-aiojobs/Config.in > +++ b/package/python-aiojobs/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_AIOJOBS > bool "python-aiojobs" > - depends on BR2_PACKAGE_PYTHON3 > help > Jobs scheduler for managing background task (asyncio). > > diff --git a/package/python-aiologstash/Config.in b/package/python-aiologstash/Config.in > index e70c232fd2..ce7ebe03cd 100644 > --- a/package/python-aiologstash/Config.in > +++ b/package/python-aiologstash/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_AIOLOGSTASH > bool "python-aiologstash" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_ASYNC_TIMEOUT # runtime > select BR2_PACKAGE_PYTHON_LOGSTASH # runtime > help > diff --git a/package/python-aiomonitor/Config.in b/package/python-aiomonitor/Config.in > index c76c952c82..435900ae32 100644 > --- a/package/python-aiomonitor/Config.in > +++ b/package/python-aiomonitor/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_AIOMONITOR > bool "python-aiomonitor" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_TERMINALTABLES # runtime > select BR2_PACKAGE_PYTHON_AIOCONSOLE # runtime > help > diff --git a/package/python-aioprocessing/Config.in b/package/python-aioprocessing/Config.in > index 2e76bc562b..381805c759 100644 > --- a/package/python-aioprocessing/Config.in > +++ b/package/python-aioprocessing/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_AIOPROCESSING > bool "python-aioprocessing" > - depends on BR2_PACKAGE_PYTHON3 > help > A Python 3.5+ library that integrates the multiprocessing > module with asyncio. > diff --git a/package/python-aioredis/Config.in b/package/python-aioredis/Config.in > index dc2ee01d9a..46ed2c7a46 100644 > --- a/package/python-aioredis/Config.in > +++ b/package/python-aioredis/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_AIOREDIS > bool "python-aioredis" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_ASYNC_TIMEOUT # runtime > select BR2_PACKAGE_PYTHON_HIREDIS # runtime > help > diff --git a/package/python-aiorwlock/Config.in b/package/python-aiorwlock/Config.in > index afdc27dd6f..3b61890555 100644 > --- a/package/python-aiorwlock/Config.in > +++ b/package/python-aiorwlock/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_AIORWLOCK > bool "python-aiorwlock" > - depends on BR2_PACKAGE_PYTHON3 > help > Read write lock for asyncio. > > diff --git a/package/python-aiosignal/Config.in b/package/python-aiosignal/Config.in > index 6b7753defd..9bb2998304 100644 > --- a/package/python-aiosignal/Config.in > +++ b/package/python-aiosignal/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_AIOSIGNAL > bool "python-aiosignal" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_FROZENLIST # runtime > help > aiosignal: a list of registered asynchronous callbacks. > diff --git a/package/python-aiozipkin/Config.in b/package/python-aiozipkin/Config.in > index 643fc9a4da..6ce6d86b6e 100644 > --- a/package/python-aiozipkin/Config.in > +++ b/package/python-aiozipkin/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_AIOZIPKIN > bool "python-aiozipkin" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_AIOHTTP # runtime > help > Distributed tracing instrumentation for asyncio application > diff --git a/package/python-argon2-cffi-bindings/Config.in b/package/python-argon2-cffi-bindings/Config.in > index 3d409759e0..2e6a4a6c96 100644 > --- a/package/python-argon2-cffi-bindings/Config.in > +++ b/package/python-argon2-cffi-bindings/Config.in > @@ -1,6 +1,5 @@ > 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 > diff --git a/package/python-arrow/Config.in b/package/python-arrow/Config.in > index aed9a682ff..244956879c 100644 > --- a/package/python-arrow/Config.in > +++ b/package/python-arrow/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_ARROW > bool "python-arrow" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_DATEUTIL # runtime > help > Better dates and times for Python. > diff --git a/package/python-asgiref/Config.in b/package/python-asgiref/Config.in > index e131f476c2..d0b816c369 100644 > --- a/package/python-asgiref/Config.in > +++ b/package/python-asgiref/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_ASGIREF > bool "python-asgiref" > - depends on BR2_PACKAGE_PYTHON3 > help > ASGI is a standard for Python asynchronous web apps and > servers to communicate with each other, and positioned as > diff --git a/package/python-async-lru/Config.in b/package/python-async-lru/Config.in > index 794f504e5e..dc44e8cd11 100644 > --- a/package/python-async-lru/Config.in > +++ b/package/python-async-lru/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_ASYNC_LRU > bool "python-async-lru" > - depends on BR2_PACKAGE_PYTHON3 > help > Simple lru_cache for asyncio. > > diff --git a/package/python-async-timeout/Config.in b/package/python-async-timeout/Config.in > index 27cfe51f7b..d19f15b3c6 100644 > --- a/package/python-async-timeout/Config.in > +++ b/package/python-async-timeout/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_ASYNC_TIMEOUT > bool "python-async-timeout" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime > help > asyncio-compatible timeout context manager. > diff --git a/package/python-attrs/Config.in b/package/python-attrs/Config.in > index b1a69d0e3e..fb0ab248fa 100644 > --- a/package/python-attrs/Config.in > +++ b/package/python-attrs/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_ATTRS > bool "python-attrs" > - depends on BR2_PACKAGE_PYTHON3 > help > attrs is the Python package that will bring back the joy of > writing classes by relieving you from the drudgery of > diff --git a/package/python-autobahn/Config.in b/package/python-autobahn/Config.in > index 92ddad0ea4..627bcd73e5 100644 > --- a/package/python-autobahn/Config.in > +++ b/package/python-autobahn/Config.in > @@ -1,7 +1,6 @@ > config BR2_PACKAGE_PYTHON_AUTOBAHN > bool "python-autobahn" > 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 > select BR2_PACKAGE_PYTHON_HYPERLINK # runtime > diff --git a/package/python-automat/Config.in b/package/python-automat/Config.in > index 9d22276c2c..ee02d22b5b 100644 > --- a/package/python-automat/Config.in > +++ b/package/python-automat/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_AUTOMAT > bool "python-automat" > - depends on BR2_PACKAGE_PYTHON3 # python-attrs > select BR2_PACKAGE_PYTHON_ATTRS # runtime > select BR2_PACKAGE_PYTHON_SIX # runtime > help > diff --git a/package/python-avro/Config.in b/package/python-avro/Config.in > index e1d7fc832c..1f67732ce0 100644 > --- a/package/python-avro/Config.in > +++ b/package/python-avro/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_AVRO > bool "python-avro" > - depends on BR2_PACKAGE_PYTHON3 > help > Select this option to install the Avro Python3 language > bindings, and the `avro` command line tool > diff --git a/package/python-bcrypt/Config.in b/package/python-bcrypt/Config.in > index 81becad322..9e9864e9d2 100644 > --- a/package/python-bcrypt/Config.in > +++ b/package/python-bcrypt/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_BCRYPT > bool "python-bcrypt" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_CFFI # runtime > help > Modern password hashing for your software and your servers. > diff --git a/package/python-beautifulsoup4/Config.in b/package/python-beautifulsoup4/Config.in > index 93fa540a73..eb7d2ba673 100644 > --- a/package/python-beautifulsoup4/Config.in > +++ b/package/python-beautifulsoup4/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_BEAUTIFULSOUP4 > bool "python-beautifulsoup4" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_SOUPSIEVE # runtime > help > Beautiful Soup is a Python library for pulling data out of > diff --git a/package/python-bidict/Config.in b/package/python-bidict/Config.in > index adbfda69b8..dfc55b87dd 100644 > --- a/package/python-bidict/Config.in > +++ b/package/python-bidict/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_BIDICT > bool "python-bidict" > - depends on BR2_PACKAGE_PYTHON3 > help > The bidirectional mapping library for Python. > > diff --git a/package/python-bleak/Config.in b/package/python-bleak/Config.in > index 43ed65d752..085c16fae8 100644 > --- a/package/python-bleak/Config.in > +++ b/package/python-bleak/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_BLEAK > bool "python-bleak" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_DBUS_NEXT # runtime > help > Bluetooth Low Energy platform Agnostic Klient. > diff --git a/package/python-bluezero/Config.in b/package/python-bluezero/Config.in > index d617b96d67..fa0998a298 100644 > --- a/package/python-bluezero/Config.in > +++ b/package/python-bluezero/Config.in > @@ -4,7 +4,6 @@ config BR2_PACKAGE_PYTHON_BLUEZERO > depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # python-gobject -> gobject-introspection > 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_PYTHON3 > select BR2_PACKAGE_DBUS # runtime > select BR2_PACKAGE_DBUS_PYTHON # runtime > select BR2_PACKAGE_PYTHON_GOBJECT # runtime > @@ -14,7 +13,6 @@ config BR2_PACKAGE_PYTHON_BLUEZERO > https://github.com/ukBaz/python-bluezero > > comment "python-bluezero needs a glibc toolchain, gcc >= 4.9, host gcc >= 8" > - depends on BR2_PACKAGE_PYTHON3 > depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS > depends on !BR2_TOOLCHAIN_USES_GLIBC || \ > !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ > diff --git a/package/python-boto3/Config.in b/package/python-boto3/Config.in > index 1cb1ebfd12..67b1420388 100644 > --- a/package/python-boto3/Config.in > +++ b/package/python-boto3/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_BOTO3 > bool "python-boto3" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_BOTOCORE # runtime > select BR2_PACKAGE_PYTHON_JMESPATH # runtime > select BR2_PACKAGE_PYTHON_S3TRANSFER # runtime > diff --git a/package/python-botocore/Config.in b/package/python-botocore/Config.in > index 51cb660477..cc5e32b504 100644 > --- a/package/python-botocore/Config.in > +++ b/package/python-botocore/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_BOTOCORE > bool "python-botocore" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_DATEUTIL # runtime > select BR2_PACKAGE_PYTHON_JMESPATH # runtime > select BR2_PACKAGE_PYTHON_URLLIB3 # runtime > diff --git a/package/python-cbor2/Config.in b/package/python-cbor2/Config.in > index e35e37f018..ba9383f787 100644 > --- a/package/python-cbor2/Config.in > +++ b/package/python-cbor2/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_CBOR2 > bool "python-cbor2" > - depends on BR2_PACKAGE_PYTHON3 > help > Pure Python CBOR (de)serializer with extensive tag support. > > diff --git a/package/python-cchardet/Config.in b/package/python-cchardet/Config.in > index 0f8645aafe..74153126fb 100644 > --- a/package/python-cchardet/Config.in > +++ b/package/python-cchardet/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_CCHARDET > bool "python-cchardet" > - depends on BR2_PACKAGE_PYTHON3 > depends on BR2_INSTALL_LIBSTDCPP > help > cChardet is high speed universal character encoding > @@ -9,5 +8,4 @@ config BR2_PACKAGE_PYTHON_CCHARDET > https://github.com/PyYoshi/cChardet > > comment "python-cchardet needs a toolchain w/ C++" > - depends on BR2_PACKAGE_PYTHON3 > depends on !BR2_INSTALL_LIBSTDCPP > diff --git a/package/python-channels-redis/Config.in b/package/python-channels-redis/Config.in > index bab801d2a9..d25f8ffe31 100644 > --- a/package/python-channels-redis/Config.in > +++ b/package/python-channels-redis/Config.in > @@ -2,7 +2,6 @@ config BR2_PACKAGE_PYTHON_CHANNELS_REDIS > bool "python-channels-redis" > # 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 > select BR2_PACKAGE_PYTHON_CHANNELS # runtime > diff --git a/package/python-channels/Config.in b/package/python-channels/Config.in > index 6cd6e5f60d..b94f53ceaa 100644 > --- a/package/python-channels/Config.in > +++ b/package/python-channels/Config.in > @@ -2,7 +2,6 @@ config BR2_PACKAGE_PYTHON_CHANNELS > bool "python-channels" > # 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 > select BR2_PACKAGE_PYTHON_DJANGO # runtime > diff --git a/package/python-charset-normalizer/Config.in b/package/python-charset-normalizer/Config.in > index c4c40fc99b..63e04a7a33 100644 > --- a/package/python-charset-normalizer/Config.in > +++ b/package/python-charset-normalizer/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_CHARSET_NORMALIZER > bool "python-charset-normalizer" > - depends on BR2_PACKAGE_PYTHON3 > help > The Real First Universal Charset Detector. Open, modern and > actively maintained alternative to Chardet. > diff --git a/package/python-cheroot/Config.in b/package/python-cheroot/Config.in > index 45dd2d8a11..bb9b4abbc3 100644 > --- a/package/python-cheroot/Config.in > +++ b/package/python-cheroot/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_CHEROOT > bool "python-cheroot" > - depends on BR2_PACKAGE_PYTHON3 # python-more-itertools, python-jaraco-functools > select BR2_PACKAGE_PYTHON_SIX # runtime > select BR2_PACKAGE_PYTHON_MORE_ITERTOOLS # runtime > select BR2_PACKAGE_PYTHON_JARACO_FUNCTOOLS # runtime > diff --git a/package/python-cherrypy/Config.in b/package/python-cherrypy/Config.in > index eb83054be3..7548dcf91b 100644 > --- a/package/python-cherrypy/Config.in > +++ b/package/python-cherrypy/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_CHERRYPY > bool "python-cherrypy" > - depends on BR2_PACKAGE_PYTHON3 # python-cheroot, python-portend > select BR2_PACKAGE_PYTHON_CHEROOT # runtime > select BR2_PACKAGE_PYTHON_JARACO_CLASSES # runtime > select BR2_PACKAGE_PYTHON_PORTEND # runtime > diff --git a/package/python-colorlog/Config.in b/package/python-colorlog/Config.in > index e191ae82ac..673f97aad2 100644 > --- a/package/python-colorlog/Config.in > +++ b/package/python-colorlog/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_COLORLOG > bool "python-colorlog" > - depends on BR2_PACKAGE_PYTHON3 > help > Log formatting with colors. > > diff --git a/package/python-colorzero/Config.in b/package/python-colorzero/Config.in > index a1deada5fc..b2ef711fbe 100644 > --- a/package/python-colorzero/Config.in > +++ b/package/python-colorzero/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_COLORZERO > bool "python-colorzero" > - depends on BR2_PACKAGE_PYTHON3 > help > A color manipulation library for Python. > > diff --git a/package/python-configshell-fb/Config.in b/package/python-configshell-fb/Config.in > index a0326e9150..ed7f9e0234 100644 > --- a/package/python-configshell-fb/Config.in > +++ b/package/python-configshell-fb/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_CONFIGSHELL_FB > bool "python-configshell-fb" > - depends on BR2_PACKAGE_PYTHON3 # python-urwid > select BR2_PACKAGE_PYTHON_PYPARSING > select BR2_PACKAGE_PYTHON3_READLINE > select BR2_PACKAGE_PYTHON_SIX > diff --git a/package/python-crayons/Config.in b/package/python-crayons/Config.in > index 10f3ece009..865a142b4c 100644 > --- a/package/python-crayons/Config.in > +++ b/package/python-crayons/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_CRAYONS > bool "python-crayons" > - depends on BR2_PACKAGE_PYTHON3 > help > This module is really simple, it gives you > colored strings for terminal usage. > diff --git a/package/python-crontab/Config.in b/package/python-crontab/Config.in > index 7514a3866b..102dbbdb6b 100644 > --- a/package/python-crontab/Config.in > +++ b/package/python-crontab/Config.in > @@ -1,6 +1,5 @@ > 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-crossbar/Config.in b/package/python-crossbar/Config.in > index b72d64c19d..9625d9ce8e 100644 > --- a/package/python-crossbar/Config.in > +++ b/package/python-crossbar/Config.in > @@ -1,7 +1,6 @@ > config BR2_PACKAGE_PYTHON_CROSSBAR > bool "python-crossbar" > 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 > select BR2_PACKAGE_PYTHON_AUTOBAHN > diff --git a/package/python-cryptography/Config.in b/package/python-cryptography/Config.in > index 07a22bf846..213aa24fa8 100644 > --- a/package/python-cryptography/Config.in > +++ b/package/python-cryptography/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_CRYPTOGRAPHY > bool "python-cryptography" > - depends on BR2_PACKAGE_PYTHON3 > depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS > select BR2_PACKAGE_OPENSSL > select BR2_PACKAGE_PYTHON_CFFI # runtime > diff --git a/package/python-cssselect2/Config.in b/package/python-cssselect2/Config.in > index 0196471253..030d6df0de 100644 > --- a/package/python-cssselect2/Config.in > +++ b/package/python-cssselect2/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_CSSSELECT2 > bool "python-cssselect2" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_TINYCSS2 # runtime > select BR2_PACKAGE_PYTHON_WEBENCODINGS # runtime > help > diff --git a/package/python-cssutils/Config.in b/package/python-cssutils/Config.in > index 141561901c..1c23a587f6 100644 > --- a/package/python-cssutils/Config.in > +++ b/package/python-cssutils/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_CSSUTILS > bool "python-cssutils" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime > help > A CSS Cascading Style Sheets library for Python. > diff --git a/package/python-cycler/Config.in b/package/python-cycler/Config.in > index 39ff23e45f..813bc69dd4 100644 > --- a/package/python-cycler/Config.in > +++ b/package/python-cycler/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_CYCLER > bool "python-cycler" > - depends on BR2_PACKAGE_PYTHON3 > help > Creates a Cycler objects much like cycler, but > includes input validation. > diff --git a/package/python-daphne/Config.in b/package/python-daphne/Config.in > index c4479417e9..51c66532f0 100644 > --- a/package/python-daphne/Config.in > +++ b/package/python-daphne/Config.in > @@ -2,7 +2,6 @@ config BR2_PACKAGE_PYTHON_DAPHNE > bool "python-daphne" > # 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 > select BR2_PACKAGE_PYTHON_TWISTED # runtime > diff --git a/package/python-dataproperty/Config.in b/package/python-dataproperty/Config.in > index 3de9cc685e..9dab9e4f64 100644 > --- a/package/python-dataproperty/Config.in > +++ b/package/python-dataproperty/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_DATAPROPERTY > bool "python-dataproperty" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime > select BR2_PACKAGE_PYTHON_TYPEPY # runtime > help > diff --git a/package/python-dateutil/Config.in b/package/python-dateutil/Config.in > index bbf61f6813..1a36a150b1 100644 > --- a/package/python-dateutil/Config.in > +++ b/package/python-dateutil/Config.in > @@ -1,6 +1,5 @@ > 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-dbus-next/Config.in b/package/python-dbus-next/Config.in > index bafead8986..6b00e70765 100644 > --- a/package/python-dbus-next/Config.in > +++ b/package/python-dbus-next/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_DBUS_NEXT > bool "python-dbus-next" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime > help > A zero-dependency DBus library for Python with asyncio > diff --git a/package/python-decorator/Config.in b/package/python-decorator/Config.in > index 0e84840657..e7ec00cd69 100644 > --- a/package/python-decorator/Config.in > +++ b/package/python-decorator/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_DECORATOR > bool "python-decorator" > - depends on BR2_PACKAGE_PYTHON3 > help > Better living through Python with decorators > > diff --git a/package/python-dialog3/Config.in b/package/python-dialog3/Config.in > index cd0760854b..86812d2764 100644 > --- a/package/python-dialog3/Config.in > +++ b/package/python-dialog3/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_DIALOG3 > bool "python-dialog3" > - depends on BR2_PACKAGE_PYTHON3 > depends on BR2_USE_MMU # dialog > select BR2_PACKAGE_DIALOG > help > diff --git a/package/python-django-enumfields/Config.in b/package/python-django-enumfields/Config.in > index 51efbcbf53..e7236d130a 100644 > --- a/package/python-django-enumfields/Config.in > +++ b/package/python-django-enumfields/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_DJANGO_ENUMFIELDS > bool "python-django-enumfields" > - depends on BR2_PACKAGE_PYTHON3 > help > Real Python Enums for Django. > > diff --git a/package/python-django/Config.in b/package/python-django/Config.in > index 6748d42e1a..8ffceb7275 100644 > --- a/package/python-django/Config.in > +++ b/package/python-django/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_DJANGO > bool "python-django" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON3_UNICODEDATA > select BR2_PACKAGE_PYTHON3_PYEXPAT > select BR2_PACKAGE_PYTHON_ASGIREF # runtime > diff --git a/package/python-dnspython/Config.in b/package/python-dnspython/Config.in > index da9b959366..99fd6a9a5f 100644 > --- a/package/python-dnspython/Config.in > +++ b/package/python-dnspython/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_DNSPYTHON > bool "python-dnspython" > - depends on BR2_PACKAGE_PYTHON3 > help > A powerful DNS toolkit for python. > > diff --git a/package/python-docker/Config.in b/package/python-docker/Config.in > index 41b4aacd5e..b2296f42eb 100644 > --- a/package/python-docker/Config.in > +++ b/package/python-docker/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_DOCKER > bool "python-docker" > - depends on BR2_PACKAGE_PYTHON3 # python-requests -> python-idna > # docker-engine may be running on another host, so no other dependency > select BR2_PACKAGE_PYTHON3_SSL # runtime > select BR2_PACKAGE_PYTHON_REQUESTS # runtime > diff --git a/package/python-engineio/Config.in b/package/python-engineio/Config.in > index 48f3391e53..b42b609e0d 100644 > --- a/package/python-engineio/Config.in > +++ b/package/python-engineio/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_ENGINEIO > bool "python-engineio" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON3_ZLIB > help > Engine.IO server. > diff --git a/package/python-falcon/Config.in b/package/python-falcon/Config.in > index f90ef55b30..1bf93064bb 100644 > --- a/package/python-falcon/Config.in > +++ b/package/python-falcon/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_FALCON > bool "python-falcon" > - depends on BR2_PACKAGE_PYTHON3 > help > An unladen web framework for building APIs and app > backends. > diff --git a/package/python-filelock/Config.in b/package/python-filelock/Config.in > index bda4582ac1..57ec039400 100644 > --- a/package/python-filelock/Config.in > +++ b/package/python-filelock/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_FILELOCK > bool "python-filelock" > - depends on BR2_PACKAGE_PYTHON3 > help > A platform independent file lock. > > diff --git a/package/python-flask-babel/Config.in b/package/python-flask-babel/Config.in > index 52f05f1e6a..272d9ef1c1 100644 > --- a/package/python-flask-babel/Config.in > +++ b/package/python-flask-babel/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_FLASK_BABEL > bool "python-flask-babel" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_FLASK # runtime > select BR2_PACKAGE_PYTHON_BABEL # runtime > select BR2_PACKAGE_PYTHON_JINJA2 # runtime > diff --git a/package/python-flask-cors/Config.in b/package/python-flask-cors/Config.in > index f34f77e5b0..e2e84797f9 100644 > --- a/package/python-flask-cors/Config.in > +++ b/package/python-flask-cors/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_FLASK_CORS > bool "python-flask-cors" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_FLASK # runtime > select BR2_PACKAGE_PYTHON_SIX # runtime > help > diff --git a/package/python-flask-expects-json/Config.in b/package/python-flask-expects-json/Config.in > index efe4c248d3..901234762e 100644 > --- a/package/python-flask-expects-json/Config.in > +++ b/package/python-flask-expects-json/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_FLASK_EXPECTS_JSON > bool "python-flask-expects-json" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_FLASK # runtime > select BR2_PACKAGE_PYTHON_JSONSCHEMA # runtime > help > diff --git a/package/python-flask-jsonrpc/Config.in b/package/python-flask-jsonrpc/Config.in > index 4bc13f9bcb..c8ecd854b3 100644 > --- a/package/python-flask-jsonrpc/Config.in > +++ b/package/python-flask-jsonrpc/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_FLASK_JSONRPC > bool "python-flask-jsonrpc" > - depends on BR2_PACKAGE_PYTHON3 > # runtime dependency > select BR2_PACKAGE_PYTHON_FLASK > help > diff --git a/package/python-flask-login/Config.in b/package/python-flask-login/Config.in > index 00fa58d783..88c413e2a2 100644 > --- a/package/python-flask-login/Config.in > +++ b/package/python-flask-login/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_FLASK_LOGIN > bool "python-flask-login" > - depends on BR2_PACKAGE_PYTHON3 > # runtime dependency > select BR2_PACKAGE_PYTHON_FLASK > help > diff --git a/package/python-flask-sqlalchemy/Config.in b/package/python-flask-sqlalchemy/Config.in > index e96bd7078c..fa4a035110 100644 > --- a/package/python-flask-sqlalchemy/Config.in > +++ b/package/python-flask-sqlalchemy/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_FLASK_SQLALCHEMY > bool "python-flask-sqlalchemy" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_FLASK # runtime > select BR2_PACKAGE_PYTHON_SQLALCHEMY # runtime > help > diff --git a/package/python-flask-wtf/Config.in b/package/python-flask-wtf/Config.in > index 18329d0776..4a8566a26a 100644 > --- a/package/python-flask-wtf/Config.in > +++ b/package/python-flask-wtf/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_FLASK_WTF > bool "python-flask-wtf" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_FLASK # runtime > select BR2_PACKAGE_PYTHON_ITSDANGEROUS # runtime > select BR2_PACKAGE_PYTHON_WTFORMS # runtime > diff --git a/package/python-flup/Config.in b/package/python-flup/Config.in > index f40f250163..50d1dfa3ac 100644 > --- a/package/python-flup/Config.in > +++ b/package/python-flup/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_FLUP > bool "python-flup" > - depends on BR2_PACKAGE_PYTHON3 > help > flup provides of a collection of WSGI modules for Python. > It allows a webserver to use scgi-mod and fastcgi-mod > diff --git a/package/python-fonttools/Config.in b/package/python-fonttools/Config.in > index 714f547430..64de1efe5f 100644 > --- a/package/python-fonttools/Config.in > +++ b/package/python-fonttools/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_FONTTOOLS > bool "python-fonttools" > - depends on BR2_PACKAGE_PYTHON3 > help > Tools to manipulate font files. > > diff --git a/package/python-frozenlist/Config.in b/package/python-frozenlist/Config.in > index 67a58b40ca..05714199ca 100644 > --- a/package/python-frozenlist/Config.in > +++ b/package/python-frozenlist/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_FROZENLIST > bool "python-frozenlist" > - depends on BR2_PACKAGE_PYTHON3 > help > A list-like structure which implements > collections.abc.MutableSequence. > diff --git a/package/python-git/Config.in b/package/python-git/Config.in > index b8dbc3a6c1..3c23f91c36 100644 > --- a/package/python-git/Config.in > +++ b/package/python-git/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_GIT > bool "python-git" > - depends on BR2_PACKAGE_PYTHON3 > depends on BR2_USE_MMU # git > select BR2_PACKAGE_GIT # runtime > select BR2_PACKAGE_PYTHON_GITDB2 # runtime > diff --git a/package/python-gitdb2/Config.in b/package/python-gitdb2/Config.in > index 158e4b6980..4a87cc8e8d 100644 > --- a/package/python-gitdb2/Config.in > +++ b/package/python-gitdb2/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_GITDB2 > bool "python-gitdb2" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_SMMAP2 # runtime > select BR2_PACKAGE_PYTHON3_ZLIB > help > diff --git a/package/python-gobject/Config.in b/package/python-gobject/Config.in > index efc781a1ff..3354535637 100644 > --- a/package/python-gobject/Config.in > +++ b/package/python-gobject/Config.in > @@ -5,7 +5,6 @@ config BR2_PACKAGE_PYTHON_GOBJECT > depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # gobject-introspection > depends on BR2_HOST_GCC_AT_LEAST_8 # gobject-introspection -> host-qemu > depends on BR2_TOOLCHAIN_USES_GLIBC # gobject-introspection > - depends on BR2_PACKAGE_PYTHON3 # gobject-introspection > select BR2_PACKAGE_GOBJECT_INTROSPECTION > select BR2_PACKAGE_LIBGLIB2 > help > diff --git a/package/python-gpiozero/Config.in b/package/python-gpiozero/Config.in > index 13506ae45f..93e5de3e55 100644 > --- a/package/python-gpiozero/Config.in > +++ b/package/python-gpiozero/Config.in > @@ -1,7 +1,6 @@ > config BR2_PACKAGE_PYTHON_GPIOZERO > bool "python-gpiozero" > depends on BR2_arm > - depends on BR2_PACKAGE_PYTHON3 # python-colorzero > select BR2_PACKAGE_PYTHON_COLORZERO # runtime > select BR2_PACKAGE_PYTHON_RPI_GPIO # runtime > select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime > diff --git a/package/python-gunicorn/Config.in b/package/python-gunicorn/Config.in > index 4e7c0179a5..18f0c034ba 100644 > --- a/package/python-gunicorn/Config.in > +++ b/package/python-gunicorn/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_GUNICORN > bool "python-gunicorn" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime > select BR2_PACKAGE_PYTHON3_SSL # runtime > help > diff --git a/package/python-h2/Config.in b/package/python-h2/Config.in > index d88ad36761..74a6b2ad08 100644 > --- a/package/python-h2/Config.in > +++ b/package/python-h2/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_H2 > bool "python-h2" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_HPACK # runtime > select BR2_PACKAGE_PYTHON_HYPERFRAME # runtime > help > diff --git a/package/python-hiredis/Config.in b/package/python-hiredis/Config.in > index aacdc87cd2..a401de055d 100644 > --- a/package/python-hiredis/Config.in > +++ b/package/python-hiredis/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_HIREDIS > bool "python-hiredis" > - depends on BR2_PACKAGE_PYTHON3 > help > Python wrapper for hiredis. > > diff --git a/package/python-hpack/Config.in b/package/python-hpack/Config.in > index 0608f97281..b34a3f31fa 100644 > --- a/package/python-hpack/Config.in > +++ b/package/python-hpack/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_HPACK > bool "python-hpack" > - depends on BR2_PACKAGE_PYTHON3 > help > Pure-Python HPACK header compression. > > diff --git a/package/python-httplib2/Config.in b/package/python-httplib2/Config.in > index 0095d95b51..a029814f03 100644 > --- a/package/python-httplib2/Config.in > +++ b/package/python-httplib2/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_HTTPLIB2 > bool "python-httplib2" > - depends on BR2_PACKAGE_PYTHON3 # python-pyparsing > select BR2_PACKAGE_PYTHON3_ZLIB > select BR2_PACKAGE_PYTHON3_SSL > select BR2_PACKAGE_PYTHON_PYPARSING # runtime > diff --git a/package/python-humanize/Config.in b/package/python-humanize/Config.in > index ec63be9b35..f4f4e67b65 100644 > --- a/package/python-humanize/Config.in > +++ b/package/python-humanize/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_HUMANIZE > bool "python-humanize" > - depends on BR2_PACKAGE_PYTHON3 > help > Python humanize package contains various common humanization > utilities, like turning a number into a fuzzy human readable > diff --git a/package/python-hyperframe/Config.in b/package/python-hyperframe/Config.in > index 30457fe86e..fb83c895af 100644 > --- a/package/python-hyperframe/Config.in > +++ b/package/python-hyperframe/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_HYPERFRAME > bool "python-hyperframe" > - depends on BR2_PACKAGE_PYTHON3 > help > HTTP/2 framing layer for Python. > > diff --git a/package/python-hyperlink/Config.in b/package/python-hyperlink/Config.in > index 3a85e6f461..8dad0af19a 100644 > --- a/package/python-hyperlink/Config.in > +++ b/package/python-hyperlink/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_HYPERLINK > bool "python-hyperlink" > - depends on BR2_PACKAGE_PYTHON3 # python-idna > select BR2_PACKAGE_PYTHON_IDNA # runtime > help > A featureful, correct URL for Python. > diff --git a/package/python-ibmiotf/Config.in b/package/python-ibmiotf/Config.in > index 3f3f7e1965..64362db998 100644 > --- a/package/python-ibmiotf/Config.in > +++ b/package/python-ibmiotf/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_IBMIOTF > bool "python-ibmiotf" > - depends on BR2_PACKAGE_PYTHON3 # python-requests -> python-idna > select BR2_PACKAGE_PYTHON_ISO8601 # runtime > select BR2_PACKAGE_PYTHON_PAHO_MQTT # runtime > select BR2_PACKAGE_PYTHON_PYTZ # runtime > diff --git a/package/python-idna/Config.in b/package/python-idna/Config.in > index 3df634f9bf..ddc2cd7d17 100644 > --- a/package/python-idna/Config.in > +++ b/package/python-idna/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_IDNA > bool "python-idna" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON3_UNICODEDATA > help > A library to support the Internationalised Domain Names in > diff --git a/package/python-inflection/Config.in b/package/python-inflection/Config.in > index 5b6a26fead..84240060fd 100644 > --- a/package/python-inflection/Config.in > +++ b/package/python-inflection/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_INFLECTION > bool "python-inflection" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON3_UNICODEDATA > help > A string transformation library that singularizes and > diff --git a/package/python-influxdb/Config.in b/package/python-influxdb/Config.in > index 48c300f90d..6ebbd4aa9c 100644 > --- a/package/python-influxdb/Config.in > +++ b/package/python-influxdb/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_INFLUXDB > bool "python-influxdb" > - depends on BR2_PACKAGE_PYTHON3 # python-requests -> python-idna > select BR2_PACKAGE_PYTHON_DATEUTIL # runtime > select BR2_PACKAGE_PYTHON_MSGPACK # runtime > select BR2_PACKAGE_PYTHON_PYTZ # runtime > diff --git a/package/python-ipdb/Config.in b/package/python-ipdb/Config.in > index 4a89bf75de..a9d6af1684 100644 > --- a/package/python-ipdb/Config.in > +++ b/package/python-ipdb/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_IPDB > bool "python-ipdb" > - depends on BR2_PACKAGE_PYTHON3 # python-ipython > select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime > select BR2_PACKAGE_PYTHON_IPYTHON # runtime > help > diff --git a/package/python-ipython/Config.in b/package/python-ipython/Config.in > index c151ac2dd2..3de49ae574 100644 > --- a/package/python-ipython/Config.in > +++ b/package/python-ipython/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_IPYTHON > bool "python-ipython" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_BACKCALL # runtime > select BR2_PACKAGE_PYTHON_DECORATOR # runtime > select BR2_PACKAGE_PYTHON_JEDI # runtime > diff --git a/package/python-itsdangerous/Config.in b/package/python-itsdangerous/Config.in > index 72aa9165f8..fc0cfe1591 100644 > --- a/package/python-itsdangerous/Config.in > +++ b/package/python-itsdangerous/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_ITSDANGEROUS > bool "python-itsdangerous" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON3_ZLIB # runtime > help > Itsdangerous contains various helpers to pass data to > diff --git a/package/python-janus/Config.in b/package/python-janus/Config.in > index 38e4b7217f..924c1fa97d 100644 > --- a/package/python-janus/Config.in > +++ b/package/python-janus/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_JANUS > bool "python-janus" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime > help > Mixed sync-async queue to interoperate between asyncio > diff --git a/package/python-jaraco-classes/Config.in b/package/python-jaraco-classes/Config.in > index 271e085c6f..05c11237ab 100644 > --- a/package/python-jaraco-classes/Config.in > +++ b/package/python-jaraco-classes/Config.in > @@ -1,6 +1,5 @@ > 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-jaraco-functools/Config.in b/package/python-jaraco-functools/Config.in > index 6c914f3851..f65664018d 100644 > --- a/package/python-jaraco-functools/Config.in > +++ b/package/python-jaraco-functools/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_JARACO_FUNCTOOLS > bool "python-jaraco-functools" > - depends on BR2_PACKAGE_PYTHON3 # python-more-itertools > select BR2_PACKAGE_PYTHON_MORE_ITERTOOLS # runtime > help > Additional functools in the spirit of stdlib?s > diff --git a/package/python-jedi/Config.in b/package/python-jedi/Config.in > index e14fa54ffb..8ceaa1530c 100644 > --- a/package/python-jedi/Config.in > +++ b/package/python-jedi/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_JEDI > bool "python-jedi" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_PARSO # runtime > help > An autocompletion tool for Python that can be used for text > diff --git a/package/python-jinja2/Config.in b/package/python-jinja2/Config.in > index 8ba2fa4df8..84a46bd264 100644 > --- a/package/python-jinja2/Config.in > +++ b/package/python-jinja2/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_JINJA2 > bool "python-jinja2" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_MARKUPSAFE # runtime > select BR2_PACKAGE_PYTHON3_UNICODEDATA > help > diff --git a/package/python-jsonmodels/Config.in b/package/python-jsonmodels/Config.in > index 84a269f171..f66982874a 100644 > --- a/package/python-jsonmodels/Config.in > +++ b/package/python-jsonmodels/Config.in > @@ -1,6 +1,5 @@ > 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-keyring/Config.in b/package/python-keyring/Config.in > index 61cb98952f..6b33686cbe 100644 > --- a/package/python-keyring/Config.in > +++ b/package/python-keyring/Config.in > @@ -2,7 +2,6 @@ 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 > select BR2_PACKAGE_PYTHON_ENTRYPOINTS # runtime > select BR2_PACKAGE_PYTHON_SECRETSTORAGE # runtime > help > diff --git a/package/python-libusb1/Config.in b/package/python-libusb1/Config.in > index fbad70c375..e464a0394d 100644 > --- a/package/python-libusb1/Config.in > +++ b/package/python-libusb1/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_LIBUSB1 > bool "python-libusb1" > - depends on BR2_PACKAGE_PYTHON3 > depends on BR2_TOOLCHAIN_HAS_THREADS # libusb > depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb > select BR2_PACKAGE_LIBUSB > @@ -10,6 +9,5 @@ config BR2_PACKAGE_PYTHON_LIBUSB1 > http://github.com/vpelletier/python-libusb1 > > comment "python-libusb1 needs a toolchain w/ threads, gcc >= 4.9" > - depends on BR2_PACKAGE_PYTHON3 > depends on !BR2_TOOLCHAIN_HAS_THREADS || \ > !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 > diff --git a/package/python-markdown/Config.in b/package/python-markdown/Config.in > index 454c2729bd..4963ec6560 100644 > --- a/package/python-markdown/Config.in > +++ b/package/python-markdown/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_MARKDOWN > bool "python-markdown" > - depends on BR2_PACKAGE_PYTHON3 > # runtime dependency on Python's xml module > select BR2_PACKAGE_PYTHON3_PYEXPAT > help > diff --git a/package/python-markdown2/Config.in b/package/python-markdown2/Config.in > index 5513219a40..8fe2332491 100644 > --- a/package/python-markdown2/Config.in > +++ b/package/python-markdown2/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_MARKDOWN2 > bool "python-markdown2" > - depends on BR2_PACKAGE_PYTHON3 > help > A fast and complete Python implementation of Markdown. > > diff --git a/package/python-markupsafe/Config.in b/package/python-markupsafe/Config.in > index cd7cb2d8e9..48421e0a32 100644 > --- a/package/python-markupsafe/Config.in > +++ b/package/python-markupsafe/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_MARKUPSAFE > bool "python-markupsafe" > - depends on BR2_PACKAGE_PYTHON3 > help > MarkupSafe implements a XML/HTML/XHTML Markup safe string > for Python. > diff --git a/package/python-matplotlib/Config.in b/package/python-matplotlib/Config.in > index e5a4064538..b936777662 100644 > --- a/package/python-matplotlib/Config.in > +++ b/package/python-matplotlib/Config.in > @@ -1,7 +1,6 @@ > config BR2_PACKAGE_PYTHON_MATPLOTLIB > bool "python-matplotlib" > depends on BR2_INSTALL_LIBSTDCPP > - depends on BR2_PACKAGE_PYTHON3 > depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS > depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy > select BR2_PACKAGE_FREETYPE # runtime > diff --git a/package/python-mbstrdecoder/Config.in b/package/python-mbstrdecoder/Config.in > index 5ba3a19cc4..0ff0a310a5 100644 > --- a/package/python-mbstrdecoder/Config.in > +++ b/package/python-mbstrdecoder/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_MBSTRDECODER > bool "python-mbstrdecoder" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_CHARDET # runtime > help > multi-byte character string decoder. > diff --git a/package/python-memory-profiler/Config.in b/package/python-memory-profiler/Config.in > index 60833304ae..9d29e5f1ca 100644 > --- a/package/python-memory-profiler/Config.in > +++ b/package/python-memory-profiler/Config.in > @@ -1,6 +1,5 @@ > 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. > diff --git a/package/python-more-itertools/Config.in b/package/python-more-itertools/Config.in > index f54b52d1f0..5a74f95d59 100644 > --- a/package/python-more-itertools/Config.in > +++ b/package/python-more-itertools/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_MORE_ITERTOOLS > bool "python-more-itertools" > - depends on BR2_PACKAGE_PYTHON3 > help > More routines for operating on iterables, beyond itertools. > > diff --git a/package/python-mpd2/Config.in b/package/python-mpd2/Config.in > index 823c82e52d..52dcbf0096 100644 > --- a/package/python-mpd2/Config.in > +++ b/package/python-mpd2/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_MPD2 > bool "python-mpd2" > - depends on BR2_PACKAGE_PYTHON3 > help > A Python MPD client library. > > diff --git a/package/python-msgfy/Config.in b/package/python-msgfy/Config.in > index f5a471633a..7875379e9e 100644 > --- a/package/python-msgfy/Config.in > +++ b/package/python-msgfy/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_MSGFY > bool "python-msgfy" > - depends on BR2_PACKAGE_PYTHON3 > help > msgfy is a Python library for convert Exception instance to > a human-readable error message. > diff --git a/package/python-multidict/Config.in b/package/python-multidict/Config.in > index 7bfaa36db2..9a92a6d396 100644 > --- a/package/python-multidict/Config.in > +++ b/package/python-multidict/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_MULTIDICT > bool "python-multidict" > - depends on BR2_PACKAGE_PYTHON3 > help > Multidict is dict-like collection of key-value pairs where a > key may occur more than once in the container. > diff --git a/package/python-mutagen/Config.in b/package/python-mutagen/Config.in > index 655562893f..dc183a6e4e 100644 > --- a/package/python-mutagen/Config.in > +++ b/package/python-mutagen/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_MUTAGEN > bool "python-mutagen" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime > select BR2_PACKAGE_PYTHON3_ZLIB # runtime > help > diff --git a/package/python-mwclient/Config.in b/package/python-mwclient/Config.in > index 1af60fdcd0..dc93e6c0df 100644 > --- a/package/python-mwclient/Config.in > +++ b/package/python-mwclient/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_MWCLIENT > bool "python-mwclient" > - depends on BR2_PACKAGE_PYTHON3 # python-requests-oauthlib -> python-requests -> python-idna > select BR2_PACKAGE_PYTHON_REQUESTS_OAUTHLIB # runtime > select BR2_PACKAGE_PYTHON_SIX # runtime > help > diff --git a/package/python-mwscrape/Config.in b/package/python-mwscrape/Config.in > index cb1e30506f..fc9d5223f2 100644 > --- a/package/python-mwscrape/Config.in > +++ b/package/python-mwscrape/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_MWSCRAPE > bool "python-mwscrape" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_COUCHDB # runtime > select BR2_PACKAGE_PYTHON_MWCLIENT # runtime > select BR2_PACKAGE_PYTHON_PYLRU # runtime > diff --git a/package/python-mwscrape2slob/Config.in b/package/python-mwscrape2slob/Config.in > index 6d543bda28..6ced253451 100644 > --- a/package/python-mwscrape2slob/Config.in > +++ b/package/python-mwscrape2slob/Config.in > @@ -4,7 +4,6 @@ config BR2_PACKAGE_PYTHON_MWSCRAPE2SLOB > depends on BR2_HOST_GCC_AT_LEAST_4_9 # python-slob -> python-pyicu -> icu > depends on BR2_INSTALL_LIBSTDCPP # python-slob -> python-pyicu -> icu > depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # python-slob -> python-pyicu -> icu > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_COUCHDB # runtime > select BR2_PACKAGE_PYTHON_CSSSELECT # runtime > select BR2_PACKAGE_PYTHON_CSSUTILS # runtime > @@ -17,7 +16,6 @@ config BR2_PACKAGE_PYTHON_MWSCRAPE2SLOB > https://github.com/itkach/mwscrape2slob > > comment "python-mwscrape2slob needs a toolchain w/ C++, gcc >= 4.9, host gcc >= 4.9" > - depends on BR2_PACKAGE_PYTHON3 && !BR2_BINFMT_FLAT > depends on !BR2_INSTALL_LIBSTDCPP || \ > !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ > !BR2_HOST_GCC_AT_LEAST_4_9 > diff --git a/package/python-networkx/Config.in b/package/python-networkx/Config.in > index 2ae3841dfa..0f3e86f497 100644 > --- a/package/python-networkx/Config.in > +++ b/package/python-networkx/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_NETWORKX > bool "python-networkx" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_DECORATOR # runtime > help > A Python package for the creation, manipulation, > diff --git a/package/python-numpy/Config.in b/package/python-numpy/Config.in > index 23dcbc7986..a65164d9d5 100644 > --- a/package/python-numpy/Config.in > +++ b/package/python-numpy/Config.in > @@ -15,7 +15,6 @@ config BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS > > config BR2_PACKAGE_PYTHON_NUMPY > bool "python-numpy" > - depends on BR2_PACKAGE_PYTHON3 > depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS > # python-numpy needs fenv.h which is not provided by uclibc > depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL > @@ -29,6 +28,5 @@ config BR2_PACKAGE_PYTHON_NUMPY > http://www.numpy.org/ > > comment "python-numpy needs glibc or musl" > - depends on BR2_PACKAGE_PYTHON3 > depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS > depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) > diff --git a/package/python-oauthlib/Config.in b/package/python-oauthlib/Config.in > index 0084e7cbd9..65016c1d08 100644 > --- a/package/python-oauthlib/Config.in > +++ b/package/python-oauthlib/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_OAUTHLIB > bool "python-oauthlib" > - depends on BR2_PACKAGE_PYTHON3 > help > A generic, spec-compliant, thorough implementation of the > OAuth request-signing logic. > diff --git a/package/python-opcua-asyncio/Config.in b/package/python-opcua-asyncio/Config.in > index 95715fdd08..e5b8623f0d 100644 > --- a/package/python-opcua-asyncio/Config.in > +++ b/package/python-opcua-asyncio/Config.in > @@ -1,7 +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 > select BR2_PACKAGE_PYTHON_DATEUTIL # runtime > diff --git a/package/python-packaging/Config.in b/package/python-packaging/Config.in > index 74d5205e8d..12170df84e 100644 > --- a/package/python-packaging/Config.in > +++ b/package/python-packaging/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PACKAGING > bool "python-packaging" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_PYPARSING # runtime > help > Core utilities for Python packages. > diff --git a/package/python-paramiko/Config.in b/package/python-paramiko/Config.in > index d48051bd22..a07af19a4b 100644 > --- a/package/python-paramiko/Config.in > +++ b/package/python-paramiko/Config.in > @@ -1,7 +1,6 @@ > 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, 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-parso/Config.in b/package/python-parso/Config.in > index 4f5482d8a0..ea1c5a4732 100644 > --- a/package/python-parso/Config.in > +++ b/package/python-parso/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PARSO > bool "python-parso" > - depends on BR2_PACKAGE_PYTHON3 > help > A Python Parser. > > diff --git a/package/python-pathpy/Config.in b/package/python-pathpy/Config.in > index 7c7ffc9e92..98c05126bf 100644 > --- a/package/python-pathpy/Config.in > +++ b/package/python-pathpy/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PATHPY > bool "python-pathpy" > - depends on BR2_PACKAGE_PYTHON3 > help > path.py implements a path objects as first-class > entities, allowing common operations on files to > diff --git a/package/python-pathvalidate/Config.in b/package/python-pathvalidate/Config.in > index f8658e6165..8606696e1b 100644 > --- a/package/python-pathvalidate/Config.in > +++ b/package/python-pathvalidate/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PATHVALIDATE > bool "python-pathvalidate" > - depends on BR2_PACKAGE_PYTHON3 > help > pathvalidate is a python library to validate/sanitize a string > such as filename/variable-name. > diff --git a/package/python-piexif/Config.in b/package/python-piexif/Config.in > index 2f7eff80b5..1c8c31b9c6 100644 > --- a/package/python-piexif/Config.in > +++ b/package/python-piexif/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PIEXIF > bool "python-piexif" > - depends on BR2_PACKAGE_PYTHON3 > help > Piexif simplifies interacting with EXIF data in Python. It > includes the tools necessary for extracting, creating, > diff --git a/package/python-pillow/Config.in b/package/python-pillow/Config.in > index ae6d8c8346..126cb452fa 100644 > --- a/package/python-pillow/Config.in > +++ b/package/python-pillow/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PILLOW > bool "python-pillow" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime > select BR2_PACKAGE_PYTHON3_ZLIB > help > diff --git a/package/python-pip/Config.in b/package/python-pip/Config.in > index 92c3e3bd46..805dc01545 100644 > --- a/package/python-pip/Config.in > +++ b/package/python-pip/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PIP > bool "python-pip" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime > select BR2_PACKAGE_PYTHON3_SSL > help > diff --git a/package/python-pluggy/Config.in b/package/python-pluggy/Config.in > index 7179bc427c..35b18c824f 100644 > --- a/package/python-pluggy/Config.in > +++ b/package/python-pluggy/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PLUGGY > bool "python-pluggy" > - depends on BR2_PACKAGE_PYTHON3 > help > plugin and hook calling mechanisms for python. > > diff --git a/package/python-portend/Config.in b/package/python-portend/Config.in > index 30a50c7f61..6b21078caa 100644 > --- a/package/python-portend/Config.in > +++ b/package/python-portend/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PORTEND > bool "python-portend" > - depends on BR2_PACKAGE_PYTHON3 # python-tempora > select BR2_PACKAGE_PYTHON_TEMPORA # runtime > help > TCP port monitoring utilities. > diff --git a/package/python-priority/Config.in b/package/python-priority/Config.in > index 8ac2d13824..b73b7e2ad4 100644 > --- a/package/python-priority/Config.in > +++ b/package/python-priority/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PRIORITY > bool "python-priority" > - depends on BR2_PACKAGE_PYTHON3 > help > A pure-Python implementation of the HTTP/2 priority tree. > > diff --git a/package/python-prompt-toolkit/Config.in b/package/python-prompt-toolkit/Config.in > index a16ac13d53..ad4f8162de 100644 > --- a/package/python-prompt-toolkit/Config.in > +++ b/package/python-prompt-toolkit/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PROMPT_TOOLKIT > bool "python-prompt-toolkit" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_SIX # runtime > select BR2_PACKAGE_PYTHON_WCWIDTH # runtime > select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime > diff --git a/package/python-protobuf/Config.in b/package/python-protobuf/Config.in > index 9b20881196..1af82112b4 100644 > --- a/package/python-protobuf/Config.in > +++ b/package/python-protobuf/Config.in > @@ -2,7 +2,6 @@ config BR2_PACKAGE_PYTHON_PROTOBUF > bool "python-protobuf" > # host-protobuf only builds on certain architectures > depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_SIX # runtime > help > Python implementation of the Google Protocol Buffers. > diff --git a/package/python-psycopg2/Config.in b/package/python-psycopg2/Config.in > index fba781c014..ec27d706de 100644 > --- a/package/python-psycopg2/Config.in > +++ b/package/python-psycopg2/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PSYCOPG2 > bool "python-psycopg2" > - depends on BR2_PACKAGE_PYTHON3 > depends on BR2_USE_WCHAR # postgresql > select BR2_PACKAGE_POSTGRESQL > help > @@ -24,5 +23,4 @@ config BR2_PACKAGE_PYTHON_PSYCOPG2 > http://initd.org/psycopg/ > > comment "python-psycopg2 needs a toolchain w/ wchar" > - depends on BR2_PACKAGE_PYTHON3 > depends on !BR2_USE_WCHAR > diff --git a/package/python-pudb/Config.in b/package/python-pudb/Config.in > index 64789021d1..06f1b20c26 100644 > --- a/package/python-pudb/Config.in > +++ b/package/python-pudb/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PUDB > bool "python-pudb" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_URWID # runtime > select BR2_PACKAGE_PYTHON_JEDI # runtime > select BR2_PACKAGE_PYTHON_PYGMENTS # runtime > diff --git a/package/python-py/Config.in b/package/python-py/Config.in > index 0e3c3390a0..354372f5b4 100644 > --- a/package/python-py/Config.in > +++ b/package/python-py/Config.in > @@ -1,6 +1,5 @@ > 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-pybind/Config.in b/package/python-pybind/Config.in > index 27bc196e32..604cb9ee67 100644 > --- a/package/python-pybind/Config.in > +++ b/package/python-pybind/Config.in > @@ -1,6 +1,5 @@ > 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-pycairo/Config.in b/package/python-pycairo/Config.in > index a44a0421e6..0d8de977e1 100644 > --- a/package/python-pycairo/Config.in > +++ b/package/python-pycairo/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PYCAIRO > bool "python-pycairo" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_CAIRO > help > Python interface for cairo. > diff --git a/package/python-pycares/Config.in b/package/python-pycares/Config.in > index 3452ae6b10..889e0943be 100644 > --- a/package/python-pycares/Config.in > +++ b/package/python-pycares/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PYCARES > bool "python-pycares" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_CFFI # runtime > help > Python interface for c-ares. > diff --git a/package/python-pycups/Config.in b/package/python-pycups/Config.in > index 61c2ba21d1..eeaf70c9e6 100644 > --- a/package/python-pycups/Config.in > +++ b/package/python-pycups/Config.in > @@ -1,7 +1,6 @@ > config BR2_PACKAGE_PYTHON_PYCUPS > bool "python-pycups" > depends on BR2_PACKAGE_CUPS > - depends on BR2_PACKAGE_PYTHON3 > help > Python bindings for libcups. > > diff --git a/package/python-pydantic/Config.in b/package/python-pydantic/Config.in > index ac81aeb342..41ec43adf4 100644 > --- a/package/python-pydantic/Config.in > +++ b/package/python-pydantic/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PYDANTIC > bool "python-pydantic" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime > help > Data validation and settings management using python 3.6 > diff --git a/package/python-pydyf/Config.in b/package/python-pydyf/Config.in > index f283a6d6aa..42530eafbb 100644 > --- a/package/python-pydyf/Config.in > +++ b/package/python-pydyf/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PYDYF > bool "python-pydyf" > - depends on BR2_PACKAGE_PYTHON3 > help > A low-level PDF generator. > > diff --git a/package/python-pygments/Config.in b/package/python-pygments/Config.in > index d74e53d4c8..f097c52397 100644 > --- a/package/python-pygments/Config.in > +++ b/package/python-pygments/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PYGMENTS > bool "python-pygments" > - depends on BR2_PACKAGE_PYTHON3 > help > Pygments is a syntax highlighting package written in Python. > > diff --git a/package/python-pyhamcrest/Config.in b/package/python-pyhamcrest/Config.in > index 1bbae3fec7..c2a4dc06f7 100644 > --- a/package/python-pyhamcrest/Config.in > +++ b/package/python-pyhamcrest/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PYHAMCREST > bool "python-pyhamcrest" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime > select BR2_PACKAGE_PYTHON_SIX # runtime > help > diff --git a/package/python-pyjwt/Config.in b/package/python-pyjwt/Config.in > index f8d4f8a9b8..510875ce2f 100644 > --- a/package/python-pyjwt/Config.in > +++ b/package/python-pyjwt/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PYJWT > bool "python-pyjwt" > - depends on BR2_PACKAGE_PYTHON3 > help > JSON Web Token implementation in Python. > > diff --git a/package/python-pymupdf/Config.in b/package/python-pymupdf/Config.in > index 0ecb288922..b3f9565238 100644 > --- a/package/python-pymupdf/Config.in > +++ b/package/python-pymupdf/Config.in > @@ -4,7 +4,6 @@ config BR2_PACKAGE_PYTHON_PYMUPDF > depends on BR2_TOOLCHAIN_HAS_SYNC_4 # mupdf -> harfbuzz > depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # mupdf -> harfbuzz > depends on BR2_PACKAGE_XORG7 > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_FREETYPE > select BR2_PACKAGE_MUPDF > select BR2_PACKAGE_ZLIB > @@ -14,12 +13,10 @@ config BR2_PACKAGE_PYTHON_PYMUPDF > https://github.com/pymupdf/PyMuPDF > > comment "python-pymupdf needs Xorg" > - depends on BR2_PACKAGE_PYTHON3 > depends on BR2_TOOLCHAIN_HAS_SYNC_4 > depends on !BR2_PACKAGE_XORG7 > > comment "python-pymupdf needs a toolchain w/ C++, gcc >= 4.9" > - depends on BR2_PACKAGE_PYTHON3 > depends on BR2_TOOLCHAIN_HAS_SYNC_4 > depends on !BR2_INSTALL_LIBSTDCPP || \ > !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 > diff --git a/package/python-pymysql/Config.in b/package/python-pymysql/Config.in > index 69ba485e77..75b447cbd1 100644 > --- a/package/python-pymysql/Config.in > +++ b/package/python-pymysql/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PYMYSQL > bool "python-pymysql" > - depends on BR2_PACKAGE_PYTHON3 > help > PyMySQL is a pure-Python MySQL client library. It follows > the DB-API 2.0. > diff --git a/package/python-pynacl/Config.in b/package/python-pynacl/Config.in > index 3bb4e29630..0553d82ce9 100644 > --- a/package/python-pynacl/Config.in > +++ b/package/python-pynacl/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PYNACL > bool "python-pynacl" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_LIBSODIUM > select BR2_PACKAGE_PYTHON_CFFI # runtime > help > diff --git a/package/python-pyndiff/Config.in b/package/python-pyndiff/Config.in > index cd13056d79..58ca35ba97 100644 > --- a/package/python-pyndiff/Config.in > +++ b/package/python-pyndiff/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PYNDIFF > bool "python-pyndiff" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_XMLJSON # runtime > select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime > help > diff --git a/package/python-pyopenssl/Config.in b/package/python-pyopenssl/Config.in > index 65d516813f..1a6fbd2147 100644 > --- a/package/python-pyopenssl/Config.in > +++ b/package/python-pyopenssl/Config.in > @@ -1,7 +1,6 @@ > config BR2_PACKAGE_PYTHON_PYOPENSSL > bool "python-pyopenssl" > 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 > diff --git a/package/python-pyparsing/Config.in b/package/python-pyparsing/Config.in > index 9b5894116d..926ca07ed7 100644 > --- a/package/python-pyparsing/Config.in > +++ b/package/python-pyparsing/Config.in > @@ -1,6 +1,5 @@ > 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 > diff --git a/package/python-pyparted/Config.in b/package/python-pyparted/Config.in > index 0ed24f8836..60f54a5484 100644 > --- a/package/python-pyparted/Config.in > +++ b/package/python-pyparted/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PYPARTED > bool "python-pyparted" > - depends on BR2_PACKAGE_PYTHON3 > depends on BR2_ENABLE_LOCALE # parted > depends on BR2_USE_WCHAR > select BR2_PACKAGE_PARTED > @@ -10,5 +9,4 @@ config BR2_PACKAGE_PYTHON_PYPARTED > https://github.com/rhinstaller/pyparted > > comment "pyparted needs a toolchain w/ locale, wchar" > - depends on BR2_PACKAGE_PYTHON3 > depends on !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR > diff --git a/package/python-pyphen/Config.in b/package/python-pyphen/Config.in > index 30ccafcda4..e4707ff036 100644 > --- a/package/python-pyphen/Config.in > +++ b/package/python-pyphen/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PYPHEN > bool "python-pyphen" > - depends on BR2_PACKAGE_PYTHON3 > help > Pure Python module to hyphenate text. > > diff --git a/package/python-pysftp/Config.in b/package/python-pysftp/Config.in > index c65369b667..fc4fdd972d 100644 > --- a/package/python-pysftp/Config.in > +++ b/package/python-pysftp/Config.in > @@ -1,7 +1,6 @@ > 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 > select BR2_PACKAGE_PYTHON_PARAMIKO # runtime > help > A friendly face on SFTP. > diff --git a/package/python-pytablereader/Config.in b/package/python-pytablereader/Config.in > index 1c3f2af82f..889cb79820 100644 > --- a/package/python-pytablereader/Config.in > +++ b/package/python-pytablereader/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PYTABLEREADER > bool "python-pytablereader" > - depends on BR2_PACKAGE_PYTHON3 # python-mbstrdecoder, python-pathpy, python-beautifulsoup4, python-pathvalidate > select BR2_PACKAGE_PYTHON_BEAUTIFULSOUP4 # runtime > select BR2_PACKAGE_PYTHON_DATAPROPERTY # runtime > select BR2_PACKAGE_PYTHON_JSONSCHEMA # runtime > diff --git a/package/python-pytablewriter/Config.in b/package/python-pytablewriter/Config.in > index e0405d12c8..041c30eb6c 100644 > --- a/package/python-pytablewriter/Config.in > +++ b/package/python-pytablewriter/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PYTABLEWRITER > bool "python-pytablewriter" > - depends on BR2_PACKAGE_PYTHON3 # python-dataproperty, python-mbstrdecoder, python-pathvalidate > select BR2_PACKAGE_PYTHON_DATAPROPERTY # runtime > select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime > select BR2_PACKAGE_PYTHON_MSGFY # runtime > diff --git a/package/python-pytest-asyncio/Config.in b/package/python-pytest-asyncio/Config.in > index 3fa90e4e18..2088a8bdbf 100644 > --- a/package/python-pytest-asyncio/Config.in > +++ b/package/python-pytest-asyncio/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PYTEST_ASYNCIO > bool "python-pytest-asyncio" > - depends on BR2_PACKAGE_PYTHON3 # pytest > select BR2_PACKAGE_PYTHON_PYTEST # runtime > help > Pytest support for asyncio. > diff --git a/package/python-pytest/Config.in b/package/python-pytest/Config.in > index ebbaeeea58..c3956c76d2 100644 > --- a/package/python-pytest/Config.in > +++ b/package/python-pytest/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PYTEST > bool "python-pytest" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_ATTRS # runtime > select BR2_PACKAGE_PYTHON_INICONFIG # runtime > select BR2_PACKAGE_PYTHON_PACKAGING # runtime > diff --git a/package/python-pytrie/Config.in b/package/python-pytrie/Config.in > index 722d263d7e..156638476c 100644 > --- a/package/python-pytrie/Config.in > +++ b/package/python-pytrie/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PYTRIE > bool "python-pytrie" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_SORTEDCONTAINERS # runtime > help > A pure Python implementation of the trie data structure. > diff --git a/package/python-pyusb/Config.in b/package/python-pyusb/Config.in > index 13080a9fde..bba3480a1b 100644 > --- a/package/python-pyusb/Config.in > +++ b/package/python-pyusb/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_PYUSB > bool "python-pyusb" > - depends on BR2_PACKAGE_PYTHON3 > depends on BR2_TOOLCHAIN_HAS_THREADS # libusb > depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb > select BR2_PACKAGE_LIBUSB > diff --git a/package/python-pyyaml/Config.in b/package/python-pyyaml/Config.in > index eb073b9c03..45e818b7e7 100644 > --- a/package/python-pyyaml/Config.in > +++ b/package/python-pyyaml/Config.in > @@ -1,6 +1,5 @@ > 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-requests-oauthlib/Config.in b/package/python-requests-oauthlib/Config.in > index 2510644bd1..85283b209c 100644 > --- a/package/python-requests-oauthlib/Config.in > +++ b/package/python-requests-oauthlib/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_REQUESTS_OAUTHLIB > bool "python-requests-oauthlib" > - depends on BR2_PACKAGE_PYTHON3 # python-requests -> python-idna > select BR2_PACKAGE_PYTHON_OAUTHLIB # runtime > select BR2_PACKAGE_PYTHON_REQUESTS # runtime > help > diff --git a/package/python-requests-toolbelt/Config.in b/package/python-requests-toolbelt/Config.in > index 47141c2c8a..ba2b95152e 100644 > --- a/package/python-requests-toolbelt/Config.in > +++ b/package/python-requests-toolbelt/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_REQUESTS_TOOLBELT > bool "python-requests-toolbelt" > - depends on BR2_PACKAGE_PYTHON3 # python-requests -> python-idna > select BR2_PACKAGE_PYTHON_REQUESTS # runtime > help > A utility belt for advanced users of python-requests. > diff --git a/package/python-requests/Config.in b/package/python-requests/Config.in > index 9b04c07fc9..94a44682f4 100644 > --- a/package/python-requests/Config.in > +++ b/package/python-requests/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_REQUESTS > bool "python-requests" > - depends on BR2_PACKAGE_PYTHON3 # python-idna > select BR2_PACKAGE_PYTHON_CERTIFI # runtime > select BR2_PACKAGE_PYTHON_CHARSET_NORMALIZER # runtime > select BR2_PACKAGE_PYTHON_IDNA # runtime > diff --git a/package/python-rsa/Config.in b/package/python-rsa/Config.in > index bc9ec2feab..5cafd8215f 100644 > --- a/package/python-rsa/Config.in > +++ b/package/python-rsa/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_RSA > bool "python-rsa" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_PYASN1 # runtime > help > Python-RSA is a pure-Python RSA implementation. It supports > diff --git a/package/python-s3transfer/Config.in b/package/python-s3transfer/Config.in > index ad3a673938..a7f85b146c 100644 > --- a/package/python-s3transfer/Config.in > +++ b/package/python-s3transfer/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_S3TRANSFER > bool "python-s3transfer" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_BOTOCORE # runtime > help > An Amazon S3 Transfer Manager. > diff --git a/package/python-schedule/Config.in b/package/python-schedule/Config.in > index a0f800e364..d00c245948 100644 > --- a/package/python-schedule/Config.in > +++ b/package/python-schedule/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_SCHEDULE > bool "python-schedule" > - depends on BR2_PACKAGE_PYTHON3 > help > Job scheduling for humans. > > diff --git a/package/python-secretstorage/Config.in b/package/python-secretstorage/Config.in > index 059ea097bb..f0a8689ecd 100644 > --- a/package/python-secretstorage/Config.in > +++ b/package/python-secretstorage/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_SECRETSTORAGE > bool "python-secretstorage" > - depends on BR2_PACKAGE_PYTHON3 > depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography > select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime > help > diff --git a/package/python-serial-asyncio/Config.in b/package/python-serial-asyncio/Config.in > index 5520b72506..08396a0eeb 100644 > --- a/package/python-serial-asyncio/Config.in > +++ b/package/python-serial-asyncio/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_SERIAL_ASYNCIO > bool "python-serial-asyncio" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_SERIAL > help > asyncio extension package for pyserial. > diff --git a/package/python-service-identity/Config.in b/package/python-service-identity/Config.in > index c571065e92..aa6d0fe715 100644 > --- a/package/python-service-identity/Config.in > +++ b/package/python-service-identity/Config.in > @@ -3,7 +3,6 @@ config BR2_PACKAGE_PYTHON_SERVICE_IDENTITY > # 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 > diff --git a/package/python-setproctitle/Config.in b/package/python-setproctitle/Config.in > index a901fd7055..d13afaa401 100644 > --- a/package/python-setproctitle/Config.in > +++ b/package/python-setproctitle/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_SETPROCTITLE > bool "python-setproctitle" > - depends on BR2_PACKAGE_PYTHON3 > help > A Python module to customize the process title. > > diff --git a/package/python-simpleaudio/Config.in b/package/python-simpleaudio/Config.in > index c6fcd8b07a..1169342be7 100644 > --- a/package/python-simpleaudio/Config.in > +++ b/package/python-simpleaudio/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_SIMPLEAUDIO > bool "python-simpleaudio" > - depends on BR2_PACKAGE_PYTHON3 > depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib > select BR2_PACKAGE_ALSA_LIB > help > diff --git a/package/python-simplelogging/Config.in b/package/python-simplelogging/Config.in > index 7f58791836..db95efa25f 100644 > --- a/package/python-simplelogging/Config.in > +++ b/package/python-simplelogging/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_SIMPLELOGGING > bool "python-simplelogging" > - depends on BR2_PACKAGE_PYTHON3 # python-colorlog > select BR2_PACKAGE_PYTHON_COLORLOG # runtime > help > Logging made simple, no excuse for any debug print call. > diff --git a/package/python-simplesqlite/Config.in b/package/python-simplesqlite/Config.in > index 5a9fa4a5db..81501c9e83 100644 > --- a/package/python-simplesqlite/Config.in > +++ b/package/python-simplesqlite/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_SIMPLESQLITE > bool "python-simplesqlite" > - depends on BR2_PACKAGE_PYTHON3 # python-mbstrdecoder, python-pathvalidate > select BR2_PACKAGE_PYTHON_DATAPROPERTY # runtime > select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime > select BR2_PACKAGE_PYTHON_PATHVALIDATE # runtime > diff --git a/package/python-slob/Config.in b/package/python-slob/Config.in > index 07d04d49a2..c06f544534 100644 > --- a/package/python-slob/Config.in > +++ b/package/python-slob/Config.in > @@ -4,7 +4,6 @@ config BR2_PACKAGE_PYTHON_SLOB > depends on BR2_HOST_GCC_AT_LEAST_4_9 # python-pyicu -> icu > depends on BR2_INSTALL_LIBSTDCPP # python-pyicu -> icu > depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # python-pyicu -> icu > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_PYICU # runtime > # although optional, it is used as default compression > select BR2_PACKAGE_PYTHON3_XZ # runtime > @@ -15,7 +14,6 @@ config BR2_PACKAGE_PYTHON_SLOB > https://github.com/itkach/slob > > comment "python-slob needs a toolchain w/ C++, gcc >= 4.9, host gcc >= 4.9" > - depends on BR2_PACKAGE_PYTHON3 && !BR2_BINFMT_FLAT > depends on !BR2_INSTALL_LIBSTDCPP || \ > !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ > !BR2_HOST_GCC_AT_LEAST_4_9 > diff --git a/package/python-smmap2/Config.in b/package/python-smmap2/Config.in > index 1d4b1fabbe..21a3bdb613 100644 > --- a/package/python-smmap2/Config.in > +++ b/package/python-smmap2/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_SMMAP2 > bool "python-smmap2" > - depends on BR2_PACKAGE_PYTHON3 > help > Smmap wraps an interface around mmap and tracks the mapped > files as well as the amount of clients who use it. If the > diff --git a/package/python-socketio/Config.in b/package/python-socketio/Config.in > index 89d23b6ddf..a34853ec10 100644 > --- a/package/python-socketio/Config.in > +++ b/package/python-socketio/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_SOCKETIO > bool "python-socketio" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_BIDICT # runtime > select BR2_PACKAGE_PYTHON_ENGINEIO # runtime > help > diff --git a/package/python-sockjs/Config.in b/package/python-sockjs/Config.in > index 583d7ec741..92489ec71f 100644 > --- a/package/python-sockjs/Config.in > +++ b/package/python-sockjs/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_SOCKJS > bool "python-sockjs" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_AIOHTTP # runtime > help > SockJS server implementation for aiohttp. > diff --git a/package/python-soupsieve/Config.in b/package/python-soupsieve/Config.in > index eeac0ee36e..3cb7f8d0c5 100644 > --- a/package/python-soupsieve/Config.in > +++ b/package/python-soupsieve/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_SOUPSIEVE > bool "python-soupsieve" > - depends on BR2_PACKAGE_PYTHON3 > help > A modern CSS selector implementation for Beautiful Soup. > > diff --git a/package/python-sqliteschema/Config.in b/package/python-sqliteschema/Config.in > index b8fed33c49..102a615765 100644 > --- a/package/python-sqliteschema/Config.in > +++ b/package/python-sqliteschema/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_SQLITESCHEMA > bool "python-sqliteschema" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime > select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime > select BR2_PACKAGE_PYTHON_TABLEDATA # runtime > diff --git a/package/python-tabledata/Config.in b/package/python-tabledata/Config.in > index a73207f9c0..9947f41af6 100644 > --- a/package/python-tabledata/Config.in > +++ b/package/python-tabledata/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_TABLEDATA > bool "python-tabledata" > - depends on BR2_PACKAGE_PYTHON3 # python-dataproperty, python-typepy > select BR2_PACKAGE_PYTHON_DATAPROPERTY # runtime > select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime > select BR2_PACKAGE_PYTHON_SIX # runtime > diff --git a/package/python-tempora/Config.in b/package/python-tempora/Config.in > index 06ccbfc283..508cbae3f3 100644 > --- a/package/python-tempora/Config.in > +++ b/package/python-tempora/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_TEMPORA > bool "python-tempora" > - depends on BR2_PACKAGE_PYTHON3 # python-jaraco-functools > select BR2_PACKAGE_PYTHON_JARACO_FUNCTOOLS # runtime > select BR2_PACKAGE_PYTHON_SIX # runtime > select BR2_PACKAGE_PYTHON_PYTZ # runtime > diff --git a/package/python-tinycss2/Config.in b/package/python-tinycss2/Config.in > index e6c992b8c5..a34717e002 100644 > --- a/package/python-tinycss2/Config.in > +++ b/package/python-tinycss2/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_TINYCSS2 > bool "python-tinycss2" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_WEBENCODINGS # runtime > help > A tiny CSS parser. > diff --git a/package/python-tinyrpc/Config.in b/package/python-tinyrpc/Config.in > index 3194b7825a..3c643c754a 100644 > --- a/package/python-tinyrpc/Config.in > +++ b/package/python-tinyrpc/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_TINYRPC > bool "python-tinyrpc" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_SIX # runtime > help > A small, modular, transport and protocol neutral RPC > diff --git a/package/python-tomako/Config.in b/package/python-tomako/Config.in > index 1521035bb6..bd6d29982a 100644 > --- a/package/python-tomako/Config.in > +++ b/package/python-tomako/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_TOMAKO > bool "python-tomako" > - depends on BR2_PACKAGE_PYTHON3 # python-tornado > select BR2_PACKAGE_PYTHON_TORNADO # runtime > select BR2_PACKAGE_PYTHON_MAKO # runtime > help > diff --git a/package/python-tomli/Config.in b/package/python-tomli/Config.in > index e1cecaaa36..d2ae49a45f 100644 > --- a/package/python-tomli/Config.in > +++ b/package/python-tomli/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_TOMLI > bool "python-tomli" > - depends on BR2_PACKAGE_PYTHON3 > help > A lil' TOML parser. > > diff --git a/package/python-tornado/Config.in b/package/python-tornado/Config.in > index e1bf8343f0..b5c59e970d 100644 > --- a/package/python-tornado/Config.in > +++ b/package/python-tornado/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_TORNADO > bool "python-tornado" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON3_ZLIB > select BR2_PACKAGE_PYTHON3_SSL > help > diff --git a/package/python-traitlets/Config.in b/package/python-traitlets/Config.in > index 6515cdf8d1..a273601163 100644 > --- a/package/python-traitlets/Config.in > +++ b/package/python-traitlets/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_TRAITLETS > bool "python-traitlets" > - depends on BR2_PACKAGE_PYTHON3 > help > A configuration system for Python applications. > > diff --git a/package/python-treq/Config.in b/package/python-treq/Config.in > index 6e54c19e16..f781b37305 100644 > --- a/package/python-treq/Config.in > +++ b/package/python-treq/Config.in > @@ -3,7 +3,6 @@ config BR2_PACKAGE_PYTHON_TREQ > # 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 > diff --git a/package/python-twisted/Config.in b/package/python-twisted/Config.in > index 89298b2e0c..49a21c4204 100644 > --- a/package/python-twisted/Config.in > +++ b/package/python-twisted/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_TWISTED > bool "python-twisted" > - depends on BR2_PACKAGE_PYTHON3 # python-pyhamcrest; python-hyperlink -> python-idna > select BR2_PACKAGE_PYTHON_INCREMENTAL > select BR2_PACKAGE_PYTHON_ATTRS # runtime > select BR2_PACKAGE_PYTHON_AUTOMAT # runtime > diff --git a/package/python-txaio/Config.in b/package/python-txaio/Config.in > index 19a318a902..eddd983ea6 100644 > --- a/package/python-txaio/Config.in > +++ b/package/python-txaio/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_TXAIO > bool "python-txaio" > - depends on BR2_PACKAGE_PYTHON3 > help > Compatibility API between asyncio/Twisted/Trollius. > > diff --git a/package/python-txdbus/Config.in b/package/python-txdbus/Config.in > index ffd00f153e..f3ea4c78d6 100644 > --- a/package/python-txdbus/Config.in > +++ b/package/python-txdbus/Config.in > @@ -3,7 +3,6 @@ config BR2_PACKAGE_PYTHON_TXDBUS > # 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 0606e5f442..fbea7be8cf 100644 > --- a/package/python-txtorcon/Config.in > +++ b/package/python-txtorcon/Config.in > @@ -2,7 +2,6 @@ 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 > select BR2_PACKAGE_PYTHON_AUTOMAT # runtime > select BR2_PACKAGE_PYTHON_IDNA # runtime > select BR2_PACKAGE_PYTHON_INCREMENTAL # runtime > diff --git a/package/python-typepy/Config.in b/package/python-typepy/Config.in > index fd3b983186..3438e74475 100644 > --- a/package/python-typepy/Config.in > +++ b/package/python-typepy/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_TYPEPY > bool "python-typepy" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime > help > A Python library for variable type > diff --git a/package/python-ujson/Config.in b/package/python-ujson/Config.in > index aee1d75fce..81d1bc457c 100644 > --- a/package/python-ujson/Config.in > +++ b/package/python-ujson/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_UJSON > bool "python-ujson" > - depends on BR2_PACKAGE_PYTHON3 > help > UltraJSON is an ultra fast JSON encoder and decoder written > in pure C with bindings for Python 3. > diff --git a/package/python-unittest-xml-reporting/Config.in b/package/python-unittest-xml-reporting/Config.in > index b1a6244dd3..43b054faa7 100644 > --- a/package/python-unittest-xml-reporting/Config.in > +++ b/package/python-unittest-xml-reporting/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_UNITTEST_XML_REPORTING > bool "python-unittest-xml-reporting" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON3_PYEXPAT > help > unittest-based test runner with Ant/JUnit like XML > diff --git a/package/python-urwid/Config.in b/package/python-urwid/Config.in > index c141e8c0bd..f584a9258d 100644 > --- a/package/python-urwid/Config.in > +++ b/package/python-urwid/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_URWID > bool "python-urwid" > - depends on BR2_PACKAGE_PYTHON3 > help > Urwid is a console user interface library for Python > > diff --git a/package/python-uvloop/Config.in b/package/python-uvloop/Config.in > index 76e06ac3f4..b3fb275091 100644 > --- a/package/python-uvloop/Config.in > +++ b/package/python-uvloop/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_UVLOOP > bool "python-uvloop" > - depends on BR2_PACKAGE_PYTHON3 > depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv > depends on BR2_USE_MMU # libuv > depends on !BR2_STATIC_LIBS # libuv > diff --git a/package/python-validators/Config.in b/package/python-validators/Config.in > index 802b1dde5b..e700369910 100644 > --- a/package/python-validators/Config.in > +++ b/package/python-validators/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_VALIDATORS > bool "python-validators" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_SIX # runtime > select BR2_PACKAGE_PYTHON_DECORATOR # runtime > help > diff --git a/package/python-watchdog/Config.in b/package/python-watchdog/Config.in > index 6f0dd62073..18f569ee44 100644 > --- a/package/python-watchdog/Config.in > +++ b/package/python-watchdog/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_WATCHDOG > bool "python-watchdog" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_ARGH # runtime > select BR2_PACKAGE_PYTHON_PATHTOOLS # runtime > select BR2_PACKAGE_PYTHON_PYYAML # runtime > diff --git a/package/python-weasyprint/Config.in b/package/python-weasyprint/Config.in > index de68fe2f5b..4a7e5a513d 100644 > --- a/package/python-weasyprint/Config.in > +++ b/package/python-weasyprint/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_WEASYPRINT > bool "python-weasyprint" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_BROTLI # runtime > select BR2_PACKAGE_PYTHON_CFFI # runtime > select BR2_PACKAGE_PYTHON_CSSSELECT2 # runtime > diff --git a/package/python-webpy/Config.in b/package/python-webpy/Config.in > index 419a4a180f..ed78409572 100644 > --- a/package/python-webpy/Config.in > +++ b/package/python-webpy/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_WEBPY > bool "python-webpy" > - depends on BR2_PACKAGE_PYTHON3 # python-cheroot > select BR2_PACKAGE_PYTHON_CHEROOT # runtime > select BR2_PACKAGE_PYTHON_MARKDOWN # runtime > help > diff --git a/package/python-websockets/Config.in b/package/python-websockets/Config.in > index 888bec616f..60495b6284 100644 > --- a/package/python-websockets/Config.in > +++ b/package/python-websockets/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_WEBSOCKETS > bool "python-websockets" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON3_ZLIB > select BR2_PACKAGE_PYTHON3_SSL > help > diff --git a/package/python-wtforms/Config.in b/package/python-wtforms/Config.in > index 0cc136fc13..33a17d3d37 100644 > --- a/package/python-wtforms/Config.in > +++ b/package/python-wtforms/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_WTFORMS > bool "python-wtforms" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_MARKUPSAFE # runtime > help > A flexible forms validation and rendering library for > diff --git a/package/python-xlib/Config.in b/package/python-xlib/Config.in > index 20e585db9a..081af6a2fc 100644 > --- a/package/python-xlib/Config.in > +++ b/package/python-xlib/Config.in > @@ -1,6 +1,5 @@ > 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) > diff --git a/package/python-xlsxwriter/Config.in b/package/python-xlsxwriter/Config.in > index b5da7f3f1a..59fe3ba91c 100644 > --- a/package/python-xlsxwriter/Config.in > +++ b/package/python-xlsxwriter/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_XLSXWRITER > bool "python-xlsxwriter" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON3_ZLIB > help > A Python module for creating Excel XLSX files. > diff --git a/package/python-yarl/Config.in b/package/python-yarl/Config.in > index e52050451d..84e14ce92e 100644 > --- a/package/python-yarl/Config.in > +++ b/package/python-yarl/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_YARL > bool "python-yarl" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_MULTIDICT > select BR2_PACKAGE_PYTHON_IDNA > help > diff --git a/package/python-zeroconf/Config.in b/package/python-zeroconf/Config.in > index a56bf7c16c..1570674f59 100644 > --- a/package/python-zeroconf/Config.in > +++ b/package/python-zeroconf/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_ZEROCONF > bool "python-zeroconf" > - depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_IFADDR # runtime > help > Pure Python Multicast DNS Service Discovery Library > diff --git a/package/python-zopfli/Config.in b/package/python-zopfli/Config.in > index 69d4b8b514..0b1ebca85c 100644 > --- a/package/python-zopfli/Config.in > +++ b/package/python-zopfli/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_ZOPFLI > bool "python-zopfli" > - depends on BR2_PACKAGE_PYTHON3 > help > Zopfli module for python. > > -- > 2.20.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From peter at korsgaard.com Sat Feb 12 11:24:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 12 Feb 2022 12:24:08 +0100 Subject: [Buildroot] [PATCH] utils/genrandconfig: drop BR2_PACKAGE_PYTHON_PY_ONLY logic Message-ID: <20220212112409.11674-1-peter@korsgaard.com> The option was removed by commit 306839586b (package/python: drop target package). Signed-off-by: Peter Korsgaard --- utils/genrandconfig | 2 -- 1 file changed, 2 deletions(-) diff --git a/utils/genrandconfig b/utils/genrandconfig index 77c7e585f5..3483d55c14 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -365,8 +365,6 @@ def gen_config(args): configlines.append("BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y\n") if randint(0, 20) == 0: configlines.append("BR2_STATIC_LIBS=y\n") - if randint(0, 20) == 0: - configlines.append("BR2_PACKAGE_PYTHON_PY_ONLY=y\n") if randint(0, 20) == 0: configlines.append("BR2_PACKAGE_PYTHON3_PY_ONLY=y\n") if randint(0, 5) == 0: -- 2.20.1 From james.hilliard1 at gmail.com Sat Feb 12 11:31:30 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 12 Feb 2022 04:31:30 -0700 Subject: [Buildroot] [PATCH v2 1/1] package/python-flit-core: new package/infrastructure Message-ID: <20220212113130.1213295-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 --- Changes v1 -> v2: - rebase on master --- 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 bf0649fc9c..d574bfa2b0 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -94,6 +94,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 @@ -143,6 +184,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 @@ -163,6 +217,12 @@ endif # ($(4),target) # ifeq ($$($(2)_SETUP_TYPE),setuptools) $(2)_DEPENDENCIES += $$(if $$(filter host-python-setuptools,$(1)),,host-python-setuptools) +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. @@ -174,6 +234,15 @@ $(2)_PYTHON_INTERPRETER = $$(HOST_DIR)/bin/python # 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) \ @@ -182,12 +251,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) \ @@ -195,12 +273,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) \ @@ -209,12 +297,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) \ @@ -223,6 +321,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 james.hilliard1 at gmail.com Sat Feb 12 11:34:06 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 12 Feb 2022 04:34:06 -0700 Subject: [Buildroot] [PATCH v3 1/2] package/python-flit-core: new package/infrastructure Message-ID: <20220212113407.1213446-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 --- Changes v1 -> v2: - rebase on master --- 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 bf0649fc9c..d574bfa2b0 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -94,6 +94,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 @@ -143,6 +184,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 @@ -163,6 +217,12 @@ endif # ($(4),target) # ifeq ($$($(2)_SETUP_TYPE),setuptools) $(2)_DEPENDENCIES += $$(if $$(filter host-python-setuptools,$(1)),,host-python-setuptools) +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. @@ -174,6 +234,15 @@ $(2)_PYTHON_INTERPRETER = $$(HOST_DIR)/bin/python # 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) \ @@ -182,12 +251,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) \ @@ -195,12 +273,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) \ @@ -209,12 +297,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) \ @@ -223,6 +321,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 james.hilliard1 at gmail.com Sat Feb 12 11:34:07 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 12 Feb 2022 04:34:07 -0700 Subject: [Buildroot] [PATCH v3 2/2] package/python-tinycss2: bump to version 1.1.1 In-Reply-To: <20220212113407.1213446-1-james.hilliard1@gmail.com> References: <20220212113407.1213446-1-james.hilliard1@gmail.com> Message-ID: <20220212113407.1213446-2-james.hilliard1@gmail.com> This update drops distutils support and requires flit package infrastructure. Signed-off-by: James Hilliard --- Changes v2 -> v3: - add python-tinycss2 back in series --- 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 giulio.benetti at benettiengineering.com Sat Feb 12 11:41:56 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 12 Feb 2022 12:41:56 +0100 Subject: [Buildroot] [PATCH V3] board: Add support for iMX8MN BSH SMM S2 PRO In-Reply-To: References: Message-ID: <26185F3A-7ADE-4AEB-8769-01C07430ECD7@benettiengineering.com> Hi Michael, > Il giorno 12 feb 2022, alle ore 11:12, Michael Nazzareno Trimarchi ha scritto: > > ?Hi all > > Should I need to resend? anything is missing now? No, only need to wait until maintainers submit it or find something I haven?t found(hope not). Best regards Giulio > > Michael > >> On Mon, Jan 31, 2022 at 5:20 PM Ariel D'Alessandro >> wrote: >> >> 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 > > > > -- > 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 james.hilliard1 at gmail.com Sat Feb 12 11:50:27 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 12 Feb 2022 04:50:27 -0700 Subject: [Buildroot] [PATCH buildroot-test 1/1] scripts/autobuild-run: fix and default to python3 Message-ID: <20220212115027.1533516-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- scripts/autobuild-run | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/autobuild-run b/scripts/autobuild-run index 346928f..9219134 100755 --- a/scripts/autobuild-run +++ b/scripts/autobuild-run @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright (C) 2014 by Thomas Petazzoni # @@ -794,7 +794,7 @@ class Builder: while True: try: self.run_one_build() - except URLError, e: + except URLError as e: sleep(30) # args / config file merging inspired by: -- 2.25.1 From arnout at mind.be Sat Feb 12 11:53:49 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 12:53:49 +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: <57cb38e0-b657-a6be-9722-4444ec9c0558@mind.be> On 31/01/2022 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. > > 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 Series applied to master, thanks! Regards, Arnout > > 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 arnout at mind.be Sat Feb 12 11:50:05 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 12:50:05 +0100 Subject: [Buildroot] [git commit] configs/snps_arc700_axs101: bump kernel and u-boot versions Message-ID: <20220212114631.9BFDC8284B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=758a3dffd2769ee2fe27bd50f2a0ec7175c69f75 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Bump versions: - use U-Boot 2022.01 - use Linux kernel v5.16 Add U-Boot configuration fragment increasing early malloc pool size. Signed-off-by: Sergey Matyukevich Acked-by: Alexey Brodkin Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- board/synopsys/axs10x/uboot-fragment.config | 1 + configs/snps_arc700_axs101_defconfig | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/board/synopsys/axs10x/uboot-fragment.config b/board/synopsys/axs10x/uboot-fragment.config new file mode 100644 index 0000000000..92fe20f463 --- /dev/null +++ b/board/synopsys/axs10x/uboot-fragment.config @@ -0,0 +1 @@ +CONFIG_SYS_MALLOC_F_LEN=0x0500 diff --git a/configs/snps_arc700_axs101_defconfig b/configs/snps_arc700_axs101_defconfig index 080250e92b..3a6bd5c0d3 100644 --- a/configs/snps_arc700_axs101_defconfig +++ b/configs/snps_arc700_axs101_defconfig @@ -8,13 +8,13 @@ BR2_TARGET_ROOTFS_INITRAMFS=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/synopsys/axs10x/post-build.sh" -# Linux headers same as kernel, a 5.6 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_6=y +# Linux headers same as kernel, a 5.16 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.6.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" BR2_LINUX_KERNEL_DEFCONFIG="axs101" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y @@ -22,6 +22,8 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=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.05" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="axs101" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/synopsys/axs10x/uboot-fragment.config" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y From arnout at mind.be Sat Feb 12 11:50:42 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 12:50:42 +0100 Subject: [Buildroot] [git commit] configs/snps_archs32_axs103: bump kernel and u-boot versions Message-ID: <20220212114631.A357F7F960@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3d03b24075c3d02d3471412dd7e087964b1d9198 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Bump versions: - use U-Boot 2022.01 - use Linux kernel v5.16 Add U-Boot configuration fragment increasing early malloc pool size. Signed-off-by: Sergey Matyukevich Acked-by: Alexey Brodkin Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- configs/snps_archs38_axs103_defconfig | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/configs/snps_archs38_axs103_defconfig b/configs/snps_archs38_axs103_defconfig index c5847809ba..2002520d1b 100644 --- a/configs/snps_archs38_axs103_defconfig +++ b/configs/snps_archs38_axs103_defconfig @@ -9,13 +9,13 @@ BR2_TARGET_ROOTFS_INITRAMFS=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/synopsys/axs10x/post-build.sh" -# Linux headers same as kernel, a 5.6 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_6=y +# Linux headers same as kernel, a 5.16 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.6.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" BR2_LINUX_KERNEL_DEFCONFIG="axs103_smp" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y @@ -23,6 +23,8 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=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.05" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="axs103" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/synopsys/axs10x/uboot-fragment.config" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y From arnout at mind.be Sat Feb 12 11:51:01 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 12:51:01 +0100 Subject: [Buildroot] [git commit] configs/snps_archs38_haps: bump kernel and u-boot versions Message-ID: <20220212114631.B237B82ACC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=37dae0ac31f82d5808c40dafc42267db35cbd262 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Bump versions: - use U-Boot 2022.01 - use Linux kernel v5.16 Signed-off-by: Sergey Matyukevich Acked-by: Alexey Brodkin Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- configs/snps_archs38_haps_defconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/snps_archs38_haps_defconfig b/configs/snps_archs38_haps_defconfig index a95d760df2..02e020bb47 100644 --- a/configs/snps_archs38_haps_defconfig +++ b/configs/snps_archs38_haps_defconfig @@ -7,12 +7,12 @@ BR2_TARGET_GENERIC_HOSTNAME="zebu_hs" BR2_TARGET_GENERIC_ISSUE="Welcome to the HAPS Development Platform" BR2_TARGET_ROOTFS_INITRAMFS=y -# Linux headers same as kernel, a 5.6 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_6=y +# Linux headers same as kernel, a 5.16 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.6.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" BR2_LINUX_KERNEL_DEFCONFIG="haps_hs_smp" BR2_LINUX_KERNEL_VMLINUX=y From arnout at mind.be Sat Feb 12 11:51:11 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 12:51:11 +0100 Subject: [Buildroot] [git commit] board/synopsys: remove outdated vdk boards Message-ID: <20220212114631.C019A7F960@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a778def2ac28eb7a993a33e51ab305b0c833d713 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Remove outdated and unused aarch64 and archs38 Synopsys VDK boards. Signed-off-by: Sergey Matyukevich Acked-by: Alexey Brodkin Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 5 - board/synopsys/vdk/linux-vdk-aarch64-defconfig | 143 ------------------------- board/synopsys/vdk/readme.txt | 65 ----------- configs/snps_aarch64_vdk_defconfig | 12 --- configs/snps_archs38_vdk_defconfig | 20 ---- 5 files changed, 245 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index eb073c41f1..689673fce7 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -215,7 +215,6 @@ F: configs/snps_arc700_axs101_defconfig F: configs/snps_archs38_axs103_defconfig F: configs/snps_archs38_haps_defconfig F: configs/snps_archs38_hsdk_defconfig -F: configs/snps_archs38_vdk_defconfig N: Ariel D'Alessandro F: package/axfsutils/ @@ -1420,10 +1419,6 @@ F: package/ssdp-responder/ F: package/sysklogd/ F: package/watchdogd/ -N: Joao Pinto -F: board/synopsys/vdk/ -F: configs/snps_aarch64_vdk_defconfig - N: Jochen Baltes F: package/altera-stapl diff --git a/board/synopsys/vdk/linux-vdk-aarch64-defconfig b/board/synopsys/vdk/linux-vdk-aarch64-defconfig deleted file mode 100644 index 8109e16925..0000000000 --- a/board/synopsys/vdk/linux-vdk-aarch64-defconfig +++ /dev/null @@ -1,143 +0,0 @@ -CONFIG_SYSVIPC=y -CONFIG_POSIX_MQUEUE=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=16 -CONFIG_CGROUPS=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_EMBEDDED=y -CONFIG_SLAB=y -CONFIG_PROFILING=y -CONFIG_CC_STACKPROTECTOR_REGULAR=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_SMP=y -CONFIG_SCHED_MC=y -CONFIG_SCHED_SMT=y -CONFIG_NR_CPUS=8 -CONFIG_PREEMPT=y -CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 -CONFIG_TRANSPARENT_HUGEPAGE=y -CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y -CONFIG_CMDLINE="console=ttyAMA0 earlyprintk=pl011,0x1c090000 debug user_debug=31 loglevel=9 root=/dev/vda" -CONFIG_CMDLINE_FORCE=y -CONFIG_BINFMT_MISC=y -CONFIG_CPU_IDLE=y -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_GOV_USERSPACE=y -CONFIG_CPU_FREQ_GOV_ONDEMAND=y -CONFIG_ARM_BIG_LITTLE_CPUFREQ=y -CONFIG_ARM_DT_BL_CPUFREQ=y -CONFIG_ARM_SPCI_CPUFREQ=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_XFRM_USER=y -CONFIG_NET_KEY=y -CONFIG_NET_KEY_MIGRATE=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -CONFIG_IP_PNP_RARP=y -CONFIG_SYN_COOKIES=y -CONFIG_NETWORK_PHY_TIMESTAMPING=y -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_DEVTMPFS=y -CONFIG_DEVTMPFS_MOUNT=y -CONFIG_VEXPRESS_CONFIG=y -CONFIG_CONNECTOR=m -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_NBD=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=65536 -CONFIG_VIRTIO_BLK=y -CONFIG_SCSI=y -CONFIG_BLK_DEV_SD=y -CONFIG_BLK_DEV_DM=y -CONFIG_NETDEVICES=y -CONFIG_STMMAC_ETH=m -CONFIG_INPUT_EVDEV=y -CONFIG_INPUT_MISC=y -CONFIG_INPUT_UINPUT=y -CONFIG_SERIO_AMBAKMI=y -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_AMBA_PL011=y -CONFIG_SERIAL_AMBA_PL011_CONSOLE=y -CONFIG_SERIAL_OF_PLATFORM=y -CONFIG_VIRTIO_CONSOLE=y -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_DESIGNWARE_PLATFORM=y -CONFIG_GPIOLIB=y -CONFIG_GPIO_SYSFS=y -CONFIG_POWER_RESET_VEXPRESS=y -CONFIG_FB=y -CONFIG_FB_ARMCLCD=y -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_LOGO=y -CONFIG_USB_HIDDEV=y -CONFIG_USB=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_HCD_SYNOPSYS=y -CONFIG_USB_OHCI_HCD=y -CONFIG_NOP_USB_XCEIV=y -CONFIG_USB_ULPI=y -CONFIG_USB_DUMMY_HCD=m -CONFIG_USB_G_SERIAL=m -CONFIG_MMC=y -CONFIG_MMC_ARMMMCI=y -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -CONFIG_LEDS_GPIO=y -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_TIMER=y -CONFIG_LEDS_TRIGGER_ONESHOT=y -CONFIG_LEDS_TRIGGER_HEARTBEAT=y -CONFIG_LEDS_TRIGGER_BACKLIGHT=y -CONFIG_LEDS_TRIGGER_CPU=y -CONFIG_LEDS_TRIGGER_GPIO=y -CONFIG_SWITCH=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_PL031=y -CONFIG_VIRTIO_BALLOON=y -CONFIG_VIRTIO_MMIO=y -CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y -CONFIG_COMMON_CLK_VERSATILE=y -CONFIG_CLK_SP810=y -CONFIG_CLK_VEXPRESS_OSC=y -CONFIG_COMMON_CLK_SCPI=y -CONFIG_MAILBOX=y -CONFIG_ARM_SCPI_PROTOCOL=y -CONFIG_EXT4_FS=y -CONFIG_EXT4_FS_SECURITY=y -CONFIG_BTRFS_FS=m -CONFIG_QFMT_V2=y -CONFIG_AUTOFS4_FS=m -CONFIG_MSDOS_FS=m -CONFIG_VFAT_FS=m -CONFIG_TMPFS=y -CONFIG_TMPFS_POSIX_ACL=y -CONFIG_HUGETLBFS=m -CONFIG_ECRYPT_FS=m -CONFIG_CRAMFS=m -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ISO8859_1=y -CONFIG_VIRTUALIZATION=y -CONFIG_KVM=y -CONFIG_DYNAMIC_DEBUG=y -CONFIG_DEBUG_INFO=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_SCHEDSTATS=y -CONFIG_TIMER_STATS=y -CONFIG_FUNCTION_TRACER=y -CONFIG_STRICT_DEVMEM=y -CONFIG_SECURITY=y -CONFIG_SECURITY_NETWORK_XFRM=y -CONFIG_LSM_MMAP_MIN_ADDR=0 - diff --git a/board/synopsys/vdk/readme.txt b/board/synopsys/vdk/readme.txt deleted file mode 100644 index 9804647340..0000000000 --- a/board/synopsys/vdk/readme.txt +++ /dev/null @@ -1,65 +0,0 @@ -Synopsys VDK Software Development Platform - -Intro -===== - -The Virtualizer Development Kit (VDK) Family for ARM Cortex Products -consists of a set of virtual prototypes that provide a virtualizer for -the ARM core variants. The VDK is a standalone package that runs on an -host computer. - -Buildroot will generate the kernel image and a minimal root filesystem. - -How to build it -=============== - -Configure Buildroot -------------------- - -Configuring Buildroot is pretty simple, just execute: - - $ make snps_aarch64_vdk_defconfig - -Build the rootfs and kernel ---------------------------- - -Note: you will need to have access to the network, since Buildroot will -download the packages' sources. - -You may now build your rootfs with: - - $ make - -(This may take a while) - -Result of the build -------------------- - -After building, you should obtain this tree: - - output/images/ - -- rootfs.ext2 - -- Image - -Installing your rootfs and Image -================================ - -Now copy the content of the output/images folder to the VDK' skins -folder: - - $ cp rootfs.ext2 Image /skins/Vanilla-Cortex/ARMv8 - - -Starting the VDK -================================ - -Go the VDK' installation root and execute the 'start' script: - - $ cd - $ ./start.sh - -The VP Explorer application will be executed, starting the simulation -automatically. - -For more information about Synopsys' VDK please check: -http://www.synopsys.com/Prototyping/VirtualPrototyping/Pages/default.aspx diff --git a/configs/snps_aarch64_vdk_defconfig b/configs/snps_aarch64_vdk_defconfig deleted file mode 100644 index b55dce1ad6..0000000000 --- a/configs/snps_aarch64_vdk_defconfig +++ /dev/null @@ -1,12 +0,0 @@ -BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_6=y -BR2_TARGET_GENERIC_HOSTNAME="vdk-buildroot" -BR2_TARGET_GENERIC_ISSUE="Welcome to SNPS VDK by Buildroot" -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.6" -BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/synopsys/vdk/linux-vdk-aarch64-defconfig" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -# BR2_TARGET_ROOTFS_TAR is not set diff --git a/configs/snps_archs38_vdk_defconfig b/configs/snps_archs38_vdk_defconfig deleted file mode 100644 index 8d8e9f7559..0000000000 --- a/configs/snps_archs38_vdk_defconfig +++ /dev/null @@ -1,20 +0,0 @@ -# Architecture -BR2_arcle=y -BR2_archs38=y - -# System -BR2_TARGET_GENERIC_HOSTNAME="archs38_vdk" -BR2_TARGET_GENERIC_ISSUE="Welcome to the HS38 VDK Software Development Platform" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/synopsys/axs10x/post-build.sh" -BR2_TARGET_ROOTFS_EXT2=y - -# Linux headers same as kernel, a 5.6 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_6=y - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.6.3" -BR2_LINUX_KERNEL_DEFCONFIG="vdk_hs38_smp" -BR2_LINUX_KERNEL_VMLINUX=y -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y From arnout at mind.be Sat Feb 12 11:50:51 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 12:50:51 +0100 Subject: [Buildroot] [git commit] configs/snps_archs38_hsdk: bump kernel and u-boot versions Message-ID: <20220212114631.AAC0682AB5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5069a6ba15b4118111bf6b33b8e98553b3c084e6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Bump versions: - use U-Boot 2022.01 - use Linux kernel v5.16 Signed-off-by: Sergey Matyukevich Acked-by: Alexey Brodkin Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- configs/snps_archs38_hsdk_defconfig | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/configs/snps_archs38_hsdk_defconfig b/configs/snps_archs38_hsdk_defconfig index 4a1ac3fcff..413ca5098c 100644 --- a/configs/snps_archs38_hsdk_defconfig +++ b/configs/snps_archs38_hsdk_defconfig @@ -1,7 +1,7 @@ BR2_arcle=y BR2_archs38_full=y BR2_TOOLCHAIN_BUILDROOT_GLIBC=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y BR2_PACKAGE_GLIBC_UTILS=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_TARGET_OPTIMIZATION="-mfpu=fpud_all" @@ -12,7 +12,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/synopsys/hsdk/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.6.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" BR2_LINUX_KERNEL_DEFCONFIG="hsdk" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/synopsys/hsdk/linux.fragment" BR2_TARGET_ROOTFS_EXT2=y @@ -21,10 +21,11 @@ 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.05" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="hsdk" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_ELF=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y From arnout at mind.be Sat Feb 12 12:10:01 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 13:10:01 +0100 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: On 31/01/2022 15:55, Michael Trimarchi wrote: > Add initial support for iMX8MN BSH SMM S2 PRO board: > > - Linux: v5.17-rc1 I'm a bit uncomfortable to add an -rc version. But I guess it can be updated as soon as 5.17 is released. > - 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 [snip] > 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/ You should also add configs/bsh_smms2pro_defconfig here. > 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" This is really a great way of doing it! > 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 Please also explain where you get uuu. Can we build it as part of buildroot? Then refer to it as output/host/bin/uuu. > + > + > +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 Even if the default happens to be correct, I prefer the subarch to be specified explicitly. That way we can change the default later without affecting this defconfig. > +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" I may be missing something, but this doesn't seem to be used by any of the post- scripts? > +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" Please use the tarball instead. Simply setting CUSTOM_VERSION should be sufficient - if not, linux.mk has tobe fixed. > +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" Gitlab is able to generate tarballs as well. There are plenty of examples in the tree. I would normally fix these things up while applying, but since I'm not entirely sure about merging a -rc kernel anyway, I'll wait for a v4 instead. Oh, one more thing: the subject for a new defconfig is typically "configs/bsh_smms2pro_defconfig: new defconfig" Regards, Arnout > +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 From arnout at mind.be Sat Feb 12 12:19:38 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 13:19:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/pkg-python: fix get_platform for target builds In-Reply-To: <20220130090535.404853-1-james.hilliard1@gmail.com> References: <20220130090535.404853-1-james.hilliard1@gmail.com> Message-ID: <449521f4-cef8-6209-7e94-bc2e7b9ca504@mind.be> On 30/01/2022 10:05, James Hilliard wrote: > 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 Applied to master, thanks. Regards, Arnout > --- > 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) \ From arnout at mind.be Sat Feb 12 12:13:18 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 13:13:18 +0100 Subject: [Buildroot] [git commit] package/pkg-python: fix get_platform for target builds Message-ID: <20220212121212.582E382578@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=59d3a1a9994c337207cd0bfdfbd79f01ff8739e6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/pkg-python.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index bf0649fc9c..02df061a19 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_PROJECT_BASE="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_DIR),$(PYTHON_DIR))" \ _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ _python_sysroot=$(STAGING_DIR) \ @@ -61,6 +69,7 @@ HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \ # Target setuptools-based packages PKG_PYTHON_SETUPTOOLS_ENV = \ + _PYTHON_HOST_PLATFORM="$(PKG_PYTHON_HOST_PLATFORM)" \ _PYTHON_PROJECT_BASE="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_DIR),$(PYTHON_DIR))" \ _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ PATH=$(BR_PATH) \ From michael at amarulasolutions.com Sat Feb 12 12:36:01 2022 From: michael at amarulasolutions.com (Michael Nazzareno Trimarchi) Date: Sat, 12 Feb 2022 13:36:01 +0100 Subject: [Buildroot] [PATCH V3] board: Add support for iMX8MN BSH SMM S2 PRO In-Reply-To: References: <20220131145555.2819020-1-michael@amarulasolutions.com> Message-ID: Hi On Sat, Feb 12, 2022 at 1:10 PM Arnout Vandecappelle wrote: > > > > On 31/01/2022 15:55, Michael Trimarchi wrote: > > Add initial support for iMX8MN BSH SMM S2 PRO board: > > > > - Linux: v5.17-rc1 > > I'm a bit uncomfortable to add an -rc version. But I guess it can be updated > as soon as 5.17 is released. Ok, I will then wait > > > - 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 > [snip] > > 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/ > > You should also add configs/bsh_smms2pro_defconfig here. > > > 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" > > This is really a great way of doing it! > Well, I have taken from another submitted board > > 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 > > Please also explain where you get uuu. Can we build it as part of buildroot? > Then refer to it as output/host/bin/uuu. Ok I will update it > > > + > > + > > +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 > > Even if the default happens to be correct, I prefer the subarch to be > specified explicitly. That way we can change the default later without affecting > this defconfig. > > > +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" > > I may be missing something, but this doesn't seem to be used by any of the > post- scripts? Ok > > > +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" > > Please use the tarball instead. Simply setting CUSTOM_VERSION should be > sufficient - if not, linux.mk has tobe fixed. Ok > > > +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" > > Gitlab is able to generate tarballs as well. There are plenty of examples in > the tree. > > > I would normally fix these things up while applying, but since I'm not > entirely sure about merging a -rc kernel anyway, I'll wait for a v4 instead. > I will prepare v4 Michael > Oh, one more thing: the subject for a new defconfig is typically > "configs/bsh_smms2pro_defconfig: new defconfig" > > Regards, > Arnout > > > +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 -- 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 arnout at mind.be Sat Feb 12 12:42:14 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 13:42:14 +0100 Subject: [Buildroot] [PATCH V3] board: Add support for iMX8MN BSH SMM S2 PRO In-Reply-To: References: <20220131145555.2819020-1-michael@amarulasolutions.com> Message-ID: On 12/02/2022 13:36, Michael Nazzareno Trimarchi wrote: > Hi > > On Sat, Feb 12, 2022 at 1:10 PM Arnout Vandecappelle wrote: >> >> >> >> On 31/01/2022 15:55, Michael Trimarchi wrote: >>> Add initial support for iMX8MN BSH SMM S2 PRO board: >>> >>> - Linux: v5.17-rc1 >> >> I'm a bit uncomfortable to add an -rc version. But I guess it can be updated >> as soon as 5.17 is released. > > Ok, I will then wait No, what I meant to say is: it's OK to do it with the -rc, just make sure that you update it to the release version when it comes around (which will still be another 8-ish weeks). If we still manage to merge this board before 2022.02, we'll just backport the bump to the LTS branch. Regards, Arnout [snip] From arnout at mind.be Sat Feb 12 12:46:33 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 13:46:33 +0100 Subject: [Buildroot] [PATCH 1/2] boot/uboot: depend on host-python-setuptools Message-ID: <20220212124634.3148041-1-arnout@mind.be> host-python3-setuptools was removed, we should instead use plain host-python-setuptools. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- boot/uboot/uboot.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 9e569906ce..6750069173 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -208,7 +208,7 @@ UBOOT_DEPENDENCIES += host-dtc endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON3),y) -UBOOT_DEPENDENCIES += host-python3 host-python3-setuptools +UBOOT_DEPENDENCIES += host-python3 host-python-setuptools endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYLIBFDT),y) -- 2.34.1 From arnout at mind.be Sat Feb 12 12:46:34 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 13:46:34 +0100 Subject: [Buildroot] [PATCH 2/2] package/python-regex: remove outdated comment In-Reply-To: <20220212124634.3148041-1-arnout@mind.be> References: <20220212124634.3148041-1-arnout@mind.be> Message-ID: <20220212124634.3148041-2-arnout@mind.be> python3-regex no longer exists, so there's no need to keep in sync with it. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-regex/python-regex.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/python-regex/python-regex.mk b/package/python-regex/python-regex.mk index a90fd579ac..b93607e40f 100644 --- a/package/python-regex/python-regex.mk +++ b/package/python-regex/python-regex.mk @@ -4,7 +4,6 @@ # ################################################################################ -# Please keep in sync with package/python3-regex/python3-regex.mk PYTHON_REGEX_VERSION = 2021.4.4 PYTHON_REGEX_SOURCE = regex-$(PYTHON_REGEX_VERSION).tar.gz PYTHON_REGEX_SITE = https://files.pythonhosted.org/packages/38/3f/4c42a98c9ad7d08c16e7d23b2194a0e4f3b2914662da8bc88986e4e6de1f -- 2.34.1 From arnout at mind.be Sat Feb 12 12:51:58 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 13:51:58 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add test for python-distro In-Reply-To: <20220130172145.888946-1-ju.o@free.fr> References: <20220130172145.888946-1-ju.o@free.fr> Message-ID: On 30/01/2022 18:21, Julien Olivain wrote: > 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 Applied to master, thanks. I removed the python2 part of course. Regards, Arnout > --- > 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"] From arnout at mind.be Sat Feb 12 12:55:17 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 13:55:17 +0100 Subject: [Buildroot] [PATCH 1/1] package:{clang, lld, llvm}: bump to version 11.1.0 In-Reply-To: References: <20220131015937.4113728-1-james.hilliard1@gmail.com> <20220131104553.715b97ce@windsurf> <731c2ec5-e693-f2d4-5f48-0eaf376c57d1@smile.fr> Message-ID: <6b5d3b43-fe50-0dd2-2903-e404ee7792b9@mind.be> On 02/02/2022 20:39, James Hilliard wrote: > On Mon, Jan 31, 2022 at 4:36 AM Romain Naour wrote: >> >> Hello James, Thomas, All, >> >> Le 31/01/2022 ? 10:45, Thomas Petazzoni via buildroot a ?crit : >>> On Sun, 30 Jan 2022 18:59:37 -0700 >>> James Hilliard wrote: >>> >>>> This appears to be the latest version that has a working lld build. >>>> >>>> Version 12.0.0 and newer have broken lld stand-alone builds: >>>> https://bugs.llvm.org/show_bug.cgi?id=49228 >>>> >>>> Signed-off-by: James Hilliard >>> >>> Is this really enough? I remember seeing patches a long time ago doing >>> bumps on LLVM/Clang and that was much more involved, which I think >>> explains why we're still at version 9.x. >>> >>> Romain, any comments on this? >> >> Adding Matt in Cc: >> >> IIRC, there is an issue with libclc package which is part of the llvm project. >> >> Due to the gap between the two version, all CMake options must be reviewed (long >> and boring task I agree). > > Oh, I guess there was already a series here with more changes: > https://patchwork.ozlabs.org/project/buildroot/list/?series=233431&submitter=&state=*&q=&archive=both&delegate= Given the discussion in both these threads, I've marked the patch as Changes Requested. Regards, Arnout From arnout at mind.be Sat Feb 12 13:05:12 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 14:05:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/libbpf: bump to version 0.6.1 In-Reply-To: <20220131020258.4114933-1-james.hilliard1@gmail.com> References: <20220131020258.4114933-1-james.hilliard1@gmail.com> Message-ID: <6cb7068a-66a0-9d93-2494-5e0d9fb4f364@mind.be> On 31/01/2022 03:02, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/libbpf/libbpf.hash | 2 +- > package/libbpf/libbpf.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/libbpf/libbpf.hash b/package/libbpf/libbpf.hash > index afc7aec1bf..27e22be9e9 100644 > --- a/package/libbpf/libbpf.hash > +++ b/package/libbpf/libbpf.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 21cbee4df093e7fd29e76ed429650d3f3abe3a893f35e346ab9bc3484f6e68c0 libbpf-0.4.0.tar.gz > +sha256 ce3a8eb32d85ac48490256597736d8b27e0a5e947a0731613b7aba6b4ae43ac0 libbpf-0.6.1.tar.gz > sha256 847f4addbd56e2d5be20c4ea0845e972672fc07b755fadaae5f7abd35d71e349 LICENSE > sha256 6313108c23efffa36948f8b2cff1560a5935373b527b0e1a837cc77e6ed1bacd LICENSE.BSD-2-Clause > sha256 0b9a4febcdee6de55872501d5c1a8f5d8b0d1650cd4d5351995ceb22e889f8ca LICENSE.LGPL-2.1 > diff --git a/package/libbpf/libbpf.mk b/package/libbpf/libbpf.mk > index 3f09cc38dc..6750b063c0 100644 > --- a/package/libbpf/libbpf.mk > +++ b/package/libbpf/libbpf.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBBPF_VERSION = 0.4.0 > +LIBBPF_VERSION = 0.6.1 > LIBBPF_SITE = $(call github,libbpf,libbpf,v$(LIBBPF_VERSION)) > LIBBPF_LICENSE = GPL-2.0, LGPL-2.1, BSD-2-Clause > LIBBPF_LICENSE_FILES = LICENSE LICENSE.BSD-2-Clause LICENSE.LGPL-2.1 From arnout at mind.be Sat Feb 12 13:06:53 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 14:06:53 +0100 Subject: [Buildroot] [PATCH 1/2] package/thermald: update URL in the docs In-Reply-To: <20220131024451.2580165-1-ricardo.martincoski@gmail.com> References: <20220131024451.2580165-1-ricardo.martincoski@gmail.com> Message-ID: On 31/01/2022 03:44, Ricardo Martincoski wrote: > Old project homepage was removed, so switch to github, already in use to > download the sources. > > Signed-off-by: Ricardo Martincoski Applied to master, thanks. Regards, Arnout > --- > This commit can be backported to maintenance branches > --- > package/thermald/Config.in | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/thermald/Config.in b/package/thermald/Config.in > index 6d74a164b6..e5e15b9b8d 100644 > --- a/package/thermald/Config.in > +++ b/package/thermald/Config.in > @@ -20,7 +20,7 @@ config BR2_PACKAGE_THERMALD > reaches a certain threshold, the Linux daemon activates > various cooling methods to try to cool the system. > > - https://01.org/linux-thermal-daemon > + https://github.com/intel/thermal_daemon > > comment "thermald needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" > depends on BR2_i386 || BR2_x86_64 From arnout at mind.be Sat Feb 12 13:09:14 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 14:09:14 +0100 Subject: [Buildroot] [PATCH 2/2] package/thermald: bump to 2.4.8 In-Reply-To: <20220131024451.2580165-2-ricardo.martincoski@gmail.com> References: <20220131024451.2580165-1-ricardo.martincoski@gmail.com> <20220131024451.2580165-2-ricardo.martincoski@gmail.com> Message-ID: <3537c4f9-b868-977e-12a1-c6d464aef044@mind.be> On 31/01/2022 03:44, Ricardo Martincoski wrote: > Two source files had their header updated to correctly state the licence > is GPL-2.0+, not GPL-2.0. There is no real licensing change to the > project in this bump. > > Signed-off-by: Ricardo Martincoski > --- > It is a bugfix release, so it is only for master: No, it's a bugfix release, so it should be backported to stable... > > Release 2.4.8 > -Fix Ideapad thermal shutdown issue #328 > > Release 2.4.7 > - Fix AC/DC power limit issue in some HP TigerLake systems > - Regression fix for RAPL MSR usage in xml config file > - Added Japer Lake and Alder Lake CPU models > - Debug scripts for log collection to upload Peter does backporting by going through the commit messages and deciding based on them whether it's for backport or not. Therefore, it's better to put this above the --- line. Applied to master, thanks. Regards, Arnout > --- > test-pkg config 1: > BR2_PACKAGE_THERMALD=y > BR2_INIT_SYSTEMD=y > https://gitlab.com/RicardoMartincoski/buildroot/-/pipelines/459263710 > > test-pkg config 2: > BR2_PACKAGE_THERMALD=y > BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y > https://gitlab.com/RicardoMartincoski/buildroot/-/pipelines/459264537 > --- > package/thermald/thermald.hash | 2 +- > package/thermald/thermald.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/thermald/thermald.hash b/package/thermald/thermald.hash > index 0a37f0e413..3a7c0f6952 100644 > --- a/package/thermald/thermald.hash > +++ b/package/thermald/thermald.hash > @@ -1,3 +1,3 @@ > # Locally computed: > -sha256 80c92902a89b72a9df85c51a8b5fc472cc01b4410600ef1f56d62c4ac23890c1 thermald-2.4.6.tar.gz > +sha256 3e5a5033339c021de41ed4f946dd39e13f79f722fb5bd98d798e83658184c39b thermald-2.4.8.tar.gz > sha256 e98be8bc482e038a14bfbc01caf800bbd0024fff275ef14cd999db6560254a8d COPYING > diff --git a/package/thermald/thermald.mk b/package/thermald/thermald.mk > index 9b303104e3..4e43277128 100644 > --- a/package/thermald/thermald.mk > +++ b/package/thermald/thermald.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -THERMALD_VERSION = 2.4.6 > +THERMALD_VERSION = 2.4.8 > THERMALD_SITE = $(call github,intel,thermal_daemon,v$(THERMALD_VERSION)) > # fetched from Github, with no configure script > THERMALD_AUTORECONF = YES From luca at lucaceresoli.net Sat Feb 12 13:09:18 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Sat, 12 Feb 2022 14:09:18 +0100 Subject: [Buildroot] [PATCH v5 2/2] add configs/zynqmp_zcu102_defconfig In-Reply-To: References: <20220211121740.1257919-1-neal.frager@xilinx.com> <20220211121740.1257919-2-neal.frager@xilinx.com> Message-ID: Hi Neal, On 11/02/22 14:16, Neal Frager wrote: > Hi Luca, > > I have encountered yet another issue. > > If the pm_cfg_obj.c file is generated with Vitis 2021.2, it looks like the following: > There is a new "#define PM_CONFIG_OBJECT_TYPE_BASE 0x1U" > which breaks the pm_cfg_obj_convert.py. > > Could you generate a new version of the script that supports the Vitis 2021 file format? Thank you for the report! I just sent a patch [0] to U-Boot to add this define to the script. I compared your file with one generated by an older Vivado and it looks like no other define has been added. Of course you can reply to that patch with your review, it would help getting it in mainline sooner. Now you can send a new version of your Buildroot patches that adds this U-Boot patch, so you can use an unmodified pm_cfg_obj.c Hint to use the patch: - go to [0] - click "mbox" to download the patch in the same format as 'git format-patch' - save that file into your Buildroot $BR2_GLOBAL_PATCH_DIR/uboot - edit the file to add a 'Fetch from:' line according to [1] The patch should be applied automatically on 'make uboot-clean uboot'. [0] https://patchwork.ozlabs.org/project/uboot/patch/20220212125121.3398547-1-luca at lucaceresoli.net/ [1] https://buildroot.org/downloads/manual/manual.html#_integrating_patches_found_on_the_web -- Luca From arnout at mind.be Sat Feb 12 13:10:29 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 14:10:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/xml-security-c: needs threads In-Reply-To: <20220128173002.2483220-1-fontaine.fabrice@gmail.com> References: <20220128173002.2483220-1-fontaine.fabrice@gmail.com> Message-ID: <4dbf1b11-209a-b222-bea5-7ad7c531baff@mind.be> On 28/01/2022 18:30, Fabrice Fontaine wrote: > 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 Applied to master, thanks. Regards, Arnout > --- > 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 From arnout at mind.be Sat Feb 12 13:11:57 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 14:11:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/protozero: bump version to 1.7.1 In-Reply-To: <20220128045140.272465-1-fido_max@inbox.ru> References: <20220128045140.272465-1-fido_max@inbox.ru> Message-ID: On 28/01/2022 05:51, Maxim Kochetkov via buildroot wrote: > Drop upstream patch. > Release-notes: https://github.com/mapbox/protozero/releases/tag/v1.7.1 > > Signed-off-by: Maxim Kochetkov Applied to master, thanks. Regards, Arnout > --- > ...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 From luca at lucaceresoli.net Sat Feb 12 13:13:28 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Sat, 12 Feb 2022 14:13:28 +0100 Subject: [Buildroot] [PATCH v6 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <20220211144402.1626443-1-neal.frager@xilinx.com> References: <20220211144402.1626443-1-neal.frager@xilinx.com> Message-ID: <69189572-6eba-ed26-52dd-08a8b098f124@lucaceresoli.net> Hi Neal, On 11/02/22 15:44, Neal Frager wrote: [...] > diff --git a/board/zynqmp/zcu106/pm_cfg_obj.c b/board/zynqmp/zcu106/pm_cfg_obj.c > new file mode 100644 > index 0000000000..6d15d510e9 > --- /dev/null > +++ b/board/zynqmp/zcu106/pm_cfg_obj.c > @@ -0,0 +1,562 @@ > +/****************************************************************************** > +* Copyright (c) 2017 - 2021 Xilinx, Inc. All rights reserved. > +* SPDX-License-Identifier: MIT > +******************************************************************************/ > + > +#include "xil_types.h" > +#include "pm_defs.h" > + > +#define PM_CONFIG_MASTER_SECTION_ID 0x101U > +#define PM_CONFIG_SLAVE_SECTION_ID 0x102U > +#define PM_CONFIG_PREALLOC_SECTION_ID 0x103U > +#define PM_CONFIG_POWER_SECTION_ID 0x104U > +#define PM_CONFIG_RESET_SECTION_ID 0x105U > +#define PM_CONFIG_SHUTDOWN_SECTION_ID 0x106U > +#define PM_CONFIG_SET_CONFIG_SECTION_ID 0x107U > +#define PM_CONFIG_GPO_SECTION_ID 0x108U > + > +#define PM_SLAVE_FLAG_IS_SHAREABLE 0x1U > +#define PM_MASTER_USING_SLAVE_MASK 0x2U > + > +#define PM_CONFIG_GPO1_MIO_PIN_34_MAP (1U << 10U) > +#define PM_CONFIG_GPO1_MIO_PIN_35_MAP (1U << 11U) > +#define PM_CONFIG_GPO1_MIO_PIN_36_MAP (1U << 12U) > +#define PM_CONFIG_GPO1_MIO_PIN_37_MAP (1U << 13U) > + > +#define PM_CONFIG_GPO1_BIT_2_MASK (1U << 2U) > +#define PM_CONFIG_GPO1_BIT_3_MASK (1U << 3U) > +#define PM_CONFIG_GPO1_BIT_4_MASK (1U << 4U) > +#define PM_CONFIG_GPO1_BIT_5_MASK (1U << 5U) > + > +#define SUSPEND_TIMEOUT 0xFFFFFFFFU > + > +#define PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK 0x00000001 > +#define PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK 0x00000100 > +#define PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK 0x00000200 > + > + > + > +#if defined (__ICCARM__) > +#pragma language=save > +#pragma language=extended > +#endif > +#if defined (__GNUC__) > + const u32 XPm_ConfigObject[] __attribute__((used, section(".sys_cfg_data"))) = > +#elif defined (__ICCARM__) > +#pragma location = ".sys_cfg_data" > +__root const u32 XPm_ConfigObject[] = > +#endif > +{ > + /**********************************************************************/ > + /* HEADER */ > + 2, /* Number of remaining words in the header */ > + 8, /* Number of sections included in config object */ > + 1U, /* Type of config object as base */ Here's where you have manually replaced "PM_CONFIG_OBJECT_TYPE_BASE" -> "1U", right? Well, it should be well noted in the commit message. This file is supposed to be generated by Vitis and used untouched, any manual edits whould be documented. Or, even better, use the U-Boot patch I sent (see other e-mail I just wrote) and use an unmodified pm_cfg_obj.c -- Luca From arnout at mind.be Sat Feb 12 12:55:52 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 13:55:52 +0100 Subject: [Buildroot] [git commit] support/testing: add test for python-distro Message-ID: <20220212130602.B9FDD82ACC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ebde11d29f5ceb7f7398d24cbf71909c1e08a073 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 [Arnout: drop python2 variant] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 2 ++ support/testing/tests/package/sample_python_distro.py | 4 ++++ support/testing/tests/package/test_python_distro.py | 11 +++++++++++ 3 files changed, 17 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 689673fce7..e89149cea0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1604,7 +1604,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..c26f9c499e --- /dev/null +++ b/support/testing/tests/package/test_python_distro.py @@ -0,0 +1,11 @@ +from tests.package.test_python import TestPythonPackageBase + + +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"] From arnout at mind.be Sat Feb 12 13:05:31 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 14:05:31 +0100 Subject: [Buildroot] [git commit] package/thermald: update URL in the docs Message-ID: <20220212130602.DF42482210@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1ddced072abefa001a10df56b9820e96db1b2b6f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Old project homepage was removed, so switch to github, already in use to download the sources. Signed-off-by: Ricardo Martincoski Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/thermald/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/thermald/Config.in b/package/thermald/Config.in index 6d74a164b6..e5e15b9b8d 100644 --- a/package/thermald/Config.in +++ b/package/thermald/Config.in @@ -20,7 +20,7 @@ config BR2_PACKAGE_THERMALD reaches a certain threshold, the Linux daemon activates various cooling methods to try to cool the system. - https://01.org/linux-thermal-daemon + https://github.com/intel/thermal_daemon comment "thermald needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" depends on BR2_i386 || BR2_x86_64 From arnout at mind.be Sat Feb 12 13:11:24 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 14:11:24 +0100 Subject: [Buildroot] [git commit] package/protozero: bump version to 1.7.1 Message-ID: <20220212130603.0A83382AD1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=89ac26c3043b02b60c24c3793c834ba053d91fde branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop upstream patch. Release-notes: https://github.com/mapbox/protozero/releases/tag/v1.7.1 Signed-off-by: Maxim Kochetkov Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...0001-CMakeLists.txt-respect-BUILD_TESTING.patch | 47 ---------------------- package/protozero/protozero.hash | 2 +- package/protozero/protozero.mk | 2 +- 3 files changed, 2 insertions(+), 49 deletions(-) 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 From arnout at mind.be Sat Feb 12 13:10:12 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 14:10:12 +0100 Subject: [Buildroot] [git commit] package/xml-security-c: needs threads Message-ID: <20220212130603.0077782210@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cdbe856675dafc43838f628ce4838ee8dc8d3080 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 From arnout at mind.be Sat Feb 12 13:04:33 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 14:04:33 +0100 Subject: [Buildroot] [git commit] package/libbpf: bump to version 0.6.1 Message-ID: <20220212130602.D341E82AD4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3e031008ce489dea29073c5750f5773c2e4b13cd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libbpf/libbpf.hash | 2 +- package/libbpf/libbpf.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libbpf/libbpf.hash b/package/libbpf/libbpf.hash index afc7aec1bf..27e22be9e9 100644 --- a/package/libbpf/libbpf.hash +++ b/package/libbpf/libbpf.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 21cbee4df093e7fd29e76ed429650d3f3abe3a893f35e346ab9bc3484f6e68c0 libbpf-0.4.0.tar.gz +sha256 ce3a8eb32d85ac48490256597736d8b27e0a5e947a0731613b7aba6b4ae43ac0 libbpf-0.6.1.tar.gz sha256 847f4addbd56e2d5be20c4ea0845e972672fc07b755fadaae5f7abd35d71e349 LICENSE sha256 6313108c23efffa36948f8b2cff1560a5935373b527b0e1a837cc77e6ed1bacd LICENSE.BSD-2-Clause sha256 0b9a4febcdee6de55872501d5c1a8f5d8b0d1650cd4d5351995ceb22e889f8ca LICENSE.LGPL-2.1 diff --git a/package/libbpf/libbpf.mk b/package/libbpf/libbpf.mk index 3f09cc38dc..6750b063c0 100644 --- a/package/libbpf/libbpf.mk +++ b/package/libbpf/libbpf.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBBPF_VERSION = 0.4.0 +LIBBPF_VERSION = 0.6.1 LIBBPF_SITE = $(call github,libbpf,libbpf,v$(LIBBPF_VERSION)) LIBBPF_LICENSE = GPL-2.0, LGPL-2.1, BSD-2-Clause LIBBPF_LICENSE_FILES = LICENSE LICENSE.BSD-2-Clause LICENSE.LGPL-2.1 From arnout at mind.be Sat Feb 12 13:08:46 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 14:08:46 +0100 Subject: [Buildroot] [git commit] package/thermald: bump to 2.4.8 Message-ID: <20220212130602.E98E982AD1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c8406392466ecd1591265e24e619202c79f08a39 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Two source files had their header updated to correctly state the licence is GPL-2.0+, not GPL-2.0. There is no real licensing change to the project in this bump. Release 2.4.8 -Fix Ideapad thermal shutdown issue #328 Release 2.4.7 - Fix AC/DC power limit issue in some HP TigerLake systems - Regression fix for RAPL MSR usage in xml config file - Added Japer Lake and Alder Lake CPU models - Debug scripts for log collection to upload Signed-off-by: Ricardo Martincoski Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/thermald/thermald.hash | 2 +- package/thermald/thermald.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/thermald/thermald.hash b/package/thermald/thermald.hash index 0a37f0e413..3a7c0f6952 100644 --- a/package/thermald/thermald.hash +++ b/package/thermald/thermald.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 80c92902a89b72a9df85c51a8b5fc472cc01b4410600ef1f56d62c4ac23890c1 thermald-2.4.6.tar.gz +sha256 3e5a5033339c021de41ed4f946dd39e13f79f722fb5bd98d798e83658184c39b thermald-2.4.8.tar.gz sha256 e98be8bc482e038a14bfbc01caf800bbd0024fff275ef14cd999db6560254a8d COPYING diff --git a/package/thermald/thermald.mk b/package/thermald/thermald.mk index 9b303104e3..4e43277128 100644 --- a/package/thermald/thermald.mk +++ b/package/thermald/thermald.mk @@ -4,7 +4,7 @@ # ################################################################################ -THERMALD_VERSION = 2.4.6 +THERMALD_VERSION = 2.4.8 THERMALD_SITE = $(call github,intel,thermal_daemon,v$(THERMALD_VERSION)) # fetched from Github, with no configure script THERMALD_AUTORECONF = YES From arnout at mind.be Sat Feb 12 13:12:11 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 14:12:11 +0100 Subject: [Buildroot] [git commit] package/osm2pgsql: bump version 1.6.0 Message-ID: <20220212130603.14D1982AD4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7c7de551c5bbe2fb4f392c4303a4d3475270fca7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release-notes: https://github.com/openstreetmap/osm2pgsql/releases/tag/1.6.0 Signed-off-by: Maxim Kochetkov Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 From arnout at mind.be Sat Feb 12 12:56:38 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 13:56:38 +0100 Subject: [Buildroot] [git commit] configs/friendlyarm_nanopi_r2s: new defconfig Message-ID: <20220212130602.C7FE982210@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9c78c8c0d7120b6de7103879961c778d32c57d52 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 [Arnout: - explicitly set BR2_cortex_a53=y; - remove unused mtools and dosfstools; - add BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y; ] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 | 40 +++++++++++++++++++++ 6 files changed, 130 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index e89149cea0..55fd9344ef 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1068,7 +1068,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..818c847f4b --- /dev/null +++ b/configs/friendlyarm_nanopi_r2s_defconfig @@ -0,0 +1,40 @@ +BR2_aarch64=y +BR2_cortex_a53=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_PYLIBFDT=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_GENIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y From arnout at mind.be Sat Feb 12 13:13:57 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 14:13:57 +0100 Subject: [Buildroot] [PATCH 1/1 next] package/osm2pgsql: bump version 1.6.0 In-Reply-To: <20220128060728.800722-1-fido_max@inbox.ru> References: <20220128060728.800722-1-fido_max@inbox.ru> Message-ID: On 28/01/2022 07:07, Maxim Kochetkov via buildroot wrote: > Release-notes: https://github.com/openstreetmap/osm2pgsql/releases/tag/1.6.0 > > Signed-off-by: Maxim Kochetkov Applied to master, thanks. Regards, Arnout > --- > 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 From nealf at xilinx.com Sat Feb 12 13:18:54 2022 From: nealf at xilinx.com (Neal Frager) Date: Sat, 12 Feb 2022 13:18:54 +0000 Subject: [Buildroot] [PATCH v6 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <69189572-6eba-ed26-52dd-08a8b098f124@lucaceresoli.net> References: <20220211144402.1626443-1-neal.frager@xilinx.com> <69189572-6eba-ed26-52dd-08a8b098f124@lucaceresoli.net> Message-ID: <039975A9-9273-4FC1-852B-C81AC2EF7077@xilinx.com> Hi Luca, > > Here's where you have manually replaced "PM_CONFIG_OBJECT_TYPE_BASE" -> > "1U", right? Well, it should be well noted in the commit message. This > file is supposed to be generated by Vitis and used untouched, any manual > edits whould be documented. > > Or, even better, use the U-Boot patch I sent (see other e-mail I just > wrote) and use an unmodified pm_cfg_obj.c > > -- > Luca Yes, exactly. I just deleted the define and replaced the one line where it was used with the 1U value. Unfortunately, I am on vacation this week, which is why I wanted to get the v6 patch in so quickly. I leave it up to Giulio and Peter if this patch can be accepted as is, or if we need to wait until I return in order to submit a new version of the patch. It would be really great if we can get this included in time for the 2022 long term support version of buildroot. Thanks for everyone?s support! Best regards, Neal Frager Xilinx From arnout at mind.be Sat Feb 12 13:25:24 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 14:25:24 +0100 Subject: [Buildroot] [PATCH v4 1/1] package/bpftool: new package In-Reply-To: <20220131185154.26343-1-james.hilliard1@gmail.com> References: <20220131185154.26343-1-james.hilliard1@gmail.com> Message-ID: <08b9ef7c-8ce6-3216-3f56-5c64af2f4a66@mind.be> On 31/01/2022 19:51, James Hilliard wrote: > 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. I don't understand this: linux-tools is part of the kernel build itself, so there shouldn't be any differences between kernel versions... Anyway, you probably experienced it so I kept the comment. > > The host bpftool is needed for enabling features such as the systemd > bpf-framework(to be added in a future patch). Normally we only accept host packages if there's a (target) package that actually depends on it. Knowing you however we're not going to have to wait long for this systemd bpf framework, so I kept the host package. > Signed-off-by: James Hilliard > --- > Changes v3 -> v4: > - remove linux-tools bpftool kconfig entry Ideally this should have been done in a separate patch, but OK. > 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 > [snip] > 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 This is purely for the libbpf submodule. We normally prefer to unbundle such dependencies, since we have libbpf as a package. I've kept it for now, but if you could unbundle it, that would be great. I've added a line to the commit message to explain why the git download method is used. Applied to master, thanks. Regards, Arnout > +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 From arnout at mind.be Sat Feb 12 13:19:15 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 14:19:15 +0100 Subject: [Buildroot] [git commit] package/bpftool: new package Message-ID: <20220212131841.98B4D82AD1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3675131e6c654d7536a184db0184fde7a97040e0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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). Use the git download method to get the libbpf submodule. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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(-) diff --git a/Config.in.legacy b/Config.in.legacy index 0794813a97..aefb0ba6ea 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_TARGET_UBOOT_NEEDS_PYTHON2 bool "host-python 2.7 support for U-Boot was removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 55fd9344ef..bcfcacb91d 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1279,6 +1279,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 1a9f3e29d8..7aff9e7cb7 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 From heiko.thiery at gmail.com Sat Feb 12 13:27:03 2022 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Sat, 12 Feb 2022 14:27:03 +0100 Subject: [Buildroot] [PATCH V3] board: Add support for iMX8MN BSH SMM S2 PRO In-Reply-To: References: <20220131145555.2819020-1-michael@amarulasolutions.com> Message-ID: Hi, Am Sa., 12. Feb. 2022 um 13:10 Uhr schrieb Arnout Vandecappelle : > > > > On 31/01/2022 15:55, Michael Trimarchi wrote: > > Add initial support for iMX8MN BSH SMM S2 PRO board: > > > > - Linux: v5.17-rc1 > > I'm a bit uncomfortable to add an -rc version. But I guess it can be updated > as soon as 5.17 is released. > > > - 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 > [snip] > > 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/ > > You should also add configs/bsh_smms2pro_defconfig here. > > > 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" > > This is really a great way of doing it! There was already a comment about that topic from Thomas: https://lists.buildroot.org/pipermail/buildroot/2022-January/634308.html > > > 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 > > Please also explain where you get uuu. Can we build it as part of buildroot? > Then refer to it as output/host/bin/uuu. > > > + > > + > > +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 > > Even if the default happens to be correct, I prefer the subarch to be > specified explicitly. That way we can change the default later without affecting > this defconfig. > > > +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" > > I may be missing something, but this doesn't seem to be used by any of the > post- scripts? This seems to be a leftover from the state where "board/freescale/common/imx/imx8-bootloader-prepare.sh" was used to generate the imx flash image. Now this is done by u-boot using binman Therefore this argument is no longer needed. > > > +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" > > Please use the tarball instead. Simply setting CUSTOM_VERSION should be > sufficient - if not, linux.mk has tobe fixed. > > > +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" > > Gitlab is able to generate tarballs as well. There are plenty of examples in > the tree. > > > I would normally fix these things up while applying, but since I'm not > entirely sure about merging a -rc kernel anyway, I'll wait for a v4 instead. > > Oh, one more thing: the subject for a new defconfig is typically > "configs/bsh_smms2pro_defconfig: new defconfig" > > Regards, > Arnout > > > +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 -- Heiko From arnout at mind.be Sat Feb 12 13:40:26 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 14:40:26 +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: On 31/01/2022 16:30, 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 Applied to master, thanks. Regards, Arnout [snip] From arnout at mind.be Sat Feb 12 13:39:16 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 14:39:16 +0100 Subject: [Buildroot] [git commit] configs/kontron_bl_imx8mm_defconfig: new defconfig Message-ID: <20220212133302.DD38B82AA5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ed5bbb7606c8b2614b3cfae640803eab79a1f2ac branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 [Arnout: explicitly set BR2_cortex_a53=y] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 2 + board/kontron/bl-imx8mm/extlinux.conf | 4 + board/kontron/bl-imx8mm/genimage.cfg | 18 ++ ...imx8mm-kontron-n801x-s-convert-options-to.patch | 31 +++ ...imx8mm-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(+) diff --git a/DEVELOPERS b/DEVELOPERS index bcfcacb91d..d29d8f3a21 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1180,7 +1180,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..57e7e9683d --- /dev/null +++ b/configs/kontron_bl_imx8mm_defconfig @@ -0,0 +1,59 @@ +# Architecture +BR2_aarch64=y +BR2_cortex_a53=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 From peter at korsgaard.com Sat Feb 12 13:42:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 12 Feb 2022 14:42:32 +0100 Subject: [Buildroot] [PATCH v6 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <20220211144402.1626443-1-neal.frager@xilinx.com> (Neal Frager's message of "Fri, 11 Feb 2022 07:44:01 -0700") References: <20220211144402.1626443-1-neal.frager@xilinx.com> Message-ID: <87pmnsnquv.fsf@dell.be.48ers.dk> >>>>> "Neal" == Neal Frager writes: > This patch: > - bumps ATF to Xilinx v2.6: mainline v2.6 requires patch to build > - bumps U-Boot to Xilinx 2022.01: important drivers not in mainline > - bumps Linux to Xilinx 5.15: important drivers not in mainline > - deletes board/zynqmp/patches directory: patches already in mainline > - modifies board/zynqmp/genimage.cfg: U-Boot 2022.01 uses u-boot.itb format > - adds extlinux.conf to vfat bootfs > - modifies U-Boot to unified xilinx_zynqmp_virt_defconfig (supports all boards) > - adds support for SPL pm_cfg_obj.c loading to PMU firmware > - enables support for host machines without OpenSSL required by U-Boot and Linux > Signed-off-by: Neal Frager > Reviewed-by: Giulio Benetti > Tested-by: Giulio Benetti > [Giulio: only build tested] > +++ b/configs/zynqmp_zcu106_defconfig > @@ -1,34 +1,39 @@ > BR2_aarch64=y > -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_GIT=y > BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" > -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="966124532656bc95d781abf57531e4cd4f962237" The git hashes do not make it directly clear what version this is, so I changed it to use the output of describe --abbrev=40 which adds a prefix like v5.15-930-g in front, directly making it clear that this is based on upstream 5.15 with 930 patches on top. I've done it for ATF and U-Boot as well and committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 12 13:43:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 12 Feb 2022 14:43:20 +0100 Subject: [Buildroot] [PATCH v6 2/2] add configs/zynqmp_zcu102_defconfig In-Reply-To: <20220211144402.1626443-2-neal.frager@xilinx.com> (Neal Frager's message of "Fri, 11 Feb 2022 07:44:02 -0700") References: <20220211144402.1626443-1-neal.frager@xilinx.com> <20220211144402.1626443-2-neal.frager@xilinx.com> Message-ID: <87leygnqtj.fsf@dell.be.48ers.dk> >>>>> "Neal" == Neal Frager writes: > This patch: > - adds support for Xilinx ZCU102 evaluation board > - ZCU102 features can be found here: > https://www.xilinx.com/products/boards-and-kits/zcu102.html > Signed-off-by: Neal Frager > Reviewed-by: Giulio Benetti > Tested-by: Giulio Benetti > [Giulio: only build tested] > --- V1-> V2: > * fixed general build issues > * added extlinux.conf for run-time boot issue V2-> V3: > * enabled support for host machines without OpenSSL required by U-Boot and Linux > * moved readme.txt update to zynqmp_zcu102_defconfig patch 2/2 V3-> V4: > * cleaned up commit log messages > * added version history V4-> V5: > * switched to sha1 urls to make ATF, U-Boot and Linux builds reproducible > * generated board specific pm_cfg_obj.c files with vitis 2021.2 V5-> V6: > * fixed build issue with pm_cfg_obj.c files > --- > --- > board/zynqmp/readme.txt | 23 +- > board/zynqmp/zcu102/pm_cfg_obj.c | 563 +++++++++++++++++++++++++++++++ > configs/zynqmp_zcu102_defconfig | 39 +++ > 3 files changed, 618 insertions(+), 7 deletions(-) > create mode 100644 board/zynqmp/zcu102/pm_cfg_obj.c > create mode 100644 configs/zynqmp_zcu102_defconfig You forgot to add an entry to the DEVELOPERS file for it, so I've done that, changed the git hashes with the git describe output like I explained for zcu106 and committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 12 13:43:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 12 Feb 2022 14:43:33 +0100 Subject: [Buildroot] [git commit] add configs/zynqmp_zcu102_defconfig Message-ID: <20220212133614.4D62E82B32@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f1090b9e8c217a87561c090c98ba26e713806ec1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This patch: - adds support for Xilinx ZCU102 evaluation board - ZCU102 features can be found here: https://www.xilinx.com/products/boards-and-kits/zcu102.html Signed-off-by: Neal Frager Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti [Giulio: only build tested] [Peter: use git describe for git hashes for clarity, add DEVELOPERS entry] Signed-off-by: Peter Korsgaard --- DEVELOPERS | 4 + board/zynqmp/readme.txt | 24 +- board/zynqmp/zcu102/pm_cfg_obj.c | 563 +++++++++++++++++++++++++++++++++++++++ configs/zynqmp_zcu102_defconfig | 39 +++ 4 files changed, 623 insertions(+), 7 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index d29d8f3a21..a91dccd1e0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2078,6 +2078,10 @@ F: package/libevdev/ F: package/pkg-qmake.mk F: package/qt5/qt5opcua/ +N: Neal Frager +F: board/zynqmp/ +F: configs/zynqmp_zcu102_defconfig + N: Nicola Di Lieto F: package/uacme/ diff --git a/board/zynqmp/readme.txt b/board/zynqmp/readme.txt index da37f4ccc9..dcde422091 100644 --- a/board/zynqmp/readme.txt +++ b/board/zynqmp/readme.txt @@ -1,10 +1,20 @@ -******************************** -Xilinx ZCU106 board - ZynqMP SoC -******************************** +****************************************** +Xilinx ZCU102 / ZCU106 boards - ZynqMP SoC +****************************************** + +This document describes the Buildroot support for the ZCU102 and +ZCU106 boards by Xilinx, based on the Zynq UltraScale+ MPSoC (aka +ZynqMP). It has been tested with the ZCU102 and ZCU106 production +boards. + +Evaluation board features can be found here with the links below. + +ZCU102: +https://www.xilinx.com/products/boards-and-kits/zcu102.html + +ZCU106: +https://www.xilinx.com/products/boards-and-kits/zcu106.html -This document describes the Buildroot support for the ZCU106 board by -Xilinx, based on the Zynq UltraScale+ MPSoC (aka ZynqMP). It has been -tested with the EK-U1-ZCU106-ES2 pre-production board. How to build it =============== @@ -32,7 +42,7 @@ After building, you should get a tree like this: +-- rootfs.ext4 -> rootfs.ext2 +-- sdcard.img +-- system.dtb -> zynqmp-zcu106-revA.dtb - +-- u-boot.bin + +-- u-boot.itb `-- zynqmp-zcu106-revA.dtb How to write the SD card diff --git a/board/zynqmp/zcu102/pm_cfg_obj.c b/board/zynqmp/zcu102/pm_cfg_obj.c new file mode 100644 index 0000000000..68557c4cb4 --- /dev/null +++ b/board/zynqmp/zcu102/pm_cfg_obj.c @@ -0,0 +1,563 @@ +/****************************************************************************** +* Copyright (c) 2017 - 2021 Xilinx, Inc. All rights reserved. +* SPDX-License-Identifier: MIT +******************************************************************************/ + +#include "xil_types.h" +#include "pm_defs.h" + +#define PM_CONFIG_MASTER_SECTION_ID 0x101U +#define PM_CONFIG_SLAVE_SECTION_ID 0x102U +#define PM_CONFIG_PREALLOC_SECTION_ID 0x103U +#define PM_CONFIG_POWER_SECTION_ID 0x104U +#define PM_CONFIG_RESET_SECTION_ID 0x105U +#define PM_CONFIG_SHUTDOWN_SECTION_ID 0x106U +#define PM_CONFIG_SET_CONFIG_SECTION_ID 0x107U +#define PM_CONFIG_GPO_SECTION_ID 0x108U + +#define PM_SLAVE_FLAG_IS_SHAREABLE 0x1U +#define PM_MASTER_USING_SLAVE_MASK 0x2U + +#define PM_CONFIG_GPO1_MIO_PIN_34_MAP (1U << 10U) +#define PM_CONFIG_GPO1_MIO_PIN_35_MAP (1U << 11U) +#define PM_CONFIG_GPO1_MIO_PIN_36_MAP (1U << 12U) +#define PM_CONFIG_GPO1_MIO_PIN_37_MAP (1U << 13U) + +#define PM_CONFIG_GPO1_BIT_2_MASK (1U << 2U) +#define PM_CONFIG_GPO1_BIT_3_MASK (1U << 3U) +#define PM_CONFIG_GPO1_BIT_4_MASK (1U << 4U) +#define PM_CONFIG_GPO1_BIT_5_MASK (1U << 5U) + +#define SUSPEND_TIMEOUT 0xFFFFFFFFU + +#define PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK 0x00000001 +#define PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK 0x00000100 +#define PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK 0x00000200 + + + +#if defined (__ICCARM__) +#pragma language=save +#pragma language=extended +#endif +#if defined (__GNUC__) + const u32 XPm_ConfigObject[] __attribute__((used, section(".sys_cfg_data"))) = +#elif defined (__ICCARM__) +#pragma location = ".sys_cfg_data" +__root const u32 XPm_ConfigObject[] = +#endif +{ + /**********************************************************************/ + /* HEADER */ + 2, /* Number of remaining words in the header */ + 8, /* Number of sections included in config object */ + 1U, /* Type of config object as base */ + /**********************************************************************/ + /* MASTER SECTION */ + PM_CONFIG_MASTER_SECTION_ID, /* Master SectionID */ + 3U, /* No. of Masters*/ + + NODE_APU, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_0, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_1, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Wake permissions */ + + + /**********************************************************************/ + /* SLAVE SECTION */ + + + PM_CONFIG_SLAVE_SECTION_ID, /* Section ID */ + 49, /* Number of slaves */ + + NODE_OCM_BANK_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TCM_0_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_0_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_1_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TCM_1_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_L2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU_PP_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU_PP_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_USB_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_USB_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_TTC_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SATA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_ETH_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_UART_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_UART_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SPI_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_SPI_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_I2C_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_I2C_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SD_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_SD_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_DP, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GDMA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_ADMA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_NAND, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_QSPI, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPIO, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_CAN_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_CAN_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_EXTERN, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_DDR, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_IPI_APU, + 0U, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_0, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_1, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_PCIE, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_PCAP, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_RTC, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_VCU, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_PL, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + + /**********************************************************************/ + /* PREALLOC SECTION */ + + PM_CONFIG_PREALLOC_SECTION_ID, /* Preallaoc SectionID */ + 3U, /* No. of Masters*/ + +/* Prealloc for psu_cortexa53_0 */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, + 12, + NODE_DDR, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_L2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_3, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_SD_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_QSPI, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_PL, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_APU, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_0 */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + 3, + NODE_TCM_0_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_0_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_1 */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + 3, + NODE_TCM_1_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_1_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + + /**********************************************************************/ + /* POWER SECTION */ + + PM_CONFIG_POWER_SECTION_ID, /* Power Section ID */ + 4U, /* Number of power nodes */ + + NODE_APU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_RPU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_FPD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_PLD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + + /**********************************************************************/ + /* RESET SECTION */ + + PM_CONFIG_RESET_SECTION_ID, /* Reset Section ID */ + 120U, /* Number of resets */ + + XILPM_RESET_PCIE_CFG, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_BRIDGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_CTRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRF, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GDMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SATA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APU_L2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DDR, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SOFT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_QSPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_NAND, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ADMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOU_CC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TIMESTAMP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R50, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R51, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_AMBA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_OCM, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_PGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RTC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SYSMON, 0, + XILPM_RESET_AFI_FM6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_LPD_SWDT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_FPD, PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + XILPM_RESET_RPU_DBG1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_DBG0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_VPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_7, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_8, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_9, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_10, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_11, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_12, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_13, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_14, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_15, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_16, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_17, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_18, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_19, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_20, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_21, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_22, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_23, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_24, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_25, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_26, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_27, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_28, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_29, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_30, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_31, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_LS, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PS_ONLY, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_92, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_93, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_94, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_95, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + + /**********************************************************************/ + /* SET CONFIG SECTION */ + PM_CONFIG_SET_CONFIG_SECTION_ID, /* Set Config Section ID */ + 0U, /* Permissions to load base config object */ + 0U, /* Permissions to load overlay config object */ + + /**********************************************************************/ + /* SHUTDOWN SECTION */ + + PM_CONFIG_SHUTDOWN_SECTION_ID, /* Shutdown Section ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* System Shutdown/Restart Permission */ + + /**********************************************************************/ + /* GPO SECTION */ + PM_CONFIG_GPO_SECTION_ID, /* GPO Section ID */ + PM_CONFIG_GPO1_BIT_2_MASK | + PM_CONFIG_GPO1_MIO_PIN_34_MAP | + PM_CONFIG_GPO1_MIO_PIN_35_MAP | + PM_CONFIG_GPO1_MIO_PIN_36_MAP | + PM_CONFIG_GPO1_MIO_PIN_37_MAP | + 0, /* State of GPO pins */ +}; +#if defined (__ICCARM__) +#pragma language=restore +#endif + diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig new file mode 100644 index 0000000000..298ce2388c --- /dev/null +++ b/configs/zynqmp_zcu102_defconfig @@ -0,0 +1,39 @@ +BR2_aarch64=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.15-930-g966124532656bc95d781abf57531e4cd4f962237" +BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v2.6-33-ge678d5ddc475f34dea8f5004fb6ebde118621784" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/Xilinx/u-boot-xlnx.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2022.01-165-g667001319cbe511ce6353195fb4910ae5cb041ce" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" +BR2_TARGET_UBOOT_ZYNQMP=y +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/v2021.2/bin/pmufw-v2021.2.bin" +BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/zcu102/pm_cfg_obj.c" +BR2_TARGET_UBOOT_FORMAT_ITB=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y From peter at korsgaard.com Sat Feb 12 13:43:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 12 Feb 2022 14:43:32 +0100 Subject: [Buildroot] [git commit] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 Message-ID: <20220212133614.415FE82AA5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4ade9cb1c1751d11f8e174443e5a999b3701a627 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This patch: - bumps ATF to Xilinx v2.6: mainline v2.6 requires patch to build - bumps U-Boot to Xilinx 2022.01: important drivers not in mainline - bumps Linux to Xilinx 5.15: important drivers not in mainline - deletes board/zynqmp/patches directory: patches already in mainline - modifies board/zynqmp/genimage.cfg: U-Boot 2022.01 uses u-boot.itb format - adds extlinux.conf to vfat bootfs - modifies U-Boot to unified xilinx_zynqmp_virt_defconfig (supports all boards) - adds support for SPL pm_cfg_obj.c loading to PMU firmware - enables support for host machines without OpenSSL required by U-Boot and Linux Signed-off-by: Neal Frager Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti [Giulio: only build tested] [Peter: use git describe for git hashes for clarity] Signed-off-by: Peter Korsgaard --- board/zynqmp/extlinux.conf | 5 + board/zynqmp/genimage.cfg | 6 +- ...erity-fix-Remove-GGC-ignore-Warray-bounds.patch | 68 --- ...1-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch | 52 -- .../0002-arm64-zynqmp-Enable-booting-to-ATF.patch | 114 ----- ...p-accept-an-absolute-path-for-PMUFW_INIT_.patch | 68 --- ...ynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch | 175 ------- board/zynqmp/post-build.sh | 8 + board/zynqmp/post-image.sh | 4 +- board/zynqmp/zcu106/pm_cfg_obj.c | 562 +++++++++++++++++++++ configs/zynqmp_zcu106_defconfig | 23 +- 11 files changed, 596 insertions(+), 489 deletions(-) diff --git a/board/zynqmp/extlinux.conf b/board/zynqmp/extlinux.conf new file mode 100644 index 0000000000..ae3ec8614a --- /dev/null +++ b/board/zynqmp/extlinux.conf @@ -0,0 +1,5 @@ +label linux + kernel /Image + devicetree /system.dtb + append console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait + diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg index ed202f4550..20d8352c08 100644 --- a/board/zynqmp/genimage.cfg +++ b/board/zynqmp/genimage.cfg @@ -2,11 +2,13 @@ image boot.vfat { vfat { files = { "boot.bin", - "u-boot.bin", - "atf-uboot.ub", + "u-boot.itb", "system.dtb", "Image" } + file extlinux/extlinux.conf { + image = extlinux.conf + } } size = 32M diff --git a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch b/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch deleted file mode 100644 index 0c1a9ba2a4..0000000000 --- a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch +++ /dev/null @@ -1,68 +0,0 @@ -From da003e6ada7d0217fe99dc7c649a731f8ebd3c34 Mon Sep 17 00:00:00 2001 -From: Deepika Bhavnani -Date: Thu, 15 Aug 2019 00:56:46 +0300 -Subject: [PATCH] Coverity fix: Remove GGC ignore -Warray-bounds - -GCC diagnostics were added to ignore array boundaries, instead -of ignoring GCC warning current code will check for array boundaries -and perform and array update only for valid elements. - -Resolves: `CID 246574` `CID 246710` `CID 246651` - -Signed-off-by: Deepika Bhavnani -Change-Id: I7530ecf7a1707351c6ee87e90cc3d33574088f57 - -Backported from: 41af05154abe136938bcfb5f26c969933784bbef -[Adapted to apply on 1.5] - ---- - lib/psci/psci_common.c | 20 ++++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) - -diff --git a/lib/psci/psci_common.c b/lib/psci/psci_common.c -index 2220a745cd6e..6282d992a2f0 100644 ---- a/lib/psci/psci_common.c -+++ b/lib/psci/psci_common.c -@@ -188,21 +188,17 @@ static unsigned int get_power_on_target_pwrlvl(void) - /****************************************************************************** - * Helper function to update the requested local power state array. This array - * does not store the requested state for the CPU power level. Hence an -- * assertion is added to prevent us from accessing the wrong index. -+ * assertion is added to prevent us from accessing the CPU power level. - *****************************************************************************/ - static void psci_set_req_local_pwr_state(unsigned int pwrlvl, - unsigned int cpu_idx, - plat_local_state_t req_pwr_state) - { -- /* -- * This should never happen, we have this here to avoid -- * "array subscript is above array bounds" errors in GCC. -- */ - assert(pwrlvl > PSCI_CPU_PWR_LVL); --#pragma GCC diagnostic push --#pragma GCC diagnostic ignored "-Warray-bounds" -- psci_req_local_pwr_states[pwrlvl - 1][cpu_idx] = req_pwr_state; --#pragma GCC diagnostic pop -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && -+ (cpu_idx < PLATFORM_CORE_COUNT)) { -+ psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx] = req_pwr_state; -+ } - } - - /****************************************************************************** -@@ -228,7 +224,11 @@ static plat_local_state_t *psci_get_req_local_pwr_states(unsigned int pwrlvl, - { - assert(pwrlvl > PSCI_CPU_PWR_LVL); - -- return &psci_req_local_pwr_states[pwrlvl - 1][cpu_idx]; -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && -+ (cpu_idx < PLATFORM_CORE_COUNT)) { -+ return &psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx]; -+ } else -+ return NULL; - } - - /* --- -2.34.0 - diff --git a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch b/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch deleted file mode 100644 index 4d85e1bb12..0000000000 --- a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch +++ /dev/null @@ -1,52 +0,0 @@ -From e5d72ed8339eb05285448aad3c89d21e4d18fd29 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Mon, 26 Feb 2018 09:40:34 +0100 -Subject: [PATCH] arm64: zynqmp: zcu106: fix SPL MMC booting - -The U-Boot SPL generated with the current zcu106 defconfig cannot boot -from MMC: - - [...] - U-Boot SPL 2018.01 (Feb 21 2018 - 17:47:14) - EL Level: EL3 - Trying to boot from MMC1 - sdhci_transfer_data: Error detected in status(0x408020)! - spl_load_image_fat_os: error reading image u-boot.bin, err - -2 - spl_load_image_fat: error reading image u-boot.img, err - -6 - SPL: failed to boot from all boot devices - ### ERROR ### Please RESET the board ### - -Fix by lowering the rpll value. The new value for the RPLL_CTRL -register comes from the current psu_init_gpl.c from the HDF file at -https://github.com/xilinx/hdf-examples/tree/01ad8ea5fd1989abf4ea5a072d019a16cb2bc546/zcu106-zynqmp -(generated by Vivado v2017.4). - -RPLL and sdio1_ref clocks before and after this change: - - - Old values: RPLL 1.36 GHz, sdio1_ref 272 MHz - - New values: RPLL 1.16 GHz, sdio1_ref 233 MHz - -Signed-off-by: Luca Ceresoli -Cc: Michal Simek -Upstream-status: accepted upstream in a different form ---- - - board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -index 4d18abe000ca..e6fa477e53e7 100644 ---- a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -+++ b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -@@ -10,7 +10,7 @@ - static unsigned long psu_pll_init_data(void) - { - psu_mask_write(0xFF5E0034, 0xFE7FEDEFU, 0x7E4E2C62U); -- psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00013C00U); -+ psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00014600U); - psu_mask_write(0xFF5E0030, 0x00000008U, 0x00000008U); - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000001U); - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000000U); --- -2.7.4 - diff --git a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch b/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch deleted file mode 100644 index 487fff6812..0000000000 --- a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 5e3cac50cc981e01d9072241035a8d4162560c71 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Mon, 12 Mar 2018 17:18:38 +0100 -Subject: [PATCH] arm64: zynqmp: Enable booting to ATF - -U-Boot is now able to boot to ARM Trusted Firmware (ATF). The boot -flow is SPL(EL3) loads ATF and full u-boot and jump to ATF(EL3) which -pass control to full u-boot(EL2). This has been tested on zcu106, so -enable it in this defconfig. - -To generate an image that triggers this booting flow, you need to pass -'-O arm-trusted-firmware' to mkimage. - -Signed-off-by: Luca Ceresoli -Signed-off-by: Michal Simek -Backported from upstream: http://git.denx.de/?p=u-boot.git;a=commit;h=5e3cac50cc981e01d9072241035a8d4162560c71 ---- - - configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 + - configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 + - configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 + - configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 + - configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 1 + - configs/xilinx_zynqmp_zcu102_revA_defconfig | 1 + - configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 + - 7 files changed, 7 insertions(+) - -diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig -index c5bfa2b12638..488c72258b0e 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig -index f86dce403a42..5d501eec0edd 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig -@@ -20,6 +20,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig -index 6e947cf56827..6f7eaebd7676 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig -@@ -16,6 +16,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_CMD_MEMTEST=y - CONFIG_SYS_ALT_MEMTEST=y -diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig -index 1c934858c61c..7a3806cba4b5 100644 ---- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig -+++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig -@@ -17,6 +17,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_CMD_MEMTEST=y - CONFIG_SYS_ALT_MEMTEST=y -diff --git a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig -index e13c7c56f310..e4408f182ca0 100644 ---- a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig -+++ b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig b/configs/xilinx_zynqmp_zcu102_revA_defconfig -index 5b2cd495ee85..b52f6789fd4b 100644 ---- a/configs/xilinx_zynqmp_zcu102_revA_defconfig -+++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y -diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig -index e6530fbfe7ff..80592554f682 100644 ---- a/configs/xilinx_zynqmp_zcu102_revB_defconfig -+++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_RAM_SUPPORT=y - CONFIG_SPL_RAM_DEVICE=y -+CONFIG_SPL_ATF=y - CONFIG_SYS_PROMPT="ZynqMP> " - CONFIG_FASTBOOT=y - CONFIG_FASTBOOT_FLASH=y --- -2.7.4 - diff --git a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch b/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch deleted file mode 100644 index 95ab7b3b75..0000000000 --- a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch +++ /dev/null @@ -1,68 +0,0 @@ -From c7df098a71e05dc81cee818747759e8060b59626 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Mon, 4 Jun 2018 12:21:01 +0200 -Subject: [PATCH] arm64: zynqmp: accept an absolute path for PMUFW_INIT_FILE - -The value of PMUFW_INIT_FILE is prefixed with "$(srctree)/", thus -forcing it to be a relative path inside the U-Boot source tree. Since -the PMUFW is a binary file generated outside of U-Boot, the PMUFW -binary must be copied inside the U-Boot source tree before the -build. - -This generates a few problems: - - * if the source tree is shared among different out-of-tree builds, - they will pollute (and potentially corrupt) each other - * the source tree cannot be read-only - * any buildsystem must add a command to copy the PMUFW binary - * putting an externally-generated binary in the source tree is ugly - as hell - -Avoid these problems by accepting an absolute path for -PMUFW_INIT_FILE. This would be as simple as removing the "$(srctree)/" -prefix, but in order to keep backward compatibility we rather use the -shell and readlink to get the absolute path even when starting from a -relative path. - -Since 'readlink -f' produces an empty string if the file does not -exist, we also add a check to ensure the file configured in -PMUFW_INIT_FILE exists. Otherwise the build would exit successfully, -but produce a boot.bin without PMUFW as if PMUFW_INIT_FILE were empty. - -Tested in the 12 possible combinations of: - - PMUFW_INIT_FILE empty, relative, absolute, non-existing - - building in-tree, in subdir, in other directory - -Signed-off-by: Luca Ceresoli -Cc: Michal Simek -Cc: Simon Glass -Cc: Emmanuel Vadot -Signed-off-by: Michal Simek -Backported from upstream: https://git.denx.de/?p=u-boot.git;a=commit;h=c7df098a71e05dc81cee818747759e8060b59626 ---- - scripts/Makefile.spl | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl -index ef018b5b4056..252f13826d4c 100644 ---- a/scripts/Makefile.spl -+++ b/scripts/Makefile.spl -@@ -167,8 +167,14 @@ ifdef CONFIG_ARCH_ZYNQ - MKIMAGEFLAGS_boot.bin = -T zynqimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) - endif - ifdef CONFIG_ARCH_ZYNQMP -+ifneq ($(CONFIG_PMUFW_INIT_FILE),"") -+spl/boot.bin: zynqmp-check-pmufw -+zynqmp-check-pmufw: FORCE -+ ( cd $(srctree) && test -r $(CONFIG_PMUFW_INIT_FILE) ) \ -+ || ( echo "Cannot read $(CONFIG_PMUFW_INIT_FILE)" && false ) -+endif - MKIMAGEFLAGS_boot.bin = -T zynqmpimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) \ -- -n $(srctree)/$(CONFIG_PMUFW_INIT_FILE) -+ -n "$(shell cd $(srctree); readlink -f $(CONFIG_PMUFW_INIT_FILE))" - endif - - spl/boot.bin: $(obj)/u-boot-spl.bin FORCE --- -2.7.4 - diff --git a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch b/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch deleted file mode 100644 index b32e162780..0000000000 --- a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch +++ /dev/null @@ -1,175 +0,0 @@ -From 4c9d54ab5a41d65000c8d249b6fb1b76056f1812 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Wed, 20 Jun 2018 12:11:50 +0200 -Subject: [PATCH] arm/arm64: zynq/zynqmp: pass the PS init file as a kconfig - variable - -U-Boot needs to link ps7_init_gpl.c on Zynq or psu_init_gpl.c on -ZynqMP (PS init for short). The current logic to locate this file for -both platforms is: - - 1. if a board-specific file exists in - board/xilinx/zynq[mp]/$(CONFIG_DEFAULT_DEVICE_TREE)/ps?_init_gpl.c - then use it - 2. otherwise use board/xilinx/zynq/ps?_init_gpl.c - -In the latter case the file does not exist in the U-Boot sources and -must be copied in the source tree from the outside before starting the -build. This is typical when it is generated from Xilinx tools while -developing a custom hardware. However making sure that a -board-specific file is _not_ found (and used) requires some trickery -such as removing or overwriting all PS init files (e.g.: the current -meta-xilinx yocto layer [0]). - -This generates a few problems: - - * if the source tree is shared among different out-of-tree builds, - they will pollute (and potentially corrupt) each other - * the source tree cannot be read-only - * any buildsystem must add a command to copy the PS init file binary - * overwriting or deleting files in the source tree is ugly as hell - -Simplify usage by allowing to pass the path to the desired PS init -file in kconfig variable XILINX_PS_INIT_FILE. It can be an absolute -path or relative to $(srctree). If the variable is set, the -user-specified file will always be used without being copied -around. If the the variable is left empty, for backward compatibility -fall back to the old behaviour. - -Since the issue is the same for Zynq and ZynqMP, add one kconfig -variable in a common place and use it for both. - -Also use the new kconfig help text to document all the ways to give -U-Boot the PS init file. - -Build-tested with all combinations of: - - platform: zynq or zynqmp - - PS init file: from XILINX_PS_INIT_FILE (absolute, relative path, - non-existing), in-tree board-specific, in board/xilinx/zynq[mp]/ - - building in-tree, in subdir, in other directory - -[0] https://github.com/Xilinx/meta-xilinx/blob/b2f74cc7fe5c4881589d5e440a17cb51fc66a7ab/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init.inc#L9 - -Signed-off-by: Luca Ceresoli -Cc: Albert Aribaud -Cc: Michal Simek -Cc: Nathan Rossi -Backported from upstream: https://git.denx.de/?p=u-boot.git;a=commit;h=6da4f67ad09cd8b311d77b2b04e557b7ef65b56c ---- - arch/arm/Kconfig | 1 + - board/xilinx/Kconfig | 41 +++++++++++++++++++++++++++++++++++++++++ - board/xilinx/zynq/Makefile | 10 +++++++++- - board/xilinx/zynqmp/Makefile | 10 +++++++++- - 4 files changed, 60 insertions(+), 2 deletions(-) - create mode 100644 board/xilinx/Kconfig - -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 22234cde2ab6..e04979d0ef7e 100644 ---- a/arch/arm/Kconfig -+++ b/arch/arm/Kconfig -@@ -1293,4 +1293,5 @@ source "board/technologic/ts4600/Kconfig" - source "board/vscom/baltos/Kconfig" - source "board/woodburn/Kconfig" - source "board/work-microwave/work_92105/Kconfig" -+source "board/xilinx/Kconfig" - source "board/zipitz2/Kconfig" - - source "arch/arm/Kconfig.debug" -diff --git a/board/xilinx/Kconfig b/board/xilinx/Kconfig -new file mode 100644 -index 000000000000..aa3fa061edef ---- /dev/null -+++ b/board/xilinx/Kconfig -@@ -0,0 +1,41 @@ -+# Copyright (c) 2018, Luca Ceresoli -+# -+# SPDX-License-Identifier: GPL-2.0 -+ -+if ARCH_ZYNQ || ARCH_ZYNQMP -+ -+config XILINX_PS_INIT_FILE -+ string "Zynq/ZynqMP PS init file(s) location" -+ help -+ On Zynq and ZynqMP U-Boot SPL (or U-Boot proper if -+ ZYNQMP_PSU_INIT_ENABLED is set) is responsible for some -+ basic initializations, such as enabling peripherals and -+ configuring pinmuxes. The PS init file (called -+ psu_init_gpl.c on ZynqMP, ps7_init_gpl.c for Zynq-7000) -+ contains the code for such initializations. -+ -+ U-Boot contains PS init files for some boards, but each of -+ them describes only one specific configuration. Users of a -+ different board, or needing a different configuration, can -+ generate custom files using the Xilinx development tools. -+ -+ There are three ways to give a PS init file to U-Boot: -+ -+ 1. Set this variable to the path, either relative to the -+ source tree or absolute, where the psu_init_gpl.c or -+ ps7_init_gpl.c file is located. U-Boot will build this -+ file. -+ -+ 2. If you leave an empty string here, U-Boot will use -+ board/xilinx/zynq/$(CONFIG_DEFAULT_DEVICE_TREE)/ps7_init_gpl.c -+ for Zynq-7000, or -+ board/xilinx/zynqmp/$(CONFIG_DEFAULT_DEVICE_TREE)/psu_init_gpl.c -+ for ZynqMP. -+ -+ 3. If the above file does not exist, U-Boot will use -+ board/xilinx/zynq/ps7_init_gpl.c for Zynq-7000, or -+ board/xilinx/zynqmp/psu_init_gpl.c for ZynqMP. This file -+ is not provided by U-Boot, you have to copy it there -+ before the build. -+ -+endif -diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile -index 5a76a26720cd..03ad5f0532ee 100644 ---- a/board/xilinx/zynq/Makefile -+++ b/board/xilinx/zynq/Makefile -@@ -5,10 +5,18 @@ - - obj-y := board.o - --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE)) -+init-objs := ps_init_gpl.o -+spl/board/xilinx/zynq/ps_init_gpl.o board/xilinx/zynq/ps_init_gpl.o: $(PS_INIT_FILE) -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ -+endif - -+ifeq ($(init-objs),) -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/ps7_init_gpl.c),\ - $(hw-platform-y)/ps7_init_gpl.o) -+endif - - ifeq ($(init-objs),) - ifneq ($(wildcard $(srctree)/$(src)/ps7_init_gpl.c),) -diff --git a/board/xilinx/zynqmp/Makefile b/board/xilinx/zynqmp/Makefile -index 05ccd25dcef3..960b81fc5853 100644 ---- a/board/xilinx/zynqmp/Makefile -+++ b/board/xilinx/zynqmp/Makefile -@@ -5,10 +5,18 @@ - - obj-y := zynqmp.o - --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE)) -+init-objs := ps_init_gpl.o -+spl/board/xilinx/zynqmp/ps_init_gpl.o board/xilinx/zynqmp/ps_init_gpl.o: $(PS_INIT_FILE) -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ -+endif - -+ifeq ($(init-objs),) -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/psu_init_gpl.c),\ - $(hw-platform-y)/psu_init_gpl.o) -+endif - - ifeq ($(init-objs),) - ifneq ($(wildcard $(srctree)/$(src)/psu_init_gpl.c),) --- -2.7.4 - diff --git a/board/zynqmp/post-build.sh b/board/zynqmp/post-build.sh new file mode 100755 index 0000000000..9fd8bbf2c8 --- /dev/null +++ b/board/zynqmp/post-build.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +# genimage will need to find the extlinux.conf +# in the binaries directory + +BOARD_DIR="$(dirname $0)" + +install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux.conf diff --git a/board/zynqmp/post-image.sh b/board/zynqmp/post-image.sh index b2b99fed01..ed6dbe188c 100755 --- a/board/zynqmp/post-image.sh +++ b/board/zynqmp/post-image.sh @@ -10,4 +10,6 @@ FIRST_DT=$(sed -nr \ [ -z "${FIRST_DT}" ] || ln -fs ${FIRST_DT}.dtb ${BINARIES_DIR}/system.dtb -support/scripts/genimage.sh -c board/zynqmp/genimage.cfg +BOARD_DIR="$(dirname $0)" + +support/scripts/genimage.sh -c $BOARD_DIR/genimage.cfg diff --git a/board/zynqmp/zcu106/pm_cfg_obj.c b/board/zynqmp/zcu106/pm_cfg_obj.c new file mode 100644 index 0000000000..6d15d510e9 --- /dev/null +++ b/board/zynqmp/zcu106/pm_cfg_obj.c @@ -0,0 +1,562 @@ +/****************************************************************************** +* Copyright (c) 2017 - 2021 Xilinx, Inc. All rights reserved. +* SPDX-License-Identifier: MIT +******************************************************************************/ + +#include "xil_types.h" +#include "pm_defs.h" + +#define PM_CONFIG_MASTER_SECTION_ID 0x101U +#define PM_CONFIG_SLAVE_SECTION_ID 0x102U +#define PM_CONFIG_PREALLOC_SECTION_ID 0x103U +#define PM_CONFIG_POWER_SECTION_ID 0x104U +#define PM_CONFIG_RESET_SECTION_ID 0x105U +#define PM_CONFIG_SHUTDOWN_SECTION_ID 0x106U +#define PM_CONFIG_SET_CONFIG_SECTION_ID 0x107U +#define PM_CONFIG_GPO_SECTION_ID 0x108U + +#define PM_SLAVE_FLAG_IS_SHAREABLE 0x1U +#define PM_MASTER_USING_SLAVE_MASK 0x2U + +#define PM_CONFIG_GPO1_MIO_PIN_34_MAP (1U << 10U) +#define PM_CONFIG_GPO1_MIO_PIN_35_MAP (1U << 11U) +#define PM_CONFIG_GPO1_MIO_PIN_36_MAP (1U << 12U) +#define PM_CONFIG_GPO1_MIO_PIN_37_MAP (1U << 13U) + +#define PM_CONFIG_GPO1_BIT_2_MASK (1U << 2U) +#define PM_CONFIG_GPO1_BIT_3_MASK (1U << 3U) +#define PM_CONFIG_GPO1_BIT_4_MASK (1U << 4U) +#define PM_CONFIG_GPO1_BIT_5_MASK (1U << 5U) + +#define SUSPEND_TIMEOUT 0xFFFFFFFFU + +#define PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK 0x00000001 +#define PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK 0x00000100 +#define PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK 0x00000200 + + + +#if defined (__ICCARM__) +#pragma language=save +#pragma language=extended +#endif +#if defined (__GNUC__) + const u32 XPm_ConfigObject[] __attribute__((used, section(".sys_cfg_data"))) = +#elif defined (__ICCARM__) +#pragma location = ".sys_cfg_data" +__root const u32 XPm_ConfigObject[] = +#endif +{ + /**********************************************************************/ + /* HEADER */ + 2, /* Number of remaining words in the header */ + 8, /* Number of sections included in config object */ + 1U, /* Type of config object as base */ + /**********************************************************************/ + /* MASTER SECTION */ + PM_CONFIG_MASTER_SECTION_ID, /* Master SectionID */ + 3U, /* No. of Masters*/ + + NODE_APU, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_0, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_1, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Wake permissions */ + + + /**********************************************************************/ + /* SLAVE SECTION */ + + + PM_CONFIG_SLAVE_SECTION_ID, /* Section ID */ + 49, /* Number of slaves */ + + NODE_OCM_BANK_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TCM_0_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_0_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_1_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TCM_1_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_L2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU_PP_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU_PP_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_USB_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_USB_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_TTC_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SATA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_ETH_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_UART_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_UART_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SPI_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_SPI_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_I2C_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_I2C_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SD_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_SD_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_DP, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GDMA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_ADMA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_NAND, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_QSPI, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPIO, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_CAN_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_CAN_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_EXTERN, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_DDR, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_IPI_APU, + 0U, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_0, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_1, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_PCIE, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_PCAP, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_RTC, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_VCU, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_PL, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + + /**********************************************************************/ + /* PREALLOC SECTION */ + + PM_CONFIG_PREALLOC_SECTION_ID, /* Preallaoc SectionID */ + 3U, /* No. of Masters*/ + +/* Prealloc for psu_cortexa53_0 */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, + 12, + NODE_DDR, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_L2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_3, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_SD_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_QSPI, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_PL, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_APU, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_0 */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + 3, + NODE_TCM_0_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_0_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_1 */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + 3, + NODE_TCM_1_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_1_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + + /**********************************************************************/ + /* POWER SECTION */ + + PM_CONFIG_POWER_SECTION_ID, /* Power Section ID */ + 4U, /* Number of power nodes */ + + NODE_APU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_RPU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_FPD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_PLD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + + /**********************************************************************/ + /* RESET SECTION */ + + PM_CONFIG_RESET_SECTION_ID, /* Reset Section ID */ + 120U, /* Number of resets */ + + XILPM_RESET_PCIE_CFG, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_BRIDGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_CTRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRF, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GDMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SATA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APU_L2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DDR, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SOFT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_QSPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_NAND, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ADMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOU_CC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TIMESTAMP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R50, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R51, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_AMBA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_OCM, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_PGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RTC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SYSMON, 0, + XILPM_RESET_AFI_FM6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_LPD_SWDT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_FPD, PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + XILPM_RESET_RPU_DBG1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_DBG0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_VPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_7, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_8, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_9, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_10, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_11, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_12, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_13, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_14, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_15, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_16, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_17, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_18, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_19, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_20, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_21, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_22, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_23, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_24, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_25, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_26, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_27, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_28, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_29, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_30, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_31, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_LS, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PS_ONLY, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_92, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_93, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_94, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_95, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + + /**********************************************************************/ + /* SET CONFIG SECTION */ + PM_CONFIG_SET_CONFIG_SECTION_ID, /* Set Config Section ID */ + 0U, /* Permissions to load base config object */ + 0U, /* Permissions to load overlay config object */ + + /**********************************************************************/ + /* SHUTDOWN SECTION */ + + PM_CONFIG_SHUTDOWN_SECTION_ID, /* Shutdown Section ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* System Shutdown/Restart Permission */ + + /**********************************************************************/ + /* GPO SECTION */ + PM_CONFIG_GPO_SECTION_ID, /* GPO Section ID */ + PM_CONFIG_GPO1_MIO_PIN_34_MAP | + PM_CONFIG_GPO1_MIO_PIN_35_MAP | + PM_CONFIG_GPO1_MIO_PIN_36_MAP | + PM_CONFIG_GPO1_MIO_PIN_37_MAP | + 0, /* State of GPO pins */ +}; +#if defined (__ICCARM__) +#pragma language=restore +#endif + diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index bee7c1daf7..3e51cbfaab 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -1,34 +1,39 @@ BR2_aarch64=y -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.15-930-g966124532656bc95d781abf57531e4cd4f962237" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v2.6-33-ge678d5ddc475f34dea8f5004fb6ebde118621784" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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://github.com/xilinx/u-boot-xlnx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA" +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2022.01-165-g667001319cbe511ce6353195fb4910ae5cb041ce" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/53fdb7b6c92860ceb0ec5fd14deee302f4a84269/bin/pmufw-zcu106-default-v2017.4.bin" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/v2021.2/bin/pmufw-v2021.2.bin" +BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/zcu106/pm_cfg_obj.c" +BR2_TARGET_UBOOT_FORMAT_ITB=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y From arnout at mind.be Sat Feb 12 13:44:30 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 14:44:30 +0100 Subject: [Buildroot] [git commit] package/wpa_supplicant: bump version to 2.10 Message-ID: <20220212133723.8F1D882AA5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=39381a467cd2cfc15f77d3f9adbf329d2f92e312 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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. README's copyright year was updated. Signed-off-by: Sergey Matyukevich Reviewed-by: Yegor Yefremov Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...-ignore-management-frame-from-unexpected-.patch | 77 -------------- ...date-DigestAlgorithmIdentifier-parameters.patch | 116 --------------------- ...de-stdbool.h-to-allow-C99-bool-to-be-used.patch | 32 ------ ...elper-functions-for-recognizing-tag-value.patch | 37 ------- package/wpa_supplicant/wpa_supplicant.hash | 6 +- package/wpa_supplicant/wpa_supplicant.mk | 14 +-- 6 files changed, 3 insertions(+), 279 deletions(-) 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..fcaee0a30b 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 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 +sha256 20df7ae5154b3830355f8ab4269123a87affdea59fe74fe9292a91d0d7e17b2f wpa_supplicant-2.10.tar.gz +sha256 af01e1d1ee065a1054d20ebe8a78a016f1fb1133b73e6a9d50801b165bb280c7 README 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 From arnout at mind.be Sat Feb 12 13:44:40 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 14:44:40 +0100 Subject: [Buildroot] [git commit] package/hostapd: bump version to 2.10 Message-ID: <20220212133723.985BC82B32@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7ae68402f889fbb9febe01cbda2f2bcf5b7cc2d6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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. README's copyright year was updated. Signed-off-by: Sergey Matyukevich Reviewed-by: Yegor Yefremov Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...-ignore-management-frame-from-unexpected-.patch | 77 -------------- ...date-DigestAlgorithmIdentifier-parameters.patch | 116 --------------------- ...de-stdbool.h-to-allow-C99-bool-to-be-used.patch | 32 ------ ...elper-functions-for-recognizing-tag-value.patch | 37 ------- package/hostapd/hostapd.hash | 8 +- package/hostapd/hostapd.mk | 19 +--- 6 files changed, 3 insertions(+), 286 deletions(-) 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..4e130d01ca 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 9da5dd0776da266b180b915e460ff75c6ff729aca1196ab396529510f24f3761 README +sha256 206e7c799b678572c2e3d12030238784bc4a9f82323b0156b4c9466f1498915d hostapd-2.10.tar.gz +sha256 af01e1d1ee065a1054d20ebe8a78a016f1fb1133b73e6a9d50801b165bb280c7 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 = From peter at korsgaard.com Sat Feb 12 13:45:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 12 Feb 2022 14:45:30 +0100 Subject: [Buildroot] [PATCH v6 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <69189572-6eba-ed26-52dd-08a8b098f124@lucaceresoli.net> (Luca Ceresoli's message of "Sat, 12 Feb 2022 14:13:28 +0100") References: <20220211144402.1626443-1-neal.frager@xilinx.com> <69189572-6eba-ed26-52dd-08a8b098f124@lucaceresoli.net> Message-ID: <87bkzcnqpx.fsf@dell.be.48ers.dk> >>>>> "Luca" == Luca Ceresoli writes: Hi, >> +#endif >> +{ >> + /**********************************************************************/ >> + /* HEADER */ >> + 2, /* Number of remaining words in the header */ >> + 8, /* Number of sections included in config object */ >> + 1U, /* Type of config object as base */ > Here's where you have manually replaced "PM_CONFIG_OBJECT_TYPE_BASE" -> > "1U", right? Well, it should be well noted in the commit message. This > file is supposed to be generated by Vitis and used untouched, any manual > edits whould be documented. > Or, even better, use the U-Boot patch I sent (see other e-mail I just > wrote) and use an unmodified pm_cfg_obj.c Ups, I applied the series before seeing this comment. Lets handle it as a followup patch for zcu102/106. -- Bye, Peter Korsgaard From arnout at mind.be Sat Feb 12 13:45:55 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 14:45:55 +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: On 31/01/2022 20:48, 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 The copyright year was also updated in README, which changes the hash. I fixed that and applied both to master, thanks. Regards, Arnout [snip] From arnout at mind.be Sat Feb 12 13:46:04 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 14:46:04 +0100 Subject: [Buildroot] [PATCH v3] configs/friendlyarm_nanopi_r2s: new defconfig In-Reply-To: <20220130101150.20605-1-gilles.talis@gmail.com> References: <20220130101150.20605-1-gilles.talis@gmail.com> Message-ID: <6b45334f-0339-5f67-0c59-2f20b5d17b1e@mind.be> On 30/01/2022 11:11, 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 [snip] > 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 I've added an explicit BR2_cortex_a53=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 python3 is not enough, it uses pylibfdt, so I added BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=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 Since you switch to ext4-only, dosfstools and mtools are not longer needed, so I removed those. > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_MTOOLS=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS=y I don't think this is needed either, but I wasn't 100% sure so I kept it. Applied to master with those changes, thanks. Regards, Arnout From peter at korsgaard.com Sat Feb 12 13:48:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 12 Feb 2022 14:48:37 +0100 Subject: [Buildroot] [PATCH 1/2] boot/uboot: depend on host-python-setuptools In-Reply-To: <20220212124634.3148041-1-arnout@mind.be> (Arnout Vandecappelle's message of "Sat, 12 Feb 2022 13:46:33 +0100") References: <20220212124634.3148041-1-arnout@mind.be> Message-ID: <877da0nqkq.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) writes: > host-python3-setuptools was removed, we should instead use plain > host-python-setuptools. > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 12 13:48:41 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 12 Feb 2022 14:48:41 +0100 Subject: [Buildroot] [PATCH 2/2] package/python-regex: remove outdated comment In-Reply-To: <20220212124634.3148041-2-arnout@mind.be> (Arnout Vandecappelle's message of "Sat, 12 Feb 2022 13:46:34 +0100") References: <20220212124634.3148041-1-arnout@mind.be> <20220212124634.3148041-2-arnout@mind.be> Message-ID: <8735konqkm.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) writes: > python3-regex no longer exists, so there's no need to keep in sync with > it. > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 12 13:48:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 12 Feb 2022 14:48:50 +0100 Subject: [Buildroot] [git commit] boot/uboot: depend on host-python-setuptools Message-ID: <20220212134124.A13EE81D2A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0e8957839cc82433b4a9eb4d0c3f11d07f7c2b48 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master host-python3-setuptools was removed, we should instead use plain host-python-setuptools. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- boot/uboot/uboot.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 9e569906ce..6750069173 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -208,7 +208,7 @@ UBOOT_DEPENDENCIES += host-dtc endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON3),y) -UBOOT_DEPENDENCIES += host-python3 host-python3-setuptools +UBOOT_DEPENDENCIES += host-python3 host-python-setuptools endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYLIBFDT),y) From peter at korsgaard.com Sat Feb 12 13:48:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 12 Feb 2022 14:48:50 +0100 Subject: [Buildroot] [git commit] package/python-regex: remove outdated comment Message-ID: <20220212134124.AA5F482B32@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e1081382fcdd09fcd9421d6cbdfd5b1a05e9454b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master python3-regex no longer exists, so there's no need to keep in sync with it. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- package/python-regex/python-regex.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/python-regex/python-regex.mk b/package/python-regex/python-regex.mk index a90fd579ac..b93607e40f 100644 --- a/package/python-regex/python-regex.mk +++ b/package/python-regex/python-regex.mk @@ -4,7 +4,6 @@ # ################################################################################ -# Please keep in sync with package/python3-regex/python3-regex.mk PYTHON_REGEX_VERSION = 2021.4.4 PYTHON_REGEX_SOURCE = regex-$(PYTHON_REGEX_VERSION).tar.gz PYTHON_REGEX_SITE = https://files.pythonhosted.org/packages/38/3f/4c42a98c9ad7d08c16e7d23b2194a0e4f3b2914662da8bc88986e4e6de1f From arnout at mind.be Sat Feb 12 13:50:57 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 14:50:57 +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: <2bda4de0-2931-d25d-9b2b-91390a363143@mind.be> On 22/01/2022 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. It's like the preference we have for extlinux.conf in an ext4 filesystem: we prefer it over FAT, but it's not a really hard requirement, and we're definitely not going to update existing defconfigs unless an actual developer with the board tests them. Between all of those options, I think the randomly generated UUID is probably the best one. Well, actually, the automatic filling in by U-Boot is the best one but not all boards support that I guess. Regards, Arnout From peter at korsgaard.com Sat Feb 12 13:51:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 12 Feb 2022 14:51:37 +0100 Subject: [Buildroot] [PATCH] package/python-*: drop python3 dependency In-Reply-To: <20220212104349.6015-1-peter@korsgaard.com> (Peter Korsgaard's message of "Sat, 12 Feb 2022 11:43:48 +0100") References: <20220212104349.6015-1-peter@korsgaard.com> Message-ID: <87y22gmbva.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > All the python packages are inside an if BR2_PACKAGE_PYTHON3, so with the > removal of python2 support, the explicit python3 dependency is redundant. > Remove it. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 12 13:51:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 12 Feb 2022 14:51:10 +0100 Subject: [Buildroot] [git commit] package/python-*: drop python3 dependency Message-ID: <20220212134420.C3E4E825CB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a2ba9e7db9bd5fabff738147f73039fc8d4f1b3d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master All the python packages are inside an if BR2_PACKAGE_PYTHON3, so with the removal of python2 support, the explicit python3 dependency is redundant. Remove it. Signed-off-by: Peter Korsgaard Reviewed-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-aexpect/Config.in | 1 - package/python-aioblescan/Config.in | 1 - package/python-aiocoap/Config.in | 1 - package/python-aioconsole/Config.in | 1 - package/python-aiodns/Config.in | 1 - package/python-aiofiles/Config.in | 1 - package/python-aiohttp-cors/Config.in | 1 - package/python-aiohttp-debugtoolbar/Config.in | 1 - package/python-aiohttp-jinja2/Config.in | 1 - package/python-aiohttp-mako/Config.in | 1 - package/python-aiohttp-remotes/Config.in | 1 - package/python-aiohttp-security/Config.in | 1 - package/python-aiohttp-session/Config.in | 1 - package/python-aiohttp-sse/Config.in | 1 - package/python-aiohttp/Config.in | 1 - package/python-aiojobs/Config.in | 1 - package/python-aiologstash/Config.in | 1 - package/python-aiomonitor/Config.in | 1 - package/python-aioprocessing/Config.in | 1 - package/python-aioredis/Config.in | 1 - package/python-aiorwlock/Config.in | 1 - package/python-aiosignal/Config.in | 1 - package/python-aiozipkin/Config.in | 1 - package/python-argon2-cffi-bindings/Config.in | 1 - package/python-arrow/Config.in | 1 - package/python-asgiref/Config.in | 1 - package/python-async-lru/Config.in | 1 - package/python-async-timeout/Config.in | 1 - package/python-attrs/Config.in | 1 - package/python-autobahn/Config.in | 1 - package/python-automat/Config.in | 1 - package/python-avro/Config.in | 1 - package/python-bcrypt/Config.in | 1 - package/python-beautifulsoup4/Config.in | 1 - package/python-bidict/Config.in | 1 - package/python-bleak/Config.in | 1 - package/python-bluezero/Config.in | 2 -- package/python-boto3/Config.in | 1 - package/python-botocore/Config.in | 1 - package/python-cbor2/Config.in | 1 - package/python-cchardet/Config.in | 2 -- package/python-channels-redis/Config.in | 1 - package/python-channels/Config.in | 1 - package/python-charset-normalizer/Config.in | 1 - package/python-cheroot/Config.in | 1 - package/python-cherrypy/Config.in | 1 - package/python-colorlog/Config.in | 1 - package/python-colorzero/Config.in | 1 - package/python-configshell-fb/Config.in | 1 - package/python-crayons/Config.in | 1 - package/python-crontab/Config.in | 1 - package/python-crossbar/Config.in | 1 - package/python-cryptography/Config.in | 1 - package/python-cssselect2/Config.in | 1 - package/python-cssutils/Config.in | 1 - package/python-cycler/Config.in | 1 - package/python-daphne/Config.in | 1 - package/python-dataproperty/Config.in | 1 - package/python-dateutil/Config.in | 1 - package/python-dbus-next/Config.in | 1 - package/python-decorator/Config.in | 1 - package/python-dialog3/Config.in | 1 - package/python-django-enumfields/Config.in | 1 - package/python-django/Config.in | 1 - package/python-dnspython/Config.in | 1 - package/python-docker/Config.in | 1 - package/python-engineio/Config.in | 1 - package/python-falcon/Config.in | 1 - package/python-filelock/Config.in | 1 - package/python-flask-babel/Config.in | 1 - package/python-flask-cors/Config.in | 1 - package/python-flask-expects-json/Config.in | 1 - package/python-flask-jsonrpc/Config.in | 1 - package/python-flask-login/Config.in | 1 - package/python-flask-sqlalchemy/Config.in | 1 - package/python-flask-wtf/Config.in | 1 - package/python-flup/Config.in | 1 - package/python-fonttools/Config.in | 1 - package/python-frozenlist/Config.in | 1 - package/python-git/Config.in | 1 - package/python-gitdb2/Config.in | 1 - package/python-gobject/Config.in | 1 - package/python-gpiozero/Config.in | 1 - package/python-gunicorn/Config.in | 1 - package/python-h2/Config.in | 1 - package/python-hiredis/Config.in | 1 - package/python-hpack/Config.in | 1 - package/python-httplib2/Config.in | 1 - package/python-humanize/Config.in | 1 - package/python-hyperframe/Config.in | 1 - package/python-hyperlink/Config.in | 1 - package/python-ibmiotf/Config.in | 1 - package/python-idna/Config.in | 1 - package/python-inflection/Config.in | 1 - package/python-influxdb/Config.in | 1 - package/python-ipdb/Config.in | 1 - package/python-ipython/Config.in | 1 - package/python-itsdangerous/Config.in | 1 - package/python-janus/Config.in | 1 - package/python-jaraco-classes/Config.in | 1 - package/python-jaraco-functools/Config.in | 1 - package/python-jedi/Config.in | 1 - package/python-jinja2/Config.in | 1 - package/python-jsonmodels/Config.in | 1 - package/python-keyring/Config.in | 1 - package/python-libusb1/Config.in | 2 -- package/python-markdown/Config.in | 1 - package/python-markdown2/Config.in | 1 - package/python-markupsafe/Config.in | 1 - package/python-matplotlib/Config.in | 1 - package/python-mbstrdecoder/Config.in | 1 - package/python-memory-profiler/Config.in | 1 - package/python-more-itertools/Config.in | 1 - package/python-mpd2/Config.in | 1 - package/python-msgfy/Config.in | 1 - package/python-multidict/Config.in | 1 - package/python-mutagen/Config.in | 1 - package/python-mwclient/Config.in | 1 - package/python-mwscrape/Config.in | 1 - package/python-mwscrape2slob/Config.in | 2 -- package/python-networkx/Config.in | 1 - package/python-numpy/Config.in | 2 -- package/python-oauthlib/Config.in | 1 - package/python-opcua-asyncio/Config.in | 1 - package/python-packaging/Config.in | 1 - package/python-paramiko/Config.in | 1 - package/python-parso/Config.in | 1 - package/python-pathpy/Config.in | 1 - package/python-pathvalidate/Config.in | 1 - package/python-piexif/Config.in | 1 - package/python-pillow/Config.in | 1 - package/python-pip/Config.in | 1 - package/python-pluggy/Config.in | 1 - package/python-portend/Config.in | 1 - package/python-priority/Config.in | 1 - package/python-prompt-toolkit/Config.in | 1 - package/python-protobuf/Config.in | 1 - package/python-psycopg2/Config.in | 2 -- package/python-pudb/Config.in | 1 - package/python-py/Config.in | 1 - package/python-pybind/Config.in | 1 - package/python-pycairo/Config.in | 1 - package/python-pycares/Config.in | 1 - package/python-pycups/Config.in | 1 - package/python-pydantic/Config.in | 1 - package/python-pydyf/Config.in | 1 - package/python-pygments/Config.in | 1 - package/python-pyhamcrest/Config.in | 1 - package/python-pyjwt/Config.in | 1 - package/python-pymupdf/Config.in | 3 --- package/python-pymysql/Config.in | 1 - package/python-pynacl/Config.in | 1 - package/python-pyndiff/Config.in | 1 - package/python-pyopenssl/Config.in | 1 - package/python-pyparsing/Config.in | 1 - package/python-pyparted/Config.in | 2 -- package/python-pyphen/Config.in | 1 - package/python-pysftp/Config.in | 1 - package/python-pytablereader/Config.in | 1 - package/python-pytablewriter/Config.in | 1 - package/python-pytest-asyncio/Config.in | 1 - package/python-pytest/Config.in | 1 - package/python-pytrie/Config.in | 1 - package/python-pyusb/Config.in | 1 - package/python-pyyaml/Config.in | 1 - package/python-requests-oauthlib/Config.in | 1 - package/python-requests-toolbelt/Config.in | 1 - package/python-requests/Config.in | 1 - package/python-rsa/Config.in | 1 - package/python-s3transfer/Config.in | 1 - package/python-schedule/Config.in | 1 - package/python-secretstorage/Config.in | 1 - package/python-serial-asyncio/Config.in | 1 - package/python-service-identity/Config.in | 1 - package/python-setproctitle/Config.in | 1 - package/python-simpleaudio/Config.in | 1 - package/python-simplelogging/Config.in | 1 - package/python-simplesqlite/Config.in | 1 - package/python-slob/Config.in | 2 -- package/python-smmap2/Config.in | 1 - package/python-socketio/Config.in | 1 - package/python-sockjs/Config.in | 1 - package/python-soupsieve/Config.in | 1 - package/python-sqliteschema/Config.in | 1 - package/python-tabledata/Config.in | 1 - package/python-tempora/Config.in | 1 - package/python-tinycss2/Config.in | 1 - package/python-tinyrpc/Config.in | 1 - package/python-tomako/Config.in | 1 - package/python-tomli/Config.in | 1 - package/python-tornado/Config.in | 1 - package/python-traitlets/Config.in | 1 - package/python-treq/Config.in | 1 - package/python-twisted/Config.in | 1 - package/python-txaio/Config.in | 1 - package/python-txdbus/Config.in | 1 - package/python-txtorcon/Config.in | 1 - package/python-typepy/Config.in | 1 - package/python-ujson/Config.in | 1 - package/python-unittest-xml-reporting/Config.in | 1 - package/python-urwid/Config.in | 1 - package/python-uvloop/Config.in | 1 - package/python-validators/Config.in | 1 - package/python-watchdog/Config.in | 1 - package/python-weasyprint/Config.in | 1 - package/python-webpy/Config.in | 1 - package/python-websockets/Config.in | 1 - package/python-wtforms/Config.in | 1 - package/python-xlib/Config.in | 1 - package/python-xlsxwriter/Config.in | 1 - package/python-yarl/Config.in | 1 - package/python-zeroconf/Config.in | 1 - package/python-zopfli/Config.in | 1 - 213 files changed, 223 deletions(-) Patch is too large, so refusing to show it From arnout at mind.be Sat Feb 12 14:32:19 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 15:32:19 +0100 Subject: [Buildroot] [PATCH v2 1/5] package/serd: new package In-Reply-To: <20220127192311.1954197-1-james.hilliard1@gmail.com> References: <20220127192311.1954197-1-james.hilliard1@gmail.com> Message-ID: On 27/01/2022 20:23, James Hilliard wrote: > Signed-off-by: James Hilliard You didn't carry Gilles' Tested-by tags from v1, so I added those. Applied to master, thanks. Regards, Arnout > --- > 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)) From arnout at mind.be Sat Feb 12 14:27:39 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 15:27:39 +0100 Subject: [Buildroot] [git commit] package/sord: new package Message-ID: <20220212142506.53C6382B40@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0d4c8ce8a2f26989e0e2d95b977d60e450c090a9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Tested-by: Gilles Talis Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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(+) diff --git a/DEVELOPERS b/DEVELOPERS index ece07026bc..bdea8142e0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1337,6 +1337,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 a8f408844d..0b533ce999 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1700,6 +1700,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)) From arnout at mind.be Sat Feb 12 14:27:34 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 15:27:34 +0100 Subject: [Buildroot] [git commit] package/serd: new package Message-ID: <20220212142506.464E682B3B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e55f57b3d367213ef4b667988e42f7d26c6b23c9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Tested-by: Gilles Talis Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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(+) diff --git a/DEVELOPERS b/DEVELOPERS index a91dccd1e0..ece07026bc 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1336,6 +1336,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 7aff9e7cb7..a8f408844d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1699,6 +1699,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)) From arnout at mind.be Sat Feb 12 14:28:23 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 15:28:23 +0100 Subject: [Buildroot] [git commit] package/lv2: new package Message-ID: <20220212142506.603B482B35@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b066f1756f9af4a8577321ec09c17796bfb153d7 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/lv2/Config.in | 8 ++++++++ package/lv2/lv2.hash | 4 ++++ package/lv2/lv2.mk | 36 ++++++++++++++++++++++++++++++++++++ 5 files changed, 50 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index bdea8142e0..5573c62f0b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1286,6 +1286,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 0b533ce999..d95257e7aa 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1351,6 +1351,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)) From arnout at mind.be Sat Feb 12 14:31:38 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 15:31:38 +0100 Subject: [Buildroot] [git commit] package/lilv: new package Message-ID: <20220212142506.7992782B35@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9c8453734bf0f2c3e9dbf50c604952253f2b1524 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Tested-by: Gilles Talis Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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(+) diff --git a/DEVELOPERS b/DEVELOPERS index 356e74d51f..be8231a2af 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1286,6 +1286,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 86c654e3fc..f48b0c646d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1351,6 +1351,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)) From arnout at mind.be Sat Feb 12 14:30:08 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 15:30:08 +0100 Subject: [Buildroot] [git commit] package/sratom: new package Message-ID: <20220212142506.6C37582B3B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=47c0176b39f7fd4eeebf19a6c29c5c967a229674 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Tested-by: Gilles Talis Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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(+) diff --git a/DEVELOPERS b/DEVELOPERS index 5573c62f0b..356e74d51f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1339,6 +1339,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 d95257e7aa..86c654e3fc 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1362,6 +1362,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)) From arnout at mind.be Sat Feb 12 14:24:55 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 15:24:55 +0100 Subject: [Buildroot] [git commit] package/busybox: bump version to 1.35.0 Message-ID: <20220212142506.39E8782B35@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b501e1a43d9f08e461937984a939f7afbc726336 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Updating the busybox configuration files by loading and saving it back. Signed-off-by: Michael Fischer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 75e57ba53f..3e49de0a84 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 From arnout at mind.be Sat Feb 12 14:32:52 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 15:32:52 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/busybox: bump version to 1.35.0 In-Reply-To: <20220127121824.32092-1-mf@go-sys.de> References: <20220126231554.0fcc106d@windsurf> <20220127121824.32092-1-mf@go-sys.de> Message-ID: <78653596-5ab1-a080-ebf3-22fcbdff7ec5@mind.be> On 27/01/2022 13:18, Michael Fischer wrote: > Updating the busybox configuration files by loading and saving it back. > > Signed-off-by: Michael Fischer Applied to master, thanks. Regards, Arnout From arnout at mind.be Sat Feb 12 14:44:22 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 15:44:22 +0100 Subject: [Buildroot] [PATCH] package/dbus-cxx: new package In-Reply-To: References: Message-ID: On 28/01/2022 12:12, Lang Daniel via buildroot wrote: > DBus-cxx provides an object-oriented interface to DBus > > Signed-off-by: Lang Daniel Applied to master, thanks. I made some changes though. > --- > 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 > [snip] > 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 I converted this into a "select". Normally you'd say that obviously this package is only relevant if you have dbus, but it's very well possible that some other package has a non-optional dependency on dbus-cxx and you want to use that in a context where you don't actually need dbus for anything else. So select is more appropriate. > + 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 I've made these automatic dependencies instead of explicit options. I assume that the overhead of them is fairly small. > + > +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 I put GPL-3.0 at the beginning. It's not a very strict convention, but it seems obvious that the "main" license should be first. Regards, Arnout > +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)) From arnout at mind.be Sat Feb 12 14:37:51 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 15:37:51 +0100 Subject: [Buildroot] [git commit] package/dbus-cxx: new package Message-ID: <20220212143702.16C0080114@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a0fb3eed27cc0fa4a7729f46b88b935309374b4d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master DBus-cxx provides an object-oriented interface to DBus Signed-off-by: Lang Daniel [Arnout: - reorder licenses; - select dbus instead of depends, + propagate dependency - make qt5 and libglib2 integration automatic ] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 1 + package/Config.in | 1 + package/dbus-cxx/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 | 24 ++++++ package/dbus-cxx/dbus-cxx.hash | 5 ++ package/dbus-cxx/dbus-cxx.mk | 28 +++++++ 8 files changed, 220 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index be8231a2af..b36f42e274 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -622,6 +622,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 f48b0c646d..314a17a6db 100644 --- a/package/Config.in +++ b/package/Config.in @@ -461,6 +461,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..f08769b6c5 --- /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..1892f73a72 --- /dev/null +++ b/package/dbus-cxx/Config.in @@ -0,0 +1,24 @@ +config BR2_PACKAGE_DBUS_CXX + bool "dbus-cxx" + depends on BR2_USE_MMU # dbus + 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 + select BR2_PACKAGE_DBUS # runtime + 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/ + +comment "dbus-cxx needs a toolchain w/ C++, threads, gcc >= 7 and dynamic library support" + depends on BR2_USE_MMU # dbus + 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..3e89fc9db7 --- /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 = GPL-3.0, Boost license (cmake-modules), Apache 2.0 (libcppgenerate) +DBUS_CXX_LICENSE_FILES = COPYING cmake-modules/LICENSE_1_0.txt tools/libcppgenerate/LICENSE +DBUS_CXX_INSTALL_STAGING = YES +DBUS_CXX_DEPENDENCIES = libsigc + +ifeq ($(BR2_PACKAGE_QT5BASE),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_LIBGLIB2),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)) From nealf at xilinx.com Sat Feb 12 14:47:25 2022 From: nealf at xilinx.com (Neal Frager) Date: Sat, 12 Feb 2022 14:47:25 +0000 Subject: [Buildroot] [PATCH v6 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <87bkzcnqpx.fsf@dell.be.48ers.dk> References: <20220211144402.1626443-1-neal.frager@xilinx.com> <69189572-6eba-ed26-52dd-08a8b098f124@lucaceresoli.net> <87bkzcnqpx.fsf@dell.be.48ers.dk> Message-ID: Hi Peter, > > Ups, I applied the series before seeing this comment. Lets handle it as > a followup patch for zcu102/106. > > -- > Bye, Peter Korsgaard Yes, I agree. I will make another patch to cover this when I return from my vacation the week of February 21st. Thank you for applying this patch set and for all your support! Thank you to Giulio and Luca as well! Best regards, Neal Frager Xilinx From yann.morin.1998 at free.fr Sat Feb 12 16:49:51 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 12 Feb 2022 17:49:51 +0100 Subject: [Buildroot] [PATCH] package/libcamera: fix missing comment for binutils-bug-27597 In-Reply-To: <20220128110542.1101197-2-giulio.benetti@benettiengineering.com> References: <20220128110542.1101197-1-giulio.benetti@benettiengineering.com> <20220128110542.1101197-2-giulio.benetti@benettiengineering.com> Message-ID: <20220212164951.GE3752867@scaer> Giulio, All, On 2022-01-28 12:05 +0100, Giulio Benetti spake thusly: > 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" Bug 27597 is inherently an architecture-speific bug, which is always set for NIOS2, so there is nothing the user can do about it except switch to another architecture... The comments are meant for when the user has an alternative option, like chossing a different version of a component. In this case, there is nothing the user can do, so we don't add it to the comment. Regards, Yann E. MORIN. > 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 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Feb 12 16:52:15 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 12 Feb 2022 17:52:15 +0100 Subject: [Buildroot] [PATCH] package/libcamera bump to 1966b9a58436fab51f8270aad6a228b935e4fac4 In-Reply-To: <20220211112245.1357817-1-kieran.bingham@ideasonboard.com> References: <20220211112245.1357817-1-kieran.bingham@ideasonboard.com> Message-ID: <20220212165215.GF3752867@scaer> Kieran, All, On 2022-02-11 11:22 +0000, Kieran Bingham spake thusly: > Update to the latest libcamera commit. > > This incorporates fixes and improvements for Raspberry Pi which will be > needed to go along side the new libcamera-apps package. > > Signed-off-by: Kieran Bingham Applied to master, with the minor typo spotted by Peter fixed, thanks. Regards, Yann E. MORIN. > --- > package/libcamera/libcamera.hash | 2 +- > package/libcamera/libcamera.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/libcamera/libcamera.hash b/package/libcamera/libcamera.hash > index a7ca27a96b7f..8d5abf0e621c 100644 > --- a/package/libcamera/libcamera.hash > +++ b/package/libcamera/libcamera.hash > @@ -1,4 +1,4 @@ > -sha256 305e6f458d2bf3d4b697ffe33e104b696db6b1492bb5422e2cce1937e58516f1 libcamera-40f5fddca7f774944a53f58eeaebc4db79c373d8-br1.tar.gz > +sha256 3624c71ba492c602c5335aab3dc87798193f7596c6cc75f7cfb847165f180930 libcamera-1966b9a58436fab51f8270aad6a228b935e4fac4-br1.tar.gz > > # license files > sha256 fd38b2c053c0cce46d9c5ef3545a6e34d157a240ba99c9b8dca5d37a8147da6c LICENSES/BSD-2-Clause.txt > diff --git a/package/libcamera/libcamera.mk b/package/libcamera/libcamera.mk > index 534d8d26371f..cf1af5aaf065 100644 > --- a/package/libcamera/libcamera.mk > +++ b/package/libcamera/libcamera.mk > @@ -5,7 +5,7 @@ > ################################################################################ > > LIBCAMERA_SITE = https://git.linuxtv.org/libcamera.git > -LIBCAMERA_VERSION = 40f5fddca7f774944a53f58eeaebc4db79c373d8 > +LIBCAMERA_VERSION = 1966b9a58436fab51f8270aad6a228b935e4fac4 > LIBCAMERA_SITE_METHOD = git > LIBCAMERA_DEPENDENCIES = \ > host-openssl \ > -- > 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 Feb 12 16:51:25 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 12 Feb 2022 17:51:25 +0100 Subject: [Buildroot] [git commit] package/libcamera: bump to 1966b9a58436fab51f8270aad6a228b935e4fac4 Message-ID: <20220212164453.2EE1C8212B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=695b21d6a16ab2033e8bdc86a5df38880e5aecda branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update to the latest libcamera commit. This incorporates fixes and improvements for Raspberry Pi which will be needed to go along side the new libcamera-apps package. Signed-off-by: Kieran Bingham Reviewed-by: Peter Seiderer Tested-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/libcamera/libcamera.hash | 2 +- package/libcamera/libcamera.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libcamera/libcamera.hash b/package/libcamera/libcamera.hash index a7ca27a96b..8d5abf0e62 100644 --- a/package/libcamera/libcamera.hash +++ b/package/libcamera/libcamera.hash @@ -1,4 +1,4 @@ -sha256 305e6f458d2bf3d4b697ffe33e104b696db6b1492bb5422e2cce1937e58516f1 libcamera-40f5fddca7f774944a53f58eeaebc4db79c373d8-br1.tar.gz +sha256 3624c71ba492c602c5335aab3dc87798193f7596c6cc75f7cfb847165f180930 libcamera-1966b9a58436fab51f8270aad6a228b935e4fac4-br1.tar.gz # license files sha256 fd38b2c053c0cce46d9c5ef3545a6e34d157a240ba99c9b8dca5d37a8147da6c LICENSES/BSD-2-Clause.txt diff --git a/package/libcamera/libcamera.mk b/package/libcamera/libcamera.mk index 7cd4bfa758..9cbb1910dc 100644 --- a/package/libcamera/libcamera.mk +++ b/package/libcamera/libcamera.mk @@ -5,7 +5,7 @@ ################################################################################ LIBCAMERA_SITE = https://git.linuxtv.org/libcamera.git -LIBCAMERA_VERSION = 40f5fddca7f774944a53f58eeaebc4db79c373d8 +LIBCAMERA_VERSION = 1966b9a58436fab51f8270aad6a228b935e4fac4 LIBCAMERA_SITE_METHOD = git LIBCAMERA_DEPENDENCIES = \ host-openssl \ From giulio.benetti at benettiengineering.com Sat Feb 12 16:56:51 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 12 Feb 2022 17:56:51 +0100 Subject: [Buildroot] [PATCH] package/libcamera: fix missing comment for binutils-bug-27597 In-Reply-To: <20220212164951.GE3752867@scaer> References: <20220128110542.1101197-1-giulio.benetti@benettiengineering.com> <20220128110542.1101197-2-giulio.benetti@benettiengineering.com> <20220212164951.GE3752867@scaer> Message-ID: On 12/02/22 17:49, Yann E. MORIN wrote: > Giulio, All, > > On 2022-01-28 12:05 +0100, Giulio Benetti spake thusly: >> 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" > > Bug 27597 is inherently an architecture-speific bug, which is always set > for NIOS2, so there is nothing the user can do about it except switch to > another architecture... > > The comments are meant for when the user has an alternative option, like > chossing a different version of a component. > > In this case, there is nothing the user can do, so we don't add it to > the comment. Aaah, right, like hidden options. Ok, so let's drop this patch. Thank you! Best regards -- Giulio Benetti Benetti Engineering sas > Regards, > Yann E. MORIN. > >> 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 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > From yann.morin.1998 at free.fr Sat Feb 12 17:11:52 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 12 Feb 2022 18:11:52 +0100 Subject: [Buildroot] [git commit] package/libcamera-apps: new package Message-ID: <20220212170619.DCB5F8215C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7227d005d2435ec7b38995a6247d233ddb5ba365 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer [yann.morin.1998 at free.fr: - only depend on libx11-xlib or libexpoxy if actually enabled - simplify qt5 dependency - fix check-package ] Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + package/Config.in | 1 + ...e-Werror-and-Wfatal-errors-compiler-comma.patch | 37 +++++++++++++++++ package/libcamera-apps/Config.in | 29 +++++++++++++ package/libcamera-apps/libcamera-apps.hash | 3 ++ package/libcamera-apps/libcamera-apps.mk | 48 ++++++++++++++++++++++ 6 files changed, 119 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index b36f42e274..9e3142d8a4 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2283,6 +2283,7 @@ F: package/gstreamer1/gst1-devtools/ F: package/gstreamer1/gst1-interpipe/ F: package/gstreamer1/gstreamer1-editing-services/ F: package/iwd/ +F: package/libcamera-apps/ F: package/libevdev/ F: package/libuev/ F: package/log4cplus/ diff --git a/package/Config.in b/package/Config.in index 314a17a6db..10209d84d7 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1738,6 +1738,7 @@ menu "Multimedia" source "package/libbdplus/Config.in" source "package/libbluray/Config.in" source "package/libcamera/Config.in" + source "package/libcamera-apps/Config.in" source "package/libdcadec/Config.in" source "package/libdvbcsa/Config.in" source "package/libdvbpsi/Config.in" diff --git a/package/libcamera-apps/0001-cmake-remove-Werror-and-Wfatal-errors-compiler-comma.patch b/package/libcamera-apps/0001-cmake-remove-Werror-and-Wfatal-errors-compiler-comma.patch new file mode 100644 index 0000000000..988d89cca3 --- /dev/null +++ b/package/libcamera-apps/0001-cmake-remove-Werror-and-Wfatal-errors-compiler-comma.patch @@ -0,0 +1,37 @@ +From 6bd733b52f0b4039407c676cd3126a9e2f79456b Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Fri, 5 Feb 2021 18:24:08 +0100 +Subject: [PATCH] cmake: remove -Werror and -Wfatal-errors compiler command + line option +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes (with bootlin-riscv64-musl toolchain): + + .../build/libcamera-apps-2d1009e3badcc8047361ff81149ad6cba3b911b5/core/libcamera_app.cpp:30:22: error: overflow in conversion from ???long unsigned int??? to ???int??? changes value from ???2154321408??? to ???-2140645888??? [-Werror=overflow] + 30 | int ret = ioctl(fd, VIDIOC_QUERYCAP, &caps); + | ^~~~~~~~~~~~~~~ + cc1plus: all warnings being treated as errors + +Signed-off-by: Peter Seiderer +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 748c6dd..1ca1e39 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -11,7 +11,7 @@ endif() + + set (CMAKE_EXPORT_COMPILE_COMMANDS ON) + set (CMAKE_CXX_STANDARD 17) +-add_compile_options(-Wall -Wextra -pedantic -Wno-unused-parameter -faligned-new -Werror -Wfatal-errors) ++add_compile_options(-Wall -Wextra -pedantic -Wno-unused-parameter -faligned-new) + add_definitions(-D_FILE_OFFSET_BITS=64) + + if (CMAKE_COMPILER_IS_GNUCXX) +-- +2.34.1 + diff --git a/package/libcamera-apps/Config.in b/package/libcamera-apps/Config.in new file mode 100644 index 0000000000..a1affc2d23 --- /dev/null +++ b/package/libcamera-apps/Config.in @@ -0,0 +1,29 @@ +config BR2_PACKAGE_LIBCAMERA_APPS + bool "libcamera-apps" + depends on BR2_PACKAGE_LIBCAMERA_ARCH_SUPPORTS # libcamera + depends on BR2_INSTALL_LIBSTDCPP # libcamera/boost + depends on BR2_TOOLCHAIN_HAS_THREADS # libcamera/boost + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17/libcamera + depends on !BR2_STATIC_LIBS # gnutls/libcamera + depends on BR2_USE_WCHAR # gnutls/libcamera/boost + select BR2_PACKAGE_BOOST + select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS + select BR2_PACKAGE_JPEG + select BR2_PACKAGE_LIBCAMERA + select BR2_PACKAGE_LIBEXIF + select BR2_PACKAGE_LIBPNG + select BR2_PACKAGE_TIFF + select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 && (BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL) + select BR2_PACKAGE_LIBEPOXY if BR2_PACKAGE_XORG7 && (BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL) + select BR2_PACKAGE_QT5BASE_GUI if BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT5BASE_WIDGETS if BR2_PACKAGE_QT5 + help + This is a small suite of libcamera-based apps that aim to copy + the functionality of the existing "raspicam" apps. + + https://github.com/raspberrypi/libcamera-apps + +comment "libcamera-apps needs a toolchain w/ C++, threads, wchar, dynamic library, gcc >= 7" + 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 diff --git a/package/libcamera-apps/libcamera-apps.hash b/package/libcamera-apps/libcamera-apps.hash new file mode 100644 index 0000000000..2dbb74d463 --- /dev/null +++ b/package/libcamera-apps/libcamera-apps.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 611aec06dd24de6586580164d9b7c55da0698ac4cf129944b2fc41fe67210597 libcamera-apps-2d1009e3badcc8047361ff81149ad6cba3b911b5.tar.gz +sha256 36dfed86bdef661a0a14ec1a1cc84c771d5a06b6f9b92e9ebb610ba711bd528a license.txt diff --git a/package/libcamera-apps/libcamera-apps.mk b/package/libcamera-apps/libcamera-apps.mk new file mode 100644 index 0000000000..210d4e1e52 --- /dev/null +++ b/package/libcamera-apps/libcamera-apps.mk @@ -0,0 +1,48 @@ +################################################################################ +# +# libcamera-apps +# +################################################################################ + +LIBCAMERA_APPS_VERSION = 2d1009e3badcc8047361ff81149ad6cba3b911b5 +LIBCAMERA_APPS_SITE = $(call github,raspberrypi,libcamera-apps,$(LIBCAMERA_APPS_VERSION)) +LIBCAMERA_APPS_LICENSE = BSD-2-Clause +LIBCAMERA_APPS_LICENSE_FILES = license.txt +LIBCAMERA_APPS_DEPENDENCIES = \ + host-pkgconf \ + boost \ + jpeg \ + libcamera \ + libexif \ + libpng \ + tiff + +LIBCAMERA_APPS_CONF_OPTS = \ + -DENABLE_COMPILE_FLAGS_FOR_TARGET=disabled \ + -DENABLE_OPENCV=0 \ + -DENABLE_TFLITE=0 + +ifeq ($(BR2_PACKAGE_LIBDRM),y) +LIBCAMERA_APPS_DEPENDENCIES += libdrm +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_DRM=1 +else +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_DRM=0 +endif + +ifeq ($(BR2_PACKAGE_XORG7),y) +LIBCAMERA_APPS_DEPENDENCIES += \ + $(if $(BR2_PACKAGE_LIBEPOXY),libepoxy) \ + $(if $(BR2_PACKAGE_XLIB_LIBX11),xlib_libX11) +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_X11=1 +else +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_X11=0 +endif + +ifeq ($(BR2_PACKAGE_QT5),y) +LIBCAMERA_APPS_DEPENDENCIES += qt5base +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_QT=1 +else +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_QT=0 +endif + +$(eval $(cmake-package)) From yann.morin.1998 at free.fr Sat Feb 12 17:24:57 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 12 Feb 2022 18:24:57 +0100 Subject: [Buildroot] [PATCH v6 1/1] package/libcamera-apps: new package In-Reply-To: <20220211150604.23489-2-ps.report@gmx.net> References: <20220211150604.23489-1-ps.report@gmx.net> <20220211150604.23489-2-ps.report@gmx.net> Message-ID: <20220212172457.GG3752867@scaer> Peter, All, +Kieran On 2022-02-11 16:06 +0100, Peter Seiderer spake thusly: > Signed-off-by: Peter Seiderer Finally applied to master, thanks. However, see below for somme important comments... > --- [--SNIP--] > diff --git a/package/libcamera-apps/0001-cmake-remove-Werror-and-Wfatal-errors-compiler-comma.patch b/package/libcamera-apps/0001-cmake-remove-Werror-and-Wfatal-errors-compiler-comma.patch > new file mode 100644 > index 0000000000..988d89cca3 > --- /dev/null > +++ b/package/libcamera-apps/0001-cmake-remove-Werror-and-Wfatal-errors-compiler-comma.patch > @@ -0,0 +1,37 @@ > +From 6bd733b52f0b4039407c676cd3126a9e2f79456b Mon Sep 17 00:00:00 2001 > +From: Peter Seiderer > +Date: Fri, 5 Feb 2021 18:24:08 +0100 > +Subject: [PATCH] cmake: remove -Werror and -Wfatal-errors compiler command > + line option > +MIME-Version: 1.0 > +Content-Type: text/plain; charset=UTF-8 > +Content-Transfer-Encoding: 8bit > + > +Fixes (with bootlin-riscv64-musl toolchain): > + > + .../build/libcamera-apps-2d1009e3badcc8047361ff81149ad6cba3b911b5/core/libcamera_app.cpp:30:22: error: overflow in conversion from ?long unsigned int? to ?int? changes value from ?2154321408? to ?-2140645888? [-Werror=overflow] > + 30 | int ret = ioctl(fd, VIDIOC_QUERYCAP, &caps); > + | ^~~~~~~~~~~~~~~ > + cc1plus: all warnings being treated as errors Kieran, I believe this really needs some investigation on your side. Peter, can you provide a defconfig that exhibits the issue, please? [--SNIP--] > diff --git a/package/libcamera-apps/Config.in b/package/libcamera-apps/Config.in > new file mode 100644 > index 0000000000..75807b9c01 > --- /dev/null > +++ b/package/libcamera-apps/Config.in > @@ -0,0 +1,30 @@ > +config BR2_PACKAGE_LIBCAMERA_APPS > + bool "libcamera-apps" > + depends on BR2_PACKAGE_LIBCAMERA_ARCH_SUPPORTS # libcamera > + depends on BR2_INSTALL_LIBSTDCPP # libcamera/boost > + depends on BR2_TOOLCHAIN_HAS_THREADS # libcamera/boost > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17/libcamera > + depends on !BR2_STATIC_LIBS # gnutls/libcamera > + depends on BR2_USE_WCHAR # gnutls/libcamera/boost > + select BR2_PACKAGE_BOOST > + select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS > + select BR2_PACKAGE_JPEG > + select BR2_PACKAGE_LIBCAMERA > + select BR2_PACKAGE_LIBEXIF > + select BR2_PACKAGE_LIBPNG > + select BR2_PACKAGE_TIFF > + select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 && (BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL) > + select BR2_PACKAGE_LIBEPOXY if BR2_PACKAGE_XORG7 && (BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL) Look closely those two select: if neither EGL nor GL are neabled, then neither libeopxy nor xlib-libx11 are enabled, even when Xorg is. So, see later [0]... > + select BR2_PACKAGE_QT5BASE_GUI if BR2_PACKAGE_QT5 > + select BR2_PACKAGE_QT5BASE_WIDGETS if BR2_PACKAGE_QT5 When Qt5 is enabled, then Qt5GUI and Qt5Widgets are enabled, so [1]... > + Spurious empty line, I dropeed it. [--SNIP--] > diff --git a/package/libcamera-apps/libcamera-apps.mk b/package/libcamera-apps/libcamera-apps.mk > new file mode 100644 > index 0000000000..23cc02793d > --- /dev/null > +++ b/package/libcamera-apps/libcamera-apps.mk > @@ -0,0 +1,46 @@ > +################################################################################ > +# > +# libcamera-apps > +# > +################################################################################ > + > +LIBCAMERA_APPS_VERSION = 2d1009e3badcc8047361ff81149ad6cba3b911b5 > +LIBCAMERA_APPS_SITE = $(call github,raspberrypi,libcamera-apps,$(LIBCAMERA_APPS_VERSION)) > +LIBCAMERA_APPS_LICENSE = BSD-2-Clause > +LIBCAMERA_APPS_LICENSE_FILES = license.txt > +LIBCAMERA_APPS_DEPENDENCIES = \ > + host-pkgconf \ > + boost \ > + jpeg \ > + libcamera \ > + libexif \ > + libpng \ > + tiff > + > +LIBCAMERA_APPS_CONF_OPTS = \ > + -DENABLE_COMPILE_FLAGS_FOR_TARGET=disabled \ > + -DENABLE_OPENCV=0 \ > + -DENABLE_TFLITE=0 > + > +ifeq ($(BR2_PACKAGE_LIBDRM),y) > +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_DRM=1 > +LIBCAMERA_APPS_DEPENDENCIES += libdrm > +else > +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_DRM=0 > +endif > + > +ifeq ($(BR2_PACKAGE_XORG7)$(BR2_PACKAGE_LIBEPOXY),yy) > +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_X11=1 > +LIBCAMERA_APPS_DEPENDENCIES += libepoxy xlib_libX11 [0] so here, the condition is only on Xorg && linepoxy, and nothing about xlib-libx11, but still a dependency is added against it, although it may well be not enabled. So, I changed the condition to: ifeq ($(BR2_PACKAGE_XORG7),y) LIBCAMERA_APPS_DEPENDENCIES += \ $(if $(BR2_PACKAGE_LIBEPOXY),libepoxy) \ $(if $(BR2_PACKAGE_XLIB_LIBX11),xlib_libX11) LIBCAMERA_APPS_CONF_OPTS += -DENABLE_X11=1 else LIBCAMERA_APPS_CONF_OPTS += -DENABLE_X11=0 endif Argh, and now I see I missed something: indeed, libepoxy and xlib-libx11 are selected udner the same conditions, so if either is enabled, the other is.... Oh, wait, no, they can either be enabled manually by the user, and not 'selected' by libcanera-apps, so we still can have the situation where they are not both enabled... So, if both xlib-libx11 are required, then please send a patch to fix the comndition. In any case, pelase review the current code, at least to check if I did not mess too much... > +else > +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_X11=0 > +endif > + > +ifeq ($(BR2_PACKAGE_QT5)$(BR2_PACKAGE_QT5BASE_GUI)$(BR2_PACKAGE_QT5BASE_WIDGETS),yyy) [1] so here, GUI and widgets will be enabled when Qt5 is, so checking for them is redundant. Also: # make check-package package/libcamera-apps/libcamera-apps.mk:39: line contains trailing whitespace Applied to master with a buncha fixes for all the above, thanks. Regards, Yann E. MORIN. > +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_QT=1 > +LIBCAMERA_APPS_DEPENDENCIES += qt5base > +else > +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_QT=0 > +endif > + > +$(eval $(cmake-package)) > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Feb 12 18:41:55 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 12 Feb 2022 19:41:55 +0100 Subject: [Buildroot] [PATCH] support/pkg-stats: fix regression after cleanup in show-info Message-ID: <20220212184155.4188927-1-yann.morin.1998@free.fr> Commit 471ecea5eeb0 (core/show-info: 'name' only applies to packages) removed the 'name' field for rootfs (really, for non-package) entries, thus breaking the pkg-stats processing. We fix that by excluding any entry that has no 'name', on the assumption that if it has no name, it is not a package. Reported-by: Xogium on IRC Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni --- support/scripts/pkg-stats | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index abd36a3dd5..c235d99407 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -371,7 +371,7 @@ def get_pkglist(npackages, package_list): def get_config_packages(): cmd = ["make", "--no-print-directory", "show-info"] js = json.loads(subprocess.check_output(cmd)) - return set([v["name"] for v in js.values()]) + return set([v["name"] for v in js.values() if 'name' in v]) def package_init_make_info(): -- 2.25.1 From arnout at mind.be Sat Feb 12 20:35:16 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 21:35:16 +0100 Subject: [Buildroot] [PATCH] boot/uboot: add support for bundling TEE in BIN format into U-Boot In-Reply-To: <20220201091342.143010-1-michael@amarulasolutions.com> References: <20220201091342.143010-1-michael@amarulasolutions.com> Message-ID: On 01/02/2022 10:13, Michael Trimarchi wrote: > Some U-Boot platforms (e.g. nxp) can bundle OPTEE's tee.bin > into the U-Boot image using binman. This patch brings the necessary changes to > enable this feature. > > Signed-off-by: Michael Trimarchi > --- > boot/uboot/Config.in | 12 ++++++++++++ > boot/uboot/uboot.mk | 12 ++++++++++++ > 2 files changed, 24 insertions(+) > > diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in > index c630fc6552..117bbd3faf 100644 > --- a/boot/uboot/Config.in > +++ b/boot/uboot/Config.in > @@ -237,6 +237,18 @@ config BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE > U-Boot. This option makes sure optee-os gets built prior to > U-Boot, and that the TEE variable pointing to OPTEE's > tee.elf, is passed during the Buildroot build. ^^^^^^^ This is inconsistent with the choice below. Perhaps reformulate like this: U-Boot, and that the TEE variable pointing to OPTEE's binary is passed during the Buildroot build. > +choice > + prompt "U-Boot OPTEE BL32 format" > + default BR2_TARGET_UBOOT_NEEDS_OPTEE_BIN > + depends on BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE (nitpick) IMHO it's nicer to write this with if...endif around the choice. More importantly: there should be a help text. > + > +config BR2_TARGET_UBOOT_NEEDS_OPTEE_BIN > + bool "tee.bin" > + > +config BR2_TARGET_UBOOT_NEEDS_OPTEE_ELF > + bool "tee.elf" > + > +endchoice > > config BR2_TARGET_UBOOT_NEEDS_OPENSBI > bool "U-Boot needs OpenSBI" > diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk > index 574fc7089a..210fa219ed 100644 > --- a/boot/uboot/uboot.mk > +++ b/boot/uboot/uboot.mk > @@ -177,7 +177,19 @@ endif > > ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE),y) > UBOOT_DEPENDENCIES += optee-os > +ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPTEE_ELF),y) > UBOOT_MAKE_OPTS += TEE=$(BINARIES_DIR)/tee.elf > +define UBOOT_COPY_TEE_FIRMWARE > + cp $(BINARIES_DIR)/tee.elf $(@D)/ As Yann explained but it didn't appear to get through: before, it supposedly wasn't necessary to make this copy, so why is it necessary now? Perhaps it is necessary to copy it in more recent versions of U-Boot (i.e. when using binman). In that case, I think it would be good to also update the make option to TEE=tee.elf, to make it more consistent. > +endef > +UBOOT_PRE_BUILD_HOOKS += UBOOT_COPY_TEE_FIRMWARE > +else > +UBOOT_MAKE_OPTS += BL32=$(BINARIES_DIR)/tee.bin > +define UBOOT_COPY_TEE_FIRMWARE > + cp $(BINARIES_DIR)/tee-raw.bin $(@D)/tee.bin Again, it's very weird that you pass in a BL32= that refers to a different file (really different this time, because it's not the tee-raw.bin but the full tee.bin). There may be good reasons to do it this way, but that should be explained in detail in the commit message, and also briefly in a comment because it's simply too weird to understand like this. I've marked the patch as Changes Requested. Regards, Arnout > +endef > +UBOOT_PRE_BUILD_HOOKS += UBOOT_COPY_TEE_FIRMWARE > +endif > endif > > ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSBI),y) From arnout at mind.be Sat Feb 12 20:36:25 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 21:36:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-aiohttp-session: bump to version 2.11.0 In-Reply-To: <20220201013307.1956972-1-james.hilliard1@gmail.com> References: <20220201013307.1956972-1-james.hilliard1@gmail.com> Message-ID: On 01/02/2022 02:33, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-aiohttp-session/python-aiohttp-session.hash | 4 ++-- > package/python-aiohttp-session/python-aiohttp-session.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-aiohttp-session/python-aiohttp-session.hash b/package/python-aiohttp-session/python-aiohttp-session.hash > index 3842f0c7af..8b44318307 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 d57d463a9db13b681f7924b38aa77f64 aiohttp-session-2.10.0.tar.gz > -sha256 2af19af9f435937baacbb6420f887b21e5021bb34be146c2702c58e6ebf6b76b aiohttp-session-2.10.0.tar.gz > +md5 797273eb5f0ef9e95fa92c6a933cf4ad aiohttp-session-2.11.0.tar.gz > +sha256 0fdf39600f6a05c4943ef6c7b099071ca9854413111a26761626244be5015dc4 aiohttp-session-2.11.0.tar.gz > # Locally computed sha256 checksums > sha256 7bc5dd2f229a6b922befb1427fd4ad2c0b255f12c1b1869370ba77520dc22bc7 LICENSE > diff --git a/package/python-aiohttp-session/python-aiohttp-session.mk b/package/python-aiohttp-session/python-aiohttp-session.mk > index a28b1ae143..3d59b75e3d 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.10.0 > +PYTHON_AIOHTTP_SESSION_VERSION = 2.11.0 > PYTHON_AIOHTTP_SESSION_SOURCE = aiohttp-session-$(PYTHON_AIOHTTP_SESSION_VERSION).tar.gz > -PYTHON_AIOHTTP_SESSION_SITE = https://files.pythonhosted.org/packages/d6/3f/ab6288e8bbf4a9ae63ea0d3d5711bccc3a6dad1cb85a420c14fdeabc209e > +PYTHON_AIOHTTP_SESSION_SITE = https://files.pythonhosted.org/packages/3b/a7/0b97b9a2e3a553a86a6703f86b0e9b1afb2b262849700e8f80015c0f643f > PYTHON_AIOHTTP_SESSION_SETUP_TYPE = setuptools > PYTHON_AIOHTTP_SESSION_LICENSE = Apache-2.0 > PYTHON_AIOHTTP_SESSION_LICENSE_FILES = LICENSE From arnout at mind.be Sat Feb 12 20:36:44 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 21:36:44 +0100 Subject: [Buildroot] [PATCH v1] package/qt5base: fix uclibc/musl compile with libexecinfo enabled In-Reply-To: <20220131223024.22386-1-ps.report@gmx.net> References: <20220131223024.22386-1-ps.report@gmx.net> Message-ID: On 31/01/2022 23:30, Peter Seiderer wrote: > - 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 Applied to master, thanks. Regards, Arnout > --- > 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) \ From arnout at mind.be Sat Feb 12 20:38:47 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 21:38:47 +0100 Subject: [Buildroot] [PATCH 0/2 v2] linux|uboot: fix build with host-gcc 10+ for older versions (branch yem/yylloc) In-Reply-To: References: Message-ID: <0efa84fe-ed18-b918-d410-1d3042a52de4@mind.be> On 31/01/2022 22:38, Yann E. MORIN wrote: > 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 Applied to master, thanks. Regards, Arnout > > 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(+) > From arnout at mind.be Sat Feb 12 20:39:08 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 21:39:08 +0100 Subject: [Buildroot] [PATCH 1/1] linux: build after wireless-regdb if enabled for early loading support In-Reply-To: <20220131202151.937124-1-joerg.krause@embedded.rocks> References: <20220131202151.937124-1-joerg.krause@embedded.rocks> Message-ID: On 31/01/2022 21:21, J?rg Krause wrote: > 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 Applied to master, thanks. Regards, Arnout > --- > 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 From arnout at mind.be Sat Feb 12 20:38:18 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 21:38:18 +0100 Subject: [Buildroot] [git commit] linux: build after wireless-regdb if enabled for early loading support Message-ID: <20220212203150.B150881D55@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=de0f5ba17a15a87bc16a6d6aa318104510c38f9d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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. The dependency is harmless if CONFIG_EXTRA_FIRMWARE isn't actually set. Signed-off-by: J??rg Krause Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- linux/linux.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/linux/linux.mk b/linux/linux.mk index 35e2484588..d798aea057 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 From arnout at mind.be Sat Feb 12 20:38:18 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 21:38:18 +0100 Subject: [Buildroot] [git commit] package/python-aiohttp-session: bump to version 2.11.0 Message-ID: <20220212203150.DA02382470@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=37e49ce3e17cc1f434b05a9a431c716bd70dc540 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-aiohttp-session/python-aiohttp-session.hash | 4 ++-- package/python-aiohttp-session/python-aiohttp-session.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aiohttp-session/python-aiohttp-session.hash b/package/python-aiohttp-session/python-aiohttp-session.hash index 3842f0c7af..8b44318307 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 d57d463a9db13b681f7924b38aa77f64 aiohttp-session-2.10.0.tar.gz -sha256 2af19af9f435937baacbb6420f887b21e5021bb34be146c2702c58e6ebf6b76b aiohttp-session-2.10.0.tar.gz +md5 797273eb5f0ef9e95fa92c6a933cf4ad aiohttp-session-2.11.0.tar.gz +sha256 0fdf39600f6a05c4943ef6c7b099071ca9854413111a26761626244be5015dc4 aiohttp-session-2.11.0.tar.gz # Locally computed sha256 checksums sha256 7bc5dd2f229a6b922befb1427fd4ad2c0b255f12c1b1869370ba77520dc22bc7 LICENSE diff --git a/package/python-aiohttp-session/python-aiohttp-session.mk b/package/python-aiohttp-session/python-aiohttp-session.mk index a28b1ae143..3d59b75e3d 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.10.0 +PYTHON_AIOHTTP_SESSION_VERSION = 2.11.0 PYTHON_AIOHTTP_SESSION_SOURCE = aiohttp-session-$(PYTHON_AIOHTTP_SESSION_VERSION).tar.gz -PYTHON_AIOHTTP_SESSION_SITE = https://files.pythonhosted.org/packages/d6/3f/ab6288e8bbf4a9ae63ea0d3d5711bccc3a6dad1cb85a420c14fdeabc209e +PYTHON_AIOHTTP_SESSION_SITE = https://files.pythonhosted.org/packages/3b/a7/0b97b9a2e3a553a86a6703f86b0e9b1afb2b262849700e8f80015c0f643f PYTHON_AIOHTTP_SESSION_SETUP_TYPE = setuptools PYTHON_AIOHTTP_SESSION_LICENSE = Apache-2.0 PYTHON_AIOHTTP_SESSION_LICENSE_FILES = LICENSE From arnout at mind.be Sat Feb 12 20:38:18 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 21:38:18 +0100 Subject: [Buildroot] [git commit] package/qt5base: fix uclibc/musl compile with libexecinfo enabled Message-ID: <20220212203150.D1A8381D55@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=af0ea7d0372445fb315e739190fd98ecaf37c607 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 d8a0bf1d16..ef38d03253 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -235,6 +235,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 @@ -283,7 +291,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 @@ -306,7 +314,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) \ From arnout at mind.be Sat Feb 12 20:38:18 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 21:38:18 +0100 Subject: [Buildroot] [git commit] boot/uboot: fix build with host-gcc 10+ Message-ID: <20220212203150.BCAF482470@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3b3859cc7df8edce10e5b4dad9005bd05342c8c3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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) Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- boot/uboot/uboot.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 6750069173..cb26fc8d3e 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -238,6 +238,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) From arnout at mind.be Sat Feb 12 20:38:18 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 21:38:18 +0100 Subject: [Buildroot] [git commit] linux: fix build with host-gcc 10+ Message-ID: <20220212203150.C868C824EE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9b41b54be07711c10ad13ce157be272ed1cf402e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Linux 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) Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- linux/linux.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/linux/linux.mk b/linux/linux.mk index d798aea057..102b7a15d4 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -271,6 +271,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 yann.morin.1998 at free.fr Sat Feb 12 20:39:43 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 12 Feb 2022 21:39:43 +0100 Subject: [Buildroot] [git commit] utils/genrandconfig: drop BR2_PACKAGE_PYTHON_PY_ONLY logic Message-ID: <20220212203220.7560E81D55@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6c00a319ac6bd1b1f113abe988f8d62e76984323 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The option was removed by commit 306839586b (package/python: drop target package). Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- utils/genrandconfig | 2 -- 1 file changed, 2 deletions(-) diff --git a/utils/genrandconfig b/utils/genrandconfig index 77c7e585f5..3483d55c14 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -365,8 +365,6 @@ def gen_config(args): configlines.append("BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y\n") if randint(0, 20) == 0: configlines.append("BR2_STATIC_LIBS=y\n") - if randint(0, 20) == 0: - configlines.append("BR2_PACKAGE_PYTHON_PY_ONLY=y\n") if randint(0, 20) == 0: configlines.append("BR2_PACKAGE_PYTHON3_PY_ONLY=y\n") if randint(0, 5) == 0: From arnout at mind.be Sat Feb 12 20:44:29 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 21:44:29 +0100 Subject: [Buildroot] [PATCH] package/freescale-imx: Add installation of easrc-imx8mn.bin firmware In-Reply-To: References: <20220129140831.1284832-1-michael@amarulasolutions.com> Message-ID: On 12/02/2022 11:13, Michael Nazzareno Trimarchi wrote: > Hi > > On Sat, Jan 29, 2022 at 3:08 PM Michael Trimarchi > wrote: >> >> 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) > > > Is something missing here? No, it's just that patches that are not reviewed or version bumps or fixes can take a long time before they get applied, because there's such a huge stream of incoming patches. Anyway, applied to master, thanks. Regards, Arnout > > Michael >> -- >> 2.25.1 >> > > From arnout at mind.be Sat Feb 12 20:45:39 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 21:45:39 +0100 Subject: [Buildroot] [git commit] package/freescale-imx: Add installation of easrc-imx8mn.bin firmware Message-ID: <20220212203819.D6F9682470@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b538b43c7665f54e3d1e47cfd7bbe824cd6d7544 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The easrc firmware is used for audio resampling. The firmware for now exists only for imx8mn device Signed-off-by: Michael Trimarchi Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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) From wbx at openadk.org Sat Feb 12 21:49:36 2022 From: wbx at openadk.org (Waldemar Brodkorb) Date: Sat, 12 Feb 2022 22:49:36 +0100 Subject: [Buildroot] [PATCH] board/qemu/ppc-bamboo: use path to vmlinux image for copy and paste users Message-ID: Signed-off-by: Waldemar Brodkorb --- board/qemu/ppc-bamboo/readme.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/qemu/ppc-bamboo/readme.txt b/board/qemu/ppc-bamboo/readme.txt index 0b70d2fa54..53d1970698 100644 --- a/board/qemu/ppc-bamboo/readme.txt +++ b/board/qemu/ppc-bamboo/readme.txt @@ -1,5 +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 +qemu-system-ppc -nographic -M bamboo -kernel output/images/vmlinux -net nic,model=virtio-net-pci -net user # qemu_ppc_bamboo_defconfig The login prompt will appear in the terminal that started Qemu. -- 2.30.2 From wbx at openadk.org Sat Feb 12 21:51:55 2022 From: wbx at openadk.org (Waldemar Brodkorb) Date: Sat, 12 Feb 2022 22:51:55 +0100 Subject: [Buildroot] [PATCH 1/3] package/binutils: add version 2.38 Message-ID: See: https://sourceware.org/pipermail/binutils/2022-February/119721.html Signed-off-by: Waldemar Brodkorb --- package/binutils/2.38/0001-sh-conf.patch | 48 +++ .../2.38/0002-poison-system-directories.patch | 306 ++++++++++++++++++ ...or1k-fix-building-with-gcc-version-5.patch | 50 +++ ...K_GOT16-signed-overflow-by-using-spe.patch | 75 +++++ package/binutils/Config.in.host | 7 + package/binutils/binutils.hash | 1 + 6 files changed, 487 insertions(+) create mode 100644 package/binutils/2.38/0001-sh-conf.patch create mode 100644 package/binutils/2.38/0002-poison-system-directories.patch create mode 100644 package/binutils/2.38/0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch create mode 100644 package/binutils/2.38/0004-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch diff --git a/package/binutils/2.38/0001-sh-conf.patch b/package/binutils/2.38/0001-sh-conf.patch new file mode 100644 index 0000000000..fcc597e4d9 --- /dev/null +++ b/package/binutils/2.38/0001-sh-conf.patch @@ -0,0 +1,48 @@ +From 33f3c1f804efc2e4f97849081589efb70cda31e5 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 25 Dec 2015 11:38:13 +0100 +Subject: [PATCH] sh-conf + +Likewise, binutils has no idea about any of these new targets either, so we +fix that up too.. now we're able to actually build a real toolchain for +sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more +inept targets than that one, really. Go look, I promise). + +[Romain: rebase on top of 2.32] +Signed-off-by: Romain Naour +[Thomas: rebase on top of 2.29, in which sh64 support was removed.] +Signed-off-by: Thomas Petazzoni +--- + configure | 2 +- + configure.ac | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 3dd206525a7..6881ce632f5 100755 +--- a/configure ++++ b/configure +@@ -3892,7 +3892,7 @@ case "${target}" in + nvptx*-*-*) + noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" + ;; +- sh-*-*) ++ sh*-*-*) + case "${target}" in + sh*-*-elf) + ;; +diff --git a/configure.ac b/configure.ac +index 797a624621e..1f9256bbf18 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1175,7 +1175,7 @@ case "${target}" in + nvptx*-*-*) + noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" + ;; +- sh-*-*) ++ sh*-*-*) + case "${target}" in + sh*-*-elf) + ;; +-- +2.31.1 + diff --git a/package/binutils/2.38/0002-poison-system-directories.patch b/package/binutils/2.38/0002-poison-system-directories.patch new file mode 100644 index 0000000000..1a5fe46575 --- /dev/null +++ b/package/binutils/2.38/0002-poison-system-directories.patch @@ -0,0 +1,306 @@ +From 4d8705ddb55897e8a74b617ab95736d520d9e1ea Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 25 Dec 2015 11:45:38 +0100 +Subject: [PATCH] poison-system-directories + +Patch adapted to binutils 2.23.2 and extended to use +BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni. + +[Romain: rebase on top of 2.33.1] +Signed-off-by: Romain Naour +[Gustavo: adapt to binutils 2.25] +Signed-off-by: Thomas Petazzoni +Signed-off-by: Gustavo Zacarias + +Upstream-Status: Inappropriate [distribution: codesourcery] + +Patch originally created by Mark Hatle, forward-ported to +binutils 2.21 by Scott Garman. + +purpose: warn for uses of system directories when cross linking + +Code Merged from Sourcery G++ binutils 2.19 - 4.4-277 + +2008-07-02 Joseph Myers + + ld/ + * ld.h (args_type): Add error_poison_system_directories. + * ld.texinfo (--error-poison-system-directories): Document. + * ldfile.c (ldfile_add_library_path): Check + command_line.error_poison_system_directories. + * ldmain.c (main): Initialize + command_line.error_poison_system_directories. + * lexsup.c (enum option_values): Add + OPTION_ERROR_POISON_SYSTEM_DIRECTORIES. + (ld_options): Add --error-poison-system-directories. + (parse_args): Handle new option. + +2007-06-13 Joseph Myers + + ld/ + * config.in: Regenerate. + * ld.h (args_type): Add poison_system_directories. + * ld.texinfo (--no-poison-system-directories): Document. + * ldfile.c (ldfile_add_library_path): Check + command_line.poison_system_directories. + * ldmain.c (main): Initialize + command_line.poison_system_directories. + * lexsup.c (enum option_values): Add + OPTION_NO_POISON_SYSTEM_DIRECTORIES. + (ld_options): Add --no-poison-system-directories. + (parse_args): Handle new option. + +2007-04-20 Joseph Myers + + Merge from Sourcery G++ binutils 2.17: + + 2007-03-20 Joseph Myers + Based on patch by Mark Hatle . + ld/ + * configure.ac (--enable-poison-system-directories): New option. + * configure, config.in: Regenerate. + * ldfile.c (ldfile_add_library_path): If + ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib, + /usr/lib, /usr/local/lib or /usr/X11R6/lib. + +Signed-off-by: Mark Hatle +Signed-off-by: Scott Garman +--- + ld/config.in | 3 +++ + ld/configure | 14 ++++++++++++++ + ld/configure.ac | 10 ++++++++++ + ld/ld.h | 8 ++++++++ + ld/ld.texi | 12 ++++++++++++ + ld/ldfile.c | 17 +++++++++++++++++ + ld/ldlex.h | 2 ++ + ld/ldmain.c | 2 ++ + ld/lexsup.c | 21 +++++++++++++++++++++ + 9 files changed, 89 insertions(+) + +diff --git a/ld/config.in b/ld/config.in +index 26d55a00d47..ffad464783c 100644 +--- a/ld/config.in ++++ b/ld/config.in +@@ -43,6 +43,9 @@ + language is requested. */ + #undef ENABLE_NLS + ++/* Define to warn for use of native system library directories */ ++#undef ENABLE_POISON_SYSTEM_DIRECTORIES ++ + /* Additional extension a shared object might have. */ + #undef EXTRA_SHLIB_EXTENSION + +diff --git a/ld/configure b/ld/configure +index c197aaef3cb..882263aa43f 100755 +--- a/ld/configure ++++ b/ld/configure +@@ -829,6 +829,7 @@ with_lib_path + enable_targets + enable_64_bit_bfd + with_sysroot ++enable_poison_system_directories + enable_gold + enable_got + enable_compressed_debug_sections +@@ -1498,6 +1499,8 @@ Optional Features: + --enable-checking enable run-time checks + --enable-targets alternative target configurations + --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) ++ --enable-poison-system-directories ++ warn for use of native system library directories + --enable-gold[=ARG] build gold [ARG={default,yes,no}] + --enable-got= GOT handling scheme (target, single, negative, + multigot) +@@ -15236,7 +15239,18 @@ else + fi + + ++# Check whether --enable-poison-system-directories was given. ++if test "${enable_poison_system_directories+set}" = set; then : ++ enableval=$enable_poison_system_directories; ++else ++ enable_poison_system_directories=no ++fi ++ ++if test "x${enable_poison_system_directories}" = "xyes"; then + ++$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h ++ ++fi + + # Check whether --enable-got was given. + if test "${enable_got+set}" = set; then : +diff --git a/ld/configure.ac b/ld/configure.ac +index 8ea97c43cd4..0f246db67d8 100644 +--- a/ld/configure.ac ++++ b/ld/configure.ac +@@ -106,6 +106,16 @@ AC_SUBST(use_sysroot) + AC_SUBST(TARGET_SYSTEM_ROOT) + AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) + ++AC_ARG_ENABLE([poison-system-directories], ++ AS_HELP_STRING([--enable-poison-system-directories], ++ [warn for use of native system library directories]),, ++ [enable_poison_system_directories=no]) ++if test "x${enable_poison_system_directories}" = "xyes"; then ++ AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES], ++ [1], ++ [Define to warn for use of native system library directories]) ++fi ++ + dnl Use --enable-gold to decide if this linker should be the default. + dnl "install_as_default" is set to false if gold is the default linker. + dnl "installed_linker" is the installed BFD linker name. +diff --git a/ld/ld.h b/ld/ld.h +index 35fafebfaed..74e66405de6 100644 +--- a/ld/ld.h ++++ b/ld/ld.h +@@ -162,6 +162,14 @@ typedef struct + in the linker script. */ + bool force_group_allocation; + ++ /* If TRUE (the default) warn for uses of system directories when ++ cross linking. */ ++ bool poison_system_directories; ++ ++ /* If TRUE (default FALSE) give an error for uses of system ++ directories when cross linking instead of a warning. */ ++ bool error_poison_system_directories; ++ + /* Big or little endian as set on command line. */ + enum endian_enum endian; + +diff --git a/ld/ld.texi b/ld/ld.texi +index dd8f571d4e4..3ab210b41b9 100644 +--- a/ld/ld.texi ++++ b/ld/ld.texi +@@ -2863,6 +2863,18 @@ string identifying the original linked file does not change. + + Passing @code{none} for @var{style} disables the setting from any + @code{--build-id} options earlier on the command line. ++ ++ at kindex --no-poison-system-directories ++ at item --no-poison-system-directories ++Do not warn for @option{-L} options using system directories such as ++ at file{/usr/lib} when cross linking. This option is intended for use ++in chroot environments when such directories contain the correct ++libraries for the target system rather than the host. ++ ++ at kindex --error-poison-system-directories ++ at item --error-poison-system-directories ++Give an error instead of a warning for @option{-L} options using ++system directories when cross linking. + @end table + + @c man end +diff --git a/ld/ldfile.c b/ld/ldfile.c +index 9d0af06f1f6..7cdd3b1c1b1 100644 +--- a/ld/ldfile.c ++++ b/ld/ldfile.c +@@ -117,6 +117,23 @@ ldfile_add_library_path (const char *name, bool cmdline) + new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); + else + new_dirs->name = xstrdup (name); ++ ++#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES ++ if (command_line.poison_system_directories ++ && ((!strncmp (name, "/lib", 4)) ++ || (!strncmp (name, "/usr/lib", 8)) ++ || (!strncmp (name, "/usr/local/lib", 14)) ++ || (!strncmp (name, "/usr/X11R6/lib", 14)))) ++ { ++ if (command_line.error_poison_system_directories) ++ einfo (_("%X%P: error: library search path \"%s\" is unsafe for " ++ "cross-compilation\n"), name); ++ else ++ einfo (_("%P: warning: library search path \"%s\" is unsafe for " ++ "cross-compilation\n"), name); ++ } ++#endif ++ + } + + /* Try to open a BFD for a lang_input_statement. */ +diff --git a/ld/ldlex.h b/ld/ldlex.h +index 9e8bf5fb835..2f0fadfe0a3 100644 +--- a/ld/ldlex.h ++++ b/ld/ldlex.h +@@ -163,6 +163,8 @@ enum option_values + OPTION_CTF_VARIABLES, + OPTION_NO_CTF_VARIABLES, + OPTION_CTF_SHARE_TYPES, ++ OPTION_NO_POISON_SYSTEM_DIRECTORIES, ++ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, + }; + + /* The initial parser states. */ +diff --git a/ld/ldmain.c b/ld/ldmain.c +index 42660eb9a3c..1aef9387f93 100644 +--- a/ld/ldmain.c ++++ b/ld/ldmain.c +@@ -321,6 +321,8 @@ main (int argc, char **argv) + command_line.warn_mismatch = true; + command_line.warn_search_mismatch = true; + command_line.check_section_addresses = -1; ++ command_line.poison_system_directories = true; ++ command_line.error_poison_system_directories = false; + + /* We initialize DEMANGLING based on the environment variable + COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the +diff --git a/ld/lexsup.c b/ld/lexsup.c +index 00274c500d0..4f23b3a2da2 100644 +--- a/ld/lexsup.c ++++ b/ld/lexsup.c +@@ -595,6 +595,14 @@ static const struct ld_option ld_options[] = + " is: share-unconflicted (default),\n" + " share-duplicated"), + TWO_DASHES }, ++ { {"no-poison-system-directories", no_argument, NULL, ++ OPTION_NO_POISON_SYSTEM_DIRECTORIES}, ++ '\0', NULL, N_("Do not warn for -L options using system directories"), ++ TWO_DASHES }, ++ { {"error-poison-system-directories", no_argument, NULL, ++ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES}, ++ '\0', NULL, N_("Give an error for -L options using system directories"), ++ TWO_DASHES }, + }; + + #define OPTION_COUNT ARRAY_SIZE (ld_options) +@@ -607,6 +615,7 @@ parse_args (unsigned argc, char **argv) + int ingroup = 0; + char *default_dirlist = NULL; + char *shortopts; ++ char *BR_paranoid_env; + struct option *longopts; + struct option *really_longopts; + int last_optind; +@@ -1643,6 +1652,14 @@ parse_args (unsigned argc, char **argv) + } + break; + ++ case OPTION_NO_POISON_SYSTEM_DIRECTORIES: ++ command_line.poison_system_directories = false; ++ break; ++ ++ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: ++ command_line.error_poison_system_directories = true; ++ break; ++ + case OPTION_PUSH_STATE: + input_flags.pushed = xmemdup (&input_flags, + sizeof (input_flags), +@@ -1788,6 +1805,10 @@ parse_args (unsigned argc, char **argv) + command_line.soname = NULL; + } + ++ BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH"); ++ if (BR_paranoid_env && strlen(BR_paranoid_env) > 0) ++ command_line.error_poison_system_directories = true; ++ + while (ingroup) + { + einfo (_("%P: missing --end-group; added as last command line option\n")); +-- +2.31.1 + diff --git a/package/binutils/2.38/0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch b/package/binutils/2.38/0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch new file mode 100644 index 0000000000..bfd531b818 --- /dev/null +++ b/package/binutils/2.38/0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch @@ -0,0 +1,50 @@ +From ef4ba1da823e8366ea4f126f50885a44ebf4dcf0 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Wed, 9 Jun 2021 17:28:27 +0200 +Subject: [PATCH] bfd/elf32-or1k: fix building with gcc version < 5 + +Gcc version >= 5 has standard C mode not set to -std=gnu11, so if we use +an old compiler(i.e. gcc 4.9) build fails on: +``` +elf32-or1k.c:2251:3: error: 'for' loop initial declarations are only allowed in +C99 or C11 mode + for (size_t i = 0; i < insn_count; i++) + ^ +``` + +So let's declare `size_t i` at the top of the function instead of inside +for loop. + +Signed-off-by: Giulio Benetti +--- + bfd/elf32-or1k.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c +index 4ae7f324d33..32063ab0289 100644 +--- a/bfd/elf32-or1k.c ++++ b/bfd/elf32-or1k.c +@@ -2244,9 +2244,10 @@ or1k_write_plt_entry (bfd *output_bfd, bfd_byte *contents, unsigned insnj, + { + unsigned nodelay = elf_elfheader (output_bfd)->e_flags & EF_OR1K_NODELAY; + unsigned output_insns[PLT_MAX_INSN_COUNT]; ++ size_t i; + + /* Copy instructions into the output buffer. */ +- for (size_t i = 0; i < insn_count; i++) ++ for (i = 0; i < insn_count; i++) + output_insns[i] = insns[i]; + + /* Honor the no-delay-slot setting. */ +@@ -2277,7 +2278,7 @@ or1k_write_plt_entry (bfd *output_bfd, bfd_byte *contents, unsigned insnj, + } + + /* Write out the output buffer. */ +- for (size_t i = 0; i < (insn_count+1); i++) ++ for (i = 0; i < (insn_count+1); i++) + bfd_put_32 (output_bfd, output_insns[i], contents + (i*4)); + } + +-- +2.31.1 + diff --git a/package/binutils/2.38/0004-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch b/package/binutils/2.38/0004-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch new file mode 100644 index 0000000000..8609db95b7 --- /dev/null +++ b/package/binutils/2.38/0004-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 + diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index ea1f020989..17de6e4e41 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -36,6 +36,12 @@ config BR2_BINUTILS_VERSION_2_37_X # https://github.com/uclinux-dev/elf2flt/issues/12 depends on !BR2_BINFMT_FLAT +config BR2_BINUTILS_VERSION_2_38_X + bool "binutils 2.38" + # https://github.com/uclinux-dev/elf2flt/pull/16 + # https://github.com/uclinux-dev/elf2flt/issues/12 + depends on !BR2_BINFMT_FLAT + config BR2_BINUTILS_VERSION_ARC bool "binutils arc (2.34.50)" depends on BR2_arc @@ -49,6 +55,7 @@ config BR2_BINUTILS_VERSION default "2.35.2" if BR2_BINUTILS_VERSION_2_35_X default "2.36.1" if BR2_BINUTILS_VERSION_2_36_X default "2.37" if BR2_BINUTILS_VERSION_2_37_X + default "2.38" if BR2_BINUTILS_VERSION_2_38_X config BR2_BINUTILS_ENABLE_LTO bool diff --git a/package/binutils/binutils.hash b/package/binutils/binutils.hash index d1be6cbce8..fe31b34d40 100644 --- a/package/binutils/binutils.hash +++ b/package/binutils/binutils.hash @@ -3,6 +3,7 @@ sha512 d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724a sha512 9974ede5978d32e0d68fef23da48fa00bd06b0bff7ec45b00ca075c126d6bbe0cf2defc03ecc3f17bc6cc85b64271a13009c4049d7ba17de26e84e3a6e2c0348 binutils-2.35.2.tar.xz sha512 cc24590bcead10b90763386b6f96bb027d7594c659c2d95174a6352e8b98465a50ec3e4088d0da038428abe059bbc4ae5f37b269f31a40fc048072c8a234f4e9 binutils-2.36.1.tar.xz sha512 5c11aeef6935860a6819ed3a3c93371f052e52b4bdc5033da36037c1544d013b7f12cb8d561ec954fe7469a68f1b66f1a3cd53d5a3af7293635a90d69edd15e7 binutils-2.37.tar.xz +sha512 8bf0b0d193c9c010e0518ee2b2e5a830898af206510992483b427477ed178396cd210235e85fd7bd99a96fc6d5eedbeccbd48317a10f752b7336ada8b2bb826d binutils-2.38.tar.xz # Locally calculated (fetched from Github) sha512 76a8227a19218435319c660e4983ea17985194b7f496f163e97543e7f6fd3e9249241fdc05a16ba512fba96a1d846c1f7b080983404d821d6215f10e7f11e238 binutils-gdb-arc-2020.09-release.tar.gz -- 2.30.2 From wbx at openadk.org Sat Feb 12 21:52:57 2022 From: wbx at openadk.org (Waldemar Brodkorb) Date: Sat, 12 Feb 2022 22:52:57 +0100 Subject: [Buildroot] [PATCH 2/3] package/binutils: remove 2.35.2 Message-ID: Signed-off-by: Waldemar Brodkorb --- package/binutils/Config.in.host | 8 -------- package/binutils/binutils.hash | 1 - 2 files changed, 9 deletions(-) diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index 17de6e4e41..21b15b5c36 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -16,13 +16,6 @@ config BR2_BINUTILS_VERSION_2_32_X bool "binutils 2.32" depends on !BR2_csky -config BR2_BINUTILS_VERSION_2_35_X - bool "binutils 2.35.2" - depends on !BR2_csky - # https://github.com/uclinux-dev/elf2flt/pull/16 - # https://github.com/uclinux-dev/elf2flt/issues/12 - depends on !BR2_BINFMT_FLAT - config BR2_BINUTILS_VERSION_2_36_X bool "binutils 2.36.1" depends on !BR2_csky @@ -52,7 +45,6 @@ config BR2_BINUTILS_VERSION string default "arc-2020.09-release" if BR2_BINUTILS_VERSION_ARC default "2.32" if BR2_BINUTILS_VERSION_2_32_X - default "2.35.2" if BR2_BINUTILS_VERSION_2_35_X default "2.36.1" if BR2_BINUTILS_VERSION_2_36_X default "2.37" if BR2_BINUTILS_VERSION_2_37_X default "2.38" if BR2_BINUTILS_VERSION_2_38_X diff --git a/package/binutils/binutils.hash b/package/binutils/binutils.hash index fe31b34d40..4141e0c5f2 100644 --- a/package/binutils/binutils.hash +++ b/package/binutils/binutils.hash @@ -1,6 +1,5 @@ # From ftp://gcc.gnu.org/pub/binutils/releases/sha512.sum sha512 d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724afa1e43bd0db45cfc9916b41519b67dfce03232aa4978704492a6994a binutils-2.32.tar.xz -sha512 9974ede5978d32e0d68fef23da48fa00bd06b0bff7ec45b00ca075c126d6bbe0cf2defc03ecc3f17bc6cc85b64271a13009c4049d7ba17de26e84e3a6e2c0348 binutils-2.35.2.tar.xz sha512 cc24590bcead10b90763386b6f96bb027d7594c659c2d95174a6352e8b98465a50ec3e4088d0da038428abe059bbc4ae5f37b269f31a40fc048072c8a234f4e9 binutils-2.36.1.tar.xz sha512 5c11aeef6935860a6819ed3a3c93371f052e52b4bdc5033da36037c1544d013b7f12cb8d561ec954fe7469a68f1b66f1a3cd53d5a3af7293635a90d69edd15e7 binutils-2.37.tar.xz sha512 8bf0b0d193c9c010e0518ee2b2e5a830898af206510992483b427477ed178396cd210235e85fd7bd99a96fc6d5eedbeccbd48317a10f752b7336ada8b2bb826d binutils-2.38.tar.xz -- 2.30.2 From wbx at openadk.org Sat Feb 12 21:53:54 2022 From: wbx at openadk.org (Waldemar Brodkorb) Date: Sat, 12 Feb 2022 22:53:54 +0100 Subject: [Buildroot] [PATCH 3/3] package/binutils: make 2.37 the default Message-ID: Signed-off-by: Waldemar Brodkorb --- package/binutils/Config.in.host | 2 +- package/binutils/binutils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index 21b15b5c36..e639c67149 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -7,7 +7,7 @@ config BR2_PACKAGE_HOST_BINUTILS_SUPPORTS_CFI choice prompt "Binutils Version" - default BR2_BINUTILS_VERSION_2_36_X if !BR2_arc && !BR2_csky + default BR2_BINUTILS_VERSION_2_37_X if !BR2_arc && !BR2_csky default BR2_BINUTILS_VERSION_ARC if BR2_arc help Select the version of binutils you wish to use. diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index 8c4a1371ca..c94ebe0995 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -11,7 +11,7 @@ ifeq ($(BINUTILS_VERSION),) ifeq ($(BR2_arc),y) BINUTILS_VERSION = arc-2020.09-release else -BINUTILS_VERSION = 2.36.1 +BINUTILS_VERSION = 2.37 endif endif # BINUTILS_VERSION -- 2.30.2 From arnout at mind.be Sat Feb 12 22:00:53 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 23:00:53 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/android-tools: fastboot needs gcc >= 5 In-Reply-To: <20220129155019.3819750-1-fontaine.fabrice@gmail.com> References: <20220129155019.3819750-1-fontaine.fabrice@gmail.com> Message-ID: <56728901-85a9-87ef-1a97-b1d907f17056@mind.be> On 29/01/2022 16:50, Fabrice Fontaine wrote: > 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 Applied to master, thanks. Regards, Arnout > --- > 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 From arnout at mind.be Sat Feb 12 22:00:38 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 23:00:38 +0100 Subject: [Buildroot] [git commit] package/android-tools: fastboot needs gcc >= 5 Message-ID: <20220212215328.0005E825B3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cdefb4538e07ef37d77aa3634907b15652d31ff9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 From arnout at mind.be Sat Feb 12 22:02:20 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 23:02:20 +0100 Subject: [Buildroot] [PATCH v2] package/util-linux: improve host build failure fix In-Reply-To: <20220203223124.3017611-1-giulio.benetti@benettiengineering.com> References: <20220203212328.264bc948@gmx.net> <20220203223124.3017611-1-giulio.benetti@benettiengineering.com> Message-ID: <410007c0-2496-3a06-bb91-19f7acbef174@mind.be> On 03/02/2022 23:31, Giulio Benetti wrote: > As suggested by Peter Seiderer package util-linux doesn't need raw support > when built for host, so let's remove: > HOST_UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE > in favor of: > HOST_UTIL_LINUX_CONF_OPTS += --disable-raw > This is a better approach than my commit: > https://git.buildroot.net/buildroot/commit/?id=d895bd973b35fde10d3dd7db530d9e4782926497 > > Suggested-by: Peter Seiderer > Tested-by: Peter Seiderer > Reviewed-by: Peter Seiderer > Signed-off-by: Giulio Benetti Applied to master, thanks. Regards, Arnout > --- > V1->V2: > * move --disable-raw to a dedicated HOST_UTIL_LINUX_CONF_OPTS as suggested > by Peter Seiderer. This avoid ambiguity since previously it was under the > comment "# We also don't want the host-python dependency". > --- > package/util-linux/util-linux.mk | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk > index 5a4ff64d01..40fd518a58 100644 > --- a/package/util-linux/util-linux.mk > +++ b/package/util-linux/util-linux.mk > @@ -41,7 +41,6 @@ define UTIL_LINUX_FIX_DISK_UTILS_COMPILE > touch $(@D)/disk-utils/raw.8 > endef > UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE > -HOST_UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE > > HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf > > @@ -202,6 +201,11 @@ HOST_UTIL_LINUX_CONF_OPTS += \ > --without-ncursesw \ > --without-tinfo > > +# Disable raw command since starting from version 2.37 needs a > +# work-around to build but in the end we don't need at all. > +HOST_UTIL_LINUX_CONF_OPTS += \ > + --disable-raw > + > ifeq ($(BR2_PACKAGE_HOST_UTIL_LINUX),y) > HOST_UTIL_LINUX_CONF_OPTS += --disable-makeinstall-chown > # disable commands that have ncurses dependency, as well as From arnout at mind.be Sat Feb 12 22:01:45 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 23:01:45 +0100 Subject: [Buildroot] [git commit] package/util-linux: improve host build failure fix Message-ID: <20220212215455.A6588825B3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=498117df1261c582ca70851c8a4f58db95632f2c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master As suggested by Peter Seiderer package util-linux doesn't need raw support when built for host, so let's remove: HOST_UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE in favor of: HOST_UTIL_LINUX_CONF_OPTS += --disable-raw This is a better approach than my commit: https://git.buildroot.net/buildroot/commit/?id=d895bd973b35fde10d3dd7db530d9e4782926497 Suggested-by: Peter Seiderer Tested-by: Peter Seiderer Reviewed-by: Peter Seiderer Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/util-linux/util-linux.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 1ca605f3fb..a25b69d910 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -41,7 +41,6 @@ define UTIL_LINUX_FIX_DISK_UTILS_COMPILE touch $(@D)/disk-utils/raw.8 endef UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE -HOST_UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf @@ -202,6 +201,11 @@ HOST_UTIL_LINUX_CONF_OPTS += \ --without-ncursesw \ --without-tinfo +# Disable raw command since starting from version 2.37 needs a +# work-around to build but in the end we don't need at all. +HOST_UTIL_LINUX_CONF_OPTS += \ + --disable-raw + ifeq ($(BR2_PACKAGE_HOST_UTIL_LINUX),y) HOST_UTIL_LINUX_CONF_OPTS += --disable-makeinstall-chown # disable commands that have ncurses dependency, as well as From arnout at mind.be Sat Feb 12 22:05:04 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 23:05:04 +0100 Subject: [Buildroot] [PATCH] board/pc: fix build failure due to new genimage 15 In-Reply-To: <20220204005610.897894-1-giulio.benetti@benettiengineering.com> References: <20220204005610.897894-1-giulio.benetti@benettiengineering.com> Message-ID: <32309155-0d7e-94ff-603f-496c783e82d5@mind.be> On 04/02/2022 01:56, Giulio Benetti wrote: > Actually genimage fails to create final image with: > ``` > ERROR: hdimage(disk.img): partition [MBR] (offset 0x1b8, size 0x48) overlaps previous partition boot (offset 0x0, size 0x200) > ERROR: hdimage(disk.img): bootloaders, etc. that overlap with the partition table must declare the overlapping area as a hole. > ``` > > This is because genimage 15 is less permissive than before, so let's add > holes = {"(440; 512)"} to leave room to MBR. > > Fixes: > https://gitlab.com/buildroot.org/buildroot/-/jobs/1865935249 > > Signed-off-by: Giulio Benetti Applied to master, thanks. Regards, Arnout > --- > board/pc/genimage-bios.cfg | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/board/pc/genimage-bios.cfg b/board/pc/genimage-bios.cfg > index 26d12d9ab3..54026f6527 100644 > --- a/board/pc/genimage-bios.cfg > +++ b/board/pc/genimage-bios.cfg > @@ -7,6 +7,7 @@ image disk.img { > image = "boot.img" > offset = 0 > size = 512 > + holes = {"(440; 512)"} > } > > partition grub { From arnout at mind.be Sat Feb 12 22:04:28 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 23:04:28 +0100 Subject: [Buildroot] [git commit] board/pc: fix build failure due to new genimage 15 Message-ID: <20220212215739.F1AFC825C1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=92dc22dd6823b93b5989a704a2440e724d954bd3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Actually genimage fails to create final image with: ``` ERROR: hdimage(disk.img): partition [MBR] (offset 0x1b8, size 0x48) overlaps previous partition boot (offset 0x0, size 0x200) ERROR: hdimage(disk.img): bootloaders, etc. that overlap with the partition table must declare the overlapping area as a hole. ``` This is because genimage 15 is less permissive than before, so let's add holes = {"(440; 512)"} to leave room to MBR. The generated image is identical to the image generated by the previous version of genimage. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/1865935249 Signed-off-by: Giulio Benetti Tested-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- board/pc/genimage-bios.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/board/pc/genimage-bios.cfg b/board/pc/genimage-bios.cfg index 26d12d9ab3..54026f6527 100644 --- a/board/pc/genimage-bios.cfg +++ b/board/pc/genimage-bios.cfg @@ -7,6 +7,7 @@ image disk.img { image = "boot.img" offset = 0 size = 512 + holes = {"(440; 512)"} } partition grub { From arnout at mind.be Sat Feb 12 22:11:45 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 23:11:45 +0100 Subject: [Buildroot] [PATCH v4] configs/orangepi_zero_defconfig: switch to extlinux In-Reply-To: <20220206074853.25887-1-kuzminov.sergey81@gmail.com> References: <20220206074853.25887-1-kuzminov.sergey81@gmail.com> Message-ID: On 06/02/2022 08:48, Sergey Kuzminov wrote: > Changes: > * Exclude FAT partition, it is no longer needed for U-Boot. > * Switch the rootfs partition from MBR to GPT for partition-uuid to work. > * Switch to extlinux, this is convenient for debugging. > * Create common scenarios for multiple boards to create an SD image: board/orangepi/common. > * Add BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y, remount root filesystem read-write during boot. > > Signed-off-by: Sergey Kuzminov > --- > V1->V2: > * improved commit log > * removed commented line in extlinux.conf > * removed one boot option from extlinux.conf > > V2->V3: > * improved commit log > * removed comment from board/orangepi/common/genimage.cfg > > V3->V4: > * fixed Signed-off-by position I think I'm going to use this commit message as an example for the documentation... Well, if I ever get around to it :-) [snip] > diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig > index 5aaa1566c5..96f0c3f600 100644 > --- a/configs/orangepi_zero_defconfig > +++ b/configs/orangepi_zero_defconfig > @@ -20,10 +20,13 @@ 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_NEEDS_HOST_OPENSSL=y > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > > # Filesystem > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="63M" Why? Increase from 60M to 63M seems a bit odd... I removed this. > +BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y We don't do this for any other defconfig. I removed this. Applied to master, thanks. Regards, Arnout > # BR2_TARGET_ROOTFS_TAR is not set > > # Bootloader > @@ -39,16 +42,12 @@ 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 > > # 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" > > # Wireless driver and firmware > BR2_PACKAGE_XR819_XRADIO=y From arnout at mind.be Sat Feb 12 22:09:09 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 23:09:09 +0100 Subject: [Buildroot] [git commit] configs/orangepi_zero_defconfig: switch to extlinux Message-ID: <20220212220421.1E558825C1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c0312f71cc89434e2f29e37b4586186240aa4d14 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changes: * Exclude FAT partition, it is no longer needed for U-Boot. * Switch the rootfs partition from MBR to GPT for partition-uuid to work. * Switch to extlinux, this is convenient for debugging. * Create common scenarios for multiple boards to create an SD image: board/orangepi/common. Currently only orangepi_zero makes use of the common infrastructure. Signed-off-by: Sergey Kuzminov Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti [Arnout: remove rootfs size = 63M and remount rw] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- board/orangepi/common/extlinux.conf | 4 ++++ board/orangepi/common/genimage.cfg | 20 +++++++++++++++++ board/orangepi/common/post-build.sh | 34 +++++++++++++++++++++++++++++ board/orangepi/orangepi-zero/boot.cmd | 9 -------- board/orangepi/orangepi-zero/genimage.cfg | 36 ------------------------------- configs/orangepi_zero_defconfig | 9 +++----- 6 files changed, 61 insertions(+), 51 deletions(-) diff --git a/board/orangepi/common/extlinux.conf b/board/orangepi/common/extlinux.conf new file mode 100644 index 0000000000..12f496b1fa --- /dev/null +++ b/board/orangepi/common/extlinux.conf @@ -0,0 +1,4 @@ +LABEL default + kernel /boot/%LINUXIMAGE% + devicetreedir /boot + 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..a61c4a039f --- /dev/null +++ b/board/orangepi/common/genimage.cfg @@ -0,0 +1,20 @@ +image sdcard.img { + partition u-boot { + in-partition-table = false + image = "u-boot-sunxi-with-spl.bin" + offset = 8K + size = 1000K # 1MB - 8KB(offset) - 16KB(GPT) + } + + hdimage { + partition-table-type = gpt + gpt-location = 1008K # 1MB - 16KB(GPT) + gpt-no-backup = true + } + + 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/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 5aaa1566c5..464e075e5c 100644 --- a/configs/orangepi_zero_defconfig +++ b/configs/orangepi_zero_defconfig @@ -20,6 +20,7 @@ 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_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y # Filesystem BR2_TARGET_ROOTFS_EXT2=y @@ -39,16 +40,12 @@ 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 # 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" # Wireless driver and firmware BR2_PACKAGE_XR819_XRADIO=y From arnout at mind.be Sat Feb 12 22:17:20 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 23:17:20 +0100 Subject: [Buildroot] [PATCH v3 0/2] Fix gitlab CI build failure due to missing HOST_ dependencies In-Reply-To: <20220206112620.1637342-1-giulio.benetti@benettiengineering.com> References: <20220206115156.6042cc1b@windsurf> <20220206112620.1637342-1-giulio.benetti@benettiengineering.com> Message-ID: On 06/02/2022 12:26, Giulio Benetti wrote: > This patchset fixes the gitlab build failure due to HOST_ dependencies(uboot/linux). > > V1->V2: > * add missing host openssl for linux on microchip_sama7g5ek_mmc_defconfig/_dev_defconfig > V2->V3: > * add specific custom linux version as suggested by Thomas > > Giulio Benetti (2): > configs/microchip_sama7g5ek_mmc_defconfig: set custom linux version to > 5.15.21 and add host openssl for linux > configs/microchip_sama7g5ek_mmc_dev_defconfig: set custom linux > version to 5.15.21 and add host openssl for linux Both applied to master, thanks. The entropy issue can be resolved later. Regards, Arnout > > configs/microchip_sama7g5ek_mmc_defconfig | 4 ++++ > configs/microchip_sama7g5ek_mmc_dev_defconfig | 4 ++++ > 2 files changed, 8 insertions(+) > From arnout at mind.be Sat Feb 12 22:13:02 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 23:13:02 +0100 Subject: [Buildroot] [git commit] configs/microchip_sama7g5ek_mmc_dev_defconfig: set custom linux version to 5.15.21 and add host openssl for linux Message-ID: <20220212221033.1A291825C1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f6e2920c94baa70fb78af57b7cc6afcbf621c4d0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: https://gitlab.com/ymorin/buildroot/-/jobs/2035821100 Signed-off-by: Giulio Benetti Tested-by: Eugen Hristev Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- configs/microchip_sama7g5ek_mmc_dev_defconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configs/microchip_sama7g5ek_mmc_dev_defconfig b/configs/microchip_sama7g5ek_mmc_dev_defconfig index 3253bce401..c11ea2f518 100644 --- a/configs/microchip_sama7g5ek_mmc_dev_defconfig +++ b/configs/microchip_sama7g5ek_mmc_dev_defconfig @@ -1,6 +1,7 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_TOOLCHAIN_BUILDROOT_WCHAR=y BR2_PTHREAD_DEBUG=y BR2_TOOLCHAIN_BUILDROOT_CXX=y @@ -8,9 +9,12 @@ BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/microchip/sama7g5ek/genimage.cfg" BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.21" BR2_LINUX_KERNEL_DEFCONFIG="sama7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama7g5ek" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_LINUX_TOOLS_IIO=y BR2_PACKAGE_BZIP2=y BR2_PACKAGE_XZ=y From arnout at mind.be Sat Feb 12 22:12:43 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 23:12:43 +0100 Subject: [Buildroot] [git commit] configs/microchip_sama7g5ek_mmc_defconfig: set custom linux version to 5.15.21 and add host openssl for linux Message-ID: <20220212221033.124E182518@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=27edd4d18a913d08217217f6da725e88b4796211 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: https://gitlab.com/ymorin/buildroot/-/jobs/2035821098 Signed-off-by: Giulio Benetti Tested-by: Eugen Hristev Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- configs/microchip_sama7g5ek_mmc_defconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configs/microchip_sama7g5ek_mmc_defconfig b/configs/microchip_sama7g5ek_mmc_defconfig index b1cd193829..7ab81d1dd0 100644 --- a/configs/microchip_sama7g5ek_mmc_defconfig +++ b/configs/microchip_sama7g5ek_mmc_defconfig @@ -1,12 +1,16 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/microchip/sama7g5ek/genimage.cfg" BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.21" BR2_LINUX_KERNEL_DEFCONFIG="sama7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama7g5ek" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" From arnout at mind.be Sat Feb 12 22:18:55 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Feb 2022 23:18:55 +0100 Subject: [Buildroot] [PATCH v3 1/1] package/guile: Fix build failure due to missing libiconv In-Reply-To: <20220209225957.1257630-1-paguilar@paguilar.org> References: <20220209225957.1257630-1-paguilar@paguilar.org> Message-ID: On 09/02/2022 23:59, Pedro Aguilar wrote: > When building package guile with BR2_ENABLE_LOCALE=n > we get the following error: > > ``` > In file included from filesys.c:95: > ports-internal.h:26:10: fatal error: iconv.h: No such file or directory > 26 | #include > | ^~~~~~~~~ > compilation terminated. > ``` > > So let's fix it by selecting BR2_PACKAGE_LIBICONV and > adding libiconv package as dependency. > > Signed-off-by: Pedro Aguilar Applied to master, thanks. Regards, Arnout > > --- > Changes v2 -> v3: > - Improve commit message (thanks to Giulio comments) > Changes v1 -> v2: > - Use BR2_ENABLE_LOCALE if selected, otherwise use libiconv > as before (pointed out by Thomas and Giulio) > --- > package/guile/Config.in | 1 + > package/guile/guile.mk | 4 ++++ > 2 files changed, 5 insertions(+) > > diff --git a/package/guile/Config.in b/package/guile/Config.in > index b1182a4cee..f70e674018 100644 > --- a/package/guile/Config.in > +++ b/package/guile/Config.in > @@ -9,6 +9,7 @@ config BR2_PACKAGE_GUILE > select BR2_PACKAGE_LIBFFI > select BR2_PACKAGE_GMP > select BR2_PACKAGE_BDWGC > + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE > help > Guile is an interpreter and compiler for the Scheme > programming language, a clean and elegant dialect of Lisp. > diff --git a/package/guile/guile.mk b/package/guile/guile.mk > index 0f245fca76..03420407f8 100644 > --- a/package/guile/guile.mk > +++ b/package/guile/guile.mk > @@ -18,6 +18,10 @@ GUILE_CPE_ID_VENDOR = gnu > GUILE_DEPENDENCIES = host-guile libunistring libffi gmp bdwgc host-pkgconf > HOST_GUILE_DEPENDENCIES = host-libunistring host-libffi host-gmp host-bdwgc host-flex host-pkgconf host-gettext > > +ifeq ($(BR2_ENABLE_LOCALE),) > +GUILE_DEPENDENCIES += libiconv > +endif > + > # The HAVE_GC* CFLAGS specify that we will use internal callbacks > # instead of the ones provided by > # bdwgc. Eg. HAVE_GC_SET_FINALIZER_NOTIFIER specifies that we won't From arnout at mind.be Sat Feb 12 22:18:37 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Feb 2022 23:18:37 +0100 Subject: [Buildroot] [git commit] package/guile: Fix build failure due to missing libiconv Message-ID: <20220212221137.B099082518@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5050f07fdfbd6b7cb4447745b4eb18606692dbf7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master When building package guile with BR2_ENABLE_LOCALE=n we get the following error: ``` In file included from filesys.c:95: ports-internal.h:26:10: fatal error: iconv.h: No such file or directory 26 | #include | ^~~~~~~~~ compilation terminated. ``` So let's fix it by selecting BR2_PACKAGE_LIBICONV and adding libiconv package as dependency. Signed-off-by: Pedro Aguilar Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/guile/Config.in | 1 + package/guile/guile.mk | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/package/guile/Config.in b/package/guile/Config.in index b1182a4cee..f70e674018 100644 --- a/package/guile/Config.in +++ b/package/guile/Config.in @@ -9,6 +9,7 @@ config BR2_PACKAGE_GUILE select BR2_PACKAGE_LIBFFI select BR2_PACKAGE_GMP select BR2_PACKAGE_BDWGC + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE help Guile is an interpreter and compiler for the Scheme programming language, a clean and elegant dialect of Lisp. diff --git a/package/guile/guile.mk b/package/guile/guile.mk index 0f245fca76..03420407f8 100644 --- a/package/guile/guile.mk +++ b/package/guile/guile.mk @@ -18,6 +18,10 @@ GUILE_CPE_ID_VENDOR = gnu GUILE_DEPENDENCIES = host-guile libunistring libffi gmp bdwgc host-pkgconf HOST_GUILE_DEPENDENCIES = host-libunistring host-libffi host-gmp host-bdwgc host-flex host-pkgconf host-gettext +ifeq ($(BR2_ENABLE_LOCALE),) +GUILE_DEPENDENCIES += libiconv +endif + # The HAVE_GC* CFLAGS specify that we will use internal callbacks # instead of the ones provided by # bdwgc. Eg. HAVE_GC_SET_FINALIZER_NOTIFIER specifies that we won't From luca at lucaceresoli.net Sat Feb 12 22:56:25 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Sat, 12 Feb 2022 23:56:25 +0100 Subject: [Buildroot] [PATCH] manual: board support: add instructions to test defconfig in the official docker In-Reply-To: <20220203235438.610277-1-giulio.benetti@benettiengineering.com> References: <20220203235438.610277-1-giulio.benetti@benettiengineering.com> Message-ID: Hi Giulio, On 04/02/22 00:54, Giulio Benetti wrote: > Often new boards have not been tested with official docker so let's add > instructions to do it. Thank you, I think this is a very useful addition to the documentation! However I would suggest some changes for it to look more "professional". > Signed-off-by: Giulio Benetti > --- > docs/manual/adding-board-support.txt | 22 ++++++++++++++++++++++ > 1 file changed, 22 insertions(+) > > diff --git a/docs/manual/adding-board-support.txt b/docs/manual/adding-board-support.txt > index 33ed709535..f5fb3af371 100644 > --- a/docs/manual/adding-board-support.txt > +++ b/docs/manual/adding-board-support.txt > @@ -46,3 +46,25 @@ create a directory +board/+ and a subdirectory > +board//+. You can then store your patches > and configurations in these directories, and reference them from the main > Buildroot configuration. Refer to xref:customize[] for more details. > + > +Before submitting patches for new boards it would be better to test it "it would be better" -> "it is recommended". > +by building it using .gitlab-ci.yml specified docker. For example at the I think this should be reworded in a simpler way: "by building it using the docker specified in .gitlab-ci.yml". BTW as I am a docker newbie: is it common to say "the docker"? Or would "the docker container" be more correct? -- By comparison, I would never say "using the virtualbox" but rather "using the virtualbox machine". > +time of this writing the docker is: Remove the ':' from this line, or you'll have multiple ':' per line, which looks awkward. > +$CI_REGISTRY/buildroot.org/buildroot/base:20220105.2314 Hm, this string is already old. There's no sane way to keep docs and .yml in sync. I wonder whether we should have in the manual a command line that always use the current string, such as: DOCKER_IMAGE=$(cat .gitlab-ci.yml | \ sed -n '/^image/s/^.*CI_REGISTRY/registry.gitlab.com/p') docker pull $DOCKER_IMAGE sudo docker run -it $DOCKER_IMAGE However I must admit this is not very readable in the docs... :( What about adding a simple script (utils/run-docker?) that does the trick and just mention that in the docs? > +so: Add an empty line here, so that the output separates from the next line. > +Pull the docker: > +-------------------- > + $ docker pull registry.gitlab.com/buildroot.org/buildroot/base:20220105.2314 Missing 'sudo'? > +-------------------- Add an empty line here. This has no effect on the output but makes source code more readable. > +Run the docker: > +-------------------- > + $ sudo docker run -it registry.gitlab.com/buildroot.org/buildroot/base:20220105.2314 /bin/bash > +-------------------- As above, add an empty line here. > +Inside the docker hint: > +-------------------- > + $ git clone git://git.busybox.net/buildroot > + $ cd buildroot > + $ make +_defconfig+ > + $ make > +-------------------- As above, add an empty line here. > +Wait until build finishes and eventually add host dependencies. If I understand what you mean here, it should be "and add host dependencies if needed" ("eventually" is not the english translation of italian "eventualmente"). If my understanding is correct, I don't find this sentence very useful: a docker newbie perhaps doesn't know how to add a host dependency (and maybe not even how to understand that they are missing one). I would just remove this line, but if you think it is very important I'd clarify it, maybe with some examples. -- Luca From james.hilliard1 at gmail.com Sun Feb 13 01:20:51 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 12 Feb 2022 18:20:51 -0700 Subject: [Buildroot] [PATCH v4 1/1] package/bpftool: new package In-Reply-To: <08b9ef7c-8ce6-3216-3f56-5c64af2f4a66@mind.be> References: <20220131185154.26343-1-james.hilliard1@gmail.com> <08b9ef7c-8ce6-3216-3f56-5c64af2f4a66@mind.be> Message-ID: On Sat, Feb 12, 2022 at 6:25 AM Arnout Vandecappelle wrote: > > > > On 31/01/2022 19:51, James Hilliard wrote: > > 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. > > I don't understand this: linux-tools is part of the kernel build itself, so > there shouldn't be any differences between kernel versions... Anyway, you > probably experienced it so I kept the comment. I mean that older kernels provide outdated versions of bpftool which may cause issues especially for host-bpftool as stuff like systemd bpf-framework has minimum version requirements there for build side. > > > > > The host bpftool is needed for enabling features such as the systemd > > bpf-framework(to be added in a future patch). > > Normally we only accept host packages if there's a (target) package that > actually depends on it. Knowing you however we're not going to have to wait long > for this systemd bpf framework, so I kept the host package. Yeah, I think I'll have that working once we bump clang/llvm, min version is 10.0.0 and we're still on 9.0.1: https://patchwork.ozlabs.org/project/buildroot/list/?series=233431&submitter=&state=*&q=&archive=both&delegate= > > > > Signed-off-by: James Hilliard > > --- > > Changes v3 -> v4: > > - remove linux-tools bpftool kconfig entry > > Ideally this should have been done in a separate patch, but OK. > > > 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 > > > > [snip] > > 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 > > This is purely for the libbpf submodule. We normally prefer to unbundle such > dependencies, since we have libbpf as a package. I've kept it for now, but if > you could unbundle it, that would be great. Yeah, unbundled doesn't seem to really be a supported configuration here yet. > > I've added a line to the commit message to explain why the git download method > is used. > > > Applied to master, thanks. > > Regards, > Arnout > > > > +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 From james.hilliard1 at gmail.com Sun Feb 13 01:40:24 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 12 Feb 2022 18:40:24 -0700 Subject: [Buildroot] [PATCH 1/1] package/pipewire: add optional lv2 support Message-ID: <20220213014024.1868278-1-james.hilliard1@gmail.com> Pipewire supports lv2 via the lilv dependency. https://github.com/PipeWire/pipewire/blob/0.3.45/meson.build#L451 Signed-off-by: James Hilliard --- package/pipewire/pipewire.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index fc521c86ac..2a38db9977 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -29,8 +29,7 @@ PIPEWIRE_CONF_OPTS += \ -Dvideotestsrc=enabled \ -Dvolume=enabled \ -Dsession-managers=[] \ - -Dlibcanberra=disabled \ - -Dlv2=disabled + -Dlibcanberra=disabled ifeq ($(BR2_PACKAGE_DBUS),y) PIPEWIRE_CONF_OPTS += -Ddbus=enabled @@ -129,6 +128,13 @@ else PIPEWIRE_CONF_OPTS += -Dlibcamera=disabled endif +ifeq ($(BR2_PACKAGE_LILV),y) +PIPEWIRE_CONF_OPTS += -Dlv2=enabled +PIPEWIRE_DEPENDENCIES += lilv +else +PIPEWIRE_CONF_OPTS += -Dlv2=disabled +endif + ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y) PIPEWIRE_CONF_OPTS += -Dx11=enabled PIPEWIRE_DEPENDENCIES += xlib_libX11 -- 2.25.1 From kuzminov.sergey81 at gmail.com Sun Feb 13 05:14:10 2022 From: kuzminov.sergey81 at gmail.com (Sergey Kuzminov) Date: Sun, 13 Feb 2022 08:14:10 +0300 Subject: [Buildroot] [PATCH v4] configs/orangepi_zero_defconfig: switch to extlinux In-Reply-To: References: <20220206074853.25887-1-kuzminov.sergey81@gmail.com> Message-ID: <9441c983-821e-5f10-27f3-30d5705e365b@gmail.com> Hi Arnout, 13.02.2022 01:11, Arnout Vandecappelle: > > > On 06/02/2022 08:48, Sergey Kuzminov wrote: >> Changes: >> * Exclude FAT partition, it is no longer needed for U-Boot. >> * Switch the rootfs partition from MBR to GPT for partition-uuid to work. >> * Switch to extlinux, this is convenient for debugging. >> * Create common scenarios for multiple boards to create an SD image: >> board/orangepi/common. >> * Add BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y, remount root filesystem >> read-write during boot. >> >> Signed-off-by: Sergey Kuzminov >> --- >> V1->V2: >> * improved commit log >> * removed commented line in extlinux.conf >> * removed one boot option from extlinux.conf >> >> V2->V3: >> * improved commit log >> * removed comment from board/orangepi/common/genimage.cfg >> >> V3->V4: >> * fixed Signed-off-by position > > ?I think I'm going to use this commit message as an example for the > documentation... Well, if I ever get around to it :-) Giulio Benetti helped me. Thanks Giulio. > [snip] >> diff --git a/configs/orangepi_zero_defconfig >> b/configs/orangepi_zero_defconfig >> index 5aaa1566c5..96f0c3f600 100644 >> --- a/configs/orangepi_zero_defconfig >> +++ b/configs/orangepi_zero_defconfig >> @@ -20,10 +20,13 @@ 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_NEEDS_HOST_OPENSSL=y >> +BR2_LINUX_KERNEL_INSTALL_TARGET=y >> ? # Filesystem >> ? BR2_TARGET_ROOTFS_EXT2=y >> ? BR2_TARGET_ROOTFS_EXT2_4=y >> +BR2_TARGET_ROOTFS_EXT2_SIZE="63M" > > ?Why? Increase from 60M to 63M seems a bit odd... > > ?I removed this. Initially, 512 MB was in the genimage.cfg configuration. Beautifully obtained 1 MB (u-boot) + 63 MB (rootfs) = 64 MB (SD Card Image) :) >> +BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y > > ?We don't do this for any other defconfig. I removed this. > > > ?Applied to master, thanks. > > ?Regards, > ?Arnout > > >> ? # BR2_TARGET_ROOTFS_TAR is not set >> ? # Bootloader >> @@ -39,16 +42,12 @@ 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 >> ? # 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" >> ? # Wireless driver and firmware >> ? BR2_PACKAGE_XR819_XRADIO=y From thomas.petazzoni at bootlin.com Sun Feb 13 07:32:18 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 13 Feb 2022 07:32:18 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-02-12 Message-ID: <20220213073223.4C6B560AFA@smtp3.osuosl.org> Hello, Autobuild statistics for 2022-02-12 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 58 | 7 | 0 | 65 | 2021.11.x | 18 | 3 | 0 | 21 | master | 40 | 74 | 0 | 114 | Classification of failures by reason for master ----------------------------------------------- bluez5_utils-5.63 | 12 host-libselinux-3.3 | 10 host-python-docutils-0.15.2 | 5 host-python-xlrd-2.0.1 | 5 unknown | 5 frr-8.1 | 4 gerbera-1.9.2 | 4 host-python-pycryptodomex-3... | 3 host-bmap-tools-3.6 | 2 host-python-lxml-4.6.5 | 2 host-python-ply-3.11 | 2 bat-0.19.0 | 1 bird-2.0.8 | 1 boinc-7.18.1 | 1 cryptsetup-2.4.2 | 1 docker-cli-20.10.12 | 1 hackrf-2018.01.1 | 1 host-cxxtest-4.4 | 1 host-go-1.17.7 | 1 host-grpc-1.43.0 | 1 host-python-cython-0.29.27 | 1 host-python-greenlet-1.1.2 | 1 hostapd-2.10 | 1 mp4v2-5.0.1 | 1 pcsc-lite-1.9.5 | 1 poppler-21.12.0 | 1 python-docutils-0.15.2 | 1 qt5base-53a047c212af7fbded6... | 1 qt5webkit-5.212.0-alpha4 | 1 safeclib-3.7.1 | 1 target-finalize | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | bat-0.19.0 | NOK | http://autobuild.buildroot.net/results/8b0521c0a3fd1d74824fc86ad6972109957f45cc | mips64el | bird-2.0.8 | NOK | http://autobuild.buildroot.net/results/f0b7300fa2bc6bbeb0ee8afdc74c6ffd62bee477 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/fbe96c327b9db8da471683f634c5367899181651 | arc | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/dea45334d4c0b08a1042dc1eaa8f9f0aab676636 | arc | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/1c84bdfa8a9cb8eef32c1c6df06cd02b54d711c3 | x86_64 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/91c2549717e5bb331bf485e176e95db67f68d86b | i686 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/8e0576b7d22a74006d8bb754a6e4fd74d489bcc7 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/2991525b4696db6be2ac224e4ec825415cfa7022 | mips64el | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/2c91999fa26fba708bc71805acac386c31987452 | mipsel | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/44c21d737c9056e0772c21e32459a61342fdc876 | s390x | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/26f64ee265fe325ce4e4b6fe1585ebe5006da04b | xtensa | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/faa7a669ae0618e75c7bb8912e51c7fe1da1fe06 | nios2 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/727cc106331d517b1069854f877200b0ae09d3f9 | m68k | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/347d55ef864f68b2f62a088220b18b441635e9df | riscv64 | boinc-7.18.1 | NOK | http://autobuild.buildroot.net/results/b25fa43418e1c3bff1093ed6a82848626b6fe850 | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/35f7b82fb842f57de04a56139d7e939f8fb0e33a | x86_64 | docker-cli-20.10.12 | NOK | http://autobuild.buildroot.net/results/7dbe6fbe2c9afc3842805784065d64957bc424d3 | xtensa | frr-8.1 | NOK | http://autobuild.buildroot.net/results/d955325a2b63d890c6a1c8be2631ebe4f67bf49a | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/7a210063c2e4a3b290409d2dd20ae3ed1654953e | microblazeel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/3cdb50f5e5a1b3f37a6edcd4276fcbf015e28828 | xtensa | frr-8.1 | NOK | http://autobuild.buildroot.net/results/25ee913b551d04d79da6ad73d7fe901844cd62c4 | nios2 | gerbera-1.9.2 | NOK | http://autobuild.buildroot.net/results/b734a4e8ae8780f84d23045b40ec4415a891841e | x86_64 | gerbera-1.9.2 | NOK | http://autobuild.buildroot.net/results/0a1541ef3d87ccb704b8bcd2bb721f0ae206e214 | arc | gerbera-1.9.2 | NOK | http://autobuild.buildroot.net/results/2b679caf0dbcbf7e58bf3335beb4757c33db1337 | riscv64 | gerbera-1.9.2 | NOK | http://autobuild.buildroot.net/results/475752729af9943d5b52b3b55d670e4c7ea8e0a9 | sparc | hackrf-2018.01.1 | NOK | http://autobuild.buildroot.net/results/fd6eda3a52fc946cf9ccf71717e33825612ed08d | ORPH riscv64 | host-bmap-tools-3.6 | NOK | http://autobuild.buildroot.net/results/5bb82e762a764e2614826897fcc6d7535bc93fd9 | microblazeel | host-bmap-tools-3.6 | NOK | http://autobuild.buildroot.net/results/ff1ede12d623db3108e7a302cef5bcf71a9107a6 | sh4 | host-cxxtest-4.4 | NOK | http://autobuild.buildroot.net/results/4b680ad0ac4e7639dfba1558900601bb4d2d8ec6 | mips64el | host-go-1.17.7 | NOK | http://autobuild.buildroot.net/results/10186cd792cdd3ec4da8e97481e3a9f3a1ba6525 | powerpc64 | host-grpc-1.43.0 | NOK | http://autobuild.buildroot.net/results/38f9560a49522c23b278ca38e5c1b34020c238a3 | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/6b14d33ac67b94ecd44cd58f34e4e90e09737cdb | riscv64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/1c9eb8cad02c377f734b667e21cddf14c11d168a | aarch64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/e0eaacad3427e9fe488cce5f37eec0a81969f45b | or1k | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/e922fd0b251468ef6814fc03f9bf993aff119f0d | i686 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/2cf41a8aa6e118f3d0cb9598aad66f167c36fedf | mipsel | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/f4b7ed2e54411b5342ae1705e846b2e1570a8e9f | powerpc64le | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/e29cefe0d8b62656733cbc5cccd58581dbb6767b | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/49eda3af5d1a48249d345560464ed6c9c227e534 | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/a21c50dc9e68ef42c7252b3a99b42b8812d1dceb | arc | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/13b4181b5f5b332ee60c3310da1df904819873f9 | sparc | host-python-cython-0.29.27 | NOK | http://autobuild.buildroot.net/results/2166e3fa2b132831d56cc8102c49307034b490b0 | mips64el | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/d4a3df11a627495a2d39028c9da1f80c2de89b2d | aarch64 | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/f86fa61635afaef94bbadd904991ca8f03d8d1a5 | arc | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/3d5fbd6be33234b07c4c4d4728f213bd687a2c2b | xtensa | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/0082cfa8a18895172f4bed7368ead6172b68f566 | or1k | host-python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/325a0dcf9a56c6448c3547a335fe57c64c5d00dd | i686 | host-python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/cf81c380f4838c4d8d83843307dfae8060c7b8b5 | m68k | host-python-lxml-4.6.5 | NOK | http://autobuild.buildroot.net/results/8a9af7bae77bc67555a3a2d72214da988ce63a6c | powerpc | host-python-lxml-4.6.5 | NOK | http://autobuild.buildroot.net/results/3bc400c783cf8046f26512b2d84c73941b6c672d | arm | host-python-ply-3.11 | NOK | http://autobuild.buildroot.net/results/28abf0e40d8ea0260d427dfd77488e40ffcc4167 | powerpc64 | host-python-ply-3.11 | NOK | http://autobuild.buildroot.net/results/f832b4ced36cc803f27ff27b06a7a5ef039dbb8b | mips64el | host-python-pycryptodomex-3... | NOK | http://autobuild.buildroot.net/results/9fcc9a7fe2387c9c4716ff798af0defda963a1eb | nios2 | host-python-pycryptodomex-3... | NOK | http://autobuild.buildroot.net/results/6dc1023eb1560e80acf0bf4ad003a58a2a688b97 | arm | host-python-pycryptodomex-3... | NOK | http://autobuild.buildroot.net/results/dfe9cc566ea86b0325367087ea3b0637fd3bca4b | arm | host-python-xlrd-2.0.1 | NOK | http://autobuild.buildroot.net/results/85d0ddd3b769b253854959f31f33852fd222f8d8 | sh4 | host-python-xlrd-2.0.1 | NOK | http://autobuild.buildroot.net/results/eea867ea6d46688a887307a5f78587db56d08fd2 | m68k | host-python-xlrd-2.0.1 | NOK | http://autobuild.buildroot.net/results/18790a618a64650e6ed079c5b9dfe71588b72846 | nios2 | host-python-xlrd-2.0.1 | NOK | http://autobuild.buildroot.net/results/3b6e34cd213863e13873891ba899676e2eddf7e6 | arm | host-python-xlrd-2.0.1 | NOK | http://autobuild.buildroot.net/results/0d47442028c3e95aec8392b109d5c5dfbed4728f | arm | hostapd-2.10 | NOK | http://autobuild.buildroot.net/results/3f8058ee6f3913fda795578f206db895731ba1e6 | arm | mp4v2-5.0.1 | NOK | http://autobuild.buildroot.net/results/9a3095852c93c30795cf6579cafbbc6ea8095308 | ORPH sparc | pcsc-lite-1.9.5 | NOK | http://autobuild.buildroot.net/results/6abb9f976f7ca61e266dc824befcc7dbfe77c68d | ORPH xtensa | poppler-21.12.0 | NOK | http://autobuild.buildroot.net/results/7a3452edbf7e610658bd6f829b7e7aab5f831cbe | s390x | python-docutils-0.15.2 | NOK | http://autobuild.buildroot.net/results/679ce46b9712b6bd23f32cc4153c28369eb427d9 | riscv32 | qt5base-53a047c212af7fbded6... | NOK | http://autobuild.buildroot.net/results/83778f1d9ed30d2a71b052e0a49db0fc35065da1 | arm | qt5webkit-5.212.0-alpha4 | NOK | http://autobuild.buildroot.net/results/17065373b8dfc9545e6c7e6d1ad7c23562a27550 | arm | safeclib-3.7.1 | NOK | http://autobuild.buildroot.net/results/5c3468585942879b47331e05058d25d324c8cc23 | nios2 | target-finalize | NOK | http://autobuild.buildroot.net/results/ee5d43d31bbbd54bf462c9ddc2908af63d4b6893 | arm | unknown | NOK | http://autobuild.buildroot.net/results/2b41ea89a665c2cb6aee459a1259a2d126dbe0a8 | arm | unknown | NOK | http://autobuild.buildroot.net/results/8a7a5806ed4f54796f240aaeebb3dc8d19918010 | arm | unknown | NOK | http://autobuild.buildroot.net/results/0a5d9cf528ca86dcf04a614525a9ea1dd29e2ef5 | arm | unknown | NOK | http://autobuild.buildroot.net/results/ad847cbf0cdfe568707ec3354956d89d30eaef04 | mipsel | unknown | NOK | http://autobuild.buildroot.net/results/9a4f1f3489b4b4788e74b6b5e565c135cc40bc3f | Classification of failures by reason for 2021.02.x -------------------------------------------------- gensio-2.2.3 | 2 host-sentry-cli-1.57.0 | 2 glib-networking-2.66.0 | 1 openldap-2.4.59 | 1 piglit-2affee53f3ad7a96f5b3... | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- riscv32 | gensio-2.2.3 | NOK | http://autobuild.buildroot.net/results/947596cdffbaa12c30046410d4245b27f7b9e11f | riscv32 | gensio-2.2.3 | NOK | http://autobuild.buildroot.net/results/cb29c7c2bb9ef0a02679d93087b3712ba31397eb | riscv32 | glib-networking-2.66.0 | NOK | http://autobuild.buildroot.net/results/64deca9250fce6a5a85a1989179c845919722b88 | ORPH i686 | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/cedfcb3f3dbe169606a7f421ba742c5f1a59fc58 | mips64el | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/6517803de9962ec04026a7e2f776390ff31891a8 | riscv32 | openldap-2.4.59 | NOK | http://autobuild.buildroot.net/results/bc35ab69838aba23bbd568c3d6375489aca1cd09 | aarch64 | piglit-2affee53f3ad7a96f5b3... | NOK | http://autobuild.buildroot.net/results/28f3a4ded772577d5f01c942538ec13bc2036889 | Classification of failures by reason for 2021.11.x -------------------------------------------------- wavemon-0.9.4 | 2 libvirt-7.7.0 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- x86_64 | libvirt-7.7.0 | NOK | http://autobuild.buildroot.net/results/c371bd49968e8156fba0bbc436d3306a1aca911c | riscv64 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/8c18092143a88af7760cadedf5b44eda6c2241c5 | x86_64 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/4d3f2817062782d1e64647d355909dbdd34465a1 | -- http://autobuild.buildroot.net From Eugen.Hristev at microchip.com Sun Feb 13 07:51:05 2022 From: Eugen.Hristev at microchip.com (Eugen.Hristev at microchip.com) Date: Sun, 13 Feb 2022 07:51:05 +0000 Subject: [Buildroot] [PATCH v3 0/2] Fix gitlab CI build failure due to missing HOST_ dependencies In-Reply-To: References: <20220206115156.6042cc1b@windsurf> <20220206112620.1637342-1-giulio.benetti@benettiengineering.com> Message-ID: <79d7d2a5-d915-3838-2771-37604ee9a835@microchip.com> On 2/13/22 12:17 AM, Arnout Vandecappelle wrote: > On 06/02/2022 12:26, Giulio Benetti wrote: >> This patchset fixes the gitlab build failure due to HOST_ >> dependencies(uboot/linux). >> >> V1->V2: >> * add missing host openssl for linux on >> microchip_sama7g5ek_mmc_defconfig/_dev_defconfig >> V2->V3: >> * add specific custom linux version as suggested by Thomas >> >> Giulio Benetti (2): >> ?? configs/microchip_sama7g5ek_mmc_defconfig: set custom linux version to >> ???? 5.15.21 and add host openssl for linux >> ?? configs/microchip_sama7g5ek_mmc_dev_defconfig: set custom linux >> ???? version to 5.15.21 and add host openssl for linux > > ?Both applied to master, thanks. > > ?The entropy issue can be resolved later. I already sent another patch to fix that. Please have a look. Thanks ! Eugen > > ?Regards, > ?Arnout > >> >> ? configs/microchip_sama7g5ek_mmc_defconfig???? | 4 ++++ >> ? configs/microchip_sama7g5ek_mmc_dev_defconfig | 4 ++++ >> ? 2 files changed, 8 insertions(+) >> From peter at korsgaard.com Sun Feb 13 08:18:12 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Feb 2022 09:18:12 +0100 Subject: [Buildroot] [PATCH] configs/beelink_gs1: select BR2_TARGET_UBOOT_NEEDS_OPENSSL In-Reply-To: <20220212111710.22559-1-peron.clem@gmail.com> (=?utf-8?Q?=22C?= =?utf-8?Q?l=C3=A9ment_P=C3=A9ron=22's?= message of "Sat, 12 Feb 2022 12:17:10 +0100") References: <20220212111710.22559-1-peron.clem@gmail.com> Message-ID: <87leyfmb7f.fsf@dell.be.48ers.dk> >>>>> "Cl?ment" == Cl?ment P?ron 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/2076475033 > Signed-off-by: Cl?ment P?ron Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 13 08:17:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Feb 2022 09:17:32 +0100 Subject: [Buildroot] [git commit] configs/beelink_gs1: select BR2_TARGET_UBOOT_NEEDS_OPENSSL Message-ID: <20220213083309.8A11781DB5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=93d751217ee4cc18ebe48138ee4e712b5224fcf7 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/2076475033 Signed-off-by: Cl??ment P??ron Signed-off-by: Peter Korsgaard --- configs/beelink_gs1_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/beelink_gs1_defconfig b/configs/beelink_gs1_defconfig index aa8a2cfb6b..d4682d6b7c 100644 --- a/configs/beelink_gs1_defconfig +++ b/configs/beelink_gs1_defconfig @@ -34,6 +34,7 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y 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_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y From bernd.kuhls at t-online.de Sun Feb 13 09:15:32 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 13 Feb 2022 10:15:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/{mesa3d, mesa3d-headers}: bump version to 21.3.6 Message-ID: <20220213091532.1260695-1-bernd.kuhls@t-online.de> Release notes: https://lists.freedesktop.org/archives/mesa-announce/2022-February/000663.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 871cf2f495..c8573fafad 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.5 +MESA3D_HEADERS_VERSION = 21.3.6 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 e36d798e21..d64b833100 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/000660.html -sha256 d93b2a9d2464ee856d7637a07dff6b7cd950f295ad58518bb959f76882cf4a4c mesa-21.3.5.tar.xz -sha512 417d1787f8177567f0c547dde3e24212f7497f2fe7cdaa945fe998cd61ec0e9eb9388feb444e377c4fd8794b056af02aac28d1bbfb9527844391ba49e6893933 mesa-21.3.5.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2022-February/000663.html +sha256 96bb761fd546e9aa41d025fcc025225c5668443839dae21e3731959beb096736 mesa-21.3.6.tar.xz +sha512 8c930e04eade29f689384ee7d6e2f178acbbf30fa6c9fdf132281279658c3c221ec7f9b1318e3c0a654c6136f925a5c0a35eaf849b65db7674641127c71e8a4f mesa-21.3.6.tar.xz # License sha256 998437f3f75f0c542046f83c1cb349408122268168fb13eb4ae6967aa18b7d98 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 5f080ff5fc..95618b2072 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.5 +MESA3D_VERSION = 21.3.6 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 Sun Feb 13 09:16:50 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 13 Feb 2022 10:16:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi: fix buld with python-3.10 Message-ID: <20220213091650.1260849-1-bernd.kuhls@t-online.de> Fixes build error: CMake Error at /usr/share/cmake-3.18/Modules/FindPackageHandleStandardArgs.cmake:165 (message): Could NOT find PythonLibs (missing: PYTHON_LIBRARIES) (found suitable version "3.10.2", minimum required is "3.5") Signed-off-by: Bernd Kuhls --- package/kodi/0002-cmake-findpython.patch | 135 ++++++++++++++++++ ...-cmake-search-for-python-interpreter.patch | 48 +++++++ ...-allow-to-override-PYTHON_EXECUTABLE.patch | 39 +++++ package/kodi/kodi.mk | 4 + 4 files changed, 226 insertions(+) create mode 100644 package/kodi/0002-cmake-findpython.patch create mode 100644 package/kodi/0003-cmake-search-for-python-interpreter.patch create mode 100644 package/kodi/0004-cmake-allow-to-override-PYTHON_EXECUTABLE.patch diff --git a/package/kodi/0002-cmake-findpython.patch b/package/kodi/0002-cmake-findpython.patch new file mode 100644 index 0000000000..60728aa465 --- /dev/null +++ b/package/kodi/0002-cmake-findpython.patch @@ -0,0 +1,135 @@ +From 52f44ec5c7b728a6afaca867e8d815fced2012ec Mon Sep 17 00:00:00 2001 +From: fuzzard +Date: Sat, 31 Jul 2021 19:22:08 +1000 +Subject: [PATCH] [cmake] findpython + +use cmakes (3.12+) FindPython3 module. +Provide cmake vars for user to overide specific version, and search path + +Backport of https://github.com/xbmc/xbmc/pull/20045 + +Patch sent upstream: https://github.com/xbmc/xbmc/pull/20989 + +Signed-off-by: Bernd Kuhls +--- + CMakeLists.txt | 4 +- + cmake/modules/FindPython.cmake | 71 ++++++++++++++++++++++++++-------- + 2 files changed, 56 insertions(+), 19 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2d5369798d..9bed54ef40 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.4) ++cmake_minimum_required(VERSION 3.12) + if(WIN32) + # Version 3.15 is required to use "PREPEND" for dependencies + cmake_minimum_required(VERSION 3.15) +@@ -187,8 +187,6 @@ core_require_dep(${required_deps}) + find_package(TexturePacker REQUIRED) + find_package(JsonSchemaBuilder REQUIRED) + +-SET(PYTHON_VERSION 3.8) +- + if(ENABLE_MARIADBCLIENT AND NOT ENABLE_MARIADBCLIENT STREQUAL AUTO AND ENABLE_MYSQLCLIENT AND NOT ENABLE_MYSQLCLIENT STREQUAL AUTO) + MESSAGE(FATAL_ERROR "You can not use MySql and MariaDB at the same time. Disable one by adding -DENABLE_MYSQLCLIENT=OFF or -DENABLE_MARIADBCLIENT=OFF.") + elseif(ENABLE_MYSQLCLIENT AND NOT ENABLE_MYSQLCLIENT STREQUAL AUTO) +diff --git a/cmake/modules/FindPython.cmake b/cmake/modules/FindPython.cmake +index c40e12d551..35220b5426 100644 +--- a/cmake/modules/FindPython.cmake ++++ b/cmake/modules/FindPython.cmake +@@ -1,17 +1,56 @@ +-# - Try to find python +-# Once done this will define ++# FindPython ++# -------- ++# Finds Python3 libraries ++# ++# This module will search for the required python libraries on the system ++# If multiple versions are found, the highest version will be used. ++# ++# -------- ++# ++# the following variables influence behaviour: ++# ++# PYTHON_PATH - use external python not found in system paths ++# usage: -DPYTHON_PATH=/path/to/python/lib ++# PYTHON_VER - use exact python version, fail if not found ++# usage: -DPYTHON_VER=3.8 ++# ++# -------- ++# ++# This module will define the following variables: + # + # PYTHON_FOUND - system has PYTHON ++# PYTHON_VERSION - Python version number (Major.Minor) + # PYTHON_INCLUDE_DIRS - the python include directory + # PYTHON_LIBRARIES - The python libraries ++# PYTHON_LDFLAGS - Python provided link options ++# ++# -------- ++# ++ ++# for Depends builds, set search root dir to depends path ++if(KODI_DEPENDSBUILD) ++ set(Python3_USE_STATIC_LIBS TRUE) ++ set(Python3_ROOT_DIR ${DEPENDS_PATH}/lib) ++endif() ++ ++# Provide root dir to search for Python if provided ++if(PYTHON_PATH) ++ set(Python3_ROOT_DIR ${PYTHON_PATH}) ++ ++ # unset cache var so we can generate again with a different dir (or none) if desired ++ unset(PYTHON_PATH CACHE) ++endif() ++ ++# Set specific version of Python to find if provided ++if(PYTHON_VER) ++ set(VERSION ${PYTHON_VER}) ++ set(EXACT_VER "EXACT") + +-if(PKG_CONFIG_FOUND) +- pkg_check_modules(PC_PYTHON python3>=3.5 QUIET) ++ # unset cache var so we can generate again with a different ver (or none) if desired ++ unset(PYTHON_VER CACHE) + endif() + +-find_program(PYTHON_EXECUTABLE python3 ONLY_CMAKE_FIND_ROOT_PATH) +-find_library(PYTHON_LIBRARY NAMES python3.9 python3.8 python3.7 python3.6 python3.5 PATHS ${PC_PYTHON_LIBDIR}) +-find_path(PYTHON_INCLUDE_DIR NAMES Python.h PATHS ${PC_PYTHON_INCLUDE_DIRS} PATH_SUFFIXES python3.9 python3.8 python3.7 python3.6 python3.5) ++find_package(Python3 ${VERSION} ${EXACT_VER} COMPONENTS Development) + + if(KODI_DEPENDSBUILD) + find_library(FFI_LIBRARY ffi REQUIRED) +@@ -27,17 +66,17 @@ if(KODI_DEPENDSBUILD) + endif() + endif() + +- set(PYTHON_LIBRARIES ${PYTHON_LIBRARY} ${FFI_LIBRARY} ${EXPAT_LIBRARY} ${INTL_LIBRARY} ${GMP_LIBRARY} ${PYTHON_DEP_LIBRARIES}) +-else() +- find_package(PythonLibs 3.5 REQUIRED) +- list(APPEND PYTHON_LIBRARIES ${PC_PYTHON_STATIC_LIBRARIES}) ++ list(APPEND Python3_LIBRARIES ${FFI_LIBRARY} ${EXPAT_LIBRARY} ${INTL_LIBRARY} ${GMP_LIBRARY} ${PYTHON_DEP_LIBRARIES}) + endif() + +-include(FindPackageHandleStandardArgs) +-find_package_handle_standard_args(Python REQUIRED_VARS PYTHON_INCLUDE_DIR PYTHON_LIBRARY PYTHON_LIBRARIES) +-if(PYTHON_FOUND) +- set(PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_DIR}) ++if(Python3_FOUND) + list(APPEND PYTHON_DEFINITIONS -DHAS_PYTHON=1) ++ # These are all set for easy integration with the rest of our build system ++ set(PYTHON_FOUND ${Python3_FOUND}) ++ set(PYTHON_INCLUDE_DIRS ${Python3_INCLUDE_DIRS}) ++ set(PYTHON_LIBRARIES ${Python3_LIBRARIES}) ++ set(PYTHON_VERSION "${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}" CACHE INTERNAL "" FORCE) ++ set(PYTHON_LDFLAGS ${Python3_LINK_OPTIONS}) + endif() + +-mark_as_advanced(PYTHON_EXECUTABLE PYTHON_INCLUDE_DIRS PYTHON_INCLUDE_DIR PYTHON_LIBRARY PYTHON_LIBRARIES PYTHON_LDFLAGS FFI_LIBRARY EXPAT_LIBRARY INTL_LIBRARY GMP_LIBRARY) ++mark_as_advanced(PYTHON_EXECUTABLE PYTHON_VERSION PYTHON_INCLUDE_DIRS PYTHON_LDFLAGS FFI_LIBRARY EXPAT_LIBRARY INTL_LIBRARY GMP_LIBRARY) +-- +2.30.2 + diff --git a/package/kodi/0003-cmake-search-for-python-interpreter.patch b/package/kodi/0003-cmake-search-for-python-interpreter.patch new file mode 100644 index 0000000000..158345a212 --- /dev/null +++ b/package/kodi/0003-cmake-search-for-python-interpreter.patch @@ -0,0 +1,48 @@ +From 6bb112e585f2ffd10e5af70ca28159dd235d063b Mon Sep 17 00:00:00 2001 +From: wsnipex +Date: Thu, 19 Aug 2021 08:50:05 +0200 +Subject: [PATCH] [cmake] search for python interpreter fixes installing + eventclients on linux + +Backport of https://github.com/xbmc/xbmc/pull/20058 + +Patch sent upstream: https://github.com/xbmc/xbmc/pull/20989 + +Signed-off-by: Bernd Kuhls +--- + cmake/modules/FindPython.cmake | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/cmake/modules/FindPython.cmake b/cmake/modules/FindPython.cmake +index 35220b5426..c469ed9fb6 100644 +--- a/cmake/modules/FindPython.cmake ++++ b/cmake/modules/FindPython.cmake +@@ -20,6 +20,7 @@ + # + # PYTHON_FOUND - system has PYTHON + # PYTHON_VERSION - Python version number (Major.Minor) ++# PYTHON_EXECUTABLE - Python interpreter binary + # PYTHON_INCLUDE_DIRS - the python include directory + # PYTHON_LIBRARIES - The python libraries + # PYTHON_LDFLAGS - Python provided link options +@@ -51,6 +52,9 @@ if(PYTHON_VER) + endif() + + find_package(Python3 ${VERSION} ${EXACT_VER} COMPONENTS Development) ++if(CORE_SYSTEM_NAME STREQUAL linux) ++ find_package(Python3 ${VERSION} ${EXACT_VER} COMPONENTS Interpreter) ++endif() + + if(KODI_DEPENDSBUILD) + find_library(FFI_LIBRARY ffi REQUIRED) +@@ -73,6 +77,7 @@ if(Python3_FOUND) + list(APPEND PYTHON_DEFINITIONS -DHAS_PYTHON=1) + # These are all set for easy integration with the rest of our build system + set(PYTHON_FOUND ${Python3_FOUND}) ++ set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE} CACHE FILEPATH "Python interpreter" FORCE) + set(PYTHON_INCLUDE_DIRS ${Python3_INCLUDE_DIRS}) + set(PYTHON_LIBRARIES ${Python3_LIBRARIES}) + set(PYTHON_VERSION "${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}" CACHE INTERNAL "" FORCE) +-- +2.30.2 + diff --git a/package/kodi/0004-cmake-allow-to-override-PYTHON_EXECUTABLE.patch b/package/kodi/0004-cmake-allow-to-override-PYTHON_EXECUTABLE.patch new file mode 100644 index 0000000000..d1e9b3f25f --- /dev/null +++ b/package/kodi/0004-cmake-allow-to-override-PYTHON_EXECUTABLE.patch @@ -0,0 +1,39 @@ +From 25681d8adde4a90d5da02051e30f6a3a27322136 Mon Sep 17 00:00:00 2001 +From: Jernej Skrabec +Date: Sat, 25 Sep 2021 07:41:10 +0200 +Subject: [PATCH] [cmake] allow to override PYTHON_EXECUTABLE + +If Kodi is being build for distro which has different python version +than host, PYTHON_EXECUTABLE must be overriden and point to distro +version. Otherwise, eventclients will be installed in wrong location and +be thus unusable. + +Use case: Cross compiling Kodi for LibreELEC + +Backport of https://github.com/xbmc/xbmc/pull/20171 + +Patch sent upstream: https://github.com/xbmc/xbmc/pull/20989 + +Signed-off-by: Bernd Kuhls +--- + cmake/modules/FindPython.cmake | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/cmake/modules/FindPython.cmake b/cmake/modules/FindPython.cmake +index c469ed9fb6..87b8368705 100644 +--- a/cmake/modules/FindPython.cmake ++++ b/cmake/modules/FindPython.cmake +@@ -77,7 +77,9 @@ if(Python3_FOUND) + list(APPEND PYTHON_DEFINITIONS -DHAS_PYTHON=1) + # These are all set for easy integration with the rest of our build system + set(PYTHON_FOUND ${Python3_FOUND}) +- set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE} CACHE FILEPATH "Python interpreter" FORCE) ++ if(NOT PYTHON_EXECUTABLE) ++ set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE} CACHE FILEPATH "Python interpreter" FORCE) ++ endif() + set(PYTHON_INCLUDE_DIRS ${Python3_INCLUDE_DIRS}) + set(PYTHON_LIBRARIES ${Python3_LIBRARIES}) + set(PYTHON_VERSION "${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}" CACHE INTERNAL "" FORCE) +-- +2.30.2 + diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index a2c42b64c9..67459f4ccb 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -76,6 +76,10 @@ KODI_CONF_OPTS += \ -DNATIVEPREFIX=$(HOST_DIR) \ -DDEPENDS_PATH=$(STAGING_DIR)/usr \ -DENABLE_TESTING=OFF \ + -DPYTHON_EXECUTABLE=$(HOST_DIR)/usr/bin/python3 \ + -DPYTHON_INCLUDE_DIRS=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ + -DPYTHON_PATH=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR) \ + -DPYTHON_VER=$(PYTHON3_VERSION_MAJOR) \ -DWITH_JSONSCHEMABUILDER=$(HOST_DIR)/bin/JsonSchemaBuilder \ -DWITH_TEXTUREPACKER=$(HOST_DIR)/bin/TexturePacker \ -DLIBDVDCSS_URL=$(KODI_DL_DIR)/kodi-libdvdcss-$(KODI_LIBDVDCSS_VERSION).tar.gz \ -- 2.30.2 From arnout at mind.be Sun Feb 13 10:39:57 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 11:39:57 +0100 Subject: [Buildroot] [PATCH] manual: board support: add instructions to test defconfig in the official docker In-Reply-To: References: <20220203235438.610277-1-giulio.benetti@benettiengineering.com> Message-ID: On 12/02/2022 23:56, Luca Ceresoli wrote: > Hi Giulio, > > On 04/02/22 00:54, Giulio Benetti wrote: >> Often new boards have not been tested with official docker so let's add >> instructions to do it. > > Thank you, I think this is a very useful addition to the documentation! > However I would suggest some changes for it to look more "professional". > >> Signed-off-by: Giulio Benetti >> --- >> docs/manual/adding-board-support.txt | 22 ++++++++++++++++++++++ >> 1 file changed, 22 insertions(+) >> >> diff --git a/docs/manual/adding-board-support.txt b/docs/manual/adding-board-support.txt >> index 33ed709535..f5fb3af371 100644 >> --- a/docs/manual/adding-board-support.txt >> +++ b/docs/manual/adding-board-support.txt >> @@ -46,3 +46,25 @@ create a directory +board/+ and a subdirectory >> +board//+. You can then store your patches >> and configurations in these directories, and reference them from the main >> Buildroot configuration. Refer to xref:customize[] for more details. >> + >> +Before submitting patches for new boards it would be better to test it > > "it would be better" -> "it is recommended". > >> +by building it using .gitlab-ci.yml specified docker. For example at the > > I think this should be reworded in a simpler way: "by building it using > the docker specified in .gitlab-ci.yml". > > BTW as I am a docker newbie: is it common to say "the docker"? Or would > "the docker container" be more correct? -- By comparison, I would never > say "using the virtualbox" but rather "using the virtualbox machine". I would say "the container" since you can use it with any container manager that follows the OCI spec. > >> +time of this writing the docker is: > > Remove the ':' from this line, or you'll have multiple ':' per line, > which looks awkward. > >> +$CI_REGISTRY/buildroot.org/buildroot/base:20220105.2314 > > Hm, this string is already old. Actually, this part of the documentation is already superseded since we now have utils/docker-run that does everything. > There's no sane way to keep docs and > .yml in sync. I wonder whether we should have in the manual a command > line that always use the current string, such as: > > DOCKER_IMAGE=$(cat .gitlab-ci.yml | \ > sed -n '/^image/s/^.*CI_REGISTRY/registry.gitlab.com/p') > docker pull $DOCKER_IMAGE > sudo docker run -it $DOCKER_IMAGE > > However I must admit this is not very readable in the docs... :( What > about adding a simple script (utils/run-docker?) that does the trick and > just mention that in the docs? > >> +so: > > Add an empty line here, so that the output separates from the next line. > >> +Pull the docker: >> +-------------------- >> + $ docker pull registry.gitlab.com/buildroot.org/buildroot/base:20220105.2314 > > Missing 'sudo'? Docker access is usually managed through the "docker" group rather than sudo. And if you use podman as docker replacement, it can even be done in an unprivileged container. Not that I tried it, but I think so. Oh BTW, the pull is in fact not needed, both podman and docker pull automatically when you start a container. That's the reason the container name is so convoluted. > >> +-------------------- > > Add an empty line here. This has no effect on the output but makes > source code more readable. > >> +Run the docker: >> +-------------------- >> + $ sudo docker run -it registry.gitlab.com/buildroot.org/buildroot/base:20220105.2314 /bin/bash >> +-------------------- > > As above, add an empty line here. > >> +Inside the docker hint: >> +-------------------- >> + $ git clone git://git.busybox.net/buildroot >> + $ cd buildroot >> + $ make +_defconfig+ >> + $ make >> +-------------------- > > As above, add an empty line here. > >> +Wait until build finishes and eventually add host dependencies. > > If I understand what you mean here, it should be "and add host > dependencies if needed" ("eventually" is not the english translation of > italian "eventualmente"). If my understanding is correct, I don't find > this sentence very useful: a docker newbie perhaps doesn't know how to > add a host dependency (and maybe not even how to understand that they > are missing one). > > I would just remove this line, but if you think it is very important I'd > clarify it, maybe with some examples. Yes, I think this is what triggered the addition of this documentation. If you have e.g. libopenssl-dev installed on your build host, then you usually won't notice in your test builds that a dependency on host-openssl is needed. So test builds should be done in a minimal container. Unfortunately, the buildroot/base container is not exactly minimal. It's really what is meant to be used for running CI tests, not exactly what is needed for build tests. Ideally, we'd have - an absolutely minimal container that can be used for build tests - ideally in a couple of variants for different distros; - a container for CI; - a more complete container you could use for development, though I can't immediately think of extra stuff you'd want in there (but then, I wouldn't use a container for development). Regards, Arnout From arnout at mind.be Sun Feb 13 10:43:48 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 11:43:48 +0100 Subject: [Buildroot] [PATCH v4] configs/orangepi_zero_defconfig: switch to extlinux In-Reply-To: <9441c983-821e-5f10-27f3-30d5705e365b@gmail.com> References: <20220206074853.25887-1-kuzminov.sergey81@gmail.com> <9441c983-821e-5f10-27f3-30d5705e365b@gmail.com> Message-ID: On 13/02/2022 06:14, Sergey Kuzminov wrote: > Hi Arnout, > > 13.02.2022 01:11, Arnout Vandecappelle: >> >> >> On 06/02/2022 08:48, Sergey Kuzminov wrote: >>> Changes: >>> * Exclude FAT partition, it is no longer needed for U-Boot. >>> * Switch the rootfs partition from MBR to GPT for partition-uuid to work. >>> * Switch to extlinux, this is convenient for debugging. >>> * Create common scenarios for multiple boards to create an SD image: >>> board/orangepi/common. >>> * Add BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y, remount root filesystem >>> read-write during boot. >>> >>> Signed-off-by: Sergey Kuzminov >>> --- >>> V1->V2: >>> * improved commit log >>> * removed commented line in extlinux.conf >>> * removed one boot option from extlinux.conf >>> >>> V2->V3: >>> * improved commit log >>> * removed comment from board/orangepi/common/genimage.cfg >>> >>> V3->V4: >>> * fixed Signed-off-by position >> >> ??I think I'm going to use this commit message as an example for the >> documentation... Well, if I ever get around to it :-) > > Giulio Benetti helped me. Thanks Giulio. > >> [snip] >>> diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig >>> index 5aaa1566c5..96f0c3f600 100644 >>> --- a/configs/orangepi_zero_defconfig >>> +++ b/configs/orangepi_zero_defconfig >>> @@ -20,10 +20,13 @@ 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_NEEDS_HOST_OPENSSL=y >>> +BR2_LINUX_KERNEL_INSTALL_TARGET=y >>> ? # Filesystem >>> ? BR2_TARGET_ROOTFS_EXT2=y >>> ? BR2_TARGET_ROOTFS_EXT2_4=y >>> +BR2_TARGET_ROOTFS_EXT2_SIZE="63M" >> >> ??Why? Increase from 60M to 63M seems a bit odd... >> >> ??I removed this. > > Initially, 512 MB was in the genimage.cfg configuration. Beautifully obtained 1 > MB (u-boot) + 63 MB (rootfs) = 64 MB (SD Card Image) :) An SD card labelled as 64MB would typically have about 60-62MB of actual space, the rest being used for spares for bad blocks. That's why we use 60M as the default. Regards, Arnout > >>> +BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y >> >> ??We don't do this for any other defconfig. I removed this. >> >> >> ??Applied to master, thanks. >> >> ??Regards, >> ??Arnout >> >> >>> ? # BR2_TARGET_ROOTFS_TAR is not set >>> ? # Bootloader >>> @@ -39,16 +42,12 @@ 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 >>> ? # 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" >>> ? # Wireless driver and firmware >>> ? BR2_PACKAGE_XR819_XRADIO=y > From arnout at mind.be Sun Feb 13 10:47:48 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 11:47:48 +0100 Subject: [Buildroot] [PATCH] configs/microchip_sama7g5ek_mmc_dev_defconfig: add rng tools In-Reply-To: <20220211140855.917229-1-eugen.hristev@microchip.com> References: <20220211140855.917229-1-eugen.hristev@microchip.com> Message-ID: <92785a1f-9323-9d54-b7a6-8b0c40d6bd92@mind.be> On 11/02/2022 15:08, Eugen Hristev via buildroot wrote: > Add rng tools. Without this, when booting, prompt will not > appear until 'random: crng init done' appears. > Avoid this by using rng tools without the libjitterentropy. > Libjitterentropy is a jitter source of entropy which does > not help for AT91 cpus as the jitter does not have > enough variance to generate fast enough entropy. > > Signed-off-by: Eugen Hristev Applied to master, thanks. Regards, Arnout > --- > Hi, > > This should go for 2022.02 in my opinion. > > Thanks, > > configs/microchip_sama7g5ek_mmc_dev_defconfig | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/configs/microchip_sama7g5ek_mmc_dev_defconfig b/configs/microchip_sama7g5ek_mmc_dev_defconfig > index 3253bce401..895e63edcd 100644 > --- a/configs/microchip_sama7g5ek_mmc_dev_defconfig > +++ b/configs/microchip_sama7g5ek_mmc_dev_defconfig > @@ -27,6 +27,8 @@ BR2_PACKAGE_MMC_UTILS=y > BR2_PACKAGE_MTD=y > BR2_PACKAGE_WILC1000_FIRMWARE=y > BR2_PACKAGE_EVTEST=y > +BR2_PACKAGE_RNG_TOOLS=y > +# BR2_PACKAGE_RNG_TOOLS_JITTERENTROPY_LIBRARY is not set > BR2_PACKAGE_SETSERIAL=y > BR2_PACKAGE_SPI_TOOLS=y > BR2_PACKAGE_USBUTILS=y From arnout at mind.be Sun Feb 13 10:48:18 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 11:48:18 +0100 Subject: [Buildroot] [PATCH] configs/microchip_sam9x60ek_mmc_dev_defconfig: expand rootfs size to 120M In-Reply-To: <20220202155821.4038299-1-giulio.benetti@benettiengineering.com> References: <20220202155821.4038299-1-giulio.benetti@benettiengineering.com> Message-ID: <4f066fcb-2d9a-488c-1e95-d8e24dbb935c@mind.be> On 02/02/2022 16:58, Giulio Benetti wrote: > Default 60M for rootfs are not enough and generate a build failure, so > let's expand rootfs size to 120M. > > Fixes: > https://gitlab.com/ymorin/buildroot/-/jobs/2035821088 > > Signed-off-by: Giulio Benetti Applied to master, thanks. Regards, Arnout > --- > configs/microchip_sam9x60ek_mmc_dev_defconfig | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/configs/microchip_sam9x60ek_mmc_dev_defconfig b/configs/microchip_sam9x60ek_mmc_dev_defconfig > index da1bd33dd3..00ccd784b5 100644 > --- a/configs/microchip_sam9x60ek_mmc_dev_defconfig > +++ b/configs/microchip_sam9x60ek_mmc_dev_defconfig > @@ -7,6 +7,7 @@ BR2_TARGET_GENERIC_HOSTNAME="sam9x60ek" > BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y > BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/microchip/sam9x60ek_mmc/genimage.cfg" > +BR2_TARGET_ROOTFS_EXT2_SIZE=120M > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,linux4microchip-2021.10)/linux-linux4microchip-2021.10.tar.gz" From arnout at mind.be Sun Feb 13 10:45:26 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 11:45:26 +0100 Subject: [Buildroot] [git commit] configs/microchip_sama7g5ek_mmc_dev_defconfig: add rng tools Message-ID: <20220213104101.503F782815@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bc54915cebf609b4b4b2037f9ba6464ff2a7e9f3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add rng tools. Without this, when booting, prompt will not appear until 'random: crng init done' appears. Avoid this by using rng tools without the libjitterentropy. Libjitterentropy is a jitter source of entropy which does not help for AT91 cpus as the jitter does not have enough variance to generate fast enough entropy. Signed-off-by: Eugen Hristev Reviewed-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- configs/microchip_sama7g5ek_mmc_dev_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/microchip_sama7g5ek_mmc_dev_defconfig b/configs/microchip_sama7g5ek_mmc_dev_defconfig index c11ea2f518..6eb6c282e0 100644 --- a/configs/microchip_sama7g5ek_mmc_dev_defconfig +++ b/configs/microchip_sama7g5ek_mmc_dev_defconfig @@ -31,6 +31,8 @@ BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y BR2_PACKAGE_EVTEST=y +BR2_PACKAGE_RNG_TOOLS=y +# BR2_PACKAGE_RNG_TOOLS_JITTERENTROPY_LIBRARY is not set BR2_PACKAGE_SETSERIAL=y BR2_PACKAGE_SPI_TOOLS=y BR2_PACKAGE_USBUTILS=y From arnout at mind.be Sun Feb 13 10:47:24 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 11:47:24 +0100 Subject: [Buildroot] [git commit] configs/microchip_sam9x60ek_mmc_dev_defconfig: expand rootfs size to 120M Message-ID: <20220213104101.5862482817@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=616ba9c90b014637dc9925fa442a0af4a11f04b8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Default 60M for rootfs are not enough and generate a build failure, so let's expand rootfs size to 120M. Fixes: https://gitlab.com/ymorin/buildroot/-/jobs/2035821088 Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- configs/microchip_sam9x60ek_mmc_dev_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/microchip_sam9x60ek_mmc_dev_defconfig b/configs/microchip_sam9x60ek_mmc_dev_defconfig index da1bd33dd3..00ccd784b5 100644 --- a/configs/microchip_sam9x60ek_mmc_dev_defconfig +++ b/configs/microchip_sam9x60ek_mmc_dev_defconfig @@ -7,6 +7,7 @@ BR2_TARGET_GENERIC_HOSTNAME="sam9x60ek" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/microchip/sam9x60ek_mmc/genimage.cfg" +BR2_TARGET_ROOTFS_EXT2_SIZE=120M BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,linux4microchip-2021.10)/linux-linux4microchip-2021.10.tar.gz" From arnout at mind.be Sun Feb 13 11:07:08 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 12:07:08 +0100 Subject: [Buildroot] [PATCH] board: x86_64: Enable and mount debugfs In-Reply-To: <20220202031745.448551-1-joel@jms.id.au> References: <20220202031745.448551-1-joel@jms.id.au> Message-ID: <2b888540-8ee9-fc8d-58e3-4a7d0c71da48@mind.be> On 02/02/2022 04:17, Joel Stanley wrote: > Add DEBUG_FS to the kernel options, and modify fstab so it is > automatically mounted at boot. > > This is useful when testing. "This is useful when testing" is not much of an explanation. Why only for this defconfig? Why only debugfs and not strace, dropbear, gdbserver, and tons of other tools useful for testing? For now, I've marked this as Rejected but if there's a good reason we can pick up this patch again. Regards, Arnout > > Signed-off-by: Joel Stanley > --- > board/qemu/x86_64/linux.config | 1 + > board/qemu/x86_64/post-build.sh | 3 +++ > 2 files changed, 4 insertions(+) > > diff --git a/board/qemu/x86_64/linux.config b/board/qemu/x86_64/linux.config > index e1d2ce01b004..2ed5c4194560 100644 > --- a/board/qemu/x86_64/linux.config > +++ b/board/qemu/x86_64/linux.config > @@ -50,4 +50,5 @@ CONFIG_EXT4_FS=y > CONFIG_AUTOFS4_FS=y > CONFIG_TMPFS=y > CONFIG_TMPFS_POSIX_ACL=y > +CONFIG_DEBUG_FS=y > CONFIG_UNWINDER_FRAME_POINTER=y > diff --git a/board/qemu/x86_64/post-build.sh b/board/qemu/x86_64/post-build.sh > index bf83a002c2fc..0b27ab2c8074 100755 > --- a/board/qemu/x86_64/post-build.sh > +++ b/board/qemu/x86_64/post-build.sh > @@ -9,3 +9,6 @@ if [ -e ${TARGET_DIR}/etc/inittab ]; then > sed -i '/GENERIC_SERIAL/a\ > tty1::respawn:/sbin/getty -L tty1 0 vt100 # QEMU graphical window' ${TARGET_DIR}/etc/inittab > fi > + > +# Mount debugfs on boot > +echo "debugfs /sys/kernel/debug debugfs defaults 0 0" >> ${TARGET_DIR}/etc/fstab From peter at korsgaard.com Sun Feb 13 11:12:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Feb 2022 12:12:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/fatcat: bump to version 1.1.1 In-Reply-To: <20220209195240.346534-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 9 Feb 2022 20:52:40 +0100") References: <20220209195240.346534-1-fontaine.fabrice@gmail.com> Message-ID: <87ee47m35h.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Update indentation in hash file (two spaces) > https://github.com/Gregwar/fatcat/compare/v1.1.0...v1.1.1 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 13 11:12:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Feb 2022 12:12:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/jo: bump to version 1.6 In-Reply-To: <20220209202123.354897-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 9 Feb 2022 21:21:23 +0100") References: <20220209202123.354897-1-fontaine.fabrice@gmail.com> Message-ID: <87a6evm35b.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://github.com/jpmens/jo/blob/1.6/ChangeLog > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 13 11:12:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Feb 2022 12:12:37 +0100 Subject: [Buildroot] [PATCH 1/2] package: drop _NEEDS_HOST_PYTHON In-Reply-To: <20220212103421.1351-1-peter@korsgaard.com> (Peter Korsgaard's message of "Sat, 12 Feb 2022 11:34:19 +0100") References: <20220212103421.1351-1-peter@korsgaard.com> Message-ID: <875ypjm34q.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Now that host-python2 is gone and the corresponding logic in pkg-python. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 13 11:12:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Feb 2022 12:12:40 +0100 Subject: [Buildroot] [PATCH 2/2] docs/manual/adding-packages-python.txt: drop _NEEDS_HOST_PYTHON In-Reply-To: <20220212103421.1351-2-peter@korsgaard.com> (Peter Korsgaard's message of "Sat, 12 Feb 2022 11:34:20 +0100") References: <20220212103421.1351-1-peter@korsgaard.com> <20220212103421.1351-2-peter@korsgaard.com> Message-ID: <871r07m34n.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Now that host-python2 is gone and the corresponding logic in pkg-python. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 13 11:11:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Feb 2022 12:11:28 +0100 Subject: [Buildroot] [git commit] package/jo: bump to version 1.6 Message-ID: <20220213110615.506AA821DB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=968908b93ad6528dc7458442dabaceefd53ad4eb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/jpmens/jo/blob/1.6/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/jo/jo.hash | 2 +- package/jo/jo.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/jo/jo.hash b/package/jo/jo.hash index 8f1cc8fcd9..efad8228a7 100644 --- a/package/jo/jo.hash +++ b/package/jo/jo.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 24c64d2eb863900947f58f32b502c95fec8f086105fd31151b91f54b7b5256a2 jo-1.4.tar.gz +sha256 eb15592f1ba6d5a77468a1438a20e3d21c3d63bb7d045fb3544f223340fcd1a1 jo-1.6.tar.gz sha256 41d8b23dc6e76731f4920b9ce42d0d4a248d243a510319e2441d174a115f35cf COPYING diff --git a/package/jo/jo.mk b/package/jo/jo.mk index 24b499f345..dd5dd03ddb 100644 --- a/package/jo/jo.mk +++ b/package/jo/jo.mk @@ -4,7 +4,7 @@ # ################################################################################ -JO_VERSION = 1.4 +JO_VERSION = 1.6 JO_SITE = https://github.com/jpmens/jo/releases/download/$(JO_VERSION) JO_LICENSE = MIT (json.[ch]), GPL-2.0+ (rest) JO_LICENSE_FILES = COPYING From peter at korsgaard.com Sun Feb 13 11:12:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Feb 2022 12:12:06 +0100 Subject: [Buildroot] [git commit] package/fatcat: bump to version 1.1.1 Message-ID: <20220213110615.725EA82817@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4c2e26681724085106df18b382f591b47fe43141 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update indentation in hash file (two spaces) https://github.com/Gregwar/fatcat/compare/v1.1.0...v1.1.1 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/fatcat/fatcat.hash | 4 ++-- package/fatcat/fatcat.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/fatcat/fatcat.hash b/package/fatcat/fatcat.hash index 66823e2d9e..56f89edd50 100644 --- a/package/fatcat/fatcat.hash +++ b/package/fatcat/fatcat.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 303efe2aa73cbfe6fbc5d8af346d0f2c70b3f996fc891e8859213a58b95ad88c fatcat-1.1.0.tar.gz -sha256 3ea03755e32cf7f5b12981de92a0fdad396448195fe0024990c9cbc388e9866c LICENSE +sha256 5574f715f62a9feda7fffc8099f8bca7134ff4f1274bb1bc0db96a2969eea206 fatcat-1.1.1.tar.gz +sha256 3ea03755e32cf7f5b12981de92a0fdad396448195fe0024990c9cbc388e9866c LICENSE diff --git a/package/fatcat/fatcat.mk b/package/fatcat/fatcat.mk index 1a2e5aacae..0dff53fa65 100644 --- a/package/fatcat/fatcat.mk +++ b/package/fatcat/fatcat.mk @@ -4,7 +4,7 @@ # ################################################################################ -FATCAT_VERSION = 1.1.0 +FATCAT_VERSION = 1.1.1 FATCAT_SITE = $(call github,Gregwar,fatcat,v$(FATCAT_VERSION)) FATCAT_LICENSE = MIT FATCAT_LICENSE_FILES = LICENSE From peter at korsgaard.com Sun Feb 13 11:11:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Feb 2022 12:11:44 +0100 Subject: [Buildroot] [git commit] package: drop _NEEDS_HOST_PYTHON Message-ID: <20220213110615.5F6037F8A8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=594b2e9d3c427abac3efcbdf98359d2abe3d6888 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Now that host-python2 is gone and the corresponding logic in pkg-python. Signed-off-by: Peter Korsgaard --- package/meson/meson.mk | 1 - package/python-charset-normalizer/python-charset-normalizer.mk | 1 - package/python-decorator/python-decorator.mk | 1 - package/python-idna/python-idna.mk | 1 - package/python-inflection/python-inflection.mk | 1 - package/python-installer/python-installer.mk | 1 - package/python-jinja2/python-jinja2.mk | 2 -- package/python-mako/python-mako.mk | 2 -- package/python-markupsafe/python-markupsafe.mk | 2 -- package/python-networkx/python-networkx.mk | 1 - package/python-packaging/python-packaging.mk | 1 - package/python-pep517/python-pep517.mk | 1 - package/python-pypa-build/python-pypa-build.mk | 1 - package/python-pyparsing/python-pyparsing.mk | 1 - package/python-pyyaml/python-pyyaml.mk | 1 - package/python-requests/python-requests.mk | 1 - package/python-setuptools-rust/python-setuptools-rust.mk | 1 - .../python-setuptools-scm-git-archive.mk | 1 - package/python-setuptools-scm/python-setuptools-scm.mk | 1 - package/python-tomli/python-tomli.mk | 1 - package/python-typing-extensions/python-typing-extensions.mk | 1 - package/python-urllib3/python-urllib3.mk | 1 - package/scons/scons.mk | 2 -- package/setools/setools.mk | 1 - 24 files changed, 28 deletions(-) diff --git a/package/meson/meson.mk b/package/meson/meson.mk index ad15e3f91e..125488dd46 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -11,7 +11,6 @@ MESON_LICENSE_FILES = COPYING MESON_SETUP_TYPE = setuptools HOST_MESON_DEPENDENCIES = host-ninja -HOST_MESON_NEEDS_HOST_PYTHON = python3 # Avoid interpreter shebang longer than 128 chars define HOST_MESON_SET_INTERPRETER diff --git a/package/python-charset-normalizer/python-charset-normalizer.mk b/package/python-charset-normalizer/python-charset-normalizer.mk index 0a96a6b078..c37b068b36 100644 --- a/package/python-charset-normalizer/python-charset-normalizer.mk +++ b/package/python-charset-normalizer/python-charset-normalizer.mk @@ -10,7 +10,6 @@ PYTHON_CHARSET_NORMALIZER_SITE = https://files.pythonhosted.org/packages/e8/e8/b 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)) diff --git a/package/python-decorator/python-decorator.mk b/package/python-decorator/python-decorator.mk index a7e338bdc0..a61f045e2a 100644 --- a/package/python-decorator/python-decorator.mk +++ b/package/python-decorator/python-decorator.mk @@ -12,7 +12,6 @@ PYTHON_DECORATOR_LICENSE_FILES = LICENSE.txt PYTHON_DECORATOR_CPE_ID_VENDOR = python PYTHON_DECORATOR_CPE_ID_PRODUCT = decorator PYTHON_DECORATOR_SETUP_TYPE = setuptools -HOST_PYTHON_DECORATOR_NEEDS_HOST_PYTHON = python3 $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python-idna/python-idna.mk b/package/python-idna/python-idna.mk index 2a1ec8314b..6f416156d0 100644 --- a/package/python-idna/python-idna.mk +++ b/package/python-idna/python-idna.mk @@ -10,7 +10,6 @@ PYTHON_IDNA_SITE = https://files.pythonhosted.org/packages/62/08/e3fc7c8161090f7 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)) diff --git a/package/python-inflection/python-inflection.mk b/package/python-inflection/python-inflection.mk index 59f35aa135..7c030e99b9 100644 --- a/package/python-inflection/python-inflection.mk +++ b/package/python-inflection/python-inflection.mk @@ -10,7 +10,6 @@ PYTHON_INFLECTION_SITE = https://files.pythonhosted.org/packages/e1/7e/691d061b7 PYTHON_INFLECTION_SETUP_TYPE = setuptools PYTHON_INFLECTION_LICENSE = MIT PYTHON_INFLECTION_LICENSE_FILES = LICENSE -HOST_PYTHON_INFLECTION_NEEDS_HOST_PYTHON = python3 $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python-installer/python-installer.mk b/package/python-installer/python-installer.mk index 2c1d371dab..82739a8003 100644 --- a/package/python-installer/python-installer.mk +++ b/package/python-installer/python-installer.mk @@ -10,6 +10,5 @@ PYTHON_INSTALLER_SITE = https://files.pythonhosted.org/packages/71/9a/8d7c724b0d 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)) diff --git a/package/python-jinja2/python-jinja2.mk b/package/python-jinja2/python-jinja2.mk index 752daf653c..0503984bef 100644 --- a/package/python-jinja2/python-jinja2.mk +++ b/package/python-jinja2/python-jinja2.mk @@ -17,7 +17,5 @@ PYTHON_JINJA2_CPE_ID_PRODUCT = jinja2 PYTHON_JINJA2_DEPENDENCIES = host-python-markupsafe HOST_PYTHON_JINJA2_DEPENDENCIES = host-python-markupsafe -HOST_PYTHON_JINJA2_NEEDS_HOST_PYTHON = python3 - $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python-mako/python-mako.mk b/package/python-mako/python-mako.mk index 26fe95c606..553c4a5339 100644 --- a/package/python-mako/python-mako.mk +++ b/package/python-mako/python-mako.mk @@ -11,8 +11,6 @@ PYTHON_MAKO_SETUP_TYPE = setuptools PYTHON_MAKO_LICENSE = MIT PYTHON_MAKO_LICENSE_FILES = LICENSE -HOST_PYTHON_MAKO_NEEDS_HOST_PYTHON = python3 - # In host build, setup.py tries to download markupsafe if it is not installed HOST_PYTHON_MAKO_DEPENDENCIES = host-python-markupsafe diff --git a/package/python-markupsafe/python-markupsafe.mk b/package/python-markupsafe/python-markupsafe.mk index 14a8d06dfe..e0e689f5a1 100644 --- a/package/python-markupsafe/python-markupsafe.mk +++ b/package/python-markupsafe/python-markupsafe.mk @@ -11,7 +11,5 @@ PYTHON_MARKUPSAFE_SETUP_TYPE = setuptools PYTHON_MARKUPSAFE_LICENSE = BSD-3-Clause PYTHON_MARKUPSAFE_LICENSE_FILES = LICENSE.rst -HOST_PYTHON_MARKUPSAFE_NEEDS_HOST_PYTHON = python3 - $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python-networkx/python-networkx.mk b/package/python-networkx/python-networkx.mk index 3b05011eb9..1908ed8f93 100644 --- a/package/python-networkx/python-networkx.mk +++ b/package/python-networkx/python-networkx.mk @@ -13,7 +13,6 @@ PYTHON_NETWORKX_CPE_ID_VENDOR = python PYTHON_NETWORKX_CPE_ID_PRODUCT = networkx PYTHON_NETWORKX_SETUP_TYPE = setuptools HOST_PYTHON_NETWORKX_DEPENDENCIES = host-python-decorator -HOST_PYTHON_NETWORKX_NEEDS_HOST_PYTHON = python3 $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python-packaging/python-packaging.mk b/package/python-packaging/python-packaging.mk index 569dc0bf58..74b5803525 100644 --- a/package/python-packaging/python-packaging.mk +++ b/package/python-packaging/python-packaging.mk @@ -10,7 +10,6 @@ PYTHON_PACKAGING_SITE = https://files.pythonhosted.org/packages/df/9e/d1a7217f69 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)) diff --git a/package/python-pep517/python-pep517.mk b/package/python-pep517/python-pep517.mk index da0431a637..99aa62d51d 100644 --- a/package/python-pep517/python-pep517.mk +++ b/package/python-pep517/python-pep517.mk @@ -10,7 +10,6 @@ PYTHON_PEP517_SITE = https://files.pythonhosted.org/packages/0a/65/6e656d49c6791 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)) diff --git a/package/python-pypa-build/python-pypa-build.mk b/package/python-pypa-build/python-pypa-build.mk index 6babade672..dc8363f59e 100644 --- a/package/python-pypa-build/python-pypa-build.mk +++ b/package/python-pypa-build/python-pypa-build.mk @@ -10,7 +10,6 @@ PYTHON_PYPA_BUILD_SITE = https://files.pythonhosted.org/packages/f0/62/c73b77521 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 \ diff --git a/package/python-pyparsing/python-pyparsing.mk b/package/python-pyparsing/python-pyparsing.mk index e33541bdb7..2fb705bc7a 100644 --- a/package/python-pyparsing/python-pyparsing.mk +++ b/package/python-pyparsing/python-pyparsing.mk @@ -10,7 +10,6 @@ PYTHON_PYPARSING_SITE = https://files.pythonhosted.org/packages/d6/60/9bed18f432 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)) diff --git a/package/python-pyyaml/python-pyyaml.mk b/package/python-pyyaml/python-pyyaml.mk index 8f5a2d269e..067af8ea7d 100644 --- a/package/python-pyyaml/python-pyyaml.mk +++ b/package/python-pyyaml/python-pyyaml.mk @@ -15,7 +15,6 @@ PYTHON_PYYAML_CPE_ID_PRODUCT = pyyaml PYTHON_PYYAML_DEPENDENCIES = host-python-cython libyaml PYTHON_PYYAML_ENV = PYYAML_FORCE_CYTHON=1 HOST_PYTHON_PYYAML_DEPENDENCIES = host-libyaml -HOST_PYTHON_PYYAML_NEEDS_HOST_PYTHON = python3 $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python-requests/python-requests.mk b/package/python-requests/python-requests.mk index 962646516e..9613a2c47c 100644 --- a/package/python-requests/python-requests.mk +++ b/package/python-requests/python-requests.mk @@ -12,7 +12,6 @@ PYTHON_REQUESTS_LICENSE = Apache-2.0 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 \ diff --git a/package/python-setuptools-rust/python-setuptools-rust.mk b/package/python-setuptools-rust/python-setuptools-rust.mk index c87a0da3c7..394789b056 100644 --- a/package/python-setuptools-rust/python-setuptools-rust.mk +++ b/package/python-setuptools-rust/python-setuptools-rust.mk @@ -11,6 +11,5 @@ 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-typing-extensions -HOST_PYTHON_SETUPTOOLS_RUST_NEEDS_HOST_PYTHON = python3 $(eval $(host-python-package)) diff --git a/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk b/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk index 48ca9c89ae..032e2d3fc9 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,6 +11,5 @@ 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 8c5229e1a6..132eb398aa 100644 --- a/package/python-setuptools-scm/python-setuptools-scm.mk +++ b/package/python-setuptools-scm/python-setuptools-scm.mk @@ -11,6 +11,5 @@ 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-tomli/python-tomli.mk b/package/python-tomli/python-tomli.mk index 4e6b023ef7..b8c20ca736 100644 --- a/package/python-tomli/python-tomli.mk +++ b/package/python-tomli/python-tomli.mk @@ -10,7 +10,6 @@ PYTHON_TOMLI_SITE = https://files.pythonhosted.org/packages/ec/38/8eccdc662c61ae 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)) diff --git a/package/python-typing-extensions/python-typing-extensions.mk b/package/python-typing-extensions/python-typing-extensions.mk index 407fe99b54..668071e025 100644 --- a/package/python-typing-extensions/python-typing-extensions.mk +++ b/package/python-typing-extensions/python-typing-extensions.mk @@ -10,7 +10,6 @@ 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)) diff --git a/package/python-urllib3/python-urllib3.mk b/package/python-urllib3/python-urllib3.mk index c9c8a912d1..d94c97b4ed 100644 --- a/package/python-urllib3/python-urllib3.mk +++ b/package/python-urllib3/python-urllib3.mk @@ -12,7 +12,6 @@ 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)) diff --git a/package/scons/scons.mk b/package/scons/scons.mk index bc5d2a1ef9..6b75d3ddca 100644 --- a/package/scons/scons.mk +++ b/package/scons/scons.mk @@ -10,8 +10,6 @@ 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) diff --git a/package/setools/setools.mk b/package/setools/setools.mk index 5b4b4e30d8..ea355f10c8 100644 --- a/package/setools/setools.mk +++ b/package/setools/setools.mk @@ -13,7 +13,6 @@ SETOOLS_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL SETOOLS_CPE_ID_VENDOR = selinuxproject SETOOLS_SETUP_TYPE = setuptools HOST_SETOOLS_DEPENDENCIES = host-python-cython host-libselinux host-libsepol host-python-networkx -HOST_SETOOLS_NEEDS_HOST_PYTHON = python3 define SETOOLS_FIX_SETUP # By default, setup.py will look for libsepol.a in the host machines From peter at korsgaard.com Sun Feb 13 11:11:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Feb 2022 12:11:50 +0100 Subject: [Buildroot] [git commit] docs/manual/adding-packages-python.txt: drop _NEEDS_HOST_PYTHON Message-ID: <20220213110615.68FFF82821@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=26157321240adb9f5cc2802183d3955a877b9487 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Now that host-python2 is gone and the corresponding logic in pkg-python. Signed-off-by: Peter Korsgaard --- docs/manual/adding-packages-python.txt | 7 ------- 1 file changed, 7 deletions(-) diff --git a/docs/manual/adding-packages-python.txt b/docs/manual/adding-packages-python.txt index cfd2f88920..0141fea85b 100644 --- a/docs/manual/adding-packages-python.txt +++ b/docs/manual/adding-packages-python.txt @@ -141,13 +141,6 @@ therefore only use a few of them, or none. packages) and +HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS+ (for host setuptools packages). -* +HOST_PYTHON_FOO_NEEDS_HOST_PYTHON+, to define the host python - interpreter. The usage of this variable is limited to host - packages. The two supported value are +python2+ and +python3+. It - will ensure the right host python package is available and will - invoke it for the build. If some build steps are overloaded, the - right python interpreter must be explicitly called in the commands. - With the Python infrastructure, all the steps required to build and install the packages are already defined, and they generally work well for most Python-based packages. However, when required, it is still From fontaine.fabrice at gmail.com Sun Feb 13 11:20:25 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 13 Feb 2022 12:20:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/safeclib: fix build with gcc 4.8 Message-ID: <20220213112025.979418-1-fontaine.fabrice@gmail.com> Add -std=c99 to fix the following build failure with gcc 4.8 raised since bump to version 3.7.1 in commit cc27267ae41bf44276c63b1e86042c4fae4adf50: In file included from abort_handler_s.c:35:0: safeclib_private.h:167:18: error: anonymous variadic macros were introduced in C99 [-Werror=variadic-macros] #define slprintf(...) fprintf(stderr, __VA_ARGS__) ^ Fixes: - http://autobuild.buildroot.org/results/5c3468585942879b47331e05058d25d324c8cc23 Signed-off-by: Fabrice Fontaine --- package/safeclib/safeclib.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/safeclib/safeclib.mk b/package/safeclib/safeclib.mk index 91b3e26c68..bc58c1a38c 100644 --- a/package/safeclib/safeclib.mk +++ b/package/safeclib/safeclib.mk @@ -11,6 +11,7 @@ SAFECLIB_SOURCE = safeclib-$(SAFECLIB_VERSION).tar.xz SAFECLIB_LICENSE = MIT SAFECLIB_LICENSE_FILES = COPYING SAFECLIB_INSTALL_STAGING = YES +SAFECLIB_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=c99" # -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 -- 2.34.1 From arnout at mind.be Sun Feb 13 11:20:27 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 12:20:27 +0100 Subject: [Buildroot] [PATCH] package/doc-asciidoc: fix build for out-of-tree documents In-Reply-To: <11822_1643723386_61F93A7A_11822_315_1_f2cd4a063f756aa49d3dc715be368bd3738e5f1d.1643723384.git.yann.morin@orange.com> References: <11822_1643723386_61F93A7A_11822_315_1_f2cd4a063f756aa49d3dc715be368bd3738e5f1d.1643723384.git.yann.morin@orange.com> Message-ID: On 01/02/2022 14:49, yann.morin at orange.com wrote: > From: "Yann E. MORIN" > > The doc-asciidoc infra allows document to define sources and resources, > and those can only be local (there is no download support for documents). > The currently documented way to specify those is to use the $(pkgdir) > macro to point to the document sources and resources when they are along > the .mk. > > However, this works only for sources and not for resources. > > Indeed, sources are used to generate Makefile dependency rules, so > $(pkgdir) is expanded and evaluated during the call to $(doc-asciidoc), > while resources are expanded and evaluated when the rules are executed, > which always happen after all the parsing has be done, at which point > $(pkgdir) expands to the last Makefile that was parsed, which is always > Buildroot's own manual. > > This went unnoticed so far because Buildroot's manual is 1) the last to > be parsed, and 2) not using $(pkgdir) anyway. > > Additionally, $(pkgdir) is mostly an internal macro, that is, as this > change demonstrates, difficult to use, and thus should not be used, in > packages or in documents. > > We fix that by introducing $(FOO_DOCDIR), similar to $(FOO_PKGDIR), > which points to the document directory. We choose not to name the > variable FOO_PKGDIR, because it semantically is not a package. > > As a consequence, the last argument to the doc-asciidoc macro is now > superfluous, so it is removed, which causes a little bit of churn in > the main macro. As a further consequence, the third argument in the > inner macro is no longer needed either, so it too is removed, which > causes a bit more churn yet in the inner macro. > > Signed-off-by: Yann E. MORIN > Cc: Frederic GARDES Applied to master, thanks. Regards, Arnout > --- > docs/manual/adding-packages-asciidoc.txt | 17 ++++- > package/doc-asciidoc.mk | 90 ++++++++++++------------ > 2 files changed, 59 insertions(+), 48 deletions(-) > > diff --git a/docs/manual/adding-packages-asciidoc.txt b/docs/manual/adding-packages-asciidoc.txt > index f9688b36c7..0bfe99d22e 100644 > --- a/docs/manual/adding-packages-asciidoc.txt > +++ b/docs/manual/adding-packages-asciidoc.txt > @@ -39,7 +39,7 @@ Here is an example to render a simple AsciiDoc document. > 04: # > 05: ################################################################################ > 06: > -07: FOO_SOURCES = $(sort $(wildcard $(pkgdir)/*)) > +07: FOO_SOURCES = $(sort $(wildcard $(FOO_DOCDIR)/*)) > 08: $(eval $(call asciidoc-document)) > ---- > > @@ -85,6 +85,17 @@ various steps: > * +FOO_CHECK_DEPENDENCIES__HOOKS+, to run additional tests for > the specified format ++ (see the list of rendered formats, above). > > +Buildroot sets the following variable that can be used in the definitions > +above: > + > +* +$(FOO_DOCDIR)+, similar to +$(FOO_PKGDIR)+, contains the path to the > + directory containing +foo.mk+. It can be used to refer to the document > + sources, and can be used in the hooks, especially the post-rsync hook > + if parts of the documentation needs to be generated. > + > +* +$(@D)+, as for traditional packages, contains the path to the directory > + where the document will be copied and built. > + > Here is a complete example that uses all variables and all hooks: > > ---- > @@ -94,8 +105,8 @@ Here is a complete example that uses all variables and all hooks: > 04: # > 05: ################################################################################ > 06: > -07: FOO_SOURCES = $(sort $(wildcard $(pkgdir)/*)) > -08: FOO_RESOURCES = $(sort $(wildcard $(pkgdir)/ressources)) > +07: FOO_SOURCES = $(sort $(wildcard $(FOO_DOCDIR)/*)) > +08: FOO_RESOURCES = $(sort $(wildcard $(FOO_DOCDIR)/ressources)) > 09: > 10: define FOO_GEN_EXTRA_DOC > 11: /path/to/generate-script --outdir=$(@D) > diff --git a/package/doc-asciidoc.mk b/package/doc-asciidoc.mk > index be92496c2e..2bd761edfb 100644 > --- a/package/doc-asciidoc.mk > +++ b/package/doc-asciidoc.mk > @@ -42,12 +42,11 @@ BR_ASCIIDOC_CONF = docs/conf/asciidoc.conf > # argument 1 is the name of the document and the top-level asciidoc file must > # have the same name > # argument 2 is the uppercase name of the document > -# argument 3 is the directory containing the document > -# argument 4 is the type of document to generate (-f argument of a2x) > -# argument 5 is the document type as used in the make target > -# argument 6 is the output file extension for the document type > -# argument 7 is the human text for the document type > -# argument 8 (optional) are extra arguments for a2x > +# argument 3 is the type of document to generate (-f argument of a2x) > +# argument 4 is the document type as used in the make target > +# argument 5 is the output file extension for the document type > +# argument 6 is the human text for the document type > +# argument 7 (optional) are extra arguments for a2x > # > # The variable _SOURCES defines the dependencies. > # > @@ -55,55 +54,55 @@ BR_ASCIIDOC_CONF = docs/conf/asciidoc.conf > # all variable references except the arguments must be $$-quoted. > ################################################################################ > define ASCIIDOC_INNER > -$(1): $(1)-$(5) > -.PHONY: $(1)-$(5) > -$(1)-$(5): $$(O)/docs/$(1)/$(1).$(6) > +$(1): $(1)-$(4) > +.PHONY: $(1)-$(4) > +$(1)-$(4): $$(O)/docs/$(1)/$(1).$(5) > > -asciidoc-check-dependencies-$(5): > -.PHONY: $(1)-check-dependencies-$(5) > +asciidoc-check-dependencies-$(4): > +.PHONY: $(1)-check-dependencies-$(4) > # Single line, because splitting a foreach is not easy... > -$(1)-check-dependencies-$(5): asciidoc-check-dependencies-$(5) > - $$(Q)$$(foreach hook,$$($(2)_CHECK_DEPENDENCIES_$$(call UPPERCASE,$(5))_HOOKS),$$(call $$(hook))$$(sep)) > +$(1)-check-dependencies-$(4): asciidoc-check-dependencies-$(4) > + $$(Q)$$(foreach hook,$$($(2)_CHECK_DEPENDENCIES_$$(call UPPERCASE,$(4))_HOOKS),$$(call $$(hook))$$(sep)) > > # Include Buildroot's AsciiDoc configuration first: > # - generic configuration, > # - then output-specific configuration > ifneq ($$(wildcard $$(BR_ASCIIDOC_CONF)),) > -$(2)_$(4)_ASCIIDOC_OPTS += -f $$(BR_ASCIIDOC_CONF) > +$(2)_$(3)_ASCIIDOC_OPTS += -f $$(BR_ASCIIDOC_CONF) > endif > -BR_$(4)_ASCIIDOC_CONF = docs/conf/asciidoc-$(4).conf > -ifneq ($$(wildcard $$(BR_$(4)_ASCIIDOC_CONF)),) > -$(2)_$(4)_ASCIIDOC_OPTS += -f $$(BR_$(4)_ASCIIDOC_CONF) > +BR_$(3)_ASCIIDOC_CONF = docs/conf/asciidoc-$(3).conf > +ifneq ($$(wildcard $$(BR_$(3)_ASCIIDOC_CONF)),) > +$(2)_$(3)_ASCIIDOC_OPTS += -f $$(BR_$(3)_ASCIIDOC_CONF) > endif > > # Then include the document's AsciiDoc configuration: > # - generic configuration, > # - then output-specific configuration > ifneq ($$(wildcard $$($(2)_ASCIIDOC_CONF)),) > -$(2)_$(4)_ASCIIDOC_OPTS += -f $$($(2)_ASCIIDOC_CONF) > +$(2)_$(3)_ASCIIDOC_OPTS += -f $$($(2)_ASCIIDOC_CONF) > endif > -$(2)_$(4)_ASCIIDOC_CONF = $(3)/asciidoc-$(4).conf > -ifneq ($$(wildcard $$($(2)_$(4)_ASCIIDOC_CONF)),) > -$(2)_$(4)_ASCIIDOC_OPTS += -f $$($(2)_$(4)_ASCIIDOC_CONF) > +$(2)_$(3)_ASCIIDOC_CONF = $$($(2)_DOCDIR)/asciidoc-$(3).conf > +ifneq ($$(wildcard $$($(2)_$(3)_ASCIIDOC_CONF)),) > +$(2)_$(3)_ASCIIDOC_OPTS += -f $$($(2)_$(3)_ASCIIDOC_CONF) > endif > > # Handle a2x warning about --destination-dir option only applicable to HTML > # based outputs. So: > # - use the --destination-dir option if possible (html and split-html), > # - otherwise copy the generated document to the output directory > -$(2)_$(4)_A2X_OPTS = > -ifneq ($$(filter $(5),html split-html),) > -$(2)_$(4)_A2X_OPTS += --destination-dir="$$(@D)" > +$(2)_$(3)_A2X_OPTS = > +ifneq ($$(filter $(4),html split-html),) > +$(2)_$(3)_A2X_OPTS += --destination-dir="$$(@D)" > else > -define $(2)_$(4)_INSTALL_CMDS > - $$(Q)cp -f $$(BUILD_DIR)/docs/$(1)/$(1).$(6) $$(@D) > +define $(2)_$(3)_INSTALL_CMDS > + $$(Q)cp -f $$(BUILD_DIR)/docs/$(1)/$(1).$(5) $$(@D) > endef > endif > > -$$(O)/docs/$(1)/$(1).$(6): export TZ=UTC > +$$(O)/docs/$(1)/$(1).$(5): export TZ=UTC > > -ifeq ($(6)-$$(GENDOC_XSLTPROC_IS_BROKEN),pdf-y) > -$$(O)/docs/$(1)/$(1).$(6): > +ifeq ($(5)-$$(GENDOC_XSLTPROC_IS_BROKEN),pdf-y) > +$$(O)/docs/$(1)/$(1).$(5): > $$(warning PDF generation is disabled because of a bug in \ > xsltproc. To be able to generate a PDF, you should \ > build xsltproc from the libxslt sources >=1.1.29 and pass it \ > @@ -112,20 +111,20 @@ $$(O)/docs/$(1)/$(1).$(6): > else > # -r $(@D) is there for documents that use external filters; those filters > # generate code at the same location it finds the document's source files. > -$$(O)/docs/$(1)/$(1).$(6): $$($(2)_SOURCES) \ > +$$(O)/docs/$(1)/$(1).$(5): $$($(2)_SOURCES) \ > $(1)-check-dependencies \ > - $(1)-check-dependencies-$(5) \ > + $(1)-check-dependencies-$(4) \ > $(1)-prepare-sources > - $$(Q)$$(call MESSAGE,"Generating $(7) $(1)...") > + $$(Q)$$(call MESSAGE,"Generating $(6) $(1)...") > $$(Q)mkdir -p $$(@D) > - $$(Q)a2x $(8) -f $(4) -d book -L \ > + $$(Q)a2x $(7) -f $(3) -d book -L \ > $$(foreach r,$$($(2)_RESOURCES) $$(@D), \ > --resource="$$(abspath $$(r))") \ > - $$($(2)_$(4)_A2X_OPTS) \ > - --asciidoc-opts="$$($(2)_$(4)_ASCIIDOC_OPTS)" \ > + $$($(2)_$(3)_A2X_OPTS) \ > + --asciidoc-opts="$$($(2)_$(3)_ASCIIDOC_OPTS)" \ > $$(BUILD_DIR)/docs/$(1)/$(1).txt > # install the generated document > - $$($(2)_$(4)_INSTALL_CMDS) > + $$($(2)_$(3)_INSTALL_CMDS) > endif > endef > > @@ -135,13 +134,14 @@ endef > # argument 1 is the lowercase name of the document; the document's main file > # must have the same name, with the .txt extension > # argument 2 is the uppercase name of the document > -# argument 3 is the directory containing the document's sources > # > # The variable _SOURCES defines the dependencies. > # The variable _RESOURCES defines where the document's > # resources, such as images, are located; must be an absolute path. > ################################################################################ > define ASCIIDOC > +$(2)_DOCDIR = $(pkgdir) > + > # Single line, because splitting a foreach is not easy... > .PHONY: $(1)-check-dependencies > $(1)-check-dependencies: asciidoc-check-dependencies $$($(2)_DEPENDENCIES) > @@ -153,29 +153,29 @@ $(1)-check-dependencies: asciidoc-check-dependencies $$($(2)_DEPENDENCIES) > $$(BUILD_DIR)/docs/$(1)/.stamp_doc_rsynced: > $$(Q)$$(call MESSAGE,"Preparing the $(1) sources...") > $$(Q)mkdir -p $$(@D) > - $$(Q)rsync -a $(3) $$(@D) > + $$(Q)rsync -a $$($(2)_DOCDIR) $$(@D) > $$(Q)$$(foreach hook,$$($(2)_POST_RSYNC_HOOKS),$$(call $$(hook))$$(sep)) > > .PHONY: $(1)-prepare-sources > $(1)-prepare-sources: $$(BUILD_DIR)/docs/$(1)/.stamp_doc_rsynced > > -$(2)_ASCIIDOC_CONF = $(3)/asciidoc.conf > +$(2)_ASCIIDOC_CONF = $$($(2)_DOCDIR)/asciidoc.conf > > -$(call ASCIIDOC_INNER,$(1),$(2),$(3),xhtml,html,html,HTML,\ > +$(call ASCIIDOC_INNER,$(1),$(2),xhtml,html,html,HTML,\ > --xsltproc-opts "--stringparam toc.section.depth 1") > > -$(call ASCIIDOC_INNER,$(1),$(2),$(3),chunked,split-html,chunked,split HTML,\ > +$(call ASCIIDOC_INNER,$(1),$(2),chunked,split-html,chunked,split HTML,\ > --xsltproc-opts "--stringparam toc.section.depth 1") > > # dblatex needs to pass the '--maxvars ...' option to xsltproc to prevent it > # from reaching the template recursion limit when processing the (long) target > # package table and bailing out. > -$(call ASCIIDOC_INNER,$(1),$(2),$(3),pdf,pdf,pdf,PDF,\ > +$(call ASCIIDOC_INNER,$(1),$(2),pdf,pdf,pdf,PDF,\ > --dblatex-opts "-P latex.output.revhistory=0 -x '--maxvars 100000'") > > -$(call ASCIIDOC_INNER,$(1),$(2),$(3),text,text,text,text) > +$(call ASCIIDOC_INNER,$(1),$(2),text,text,text,text) > > -$(call ASCIIDOC_INNER,$(1),$(2),$(3),epub,epub,epub,ePUB) > +$(call ASCIIDOC_INNER,$(1),$(2),epub,epub,epub,ePUB) > > clean: $(1)-clean > $(1)-clean: > @@ -187,4 +187,4 @@ endef > # asciidoc-document -- the target generator macro for asciidoc documents > ################################################################################ > > -asciidoc-document = $(call ASCIIDOC,$(pkgname),$(call UPPERCASE,$(pkgname)),$(pkgdir)) > +asciidoc-document = $(call ASCIIDOC,$(pkgname),$(call UPPERCASE,$(pkgname))) From arnout at mind.be Sun Feb 13 11:21:19 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 12:21:19 +0100 Subject: [Buildroot] [PATCH 1/2] package/cryptsetup: bump version to 2.4.3 In-Reply-To: <20220201173352.160244-1-giulio.benetti@benettiengineering.com> References: <20220201173352.160244-1-giulio.benetti@benettiengineering.com> Message-ID: On 01/02/2022 18:33, Giulio Benetti wrote: > Signed-off-by: Giulio Benetti Both applied to master, thanks. Regards, Arnout > --- > package/cryptsetup/cryptsetup.hash | 2 +- > package/cryptsetup/cryptsetup.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/cryptsetup/cryptsetup.hash b/package/cryptsetup/cryptsetup.hash > index b3bb859bdc..dce2686d31 100644 > --- a/package/cryptsetup/cryptsetup.hash > +++ b/package/cryptsetup/cryptsetup.hash > @@ -1,4 +1,4 @@ > # From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.4/sha256sums.asc > -sha256 170cc2326a9daeeeb578579176bd10d4a60ee5c4fc5bc69018ce67dafc540b9c cryptsetup-2.4.2.tar.xz > +sha256 fc0df945188172264ec5bf1d0bda08264fadc8a3f856d47eba91f31fe354b507 cryptsetup-2.4.3.tar.xz > sha256 45670cce8b6a0ddd66c8016cd8ccef6cd71f35717cbacc7f1e895b3855207b33 COPYING > sha256 8c33cc37871654ec7ed87e6fbb896c8cf33ef5ef05b1611a5aed857596ffafa5 COPYING.LGPL > diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk > index 9cfd647ac6..2e06047c56 100644 > --- a/package/cryptsetup/cryptsetup.mk > +++ b/package/cryptsetup/cryptsetup.mk > @@ -5,7 +5,7 @@ > ################################################################################ > > CRYPTSETUP_VERSION_MAJOR = 2.4 > -CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).2 > +CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).3 > CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz > CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR) > CRYPTSETUP_DEPENDENCIES = \ From arnout at mind.be Sun Feb 13 11:21:54 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 12:21:54 +0100 Subject: [Buildroot] [PATCH] DEVELOPERS: remove Martin Hicks from file In-Reply-To: <20220201174202.286878-1-giulio.benetti@benettiengineering.com> References: <20220201174202.286878-1-giulio.benetti@benettiengineering.com> Message-ID: <2ff02c8e-f9bc-8acb-28d4-c4e8297b90fc@mind.be> On 01/02/2022 18:42, Giulio Benetti wrote: > Martin Hicks asked to not maintain cryptsetup anymore: > https://lists.buildroot.org/pipermail/buildroot/2022-February/635413.html > > Also he doesn't mantain any other package, so let's remove him from this > file. > > Signed-off-by: Giulio Benetti Applied to master, thanks. Regards, Arnout > --- > DEVELOPERS | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/DEVELOPERS b/DEVELOPERS > index 5255b096b0..555723867e 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1847,9 +1847,6 @@ F: package/rpi-firmware/ > F: package/tzdata/ > F: package/zic/ > > -N: Martin Hicks > -F: package/cryptsetup/ > - > N: Martin Kepplinger > F: package/tslib/ > F: package/x11r7/xdriver_xf86-input-tslib/ From arnout at mind.be Sun Feb 13 11:25:39 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 12:25:39 +0100 Subject: [Buildroot] [PATCH] package/libglfw: bump to 3.3.6 and enable Wayland/libGLES support In-Reply-To: <8B42D9C7-D86C-4A08-B552-3523E7D0C50D@ignavus.net> References: <8B42D9C7-D86C-4A08-B552-3523E7D0C50D@ignavus.net> Message-ID: <8c6d99e1-c645-3f6d-cd18-6346f2c3d2a7@mind.be> On 01/02/2022 21:43, Andre Renaud wrote: > Signed-off-by: Andre Renaud > --- > package/libglfw/Config.in | 19 ++++++++++--------- > package/libglfw/libglfw.hash | 2 +- > package/libglfw/libglfw.mk | 16 ++++++++++++++-- > 3 files changed, 25 insertions(+), 12 deletions(-) > > diff --git a/package/libglfw/Config.in b/package/libglfw/Config.in > index 06f4376453..9705fef432 100644 > --- a/package/libglfw/Config.in > +++ b/package/libglfw/Config.in > @@ -1,17 +1,18 @@ > config BR2_PACKAGE_LIBGLFW > bool "libglfw" > - depends on BR2_PACKAGE_XORG7 > - depends on BR2_PACKAGE_HAS_LIBGL > - select BR2_PACKAGE_XLIB_LIBXCURSOR > - select BR2_PACKAGE_XLIB_LIBXEXT > - select BR2_PACKAGE_XLIB_LIBXI > - select BR2_PACKAGE_XLIB_LIBXINERAMA > - select BR2_PACKAGE_XLIB_LIBXRANDR > + depends on BR2_PACKAGE_XORG7 || BR2_PACKAGE_WAYLAND > + depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES > + select BR2_PACKAGE_XLIB_LIBXCURSOR if BR2_PACKAGE_XORG7 > + select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 > + select BR2_PACKAGE_XLIB_LIBXI if BR2_PACKAGE_XORG7 > + select BR2_PACKAGE_XLIB_LIBXINERAMA if BR2_PACKAGE_XORG7 > + select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_XORG7 > help > GLFW is an Open Source, multi-platform library for creating > windows with OpenGL contexts and receiving input and events. > > http://www.glfw.org > > -comment "libglfw depends on X.org and needs an OpenGL backend" > - depends on !BR2_PACKAGE_XORG7 || !BR2_PACKAGE_HAS_LIBGL > +comment "libglfw depends on X.org/Wayland and needs an OpenGL/GLES backend" > + depends on !(BR2_PACKAGE_XORG7 || BR2_PACKAGE_WAYLAND) > + depends on !(BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES) > diff --git a/package/libglfw/libglfw.hash b/package/libglfw/libglfw.hash > index c21a595bbc..5bffc55d26 100644 > --- a/package/libglfw/libglfw.hash > +++ b/package/libglfw/libglfw.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 98768e12e615fbe9f3386f5bbfeb91b5a3b45a8c4c77159cef06b1f6ff749537 libglfw-3.3.2.tar.gz > +sha256 ed07b90e334dcd39903e6288d90fa1ae0cf2d2119fec516cf743a0a404527c02 libglfw-3.3.6.tar.gz > sha256 149704059b5d0bf551637e50042dd4de9c2cae921021f6636298911e3a5f9462 LICENSE.md > diff --git a/package/libglfw/libglfw.mk b/package/libglfw/libglfw.mk > index 63d2a88bf8..7daf61af0e 100644 > --- a/package/libglfw/libglfw.mk > +++ b/package/libglfw/libglfw.mk > @@ -4,11 +4,19 @@ > # > ################################################################################ > > -LIBGLFW_VERSION = 3.3.2 > +LIBGLFW_VERSION = 3.3.6 > LIBGLFW_SITE = $(call github,glfw,glfw,$(LIBGLFW_VERSION)) > LIBGLFW_INSTALL_STAGING = YES > -LIBGLFW_DEPENDENCIES = libgl xlib_libXcursor xlib_libXext \ > +ifeq ($(BR2_PACKAGE_XORG7),y) > +LIBGLFW_DEPENDENCIES = xlib_libXcursor xlib_libXext \ Overriding assignment within conditions is no longer accepted by check-package, so I changed this into += I also reordered stuff so the unconditional stuff precedes the conditional stuff, and added an empty line between the different conditions. Applied to master with those changes, thanks. > xlib_libXi xlib_libXinerama xlib_libXrandr > +endif > +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) > +LIBGLFW_DEPENDENCIES += libgl > +endif > +ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) > +LIBGLFW_DEPENDENCIES += libgles Does the combination X11+GLES work? It wasn't possible before and it is possible now. I guess the autobuilders will tell us that. However, you're not registered as a developer for this package, so you won't get notified. Could you add yourself to DEVELOPERS for this package? Regards, Arnout > +endif > LIBGLFW_LICENSE = Zlib > LIBGLFW_LICENSE_FILES = LICENSE.md > > @@ -17,6 +25,10 @@ LIBGLFW_CONF_OPTS += \ > -DGLFW_BUILD_TESTS=OFF \ > -DGLFW_BUILD_DOCS=OFF > > +ifeq ($(BR2_PACKAGE_WAYLAND),y) > +LIBGLFW_CONF_OPTS += -DGLFW_USE_WAYLAND=1 > +endif > + > ifeq ($(BR2_PACKAGE_XLIB_LIBXXF86VM),y) > LIBGLFW_DEPENDENCIES += xlib_libXxf86vm > endif > -- > 2.32.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From arnout at mind.be Sun Feb 13 11:28:21 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 12:28:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/python{3}-pycryptodomex: bump to version 3.14.0 In-Reply-To: <20220202040619.2197495-1-james.hilliard1@gmail.com> References: <20220202040619.2197495-1-james.hilliard1@gmail.com> Message-ID: <79f8e0b9-8979-44d3-c0ce-0d67c101c32d@mind.be> On 02/02/2022 05:06, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master after dropping the python3 part, thanks. Regards, Arnout > --- > package/python-pycryptodomex/python-pycryptodomex.hash | 4 ++-- > package/python-pycryptodomex/python-pycryptodomex.mk | 4 ++-- > package/python3-pycryptodomex/python3-pycryptodomex.mk | 4 ++-- > 3 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/package/python-pycryptodomex/python-pycryptodomex.hash b/package/python-pycryptodomex/python-pycryptodomex.hash > index 9512f185a8..920cec2518 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 dcf0d13044c700410bdce31a5afdf6d0 pycryptodomex-3.13.0.tar.gz > -sha256 63443230247837dd03c5d4028cae5cb2e6793a9ae110e321798bee48a04ff3e9 pycryptodomex-3.13.0.tar.gz > +md5 18f571832bbfbf0f4516ccef009f2dfb pycryptodomex-3.14.0.tar.gz > +sha256 2d8bda8f949b79b78b293706aa7fc1e5c171c62661252bfdd5d12c70acd03282 pycryptodomex-3.14.0.tar.gz > # Locally computed sha256 checksums > sha256 4e04660d77c1c64e89d79537919fb8240fa21484a7e3db29f358b2c7f84ea073 LICENSE.rst > sha256 8e563c767164faa0831a333b57d23d4311cf566eb1b15d93250f4606be4eb549 Doc/LEGAL/COPYRIGHT.pycrypto > diff --git a/package/python-pycryptodomex/python-pycryptodomex.mk b/package/python-pycryptodomex/python-pycryptodomex.mk > index 92780327a1..7821052b43 100644 > --- a/package/python-pycryptodomex/python-pycryptodomex.mk > +++ b/package/python-pycryptodomex/python-pycryptodomex.mk > @@ -5,9 +5,9 @@ > ################################################################################ > > # Please keep in sync with package/python3-pycryptodomex/python3-pycryptodomex.mk > -PYTHON_PYCRYPTODOMEX_VERSION = 3.13.0 > +PYTHON_PYCRYPTODOMEX_VERSION = 3.14.0 > PYTHON_PYCRYPTODOMEX_SOURCE = pycryptodomex-$(PYTHON_PYCRYPTODOMEX_VERSION).tar.gz > -PYTHON_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/7a/21/f399ba8dfd6e40eee444151af3237af22788b8b16077c75ec0419125f619 > +PYTHON_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/a6/b3/a5e59cd3ad65d4dc470a3a63381d0495885cf1ac7659c83c6bc9e9e79df6 > PYTHON_PYCRYPTODOMEX_SETUP_TYPE = setuptools > PYTHON_PYCRYPTODOMEX_LICENSE = \ > BSD-2-Clause, \ > diff --git a/package/python3-pycryptodomex/python3-pycryptodomex.mk b/package/python3-pycryptodomex/python3-pycryptodomex.mk > index 06a46cdf63..35469df85a 100644 > --- a/package/python3-pycryptodomex/python3-pycryptodomex.mk > +++ b/package/python3-pycryptodomex/python3-pycryptodomex.mk > @@ -5,9 +5,9 @@ > ################################################################################ > > # Please keep in sync with package/python-pycryptodomex/python-pycryptodomex.mk > -PYTHON3_PYCRYPTODOMEX_VERSION = 3.13.0 > +PYTHON3_PYCRYPTODOMEX_VERSION = 3.14.0 > PYTHON3_PYCRYPTODOMEX_SOURCE = pycryptodomex-$(PYTHON3_PYCRYPTODOMEX_VERSION).tar.gz > -PYTHON3_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/7a/21/f399ba8dfd6e40eee444151af3237af22788b8b16077c75ec0419125f619 > +PYTHON3_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/a6/b3/a5e59cd3ad65d4dc470a3a63381d0495885cf1ac7659c83c6bc9e9e79df6 > PYTHON3_PYCRYPTODOMEX_SETUP_TYPE = setuptools > PYTHON3_PYCRYPTODOMEX_LICENSE = \ > BSD-2-Clause, \ From arnout at mind.be Sun Feb 13 11:24:02 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 12:24:02 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: add Giulio Benetti to cryptsetup package Message-ID: <20220213112133.553D282821@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a5e72ca9e7e490c2f94c574b29f34d17cc79d816 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 9e3142d8a4..d4b8da55ac 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1095,6 +1095,7 @@ F: configs/asus_tinker_rk3288_defconfig F: configs/olimex_a* F: package/at/ F: package/binutils/ +F: package/cryptsetup/ F: package/erlang-jiffy/ F: package/gcc/ F: package/harfbuzz/ From arnout at mind.be Sun Feb 13 11:24:02 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 12:24:02 +0100 Subject: [Buildroot] [git commit] package/cryptsetup: bump version to 2.4.3 Message-ID: <20220213112133.4CC688141E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=13472596a781b3ca622fe8528fe9d571811125f8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/cryptsetup/cryptsetup.hash | 2 +- package/cryptsetup/cryptsetup.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cryptsetup/cryptsetup.hash b/package/cryptsetup/cryptsetup.hash index b3bb859bdc..dce2686d31 100644 --- a/package/cryptsetup/cryptsetup.hash +++ b/package/cryptsetup/cryptsetup.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.4/sha256sums.asc -sha256 170cc2326a9daeeeb578579176bd10d4a60ee5c4fc5bc69018ce67dafc540b9c cryptsetup-2.4.2.tar.xz +sha256 fc0df945188172264ec5bf1d0bda08264fadc8a3f856d47eba91f31fe354b507 cryptsetup-2.4.3.tar.xz sha256 45670cce8b6a0ddd66c8016cd8ccef6cd71f35717cbacc7f1e895b3855207b33 COPYING sha256 8c33cc37871654ec7ed87e6fbb896c8cf33ef5ef05b1611a5aed857596ffafa5 COPYING.LGPL diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index 9cfd647ac6..2e06047c56 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -5,7 +5,7 @@ ################################################################################ CRYPTSETUP_VERSION_MAJOR = 2.4 -CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).2 +CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).3 CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR) CRYPTSETUP_DEPENDENCIES = \ From arnout at mind.be Sun Feb 13 11:24:02 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 12:24:02 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: remove Martin Hicks from file Message-ID: <20220213112133.5EDEA82817@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d06bf4a9d73e7a05e651e737e26abac86080878e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Martin Hicks asked to not maintain cryptsetup anymore: https://lists.buildroot.org/pipermail/buildroot/2022-February/635413.html Also he doesn't mantain any other package, so let's remove him from this file. Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 3 --- 1 file changed, 3 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index d4b8da55ac..ac702d8d0f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1849,9 +1849,6 @@ F: package/rpi-firmware/ F: package/tzdata/ F: package/zic/ -N: Martin Hicks -F: package/cryptsetup/ - N: Martin Kepplinger F: package/tslib/ F: package/x11r7/xdriver_xf86-input-tslib/ From arnout at mind.be Sun Feb 13 11:27:47 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 12:27:47 +0100 Subject: [Buildroot] [git commit] package/python-pycryptodomex: bump to version 3.14.0 Message-ID: <20220213112133.714A182821@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5e19ca4cf302c772e5a6725e7d2ab80b7b3978da 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-pycryptodomex/python-pycryptodomex.hash | 4 ++-- package/python-pycryptodomex/python-pycryptodomex.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pycryptodomex/python-pycryptodomex.hash b/package/python-pycryptodomex/python-pycryptodomex.hash index 9512f185a8..920cec2518 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 dcf0d13044c700410bdce31a5afdf6d0 pycryptodomex-3.13.0.tar.gz -sha256 63443230247837dd03c5d4028cae5cb2e6793a9ae110e321798bee48a04ff3e9 pycryptodomex-3.13.0.tar.gz +md5 18f571832bbfbf0f4516ccef009f2dfb pycryptodomex-3.14.0.tar.gz +sha256 2d8bda8f949b79b78b293706aa7fc1e5c171c62661252bfdd5d12c70acd03282 pycryptodomex-3.14.0.tar.gz # Locally computed sha256 checksums sha256 4e04660d77c1c64e89d79537919fb8240fa21484a7e3db29f358b2c7f84ea073 LICENSE.rst sha256 8e563c767164faa0831a333b57d23d4311cf566eb1b15d93250f4606be4eb549 Doc/LEGAL/COPYRIGHT.pycrypto diff --git a/package/python-pycryptodomex/python-pycryptodomex.mk b/package/python-pycryptodomex/python-pycryptodomex.mk index d752122550..e3cc11afda 100644 --- a/package/python-pycryptodomex/python-pycryptodomex.mk +++ b/package/python-pycryptodomex/python-pycryptodomex.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYCRYPTODOMEX_VERSION = 3.13.0 +PYTHON_PYCRYPTODOMEX_VERSION = 3.14.0 PYTHON_PYCRYPTODOMEX_SOURCE = pycryptodomex-$(PYTHON_PYCRYPTODOMEX_VERSION).tar.gz -PYTHON_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/7a/21/f399ba8dfd6e40eee444151af3237af22788b8b16077c75ec0419125f619 +PYTHON_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/a6/b3/a5e59cd3ad65d4dc470a3a63381d0495885cf1ac7659c83c6bc9e9e79df6 PYTHON_PYCRYPTODOMEX_SETUP_TYPE = setuptools PYTHON_PYCRYPTODOMEX_LICENSE = \ BSD-2-Clause, \ From arnout at mind.be Sun Feb 13 11:24:02 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 12:24:02 +0100 Subject: [Buildroot] [git commit] package/doc-asciidoc: fix build for out-of-tree documents Message-ID: <20220213112133.4203E82287@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4f59ababc018ee2a41b11b4f0723b2d54fa6b91b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The doc-asciidoc infra allows document to define sources and resources, and those can only be local (there is no download support for documents). The currently documented way to specify those is to use the $(pkgdir) macro to point to the document sources and resources when they are along the .mk. However, this works only for sources and not for resources. Indeed, sources are used to generate Makefile dependency rules, so $(pkgdir) is expanded and evaluated during the call to $(doc-asciidoc), while resources are expanded and evaluated when the rules are executed, which always happen after all the parsing has be done, at which point $(pkgdir) expands to the last Makefile that was parsed, which is always Buildroot's own manual. This went unnoticed so far because Buildroot's manual is 1) the last to be parsed, and 2) not using $(pkgdir) anyway. Additionally, $(pkgdir) is mostly an internal macro, that is, as this change demonstrates, difficult to use, and thus should not be used, in packages or in documents. We fix that by introducing $(FOO_DOCDIR), similar to $(FOO_PKGDIR), which points to the document directory. We choose not to name the variable FOO_PKGDIR, because it semantically is not a package. As a consequence, the last argument to the doc-asciidoc macro is now superfluous, so it is removed, which causes a little bit of churn in the main macro. As a further consequence, the third argument in the inner macro is no longer needed either, so it too is removed, which causes a bit more churn yet in the inner macro. Signed-off-by: Yann E. MORIN Cc: Frederic GARDES Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- docs/manual/adding-packages-asciidoc.txt | 17 ++++-- package/doc-asciidoc.mk | 90 ++++++++++++++++---------------- 2 files changed, 59 insertions(+), 48 deletions(-) diff --git a/docs/manual/adding-packages-asciidoc.txt b/docs/manual/adding-packages-asciidoc.txt index f9688b36c7..0bfe99d22e 100644 --- a/docs/manual/adding-packages-asciidoc.txt +++ b/docs/manual/adding-packages-asciidoc.txt @@ -39,7 +39,7 @@ Here is an example to render a simple AsciiDoc document. 04: # 05: ################################################################################ 06: -07: FOO_SOURCES = $(sort $(wildcard $(pkgdir)/*)) +07: FOO_SOURCES = $(sort $(wildcard $(FOO_DOCDIR)/*)) 08: $(eval $(call asciidoc-document)) ---- @@ -85,6 +85,17 @@ various steps: * +FOO_CHECK_DEPENDENCIES__HOOKS+, to run additional tests for the specified format ++ (see the list of rendered formats, above). +Buildroot sets the following variable that can be used in the definitions +above: + +* +$(FOO_DOCDIR)+, similar to +$(FOO_PKGDIR)+, contains the path to the + directory containing +foo.mk+. It can be used to refer to the document + sources, and can be used in the hooks, especially the post-rsync hook + if parts of the documentation needs to be generated. + +* +$(@D)+, as for traditional packages, contains the path to the directory + where the document will be copied and built. + Here is a complete example that uses all variables and all hooks: ---- @@ -94,8 +105,8 @@ Here is a complete example that uses all variables and all hooks: 04: # 05: ################################################################################ 06: -07: FOO_SOURCES = $(sort $(wildcard $(pkgdir)/*)) -08: FOO_RESOURCES = $(sort $(wildcard $(pkgdir)/ressources)) +07: FOO_SOURCES = $(sort $(wildcard $(FOO_DOCDIR)/*)) +08: FOO_RESOURCES = $(sort $(wildcard $(FOO_DOCDIR)/ressources)) 09: 10: define FOO_GEN_EXTRA_DOC 11: /path/to/generate-script --outdir=$(@D) diff --git a/package/doc-asciidoc.mk b/package/doc-asciidoc.mk index be92496c2e..2bd761edfb 100644 --- a/package/doc-asciidoc.mk +++ b/package/doc-asciidoc.mk @@ -42,12 +42,11 @@ BR_ASCIIDOC_CONF = docs/conf/asciidoc.conf # argument 1 is the name of the document and the top-level asciidoc file must # have the same name # argument 2 is the uppercase name of the document -# argument 3 is the directory containing the document -# argument 4 is the type of document to generate (-f argument of a2x) -# argument 5 is the document type as used in the make target -# argument 6 is the output file extension for the document type -# argument 7 is the human text for the document type -# argument 8 (optional) are extra arguments for a2x +# argument 3 is the type of document to generate (-f argument of a2x) +# argument 4 is the document type as used in the make target +# argument 5 is the output file extension for the document type +# argument 6 is the human text for the document type +# argument 7 (optional) are extra arguments for a2x # # The variable _SOURCES defines the dependencies. # @@ -55,55 +54,55 @@ BR_ASCIIDOC_CONF = docs/conf/asciidoc.conf # all variable references except the arguments must be $$-quoted. ################################################################################ define ASCIIDOC_INNER -$(1): $(1)-$(5) -.PHONY: $(1)-$(5) -$(1)-$(5): $$(O)/docs/$(1)/$(1).$(6) +$(1): $(1)-$(4) +.PHONY: $(1)-$(4) +$(1)-$(4): $$(O)/docs/$(1)/$(1).$(5) -asciidoc-check-dependencies-$(5): -.PHONY: $(1)-check-dependencies-$(5) +asciidoc-check-dependencies-$(4): +.PHONY: $(1)-check-dependencies-$(4) # Single line, because splitting a foreach is not easy... -$(1)-check-dependencies-$(5): asciidoc-check-dependencies-$(5) - $$(Q)$$(foreach hook,$$($(2)_CHECK_DEPENDENCIES_$$(call UPPERCASE,$(5))_HOOKS),$$(call $$(hook))$$(sep)) +$(1)-check-dependencies-$(4): asciidoc-check-dependencies-$(4) + $$(Q)$$(foreach hook,$$($(2)_CHECK_DEPENDENCIES_$$(call UPPERCASE,$(4))_HOOKS),$$(call $$(hook))$$(sep)) # Include Buildroot's AsciiDoc configuration first: # - generic configuration, # - then output-specific configuration ifneq ($$(wildcard $$(BR_ASCIIDOC_CONF)),) -$(2)_$(4)_ASCIIDOC_OPTS += -f $$(BR_ASCIIDOC_CONF) +$(2)_$(3)_ASCIIDOC_OPTS += -f $$(BR_ASCIIDOC_CONF) endif -BR_$(4)_ASCIIDOC_CONF = docs/conf/asciidoc-$(4).conf -ifneq ($$(wildcard $$(BR_$(4)_ASCIIDOC_CONF)),) -$(2)_$(4)_ASCIIDOC_OPTS += -f $$(BR_$(4)_ASCIIDOC_CONF) +BR_$(3)_ASCIIDOC_CONF = docs/conf/asciidoc-$(3).conf +ifneq ($$(wildcard $$(BR_$(3)_ASCIIDOC_CONF)),) +$(2)_$(3)_ASCIIDOC_OPTS += -f $$(BR_$(3)_ASCIIDOC_CONF) endif # Then include the document's AsciiDoc configuration: # - generic configuration, # - then output-specific configuration ifneq ($$(wildcard $$($(2)_ASCIIDOC_CONF)),) -$(2)_$(4)_ASCIIDOC_OPTS += -f $$($(2)_ASCIIDOC_CONF) +$(2)_$(3)_ASCIIDOC_OPTS += -f $$($(2)_ASCIIDOC_CONF) endif -$(2)_$(4)_ASCIIDOC_CONF = $(3)/asciidoc-$(4).conf -ifneq ($$(wildcard $$($(2)_$(4)_ASCIIDOC_CONF)),) -$(2)_$(4)_ASCIIDOC_OPTS += -f $$($(2)_$(4)_ASCIIDOC_CONF) +$(2)_$(3)_ASCIIDOC_CONF = $$($(2)_DOCDIR)/asciidoc-$(3).conf +ifneq ($$(wildcard $$($(2)_$(3)_ASCIIDOC_CONF)),) +$(2)_$(3)_ASCIIDOC_OPTS += -f $$($(2)_$(3)_ASCIIDOC_CONF) endif # Handle a2x warning about --destination-dir option only applicable to HTML # based outputs. So: # - use the --destination-dir option if possible (html and split-html), # - otherwise copy the generated document to the output directory -$(2)_$(4)_A2X_OPTS = -ifneq ($$(filter $(5),html split-html),) -$(2)_$(4)_A2X_OPTS += --destination-dir="$$(@D)" +$(2)_$(3)_A2X_OPTS = +ifneq ($$(filter $(4),html split-html),) +$(2)_$(3)_A2X_OPTS += --destination-dir="$$(@D)" else -define $(2)_$(4)_INSTALL_CMDS - $$(Q)cp -f $$(BUILD_DIR)/docs/$(1)/$(1).$(6) $$(@D) +define $(2)_$(3)_INSTALL_CMDS + $$(Q)cp -f $$(BUILD_DIR)/docs/$(1)/$(1).$(5) $$(@D) endef endif -$$(O)/docs/$(1)/$(1).$(6): export TZ=UTC +$$(O)/docs/$(1)/$(1).$(5): export TZ=UTC -ifeq ($(6)-$$(GENDOC_XSLTPROC_IS_BROKEN),pdf-y) -$$(O)/docs/$(1)/$(1).$(6): +ifeq ($(5)-$$(GENDOC_XSLTPROC_IS_BROKEN),pdf-y) +$$(O)/docs/$(1)/$(1).$(5): $$(warning PDF generation is disabled because of a bug in \ xsltproc. To be able to generate a PDF, you should \ build xsltproc from the libxslt sources >=1.1.29 and pass it \ @@ -112,20 +111,20 @@ $$(O)/docs/$(1)/$(1).$(6): else # -r $(@D) is there for documents that use external filters; those filters # generate code at the same location it finds the document's source files. -$$(O)/docs/$(1)/$(1).$(6): $$($(2)_SOURCES) \ +$$(O)/docs/$(1)/$(1).$(5): $$($(2)_SOURCES) \ $(1)-check-dependencies \ - $(1)-check-dependencies-$(5) \ + $(1)-check-dependencies-$(4) \ $(1)-prepare-sources - $$(Q)$$(call MESSAGE,"Generating $(7) $(1)...") + $$(Q)$$(call MESSAGE,"Generating $(6) $(1)...") $$(Q)mkdir -p $$(@D) - $$(Q)a2x $(8) -f $(4) -d book -L \ + $$(Q)a2x $(7) -f $(3) -d book -L \ $$(foreach r,$$($(2)_RESOURCES) $$(@D), \ --resource="$$(abspath $$(r))") \ - $$($(2)_$(4)_A2X_OPTS) \ - --asciidoc-opts="$$($(2)_$(4)_ASCIIDOC_OPTS)" \ + $$($(2)_$(3)_A2X_OPTS) \ + --asciidoc-opts="$$($(2)_$(3)_ASCIIDOC_OPTS)" \ $$(BUILD_DIR)/docs/$(1)/$(1).txt # install the generated document - $$($(2)_$(4)_INSTALL_CMDS) + $$($(2)_$(3)_INSTALL_CMDS) endif endef @@ -135,13 +134,14 @@ endef # argument 1 is the lowercase name of the document; the document's main file # must have the same name, with the .txt extension # argument 2 is the uppercase name of the document -# argument 3 is the directory containing the document's sources # # The variable _SOURCES defines the dependencies. # The variable _RESOURCES defines where the document's # resources, such as images, are located; must be an absolute path. ################################################################################ define ASCIIDOC +$(2)_DOCDIR = $(pkgdir) + # Single line, because splitting a foreach is not easy... .PHONY: $(1)-check-dependencies $(1)-check-dependencies: asciidoc-check-dependencies $$($(2)_DEPENDENCIES) @@ -153,29 +153,29 @@ $(1)-check-dependencies: asciidoc-check-dependencies $$($(2)_DEPENDENCIES) $$(BUILD_DIR)/docs/$(1)/.stamp_doc_rsynced: $$(Q)$$(call MESSAGE,"Preparing the $(1) sources...") $$(Q)mkdir -p $$(@D) - $$(Q)rsync -a $(3) $$(@D) + $$(Q)rsync -a $$($(2)_DOCDIR) $$(@D) $$(Q)$$(foreach hook,$$($(2)_POST_RSYNC_HOOKS),$$(call $$(hook))$$(sep)) .PHONY: $(1)-prepare-sources $(1)-prepare-sources: $$(BUILD_DIR)/docs/$(1)/.stamp_doc_rsynced -$(2)_ASCIIDOC_CONF = $(3)/asciidoc.conf +$(2)_ASCIIDOC_CONF = $$($(2)_DOCDIR)/asciidoc.conf -$(call ASCIIDOC_INNER,$(1),$(2),$(3),xhtml,html,html,HTML,\ +$(call ASCIIDOC_INNER,$(1),$(2),xhtml,html,html,HTML,\ --xsltproc-opts "--stringparam toc.section.depth 1") -$(call ASCIIDOC_INNER,$(1),$(2),$(3),chunked,split-html,chunked,split HTML,\ +$(call ASCIIDOC_INNER,$(1),$(2),chunked,split-html,chunked,split HTML,\ --xsltproc-opts "--stringparam toc.section.depth 1") # dblatex needs to pass the '--maxvars ...' option to xsltproc to prevent it # from reaching the template recursion limit when processing the (long) target # package table and bailing out. -$(call ASCIIDOC_INNER,$(1),$(2),$(3),pdf,pdf,pdf,PDF,\ +$(call ASCIIDOC_INNER,$(1),$(2),pdf,pdf,pdf,PDF,\ --dblatex-opts "-P latex.output.revhistory=0 -x '--maxvars 100000'") -$(call ASCIIDOC_INNER,$(1),$(2),$(3),text,text,text,text) +$(call ASCIIDOC_INNER,$(1),$(2),text,text,text,text) -$(call ASCIIDOC_INNER,$(1),$(2),$(3),epub,epub,epub,ePUB) +$(call ASCIIDOC_INNER,$(1),$(2),epub,epub,epub,ePUB) clean: $(1)-clean $(1)-clean: @@ -187,4 +187,4 @@ endef # asciidoc-document -- the target generator macro for asciidoc documents ################################################################################ -asciidoc-document = $(call ASCIIDOC,$(pkgname),$(call UPPERCASE,$(pkgname)),$(pkgdir)) +asciidoc-document = $(call ASCIIDOC,$(pkgname),$(call UPPERCASE,$(pkgname))) From arnout at mind.be Sun Feb 13 11:24:02 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 12:24:02 +0100 Subject: [Buildroot] [git commit] package/libglfw: bump to 3.3.6 and enable Wayland/libGLES support Message-ID: <20220213112133.681EE82287@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3cd9bb4f2a91d3739c5da96f5e4dd37d3ae13799 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Andre Renaud [Arnout: reorder .mk so conditional parts come after unconditional, and use += within conditions] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libglfw/Config.in | 19 ++++++++++--------- package/libglfw/libglfw.hash | 2 +- package/libglfw/libglfw.mk | 21 ++++++++++++++++++--- 3 files changed, 29 insertions(+), 13 deletions(-) diff --git a/package/libglfw/Config.in b/package/libglfw/Config.in index 06f4376453..281b55df7b 100644 --- a/package/libglfw/Config.in +++ b/package/libglfw/Config.in @@ -1,17 +1,18 @@ config BR2_PACKAGE_LIBGLFW bool "libglfw" - depends on BR2_PACKAGE_XORG7 - depends on BR2_PACKAGE_HAS_LIBGL - select BR2_PACKAGE_XLIB_LIBXCURSOR - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_XLIB_LIBXI - select BR2_PACKAGE_XLIB_LIBXINERAMA - select BR2_PACKAGE_XLIB_LIBXRANDR + depends on BR2_PACKAGE_XORG7 || BR2_PACKAGE_WAYLAND + depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES + select BR2_PACKAGE_XLIB_LIBXCURSOR if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBXI if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBXINERAMA if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_XORG7 help GLFW is an Open Source, multi-platform library for creating windows with OpenGL contexts and receiving input and events. http://www.glfw.org -comment "libglfw depends on X.org and needs an OpenGL backend" - depends on !BR2_PACKAGE_XORG7 || !BR2_PACKAGE_HAS_LIBGL +comment "libglfw depends on X.org or Wayland and an OpenGL or GLES backend" + depends on !(BR2_PACKAGE_XORG7 || BR2_PACKAGE_WAYLAND) + depends on !(BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES) diff --git a/package/libglfw/libglfw.hash b/package/libglfw/libglfw.hash index c21a595bbc..5bffc55d26 100644 --- a/package/libglfw/libglfw.hash +++ b/package/libglfw/libglfw.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 98768e12e615fbe9f3386f5bbfeb91b5a3b45a8c4c77159cef06b1f6ff749537 libglfw-3.3.2.tar.gz +sha256 ed07b90e334dcd39903e6288d90fa1ae0cf2d2119fec516cf743a0a404527c02 libglfw-3.3.6.tar.gz sha256 149704059b5d0bf551637e50042dd4de9c2cae921021f6636298911e3a5f9462 LICENSE.md diff --git a/package/libglfw/libglfw.mk b/package/libglfw/libglfw.mk index 63d2a88bf8..2ba31fd674 100644 --- a/package/libglfw/libglfw.mk +++ b/package/libglfw/libglfw.mk @@ -4,11 +4,9 @@ # ################################################################################ -LIBGLFW_VERSION = 3.3.2 +LIBGLFW_VERSION = 3.3.6 LIBGLFW_SITE = $(call github,glfw,glfw,$(LIBGLFW_VERSION)) LIBGLFW_INSTALL_STAGING = YES -LIBGLFW_DEPENDENCIES = libgl xlib_libXcursor xlib_libXext \ - xlib_libXi xlib_libXinerama xlib_libXrandr LIBGLFW_LICENSE = Zlib LIBGLFW_LICENSE_FILES = LICENSE.md @@ -17,6 +15,23 @@ LIBGLFW_CONF_OPTS += \ -DGLFW_BUILD_TESTS=OFF \ -DGLFW_BUILD_DOCS=OFF +ifeq ($(BR2_PACKAGE_XORG7),y) +LIBGLFW_DEPENDENCIES += xlib_libXcursor xlib_libXext \ + xlib_libXi xlib_libXinerama xlib_libXrandr +endif + +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) +LIBGLFW_DEPENDENCIES += libgl +endif + +ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) +LIBGLFW_DEPENDENCIES += libgles +endif + +ifeq ($(BR2_PACKAGE_WAYLAND),y) +LIBGLFW_CONF_OPTS += -DGLFW_USE_WAYLAND=1 +endif + ifeq ($(BR2_PACKAGE_XLIB_LIBXXF86VM),y) LIBGLFW_DEPENDENCIES += xlib_libXxf86vm endif From fontaine.fabrice at gmail.com Sun Feb 13 11:33:32 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 13 Feb 2022 12:33:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/strongswan: security bump to version 5.9.5 Message-ID: <20220213113332.1056370-1-fontaine.fabrice@gmail.com> Fixed a vulnerability in the EAP client implementation that was caused by incorrectly handling early EAP-Success messages. It may allow to bypass the client and in some scenarios even the server authentication, or could lead to a denial-of-service attack. This vulnerability has been registered as CVE-2021-45079: https://www.strongswan.org/blog/2022/01/24/strongswan-vulnerability-(cve-2021-45079).html https://github.com/strongswan/strongswan/releases/tag/5.9.5 Signed-off-by: Fabrice Fontaine --- package/strongswan/strongswan.hash | 6 +++--- package/strongswan/strongswan.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/strongswan/strongswan.hash b/package/strongswan/strongswan.hash index 69b3547f91..aca7ddf5cd 100644 --- a/package/strongswan/strongswan.hash +++ b/package/strongswan/strongswan.hash @@ -1,7 +1,7 @@ -# From http://download.strongswan.org/strongswan-5.9.4.tar.bz2.md5 -md5 9c387eb77f0159fdefbcf7e81c905c35 strongswan-5.9.4.tar.bz2 +# From http://download.strongswan.org/strongswan-5.9.5.tar.bz2.md5 +md5 53005324e3cba8592f1fb958b1c2d0e5 strongswan-5.9.5.tar.bz2 # Calculated based on the hash above -sha256 45fdf1a4c2af086d8ff5b76fd7b21d3b6f0890f365f83bf4c9a75dda26887518 strongswan-5.9.4.tar.bz2 +sha256 983e4ef4a4c6c9d69f5fe6707c7fe0b2b9a9291943bbf4e008faab6bf91c0bdd strongswan-5.9.5.tar.bz2 # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 2292e21797754548dccdef9eef6aee7584e552fbd890fa914e1de8d3577d23f0 LICENSE diff --git a/package/strongswan/strongswan.mk b/package/strongswan/strongswan.mk index 2891e5aa5e..95079aceb3 100644 --- a/package/strongswan/strongswan.mk +++ b/package/strongswan/strongswan.mk @@ -4,7 +4,7 @@ # ################################################################################ -STRONGSWAN_VERSION = 5.9.4 +STRONGSWAN_VERSION = 5.9.5 STRONGSWAN_SOURCE = strongswan-$(STRONGSWAN_VERSION).tar.bz2 STRONGSWAN_SITE = http://download.strongswan.org STRONGSWAN_LICENSE = GPL-2.0+ -- 2.34.1 From arnout at mind.be Sun Feb 13 11:35:33 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 12:35:33 +0100 Subject: [Buildroot] [PATCH] configs/roc_pc_rk3399_defconfig: expand rootfs size to 120M In-Reply-To: <20220202171035.1740791-2-giulio.benetti@benettiengineering.com> References: <20220202171035.1740791-1-giulio.benetti@benettiengineering.com> <20220202171035.1740791-2-giulio.benetti@benettiengineering.com> Message-ID: On 02/02/2022 18:10, Giulio Benetti wrote: > Default 60M for rootfs are not enough and generate a build failure, so > let's expand rootfs size to 120M. Did you find out _why_ 64M wasn't enough for just the kernel and busybox? Is it because of all the stupid modules in the default arm64 defconfig? But most other arm64 defconfigs don't seem to need this... > > Signed-off-by: Giulio Benetti > --- > configs/roc_pc_rk3399_defconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/configs/roc_pc_rk3399_defconfig b/configs/roc_pc_rk3399_defconfig > index dfbc5e4f47..ae7cf19a80 100644 > --- a/configs/roc_pc_rk3399_defconfig > +++ b/configs/roc_pc_rk3399_defconfig > @@ -45,7 +45,7 @@ BR2_TARGET_GENERIC_HOSTNAME="roc-rk3399-pc" > BR2_TARGET_GENERIC_ISSUE="Welcome to ROC-RK3399-PC!" > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > -BR2_TARGET_ROOTFS_EXT2_SIZE="64M" > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > BR2_PACKAGE_HOST_DOSFSTOOLS=y > BR2_PACKAGE_HOST_GENIMAGE=y > BR2_PACKAGE_HOST_MTOOLS=y Unrelated by this patch, but the image doesn't have a FAT partition so dosfstols and mtools aren't needed. Regards, Arnout From fontaine.fabrice at gmail.com Sun Feb 13 11:42:14 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 13 Feb 2022 12:42:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/libbpf: add LIBBPF_CPE_ID_VENDOR Message-ID: <20220213114214.1057171-1-fontaine.fabrice@gmail.com> cpe:2.3:a:libbpf_project:libbpf is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Alibbpf_project%3Alibbpf Signed-off-by: Fabrice Fontaine --- package/libbpf/libbpf.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libbpf/libbpf.mk b/package/libbpf/libbpf.mk index 6750b063c0..06f3f3475a 100644 --- a/package/libbpf/libbpf.mk +++ b/package/libbpf/libbpf.mk @@ -8,6 +8,7 @@ LIBBPF_VERSION = 0.6.1 LIBBPF_SITE = $(call github,libbpf,libbpf,v$(LIBBPF_VERSION)) LIBBPF_LICENSE = GPL-2.0, LGPL-2.1, BSD-2-Clause LIBBPF_LICENSE_FILES = LICENSE LICENSE.BSD-2-Clause LICENSE.LGPL-2.1 +LIBBPF_CPE_ID_VENDOR = libbpf_project LIBBPF_DEPENDENCIES = host-bison host-flex host-pkgconf elfutils zlib LIBBPF_INSTALL_STAGING = YES -- 2.34.1 From peter at korsgaard.com Sun Feb 13 11:43:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Feb 2022 12:43:45 +0100 Subject: [Buildroot] [PATCH v6 1/8] package/webp: enable host build In-Reply-To: <20220205201837.3324085-1-james.hilliard1@gmail.com> (James Hilliard's message of "Sat, 5 Feb 2022 13:18:30 -0700") References: <20220205201837.3324085-1-james.hilliard1@gmail.com> Message-ID: <87wnhzkn4e.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > This will be needed by qt5webengine. > Signed-off-by: James Hilliard > --- > package/webp/webp.mk | 5 +++++ > 1 file changed, 5 insertions(+) > 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 What about the other configure options? It should also explicitly disable gif/gl/png/jpeg/tiff support (unless you need it?) Committed with that fixed, thanks. I also pushed a cleanup patch to use --enable/--disable for png/jpeg/tiff for the target build. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 13 11:43:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Feb 2022 12:43:56 +0100 Subject: [Buildroot] [git commit] package/webp: enable host build Message-ID: <20220213113628.CB30B82578@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=78a3807295f7436297056aab6ff4916bdb0f8289 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This will be needed by qt5webengine. Signed-off-by: James Hilliard [Peter: explicitly disable gif/gl/jpeg/png/tiff support] Signed-off-by: Peter Korsgaard --- package/webp/webp.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package/webp/webp.mk b/package/webp/webp.mk index d1462426c6..e8d204919c 100644 --- a/package/webp/webp.mk +++ b/package/webp/webp.mk @@ -19,6 +19,15 @@ WEBP_CONF_OPTS += \ --with-tiffincludedir=$(STAGING_DIR)/usr/include \ --with-tifflibdir=$(STAGING_DIR)/usr/lib +HOST_WEBP_CONF_OPTS += \ + --enable-libwebpdemux \ + --enable-libwebpmux \ + --disable-gif \ + --disable-gl \ + --disable-jpeg \ + --disable-png \ + --disable-tiff + ifeq ($(BR2_PACKAGE_WEBP_DEMUX),y) WEBP_CONF_OPTS += --enable-libwebpdemux else @@ -56,3 +65,4 @@ WEBP_DEPENDENCIES += $(if $(BR2_PACKAGE_JPEG),jpeg) WEBP_DEPENDENCIES += $(if $(BR2_PACKAGE_TIFF),tiff) $(eval $(autotools-package)) +$(eval $(host-autotools-package)) From peter at korsgaard.com Sun Feb 13 11:43:57 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Feb 2022 12:43:57 +0100 Subject: [Buildroot] [git commit] package/webp: use configure options for jpeg/png/tiff support Message-ID: <20220213113628.DAF5082745@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4284eea7c9f66b22a7f87a4edd827692f88afed4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Webp nowadays has explicit configure options for jpeg/png/tiff, so use those to explicitly enable/disable support. Signed-off-by: Peter Korsgaard --- package/webp/webp.mk | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/package/webp/webp.mk b/package/webp/webp.mk index e8d204919c..d725b44438 100644 --- a/package/webp/webp.mk +++ b/package/webp/webp.mk @@ -13,12 +13,6 @@ WEBP_CPE_ID_VENDOR = webmproject WEBP_CPE_ID_PRODUCT = libwebp WEBP_INSTALL_STAGING = YES -WEBP_CONF_OPTS += \ - --with-jpegincludedir=$(STAGING_DIR)/usr/include \ - --with-jpeglibdir=$(STAGING_DIR)/usr/lib \ - --with-tiffincludedir=$(STAGING_DIR)/usr/include \ - --with-tifflibdir=$(STAGING_DIR)/usr/lib - HOST_WEBP_CONF_OPTS += \ --enable-libwebpdemux \ --enable-libwebpmux \ @@ -47,6 +41,16 @@ else WEBP_CONF_OPTS += --disable-gif endif +ifeq ($(BR2_PACKAGE_JPEG),y) +WEBP_DEPENDENCIES += jpeg +WEBP_CONF_OPTS += \ + --enable-jpeg \ + --with-jpegincludedir=$(STAGING_DIR)/usr/include \ + --with-jpeglibdir=$(STAGING_DIR)/usr/lib +else +WEBP_CONF_OPTS += --disable-jpeg +endif + ifeq ($(BR2_PACKAGE_LIBFREEGLUT),y) WEBP_DEPENDENCIES += libfreeglut WEBP_CONF_OPTS += --enable-gl @@ -56,13 +60,21 @@ endif ifeq ($(BR2_PACKAGE_LIBPNG),y) WEBP_DEPENDENCIES += libpng +WEBP_CONF_OPTS += --enable-png WEBP_CONF_ENV += ac_cv_path_LIBPNG_CONFIG=$(STAGING_DIR)/usr/bin/libpng-config else -WEBP_CONF_ENV += ac_cv_path_LIBPNG_CONFIG=/bin/false +WEBP_CONF_OPTS += --disable-png endif -WEBP_DEPENDENCIES += $(if $(BR2_PACKAGE_JPEG),jpeg) -WEBP_DEPENDENCIES += $(if $(BR2_PACKAGE_TIFF),tiff) +ifeq ($(BR2_PACKAGE_TIFF),y) +WEBP_DEPENDENCIES += tiff +WEBP_CONF_OPTS += \ + --enable-tiff \ + --with-tiffincludedir=$(STAGING_DIR)/usr/include \ + --with-tifflibdir=$(STAGING_DIR)/usr/lib +else +WEBP_CONF_OPTS += --disable-tiff +endif $(eval $(autotools-package)) $(eval $(host-autotools-package)) From peter at korsgaard.com Sun Feb 13 11:43:57 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Feb 2022 12:43:57 +0100 Subject: [Buildroot] [git commit] package/webp: explicitly disable SDL support Message-ID: <20220213113628.EC60F82578@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=af54104cbb38a2d8843f1a55e3f4283cc9a5aca9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Webp has optional SDL support. Explicitly disable it for now. Signed-off-by: Peter Korsgaard --- package/webp/webp.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/webp/webp.mk b/package/webp/webp.mk index d725b44438..f23e1c92e1 100644 --- a/package/webp/webp.mk +++ b/package/webp/webp.mk @@ -13,6 +13,9 @@ WEBP_CPE_ID_VENDOR = webmproject WEBP_CPE_ID_PRODUCT = libwebp WEBP_INSTALL_STAGING = YES +WEBP_CONF_OPTS += \ + --disable-sdl + HOST_WEBP_CONF_OPTS += \ --enable-libwebpdemux \ --enable-libwebpmux \ @@ -20,6 +23,7 @@ HOST_WEBP_CONF_OPTS += \ --disable-gl \ --disable-jpeg \ --disable-png \ + --disable-sdl \ --disable-tiff ifeq ($(BR2_PACKAGE_WEBP_DEMUX),y) From arnout at mind.be Sun Feb 13 11:44:29 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 12:44:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/sconeserver: fix build with icu and libxml2 In-Reply-To: <20220202173306.42559-1-fontaine.fabrice@gmail.com> References: <20220202173306.42559-1-fontaine.fabrice@gmail.com> Message-ID: <19a05780-b4ed-08a5-8a95-4320fe9e7f42@mind.be> On 02/02/2022 18:33, Fabrice Fontaine wrote: > Fix the following build failure raised since addition of icu support in > libxml2 through commit 49d7c85421e87d9d762be9352805cb47a2f0bbeb: > > In file included from /home/peko/autobuild/instance-1/output-1/host/mips64el-buildroot-linux-gnu/sysroot/usr/include/unicode/ptypes.h:52:0, > from /home/peko/autobuild/instance-1/output-1/host/mips64el-buildroot-linux-gnu/sysroot/usr/include/unicode/umachine.h:46, > from /home/peko/autobuild/instance-1/output-1/host/mips64el-buildroot-linux-gnu/sysroot/usr/include/unicode/utypes.h:38, > from /home/peko/autobuild/instance-1/output-1/host/mips64el-buildroot-linux-gnu/sysroot/usr/include/unicode/ucnv_err.h:88, > from /home/peko/autobuild/instance-1/output-1/host/mips64el-buildroot-linux-gnu/sysroot/usr/include/unicode/ucnv.h:51, > from /home/peko/autobuild/instance-1/output-1/host/mips64el-buildroot-linux-gnu/sysroot/usr/bin/../../usr/include/libxml2/libxml/encoding.h:31, > from /home/peko/autobuild/instance-1/output-1/host/mips64el-buildroot-linux-gnu/sysroot/usr/bin/../../usr/include/libxml2/libxml/parser.h:812, > from conftest.cpp:61: > /home/peko/autobuild/instance-1/output-1/host/mips64el-buildroot-linux-gnu/sysroot/usr/include/unicode/localpointer.h:224:41: error: 'noexcept' does not name a type > LocalPointer(LocalPointer &&src) U_NOEXCEPT : LocalPointerBase(src.ptr) { > ^ > /home/peko/autobuild/instance-1/output-1/host/mips64el-buildroot-linux-gnu/sysroot/usr/include/unicode/localpointer.h:224:41: note: C++11 'noexcept' only available with -std=c++11 or -std=gnu++11 > > Fixes: > - http://autobuild.buildroot.org/results/be043792e6e5501631517881b10096291a654364 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/sconeserver/sconeserver.mk | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/package/sconeserver/sconeserver.mk b/package/sconeserver/sconeserver.mk > index 17407c29f5..2b28f8015c 100644 > --- a/package/sconeserver/sconeserver.mk > +++ b/package/sconeserver/sconeserver.mk > @@ -29,6 +29,8 @@ SCONESERVER_CONF_OPTS += \ > ifeq ($(BR2_PACKAGE_LIBXML2),y) > SCONESERVER_CONF_OPTS += \ > --with-xml2-config="$(STAGING_DIR)/usr/bin/xml2-config" > +# Needed to fix build failure when icu is enabled in libxml2 > +SCONESERVER_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" > endif > > ifeq ($(BR2_PACKAGE_OPENSSL),y) From arnout at mind.be Sun Feb 13 11:44:56 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 12:44:56 +0100 Subject: [Buildroot] [PATCH] package/cryptsetup: fix build failure with Microblaze In-Reply-To: <20220202203725.2115889-1-giulio.benetti@benettiengineering.com> References: <20220202203725.2115889-1-giulio.benetti@benettiengineering.com> Message-ID: On 02/02/2022 21:37, Giulio Benetti wrote: > Add local patch pending upstream[1] to fix the build failure after my > suggestion[2] to imitate what I've done with libfuse[3]. > > [1]: https://gitlab.com/cryptsetup/cryptsetup/-/merge_requests/275?commit_id=5f71b3d63181aa88a68f7f71eab8801f2d8d2cde > [2]: https://gitlab.com/cryptsetup/cryptsetup/-/issues/709 > [3]: https://github.com/libfuse/libfuse/pull/620/commits/3aba09a5c56e017746c5c1652dbc845f4db7374a > > Fixes: > http://autobuild.buildroot.net/results/bad/bad4d01fde3191e4d481a8e9dae18df3b1a94537/ > > Signed-off-by: Giulio Benetti Applied to master, thanks. Regards, Arnout > --- > ...d-check-program-for-symver-attribute.patch | 56 +++++++++++++++++++ > 1 file changed, 56 insertions(+) > create mode 100644 package/cryptsetup/0001-Add-check-program-for-symver-attribute.patch > > diff --git a/package/cryptsetup/0001-Add-check-program-for-symver-attribute.patch b/package/cryptsetup/0001-Add-check-program-for-symver-attribute.patch > new file mode 100644 > index 0000000000..04f59a2050 > --- /dev/null > +++ b/package/cryptsetup/0001-Add-check-program-for-symver-attribute.patch > @@ -0,0 +1,56 @@ > +From 7c6ec620de3f99d4212f4a54aa576df1b97020ab Mon Sep 17 00:00:00 2001 > +From: Ondrej Kozina > +Date: Wed, 2 Feb 2022 11:34:57 +0100 > +Subject: [PATCH] Add check program for symver attribute. > + > +Fixes: #709. > +Signed-off-by: Giulio Benetti > +--- > + configure.ac | 11 +++++++++++ > + lib/libcryptsetup_symver.h | 8 +++----- > + 2 files changed, 14 insertions(+), 5 deletions(-) > + > +diff --git a/configure.ac b/configure.ac > +index a0e5990d..b052f8cf 100644 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -554,6 +554,17 @@ if test "x$enable_static_cryptsetup" = "xyes"; then > + PKG_CONFIG=$saved_PKG_CONFIG > + fi > + > ++dnl Check compiler support for symver function attribute > ++saved_CFLAGS=$CFLAGS > ++CFLAGS="-O0 -Werror" > ++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ > ++ void _test_sym(void); > ++ __attribute__((__symver__("sym at VERSION_4.2"))) void _test_sym(void) {} > ++]], > ++[[ _test_sym() ]] > ++)],[ AC_DEFINE([HAVE_ATTRIBUTE_SYMVER], 1, [Define to 1 to use __attribute__((symver))])]) > ++CFLAGS=$saved_CFLAGS > ++ > + AC_MSG_CHECKING([for systemd tmpfiles config directory]) > + PKG_CHECK_VAR([systemd_tmpfilesdir], [systemd], [tmpfilesdir], [], [systemd_tmpfilesdir=no]) > + AC_MSG_RESULT([$systemd_tmpfilesdir]) > +diff --git a/lib/libcryptsetup_symver.h b/lib/libcryptsetup_symver.h > +index 2a804b6a..3558310d 100644 > +--- a/lib/libcryptsetup_symver.h > ++++ b/lib/libcryptsetup_symver.h > +@@ -67,11 +67,9 @@ > + * under CRYPT_SYMBOL_EXPORT_OLD(int, crypt_func_X, ...) macro > + */ > + > +-#ifdef __has_attribute > +-# if __has_attribute(symver) > +-# define _CRYPT_SYMVER(_local_sym, _public_sym, _ver_str, _maj, _min) \ > +- __attribute__((__symver__(#_public_sym _ver_str #_maj "." #_min))) > +-# endif > ++#if HAVE_ATTRIBUTE_SYMVER > ++# define _CRYPT_SYMVER(_local_sym, _public_sym, _ver_str, _maj, _min) \ > ++ __attribute__((__symver__(#_public_sym _ver_str #_maj "." #_min))) > + #endif > + > + #if !defined(_CRYPT_SYMVER) && defined(__GNUC__) > +-- > +2.25.1 > + From arnout at mind.be Sun Feb 13 11:46:05 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 12:46:05 +0100 Subject: [Buildroot] [PATCH] board/intel/galileo: fix build failure with host gcc 10 In-Reply-To: <20220202214357.2640301-1-giulio.benetti@benettiengineering.com> References: <20220202214357.2640301-1-giulio.benetti@benettiengineering.com> Message-ID: On 02/02/2022 22:43, Giulio Benetti wrote: > Building galileo_defconfig throws error: > ``` > /usr/bin/ld: arch/x86/tools/relocs_64.o:(.bss+0x0): multiple definition of `per_cpu_load_addr'; arch/x86/tools/relocs_32.o:(.bss+0x0): first defined here > ``` > > To fix this let's add an upstreamed patch[1] and add BR2_GLOBAL_PATCH_DIR > to galileo_defconfig to point to where patch is. > > [1]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=eeeda4cd06e828b331b15741a204ff9f5874d28d.patch > > Fixes: > https://gitlab.com/ymorin/buildroot/-/jobs/2035821039 > > Signed-off-by: Giulio Benetti You can't imagine how much joy it gives me to see a patch from 2014 applied here... Applied to master, thanks. Regards, Arnout > --- > ...relocs-Make-per_cpu_load_addr-static.patch | 39 +++++++++++++++++++ > configs/galileo_defconfig | 1 + > 2 files changed, 40 insertions(+) > create mode 100644 board/intel/galileo/patches/linux/0001-x86-relocs-Make-per_cpu_load_addr-static.patch > > diff --git a/board/intel/galileo/patches/linux/0001-x86-relocs-Make-per_cpu_load_addr-static.patch b/board/intel/galileo/patches/linux/0001-x86-relocs-Make-per_cpu_load_addr-static.patch > new file mode 100644 > index 0000000000..1d206cc6d1 > --- /dev/null > +++ b/board/intel/galileo/patches/linux/0001-x86-relocs-Make-per_cpu_load_addr-static.patch > @@ -0,0 +1,39 @@ > +From eeeda4cd06e828b331b15741a204ff9f5874d28d Mon Sep 17 00:00:00 2001 > +From: Ben Hutchings > +Date: Wed, 24 Sep 2014 13:30:12 +0100 > +Subject: [PATCH] x86/relocs: Make per_cpu_load_addr static > + > +per_cpu_load_addr is only used for 64-bit relocations, but is > +declared in both configurations of relocs.c - with different > +types. This has undefined behaviour in general. GNU ld is > +documented to use the larger size in this case, but other tools > +may differ and some warn about this. > + > +References: https://bugs.debian.org/748577 > +Reported-by: Michael Tautschnig > +Signed-off-by: Ben Hutchings > +Cc: 748577 at bugs.debian.org > +Cc: Linus Torvalds > +Link: http://lkml.kernel.org/r/1411561812.3659.23.camel at decadent.org.uk > +Signed-off-by: Ingo Molnar > +Signed-off-by: Giulio Benetti > +--- > + arch/x86/tools/relocs.c | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c > +index bbb1d2259ecf..a5efb21d5228 100644 > +--- a/arch/x86/tools/relocs.c > ++++ b/arch/x86/tools/relocs.c > +@@ -695,7 +695,7 @@ static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel, > + * > + */ > + static int per_cpu_shndx = -1; > +-Elf_Addr per_cpu_load_addr; > ++static Elf_Addr per_cpu_load_addr; > + > + static void percpu_init(void) > + { > +-- > +2.25.1 > + > diff --git a/configs/galileo_defconfig b/configs/galileo_defconfig > index 03ca23f414..a8fd0a6dcc 100644 > --- a/configs/galileo_defconfig > +++ b/configs/galileo_defconfig > @@ -1,4 +1,5 @@ > BR2_x86_x1000=y > +BR2_GLOBAL_PATCH_DIR=board/intel/galileo/patches > # Needed for TARGET_GRUB2 > BR2_TOOLCHAIN_BUILDROOT_WCHAR=y > # Linux headers same as kernel, a 3.14 series From bernd.kuhls at t-online.de Sun Feb 13 11:47:12 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 13 Feb 2022 12:47:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi: fix build with python-3.10 Message-ID: <20220213114712.2738619-1-bernd.kuhls@t-online.de> Fixes build error: CMake Error at /usr/share/cmake-3.18/Modules/FindPackageHandleStandardArgs.cmake:165 (message): Could NOT find PythonLibs (missing: PYTHON_LIBRARIES) (found suitable version "3.10.2", minimum required is "3.5") Signed-off-by: Bernd Kuhls --- v2: fixed typo in PYTHON_EXECUTABLE configure option (usr/bin/ -> bin/) package/kodi/0002-cmake-findpython.patch | 135 ++++++++++++++++++ ...-cmake-search-for-python-interpreter.patch | 48 +++++++ ...-allow-to-override-PYTHON_EXECUTABLE.patch | 39 +++++ package/kodi/kodi.mk | 4 + 4 files changed, 226 insertions(+) create mode 100644 package/kodi/0002-cmake-findpython.patch create mode 100644 package/kodi/0003-cmake-search-for-python-interpreter.patch create mode 100644 package/kodi/0004-cmake-allow-to-override-PYTHON_EXECUTABLE.patch diff --git a/package/kodi/0002-cmake-findpython.patch b/package/kodi/0002-cmake-findpython.patch new file mode 100644 index 0000000000..60728aa465 --- /dev/null +++ b/package/kodi/0002-cmake-findpython.patch @@ -0,0 +1,135 @@ +From 52f44ec5c7b728a6afaca867e8d815fced2012ec Mon Sep 17 00:00:00 2001 +From: fuzzard +Date: Sat, 31 Jul 2021 19:22:08 +1000 +Subject: [PATCH] [cmake] findpython + +use cmakes (3.12+) FindPython3 module. +Provide cmake vars for user to overide specific version, and search path + +Backport of https://github.com/xbmc/xbmc/pull/20045 + +Patch sent upstream: https://github.com/xbmc/xbmc/pull/20989 + +Signed-off-by: Bernd Kuhls +--- + CMakeLists.txt | 4 +- + cmake/modules/FindPython.cmake | 71 ++++++++++++++++++++++++++-------- + 2 files changed, 56 insertions(+), 19 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2d5369798d..9bed54ef40 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.4) ++cmake_minimum_required(VERSION 3.12) + if(WIN32) + # Version 3.15 is required to use "PREPEND" for dependencies + cmake_minimum_required(VERSION 3.15) +@@ -187,8 +187,6 @@ core_require_dep(${required_deps}) + find_package(TexturePacker REQUIRED) + find_package(JsonSchemaBuilder REQUIRED) + +-SET(PYTHON_VERSION 3.8) +- + if(ENABLE_MARIADBCLIENT AND NOT ENABLE_MARIADBCLIENT STREQUAL AUTO AND ENABLE_MYSQLCLIENT AND NOT ENABLE_MYSQLCLIENT STREQUAL AUTO) + MESSAGE(FATAL_ERROR "You can not use MySql and MariaDB at the same time. Disable one by adding -DENABLE_MYSQLCLIENT=OFF or -DENABLE_MARIADBCLIENT=OFF.") + elseif(ENABLE_MYSQLCLIENT AND NOT ENABLE_MYSQLCLIENT STREQUAL AUTO) +diff --git a/cmake/modules/FindPython.cmake b/cmake/modules/FindPython.cmake +index c40e12d551..35220b5426 100644 +--- a/cmake/modules/FindPython.cmake ++++ b/cmake/modules/FindPython.cmake +@@ -1,17 +1,56 @@ +-# - Try to find python +-# Once done this will define ++# FindPython ++# -------- ++# Finds Python3 libraries ++# ++# This module will search for the required python libraries on the system ++# If multiple versions are found, the highest version will be used. ++# ++# -------- ++# ++# the following variables influence behaviour: ++# ++# PYTHON_PATH - use external python not found in system paths ++# usage: -DPYTHON_PATH=/path/to/python/lib ++# PYTHON_VER - use exact python version, fail if not found ++# usage: -DPYTHON_VER=3.8 ++# ++# -------- ++# ++# This module will define the following variables: + # + # PYTHON_FOUND - system has PYTHON ++# PYTHON_VERSION - Python version number (Major.Minor) + # PYTHON_INCLUDE_DIRS - the python include directory + # PYTHON_LIBRARIES - The python libraries ++# PYTHON_LDFLAGS - Python provided link options ++# ++# -------- ++# ++ ++# for Depends builds, set search root dir to depends path ++if(KODI_DEPENDSBUILD) ++ set(Python3_USE_STATIC_LIBS TRUE) ++ set(Python3_ROOT_DIR ${DEPENDS_PATH}/lib) ++endif() ++ ++# Provide root dir to search for Python if provided ++if(PYTHON_PATH) ++ set(Python3_ROOT_DIR ${PYTHON_PATH}) ++ ++ # unset cache var so we can generate again with a different dir (or none) if desired ++ unset(PYTHON_PATH CACHE) ++endif() ++ ++# Set specific version of Python to find if provided ++if(PYTHON_VER) ++ set(VERSION ${PYTHON_VER}) ++ set(EXACT_VER "EXACT") + +-if(PKG_CONFIG_FOUND) +- pkg_check_modules(PC_PYTHON python3>=3.5 QUIET) ++ # unset cache var so we can generate again with a different ver (or none) if desired ++ unset(PYTHON_VER CACHE) + endif() + +-find_program(PYTHON_EXECUTABLE python3 ONLY_CMAKE_FIND_ROOT_PATH) +-find_library(PYTHON_LIBRARY NAMES python3.9 python3.8 python3.7 python3.6 python3.5 PATHS ${PC_PYTHON_LIBDIR}) +-find_path(PYTHON_INCLUDE_DIR NAMES Python.h PATHS ${PC_PYTHON_INCLUDE_DIRS} PATH_SUFFIXES python3.9 python3.8 python3.7 python3.6 python3.5) ++find_package(Python3 ${VERSION} ${EXACT_VER} COMPONENTS Development) + + if(KODI_DEPENDSBUILD) + find_library(FFI_LIBRARY ffi REQUIRED) +@@ -27,17 +66,17 @@ if(KODI_DEPENDSBUILD) + endif() + endif() + +- set(PYTHON_LIBRARIES ${PYTHON_LIBRARY} ${FFI_LIBRARY} ${EXPAT_LIBRARY} ${INTL_LIBRARY} ${GMP_LIBRARY} ${PYTHON_DEP_LIBRARIES}) +-else() +- find_package(PythonLibs 3.5 REQUIRED) +- list(APPEND PYTHON_LIBRARIES ${PC_PYTHON_STATIC_LIBRARIES}) ++ list(APPEND Python3_LIBRARIES ${FFI_LIBRARY} ${EXPAT_LIBRARY} ${INTL_LIBRARY} ${GMP_LIBRARY} ${PYTHON_DEP_LIBRARIES}) + endif() + +-include(FindPackageHandleStandardArgs) +-find_package_handle_standard_args(Python REQUIRED_VARS PYTHON_INCLUDE_DIR PYTHON_LIBRARY PYTHON_LIBRARIES) +-if(PYTHON_FOUND) +- set(PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_DIR}) ++if(Python3_FOUND) + list(APPEND PYTHON_DEFINITIONS -DHAS_PYTHON=1) ++ # These are all set for easy integration with the rest of our build system ++ set(PYTHON_FOUND ${Python3_FOUND}) ++ set(PYTHON_INCLUDE_DIRS ${Python3_INCLUDE_DIRS}) ++ set(PYTHON_LIBRARIES ${Python3_LIBRARIES}) ++ set(PYTHON_VERSION "${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}" CACHE INTERNAL "" FORCE) ++ set(PYTHON_LDFLAGS ${Python3_LINK_OPTIONS}) + endif() + +-mark_as_advanced(PYTHON_EXECUTABLE PYTHON_INCLUDE_DIRS PYTHON_INCLUDE_DIR PYTHON_LIBRARY PYTHON_LIBRARIES PYTHON_LDFLAGS FFI_LIBRARY EXPAT_LIBRARY INTL_LIBRARY GMP_LIBRARY) ++mark_as_advanced(PYTHON_EXECUTABLE PYTHON_VERSION PYTHON_INCLUDE_DIRS PYTHON_LDFLAGS FFI_LIBRARY EXPAT_LIBRARY INTL_LIBRARY GMP_LIBRARY) +-- +2.30.2 + diff --git a/package/kodi/0003-cmake-search-for-python-interpreter.patch b/package/kodi/0003-cmake-search-for-python-interpreter.patch new file mode 100644 index 0000000000..158345a212 --- /dev/null +++ b/package/kodi/0003-cmake-search-for-python-interpreter.patch @@ -0,0 +1,48 @@ +From 6bb112e585f2ffd10e5af70ca28159dd235d063b Mon Sep 17 00:00:00 2001 +From: wsnipex +Date: Thu, 19 Aug 2021 08:50:05 +0200 +Subject: [PATCH] [cmake] search for python interpreter fixes installing + eventclients on linux + +Backport of https://github.com/xbmc/xbmc/pull/20058 + +Patch sent upstream: https://github.com/xbmc/xbmc/pull/20989 + +Signed-off-by: Bernd Kuhls +--- + cmake/modules/FindPython.cmake | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/cmake/modules/FindPython.cmake b/cmake/modules/FindPython.cmake +index 35220b5426..c469ed9fb6 100644 +--- a/cmake/modules/FindPython.cmake ++++ b/cmake/modules/FindPython.cmake +@@ -20,6 +20,7 @@ + # + # PYTHON_FOUND - system has PYTHON + # PYTHON_VERSION - Python version number (Major.Minor) ++# PYTHON_EXECUTABLE - Python interpreter binary + # PYTHON_INCLUDE_DIRS - the python include directory + # PYTHON_LIBRARIES - The python libraries + # PYTHON_LDFLAGS - Python provided link options +@@ -51,6 +52,9 @@ if(PYTHON_VER) + endif() + + find_package(Python3 ${VERSION} ${EXACT_VER} COMPONENTS Development) ++if(CORE_SYSTEM_NAME STREQUAL linux) ++ find_package(Python3 ${VERSION} ${EXACT_VER} COMPONENTS Interpreter) ++endif() + + if(KODI_DEPENDSBUILD) + find_library(FFI_LIBRARY ffi REQUIRED) +@@ -73,6 +77,7 @@ if(Python3_FOUND) + list(APPEND PYTHON_DEFINITIONS -DHAS_PYTHON=1) + # These are all set for easy integration with the rest of our build system + set(PYTHON_FOUND ${Python3_FOUND}) ++ set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE} CACHE FILEPATH "Python interpreter" FORCE) + set(PYTHON_INCLUDE_DIRS ${Python3_INCLUDE_DIRS}) + set(PYTHON_LIBRARIES ${Python3_LIBRARIES}) + set(PYTHON_VERSION "${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}" CACHE INTERNAL "" FORCE) +-- +2.30.2 + diff --git a/package/kodi/0004-cmake-allow-to-override-PYTHON_EXECUTABLE.patch b/package/kodi/0004-cmake-allow-to-override-PYTHON_EXECUTABLE.patch new file mode 100644 index 0000000000..d1e9b3f25f --- /dev/null +++ b/package/kodi/0004-cmake-allow-to-override-PYTHON_EXECUTABLE.patch @@ -0,0 +1,39 @@ +From 25681d8adde4a90d5da02051e30f6a3a27322136 Mon Sep 17 00:00:00 2001 +From: Jernej Skrabec +Date: Sat, 25 Sep 2021 07:41:10 +0200 +Subject: [PATCH] [cmake] allow to override PYTHON_EXECUTABLE + +If Kodi is being build for distro which has different python version +than host, PYTHON_EXECUTABLE must be overriden and point to distro +version. Otherwise, eventclients will be installed in wrong location and +be thus unusable. + +Use case: Cross compiling Kodi for LibreELEC + +Backport of https://github.com/xbmc/xbmc/pull/20171 + +Patch sent upstream: https://github.com/xbmc/xbmc/pull/20989 + +Signed-off-by: Bernd Kuhls +--- + cmake/modules/FindPython.cmake | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/cmake/modules/FindPython.cmake b/cmake/modules/FindPython.cmake +index c469ed9fb6..87b8368705 100644 +--- a/cmake/modules/FindPython.cmake ++++ b/cmake/modules/FindPython.cmake +@@ -77,7 +77,9 @@ if(Python3_FOUND) + list(APPEND PYTHON_DEFINITIONS -DHAS_PYTHON=1) + # These are all set for easy integration with the rest of our build system + set(PYTHON_FOUND ${Python3_FOUND}) +- set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE} CACHE FILEPATH "Python interpreter" FORCE) ++ if(NOT PYTHON_EXECUTABLE) ++ set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE} CACHE FILEPATH "Python interpreter" FORCE) ++ endif() + set(PYTHON_INCLUDE_DIRS ${Python3_INCLUDE_DIRS}) + set(PYTHON_LIBRARIES ${Python3_LIBRARIES}) + set(PYTHON_VERSION "${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}" CACHE INTERNAL "" FORCE) +-- +2.30.2 + diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index 646c6e0ab4..56e901fa17 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -76,6 +76,10 @@ KODI_CONF_OPTS += \ -DNATIVEPREFIX=$(HOST_DIR) \ -DDEPENDS_PATH=$(STAGING_DIR)/usr \ -DENABLE_TESTING=OFF \ + -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python \ + -DPYTHON_INCLUDE_DIRS=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ + -DPYTHON_PATH=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR) \ + -DPYTHON_VER=$(PYTHON3_VERSION_MAJOR) \ -DWITH_JSONSCHEMABUILDER=$(HOST_DIR)/bin/JsonSchemaBuilder \ -DWITH_TEXTUREPACKER=$(HOST_DIR)/bin/TexturePacker \ -DLIBDVDCSS_URL=$(KODI_DL_DIR)/kodi-libdvdcss-$(KODI_LIBDVDCSS_VERSION).tar.gz \ -- 2.30.2 From bernd.kuhls at t-online.de Sun Feb 13 11:47:21 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 13 Feb 2022 12:47:21 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/kodi: fix build with python-3.10 Message-ID: <20220213114721.2738803-1-bernd.kuhls@t-online.de> Fixes build error: CMake Error at /usr/share/cmake-3.18/Modules/FindPackageHandleStandardArgs.cmake:165 (message): Could NOT find PythonLibs (missing: PYTHON_LIBRARIES) (found suitable version "3.10.2", minimum required is "3.5") Signed-off-by: Bernd Kuhls --- v2: fixed typo in PYTHON_EXECUTABLE configure option (usr/bin/ -> bin/) package/kodi/0002-cmake-findpython.patch | 135 ++++++++++++++++++ ...-cmake-search-for-python-interpreter.patch | 48 +++++++ ...-allow-to-override-PYTHON_EXECUTABLE.patch | 39 +++++ package/kodi/kodi.mk | 4 + 4 files changed, 226 insertions(+) create mode 100644 package/kodi/0002-cmake-findpython.patch create mode 100644 package/kodi/0003-cmake-search-for-python-interpreter.patch create mode 100644 package/kodi/0004-cmake-allow-to-override-PYTHON_EXECUTABLE.patch diff --git a/package/kodi/0002-cmake-findpython.patch b/package/kodi/0002-cmake-findpython.patch new file mode 100644 index 0000000000..60728aa465 --- /dev/null +++ b/package/kodi/0002-cmake-findpython.patch @@ -0,0 +1,135 @@ +From 52f44ec5c7b728a6afaca867e8d815fced2012ec Mon Sep 17 00:00:00 2001 +From: fuzzard +Date: Sat, 31 Jul 2021 19:22:08 +1000 +Subject: [PATCH] [cmake] findpython + +use cmakes (3.12+) FindPython3 module. +Provide cmake vars for user to overide specific version, and search path + +Backport of https://github.com/xbmc/xbmc/pull/20045 + +Patch sent upstream: https://github.com/xbmc/xbmc/pull/20989 + +Signed-off-by: Bernd Kuhls +--- + CMakeLists.txt | 4 +- + cmake/modules/FindPython.cmake | 71 ++++++++++++++++++++++++++-------- + 2 files changed, 56 insertions(+), 19 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2d5369798d..9bed54ef40 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.4) ++cmake_minimum_required(VERSION 3.12) + if(WIN32) + # Version 3.15 is required to use "PREPEND" for dependencies + cmake_minimum_required(VERSION 3.15) +@@ -187,8 +187,6 @@ core_require_dep(${required_deps}) + find_package(TexturePacker REQUIRED) + find_package(JsonSchemaBuilder REQUIRED) + +-SET(PYTHON_VERSION 3.8) +- + if(ENABLE_MARIADBCLIENT AND NOT ENABLE_MARIADBCLIENT STREQUAL AUTO AND ENABLE_MYSQLCLIENT AND NOT ENABLE_MYSQLCLIENT STREQUAL AUTO) + MESSAGE(FATAL_ERROR "You can not use MySql and MariaDB at the same time. Disable one by adding -DENABLE_MYSQLCLIENT=OFF or -DENABLE_MARIADBCLIENT=OFF.") + elseif(ENABLE_MYSQLCLIENT AND NOT ENABLE_MYSQLCLIENT STREQUAL AUTO) +diff --git a/cmake/modules/FindPython.cmake b/cmake/modules/FindPython.cmake +index c40e12d551..35220b5426 100644 +--- a/cmake/modules/FindPython.cmake ++++ b/cmake/modules/FindPython.cmake +@@ -1,17 +1,56 @@ +-# - Try to find python +-# Once done this will define ++# FindPython ++# -------- ++# Finds Python3 libraries ++# ++# This module will search for the required python libraries on the system ++# If multiple versions are found, the highest version will be used. ++# ++# -------- ++# ++# the following variables influence behaviour: ++# ++# PYTHON_PATH - use external python not found in system paths ++# usage: -DPYTHON_PATH=/path/to/python/lib ++# PYTHON_VER - use exact python version, fail if not found ++# usage: -DPYTHON_VER=3.8 ++# ++# -------- ++# ++# This module will define the following variables: + # + # PYTHON_FOUND - system has PYTHON ++# PYTHON_VERSION - Python version number (Major.Minor) + # PYTHON_INCLUDE_DIRS - the python include directory + # PYTHON_LIBRARIES - The python libraries ++# PYTHON_LDFLAGS - Python provided link options ++# ++# -------- ++# ++ ++# for Depends builds, set search root dir to depends path ++if(KODI_DEPENDSBUILD) ++ set(Python3_USE_STATIC_LIBS TRUE) ++ set(Python3_ROOT_DIR ${DEPENDS_PATH}/lib) ++endif() ++ ++# Provide root dir to search for Python if provided ++if(PYTHON_PATH) ++ set(Python3_ROOT_DIR ${PYTHON_PATH}) ++ ++ # unset cache var so we can generate again with a different dir (or none) if desired ++ unset(PYTHON_PATH CACHE) ++endif() ++ ++# Set specific version of Python to find if provided ++if(PYTHON_VER) ++ set(VERSION ${PYTHON_VER}) ++ set(EXACT_VER "EXACT") + +-if(PKG_CONFIG_FOUND) +- pkg_check_modules(PC_PYTHON python3>=3.5 QUIET) ++ # unset cache var so we can generate again with a different ver (or none) if desired ++ unset(PYTHON_VER CACHE) + endif() + +-find_program(PYTHON_EXECUTABLE python3 ONLY_CMAKE_FIND_ROOT_PATH) +-find_library(PYTHON_LIBRARY NAMES python3.9 python3.8 python3.7 python3.6 python3.5 PATHS ${PC_PYTHON_LIBDIR}) +-find_path(PYTHON_INCLUDE_DIR NAMES Python.h PATHS ${PC_PYTHON_INCLUDE_DIRS} PATH_SUFFIXES python3.9 python3.8 python3.7 python3.6 python3.5) ++find_package(Python3 ${VERSION} ${EXACT_VER} COMPONENTS Development) + + if(KODI_DEPENDSBUILD) + find_library(FFI_LIBRARY ffi REQUIRED) +@@ -27,17 +66,17 @@ if(KODI_DEPENDSBUILD) + endif() + endif() + +- set(PYTHON_LIBRARIES ${PYTHON_LIBRARY} ${FFI_LIBRARY} ${EXPAT_LIBRARY} ${INTL_LIBRARY} ${GMP_LIBRARY} ${PYTHON_DEP_LIBRARIES}) +-else() +- find_package(PythonLibs 3.5 REQUIRED) +- list(APPEND PYTHON_LIBRARIES ${PC_PYTHON_STATIC_LIBRARIES}) ++ list(APPEND Python3_LIBRARIES ${FFI_LIBRARY} ${EXPAT_LIBRARY} ${INTL_LIBRARY} ${GMP_LIBRARY} ${PYTHON_DEP_LIBRARIES}) + endif() + +-include(FindPackageHandleStandardArgs) +-find_package_handle_standard_args(Python REQUIRED_VARS PYTHON_INCLUDE_DIR PYTHON_LIBRARY PYTHON_LIBRARIES) +-if(PYTHON_FOUND) +- set(PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_DIR}) ++if(Python3_FOUND) + list(APPEND PYTHON_DEFINITIONS -DHAS_PYTHON=1) ++ # These are all set for easy integration with the rest of our build system ++ set(PYTHON_FOUND ${Python3_FOUND}) ++ set(PYTHON_INCLUDE_DIRS ${Python3_INCLUDE_DIRS}) ++ set(PYTHON_LIBRARIES ${Python3_LIBRARIES}) ++ set(PYTHON_VERSION "${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}" CACHE INTERNAL "" FORCE) ++ set(PYTHON_LDFLAGS ${Python3_LINK_OPTIONS}) + endif() + +-mark_as_advanced(PYTHON_EXECUTABLE PYTHON_INCLUDE_DIRS PYTHON_INCLUDE_DIR PYTHON_LIBRARY PYTHON_LIBRARIES PYTHON_LDFLAGS FFI_LIBRARY EXPAT_LIBRARY INTL_LIBRARY GMP_LIBRARY) ++mark_as_advanced(PYTHON_EXECUTABLE PYTHON_VERSION PYTHON_INCLUDE_DIRS PYTHON_LDFLAGS FFI_LIBRARY EXPAT_LIBRARY INTL_LIBRARY GMP_LIBRARY) +-- +2.30.2 + diff --git a/package/kodi/0003-cmake-search-for-python-interpreter.patch b/package/kodi/0003-cmake-search-for-python-interpreter.patch new file mode 100644 index 0000000000..158345a212 --- /dev/null +++ b/package/kodi/0003-cmake-search-for-python-interpreter.patch @@ -0,0 +1,48 @@ +From 6bb112e585f2ffd10e5af70ca28159dd235d063b Mon Sep 17 00:00:00 2001 +From: wsnipex +Date: Thu, 19 Aug 2021 08:50:05 +0200 +Subject: [PATCH] [cmake] search for python interpreter fixes installing + eventclients on linux + +Backport of https://github.com/xbmc/xbmc/pull/20058 + +Patch sent upstream: https://github.com/xbmc/xbmc/pull/20989 + +Signed-off-by: Bernd Kuhls +--- + cmake/modules/FindPython.cmake | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/cmake/modules/FindPython.cmake b/cmake/modules/FindPython.cmake +index 35220b5426..c469ed9fb6 100644 +--- a/cmake/modules/FindPython.cmake ++++ b/cmake/modules/FindPython.cmake +@@ -20,6 +20,7 @@ + # + # PYTHON_FOUND - system has PYTHON + # PYTHON_VERSION - Python version number (Major.Minor) ++# PYTHON_EXECUTABLE - Python interpreter binary + # PYTHON_INCLUDE_DIRS - the python include directory + # PYTHON_LIBRARIES - The python libraries + # PYTHON_LDFLAGS - Python provided link options +@@ -51,6 +52,9 @@ if(PYTHON_VER) + endif() + + find_package(Python3 ${VERSION} ${EXACT_VER} COMPONENTS Development) ++if(CORE_SYSTEM_NAME STREQUAL linux) ++ find_package(Python3 ${VERSION} ${EXACT_VER} COMPONENTS Interpreter) ++endif() + + if(KODI_DEPENDSBUILD) + find_library(FFI_LIBRARY ffi REQUIRED) +@@ -73,6 +77,7 @@ if(Python3_FOUND) + list(APPEND PYTHON_DEFINITIONS -DHAS_PYTHON=1) + # These are all set for easy integration with the rest of our build system + set(PYTHON_FOUND ${Python3_FOUND}) ++ set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE} CACHE FILEPATH "Python interpreter" FORCE) + set(PYTHON_INCLUDE_DIRS ${Python3_INCLUDE_DIRS}) + set(PYTHON_LIBRARIES ${Python3_LIBRARIES}) + set(PYTHON_VERSION "${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}" CACHE INTERNAL "" FORCE) +-- +2.30.2 + diff --git a/package/kodi/0004-cmake-allow-to-override-PYTHON_EXECUTABLE.patch b/package/kodi/0004-cmake-allow-to-override-PYTHON_EXECUTABLE.patch new file mode 100644 index 0000000000..d1e9b3f25f --- /dev/null +++ b/package/kodi/0004-cmake-allow-to-override-PYTHON_EXECUTABLE.patch @@ -0,0 +1,39 @@ +From 25681d8adde4a90d5da02051e30f6a3a27322136 Mon Sep 17 00:00:00 2001 +From: Jernej Skrabec +Date: Sat, 25 Sep 2021 07:41:10 +0200 +Subject: [PATCH] [cmake] allow to override PYTHON_EXECUTABLE + +If Kodi is being build for distro which has different python version +than host, PYTHON_EXECUTABLE must be overriden and point to distro +version. Otherwise, eventclients will be installed in wrong location and +be thus unusable. + +Use case: Cross compiling Kodi for LibreELEC + +Backport of https://github.com/xbmc/xbmc/pull/20171 + +Patch sent upstream: https://github.com/xbmc/xbmc/pull/20989 + +Signed-off-by: Bernd Kuhls +--- + cmake/modules/FindPython.cmake | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/cmake/modules/FindPython.cmake b/cmake/modules/FindPython.cmake +index c469ed9fb6..87b8368705 100644 +--- a/cmake/modules/FindPython.cmake ++++ b/cmake/modules/FindPython.cmake +@@ -77,7 +77,9 @@ if(Python3_FOUND) + list(APPEND PYTHON_DEFINITIONS -DHAS_PYTHON=1) + # These are all set for easy integration with the rest of our build system + set(PYTHON_FOUND ${Python3_FOUND}) +- set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE} CACHE FILEPATH "Python interpreter" FORCE) ++ if(NOT PYTHON_EXECUTABLE) ++ set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE} CACHE FILEPATH "Python interpreter" FORCE) ++ endif() + set(PYTHON_INCLUDE_DIRS ${Python3_INCLUDE_DIRS}) + set(PYTHON_LIBRARIES ${Python3_LIBRARIES}) + set(PYTHON_VERSION "${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}" CACHE INTERNAL "" FORCE) +-- +2.30.2 + diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index 646c6e0ab4..56e901fa17 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -76,6 +76,10 @@ KODI_CONF_OPTS += \ -DNATIVEPREFIX=$(HOST_DIR) \ -DDEPENDS_PATH=$(STAGING_DIR)/usr \ -DENABLE_TESTING=OFF \ + -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python \ + -DPYTHON_INCLUDE_DIRS=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ + -DPYTHON_PATH=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR) \ + -DPYTHON_VER=$(PYTHON3_VERSION_MAJOR) \ -DWITH_JSONSCHEMABUILDER=$(HOST_DIR)/bin/JsonSchemaBuilder \ -DWITH_TEXTUREPACKER=$(HOST_DIR)/bin/TexturePacker \ -DLIBDVDCSS_URL=$(KODI_DL_DIR)/kodi-libdvdcss-$(KODI_LIBDVDCSS_VERSION).tar.gz \ -- 2.30.2 From peter at korsgaard.com Sun Feb 13 11:59:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Feb 2022 12:59:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/grpc: fix fourth patch In-Reply-To: <20220208222356.24675-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 8 Feb 2022 23:23:56 +0100") References: <20220208222356.24675-1-fontaine.fabrice@gmail.com> Message-ID: <87sfsnkmeq.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure raised since the addition of fourth > patch in commit 8251d8c2559b25f11684776fc343059cf100657d: > 1 out of 22 hunks FAILED -- saving rejects to file CMakeLists.txt.rej > Fixes: > - http://autobuild.buildroot.org/results/44f6d7c61316e90d22e75cb1fb77c3bc5b31ad66 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From b.bilas at grinn-global.com Sun Feb 13 12:02:58 2022 From: b.bilas at grinn-global.com (Bartosz Bilas) Date: Sun, 13 Feb 2022 13:02:58 +0100 Subject: [Buildroot] [PATCH] boot/barebox: bump version to 2022.01.0 Message-ID: <20220213120258.601369-1-b.bilas@grinn-global.com> Signed-off-by: Bartosz Bilas --- boot/barebox/Config.in | 4 ++-- boot/barebox/barebox.hash | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in index 23f8a5ac8a..c16fea3cea 100644 --- a/boot/barebox/Config.in +++ b/boot/barebox/Config.in @@ -12,7 +12,7 @@ choice Select the specific Barebox version you want to use config BR2_TARGET_BAREBOX_LATEST_VERSION - bool "2021.12.0" + bool "2022.01.0" config BR2_TARGET_BAREBOX_CUSTOM_VERSION bool "Custom version" @@ -40,7 +40,7 @@ endif config BR2_TARGET_BAREBOX_VERSION string - default "2021.12.0" if BR2_TARGET_BAREBOX_LATEST_VERSION + default "2022.01.0" if BR2_TARGET_BAREBOX_LATEST_VERSION default BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE if BR2_TARGET_BAREBOX_CUSTOM_VERSION default "custom" if BR2_TARGET_BAREBOX_CUSTOM_TARBALL default BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT diff --git a/boot/barebox/barebox.hash b/boot/barebox/barebox.hash index 0a853866b5..3d52d40beb 100644 --- a/boot/barebox/barebox.hash +++ b/boot/barebox/barebox.hash @@ -1,8 +1,8 @@ # From https://www.barebox.org/download/barebox-2021.12.0.tar.bz2.md5 -md5 199b6d7ff3441cec2062ab18a52454dc barebox-2021.12.0.tar.bz2 +md5 753ba533ced54f4113f9e97846c13fc1 barebox-2022.01.0.tar.bz2 # Locally calculated -sha256 555569fe9e71524e0bf927eaa2c1aa2e81ee2c34dd71e39fe21620db6ccc8aa6 barebox-2021.12.0.tar.bz2 +sha256 ddf7898075bec05e4865ce0f7a2ac19c2b1efaaa0d066eba1939494e25711d28 barebox-2022.01.0.tar.bz2 # License files, locally computed sha256 ab1122aa9f9073ad1ec824edcd970b16a6a7881a34a18fd56c080debb2dca5d4 COPYING -- 2.35.1 From arnout at mind.be Sun Feb 13 12:04:46 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 13:04:46 +0100 Subject: [Buildroot] [PATCH] package/python-docutils: bump to version 0.18.1 In-Reply-To: <20220203090848.22869-1-yegorslists@googlemail.com> References: <20220203090848.22869-1-yegorslists@googlemail.com> Message-ID: <88094627-fe17-f255-ef93-2e6aaae0e995@mind.be> On 03/02/2022 10:08, yegorslists--- via buildroot wrote: > From: Yegor Yefremov > > Remove the obsolete patch as docutils is now a setuptools package. > > The package also includes code licensed under BSD-3-Clause licence. > COPYING.txt has the following changes: > > * copyright year > * more exceptions from the Public Domain added > * BSD-3-Clause license added > > Fixes: > http://autobuild.buildroot.net/results/02dd94c09dabdbdd8b47673393577a7fd3af3aeb > > Signed-off-by: Yegor Yefremov James came later with a largely identical patch, but it also extended the list of licenses a bit. So I incorporated that change, with his Sob, and applied to master, thanks. Regards, Arnout > --- > .../0001-Update-setup.py.patch | 64 ------------------- > package/python-docutils/python-docutils.hash | 6 +- > package/python-docutils/python-docutils.mk | 8 +-- > 3 files changed, 7 insertions(+), 71 deletions(-) > delete mode 100644 package/python-docutils/0001-Update-setup.py.patch > > diff --git a/package/python-docutils/0001-Update-setup.py.patch b/package/python-docutils/0001-Update-setup.py.patch > deleted file mode 100644 > index 3fb34a9763..0000000000 > --- a/package/python-docutils/0001-Update-setup.py.patch > +++ /dev/null > @@ -1,64 +0,0 @@ > -From 583e59ccf72a02c2a6f0399f29f622c7f2f4a932 Mon Sep 17 00:00:00 2001 > -From: milde > -Date: Sun, 1 Sep 2019 19:39:36 +0000 > -Subject: [PATCH] Update setup.py > - > -Python 3.4 no longer supported, > -more languages supported (and Lithuanian accepted by PyPi). > - > -git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk at 8383 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 > - > -[Asaf: adjust upstream patch to 0.15.2] > -Signed-off-by: Asaf Kahlon > ---- > - setup.py | 14 +++++++++++++- > - 1 file changed, 13 insertions(+), 1 deletion(-) > - > -diff --git a/setup.py b/setup.py > -index f801ea2..5c1ebfd 100755 > ---- a/setup.py > -+++ b/setup.py > -@@ -7,6 +7,10 @@ import os > - import glob > - try: > - import setuptools > -+except ImportError: > -+ print('Warning: Could not load package `setuptools`.') > -+ print('Actions requiring `setuptools` instead of `distutils` will fail') > -+try: > - from distutils.core import setup, Command > - from distutils.command.build import build > - from distutils.command.build_py import build_py > -@@ -123,7 +127,7 @@ what-you-see-is-what-you-get plaintext markup syntax.""", # wrap at col 60 > - 'maintainer_email': 'docutils-develop at lists.sourceforge.net', > - 'license': 'public domain, Python, 2-Clause BSD, GPL 3 (see COPYING.txt)', > - 'platforms': 'OS-independent', > -- 'python_requires': '>=2.6, !=3.0.*, !=3.1.*, !=3.2.*', > -+ 'python_requires': '>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*', > - 'package_dir': {'docutils': 'docutils', > - 'docutils.tools': 'tools'}, > - 'packages': ['docutils', > -@@ -213,14 +219,20 @@ classifiers = [ > - 'Natural Language :: Chinese (Simplified)', > - 'Natural Language :: Chinese (Traditional)', > - 'Natural Language :: Czech', > -+ 'Natural Language :: Danish', > - 'Natural Language :: Dutch', > - 'Natural Language :: Esperanto', > - 'Natural Language :: Finnish', > - 'Natural Language :: French', > - 'Natural Language :: Galician', > - 'Natural Language :: German', > -+ 'Natural Language :: Hebrew', > - 'Natural Language :: Italian', > - 'Natural Language :: Japanese', > -+ 'Natural Language :: Korean', > -+ 'Natural Language :: Latvian', > -+ 'Natural Language :: Lithuanian', > -+ 'Natural Language :: Persian', > - 'Natural Language :: Polish', > - 'Natural Language :: Portuguese (Brazilian)', > - 'Natural Language :: Russian', > --- > -2.20.1 > -k > diff --git a/package/python-docutils/python-docutils.hash b/package/python-docutils/python-docutils.hash > index ccccca1064..9f6bb53bdb 100644 > --- a/package/python-docutils/python-docutils.hash > +++ b/package/python-docutils/python-docutils.hash > @@ -1,4 +1,4 @@ > # md5 from https://pypi.python.org/pypi/docutils/json, sha256 locally computed > -md5 e26a308d8000b0bed7416a633217c676 docutils-0.15.2.tar.gz > -sha256 a2aeea129088da402665e92e0b25b04b073c04b2dce4ab65caaa38b7ce2e1a99 docutils-0.15.2.tar.gz > -sha256 efa0c85aa99ea5b4781240031b0d02af54d7b5554c87ad2b2bea9ba490f6663f COPYING.txt > +md5 ca5827e2432fd58f4c8d74a6591135de docutils-0.18.1.tar.gz > +sha256 679987caf361a7539d76e584cbeddc311e3aee937877c87346f31debc63e9d06 docutils-0.18.1.tar.gz > +sha256 f20172170ef9aeebbf53adf5d8f7d309f7dc6068e9a3a1b52ea772305686739d COPYING.txt > diff --git a/package/python-docutils/python-docutils.mk b/package/python-docutils/python-docutils.mk > index 9a42d3e5dc..3872b54906 100644 > --- a/package/python-docutils/python-docutils.mk > +++ b/package/python-docutils/python-docutils.mk > @@ -4,12 +4,12 @@ > # > ################################################################################ > > -PYTHON_DOCUTILS_VERSION = 0.15.2 > +PYTHON_DOCUTILS_VERSION = 0.18.1 > PYTHON_DOCUTILS_SOURCE = docutils-$(PYTHON_DOCUTILS_VERSION).tar.gz > -PYTHON_DOCUTILS_SITE = https://files.pythonhosted.org/packages/93/22/953e071b589b0b1fee420ab06a0d15e5aa0c7470eb9966d60393ce58ad61 > -PYTHON_DOCUTILS_LICENSE = Public Domain, BSD-2-Clause, GPL-3.0 (emacs mode), other > +PYTHON_DOCUTILS_SITE = https://files.pythonhosted.org/packages/57/b1/b880503681ea1b64df05106fc7e3c4e3801736cf63deffc6fa7fc5404cf5 > +PYTHON_DOCUTILS_LICENSE = Public Domain, BSD-2-Clause, BSD-3-Clause, GPL-3.0 (emacs mode), other > PYTHON_DOCUTILS_LICENSE_FILES = COPYING.txt > -PYTHON_DOCUTILS_SETUP_TYPE = distutils > +PYTHON_DOCUTILS_SETUP_TYPE = setuptools > > $(eval $(python-package)) > $(eval $(host-python-package)) From arnout at mind.be Sun Feb 13 12:05:05 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 13:05:05 +0100 Subject: [Buildroot] [git commit] package/sconeserver: fix build with icu and libxml2 Message-ID: <20220213115753.22A1482745@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b9eca021594470341bec2876edc0a27251f3f9b2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since addition of icu support in libxml2 through commit 49d7c85421e87d9d762be9352805cb47a2f0bbeb: In file included from /home/peko/autobuild/instance-1/output-1/host/mips64el-buildroot-linux-gnu/sysroot/usr/include/unicode/ptypes.h:52:0, from /home/peko/autobuild/instance-1/output-1/host/mips64el-buildroot-linux-gnu/sysroot/usr/include/unicode/umachine.h:46, from /home/peko/autobuild/instance-1/output-1/host/mips64el-buildroot-linux-gnu/sysroot/usr/include/unicode/utypes.h:38, from /home/peko/autobuild/instance-1/output-1/host/mips64el-buildroot-linux-gnu/sysroot/usr/include/unicode/ucnv_err.h:88, from /home/peko/autobuild/instance-1/output-1/host/mips64el-buildroot-linux-gnu/sysroot/usr/include/unicode/ucnv.h:51, from /home/peko/autobuild/instance-1/output-1/host/mips64el-buildroot-linux-gnu/sysroot/usr/bin/../../usr/include/libxml2/libxml/encoding.h:31, from /home/peko/autobuild/instance-1/output-1/host/mips64el-buildroot-linux-gnu/sysroot/usr/bin/../../usr/include/libxml2/libxml/parser.h:812, from conftest.cpp:61: /home/peko/autobuild/instance-1/output-1/host/mips64el-buildroot-linux-gnu/sysroot/usr/include/unicode/localpointer.h:224:41: error: 'noexcept' does not name a type LocalPointer(LocalPointer &&src) U_NOEXCEPT : LocalPointerBase(src.ptr) { ^ /home/peko/autobuild/instance-1/output-1/host/mips64el-buildroot-linux-gnu/sysroot/usr/include/unicode/localpointer.h:224:41: note: C++11 'noexcept' only available with -std=c++11 or -std=gnu++11 Fixes: - http://autobuild.buildroot.org/results/be043792e6e5501631517881b10096291a654364 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/sconeserver/sconeserver.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/sconeserver/sconeserver.mk b/package/sconeserver/sconeserver.mk index 17407c29f5..2b28f8015c 100644 --- a/package/sconeserver/sconeserver.mk +++ b/package/sconeserver/sconeserver.mk @@ -29,6 +29,8 @@ SCONESERVER_CONF_OPTS += \ ifeq ($(BR2_PACKAGE_LIBXML2),y) SCONESERVER_CONF_OPTS += \ --with-xml2-config="$(STAGING_DIR)/usr/bin/xml2-config" +# Needed to fix build failure when icu is enabled in libxml2 +SCONESERVER_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" endif ifeq ($(BR2_PACKAGE_OPENSSL),y) From arnout at mind.be Sun Feb 13 12:05:06 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 13:05:06 +0100 Subject: [Buildroot] [git commit] package/python-docutils: bump to version 0.18.1 Message-ID: <20220213115753.45B168287C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9324d53bc5114cf862602cafcf214adfc7375d32 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Remove the obsolete patch as docutils is now a setuptools package. The package also includes code licensed under BSD-3-Clause licence. COPYING.txt has the following changes: * copyright year * more exceptions from the Public Domain added * BSD-3-Clause license added * emacs mode is GPL-3.0+ instead of just GPL-3.0 * added Python-2.0 for roman.py The "other" license is removed since the list covers all licenses mentioned in COPYING.txt. Also update hash file whitespace to two spaces. Fixes: http://autobuild.buildroot.net/results/02dd94c09dabdbdd8b47673393577a7fd3af3aeb Signed-off-by: Yegor Yefremov Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-docutils/0001-Update-setup.py.patch | 64 ---------------------- package/python-docutils/python-docutils.hash | 6 +- package/python-docutils/python-docutils.mk | 8 +-- 3 files changed, 7 insertions(+), 71 deletions(-) diff --git a/package/python-docutils/0001-Update-setup.py.patch b/package/python-docutils/0001-Update-setup.py.patch deleted file mode 100644 index 3fb34a9763..0000000000 --- a/package/python-docutils/0001-Update-setup.py.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 583e59ccf72a02c2a6f0399f29f622c7f2f4a932 Mon Sep 17 00:00:00 2001 -From: milde -Date: Sun, 1 Sep 2019 19:39:36 +0000 -Subject: [PATCH] Update setup.py - -Python 3.4 no longer supported, -more languages supported (and Lithuanian accepted by PyPi). - -git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk at 8383 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 - -[Asaf: adjust upstream patch to 0.15.2] -Signed-off-by: Asaf Kahlon ---- - setup.py | 14 +++++++++++++- - 1 file changed, 13 insertions(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index f801ea2..5c1ebfd 100755 ---- a/setup.py -+++ b/setup.py -@@ -7,6 +7,10 @@ import os - import glob - try: - import setuptools -+except ImportError: -+ print('Warning: Could not load package `setuptools`.') -+ print('Actions requiring `setuptools` instead of `distutils` will fail') -+try: - from distutils.core import setup, Command - from distutils.command.build import build - from distutils.command.build_py import build_py -@@ -123,7 +127,7 @@ what-you-see-is-what-you-get plaintext markup syntax.""", # wrap at col 60 - 'maintainer_email': 'docutils-develop at lists.sourceforge.net', - 'license': 'public domain, Python, 2-Clause BSD, GPL 3 (see COPYING.txt)', - 'platforms': 'OS-independent', -- 'python_requires': '>=2.6, !=3.0.*, !=3.1.*, !=3.2.*', -+ 'python_requires': '>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*', - 'package_dir': {'docutils': 'docutils', - 'docutils.tools': 'tools'}, - 'packages': ['docutils', -@@ -213,14 +219,20 @@ classifiers = [ - 'Natural Language :: Chinese (Simplified)', - 'Natural Language :: Chinese (Traditional)', - 'Natural Language :: Czech', -+ 'Natural Language :: Danish', - 'Natural Language :: Dutch', - 'Natural Language :: Esperanto', - 'Natural Language :: Finnish', - 'Natural Language :: French', - 'Natural Language :: Galician', - 'Natural Language :: German', -+ 'Natural Language :: Hebrew', - 'Natural Language :: Italian', - 'Natural Language :: Japanese', -+ 'Natural Language :: Korean', -+ 'Natural Language :: Latvian', -+ 'Natural Language :: Lithuanian', -+ 'Natural Language :: Persian', - 'Natural Language :: Polish', - 'Natural Language :: Portuguese (Brazilian)', - 'Natural Language :: Russian', --- -2.20.1 -k diff --git a/package/python-docutils/python-docutils.hash b/package/python-docutils/python-docutils.hash index ccccca1064..f5e0b82db8 100644 --- a/package/python-docutils/python-docutils.hash +++ b/package/python-docutils/python-docutils.hash @@ -1,4 +1,4 @@ # md5 from https://pypi.python.org/pypi/docutils/json, sha256 locally computed -md5 e26a308d8000b0bed7416a633217c676 docutils-0.15.2.tar.gz -sha256 a2aeea129088da402665e92e0b25b04b073c04b2dce4ab65caaa38b7ce2e1a99 docutils-0.15.2.tar.gz -sha256 efa0c85aa99ea5b4781240031b0d02af54d7b5554c87ad2b2bea9ba490f6663f COPYING.txt +md5 ca5827e2432fd58f4c8d74a6591135de docutils-0.18.1.tar.gz +sha256 679987caf361a7539d76e584cbeddc311e3aee937877c87346f31debc63e9d06 docutils-0.18.1.tar.gz +sha256 f20172170ef9aeebbf53adf5d8f7d309f7dc6068e9a3a1b52ea772305686739d COPYING.txt diff --git a/package/python-docutils/python-docutils.mk b/package/python-docutils/python-docutils.mk index 9a42d3e5dc..39a570f5a1 100644 --- a/package/python-docutils/python-docutils.mk +++ b/package/python-docutils/python-docutils.mk @@ -4,12 +4,12 @@ # ################################################################################ -PYTHON_DOCUTILS_VERSION = 0.15.2 +PYTHON_DOCUTILS_VERSION = 0.18.1 PYTHON_DOCUTILS_SOURCE = docutils-$(PYTHON_DOCUTILS_VERSION).tar.gz -PYTHON_DOCUTILS_SITE = https://files.pythonhosted.org/packages/93/22/953e071b589b0b1fee420ab06a0d15e5aa0c7470eb9966d60393ce58ad61 -PYTHON_DOCUTILS_LICENSE = Public Domain, BSD-2-Clause, GPL-3.0 (emacs mode), other +PYTHON_DOCUTILS_SITE = https://files.pythonhosted.org/packages/57/b1/b880503681ea1b64df05106fc7e3c4e3801736cf63deffc6fa7fc5404cf5 +PYTHON_DOCUTILS_LICENSE = Public Domain, BSD-2-Clause, BSD-3-Clause, Python-2.0, GPL-3.0+ (emacs mode) PYTHON_DOCUTILS_LICENSE_FILES = COPYING.txt -PYTHON_DOCUTILS_SETUP_TYPE = distutils +PYTHON_DOCUTILS_SETUP_TYPE = setuptools $(eval $(python-package)) $(eval $(host-python-package)) From arnout at mind.be Sun Feb 13 12:05:05 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 13:05:05 +0100 Subject: [Buildroot] [git commit] board/intel/galileo: fix build failure with host gcc 10 Message-ID: <20220213115753.393B082745@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9dd5382d791c3d5197b9ef401a0d103ad1457d5d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Building galileo_defconfig throws error: ``` /usr/bin/ld: arch/x86/tools/relocs_64.o:(.bss+0x0): multiple definition of `per_cpu_load_addr'; arch/x86/tools/relocs_32.o:(.bss+0x0): first defined here ``` To fix this let's add an upstreamed patch[1] and add BR2_GLOBAL_PATCH_DIR to galileo_defconfig to point to where patch is. [1]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=eeeda4cd06e828b331b15741a204ff9f5874d28d.patch Fixes: https://gitlab.com/ymorin/buildroot/-/jobs/2035821039 Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...-x86-relocs-Make-per_cpu_load_addr-static.patch | 39 ++++++++++++++++++++++ configs/galileo_defconfig | 1 + 2 files changed, 40 insertions(+) diff --git a/board/intel/galileo/patches/linux/0001-x86-relocs-Make-per_cpu_load_addr-static.patch b/board/intel/galileo/patches/linux/0001-x86-relocs-Make-per_cpu_load_addr-static.patch new file mode 100644 index 0000000000..1d206cc6d1 --- /dev/null +++ b/board/intel/galileo/patches/linux/0001-x86-relocs-Make-per_cpu_load_addr-static.patch @@ -0,0 +1,39 @@ +From eeeda4cd06e828b331b15741a204ff9f5874d28d Mon Sep 17 00:00:00 2001 +From: Ben Hutchings +Date: Wed, 24 Sep 2014 13:30:12 +0100 +Subject: [PATCH] x86/relocs: Make per_cpu_load_addr static + +per_cpu_load_addr is only used for 64-bit relocations, but is +declared in both configurations of relocs.c - with different +types. This has undefined behaviour in general. GNU ld is +documented to use the larger size in this case, but other tools +may differ and some warn about this. + +References: https://bugs.debian.org/748577 +Reported-by: Michael Tautschnig +Signed-off-by: Ben Hutchings +Cc: 748577 at bugs.debian.org +Cc: Linus Torvalds +Link: http://lkml.kernel.org/r/1411561812.3659.23.camel at decadent.org.uk +Signed-off-by: Ingo Molnar +Signed-off-by: Giulio Benetti +--- + arch/x86/tools/relocs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c +index bbb1d2259ecf..a5efb21d5228 100644 +--- a/arch/x86/tools/relocs.c ++++ b/arch/x86/tools/relocs.c +@@ -695,7 +695,7 @@ static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel, + * + */ + static int per_cpu_shndx = -1; +-Elf_Addr per_cpu_load_addr; ++static Elf_Addr per_cpu_load_addr; + + static void percpu_init(void) + { +-- +2.25.1 + diff --git a/configs/galileo_defconfig b/configs/galileo_defconfig index 03ca23f414..a8fd0a6dcc 100644 --- a/configs/galileo_defconfig +++ b/configs/galileo_defconfig @@ -1,4 +1,5 @@ BR2_x86_x1000=y +BR2_GLOBAL_PATCH_DIR=board/intel/galileo/patches # Needed for TARGET_GRUB2 BR2_TOOLCHAIN_BUILDROOT_WCHAR=y # Linux headers same as kernel, a 3.14 series From arnout at mind.be Sun Feb 13 12:05:05 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 13:05:05 +0100 Subject: [Buildroot] [git commit] package/cryptsetup: fix build failure with Microblaze Message-ID: <20220213115753.3042A82868@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=683e8387d05cb506c30592ab43a3e7534d7cf56e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add local patch pending upstream[1] to fix the build failure after my suggestion[2] to imitate what I've done with libfuse[3]. [1]: https://gitlab.com/cryptsetup/cryptsetup/-/merge_requests/275?commit_id=5f71b3d63181aa88a68f7f71eab8801f2d8d2cde [2]: https://gitlab.com/cryptsetup/cryptsetup/-/issues/709 [3]: https://github.com/libfuse/libfuse/pull/620/commits/3aba09a5c56e017746c5c1652dbc845f4db7374a Fixes: http://autobuild.buildroot.net/results/bad/bad4d01fde3191e4d481a8e9dae18df3b1a94537/ Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...01-Add-check-program-for-symver-attribute.patch | 56 ++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/package/cryptsetup/0001-Add-check-program-for-symver-attribute.patch b/package/cryptsetup/0001-Add-check-program-for-symver-attribute.patch new file mode 100644 index 0000000000..04f59a2050 --- /dev/null +++ b/package/cryptsetup/0001-Add-check-program-for-symver-attribute.patch @@ -0,0 +1,56 @@ +From 7c6ec620de3f99d4212f4a54aa576df1b97020ab Mon Sep 17 00:00:00 2001 +From: Ondrej Kozina +Date: Wed, 2 Feb 2022 11:34:57 +0100 +Subject: [PATCH] Add check program for symver attribute. + +Fixes: #709. +Signed-off-by: Giulio Benetti +--- + configure.ac | 11 +++++++++++ + lib/libcryptsetup_symver.h | 8 +++----- + 2 files changed, 14 insertions(+), 5 deletions(-) + +diff --git a/configure.ac b/configure.ac +index a0e5990d..b052f8cf 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -554,6 +554,17 @@ if test "x$enable_static_cryptsetup" = "xyes"; then + PKG_CONFIG=$saved_PKG_CONFIG + fi + ++dnl Check compiler support for symver function attribute ++saved_CFLAGS=$CFLAGS ++CFLAGS="-O0 -Werror" ++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ++ void _test_sym(void); ++ __attribute__((__symver__("sym at VERSION_4.2"))) void _test_sym(void) {} ++]], ++[[ _test_sym() ]] ++)],[ AC_DEFINE([HAVE_ATTRIBUTE_SYMVER], 1, [Define to 1 to use __attribute__((symver))])]) ++CFLAGS=$saved_CFLAGS ++ + AC_MSG_CHECKING([for systemd tmpfiles config directory]) + PKG_CHECK_VAR([systemd_tmpfilesdir], [systemd], [tmpfilesdir], [], [systemd_tmpfilesdir=no]) + AC_MSG_RESULT([$systemd_tmpfilesdir]) +diff --git a/lib/libcryptsetup_symver.h b/lib/libcryptsetup_symver.h +index 2a804b6a..3558310d 100644 +--- a/lib/libcryptsetup_symver.h ++++ b/lib/libcryptsetup_symver.h +@@ -67,11 +67,9 @@ + * under CRYPT_SYMBOL_EXPORT_OLD(int, crypt_func_X, ...) macro + */ + +-#ifdef __has_attribute +-# if __has_attribute(symver) +-# define _CRYPT_SYMVER(_local_sym, _public_sym, _ver_str, _maj, _min) \ +- __attribute__((__symver__(#_public_sym _ver_str #_maj "." #_min))) +-# endif ++#if HAVE_ATTRIBUTE_SYMVER ++# define _CRYPT_SYMVER(_local_sym, _public_sym, _ver_str, _maj, _min) \ ++ __attribute__((__symver__(#_public_sym _ver_str #_maj "." #_min))) + #endif + + #if !defined(_CRYPT_SYMVER) && defined(__GNUC__) +-- +2.25.1 + From giulio.benetti at benettiengineering.com Sun Feb 13 12:56:05 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 13 Feb 2022 13:56:05 +0100 Subject: [Buildroot] [PATCH] board/intel/galileo: fix build failure with host gcc 10 In-Reply-To: References: Message-ID: <42058D10-AAA9-41FE-91E3-1D5153134FCA@benettiengineering.com> Hi Nicolas, sorry for html but I?m mobile. My patch for fixing the build failure for Galileo has been upstream, but Linux version is very old, I?ve added a local patch from 2014 as pointed Arnout below. I don?t have a Galileo board and you are the maintainer, can you please update uboot and Linux versions and send a patch for that after testing please? Thank you! ?- Giulio Benetti Benetti Engineering sas > Il giorno 13 feb 2022, alle ore 12:46, Arnout Vandecappelle ha scritto: > > ? > >> On 02/02/2022 22:43, Giulio Benetti wrote: >> Building galileo_defconfig throws error: >> ``` >> /usr/bin/ld: arch/x86/tools/relocs_64.o:(.bss+0x0): multiple definition of `per_cpu_load_addr'; arch/x86/tools/relocs_32.o:(.bss+0x0): first defined here >> ``` >> To fix this let's add an upstreamed patch[1] and add BR2_GLOBAL_PATCH_DIR >> to galileo_defconfig to point to where patch is. >> [1]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=eeeda4cd06e828b331b15741a204ff9f5874d28d.patch >> Fixes: >> https://gitlab.com/ymorin/buildroot/-/jobs/2035821039 >> Signed-off-by: Giulio Benetti > > You can't imagine how much joy it gives me to see a patch from 2014 applied here... > > > Applied to master, thanks. > > Regards, > Arnout > >> --- >> ...relocs-Make-per_cpu_load_addr-static.patch | 39 +++++++++++++++++++ >> configs/galileo_defconfig | 1 + >> 2 files changed, 40 insertions(+) >> create mode 100644 board/intel/galileo/patches/linux/0001-x86-relocs-Make-per_cpu_load_addr-static.patch >> diff --git a/board/intel/galileo/patches/linux/0001-x86-relocs-Make-per_cpu_load_addr-static.patch b/board/intel/galileo/patches/linux/0001-x86-relocs-Make-per_cpu_load_addr-static.patch >> new file mode 100644 >> index 0000000000..1d206cc6d1 >> --- /dev/null >> +++ b/board/intel/galileo/patches/linux/0001-x86-relocs-Make-per_cpu_load_addr-static.patch >> @@ -0,0 +1,39 @@ >> +From eeeda4cd06e828b331b15741a204ff9f5874d28d Mon Sep 17 00:00:00 2001 >> +From: Ben Hutchings >> +Date: Wed, 24 Sep 2014 13:30:12 +0100 >> +Subject: [PATCH] x86/relocs: Make per_cpu_load_addr static >> + >> +per_cpu_load_addr is only used for 64-bit relocations, but is >> +declared in both configurations of relocs.c - with different >> +types. This has undefined behaviour in general. GNU ld is >> +documented to use the larger size in this case, but other tools >> +may differ and some warn about this. >> + >> +References: https://bugs.debian.org/748577 >> +Reported-by: Michael Tautschnig >> +Signed-off-by: Ben Hutchings >> +Cc: 748577 at bugs.debian.org >> +Cc: Linus Torvalds >> +Link: http://lkml.kernel.org/r/1411561812.3659.23.camel at decadent.org.uk >> +Signed-off-by: Ingo Molnar >> +Signed-off-by: Giulio Benetti >> +--- >> + arch/x86/tools/relocs.c | 2 +- >> + 1 file changed, 1 insertion(+), 1 deletion(-) >> + >> +diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c >> +index bbb1d2259ecf..a5efb21d5228 100644 >> +--- a/arch/x86/tools/relocs.c >> ++++ b/arch/x86/tools/relocs.c >> +@@ -695,7 +695,7 @@ static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel, >> + * >> + */ >> + static int per_cpu_shndx = -1; >> +-Elf_Addr per_cpu_load_addr; >> ++static Elf_Addr per_cpu_load_addr; >> + >> + static void percpu_init(void) >> + { >> +-- >> +2.25.1 >> + >> diff --git a/configs/galileo_defconfig b/configs/galileo_defconfig >> index 03ca23f414..a8fd0a6dcc 100644 >> --- a/configs/galileo_defconfig >> +++ b/configs/galileo_defconfig >> @@ -1,4 +1,5 @@ >> BR2_x86_x1000=y >> +BR2_GLOBAL_PATCH_DIR=board/intel/galileo/patches >> # Needed for TARGET_GRUB2 >> BR2_TOOLCHAIN_BUILDROOT_WCHAR=y >> # Linux headers same as kernel, a 3.14 series > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From bernd.kuhls at t-online.de Sun Feb 13 13:03:06 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 13 Feb 2022 14:03:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/e3: new package Message-ID: <20220213130306.3002130-1-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- Build was successful: [...] bootlin-x86-64-glibc [24/45]: OK bootlin-x86-64-musl [25/45]: OK bootlin-x86-64-uclibc [26/45]: OK [...] br-i386-pentium4-full [31/45]: OK br-i386-pentium-mmx-musl [32/45]: OK [...] 45 builds, 40 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed DEVELOPERS | 1 + package/Config.in | 1 + package/e3/0001-makefile.patch | 42 +++++++++++++++ .../e3/0002-Align-header-to-avoid-crash.patch | 26 +++++++++ package/e3/0003-format-1.0.patch | 54 +++++++++++++++++++ package/e3/0004-e3-gnu-stack.patch | 50 +++++++++++++++++ package/e3/Config.in | 9 ++++ package/e3/e3.hash | 3 ++ package/e3/e3.mk | 24 +++++++++ 9 files changed, 210 insertions(+) create mode 100644 package/e3/0001-makefile.patch create mode 100644 package/e3/0002-Align-header-to-avoid-crash.patch create mode 100644 package/e3/0003-format-1.0.patch create mode 100644 package/e3/0004-e3-gnu-stack.patch create mode 100644 package/e3/Config.in create mode 100644 package/e3/e3.hash create mode 100644 package/e3/e3.mk diff --git a/DEVELOPERS b/DEVELOPERS index 7b5f4d992c..f8aab505ed 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -326,6 +326,7 @@ F: package/dht/ F: package/dovecot/ F: package/dovecot-pigeonhole/ F: package/dtv-scan-tables/ +F: package/e3/ F: package/eudev/ F: package/exim/ F: package/fetchmail/ diff --git a/package/Config.in b/package/Config.in index c004228759..f47f003a00 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2612,6 +2612,7 @@ endmenu menu "Text editors and viewers" source "package/bat/Config.in" + source "package/e3/Config.in" source "package/ed/Config.in" source "package/joe/Config.in" source "package/less/Config.in" diff --git a/package/e3/0001-makefile.patch b/package/e3/0001-makefile.patch new file mode 100644 index 0000000000..62b2b3a94b --- /dev/null +++ b/package/e3/0001-makefile.patch @@ -0,0 +1,42 @@ +Add build fixes from Gentoo + +Downloaded from +https://gitweb.gentoo.org/repo/gentoo.git/tree/app-editors/e3/files/e3-2.8.2-makefile.patch + +Signed-off-by: Bernd Kuhls +--- e3-2.82-orig/Makefile ++++ e3-2.82/Makefile +@@ -17,6 +17,8 @@ + NASM_OR_YASM=nasm + #NASM_OR_YASM=yasm + ++LD=ld ++ + EXMODE=SED + + #----------------------do not edit below line------------------------------- +@@ -41,12 +43,12 @@ + + 32: $(ASOURCES) Makefile + ifeq ($(OS),LINUX) +- nasm -O2 -f bin -l e3.lst -o e3 e3.asm -DCRIPLED_ELF=1 -D$(OS) -D$(EXMODE) ++ nasm -O2 -f bin -l e3.lst -o e3 e3.asm -DCRIPLED_ELF=1 -D$(OS) + chmod +x e3 + else + echo $(ASVER) +- nasm -O2 $(AFLAGS) -o e3.o e3.asm -l e3.lst -D$(OS) -D$(EXMODE) +- ld -s -o e3 e3.o ++ nasm -O2 $(AFLAGS) -o e3.o e3.asm -l e3.lst -D$(OS) ++ $(LD) -s -o e3 e3.o + strip --remove-section .comment e3 + endif + ln -sf e3 e3ws +@@ -60,7 +62,7 @@ + 64: $(ASOURCES) Makefile + cat e3.asm | sed -f e3_32to64.sed >e3.tmp + $(ASSEMBLER64) +- ld -b elf64-x86-64 --oformat elf64-x86-64 -o e3 e3.o ++ $(LD) -o e3 e3.o + ifneq ($(DEBUG),true) + strip e3 + endif diff --git a/package/e3/0002-Align-header-to-avoid-crash.patch b/package/e3/0002-Align-header-to-avoid-crash.patch new file mode 100644 index 0000000000..f24f180b0c --- /dev/null +++ b/package/e3/0002-Align-header-to-avoid-crash.patch @@ -0,0 +1,26 @@ +From: =?utf-8?q?Bernhard_=C3=9Cbelacker?= +Date: Tue, 6 Nov 2018 18:52:41 +0100 +Subject: [PATCH] Align header to avoid crash. + +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=913014 + +Downloaded from +https://sources.debian.org/src/e3/1%3A2.82%2Bdfsg-2/debian/patches/0001-Align-header-to-avoid-crash.patch/ + +Signed-off-by: Bernd Kuhls +--- + e3.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/e3.h b/e3.h +index 96f8dc7..6508e9b 100644 +--- a/e3.h ++++ b/e3.h +@@ -861,6 +861,7 @@ phdr2: ;another Elf32_Phdr starts here + %else + org 0x8048000 + ELFheader ++ times 0xBF2 db 0 + %endif + %else + ;nothing diff --git a/package/e3/0003-format-1.0.patch b/package/e3/0003-format-1.0.patch new file mode 100644 index 0000000000..c7ace235c4 --- /dev/null +++ b/package/e3/0003-format-1.0.patch @@ -0,0 +1,54 @@ +From: Debian QA Group +Date: Sun, 12 May 2019 04:36:49 +0000 +Subject: format-1.0 + +Downloaded from +https://sources.debian.org/src/e3/1%3A2.82%2Bdfsg-2/debian/patches/format-1.0.patch/ + +and removed Makefile patch. + +Signed-off-by: Bernd Kuhls + + e3.asm | 26 ++++++++++++++++++++++++++ + 2 files changed, 40 insertions(+), 12 deletions(-) +--- + e3.asm | 26 ++++++++++++++++++++++++++ + 2 files changed, 33 insertions(+), 11 deletions(-) + +diff --git a/e3.asm b/e3.asm +index b0a17ca..7d99f17 100644 +--- a/e3.asm ++++ b/e3.asm +@@ -3653,6 +3653,32 @@ NoPi: cmp ecx,'e3vi' + mov byte [eax],VI + ret + NoVi: cmp ecx,'e3ws' ++ jnz NoWs ++ mov byte [eax],WS ++ ret ++NoWs: cmp ecx,'edit' ++ jnz NoNe2 ++ mov byte [eax],NE ++ ret ++NoNe2: cmp ecx,'macs' ++ jnz NoEm2 ++ mov byte [eax],EM ++ ret ++NoEm2: cmp ecx,'pico' ++ jnz NoPi2 ++ mov byte [eax],PI ++ ret ++NoPi2: push cx ++ mov cx,'__' ++ cmp ecx,'__vi' ++ pop cx ++ jnz NoVi2 ++ mov byte [eax],VI ++ ret ++NoVi2: push cx ++ mov cx,'__' ++ cmp ecx,'__ws' ++ pop cx + jnz modeOK + mov byte [eax],WS + modeOK: ret diff --git a/package/e3/0004-e3-gnu-stack.patch b/package/e3/0004-e3-gnu-stack.patch new file mode 100644 index 0000000000..81eb6b14bb --- /dev/null +++ b/package/e3/0004-e3-gnu-stack.patch @@ -0,0 +1,50 @@ +Fix GNU stack + +Quoted from https://src.fedoraproject.org/rpms/e3/blob/f30/f/e3.spec + +# mark the stack as non-executable and disable tiny/crippled elf on 32 +# bit linux so that stack can be marked as non-executable on it too + +Downloaded from +https://src.fedoraproject.org/rpms/e3/blob/f30/f/e3-gnu-stack.patch + +Signed-off-by: Bernd Kuhls + +Common subdirectories: e3-2.8.orig/bin and e3-2.8/bin +diff -u e3-2.8.orig/e3.asm e3-2.8/e3.asm +--- e3-2.8.orig/e3.asm 2010-05-09 12:16:47.000000000 -0400 ++++ e3-2.8/e3.asm 2013-02-22 14:24:46.884384131 -0500 +@@ -6553,3 +6553,13 @@ + %ifdef CRIPLED_ELF + bsssize equ $-bssstart + %endif ++ ++%ifidn __OUTPUT_FORMAT__,elf ++section .note.GNU-stack noalloc noexec nowrite progbits ++%endif ++%ifidn __OUTPUT_FORMAT__,elf32 ++section .note.GNU-stack noalloc noexec nowrite progbits ++%endif ++%ifidn __OUTPUT_FORMAT__,elf64 ++section .note.GNU-stack noalloc noexec nowrite progbits ++%endif +Only in e3-2.8: e3.asm~ +diff -u e3-2.8.orig/Makefile e3-2.8/Makefile +--- e3-2.8.orig/Makefile 2010-05-27 14:58:59.000000000 -0400 ++++ e3-2.8/Makefile 2013-02-22 15:38:57.729605772 -0500 +@@ -42,15 +42,10 @@ + #---------------- 32 bit LINUX (and perhaps BSD) -- + + 32: $(ASOURCES) Makefile +-ifeq ($(OS),LINUX) +- nasm -O2 -f bin -l e3.lst -o e3 e3.asm -DCRIPLED_ELF=1 -D$(OS) +- chmod +x e3 +-else + echo $(ASVER) + nasm -O2 $(AFLAGS) -o e3.o e3.asm -l e3.lst -D$(OS) + $(LD) -s -o e3 e3.o + strip --remove-section .comment e3 +-endif + ln -sf e3 e3ws + ln -sf e3 e3em + ln -sf e3 e3pi diff --git a/package/e3/Config.in b/package/e3/Config.in new file mode 100644 index 0000000000..2854ea8ed7 --- /dev/null +++ b/package/e3/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_E3 + bool "e3" + depends on BR2_i386 || BR2_x86_64 + help + e3 is a full-screen, user-friendly text editor with an + interface similar to that of either WordStar, Emacs, Pico, + Nedit, or vi written in NASM assembler. + + https://sites.google.com/site/e3editor diff --git a/package/e3/e3.hash b/package/e3/e3.hash new file mode 100644 index 0000000000..5fc794f206 --- /dev/null +++ b/package/e3/e3.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 53c51d656801fd3ae0179a5b27f028e07eaba328e80c8c55050268359b9a2924 e3-2.82.tgz +sha256 cc2a6651c315b233ebc110b49ea3c6452eff9a28f8bc051ffd2bb92a8dcfa3d2 COPYING.GPL diff --git a/package/e3/e3.mk b/package/e3/e3.mk new file mode 100644 index 0000000000..63c97078ff --- /dev/null +++ b/package/e3/e3.mk @@ -0,0 +1,24 @@ +################################################################################ +# +# e3 +# +################################################################################ + +E3_VERSION = 2.82 +E3_SITE = https://gentoo.osuosl.org/distfiles +E3_SOURCE = e3-$(E3_VERSION).tgz +E3_LICENSE = GPL-2.0+ +E3_LICENSE_FILES = COPYING.GPL +E3_DEPENDENCIES = host-nasm + +define E3_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \ + $(if $(BR2_ARCH_IS_64),64,32) +endef + +define E3_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \ + PREFIX="$(TARGET_DIR)/usr" install +endef + +$(eval $(generic-package)) -- 2.30.2 From kyle at balena.io Sun Feb 13 13:55:40 2022 From: kyle at balena.io (Kyle Harding) Date: Sun, 13 Feb 2022 08:55:40 -0500 Subject: [Buildroot] [PATCH 1/1] package/unbound: bump version to 1.15.0 Message-ID: <20220213135540.49983-1-kyle@balena.io> Signed-off-by: Kyle Harding --- package/unbound/unbound.hash | 4 ++-- package/unbound/unbound.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/unbound/unbound.hash b/package/unbound/unbound.hash index ca6fe174e0..99caf7dd3d 100644 --- a/package/unbound/unbound.hash +++ b/package/unbound/unbound.hash @@ -1,5 +1,5 @@ -# From https://nlnetlabs.nl/downloads/unbound/unbound-1.14.0.tar.gz.sha256 -sha256 6ef91cbf02d5299eab39328c0857393de7b4885a2fe7233ddfe3c124ff5a89c8 unbound-1.14.0.tar.gz +# From https://nlnetlabs.nl/downloads/unbound/unbound-1.15.0.tar.gz.sha256 +sha256 a480dc6c8937447b98d161fe911ffc76cfaffa2da18788781314e81339f1126f unbound-1.15.0.tar.gz # Locally calculated sha256 8eb9a16cbfb8703090bbfa3a2028fd46bb351509a2f90dc1001e51fbe6fd45db LICENSE diff --git a/package/unbound/unbound.mk b/package/unbound/unbound.mk index 61fdc5389b..1e6e0d99d7 100644 --- a/package/unbound/unbound.mk +++ b/package/unbound/unbound.mk @@ -4,7 +4,7 @@ # ################################################################################ -UNBOUND_VERSION = 1.14.0 +UNBOUND_VERSION = 1.15.0 UNBOUND_SITE = https://www.unbound.net/downloads UNBOUND_DEPENDENCIES = host-pkgconf expat libevent openssl UNBOUND_LICENSE = BSD-3-Clause -- 2.30.2 From yann.morin.1998 at free.fr Sun Feb 13 14:42:18 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 13 Feb 2022 15:42:18 +0100 Subject: [Buildroot] [PATCH v6 2/8] package/re2: switch to generic-package make build In-Reply-To: <20220205201837.3324085-2-james.hilliard1@gmail.com> References: <20220205201837.3324085-1-james.hilliard1@gmail.com> <20220205201837.3324085-2-james.hilliard1@gmail.com> Message-ID: <20220213144218.GA4462@scaer> Jmes, All, On 2022-02-05 13:18 -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. I was wondering why we could not just fix the CMake buildsystem, and submit the fix upstream... And then I remembered already talking about this earlier, but this commit did not carry any explanations why we could not do it... So I had to dig the archives to recover the previous discussion. So, bottom line is, the commit log would be better off with more explanations, like: The cmake build appears to be missing features, such as pkg-config generation support which is needed for some packages to find re2, like qt5webengine. Upstream is not keen on fixing the CMake-absed buildsystem [0] Instead of patching it on our side, and then have to carry the patch forever, we switch to the Makefile-based generic buildsystem. Note that previously some packages like grpc failed when the generic Makefile was used, because they would not find the cmake-equivalent of pkg-config, but this is now fixed [1]. Signed-off-by: you. [0] https://github.com/google/re2/issues/349 [1] https://github.com/grpc/grpc/commit/45e413d2520795e7281e9a592af81620349bc186 > This will be needed by qt5webengine. > > 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) \ We usually do not double-quote STAGING_DIR, TARGET_DIR, or HOST_DIR, because we do not even support building in a directory with spaces in its name. $ git grep -E '=\$\(STAGING_DIR\)' |wc -l 693 $ git grep -E '="\$\(STAGING_DIR\)"' |wc -l 23 So I'd prefer we stick to the not-double-quoted situation. No need to respin, this can be fixed when applying... Regards, Yann E. MORIN. > + $(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 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From peter at korsgaard.com Sun Feb 13 14:44:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Feb 2022 15:44:04 +0100 Subject: [Buildroot] [git commit] package/grpc: fix fourth patch Message-ID: <20220213143638.EA37082901@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9f22134430f00edcfb9093f6095b1b5f72c27069 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since the addition of fourth patch in commit 8251d8c2559b25f11684776fc343059cf100657d: 1 out of 22 hunks FAILED -- saving rejects to file CMakeLists.txt.rej Fixes: - http://autobuild.buildroot.org/results/44f6d7c61316e90d22e75cb1fb77c3bc5b31ad66 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/grpc/0004-host-grpc-only-cpp-plugin.patch | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/package/grpc/0004-host-grpc-only-cpp-plugin.patch b/package/grpc/0004-host-grpc-only-cpp-plugin.patch index 43fad7e3d6..c97d9a9385 100644 --- a/package/grpc/0004-host-grpc-only-cpp-plugin.patch +++ b/package/grpc/0004-host-grpc-only-cpp-plugin.patch @@ -10,6 +10,7 @@ others. Upstream-status: not accepted (see https://github.com/grpc/grpc/issues/25322) Signed-off-by: Thomas De Schampheleire +Signed-off-by: Fabrice Fontaine --- CMakeLists.txt | 43 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 35 insertions(+), 8 deletions(-) @@ -167,15 +168,6 @@ index e8934a3e03..c2df332cc6 100644 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} ) From peter at korsgaard.com Sun Feb 13 14:52:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Feb 2022 15:52:23 +0100 Subject: [Buildroot] [PATCH v6 2/8] package/re2: switch to generic-package make build In-Reply-To: <20220213144218.GA4462@scaer> (Yann E. MORIN's message of "Sun, 13 Feb 2022 15:42:18 +0100") References: <20220205201837.3324085-1-james.hilliard1@gmail.com> <20220205201837.3324085-2-james.hilliard1@gmail.com> <20220213144218.GA4462@scaer> Message-ID: <87o83alsyg.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Jmes, All, > On 2022-02-05 13:18 -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. > I was wondering why we could not just fix the CMake buildsystem, and > submit the fix upstream... > And then I remembered already talking about this earlier, but this > commit did not carry any explanations why we could not do it... So I > had to dig the archives to recover the previous discussion. > So, bottom line is, the commit log would be better off with more > explanations, like: > The cmake build appears to be missing features, such as pkg-config > generation support which is needed for some packages to find re2, > like qt5webengine. > Upstream is not keen on fixing the CMake-absed buildsystem [0] > Instead of patching it on our side, and then have to carry the patch > forever, we switch to the Makefile-based generic buildsystem. > Note that previously some packages like grpc failed when the generic > Makefile was used, because they would not find the cmake-equivalent > of pkg-config, but this is now fixed [1]. > Signed-off-by: you. > [0] https://github.com/google/re2/issues/349 > [1] https://github.com/grpc/grpc/commit/45e413d2520795e7281e9a592af81620349bc186 Yes, a lot nicer! Committed with the commit message changed to the above, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 13 14:53:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Feb 2022 15:53:24 +0100 Subject: [Buildroot] [git commit] package/re2: switch to generic-package make build Message-ID: <20220213144604.E9CB082293@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9ecf705d8c65f6dfce189bc49e880ff6cd009882 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The cmake build appears to be missing features, such as pkg-config generation support which is needed for some packages to find re2, like qt5webengine. Upstream is not keen on fixing the CMake-based buildsystem [0] Instead of patching it on our side, and then have to carry the patch forever, we switch to the Makefile-based generic buildsystem. Note that previously some packages like grpc failed when the generic Makefile was used, because they would not find the cmake-equivalent of pkg-config, but this is now fixed [1]. [0] https://github.com/google/re2/issues/349 [1] https://github.com/grpc/grpc/commit/45e413d2520795e7281e9a592af81620349bc186 Signed-off-by: James Hilliard [Peter: Reword commit message as suggested by Yann] Signed-off-by: Peter Korsgaard --- 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 31252ee82f..41392cb179 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)) From bernd.kuhls at t-online.de Sun Feb 13 14:58:03 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 13 Feb 2022 15:58:03 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/libdeflate: new package Message-ID: <20220213145803.3132537-1-bernd.kuhls@t-online.de> Needed for transmission: https://github.com/transmission/transmission/commit/d8d765c59551b97ffb10bedb6f66133a54954a0e Signed-off-by: Bernd Kuhls --- v2: bumped to v1.10, added commit URL for patch Build test using this defconfig BR2_PACKAGE_LIBDEFLATE=y was successful: 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]: 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]: OK br-arm-full-nothread [29/45]: OK br-arm-full-static [30/45]: OK br-i386-pentium4-full [31/45]: OK br-i386-pentium-mmx-musl [32/45]: OK br-mips64-n64-full [33/45]: OK br-mips64r6-el-hf-glibc [34/45]: OK br-powerpc-603e-basic-cpp [35/45]: OK br-powerpc64-power7-glibc [36/45]: OK linaro-aarch64-be [37/45]: OK linaro-aarch64 [38/45]: OK linaro-arm [39/45]: OK sourcery-arm-armv4t [40/45]: OK sourcery-arm [41/45]: OK sourcery-arm-thumb2 [42/45]: OK sourcery-mips64 [43/45]: OK sourcery-mips [44/45]: OK sourcery-nios2 [45/45]: OK 45 builds, 0 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed DEVELOPERS | 1 + package/Config.in | 1 + ...e-ARM-CRC32-intrinsics-when-affected.patch | 66 +++++++++++++++++++ package/libdeflate/Config.in | 7 ++ package/libdeflate/libdeflate.hash | 3 + package/libdeflate/libdeflate.mk | 34 ++++++++++ 6 files changed, 112 insertions(+) create mode 100644 package/libdeflate/0001-Don-t-use-ARM-CRC32-intrinsics-when-affected.patch create mode 100644 package/libdeflate/Config.in create mode 100644 package/libdeflate/libdeflate.hash create mode 100644 package/libdeflate/libdeflate.mk diff --git a/DEVELOPERS b/DEVELOPERS index ac702d8d0f..53795ba67c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -361,6 +361,7 @@ F: package/libcec/ F: package/libcodec2/ F: package/libcrossguid/ F: package/libdcadec/ +F: package/libdeflate/ F: package/libdrm/ F: package/libdvbcsa/ F: package/libdvdcss/ diff --git a/package/Config.in b/package/Config.in index e4a0f35cb8..268549c4a1 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1376,6 +1376,7 @@ endmenu menu "Compression and decompression" source "package/libarchive/Config.in" + source "package/libdeflate/Config.in" source "package/libmspack/Config.in" source "package/libsquish/Config.in" source "package/libzip/Config.in" diff --git a/package/libdeflate/0001-Don-t-use-ARM-CRC32-intrinsics-when-affected.patch b/package/libdeflate/0001-Don-t-use-ARM-CRC32-intrinsics-when-affected.patch new file mode 100644 index 0000000000..63832810e9 --- /dev/null +++ b/package/libdeflate/0001-Don-t-use-ARM-CRC32-intrinsics-when-affected.patch @@ -0,0 +1,66 @@ +From d045a4933585fceef38d235727c49d9eac61cd61 Mon Sep 17 00:00:00 2001 +From: Eric Biggers +Date: Tue, 8 Feb 2022 00:22:00 -0800 +Subject: [PATCH] Don't use ARM CRC32 intrinsics when affected by gcc bug + 104439 + +The following build error was reported at +https://github.com/ebiggers/libdeflate/pull/163: + + /tmp/ccAwbDTP.s:140: Error: selected processor does not support crc32b r0,r0,r3' in ARM mode + [followed by lots of similar errors] + +This is caused by https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104439, a +gcc bug that has been fixed. To work around this, disable building +crc32_arm() as dynamically-dispatched code on the affected gcc versions. + +Downloaded from upstream commit +https://github.com/ebiggers/libdeflate/commit/d045a4933585fceef38d235727c49d9eac61cd61 + +Signed-off-by: Bernd Kuhls +--- + common/compiler_gcc.h | 29 ++++++++++++++++++++++------- + 1 file changed, 22 insertions(+), 7 deletions(-) + +diff --git a/common/compiler_gcc.h b/common/compiler_gcc.h +index 2a45b05..8ea3ff8 100644 +--- a/common/compiler_gcc.h ++++ b/common/compiler_gcc.h +@@ -122,15 +122,30 @@ + # endif + + /* +- * Determine whether CRC32 intrinsics are supported. ++ * Determine whether ARM CRC32 intrinsics are supported. + * +- * With gcc r274827 or later (gcc 10.1+, 9.3+, or 8.4+), or with clang, +- * they work as expected. (Well, not quite. There's still a bug, but we +- * have to work around it later when including arm_acle.h.) ++ * This support has been affected by several gcc bugs, which we must avoid ++ * by only allowing gcc versions that have the corresponding fixes. First, ++ * gcc commit 943766d37ae4 ("[arm] Fix use of CRC32 intrinsics with Armv8-a ++ * and hard-float"), i.e. gcc 8.4+, 9.3+, 10.1+, or 11+, is needed. ++ * Second, gcc commit c1cdabe3aab8 ("arm: reorder assembler architecture ++ * directives [PR101723]"), i.e. gcc 9.5+, 10.4+, 11.3+, or 12+, is needed ++ * when binutils is 2.34 or later, due to ++ * https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104439. We use the second ++ * set of prerequisites, as they are stricter and we have no way to detect ++ * the binutils version in C source without requiring a configure script. ++ * ++ * Yet another gcc bug makes arm_acle.h sometimes not define the crc ++ * functions even when the corresponding builtins are available. However, ++ * we work around this later when including arm_acle.h. ++ * ++ * Things are a bit easier with clang -- we can just check whether the ++ * crc builtins are available. However, clang's arm_acle.h is broken in ++ * the same way as gcc's, which we work around later in the same way. + */ +-# if GCC_PREREQ(10, 1) || \ +- (GCC_PREREQ(9, 3) && !GCC_PREREQ(10, 0)) || \ +- (GCC_PREREQ(8, 4) && !GCC_PREREQ(9, 0)) || \ ++# if GCC_PREREQ(11, 3) || \ ++ (GCC_PREREQ(10, 4) && !GCC_PREREQ(11, 0)) || \ ++ (GCC_PREREQ(9, 5) && !GCC_PREREQ(10, 0)) || \ + (defined(__clang__) && __has_builtin(__builtin_arm_crc32b)) + # define COMPILER_SUPPORTS_CRC32_TARGET_INTRINSICS 1 + # endif diff --git a/package/libdeflate/Config.in b/package/libdeflate/Config.in new file mode 100644 index 0000000000..d2fb0d6c55 --- /dev/null +++ b/package/libdeflate/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_LIBDEFLATE + bool "libdeflate" + help + Libdeflate is a heavily optimized library for DEFLATE/zlib/ + gzip compression and decompression + + https://github.com/ebiggers/libdeflate diff --git a/package/libdeflate/libdeflate.hash b/package/libdeflate/libdeflate.hash new file mode 100644 index 0000000000..0a941bd8d6 --- /dev/null +++ b/package/libdeflate/libdeflate.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 5c1f75c285cd87202226f4de49985dcb75732f527eefba2b3ddd70a8865f2533 libdeflate-1.10.tar.gz +sha256 5d246dd2537307b80fed9ba5fdddf5d0fe7a8f023393a071182b9daed56b40fe COPYING diff --git a/package/libdeflate/libdeflate.mk b/package/libdeflate/libdeflate.mk new file mode 100644 index 0000000000..08901ed5ed --- /dev/null +++ b/package/libdeflate/libdeflate.mk @@ -0,0 +1,34 @@ +################################################################################ +# +# libdeflate +# +################################################################################ + +LIBDEFLATE_VERSION = 1.10 +LIBDEFLATE_SITE = $(call github,ebiggers,libdeflate,v$(LIBDEFLATE_VERSION)) +LIBDEFLATE_LICENSE = MIT +LIBDEFLATE_LICENSE_FILES = COPYING +LIBDEFLATE_INSTALL_STAGING = YES + +ifeq ($(BR2_STATIC_LIBS),y) +LIBDEFLATE_MAKE_OPTS += DISABLE_SHARED=yes +endif + +define LIBDEFLATE_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \ + $(LIBDEFLATE_MAKE_OPTS) +endef + +define LIBDEFLATE_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \ + $(LIBDEFLATE_MAKE_OPTS) \ + DESTDIR="$(STAGING_DIR)" PREFIX=/usr install +endef + +define LIBDEFLATE_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \ + $(LIBDEFLATE_MAKE_OPTS) \ + DESTDIR="$(TARGET_DIR)" PREFIX=/usr install +endef + +$(eval $(generic-package)) -- 2.30.2 From yann.morin.1998 at free.fr Sun Feb 13 15:00:51 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 13 Feb 2022 16:00:51 +0100 Subject: [Buildroot] [PATCH v6 3/8] package/icu: don't disable renaming for host build In-Reply-To: <20220205201837.3324085-3-james.hilliard1@gmail.com> References: <20220205201837.3324085-1-james.hilliard1@gmail.com> <20220205201837.3324085-3-james.hilliard1@gmail.com> Message-ID: <20220213150051.GB4462@scaer> James, All, On 2022-02-05 13:18 -0700, James Hilliard spake thusly: > Using a different renaming option for the icu host build can cause > issues for packages such as qt5webengine which expect target and > host packages to be built with the same options. This little hand-waving is not explaning the actual error that those packages encounter, nor the root cause for that error. A package that needs both host and target to have the same options is most probably doing somethig wrong, like linking a host program and taking the result as valid for the target... However, our adding the --disable-renaming in the first place in 3911e67151b (icu: security bump to version 51.2) did not provide any explanations why it was needed to begin with. So it is not much uglier to remove it without further explanations either. Yet, a reference to the original commit would be nice, like the little blurb I wrote above maybe... Regards, Yann E. MORIN. > Signed-off-by: James Hilliard > --- > package/icu/icu.mk | 3 +-- > package/nodejs/nodejs.mk | 2 +- > 2 files changed, 2 insertions(+), 3 deletions(-) > > diff --git a/package/icu/icu.mk b/package/icu/icu.mk > index 7e0c96e43a..ebbb1968fc 100644 > --- a/package/icu/icu.mk > +++ b/package/icu/icu.mk > @@ -45,8 +45,7 @@ HOST_ICU_CONF_OPTS = \ > --disable-tests \ > --disable-extras \ > --disable-icuio \ > - --disable-layout \ > - --disable-renaming > + --disable-layout > ICU_SUBDIR = source > HOST_ICU_SUBDIR = source > > diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk > index 727af6dc50..2e41c11dbd 100644 > --- a/package/nodejs/nodejs.mk > +++ b/package/nodejs/nodejs.mk > @@ -94,7 +94,7 @@ NODEJS_HOST_TOOLS_V8 = \ > NODEJS_HOST_TOOLS_NODE = mkcodecache > NODEJS_HOST_TOOLS = $(NODEJS_HOST_TOOLS_V8) $(NODEJS_HOST_TOOLS_NODE) > > -HOST_NODEJS_CXXFLAGS = $(HOST_CXXFLAGS) -DU_DISABLE_RENAMING=1 > +HOST_NODEJS_CXXFLAGS = $(HOST_CXXFLAGS) > > define HOST_NODEJS_BUILD_CMDS > $(HOST_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python3 \ > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Feb 13 15:01:13 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 13 Feb 2022 16:01:13 +0100 Subject: [Buildroot] [PATCH v6 3/8] package/icu: don't disable renaming for host build In-Reply-To: <20220205201837.3324085-3-james.hilliard1@gmail.com> References: <20220205201837.3324085-1-james.hilliard1@gmail.com> <20220205201837.3324085-3-james.hilliard1@gmail.com> Message-ID: <20220213150113.GC4462@scaer> On 2022-02-05 13:18 -0700, James Hilliard spake thusly: > Using a different renaming option for the icu host build can cause > issues for packages such as qt5webengine which expect target and > host packages to be built with the same options. > > Signed-off-by: James Hilliard I forgot to add: Reviewed-by: Yann E. MORIN Regards, Yann E. MORIN. > --- > package/icu/icu.mk | 3 +-- > package/nodejs/nodejs.mk | 2 +- > 2 files changed, 2 insertions(+), 3 deletions(-) > > diff --git a/package/icu/icu.mk b/package/icu/icu.mk > index 7e0c96e43a..ebbb1968fc 100644 > --- a/package/icu/icu.mk > +++ b/package/icu/icu.mk > @@ -45,8 +45,7 @@ HOST_ICU_CONF_OPTS = \ > --disable-tests \ > --disable-extras \ > --disable-icuio \ > - --disable-layout \ > - --disable-renaming > + --disable-layout > ICU_SUBDIR = source > HOST_ICU_SUBDIR = source > > diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk > index 727af6dc50..2e41c11dbd 100644 > --- a/package/nodejs/nodejs.mk > +++ b/package/nodejs/nodejs.mk > @@ -94,7 +94,7 @@ NODEJS_HOST_TOOLS_V8 = \ > NODEJS_HOST_TOOLS_NODE = mkcodecache > NODEJS_HOST_TOOLS = $(NODEJS_HOST_TOOLS_V8) $(NODEJS_HOST_TOOLS_NODE) > > -HOST_NODEJS_CXXFLAGS = $(HOST_CXXFLAGS) -DU_DISABLE_RENAMING=1 > +HOST_NODEJS_CXXFLAGS = $(HOST_CXXFLAGS) > > define HOST_NODEJS_BUILD_CMDS > $(HOST_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python3 \ > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Feb 13 15:06:21 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 13 Feb 2022 16:06:21 +0100 Subject: [Buildroot] [PATCH v6 4/8] package/qt5/qt5base: enable ccache via configure option In-Reply-To: <20220205201837.3324085-4-james.hilliard1@gmail.com> References: <20220205201837.3324085-1-james.hilliard1@gmail.com> <20220205201837.3324085-4-james.hilliard1@gmail.com> Message-ID: <20220213150621.GD4462@scaer> James, All, +Arnout On 2022-02-05 13:18 -0700, James Hilliard spake thusly: > This should be cleaner than editing mkspecs/common/g++-base.conf. Is this actually fixing something? Is ccache as we sue it badly handled by the qt5webengin buildsystem somehow? Thomas, Arnout: IIRC some time ago, there were talks about using the compiler wrapper also for the host compiler. Maybe this would solve this kind of situations? Regards, Yann E. MORIN. > Signed-off-by: James Hilliard > --- > package/qt5/qt5base/qt5base.mk | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk > index d8a0bf1d16..4b7a2a937d 100644 > --- a/package/qt5/qt5base/qt5base.mk > +++ b/package/qt5/qt5base/qt5base.mk > @@ -289,10 +289,9 @@ endef > endif > > # This allows to use ccache when available > -define QT5BASE_CONFIGURE_HOSTCC > - $(SED) 's,^QMAKE_CC\s*=.*,QMAKE_CC = $(HOSTCC),' $(@D)/mkspecs/common/g++-base.conf > - $(SED) 's,^QMAKE_CXX\s*=.*,QMAKE_CXX = $(HOSTCXX),' $(@D)/mkspecs/common/g++-base.conf > -endef > +ifeq ($(BR2_CCACHE),y) > +QT5BASE_CONFIGURE_OPTS += -ccache > +endif > > # Must be last so can override all options set by Buildroot > QT5BASE_CONFIGURE_OPTS += $(call qstrip,$(BR2_PACKAGE_QT5BASE_CUSTOM_CONF_OPTS)) > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From arnout at mind.be Sun Feb 13 15:06:57 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 16:06:57 +0100 Subject: [Buildroot] [PATCH 01/16] board/aarch64-efi/genimage-efi: convert partition-type-uuid to single letter notation In-Reply-To: <20220207173751.GA2249818@scaer> References: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> <20220206200532.2758493-2-giulio.benetti@benettiengineering.com> <20220206213657.GA457876@scaer> <20220207085517.5c13c097@windsurf> <20220207173751.GA2249818@scaer> Message-ID: On 07/02/2022 18:37, Yann E. MORIN wrote: > Thomas, All, > > On 2022-02-07 08:55 +0100, Thomas Petazzoni spake thusly: >> On Sun, 6 Feb 2022 22:36:57 +0100 >> "Yann E. MORIN" wrote: >>>> partition root { >>>> - partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae >>>> + partition-type-uuid = L >>> As we discussed on IRC, this is not the same thing. genimage will extend >>> the 'L' shorthand to the full UUID 0fc63daf-8483-4772-8e79-3d69d8477de4, >>> which is different. >> And? Is that really important? >>> So I don't think uaing the shorthands are correct. >> Why? > > I think that it is important that we do adhere to the expected values; > see below... > >>> The UUID assignments are available on Wikipedia: >>> https://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs >>> But the systemd docuemntation has extra UUID definitions: >>> https://man.archlinux.org/man/systemd-gpt-auto-generator.8 >> Yes, but how useful are they? > > Why would we diverge from the specs? > >> Unless these systemd-defined UUID are really relevant, I would prefer >> that we use the shortcuts provided by genimage wherever possible, and >> only rely on using the full UUID for special cases, such as the >> board/sifive/hifive-unleashed/genimage_sdcard.cfg (PATCH 15/16). > > There are tools that expect those values, to autodetect partitions. This > is the case, of course, of systemd-gpt-auto-generator, which will lookup > the partition UUIDs, but other tools may expect these UUIDs too. At least for systemd-gpt-auto-generator, the UUID for rootfs is only relevant in case systemd is the one mounting the rootfs, i.e. in case of it running from initramfs and pivoting into a mounted root. That is not a scenario that we support in Buildroot, by a long shot. Therefore, my suggestion would be to use the default Linux partition type for the rootfs, i.e. L. Since this is actually the default for genimage, I would even leave it out completely. Giulio, that would mean rewriting this series and removing everywhere L is specified. Do you agree with that? > I am not saying that we would cause trouble by changing our board > descriptions, but if we want to allow people to just copy them as the > base for their own development, then diverging from expected behaviour > is not nice. I think the cases where a non-standard (where "standard" means the actual GPT standard, not the additional stuff that systemd invented) partition type is relevant are going to be so unusual that the default we put in our genimage.cfg is going to be of no relevance whatsoever. Regards, Arnout > >> This way, it would be pretty clear that we have the "common cases" (boot >> partition, rootfs partition) and the "odd/special cases". > > I think the "common case" would be "adhere to spec, use specified > values", while the exceptions are "the spec says nothing, use something > else and comment it". > > Regards, > Yann E. MORIN. > From arnout at mind.be Sun Feb 13 15:18:54 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 16:18:54 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/rygel: gobject-introspection is mandatory In-Reply-To: <20220206095359.854435-1-fontaine.fabrice@gmail.com> References: <20220206095359.854435-1-fontaine.fabrice@gmail.com> Message-ID: <9e24e8c1-2b12-59c1-82a9-6ef49557132f@mind.be> On 06/02/2022 10:53, Fabrice Fontaine wrote: > vapi (and gobject-introspection) is mandatory since bump to version > 0.40.2 in commit 6acdbb81c8d6cdd3ecb476ae24e72fd4547011c3: > > valac -C --pkg posix --pkg libxml-2.0 --pkg gmodule-2.0 --pkg gio-2.0 --pkg gssdp-1.2 --pkg gee-0.8 --pkg gupnp-1.2 --target-glib ' 2.56' --pkg glib-2.0 --color=always --directory src/librygel-core/librygel-core-2.6.so.2.0.4.p --basedir ../src/librygel-core --library rygel-core-2.6 --header src/librygel-core/rygel-core.h --vapi ../rygel-core-2.6.vapi --gir ../Rygel-2.6.gir ../src/librygel-core/rygel-build-config.vapi ../src/librygel-core/rygel-connection-manager.vala ../src/librygel-core/rygel-basic-management.vala ../src/librygel-core/rygel-basic-management-test.vala ../src/librygel-core/rygel-basic-management-test-ping.vala ../src/librygel-core/rygel-basic-management-test-nslookup.vala ../src/librygel-core/rygel-basic-management-test-traceroute.vala ../src/librygel-core/rygel-description-file.vala ../src/librygel-core/rygel-dlna-profile.vala ../src/librygel-core/rygel-energy-management.vala ../src/librygel-core/rygel-root-device.vala ../src/librygel-core/rygel-root-device-factory.v > ala ../src/librygel-core/rygel-dbus-interface.vala ../src/librygel-core/rygel-log-handler.vala ../src/librygel-core/rygel-meta-config.vala ../src/librygel-core/rygel-plugin-loader.vala ../src/librygel-core/rygel-recursive-module-loader.vala ../src/librygel-core/rygel-plugin.vala ../src/librygel-core/rygel-resource-info.vala ../src/librygel-core/rygel-media-device.vala ../src/librygel-core/rygel-configuration.vala ../src/librygel-core/rygel-base-configuration.vala ../src/librygel-core/rygel-cmdline-config.vala ../src/librygel-core/rygel-environment-config.vala ../src/librygel-core/rygel-user-config.vala ../src/librygel-core/rygel-state-machine.vala ../src/librygel-core/rygel-v1-hacks.vala ../src/librygel-core/rygel-icon-info.vala ../src/librygel-core/rygel-xml-utils.vala ../src/librygel-core/rygel-plugin-information.vala > error: Package `gssdp-1.2' not found in specified Vala API directories or GObject-Introspection GIR directories > error: Package `gupnp-1.2' not found in specified Vala API directories or GObject-Introspection GIR directories > > Depends on BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES instead of selecting > it to avoid the following recursive dependency: > > package/gstreamer1/gstreamer1/Config.in:5:error: recursive dependency detected! > package/gstreamer1/gstreamer1/Config.in:5: symbol BR2_PACKAGE_GSTREAMER1 is selected by BR2_PACKAGE_RYGEL_MEDIA_ENGINE_GSTREAMER1 > package/rygel/Config.in:46: symbol BR2_PACKAGE_RYGEL_MEDIA_ENGINE_GSTREAMER1 is part of choice > package/rygel/Config.in:39: choice contains symbol > package/rygel/Config.in:39: choice contains symbol BR2_PACKAGE_RYGEL > package/rygel/Config.in:1: symbol BR2_PACKAGE_RYGEL depends on BR2_PACKAGE_PYTHON3 > package/python3/Config.in:5: symbol BR2_PACKAGE_PYTHON3 is selected by BR2_PACKAGE_JACK2_DBUS > package/jack2/Config.in:35: symbol BR2_PACKAGE_JACK2_DBUS depends on BR2_PACKAGE_JACK2 > package/jack2/Config.in:1: symbol BR2_PACKAGE_JACK2 is selected by BR2_PACKAGE_FLUIDSYNTH_JACK2 > package/fluidsynth/Config.in:37: symbol BR2_PACKAGE_FLUIDSYNTH_JACK2 depends on BR2_PACKAGE_FLUIDSYNTH > package/fluidsynth/Config.in:1: symbol BR2_PACKAGE_FLUIDSYNTH is selected by BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FLUIDSYNTH > package/gstreamer1/gst1-plugins-bad/Config.in:425: symbol BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FLUIDSYNTH depends on BR2_PACKAGE_GSTREAMER1 I think that now python2 has been removed, we can select python3 for gobject-introspection instead of depending on it, and that that would break this circular dependency. select python3 would also allow us to remove the python3 dependency from all transitive dependencies of gobject-introspection. Regards, Arnout > > Fixes: > - http://autobuild.buildroot.org/results/027ce84895fab6fb251dd37cd5cfb7169287a2de > > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2: > - Depends on BR2_PACKAGE_{PYTHON3,GSTREAMER1_EDITING_SERVICES} > > package/rygel/Config.in | 23 +++++++++++++++++------ > package/rygel/rygel.mk | 9 ++------- > 2 files changed, 19 insertions(+), 13 deletions(-) > > diff --git a/package/rygel/Config.in b/package/rygel/Config.in > index df48918833..30e8430537 100644 > --- a/package/rygel/Config.in > +++ b/package/rygel/Config.in > @@ -2,8 +2,14 @@ config BR2_PACKAGE_RYGEL > bool "rygel" > depends on BR2_USE_WCHAR # gupnp-av > depends on BR2_TOOLCHAIN_HAS_THREADS # gupnp-av > - depends on BR2_USE_MMU # gupnp-av > + depends on BR2_USE_MMU # gupnp-av, gobject-introspection > + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS # gobject-introspection > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # gobject-introspection > + depends on BR2_HOST_GCC_AT_LEAST_8 # gobject-introspection -> host-qemu > + depends on BR2_TOOLCHAIN_USES_GLIBC # gobject-introspection > + depends on BR2_PACKAGE_PYTHON3 # gobject-introspection > select BR2_PACKAGE_GDK_PIXBUF > + select BR2_PACKAGE_GOBJECT_INTROSPECTION > select BR2_PACKAGE_GUPNP_AV > select BR2_PACKAGE_GUPNP_DLNA > select BR2_PACKAGE_LIBGEE > @@ -39,14 +45,19 @@ config BR2_PACKAGE_RYGEL_MEDIA_ENGINE_SIMPLE > > config BR2_PACKAGE_RYGEL_MEDIA_ENGINE_GSTREAMER1 > bool "gstreamer1" > - select BR2_PACKAGE_GSTREAMER1 > - select BR2_PACKAGE_GST1_PLUGINS_BASE > - select BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES > + depends on BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES > + > +comment "gstreamer1 needs gst1-editing-services" > + depends on !BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES > > endchoice > > -comment "rygel needs a toolchain w/ wchar, threads" > +comment "rygel needs a glibc toolchain w/ wchar, threads, gcc >= 4.9, host gcc >= 8" > depends on BR2_USE_MMU > - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS > + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS > + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ > + !BR2_TOOLCHAIN_USES_GLIBC || \ > + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ > + !BR2_HOST_GCC_AT_LEAST_8 > > endif # BR2_PACKAGE_RYGEL > diff --git a/package/rygel/rygel.mk b/package/rygel/rygel.mk > index c541cdc0ed..bfcd5df3c6 100644 > --- a/package/rygel/rygel.mk > +++ b/package/rygel/rygel.mk > @@ -12,6 +12,7 @@ RYGEL_LICENSE = LGPL-2.1+, CC-BY-SA-3.0 (logo) > RYGEL_LICENSE_FILES = COPYING COPYING.logo > RYGEL_DEPENDENCIES = \ > gdk-pixbuf \ > + gobject-introspection \ > gupnp-av \ > gupnp-dlna \ > libgee \ > @@ -24,16 +25,10 @@ RYGEL_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) > RYGEL_CONF_OPTS += \ > -Dapi-docs=false \ > -Dexamples=false \ > + -Dintrospection=enabled \ > -Dtests=false > RYGEL_PLUGINS = external,lms,mpris,ruih > > -ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) > -RYGEL_CONF_OPTS += -Dintrospection=enabled > -RYGEL_DEPENDENCIES += gobject-introspection > -else > -RYGEL_CONF_OPTS += -Dintrospection=disabled > -endif > - > ifeq ($(BR2_PACKAGE_RYGEL_MEDIA_ENGINE_GSTREAMER1),y) > RYGEL_CONF_OPTS += \ > -Dengines=gstreamer \ From arnout at mind.be Sun Feb 13 15:21:26 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 16:21:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/mpd: ignore CVE-2020-746[56] intended for FreeBSD PPP daemon In-Reply-To: <20220203094746.22715-1-br015@umbiko.net> References: <20220203094746.22715-1-br015@umbiko.net> Message-ID: <48283b3f-b38a-051c-40cc-e8473d11e9c1@mind.be> On 03/02/2022 10:47, Andreas Ziegler wrote: > cpe:2.3:a:mpd_project:mpd:*:*:*:*:*:*:*:* is not a valid CPE > identifier for mpd (musicpd.org); this string refers to > MPD /FreeBSD PPP daemon (sourceforge.net/projects/mpd) > > Since mpd does not have entries in the CVE database, put these > two CVE identifiers on the mpd ignore list: > > https://nvd.nist.gov/vuln/detail/CVE-2020-7465 > https://nvd.nist.gov/vuln/detail/CVE-2020-7466 > > Signed-off-by: Andreas Ziegler Applied to master, thanks. Regards, Arnout > --- > package/mpd/mpd.mk | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk > index 6f01b29c6d..a55e4adde2 100644 > --- a/package/mpd/mpd.mk > +++ b/package/mpd/mpd.mk > @@ -11,6 +11,8 @@ 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 > +# these refer to the FreeBSD PPP daemon > +MPD_IGNORE_CVES = CVE-2020-7465 CVE-2020-7466 > MPD_SELINUX_MODULES = mpd > MPD_CONF_OPTS = \ > -Daudiofile=disabled \ From arnout at mind.be Sun Feb 13 15:21:57 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 16:21:57 +0100 Subject: [Buildroot] [PATCH 1/1] configs/qemu_*: bump kernel version to 5.15.18 In-Reply-To: <20220203155951.1277343-1-david.heng@smile.fr> References: <20220203155951.1277343-1-david.heng@smile.fr> Message-ID: On 03/02/2022 16:59, David HENG wrote: > See runtimes test here : > https://gitlab.com/davidheng.pw/buildroot/-/pipelines/460019580 > > Signed-off-by: David HENG Applied to master, thanks. Regards, Arnout > --- > It seems that qemu_s390x_defconfig made a timeout on Gitlab shared-runner at the end but work after a restarting. > https://gitlab.com/davidheng.pw/buildroot/-/jobs/2044971657 > --- > configs/qemu_aarch64_sbsa_defconfig | 2 +- > configs/qemu_aarch64_virt_defconfig | 2 +- > configs/qemu_arm_versatile_defconfig | 2 +- > configs/qemu_arm_versatile_nommu_defconfig | 2 +- > configs/qemu_arm_vexpress_defconfig | 2 +- > configs/qemu_arm_vexpress_tz_defconfig | 2 +- > configs/qemu_m68k_mcf5208_defconfig | 2 +- > configs/qemu_m68k_q800_defconfig | 2 +- > configs/qemu_microblazebe_mmu_defconfig | 2 +- > configs/qemu_microblazeel_mmu_defconfig | 2 +- > configs/qemu_mips32r2_malta_defconfig | 2 +- > configs/qemu_mips32r2el_malta_defconfig | 2 +- > configs/qemu_mips32r6_malta_defconfig | 2 +- > configs/qemu_mips32r6el_malta_defconfig | 2 +- > configs/qemu_mips64_malta_defconfig | 2 +- > configs/qemu_mips64el_malta_defconfig | 2 +- > configs/qemu_mips64r6_malta_defconfig | 2 +- > configs/qemu_mips64r6el_malta_defconfig | 2 +- > configs/qemu_nios2_10m50_defconfig | 2 +- > configs/qemu_or1k_defconfig | 2 +- > configs/qemu_ppc64_e5500_defconfig | 2 +- > configs/qemu_ppc64_pseries_defconfig | 2 +- > configs/qemu_ppc64le_powernv8_defconfig | 2 +- > configs/qemu_ppc64le_pseries_defconfig | 2 +- > configs/qemu_ppc_bamboo_defconfig | 2 +- > configs/qemu_ppc_e500mc_defconfig | 2 +- > configs/qemu_ppc_g3beige_defconfig | 2 +- > configs/qemu_ppc_mac99_defconfig | 2 +- > configs/qemu_ppc_mpc8544ds_defconfig | 2 +- > configs/qemu_riscv32_virt_defconfig | 2 +- > configs/qemu_riscv64_virt_defconfig | 2 +- > configs/qemu_s390x_defconfig | 2 +- > configs/qemu_sh4_r2d_defconfig | 2 +- > configs/qemu_sh4eb_r2d_defconfig | 2 +- > configs/qemu_sparc64_sun4u_defconfig | 2 +- > configs/qemu_sparc_ss10_defconfig | 2 +- > configs/qemu_x86_64_defconfig | 2 +- > configs/qemu_x86_defconfig | 2 +- > configs/qemu_xtensa_lx60_defconfig | 2 +- > configs/qemu_xtensa_lx60_nommu_defconfig | 2 +- > 40 files changed, 40 insertions(+), 40 deletions(-) > > diff --git a/configs/qemu_aarch64_sbsa_defconfig b/configs/qemu_aarch64_sbsa_defconfig > index e7d3bd03ca..2d6134e78c 100644 > --- a/configs/qemu_aarch64_sbsa_defconfig > +++ b/configs/qemu_aarch64_sbsa_defconfig > @@ -25,7 +25,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.18" > BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > > diff --git a/configs/qemu_aarch64_virt_defconfig b/configs/qemu_aarch64_virt_defconfig > index 9fbf293311..03df0ad9e2 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.16" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig > index 5e399d17de..4f43273a82 100644 > --- a/configs/qemu_arm_versatile_defconfig > +++ b/configs/qemu_arm_versatile_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.18" > BR2_LINUX_KERNEL_DEFCONFIG="versatile" > BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-versatile/linux.fragment" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > diff --git a/configs/qemu_arm_versatile_nommu_defconfig b/configs/qemu_arm_versatile_nommu_defconfig > index 1357742703..0c49d1b67d 100644 > --- a/configs/qemu_arm_versatile_nommu_defconfig > +++ b/configs/qemu_arm_versatile_nommu_defconfig > @@ -31,7 +31,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.18" > BR2_LINUX_KERNEL_DEFCONFIG="versatile" > BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-versatile/linux-nommu.fragment" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > diff --git a/configs/qemu_arm_vexpress_defconfig b/configs/qemu_arm_vexpress_defconfig > index dafcc37bc0..2c813456f4 100644 > --- a/configs/qemu_arm_vexpress_defconfig > +++ b/configs/qemu_arm_vexpress_defconfig > @@ -25,7 +25,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.18" > BR2_LINUX_KERNEL_DEFCONFIG="vexpress" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" > diff --git a/configs/qemu_arm_vexpress_tz_defconfig b/configs/qemu_arm_vexpress_tz_defconfig > index 327762277b..def11721ae 100644 > --- a/configs/qemu_arm_vexpress_tz_defconfig > +++ b/configs/qemu_arm_vexpress_tz_defconfig > @@ -22,7 +22,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.18" > BR2_LINUX_KERNEL_DEFCONFIG="vexpress" > BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-vexpress-tz/linux.fragment" > > diff --git a/configs/qemu_m68k_mcf5208_defconfig b/configs/qemu_m68k_mcf5208_defconfig > index 1dcd8272c3..0490b9e29e 100644 > --- a/configs/qemu_m68k_mcf5208_defconfig > +++ b/configs/qemu_m68k_mcf5208_defconfig > @@ -19,7 +19,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.18" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-mcf5208/linux.config" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_m68k_q800_defconfig b/configs/qemu_m68k_q800_defconfig > index 7bf8b4061f..30d8982db3 100644 > --- a/configs/qemu_m68k_q800_defconfig > +++ b/configs/qemu_m68k_q800_defconfig > @@ -19,7 +19,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.18" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-q800/linux.config" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_microblazebe_mmu_defconfig b/configs/qemu_microblazebe_mmu_defconfig > index 0508f92c36..7bd2ae53b8 100644 > --- a/configs/qemu_microblazebe_mmu_defconfig > +++ b/configs/qemu_microblazebe_mmu_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.18" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux.config" > BR2_LINUX_KERNEL_LINUX_BIN=y > diff --git a/configs/qemu_microblazeel_mmu_defconfig b/configs/qemu_microblazeel_mmu_defconfig > index 10811e284e..cd8c5a3cb2 100644 > --- a/configs/qemu_microblazeel_mmu_defconfig > +++ b/configs/qemu_microblazeel_mmu_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.18" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux.config" > BR2_LINUX_KERNEL_LINUX_BIN=y > diff --git a/configs/qemu_mips32r2_malta_defconfig b/configs/qemu_mips32r2_malta_defconfig > index c08ca862c5..49d84c308b 100644 > --- a/configs/qemu_mips32r2_malta_defconfig > +++ b/configs/qemu_mips32r2_malta_defconfig > @@ -19,7 +19,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.18" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2-malta/linux.config" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_mips32r2el_malta_defconfig b/configs/qemu_mips32r2el_malta_defconfig > index 0bb16b9320..5363018c47 100644 > --- a/configs/qemu_mips32r2el_malta_defconfig > +++ b/configs/qemu_mips32r2el_malta_defconfig > @@ -19,7 +19,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.18" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2el-malta/linux.config" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_mips32r6_malta_defconfig b/configs/qemu_mips32r6_malta_defconfig > index f7b218c62a..f77feb9b6d 100644 > --- a/configs/qemu_mips32r6_malta_defconfig > +++ b/configs/qemu_mips32r6_malta_defconfig > @@ -19,7 +19,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.18" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6-malta/linux.config" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_mips32r6el_malta_defconfig b/configs/qemu_mips32r6el_malta_defconfig > index d0f118ff90..575034441a 100644 > --- a/configs/qemu_mips32r6el_malta_defconfig > +++ b/configs/qemu_mips32r6el_malta_defconfig > @@ -19,7 +19,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.18" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6el-malta/linux.config" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_mips64_malta_defconfig b/configs/qemu_mips64_malta_defconfig > index fe03b911c5..e9438fda1e 100644 > --- a/configs/qemu_mips64_malta_defconfig > +++ b/configs/qemu_mips64_malta_defconfig > @@ -19,7 +19,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.18" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux.config" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_mips64el_malta_defconfig b/configs/qemu_mips64el_malta_defconfig > index c6d428226c..4b1c8e22af 100644 > --- a/configs/qemu_mips64el_malta_defconfig > +++ b/configs/qemu_mips64el_malta_defconfig > @@ -19,7 +19,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.18" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64el-malta/linux.config" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_mips64r6_malta_defconfig b/configs/qemu_mips64r6_malta_defconfig > index 9cf651a4ba..87ef7902af 100644 > --- a/configs/qemu_mips64r6_malta_defconfig > +++ b/configs/qemu_mips64r6_malta_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.18" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6-malta/linux.config" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_mips64r6el_malta_defconfig b/configs/qemu_mips64r6el_malta_defconfig > index 0d02a5b4df..5774207f65 100644 > --- a/configs/qemu_mips64r6el_malta_defconfig > +++ b/configs/qemu_mips64r6el_malta_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.18" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6el-malta/linux.config" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_nios2_10m50_defconfig b/configs/qemu_nios2_10m50_defconfig > index 44afb928e3..4b9c53e8de 100644 > --- a/configs/qemu_nios2_10m50_defconfig > +++ b/configs/qemu_nios2_10m50_defconfig > @@ -1,7 +1,7 @@ > BR2_nios2=y > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > BR2_LINUX_KERNEL_DEFCONFIG="10m50" > BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/nios2-10m50/linux.fragment" > BR2_TARGET_ROOTFS_INITRAMFS=y > diff --git a/configs/qemu_or1k_defconfig b/configs/qemu_or1k_defconfig > index 9d55cb3420..b3d9d79156 100644 > --- a/configs/qemu_or1k_defconfig > +++ b/configs/qemu_or1k_defconfig > @@ -15,7 +15,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.18" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/or1k/linux.config" > > diff --git a/configs/qemu_ppc64_e5500_defconfig b/configs/qemu_ppc64_e5500_defconfig > index 09aac50252..072240c99c 100644 > --- a/configs/qemu_ppc64_e5500_defconfig > +++ b/configs/qemu_ppc64_e5500_defconfig > @@ -16,7 +16,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.18" > BR2_LINUX_KERNEL_DEFCONFIG="corenet64_smp" > BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc64-e5500/linux.fragment" > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > diff --git a/configs/qemu_ppc64_pseries_defconfig b/configs/qemu_ppc64_pseries_defconfig > index 1a20e2ee0e..ad523ec2ef 100644 > --- a/configs/qemu_ppc64_pseries_defconfig > +++ b/configs/qemu_ppc64_pseries_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.18" > BR2_LINUX_KERNEL_DEFCONFIG="pseries" > BR2_LINUX_KERNEL_VMLINUX=y > > diff --git a/configs/qemu_ppc64le_powernv8_defconfig b/configs/qemu_ppc64le_powernv8_defconfig > index d8ea6655fc..a784695ddf 100644 > --- a/configs/qemu_ppc64le_powernv8_defconfig > +++ b/configs/qemu_ppc64le_powernv8_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.18" > BR2_LINUX_KERNEL_DEFCONFIG="powernv" > BR2_LINUX_KERNEL_VMLINUX=y > > diff --git a/configs/qemu_ppc64le_pseries_defconfig b/configs/qemu_ppc64le_pseries_defconfig > index 46f62b8313..f10b0fdf40 100644 > --- a/configs/qemu_ppc64le_pseries_defconfig > +++ b/configs/qemu_ppc64le_pseries_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.18" > BR2_LINUX_KERNEL_DEFCONFIG="pseries_le" > BR2_LINUX_KERNEL_VMLINUX=y > > diff --git a/configs/qemu_ppc_bamboo_defconfig b/configs/qemu_ppc_bamboo_defconfig > index d6abbeb452..6129c4a663 100644 > --- a/configs/qemu_ppc_bamboo_defconfig > +++ b/configs/qemu_ppc_bamboo_defconfig > @@ -19,7 +19,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.18" > BR2_LINUX_KERNEL_DEFCONFIG="44x/bamboo" > BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-bamboo/linux.fragment" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_ppc_e500mc_defconfig b/configs/qemu_ppc_e500mc_defconfig > index 232bc1f70c..1853e538bb 100644 > --- a/configs/qemu_ppc_e500mc_defconfig > +++ b/configs/qemu_ppc_e500mc_defconfig > @@ -16,7 +16,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.18" > BR2_LINUX_KERNEL_DEFCONFIG="corenet32_smp" > BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-e500mc/linux.fragment" > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > diff --git a/configs/qemu_ppc_g3beige_defconfig b/configs/qemu_ppc_g3beige_defconfig > index 824fe648ab..9bbebede1b 100644 > --- a/configs/qemu_ppc_g3beige_defconfig > +++ b/configs/qemu_ppc_g3beige_defconfig > @@ -19,7 +19,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.18" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-g3beige/linux.config" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_ppc_mac99_defconfig b/configs/qemu_ppc_mac99_defconfig > index ddeb99465a..e9629ff233 100644 > --- a/configs/qemu_ppc_mac99_defconfig > +++ b/configs/qemu_ppc_mac99_defconfig > @@ -11,7 +11,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.18" > BR2_LINUX_KERNEL_DEFCONFIG="pmac32" > BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-mac99/linux.fragment" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_ppc_mpc8544ds_defconfig b/configs/qemu_ppc_mpc8544ds_defconfig > index 1a72d81ed5..2b51573da9 100644 > --- a/configs/qemu_ppc_mpc8544ds_defconfig > +++ b/configs/qemu_ppc_mpc8544ds_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.18" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-mpc8544ds/linux.config" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_riscv32_virt_defconfig b/configs/qemu_riscv32_virt_defconfig > index e2753cfcfd..dff87ef342 100644 > --- a/configs/qemu_riscv32_virt_defconfig > +++ b/configs/qemu_riscv32_virt_defconfig > @@ -19,7 +19,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.18" > BR2_LINUX_KERNEL_DEFCONFIG="rv32" > BR2_LINUX_KERNEL_IMAGE=y > > diff --git a/configs/qemu_riscv64_virt_defconfig b/configs/qemu_riscv64_virt_defconfig > index 07f20776f0..d67d070185 100644 > --- a/configs/qemu_riscv64_virt_defconfig > +++ b/configs/qemu_riscv64_virt_defconfig > @@ -19,7 +19,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.18" > BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > BR2_LINUX_KERNEL_IMAGE=y > > diff --git a/configs/qemu_s390x_defconfig b/configs/qemu_s390x_defconfig > index 86ac1fd024..346df04ada 100644 > --- a/configs/qemu_s390x_defconfig > +++ b/configs/qemu_s390x_defconfig > @@ -17,7 +17,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.18" > BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > > diff --git a/configs/qemu_sh4_r2d_defconfig b/configs/qemu_sh4_r2d_defconfig > index c8177e6096..0f12b7dfe9 100644 > --- a/configs/qemu_sh4_r2d_defconfig > +++ b/configs/qemu_sh4_r2d_defconfig > @@ -20,7 +20,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > # Linux 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.18" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux.config" > BR2_LINUX_KERNEL_ZIMAGE=y > diff --git a/configs/qemu_sh4eb_r2d_defconfig b/configs/qemu_sh4eb_r2d_defconfig > index f334569779..d5ee371e79 100644 > --- a/configs/qemu_sh4eb_r2d_defconfig > +++ b/configs/qemu_sh4eb_r2d_defconfig > @@ -19,7 +19,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > # Linux 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.18" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4eb-r2d/linux.config" > BR2_LINUX_KERNEL_ZIMAGE=y > diff --git a/configs/qemu_sparc64_sun4u_defconfig b/configs/qemu_sparc64_sun4u_defconfig > index 941439d338..485b497e71 100644 > --- a/configs/qemu_sparc64_sun4u_defconfig > +++ b/configs/qemu_sparc64_sun4u_defconfig > @@ -19,7 +19,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > # Linux 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.18" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc64-sun4u/linux.config" > > diff --git a/configs/qemu_sparc_ss10_defconfig b/configs/qemu_sparc_ss10_defconfig > index 62d3acb16b..2ba04c0864 100644 > --- a/configs/qemu_sparc_ss10_defconfig > +++ b/configs/qemu_sparc_ss10_defconfig > @@ -19,7 +19,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > # Linux 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.18" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc-ss10/linux.config" > > diff --git a/configs/qemu_x86_64_defconfig b/configs/qemu_x86_64_defconfig > index 1bca76df44..cc505a8540 100644 > --- a/configs/qemu_x86_64_defconfig > +++ b/configs/qemu_x86_64_defconfig > @@ -21,7 +21,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.18" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux.config" > BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y > diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig > index 54cf8e9794..34b7e2d292 100644 > --- a/configs/qemu_x86_defconfig > +++ b/configs/qemu_x86_defconfig > @@ -22,7 +22,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.18" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux.config" > > diff --git a/configs/qemu_xtensa_lx60_defconfig b/configs/qemu_xtensa_lx60_defconfig > index 1db3fd3ce4..cb78106091 100644 > --- a/configs/qemu_xtensa_lx60_defconfig > +++ b/configs/qemu_xtensa_lx60_defconfig > @@ -21,7 +21,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.18" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux.config" > BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y > diff --git a/configs/qemu_xtensa_lx60_nommu_defconfig b/configs/qemu_xtensa_lx60_nommu_defconfig > index d4c07b574c..c4473fb32a 100644 > --- a/configs/qemu_xtensa_lx60_nommu_defconfig > +++ b/configs/qemu_xtensa_lx60_nommu_defconfig > @@ -25,7 +25,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.18" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux-nommu.config" > BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y From arnout at mind.be Sun Feb 13 15:21:36 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 16:21:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/mpdecimal: fix build without threads In-Reply-To: <20220205145039.439160-1-fontaine.fabrice@gmail.com> References: <20220205145039.439160-1-fontaine.fabrice@gmail.com> Message-ID: <052f34a5-6ae9-2cb4-e4b0-b6549beaf14a@mind.be> On 05/02/2022 15:50, Fabrice Fontaine wrote: > Fix the following build failure raised since bump to version 2.5.1 in > commit 995c093d6a3e8042110d6a8d96fdc7ad65a557c4: > > /home/peko/autobuild/instance-0/output-1/per-package/mpdecimal/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: cannot find -lpthread > > Fixes: > - http://autobuild.buildroot.org/results/b20c090f2ac5ea6d1c761820763037b87bde137a > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/mpdecimal/mpdecimal.mk | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/package/mpdecimal/mpdecimal.mk b/package/mpdecimal/mpdecimal.mk > index 25c12c08b1..aa322df340 100644 > --- a/package/mpdecimal/mpdecimal.mk > +++ b/package/mpdecimal/mpdecimal.mk > @@ -11,6 +11,9 @@ MPDECIMAL_LICENSE = BSD-2-Clause > MPDECIMAL_LICENSE_FILES = LICENSE.txt > MPDECIMAL_CONF_OPTS = LD="$(TARGET_CC)" > > +# threads are only needed for tests > +MPDECIMAL_MAKE_OPTS = MPD_PTHREAD= > + > # On i386, by default, mpdecimal tries to uses which is not > # available in musl/uclibc. So in this case, we tell mpdecimal to use > # the generic 32 bits code, which is anyway the one used on ARM, From arnout at mind.be Sun Feb 13 15:22:20 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 16:22:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/dt-utils: use snapshot tarball In-Reply-To: <20220203222639.725822-1-fontaine.fabrice@gmail.com> References: <20220203222639.725822-1-fontaine.fabrice@gmail.com> Message-ID: On 03/02/2022 23:26, Fabrice Fontaine wrote: > Use snapshot tarball so DT_UTILS_VERSION will match what is returned by > https://release-monitoring.org > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/dt-utils/dt-utils.hash | 2 +- > package/dt-utils/dt-utils.mk | 6 +++--- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/dt-utils/dt-utils.hash b/package/dt-utils/dt-utils.hash > index 74819158bb..9fca594db5 100644 > --- a/package/dt-utils/dt-utils.hash > +++ b/package/dt-utils/dt-utils.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 8b29d3a8799170afdb1b077e655528bf4e6afe0c789107b1eec8fff9d4482771 dt-utils-v2021.03.0-br1.tar.gz > +sha256 63cf47c70911bb3605bafac38a5a7e19eb753ac1c90de2abceaf2fdefd71be6d dt-utils-2021.03.0.tar.xz > sha256 a45932c79317d15116eadbf1c9c6fc59117ec3c4621db3a876066defa723963b COPYING > diff --git a/package/dt-utils/dt-utils.mk b/package/dt-utils/dt-utils.mk > index bc7fd90631..d264e2cdc9 100644 > --- a/package/dt-utils/dt-utils.mk > +++ b/package/dt-utils/dt-utils.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -DT_UTILS_VERSION = v2021.03.0 > -DT_UTILS_SITE = https://git.pengutronix.de/git/tools/dt-utils > -DT_UTILS_SITE_METHOD = git > +DT_UTILS_VERSION = 2021.03.0 > +DT_UTILS_SOURCE = dt-utils-$(DT_UTILS_VERSION).tar.xz > +DT_UTILS_SITE = https://git.pengutronix.de/cgit/tools/dt-utils/snapshot > DT_UTILS_LICENSE = GPL-2.0 > DT_UTILS_LICENSE_FILES = COPYING > DT_UTILS_DEPENDENCIES = udev From arnout at mind.be Sun Feb 13 15:23:17 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 16:23:17 +0100 Subject: [Buildroot] [PATCH] board/radxa/rockpi-n8:use partition-type-uuid for genimage-15 In-Reply-To: <20220204000657.747245-1-giulio.benetti@benettiengineering.com> References: <20220204000657.747245-1-giulio.benetti@benettiengineering.com> Message-ID: <09ecf96b-e69d-c143-d37b-f32681c3cd5c@mind.be> On 04/02/2022 01:06, Giulio Benetti wrote: > 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 > > So let's use for EFI System partition: > 'partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b' > and for Root partition (32-bit ARM): > 'partition-type-uuid = 69DAD710-2CE4-4E3C-B16C-21A1D49ABED3' > > Fixes: > https://gitlab.com/buildroot.org/buildroot/-/jobs/1929717242 > > FTR, the magic UUID are from: > https://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs > > Signed-off-by: Giulio Benetti I considered squashing it with the patch in the partition-type-uuid abbreviation series, but since that's still a bit in the air: applied to master, thanks. Regards, Arnout > --- > board/radxa/rockpi-n8/genimage.cfg | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/board/radxa/rockpi-n8/genimage.cfg b/board/radxa/rockpi-n8/genimage.cfg > index 2e064d48c0..909a646499 100644 > --- a/board/radxa/rockpi-n8/genimage.cfg > +++ b/board/radxa/rockpi-n8/genimage.cfg > @@ -26,14 +26,14 @@ image sdcard.img { > } > > partition boot { > - partition-type = 0xC > + partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b > bootable = "true" > image = "boot.vfat" > offset = 16M > } > > partition rootfs { > - partition-type = 0x83 > + partition-type-uuid = 69dad710-2ce4-4e3c-b16c-21a1d49abed3 > image = "rootfs.ext4" > } > } From arnout at mind.be Sun Feb 13 15:23:36 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 16:23:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/cryptopp: disable altivec if needed In-Reply-To: <20220205135806.312865-1-fontaine.fabrice@gmail.com> References: <20220205135806.312865-1-fontaine.fabrice@gmail.com> Message-ID: <734ec41c-a138-e7b4-eeba-7db667e226f1@mind.be> On 05/02/2022 14:58, Fabrice Fontaine wrote: > Fix the following build failure raised since commit > bf4cf9de833e2d571d98d1ca935ea08a3468e463: > > blake2s_simd.cpp:715:8: error: 'uint32x4_p' does not name a type; did you mean 'uint32_t'? > 715 | inline uint32x4_p VecLoad32(const T* p) > | ^~~~~~~~~~ > | uint32_t > > Fixes: > - http://autobuild.buildroot.org/results/9e9f8559b12b8e2cf99cfab435fa7dd5796bbcd5 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/cryptopp/cryptopp.mk | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/package/cryptopp/cryptopp.mk b/package/cryptopp/cryptopp.mk > index 4353e35e0a..87d6fba237 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_POWERPC_CPU_HAS_ALTIVEC),y) > +CRYPTOPP_CXXFLAGS += -DCRYPTOPP_DISABLE_ALTIVEC > +endif > + > ifneq ($(BR2_ARM_CPU_HAS_NEON),y) > CRYPTOPP_CXXFLAGS += -DCRYPTOPP_DISABLE_ARM_NEON > endif From arnout at mind.be Sun Feb 13 15:23:57 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 16:23:57 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/libldns: enable dane-verify for OpenSSL In-Reply-To: <20220205174046.1850152-1-bernd.kuhls@t-online.de> References: <20220205174046.1850152-1-bernd.kuhls@t-online.de> Message-ID: <100393fa-c571-821c-9226-b01d0a144df4@mind.be> On 05/02/2022 18:40, Bernd Kuhls wrote: > Since the bump of libopenssl to 1.1.x support for offline DANE > verification can be enabled. > > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Arnout > --- > v2: enable only for libopenssl, libressl does not support SSL_get0_dane > (Peter) > > package/libldns/libldns.mk | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/package/libldns/libldns.mk b/package/libldns/libldns.mk > index 7deca978da..86e7c0eafc 100644 > --- a/package/libldns/libldns.mk > +++ b/package/libldns/libldns.mk > @@ -13,11 +13,9 @@ LIBLDNS_CPE_ID_VENDOR = nlnetlabs > LIBLDNS_CPE_ID_PRODUCT = ldns > LIBLDNS_INSTALL_STAGING = YES > LIBLDNS_DEPENDENCIES = openssl > -# --disable-dane-verify can be removed after openssl bump to 1.1.x > LIBLDNS_CONF_OPTS = \ > --with-ssl=$(STAGING_DIR)/usr \ > --enable-dane \ > - --disable-dane-verify \ > --enable-ecdsa \ > --enable-gost \ > --enable-sha2 \ > @@ -26,6 +24,12 @@ LIBLDNS_CONF_OPTS = \ > --without-pyldns \ > --without-pyldnsx > > +ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) > +LIBLDNS_CONF_OPTS += --enable-dane-verify > +else > +LIBLDNS_CONF_OPTS += --disable-dane-verify > +endif > + > ifeq ($(BR2_STATIC_LIBS),y) > LIBLDNS_DEPENDENCIES += host-pkgconf > # missing -lz breaks configure, add it using pkgconf From arnout at mind.be Sun Feb 13 15:24:20 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 16:24:20 +0100 Subject: [Buildroot] [PATCH 1/2] package/wayland-protocols: bump to version 1.25 In-Reply-To: <20220205230302.3837382-1-james.hilliard1@gmail.com> References: <20220205230302.3837382-1-james.hilliard1@gmail.com> Message-ID: <468a9439-90fd-76bf-1dbe-ad64d0771603@mind.be> On 06/02/2022 00:03, James Hilliard wrote: > Drop patch that is now upstream. > > Signed-off-by: James Hilliard Applied both to master, thanks. Regards, Arnout > --- > ...and-scanner-is-only-needed-for-tests.patch | 42 ------------------- > .../wayland-protocols/wayland-protocols.hash | 8 ++-- > .../wayland-protocols/wayland-protocols.mk | 2 +- > 3 files changed, 5 insertions(+), 47 deletions(-) > delete mode 100644 package/wayland-protocols/0001-meson.build-wayland-scanner-is-only-needed-for-tests.patch > > diff --git a/package/wayland-protocols/0001-meson.build-wayland-scanner-is-only-needed-for-tests.patch b/package/wayland-protocols/0001-meson.build-wayland-scanner-is-only-needed-for-tests.patch > deleted file mode 100644 > index ff3ec5719c..0000000000 > --- a/package/wayland-protocols/0001-meson.build-wayland-scanner-is-only-needed-for-tests.patch > +++ /dev/null > @@ -1,42 +0,0 @@ > -From 80e97bd00bf6263845aa98b411507baba28be67e Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Sun, 19 Sep 2021 11:01:00 +0200 > -Subject: [PATCH] meson.build: wayland-scanner is only needed for tests > - > -wayland-scanner is only needed for tests so don't require it if tests > -are disabled > - > -Signed-off-by: Fabrice Fontaine > -[Retrieved from: > -https://gitlab.freedesktop.org/wayland/wayland-protocols/-/commit/80e97bd00bf6263845aa98b411507baba28be67e] > ---- > - meson.build | 2 -- > - tests/meson.build | 1 + > - 2 files changed, 1 insertion(+), 2 deletions(-) > - > -diff --git a/meson.build b/meson.build > -index 94b49e7..15dbc37 100644 > ---- a/meson.build > -+++ b/meson.build > -@@ -8,8 +8,6 @@ wayland_protocols_version = meson.project_version() > - > - fs = import('fs') > - > --dep_scanner = dependency('wayland-scanner', native: true) > -- > - stable_protocols = [ > - 'presentation-time', > - 'viewporter', > -diff --git a/tests/meson.build b/tests/meson.build > -index 66337e7..74824ae 100644 > ---- a/tests/meson.build > -+++ b/tests/meson.build > -@@ -1,4 +1,5 @@ > - prog_scan_sh = find_program('scan.sh') > -+dep_scanner = dependency('wayland-scanner', native: true) > - prog_scanner = find_program(dep_scanner.get_pkgconfig_variable('wayland_scanner')) > - > - libwayland = [ > --- > -GitLab > - > diff --git a/package/wayland-protocols/wayland-protocols.hash b/package/wayland-protocols/wayland-protocols.hash > index b76bafb437..1262f0f9d7 100644 > --- a/package/wayland-protocols/wayland-protocols.hash > +++ b/package/wayland-protocols/wayland-protocols.hash > @@ -1,5 +1,5 @@ > -# From https://lists.freedesktop.org/archives/wayland-devel/2021-September/041979.html > -md5 31a6c469718db37d2688109e548506e4 wayland-protocols-1.23.tar.xz > -sha1 8c4ebdce35953b1e2af458c139a432a308af6f50 wayland-protocols-1.23.tar.xz > -sha256 6c0af1915f96f615927a6270d025bd973ff1c58e521e4ca1fc9abfc914633f76 wayland-protocols-1.23.tar.xz > +# From https://lists.freedesktop.org/archives/wayland-devel/2022-January/042102.html > +md5 0c192bf32de09ec30de4a82d1c65329c wayland-protocols-1.25.tar.xz > +sha1 275298332d124e40e345aa82bc8f48ef8cad3480 wayland-protocols-1.25.tar.xz > +sha256 f1ff0f7199d0a0da337217dd8c99979967808dc37731a1e759e822b75b571460 wayland-protocols-1.25.tar.xz > sha256 f1a2b233e8a9a71c40f4aa885be08a0842ac85bb8588703c1dd7e6e6502e3124 COPYING > diff --git a/package/wayland-protocols/wayland-protocols.mk b/package/wayland-protocols/wayland-protocols.mk > index 41ab1e1c99..746d82e308 100644 > --- a/package/wayland-protocols/wayland-protocols.mk > +++ b/package/wayland-protocols/wayland-protocols.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -WAYLAND_PROTOCOLS_VERSION = 1.23 > +WAYLAND_PROTOCOLS_VERSION = 1.25 > WAYLAND_PROTOCOLS_SITE = https://wayland.freedesktop.org/releases > WAYLAND_PROTOCOLS_SOURCE = wayland-protocols-$(WAYLAND_PROTOCOLS_VERSION).tar.xz > WAYLAND_PROTOCOLS_LICENSE = MIT From arnout at mind.be Sun Feb 13 15:24:36 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 16:24:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/lighttpd: add mysql support In-Reply-To: <20220206073805.832602-1-fontaine.fabrice@gmail.com> References: <20220206073805.832602-1-fontaine.fabrice@gmail.com> Message-ID: On 06/02/2022 08:38, Fabrice Fontaine wrote: > lighttpd only supports mariadb > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/lighttpd/Config.in | 9 +++++++++ > package/lighttpd/lighttpd.mk | 8 +++++++- > 2 files changed, 16 insertions(+), 1 deletion(-) > > diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in > index b9f64a3bc3..aa18c13171 100644 > --- a/package/lighttpd/Config.in > +++ b/package/lighttpd/Config.in > @@ -61,6 +61,15 @@ config BR2_PACKAGE_LIGHTTPD_MAXMINDDB > help > Enable MaxMind GeoIP2 support. Needed to support mod_maxminddb > > +config BR2_PACKAGE_LIGHTTPD_MYSQL > + bool "mysql support" > + depends on BR2_PACKAGE_MARIADB > + help > + Enable mysql support for lighttpd mod_vhostdb_mysql. > + > +comment "mysql support needs mariadb" > + depends on !BR2_PACKAGE_MARIADB > + > 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 49ab8587f7..595c59cb37 100644 > --- a/package/lighttpd/lighttpd.mk > +++ b/package/lighttpd/lighttpd.mk > @@ -19,7 +19,6 @@ LIGHTTPD_CONF_OPTS = \ > -Dwith_libev=false \ > -Dwith_libunwind=false \ > -Dwith_mbedtls=false \ > - -Dwith_mysql=false \ > -Dwith_nettle=false \ > -Dwith_nss=false \ > -Dwith_pcre=false \ > @@ -73,6 +72,13 @@ else > LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=false > endif > > +ifeq ($(BR2_PACKAGE_LIGHTTPD_MYSQL),y) > +LIGHTTPD_DEPENDENCIES += mysql > +LIGHTTPD_CONF_OPTS += -Dwith_mysql=true > +else > +LIGHTTPD_CONF_OPTS += -Dwith_mysql=false > +endif > + > ifeq ($(BR2_PACKAGE_LIGHTTPD_OPENSSL),y) > LIGHTTPD_DEPENDENCIES += openssl > LIGHTTPD_CONF_OPTS += -Dwith_openssl=true From arnout at mind.be Sun Feb 13 15:21:03 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 16:21:03 +0100 Subject: [Buildroot] [git commit] package/lighttpd: add mysql support Message-ID: <20220213151835.420A08295E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1cd93b69ccc90346f5cb0f3460d48625a41eaec9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master lighttpd only supports mariadb Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/lighttpd/Config.in | 9 +++++++++ package/lighttpd/lighttpd.mk | 8 +++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index 4406a685ba..6f0c927319 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -61,6 +61,15 @@ config BR2_PACKAGE_LIGHTTPD_MAXMINDDB help Enable MaxMind GeoIP2 support. Needed to support mod_maxminddb +config BR2_PACKAGE_LIGHTTPD_MYSQL + bool "mysql support" + depends on BR2_PACKAGE_MARIADB + help + Enable mysql support for lighttpd mod_vhostdb_mysql. + +comment "mysql support needs mariadb" + depends on !BR2_PACKAGE_MARIADB + 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 49ab8587f7..595c59cb37 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -19,7 +19,6 @@ LIGHTTPD_CONF_OPTS = \ -Dwith_libev=false \ -Dwith_libunwind=false \ -Dwith_mbedtls=false \ - -Dwith_mysql=false \ -Dwith_nettle=false \ -Dwith_nss=false \ -Dwith_pcre=false \ @@ -73,6 +72,13 @@ else LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=false endif +ifeq ($(BR2_PACKAGE_LIGHTTPD_MYSQL),y) +LIGHTTPD_DEPENDENCIES += mysql +LIGHTTPD_CONF_OPTS += -Dwith_mysql=true +else +LIGHTTPD_CONF_OPTS += -Dwith_mysql=false +endif + ifeq ($(BR2_PACKAGE_LIGHTTPD_OPENSSL),y) LIGHTTPD_DEPENDENCIES += openssl LIGHTTPD_CONF_OPTS += -Dwith_openssl=true From arnout at mind.be Sun Feb 13 15:21:04 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 16:21:04 +0100 Subject: [Buildroot] [git commit] package/mp4v2: needs gcc >= 5 Message-ID: <20220213151835.5D88A8295E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ec720d210634b55faf0eb6c060d915b100c5028d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master TechSmith fork of mp4v2 needs gcc >= 5: https://github.com/TechSmith/mp4v2/issues/47 As a result, the following build failure is raised since bump to version 5.0.1 in commit df22a9d6b77d9e245dceb7c8fd3f9d80c8917ca0: In file included from ./include/mp4v2/mp4v2.h:58:0, from ./libplatform/platform_posix.h:37, from ./libplatform/platform.h:24, from libplatform/impl.h:6: ./include/mp4v2/file.h:336:5: warning: identifier 'nullptr' is a keyword in C++11 [-Wc++0x-compat] ShouldParseAtomCallback cb = nullptr ); ^ While a it, drop first patch which is not needed now that mp4v2 depends on gcc >= 5 Fixes: - http://autobuild.buildroot.org/results/178f1266396d44c6659a67d8e68cb99e36d544ea Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...01-Static-cast-to-unsigned-int-for-cases.patch} | 0 ...-src-mp4track.cpp-replace-nullptr-by-NULL.patch | 50 ---------------------- package/mp4v2/Config.in | 6 ++- 3 files changed, 4 insertions(+), 52 deletions(-) diff --git a/package/mp4v2/0002-Static-cast-to-unsigned-int-for-cases.patch b/package/mp4v2/0001-Static-cast-to-unsigned-int-for-cases.patch similarity index 100% rename from package/mp4v2/0002-Static-cast-to-unsigned-int-for-cases.patch rename to package/mp4v2/0001-Static-cast-to-unsigned-int-for-cases.patch diff --git a/package/mp4v2/0001-src-mp4track.cpp-replace-nullptr-by-NULL.patch b/package/mp4v2/0001-src-mp4track.cpp-replace-nullptr-by-NULL.patch deleted file mode 100644 index c279b9c56a..0000000000 --- a/package/mp4v2/0001-src-mp4track.cpp-replace-nullptr-by-NULL.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 78cf76b5d661e37e958163c37c0ad95940c09591 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 30 May 2020 11:42:19 +0200 -Subject: [PATCH] src/mp4track.cpp: replace nullptr by NULL - -Commit 15ec11166ba9ee7b77631d0d9234522f656cfd66 added code that uses -nullptr. nullptr is C++11, it will break the build with gcc < 5. - -Semantically, NULL and nullptr are different, so should not be mixed. -In this situaiton, m_File.FindAtom() indeed does not return nullptr, -but NULL (on error, that is). - -Switch back to comparing against NULL. - -Fixes: - - http://autobuild.buildroot.org/results/14937c96a82fb3d10e5d83bd7b2905b846fb09f9 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/TechSmith/mp4v2/pull/62] ---- - src/mp4track.cpp | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/mp4track.cpp b/src/mp4track.cpp -index 4b8fc9d..42489eb 100644 ---- a/src/mp4track.cpp -+++ b/src/mp4track.cpp -@@ -908,16 +908,16 @@ File* MP4Track::GetSampleFile( MP4SampleId sampleId ) - MP4FtypAtom *pFtypAtom = reinterpret_cast( m_File.FindAtom( "ftyp" ) ); - - // MOV spec does not require "ftyp" atom... -- if ( pFtypAtom == nullptr ) -+ if ( pFtypAtom == NULL ) - { -- return nullptr; -+ return NULL; - } - else - { - // ... but most often it is present with a "qt " value - const char *majorBrand = pFtypAtom->majorBrand.GetValue(); - if ( ::strcmp( pFtypAtom->majorBrand.GetValue(), "qt " ) == 0 ) -- return nullptr; -+ return NULL; - } - throw new Exception( "invalid stsd entry", __FILE__, __LINE__, __FUNCTION__ ); - } --- -2.26.2 - diff --git a/package/mp4v2/Config.in b/package/mp4v2/Config.in index 172d1baabe..00e80cd358 100644 --- a/package/mp4v2/Config.in +++ b/package/mp4v2/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_MP4V2 bool "mp4v2" depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++11 help The MP4v2 library provides functions to read, create, and modify mp4 files. @@ -18,5 +19,6 @@ config BR2_PACKAGE_MP4V2_UTIL endif -comment "mp4v2 needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP +comment "mp4v2 needs a toolchain w/ C++, gcc >= 5" + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 From arnout at mind.be Sun Feb 13 15:25:07 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 16:25:07 +0100 Subject: [Buildroot] [PATCH] docs/manual: fix "+size = +" latex formatting In-Reply-To: <20220206095403.1563814-1-giulio.benetti@benettiengineering.com> References: <20220206095403.1563814-1-giulio.benetti@benettiengineering.com> Message-ID: <54fda3e6-1188-f104-4c6d-f1686df77bcd@mind.be> On 06/02/2022 10:54, Giulio Benetti wrote: > Signed-off-by: Giulio Benetti Not sure why you say "latex formatting", but OK. Applied to master, thanks. Regards, Arnout > --- > docs/manual/writing-rules.txt | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/docs/manual/writing-rules.txt b/docs/manual/writing-rules.txt > index 3eec095d0e..06f87556ed 100644 > --- a/docs/manual/writing-rules.txt > +++ b/docs/manual/writing-rules.txt > @@ -184,7 +184,7 @@ image sdimage.img { > * Every node(+section+, +partition+, +file+, +subnode+) must have an open > curly bracket on the same line of the node's name, while the closing one > must be on a newline and after it a newline must be added except for the > - last one node. Same goes for its option, for example option +size = +. > + last one node. Same goes for its option, for example option +size+ +=+. > > * Every +option+(i.e. +image+, +offset+, +size+) must have the +=+ > assignment one space from it and one space from the value specified. From arnout at mind.be Sun Feb 13 15:25:24 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 16:25:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/gerbera: fix build with fmt > 8.0 In-Reply-To: <20220206140459.1622884-1-fontaine.fabrice@gmail.com> References: <20220206140459.1622884-1-fontaine.fabrice@gmail.com> Message-ID: On 06/02/2022 15:04, Fabrice Fontaine wrote: > Fix the following build failure raised since bump of fmt to version > 8.1.1 in commit ec7fd50d08690a383fec40748ac9b78c3f764316: > > /home/peko/autobuild/instance-0/output-1/host/mips64el-buildroot-linux-uclibc/sysroot/usr/include/fmt/core.h:1728:7: error: static assertion failed: Cannot format an argument. To make type T formattable provide a formatter specialization: https://fmt.dev/latest/api.html#udt > formattable, > ^~~~~~~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/009db44f83c3b02025c910ce4f190bd709c5ab49 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/gerbera/0001-Fix-for-fmt-8-0.patch | 44 ++++++++++++++++++++++ > 1 file changed, 44 insertions(+) > create mode 100644 package/gerbera/0001-Fix-for-fmt-8-0.patch > > diff --git a/package/gerbera/0001-Fix-for-fmt-8-0.patch b/package/gerbera/0001-Fix-for-fmt-8-0.patch > new file mode 100644 > index 0000000000..c4419209a5 > --- /dev/null > +++ b/package/gerbera/0001-Fix-for-fmt-8-0.patch > @@ -0,0 +1,44 @@ > +From 82d84ac5e62c23e717198fc7b2ef190ff95e70d1 Mon Sep 17 00:00:00 2001 > +From: kyak > +Date: Wed, 12 Jan 2022 19:41:37 +0300 > +Subject: [PATCH] Fix for fmt > 8.0 > + > +[Retrieved from: > +https://github.com/gerbera/gerbera/commit/82d84ac5e62c23e717198fc7b2ef190ff95e70d1] > +Signed-off-by: Fabrice Fontaine > +--- > + src/util/logger.h | 15 +++++++++++++++ > + 1 file changed, 15 insertions(+) > + > +diff --git a/src/util/logger.h b/src/util/logger.h > +index 58696e52f..ba64afa79 100644 > +--- a/src/util/logger.h > ++++ b/src/util/logger.h > +@@ -32,7 +32,9 @@ > + #ifndef __LOGGER_H__ > + #define __LOGGER_H__ > + > ++#include > + #include > ++#include > + > + #define log_debug SPDLOG_DEBUG > + #define log_info SPDLOG_INFO > +@@ -40,4 +42,17 @@ > + #define log_error SPDLOG_ERROR > + #define log_js SPDLOG_INFO > + > ++#if FMT_VERSION >= 80100 > ++template > ++struct fmt::formatter, char>> > ++ : formatter> { > ++ template > ++ auto format(const T& value, FormatContext& ctx) -> decltype(ctx.out()) > ++ { > ++ return fmt::formatter>::format( > ++ static_cast>(value), ctx); > ++ } > ++}; > ++#endif > ++ > + #endif // __LOGGER_H__ From arnout at mind.be Sun Feb 13 15:25:41 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 16:25:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/mp4v2: needs gcc >= 5 In-Reply-To: <20220206142638.1751906-1-fontaine.fabrice@gmail.com> References: <20220206142638.1751906-1-fontaine.fabrice@gmail.com> Message-ID: <86d76831-de88-4d8a-3f1a-16bde429fa61@mind.be> On 06/02/2022 15:26, Fabrice Fontaine wrote: > TechSmith fork of mp4v2 needs gcc >= 5: > https://github.com/TechSmith/mp4v2/issues/47 > > As a result, the following build failure is raised since bump to version > 5.0.1 in commit df22a9d6b77d9e245dceb7c8fd3f9d80c8917ca0: > > In file included from ./include/mp4v2/mp4v2.h:58:0, > from ./libplatform/platform_posix.h:37, > from ./libplatform/platform.h:24, > from libplatform/impl.h:6: > ./include/mp4v2/file.h:336:5: warning: identifier 'nullptr' is a keyword in C++11 [-Wc++0x-compat] > ShouldParseAtomCallback cb = nullptr ); > ^ > > While a it, drop first patch which is not needed now that mp4v2 depends > on gcc >= 5 > > Fixes: > - http://autobuild.buildroot.org/results/178f1266396d44c6659a67d8e68cb99e36d544ea > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...atic-cast-to-unsigned-int-for-cases.patch} | 0 > ...mp4track.cpp-replace-nullptr-by-NULL.patch | 50 ------------------- > package/mp4v2/Config.in | 6 ++- > 3 files changed, 4 insertions(+), 52 deletions(-) > rename package/mp4v2/{0002-Static-cast-to-unsigned-int-for-cases.patch => 0001-Static-cast-to-unsigned-int-for-cases.patch} (100%) > delete mode 100644 package/mp4v2/0001-src-mp4track.cpp-replace-nullptr-by-NULL.patch > > diff --git a/package/mp4v2/0002-Static-cast-to-unsigned-int-for-cases.patch b/package/mp4v2/0001-Static-cast-to-unsigned-int-for-cases.patch > similarity index 100% > rename from package/mp4v2/0002-Static-cast-to-unsigned-int-for-cases.patch > rename to package/mp4v2/0001-Static-cast-to-unsigned-int-for-cases.patch > diff --git a/package/mp4v2/0001-src-mp4track.cpp-replace-nullptr-by-NULL.patch b/package/mp4v2/0001-src-mp4track.cpp-replace-nullptr-by-NULL.patch > deleted file mode 100644 > index c279b9c56a..0000000000 > --- a/package/mp4v2/0001-src-mp4track.cpp-replace-nullptr-by-NULL.patch > +++ /dev/null > @@ -1,50 +0,0 @@ > -From 78cf76b5d661e37e958163c37c0ad95940c09591 Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Sat, 30 May 2020 11:42:19 +0200 > -Subject: [PATCH] src/mp4track.cpp: replace nullptr by NULL > - > -Commit 15ec11166ba9ee7b77631d0d9234522f656cfd66 added code that uses > -nullptr. nullptr is C++11, it will break the build with gcc < 5. > - > -Semantically, NULL and nullptr are different, so should not be mixed. > -In this situaiton, m_File.FindAtom() indeed does not return nullptr, > -but NULL (on error, that is). > - > -Switch back to comparing against NULL. > - > -Fixes: > - - http://autobuild.buildroot.org/results/14937c96a82fb3d10e5d83bd7b2905b846fb09f9 > - > -Signed-off-by: Fabrice Fontaine > -[Upstream status: https://github.com/TechSmith/mp4v2/pull/62] > ---- > - src/mp4track.cpp | 6 +++--- > - 1 file changed, 3 insertions(+), 3 deletions(-) > - > -diff --git a/src/mp4track.cpp b/src/mp4track.cpp > -index 4b8fc9d..42489eb 100644 > ---- a/src/mp4track.cpp > -+++ b/src/mp4track.cpp > -@@ -908,16 +908,16 @@ File* MP4Track::GetSampleFile( MP4SampleId sampleId ) > - MP4FtypAtom *pFtypAtom = reinterpret_cast( m_File.FindAtom( "ftyp" ) ); > - > - // MOV spec does not require "ftyp" atom... > -- if ( pFtypAtom == nullptr ) > -+ if ( pFtypAtom == NULL ) > - { > -- return nullptr; > -+ return NULL; > - } > - else > - { > - // ... but most often it is present with a "qt " value > - const char *majorBrand = pFtypAtom->majorBrand.GetValue(); > - if ( ::strcmp( pFtypAtom->majorBrand.GetValue(), "qt " ) == 0 ) > -- return nullptr; > -+ return NULL; > - } > - throw new Exception( "invalid stsd entry", __FILE__, __LINE__, __FUNCTION__ ); > - } > --- > -2.26.2 > - > diff --git a/package/mp4v2/Config.in b/package/mp4v2/Config.in > index 172d1baabe..00e80cd358 100644 > --- a/package/mp4v2/Config.in > +++ b/package/mp4v2/Config.in > @@ -1,6 +1,7 @@ > config BR2_PACKAGE_MP4V2 > bool "mp4v2" > depends on BR2_INSTALL_LIBSTDCPP > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++11 > help > The MP4v2 library provides functions to read, create, and > modify mp4 files. > @@ -18,5 +19,6 @@ config BR2_PACKAGE_MP4V2_UTIL > > endif > > -comment "mp4v2 needs a toolchain w/ C++" > - depends on !BR2_INSTALL_LIBSTDCPP > +comment "mp4v2 needs a toolchain w/ C++, gcc >= 5" > + depends on !BR2_INSTALL_LIBSTDCPP || \ > + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 From arnout at mind.be Sun Feb 13 15:21:02 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 16:21:02 +0100 Subject: [Buildroot] [git commit] package/mpd: ignore CVE-2020-746[56] intended for FreeBSD PPP daemon Message-ID: <20220213151834.E14058295E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=210e6bd55991497c45eb3a6baf9ed0c20a88067c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:mpd_project:mpd:*:*:*:*:*:*:*:* is not a valid CPE identifier for mpd (musicpd.org); this string refers to MPD /FreeBSD PPP daemon (sourceforge.net/projects/mpd) Since mpd does not have entries in the CVE database, put these two CVE identifiers on the mpd ignore list: https://nvd.nist.gov/vuln/detail/CVE-2020-7465 https://nvd.nist.gov/vuln/detail/CVE-2020-7466 Signed-off-by: Andreas Ziegler Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/mpd/mpd.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index 6f01b29c6d..a55e4adde2 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -11,6 +11,8 @@ 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 +# these refer to the FreeBSD PPP daemon +MPD_IGNORE_CVES = CVE-2020-7465 CVE-2020-7466 MPD_SELINUX_MODULES = mpd MPD_CONF_OPTS = \ -Daudiofile=disabled \ From arnout at mind.be Sun Feb 13 15:21:03 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 16:21:03 +0100 Subject: [Buildroot] [git commit] board/radxa/rockpi-n8:use partition-type-uuid for genimage-15 Message-ID: <20220213151835.0DFFB82983@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=85ee640eb5a3904eae0d743d32afa015dd6cc760 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 So let's use for EFI System partition: 'partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b' and for Root partition (32-bit ARM): 'partition-type-uuid = 69DAD710-2CE4-4E3C-B16C-21A1D49ABED3' Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/1929717242 FTR, the magic UUID are from: https://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- board/radxa/rockpi-n8/genimage.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/radxa/rockpi-n8/genimage.cfg b/board/radxa/rockpi-n8/genimage.cfg index 2e064d48c0..909a646499 100644 --- a/board/radxa/rockpi-n8/genimage.cfg +++ b/board/radxa/rockpi-n8/genimage.cfg @@ -26,14 +26,14 @@ image sdcard.img { } partition boot { - partition-type = 0xC + partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b bootable = "true" image = "boot.vfat" offset = 16M } partition rootfs { - partition-type = 0x83 + partition-type-uuid = 69dad710-2ce4-4e3c-b16c-21a1d49abed3 image = "rootfs.ext4" } } From arnout at mind.be Sun Feb 13 15:21:03 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 16:21:03 +0100 Subject: [Buildroot] [git commit] docs/manual: fix "+size = +" latex formatting Message-ID: <20220213151835.4A50F82974@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=46beca0656505e9a9d4d5d17d22f40550ac487c6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- docs/manual/writing-rules.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/manual/writing-rules.txt b/docs/manual/writing-rules.txt index 6255a08c1c..57ba61bdb1 100644 --- a/docs/manual/writing-rules.txt +++ b/docs/manual/writing-rules.txt @@ -184,7 +184,7 @@ image sdimage.img { * Every node(+section+, +partition+, +file+, +subnode+) must have an open curly bracket on the same line of the node's name, while the closing one must be on a newline and after it a newline must be added except for the - last one node. Same goes for its option, for example option +size = +. + last one node. Same goes for its option, for example option +size+ +=+. * Every +option+(i.e. +image+, +offset+, +size+) must have the +=+ assignment one space from it and one space from the value specified. From arnout at mind.be Sun Feb 13 15:21:03 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 16:21:03 +0100 Subject: [Buildroot] [git commit] package/cryptopp: disable altivec if needed Message-ID: <20220213151835.15E9F82974@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d0339905fcdfce98d2c0b45c0795ad79faf6c519 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since commit bf4cf9de833e2d571d98d1ca935ea08a3468e463: blake2s_simd.cpp:715:8: error: 'uint32x4_p' does not name a type; did you mean 'uint32_t'? 715 | inline uint32x4_p VecLoad32(const T* p) | ^~~~~~~~~~ | uint32_t Fixes: - http://autobuild.buildroot.org/results/9e9f8559b12b8e2cf99cfab435fa7dd5796bbcd5 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/cryptopp/cryptopp.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/cryptopp/cryptopp.mk b/package/cryptopp/cryptopp.mk index 4353e35e0a..87d6fba237 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_POWERPC_CPU_HAS_ALTIVEC),y) +CRYPTOPP_CXXFLAGS += -DCRYPTOPP_DISABLE_ALTIVEC +endif + ifneq ($(BR2_ARM_CPU_HAS_NEON),y) CRYPTOPP_CXXFLAGS += -DCRYPTOPP_DISABLE_ARM_NEON endif From arnout at mind.be Sun Feb 13 15:21:02 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 16:21:02 +0100 Subject: [Buildroot] [git commit] package/dt-utils: use snapshot tarball Message-ID: <20220213151835.060398295E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e33cd57b2515675d9aa1a9abdfdf8b21025705ea branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Use snapshot tarball so DT_UTILS_VERSION will match what is returned by https://release-monitoring.org Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/dt-utils/dt-utils.hash | 2 +- package/dt-utils/dt-utils.mk | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/dt-utils/dt-utils.hash b/package/dt-utils/dt-utils.hash index 74819158bb..9fca594db5 100644 --- a/package/dt-utils/dt-utils.hash +++ b/package/dt-utils/dt-utils.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8b29d3a8799170afdb1b077e655528bf4e6afe0c789107b1eec8fff9d4482771 dt-utils-v2021.03.0-br1.tar.gz +sha256 63cf47c70911bb3605bafac38a5a7e19eb753ac1c90de2abceaf2fdefd71be6d dt-utils-2021.03.0.tar.xz sha256 a45932c79317d15116eadbf1c9c6fc59117ec3c4621db3a876066defa723963b COPYING diff --git a/package/dt-utils/dt-utils.mk b/package/dt-utils/dt-utils.mk index bc7fd90631..d264e2cdc9 100644 --- a/package/dt-utils/dt-utils.mk +++ b/package/dt-utils/dt-utils.mk @@ -4,9 +4,9 @@ # ################################################################################ -DT_UTILS_VERSION = v2021.03.0 -DT_UTILS_SITE = https://git.pengutronix.de/git/tools/dt-utils -DT_UTILS_SITE_METHOD = git +DT_UTILS_VERSION = 2021.03.0 +DT_UTILS_SOURCE = dt-utils-$(DT_UTILS_VERSION).tar.xz +DT_UTILS_SITE = https://git.pengutronix.de/cgit/tools/dt-utils/snapshot DT_UTILS_LICENSE = GPL-2.0 DT_UTILS_LICENSE_FILES = COPYING DT_UTILS_DEPENDENCIES = udev From arnout at mind.be Sun Feb 13 15:21:03 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 16:21:03 +0100 Subject: [Buildroot] [git commit] package/libldns: enable dane-verify for OpenSSL Message-ID: <20220213151835.2826382974@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=39aa793c0f6605586ad522267f97a33428f7de85 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Since the bump of libopenssl to 1.1.x support for offline DANE verification can be enabled. Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libldns/libldns.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/package/libldns/libldns.mk b/package/libldns/libldns.mk index 7deca978da..86e7c0eafc 100644 --- a/package/libldns/libldns.mk +++ b/package/libldns/libldns.mk @@ -13,11 +13,9 @@ LIBLDNS_CPE_ID_VENDOR = nlnetlabs LIBLDNS_CPE_ID_PRODUCT = ldns LIBLDNS_INSTALL_STAGING = YES LIBLDNS_DEPENDENCIES = openssl -# --disable-dane-verify can be removed after openssl bump to 1.1.x LIBLDNS_CONF_OPTS = \ --with-ssl=$(STAGING_DIR)/usr \ --enable-dane \ - --disable-dane-verify \ --enable-ecdsa \ --enable-gost \ --enable-sha2 \ @@ -26,6 +24,12 @@ LIBLDNS_CONF_OPTS = \ --without-pyldns \ --without-pyldnsx +ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) +LIBLDNS_CONF_OPTS += --enable-dane-verify +else +LIBLDNS_CONF_OPTS += --disable-dane-verify +endif + ifeq ($(BR2_STATIC_LIBS),y) LIBLDNS_DEPENDENCIES += host-pkgconf # missing -lz breaks configure, add it using pkgconf From arnout at mind.be Sun Feb 13 15:21:03 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 16:21:03 +0100 Subject: [Buildroot] [git commit] package/mpdecimal: fix build without threads Message-ID: <20220213151835.1EC4A8295E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f219cface0b219ae20e149fcf83e643de1793a34 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since bump to version 2.5.1 in commit 995c093d6a3e8042110d6a8d96fdc7ad65a557c4: /home/peko/autobuild/instance-0/output-1/per-package/mpdecimal/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: cannot find -lpthread Fixes: - http://autobuild.buildroot.org/results/b20c090f2ac5ea6d1c761820763037b87bde137a Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/mpdecimal/mpdecimal.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/mpdecimal/mpdecimal.mk b/package/mpdecimal/mpdecimal.mk index 25c12c08b1..aa322df340 100644 --- a/package/mpdecimal/mpdecimal.mk +++ b/package/mpdecimal/mpdecimal.mk @@ -11,6 +11,9 @@ MPDECIMAL_LICENSE = BSD-2-Clause MPDECIMAL_LICENSE_FILES = LICENSE.txt MPDECIMAL_CONF_OPTS = LD="$(TARGET_CC)" +# threads are only needed for tests +MPDECIMAL_MAKE_OPTS = MPD_PTHREAD= + # On i386, by default, mpdecimal tries to uses which is not # available in musl/uclibc. So in this case, we tell mpdecimal to use # the generic 32 bits code, which is anyway the one used on ARM, From arnout at mind.be Sun Feb 13 15:21:03 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 16:21:03 +0100 Subject: [Buildroot] [git commit] package/wayland-protocols: bump to version 1.25 Message-ID: <20220213151835.2FED482983@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bf152e55a33a3cb3e10e26813eb36a8801ebfa97 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patch that is now upstream. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...-wayland-scanner-is-only-needed-for-tests.patch | 42 ---------------------- package/wayland-protocols/wayland-protocols.hash | 8 ++--- package/wayland-protocols/wayland-protocols.mk | 2 +- 3 files changed, 5 insertions(+), 47 deletions(-) diff --git a/package/wayland-protocols/0001-meson.build-wayland-scanner-is-only-needed-for-tests.patch b/package/wayland-protocols/0001-meson.build-wayland-scanner-is-only-needed-for-tests.patch deleted file mode 100644 index ff3ec5719c..0000000000 --- a/package/wayland-protocols/0001-meson.build-wayland-scanner-is-only-needed-for-tests.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 80e97bd00bf6263845aa98b411507baba28be67e Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 19 Sep 2021 11:01:00 +0200 -Subject: [PATCH] meson.build: wayland-scanner is only needed for tests - -wayland-scanner is only needed for tests so don't require it if tests -are disabled - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://gitlab.freedesktop.org/wayland/wayland-protocols/-/commit/80e97bd00bf6263845aa98b411507baba28be67e] ---- - meson.build | 2 -- - tests/meson.build | 1 + - 2 files changed, 1 insertion(+), 2 deletions(-) - -diff --git a/meson.build b/meson.build -index 94b49e7..15dbc37 100644 ---- a/meson.build -+++ b/meson.build -@@ -8,8 +8,6 @@ wayland_protocols_version = meson.project_version() - - fs = import('fs') - --dep_scanner = dependency('wayland-scanner', native: true) -- - stable_protocols = [ - 'presentation-time', - 'viewporter', -diff --git a/tests/meson.build b/tests/meson.build -index 66337e7..74824ae 100644 ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -1,4 +1,5 @@ - prog_scan_sh = find_program('scan.sh') -+dep_scanner = dependency('wayland-scanner', native: true) - prog_scanner = find_program(dep_scanner.get_pkgconfig_variable('wayland_scanner')) - - libwayland = [ --- -GitLab - diff --git a/package/wayland-protocols/wayland-protocols.hash b/package/wayland-protocols/wayland-protocols.hash index b76bafb437..1262f0f9d7 100644 --- a/package/wayland-protocols/wayland-protocols.hash +++ b/package/wayland-protocols/wayland-protocols.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2021-September/041979.html -md5 31a6c469718db37d2688109e548506e4 wayland-protocols-1.23.tar.xz -sha1 8c4ebdce35953b1e2af458c139a432a308af6f50 wayland-protocols-1.23.tar.xz -sha256 6c0af1915f96f615927a6270d025bd973ff1c58e521e4ca1fc9abfc914633f76 wayland-protocols-1.23.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2022-January/042102.html +md5 0c192bf32de09ec30de4a82d1c65329c wayland-protocols-1.25.tar.xz +sha1 275298332d124e40e345aa82bc8f48ef8cad3480 wayland-protocols-1.25.tar.xz +sha256 f1ff0f7199d0a0da337217dd8c99979967808dc37731a1e759e822b75b571460 wayland-protocols-1.25.tar.xz sha256 f1a2b233e8a9a71c40f4aa885be08a0842ac85bb8588703c1dd7e6e6502e3124 COPYING diff --git a/package/wayland-protocols/wayland-protocols.mk b/package/wayland-protocols/wayland-protocols.mk index 41ab1e1c99..746d82e308 100644 --- a/package/wayland-protocols/wayland-protocols.mk +++ b/package/wayland-protocols/wayland-protocols.mk @@ -4,7 +4,7 @@ # ################################################################################ -WAYLAND_PROTOCOLS_VERSION = 1.23 +WAYLAND_PROTOCOLS_VERSION = 1.25 WAYLAND_PROTOCOLS_SITE = https://wayland.freedesktop.org/releases WAYLAND_PROTOCOLS_SOURCE = wayland-protocols-$(WAYLAND_PROTOCOLS_VERSION).tar.xz WAYLAND_PROTOCOLS_LICENSE = MIT From arnout at mind.be Sun Feb 13 15:21:02 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 16:21:02 +0100 Subject: [Buildroot] [git commit] configs/qemu_*: bump kernel version to 5.15.18 Message-ID: <20220213151834.EF27482974@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f540edccb93444408b4280b62e254d9b4fc335b2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master See runtimes test here : https://gitlab.com/davidheng.pw/buildroot/-/pipelines/460019580 Signed-off-by: David HENG Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- configs/qemu_aarch64_sbsa_defconfig | 2 +- configs/qemu_aarch64_virt_defconfig | 2 +- configs/qemu_arm_versatile_defconfig | 2 +- configs/qemu_arm_versatile_nommu_defconfig | 2 +- configs/qemu_arm_vexpress_defconfig | 2 +- configs/qemu_arm_vexpress_tz_defconfig | 2 +- configs/qemu_m68k_mcf5208_defconfig | 2 +- configs/qemu_m68k_q800_defconfig | 2 +- configs/qemu_microblazebe_mmu_defconfig | 2 +- configs/qemu_microblazeel_mmu_defconfig | 2 +- configs/qemu_mips32r2_malta_defconfig | 2 +- configs/qemu_mips32r2el_malta_defconfig | 2 +- configs/qemu_mips32r6_malta_defconfig | 2 +- configs/qemu_mips32r6el_malta_defconfig | 2 +- configs/qemu_mips64_malta_defconfig | 2 +- configs/qemu_mips64el_malta_defconfig | 2 +- configs/qemu_mips64r6_malta_defconfig | 2 +- configs/qemu_mips64r6el_malta_defconfig | 2 +- configs/qemu_nios2_10m50_defconfig | 2 +- configs/qemu_or1k_defconfig | 2 +- configs/qemu_ppc64_e5500_defconfig | 2 +- configs/qemu_ppc64_pseries_defconfig | 2 +- configs/qemu_ppc64le_powernv8_defconfig | 2 +- configs/qemu_ppc64le_pseries_defconfig | 2 +- configs/qemu_ppc_bamboo_defconfig | 2 +- configs/qemu_ppc_e500mc_defconfig | 2 +- configs/qemu_ppc_g3beige_defconfig | 2 +- configs/qemu_ppc_mac99_defconfig | 2 +- configs/qemu_ppc_mpc8544ds_defconfig | 2 +- configs/qemu_riscv32_virt_defconfig | 2 +- configs/qemu_riscv64_virt_defconfig | 2 +- configs/qemu_s390x_defconfig | 2 +- configs/qemu_sh4_r2d_defconfig | 2 +- configs/qemu_sh4eb_r2d_defconfig | 2 +- configs/qemu_sparc64_sun4u_defconfig | 2 +- configs/qemu_sparc_ss10_defconfig | 2 +- configs/qemu_x86_64_defconfig | 2 +- configs/qemu_x86_defconfig | 2 +- configs/qemu_xtensa_lx60_defconfig | 2 +- configs/qemu_xtensa_lx60_nommu_defconfig | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) diff --git a/configs/qemu_aarch64_sbsa_defconfig b/configs/qemu_aarch64_sbsa_defconfig index e7d3bd03ca..2d6134e78c 100644 --- a/configs/qemu_aarch64_sbsa_defconfig +++ b/configs/qemu_aarch64_sbsa_defconfig @@ -25,7 +25,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.18" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_aarch64_virt_defconfig b/configs/qemu_aarch64_virt_defconfig index 9fbf293311..03df0ad9e2 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.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig index 5e399d17de..4f43273a82 100644 --- a/configs/qemu_arm_versatile_defconfig +++ b/configs/qemu_arm_versatile_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.18" BR2_LINUX_KERNEL_DEFCONFIG="versatile" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-versatile/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/configs/qemu_arm_versatile_nommu_defconfig b/configs/qemu_arm_versatile_nommu_defconfig index 1357742703..0c49d1b67d 100644 --- a/configs/qemu_arm_versatile_nommu_defconfig +++ b/configs/qemu_arm_versatile_nommu_defconfig @@ -31,7 +31,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.18" BR2_LINUX_KERNEL_DEFCONFIG="versatile" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-versatile/linux-nommu.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/configs/qemu_arm_vexpress_defconfig b/configs/qemu_arm_vexpress_defconfig index dafcc37bc0..2c813456f4 100644 --- a/configs/qemu_arm_vexpress_defconfig +++ b/configs/qemu_arm_vexpress_defconfig @@ -25,7 +25,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.18" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" diff --git a/configs/qemu_arm_vexpress_tz_defconfig b/configs/qemu_arm_vexpress_tz_defconfig index 327762277b..def11721ae 100644 --- a/configs/qemu_arm_vexpress_tz_defconfig +++ b/configs/qemu_arm_vexpress_tz_defconfig @@ -22,7 +22,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.18" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-vexpress-tz/linux.fragment" diff --git a/configs/qemu_m68k_mcf5208_defconfig b/configs/qemu_m68k_mcf5208_defconfig index 1dcd8272c3..0490b9e29e 100644 --- a/configs/qemu_m68k_mcf5208_defconfig +++ b/configs/qemu_m68k_mcf5208_defconfig @@ -19,7 +19,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-mcf5208/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_m68k_q800_defconfig b/configs/qemu_m68k_q800_defconfig index 7bf8b4061f..30d8982db3 100644 --- a/configs/qemu_m68k_q800_defconfig +++ b/configs/qemu_m68k_q800_defconfig @@ -19,7 +19,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-q800/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_microblazebe_mmu_defconfig b/configs/qemu_microblazebe_mmu_defconfig index 0508f92c36..7bd2ae53b8 100644 --- a/configs/qemu_microblazebe_mmu_defconfig +++ b/configs/qemu_microblazebe_mmu_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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux.config" BR2_LINUX_KERNEL_LINUX_BIN=y diff --git a/configs/qemu_microblazeel_mmu_defconfig b/configs/qemu_microblazeel_mmu_defconfig index 10811e284e..cd8c5a3cb2 100644 --- a/configs/qemu_microblazeel_mmu_defconfig +++ b/configs/qemu_microblazeel_mmu_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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux.config" BR2_LINUX_KERNEL_LINUX_BIN=y diff --git a/configs/qemu_mips32r2_malta_defconfig b/configs/qemu_mips32r2_malta_defconfig index c08ca862c5..49d84c308b 100644 --- a/configs/qemu_mips32r2_malta_defconfig +++ b/configs/qemu_mips32r2_malta_defconfig @@ -19,7 +19,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips32r2el_malta_defconfig b/configs/qemu_mips32r2el_malta_defconfig index 0bb16b9320..5363018c47 100644 --- a/configs/qemu_mips32r2el_malta_defconfig +++ b/configs/qemu_mips32r2el_malta_defconfig @@ -19,7 +19,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips32r6_malta_defconfig b/configs/qemu_mips32r6_malta_defconfig index f7b218c62a..f77feb9b6d 100644 --- a/configs/qemu_mips32r6_malta_defconfig +++ b/configs/qemu_mips32r6_malta_defconfig @@ -19,7 +19,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips32r6el_malta_defconfig b/configs/qemu_mips32r6el_malta_defconfig index d0f118ff90..575034441a 100644 --- a/configs/qemu_mips32r6el_malta_defconfig +++ b/configs/qemu_mips32r6el_malta_defconfig @@ -19,7 +19,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips64_malta_defconfig b/configs/qemu_mips64_malta_defconfig index fe03b911c5..e9438fda1e 100644 --- a/configs/qemu_mips64_malta_defconfig +++ b/configs/qemu_mips64_malta_defconfig @@ -19,7 +19,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips64el_malta_defconfig b/configs/qemu_mips64el_malta_defconfig index c6d428226c..4b1c8e22af 100644 --- a/configs/qemu_mips64el_malta_defconfig +++ b/configs/qemu_mips64el_malta_defconfig @@ -19,7 +19,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips64r6_malta_defconfig b/configs/qemu_mips64r6_malta_defconfig index 9cf651a4ba..87ef7902af 100644 --- a/configs/qemu_mips64r6_malta_defconfig +++ b/configs/qemu_mips64r6_malta_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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips64r6el_malta_defconfig b/configs/qemu_mips64r6el_malta_defconfig index 0d02a5b4df..5774207f65 100644 --- a/configs/qemu_mips64r6el_malta_defconfig +++ b/configs/qemu_mips64r6el_malta_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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_nios2_10m50_defconfig b/configs/qemu_nios2_10m50_defconfig index 44afb928e3..4b9c53e8de 100644 --- a/configs/qemu_nios2_10m50_defconfig +++ b/configs/qemu_nios2_10m50_defconfig @@ -1,7 +1,7 @@ BR2_nios2=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" BR2_LINUX_KERNEL_DEFCONFIG="10m50" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/nios2-10m50/linux.fragment" BR2_TARGET_ROOTFS_INITRAMFS=y diff --git a/configs/qemu_or1k_defconfig b/configs/qemu_or1k_defconfig index 9d55cb3420..b3d9d79156 100644 --- a/configs/qemu_or1k_defconfig +++ b/configs/qemu_or1k_defconfig @@ -15,7 +15,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/or1k/linux.config" diff --git a/configs/qemu_ppc64_e5500_defconfig b/configs/qemu_ppc64_e5500_defconfig index 09aac50252..072240c99c 100644 --- a/configs/qemu_ppc64_e5500_defconfig +++ b/configs/qemu_ppc64_e5500_defconfig @@ -16,7 +16,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.18" BR2_LINUX_KERNEL_DEFCONFIG="corenet64_smp" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc64-e5500/linux.fragment" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_ppc64_pseries_defconfig b/configs/qemu_ppc64_pseries_defconfig index 1a20e2ee0e..ad523ec2ef 100644 --- a/configs/qemu_ppc64_pseries_defconfig +++ b/configs/qemu_ppc64_pseries_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.18" BR2_LINUX_KERNEL_DEFCONFIG="pseries" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc64le_powernv8_defconfig b/configs/qemu_ppc64le_powernv8_defconfig index d8ea6655fc..a784695ddf 100644 --- a/configs/qemu_ppc64le_powernv8_defconfig +++ b/configs/qemu_ppc64le_powernv8_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.18" BR2_LINUX_KERNEL_DEFCONFIG="powernv" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc64le_pseries_defconfig b/configs/qemu_ppc64le_pseries_defconfig index 46f62b8313..f10b0fdf40 100644 --- a/configs/qemu_ppc64le_pseries_defconfig +++ b/configs/qemu_ppc64le_pseries_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.18" BR2_LINUX_KERNEL_DEFCONFIG="pseries_le" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_bamboo_defconfig b/configs/qemu_ppc_bamboo_defconfig index d6abbeb452..6129c4a663 100644 --- a/configs/qemu_ppc_bamboo_defconfig +++ b/configs/qemu_ppc_bamboo_defconfig @@ -19,7 +19,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.18" BR2_LINUX_KERNEL_DEFCONFIG="44x/bamboo" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-bamboo/linux.fragment" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_e500mc_defconfig b/configs/qemu_ppc_e500mc_defconfig index 232bc1f70c..1853e538bb 100644 --- a/configs/qemu_ppc_e500mc_defconfig +++ b/configs/qemu_ppc_e500mc_defconfig @@ -16,7 +16,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.18" BR2_LINUX_KERNEL_DEFCONFIG="corenet32_smp" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-e500mc/linux.fragment" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_ppc_g3beige_defconfig b/configs/qemu_ppc_g3beige_defconfig index 824fe648ab..9bbebede1b 100644 --- a/configs/qemu_ppc_g3beige_defconfig +++ b/configs/qemu_ppc_g3beige_defconfig @@ -19,7 +19,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-g3beige/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_mac99_defconfig b/configs/qemu_ppc_mac99_defconfig index ddeb99465a..e9629ff233 100644 --- a/configs/qemu_ppc_mac99_defconfig +++ b/configs/qemu_ppc_mac99_defconfig @@ -11,7 +11,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.18" BR2_LINUX_KERNEL_DEFCONFIG="pmac32" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-mac99/linux.fragment" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_mpc8544ds_defconfig b/configs/qemu_ppc_mpc8544ds_defconfig index 1a72d81ed5..2b51573da9 100644 --- a/configs/qemu_ppc_mpc8544ds_defconfig +++ b/configs/qemu_ppc_mpc8544ds_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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-mpc8544ds/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_riscv32_virt_defconfig b/configs/qemu_riscv32_virt_defconfig index e2753cfcfd..dff87ef342 100644 --- a/configs/qemu_riscv32_virt_defconfig +++ b/configs/qemu_riscv32_virt_defconfig @@ -19,7 +19,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.18" BR2_LINUX_KERNEL_DEFCONFIG="rv32" BR2_LINUX_KERNEL_IMAGE=y diff --git a/configs/qemu_riscv64_virt_defconfig b/configs/qemu_riscv64_virt_defconfig index 07f20776f0..d67d070185 100644 --- a/configs/qemu_riscv64_virt_defconfig +++ b/configs/qemu_riscv64_virt_defconfig @@ -19,7 +19,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.18" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_IMAGE=y diff --git a/configs/qemu_s390x_defconfig b/configs/qemu_s390x_defconfig index 86ac1fd024..346df04ada 100644 --- a/configs/qemu_s390x_defconfig +++ b/configs/qemu_s390x_defconfig @@ -17,7 +17,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.18" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_sh4_r2d_defconfig b/configs/qemu_sh4_r2d_defconfig index c8177e6096..0f12b7dfe9 100644 --- a/configs/qemu_sh4_r2d_defconfig +++ b/configs/qemu_sh4_r2d_defconfig @@ -20,7 +20,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Linux 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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux.config" BR2_LINUX_KERNEL_ZIMAGE=y diff --git a/configs/qemu_sh4eb_r2d_defconfig b/configs/qemu_sh4eb_r2d_defconfig index f334569779..d5ee371e79 100644 --- a/configs/qemu_sh4eb_r2d_defconfig +++ b/configs/qemu_sh4eb_r2d_defconfig @@ -19,7 +19,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Linux 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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4eb-r2d/linux.config" BR2_LINUX_KERNEL_ZIMAGE=y diff --git a/configs/qemu_sparc64_sun4u_defconfig b/configs/qemu_sparc64_sun4u_defconfig index 941439d338..485b497e71 100644 --- a/configs/qemu_sparc64_sun4u_defconfig +++ b/configs/qemu_sparc64_sun4u_defconfig @@ -19,7 +19,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Linux 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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc64-sun4u/linux.config" diff --git a/configs/qemu_sparc_ss10_defconfig b/configs/qemu_sparc_ss10_defconfig index 62d3acb16b..2ba04c0864 100644 --- a/configs/qemu_sparc_ss10_defconfig +++ b/configs/qemu_sparc_ss10_defconfig @@ -19,7 +19,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Linux 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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc-ss10/linux.config" diff --git a/configs/qemu_x86_64_defconfig b/configs/qemu_x86_64_defconfig index 1bca76df44..cc505a8540 100644 --- a/configs/qemu_x86_64_defconfig +++ b/configs/qemu_x86_64_defconfig @@ -21,7 +21,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux.config" BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig index 54cf8e9794..34b7e2d292 100644 --- a/configs/qemu_x86_defconfig +++ b/configs/qemu_x86_defconfig @@ -22,7 +22,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux.config" diff --git a/configs/qemu_xtensa_lx60_defconfig b/configs/qemu_xtensa_lx60_defconfig index 1db3fd3ce4..cb78106091 100644 --- a/configs/qemu_xtensa_lx60_defconfig +++ b/configs/qemu_xtensa_lx60_defconfig @@ -21,7 +21,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y diff --git a/configs/qemu_xtensa_lx60_nommu_defconfig b/configs/qemu_xtensa_lx60_nommu_defconfig index d4c07b574c..c4473fb32a 100644 --- a/configs/qemu_xtensa_lx60_nommu_defconfig +++ b/configs/qemu_xtensa_lx60_nommu_defconfig @@ -25,7 +25,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.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux-nommu.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y From arnout at mind.be Sun Feb 13 15:21:04 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 16:21:04 +0100 Subject: [Buildroot] [git commit] package/gerbera: fix build with fmt > 8.0 Message-ID: <20220213151835.539E482983@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c16618959a1097b1d8bc580a29c2fdd96c96e91d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since bump of fmt to version 8.1.1 in commit ec7fd50d08690a383fec40748ac9b78c3f764316: /home/peko/autobuild/instance-0/output-1/host/mips64el-buildroot-linux-uclibc/sysroot/usr/include/fmt/core.h:1728:7: error: static assertion failed: Cannot format an argument. To make type T formattable provide a formatter specialization: https://fmt.dev/latest/api.html#udt formattable, ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/009db44f83c3b02025c910ce4f190bd709c5ab49 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/gerbera/0001-Fix-for-fmt-8-0.patch | 44 ++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/package/gerbera/0001-Fix-for-fmt-8-0.patch b/package/gerbera/0001-Fix-for-fmt-8-0.patch new file mode 100644 index 0000000000..c4419209a5 --- /dev/null +++ b/package/gerbera/0001-Fix-for-fmt-8-0.patch @@ -0,0 +1,44 @@ +From 82d84ac5e62c23e717198fc7b2ef190ff95e70d1 Mon Sep 17 00:00:00 2001 +From: kyak +Date: Wed, 12 Jan 2022 19:41:37 +0300 +Subject: [PATCH] Fix for fmt > 8.0 + +[Retrieved from: +https://github.com/gerbera/gerbera/commit/82d84ac5e62c23e717198fc7b2ef190ff95e70d1] +Signed-off-by: Fabrice Fontaine +--- + src/util/logger.h | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/src/util/logger.h b/src/util/logger.h +index 58696e52f..ba64afa79 100644 +--- a/src/util/logger.h ++++ b/src/util/logger.h +@@ -32,7 +32,9 @@ + #ifndef __LOGGER_H__ + #define __LOGGER_H__ + ++#include + #include ++#include + + #define log_debug SPDLOG_DEBUG + #define log_info SPDLOG_INFO +@@ -40,4 +42,17 @@ + #define log_error SPDLOG_ERROR + #define log_js SPDLOG_INFO + ++#if FMT_VERSION >= 80100 ++template ++struct fmt::formatter, char>> ++ : formatter> { ++ template ++ auto format(const T& value, FormatContext& ctx) -> decltype(ctx.out()) ++ { ++ return fmt::formatter>::format( ++ static_cast>(value), ctx); ++ } ++}; ++#endif ++ + #endif // __LOGGER_H__ From arnout at mind.be Sun Feb 13 15:21:03 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 16:21:03 +0100 Subject: [Buildroot] [git commit] package/weston: bump to version 10.0.0 Message-ID: <20220213151835.390D28295E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f67a6e9b7a7be9adbc405b3126000056120a01af branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patches that are now upstream. Jpeg dependency is now optional. Add new backend compositor options. Add comment indicating fbdev is deprecated(not yet removed). Enable tools to match existing default(all enabled). Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...de-fcntl.h-for-open-O_RDWR-O_CLOEXEC-and-.patch | 48 --- ...0002-libweston-backend-drm-might-need-EGL.patch | 47 --- .../0003-pipewire-add-support-for-0.3-API.patch | 391 --------------------- .../0004-pipewire-fix-null-deref-in-0-3-API.patch | 28 -- package/weston/Config.in | 34 +- package/weston/weston.hash | 10 +- package/weston/weston.mk | 35 +- 7 files changed, 58 insertions(+), 535 deletions(-) diff --git a/package/weston/0001-tests-include-fcntl.h-for-open-O_RDWR-O_CLOEXEC-and-.patch b/package/weston/0001-tests-include-fcntl.h-for-open-O_RDWR-O_CLOEXEC-and-.patch deleted file mode 100644 index 2eb6bd838c..0000000000 --- a/package/weston/0001-tests-include-fcntl.h-for-open-O_RDWR-O_CLOEXEC-and-.patch +++ /dev/null @@ -1,48 +0,0 @@ -From b10c0e843dcb8148bbe869bb15261955b94ac98c Mon Sep 17 00:00:00 2001 -From: Denys Dmytriyenko -Date: Tue, 8 Sep 2020 19:37:42 -0400 -Subject: [PATCH] tests: include fcntl.h for open(), O_RDWR, O_CLOEXEC and - O_CREAT - -musl libc (unlike glibc) requires explicitly incuding fcntl.h to define open(), -O_RDWR, O_CLOEXEC and O_CREAT. Otherwise the build fails with the errors: - -| ../weston-9.0.0/tests/weston-test-fixture-compositor.c: In function 'wait_for_lock': -| ../weston-9.0.0/tests/weston-test-fixture-compositor.c:135:7: warning: implicit declaration of function 'open'; did you mean 'popen'? [-Wimplicit-function-declaration] -| 135 | fd = open(lock_path, O_RDWR | O_CLOEXEC | O_CREAT, 00700); -| | ^~~~ -| | popen -| ../weston-9.0.0/tests/weston-test-fixture-compositor.c:135:23: error: 'O_RDWR' undeclared (first use in this function) -| 135 | fd = open(lock_path, O_RDWR | O_CLOEXEC | O_CREAT, 00700); -| | ^~~~~~ -| ../weston-9.0.0/tests/weston-test-fixture-compositor.c:135:23: note: each undeclared identifier is reported only once for each function it appears in -| ../weston-9.0.0/tests/weston-test-fixture-compositor.c:135:32: error: 'O_CLOEXEC' undeclared (first use in this function) -| 135 | fd = open(lock_path, O_RDWR | O_CLOEXEC | O_CREAT, 00700); -| | ^~~~~~~~~ -| ../weston-9.0.0/tests/weston-test-fixture-compositor.c:135:44: error: 'O_CREAT' undeclared (first use in this function) -| 135 | fd = open(lock_path, O_RDWR | O_CLOEXEC | O_CREAT, 00700); -| | ^~~~~~~ - -Signed-off-by: Denys Dmytriyenko -Signed-off-by: James Hilliard -[james.hilliard1 at gmail.com: backport from upstream commit -b10c0e843dcb8148bbe869bb15261955b94ac98c] ---- - tests/weston-test-fixture-compositor.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tests/weston-test-fixture-compositor.c b/tests/weston-test-fixture-compositor.c -index 1c32959c..c1eb26c4 100644 ---- a/tests/weston-test-fixture-compositor.c -+++ b/tests/weston-test-fixture-compositor.c -@@ -35,6 +35,7 @@ - #include - #include - #include -+#include - - #include "shared/helpers.h" - #include "weston-test-fixture-compositor.h" --- -2.25.1 - diff --git a/package/weston/0002-libweston-backend-drm-might-need-EGL.patch b/package/weston/0002-libweston-backend-drm-might-need-EGL.patch deleted file mode 100644 index f504e1145b..0000000000 --- a/package/weston/0002-libweston-backend-drm-might-need-EGL.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 4b93b71067949cc5efabb9b3d59278a3f362b11c Mon Sep 17 00:00:00 2001 -From: Heiko Thiery -Date: Wed, 21 Oct 2020 13:33:25 +0200 -Subject: [PATCH] libweston/backend/drm: might need EGL - -gbm-drm.c includes gl-renderer.h. When EGL is enabled, that in turns -includes egl.h. As such, dependencies for drm should include EGL if -it is available. - -This condition is modelled after a similar one in libweston/meson.build - -Reported-by: Gary Bisson -Reported-by: Heiko Thiery -Signed-off-by: Yann E. MORIN -Cc: Refik Tuzakli -Cc: Thomas Petazzoni -Signed-off-by: Heiko Thiery ---- -This patch should be a proper fix for the issue discribed in the patch from -Gary [1]. - -Since the MR on weston upstream [2] is not merged now I add this patch -to have working weston with imx in buildroot. - -[1] https://patchwork.ozlabs.org/project/buildroot/patch/20200402130842.918696-3-gary.bisson at boundarydevices.com/ -[2] https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/508 ---- - libweston/backend-drm/meson.build | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/libweston/backend-drm/meson.build b/libweston/backend-drm/meson.build -index 484c2702..e3e5b976 100644 ---- a/libweston/backend-drm/meson.build -+++ b/libweston/backend-drm/meson.build -@@ -53,6 +53,9 @@ if get_option('renderer-gl') - config_h.set('HAVE_GBM_FD_IMPORT', '1') - endif - deps_drm += dep_gbm -+ if dep_egl.found() -+ deps_drm += dep_egl -+ endif - srcs_drm += 'drm-gbm.c' - config_h.set('BUILD_DRM_GBM', '1') - endif --- -2.20.1 - diff --git a/package/weston/0003-pipewire-add-support-for-0.3-API.patch b/package/weston/0003-pipewire-add-support-for-0.3-API.patch deleted file mode 100644 index b486b3de5c..0000000000 --- a/package/weston/0003-pipewire-add-support-for-0.3-API.patch +++ /dev/null @@ -1,391 +0,0 @@ -From cc08737e3fd174ec3c4c208ea4f2a3a6a9e8af3e Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Mon, 6 Jul 2020 00:58:02 -0600 -Subject: [PATCH] pipewire: add support for 0.3 API - -Fixes: #369 - -Signed-off-by: James Hilliard -[james.hilliard1 at gmail.com: backport from upstream commit -80b585f8d2a31e780b4de41fbd187a742bea7e1a] ---- - .gitlab-ci.yml | 2 +- - .gitlab-ci/debian-install.sh | 16 ++++- - pipewire/meson.build | 28 ++++++--- - pipewire/pipewire-plugin.c | 118 ++++++++++++++++++++++++++++++++++- - 4 files changed, 151 insertions(+), 13 deletions(-) - -diff --git a/pipewire/meson.build b/pipewire/meson.build -index 3d3374b8..e30a0b62 100644 ---- a/pipewire/meson.build -+++ b/pipewire/meson.build -@@ -5,17 +5,25 @@ if get_option('pipewire') - error('Attempting to build the pipewire plugin without the required DRM backend. ' + user_hint) - endif - -- depnames = [ -- 'libpipewire-0.2', 'libspa-0.1' -- ] - deps_pipewire = [ dep_libweston_private ] -- foreach depname : depnames -- dep = dependency(depname, required: false) -- if not dep.found() -- error('Pipewire plugin requires @0@ which was not found. '.format(depname) + user_hint) -- endif -- deps_pipewire += dep -- endforeach -+ -+ dep_libpipewire = dependency('libpipewire-0.3', required: false) -+ if not dep_libpipewire.found() -+ dep_libpipewire = dependency('libpipewire-0.2', required: false) -+ endif -+ if not dep_libpipewire.found() -+ error('Pipewire plugin requires libpipewire which was not found. ' + user_hint) -+ endif -+ deps_pipewire += dep_libpipewire -+ -+ dep_libspa = dependency('libspa-0.2', required: false) -+ if not dep_libspa.found() -+ dep_libspa = dependency('libspa-0.1', required: false) -+ endif -+ if not dep_libspa.found() -+ error('Pipewire plugin requires libspa which was not found. ' + user_hint) -+ endif -+ deps_pipewire += dep_libspa - - plugin_pipewire = shared_library( - 'pipewire-plugin', -diff --git a/pipewire/pipewire-plugin.c b/pipewire/pipewire-plugin.c -index 6f892574..ce70ea63 100644 ---- a/pipewire/pipewire-plugin.c -+++ b/pipewire/pipewire-plugin.c -@@ -34,20 +34,27 @@ - #include - #include - -+#include -+ - #include - #include - #include - --#include -+#if PW_CHECK_VERSION(0, 2, 90) -+#include -+#include -+#endif - - #define PROP_RANGE(min, max) 2, (min), (max) - -+#if !PW_CHECK_VERSION(0, 2, 90) - struct type { - struct spa_type_media_type media_type; - struct spa_type_media_subtype media_subtype; - struct spa_type_format_video format_video; - struct spa_type_video_format video_format; - }; -+#endif - - struct weston_pipewire { - struct weston_compositor *compositor; -@@ -60,12 +67,19 @@ struct weston_pipewire { - struct pw_loop *loop; - struct wl_event_source *loop_source; - -+#if PW_CHECK_VERSION(0, 2, 90) -+ struct pw_context *context; -+#endif - struct pw_core *core; - struct pw_type *t; -+#if PW_CHECK_VERSION(0, 2, 90) -+ struct spa_hook core_listener; -+#else - struct type type; - - struct pw_remote *remote; - struct spa_hook remote_listener; -+#endif - }; - - struct pipewire_output { -@@ -100,6 +114,7 @@ struct pipewire_frame_data { - struct wl_event_source *fence_sync_event_source; - }; - -+#if !PW_CHECK_VERSION(0, 2, 90) - static inline void init_type(struct type *type, struct spa_type_map *map) - { - spa_type_media_type_map(map, &type->media_type); -@@ -107,6 +122,7 @@ static inline void init_type(struct type *type, struct spa_type_map *map) - spa_type_format_video_map(map, &type->format_video); - spa_type_video_format_map(map, &type->video_format); - } -+#endif - - static void - pipewire_debug_impl(struct weston_pipewire *pipewire, -@@ -141,6 +157,7 @@ pipewire_debug_impl(struct weston_pipewire *pipewire, - free(logstr); - } - -+#if !PW_CHECK_VERSION(0, 2, 90) - static void - pipewire_debug(struct weston_pipewire *pipewire, const char *fmt, ...) - { -@@ -150,6 +167,7 @@ pipewire_debug(struct weston_pipewire *pipewire, const char *fmt, ...) - pipewire_debug_impl(pipewire, NULL, fmt, ap); - va_end(ap); - } -+#endif - - static void - pipewire_output_debug(struct pipewire_output *output, const char *fmt, ...) -@@ -185,7 +203,9 @@ pipewire_output_handle_frame(struct pipewire_output *output, int fd, - const struct weston_drm_virtual_output_api *api = - output->pipewire->virtual_output_api; - size_t size = output->output->height * stride; -+#if !PW_CHECK_VERSION(0, 2, 90) - struct pw_type *t = output->pipewire->t; -+#endif - struct pw_buffer *buffer; - struct spa_buffer *spa_buffer; - struct spa_meta_header *h; -@@ -203,7 +223,12 @@ pipewire_output_handle_frame(struct pipewire_output *output, int fd, - - spa_buffer = buffer->buffer; - -+#if PW_CHECK_VERSION(0, 2, 90) -+ if ((h = spa_buffer_find_meta_data(spa_buffer, SPA_META_Header, -+ sizeof(struct spa_meta_header)))) { -+#else - if ((h = spa_buffer_find_meta(spa_buffer, t->meta.Header))) { -+#endif - h->pts = -1; - h->flags = 0; - h->seq = output->seq++; -@@ -375,18 +400,40 @@ pipewire_set_dpms(struct weston_output *base_output, enum dpms_enum level) - static int - pipewire_output_connect(struct pipewire_output *output) - { -+#if !PW_CHECK_VERSION(0, 2, 90) - struct weston_pipewire *pipewire = output->pipewire; - struct type *type = &pipewire->type; -+#endif - uint8_t buffer[1024]; - struct spa_pod_builder builder = - SPA_POD_BUILDER_INIT(buffer, sizeof(buffer)); - const struct spa_pod *params[1]; -+#if !PW_CHECK_VERSION(0, 2, 90) - struct pw_type *t = pipewire->t; -+#endif - int frame_rate = output->output->current_mode->refresh / 1000; - int width = output->output->width; - int height = output->output->height; - int ret; - -+#if PW_CHECK_VERSION(0, 2, 90) -+ params[0] = spa_pod_builder_add_object(&builder, -+ SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat, -+ SPA_FORMAT_mediaType, SPA_POD_Id(SPA_MEDIA_TYPE_video), -+ SPA_FORMAT_mediaSubtype, SPA_POD_Id(SPA_MEDIA_SUBTYPE_raw), -+ SPA_FORMAT_VIDEO_format, SPA_POD_Id(SPA_VIDEO_FORMAT_BGRx), -+ SPA_FORMAT_VIDEO_size, SPA_POD_Rectangle(&SPA_RECTANGLE(width, height)), -+ SPA_FORMAT_VIDEO_framerate, SPA_POD_Fraction(&SPA_FRACTION (0, 1)), -+ SPA_FORMAT_VIDEO_maxFramerate, -+ SPA_POD_CHOICE_RANGE_Fraction(&SPA_FRACTION(frame_rate, 1), -+ &SPA_FRACTION(1, 1), -+ &SPA_FRACTION(frame_rate, 1))); -+ -+ ret = pw_stream_connect(output->stream, PW_DIRECTION_OUTPUT, SPA_ID_INVALID, -+ (PW_STREAM_FLAG_DRIVER | -+ PW_STREAM_FLAG_MAP_BUFFERS), -+ params, 1); -+#else - params[0] = spa_pod_builder_object(&builder, - t->param.idEnumFormat, t->spa_format, - "I", type->media_type.video, -@@ -406,6 +453,7 @@ pipewire_output_connect(struct pipewire_output *output) - (PW_STREAM_FLAG_DRIVER | - PW_STREAM_FLAG_MAP_BUFFERS), - params, 1); -+#endif - if (ret != 0) { - weston_log("Failed to connect pipewire stream: %s", - spa_strerror(ret)); -@@ -482,26 +530,42 @@ pipewire_output_stream_state_changed(void *data, enum pw_stream_state old, - } - - static void -+#if PW_CHECK_VERSION(0, 2, 90) -+pipewire_output_stream_param_changed(void *data, uint32_t id, const struct spa_pod *format) -+#else - pipewire_output_stream_format_changed(void *data, const struct spa_pod *format) -+#endif - { - struct pipewire_output *output = data; -+#if !PW_CHECK_VERSION(0, 2, 90) - struct weston_pipewire *pipewire = output->pipewire; -+#endif - uint8_t buffer[1024]; - struct spa_pod_builder builder = - SPA_POD_BUILDER_INIT(buffer, sizeof(buffer)); - const struct spa_pod *params[2]; -+#if !PW_CHECK_VERSION(0, 2, 90) - struct pw_type *t = pipewire->t; -+#endif - int32_t width, height, stride, size; - const int bpp = 4; - - if (!format) { - pipewire_output_debug(output, "format = None"); -+#if PW_CHECK_VERSION(0, 2, 90) -+ pw_stream_update_params(output->stream, NULL, 0); -+#else - pw_stream_finish_format(output->stream, 0, NULL, 0); -+#endif - return; - } - -+#if PW_CHECK_VERSION(0, 2, 90) -+ spa_format_video_raw_parse(format, &output->video_format); -+#else - spa_format_video_raw_parse(format, &output->video_format, - &pipewire->type.format_video); -+#endif - - width = output->video_format.size.width; - height = output->video_format.size.height; -@@ -510,6 +574,21 @@ pipewire_output_stream_format_changed(void *data, const struct spa_pod *format) - - pipewire_output_debug(output, "format = %dx%d", width, height); - -+#if PW_CHECK_VERSION(0, 2, 90) -+ params[0] = spa_pod_builder_add_object(&builder, -+ SPA_TYPE_OBJECT_ParamBuffers, SPA_PARAM_Buffers, -+ SPA_PARAM_BUFFERS_size, SPA_POD_Int(size), -+ SPA_PARAM_BUFFERS_stride, SPA_POD_Int(stride), -+ SPA_PARAM_BUFFERS_buffers, SPA_POD_CHOICE_RANGE_Int(4, 2, 8), -+ SPA_PARAM_BUFFERS_align, SPA_POD_Int(16)); -+ -+ params[1] = spa_pod_builder_add_object(&builder, -+ SPA_TYPE_OBJECT_ParamMeta, SPA_PARAM_Meta, -+ SPA_PARAM_META_type, SPA_POD_Id(SPA_META_Header), -+ SPA_PARAM_META_size, SPA_POD_Int(sizeof(struct spa_meta_header))); -+ -+ pw_stream_update_params(output->stream, params, 2); -+#else - params[0] = spa_pod_builder_object(&builder, - t->param.idBuffers, t->param_buffers.Buffers, - ":", t->param_buffers.size, -@@ -527,12 +606,17 @@ pipewire_output_stream_format_changed(void *data, const struct spa_pod *format) - ":", t->param_meta.size, "i", sizeof(struct spa_meta_header)); - - pw_stream_finish_format(output->stream, 0, params, 2); -+#endif - } - - static const struct pw_stream_events stream_events = { - PW_VERSION_STREAM_EVENTS, - .state_changed = pipewire_output_stream_state_changed, -+#if PW_CHECK_VERSION(0, 2, 90) -+ .param_changed = pipewire_output_stream_param_changed, -+#else - .format_changed = pipewire_output_stream_format_changed, -+#endif - }; - - static struct weston_output * -@@ -560,7 +644,11 @@ pipewire_output_create(struct weston_compositor *c, char *name) - if (!head) - goto err; - -+#if PW_CHECK_VERSION(0, 2, 90) -+ output->stream = pw_stream_new(pipewire->core, name, NULL); -+#else - output->stream = pw_stream_new(pipewire->remote, name, NULL); -+#endif - if (!output->stream) { - weston_log("Cannot initialize pipewire stream\n"); - goto err; -@@ -704,6 +792,14 @@ weston_pipewire_loop_handler(int fd, uint32_t mask, void *data) - return 0; - } - -+#if PW_CHECK_VERSION(0, 2, 90) -+static void -+weston_pipewire_error(void *data, uint32_t id, int seq, int res, -+ const char *error) -+{ -+ weston_log("pipewire remote error: %s\n", error); -+} -+#else - static void - weston_pipewire_state_changed(void *data, enum pw_remote_state old, - enum pw_remote_state state, const char *error) -@@ -725,12 +821,20 @@ weston_pipewire_state_changed(void *data, enum pw_remote_state old, - break; - } - } -+#endif - - -+#if PW_CHECK_VERSION(0, 2, 90) -+static const struct pw_core_events core_events = { -+ PW_VERSION_CORE_EVENTS, -+ .error = weston_pipewire_error, -+}; -+#else - static const struct pw_remote_events remote_events = { - PW_VERSION_REMOTE_EVENTS, - .state_changed = weston_pipewire_state_changed, - }; -+#endif - - static int - weston_pipewire_init(struct weston_pipewire *pipewire) -@@ -745,10 +849,19 @@ weston_pipewire_init(struct weston_pipewire *pipewire) - - pw_loop_enter(pipewire->loop); - -+#if PW_CHECK_VERSION(0, 2, 90) -+ pipewire->context = pw_context_new(pipewire->loop, NULL, 0); -+#else - pipewire->core = pw_core_new(pipewire->loop, NULL); - pipewire->t = pw_core_get_type(pipewire->core); - init_type(&pipewire->type, pipewire->t->map); -+#endif - -+#if PW_CHECK_VERSION(0, 2, 90) -+ pw_core_add_listener(pipewire->core, -+ &pipewire->core_listener, -+ &core_events, pipewire); -+#else - pipewire->remote = pw_remote_new(pipewire->core, NULL, 0); - pw_remote_add_listener(pipewire->remote, - &pipewire->remote_listener, -@@ -777,6 +890,7 @@ weston_pipewire_init(struct weston_pipewire *pipewire) - goto err; - } - } -+#endif - - loop = wl_display_get_event_loop(pipewire->compositor->wl_display); - pipewire->loop_source = -@@ -786,12 +900,14 @@ weston_pipewire_init(struct weston_pipewire *pipewire) - pipewire); - - return 0; -+#if !PW_CHECK_VERSION(0, 2, 90) - err: - if (pipewire->remote) - pw_remote_destroy(pipewire->remote); - pw_loop_leave(pipewire->loop); - pw_loop_destroy(pipewire->loop); - return -1; -+#endif - } - - static const struct weston_pipewire_api pipewire_api = { --- -2.25.1 - diff --git a/package/weston/0004-pipewire-fix-null-deref-in-0-3-API.patch b/package/weston/0004-pipewire-fix-null-deref-in-0-3-API.patch deleted file mode 100644 index f65348e166..0000000000 --- a/package/weston/0004-pipewire-fix-null-deref-in-0-3-API.patch +++ /dev/null @@ -1,28 +0,0 @@ -From a67393c353e0f25b142910a817be5a7754d436c3 Mon Sep 17 00:00:00 2001 -From: Ambareesh Balaji -Date: Sat, 5 Dec 2020 20:49:55 -0500 -Subject: [PATCH] pipewire: fix null deref in 0.3 API - -Signed-off-by: Ambareesh Balaji -[Retrieved from: -https://gitlab.freedesktop.org/wayland/weston/-/commit/a67393c353e0f25b142910a817be5a7754d436c3] -Signed-off-by: Fabrice Fontaine ---- - pipewire/pipewire-plugin.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/pipewire/pipewire-plugin.c b/pipewire/pipewire-plugin.c -index ca5cbfec1..55705acfc 100644 ---- a/pipewire/pipewire-plugin.c -+++ b/pipewire/pipewire-plugin.c -@@ -856,6 +856,7 @@ weston_pipewire_init(struct weston_pipewire *pipewire) - - #if PW_CHECK_VERSION(0, 2, 90) - pipewire->context = pw_context_new(pipewire->loop, NULL, 0); -+ pipewire->core = pw_context_connect(pipewire->context, NULL, 0); - #else - pipewire->core = pw_core_new(pipewire->loop, NULL); - pipewire->t = pw_core_get_type(pipewire->core); --- -GitLab - diff --git a/package/weston/Config.in b/package/weston/Config.in index 8f3dbc7931..d45e50baaa 100644 --- a/package/weston/Config.in +++ b/package/weston/Config.in @@ -35,7 +35,7 @@ choice prompt "default compositor" config BR2_PACKAGE_WESTON_DEFAULT_FBDEV - bool "fbdev" + bool "fbdev (deprecated)" select BR2_PACKAGE_WESTON_FBDEV config BR2_PACKAGE_WESTON_DEFAULT_DRM @@ -46,21 +46,31 @@ config BR2_PACKAGE_WESTON_DEFAULT_DRM comment "drm backend needs mesa3d w/ EGL driver" depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL && !BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL +config BR2_PACKAGE_WESTON_DEFAULT_HEADLESS + bool "headless" + select BR2_PACKAGE_WESTON_HEADLESS + +config BR2_PACKAGE_WESTON_DEFAULT_WAYLAND + bool "wayland (nested)" + select BR2_PACKAGE_WESTON_WAYLAND + config BR2_PACKAGE_WESTON_DEFAULT_X11 - bool "X11" + bool "X11 (nested)" depends on BR2_PACKAGE_XORG7 select BR2_PACKAGE_WESTON_X11 -comment "X11 backend needs X.org" +comment "X11 (nested) backend needs X.org" depends on !BR2_PACKAGE_XORG7 endchoice config BR2_PACKAGE_WESTON_DEFAULT_COMPOSITOR string - default "fbdev" if BR2_PACKAGE_WESTON_DEFAULT_FBDEV - default "drm" if BR2_PACKAGE_WESTON_DEFAULT_DRM - default "x11" if BR2_PACKAGE_WESTON_DEFAULT_X11 + default "fbdev" if BR2_PACKAGE_WESTON_DEFAULT_FBDEV + default "drm" if BR2_PACKAGE_WESTON_DEFAULT_DRM + default "headless" if BR2_PACKAGE_WESTON_DEFAULT_HEADLESS + default "wayland" if BR2_PACKAGE_WESTON_DEFAULT_WAYLAND + default "x11" if BR2_PACKAGE_WESTON_DEFAULT_X11 config BR2_PACKAGE_WESTON_DRM bool "DRM compositor" @@ -71,7 +81,7 @@ comment "DRM compositor needs an OpenGL EGL backend provided by mesa3d" depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL && !BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL config BR2_PACKAGE_WESTON_FBDEV - bool "fbdev compositor" + bool "fbdev compositor (deprecated)" # FreeRDP needs threads and !static, already the case for weston config BR2_PACKAGE_WESTON_RDP @@ -99,13 +109,19 @@ comment "RDP compositor needs a toolchain w/ wchar, C++" depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP +config BR2_PACKAGE_WESTON_HEADLESS + bool "headless (testing) compositor" + +config BR2_PACKAGE_WESTON_WAYLAND + bool "Wayland (nested) compositor" + config BR2_PACKAGE_WESTON_X11 - bool "X11 compositor" + bool "X11 (nested) compositor" depends on BR2_PACKAGE_XORG7 select BR2_PACKAGE_LIBXCB select BR2_PACKAGE_XLIB_LIBX11 -comment "X11 compositor needs X.org enabled" +comment "X11 (nested) compositor needs X.org enabled" depends on !BR2_PACKAGE_XORG7 config BR2_PACKAGE_WESTON_XWAYLAND diff --git a/package/weston/weston.hash b/package/weston/weston.hash index 5a6b38686a..b78a7c7550 100644 --- a/package/weston/weston.hash +++ b/package/weston/weston.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2020-September/041595.html -md5 b406da0fe9139fd39653238fde22a6cf weston-9.0.0.tar.xz -sha1 90b9540a0bd6d6f7a465817f1c696d4d393183c9 weston-9.0.0.tar.xz -sha256 5cf5d6ce192e0eb15c1fc861a436bf21b5bb3b91dbdabbdebe83e1f83aa098fe weston-9.0.0.tar.xz -sha512 ccc263f8279b7b23e5c593b4a8a023de2c3dc178b1b8d6593599171770bcfe97608de9fcb77aa1cab39255451d289d323e51c317dae190c7641282e085b84f90 weston-9.0.0.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2022-February/042103.html +md5 bc4abe2ee6904a4890a0c641c6257f91 weston-10.0.0.tar.xz +sha1 b1a51e3bb7ee1d75bbf728c8071771e07fc97fdd weston-10.0.0.tar.xz +sha256 5c23964112b90238bed39e5dd1e41cd71a79398813cdc3bbb15a9fdc94e547ae weston-10.0.0.tar.xz +sha512 77e05530751e4f743eebf015ab5b78a1fcc66b774713b5e296cfffc488be84e459f811c85ac4280b7b63eebf4ff5c958dd7306376ab343e6b80feae16c8c35a4 weston-10.0.0.tar.xz sha256 fdb65868f65d0fbdb05c2d3b779e10ce9969fa0c4b9262ba4f260e87086ab860 COPYING diff --git a/package/weston/weston.mk b/package/weston/weston.mk index 6dd5439291..a0a18d9358 100644 --- a/package/weston/weston.mk +++ b/package/weston/weston.mk @@ -4,7 +4,7 @@ # ################################################################################ -WESTON_VERSION = 9.0.0 +WESTON_VERSION = 10.0.0 WESTON_SITE = https://wayland.freedesktop.org/releases WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz WESTON_LICENSE = MIT @@ -12,12 +12,14 @@ WESTON_LICENSE_FILES = COPYING WESTON_CPE_ID_VENDOR = wayland WESTON_DEPENDENCIES = host-pkgconf wayland wayland-protocols \ - libxkbcommon pixman libpng jpeg udev cairo libinput libdrm + libxkbcommon pixman libpng udev cairo libinput libdrm WESTON_CONF_OPTS = \ -Dbackend-headless=false \ -Dcolor-management-colord=false \ - -Dremoting=false + -Ddoc=false \ + -Dremoting=false \ + -Dtools=calibrator,debug,info,terminal,touch-calibrator # Uses VIDIOC_EXPBUF, only available from 3.8+ ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_8),y) @@ -33,6 +35,13 @@ else WESTON_CONF_OPTS += -Dlauncher-logind=false endif +ifeq ($(BR2_PACKAGE_JPEG),y) +WESTON_CONF_OPTS += -Dimage-jpeg=true +WESTON_DEPENDENCIES += jpeg +else +WESTON_CONF_OPTS += -Dimage-jpeg=false +endif + ifeq ($(BR2_PACKAGE_WEBP),y) WESTON_CONF_OPTS += -Dimage-webp=true WESTON_DEPENDENCIES += webp @@ -48,10 +57,10 @@ endef define WESTON_USERS - - weston-launch -1 - - - - Weston launcher group endef -WESTON_CONF_OPTS += -Dweston-launch=true +WESTON_CONF_OPTS += -Ddeprecated-weston-launch=true WESTON_DEPENDENCIES += linux-pam else -WESTON_CONF_OPTS += -Dweston-launch=false +WESTON_CONF_OPTS += -Ddeprecated-weston-launch=false endif ifeq ($(BR2_PACKAGE_HAS_LIBEGL_WAYLAND)$(BR2_PACKAGE_HAS_LIBGLES),yy) @@ -77,9 +86,9 @@ WESTON_CONF_OPTS += -Dbackend-rdp=false endif ifeq ($(BR2_PACKAGE_WESTON_FBDEV),y) -WESTON_CONF_OPTS += -Dbackend-fbdev=true +WESTON_CONF_OPTS += -Ddeprecated-backend-fbdev=true else -WESTON_CONF_OPTS += -Dbackend-fbdev=false +WESTON_CONF_OPTS += -Ddeprecated-backend-fbdev=false endif ifeq ($(BR2_PACKAGE_WESTON_DRM),y) @@ -88,6 +97,18 @@ else WESTON_CONF_OPTS += -Dbackend-drm=false endif +ifeq ($(BR2_PACKAGE_WESTON_HEADLESS),y) +WESTON_CONF_OPTS += -Dbackend-headless=true +else +WESTON_CONF_OPTS += -Dbackend-headless=false +endif + +ifeq ($(BR2_PACKAGE_WESTON_WAYLAND),y) +WESTON_CONF_OPTS += -Dbackend-wayland=true +else +WESTON_CONF_OPTS += -Dbackend-wayland=false +endif + ifeq ($(BR2_PACKAGE_WESTON_X11),y) WESTON_CONF_OPTS += -Dbackend-x11=true WESTON_DEPENDENCIES += libxcb xlib_libX11 From arnout at mind.be Sun Feb 13 15:30:28 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 16:30:28 +0100 Subject: [Buildroot] [PATCH] package/libbsd: bump to version 0.11.5 In-Reply-To: <20220207120946.1553618-1-francois.perrad@gadz.org> References: <20220207120946.1553618-1-francois.perrad@gadz.org> Message-ID: On 07/02/2022 13:09, Francois Perrad wrote: > Signed-off-by: Francois Perrad > --- > package/libbsd/libbsd.hash | 8 +++++--- > package/libbsd/libbsd.mk | 2 +- > 2 files changed, 6 insertions(+), 4 deletions(-) > > diff --git a/package/libbsd/libbsd.hash b/package/libbsd/libbsd.hash > index 17bb32e01..435ea5470 100644 > --- a/package/libbsd/libbsd.hash > +++ b/package/libbsd/libbsd.hash > @@ -1,3 +1,5 @@ > -# From https://lists.freedesktop.org/archives/libbsd/2021-February/000305.html > -sha512 a7015ea1ffa3766b1a4690526a25231898ad8275149b31fb6801082450172249997c36165626d101ffce53b59767a46676eebc0806426922fe4e773a0376c1f5 libbsd-0.11.3.tar.xz > -sha256 ff2fdeeb0fe8bcb9045fe91d69e8312a5b477c54db48dffe34dd1c0d730c5864 COPYING > +# From https://lists.freedesktop.org/archives/libbsd/2022-January/000322.html > +sha512 c52c19eddd53630aca14f9f6221f7b84aa9cc798b4bb91e867822b161793313aab872ac1c0350d29312a72fee6e2061f3910ff918b724ec171d8c9de5837c841 libbsd-0.11.5.tar.xz > + > +# License files (locally computed) > +sha256 3761714adb9c45fa588b77b372d6e75dcc9e6822cc2d6baa712007241aec714e COPYING Please explain in the commit message why the license hash changed, and if necessary, update _LICENSE. There's a reason we have these hashes, you know. Patch marked as Changes Requested. Regards, Arnout > diff --git a/package/libbsd/libbsd.mk b/package/libbsd/libbsd.mk > index 86df8a97a..0654bef82 100644 > --- a/package/libbsd/libbsd.mk > +++ b/package/libbsd/libbsd.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBBSD_VERSION = 0.11.3 > +LIBBSD_VERSION = 0.11.5 > 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, \ From arnout at mind.be Sun Feb 13 15:30:58 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 16:30:58 +0100 Subject: [Buildroot] [PATCH] package/zstd: bump to version 1.5.2 In-Reply-To: <20220207122423.1561946-1-francois.perrad@gadz.org> References: <20220207122423.1561946-1-francois.perrad@gadz.org> Message-ID: On 07/02/2022 13:24, Francois Perrad wrote: > Signed-off-by: Francois Perrad Applied to master, thanks. Regards, Arnout > --- > package/zstd/zstd.hash | 4 ++-- > package/zstd/zstd.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/zstd/zstd.hash b/package/zstd/zstd.hash > index d7d8a448f..eca44b89f 100644 > --- a/package/zstd/zstd.hash > +++ b/package/zstd/zstd.hash > @@ -1,5 +1,5 @@ > -# From https://github.com/facebook/zstd/releases/download/v1.5.1/zstd-1.5.1.tar.gz.sha256 > -sha256 e28b2f2ed5710ea0d3a1ecac3f6a947a016b972b9dd30242369010e5f53d7002 zstd-1.5.1.tar.gz > +# From https://github.com/facebook/zstd/releases/download/v1.5.2/zstd-1.5.2.tar.gz.sha256 > +sha256 7c42d56fac126929a6a85dbc73ff1db2411d04f104fae9bdea51305663a83fd0 zstd-1.5.2.tar.gz > > # License files (locally computed) > sha256 2c1a7fa704df8f3a606f6fc010b8b5aaebf403f3aeec339a12048f1ba7331a0b LICENSE > diff --git a/package/zstd/zstd.mk b/package/zstd/zstd.mk > index 476190e9a..a4bbada82 100644 > --- a/package/zstd/zstd.mk > +++ b/package/zstd/zstd.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -ZSTD_VERSION = 1.5.1 > +ZSTD_VERSION = 1.5.2 > ZSTD_SITE = https://github.com/facebook/zstd/releases/download/v$(ZSTD_VERSION) > ZSTD_INSTALL_STAGING = YES > ZSTD_LICENSE = BSD-3-Clause or GPL-2.0 From arnout at mind.be Sun Feb 13 15:31:14 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 16:31:14 +0100 Subject: [Buildroot] [PATCH] package/alfred: bump to version 2022.0 In-Reply-To: <20220207112228.1753927-1-jose.pekkarinen@unikie.com> References: <20220207112228.1753927-1-jose.pekkarinen@unikie.com> Message-ID: On 07/02/2022 12:22, Jos? Pekkarinen wrote: > https://www.open-mesh.org/news/107 > > Signed-off-by: Jos? Pekkarinen Applied to master, thanks. Regards, Arnout > --- > package/alfred/alfred.hash | 6 +++--- > package/alfred/alfred.mk | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/alfred/alfred.hash b/package/alfred/alfred.hash > index 0799071231..2da7eb31c8 100644 > --- a/package/alfred/alfred.hash > +++ b/package/alfred/alfred.hash > @@ -1,5 +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 > +# From https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2022.0.tar.gz.sha1 > +sha1 8e00789d3e1e5c959dd985809861ff624d372694 alfred-2022.0.tar.gz > # Locally computed > -sha256 4c79b6c45de4bcc8cbfe64cba9a0f8b4ef304ca84c194622f2bfa41e01e2cb95 alfred-2021.4.tar.gz > +sha256 abba1dac61eccfcd6329e7331d0555fecc937760fb36c6cf55ce6c1d751cfd98 alfred-2022.0.tar.gz > sha256 cecbf53d1148e13256ac29f8b900655b7fc8dc12d59939a95bc2323ea1747025 LICENSES/preferred/GPL-2.0 > diff --git a/package/alfred/alfred.mk b/package/alfred/alfred.mk > index ed59066393..24b9956b11 100644 > --- a/package/alfred/alfred.mk > +++ b/package/alfred/alfred.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -ALFRED_VERSION = 2021.4 > +ALFRED_VERSION = 2022.0 > ALFRED_SITE = https://downloads.open-mesh.org/batman/stable/sources/alfred > ALFRED_LICENSE = GPL-2.0 > ALFRED_LICENSE_FILES = LICENSES/preferred/GPL-2.0 From arnout at mind.be Sun Feb 13 15:32:17 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 16:32:17 +0100 Subject: [Buildroot] [PATCH] package/harfbuzz: bump to version 3.3.2 In-Reply-To: <20220206225902.3349344-1-giulio.benetti@benettiengineering.com> References: <20220206225902.3349344-1-giulio.benetti@benettiengineering.com> Message-ID: On 06/02/2022 23:59, Giulio Benetti wrote: > Signed-off-by: Giulio Benetti Applied to master, thanks. > --- > This patch superseeds this: > https://patchwork.ozlabs.org/project/buildroot/patch/20220131175341.4091688-1-giulio.benetti at benettiengineering.com/ If you mark it as superseded yourself, there's no real need to say it here. But you should probably have given it a v2. Regards, Arnout > --- > 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..61f2865563 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 1c13bca136c4f66658059853e2c1253f34c88f4b5c5aba6050aba7b5e0ce2503 harfbuzz-3.3.2.tar.xz > sha256 4345e1735f8bc6d812fed5180cabb5a5e88a4109d332652f2a45c13cfa5ee692 COPYING > diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk > index 67eab359c6..1f5dfa8822 100644 > --- a/package/harfbuzz/harfbuzz.mk > +++ b/package/harfbuzz/harfbuzz.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -HARFBUZZ_VERSION = 3.2.0 > +HARFBUZZ_VERSION = 3.3.2 > HARFBUZZ_SITE = https://github.com/harfbuzz/harfbuzz/releases/download/$(HARFBUZZ_VERSION) > HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.xz > HARFBUZZ_LICENSE = MIT, ISC (ucdn library) From arnout at mind.be Sun Feb 13 15:32:36 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 16:32:36 +0100 Subject: [Buildroot] [PATCH] package/libnss: bump to version 3.75 In-Reply-To: <20220206224521.3204040-1-giulio.benetti@benettiengineering.com> References: <20220206224521.3204040-1-giulio.benetti@benettiengineering.com> Message-ID: <6b41c65a-8655-229b-2832-23c2fa7c1c1e@mind.be> On 06/02/2022 23:45, Giulio Benetti wrote: > Signed-off-by: Giulio Benetti Applied to master, thanks. Regards, Arnout > --- > 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 819c272a30..07fb340c33 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_74_RTM/src/SHA256SUMS > -sha256 88928811f9f40f87d42e2eaccdf6e454562e51486067f2ddbe90aa47ea6cd056 nss-3.74.tar.gz > +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_75_RTM/src/SHA256SUMS > +sha256 fd571507827284644f4dd522a032acda2286835f6683ed22a1c2d3878cc58582 nss-3.75.tar.gz > # Locally calculated > sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING > diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk > index 537f6dd9b6..a9549e48dd 100644 > --- a/package/libnss/libnss.mk > +++ b/package/libnss/libnss.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBNSS_VERSION = 3.74 > +LIBNSS_VERSION = 3.75 > 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 arnout at mind.be Sun Feb 13 15:27:42 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 16:27:42 +0100 Subject: [Buildroot] [git commit] package/harfbuzz: bump to version 3.3.2 Message-ID: <20220213152515.A748682974@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=423ef314b480ee62ecbba48424e2d77dd7bff4fc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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..61f2865563 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 1c13bca136c4f66658059853e2c1253f34c88f4b5c5aba6050aba7b5e0ce2503 harfbuzz-3.3.2.tar.xz sha256 4345e1735f8bc6d812fed5180cabb5a5e88a4109d332652f2a45c13cfa5ee692 COPYING diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk index 67eab359c6..1f5dfa8822 100644 --- a/package/harfbuzz/harfbuzz.mk +++ b/package/harfbuzz/harfbuzz.mk @@ -4,7 +4,7 @@ # ################################################################################ -HARFBUZZ_VERSION = 3.2.0 +HARFBUZZ_VERSION = 3.3.2 HARFBUZZ_SITE = https://github.com/harfbuzz/harfbuzz/releases/download/$(HARFBUZZ_VERSION) HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.xz HARFBUZZ_LICENSE = MIT, ISC (ucdn library) From arnout at mind.be Sun Feb 13 15:27:26 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 16:27:26 +0100 Subject: [Buildroot] [git commit] package/libnss: bump to version 3.75 Message-ID: <20220213152515.9AF4B827D4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=039436fca6c06644a16b5cb3ec5a9cd05d43aefa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 819c272a30..07fb340c33 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_74_RTM/src/SHA256SUMS -sha256 88928811f9f40f87d42e2eaccdf6e454562e51486067f2ddbe90aa47ea6cd056 nss-3.74.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_75_RTM/src/SHA256SUMS +sha256 fd571507827284644f4dd522a032acda2286835f6683ed22a1c2d3878cc58582 nss-3.75.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index 537f6dd9b6..a9549e48dd 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.74 +LIBNSS_VERSION = 3.75 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 arnout at mind.be Sun Feb 13 15:29:33 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 16:29:33 +0100 Subject: [Buildroot] [git commit] package/zstd: bump to version 1.5.2 Message-ID: <20220213152515.BC00C827D4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=10ac3455d364b5e1f87d8f2f111ef1a6952e426a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/zstd/zstd.hash | 4 ++-- package/zstd/zstd.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/zstd/zstd.hash b/package/zstd/zstd.hash index d7d8a448ff..eca44b89f0 100644 --- a/package/zstd/zstd.hash +++ b/package/zstd/zstd.hash @@ -1,5 +1,5 @@ -# From https://github.com/facebook/zstd/releases/download/v1.5.1/zstd-1.5.1.tar.gz.sha256 -sha256 e28b2f2ed5710ea0d3a1ecac3f6a947a016b972b9dd30242369010e5f53d7002 zstd-1.5.1.tar.gz +# From https://github.com/facebook/zstd/releases/download/v1.5.2/zstd-1.5.2.tar.gz.sha256 +sha256 7c42d56fac126929a6a85dbc73ff1db2411d04f104fae9bdea51305663a83fd0 zstd-1.5.2.tar.gz # License files (locally computed) sha256 2c1a7fa704df8f3a606f6fc010b8b5aaebf403f3aeec339a12048f1ba7331a0b LICENSE diff --git a/package/zstd/zstd.mk b/package/zstd/zstd.mk index 476190e9ae..a4bbada825 100644 --- a/package/zstd/zstd.mk +++ b/package/zstd/zstd.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZSTD_VERSION = 1.5.1 +ZSTD_VERSION = 1.5.2 ZSTD_SITE = https://github.com/facebook/zstd/releases/download/v$(ZSTD_VERSION) ZSTD_INSTALL_STAGING = YES ZSTD_LICENSE = BSD-3-Clause or GPL-2.0 From arnout at mind.be Sun Feb 13 15:27:50 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 16:27:50 +0100 Subject: [Buildroot] [git commit] package/alfred: bump to version 2022.0 Message-ID: <20220213152515.B0C7482983@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b7e0b0e9a5831d85fcd5bacb2c1c815a26bfa1a0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://www.open-mesh.org/news/107 Signed-off-by: Jos?? Pekkarinen Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/alfred/alfred.hash | 6 +++--- package/alfred/alfred.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/alfred/alfred.hash b/package/alfred/alfred.hash index 0799071231..2da7eb31c8 100644 --- a/package/alfred/alfred.hash +++ b/package/alfred/alfred.hash @@ -1,5 +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 +# From https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2022.0.tar.gz.sha1 +sha1 8e00789d3e1e5c959dd985809861ff624d372694 alfred-2022.0.tar.gz # Locally computed -sha256 4c79b6c45de4bcc8cbfe64cba9a0f8b4ef304ca84c194622f2bfa41e01e2cb95 alfred-2021.4.tar.gz +sha256 abba1dac61eccfcd6329e7331d0555fecc937760fb36c6cf55ce6c1d751cfd98 alfred-2022.0.tar.gz sha256 cecbf53d1148e13256ac29f8b900655b7fc8dc12d59939a95bc2323ea1747025 LICENSES/preferred/GPL-2.0 diff --git a/package/alfred/alfred.mk b/package/alfred/alfred.mk index ed59066393..24b9956b11 100644 --- a/package/alfred/alfred.mk +++ b/package/alfred/alfred.mk @@ -4,7 +4,7 @@ # ################################################################################ -ALFRED_VERSION = 2021.4 +ALFRED_VERSION = 2022.0 ALFRED_SITE = https://downloads.open-mesh.org/batman/stable/sources/alfred ALFRED_LICENSE = GPL-2.0 ALFRED_LICENSE_FILES = LICENSES/preferred/GPL-2.0 From geomatsi at gmail.com Sun Feb 13 15:52:06 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Sun, 13 Feb 2022 18:52:06 +0300 Subject: [Buildroot] [PATCH 0/2] hostapd/wpa_s: fixes after version update Message-ID: <20220213155208.560001-1-geomatsi@gmail.com> Hi all, This patch series provides two fixes for hostapd/wpa_s build issues. The first patch fixes hostapd build regression caused by its version update. New hostapd version requires updated handling of CONFIG_DPP option. I guess I failed to catch this problem because all my random hostapd test configs enabled openssl. So I overlooked basic minimal configuration that did not require openssl. The second patch fixes specific configuration of wpa_supplicant reported by Yegor Yefremov. For now a patch is added. Yegor already posted patch to hostapd mailing list. So some time in the future this problem will be fixed upstream. Regards, Sergey Sergey Matyukevich (2): package/hostapd: update DPP option handling package/wpa_supplicant: fix build for mesh configuration package/hostapd/hostapd.mk | 3 +- .../0001-mesh-enable-HMAC_SHA384_KDF.patch | 30 +++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 package/wpa_supplicant/0001-mesh-enable-HMAC_SHA384_KDF.patch -- 2.35.0 From geomatsi at gmail.com Sun Feb 13 15:52:07 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Sun, 13 Feb 2022 18:52:07 +0300 Subject: [Buildroot] [PATCH 1/2] package/hostapd: update DPP option handling In-Reply-To: <20220213155208.560001-1-geomatsi@gmail.com> References: <20220213155208.560001-1-geomatsi@gmail.com> Message-ID: <20220213155208.560001-2-geomatsi@gmail.com> Makefile hostapd.mk defines different macros for different defconfig options. Options that are not listed in defconfig, can be set using HOSTAPD_CONFIG_SET. Options that are listed in defconfig, can be enabled/disabled using HOSTAPD_CONFIG_ENABLE/HOSTAPD_CONFIG_DISABLE. Starting from hostapd v2.10, option CONFIG_DPP is explicitly listed in defconfig. So it is time to switch to enable/disable macros for this option. Fixes: - http://autobuild.buildroot.net/results/3f8058ee6f3913fda795578f206db895731ba1e6/ Signed-off-by: Sergey Matyukevich --- package/hostapd/hostapd.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk index 075cb2a8d0..2ea6e0312f 100644 --- a/package/hostapd/hostapd.mk +++ b/package/hostapd/hostapd.mk @@ -84,12 +84,13 @@ endif ifeq ($(BR2_PACKAGE_HOSTAPD_WPA3),y) HOSTAPD_CONFIG_SET += \ - CONFIG_DPP \ CONFIG_SAE HOSTAPD_CONFIG_ENABLE += \ + CONFIG_DPP \ CONFIG_OWE else HOSTAPD_CONFIG_DISABLE += \ + CONFIG_DPP \ CONFIG_OWE endif -- 2.35.0 From geomatsi at gmail.com Sun Feb 13 15:52:08 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Sun, 13 Feb 2022 18:52:08 +0300 Subject: [Buildroot] [PATCH 2/2] package/wpa_supplicant: fix mesh configuration build In-Reply-To: <20220213155208.560001-1-geomatsi@gmail.com> References: <20220213155208.560001-1-geomatsi@gmail.com> Message-ID: <20220213155208.560001-3-geomatsi@gmail.com> Consider 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 BR2_PACKAGE_WPA_SUPPLICANT_EAP=y This configuration fails to build with the following error: /path/to/output/build/wpa_supplicant-2.10/build/wpa_supplicant/src/common/sae.o: in function `hkdf_expand': sae.c:(.text+0x3c8): undefined reference to `hmac_sha384_kdf' collect2: error: ld returned 1 exit status make[1]: *** [Makefile:1894: wpa_supplicant] Error 1 Looking into wpa_supplicant Makefile: - CONFIG_MESH for some reason needs SAE, so it enables CONFIG_SAE - CONFIG_SAE enables only HMAC_SHA256_KDF This is apparently not enough. At least HMAC_SHA384_KDF is required for successful build. This commit adds a minimal patch for wpa_supplicant that fixes specified build configuration. Reported-by: Yegor Yefremov Signed-off-by: Sergey Matyukevich --- .../0001-mesh-enable-HMAC_SHA384_KDF.patch | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 package/wpa_supplicant/0001-mesh-enable-HMAC_SHA384_KDF.patch diff --git a/package/wpa_supplicant/0001-mesh-enable-HMAC_SHA384_KDF.patch b/package/wpa_supplicant/0001-mesh-enable-HMAC_SHA384_KDF.patch new file mode 100644 index 0000000000..d765c1dbbc --- /dev/null +++ b/package/wpa_supplicant/0001-mesh-enable-HMAC_SHA384_KDF.patch @@ -0,0 +1,30 @@ +From 08986b7da7e580f5deb570aaa654df38fb23397a Mon Sep 17 00:00:00 2001 +From: Sergey Matyukevich +Date: Sun, 13 Feb 2022 18:26:23 +0300 +Subject: [PATCH] mesh: enable HMAC_SHA384_KDF + +Mesh support CONFIG_MESH needs SAE, so it enables CONFIG_SAE. +In its turn, CONFIG_SAE enables only HMAC_SHA256_KDF option. +This is apparently not enough for successful build. At least +HMAC_SHA384_KDF is required for successful build. + +Signed-off-by: Sergey Matyukevich +--- + wpa_supplicant/Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile +index cb66defac..c8e53a3c9 100644 +--- a/wpa_supplicant/Makefile ++++ b/wpa_supplicant/Makefile +@@ -246,6 +246,7 @@ endif + ifdef CONFIG_MESH + NEED_80211_COMMON=y + NEED_AES_SIV=y ++NEED_HMAC_SHA384_KDF=y + CONFIG_SAE=y + CONFIG_AP=y + CFLAGS += -DCONFIG_MESH +-- +2.35.0 + -- 2.35.0 From ju.o at free.fr Sun Feb 13 16:11:07 2022 From: ju.o at free.fr (Julien Olivain) Date: Sun, 13 Feb 2022 17:11:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/ola: reintroduce package at version 0.10.8 Message-ID: <20220213161107.3138320-1-ju.o@free.fr> The ola package (Open Lighting Architecture) version 0.10.2 was removed in commit e692e1f2b2285c18057e2c70cc1d9d0cfdb15d5e due to an incompatibility with the protobuf version 3.2.0 present in Buildroot at that time. ola was fixed to support newer protobuf version in: https://github.com/OpenLightingProject/ola/pull/1630 This commit reintroduce this package at version 0.10.8. For changelogs since its removal at 0.10.2, see: - https://github.com/OpenLightingProject/ola/releases/tag/0.10.3 - https://github.com/OpenLightingProject/ola/releases/tag/0.10.4 - https://github.com/OpenLightingProject/ola/releases/tag/0.10.5 - https://github.com/OpenLightingProject/ola/releases/tag/0.10.6 - https://github.com/OpenLightingProject/ola/releases/tag/0.10.7 - https://github.com/OpenLightingProject/ola/releases/tag/0.10.8 This commit is based on the previously removed ola package, with the following rework: - Remove the dependency on BR2_HOST_GCC_AT_LEAST_4_5 as host gcc is now guaranteed to be at least 4.8. - Update target gcc dependency to >= 4.8 to reflect protobuf requirement. - Remove the BR2_PACKAGE_OLA_SLP option, which was removed in ola 0.9.4. - Change the "DMX4Linux" plugin option name to "Open DMX" to better reflect the ola option (DMX4Linux is a legacy plugin for 2.6 Kernels). - Update Python support to version 3.x only - Remove patches, as they are no longer needed - Add options for ola plugins: ftdidmx, gpio, karate, openpixelcontrol, renard, spi, uartdmx, usbdmx - Reorder options alphabetically - Update project URL - Add license hashes Signed-off-by: Julien Olivain --- Package tested with: make check-package [...] 0 warnings generated ./utils/test-pkg -a --package ola [...] 45 builds, 6 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed --- DEVELOPERS | 1 + package/Config.in | 1 + package/ola/Config.in | 171 ++++++++++++++++++++++++++++++++ package/ola/ola.hash | 8 ++ package/ola/ola.mk | 223 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 404 insertions(+) create mode 100644 package/ola/Config.in create mode 100644 package/ola/ola.hash create mode 100644 package/ola/ola.mk diff --git a/DEVELOPERS b/DEVELOPERS index ac702d8d0f..91e9060ac5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1610,6 +1610,7 @@ F: configs/zynq_qmtech_defconfig F: package/fluid-soundfont/ F: package/fluidsynth/ F: package/glslsandbox-player/ +F: package/ola/ F: package/ptm2human/ F: package/python-distro/ F: package/python-gnupg/ diff --git a/package/Config.in b/package/Config.in index 10209d84d7..9a8196efe2 100644 --- a/package/Config.in +++ b/package/Config.in @@ -535,6 +535,7 @@ endmenu source "package/nvidia-modprobe/Config.in" source "package/nvme/Config.in" source "package/ofono/Config.in" + source "package/ola/Config.in" source "package/on2-8170-modules/Config.in" source "package/open2300/Config.in" source "package/openfpgaloader/Config.in" diff --git a/package/ola/Config.in b/package/ola/Config.in new file mode 100644 index 0000000000..36b175138f --- /dev/null +++ b/package/ola/Config.in @@ -0,0 +1,171 @@ +comment "ola needs a toolchain w/ C++, threads, dynamic library, gcc >= 4.8" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ + || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS + +menuconfig BR2_PACKAGE_OLA + bool "ola (open lighting architecture)" + depends on BR2_INSTALL_LIBSTDCPP # protobuf + depends on !BR2_STATIC_LIBS # protobuf + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # protobuf + select BR2_PACKAGE_PROTOBUF + select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_LIBUUID + help + Open Lighting Architecture provides applications + with a mechanism to send and receive DMX512 & RDM + commands using hardware devices and DMX over IP protocols. + + https://www.openlighting.org/ola/ + +if BR2_PACKAGE_OLA + +comment "bindings and interface" + +config BR2_PACKAGE_OLA_WEB + bool "http interface" + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt, libmicrohttpd + select BR2_PACKAGE_LIBMICROHTTPD + help + Build OLA with browser interface. + +config BR2_PACKAGE_OLA_PYTHON_BINDINGS + bool "python bindings" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_PROTOBUF + help + Build OLA with support for the Python language. + +comment "tests and examples" + +config BR2_PACKAGE_OLA_EXAMPLES + bool "examples" + select BR2_PACKAGE_NCURSES + help + Build OLA examples. + +config BR2_PACKAGE_OLA_RDM_TESTS + bool "rdm tests" + depends on BR2_PACKAGE_OLA_PYTHON_BINDINGS + depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS + select BR2_PACKAGE_PYTHON_NUMPY + help + Build OLA RDM tests. + +comment "plugin selections" + +config BR2_PACKAGE_OLA_PLUGIN_ARTNET + bool "artnet" + help + Build Artnet plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_DUMMY + bool "dummy" + help + Build Dummy plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_E131 + bool "acn E131" + help + Build ACN E131 plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_ESPNET + bool "espnet" + help + Build EspNet plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_FTDIDMX + bool "ftdidmx" + select BR2_PACKAGE_LIBFTDI1 + help + Build FTDI USB DMX plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_GPIO + bool "GPIO" + help + Build GPIO plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_KARATE + bool "karate" + help + Build Karate plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_KINET + bool "kinet" + help + Build KiNet plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_MILINT + bool "Milford Instruments" + help + Build Milford Instruments 1-463 plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_OPENDMX + bool "Enttec Open DMX" + help + Build Enttec Open DMX plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_OPENPIXELCONTROL + bool "Open Pixel Control" + help + Build Open Pixel Control (OPC) plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_OSC + bool "osc" + select BR2_PACKAGE_LIBLO + help + Build Open Sound Control (OSC) plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_PATHPORT + bool "pathport" + help + Build Pathport plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_RENARD + bool "renard" + help + Build Renard plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_SANDNET + bool "sandnet" + help + Build SandNet plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_SHOWNET + bool "shownet" + help + Build ShowNet plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_SPI + bool "spi" + help + Build SPI plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_STAGEPROFI + bool "stageprofi" + select BR2_PACKAGE_LIBUSB + help + Build StageProfi plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_UARTDMX + bool "uartdmx" + help + Build UART Native DMX plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_USBDMX + bool "usbdmx" + select BR2_PACKAGE_LIBUSB + help + Build USB DMX plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_USBPRO + bool "usbpro" + select BR2_PACKAGE_LIBUSB + help + Build UsbPro plugin for OLA. + +endif diff --git a/package/ola/ola.hash b/package/ola/ola.hash new file mode 100644 index 0000000000..7565adabde --- /dev/null +++ b/package/ola/ola.hash @@ -0,0 +1,8 @@ +# Locally calculated +sha256 102aa3114562a2a71dbf7f77d2a0fb9fc47acc35d6248a70b6e831365ca71b13 ola-0.10.8.tar.gz + +# License files (locally computed) +sha256 e6b95dd336a57abb343e2988ac22b7e21b35c5b86003e6eb9e066ffbeeff9da7 COPYING +sha256 1480a883c87789075ccdead38b8ad9e2d740d6f7eefaaf183f894b50bebd8a25 GPL +sha256 e6b95dd336a57abb343e2988ac22b7e21b35c5b86003e6eb9e066ffbeeff9da7 LGPL +sha256 685ceaf368d37250f69f2861e91a4cbbab069e81af8bf50adce8a498936e02fc LICENCE diff --git a/package/ola/ola.mk b/package/ola/ola.mk new file mode 100644 index 0000000000..5090076175 --- /dev/null +++ b/package/ola/ola.mk @@ -0,0 +1,223 @@ +################################################################################ +# +# ola +# +################################################################################ + +OLA_VERSION = 0.10.8 +OLA_SITE = https://github.com/OpenLightingProject/ola/releases/download/$(OLA_VERSION) +OLA_LICENSE = LGPL-2.1+ (libola, libolacommon, Python bindings), GPL-2.0+ (libolaserver, olad, Python examples and tests) +OLA_LICENSE_FILES = COPYING GPL LGPL LICENCE +OLA_INSTALL_STAGING = YES +OLA_AUTORECONF = YES + +# util-linux provides uuid lib +OLA_DEPENDENCIES = protobuf util-linux host-bison host-flex host-ola + +OLA_CONF_OPTS = \ + ac_cv_have_pymod_google_protobuf=yes \ + --disable-fatal-warnings \ + --disable-gcov \ + --disable-ja-rule \ + --disable-java-libs \ + --disable-root-check \ + --disable-tcmalloc \ + --disable-unittests \ + --with-ola-protoc-plugin=$(HOST_DIR)/usr/bin/ola_protoc_plugin + +HOST_OLA_DEPENDENCIES = host-util-linux host-protobuf + +# When building the host part, disable as much as possible to speed up +# the configure step and avoid missing host dependencies. +HOST_OLA_CONF_OPTS = \ + --disable-all-plugins \ + --disable-osc \ + --disable-uart \ + --disable-libusb \ + --disable-libftdi \ + --disable-http \ + --disable-examples \ + --disable-unittests \ + --disable-doxygen-html \ + --disable-doxygen-doc \ + --disable-fatal-warnings + +# On the host side, we only need ola_protoc_plugin, so build and install this +# only. +HOST_OLA_MAKE_OPTS = protoc/ola_protoc_plugin +define HOST_OLA_INSTALL_CMDS + $(INSTALL) -D -m 0755 $(@D)/protoc/ola_protoc_plugin $(HOST_DIR)/usr/bin/ola_protoc_plugin +endef + +# sets where to find python libs built for target and required by ola +OLA_CONF_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages +OLA_MAKE_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages + +## OLA Bindings and Interface selections + +ifeq ($(BR2_PACKAGE_OLA_WEB),y) +OLA_CONF_OPTS += --enable-http +OLA_DEPENDENCIES += libmicrohttpd +else +OLA_CONF_OPTS += --disable-http +endif + +ifeq ($(BR2_PACKAGE_OLA_PYTHON_BINDINGS),y) +OLA_CONF_OPTS += --enable-python-libs +OLA_DEPENDENCIES += python3 python-protobuf +else +OLA_CONF_OPTS += --disable-python-libs +endif + +## OLA Examples and Tests + +ifeq ($(BR2_PACKAGE_OLA_EXAMPLES),y) +OLA_CONF_OPTS += --enable-examples +OLA_DEPENDENCIES += ncurses +else +OLA_CONF_OPTS += --disable-examples +endif + +ifeq ($(BR2_PACKAGE_OLA_RDM_TESTS),y) +OLA_CONF_OPTS += --enable-rdm-tests +OLA_DEPENDENCIES += python-numpy +# needed as numpy builds some shared libraries and ola checks for +# numpy using a host python test program which fails with 'wrong ELF +# class'. +OLA_CONF_ENV += ac_cv_have_pymod_numpy=yes +else +OLA_CONF_OPTS += --disable-rdm-tests +endif + +## OLA Plugin selections + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_ARTNET),y) +OLA_CONF_OPTS += --enable-artnet +else +OLA_CONF_OPTS += --disable-artnet +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_DUMMY),y) +OLA_CONF_OPTS += --enable-dummy +else +OLA_CONF_OPTS += --disable-dummy +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_E131),y) +OLA_CONF_OPTS += --enable-e131 +else +OLA_CONF_OPTS += --disable-e131 +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_ESPNET),y) +OLA_CONF_OPTS += --enable-espnet +else +OLA_CONF_OPTS += --disable-espnet +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_FTDIDMX),y) +OLA_CONF_OPTS += --enable-ftdidmx +OLA_DEPENDENCIES += libftdi1 +else +OLA_CONF_OPTS += --disable-ftdidmx +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_GPIO),y) +OLA_CONF_OPTS += --enable-gpio +else +OLA_CONF_OPTS += --disable-gpio +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_KARATE),y) +OLA_CONF_OPTS += --enable-karate +else +OLA_CONF_OPTS += --disable-karate +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_KINET),y) +OLA_CONF_OPTS += --enable-kinet +else +OLA_CONF_OPTS += --disable-kinet +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_MILINT),y) +OLA_CONF_OPTS += --enable-milinst +else +OLA_CONF_OPTS += --disable-milinst +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_OPENDMX),y) +OLA_CONF_OPTS += --enable-opendmx +else +OLA_CONF_OPTS += --disable-opendmx +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_OPENPIXELCONTROL),y) +OLA_CONF_OPTS += --enable-openpixelcontrol +else +OLA_CONF_OPTS += --disable-openpixelcontrol +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_OSC),y) +OLA_CONF_OPTS += --enable-osc +OLA_DEPENDENCIES += liblo +else +OLA_CONF_OPTS += --disable-osc +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_PATHPORT),y) +OLA_CONF_OPTS += --enable-pathport +else +OLA_CONF_OPTS += --disable-pathport +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_RENARD),y) +OLA_CONF_OPTS += --enable-renard +else +OLA_CONF_OPTS += --disable-renard +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_SANDNET),y) +OLA_CONF_OPTS += --enable-sandnet +else +OLA_CONF_OPTS += --disable-sandnet +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_SHOWNET),y) +OLA_CONF_OPTS += --enable-shownet +else +OLA_CONF_OPTS += --disable-shownet +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_SPI),y) +OLA_CONF_OPTS += --enable-spi +else +OLA_CONF_OPTS += --disable-spi +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_STAGEPROFI),y) +OLA_CONF_OPTS += --enable-stageprofi --enable-libusb +else +OLA_CONF_OPTS += --disable-stageprofi +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_UARTDMX),y) +OLA_CONF_OPTS += --enable-uartdmx +else +OLA_CONF_OPTS += --disable-uartdmx +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_USBDMX),y) +OLA_CONF_OPTS += --enable-usbdmx --enable-libusb +else +OLA_CONF_OPTS += --disable-usbdmx +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_USBPRO),y) +OLA_CONF_OPTS += --enable-usbpro --enable-libusb +else +OLA_CONF_OPTS += --disable-usbpro +endif + +$(eval $(autotools-package)) +$(eval $(host-autotools-package)) -- 2.35.1 From giulio.benetti at benettiengineering.com Sun Feb 13 16:36:25 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 13 Feb 2022 17:36:25 +0100 Subject: [Buildroot] [PATCH] package/harfbuzz: bump to version 3.3.2 In-Reply-To: References: Message-ID: <3FAB3345-1BDE-4A7C-9B17-7F3C986D5D40@benettiengineering.com> > Il giorno 13 feb 2022, alle ore 16:33, Arnout Vandecappelle ha scritto: > > ? > >> On 06/02/2022 23:59, Giulio Benetti wrote: >> Signed-off-by: Giulio Benetti > > Applied to master, thanks. > >> --- >> This patch superseeds this: >> https://patchwork.ozlabs.org/project/buildroot/patch/20220131175341.4091688-1-giulio.benetti at benettiengineering.com/ > > If you mark it as superseded yourself, there's no real need to say it here. But you should probably have given it a v2. Ah ok, I didn?t think about it, thank you! Giulio > > Regards, > Arnout > >> --- >> 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..61f2865563 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 1c13bca136c4f66658059853e2c1253f34c88f4b5c5aba6050aba7b5e0ce2503 harfbuzz-3.3.2.tar.xz >> sha256 4345e1735f8bc6d812fed5180cabb5a5e88a4109d332652f2a45c13cfa5ee692 COPYING >> diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk >> index 67eab359c6..1f5dfa8822 100644 >> --- a/package/harfbuzz/harfbuzz.mk >> +++ b/package/harfbuzz/harfbuzz.mk >> @@ -4,7 +4,7 @@ >> # >> ################################################################################ >> -HARFBUZZ_VERSION = 3.2.0 >> +HARFBUZZ_VERSION = 3.3.2 >> HARFBUZZ_SITE = https://github.com/harfbuzz/harfbuzz/releases/download/$(HARFBUZZ_VERSION) >> HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.xz >> HARFBUZZ_LICENSE = MIT, ISC (ucdn library) > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From giulio.benetti at benettiengineering.com Sun Feb 13 16:37:52 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 13 Feb 2022 17:37:52 +0100 Subject: [Buildroot] [PATCH] docs/manual: fix "+size = +" latex formatting In-Reply-To: <54fda3e6-1188-f104-4c6d-f1686df77bcd@mind.be> References: <54fda3e6-1188-f104-4c6d-f1686df77bcd@mind.be> Message-ID: <0C0DD5FD-73D1-4DBB-AE31-4D8DE518D00B@benettiengineering.com> > Il giorno 13 feb 2022, alle ore 16:29, Arnout Vandecappelle ha scritto: > > ? > >> On 06/02/2022 10:54, Giulio Benetti wrote: >> Signed-off-by: Giulio Benetti > > Not sure why you say "latex formatting", but OK. :-) Ascii-doc, I was sure manual was written in latex but it?s not. Thanks Giulio > Applied to master, thanks. > > Regards, > Arnout > >> --- >> docs/manual/writing-rules.txt | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> diff --git a/docs/manual/writing-rules.txt b/docs/manual/writing-rules.txt >> index 3eec095d0e..06f87556ed 100644 >> --- a/docs/manual/writing-rules.txt >> +++ b/docs/manual/writing-rules.txt >> @@ -184,7 +184,7 @@ image sdimage.img { >> * Every node(+section+, +partition+, +file+, +subnode+) must have an open >> curly bracket on the same line of the node's name, while the closing one >> must be on a newline and after it a newline must be added except for the >> - last one node. Same goes for its option, for example option +size = +. >> + last one node. Same goes for its option, for example option +size+ +=+. >> * Every +option+(i.e. +image+, +offset+, +size+) must have the +=+ >> assignment one space from it and one space from the value specified. From arnout at mind.be Sun Feb 13 16:39:44 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 17:39:44 +0100 Subject: [Buildroot] [PATCH v6 4/8] package/qt5/qt5base: enable ccache via configure option In-Reply-To: <20220213150621.GD4462@scaer> References: <20220205201837.3324085-1-james.hilliard1@gmail.com> <20220205201837.3324085-4-james.hilliard1@gmail.com> <20220213150621.GD4462@scaer> Message-ID: On 13/02/2022 16:06, Yann E. MORIN wrote: > James, All, > > +Arnout > > On 2022-02-05 13:18 -0700, James Hilliard spake thusly: >> This should be cleaner than editing mkspecs/common/g++-base.conf. > > Is this actually fixing something? Is ccache as we sue it badly handled > by the qt5webengin buildsystem somehow? > > Thomas, Arnout: IIRC some time ago, there were talks about using the > compiler wrapper also for the host compiler. Maybe this would solve this > kind of situations? Yes it would. However, it would be pretty much the only thing handled by that wrapper, so I don't know if it's worth the bother. If we want to do that, it would probably be better to use the symlink approach for ccache, i.e. create a gcc->ccache symlink in HOST_DIR/bin and set HOSTCC to $(HOST_DIR)/bin/gcc. Regards, Arnout > > Regards, > Yann E. MORIN. > >> Signed-off-by: James Hilliard >> --- >> package/qt5/qt5base/qt5base.mk | 7 +++---- >> 1 file changed, 3 insertions(+), 4 deletions(-) >> >> diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk >> index d8a0bf1d16..4b7a2a937d 100644 >> --- a/package/qt5/qt5base/qt5base.mk >> +++ b/package/qt5/qt5base/qt5base.mk >> @@ -289,10 +289,9 @@ endef >> endif >> >> # This allows to use ccache when available >> -define QT5BASE_CONFIGURE_HOSTCC >> - $(SED) 's,^QMAKE_CC\s*=.*,QMAKE_CC = $(HOSTCC),' $(@D)/mkspecs/common/g++-base.conf >> - $(SED) 's,^QMAKE_CXX\s*=.*,QMAKE_CXX = $(HOSTCXX),' $(@D)/mkspecs/common/g++-base.conf >> -endef >> +ifeq ($(BR2_CCACHE),y) >> +QT5BASE_CONFIGURE_OPTS += -ccache >> +endif >> >> # Must be last so can override all options set by Buildroot >> QT5BASE_CONFIGURE_OPTS += $(call qstrip,$(BR2_PACKAGE_QT5BASE_CUSTOM_CONF_OPTS)) >> -- >> 2.25.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > From arnout at mind.be Sun Feb 13 16:42:55 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 17:42:55 +0100 Subject: [Buildroot] [PATCH 2/2] package/wpa_supplicant: fix mesh configuration build In-Reply-To: <20220213155208.560001-3-geomatsi@gmail.com> References: <20220213155208.560001-1-geomatsi@gmail.com> <20220213155208.560001-3-geomatsi@gmail.com> Message-ID: <5cbbc353-0bd4-6bfd-c18a-d2d29d419dd5@mind.be> On 13/02/2022 16:52, Sergey Matyukevich wrote: > Consider 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 > BR2_PACKAGE_WPA_SUPPLICANT_EAP=y > > This configuration fails to build with the following error: > > /path/to/output/build/wpa_supplicant-2.10/build/wpa_supplicant/src/common/sae.o: in function `hkdf_expand': > sae.c:(.text+0x3c8): undefined reference to `hmac_sha384_kdf' > collect2: error: ld returned 1 exit status > make[1]: *** [Makefile:1894: wpa_supplicant] Error 1 > > Looking into wpa_supplicant Makefile: > - CONFIG_MESH for some reason needs SAE, so it enables CONFIG_SAE > - CONFIG_SAE enables only HMAC_SHA256_KDF > > This is apparently not enough. At least HMAC_SHA384_KDF is required > for successful build. This commit adds a minimal patch for > wpa_supplicant that fixes specified build configuration. > > Reported-by: Yegor Yefremov > Signed-off-by: Sergey Matyukevich > --- > .../0001-mesh-enable-HMAC_SHA384_KDF.patch | 30 +++++++++++++++++++ > 1 file changed, 30 insertions(+) > create mode 100644 package/wpa_supplicant/0001-mesh-enable-HMAC_SHA384_KDF.patch > > diff --git a/package/wpa_supplicant/0001-mesh-enable-HMAC_SHA384_KDF.patch b/package/wpa_supplicant/0001-mesh-enable-HMAC_SHA384_KDF.patch > new file mode 100644 > index 0000000000..d765c1dbbc > --- /dev/null > +++ b/package/wpa_supplicant/0001-mesh-enable-HMAC_SHA384_KDF.patch > @@ -0,0 +1,30 @@ > +From 08986b7da7e580f5deb570aaa654df38fb23397a Mon Sep 17 00:00:00 2001 > +From: Sergey Matyukevich > +Date: Sun, 13 Feb 2022 18:26:23 +0300 > +Subject: [PATCH] mesh: enable HMAC_SHA384_KDF > + > +Mesh support CONFIG_MESH needs SAE, so it enables CONFIG_SAE. > +In its turn, CONFIG_SAE enables only HMAC_SHA256_KDF option. > +This is apparently not enough for successful build. At least > +HMAC_SHA384_KDF is required for successful build. > + You said that this patch was sent to hostapd. If that is true, please add a patchwork link for it, like: Upstream: https://patchwork.ozlabs.org/project/hostap/patch/20220130074139.2972-1-yegorslists at googlemail.com/ However, that patch looks a bit different, so you'll need to explain why. Also, you dropped Yegor as an author, that's not very nice... Regards, Arnout > +Signed-off-by: Sergey Matyukevich > +--- > + wpa_supplicant/Makefile | 1 + > + 1 file changed, 1 insertion(+) > + > +diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile > +index cb66defac..c8e53a3c9 100644 > +--- a/wpa_supplicant/Makefile > ++++ b/wpa_supplicant/Makefile > +@@ -246,6 +246,7 @@ endif > + ifdef CONFIG_MESH > + NEED_80211_COMMON=y > + NEED_AES_SIV=y > ++NEED_HMAC_SHA384_KDF=y > + CONFIG_SAE=y > + CONFIG_AP=y > + CFLAGS += -DCONFIG_MESH > +-- > +2.35.0 > + From yann.morin.1998 at free.fr Sun Feb 13 16:50:01 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 13 Feb 2022 17:50:01 +0100 Subject: [Buildroot] [PATCH v6 6/8] package/qt5/qt5webengine-chromium: new package In-Reply-To: <20220205201837.3324085-6-james.hilliard1@gmail.com> References: <20220205201837.3324085-1-james.hilliard1@gmail.com> <20220205201837.3324085-6-james.hilliard1@gmail.com> Message-ID: <20220213165001.GA38097@scaer> James, All, On 2022-02-05 13:18 -0700, James Hilliard spake thusly: > 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. > > Signed-off-by: James Hilliard > --- > package/qt5/Config.in | 1 + > .../0001-Add-python3-build-support.patch | 1858 +++++++++++++++++ This is a very big patch... The commit you are using here, 0ad2814370799a2161057d92231fe3ee00e2fe98, is on the '87-based' branch, which is supposedly not a recent branch, even if the commit itself is not so old (a bit over two months). However, there are more recent branches that already have python3 support, starting from '90-based' onward. Why can't we use those branches, instead of carrying such a beast of a patch? 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 geomatsi at gmail.com Sun Feb 13 16:56:53 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Sun, 13 Feb 2022 19:56:53 +0300 Subject: [Buildroot] [PATCH 2/2] package/wpa_supplicant: fix mesh configuration build In-Reply-To: <5cbbc353-0bd4-6bfd-c18a-d2d29d419dd5@mind.be> References: <20220213155208.560001-1-geomatsi@gmail.com> <20220213155208.560001-3-geomatsi@gmail.com> <5cbbc353-0bd4-6bfd-c18a-d2d29d419dd5@mind.be> Message-ID: Hi Arnout, > > Consider 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 > > BR2_PACKAGE_WPA_SUPPLICANT_EAP=y > > > > This configuration fails to build with the following error: > > > > /path/to/output/build/wpa_supplicant-2.10/build/wpa_supplicant/src/common/sae.o: in function `hkdf_expand': > > sae.c:(.text+0x3c8): undefined reference to `hmac_sha384_kdf' > > collect2: error: ld returned 1 exit status > > make[1]: *** [Makefile:1894: wpa_supplicant] Error 1 > > > > Looking into wpa_supplicant Makefile: > > - CONFIG_MESH for some reason needs SAE, so it enables CONFIG_SAE > > - CONFIG_SAE enables only HMAC_SHA256_KDF > > > > This is apparently not enough. At least HMAC_SHA384_KDF is required > > for successful build. This commit adds a minimal patch for > > wpa_supplicant that fixes specified build configuration. > > > > Reported-by: Yegor Yefremov > > Signed-off-by: Sergey Matyukevich > > --- > > .../0001-mesh-enable-HMAC_SHA384_KDF.patch | 30 +++++++++++++++++++ > > 1 file changed, 30 insertions(+) > > create mode 100644 package/wpa_supplicant/0001-mesh-enable-HMAC_SHA384_KDF.patch > > > > diff --git a/package/wpa_supplicant/0001-mesh-enable-HMAC_SHA384_KDF.patch b/package/wpa_supplicant/0001-mesh-enable-HMAC_SHA384_KDF.patch > > new file mode 100644 > > index 0000000000..d765c1dbbc > > --- /dev/null > > +++ b/package/wpa_supplicant/0001-mesh-enable-HMAC_SHA384_KDF.patch > > @@ -0,0 +1,30 @@ > > +From 08986b7da7e580f5deb570aaa654df38fb23397a Mon Sep 17 00:00:00 2001 > > +From: Sergey Matyukevich > > +Date: Sun, 13 Feb 2022 18:26:23 +0300 > > +Subject: [PATCH] mesh: enable HMAC_SHA384_KDF > > + > > +Mesh support CONFIG_MESH needs SAE, so it enables CONFIG_SAE. > > +In its turn, CONFIG_SAE enables only HMAC_SHA256_KDF option. > > +This is apparently not enough for successful build. At least > > +HMAC_SHA384_KDF is required for successful build. > > + > > You said that this patch was sent to hostapd. If that is true, please add a > patchwork link for it, like: > > Upstream: https://patchwork.ozlabs.org/project/hostap/patch/20220130074139.2972-1-yegorslists at googlemail.com/ > > > However, that patch looks a bit different, so you'll need to explain why. Suggested solution seems the be slightly simpler. > Also, you dropped Yegor as an author, that's not very nice... I didn't. I sent my version of the fix. Communication on hostapd mailing list usually takes a while. As soon as upstream patch is accepted, we will replace this one with the upstream one keeping appropriate authorship. If you still have some concerns, feel free to drop my second patch. We will ask Yegor to send his version. Original discussion: https://patchwork.ozlabs.org/project/buildroot/patch/20220131194818.2084092-1-geomatsi at gmail.com/ Regards, Sergey From peter at korsgaard.com Sun Feb 13 16:59:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Feb 2022 17:59:09 +0100 Subject: [Buildroot] [PATCH v6 3/8] package/icu: don't disable renaming for host build In-Reply-To: <20220213150051.GB4462@scaer> (Yann E. MORIN's message of "Sun, 13 Feb 2022 16:00:51 +0100") References: <20220205201837.3324085-1-james.hilliard1@gmail.com> <20220205201837.3324085-3-james.hilliard1@gmail.com> <20220213150051.GB4462@scaer> Message-ID: <87iltiln36.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > James, All, > On 2022-02-05 13:18 -0700, James Hilliard spake thusly: >> Using a different renaming option for the icu host build can cause >> issues for packages such as qt5webengine which expect target and >> host packages to be built with the same options. > This little hand-waving is not explaning the actual error that those > packages encounter, nor the root cause for that error. > A package that needs both host and target to have the same options is > most probably doing somethig wrong, like linking a host program and > taking the result as valid for the target... > However, our adding the --disable-renaming in the first place in > 3911e67151b (icu: security bump to version 51.2) did not provide any > explanations why it was needed to begin with. > So it is not much uglier to remove it without further explanations > either. > Yet, a reference to the original commit would be nice, like the little > blurb I wrote above maybe... Committed with the commit message extended, thanks. -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Sun Feb 13 16:59:39 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 13 Feb 2022 17:59:39 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/rygel: gobject-introspection is mandatory In-Reply-To: <9e24e8c1-2b12-59c1-82a9-6ef49557132f@mind.be> References: <20220206095359.854435-1-fontaine.fabrice@gmail.com> <9e24e8c1-2b12-59c1-82a9-6ef49557132f@mind.be> Message-ID: Dear Arnout, Le dim. 13 f?vr. 2022 ? 16:18, Arnout Vandecappelle a ?crit : > > > > On 06/02/2022 10:53, Fabrice Fontaine wrote: > > vapi (and gobject-introspection) is mandatory since bump to version > > 0.40.2 in commit 6acdbb81c8d6cdd3ecb476ae24e72fd4547011c3: > > > > valac -C --pkg posix --pkg libxml-2.0 --pkg gmodule-2.0 --pkg gio-2.0 --pkg gssdp-1.2 --pkg gee-0.8 --pkg gupnp-1.2 --target-glib ' 2.56' --pkg glib-2.0 --color=always --directory src/librygel-core/librygel-core-2.6.so.2.0.4.p --basedir ../src/librygel-core --library rygel-core-2.6 --header src/librygel-core/rygel-core.h --vapi ../rygel-core-2.6.vapi --gir ../Rygel-2.6.gir ../src/librygel-core/rygel-build-config.vapi ../src/librygel-core/rygel-connection-manager.vala ../src/librygel-core/rygel-basic-management.vala ../src/librygel-core/rygel-basic-management-test.vala ../src/librygel-core/rygel-basic-management-test-ping.vala ../src/librygel-core/rygel-basic-management-test-nslookup.vala ../src/librygel-core/rygel-basic-management-test-traceroute.vala ../src/librygel-core/rygel-description-file.vala ../src/librygel-core/rygel-dlna-profile.vala ../src/librygel-core/rygel-energy-management.vala ../src/librygel-core/rygel-root-device.vala ../src/librygel-core/rygel-root-device-factory.v > > ala ../src/librygel-core/rygel-dbus-interface.vala ../src/librygel-core/rygel-log-handler.vala ../src/librygel-core/rygel-meta-config.vala ../src/librygel-core/rygel-plugin-loader.vala ../src/librygel-core/rygel-recursive-module-loader.vala ../src/librygel-core/rygel-plugin.vala ../src/librygel-core/rygel-resource-info.vala ../src/librygel-core/rygel-media-device.vala ../src/librygel-core/rygel-configuration.vala ../src/librygel-core/rygel-base-configuration.vala ../src/librygel-core/rygel-cmdline-config.vala ../src/librygel-core/rygel-environment-config.vala ../src/librygel-core/rygel-user-config.vala ../src/librygel-core/rygel-state-machine.vala ../src/librygel-core/rygel-v1-hacks.vala ../src/librygel-core/rygel-icon-info.vala ../src/librygel-core/rygel-xml-utils.vala ../src/librygel-core/rygel-plugin-information.vala > > error: Package `gssdp-1.2' not found in specified Vala API directories or GObject-Introspection GIR directories > > error: Package `gupnp-1.2' not found in specified Vala API directories or GObject-Introspection GIR directories > > > > Depends on BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES instead of selecting > > it to avoid the following recursive dependency: > > > > package/gstreamer1/gstreamer1/Config.in:5:error: recursive dependency detected! > > package/gstreamer1/gstreamer1/Config.in:5: symbol BR2_PACKAGE_GSTREAMER1 is selected by BR2_PACKAGE_RYGEL_MEDIA_ENGINE_GSTREAMER1 > > package/rygel/Config.in:46: symbol BR2_PACKAGE_RYGEL_MEDIA_ENGINE_GSTREAMER1 is part of choice > > package/rygel/Config.in:39: choice contains symbol > > package/rygel/Config.in:39: choice contains symbol BR2_PACKAGE_RYGEL > > package/rygel/Config.in:1: symbol BR2_PACKAGE_RYGEL depends on BR2_PACKAGE_PYTHON3 > > package/python3/Config.in:5: symbol BR2_PACKAGE_PYTHON3 is selected by BR2_PACKAGE_JACK2_DBUS > > package/jack2/Config.in:35: symbol BR2_PACKAGE_JACK2_DBUS depends on BR2_PACKAGE_JACK2 > > package/jack2/Config.in:1: symbol BR2_PACKAGE_JACK2 is selected by BR2_PACKAGE_FLUIDSYNTH_JACK2 > > package/fluidsynth/Config.in:37: symbol BR2_PACKAGE_FLUIDSYNTH_JACK2 depends on BR2_PACKAGE_FLUIDSYNTH > > package/fluidsynth/Config.in:1: symbol BR2_PACKAGE_FLUIDSYNTH is selected by BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FLUIDSYNTH > > package/gstreamer1/gst1-plugins-bad/Config.in:425: symbol BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FLUIDSYNTH depends on BR2_PACKAGE_GSTREAMER1 > > I think that now python2 has been removed, we can select python3 for > gobject-introspection instead of depending on it, and that that would break this > circular dependency. I tried to work around your suggestion but it seems this adds another circular dependency :-( package/python3/Config.in:5:error: recursive dependency detected! package/python3/Config.in:5: symbol BR2_PACKAGE_PYTHON3 is selected by BR2_PACKAGE_GOBJECT_INTROSPECTION package/gobject-introspection/Config.in:6: symbol BR2_PACKAGE_GOBJECT_INTROSPECTION is selected by BR2_PACKAGE_PYTHON_GOBJECT package/python-gobject/Config.in:1: symbol BR2_PACKAGE_PYTHON_GOBJECT is selected by BR2_PACKAGE_PYTHON_BLUEZERO package/python-bluezero/Config.in:1: symbol BR2_PACKAGE_PYTHON_BLUEZERO depends on BR2_PACKAGE_PYTHON3 > > select python3 would also allow us to remove the python3 dependency from all > transitive dependencies of gobject-introspection. > > Regards, > Arnout > > > > > Fixes: > > - http://autobuild.buildroot.org/results/027ce84895fab6fb251dd37cd5cfb7169287a2de > > > > Signed-off-by: Fabrice Fontaine > > --- > > Changes v1 -> v2: > > - Depends on BR2_PACKAGE_{PYTHON3,GSTREAMER1_EDITING_SERVICES} > > > > package/rygel/Config.in | 23 +++++++++++++++++------ > > package/rygel/rygel.mk | 9 ++------- > > 2 files changed, 19 insertions(+), 13 deletions(-) > > > > diff --git a/package/rygel/Config.in b/package/rygel/Config.in > > index df48918833..30e8430537 100644 > > --- a/package/rygel/Config.in > > +++ b/package/rygel/Config.in > > @@ -2,8 +2,14 @@ config BR2_PACKAGE_RYGEL > > bool "rygel" > > depends on BR2_USE_WCHAR # gupnp-av > > depends on BR2_TOOLCHAIN_HAS_THREADS # gupnp-av > > - depends on BR2_USE_MMU # gupnp-av > > + depends on BR2_USE_MMU # gupnp-av, gobject-introspection > > + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS # gobject-introspection > > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # gobject-introspection > > + depends on BR2_HOST_GCC_AT_LEAST_8 # gobject-introspection -> host-qemu > > + depends on BR2_TOOLCHAIN_USES_GLIBC # gobject-introspection > > + depends on BR2_PACKAGE_PYTHON3 # gobject-introspection > > select BR2_PACKAGE_GDK_PIXBUF > > + select BR2_PACKAGE_GOBJECT_INTROSPECTION > > select BR2_PACKAGE_GUPNP_AV > > select BR2_PACKAGE_GUPNP_DLNA > > select BR2_PACKAGE_LIBGEE > > @@ -39,14 +45,19 @@ config BR2_PACKAGE_RYGEL_MEDIA_ENGINE_SIMPLE > > > > config BR2_PACKAGE_RYGEL_MEDIA_ENGINE_GSTREAMER1 > > bool "gstreamer1" > > - select BR2_PACKAGE_GSTREAMER1 > > - select BR2_PACKAGE_GST1_PLUGINS_BASE > > - select BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES > > + depends on BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES > > + > > +comment "gstreamer1 needs gst1-editing-services" > > + depends on !BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES > > > > endchoice > > > > -comment "rygel needs a toolchain w/ wchar, threads" > > +comment "rygel needs a glibc toolchain w/ wchar, threads, gcc >= 4.9, host gcc >= 8" > > depends on BR2_USE_MMU > > - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS > > + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS > > + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ > > + !BR2_TOOLCHAIN_USES_GLIBC || \ > > + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ > > + !BR2_HOST_GCC_AT_LEAST_8 > > > > endif # BR2_PACKAGE_RYGEL > > diff --git a/package/rygel/rygel.mk b/package/rygel/rygel.mk > > index c541cdc0ed..bfcd5df3c6 100644 > > --- a/package/rygel/rygel.mk > > +++ b/package/rygel/rygel.mk > > @@ -12,6 +12,7 @@ RYGEL_LICENSE = LGPL-2.1+, CC-BY-SA-3.0 (logo) > > RYGEL_LICENSE_FILES = COPYING COPYING.logo > > RYGEL_DEPENDENCIES = \ > > gdk-pixbuf \ > > + gobject-introspection \ > > gupnp-av \ > > gupnp-dlna \ > > libgee \ > > @@ -24,16 +25,10 @@ RYGEL_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) > > RYGEL_CONF_OPTS += \ > > -Dapi-docs=false \ > > -Dexamples=false \ > > + -Dintrospection=enabled \ > > -Dtests=false > > RYGEL_PLUGINS = external,lms,mpris,ruih > > > > -ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) > > -RYGEL_CONF_OPTS += -Dintrospection=enabled > > -RYGEL_DEPENDENCIES += gobject-introspection > > -else > > -RYGEL_CONF_OPTS += -Dintrospection=disabled > > -endif > > - > > ifeq ($(BR2_PACKAGE_RYGEL_MEDIA_ENGINE_GSTREAMER1),y) > > RYGEL_CONF_OPTS += \ > > -Dengines=gstreamer \ Best Regards, Fabrice From peter at korsgaard.com Sun Feb 13 16:57:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Feb 2022 17:57:44 +0100 Subject: [Buildroot] [git commit] package/icu: don't disable renaming for host build Message-ID: <20220213165213.6902282297@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f93039e3a6f0177675a4f775d762d665204714c9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Using a different renaming option for the icu host build can cause issues for packages such as qt5webengine which expect target and host packages to be built with the same options. A package that needs both host and target to have the same options is most probably doing somethig wrong, like linking a host program and taking the result as valid for the target. However, our adding the --disable-renaming in the first place in 3911e67151b (icu: security bump to version 51.2) did not provide any explanations why it was needed to begin with, so drop it. Signed-off-by: James Hilliard Reviewed-by: Yann E. MORIN [Peter: extend commit message as suggested by Yann] Signed-off-by: Peter Korsgaard --- package/icu/icu.mk | 3 +-- package/nodejs/nodejs.mk | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/icu/icu.mk b/package/icu/icu.mk index 7e0c96e43a..ebbb1968fc 100644 --- a/package/icu/icu.mk +++ b/package/icu/icu.mk @@ -45,8 +45,7 @@ HOST_ICU_CONF_OPTS = \ --disable-tests \ --disable-extras \ --disable-icuio \ - --disable-layout \ - --disable-renaming + --disable-layout ICU_SUBDIR = source HOST_ICU_SUBDIR = source diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 727af6dc50..2e41c11dbd 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -94,7 +94,7 @@ NODEJS_HOST_TOOLS_V8 = \ NODEJS_HOST_TOOLS_NODE = mkcodecache NODEJS_HOST_TOOLS = $(NODEJS_HOST_TOOLS_V8) $(NODEJS_HOST_TOOLS_NODE) -HOST_NODEJS_CXXFLAGS = $(HOST_CXXFLAGS) -DU_DISABLE_RENAMING=1 +HOST_NODEJS_CXXFLAGS = $(HOST_CXXFLAGS) define HOST_NODEJS_BUILD_CMDS $(HOST_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python3 \ From fontaine.fabrice at gmail.com Sun Feb 13 19:33:36 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 13 Feb 2022 20:33:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/bpftool: needs headers >= 4.12 Message-ID: <20220213193336.1102940-1-fontaine.fabrice@gmail.com> NETLINK_EXT_ACK is only available since kernel 4.12 and https://github.com/torvalds/linux/commit/2d4bc93368f5a0ddb57c8c885cdad9c9b7a10ed5 resulting in the following build failure since addition of the package in commit 3675131e6c654d7536a184db0184fde7a97040e0: net.c: In function 'netlink_open': net.c:110:36: error: 'NETLINK_EXT_ACK' undeclared (first use in this function); did you mean 'NETLINK_CAP_ACK'? 110 | if (setsockopt(sock, SOL_NETLINK, NETLINK_EXT_ACK, | ^~~~~~~~~~~~~~~ | NETLINK_CAP_ACK Fixes: - http://autobuild.buildroot.org/results/c61678e56bd73609838747048f27068818c21150 Signed-off-by: Fabrice Fontaine --- package/bpftool/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/bpftool/Config.in b/package/bpftool/Config.in index 39475aa962..e81d874343 100644 --- a/package/bpftool/Config.in +++ b/package/bpftool/Config.in @@ -5,14 +5,16 @@ config BR2_PACKAGE_BPFTOOL depends on !BR2_STATIC_LIBS # elfutils depends on BR2_TOOLCHAIN_HAS_THREADS # elfutils depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 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" +comment "bpftool needs a uClibc or glibc toolchain w/ wchar, dynamic library, threads, headers >= 4.12" depends on !BR2_nios2 depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \ || !BR2_TOOLCHAIN_HAS_THREADS \ - || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) + || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) \ + || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 -- 2.34.1 From fontaine.fabrice at gmail.com Sun Feb 13 19:41:31 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 13 Feb 2022 20:41:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-psutil: add host variant Message-ID: <20220213194131.1103482-1-fontaine.fabrice@gmail.com> Add host variant to avoid the following build failure with mongodb since drop of python3-psutil in commit aab7bc4a1d499b3f926464290eee3d6459d0e816: make: *** No rule to make target 'host-python-psutil', needed by '/home/buildroot/autobuild/instance-3/output-1/build/mongodb-4.2.18/.stamp_configured'. Stop. Fixes: - http://autobuild.buildroot.org/results/3bce147b6b34d8854e54fc1102a047fcb2c19d01 Signed-off-by: Fabrice Fontaine --- package/python-psutil/python-psutil.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-psutil/python-psutil.mk b/package/python-psutil/python-psutil.mk index 413fc8a391..3a2781c284 100644 --- a/package/python-psutil/python-psutil.mk +++ b/package/python-psutil/python-psutil.mk @@ -14,3 +14,4 @@ PYTHON_PSUTIL_CPE_ID_VENDOR = psutil_project PYTHON_PSUTIL_CPE_ID_PRODUCT = psutil $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.34.1 From peter at korsgaard.com Sun Feb 13 19:51:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Feb 2022 20:51:19 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-psutil: add host variant In-Reply-To: <20220213194131.1103482-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 13 Feb 2022 20:41:31 +0100") References: <20220213194131.1103482-1-fontaine.fabrice@gmail.com> Message-ID: <87ee46lf48.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Add host variant to avoid the following build failure with mongodb since > drop of python3-psutil in commit > aab7bc4a1d499b3f926464290eee3d6459d0e816: > make: *** No rule to make target 'host-python-psutil', needed by > '/home/buildroot/autobuild/instance-3/output-1/build/mongodb-4.2.18/.stamp_configured'. > Stop. > Fixes: > - http://autobuild.buildroot.org/results/3bce147b6b34d8854e54fc1102a047fcb2c19d01 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 13 19:50:48 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Feb 2022 20:50:48 +0100 Subject: [Buildroot] [git commit] package/python-psutil: add host variant Message-ID: <20220213194421.7F3C082582@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=35e2f68c30515598014a9ef4daf7c8f6134aeb74 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add host variant to avoid the following build failure with mongodb since drop of python3-psutil in commit aab7bc4a1d499b3f926464290eee3d6459d0e816: make: *** No rule to make target 'host-python-psutil', needed by '/home/buildroot/autobuild/instance-3/output-1/build/mongodb-4.2.18/.stamp_configured'. Stop. Fixes: - http://autobuild.buildroot.org/results/3bce147b6b34d8854e54fc1102a047fcb2c19d01 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/python-psutil/python-psutil.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-psutil/python-psutil.mk b/package/python-psutil/python-psutil.mk index 413fc8a391..3a2781c284 100644 --- a/package/python-psutil/python-psutil.mk +++ b/package/python-psutil/python-psutil.mk @@ -14,3 +14,4 @@ PYTHON_PSUTIL_CPE_ID_VENDOR = psutil_project PYTHON_PSUTIL_CPE_ID_PRODUCT = psutil $(eval $(python-package)) +$(eval $(host-python-package)) From peter at korsgaard.com Sun Feb 13 19:50:48 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Feb 2022 20:50:48 +0100 Subject: [Buildroot] [git commit] Update for 2022.02-rc1 Message-ID: <20220213194421.91A7C82A50@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5ee6be2bdc8882eb04b5480b61d3c369c06972b8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard --- CHANGES | 68 ++++++++++++++++++++++++++++++++++++++++++++++ Makefile | 4 +-- docs/website/download.html | 22 +++++++-------- docs/website/news.html | 21 ++++++++++++++ 4 files changed, 102 insertions(+), 13 deletions(-) diff --git a/CHANGES b/CHANGES index 4fa4e12b9f..4cc574d928 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,71 @@ +2022.02-rc1, released February 13th, 2022 + + Numerous package updates and many (80) new packages. + + Toolchain: + - glibc: Optional support for compatibility shims for running + on older kernels than what glibc has been built against + - uClibc: Use uClibc-ng 1.0.40 + - External toolchains: Update Bootlin toolchains to 2021.11-1 + version + + Python 2.7 and python 2.x specific packages removed as python + 2.x is EOL since April 2020. Likewise a number of python3 + specific host packages has been renamed (host-python-foo + instead of host-python3-foo) now host-python is always python + 3.x. + + Cargo (Rust) package infrastructure added. Vendoring support + added to golang package infrastructure. + + New defconfigs: FriendlyARM NanoPi R2S, Kontron BL i.MX8M + Mini, Microchip Sama7g7ek, Olimex STMP157 OlinuXino LIME2, + QEMU PPC Bamboo, PPC64 PowerNV, Raspberry Pi Zero 2W, Spike + Riscv64, Xilinx zcu102 + + Removed defconfigs: Synopsys arch38 VDK, aarch64 VDK + + New packages: ace, alchemy, alfred, bat, bento4, bmx7, + bpftool, brcmfmac_sdio-firmware-rpi, cfm, cups-pk-helper, + davinci-bootcount, dbus-cxx, embiggen-disk, freeipmi, + gocryptfs, kodi-pvr-plutotv, kodi-pvr-waipu, ksmbd-tools, + libcamera-apps, libest, libexecinfo, libfutils, libglvnd, + libks, libmd, libopenaptx, libpeas, libshdata, liburing, lilv, + lua-argon2, lua-cffi, lua-inotify, lv2, mali-driver, + moby-buildkit, modsecurity2, networkd-dispatcher, pahole, + php-apcu, php-lua, php-pam, python-argon2-cffi-bindings, + python-cssselect2, python-distro, python-fonttools, + python-gnupg, python-installer, python-memory-profiler, + python-mpd2, python-pep517, python-pydyf, python-pypa-build, + python-pyphen, python-tinycss2, python-tomli, + python-weasyprint, python-zopfli, qoriq-cadence-dp-firmware, + riscv-isa-sim, rockchip-mali, rpi-rgb-led-matrix, sdbus-cpp, + sentry-cli, serd, simple-mail, sord, sratom, + sunxi-mali-utgard, sunxi-mali-utgard-driver, tinifier, ulog, + vulkan-headers, xlib_libxcvt, zabbix, zchunk, zynaddsubfx + + Removed packages: gstreamer1-mm, python, python-backports-abc, + python-backports-functools-lru-cache, + python-backports-shutil-get-terminal-size, + python-backports-ssl-match-hostname, python-configobj, + python-dialog, python-enum, python-enum34, python-functools32, + python-futures, python-id3, python-ipaddr, python-ipaddress, + python-mad, python-nfc, python-pam, python-pathlib2, + python-pycap, python-pyro, python-singledispatch, + python-subprocess32, python-typing, python-yieldfrom, + qt5webkit-examples, rpi-bt-firmware, rpi-wifi-firmware, + sunxi-mali-mainline, sunxi-mali-mainline-driver, zynq-boot-bin + + Issues resolved (http://bugs.uclibc.org): + + #12271: python-iptables runtime dependencies + #13436: PPP 2.4.9 is out + #14351: needs to mount sysfs before mount -a + #14451: nodejs won't build on Fedora 35 + #14471: alsa_utils wrong deployment + #14501: lttng-modules v2.11 package fails to build + #14531: Package EFL - build error + 2021.11.1, released January 29th, 2022 Important / security related fixes. diff --git a/Makefile b/Makefile index 8a4ec4ef85..a4b7db69a7 100644 --- a/Makefile +++ b/Makefile @@ -92,9 +92,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2022.02-git +export BR2_VERSION := 2022.02-rc1 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1638734000 +BR2_VERSION_EPOCH = 1644782000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/docs/website/download.html b/docs/website/download.html index 2d082062a2..3d98fe48ee 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -75,41 +75,41 @@

          PGP signature

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

        News

          +
        • +
          +
          +
          +

          2022.02-rc1 released

          +

          13 February 2022

          +
          +
          +

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

          + +

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

          +
          +
          +
        • +
        • From arnout at mind.be Sun Feb 13 19:59:12 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 13 Feb 2022 20:59:12 +0100 Subject: [Buildroot] [git commit] package/rygel: gobject-introspection is mandatory Message-ID: <20220213195207.CFFDE82297@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=115ad9c54874dd14fd53ece9ae4ce6858ad743ad branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master vapi (and gobject-introspection) is mandatory since bump to version 0.40.2 in commit 6acdbb81c8d6cdd3ecb476ae24e72fd4547011c3: valac -C --pkg posix --pkg libxml-2.0 --pkg gmodule-2.0 --pkg gio-2.0 --pkg gssdp-1.2 --pkg gee-0.8 --pkg gupnp-1.2 --target-glib ' 2.56' --pkg glib-2.0 --color=always --directory src/librygel-core/librygel-core-2.6.so.2.0.4.p --basedir ../src/librygel-core --library rygel-core-2.6 --header src/librygel-core/rygel-core.h --vapi ../rygel-core-2.6.vapi --gir ../Rygel-2.6.gir ../src/librygel-core/rygel-build-config.vapi ../src/librygel-core/rygel-connection-manager.vala ../src/librygel-core/rygel-basic-management.vala ../src/librygel-core/rygel-basic-management-test.vala ../src/librygel-core/rygel-basic-management-test-ping.vala ../src/librygel-core/rygel-basic-management-test-nslookup.vala ../src/librygel-core/rygel-basic-management-test-traceroute.vala ../src/librygel-core/rygel-description-file.vala ../src/librygel-core/rygel-dlna-profile.vala ../src/librygel-core/rygel-energy-management.vala ../src/librygel-core/rygel-root-device.vala ../src/librygel-core/rygel-root-device-factory.v ala ../src/librygel-core/rygel-dbus-interface.vala ../src/librygel-core/rygel-log-handler.vala ../src/librygel-core/rygel-meta-config.vala ../src/librygel-core/rygel-plugin-loader.vala ../src/librygel-core/rygel-recursive-module-loader.vala ../src/librygel-core/rygel-plugin.vala ../src/librygel-core/rygel-resource-info.vala ../src/librygel-core/rygel-media-device.vala ../src/librygel-core/rygel-configuration.vala ../src/librygel-core/rygel-base-configuration.vala ../src/librygel-core/rygel-cmdline-config.vala ../src/librygel-core/rygel-environment-config.vala ../src/librygel-core/rygel-user-config.vala ../src/librygel-core/rygel-state-machine.vala ../src/librygel-core/rygel-v1-hacks.vala ../src/librygel-core/rygel-icon-info.vala ../src/librygel-core/rygel-xml-utils.vala ../src/librygel-core/rygel-plugin-information.vala error: Package `gssdp-1.2' not found in specified Vala API directories or GObject-Introspection GIR directories error: Package `gupnp-1.2' not found in specified Vala API directories or GObject-Introspection GIR directories Depends on BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES instead of selecting it to avoid the following recursive dependency: package/gstreamer1/gstreamer1/Config.in:5:error: recursive dependency detected! package/gstreamer1/gstreamer1/Config.in:5: symbol BR2_PACKAGE_GSTREAMER1 is selected by BR2_PACKAGE_RYGEL_MEDIA_ENGINE_GSTREAMER1 package/rygel/Config.in:46: symbol BR2_PACKAGE_RYGEL_MEDIA_ENGINE_GSTREAMER1 is part of choice package/rygel/Config.in:39: choice contains symbol package/rygel/Config.in:39: choice contains symbol BR2_PACKAGE_RYGEL package/rygel/Config.in:1: symbol BR2_PACKAGE_RYGEL depends on BR2_PACKAGE_PYTHON3 package/python3/Config.in:5: symbol BR2_PACKAGE_PYTHON3 is selected by BR2_PACKAGE_JACK2_DBUS package/jack2/Config.in:35: symbol BR2_PACKAGE_JACK2_DBUS depends on BR2_PACKAGE_JACK2 package/jack2/Config.in:1: symbol BR2_PACKAGE_JACK2 is selected by BR2_PACKAGE_FLUIDSYNTH_JACK2 package/fluidsynth/Config.in:37: symbol BR2_PACKAGE_FLUIDSYNTH_JACK2 depends on BR2_PACKAGE_FLUIDSYNTH package/fluidsynth/Config.in:1: symbol BR2_PACKAGE_FLUIDSYNTH is selected by BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FLUIDSYNTH package/gstreamer1/gst1-plugins-bad/Config.in:425: symbol BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FLUIDSYNTH depends on BR2_PACKAGE_GSTREAMER1 Fixes: - http://autobuild.buildroot.org/results/027ce84895fab6fb251dd37cd5cfb7169287a2de Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/rygel/Config.in | 23 +++++++++++++++++------ package/rygel/rygel.mk | 9 ++------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/package/rygel/Config.in b/package/rygel/Config.in index df48918833..30e8430537 100644 --- a/package/rygel/Config.in +++ b/package/rygel/Config.in @@ -2,8 +2,14 @@ config BR2_PACKAGE_RYGEL bool "rygel" depends on BR2_USE_WCHAR # gupnp-av depends on BR2_TOOLCHAIN_HAS_THREADS # gupnp-av - depends on BR2_USE_MMU # gupnp-av + depends on BR2_USE_MMU # gupnp-av, gobject-introspection + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS # gobject-introspection + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # gobject-introspection + depends on BR2_HOST_GCC_AT_LEAST_8 # gobject-introspection -> host-qemu + depends on BR2_TOOLCHAIN_USES_GLIBC # gobject-introspection + depends on BR2_PACKAGE_PYTHON3 # gobject-introspection select BR2_PACKAGE_GDK_PIXBUF + select BR2_PACKAGE_GOBJECT_INTROSPECTION select BR2_PACKAGE_GUPNP_AV select BR2_PACKAGE_GUPNP_DLNA select BR2_PACKAGE_LIBGEE @@ -39,14 +45,19 @@ config BR2_PACKAGE_RYGEL_MEDIA_ENGINE_SIMPLE config BR2_PACKAGE_RYGEL_MEDIA_ENGINE_GSTREAMER1 bool "gstreamer1" - select BR2_PACKAGE_GSTREAMER1 - select BR2_PACKAGE_GST1_PLUGINS_BASE - select BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES + depends on BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES + +comment "gstreamer1 needs gst1-editing-services" + depends on !BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES endchoice -comment "rygel needs a toolchain w/ wchar, threads" +comment "rygel needs a glibc toolchain w/ wchar, threads, gcc >= 4.9, host gcc >= 8" depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_USES_GLIBC || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_HOST_GCC_AT_LEAST_8 endif # BR2_PACKAGE_RYGEL diff --git a/package/rygel/rygel.mk b/package/rygel/rygel.mk index c541cdc0ed..bfcd5df3c6 100644 --- a/package/rygel/rygel.mk +++ b/package/rygel/rygel.mk @@ -12,6 +12,7 @@ RYGEL_LICENSE = LGPL-2.1+, CC-BY-SA-3.0 (logo) RYGEL_LICENSE_FILES = COPYING COPYING.logo RYGEL_DEPENDENCIES = \ gdk-pixbuf \ + gobject-introspection \ gupnp-av \ gupnp-dlna \ libgee \ @@ -24,16 +25,10 @@ RYGEL_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) RYGEL_CONF_OPTS += \ -Dapi-docs=false \ -Dexamples=false \ + -Dintrospection=enabled \ -Dtests=false RYGEL_PLUGINS = external,lms,mpris,ruih -ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) -RYGEL_CONF_OPTS += -Dintrospection=enabled -RYGEL_DEPENDENCIES += gobject-introspection -else -RYGEL_CONF_OPTS += -Dintrospection=disabled -endif - ifeq ($(BR2_PACKAGE_RYGEL_MEDIA_ENGINE_GSTREAMER1),y) RYGEL_CONF_OPTS += \ -Dengines=gstreamer \ From arnout at mind.be Sun Feb 13 19:59:47 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 13 Feb 2022 20:59:47 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/rygel: gobject-introspection is mandatory In-Reply-To: References: <20220206095359.854435-1-fontaine.fabrice@gmail.com> <9e24e8c1-2b12-59c1-82a9-6ef49557132f@mind.be> Message-ID: On 13/02/2022 17:59, Fabrice Fontaine wrote: > Dear Arnout, > > Le dim. 13 f?vr. 2022 ? 16:18, Arnout Vandecappelle a ?crit : >> >> >> >> On 06/02/2022 10:53, Fabrice Fontaine wrote: >>> vapi (and gobject-introspection) is mandatory since bump to version >>> 0.40.2 in commit 6acdbb81c8d6cdd3ecb476ae24e72fd4547011c3: >>> >>> valac -C --pkg posix --pkg libxml-2.0 --pkg gmodule-2.0 --pkg gio-2.0 --pkg gssdp-1.2 --pkg gee-0.8 --pkg gupnp-1.2 --target-glib ' 2.56' --pkg glib-2.0 --color=always --directory src/librygel-core/librygel-core-2.6.so.2.0.4.p --basedir ../src/librygel-core --library rygel-core-2.6 --header src/librygel-core/rygel-core.h --vapi ../rygel-core-2.6.vapi --gir ../Rygel-2.6.gir ../src/librygel-core/rygel-build-config.vapi ../src/librygel-core/rygel-connection-manager.vala ../src/librygel-core/rygel-basic-management.vala ../src/librygel-core/rygel-basic-management-test.vala ../src/librygel-core/rygel-basic-management-test-ping.vala ../src/librygel-core/rygel-basic-management-test-nslookup.vala ../src/librygel-core/rygel-basic-management-test-traceroute.vala ../src/librygel-core/rygel-description-file.vala ../src/librygel-core/rygel-dlna-profile.vala ../src/librygel-core/rygel-energy-management.vala ../src/librygel-core/rygel-root-device.vala ../src/librygel-core/rygel-root-device-factory.v >>> ala ../src/librygel-core/rygel-dbus-interface.vala ../src/librygel-core/rygel-log-handler.vala ../src/librygel-core/rygel-meta-config.vala ../src/librygel-core/rygel-plugin-loader.vala ../src/librygel-core/rygel-recursive-module-loader.vala ../src/librygel-core/rygel-plugin.vala ../src/librygel-core/rygel-resource-info.vala ../src/librygel-core/rygel-media-device.vala ../src/librygel-core/rygel-configuration.vala ../src/librygel-core/rygel-base-configuration.vala ../src/librygel-core/rygel-cmdline-config.vala ../src/librygel-core/rygel-environment-config.vala ../src/librygel-core/rygel-user-config.vala ../src/librygel-core/rygel-state-machine.vala ../src/librygel-core/rygel-v1-hacks.vala ../src/librygel-core/rygel-icon-info.vala ../src/librygel-core/rygel-xml-utils.vala ../src/librygel-core/rygel-plugin-information.vala >>> error: Package `gssdp-1.2' not found in specified Vala API directories or GObject-Introspection GIR directories >>> error: Package `gupnp-1.2' not found in specified Vala API directories or GObject-Introspection GIR directories >>> >>> Depends on BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES instead of selecting >>> it to avoid the following recursive dependency: >>> >>> package/gstreamer1/gstreamer1/Config.in:5:error: recursive dependency detected! >>> package/gstreamer1/gstreamer1/Config.in:5: symbol BR2_PACKAGE_GSTREAMER1 is selected by BR2_PACKAGE_RYGEL_MEDIA_ENGINE_GSTREAMER1 >>> package/rygel/Config.in:46: symbol BR2_PACKAGE_RYGEL_MEDIA_ENGINE_GSTREAMER1 is part of choice >>> package/rygel/Config.in:39: choice contains symbol >>> package/rygel/Config.in:39: choice contains symbol BR2_PACKAGE_RYGEL >>> package/rygel/Config.in:1: symbol BR2_PACKAGE_RYGEL depends on BR2_PACKAGE_PYTHON3 >>> package/python3/Config.in:5: symbol BR2_PACKAGE_PYTHON3 is selected by BR2_PACKAGE_JACK2_DBUS >>> package/jack2/Config.in:35: symbol BR2_PACKAGE_JACK2_DBUS depends on BR2_PACKAGE_JACK2 >>> package/jack2/Config.in:1: symbol BR2_PACKAGE_JACK2 is selected by BR2_PACKAGE_FLUIDSYNTH_JACK2 >>> package/fluidsynth/Config.in:37: symbol BR2_PACKAGE_FLUIDSYNTH_JACK2 depends on BR2_PACKAGE_FLUIDSYNTH >>> package/fluidsynth/Config.in:1: symbol BR2_PACKAGE_FLUIDSYNTH is selected by BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FLUIDSYNTH >>> package/gstreamer1/gst1-plugins-bad/Config.in:425: symbol BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FLUIDSYNTH depends on BR2_PACKAGE_GSTREAMER1 >> >> I think that now python2 has been removed, we can select python3 for >> gobject-introspection instead of depending on it, and that that would break this >> circular dependency. > > I tried to work around your suggestion but it seems this adds another > circular dependency :-( > > package/python3/Config.in:5:error: recursive dependency detected! > package/python3/Config.in:5: symbol BR2_PACKAGE_PYTHON3 is selected > by BR2_PACKAGE_GOBJECT_INTROSPECTION > package/gobject-introspection/Config.in:6: symbol > BR2_PACKAGE_GOBJECT_INTROSPECTION is selected by > BR2_PACKAGE_PYTHON_GOBJECT > package/python-gobject/Config.in:1: symbol > BR2_PACKAGE_PYTHON_GOBJECT is selected by BR2_PACKAGE_PYTHON_BLUEZERO > package/python-bluezero/Config.in:1: symbol > BR2_PACKAGE_PYTHON_BLUEZERO depends on BR2_PACKAGE_PYTHON3 Heh. In that case let's keep it as is. Patch applied to master, thanks. Regards, Arnout > >> >> select python3 would also allow us to remove the python3 dependency from all >> transitive dependencies of gobject-introspection. >> >> Regards, >> Arnout >> >>> >>> Fixes: >>> - http://autobuild.buildroot.org/results/027ce84895fab6fb251dd37cd5cfb7169287a2de >>> >>> Signed-off-by: Fabrice Fontaine >>> --- >>> Changes v1 -> v2: >>> - Depends on BR2_PACKAGE_{PYTHON3,GSTREAMER1_EDITING_SERVICES} >>> >>> package/rygel/Config.in | 23 +++++++++++++++++------ >>> package/rygel/rygel.mk | 9 ++------- >>> 2 files changed, 19 insertions(+), 13 deletions(-) >>> >>> diff --git a/package/rygel/Config.in b/package/rygel/Config.in >>> index df48918833..30e8430537 100644 >>> --- a/package/rygel/Config.in >>> +++ b/package/rygel/Config.in >>> @@ -2,8 +2,14 @@ config BR2_PACKAGE_RYGEL >>> bool "rygel" >>> depends on BR2_USE_WCHAR # gupnp-av >>> depends on BR2_TOOLCHAIN_HAS_THREADS # gupnp-av >>> - depends on BR2_USE_MMU # gupnp-av >>> + depends on BR2_USE_MMU # gupnp-av, gobject-introspection >>> + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS # gobject-introspection >>> + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # gobject-introspection >>> + depends on BR2_HOST_GCC_AT_LEAST_8 # gobject-introspection -> host-qemu >>> + depends on BR2_TOOLCHAIN_USES_GLIBC # gobject-introspection >>> + depends on BR2_PACKAGE_PYTHON3 # gobject-introspection >>> select BR2_PACKAGE_GDK_PIXBUF >>> + select BR2_PACKAGE_GOBJECT_INTROSPECTION >>> select BR2_PACKAGE_GUPNP_AV >>> select BR2_PACKAGE_GUPNP_DLNA >>> select BR2_PACKAGE_LIBGEE >>> @@ -39,14 +45,19 @@ config BR2_PACKAGE_RYGEL_MEDIA_ENGINE_SIMPLE >>> >>> config BR2_PACKAGE_RYGEL_MEDIA_ENGINE_GSTREAMER1 >>> bool "gstreamer1" >>> - select BR2_PACKAGE_GSTREAMER1 >>> - select BR2_PACKAGE_GST1_PLUGINS_BASE >>> - select BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES >>> + depends on BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES >>> + >>> +comment "gstreamer1 needs gst1-editing-services" >>> + depends on !BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES >>> >>> endchoice >>> >>> -comment "rygel needs a toolchain w/ wchar, threads" >>> +comment "rygel needs a glibc toolchain w/ wchar, threads, gcc >= 4.9, host gcc >= 8" >>> depends on BR2_USE_MMU >>> - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS >>> + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS >>> + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ >>> + !BR2_TOOLCHAIN_USES_GLIBC || \ >>> + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ >>> + !BR2_HOST_GCC_AT_LEAST_8 >>> >>> endif # BR2_PACKAGE_RYGEL >>> diff --git a/package/rygel/rygel.mk b/package/rygel/rygel.mk >>> index c541cdc0ed..bfcd5df3c6 100644 >>> --- a/package/rygel/rygel.mk >>> +++ b/package/rygel/rygel.mk >>> @@ -12,6 +12,7 @@ RYGEL_LICENSE = LGPL-2.1+, CC-BY-SA-3.0 (logo) >>> RYGEL_LICENSE_FILES = COPYING COPYING.logo >>> RYGEL_DEPENDENCIES = \ >>> gdk-pixbuf \ >>> + gobject-introspection \ >>> gupnp-av \ >>> gupnp-dlna \ >>> libgee \ >>> @@ -24,16 +25,10 @@ RYGEL_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) >>> RYGEL_CONF_OPTS += \ >>> -Dapi-docs=false \ >>> -Dexamples=false \ >>> + -Dintrospection=enabled \ >>> -Dtests=false >>> RYGEL_PLUGINS = external,lms,mpris,ruih >>> >>> -ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) >>> -RYGEL_CONF_OPTS += -Dintrospection=enabled >>> -RYGEL_DEPENDENCIES += gobject-introspection >>> -else >>> -RYGEL_CONF_OPTS += -Dintrospection=disabled >>> -endif >>> - >>> ifeq ($(BR2_PACKAGE_RYGEL_MEDIA_ENGINE_GSTREAMER1),y) >>> RYGEL_CONF_OPTS += \ >>> -Dengines=gstreamer \ > Best Regards, > > Fabrice From fontaine.fabrice at gmail.com Sun Feb 13 20:24:07 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 13 Feb 2022 21:24:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/mariadb: security bump to version 10.3.34 Message-ID: <20220213202407.1205912-1-fontaine.fabrice@gmail.com> Fix CVE-2021-46665, CVE-2021-46664, CVE-2021-46661, CVE-2021-46668, CVE-2021-46663, CVE-2022-24052, CVE-2022-24051, CVE-2022-24050, CVE-2022-24048, CVE-2021-46659, CVE-2021-35604, CVE-2021-46667, CVE-2021-46662, CVE-2021-2372, CVE-2021-2389 and CVE-2021-46658 Update hash of README.md (changes not related to license: https://github.com/MariaDB/server/commit/773a07b65517327add6348c045cee14bdf489fe0) https://mariadb.com/kb/en/mariadb-10334-release-notes/ https://mariadb.com/kb/en/mariadb-10333-release-notes/ https://mariadb.com/kb/en/mariadb-10332-release-notes/ https://mariadb.com/kb/en/mariadb-10331-release-notes/ Signed-off-by: Fabrice Fontaine --- package/mariadb/mariadb.hash | 7 +++---- package/mariadb/mariadb.mk | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/mariadb/mariadb.hash b/package/mariadb/mariadb.hash index 4025be317f..4da26bdf94 100644 --- a/package/mariadb/mariadb.hash +++ b/package/mariadb/mariadb.hash @@ -1,7 +1,6 @@ -# From https://downloads.mariadb.org/mariadb/10.3.30 -sha256 bd8735c65bdb7ebcd5d779fb9d3de3f2fcd319ad6482278d73dfe7301ad4ae1b mariadb-10.3.30.tar.gz -sha512 742c30b3ebc0b6d36b98d4e7a7fb511098142e72d8f42cbfa73a0bdea2059be17e790fbda4732329bbd99e4b50b13cf18e8122964a473e0b62170ab869eca8fc mariadb-10.3.30.tar.gz +# From https://dlm.mariadb.com/2117287/MariaDB/mariadb-10.3.34/source/sha512sums.txt +sha512 46d4575ec1afb68510652a4bb31ca5ce83a2f5f61048a6e9c1487b0ba58f079465a8b72518d44043cd42c631b19ff50b5498584676ac6473705b138fe3300741 mariadb-10.3.34.tar.gz # Hash for license files -sha256 a4665c1189fe31e0bbc27e9b55439df7dad6e99805407fe58d78da7aabe678f8 README.md +sha256 084aa0007efac6dda6aafffb3f3ef8b66b105862dad7ee23f6a4b52813f84464 README.md sha256 240a15a1d0f34d3abca462cdb7e5fb89470967563f16b0e71169e51c1e74cf2b COPYING diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk index db967ca3ed..4eb9c71827 100644 --- a/package/mariadb/mariadb.mk +++ b/package/mariadb/mariadb.mk @@ -4,8 +4,8 @@ # ################################################################################ -MARIADB_VERSION = 10.3.30 -MARIADB_SITE = https://downloads.mariadb.org/interstitial/mariadb-$(MARIADB_VERSION)/source +MARIADB_VERSION = 10.3.34 +MARIADB_SITE = https://dlm.mariadb.com/2117285/MariaDB/mariadb-$(MARIADB_VERSION)/source MARIADB_LICENSE = GPL-2.0 (server), GPL-2.0 with FLOSS exception (GPL client library), LGPL-2.0 (LGPL client library) # Tarball no longer contains LGPL license text # https://jira.mariadb.org/browse/MDEV-12297 -- 2.34.1 From fontaine.fabrice at gmail.com Sun Feb 13 20:32:19 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 13 Feb 2022 21:32:19 +0100 Subject: [Buildroot] [PATCH 1/1] package/zabbix: add ZABBIX_CPE_ID_VENDOR Message-ID: <20220213203219.1206327-1-fontaine.fabrice@gmail.com> cpe:2.3:a:zabbix:zabbix is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Azabbix%3Azabbix Signed-off-by: Fabrice Fontaine --- package/zabbix/zabbix.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk index e72d831b46..e6564e68fd 100644 --- a/package/zabbix/zabbix.mk +++ b/package/zabbix/zabbix.mk @@ -9,6 +9,7 @@ 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_CPE_ID_VENDOR = zabbix ZABBIX_DEPENDENCIES = pcre ZABBIX_CONF_OPTS = \ -- 2.34.1 From thomas.petazzoni at bootlin.com Sun Feb 13 20:38:09 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 13 Feb 2022 21:38:09 +0100 Subject: [Buildroot] [PATCH 1/2] package/hostapd: update DPP option handling In-Reply-To: <20220213155208.560001-2-geomatsi@gmail.com> References: <20220213155208.560001-1-geomatsi@gmail.com> <20220213155208.560001-2-geomatsi@gmail.com> Message-ID: <20220213213809.361f3ea9@windsurf> On Sun, 13 Feb 2022 18:52:07 +0300 Sergey Matyukevich wrote: > Makefile hostapd.mk defines different macros for different defconfig > options. Options that are not listed in defconfig, can be set using > HOSTAPD_CONFIG_SET. Options that are listed in defconfig, can be > enabled/disabled using HOSTAPD_CONFIG_ENABLE/HOSTAPD_CONFIG_DISABLE. > > Starting from hostapd v2.10, option CONFIG_DPP is explicitly listed > in defconfig. So it is time to switch to enable/disable macros for > this option. This seems fragile. Why don't we have a single way of enabling an option, which doesn't depend on whether the option is listed in the hostapd defconfig or not? Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From fontaine.fabrice at gmail.com Sun Feb 13 20:43:27 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 13 Feb 2022 21:43:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-gnupg: add PYTHON_GNUPG_CPE_ID_VENDOR Message-ID: <20220213204327.1206836-1-fontaine.fabrice@gmail.com> cpe:2.3:a:python:python-gnupg is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Apython%3Apython-gnupg Signed-off-by: Fabrice Fontaine --- package/python-gnupg/python-gnupg.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-gnupg/python-gnupg.mk b/package/python-gnupg/python-gnupg.mk index f16910e517..fda264a0ed 100644 --- a/package/python-gnupg/python-gnupg.mk +++ b/package/python-gnupg/python-gnupg.mk @@ -8,6 +8,7 @@ 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_CPE_ID_VENDOR = python PYTHON_GNUPG_SETUP_TYPE = setuptools $(eval $(python-package)) -- 2.34.1 From thomas.petazzoni at bootlin.com Sun Feb 13 20:43:15 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 13 Feb 2022 21:43:15 +0100 Subject: [Buildroot] [PATCH 2/3] package/binutils: remove 2.35.2 In-Reply-To: References: Message-ID: <20220213214315.015c63b5@windsurf> Hello Waldemar, On Sat, 12 Feb 2022 22:52:57 +0100 Waldemar Brodkorb wrote: > Signed-off-by: Waldemar Brodkorb This patch forgets to remove package/binutils/2.35.2/ Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 13 20:45:01 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 13 Feb 2022 21:45:01 +0100 Subject: [Buildroot] [PATCH 1/2] package/binutils: fixes glibc build compiled with -Os on x86 In-Reply-To: References: Message-ID: <20220213214501.29dbc301@windsurf> On Fri, 11 Feb 2022 19:06:51 +0100 Waldemar Brodkorb wrote: > See here: > https://sourceware.org/bugzilla/show_bug.cgi?id=28870 > > Signed-off-by: Waldemar Brodkorb Is this patch also needed for binutils 2.38 ? Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From peter at korsgaard.com Sun Feb 13 20:51:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Feb 2022 21:51:38 +0100 Subject: [Buildroot] Buildroot 2022.02-rc1 released Message-ID: <87a6eulcbp.fsf@dell.be.48ers.dk> Hi, Buildroot 2022.02-rc1 is released - Go download it at: http://buildroot.net/downloads/buildroot-2022.02-rc1.tar.gz or http://buildroot.net/downloads/buildroot-2022.02-rc1.tar.xz Or get it from Git: git://git.buildroot.net/buildroot Please give it a spin and report any problems to the mailing list or bug tracker. Once more, a busy cycle with close to 1800 changes from 143 unique contributors! Of noteworthy new features/changes we have: - Numerous package updates and many (80) new packages. - Toolchain: - glibc: Optional support for compatibility shims for running on older kernels than what glibc has been built against - uClibc: Use uClibc-ng 1.0.40 - External toolchains: Update Bootlin toolchains to 2021.11-1 version - Python 2.7 and python 2.x specific packages removed as python 2.x is EOL since April 2020. Likewise a number of python3 specific host packages has been renamed (host-python-foo instead of host-python3-foo) now host-python is always python 3.x. - Cargo (Rust) package infrastructure added. Vendoring support added to golang package infrastructure. - New defconfigs: FriendlyARM NanoPi R2S, Kontron BL i.MX8M Mini, Microchip Sama7g7ek, Olimex STMP157 OlinuXino LIME2, QEMU PPC Bamboo, PPC64 PowerNV, Raspberry Pi Zero 2W, Spike Riscv64, Xilinx zcu102 - New packages: ace, alchemy, alfred, bat, bento4, bmx7, bpftool, brcmfmac_sdio-firmware-rpi, cfm, cups-pk-helper, davinci-bootcount, dbus-cxx, embiggen-disk, freeipmi, gocryptfs, kodi-pvr-plutotv, kodi-pvr-waipu, ksmbd-tools, libcamera-apps, libest, libexecinfo, libfutils, libglvnd, libks, libmd, libopenaptx, libpeas, libshdata, liburing, lilv, lua-argon2, lua-cffi, lua-inotify, lv2, mali-driver, moby-buildkit, modsecurity2, networkd-dispatcher, pahole, php-apcu, php-lua, php-pam, python-argon2-cffi-bindings, python-cssselect2, python-distro, python-fonttools, python-gnupg, python-installer, python-memory-profiler, python-mpd2, python-pep517, python-pydyf, python-pypa-build, python-pyphen, python-tinycss2, python-tomli, python-weasyprint, python-zopfli, qoriq-cadence-dp-firmware, riscv-isa-sim, rockchip-mali, rpi-rgb-led-matrix, sdbus-cpp, sentry-cli, serd, simple-mail, sord, sratom, sunxi-mali-utgard, sunxi-mali-utgard-driver, tinifier, ulog, vulkan-headers, xlib_libxcvt, zabbix, zchunk, zynaddsubfx And the usual package version updates and bug fixes. See the CHANGES file for details: http://git.buildroot.net/buildroot/plain/CHANGES?id=2022.02-rc1 Many thanks to the people contributing to this release: git shortlog -s -n 2021.11.. 493 Fabrice Fontaine 178 Peter Korsgaard 177 Bernd Kuhls 127 James Hilliard 102 Peter Seiderer 78 Thomas Petazzoni 65 Giulio Benetti 45 Francois Perrad 32 Romain Naour 28 Arnout Vandecappelle (Essensium/Mind) 27 Yann E. MORIN 23 Norbert Lange 21 Adam Duskett 20 Ricardo Martincoski 18 Fabio Estevam 17 Christian Stewart 15 Joachim Wiberg 12 Julien Olivain 11 Adrian Perez de Castro 11 Dario Binacchi 10 Heiko Thiery 10 Michael Nosthoff 10 Sergey Matyukevich 9 Herve Codina 9 Maxim Kochetkov 8 Angelo Compagnucci 6 C?dric Le Goater 6 Eugen Hristev 6 Thomas Claveirole 6 Thomas De Schampheleire 6 Yegor Yefremov 5 Gilles Talis 5 Gwenhael Goavec-Merou 5 Petr Vorel 4 Alexey Brodkin 4 Andreas Ziegler 4 Baruch Siach 4 Guillaume W. Bres 4 Michael Fischer 4 Sergey Kuzminov 4 Thomas Preston 3 Alexander Egorenkov 3 Jos? Pekkarinen 3 Kory Maincent 3 Lothar Felten 3 Maxime Chevallier 3 Michael Walle 3 Miquel Raynal 3 Patrick Havelange 3 Pedro Aguilar 3 S?bastien Szymanski 3 Thomas Devoogdt 3 Uladzimir Bely 3 Vincent Stehl? 3 Waldemar Brodkorb 3 Yunhao Tian 2 Bartosz Bilas 2 Brandon Maier 2 Cl?ment P?ron 2 Cyril Bur 2 Doug Brown 2 Erik Larsson 2 Francis Laniel 2 Horatiu Vultur 2 Jakub Skrzypnik 2 Jan Kraval 2 Jerry Huang 2 John Keeping 2 Joseph Kogut 2 J?rg Krause 2 Marcus Folkesson 2 Markus Mayer 2 Masahiro Yamada 2 Michael Trimarchi 2 Moritz Bitsch 2 Neal Frager 2 Nuno Gon?alves 2 Pierre-Jean Texier 2 Sergey Bobrenok 2 ???????? ?????? 1 Aleksandr Makarov 1 Alexey Lukyanchuk 1 Andre Renaud 1 Andreas Klinger 1 Andrey Nechypurenko 1 Anssi Hannula 1 Asaf Kahlon 1 Ash Charles 1 Christoph Muellner 1 Clayton Shotwell 1 Colin Foster 1 Dagg Stompler 1 Danilo Bargen 1 David HENG 1 David Pierret 1 Doug Kehn 1 Erwan GAUTRON 1 Esben Haabendal 1 Florent AUMAITRE 1 Florian Fainelli 1 Florian La Roche 1 Florian Larysch 1 Frank Hunleth 1 Frank Vanbever 1 Gleb Mazovetskiy 1 Gregory CLEMENT 1 Grzegorz Blach 1 Howard Mitchell 1 Ignacy Gaw?dzki 1 Ismael Luceno 1 Ivan Maidanski 1 Joe Schultz 1 Joel Stanley 1 Jonathan Borne 1 Juergen Stuber 1 Julien Grossholtz 1 Kamel Bouhara 1 Khoa Hoang 1 Kieran Bingham 1 Kyle Harding 1 Lang Daniel 1 Leonid Yuriev 1 Linus Kaschulla 1 Louis Aussedat 1 Matt Weber 1 Max Filippov 1 Michael Nosthoff 1 Michael Opdenacker 1 Mikael Bourhis-Cloarec 1 Paul Soucy 1 Peter Thompson 1 Pieter De Gendt 1 Quentin Schulz 1 Rainer Jonsson 1 Ramon Fried 1 Robert Hancock 1 Santosh Multhalli 1 TIAN Yuanhao 1 Tilman Keskin?z 1 Vyacheslav Bocharov 1 Xiangyu Chen 1 Zoltan Gyarmati 1 ?????? ????? (Leonid Yuriev) And a special thanks to our patch reviewers: git log 2021.11.. | grep -Ei '(reviewed|acked)-by:' | \ sed 's/.*by: //' | sort | uniq -c | sort -n -r 15 Giulio Benetti 6 Petr Vorel 6 Peter Seiderer 5 Joachim Wiberg 5 Alexey Brodkin 5 Adam Duskett 4 Romain Naour 4 Romain Naour 4 Christophe Priouzeau 3 James Hilliard 3 Adrian Perez de Castro 2 Yegor Yefremov 2 Ricardo Martincoski 2 Paul Cercueil 2 Maxim Kochetkov 2 Luca Ceresoli 2 Heiko Thiery 2 Christian Stewart 2 Alistair Francis 1 Yann E. MORIN 1 Ricardo Martincoski 1 Michael Trimarchi 1 Max Filippov 1 Marcin Niestroj 1 Je?re?my Rosen 1 Dick Olsson 1 Bryce Schober We will now create a next branch and start merging new features for 2022.05 already in parallel with the 2022.02 stabilization. -- Bye, Peter Korsgaard From thomas.petazzoni at bootlin.com Sun Feb 13 21:00:53 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 13 Feb 2022 22:00:53 +0100 Subject: [Buildroot] [PATCH 1/2] package/binutils: fixes glibc build compiled with -Os on x86 In-Reply-To: <20220213214501.29dbc301@windsurf> References: <20220213214501.29dbc301@windsurf> Message-ID: <20220213220053.1a27eaed@windsurf> On Sun, 13 Feb 2022 21:45:01 +0100 Thomas Petazzoni wrote: > On Fri, 11 Feb 2022 19:06:51 +0100 > Waldemar Brodkorb wrote: > > > See here: > > https://sourceware.org/bugzilla/show_bug.cgi?id=28870 > > > > Signed-off-by: Waldemar Brodkorb > > Is this patch also needed for binutils 2.38 ? No it isn't: it's part of binutils 2.38. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From fontaine.fabrice at gmail.com Sun Feb 13 21:05:04 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 13 Feb 2022 22:05:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/cryptsetup: set CRYPTSETUP_AUTORECONF Message-ID: <20220213210504.1416861-1-fontaine.fabrice@gmail.com> Commit 683e8387d05cb506c30592ab43a3e7534d7cf56e forgot to set CRYPTSETUP_AUTORECONF resulting in the following build failure: configure: error: You need the gcrypt library. Fixes: - http://autobuild.buildroot.org/results/f6cead0cf1089bbbe52457d379764a0aa9add408 Signed-off-by: Fabrice Fontaine --- package/cryptsetup/cryptsetup.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index 2e06047c56..55cc70576c 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -17,6 +17,8 @@ CRYPTSETUP_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (library) CRYPTSETUP_LICENSE_FILES = COPYING COPYING.LGPL CRYPTSETUP_CPE_ID_VENDOR = cryptsetup_project CRYPTSETUP_INSTALL_STAGING = YES +# We're patching configure.ac +CRYPTSETUP_AUTORECONF = YES CRYPTSETUP_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)" CRYPTSETUP_CONF_OPTS += --enable-blkid --enable-libargon2 -- 2.34.1 From fontaine.fabrice at gmail.com Sun Feb 13 21:29:09 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 13 Feb 2022 22:29:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/cryptsetup: openssl is the default crypto backend Message-ID: <20220213212909.1504992-1-fontaine.fabrice@gmail.com> openssl is the default crypto backend since version 2.1.0 and https://github.com/mbroz/cryptsetup/commit/bc3d0feb5cd33f9181102b418cc7bf44fe112e82 Signed-off-by: Fabrice Fontaine --- package/cryptsetup/cryptsetup.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index 55cc70576c..b50ac698bb 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -22,15 +22,15 @@ CRYPTSETUP_AUTORECONF = YES CRYPTSETUP_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)" CRYPTSETUP_CONF_OPTS += --enable-blkid --enable-libargon2 -# cryptsetup uses libgcrypt by default, but can be configured to use OpenSSL +# cryptsetup uses OpenSSL by default, but can be configured to use libgcrypt # or kernel crypto modules instead -ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) +ifeq ($(BR2_PACKAGE_OPENSSL),y) +CRYPTSETUP_DEPENDENCIES += openssl +CRYPTSETUP_CONF_OPTS += --with-crypto_backend=openssl +else ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) CRYPTSETUP_DEPENDENCIES += libgcrypt CRYPTSETUP_CONF_ENV += LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config CRYPTSETUP_CONF_OPTS += --with-crypto_backend=gcrypt -else ifeq ($(BR2_PACKAGE_OPENSSL),y) -CRYPTSETUP_DEPENDENCIES += openssl -CRYPTSETUP_CONF_OPTS += --with-crypto_backend=openssl else CRYPTSETUP_CONF_OPTS += --with-crypto_backend=kernel endif -- 2.34.1 From fontaine.fabrice at gmail.com Sun Feb 13 21:34:30 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 13 Feb 2022 22:34:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/opentracing-cpp: bump to version 1.6.0 Message-ID: <20220213213430.1506727-1-fontaine.fabrice@gmail.com> Update indentation in hash file (two spaces) https://github.com/opentracing/opentracing-cpp/releases/tag/v1.6.0 Signed-off-by: Fabrice Fontaine --- package/opentracing-cpp/opentracing-cpp.hash | 4 ++-- package/opentracing-cpp/opentracing-cpp.mk | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/opentracing-cpp/opentracing-cpp.hash b/package/opentracing-cpp/opentracing-cpp.hash index 591c0e4a0a..8cfaf5fd47 100644 --- a/package/opentracing-cpp/opentracing-cpp.hash +++ b/package/opentracing-cpp/opentracing-cpp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 015c4187f7a6426a2b5196f0ccd982aa87f010cf61f507ae3ce5c90523f92301 opentracing-cpp-1.5.1.tar.gz -sha256 076d03156735d5ff2df2ea0f8b12351ef65e5e9222b5c8c6a35101dadb41e717 LICENSE +sha256 5b170042da4d1c4c231df6594da120875429d5231e9baa5179822ee8d1054ac3 opentracing-cpp-1.6.0.tar.gz +sha256 076d03156735d5ff2df2ea0f8b12351ef65e5e9222b5c8c6a35101dadb41e717 LICENSE diff --git a/package/opentracing-cpp/opentracing-cpp.mk b/package/opentracing-cpp/opentracing-cpp.mk index 0605cd5d96..12ce40fbed 100644 --- a/package/opentracing-cpp/opentracing-cpp.mk +++ b/package/opentracing-cpp/opentracing-cpp.mk @@ -4,8 +4,9 @@ # ################################################################################ -OPENTRACING_CPP_VERSION = 1.5.1 -OPENTRACING_CPP_SITE = $(call github,opentracing,opentracing-cpp,v$(OPENTRACING_CPP_VERSION)) +OPENTRACING_CPP_VERSION = 1.6.0 +OPENTRACING_CPP_SITE = \ + $(call github,opentracing,opentracing-cpp,v$(OPENTRACING_CPP_VERSION)) OPENTRACING_CPP_LICENSE = Apache-2.0 OPENTRACING_CPP_LICENSE_FILES = LICENSE -- 2.34.1 From fontaine.fabrice at gmail.com Sun Feb 13 21:51:59 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 13 Feb 2022 22:51:59 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/mutt: bump to version 2.2.0 Message-ID: <20220213215159.1533045-1-fontaine.fabrice@gmail.com> libgsasl is an optional dependency since https://gitlab.com/muttmua/mutt/-/commit/68caf9140c8217ecf6c848460c4b4d27996b2922 http://www.mutt.org/relnotes/2.2/ https://gitlab.com/muttmua/mutt/-/blob/mutt-2-2-rel/ChangeLog Signed-off-by: Fabrice Fontaine --- package/mutt/mutt.hash | 2 +- package/mutt/mutt.mk | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/package/mutt/mutt.hash b/package/mutt/mutt.hash index d439b23aa3..bbc9d459b0 100644 --- a/package/mutt/mutt.hash +++ b/package/mutt/mutt.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 92a309e47e363a97d62425bcb71adceae5ab5c4c413dbcac37fa98ed70c12be0 mutt-2.1.5.tar.gz +sha256 e84597f06d03ca82f8ca3b5ec8bc294c150709b43ed2a0177bf479c3e3345314 mutt-2.2.0.tar.gz sha256 732f24b69a6c71cd8e01e4672bb8e12cc1cbb88a50a4665e6ca4fd95000a57ee GPL diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk index 7e9046fe8a..51178ef03d 100644 --- a/package/mutt/mutt.mk +++ b/package/mutt/mutt.mk @@ -4,7 +4,7 @@ # ################################################################################ -MUTT_VERSION = 2.1.5 +MUTT_VERSION = 2.2.0 MUTT_SITE = https://bitbucket.org/mutt/mutt/downloads MUTT_LICENSE = GPL-2.0+ MUTT_LICENSE_FILES = GPL @@ -53,8 +53,15 @@ else MUTT_CONF_OPTS += --disable-pop endif -# SSL support is only used by imap or pop3 module +# SASL and SSL support are only used by imap or pop3 module ifneq ($(BR2_PACKAGE_MUTT_IMAP)$(BR2_PACKAGE_MUTT_POP3),) +ifeq ($(BR2_PACKAGE_LIBGSASL),y) +MUTT_DEPENDENCIES += libgsasl +MUTT_CONF_OPTS += --with-gsasl +else +MUTT_CONF_OPTS += --without-gsasl +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) MUTT_DEPENDENCIES += openssl MUTT_CONF_OPTS += \ @@ -72,6 +79,7 @@ MUTT_CONF_OPTS += \ endif else MUTT_CONF_OPTS += \ + --without-gsasl \ --without-gnutls \ --without-ssl endif -- 2.34.1 From thomas.petazzoni at bootlin.com Sun Feb 13 22:01:15 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 13 Feb 2022 23:01:15 +0100 Subject: [Buildroot] [PATCH] package/gdb: bump 11.x version to 11.2 Message-ID: <20220213220116.144141-1-thomas.petazzoni@bootlin.com> This is a minor corrective release over GDB 11.1, fixing the following issues: PR sim/28302 (gdb fails to build with glibc 2.34) PR build/28318 (std::thread support configure check does not use CXX_DIALECT) PR gdb/28405 (arm-none-eabi: internal-error: ptid_t remote_target::select_thread_for_ambiguous_stop_reply(const target_waitstatus*): Assertion `first_resumed_thread != nullptr' failed) PR tui/28483 ([gdb/tui] breakpoint creation not displayed) PR build/28555 (uclibc compile failure since commit 4655f8509fd44e6efabefa373650d9982ff37fd6) PR rust/28637 (Rust characters will be encoded using DW_ATE_UTF) PR gdb/28758 (GDB 11 doesn't work correctly on binaries with a SHT_RELR (.relr.dyn) section) PR gdb/28785 (Support SHT_RELR (.relr.dyn) section) Drop patch 0006-sim-filter-out-SIGSTKSZ-PR-sim-28302.patch, which was merged upstream as commit 17d6f2152b583cdc7defafa7813b727a304bac5b. Drop patch 0008-Fix-build-on-rhES5.patch, which was merged upstream as commit df9ebc472a162306dee8ba6e02b99963c2babb7c? Drop patch 0009-gdbserver-aarch64-support.patch, which was merged upstream as commit eb79b2318066cafb75ffdce310e3bbd44f7c79e3. Signed-off-by: Thomas Petazzoni --- ...sim-filter-out-SIGSTKSZ-PR-sim-28302.patch | 110 ------ .../gdb/11.1/0008-Fix-build-on-rhES5.patch | 194 ----------- .../11.1/0010-gdbserver-aarch64-support.patch | 320 ------------------ ...e-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch | 0 ...-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch | 0 .../0003-use-asm-sgidefs.h.patch | 0 .../0004-gdbserver-fix-build-for-m68k.patch | 0 ...fork-inferior-include-linux-ptrace.h.patch | 0 ...etrandom-compile-for-uclibc-v1.0.35.patch} | 0 .../0007-fix-musl-build-on-riscv.patch | 0 ...gdbserver-Makefile.in-fix-NLS-build.patch} | 0 package/gdb/Config.in.host | 2 +- package/gdb/gdb.hash | 2 +- 13 files changed, 2 insertions(+), 626 deletions(-) delete mode 100644 package/gdb/11.1/0006-sim-filter-out-SIGSTKSZ-PR-sim-28302.patch delete mode 100644 package/gdb/11.1/0008-Fix-build-on-rhES5.patch delete mode 100644 package/gdb/11.1/0010-gdbserver-aarch64-support.patch rename package/gdb/{11.1 => 11.2}/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch (100%) rename package/gdb/{11.1 => 11.2}/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch (100%) rename package/gdb/{11.1 => 11.2}/0003-use-asm-sgidefs.h.patch (100%) rename package/gdb/{11.1 => 11.2}/0004-gdbserver-fix-build-for-m68k.patch (100%) rename package/gdb/{11.1 => 11.2}/0005-nat-fork-inferior-include-linux-ptrace.h.patch (100%) rename package/gdb/{11.1/0007-Fix-getrandom-compile-for-uclibc-v1.0.35.patch => 11.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch} (100%) rename package/gdb/{11.1 => 11.2}/0007-fix-musl-build-on-riscv.patch (100%) rename package/gdb/{11.1/0009-gdbserver-Makefile.in-fix-NLS-build.patch => 11.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch} (100%) diff --git a/package/gdb/11.1/0006-sim-filter-out-SIGSTKSZ-PR-sim-28302.patch b/package/gdb/11.1/0006-sim-filter-out-SIGSTKSZ-PR-sim-28302.patch deleted file mode 100644 index d969d98831..0000000000 --- a/package/gdb/11.1/0006-sim-filter-out-SIGSTKSZ-PR-sim-28302.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 7b3df9b8938357c2b0dcf2624e599a76fc4edc02 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Sun, 3 Oct 2021 12:02:53 -0400 -Subject: [PATCH] sim: filter out SIGSTKSZ [PR sim/28302] - -We map target signals to host signals so we can propagate signals -between the host & simulated worlds. That means we need to know -the symbolic names & values of all signals that might be sent. - -The tools that generate that list use signal.h and include all -symbols that start with "SIG" so as to automatically include any -new symbols that the C library might add. Unfortunately, this -also picks up "SIGSTKSZ" which is not actually a signal itself, -but a signal related setting -- it's the size of the stack when -a signal is handled. - -By itself this doesn't super matter as we will never see a signal -with that same value (since the range of valid signals tend to be -way less than 1024, and the size of the default signal stack will -never be that small). But with recent glibc changes that make this -into a dynamic value instead of a compile-time constant, some users -see build failures when building the sim. - -As suggested by Adam Sampson, update our scripts to ignore this -symbol to simplify everything and avoid the build failure. - -Bug: https://sourceware.org/PR28302 - -[Upstream: https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=39d53d04357606a15efd400147fa7369d71baf2c] -Signed-off-by: Peter Seiderer ---- - sim/bfin/linux-targ-map.h | 5 +---- - sim/common/gennltvals.py | 6 ++++-- - sim/common/nltvals.def | 1 - - 3 files changed, 5 insertions(+), 7 deletions(-) - -diff --git a/sim/bfin/linux-targ-map.h b/sim/bfin/linux-targ-map.h -index e9c8c8f..0340ed5 100644 ---- a/sim/bfin/linux-targ-map.h -+++ b/sim/bfin/linux-targ-map.h -@@ -30,6 +30,7 @@ echo - # XXX: nothing uses this ? - echo '#include ' | \ - bfin-uclinux-gcc -E -dD -P - | \ -+grep -v SIGSTKSZ | \ - sed -r -n \ - -e '1istatic CB_TARGET_DEFS_MAP cb_linux_signal_map[] = {' \ - -e '$i\ \ { 0, -1, -1 }\n};' \ -@@ -1987,10 +1988,6 @@ static CB_TARGET_DEFS_MAP cb_linux_signal_map[] = - #ifdef SIG_SETMASK - # define TARGET_LINUX_SIG_SETMASK 2 - { "SIG_SETMASK", SIG_SETMASK, TARGET_LINUX_SIG_SETMASK }, --#endif --#ifdef SIGSTKSZ --# define TARGET_LINUX_SIGSTKSZ 8192 -- { "SIGSTKSZ", SIGSTKSZ, TARGET_LINUX_SIGSTKSZ }, - #endif - { 0, -1, -1 } - }; -diff --git a/sim/common/gennltvals.py b/sim/common/gennltvals.py -index b3e558d..bd4d7e9 100755 ---- a/sim/common/gennltvals.py -+++ b/sim/common/gennltvals.py -@@ -67,6 +67,7 @@ FILE_HEADER = f"""\ - def gentvals(output: TextIO, cpp: str, srctype: str, srcdir: Path, - headers: Iterable[str], - pattern: str, -+ filter: str = r'^$', - target: str = None): - """Extract constants from the specified files using a regular expression. - -@@ -94,12 +95,13 @@ def gentvals(output: TextIO, cpp: str, srctype: str, srcdir: Path, - srcfile = ''.join(f'#include <{x}>\n' for x in headers) - syms = set() - define_pattern = re.compile(r'^#\s*define\s+(' + pattern + ')') -+ filter_pattern = re.compile(filter) - for header in headers: - with open(srcdir / header, 'r', encoding='utf-8') as fp: - data = fp.read() - for line in data.splitlines(): - m = define_pattern.match(line) -- if m: -+ if m and not filter_pattern.search(line): - syms.add(m.group(1)) - for sym in sorted(syms): - srcfile += f'#ifdef {sym}\nDEFVAL {{ "{sym}", {sym} }},\n#endif\n' -@@ -129,7 +131,7 @@ def gen_common(output: TextIO, newlib: Path, cpp: str): - ('errno.h', 'sys/errno.h'), 'E[A-Z0-9]*') - - gentvals(output, cpp, 'signal', newlib / 'newlib/libc/include', -- ('signal.h', 'sys/signal.h'), r'SIG[A-Z0-9]*') -+ ('signal.h', 'sys/signal.h'), r'SIG[A-Z0-9]*', filter=r'SIGSTKSZ') - - gentvals(output, cpp, 'open', newlib / 'newlib/libc/include', - ('fcntl.h', 'sys/fcntl.h', 'sys/_default_fcntl.h'), r'O_[A-Z0-9]*') -diff --git a/sim/common/nltvals.def b/sim/common/nltvals.def -index 8ae8839..8bc6ae5 100644 ---- a/sim/common/nltvals.def -+++ b/sim/common/nltvals.def -@@ -116,7 +116,6 @@ - { "SIGPROF", 27 }, - { "SIGQUIT", 3 }, - { "SIGSEGV", 11 }, -- { "SIGSTKSZ", 8192 }, - { "SIGSTOP", 17 }, - { "SIGSYS", 12 }, - { "SIGTERM", 15 }, --- -2.33.1 - diff --git a/package/gdb/11.1/0008-Fix-build-on-rhES5.patch b/package/gdb/11.1/0008-Fix-build-on-rhES5.patch deleted file mode 100644 index 2d4e30ffe1..0000000000 --- a/package/gdb/11.1/0008-Fix-build-on-rhES5.patch +++ /dev/null @@ -1,194 +0,0 @@ -From db3aaeda1d6b156100d969edb8c0e674bca6b201 Mon Sep 17 00:00:00 2001 -From: Tom Tromey -Date: Wed, 12 May 2021 12:39:22 -0600 -Subject: [PATCH] Fix build on rhES5 - -The rhES5 build failed due to an upstream import a while back. The -bug here is that, while the 'personality' function exists, -ADDR_NO_RANDOMIZE is only defined in , not -. - -However, does not declare the 'personality' -function, and and cannot -both be included. - -This patch restores one of the removed configure checks and updates -the code to check it. - -We had this as a local patch at AdaCore, because it seemed like there -was no interest upstream. However, now it turns out that this fixes -PR build/28555, so I'm sending it now. - -[Upstream: https://sourceware.org/git?p=binutils-gdb.git;h=0b03c6f03d51f441d999e0cee92f81af543d9373] -Signed-off-by: Peter Seiderer ---- - gdb/config.in | 4 ++++ - gdb/configure | 16 ++++++++++++++++ - gdb/nat/linux-personality.c | 4 ++++ - gdbserver/config.in | 4 ++++ - gdbserver/configure | 16 ++++++++++++++++ - gdbsupport/common.m4 | 5 +++++ - gdbsupport/config.in | 4 ++++ - gdbsupport/configure | 16 ++++++++++++++++ - 8 files changed, 69 insertions(+) - -diff --git a/gdb/config.in b/gdb/config.in -index 2c30504..776bee9 100644 ---- a/gdb/config.in -+++ b/gdb/config.in -@@ -96,6 +96,10 @@ - /* define if the compiler supports basic C++11 syntax */ - #undef HAVE_CXX11 - -+/* Define to 1 if you have the declaration of `ADDR_NO_RANDOMIZE', and to 0 if -+ you don't. */ -+#undef HAVE_DECL_ADDR_NO_RANDOMIZE -+ - /* Define to 1 if you have the declaration of `asprintf', and to 0 if you - don't. */ - #undef HAVE_DECL_ASPRINTF -diff --git a/gdb/configure b/gdb/configure -index 5d89635..27e3194 100755 ---- a/gdb/configure -+++ b/gdb/configure -@@ -13838,6 +13838,22 @@ fi - done - - -+ # This is needed for RHEL 5 and uclibc-ng < 1.0.39. -+ # These did not define ADDR_NO_RANDOMIZE in sys/personality.h, -+ # only in linux/personality.h. -+ ac_fn_c_check_decl "$LINENO" "ADDR_NO_RANDOMIZE" "ac_cv_have_decl_ADDR_NO_RANDOMIZE" "#include -+" -+if test "x$ac_cv_have_decl_ADDR_NO_RANDOMIZE" = xyes; then : -+ ac_have_decl=1 -+else -+ ac_have_decl=0 -+fi -+ -+cat >>confdefs.h <<_ACEOF -+#define HAVE_DECL_ADDR_NO_RANDOMIZE $ac_have_decl -+_ACEOF -+ -+ - ac_fn_c_check_decl "$LINENO" "strstr" "ac_cv_have_decl_strstr" "$ac_includes_default" - if test "x$ac_cv_have_decl_strstr" = xyes; then : - ac_have_decl=1 -diff --git a/gdb/nat/linux-personality.c b/gdb/nat/linux-personality.c -index 9ce345b..27999fd 100644 ---- a/gdb/nat/linux-personality.c -+++ b/gdb/nat/linux-personality.c -@@ -22,6 +22,10 @@ - - #include - -+# if !HAVE_DECL_ADDR_NO_RANDOMIZE -+# define ADDR_NO_RANDOMIZE 0x0040000 -+# endif /* ! HAVE_DECL_ADDR_NO_RANDOMIZE */ -+ - /* See comment on nat/linux-personality.h. */ - - maybe_disable_address_space_randomization:: -diff --git a/gdbserver/config.in b/gdbserver/config.in -index cf06c56..c9258b3 100644 ---- a/gdbserver/config.in -+++ b/gdbserver/config.in -@@ -31,6 +31,10 @@ - /* define if the compiler supports basic C++11 syntax */ - #undef HAVE_CXX11 - -+/* Define to 1 if you have the declaration of `ADDR_NO_RANDOMIZE', and to 0 if -+ you don't. */ -+#undef HAVE_DECL_ADDR_NO_RANDOMIZE -+ - /* Define to 1 if you have the declaration of `asprintf', and to 0 if you - don't. */ - #undef HAVE_DECL_ASPRINTF -diff --git a/gdbserver/configure b/gdbserver/configure -index b227167..d399d71 100755 ---- a/gdbserver/configure -+++ b/gdbserver/configure -@@ -7131,6 +7131,22 @@ fi - done - - -+ # This is needed for RHEL 5 and uclibc-ng < 1.0.39. -+ # These did not define ADDR_NO_RANDOMIZE in sys/personality.h, -+ # only in linux/personality.h. -+ ac_fn_c_check_decl "$LINENO" "ADDR_NO_RANDOMIZE" "ac_cv_have_decl_ADDR_NO_RANDOMIZE" "#include -+" -+if test "x$ac_cv_have_decl_ADDR_NO_RANDOMIZE" = xyes; then : -+ ac_have_decl=1 -+else -+ ac_have_decl=0 -+fi -+ -+cat >>confdefs.h <<_ACEOF -+#define HAVE_DECL_ADDR_NO_RANDOMIZE $ac_have_decl -+_ACEOF -+ -+ - ac_fn_c_check_decl "$LINENO" "strstr" "ac_cv_have_decl_strstr" "$ac_includes_default" - if test "x$ac_cv_have_decl_strstr" = xyes; then : - ac_have_decl=1 -diff --git a/gdbsupport/common.m4 b/gdbsupport/common.m4 -index 901c454..56a355e 100644 ---- a/gdbsupport/common.m4 -+++ b/gdbsupport/common.m4 -@@ -55,6 +55,11 @@ AC_DEFUN([GDB_AC_COMMON], [ - ptrace64 sbrk setns sigaltstack sigprocmask \ - setpgid setpgrp getrusage getauxval sigtimedwait]) - -+ # This is needed for RHEL 5 and uclibc-ng < 1.0.39. -+ # These did not define ADDR_NO_RANDOMIZE in sys/personality.h, -+ # only in linux/personality.h. -+ AC_CHECK_DECLS([ADDR_NO_RANDOMIZE],,, [#include ]) -+ - AC_CHECK_DECLS([strstr]) - - # ----------------------- # -diff --git a/gdbsupport/config.in b/gdbsupport/config.in -index f46e261..6945a62 100644 ---- a/gdbsupport/config.in -+++ b/gdbsupport/config.in -@@ -28,6 +28,10 @@ - /* define if the compiler supports basic C++11 syntax */ - #undef HAVE_CXX11 - -+/* Define to 1 if you have the declaration of `ADDR_NO_RANDOMIZE', and to 0 if -+ you don't. */ -+#undef HAVE_DECL_ADDR_NO_RANDOMIZE -+ - /* Define to 1 if you have the declaration of `asprintf', and to 0 if you - don't. */ - #undef HAVE_DECL_ASPRINTF -diff --git a/gdbsupport/configure b/gdbsupport/configure -index a9dd02c..243a03f 100755 ---- a/gdbsupport/configure -+++ b/gdbsupport/configure -@@ -8144,6 +8144,22 @@ fi - done - - -+ # This is needed for RHEL 5 and uclibc-ng < 1.0.39. -+ # These did not define ADDR_NO_RANDOMIZE in sys/personality.h, -+ # only in linux/personality.h. -+ ac_fn_c_check_decl "$LINENO" "ADDR_NO_RANDOMIZE" "ac_cv_have_decl_ADDR_NO_RANDOMIZE" "#include -+" -+if test "x$ac_cv_have_decl_ADDR_NO_RANDOMIZE" = xyes; then : -+ ac_have_decl=1 -+else -+ ac_have_decl=0 -+fi -+ -+cat >>confdefs.h <<_ACEOF -+#define HAVE_DECL_ADDR_NO_RANDOMIZE $ac_have_decl -+_ACEOF -+ -+ - ac_fn_c_check_decl "$LINENO" "strstr" "ac_cv_have_decl_strstr" "$ac_includes_default" - if test "x$ac_cv_have_decl_strstr" = xyes; then : - ac_have_decl=1 --- -2.33.1 - diff --git a/package/gdb/11.1/0010-gdbserver-aarch64-support.patch b/package/gdb/11.1/0010-gdbserver-aarch64-support.patch deleted file mode 100644 index 3718b1b6fd..0000000000 --- a/package/gdb/11.1/0010-gdbserver-aarch64-support.patch +++ /dev/null @@ -1,320 +0,0 @@ -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. - -Backported from: eb79b2318066cafb75ffdce310e3bbd44f7c79e3 -Signed-off-by: Joachim Wiberg ---- - 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 - diff --git a/package/gdb/11.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/package/gdb/11.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch similarity index 100% rename from package/gdb/11.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch rename to package/gdb/11.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch diff --git a/package/gdb/11.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch b/package/gdb/11.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch similarity index 100% rename from package/gdb/11.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch rename to package/gdb/11.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch diff --git a/package/gdb/11.1/0003-use-asm-sgidefs.h.patch b/package/gdb/11.2/0003-use-asm-sgidefs.h.patch similarity index 100% rename from package/gdb/11.1/0003-use-asm-sgidefs.h.patch rename to package/gdb/11.2/0003-use-asm-sgidefs.h.patch diff --git a/package/gdb/11.1/0004-gdbserver-fix-build-for-m68k.patch b/package/gdb/11.2/0004-gdbserver-fix-build-for-m68k.patch similarity index 100% rename from package/gdb/11.1/0004-gdbserver-fix-build-for-m68k.patch rename to package/gdb/11.2/0004-gdbserver-fix-build-for-m68k.patch diff --git a/package/gdb/11.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch b/package/gdb/11.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch similarity index 100% rename from package/gdb/11.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch rename to package/gdb/11.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch diff --git a/package/gdb/11.1/0007-Fix-getrandom-compile-for-uclibc-v1.0.35.patch b/package/gdb/11.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch similarity index 100% rename from package/gdb/11.1/0007-Fix-getrandom-compile-for-uclibc-v1.0.35.patch rename to package/gdb/11.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch diff --git a/package/gdb/11.1/0007-fix-musl-build-on-riscv.patch b/package/gdb/11.2/0007-fix-musl-build-on-riscv.patch similarity index 100% rename from package/gdb/11.1/0007-fix-musl-build-on-riscv.patch rename to package/gdb/11.2/0007-fix-musl-build-on-riscv.patch diff --git a/package/gdb/11.1/0009-gdbserver-Makefile.in-fix-NLS-build.patch b/package/gdb/11.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch similarity index 100% rename from package/gdb/11.1/0009-gdbserver-Makefile.in-fix-NLS-build.patch rename to package/gdb/11.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host index 56999fa9e0..d3dea0b0a7 100644 --- a/package/gdb/Config.in.host +++ b/package/gdb/Config.in.host @@ -71,7 +71,7 @@ config BR2_GDB_VERSION default "4ecb98fbc2f94dbe01b69384afbc515107de73df" if BR2_csky default "9.2" if BR2_GDB_VERSION_9_2 default "10.2" if BR2_GDB_VERSION_10 || !BR2_PACKAGE_HOST_GDB - default "11.1" if BR2_GDB_VERSION_11 + default "11.2" if BR2_GDB_VERSION_11 depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB # recent gdb versions (>= 10) have gdbserver moved at the top-level, diff --git a/package/gdb/gdb.hash b/package/gdb/gdb.hash index d3e83af0b9..e7933374f1 100644 --- a/package/gdb/gdb.hash +++ b/package/gdb/gdb.hash @@ -1,7 +1,7 @@ # From ftp://gcc.gnu.org/pub/gdb/releases/sha512.sum sha512 73635f00f343117aa5e2436f1e1597099e2bfb31ef7bb162b273fa1ea282c3fa9b0f52762e70bfc7ad0334addb8d159e9ac7cbe5998ca4f755ea8cf90714d274 gdb-9.2.tar.xz sha512 3653762ac008e065c37cd641653184c9ff7ce51ee2222ade1122bec9d6cc64dffd4fb74888ef11ac1942064a08910e96b7865112ad37f4602eb0a16bed074caa gdb-10.2.tar.xz -sha512 c40bf970e2f7c2107b29c5aa6a7150daa709d75ddadb73ac20742419d4637d158e3063a4c6ff6e47fae8ca8e1d36253973f85ea15445d004be6d5d7a2dd9bd46 gdb-11.1.tar.xz +sha512 07e9026423438049b11f4f784d57401ece4e940570f613bd6958b3714fe7fbc2c048470bcce3e7d7d9f93331cdf3881d30dcc964cb113a071143a02b28e5b127 gdb-11.2.tar.xz # Locally calculated (fetched from Github) sha512 5a2acf2fd33ab2ff589e1037ca40abda54328997dcff26b2b49b874bd3be980be5a63342962254f3c3bda98e32ce7a33af704d37353352833dee193135600458 gdb-arc-2020.09-release-gdb.tar.gz -- 2.34.1 From giulio.benetti at benettiengineering.com Sun Feb 13 22:24:52 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 13 Feb 2022 23:24:52 +0100 Subject: [Buildroot] [PATCH 01/16] board/aarch64-efi/genimage-efi: convert partition-type-uuid to single letter notation In-Reply-To: References: <20220206200532.2758493-1-giulio.benetti@benettiengineering.com> <20220206200532.2758493-2-giulio.benetti@benettiengineering.com> <20220206213657.GA457876@scaer> <20220207085517.5c13c097@windsurf> <20220207173751.GA2249818@scaer> Message-ID: <49133c66-0a53-7607-1c52-5e1ad9e8fc7b@benettiengineering.com> Hi Arnout, Yann, Thomas, All, On 13/02/22 16:06, Arnout Vandecappelle wrote: > > > On 07/02/2022 18:37, Yann E. MORIN wrote: >> Thomas, All, >> >> On 2022-02-07 08:55 +0100, Thomas Petazzoni spake thusly: >>> On Sun, 6 Feb 2022 22:36:57 +0100 >>> "Yann E. MORIN" wrote: >>>>> partition root { >>>>> - partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae >>>>> + partition-type-uuid = L >>>> As we discussed on IRC, this is not the same thing. genimage will extend >>>> the 'L' shorthand to the full UUID 0fc63daf-8483-4772-8e79-3d69d8477de4, >>>> which is different. >>> And? Is that really important? >>>> So I don't think uaing the shorthands are correct. >>> Why? >> >> I think that it is important that we do adhere to the expected values; >> see below... >> >>>> The UUID assignments are available on Wikipedia: >>>> https://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs >>>> But the systemd docuemntation has extra UUID definitions: >>>> https://man.archlinux.org/man/systemd-gpt-auto-generator.8 >>> Yes, but how useful are they? >> >> Why would we diverge from the specs? >> >>> Unless these systemd-defined UUID are really relevant, I would prefer >>> that we use the shortcuts provided by genimage wherever possible, and >>> only rely on using the full UUID for special cases, such as the >>> board/sifive/hifive-unleashed/genimage_sdcard.cfg (PATCH 15/16). >> >> There are tools that expect those values, to autodetect partitions. This >> is the case, of course, of systemd-gpt-auto-generator, which will lookup >> the partition UUIDs, but other tools may expect these UUIDs too. > > At least for systemd-gpt-auto-generator, the UUID for rootfs is only relevant > in case systemd is the one mounting the rootfs, i.e. in case of it running from > initramfs and pivoting into a mounted root. > > That is not a scenario that we support in Buildroot, by a long shot. > Therefore, my suggestion would be to use the default Linux partition type for > the rootfs, i.e. L. Since this is actually the default for genimage, I would > even leave it out completely. > > Giulio, that would mean rewriting this series and removing everywhere L is > specified. Do you agree with that? I'm going to rework and remove L, less code we have the better IMHO. Also, this gives less ambiguity on letters, because we're going to end up only having: F => Fat U => Efi(that recalls UEFI(to me at least) even if it's not the same thing as EFI) > >> I am not saying that we would cause trouble by changing our board >> descriptions, but if we want to allow people to just copy them as the >> base for their own development, then diverging from expected behaviour >> is not nice. > > I think the cases where a non-standard (where "standard" means the actual GPT > standard, not the additional stuff that systemd invented) partition type is > relevant are going to be so unusual that the default we put in our genimage.cfg > is going to be of no relevance whatsoever. Yes, I agree too. At least for the moment I would use the genimage letters and if needed we can modify it later. Thank you all! Best regards -- Giulio Benetti Benetti Engineering sas > Regards, > Arnout > > >> >>> This way, it would be pretty clear that we have the "common cases" (boot >>> partition, rootfs partition) and the "odd/special cases". >> >> I think the "common case" would be "adhere to spec, use specified >> values", while the exceptions are "the spec says nothing, use something >> else and comment it". >> >> Regards, >> Yann E. MORIN. >> > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From giulio.benetti at benettiengineering.com Sun Feb 13 22:35:25 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 13 Feb 2022 23:35:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/cryptsetup: set CRYPTSETUP_AUTORECONF In-Reply-To: <20220213210504.1416861-1-fontaine.fabrice@gmail.com> References: <20220213210504.1416861-1-fontaine.fabrice@gmail.com> Message-ID: Hi Fabrice, thanks again, On 13/02/22 22:05, Fabrice Fontaine wrote: > Commit 683e8387d05cb506c30592ab43a3e7534d7cf56e forgot to set > CRYPTSETUP_AUTORECONF resulting in the following build failure: > > configure: error: You need the gcrypt library. > > Fixes: > - http://autobuild.buildroot.org/results/f6cead0cf1089bbbe52457d379764a0aa9add408 > > Signed-off-by: Fabrice Fontaine Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti Now that my patch for DEVELOPER has been committed I will receive the build failure e-mail. Best regards -- Giulio Benetti Benetti Engineering sas > --- > package/cryptsetup/cryptsetup.mk | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk > index 2e06047c56..55cc70576c 100644 > --- a/package/cryptsetup/cryptsetup.mk > +++ b/package/cryptsetup/cryptsetup.mk > @@ -17,6 +17,8 @@ CRYPTSETUP_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (library) > CRYPTSETUP_LICENSE_FILES = COPYING COPYING.LGPL > CRYPTSETUP_CPE_ID_VENDOR = cryptsetup_project > CRYPTSETUP_INSTALL_STAGING = YES > +# We're patching configure.ac > +CRYPTSETUP_AUTORECONF = YES > CRYPTSETUP_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)" > CRYPTSETUP_CONF_OPTS += --enable-blkid --enable-libargon2 > From giulio.benetti at benettiengineering.com Sun Feb 13 22:44:48 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 13 Feb 2022 23:44:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/cryptsetup: openssl is the default crypto backend In-Reply-To: <20220213212909.1504992-1-fontaine.fabrice@gmail.com> References: <20220213212909.1504992-1-fontaine.fabrice@gmail.com> Message-ID: <4145b9b9-a71a-f763-2211-529cf916b91d@benettiengineering.com> Hi Fabrice, thanks a lot! On 13/02/22 22:29, Fabrice Fontaine wrote: > openssl is the default crypto backend since version 2.1.0 and > https://github.com/mbroz/cryptsetup/commit/bc3d0feb5cd33f9181102b418cc7bf44fe112e82 > > Signed-off-by: Fabrice Fontaine Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti Best regards -- Giulio Benetti Benetti Engineering sas > --- > package/cryptsetup/cryptsetup.mk | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk > index 55cc70576c..b50ac698bb 100644 > --- a/package/cryptsetup/cryptsetup.mk > +++ b/package/cryptsetup/cryptsetup.mk > @@ -22,15 +22,15 @@ CRYPTSETUP_AUTORECONF = YES > CRYPTSETUP_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)" > CRYPTSETUP_CONF_OPTS += --enable-blkid --enable-libargon2 > > -# cryptsetup uses libgcrypt by default, but can be configured to use OpenSSL > +# cryptsetup uses OpenSSL by default, but can be configured to use libgcrypt > # or kernel crypto modules instead > -ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) > +ifeq ($(BR2_PACKAGE_OPENSSL),y) > +CRYPTSETUP_DEPENDENCIES += openssl > +CRYPTSETUP_CONF_OPTS += --with-crypto_backend=openssl > +else ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) > CRYPTSETUP_DEPENDENCIES += libgcrypt > CRYPTSETUP_CONF_ENV += LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config > CRYPTSETUP_CONF_OPTS += --with-crypto_backend=gcrypt > -else ifeq ($(BR2_PACKAGE_OPENSSL),y) > -CRYPTSETUP_DEPENDENCIES += openssl > -CRYPTSETUP_CONF_OPTS += --with-crypto_backend=openssl > else > CRYPTSETUP_CONF_OPTS += --with-crypto_backend=kernel > endif From giulio.benetti at benettiengineering.com Sun Feb 13 22:53:35 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 13 Feb 2022 23:53:35 +0100 Subject: [Buildroot] [PATCH v2 01/16] board/aarch64-efi/genimage-efi: convert partition-type-uuid to single letter notation In-Reply-To: <20220213225350.3466696-1-giulio.benetti@benettiengineering.com> References: <49133c66-0a53-7607-1c52-5e1ad9e8fc7b@benettiengineering.com> <20220213225350.3466696-1-giulio.benetti@benettiengineering.com> Message-ID: <20220213225350.3466696-2-giulio.benetti@benettiengineering.com> Note that rootfs doesn't need partition-type-uuid = L since L(rootfs) is the default value. So let's remove it. Signed-off-by: Giulio Benetti --- board/aarch64-efi/genimage-efi.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/board/aarch64-efi/genimage-efi.cfg b/board/aarch64-efi/genimage-efi.cfg index 87e85816bc..3708727c18 100644 --- a/board/aarch64-efi/genimage-efi.cfg +++ b/board/aarch64-efi/genimage-efi.cfg @@ -18,13 +18,12 @@ image disk.img { partition boot { image = "efi-part.vfat" - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + partition-type-uuid = U offset = 32K bootable = true } partition root { - partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae image = "rootfs.ext2" } } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 13 22:53:34 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 13 Feb 2022 23:53:34 +0100 Subject: [Buildroot] [PATCH v2 00/16] Use single letter notation in genimage.cfg files for partition-type-uuid In-Reply-To: <49133c66-0a53-7607-1c52-5e1ad9e8fc7b@benettiengineering.com> References: <49133c66-0a53-7607-1c52-5e1ad9e8fc7b@benettiengineering.com> Message-ID: <20220213225350.3466696-1-giulio.benetti@benettiengineering.com> This patchset convert partition-type-uuid to single letter notation *without* "" and without L(rootfs) since it's the default value for partition-type-uuid if it's not specified. V1->V2: * remove every partition-type-uuid = L as suggested by Arnout Giulio Benetti (16): board/aarch64-efi/genimage-efi: convert partition-type-uuid to single letter notation board/beaglev/genimage-efi: remove partition-type-uuid since its default value is L(rootfs) board/friendlyarm/nanopc-t4/genimage: convert partition-type-uuid to single letter notation board/friendlyarm/nanopi-m4/genimage: convert partition-type-uuid to single letter notation board/orangepi/orangepi-pc-plus/genimage: keep partition-type-uuid without "" for consistency board/orangepi/orangepi-r1/genimage: fix partition-type-uuid for boot partition and remove "" for consistency board/orangepi/orangepi-zero-plus2/genimage: keep partition-type-uuid without "" for consistency board/pc/genimage-efi: convert partition-type-uuid to single letter notation board/pine64/rockpro64/genimage: convert partition-type-uuid to single letter notation board/qemu/aarch64-sbsa/genimage: convert partition-type-uuid to single letter notation board/radxa/rockpi-n4/genimage: convert partition-type-uuid to single letter notation board/radxa/rockpi-n10/genimage: convert partition-type-uuid to single letter notation board/radxa/rockpi-n8/genimage: convert partition-type-uuid to single letter notation board/sifive/hifive-unleashed/genimage_sdcard: remove partition-type-uuid since its default value is L(rootfs) board/sifive/hifive-unleashed/genimage_sdcard: add comments to particular partition-type-uuid parameters board/sifive/hifive-unleashed/genimage_spi-nor: add comments to particular partition-type-uuid parameters board/aarch64-efi/genimage-efi.cfg | 3 +-- board/beaglev/genimage.cfg | 2 +- board/friendlyarm/nanopc-t4/genimage.cfg | 3 +-- board/friendlyarm/nanopi-m4/genimage.cfg | 3 +-- board/orangepi/orangepi-pc-plus/genimage.cfg | 3 +-- board/orangepi/orangepi-r1/genimage.cfg | 3 +-- board/orangepi/orangepi-zero-plus2/genimage.cfg | 3 +-- board/pc/genimage-efi.cfg | 3 +-- board/pine64/rockpro64/genimage.cfg | 3 +-- board/qemu/aarch64-sbsa/genimage.cfg | 3 +-- board/radxa/rockpi-4/genimage.cfg | 3 +-- board/radxa/rockpi-n10/genimage.cfg | 3 +-- board/radxa/rockpi-n8/genimage.cfg | 4 ++-- board/sifive/hifive-unleashed/genimage_sdcard.cfg | 3 ++- board/sifive/hifive-unleashed/genimage_spi-nor.cfg | 2 ++ 15 files changed, 18 insertions(+), 26 deletions(-) -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 13 22:53:37 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 13 Feb 2022 23:53:37 +0100 Subject: [Buildroot] [PATCH v2 03/16] board/friendlyarm/nanopc-t4/genimage: convert partition-type-uuid to single letter notation In-Reply-To: <20220213225350.3466696-1-giulio.benetti@benettiengineering.com> References: <49133c66-0a53-7607-1c52-5e1ad9e8fc7b@benettiengineering.com> <20220213225350.3466696-1-giulio.benetti@benettiengineering.com> Message-ID: <20220213225350.3466696-4-giulio.benetti@benettiengineering.com> Note that rootfs doesn't need partition-type-uuid = L since L(rootfs) is the default value. So let's remove it. Signed-off-by: Giulio Benetti --- board/friendlyarm/nanopc-t4/genimage.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/board/friendlyarm/nanopc-t4/genimage.cfg b/board/friendlyarm/nanopc-t4/genimage.cfg index 98dc2f3892..f966d48f3f 100644 --- a/board/friendlyarm/nanopc-t4/genimage.cfg +++ b/board/friendlyarm/nanopc-t4/genimage.cfg @@ -26,14 +26,13 @@ image sdcard.img { } partition boot { - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + partition-type-uuid = F bootable = "true" image = "boot.vfat" offset = 16M } partition rootfs { - partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae image = "rootfs.ext4" } } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 13 22:53:38 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 13 Feb 2022 23:53:38 +0100 Subject: [Buildroot] [PATCH v2 04/16] board/friendlyarm/nanopi-m4/genimage: convert partition-type-uuid to single letter notation In-Reply-To: <20220213225350.3466696-1-giulio.benetti@benettiengineering.com> References: <49133c66-0a53-7607-1c52-5e1ad9e8fc7b@benettiengineering.com> <20220213225350.3466696-1-giulio.benetti@benettiengineering.com> Message-ID: <20220213225350.3466696-5-giulio.benetti@benettiengineering.com> Note that rootfs doesn't need partition-type-uuid = L since L(rootfs) is the default value. So let's remove it. Signed-off-by: Giulio Benetti --- board/friendlyarm/nanopi-m4/genimage.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/board/friendlyarm/nanopi-m4/genimage.cfg b/board/friendlyarm/nanopi-m4/genimage.cfg index 8d0e6ad13b..db1205bfbf 100644 --- a/board/friendlyarm/nanopi-m4/genimage.cfg +++ b/board/friendlyarm/nanopi-m4/genimage.cfg @@ -26,14 +26,13 @@ image sdcard.img { } partition boot { - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + partition-type-uuid = F bootable = "true" image = "boot.vfat" offset = 16M } partition rootfs { - partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae image = "rootfs.ext4" } } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 13 22:53:36 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 13 Feb 2022 23:53:36 +0100 Subject: [Buildroot] [PATCH v2 02/16] board/beaglev/genimage-efi: remove partition-type-uuid since its default value is L(rootfs) In-Reply-To: <20220213225350.3466696-1-giulio.benetti@benettiengineering.com> References: <49133c66-0a53-7607-1c52-5e1ad9e8fc7b@benettiengineering.com> <20220213225350.3466696-1-giulio.benetti@benettiengineering.com> Message-ID: <20220213225350.3466696-3-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- board/beaglev/genimage.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/beaglev/genimage.cfg b/board/beaglev/genimage.cfg index deefdbc110..54f9118ea9 100644 --- a/board/beaglev/genimage.cfg +++ b/board/beaglev/genimage.cfg @@ -4,7 +4,7 @@ image sdcard.img { } partition rootfs { - partition-type-uuid = 72ec70a6-cf74-40e6-bd49-4bda08e8f224 + partition-type-uuid = L partition-uuid = 0fef845a-c6e1-45bc-82f7-002fa720f958 bootable = "true" image = "rootfs.ext4" -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 13 22:53:39 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 13 Feb 2022 23:53:39 +0100 Subject: [Buildroot] [PATCH v2 05/16] board/orangepi/orangepi-pc-plus/genimage: keep partition-type-uuid without "" for consistency In-Reply-To: <20220213225350.3466696-1-giulio.benetti@benettiengineering.com> References: <49133c66-0a53-7607-1c52-5e1ad9e8fc7b@benettiengineering.com> <20220213225350.3466696-1-giulio.benetti@benettiengineering.com> Message-ID: <20220213225350.3466696-6-giulio.benetti@benettiengineering.com> Note that rootfs doesn't need partition-type-uuid = L since L(rootfs) is the default value, so let's remove it. Signed-off-by: Giulio Benetti --- board/orangepi/orangepi-pc-plus/genimage.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/board/orangepi/orangepi-pc-plus/genimage.cfg b/board/orangepi/orangepi-pc-plus/genimage.cfg index 3812d785d5..2c68b28e10 100644 --- a/board/orangepi/orangepi-pc-plus/genimage.cfg +++ b/board/orangepi/orangepi-pc-plus/genimage.cfg @@ -28,7 +28,7 @@ image sdcard.img { } partition boot { - partition-type-uuid = "F" + partition-type-uuid = F bootable = "true" image = "boot.vfat" } @@ -36,7 +36,6 @@ image sdcard.img { # 'rootfs' will be used as the partition label, used # with root=PARTLABEL=rootfs kernel command line partition rootfs { - partition-type-uuid = "L" image = "rootfs.ext4" size = 512M } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 13 22:53:44 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 13 Feb 2022 23:53:44 +0100 Subject: [Buildroot] [PATCH v2 10/16] board/qemu/aarch64-sbsa/genimage: convert partition-type-uuid to single letter notation In-Reply-To: <20220213225350.3466696-1-giulio.benetti@benettiengineering.com> References: <49133c66-0a53-7607-1c52-5e1ad9e8fc7b@benettiengineering.com> <20220213225350.3466696-1-giulio.benetti@benettiengineering.com> Message-ID: <20220213225350.3466696-11-giulio.benetti@benettiengineering.com> Note that rootfs doesn't need partition-type-uuid = L since L(rootfs) is the default value. So let's remove it. Signed-off-by: Giulio Benetti --- board/qemu/aarch64-sbsa/genimage.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/board/qemu/aarch64-sbsa/genimage.cfg b/board/qemu/aarch64-sbsa/genimage.cfg index bdf8a89d75..8308b58789 100644 --- a/board/qemu/aarch64-sbsa/genimage.cfg +++ b/board/qemu/aarch64-sbsa/genimage.cfg @@ -19,13 +19,12 @@ image disk.img { partition boot { image = "efi-part.vfat" - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + partition-type-uuid = U offset = 32K bootable = true } partition root { - partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae image = "rootfs.ext2" } } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 13 22:53:46 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 13 Feb 2022 23:53:46 +0100 Subject: [Buildroot] [PATCH v2 12/16] board/radxa/rockpi-n10/genimage: convert partition-type-uuid to single letter notation In-Reply-To: <20220213225350.3466696-1-giulio.benetti@benettiengineering.com> References: <49133c66-0a53-7607-1c52-5e1ad9e8fc7b@benettiengineering.com> <20220213225350.3466696-1-giulio.benetti@benettiengineering.com> Message-ID: <20220213225350.3466696-13-giulio.benetti@benettiengineering.com> Note that rootfs doesn't need partition-type-uuid = L since L(rootfs) is the default value. So let's remove it. Signed-off-by: Giulio Benetti --- board/radxa/rockpi-n10/genimage.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/board/radxa/rockpi-n10/genimage.cfg b/board/radxa/rockpi-n10/genimage.cfg index 7f4b639bbc..cd0e3610c2 100644 --- a/board/radxa/rockpi-n10/genimage.cfg +++ b/board/radxa/rockpi-n10/genimage.cfg @@ -26,14 +26,13 @@ image sdcard.img { } partition boot { - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + partition-type-uuid = F bootable = "true" image = "boot.vfat" offset = 16M } partition rootfs { - partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae image = "rootfs.ext4" } } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 13 22:53:47 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 13 Feb 2022 23:53:47 +0100 Subject: [Buildroot] [PATCH v2 13/16] board/radxa/rockpi-n8/genimage: convert partition-type-uuid to single letter notation In-Reply-To: <20220213225350.3466696-1-giulio.benetti@benettiengineering.com> References: <49133c66-0a53-7607-1c52-5e1ad9e8fc7b@benettiengineering.com> <20220213225350.3466696-1-giulio.benetti@benettiengineering.com> Message-ID: <20220213225350.3466696-14-giulio.benetti@benettiengineering.com> Note that rootfs doesn't need partition-type-uuid = L since L(rootfs) is the default value. So let's remove it. Signed-off-by: Giulio Benetti --- board/radxa/rockpi-n8/genimage.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/radxa/rockpi-n8/genimage.cfg b/board/radxa/rockpi-n8/genimage.cfg index 909a646499..3fced4a5d8 100644 --- a/board/radxa/rockpi-n8/genimage.cfg +++ b/board/radxa/rockpi-n8/genimage.cfg @@ -26,14 +26,14 @@ image sdcard.img { } partition boot { - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + partition-type-uuid = F bootable = "true" image = "boot.vfat" offset = 16M } partition rootfs { - partition-type-uuid = 69dad710-2ce4-4e3c-b16c-21a1d49abed3 + partition-type-uuid = L image = "rootfs.ext4" } } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 13 22:53:40 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 13 Feb 2022 23:53:40 +0100 Subject: [Buildroot] [PATCH v2 06/16] board/orangepi/orangepi-r1/genimage: fix partition-type-uuid for boot partition and remove "" for consistency In-Reply-To: <20220213225350.3466696-1-giulio.benetti@benettiengineering.com> References: <49133c66-0a53-7607-1c52-5e1ad9e8fc7b@benettiengineering.com> <20220213225350.3466696-1-giulio.benetti@benettiengineering.com> Message-ID: <20220213225350.3466696-7-giulio.benetti@benettiengineering.com> Note that rootfs doesn't need partition-type-uuid = L since L(rootfs) is the default value. So let's remove it. Signed-off-by: Giulio Benetti --- board/orangepi/orangepi-r1/genimage.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/board/orangepi/orangepi-r1/genimage.cfg b/board/orangepi/orangepi-r1/genimage.cfg index e93e802bd9..da96e4c4b8 100644 --- a/board/orangepi/orangepi-r1/genimage.cfg +++ b/board/orangepi/orangepi-r1/genimage.cfg @@ -28,7 +28,7 @@ image sdcard.img { } partition boot { - partition-type-uuid = "U" + partition-type-uuid = F bootable = "true" image = "boot.vfat" } @@ -36,7 +36,6 @@ image sdcard.img { # 'rootfs' will be used as the partition label, used # with root=PARTLABEL=rootfs kernel command line partition rootfs { - partition-type-uuid = "L" image = "rootfs.ext4" size = 512M } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 13 22:53:41 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 13 Feb 2022 23:53:41 +0100 Subject: [Buildroot] [PATCH v2 07/16] board/orangepi/orangepi-zero-plus2/genimage: keep partition-type-uuid without "" for consistency In-Reply-To: <20220213225350.3466696-1-giulio.benetti@benettiengineering.com> References: <49133c66-0a53-7607-1c52-5e1ad9e8fc7b@benettiengineering.com> <20220213225350.3466696-1-giulio.benetti@benettiengineering.com> Message-ID: <20220213225350.3466696-8-giulio.benetti@benettiengineering.com> Note that rootfs doesn't need partition-type-uuid = L since L(rootfs) is the default value. So let's remove it. Signed-off-by: Giulio Benetti --- board/orangepi/orangepi-zero-plus2/genimage.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/board/orangepi/orangepi-zero-plus2/genimage.cfg b/board/orangepi/orangepi-zero-plus2/genimage.cfg index 5a7ee7707a..0a03384f30 100644 --- a/board/orangepi/orangepi-zero-plus2/genimage.cfg +++ b/board/orangepi/orangepi-zero-plus2/genimage.cfg @@ -26,7 +26,7 @@ image sdcard.img { } partition boot { - partition-type-uuid = "F" + partition-type-uuid = F bootable = "true" image = "boot.vfat" } @@ -34,7 +34,6 @@ image sdcard.img { # 'rootfs' will be used as the partition label, used # with root=PARTLABEL=rootfs kernel command line partition rootfs { - partition-type-uuid = "L" image = "rootfs.ext4" size = 256M } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 13 22:53:42 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 13 Feb 2022 23:53:42 +0100 Subject: [Buildroot] [PATCH v2 08/16] board/pc/genimage-efi: convert partition-type-uuid to single letter notation In-Reply-To: <20220213225350.3466696-1-giulio.benetti@benettiengineering.com> References: <49133c66-0a53-7607-1c52-5e1ad9e8fc7b@benettiengineering.com> <20220213225350.3466696-1-giulio.benetti@benettiengineering.com> Message-ID: <20220213225350.3466696-9-giulio.benetti@benettiengineering.com> Note that rootfs doesn't need partition-type-uuid = L since L(rootfs) is the default value. So let's remove it. Signed-off-by: Giulio Benetti --- board/pc/genimage-efi.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/board/pc/genimage-efi.cfg b/board/pc/genimage-efi.cfg index 035a077a78..68498772a1 100644 --- a/board/pc/genimage-efi.cfg +++ b/board/pc/genimage-efi.cfg @@ -19,13 +19,12 @@ image disk.img { partition boot { image = "efi-part.vfat" - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + partition-type-uuid = U offset = 32K bootable = true } partition root { - partition-type-uuid = 44479540-f297-41b2-9af7-d131d5f0458a partition-uuid = UUID_TMP image = "rootfs.ext2" } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 13 22:53:43 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 13 Feb 2022 23:53:43 +0100 Subject: [Buildroot] [PATCH v2 09/16] board/pine64/rockpro64/genimage: convert partition-type-uuid to single letter notation In-Reply-To: <20220213225350.3466696-1-giulio.benetti@benettiengineering.com> References: <49133c66-0a53-7607-1c52-5e1ad9e8fc7b@benettiengineering.com> <20220213225350.3466696-1-giulio.benetti@benettiengineering.com> Message-ID: <20220213225350.3466696-10-giulio.benetti@benettiengineering.com> Note that rootfs doesn't need partition-type-uuid = L since L(rootfs) is the default value. So let's remove it. Signed-off-by: Giulio Benetti --- board/pine64/rockpro64/genimage.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/board/pine64/rockpro64/genimage.cfg b/board/pine64/rockpro64/genimage.cfg index d3926f2df6..978a77de95 100644 --- a/board/pine64/rockpro64/genimage.cfg +++ b/board/pine64/rockpro64/genimage.cfg @@ -26,14 +26,13 @@ image sdcard.img { } partition boot { - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + partition-type-uuid = F bootable = "true" image = "boot.vfat" offset = 16M } partition rootfs { - partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae image = "rootfs.ext4" } } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 13 22:53:45 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 13 Feb 2022 23:53:45 +0100 Subject: [Buildroot] [PATCH v2 11/16] board/radxa/rockpi-n4/genimage: convert partition-type-uuid to single letter notation In-Reply-To: <20220213225350.3466696-1-giulio.benetti@benettiengineering.com> References: <49133c66-0a53-7607-1c52-5e1ad9e8fc7b@benettiengineering.com> <20220213225350.3466696-1-giulio.benetti@benettiengineering.com> Message-ID: <20220213225350.3466696-12-giulio.benetti@benettiengineering.com> Note that rootfs doesn't need partition-type-uuid = L since L(rootfs) is the default value. So let's remove it. Signed-off-by: Giulio Benetti --- board/radxa/rockpi-4/genimage.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/board/radxa/rockpi-4/genimage.cfg b/board/radxa/rockpi-4/genimage.cfg index 68cc4d61a8..07bee5bf81 100644 --- a/board/radxa/rockpi-4/genimage.cfg +++ b/board/radxa/rockpi-4/genimage.cfg @@ -26,14 +26,13 @@ image sdcard.img { } partition boot { - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + partition-type-uuid = F bootable = "true" image = "boot.vfat" offset = 16M } partition rootfs { - partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae image = "rootfs.ext4" } } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 13 22:54:21 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 13 Feb 2022 23:54:21 +0100 Subject: [Buildroot] [PATCH v2 14/16] board/sifive/hifive-unleashed/genimage_sdcard: remove partition-type-uuid since its default value is L(rootfs) In-Reply-To: <49133c66-0a53-7607-1c52-5e1ad9e8fc7b@benettiengineering.com> References: <49133c66-0a53-7607-1c52-5e1ad9e8fc7b@benettiengineering.com> Message-ID: <20220213225423.3466840-1-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- board/sifive/hifive-unleashed/genimage_sdcard.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/board/sifive/hifive-unleashed/genimage_sdcard.cfg b/board/sifive/hifive-unleashed/genimage_sdcard.cfg index e66f221d73..1e0c800153 100644 --- a/board/sifive/hifive-unleashed/genimage_sdcard.cfg +++ b/board/sifive/hifive-unleashed/genimage_sdcard.cfg @@ -17,7 +17,6 @@ image sdcard.img { partition rootfs { image = "rootfs.ext4" - partition-type-uuid = 0FC63DAF-8483-4772-8E79-3D69D8477DE4 bootable = true } } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 13 22:54:22 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 13 Feb 2022 23:54:22 +0100 Subject: [Buildroot] [PATCH v2 15/16] board/sifive/hifive-unleashed/genimage_sdcard: add comments to particular partition-type-uuid parameters In-Reply-To: <20220213225423.3466840-1-giulio.benetti@benettiengineering.com> References: <49133c66-0a53-7607-1c52-5e1ad9e8fc7b@benettiengineering.com> <20220213225423.3466840-1-giulio.benetti@benettiengineering.com> Message-ID: <20220213225423.3466840-2-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- board/sifive/hifive-unleashed/genimage_sdcard.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/board/sifive/hifive-unleashed/genimage_sdcard.cfg b/board/sifive/hifive-unleashed/genimage_sdcard.cfg index 1e0c800153..e5618fa4c1 100644 --- a/board/sifive/hifive-unleashed/genimage_sdcard.cfg +++ b/board/sifive/hifive-unleashed/genimage_sdcard.cfg @@ -6,12 +6,14 @@ image sdcard.img { partition u-boot-spl { image = "u-boot-spl.bin" offset = 17K + # ZSBL only loads from this type of partition type uuid partition-type-uuid = 5B193300-FC78-40CD-8002-E86C45580B47 } partition u-boot { image = "u-boot.itb" offset = 1041K + # U-Boot expects exactly this partition type uuid partition-type-uuid = 2E54B353-1271-4842-806F-E436D6AF6985 } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 13 22:54:23 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 13 Feb 2022 23:54:23 +0100 Subject: [Buildroot] [PATCH v2 16/16] board/sifive/hifive-unleashed/genimage_spi-nor: add comments to particular partition-type-uuid parameters In-Reply-To: <20220213225423.3466840-1-giulio.benetti@benettiengineering.com> References: <49133c66-0a53-7607-1c52-5e1ad9e8fc7b@benettiengineering.com> <20220213225423.3466840-1-giulio.benetti@benettiengineering.com> Message-ID: <20220213225423.3466840-3-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- board/sifive/hifive-unleashed/genimage_spi-nor.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/board/sifive/hifive-unleashed/genimage_spi-nor.cfg b/board/sifive/hifive-unleashed/genimage_spi-nor.cfg index 903e675a90..f5e8f188e3 100644 --- a/board/sifive/hifive-unleashed/genimage_spi-nor.cfg +++ b/board/sifive/hifive-unleashed/genimage_spi-nor.cfg @@ -8,12 +8,14 @@ image spi-nor.img { partition u-boot-spl { image = "u-boot-spl.bin" offset = 20K + # ZSBL only loads from this type of partition type uuid partition-type-uuid = 5B193300-FC78-40CD-8002-E86C45580B47 } partition u-boot { image = "u-boot.itb" offset = 1044K + # U-Boot expects exactly this partition type uuid partition-type-uuid = 2E54B353-1271-4842-806F-E436D6AF6985 } } -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 13 23:35:44 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 14 Feb 2022 00:35:44 +0100 Subject: [Buildroot] [PATCH] manual: board support: add instructions to test defconfig in the official docker In-Reply-To: References: <20220203235438.610277-1-giulio.benetti@benettiengineering.com> Message-ID: <80ba31da-8a8e-12ed-bded-025e47f5cced@benettiengineering.com> Hi Luca, Arnout, Thomas P., On 13/02/22 11:39, Arnout Vandecappelle wrote: > > > On 12/02/2022 23:56, Luca Ceresoli wrote: >> Hi Giulio, >> >> On 04/02/22 00:54, Giulio Benetti wrote: >>> Often new boards have not been tested with official docker so let's add >>> instructions to do it. >> >> Thank you, I think this is a very useful addition to the documentation! >> However I would suggest some changes for it to look more "professional". Always welcome! >>> Signed-off-by: Giulio Benetti >>> --- >>> docs/manual/adding-board-support.txt | 22 ++++++++++++++++++++++ >>> 1 file changed, 22 insertions(+) >>> >>> diff --git a/docs/manual/adding-board-support.txt b/docs/manual/adding-board-support.txt >>> index 33ed709535..f5fb3af371 100644 >>> --- a/docs/manual/adding-board-support.txt >>> +++ b/docs/manual/adding-board-support.txt >>> @@ -46,3 +46,25 @@ create a directory +board/+ and a subdirectory >>> +board//+. You can then store your patches >>> and configurations in these directories, and reference them from the main >>> Buildroot configuration. Refer to xref:customize[] for more details. >>> + >>> +Before submitting patches for new boards it would be better to test it >> >> "it would be better" -> "it is recommended". Ok >>> +by building it using .gitlab-ci.yml specified docker. For example at the >> >> I think this should be reworded in a simpler way: "by building it using >> the docker specified in .gitlab-ci.yml". Yes >> BTW as I am a docker newbie: is it common to say "the docker"? Or would >> "the docker container" be more correct? -- By comparison, I would never >> say "using the virtualbox" but rather "using the virtualbox machine". > > I would say "the container" since you can use it with any container manager > that follows the OCI spec. Ok >> >>> +time of this writing the docker is: >> >> Remove the ':' from this line, or you'll have multiple ':' per line, >> which looks awkward. >> >>> +$CI_REGISTRY/buildroot.org/buildroot/base:20220105.2314 >> >> Hm, this string is already old. Yes :-/ > Actually, this part of the documentation is already superseded since we now > have utils/docker-run that does everything. Oh, I've missed that, just checked and it eases life not few! I have a 120 columns command to start it that I copy and paste everytime. Because also, what I don't take care of here is the -v flag that allows you mount a host folder. >> There's no sane way to keep docs and >> .yml in sync. I wonder whether we should have in the manual a command >> line that always use the current string, such as: >> >> DOCKER_IMAGE=$(cat .gitlab-ci.yml | \ >> sed -n '/^image/s/^.*CI_REGISTRY/registry.gitlab.com/p') >> docker pull $DOCKER_IMAGE >> sudo docker run -it $DOCKER_IMAGE >> >> However I must admit this is not very readable in the docs... :( What >> about adding a simple script (utils/run-docker?) that does the trick and >> just mention that in the docs? utils/docker-run then. Now we know it exists :-) >>> +so: >> >> Add an empty line here, so that the output separates from the next line. Ok >>> +Pull the docker: >>> +-------------------- >>> + $ docker pull registry.gitlab.com/buildroot.org/buildroot/base:20220105.2314 >> >> Missing 'sudo'? > > Docker access is usually managed through the "docker" group rather than sudo. > > And if you use podman as docker replacement, it can even be done in an > unprivileged container. Not that I tried it, but I think so. > > Oh BTW, the pull is in fact not needed, both podman and docker pull > automatically when you start a container. That's the reason the container name > is so convoluted. All new thing I didn't know! >> >>> +-------------------- >> >> Add an empty line here. This has no effect on the output but makes >> source code more readable. >> >>> +Run the docker: >>> +-------------------- >>> + $ sudo docker run -it registry.gitlab.com/buildroot.org/buildroot/base:20220105.2314 /bin/bash >>> +-------------------- >> >> As above, add an empty line here. +1 >>> +Inside the docker hint: >>> +-------------------- >>> + $ git clone git://git.busybox.net/buildroot >>> + $ cd buildroot >>> + $ make +_defconfig+ >>> + $ make >>> +-------------------- >> >> As above, add an empty line here. +1 >>> +Wait until build finishes and eventually add host dependencies. >> >> If I understand what you mean here, it should be "and add host >> dependencies if needed" ("eventually" is not the english translation of >> italian "eventualmente"). "...and possibly add host dependencies", right? >> If my understanding is correct, I don't find >> this sentence very useful: a docker newbie perhaps doesn't know how to >> add a host dependency (and maybe not even how to understand that they >> are missing one). >> >> I would just remove this line, but if you think it is very important I'd >> clarify it, maybe with some examples. > > Yes, I think this is what triggered the addition of this documentation. If you > have e.g. libopenssl-dev installed on your build host, then you usually won't > notice in your test builds that a dependency on host-openssl is needed. So test > builds should be done in a minimal container. Yes, it was because of that. > Unfortunately, the buildroot/base container is not exactly minimal. It's > really what is meant to be used for running CI tests, not exactly what is needed > for build tests. Ideally, we'd have > > - an absolutely minimal container that can be used for build tests - ideally in > a couple of variants for different distros; There is a bunch of dockers like that(more or less) here: https://github.com/aduskett/buildroot-docker-devel I've also contributed to, and at that time Thomas P. in IRC asked why we didn't upstreamed it and I told I would have done like 2/3 years ago and I've never done it :-/ And also modifying autobuilder's script to pick random distro and build to avoid possible host issues. But it's a bunch of stuff to do. > - a container for CI; Do you mean the one we already have but more shrinked? > - a more complete container you could use for development, though I can't > immediately think of extra stuff you'd want in there Is it really worth it? I mean, I've never seen anybody in IRC(even if read few in it) or ML(same) that complain about "I can't have buildroot working because I miss host tools". But I've seen recently gitlab-ci results that took me like 15-16 hours to fix. Does Yocto have something like that? And if yes, does someone can give a feedback if he really uses it? >(but then, I wouldn't use a container for development). Me too, and who would use it? I think nobody, because I don't think a newbie is that skilled to use a docker too(or maybe yes), but my first try would be using it with my distro and probably same goes for other people. But here again, I use Terminator+Midnight Commander as my "IDE", so I won't be happy enough with it. Someone else uses real "IDE" and we can't add Eclipse or VSCode(I hope), so it will be something that is not enough for anybody, thus IMHO useless. ---------------- Going back to this patch: What I can do with this patch is to rewrite it pointing how to use utils/docker-run to check that at least configs/* and board/* patches work. Another solution to my patch is what Thomas P. pointed in IRC: "it is probably easier to ask people to use gitlab CI" But my worry is that lot of people actually fork from github and not from gitlab. Who would really do that(both docker and gitlab-CI solutions)? But also, who would really install docker(if they don't use it) to submit a patch for gitlab-CI build failures? I think that counting the ones who took care about their maintained board gives us an idea, very few. BUT for new boards, and I see not few of them adding in the last period. It could be a way to force them to give a proof of a successfull building with gitlab-CI pipeline log as Thomas P. proposed. So I would modify this patch with instructions to: - fork Buildroot in gitlab - trigger gitlab-CI pipeline for a single defconfig What do you all think? Best regards -- Giulio Benetti Benetti Engineering sas From giulio.benetti at benettiengineering.com Mon Feb 14 00:03:09 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 14 Feb 2022 01:03:09 +0100 Subject: [Buildroot] [PATCH] configs/roc_pc_rk3399_defconfig: expand rootfs size to 120M In-Reply-To: References: <20220202171035.1740791-1-giulio.benetti@benettiengineering.com> <20220202171035.1740791-2-giulio.benetti@benettiengineering.com> Message-ID: Hi Arnout, On 13/02/22 12:35, Arnout Vandecappelle wrote: > > > On 02/02/2022 18:10, Giulio Benetti wrote: >> Default 60M for rootfs are not enough and generate a build failure, so >> let's expand rootfs size to 120M. > > Did you find out _why_ 64M wasn't enough for just the kernel and busybox? Is > it because of all the stupid modules in the default arm64 defconfig? But most > other arm64 defconfigs don't seem to need this... It is because of modules(30M) and linux "Image", it's not compressed, so it's 25M. So only for Linux+modules => 55M, plus the few other stuff(Busybox+libc etc.)1M Also, nothing changed since the beginning, so I don't know how could this happened: # git log --oneline configs/roc_pc_rk3399_defconfig f51cbc33d9 configs/roc_pc_rk3399: fix U-Boot dependencies 80ae1aedcb configs/roc_rk3399_pc: new defconfig # git log --oneline roc-rk3399-pc/ 80ae1aedcb configs/roc_rk3399_pc: new defconfig U-Boot dependencies are host dependencies, so it doesn't impact. # git log --oneline fs/ext2: 5ece6be60b fs/ext2: fir (again) namespace for variables db7d786140 fs/ext2: fix namespace for variables 5631c38024 fs/ext2: pass a default string to filesystem label ... here board has been added So it doesn't seem a ext2 problem too. I can't understand how it could be building in the beginning. We have 2 solutions: - expand rootfs - use a compressed linux Image.gz(25M => 9M), but need target testing Honestly I don't think systems with SoCs like RK3399 have problems with 56M more, so I would go with expanding rootfs to 120M and if maintainer in Cc wants to shrink Linux and target testing it is welcome to send a patch. What do you think? Best regards -- Giulio Benetti Benetti Engineering sas >> >> Signed-off-by: Giulio Benetti >> --- >> configs/roc_pc_rk3399_defconfig | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/configs/roc_pc_rk3399_defconfig b/configs/roc_pc_rk3399_defconfig >> index dfbc5e4f47..ae7cf19a80 100644 >> --- a/configs/roc_pc_rk3399_defconfig >> +++ b/configs/roc_pc_rk3399_defconfig >> @@ -45,7 +45,7 @@ BR2_TARGET_GENERIC_HOSTNAME="roc-rk3399-pc" >> BR2_TARGET_GENERIC_ISSUE="Welcome to ROC-RK3399-PC!" >> BR2_TARGET_ROOTFS_EXT2=y >> BR2_TARGET_ROOTFS_EXT2_4=y >> -BR2_TARGET_ROOTFS_EXT2_SIZE="64M" >> +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" >> BR2_PACKAGE_HOST_DOSFSTOOLS=y >> BR2_PACKAGE_HOST_GENIMAGE=y >> BR2_PACKAGE_HOST_MTOOLS=y > > Unrelated by this patch, but the image doesn't have a FAT partition so > dosfstols and mtools aren't needed. > > Regards, > Arnout > From james.hilliard1 at gmail.com Mon Feb 14 01:11:29 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 13 Feb 2022 18:11:29 -0700 Subject: [Buildroot] [PATCH v6 6/8] package/qt5/qt5webengine-chromium: new package In-Reply-To: <20220213165001.GA38097@scaer> References: <20220205201837.3324085-1-james.hilliard1@gmail.com> <20220205201837.3324085-6-james.hilliard1@gmail.com> <20220213165001.GA38097@scaer> Message-ID: On Sun, Feb 13, 2022 at 9:50 AM Yann E. MORIN wrote: > > James, All, > > On 2022-02-05 13:18 -0700, James Hilliard spake thusly: > > 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. > > > > Signed-off-by: James Hilliard > > --- > > package/qt5/Config.in | 1 + > > .../0001-Add-python3-build-support.patch | 1858 +++++++++++++++++ > > This is a very big patch... > > The commit you are using here, 0ad2814370799a2161057d92231fe3ee00e2fe98, > is on the '87-based' branch, which is supposedly not a recent branch, > even if the commit itself is not so old (a bit over two months). > > However, there are more recent branches that already have python3 > support, starting from '90-based' onward. > > Why can't we use those branches, instead of carrying such a beast of a > patch? I'm using the commit that matches v5.15.8-lts, I think others aren't compatible: https://invent.kde.org/qt/qt/qtwebengine/-/tree/v5.15.8-lts/src > > 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 Feb 14 04:19:25 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 13 Feb 2022 21:19:25 -0700 Subject: [Buildroot] [PATCH v7 1/5] package/qt5/qt5base: enable ccache via configure option Message-ID: <20220214041929.1916468-1-james.hilliard1@gmail.com> This should be cleaner than editing mkspecs/common/g++-base.conf. This should be more reliable with qt5webengine gn build system. Signed-off-by: James Hilliard --- Changes v6 -> v7: - remove QT5BASE_CONFIGURE_HOSTCC variable --- package/qt5/qt5base/qt5base.mk | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index ef38d03253..cce92db81b 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -297,10 +297,9 @@ endef endif # This allows to use ccache when available -define QT5BASE_CONFIGURE_HOSTCC - $(SED) 's,^QMAKE_CC\s*=.*,QMAKE_CC = $(HOSTCC),' $(@D)/mkspecs/common/g++-base.conf - $(SED) 's,^QMAKE_CXX\s*=.*,QMAKE_CXX = $(HOSTCXX),' $(@D)/mkspecs/common/g++-base.conf -endef +ifeq ($(BR2_CCACHE),y) +QT5BASE_CONFIGURE_OPTS += -ccache +endif # Must be last so can override all options set by Buildroot QT5BASE_CONFIGURE_OPTS += $(call qstrip,$(BR2_PACKAGE_QT5BASE_CUSTOM_CONF_OPTS)) @@ -316,7 +315,6 @@ define QT5BASE_CONFIGURE_CMDS touch $(QT5BASE_ARCH_CONFIG_FILE) $(QT5BASE_CONFIGURE_ARCH_CONFIG_LIBATOMIC) $(QT5BASE_CONFIGURE_ARCH_CONFIG_LIBEXECINFO) - $(QT5BASE_CONFIGURE_HOSTCC) (cd $(@D); \ $(TARGET_MAKE_ENV) \ PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ -- 2.25.1 From james.hilliard1 at gmail.com Mon Feb 14 04:19:26 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 13 Feb 2022 21:19:26 -0700 Subject: [Buildroot] [PATCH v7 2/5] package/qt5/qt5webengine-chromium-catapult: new package In-Reply-To: <20220214041929.1916468-1-james.hilliard1@gmail.com> References: <20220214041929.1916468-1-james.hilliard1@gmail.com> Message-ID: <20220214041929.1916468-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 --- 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 Feb 14 04:19:28 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 13 Feb 2022 21:19:28 -0700 Subject: [Buildroot] [PATCH v7 4/5] package/qt5/qt5base: disable broken qmake sysrootify In-Reply-To: <20220214041929.1916468-1-james.hilliard1@gmail.com> References: <20220214041929.1916468-1-james.hilliard1@gmail.com> Message-ID: <20220214041929.1916468-4-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. Improves pkg-config target/host separation. Signed-off-by: James Hilliard --- Changes v5 -> v6: - rebase/rework with qt5webengine bump 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/qt5/qt5base/qt.conf.in | 21 ++++++++++++++++++--- package/qt5/qt5base/qt5base.mk | 5 ++++- 2 files changed, 22 insertions(+), 4 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 cce92db81b..1ef70eb7f6 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -323,12 +323,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)" \ @@ -337,6 +340,6 @@ define QT5BASE_CONFIGURE_CMDS ) endef -QT5BASE_POST_INSTALL_STAGING_HOOKS += QT5_INSTALL_QT_CONF +QT5BASE_PRE_INSTALL_STAGING_HOOKS += QT5_INSTALL_QT_CONF $(eval $(qmake-package)) -- 2.25.1 From james.hilliard1 at gmail.com Mon Feb 14 04:19:29 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 13 Feb 2022 21:19:29 -0700 Subject: [Buildroot] [PATCH v7 5/5] package/qt5/qt5webengine: bump to version 5.15.8 In-Reply-To: <20220214041929.1916468-1-james.hilliard1@gmail.com> References: <20220214041929.1916468-1-james.hilliard1@gmail.com> Message-ID: <20220214041929.1916468-5-james.hilliard1@gmail.com> We need to use the separate package for the chromium submodule which has python3 support patches. We also need to apply a patch to qt5webengine to allow building with python3. Drop a patch which is now upstream. 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. Switch libraries to system libraries instead of bundled when possible. Migrate unsupported WEBENGINE_CONFIG to new config flag option. Override feature detection using config override flags to ensure we get the expected features enabled/disabled as autodetection logic may otherwise disable features without throwing build errors. Signed-off-by: James Hilliard --- Changes v5 -> v6: - switch to python3 - fix up config flags and rebase Changes v3 -> v4: - linker fixes Changes v2 -> v3: - add kconfig entries --- package/qt5/qt5.mk | 1 - .../0002-Add-python3-build-support.patch | 168 +++ ...m-breakpad-fix-build-with-glibc-2.34.patch | 76 -- package/qt5/qt5webengine/Config.in | 13 + .../qt5/qt5webengine/host-python-wrapper.in | 3 + package/qt5/qt5webengine/qt5webengine.hash | 1001 +---------------- package/qt5/qt5webengine/qt5webengine.mk | 157 ++- 7 files changed, 322 insertions(+), 1097 deletions(-) create mode 100644 package/qt5/qt5webengine/0002-Add-python3-build-support.patch delete mode 100644 package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch create mode 100644 package/qt5/qt5webengine/host-python-wrapper.in diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk index 656e3067dc..0706c3548d 100644 --- a/package/qt5/qt5.mk +++ b/package/qt5/qt5.mk @@ -6,7 +6,6 @@ QT5_VERSION_MAJOR = 5.15 QT5_VERSION = $(QT5_VERSION_MAJOR).8 -QT5_SOURCE_TARBALL_PREFIX = everywhere-src QT5_SITE = https://invent.kde.org/qt/qt include $(sort $(wildcard package/qt5/*/*.mk)) diff --git a/package/qt5/qt5webengine/0002-Add-python3-build-support.patch b/package/qt5/qt5webengine/0002-Add-python3-build-support.patch new file mode 100644 index 0000000000..18fc1c1de0 --- /dev/null +++ b/package/qt5/qt5webengine/0002-Add-python3-build-support.patch @@ -0,0 +1,168 @@ +From 1e299a6c9eeb08555208b76623e453d8ab96b6e3 Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Fri, 4 Feb 2022 16:16:35 -0700 +Subject: [PATCH] Add python3 build support + +Adapted from: +https://github.com/archlinux/svntogit-packages/blob/6edf5f1aaea952d046aff89a2e0175258fe77361/trunk/qt5-webengine-python3.patch + +Signed-off-by: James Hilliard +--- + configure.pri | 13 ++++++------- + mkspecs/features/functions.prf | 6 +++--- + src/buildtools/config/support.pri | 10 +++++----- + src/buildtools/configure.json | 18 +++++++++--------- + 4 files changed, 23 insertions(+), 24 deletions(-) + +diff --git a/configure.pri b/configure.pri +index e072961f..6fec7b20 100644 +--- a/configure.pri ++++ b/configure.pri +@@ -13,8 +13,7 @@ defineTest(isPythonVersionSupported) { + python_version = $$split(python_version, ',') + python_major_version = $$first(python_version) + greaterThan(python_major_version, 2) { +- qtLog("Python version 3 is not supported by Chromium.") +- return(false) ++ return(true) + } + python_minor_version = $$member(python_version, 1) + python_patch_version = $$member(python_version, 2) +@@ -52,10 +51,10 @@ defineTest(qtConfReport_jumboBuild) { + qtConfReportPadded($${1}, $$mergeLimit) + } + +-defineTest(qtConfTest_detectPython2) { +- python = $$qtConfFindInPath("python2$$EXE_SUFFIX") ++defineTest(qtConfTest_detectPython) { ++ python = $$qtConfFindInPath("python$$EXE_SUFFIX") + isEmpty(python) { +- qtLog("'python2$$EXE_SUFFIX' not found in PATH. Checking for 'python$$EXE_SUFFIX'.") ++ qtLog("'python$$EXE_SUFFIX' not found in PATH. Checking for 'python$$EXE_SUFFIX'.") + python = $$qtConfFindInPath("python$$EXE_SUFFIX") + } + isEmpty(python) { +@@ -63,11 +62,11 @@ defineTest(qtConfTest_detectPython2) { + return(false) + } + !isPythonVersionSupported($$python) { +- qtLog("A suitable Python 2 executable could not be located.") ++ qtLog("A suitable Python executable could not be located.") + return(false) + } + +- # Make tests.python2.location available in configure.json. ++ # Make tests.python.location available in configure.json. + $${1}.location = $$clean_path($$python) + export($${1}.location) + $${1}.cache += location +diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf +index 2750d707..9fda13d0 100644 +--- a/mkspecs/features/functions.prf ++++ b/mkspecs/features/functions.prf +@@ -39,11 +39,11 @@ defineReplace(which) { + + # Returns the unquoted path to the python executable. + defineReplace(pythonPath) { +- isEmpty(QMAKE_PYTHON2) { ++ isEmpty(QMAKE_PYTHON) { + # Fallback for building QtWebEngine with Qt < 5.8 +- QMAKE_PYTHON2 = python ++ QMAKE_PYTHON = python + } +- return($$QMAKE_PYTHON2) ++ return($$QMAKE_PYTHON) + } + + # Returns the python executable for use with shell / make targets. +diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri +index e7f869a1..1bf2c5d7 100644 +--- a/src/buildtools/config/support.pri ++++ b/src/buildtools/config/support.pri +@@ -21,7 +21,7 @@ defineReplace(qtwebengine_checkWebEngineCoreError) { + !qtwebengine_checkForGperf(QtWebEngine):return(false) + !qtwebengine_checkForBison(QtWebEngine):return(false) + !qtwebengine_checkForFlex(QtWebEngine):return(false) +- !qtwebengine_checkForPython2(QtWebEngine):return(false) ++ !qtwebengine_checkForPython(QtWebEngine):return(false) + !qtwebengine_checkForNodejs(QtWebEngine):return(false) + !qtwebengine_checkForSanitizer(QtWebEngine):return(false) + linux:!qtwebengine_checkForPkgCfg(QtWebEngine):return(false) +@@ -51,7 +51,7 @@ defineReplace(qtwebengine_checkPdfError) { + !qtwebengine_checkForGperf(QtPdf):return(false) + !qtwebengine_checkForBison(QtPdf):return(false) + !qtwebengine_checkForFlex(QtPdf):return(false) +- !qtwebengine_checkForPython2(QtPdf):return(false) ++ !qtwebengine_checkForPython(QtPdf):return(false) + !qtwebengine_checkForSanitizer(QtPdf):return(false) + linux:!qtwebengine_checkForPkgCfg(QtPdf):return(false) + linux:!qtwebengine_checkForHostPkgCfg(QtPdf):return(false) +@@ -143,10 +143,10 @@ defineTest(qtwebengine_checkForFlex) { + return(true) + } + +-defineTest(qtwebengine_checkForPython2) { ++defineTest(qtwebengine_checkForPython) { + module = $$1 +- !qtConfig(webengine-python2) { +- qtwebengine_skipBuild("Python version 2 (2.7.5 or later) is required to build $${module}.") ++ !qtConfig(webengine-python) { ++ qtwebengine_skipBuild("Python is required to build $${module}.") + return(false) + } + return(true) +diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json +index 88d1790c..032aa665 100644 +--- a/src/buildtools/configure.json ++++ b/src/buildtools/configure.json +@@ -295,9 +295,9 @@ + "label": "system ninja", + "type": "detectNinja" + }, +- "webengine-python2": { +- "label": "python2", +- "type": "detectPython2", ++ "webengine-python": { ++ "label": "python", ++ "type": "detectPython", + "log": "location" + }, + "webengine-winversion": { +@@ -374,7 +374,7 @@ + && features.webengine-gperf + && features.webengine-bison + && features.webengine-flex +- && features.webengine-python2 ++ && features.webengine-python + && features.webengine-nodejs + && (!config.sanitizer || features.webengine-sanitizer) + && (!config.linux || features.pkg-config) +@@ -400,7 +400,7 @@ + && features.webengine-gperf + && features.webengine-bison + && features.webengine-flex +- && features.webengine-python2 ++ && features.webengine-python + && (!config.sanitizer || features.webengine-sanitizer) + && (!config.linux || features.pkg-config) + && (!config.linux || features.webengine-host-pkg-config) +@@ -423,12 +423,12 @@ + "autoDetect": "features.private_tests", + "output": [ "privateFeature" ] + }, +- "webengine-python2": { +- "label": "python2", +- "condition": "tests.webengine-python2", ++ "webengine-python": { ++ "label": "python", ++ "condition": "tests.webengine-python", + "output": [ + "privateFeature", +- { "type": "varAssign", "name": "QMAKE_PYTHON2", "value": "tests.webengine-python2.location" } ++ { "type": "varAssign", "name": "QMAKE_PYTHON", "value": "tests.webengine-python.location" } + ] + }, + "webengine-gperf": { +-- +2.25.1 + 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 deleted file mode 100644 index 44a6424c7d..0000000000 --- a/package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch +++ /dev/null @@ -1,76 +0,0 @@ -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/Config.in b/package/qt5/qt5webengine/Config.in index 5d537cdf84..b5ba8c4649 100644 --- a/package/qt5/qt5webengine/Config.in +++ b/package/qt5/qt5webengine/Config.in @@ -32,24 +32,35 @@ 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). # 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_LCMS2 + 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_MINIZIP select BR2_PACKAGE_OPUS + select BR2_PACKAGE_RE2 + select BR2_PACKAGE_SNAPPY 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 @@ -57,9 +68,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/host-python-wrapper.in b/package/qt5/qt5webengine/host-python-wrapper.in new file mode 100644 index 0000000000..3400be1d06 --- /dev/null +++ b/package/qt5/qt5webengine/host-python-wrapper.in @@ -0,0 +1,3 @@ +#!/bin/sh +LD_LIBRARY_PATH="@HOST_DIR@/lib" \ +exec @HOST_DIR@/bin/python "$@" 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 cebd6d0fe2..68eb2e8a1c 100644 --- a/package/qt5/qt5webengine/qt5webengine.mk +++ b/package/qt5/qt5webengine/qt5webengine.mk @@ -4,42 +4,147 @@ # ################################################################################ -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 \ - host-pkgconf host-python +QT5WEBENGINE_VERSION = $(QT5_VERSION) +QT5WEBENGINE_SITE = $(QT5_SITE)/qtwebengine/-/archive/v$(QT5WEBENGINE_VERSION)-lts +QT5WEBENGINE_SOURCE = qtwebengine-v$(QT5WEBENGINE_VERSION)-lts.tar.bz2 +QT5WEBENGINE_DEPENDENCIES = qt5declarative qt5webchannel +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 + +# command line argument separator +QT5WEBENGINE_CONF_OPTS = -- 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 += \ + xlib_libXcomposite \ + xlib_libXcursor \ + xlib_libXi \ + xlib_libxkbfile \ + xlib_libXrandr \ + xlib_libXScrnSaver \ + xlib_libXtst +QT5WEBENGINE_CONF_OPTS += \ + -feature-webengine-ozone \ + -feature-webengine-system-libdrm \ + -feature-webengine-system-x11 \ + -feature-webengine-system-xkbfile \ + -feature-webengine-system-xcomposite \ + -feature-webengine-system-xcursor \ + -feature-webengine-system-xi \ + -feature-webengine-system-xproto-gl \ + -feature-webengine-system-xtst +else +QT5WEBENGINE_CONF_OPTS += \ + -no-feature-webengine-ozone \ + -no-feature-webengine-system-libdrm \ + -no-feature-webengine-system-x11 \ + -no-feature-webengine-system-xkbfile \ + -no-feature-webengine-system-xcomposite \ + -no-feature-webengine-system-xcursor \ + -no-feature-webengine-system-xi \ + -no-feature-webengine-system-xproto-gl \ + -no-feature-webengine-system-xtst endif -QT5WEBENGINE_DEPENDENCIES += host-libpng host-libnss libnss +QT5WEBENGINE_DEPENDENCIES += \ + host-bison \ + host-flex \ + host-freetype \ + host-gperf \ + host-harfbuzz \ + host-icu \ + host-ninja \ + host-nodejs \ + host-pkgconf \ + host-libjpeg \ + host-libnss \ + host-libpng \ + host-python3 \ + host-webp \ + host-zlib \ + ffmpeg \ + freetype \ + jpeg \ + lcms2 \ + libevent \ + libnss \ + libvpx \ + libxml2 \ + libxslt \ + re2 \ + snappy \ + webp -QT5WEBENGINE_CONF_OPTS += WEBENGINE_CONFIG+=use_system_ffmpeg +QT5WEBENGINE_CONF_OPTS += \ + -webengine-embedded-build \ + -webengine-ffmpeg \ + -webengine-icu \ + -webengine-opus \ + -webengine-webchannel \ + -webengine-webp \ + -feature-build-qtwebengine-core \ + -feature-webengine-core-support \ + -feature-webengine-system-dbus \ + -feature-webengine-system-fontconfig \ + -feature-webengine-system-freetype \ + -feature-webengine-system-glib \ + -feature-webengine-system-glibc \ + -feature-webengine-system-harfbuzz \ + -feature-webengine-system-jpeg \ + -feature-webengine-system-khr \ + -feature-webengine-system-lcms2 \ + -feature-webengine-system-libevent \ + -feature-webengine-system-libvpx \ + -feature-webengine-system-libxml2 \ + -feature-webengine-system-ninja \ + -feature-webengine-system-nss \ + -feature-webengine-system-png \ + -feature-webengine-system-re2 \ + -feature-webengine-system-snappy \ + -feature-webengine-system-zlib + +QT5WEBENGINE_CONF_OPTS += \ + -no-webengine-geolocation \ + -no-webengine-kerberos \ + -no-webengine-pepper-plugins \ + -no-webengine-printing-and-pdf \ + -no-webengine-spellchecker \ + -no-webengine-webrtc \ + -no-webengine-webrtc-pipewire \ + -no-feature-webengine-developer-build \ + -no-feature-webengine-full-debug-info \ + -no-feature-webengine-native-spellchecker \ + -no-feature-webengine-noexecstack \ + -no-feature-webengine-system-minizip \ + -no-feature-webengine-system-gn ifeq ($(BR2_PACKAGE_QT5WEBENGINE_PROPRIETARY_CODECS),y) -QT5WEBENGINE_CONF_OPTS += WEBENGINE_CONFIG+=use_proprietary_codecs +QT5WEBENGINE_CONF_OPTS += -webengine-proprietary-codecs +else +QT5WEBENGINE_CONF_OPTS += -no-webengine-proprietary-codecs endif ifeq ($(BR2_PACKAGE_QT5WEBENGINE_ALSA),y) QT5WEBENGINE_DEPENDENCIES += alsa-lib +QT5WEBENGINE_CONF_OPTS += -webengine-alsa else -QT5WEBENGINE_CONF_OPTS += QT_CONFIG-=alsa +QT5WEBENGINE_CONF_OPTS += -no-webengine-alsa +endif + +ifeq ($(BR2_PACKAGE_PULSEAUDIO),y) +QT5WEBENGINE_DEPENDENCIES += pulseaudio +QT5WEBENGINE_CONF_OPTS += -webengine-pulseaudio +else +QT5WEBENGINE_CONF_OPTS += -no-webengine-pulseaudio endif # QtWebengine's build system uses python, but only supports python2. We work @@ -47,21 +152,31 @@ endif # symlink. QT5WEBENGINE_ENV = \ PATH=$(@D)/host-bin:$(BR_PATH) \ - PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig -define QT5WEBENGINE_PYTHON2_SYMLINK + PKG_CONFIG_SYSROOT_DIR="/" +define QT5WEBENGINE_CREATE_HOST_PYTHON_WRAPPER mkdir -p $(@D)/host-bin - ln -sf $(HOST_DIR)/bin/python2 $(@D)/host-bin/python + sed s%@HOST_DIR@%$(HOST_DIR)%g $(QT5WEBENGINE_PKGDIR)/host-python-wrapper.in > $(@D)/host-bin/python + chmod +x $(@D)/host-bin/python endef -QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_PYTHON2_SYMLINK +QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_CREATE_HOST_PYTHON_WRAPPER 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 + mkdir -p $(@D)/host-bin 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 wbx at openadk.org Mon Feb 14 05:14:07 2022 From: wbx at openadk.org (Waldemar Brodkorb) Date: Mon, 14 Feb 2022 06:14:07 +0100 Subject: [Buildroot] [PATCHv2 2/3] package/binutils: remove 2.35.2 Message-ID: Signed-off-by: Waldemar Brodkorb --- v1->v2: remove the patch folder, recognized by Thomas P. --- package/binutils/2.35.2/0001-sh-conf.patch | 48 -- .../0002-poison-system-directories.patch | 306 ----------- ...ith-plt-link-failure-for-local-calls.patch | 59 --- ...elocation-R_OR1K_GOT_AHI16-for-gotha.patch | 256 --------- ...K_GOT16-overflow-failures-in-presenc.patch | 61 --- ...ge-plt_relocs-when-generating-plt-en.patch | 500 ------------------ ...or1k-fix-building-with-gcc-version-5.patch | 50 -- ...tive-relocation-against-dynamic-on-P.patch | 59 --- ...K_GOT16-signed-overflow-by-using-spe.patch | 75 --- ...OT32-relocations-against-ABS-symbols.patch | 46 -- package/binutils/Config.in.host | 8 - package/binutils/binutils.hash | 1 - 12 files changed, 1469 deletions(-) delete mode 100644 package/binutils/2.35.2/0001-sh-conf.patch delete mode 100644 package/binutils/2.35.2/0002-poison-system-directories.patch delete mode 100644 package/binutils/2.35.2/0003-or1k-Fix-issue-with-plt-link-failure-for-local-calls.patch delete mode 100644 package/binutils/2.35.2/0004-or1k-Implement-relocation-R_OR1K_GOT_AHI16-for-gotha.patch delete mode 100644 package/binutils/2.35.2/0005-or1k-Avoid-R_OR1K_GOT16-overflow-failures-in-presenc.patch delete mode 100644 package/binutils/2.35.2/0006-or1k-Support-large-plt_relocs-when-generating-plt-en.patch delete mode 100644 package/binutils/2.35.2/0007-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch delete mode 100644 package/binutils/2.35.2/0008-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch delete mode 100644 package/binutils/2.35.2/0009-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch delete mode 100644 package/binutils/2.35.2/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch diff --git a/package/binutils/2.35.2/0001-sh-conf.patch b/package/binutils/2.35.2/0001-sh-conf.patch deleted file mode 100644 index 44d5f4e89a..0000000000 --- a/package/binutils/2.35.2/0001-sh-conf.patch +++ /dev/null @@ -1,48 +0,0 @@ -From ae50e875f4292c99b859cded1d036e401b6ddaec Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:38:13 +0100 -Subject: [PATCH] sh-conf - -Likewise, binutils has no idea about any of these new targets either, so we -fix that up too.. now we're able to actually build a real toolchain for -sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more -inept targets than that one, really. Go look, I promise). - -[Romain: rebase on top of 2.32] -Signed-off-by: Romain Naour -[Thomas: rebase on top of 2.29, in which sh64 support was removed.] -Signed-off-by: Thomas Petazzoni ---- - configure | 2 +- - configure.ac | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure b/configure -index 54d0339ab9e..c2f51ffcebb 100755 ---- a/configure -+++ b/configure -@@ -3937,7 +3937,7 @@ case "${target}" in - nvptx*-*-*) - noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" - ;; -- sh-*-*) -+ sh*-*-*) - case "${target}" in - sh*-*-elf) - ;; -diff --git a/configure.ac b/configure.ac -index a910c4fd6ba..a93d93c81c3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1178,7 +1178,7 @@ case "${target}" in - nvptx*-*-*) - noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" - ;; -- sh-*-*) -+ sh*-*-*) - case "${target}" in - sh*-*-elf) - ;; --- -2.25.4 - diff --git a/package/binutils/2.35.2/0002-poison-system-directories.patch b/package/binutils/2.35.2/0002-poison-system-directories.patch deleted file mode 100644 index b77a5e1a66..0000000000 --- a/package/binutils/2.35.2/0002-poison-system-directories.patch +++ /dev/null @@ -1,306 +0,0 @@ -From db405d1bc5607892ddb25433354b46d78e23b343 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:45:38 +0100 -Subject: [PATCH] poison-system-directories - -Patch adapted to binutils 2.23.2 and extended to use -BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni. - -[Romain: rebase on top of 2.33.1] -Signed-off-by: Romain Naour -[Gustavo: adapt to binutils 2.25] -Signed-off-by: Thomas Petazzoni -Signed-off-by: Gustavo Zacarias - -Upstream-Status: Inappropriate [distribution: codesourcery] - -Patch originally created by Mark Hatle, forward-ported to -binutils 2.21 by Scott Garman. - -purpose: warn for uses of system directories when cross linking - -Code Merged from Sourcery G++ binutils 2.19 - 4.4-277 - -2008-07-02 Joseph Myers - - ld/ - * ld.h (args_type): Add error_poison_system_directories. - * ld.texinfo (--error-poison-system-directories): Document. - * ldfile.c (ldfile_add_library_path): Check - command_line.error_poison_system_directories. - * ldmain.c (main): Initialize - command_line.error_poison_system_directories. - * lexsup.c (enum option_values): Add - OPTION_ERROR_POISON_SYSTEM_DIRECTORIES. - (ld_options): Add --error-poison-system-directories. - (parse_args): Handle new option. - -2007-06-13 Joseph Myers - - ld/ - * config.in: Regenerate. - * ld.h (args_type): Add poison_system_directories. - * ld.texinfo (--no-poison-system-directories): Document. - * ldfile.c (ldfile_add_library_path): Check - command_line.poison_system_directories. - * ldmain.c (main): Initialize - command_line.poison_system_directories. - * lexsup.c (enum option_values): Add - OPTION_NO_POISON_SYSTEM_DIRECTORIES. - (ld_options): Add --no-poison-system-directories. - (parse_args): Handle new option. - -2007-04-20 Joseph Myers - - Merge from Sourcery G++ binutils 2.17: - - 2007-03-20 Joseph Myers - Based on patch by Mark Hatle . - ld/ - * configure.ac (--enable-poison-system-directories): New option. - * configure, config.in: Regenerate. - * ldfile.c (ldfile_add_library_path): If - ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib, - /usr/lib, /usr/local/lib or /usr/X11R6/lib. - -Signed-off-by: Mark Hatle -Signed-off-by: Scott Garman ---- - ld/config.in | 3 +++ - ld/configure | 14 ++++++++++++++ - ld/configure.ac | 10 ++++++++++ - ld/ld.h | 8 ++++++++ - ld/ld.texi | 12 ++++++++++++ - ld/ldfile.c | 17 +++++++++++++++++ - ld/ldlex.h | 2 ++ - ld/ldmain.c | 2 ++ - ld/lexsup.c | 21 +++++++++++++++++++++ - 9 files changed, 89 insertions(+) - -diff --git a/ld/config.in b/ld/config.in -index 2f4e5ea33e3..8fbb29682b2 100644 ---- a/ld/config.in -+++ b/ld/config.in -@@ -40,6 +40,9 @@ - language is requested. */ - #undef ENABLE_NLS - -+/* Define to warn for use of native system library directories */ -+#undef ENABLE_POISON_SYSTEM_DIRECTORIES -+ - /* Additional extension a shared object might have. */ - #undef EXTRA_SHLIB_EXTENSION - -diff --git a/ld/configure b/ld/configure -index 6be5280621f..d62e7b12382 100755 ---- a/ld/configure -+++ b/ld/configure -@@ -826,6 +826,7 @@ with_lib_path - enable_targets - enable_64_bit_bfd - with_sysroot -+enable_poison_system_directories - enable_gold - enable_got - enable_compressed_debug_sections -@@ -1493,6 +1494,8 @@ Optional Features: - --disable-largefile omit support for large files - --enable-targets alternative target configurations - --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) -+ --enable-poison-system-directories -+ warn for use of native system library directories - --enable-gold[=ARG] build gold [ARG={default,yes,no}] - --enable-got= GOT handling scheme (target, single, negative, - multigot) -@@ -15814,7 +15817,18 @@ else - fi - - -+# Check whether --enable-poison-system-directories was given. -+if test "${enable_poison_system_directories+set}" = set; then : -+ enableval=$enable_poison_system_directories; -+else -+ enable_poison_system_directories=no -+fi -+ -+if test "x${enable_poison_system_directories}" = "xyes"; then - -+$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h -+ -+fi - - # Check whether --enable-got was given. - if test "${enable_got+set}" = set; then : -diff --git a/ld/configure.ac b/ld/configure.ac -index 172398ff847..b77f8510ca6 100644 ---- a/ld/configure.ac -+++ b/ld/configure.ac -@@ -94,6 +94,16 @@ AC_SUBST(use_sysroot) - AC_SUBST(TARGET_SYSTEM_ROOT) - AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) - -+AC_ARG_ENABLE([poison-system-directories], -+ AS_HELP_STRING([--enable-poison-system-directories], -+ [warn for use of native system library directories]),, -+ [enable_poison_system_directories=no]) -+if test "x${enable_poison_system_directories}" = "xyes"; then -+ AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES], -+ [1], -+ [Define to warn for use of native system library directories]) -+fi -+ - dnl Use --enable-gold to decide if this linker should be the default. - dnl "install_as_default" is set to false if gold is the default linker. - dnl "installed_linker" is the installed BFD linker name. -diff --git a/ld/ld.h b/ld/ld.h -index 1790dc81a66..73f832eb169 100644 ---- a/ld/ld.h -+++ b/ld/ld.h -@@ -166,6 +166,14 @@ typedef struct - in the linker script. */ - bfd_boolean force_group_allocation; - -+ /* If TRUE (the default) warn for uses of system directories when -+ cross linking. */ -+ bfd_boolean poison_system_directories; -+ -+ /* If TRUE (default FALSE) give an error for uses of system -+ directories when cross linking instead of a warning. */ -+ bfd_boolean error_poison_system_directories; -+ - /* Big or little endian as set on command line. */ - enum endian_enum endian; - -diff --git a/ld/ld.texi b/ld/ld.texi -index 2a93e9456ac..3eeb70607fd 100644 ---- a/ld/ld.texi -+++ b/ld/ld.texi -@@ -2655,6 +2655,18 @@ string identifying the original linked file does not change. - - Passing @code{none} for @var{style} disables the setting from any - @code{--build-id} options earlier on the command line. -+ -+ at kindex --no-poison-system-directories -+ at item --no-poison-system-directories -+Do not warn for @option{-L} options using system directories such as -+ at file{/usr/lib} when cross linking. This option is intended for use -+in chroot environments when such directories contain the correct -+libraries for the target system rather than the host. -+ -+ at kindex --error-poison-system-directories -+ at item --error-poison-system-directories -+Give an error instead of a warning for @option{-L} options using -+system directories when cross linking. - @end table - - @c man end -diff --git a/ld/ldfile.c b/ld/ldfile.c -index e39170b5d94..fadc248a140 100644 ---- a/ld/ldfile.c -+++ b/ld/ldfile.c -@@ -117,6 +117,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline) - new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); - else - new_dirs->name = xstrdup (name); -+ -+#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES -+ if (command_line.poison_system_directories -+ && ((!strncmp (name, "/lib", 4)) -+ || (!strncmp (name, "/usr/lib", 8)) -+ || (!strncmp (name, "/usr/local/lib", 14)) -+ || (!strncmp (name, "/usr/X11R6/lib", 14)))) -+ { -+ if (command_line.error_poison_system_directories) -+ einfo (_("%X%P: error: library search path \"%s\" is unsafe for " -+ "cross-compilation\n"), name); -+ else -+ einfo (_("%P: warning: library search path \"%s\" is unsafe for " -+ "cross-compilation\n"), name); -+ } -+#endif -+ - } - - /* Try to open a BFD for a lang_input_statement. */ -diff --git a/ld/ldlex.h b/ld/ldlex.h -index 5ea083ebeb3..417f9b858ce 100644 ---- a/ld/ldlex.h -+++ b/ld/ldlex.h -@@ -155,6 +155,8 @@ enum option_values - OPTION_NON_CONTIGUOUS_REGIONS, - OPTION_NON_CONTIGUOUS_REGIONS_WARNINGS, - OPTION_DEPENDENCY_FILE, -+ OPTION_NO_POISON_SYSTEM_DIRECTORIES, -+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, - }; - - /* The initial parser states. */ -diff --git a/ld/ldmain.c b/ld/ldmain.c -index 08be9030cb5..92dc16399eb 100644 ---- a/ld/ldmain.c -+++ b/ld/ldmain.c -@@ -321,6 +321,8 @@ main (int argc, char **argv) - command_line.warn_mismatch = TRUE; - command_line.warn_search_mismatch = TRUE; - command_line.check_section_addresses = -1; -+ command_line.poison_system_directories = TRUE; -+ command_line.error_poison_system_directories = FALSE; - - /* We initialize DEMANGLING based on the environment variable - COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the -diff --git a/ld/lexsup.c b/ld/lexsup.c -index 6cab41cf5df..c497f36b148 100644 ---- a/ld/lexsup.c -+++ b/ld/lexsup.c -@@ -572,6 +572,14 @@ static const struct ld_option ld_options[] = - { {"no-print-map-discarded", no_argument, NULL, OPTION_NO_PRINT_MAP_DISCARDED}, - '\0', NULL, N_("Do not show discarded sections in map file output"), - TWO_DASHES }, -+ { {"no-poison-system-directories", no_argument, NULL, -+ OPTION_NO_POISON_SYSTEM_DIRECTORIES}, -+ '\0', NULL, N_("Do not warn for -L options using system directories"), -+ TWO_DASHES }, -+ { {"error-poison-system-directories", no_argument, NULL, -+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES}, -+ '\0', NULL, N_("Give an error for -L options using system directories"), -+ TWO_DASHES }, - }; - - #define OPTION_COUNT ARRAY_SIZE (ld_options) -@@ -584,6 +592,7 @@ parse_args (unsigned argc, char **argv) - int ingroup = 0; - char *default_dirlist = NULL; - char *shortopts; -+ char *BR_paranoid_env; - struct option *longopts; - struct option *really_longopts; - int last_optind; -@@ -1591,6 +1600,14 @@ parse_args (unsigned argc, char **argv) - } - break; - -+ case OPTION_NO_POISON_SYSTEM_DIRECTORIES: -+ command_line.poison_system_directories = FALSE; -+ break; -+ -+ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: -+ command_line.error_poison_system_directories = TRUE; -+ break; -+ - case OPTION_PUSH_STATE: - input_flags.pushed = xmemdup (&input_flags, - sizeof (input_flags), -@@ -1681,6 +1698,10 @@ parse_args (unsigned argc, char **argv) - command_line.soname = NULL; - } - -+ BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH"); -+ if (BR_paranoid_env && strlen(BR_paranoid_env) > 0) -+ command_line.error_poison_system_directories = TRUE; -+ - while (ingroup) - { - einfo (_("%P: missing --end-group; added as last command line option\n")); --- -2.25.4 - diff --git a/package/binutils/2.35.2/0003-or1k-Fix-issue-with-plt-link-failure-for-local-calls.patch b/package/binutils/2.35.2/0003-or1k-Fix-issue-with-plt-link-failure-for-local-calls.patch deleted file mode 100644 index 81fb6b8518..0000000000 --- a/package/binutils/2.35.2/0003-or1k-Fix-issue-with-plt-link-failure-for-local-calls.patch +++ /dev/null @@ -1,59 +0,0 @@ -From baf313f84b106a5a29f01796afd857e69abf8b08 Mon Sep 17 00:00:00 2001 -From: Stafford Horne -Date: Sun, 2 May 2021 06:02:14 +0900 -Subject: [PATCH] or1k: Fix issue with plt link failure for local calls - -When building protobuf we were seeing the assert failure: - - /home/giuliobenetti/git/upstream/or1k-binutils-2.36.1/host/lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: - BFD (GNU Binutils) 2.36.1 assertion fail elf32-or1k.c:2377 - /home/giuliobenetti/git/upstream/or1k-binutils-2.36.1/host/lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: - BFD (GNU Binutils) 2.36.1 assertion fail elf32-or1k.c:2377 - /home/giuliobenetti/git/upstream/or1k-binutils-2.36.1/host/lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: - BFD (GNU Binutils) 2.36.1 assertion fail elf32-or1k.c:2377 - collect2: error: ld returned 1 exit status - -This failure happens while writing out PLT entries, there is a check -"BFD_ASSERT (h->dynindx != -1)" to confirm all plt entries have dynamic -symbol attributes. This was failing for symbols that were -"forced_local" in previous linking code. - -The fix adds logic to or1k_elf_adjust_dynamic_symbol to identify -"forced_local" symbols and exclude them from the the PLT. - -bfd/ChangeLog: - - PR 27624 - * elf32-or1k.c (or1k_elf_adjust_dynamic_symbol): Change - condition used to cleanup plt entries to cleanup forced local - entries. - -Cc: Giulio Benetti -Signed-off-by: Giulio Benetti ---- - bfd/elf32-or1k.c | 9 ++++----- - 1 file changed, 4 insertions(+), 5 deletions(-) - -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index 7c02d004cc7..bbfa2bfe614 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -2568,11 +2568,10 @@ or1k_elf_adjust_dynamic_symbol (struct bfd_link_info *info, - if (h->type == STT_FUNC - || h->needs_plt) - { -- if (! bfd_link_pic (info) -- && !h->def_dynamic -- && !h->ref_dynamic -- && h->root.type != bfd_link_hash_undefweak -- && h->root.type != bfd_link_hash_undefined) -+ if (h->plt.refcount <= 0 -+ || (SYMBOL_CALLS_LOCAL (info, h) -+ || (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT -+ && h->root.type == bfd_link_hash_undefweak))) - { - /* This case can occur if we saw a PLT reloc in an input - file, but the symbol was never referred to by a dynamic --- -2.25.1 - diff --git a/package/binutils/2.35.2/0004-or1k-Implement-relocation-R_OR1K_GOT_AHI16-for-gotha.patch b/package/binutils/2.35.2/0004-or1k-Implement-relocation-R_OR1K_GOT_AHI16-for-gotha.patch deleted file mode 100644 index a4af57d546..0000000000 --- a/package/binutils/2.35.2/0004-or1k-Implement-relocation-R_OR1K_GOT_AHI16-for-gotha.patch +++ /dev/null @@ -1,256 +0,0 @@ -From c67656e248d6dadaa2729975a17c8dd03afe48d0 Mon Sep 17 00:00:00 2001 -From: Stafford Horne -Date: Sun, 2 May 2021 06:02:15 +0900 -Subject: [PATCH] or1k: Implement relocation R_OR1K_GOT_AHI16 for gotha() - -The gotha() relocation mnemonic will be outputted by OpenRISC GCC when -using the -mcmodel=large option. This relocation is used along with -got() to generate 32-bit GOT offsets. This increases the previous GOT -offset limit from the previous 16-bit (64K) limit. - -This is needed on large binaries where the GOT grows larger than 64k. - -bfd/ChangeLog: - - PR 21464 - * bfd-in2.h: Add BFD_RELOC_OR1K_GOT_AHI16 relocation. - * elf32-or1k.c (or1k_elf_howto_table, or1k_reloc_map): Likewise. - (or1k_final_link_relocate, or1k_elf_relocate_section, - or1k_elf_check_relocs): Likewise. - * libbfd.h (bfd_reloc_code_real_names): Likewise. - * reloc.c: Likewise. - -cpu/ChangeLog: - - PR 21464 - * or1k.opc (or1k_imm16_relocs, parse_reloc): Define parse logic - for gotha() relocation. - -include/ChangeLog: - - PR 21464 - * elf/or1k.h (elf_or1k_reloc_type): Define R_OR1K_GOT_AHI16 number. - -opcodes/ChangeLog: - - PR 21464 - * or1k-asm.c: Regenerate. - -gas/ChangeLog: - - PR 21464 - * testsuite/gas/or1k/reloc-1.s: Add test for new relocation. - * testsuite/gas/or1k/reloc-1.d: Add test result for new - relocation. - -Cc: Giulio Benetti - -fixup reloc, add tests - -Signed-off-by: Giulio Benetti ---- - bfd/bfd-in2.h | 1 + - bfd/elf32-or1k.c | 21 ++++++++++++++++++++- - bfd/libbfd.h | 1 + - bfd/reloc.c | 2 ++ - cpu/or1k.opc | 7 ++++++- - gas/testsuite/gas/or1k/reloc-1.d | 4 +++- - gas/testsuite/gas/or1k/reloc-1.s | 4 ++++ - include/elf/or1k.h | 1 + - opcodes/or1k-asm.c | 7 ++++++- - 9 files changed, 44 insertions(+), 4 deletions(-) - -diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h -index df6f9f45673..ab861395e93 100644 ---- a/bfd/bfd-in2.h -+++ b/bfd/bfd-in2.h -@@ -5041,6 +5041,7 @@ then it may be truncated to 8 bits. */ - BFD_RELOC_OR1K_TLS_TPOFF, - BFD_RELOC_OR1K_TLS_DTPOFF, - BFD_RELOC_OR1K_TLS_DTPMOD, -+ BFD_RELOC_OR1K_GOT_AHI16, - - /* H8 elf Relocations. */ - BFD_RELOC_H8_DIR16A8, -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index bbfa2bfe614..8e395827123 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -808,6 +808,20 @@ static reloc_howto_type or1k_elf_howto_table[] = - 0, /* Source Mask. */ - 0x03ffffff, /* Dest Mask. */ - TRUE), /* PC relative offset? */ -+ -+ HOWTO (R_OR1K_GOT_AHI16, /* type */ -+ 16, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_signed, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_OR1K_GOT_AHI16", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ - }; - - /* Map BFD reloc types to Or1k ELF reloc types. */ -@@ -871,6 +885,7 @@ static const struct or1k_reloc_map or1k_reloc_map[] = - { BFD_RELOC_OR1K_TLS_IE_LO13, R_OR1K_TLS_IE_LO13 }, - { BFD_RELOC_OR1K_SLO13, R_OR1K_SLO13 }, - { BFD_RELOC_OR1K_PLTA26, R_OR1K_PLTA26 }, -+ { BFD_RELOC_OR1K_GOT_AHI16, R_OR1K_GOT_AHI16 }, - }; - - /* tls_type is a mask used to track how each symbol is accessed, -@@ -1113,6 +1128,7 @@ or1k_final_link_relocate (reloc_howto_type *howto, bfd *input_bfd, - switch (howto->type) - { - case R_OR1K_AHI16: -+ case R_OR1K_GOT_AHI16: - case R_OR1K_GOTOFF_AHI16: - case R_OR1K_TLS_IE_AHI16: - case R_OR1K_TLS_LE_AHI16: -@@ -1375,6 +1391,7 @@ or1k_elf_relocate_section (bfd *output_bfd, - } - break; - -+ case R_OR1K_GOT_AHI16: - case R_OR1K_GOT16: - case R_OR1K_GOT_PG21: - case R_OR1K_GOT_LO13: -@@ -1466,7 +1483,8 @@ or1k_elf_relocate_section (bfd *output_bfd, - /* The GOT_PG21 and GOT_LO13 relocs are pc-relative, - while the GOT16 reloc is GOT relative. */ - relocation = got_base + off; -- if (r_type == R_OR1K_GOT16) -+ if (r_type == R_OR1K_GOT16 -+ || r_type == R_OR1K_GOT_AHI16) - relocation -= got_sym_value; - - /* Addend should be zero. */ -@@ -1992,6 +2010,7 @@ or1k_elf_check_relocs (bfd *abfd, - } - break; - -+ case R_OR1K_GOT_AHI16: - case R_OR1K_GOT16: - case R_OR1K_GOT_PG21: - case R_OR1K_GOT_LO13: -diff --git a/bfd/libbfd.h b/bfd/libbfd.h -index b97534fc9fe..795c9b9d27f 100644 ---- a/bfd/libbfd.h -+++ b/bfd/libbfd.h -@@ -2755,6 +2755,7 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@", - "BFD_RELOC_OR1K_TLS_TPOFF", - "BFD_RELOC_OR1K_TLS_DTPOFF", - "BFD_RELOC_OR1K_TLS_DTPMOD", -+ "BFD_RELOC_OR1K_GOT_AHI16", - "BFD_RELOC_H8_DIR16A8", - "BFD_RELOC_H8_DIR16R8", - "BFD_RELOC_H8_DIR24A8", -diff --git a/bfd/reloc.c b/bfd/reloc.c -index 9aba84ca81e..1e021febef2 100644 ---- a/bfd/reloc.c -+++ b/bfd/reloc.c -@@ -6175,6 +6175,8 @@ ENUMX - BFD_RELOC_OR1K_GOTPC_HI16 - ENUMX - BFD_RELOC_OR1K_GOTPC_LO16 -+ENUMX -+ BFD_RELOC_OR1K_GOT_AHI16 - ENUMX - BFD_RELOC_OR1K_GOT16 - ENUMX -diff --git a/cpu/or1k.opc b/cpu/or1k.opc -index f0adcbb00a5..5d20a1f33a7 100644 ---- a/cpu/or1k.opc -+++ b/cpu/or1k.opc -@@ -193,7 +193,7 @@ static const bfd_reloc_code_real_type or1k_imm16_relocs[][6] = { - BFD_RELOC_OR1K_GOT_LO13, - BFD_RELOC_UNUSED, - BFD_RELOC_UNUSED, -- BFD_RELOC_UNUSED }, -+ BFD_RELOC_OR1K_GOT_AHI16 }, - { BFD_RELOC_OR1K_GOTPC_LO16, - BFD_RELOC_UNUSED, - BFD_RELOC_UNUSED, -@@ -296,6 +296,11 @@ parse_reloc (const char **strp) - str += 5; - cls = RCLASS_TPOFF; - } -+ else if (strncasecmp (str, "got", 3) == 0) -+ { -+ str += 3; -+ cls = RCLASS_GOT; -+ } - - if (strncasecmp (str, "hi(", 3) == 0) - { -diff --git a/gas/testsuite/gas/or1k/reloc-1.d b/gas/testsuite/gas/or1k/reloc-1.d -index d1bcf5608bb..3a001c4ed99 100644 ---- a/gas/testsuite/gas/or1k/reloc-1.d -+++ b/gas/testsuite/gas/or1k/reloc-1.d -@@ -68,5 +68,7 @@ OFFSET TYPE VALUE - 000000ec R_OR1K_LO13 x - 000000f0 R_OR1K_GOT_LO13 x - 000000f4 R_OR1K_SLO13 x -- -+000000f8 R_OR1K_GOT_AHI16 x -+000000fc R_OR1K_GOT_AHI16 x -+00000100 R_OR1K_GOT_AHI16 x - -diff --git a/gas/testsuite/gas/or1k/reloc-1.s b/gas/testsuite/gas/or1k/reloc-1.s -index e76abef6532..562609aa869 100644 ---- a/gas/testsuite/gas/or1k/reloc-1.s -+++ b/gas/testsuite/gas/or1k/reloc-1.s -@@ -74,3 +74,7 @@ - l.lbz r5,po(x)(r3) - l.lbz r5,gotpo(x)(r3) - l.sb po(x)(r3),r6 -+ -+ l.movhi r4,gotha(x) -+ l.ori r3,r4,gotha(x) -+ l.addi r3,r4,gotha(x) -diff --git a/include/elf/or1k.h b/include/elf/or1k.h -index a215ef5c17e..dff37d875f2 100644 ---- a/include/elf/or1k.h -+++ b/include/elf/or1k.h -@@ -77,6 +77,7 @@ START_RELOC_NUMBERS (elf_or1k_reloc_type) - RELOC_NUMBER (R_OR1K_TLS_IE_LO13, 51) - RELOC_NUMBER (R_OR1K_SLO13, 52) - RELOC_NUMBER (R_OR1K_PLTA26, 53) -+ RELOC_NUMBER (R_OR1K_GOT_AHI16, 54) - END_RELOC_NUMBERS (R_OR1K_max) - - #define EF_OR1K_NODELAY (1UL << 0) -diff --git a/opcodes/or1k-asm.c b/opcodes/or1k-asm.c -index 5f3c6c74b12..e0c49b3b8cd 100644 ---- a/opcodes/or1k-asm.c -+++ b/opcodes/or1k-asm.c -@@ -177,7 +177,7 @@ static const bfd_reloc_code_real_type or1k_imm16_relocs[][6] = { - BFD_RELOC_OR1K_GOT_LO13, - BFD_RELOC_UNUSED, - BFD_RELOC_UNUSED, -- BFD_RELOC_UNUSED }, -+ BFD_RELOC_OR1K_GOT_AHI16 }, - { BFD_RELOC_OR1K_GOTPC_LO16, - BFD_RELOC_UNUSED, - BFD_RELOC_UNUSED, -@@ -280,6 +280,11 @@ parse_reloc (const char **strp) - str += 5; - cls = RCLASS_TPOFF; - } -+ else if (strncasecmp (str, "got", 3) == 0) -+ { -+ str += 3; -+ cls = RCLASS_GOT; -+ } - - if (strncasecmp (str, "hi(", 3) == 0) - { --- -2.25.1 - diff --git a/package/binutils/2.35.2/0005-or1k-Avoid-R_OR1K_GOT16-overflow-failures-in-presenc.patch b/package/binutils/2.35.2/0005-or1k-Avoid-R_OR1K_GOT16-overflow-failures-in-presenc.patch deleted file mode 100644 index 82198dd373..0000000000 --- a/package/binutils/2.35.2/0005-or1k-Avoid-R_OR1K_GOT16-overflow-failures-in-presenc.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 097b83a1c9c694a14e6081cee034bf24f16875c1 Mon Sep 17 00:00:00 2001 -From: Stafford Horne -Date: Sun, 2 May 2021 06:02:16 +0900 -Subject: [PATCH] or1k: Avoid R_OR1K_GOT16 overflow failures in presence of - R_OR1K_GOT_AHI16 - -Now that we support R_OR1K_GOT_AHI16 we can relax the R_OR1K_GOT16 -overflow validation check if the section has R_OR1K_GOT_AHI16. - -We cannot simple disable R_OR1K_GOT16 overflow validation as there will -still be binaries that will have only R_OR1K_GOT16. The -R_OR1K_GOT_AHI16 relocation will only be added by GCC when building with -the option -mcmodel=large. - -This assumes that R_OR1K_GOT_AHI16 will come before R_OR1K_GOT16, which -is the code pattern that will be emitted by GCC. - -bfd/ChangeLog: - - PR 21464 - * elf32-or1k.c (or1k_elf_relocate_section): Relax R_OR1K_GOT16 - overflow check if we have R_OR1K_GOT_AHI16 followed by - R_OR1K_GOT16. - -Signed-off-by: Giulio Benetti ---- - bfd/elf32-or1k.c | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index 8e395827123..9f315bfda99 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -1280,6 +1280,7 @@ or1k_elf_relocate_section (bfd *output_bfd, - asection *sgot, *splt; - bfd_vma plt_base, got_base, got_sym_value; - bfd_boolean ret_val = TRUE; -+ bfd_boolean saw_gotha = FALSE; - - if (htab == NULL) - return FALSE; -@@ -1487,6 +1488,16 @@ or1k_elf_relocate_section (bfd *output_bfd, - || r_type == R_OR1K_GOT_AHI16) - relocation -= got_sym_value; - -+ if (r_type == R_OR1K_GOT_AHI16) -+ saw_gotha = TRUE; -+ -+ /* If we have a R_OR1K_GOT16 followed by 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. */ -+ if (r_type == R_OR1K_GOT16 && saw_gotha) -+ relocation &= 0xffff; -+ - /* Addend should be zero. */ - if (rel->r_addend != 0) - { --- -2.25.1 - diff --git a/package/binutils/2.35.2/0006-or1k-Support-large-plt_relocs-when-generating-plt-en.patch b/package/binutils/2.35.2/0006-or1k-Support-large-plt_relocs-when-generating-plt-en.patch deleted file mode 100644 index c884ab874d..0000000000 --- a/package/binutils/2.35.2/0006-or1k-Support-large-plt_relocs-when-generating-plt-en.patch +++ /dev/null @@ -1,500 +0,0 @@ -From c87692eb894b4b86eced7b7ba205f9bf27c2c213 Mon Sep 17 00:00:00 2001 -From: Stafford Horne -Date: Sun, 2 May 2021 06:02:17 +0900 -Subject: [PATCH] or1k: Support large plt_relocs when generating plt - entries - -The current PLT generation code will generate invalid code when the PLT -relocation offset exceeds 64k. This fixes the issue by detecting large -plt_reloc offsets and generare code sequences to create larger plt -relocations. - -The "large" plt code needs 2 extra instructions to create 32-bit offsets. - -bfd/ChangeLog: - - PR 27746 - * elf32-or1k.c (PLT_ENTRY_SIZE_LARGE, PLT_MAX_INSN_COUNT, - OR1K_ADD, OR1K_ORI): New macros to help with plt creation. - (elf_or1k_link_hash_table): New field plt_count. - (elf_or1k_link_hash_entry): New field plt_index. - (elf_or1k_plt_entry_size): New function. - (or1k_write_plt_entry): Update to support variable size PLTs. - (or1k_elf_finish_dynamic_sections): Use new or1k_write_plt_entry - API. - (or1k_elf_finish_dynamic_symbol): Update to write large PLTs - when needed. - (allocate_dynrelocs): Use elf_or1k_plt_entry_size to account for - PLT size. - -ld/ChangeLog: - - PR 27746 - testsuite/ld-or1k/or1k.exp (or1kplttests): Add tests for linking - along with gotha() relocations. - testsuite/ld-or1k/gotha1.dd: New file. - testsuite/ld-or1k/gotha1.s: New file. - testsuite/ld-or1k/gotha2.dd: New file. - testsuite/ld-or1k/gotha2.s: New file - testsuite/ld-or1k/pltlib.s (x): Define size to avoid link - failure. - -Signed-off-by: Giulio Benetti ---- - bfd/elf32-or1k.c | 149 ++++++++++++++++++++++++--------- - ld/testsuite/ld-or1k/gotha1.dd | 34 ++++++++ - ld/testsuite/ld-or1k/gotha1.s | 24 ++++++ - ld/testsuite/ld-or1k/gotha2.dd | 21 +++++ - ld/testsuite/ld-or1k/gotha2.s | 22 +++++ - ld/testsuite/ld-or1k/or1k.exp | 8 ++ - ld/testsuite/ld-or1k/pltlib.s | 1 + - 7 files changed, 220 insertions(+), 39 deletions(-) - create mode 100644 ld/testsuite/ld-or1k/gotha1.dd - create mode 100644 ld/testsuite/ld-or1k/gotha1.s - create mode 100644 ld/testsuite/ld-or1k/gotha2.dd - create mode 100644 ld/testsuite/ld-or1k/gotha2.s - -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index 9f315bfda99..7a14eaa3a46 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -30,10 +30,14 @@ - #define N_ONES(X) (((bfd_vma)2 << (X)) - 1) - - #define PLT_ENTRY_SIZE 16 -+#define PLT_ENTRY_SIZE_LARGE (6*4) -+#define PLT_MAX_INSN_COUNT 6 - - #define OR1K_MOVHI(D) (0x18000000 | (D << 21)) - #define OR1K_ADRP(D) (0x08000000 | (D << 21)) - #define OR1K_LWZ(D,A) (0x84000000 | (D << 21) | (A << 16)) -+#define OR1K_ADD(D,A,B) (0xE0000000 | (D << 21) | (A << 16) | (B << 11)) -+#define OR1K_ORI(D,A) (0xA8000000 | (D << 21) | (A << 16)) - #define OR1K_ORI0(D) (0xA8000000 | (D << 21)) - #define OR1K_JR(B) (0x44000000 | (B << 11)) - #define OR1K_NOP 0x15000000 -@@ -907,6 +911,8 @@ struct elf_or1k_link_hash_entry - { - struct elf_link_hash_entry root; - -+ /* For calculating PLT size. */ -+ bfd_vma plt_index; - /* Track type of TLS access. */ - unsigned char tls_type; - }; -@@ -934,9 +940,20 @@ struct elf_or1k_link_hash_table - /* Small local sym to section mapping cache. */ - struct sym_cache sym_sec; - -+ bfd_vma plt_count; - bfd_boolean saw_plta; - }; - -+static size_t -+elf_or1k_plt_entry_size (bfd_vma plt_index) -+{ -+ bfd_vma plt_reloc; -+ -+ plt_reloc = plt_index * sizeof (Elf32_External_Rela); -+ -+ return (plt_reloc > 0xffff) ? PLT_ENTRY_SIZE_LARGE : PLT_ENTRY_SIZE; -+} -+ - /* Get the ELF linker hash table from a link_info structure. */ - #define or1k_elf_hash_table(p) \ - (elf_hash_table_id ((struct elf_link_hash_table *) ((p)->hash)) \ -@@ -2224,33 +2241,46 @@ or1k_elf_check_relocs (bfd *abfd, - } - - static void --or1k_write_plt_entry (bfd *output_bfd, bfd_byte *contents, unsigned insn1, -- unsigned insn2, unsigned insn3, unsigned insnj) -+or1k_write_plt_entry (bfd *output_bfd, bfd_byte *contents, unsigned insnj, -+ unsigned insns[], size_t insn_count) - { - unsigned nodelay = elf_elfheader (output_bfd)->e_flags & EF_OR1K_NODELAY; -- unsigned insn4; -+ unsigned output_insns[PLT_MAX_INSN_COUNT]; -+ -+ /* Copy instructions into the output buffer. */ -+ for (size_t i = 0; i < insn_count; i++) -+ output_insns[i] = insns[i]; - - /* Honor the no-delay-slot setting. */ -- if (insn3 == OR1K_NOP) -+ if (insns[insn_count-1] == OR1K_NOP) - { -- insn4 = insn3; -+ unsigned slot1, slot2; -+ - if (nodelay) -- insn3 = insnj; -+ slot1 = insns[insn_count-2], slot2 = insnj; - else -- insn3 = insn2, insn2 = insnj; -+ slot1 = insnj, slot2 = insns[insn_count-2]; -+ -+ output_insns[insn_count-2] = slot1; -+ output_insns[insn_count-1] = slot2; -+ output_insns[insn_count] = OR1K_NOP; - } - else - { -+ unsigned slot1, slot2; -+ - if (nodelay) -- insn4 = insnj; -+ slot1 = insns[insn_count-1], slot2 = insnj; - else -- insn4 = insn3, insn3 = insnj; -+ slot1 = insnj, slot2 = insns[insn_count-1]; -+ -+ output_insns[insn_count-1] = slot1; -+ output_insns[insn_count] = slot2; - } - -- bfd_put_32 (output_bfd, insn1, contents); -- bfd_put_32 (output_bfd, insn2, contents + 4); -- bfd_put_32 (output_bfd, insn3, contents + 8); -- bfd_put_32 (output_bfd, insn4, contents + 12); -+ /* Write out the output buffer. */ -+ for (size_t i = 0; i < (insn_count+1); i++) -+ bfd_put_32 (output_bfd, output_insns[i], contents + (i*4)); - } - - /* Finish up the dynamic sections. */ -@@ -2317,7 +2347,8 @@ or1k_elf_finish_dynamic_sections (bfd *output_bfd, - splt = htab->root.splt; - if (splt && splt->size > 0) - { -- unsigned plt0, plt1, plt2; -+ unsigned plt[PLT_MAX_INSN_COUNT]; -+ size_t plt_insn_count = 3; - bfd_vma got_addr = sgot->output_section->vma + sgot->output_offset; - - /* Note we force 16 byte alignment on the .got, so that -@@ -2328,27 +2359,27 @@ or1k_elf_finish_dynamic_sections (bfd *output_bfd, - bfd_vma pc = splt->output_section->vma + splt->output_offset; - unsigned pa = ((got_addr >> 13) - (pc >> 13)) & 0x1fffff; - unsigned po = got_addr & 0x1fff; -- plt0 = OR1K_ADRP(12) | pa; -- plt1 = OR1K_LWZ(15,12) | (po + 8); -- plt2 = OR1K_LWZ(12,12) | (po + 4); -+ plt[0] = OR1K_ADRP(12) | pa; -+ plt[1] = OR1K_LWZ(15,12) | (po + 8); -+ plt[2] = OR1K_LWZ(12,12) | (po + 4); - } - else if (bfd_link_pic (info)) - { -- plt0 = OR1K_LWZ(15, 16) | 8; /* .got+8 */ -- plt1 = OR1K_LWZ(12, 16) | 4; /* .got+4 */ -- plt2 = OR1K_NOP; -+ plt[0] = OR1K_LWZ(15, 16) | 8; /* .got+8 */ -+ plt[1] = OR1K_LWZ(12, 16) | 4; /* .got+4 */ -+ plt[2] = OR1K_NOP; - } - else - { - unsigned ha = ((got_addr + 0x8000) >> 16) & 0xffff; - unsigned lo = got_addr & 0xffff; -- plt0 = OR1K_MOVHI(12) | ha; -- plt1 = OR1K_LWZ(15,12) | (lo + 8); -- plt2 = OR1K_LWZ(12,12) | (lo + 4); -+ plt[0] = OR1K_MOVHI(12) | ha; -+ plt[1] = OR1K_LWZ(15,12) | (lo + 8); -+ plt[2] = OR1K_LWZ(12,12) | (lo + 4); - } - -- or1k_write_plt_entry (output_bfd, splt->contents, -- plt0, plt1, plt2, OR1K_JR(15)); -+ or1k_write_plt_entry (output_bfd, splt->contents, OR1K_JR(15), -+ plt, plt_insn_count); - - elf_section_data (splt->output_section)->this_hdr.sh_entsize = 4; - } -@@ -2391,7 +2422,8 @@ or1k_elf_finish_dynamic_symbol (bfd *output_bfd, - - if (h->plt.offset != (bfd_vma) -1) - { -- unsigned int plt0, plt1, plt2; -+ unsigned int plt[PLT_MAX_INSN_COUNT]; -+ size_t plt_insn_count = 3; - asection *splt; - asection *sgot; - asection *srela; -@@ -2403,6 +2435,7 @@ or1k_elf_finish_dynamic_symbol (bfd *output_bfd, - bfd_vma got_offset; - bfd_vma got_addr; - Elf_Internal_Rela rela; -+ bfd_boolean large_plt_entry; - - /* This symbol has an entry in the procedure linkage table. Set - it up. */ -@@ -2420,10 +2453,13 @@ or1k_elf_finish_dynamic_symbol (bfd *output_bfd, - corresponds to this symbol. This is the index of this symbol - in all the symbols for which we are making plt entries. The - first entry in the procedure linkage table is reserved. */ -- plt_index = h->plt.offset / PLT_ENTRY_SIZE - 1; -+ plt_index = ((struct elf_or1k_link_hash_entry *) h)->plt_index; - plt_addr = plt_base_addr + h->plt.offset; - plt_reloc = plt_index * sizeof (Elf32_External_Rela); - -+ large_plt_entry = (elf_or1k_plt_entry_size (plt_index) -+ == PLT_ENTRY_SIZE_LARGE); -+ - /* Get the offset into the .got table of the entry that - corresponds to this function. Each .got entry is 4 bytes. - The first three are reserved. */ -@@ -2435,27 +2471,57 @@ or1k_elf_finish_dynamic_symbol (bfd *output_bfd, - { - unsigned pa = ((got_addr >> 13) - (plt_addr >> 13)) & 0x1fffff; - unsigned po = (got_addr & 0x1fff); -- plt0 = OR1K_ADRP(12) | pa; -- plt1 = OR1K_LWZ(12,12) | po; -- plt2 = OR1K_ORI0(11) | plt_reloc; -+ plt[0] = OR1K_ADRP(12) | pa; -+ plt[1] = OR1K_LWZ(12,12) | po; -+ plt[2] = OR1K_ORI0(11) | plt_reloc; - } - else if (bfd_link_pic (info)) - { -- plt0 = OR1K_LWZ(12,16) | got_offset; -- plt1 = OR1K_ORI0(11) | plt_reloc; -- plt2 = OR1K_NOP; -+ if (large_plt_entry) -+ { -+ unsigned gotha = ((got_offset + 0x8000) >> 16) & 0xffff; -+ unsigned got = got_offset & 0xffff; -+ unsigned pltrelhi = (plt_reloc >> 16) & 0xffff; -+ unsigned pltrello = plt_reloc & 0xffff; -+ -+ plt[0] = OR1K_MOVHI(12) | gotha; -+ plt[1] = OR1K_ADD(12,12,16); -+ plt[2] = OR1K_LWZ(12,12) | got; -+ plt[3] = OR1K_MOVHI(11) | pltrelhi; -+ plt[4] = OR1K_ORI(11,11) | pltrello; -+ plt_insn_count = 5; -+ } -+ else -+ { -+ plt[0] = OR1K_LWZ(12,16) | got_offset; -+ plt[1] = OR1K_ORI0(11) | plt_reloc; -+ plt[2] = OR1K_NOP; -+ } - } - else - { - unsigned ha = ((got_addr + 0x8000) >> 16) & 0xffff; - unsigned lo = got_addr & 0xffff; -- plt0 = OR1K_MOVHI(12) | ha; -- plt1 = OR1K_LWZ(12,12) | lo; -- plt2 = OR1K_ORI0(11) | plt_reloc; -+ plt[0] = OR1K_MOVHI(12) | ha; -+ plt[1] = OR1K_LWZ(12,12) | lo; -+ plt[2] = OR1K_ORI0(11) | plt_reloc; -+ } -+ -+ /* For large code model we fixup the non-PIC PLT relocation instructions -+ here. */ -+ if (large_plt_entry && !bfd_link_pic (info)) -+ { -+ unsigned pltrelhi = (plt_reloc >> 16) & 0xffff; -+ unsigned pltrello = plt_reloc & 0xffff; -+ -+ plt[2] = OR1K_MOVHI(11) | pltrelhi; -+ plt[3] = OR1K_ORI(11,11) | pltrello; -+ plt[4] = OR1K_NOP; -+ plt_insn_count = 5; - } - - or1k_write_plt_entry (output_bfd, splt->contents + h->plt.offset, -- plt0, plt1, plt2, OR1K_JR(12)); -+ OR1K_JR(12), plt, plt_insn_count); - - /* Fill in the entry in the global offset table. We initialize it to - point to the top of the plt. This is done to lazy lookup the actual -@@ -2779,11 +2845,16 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf) - if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, bfd_link_pic (info), h)) - { - asection *splt = htab->root.splt; -+ bfd_vma plt_index; -+ -+ /* Track the index of our plt entry for use in calculating size. */ -+ plt_index = htab->plt_count++; -+ ((struct elf_or1k_link_hash_entry *) h)->plt_index = plt_index; - - /* If this is the first .plt entry, make room for the special - first entry. */ - if (splt->size == 0) -- splt->size = PLT_ENTRY_SIZE; -+ splt->size = elf_or1k_plt_entry_size (plt_index); - - h->plt.offset = splt->size; - -@@ -2800,7 +2871,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf) - } - - /* Make room for this entry. */ -- splt->size += PLT_ENTRY_SIZE; -+ splt->size += elf_or1k_plt_entry_size (plt_index); - - /* We also need to make an entry in the .got.plt section, which - will be placed in the .got section by the linker script. */ -diff --git a/ld/testsuite/ld-or1k/gotha1.dd b/ld/testsuite/ld-or1k/gotha1.dd -new file mode 100644 -index 00000000000..0ad1f8f5399 ---- /dev/null -+++ b/ld/testsuite/ld-or1k/gotha1.dd -@@ -0,0 +1,34 @@ -+ -+.*\.x: file format elf32-or1k -+ -+ -+Disassembly of section \.plt: -+ -+[0-9a-f]+ <\.plt>: -+ +[0-9a-f]+: 19 80 00 00 l\.movhi r12,0x0 -+ +[0-9a-f]+: 85 ec [0-9a-f]+ [0-9a-f]+ l\.lwz r15,[0-9]+\(r12\) -+ +[0-9a-f]+: 44 00 78 00 l\.jr r15 -+ +[0-9a-f]+: 85 8c [0-9a-f]+ [0-9a-f]+ l\.lwz r12,[0-9]+\(r12\) -+ +[0-9a-f]+: 19 80 00 00 l\.movhi r12,0x0 -+ +[0-9a-f]+: 85 8c [0-9a-f]+ [0-9a-f]+ l\.lwz r12,[0-9]+\(r12\) -+ +[0-9a-f]+: 44 00 60 00 l\.jr r12 -+ +[0-9a-f]+: a9 60 00 00 l\.ori r11,r0,0x0 -+ -+Disassembly of section \.text: -+ -+[0-9a-f]+ <_start>: -+ +[0-9a-f]+: 9c 21 ff fc l\.addi r1,r1,-4 -+ +[0-9a-f]+: d4 01 48 00 l\.sw 0\(r1\),r9 -+ +[0-9a-f]+: 04 00 00 02 l\.jal [0-9a-f]+ <_start\+0x10> -+ +[0-9a-f]+: 1a 60 00 00 l\.movhi r19,0x0 -+ +[0-9a-f]+: aa 73 [0-9a-f]+ [0-9a-f]+ l\.ori r19,r19,0x[0-9a-f]+ -+ +[0-9a-f]+: e2 73 48 00 l\.add r19,r19,r9 -+ +[0-9a-f]+: 1a 20 00 00 l\.movhi r17,0x0 -+ +[0-9a-f]+: e2 31 98 00 l\.add r17,r17,r19 -+ +[0-9a-f]+: 86 31 00 10 l\.lwz r17,16\(r17\) -+ +[0-9a-f]+: 84 71 00 00 l\.lwz r3,0\(r17\) -+ +[0-9a-f]+: 07 ff ff f2 l\.jal [0-9a-f]+ <\.plt\+0x10> -+ +[0-9a-f]+: 15 00 00 00 l\.nop 0x0 -+ +[0-9a-f]+: 85 21 00 00 l\.lwz r9,0\(r1\) -+ +[0-9a-f]+: 44 00 48 00 l\.jr r9 -+ +[0-9a-f]+: 9c 21 00 04 l\.addi r1,r1,4 -diff --git a/ld/testsuite/ld-or1k/gotha1.s b/ld/testsuite/ld-or1k/gotha1.s -new file mode 100644 -index 00000000000..42b16db425c ---- /dev/null -+++ b/ld/testsuite/ld-or1k/gotha1.s -@@ -0,0 +1,24 @@ -+ .data -+ .p2align 16 -+ -+ .text -+ .globl _start -+_start: -+ l.addi r1, r1, -4 -+ l.sw 0(r1), r9 -+ -+ l.jal 8 -+ l.movhi r19, gotpchi(_GLOBAL_OFFSET_TABLE_-4) -+ l.ori r19, r19, gotpclo(_GLOBAL_OFFSET_TABLE_+0) -+ l.add r19, r19, r9 -+ -+ l.movhi r17, gotha(x) -+ l.add r17, r17, r19 -+ l.lwz r17, got(x)(r17) -+ l.lwz r3, 0(r17) -+ -+ l.jal plt(func) -+ l.nop -+ l.lwz r9, 0(r1) -+ l.jr r9 -+ l.addi r1, r1, 4 -diff --git a/ld/testsuite/ld-or1k/gotha2.dd b/ld/testsuite/ld-or1k/gotha2.dd -new file mode 100644 -index 00000000000..fe09da5466b ---- /dev/null -+++ b/ld/testsuite/ld-or1k/gotha2.dd -@@ -0,0 +1,21 @@ -+ -+.*\.x: file format elf32-or1k -+ -+ -+Disassembly of section \.text: -+ -+[0-9a-f]+ : -+ +[0-9a-f]+: 9c 21 ff f8 l\.addi r1,r1,-8 -+ +[0-9a-f]+: d4 01 80 00 l\.sw 0\(r1\),r16 -+ +[0-9a-f]+: d4 01 48 04 l\.sw 4\(r1\),r9 -+ +[0-9a-f]+: 04 00 [0-9a-f]+ [0-9a-f]+ l\.jal [0-9a-f]+ -+ +[0-9a-f]+: 1a 00 00 00 l\.movhi r16,0x0 -+ +[0-9a-f]+: aa 10 [0-9a-f]+ [0-9a-f]+ l\.ori r16,r16,0x[0-9a-f]+ -+ +[0-9a-f]+: e2 10 48 00 l\.add r16,r16,r9 -+ +[0-9a-f]+: 1a 20 00 00 l\.movhi r17,0x0 -+ +[0-9a-f]+: e2 31 80 00 l\.add r17,r17,r16 -+ +[0-9a-f]+: 86 31 00 0c l\.lwz r17,12\(r17\) -+ +[0-9a-f]+: 85 21 00 04 l\.lwz r9,4\(r1\) -+ +[0-9a-f]+: 86 01 00 00 l\.lwz r16,0\(r1\) -+ +[0-9a-f]+: 44 00 48 00 l\.jr r9 -+ +[0-9a-f]+: 9c 21 00 08 l\.addi r1,r1,8 -diff --git a/ld/testsuite/ld-or1k/gotha2.s b/ld/testsuite/ld-or1k/gotha2.s -new file mode 100644 -index 00000000000..164b282f2dd ---- /dev/null -+++ b/ld/testsuite/ld-or1k/gotha2.s -@@ -0,0 +1,22 @@ -+ .section .text -+ .align 4 -+ .global test -+ .type test, @function -+test: -+ l.addi r1, r1, -8 -+ l.sw 0(r1), r16 -+ l.sw 4(r1), r9 -+ -+ l.jal 8 -+ l.movhi r16, gotpchi(_GLOBAL_OFFSET_TABLE_-4) -+ l.ori r16, r16, gotpclo(_GLOBAL_OFFSET_TABLE_+0) -+ l.add r16, r16, r9 -+ -+ l.movhi r17, gotha(i) -+ l.add r17, r17, r16 -+ l.lwz r17, got(i)(r17) -+ -+ l.lwz r9, 4(r1) -+ l.lwz r16, 0(r1) -+ l.jr r9 -+ l.addi r1, r1, 8 -diff --git a/ld/testsuite/ld-or1k/or1k.exp b/ld/testsuite/ld-or1k/or1k.exp -index 7592e8307c1..8e19ec6c31a 100644 ---- a/ld/testsuite/ld-or1k/or1k.exp -+++ b/ld/testsuite/ld-or1k/or1k.exp -@@ -53,6 +53,14 @@ set or1kplttests { - "" {plt1.s} - {{objdump -dr plt1.x.dd}} - "plt1.x"} -+ {"gotha exec plt" "tmpdir/libpltlib.so" "" -+ "" {gotha1.s} -+ {{objdump -dr gotha1.dd}} -+ "gotha1.x"} -+ {"gotha -fpic -shared" "-fpic -shared" "" -+ "" {gotha2.s} -+ {{objdump -dr gotha2.dd}} -+ "gotha2.x"} - } - - # Not implemented yet -diff --git a/ld/testsuite/ld-or1k/pltlib.s b/ld/testsuite/ld-or1k/pltlib.s -index baf76ca1af7..8b4d7ba48fd 100644 ---- a/ld/testsuite/ld-or1k/pltlib.s -+++ b/ld/testsuite/ld-or1k/pltlib.s -@@ -1,5 +1,6 @@ - .section .data - .globl x, y -+ .size x, 4 - x: .long 33 - y: .long 44 - --- -2.25.1 - diff --git a/package/binutils/2.35.2/0007-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch b/package/binutils/2.35.2/0007-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch deleted file mode 100644 index c3978e22fa..0000000000 --- a/package/binutils/2.35.2/0007-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch +++ /dev/null @@ -1,50 +0,0 @@ -From c3003947e4bad18faea4337fd2073feeb30ee078 Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Wed, 9 Jun 2021 17:28:27 +0200 -Subject: [PATCH] bfd/elf32-or1k: fix building with gcc version < 5 - -Gcc version >= 5 has standard C mode not set to -std=gnu11, so if we use -an old compiler(i.e. gcc 4.9) build fails on: -``` -elf32-or1k.c:2251:3: error: 'for' loop initial declarations are only allowed in -C99 or C11 mode - for (size_t i = 0; i < insn_count; i++) - ^ -``` - -So let's declare `size_t i` at the top of the function instead of inside -for loop. - -Signed-off-by: Giulio Benetti ---- - bfd/elf32-or1k.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index 4ae7f324d33..32063ab0289 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -2244,9 +2244,10 @@ or1k_write_plt_entry (bfd *output_bfd, bfd_byte *contents, unsigned insnj, - { - unsigned nodelay = elf_elfheader (output_bfd)->e_flags & EF_OR1K_NODELAY; - unsigned output_insns[PLT_MAX_INSN_COUNT]; -+ size_t i; - - /* Copy instructions into the output buffer. */ -- for (size_t i = 0; i < insn_count; i++) -+ for (i = 0; i < insn_count; i++) - output_insns[i] = insns[i]; - - /* Honor the no-delay-slot setting. */ -@@ -2277,7 +2278,7 @@ or1k_write_plt_entry (bfd *output_bfd, bfd_byte *contents, unsigned insnj, - } - - /* Write out the output buffer. */ -- for (size_t i = 0; i < (insn_count+1); i++) -+ for (i = 0; i < (insn_count+1); i++) - bfd_put_32 (output_bfd, output_insns[i], contents + (i*4)); - } - --- -2.25.1 - diff --git a/package/binutils/2.35.2/0008-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch b/package/binutils/2.35.2/0008-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch deleted file mode 100644 index 585b97b2af..0000000000 --- a/package/binutils/2.35.2/0008-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 9af93e143a7fbdb75aa1ed37277f9250eb111628 Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Sat, 10 Jul 2021 17:57:34 +0200 -Subject: [PATCH] or1k: fix pc-relative relocation against dynamic on PC - relative 26 bit relocation - -When building openal we were seeing the assert failure: - -/home/buildroot/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: CMakeFiles/OpenAL.dir/al/source.cpp.o: -pc-relative relocation against dynamic symbol alSourcePausev -/home/buildroot/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: CMakeFiles/OpenAL.dir/al/source.cpp.o: -pc-relative relocation against dynamic symbol alSourceStopv -/home/buildroot/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: CMakeFiles/OpenAL.dir/al/source.cpp.o: -pc-relative relocation against dynamic symbol alSourceRewindv -/home/buildroot/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: CMakeFiles/OpenAL.dir/al/source.cpp.o: -pc-relative relocation against dynamic symbol alSourcePlayv -collect2: error: ld returned 1 exit status - -This happens because in R_OR1K_INSN_REL_26 case we can't reference local -symbol as previously done but we need to make sure that calls to actual -symbol always call the version of current object. - -bfd/Changelog: - - * elf32-or1k.c (or1k_elf_relocate_section): use a separate entry - in switch case R_OR1K_INSN_REL_26 where we need to check for - !SYMBOL_CALLS_LOCAL() instead of !SYMBOL_REFERENCES_LOCAL(). - -Signed-off-by: Giulio Benetti ---- - bfd/elf32-or1k.c | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index 4ae7f324d33..4f9092539f5 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -1543,6 +1543,18 @@ or1k_elf_relocate_section (bfd *output_bfd, - break; - - case R_OR1K_INSN_REL_26: -+ /* For a non-shared link, these will reference plt or call the -+ version of actual object. */ -+ if (bfd_link_pic (info) && !SYMBOL_CALLS_LOCAL (info, h)) -+ { -+ _bfd_error_handler -+ (_("%pB: pc-relative relocation against dynamic symbol %s"), -+ input_bfd, name); -+ ret_val = FALSE; -+ bfd_set_error (bfd_error_bad_value); -+ } -+ break; -+ - case R_OR1K_PCREL_PG21: - case R_OR1K_LO13: - case R_OR1K_SLO13: --- -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 deleted file mode 100644 index e96d49122a..0000000000 --- a/package/binutils/2.35.2/0009-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch +++ /dev/null @@ -1,75 +0,0 @@ -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.35.2/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch b/package/binutils/2.35.2/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch deleted file mode 100644 index e95eb1e7c5..0000000000 --- a/package/binutils/2.35.2/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 30a954525f4e53a9cd50a1a8a6f201c7cf6595c7 Mon Sep 17 00:00:00 2001 -From: "H.J. Lu" -Date: Mon, 7 Feb 2022 15:22:19 -0800 -Subject: [PATCH] i386: Allow GOT32 relocations against ABS symbols - -GOT32 relocations are allowed since absolute value + addend is stored in -the GOT slot. - -Tested on glibc 2.35 build with GCC 11.2 and -Os. - -bfd/ - - PR ld/28870 - * elfxx-x86.c (_bfd_elf_x86_valid_reloc_p): Also allow GOT32 - relocations. - -Signed-off-by: Waldemar Brodkorb - -diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c -index 7ac2411fc80..d00dc45677b 100644 ---- a/bfd/elfxx-x86.c -+++ b/bfd/elfxx-x86.c -@@ -1942,9 +1942,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section, - irel = *rel; - - /* Only allow relocations against absolute symbol, which can be -- resolved as absolute value + addend. GOTPCREL relocations -- are allowed since absolute value + addend is stored in the -- GOT slot. */ -+ resolved as absolute value + addend. GOTPCREL and GOT32 -+ relocations are allowed since absolute value + addend is -+ stored in the GOT slot. */ - if (bed->target_id == X86_64_ELF_DATA) - { - r_type &= ~R_X86_64_converted_reloc_bit; -@@ -1965,7 +1965,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section, - else - valid_p = (r_type == R_386_32 - || r_type == R_386_16 -- || r_type == R_386_8); -+ || r_type == R_386_8 -+ || r_type == R_386_GOT32 -+ || r_type == R_386_GOT32X); - - if (valid_p) - *no_dynreloc_p = true; diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index 17de6e4e41..21b15b5c36 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -16,13 +16,6 @@ config BR2_BINUTILS_VERSION_2_32_X bool "binutils 2.32" depends on !BR2_csky -config BR2_BINUTILS_VERSION_2_35_X - bool "binutils 2.35.2" - depends on !BR2_csky - # https://github.com/uclinux-dev/elf2flt/pull/16 - # https://github.com/uclinux-dev/elf2flt/issues/12 - depends on !BR2_BINFMT_FLAT - config BR2_BINUTILS_VERSION_2_36_X bool "binutils 2.36.1" depends on !BR2_csky @@ -52,7 +45,6 @@ config BR2_BINUTILS_VERSION string default "arc-2020.09-release" if BR2_BINUTILS_VERSION_ARC default "2.32" if BR2_BINUTILS_VERSION_2_32_X - default "2.35.2" if BR2_BINUTILS_VERSION_2_35_X default "2.36.1" if BR2_BINUTILS_VERSION_2_36_X default "2.37" if BR2_BINUTILS_VERSION_2_37_X default "2.38" if BR2_BINUTILS_VERSION_2_38_X diff --git a/package/binutils/binutils.hash b/package/binutils/binutils.hash index fe31b34d40..4141e0c5f2 100644 --- a/package/binutils/binutils.hash +++ b/package/binutils/binutils.hash @@ -1,6 +1,5 @@ # From ftp://gcc.gnu.org/pub/binutils/releases/sha512.sum sha512 d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724afa1e43bd0db45cfc9916b41519b67dfce03232aa4978704492a6994a binutils-2.32.tar.xz -sha512 9974ede5978d32e0d68fef23da48fa00bd06b0bff7ec45b00ca075c126d6bbe0cf2defc03ecc3f17bc6cc85b64271a13009c4049d7ba17de26e84e3a6e2c0348 binutils-2.35.2.tar.xz sha512 cc24590bcead10b90763386b6f96bb027d7594c659c2d95174a6352e8b98465a50ec3e4088d0da038428abe059bbc4ae5f37b269f31a40fc048072c8a234f4e9 binutils-2.36.1.tar.xz sha512 5c11aeef6935860a6819ed3a3c93371f052e52b4bdc5033da36037c1544d013b7f12cb8d561ec954fe7469a68f1b66f1a3cd53d5a3af7293635a90d69edd15e7 binutils-2.37.tar.xz sha512 8bf0b0d193c9c010e0518ee2b2e5a830898af206510992483b427477ed178396cd210235e85fd7bd99a96fc6d5eedbeccbd48317a10f752b7336ada8b2bb826d binutils-2.38.tar.xz -- 2.30.2 From wbx at openadk.org Mon Feb 14 05:15:14 2022 From: wbx at openadk.org (Waldemar Brodkorb) Date: Mon, 14 Feb 2022 06:15:14 +0100 Subject: [Buildroot] [PATCHv2 3/3] package/binutils: make 2.37 the default Message-ID: Signed-off-by: Waldemar Brodkorb --- v1->v2: no changes --- package/binutils/Config.in.host | 2 +- package/binutils/binutils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index 21b15b5c36..e639c67149 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -7,7 +7,7 @@ config BR2_PACKAGE_HOST_BINUTILS_SUPPORTS_CFI choice prompt "Binutils Version" - default BR2_BINUTILS_VERSION_2_36_X if !BR2_arc && !BR2_csky + default BR2_BINUTILS_VERSION_2_37_X if !BR2_arc && !BR2_csky default BR2_BINUTILS_VERSION_ARC if BR2_arc help Select the version of binutils you wish to use. diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index 8c4a1371ca..c94ebe0995 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -11,7 +11,7 @@ ifeq ($(BINUTILS_VERSION),) ifeq ($(BR2_arc),y) BINUTILS_VERSION = arc-2020.09-release else -BINUTILS_VERSION = 2.36.1 +BINUTILS_VERSION = 2.37 endif endif # BINUTILS_VERSION -- 2.30.2 From wbx at openadk.org Mon Feb 14 05:11:03 2022 From: wbx at openadk.org (Waldemar Brodkorb) Date: Mon, 14 Feb 2022 06:11:03 +0100 Subject: [Buildroot] [PATCHv2 1/3] package/binutils: add version 2.38 Message-ID: See: https://sourceware.org/pipermail/binutils/2022-February/119721.html i386-Allow-GOT32-relocations-against-ABS-symbols.patch is not required as it is in release. Signed-off-by: Waldemar Brodkorb --- v1->v2: add a comment about i386 patch --- package/binutils/2.38/0001-sh-conf.patch | 48 +++ .../2.38/0002-poison-system-directories.patch | 306 ++++++++++++++++++ ...or1k-fix-building-with-gcc-version-5.patch | 50 +++ ...K_GOT16-signed-overflow-by-using-spe.patch | 75 +++++ package/binutils/Config.in.host | 7 + package/binutils/binutils.hash | 1 + 6 files changed, 487 insertions(+) create mode 100644 package/binutils/2.38/0001-sh-conf.patch create mode 100644 package/binutils/2.38/0002-poison-system-directories.patch create mode 100644 package/binutils/2.38/0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch create mode 100644 package/binutils/2.38/0004-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch diff --git a/package/binutils/2.38/0001-sh-conf.patch b/package/binutils/2.38/0001-sh-conf.patch new file mode 100644 index 0000000000..fcc597e4d9 --- /dev/null +++ b/package/binutils/2.38/0001-sh-conf.patch @@ -0,0 +1,48 @@ +From 33f3c1f804efc2e4f97849081589efb70cda31e5 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 25 Dec 2015 11:38:13 +0100 +Subject: [PATCH] sh-conf + +Likewise, binutils has no idea about any of these new targets either, so we +fix that up too.. now we're able to actually build a real toolchain for +sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more +inept targets than that one, really. Go look, I promise). + +[Romain: rebase on top of 2.32] +Signed-off-by: Romain Naour +[Thomas: rebase on top of 2.29, in which sh64 support was removed.] +Signed-off-by: Thomas Petazzoni +--- + configure | 2 +- + configure.ac | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 3dd206525a7..6881ce632f5 100755 +--- a/configure ++++ b/configure +@@ -3892,7 +3892,7 @@ case "${target}" in + nvptx*-*-*) + noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" + ;; +- sh-*-*) ++ sh*-*-*) + case "${target}" in + sh*-*-elf) + ;; +diff --git a/configure.ac b/configure.ac +index 797a624621e..1f9256bbf18 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1175,7 +1175,7 @@ case "${target}" in + nvptx*-*-*) + noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" + ;; +- sh-*-*) ++ sh*-*-*) + case "${target}" in + sh*-*-elf) + ;; +-- +2.31.1 + diff --git a/package/binutils/2.38/0002-poison-system-directories.patch b/package/binutils/2.38/0002-poison-system-directories.patch new file mode 100644 index 0000000000..1a5fe46575 --- /dev/null +++ b/package/binutils/2.38/0002-poison-system-directories.patch @@ -0,0 +1,306 @@ +From 4d8705ddb55897e8a74b617ab95736d520d9e1ea Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 25 Dec 2015 11:45:38 +0100 +Subject: [PATCH] poison-system-directories + +Patch adapted to binutils 2.23.2 and extended to use +BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni. + +[Romain: rebase on top of 2.33.1] +Signed-off-by: Romain Naour +[Gustavo: adapt to binutils 2.25] +Signed-off-by: Thomas Petazzoni +Signed-off-by: Gustavo Zacarias + +Upstream-Status: Inappropriate [distribution: codesourcery] + +Patch originally created by Mark Hatle, forward-ported to +binutils 2.21 by Scott Garman. + +purpose: warn for uses of system directories when cross linking + +Code Merged from Sourcery G++ binutils 2.19 - 4.4-277 + +2008-07-02 Joseph Myers + + ld/ + * ld.h (args_type): Add error_poison_system_directories. + * ld.texinfo (--error-poison-system-directories): Document. + * ldfile.c (ldfile_add_library_path): Check + command_line.error_poison_system_directories. + * ldmain.c (main): Initialize + command_line.error_poison_system_directories. + * lexsup.c (enum option_values): Add + OPTION_ERROR_POISON_SYSTEM_DIRECTORIES. + (ld_options): Add --error-poison-system-directories. + (parse_args): Handle new option. + +2007-06-13 Joseph Myers + + ld/ + * config.in: Regenerate. + * ld.h (args_type): Add poison_system_directories. + * ld.texinfo (--no-poison-system-directories): Document. + * ldfile.c (ldfile_add_library_path): Check + command_line.poison_system_directories. + * ldmain.c (main): Initialize + command_line.poison_system_directories. + * lexsup.c (enum option_values): Add + OPTION_NO_POISON_SYSTEM_DIRECTORIES. + (ld_options): Add --no-poison-system-directories. + (parse_args): Handle new option. + +2007-04-20 Joseph Myers + + Merge from Sourcery G++ binutils 2.17: + + 2007-03-20 Joseph Myers + Based on patch by Mark Hatle . + ld/ + * configure.ac (--enable-poison-system-directories): New option. + * configure, config.in: Regenerate. + * ldfile.c (ldfile_add_library_path): If + ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib, + /usr/lib, /usr/local/lib or /usr/X11R6/lib. + +Signed-off-by: Mark Hatle +Signed-off-by: Scott Garman +--- + ld/config.in | 3 +++ + ld/configure | 14 ++++++++++++++ + ld/configure.ac | 10 ++++++++++ + ld/ld.h | 8 ++++++++ + ld/ld.texi | 12 ++++++++++++ + ld/ldfile.c | 17 +++++++++++++++++ + ld/ldlex.h | 2 ++ + ld/ldmain.c | 2 ++ + ld/lexsup.c | 21 +++++++++++++++++++++ + 9 files changed, 89 insertions(+) + +diff --git a/ld/config.in b/ld/config.in +index 26d55a00d47..ffad464783c 100644 +--- a/ld/config.in ++++ b/ld/config.in +@@ -43,6 +43,9 @@ + language is requested. */ + #undef ENABLE_NLS + ++/* Define to warn for use of native system library directories */ ++#undef ENABLE_POISON_SYSTEM_DIRECTORIES ++ + /* Additional extension a shared object might have. */ + #undef EXTRA_SHLIB_EXTENSION + +diff --git a/ld/configure b/ld/configure +index c197aaef3cb..882263aa43f 100755 +--- a/ld/configure ++++ b/ld/configure +@@ -829,6 +829,7 @@ with_lib_path + enable_targets + enable_64_bit_bfd + with_sysroot ++enable_poison_system_directories + enable_gold + enable_got + enable_compressed_debug_sections +@@ -1498,6 +1499,8 @@ Optional Features: + --enable-checking enable run-time checks + --enable-targets alternative target configurations + --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) ++ --enable-poison-system-directories ++ warn for use of native system library directories + --enable-gold[=ARG] build gold [ARG={default,yes,no}] + --enable-got= GOT handling scheme (target, single, negative, + multigot) +@@ -15236,7 +15239,18 @@ else + fi + + ++# Check whether --enable-poison-system-directories was given. ++if test "${enable_poison_system_directories+set}" = set; then : ++ enableval=$enable_poison_system_directories; ++else ++ enable_poison_system_directories=no ++fi ++ ++if test "x${enable_poison_system_directories}" = "xyes"; then + ++$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h ++ ++fi + + # Check whether --enable-got was given. + if test "${enable_got+set}" = set; then : +diff --git a/ld/configure.ac b/ld/configure.ac +index 8ea97c43cd4..0f246db67d8 100644 +--- a/ld/configure.ac ++++ b/ld/configure.ac +@@ -106,6 +106,16 @@ AC_SUBST(use_sysroot) + AC_SUBST(TARGET_SYSTEM_ROOT) + AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) + ++AC_ARG_ENABLE([poison-system-directories], ++ AS_HELP_STRING([--enable-poison-system-directories], ++ [warn for use of native system library directories]),, ++ [enable_poison_system_directories=no]) ++if test "x${enable_poison_system_directories}" = "xyes"; then ++ AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES], ++ [1], ++ [Define to warn for use of native system library directories]) ++fi ++ + dnl Use --enable-gold to decide if this linker should be the default. + dnl "install_as_default" is set to false if gold is the default linker. + dnl "installed_linker" is the installed BFD linker name. +diff --git a/ld/ld.h b/ld/ld.h +index 35fafebfaed..74e66405de6 100644 +--- a/ld/ld.h ++++ b/ld/ld.h +@@ -162,6 +162,14 @@ typedef struct + in the linker script. */ + bool force_group_allocation; + ++ /* If TRUE (the default) warn for uses of system directories when ++ cross linking. */ ++ bool poison_system_directories; ++ ++ /* If TRUE (default FALSE) give an error for uses of system ++ directories when cross linking instead of a warning. */ ++ bool error_poison_system_directories; ++ + /* Big or little endian as set on command line. */ + enum endian_enum endian; + +diff --git a/ld/ld.texi b/ld/ld.texi +index dd8f571d4e4..3ab210b41b9 100644 +--- a/ld/ld.texi ++++ b/ld/ld.texi +@@ -2863,6 +2863,18 @@ string identifying the original linked file does not change. + + Passing @code{none} for @var{style} disables the setting from any + @code{--build-id} options earlier on the command line. ++ ++ at kindex --no-poison-system-directories ++ at item --no-poison-system-directories ++Do not warn for @option{-L} options using system directories such as ++ at file{/usr/lib} when cross linking. This option is intended for use ++in chroot environments when such directories contain the correct ++libraries for the target system rather than the host. ++ ++ at kindex --error-poison-system-directories ++ at item --error-poison-system-directories ++Give an error instead of a warning for @option{-L} options using ++system directories when cross linking. + @end table + + @c man end +diff --git a/ld/ldfile.c b/ld/ldfile.c +index 9d0af06f1f6..7cdd3b1c1b1 100644 +--- a/ld/ldfile.c ++++ b/ld/ldfile.c +@@ -117,6 +117,23 @@ ldfile_add_library_path (const char *name, bool cmdline) + new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); + else + new_dirs->name = xstrdup (name); ++ ++#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES ++ if (command_line.poison_system_directories ++ && ((!strncmp (name, "/lib", 4)) ++ || (!strncmp (name, "/usr/lib", 8)) ++ || (!strncmp (name, "/usr/local/lib", 14)) ++ || (!strncmp (name, "/usr/X11R6/lib", 14)))) ++ { ++ if (command_line.error_poison_system_directories) ++ einfo (_("%X%P: error: library search path \"%s\" is unsafe for " ++ "cross-compilation\n"), name); ++ else ++ einfo (_("%P: warning: library search path \"%s\" is unsafe for " ++ "cross-compilation\n"), name); ++ } ++#endif ++ + } + + /* Try to open a BFD for a lang_input_statement. */ +diff --git a/ld/ldlex.h b/ld/ldlex.h +index 9e8bf5fb835..2f0fadfe0a3 100644 +--- a/ld/ldlex.h ++++ b/ld/ldlex.h +@@ -163,6 +163,8 @@ enum option_values + OPTION_CTF_VARIABLES, + OPTION_NO_CTF_VARIABLES, + OPTION_CTF_SHARE_TYPES, ++ OPTION_NO_POISON_SYSTEM_DIRECTORIES, ++ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, + }; + + /* The initial parser states. */ +diff --git a/ld/ldmain.c b/ld/ldmain.c +index 42660eb9a3c..1aef9387f93 100644 +--- a/ld/ldmain.c ++++ b/ld/ldmain.c +@@ -321,6 +321,8 @@ main (int argc, char **argv) + command_line.warn_mismatch = true; + command_line.warn_search_mismatch = true; + command_line.check_section_addresses = -1; ++ command_line.poison_system_directories = true; ++ command_line.error_poison_system_directories = false; + + /* We initialize DEMANGLING based on the environment variable + COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the +diff --git a/ld/lexsup.c b/ld/lexsup.c +index 00274c500d0..4f23b3a2da2 100644 +--- a/ld/lexsup.c ++++ b/ld/lexsup.c +@@ -595,6 +595,14 @@ static const struct ld_option ld_options[] = + " is: share-unconflicted (default),\n" + " share-duplicated"), + TWO_DASHES }, ++ { {"no-poison-system-directories", no_argument, NULL, ++ OPTION_NO_POISON_SYSTEM_DIRECTORIES}, ++ '\0', NULL, N_("Do not warn for -L options using system directories"), ++ TWO_DASHES }, ++ { {"error-poison-system-directories", no_argument, NULL, ++ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES}, ++ '\0', NULL, N_("Give an error for -L options using system directories"), ++ TWO_DASHES }, + }; + + #define OPTION_COUNT ARRAY_SIZE (ld_options) +@@ -607,6 +615,7 @@ parse_args (unsigned argc, char **argv) + int ingroup = 0; + char *default_dirlist = NULL; + char *shortopts; ++ char *BR_paranoid_env; + struct option *longopts; + struct option *really_longopts; + int last_optind; +@@ -1643,6 +1652,14 @@ parse_args (unsigned argc, char **argv) + } + break; + ++ case OPTION_NO_POISON_SYSTEM_DIRECTORIES: ++ command_line.poison_system_directories = false; ++ break; ++ ++ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: ++ command_line.error_poison_system_directories = true; ++ break; ++ + case OPTION_PUSH_STATE: + input_flags.pushed = xmemdup (&input_flags, + sizeof (input_flags), +@@ -1788,6 +1805,10 @@ parse_args (unsigned argc, char **argv) + command_line.soname = NULL; + } + ++ BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH"); ++ if (BR_paranoid_env && strlen(BR_paranoid_env) > 0) ++ command_line.error_poison_system_directories = true; ++ + while (ingroup) + { + einfo (_("%P: missing --end-group; added as last command line option\n")); +-- +2.31.1 + diff --git a/package/binutils/2.38/0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch b/package/binutils/2.38/0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch new file mode 100644 index 0000000000..bfd531b818 --- /dev/null +++ b/package/binutils/2.38/0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch @@ -0,0 +1,50 @@ +From ef4ba1da823e8366ea4f126f50885a44ebf4dcf0 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Wed, 9 Jun 2021 17:28:27 +0200 +Subject: [PATCH] bfd/elf32-or1k: fix building with gcc version < 5 + +Gcc version >= 5 has standard C mode not set to -std=gnu11, so if we use +an old compiler(i.e. gcc 4.9) build fails on: +``` +elf32-or1k.c:2251:3: error: 'for' loop initial declarations are only allowed in +C99 or C11 mode + for (size_t i = 0; i < insn_count; i++) + ^ +``` + +So let's declare `size_t i` at the top of the function instead of inside +for loop. + +Signed-off-by: Giulio Benetti +--- + bfd/elf32-or1k.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c +index 4ae7f324d33..32063ab0289 100644 +--- a/bfd/elf32-or1k.c ++++ b/bfd/elf32-or1k.c +@@ -2244,9 +2244,10 @@ or1k_write_plt_entry (bfd *output_bfd, bfd_byte *contents, unsigned insnj, + { + unsigned nodelay = elf_elfheader (output_bfd)->e_flags & EF_OR1K_NODELAY; + unsigned output_insns[PLT_MAX_INSN_COUNT]; ++ size_t i; + + /* Copy instructions into the output buffer. */ +- for (size_t i = 0; i < insn_count; i++) ++ for (i = 0; i < insn_count; i++) + output_insns[i] = insns[i]; + + /* Honor the no-delay-slot setting. */ +@@ -2277,7 +2278,7 @@ or1k_write_plt_entry (bfd *output_bfd, bfd_byte *contents, unsigned insnj, + } + + /* Write out the output buffer. */ +- for (size_t i = 0; i < (insn_count+1); i++) ++ for (i = 0; i < (insn_count+1); i++) + bfd_put_32 (output_bfd, output_insns[i], contents + (i*4)); + } + +-- +2.31.1 + diff --git a/package/binutils/2.38/0004-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch b/package/binutils/2.38/0004-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch new file mode 100644 index 0000000000..8609db95b7 --- /dev/null +++ b/package/binutils/2.38/0004-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 + diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index ea1f020989..17de6e4e41 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -36,6 +36,12 @@ config BR2_BINUTILS_VERSION_2_37_X # https://github.com/uclinux-dev/elf2flt/issues/12 depends on !BR2_BINFMT_FLAT +config BR2_BINUTILS_VERSION_2_38_X + bool "binutils 2.38" + # https://github.com/uclinux-dev/elf2flt/pull/16 + # https://github.com/uclinux-dev/elf2flt/issues/12 + depends on !BR2_BINFMT_FLAT + config BR2_BINUTILS_VERSION_ARC bool "binutils arc (2.34.50)" depends on BR2_arc @@ -49,6 +55,7 @@ config BR2_BINUTILS_VERSION default "2.35.2" if BR2_BINUTILS_VERSION_2_35_X default "2.36.1" if BR2_BINUTILS_VERSION_2_36_X default "2.37" if BR2_BINUTILS_VERSION_2_37_X + default "2.38" if BR2_BINUTILS_VERSION_2_38_X config BR2_BINUTILS_ENABLE_LTO bool diff --git a/package/binutils/binutils.hash b/package/binutils/binutils.hash index d1be6cbce8..fe31b34d40 100644 --- a/package/binutils/binutils.hash +++ b/package/binutils/binutils.hash @@ -3,6 +3,7 @@ sha512 d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724a sha512 9974ede5978d32e0d68fef23da48fa00bd06b0bff7ec45b00ca075c126d6bbe0cf2defc03ecc3f17bc6cc85b64271a13009c4049d7ba17de26e84e3a6e2c0348 binutils-2.35.2.tar.xz sha512 cc24590bcead10b90763386b6f96bb027d7594c659c2d95174a6352e8b98465a50ec3e4088d0da038428abe059bbc4ae5f37b269f31a40fc048072c8a234f4e9 binutils-2.36.1.tar.xz sha512 5c11aeef6935860a6819ed3a3c93371f052e52b4bdc5033da36037c1544d013b7f12cb8d561ec954fe7469a68f1b66f1a3cd53d5a3af7293635a90d69edd15e7 binutils-2.37.tar.xz +sha512 8bf0b0d193c9c010e0518ee2b2e5a830898af206510992483b427477ed178396cd210235e85fd7bd99a96fc6d5eedbeccbd48317a10f752b7336ada8b2bb826d binutils-2.38.tar.xz # Locally calculated (fetched from Github) sha512 76a8227a19218435319c660e4983ea17985194b7f496f163e97543e7f6fd3e9249241fdc05a16ba512fba96a1d846c1f7b080983404d821d6215f10e7f11e238 binutils-gdb-arc-2020.09-release.tar.gz -- 2.30.2 From james.hilliard1 at gmail.com Mon Feb 14 04:19:27 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 13 Feb 2022 21:19:27 -0700 Subject: [Buildroot] [PATCH v7 3/5] package/qt5/qt5webengine-chromium: new package In-Reply-To: <20220214041929.1916468-1-james.hilliard1@gmail.com> References: <20220214041929.1916468-1-james.hilliard1@gmail.com> Message-ID: <20220214041929.1916468-3-james.hilliard1@gmail.com> 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. Signed-off-by: James Hilliard --- package/qt5/Config.in | 1 + .../0001-Add-python3-build-support.patch | 1858 +++++++++++++++++ .../0002-Don-t-rebase-sysroot-path.patch | 32 + package/qt5/qt5webengine-chromium/Config.in | 5 + .../qt5webengine-chromium/chromium-latest.inc | 1257 +++++++++++ .../qt5webengine-chromium.hash | 1256 +++++++++++ .../qt5webengine-chromium.mk | 23 + 7 files changed, 4432 insertions(+) create mode 100644 package/qt5/qt5webengine-chromium/0001-Add-python3-build-support.patch create mode 100644 package/qt5/qt5webengine-chromium/0002-Don-t-rebase-sysroot-path.patch 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 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/qt5webengine-chromium/0001-Add-python3-build-support.patch b/package/qt5/qt5webengine-chromium/0001-Add-python3-build-support.patch new file mode 100644 index 0000000000..cc9726418e --- /dev/null +++ b/package/qt5/qt5webengine-chromium/0001-Add-python3-build-support.patch @@ -0,0 +1,1858 @@ +From bf94b834e9beb4e7bc25dbc4c61f5e2db39e7cdc Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Fri, 4 Feb 2022 15:43:35 -0700 +Subject: [PATCH] Add python3 build support + +Adapted from: +https://github.com/archlinux/svntogit-packages/blob/6edf5f1aaea952d046aff89a2e0175258fe77361/trunk/qt5-webengine-chromium-python3.patch + +Signed-off-by: James Hilliard +--- + .../protobufs/binary_proto_generator.py | 8 +- + .../tracing/generate_trace_viewer_grd.py | 2 +- + chromium/mojo/public/tools/bindings/BUILD.gn | 2 + + .../tools/bindings/gen_data_files_list.py | 8 +- + .../generators/mojom_java_generator.py | 4 + + .../tools/mojom/mojom/generate/generator.py | 14 ++-- + .../tools/mojom/mojom/generate/module.py | 3 +- + .../mojom/mojom/generate/template_expander.py | 12 +-- + .../scripts/bind_gen/blink_v8_bridge.py | 6 +- + .../scripts/bind_gen/callback_interface.py | 2 +- + .../bindings/scripts/bind_gen/code_node.py | 10 +-- + .../bindings/scripts/bind_gen/codegen_expr.py | 15 ++-- + .../scripts/bind_gen/codegen_format.py | 2 +- + .../scripts/bind_gen/codegen_utils.py | 2 +- + .../bindings/scripts/bind_gen/dictionary.py | 2 +- + .../bindings/scripts/bind_gen/interface.py | 82 +++++++++++-------- + .../scripts/bind_gen/mako_renderer.py | 2 +- + .../bindings/scripts/bind_gen/style_format.py | 9 +- + .../bindings/scripts/bind_gen/task_queue.py | 5 +- + .../bindings/scripts/code_generator.py | 10 +++ + .../scripts/generate_origin_trial_features.py | 4 +- + .../bindings/scripts/idl_definitions.py | 8 +- + .../renderer/bindings/scripts/idl_reader.py | 4 +- + .../renderer/bindings/scripts/idl_types.py | 2 +- + .../renderer/bindings/scripts/utilities.py | 28 +++---- + .../renderer/bindings/scripts/v8_interface.py | 9 +- + .../renderer/bindings/scripts/v8_methods.py | 4 + + .../renderer/bindings/scripts/v8_utilities.py | 2 +- + .../scripts/web_idl/callback_interface.py | 12 +-- + .../bindings/scripts/web_idl/database.py | 2 +- + .../bindings/scripts/web_idl/exposure.py | 5 +- + .../bindings/scripts/web_idl/function_like.py | 28 +++---- + .../bindings/scripts/web_idl/idl_compiler.py | 21 ++--- + .../bindings/scripts/web_idl/interface.py | 45 +++++----- + .../bindings/scripts/web_idl/ir_builder.py | 29 ++++--- + .../bindings/scripts/web_idl/make_copy.py | 7 ++ + .../bindings/scripts/web_idl/namespace.py | 12 +-- + .../bindings/templates/dictionary_v8.cc.tmpl | 8 +- + .../scripts/core/css/make_style_shorthands.py | 23 +++--- + .../properties/make_css_property_instances.py | 4 +- + .../blink/renderer/build/scripts/gperf.py | 2 +- + .../blink/renderer/build/scripts/in_file.py | 2 +- + .../renderer/build/scripts/in_generator.py | 5 ++ + .../build/scripts/make_runtime_features.py | 2 +- + .../scripts/templates/element_factory.cc.tmpl | 4 +- + .../templates/element_type_helpers.cc.tmpl | 4 +- + .../templates/element_type_helpers.h.tmpl | 2 +- + .../build/scripts/templates/macros.tmpl | 4 +- + .../templates/make_qualified_names.h.tmpl | 4 +- + .../dawn/generator/generator_lib.py | 4 + + .../devtools-frontend/src/BUILD.gn | 2 + + .../scripts/build/build_inspector_overlay.py | 3 +- + .../build/build_release_applications.py | 9 +- + .../scripts/build/generate_devtools_grd.py | 4 +- + .../src/scripts/build/modular_build.py | 6 +- + chromium/third_party/jinja2/tests.py | 2 +- + chromium/tools/metrics/ukm/gen_builders.py | 5 +- + .../ui/ozone/generate_constructor_list.py | 13 ++- + .../ui/ozone/generate_ozone_platform_list.py | 26 ++++-- + 59 files changed, 331 insertions(+), 229 deletions(-) + +diff --git a/chromium/components/resources/protobufs/binary_proto_generator.py b/chromium/components/resources/protobufs/binary_proto_generator.py +index 7422ead9697..16365515f26 100755 +--- a/chromium/components/resources/protobufs/binary_proto_generator.py ++++ b/chromium/components/resources/protobufs/binary_proto_generator.py +@@ -7,7 +7,7 @@ + Converts a given ASCII proto into a binary resource. + + """ +- ++from __future__ import print_function + import abc + import imp + import optparse +@@ -196,12 +196,12 @@ class BinaryProtoGenerator: + self._ImportProtoModules(opts.path) + + if not self.VerifyArgs(opts): +- print "Wrong arguments" ++ print("Wrong arguments") + return 1 + + try: + self._GenerateBinaryProtos(opts) + except Exception as e: +- print "ERROR: Failed to render binary version of %s:\n %s\n%s" % ( +- opts.infile, str(e), traceback.format_exc()) ++ print("ERROR: Failed to render binary version of %s:\n %s\n%s" % ++ (opts.infile, str(e), traceback.format_exc())) + return 1 +diff --git a/chromium/content/browser/tracing/generate_trace_viewer_grd.py b/chromium/content/browser/tracing/generate_trace_viewer_grd.py +index 037f9497dc2..be393d21f90 100755 +--- a/chromium/content/browser/tracing/generate_trace_viewer_grd.py ++++ b/chromium/content/browser/tracing/generate_trace_viewer_grd.py +@@ -74,7 +74,7 @@ def main(argv): + for filename in parsed_args.source_files: + add_file_to_grd(doc, os.path.basename(filename)) + +- with open(parsed_args.output_filename, 'w') as output_file: ++ with open(parsed_args.output_filename, 'wb') as output_file: + output_file.write(doc.toxml(encoding='UTF-8')) + + +diff --git a/chromium/mojo/public/tools/bindings/BUILD.gn b/chromium/mojo/public/tools/bindings/BUILD.gn +index fc04b5dd0b1..708958e438b 100644 +--- a/chromium/mojo/public/tools/bindings/BUILD.gn ++++ b/chromium/mojo/public/tools/bindings/BUILD.gn +@@ -2,9 +2,11 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import("//build/config/python.gni") + import("//mojo/public/tools/bindings/mojom.gni") + import("//third_party/jinja2/jinja2.gni") + ++# TODO(crbug.com/1194274): Investigate nondeterminism in Py3 builds. + action("precompile_templates") { + sources = mojom_generator_sources + sources += [ +diff --git a/chromium/mojo/public/tools/bindings/gen_data_files_list.py b/chromium/mojo/public/tools/bindings/gen_data_files_list.py +index 79c9e50efce..8b78d092418 100644 +--- a/chromium/mojo/public/tools/bindings/gen_data_files_list.py ++++ b/chromium/mojo/public/tools/bindings/gen_data_files_list.py +@@ -18,7 +18,6 @@ import os + import re + import sys + +-from cStringIO import StringIO + from optparse import OptionParser + + sys.path.insert( +@@ -41,12 +40,9 @@ def main(): + pattern = re.compile(options.pattern) + files = [f for f in os.listdir(options.directory) if pattern.match(f)] + +- stream = StringIO() +- for f in files: +- print(f, file=stream) ++ contents = '\n'.join(f for f in files) + '\n' ++ WriteFile(contents, options.output) + +- WriteFile(stream.getvalue(), options.output) +- stream.close() + + if __name__ == '__main__': + sys.exit(main()) +diff --git a/chromium/mojo/public/tools/bindings/generators/mojom_java_generator.py b/chromium/mojo/public/tools/bindings/generators/mojom_java_generator.py +index 96b2fdfae0c..00b9dccd00c 100644 +--- a/chromium/mojo/public/tools/bindings/generators/mojom_java_generator.py ++++ b/chromium/mojo/public/tools/bindings/generators/mojom_java_generator.py +@@ -25,6 +25,10 @@ sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir, + 'build', 'android', 'gyp')) + from util import build_utils + ++# TODO(crbug.com/1174969): Remove this once Python2 is obsoleted. ++if sys.version_info.major != 2: ++ basestring = str ++ long = int + + GENERATOR_PREFIX = 'java' + +diff --git a/chromium/mojo/public/tools/mojom/mojom/generate/generator.py b/chromium/mojo/public/tools/mojom/mojom/generate/generator.py +index de62260a5c9..4a1c73fcf82 100644 +--- a/chromium/mojo/public/tools/mojom/mojom/generate/generator.py ++++ b/chromium/mojo/public/tools/mojom/mojom/generate/generator.py +@@ -136,9 +136,14 @@ class Stylizer(object): + + def WriteFile(contents, full_path): + # If |contents| is same with the file content, we skip updating. ++ if not isinstance(contents, bytes): ++ data = contents.encode('utf8') ++ else: ++ data = contents ++ + if os.path.isfile(full_path): + with open(full_path, 'rb') as destination_file: +- if destination_file.read() == contents: ++ if destination_file.read() == data: + return + + # Make sure the containing directory exists. +@@ -146,11 +151,8 @@ def WriteFile(contents, full_path): + fileutil.EnsureDirectoryExists(full_dir) + + # Dump the data to disk. +- with open(full_path, "wb") as f: +- if not isinstance(contents, bytes): +- f.write(contents.encode('utf-8')) +- else: +- f.write(contents) ++ with open(full_path, 'wb') as f: ++ f.write(data) + + + def AddComputedData(module): +diff --git a/chromium/mojo/public/tools/mojom/mojom/generate/module.py b/chromium/mojo/public/tools/mojom/mojom/generate/module.py +index ebbc9b322ea..3d026429bbc 100644 +--- a/chromium/mojo/public/tools/mojom/mojom/generate/module.py ++++ b/chromium/mojo/public/tools/mojom/mojom/generate/module.py +@@ -398,7 +398,8 @@ class Field(object): + + + class StructField(Field): +- pass ++ def __hash__(self): ++ return super(Field, self).__hash__() + + + class UnionField(Field): +diff --git a/chromium/mojo/public/tools/mojom/mojom/generate/template_expander.py b/chromium/mojo/public/tools/mojom/mojom/generate/template_expander.py +index 7a300560246..8d9e26fb7f6 100644 +--- a/chromium/mojo/public/tools/mojom/mojom/generate/template_expander.py ++++ b/chromium/mojo/public/tools/mojom/mojom/generate/template_expander.py +@@ -75,9 +75,9 @@ def PrecompileTemplates(generator_modules, output_dir): + os.path.dirname(module.__file__), generator.GetTemplatePrefix()) + ])) + jinja_env.filters.update(generator.GetFilters()) +- jinja_env.compile_templates( +- os.path.join(output_dir, "%s.zip" % generator.GetTemplatePrefix()), +- extensions=["tmpl"], +- zip="stored", +- py_compile=True, +- ignore_errors=False) ++ jinja_env.compile_templates(os.path.join( ++ output_dir, "%s.zip" % generator.GetTemplatePrefix()), ++ extensions=["tmpl"], ++ zip="stored", ++ py_compile=sys.version_info.major < 3, ++ ignore_errors=False) +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/blink_v8_bridge.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/blink_v8_bridge.py +index 3225ecca6e4..fc078d31b55 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/blink_v8_bridge.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/blink_v8_bridge.py +@@ -344,7 +344,7 @@ def make_default_value_expr(idl_type, default_value): + """ + assert default_value.is_type_compatible_with(idl_type) + +- class DefaultValueExpr: ++ class DefaultValueExpr(object): + _ALLOWED_SYMBOLS_IN_DEPS = ("isolate") + + def __init__(self, initializer_expr, initializer_deps, +@@ -502,7 +502,7 @@ def make_v8_to_blink_value(blink_var_name, + assert isinstance(blink_var_name, str) + assert isinstance(v8_value_expr, str) + assert isinstance(idl_type, web_idl.IdlType) +- assert (argument_index is None or isinstance(argument_index, (int, long))) ++ assert (argument_index is None or isinstance(argument_index, int)) + assert (default_value is None + or isinstance(default_value, web_idl.LiteralConstant)) + +@@ -622,7 +622,7 @@ def make_v8_to_blink_value_variadic(blink_var_name, v8_array, + """ + assert isinstance(blink_var_name, str) + assert isinstance(v8_array, str) +- assert isinstance(v8_array_start_index, (int, long)) ++ assert isinstance(v8_array_start_index, int) + assert isinstance(idl_type, web_idl.IdlType) + + pattern = ("auto&& ${{{_1}}} = " +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/callback_interface.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/callback_interface.py +index 4a6df513068..8b51f23a409 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/callback_interface.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/callback_interface.py +@@ -177,7 +177,7 @@ def generate_callback_interface(callback_interface_identifier): + prop_install_mode=PropInstallMode.UNCONDITIONAL, + trampoline_var_name=None, + attribute_entries=[], +- constant_entries=filter(is_unconditional, constant_entries), ++ constant_entries=list(filter(is_unconditional, constant_entries)), + exposed_construct_entries=[], + operation_entries=[]) + (install_interface_template_decl, install_interface_template_def, +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/code_node.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/code_node.py +index 52972fefe20..e5ae9d9629e 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/code_node.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/code_node.py +@@ -503,13 +503,13 @@ class CompositeNode(CodeNode): + gensym_kwargs = {} + template_vars = {} + for arg in args: +- assert isinstance(arg, (CodeNode, int, long, str)) ++ assert isinstance(arg, (CodeNode, int, str)) + gensym = CodeNode.gensym() + gensym_args.append("${{{}}}".format(gensym)) + template_vars[gensym] = arg + for key, value in kwargs.items(): +- assert isinstance(key, (int, long, str)) +- assert isinstance(value, (CodeNode, int, long, str)) ++ assert isinstance(key, (int, str)) ++ assert isinstance(value, (CodeNode, int, str)) + gensym = CodeNode.gensym() + gensym_kwargs[key] = "${{{}}}".format(gensym) + template_vars[gensym] = value +@@ -602,7 +602,7 @@ class ListNode(CodeNode): + def insert(self, index, node): + if node is None: + return +- assert isinstance(index, (int, long)) ++ assert isinstance(index, int) + assert isinstance(node, CodeNode) + assert node.outer is None and node.prev is None + +@@ -721,7 +721,7 @@ class SymbolScopeNode(SequenceNode): + if not scope_chains: + return counts + +- self_index = iter(scope_chains).next().index(self) ++ self_index = next(iter(scope_chains)).index(self) + scope_chains = map( + lambda scope_chain: scope_chain[self_index + 1:], scope_chains) + scope_to_likeliness = {} +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_expr.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_expr.py +index a229a6c71c9..5fa288dabf2 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_expr.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_expr.py +@@ -109,7 +109,7 @@ def expr_and(terms): + + if any(term.is_always_false for term in terms): + return _Expr(False) +- terms = filter(lambda x: not x.is_always_true, terms) ++ terms = list(filter(lambda x: not x.is_always_true, terms)) + if not terms: + return _Expr(True) + if len(terms) == 1: +@@ -124,7 +124,7 @@ def expr_or(terms): + + if any(term.is_always_true for term in terms): + return _Expr(True) +- terms = filter(lambda x: not x.is_always_false, terms) ++ terms = list(filter(lambda x: not x.is_always_false, terms)) + if not terms: + return _Expr(False) + if len(terms) == 1: +@@ -222,7 +222,7 @@ def expr_from_exposure(exposure, + elif exposure.only_in_secure_contexts is False: + secure_context_term = _Expr(True) + else: +- terms = map(ref_enabled, exposure.only_in_secure_contexts) ++ terms = list(map(ref_enabled, exposure.only_in_secure_contexts)) + secure_context_term = expr_or( + [_Expr("${is_in_secure_context}"), + expr_not(expr_and(terms))]) +@@ -275,10 +275,11 @@ def expr_from_exposure(exposure, + + # [ContextEnabled] + if exposure.context_enabled_features: +- terms = map( +- lambda feature: _Expr( +- "${{context_feature_settings}}->is{}Enabled()".format( +- feature)), exposure.context_enabled_features) ++ terms = list( ++ map( ++ lambda feature: _Expr( ++ "${{context_feature_settings}}->is{}Enabled()".format( ++ feature)), exposure.context_enabled_features)) + context_enabled_terms.append( + expr_and([_Expr("${context_feature_settings}"), + expr_or(terms)])) +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_format.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_format.py +index 87d26eec3ca..f3e9d38247e 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_format.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_format.py +@@ -23,7 +23,7 @@ class _TemplateFormatter(string.Formatter): + self._template_formatter_indexing_count_ = 0 + + def get_value(self, key, args, kwargs): +- if isinstance(key, (int, long)): ++ if isinstance(key, int): + return args[key] + assert isinstance(key, str) + if not key: +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_utils.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_utils.py +index 2bcc4fed49a..e72282aa696 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_utils.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_utils.py +@@ -116,4 +116,4 @@ def write_code_node_to_file(code_node, filepath): + # stderr=format_result.error_message)) + # + # web_idl.file_io.write_to_file_if_changed(filepath, format_result.contents) +- web_idl.file_io.write_to_file_if_changed(filepath, rendered_text) ++ web_idl.file_io.write_to_file_if_changed(filepath, rendered_text.encode('utf-8')) +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/dictionary.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/dictionary.py +index b39f0100410..4d68202296b 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/dictionary.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/dictionary.py +@@ -993,7 +993,7 @@ def make_dict_trace_func(cg_context): + _2 = _blink_member_name(member).value_var + return TextNode(_format(pattern, _1=_1, _2=_2)) + +- body.extend(map(make_trace_member_node, own_members)) ++ body.extend(list(map(make_trace_member_node, own_members))) + body.append(TextNode("BaseClass::Trace(visitor);")) + + return func_decl, func_def +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py +index 10ff30656ad..bfdf7128aac 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py +@@ -582,7 +582,7 @@ def _make_blink_api_call(code_node, + overriding_args=None): + assert isinstance(code_node, SymbolScopeNode) + assert isinstance(cg_context, CodeGenContext) +- assert num_of_args is None or isinstance(num_of_args, (int, long)) ++ assert num_of_args is None or isinstance(num_of_args, int) + assert (overriding_args is None + or (isinstance(overriding_args, (list, tuple)) + and all(isinstance(arg, str) for arg in overriding_args))) +@@ -1196,8 +1196,10 @@ def make_overload_dispatcher(cg_context): + did_use_break = did_use_break or can_fail + + conditional = expr_or( +- map(lambda item: expr_from_exposure(item.function_like.exposure), +- items)) ++ list( ++ map( ++ lambda item: expr_from_exposure(item.function_like.exposure ++ ), items))) + if not conditional.is_always_true: + node = CxxUnlikelyIfNode(cond=conditional, body=node) + +@@ -4642,7 +4644,7 @@ class _PropEntryConstructorGroup(_PropEntryBase): + def __init__(self, is_context_dependent, exposure_conditional, world, + constructor_group, ctor_callback_name, ctor_func_length): + assert isinstance(ctor_callback_name, str) +- assert isinstance(ctor_func_length, (int, long)) ++ assert isinstance(ctor_func_length, int) + + _PropEntryBase.__init__(self, is_context_dependent, + exposure_conditional, world, constructor_group) +@@ -4670,7 +4672,7 @@ class _PropEntryOperationGroup(_PropEntryBase): + op_func_length, + no_alloc_direct_callback_name=None): + assert isinstance(op_callback_name, str) +- assert isinstance(op_func_length, (int, long)) ++ assert isinstance(op_func_length, int) + + _PropEntryBase.__init__(self, is_context_dependent, + exposure_conditional, world, operation_group) +@@ -5175,9 +5177,9 @@ def make_install_interface_template(cg_context, function_name, class_name, api_c + ]) + + if class_like.identifier == "CSSStyleDeclaration": +- css_properties = filter( +- lambda attr: "CSSProperty" in attr.extended_attributes, +- class_like.attributes) ++ css_properties = list( ++ filter(lambda attr: "CSSProperty" in attr.extended_attributes, ++ class_like.attributes)) + if css_properties: + prop_name_list = "".join( + map(lambda attr: "\"{}\", ".format(attr.identifier), +@@ -5567,8 +5569,8 @@ ${instance_object} = ${v8_context}->Global()->GetPrototype().As();\ + "V8DOMConfiguration::InstallConstants(${isolate}, " + "${interface_template}, ${prototype_template}, " + "kConstantCallbackTable, base::size(kConstantCallbackTable));") +- constant_callback_entries = filter(lambda entry: entry.const_callback_name, +- constant_entries) ++ constant_callback_entries = list(filter(lambda entry: entry.const_callback_name, ++ constant_entries)) + install_properties(table_name, constant_callback_entries, + _make_constant_callback_registration_table, + installer_call_text) +@@ -5584,8 +5586,8 @@ ${instance_object} = ${v8_context}->Global()->GetPrototype().As();\ + "V8DOMConfiguration::InstallConstants(${isolate}, " + "${interface_template}, ${prototype_template}, " + "kConstantValueTable, base::size(kConstantValueTable));") +- constant_value_entries = filter( +- lambda entry: not entry.const_callback_name, constant_entries) ++ constant_value_entries = list(filter( ++ lambda entry: not entry.const_callback_name, constant_entries)) + install_properties(table_name, constant_value_entries, + _make_constant_value_registration_table, + installer_call_text) +@@ -6336,8 +6338,8 @@ def make_v8_context_snapshot_api(cg_context, component, attribute_entries, + assert isinstance(component, web_idl.Component) + + derived_interfaces = cg_context.interface.deriveds +- derived_names = map(lambda interface: interface.identifier, +- derived_interfaces) ++ derived_names = list( ++ map(lambda interface: interface.identifier, derived_interfaces)) + derived_names.append(cg_context.interface.identifier) + if not ("Window" in derived_names or "HTMLDocument" in derived_names): + return None, None +@@ -6411,9 +6413,11 @@ def _make_v8_context_snapshot_get_reference_table_function( + collect_callbacks(named_properties_object_callback_defs) + collect_callbacks(cross_origin_property_callback_defs) + +- entry_nodes = map( +- lambda name: TextNode("reinterpret_cast({}),".format(name)), +- filter(None, callback_names)) ++ entry_nodes = list( ++ map( ++ lambda name: TextNode("reinterpret_cast({}),".format(name ++ )), ++ filter(None, callback_names))) + table_node = ListNode([ + TextNode("using namespace ${class_name}Callbacks;"), + TextNode("static const intptr_t kReferenceTable[] = {"), +@@ -6451,10 +6455,11 @@ def _make_v8_context_snapshot_install_props_per_context_function( + class_name=None, + prop_install_mode=PropInstallMode.V8_CONTEXT_SNAPSHOT, + trampoline_var_name=None, +- attribute_entries=filter(selector, attribute_entries), +- constant_entries=filter(selector, constant_entries), +- exposed_construct_entries=filter(selector, exposed_construct_entries), +- operation_entries=filter(selector, operation_entries)) ++ attribute_entries=list(filter(selector, attribute_entries)), ++ constant_entries=list(filter(selector, constant_entries)), ++ exposed_construct_entries=list( ++ filter(selector, exposed_construct_entries)), ++ operation_entries=list(filter(selector, operation_entries))) + + return func_decl, func_def + +@@ -6810,11 +6815,11 @@ def generate_interface(interface_identifier): + class_name=impl_class_name, + prop_install_mode=PropInstallMode.UNCONDITIONAL, + trampoline_var_name=tp_install_unconditional_props, +- attribute_entries=filter(is_unconditional, attribute_entries), +- constant_entries=filter(is_unconditional, constant_entries), +- exposed_construct_entries=filter(is_unconditional, +- exposed_construct_entries), +- operation_entries=filter(is_unconditional, operation_entries)) ++ attribute_entries=list(filter(is_unconditional, attribute_entries)), ++ constant_entries=list(filter(is_unconditional, constant_entries)), ++ exposed_construct_entries=list( ++ filter(is_unconditional, exposed_construct_entries)), ++ operation_entries=list(filter(is_unconditional, operation_entries))) + (install_context_independent_props_decl, + install_context_independent_props_def, + install_context_independent_props_trampoline) = make_install_properties( +@@ -6823,11 +6828,14 @@ def generate_interface(interface_identifier): + class_name=impl_class_name, + prop_install_mode=PropInstallMode.CONTEXT_INDEPENDENT, + trampoline_var_name=tp_install_context_independent_props, +- attribute_entries=filter(is_context_independent, attribute_entries), +- constant_entries=filter(is_context_independent, constant_entries), +- exposed_construct_entries=filter(is_context_independent, +- exposed_construct_entries), +- operation_entries=filter(is_context_independent, operation_entries)) ++ attribute_entries=list( ++ filter(is_context_independent, attribute_entries)), ++ constant_entries=list(filter(is_context_independent, ++ constant_entries)), ++ exposed_construct_entries=list( ++ filter(is_context_independent, exposed_construct_entries)), ++ operation_entries=list( ++ filter(is_context_independent, operation_entries))) + (install_context_dependent_props_decl, install_context_dependent_props_def, + install_context_dependent_props_trampoline) = make_install_properties( + cg_context, +@@ -6835,11 +6843,13 @@ def generate_interface(interface_identifier): + class_name=impl_class_name, + prop_install_mode=PropInstallMode.CONTEXT_DEPENDENT, + trampoline_var_name=tp_install_context_dependent_props, +- attribute_entries=filter(is_context_dependent, attribute_entries), +- constant_entries=filter(is_context_dependent, constant_entries), +- exposed_construct_entries=filter(is_context_dependent, +- exposed_construct_entries), +- operation_entries=filter(is_context_dependent, operation_entries)) ++ attribute_entries=list(filter(is_context_dependent, ++ attribute_entries)), ++ constant_entries=list(filter(is_context_dependent, constant_entries)), ++ exposed_construct_entries=list( ++ filter(is_context_dependent, exposed_construct_entries)), ++ operation_entries=list(filter(is_context_dependent, ++ operation_entries))) + (install_interface_template_decl, install_interface_template_def, + install_interface_template_trampoline) = make_install_interface_template( + cg_context, +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/mako_renderer.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/mako_renderer.py +index b4c70553863..f3a2fcd772d 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/mako_renderer.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/mako_renderer.py +@@ -105,7 +105,7 @@ class MakoRenderer(object): + on_error = self._caller_stack_on_error + if (len(current) <= len(on_error) + and all(current[i] == on_error[i] +- for i in xrange(len(current)))): ++ for i in range(len(current)))): + pass # Error happened in a deeper caller. + else: + self._caller_stack_on_error = list(self._caller_stack) +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py +index dc3493cc394..017d3d47bb3 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py +@@ -70,8 +70,13 @@ def gn_format(contents, filename=None): + + + def _invoke_format_command(command_line, filename, contents): +- proc = subprocess.Popen( +- command_line, stdin=subprocess.PIPE, stdout=subprocess.PIPE) ++ kwargs = {} ++ if sys.version_info.major != 2: ++ kwargs['encoding'] = 'utf-8' ++ proc = subprocess.Popen(command_line, ++ stdin=subprocess.PIPE, ++ stdout=subprocess.PIPE, ++ **kwargs) + stdout_output, stderr_output = proc.communicate(input=contents) + exit_code = proc.wait() + +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/task_queue.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/task_queue.py +index 0d8f4c0f303..e666a9b668e 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/task_queue.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/task_queue.py +@@ -2,6 +2,7 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import functools + import multiprocessing + + from .package_initializer import package_initializer +@@ -76,7 +77,7 @@ class TaskQueue(object): + if not report_progress: + return + +- done_count = reduce( ++ done_count = functools.reduce( + lambda count, worker_task: count + bool(worker_task.ready()), + self._worker_tasks, 0) + report_progress(len(self._worker_tasks), done_count) +@@ -85,4 +86,4 @@ class TaskQueue(object): + def _task_queue_run_tasks(tasks): + for task in tasks: + func, args, kwargs = task +- apply(func, args, kwargs) ++ func(*args, **kwargs) +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/code_generator.py b/chromium/third_party/blink/renderer/bindings/scripts/code_generator.py +index e8280be7213..e49e6eb965e 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/code_generator.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/code_generator.py +@@ -13,6 +13,7 @@ import re + import sys + + from idl_types import set_ancestors, IdlType ++from itertools import groupby + from v8_globals import includes + from v8_interface import constant_filters + from v8_types import set_component_dirs +@@ -43,6 +44,7 @@ TEMPLATES_DIR = os.path.normpath( + # after path[0] == invoking script dir + sys.path.insert(1, THIRD_PARTY_DIR) + import jinja2 ++from jinja2.filters import make_attrgetter, environmentfilter + + + def generate_indented_conditional(code, conditional): +@@ -88,6 +90,13 @@ def runtime_enabled_if(code, name): + return generate_indented_conditional(code, function) + + ++ at environmentfilter ++def do_stringify_key_group_by(environment, value, attribute): ++ expr = make_attrgetter(environment, attribute) ++ key = lambda item: '' if expr(item) is None else str(expr(item)) ++ return groupby(sorted(value, key=key), expr) ++ ++ + def initialize_jinja_env(cache_dir): + jinja_env = jinja2.Environment( + loader=jinja2.FileSystemLoader(TEMPLATES_DIR), +@@ -117,6 +126,7 @@ def initialize_jinja_env(cache_dir): + }) + jinja_env.filters.update(constant_filters()) + jinja_env.filters.update(method_filters()) ++ jinja_env.filters["stringifykeygroupby"] = do_stringify_key_group_by + return jinja_env + + +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/generate_origin_trial_features.py b/chromium/third_party/blink/renderer/bindings/scripts/generate_origin_trial_features.py +index 130004eae83..04c0fabcef2 100755 +--- a/chromium/third_party/blink/renderer/bindings/scripts/generate_origin_trial_features.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/generate_origin_trial_features.py +@@ -80,7 +80,7 @@ def read_idl_file(reader, idl_filename): + assert len(interfaces) == 1, ( + "Expected one interface in file %r, found %d" % + (idl_filename, len(interfaces))) +- return (interfaces.values()[0], includes) ++ return (list(interfaces.values())[0], includes) + + + def interface_is_global(interface): +@@ -281,7 +281,7 @@ def main(): + + info_provider = create_component_info_provider( + os.path.normpath(options.info_dir), options.target_component) +- idl_filenames = map(str.strip, open(options.idl_files_list)) ++ idl_filenames = list(map(str.strip, open(options.idl_files_list))) + + generate_origin_trial_features(info_provider, options, idl_filenames) + return 0 +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/idl_definitions.py b/chromium/third_party/blink/renderer/bindings/scripts/idl_definitions.py +index 14e6e9d3f87..b027818aef2 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/idl_definitions.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/idl_definitions.py +@@ -394,7 +394,8 @@ class IdlInterface(object): + else: + raise ValueError('Unrecognized node class: %s' % child_class) + +- if len(filter(None, [self.iterable, self.maplike, self.setlike])) > 1: ++ if len(list(filter(None, ++ [self.iterable, self.maplike, self.setlike]))) > 1: + raise ValueError( + 'Interface can only have one of iterable<>, maplike<> and setlike<>.' + ) +@@ -512,6 +513,9 @@ class IdlAttribute(TypedObject): + def accept(self, visitor): + visitor.visit_attribute(self) + ++ def __lt__(self, other): ++ return self.name < other.name ++ + + ################################################################################ + # Constants +@@ -852,7 +856,7 @@ class IdlIncludes(object): + ################################################################################ + + +-class Exposure: ++class Exposure(object): + """An Exposure holds one Exposed or RuntimeEnabled condition. + Each exposure has two properties: exposed and runtime_enabled. + Exposure(e, r) corresponds to [Exposed(e r)]. Exposure(e) corresponds to +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/idl_reader.py b/chromium/third_party/blink/renderer/bindings/scripts/idl_reader.py +index 8d72865a6ca..b80eebdcd61 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/idl_reader.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/idl_reader.py +@@ -55,8 +55,8 @@ def validate_blink_idl_definitions(idl_filename, idl_file_basename, + definitions. There is no filename convention in this case. + - Otherwise, an IDL file is invalid. + """ +- targets = ( +- definitions.interfaces.values() + definitions.dictionaries.values()) ++ targets = (list(definitions.interfaces.values()) + ++ list(definitions.dictionaries.values())) + number_of_targets = len(targets) + if number_of_targets > 1: + raise Exception( +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/idl_types.py b/chromium/third_party/blink/renderer/bindings/scripts/idl_types.py +index cd4f0c3513b..ab95e9c0b08 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/idl_types.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/idl_types.py +@@ -349,7 +349,7 @@ class IdlUnionType(IdlTypeBase): + return True + + def single_matching_member_type(self, predicate): +- matching_types = filter(predicate, self.flattened_member_types) ++ matching_types = list(filter(predicate, self.flattened_member_types)) + if len(matching_types) > 1: + raise ValueError('%s is ambiguous.' % self.name) + return matching_types[0] if matching_types else None +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/utilities.py b/chromium/third_party/blink/renderer/bindings/scripts/utilities.py +index e1677ee7bd6..3c5006f064f 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/utilities.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/utilities.py +@@ -196,8 +196,9 @@ class ComponentInfoProviderModules(ComponentInfoProvider): + + @property + def callback_functions(self): +- return dict(self._component_info_core['callback_functions'].items() + +- self._component_info_modules['callback_functions'].items()) ++ return dict( ++ list(self._component_info_core['callback_functions'].items()) + ++ list(self._component_info_modules['callback_functions'].items())) + + @property + def specifier_for_export(self): +@@ -209,8 +210,8 @@ class ComponentInfoProviderModules(ComponentInfoProvider): + + + def load_interfaces_info_overall_pickle(info_dir): +- with open(os.path.join(info_dir, +- 'interfaces_info.pickle')) as interface_info_file: ++ with open(os.path.join(info_dir, 'interfaces_info.pickle'), ++ mode='rb') as interface_info_file: + return pickle.load(interface_info_file) + + +@@ -236,23 +237,20 @@ def merge_dict_recursively(target, diff): + + def create_component_info_provider_core(info_dir): + interfaces_info = load_interfaces_info_overall_pickle(info_dir) +- with open( +- os.path.join(info_dir, 'core', +- 'component_info_core.pickle')) as component_info_file: ++ with open(os.path.join(info_dir, 'core', 'component_info_core.pickle'), ++ mode='rb') as component_info_file: + component_info = pickle.load(component_info_file) + return ComponentInfoProviderCore(interfaces_info, component_info) + + + def create_component_info_provider_modules(info_dir): + interfaces_info = load_interfaces_info_overall_pickle(info_dir) +- with open( +- os.path.join(info_dir, 'core', +- 'component_info_core.pickle')) as component_info_file: ++ with open(os.path.join(info_dir, 'core', 'component_info_core.pickle'), ++ mode='rb') as component_info_file: + component_info_core = pickle.load(component_info_file) +- with open( +- os.path.join( +- info_dir, 'modules', +- 'component_info_modules.pickle')) as component_info_file: ++ with open(os.path.join(info_dir, 'modules', ++ 'component_info_modules.pickle'), ++ mode='rb') as component_info_file: + component_info_modules = pickle.load(component_info_file) + return ComponentInfoProviderModules(interfaces_info, component_info_core, + component_info_modules) +@@ -356,7 +354,7 @@ def write_pickle_file(pickle_filename, data): + pickle_filename = abs(pickle_filename) + # If |data| is same with the file content, we skip updating. + if os.path.isfile(pickle_filename): +- with open(pickle_filename) as pickle_file: ++ with open(pickle_filename, 'rb') as pickle_file: + try: + if pickle.load(pickle_file) == data: + return +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/v8_interface.py b/chromium/third_party/blink/renderer/bindings/scripts/v8_interface.py +index a43260414db..a85b03abe75 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/v8_interface.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/v8_interface.py +@@ -189,7 +189,7 @@ def context_enabled_features(attributes): + return sorted([ + member for member in members + if member.get(KEY) and not member.get('exposed_test') +- ]) ++ ], key=lambda item: item['name']) + + def member_filter_by_name(members, name): + return [member for member in members if member[KEY] == name] +@@ -612,7 +612,8 @@ def interface_context(interface, interfaces, component_info): + sorted( + origin_trial_features(interface, context['constants'], + context['attributes'], context['methods']) + +- context_enabled_features(context['attributes'])), ++ context_enabled_features(context['attributes']), ++ key=lambda item: item['name']), + }) + if context['optional_features']: + includes.add('platform/bindings/v8_per_context_data.h') +@@ -1356,9 +1357,9 @@ def resolution_tests_methods(effective_overloads): + + # Extract argument and IDL type to simplify accessing these in each loop. + arguments = [method['arguments'][index] for method in methods] +- arguments_methods = zip(arguments, methods) ++ arguments_methods = list(zip(arguments, methods)) + idl_types = [argument['idl_type_object'] for argument in arguments] +- idl_types_methods = zip(idl_types, methods) ++ idl_types_methods = list(zip(idl_types, methods)) + + # We can?t do a single loop through all methods or simply sort them, because + # a method may be listed in multiple steps of the resolution algorithm, and +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/v8_methods.py b/chromium/third_party/blink/renderer/bindings/scripts/v8_methods.py +index 5f1f89a3def..6ee8a407798 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/v8_methods.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/v8_methods.py +@@ -46,6 +46,10 @@ import v8_types + import v8_utilities + from v8_utilities import (has_extended_attribute_value, is_unforgeable) + ++# TODO: Remove this once Python2 is obsoleted. ++if sys.version_info.major != 2: ++ basestring = str ++ + + def method_is_visible(method, interface_is_partial): + if 'overloads' in method: +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/v8_utilities.py b/chromium/third_party/blink/renderer/bindings/scripts/v8_utilities.py +index 2ecd6923320..fcfc48371b1 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/v8_utilities.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/v8_utilities.py +@@ -271,7 +271,7 @@ EXPOSED_WORKERS = set([ + ]) + + +-class ExposureSet: ++class ExposureSet(object): + """An ExposureSet is a collection of Exposure instructions.""" + + def __init__(self, exposures=None): +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/callback_interface.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/callback_interface.py +index 13fb7c7068d..b73b7710687 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/callback_interface.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/callback_interface.py +@@ -91,11 +91,13 @@ class CallbackInterface(UserDefinedType, WithExtendedAttributes, + for operation_ir in ir.operations + ]) + self._operation_groups = tuple([ +- OperationGroup( +- operation_group_ir, +- filter(lambda x: x.identifier == operation_group_ir.identifier, +- self._operations), +- owner=self) for operation_group_ir in ir.operation_groups ++ OperationGroup(operation_group_ir, ++ list( ++ filter( ++ lambda x: x.identifier == operation_group_ir ++ .identifier, self._operations)), ++ owner=self) ++ for operation_group_ir in ir.operation_groups + ]) + + @property +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/database.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/database.py +index c92cf48eb2a..f5d59129449 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/database.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/database.py +@@ -156,4 +156,4 @@ class Database(object): + return self._view_by_kind(Database._Kind.UNION) + + def _view_by_kind(self, kind): +- return self._impl.find_by_kind(kind).values() ++ return list(self._impl.find_by_kind(kind).values()) +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/exposure.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/exposure.py +index abaeef39c30..e36cf7439ae 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/exposure.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/exposure.py +@@ -8,8 +8,11 @@ from .runtime_enabled_features import RuntimeEnabledFeatures + class _Feature(str): + """Represents a runtime-enabled feature.""" + ++ def __new__(cls, value): ++ return str.__new__(cls, value) ++ + def __init__(self, value): +- str.__init__(self, value) ++ str.__init__(self) + self._is_context_dependent = ( + RuntimeEnabledFeatures.is_context_dependent(self)) + +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/function_like.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/function_like.py +index 648c70d803d..1712f19c672 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/function_like.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/function_like.py +@@ -71,8 +71,9 @@ class FunctionLike(WithIdentifier): + def num_of_required_arguments(self): + """Returns the number of required arguments.""" + return len( +- filter(lambda arg: not (arg.is_optional or arg.is_variadic), +- self.arguments)) ++ list( ++ filter(lambda arg: not (arg.is_optional or arg.is_variadic), ++ self.arguments))) + + + class OverloadGroup(WithIdentifier): +@@ -171,8 +172,7 @@ class OverloadGroup(WithIdentifier): + Returns the effective overload set. + https://heycam.github.io/webidl/#compute-the-effective-overload-set + """ +- assert argument_count is None or isinstance(argument_count, +- (int, long)) ++ assert argument_count is None or isinstance(argument_count, int) + + N = argument_count + S = [] +@@ -188,21 +188,21 @@ class OverloadGroup(WithIdentifier): + + S.append( + OverloadGroup.EffectiveOverloadItem( +- X, map(lambda arg: arg.idl_type, X.arguments), +- map(lambda arg: arg.optionality, X.arguments))) ++ X, list(map(lambda arg: arg.idl_type, X.arguments)), ++ list(map(lambda arg: arg.optionality, X.arguments)))) + + if X.is_variadic: +- for i in xrange(n, max(maxarg, N)): +- t = map(lambda arg: arg.idl_type, X.arguments) +- o = map(lambda arg: arg.optionality, X.arguments) +- for _ in xrange(n, i + 1): ++ for i in range(n, max(maxarg, N)): ++ t = list(map(lambda arg: arg.idl_type, X.arguments)) ++ o = list(map(lambda arg: arg.optionality, X.arguments)) ++ for _ in range(n, i + 1): + t.append(X.arguments[-1].idl_type) + o.append(X.arguments[-1].optionality) + S.append(OverloadGroup.EffectiveOverloadItem(X, t, o)) + +- t = map(lambda arg: arg.idl_type, X.arguments) +- o = map(lambda arg: arg.optionality, X.arguments) +- for i in xrange(n - 1, -1, -1): ++ t = list(map(lambda arg: arg.idl_type, X.arguments)) ++ o = list(map(lambda arg: arg.optionality, X.arguments)) ++ for i in range(n - 1, -1, -1): + if X.arguments[i].optionality == IdlType.Optionality.REQUIRED: + break + S.append(OverloadGroup.EffectiveOverloadItem(X, t[:i], o[:i])) +@@ -222,7 +222,7 @@ class OverloadGroup(WithIdentifier): + for item in items) + assert len(items) > 1 + +- for index in xrange(len(items[0].type_list)): ++ for index in range(len(items[0].type_list)): + # Assume that the given items are valid, and we only need to test + # the two types. + if OverloadGroup.are_distinguishable_types( +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/idl_compiler.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/idl_compiler.py +index c5ee2bd8a3d..58315072480 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/idl_compiler.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/idl_compiler.py +@@ -149,8 +149,8 @@ class IdlCompiler(object): + for old_ir in old_irs: + new_ir = make_copy(old_ir) + self._ir_map.add(new_ir) +- new_ir.attributes = filter(not_disabled, new_ir.attributes) +- new_ir.operations = filter(not_disabled, new_ir.operations) ++ new_ir.attributes = list(filter(not_disabled, new_ir.attributes)) ++ new_ir.operations = list(filter(not_disabled, new_ir.operations)) + + def _record_defined_in_partial_and_mixin(self): + old_irs = self._ir_map.irs_of_kinds( +@@ -231,7 +231,7 @@ class IdlCompiler(object): + only_to_members_of_partial_or_mixin=False) + propagate_to_exposure(propagate) + +- map(process_member_like, ir.iter_all_members()) ++ list(map(process_member_like, ir.iter_all_members())) + + def process_member_like(ir): + propagate = functools.partial(propagate_extattr, ir=ir) +@@ -257,7 +257,7 @@ class IdlCompiler(object): + + self._ir_map.move_to_new_phase() + +- map(process_interface_like, old_irs) ++ list(map(process_interface_like, old_irs)) + + def _determine_blink_headers(self): + irs = self._ir_map.irs_of_kinds( +@@ -422,9 +422,9 @@ class IdlCompiler(object): + assert not new_interface.deriveds + derived_set = identifier_to_derived_set.get( + new_interface.identifier, set()) +- new_interface.deriveds = map( +- lambda id_: self._ref_to_idl_def_factory.create(id_), +- sorted(derived_set)) ++ new_interface.deriveds = list( ++ map(lambda id_: self._ref_to_idl_def_factory.create(id_), ++ sorted(derived_set))) + + def _supplement_missing_html_constructor_operation(self): + # Temporary mitigation of misuse of [HTMLConstructor] +@@ -553,7 +553,8 @@ class IdlCompiler(object): + self._ir_map.add(new_ir) + + for group in new_ir.iter_all_overload_groups(): +- exposures = map(lambda overload: overload.exposure, group) ++ exposures = list(map(lambda overload: overload.exposure, ++ group)) + + # [Exposed] + if any(not exposure.global_names_and_features +@@ -653,8 +654,8 @@ class IdlCompiler(object): + constructs = set() + for global_name in global_names: + constructs.update(exposed_map.get(global_name, [])) +- new_ir.exposed_constructs = map( +- self._ref_to_idl_def_factory.create, sorted(constructs)) ++ new_ir.exposed_constructs = list( ++ map(self._ref_to_idl_def_factory.create, sorted(constructs))) + + assert not new_ir.legacy_window_aliases + if new_ir.identifier != 'Window': +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/interface.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/interface.py +index 65d24e529d1..067ef2eb0b2 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/interface.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/interface.py +@@ -180,8 +180,9 @@ class Interface(UserDefinedType, WithExtendedAttributes, WithCodeGeneratorInfo, + self._constructor_groups = tuple([ + ConstructorGroup( + group_ir, +- filter(lambda x: x.identifier == group_ir.identifier, +- self._constructors), ++ list( ++ filter(lambda x: x.identifier == group_ir.identifier, ++ self._constructors)), + owner=self) for group_ir in ir.constructor_groups + ]) + assert len(self._constructor_groups) <= 1 +@@ -192,8 +193,9 @@ class Interface(UserDefinedType, WithExtendedAttributes, WithCodeGeneratorInfo, + self._named_constructor_groups = tuple([ + ConstructorGroup( + group_ir, +- filter(lambda x: x.identifier == group_ir.identifier, +- self._named_constructors), ++ list( ++ filter(lambda x: x.identifier == group_ir.identifier, ++ self._named_constructors)), + owner=self) for group_ir in ir.named_constructor_groups + ]) + self._operations = tuple([ +@@ -203,22 +205,23 @@ class Interface(UserDefinedType, WithExtendedAttributes, WithCodeGeneratorInfo, + self._operation_groups = tuple([ + OperationGroup( + group_ir, +- filter(lambda x: x.identifier == group_ir.identifier, +- self._operations), ++ list( ++ filter(lambda x: x.identifier == group_ir.identifier, ++ self._operations)), + owner=self) for group_ir in ir.operation_groups + ]) + self._exposed_constructs = tuple(ir.exposed_constructs) + self._legacy_window_aliases = tuple(ir.legacy_window_aliases) + self._indexed_and_named_properties = None +- indexed_and_named_property_operations = filter( +- lambda x: x.is_indexed_or_named_property_operation, +- self._operations) ++ indexed_and_named_property_operations = list( ++ filter(lambda x: x.is_indexed_or_named_property_operation, ++ self._operations)) + if indexed_and_named_property_operations: + self._indexed_and_named_properties = IndexedAndNamedProperties( + indexed_and_named_property_operations, owner=self) + self._stringifier = None +- stringifier_operation_irs = filter(lambda x: x.is_stringifier, +- ir.operations) ++ stringifier_operation_irs = list( ++ filter(lambda x: x.is_stringifier, ir.operations)) + if stringifier_operation_irs: + assert len(stringifier_operation_irs) == 1 + op_ir = make_copy(stringifier_operation_irs[0]) +@@ -231,8 +234,9 @@ class Interface(UserDefinedType, WithExtendedAttributes, WithCodeGeneratorInfo, + attribute = None + if operation.stringifier_attribute: + attr_id = operation.stringifier_attribute +- attributes = filter(lambda x: x.identifier == attr_id, +- self._attributes) ++ attributes = list( ++ filter(lambda x: x.identifier == attr_id, ++ self._attributes)) + assert len(attributes) == 1 + attribute = attributes[0] + self._stringifier = Stringifier(operation, attribute, owner=self) +@@ -578,8 +582,9 @@ class Iterable(WithDebugInfo): + self._operation_groups = tuple([ + OperationGroup( + group_ir, +- filter(lambda x: x.identifier == group_ir.identifier, +- self._operations), ++ list( ++ filter(lambda x: x.identifier == group_ir.identifier, ++ self._operations)), + owner=owner) for group_ir in ir.operation_groups + ]) + +@@ -666,8 +671,9 @@ class Maplike(WithDebugInfo): + self._operation_groups = tuple([ + OperationGroup( + group_ir, +- filter(lambda x: x.identifier == group_ir.identifier, +- self._operations), ++ list( ++ filter(lambda x: x.identifier == group_ir.identifier, ++ self._operations)), + owner=owner) for group_ir in ir.operation_groups + ]) + +@@ -755,8 +761,9 @@ class Setlike(WithDebugInfo): + self._operation_groups = tuple([ + OperationGroup( + group_ir, +- filter(lambda x: x.identifier == group_ir.identifier, +- self._operations), ++ list( ++ filter(lambda x: x.identifier == group_ir.identifier, ++ self._operations)), + owner=owner) for group_ir in ir.operation_groups + ]) + +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/ir_builder.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/ir_builder.py +index e9aeff4ab82..d80554d603e 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/ir_builder.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/ir_builder.py +@@ -2,6 +2,8 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import sys ++ + from .argument import Argument + from .ast_group import AstGroup + from .attribute import Attribute +@@ -30,6 +32,11 @@ from .operation import Operation + from .typedef import Typedef + + ++# TODO: Remove this once Python2 is obsoleted. ++if sys.version_info.major != 2: ++ long = int ++ ++ + def load_and_register_idl_definitions(filepaths, register_ir, + create_ref_to_idl_def, idl_type_factory): + """ +@@ -160,7 +167,7 @@ class _IRBuilder(object): + child_nodes = list(node.GetChildren()) + extended_attributes = self._take_extended_attributes(child_nodes) + +- members = map(self._build_interface_member, child_nodes) ++ members = list(map(self._build_interface_member, child_nodes)) + attributes = [] + constants = [] + operations = [] +@@ -302,7 +309,7 @@ class _IRBuilder(object): + child_nodes = list(node.GetChildren()) + inherited = self._take_inheritance(child_nodes) + extended_attributes = self._take_extended_attributes(child_nodes) +- own_members = map(self._build_dictionary_member, child_nodes) ++ own_members = list(map(self._build_dictionary_member, child_nodes)) + + return Dictionary.IR( + identifier=Identifier(node.GetName()), +@@ -336,7 +343,7 @@ class _IRBuilder(object): + + child_nodes = list(node.GetChildren()) + extended_attributes = self._take_extended_attributes(child_nodes) +- members = map(self._build_interface_member, child_nodes) ++ members = list(map(self._build_interface_member, child_nodes)) + constants = [] + operations = [] + for member in members: +@@ -456,8 +463,8 @@ class _IRBuilder(object): + assert len(child_nodes) == 1 + child = child_nodes[0] + if child.GetClass() == 'Arguments': +- arguments = map(build_extattr_argument, +- child.GetChildren()) ++ arguments = list( ++ map(build_extattr_argument, child.GetChildren())) + elif child.GetClass() == 'Call': + assert len(child.GetChildren()) == 1 + grand_child = child.GetChildren()[0] +@@ -486,7 +493,9 @@ class _IRBuilder(object): + + assert node.GetClass() == 'ExtAttributes' + return ExtendedAttributes( +- filter(None, map(build_extended_attribute, node.GetChildren()))) ++ list( ++ filter(None, map(build_extended_attribute, ++ node.GetChildren())))) + + def _build_inheritance(self, node): + assert node.GetClass() == 'Inherit' +@@ -506,7 +515,7 @@ class _IRBuilder(object): + + def _build_iterable(self, node): + assert node.GetClass() == 'Iterable' +- types = map(self._build_type, node.GetChildren()) ++ types = list(map(self._build_type, node.GetChildren())) + assert len(types) == 1 or len(types) == 2 + if len(types) == 1: # value iterator + key_type, value_type = (None, types[0]) +@@ -584,7 +593,7 @@ class _IRBuilder(object): + def _build_maplike(self, node, interface_identifier): + assert node.GetClass() == 'Maplike' + assert isinstance(interface_identifier, Identifier) +- types = map(self._build_type, node.GetChildren()) ++ types = list(map(self._build_type, node.GetChildren())) + assert len(types) == 2 + key_type, value_type = types + is_readonly = bool(node.GetProperty('READONLY')) +@@ -676,7 +685,7 @@ class _IRBuilder(object): + def _build_setlike(self, node, interface_identifier): + assert node.GetClass() == 'Setlike' + assert isinstance(interface_identifier, Identifier) +- types = map(self._build_type, node.GetChildren()) ++ types = list(map(self._build_type, node.GetChildren())) + assert len(types) == 1 + value_type = types[0] + is_readonly = bool(node.GetProperty('READONLY')) +@@ -838,7 +847,7 @@ class _IRBuilder(object): + + def build_union_type(node, extended_attributes): + return self._idl_type_factory.union_type( +- member_types=map(self._build_type, node.GetChildren()), ++ member_types=list(map(self._build_type, node.GetChildren())), + is_optional=is_optional, + extended_attributes=extended_attributes, + debug_info=self._build_debug_info(node)) +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/make_copy.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/make_copy.py +index a7a2b11f3f0..2f6b61300ff 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/make_copy.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/make_copy.py +@@ -3,6 +3,13 @@ + # found in the LICENSE file. + + ++import sys ++ ++# TODO: Remove this once Python2 is obsoleted. ++if sys.version_info.major != 2: ++ long = int ++ basestring = str ++ + def make_copy(obj, memo=None): + """ + Creates a copy of the given object, which should be an IR or part of IR. +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/namespace.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/namespace.py +index eeabef97cbe..bd7e98907f3 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/namespace.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/namespace.py +@@ -107,11 +107,13 @@ class Namespace(UserDefinedType, WithExtendedAttributes, WithCodeGeneratorInfo, + for operation_ir in ir.operations + ]) + self._operation_groups = tuple([ +- OperationGroup( +- operation_group_ir, +- filter(lambda x: x.identifier == operation_group_ir.identifier, +- self._operations), +- owner=self) for operation_group_ir in ir.operation_groups ++ OperationGroup(operation_group_ir, ++ list( ++ filter( ++ lambda x: x.identifier == operation_group_ir ++ .identifier, self._operations)), ++ owner=self) ++ for operation_group_ir in ir.operation_groups + ]) + + @property +diff --git a/chromium/third_party/blink/renderer/bindings/templates/dictionary_v8.cc.tmpl b/chromium/third_party/blink/renderer/bindings/templates/dictionary_v8.cc.tmpl +index 0add9c45a38..dc910f6d227 100644 +--- a/chromium/third_party/blink/renderer/bindings/templates/dictionary_v8.cc.tmpl ++++ b/chromium/third_party/blink/renderer/bindings/templates/dictionary_v8.cc.tmpl +@@ -59,9 +59,9 @@ void {{v8_class}}::ToImpl(v8::Isolate* isolate, v8::Local v8_value, { + DCHECK(executionContext); + {% endif %}{# has_origin_trial_members #} + {% endif %}{# members #} +- {% for origin_trial_test, origin_trial_member_list in members | groupby('origin_trial_feature_name') %} ++ {% for origin_trial_test, origin_trial_member_list in members | stringifykeygroupby('origin_trial_feature_name') %} + {% filter origin_trial_enabled(origin_trial_test, "executionContext") %} +- {% for feature_name, member_list in origin_trial_member_list | groupby('runtime_enabled_feature_name') %} ++ {% for feature_name, member_list in origin_trial_member_list | stringifykeygroupby('runtime_enabled_feature_name') %} + {% filter runtime_enabled(feature_name) %} + {% for member in member_list %} + v8::Local {{member.v8_value}}; +@@ -147,9 +147,9 @@ bool toV8{{cpp_class}}(const {{cpp_class}}* impl, v8::Local dictiona + DCHECK(executionContext); + {% endif %}{# has_origin_trial_members #} + {% endif %}{# members #} +- {% for origin_trial_test, origin_trial_member_list in members | groupby('origin_trial_feature_name') %} ++ {% for origin_trial_test, origin_trial_member_list in members | stringifykeygroupby('origin_trial_feature_name') %} + {% filter origin_trial_enabled(origin_trial_test, "executionContext") %} +- {% for feature_name, member_list in origin_trial_member_list | groupby('runtime_enabled_feature_name') %} ++ {% for feature_name, member_list in origin_trial_member_list | stringifykeygroupby('runtime_enabled_feature_name') %} + {% filter runtime_enabled(feature_name) %} + {% for member in member_list %} + v8::Local {{member.v8_value}}; +diff --git a/chromium/third_party/blink/renderer/build/scripts/core/css/make_style_shorthands.py b/chromium/third_party/blink/renderer/build/scripts/core/css/make_style_shorthands.py +index 1799cd5a153..5f43ffabc26 100755 +--- a/chromium/third_party/blink/renderer/build/scripts/core/css/make_style_shorthands.py ++++ b/chromium/third_party/blink/renderer/build/scripts/core/css/make_style_shorthands.py +@@ -71,7 +71,7 @@ class Expansion(object): + def enabled_longhands(self): + include = lambda longhand: not longhand[ + 'runtime_flag'] or self.is_enabled(longhand['runtime_flag']) +- return filter(include, self._longhands) ++ return list(filter(include, self._longhands)) + + @property + def index(self): +@@ -87,8 +87,9 @@ class Expansion(object): + + def create_expansions(longhands): + flags = collect_runtime_flags(longhands) +- expansions = map(lambda mask: Expansion(longhands, flags, mask), +- range(1 << len(flags))) ++ expansions = list( ++ map(lambda mask: Expansion(longhands, flags, mask), ++ range(1 << len(flags)))) + assert len(expansions) > 0 + # We generate 2^N expansions for N flags, so enforce some limit. + assert len(flags) <= 4, 'Too many runtime flags for a single shorthand' +@@ -114,14 +115,14 @@ class StylePropertyShorthandWriter(json5_generator.Writer): + + self._longhand_dictionary = defaultdict(list) + for property_ in json5_properties.shorthands: +- property_['longhand_enum_keys'] = map(enum_key_for_css_property, +- property_['longhands']) +- property_['longhand_property_ids'] = map(id_for_css_property, +- property_['longhands']) +- +- longhands = map( +- lambda name: json5_properties.properties_by_name[name], +- property_['longhands']) ++ property_['longhand_enum_keys'] = list( ++ map(enum_key_for_css_property, property_['longhands'])) ++ property_['longhand_property_ids'] = list( ++ map(id_for_css_property, property_['longhands'])) ++ ++ longhands = list( ++ map(lambda name: json5_properties.properties_by_name[name], ++ property_['longhands'])) + property_['expansions'] = create_expansions(longhands) + for longhand_enum_key in property_['longhand_enum_keys']: + self._longhand_dictionary[longhand_enum_key].append(property_) +diff --git a/chromium/third_party/blink/renderer/build/scripts/core/css/properties/make_css_property_instances.py b/chromium/third_party/blink/renderer/build/scripts/core/css/properties/make_css_property_instances.py +index 75030ac577e..f72aadee17d 100755 +--- a/chromium/third_party/blink/renderer/build/scripts/core/css/properties/make_css_property_instances.py ++++ b/chromium/third_party/blink/renderer/build/scripts/core/css/properties/make_css_property_instances.py +@@ -42,8 +42,8 @@ class CSSPropertyInstancesWriter(json5_generator.Writer): + aliases = self._css_properties.aliases + + # Lists of PropertyClassData. +- self._property_classes_by_id = map(self.get_class, properties) +- self._alias_classes_by_id = map(self.get_class, aliases) ++ self._property_classes_by_id = list(map(self.get_class, properties)) ++ self._alias_classes_by_id = list(map(self.get_class, aliases)) + + # Sort by enum value. + self._property_classes_by_id.sort(key=lambda t: t.enum_value) +diff --git a/chromium/third_party/blink/renderer/build/scripts/gperf.py b/chromium/third_party/blink/renderer/build/scripts/gperf.py +index 5ee49056be4..db72660d471 100644 +--- a/chromium/third_party/blink/renderer/build/scripts/gperf.py ++++ b/chromium/third_party/blink/renderer/build/scripts/gperf.py +@@ -95,7 +95,7 @@ def main(): + + open(args.output_file, 'wb').write( + generate_gperf(gperf_path, +- open(infile).read(), gperf_args)) ++ open(infile).read(), gperf_args).encode('utf-8')) + + + if __name__ == '__main__': +diff --git a/chromium/third_party/blink/renderer/build/scripts/in_file.py b/chromium/third_party/blink/renderer/build/scripts/in_file.py +index 28adc050f1e..58113483e57 100644 +--- a/chromium/third_party/blink/renderer/build/scripts/in_file.py ++++ b/chromium/third_party/blink/renderer/build/scripts/in_file.py +@@ -66,7 +66,7 @@ class InFile(object): + self._defaults = defaults + self._valid_values = copy.deepcopy( + valid_values if valid_values else {}) +- self._parse(map(str.strip, lines)) ++ self._parse(list(map(str.strip, lines))) + + @classmethod + def load_from_files(self, file_paths, defaults, valid_values, +diff --git a/chromium/third_party/blink/renderer/build/scripts/in_generator.py b/chromium/third_party/blink/renderer/build/scripts/in_generator.py +index e46740a2e85..ab1981ad1e3 100644 +--- a/chromium/third_party/blink/renderer/build/scripts/in_generator.py ++++ b/chromium/third_party/blink/renderer/build/scripts/in_generator.py +@@ -32,10 +32,15 @@ import os + import os.path + import shlex + import shutil ++import sys + import optparse + + from in_file import InFile + ++# TODO: Remove this once Python2 is obsoleted. ++if sys.version_info.major != 2: ++ basestring = str ++ + + ######################################################### + # This is now deprecated - use json5_generator.py instead +diff --git a/chromium/third_party/blink/renderer/build/scripts/make_runtime_features.py b/chromium/third_party/blink/renderer/build/scripts/make_runtime_features.py +index cafe8d94a8e..6925a4fa580 100755 +--- a/chromium/third_party/blink/renderer/build/scripts/make_runtime_features.py ++++ b/chromium/third_party/blink/renderer/build/scripts/make_runtime_features.py +@@ -138,7 +138,7 @@ class RuntimeFeatureWriter(BaseRuntimeFeatureWriter): + except Exception: + # If trouble unpickling, overwrite + pass +- with open(os.path.abspath(file_name), 'w') as pickle_file: ++ with open(os.path.abspath(file_name), 'wb') as pickle_file: + pickle.dump(features_map, pickle_file) + + def _template_inputs(self): +diff --git a/chromium/third_party/blink/renderer/build/scripts/templates/element_factory.cc.tmpl b/chromium/third_party/blink/renderer/build/scripts/templates/element_factory.cc.tmpl +index dc3f44c5b10..3eefcf9f0ee 100644 +--- a/chromium/third_party/blink/renderer/build/scripts/templates/element_factory.cc.tmpl ++++ b/chromium/third_party/blink/renderer/build/scripts/templates/element_factory.cc.tmpl +@@ -26,7 +26,7 @@ using {{namespace}}FunctionMap = HashMapGetExecutionContext())) { +diff --git a/chromium/third_party/blink/renderer/build/scripts/templates/element_type_helpers.h.tmpl b/chromium/third_party/blink/renderer/build/scripts/templates/element_type_helpers.h.tmpl +index 1b5297d52dc..edecc81d9d4 100644 +--- a/chromium/third_party/blink/renderer/build/scripts/templates/element_type_helpers.h.tmpl ++++ b/chromium/third_party/blink/renderer/build/scripts/templates/element_type_helpers.h.tmpl +@@ -15,7 +15,7 @@ namespace blink { + class Document; + + // Type checking. +-{% for tag in tags|sort if not tag.multipleTagNames and not tag.noTypeHelpers %} ++{% for tag in tags|sort(attribute='name') if not tag.multipleTagNames and not tag.noTypeHelpers %} + class {{tag.interface}}; + template <> + inline bool IsElementOfType(const Node& node) { +diff --git a/chromium/third_party/blink/renderer/build/scripts/templates/macros.tmpl b/chromium/third_party/blink/renderer/build/scripts/templates/macros.tmpl +index 0244433af2e..dcdbb02a56c 100644 +--- a/chromium/third_party/blink/renderer/build/scripts/templates/macros.tmpl ++++ b/chromium/third_party/blink/renderer/build/scripts/templates/macros.tmpl +@@ -25,7 +25,7 @@ + + + {% macro trie_leaf(index, object, return_macro, lowercase_data) %} +-{% set name, value = object.items()[0] %} ++{% set name, value = (object.items()|list)[0] %} + {% if name|length %} + if ( + {%- for c in name -%} +@@ -45,7 +45,7 @@ return {{ return_macro(value) }}; + + + {% macro trie_switch(trie, index, return_macro, lowercase_data) %} +-{% if trie|length == 1 and trie.values()[0] is string %} ++{% if trie|length == 1 and (trie.values()|list)[0] is string %} + {{ trie_leaf(index, trie, return_macro, lowercase_data) -}} + {% else %} + {% if lowercase_data %} +diff --git a/chromium/third_party/blink/renderer/build/scripts/templates/make_qualified_names.h.tmpl b/chromium/third_party/blink/renderer/build/scripts/templates/make_qualified_names.h.tmpl +index cb05c6c4315..bd5566b03e7 100644 +--- a/chromium/third_party/blink/renderer/build/scripts/templates/make_qualified_names.h.tmpl ++++ b/chromium/third_party/blink/renderer/build/scripts/templates/make_qualified_names.h.tmpl +@@ -24,12 +24,12 @@ namespace {{cpp_namespace}} { + {{symbol_export}}extern const WTF::AtomicString& {{namespace_prefix}}NamespaceURI; + + // Tags +-{% for tag in tags|sort %} ++{% for tag in tags|sort(attribute='name') %} + {{symbol_export}}extern const blink::{{namespace}}QualifiedName& {{tag|symbol}}Tag; + {% endfor %} + + // Attributes +-{% for attr in attrs|sort %} ++{% for attr in attrs|sort(attribute='name') %} + {{symbol_export}}extern const blink::QualifiedName& {{attr|symbol}}Attr; + {% endfor %} + +diff --git a/chromium/third_party/dawn/generator/generator_lib.py b/chromium/third_party/dawn/generator/generator_lib.py +index 5e3734d7833..e3d46bd194f 100644 +--- a/chromium/third_party/dawn/generator/generator_lib.py ++++ b/chromium/third_party/dawn/generator/generator_lib.py +@@ -201,6 +201,10 @@ def _compute_python_dependencies(root_dir=None): + + paths = set() + for path in module_paths: ++ # Builtin/namespaced modules may return None for the file path. ++ if not path: ++ continue ++ + path = os.path.abspath(path) + + if not path.startswith(root_dir): +diff --git a/chromium/third_party/devtools-frontend/src/BUILD.gn b/chromium/third_party/devtools-frontend/src/BUILD.gn +index cd488e88b60..ea1dc3d9a79 100644 +--- a/chromium/third_party/devtools-frontend/src/BUILD.gn ++++ b/chromium/third_party/devtools-frontend/src/BUILD.gn +@@ -2,6 +2,8 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import("//build/config/python.gni") ++ + import("//third_party/blink/public/public_features.gni") + import("./all_devtools_files.gni") + import("./all_devtools_modules.gni") +diff --git a/chromium/third_party/devtools-frontend/src/scripts/build/build_inspector_overlay.py b/chromium/third_party/devtools-frontend/src/scripts/build/build_inspector_overlay.py +index d6666e8b74f..0f7a661e632 100644 +--- a/chromium/third_party/devtools-frontend/src/scripts/build/build_inspector_overlay.py ++++ b/chromium/third_party/devtools-frontend/src/scripts/build/build_inspector_overlay.py +@@ -45,7 +45,8 @@ def rollup(input_path, output_path, filename, max_size, rollup_plugin): + ['--format', 'iife', '-n', 'InspectorOverlay'] + ['--input', target] + + ['--plugin', rollup_plugin], + stdout=subprocess.PIPE, +- stderr=subprocess.PIPE) ++ stderr=subprocess.PIPE, ++ text=True) + out, error = rollup_process.communicate() + if not out: + raise Exception("rollup failed: " + error) +diff --git a/chromium/third_party/devtools-frontend/src/scripts/build/build_release_applications.py b/chromium/third_party/devtools-frontend/src/scripts/build/build_release_applications.py +index fa8e73d34af..7d0b84b2171 100644 +--- a/chromium/third_party/devtools-frontend/src/scripts/build/build_release_applications.py ++++ b/chromium/third_party/devtools-frontend/src/scripts/build/build_release_applications.py +@@ -10,7 +10,7 @@ Builds applications in release mode: + and?the?application?loader?into?a?single?script. + """ + +-from cStringIO import StringIO ++from io import StringIO + from os import path + from os.path import join + import copy +@@ -145,8 +145,7 @@ class ReleaseBuilder(object): + resource_content = read_file(path.join(self.application_dir, resource_name)) + if not (resource_name.endswith('.html') + or resource_name.endswith('md')): +- resource_content += resource_source_url(resource_name).encode( +- 'utf-8') ++ resource_content += resource_source_url(resource_name) + resource_content = resource_content.replace('\\', '\\\\') + resource_content = resource_content.replace('\n', '\\n') + resource_content = resource_content.replace('"', '\\"') +@@ -173,7 +172,9 @@ class ReleaseBuilder(object): + def _concatenate_application_script(self, output): + output.write('Root.allDescriptors.push(...%s);' % self._release_module_descriptors()) + if self.descriptors.extends: +- output.write('Root.applicationDescriptor.modules.push(...%s);' % json.dumps(self.descriptors.application.values())) ++ output.write( ++ 'Root.applicationDescriptor.modules.push(...%s);' % ++ json.dumps(list(self.descriptors.application.values()))) + else: + output.write('Root.applicationDescriptor = %s;' % self.descriptors.application_json()) + +diff --git a/chromium/third_party/devtools-frontend/src/scripts/build/generate_devtools_grd.py b/chromium/third_party/devtools-frontend/src/scripts/build/generate_devtools_grd.py +index be510c48d76..c6a59c90298 100644 +--- a/chromium/third_party/devtools-frontend/src/scripts/build/generate_devtools_grd.py ++++ b/chromium/third_party/devtools-frontend/src/scripts/build/generate_devtools_grd.py +@@ -123,7 +123,7 @@ def main(argv): + + try: + os.makedirs(path.join(output_directory, 'Images')) +- except OSError, e: ++ except OSError as e: + if e.errno != errno.EEXIST: + raise e + +@@ -147,7 +147,7 @@ def main(argv): + shutil.copy(path.join(dirname, filename), path.join(output_directory, 'Images')) + add_file_to_grd(doc, path.join('Images', filename)) + +- with open(parsed_args.output_filename, 'w') as output_file: ++ with open(parsed_args.output_filename, 'wb') as output_file: + output_file.write(doc.toxml(encoding='UTF-8')) + + +diff --git a/chromium/third_party/devtools-frontend/src/scripts/build/modular_build.py b/chromium/third_party/devtools-frontend/src/scripts/build/modular_build.py +index 0ba695d3810..bb1da2f9f8d 100644 +--- a/chromium/third_party/devtools-frontend/src/scripts/build/modular_build.py ++++ b/chromium/third_party/devtools-frontend/src/scripts/build/modular_build.py +@@ -7,6 +7,8 @@ + Utilities for the modular DevTools build. + """ + ++from __future__ import print_function ++ + import collections + from os import path + import os +@@ -40,7 +42,7 @@ def load_and_parse_json(filename): + try: + return json.loads(read_file(filename)) + except: +- print 'ERROR: Failed to parse %s' % filename ++ print('ERROR: Failed to parse %s' % filename) + raise + + class Descriptors: +@@ -57,7 +59,7 @@ class Descriptors: + + def application_json(self): + result = dict() +- result['modules'] = self.application.values() ++ result['modules'] = list(self.application.values()) + return json.dumps(result) + + def all_compiled_files(self): +diff --git a/chromium/third_party/jinja2/tests.py b/chromium/third_party/jinja2/tests.py +index 0adc3d4dbcb..b14f85ff148 100644 +--- a/chromium/third_party/jinja2/tests.py ++++ b/chromium/third_party/jinja2/tests.py +@@ -10,7 +10,7 @@ + """ + import operator + import re +-from collections import Mapping ++from collections.abc import Mapping + from jinja2.runtime import Undefined + from jinja2._compat import text_type, string_types, integer_types + import decimal +diff --git a/chromium/tools/metrics/ukm/gen_builders.py b/chromium/tools/metrics/ukm/gen_builders.py +index f9f61d90a56..44e46fae8cc 100755 +--- a/chromium/tools/metrics/ukm/gen_builders.py ++++ b/chromium/tools/metrics/ukm/gen_builders.py +@@ -48,9 +48,10 @@ def ReadFilteredData(path): + data = ukm_model.UKM_XML_TYPE.Parse(ukm_file.read()) + event_tag = ukm_model._EVENT_TYPE.tag + metric_tag = ukm_model._METRIC_TYPE.tag +- data[event_tag] = filter(ukm_model.IsNotObsolete, data[event_tag]) ++ data[event_tag] = list(filter(ukm_model.IsNotObsolete, data[event_tag])) + for event in data[event_tag]: +- event[metric_tag] = filter(ukm_model.IsNotObsolete, event[metric_tag]) ++ event[metric_tag] = list( ++ filter(ukm_model.IsNotObsolete, event[metric_tag])) + return data + + +diff --git a/chromium/ui/ozone/generate_constructor_list.py b/chromium/ui/ozone/generate_constructor_list.py +index 8d800636c97..04fa18e93df 100755 +--- a/chromium/ui/ozone/generate_constructor_list.py ++++ b/chromium/ui/ozone/generate_constructor_list.py +@@ -45,12 +45,15 @@ Example Output: ./ui/ozone/generate_constructor_list.py \ + } // namespace ui + """ + ++try: ++ from StringIO import StringIO # for Python 2 ++except ImportError: ++ from io import StringIO # for Python 3 + import optparse + import os + import collections + import re + import sys +-import string + + + def GetTypedefName(typename): +@@ -68,7 +71,7 @@ def GetConstructorName(typename, platform): + This is just "Create" + typename + platform. + """ + +- return 'Create' + typename + string.capitalize(platform) ++ return 'Create' + typename + platform.capitalize() + + + def GenerateConstructorList(out, namespace, export, typenames, platforms, +@@ -163,12 +166,14 @@ def main(argv): + sys.exit(1) + + # Write to standard output or file specified by --output_cc. +- out_cc = sys.stdout ++ out_cc = getattr(sys.stdout, 'buffer', sys.stdout) + if options.output_cc: + out_cc = open(options.output_cc, 'wb') + +- GenerateConstructorList(out_cc, options.namespace, options.export, ++ out_cc_str = StringIO() ++ GenerateConstructorList(out_cc_str, options.namespace, options.export, + typenames, platforms, includes, usings) ++ out_cc.write(out_cc_str.getvalue().encode('utf-8')) + + if options.output_cc: + out_cc.close() +diff --git a/chromium/ui/ozone/generate_ozone_platform_list.py b/chromium/ui/ozone/generate_ozone_platform_list.py +index d47c398259b..2702b68b9bd 100755 +--- a/chromium/ui/ozone/generate_ozone_platform_list.py ++++ b/chromium/ui/ozone/generate_ozone_platform_list.py +@@ -49,12 +49,15 @@ Example Output: ./generate_ozone_platform_list.py --default wayland dri wayland + + """ + ++try: ++ from StringIO import StringIO # for Python 2 ++except ImportError: ++ from io import StringIO # for Python 3 + import optparse + import os + import collections + import re + import sys +-import string + + + def GetConstantName(name): +@@ -63,7 +66,7 @@ def GetConstantName(name): + We just capitalize the platform name and prepend "CreateOzonePlatform". + """ + +- return 'kPlatform' + string.capitalize(name) ++ return 'kPlatform' + name.capitalize() + + + def GeneratePlatformListText(out, platforms): +@@ -149,9 +152,9 @@ def main(argv): + platforms.insert(0, options.default) + + # Write to standard output or file specified by --output_{cc,h}. +- out_cc = sys.stdout +- out_h = sys.stdout +- out_txt = sys.stdout ++ out_cc = getattr(sys.stdout, 'buffer', sys.stdout) ++ out_h = getattr(sys.stdout, 'buffer', sys.stdout) ++ out_txt = getattr(sys.stdout, 'buffer', sys.stdout) + if options.output_cc: + out_cc = open(options.output_cc, 'wb') + if options.output_h: +@@ -159,9 +162,16 @@ def main(argv): + if options.output_txt: + out_txt = open(options.output_txt, 'wb') + +- GeneratePlatformListText(out_txt, platforms) +- GeneratePlatformListHeader(out_h, platforms) +- GeneratePlatformListSource(out_cc, platforms) ++ out_txt_str = StringIO() ++ out_h_str = StringIO() ++ out_cc_str = StringIO() ++ ++ GeneratePlatformListText(out_txt_str, platforms) ++ out_txt.write(out_txt_str.getvalue().encode('utf-8')) ++ GeneratePlatformListHeader(out_h_str, platforms) ++ out_h.write(out_h_str.getvalue().encode('utf-8')) ++ GeneratePlatformListSource(out_cc_str, platforms) ++ out_cc.write(out_cc_str.getvalue().encode('utf-8')) + + if options.output_cc: + out_cc.close() +-- +2.25.1 + diff --git a/package/qt5/qt5webengine-chromium/0002-Don-t-rebase-sysroot-path.patch b/package/qt5/qt5webengine-chromium/0002-Don-t-rebase-sysroot-path.patch new file mode 100644 index 0000000000..c39f008a3d --- /dev/null +++ b/package/qt5/qt5webengine-chromium/0002-Don-t-rebase-sysroot-path.patch @@ -0,0 +1,32 @@ +From bfc520671693587a0b81842018326da35aa97f80 Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Thu, 3 Feb 2022 20:41:08 -0700 +Subject: [PATCH] Don't rebase sysroot path + +Just use the actual sysroot as rebase_path will generate an invalid +sysroot path. + +Fixes: +/home/buildroot/buildroot/output/per-package/qt5webengine/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-buildroot-linux-gnu/10.3.0/../../../../aarch64-buildroot-linux-gnu/bin/ld: cannot find crti.o: No such file or directory + +Signed-off-by: James Hilliard +--- + chromium/build/config/posix/BUILD.gn | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chromium/build/config/posix/BUILD.gn b/chromium/build/config/posix/BUILD.gn +index e61554c5656..dc957225869 100644 +--- a/chromium/build/config/posix/BUILD.gn ++++ b/chromium/build/config/posix/BUILD.gn +@@ -27,7 +27,7 @@ config("runtime_library") { + + if (!is_apple && sysroot != "") { + # Pass the sysroot to all C compiler variants, the assembler, and linker. +- sysroot_flags = [ "--sysroot=" + rebase_path(sysroot, root_build_dir) ] ++ sysroot_flags = [ "--sysroot=" + sysroot ] + if (is_linux || is_chromeos) { + # This is here so that all files get recompiled after a sysroot roll and + # when turning the sysroot on or off. (defines are passed via the command +-- +2.25.1 + 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)) -- 2.25.1 From thomas.petazzoni at bootlin.com Mon Feb 14 07:57:22 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 14 Feb 2022 08:57:22 +0100 Subject: [Buildroot] [PATCH] manual: board support: add instructions to test defconfig in the official docker In-Reply-To: <20220203235438.610277-1-giulio.benetti@benettiengineering.com> References: <20220203235438.610277-1-giulio.benetti@benettiengineering.com> Message-ID: <20220214085722.330337d9@windsurf> Hello, On Fri, 4 Feb 2022 00:54:38 +0100 Giulio Benetti wrote: > +Inside the docker hint: > +-------------------- > + $ git clone git://git.busybox.net/buildroot As mentioned on IRC, I think this is not very useful: if you want to test a new defconfig, or changes to a defconfig, the changes to this defconfig are not yet in the official repo, so simply cloning the official repo within the Docker container will not allow you to test your brand new defconfig. So as they are, those instructions are in fact not very relevant for the indicated purpose. Either the instructions include mounting the local Buildroot copy into the container, or they instead suggest to use Gitlab CI to validate the defconfig. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From geomatsi at gmail.com Mon Feb 14 09:39:37 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Mon, 14 Feb 2022 12:39:37 +0300 Subject: [Buildroot] [PATCH 1/2] package/hostapd: update DPP option handling In-Reply-To: <20220213213809.361f3ea9@windsurf> References: <20220213155208.560001-1-geomatsi@gmail.com> <20220213155208.560001-2-geomatsi@gmail.com> <20220213213809.361f3ea9@windsurf> Message-ID: Hello Thomas, > > Makefile hostapd.mk defines different macros for different defconfig > > options. Options that are not listed in defconfig, can be set using > > HOSTAPD_CONFIG_SET. Options that are listed in defconfig, can be > > enabled/disabled using HOSTAPD_CONFIG_ENABLE/HOSTAPD_CONFIG_DISABLE. > > > > Starting from hostapd v2.10, option CONFIG_DPP is explicitly listed > > in defconfig. So it is time to switch to enable/disable macros for > > this option. > > This seems fragile. Why don't we have a single way of enabling an > option, which doesn't depend on whether the option is listed in the > hostapd defconfig or not? What do you think about removal of HOSTAPD_CONFIG_SET and having something along the following lines for configuration step: @@ -124,9 +124,11 @@ define HOSTAPD_CONFIGURE_CMDS cp $(@D)/hostapd/defconfig $(HOSTAPD_CONFIG) sed -i $(patsubst %,-e 's/^#\(%\)/\1/',$(HOSTAPD_CONFIG_ENABLE)) \ $(patsubst %,-e 's/^\(%\)/#\1/',$(HOSTAPD_CONFIG_DISABLE)) \ - $(patsubst %,-e '1i%=y',$(HOSTAPD_CONFIG_SET)) \ $(patsubst %,-e %,$(HOSTAPD_CONFIG_EDITS)) \ $(HOSTAPD_CONFIG) + for opt in $(HOSTAPD_CONFIG_ENABLE) ; do \ + sed -i -ze "/$${opt}=y/!s/$$/$${opt}=y\n/" $(HOSTAPD_CONFIG) ; \ + done endef This way only HOSTAPD_CONFIG_ENABLED/HOSTAPD_CONFIG_DISABLED macros will remain. Options that are required, but not listed in defconfig, still will be appended. There is a chance that next hostapd releases will introduce some new options for existing functionality, that will require attention. But there will be no need for shuffling existing options between CONFIG_SET and CONFIG_ENABLED. Regards, Sergey From yann.morin.1998 at free.fr Mon Feb 14 10:28:29 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 14 Feb 2022 11:28:29 +0100 Subject: [Buildroot] [PATCH] package/python-cryptography: needs cargo env when downloading Message-ID: <20220214102829.156331-1-yann.morin.1998@free.fr> python-cryptography is a python package, but it internally builds a rust crate. As such, it needs to be vendored at install time. Currently, we only pass the path to the sub-directory where the rust source is in the package tree, but calling cargo needs additional variables, most notably it needs CARGO_HOME to be set in the environment, otherwise it ends up writing in the user's own cargo home, which is by default ~/.cargo/ We do not really know what variables are used at vendor tie, so we pass the full Cargo environment, that we pass when building target packages. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Yegor Yefremov Cc: Asaf Kahlon --- package/python-cryptography/python-cryptography.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk index e642691bc5..a524f729c8 100644 --- a/package/python-cryptography/python-cryptography.mk +++ b/package/python-cryptography/python-cryptography.mk @@ -24,6 +24,7 @@ PYTHON_CRYPTOGRAPHY_ENV = \ PYTHON_CRYPTOGRAPHY_DOWNLOAD_POST_PROCESS = cargo PYTHON_CRYPTOGRAPHY_DOWNLOAD_DEPENDENCIES = host-rustc PYTHON_CRYPTOGRAPHY_DL_ENV = \ + $(PKG_CARGO_ENV) \ BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml $(eval $(python-package)) -- 2.25.1 From fontaine.fabrice at gmail.com Mon Feb 14 10:29:59 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 14 Feb 2022 11:29:59 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/libgee: bump to version 0.20.5 Message-ID: <20220214102959.1740165-1-fontaine.fabrice@gmail.com> Drop patch (already in version) and so autoreconf https://gitlab.gnome.org/GNOME/libgee/-/blob/0.20.5/NEWS Signed-off-by: Fabrice Fontaine --- ...le.am-include-Makefile.introspection.patch | 40 ------------------- package/libgee/libgee.hash | 4 +- package/libgee/libgee.mk | 4 +- 3 files changed, 3 insertions(+), 45 deletions(-) delete mode 100644 package/libgee/0001-gee-Makefile.am-include-Makefile.introspection.patch diff --git a/package/libgee/0001-gee-Makefile.am-include-Makefile.introspection.patch b/package/libgee/0001-gee-Makefile.am-include-Makefile.introspection.patch deleted file mode 100644 index 0906275ae3..0000000000 --- a/package/libgee/0001-gee-Makefile.am-include-Makefile.introspection.patch +++ /dev/null @@ -1,40 +0,0 @@ -From d771e8ddb5e40f234459966e46880d10f34aaa1a Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 20 Nov 2021 23:57:33 +0100 -Subject: [PATCH] gee/Makefile.am: include Makefile.introspection - -Include Makefile.introspection instead of using a custom rule which will -result in the following build failure when cross-compiling on buildroot -because of missing --includedir: - -/home/giuliobenetti/autobuild/run/instance-1/output-1/host/bin/../riscv32-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler -l `/usr/bin/sed -nE "s/^dlname='([A-Za-z0-9.+-]+)'/\1/p" libgee-0.8.la` -o Gee-0.8.typelib Gee-0.8.gir libgee-0.8.la -Could not find GIR file 'GObject-2.0.gir'; check XDG_DATA_DIRS or use --includedir -error parsing file Gee-0.8.gir: Failed to parse included gir GObject-2.0 - -Fixes: - - http://autobuild.buildroot.org/results/884faa0f84c8dc43ed1ca6cde9caf21c731a4b35 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.gnome.org/GNOME/libgee/-/merge_requests/8] ---- - gee/Makefile.am | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/gee/Makefile.am b/gee/Makefile.am -index 5634bcb..e0d950e 100644 ---- a/gee/Makefile.am -+++ b/gee/Makefile.am -@@ -167,7 +167,8 @@ INTROSPECTION_COMPILER_ARGS= \ - -l $(libgee_dlname) - Gee-0.8.gir: libgee_0_8_la_vala.stamp - Gee-0.8.typelib: Gee-0.8.gir libgee-0.8.la -- @INTROSPECTION_COMPILER@ $(INTROSPECTION_COMPILER_ARGS) -o $@ $^ -+ -+-include $(INTROSPECTION_MAKEFILE) - endif - - MOSTLYCLEANFILES = \ --- -2.33.0 - diff --git a/package/libgee/libgee.hash b/package/libgee/libgee.hash index 72d2c21ced..54a46f954c 100644 --- a/package/libgee/libgee.hash +++ b/package/libgee/libgee.hash @@ -1,5 +1,5 @@ -# From http://ftp.acc.umu.se/pub/gnome/sources/libgee/0.20/libgee-0.20.4.sha256sum -sha256 524c1bf390f9cdda4fbd9a47b269980dc64ab5280f0801b53bc69d782c72de0e libgee-0.20.4.tar.xz +# From http://ftp.acc.umu.se/pub/gnome/sources/libgee/0.20/libgee-0.20.5.sha256sum +sha256 31863a8957d5a727f9067495cabf0a0889fa5d3d44626e54094331188d5c1518 libgee-0.20.5.tar.xz # Hash for license file: sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/package/libgee/libgee.mk b/package/libgee/libgee.mk index 64beef30df..7d8d3d4863 100644 --- a/package/libgee/libgee.mk +++ b/package/libgee/libgee.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGEE_VERSION_MAJOR = 0.20 -LIBGEE_VERSION = $(LIBGEE_VERSION_MAJOR).4 +LIBGEE_VERSION = $(LIBGEE_VERSION_MAJOR).5 LIBGEE_SITE = http://ftp.gnome.org/pub/gnome/sources/libgee/$(LIBGEE_VERSION_MAJOR) LIBGEE_SOURCE = libgee-$(LIBGEE_VERSION).tar.xz LIBGEE_DEPENDENCIES = host-pkgconf host-vala libglib2 @@ -13,8 +13,6 @@ LIBGEE_INSTALL_STAGING = YES LIBGEE_LICENSE = LGPL-2.1+ LIBGEE_LICENSE_FILES = COPYING LIBGEE_CPE_ID_VENDOR = gnome -# We're patching gee/Makefile.am -LIBGEE_AUTORECONF = YES ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) LIBGEE_CONF_OPTS += --enable-introspection -- 2.34.1 From fontaine.fabrice at gmail.com Mon Feb 14 11:05:59 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 14 Feb 2022 12:05:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/bluez5_utils: set BLUEZ5_UTILS_AUTORECONF Message-ID: <20220214110559.2176506-1-fontaine.fabrice@gmail.com> Commit 572d08ee4a731b203b2d3aaf720a48f622609371 forgot to set BLUEZ5_UTILS_AUTORECONF resulting in the following build failure: /home/peko/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sh4-buildroot-linux-uclibc/10.3.0/../../../../sh4-buildroot-linux-uclibc/bin/ld: gobex/gobex-packet.o: in function `g_obex_packet_set_data': gobex-packet.c:(.text+0x698): undefined reference to `util_memdup' It should be noted that previous commit didn't fix any build failure with libglib >= 2.69. It only fixes the following warning: profiles/battery/battery.c: In function 'read_initial_battery_level_cb': profiles/battery/battery.c:162:2: warning: 'g_memdup' is deprecated (declared at /home/buildroot/autobuild/instance-0/output-1/host/bin/../arm-buildroot-linux-gnueabi/sysroot/usr/include/glib-2.0/glib/gstrfuncs.h:257): Use 'g_memdup2' instead [-Wdeprecated-declarations] batt->initial_value = g_memdup(value, length); ^ So an other option would be to revert this commit. The 'real' build error that previous commit tried to fix was raised because rand was replaced by getrandom since https://git.kernel.org/pub/scm/bluetooth/bluez.git/log/?qt=grep&q=getrandom but getrandom is not available until glibc 2.25: plugins/autopair.c:20:24: fatal error: sys/random.h: No such file or directory #include ^ Fixes: - http://autobuild.buildroot.org/results/46f7dbfe1d80c7622d670ba1ac957e9e6077eb9f Signed-off-by: Fabrice Fontaine --- package/bluez5_utils/bluez5_utils.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/bluez5_utils/bluez5_utils.mk b/package/bluez5_utils/bluez5_utils.mk index 49f6eaac13..7c2561b864 100644 --- a/package/bluez5_utils/bluez5_utils.mk +++ b/package/bluez5_utils/bluez5_utils.mk @@ -13,6 +13,8 @@ BLUEZ5_UTILS_LICENSE = GPL-2.0+, LGPL-2.1+ BLUEZ5_UTILS_LICENSE_FILES = COPYING COPYING.LIB BLUEZ5_UTILS_CPE_ID_VENDOR = bluez BLUEZ5_UTILS_CPE_ID_PRODUCT = bluez +# We're patching Makefile.am +BLUEZ5_UTILS_AUTORECONF = YES BLUEZ5_UTILS_DEPENDENCIES = \ $(if $(BR2_PACKAGE_BLUEZ5_UTILS_HEADERS),bluez5_utils-headers) \ -- 2.34.1 From fontaine.fabrice at gmail.com Mon Feb 14 11:43:51 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 14 Feb 2022 12:43:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi: add bluetooth dependency comment Message-ID: <20220214114351.2372109-1-fontaine.fabrice@gmail.com> Commit 43122d64e05a2831a96dabcbf149ba199726767f forgot to add bluetooth dependency comment Signed-off-by: Fabrice Fontaine --- package/kodi/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/kodi/Config.in b/package/kodi/Config.in index c7e746fad3..692d562af3 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -135,6 +135,10 @@ config BR2_PACKAGE_KODI_BLUEZ help Enable bluetooth support +comment "bluetooth support needs a toolchain w/ headers >= 3.4" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 + config BR2_PACKAGE_KODI_DBUS bool "dbus" select BR2_PACKAGE_DBUS -- 2.34.1 From yann.morin.1998 at free.fr Mon Feb 14 11:52:21 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 14 Feb 2022 12:52:21 +0100 Subject: [Buildroot] [git commit] package/bluez5_utils: set BLUEZ5_UTILS_AUTORECONF Message-ID: <20220214114500.AB3728199C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=81cb8a853bd2e01dbcb67573fe591474b43040a1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 572d08ee4a731b203b2d3aaf720a48f622609371 forgot to set BLUEZ5_UTILS_AUTORECONF resulting in the following build failure: /home/peko/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sh4-buildroot-linux-uclibc/10.3.0/../../../../sh4-buildroot-linux-uclibc/bin/ld: gobex/gobex-packet.o: in function `g_obex_packet_set_data': gobex-packet.c:(.text+0x698): undefined reference to `util_memdup' It should be noted that previous commit didn't fix any build failure with libglib >= 2.69. It only fixes the following warning: profiles/battery/battery.c: In function 'read_initial_battery_level_cb': profiles/battery/battery.c:162:2: warning: 'g_memdup' is deprecated (declared at /home/buildroot/autobuild/instance-0/output-1/host/bin/../arm-buildroot-linux-gnueabi/sysroot/usr/include/glib-2.0/glib/gstrfuncs.h:257): Use 'g_memdup2' instead [-Wdeprecated-declarations] batt->initial_value = g_memdup(value, length); ^ So an other option would be to revert this commit. The 'real' build error that previous commit tried to fix was raised because rand was replaced by getrandom since https://git.kernel.org/pub/scm/bluetooth/bluez.git/log/?qt=grep&q=getrandom but getrandom is not available until glibc 2.25: plugins/autopair.c:20:24: fatal error: sys/random.h: No such file or directory #include ^ Fixes: - http://autobuild.buildroot.org/results/46f7dbfe1d80c7622d670ba1ac957e9e6077eb9f Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/bluez5_utils/bluez5_utils.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/bluez5_utils/bluez5_utils.mk b/package/bluez5_utils/bluez5_utils.mk index 49f6eaac13..7c2561b864 100644 --- a/package/bluez5_utils/bluez5_utils.mk +++ b/package/bluez5_utils/bluez5_utils.mk @@ -13,6 +13,8 @@ BLUEZ5_UTILS_LICENSE = GPL-2.0+, LGPL-2.1+ BLUEZ5_UTILS_LICENSE_FILES = COPYING COPYING.LIB BLUEZ5_UTILS_CPE_ID_VENDOR = bluez BLUEZ5_UTILS_CPE_ID_PRODUCT = bluez +# We're patching Makefile.am +BLUEZ5_UTILS_AUTORECONF = YES BLUEZ5_UTILS_DEPENDENCIES = \ $(if $(BR2_PACKAGE_BLUEZ5_UTILS_HEADERS),bluez5_utils-headers) \ From yann.morin.1998 at free.fr Mon Feb 14 11:59:02 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 14 Feb 2022 12:59:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/bluez5_utils: set BLUEZ5_UTILS_AUTORECONF In-Reply-To: <20220214110559.2176506-1-fontaine.fabrice@gmail.com> References: <20220214110559.2176506-1-fontaine.fabrice@gmail.com> Message-ID: <20220214115902.GB38097@scaer> Fabrice, All, On 2022-02-14 12:05 +0100, Fabrice Fontaine spake thusly: > Commit 572d08ee4a731b203b2d3aaf720a48f622609371 forgot to set > BLUEZ5_UTILS_AUTORECONF resulting in the following build failure: > > /home/peko/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sh4-buildroot-linux-uclibc/10.3.0/../../../../sh4-buildroot-linux-uclibc/bin/ld: gobex/gobex-packet.o: in function `g_obex_packet_set_data': > gobex-packet.c:(.text+0x698): undefined reference to `util_memdup' > > It should be noted that previous commit didn't fix any build failure > with libglib >= 2.69. It only fixes the following warning: > > profiles/battery/battery.c: In function 'read_initial_battery_level_cb': > profiles/battery/battery.c:162:2: warning: 'g_memdup' is deprecated (declared at /home/buildroot/autobuild/instance-0/output-1/host/bin/../arm-buildroot-linux-gnueabi/sysroot/usr/include/glib-2.0/glib/gstrfuncs.h:257): Use 'g_memdup2' instead [-Wdeprecated-declarations] > batt->initial_value = g_memdup(value, length); > ^ > > So an other option would be to revert this commit. That would have been a possibility, indeed, but I went for keeping it instead. > The 'real' build error that previous commit tried to fix was raised > because rand was replaced by getrandom since > https://git.kernel.org/pub/scm/bluetooth/bluez.git/log/?qt=grep&q=getrandom > but getrandom is not available until glibc 2.25: > > plugins/autopair.c:20:24: fatal error: sys/random.h: No such file or directory > #include > ^ But then this patch of yours does not fix this original issue, does it? > Fixes: > - http://autobuild.buildroot.org/results/46f7dbfe1d80c7622d670ba1ac957e9e6077eb9f > > Signed-off-by: Fabrice Fontaine Applied to master anyway, thanks. Regards, Yann E. MORIN. > --- > package/bluez5_utils/bluez5_utils.mk | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/package/bluez5_utils/bluez5_utils.mk b/package/bluez5_utils/bluez5_utils.mk > index 49f6eaac13..7c2561b864 100644 > --- a/package/bluez5_utils/bluez5_utils.mk > +++ b/package/bluez5_utils/bluez5_utils.mk > @@ -13,6 +13,8 @@ BLUEZ5_UTILS_LICENSE = GPL-2.0+, LGPL-2.1+ > BLUEZ5_UTILS_LICENSE_FILES = COPYING COPYING.LIB > BLUEZ5_UTILS_CPE_ID_VENDOR = bluez > BLUEZ5_UTILS_CPE_ID_PRODUCT = bluez > +# We're patching Makefile.am > +BLUEZ5_UTILS_AUTORECONF = YES > > BLUEZ5_UTILS_DEPENDENCIES = \ > $(if $(BR2_PACKAGE_BLUEZ5_UTILS_HEADERS),bluez5_utils-headers) \ > -- > 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 paul at crapouillou.net Mon Feb 14 11:59:11 2022 From: paul at crapouillou.net (Paul Cercueil) Date: Mon, 14 Feb 2022 11:59:11 +0000 Subject: [Buildroot] [PATCH 024/107] package/libiio: drop python2 support In-Reply-To: <20220209165213.4498-25-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> <20220209165213.4498-25-peter@korsgaard.com> Message-ID: Hi Peter, Le mer., f?vr. 9 2022 at 17:50:50 +0100, Peter Korsgaard a ?crit : > Signed-off-by: Peter Korsgaard Acked-by: Paul Cercueil Cheers, -Paul > --- > package/libiio/Config.in | 2 +- > package/libiio/libiio.mk | 10 +++------- > 2 files changed, 4 insertions(+), 8 deletions(-) > > diff --git a/package/libiio/Config.in b/package/libiio/Config.in > index 0d89331c89..98d663e203 100644 > --- a/package/libiio/Config.in > +++ b/package/libiio/Config.in > @@ -91,7 +91,7 @@ config BR2_PACKAGE_LIBIIO_BINDINGS_CSHARP > > config BR2_PACKAGE_LIBIIO_BINDINGS_PYTHON > bool "Install Python bindings" > - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 > + depends on BR2_PACKAGE_PYTHON3 > help > Install the Python bindings. > > diff --git a/package/libiio/libiio.mk b/package/libiio/libiio.mk > index a4fe0d4541..48e2f385e3 100644 > --- a/package/libiio/libiio.mk > +++ b/package/libiio/libiio.mk > @@ -73,14 +73,10 @@ LIBIIO_CONF_OPTS += -DHAVE_DNS_SD=OFF > 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 > +LIBIIO_CONF_OPTS += \ > + -DPYTHON_BINDINGS=ON > + -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 > else > LIBIIO_CONF_OPTS += -DPYTHON_BINDINGS=OFF > endif > -- > 2.20.1 > From yann.morin.1998 at free.fr Mon Feb 14 12:05:24 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 14 Feb 2022 13:05:24 +0100 Subject: [Buildroot] [git commit] package/kodi: add bluetooth dependency comment Message-ID: <20220214115800.9F5D182582@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=38b5f2069bbe029c62594095a02f915552dc28c2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 43122d64e05a2831a96dabcbf149ba199726767f forgot to add bluetooth dependency comment Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/kodi/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/kodi/Config.in b/package/kodi/Config.in index f436a444d3..6896e85e7b 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -135,6 +135,10 @@ config BR2_PACKAGE_KODI_BLUEZ help Enable bluetooth support +comment "bluetooth support needs a toolchain w/ headers >= 3.4" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 + config BR2_PACKAGE_KODI_DBUS bool "dbus" select BR2_PACKAGE_DBUS From yann.morin.1998 at free.fr Mon Feb 14 12:05:47 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 14 Feb 2022 13:05:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi: add bluetooth dependency comment In-Reply-To: <20220214114351.2372109-1-fontaine.fabrice@gmail.com> References: <20220214114351.2372109-1-fontaine.fabrice@gmail.com> Message-ID: <20220214120547.GC38097@scaer> Fabrice, All, On 2022-02-14 12:43 +0100, Fabrice Fontaine spake thusly: > Commit 43122d64e05a2831a96dabcbf149ba199726767f forgot to add bluetooth > dependency comment > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/kodi/Config.in | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/package/kodi/Config.in b/package/kodi/Config.in > index c7e746fad3..692d562af3 100644 > --- a/package/kodi/Config.in > +++ b/package/kodi/Config.in > @@ -135,6 +135,10 @@ config BR2_PACKAGE_KODI_BLUEZ > help > Enable bluetooth support > > +comment "bluetooth support needs a toolchain w/ headers >= 3.4" > + depends on BR2_TOOLCHAIN_HAS_SYNC_4 > + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 > + > config BR2_PACKAGE_KODI_DBUS > bool "dbus" > select BR2_PACKAGE_DBUS > -- > 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 luca at lucaceresoli.net Mon Feb 14 12:16:27 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Mon, 14 Feb 2022 13:16:27 +0100 Subject: [Buildroot] [PATCH] manual: board support: add instructions to test defconfig in the official docker In-Reply-To: <80ba31da-8a8e-12ed-bded-025e47f5cced@benettiengineering.com> References: <20220203235438.610277-1-giulio.benetti@benettiengineering.com> <80ba31da-8a8e-12ed-bded-025e47f5cced@benettiengineering.com> Message-ID: <2169b106-8ed7-4eaf-1409-6dfe3eb19c0d@lucaceresoli.net> Hi Giulio, On 14/02/22 00:35, Giulio Benetti wrote: > Hi Luca, Arnout, Thomas P., > > On 13/02/22 11:39, Arnout Vandecappelle wrote: >> >> >> On 12/02/2022 23:56, Luca Ceresoli wrote: >>> Hi Giulio, >>> >>> On 04/02/22 00:54, Giulio Benetti wrote: >>>> Often new boards have not been tested with official docker so let's add >>>> instructions to do it. >>> >>> Thank you, I think this is a very useful addition to the documentation! >>> However I would suggest some changes for it to look more "professional". > > Always welcome! > >>>> Signed-off-by: Giulio Benetti >>>> --- >>>> ?? docs/manual/adding-board-support.txt | 22 ++++++++++++++++++++++ >>>> ?? 1 file changed, 22 insertions(+) >>>> >>>> diff --git a/docs/manual/adding-board-support.txt >>>> b/docs/manual/adding-board-support.txt >>>> index 33ed709535..f5fb3af371 100644 >>>> --- a/docs/manual/adding-board-support.txt >>>> +++ b/docs/manual/adding-board-support.txt >>>> @@ -46,3 +46,25 @@ create a directory +board/+ and a >>>> subdirectory >>>> ?? +board//+. You can then store your patches >>>> ?? and configurations in these directories, and reference them from >>>> the main >>>> ?? Buildroot configuration. Refer to xref:customize[] for more details. >>>> + >>>> +Before submitting patches for new boards it would be better to test it >>> >>> "it would be better" -> "it is recommended". > > Ok > >>>> +by building it using .gitlab-ci.yml specified docker. For example >>>> at the >>> >>> I think this should be reworded in a simpler way: "by building it using >>> the docker specified in .gitlab-ci.yml". > > Yes > >>> BTW as I am a docker newbie: is it common to say "the docker"? Or would >>> "the docker container" be more correct? -- By comparison, I would never >>> say "using the virtualbox" but rather "using the virtualbox machine". >> >> ?? I would say "the container" since you can use it with any container >> manager >> that follows the OCI spec. > > Ok > >>> >>>> +time of this writing the docker is: >>> >>> Remove the ':' from this line, or you'll have multiple ':' per line, >>> which looks awkward. >>> >>>> +$CI_REGISTRY/buildroot.org/buildroot/base:20220105.2314 >>> >>> Hm, this string is already old. > > Yes :-/ > >> ?? Actually, this part of the documentation is already superseded >> since we now >> have utils/docker-run that does everything. > > Oh, I've missed that, just checked and it eases life not few! > I have a 120 columns command to start it that I copy and paste > everytime. Because also, what I don't take care of here is the -v flag > that allows you mount a host folder. > >>> There's no sane way to keep docs and >>> .yml in sync. I wonder whether we should have in the manual a command >>> line that always use the current string, such as: >>> >>> DOCKER_IMAGE=$(cat .gitlab-ci.yml | \ >>> ???????????????? sed -n >>> '/^image/s/^.*CI_REGISTRY/registry.gitlab.com/p') >>> docker pull $DOCKER_IMAGE >>> sudo docker run -it? $DOCKER_IMAGE >>> >>> However I must admit this is not very readable in the docs... :( What >>> about adding a simple script (utils/run-docker?) that does the trick and >>> just mention that in the docs? > > utils/docker-run then. Now we know it exists :-) > >>>> +so: >>> >>> Add an empty line here, so that the output separates from the next line. > > Ok > >>>> +Pull the docker: >>>> +-------------------- >>>> + $ docker pull >>>> registry.gitlab.com/buildroot.org/buildroot/base:20220105.2314 >>> >>> Missing 'sudo'? >> >> ?? Docker access is usually managed through the "docker" group rather >> than sudo. >> >> ?? And if you use podman as docker replacement, it can even be done in an >> unprivileged container. Not that I tried it, but I think so. >> >> ?? Oh BTW, the pull is in fact not needed, both podman and docker pull >> automatically when you start a container. That's the reason the >> container name >> is so convoluted. > > All new thing I didn't know! > >>> >>>> +-------------------- >>> >>> Add an empty line here. This has no effect on the output but makes >>> source code more readable. >>> >>>> +Run the docker: >>>> +-------------------- >>>> + $ sudo docker run -it >>>> registry.gitlab.com/buildroot.org/buildroot/base:20220105.2314 >>>> /bin/bash >>>> +-------------------- >>> >>> As above, add an empty line here. > > +1 > >>>> +Inside the docker hint: >>>> +-------------------- >>>> + $ git clone git://git.busybox.net/buildroot >>>> + $ cd buildroot >>>> + $ make +_defconfig+ >>>> + $ make >>>> +-------------------- >>> >>> As above, add an empty line here. > > +1 > >>>> +Wait until build finishes and eventually add host dependencies. >>> >>> If I understand what you mean here, it should be "and add host >>> dependencies if needed" ("eventually" is not the english translation of >>> italian "eventualmente"). > > "...and possibly add host dependencies", right? Better. Even better: "and add any missing host dependencies, if any". >>> If my understanding is correct, I don't find >>> this sentence very useful: a docker newbie perhaps doesn't know how to >>> add a host dependency (and maybe not even how to understand that they >>> are missing one). >>> >>> I would just remove this line, but if you think it is very important I'd >>> clarify it, maybe with some examples. >> >> ?? Yes, I think this is what triggered the addition of this >> documentation. If you >> have e.g. libopenssl-dev installed on your build host, then you >> usually won't >> notice in your test builds that a dependency on host-openssl is >> needed. So test >> builds should be done in a minimal container. > > Yes, it was because of that. > >> ?? Unfortunately, the buildroot/base container is not exactly minimal. >> It's >> really what is meant to be used for running CI tests, not exactly what >> is needed >> for build tests. Ideally, we'd have >> >> - an absolutely minimal container that can be used for build tests - >> ideally in >> a couple of variants for different distros; > > There is a bunch of dockers like that(more or less) here: > https://github.com/aduskett/buildroot-docker-devel > I've also contributed to, and at that time Thomas P. in IRC asked why we > didn't upstreamed it and I told I would have done like 2/3 years ago and > I've never done it :-/ > > And also modifying autobuilder's script to pick random distro and build > to avoid possible host issues. But it's a bunch of stuff to do. > >> - a container for CI; > > Do you mean the one we already have but more shrinked? > >> - a more complete container you could use for development, though I can't >> immediately think of extra stuff you'd want in there > > Is it really worth it? I mean, I've never seen anybody in IRC(even if > read few in it) or ML(same) that complain about "I can't have buildroot > working because I miss host tools". But I've seen recently gitlab-ci > results that took me like 15-16 hours to fix. > > Does Yocto have something like that? And if yes, does someone can give a > feedback if he really uses it? The situation is different with yocto as /usr/bin & co are just not in the PATH. No host tools are accessible unless explicitly listed in the HOSTTOOLS variable, so the problem is mostly solved at the root. >> (but then, I wouldn't use a container for development). > > Me too, and who would use it? I think nobody, because I don't think a > newbie is that skilled to use a docker too(or maybe yes), but my first > try would be using it with my distro and probably same goes for other > people. But here again, I use Terminator+Midnight Commander as my "IDE", > so I won't be happy enough with it. Someone else uses real "IDE" and we > can't add Eclipse or VSCode(I hope), so it will be something that is not > enough for anybody, thus IMHO useless. > > ---------------- > Going back to this patch: > > What I can do with this patch is to rewrite it pointing how to use > utils/docker-run to check that at least configs/* and board/* patches work. > > Another solution to my patch is what Thomas P. pointed in IRC: > "it is probably easier to ask people to use gitlab CI" > > But my worry is that lot of people actually fork from github and not > from gitlab. Who would really do that(both docker and gitlab-CI solutions)? > But also, who would really install docker(if they don't use it) to > submit a patch for gitlab-CI build failures? > > I think that counting the ones who took care about their maintained > board gives us an idea, very few. BUT for new boards, and I see not few > of them adding in the last period. It could be a way to force them to > give a proof of a successfull building with gitlab-CI pipeline log as > Thomas P. proposed. > > So I would modify this patch with instructions to: > - fork Buildroot in gitlab > - trigger gitlab-CI pipeline for a single defconfig > > What do you all think? I think we need simple instructions to ensure that anybody is able to test their config builds without unnoticed host dependencies, before they send a patch. I don't care whether it's docker or gitlab or whatever. But it must be something documented and easy to do in a few commands. -- Luca From fontaine.fabrice at gmail.com Mon Feb 14 12:33:50 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 14 Feb 2022 13:33:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/bluez5_utils: set BLUEZ5_UTILS_AUTORECONF In-Reply-To: <20220214115902.GB38097@scaer> References: <20220214110559.2176506-1-fontaine.fabrice@gmail.com> <20220214115902.GB38097@scaer> Message-ID: Yann, Le lun. 14 f?vr. 2022 ? 12:59, Yann E. MORIN a ?crit : > > Fabrice, All, > > On 2022-02-14 12:05 +0100, Fabrice Fontaine spake thusly: > > Commit 572d08ee4a731b203b2d3aaf720a48f622609371 forgot to set > > BLUEZ5_UTILS_AUTORECONF resulting in the following build failure: > > > > /home/peko/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sh4-buildroot-linux-uclibc/10.3.0/../../../../sh4-buildroot-linux-uclibc/bin/ld: gobex/gobex-packet.o: in function `g_obex_packet_set_data': > > gobex-packet.c:(.text+0x698): undefined reference to `util_memdup' > > > > It should be noted that previous commit didn't fix any build failure > > with libglib >= 2.69. It only fixes the following warning: > > > > profiles/battery/battery.c: In function 'read_initial_battery_level_cb': > > profiles/battery/battery.c:162:2: warning: 'g_memdup' is deprecated (declared at /home/buildroot/autobuild/instance-0/output-1/host/bin/../arm-buildroot-linux-gnueabi/sysroot/usr/include/glib-2.0/glib/gstrfuncs.h:257): Use 'g_memdup2' instead [-Wdeprecated-declarations] > > batt->initial_value = g_memdup(value, length); > > ^ > > > > So an other option would be to revert this commit. > > That would have been a possibility, indeed, but I went for keeping it > instead. > > > The 'real' build error that previous commit tried to fix was raised > > because rand was replaced by getrandom since > > https://git.kernel.org/pub/scm/bluetooth/bluez.git/log/?qt=grep&q=getrandom > > but getrandom is not available until glibc 2.25: > > > > plugins/autopair.c:20:24: fatal error: sys/random.h: No such file or directory > > #include > > ^ > > But then this patch of yours does not fix this original issue, does it? Nope, I'm working on it. > > > Fixes: > > - http://autobuild.buildroot.org/results/46f7dbfe1d80c7622d670ba1ac957e9e6077eb9f > > > > Signed-off-by: Fabrice Fontaine > > Applied to master anyway, thanks. > > Regards, > Yann E. MORIN. > > > --- > > package/bluez5_utils/bluez5_utils.mk | 2 ++ > > 1 file changed, 2 insertions(+) > > > > diff --git a/package/bluez5_utils/bluez5_utils.mk b/package/bluez5_utils/bluez5_utils.mk > > index 49f6eaac13..7c2561b864 100644 > > --- a/package/bluez5_utils/bluez5_utils.mk > > +++ b/package/bluez5_utils/bluez5_utils.mk > > @@ -13,6 +13,8 @@ BLUEZ5_UTILS_LICENSE = GPL-2.0+, LGPL-2.1+ > > BLUEZ5_UTILS_LICENSE_FILES = COPYING COPYING.LIB > > BLUEZ5_UTILS_CPE_ID_VENDOR = bluez > > BLUEZ5_UTILS_CPE_ID_PRODUCT = bluez > > +# We're patching Makefile.am > > +BLUEZ5_UTILS_AUTORECONF = YES > > > > BLUEZ5_UTILS_DEPENDENCIES = \ > > $(if $(BR2_PACKAGE_BLUEZ5_UTILS_HEADERS),bluez5_utils-headers) \ > > -- > > 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. | > '------------------------------^-------^------------------^--------------------' Best Regards, Fabrice From fontaine.fabrice at gmail.com Mon Feb 14 13:29:44 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 14 Feb 2022 14:29:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/dnsmasq: fix build with ubus and without dnssec Message-ID: <20220214132944.2471362-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump to version 2.86 in commit 5b29096f8fcb0acd8890073a56ba9d620b1f911c: rfc1035.c: In function 'report_addresses': rfc1035.c:978:49: error: 'struct dnsmasq_daemon' has no member named 'workspacename' 978 | if (!extract_name(header, len, &p, daemon->workspacename, 1, 0)) | ^~ Fixes: - http://autobuild.buildroot.org/results/51242d4f532373544e3c7ea45036b8d41390b29b Signed-off-by: Fabrice Fontaine --- ...-not-DNSSEC-compile-options-selected.patch | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 package/dnsmasq/0003-Fix-FTBFS-when-CONNTRACK-and-UBUS-but-not-DNSSEC-compile-options-selected.patch diff --git a/package/dnsmasq/0003-Fix-FTBFS-when-CONNTRACK-and-UBUS-but-not-DNSSEC-compile-options-selected.patch b/package/dnsmasq/0003-Fix-FTBFS-when-CONNTRACK-and-UBUS-but-not-DNSSEC-compile-options-selected.patch new file mode 100644 index 0000000000..9c98af2be5 --- /dev/null +++ b/package/dnsmasq/0003-Fix-FTBFS-when-CONNTRACK-and-UBUS-but-not-DNSSEC-compile-options-selected.patch @@ -0,0 +1,34 @@ +From 2c60441239e1c10c4987cb586653b1ea08f703c0 Mon Sep 17 00:00:00 2001 +From: Simon Kelley +Date: Tue, 28 Sep 2021 23:42:15 +0100 +Subject: [PATCH] Fix FTBFS when CONNTRACK and UBUS but not DNSSEC compile + options selected. + +[Retrieved from: +https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=2c60441239e1c10c4987cb586653b1ea08f703c0] +Signed-off-by: Fabrice Fontaine +--- + src/dnsmasq.h | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/dnsmasq.h b/src/dnsmasq.h +index c8a918a..3fdc1b0 100644 +--- a/src/dnsmasq.h ++++ b/src/dnsmasq.h +@@ -1173,9 +1173,12 @@ extern struct daemon { + char *packet; /* packet buffer */ + int packet_buff_sz; /* size of above */ + char *namebuff; /* MAXDNAME size buffer */ ++#if (defined(HAVE_CONNTRACK) && defined(HAVE_UBUS)) || defined(HAVE_DNSSEC) ++ /* CONNTRACK UBUS code uses this buffer, as well as DNSSEC code. */ ++ char *workspacename; ++#endif + #ifdef HAVE_DNSSEC + char *keyname; /* MAXDNAME size buffer */ +- char *workspacename; /* ditto */ + unsigned long *rr_status; /* ceiling in TTL from DNSSEC or zero for insecure */ + int rr_status_sz; + int dnssec_no_time_check; +-- +2.20.1 + -- 2.34.1 From fontaine.fabrice at gmail.com Mon Feb 14 13:33:48 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 14 Feb 2022 14:33:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/bluez5_utils: fix build with glibc < 2.25 Message-ID: <20220214133348.2473221-1-fontaine.fabrice@gmail.com> Fix the following build failure with glibc < 2.25 raised since bump to version 5.63 in commit d4c6cf4b1fc0f34e72ff047e76de53d3634f5184: plugins/autopair.c:20:24: fatal error: sys/random.h: No such file or directory #include ^ Fixes: - http://autobuild.buildroot.org/results/6b8870d12e0804d6154230a7322c49416c1dc0e2 Signed-off-by: Fabrice Fontaine --- .../0005-fix-build-with-glibc-2.25.patch | 285 ++++++++++++++++++ 1 file changed, 285 insertions(+) create mode 100644 package/bluez5_utils/0005-fix-build-with-glibc-2.25.patch diff --git a/package/bluez5_utils/0005-fix-build-with-glibc-2.25.patch b/package/bluez5_utils/0005-fix-build-with-glibc-2.25.patch new file mode 100644 index 0000000000..13d0d4de4c --- /dev/null +++ b/package/bluez5_utils/0005-fix-build-with-glibc-2.25.patch @@ -0,0 +1,285 @@ +From a90d20109b605e073ae686d54596b68584a7d7fc Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 14 Feb 2022 13:37:45 +0100 +Subject: [PATCH] fix build with glibc < 2.25 + +getrandom and sys/random.h are only available since glibc 2.25: +https://www.gnu.org/software/gnulib/manual/html_node/sys_002frandom_002eh.html +resulting in the following build failures since version 5.63 and +https://git.kernel.org/pub/scm/bluetooth/bluez.git/log/?qt=grep&q=getrandom +so put back rand() as a fallback: + +plugins/autopair.c:20:24: fatal error: sys/random.h: No such file or directory + #include + ^ + +Fixes: + - http://autobuild.buildroot.org/results/6b8870d12e0804d6154230a7322c49416c1dc0e2 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://patchwork.kernel.org/project/bluetooth/patch/20220214131451.2397549-1-fontaine.fabrice at gmail.com] +--- + configure.ac | 2 ++ + emulator/le.c | 7 +++++++ + emulator/phy.c | 7 +++++++ + peripheral/main.c | 10 ++++++++++ + plugins/autopair.c | 6 ++++++ + profiles/health/hdp.c | 11 +++++++++++ + profiles/health/mcap.c | 10 ++++++++++ + tools/btgatt-server.c | 6 ++++++ + 8 files changed, 59 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 07d068a4d..cdd693da3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -54,6 +54,8 @@ AC_ARG_ENABLE(threads, AS_HELP_STRING([--enable-threads], + + AC_CHECK_FUNCS(explicit_bzero) + ++AC_CHECK_FUNCS(getrandom) ++ + AC_CHECK_FUNCS(rawmemchr) + + AC_CHECK_FUNC(signalfd, dummy=yes, +diff --git a/emulator/le.c b/emulator/le.c +index f8f313f2c..9ef0636d0 100644 +--- a/emulator/le.c ++++ b/emulator/le.c +@@ -20,7 +20,9 @@ + #include + #include + #include ++#ifdef HAVE_GETRANDOM + #include ++#endif + #include + + #include "lib/bluetooth.h" +@@ -509,10 +511,15 @@ static unsigned int get_adv_delay(void) + /* The advertising delay is a pseudo-random value with a range + * of 0 ms to 10 ms generated for each advertising event. + */ ++#ifdef HAVE_GETRANDOM + if (getrandom(&val, sizeof(val), 0) < 0) { + /* If it fails to get the random number, use a static value */ + val = 5; + } ++#else ++ srand(time(NULL)); ++ val = rand(); ++#endif + + return (val % 11); + } +diff --git a/emulator/phy.c b/emulator/phy.c +index 44cace438..e41aaf9c2 100644 +--- a/emulator/phy.c ++++ b/emulator/phy.c +@@ -19,7 +19,9 @@ + #include + #include + #include ++#ifdef HAVE_GETRANDOM + #include ++#endif + #include + #include + #include +@@ -174,6 +176,7 @@ struct bt_phy *bt_phy_new(void) + mainloop_add_fd(phy->rx_fd, EPOLLIN, phy_rx_callback, phy, NULL); + + if (!get_random_bytes(&phy->id, sizeof(phy->id))) { ++#ifdef GAVE_GETRANDOM + if (getrandom(&phy->id, sizeof(phy->id), 0) < 0) { + mainloop_remove_fd(phy->rx_fd); + close(phy->tx_fd); +@@ -181,6 +184,10 @@ struct bt_phy *bt_phy_new(void) + free(phy); + return NULL; + } ++#else ++ srandom(time(NULL)); ++ phy->id = random(); ++#endif + } + + bt_phy_send(phy, BT_PHY_PKT_NULL, NULL, 0); +diff --git a/peripheral/main.c b/peripheral/main.c +index 91adb45fc..542adc330 100644 +--- a/peripheral/main.c ++++ b/peripheral/main.c +@@ -25,7 +25,9 @@ + #include + #include + #include ++#ifdef HAVE_GETRANDOM + #include ++#endif + + #ifndef WAIT_ANY + #define WAIT_ANY (-1) +@@ -192,10 +194,18 @@ int main(int argc, char *argv[]) + addr, 6) < 0) { + printf("Generating new persistent static address\n"); + ++#ifdef HAVE_GETRANDOM + if (getrandom(addr, sizeof(addr), 0) < 0) { + perror("Failed to get random static address"); + return EXIT_FAILURE; + } ++#else ++ addr[0] = rand(); ++ addr[1] = rand(); ++ addr[2] = rand(); ++ addr[3] = 0x34; ++ addr[4] = 0x12; ++#endif + /* Overwrite the MSB to make it a static address */ + addr[5] = 0xc0; + +diff --git a/plugins/autopair.c b/plugins/autopair.c +index a75ecebe4..59d65807c 100644 +--- a/plugins/autopair.c ++++ b/plugins/autopair.c +@@ -17,7 +17,9 @@ + #include + #include + #include ++#ifdef HAVE_GETRANDOM + #include ++#endif + + #include + +@@ -131,10 +133,14 @@ static ssize_t autopair_pincb(struct btd_adapter *adapter, + if (attempt >= 4) + return 0; + ++#ifdef HAVE_GETRANDOM + if (getrandom(&val, sizeof(val), 0) < 0) { + error("Failed to get a random pincode"); + return 0; + } ++#else ++ val = rand(); ++#endif + snprintf(pinstr, sizeof(pinstr), "%06u", + val % 1000000); + *display = true; +diff --git a/profiles/health/hdp.c b/profiles/health/hdp.c +index 9d9d1e824..ca59be3e8 100644 +--- a/profiles/health/hdp.c ++++ b/profiles/health/hdp.c +@@ -16,7 +16,9 @@ + #include + #include + #include ++#ifdef HAVE_GETRANDOM + #include ++#endif + + #include + +@@ -1485,15 +1487,24 @@ static void destroy_create_dc_data(gpointer data) + static void *generate_echo_packet(void) + { + uint8_t *buf; ++#ifndef HAVE_GETRANDOM ++ int i; ++#endif + + buf = g_malloc(HDP_ECHO_LEN); + if (!buf) + return NULL; + ++#ifdef HAVE_GETRANDOM + if (getrandom(buf, HDP_ECHO_LEN, 0) < 0) { + g_free(buf); + return NULL; + } ++#else ++ srand(time(NULL)); ++ for(i = 0; i < HDP_ECHO_LEN; i++) ++ buf[i] = rand() % UINT8_MAX; ++#endif + + return buf; + } +diff --git a/profiles/health/mcap.c b/profiles/health/mcap.c +index aad0a08a3..9bd994fda 100644 +--- a/profiles/health/mcap.c ++++ b/profiles/health/mcap.c +@@ -19,7 +19,9 @@ + #include + #include + #include ++#ifdef HAVE_GETRANDOM + #include ++#endif + + #include + +@@ -1905,11 +1907,15 @@ gboolean mcap_create_mcl(struct mcap_instance *mi, + mcl->state = MCL_IDLE; + bacpy(&mcl->addr, addr); + set_default_cb(mcl); ++#ifdef HAVE_GETRANDOM + if (getrandom(&val, sizeof(val), 0) < 0) { + mcap_instance_unref(mcl->mi); + g_free(mcl); + return FALSE; + } ++#else ++ val = rand(); ++#endif + mcl->next_mdl = (val % MCAP_MDLID_FINAL) + 1; + } + +@@ -2049,11 +2055,15 @@ static void connect_mcl_event_cb(GIOChannel *chan, GError *gerr, + mcl->mi = mcap_instance_ref(mi); + bacpy(&mcl->addr, &dst); + set_default_cb(mcl); ++#ifdef HAVE_GETRANDOM + if (getrandom(&val, sizeof(val), 0) < 0) { + mcap_instance_unref(mcl->mi); + g_free(mcl); + goto drop; + } ++#else ++ val = rand(); ++#endif + mcl->next_mdl = (val % MCAP_MDLID_FINAL) + 1; + } + +diff --git a/tools/btgatt-server.c b/tools/btgatt-server.c +index 15d49a464..6367ccd9d 100644 +--- a/tools/btgatt-server.c ++++ b/tools/btgatt-server.c +@@ -20,7 +20,9 @@ + #include + #include + #include ++#ifdef HAVE_GETRANDOM + #include ++#endif + + #include "lib/bluetooth.h" + #include "lib/hci.h" +@@ -287,8 +289,12 @@ static bool hr_msrmt_cb(void *user_data) + uint32_t cur_ee; + uint32_t val; + ++#ifdef HAVE_GETRANDOM + if (getrandom(&val, sizeof(val), 0) < 0) + return false; ++#else ++ val = rand(); ++#endif + + pdu[0] = 0x06; + pdu[1] = 90 + (val % 40); +-- +2.34.1 + -- 2.34.1 From hsiangkao at aol.com Mon Feb 14 15:24:50 2022 From: hsiangkao at aol.com (Gao Xiang) Date: Mon, 14 Feb 2022 23:24:50 +0800 Subject: [Buildroot] [PATCH] package/erofs-utils: bump version to 1.4 References: <20220214152450.319583-1-hsiangkao.ref@aol.com> Message-ID: <20220214152450.319583-1-hsiangkao@aol.com> - new upstream version; - add 0001-erofs-utils-dump-fix-de-nid-issues.patch [1]; - add 0002-fsck-main.c-add-missing-include.patch [2]; - add 0003-erofs-utils-lib-fix-blobdev-without-Eforce-chunk-ind.patch [3]; - add 0004-erofs-utils-fix-Makefile-for-fsck.erofs-manpage.patch [4]. [1] https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/commit/?id=17eb5c417bd56be4b2f7627c2d6879fbad6a86d6 [2] https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/commit/?id=1ca453ee89894b1669ac78d7f216bda172783e8d [3] https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/commit/?id=eb255afa101b52096bd3e5e48f990576190f03bd [4] https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/commit/?id=534eda7f8678e5b8fc8ca0f5cf0d9d7a932e0d48 Signed-off-by: Gao Xiang --- ...1-erofs-utils-dump-fix-de-nid-issues.patch | 134 ++++++++++++++++++ ...age-only-install-erofsfuse.1-with-th.patch | 32 ----- ...0002-fsck-main.c-add-missing-include.patch | 31 ++++ ...fix-blobdev-without-Eforce-chunk-ind.patch | 40 ++++++ ...-fix-Makefile-for-fsck.erofs-manpage.patch | 29 ++++ package/erofs-utils/erofs-utils.hash | 2 +- package/erofs-utils/erofs-utils.mk | 2 +- 7 files changed, 236 insertions(+), 34 deletions(-) create mode 100644 package/erofs-utils/0001-erofs-utils-dump-fix-de-nid-issues.patch delete mode 100644 package/erofs-utils/0001-erofs-utils-manpage-only-install-erofsfuse.1-with-th.patch create mode 100644 package/erofs-utils/0002-fsck-main.c-add-missing-include.patch create mode 100644 package/erofs-utils/0003-erofs-utils-lib-fix-blobdev-without-Eforce-chunk-ind.patch create mode 100644 package/erofs-utils/0004-erofs-utils-fix-Makefile-for-fsck.erofs-manpage.patch diff --git a/package/erofs-utils/0001-erofs-utils-dump-fix-de-nid-issues.patch b/package/erofs-utils/0001-erofs-utils-dump-fix-de-nid-issues.patch new file mode 100644 index 000000000000..493ce5917722 --- /dev/null +++ b/package/erofs-utils/0001-erofs-utils-dump-fix-de-nid-issues.patch @@ -0,0 +1,134 @@ +From 17eb5c417bd56be4b2f7627c2d6879fbad6a86d6 Mon Sep 17 00:00:00 2001 +From: Gao Xiang +Date: Mon, 22 Nov 2021 07:48:48 +0800 +Subject: [PATCH] erofs-utils: dump: fix de->nid issues + +As David Michael reported, " + In file included from main.c:11: + main.c: In function 'erofs_checkdirent': + ../include/erofs/print.h:68:25: error: format '%llu' expects argument of type 'long long unsigned int', but argument 3 has type '__le64' {aka 'long unsigned int'} [-Werror=format=] + 68 | " " PR_FMT_FUNC_LINE(fmt), \ + | ^~~~~~ + main.c:264:17: note: in expansion of macro 'erofs_err' + 264 | erofs_err("invalid file type %llu", de->nid); + | ^~~~~~~~~ + main.c: In function 'erofs_read_dirent': + ../include/erofs/print.h:68:25: error: format '%llu' expects argument of type 'long long unsigned int', but argument 3 has type '__le64' {aka 'long unsigned int'} [-Werror=format=] + 68 | " " PR_FMT_FUNC_LINE(fmt), \ + | ^~~~~~ + main.c:303:25: note: in expansion of macro 'erofs_err' + 303 | erofs_err("parse dir nid %llu error occurred\n", + | ^~~~~~~~~ + cc1: all warnings being treated as errors +" + +Also there are many de->nid lacking of endianness handling. +Should fix them together. + +Link: https://lore.kernel.org/r/20211121234848.12663-1-xiang at kernel.org +Fixes: cf8be8a4352a ("erofs-utils: dump: add feature for collecting filesystem statistics") +Cc: Wang Qi +Cc: Guo Xuenan +Reported-by: David Michael +Signed-off-by: Gao Xiang +--- + dump/main.c | 31 ++++++++++++++++--------------- + 1 file changed, 16 insertions(+), 15 deletions(-) + +diff --git a/dump/main.c b/dump/main.c +index b7560eca1080..f85903b059d2 100644 +--- a/dump/main.c ++++ b/dump/main.c +@@ -242,11 +242,12 @@ static inline int erofs_checkdirent(struct erofs_dirent *de, + { + int dname_len; + unsigned int nameoff = le16_to_cpu(de->nameoff); ++ erofs_nid_t nid = le64_to_cpu(de->nid); + + if (nameoff < sizeof(struct erofs_dirent) || + nameoff >= PAGE_SIZE) { + erofs_err("invalid de[0].nameoff %u @ nid %llu", +- nameoff, de->nid | 0ULL); ++ nameoff, nid | 0ULL); + return -EFSCORRUPTED; + } + +@@ -255,13 +256,12 @@ static inline int erofs_checkdirent(struct erofs_dirent *de, + /* a corrupted entry is found */ + if (nameoff + dname_len > maxsize || + dname_len > EROFS_NAME_LEN) { +- erofs_err("bogus dirent @ nid %llu", +- le64_to_cpu(de->nid) | 0ULL); ++ erofs_err("bogus dirent @ nid %llu", nid | 0ULL); + DBG_BUGON(1); + return -EFSCORRUPTED; + } + if (de->file_type >= EROFS_FT_MAX) { +- erofs_err("invalid file type %llu", de->nid); ++ erofs_err("invalid file type %llu", nid | 0ULL); + return -EFSCORRUPTED; + } + return dname_len; +@@ -273,7 +273,7 @@ static int erofs_read_dirent(struct erofs_dirent *de, + { + int err; + erofs_off_t occupied_size = 0; +- struct erofs_inode inode = { .nid = de->nid }; ++ struct erofs_inode inode = { .nid = le64_to_cpu(de->nid) }; + + stats.files++; + stats.file_category_stat[de->file_type]++; +@@ -296,12 +296,12 @@ static int erofs_read_dirent(struct erofs_dirent *de, + update_file_size_statatics(occupied_size, inode.i_size); + } + +- if ((de->file_type == EROFS_FT_DIR) +- && de->nid != nid && de->nid != parent_nid) { +- err = erofs_read_dir(de->nid, nid); ++ if (de->file_type == EROFS_FT_DIR && inode.nid != nid && ++ inode.nid != parent_nid) { ++ err = erofs_read_dir(inode.nid, nid); + if (err) { + erofs_err("parse dir nid %llu error occurred\n", +- de->nid); ++ inode.nid | 0ULL); + return err; + } + } +@@ -338,7 +338,8 @@ static int erofs_read_dir(erofs_nid_t nid, erofs_nid_t parent_nid) + int ret; + + /* skip "." and ".." dentry */ +- if (de->nid == nid || de->nid == parent_nid) { ++ if (le64_to_cpu(de->nid) == nid || ++ le64_to_cpu(de->nid) == parent_nid) { + de++; + continue; + } +@@ -399,18 +400,18 @@ static int erofs_get_pathname(erofs_nid_t nid, erofs_nid_t parent_nid, + if (len < 0) + return len; + +- if (de->nid == target) { ++ if (le64_to_cpu(de->nid) == target) { + memcpy(path + pos, dname, len); + path[pos + len] = '\0'; + return 0; + } + + if (de->file_type == EROFS_FT_DIR && +- de->nid != parent_nid && +- de->nid != nid) { ++ le64_to_cpu(de->nid) != parent_nid && ++ le64_to_cpu(de->nid) != nid) { + memcpy(path + pos, dname, len); +- err = erofs_get_pathname(de->nid, nid, +- target, path, pos + len); ++ err = erofs_get_pathname(le64_to_cpu(de->nid), ++ nid, target, path, pos + len); + if (!err) + return 0; + memset(path + pos, 0, len); +-- +2.30.2 + diff --git a/package/erofs-utils/0001-erofs-utils-manpage-only-install-erofsfuse.1-with-th.patch b/package/erofs-utils/0001-erofs-utils-manpage-only-install-erofsfuse.1-with-th.patch deleted file mode 100644 index 0aa99d5324d0..000000000000 --- a/package/erofs-utils/0001-erofs-utils-manpage-only-install-erofsfuse.1-with-th.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 7ab34000c672adca90388a8fcb1f70a7d391d35c Mon Sep 17 00:00:00 2001 -From: David Michael -Date: Thu, 3 Jun 2021 16:18:57 -0400 -Subject: [PATCH] erofs-utils: manpage: only install erofsfuse.1 with the - command - -Link: https://lore.kernel.org/r/87lf7q3dn2.fsf at gmail.com -Reviewed-by: Gao Xiang -Signed-off-by: David Michael -Signed-off-by: Gao Xiang ---- - man/Makefile.am | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/man/Makefile.am b/man/Makefile.am -index ffcf6f81c255..0df947b6fbf7 100644 ---- a/man/Makefile.am -+++ b/man/Makefile.am -@@ -1,5 +1,9 @@ - # SPDX-License-Identifier: GPL-2.0+ - # Makefile.am - --dist_man_MANS = mkfs.erofs.1 erofsfuse.1 -+dist_man_MANS = mkfs.erofs.1 - -+EXTRA_DIST = erofsfuse.1 -+if ENABLE_FUSE -+man_MANS = erofsfuse.1 -+endif --- -2.20.1 - diff --git a/package/erofs-utils/0002-fsck-main.c-add-missing-include.patch b/package/erofs-utils/0002-fsck-main.c-add-missing-include.patch new file mode 100644 index 000000000000..c4fe71c9e6cd --- /dev/null +++ b/package/erofs-utils/0002-fsck-main.c-add-missing-include.patch @@ -0,0 +1,31 @@ +From 1ca453ee89894b1669ac78d7f216bda172783e8d Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Mon, 6 Dec 2021 20:14:03 +0100 +Subject: [PATCH] fsck/main.c: add missing include + +Otherwise musl C library builds fail with missing S_IFMT/S_IFDIR +definitions. + +Link: https://lore.kernel.org/r/20211206191403.1435229-1-alex at linutronix.de +Reviewed-by: Gao Xiang +Signed-off-by: Alexander Kanavin +Signed-off-by: Gao Xiang +--- + fsck/main.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/fsck/main.c b/fsck/main.c +index aefa881f740a..ad48e35f587b 100644 +--- a/fsck/main.c ++++ b/fsck/main.c +@@ -6,6 +6,7 @@ + #include + #include + #include ++#include + #include "erofs/print.h" + #include "erofs/io.h" + #include "erofs/decompress.h" +-- +2.30.2 + diff --git a/package/erofs-utils/0003-erofs-utils-lib-fix-blobdev-without-Eforce-chunk-ind.patch b/package/erofs-utils/0003-erofs-utils-lib-fix-blobdev-without-Eforce-chunk-ind.patch new file mode 100644 index 000000000000..88979eb28fe3 --- /dev/null +++ b/package/erofs-utils/0003-erofs-utils-lib-fix-blobdev-without-Eforce-chunk-ind.patch @@ -0,0 +1,40 @@ +From eb255afa101b52096bd3e5e48f990576190f03bd Mon Sep 17 00:00:00 2001 +From: Gao Xiang +Date: Thu, 23 Dec 2021 16:49:07 +0800 +Subject: [PATCH] erofs-utils: lib: fix --blobdev without -Eforce-chunk-indexes + +blockmap is used by default, chunk indexes should be switched +instead if --blobdev is specified. + +Link: https://lore.kernel.org/r/20211223084907.93020-1-hsiangkao at linux.alibaba.com +Fixes: 016bd812be1e ("erofs-utils: mkfs: enable block map chunk format") +Signed-off-by: Gao Xiang +--- + lib/blobchunk.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/lib/blobchunk.c b/lib/blobchunk.c +index 5e9a88a30af3..a145be917b4a 100644 +--- a/lib/blobchunk.c ++++ b/lib/blobchunk.c +@@ -113,7 +113,7 @@ int erofs_blob_write_chunk_indexes(struct erofs_inode *inode, + + if (multidev) { + idx.device_id = 1; +- inode->u.chunkformat |= EROFS_CHUNK_FORMAT_INDEXES; ++ DBG_BUGON(!(inode->u.chunkformat & EROFS_CHUNK_FORMAT_INDEXES)); + } else { + base_blkaddr = remapped_base; + } +@@ -171,6 +171,8 @@ int erofs_blob_write_chunked_file(struct erofs_inode *inode) + int fd, ret; + + inode->u.chunkformat |= inode->u.chunkbits - LOG_BLOCK_SIZE; ++ if (multidev) ++ inode->u.chunkformat |= EROFS_CHUNK_FORMAT_INDEXES; + + if (inode->u.chunkformat & EROFS_CHUNK_FORMAT_INDEXES) + unit = sizeof(struct erofs_inode_chunk_index); +-- +2.30.2 + diff --git a/package/erofs-utils/0004-erofs-utils-fix-Makefile-for-fsck.erofs-manpage.patch b/package/erofs-utils/0004-erofs-utils-fix-Makefile-for-fsck.erofs-manpage.patch new file mode 100644 index 000000000000..27832d1e32b9 --- /dev/null +++ b/package/erofs-utils/0004-erofs-utils-fix-Makefile-for-fsck.erofs-manpage.patch @@ -0,0 +1,29 @@ +From 534eda7f8678e5b8fc8ca0f5cf0d9d7a932e0d48 Mon Sep 17 00:00:00 2001 +From: Gao Xiang +Date: Mon, 22 Nov 2021 07:58:40 +0800 +Subject: [PATCH] erofs-utils: fix Makefile for fsck.erofs manpage + +Add the missing dependency for fsck.erofs manpage. + +Link: https://lore.kernel.org/r/20211121235840.17600-1-xiang at kernel.org +Fixes: f44043561491 ("erofs-utils: introduce fsck.erofs") +Signed-off-by: Gao Xiang +--- + man/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/man/Makefile.am b/man/Makefile.am +index 769b5578a175..4628b85df2ef 100644 +--- a/man/Makefile.am ++++ b/man/Makefile.am +@@ -1,6 +1,6 @@ + # SPDX-License-Identifier: GPL-2.0+ + +-dist_man_MANS = mkfs.erofs.1 dump.erofs.1 ++dist_man_MANS = mkfs.erofs.1 dump.erofs.1 fsck.erofs.1 + + EXTRA_DIST = erofsfuse.1 + if ENABLE_FUSE +-- +2.30.2 + diff --git a/package/erofs-utils/erofs-utils.hash b/package/erofs-utils/erofs-utils.hash index 8bbb0885689b..aca5677d17e4 100644 --- a/package/erofs-utils/erofs-utils.hash +++ b/package/erofs-utils/erofs-utils.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 132635740039bbe76d743aea72378bfae30dbf034e123929f5d794198d4c0b12 erofs-utils-1.3.tar.gz +sha256 67702b1fc5da05719d95ddb7c107e334b04365f5161a9717479d2831fca85a98 erofs-utils-1.4.tar.gz sha256 feee3b3157dcdf78d4f50edefbd5dd7adf8b6d52c11bfaaa746a85a373256713 COPYING diff --git a/package/erofs-utils/erofs-utils.mk b/package/erofs-utils/erofs-utils.mk index e35470b02edc..03df2be3668a 100644 --- a/package/erofs-utils/erofs-utils.mk +++ b/package/erofs-utils/erofs-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -EROFS_UTILS_VERSION = 1.3 +EROFS_UTILS_VERSION = 1.4 EROFS_UTILS_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot EROFS_UTILS_LICENSE = GPL-2.0+ EROFS_UTILS_LICENSE_FILES = COPYING -- 2.30.2 From ps.report at gmx.net Mon Feb 14 15:49:25 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Mon, 14 Feb 2022 16:49:25 +0100 Subject: [Buildroot] [PATCH v1] package/util-linux: bump version to 2.37.4 (fixes CVE-2022-0563) Message-ID: <20220214154925.6014-1-ps.report@gmx.net> For details see [1] and [2]. [1] https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.37/v2.37.4-ChangeLog [2] https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.37/v2.37.4-ReleaseNotes 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 9c10a42dca..748a36e0be 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 634e6916ad913366c3536b6468e7844769549b99a7b2bf80314de78ab5655b83 util-linux-2.37.4.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 a25b69d910..891c17d1d9 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).4 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 luca at lucaceresoli.net Mon Feb 14 16:24:13 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Mon, 14 Feb 2022 17:24:13 +0100 Subject: [Buildroot] [PATCH 2/2] utils/docker-run: allow interactive use In-Reply-To: <20220214162413.17301-1-luca@lucaceresoli.net> References: <20220214162413.17301-1-luca@lucaceresoli.net> Message-ID: <20220214162413.17301-2-luca@lucaceresoli.net> Without -i, the container cannot be used interactively. Allow using it as in: $ ./utils/docker-run + exec docker run -v /home/ceresoli/devel/buildroot:/home/br-user -it registry.gitlab.com/buildroot.org/buildroot/base:20220206.1756 br-user at 1e9508a4ccbb:~$ ls arch board boot CHANGES Config.in Config.in.legacy configs COPYING DEVELOPERS docs fs linux Makefile Makefile.legacy output package README support system toolchain utils br-user at 1e9508a4ccbb:~$ Signed-off-by: Luca Ceresoli --- utils/docker-run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/docker-run b/utils/docker-run index 979aec69b946..9fb895bcc628 100755 --- a/utils/docker-run +++ b/utils/docker-run @@ -7,4 +7,4 @@ IMAGE=$(grep ^image: "${MAIN_DIR}/.gitlab-ci.yml" | \ sed -e 's,^image: ,,g' | sed -e 's,\$CI_REGISTRY,registry.gitlab.com,g') set -x -exec docker run -v "${MAIN_DIR}:/home/br-user" -t "${IMAGE}" "$@" +exec docker run -v "${MAIN_DIR}:/home/br-user" -it "${IMAGE}" "$@" -- 2.35.1 From luca at lucaceresoli.net Mon Feb 14 16:24:12 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Mon, 14 Feb 2022 17:24:12 +0100 Subject: [Buildroot] [PATCH 1/2] utils/docker-run: use portable bash shebang Message-ID: <20220214162413.17301-1-luca@lucaceresoli.net> /usr/bin/bash does not exist on Ubuntu 2018.04. Use the more portable alternative /bin/bash. Note that currently "/usr/bin/bash" does not appear anywhere in the Buildroot source code, while "/bin/bash" is used by many scripts. Signed-off-by: Luca Ceresoli Fixes: 242e9d72e7d2 ("utils/docker-run: new script") --- utils/docker-run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/docker-run b/utils/docker-run index 0614f1325d78..979aec69b946 100755 --- a/utils/docker-run +++ b/utils/docker-run @@ -1,4 +1,4 @@ -#!/usr/bin/bash +#!/bin/bash set -o errexit -o pipefail DIR=$(dirname "${0}") MAIN_DIR=$(readlink -f "${DIR}/..") -- 2.35.1 From giulio.benetti at benettiengineering.com Mon Feb 14 16:28:10 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 14 Feb 2022 17:28:10 +0100 Subject: [Buildroot] [PATCH 2/2] utils/docker-run: allow interactive use In-Reply-To: <20220214162413.17301-2-luca@lucaceresoli.net> References: <20220214162413.17301-1-luca@lucaceresoli.net> <20220214162413.17301-2-luca@lucaceresoli.net> Message-ID: <26f4f710-d8d3-b4a9-faa9-6bd329dfba8c@benettiengineering.com> Hi Luca, On 14/02/22 17:24, Luca Ceresoli wrote: > Without -i, the container cannot be used interactively. Allow using it as > in: > > $ ./utils/docker-run > + exec docker run -v /home/ceresoli/devel/buildroot:/home/br-user -it registry.gitlab.com/buildroot.org/buildroot/base:20220206.1756 > br-user at 1e9508a4ccbb:~$ ls > arch board boot CHANGES Config.in Config.in.legacy configs COPYING DEVELOPERS docs fs linux Makefile Makefile.legacy output package README support system toolchain utils > br-user at 1e9508a4ccbb:~$ > > Signed-off-by: Luca Ceresoli > --- > utils/docker-run | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/utils/docker-run b/utils/docker-run > index 979aec69b946..9fb895bcc628 100755 > --- a/utils/docker-run > +++ b/utils/docker-run > @@ -7,4 +7,4 @@ IMAGE=$(grep ^image: "${MAIN_DIR}/.gitlab-ci.yml" | \ > sed -e 's,^image: ,,g' | sed -e 's,\$CI_REGISTRY,registry.gitlab.com,g') > > set -x > -exec docker run -v "${MAIN_DIR}:/home/br-user" -t "${IMAGE}" "$@" > +exec docker run -v "${MAIN_DIR}:/home/br-user" -it "${IMAGE}" "$@" Can you please also add --rm option too to avoid having a lot of exited containers? It should go into another patch. Thank you! Best regards -- Giulio Benetti Benetti Engineering sas From yann.morin.1998 at free.fr Mon Feb 14 16:36:09 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 14 Feb 2022 17:36:09 +0100 Subject: [Buildroot] [PATCH 1/2] utils/docker-run: use portable bash shebang In-Reply-To: <20220214162413.17301-1-luca@lucaceresoli.net> References: <20220214162413.17301-1-luca@lucaceresoli.net> Message-ID: <20220214163609.GD38097@scaer> Luca, All, On 2022-02-14 17:24 +0100, Luca Ceresoli spake thusly: > /usr/bin/bash does not exist on Ubuntu 2018.04. Use the more portable > alternative /bin/bash. > > Note that currently "/usr/bin/bash" does not appear anywhere in the > Buildroot source code, while "/bin/bash" is used by many scripts. The real portable solution is to use /usr/bin/env, which is mandated by POSIX: #!/usr/bin/env bash and which we already use quite a bit: $ git grep 'env bash' |wc -l 34 (No need to respin, it can be fixed when applying, I guess...) Regards, Yann E. MORIN. > Signed-off-by: Luca Ceresoli > Fixes: 242e9d72e7d2 ("utils/docker-run: new script") > --- > utils/docker-run | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/utils/docker-run b/utils/docker-run > index 0614f1325d78..979aec69b946 100755 > --- a/utils/docker-run > +++ b/utils/docker-run > @@ -1,4 +1,4 @@ > -#!/usr/bin/bash > +#!/bin/bash > set -o errexit -o pipefail > DIR=$(dirname "${0}") > MAIN_DIR=$(readlink -f "${DIR}/..") > -- > 2.35.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 Mon Feb 14 16:45:16 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 14 Feb 2022 17:45:16 +0100 Subject: [Buildroot] [git commit] utils/docker-run: use portable bash shebang Message-ID: <20220214164932.0C93A81E89@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=61912cc89a0ee391fdb1d79203fbf027822fa97d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master /usr/bin/bash does not exist on Ubuntu 2018.04. Use the more portable alternative "#!/usr/bin/env bash" which we are already using in quite a few scripts. Signed-off-by: Luca Ceresoli Fixes: 242e9d72e7d2 ("utils/docker-run: new script") [yann.morin.1998 at free.fr: use "#!/usr/bin/env bash", not "@!/bin/bash"] Signed-off-by: Yann E. MORIN --- utils/docker-run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/docker-run b/utils/docker-run index 0614f1325d..35153199a1 100755 --- a/utils/docker-run +++ b/utils/docker-run @@ -1,4 +1,4 @@ -#!/usr/bin/bash +#!/usr/bin/env bash set -o errexit -o pipefail DIR=$(dirname "${0}") MAIN_DIR=$(readlink -f "${DIR}/..") From yann.morin.1998 at free.fr Mon Feb 14 16:56:49 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 14 Feb 2022 17:56:49 +0100 Subject: [Buildroot] [git commit] utils/docker-run: allow interactive use Message-ID: <20220214164932.15E6382AA4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cef07c93587b186f68c42b8748a4db81c81ec7dc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Without -i, the container cannot be used interactively. Allow using it as in: $ ./utils/docker-run + exec docker run -v /home/ceresoli/devel/buildroot:/home/br-user -it registry.gitlab.com/buildroot.org/buildroot/base:20220206.1756 br-user at 1e9508a4ccbb:~$ ls arch board boot CHANGES Config.in Config.in.legacy configs COPYING DEVELOPERS docs fs linux Makefile Makefile.legacy output package README support system toolchain utils br-user at 1e9508a4ccbb:~$ Signed-off-by: Luca Ceresoli Signed-off-by: Yann E. MORIN --- utils/docker-run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/docker-run b/utils/docker-run index 35153199a1..2bca8d8e3a 100755 --- a/utils/docker-run +++ b/utils/docker-run @@ -7,4 +7,4 @@ IMAGE=$(grep ^image: "${MAIN_DIR}/.gitlab-ci.yml" | \ sed -e 's,^image: ,,g' | sed -e 's,\$CI_REGISTRY,registry.gitlab.com,g') set -x -exec docker run -v "${MAIN_DIR}:/home/br-user" -t "${IMAGE}" "$@" +exec docker run -v "${MAIN_DIR}:/home/br-user" -it "${IMAGE}" "$@" From yann.morin.1998 at free.fr Mon Feb 14 17:04:56 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 14 Feb 2022 18:04:56 +0100 Subject: [Buildroot] [PATCH 1/2] utils/docker-run: use portable bash shebang In-Reply-To: <20220214162413.17301-1-luca@lucaceresoli.net> References: <20220214162413.17301-1-luca@lucaceresoli.net> Message-ID: <20220214170456.GE38097@scaer> Luca, All, Series of two applied to master, thanks. As Giulio requested, an additional patch to use --rm would be nice. And now there is something that strikes me: we bind-mount the Buildroot tree as the home of the br-user, so we don't have any file from the br-user avvailable at all, so we can as well run the container with the local user, by running with: --user $(id -u):$(id -g) This way, there wil no longer be any issue with file acccess rights. There would however be the issue that the paths in the container would not be the same as on the host, but we can also alleviate that isue by doing the bind-mount in the same location (Docker creates the montpoint if it does not exists prior do doing the mount), and change the cwd: exec docker run \ -it --rm \ --workdir "${MAIN_DIR}" \ --mount "type=bind,src=${MAIN_DIR},dst=${MAIN_DIR}" \ "${IMAGE}" \ "$@" Et voil?, that's much more interesting now! :-] Care to send a patch please? ;-) Regards, Yann E. MORIN. On 2022-02-14 17:24 +0100, Luca Ceresoli spake thusly: > /usr/bin/bash does not exist on Ubuntu 2018.04. Use the more portable > alternative /bin/bash. > > Note that currently "/usr/bin/bash" does not appear anywhere in the > Buildroot source code, while "/bin/bash" is used by many scripts. > > Signed-off-by: Luca Ceresoli > Fixes: 242e9d72e7d2 ("utils/docker-run: new script") > --- > utils/docker-run | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/utils/docker-run b/utils/docker-run > index 0614f1325d78..979aec69b946 100755 > --- a/utils/docker-run > +++ b/utils/docker-run > @@ -1,4 +1,4 @@ > -#!/usr/bin/bash > +#!/bin/bash > set -o errexit -o pipefail > DIR=$(dirname "${0}") > MAIN_DIR=$(readlink -f "${DIR}/..") > -- > 2.35.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From giulio.benetti at benettiengineering.com Mon Feb 14 17:38:55 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 14 Feb 2022 18:38:55 +0100 Subject: [Buildroot] [PATCH] utils/docker-run: hide docker run command Message-ID: <20220214173855.4071040-1-giulio.benetti@benettiengineering.com> Since this is a helper script I don't find the reason to show the command we're issuing, so let's remove 'set -x' before running docker. Signed-off-by: Giulio Benetti --- utils/docker-run | 1 - 1 file changed, 1 deletion(-) diff --git a/utils/docker-run b/utils/docker-run index 0614f1325d..55dafd22a3 100755 --- a/utils/docker-run +++ b/utils/docker-run @@ -6,5 +6,4 @@ 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 exec docker run -v "${MAIN_DIR}:/home/br-user" -t "${IMAGE}" "$@" -- 2.25.1 From fontaine.fabrice at gmail.com Mon Feb 14 19:39:39 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 14 Feb 2022 20:39:39 +0100 Subject: [Buildroot] [PATCH 1/2] package/weston: drop GBM dependency from DRM option Message-ID: <20220214193940.3615904-1-fontaine.fabrice@gmail.com> upstream advocated that DRM backend can be built without GBM: https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/791 so drop dependencies on BR2_PACKAGE_MESA3D_OPENGL_EGL || BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL to allow DRM to be the default backend when fbdev will be removed in the follow-up patch Signed-off-by: Fabrice Fontaine --- package/weston/Config.in | 9 --------- 1 file changed, 9 deletions(-) diff --git a/package/weston/Config.in b/package/weston/Config.in index d45e50baaa..073a3ae567 100644 --- a/package/weston/Config.in +++ b/package/weston/Config.in @@ -40,12 +40,8 @@ config BR2_PACKAGE_WESTON_DEFAULT_FBDEV config BR2_PACKAGE_WESTON_DEFAULT_DRM bool "drm" - depends on BR2_PACKAGE_MESA3D_OPENGL_EGL || BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL select BR2_PACKAGE_WESTON_DRM -comment "drm backend needs mesa3d w/ EGL driver" - depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL && !BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL - config BR2_PACKAGE_WESTON_DEFAULT_HEADLESS bool "headless" select BR2_PACKAGE_WESTON_HEADLESS @@ -74,11 +70,6 @@ config BR2_PACKAGE_WESTON_DEFAULT_COMPOSITOR config BR2_PACKAGE_WESTON_DRM bool "DRM compositor" - depends on BR2_PACKAGE_MESA3D_OPENGL_EGL || BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL - -# Uses libgbm from mesa3d -comment "DRM compositor needs an OpenGL EGL backend provided by mesa3d" - depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL && !BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL config BR2_PACKAGE_WESTON_FBDEV bool "fbdev compositor (deprecated)" -- 2.34.1 From fontaine.fabrice at gmail.com Mon Feb 14 19:39:40 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 14 Feb 2022 20:39:40 +0100 Subject: [Buildroot] [PATCH 2/2] package/weston: drop fbdev In-Reply-To: <20220214193940.3615904-1-fontaine.fabrice@gmail.com> References: <20220214193940.3615904-1-fontaine.fabrice@gmail.com> Message-ID: <20220214193940.3615904-2-fontaine.fabrice@gmail.com> fbdev raises the following build failure since bump to version 10.0.0 in commit f67a6e9b7a7be9adbc405b3126000056120a01af and https://gitlab.freedesktop.org/wayland/weston/-/commit/6338dbd5816689b2f08f48b359a972e16ff038d8: ../output-1/build/weston-10.0.0/meson.build:133:7: ERROR: Tried to access unknown option 'backend-fbdev'. Drop fbdev to avoid this build failure as upstream is reluctant to properly fix this issue by renaming the fbdev option in stable release: https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/791 Fixes: - http://autobuild.buildroot.org/results/e669a6237c19783c627169c819d7372e20daaf54 Signed-off-by: Fabrice Fontaine --- Config.in.legacy | 12 ++++++++++++ package/weston/Config.in | 8 -------- package/weston/weston.mk | 6 ------ 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index aefb0ba6ea..b90b9dbcbc 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,18 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_WESTON_DEFAULT_FBDEV + bool "weston fbdev removed" + select BR2_LEGACY + help + fbdev was deprecated in weston 10.0.0. + +config BR2_PACKAGE_WESTON_FBDEV + bool "weston fbdev compositor removed" + select BR2_LEGACY + help + fbdev compositor was deprecated in weston 10.0.0. + config BR2_PACKAGE_LINUX_TOOLS_BPFTOOL bool "bpftool was moved" select BR2_LEGACY diff --git a/package/weston/Config.in b/package/weston/Config.in index 073a3ae567..6ad8241caa 100644 --- a/package/weston/Config.in +++ b/package/weston/Config.in @@ -34,10 +34,6 @@ if BR2_PACKAGE_WESTON choice prompt "default compositor" -config BR2_PACKAGE_WESTON_DEFAULT_FBDEV - bool "fbdev (deprecated)" - select BR2_PACKAGE_WESTON_FBDEV - config BR2_PACKAGE_WESTON_DEFAULT_DRM bool "drm" select BR2_PACKAGE_WESTON_DRM @@ -62,7 +58,6 @@ endchoice config BR2_PACKAGE_WESTON_DEFAULT_COMPOSITOR string - default "fbdev" if BR2_PACKAGE_WESTON_DEFAULT_FBDEV default "drm" if BR2_PACKAGE_WESTON_DEFAULT_DRM default "headless" if BR2_PACKAGE_WESTON_DEFAULT_HEADLESS default "wayland" if BR2_PACKAGE_WESTON_DEFAULT_WAYLAND @@ -71,9 +66,6 @@ config BR2_PACKAGE_WESTON_DEFAULT_COMPOSITOR config BR2_PACKAGE_WESTON_DRM bool "DRM compositor" -config BR2_PACKAGE_WESTON_FBDEV - bool "fbdev compositor (deprecated)" - # FreeRDP needs threads and !static, already the case for weston config BR2_PACKAGE_WESTON_RDP bool "RDP compositor" diff --git a/package/weston/weston.mk b/package/weston/weston.mk index a0a18d9358..90cf160688 100644 --- a/package/weston/weston.mk +++ b/package/weston/weston.mk @@ -85,12 +85,6 @@ else WESTON_CONF_OPTS += -Dbackend-rdp=false endif -ifeq ($(BR2_PACKAGE_WESTON_FBDEV),y) -WESTON_CONF_OPTS += -Ddeprecated-backend-fbdev=true -else -WESTON_CONF_OPTS += -Ddeprecated-backend-fbdev=false -endif - ifeq ($(BR2_PACKAGE_WESTON_DRM),y) WESTON_CONF_OPTS += -Dbackend-drm=true else -- 2.34.1 From arnout at mind.be Mon Feb 14 20:01:02 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 14 Feb 2022 21:01:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/guile: fix build with glibc 2.34 In-Reply-To: <20220206195106.2520033-1-fontaine.fabrice@gmail.com> References: <20220206195106.2520033-1-fontaine.fabrice@gmail.com> Message-ID: On 06/02/2022 20:51, Fabrice Fontaine wrote: > Fix the following build failure with glibc 2.34 raised since bump to > version 3.0.7 in commit d8bee3950aa851620d6a954aebad1f984caa105a: > > In file included from regexec.c:1368, > from regex.c:74: > ./malloc/dynarray-skeleton.c:195:24: error: expected declaration specifiers or '...' before '(' token > 195 | __attribute_nonnull__ ((1)) > | ^ > > https://lists.gnu.org/archive/html/bug-guile/2021-08/msg00003.html > > Fixes: > - http://autobuild.buildroot.org/results/27a2a69e1177f15daec65eca035b99ea5355c34b > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Pity about the huge patch, but it is what it is. Regards, Arnout From arnout at mind.be Mon Feb 14 20:01:28 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 14 Feb 2022 21:01:28 +0100 Subject: [Buildroot] [PATCH] configs/pcengines_apu2_defconfig: linux needs host libelf In-Reply-To: <20220202171035.1740791-1-giulio.benetti@benettiengineering.com> References: <20220202171035.1740791-1-giulio.benetti@benettiengineering.com> Message-ID: On 02/02/2022 18:10, Giulio Benetti wrote: > Signed-off-by: Giulio Benetti Applied to master, thanks. Regards, Arnout > --- > configs/pcengines_apu2_defconfig | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/configs/pcengines_apu2_defconfig b/configs/pcengines_apu2_defconfig > index 0792c93c19..a85808554c 100644 > --- a/configs/pcengines_apu2_defconfig > +++ b/configs/pcengines_apu2_defconfig > @@ -8,6 +8,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION=y > 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" > +BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y > > # Default hostname and TTY > BR2_TARGET_GENERIC_HOSTNAME="apu2" From arnout at mind.be Mon Feb 14 19:56:51 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Feb 2022 20:56:51 +0100 Subject: [Buildroot] [git commit] configs/pcengines_apu2_defconfig: linux needs host libelf Message-ID: <20220214195402.43E188142B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fd78150e89abf972d957edd255f2824803d76121 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- configs/pcengines_apu2_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/pcengines_apu2_defconfig b/configs/pcengines_apu2_defconfig index 0792c93c19..a85808554c 100644 --- a/configs/pcengines_apu2_defconfig +++ b/configs/pcengines_apu2_defconfig @@ -8,6 +8,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION=y 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" +BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y # Default hostname and TTY BR2_TARGET_GENERIC_HOSTNAME="apu2" From arnout at mind.be Mon Feb 14 19:57:56 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Feb 2022 20:57:56 +0100 Subject: [Buildroot] [git commit] package/guile: fix build with glibc 2.34 Message-ID: <20220214195402.6211C8142B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3e4d43911365653e0f9e2423d473fef85d347e32 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with glibc 2.34 raised since bump to version 3.0.7 in commit d8bee3950aa851620d6a954aebad1f984caa105a: In file included from regexec.c:1368, from regex.c:74: ./malloc/dynarray-skeleton.c:195:24: error: expected declaration specifiers or '...' before '(' token 195 | __attribute_nonnull__ ((1)) | ^ https://lists.gnu.org/archive/html/bug-guile/2021-08/msg00003.html Fixes: - http://autobuild.buildroot.org/results/27a2a69e1177f15daec65eca035b99ea5355c34b Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...-8f4538a53d64054ae2fc8b86c0f87c418c6176e6.patch | 13930 +++++++++++++++++++ package/guile/guile.mk | 7 +- 2 files changed, 13935 insertions(+), 2 deletions(-) Patch is too large, so refusing to show it From arnout at mind.be Mon Feb 14 20:13:33 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 14 Feb 2022 21:13:33 +0100 Subject: [Buildroot] [PATCH] configs/roc_pc_rk3399_defconfig: expand rootfs size to 120M In-Reply-To: References: <20220202171035.1740791-1-giulio.benetti@benettiengineering.com> <20220202171035.1740791-2-giulio.benetti@benettiengineering.com> Message-ID: <6edcbc6d-c9bb-e802-48f1-d4866a698aa9@mind.be> On 14/02/2022 01:03, Giulio Benetti wrote: > Hi Arnout, > > On 13/02/22 12:35, Arnout Vandecappelle wrote: >> >> >> On 02/02/2022 18:10, Giulio Benetti wrote: >>> Default 60M for rootfs are not enough and generate a build failure, so >>> let's expand rootfs size to 120M. >> >> ?? Did you find out _why_ 64M wasn't enough for just the kernel and busybox? Is >> it because of all the stupid modules in the default arm64 defconfig? But most >> other arm64 defconfigs don't seem to need this... > > It is because of modules(30M) and linux "Image", it's not compressed, so it's > 25M. So only for Linux+modules => 55M, plus the few other stuff(Busybox+libc > etc.)1M Yeah those giant aarch64 default configs are mightily annoying... I'm thinking, perhaps we should just bite the bullet and move the default ext2 size to 120M... Peter, Yann, what do you think? Regards, Arnout > > Also, nothing changed since the beginning, so I don't know how could this happened: > # git log --oneline configs/roc_pc_rk3399_defconfig > f51cbc33d9 configs/roc_pc_rk3399: fix U-Boot dependencies > 80ae1aedcb configs/roc_rk3399_pc: new defconfig > # git log --oneline roc-rk3399-pc/ > 80ae1aedcb configs/roc_rk3399_pc: new defconfig > > U-Boot dependencies are host dependencies, so it doesn't impact. > > # git log --oneline fs/ext2: > 5ece6be60b fs/ext2: fir (again) namespace for variables > db7d786140 fs/ext2: fix namespace for variables > 5631c38024 fs/ext2: pass a default string to filesystem label > ... > here board has been added > > So it doesn't seem a ext2 problem too. > I can't understand how it could be building in the beginning. > > We have 2 solutions: > - expand rootfs > - use a compressed linux Image.gz(25M => 9M), but need target testing > > Honestly I don't think systems with SoCs like RK3399 have problems with 56M > more, so I would go with expanding rootfs to 120M and if maintainer in Cc wants > to shrink Linux and target testing it is welcome to send a patch. > > What do you think? > > Best regards From arnout at mind.be Mon Feb 14 20:13:51 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 14 Feb 2022 21:13:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/resiprocate: fix build of rend with gcc 11 In-Reply-To: <20220208182929.3976984-1-fontaine.fabrice@gmail.com> References: <20220208182929.3976984-1-fontaine.fabrice@gmail.com> Message-ID: <77e919af-fe0e-2878-4f79-826b486c911a@mind.be> On 08/02/2022 19:29, Fabrice Fontaine wrote: > Fix the following build failure of rend with gcc 11: > > /home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/riscv32-buildroot-linux-gnu/include/c++/11.2.0/bits/stl_tree.h:770:15: error: static assertion failed: comparison object must be invocable as const > 770 | is_invocable_v, > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/ad9d89fefe1a667daa123397a072bf130bfa03a7 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...e-issue-compiling-with-Visual-Studio.patch | 95 +++++++++++++++++++ > 1 file changed, 95 insertions(+) > create mode 100644 package/resiprocate/0001-Fix-some-issue-compiling-with-Visual-Studio.patch > > diff --git a/package/resiprocate/0001-Fix-some-issue-compiling-with-Visual-Studio.patch b/package/resiprocate/0001-Fix-some-issue-compiling-with-Visual-Studio.patch > new file mode 100644 > index 0000000000..826774ce8d > --- /dev/null > +++ b/package/resiprocate/0001-Fix-some-issue-compiling-with-Visual-Studio.patch > @@ -0,0 +1,95 @@ > +From be76b10a50749e2e11dce8dcc38b414a7f9d8747 Mon Sep 17 00:00:00 2001 > +From: Ben Walden > +Date: Sat, 22 Aug 2020 23:14:11 +0100 > +Subject: [PATCH] Fix some issue compiling with Visual Studio 16.7.0 and tidy > + up Visual Studio 16 project files > + > +[Retrieved (and updated to keep only RendKa.cxx update) from: > +https://github.com/resiprocate/resiprocate/commit/be76b10a50749e2e11dce8dcc38b414a7f9d8747] > +SIgned-off-by: Fabrice Fontaine > +--- > + VisualStudioReadme.htm | 65 + > + contrib/GeoIP/GeoIP_12_0.vcxproj | 550 ------- > + contrib/GeoIP/GeoIP_16_0.vcxproj | 93 +- > + .../db/build_windows/db_static_12_0.vcxproj | 1260 ----------------- > + .../db/build_windows/db_static_16_0.vcxproj | 696 +-------- > + contrib/db/dbinc/atomic.h | 4 +- > + contrib/db/mp/mp_fget.c | 4 +- > + contrib/db/mp/mp_mvcc.c | 4 +- > + contrib/db/mp/mp_region.c | 4 +- > + contrib/db/mutex/mut_method.c | 2 +- > + contrib/pcre/pcre_12_0.vcxproj | 466 ------ > + contrib/pcre/pcre_16_0.vcxproj | 159 +-- > + contrib/popt/popt_12_0.vcxproj | 394 ------ > + contrib/popt/popt_16_0.vcxproj | 120 +- > + reSIProcate_16_0.sln | 58 +- > + .../queuetostream_12_0.vcxproj | 582 -------- > + .../queuetostream_16_0.vcxproj | 207 ++- > + repro/repro_12_0.vcxproj | 825 ----------- > + repro/repro_12_0.vcxproj.filters | 47 - > + repro/repro_16_0.vcxproj | 159 ++- > + repro/reprocmd/reprocmd_12_0.vcxproj | 597 -------- > + repro/reprocmd/reprocmd_16_0.vcxproj | 139 +- > + repro/reprolib_12_0.vcxproj | 596 -------- > + repro/reprolib_12_0.vcxproj.filters | 136 -- > + repro/reprolib_16_0.vcxproj | 132 +- > + resip/dum/dum_12_0.vcxproj | 615 -------- > + resip/dum/dum_16_0.vcxproj | 124 +- > + resip/dum/test/basicCall_12_0.vcxproj | 621 -------- > + resip/dum/test/basicCall_16_0.vcxproj | 145 +- > + resip/dum/test/basicClient_12_0.vcxproj | 653 --------- > + resip/dum/test/basicClient_16_0.vcxproj | 158 +-- > + resip/dum/test/basicMessage_12_0.vcxproj | 615 -------- > + resip/dum/test/basicMessage_16_0.vcxproj | 141 +- > + resip/dum/test/basicRegister_12_0.vcxproj | 615 -------- > + resip/dum/test/basicRegister_16_0.vcxproj | 137 +- > + resip/rend/RendKa.cxx | 2 +- > + resip/rend/rend_12_0.vcxproj | 352 ----- > + resip/rend/rend_16_0.vcxproj | 89 +- > + resip/stack/resiprocate_12_0.vcxproj | 873 ------------ > + resip/stack/resiprocate_12_0.vcxproj.filters | 351 ----- > + resip/stack/resiprocate_16_0.vcxproj | 165 ++- > + resip/stack/test/test_12_0.vcxproj | 627 -------- > + resip/stack/test/test_16_0.vcxproj | 171 ++- > + rutil/dns/ares/ares_12_0.vcxproj | 488 ------- > + rutil/dns/ares/ares_12_0.vcxproj.filters | 34 - > + rutil/dns/ares/ares_16_0.vcxproj | 159 +-- > + rutil/rutil_12_0.vcxproj | 604 -------- > + rutil/rutil_16_0.vcxproj | 153 +- > + 48 files changed, 1409 insertions(+), 13782 deletions(-) > + delete mode 100644 contrib/GeoIP/GeoIP_12_0.vcxproj > + delete mode 100644 contrib/db/build_windows/db_static_12_0.vcxproj > + delete mode 100644 contrib/pcre/pcre_12_0.vcxproj > + delete mode 100644 contrib/popt/popt_12_0.vcxproj > + delete mode 100644 repro/accountingconsumers/queuetostream_12_0.vcxproj > + delete mode 100644 repro/repro_12_0.vcxproj > + delete mode 100644 repro/repro_12_0.vcxproj.filters > + delete mode 100644 repro/reprocmd/reprocmd_12_0.vcxproj > + delete mode 100644 repro/reprolib_12_0.vcxproj > + delete mode 100644 repro/reprolib_12_0.vcxproj.filters > + delete mode 100644 resip/dum/dum_12_0.vcxproj > + delete mode 100644 resip/dum/test/basicCall_12_0.vcxproj > + delete mode 100644 resip/dum/test/basicClient_12_0.vcxproj > + delete mode 100644 resip/dum/test/basicMessage_12_0.vcxproj > + delete mode 100644 resip/dum/test/basicRegister_12_0.vcxproj > + delete mode 100644 resip/rend/rend_12_0.vcxproj > + delete mode 100644 resip/stack/resiprocate_12_0.vcxproj > + delete mode 100644 resip/stack/resiprocate_12_0.vcxproj.filters > + delete mode 100644 resip/stack/test/test_12_0.vcxproj > + delete mode 100644 rutil/dns/ares/ares_12_0.vcxproj > + delete mode 100644 rutil/dns/ares/ares_12_0.vcxproj.filters > + delete mode 100644 rutil/rutil_12_0.vcxproj > + > +diff --git a/resip/rend/RendKa.cxx b/resip/rend/RendKa.cxx > +index 8645f17636..8321ada1ee 100644 > +--- a/resip/rend/RendKa.cxx > ++++ b/resip/rend/RendKa.cxx > +@@ -66,7 +66,7 @@ bool operator<(const RendKaAssoc& a, const RendKaAssoc& b) > + > + struct RendKaConn > + { > +- bool operator() (const RendKaAssocPtr& a, const RendKaAssocPtr& b) > ++ bool operator()(const RendKaAssocPtr& a, const RendKaAssocPtr& b) const > + { > + return *a < *b; > + } From arnout at mind.be Mon Feb 14 20:14:09 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 14 Feb 2022 21:14:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/neon: fix ssl build without threads In-Reply-To: <20220208182636.3976618-1-fontaine.fabrice@gmail.com> References: <20220208182636.3976618-1-fontaine.fabrice@gmail.com> Message-ID: <902d8e5c-8b16-682e-a199-3352b22529b9@mind.be> On 08/02/2022 19:26, Fabrice Fontaine wrote: > Fix the following ssl build failure without threads raised since bump to > version 0.32.2 in commit 029a6dc3e3320984c6369747e0b79060f13b2afc and > https://github.com/notroj/neon/commit/281c84fc3996c757efdf6e9b3f906d7a1fc08b1d: > > ne_openssl.c:43:10: fatal error: pthread.h: No such file or directory > 43 | #include > | ^~~~~~~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/da995ef26001357e51a5907de9c6111b9ff89bdf > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...se-TS_SSL-feature-with-OpenSSL-1.1.0.patch | 76 +++++++++++++++++++ > .../0002-configure.ac-fix-autoreconf.patch | 28 +++++++ > package/neon/neon.mk | 2 + > 3 files changed, 106 insertions(+) > create mode 100644 package/neon/0001-Revert-Advertise-TS_SSL-feature-with-OpenSSL-1.1.0.patch > create mode 100644 package/neon/0002-configure.ac-fix-autoreconf.patch > > diff --git a/package/neon/0001-Revert-Advertise-TS_SSL-feature-with-OpenSSL-1.1.0.patch b/package/neon/0001-Revert-Advertise-TS_SSL-feature-with-OpenSSL-1.1.0.patch > new file mode 100644 > index 0000000000..02088bfe02 > --- /dev/null > +++ b/package/neon/0001-Revert-Advertise-TS_SSL-feature-with-OpenSSL-1.1.0.patch > @@ -0,0 +1,76 @@ > +From 8f9e110b391f065536780d19c2257ad7afd83522 Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Mon, 31 Jan 2022 23:42:13 +0100 > +Subject: [PATCH] Revert "Advertise TS_SSL feature with OpenSSL >= 1.1.0." > + > +This reverts commit 281c84fc3996c757efdf6e9b3f906d7a1fc08b1d. > + > +Indeed openssl can be built on toolchains without threads support which > +will result in the following build failure: > + > +ne_openssl.c:43:10: fatal error: pthread.h: No such file or directory > + 43 | #include > + | ^~~~~~~~~~~ > + > +Fixes: > + - http://autobuild.buildroot.org/results/da995ef26001357e51a5907de9c6111b9ff89bdf > + > +Signed-off-by: Fabrice Fontaine > +[Upstream status: https://github.com/notroj/neon/pull/71] > +--- > + macros/neon.m4 | 15 ++++----------- > + src/ne_openssl.c | 4 ++-- > + 2 files changed, 6 insertions(+), 13 deletions(-) > + > +diff --git a/macros/neon.m4 b/macros/neon.m4 > +index 129d4ac..5a5fb1b 100644 > +--- a/macros/neon.m4 > ++++ b/macros/neon.m4 > +@@ -960,13 +960,9 @@ yes|openssl) > + AC_CHECK_HEADERS(openssl/ssl.h openssl/opensslv.h,, > + [AC_MSG_ERROR([OpenSSL headers not found, cannot enable SSL support])]) > + > ++ # Enable EGD support if using 0.9.7 or newer > + NE_CHECK_OPENSSLVER(ne_cv_lib_ssl097, 0.9.7, 0x00907000L) > +- NE_CHECK_OPENSSLVER(ne_cv_lib_ssl110, 1.1.0, 0x10100000L) > +- if test "$ne_cv_lib_ssl110" = "yes"; then > +- NE_ENABLE_SUPPORT(SSL, [SSL support enabled, using OpenSSL $NE_SSL_VERSION]) > +- AC_DEFINE(HAVE_OPENSSL11, 1, [Enable OpenSSL 1.1 support]) > +- elif test "$ne_cv_lib_ssl097" = "yes"; then > +- # Enable EGD support if using 0.9.7 or newer > ++ if test "$ne_cv_lib_ssl097" = "yes"; then > + AC_MSG_NOTICE([OpenSSL >= 0.9.7; EGD support not needed in neon]) > + NE_ENABLE_SUPPORT(SSL, [SSL support enabled, using OpenSSL $NE_SSL_VERSION]) > + NE_CHECK_FUNCS(CRYPTO_set_idptr_callback SSL_SESSION_cmp) > +@@ -1074,11 +1070,8 @@ CC/CFLAGS/LIBS must be used to make the POSIX library interfaces > + available]),, > + enable_threadsafe_ssl=no) > + > +-case ${enable_threadsafe_ssl}X${ne_cv_lib_ssl110} in > +-*Xyes) > +- NE_ENABLE_SUPPORT(TS_SSL, [OpenSSL is natively thread-safe]) > +- ;; > +-posixX*|yesX*) > ++case $enable_threadsafe_ssl in > ++posix|yes) > + ne_pthr_ok=yes > + AC_CHECK_FUNCS([pthread_mutex_init pthread_mutex_lock],,[ne_pthr_ok=no]) > + if test "${ne_pthr_ok}" = "no"; then > +diff --git a/src/ne_openssl.c b/src/ne_openssl.c > +index 41a5c05..96c768e 100644 > +--- a/src/ne_openssl.c > ++++ b/src/ne_openssl.c > +@@ -1194,8 +1194,8 @@ char *ne_vstrhash(unsigned int flags, va_list ap) > + return ne__strhash2hex(v, vlen, flags); > + } > + > +-#if defined(NE_HAVE_TS_SSL) && OPENSSL_VERSION_NUMBER < 0x10100000L > +-/* From OpenSSL 1.1.0 locking callbacks are no longer needed. */ > ++#if defined(NE_HAVE_TS_SSL) && OPENSSL_VERSION_NUMBER < 0x10101000L > ++/* For OpenSSL 1.1.1 locking callbacks are no longer need at all. */ > + #define WITH_OPENSSL_LOCKING (1) > + > + /* Implementation of locking callbacks to make OpenSSL thread-safe. > +-- > +2.34.1 > + > diff --git a/package/neon/0002-configure.ac-fix-autoreconf.patch b/package/neon/0002-configure.ac-fix-autoreconf.patch > new file mode 100644 > index 0000000000..cd63d1ed41 > --- /dev/null > +++ b/package/neon/0002-configure.ac-fix-autoreconf.patch > @@ -0,0 +1,28 @@ > +From cf779609a5dd38f0a8fdb3c4539371f13fd3a24a Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Tue, 8 Feb 2022 18:34:25 +0100 > +Subject: [PATCH] configure.ac: fix autoreconf > + > +Add AC_CONFIG_MACRO_DIR(macros) to fix autoreconf > + > +Signed-off-by: Fabrice Fontaine > +[Upstream status: not sent yet] > +--- > + configure.ac | 2 ++ > + 1 file changed, 2 insertions(+) > + > +diff --git a/configure.ac b/configure.ac > +index 37b14ec..122151d 100644 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -1,5 +1,7 @@ > + AC_PREREQ(2.58) dnl 2.58 required for AS_HELP_STRING > + > ++AC_CONFIG_MACRO_DIR(macros) > ++ > + dnl Extract the version (sans LF) from .version, created at release-time. > + m4_define(ne_version, [m4_translit(m4_include(.version), [ > + ])]) > +-- > +2.34.1 > + > diff --git a/package/neon/neon.mk b/package/neon/neon.mk > index 3bbd12561f..eae6bfbad6 100644 > --- a/package/neon/neon.mk > +++ b/package/neon/neon.mk > @@ -10,6 +10,8 @@ NEON_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (manual and tests) > NEON_LICENSE_FILES = src/COPYING.LIB test/COPYING README.md > NEON_CPE_ID_VENDOR = webdav > NEON_INSTALL_STAGING = YES > +# We're patching configure.ac > +NEON_AUTORECONF = YES > NEON_CONF_OPTS = --without-gssapi --disable-rpath > NEON_CONFIG_SCRIPTS = neon-config > NEON_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES) From arnout at mind.be Mon Feb 14 20:04:40 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Feb 2022 21:04:40 +0100 Subject: [Buildroot] [git commit] package/neon: fix ssl build without threads Message-ID: <20220214200642.29DA181734@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6d5061c711fe0e64c0fef466f1221aa8e6202608 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following ssl build failure without threads raised since bump to version 0.32.2 in commit 029a6dc3e3320984c6369747e0b79060f13b2afc and https://github.com/notroj/neon/commit/281c84fc3996c757efdf6e9b3f906d7a1fc08b1d: ne_openssl.c:43:10: fatal error: pthread.h: No such file or directory 43 | #include | ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/da995ef26001357e51a5907de9c6111b9ff89bdf Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...vertise-TS_SSL-feature-with-OpenSSL-1.1.0.patch | 76 ++++++++++++++++++++++ .../neon/0002-configure.ac-fix-autoreconf.patch | 28 ++++++++ package/neon/neon.mk | 2 + 3 files changed, 106 insertions(+) diff --git a/package/neon/0001-Revert-Advertise-TS_SSL-feature-with-OpenSSL-1.1.0.patch b/package/neon/0001-Revert-Advertise-TS_SSL-feature-with-OpenSSL-1.1.0.patch new file mode 100644 index 0000000000..02088bfe02 --- /dev/null +++ b/package/neon/0001-Revert-Advertise-TS_SSL-feature-with-OpenSSL-1.1.0.patch @@ -0,0 +1,76 @@ +From 8f9e110b391f065536780d19c2257ad7afd83522 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 31 Jan 2022 23:42:13 +0100 +Subject: [PATCH] Revert "Advertise TS_SSL feature with OpenSSL >= 1.1.0." + +This reverts commit 281c84fc3996c757efdf6e9b3f906d7a1fc08b1d. + +Indeed openssl can be built on toolchains without threads support which +will result in the following build failure: + +ne_openssl.c:43:10: fatal error: pthread.h: No such file or directory + 43 | #include + | ^~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/da995ef26001357e51a5907de9c6111b9ff89bdf + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/notroj/neon/pull/71] +--- + macros/neon.m4 | 15 ++++----------- + src/ne_openssl.c | 4 ++-- + 2 files changed, 6 insertions(+), 13 deletions(-) + +diff --git a/macros/neon.m4 b/macros/neon.m4 +index 129d4ac..5a5fb1b 100644 +--- a/macros/neon.m4 ++++ b/macros/neon.m4 +@@ -960,13 +960,9 @@ yes|openssl) + AC_CHECK_HEADERS(openssl/ssl.h openssl/opensslv.h,, + [AC_MSG_ERROR([OpenSSL headers not found, cannot enable SSL support])]) + ++ # Enable EGD support if using 0.9.7 or newer + NE_CHECK_OPENSSLVER(ne_cv_lib_ssl097, 0.9.7, 0x00907000L) +- NE_CHECK_OPENSSLVER(ne_cv_lib_ssl110, 1.1.0, 0x10100000L) +- if test "$ne_cv_lib_ssl110" = "yes"; then +- NE_ENABLE_SUPPORT(SSL, [SSL support enabled, using OpenSSL $NE_SSL_VERSION]) +- AC_DEFINE(HAVE_OPENSSL11, 1, [Enable OpenSSL 1.1 support]) +- elif test "$ne_cv_lib_ssl097" = "yes"; then +- # Enable EGD support if using 0.9.7 or newer ++ if test "$ne_cv_lib_ssl097" = "yes"; then + AC_MSG_NOTICE([OpenSSL >= 0.9.7; EGD support not needed in neon]) + NE_ENABLE_SUPPORT(SSL, [SSL support enabled, using OpenSSL $NE_SSL_VERSION]) + NE_CHECK_FUNCS(CRYPTO_set_idptr_callback SSL_SESSION_cmp) +@@ -1074,11 +1070,8 @@ CC/CFLAGS/LIBS must be used to make the POSIX library interfaces + available]),, + enable_threadsafe_ssl=no) + +-case ${enable_threadsafe_ssl}X${ne_cv_lib_ssl110} in +-*Xyes) +- NE_ENABLE_SUPPORT(TS_SSL, [OpenSSL is natively thread-safe]) +- ;; +-posixX*|yesX*) ++case $enable_threadsafe_ssl in ++posix|yes) + ne_pthr_ok=yes + AC_CHECK_FUNCS([pthread_mutex_init pthread_mutex_lock],,[ne_pthr_ok=no]) + if test "${ne_pthr_ok}" = "no"; then +diff --git a/src/ne_openssl.c b/src/ne_openssl.c +index 41a5c05..96c768e 100644 +--- a/src/ne_openssl.c ++++ b/src/ne_openssl.c +@@ -1194,8 +1194,8 @@ char *ne_vstrhash(unsigned int flags, va_list ap) + return ne__strhash2hex(v, vlen, flags); + } + +-#if defined(NE_HAVE_TS_SSL) && OPENSSL_VERSION_NUMBER < 0x10100000L +-/* From OpenSSL 1.1.0 locking callbacks are no longer needed. */ ++#if defined(NE_HAVE_TS_SSL) && OPENSSL_VERSION_NUMBER < 0x10101000L ++/* For OpenSSL 1.1.1 locking callbacks are no longer need at all. */ + #define WITH_OPENSSL_LOCKING (1) + + /* Implementation of locking callbacks to make OpenSSL thread-safe. +-- +2.34.1 + diff --git a/package/neon/0002-configure.ac-fix-autoreconf.patch b/package/neon/0002-configure.ac-fix-autoreconf.patch new file mode 100644 index 0000000000..cd63d1ed41 --- /dev/null +++ b/package/neon/0002-configure.ac-fix-autoreconf.patch @@ -0,0 +1,28 @@ +From cf779609a5dd38f0a8fdb3c4539371f13fd3a24a Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 8 Feb 2022 18:34:25 +0100 +Subject: [PATCH] configure.ac: fix autoreconf + +Add AC_CONFIG_MACRO_DIR(macros) to fix autoreconf + +Signed-off-by: Fabrice Fontaine +[Upstream status: not sent yet] +--- + configure.ac | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 37b14ec..122151d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1,5 +1,7 @@ + AC_PREREQ(2.58) dnl 2.58 required for AS_HELP_STRING + ++AC_CONFIG_MACRO_DIR(macros) ++ + dnl Extract the version (sans LF) from .version, created at release-time. + m4_define(ne_version, [m4_translit(m4_include(.version), [ + ])]) +-- +2.34.1 + diff --git a/package/neon/neon.mk b/package/neon/neon.mk index 3bbd12561f..eae6bfbad6 100644 --- a/package/neon/neon.mk +++ b/package/neon/neon.mk @@ -10,6 +10,8 @@ NEON_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (manual and tests) NEON_LICENSE_FILES = src/COPYING.LIB test/COPYING README.md NEON_CPE_ID_VENDOR = webdav NEON_INSTALL_STAGING = YES +# We're patching configure.ac +NEON_AUTORECONF = YES NEON_CONF_OPTS = --without-gssapi --disable-rpath NEON_CONFIG_SCRIPTS = neon-config NEON_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES) From arnout at mind.be Mon Feb 14 20:09:37 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Feb 2022 21:09:37 +0100 Subject: [Buildroot] [git commit] package/resiprocate: fix build of rend with gcc 11 Message-ID: <20220214200642.3326582AD4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a715593d944ac4f64e56a6d5778374e7388af23d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure of rend with gcc 11: /home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/riscv32-buildroot-linux-gnu/include/c++/11.2.0/bits/stl_tree.h:770:15: error: static assertion failed: comparison object must be invocable as const 770 | is_invocable_v, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/ad9d89fefe1a667daa123397a072bf130bfa03a7 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...x-some-issue-compiling-with-Visual-Studio.patch | 95 ++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/package/resiprocate/0001-Fix-some-issue-compiling-with-Visual-Studio.patch b/package/resiprocate/0001-Fix-some-issue-compiling-with-Visual-Studio.patch new file mode 100644 index 0000000000..0efe0d9cfb --- /dev/null +++ b/package/resiprocate/0001-Fix-some-issue-compiling-with-Visual-Studio.patch @@ -0,0 +1,95 @@ +From be76b10a50749e2e11dce8dcc38b414a7f9d8747 Mon Sep 17 00:00:00 2001 +From: Ben Walden +Date: Sat, 22 Aug 2020 23:14:11 +0100 +Subject: [PATCH] Fix some issue compiling with Visual Studio 16.7.0 and tidy + up Visual Studio 16 project files + +[Retrieved (and updated to keep only RendKa.cxx update) from: +https://github.com/resiprocate/resiprocate/commit/be76b10a50749e2e11dce8dcc38b414a7f9d8747] +Signed-off-by: Fabrice Fontaine +--- + VisualStudioReadme.htm | 65 + + contrib/GeoIP/GeoIP_12_0.vcxproj | 550 ------- + contrib/GeoIP/GeoIP_16_0.vcxproj | 93 +- + .../db/build_windows/db_static_12_0.vcxproj | 1260 ----------------- + .../db/build_windows/db_static_16_0.vcxproj | 696 +-------- + contrib/db/dbinc/atomic.h | 4 +- + contrib/db/mp/mp_fget.c | 4 +- + contrib/db/mp/mp_mvcc.c | 4 +- + contrib/db/mp/mp_region.c | 4 +- + contrib/db/mutex/mut_method.c | 2 +- + contrib/pcre/pcre_12_0.vcxproj | 466 ------ + contrib/pcre/pcre_16_0.vcxproj | 159 +-- + contrib/popt/popt_12_0.vcxproj | 394 ------ + contrib/popt/popt_16_0.vcxproj | 120 +- + reSIProcate_16_0.sln | 58 +- + .../queuetostream_12_0.vcxproj | 582 -------- + .../queuetostream_16_0.vcxproj | 207 ++- + repro/repro_12_0.vcxproj | 825 ----------- + repro/repro_12_0.vcxproj.filters | 47 - + repro/repro_16_0.vcxproj | 159 ++- + repro/reprocmd/reprocmd_12_0.vcxproj | 597 -------- + repro/reprocmd/reprocmd_16_0.vcxproj | 139 +- + repro/reprolib_12_0.vcxproj | 596 -------- + repro/reprolib_12_0.vcxproj.filters | 136 -- + repro/reprolib_16_0.vcxproj | 132 +- + resip/dum/dum_12_0.vcxproj | 615 -------- + resip/dum/dum_16_0.vcxproj | 124 +- + resip/dum/test/basicCall_12_0.vcxproj | 621 -------- + resip/dum/test/basicCall_16_0.vcxproj | 145 +- + resip/dum/test/basicClient_12_0.vcxproj | 653 --------- + resip/dum/test/basicClient_16_0.vcxproj | 158 +-- + resip/dum/test/basicMessage_12_0.vcxproj | 615 -------- + resip/dum/test/basicMessage_16_0.vcxproj | 141 +- + resip/dum/test/basicRegister_12_0.vcxproj | 615 -------- + resip/dum/test/basicRegister_16_0.vcxproj | 137 +- + resip/rend/RendKa.cxx | 2 +- + resip/rend/rend_12_0.vcxproj | 352 ----- + resip/rend/rend_16_0.vcxproj | 89 +- + resip/stack/resiprocate_12_0.vcxproj | 873 ------------ + resip/stack/resiprocate_12_0.vcxproj.filters | 351 ----- + resip/stack/resiprocate_16_0.vcxproj | 165 ++- + resip/stack/test/test_12_0.vcxproj | 627 -------- + resip/stack/test/test_16_0.vcxproj | 171 ++- + rutil/dns/ares/ares_12_0.vcxproj | 488 ------- + rutil/dns/ares/ares_12_0.vcxproj.filters | 34 - + rutil/dns/ares/ares_16_0.vcxproj | 159 +-- + rutil/rutil_12_0.vcxproj | 604 -------- + rutil/rutil_16_0.vcxproj | 153 +- + 48 files changed, 1409 insertions(+), 13782 deletions(-) + delete mode 100644 contrib/GeoIP/GeoIP_12_0.vcxproj + delete mode 100644 contrib/db/build_windows/db_static_12_0.vcxproj + delete mode 100644 contrib/pcre/pcre_12_0.vcxproj + delete mode 100644 contrib/popt/popt_12_0.vcxproj + delete mode 100644 repro/accountingconsumers/queuetostream_12_0.vcxproj + delete mode 100644 repro/repro_12_0.vcxproj + delete mode 100644 repro/repro_12_0.vcxproj.filters + delete mode 100644 repro/reprocmd/reprocmd_12_0.vcxproj + delete mode 100644 repro/reprolib_12_0.vcxproj + delete mode 100644 repro/reprolib_12_0.vcxproj.filters + delete mode 100644 resip/dum/dum_12_0.vcxproj + delete mode 100644 resip/dum/test/basicCall_12_0.vcxproj + delete mode 100644 resip/dum/test/basicClient_12_0.vcxproj + delete mode 100644 resip/dum/test/basicMessage_12_0.vcxproj + delete mode 100644 resip/dum/test/basicRegister_12_0.vcxproj + delete mode 100644 resip/rend/rend_12_0.vcxproj + delete mode 100644 resip/stack/resiprocate_12_0.vcxproj + delete mode 100644 resip/stack/resiprocate_12_0.vcxproj.filters + delete mode 100644 resip/stack/test/test_12_0.vcxproj + delete mode 100644 rutil/dns/ares/ares_12_0.vcxproj + delete mode 100644 rutil/dns/ares/ares_12_0.vcxproj.filters + delete mode 100644 rutil/rutil_12_0.vcxproj + +diff --git a/resip/rend/RendKa.cxx b/resip/rend/RendKa.cxx +index 8645f17636..8321ada1ee 100644 +--- a/resip/rend/RendKa.cxx ++++ b/resip/rend/RendKa.cxx +@@ -66,7 +66,7 @@ bool operator<(const RendKaAssoc& a, const RendKaAssoc& b) + + struct RendKaConn + { +- bool operator() (const RendKaAssocPtr& a, const RendKaAssocPtr& b) ++ bool operator()(const RendKaAssocPtr& a, const RendKaAssocPtr& b) const + { + return *a < *b; + } From bugzilla at busybox.net Mon Feb 14 20:35:36 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Mon, 14 Feb 2022 20:35:36 +0000 Subject: [Buildroot] [Bug 14581] qemu-system-ppc -M mac99 does not boot for glibc system In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14581 --- Comment #1 from romain.naour at gmail.com --- Hi Waldemar, Thanks for the report! I can reproduce it easily with gcc-10 and gcc-11 but not with gcc-9. The powerpc 7400 support has been broken since the beginning of gcc-10 development. After the commit [1] removing -many from the options passed by default to the assembler, the build of this defconfig fail with assembler errors: arch/powerpc/perf/bhrb.S: Assembler messages: arch/powerpc/perf/bhrb.S:22: Error: unrecognized opcode: `cmpldi' arch/powerpc/perf/bhrb.S:24: Error: unrecognized opcode: `ld' arch/powerpc/perf/bhrb.S:25: Error: unrecognized opcode: `sldi' It was fixed later by the commit [2] before the gcc-10 release but glibc segfault at runtime since then. The Buildroot gitlab-ci testing only test with uClibc-ng libc but I try sometime with Glibc... but I missed this issue. This issue should be reported to gcc. [1] https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=e154242724b084380e3221df7c08fcdbd8460674 [2] https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=66711279083121b07d909ac0fc2f3a744ac7c937 Best regards, Romain -- You are receiving this mail because: You are on the CC list for the bug. From yann.morin.1998 at free.fr Mon Feb 14 20:36:24 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 14 Feb 2022 21:36:24 +0100 Subject: [Buildroot] [PATCH] configs/roc_pc_rk3399_defconfig: expand rootfs size to 120M In-Reply-To: <6edcbc6d-c9bb-e802-48f1-d4866a698aa9@mind.be> References: <20220202171035.1740791-1-giulio.benetti@benettiengineering.com> <20220202171035.1740791-2-giulio.benetti@benettiengineering.com> <6edcbc6d-c9bb-e802-48f1-d4866a698aa9@mind.be> Message-ID: <20220214203624.GA248243@scaer> Arnout, All, On 2022-02-14 21:13 +0100, Arnout Vandecappelle spake thusly: > On 14/02/2022 01:03, Giulio Benetti wrote: [--SNIP--] > >It is because of modules(30M) and linux "Image", it's not compressed, so > >it's 25M. So only for Linux+modules => 55M, plus the few other > >stuff(Busybox+libc etc.)1M > Yeah those giant aarch64 default configs are mightily annoying... > I'm thinking, perhaps we should just bite the bullet and move the default > ext2 size to 120M... > Peter, Yann, what do you think? ACK. 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 Mon Feb 14 20:36:37 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 14 Feb 2022 21:36:37 +0100 Subject: [Buildroot] [PATCH v2, 2/2] package/keepalived: fix build with gcc < 4.9 In-Reply-To: <20220208192157.4058193-2-fontaine.fabrice@gmail.com> References: <20220208192157.4058193-1-fontaine.fabrice@gmail.com> <20220208192157.4058193-2-fontaine.fabrice@gmail.com> Message-ID: <78553604-4270-93db-de3b-638dea64867c@mind.be> On 08/02/2022 20:21, Fabrice Fontaine wrote: > Disable track-process to avoid the following build failure with > gcc < 4.9 raised since bump to version 2.2.7 in commit > 79f631000fe6846e72f44810452bb764c228ad44 as suggested by upstream in > https://github.com/acassen/keepalived/issues/2094: > > In file included from ../../lib/rbtree.h:24:0, > from ../../lib/rbtree_ka.h:26, > from ../../lib/scheduler.h:40, > from ../../lib/notify.h:31, > from ../../keepalived/include/vrrp.h:41, > from ../../keepalived/include/track_process.h:31, > from track_process.c:50: > ../../lib/rbtree_types.h:31:25: error: initializer element is not constant > #define RB_ROOT (struct rb_root) { NULL, } I expect that they'll introduce more things that require GCC 4.9 over time, so this is probably just a stop-gap solution. Still, for the time being it works, so both applied to master, thanks. Regards, Arnout > ^ > > Fixes: > - http://autobuild.buildroot.org/results/2132570fb0407abc0e70146d771471e13ef10237 > > Signed-off-by: Fabrice Fontaine > --- > package/keepalived/keepalived.mk | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/package/keepalived/keepalived.mk b/package/keepalived/keepalived.mk > index c7e8c3e2ec..5d6cf174e3 100644 > --- a/package/keepalived/keepalived.mk > +++ b/package/keepalived/keepalived.mk > @@ -56,4 +56,8 @@ else > KEEPALIVED_CONF_OPTS += --disable-nftables > endif > > +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_9),) > +KEEPALIVED_CONF_OPTS += --disable-track-process > +endif > + > $(eval $(autotools-package)) From arnout at mind.be Mon Feb 14 20:15:24 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Feb 2022 21:15:24 +0100 Subject: [Buildroot] [git commit] package/keepalived: fix build with gcc < 4.9 Message-ID: <20220214202910.58A8A82AD4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9b0d3b12438db46565824da437958e526a7c4d71 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Disable track-process to avoid the following build failure with gcc < 4.9 raised since bump to version 2.2.7 in commit 79f631000fe6846e72f44810452bb764c228ad44 as suggested by upstream in https://github.com/acassen/keepalived/issues/2094: In file included from ../../lib/rbtree.h:24:0, from ../../lib/rbtree_ka.h:26, from ../../lib/scheduler.h:40, from ../../lib/notify.h:31, from ../../keepalived/include/vrrp.h:41, from ../../keepalived/include/track_process.h:31, from track_process.c:50: ../../lib/rbtree_types.h:31:25: error: initializer element is not constant #define RB_ROOT (struct rb_root) { NULL, } ^ Fixes: - http://autobuild.buildroot.org/results/2132570fb0407abc0e70146d771471e13ef10237 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/keepalived/keepalived.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/keepalived/keepalived.mk b/package/keepalived/keepalived.mk index c7e8c3e2ec..5d6cf174e3 100644 --- a/package/keepalived/keepalived.mk +++ b/package/keepalived/keepalived.mk @@ -56,4 +56,8 @@ else KEEPALIVED_CONF_OPTS += --disable-nftables endif +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_9),) +KEEPALIVED_CONF_OPTS += --disable-track-process +endif + $(eval $(autotools-package)) From arnout at mind.be Mon Feb 14 20:14:27 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Feb 2022 21:14:27 +0100 Subject: [Buildroot] [git commit] package/keepalived: fix build with kernel < 3.14 Message-ID: <20220214202910.508FD82621@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=53b790631e57b049551230b48707a82a90541942 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with kernel < 3.14 raised since bump to version 2.27 in commit 79f631000fe6846e72f44810452bb764c228ad44: vrrp_nftables.c: In function 'setup_rule_move_igmp': vrrp_nftables.c:1226:15: error: 'NFT_META_L4PROTO' undeclared (first use in this function) add_meta(r, NFT_META_L4PROTO, NFT_REG_1); ^ Fixes: - http://autobuild.buildroot.org/results/2132570fb0407abc0e70146d771471e13ef10237 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...n-t-support-meta-l4proro-until-Linux-3-14.patch | 76 ++++++++++++++++++++++ ...n-t-support-meta-l4proro-until-Linux-3-14.patch | 40 ++++++++++++ package/keepalived/keepalived.mk | 2 + 3 files changed, 118 insertions(+) diff --git a/package/keepalived/0001-vrrp-nft-didn-t-support-meta-l4proro-until-Linux-3-14.patch b/package/keepalived/0001-vrrp-nft-didn-t-support-meta-l4proro-until-Linux-3-14.patch new file mode 100644 index 0000000000..9d5f3f7905 --- /dev/null +++ b/package/keepalived/0001-vrrp-nft-didn-t-support-meta-l4proro-until-Linux-3-14.patch @@ -0,0 +1,76 @@ +From edc71b19c619fdc1d71df10a2d0e8f5822965d69 Mon Sep 17 00:00:00 2001 +From: Quentin Armitage +Date: Tue, 8 Feb 2022 14:58:49 +0000 +Subject: [PATCH] vrrp: nft didn't support meta l4proro until Linux 3.14 + +For Linux 3.13 (first version to support nftables), we instead specify: + at nh,48,8 58 + +Signed-off-by: Quentin Armitage + +[Retrieved (and updated to drop update of README.kernel_versions) from: +https://github.com/acassen/keepalived/commit/edc71b19c619fdc1d71df10a2d0e8f5822965d69] +Signed-off-by: Fabrice Fontaine +--- + README.kernel_versions | 1 + + configure.ac | 5 +++++ + keepalived/vrrp/vrrp_nftables.c | 16 ++++++++++++++-- + 3 files changed, 20 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 350a9f4e9..bc643dbf1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1754,6 +1754,11 @@ if test .${enable_nftables} != .no; then + ],[ + AC_MSG_RESULT(no) + ]) ++ ++ # nft l4proto from Linux 3.14 ++ AC_CHECK_DECLS([NFT_META_L4PROTO], [], [], ++ [#include ]) ++ + # nft dup from Linux 4.3 + AC_CHECK_DECLS([NFTA_DUP_MAX], [], [], + [#include ]) +diff --git a/keepalived/vrrp/vrrp_nftables.c b/keepalived/vrrp/vrrp_nftables.c +index d3ea39db3..8b5095ad4 100644 +--- a/keepalived/vrrp/vrrp_nftables.c ++++ b/keepalived/vrrp/vrrp_nftables.c +@@ -1191,6 +1191,8 @@ setup_rule_move_igmp(uint8_t family, const char *table, + otherwise: + nft add rule ip keepalived out ip protocol igmp [meta oifkind macvlan] oif @vmac_set drop + nft add rule ip6 keepalived out icmpv6 type mld2-listener-report [meta oifkind macvlan] oif @vmac_set drop ++ * ++ * Note: on 3.13 kernels, icmpv6 is specified as @nh,48,8 58 + */ + struct nftnl_rule *r = NULL; + uint64_t handle_num; +@@ -1223,7 +1225,12 @@ setup_rule_move_igmp(uint8_t family, const char *table, + offsetof(struct iphdr, daddr), sizeof(struct in_addr)); + #endif + } else { +- add_meta(r, NFT_META_L4PROTO, NFT_REG_1); ++#if HAVE_DECL_NFT_META_L4PROTO ++ add_meta(r, NFT_META_L4PROTO, NFT_REG_1); /* From Linux 3.14 */ ++#else ++ add_payload(r, NFT_PAYLOAD_NETWORK_HEADER, NFT_REG_1, ++ offsetof(struct ip6_hdr, ip6_nxt), sizeof(((struct ip6_hdr *)NULL)->ip6_nxt)); ++#endif + protocol = IPPROTO_ICMPV6; + add_cmp(r, NFT_REG_1, NFT_CMP_EQ, &protocol, sizeof(protocol)); + add_payload(r, NFT_PAYLOAD_TRANSPORT_HEADER, NFT_REG_1, +@@ -1279,7 +1286,12 @@ setup_rule_drop_router_solicit(const char *table, const char *chain, + nftnl_rule_set_u64(r, NFTNL_RULE_POSITION, handle_num); + } + +- add_meta(r, NFT_META_L4PROTO, NFT_REG_1); ++#if HAVE_DECL_NFT_META_L4PROTO ++ add_meta(r, NFT_META_L4PROTO, NFT_REG_1); /* From Linux 3.14 */ ++#else ++ add_payload(r, NFT_PAYLOAD_NETWORK_HEADER, NFT_REG_1, ++ offsetof(struct ip6_hdr, ip6_nxt), sizeof(((struct ip6_hdr *)NULL)->ip6_nxt)); ++#endif + protocol = IPPROTO_ICMPV6; + add_cmp(r, NFT_REG_1, NFT_CMP_EQ, &protocol, sizeof(protocol)); + add_payload(r, NFT_PAYLOAD_TRANSPORT_HEADER, NFT_REG_1, diff --git a/package/keepalived/0002-ipvs-nft-didn-t-support-meta-l4proro-until-Linux-3-14.patch b/package/keepalived/0002-ipvs-nft-didn-t-support-meta-l4proro-until-Linux-3-14.patch new file mode 100644 index 0000000000..3713de37c2 --- /dev/null +++ b/package/keepalived/0002-ipvs-nft-didn-t-support-meta-l4proro-until-Linux-3-14.patch @@ -0,0 +1,40 @@ +From 50e8a8d56cd5a3d7184b035708865302bbc7ef69 Mon Sep 17 00:00:00 2001 +From: Quentin Armitage +Date: Tue, 8 Feb 2022 17:43:49 +0000 +Subject: [PATCH] ipvs: nft didn't support meta l4proro until Linux 3.14 + +For Linux 3.13 (first version to support nftables), we instead specify: +ipv4: @nh,72,8 PROTO +ipv6: @nh,48,8 PROTO + +Signed-off-by: Quentin Armitage + +[Retrieved from: +https://github.com/acassen/keepalived/commit/50e8a8d56cd5a3d7184b035708865302bbc7ef69] +Signed-off-by: Fabrice Fontaine +--- + keepalived/check/check_nftables.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/keepalived/check/check_nftables.c b/keepalived/check/check_nftables.c +index 2d163ac14..45831203b 100644 +--- a/keepalived/check/check_nftables.c ++++ b/keepalived/check/check_nftables.c +@@ -150,7 +150,16 @@ setup_rule_set_mark(uint8_t family, const char *table, + nftnl_rule_set_u64(r, NFTNL_RULE_POSITION, handle_num); + } + +- add_meta(r, NFT_META_L4PROTO, NFT_REG_1); ++#if HAVE_DECL_NFT_META_L4PROTO ++ add_meta(r, NFT_META_L4PROTO, NFT_REG_1); /* From Linux 3.14 */ ++#else ++ if (family == NFPROTO_IPV4) ++ add_payload(r, NFT_PAYLOAD_NETWORK_HEADER, NFT_REG_1, ++ offsetof(struct iphdr, protocol), sizeof(((struct iphdr *)NULL)->protocol)); ++ else ++ add_payload(r, NFT_PAYLOAD_NETWORK_HEADER, NFT_REG_1, ++ offsetof(struct ip6_hdr, ip6_nxt), sizeof(((struct ip6_hdr *)NULL)->ip6_nxt)); ++#endif + add_cmp(r, NFT_REG_1, NFT_CMP_EQ, &l4_protocol, sizeof(l4_protocol)); + if (family == NFPROTO_IPV4) + add_payload(r, NFT_PAYLOAD_NETWORK_HEADER, NFT_REG_1, diff --git a/package/keepalived/keepalived.mk b/package/keepalived/keepalived.mk index 7a1123b4dd..c7e8c3e2ec 100644 --- a/package/keepalived/keepalived.mk +++ b/package/keepalived/keepalived.mk @@ -11,6 +11,8 @@ KEEPALIVED_LICENSE = GPL-2.0+ KEEPALIVED_LICENSE_FILES = COPYING KEEPALIVED_CPE_ID_VENDOR = keepalived KEEPALIVED_CONF_OPTS = --disable-hardening +# We're patching configure.ac +KEEPALIVED_AUTORECONF = YES ifeq ($(BR2_PACKAGE_JSON_C),y) KEEPALIVED_DEPENDENCIES += json-c From yann.morin.1998 at free.fr Mon Feb 14 20:39:09 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 14 Feb 2022 21:39:09 +0100 Subject: [Buildroot] [PATCH] utils/docker-run: improve user experience Message-ID: <20220214203909.251924-1-yann.morin.1998@free.fr> Currently, the docker-run script starts a container based on the reference image, in which the user has UID:GID set to 1000:1000, which may or may not be the same as local user uses, which may prevent the commands in the container from creating files, which foils the plan of using the container to run a build... Additionally, the paths in the container differ from the paths the user expects, as the current Buildroot tree is mounted over the in-container user home directory. This is a bit confusing... Finally, the container is left hanging around after the command finishes, and thus there are as many lingering containers as the user runs docker-run. This is not very nice... We fix all of that (yeah, should be different patches, but meh): - we use --mount instead of -v, which allows us to bind-mount the Buildroot tree at the same place in the container, as Docker will create the destination if it does not exist, while -v seems to expect it to exist [0]. - as a consequence, we can also set the working directory as the Buildroot top-directory; - use --user to force the same UID:GID in the container as the local user, so that files created in the container belong to the local user, and so that files from the local user are accessible from the container; - use --rm do remove the container once it terminates; starting a new container is very quick anyway, so it is as good as re-using a previous container. [0] the documentation is not clear about that. It clearly states that the host directory (i.e. the origin, the source) is created if missing, but it says nothing of the destination: https://docs.docker.com/engine/reference/commandline/run/#mount-volume--v---read-only Signed-off-by: Yann E. MORIN Cc: Luca Ceresoli Cc: Giulio Benetti Cc: Arnout Vandecappelle (Essensium/Mind) --- utils/docker-run | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/utils/docker-run b/utils/docker-run index 2bca8d8e3a..bdbc979264 100755 --- a/utils/docker-run +++ b/utils/docker-run @@ -7,4 +7,8 @@ IMAGE=$(grep ^image: "${MAIN_DIR}/.gitlab-ci.yml" | \ sed -e 's,^image: ,,g' | sed -e 's,\$CI_REGISTRY,registry.gitlab.com,g') set -x -exec docker run -v "${MAIN_DIR}:/home/br-user" -it "${IMAGE}" "$@" +exec docker run -it --rm \ + --user $(id -u):$(id -g) \ + --mount "type=bind,src=${MAIN_DIR},dst=${MAIN_DIR}" \ + --workdir "${MAIN_DIR}" \ + "${IMAGE}" "${@}" -- 2.25.1 From arnout at mind.be Mon Feb 14 20:41:03 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 14 Feb 2022 21:41:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/libuhttpd: depends on gcc >= 4.9 In-Reply-To: <20220208210644.16926-1-fontaine.fabrice@gmail.com> References: <20220208210644.16926-1-fontaine.fabrice@gmail.com> Message-ID: <31b52468-98ef-bfa7-c59e-12130d4ecdf9@mind.be> On 08/02/2022 22:06, Fabrice Fontaine wrote: > Add a dependency on gcc >= 4.9 to avoid the following build failure > with gcc 4.8.3 raised since bump to version 3.14.1 in commit > 61797c52f5deef2cb67e60cf075ca243078c8855 and > https://github.com/zhaojh329/libuhttpd/commit/ffdf7de3a4a1f5a62aa3814ac96e889958a30840: > > /home/peko/autobuild/instance-1/output-1/build/libuhttpd-3.14.1/src/cgi.c:41:5: error: initializer element is not a constant expression [-Werror] > {"accept", strlen("accept"), "HTTP_ACCEPT"}, > ^ > > It should be noted that upstream rejected a patch to remove -Werror: > https://github.com/zhaojh329/libuhttpd/pull/12 > > Fixes: > - http://autobuild.buildroot.org/results/a3a970a6398dcb0e4e03f4277f1a50c6b5eff7bd > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/libuhttpd/Config.in | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/package/libuhttpd/Config.in b/package/libuhttpd/Config.in > index 52bbd313bc..97fc984ea0 100644 > --- a/package/libuhttpd/Config.in > +++ b/package/libuhttpd/Config.in > @@ -1,6 +1,7 @@ > config BR2_PACKAGE_LIBUHTTPD > bool "libuhttpd" > depends on BR2_USE_MMU # fork() > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 > select BR2_PACKAGE_LIBEV > select BR2_PACKAGE_WOLFSSL_ALL if BR2_PACKAGE_WOLFSSL > help > @@ -8,3 +9,7 @@ config BR2_PACKAGE_LIBUHTTPD > library based on libev > > https://github.com/zhaojh329/libuhttpd > + > +comment "libuhttpd needs a toolchain w/ gcc >= 4.9" > + depends on BR2_USE_MMU > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 From arnout at mind.be Mon Feb 14 20:41:19 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 14 Feb 2022 21:41:19 +0100 Subject: [Buildroot] [PATCH 1/1] package/libusb: add -latomic to libusb-1.0.pc if needed In-Reply-To: <20220207172500.3041019-1-fontaine.fabrice@gmail.com> References: <20220207172500.3041019-1-fontaine.fabrice@gmail.com> Message-ID: On 07/02/2022 18:25, Fabrice Fontaine wrote: > libusb unconditionally uses atomic since version 1.0.25 and > https://github.com/libusb/libusb/commit/1a08aa84d96397a3840a75abe66051f5360c2c84 > resulting in the following build failure with pcsc-lite or openocd since > commit aad609936fc83acfe1eac6ffc86d29ac35dcf54e: > > checking for libusb_init... configure: error: libusb not found, use ./configure LIBUSB_LIBS=... > > /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: /home/buildroot/autobuild/instance-0/output-1/host/sparc-buildroot-linux-uclibc/sysroot/usr/lib/libusb-1.0.so: undefined reference to `__atomic_fetch_add_4' > collect2: error: ld returned 1 exit status > > Fixes: > - http://autobuild.buildroot.org/results/4a27a769bb3cdf78643c3049b87d792178d6512c > - http://autobuild.buildroot.org/results/b59b30cbe0e27399db5c7586f369104e68a1589a > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...igure.ac-link-with-latomic-if-needed.patch | 39 +++++++++++++++++++ > package/libusb/libusb.mk | 2 + > 2 files changed, 41 insertions(+) > create mode 100644 package/libusb/0001-configure.ac-link-with-latomic-if-needed.patch > > diff --git a/package/libusb/0001-configure.ac-link-with-latomic-if-needed.patch b/package/libusb/0001-configure.ac-link-with-latomic-if-needed.patch > new file mode 100644 > index 0000000000..5f6c88e57d > --- /dev/null > +++ b/package/libusb/0001-configure.ac-link-with-latomic-if-needed.patch > @@ -0,0 +1,39 @@ > +From 0b857081d687f7ee41483a3d7e9846af44a5ba7d Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Mon, 7 Feb 2022 11:55:54 +0100 > +Subject: [PATCH] configure.ac: link with -latomic if needed > + > +libusb unconditionally uses atomic_fetch_add since version 1.0.25 and > +https://github.com/libusb/libusb/commit/1a08aa84d96397a3840a75abe66051f5360c2c84 > +https://github.com/libusb/libusb/commit/eed8a371ea53939096ba94d44001e0637d042572 > +but some architectures (e.g. sparc) needs to link with -latomic to be > +able to use it. So check if -latomic is needed and update libusb-1.0.pc > +accordingly to avoid the following build failure with openocd: > + > +/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: /home/buildroot/autobuild/instance-0/output-1/host/sparc-buildroot-linux-uclibc/sysroot/usr/lib/libusb-1.0.so: undefined reference to `__atomic_fetch_add_4' > +collect2: error: ld returned 1 exit status > + > +Fixes: > + - http://autobuild.buildroot.org/results/4a27a769bb3cdf78643c3049b87d792178d6512c > + > +Signed-off-by: Fabrice Fontaine > +[Upstream status: https://github.com/libusb/libusb/pull/1064] > +--- > + configure.ac | 1 + > + 1 file changed, 1 insertion(+) > + > +diff --git a/configure.ac b/configure.ac > +index f6cf2f9..002bcf6 100644 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -152,6 +152,7 @@ if test "x$platform" = xposix; then > + AC_SEARCH_LIBS([pthread_create], [pthread], > + [test "x$ac_cv_search_pthread_create" != "xnone required" && AC_SUBST(THREAD_LIBS, [-lpthread])], > + [], []) > ++ AC_SEARCH_LIBS([__atomic_fetch_add_4], [atomic]) > + elif test "x$platform" = xwindows; then > + AC_DEFINE([PLATFORM_WINDOWS], [1], [Define to 1 if compiling for a Windows platform.]) > + else > +-- > +2.34.1 > + > diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk > index 1e82cb9a85..aa306e295d 100644 > --- a/package/libusb/libusb.mk > +++ b/package/libusb/libusb.mk > @@ -13,6 +13,8 @@ LIBUSB_LICENSE_FILES = COPYING > LIBUSB_CPE_ID_VENDOR = libusb > LIBUSB_DEPENDENCIES = host-pkgconf > LIBUSB_INSTALL_STAGING = YES > +# We're patching configure.ac > +LIBUSB_AUTORECONF = YES > > # Avoid the discovery of udev for the host variant > HOST_LIBUSB_CONF_OPTS = --disable-udev From arnout at mind.be Mon Feb 14 20:41:38 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 14 Feb 2022 21:41:38 +0100 Subject: [Buildroot] [PATCH] toolchain: fix gcc bug 99140 condition In-Reply-To: <20220206142403.1644118-1-giulio.benetti@benettiengineering.com> References: <2fec6210-3811-197d-45a7-1ece869f49e0@benettiengineering.com> <20220206142403.1644118-1-giulio.benetti@benettiengineering.com> Message-ID: <96afee8b-4875-666f-a28b-841a990e8fb3@mind.be> On 06/02/2022 15:24, Giulio Benetti wrote: > Gcc bug 99140 exhibits with gcc versions: > - up to 7.x > - 9.x > - 10.x > and doesn't show up with gcc versions: > - 8.x > - 11.x > then moving BR2_TOOLCHAIN_GCC_AT_LEAST_9 to BR2_TOOLCHAIN_GCC_AT_LEAST_10 > makes gcc version 9 set as working but it's not. So let's back substitute > BR2_TOOLCHAIN_GCC_AT_LEAST_10 with BR2_TOOLCHAIN_GCC_AT_LEAST_9. > > Signed-off-by: Giulio Benetti Applied to master, thanks. Regards, Arnout > --- > toolchain/Config.in | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/toolchain/Config.in b/toolchain/Config.in > index aed8f393a3..db3f451f45 100644 > --- a/toolchain/Config.in > +++ b/toolchain/Config.in > @@ -189,7 +189,7 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_93847 > config BR2_TOOLCHAIN_HAS_GCC_BUG_99140 > bool > default y if !BR2_TOOLCHAIN_GCC_AT_LEAST_8 > - default y if BR2_TOOLCHAIN_GCC_AT_LEAST_10 && !BR2_TOOLCHAIN_GCC_AT_LEAST_11 > + default y if BR2_TOOLCHAIN_GCC_AT_LEAST_9 && !BR2_TOOLCHAIN_GCC_AT_LEAST_11 > depends on BR2_nios2 > > # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101737 From arnout at mind.be Mon Feb 14 20:42:10 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 14 Feb 2022 21:42:10 +0100 Subject: [Buildroot] [PATCH v2] package/systemd: don't treat ld warnings as errors In-Reply-To: <20220206104120.1580819-1-giulio.benetti@benettiengineering.com> References: <20220206104120.1580819-1-giulio.benetti@benettiengineering.com> Message-ID: On 06/02/2022 11:41, Giulio Benetti wrote: > Nios2 ld emits warnings like: > ' > /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/nios2-linux-gnu/7.3.1/../../../../nios2-linux-gnu/bin/ld: FDE encoding in /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/nios2-linux-gnu/7.3.1/libgcc.a(_umoddi3.o)(.eh_frame) prevents .eh_frame_hdr table being created. > ' > Since '-Wl,--fatal-warnings' is passed by default, build fails, so don't > treat warnings as errors by appending "-Wl,--no-fatal-warnings" to > SYSTEMD_LDFLAGS the same way I've done for Microblaze in commit: > https://git.buildroot.net/buildroot/commit/?id=cc53d5357d84ff9b78d76e45ce216061df8a37c1 > > Fixes: > http://autobuild.buildroot.net/results/5fc884e11e46ab165ea21c8e8f2901516d79ff80/ > > Signed-off-by: Giulio Benetti Applied to master, thanks. Regards, Arnout > --- > V1->V2: > * renamed BR2_nios to BR2_nios2 > --- > package/systemd/systemd.mk | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > index 5626b54e8e..b07fac27d4 100644 > --- a/package/systemd/systemd.mk > +++ b/package/systemd/systemd.mk > @@ -90,6 +90,11 @@ SYSTEMD_CONF_OPTS += \ > -Dumount-path=/usr/bin/umount \ > -Dutmp=false > > +ifeq ($(BR2_nios2),y) > +# Nios2 ld emits warnings, make warnings not to be treated as errors > +SYSTEMD_LDFLAGS = $(TARGET_LDFLAGS) -Wl,--no-fatal-warnings > +endif > + > ifeq ($(BR2_PACKAGE_ACL),y) > SYSTEMD_DEPENDENCIES += acl > SYSTEMD_CONF_OPTS += -Dacl=true From arnout at mind.be Mon Feb 14 20:42:28 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 14 Feb 2022 21:42:28 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-regex: fix license In-Reply-To: <20220206220814.2580975-1-fontaine.fabrice@gmail.com> References: <20220206220814.2580975-1-fontaine.fabrice@gmail.com> Message-ID: <767362e6-ba7e-ff9f-81ef-787f325067e7@mind.be> On 06/02/2022 23:08, Fabrice Fontaine wrote: > License is Apache-2.0 since bump to version 2021.4.4 in commit > d973fac7ca2e7c0c4864e8045e5205764e84c45b and > https://github.com/mrabarnett/mrab-regex/commit/b693a1fba731a9aa0dc6ae37b441267d4b7b0419 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/python-regex/python-regex.hash | 2 ++ > package/python-regex/python-regex.mk | 3 ++- > package/python3-regex/python3-regex.mk | 3 ++- > 3 files changed, 6 insertions(+), 2 deletions(-) > > diff --git a/package/python-regex/python-regex.hash b/package/python-regex/python-regex.hash > index 4749cd6167..b0f5bb05da 100644 > --- a/package/python-regex/python-regex.hash > +++ b/package/python-regex/python-regex.hash > @@ -1,3 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/regex/json > md5 cd206281327b4c087bb20bf93cee4ab9 regex-2021.4.4.tar.gz > sha256 52ba3d3f9b942c49d7e4bc105bb28551c44065f139a65062ab7912bef10c9afb regex-2021.4.4.tar.gz > +# Locally computed sha256 checksums > +sha256 bff55ef4cdcc8c14ce259f8e8ab60e264418440d6335f4dc138273fbd506144d LICENSE.txt > diff --git a/package/python-regex/python-regex.mk b/package/python-regex/python-regex.mk > index c46c4d1614..4019bcdd3e 100644 > --- a/package/python-regex/python-regex.mk > +++ b/package/python-regex/python-regex.mk > @@ -9,6 +9,7 @@ PYTHON_REGEX_VERSION = 2021.4.4 > PYTHON_REGEX_SOURCE = regex-$(PYTHON_REGEX_VERSION).tar.gz > PYTHON_REGEX_SITE = https://files.pythonhosted.org/packages/38/3f/4c42a98c9ad7d08c16e7d23b2194a0e4f3b2914662da8bc88986e4e6de1f > PYTHON_REGEX_SETUP_TYPE = setuptools > -PYTHON_REGEX_LICENSE = CNRI-Python > +PYTHON_REGEX_LICENSE = Apache-2.0 > +PYTHON_REGEX_LICENSE_FILES = LICENSE.txt > > $(eval $(python-package)) > diff --git a/package/python3-regex/python3-regex.mk b/package/python3-regex/python3-regex.mk > index 0b71768e9d..5c08338437 100644 > --- a/package/python3-regex/python3-regex.mk > +++ b/package/python3-regex/python3-regex.mk > @@ -9,7 +9,8 @@ PYTHON3_REGEX_VERSION = 2021.4.4 > PYTHON3_REGEX_SOURCE = regex-$(PYTHON3_REGEX_VERSION).tar.gz > PYTHON3_REGEX_SITE = https://files.pythonhosted.org/packages/38/3f/4c42a98c9ad7d08c16e7d23b2194a0e4f3b2914662da8bc88986e4e6de1f > PYTHON3_REGEX_SETUP_TYPE = setuptools > -PYTHON3_REGEX_LICENSE = CNRI-Python > +PYTHON3_REGEX_LICENSE = Apache-2.0 > +PYTHON3_REGEX_LICENSE_FILES = LICENSE.txt > HOST_PYTHON3_REGEX_DL_SUBDIR = python-regex > HOST_PYTHON3_REGEX_NEEDS_HOST_PYTHON = python3 > From arnout at mind.be Mon Feb 14 20:38:43 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Feb 2022 21:38:43 +0100 Subject: [Buildroot] [git commit] package/libusb: add -latomic to libusb-1.0.pc if needed Message-ID: <20220214203507.22FEA82BDB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d661740201405970f65c16c39a79f4148705af30 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master libusb unconditionally uses atomic since version 1.0.25 and https://github.com/libusb/libusb/commit/1a08aa84d96397a3840a75abe66051f5360c2c84 resulting in the following build failure with pcsc-lite or openocd since commit aad609936fc83acfe1eac6ffc86d29ac35dcf54e: checking for libusb_init... configure: error: libusb not found, use ./configure LIBUSB_LIBS=... /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: /home/buildroot/autobuild/instance-0/output-1/host/sparc-buildroot-linux-uclibc/sysroot/usr/lib/libusb-1.0.so: undefined reference to `__atomic_fetch_add_4' collect2: error: ld returned 1 exit status Fixes: - http://autobuild.buildroot.org/results/4a27a769bb3cdf78643c3049b87d792178d6512c - http://autobuild.buildroot.org/results/b59b30cbe0e27399db5c7586f369104e68a1589a Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...-configure.ac-link-with-latomic-if-needed.patch | 39 ++++++++++++++++++++++ package/libusb/libusb.mk | 2 ++ 2 files changed, 41 insertions(+) diff --git a/package/libusb/0001-configure.ac-link-with-latomic-if-needed.patch b/package/libusb/0001-configure.ac-link-with-latomic-if-needed.patch new file mode 100644 index 0000000000..5f6c88e57d --- /dev/null +++ b/package/libusb/0001-configure.ac-link-with-latomic-if-needed.patch @@ -0,0 +1,39 @@ +From 0b857081d687f7ee41483a3d7e9846af44a5ba7d Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 7 Feb 2022 11:55:54 +0100 +Subject: [PATCH] configure.ac: link with -latomic if needed + +libusb unconditionally uses atomic_fetch_add since version 1.0.25 and +https://github.com/libusb/libusb/commit/1a08aa84d96397a3840a75abe66051f5360c2c84 +https://github.com/libusb/libusb/commit/eed8a371ea53939096ba94d44001e0637d042572 +but some architectures (e.g. sparc) needs to link with -latomic to be +able to use it. So check if -latomic is needed and update libusb-1.0.pc +accordingly to avoid the following build failure with openocd: + +/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: /home/buildroot/autobuild/instance-0/output-1/host/sparc-buildroot-linux-uclibc/sysroot/usr/lib/libusb-1.0.so: undefined reference to `__atomic_fetch_add_4' +collect2: error: ld returned 1 exit status + +Fixes: + - http://autobuild.buildroot.org/results/4a27a769bb3cdf78643c3049b87d792178d6512c + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/libusb/libusb/pull/1064] +--- + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure.ac b/configure.ac +index f6cf2f9..002bcf6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -152,6 +152,7 @@ if test "x$platform" = xposix; then + AC_SEARCH_LIBS([pthread_create], [pthread], + [test "x$ac_cv_search_pthread_create" != "xnone required" && AC_SUBST(THREAD_LIBS, [-lpthread])], + [], []) ++ AC_SEARCH_LIBS([__atomic_fetch_add_4], [atomic]) + elif test "x$platform" = xwindows; then + AC_DEFINE([PLATFORM_WINDOWS], [1], [Define to 1 if compiling for a Windows platform.]) + else +-- +2.34.1 + diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk index 1e82cb9a85..aa306e295d 100644 --- a/package/libusb/libusb.mk +++ b/package/libusb/libusb.mk @@ -13,6 +13,8 @@ LIBUSB_LICENSE_FILES = COPYING LIBUSB_CPE_ID_VENDOR = libusb LIBUSB_DEPENDENCIES = host-pkgconf LIBUSB_INSTALL_STAGING = YES +# We're patching configure.ac +LIBUSB_AUTORECONF = YES # Avoid the discovery of udev for the host variant HOST_LIBUSB_CONF_OPTS = --disable-udev From arnout at mind.be Mon Feb 14 20:38:22 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Feb 2022 21:38:22 +0100 Subject: [Buildroot] [git commit] package/systemd: don't treat ld warnings as errors Message-ID: <20220214203507.0B70F82BDC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=132eec5c47f5f9542d0c2e93d12341d624627de0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Nios2 ld emits warnings like: ' /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/nios2-linux-gnu/7.3.1/../../../../nios2-linux-gnu/bin/ld: FDE encoding in /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/nios2-linux-gnu/7.3.1/libgcc.a(_umoddi3.o)(.eh_frame) prevents .eh_frame_hdr table being created. ' Since '-Wl,--fatal-warnings' is passed by default, build fails, so don't treat warnings as errors by appending "-Wl,--no-fatal-warnings" to SYSTEMD_LDFLAGS the same way I've done for Microblaze in commit: https://git.buildroot.net/buildroot/commit/?id=cc53d5357d84ff9b78d76e45ce216061df8a37c1 Fixes: http://autobuild.buildroot.net/results/5fc884e11e46ab165ea21c8e8f2901516d79ff80/ Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/systemd/systemd.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 5626b54e8e..b07fac27d4 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -90,6 +90,11 @@ SYSTEMD_CONF_OPTS += \ -Dumount-path=/usr/bin/umount \ -Dutmp=false +ifeq ($(BR2_nios2),y) +# Nios2 ld emits warnings, make warnings not to be treated as errors +SYSTEMD_LDFLAGS = $(TARGET_LDFLAGS) -Wl,--no-fatal-warnings +endif + ifeq ($(BR2_PACKAGE_ACL),y) SYSTEMD_DEPENDENCIES += acl SYSTEMD_CONF_OPTS += -Dacl=true From arnout at mind.be Mon Feb 14 20:39:58 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Feb 2022 21:39:58 +0100 Subject: [Buildroot] [git commit] package/libuhttpd: depends on gcc >= 4.9 Message-ID: <20220214203507.2E57882BDC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8679f6a7e7c0e6245ebdea47ea2257bfaccc7d37 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add a dependency on gcc >= 4.9 to avoid the following build failure with gcc 4.8.3 raised since bump to version 3.14.1 in commit 61797c52f5deef2cb67e60cf075ca243078c8855 and https://github.com/zhaojh329/libuhttpd/commit/ffdf7de3a4a1f5a62aa3814ac96e889958a30840: /home/peko/autobuild/instance-1/output-1/build/libuhttpd-3.14.1/src/cgi.c:41:5: error: initializer element is not a constant expression [-Werror] {"accept", strlen("accept"), "HTTP_ACCEPT"}, ^ It should be noted that upstream rejected a patch to remove -Werror: https://github.com/zhaojh329/libuhttpd/pull/12 Fixes: - http://autobuild.buildroot.org/results/a3a970a6398dcb0e4e03f4277f1a50c6b5eff7bd Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libuhttpd/Config.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/libuhttpd/Config.in b/package/libuhttpd/Config.in index 52bbd313bc..97fc984ea0 100644 --- a/package/libuhttpd/Config.in +++ b/package/libuhttpd/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_LIBUHTTPD bool "libuhttpd" depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 select BR2_PACKAGE_LIBEV select BR2_PACKAGE_WOLFSSL_ALL if BR2_PACKAGE_WOLFSSL help @@ -8,3 +9,7 @@ config BR2_PACKAGE_LIBUHTTPD library based on libev https://github.com/zhaojh329/libuhttpd + +comment "libuhttpd needs a toolchain w/ gcc >= 4.9" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 From arnout at mind.be Mon Feb 14 20:38:27 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Feb 2022 21:38:27 +0100 Subject: [Buildroot] [git commit] toolchain: fix gcc bug 99140 condition Message-ID: <20220214203507.15C8582CFC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=33ea4d7887b15ccb3e11d1390c697eee531af565 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Gcc bug 99140 exhibits with gcc versions: - up to 7.x - 9.x - 10.x and doesn't show up with gcc versions: - 8.x - 11.x then moving BR2_TOOLCHAIN_GCC_AT_LEAST_9 to BR2_TOOLCHAIN_GCC_AT_LEAST_10 makes gcc version 9 set as working but it's not. So let's back substitute BR2_TOOLCHAIN_GCC_AT_LEAST_10 with BR2_TOOLCHAIN_GCC_AT_LEAST_9. Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- toolchain/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchain/Config.in b/toolchain/Config.in index 53d2046379..d2c81217c8 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -189,7 +189,7 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_93847 config BR2_TOOLCHAIN_HAS_GCC_BUG_99140 bool default y if !BR2_TOOLCHAIN_GCC_AT_LEAST_8 - default y if BR2_TOOLCHAIN_GCC_AT_LEAST_10 && !BR2_TOOLCHAIN_GCC_AT_LEAST_11 + default y if BR2_TOOLCHAIN_GCC_AT_LEAST_9 && !BR2_TOOLCHAIN_GCC_AT_LEAST_11 depends on BR2_nios2 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101737 From arnout at mind.be Mon Feb 14 20:37:43 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Feb 2022 21:37:43 +0100 Subject: [Buildroot] [git commit] package/python-regex: fix license Message-ID: <20220214203507.0043C82BDB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=261bb9a17a21439e9688b07de1b8edf89f8eae31 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master License is Apache-2.0 since bump to version 2021.4.4 in commit d973fac7ca2e7c0c4864e8045e5205764e84c45b and https://github.com/mrabarnett/mrab-regex/commit/b693a1fba731a9aa0dc6ae37b441267d4b7b0419 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-regex/python-regex.hash | 2 ++ package/python-regex/python-regex.mk | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/package/python-regex/python-regex.hash b/package/python-regex/python-regex.hash index 4749cd6167..b0f5bb05da 100644 --- a/package/python-regex/python-regex.hash +++ b/package/python-regex/python-regex.hash @@ -1,3 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/regex/json md5 cd206281327b4c087bb20bf93cee4ab9 regex-2021.4.4.tar.gz sha256 52ba3d3f9b942c49d7e4bc105bb28551c44065f139a65062ab7912bef10c9afb regex-2021.4.4.tar.gz +# Locally computed sha256 checksums +sha256 bff55ef4cdcc8c14ce259f8e8ab60e264418440d6335f4dc138273fbd506144d LICENSE.txt diff --git a/package/python-regex/python-regex.mk b/package/python-regex/python-regex.mk index b93607e40f..bb8fdf3e48 100644 --- a/package/python-regex/python-regex.mk +++ b/package/python-regex/python-regex.mk @@ -8,7 +8,8 @@ PYTHON_REGEX_VERSION = 2021.4.4 PYTHON_REGEX_SOURCE = regex-$(PYTHON_REGEX_VERSION).tar.gz PYTHON_REGEX_SITE = https://files.pythonhosted.org/packages/38/3f/4c42a98c9ad7d08c16e7d23b2194a0e4f3b2914662da8bc88986e4e6de1f PYTHON_REGEX_SETUP_TYPE = setuptools -PYTHON_REGEX_LICENSE = CNRI-Python +PYTHON_REGEX_LICENSE = Apache-2.0 +PYTHON_REGEX_LICENSE_FILES = LICENSE.txt $(eval $(python-package)) $(eval $(host-python-package)) From arnout at mind.be Mon Feb 14 20:46:38 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 14 Feb 2022 21:46:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/mongrel2: fix build with gcc 4.8 In-Reply-To: <20220209192048.319559-1-fontaine.fabrice@gmail.com> References: <20220209192048.319559-1-fontaine.fabrice@gmail.com> Message-ID: <234a1e78-f2cc-9ac1-55b9-9817d51acc89@mind.be> On 09/02/2022 20:20, Fabrice Fontaine wrote: > Fix the following build failure raised since bump to version 1.13.0 in > commit b0a7bffad9e041d9920171802621b67903f9389e: > > arm-none-linux-gnueabi-gcc: error: unrecognized command line option '-Wimplicit-fallthrough=0' > > Fixes: > - http://autobuild.buildroot.org/results/de324b733e09057c87352220069fe65f6e535eb8 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > .../0003-fix-build-with-gcc-4.8.patch | 60 +++++++++++++++++++ > 1 file changed, 60 insertions(+) > create mode 100644 package/mongrel2/0003-fix-build-with-gcc-4.8.patch > > diff --git a/package/mongrel2/0003-fix-build-with-gcc-4.8.patch b/package/mongrel2/0003-fix-build-with-gcc-4.8.patch > new file mode 100644 > index 0000000000..eebfce0487 > --- /dev/null > +++ b/package/mongrel2/0003-fix-build-with-gcc-4.8.patch > @@ -0,0 +1,60 @@ > +From cc2dd3995dc9a9e6f0e705e11e791f3f3c7d7326 Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Tue, 18 Jan 2022 22:41:36 +0100 > +Subject: [PATCH] fix build with gcc 4.8 > + > +Drop "-Wno-unused-const-variable -Wimplicit-fallthrough=0" as > +"-Wno-implicit-fallthrough -Wno-unused-const-variable" is already set in > +CFLAGS. This will avoid the following build failure with gcc 4.8 raised > +since version 1.13.0 and > +https://github.com/mongrel2/mongrel2/commit/725209578599bd7784753d86aee34f6441ff78a5: > + > +arm-none-linux-gnueabi-gcc: error: unrecognized command line option '-Wimplicit-fallthrough=0' > + > +Fixes: > + - http://autobuild.buildroot.org/results/de324b733e09057c87352220069fe65f6e535eb8 > + > +Signed-off-by: Fabrice Fontaine > +[Upstream status: https://github.com/mongrel2/mongrel2/pull/354] > +--- > + Makefile | 1 - > + tools/m2sh/Makefile | 4 ++-- > + 2 files changed, 2 insertions(+), 3 deletions(-) > + > +diff --git a/Makefile b/Makefile > +index f6627ed..fb8d028 100644 > +--- a/Makefile > ++++ b/Makefile > +@@ -22,7 +22,6 @@ all: bin/mongrel2 tests m2sh procer > + > + ${OBJECTS_NOEXT}: CFLAGS += ${NOEXTCFLAGS} > + ${OBJECTS}: | builddirs > +-$(RAGEL_OBJECTS): CFLAGS += -Wno-unused-const-variable -Wimplicit-fallthrough=0 > + > + .PHONY: builddirs > + builddirs: > +diff --git a/tools/m2sh/Makefile b/tools/m2sh/Makefile > +index 83e7ae4..86364af 100644 > +--- a/tools/m2sh/Makefile > ++++ b/tools/m2sh/Makefile > +@@ -10,7 +10,7 @@ LIB_SRC=$(filter-out src/m2sh.c,${SOURCES}) > + LIB_OBJ=$(filter-out src/m2sh.o,${OBJECTS}) > + RAGEL_OBJECTS=src/lexer.o src/cli.o > + > +-$(RAGEL_OBJECTS): CFLAGS += -Wno-unused-const-variable -Wimplicit-fallthrough=0 -Wno-unused-parameter > ++$(RAGEL_OBJECTS): CFLAGS += -Wno-unused-parameter > + > + all: ../lemon/lemon tests build/m2sh > + > +@@ -20,7 +20,7 @@ dev: all > + install: build/m2sh > + install build/m2sh ${DESTDIR}${PREFIX}/bin > + > +-src/parser.o: CFLAGS += -Wno-unused-const-variable -Wno-unused-parameter > ++src/parser.o: CFLAGS += -Wno-unused-parameter > + > + build/libm2sh.a: ${LIB_OBJ} > + mkdir -p build > +-- > +2.34.1 > + From arnout at mind.be Mon Feb 14 20:48:54 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 14 Feb 2022 21:48:54 +0100 Subject: [Buildroot] [PATCH v1] package/libv4l: v4l-utils needs C++11 support In-Reply-To: <20220211134906.18280-1-ps.report@gmx.net> References: <20220211134906.18280-1-ps.report@gmx.net> Message-ID: <069d7a4e-63d0-ee43-80b8-222eee4b43e9@mind.be> On 11/02/2022 14:49, Peter Seiderer wrote: > Fixes: > > - http://autobuild.buildroot.net/results/cacd73e08cfb359d608bca807189b7bd3c5c79bd > > v4l2-ctl.cpp:53:2: warning: identifier 'nullptr' is a keyword in C++11 [-Wc++0x-compat] > v4l2-ctl.cpp:53:37: error: 'nullptr' was not declared in this scope > [...] > v4l2-ctl-tuner.cpp: In function 'void parse_freq_seek(char*, v4l2_hw_freq_seek&)': > v4l2-ctl-tuner.cpp:160:10: error: 'constexpr' does not name a type > static constexpr const char *subopts[] = { > ^ > v4l2-ctl-tuner.cpp:160:10: note: C++11 'constexpr' only available with -std=c++11 or -std=gnu++11 > > Signed-off-by: Peter Seiderer > --- > package/libv4l/Config.in | 4 ++++ > package/libv4l/libv4l.mk | 6 ++++-- > 2 files changed, 8 insertions(+), 2 deletions(-) > > diff --git a/package/libv4l/Config.in b/package/libv4l/Config.in > index 57ddde1dfb..c88f280c3b 100644 > --- a/package/libv4l/Config.in > +++ b/package/libv4l/Config.in > @@ -20,6 +20,7 @@ comment "libv4l JPEG support not enabled" > > config BR2_PACKAGE_LIBV4L_UTILS > bool "v4l-utils tools" > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 > help > v4l-utils is a collection of various video4linux and DVB > utilities. > @@ -35,6 +36,9 @@ config BR2_PACKAGE_LIBV4L_UTILS > - rds-ctl > - qv4l2 (if Qt is enabled) > > +comment "v4l-utils tools needs a toolchain w/ C++11" > + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 > + > endif > > comment "libv4l needs a toolchain w/ threads, C++ and headers >= 3.0" > diff --git a/package/libv4l/libv4l.mk b/package/libv4l/libv4l.mk > index 4dc0f15f94..ee5a1f2241 100644 > --- a/package/libv4l/libv4l.mk > +++ b/package/libv4l/libv4l.mk > @@ -59,6 +59,10 @@ ifeq ($(BR2_PACKAGE_LIBV4L_UTILS),y) > LIBV4L_CONF_OPTS += --enable-v4l-utils > LIBV4L_DEPENDENCIES += $(TARGET_NLS_DEPENDENCIES) > > +# v4l2-ctl needs c++11, qt5 needs c++11 (since qt-5.7)/use gnu++11 for > +# typeof support This no longer makes sense. The "use gnu++11" part is there because libv4l uses 'typeof', which is a GNU extension, and -std=c++XX disables GNU extensions. qt5 needs -std=c++11, not -std=gnu++11. Since libv4l itself now requires c++11, the qt5 reference is no longer relevant. So I removed the qt5 part and applied to master, thanks. Regards, Arnout > +LIBV4L_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=gnu++11" > + > # IR BPF decoder support needs toolchain with linux-headers >= 3.18 > # libelf and clang support > LIBV4L_CONF_OPTS += --disable-bpf > @@ -71,8 +75,6 @@ LIBV4L_CONF_ENV += \ > ac_cv_prog_MOC=$(HOST_DIR)/bin/moc \ > ac_cv_prog_RCC=$(HOST_DIR)/bin/rcc \ > ac_cv_prog_UIC=$(HOST_DIR)/bin/uic > -# qt5 needs c++11 (since qt-5.7)/use gnu++11 for typeof support > -LIBV4L_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=gnu++11" > else > LIBV4L_CONF_OPTS += --disable-qv4l2 > endif From arnout at mind.be Mon Feb 14 20:46:13 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Feb 2022 21:46:13 +0100 Subject: [Buildroot] [git commit] package/libv4l: v4l-utils needs C++11 support Message-ID: <20220214204133.20B2582BDB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=184ce3ced3ccb39f43369482292b09730e6ab8e2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: - http://autobuild.buildroot.net/results/cacd73e08cfb359d608bca807189b7bd3c5c79bd v4l2-ctl.cpp:53:2: warning: identifier 'nullptr' is a keyword in C++11 [-Wc++0x-compat] v4l2-ctl.cpp:53:37: error: 'nullptr' was not declared in this scope [...] v4l2-ctl-tuner.cpp: In function 'void parse_freq_seek(char*, v4l2_hw_freq_seek&)': v4l2-ctl-tuner.cpp:160:10: error: 'constexpr' does not name a type static constexpr const char *subopts[] = { ^ v4l2-ctl-tuner.cpp:160:10: note: C++11 'constexpr' only available with -std=c++11 or -std=gnu++11 Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libv4l/Config.in | 4 ++++ package/libv4l/libv4l.mk | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/package/libv4l/Config.in b/package/libv4l/Config.in index 57ddde1dfb..c88f280c3b 100644 --- a/package/libv4l/Config.in +++ b/package/libv4l/Config.in @@ -20,6 +20,7 @@ comment "libv4l JPEG support not enabled" config BR2_PACKAGE_LIBV4L_UTILS bool "v4l-utils tools" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 help v4l-utils is a collection of various video4linux and DVB utilities. @@ -35,6 +36,9 @@ config BR2_PACKAGE_LIBV4L_UTILS - rds-ctl - qv4l2 (if Qt is enabled) +comment "v4l-utils tools needs a toolchain w/ C++11" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + endif comment "libv4l needs a toolchain w/ threads, C++ and headers >= 3.0" diff --git a/package/libv4l/libv4l.mk b/package/libv4l/libv4l.mk index 4dc0f15f94..8300f5c970 100644 --- a/package/libv4l/libv4l.mk +++ b/package/libv4l/libv4l.mk @@ -59,6 +59,9 @@ ifeq ($(BR2_PACKAGE_LIBV4L_UTILS),y) LIBV4L_CONF_OPTS += --enable-v4l-utils LIBV4L_DEPENDENCIES += $(TARGET_NLS_DEPENDENCIES) +# v4l2-ctl needs c++11, use gnu++11 for typeof support +LIBV4L_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=gnu++11" + # IR BPF decoder support needs toolchain with linux-headers >= 3.18 # libelf and clang support LIBV4L_CONF_OPTS += --disable-bpf @@ -71,8 +74,6 @@ LIBV4L_CONF_ENV += \ ac_cv_prog_MOC=$(HOST_DIR)/bin/moc \ ac_cv_prog_RCC=$(HOST_DIR)/bin/rcc \ ac_cv_prog_UIC=$(HOST_DIR)/bin/uic -# qt5 needs c++11 (since qt-5.7)/use gnu++11 for typeof support -LIBV4L_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=gnu++11" else LIBV4L_CONF_OPTS += --disable-qv4l2 endif From arnout at mind.be Mon Feb 14 20:43:11 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Feb 2022 21:43:11 +0100 Subject: [Buildroot] [git commit] package/mongrel2: fix build with gcc 4.8 Message-ID: <20220214204133.1403582AD1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a738ecbce4979db46bcb8b960531f573e08c0e32 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since bump to version 1.13.0 in commit b0a7bffad9e041d9920171802621b67903f9389e: arm-none-linux-gnueabi-gcc: error: unrecognized command line option '-Wimplicit-fallthrough=0' Fixes: - http://autobuild.buildroot.org/results/de324b733e09057c87352220069fe65f6e535eb8 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/mongrel2/0003-fix-build-with-gcc-4.8.patch | 60 ++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/package/mongrel2/0003-fix-build-with-gcc-4.8.patch b/package/mongrel2/0003-fix-build-with-gcc-4.8.patch new file mode 100644 index 0000000000..eebfce0487 --- /dev/null +++ b/package/mongrel2/0003-fix-build-with-gcc-4.8.patch @@ -0,0 +1,60 @@ +From cc2dd3995dc9a9e6f0e705e11e791f3f3c7d7326 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 18 Jan 2022 22:41:36 +0100 +Subject: [PATCH] fix build with gcc 4.8 + +Drop "-Wno-unused-const-variable -Wimplicit-fallthrough=0" as +"-Wno-implicit-fallthrough -Wno-unused-const-variable" is already set in +CFLAGS. This will avoid the following build failure with gcc 4.8 raised +since version 1.13.0 and +https://github.com/mongrel2/mongrel2/commit/725209578599bd7784753d86aee34f6441ff78a5: + +arm-none-linux-gnueabi-gcc: error: unrecognized command line option '-Wimplicit-fallthrough=0' + +Fixes: + - http://autobuild.buildroot.org/results/de324b733e09057c87352220069fe65f6e535eb8 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/mongrel2/mongrel2/pull/354] +--- + Makefile | 1 - + tools/m2sh/Makefile | 4 ++-- + 2 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index f6627ed..fb8d028 100644 +--- a/Makefile ++++ b/Makefile +@@ -22,7 +22,6 @@ all: bin/mongrel2 tests m2sh procer + + ${OBJECTS_NOEXT}: CFLAGS += ${NOEXTCFLAGS} + ${OBJECTS}: | builddirs +-$(RAGEL_OBJECTS): CFLAGS += -Wno-unused-const-variable -Wimplicit-fallthrough=0 + + .PHONY: builddirs + builddirs: +diff --git a/tools/m2sh/Makefile b/tools/m2sh/Makefile +index 83e7ae4..86364af 100644 +--- a/tools/m2sh/Makefile ++++ b/tools/m2sh/Makefile +@@ -10,7 +10,7 @@ LIB_SRC=$(filter-out src/m2sh.c,${SOURCES}) + LIB_OBJ=$(filter-out src/m2sh.o,${OBJECTS}) + RAGEL_OBJECTS=src/lexer.o src/cli.o + +-$(RAGEL_OBJECTS): CFLAGS += -Wno-unused-const-variable -Wimplicit-fallthrough=0 -Wno-unused-parameter ++$(RAGEL_OBJECTS): CFLAGS += -Wno-unused-parameter + + all: ../lemon/lemon tests build/m2sh + +@@ -20,7 +20,7 @@ dev: all + install: build/m2sh + install build/m2sh ${DESTDIR}${PREFIX}/bin + +-src/parser.o: CFLAGS += -Wno-unused-const-variable -Wno-unused-parameter ++src/parser.o: CFLAGS += -Wno-unused-parameter + + build/libm2sh.a: ${LIB_OBJ} + mkdir -p build +-- +2.34.1 + From fontaine.fabrice at gmail.com Mon Feb 14 20:53:38 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 14 Feb 2022 21:53:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/ghostscript: add tesseract-ocr optional dependency Message-ID: <20220214205338.4142074-1-fontaine.fabrice@gmail.com> tesseract-ocr is an optional dependency which is enabled by default since version 9.53.0 and https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=7322ef87546c55b29056c1d96d8bdbb7f3ba53ef Since version 9.55.0 and https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=5459f7aca1ded3b7cf96c339a2419f418aa406c7, ghostscript expects that tesseract-ocr is disabled if threads are not available resulting in the following build failure since commit 7a4944569ce83b0b7b0cabd6e8aa184b8cb72a22: configure: error: Threading disabled or not available. Tesseract OCR relies on threading. Rerun configure with "--without-tesseract" to exclude OCR from the build Fixes: - http://autobuild.buildroot.org/results/fd35a47b2a77cf57c243ec1c88802b53ddca8f52 Signed-off-by: Fabrice Fontaine --- package/ghostscript/ghostscript.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/ghostscript/ghostscript.mk b/package/ghostscript/ghostscript.mk index 24a0c489a8..e869e804ce 100644 --- a/package/ghostscript/ghostscript.mk +++ b/package/ghostscript/ghostscript.mk @@ -76,6 +76,13 @@ else GHOSTSCRIPT_CONF_OPTS += --disable-cups endif +ifeq ($(BR2_PACKAGE_TESSERACT_OCR),y) +GHOSTSCRIPT_DEPENDENCIES += tesseract-ocr +GHOSTSCRIPT_CONF_OPTS += --with-tesseract +else +GHOSTSCRIPT_CONF_OPTS += --without-tesseract +endif + ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y) GHOSTSCRIPT_DEPENDENCIES += xlib_libX11 GHOSTSCRIPT_CONF_OPTS += --with-x -- 2.34.1 From arnout at mind.be Mon Feb 14 20:56:52 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 14 Feb 2022 21:56:52 +0100 Subject: [Buildroot] [PATCH] configs/roc_pc_rk3399_defconfig: expand rootfs size to 120M In-Reply-To: <20220202171035.1740791-2-giulio.benetti@benettiengineering.com> References: <20220202171035.1740791-1-giulio.benetti@benettiengineering.com> <20220202171035.1740791-2-giulio.benetti@benettiengineering.com> Message-ID: On 02/02/2022 18:10, Giulio Benetti wrote: > Default 60M for rootfs are not enough and generate a build failure, so > let's expand rootfs size to 120M. > > Signed-off-by: Giulio Benetti > --- > configs/roc_pc_rk3399_defconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/configs/roc_pc_rk3399_defconfig b/configs/roc_pc_rk3399_defconfig > index dfbc5e4f47..ae7cf19a80 100644 > --- a/configs/roc_pc_rk3399_defconfig > +++ b/configs/roc_pc_rk3399_defconfig > @@ -45,7 +45,7 @@ BR2_TARGET_GENERIC_HOSTNAME="roc-rk3399-pc" > BR2_TARGET_GENERIC_ISSUE="Welcome to ROC-RK3399-PC!" > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > -BR2_TARGET_ROOTFS_EXT2_SIZE="64M" > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" Even though I proposed to move the default to 120M, that's for next anyway, and this defconfig should be fixed on master, so applied to master, thanks. Regards, Arnout > BR2_PACKAGE_HOST_DOSFSTOOLS=y > BR2_PACKAGE_HOST_GENIMAGE=y > BR2_PACKAGE_HOST_MTOOLS=y From arnout at mind.be Mon Feb 14 20:57:10 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Feb 2022 21:57:10 +0100 Subject: [Buildroot] [git commit] configs/roc_pc_rk3399_defconfig: expand rootfs size to 120M Message-ID: <20220214205051.930AD8179A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5194113331b04c5fee1a773e1751b40bff6fdd18 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Default 60M for rootfs are not enough and generate a build failure, so let's expand rootfs size to 120M. Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- configs/roc_pc_rk3399_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/roc_pc_rk3399_defconfig b/configs/roc_pc_rk3399_defconfig index dfbc5e4f47..ae7cf19a80 100644 --- a/configs/roc_pc_rk3399_defconfig +++ b/configs/roc_pc_rk3399_defconfig @@ -45,7 +45,7 @@ BR2_TARGET_GENERIC_HOSTNAME="roc-rk3399-pc" BR2_TARGET_GENERIC_ISSUE="Welcome to ROC-RK3399-PC!" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="64M" +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y From arnout at mind.be Mon Feb 14 21:01:36 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Feb 2022 22:01:36 +0100 Subject: [Buildroot] [git commit] package/binutils: fixes glibc build compiled with -Os on x86 Message-ID: <20220214205821.A320A82A4E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=91f241b8e967d114076cd4e5533213b8f2fb27ce branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master See here: https://sourceware.org/bugzilla/show_bug.cgi?id=28870 Signed-off-by: Waldemar Brodkorb Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...low-GOT32-relocations-against-ABS-symbols.patch | 46 +++++++++++++++++++ ...low-GOT32-relocations-against-ABS-symbols.patch | 53 ++++++++++++++++++++++ ...low-GOT32-relocations-against-ABS-symbols.patch | 47 +++++++++++++++++++ 3 files changed, 146 insertions(+) diff --git a/package/binutils/2.35.2/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch b/package/binutils/2.35.2/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch new file mode 100644 index 0000000000..e95eb1e7c5 --- /dev/null +++ b/package/binutils/2.35.2/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch @@ -0,0 +1,46 @@ +From 30a954525f4e53a9cd50a1a8a6f201c7cf6595c7 Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" +Date: Mon, 7 Feb 2022 15:22:19 -0800 +Subject: [PATCH] i386: Allow GOT32 relocations against ABS symbols + +GOT32 relocations are allowed since absolute value + addend is stored in +the GOT slot. + +Tested on glibc 2.35 build with GCC 11.2 and -Os. + +bfd/ + + PR ld/28870 + * elfxx-x86.c (_bfd_elf_x86_valid_reloc_p): Also allow GOT32 + relocations. + +Signed-off-by: Waldemar Brodkorb + +diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c +index 7ac2411fc80..d00dc45677b 100644 +--- a/bfd/elfxx-x86.c ++++ b/bfd/elfxx-x86.c +@@ -1942,9 +1942,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section, + irel = *rel; + + /* Only allow relocations against absolute symbol, which can be +- resolved as absolute value + addend. GOTPCREL relocations +- are allowed since absolute value + addend is stored in the +- GOT slot. */ ++ resolved as absolute value + addend. GOTPCREL and GOT32 ++ relocations are allowed since absolute value + addend is ++ stored in the GOT slot. */ + if (bed->target_id == X86_64_ELF_DATA) + { + r_type &= ~R_X86_64_converted_reloc_bit; +@@ -1965,7 +1965,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section, + else + valid_p = (r_type == R_386_32 + || r_type == R_386_16 +- || r_type == R_386_8); ++ || r_type == R_386_8 ++ || r_type == R_386_GOT32 ++ || r_type == R_386_GOT32X); + + if (valid_p) + *no_dynreloc_p = true; diff --git a/package/binutils/2.36.1/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch b/package/binutils/2.36.1/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch new file mode 100644 index 0000000000..af96f1a0f0 --- /dev/null +++ b/package/binutils/2.36.1/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch @@ -0,0 +1,53 @@ +From 30a954525f4e53a9cd50a1a8a6f201c7cf6595c7 Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" +Date: Mon, 7 Feb 2022 15:22:19 -0800 +Subject: [PATCH] i386: Allow GOT32 relocations against ABS symbols + +GOT32 relocations are allowed since absolute value + addend is stored in +the GOT slot. + +Tested on glibc 2.35 build with GCC 11.2 and -Os. + +bfd/ + + PR ld/28870 + * elfxx-x86.c (_bfd_elf_x86_valid_reloc_p): Also allow GOT32 + relocations. + +ld/ + + PR ld/28870 + * testsuite/ld-i386/i386.exp: Run pr28870. + * testsuite/ld-i386/pr28870.d: New file. + * testsuite/ld-i386/pr28870.s: Likewise. + +Signed-off-by: Waldemar Brodkorb + +diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c +index 7ac2411fc80..d00dc45677b 100644 +--- a/bfd/elfxx-x86.c ++++ b/bfd/elfxx-x86.c +@@ -1942,9 +1942,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section, + irel = *rel; + + /* Only allow relocations against absolute symbol, which can be +- resolved as absolute value + addend. GOTPCREL relocations +- are allowed since absolute value + addend is stored in the +- GOT slot. */ ++ resolved as absolute value + addend. GOTPCREL and GOT32 ++ relocations are allowed since absolute value + addend is ++ stored in the GOT slot. */ + if (bed->target_id == X86_64_ELF_DATA) + { + r_type &= ~R_X86_64_converted_reloc_bit; +@@ -1965,7 +1965,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section, + else + valid_p = (r_type == R_386_32 + || r_type == R_386_16 +- || r_type == R_386_8); ++ || r_type == R_386_8 ++ || r_type == R_386_GOT32 ++ || r_type == R_386_GOT32X); + + if (valid_p) + *no_dynreloc_p = true; diff --git a/package/binutils/2.37/0007-i386-Allow-GOT32-relocations-against-ABS-symbols.patch b/package/binutils/2.37/0007-i386-Allow-GOT32-relocations-against-ABS-symbols.patch new file mode 100644 index 0000000000..3e29282261 --- /dev/null +++ b/package/binutils/2.37/0007-i386-Allow-GOT32-relocations-against-ABS-symbols.patch @@ -0,0 +1,47 @@ +From 30a954525f4e53a9cd50a1a8a6f201c7cf6595c7 Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" +Date: Mon, 7 Feb 2022 15:22:19 -0800 +Subject: [PATCH] i386: Allow GOT32 relocations against ABS symbols + +GOT32 relocations are allowed since absolute value + addend is stored in +the GOT slot. + +Tested on glibc 2.35 build with GCC 11.2 and -Os. + +bfd/ + + PR ld/28870 + * elfxx-x86.c (_bfd_elf_x86_valid_reloc_p): Also allow GOT32 + relocations. + + +Signed-off-by: Waldemar Brodkorb + +diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c +index 7ac2411fc80..d00dc45677b 100644 +--- a/bfd/elfxx-x86.c ++++ b/bfd/elfxx-x86.c +@@ -1942,9 +1942,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section, + irel = *rel; + + /* Only allow relocations against absolute symbol, which can be +- resolved as absolute value + addend. GOTPCREL relocations +- are allowed since absolute value + addend is stored in the +- GOT slot. */ ++ resolved as absolute value + addend. GOTPCREL and GOT32 ++ relocations are allowed since absolute value + addend is ++ stored in the GOT slot. */ + if (bed->target_id == X86_64_ELF_DATA) + { + r_type &= ~R_X86_64_converted_reloc_bit; +@@ -1965,7 +1965,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section, + else + valid_p = (r_type == R_386_32 + || r_type == R_386_16 +- || r_type == R_386_8); ++ || r_type == R_386_8 ++ || r_type == R_386_GOT32 ++ || r_type == R_386_GOT32X); + + if (valid_p) + *no_dynreloc_p = true; From arnout at mind.be Mon Feb 14 21:06:46 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 14 Feb 2022 22:06:46 +0100 Subject: [Buildroot] [PATCH 1/2] package/binutils: fixes glibc build compiled with -Os on x86 In-Reply-To: References: Message-ID: On 11/02/2022 19:06, Waldemar Brodkorb wrote: > See here: > https://sourceware.org/bugzilla/show_bug.cgi?id=28870 > > Signed-off-by: Waldemar Brodkorb Applied to master, thanks. Regards, Arnout > --- > ...OT32-relocations-against-ABS-symbols.patch | 46 ++++++++++++++++ > ...OT32-relocations-against-ABS-symbols.patch | 53 +++++++++++++++++++ > ...OT32-relocations-against-ABS-symbols.patch | 47 ++++++++++++++++ > 3 files changed, 146 insertions(+) > create mode 100644 package/binutils/2.35.2/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch > create mode 100644 package/binutils/2.36.1/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch > create mode 100644 package/binutils/2.37/0007-i386-Allow-GOT32-relocations-against-ABS-symbols.patch > > diff --git a/package/binutils/2.35.2/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch b/package/binutils/2.35.2/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch > new file mode 100644 > index 0000000000..e95eb1e7c5 > --- /dev/null > +++ b/package/binutils/2.35.2/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch > @@ -0,0 +1,46 @@ > +From 30a954525f4e53a9cd50a1a8a6f201c7cf6595c7 Mon Sep 17 00:00:00 2001 > +From: "H.J. Lu" > +Date: Mon, 7 Feb 2022 15:22:19 -0800 > +Subject: [PATCH] i386: Allow GOT32 relocations against ABS symbols > + > +GOT32 relocations are allowed since absolute value + addend is stored in > +the GOT slot. > + > +Tested on glibc 2.35 build with GCC 11.2 and -Os. > + > +bfd/ > + > + PR ld/28870 > + * elfxx-x86.c (_bfd_elf_x86_valid_reloc_p): Also allow GOT32 > + relocations. > + > +Signed-off-by: Waldemar Brodkorb > + > +diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c > +index 7ac2411fc80..d00dc45677b 100644 > +--- a/bfd/elfxx-x86.c > ++++ b/bfd/elfxx-x86.c > +@@ -1942,9 +1942,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section, > + irel = *rel; > + > + /* Only allow relocations against absolute symbol, which can be > +- resolved as absolute value + addend. GOTPCREL relocations > +- are allowed since absolute value + addend is stored in the > +- GOT slot. */ > ++ resolved as absolute value + addend. GOTPCREL and GOT32 > ++ relocations are allowed since absolute value + addend is > ++ stored in the GOT slot. */ > + if (bed->target_id == X86_64_ELF_DATA) > + { > + r_type &= ~R_X86_64_converted_reloc_bit; > +@@ -1965,7 +1965,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section, > + else > + valid_p = (r_type == R_386_32 > + || r_type == R_386_16 > +- || r_type == R_386_8); > ++ || r_type == R_386_8 > ++ || r_type == R_386_GOT32 > ++ || r_type == R_386_GOT32X); > + > + if (valid_p) > + *no_dynreloc_p = true; > diff --git a/package/binutils/2.36.1/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch b/package/binutils/2.36.1/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch > new file mode 100644 > index 0000000000..af96f1a0f0 > --- /dev/null > +++ b/package/binutils/2.36.1/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch > @@ -0,0 +1,53 @@ > +From 30a954525f4e53a9cd50a1a8a6f201c7cf6595c7 Mon Sep 17 00:00:00 2001 > +From: "H.J. Lu" > +Date: Mon, 7 Feb 2022 15:22:19 -0800 > +Subject: [PATCH] i386: Allow GOT32 relocations against ABS symbols > + > +GOT32 relocations are allowed since absolute value + addend is stored in > +the GOT slot. > + > +Tested on glibc 2.35 build with GCC 11.2 and -Os. > + > +bfd/ > + > + PR ld/28870 > + * elfxx-x86.c (_bfd_elf_x86_valid_reloc_p): Also allow GOT32 > + relocations. > + > +ld/ > + > + PR ld/28870 > + * testsuite/ld-i386/i386.exp: Run pr28870. > + * testsuite/ld-i386/pr28870.d: New file. > + * testsuite/ld-i386/pr28870.s: Likewise. > + > +Signed-off-by: Waldemar Brodkorb > + > +diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c > +index 7ac2411fc80..d00dc45677b 100644 > +--- a/bfd/elfxx-x86.c > ++++ b/bfd/elfxx-x86.c > +@@ -1942,9 +1942,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section, > + irel = *rel; > + > + /* Only allow relocations against absolute symbol, which can be > +- resolved as absolute value + addend. GOTPCREL relocations > +- are allowed since absolute value + addend is stored in the > +- GOT slot. */ > ++ resolved as absolute value + addend. GOTPCREL and GOT32 > ++ relocations are allowed since absolute value + addend is > ++ stored in the GOT slot. */ > + if (bed->target_id == X86_64_ELF_DATA) > + { > + r_type &= ~R_X86_64_converted_reloc_bit; > +@@ -1965,7 +1965,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section, > + else > + valid_p = (r_type == R_386_32 > + || r_type == R_386_16 > +- || r_type == R_386_8); > ++ || r_type == R_386_8 > ++ || r_type == R_386_GOT32 > ++ || r_type == R_386_GOT32X); > + > + if (valid_p) > + *no_dynreloc_p = true; > diff --git a/package/binutils/2.37/0007-i386-Allow-GOT32-relocations-against-ABS-symbols.patch b/package/binutils/2.37/0007-i386-Allow-GOT32-relocations-against-ABS-symbols.patch > new file mode 100644 > index 0000000000..3e29282261 > --- /dev/null > +++ b/package/binutils/2.37/0007-i386-Allow-GOT32-relocations-against-ABS-symbols.patch > @@ -0,0 +1,47 @@ > +From 30a954525f4e53a9cd50a1a8a6f201c7cf6595c7 Mon Sep 17 00:00:00 2001 > +From: "H.J. Lu" > +Date: Mon, 7 Feb 2022 15:22:19 -0800 > +Subject: [PATCH] i386: Allow GOT32 relocations against ABS symbols > + > +GOT32 relocations are allowed since absolute value + addend is stored in > +the GOT slot. > + > +Tested on glibc 2.35 build with GCC 11.2 and -Os. > + > +bfd/ > + > + PR ld/28870 > + * elfxx-x86.c (_bfd_elf_x86_valid_reloc_p): Also allow GOT32 > + relocations. > + > + > +Signed-off-by: Waldemar Brodkorb > + > +diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c > +index 7ac2411fc80..d00dc45677b 100644 > +--- a/bfd/elfxx-x86.c > ++++ b/bfd/elfxx-x86.c > +@@ -1942,9 +1942,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section, > + irel = *rel; > + > + /* Only allow relocations against absolute symbol, which can be > +- resolved as absolute value + addend. GOTPCREL relocations > +- are allowed since absolute value + addend is stored in the > +- GOT slot. */ > ++ resolved as absolute value + addend. GOTPCREL and GOT32 > ++ relocations are allowed since absolute value + addend is > ++ stored in the GOT slot. */ > + if (bed->target_id == X86_64_ELF_DATA) > + { > + r_type &= ~R_X86_64_converted_reloc_bit; > +@@ -1965,7 +1965,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section, > + else > + valid_p = (r_type == R_386_32 > + || r_type == R_386_16 > +- || r_type == R_386_8); > ++ || r_type == R_386_8 > ++ || r_type == R_386_GOT32 > ++ || r_type == R_386_GOT32X); > + > + if (valid_p) > + *no_dynreloc_p = true; From ps.report at gmx.net Mon Feb 14 21:10:50 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Mon, 14 Feb 2022 22:10:50 +0100 Subject: [Buildroot] [PATCH v1 1/2] package/ell: bump version to 0.48 Message-ID: <20220214211051.22421-1-ps.report@gmx.net> - Changelog (since 0.47, from [1]): ver 0.48: Fix issue with memory leaking from ICMPv6 RA. [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 cd724eae2d..4bde1ab677 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 4901a0baac4eb24163ceafb44fd448430361d25d8f17d89ff29f8b0b162b3eb9 ell-0.47.tar.xz +sha256 9894943042a5d6165d3e5cc354f92274fb1304004d02b4bee682ab6067cdbbd5 ell-0.48.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/ell/ell.mk b/package/ell/ell.mk index 3ce64b6f2f..267b44e5f0 100644 --- a/package/ell/ell.mk +++ b/package/ell/ell.mk @@ -4,7 +4,7 @@ # ################################################################################ -ELL_VERSION = 0.47 +ELL_VERSION = 0.48 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 Feb 14 21:10:51 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Mon, 14 Feb 2022 22:10:51 +0100 Subject: [Buildroot] [PATCH v1 2/2] package/iwd: bump version to 1.24 In-Reply-To: <20220214211051.22421-1-ps.report@gmx.net> References: <20220214211051.22421-1-ps.report@gmx.net> Message-ID: <20220214211051.22421-2-ps.report@gmx.net> - remove 001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch (upstream applied [1]) - Changelog (since 1.21, from [2]): ver 1.24: Fix issue with handshake and missing rekeying support. Fix issue with BSS ranking and zero signal strength. Fix issue with setting OWE IE length correctly. ver 1.23: Fix issue with handling handshake offloading. Fix issue with at_console and D-Bus policy. ver 1.22: Fix issue with handling periodic scanning. Fix issue with handling scanning completion. Fix issue with handling scanning for OWE auto-connect. Add support for additional DPP features. [1] https://git.kernel.org/pub/scm/network/wireless/iwd.git/commit/?id=6ce41f621154eff0145dab41308bc145c0440f16 [2] https://git.kernel.org/pub/scm/network/wireless/iwd.git/tree/ChangeLog Signed-off-by: Peter Seiderer --- ...-declaration-of-function-explicit_bz.patch | 41 ------------------- package/iwd/iwd.hash | 2 +- package/iwd/iwd.mk | 2 +- 3 files changed, 2 insertions(+), 43 deletions(-) delete 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 deleted file mode 100644 index 3e808deb88..0000000000 --- a/package/iwd/0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 6ce41f621154eff0145dab41308bc145c0440f16 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Mon, 10 Jan 2022 22:32:18 +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); - | ^~~~~~~~~~~~~~ - -[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 8e34d2983f..1a58ec88e8 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 bac891df91c605271e91b73cf0015e1ba86ff784347e53fc67601366859b3851 iwd-1.21.tar.xz +sha256 61b5e48380cd3a6d0529f725eb6974157f1410af165f5d266b87add0bf395224 iwd-1.24.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/iwd/iwd.mk b/package/iwd/iwd.mk index a70da86ecc..548b508edb 100644 --- a/package/iwd/iwd.mk +++ b/package/iwd/iwd.mk @@ -4,7 +4,7 @@ # ################################################################################ -IWD_VERSION = 1.21 +IWD_VERSION = 1.24 IWD_SOURCE = iwd-$(IWD_VERSION).tar.xz IWD_SITE = $(BR2_KERNEL_MIRROR)/linux/network/wireless IWD_LICENSE = LGPL-2.1+ -- 2.34.1 From arnout at mind.be Mon Feb 14 21:16:19 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 14 Feb 2022 22:16:19 +0100 Subject: [Buildroot] [PATCH 2/2] package/{glibc, localedef}: update to 2.35 In-Reply-To: References: Message-ID: <1b0d866f-fc09-f23d-3fae-068858ab5304@mind.be> On 11/02/2022 19:08, Waldemar Brodkorb wrote: > https://sourceware.org/pipermail/libc-alpha/2022-February/136040.html > > - allow to use optimization CFLAGS (not CPPFLAGS) which are nowadays > supported by upstream (except nios2) > - enable support for or1k, which is now included upstream > - runtime tested with qemu-system for aarch64/arm/microblaze/mips/mips64/nios2/ > or1k/powerpc/powerpc64/powerpc64le/riscv32/riscv64/s390x/sh4/sparc64/x86/x86_64 > > Signed-off-by: Waldemar Brodkorb > --- > ...v-linux-microblaze-pselect32.c-add-m.patch | 85 ------------------- > .../glibc.hash | 2 +- > package/glibc/glibc.mk | 16 ++-- > ...ACK-only-build-and-install-localedef.patch | 0 > ...y-on-GCC-to-4.8-and-binutils-to-2.24.patch | 0 > .../localedef.hash | 2 +- > package/localedef/localedef.mk | 2 +- > toolchain/toolchain-buildroot/Config.in | 3 +- > 8 files changed, 15 insertions(+), 95 deletions(-) > delete mode 100644 package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch > rename package/glibc/{2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c => 2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586}/glibc.hash (70%) > rename package/localedef/{2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c => 2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586}/0001-HACK-only-build-and-install-localedef.patch (100%) > rename package/localedef/{2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c => 2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586}/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch (100%) > rename package/localedef/{2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c => 2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586}/localedef.hash (70%) with the removal of the csky fork in commit ebc6c7e, there's no longer a need to version the patches, so perhaps you could take this opportunity to move them out of the directory. [snip] > diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk > index 2702994c6b..f258f33c96 100644 > --- a/package/glibc/glibc.mk > +++ b/package/glibc/glibc.mk > @@ -7,7 +7,7 @@ > # Generate version string using: > # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- > # When updating the version, please also update localedef > -GLIBC_VERSION = 2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c > +GLIBC_VERSION = 2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586 > # Upstream doesn't officially provide an https download link. > # There is one (https://sourceware.org/git/glibc.git) but it's not reliable, > # sometimes the connection times out. So use an unofficial github mirror. > @@ -110,16 +110,20 @@ endif > # > # 2. We have to execute the configure script with bash and not sh. > # > -# Note that as mentionned in > -# http://patches.openembedded.org/patch/38849/, glibc must be > -# built with -O2, so we pass our own CFLAGS and CXXFLAGS below. > +# Glibc nowadays can be build with optimization flags f.e. -Os > + > +# crash in qemu-system-nios2 with -Os > +ifeq ($(BR2_nios2),y) > +TARGET_FCFLAGS := -O2 You're overriding the global TARGET_FCFLAGS here, that's not allowed. Instead, you should use GLIBC_CFLAGS = $(TARGET_CFLAGS) # crash in qemu-system-nios2 with -Os ifeq ($(BR2_nios2),y) GLIBC_CFLAGS += -O2 endif (I'm not sure if += is OK here, if not, just use =) And to make the below simpler, you can use GLIBC_CFLAGS += $(GLIBC_EXTRA_CFLAGS) Alternatively, if += is OK for nios, you can use ifeq ($(BR2_nios2),y) GLIBC_EXTRA_CFLAGS += -O2 endif ... CFLAGS="$(TARGET_CFLAGS) $(GLIBC_EXTRA_CFLAGS)" \ > +endif > + > define GLIBC_CONFIGURE_CMDS > mkdir -p $(@D)/build > # Do the configuration > (cd $(@D)/build; \ > $(TARGET_CONFIGURE_OPTS) \ > - CFLAGS="-O2 $(GLIBC_EXTRA_CFLAGS)" CPPFLAGS="" \ > - CXXFLAGS="-O2 $(GLIBC_EXTRA_CFLAGS)" \ > + CFLAGS="$(TARGET_FCFLAGS) $(GLIBC_EXTRA_CFLAGS)" CPPFLAGS="" \ FCFLAGS stands for Fortran Compilation flags. You should use TARGET_CFLAGS here. Why is CPPFLAGS not set? Marked as Changes Requested. Regards, Arnout > + CXXFLAGS="$(TARGET_FCFLAGS) $(GLIBC_EXTRA_CFLAGS)" \ > $(GLIBC_CONF_ENV) \ > $(SHELL) $(@D)/configure \ > --target=$(GNU_TARGET_NAME) \ > diff --git a/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-HACK-only-build-and-install-localedef.patch b/package/localedef/2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586/0001-HACK-only-build-and-install-localedef.patch > similarity index 100% > rename from package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-HACK-only-build-and-install-localedef.patch > rename to package/localedef/2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586/0001-HACK-only-build-and-install-localedef.patch > diff --git a/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch b/package/localedef/2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch > similarity index 100% > rename from package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch > rename to package/localedef/2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch > diff --git a/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/localedef.hash b/package/localedef/2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586/localedef.hash > similarity index 70% > rename from package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/localedef.hash > rename to package/localedef/2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586/localedef.hash > index dfd939020f..f28c15c2a3 100644 > --- a/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/localedef.hash > +++ b/package/localedef/2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586/localedef.hash > @@ -1,5 +1,5 @@ > # Locally calculated (fetched from Github) > -sha256 3c299a21468a80356b848ca341f45551616c4928a6c871e6d45cee942e8b0f24 glibc-2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c.tar.gz > +sha256 0ca43b2a6cd74609519554303a16e350abdac0e66943c5d98d91228233c826a0 glibc-2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586.tar.gz > > # Hashes for license files > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > diff --git a/package/localedef/localedef.mk b/package/localedef/localedef.mk > index f8f0b42984..fb5edde0c2 100644 > --- a/package/localedef/localedef.mk > +++ b/package/localedef/localedef.mk > @@ -7,7 +7,7 @@ > # Use the same VERSION and SITE as target glibc > # As in glibc.mk, generate version string using: > # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- > -LOCALEDEF_VERSION = 2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c > +LOCALEDEF_VERSION = 2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586 > LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION).tar.gz > LOCALEDEF_SITE = $(call github,bminor,glibc,$(LOCALEDEF_VERSION)) > HOST_LOCALEDEF_DL_SUBDIR = glibc > diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in > index 4004c0edf8..437daafa74 100644 > --- a/toolchain/toolchain-buildroot/Config.in > +++ b/toolchain/toolchain-buildroot/Config.in > @@ -49,7 +49,8 @@ config BR2_TOOLCHAIN_BUILDROOT_GLIBC > BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le || \ > BR2_riscv || BR2_s390x || BR2_sh || \ > BR2_sparc64 || BR2_x86_64 || BR2_microblaze || \ > - BR2_nios2 || (BR2_arc && BR2_ARC_ATOMIC_EXT) || BR2_csky > + BR2_nios2 || (BR2_arc && BR2_ARC_ATOMIC_EXT) || \ > + BR2_csky || BR2_or1k > depends on BR2_USE_MMU > depends on !BR2_STATIC_LIBS > depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 From arnout at mind.be Mon Feb 14 21:16:48 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 14 Feb 2022 22:16:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/rng-tools: bump to version 6.15 In-Reply-To: <20220209192436.319769-1-fontaine.fabrice@gmail.com> References: <20220209192436.319769-1-fontaine.fabrice@gmail.com> Message-ID: <285e485d-146e-6199-3eb7-1b1dcaccfdea@mind.be> On 09/02/2022 20:24, Fabrice Fontaine wrote: > Drop patches (already in version) > > https://github.com/nhorman/rng-tools/releases/tag/v6.15 > > Signed-off-by: Fabrice Fontaine Applied to next, thanks. Regards, Arnout > --- > ...ct-non-posix-extensions-for-pthreads.patch | 43 ---------------- > ...-either-pthread-affinity-set-methods.patch | 49 ------------------- > package/rng-tools/rng-tools.hash | 2 +- > package/rng-tools/rng-tools.mk | 2 +- > 4 files changed, 2 insertions(+), 94 deletions(-) > delete mode 100644 package/rng-tools/0001-Adding-ability-to-detect-non-posix-extensions-for-pthreads.patch > delete mode 100644 package/rng-tools/0002-Allow-for-use-of-either-pthread-affinity-set-methods.patch > > 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 > deleted file mode 100644 > index ba6cf63d7c..0000000000 > --- a/package/rng-tools/0001-Adding-ability-to-detect-non-posix-extensions-for-pthreads.patch > +++ /dev/null > @@ -1,43 +0,0 @@ > -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 > deleted file mode 100644 > index 17285baa6a..0000000000 > --- a/package/rng-tools/0002-Allow-for-use-of-either-pthread-affinity-set-methods.patch > +++ /dev/null > @@ -1,49 +0,0 @@ > -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; > - } > diff --git a/package/rng-tools/rng-tools.hash b/package/rng-tools/rng-tools.hash > index 6806a99fc6..be2ee13969 100644 > --- a/package/rng-tools/rng-tools.hash > +++ b/package/rng-tools/rng-tools.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 4dd86f6ae37d917a8489f44070d39d7feddcc622429b95efd7aa85a1f3cfdf81 rng-tools-6.14.tar.gz > +sha256 bff0c58dff90ec10bd61f672e48618e045155eabd60b32d63a9c4ffbdad05f3a rng-tools-6.15.tar.gz > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > diff --git a/package/rng-tools/rng-tools.mk b/package/rng-tools/rng-tools.mk > index 8db97569d4..8b195ea875 100644 > --- a/package/rng-tools/rng-tools.mk > +++ b/package/rng-tools/rng-tools.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -RNG_TOOLS_VERSION = 6.14 > +RNG_TOOLS_VERSION = 6.15 > RNG_TOOLS_SITE = $(call github,nhorman,$(RNG_TOOLS_NAME),v$(RNG_TOOLS_VERSION)) > RNG_TOOLS_LICENSE = GPL-2.0 > RNG_TOOLS_LICENSE_FILES = COPYING From arnout at mind.be Mon Feb 14 21:17:07 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 14 Feb 2022 22:17:07 +0100 Subject: [Buildroot] [PATCHv2] package/poke: bump to version 2.1 In-Reply-To: <20220209002308.137832-1-romain.naour@gmail.com> References: <20220209002308.137832-1-romain.naour@gmail.com> Message-ID: On 09/02/2022 01:23, Romain Naour wrote: > Tested locally with poke testsuite on aarch64 with Qemu: > > === poke Summary === > # of expected passes 6320 > # of unsupported tests 7 > > Build tested with test-pkg: > https://gitlab.com/kubu93/buildroot/-/pipelines/466516470 > > See: > http://www.jemarch.net/poke-2.0-relnotes.html > http://www.jemarch.net/poke-2.1-relnotes.html > > Signed-off-by: Romain Naour Applied to next, thanks. Regards, Arnout > --- > test-pkg config: > BR2_PACKAGE_POKE=y > BR2_PACKAGE_JSON_C=y > > v2: poke 2.0 had a issue with minimal-threading on > several architectures (not only ARM thumb2), this feature > is now disabled by default with poke 2.1. > --- > ...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..c30713b91c 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 cd528e6c1bbc540c3b629c2b4f36b784b30a026b005a38b99283422599442670 poke-2.1.tar.gz > sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING > sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 jitter/COPYING > diff --git a/package/poke/poke.mk b/package/poke/poke.mk > index ddd03ae3b0..2852673548 100644 > --- a/package/poke/poke.mk > +++ b/package/poke/poke.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -POKE_VERSION = 1.4 > +POKE_VERSION = 2.1 > 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) From arnout at mind.be Mon Feb 14 21:17:26 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 14 Feb 2022 22:17:26 +0100 Subject: [Buildroot] [PATCH v1] package/libxkbcommon: bump version to 1.4.0 In-Reply-To: <20220208222024.24167-1-ps.report@gmx.net> References: <20220208222024.24167-1-ps.report@gmx.net> Message-ID: <9d793689-0558-b9b7-e109-593e3723d066@mind.be> On 08/02/2022 23:20, Peter Seiderer wrote: > - bump version to 1.4.0 > > - add new option to select some tools for the target (xkbcli, > xkbcli-compile-keymap, xkbcli-how-to-type, xkbcli-interactive-evdev, > xkbcli-interactive-x11, xkbcli-interactive-wayland > > For details see [1]. > > [1] https://lists.freedesktop.org/archives/wayland-devel/2022-February/042104.html > > Signed-off-by: Peter Seiderer Applied to master, thanks. Regards, Arnout > --- > package/libxkbcommon/Config.in | 11 +++++++++++ > package/libxkbcommon/libxkbcommon.hash | 4 ++-- > package/libxkbcommon/libxkbcommon.mk | 8 +++++++- > 3 files changed, 20 insertions(+), 3 deletions(-) > > diff --git a/package/libxkbcommon/Config.in b/package/libxkbcommon/Config.in > index 4e73a24abb..e9f61227a0 100644 > --- a/package/libxkbcommon/Config.in > +++ b/package/libxkbcommon/Config.in > @@ -7,3 +7,14 @@ config BR2_PACKAGE_LIBXKBCOMMON > specification. > > https://xkbcommon.org > + > +if BR2_PACKAGE_LIBXKBCOMMON > + > +config BR2_PACKAGE_LIBXKBCOMMON_TOOLS > + bool "tools" > + help > + Tools: xkbcli, xkbcli-compile-keymap, xkbcli-how-to-type, > + xkbcli-interactive-evdev, xkbcli-interactive-x11, > + xkbcli-interactive-wayland > + > +endif > diff --git a/package/libxkbcommon/libxkbcommon.hash b/package/libxkbcommon/libxkbcommon.hash > index c00fffe706..fff2b7a943 100644 > --- a/package/libxkbcommon/libxkbcommon.hash > +++ b/package/libxkbcommon/libxkbcommon.hash > @@ -1,5 +1,5 @@ > -# From https://lists.freedesktop.org/archives/wayland-devel/2021-September/041976.html > -sha256 b3c710d27a2630054e1e1399c85b7f330ef03359b460f0c1b3b587fd01fe9234 libxkbcommon-1.3.1.tar.xz > +# From https://lists.freedesktop.org/archives/wayland-devel/2022-February/042104.html > +sha256 106cec5263f9100a7e79b5f7220f889bc78e7d7ffc55d2b6fdb1efefb8024031 libxkbcommon-1.4.0.tar.xz > > # License file: > sha256 086caee279449369d41c1157911ec7696e707b93feba7280de757d3c470b2dfb LICENSE > diff --git a/package/libxkbcommon/libxkbcommon.mk b/package/libxkbcommon/libxkbcommon.mk > index ee2bc1ee99..f2c49cc700 100644 > --- a/package/libxkbcommon/libxkbcommon.mk > +++ b/package/libxkbcommon/libxkbcommon.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBXKBCOMMON_VERSION = 1.3.1 > +LIBXKBCOMMON_VERSION = 1.4.0 > LIBXKBCOMMON_SITE = https://xkbcommon.org/download > LIBXKBCOMMON_SOURCE = libxkbcommon-$(LIBXKBCOMMON_VERSION).tar.xz > LIBXKBCOMMON_LICENSE = MIT/X11 > @@ -23,4 +23,10 @@ else > LIBXKBCOMMON_CONF_OPTS += -Denable-x11=false > endif > > +ifeq ($(BR2_PACKAGE_LIBXKBCOMMON_TOOLS),y) > +LIBXKBCOMMON_CONF_OPTS += -Denable-tools=true > +else > +LIBXKBCOMMON_CONF_OPTS += -Denable-tools=false > +endif > + > $(eval $(meson-package)) From arnout at mind.be Mon Feb 14 21:17:41 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 14 Feb 2022 22:17:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/liquid-dsp: bump version to 1.4.0 In-Reply-To: <20220208121928.28519-1-guillaume.bressaix@gmail.com> References: <20220208121928.28519-1-guillaume.bressaix@gmail.com> Message-ID: <1fbce0dc-9ab5-cb94-bd17-29c18200f20b@mind.be> On 08/02/2022 13:19, Guillaume W. Bres wrote: > Signed-off-by: Guillaume W. Bres Applied to master, thanks. Regards, Arnout > --- > package/liquid-dsp/liquid-dsp.hash | 4 ++-- > package/liquid-dsp/liquid-dsp.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/liquid-dsp/liquid-dsp.hash b/package/liquid-dsp/liquid-dsp.hash > index 31bcd68767..7e5de6b259 100644 > --- a/package/liquid-dsp/liquid-dsp.hash > +++ b/package/liquid-dsp/liquid-dsp.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 85093624ef9cb90ead64c836d2f42690197edace1a86257d6524c4e4dc870483 liquid-dsp-1.3.2.tar.gz > -sha256 4df7126196efba1283deb99e3269418dde4ab0ad1fde80a55051153451eb4df2 LICENSE > +sha256 66f38d509aa8f6207d2035bae5ee081a3d9df0f2cab516bc2118b5b1c6ce3333 liquid-dsp-1.4.0.tar.gz > +sha256 4df7126196efba1283deb99e3269418dde4ab0ad1fde80a55051153451eb4df2 LICENSE > diff --git a/package/liquid-dsp/liquid-dsp.mk b/package/liquid-dsp/liquid-dsp.mk > index 9745893b7c..fcdf572532 100644 > --- a/package/liquid-dsp/liquid-dsp.mk > +++ b/package/liquid-dsp/liquid-dsp.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIQUID_DSP_VERSION = 1.3.2 > +LIQUID_DSP_VERSION = 1.4.0 > LIQUID_DSP_SITE = $(call github,jgaeddert,liquid-dsp,v$(LIQUID_DSP_VERSION)) > LIQUID_DSP_LICENSE = MIT > LIQUID_DSP_LICENSE_FILES = LICENSE From arnout at mind.be Mon Feb 14 21:01:57 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Feb 2022 22:01:57 +0100 Subject: [Buildroot] [git commit branch/next] package/libxkbcommon: bump version to 1.4.0 Message-ID: <20220214211017.1657C82BDB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=948050c0f9096953555ed7f84835c5297a415a6d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - bump version to 1.4.0 - add new option to select some tools for the target (xkbcli, xkbcli-compile-keymap, xkbcli-how-to-type, xkbcli-interactive-evdev, xkbcli-interactive-x11, xkbcli-interactive-wayland For details see [1]. [1] https://lists.freedesktop.org/archives/wayland-devel/2022-February/042104.html Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libxkbcommon/Config.in | 11 +++++++++++ package/libxkbcommon/libxkbcommon.hash | 4 ++-- package/libxkbcommon/libxkbcommon.mk | 8 +++++++- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/package/libxkbcommon/Config.in b/package/libxkbcommon/Config.in index 4e73a24abb..e9f61227a0 100644 --- a/package/libxkbcommon/Config.in +++ b/package/libxkbcommon/Config.in @@ -7,3 +7,14 @@ config BR2_PACKAGE_LIBXKBCOMMON specification. https://xkbcommon.org + +if BR2_PACKAGE_LIBXKBCOMMON + +config BR2_PACKAGE_LIBXKBCOMMON_TOOLS + bool "tools" + help + Tools: xkbcli, xkbcli-compile-keymap, xkbcli-how-to-type, + xkbcli-interactive-evdev, xkbcli-interactive-x11, + xkbcli-interactive-wayland + +endif diff --git a/package/libxkbcommon/libxkbcommon.hash b/package/libxkbcommon/libxkbcommon.hash index c00fffe706..fff2b7a943 100644 --- a/package/libxkbcommon/libxkbcommon.hash +++ b/package/libxkbcommon/libxkbcommon.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2021-September/041976.html -sha256 b3c710d27a2630054e1e1399c85b7f330ef03359b460f0c1b3b587fd01fe9234 libxkbcommon-1.3.1.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2022-February/042104.html +sha256 106cec5263f9100a7e79b5f7220f889bc78e7d7ffc55d2b6fdb1efefb8024031 libxkbcommon-1.4.0.tar.xz # License file: sha256 086caee279449369d41c1157911ec7696e707b93feba7280de757d3c470b2dfb LICENSE diff --git a/package/libxkbcommon/libxkbcommon.mk b/package/libxkbcommon/libxkbcommon.mk index ee2bc1ee99..f2c49cc700 100644 --- a/package/libxkbcommon/libxkbcommon.mk +++ b/package/libxkbcommon/libxkbcommon.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBXKBCOMMON_VERSION = 1.3.1 +LIBXKBCOMMON_VERSION = 1.4.0 LIBXKBCOMMON_SITE = https://xkbcommon.org/download LIBXKBCOMMON_SOURCE = libxkbcommon-$(LIBXKBCOMMON_VERSION).tar.xz LIBXKBCOMMON_LICENSE = MIT/X11 @@ -23,4 +23,10 @@ else LIBXKBCOMMON_CONF_OPTS += -Denable-x11=false endif +ifeq ($(BR2_PACKAGE_LIBXKBCOMMON_TOOLS),y) +LIBXKBCOMMON_CONF_OPTS += -Denable-tools=true +else +LIBXKBCOMMON_CONF_OPTS += -Denable-tools=false +endif + $(eval $(meson-package)) From arnout at mind.be Mon Feb 14 21:01:55 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Feb 2022 22:01:55 +0100 Subject: [Buildroot] [git commit branch/next] package/liquid-dsp: bump version to 1.4.0 Message-ID: <20220214211017.0D35982A50@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2f7f8f381394207bfb029ec395f5ced5695a0a2e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Guillaume W. Bres Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/liquid-dsp/liquid-dsp.hash | 4 ++-- package/liquid-dsp/liquid-dsp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/liquid-dsp/liquid-dsp.hash b/package/liquid-dsp/liquid-dsp.hash index 31bcd68767..7e5de6b259 100644 --- a/package/liquid-dsp/liquid-dsp.hash +++ b/package/liquid-dsp/liquid-dsp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 85093624ef9cb90ead64c836d2f42690197edace1a86257d6524c4e4dc870483 liquid-dsp-1.3.2.tar.gz -sha256 4df7126196efba1283deb99e3269418dde4ab0ad1fde80a55051153451eb4df2 LICENSE +sha256 66f38d509aa8f6207d2035bae5ee081a3d9df0f2cab516bc2118b5b1c6ce3333 liquid-dsp-1.4.0.tar.gz +sha256 4df7126196efba1283deb99e3269418dde4ab0ad1fde80a55051153451eb4df2 LICENSE diff --git a/package/liquid-dsp/liquid-dsp.mk b/package/liquid-dsp/liquid-dsp.mk index 9745893b7c..fcdf572532 100644 --- a/package/liquid-dsp/liquid-dsp.mk +++ b/package/liquid-dsp/liquid-dsp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIQUID_DSP_VERSION = 1.3.2 +LIQUID_DSP_VERSION = 1.4.0 LIQUID_DSP_SITE = $(call github,jgaeddert,liquid-dsp,v$(LIQUID_DSP_VERSION)) LIQUID_DSP_LICENSE = MIT LIQUID_DSP_LICENSE_FILES = LICENSE From arnout at mind.be Mon Feb 14 21:02:03 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Feb 2022 22:02:03 +0100 Subject: [Buildroot] [git commit branch/next] package/rng-tools: bump to version 6.15 Message-ID: <20220214211017.2A18A82A50@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=91cc129d72cf972c906829b1085c96797e41efd0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop patches (already in version) https://github.com/nhorman/rng-tools/releases/tag/v6.15 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...-detect-non-posix-extensions-for-pthreads.patch | 43 ------------------- ...se-of-either-pthread-affinity-set-methods.patch | 49 ---------------------- package/rng-tools/rng-tools.hash | 2 +- package/rng-tools/rng-tools.mk | 2 +- 4 files changed, 2 insertions(+), 94 deletions(-) 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 deleted file mode 100644 index ba6cf63d7c..0000000000 --- a/package/rng-tools/0001-Adding-ability-to-detect-non-posix-extensions-for-pthreads.patch +++ /dev/null @@ -1,43 +0,0 @@ -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 deleted file mode 100644 index 17285baa6a..0000000000 --- a/package/rng-tools/0002-Allow-for-use-of-either-pthread-affinity-set-methods.patch +++ /dev/null @@ -1,49 +0,0 @@ -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; - } diff --git a/package/rng-tools/rng-tools.hash b/package/rng-tools/rng-tools.hash index 6806a99fc6..be2ee13969 100644 --- a/package/rng-tools/rng-tools.hash +++ b/package/rng-tools/rng-tools.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4dd86f6ae37d917a8489f44070d39d7feddcc622429b95efd7aa85a1f3cfdf81 rng-tools-6.14.tar.gz +sha256 bff0c58dff90ec10bd61f672e48618e045155eabd60b32d63a9c4ffbdad05f3a rng-tools-6.15.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/rng-tools/rng-tools.mk b/package/rng-tools/rng-tools.mk index 8db97569d4..8b195ea875 100644 --- a/package/rng-tools/rng-tools.mk +++ b/package/rng-tools/rng-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -RNG_TOOLS_VERSION = 6.14 +RNG_TOOLS_VERSION = 6.15 RNG_TOOLS_SITE = $(call github,nhorman,$(RNG_TOOLS_NAME),v$(RNG_TOOLS_VERSION)) RNG_TOOLS_LICENSE = GPL-2.0 RNG_TOOLS_LICENSE_FILES = COPYING From arnout at mind.be Mon Feb 14 21:02:00 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Feb 2022 22:02:00 +0100 Subject: [Buildroot] [git commit branch/next] package/poke: bump to version 2.1 Message-ID: <20220214211017.204BA82BDC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0fc614345f1b8389df46b8f2d64cb3ae5a209b6d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Tested locally with poke testsuite on aarch64 with Qemu: === poke Summary === # of expected passes 6320 # of unsupported tests 7 Build tested with test-pkg: https://gitlab.com/kubu93/buildroot/-/pipelines/466516470 See: http://www.jemarch.net/poke-2.0-relnotes.html http://www.jemarch.net/poke-2.1-relnotes.html Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...c-HELP2MAN-replace-by-true-when-cross-com.patch | 6 ++--- ...-getrandom.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..c30713b91c 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 cd528e6c1bbc540c3b629c2b4f36b784b30a026b005a38b99283422599442670 poke-2.1.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 jitter/COPYING diff --git a/package/poke/poke.mk b/package/poke/poke.mk index ddd03ae3b0..2852673548 100644 --- a/package/poke/poke.mk +++ b/package/poke/poke.mk @@ -4,7 +4,7 @@ # ################################################################################ -POKE_VERSION = 1.4 +POKE_VERSION = 2.1 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) From judge.packham at gmail.com Mon Feb 14 21:19:26 2022 From: judge.packham at gmail.com (Chris Packham) Date: Tue, 15 Feb 2022 10:19:26 +1300 Subject: [Buildroot] [PATCH 1/2] syslog-ng: Bump version to 3.35.1 Message-ID: <20220214211927.3673441-1-judge.packham@gmail.com> Signed-off-by: Chris Packham --- package/syslog-ng/syslog-ng.conf | 2 +- package/syslog-ng/syslog-ng.hash | 2 +- package/syslog-ng/syslog-ng.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/syslog-ng/syslog-ng.conf b/package/syslog-ng/syslog-ng.conf index 55d01501cb..64ff980593 100644 --- a/package/syslog-ng/syslog-ng.conf +++ b/package/syslog-ng/syslog-ng.conf @@ -1,4 +1,4 @@ - at version: 3.34 + at version: 3.35 source s_sys { file("/proc/kmsg" program_override("kernel")); diff --git a/package/syslog-ng/syslog-ng.hash b/package/syslog-ng/syslog-ng.hash index 99ed363eca..ab643627e8 100644 --- a/package/syslog-ng/syslog-ng.hash +++ b/package/syslog-ng/syslog-ng.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 cece39ec1c68c88d493705e0a528b83d038da384e89d4838393ccc75f62a2d4c syslog-ng-3.34.1.tar.gz +sha256 1d0238b06b3e5987c859e5b529ecee738f75bacff04b149398b1fe8cbb121e53 syslog-ng-3.35.1.tar.gz sha256 e912cf1e1c09b81d61c0154eb6c179588622c31ad07bfb4a90c612d07ff09d9b COPYING sha256 ce3324c9f22299cfc7c281e5a6ab40fbe9c2ea1a67cee87226cb8cd39db1e1d2 GPL.txt sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LGPL.txt diff --git a/package/syslog-ng/syslog-ng.mk b/package/syslog-ng/syslog-ng.mk index c05ec9785c..fc57a56820 100644 --- a/package/syslog-ng/syslog-ng.mk +++ b/package/syslog-ng/syslog-ng.mk @@ -6,7 +6,7 @@ # When updating the version, please check at runtime if the version in # syslog-ng.conf header needs to be updated -SYSLOG_NG_VERSION = 3.34.1 +SYSLOG_NG_VERSION = 3.35.1 SYSLOG_NG_SITE = https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$(SYSLOG_NG_VERSION) SYSLOG_NG_LICENSE = LGPL-2.1+ (syslog-ng core), GPL-2.0+ (modules) SYSLOG_NG_LICENSE_FILES = COPYING GPL.txt LGPL.txt -- 2.35.1 From judge.packham at gmail.com Mon Feb 14 21:19:27 2022 From: judge.packham at gmail.com (Chris Packham) Date: Tue, 15 Feb 2022 10:19:27 +1300 Subject: [Buildroot] [PATCH 2/2] micropython: Bump version to 1.18 In-Reply-To: <20220214211927.3673441-1-judge.packham@gmail.com> References: <20220214211927.3673441-1-judge.packham@gmail.com> Message-ID: <20220214211927.3673441-2-judge.packham@gmail.com> LICENSE hash is update due to change in copyright year. Signed-off-by: Chris Packham --- package/micropython/micropython.hash | 4 ++-- package/micropython/micropython.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/micropython/micropython.hash b/package/micropython/micropython.hash index d5045e8f27..6beea78bc7 100644 --- a/package/micropython/micropython.hash +++ b/package/micropython/micropython.hash @@ -1,3 +1,3 @@ #locally computed -sha256 c21dbf8144237b3dbe3847c9ad5264cd0f3104eb078c810b3986004cce8fcd70 micropython-1.17.tar.gz -sha256 59b1f0947a87c90d0d29dbe2c8deb3d1f8263bbbd2fb5ebcc79a649cff6dfcba LICENSE +sha256 d804a422872c6fe283c6e4fd392698472035b34b5a683ac26adbd5c7582267f9 micropython-1.18.tar.gz +sha256 0f678c2abd7fe2cfca36693630506bbcbdfc219bd04bf4a02fe3b094ae4c666f LICENSE diff --git a/package/micropython/micropython.mk b/package/micropython/micropython.mk index 55c00ba08a..d8ba5ac0c0 100644 --- a/package/micropython/micropython.mk +++ b/package/micropython/micropython.mk @@ -4,7 +4,7 @@ # ################################################################################ -MICROPYTHON_VERSION = 1.17 +MICROPYTHON_VERSION = 1.18 MICROPYTHON_SITE = $(call github,micropython,micropython,v$(MICROPYTHON_VERSION)) # Micropython has a lot of code copied from other projects, and also a number # of submodules for various libs. However, we don't even clone the submodules, -- 2.35.1 From fontaine.fabrice at gmail.com Mon Feb 14 21:23:01 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 14 Feb 2022 22:23:01 +0100 Subject: [Buildroot] [PATCH v2,1/1] package/ghostscript: disable tesseract Message-ID: <20220214212301.4142823-1-fontaine.fabrice@gmail.com> ghostscript embeds a local copy of tesseract-ocr which is enabled by default since version 9.53.0 and https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=7322ef87546c55b29056c1d96d8bdbb7f3ba53ef Since version 9.55.0 and https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=5459f7aca1ded3b7cf96c339a2419f418aa406c7, ghostscript expects that tesseract is disabled if threads are not available resulting in the following build failure since commit 7a4944569ce83b0b7b0cabd6e8aa184b8cb72a22: configure: error: Threading disabled or not available. Tesseract OCR relies on threading. Rerun configure with "--without-tesseract" to exclude OCR from the build So disable tesseract as there is no way to tell ghostscript to use a system provided tesseract-ocr package Fixes: - http://autobuild.buildroot.org/results/fd35a47b2a77cf57c243ec1c88802b53ddca8f52 Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2: - Unconditionally disable tesseract package/ghostscript/ghostscript.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/ghostscript/ghostscript.mk b/package/ghostscript/ghostscript.mk index 24a0c489a8..b2e5fe16bb 100644 --- a/package/ghostscript/ghostscript.mk +++ b/package/ghostscript/ghostscript.mk @@ -44,6 +44,7 @@ GHOSTSCRIPT_CONF_OPTS = \ --disable-gtk \ --without-libpaper \ --without-pdf \ + --without-tesseract \ --with-system-libtiff ifeq ($(BR2_PACKAGE_JBIG2DEC),y) -- 2.34.1 From fontaine.fabrice at gmail.com Mon Feb 14 21:32:26 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 14 Feb 2022 22:32:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5webkit: needs execinfo.h Message-ID: <20220214213226.4143188-1-fontaine.fabrice@gmail.com> qt5webkit needs execinfo.h since bump to version 5.212.0-alpha4 in commit df0b0fe6919c0d0f3750f439a3cfa765232bd569: /tmp/instance-1/output-1/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp:54:10: fatal error: execinfo.h: No such file or directory 54 | #include | ^~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/351529f7d928e28fa2db22c6297dc70d21db562b Signed-off-by: Fabrice Fontaine --- package/qt5/qt5webkit/Config.in | 1 + package/qt5/qt5webkit/qt5webkit.mk | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in index 68b679dfcd..ed87efca95 100644 --- a/package/qt5/qt5webkit/Config.in +++ b/package/qt5/qt5webkit/Config.in @@ -21,6 +21,7 @@ config BR2_PACKAGE_QT5WEBKIT select BR2_PACKAGE_QT5LOCATION select BR2_PACKAGE_QT5SENSORS select BR2_PACKAGE_QT5WEBCHANNEL + select BR2_PACKAGE_LIBEXECINFO if !BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_LIBXSLT select BR2_PACKAGE_SQLITE diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk index 565c57e813..2084f3af52 100644 --- a/package/qt5/qt5webkit/qt5webkit.mk +++ b/package/qt5/qt5webkit/qt5webkit.mk @@ -10,7 +10,8 @@ QT5WEBKIT_SOURCE = qtwebkit-$(QT5WEBKIT_VERSION).tar.xz QT5WEBKIT_DEPENDENCIES = \ 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 + qt5sensors qt5webchannel sqlite webp woff2 \ + $(if $(BR2_PACKAGE_LIBEXECINFO),libexecinfo) QT5WEBKIT_INSTALL_STAGING = YES QT5WEBKIT_LICENSE_FILES = Source/WebCore/LICENSE-LGPL-2 Source/WebCore/LICENSE-LGPL-2.1 -- 2.34.1 From giulio.benetti at benettiengineering.com Tue Feb 15 00:45:21 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 15 Feb 2022 01:45:21 +0100 Subject: [Buildroot] [PATCH] utils/docker-run: improve user experience In-Reply-To: <20220214203909.251924-1-yann.morin.1998@free.fr> References: <20220214203909.251924-1-yann.morin.1998@free.fr> Message-ID: <14f61987-4c17-533d-97d3-d04dd5ea1949@benettiengineering.com> Hi Yann, Luca, All, On 14/02/22 21:39, Yann E. MORIN wrote: > Currently, the docker-run script starts a container based on the > reference image, in which the user has UID:GID set to 1000:1000, > which may or may not be the same as local user uses, which may > prevent the commands in the container from creating files, which > foils the plan of using the container to run a build... > > Additionally, the paths in the container differ from the paths > the user expects, as the current Buildroot tree is mounted over > the in-container user home directory. This is a bit confusing... > > Finally, the container is left hanging around after the command > finishes, and thus there are as many lingering containers as the > user runs docker-run. This is not very nice... > > We fix all of that (yeah, should be different patches, but meh): > > - we use --mount instead of -v, which allows us to bind-mount > the Buildroot tree at the same place in the container, as > Docker will create the destination if it does not exist, while > -v seems to expect it to exist [0]. > > - as a consequence, we can also set the working directory as the > Buildroot top-directory; > > - use --user to force the same UID:GID in the container as the > local user, so that files created in the container belong to > the local user, and so that files from the local user are > accessible from the container; > > - use --rm do remove the container once it terminates; starting typo s/do/to > a new container is very quick anyway, so it is as good as > re-using a previous container. > > [0] the documentation is not clear about that. It clearly states > that the host directory (i.e. the origin, the source) is created > if missing, but it says nothing of the destination: > https://docs.docker.com/engine/reference/commandline/run/#mount-volume--v---read-only > > Signed-off-by: Yann E. MORIN > Cc: Luca Ceresoli > Cc: Giulio Benetti > Cc: Arnout Vandecappelle (Essensium/Mind) > --- > utils/docker-run | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/utils/docker-run b/utils/docker-run > index 2bca8d8e3a..bdbc979264 100755 > --- a/utils/docker-run > +++ b/utils/docker-run > @@ -7,4 +7,8 @@ IMAGE=$(grep ^image: "${MAIN_DIR}/.gitlab-ci.yml" | \ > sed -e 's,^image: ,,g' | sed -e 's,\$CI_REGISTRY,registry.gitlab.com,g') > > set -x > -exec docker run -v "${MAIN_DIR}:/home/br-user" -it "${IMAGE}" "$@" > +exec docker run -it --rm \ > + --user $(id -u):$(id -g) \ > + --mount "type=bind,src=${MAIN_DIR},dst=${MAIN_DIR}" \ > + --workdir "${MAIN_DIR}" \ > + "${IMAGE}" "${@}" I've tested without UID:GID != 1000, but it works perfectly, so: Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti Best regards -- Giulio Benetti Benetti Engineering sas From giulio.benetti at benettiengineering.com Tue Feb 15 00:49:56 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 15 Feb 2022 01:49:56 +0100 Subject: [Buildroot] [PATCH] manual: board support: add instructions to test defconfig in the official docker In-Reply-To: <2169b106-8ed7-4eaf-1409-6dfe3eb19c0d@lucaceresoli.net> References: <20220203235438.610277-1-giulio.benetti@benettiengineering.com> <80ba31da-8a8e-12ed-bded-025e47f5cced@benettiengineering.com> <2169b106-8ed7-4eaf-1409-6dfe3eb19c0d@lucaceresoli.net> Message-ID: <9c579246-5466-58c8-8831-e8282041d952@benettiengineering.com> Hi Luca, On 14/02/22 13:16, Luca Ceresoli wrote: > Hi Giulio, > > On 14/02/22 00:35, Giulio Benetti wrote: >> Hi Luca, Arnout, Thomas P., >> >> On 13/02/22 11:39, Arnout Vandecappelle wrote: >>> >>> >>> On 12/02/2022 23:56, Luca Ceresoli wrote: >>>> Hi Giulio, >>>> >>>> On 04/02/22 00:54, Giulio Benetti wrote: >>>>> Often new boards have not been tested with official docker so let's add >>>>> instructions to do it. >>>> >>>> Thank you, I think this is a very useful addition to the documentation! >>>> However I would suggest some changes for it to look more "professional". >> >> Always welcome! >> >>>>> Signed-off-by: Giulio Benetti >>>>> --- >>>>> ?? docs/manual/adding-board-support.txt | 22 ++++++++++++++++++++++ >>>>> ?? 1 file changed, 22 insertions(+) >>>>> >>>>> diff --git a/docs/manual/adding-board-support.txt >>>>> b/docs/manual/adding-board-support.txt >>>>> index 33ed709535..f5fb3af371 100644 >>>>> --- a/docs/manual/adding-board-support.txt >>>>> +++ b/docs/manual/adding-board-support.txt >>>>> @@ -46,3 +46,25 @@ create a directory +board/+ and a >>>>> subdirectory >>>>> ?? +board//+. You can then store your patches >>>>> ?? and configurations in these directories, and reference them from >>>>> the main >>>>> ?? Buildroot configuration. Refer to xref:customize[] for more details. >>>>> + >>>>> +Before submitting patches for new boards it would be better to test it >>>> >>>> "it would be better" -> "it is recommended". >> >> Ok >> >>>>> +by building it using .gitlab-ci.yml specified docker. For example >>>>> at the >>>> >>>> I think this should be reworded in a simpler way: "by building it using >>>> the docker specified in .gitlab-ci.yml". >> >> Yes >> >>>> BTW as I am a docker newbie: is it common to say "the docker"? Or would >>>> "the docker container" be more correct? -- By comparison, I would never >>>> say "using the virtualbox" but rather "using the virtualbox machine". >>> >>> ?? I would say "the container" since you can use it with any container >>> manager >>> that follows the OCI spec. >> >> Ok >> >>>> >>>>> +time of this writing the docker is: >>>> >>>> Remove the ':' from this line, or you'll have multiple ':' per line, >>>> which looks awkward. >>>> >>>>> +$CI_REGISTRY/buildroot.org/buildroot/base:20220105.2314 >>>> >>>> Hm, this string is already old. >> >> Yes :-/ >> >>> ?? Actually, this part of the documentation is already superseded >>> since we now >>> have utils/docker-run that does everything. >> >> Oh, I've missed that, just checked and it eases life not few! >> I have a 120 columns command to start it that I copy and paste >> everytime. Because also, what I don't take care of here is the -v flag >> that allows you mount a host folder. >> >>>> There's no sane way to keep docs and >>>> .yml in sync. I wonder whether we should have in the manual a command >>>> line that always use the current string, such as: >>>> >>>> DOCKER_IMAGE=$(cat .gitlab-ci.yml | \ >>>> ???????????????? sed -n >>>> '/^image/s/^.*CI_REGISTRY/registry.gitlab.com/p') >>>> docker pull $DOCKER_IMAGE >>>> sudo docker run -it? $DOCKER_IMAGE >>>> >>>> However I must admit this is not very readable in the docs... :( What >>>> about adding a simple script (utils/run-docker?) that does the trick and >>>> just mention that in the docs? >> >> utils/docker-run then. Now we know it exists :-) >> >>>>> +so: >>>> >>>> Add an empty line here, so that the output separates from the next line. >> >> Ok >> >>>>> +Pull the docker: >>>>> +-------------------- >>>>> + $ docker pull >>>>> registry.gitlab.com/buildroot.org/buildroot/base:20220105.2314 >>>> >>>> Missing 'sudo'? >>> >>> ?? Docker access is usually managed through the "docker" group rather >>> than sudo. >>> >>> ?? And if you use podman as docker replacement, it can even be done in an >>> unprivileged container. Not that I tried it, but I think so. >>> >>> ?? Oh BTW, the pull is in fact not needed, both podman and docker pull >>> automatically when you start a container. That's the reason the >>> container name >>> is so convoluted. >> >> All new thing I didn't know! >> >>>> >>>>> +-------------------- >>>> >>>> Add an empty line here. This has no effect on the output but makes >>>> source code more readable. >>>> >>>>> +Run the docker: >>>>> +-------------------- >>>>> + $ sudo docker run -it >>>>> registry.gitlab.com/buildroot.org/buildroot/base:20220105.2314 >>>>> /bin/bash >>>>> +-------------------- >>>> >>>> As above, add an empty line here. >> >> +1 >> >>>>> +Inside the docker hint: >>>>> +-------------------- >>>>> + $ git clone git://git.busybox.net/buildroot >>>>> + $ cd buildroot >>>>> + $ make +_defconfig+ >>>>> + $ make >>>>> +-------------------- >>>> >>>> As above, add an empty line here. >> >> +1 >> >>>>> +Wait until build finishes and eventually add host dependencies. >>>> >>>> If I understand what you mean here, it should be "and add host >>>> dependencies if needed" ("eventually" is not the english translation of >>>> italian "eventualmente"). >> >> "...and possibly add host dependencies", right? > > Better. > > Even better: "and add any missing host dependencies, if any". Ah yes, thank you! >>>> If my understanding is correct, I don't find >>>> this sentence very useful: a docker newbie perhaps doesn't know how to >>>> add a host dependency (and maybe not even how to understand that they >>>> are missing one). >>>> >>>> I would just remove this line, but if you think it is very important I'd >>>> clarify it, maybe with some examples. >>> >>> ?? Yes, I think this is what triggered the addition of this >>> documentation. If you >>> have e.g. libopenssl-dev installed on your build host, then you >>> usually won't >>> notice in your test builds that a dependency on host-openssl is >>> needed. So test >>> builds should be done in a minimal container. >> >> Yes, it was because of that. >> >>> ?? Unfortunately, the buildroot/base container is not exactly minimal. >>> It's >>> really what is meant to be used for running CI tests, not exactly what >>> is needed >>> for build tests. Ideally, we'd have >>> >>> - an absolutely minimal container that can be used for build tests - >>> ideally in >>> a couple of variants for different distros; >> >> There is a bunch of dockers like that(more or less) here: >> https://github.com/aduskett/buildroot-docker-devel >> I've also contributed to, and at that time Thomas P. in IRC asked why we >> didn't upstreamed it and I told I would have done like 2/3 years ago and >> I've never done it :-/ >> >> And also modifying autobuilder's script to pick random distro and build >> to avoid possible host issues. But it's a bunch of stuff to do. >> >>> - a container for CI; >> >> Do you mean the one we already have but more shrinked? >> >>> - a more complete container you could use for development, though I can't >>> immediately think of extra stuff you'd want in there >> >> Is it really worth it? I mean, I've never seen anybody in IRC(even if >> read few in it) or ML(same) that complain about "I can't have buildroot >> working because I miss host tools". But I've seen recently gitlab-ci >> results that took me like 15-16 hours to fix. >> >> Does Yocto have something like that? And if yes, does someone can give a >> feedback if he really uses it? > > The situation is different with yocto as /usr/bin & co are just not in > the PATH. No host tools are accessible unless explicitly listed in the > HOSTTOOLS variable, so the problem is mostly solved at the root. Ah ok, thank for the explanation! >>> (but then, I wouldn't use a container for development). >> >> Me too, and who would use it? I think nobody, because I don't think a >> newbie is that skilled to use a docker too(or maybe yes), but my first >> try would be using it with my distro and probably same goes for other >> people. But here again, I use Terminator+Midnight Commander as my "IDE", >> so I won't be happy enough with it. Someone else uses real "IDE" and we >> can't add Eclipse or VSCode(I hope), so it will be something that is not >> enough for anybody, thus IMHO useless. >> >> ---------------- >> Going back to this patch: >> >> What I can do with this patch is to rewrite it pointing how to use >> utils/docker-run to check that at least configs/* and board/* patches work. >> >> Another solution to my patch is what Thomas P. pointed in IRC: >> "it is probably easier to ask people to use gitlab CI" >> >> But my worry is that lot of people actually fork from github and not >> from gitlab. Who would really do that(both docker and gitlab-CI solutions)? >> But also, who would really install docker(if they don't use it) to >> submit a patch for gitlab-CI build failures? >> >> I think that counting the ones who took care about their maintained >> board gives us an idea, very few. BUT for new boards, and I see not few >> of them adding in the last period. It could be a way to force them to >> give a proof of a successfull building with gitlab-CI pipeline log as >> Thomas P. proposed. >> >> So I would modify this patch with instructions to: >> - fork Buildroot in gitlab >> - trigger gitlab-CI pipeline for a single defconfig >> >> What do you all think? > > I think we need simple instructions to ensure that anybody is able to > test their config builds without unnoticed host dependencies, before > they send a patch. I don't care whether it's docker or gitlab or > whatever. But it must be something documented and easy to do in a few > commands. > At this point, once this patch [1] is upstreamed I will modify this patch and point to utils/docker-run. Thank you! Best regards -- Giulio Benetti Benetti Engineering sas From james.hilliard1 at gmail.com Tue Feb 15 01:53:03 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 14 Feb 2022 18:53:03 -0700 Subject: [Buildroot] [PATCH v8 1/5] package/qt5/qt5base: enable ccache via configure option Message-ID: <20220215015307.855341-1-james.hilliard1@gmail.com> This should be cleaner than editing mkspecs/common/g++-base.conf. This should be more reliable with qt5webengine gn build system. Signed-off-by: James Hilliard --- Changes v6 -> v7: - remove QT5BASE_CONFIGURE_HOSTCC variable --- package/qt5/qt5base/qt5base.mk | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index ef38d03253..cce92db81b 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -297,10 +297,9 @@ endef endif # This allows to use ccache when available -define QT5BASE_CONFIGURE_HOSTCC - $(SED) 's,^QMAKE_CC\s*=.*,QMAKE_CC = $(HOSTCC),' $(@D)/mkspecs/common/g++-base.conf - $(SED) 's,^QMAKE_CXX\s*=.*,QMAKE_CXX = $(HOSTCXX),' $(@D)/mkspecs/common/g++-base.conf -endef +ifeq ($(BR2_CCACHE),y) +QT5BASE_CONFIGURE_OPTS += -ccache +endif # Must be last so can override all options set by Buildroot QT5BASE_CONFIGURE_OPTS += $(call qstrip,$(BR2_PACKAGE_QT5BASE_CUSTOM_CONF_OPTS)) @@ -316,7 +315,6 @@ define QT5BASE_CONFIGURE_CMDS touch $(QT5BASE_ARCH_CONFIG_FILE) $(QT5BASE_CONFIGURE_ARCH_CONFIG_LIBATOMIC) $(QT5BASE_CONFIGURE_ARCH_CONFIG_LIBEXECINFO) - $(QT5BASE_CONFIGURE_HOSTCC) (cd $(@D); \ $(TARGET_MAKE_ENV) \ PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ -- 2.25.1 From james.hilliard1 at gmail.com Tue Feb 15 01:53:04 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 14 Feb 2022 18:53:04 -0700 Subject: [Buildroot] [PATCH v8 2/5] package/qt5/qt5webengine-chromium-catapult: new package In-Reply-To: <20220215015307.855341-1-james.hilliard1@gmail.com> References: <20220215015307.855341-1-james.hilliard1@gmail.com> Message-ID: <20220215015307.855341-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 --- 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 Tue Feb 15 01:53:06 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 14 Feb 2022 18:53:06 -0700 Subject: [Buildroot] [PATCH v8 4/5] package/qt5/qt5base: disable broken qmake sysrootify In-Reply-To: <20220215015307.855341-1-james.hilliard1@gmail.com> References: <20220215015307.855341-1-james.hilliard1@gmail.com> Message-ID: <20220215015307.855341-4-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. Improves pkg-config target/host separation. Signed-off-by: James Hilliard --- Changes v5 -> v6: - rebase/rework with qt5webengine bump 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/qt5/qt5base/qt.conf.in | 21 ++++++++++++++++++--- package/qt5/qt5base/qt5base.mk | 5 ++++- 2 files changed, 22 insertions(+), 4 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 cce92db81b..1ef70eb7f6 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -323,12 +323,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)" \ @@ -337,6 +340,6 @@ define QT5BASE_CONFIGURE_CMDS ) endef -QT5BASE_POST_INSTALL_STAGING_HOOKS += QT5_INSTALL_QT_CONF +QT5BASE_PRE_INSTALL_STAGING_HOOKS += QT5_INSTALL_QT_CONF $(eval $(qmake-package)) -- 2.25.1 From james.hilliard1 at gmail.com Tue Feb 15 01:53:07 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 14 Feb 2022 18:53:07 -0700 Subject: [Buildroot] [PATCH v8 5/5] package/qt5/qt5webengine: bump to version 5.15.8 In-Reply-To: <20220215015307.855341-1-james.hilliard1@gmail.com> References: <20220215015307.855341-1-james.hilliard1@gmail.com> Message-ID: <20220215015307.855341-5-james.hilliard1@gmail.com> We need to use the separate package for the chromium submodule which has python3 support patches. We also need to apply a patch to qt5webengine to allow building with python3. Drop a patch which is now upstream. 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. Switch libraries to system libraries instead of bundled when possible. Migrate unsupported WEBENGINE_CONFIG to new config flag option. Override feature detection using config override flags to ensure we get the expected features enabled/disabled as autodetection logic may otherwise disable features without throwing build errors. Signed-off-by: James Hilliard --- Changes v7 -> v8: - add missing BR2_PACKAGE_QT5BASE_HARFBUZZ select Changes v5 -> v6: - switch to python3 - fix up config flags and rebase Changes v3 -> v4: - linker fixes Changes v2 -> v3: - add kconfig entries --- package/qt5/qt5.mk | 1 - .../0002-Add-python3-build-support.patch | 168 +++ ...m-breakpad-fix-build-with-glibc-2.34.patch | 76 -- package/qt5/qt5webengine/Config.in | 14 + .../qt5/qt5webengine/host-python-wrapper.in | 3 + package/qt5/qt5webengine/qt5webengine.hash | 1001 +---------------- package/qt5/qt5webengine/qt5webengine.mk | 160 ++- 7 files changed, 323 insertions(+), 1100 deletions(-) create mode 100644 package/qt5/qt5webengine/0002-Add-python3-build-support.patch delete mode 100644 package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch create mode 100644 package/qt5/qt5webengine/host-python-wrapper.in diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk index 656e3067dc..0706c3548d 100644 --- a/package/qt5/qt5.mk +++ b/package/qt5/qt5.mk @@ -6,7 +6,6 @@ QT5_VERSION_MAJOR = 5.15 QT5_VERSION = $(QT5_VERSION_MAJOR).8 -QT5_SOURCE_TARBALL_PREFIX = everywhere-src QT5_SITE = https://invent.kde.org/qt/qt include $(sort $(wildcard package/qt5/*/*.mk)) diff --git a/package/qt5/qt5webengine/0002-Add-python3-build-support.patch b/package/qt5/qt5webengine/0002-Add-python3-build-support.patch new file mode 100644 index 0000000000..18fc1c1de0 --- /dev/null +++ b/package/qt5/qt5webengine/0002-Add-python3-build-support.patch @@ -0,0 +1,168 @@ +From 1e299a6c9eeb08555208b76623e453d8ab96b6e3 Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Fri, 4 Feb 2022 16:16:35 -0700 +Subject: [PATCH] Add python3 build support + +Adapted from: +https://github.com/archlinux/svntogit-packages/blob/6edf5f1aaea952d046aff89a2e0175258fe77361/trunk/qt5-webengine-python3.patch + +Signed-off-by: James Hilliard +--- + configure.pri | 13 ++++++------- + mkspecs/features/functions.prf | 6 +++--- + src/buildtools/config/support.pri | 10 +++++----- + src/buildtools/configure.json | 18 +++++++++--------- + 4 files changed, 23 insertions(+), 24 deletions(-) + +diff --git a/configure.pri b/configure.pri +index e072961f..6fec7b20 100644 +--- a/configure.pri ++++ b/configure.pri +@@ -13,8 +13,7 @@ defineTest(isPythonVersionSupported) { + python_version = $$split(python_version, ',') + python_major_version = $$first(python_version) + greaterThan(python_major_version, 2) { +- qtLog("Python version 3 is not supported by Chromium.") +- return(false) ++ return(true) + } + python_minor_version = $$member(python_version, 1) + python_patch_version = $$member(python_version, 2) +@@ -52,10 +51,10 @@ defineTest(qtConfReport_jumboBuild) { + qtConfReportPadded($${1}, $$mergeLimit) + } + +-defineTest(qtConfTest_detectPython2) { +- python = $$qtConfFindInPath("python2$$EXE_SUFFIX") ++defineTest(qtConfTest_detectPython) { ++ python = $$qtConfFindInPath("python$$EXE_SUFFIX") + isEmpty(python) { +- qtLog("'python2$$EXE_SUFFIX' not found in PATH. Checking for 'python$$EXE_SUFFIX'.") ++ qtLog("'python$$EXE_SUFFIX' not found in PATH. Checking for 'python$$EXE_SUFFIX'.") + python = $$qtConfFindInPath("python$$EXE_SUFFIX") + } + isEmpty(python) { +@@ -63,11 +62,11 @@ defineTest(qtConfTest_detectPython2) { + return(false) + } + !isPythonVersionSupported($$python) { +- qtLog("A suitable Python 2 executable could not be located.") ++ qtLog("A suitable Python executable could not be located.") + return(false) + } + +- # Make tests.python2.location available in configure.json. ++ # Make tests.python.location available in configure.json. + $${1}.location = $$clean_path($$python) + export($${1}.location) + $${1}.cache += location +diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf +index 2750d707..9fda13d0 100644 +--- a/mkspecs/features/functions.prf ++++ b/mkspecs/features/functions.prf +@@ -39,11 +39,11 @@ defineReplace(which) { + + # Returns the unquoted path to the python executable. + defineReplace(pythonPath) { +- isEmpty(QMAKE_PYTHON2) { ++ isEmpty(QMAKE_PYTHON) { + # Fallback for building QtWebEngine with Qt < 5.8 +- QMAKE_PYTHON2 = python ++ QMAKE_PYTHON = python + } +- return($$QMAKE_PYTHON2) ++ return($$QMAKE_PYTHON) + } + + # Returns the python executable for use with shell / make targets. +diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri +index e7f869a1..1bf2c5d7 100644 +--- a/src/buildtools/config/support.pri ++++ b/src/buildtools/config/support.pri +@@ -21,7 +21,7 @@ defineReplace(qtwebengine_checkWebEngineCoreError) { + !qtwebengine_checkForGperf(QtWebEngine):return(false) + !qtwebengine_checkForBison(QtWebEngine):return(false) + !qtwebengine_checkForFlex(QtWebEngine):return(false) +- !qtwebengine_checkForPython2(QtWebEngine):return(false) ++ !qtwebengine_checkForPython(QtWebEngine):return(false) + !qtwebengine_checkForNodejs(QtWebEngine):return(false) + !qtwebengine_checkForSanitizer(QtWebEngine):return(false) + linux:!qtwebengine_checkForPkgCfg(QtWebEngine):return(false) +@@ -51,7 +51,7 @@ defineReplace(qtwebengine_checkPdfError) { + !qtwebengine_checkForGperf(QtPdf):return(false) + !qtwebengine_checkForBison(QtPdf):return(false) + !qtwebengine_checkForFlex(QtPdf):return(false) +- !qtwebengine_checkForPython2(QtPdf):return(false) ++ !qtwebengine_checkForPython(QtPdf):return(false) + !qtwebengine_checkForSanitizer(QtPdf):return(false) + linux:!qtwebengine_checkForPkgCfg(QtPdf):return(false) + linux:!qtwebengine_checkForHostPkgCfg(QtPdf):return(false) +@@ -143,10 +143,10 @@ defineTest(qtwebengine_checkForFlex) { + return(true) + } + +-defineTest(qtwebengine_checkForPython2) { ++defineTest(qtwebengine_checkForPython) { + module = $$1 +- !qtConfig(webengine-python2) { +- qtwebengine_skipBuild("Python version 2 (2.7.5 or later) is required to build $${module}.") ++ !qtConfig(webengine-python) { ++ qtwebengine_skipBuild("Python is required to build $${module}.") + return(false) + } + return(true) +diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json +index 88d1790c..032aa665 100644 +--- a/src/buildtools/configure.json ++++ b/src/buildtools/configure.json +@@ -295,9 +295,9 @@ + "label": "system ninja", + "type": "detectNinja" + }, +- "webengine-python2": { +- "label": "python2", +- "type": "detectPython2", ++ "webengine-python": { ++ "label": "python", ++ "type": "detectPython", + "log": "location" + }, + "webengine-winversion": { +@@ -374,7 +374,7 @@ + && features.webengine-gperf + && features.webengine-bison + && features.webengine-flex +- && features.webengine-python2 ++ && features.webengine-python + && features.webengine-nodejs + && (!config.sanitizer || features.webengine-sanitizer) + && (!config.linux || features.pkg-config) +@@ -400,7 +400,7 @@ + && features.webengine-gperf + && features.webengine-bison + && features.webengine-flex +- && features.webengine-python2 ++ && features.webengine-python + && (!config.sanitizer || features.webengine-sanitizer) + && (!config.linux || features.pkg-config) + && (!config.linux || features.webengine-host-pkg-config) +@@ -423,12 +423,12 @@ + "autoDetect": "features.private_tests", + "output": [ "privateFeature" ] + }, +- "webengine-python2": { +- "label": "python2", +- "condition": "tests.webengine-python2", ++ "webengine-python": { ++ "label": "python", ++ "condition": "tests.webengine-python", + "output": [ + "privateFeature", +- { "type": "varAssign", "name": "QMAKE_PYTHON2", "value": "tests.webengine-python2.location" } ++ { "type": "varAssign", "name": "QMAKE_PYTHON", "value": "tests.webengine-python.location" } + ] + }, + "webengine-gperf": { +-- +2.25.1 + 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 deleted file mode 100644 index 44a6424c7d..0000000000 --- a/package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch +++ /dev/null @@ -1,76 +0,0 @@ -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/Config.in b/package/qt5/qt5webengine/Config.in index 5d537cdf84..542f212dfc 100644 --- a/package/qt5/qt5webengine/Config.in +++ b/package/qt5/qt5webengine/Config.in @@ -32,24 +32,36 @@ 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). # 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_LCMS2 + 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_MINIZIP select BR2_PACKAGE_OPUS + select BR2_PACKAGE_RE2 + select BR2_PACKAGE_SNAPPY 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_HARFBUZZ + 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 @@ -57,9 +69,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/host-python-wrapper.in b/package/qt5/qt5webengine/host-python-wrapper.in new file mode 100644 index 0000000000..3400be1d06 --- /dev/null +++ b/package/qt5/qt5webengine/host-python-wrapper.in @@ -0,0 +1,3 @@ +#!/bin/sh +LD_LIBRARY_PATH="@HOST_DIR@/lib" \ +exec @HOST_DIR@/bin/python "$@" 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 cebd6d0fe2..836ba62189 100644 --- a/package/qt5/qt5webengine/qt5webengine.mk +++ b/package/qt5/qt5webengine/qt5webengine.mk @@ -4,64 +4,176 @@ # ################################################################################ -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 \ - host-pkgconf host-python +QT5WEBENGINE_VERSION = $(QT5_VERSION) +QT5WEBENGINE_SITE = $(QT5_SITE)/qtwebengine/-/archive/v$(QT5WEBENGINE_VERSION)-lts +QT5WEBENGINE_SOURCE = qtwebengine-v$(QT5WEBENGINE_VERSION)-lts.tar.bz2 +QT5WEBENGINE_DEPENDENCIES = qt5declarative qt5webchannel +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 + +# command line argument separator +QT5WEBENGINE_CONF_OPTS = -- 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 += \ + xlib_libXcomposite \ + xlib_libXcursor \ + xlib_libXi \ + xlib_libxkbfile \ + xlib_libXrandr \ + xlib_libXScrnSaver \ + xlib_libXtst +QT5WEBENGINE_CONF_OPTS += \ + -feature-webengine-ozone \ + -feature-webengine-system-libdrm \ + -feature-webengine-system-x11 \ + -feature-webengine-system-xkbfile \ + -feature-webengine-system-xcomposite \ + -feature-webengine-system-xcursor \ + -feature-webengine-system-xi \ + -feature-webengine-system-xproto-gl \ + -feature-webengine-system-xtst +else +QT5WEBENGINE_CONF_OPTS += \ + -no-feature-webengine-ozone \ + -no-feature-webengine-system-libdrm \ + -no-feature-webengine-system-x11 \ + -no-feature-webengine-system-xkbfile \ + -no-feature-webengine-system-xcomposite \ + -no-feature-webengine-system-xcursor \ + -no-feature-webengine-system-xi \ + -no-feature-webengine-system-xproto-gl \ + -no-feature-webengine-system-xtst endif -QT5WEBENGINE_DEPENDENCIES += host-libpng host-libnss libnss +QT5WEBENGINE_DEPENDENCIES += \ + host-bison \ + host-flex \ + host-freetype \ + host-gperf \ + host-harfbuzz \ + host-icu \ + host-ninja \ + host-nodejs \ + host-pkgconf \ + host-libjpeg \ + host-libnss \ + host-libpng \ + host-python3 \ + host-webp \ + host-zlib \ + ffmpeg \ + freetype \ + jpeg \ + lcms2 \ + libevent \ + libnss \ + libvpx \ + libxml2 \ + libxslt \ + re2 \ + snappy \ + webp -QT5WEBENGINE_CONF_OPTS += WEBENGINE_CONFIG+=use_system_ffmpeg +QT5WEBENGINE_CONF_OPTS += \ + -webengine-embedded-build \ + -webengine-ffmpeg \ + -webengine-icu \ + -webengine-opus \ + -webengine-webchannel \ + -webengine-webp \ + -feature-build-qtwebengine-core \ + -feature-webengine-core-support \ + -feature-webengine-system-dbus \ + -feature-webengine-system-fontconfig \ + -feature-webengine-system-freetype \ + -feature-webengine-system-glib \ + -feature-webengine-system-glibc \ + -feature-webengine-system-harfbuzz \ + -feature-webengine-system-jpeg \ + -feature-webengine-system-khr \ + -feature-webengine-system-lcms2 \ + -feature-webengine-system-libevent \ + -feature-webengine-system-libvpx \ + -feature-webengine-system-libxml2 \ + -feature-webengine-system-ninja \ + -feature-webengine-system-nss \ + -feature-webengine-system-png \ + -feature-webengine-system-re2 \ + -feature-webengine-system-snappy \ + -feature-webengine-system-zlib + +QT5WEBENGINE_CONF_OPTS += \ + -no-webengine-geolocation \ + -no-webengine-kerberos \ + -no-webengine-pepper-plugins \ + -no-webengine-printing-and-pdf \ + -no-webengine-spellchecker \ + -no-webengine-webrtc \ + -no-webengine-webrtc-pipewire \ + -no-feature-webengine-developer-build \ + -no-feature-webengine-full-debug-info \ + -no-feature-webengine-native-spellchecker \ + -no-feature-webengine-noexecstack \ + -no-feature-webengine-system-minizip \ + -no-feature-webengine-system-gn ifeq ($(BR2_PACKAGE_QT5WEBENGINE_PROPRIETARY_CODECS),y) -QT5WEBENGINE_CONF_OPTS += WEBENGINE_CONFIG+=use_proprietary_codecs +QT5WEBENGINE_CONF_OPTS += -webengine-proprietary-codecs +else +QT5WEBENGINE_CONF_OPTS += -no-webengine-proprietary-codecs endif ifeq ($(BR2_PACKAGE_QT5WEBENGINE_ALSA),y) QT5WEBENGINE_DEPENDENCIES += alsa-lib +QT5WEBENGINE_CONF_OPTS += -webengine-alsa else -QT5WEBENGINE_CONF_OPTS += QT_CONFIG-=alsa +QT5WEBENGINE_CONF_OPTS += -no-webengine-alsa +endif + +ifeq ($(BR2_PACKAGE_PULSEAUDIO),y) +QT5WEBENGINE_DEPENDENCIES += pulseaudio +QT5WEBENGINE_CONF_OPTS += -webengine-pulseaudio +else +QT5WEBENGINE_CONF_OPTS += -no-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) \ - PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig -define QT5WEBENGINE_PYTHON2_SYMLINK + PKG_CONFIG_SYSROOT_DIR="/" +define QT5WEBENGINE_CREATE_HOST_PYTHON_WRAPPER mkdir -p $(@D)/host-bin - ln -sf $(HOST_DIR)/bin/python2 $(@D)/host-bin/python + sed s%@HOST_DIR@%$(HOST_DIR)%g $(QT5WEBENGINE_PKGDIR)/host-python-wrapper.in > $(@D)/host-bin/python + chmod +x $(@D)/host-bin/python endef -QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_PYTHON2_SYMLINK +QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_CREATE_HOST_PYTHON_WRAPPER 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 + mkdir -p $(@D)/host-bin 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 peterlin at andestech.com Tue Feb 15 02:13:20 2022 From: peterlin at andestech.com (Yu Chien Peter Lin) Date: Tue, 15 Feb 2022 10:13:20 +0800 Subject: [Buildroot] [PATCH v2 3/3] DEVELOPERS: add Yu-Chien Lin to board/andes In-Reply-To: <674c1c83-4bcf-3740-8f79-184c1a86cda3@benettiengineering.com> References: <20220125054956.27492-1-peterlin@andestech.com> <20220125054956.27492-3-peterlin@andestech.com> <674c1c83-4bcf-3740-8f79-184c1a86cda3@benettiengineering.com> Message-ID: Hi Giulio, Thanks for your comments. > On Thu, Feb 10, 2022 at 12:39:07AM +0100, Giulio Benetti wrote: > > Hi Peter, > > > > I review it now, > > > > On 25/01/22 06:49, 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 > ... > > > 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 > > > > Would it be possible for you to upstream these patches? I mean, do you > > maintain the uboot, opensbi repositories so you can do that? > > If yes it would be great having no patches at all here. We have a plan to upstream some of them if the patch is platform specific. I'll remove them when the u-boot bumps to the future version. > > > index 0000000000..5e5d70ab25 > > > --- /dev/null > > > +++ b/board/andes/ae350/ae350.dts > ... > > It's a bit out of topic, but with this .dts ^^^ you define and entire > > SoC+board, shouldn't it be like a .dtsi file for SoC and a .dts file for > > board? We would like to remain in this form until new board is available. Thanks. Regards, Yu-Chien Peter Lin From giulio.benetti at benettiengineering.com Tue Feb 15 02:17:00 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 15 Feb 2022 03:17:00 +0100 Subject: [Buildroot] [PATCH] manual: board support: add instructions to test defconfig in the official docker In-Reply-To: <9c579246-5466-58c8-8831-e8282041d952@benettiengineering.com> References: <20220203235438.610277-1-giulio.benetti@benettiengineering.com> <80ba31da-8a8e-12ed-bded-025e47f5cced@benettiengineering.com> <2169b106-8ed7-4eaf-1409-6dfe3eb19c0d@lucaceresoli.net> <9c579246-5466-58c8-8831-e8282041d952@benettiengineering.com> Message-ID: On 15/02/22 01:49, Giulio Benetti wrote: >> I think we need simple instructions to ensure that anybody is able to >> test their config builds without unnoticed host dependencies, before >> they send a patch. I don't care whether it's docker or gitlab or >> whatever. But it must be something documented and easy to do in a few >> commands. >> > > At this point, once this patch [1] is upstreamed I will modify this > patch and point to utils/docker-run. [1]: https://lists.buildroot.org/pipermail/buildroot/2022-February/637017.html -- Giulio Benetti Benetti Engineering sas From giulio.benetti at benettiengineering.com Tue Feb 15 02:22:14 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 15 Feb 2022 03:22:14 +0100 Subject: [Buildroot] [PATCH v2 3/3] DEVELOPERS: add Yu-Chien Lin to board/andes In-Reply-To: References: <20220125054956.27492-1-peterlin@andestech.com> <20220125054956.27492-3-peterlin@andestech.com> <674c1c83-4bcf-3740-8f79-184c1a86cda3@benettiengineering.com> Message-ID: <9907aa64-1f54-cbf4-074a-a73c2233ab97@benettiengineering.com> Hi Peter, On 15/02/22 03:13, Yu Chien Peter Lin wrote: > Hi Giulio, > > Thanks for your comments. > >> On Thu, Feb 10, 2022 at 12:39:07AM +0100, Giulio Benetti wrote: >>> Hi Peter, >>> >>> I review it now, >>> >>> On 25/01/22 06:49, 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 >> ... >>>> 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 >>> >>> Would it be possible for you to upstream these patches? I mean, do you >>> maintain the uboot, opensbi repositories so you can do that? >>> If yes it would be great having no patches at all here. > > We have a plan to upstream some of them if the patch is platform specific. This sounds good > I'll remove them when the u-boot bumps to the future version. That's ok >>>> index 0000000000..5e5d70ab25 >>>> --- /dev/null >>>> +++ b/board/andes/ae350/ae350.dts >> ... >>> It's a bit out of topic, but with this .dts ^^^ you define and entire >>> SoC+board, shouldn't it be like a .dtsi file for SoC and a .dts file for >>> board? > > We would like to remain in this form until new board is available. Thanks. Ok, with some new board on the horizon it makes sense to me. Best regards -- Giulio Benetti Benetti Engineering sas From peterlin at andestech.com Tue Feb 15 02:32:00 2022 From: peterlin at andestech.com (Yu Chien Peter Lin) Date: Tue, 15 Feb 2022 10:32:00 +0800 Subject: [Buildroot] [PATCH 1/3] board/andes: rearrange nds32 folder structure Message-ID: <20220215023202.1188-1-peterlin@andestech.com> Rearrange nds32 folder structure to add AE350 platform. Signed-off-by: Yu Chien Peter Lin Signed-off-by: Alan Kao --- .../patches/linux/0001-nds32-Fix-boot-messages-garbled.patch | 0 ...2-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch | 0 board/andes/{ => ae3xx}/readme.txt | 0 configs/andes_ae3xx_defconfig | 2 +- 4 files changed, 1 insertion(+), 1 deletion(-) rename board/andes/{ => ae3xx}/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch (100%) rename board/andes/{ => ae3xx}/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.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/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch b/board/andes/ae3xx/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch similarity index 100% rename from board/andes/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch rename to board/andes/ae3xx/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.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.25.1 From peterlin at andestech.com Tue Feb 15 02:32:01 2022 From: peterlin at andestech.com (Yu Chien Peter Lin) Date: Tue, 15 Feb 2022 10:32:01 +0800 Subject: [Buildroot] [PATCH 2/3] board/andes/ae350: add support for Andes AE350 In-Reply-To: <20220215023202.1188-1-peterlin@andestech.com> References: <20220215023202.1188-1-peterlin@andestech.com> Message-ID: <20220215023202.1188-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 --- Changes V1->V2: * move linux source code and its patches to AndesTech Github repo * rename ae350_andestar45_defconfig to andes_ae350_45_defconfig * change C library to uClibc * remove OpenSSL package * remove rootfs.cpio and rootfs.tar * update DEVELOPERS V2->V3: * specifiy branch to download from AndesTech linux repo * change boot.cmd to extlinux.conf * add post-build.sh for extlinux.conf to retrieve Image and DTB * fix format and update genimage_sdcard.cfg * update readme.txt * add packages (python3, pylibfdt and openssl) for u-boot binman * reorder item in DEVELOPERS board/andes/ae350/ae350.dts | 274 ++++++++++++++++++ board/andes/ae350/genimage_sdcard.cfg | 26 ++ ...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/post-build.sh | 3 + board/andes/ae350/readme.txt | 65 +++++ .../boot/extlinux/extlinux.conf | 4 + board/andes/ae350/uboot.config.fragment | 5 + configs/andes_ae350_45_defconfig | 43 +++ 13 files changed, 579 insertions(+) create mode 100755 board/andes/ae350/ae350.dts 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 100755 board/andes/ae350/post-build.sh create mode 100644 board/andes/ae350/readme.txt create mode 100644 board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf 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/genimage_sdcard.cfg b/board/andes/ae350/genimage_sdcard.cfg new file mode 100644 index 0000000000..b8b9fe6a62 --- /dev/null +++ b/board/andes/ae350/genimage_sdcard.cfg @@ -0,0 +1,26 @@ +image boot.vfat { + vfat { + files = { + "u-boot-spl.bin", + "u-boot.itb", + "ae350.dtb", + } + } + size = 2M +} + +image sdcard.img { + hdimage { + } + + partition boot { + partition-type = 0xC + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + bootable = true + 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/post-build.sh b/board/andes/ae350/post-build.sh new file mode 100755 index 0000000000..0e6ce228f4 --- /dev/null +++ b/board/andes/ae350/post-build.sh @@ -0,0 +1,3 @@ +#!/bin/sh +cp $BINARIES_DIR/Image $TARGET_DIR/boot +cp $BINARIES_DIR/ae350.dtb $TARGET_DIR/boot diff --git a/board/andes/ae350/readme.txt b/board/andes/ae350/readme.txt new file mode 100644 index 0000000000..6825468d50 --- /dev/null +++ b/board/andes/ae350/readme.txt @@ -0,0 +1,65 @@ +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/ + |-- ae350.dtb + |-- boot.vfat + |-- fw_dynamic.bin + |-- fw_dynamic.elf + |-- fw_jump.bin + |-- fw_jump.elf + |-- Image + |-- 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 + $ sudo sync + +Your SD card partition should be: + + Disk /dev/sdb: 14.48 GiB, 15552479232 bytes, 30375936 sectors + Disk model: Multi-Card + Units: sectors of 1 * 512 = 512 bytes + Sector size (logical/physical): 512 bytes / 512 bytes + I/O size (minimum/optimal): 512 bytes / 512 bytes + Disklabel type: dos + Disk identifier: 0x00000000 + + Device Boot Start End Sectors Size Id Type + /dev/sdb1 1 4096 4096 2M c W95 FAT32 (LBA) + /dev/sdb2 * 4097 126976 122880 60M 83 Linux + +Insert SD card and reset the board, it should boot Linux from mmc. diff --git a/board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf b/board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf new file mode 100644 index 0000000000..549eb93abc --- /dev/null +++ b/board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +label linux + kernel /boot/Image + fdt /boot/ae350.dtb + append earlycon=sbi root=/dev/mmcblk0p2 rootwait 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..a35ddd06ba --- /dev/null +++ b/configs/andes_ae350_45_defconfig @@ -0,0 +1,43 @@ +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_OVERLAY="board/andes/ae350/rootfs_overlay" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/andes/ae350/post-build.sh" +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_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/andestech/linux.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.10.84-ae350_45" +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_PYTHON3=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y +# BR2_TARGET_UBOOT_FORMAT_BIN is not set +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.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 -- 2.25.1 From peterlin at andestech.com Tue Feb 15 02:32:02 2022 From: peterlin at andestech.com (Yu Chien Peter Lin) Date: Tue, 15 Feb 2022 10:32:02 +0800 Subject: [Buildroot] [PATCH 3/3] DEVELOPERS: add Yu-Chien Lin to board/andes In-Reply-To: <20220215023202.1188-1-peterlin@andestech.com> References: <20220215023202.1188-1-peterlin@andestech.com> Message-ID: <20220215023202.1188-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 ac702d8d0f..8848d6a9a7 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2146,9 +2146,10 @@ 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_ae350_45_defconfig F: configs/andes_ae3xx_defconfig F: toolchain/toolchain-external/toolchain-external-andes-nds32/ -- 2.25.1 From peterlin at andestech.com Tue Feb 15 05:14:44 2022 From: peterlin at andestech.com (Yu Chien Peter Lin) Date: Tue, 15 Feb 2022 13:14:44 +0800 Subject: [Buildroot] [PATCH 2/3] board/andes/ae350: add support for Andes AE350 In-Reply-To: <20220215023202.1188-2-peterlin@andestech.com> References: <20220215023202.1188-1-peterlin@andestech.com> <20220215023202.1188-2-peterlin@andestech.com> Message-ID: > On Tue, Feb 15, 2022 at 10:32:01AM +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 > > --- > > Changes > > V1->V2: > > * move linux source code and its patches to AndesTech Github repo > > * rename ae350_andestar45_defconfig to andes_ae350_45_defconfig > > * change C library to uClibc > > * remove OpenSSL package > > * remove rootfs.cpio and rootfs.tar > > * update DEVELOPERS > > V2->V3: > > * specifiy branch to download from AndesTech linux repo > > * change boot.cmd to extlinux.conf > > * add post-build.sh for extlinux.conf to retrieve Image and DTB > > * fix format and update genimage_sdcard.cfg > > * update readme.txt > > * add packages (python3, pylibfdt and openssl) for u-boot binman > > * reorder item in DEVELOPERS > > Sorry, I missed versioning for this revision. I'll resend it and fix changelog format. Regards, Yu-Chien Peter Lin From peterlin at andestech.com Tue Feb 15 05:33:25 2022 From: peterlin at andestech.com (Yu Chien Peter Lin) Date: Tue, 15 Feb 2022 13:33:25 +0800 Subject: [Buildroot] [PATCH v3 1/3] board/andes: rearrange nds32 folder structure Message-ID: <20220215053327.4046-1-peterlin@andestech.com> Rearrange nds32 folder structure to add AE350 platform. Signed-off-by: Yu Chien Peter Lin Signed-off-by: Alan Kao --- .../patches/linux/0001-nds32-Fix-boot-messages-garbled.patch | 0 ...2-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch | 0 board/andes/{ => ae3xx}/readme.txt | 0 configs/andes_ae3xx_defconfig | 2 +- 4 files changed, 1 insertion(+), 1 deletion(-) rename board/andes/{ => ae3xx}/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch (100%) rename board/andes/{ => ae3xx}/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.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/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch b/board/andes/ae3xx/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch similarity index 100% rename from board/andes/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch rename to board/andes/ae3xx/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.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.25.1 From peterlin at andestech.com Tue Feb 15 05:33:27 2022 From: peterlin at andestech.com (Yu Chien Peter Lin) Date: Tue, 15 Feb 2022 13:33:27 +0800 Subject: [Buildroot] [PATCH v3 3/3] DEVELOPERS: add Yu-Chien Lin to board/andes In-Reply-To: <20220215053327.4046-1-peterlin@andestech.com> References: <20220215053327.4046-1-peterlin@andestech.com> Message-ID: <20220215053327.4046-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 ac702d8d0f..8848d6a9a7 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2146,9 +2146,10 @@ 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_ae350_45_defconfig F: configs/andes_ae3xx_defconfig F: toolchain/toolchain-external/toolchain-external-andes-nds32/ -- 2.25.1 From peterlin at andestech.com Tue Feb 15 05:33:26 2022 From: peterlin at andestech.com (Yu Chien Peter Lin) Date: Tue, 15 Feb 2022 13:33:26 +0800 Subject: [Buildroot] [PATCH v3 2/3] board/andes/ae350: add support for Andes AE350 In-Reply-To: <20220215053327.4046-1-peterlin@andestech.com> References: <20220215053327.4046-1-peterlin@andestech.com> Message-ID: <20220215053327.4046-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 --- Changes v1 -> v2: - move linux source code and its patches to AndesTech Github repo - rename ae350_andestar45_defconfig to andes_ae350_45_defconfig - change C library to uClibc - remove OpenSSL package - remove rootfs.cpio and rootfs.tar - update DEVELOPERS Changes v2 -> v3: - specifiy branch to download from AndesTech linux repo - change boot.cmd to extlinux.conf - add post-build.sh for extlinux.conf to retrieve Image and DTB - fix format and update genimage_sdcard.cfg - update readme.txt - add packages (python3, pylibfdt and openssl) for u-boot binman - reorder item in DEVELOPERS --- board/andes/ae350/ae350.dts | 274 ++++++++++++++++++ board/andes/ae350/genimage_sdcard.cfg | 26 ++ ...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/post-build.sh | 3 + board/andes/ae350/readme.txt | 65 +++++ .../boot/extlinux/extlinux.conf | 4 + board/andes/ae350/uboot.config.fragment | 5 + configs/andes_ae350_45_defconfig | 43 +++ 13 files changed, 579 insertions(+) create mode 100755 board/andes/ae350/ae350.dts 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 100755 board/andes/ae350/post-build.sh create mode 100644 board/andes/ae350/readme.txt create mode 100644 board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf 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/genimage_sdcard.cfg b/board/andes/ae350/genimage_sdcard.cfg new file mode 100644 index 0000000000..b8b9fe6a62 --- /dev/null +++ b/board/andes/ae350/genimage_sdcard.cfg @@ -0,0 +1,26 @@ +image boot.vfat { + vfat { + files = { + "u-boot-spl.bin", + "u-boot.itb", + "ae350.dtb", + } + } + size = 2M +} + +image sdcard.img { + hdimage { + } + + partition boot { + partition-type = 0xC + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + bootable = true + 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/post-build.sh b/board/andes/ae350/post-build.sh new file mode 100755 index 0000000000..0e6ce228f4 --- /dev/null +++ b/board/andes/ae350/post-build.sh @@ -0,0 +1,3 @@ +#!/bin/sh +cp $BINARIES_DIR/Image $TARGET_DIR/boot +cp $BINARIES_DIR/ae350.dtb $TARGET_DIR/boot diff --git a/board/andes/ae350/readme.txt b/board/andes/ae350/readme.txt new file mode 100644 index 0000000000..6825468d50 --- /dev/null +++ b/board/andes/ae350/readme.txt @@ -0,0 +1,65 @@ +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/ + |-- ae350.dtb + |-- boot.vfat + |-- fw_dynamic.bin + |-- fw_dynamic.elf + |-- fw_jump.bin + |-- fw_jump.elf + |-- Image + |-- 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 + $ sudo sync + +Your SD card partition should be: + + Disk /dev/sdb: 14.48 GiB, 15552479232 bytes, 30375936 sectors + Disk model: Multi-Card + Units: sectors of 1 * 512 = 512 bytes + Sector size (logical/physical): 512 bytes / 512 bytes + I/O size (minimum/optimal): 512 bytes / 512 bytes + Disklabel type: dos + Disk identifier: 0x00000000 + + Device Boot Start End Sectors Size Id Type + /dev/sdb1 1 4096 4096 2M c W95 FAT32 (LBA) + /dev/sdb2 * 4097 126976 122880 60M 83 Linux + +Insert SD card and reset the board, it should boot Linux from mmc. diff --git a/board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf b/board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf new file mode 100644 index 0000000000..549eb93abc --- /dev/null +++ b/board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +label linux + kernel /boot/Image + fdt /boot/ae350.dtb + append earlycon=sbi root=/dev/mmcblk0p2 rootwait 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..a35ddd06ba --- /dev/null +++ b/configs/andes_ae350_45_defconfig @@ -0,0 +1,43 @@ +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_OVERLAY="board/andes/ae350/rootfs_overlay" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/andes/ae350/post-build.sh" +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_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/andestech/linux.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.10.84-ae350_45" +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_PYTHON3=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y +# BR2_TARGET_UBOOT_FORMAT_BIN is not set +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.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 -- 2.25.1 From fperrad at gmail.com Tue Feb 15 07:07:38 2022 From: fperrad at gmail.com (Francois Perrad) Date: Tue, 15 Feb 2022 08:07:38 +0100 Subject: [Buildroot] [PATCH 1/2] package/perl-gd: bump to version 2.76 Message-ID: <20220215070739.2199760-1-francois.perrad@gadz.org> remove upstreamed patch Signed-off-by: Francois Perrad --- ...-fix-cross-compilation-with-gdlib.pc.patch | 34 ------------------- package/perl-gd/perl-gd.hash | 4 +-- package/perl-gd/perl-gd.mk | 2 +- 3 files changed, 3 insertions(+), 37 deletions(-) delete mode 100644 package/perl-gd/0001-Makefile.PL-fix-cross-compilation-with-gdlib.pc.patch diff --git a/package/perl-gd/0001-Makefile.PL-fix-cross-compilation-with-gdlib.pc.patch b/package/perl-gd/0001-Makefile.PL-fix-cross-compilation-with-gdlib.pc.patch deleted file mode 100644 index af053c560..000000000 --- a/package/perl-gd/0001-Makefile.PL-fix-cross-compilation-with-gdlib.pc.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 11dc017e902397c452331425eb6101b3315572fa Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 24 Jan 2021 10:59:31 +0100 -Subject: [PATCH] Makefile.PL: fix cross-compilation with gdlib.pc - -Cross-compilation will fail if gdlib.pc does not contain any cflags. -Indeed, if cflags is empty, Makefile.PL will use the default value for -INC (i.e. -I/usr/include -I/usr/include/gd) - -It should be noted that gdlib-config has been dropped from gd since -version 2.3.0 - -Signed-off-by: Fabrice Fontaine -[Upstream status: probably not upstreamable] ---- - Makefile.PL | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.PL b/Makefile.PL -index 25f2f93..7da3651 100644 ---- a/Makefile.PL -+++ b/Makefile.PL -@@ -47,7 +47,7 @@ If you want to try to compile anyway, please rerun this script with the option - - END - } - -- at INC = qw(-I/usr/include -I/usr/include/gd) unless @INC; -+#@INC = qw(-I/usr/include -I/usr/include/gd) unless @INC; - @LIBPATH = qw(-L/usr/lib/X11 -L/usr/X11R6/lib -L/usr/X11/lib -L/usr/lib) unless @LIBPATH; - @LIBS = qw(-lgd) unless @LIBS; - --- -2.29.2 - diff --git a/package/perl-gd/perl-gd.hash b/package/perl-gd/perl-gd.hash index 780b1d1e2..97f1da821 100644 --- a/package/perl-gd/perl-gd.hash +++ b/package/perl-gd/perl-gd.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 c2bf1ca56d15e33d2432e4d8ba5aeadf GD-2.73.tar.gz -sha256 491c9e73238522e2987e66725a20935f4268a3864202ecbaf4659a1691ba322b GD-2.73.tar.gz +md5 fb4bacab10ed4f28d52c2aabdaf866bb GD-2.76.tar.gz +sha256 693d9e3d709e9188a682cb9090a77b70aac12a04e84128677577b94e4331775b GD-2.76.tar.gz # computed by scancpan sha256 1e2250289d6df4ba1c24f7550982d7ffaff2c97cd02e847659406e1afd28e83f LICENSE diff --git a/package/perl-gd/perl-gd.mk b/package/perl-gd/perl-gd.mk index b402dfff4..9787cc12f 100644 --- a/package/perl-gd/perl-gd.mk +++ b/package/perl-gd/perl-gd.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_GD_VERSION = 2.73 +PERL_GD_VERSION = 2.76 PERL_GD_SOURCE = GD-$(PERL_GD_VERSION).tar.gz PERL_GD_SITE = $(BR2_CPAN_MIRROR)/authors/id/R/RU/RURBAN PERL_GD_DEPENDENCIES = host-perl-extutils-pkgconfig zlib gd -- 2.32.0 From fperrad at gmail.com Tue Feb 15 07:07:39 2022 From: fperrad at gmail.com (Francois Perrad) Date: Tue, 15 Feb 2022 08:07:39 +0100 Subject: [Buildroot] [PATCH 2/2] package/perl-gd: add webp support In-Reply-To: <20220215070739.2199760-1-francois.perrad@gadz.org> References: <20220215070739.2199760-1-francois.perrad@gadz.org> Message-ID: <20220215070739.2199760-2-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/perl-gd/perl-gd.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/perl-gd/perl-gd.mk b/package/perl-gd/perl-gd.mk index 9787cc12f..cd32c7fb8 100644 --- a/package/perl-gd/perl-gd.mk +++ b/package/perl-gd/perl-gd.mk @@ -40,6 +40,12 @@ PERL_GD_OPTIONS += PNG PERL_GD_CONF_OPTS += -lib_png_path=$(STAGING_DIR)/usr endif +ifeq ($(BR2_PACKAGE_WEBP),y) +PERL_GD_DEPENDENCIES += webp +PERL_GD_OPTIONS += WEBP +PERL_GD_CONF_OPTS += -lib_webp_path=$(STAGING_DIR)/usr +endif + ifeq ($(BR2_PACKAGE_XLIB_LIBXPM),y) PERL_GD_DEPENDENCIES += xlib_libXpm PERL_GD_OPTIONS += XPM -- 2.32.0 From thomas.petazzoni at bootlin.com Tue Feb 15 07:23:31 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 15 Feb 2022 07:23:31 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-02-14 Message-ID: <20220215072336.EF8444026C@smtp4.osuosl.org> Hello, Autobuild statistics for 2022-02-14 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 46 | 10 | 0 | 56 | 2021.11.x | 9 | 2 | 0 | 11 | master | 45 | 36 | 0 | 81 | Classification of failures by reason for master ----------------------------------------------- bluez5_utils-5.63 | 9 host-libselinux-3.3 | 5 bpftool-a7f0e7f057283ae8af3... | 2 python-greenlet-1.1.2 | 2 rtorrent-0.9.8 | 2 unknown | 2 bat-0.19.0 | 1 dnsmasq-2.86 | 1 frr-8.1 | 1 gdb-10.2 | 1 ghostscript-9.55.0 | 1 kismet-2021-08-R1 | 1 libusb-1.0.25 | 1 mesa3d-21.3.5 | 1 mongodb-4.2.18 | 1 qt5webkit-5.212.0-alpha4 | 1 target-finalize | 1 tovid-87c676f4aadb7303d2cd9... | 1 wavemon-0.9.4 | 1 weston-10.0.0 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | bat-0.19.0 | NOK | http://autobuild.buildroot.net/results/b489ded8e2df5ccaee68b8653a6f8c973d9f277f | sh4 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/46f7dbfe1d80c7622d670ba1ac957e9e6077eb9f | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/1e7a0d5b5cdd899b31592c1b4eefa56fb63ea516 | nios2 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/103d8f9704b2b320b9e28f89f74009121691b1be | arc | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/207e13be0afe6b9ececee1ca93a07cd0d171ccfe | mips64el | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/04c2567b5613b9fd7cfae50f629ee104fdefe277 | arc | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/50022775b7f0534629c945d0383eec0408b27f69 | mips64el | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/7fb21ef2eb1a12fe7d28e3e0bc57a5ef381a018c | i686 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/6a8f998896f874d3a669151d1487ca572691db6d | arc | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/a9a4004f52c9d80047b1d86b82b60fb0696ed88e | powerpc64le | bpftool-a7f0e7f057283ae8af3... | NOK | http://autobuild.buildroot.net/results/390b70b66ce21ed2cfc69658c5bf88610b091f6b | mipsel | bpftool-a7f0e7f057283ae8af3... | NOK | http://autobuild.buildroot.net/results/302d69b5cba13934ca8f7cc4890ede61c7a3a741 | powerpc | dnsmasq-2.86 | NOK | http://autobuild.buildroot.net/results/9714d33f0679aa75d4add03087ac066f8b961b9e | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/e055d47e807e106ed8613de5eebfbb383d4d23cb | xtensa | gdb-10.2 | NOK | http://autobuild.buildroot.net/results/091f6ea9da11c095dff7d49c3916afa30b9e7ddb | ORPH arm | ghostscript-9.55.0 | NOK | http://autobuild.buildroot.net/results/fd35a47b2a77cf57c243ec1c88802b53ddca8f52 | nios2 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/f950b15ad0d87e50ff3935d9e4e4356804474fc3 | mips64el | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/4f822a0de9457aced04563952238524ff9720390 | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/fe4297556655eb15d0e7f9fd9d972033c092e144 | microblazeel | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/d7cdcbf921af462591e4e80d02506d6919984e3a | mips64el | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/72b36a7125826bdbb0451da3361a0fe0f2fb7f11 | sparc | kismet-2021-08-R1 | NOK | http://autobuild.buildroot.net/results/1b1da700a9b875ed8cb019c8974edd02f969d1c5 | ORPH sparc | libusb-1.0.25 | NOK | http://autobuild.buildroot.net/results/8b79c58e4d28281c020eb10515d1c16b72dadd42 | sh4 | mesa3d-21.3.5 | NOK | http://autobuild.buildroot.net/results/a53ca83cac36346d31d89edf481e10424e917379 | aarch64 | mongodb-4.2.18 | NOK | http://autobuild.buildroot.net/results/1a1dabae447feeee32ec34cc96563f088c0b4cd6 | riscv64 | python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/cdcf19168ea5aa82c57c36358ebec9c28201e2ea | mips64el | python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/6a91bec4336c147e1682880784af87a757b3d48a | arm | qt5webkit-5.212.0-alpha4 | NOK | http://autobuild.buildroot.net/results/af5b8baf4dc3de3b266debe99d1392e965cbe5fe | x86_64 | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/8d3a6ca73dfe1a4d878b299ee7e9761336e3caa0 | ORPH i686 | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/7082c83ec56177a9d83ddb607fd24e91cb201100 | ORPH m68k | target-finalize | NOK | http://autobuild.buildroot.net/results/8d7b0c23472abffc9447e4a6de273bdd04486d39 | arc | tovid-87c676f4aadb7303d2cd9... | NOK | http://autobuild.buildroot.net/results/9717c424bbef39c7603556e01e6dcaf5bf513855 | mipsel | unknown | NOK | http://autobuild.buildroot.net/results/c5e5e937c68a50eebee38b0f7a98c34575a966db | aarch64 | unknown | NOK | http://autobuild.buildroot.net/results/d0f5eee53f6e93998096f3927f5a378a7beef6c1 | nios2 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/930ef990ecf804f872fcb25ec4ec544e33567c04 | arc | weston-10.0.0 | NOK | http://autobuild.buildroot.net/results/e669a6237c19783c627169c819d7372e20daaf54 | Classification of failures by reason for 2021.02.x -------------------------------------------------- zeromq-4.3.4 | 3 rocksdb-6.13.3 | 2 unknown | 2 host-sentry-cli-1.57.0 | 1 ndisc6-1.0.4 | 1 openldap-2.4.59 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/993cabc3cb3a64dcf632f2d1ef1efd48030177d5 | arm | ndisc6-1.0.4 | NOK | http://autobuild.buildroot.net/results/b1451075d49a02a5fa9318b700dc227543868545 | ORPH riscv32 | openldap-2.4.59 | NOK | http://autobuild.buildroot.net/results/0ca955cc1adf21c8275def251c1d7b59688a555c | arm | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/36681a8c949f74ec16918cabd5cf94a73f24dcc8 | m68k | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/fa7b80702bb204f12b04cd86d8e8c86a6483bf4e | arm | unknown | NOK | http://autobuild.buildroot.net/results/39c2aaf5a12ff24bc17e67020e812c48a56cddf5 | i686 | unknown | NOK | http://autobuild.buildroot.net/results/94dc981b95e84cd51816ce0f9152c2c23ae9f781 | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/7e8c0ab0006d68f23661e08f5ed15a0f3b2c6428 | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/e7fa50228728210b5d8d39f41a7218b33fdf05fe | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/734b8b506b310cfe29ed4494ae74c0e1c0dabed3 | Classification of failures by reason for 2021.11.x -------------------------------------------------- wavemon-0.9.4 | 2 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arc | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/ddcef7e036147e50acb39af3b7e7c98fbe98eebf | mips64el | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/3384ab0fcb9a8554dbeb22d4262d31fc42338a17 | Gitlab CI results for 2022-02-14 ================================ Detail of defconfig failures for 2022.02-rc1 -------------------------------------------- defconfig | link to the job | orph? ----------------------------------+---------------------------------------------------------------+------ qemu_ppc64le_pseries | https://gitlab.com/buildroot.org/buildroot/-/jobs/2087852289 | qemu_s390x | https://gitlab.com/buildroot.org/buildroot/-/jobs/2087852300 | Detail of runtime-test failures for 2022.02-rc1 ----------------------------------------------- runtime-test | link to the job | orph? --------------------------+---------------------------------------------------------------+------ TestIPythonPy3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2087852418 | ORPH TestLuaLuasyslog | https://gitlab.com/buildroot.org/buildroot/-/jobs/2087852492 | ORPH TestLxc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2087852495 | ORPH TestPerlLWPProtocolhttps | https://gitlab.com/buildroot.org/buildroot/-/jobs/2087852520 | ORPH TestPythonPy3Cryptography | https://gitlab.com/buildroot.org/buildroot/-/jobs/2087852572 | ORPH TestPythonPy3Pyyaml | https://gitlab.com/buildroot.org/buildroot/-/jobs/2087852603 | ORPH TestRust | https://gitlab.com/buildroot.org/buildroot/-/jobs/2087852624 | ORPH TestRustBin | https://gitlab.com/buildroot.org/buildroot/-/jobs/2087852627 | ORPH Detail of runtime-test failures for master ------------------------------------------ runtime-test | link to the job | orph? --------------------------+---------------------------------------------------------------+------ TestCrudiniPy3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2088683760 | ORPH TestIPythonPy3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2088683795 | ORPH TestLuaLuasyslog | https://gitlab.com/buildroot.org/buildroot/-/jobs/2088683903 | ORPH TestLxc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2088683908 | ORPH TestPythonPy3Pyyaml | https://gitlab.com/buildroot.org/buildroot/-/jobs/2088684091 | ORPH TestRust | https://gitlab.com/buildroot.org/buildroot/-/jobs/2088684137 | ORPH TestRustBin | https://gitlab.com/buildroot.org/buildroot/-/jobs/2088684141 | ORPH -- http://autobuild.buildroot.net From james.hilliard1 at gmail.com Tue Feb 15 01:53:05 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 14 Feb 2022 18:53:05 -0700 Subject: [Buildroot] [PATCH v8 3/5] package/qt5/qt5webengine-chromium: new package In-Reply-To: <20220215015307.855341-1-james.hilliard1@gmail.com> References: <20220215015307.855341-1-james.hilliard1@gmail.com> Message-ID: <20220215015307.855341-3-james.hilliard1@gmail.com> 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. Signed-off-by: James Hilliard --- package/qt5/Config.in | 1 + .../0001-Add-python3-build-support.patch | 1858 +++++++++++++++++ .../0002-Don-t-rebase-sysroot-path.patch | 32 + package/qt5/qt5webengine-chromium/Config.in | 5 + .../qt5webengine-chromium/chromium-latest.inc | 1257 +++++++++++ .../qt5webengine-chromium.hash | 1256 +++++++++++ .../qt5webengine-chromium.mk | 23 + 7 files changed, 4432 insertions(+) create mode 100644 package/qt5/qt5webengine-chromium/0001-Add-python3-build-support.patch create mode 100644 package/qt5/qt5webengine-chromium/0002-Don-t-rebase-sysroot-path.patch 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 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/qt5webengine-chromium/0001-Add-python3-build-support.patch b/package/qt5/qt5webengine-chromium/0001-Add-python3-build-support.patch new file mode 100644 index 0000000000..cc9726418e --- /dev/null +++ b/package/qt5/qt5webengine-chromium/0001-Add-python3-build-support.patch @@ -0,0 +1,1858 @@ +From bf94b834e9beb4e7bc25dbc4c61f5e2db39e7cdc Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Fri, 4 Feb 2022 15:43:35 -0700 +Subject: [PATCH] Add python3 build support + +Adapted from: +https://github.com/archlinux/svntogit-packages/blob/6edf5f1aaea952d046aff89a2e0175258fe77361/trunk/qt5-webengine-chromium-python3.patch + +Signed-off-by: James Hilliard +--- + .../protobufs/binary_proto_generator.py | 8 +- + .../tracing/generate_trace_viewer_grd.py | 2 +- + chromium/mojo/public/tools/bindings/BUILD.gn | 2 + + .../tools/bindings/gen_data_files_list.py | 8 +- + .../generators/mojom_java_generator.py | 4 + + .../tools/mojom/mojom/generate/generator.py | 14 ++-- + .../tools/mojom/mojom/generate/module.py | 3 +- + .../mojom/mojom/generate/template_expander.py | 12 +-- + .../scripts/bind_gen/blink_v8_bridge.py | 6 +- + .../scripts/bind_gen/callback_interface.py | 2 +- + .../bindings/scripts/bind_gen/code_node.py | 10 +-- + .../bindings/scripts/bind_gen/codegen_expr.py | 15 ++-- + .../scripts/bind_gen/codegen_format.py | 2 +- + .../scripts/bind_gen/codegen_utils.py | 2 +- + .../bindings/scripts/bind_gen/dictionary.py | 2 +- + .../bindings/scripts/bind_gen/interface.py | 82 +++++++++++-------- + .../scripts/bind_gen/mako_renderer.py | 2 +- + .../bindings/scripts/bind_gen/style_format.py | 9 +- + .../bindings/scripts/bind_gen/task_queue.py | 5 +- + .../bindings/scripts/code_generator.py | 10 +++ + .../scripts/generate_origin_trial_features.py | 4 +- + .../bindings/scripts/idl_definitions.py | 8 +- + .../renderer/bindings/scripts/idl_reader.py | 4 +- + .../renderer/bindings/scripts/idl_types.py | 2 +- + .../renderer/bindings/scripts/utilities.py | 28 +++---- + .../renderer/bindings/scripts/v8_interface.py | 9 +- + .../renderer/bindings/scripts/v8_methods.py | 4 + + .../renderer/bindings/scripts/v8_utilities.py | 2 +- + .../scripts/web_idl/callback_interface.py | 12 +-- + .../bindings/scripts/web_idl/database.py | 2 +- + .../bindings/scripts/web_idl/exposure.py | 5 +- + .../bindings/scripts/web_idl/function_like.py | 28 +++---- + .../bindings/scripts/web_idl/idl_compiler.py | 21 ++--- + .../bindings/scripts/web_idl/interface.py | 45 +++++----- + .../bindings/scripts/web_idl/ir_builder.py | 29 ++++--- + .../bindings/scripts/web_idl/make_copy.py | 7 ++ + .../bindings/scripts/web_idl/namespace.py | 12 +-- + .../bindings/templates/dictionary_v8.cc.tmpl | 8 +- + .../scripts/core/css/make_style_shorthands.py | 23 +++--- + .../properties/make_css_property_instances.py | 4 +- + .../blink/renderer/build/scripts/gperf.py | 2 +- + .../blink/renderer/build/scripts/in_file.py | 2 +- + .../renderer/build/scripts/in_generator.py | 5 ++ + .../build/scripts/make_runtime_features.py | 2 +- + .../scripts/templates/element_factory.cc.tmpl | 4 +- + .../templates/element_type_helpers.cc.tmpl | 4 +- + .../templates/element_type_helpers.h.tmpl | 2 +- + .../build/scripts/templates/macros.tmpl | 4 +- + .../templates/make_qualified_names.h.tmpl | 4 +- + .../dawn/generator/generator_lib.py | 4 + + .../devtools-frontend/src/BUILD.gn | 2 + + .../scripts/build/build_inspector_overlay.py | 3 +- + .../build/build_release_applications.py | 9 +- + .../scripts/build/generate_devtools_grd.py | 4 +- + .../src/scripts/build/modular_build.py | 6 +- + chromium/third_party/jinja2/tests.py | 2 +- + chromium/tools/metrics/ukm/gen_builders.py | 5 +- + .../ui/ozone/generate_constructor_list.py | 13 ++- + .../ui/ozone/generate_ozone_platform_list.py | 26 ++++-- + 59 files changed, 331 insertions(+), 229 deletions(-) + +diff --git a/chromium/components/resources/protobufs/binary_proto_generator.py b/chromium/components/resources/protobufs/binary_proto_generator.py +index 7422ead9697..16365515f26 100755 +--- a/chromium/components/resources/protobufs/binary_proto_generator.py ++++ b/chromium/components/resources/protobufs/binary_proto_generator.py +@@ -7,7 +7,7 @@ + Converts a given ASCII proto into a binary resource. + + """ +- ++from __future__ import print_function + import abc + import imp + import optparse +@@ -196,12 +196,12 @@ class BinaryProtoGenerator: + self._ImportProtoModules(opts.path) + + if not self.VerifyArgs(opts): +- print "Wrong arguments" ++ print("Wrong arguments") + return 1 + + try: + self._GenerateBinaryProtos(opts) + except Exception as e: +- print "ERROR: Failed to render binary version of %s:\n %s\n%s" % ( +- opts.infile, str(e), traceback.format_exc()) ++ print("ERROR: Failed to render binary version of %s:\n %s\n%s" % ++ (opts.infile, str(e), traceback.format_exc())) + return 1 +diff --git a/chromium/content/browser/tracing/generate_trace_viewer_grd.py b/chromium/content/browser/tracing/generate_trace_viewer_grd.py +index 037f9497dc2..be393d21f90 100755 +--- a/chromium/content/browser/tracing/generate_trace_viewer_grd.py ++++ b/chromium/content/browser/tracing/generate_trace_viewer_grd.py +@@ -74,7 +74,7 @@ def main(argv): + for filename in parsed_args.source_files: + add_file_to_grd(doc, os.path.basename(filename)) + +- with open(parsed_args.output_filename, 'w') as output_file: ++ with open(parsed_args.output_filename, 'wb') as output_file: + output_file.write(doc.toxml(encoding='UTF-8')) + + +diff --git a/chromium/mojo/public/tools/bindings/BUILD.gn b/chromium/mojo/public/tools/bindings/BUILD.gn +index fc04b5dd0b1..708958e438b 100644 +--- a/chromium/mojo/public/tools/bindings/BUILD.gn ++++ b/chromium/mojo/public/tools/bindings/BUILD.gn +@@ -2,9 +2,11 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import("//build/config/python.gni") + import("//mojo/public/tools/bindings/mojom.gni") + import("//third_party/jinja2/jinja2.gni") + ++# TODO(crbug.com/1194274): Investigate nondeterminism in Py3 builds. + action("precompile_templates") { + sources = mojom_generator_sources + sources += [ +diff --git a/chromium/mojo/public/tools/bindings/gen_data_files_list.py b/chromium/mojo/public/tools/bindings/gen_data_files_list.py +index 79c9e50efce..8b78d092418 100644 +--- a/chromium/mojo/public/tools/bindings/gen_data_files_list.py ++++ b/chromium/mojo/public/tools/bindings/gen_data_files_list.py +@@ -18,7 +18,6 @@ import os + import re + import sys + +-from cStringIO import StringIO + from optparse import OptionParser + + sys.path.insert( +@@ -41,12 +40,9 @@ def main(): + pattern = re.compile(options.pattern) + files = [f for f in os.listdir(options.directory) if pattern.match(f)] + +- stream = StringIO() +- for f in files: +- print(f, file=stream) ++ contents = '\n'.join(f for f in files) + '\n' ++ WriteFile(contents, options.output) + +- WriteFile(stream.getvalue(), options.output) +- stream.close() + + if __name__ == '__main__': + sys.exit(main()) +diff --git a/chromium/mojo/public/tools/bindings/generators/mojom_java_generator.py b/chromium/mojo/public/tools/bindings/generators/mojom_java_generator.py +index 96b2fdfae0c..00b9dccd00c 100644 +--- a/chromium/mojo/public/tools/bindings/generators/mojom_java_generator.py ++++ b/chromium/mojo/public/tools/bindings/generators/mojom_java_generator.py +@@ -25,6 +25,10 @@ sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir, + 'build', 'android', 'gyp')) + from util import build_utils + ++# TODO(crbug.com/1174969): Remove this once Python2 is obsoleted. ++if sys.version_info.major != 2: ++ basestring = str ++ long = int + + GENERATOR_PREFIX = 'java' + +diff --git a/chromium/mojo/public/tools/mojom/mojom/generate/generator.py b/chromium/mojo/public/tools/mojom/mojom/generate/generator.py +index de62260a5c9..4a1c73fcf82 100644 +--- a/chromium/mojo/public/tools/mojom/mojom/generate/generator.py ++++ b/chromium/mojo/public/tools/mojom/mojom/generate/generator.py +@@ -136,9 +136,14 @@ class Stylizer(object): + + def WriteFile(contents, full_path): + # If |contents| is same with the file content, we skip updating. ++ if not isinstance(contents, bytes): ++ data = contents.encode('utf8') ++ else: ++ data = contents ++ + if os.path.isfile(full_path): + with open(full_path, 'rb') as destination_file: +- if destination_file.read() == contents: ++ if destination_file.read() == data: + return + + # Make sure the containing directory exists. +@@ -146,11 +151,8 @@ def WriteFile(contents, full_path): + fileutil.EnsureDirectoryExists(full_dir) + + # Dump the data to disk. +- with open(full_path, "wb") as f: +- if not isinstance(contents, bytes): +- f.write(contents.encode('utf-8')) +- else: +- f.write(contents) ++ with open(full_path, 'wb') as f: ++ f.write(data) + + + def AddComputedData(module): +diff --git a/chromium/mojo/public/tools/mojom/mojom/generate/module.py b/chromium/mojo/public/tools/mojom/mojom/generate/module.py +index ebbc9b322ea..3d026429bbc 100644 +--- a/chromium/mojo/public/tools/mojom/mojom/generate/module.py ++++ b/chromium/mojo/public/tools/mojom/mojom/generate/module.py +@@ -398,7 +398,8 @@ class Field(object): + + + class StructField(Field): +- pass ++ def __hash__(self): ++ return super(Field, self).__hash__() + + + class UnionField(Field): +diff --git a/chromium/mojo/public/tools/mojom/mojom/generate/template_expander.py b/chromium/mojo/public/tools/mojom/mojom/generate/template_expander.py +index 7a300560246..8d9e26fb7f6 100644 +--- a/chromium/mojo/public/tools/mojom/mojom/generate/template_expander.py ++++ b/chromium/mojo/public/tools/mojom/mojom/generate/template_expander.py +@@ -75,9 +75,9 @@ def PrecompileTemplates(generator_modules, output_dir): + os.path.dirname(module.__file__), generator.GetTemplatePrefix()) + ])) + jinja_env.filters.update(generator.GetFilters()) +- jinja_env.compile_templates( +- os.path.join(output_dir, "%s.zip" % generator.GetTemplatePrefix()), +- extensions=["tmpl"], +- zip="stored", +- py_compile=True, +- ignore_errors=False) ++ jinja_env.compile_templates(os.path.join( ++ output_dir, "%s.zip" % generator.GetTemplatePrefix()), ++ extensions=["tmpl"], ++ zip="stored", ++ py_compile=sys.version_info.major < 3, ++ ignore_errors=False) +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/blink_v8_bridge.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/blink_v8_bridge.py +index 3225ecca6e4..fc078d31b55 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/blink_v8_bridge.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/blink_v8_bridge.py +@@ -344,7 +344,7 @@ def make_default_value_expr(idl_type, default_value): + """ + assert default_value.is_type_compatible_with(idl_type) + +- class DefaultValueExpr: ++ class DefaultValueExpr(object): + _ALLOWED_SYMBOLS_IN_DEPS = ("isolate") + + def __init__(self, initializer_expr, initializer_deps, +@@ -502,7 +502,7 @@ def make_v8_to_blink_value(blink_var_name, + assert isinstance(blink_var_name, str) + assert isinstance(v8_value_expr, str) + assert isinstance(idl_type, web_idl.IdlType) +- assert (argument_index is None or isinstance(argument_index, (int, long))) ++ assert (argument_index is None or isinstance(argument_index, int)) + assert (default_value is None + or isinstance(default_value, web_idl.LiteralConstant)) + +@@ -622,7 +622,7 @@ def make_v8_to_blink_value_variadic(blink_var_name, v8_array, + """ + assert isinstance(blink_var_name, str) + assert isinstance(v8_array, str) +- assert isinstance(v8_array_start_index, (int, long)) ++ assert isinstance(v8_array_start_index, int) + assert isinstance(idl_type, web_idl.IdlType) + + pattern = ("auto&& ${{{_1}}} = " +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/callback_interface.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/callback_interface.py +index 4a6df513068..8b51f23a409 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/callback_interface.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/callback_interface.py +@@ -177,7 +177,7 @@ def generate_callback_interface(callback_interface_identifier): + prop_install_mode=PropInstallMode.UNCONDITIONAL, + trampoline_var_name=None, + attribute_entries=[], +- constant_entries=filter(is_unconditional, constant_entries), ++ constant_entries=list(filter(is_unconditional, constant_entries)), + exposed_construct_entries=[], + operation_entries=[]) + (install_interface_template_decl, install_interface_template_def, +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/code_node.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/code_node.py +index 52972fefe20..e5ae9d9629e 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/code_node.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/code_node.py +@@ -503,13 +503,13 @@ class CompositeNode(CodeNode): + gensym_kwargs = {} + template_vars = {} + for arg in args: +- assert isinstance(arg, (CodeNode, int, long, str)) ++ assert isinstance(arg, (CodeNode, int, str)) + gensym = CodeNode.gensym() + gensym_args.append("${{{}}}".format(gensym)) + template_vars[gensym] = arg + for key, value in kwargs.items(): +- assert isinstance(key, (int, long, str)) +- assert isinstance(value, (CodeNode, int, long, str)) ++ assert isinstance(key, (int, str)) ++ assert isinstance(value, (CodeNode, int, str)) + gensym = CodeNode.gensym() + gensym_kwargs[key] = "${{{}}}".format(gensym) + template_vars[gensym] = value +@@ -602,7 +602,7 @@ class ListNode(CodeNode): + def insert(self, index, node): + if node is None: + return +- assert isinstance(index, (int, long)) ++ assert isinstance(index, int) + assert isinstance(node, CodeNode) + assert node.outer is None and node.prev is None + +@@ -721,7 +721,7 @@ class SymbolScopeNode(SequenceNode): + if not scope_chains: + return counts + +- self_index = iter(scope_chains).next().index(self) ++ self_index = next(iter(scope_chains)).index(self) + scope_chains = map( + lambda scope_chain: scope_chain[self_index + 1:], scope_chains) + scope_to_likeliness = {} +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_expr.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_expr.py +index a229a6c71c9..5fa288dabf2 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_expr.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_expr.py +@@ -109,7 +109,7 @@ def expr_and(terms): + + if any(term.is_always_false for term in terms): + return _Expr(False) +- terms = filter(lambda x: not x.is_always_true, terms) ++ terms = list(filter(lambda x: not x.is_always_true, terms)) + if not terms: + return _Expr(True) + if len(terms) == 1: +@@ -124,7 +124,7 @@ def expr_or(terms): + + if any(term.is_always_true for term in terms): + return _Expr(True) +- terms = filter(lambda x: not x.is_always_false, terms) ++ terms = list(filter(lambda x: not x.is_always_false, terms)) + if not terms: + return _Expr(False) + if len(terms) == 1: +@@ -222,7 +222,7 @@ def expr_from_exposure(exposure, + elif exposure.only_in_secure_contexts is False: + secure_context_term = _Expr(True) + else: +- terms = map(ref_enabled, exposure.only_in_secure_contexts) ++ terms = list(map(ref_enabled, exposure.only_in_secure_contexts)) + secure_context_term = expr_or( + [_Expr("${is_in_secure_context}"), + expr_not(expr_and(terms))]) +@@ -275,10 +275,11 @@ def expr_from_exposure(exposure, + + # [ContextEnabled] + if exposure.context_enabled_features: +- terms = map( +- lambda feature: _Expr( +- "${{context_feature_settings}}->is{}Enabled()".format( +- feature)), exposure.context_enabled_features) ++ terms = list( ++ map( ++ lambda feature: _Expr( ++ "${{context_feature_settings}}->is{}Enabled()".format( ++ feature)), exposure.context_enabled_features)) + context_enabled_terms.append( + expr_and([_Expr("${context_feature_settings}"), + expr_or(terms)])) +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_format.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_format.py +index 87d26eec3ca..f3e9d38247e 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_format.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_format.py +@@ -23,7 +23,7 @@ class _TemplateFormatter(string.Formatter): + self._template_formatter_indexing_count_ = 0 + + def get_value(self, key, args, kwargs): +- if isinstance(key, (int, long)): ++ if isinstance(key, int): + return args[key] + assert isinstance(key, str) + if not key: +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_utils.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_utils.py +index 2bcc4fed49a..e72282aa696 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_utils.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_utils.py +@@ -116,4 +116,4 @@ def write_code_node_to_file(code_node, filepath): + # stderr=format_result.error_message)) + # + # web_idl.file_io.write_to_file_if_changed(filepath, format_result.contents) +- web_idl.file_io.write_to_file_if_changed(filepath, rendered_text) ++ web_idl.file_io.write_to_file_if_changed(filepath, rendered_text.encode('utf-8')) +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/dictionary.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/dictionary.py +index b39f0100410..4d68202296b 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/dictionary.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/dictionary.py +@@ -993,7 +993,7 @@ def make_dict_trace_func(cg_context): + _2 = _blink_member_name(member).value_var + return TextNode(_format(pattern, _1=_1, _2=_2)) + +- body.extend(map(make_trace_member_node, own_members)) ++ body.extend(list(map(make_trace_member_node, own_members))) + body.append(TextNode("BaseClass::Trace(visitor);")) + + return func_decl, func_def +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py +index 10ff30656ad..bfdf7128aac 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py +@@ -582,7 +582,7 @@ def _make_blink_api_call(code_node, + overriding_args=None): + assert isinstance(code_node, SymbolScopeNode) + assert isinstance(cg_context, CodeGenContext) +- assert num_of_args is None or isinstance(num_of_args, (int, long)) ++ assert num_of_args is None or isinstance(num_of_args, int) + assert (overriding_args is None + or (isinstance(overriding_args, (list, tuple)) + and all(isinstance(arg, str) for arg in overriding_args))) +@@ -1196,8 +1196,10 @@ def make_overload_dispatcher(cg_context): + did_use_break = did_use_break or can_fail + + conditional = expr_or( +- map(lambda item: expr_from_exposure(item.function_like.exposure), +- items)) ++ list( ++ map( ++ lambda item: expr_from_exposure(item.function_like.exposure ++ ), items))) + if not conditional.is_always_true: + node = CxxUnlikelyIfNode(cond=conditional, body=node) + +@@ -4642,7 +4644,7 @@ class _PropEntryConstructorGroup(_PropEntryBase): + def __init__(self, is_context_dependent, exposure_conditional, world, + constructor_group, ctor_callback_name, ctor_func_length): + assert isinstance(ctor_callback_name, str) +- assert isinstance(ctor_func_length, (int, long)) ++ assert isinstance(ctor_func_length, int) + + _PropEntryBase.__init__(self, is_context_dependent, + exposure_conditional, world, constructor_group) +@@ -4670,7 +4672,7 @@ class _PropEntryOperationGroup(_PropEntryBase): + op_func_length, + no_alloc_direct_callback_name=None): + assert isinstance(op_callback_name, str) +- assert isinstance(op_func_length, (int, long)) ++ assert isinstance(op_func_length, int) + + _PropEntryBase.__init__(self, is_context_dependent, + exposure_conditional, world, operation_group) +@@ -5175,9 +5177,9 @@ def make_install_interface_template(cg_context, function_name, class_name, api_c + ]) + + if class_like.identifier == "CSSStyleDeclaration": +- css_properties = filter( +- lambda attr: "CSSProperty" in attr.extended_attributes, +- class_like.attributes) ++ css_properties = list( ++ filter(lambda attr: "CSSProperty" in attr.extended_attributes, ++ class_like.attributes)) + if css_properties: + prop_name_list = "".join( + map(lambda attr: "\"{}\", ".format(attr.identifier), +@@ -5567,8 +5569,8 @@ ${instance_object} = ${v8_context}->Global()->GetPrototype().As();\ + "V8DOMConfiguration::InstallConstants(${isolate}, " + "${interface_template}, ${prototype_template}, " + "kConstantCallbackTable, base::size(kConstantCallbackTable));") +- constant_callback_entries = filter(lambda entry: entry.const_callback_name, +- constant_entries) ++ constant_callback_entries = list(filter(lambda entry: entry.const_callback_name, ++ constant_entries)) + install_properties(table_name, constant_callback_entries, + _make_constant_callback_registration_table, + installer_call_text) +@@ -5584,8 +5586,8 @@ ${instance_object} = ${v8_context}->Global()->GetPrototype().As();\ + "V8DOMConfiguration::InstallConstants(${isolate}, " + "${interface_template}, ${prototype_template}, " + "kConstantValueTable, base::size(kConstantValueTable));") +- constant_value_entries = filter( +- lambda entry: not entry.const_callback_name, constant_entries) ++ constant_value_entries = list(filter( ++ lambda entry: not entry.const_callback_name, constant_entries)) + install_properties(table_name, constant_value_entries, + _make_constant_value_registration_table, + installer_call_text) +@@ -6336,8 +6338,8 @@ def make_v8_context_snapshot_api(cg_context, component, attribute_entries, + assert isinstance(component, web_idl.Component) + + derived_interfaces = cg_context.interface.deriveds +- derived_names = map(lambda interface: interface.identifier, +- derived_interfaces) ++ derived_names = list( ++ map(lambda interface: interface.identifier, derived_interfaces)) + derived_names.append(cg_context.interface.identifier) + if not ("Window" in derived_names or "HTMLDocument" in derived_names): + return None, None +@@ -6411,9 +6413,11 @@ def _make_v8_context_snapshot_get_reference_table_function( + collect_callbacks(named_properties_object_callback_defs) + collect_callbacks(cross_origin_property_callback_defs) + +- entry_nodes = map( +- lambda name: TextNode("reinterpret_cast({}),".format(name)), +- filter(None, callback_names)) ++ entry_nodes = list( ++ map( ++ lambda name: TextNode("reinterpret_cast({}),".format(name ++ )), ++ filter(None, callback_names))) + table_node = ListNode([ + TextNode("using namespace ${class_name}Callbacks;"), + TextNode("static const intptr_t kReferenceTable[] = {"), +@@ -6451,10 +6455,11 @@ def _make_v8_context_snapshot_install_props_per_context_function( + class_name=None, + prop_install_mode=PropInstallMode.V8_CONTEXT_SNAPSHOT, + trampoline_var_name=None, +- attribute_entries=filter(selector, attribute_entries), +- constant_entries=filter(selector, constant_entries), +- exposed_construct_entries=filter(selector, exposed_construct_entries), +- operation_entries=filter(selector, operation_entries)) ++ attribute_entries=list(filter(selector, attribute_entries)), ++ constant_entries=list(filter(selector, constant_entries)), ++ exposed_construct_entries=list( ++ filter(selector, exposed_construct_entries)), ++ operation_entries=list(filter(selector, operation_entries))) + + return func_decl, func_def + +@@ -6810,11 +6815,11 @@ def generate_interface(interface_identifier): + class_name=impl_class_name, + prop_install_mode=PropInstallMode.UNCONDITIONAL, + trampoline_var_name=tp_install_unconditional_props, +- attribute_entries=filter(is_unconditional, attribute_entries), +- constant_entries=filter(is_unconditional, constant_entries), +- exposed_construct_entries=filter(is_unconditional, +- exposed_construct_entries), +- operation_entries=filter(is_unconditional, operation_entries)) ++ attribute_entries=list(filter(is_unconditional, attribute_entries)), ++ constant_entries=list(filter(is_unconditional, constant_entries)), ++ exposed_construct_entries=list( ++ filter(is_unconditional, exposed_construct_entries)), ++ operation_entries=list(filter(is_unconditional, operation_entries))) + (install_context_independent_props_decl, + install_context_independent_props_def, + install_context_independent_props_trampoline) = make_install_properties( +@@ -6823,11 +6828,14 @@ def generate_interface(interface_identifier): + class_name=impl_class_name, + prop_install_mode=PropInstallMode.CONTEXT_INDEPENDENT, + trampoline_var_name=tp_install_context_independent_props, +- attribute_entries=filter(is_context_independent, attribute_entries), +- constant_entries=filter(is_context_independent, constant_entries), +- exposed_construct_entries=filter(is_context_independent, +- exposed_construct_entries), +- operation_entries=filter(is_context_independent, operation_entries)) ++ attribute_entries=list( ++ filter(is_context_independent, attribute_entries)), ++ constant_entries=list(filter(is_context_independent, ++ constant_entries)), ++ exposed_construct_entries=list( ++ filter(is_context_independent, exposed_construct_entries)), ++ operation_entries=list( ++ filter(is_context_independent, operation_entries))) + (install_context_dependent_props_decl, install_context_dependent_props_def, + install_context_dependent_props_trampoline) = make_install_properties( + cg_context, +@@ -6835,11 +6843,13 @@ def generate_interface(interface_identifier): + class_name=impl_class_name, + prop_install_mode=PropInstallMode.CONTEXT_DEPENDENT, + trampoline_var_name=tp_install_context_dependent_props, +- attribute_entries=filter(is_context_dependent, attribute_entries), +- constant_entries=filter(is_context_dependent, constant_entries), +- exposed_construct_entries=filter(is_context_dependent, +- exposed_construct_entries), +- operation_entries=filter(is_context_dependent, operation_entries)) ++ attribute_entries=list(filter(is_context_dependent, ++ attribute_entries)), ++ constant_entries=list(filter(is_context_dependent, constant_entries)), ++ exposed_construct_entries=list( ++ filter(is_context_dependent, exposed_construct_entries)), ++ operation_entries=list(filter(is_context_dependent, ++ operation_entries))) + (install_interface_template_decl, install_interface_template_def, + install_interface_template_trampoline) = make_install_interface_template( + cg_context, +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/mako_renderer.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/mako_renderer.py +index b4c70553863..f3a2fcd772d 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/mako_renderer.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/mako_renderer.py +@@ -105,7 +105,7 @@ class MakoRenderer(object): + on_error = self._caller_stack_on_error + if (len(current) <= len(on_error) + and all(current[i] == on_error[i] +- for i in xrange(len(current)))): ++ for i in range(len(current)))): + pass # Error happened in a deeper caller. + else: + self._caller_stack_on_error = list(self._caller_stack) +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py +index dc3493cc394..017d3d47bb3 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py +@@ -70,8 +70,13 @@ def gn_format(contents, filename=None): + + + def _invoke_format_command(command_line, filename, contents): +- proc = subprocess.Popen( +- command_line, stdin=subprocess.PIPE, stdout=subprocess.PIPE) ++ kwargs = {} ++ if sys.version_info.major != 2: ++ kwargs['encoding'] = 'utf-8' ++ proc = subprocess.Popen(command_line, ++ stdin=subprocess.PIPE, ++ stdout=subprocess.PIPE, ++ **kwargs) + stdout_output, stderr_output = proc.communicate(input=contents) + exit_code = proc.wait() + +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/task_queue.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/task_queue.py +index 0d8f4c0f303..e666a9b668e 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/task_queue.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/task_queue.py +@@ -2,6 +2,7 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import functools + import multiprocessing + + from .package_initializer import package_initializer +@@ -76,7 +77,7 @@ class TaskQueue(object): + if not report_progress: + return + +- done_count = reduce( ++ done_count = functools.reduce( + lambda count, worker_task: count + bool(worker_task.ready()), + self._worker_tasks, 0) + report_progress(len(self._worker_tasks), done_count) +@@ -85,4 +86,4 @@ class TaskQueue(object): + def _task_queue_run_tasks(tasks): + for task in tasks: + func, args, kwargs = task +- apply(func, args, kwargs) ++ func(*args, **kwargs) +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/code_generator.py b/chromium/third_party/blink/renderer/bindings/scripts/code_generator.py +index e8280be7213..e49e6eb965e 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/code_generator.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/code_generator.py +@@ -13,6 +13,7 @@ import re + import sys + + from idl_types import set_ancestors, IdlType ++from itertools import groupby + from v8_globals import includes + from v8_interface import constant_filters + from v8_types import set_component_dirs +@@ -43,6 +44,7 @@ TEMPLATES_DIR = os.path.normpath( + # after path[0] == invoking script dir + sys.path.insert(1, THIRD_PARTY_DIR) + import jinja2 ++from jinja2.filters import make_attrgetter, environmentfilter + + + def generate_indented_conditional(code, conditional): +@@ -88,6 +90,13 @@ def runtime_enabled_if(code, name): + return generate_indented_conditional(code, function) + + ++ at environmentfilter ++def do_stringify_key_group_by(environment, value, attribute): ++ expr = make_attrgetter(environment, attribute) ++ key = lambda item: '' if expr(item) is None else str(expr(item)) ++ return groupby(sorted(value, key=key), expr) ++ ++ + def initialize_jinja_env(cache_dir): + jinja_env = jinja2.Environment( + loader=jinja2.FileSystemLoader(TEMPLATES_DIR), +@@ -117,6 +126,7 @@ def initialize_jinja_env(cache_dir): + }) + jinja_env.filters.update(constant_filters()) + jinja_env.filters.update(method_filters()) ++ jinja_env.filters["stringifykeygroupby"] = do_stringify_key_group_by + return jinja_env + + +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/generate_origin_trial_features.py b/chromium/third_party/blink/renderer/bindings/scripts/generate_origin_trial_features.py +index 130004eae83..04c0fabcef2 100755 +--- a/chromium/third_party/blink/renderer/bindings/scripts/generate_origin_trial_features.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/generate_origin_trial_features.py +@@ -80,7 +80,7 @@ def read_idl_file(reader, idl_filename): + assert len(interfaces) == 1, ( + "Expected one interface in file %r, found %d" % + (idl_filename, len(interfaces))) +- return (interfaces.values()[0], includes) ++ return (list(interfaces.values())[0], includes) + + + def interface_is_global(interface): +@@ -281,7 +281,7 @@ def main(): + + info_provider = create_component_info_provider( + os.path.normpath(options.info_dir), options.target_component) +- idl_filenames = map(str.strip, open(options.idl_files_list)) ++ idl_filenames = list(map(str.strip, open(options.idl_files_list))) + + generate_origin_trial_features(info_provider, options, idl_filenames) + return 0 +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/idl_definitions.py b/chromium/third_party/blink/renderer/bindings/scripts/idl_definitions.py +index 14e6e9d3f87..b027818aef2 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/idl_definitions.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/idl_definitions.py +@@ -394,7 +394,8 @@ class IdlInterface(object): + else: + raise ValueError('Unrecognized node class: %s' % child_class) + +- if len(filter(None, [self.iterable, self.maplike, self.setlike])) > 1: ++ if len(list(filter(None, ++ [self.iterable, self.maplike, self.setlike]))) > 1: + raise ValueError( + 'Interface can only have one of iterable<>, maplike<> and setlike<>.' + ) +@@ -512,6 +513,9 @@ class IdlAttribute(TypedObject): + def accept(self, visitor): + visitor.visit_attribute(self) + ++ def __lt__(self, other): ++ return self.name < other.name ++ + + ################################################################################ + # Constants +@@ -852,7 +856,7 @@ class IdlIncludes(object): + ################################################################################ + + +-class Exposure: ++class Exposure(object): + """An Exposure holds one Exposed or RuntimeEnabled condition. + Each exposure has two properties: exposed and runtime_enabled. + Exposure(e, r) corresponds to [Exposed(e r)]. Exposure(e) corresponds to +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/idl_reader.py b/chromium/third_party/blink/renderer/bindings/scripts/idl_reader.py +index 8d72865a6ca..b80eebdcd61 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/idl_reader.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/idl_reader.py +@@ -55,8 +55,8 @@ def validate_blink_idl_definitions(idl_filename, idl_file_basename, + definitions. There is no filename convention in this case. + - Otherwise, an IDL file is invalid. + """ +- targets = ( +- definitions.interfaces.values() + definitions.dictionaries.values()) ++ targets = (list(definitions.interfaces.values()) + ++ list(definitions.dictionaries.values())) + number_of_targets = len(targets) + if number_of_targets > 1: + raise Exception( +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/idl_types.py b/chromium/third_party/blink/renderer/bindings/scripts/idl_types.py +index cd4f0c3513b..ab95e9c0b08 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/idl_types.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/idl_types.py +@@ -349,7 +349,7 @@ class IdlUnionType(IdlTypeBase): + return True + + def single_matching_member_type(self, predicate): +- matching_types = filter(predicate, self.flattened_member_types) ++ matching_types = list(filter(predicate, self.flattened_member_types)) + if len(matching_types) > 1: + raise ValueError('%s is ambiguous.' % self.name) + return matching_types[0] if matching_types else None +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/utilities.py b/chromium/third_party/blink/renderer/bindings/scripts/utilities.py +index e1677ee7bd6..3c5006f064f 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/utilities.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/utilities.py +@@ -196,8 +196,9 @@ class ComponentInfoProviderModules(ComponentInfoProvider): + + @property + def callback_functions(self): +- return dict(self._component_info_core['callback_functions'].items() + +- self._component_info_modules['callback_functions'].items()) ++ return dict( ++ list(self._component_info_core['callback_functions'].items()) + ++ list(self._component_info_modules['callback_functions'].items())) + + @property + def specifier_for_export(self): +@@ -209,8 +210,8 @@ class ComponentInfoProviderModules(ComponentInfoProvider): + + + def load_interfaces_info_overall_pickle(info_dir): +- with open(os.path.join(info_dir, +- 'interfaces_info.pickle')) as interface_info_file: ++ with open(os.path.join(info_dir, 'interfaces_info.pickle'), ++ mode='rb') as interface_info_file: + return pickle.load(interface_info_file) + + +@@ -236,23 +237,20 @@ def merge_dict_recursively(target, diff): + + def create_component_info_provider_core(info_dir): + interfaces_info = load_interfaces_info_overall_pickle(info_dir) +- with open( +- os.path.join(info_dir, 'core', +- 'component_info_core.pickle')) as component_info_file: ++ with open(os.path.join(info_dir, 'core', 'component_info_core.pickle'), ++ mode='rb') as component_info_file: + component_info = pickle.load(component_info_file) + return ComponentInfoProviderCore(interfaces_info, component_info) + + + def create_component_info_provider_modules(info_dir): + interfaces_info = load_interfaces_info_overall_pickle(info_dir) +- with open( +- os.path.join(info_dir, 'core', +- 'component_info_core.pickle')) as component_info_file: ++ with open(os.path.join(info_dir, 'core', 'component_info_core.pickle'), ++ mode='rb') as component_info_file: + component_info_core = pickle.load(component_info_file) +- with open( +- os.path.join( +- info_dir, 'modules', +- 'component_info_modules.pickle')) as component_info_file: ++ with open(os.path.join(info_dir, 'modules', ++ 'component_info_modules.pickle'), ++ mode='rb') as component_info_file: + component_info_modules = pickle.load(component_info_file) + return ComponentInfoProviderModules(interfaces_info, component_info_core, + component_info_modules) +@@ -356,7 +354,7 @@ def write_pickle_file(pickle_filename, data): + pickle_filename = abs(pickle_filename) + # If |data| is same with the file content, we skip updating. + if os.path.isfile(pickle_filename): +- with open(pickle_filename) as pickle_file: ++ with open(pickle_filename, 'rb') as pickle_file: + try: + if pickle.load(pickle_file) == data: + return +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/v8_interface.py b/chromium/third_party/blink/renderer/bindings/scripts/v8_interface.py +index a43260414db..a85b03abe75 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/v8_interface.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/v8_interface.py +@@ -189,7 +189,7 @@ def context_enabled_features(attributes): + return sorted([ + member for member in members + if member.get(KEY) and not member.get('exposed_test') +- ]) ++ ], key=lambda item: item['name']) + + def member_filter_by_name(members, name): + return [member for member in members if member[KEY] == name] +@@ -612,7 +612,8 @@ def interface_context(interface, interfaces, component_info): + sorted( + origin_trial_features(interface, context['constants'], + context['attributes'], context['methods']) + +- context_enabled_features(context['attributes'])), ++ context_enabled_features(context['attributes']), ++ key=lambda item: item['name']), + }) + if context['optional_features']: + includes.add('platform/bindings/v8_per_context_data.h') +@@ -1356,9 +1357,9 @@ def resolution_tests_methods(effective_overloads): + + # Extract argument and IDL type to simplify accessing these in each loop. + arguments = [method['arguments'][index] for method in methods] +- arguments_methods = zip(arguments, methods) ++ arguments_methods = list(zip(arguments, methods)) + idl_types = [argument['idl_type_object'] for argument in arguments] +- idl_types_methods = zip(idl_types, methods) ++ idl_types_methods = list(zip(idl_types, methods)) + + # We can?t do a single loop through all methods or simply sort them, because + # a method may be listed in multiple steps of the resolution algorithm, and +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/v8_methods.py b/chromium/third_party/blink/renderer/bindings/scripts/v8_methods.py +index 5f1f89a3def..6ee8a407798 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/v8_methods.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/v8_methods.py +@@ -46,6 +46,10 @@ import v8_types + import v8_utilities + from v8_utilities import (has_extended_attribute_value, is_unforgeable) + ++# TODO: Remove this once Python2 is obsoleted. ++if sys.version_info.major != 2: ++ basestring = str ++ + + def method_is_visible(method, interface_is_partial): + if 'overloads' in method: +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/v8_utilities.py b/chromium/third_party/blink/renderer/bindings/scripts/v8_utilities.py +index 2ecd6923320..fcfc48371b1 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/v8_utilities.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/v8_utilities.py +@@ -271,7 +271,7 @@ EXPOSED_WORKERS = set([ + ]) + + +-class ExposureSet: ++class ExposureSet(object): + """An ExposureSet is a collection of Exposure instructions.""" + + def __init__(self, exposures=None): +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/callback_interface.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/callback_interface.py +index 13fb7c7068d..b73b7710687 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/callback_interface.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/callback_interface.py +@@ -91,11 +91,13 @@ class CallbackInterface(UserDefinedType, WithExtendedAttributes, + for operation_ir in ir.operations + ]) + self._operation_groups = tuple([ +- OperationGroup( +- operation_group_ir, +- filter(lambda x: x.identifier == operation_group_ir.identifier, +- self._operations), +- owner=self) for operation_group_ir in ir.operation_groups ++ OperationGroup(operation_group_ir, ++ list( ++ filter( ++ lambda x: x.identifier == operation_group_ir ++ .identifier, self._operations)), ++ owner=self) ++ for operation_group_ir in ir.operation_groups + ]) + + @property +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/database.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/database.py +index c92cf48eb2a..f5d59129449 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/database.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/database.py +@@ -156,4 +156,4 @@ class Database(object): + return self._view_by_kind(Database._Kind.UNION) + + def _view_by_kind(self, kind): +- return self._impl.find_by_kind(kind).values() ++ return list(self._impl.find_by_kind(kind).values()) +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/exposure.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/exposure.py +index abaeef39c30..e36cf7439ae 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/exposure.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/exposure.py +@@ -8,8 +8,11 @@ from .runtime_enabled_features import RuntimeEnabledFeatures + class _Feature(str): + """Represents a runtime-enabled feature.""" + ++ def __new__(cls, value): ++ return str.__new__(cls, value) ++ + def __init__(self, value): +- str.__init__(self, value) ++ str.__init__(self) + self._is_context_dependent = ( + RuntimeEnabledFeatures.is_context_dependent(self)) + +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/function_like.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/function_like.py +index 648c70d803d..1712f19c672 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/function_like.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/function_like.py +@@ -71,8 +71,9 @@ class FunctionLike(WithIdentifier): + def num_of_required_arguments(self): + """Returns the number of required arguments.""" + return len( +- filter(lambda arg: not (arg.is_optional or arg.is_variadic), +- self.arguments)) ++ list( ++ filter(lambda arg: not (arg.is_optional or arg.is_variadic), ++ self.arguments))) + + + class OverloadGroup(WithIdentifier): +@@ -171,8 +172,7 @@ class OverloadGroup(WithIdentifier): + Returns the effective overload set. + https://heycam.github.io/webidl/#compute-the-effective-overload-set + """ +- assert argument_count is None or isinstance(argument_count, +- (int, long)) ++ assert argument_count is None or isinstance(argument_count, int) + + N = argument_count + S = [] +@@ -188,21 +188,21 @@ class OverloadGroup(WithIdentifier): + + S.append( + OverloadGroup.EffectiveOverloadItem( +- X, map(lambda arg: arg.idl_type, X.arguments), +- map(lambda arg: arg.optionality, X.arguments))) ++ X, list(map(lambda arg: arg.idl_type, X.arguments)), ++ list(map(lambda arg: arg.optionality, X.arguments)))) + + if X.is_variadic: +- for i in xrange(n, max(maxarg, N)): +- t = map(lambda arg: arg.idl_type, X.arguments) +- o = map(lambda arg: arg.optionality, X.arguments) +- for _ in xrange(n, i + 1): ++ for i in range(n, max(maxarg, N)): ++ t = list(map(lambda arg: arg.idl_type, X.arguments)) ++ o = list(map(lambda arg: arg.optionality, X.arguments)) ++ for _ in range(n, i + 1): + t.append(X.arguments[-1].idl_type) + o.append(X.arguments[-1].optionality) + S.append(OverloadGroup.EffectiveOverloadItem(X, t, o)) + +- t = map(lambda arg: arg.idl_type, X.arguments) +- o = map(lambda arg: arg.optionality, X.arguments) +- for i in xrange(n - 1, -1, -1): ++ t = list(map(lambda arg: arg.idl_type, X.arguments)) ++ o = list(map(lambda arg: arg.optionality, X.arguments)) ++ for i in range(n - 1, -1, -1): + if X.arguments[i].optionality == IdlType.Optionality.REQUIRED: + break + S.append(OverloadGroup.EffectiveOverloadItem(X, t[:i], o[:i])) +@@ -222,7 +222,7 @@ class OverloadGroup(WithIdentifier): + for item in items) + assert len(items) > 1 + +- for index in xrange(len(items[0].type_list)): ++ for index in range(len(items[0].type_list)): + # Assume that the given items are valid, and we only need to test + # the two types. + if OverloadGroup.are_distinguishable_types( +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/idl_compiler.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/idl_compiler.py +index c5ee2bd8a3d..58315072480 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/idl_compiler.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/idl_compiler.py +@@ -149,8 +149,8 @@ class IdlCompiler(object): + for old_ir in old_irs: + new_ir = make_copy(old_ir) + self._ir_map.add(new_ir) +- new_ir.attributes = filter(not_disabled, new_ir.attributes) +- new_ir.operations = filter(not_disabled, new_ir.operations) ++ new_ir.attributes = list(filter(not_disabled, new_ir.attributes)) ++ new_ir.operations = list(filter(not_disabled, new_ir.operations)) + + def _record_defined_in_partial_and_mixin(self): + old_irs = self._ir_map.irs_of_kinds( +@@ -231,7 +231,7 @@ class IdlCompiler(object): + only_to_members_of_partial_or_mixin=False) + propagate_to_exposure(propagate) + +- map(process_member_like, ir.iter_all_members()) ++ list(map(process_member_like, ir.iter_all_members())) + + def process_member_like(ir): + propagate = functools.partial(propagate_extattr, ir=ir) +@@ -257,7 +257,7 @@ class IdlCompiler(object): + + self._ir_map.move_to_new_phase() + +- map(process_interface_like, old_irs) ++ list(map(process_interface_like, old_irs)) + + def _determine_blink_headers(self): + irs = self._ir_map.irs_of_kinds( +@@ -422,9 +422,9 @@ class IdlCompiler(object): + assert not new_interface.deriveds + derived_set = identifier_to_derived_set.get( + new_interface.identifier, set()) +- new_interface.deriveds = map( +- lambda id_: self._ref_to_idl_def_factory.create(id_), +- sorted(derived_set)) ++ new_interface.deriveds = list( ++ map(lambda id_: self._ref_to_idl_def_factory.create(id_), ++ sorted(derived_set))) + + def _supplement_missing_html_constructor_operation(self): + # Temporary mitigation of misuse of [HTMLConstructor] +@@ -553,7 +553,8 @@ class IdlCompiler(object): + self._ir_map.add(new_ir) + + for group in new_ir.iter_all_overload_groups(): +- exposures = map(lambda overload: overload.exposure, group) ++ exposures = list(map(lambda overload: overload.exposure, ++ group)) + + # [Exposed] + if any(not exposure.global_names_and_features +@@ -653,8 +654,8 @@ class IdlCompiler(object): + constructs = set() + for global_name in global_names: + constructs.update(exposed_map.get(global_name, [])) +- new_ir.exposed_constructs = map( +- self._ref_to_idl_def_factory.create, sorted(constructs)) ++ new_ir.exposed_constructs = list( ++ map(self._ref_to_idl_def_factory.create, sorted(constructs))) + + assert not new_ir.legacy_window_aliases + if new_ir.identifier != 'Window': +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/interface.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/interface.py +index 65d24e529d1..067ef2eb0b2 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/interface.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/interface.py +@@ -180,8 +180,9 @@ class Interface(UserDefinedType, WithExtendedAttributes, WithCodeGeneratorInfo, + self._constructor_groups = tuple([ + ConstructorGroup( + group_ir, +- filter(lambda x: x.identifier == group_ir.identifier, +- self._constructors), ++ list( ++ filter(lambda x: x.identifier == group_ir.identifier, ++ self._constructors)), + owner=self) for group_ir in ir.constructor_groups + ]) + assert len(self._constructor_groups) <= 1 +@@ -192,8 +193,9 @@ class Interface(UserDefinedType, WithExtendedAttributes, WithCodeGeneratorInfo, + self._named_constructor_groups = tuple([ + ConstructorGroup( + group_ir, +- filter(lambda x: x.identifier == group_ir.identifier, +- self._named_constructors), ++ list( ++ filter(lambda x: x.identifier == group_ir.identifier, ++ self._named_constructors)), + owner=self) for group_ir in ir.named_constructor_groups + ]) + self._operations = tuple([ +@@ -203,22 +205,23 @@ class Interface(UserDefinedType, WithExtendedAttributes, WithCodeGeneratorInfo, + self._operation_groups = tuple([ + OperationGroup( + group_ir, +- filter(lambda x: x.identifier == group_ir.identifier, +- self._operations), ++ list( ++ filter(lambda x: x.identifier == group_ir.identifier, ++ self._operations)), + owner=self) for group_ir in ir.operation_groups + ]) + self._exposed_constructs = tuple(ir.exposed_constructs) + self._legacy_window_aliases = tuple(ir.legacy_window_aliases) + self._indexed_and_named_properties = None +- indexed_and_named_property_operations = filter( +- lambda x: x.is_indexed_or_named_property_operation, +- self._operations) ++ indexed_and_named_property_operations = list( ++ filter(lambda x: x.is_indexed_or_named_property_operation, ++ self._operations)) + if indexed_and_named_property_operations: + self._indexed_and_named_properties = IndexedAndNamedProperties( + indexed_and_named_property_operations, owner=self) + self._stringifier = None +- stringifier_operation_irs = filter(lambda x: x.is_stringifier, +- ir.operations) ++ stringifier_operation_irs = list( ++ filter(lambda x: x.is_stringifier, ir.operations)) + if stringifier_operation_irs: + assert len(stringifier_operation_irs) == 1 + op_ir = make_copy(stringifier_operation_irs[0]) +@@ -231,8 +234,9 @@ class Interface(UserDefinedType, WithExtendedAttributes, WithCodeGeneratorInfo, + attribute = None + if operation.stringifier_attribute: + attr_id = operation.stringifier_attribute +- attributes = filter(lambda x: x.identifier == attr_id, +- self._attributes) ++ attributes = list( ++ filter(lambda x: x.identifier == attr_id, ++ self._attributes)) + assert len(attributes) == 1 + attribute = attributes[0] + self._stringifier = Stringifier(operation, attribute, owner=self) +@@ -578,8 +582,9 @@ class Iterable(WithDebugInfo): + self._operation_groups = tuple([ + OperationGroup( + group_ir, +- filter(lambda x: x.identifier == group_ir.identifier, +- self._operations), ++ list( ++ filter(lambda x: x.identifier == group_ir.identifier, ++ self._operations)), + owner=owner) for group_ir in ir.operation_groups + ]) + +@@ -666,8 +671,9 @@ class Maplike(WithDebugInfo): + self._operation_groups = tuple([ + OperationGroup( + group_ir, +- filter(lambda x: x.identifier == group_ir.identifier, +- self._operations), ++ list( ++ filter(lambda x: x.identifier == group_ir.identifier, ++ self._operations)), + owner=owner) for group_ir in ir.operation_groups + ]) + +@@ -755,8 +761,9 @@ class Setlike(WithDebugInfo): + self._operation_groups = tuple([ + OperationGroup( + group_ir, +- filter(lambda x: x.identifier == group_ir.identifier, +- self._operations), ++ list( ++ filter(lambda x: x.identifier == group_ir.identifier, ++ self._operations)), + owner=owner) for group_ir in ir.operation_groups + ]) + +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/ir_builder.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/ir_builder.py +index e9aeff4ab82..d80554d603e 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/ir_builder.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/ir_builder.py +@@ -2,6 +2,8 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import sys ++ + from .argument import Argument + from .ast_group import AstGroup + from .attribute import Attribute +@@ -30,6 +32,11 @@ from .operation import Operation + from .typedef import Typedef + + ++# TODO: Remove this once Python2 is obsoleted. ++if sys.version_info.major != 2: ++ long = int ++ ++ + def load_and_register_idl_definitions(filepaths, register_ir, + create_ref_to_idl_def, idl_type_factory): + """ +@@ -160,7 +167,7 @@ class _IRBuilder(object): + child_nodes = list(node.GetChildren()) + extended_attributes = self._take_extended_attributes(child_nodes) + +- members = map(self._build_interface_member, child_nodes) ++ members = list(map(self._build_interface_member, child_nodes)) + attributes = [] + constants = [] + operations = [] +@@ -302,7 +309,7 @@ class _IRBuilder(object): + child_nodes = list(node.GetChildren()) + inherited = self._take_inheritance(child_nodes) + extended_attributes = self._take_extended_attributes(child_nodes) +- own_members = map(self._build_dictionary_member, child_nodes) ++ own_members = list(map(self._build_dictionary_member, child_nodes)) + + return Dictionary.IR( + identifier=Identifier(node.GetName()), +@@ -336,7 +343,7 @@ class _IRBuilder(object): + + child_nodes = list(node.GetChildren()) + extended_attributes = self._take_extended_attributes(child_nodes) +- members = map(self._build_interface_member, child_nodes) ++ members = list(map(self._build_interface_member, child_nodes)) + constants = [] + operations = [] + for member in members: +@@ -456,8 +463,8 @@ class _IRBuilder(object): + assert len(child_nodes) == 1 + child = child_nodes[0] + if child.GetClass() == 'Arguments': +- arguments = map(build_extattr_argument, +- child.GetChildren()) ++ arguments = list( ++ map(build_extattr_argument, child.GetChildren())) + elif child.GetClass() == 'Call': + assert len(child.GetChildren()) == 1 + grand_child = child.GetChildren()[0] +@@ -486,7 +493,9 @@ class _IRBuilder(object): + + assert node.GetClass() == 'ExtAttributes' + return ExtendedAttributes( +- filter(None, map(build_extended_attribute, node.GetChildren()))) ++ list( ++ filter(None, map(build_extended_attribute, ++ node.GetChildren())))) + + def _build_inheritance(self, node): + assert node.GetClass() == 'Inherit' +@@ -506,7 +515,7 @@ class _IRBuilder(object): + + def _build_iterable(self, node): + assert node.GetClass() == 'Iterable' +- types = map(self._build_type, node.GetChildren()) ++ types = list(map(self._build_type, node.GetChildren())) + assert len(types) == 1 or len(types) == 2 + if len(types) == 1: # value iterator + key_type, value_type = (None, types[0]) +@@ -584,7 +593,7 @@ class _IRBuilder(object): + def _build_maplike(self, node, interface_identifier): + assert node.GetClass() == 'Maplike' + assert isinstance(interface_identifier, Identifier) +- types = map(self._build_type, node.GetChildren()) ++ types = list(map(self._build_type, node.GetChildren())) + assert len(types) == 2 + key_type, value_type = types + is_readonly = bool(node.GetProperty('READONLY')) +@@ -676,7 +685,7 @@ class _IRBuilder(object): + def _build_setlike(self, node, interface_identifier): + assert node.GetClass() == 'Setlike' + assert isinstance(interface_identifier, Identifier) +- types = map(self._build_type, node.GetChildren()) ++ types = list(map(self._build_type, node.GetChildren())) + assert len(types) == 1 + value_type = types[0] + is_readonly = bool(node.GetProperty('READONLY')) +@@ -838,7 +847,7 @@ class _IRBuilder(object): + + def build_union_type(node, extended_attributes): + return self._idl_type_factory.union_type( +- member_types=map(self._build_type, node.GetChildren()), ++ member_types=list(map(self._build_type, node.GetChildren())), + is_optional=is_optional, + extended_attributes=extended_attributes, + debug_info=self._build_debug_info(node)) +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/make_copy.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/make_copy.py +index a7a2b11f3f0..2f6b61300ff 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/make_copy.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/make_copy.py +@@ -3,6 +3,13 @@ + # found in the LICENSE file. + + ++import sys ++ ++# TODO: Remove this once Python2 is obsoleted. ++if sys.version_info.major != 2: ++ long = int ++ basestring = str ++ + def make_copy(obj, memo=None): + """ + Creates a copy of the given object, which should be an IR or part of IR. +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/namespace.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/namespace.py +index eeabef97cbe..bd7e98907f3 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/namespace.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/namespace.py +@@ -107,11 +107,13 @@ class Namespace(UserDefinedType, WithExtendedAttributes, WithCodeGeneratorInfo, + for operation_ir in ir.operations + ]) + self._operation_groups = tuple([ +- OperationGroup( +- operation_group_ir, +- filter(lambda x: x.identifier == operation_group_ir.identifier, +- self._operations), +- owner=self) for operation_group_ir in ir.operation_groups ++ OperationGroup(operation_group_ir, ++ list( ++ filter( ++ lambda x: x.identifier == operation_group_ir ++ .identifier, self._operations)), ++ owner=self) ++ for operation_group_ir in ir.operation_groups + ]) + + @property +diff --git a/chromium/third_party/blink/renderer/bindings/templates/dictionary_v8.cc.tmpl b/chromium/third_party/blink/renderer/bindings/templates/dictionary_v8.cc.tmpl +index 0add9c45a38..dc910f6d227 100644 +--- a/chromium/third_party/blink/renderer/bindings/templates/dictionary_v8.cc.tmpl ++++ b/chromium/third_party/blink/renderer/bindings/templates/dictionary_v8.cc.tmpl +@@ -59,9 +59,9 @@ void {{v8_class}}::ToImpl(v8::Isolate* isolate, v8::Local v8_value, { + DCHECK(executionContext); + {% endif %}{# has_origin_trial_members #} + {% endif %}{# members #} +- {% for origin_trial_test, origin_trial_member_list in members | groupby('origin_trial_feature_name') %} ++ {% for origin_trial_test, origin_trial_member_list in members | stringifykeygroupby('origin_trial_feature_name') %} + {% filter origin_trial_enabled(origin_trial_test, "executionContext") %} +- {% for feature_name, member_list in origin_trial_member_list | groupby('runtime_enabled_feature_name') %} ++ {% for feature_name, member_list in origin_trial_member_list | stringifykeygroupby('runtime_enabled_feature_name') %} + {% filter runtime_enabled(feature_name) %} + {% for member in member_list %} + v8::Local {{member.v8_value}}; +@@ -147,9 +147,9 @@ bool toV8{{cpp_class}}(const {{cpp_class}}* impl, v8::Local dictiona + DCHECK(executionContext); + {% endif %}{# has_origin_trial_members #} + {% endif %}{# members #} +- {% for origin_trial_test, origin_trial_member_list in members | groupby('origin_trial_feature_name') %} ++ {% for origin_trial_test, origin_trial_member_list in members | stringifykeygroupby('origin_trial_feature_name') %} + {% filter origin_trial_enabled(origin_trial_test, "executionContext") %} +- {% for feature_name, member_list in origin_trial_member_list | groupby('runtime_enabled_feature_name') %} ++ {% for feature_name, member_list in origin_trial_member_list | stringifykeygroupby('runtime_enabled_feature_name') %} + {% filter runtime_enabled(feature_name) %} + {% for member in member_list %} + v8::Local {{member.v8_value}}; +diff --git a/chromium/third_party/blink/renderer/build/scripts/core/css/make_style_shorthands.py b/chromium/third_party/blink/renderer/build/scripts/core/css/make_style_shorthands.py +index 1799cd5a153..5f43ffabc26 100755 +--- a/chromium/third_party/blink/renderer/build/scripts/core/css/make_style_shorthands.py ++++ b/chromium/third_party/blink/renderer/build/scripts/core/css/make_style_shorthands.py +@@ -71,7 +71,7 @@ class Expansion(object): + def enabled_longhands(self): + include = lambda longhand: not longhand[ + 'runtime_flag'] or self.is_enabled(longhand['runtime_flag']) +- return filter(include, self._longhands) ++ return list(filter(include, self._longhands)) + + @property + def index(self): +@@ -87,8 +87,9 @@ class Expansion(object): + + def create_expansions(longhands): + flags = collect_runtime_flags(longhands) +- expansions = map(lambda mask: Expansion(longhands, flags, mask), +- range(1 << len(flags))) ++ expansions = list( ++ map(lambda mask: Expansion(longhands, flags, mask), ++ range(1 << len(flags)))) + assert len(expansions) > 0 + # We generate 2^N expansions for N flags, so enforce some limit. + assert len(flags) <= 4, 'Too many runtime flags for a single shorthand' +@@ -114,14 +115,14 @@ class StylePropertyShorthandWriter(json5_generator.Writer): + + self._longhand_dictionary = defaultdict(list) + for property_ in json5_properties.shorthands: +- property_['longhand_enum_keys'] = map(enum_key_for_css_property, +- property_['longhands']) +- property_['longhand_property_ids'] = map(id_for_css_property, +- property_['longhands']) +- +- longhands = map( +- lambda name: json5_properties.properties_by_name[name], +- property_['longhands']) ++ property_['longhand_enum_keys'] = list( ++ map(enum_key_for_css_property, property_['longhands'])) ++ property_['longhand_property_ids'] = list( ++ map(id_for_css_property, property_['longhands'])) ++ ++ longhands = list( ++ map(lambda name: json5_properties.properties_by_name[name], ++ property_['longhands'])) + property_['expansions'] = create_expansions(longhands) + for longhand_enum_key in property_['longhand_enum_keys']: + self._longhand_dictionary[longhand_enum_key].append(property_) +diff --git a/chromium/third_party/blink/renderer/build/scripts/core/css/properties/make_css_property_instances.py b/chromium/third_party/blink/renderer/build/scripts/core/css/properties/make_css_property_instances.py +index 75030ac577e..f72aadee17d 100755 +--- a/chromium/third_party/blink/renderer/build/scripts/core/css/properties/make_css_property_instances.py ++++ b/chromium/third_party/blink/renderer/build/scripts/core/css/properties/make_css_property_instances.py +@@ -42,8 +42,8 @@ class CSSPropertyInstancesWriter(json5_generator.Writer): + aliases = self._css_properties.aliases + + # Lists of PropertyClassData. +- self._property_classes_by_id = map(self.get_class, properties) +- self._alias_classes_by_id = map(self.get_class, aliases) ++ self._property_classes_by_id = list(map(self.get_class, properties)) ++ self._alias_classes_by_id = list(map(self.get_class, aliases)) + + # Sort by enum value. + self._property_classes_by_id.sort(key=lambda t: t.enum_value) +diff --git a/chromium/third_party/blink/renderer/build/scripts/gperf.py b/chromium/third_party/blink/renderer/build/scripts/gperf.py +index 5ee49056be4..db72660d471 100644 +--- a/chromium/third_party/blink/renderer/build/scripts/gperf.py ++++ b/chromium/third_party/blink/renderer/build/scripts/gperf.py +@@ -95,7 +95,7 @@ def main(): + + open(args.output_file, 'wb').write( + generate_gperf(gperf_path, +- open(infile).read(), gperf_args)) ++ open(infile).read(), gperf_args).encode('utf-8')) + + + if __name__ == '__main__': +diff --git a/chromium/third_party/blink/renderer/build/scripts/in_file.py b/chromium/third_party/blink/renderer/build/scripts/in_file.py +index 28adc050f1e..58113483e57 100644 +--- a/chromium/third_party/blink/renderer/build/scripts/in_file.py ++++ b/chromium/third_party/blink/renderer/build/scripts/in_file.py +@@ -66,7 +66,7 @@ class InFile(object): + self._defaults = defaults + self._valid_values = copy.deepcopy( + valid_values if valid_values else {}) +- self._parse(map(str.strip, lines)) ++ self._parse(list(map(str.strip, lines))) + + @classmethod + def load_from_files(self, file_paths, defaults, valid_values, +diff --git a/chromium/third_party/blink/renderer/build/scripts/in_generator.py b/chromium/third_party/blink/renderer/build/scripts/in_generator.py +index e46740a2e85..ab1981ad1e3 100644 +--- a/chromium/third_party/blink/renderer/build/scripts/in_generator.py ++++ b/chromium/third_party/blink/renderer/build/scripts/in_generator.py +@@ -32,10 +32,15 @@ import os + import os.path + import shlex + import shutil ++import sys + import optparse + + from in_file import InFile + ++# TODO: Remove this once Python2 is obsoleted. ++if sys.version_info.major != 2: ++ basestring = str ++ + + ######################################################### + # This is now deprecated - use json5_generator.py instead +diff --git a/chromium/third_party/blink/renderer/build/scripts/make_runtime_features.py b/chromium/third_party/blink/renderer/build/scripts/make_runtime_features.py +index cafe8d94a8e..6925a4fa580 100755 +--- a/chromium/third_party/blink/renderer/build/scripts/make_runtime_features.py ++++ b/chromium/third_party/blink/renderer/build/scripts/make_runtime_features.py +@@ -138,7 +138,7 @@ class RuntimeFeatureWriter(BaseRuntimeFeatureWriter): + except Exception: + # If trouble unpickling, overwrite + pass +- with open(os.path.abspath(file_name), 'w') as pickle_file: ++ with open(os.path.abspath(file_name), 'wb') as pickle_file: + pickle.dump(features_map, pickle_file) + + def _template_inputs(self): +diff --git a/chromium/third_party/blink/renderer/build/scripts/templates/element_factory.cc.tmpl b/chromium/third_party/blink/renderer/build/scripts/templates/element_factory.cc.tmpl +index dc3f44c5b10..3eefcf9f0ee 100644 +--- a/chromium/third_party/blink/renderer/build/scripts/templates/element_factory.cc.tmpl ++++ b/chromium/third_party/blink/renderer/build/scripts/templates/element_factory.cc.tmpl +@@ -26,7 +26,7 @@ using {{namespace}}FunctionMap = HashMapGetExecutionContext())) { +diff --git a/chromium/third_party/blink/renderer/build/scripts/templates/element_type_helpers.h.tmpl b/chromium/third_party/blink/renderer/build/scripts/templates/element_type_helpers.h.tmpl +index 1b5297d52dc..edecc81d9d4 100644 +--- a/chromium/third_party/blink/renderer/build/scripts/templates/element_type_helpers.h.tmpl ++++ b/chromium/third_party/blink/renderer/build/scripts/templates/element_type_helpers.h.tmpl +@@ -15,7 +15,7 @@ namespace blink { + class Document; + + // Type checking. +-{% for tag in tags|sort if not tag.multipleTagNames and not tag.noTypeHelpers %} ++{% for tag in tags|sort(attribute='name') if not tag.multipleTagNames and not tag.noTypeHelpers %} + class {{tag.interface}}; + template <> + inline bool IsElementOfType(const Node& node) { +diff --git a/chromium/third_party/blink/renderer/build/scripts/templates/macros.tmpl b/chromium/third_party/blink/renderer/build/scripts/templates/macros.tmpl +index 0244433af2e..dcdbb02a56c 100644 +--- a/chromium/third_party/blink/renderer/build/scripts/templates/macros.tmpl ++++ b/chromium/third_party/blink/renderer/build/scripts/templates/macros.tmpl +@@ -25,7 +25,7 @@ + + + {% macro trie_leaf(index, object, return_macro, lowercase_data) %} +-{% set name, value = object.items()[0] %} ++{% set name, value = (object.items()|list)[0] %} + {% if name|length %} + if ( + {%- for c in name -%} +@@ -45,7 +45,7 @@ return {{ return_macro(value) }}; + + + {% macro trie_switch(trie, index, return_macro, lowercase_data) %} +-{% if trie|length == 1 and trie.values()[0] is string %} ++{% if trie|length == 1 and (trie.values()|list)[0] is string %} + {{ trie_leaf(index, trie, return_macro, lowercase_data) -}} + {% else %} + {% if lowercase_data %} +diff --git a/chromium/third_party/blink/renderer/build/scripts/templates/make_qualified_names.h.tmpl b/chromium/third_party/blink/renderer/build/scripts/templates/make_qualified_names.h.tmpl +index cb05c6c4315..bd5566b03e7 100644 +--- a/chromium/third_party/blink/renderer/build/scripts/templates/make_qualified_names.h.tmpl ++++ b/chromium/third_party/blink/renderer/build/scripts/templates/make_qualified_names.h.tmpl +@@ -24,12 +24,12 @@ namespace {{cpp_namespace}} { + {{symbol_export}}extern const WTF::AtomicString& {{namespace_prefix}}NamespaceURI; + + // Tags +-{% for tag in tags|sort %} ++{% for tag in tags|sort(attribute='name') %} + {{symbol_export}}extern const blink::{{namespace}}QualifiedName& {{tag|symbol}}Tag; + {% endfor %} + + // Attributes +-{% for attr in attrs|sort %} ++{% for attr in attrs|sort(attribute='name') %} + {{symbol_export}}extern const blink::QualifiedName& {{attr|symbol}}Attr; + {% endfor %} + +diff --git a/chromium/third_party/dawn/generator/generator_lib.py b/chromium/third_party/dawn/generator/generator_lib.py +index 5e3734d7833..e3d46bd194f 100644 +--- a/chromium/third_party/dawn/generator/generator_lib.py ++++ b/chromium/third_party/dawn/generator/generator_lib.py +@@ -201,6 +201,10 @@ def _compute_python_dependencies(root_dir=None): + + paths = set() + for path in module_paths: ++ # Builtin/namespaced modules may return None for the file path. ++ if not path: ++ continue ++ + path = os.path.abspath(path) + + if not path.startswith(root_dir): +diff --git a/chromium/third_party/devtools-frontend/src/BUILD.gn b/chromium/third_party/devtools-frontend/src/BUILD.gn +index cd488e88b60..ea1dc3d9a79 100644 +--- a/chromium/third_party/devtools-frontend/src/BUILD.gn ++++ b/chromium/third_party/devtools-frontend/src/BUILD.gn +@@ -2,6 +2,8 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import("//build/config/python.gni") ++ + import("//third_party/blink/public/public_features.gni") + import("./all_devtools_files.gni") + import("./all_devtools_modules.gni") +diff --git a/chromium/third_party/devtools-frontend/src/scripts/build/build_inspector_overlay.py b/chromium/third_party/devtools-frontend/src/scripts/build/build_inspector_overlay.py +index d6666e8b74f..0f7a661e632 100644 +--- a/chromium/third_party/devtools-frontend/src/scripts/build/build_inspector_overlay.py ++++ b/chromium/third_party/devtools-frontend/src/scripts/build/build_inspector_overlay.py +@@ -45,7 +45,8 @@ def rollup(input_path, output_path, filename, max_size, rollup_plugin): + ['--format', 'iife', '-n', 'InspectorOverlay'] + ['--input', target] + + ['--plugin', rollup_plugin], + stdout=subprocess.PIPE, +- stderr=subprocess.PIPE) ++ stderr=subprocess.PIPE, ++ text=True) + out, error = rollup_process.communicate() + if not out: + raise Exception("rollup failed: " + error) +diff --git a/chromium/third_party/devtools-frontend/src/scripts/build/build_release_applications.py b/chromium/third_party/devtools-frontend/src/scripts/build/build_release_applications.py +index fa8e73d34af..7d0b84b2171 100644 +--- a/chromium/third_party/devtools-frontend/src/scripts/build/build_release_applications.py ++++ b/chromium/third_party/devtools-frontend/src/scripts/build/build_release_applications.py +@@ -10,7 +10,7 @@ Builds applications in release mode: + and?the?application?loader?into?a?single?script. + """ + +-from cStringIO import StringIO ++from io import StringIO + from os import path + from os.path import join + import copy +@@ -145,8 +145,7 @@ class ReleaseBuilder(object): + resource_content = read_file(path.join(self.application_dir, resource_name)) + if not (resource_name.endswith('.html') + or resource_name.endswith('md')): +- resource_content += resource_source_url(resource_name).encode( +- 'utf-8') ++ resource_content += resource_source_url(resource_name) + resource_content = resource_content.replace('\\', '\\\\') + resource_content = resource_content.replace('\n', '\\n') + resource_content = resource_content.replace('"', '\\"') +@@ -173,7 +172,9 @@ class ReleaseBuilder(object): + def _concatenate_application_script(self, output): + output.write('Root.allDescriptors.push(...%s);' % self._release_module_descriptors()) + if self.descriptors.extends: +- output.write('Root.applicationDescriptor.modules.push(...%s);' % json.dumps(self.descriptors.application.values())) ++ output.write( ++ 'Root.applicationDescriptor.modules.push(...%s);' % ++ json.dumps(list(self.descriptors.application.values()))) + else: + output.write('Root.applicationDescriptor = %s;' % self.descriptors.application_json()) + +diff --git a/chromium/third_party/devtools-frontend/src/scripts/build/generate_devtools_grd.py b/chromium/third_party/devtools-frontend/src/scripts/build/generate_devtools_grd.py +index be510c48d76..c6a59c90298 100644 +--- a/chromium/third_party/devtools-frontend/src/scripts/build/generate_devtools_grd.py ++++ b/chromium/third_party/devtools-frontend/src/scripts/build/generate_devtools_grd.py +@@ -123,7 +123,7 @@ def main(argv): + + try: + os.makedirs(path.join(output_directory, 'Images')) +- except OSError, e: ++ except OSError as e: + if e.errno != errno.EEXIST: + raise e + +@@ -147,7 +147,7 @@ def main(argv): + shutil.copy(path.join(dirname, filename), path.join(output_directory, 'Images')) + add_file_to_grd(doc, path.join('Images', filename)) + +- with open(parsed_args.output_filename, 'w') as output_file: ++ with open(parsed_args.output_filename, 'wb') as output_file: + output_file.write(doc.toxml(encoding='UTF-8')) + + +diff --git a/chromium/third_party/devtools-frontend/src/scripts/build/modular_build.py b/chromium/third_party/devtools-frontend/src/scripts/build/modular_build.py +index 0ba695d3810..bb1da2f9f8d 100644 +--- a/chromium/third_party/devtools-frontend/src/scripts/build/modular_build.py ++++ b/chromium/third_party/devtools-frontend/src/scripts/build/modular_build.py +@@ -7,6 +7,8 @@ + Utilities for the modular DevTools build. + """ + ++from __future__ import print_function ++ + import collections + from os import path + import os +@@ -40,7 +42,7 @@ def load_and_parse_json(filename): + try: + return json.loads(read_file(filename)) + except: +- print 'ERROR: Failed to parse %s' % filename ++ print('ERROR: Failed to parse %s' % filename) + raise + + class Descriptors: +@@ -57,7 +59,7 @@ class Descriptors: + + def application_json(self): + result = dict() +- result['modules'] = self.application.values() ++ result['modules'] = list(self.application.values()) + return json.dumps(result) + + def all_compiled_files(self): +diff --git a/chromium/third_party/jinja2/tests.py b/chromium/third_party/jinja2/tests.py +index 0adc3d4dbcb..b14f85ff148 100644 +--- a/chromium/third_party/jinja2/tests.py ++++ b/chromium/third_party/jinja2/tests.py +@@ -10,7 +10,7 @@ + """ + import operator + import re +-from collections import Mapping ++from collections.abc import Mapping + from jinja2.runtime import Undefined + from jinja2._compat import text_type, string_types, integer_types + import decimal +diff --git a/chromium/tools/metrics/ukm/gen_builders.py b/chromium/tools/metrics/ukm/gen_builders.py +index f9f61d90a56..44e46fae8cc 100755 +--- a/chromium/tools/metrics/ukm/gen_builders.py ++++ b/chromium/tools/metrics/ukm/gen_builders.py +@@ -48,9 +48,10 @@ def ReadFilteredData(path): + data = ukm_model.UKM_XML_TYPE.Parse(ukm_file.read()) + event_tag = ukm_model._EVENT_TYPE.tag + metric_tag = ukm_model._METRIC_TYPE.tag +- data[event_tag] = filter(ukm_model.IsNotObsolete, data[event_tag]) ++ data[event_tag] = list(filter(ukm_model.IsNotObsolete, data[event_tag])) + for event in data[event_tag]: +- event[metric_tag] = filter(ukm_model.IsNotObsolete, event[metric_tag]) ++ event[metric_tag] = list( ++ filter(ukm_model.IsNotObsolete, event[metric_tag])) + return data + + +diff --git a/chromium/ui/ozone/generate_constructor_list.py b/chromium/ui/ozone/generate_constructor_list.py +index 8d800636c97..04fa18e93df 100755 +--- a/chromium/ui/ozone/generate_constructor_list.py ++++ b/chromium/ui/ozone/generate_constructor_list.py +@@ -45,12 +45,15 @@ Example Output: ./ui/ozone/generate_constructor_list.py \ + } // namespace ui + """ + ++try: ++ from StringIO import StringIO # for Python 2 ++except ImportError: ++ from io import StringIO # for Python 3 + import optparse + import os + import collections + import re + import sys +-import string + + + def GetTypedefName(typename): +@@ -68,7 +71,7 @@ def GetConstructorName(typename, platform): + This is just "Create" + typename + platform. + """ + +- return 'Create' + typename + string.capitalize(platform) ++ return 'Create' + typename + platform.capitalize() + + + def GenerateConstructorList(out, namespace, export, typenames, platforms, +@@ -163,12 +166,14 @@ def main(argv): + sys.exit(1) + + # Write to standard output or file specified by --output_cc. +- out_cc = sys.stdout ++ out_cc = getattr(sys.stdout, 'buffer', sys.stdout) + if options.output_cc: + out_cc = open(options.output_cc, 'wb') + +- GenerateConstructorList(out_cc, options.namespace, options.export, ++ out_cc_str = StringIO() ++ GenerateConstructorList(out_cc_str, options.namespace, options.export, + typenames, platforms, includes, usings) ++ out_cc.write(out_cc_str.getvalue().encode('utf-8')) + + if options.output_cc: + out_cc.close() +diff --git a/chromium/ui/ozone/generate_ozone_platform_list.py b/chromium/ui/ozone/generate_ozone_platform_list.py +index d47c398259b..2702b68b9bd 100755 +--- a/chromium/ui/ozone/generate_ozone_platform_list.py ++++ b/chromium/ui/ozone/generate_ozone_platform_list.py +@@ -49,12 +49,15 @@ Example Output: ./generate_ozone_platform_list.py --default wayland dri wayland + + """ + ++try: ++ from StringIO import StringIO # for Python 2 ++except ImportError: ++ from io import StringIO # for Python 3 + import optparse + import os + import collections + import re + import sys +-import string + + + def GetConstantName(name): +@@ -63,7 +66,7 @@ def GetConstantName(name): + We just capitalize the platform name and prepend "CreateOzonePlatform". + """ + +- return 'kPlatform' + string.capitalize(name) ++ return 'kPlatform' + name.capitalize() + + + def GeneratePlatformListText(out, platforms): +@@ -149,9 +152,9 @@ def main(argv): + platforms.insert(0, options.default) + + # Write to standard output or file specified by --output_{cc,h}. +- out_cc = sys.stdout +- out_h = sys.stdout +- out_txt = sys.stdout ++ out_cc = getattr(sys.stdout, 'buffer', sys.stdout) ++ out_h = getattr(sys.stdout, 'buffer', sys.stdout) ++ out_txt = getattr(sys.stdout, 'buffer', sys.stdout) + if options.output_cc: + out_cc = open(options.output_cc, 'wb') + if options.output_h: +@@ -159,9 +162,16 @@ def main(argv): + if options.output_txt: + out_txt = open(options.output_txt, 'wb') + +- GeneratePlatformListText(out_txt, platforms) +- GeneratePlatformListHeader(out_h, platforms) +- GeneratePlatformListSource(out_cc, platforms) ++ out_txt_str = StringIO() ++ out_h_str = StringIO() ++ out_cc_str = StringIO() ++ ++ GeneratePlatformListText(out_txt_str, platforms) ++ out_txt.write(out_txt_str.getvalue().encode('utf-8')) ++ GeneratePlatformListHeader(out_h_str, platforms) ++ out_h.write(out_h_str.getvalue().encode('utf-8')) ++ GeneratePlatformListSource(out_cc_str, platforms) ++ out_cc.write(out_cc_str.getvalue().encode('utf-8')) + + if options.output_cc: + out_cc.close() +-- +2.25.1 + diff --git a/package/qt5/qt5webengine-chromium/0002-Don-t-rebase-sysroot-path.patch b/package/qt5/qt5webengine-chromium/0002-Don-t-rebase-sysroot-path.patch new file mode 100644 index 0000000000..c39f008a3d --- /dev/null +++ b/package/qt5/qt5webengine-chromium/0002-Don-t-rebase-sysroot-path.patch @@ -0,0 +1,32 @@ +From bfc520671693587a0b81842018326da35aa97f80 Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Thu, 3 Feb 2022 20:41:08 -0700 +Subject: [PATCH] Don't rebase sysroot path + +Just use the actual sysroot as rebase_path will generate an invalid +sysroot path. + +Fixes: +/home/buildroot/buildroot/output/per-package/qt5webengine/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-buildroot-linux-gnu/10.3.0/../../../../aarch64-buildroot-linux-gnu/bin/ld: cannot find crti.o: No such file or directory + +Signed-off-by: James Hilliard +--- + chromium/build/config/posix/BUILD.gn | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chromium/build/config/posix/BUILD.gn b/chromium/build/config/posix/BUILD.gn +index e61554c5656..dc957225869 100644 +--- a/chromium/build/config/posix/BUILD.gn ++++ b/chromium/build/config/posix/BUILD.gn +@@ -27,7 +27,7 @@ config("runtime_library") { + + if (!is_apple && sysroot != "") { + # Pass the sysroot to all C compiler variants, the assembler, and linker. +- sysroot_flags = [ "--sysroot=" + rebase_path(sysroot, root_build_dir) ] ++ sysroot_flags = [ "--sysroot=" + sysroot ] + if (is_linux || is_chromeos) { + # This is here so that all files get recompiled after a sysroot roll and + # when turning the sysroot on or off. (defines are passed via the command +-- +2.25.1 + 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)) -- 2.25.1 From peter at korsgaard.com Tue Feb 15 08:15:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 15 Feb 2022 09:15:43 +0100 Subject: [Buildroot] [PATCH] configs/roc_pc_rk3399_defconfig: expand rootfs size to 120M In-Reply-To: <6edcbc6d-c9bb-e802-48f1-d4866a698aa9@mind.be> (Arnout Vandecappelle's message of "Mon, 14 Feb 2022 21:13:33 +0100") References: <20220202171035.1740791-1-giulio.benetti@benettiengineering.com> <20220202171035.1740791-2-giulio.benetti@benettiengineering.com> <6edcbc6d-c9bb-e802-48f1-d4866a698aa9@mind.be> Message-ID: <87czjok0k0.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle writes: >> It is because of modules(30M) and linux "Image", it's not >> compressed, so it's 25M. So only for Linux+modules => 55M, plus the >> few other stuff(Busybox+libc etc.)1M > Yeah those giant aarch64 default configs are mightily annoying... > I'm thinking, perhaps we should just bite the bullet and move the > default ext2 size to 120M... > Peter, Yann, what do you think? Fine by me. -- Bye, Peter Korsgaard From buildroot at busybox.net Tue Feb 15 08:21:39 2022 From: buildroot at busybox.net (buildroot at busybox.net) Date: 15 Feb 2022 00:21:39 -0800 Subject: [Buildroot] Waiting for the payment 2/15/2022 12:21:39 a.m. Message-ID: <20220215002139.5FEBC05E5429E579@busybox.net> An HTML attachment was scrubbed... URL: From luca at lucaceresoli.net Tue Feb 15 08:48:40 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Tue, 15 Feb 2022 09:48:40 +0100 Subject: [Buildroot] [PATCH] utils/docker-run: improve user experience In-Reply-To: <20220214203909.251924-1-yann.morin.1998@free.fr> References: <20220214203909.251924-1-yann.morin.1998@free.fr> Message-ID: Hi Yann, On 14/02/22 21:39, Yann E. MORIN wrote: > Currently, the docker-run script starts a container based on the > reference image, in which the user has UID:GID set to 1000:1000, > which may or may not be the same as local user uses, which may > prevent the commands in the container from creating files, which > foils the plan of using the container to run a build... > > Additionally, the paths in the container differ from the paths > the user expects, as the current Buildroot tree is mounted over > the in-container user home directory. This is a bit confusing... > > Finally, the container is left hanging around after the command > finishes, and thus there are as many lingering containers as the > user runs docker-run. This is not very nice... > > We fix all of that (yeah, should be different patches, but meh): > > - we use --mount instead of -v, which allows us to bind-mount > the Buildroot tree at the same place in the container, as > Docker will create the destination if it does not exist, while > -v seems to expect it to exist [0]. > > - as a consequence, we can also set the working directory as the > Buildroot top-directory; > > - use --user to force the same UID:GID in the container as the > local user, so that files created in the container belong to > the local user, and so that files from the local user are > accessible from the container; > > - use --rm do remove the container once it terminates; starting > a new container is very quick anyway, so it is as good as > re-using a previous container. > > [0] the documentation is not clear about that. It clearly states > that the host directory (i.e. the origin, the source) is created > if missing, but it says nothing of the destination: > https://docs.docker.com/engine/reference/commandline/run/#mount-volume--v---read-only > > Signed-off-by: Yann E. MORIN > Cc: Luca Ceresoli > Cc: Giulio Benetti > Cc: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: Luca Ceresoli -- Luca From wbx at openadk.org Tue Feb 15 10:06:42 2022 From: wbx at openadk.org (Waldemar Brodkorb) Date: Tue, 15 Feb 2022 11:06:42 +0100 Subject: [Buildroot] [PATCH 2/2] package/{glibc, localedef}: update to 2.35 In-Reply-To: <1b0d866f-fc09-f23d-3fae-068858ab5304@mind.be> References: <1b0d866f-fc09-f23d-3fae-068858ab5304@mind.be> Message-ID: Hi Arnout, Arnout Vandecappelle wrote, > On 11/02/2022 19:08, Waldemar Brodkorb wrote: > > https://sourceware.org/pipermail/libc-alpha/2022-February/136040.html > > > > - allow to use optimization CFLAGS (not CPPFLAGS) which are nowadays > > supported by upstream (except nios2) > > - enable support for or1k, which is now included upstream > > - runtime tested with qemu-system for aarch64/arm/microblaze/mips/mips64/nios2/ > > or1k/powerpc/powerpc64/powerpc64le/riscv32/riscv64/s390x/sh4/sparc64/x86/x86_64 > > > > Signed-off-by: Waldemar Brodkorb > > --- > > ...v-linux-microblaze-pselect32.c-add-m.patch | 85 ------------------- > > .../glibc.hash | 2 +- > > package/glibc/glibc.mk | 16 ++-- > > ...ACK-only-build-and-install-localedef.patch | 0 > > ...y-on-GCC-to-4.8-and-binutils-to-2.24.patch | 0 > > .../localedef.hash | 2 +- > > package/localedef/localedef.mk | 2 +- > > toolchain/toolchain-buildroot/Config.in | 3 +- > > 8 files changed, 15 insertions(+), 95 deletions(-) > > delete mode 100644 package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch > > rename package/glibc/{2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c => 2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586}/glibc.hash (70%) > > rename package/localedef/{2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c => 2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586}/0001-HACK-only-build-and-install-localedef.patch (100%) > > rename package/localedef/{2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c => 2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586}/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch (100%) > > rename package/localedef/{2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c => 2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586}/localedef.hash (70%) > > with the removal of the csky fork in commit ebc6c7e, there's no longer a > need to version the patches, so perhaps you could take this opportunity to > move them out of the directory. Okay. > [snip] > > diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk > > index 2702994c6b..f258f33c96 100644 > > --- a/package/glibc/glibc.mk > > +++ b/package/glibc/glibc.mk > > @@ -7,7 +7,7 @@ > > # Generate version string using: > > # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- > > # When updating the version, please also update localedef > > -GLIBC_VERSION = 2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c > > +GLIBC_VERSION = 2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586 > > # Upstream doesn't officially provide an https download link. > > # There is one (https://sourceware.org/git/glibc.git) but it's not reliable, > > # sometimes the connection times out. So use an unofficial github mirror. > > @@ -110,16 +110,20 @@ endif > > # > > # 2. We have to execute the configure script with bash and not sh. > > # > > -# Note that as mentionned in > > -# http://patches.openembedded.org/patch/38849/, glibc must be > > -# built with -O2, so we pass our own CFLAGS and CXXFLAGS below. > > +# Glibc nowadays can be build with optimization flags f.e. -Os > > + > > +# crash in qemu-system-nios2 with -Os > > +ifeq ($(BR2_nios2),y) > > +TARGET_FCFLAGS := -O2 > > You're overriding the global TARGET_FCFLAGS here, that's not allowed. > > Instead, you should use > > GLIBC_CFLAGS = $(TARGET_CFLAGS) > # crash in qemu-system-nios2 with -Os > ifeq ($(BR2_nios2),y) > GLIBC_CFLAGS += -O2 > endif > > (I'm not sure if += is OK here, if not, just use =) > > And to make the below simpler, you can use > > GLIBC_CFLAGS += $(GLIBC_EXTRA_CFLAGS) > > Alternatively, if += is OK for nios, you can use > > ifeq ($(BR2_nios2),y) > GLIBC_EXTRA_CFLAGS += -O2 > endif > ... > CFLAGS="$(TARGET_CFLAGS) $(GLIBC_EXTRA_CFLAGS)" \ > > > > +endif > > + > > define GLIBC_CONFIGURE_CMDS > > mkdir -p $(@D)/build > > # Do the configuration > > (cd $(@D)/build; \ > > $(TARGET_CONFIGURE_OPTS) \ > > - CFLAGS="-O2 $(GLIBC_EXTRA_CFLAGS)" CPPFLAGS="" \ > > - CXXFLAGS="-O2 $(GLIBC_EXTRA_CFLAGS)" \ > > + CFLAGS="$(TARGET_FCFLAGS) $(GLIBC_EXTRA_CFLAGS)" CPPFLAGS="" \ > > FCFLAGS stands for Fortran Compilation flags. You should use TARGET_CFLAGS here. > > Why is CPPFLAGS not set? Glibc does not compile with the existing TARGET_CPPFLAGS which are added to TARGET_CFLAGS so I can not use TARGET_CFLAGS to optimize the build. I will use TARGET_OPTIMIZATION if that is okay. best regards Waldemar From quentin.schulz at theobroma-systems.com Tue Feb 15 10:11:02 2022 From: quentin.schulz at theobroma-systems.com (Quentin Schulz) Date: Tue, 15 Feb 2022 11:11:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/strongswan: security bump to version 5.9.5 In-Reply-To: <20220213113332.1056370-1-fontaine.fabrice@gmail.com> References: <20220213113332.1056370-1-fontaine.fabrice@gmail.com> Message-ID: Hi Fabrice, On 2/13/22 12:33, Fabrice Fontaine wrote: > Fixed a vulnerability in the EAP client implementation that was caused > by incorrectly handling early EAP-Success messages. It may allow to > bypass the client and in some scenarios even the server authentication, > or could lead to a denial-of-service attack. This vulnerability has been > registered as CVE-2021-45079: > https://urldefense.proofpoint.com/v2/url?u=https-3A__www.strongswan.org_blog_2022_01_24_strongswan-2Dvulnerability-2D-28cve-2D2021-2D45079-29.html&d=DwICAg&c=_sEr5x9kUWhuk4_nFwjJtA&r=LYjLexDn7rXIzVmkNPvw5ymA1XTSqHGq8yBP6m6qZZ4njZguQhZhkI_-172IIy1t&m=Xw8Wse_xivKp-F2KsLaYN07aQNQFV9AOg9nJURWQjmPZhznmWAC7LZTawLVpqOwW&s=qVIfoIBmT6GmL9xoC3go3t3Hu45ZtCsAWTeU0X0HBPU&e= > > https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_strongswan_strongswan_releases_tag_5.9.5&d=DwICAg&c=_sEr5x9kUWhuk4_nFwjJtA&r=LYjLexDn7rXIzVmkNPvw5ymA1XTSqHGq8yBP6m6qZZ4njZguQhZhkI_-172IIy1t&m=Xw8Wse_xivKp-F2KsLaYN07aQNQFV9AOg9nJURWQjmPZhznmWAC7LZTawLVpqOwW&s=UEX186sLiKBzRnvlExvfzMtE4KjZS-Rd7CfD8fNRV0E&e= > > Signed-off-by: Fabrice Fontaine Missed your patch and was about to send one :) Reviewed-by: Quentin Schulz Needs to be backported to currently maintained branches too, so Cc'ing Peter on this :) Thanks! Quentin From fontaine.fabrice at gmail.com Tue Feb 15 10:53:40 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 15 Feb 2022 11:53:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pycli: drop package Message-ID: <20220215105340.1919699-1-fontaine.fabrice@gmail.com> python-pycli raises the following build failure since bump of python3 to version 3.10.1 in commit 25b1fc2898d68ddf2674b14c738045875fc5a2dc due to the new "Multiple Exception types without parentheses" exception (https://docs.python.org/3/whatsnew/3.10.html) error: File "/usr/lib/python3.10/site-packages/cli/app.py", line 242 except Exception, e: ^^^^^^^^^^^^ SyntaxError: multiple exception types must be parenthesized So drop the package as the last release was made 10 years ago. Fixes: - http://autobuild.buildroot.org/results/8d7b0c23472abffc9447e4a6de273bdd04486d39 Signed-off-by: Fabrice Fontaine --- Config.in.legacy | 7 +++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/python-pycli/Config.in | 7 ------- package/python-pycli/python-pycli.hash | 5 ----- package/python-pycli/python-pycli.mk | 14 -------------- 6 files changed, 7 insertions(+), 28 deletions(-) delete mode 100644 package/python-pycli/Config.in delete mode 100644 package/python-pycli/python-pycli.hash delete mode 100644 package/python-pycli/python-pycli.mk diff --git a/Config.in.legacy b/Config.in.legacy index aefb0ba6ea..99459c7ad3 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_PYCLI + bool "python-pycli removed" + select BR2_LEGACY + help + Package was removed because it is not compatible with python + 3.10 and is not maintained anymore (no release since 2012). + config BR2_PACKAGE_LINUX_TOOLS_BPFTOOL bool "bpftool was moved" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 3e7c753836..6208df974d 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1065,7 +1065,6 @@ N: Geoff Levand F: package/flannel/ N: Geoffrey Ragot -F: package/python-pycli/ F: package/python-pyyaml/ N: Gerome Burlats diff --git a/package/Config.in b/package/Config.in index 3213c4a9b4..ed7d9555b2 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1144,7 +1144,6 @@ menu "External python modules" source "package/python-pybind/Config.in" source "package/python-pycairo/Config.in" source "package/python-pycares/Config.in" - source "package/python-pycli/Config.in" source "package/python-pycparser/Config.in" source "package/python-pycryptodomex/Config.in" source "package/python-pycups/Config.in" diff --git a/package/python-pycli/Config.in b/package/python-pycli/Config.in deleted file mode 100644 index e1ce3b99a6..0000000000 --- a/package/python-pycli/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYCLI - bool "python-pycli" - help - The cli package is a framework for making simple, correct - command line applications in Python. - - https://pythonhosted.org/pyCLI/ diff --git a/package/python-pycli/python-pycli.hash b/package/python-pycli/python-pycli.hash deleted file mode 100644 index f0890e83a9..0000000000 --- a/package/python-pycli/python-pycli.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5 from https://pypi.python.org/pypi/pycli/json -md5 89c487e7c8068ce05d63394d2ae7ebad pyCLI-2.0.3.tar.gz -# Locally computed -sha256 bc53e6c5db031ae1c05d131641f153d22a201c5e82cc8c9324a945752efbb622 pyCLI-2.0.3.tar.gz -sha256 591490b2ef462a4ad2be1aae5dd47738cb17e191c82d3ba38c3ae906d288e6ba lib/cli/__init__.py diff --git a/package/python-pycli/python-pycli.mk b/package/python-pycli/python-pycli.mk deleted file mode 100644 index 7aff1c6200..0000000000 --- a/package/python-pycli/python-pycli.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-pycli -# -################################################################################ - -PYTHON_PYCLI_VERSION = 2.0.3 -PYTHON_PYCLI_SOURCE = pyCLI-$(PYTHON_PYCLI_VERSION).tar.gz -PYTHON_PYCLI_SITE = https://pypi.python.org/packages/95/fc/b2d86a5fbdac4072bcf70b01674b612e1a13026f54962c878fe3eca36fd1 -PYTHON_PYCLI_LICENSE = ISC-like -PYTHON_PYCLI_LICENSE_FILES = lib/cli/__init__.py -PYTHON_PYCLI_SETUP_TYPE = setuptools - -$(eval $(python-package)) -- 2.34.1 From wbx at openadk.org Tue Feb 15 11:18:02 2022 From: wbx at openadk.org (Waldemar Brodkorb) Date: Tue, 15 Feb 2022 12:18:02 +0100 Subject: [Buildroot] [PATCH v2] package/{glibc, localedef}: update to 2.35 Message-ID: https://sourceware.org/pipermail/libc-alpha/2022-February/136040.html - allow to use optimization CFLAGS (not CPPFLAGS) which are nowadays supported by upstream (except nios2) - enable support for or1k, which is now included upstream - runtime tested with qemu-system for aarch64/arm/microblaze/mips/mips64/nios2/ or1k/powerpc/powerpc64/powerpc64le/riscv32/riscv64/s390x/sh4/sparc64/x86/x86_64 Signed-off-by: Waldemar Brodkorb --- v1->v2: - remove subdirs for patches/hash file no longer required, sugested by Arnout - use TARGET_OPTIMIZATION instead of TARGET_FCFLAGS requested by Arnout --- ...v-linux-microblaze-pselect32.c-add-m.patch | 85 ------------------- .../glibc.hash | 7 -- package/glibc/glibc.hash | 9 +- package/glibc/glibc.mk | 17 ++-- ...ACK-only-build-and-install-localedef.patch | 0 ...y-on-GCC-to-4.8-and-binutils-to-2.24.patch | 0 .../localedef.hash | 7 -- package/localedef/localedef.hash | 9 +- package/localedef/localedef.mk | 2 +- toolchain/toolchain-buildroot/Config.in | 3 +- 10 files changed, 28 insertions(+), 111 deletions(-) delete mode 100644 package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch delete mode 100644 package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/glibc.hash rename package/localedef/{2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c => }/0001-HACK-only-build-and-install-localedef.patch (100%) rename package/localedef/{2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c => }/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch (100%) delete mode 100644 package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/localedef.hash diff --git a/package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch b/package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch deleted file mode 100644 index 3597cd6a11..0000000000 --- a/package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch +++ /dev/null @@ -1,85 +0,0 @@ -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 - diff --git a/package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/glibc.hash b/package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/glibc.hash deleted file mode 100644 index dfd939020f..0000000000 --- a/package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/glibc.hash +++ /dev/null @@ -1,7 +0,0 @@ -# Locally calculated (fetched from Github) -sha256 3c299a21468a80356b848ca341f45551616c4928a6c871e6d45cee942e8b0f24 glibc-2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c.tar.gz - -# Hashes for license files -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB -sha256 b33d0bd9f685b46853548814893a6135e74430d12f6d94ab3eba42fc591f83bc LICENSES diff --git a/package/glibc/glibc.hash b/package/glibc/glibc.hash index 5316f03b10..f28c15c2a3 100644 --- a/package/glibc/glibc.hash +++ b/package/glibc/glibc.hash @@ -1,2 +1,7 @@ -# This hash file is not used; instead, update the -# hash files in the per-version sub-directories. +# Locally calculated (fetched from Github) +sha256 0ca43b2a6cd74609519554303a16e350abdac0e66943c5d98d91228233c826a0 glibc-2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586.tar.gz + +# Hashes for license files +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB +sha256 b33d0bd9f685b46853548814893a6135e74430d12f6d94ab3eba42fc591f83bc LICENSES diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index 2702994c6b..7b46ad42c3 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -7,7 +7,7 @@ # Generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- # When updating the version, please also update localedef -GLIBC_VERSION = 2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c +GLIBC_VERSION = 2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586 # Upstream doesn't officially provide an https download link. # There is one (https://sourceware.org/git/glibc.git) but it's not reliable, # sometimes the connection times out. So use an unofficial github mirror. @@ -110,16 +110,21 @@ endif # # 2. We have to execute the configure script with bash and not sh. # -# Note that as mentionned in -# http://patches.openembedded.org/patch/38849/, glibc must be -# built with -O2, so we pass our own CFLAGS and CXXFLAGS below. +# Glibc nowadays can be build with optimization flags f.e. -Os + +GLIBC_CFLAGS = $(TARGET_OPTIMIZATION) +# crash in qemu-system-nios2 with -Os +ifeq ($(BR2_nios2),y) +GLIBC_CFLAGS += -O2 +endif + define GLIBC_CONFIGURE_CMDS mkdir -p $(@D)/build # Do the configuration (cd $(@D)/build; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="-O2 $(GLIBC_EXTRA_CFLAGS)" CPPFLAGS="" \ - CXXFLAGS="-O2 $(GLIBC_EXTRA_CFLAGS)" \ + CFLAGS="$(GLIBC_CFLAGS) $(GLIBC_EXTRA_CFLAGS)" CPPFLAGS="" \ + CXXFLAGS="$(GLIBC_CFLAGS) $(GLIBC_EXTRA_CFLAGS)" \ $(GLIBC_CONF_ENV) \ $(SHELL) $(@D)/configure \ --target=$(GNU_TARGET_NAME) \ diff --git a/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-HACK-only-build-and-install-localedef.patch b/package/localedef/0001-HACK-only-build-and-install-localedef.patch similarity index 100% rename from package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-HACK-only-build-and-install-localedef.patch rename to package/localedef/0001-HACK-only-build-and-install-localedef.patch diff --git a/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch b/package/localedef/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch similarity index 100% rename from package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch rename to package/localedef/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch diff --git a/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/localedef.hash b/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/localedef.hash deleted file mode 100644 index dfd939020f..0000000000 --- a/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/localedef.hash +++ /dev/null @@ -1,7 +0,0 @@ -# Locally calculated (fetched from Github) -sha256 3c299a21468a80356b848ca341f45551616c4928a6c871e6d45cee942e8b0f24 glibc-2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c.tar.gz - -# Hashes for license files -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB -sha256 b33d0bd9f685b46853548814893a6135e74430d12f6d94ab3eba42fc591f83bc LICENSES diff --git a/package/localedef/localedef.hash b/package/localedef/localedef.hash index 5316f03b10..f28c15c2a3 100644 --- a/package/localedef/localedef.hash +++ b/package/localedef/localedef.hash @@ -1,2 +1,7 @@ -# This hash file is not used; instead, update the -# hash files in the per-version sub-directories. +# Locally calculated (fetched from Github) +sha256 0ca43b2a6cd74609519554303a16e350abdac0e66943c5d98d91228233c826a0 glibc-2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586.tar.gz + +# Hashes for license files +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB +sha256 b33d0bd9f685b46853548814893a6135e74430d12f6d94ab3eba42fc591f83bc LICENSES diff --git a/package/localedef/localedef.mk b/package/localedef/localedef.mk index f8f0b42984..fb5edde0c2 100644 --- a/package/localedef/localedef.mk +++ b/package/localedef/localedef.mk @@ -7,7 +7,7 @@ # Use the same VERSION and SITE as target glibc # As in glibc.mk, generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- -LOCALEDEF_VERSION = 2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c +LOCALEDEF_VERSION = 2.35-6-g491f2ef1f0ff849490f374917957018d07ee0586 LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION).tar.gz LOCALEDEF_SITE = $(call github,bminor,glibc,$(LOCALEDEF_VERSION)) HOST_LOCALEDEF_DL_SUBDIR = glibc diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in index 4004c0edf8..437daafa74 100644 --- a/toolchain/toolchain-buildroot/Config.in +++ b/toolchain/toolchain-buildroot/Config.in @@ -49,7 +49,8 @@ config BR2_TOOLCHAIN_BUILDROOT_GLIBC BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le || \ BR2_riscv || BR2_s390x || BR2_sh || \ BR2_sparc64 || BR2_x86_64 || BR2_microblaze || \ - BR2_nios2 || (BR2_arc && BR2_ARC_ATOMIC_EXT) || BR2_csky + BR2_nios2 || (BR2_arc && BR2_ARC_ATOMIC_EXT) || \ + BR2_csky || BR2_or1k depends on BR2_USE_MMU depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 -- 2.30.2 From nolange79 at gmail.com Tue Feb 15 12:46:17 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Tue, 15 Feb 2022 13:46:17 +0100 Subject: [Buildroot] [PATCH 1/2] toolchain: support mismatched merged usr Message-ID: <20220215124619.563502-1-nolange79@gmail.com> Look at the case where the source toolchain has non-merged usr, yet the target will have merged usr. sysroot/lib/ld-musl-x86_64.so.1 -> ../usr/lib/libc.so sysroot/usr/lib/libc.so What happens is that buildroot copies the ld-*so* symlink into usr/lib, at which point it becomes broken. We now detect these broken symlinks, then try to find the target binary in the library directories and fix the link. Fix the case where the lib directory is a symlink, and no ld-*so* is installed by adding -H to find. Also use `cp -t` instead of some rarely used xargs tricks. Signed-off-by: Norbert Lange --- toolchain/helpers.mk | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk index ef8e9a5f64..aaf2aecd80 100644 --- a/toolchain/helpers.mk +++ b/toolchain/helpers.mk @@ -135,8 +135,17 @@ copy_toolchain_sysroot = \ $(call simplify_symlink,$$i,$(STAGING_DIR)) ; \ done ; \ fi ; \ - if [[ ! $$(find $(STAGING_DIR)/lib -name 'ld*.so.*' -print -quit) ]]; then \ - find $${ARCH_SYSROOT_DIR}/lib -name 'ld*.so.*' -print0 | xargs -0 -I % cp % $(STAGING_DIR)/lib/; \ + for i in $$(find -H $(STAGING_DIR)/lib -name 'ld*.so.*' -xtype l); do \ + LINKTARGET=`readlink $$i`; \ + rm $$i; \ + NEWLINKTARGET=$$(find -H $(STAGING_DIR)/$${ARCH_LIB_DIR} $(STAGING_DIR)/lib $(STAGING_DIR)/usr/$${ARCH_LIB_DIR} $(STAGING_DIR)/usr/lib -name "`basename $${LINKTARGET}`" -print -quit); \ + if [ -n "$${NEWLINKTARGET}" -a -e "$${NEWLINKTARGET}" ]; then \ + ln -sr $${NEWLINKTARGET} $$i; \ + echo "Symlinking $$i -> `readlink $$i`" ; \ + fi; \ + done; \ + if [[ ! $$(find -H $(STAGING_DIR)/lib -name 'ld*.so.*' -print -quit) ]]; then \ + find $${ARCH_SYSROOT_DIR}/lib -name 'ld*.so.*' -print0 | xargs -0 cp -t $(STAGING_DIR)/lib/; \ fi ; \ if [ `readlink -f $${SYSROOT_DIR}` != `readlink -f $${ARCH_SYSROOT_DIR}` ] ; then \ if [ ! -d $${ARCH_SYSROOT_DIR}/usr/include ] ; then \ -- 2.34.1 From nolange79 at gmail.com Tue Feb 15 12:46:18 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Tue, 15 Feb 2022 13:46:18 +0100 Subject: [Buildroot] [PATCH 2/2] toolchain: prevent infinite loop in copy_toolchain_lib_root In-Reply-To: <20220215124619.563502-1-nolange79@gmail.com> References: <20220215124619.563502-1-nolange79@gmail.com> Message-ID: <20220215124619.563502-2-nolange79@gmail.com> This can happen when there are broken symlinks. Signed-off-by: Norbert Lange --- toolchain/helpers.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk index aaf2aecd80..7623d68123 100644 --- a/toolchain/helpers.mk +++ b/toolchain/helpers.mk @@ -20,6 +20,7 @@ copy_toolchain_lib_root = \ if test -h $${LIBPATH} ; then \ cp -d $${LIBPATH} $(TARGET_DIR)/$${DESTDIR}/$${LIBNAME}; \ LIBPATH="`readlink -f $${LIBPATH}`"; \ + [ -n "$${LIBPATH}" ] || break; \ elif test -f $${LIBPATH}; then \ $(INSTALL) -D -m0755 $${LIBPATH} $(TARGET_DIR)/$${DESTDIR}/$${LIBNAME}; \ break ; \ -- 2.34.1 From giulio.benetti at benettiengineering.com Tue Feb 15 13:00:36 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 15 Feb 2022 14:00:36 +0100 Subject: [Buildroot] [PATCH 2/3] board/andes/ae350: add support for Andes AE350 In-Reply-To: References: Message-ID: Hi Peter, > Il giorno 15 feb 2022, alle ore 06:16, Yu Chien Peter Lin ha scritto: > > ? >> >>> On Tue, Feb 15, 2022 at 10:32:01AM +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 >>> --- >>> Changes >>> V1->V2: >>> * move linux source code and its patches to AndesTech Github repo >>> * rename ae350_andestar45_defconfig to andes_ae350_45_defconfig >>> * change C library to uClibc >>> * remove OpenSSL package >>> * remove rootfs.cpio and rootfs.tar >>> * update DEVELOPERS >>> V2->V3: >>> * specifiy branch to download from AndesTech linux repo >>> * change boot.cmd to extlinux.conf >>> * add post-build.sh for extlinux.conf to retrieve Image and DTB >>> * fix format and update genimage_sdcard.cfg >>> * update readme.txt >>> * add packages (python3, pylibfdt and openssl) for u-boot binman >>> * reorder item in DEVELOPERS >>> > > Sorry, I missed versioning for this revision. > I'll resend it and fix changelog format. Can you please subscribe to patchwork[1] and tag your patches without V3 prefix as rejected? [1]: https://patchwork.ozlabs.org/project/buildroot/list/ Thank you! Giulio > > Regards, > Yu-Chien Peter Lin > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -------------- next part -------------- An HTML attachment was scrubbed... URL: From fontaine.fabrice at gmail.com Tue Feb 15 13:29:09 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 15 Feb 2022 14:29:09 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/python-pycli: fix build with python >= 3.10 Message-ID: <20220215132909.2360674-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump of python3 to version 3.10.1 in commit 25b1fc2898d68ddf2674b14c738045875fc5a2dc due to the new "Multiple Exception types without parentheses" exception (https://docs.python.org/3/whatsnew/3.10.html) error: File "/usr/lib/python3.10/site-packages/cli/app.py", line 242 except Exception, e: ^^^^^^^^^^^^ SyntaxError: multiple exception types must be parenthesized Fixes: - http://autobuild.buildroot.org/results/8d7b0c23472abffc9447e4a6de273bdd04486d39 Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2: - Add upstream commits instead of dropping package (even if repository has been archived) ...aise-exceptions-in-wrapped-functions.patch | 26 ++++++++++++ ...pt-statement-changed-slightly-in-2-6.patch | 41 +++++++++++++++++++ 2 files changed, 67 insertions(+) create mode 100644 package/python-pycli/0001-Fix-problem-with-re-raise-exceptions-in-wrapped-functions.patch create mode 100644 package/python-pycli/0002-except-statement-changed-slightly-in-2-6.patch diff --git a/package/python-pycli/0001-Fix-problem-with-re-raise-exceptions-in-wrapped-functions.patch b/package/python-pycli/0001-Fix-problem-with-re-raise-exceptions-in-wrapped-functions.patch new file mode 100644 index 0000000000..7ac9d7af9f --- /dev/null +++ b/package/python-pycli/0001-Fix-problem-with-re-raise-exceptions-in-wrapped-functions.patch @@ -0,0 +1,26 @@ +From 57c563f8b47a56feefc0a8bcbef05f4b54280549 Mon Sep 17 00:00:00 2001 +From: mmbutter +Date: Tue, 9 Jun 2020 11:50:41 -0500 +Subject: [PATCH] Fix problem with re-raise exceptions in wrapped functions. + +[Retrieved from: +https://github.com/whilp/cli/commit/57c563f8b47a56feefc0a8bcbef05f4b54280549] +Signed-off-by: Fabrice Fontaine +--- + lib/cli/app.py | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/lib/cli/app.py b/lib/cli/app.py +index 7b6db52..f487ab4 100644 +--- a/lib/cli/app.py ++++ b/lib/cli/app.py +@@ -240,6 +240,9 @@ def run(self): + try: + returned = self.main(*args) + except Exception, e: ++ elif isinstance(e, self.reraise): ++ # raising the last exception preserves traceback ++ raise + returned = e + + return self.post_run(returned) diff --git a/package/python-pycli/0002-except-statement-changed-slightly-in-2-6.patch b/package/python-pycli/0002-except-statement-changed-slightly-in-2-6.patch new file mode 100644 index 0000000000..75869d6d23 --- /dev/null +++ b/package/python-pycli/0002-except-statement-changed-slightly-in-2-6.patch @@ -0,0 +1,41 @@ +From 2af95cff5609142ec14efdf13b394f9b0121ab2e Mon Sep 17 00:00:00 2001 +From: mmbutter +Date: Thu, 11 Jun 2020 15:50:03 -0500 +Subject: [PATCH] except statement changed slightly in 2.6. This could cause + problems in newer versions. Updated to the new format. + +[Retrieved from: +https://github.com/whilp/cli/commit/2af95cff5609142ec14efdf13b394f9b0121ab2e] +Signed-off-by: Fabrice Fontaine +--- + lib/cli/app.py | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/lib/cli/app.py b/lib/cli/app.py +index f487ab4..45256b8 100644 +--- a/lib/cli/app.py ++++ b/lib/cli/app.py +@@ -239,10 +239,10 @@ def run(self): + args = () + try: + returned = self.main(*args) +- except Exception, e: +- elif isinstance(e, self.reraise): +- # raising the last exception preserves traceback +- raise ++ except self.reraise: ++ # raising the last exception preserves traceback ++ raise ++ except Exception as e: + returned = e + + return self.post_run(returned) +@@ -420,7 +420,7 @@ def pre_run(self): + """ + try: + ns = self.argparser.parse_args() +- except SystemExit, e: ++ except SystemExit as e: + if self.exit_after_main: + raise + else: -- 2.34.1 From fontaine.fabrice at gmail.com Tue Feb 15 13:41:10 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 15 Feb 2022 14:41:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5webkit: disable sampling profiler on musl Message-ID: <20220215134110.2365539-1-fontaine.fabrice@gmail.com> Disable sampling profiler on musl to avoid the following build falure raised since bump to version 5.212.0-alpha4 in commit df0b0fe6919c0d0f3750f439a3cfa765232bd569: /home/buildroot/autobuild/instance-0/output-1/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/heap/MachineStackMarker.cpp:686:2: error: #error Need a way to get the frame pointer for another thread on this platform 686 | #error Need a way to get the frame pointer for another thread on this platform | ^~~~~ Fixes: - http://autobuild.buildroot.org/results/87f52db7f8ebefa4c1ae3dd70d4a7a460f9aca35 Signed-off-by: Fabrice Fontaine --- package/qt5/qt5webkit/qt5webkit.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk index 2084f3af52..024184e267 100644 --- a/package/qt5/qt5webkit/qt5webkit.mk +++ b/package/qt5/qt5webkit/qt5webkit.mk @@ -39,6 +39,10 @@ ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5WEBKIT_DEPENDENCIES += qt5declarative endif +ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) +QT5WEBKIT_CONF_OPTS += -DENABLE_SAMPLING_PROFILER=OFF +endif + QT5WEBKIT_CONF_OPTS += \ -DENABLE_TOOLS=OFF \ -DPORT=Qt \ -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 15 21:34:29 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 15 Feb 2022 14:34:29 -0700 Subject: [Buildroot] [PATCH 1/1] package/bpftool: bump to version 51d4a12c69c7339f60813b04fc9d0fd6154792a6 Message-ID: <20220215213429.1778225-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/bpftool/bpftool.hash | 2 +- package/bpftool/bpftool.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/bpftool/bpftool.hash b/package/bpftool/bpftool.hash index c7d4ae250e..9cb03ae332 100644 --- a/package/bpftool/bpftool.hash +++ b/package/bpftool/bpftool.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 c868cb85bf44195ec6cd20649c3db4f7aff64a38d950a1c2911d981fb2d7042c bpftool-a7f0e7f057283ae8af3de4578bcb8b7ee80b7144-br1.tar.gz +sha256 97a91701f0924152eb506d549b46f5df8ce80e738f175c32c364aa8da90ab746 bpftool-51d4a12c69c7339f60813b04fc9d0fd6154792a6-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 index 4276f91958..66f8932b6d 100644 --- a/package/bpftool/bpftool.mk +++ b/package/bpftool/bpftool.mk @@ -4,7 +4,7 @@ # ################################################################################ -BPFTOOL_VERSION = a7f0e7f057283ae8af3de4578bcb8b7ee80b7144 +BPFTOOL_VERSION = 51d4a12c69c7339f60813b04fc9d0fd6154792a6 BPFTOOL_SITE = https://github.com/libbpf/bpftool BPFTOOL_SITE_METHOD = git BPFTOOL_GIT_SUBMODULES = YES -- 2.25.1 From ps.report at gmx.net Tue Feb 15 21:41:25 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 15 Feb 2022 22:41:25 +0100 Subject: [Buildroot] [PATCH v1] package/assimp: bump version to 5.2.1 Message-ID: <20220215214125.20412-1-ps.report@gmx.net> For details see [1]. [1] https://github.com/assimp/assimp/releases/tag/v5.2.1 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 50f0b3e6d6..a778b79132 100644 --- a/package/assimp/assimp.hash +++ b/package/assimp/assimp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 52ad3a3776ce320c8add531dbcb2d3b93f2e1f10fcff5ac30178b09ba934d084 assimp-5.1.6.tar.gz +sha256 c9cbbc8589639cd8c13f65e94a90422a70454e8fa150cf899b6038ba86e9ecff assimp-5.2.1.tar.gz sha256 147874443d242b4e2bae97036e26ec9d6b37f706174c1bd5ecfcc8c1294cef51 LICENSE diff --git a/package/assimp/assimp.mk b/package/assimp/assimp.mk index 766b2c9b5a..42440f0fa9 100644 --- a/package/assimp/assimp.mk +++ b/package/assimp/assimp.mk @@ -4,7 +4,7 @@ # ################################################################################ -ASSIMP_VERSION = 5.1.6 +ASSIMP_VERSION = 5.2.1 ASSIMP_SITE = $(call github,assimp,assimp,v$(ASSIMP_VERSION)) ASSIMP_LICENSE = BSD-3-Clause ASSIMP_LICENSE_FILES = LICENSE -- 2.34.1 From peter at korsgaard.com Tue Feb 15 22:10:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 15 Feb 2022 23:10:23 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/binutils: add upstream patch for v2.37 fixing linking of thin archives Message-ID: <20220215220331.6CEBB82931@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=94c3c2fa49e26b956f229ee40fa1580d863dc9eb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 40f7b0bb6b91400b9e1fc60f410c9cdcbd1998ab) Signed-off-by: Peter Korsgaard --- ...he-file-descriptor-if-there-is-no-archive.patch | 236 +++++++++++++++++++++ 1 file changed, 236 insertions(+) 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 + From peter at korsgaard.com Tue Feb 15 22:11:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 15 Feb 2022 23:11:35 +0100 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> (Peter Seiderer's message of "Wed, 26 Jan 2022 20:34:31 +0100") References: <20220126193431.17777-1-ps.report@gmx.net> Message-ID: <8735kjkcfc.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > 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 Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From james.hilliard1 at gmail.com Tue Feb 15 22:24:22 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 15 Feb 2022 15:24:22 -0700 Subject: [Buildroot] [PATCH 1/1] package/libbpf: bump to version 0.7.0 Message-ID: <20220215222422.1865613-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/libbpf/libbpf.hash | 2 +- package/libbpf/libbpf.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libbpf/libbpf.hash b/package/libbpf/libbpf.hash index 27e22be9e9..06adc09885 100644 --- a/package/libbpf/libbpf.hash +++ b/package/libbpf/libbpf.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 ce3a8eb32d85ac48490256597736d8b27e0a5e947a0731613b7aba6b4ae43ac0 libbpf-0.6.1.tar.gz +sha256 5083588ce5a3a620e395ee1e596af77b4ec5771ffc71cff2af49dfee38c06361 libbpf-0.7.0.tar.gz sha256 847f4addbd56e2d5be20c4ea0845e972672fc07b755fadaae5f7abd35d71e349 LICENSE sha256 6313108c23efffa36948f8b2cff1560a5935373b527b0e1a837cc77e6ed1bacd LICENSE.BSD-2-Clause sha256 0b9a4febcdee6de55872501d5c1a8f5d8b0d1650cd4d5351995ceb22e889f8ca LICENSE.LGPL-2.1 diff --git a/package/libbpf/libbpf.mk b/package/libbpf/libbpf.mk index 6750b063c0..ff018f5c24 100644 --- a/package/libbpf/libbpf.mk +++ b/package/libbpf/libbpf.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBBPF_VERSION = 0.6.1 +LIBBPF_VERSION = 0.7.0 LIBBPF_SITE = $(call github,libbpf,libbpf,v$(LIBBPF_VERSION)) LIBBPF_LICENSE = GPL-2.0, LGPL-2.1, BSD-2-Clause LIBBPF_LICENSE_FILES = LICENSE LICENSE.BSD-2-Clause LICENSE.LGPL-2.1 -- 2.25.1 From fontaine.fabrice at gmail.com Tue Feb 15 22:40:39 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 15 Feb 2022 23:40:39 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/bluez5_utils: fix build with glibc < 2.25 Message-ID: <20220215224039.3567741-1-fontaine.fabrice@gmail.com> Fix the following build failure with glibc < 2.25 raised since bump to version 5.63 in commit d4c6cf4b1fc0f34e72ff047e76de53d3634f5184: plugins/autopair.c:20:24: fatal error: sys/random.h: No such file or directory #include ^ Fixes: - http://autobuild.buildroot.org/results/6b8870d12e0804d6154230a7322c49416c1dc0e2 Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2: - Use upstream patch ...005-build-Fix-errors-with-glibc-2-25.patch | 312 ++++++++++++++++++ 1 file changed, 312 insertions(+) create mode 100644 package/bluez5_utils/0005-build-Fix-errors-with-glibc-2-25.patch diff --git a/package/bluez5_utils/0005-build-Fix-errors-with-glibc-2-25.patch b/package/bluez5_utils/0005-build-Fix-errors-with-glibc-2-25.patch new file mode 100644 index 0000000000..13033da7b2 --- /dev/null +++ b/package/bluez5_utils/0005-build-Fix-errors-with-glibc-2-25.patch @@ -0,0 +1,312 @@ +From fb57ad9b9d107856e5f1c8135da04ffa2f7a11ac Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 14 Feb 2022 21:17:39 +0100 +Subject: build: Fix errors with glibc < 2.25 + +getrandom and sys/random.h are only available since glibc 2.25: +https://www.gnu.org/software/gnulib/manual/html_node/sys_002frandom_002eh.html +resulting in the following build failures since version 5.63 and +https://git.kernel.org/pub/scm/bluetooth/bluez.git/log/?qt=grep&q=getrandom: + +plugins/autopair.c:20:24: fatal error: sys/random.h: No such file or directory + #include + ^ + +To fix this build failure, add util_getrandom and a fallback (borrowed +from pipewire and licensed under MIT): +https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/master/src/pipewire/utils.c + +Fixes: + - http://autobuild.buildroot.org/results/6b8870d12e0804d6154230a7322c49416c1dc0e2 + +[Retrieved from: +https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=fb57ad9b9d107856e5f1c8135da04ffa2f7a11ac] +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 4 +++- + emulator/le.c | 3 +-- + emulator/phy.c | 3 +-- + peripheral/main.c | 4 ++-- + plugins/autopair.c | 4 ++-- + profiles/health/hdp.c | 4 ++-- + profiles/health/mcap.c | 6 +++--- + src/shared/util.c | 25 +++++++++++++++++++++++++ + src/shared/util.h | 2 ++ + tools/btgatt-server.c | 3 +-- + 10 files changed, 42 insertions(+), 16 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 07d068a4d..441bd5f29 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -54,6 +54,8 @@ AC_ARG_ENABLE(threads, AS_HELP_STRING([--enable-threads], + + AC_CHECK_FUNCS(explicit_bzero) + ++AC_CHECK_FUNCS(getrandom) ++ + AC_CHECK_FUNCS(rawmemchr) + + AC_CHECK_FUNC(signalfd, dummy=yes, +@@ -68,7 +70,7 @@ AC_CHECK_LIB(pthread, pthread_create, dummy=yes, + AC_CHECK_LIB(dl, dlopen, dummy=yes, + AC_MSG_ERROR(dynamic linking loader is required)) + +-AC_CHECK_HEADERS(linux/types.h linux/if_alg.h linux/uinput.h linux/uhid.h) ++AC_CHECK_HEADERS(linux/types.h linux/if_alg.h linux/uinput.h linux/uhid.h sys/random.h) + + PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.28, dummy=yes, + AC_MSG_ERROR(GLib >= 2.28 is required)) +diff --git a/emulator/le.c b/emulator/le.c +index f8f313f2c..7656a657c 100644 +--- a/emulator/le.c ++++ b/emulator/le.c +@@ -20,7 +20,6 @@ + #include + #include + #include +-#include + #include + + #include "lib/bluetooth.h" +@@ -509,7 +508,7 @@ static unsigned int get_adv_delay(void) + /* The advertising delay is a pseudo-random value with a range + * of 0 ms to 10 ms generated for each advertising event. + */ +- if (getrandom(&val, sizeof(val), 0) < 0) { ++ if (util_getrandom(&val, sizeof(val), 0) < 0) { + /* If it fails to get the random number, use a static value */ + val = 5; + } +diff --git a/emulator/phy.c b/emulator/phy.c +index 44cace438..7de85fb05 100644 +--- a/emulator/phy.c ++++ b/emulator/phy.c +@@ -19,7 +19,6 @@ + #include + #include + #include +-#include + #include + #include + #include +@@ -174,7 +173,7 @@ struct bt_phy *bt_phy_new(void) + mainloop_add_fd(phy->rx_fd, EPOLLIN, phy_rx_callback, phy, NULL); + + if (!get_random_bytes(&phy->id, sizeof(phy->id))) { +- if (getrandom(&phy->id, sizeof(phy->id), 0) < 0) { ++ if (util_getrandom(&phy->id, sizeof(phy->id), 0) < 0) { + mainloop_remove_fd(phy->rx_fd); + close(phy->tx_fd); + close(phy->rx_fd); +diff --git a/peripheral/main.c b/peripheral/main.c +index 91adb45fc..b82d7caf6 100644 +--- a/peripheral/main.c ++++ b/peripheral/main.c +@@ -25,13 +25,13 @@ + #include + #include + #include +-#include + + #ifndef WAIT_ANY + #define WAIT_ANY (-1) + #endif + + #include "src/shared/mainloop.h" ++#include "src/shared/util.h" + #include "peripheral/efivars.h" + #include "peripheral/attach.h" + #include "peripheral/gap.h" +@@ -192,7 +192,7 @@ int main(int argc, char *argv[]) + addr, 6) < 0) { + printf("Generating new persistent static address\n"); + +- if (getrandom(addr, sizeof(addr), 0) < 0) { ++ if (util_getrandom(addr, sizeof(addr), 0) < 0) { + perror("Failed to get random static address"); + return EXIT_FAILURE; + } +diff --git a/plugins/autopair.c b/plugins/autopair.c +index a75ecebe4..0b09e893f 100644 +--- a/plugins/autopair.c ++++ b/plugins/autopair.c +@@ -17,7 +17,6 @@ + #include + #include + #include +-#include + + #include + +@@ -29,6 +28,7 @@ + #include "src/device.h" + #include "src/log.h" + #include "src/storage.h" ++#include "src/shared/util.h" + + /* + * Plugin to handle automatic pairing of devices with reduced user +@@ -131,7 +131,7 @@ static ssize_t autopair_pincb(struct btd_adapter *adapter, + if (attempt >= 4) + return 0; + +- if (getrandom(&val, sizeof(val), 0) < 0) { ++ if (util_getrandom(&val, sizeof(val), 0) < 0) { + error("Failed to get a random pincode"); + return 0; + } +diff --git a/profiles/health/hdp.c b/profiles/health/hdp.c +index 9d9d1e824..b6590cd3a 100644 +--- a/profiles/health/hdp.c ++++ b/profiles/health/hdp.c +@@ -16,7 +16,6 @@ + #include + #include + #include +-#include + + #include + +@@ -33,6 +32,7 @@ + #include "src/device.h" + #include "src/sdpd.h" + #include "src/shared/timeout.h" ++#include "src/shared/util.h" + #include "btio/btio.h" + + #include "hdp_types.h" +@@ -1490,7 +1490,7 @@ static void *generate_echo_packet(void) + if (!buf) + return NULL; + +- if (getrandom(buf, HDP_ECHO_LEN, 0) < 0) { ++ if (util_getrandom(buf, HDP_ECHO_LEN, 0) < 0) { + g_free(buf); + return NULL; + } +diff --git a/profiles/health/mcap.c b/profiles/health/mcap.c +index aad0a08a3..5d2bac3d9 100644 +--- a/profiles/health/mcap.c ++++ b/profiles/health/mcap.c +@@ -19,7 +19,6 @@ + #include + #include + #include +-#include + + #include + +@@ -28,6 +27,7 @@ + #include "btio/btio.h" + #include "src/log.h" + #include "src/shared/timeout.h" ++#include "src/shared/util.h" + + #include "mcap.h" + +@@ -1905,7 +1905,7 @@ gboolean mcap_create_mcl(struct mcap_instance *mi, + mcl->state = MCL_IDLE; + bacpy(&mcl->addr, addr); + set_default_cb(mcl); +- if (getrandom(&val, sizeof(val), 0) < 0) { ++ if (util_getrandom(&val, sizeof(val), 0) < 0) { + mcap_instance_unref(mcl->mi); + g_free(mcl); + return FALSE; +@@ -2049,7 +2049,7 @@ static void connect_mcl_event_cb(GIOChannel *chan, GError *gerr, + mcl->mi = mcap_instance_ref(mi); + bacpy(&mcl->addr, &dst); + set_default_cb(mcl); +- if (getrandom(&val, sizeof(val), 0) < 0) { ++ if (util_getrandom(&val, sizeof(val), 0) < 0) { + mcap_instance_unref(mcl->mi); + g_free(mcl); + goto drop; +diff --git a/src/shared/util.c b/src/shared/util.c +index 6e1c83057..33196bf8b 100644 +--- a/src/shared/util.c ++++ b/src/shared/util.c +@@ -13,6 +13,7 @@ + #endif + + #define _GNU_SOURCE ++#include + #include + #include + #include +@@ -23,6 +24,10 @@ + #include + #include + ++#ifdef HAVE_SYS_RANDOM_H ++#include ++#endif ++ + #include "src/shared/util.h" + + void *util_malloc(size_t size) +@@ -138,6 +143,26 @@ unsigned char util_get_dt(const char *parent, const char *name) + return DT_UNKNOWN; + } + ++/* Helper for getting a random in case getrandom unavailable (glibc < 2.25) */ ++ssize_t util_getrandom(void *buf, size_t buflen, unsigned int flags) ++{ ++#ifdef HAVE_GETRANDOM ++ return getrandom(buf, buflen, flags); ++#else ++ int fd; ++ ssize_t bytes; ++ ++ fd = open("/dev/urandom", O_CLOEXEC); ++ if (fd < 0) ++ return -1; ++ ++ bytes = read(fd, buf, buflen); ++ close(fd); ++ ++ return bytes; ++#endif ++} ++ + /* Helpers for bitfield operations */ + + /* Find unique id in range from 1 to max but no bigger than 64. */ +diff --git a/src/shared/util.h b/src/shared/util.h +index 8ef6132c4..c01eccf8a 100644 +--- a/src/shared/util.h ++++ b/src/shared/util.h +@@ -103,6 +103,8 @@ void util_hexdump(const char dir, const unsigned char *buf, size_t len, + + unsigned char util_get_dt(const char *parent, const char *name); + ++ssize_t util_getrandom(void *buf, size_t buflen, unsigned int flags); ++ + uint8_t util_get_uid(uint64_t *bitmap, uint8_t max); + void util_clear_uid(uint64_t *bitmap, uint8_t id); + +diff --git a/tools/btgatt-server.c b/tools/btgatt-server.c +index 15d49a464..4a5d2b720 100644 +--- a/tools/btgatt-server.c ++++ b/tools/btgatt-server.c +@@ -20,7 +20,6 @@ + #include + #include + #include +-#include + + #include "lib/bluetooth.h" + #include "lib/hci.h" +@@ -287,7 +286,7 @@ static bool hr_msrmt_cb(void *user_data) + uint32_t cur_ee; + uint32_t val; + +- if (getrandom(&val, sizeof(val), 0) < 0) ++ if (util_getrandom(&val, sizeof(val), 0) < 0) + return false; + + pdu[0] = 0x06; +-- +cgit + -- 2.34.1 From Damien.LeMoal at wdc.com Tue Feb 15 23:37:27 2022 From: Damien.LeMoal at wdc.com (Damien Le Moal) Date: Tue, 15 Feb 2022 23:37:27 +0000 Subject: [Buildroot] [PATCH v5 05/10] board: Add Sipeed MAIX-bit support In-Reply-To: <20220103162520.07b40bf0@windsurf> References: <20211026071728.954356-1-damien.lemoal@wdc.com> <20211026071728.954356-6-damien.lemoal@wdc.com> <20211230212742.030be8c5@windsurf> <20220103162520.07b40bf0@windsurf> Message-ID: <0a4ee945d9de8406fc1887ac2ae23037851f56f1.camel@wdc.com> On Mon, 2022-01-03 at 16:25 +0100, Thomas Petazzoni wrote: > 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. Update: I think the elf2flt stability problem was sorted. It seems to have been related to gcc arch isa options that were not set correctly. With that done, we stumbled upon some bugs in u-boot that prevented clean boots. We have finally found fixes for all the problems now. We will be sending patches to uboot & kernel and update the buildroot series once that is done. Cheers. > > > > - 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 -- Damien Le Moal Western Digital Research From peterlin at andestech.com Wed Feb 16 00:52:13 2022 From: peterlin at andestech.com (Yu Chien Peter Lin) Date: Wed, 16 Feb 2022 08:52:13 +0800 Subject: [Buildroot] [PATCH 2/3] board/andes/ae350: add support for Andes AE350 In-Reply-To: References: Message-ID: Hi Giulio, > On Tue, Feb 15, 2022 at 02:00:36PM +0100, Giulio Benetti wrote: > > Hi Peter, > > > > > Il giorno 15 feb 2022, alle ore 06:16, Yu Chien Peter Lin ha scritto: > > > > > > ? > > >> > > >>> On Tue, Feb 15, 2022 at 10:32:01AM +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 > > >>> --- > > >>> Changes > > >>> V1->V2: > > >>> * move linux source code and its patches to AndesTech Github repo > > >>> * rename ae350_andestar45_defconfig to andes_ae350_45_defconfig > > >>> * change C library to uClibc > > >>> * remove OpenSSL package > > >>> * remove rootfs.cpio and rootfs.tar > > >>> * update DEVELOPERS > > >>> V2->V3: > > >>> * specifiy branch to download from AndesTech linux repo > > >>> * change boot.cmd to extlinux.conf > > >>> * add post-build.sh for extlinux.conf to retrieve Image and DTB > > >>> * fix format and update genimage_sdcard.cfg > > >>> * update readme.txt > > >>> * add packages (python3, pylibfdt and openssl) for u-boot binman > > >>> * reorder item in DEVELOPERS > > >>> > > > > > > Sorry, I missed versioning for this revision. > > > I'll resend it and fix changelog format. > > > > Can you please subscribe to patchwork[1] and tag your patches without V3 prefix as rejected? > > > > [1]: https://patchwork.ozlabs.org/project/buildroot/list/ > > > > Thank you! > > Giulio Sure, I've updated. Sorry about that. Yu-Chien Peter Lin From Noreply at busybox.net Wed Feb 16 01:14:22 2022 From: Noreply at busybox.net (Noreply at busybox.net) Date: 16 Feb 2022 02:14:22 +0100 Subject: [Buildroot] buildroot@busybox.net Received AWB Documents via WeTransfer Message-ID: <20220216021422.C34405EEAD50AAE7@busybox.net> An HTML attachment was scrubbed... URL: From giulio.benetti at benettiengineering.com Wed Feb 16 01:52:37 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 16 Feb 2022 02:52:37 +0100 Subject: [Buildroot] [PATCH 2/3] board/andes/ae350: add support for Andes AE350 In-Reply-To: References: Message-ID: <40D75C1A-19A7-4E03-8B69-976F680BE842@benettiengineering.com> > Il giorno 16 feb 2022, alle ore 01:53, Yu Chien Peter Lin ha scritto: > > ?Hi Giulio, > >>> On Tue, Feb 15, 2022 at 02:00:36PM +0100, Giulio Benetti wrote: >>> Hi Peter, >>> >>>> Il giorno 15 feb 2022, alle ore 06:16, Yu Chien Peter Lin ha scritto: >>>> >>>> ? >>>>> >>>>>> On Tue, Feb 15, 2022 at 10:32:01AM +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 >>>>>> --- >>>>>> Changes >>>>>> V1->V2: >>>>>> * move linux source code and its patches to AndesTech Github repo >>>>>> * rename ae350_andestar45_defconfig to andes_ae350_45_defconfig >>>>>> * change C library to uClibc >>>>>> * remove OpenSSL package >>>>>> * remove rootfs.cpio and rootfs.tar >>>>>> * update DEVELOPERS >>>>>> V2->V3: >>>>>> * specifiy branch to download from AndesTech linux repo >>>>>> * change boot.cmd to extlinux.conf >>>>>> * add post-build.sh for extlinux.conf to retrieve Image and DTB >>>>>> * fix format and update genimage_sdcard.cfg >>>>>> * update readme.txt >>>>>> * add packages (python3, pylibfdt and openssl) for u-boot binman >>>>>> * reorder item in DEVELOPERS >>>>>> >>>> >>>> Sorry, I missed versioning for this revision. >>>> I'll resend it and fix changelog format. >>> >>> Can you please subscribe to patchwork[1] and tag your patches without V3 prefix as rejected? >>> >>> [1]: https://patchwork.ozlabs.org/project/buildroot/list/ >>> >>> Thank you! >>> Giulio > > Sure, I've updated. Sorry about that. No problem, please also the v2 version. You can filter by your name and check your patches. Thank you! Best regards Giulio > > Yu-Chien Peter Lin > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From peter at korsgaard.com Wed Feb 16 07:18:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 08:18:42 +0100 Subject: [Buildroot] [PATCH] package/prosody: security bump to 0.11.13 In-Reply-To: <20220131144734.1199549-1-francois.perrad@gadz.org> (Francois Perrad's message of "Mon, 31 Jan 2022 15:47:34 +0100") References: <20220131144734.1199549-1-francois.perrad@gadz.org> Message-ID: <87y22bi8j1.fsf@dell.be.48ers.dk> >>>>> "Francois" == Francois Perrad writes: > see https://prosody.im/doc/release/0.11.13 > Signed-off-by: Francois Perrad Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 16 07:19:48 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 08:19:48 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/expat: security bump to 2.4.4 Message-ID: <20220216071213.05420831C4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=91a66a566b9f89c1aaf95715ab9dd7b3a8937084 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x fix CVE-2022-23852, CVE-2022-23990 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard (cherry picked from commit ab71ac15ddd7ed6a8ca83cbc23ea0b0cbb343f0f) Signed-off-by: Peter Korsgaard --- 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 0853c3c76d..3129801668 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 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 From peter at korsgaard.com Wed Feb 16 07:17:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 08:17:51 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/prosody: security bump to 0.11.13 Message-ID: <20220216071212.EFF0082B34@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f1341cecb497e8b0f0e6bf5ce4a2b17e4614b1de branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x see https://prosody.im/doc/release/0.11.13 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard (cherry picked from commit 800e53cf7e3ec71c3830e8a125b0a5546786d44f) 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 b6fa6532a5..3a3a363a4b 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 d697c85568..62ba073b9e 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 From peter at korsgaard.com Wed Feb 16 07:19:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 08:19:40 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/expat: security bump to 2.4.4 Message-ID: <20220216071217.2AE70831C4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4676734c0c19aca6656191f17f0e10c697eef097 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x fix CVE-2022-23852, CVE-2022-23990 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard (cherry picked from commit ab71ac15ddd7ed6a8ca83cbc23ea0b0cbb343f0f) Signed-off-by: Peter Korsgaard --- 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 0853c3c76d..3129801668 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 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 From peter at korsgaard.com Wed Feb 16 07:18:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 08:18:27 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/prosody: security bump to 0.11.13 Message-ID: <20220216071217.22A8B82B34@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5424a1320a574278e2d72dbf43813ce9fa03cd21 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x see https://prosody.im/doc/release/0.11.13 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard (cherry picked from commit 800e53cf7e3ec71c3830e8a125b0a5546786d44f) 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 b6fa6532a5..3a3a363a4b 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 d697c85568..62ba073b9e 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 From peter at korsgaard.com Wed Feb 16 07:20:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 08:20:01 +0100 Subject: [Buildroot] [PATCH] package/expat: security bump to 2.4.4 In-Reply-To: <20220131145825.1206899-1-francois.perrad@gadz.org> (Francois Perrad's message of "Mon, 31 Jan 2022 15:58:25 +0100") References: <20220131145825.1206899-1-francois.perrad@gadz.org> Message-ID: <87tuczi8gu.fsf@dell.be.48ers.dk> >>>>> "Francois" == Francois Perrad writes: > fix CVE-2022-23852, CVE-2022-23990 > Signed-off-by: Francois Perrad Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From thomas.petazzoni at bootlin.com Wed Feb 16 07:32:06 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 16 Feb 2022 07:32:06 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-02-15 Message-ID: <20220216073211.A30B360B4D@smtp3.osuosl.org> Hello, Autobuild statistics for 2022-02-15 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 41 | 11 | 1 | 53 | 2021.11.x | 21 | 1 | 0 | 22 | master | 54 | 27 | 0 | 81 | Classification of failures by reason for master ----------------------------------------------- bpftool-a7f0e7f057283ae8af3... | 4 frr-8.1 | 4 cryptsetup-2.4.3 | 3 host-libselinux-3.3 | 3 wpa_supplicant-2.10 | 3 unknown | 2 bluez5_utils-5.63 | 1 librtlsdr-ed0317e6a58c09887... | 1 protozero-1.7.1 | 1 python-greenlet-1.1.2 | 1 qt5webkit-5.212.0-alpha4 | 1 target-finalize | 1 tinifier-3.4.0 | 1 wavemon-0.9.4 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/9216c677cc8789dc8dd0fbfe1b6a1d8f878716f1 | x86_64 | bpftool-a7f0e7f057283ae8af3... | NOK | http://autobuild.buildroot.net/results/82f5809f0fc05ce814fe67078b9d622fbfdd0324 | powerpc | bpftool-a7f0e7f057283ae8af3... | NOK | http://autobuild.buildroot.net/results/278f73fb745f97e61c27c6ba776003329b5a016c | arm | bpftool-a7f0e7f057283ae8af3... | NOK | http://autobuild.buildroot.net/results/c08b40d4af432072959aacf0298e0e282254df01 | arm | bpftool-a7f0e7f057283ae8af3... | NOK | http://autobuild.buildroot.net/results/6bbad051ee9c8d3ddf11ea2a536bc7a8cf9e4867 | riscv64 | cryptsetup-2.4.3 | NOK | http://autobuild.buildroot.net/results/0887f4f8fb4c4a2006ba711028b2a37f3fa5fa46 | aarch64 | cryptsetup-2.4.3 | NOK | http://autobuild.buildroot.net/results/7b016b7170aacbab34757194e88fce95fc7edac3 | mips64el | cryptsetup-2.4.3 | NOK | http://autobuild.buildroot.net/results/70a839430158717f520973f60458e4e80ff469b2 | xtensa | frr-8.1 | NOK | http://autobuild.buildroot.net/results/694cc65478a82ec93d2074252892036855cdc49d | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/1bb288cd7f8536e6c374d33b257e8ad1587502e9 | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/0b38841d4b0bba1b1e24fcbe9db68b745054943d | mips64el | frr-8.1 | NOK | http://autobuild.buildroot.net/results/456528190fbd95e23d6d24cc75b5e01499ffe032 | riscv64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/4019c8db0d5979e0ec2276ab5625a31b9e9985e2 | arc | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/6fbbbd2ef6261f57b1405edc93f81f4c29205e3b | powerpc64le | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/cbab90ac0ca89b5a52635b54d2b4051f0bbcc8cc | xtensa | librtlsdr-ed0317e6a58c09887... | NOK | http://autobuild.buildroot.net/results/a366ae8d1713e60e82f26a27f2146bc16ae54d25 | i686 | protozero-1.7.1 | NOK | http://autobuild.buildroot.net/results/c3ae3b5caf79eb30c8a1786f58abea4f2b41a26e | arm | python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/ed896fb6b7a451faecad76bee0e9e113f60cf409 | i586 | qt5webkit-5.212.0-alpha4 | NOK | http://autobuild.buildroot.net/results/87f52db7f8ebefa4c1ae3dd70d4a7a460f9aca35 | nios2 | target-finalize | NOK | http://autobuild.buildroot.net/results/5d8d7913dd595932fc832b9cd690f0ceab69c735 | aarch64 | tinifier-3.4.0 | NOK | http://autobuild.buildroot.net/results/d6eae4cf0c00330366130dd4623c5db245bf4c47 | m68k | unknown | NOK | http://autobuild.buildroot.net/results/6eb1c45dab2ec3cb1bc577325318556a9d82ed23 | aarch64 | unknown | NOK | http://autobuild.buildroot.net/results/3dff4ba9c6e8981d1aacaf82fe43d685c3837189 | arc | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/07a1f872056f993317b2101402567f85643cc0d9 | arc | wpa_supplicant-2.10 | NOK | http://autobuild.buildroot.net/results/001981339f3b895ecd9208a747a0e47d07c9583a | arc | wpa_supplicant-2.10 | NOK | http://autobuild.buildroot.net/results/1dc4ea7d73cf6234012e38290cf7c8eb67bdaf84 | x86_64 | wpa_supplicant-2.10 | NOK | http://autobuild.buildroot.net/results/758ad18658c61586a2c60b69074a729f2add3f9f | Classification of failures by reason for 2021.02.x -------------------------------------------------- mesa3d-20.3.5 | 2 zeromq-4.3.4 | 2 erlang-jiffy-1.0.6 | 1 host-nodejs-12.22.9 | 1 host-sentry-cli-1.57.0 | 1 libtheora-1.1.1 | 1 monkey-f54856ce250c4e257354... | 1 openldap-2.4.59 | 1 sunxi-cedarx | 1 unknown | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mipsel | erlang-jiffy-1.0.6 | NOK | http://autobuild.buildroot.net/results/bd9af5a3238c3832f17ed9948047b755908991c2 | x86_64 | host-nodejs-12.22.9 | NOK | http://autobuild.buildroot.net/results/c1e1d1de23aed9359ece120174bf0e7dd3cc3e4a | aarch64 | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/e7b8435858f34e3d359d435e716a2c4e08ebf53d | or1k | libtheora-1.1.1 | NOK | http://autobuild.buildroot.net/results/66b929a0c68ca1b0bcb04a1a6d6db503f27e757a | ORPH arm | mesa3d-20.3.5 | NOK | http://autobuild.buildroot.net/results/bdd367e2ee4f294f9ced3bfd46658702d63e669f | arm | mesa3d-20.3.5 | NOK | http://autobuild.buildroot.net/results/79d652c295b61dfd913abd47cb8417a8b67db513 | mips64el | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/d5abe7732a5c59d47b9a52acdad9daf02fc069bf | riscv32 | openldap-2.4.59 | NOK | http://autobuild.buildroot.net/results/9f6e9d33f43ad96f3a1705184e031841ea9d73d4 | arm | sunxi-cedarx | TIM | http://autobuild.buildroot.net/results/8ba0758c59f8c509db91d8c0b6841dc224e2a5d1 | aarch64 | unknown | NOK | http://autobuild.buildroot.net/results/2917820ea84e5497d9cf334b3a45d9159dbdd3b5 | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/ec0580315c5fb2ee88dc99413c05d7373f2147d5 | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/ad864a532b758a3c11cc0243630d71a3a74996dc | 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? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- i686 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/f0c5c48f92e88a7ca7654f77ef00506ab68ddfae | -- http://autobuild.buildroot.net From thomas.petazzoni at bootlin.com Wed Feb 16 07:54:18 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 16 Feb 2022 08:54:18 +0100 Subject: [Buildroot] [PATCH v5 05/10] board: Add Sipeed MAIX-bit support In-Reply-To: <0a4ee945d9de8406fc1887ac2ae23037851f56f1.camel@wdc.com> References: <20211026071728.954356-1-damien.lemoal@wdc.com> <20211026071728.954356-6-damien.lemoal@wdc.com> <20211230212742.030be8c5@windsurf> <20220103162520.07b40bf0@windsurf> <0a4ee945d9de8406fc1887ac2ae23037851f56f1.camel@wdc.com> Message-ID: <20220216085418.03a39653@windsurf> On Tue, 15 Feb 2022 23:37:27 +0000 Damien Le Moal wrote: > > 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. > > Update: I think the elf2flt stability problem was sorted. It seems to have been > related to gcc arch isa options that were not set correctly. With that done, we > stumbled upon some bugs in u-boot that prevented clean boots. We have finally > found fixes for all the problems now. We will be sending patches to uboot & > kernel and update the buildroot series once that is done. Excellent, thanks for the news! Looking forward to the next iteration of the series. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From peter at korsgaard.com Wed Feb 16 08:22:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 09:22:39 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/gensio: add avahi optional dependency In-Reply-To: <2b31f3d9-12bb-dc7a-61ba-9e6981985cc0@mind.be> (Arnout Vandecappelle's message of "Thu, 3 Feb 2022 21:38:09 +0100") References: <20220113232903.318853-1-fontaine.fabrice@gmail.com> <2b31f3d9-12bb-dc7a-61ba-9e6981985cc0@mind.be> Message-ID: <87pmnni5kg.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle writes: > On 14/01/2022 00:29, 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 Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 16 08:22:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 09:22:26 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gensio: add avahi optional dependency Message-ID: <20220216081915.2680681EB3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0b420b8e2133bcb06808e9c39c20996f6b33671e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit f0a1d47f6fe6bda3b18b3fcfca37757b37695dbb) Signed-off-by: Peter Korsgaard --- package/gensio/gensio.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/gensio/gensio.mk b/package/gensio/gensio.mk index 2094c756fe..408e75b720 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 \ From peter at korsgaard.com Wed Feb 16 08:22:12 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 09:22:12 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gensio: add avahi optional dependency Message-ID: <20220216081920.D308881EB3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=168f8e4358e73037f6670e92640c0079a952a6c4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit f0a1d47f6fe6bda3b18b3fcfca37757b37695dbb) Signed-off-by: Peter Korsgaard --- 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 \ From peter at korsgaard.com Wed Feb 16 08:29:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 09:29:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/kf5/kf5-extra-cmake-modules: do not build documentation In-Reply-To: <56d88177-6e09-dba3-6b27-2119cd55db52@mind.be> (Arnout Vandecappelle's message of "Thu, 3 Feb 2022 21:39:53 +0100") References: <20220113233758.110264-1-aperez@igalia.com> <56d88177-6e09-dba3-6b27-2119cd55db52@mind.be> Message-ID: <87leybi58g.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle writes: > On 14/01/2022 00:37, Adrian Perez de Castro wrote: >> 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 > Applied to master, thanks. > (AFAICS the v2 was in fact identical) Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 16 13:14:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 14:14:17 +0100 Subject: [Buildroot] [git commit] package/qt5/qt5location: remove unused qt5location-mapboxgl Message-ID: <20220216130655.D2780821A9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8bb2db8cb1ec1ad4580ccd939dfa62bd84fa3011 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This was only needed when the mapboxgl submodule was a separate package(was never included in buildroot only a patch series). Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/qt5/qt5location/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/qt5/qt5location/Config.in b/package/qt5/qt5location/Config.in index b811f9a590..3d91adaf1f 100644 --- a/package/qt5/qt5location/Config.in +++ b/package/qt5/qt5location/Config.in @@ -1,7 +1,6 @@ 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++. From peter at korsgaard.com Wed Feb 16 13:14:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 14:14:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5location: remove unused qt5location-mapboxgl In-Reply-To: <20220206215734.3853337-1-james.hilliard1@gmail.com> (James Hilliard's message of "Sun, 6 Feb 2022 14:57:34 -0700") References: <20220206215734.3853337-1-james.hilliard1@gmail.com> Message-ID: <87fsojhs1m.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > This was only needed when the mapboxgl submodule was a separate > package(was never included in buildroot only a patch series). > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From yegorslists at googlemail.com Wed Feb 16 13:31:40 2022 From: yegorslists at googlemail.com (yegorslists at googlemail.com) Date: Wed, 16 Feb 2022 14:31:40 +0100 Subject: [Buildroot] [PATCH] package/libusb: fix maybe-uninitialized error Message-ID: <20220216133140.14668-1-yegorslists@googlemail.com> From: Yegor Yefremov Initialize active_config to an invalid value to avoid the following compilation error: os/linux_usbfs.c: In function ?op_get_configuration?: os/linux_usbfs.c:1452:12: error: ?active_config? may be used uninitialized in this function [-Werror=maybe-uninitialized] 1452 | *config = (uint8_t)active_config; Upstream URL: https://github.com/libusb/libusb/pull/1062 Signed-off-by: Yegor Yefremov --- ..._usbfs-fix-maybe-uninitialized-error.patch | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 package/libusb/0002-linux_usbfs-fix-maybe-uninitialized-error.patch diff --git a/package/libusb/0002-linux_usbfs-fix-maybe-uninitialized-error.patch b/package/libusb/0002-linux_usbfs-fix-maybe-uninitialized-error.patch new file mode 100644 index 0000000000..192172e9eb --- /dev/null +++ b/package/libusb/0002-linux_usbfs-fix-maybe-uninitialized-error.patch @@ -0,0 +1,36 @@ +From bea5891591402f14940a607eafbdcd169ff8827f Mon Sep 17 00:00:00 2001 +From: Yegor Yefremov +Date: Sun, 6 Feb 2022 07:12:14 +0100 +Subject: [PATCH 2/2] linux_usbfs: fix maybe-uninitialized error +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Initialize active_config to an invalid value to avoid the following +compilation error: + +os/linux_usbfs.c: In function ?op_get_configuration?: +os/linux_usbfs.c:1452:12: error: ?active_config? may be used uninitialized in this function [-Werror=maybe-uninitialized] + 1452 | *config = (uint8_t)active_config; + +Signed-off-by: Yegor Yefremov +--- + libusb/os/linux_usbfs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libusb/os/linux_usbfs.c b/libusb/os/linux_usbfs.c +index c300675..285d9ca 100644 +--- a/libusb/os/linux_usbfs.c ++++ b/libusb/os/linux_usbfs.c +@@ -1429,7 +1429,7 @@ static int op_get_configuration(struct libusb_device_handle *handle, + uint8_t *config) + { + struct linux_device_priv *priv = usbi_get_device_priv(handle->dev); +- int active_config; ++ int active_config = -1; /* to please compiler */ + int r; + + if (priv->sysfs_dir) { +-- +2.17.0 + -- 2.17.0 From peter at korsgaard.com Wed Feb 16 08:29:14 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 09:29:14 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/kf5/kf5-extra-cmake-modules: do not build documentation Message-ID: <20220216133230.ACC5D82D5B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0a395e2a6912ae5e1c11634b2c83deb6919fb78e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit b341f0c91f658484f90c5addd553c579b8d210c1) Signed-off-by: Peter Korsgaard --- package/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)) From fontaine.fabrice at gmail.com Wed Feb 16 14:22:13 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 16 Feb 2022 15:22:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/frr: set FRR_XREF_NO_NOTE Message-ID: <20220216142213.1472039-1-fontaine.fabrice@gmail.com> Set FRR_XREF_NO_NOTE to avoid the following build failures with microblazeel, nds32 and xtensa raised since bump to version 8.1 in commit ca2753fd47d47e5ad0eec16ea62f7b7f096331b6: _clippy.ELFAccessError: virtual address (538157256) not found in program headers [...] /tmp/ccFGv94v.s:13: Error: can't resolve `__start_xref_array' {*UND* section} - `L0' {.note.FRR section} /tmp/ccFGv94v.s:14: Error: can't resolve `__stop_xref_array' {*UND* section} - `L0' {.note.FRR section} Here is an extract of https://github.com/FRRouting/frr/blob/7347a4859d4b984cea0aef769a16622d3f02e44f/lib/xref.h: "FRR itself does not need this note to operate correctly, so if you have some build issue with it just add -DFRR_XREF_NO_NOTE to your build flags to disable it." Fixes: - http://autobuild.buildroot.org/results/3cdb50f5e5a1b3f37a6edcd4276fcbf015e28828 - http://autobuild.buildroot.org/results/a3cc0b5090a1faa2bca9c8dfe0fec9b6a918ba4d - http://autobuild.buildroot.org/results/694cc65478a82ec93d2074252892036855cdc49d Signed-off-by: Fabrice Fontaine --- package/frr/frr.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/frr/frr.mk b/package/frr/frr.mk index cc83016f9f..0e6ab7a815 100644 --- a/package/frr/frr.mk +++ b/package/frr/frr.mk @@ -17,7 +17,9 @@ FRR_DEPENDENCIES = host-frr readline json-c libyang libnl \ HOST_FRR_DEPENDENCIES = host-flex host-bison host-elfutils host-python3 -FRR_CONF_ENV = ac_cv_lib_cunit_CU_initialize_registry=no +FRR_CONF_ENV = \ + ac_cv_lib_cunit_CU_initialize_registry=no \ + CFLAGS="$(TARGET_CFLAGS) -DFRR_XREF_NO_NOTE" FRR_CONF_OPTS = --with-clippy=$(HOST_DIR)/bin/clippy \ --sysconfdir=/etc/frr \ -- 2.34.1 From br015 at umbiko.net Wed Feb 16 15:49:10 2022 From: br015 at umbiko.net (Andreas Ziegler) Date: Wed, 16 Feb 2022 16:49:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/mpd: add option for async file access using io_uring Message-ID: <20220216154910.8627-1-br015@umbiko.net> In version 0.22 mpd added an option to use the io_uring kernel interface for asynchronous access to local files. Buildroot added the necessary library (package/liburing) in commit 03ca6f4e39874583060317e7e15e9e360220877e. Add an option for mpd to optionally enable asynchronous file access using io_uring (via liburing). Signed-off-by: Andreas Ziegler --- package/mpd/Config.in | 10 ++++++++++ package/mpd/mpd.mk | 7 +++++++ 2 files changed, 17 insertions(+) diff --git a/package/mpd/Config.in b/package/mpd/Config.in index fc0f409448..c5a50898e2 100644 --- a/package/mpd/Config.in +++ b/package/mpd/Config.in @@ -347,6 +347,16 @@ config BR2_PACKAGE_MPD_AVAHI_SUPPORT comment "avahi support needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS +config BR2_PACKAGE_MPD_IO_URING + bool "io_uring" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1 + select BR2_PACKAGE_LIBURING + help + Asynchronous I/O using kernel io_uring subsystem + +comment "io_uring needs at least kernel version 5.1" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1 + config BR2_PACKAGE_MPD_LIBMPDCLIENT bool "libmpdclient" select BR2_PACKAGE_LIBMPDCLIENT diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index a55e4adde2..a0cebedc64 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -119,6 +119,13 @@ else MPD_CONF_OPTS += -Did3tag=disabled endif +ifeq ($(BR2_PACKAGE_MPD_IO_URING),y) +MPD_DEPENDENCIES += liburing +MPD_CONF_OPTS += -Dio_uring=enabled +else +MPD_CONF_OPTS += -Dio_uring=disabled +endif + ifeq ($(BR2_PACKAGE_MPD_JACK2),y) MPD_DEPENDENCIES += jack2 MPD_CONF_OPTS += -Djack=enabled -- 2.34.1 From bugzilla at busybox.net Wed Feb 16 16:47:59 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 16 Feb 2022 16:47:59 +0000 Subject: [Buildroot] [Bug 14596] New: package dialog is outdated and contains a bug Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14596 Bug ID: 14596 Summary: package dialog is outdated and contains a bug Product: buildroot Version: 2021.11.1 Hardware: All OS: Linux Status: NEW Severity: normal Priority: P5 Component: Outdated package Assignee: unassigned at buildroot.uclibc.org Reporter: roman.geile at meyton.eu CC: buildroot at uclibc.org Target Milestone: --- Created attachment 9231 --> https://bugs.busybox.net/attachment.cgi?id=9231&action=edit updated package files Buildroot 2021.11.1 contains version 1.3-20200327 of the "dialog" package. This version of the package is outdated and contains a bug in the "--pause" command line parameter. There are newer versions of dialog available which fix this bug. The current version is 1.3-20220117. Please update the package to the current version. I included an updated version of dialog.mk and dialog.hash in the attachment. -- You are receiving this mail because: You are on the CC list for the bug. From bernd.kuhls at t-online.de Wed Feb 16 18:01:28 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Wed, 16 Feb 2022 19:01:28 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/libdrm: bump version to 2.4.110 Message-ID: <20220216180128.49268-1-bernd.kuhls@t-online.de> Release notes: https://lists.freedesktop.org/archives/dri-devel/2022-February/342405.html Signed-off-by: Bernd Kuhls --- package/libdrm/libdrm.hash | 6 +++--- package/libdrm/libdrm.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libdrm/libdrm.hash b/package/libdrm/libdrm.hash index ca7332dd76..e0fac3a4d1 100644 --- a/package/libdrm/libdrm.hash +++ b/package/libdrm/libdrm.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/dri-devel/2021-November/332386.html -sha256 629352e08c1fe84862ca046598d8a08ce14d26ab25ee1f4704f993d074cb7f26 libdrm-2.4.109.tar.xz -sha512 45194bb28207421afcff3e247930d2eeab77a5fea58e6be22f67525f2e0aab2f410a9ae0ab315b55ef56b80c481bba40b1660468b7cda539758b2bbb8e814fd8 libdrm-2.4.109.tar.xz +# From https://lists.freedesktop.org/archives/dri-devel/2022-February/342405.html +sha256 eecee4c4b47ed6d6ce1a9be3d6d92102548ea35e442282216d47d05293cf9737 libdrm-2.4.110.tar.xz +sha512 52f92ef1fe4c218a1d7dba53ef43334dbfca80e3209afe59f3a32c4bf67473126534e990df07a931a12d46a3b997c21ef17c1c4d8a0c88d44d5c6c040e3b6be3 libdrm-2.4.110.tar.xz # Hash for license file sha256 d0a616a9020dc0271e36e6dd4bad174b4e2c2a42636f13785f8e18dd5f85fd83 data/meson.build diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk index 9b614bf421..b64db06931 100644 --- a/package/libdrm/libdrm.mk +++ b/package/libdrm/libdrm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBDRM_VERSION = 2.4.109 +LIBDRM_VERSION = 2.4.110 LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.xz LIBDRM_SITE = https://dri.freedesktop.org/libdrm LIBDRM_LICENSE = MIT -- 2.30.2 From arnout at mind.be Wed Feb 16 19:19:14 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 16 Feb 2022 20:19:14 +0100 Subject: [Buildroot] [PATCH 1/3] package/mender: bump to version 3.2.1 In-Reply-To: <20220207190238.73906-1-aduskett@gmail.com> References: <20220207190238.73906-1-aduskett@gmail.com> Message-ID: <09ad0e46-cc60-c9d7-e792-e9f7d647ad02@mind.be> On 07/02/2022 20:02, Adam Duskett wrote: > Other changes: > - Updated license hashes due to year changes, removals, and additions. I'm sorry Adam, but that's not enough. When you say "update license hashes due to removals and additions" it sounds like there were clauses removed to or added to the license - which would mean the license has changed. Did you mean the following? Update license hashes due to year changes. Remove license files of vendored dependencies that are no longer used. Add license files for new vendored dependencies. Also, did you check if MENDER_LICENSE needs to be updated due to the added or removed vendored dependencies? Regards, Arnout > > 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..3a7a675341 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 8dd04f963f1816350c5406312969f5b11d45c772274a8c32f7a9da8b2cc36561 3.2.1.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..33b4611a5f 100644 > --- a/package/mender/mender.mk > +++ b/package/mender/mender.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -MENDER_VERSION = 3.1.0 > +MENDER_VERSION = 3.2.1 > 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 From arnout at mind.be Wed Feb 16 19:39:11 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 16 Feb 2022 20:39:11 +0100 Subject: [Buildroot] [PATCH 1/1] package/{libuv, uvw}: bump to versions 1.43.0, 2.11.0_libuv_v1.43 In-Reply-To: <20220202073338.106855-1-asafka7@gmail.com> References: <20220202073338.106855-1-asafka7@gmail.com> Message-ID: <606bd490-3941-c9ff-e591-ae4f6abe61ef@mind.be> On 02/02/2022 08:33, Asaf Kahlon wrote: > Signed-off-by: Asaf Kahlon Applied to next, thanks. Regards, Arnout > --- > package/libuv/libuv.hash | 2 +- > package/libuv/libuv.mk | 2 +- > package/uvw/uvw.hash | 2 +- > package/uvw/uvw.mk | 2 +- > 4 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/libuv/libuv.hash b/package/libuv/libuv.hash > index 172ef1f168..1874aa344c 100644 > --- a/package/libuv/libuv.hash > +++ b/package/libuv/libuv.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 371e5419708f6aaeb8656671f89400b92a9bba6443369af1bb70bcd6e4b3c764 libuv-1.42.0.tar.gz > +sha256 9e27825a55279de69a7c43e42d509fd1337c9bece2547c761e91a1592e91cc4d libuv-1.43.0.tar.gz > sha256 6d20216ae022fbeed23916f48508fd807ece3d8464992330643b0e64e5c0c24b LICENSE > diff --git a/package/libuv/libuv.mk b/package/libuv/libuv.mk > index 9fe775951d..ed51fc92f9 100644 > --- a/package/libuv/libuv.mk > +++ b/package/libuv/libuv.mk > @@ -6,7 +6,7 @@ > > # When bumping libuv, check if a new version of uvw is available > # and bump it too. > -LIBUV_VERSION = 1.42.0 > +LIBUV_VERSION = 1.43.0 > LIBUV_SITE = $(call github,libuv,libuv,v$(LIBUV_VERSION)) > LIBUV_DEPENDENCIES = host-pkgconf > LIBUV_INSTALL_STAGING = YES > diff --git a/package/uvw/uvw.hash b/package/uvw/uvw.hash > index 5f7521c8b3..564c0980f3 100644 > --- a/package/uvw/uvw.hash > +++ b/package/uvw/uvw.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 30b0ba97a94d5e652490c6b1b32c95e608263f21cf3bc606308d09b3e3a114bf uvw-2.10.0_libuv_v1.42.tar.gz > +sha256 3af4efa2842299490ec764f2148f85f4426dfb4f8d8aa436cc2d049db2b7b514 uvw-2.11.0_libuv_v1.43.tar.gz > sha256 5de32af2469480cf3261c9781962e0887366666ba8ee1f4a32c386c77fc50c88 LICENSE > diff --git a/package/uvw/uvw.mk b/package/uvw/uvw.mk > index 9c15d536cb..161c40849d 100644 > --- a/package/uvw/uvw.mk > +++ b/package/uvw/uvw.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -UVW_VERSION = 2.10.0_libuv_v1.42 > +UVW_VERSION = 2.11.0_libuv_v1.43 > UVW_SITE = $(call github,skypjack,uvw,v$(UVW_VERSION)) > UVW_INSTALL_STAGING = YES > UVW_INSTALL_TARGET = NO From arnout at mind.be Wed Feb 16 19:39:27 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 16 Feb 2022 20:39:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/xmrig: bump version to 6.16.4 In-Reply-To: <20220212062220.611561-1-bernd.kuhls@t-online.de> References: <20220212062220.611561-1-bernd.kuhls@t-online.de> Message-ID: <7f4c3239-890c-0954-8f71-a460200532b6@mind.be> On 12/02/2022 07:22, Bernd Kuhls wrote: > Signed-off-by: Bernd Kuhls Applied to next, thanks. Regards, Arnout > --- > 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 36b0c8c8a1..ff5f80a67b 100644 > --- a/package/xmrig/xmrig.hash > +++ b/package/xmrig/xmrig.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 d413b6a20a0ce30410388d330e1056715333e0863165369668dda596766e9d5b xmrig-6.16.3.tar.gz > +sha256 245ba47a6b8ae8e9a9df1c055e90f22f944a7d1219416cb30268881d0c0d377b xmrig-6.16.4.tar.gz > sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE > diff --git a/package/xmrig/xmrig.mk b/package/xmrig/xmrig.mk > index 7fa638a54c..1feab499fc 100644 > --- a/package/xmrig/xmrig.mk > +++ b/package/xmrig/xmrig.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -XMRIG_VERSION = 6.16.3 > +XMRIG_VERSION = 6.16.4 > XMRIG_SITE = $(call github,xmrig,xmrig,v$(XMRIG_VERSION)) > XMRIG_LICENSE = GPL-3.0+ > XMRIG_LICENSE_FILES = LICENSE From arnout at mind.be Wed Feb 16 19:39:52 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 16 Feb 2022 20:39:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-setuptools: bump to version 60.8.2 In-Reply-To: <20220212111843.1210441-1-james.hilliard1@gmail.com> References: <20220212111843.1210441-1-james.hilliard1@gmail.com> Message-ID: On 12/02/2022 12:18, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to next, thanks. Regards, Arnout > --- > package/python-setuptools/python-setuptools.hash | 4 ++-- > package/python-setuptools/python-setuptools.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-setuptools/python-setuptools.hash b/package/python-setuptools/python-setuptools.hash > index 8df7155d4c..e04235e041 100644 > --- a/package/python-setuptools/python-setuptools.hash > +++ b/package/python-setuptools/python-setuptools.hash > @@ -1,4 +1,4 @@ > # From https://pypi.org/pypi/setuptools/json > -md5 082637e8fbc2e1fd9c637665d8fcccd8 setuptools-60.7.0.tar.gz > -sha256 b83cf328a4f6a987c95610e76b29a30778db05174eef71f771776c48f8f25d1b setuptools-60.7.0.tar.gz > +md5 f47a5750f6084cce3418f213a9d97785 setuptools-60.8.2.tar.gz > +sha256 66b8598da112b8dc8cd941d54cf63ef91d3b50657b374457eda5851f3ff6a899 setuptools-60.8.2.tar.gz > sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE > diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk > index 584f83f7a0..8653c42259 100644 > --- a/package/python-setuptools/python-setuptools.mk > +++ b/package/python-setuptools/python-setuptools.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_SETUPTOOLS_VERSION = 60.7.0 > +PYTHON_SETUPTOOLS_VERSION = 60.8.2 > PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).tar.gz > -PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/29/dd/48d662bb93e5e51e72265ef612f869947d4ae4126328d7156824cd50d440 > +PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/ae/0b/e458b0d07dced3d7fa2d21d828e708f374ef82040f2012c05d35f47f9af3 > PYTHON_SETUPTOOLS_LICENSE = MIT > PYTHON_SETUPTOOLS_LICENSE_FILES = LICENSE > PYTHON_SETUPTOOLS_CPE_ID_VENDOR = python From arnout at mind.be Wed Feb 16 19:50:14 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 16 Feb 2022 20:50:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/{mesa3d, mesa3d-headers}: bump version to 21.3.6 In-Reply-To: <20220213091532.1260695-1-bernd.kuhls@t-online.de> References: <20220213091532.1260695-1-bernd.kuhls@t-online.de> Message-ID: <24177320-70c0-38ad-e15f-59d813fa0525@mind.be> On 13/02/2022 10:15, Bernd Kuhls wrote: > Release notes: > https://lists.freedesktop.org/archives/mesa-announce/2022-February/000663.html > > Signed-off-by: Bernd Kuhls Applied to next, thanks. Regards, Arnout > --- > 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 871cf2f495..c8573fafad 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.5 > +MESA3D_HEADERS_VERSION = 21.3.6 > 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 e36d798e21..d64b833100 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/000660.html > -sha256 d93b2a9d2464ee856d7637a07dff6b7cd950f295ad58518bb959f76882cf4a4c mesa-21.3.5.tar.xz > -sha512 417d1787f8177567f0c547dde3e24212f7497f2fe7cdaa945fe998cd61ec0e9eb9388feb444e377c4fd8794b056af02aac28d1bbfb9527844391ba49e6893933 mesa-21.3.5.tar.xz > +# From https://lists.freedesktop.org/archives/mesa-announce/2022-February/000663.html > +sha256 96bb761fd546e9aa41d025fcc025225c5668443839dae21e3731959beb096736 mesa-21.3.6.tar.xz > +sha512 8c930e04eade29f689384ee7d6e2f178acbbf30fa6c9fdf132281279658c3c221ec7f9b1318e3c0a654c6136f925a5c0a35eaf849b65db7674641127c71e8a4f mesa-21.3.6.tar.xz > > # License > sha256 998437f3f75f0c542046f83c1cb349408122268168fb13eb4ae6967aa18b7d98 docs/license.rst > diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk > index 5f080ff5fc..95618b2072 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.5 > +MESA3D_VERSION = 21.3.6 > MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz > MESA3D_SITE = https://archive.mesa3d.org > MESA3D_LICENSE = MIT, SGI, Khronos From arnout at mind.be Wed Feb 16 19:50:29 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 16 Feb 2022 20:50:29 +0100 Subject: [Buildroot] [PATCH] boot/barebox: bump version to 2022.01.0 In-Reply-To: <20220213120258.601369-1-b.bilas@grinn-global.com> References: <20220213120258.601369-1-b.bilas@grinn-global.com> Message-ID: <1f101fba-478b-3881-5195-3be61cb4d8c6@mind.be> On 13/02/2022 13:02, Bartosz Bilas wrote: > Signed-off-by: Bartosz Bilas Applied to next, thanks. Regards, Arnout > --- > boot/barebox/Config.in | 4 ++-- > boot/barebox/barebox.hash | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in > index 23f8a5ac8a..c16fea3cea 100644 > --- a/boot/barebox/Config.in > +++ b/boot/barebox/Config.in > @@ -12,7 +12,7 @@ choice > Select the specific Barebox version you want to use > > config BR2_TARGET_BAREBOX_LATEST_VERSION > - bool "2021.12.0" > + bool "2022.01.0" > > config BR2_TARGET_BAREBOX_CUSTOM_VERSION > bool "Custom version" > @@ -40,7 +40,7 @@ endif > > config BR2_TARGET_BAREBOX_VERSION > string > - default "2021.12.0" if BR2_TARGET_BAREBOX_LATEST_VERSION > + default "2022.01.0" if BR2_TARGET_BAREBOX_LATEST_VERSION > default BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE if BR2_TARGET_BAREBOX_CUSTOM_VERSION > default "custom" if BR2_TARGET_BAREBOX_CUSTOM_TARBALL > default BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT > diff --git a/boot/barebox/barebox.hash b/boot/barebox/barebox.hash > index 0a853866b5..3d52d40beb 100644 > --- a/boot/barebox/barebox.hash > +++ b/boot/barebox/barebox.hash > @@ -1,8 +1,8 @@ > # From https://www.barebox.org/download/barebox-2021.12.0.tar.bz2.md5 > -md5 199b6d7ff3441cec2062ab18a52454dc barebox-2021.12.0.tar.bz2 > +md5 753ba533ced54f4113f9e97846c13fc1 barebox-2022.01.0.tar.bz2 > > # Locally calculated > -sha256 555569fe9e71524e0bf927eaa2c1aa2e81ee2c34dd71e39fe21620db6ccc8aa6 barebox-2021.12.0.tar.bz2 > +sha256 ddf7898075bec05e4865ce0f7a2ac19c2b1efaaa0d066eba1939494e25711d28 barebox-2022.01.0.tar.bz2 > > # License files, locally computed > sha256 ab1122aa9f9073ad1ec824edcd970b16a6a7881a34a18fd56c080debb2dca5d4 COPYING From arnout at mind.be Wed Feb 16 19:51:50 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 16 Feb 2022 20:51:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/unbound: bump version to 1.15.0 In-Reply-To: <20220213135540.49983-1-kyle@balena.io> References: <20220213135540.49983-1-kyle@balena.io> Message-ID: On 13/02/2022 14:55, Kyle Harding via buildroot wrote: > Signed-off-by: Kyle Harding Applied to next, thanks. Regards, Arnout > --- > package/unbound/unbound.hash | 4 ++-- > package/unbound/unbound.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/unbound/unbound.hash b/package/unbound/unbound.hash > index ca6fe174e0..99caf7dd3d 100644 > --- a/package/unbound/unbound.hash > +++ b/package/unbound/unbound.hash > @@ -1,5 +1,5 @@ > -# From https://nlnetlabs.nl/downloads/unbound/unbound-1.14.0.tar.gz.sha256 > -sha256 6ef91cbf02d5299eab39328c0857393de7b4885a2fe7233ddfe3c124ff5a89c8 unbound-1.14.0.tar.gz > +# From https://nlnetlabs.nl/downloads/unbound/unbound-1.15.0.tar.gz.sha256 > +sha256 a480dc6c8937447b98d161fe911ffc76cfaffa2da18788781314e81339f1126f unbound-1.15.0.tar.gz > > # Locally calculated > sha256 8eb9a16cbfb8703090bbfa3a2028fd46bb351509a2f90dc1001e51fbe6fd45db LICENSE > diff --git a/package/unbound/unbound.mk b/package/unbound/unbound.mk > index 61fdc5389b..1e6e0d99d7 100644 > --- a/package/unbound/unbound.mk > +++ b/package/unbound/unbound.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -UNBOUND_VERSION = 1.14.0 > +UNBOUND_VERSION = 1.15.0 > UNBOUND_SITE = https://www.unbound.net/downloads > UNBOUND_DEPENDENCIES = host-pkgconf expat libevent openssl > UNBOUND_LICENSE = BSD-3-Clause From arnout at mind.be Wed Feb 16 19:52:41 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 16 Feb 2022 20:52:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/ola: reintroduce package at version 0.10.8 In-Reply-To: <20220213161107.3138320-1-ju.o@free.fr> References: <20220213161107.3138320-1-ju.o@free.fr> Message-ID: <70a734bc-47f2-e4b5-fc90-45d7793a5757@mind.be> On 13/02/2022 17:11, Julien Olivain wrote: > The ola package (Open Lighting Architecture) version 0.10.2 was > removed in commit e692e1f2b2285c18057e2c70cc1d9d0cfdb15d5e due to an > incompatibility with the protobuf version 3.2.0 present in Buildroot > at that time. > > ola was fixed to support newer protobuf version in: > https://github.com/OpenLightingProject/ola/pull/1630 > > This commit reintroduce this package at version 0.10.8. > For changelogs since its removal at 0.10.2, see: > - https://github.com/OpenLightingProject/ola/releases/tag/0.10.3 > - https://github.com/OpenLightingProject/ola/releases/tag/0.10.4 > - https://github.com/OpenLightingProject/ola/releases/tag/0.10.5 > - https://github.com/OpenLightingProject/ola/releases/tag/0.10.6 > - https://github.com/OpenLightingProject/ola/releases/tag/0.10.7 > - https://github.com/OpenLightingProject/ola/releases/tag/0.10.8 > > This commit is based on the previously removed ola package, with the > following rework: > - Remove the dependency on BR2_HOST_GCC_AT_LEAST_4_5 as host gcc is > now guaranteed to be at least 4.8. > - Update target gcc dependency to >= 4.8 to reflect protobuf > requirement. > - Remove the BR2_PACKAGE_OLA_SLP option, which was removed in > ola 0.9.4. > - Change the "DMX4Linux" plugin option name to "Open DMX" to better > reflect the ola option (DMX4Linux is a legacy plugin for 2.6 > Kernels). > - Update Python support to version 3.x only > - Remove patches, as they are no longer needed > - Add options for ola plugins: ftdidmx, gpio, karate, > openpixelcontrol, renard, spi, uartdmx, usbdmx > - Reorder options alphabetically > - Update project URL > - Add license hashes > > Signed-off-by: Julien Olivain Applied to next, thanks. What an absolutely marvelous commit! Regards, Arnout > --- > Package tested with: > > make check-package > [...] > 0 warnings generated > > ./utils/test-pkg -a --package ola > [...] > 45 builds, 6 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed [snip] From arnout at mind.be Wed Feb 16 19:53:00 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 16 Feb 2022 20:53:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/opentracing-cpp: bump to version 1.6.0 In-Reply-To: <20220213213430.1506727-1-fontaine.fabrice@gmail.com> References: <20220213213430.1506727-1-fontaine.fabrice@gmail.com> Message-ID: <425ff588-4a09-7a64-3926-039c2dcd57b4@mind.be> On 13/02/2022 22:34, Fabrice Fontaine wrote: > Update indentation in hash file (two spaces) > > https://github.com/opentracing/opentracing-cpp/releases/tag/v1.6.0 > > Signed-off-by: Fabrice Fontaine Applied to next, thanks. Regards, Arnout > --- > package/opentracing-cpp/opentracing-cpp.hash | 4 ++-- > package/opentracing-cpp/opentracing-cpp.mk | 5 +++-- > 2 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/package/opentracing-cpp/opentracing-cpp.hash b/package/opentracing-cpp/opentracing-cpp.hash > index 591c0e4a0a..8cfaf5fd47 100644 > --- a/package/opentracing-cpp/opentracing-cpp.hash > +++ b/package/opentracing-cpp/opentracing-cpp.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 015c4187f7a6426a2b5196f0ccd982aa87f010cf61f507ae3ce5c90523f92301 opentracing-cpp-1.5.1.tar.gz > -sha256 076d03156735d5ff2df2ea0f8b12351ef65e5e9222b5c8c6a35101dadb41e717 LICENSE > +sha256 5b170042da4d1c4c231df6594da120875429d5231e9baa5179822ee8d1054ac3 opentracing-cpp-1.6.0.tar.gz > +sha256 076d03156735d5ff2df2ea0f8b12351ef65e5e9222b5c8c6a35101dadb41e717 LICENSE > diff --git a/package/opentracing-cpp/opentracing-cpp.mk b/package/opentracing-cpp/opentracing-cpp.mk > index 0605cd5d96..12ce40fbed 100644 > --- a/package/opentracing-cpp/opentracing-cpp.mk > +++ b/package/opentracing-cpp/opentracing-cpp.mk > @@ -4,8 +4,9 @@ > # > ################################################################################ > > -OPENTRACING_CPP_VERSION = 1.5.1 > -OPENTRACING_CPP_SITE = $(call github,opentracing,opentracing-cpp,v$(OPENTRACING_CPP_VERSION)) > +OPENTRACING_CPP_VERSION = 1.6.0 > +OPENTRACING_CPP_SITE = \ > + $(call github,opentracing,opentracing-cpp,v$(OPENTRACING_CPP_VERSION)) > OPENTRACING_CPP_LICENSE = Apache-2.0 > OPENTRACING_CPP_LICENSE_FILES = LICENSE > From arnout at mind.be Wed Feb 16 19:53:15 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 16 Feb 2022 20:53:15 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/mutt: bump to version 2.2.0 In-Reply-To: <20220213215159.1533045-1-fontaine.fabrice@gmail.com> References: <20220213215159.1533045-1-fontaine.fabrice@gmail.com> Message-ID: <82c196f4-b147-ad0b-d20d-addc721c5c30@mind.be> On 13/02/2022 22:51, Fabrice Fontaine wrote: > libgsasl is an optional dependency since > https://gitlab.com/muttmua/mutt/-/commit/68caf9140c8217ecf6c848460c4b4d27996b2922 > > http://www.mutt.org/relnotes/2.2/ > https://gitlab.com/muttmua/mutt/-/blob/mutt-2-2-rel/ChangeLog > > Signed-off-by: Fabrice Fontaine Applied to next, thanks. Regards, Arnout > --- > package/mutt/mutt.hash | 2 +- > package/mutt/mutt.mk | 12 ++++++++++-- > 2 files changed, 11 insertions(+), 3 deletions(-) > > diff --git a/package/mutt/mutt.hash b/package/mutt/mutt.hash > index d439b23aa3..bbc9d459b0 100644 > --- a/package/mutt/mutt.hash > +++ b/package/mutt/mutt.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 92a309e47e363a97d62425bcb71adceae5ab5c4c413dbcac37fa98ed70c12be0 mutt-2.1.5.tar.gz > +sha256 e84597f06d03ca82f8ca3b5ec8bc294c150709b43ed2a0177bf479c3e3345314 mutt-2.2.0.tar.gz > sha256 732f24b69a6c71cd8e01e4672bb8e12cc1cbb88a50a4665e6ca4fd95000a57ee GPL > diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk > index 7e9046fe8a..51178ef03d 100644 > --- a/package/mutt/mutt.mk > +++ b/package/mutt/mutt.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -MUTT_VERSION = 2.1.5 > +MUTT_VERSION = 2.2.0 > MUTT_SITE = https://bitbucket.org/mutt/mutt/downloads > MUTT_LICENSE = GPL-2.0+ > MUTT_LICENSE_FILES = GPL > @@ -53,8 +53,15 @@ else > MUTT_CONF_OPTS += --disable-pop > endif > > -# SSL support is only used by imap or pop3 module > +# SASL and SSL support are only used by imap or pop3 module > ifneq ($(BR2_PACKAGE_MUTT_IMAP)$(BR2_PACKAGE_MUTT_POP3),) > +ifeq ($(BR2_PACKAGE_LIBGSASL),y) > +MUTT_DEPENDENCIES += libgsasl > +MUTT_CONF_OPTS += --with-gsasl > +else > +MUTT_CONF_OPTS += --without-gsasl > +endif > + > ifeq ($(BR2_PACKAGE_OPENSSL),y) > MUTT_DEPENDENCIES += openssl > MUTT_CONF_OPTS += \ > @@ -72,6 +79,7 @@ MUTT_CONF_OPTS += \ > endif > else > MUTT_CONF_OPTS += \ > + --without-gsasl \ > --without-gnutls \ > --without-ssl > endif From arnout at mind.be Wed Feb 16 19:07:18 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 16 Feb 2022 20:07:18 +0100 Subject: [Buildroot] [git commit branch/next] package/{libuv, uvw}: bump to versions 1.43.0, 2.11.0_libuv_v1.43 Message-ID: <20220216194559.177918359E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=80f480381b3b307079c761f14508458782772111 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Asaf Kahlon Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libuv/libuv.hash | 2 +- package/libuv/libuv.mk | 2 +- package/uvw/uvw.hash | 2 +- package/uvw/uvw.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libuv/libuv.hash b/package/libuv/libuv.hash index 172ef1f168..1874aa344c 100644 --- a/package/libuv/libuv.hash +++ b/package/libuv/libuv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 371e5419708f6aaeb8656671f89400b92a9bba6443369af1bb70bcd6e4b3c764 libuv-1.42.0.tar.gz +sha256 9e27825a55279de69a7c43e42d509fd1337c9bece2547c761e91a1592e91cc4d libuv-1.43.0.tar.gz sha256 6d20216ae022fbeed23916f48508fd807ece3d8464992330643b0e64e5c0c24b LICENSE diff --git a/package/libuv/libuv.mk b/package/libuv/libuv.mk index 9fe775951d..ed51fc92f9 100644 --- a/package/libuv/libuv.mk +++ b/package/libuv/libuv.mk @@ -6,7 +6,7 @@ # When bumping libuv, check if a new version of uvw is available # and bump it too. -LIBUV_VERSION = 1.42.0 +LIBUV_VERSION = 1.43.0 LIBUV_SITE = $(call github,libuv,libuv,v$(LIBUV_VERSION)) LIBUV_DEPENDENCIES = host-pkgconf LIBUV_INSTALL_STAGING = YES diff --git a/package/uvw/uvw.hash b/package/uvw/uvw.hash index 5f7521c8b3..564c0980f3 100644 --- a/package/uvw/uvw.hash +++ b/package/uvw/uvw.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 30b0ba97a94d5e652490c6b1b32c95e608263f21cf3bc606308d09b3e3a114bf uvw-2.10.0_libuv_v1.42.tar.gz +sha256 3af4efa2842299490ec764f2148f85f4426dfb4f8d8aa436cc2d049db2b7b514 uvw-2.11.0_libuv_v1.43.tar.gz sha256 5de32af2469480cf3261c9781962e0887366666ba8ee1f4a32c386c77fc50c88 LICENSE diff --git a/package/uvw/uvw.mk b/package/uvw/uvw.mk index 9c15d536cb..161c40849d 100644 --- a/package/uvw/uvw.mk +++ b/package/uvw/uvw.mk @@ -4,7 +4,7 @@ # ################################################################################ -UVW_VERSION = 2.10.0_libuv_v1.42 +UVW_VERSION = 2.11.0_libuv_v1.43 UVW_SITE = $(call github,skypjack,uvw,v$(UVW_VERSION)) UVW_INSTALL_STAGING = YES UVW_INSTALL_TARGET = NO From arnout at mind.be Wed Feb 16 19:25:20 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 16 Feb 2022 20:25:20 +0100 Subject: [Buildroot] [git commit branch/next] package/python-setuptools: bump to version 60.8.2 Message-ID: <20220216194559.2A0C3835A7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=795c473cfdedc71b6dcf5b691cec729d2845da0b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-setuptools/python-setuptools.hash | 4 ++-- package/python-setuptools/python-setuptools.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-setuptools/python-setuptools.hash b/package/python-setuptools/python-setuptools.hash index 8df7155d4c..e04235e041 100644 --- a/package/python-setuptools/python-setuptools.hash +++ b/package/python-setuptools/python-setuptools.hash @@ -1,4 +1,4 @@ # From https://pypi.org/pypi/setuptools/json -md5 082637e8fbc2e1fd9c637665d8fcccd8 setuptools-60.7.0.tar.gz -sha256 b83cf328a4f6a987c95610e76b29a30778db05174eef71f771776c48f8f25d1b setuptools-60.7.0.tar.gz +md5 f47a5750f6084cce3418f213a9d97785 setuptools-60.8.2.tar.gz +sha256 66b8598da112b8dc8cd941d54cf63ef91d3b50657b374457eda5851f3ff6a899 setuptools-60.8.2.tar.gz sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk index 584f83f7a0..8653c42259 100644 --- a/package/python-setuptools/python-setuptools.mk +++ b/package/python-setuptools/python-setuptools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SETUPTOOLS_VERSION = 60.7.0 +PYTHON_SETUPTOOLS_VERSION = 60.8.2 PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).tar.gz -PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/29/dd/48d662bb93e5e51e72265ef612f869947d4ae4126328d7156824cd50d440 +PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/ae/0b/e458b0d07dced3d7fa2d21d828e708f374ef82040f2012c05d35f47f9af3 PYTHON_SETUPTOOLS_LICENSE = MIT PYTHON_SETUPTOOLS_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_CPE_ID_VENDOR = python From arnout at mind.be Wed Feb 16 19:49:46 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 16 Feb 2022 20:49:46 +0100 Subject: [Buildroot] [git commit branch/next] boot/barebox: bump version to 2022.01.0 Message-ID: <20220216194559.3B95F8359E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9a2beaf778d3649ab395c2a931a3935f69191585 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bartosz Bilas Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- boot/barebox/Config.in | 4 ++-- boot/barebox/barebox.hash | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in index 23f8a5ac8a..c16fea3cea 100644 --- a/boot/barebox/Config.in +++ b/boot/barebox/Config.in @@ -12,7 +12,7 @@ choice Select the specific Barebox version you want to use config BR2_TARGET_BAREBOX_LATEST_VERSION - bool "2021.12.0" + bool "2022.01.0" config BR2_TARGET_BAREBOX_CUSTOM_VERSION bool "Custom version" @@ -40,7 +40,7 @@ endif config BR2_TARGET_BAREBOX_VERSION string - default "2021.12.0" if BR2_TARGET_BAREBOX_LATEST_VERSION + default "2022.01.0" if BR2_TARGET_BAREBOX_LATEST_VERSION default BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE if BR2_TARGET_BAREBOX_CUSTOM_VERSION default "custom" if BR2_TARGET_BAREBOX_CUSTOM_TARBALL default BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT diff --git a/boot/barebox/barebox.hash b/boot/barebox/barebox.hash index 0a853866b5..3d52d40beb 100644 --- a/boot/barebox/barebox.hash +++ b/boot/barebox/barebox.hash @@ -1,8 +1,8 @@ # From https://www.barebox.org/download/barebox-2021.12.0.tar.bz2.md5 -md5 199b6d7ff3441cec2062ab18a52454dc barebox-2021.12.0.tar.bz2 +md5 753ba533ced54f4113f9e97846c13fc1 barebox-2022.01.0.tar.bz2 # Locally calculated -sha256 555569fe9e71524e0bf927eaa2c1aa2e81ee2c34dd71e39fe21620db6ccc8aa6 barebox-2021.12.0.tar.bz2 +sha256 ddf7898075bec05e4865ce0f7a2ac19c2b1efaaa0d066eba1939494e25711d28 barebox-2022.01.0.tar.bz2 # License files, locally computed sha256 ab1122aa9f9073ad1ec824edcd970b16a6a7881a34a18fd56c080debb2dca5d4 COPYING From arnout at mind.be Wed Feb 16 19:25:20 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 16 Feb 2022 20:25:20 +0100 Subject: [Buildroot] [git commit branch/next] package/xmrig: bump version to 6.16.4 Message-ID: <20220216194559.1FF417FC08@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7b969c8c8cd30a97a47f7197c114e37c9d12d80b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 36b0c8c8a1..ff5f80a67b 100644 --- a/package/xmrig/xmrig.hash +++ b/package/xmrig/xmrig.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d413b6a20a0ce30410388d330e1056715333e0863165369668dda596766e9d5b xmrig-6.16.3.tar.gz +sha256 245ba47a6b8ae8e9a9df1c055e90f22f944a7d1219416cb30268881d0c0d377b xmrig-6.16.4.tar.gz sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE diff --git a/package/xmrig/xmrig.mk b/package/xmrig/xmrig.mk index 7fa638a54c..1feab499fc 100644 --- a/package/xmrig/xmrig.mk +++ b/package/xmrig/xmrig.mk @@ -4,7 +4,7 @@ # ################################################################################ -XMRIG_VERSION = 6.16.3 +XMRIG_VERSION = 6.16.4 XMRIG_SITE = $(call github,xmrig,xmrig,v$(XMRIG_VERSION)) XMRIG_LICENSE = GPL-3.0+ XMRIG_LICENSE_FILES = LICENSE From arnout at mind.be Wed Feb 16 19:49:46 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 16 Feb 2022 20:49:46 +0100 Subject: [Buildroot] [git commit branch/next] package/{mesa3d, mesa3d-headers}: bump version to 21.3.6 Message-ID: <20220216194559.33617835A2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6aca97d6e51a006187bcd3319cb7ff1a92380c66 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://lists.freedesktop.org/archives/mesa-announce/2022-February/000663.html Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 871cf2f495..c8573fafad 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.5 +MESA3D_HEADERS_VERSION = 21.3.6 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 e36d798e21..d64b833100 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/000660.html -sha256 d93b2a9d2464ee856d7637a07dff6b7cd950f295ad58518bb959f76882cf4a4c mesa-21.3.5.tar.xz -sha512 417d1787f8177567f0c547dde3e24212f7497f2fe7cdaa945fe998cd61ec0e9eb9388feb444e377c4fd8794b056af02aac28d1bbfb9527844391ba49e6893933 mesa-21.3.5.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2022-February/000663.html +sha256 96bb761fd546e9aa41d025fcc025225c5668443839dae21e3731959beb096736 mesa-21.3.6.tar.xz +sha512 8c930e04eade29f689384ee7d6e2f178acbbf30fa6c9fdf132281279658c3c221ec7f9b1318e3c0a654c6136f925a5c0a35eaf849b65db7674641127c71e8a4f mesa-21.3.6.tar.xz # License sha256 998437f3f75f0c542046f83c1cb349408122268168fb13eb4ae6967aa18b7d98 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 5f080ff5fc..95618b2072 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.5 +MESA3D_VERSION = 21.3.6 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos From arnout at mind.be Wed Feb 16 19:49:46 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 16 Feb 2022 20:49:46 +0100 Subject: [Buildroot] [git commit branch/next] package/unbound: bump version to 1.15.0 Message-ID: <20220216194559.444CE835A7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fad0f7a096ce29b3626e4ac41e5dbea0ff3e7ae0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Kyle Harding Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/unbound/unbound.hash | 4 ++-- package/unbound/unbound.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/unbound/unbound.hash b/package/unbound/unbound.hash index ca6fe174e0..99caf7dd3d 100644 --- a/package/unbound/unbound.hash +++ b/package/unbound/unbound.hash @@ -1,5 +1,5 @@ -# From https://nlnetlabs.nl/downloads/unbound/unbound-1.14.0.tar.gz.sha256 -sha256 6ef91cbf02d5299eab39328c0857393de7b4885a2fe7233ddfe3c124ff5a89c8 unbound-1.14.0.tar.gz +# From https://nlnetlabs.nl/downloads/unbound/unbound-1.15.0.tar.gz.sha256 +sha256 a480dc6c8937447b98d161fe911ffc76cfaffa2da18788781314e81339f1126f unbound-1.15.0.tar.gz # Locally calculated sha256 8eb9a16cbfb8703090bbfa3a2028fd46bb351509a2f90dc1001e51fbe6fd45db LICENSE diff --git a/package/unbound/unbound.mk b/package/unbound/unbound.mk index 61fdc5389b..1e6e0d99d7 100644 --- a/package/unbound/unbound.mk +++ b/package/unbound/unbound.mk @@ -4,7 +4,7 @@ # ################################################################################ -UNBOUND_VERSION = 1.14.0 +UNBOUND_VERSION = 1.15.0 UNBOUND_SITE = https://www.unbound.net/downloads UNBOUND_DEPENDENCIES = host-pkgconf expat libevent openssl UNBOUND_LICENSE = BSD-3-Clause From arnout at mind.be Wed Feb 16 19:49:46 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 16 Feb 2022 20:49:46 +0100 Subject: [Buildroot] [git commit branch/next] package/opentracing-cpp: bump to version 1.6.0 Message-ID: <20220216194559.588838359E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f5a8485963dc0112c0201e712d599d31f0081035 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Update indentation in hash file (two spaces) https://github.com/opentracing/opentracing-cpp/releases/tag/v1.6.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/opentracing-cpp/opentracing-cpp.hash | 4 ++-- package/opentracing-cpp/opentracing-cpp.mk | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/opentracing-cpp/opentracing-cpp.hash b/package/opentracing-cpp/opentracing-cpp.hash index 591c0e4a0a..8cfaf5fd47 100644 --- a/package/opentracing-cpp/opentracing-cpp.hash +++ b/package/opentracing-cpp/opentracing-cpp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 015c4187f7a6426a2b5196f0ccd982aa87f010cf61f507ae3ce5c90523f92301 opentracing-cpp-1.5.1.tar.gz -sha256 076d03156735d5ff2df2ea0f8b12351ef65e5e9222b5c8c6a35101dadb41e717 LICENSE +sha256 5b170042da4d1c4c231df6594da120875429d5231e9baa5179822ee8d1054ac3 opentracing-cpp-1.6.0.tar.gz +sha256 076d03156735d5ff2df2ea0f8b12351ef65e5e9222b5c8c6a35101dadb41e717 LICENSE diff --git a/package/opentracing-cpp/opentracing-cpp.mk b/package/opentracing-cpp/opentracing-cpp.mk index 0605cd5d96..12ce40fbed 100644 --- a/package/opentracing-cpp/opentracing-cpp.mk +++ b/package/opentracing-cpp/opentracing-cpp.mk @@ -4,8 +4,9 @@ # ################################################################################ -OPENTRACING_CPP_VERSION = 1.5.1 -OPENTRACING_CPP_SITE = $(call github,opentracing,opentracing-cpp,v$(OPENTRACING_CPP_VERSION)) +OPENTRACING_CPP_VERSION = 1.6.0 +OPENTRACING_CPP_SITE = \ + $(call github,opentracing,opentracing-cpp,v$(OPENTRACING_CPP_VERSION)) OPENTRACING_CPP_LICENSE = Apache-2.0 OPENTRACING_CPP_LICENSE_FILES = LICENSE From arnout at mind.be Wed Feb 16 19:49:46 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 16 Feb 2022 20:49:46 +0100 Subject: [Buildroot] [git commit branch/next] package/ola: reintroduce package at version 0.10.8 Message-ID: <20220216194559.500C48359E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=16ff948444c3978d63f483344a3d92d994c64312 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The ola package (Open Lighting Architecture) version 0.10.2 was removed in commit e692e1f2b2285c18057e2c70cc1d9d0cfdb15d5e due to an incompatibility with the protobuf version 3.2.0 present in Buildroot at that time. ola was fixed to support newer protobuf version in: https://github.com/OpenLightingProject/ola/pull/1630 This commit reintroduce this package at version 0.10.8. For changelogs since its removal at 0.10.2, see: - https://github.com/OpenLightingProject/ola/releases/tag/0.10.3 - https://github.com/OpenLightingProject/ola/releases/tag/0.10.4 - https://github.com/OpenLightingProject/ola/releases/tag/0.10.5 - https://github.com/OpenLightingProject/ola/releases/tag/0.10.6 - https://github.com/OpenLightingProject/ola/releases/tag/0.10.7 - https://github.com/OpenLightingProject/ola/releases/tag/0.10.8 This commit is based on the previously removed ola package, with the following rework: - Remove the dependency on BR2_HOST_GCC_AT_LEAST_4_5 as host gcc is now guaranteed to be at least 4.8. - Update target gcc dependency to >= 4.8 to reflect protobuf requirement. - Remove the BR2_PACKAGE_OLA_SLP option, which was removed in ola 0.9.4. - Change the "DMX4Linux" plugin option name to "Open DMX" to better reflect the ola option (DMX4Linux is a legacy plugin for 2.6 Kernels). - Update Python support to version 3.x only - Remove patches, as they are no longer needed - Add options for ola plugins: ftdidmx, gpio, karate, openpixelcontrol, renard, spi, uartdmx, usbdmx - Reorder options alphabetically - Update project URL - Add license hashes Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 1 + package/Config.in | 1 + package/ola/Config.in | 171 ++++++++++++++++++++++++++++++++++++++ package/ola/ola.hash | 8 ++ package/ola/ola.mk | 223 ++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 404 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index ac702d8d0f..91e9060ac5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1610,6 +1610,7 @@ F: configs/zynq_qmtech_defconfig F: package/fluid-soundfont/ F: package/fluidsynth/ F: package/glslsandbox-player/ +F: package/ola/ F: package/ptm2human/ F: package/python-distro/ F: package/python-gnupg/ diff --git a/package/Config.in b/package/Config.in index 10209d84d7..9a8196efe2 100644 --- a/package/Config.in +++ b/package/Config.in @@ -535,6 +535,7 @@ endmenu source "package/nvidia-modprobe/Config.in" source "package/nvme/Config.in" source "package/ofono/Config.in" + source "package/ola/Config.in" source "package/on2-8170-modules/Config.in" source "package/open2300/Config.in" source "package/openfpgaloader/Config.in" diff --git a/package/ola/Config.in b/package/ola/Config.in new file mode 100644 index 0000000000..36b175138f --- /dev/null +++ b/package/ola/Config.in @@ -0,0 +1,171 @@ +comment "ola needs a toolchain w/ C++, threads, dynamic library, gcc >= 4.8" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ + || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS + +menuconfig BR2_PACKAGE_OLA + bool "ola (open lighting architecture)" + depends on BR2_INSTALL_LIBSTDCPP # protobuf + depends on !BR2_STATIC_LIBS # protobuf + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # protobuf + select BR2_PACKAGE_PROTOBUF + select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_LIBUUID + help + Open Lighting Architecture provides applications + with a mechanism to send and receive DMX512 & RDM + commands using hardware devices and DMX over IP protocols. + + https://www.openlighting.org/ola/ + +if BR2_PACKAGE_OLA + +comment "bindings and interface" + +config BR2_PACKAGE_OLA_WEB + bool "http interface" + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt, libmicrohttpd + select BR2_PACKAGE_LIBMICROHTTPD + help + Build OLA with browser interface. + +config BR2_PACKAGE_OLA_PYTHON_BINDINGS + bool "python bindings" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_PROTOBUF + help + Build OLA with support for the Python language. + +comment "tests and examples" + +config BR2_PACKAGE_OLA_EXAMPLES + bool "examples" + select BR2_PACKAGE_NCURSES + help + Build OLA examples. + +config BR2_PACKAGE_OLA_RDM_TESTS + bool "rdm tests" + depends on BR2_PACKAGE_OLA_PYTHON_BINDINGS + depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS + select BR2_PACKAGE_PYTHON_NUMPY + help + Build OLA RDM tests. + +comment "plugin selections" + +config BR2_PACKAGE_OLA_PLUGIN_ARTNET + bool "artnet" + help + Build Artnet plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_DUMMY + bool "dummy" + help + Build Dummy plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_E131 + bool "acn E131" + help + Build ACN E131 plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_ESPNET + bool "espnet" + help + Build EspNet plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_FTDIDMX + bool "ftdidmx" + select BR2_PACKAGE_LIBFTDI1 + help + Build FTDI USB DMX plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_GPIO + bool "GPIO" + help + Build GPIO plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_KARATE + bool "karate" + help + Build Karate plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_KINET + bool "kinet" + help + Build KiNet plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_MILINT + bool "Milford Instruments" + help + Build Milford Instruments 1-463 plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_OPENDMX + bool "Enttec Open DMX" + help + Build Enttec Open DMX plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_OPENPIXELCONTROL + bool "Open Pixel Control" + help + Build Open Pixel Control (OPC) plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_OSC + bool "osc" + select BR2_PACKAGE_LIBLO + help + Build Open Sound Control (OSC) plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_PATHPORT + bool "pathport" + help + Build Pathport plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_RENARD + bool "renard" + help + Build Renard plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_SANDNET + bool "sandnet" + help + Build SandNet plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_SHOWNET + bool "shownet" + help + Build ShowNet plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_SPI + bool "spi" + help + Build SPI plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_STAGEPROFI + bool "stageprofi" + select BR2_PACKAGE_LIBUSB + help + Build StageProfi plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_UARTDMX + bool "uartdmx" + help + Build UART Native DMX plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_USBDMX + bool "usbdmx" + select BR2_PACKAGE_LIBUSB + help + Build USB DMX plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_USBPRO + bool "usbpro" + select BR2_PACKAGE_LIBUSB + help + Build UsbPro plugin for OLA. + +endif diff --git a/package/ola/ola.hash b/package/ola/ola.hash new file mode 100644 index 0000000000..7565adabde --- /dev/null +++ b/package/ola/ola.hash @@ -0,0 +1,8 @@ +# Locally calculated +sha256 102aa3114562a2a71dbf7f77d2a0fb9fc47acc35d6248a70b6e831365ca71b13 ola-0.10.8.tar.gz + +# License files (locally computed) +sha256 e6b95dd336a57abb343e2988ac22b7e21b35c5b86003e6eb9e066ffbeeff9da7 COPYING +sha256 1480a883c87789075ccdead38b8ad9e2d740d6f7eefaaf183f894b50bebd8a25 GPL +sha256 e6b95dd336a57abb343e2988ac22b7e21b35c5b86003e6eb9e066ffbeeff9da7 LGPL +sha256 685ceaf368d37250f69f2861e91a4cbbab069e81af8bf50adce8a498936e02fc LICENCE diff --git a/package/ola/ola.mk b/package/ola/ola.mk new file mode 100644 index 0000000000..5090076175 --- /dev/null +++ b/package/ola/ola.mk @@ -0,0 +1,223 @@ +################################################################################ +# +# ola +# +################################################################################ + +OLA_VERSION = 0.10.8 +OLA_SITE = https://github.com/OpenLightingProject/ola/releases/download/$(OLA_VERSION) +OLA_LICENSE = LGPL-2.1+ (libola, libolacommon, Python bindings), GPL-2.0+ (libolaserver, olad, Python examples and tests) +OLA_LICENSE_FILES = COPYING GPL LGPL LICENCE +OLA_INSTALL_STAGING = YES +OLA_AUTORECONF = YES + +# util-linux provides uuid lib +OLA_DEPENDENCIES = protobuf util-linux host-bison host-flex host-ola + +OLA_CONF_OPTS = \ + ac_cv_have_pymod_google_protobuf=yes \ + --disable-fatal-warnings \ + --disable-gcov \ + --disable-ja-rule \ + --disable-java-libs \ + --disable-root-check \ + --disable-tcmalloc \ + --disable-unittests \ + --with-ola-protoc-plugin=$(HOST_DIR)/usr/bin/ola_protoc_plugin + +HOST_OLA_DEPENDENCIES = host-util-linux host-protobuf + +# When building the host part, disable as much as possible to speed up +# the configure step and avoid missing host dependencies. +HOST_OLA_CONF_OPTS = \ + --disable-all-plugins \ + --disable-osc \ + --disable-uart \ + --disable-libusb \ + --disable-libftdi \ + --disable-http \ + --disable-examples \ + --disable-unittests \ + --disable-doxygen-html \ + --disable-doxygen-doc \ + --disable-fatal-warnings + +# On the host side, we only need ola_protoc_plugin, so build and install this +# only. +HOST_OLA_MAKE_OPTS = protoc/ola_protoc_plugin +define HOST_OLA_INSTALL_CMDS + $(INSTALL) -D -m 0755 $(@D)/protoc/ola_protoc_plugin $(HOST_DIR)/usr/bin/ola_protoc_plugin +endef + +# sets where to find python libs built for target and required by ola +OLA_CONF_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages +OLA_MAKE_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages + +## OLA Bindings and Interface selections + +ifeq ($(BR2_PACKAGE_OLA_WEB),y) +OLA_CONF_OPTS += --enable-http +OLA_DEPENDENCIES += libmicrohttpd +else +OLA_CONF_OPTS += --disable-http +endif + +ifeq ($(BR2_PACKAGE_OLA_PYTHON_BINDINGS),y) +OLA_CONF_OPTS += --enable-python-libs +OLA_DEPENDENCIES += python3 python-protobuf +else +OLA_CONF_OPTS += --disable-python-libs +endif + +## OLA Examples and Tests + +ifeq ($(BR2_PACKAGE_OLA_EXAMPLES),y) +OLA_CONF_OPTS += --enable-examples +OLA_DEPENDENCIES += ncurses +else +OLA_CONF_OPTS += --disable-examples +endif + +ifeq ($(BR2_PACKAGE_OLA_RDM_TESTS),y) +OLA_CONF_OPTS += --enable-rdm-tests +OLA_DEPENDENCIES += python-numpy +# needed as numpy builds some shared libraries and ola checks for +# numpy using a host python test program which fails with 'wrong ELF +# class'. +OLA_CONF_ENV += ac_cv_have_pymod_numpy=yes +else +OLA_CONF_OPTS += --disable-rdm-tests +endif + +## OLA Plugin selections + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_ARTNET),y) +OLA_CONF_OPTS += --enable-artnet +else +OLA_CONF_OPTS += --disable-artnet +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_DUMMY),y) +OLA_CONF_OPTS += --enable-dummy +else +OLA_CONF_OPTS += --disable-dummy +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_E131),y) +OLA_CONF_OPTS += --enable-e131 +else +OLA_CONF_OPTS += --disable-e131 +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_ESPNET),y) +OLA_CONF_OPTS += --enable-espnet +else +OLA_CONF_OPTS += --disable-espnet +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_FTDIDMX),y) +OLA_CONF_OPTS += --enable-ftdidmx +OLA_DEPENDENCIES += libftdi1 +else +OLA_CONF_OPTS += --disable-ftdidmx +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_GPIO),y) +OLA_CONF_OPTS += --enable-gpio +else +OLA_CONF_OPTS += --disable-gpio +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_KARATE),y) +OLA_CONF_OPTS += --enable-karate +else +OLA_CONF_OPTS += --disable-karate +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_KINET),y) +OLA_CONF_OPTS += --enable-kinet +else +OLA_CONF_OPTS += --disable-kinet +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_MILINT),y) +OLA_CONF_OPTS += --enable-milinst +else +OLA_CONF_OPTS += --disable-milinst +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_OPENDMX),y) +OLA_CONF_OPTS += --enable-opendmx +else +OLA_CONF_OPTS += --disable-opendmx +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_OPENPIXELCONTROL),y) +OLA_CONF_OPTS += --enable-openpixelcontrol +else +OLA_CONF_OPTS += --disable-openpixelcontrol +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_OSC),y) +OLA_CONF_OPTS += --enable-osc +OLA_DEPENDENCIES += liblo +else +OLA_CONF_OPTS += --disable-osc +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_PATHPORT),y) +OLA_CONF_OPTS += --enable-pathport +else +OLA_CONF_OPTS += --disable-pathport +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_RENARD),y) +OLA_CONF_OPTS += --enable-renard +else +OLA_CONF_OPTS += --disable-renard +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_SANDNET),y) +OLA_CONF_OPTS += --enable-sandnet +else +OLA_CONF_OPTS += --disable-sandnet +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_SHOWNET),y) +OLA_CONF_OPTS += --enable-shownet +else +OLA_CONF_OPTS += --disable-shownet +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_SPI),y) +OLA_CONF_OPTS += --enable-spi +else +OLA_CONF_OPTS += --disable-spi +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_STAGEPROFI),y) +OLA_CONF_OPTS += --enable-stageprofi --enable-libusb +else +OLA_CONF_OPTS += --disable-stageprofi +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_UARTDMX),y) +OLA_CONF_OPTS += --enable-uartdmx +else +OLA_CONF_OPTS += --disable-uartdmx +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_USBDMX),y) +OLA_CONF_OPTS += --enable-usbdmx --enable-libusb +else +OLA_CONF_OPTS += --disable-usbdmx +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_USBPRO),y) +OLA_CONF_OPTS += --enable-usbpro --enable-libusb +else +OLA_CONF_OPTS += --disable-usbpro +endif + +$(eval $(autotools-package)) +$(eval $(host-autotools-package)) From arnout at mind.be Wed Feb 16 19:49:47 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 16 Feb 2022 20:49:47 +0100 Subject: [Buildroot] [git commit branch/next] package/mutt: bump to version 2.2.0 Message-ID: <20220216194559.60FC3835A2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d1ca33e81230eaa5fe41c4945075c62821128a8b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next libgsasl is an optional dependency since https://gitlab.com/muttmua/mutt/-/commit/68caf9140c8217ecf6c848460c4b4d27996b2922 http://www.mutt.org/relnotes/2.2/ https://gitlab.com/muttmua/mutt/-/blob/mutt-2-2-rel/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/mutt/mutt.hash | 2 +- package/mutt/mutt.mk | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/package/mutt/mutt.hash b/package/mutt/mutt.hash index d439b23aa3..bbc9d459b0 100644 --- a/package/mutt/mutt.hash +++ b/package/mutt/mutt.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 92a309e47e363a97d62425bcb71adceae5ab5c4c413dbcac37fa98ed70c12be0 mutt-2.1.5.tar.gz +sha256 e84597f06d03ca82f8ca3b5ec8bc294c150709b43ed2a0177bf479c3e3345314 mutt-2.2.0.tar.gz sha256 732f24b69a6c71cd8e01e4672bb8e12cc1cbb88a50a4665e6ca4fd95000a57ee GPL diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk index 7e9046fe8a..51178ef03d 100644 --- a/package/mutt/mutt.mk +++ b/package/mutt/mutt.mk @@ -4,7 +4,7 @@ # ################################################################################ -MUTT_VERSION = 2.1.5 +MUTT_VERSION = 2.2.0 MUTT_SITE = https://bitbucket.org/mutt/mutt/downloads MUTT_LICENSE = GPL-2.0+ MUTT_LICENSE_FILES = GPL @@ -53,8 +53,15 @@ else MUTT_CONF_OPTS += --disable-pop endif -# SSL support is only used by imap or pop3 module +# SASL and SSL support are only used by imap or pop3 module ifneq ($(BR2_PACKAGE_MUTT_IMAP)$(BR2_PACKAGE_MUTT_POP3),) +ifeq ($(BR2_PACKAGE_LIBGSASL),y) +MUTT_DEPENDENCIES += libgsasl +MUTT_CONF_OPTS += --with-gsasl +else +MUTT_CONF_OPTS += --without-gsasl +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) MUTT_DEPENDENCIES += openssl MUTT_CONF_OPTS += \ @@ -72,6 +79,7 @@ MUTT_CONF_OPTS += \ endif else MUTT_CONF_OPTS += \ + --without-gsasl \ --without-gnutls \ --without-ssl endif From Eugen.Hristev at microchip.com Wed Feb 16 20:08:41 2022 From: Eugen.Hristev at microchip.com (Eugen.Hristev at microchip.com) Date: Wed, 16 Feb 2022 20:08:41 +0000 Subject: [Buildroot] [PATCH] package/libusb: fix maybe-uninitialized error In-Reply-To: <20220216133140.14668-1-yegorslists@googlemail.com> References: <20220216133140.14668-1-yegorslists@googlemail.com> Message-ID: <33f86c18-a0e2-9d21-8c89-046a6edf7693@microchip.com> On 2/16/22 3:31 PM, yegorslists--- via buildroot wrote: > From: Yegor Yefremov > > Initialize active_config to an invalid value to avoid the following > compilation error: > > os/linux_usbfs.c: In function ?op_get_configuration?: > os/linux_usbfs.c:1452:12: error: ?active_config? may be used uninitialized in this function [-Werror=maybe-uninitialized] > 1452 | *config = (uint8_t)active_config; > > Upstream URL: https://github.com/libusb/libusb/pull/1062 > > Signed-off-by: Yegor Yefremov > --- This problem also affects my build, but with the patch, it works fine: Tested-by: Eugen Hristev From peter at korsgaard.com Wed Feb 16 20:30:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:30:21 +0100 Subject: [Buildroot] [PATCH 1/2] package/rtl8723bu: bump to version 19b4bdc05483a1e79a4f955a80f8f72cdd5dedc3 In-Reply-To: <20220114050734.497034-1-doug@schmorgal.com> (Doug Brown via buildroot's message of "Thu, 13 Jan 2022 21:07:33 -0800") References: <20220114050734.497034-1-doug@schmorgal.com> Message-ID: <87bkz6img2.fsf@dell.be.48ers.dk> >>>>> "Doug" == Doug Brown via buildroot writes: > This version fixes a bug that prevents the user from switching from one > access point to another. > Signed-off-by: Doug Brown Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 16 20:30:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:30:26 +0100 Subject: [Buildroot] [PATCH 2/2] package/rtl8723bu: fix firmware install path In-Reply-To: <20220114050734.497034-2-doug@schmorgal.com> (Doug Brown via buildroot's message of "Thu, 13 Jan 2022 21:07:34 -0800") References: <20220114050734.497034-1-doug@schmorgal.com> <20220114050734.497034-2-doug@schmorgal.com> Message-ID: <877d9uimfx.fsf@dell.be.48ers.dk> >>>>> "Doug" == Doug Brown via buildroot writes: > 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 Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 16 20:35:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:35:30 +0100 Subject: [Buildroot] [PATCH] linux: clarify BR2_LINUX_KERNEL_CUSTOM_DTS_PATH description In-Reply-To: <20220114093049.2380117-1-michael.opdenacker@bootlin.com> (Michael Opdenacker's message of "Fri, 14 Jan 2022 10:30:49 +0100") References: <20220114093049.2380117-1-michael.opdenacker@bootlin.com> Message-ID: <8735kiim7h.fsf@dell.be.48ers.dk> >>>>> "Michael" == Michael Opdenacker writes: > 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 Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 16 20:40:14 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:40:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/gdb: backport fix for gdbserver 11.1 on aarch64 In-Reply-To: <20220128084244.2258811-1-troglobit@gmail.com> (Joachim Wiberg's message of "Fri, 28 Jan 2022 09:42:44 +0100") References: <20220128084244.2258811-1-troglobit@gmail.com> Message-ID: <87y22ah7f5.fsf@dell.be.48ers.dk> >>>>> "Joachim" == Joachim Wiberg writes: > 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 Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 16 20:42:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:42:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/php: bump version to 8.0.15 In-Reply-To: <20220128094827.2705597-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Fri, 28 Jan 2022 10:48:27 +0100") References: <20220128094827.2705597-1-bernd.kuhls@t-online.de> Message-ID: <87tucyh7bg.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Changelog: https://www.php.net/ChangeLog-8.php#8.0.15 > Signed-off-by: Bernd Kuhls Committed to 2021.11.x, thanks. > --- > 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 > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 16 20:45:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:45:21 +0100 Subject: [Buildroot] [git commit] package/{glibc, localedef}: security bump for additional post-2.34.x fixes In-Reply-To: <20220205124414.D529182293@busybox.osuosl.org> (Peter Korsgaard's message of "Sat, 5 Feb 2022 13:51:09 +0100") References: <20220205124414.D529182293@busybox.osuosl.org> Message-ID: <87pmnmh76m.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > commit: https://git.buildroot.net/buildroot/commit/?id=1983d2e6a30fb6ca1d81f47798467bb0ac4401e6 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Fixes the following security issues: > CVE-2022-23219: Passing an overlong file name to the clnt_create > legacy function could result in a stack-based buffer overflow when > using the "unix" protocol. Reported by Martin Sebor. > CVE-2022-23218: Passing an overlong file name to the svcunix_create > legacy function could result in a stack-based buffer overflow. > CVE-2021-3998: Passing a path longer than PATH_MAX to the realpath > function could result in a memory leak and potential access of > uninitialized memory. Reported by Qualys. > CVE-2021-3999: Passing a buffer of size exactly 1 byte to the getcwd > function may result in an off-by-one buffer underflow and overflow > when the current working directory is longer than PATH_MAX and also > corresponds to the / directory through an unprivileged mount > namespace. Reported by Qualys. > Signed-off-by: Peter Korsgaard > Reviewed-by: Romain Naour > Signed-off-by: Peter Korsgaard Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Wed Feb 16 20:45:38 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 16 Feb 2022 21:45:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/dialog: bump to version 1.3-20220117 Message-ID: <20220216204538.2450673-1-fontaine.fabrice@gmail.com> https://invisible-mirror.net/dialog/CHANGES.html#index-t20220117 Fixes: - https://bugs.buildroot.org/show_bug.cgi?id=14596 Signed-off-by: Fabrice Fontaine --- package/dialog/dialog.hash | 2 +- package/dialog/dialog.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dialog/dialog.hash b/package/dialog/dialog.hash index 2286590b66..3136d18b2b 100644 --- a/package/dialog/dialog.hash +++ b/package/dialog/dialog.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 466163e8b97c2b7709d00389199add3156bd813f60ccb0335d0a30f2d4a17f99 dialog-1.3-20200327.tgz +sha256 754cb6bf7dc6a9ac5c1f80c13caa4d976e30a5a6e8b46f17b3bb9b080c31041f dialog-1.3-20220117.tgz # Locally computed sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/dialog/dialog.mk b/package/dialog/dialog.mk index 1c98d354e3..681f8ec9fe 100644 --- a/package/dialog/dialog.mk +++ b/package/dialog/dialog.mk @@ -4,7 +4,7 @@ # ################################################################################ -DIALOG_VERSION = 1.3-20200327 +DIALOG_VERSION = 1.3-20220117 DIALOG_SOURCE = dialog-$(DIALOG_VERSION).tgz DIALOG_SITE = https://invisible-mirror.net/archives/dialog DIALOG_CONF_OPTS = --with-ncurses --with-curses-dir=$(STAGING_DIR)/usr \ -- 2.34.1 From peter at korsgaard.com Wed Feb 16 20:46:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:46:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/tor: bump version to 0.4.6.10 In-Reply-To: <20220205090943.4012391-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sat, 5 Feb 2022 10:09:43 +0100") References: <20220205090943.4012391-1-bernd.kuhls@t-online.de> Message-ID: <87leyah74l.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Release notes: > https://gitlab.torproject.org/tpo/core/tor/-/raw/release-0.4.6/ReleaseNotes > Signed-off-by: Bernd Kuhls Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 16 20:28:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:28:09 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/rtl8723bu: fix firmware install path Message-ID: <20220216204039.38BA9835CD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=749175affa7916e523f524c39b20aa6314e05afe branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x 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. It was like that since the very first version that was added to Buildroot. Signed-off-by: Doug Brown Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 657d9731cf52dd7e9a2564ba68ce19e675c1eaee) Signed-off-by: Peter Korsgaard --- 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)) From peter at korsgaard.com Wed Feb 16 20:34:57 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:34:57 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] linux: clarify BR2_LINUX_KERNEL_CUSTOM_DTS_PATH description Message-ID: <20220216204039.4226E835CE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=09b168c7edfe0fe51604d5e7d8bfd5bf9f1c3816 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 8ef413b59a870b6a593eb9f1a71caef30c1848c3) Signed-off-by: Peter Korsgaard --- linux/Config.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index e7addf1810..3f796b252b 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 the .dts files will + be compiled from there. config BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME bool "Keep the directory name of the Device Tree" From peter at korsgaard.com Wed Feb 16 20:28:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:28:00 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/rtl8723bu: bump to version 19b4bdc05483a1e79a4f955a80f8f72cdd5dedc3 Message-ID: <20220216204039.30805835CC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6306bed7f5bffd16ca3627671ae3ddf1d850e3e3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x This version fixes a bug that prevents the user from switching from one access point to another. Signed-off-by: Doug Brown Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 89211450c68df76f3b850c651733c86fb02b40d6) Signed-off-by: Peter Korsgaard --- 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) From peter at korsgaard.com Wed Feb 16 20:33:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:33:42 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] linux: clarify BR2_LINUX_KERNEL_CUSTOM_DTS_PATH description Message-ID: <20220216204044.09893835E8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=73c8fbe2a84934778c869edac72a9d2f410ce737 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 8ef413b59a870b6a593eb9f1a71caef30c1848c3) Signed-off-by: Peter Korsgaard --- linux/Config.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 264cbde98e..0d7464d1da 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 the .dts files will + be compiled from there. config BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME bool "Keep the directory name of the Device Tree" From peter at korsgaard.com Wed Feb 16 20:28:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:28:20 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/rtl8723bu: fix firmware install path Message-ID: <20220216204044.010DB835EE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=32181572eba91a6a58fdfff0cf92df940be99b97 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x 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. It was like that since the very first version that was added to Buildroot. Signed-off-by: Doug Brown Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 657d9731cf52dd7e9a2564ba68ce19e675c1eaee) Signed-off-by: Peter Korsgaard --- 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)) From peter at korsgaard.com Wed Feb 16 08:27:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 09:27:47 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/kf5/kf5-extra-cmake-modules: do not build documentation Message-ID: <20220216204043.E243F835E8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7c20887e1f465ad8b2ebab995ad0fab22ecac0a8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit b341f0c91f658484f90c5addd553c579b8d210c1) Signed-off-by: Peter Korsgaard --- package/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)) From peter at korsgaard.com Wed Feb 16 20:45:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:45:55 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/tor: bump version to 0.4.6.10 Message-ID: <20220216204044.310D1835E8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5f24db1f9681f13343bc9c8d6fbfc434838480c8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Release notes: https://gitlab.torproject.org/tpo/core/tor/-/raw/release-0.4.6/ReleaseNotes Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit b3058f39b86993996d17c8f38f0bfd83d654b5a7) 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 63d47d7fa6..16e01c80a9 100644 --- a/package/tor/tor.hash +++ b/package/tor/tor.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c7e93380988ce20b82aa19c06cdb2f10302b72cfebec7c15b5b96bcfc94ca9a9 tor-0.4.6.9.tar.gz +sha256 94ccd60e04e558f33be73032bc84ea241660f92f58cfb88789bda6893739e31c tor-0.4.6.10.tar.gz sha256 47b54ed17e8fdcab3c44729a1789a09b208f9a63a845a7e50def9df729eebad0 LICENSE diff --git a/package/tor/tor.mk b/package/tor/tor.mk index fc1db6da6b..d16b3541eb 100644 --- a/package/tor/tor.mk +++ b/package/tor/tor.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOR_VERSION = 0.4.6.9 +TOR_VERSION = 0.4.6.10 TOR_SITE = https://dist.torproject.org TOR_LICENSE = BSD-3-Clause TOR_LICENSE_FILES = LICENSE From peter at korsgaard.com Wed Feb 16 20:42:14 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:42:14 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/php: bump version to 8.0.15 Message-ID: <20220216204044.1E803835E8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0d32c53ee75c2f53f4e50522bf229d1a399a4090 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Changelog: https://www.php.net/ChangeLog-8.php#8.0.15 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit b784733f9cfd661f013dde1b0aa5347e825a4187) 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 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 From peter at korsgaard.com Wed Feb 16 20:39:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:39:37 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gdb: backport fix for gdbserver 11.1 on aarch64 Message-ID: <20220216204044.12585835EC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0139ab83d612b125a4eeeb68b08a9e32e1865837 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x 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 [yann.morin.1998 at free.fr: add SoB in patch, provided live on IRC] Signed-off-by: Yann E. MORIN (cherry picked from commit 4353c716466fb8860dea265985829e9fae58e016) Signed-off-by: Peter Korsgaard --- .../gdb/11.1/0010-gdbserver-aarch64-support.patch | 320 +++++++++++++++++++++ 1 file changed, 320 insertions(+) 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..3718b1b6fd --- /dev/null +++ b/package/gdb/11.1/0010-gdbserver-aarch64-support.patch @@ -0,0 +1,320 @@ +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. + +Backported from: eb79b2318066cafb75ffdce310e3bbd44f7c79e3 +Signed-off-by: Joachim Wiberg +--- + 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 peter at korsgaard.com Wed Feb 16 20:43:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:43:08 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/{glibc, localedef}: security bump for additional post-2.34.x fixes Message-ID: <20220216204044.284EE835E8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d6b61411a3f63355b5b7c5689dea98c724f2b2d8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fixes the following security issues: CVE-2022-23219: Passing an overlong file name to the clnt_create legacy function could result in a stack-based buffer overflow when using the "unix" protocol. Reported by Martin Sebor. CVE-2022-23218: Passing an overlong file name to the svcunix_create legacy function could result in a stack-based buffer overflow. CVE-2021-3998: Passing a path longer than PATH_MAX to the realpath function could result in a memory leak and potential access of uninitialized memory. Reported by Qualys. CVE-2021-3999: Passing a buffer of size exactly 1 byte to the getcwd function may result in an off-by-one buffer underflow and overflow when the current working directory is longer than PATH_MAX and also corresponds to the / directory through an unprivileged mount namespace. Reported by Qualys. Signed-off-by: Peter Korsgaard Reviewed-by: Romain Naour Signed-off-by: Peter Korsgaard (cherry picked from commit 1983d2e6a30fb6ca1d81f47798467bb0ac4401e6) Signed-off-by: Peter Korsgaard --- .../0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch | 0 .../glibc.hash | 2 +- package/glibc/glibc.mk | 2 +- .../0001-HACK-only-build-and-install-localedef.patch | 0 .../0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch | 0 .../localedef.hash | 2 +- package/localedef/localedef.mk | 2 +- 7 files changed, 4 insertions(+), 4 deletions(-) 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-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch similarity index 100% rename from package/glibc/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch rename to package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch diff --git a/package/glibc/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/glibc.hash b/package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/glibc.hash similarity index 70% rename from package/glibc/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/glibc.hash rename to package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/glibc.hash index 595de95a58..dfd939020f 100644 --- a/package/glibc/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/glibc.hash +++ b/package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/glibc.hash @@ -1,5 +1,5 @@ # Locally calculated (fetched from Github) -sha256 1c7ed0f69ed268bd66f9754d0cb8fb65e0dafc1f9a1048ea50d1e96d60399686 glibc-2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4.tar.gz +sha256 3c299a21468a80356b848ca341f45551616c4928a6c871e6d45cee942e8b0f24 glibc-2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c.tar.gz # Hashes for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index 3862e0624b..f8950c166b 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -7,7 +7,7 @@ # Generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- # When updating the version, please also update localedef -GLIBC_VERSION = 2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4 +GLIBC_VERSION = 2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c # Upstream doesn't officially provide an https download link. # There is one (https://sourceware.org/git/glibc.git) but it's not reliable, # sometimes the connection times out. So use an unofficial github mirror. diff --git a/package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0001-HACK-only-build-and-install-localedef.patch b/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-HACK-only-build-and-install-localedef.patch similarity index 100% rename from package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0001-HACK-only-build-and-install-localedef.patch rename to package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-HACK-only-build-and-install-localedef.patch diff --git a/package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch b/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch similarity index 100% rename from package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch rename to package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch diff --git a/package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/localedef.hash b/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/localedef.hash similarity index 70% rename from package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/localedef.hash rename to package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/localedef.hash index 595de95a58..dfd939020f 100644 --- a/package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/localedef.hash +++ b/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/localedef.hash @@ -1,5 +1,5 @@ # Locally calculated (fetched from Github) -sha256 1c7ed0f69ed268bd66f9754d0cb8fb65e0dafc1f9a1048ea50d1e96d60399686 glibc-2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4.tar.gz +sha256 3c299a21468a80356b848ca341f45551616c4928a6c871e6d45cee942e8b0f24 glibc-2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c.tar.gz # Hashes for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/localedef/localedef.mk b/package/localedef/localedef.mk index 87d921cffe..f8f0b42984 100644 --- a/package/localedef/localedef.mk +++ b/package/localedef/localedef.mk @@ -7,7 +7,7 @@ # Use the same VERSION and SITE as target glibc # As in glibc.mk, generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- -LOCALEDEF_VERSION = 2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4 +LOCALEDEF_VERSION = 2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION).tar.gz LOCALEDEF_SITE = $(call github,bminor,glibc,$(LOCALEDEF_VERSION)) HOST_LOCALEDEF_DL_SUBDIR = glibc From peter at korsgaard.com Wed Feb 16 20:28:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:28:16 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/rtl8723bu: bump to version 19b4bdc05483a1e79a4f955a80f8f72cdd5dedc3 Message-ID: <20220216204043.EC5FF835EC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6dc71469625aef182eabd413ffd0dd4d90940631 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x This version fixes a bug that prevents the user from switching from one access point to another. Signed-off-by: Doug Brown Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 89211450c68df76f3b850c651733c86fb02b40d6) Signed-off-by: Peter Korsgaard --- 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) From peter at korsgaard.com Wed Feb 16 20:50:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:50:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-django: bump to version 4.0.2 In-Reply-To: <20220204193215.167521-1-aduskett@gmail.com> (Adam Duskett's message of "Fri, 4 Feb 2022 11:32:15 -0800") References: <20220204193215.167521-1-aduskett@gmail.com> Message-ID: <87h78yh6xt.fsf@dell.be.48ers.dk> >>>>> "Adam" == Adam Duskett writes: > Tested with: > support/testing/run-tests tests.package.test_python_django.TestPythonPy3Django > Signed-off-by: Adam Duskett This fixes a number of security issues. It would have been good if you could have mentioned that: https://www.djangoproject.com/weblog/2022/feb/01/security-releases/ For 2021.02.x / 2021.11.x I will instead bump to 3.2.12. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 16 20:55:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:55:15 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/python-django: security bump to version 3.2.12 Message-ID: <20220216204749.F3C1D835F4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a26e9e5b08532f72cc709c8ff8dfadda2bd1dd59 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fixes the following security issues: - CVE-2022-22818: Possible XSS via {% debug %} template tag The {% debug %} template tag didn't properly encode the current context, posing an XSS attack vector. In order to avoid this vulnerability, {% debug %} no longer outputs information when the DEBUG setting is False, and it ensures all context variables are correctly escaped when the DEBUG setting is True. - CVE-2022-23833: Denial-of-service possibility in file uploads Passing certain inputs to multipart forms could result in an infinite loop when parsing files. 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 89bc5ffb19..a54c22a101 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 6c4a53d2ccb464bc3dd772c6f2f07df9 Django-3.2.11.tar.gz -sha256 69c94abe5d6b1b088bf475e09b7b74403f943e34da107e798465d2045da27e75 Django-3.2.11.tar.gz +md5 1847b2f286930a9d84e820a757e3a7ec Django-3.2.12.tar.gz +sha256 9772e6935703e59e993960832d66a614cf0233a1c5123bc6224ecc6ad69e41e2 Django-3.2.12.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 25a645823b..676aa780c3 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 3.2.11 +PYTHON_DJANGO_VERSION = 3.2.12 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/20/86/e4348aac45bc83fc8e9dda2cfd81004b007c65b68c1499a4233acabdaa3b +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/83/d9/7f28811ff78ce1903dc9a32ac439e4e6c98298cd2e99cb01f528e51dd796 PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE From peter at korsgaard.com Wed Feb 16 20:54:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:54:00 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/python-django: security bump to version 3.2.12 Message-ID: <20220216204754.E59F38360A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2fbfb5271e3e7b93fa57ef13de14e54e265e9136 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fixes the following security issues: - CVE-2022-22818: Possible XSS via {% debug %} template tag The {% debug %} template tag didn't properly encode the current context, posing an XSS attack vector. In order to avoid this vulnerability, {% debug %} no longer outputs information when the DEBUG setting is False, and it ensures all context variables are correctly escaped when the DEBUG setting is True. - CVE-2022-23833: Denial-of-service possibility in file uploads Passing certain inputs to multipart forms could result in an infinite loop when parsing files. 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 89bc5ffb19..a54c22a101 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 6c4a53d2ccb464bc3dd772c6f2f07df9 Django-3.2.11.tar.gz -sha256 69c94abe5d6b1b088bf475e09b7b74403f943e34da107e798465d2045da27e75 Django-3.2.11.tar.gz +md5 1847b2f286930a9d84e820a757e3a7ec Django-3.2.12.tar.gz +sha256 9772e6935703e59e993960832d66a614cf0233a1c5123bc6224ecc6ad69e41e2 Django-3.2.12.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 25a645823b..676aa780c3 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 3.2.11 +PYTHON_DJANGO_VERSION = 3.2.12 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/20/86/e4348aac45bc83fc8e9dda2cfd81004b007c65b68c1499a4233acabdaa3b +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/83/d9/7f28811ff78ce1903dc9a32ac439e4e6c98298cd2e99cb01f528e51dd796 PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Wed Feb 16 20:56:31 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Feb 2022 21:56:31 +0100 Subject: [Buildroot] [git commit] package/libusb: fix maybe-uninitialized error Message-ID: <20220216204910.979A383612@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d06737b27b4f01ecb69b69ef3dcc44ca4fd7eec6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Initialize active_config to an invalid value to avoid the following compilation error: os/linux_usbfs.c: In function ???op_get_configuration???: os/linux_usbfs.c:1452:12: error: ???active_config??? may be used uninitialized in this function [-Werror=maybe-uninitialized] 1452 | *config = (uint8_t)active_config; Signed-off-by: Yegor Yefremov Tested-by: Eugen Hristev Signed-off-by: Yann E. MORIN --- ...linux_usbfs-fix-maybe-uninitialized-error.patch | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/package/libusb/0002-linux_usbfs-fix-maybe-uninitialized-error.patch b/package/libusb/0002-linux_usbfs-fix-maybe-uninitialized-error.patch new file mode 100644 index 0000000000..e6020f466e --- /dev/null +++ b/package/libusb/0002-linux_usbfs-fix-maybe-uninitialized-error.patch @@ -0,0 +1,37 @@ +From bea5891591402f14940a607eafbdcd169ff8827f Mon Sep 17 00:00:00 2001 +From: Yegor Yefremov +Date: Sun, 6 Feb 2022 07:12:14 +0100 +Subject: [PATCH 2/2] linux_usbfs: fix maybe-uninitialized error +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Initialize active_config to an invalid value to avoid the following +compilation error: + +os/linux_usbfs.c: In function ???op_get_configuration???: +os/linux_usbfs.c:1452:12: error: ???active_config??? may be used uninitialized in this function [-Werror=maybe-uninitialized] + 1452 | *config = (uint8_t)active_config; + +Signed-off-by: Yegor Yefremov +Upstream: https://github.com/libusb/libusb/pull/1062 +--- + libusb/os/linux_usbfs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libusb/os/linux_usbfs.c b/libusb/os/linux_usbfs.c +index c300675..285d9ca 100644 +--- a/libusb/os/linux_usbfs.c ++++ b/libusb/os/linux_usbfs.c +@@ -1429,7 +1429,7 @@ static int op_get_configuration(struct libusb_device_handle *handle, + uint8_t *config) + { + struct linux_device_priv *priv = usbi_get_device_priv(handle->dev); +- int active_config; ++ int active_config = -1; /* to please compiler */ + int r; + + if (priv->sysfs_dir) { +-- +2.17.0 + From yann.morin.1998 at free.fr Wed Feb 16 20:59:02 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Feb 2022 21:59:02 +0100 Subject: [Buildroot] [PATCH] package/libusb: fix maybe-uninitialized error In-Reply-To: <20220216133140.14668-1-yegorslists@googlemail.com> References: <20220216133140.14668-1-yegorslists@googlemail.com> Message-ID: <20220216205902.GA522310@scaer> Yegor, All, On 2022-02-16 14:31 +0100, yegorslists--- via buildroot spake thusly: > From: Yegor Yefremov > > Initialize active_config to an invalid value to avoid the following > compilation error: > > os/linux_usbfs.c: In function ?op_get_configuration?: > os/linux_usbfs.c:1452:12: error: ?active_config? may be used uninitialized in this function [-Werror=maybe-uninitialized] > 1452 | *config = (uint8_t)active_config; > > Upstream URL: https://github.com/libusb/libusb/pull/1062 I've moved that into the patch itself, as it is either to find when we update the version and have to check if the patch has to be removed or rebased. Applied to master, thanks. Regards, Yann E. MORIN. > Signed-off-by: Yegor Yefremov > --- > ..._usbfs-fix-maybe-uninitialized-error.patch | 36 +++++++++++++++++++ > 1 file changed, 36 insertions(+) > create mode 100644 package/libusb/0002-linux_usbfs-fix-maybe-uninitialized-error.patch > > diff --git a/package/libusb/0002-linux_usbfs-fix-maybe-uninitialized-error.patch b/package/libusb/0002-linux_usbfs-fix-maybe-uninitialized-error.patch > new file mode 100644 > index 0000000000..192172e9eb > --- /dev/null > +++ b/package/libusb/0002-linux_usbfs-fix-maybe-uninitialized-error.patch > @@ -0,0 +1,36 @@ > +From bea5891591402f14940a607eafbdcd169ff8827f Mon Sep 17 00:00:00 2001 > +From: Yegor Yefremov > +Date: Sun, 6 Feb 2022 07:12:14 +0100 > +Subject: [PATCH 2/2] linux_usbfs: fix maybe-uninitialized error > +MIME-Version: 1.0 > +Content-Type: text/plain; charset=UTF-8 > +Content-Transfer-Encoding: 8bit > + > +Initialize active_config to an invalid value to avoid the following > +compilation error: > + > +os/linux_usbfs.c: In function ?op_get_configuration?: > +os/linux_usbfs.c:1452:12: error: ?active_config? may be used uninitialized in this function [-Werror=maybe-uninitialized] > + 1452 | *config = (uint8_t)active_config; > + > +Signed-off-by: Yegor Yefremov > +--- > + libusb/os/linux_usbfs.c | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/libusb/os/linux_usbfs.c b/libusb/os/linux_usbfs.c > +index c300675..285d9ca 100644 > +--- a/libusb/os/linux_usbfs.c > ++++ b/libusb/os/linux_usbfs.c > +@@ -1429,7 +1429,7 @@ static int op_get_configuration(struct libusb_device_handle *handle, > + uint8_t *config) > + { > + struct linux_device_priv *priv = usbi_get_device_priv(handle->dev); > +- int active_config; > ++ int active_config = -1; /* to please compiler */ > + int r; > + > + if (priv->sysfs_dir) { > +-- > +2.17.0 > + > -- > 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 peter at korsgaard.com Wed Feb 16 21:00:11 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 22:00:11 +0100 Subject: [Buildroot] [PATCH v1 00/12] package/gstreamer1/*: bump version to 1.18.6 In-Reply-To: <20220204154631.17814-1-ps.report@gmx.net> (Peter Seiderer's message of "Fri, 4 Feb 2022 16:46:19 +0100") References: <20220204154631.17814-1-ps.report@gmx.net> Message-ID: <87czjmh6hw.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > For details see [1] and [2]. > [1] https://lists.freedesktop.org/archives/gstreamer-devel/2022-February/079533.html > [2] https://gstreamer.freedesktop.org/releases/1.18/#1.18.6 > Peter Seiderer (12): > package/gstreamer1: bump version to 1.18.6 > package/gst1-plugins-base: bump version to 1.18.6 > package/gst1-plugins-good: bump version to 1.18.6 > package/gst1-plugins-bad: bump version to 1.18.6 > package/gst1-plugins-ugly: bump version to 1.18.6 > package/gst1-devtools: bump version to 1.18.6 > package/gst1-libav: bump version to 1.18.6 > package/gst1-vaapi: bump version to 1.18.6 > package/gst1-rtsp-server: bump version to 1.18.6 > package/gstreamer1-editing-services: bump version to 1.18.6 > package/gst-omx: bump version to 1.18.6 > package/gst1-python: bump version to 1.18.6 Committed series to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 16 20:56:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:56:38 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gst1-plugins-good: bump version to 1.18.6 Message-ID: <20220216205241.B01258365F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=563d6ff419cb247bdb3eab9aa71ebbe220655ae0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit 8741ac0e502bacad8c81c9b02e116d9ce00fee03) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash | 4 ++-- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash index ea9f43bfd2..e342bd133e 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.5.tar.xz.sha256sum -sha256 3aaeeea7765fbf8801acce4a503a9b05f73f04e8a35352e9d00232cfd555796b gst-plugins-good-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.6.tar.xz.sha256sum +sha256 26723ac01fcb360ade1f41d168c7c322d8af4ceb7e55c8c12ed2690d06a76eed gst-plugins-good-1.18.6.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk index 44da3c3c30..e0ca29c5fd 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_GOOD_VERSION = 1.18.5 +GST1_PLUGINS_GOOD_VERSION = 1.18.6 GST1_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST1_PLUGINS_GOOD_VERSION).tar.xz GST1_PLUGINS_GOOD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-good GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING From peter at korsgaard.com Wed Feb 16 20:56:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:56:51 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gst1-plugins-ugly: bump version to 1.18.6 Message-ID: <20220216205241.C58128365D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3052258b900f2694e2990c090bd41804f68e264b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit 4d02d512f380a51097026ab33241aa466c33ee07) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash | 4 ++-- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash index 93945cdecd..26fd0fd9ac 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.18.5.tar.xz.sha256sum -sha256 df32803e98f8a9979373fa2ca7e05e62f977b1097576d3a80619d9f5c69f66d9 gst-plugins-ugly-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.18.6.tar.xz.sha256sum +sha256 4969c409cb6a88317d2108b8577108e18623b2333d7b587ae3f39459c70e3a7f gst-plugins-ugly-1.18.6.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk index a25110264e..7f483deb81 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_UGLY_VERSION = 1.18.5 +GST1_PLUGINS_UGLY_VERSION = 1.18.6 GST1_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST1_PLUGINS_UGLY_VERSION).tar.xz GST1_PLUGINS_UGLY_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-ugly GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING From peter at korsgaard.com Wed Feb 16 20:56:29 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:56:29 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gst1-plugins-base: bump version to 1.18.6 Message-ID: <20220216205241.A68F1835F3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=31a9d8797184be43bab960ff38279952e2b865d5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x - removed 0001-gst-libs-gst-video-gstvideoaggregator.c-fix-build-wi.patch (upstream accepted [1], [2]) [1] https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/974 [2] https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/commit/d86cf6314f8f178c59600f55321ce73d4ca95d97.patch Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit ecdc76a39c89d37a90c2b87ecf62db09de710beb) Signed-off-by: Peter Korsgaard --- ...t-video-gstvideoaggregator.c-fix-build-wi.patch | 45 ---------------------- .../gst1-plugins-base/gst1-plugins-base.hash | 4 +- .../gst1-plugins-base/gst1-plugins-base.mk | 2 +- 3 files changed, 3 insertions(+), 48 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-base/0001-gst-libs-gst-video-gstvideoaggregator.c-fix-build-wi.patch b/package/gstreamer1/gst1-plugins-base/0001-gst-libs-gst-video-gstvideoaggregator.c-fix-build-wi.patch deleted file mode 100644 index 87cd6493f5..0000000000 --- a/package/gstreamer1/gst1-plugins-base/0001-gst-libs-gst-video-gstvideoaggregator.c-fix-build-wi.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 012ca1bcd234ee02f576dd58b1f09baba18b89b0 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 14 Dec 2020 07:42:55 +0100 -Subject: [PATCH] gst-libs/gst/video/gstvideoaggregator.c: fix build with gcc - 4.8 - -Fix the following build failure with gcc 4.8 which has been added with -https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/commit/d268c193ad39fb970351ed62898be806ebd0a71e: - -../gst-libs/gst/video/gstvideoaggregator.c: In function 'gst_video_aggregator_init': -../gst-libs/gst/video/gstvideoaggregator.c:2762:3: error: 'for' loop initial declarations are only allowed in C99 mode - for (gint i = 0; i < gst_caps_get_size (src_template); i++) { - ^ - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/974] ---- - gst-libs/gst/video/gstvideoaggregator.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/gst-libs/gst/video/gstvideoaggregator.c b/gst-libs/gst/video/gstvideoaggregator.c -index 2e3d813be..04dad6563 100644 ---- a/gst-libs/gst/video/gstvideoaggregator.c -+++ b/gst-libs/gst/video/gstvideoaggregator.c -@@ -2786,6 +2786,7 @@ gst_video_aggregator_init (GstVideoAggregator * vagg, - { - GstCaps *src_template; - GstPadTemplate *pad_template; -+ gint i; - - vagg->priv = gst_video_aggregator_get_instance_private (vagg); - vagg->priv->current_caps = NULL; -@@ -2800,7 +2801,7 @@ gst_video_aggregator_init (GstVideoAggregator * vagg, - pad_template = - gst_element_class_get_pad_template (GST_ELEMENT_CLASS (klass), "src"); - src_template = gst_pad_template_get_caps (pad_template); -- for (gint i = 0; i < gst_caps_get_size (src_template); i++) { -+ for (i = 0; i < gst_caps_get_size (src_template); i++) { - const GValue *v = - gst_structure_get_value (gst_caps_get_structure (src_template, i), - "format"); --- -2.29.2 - diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash index 200ba0fe5d..081dc6f213 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.18.5.tar.xz.sha256sum -sha256 960b7af4585700db0fdd5b843554e11e2564fed9e061f591fae88a7be6446fa3 gst-plugins-base-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.18.6.tar.xz.sha256sum +sha256 56a9ff2fe9e6603b9e658cf6897d412a173d2180829fe01e92568549c6bd0f5b gst-plugins-base-1.18.6.tar.xz sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk index 76757fd6a8..c99eeb6c59 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BASE_VERSION = 1.18.5 +GST1_PLUGINS_BASE_VERSION = 1.18.6 GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz GST1_PLUGINS_BASE_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-base GST1_PLUGINS_BASE_INSTALL_STAGING = YES From peter at korsgaard.com Wed Feb 16 20:56:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:56:21 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gstreamer1: bump version to 1.18.6 Message-ID: <20220216205241.9D1B88365C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2d2664cbecfa10807ca6a1bbd322b1cf6252a339 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit 58be19b0280e803ebe710c591cd4780cdd037a5e) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gstreamer1/gstreamer1.hash | 4 ++-- package/gstreamer1/gstreamer1/gstreamer1.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gstreamer1/gstreamer1.hash b/package/gstreamer1/gstreamer1/gstreamer1.hash index c6282454ca..1202bf2c50 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.hash +++ b/package/gstreamer1/gstreamer1/gstreamer1.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.18.5.tar.xz.sha256sum -sha256 55862232a63459bbf56abebde3085ca9aec211b478e891dacea4d6df8cafe80a gstreamer-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.18.6.tar.xz.sha256sum +sha256 4ec816010dd4d3a93cf470ad0a6f25315f52b204eb1d71dfa70ab8a1c3bd06e6 gstreamer-1.18.6.tar.xz sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk index 1aab035e05..27745f3bf9 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_VERSION = 1.18.5 +GSTREAMER1_VERSION = 1.18.6 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer GSTREAMER1_INSTALL_STAGING = YES From peter at korsgaard.com Wed Feb 16 20:56:57 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:56:57 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gst1-devtools: bump version to 1.18.6 Message-ID: <20220216205241.CE5118365F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4784486c0de48e04f068ece5b125f86e3f717ecb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit efd9eac4d7579808caa23ee52a0d9661c8f987be) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-devtools/gst1-devtools.hash | 4 ++-- package/gstreamer1/gst1-devtools/gst1-devtools.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.hash b/package/gstreamer1/gst1-devtools/gst1-devtools.hash index c19254c195..011385e757 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.hash +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.18.5.tar.xz.sha256sum -sha256 fecffc86447daf5c2a06843c757a991d745caa2069446a0d746e99b13f7cb079 gst-devtools-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.18.6.tar.xz.sha256sum +sha256 3725622c740a635452e54b79d065f963ab7706ca2403de6c43072ae7610a0de4 gst-devtools-1.18.6.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 validate/COPYING diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.mk b/package/gstreamer1/gst1-devtools/gst1-devtools.mk index 1c25823953..66b509ae2c 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.mk +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_DEVTOOLS_VERSION = 1.18.5 +GST1_DEVTOOLS_VERSION = 1.18.6 GST1_DEVTOOLS_SOURCE = gst-devtools-$(GST1_DEVTOOLS_VERSION).tar.xz GST1_DEVTOOLS_SITE = https://gstreamer.freedesktop.org/src/gst-devtools GST1_DEVTOOLS_LICENSE = LGPL-2.1+ From peter at korsgaard.com Wed Feb 16 20:56:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:56:44 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gst1-plugins-bad: bump version to 1.18.6 Message-ID: <20220216205241.BB65D8365C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3284ec865dd3d3758e60436b7bd70e38378c4a48 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit ed2f427fd240f539e833919c6ef832c58eb86959) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash | 4 ++-- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash index cbb2729dab..d31a78981e 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.5.tar.xz.sha256sum -sha256 a164923b94f0d08578a6fcaeaac6e0c05da788a46903a1086870e9ca45ad678e gst-plugins-bad-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.6.tar.xz.sha256sum +sha256 0b1b50ac6311f0c510248b6cd64d6d3c94369344828baa602db85ded5bc70ec9 gst-plugins-bad-1.18.6.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index d3f089bfed..8100272bba 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BAD_VERSION = 1.18.5 +GST1_PLUGINS_BAD_VERSION = 1.18.6 GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz GST1_PLUGINS_BAD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-bad GST1_PLUGINS_BAD_INSTALL_STAGING = YES From peter at korsgaard.com Wed Feb 16 20:57:29 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:57:29 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gstreamer1-editing-services: bump version to 1.18.6 Message-ID: <20220216205242.001B98365D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b17c6fa090b4539bd3b97ba17455b122efd68191 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit aa87c2e1689b920052ee4a802e24ca342d8f9651) Signed-off-by: Peter Korsgaard --- .../gstreamer1-editing-services/gstreamer1-editing-services.hash | 4 ++-- .../gstreamer1-editing-services/gstreamer1-editing-services.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash index daaf729c70..e29dc112ce 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash @@ -1,5 +1,5 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.18.5.tar.xz.sha256sum -sha256 8af4a8394d051f3e18280686db49a6efaccc95c0c59a17f0f564e32000590df5 gst-editing-services-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.18.6.tar.xz.sha256sum +sha256 fe10d14ef896aa21038317f6f81e1158ccc6caaed9b0d5a29ae5bdd63074582c gst-editing-services-1.18.6.tar.xz # Hashes for license files: sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk index d3de79c5f6..a3722cbbca 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_EDITING_SERVICES_VERSION = 1.18.5 +GSTREAMER1_EDITING_SERVICES_VERSION = 1.18.6 GSTREAMER1_EDITING_SERVICES_SOURCE = gst-editing-services-$(GSTREAMER1_EDITING_SERVICES_VERSION).tar.xz GSTREAMER1_EDITING_SERVICES_SITE = https://gstreamer.freedesktop.org/src/gstreamer-editing-services GSTREAMER1_EDITING_SERVICES_LICENSE = LGPL-2.0+ From peter at korsgaard.com Wed Feb 16 20:57:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:57:03 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gst1-libav: bump version to 1.18.6 Message-ID: <20220216205241.D799E8365C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5e7abb7d73527f99fbdb36a4d7b561100f2a29e7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit 8de78f3da0cdbc139b876bdeb34079302ce02934) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-libav/gst1-libav.hash | 4 ++-- package/gstreamer1/gst1-libav/gst1-libav.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-libav/gst1-libav.hash b/package/gstreamer1/gst1-libav/gst1-libav.hash index 040a6e33f3..5fb39a0b3e 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.hash +++ b/package/gstreamer1/gst1-libav/gst1-libav.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.18.5.tar.xz.sha256sum -sha256 822e008a910e9dd13aedbdd8dc63fedef4040c0ee2e927bab3112e9de693a548 gst-libav-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.18.6.tar.xz.sha256sum +sha256 e4e50dcd5a29441ae34de60d2221057e8064ed824bb6ca4dc0fd9ee88fbe9b81 gst-libav-1.18.6.tar.xz sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gst1-libav/gst1-libav.mk b/package/gstreamer1/gst1-libav/gst1-libav.mk index 01ec4d2c98..55c6e06e0e 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.mk +++ b/package/gstreamer1/gst1-libav/gst1-libav.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_LIBAV_VERSION = 1.18.5 +GST1_LIBAV_VERSION = 1.18.6 GST1_LIBAV_SOURCE = gst-libav-$(GST1_LIBAV_VERSION).tar.xz GST1_LIBAV_SITE = https://gstreamer.freedesktop.org/src/gst-libav GST1_LIBAV_LICENSE = LGPL-2.0+ From peter at korsgaard.com Wed Feb 16 20:57:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:57:35 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gst-omx: bump version to 1.18.6 Message-ID: <20220216205242.085508365C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=720b465a6f90f5f3f66fde0d557e6348f81f3b43 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit ce4bc450007910aa673d0f8356e99c421d20af89) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst-omx/gst-omx.hash | 4 ++-- package/gstreamer1/gst-omx/gst-omx.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst-omx/gst-omx.hash b/package/gstreamer1/gst-omx/gst-omx.hash index 9040393506..47f7cb5893 100644 --- a/package/gstreamer1/gst-omx/gst-omx.hash +++ b/package/gstreamer1/gst-omx/gst-omx.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.18.5.tar.xz.sha256sum -sha256 2cd457c1e8deb1a9b39608048fb36a44f6c9a864a6b6115b1453a32e7be93b42 gst-omx-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.18.6.tar.xz.sha256sum +sha256 b5281c938e959fd2418e989cfb6065fdd9fe5f6f87ee86236c9427166e708163 gst-omx-1.18.6.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst-omx/gst-omx.mk b/package/gstreamer1/gst-omx/gst-omx.mk index f7be1d59ef..dc65509244 100644 --- a/package/gstreamer1/gst-omx/gst-omx.mk +++ b/package/gstreamer1/gst-omx/gst-omx.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST_OMX_VERSION = 1.18.5 +GST_OMX_VERSION = 1.18.6 GST_OMX_SOURCE = gst-omx-$(GST_OMX_VERSION).tar.xz GST_OMX_SITE = https://gstreamer.freedesktop.org/src/gst-omx From peter at korsgaard.com Wed Feb 16 20:57:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:57:15 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gst1-vaapi: bump version to 1.18.6 Message-ID: <20220216205241.E0BA68365C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=07264fc142d037d9b86f449ab5764e8070adfbda branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit aef9027773543fede0cbfa3405f5919e38671dbf) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-vaapi/gst1-vaapi.hash | 4 ++-- package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash index b0c19fc600..7e22774c11 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.18.5.tar.xz.sha256sum -sha256 4a460fb95559f41444eb24864ad2d9e37922b6eea941510310319fc3e0ba727b gstreamer-vaapi-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.18.6.tar.xz.sha256sum +sha256 ab6270f1e5e4546fbe6f5ea246d86ca3d196282eb863d46e6cdcc96f867449e0 gstreamer-vaapi-1.18.6.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk index 9810b12cf7..6af851602f 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_VAAPI_VERSION = 1.18.5 +GST1_VAAPI_VERSION = 1.18.6 GST1_VAAPI_SITE = https://gstreamer.freedesktop.org/src/gstreamer-vaapi GST1_VAAPI_SOURCE = gstreamer-vaapi-$(GST1_VAAPI_VERSION).tar.xz GST1_VAAPI_LICENSE = LGPL-2.1+ From peter at korsgaard.com Wed Feb 16 20:57:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:57:44 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gst1-python: bump version to 1.18.6 Message-ID: <20220216205242.10F4C8365F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=61f8a7e79129ade522c871f10a74cad10e385dca branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit dc66c5901cbc912941f26275aac0f4b3fe6cf596) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-python/gst1-python.hash | 4 ++-- package/gstreamer1/gst1-python/gst1-python.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-python/gst1-python.hash b/package/gstreamer1/gst1-python/gst1-python.hash index 2035c81fea..a760e53e7d 100644 --- a/package/gstreamer1/gst1-python/gst1-python.hash +++ b/package/gstreamer1/gst1-python/gst1-python.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.18.5.tar.xz.sha256sum -sha256 533685871305959d6db89507f3b3aa6c765c2f2b0dacdc32c5a6543e72e5bc52 gst-python-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.18.6.tar.xz.sha256sum +sha256 bdc0ea22fbd7335ad9decc151561aacc53c51206a9735b81eac700ce5b0bbd4a gst-python-1.18.6.tar.xz sha256 ea3ad127610e5ded2210b3a86a46314f2b3b28e438eccffdae19a4d6fbcdb0c2 COPYING diff --git a/package/gstreamer1/gst1-python/gst1-python.mk b/package/gstreamer1/gst1-python/gst1-python.mk index 614cb22396..7faab752cd 100644 --- a/package/gstreamer1/gst1-python/gst1-python.mk +++ b/package/gstreamer1/gst1-python/gst1-python.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PYTHON_VERSION = 1.18.5 +GST1_PYTHON_VERSION = 1.18.6 GST1_PYTHON_SOURCE = gst-python-$(GST1_PYTHON_VERSION).tar.xz GST1_PYTHON_SITE = https://gstreamer.freedesktop.org/src/gst-python GST1_PYTHON_INSTALL_STAGING = YES From peter at korsgaard.com Wed Feb 16 20:57:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:57:22 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gst1-rtsp-server: bump version to 1.18.6 Message-ID: <20220216205241.E9DF18365D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eec18355b708f68bb4e842441de170c6a03479e5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit 56c0d7b8867228bb44e76f4bf296e27202d10f13) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash | 4 ++-- package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash index 627a451d04..fadef41351 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash @@ -1,4 +1,4 @@ -# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.18.5.tar.xz.sha256sum -sha256 04d63bf48816c6f41c73f6de0f912a7cef0aab39c44162a7bcece1923dfc9d1f gst-rtsp-server-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.18.6.tar.xz.sha256sum +sha256 826f32afbcf94b823541efcac4a0dacdb62f6145ef58f363095749f440262be9 gst-rtsp-server-1.18.6.tar.xz sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING.LIB diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk index 37942423a5..55403754f3 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_RTSP_SERVER_VERSION = 1.18.5 +GST1_RTSP_SERVER_VERSION = 1.18.6 GST1_RTSP_SERVER_SOURCE = gst-rtsp-server-$(GST1_RTSP_SERVER_VERSION).tar.xz GST1_RTSP_SERVER_SITE = http://gstreamer.freedesktop.org/src/gst-rtsp-server GST1_RTSP_SERVER_LICENSE = LGPL-2.0+ From peter at korsgaard.com Wed Feb 16 20:58:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:58:27 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gstreamer1: bump version to 1.18.6 Message-ID: <20220216205312.3D73B836A6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5806baf9fef22463d0eb218db0d8b424bb5c3cab branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit 58be19b0280e803ebe710c591cd4780cdd037a5e) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gstreamer1/gstreamer1.hash | 4 ++-- package/gstreamer1/gstreamer1/gstreamer1.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gstreamer1/gstreamer1.hash b/package/gstreamer1/gstreamer1/gstreamer1.hash index c6282454ca..1202bf2c50 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.hash +++ b/package/gstreamer1/gstreamer1/gstreamer1.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.18.5.tar.xz.sha256sum -sha256 55862232a63459bbf56abebde3085ca9aec211b478e891dacea4d6df8cafe80a gstreamer-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.18.6.tar.xz.sha256sum +sha256 4ec816010dd4d3a93cf470ad0a6f25315f52b204eb1d71dfa70ab8a1c3bd06e6 gstreamer-1.18.6.tar.xz sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk index 1aab035e05..27745f3bf9 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_VERSION = 1.18.5 +GSTREAMER1_VERSION = 1.18.6 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer GSTREAMER1_INSTALL_STAGING = YES From peter at korsgaard.com Wed Feb 16 20:58:29 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:58:29 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gst1-plugins-bad: bump version to 1.18.6 Message-ID: <20220216205312.5868B836A6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=521a8184e707662a937f653ad65f1347b3f58ab8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit ed2f427fd240f539e833919c6ef832c58eb86959) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash | 4 ++-- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash index cbb2729dab..d31a78981e 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.5.tar.xz.sha256sum -sha256 a164923b94f0d08578a6fcaeaac6e0c05da788a46903a1086870e9ca45ad678e gst-plugins-bad-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.6.tar.xz.sha256sum +sha256 0b1b50ac6311f0c510248b6cd64d6d3c94369344828baa602db85ded5bc70ec9 gst-plugins-bad-1.18.6.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index d3f089bfed..8100272bba 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BAD_VERSION = 1.18.5 +GST1_PLUGINS_BAD_VERSION = 1.18.6 GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz GST1_PLUGINS_BAD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-bad GST1_PLUGINS_BAD_INSTALL_STAGING = YES From peter at korsgaard.com Wed Feb 16 20:58:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:58:30 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gst1-plugins-ugly: bump version to 1.18.6 Message-ID: <20220216205312.611A0836A7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=086cb593228d23e4bbe0de5bcf437c0975bc8ef4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit 4d02d512f380a51097026ab33241aa466c33ee07) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash | 4 ++-- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash index 93945cdecd..26fd0fd9ac 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.18.5.tar.xz.sha256sum -sha256 df32803e98f8a9979373fa2ca7e05e62f977b1097576d3a80619d9f5c69f66d9 gst-plugins-ugly-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.18.6.tar.xz.sha256sum +sha256 4969c409cb6a88317d2108b8577108e18623b2333d7b587ae3f39459c70e3a7f gst-plugins-ugly-1.18.6.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk index a25110264e..7f483deb81 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_UGLY_VERSION = 1.18.5 +GST1_PLUGINS_UGLY_VERSION = 1.18.6 GST1_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST1_PLUGINS_UGLY_VERSION).tar.xz GST1_PLUGINS_UGLY_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-ugly GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING From peter at korsgaard.com Wed Feb 16 20:58:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:58:28 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gst1-plugins-base: bump version to 1.18.6 Message-ID: <20220216205312.45FB0836A7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=374b496efb8ed629367d3d46a48e8de6c35f23d9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x - removed 0001-gst-libs-gst-video-gstvideoaggregator.c-fix-build-wi.patch (upstream accepted [1], [2]) [1] https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/974 [2] https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/commit/d86cf6314f8f178c59600f55321ce73d4ca95d97.patch Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit ecdc76a39c89d37a90c2b87ecf62db09de710beb) Signed-off-by: Peter Korsgaard --- ...t-video-gstvideoaggregator.c-fix-build-wi.patch | 45 ---------------------- .../gst1-plugins-base/gst1-plugins-base.hash | 4 +- .../gst1-plugins-base/gst1-plugins-base.mk | 2 +- 3 files changed, 3 insertions(+), 48 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-base/0001-gst-libs-gst-video-gstvideoaggregator.c-fix-build-wi.patch b/package/gstreamer1/gst1-plugins-base/0001-gst-libs-gst-video-gstvideoaggregator.c-fix-build-wi.patch deleted file mode 100644 index 87cd6493f5..0000000000 --- a/package/gstreamer1/gst1-plugins-base/0001-gst-libs-gst-video-gstvideoaggregator.c-fix-build-wi.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 012ca1bcd234ee02f576dd58b1f09baba18b89b0 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 14 Dec 2020 07:42:55 +0100 -Subject: [PATCH] gst-libs/gst/video/gstvideoaggregator.c: fix build with gcc - 4.8 - -Fix the following build failure with gcc 4.8 which has been added with -https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/commit/d268c193ad39fb970351ed62898be806ebd0a71e: - -../gst-libs/gst/video/gstvideoaggregator.c: In function 'gst_video_aggregator_init': -../gst-libs/gst/video/gstvideoaggregator.c:2762:3: error: 'for' loop initial declarations are only allowed in C99 mode - for (gint i = 0; i < gst_caps_get_size (src_template); i++) { - ^ - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/974] ---- - gst-libs/gst/video/gstvideoaggregator.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/gst-libs/gst/video/gstvideoaggregator.c b/gst-libs/gst/video/gstvideoaggregator.c -index 2e3d813be..04dad6563 100644 ---- a/gst-libs/gst/video/gstvideoaggregator.c -+++ b/gst-libs/gst/video/gstvideoaggregator.c -@@ -2786,6 +2786,7 @@ gst_video_aggregator_init (GstVideoAggregator * vagg, - { - GstCaps *src_template; - GstPadTemplate *pad_template; -+ gint i; - - vagg->priv = gst_video_aggregator_get_instance_private (vagg); - vagg->priv->current_caps = NULL; -@@ -2800,7 +2801,7 @@ gst_video_aggregator_init (GstVideoAggregator * vagg, - pad_template = - gst_element_class_get_pad_template (GST_ELEMENT_CLASS (klass), "src"); - src_template = gst_pad_template_get_caps (pad_template); -- for (gint i = 0; i < gst_caps_get_size (src_template); i++) { -+ for (i = 0; i < gst_caps_get_size (src_template); i++) { - const GValue *v = - gst_structure_get_value (gst_caps_get_structure (src_template, i), - "format"); --- -2.29.2 - diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash index 200ba0fe5d..081dc6f213 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.18.5.tar.xz.sha256sum -sha256 960b7af4585700db0fdd5b843554e11e2564fed9e061f591fae88a7be6446fa3 gst-plugins-base-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.18.6.tar.xz.sha256sum +sha256 56a9ff2fe9e6603b9e658cf6897d412a173d2180829fe01e92568549c6bd0f5b gst-plugins-base-1.18.6.tar.xz sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk index 76757fd6a8..c99eeb6c59 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BASE_VERSION = 1.18.5 +GST1_PLUGINS_BASE_VERSION = 1.18.6 GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz GST1_PLUGINS_BASE_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-base GST1_PLUGINS_BASE_INSTALL_STAGING = YES From peter at korsgaard.com Wed Feb 16 20:58:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:58:28 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gst1-plugins-good: bump version to 1.18.6 Message-ID: <20220216205312.4F648836AF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8c378d9c7109f034771d4b96621781730dad8ad0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit 8741ac0e502bacad8c81c9b02e116d9ce00fee03) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash | 4 ++-- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash index ea9f43bfd2..e342bd133e 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.5.tar.xz.sha256sum -sha256 3aaeeea7765fbf8801acce4a503a9b05f73f04e8a35352e9d00232cfd555796b gst-plugins-good-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.6.tar.xz.sha256sum +sha256 26723ac01fcb360ade1f41d168c7c322d8af4ceb7e55c8c12ed2690d06a76eed gst-plugins-good-1.18.6.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk index 44da3c3c30..e0ca29c5fd 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_GOOD_VERSION = 1.18.5 +GST1_PLUGINS_GOOD_VERSION = 1.18.6 GST1_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST1_PLUGINS_GOOD_VERSION).tar.xz GST1_PLUGINS_GOOD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-good GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING From peter at korsgaard.com Wed Feb 16 20:58:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:58:32 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gst1-vaapi: bump version to 1.18.6 Message-ID: <20220216205312.7B461836A6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dc58180087bed78041f4d11575afaa73c84e139e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit aef9027773543fede0cbfa3405f5919e38671dbf) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-vaapi/gst1-vaapi.hash | 4 ++-- package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash index b0c19fc600..7e22774c11 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.18.5.tar.xz.sha256sum -sha256 4a460fb95559f41444eb24864ad2d9e37922b6eea941510310319fc3e0ba727b gstreamer-vaapi-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.18.6.tar.xz.sha256sum +sha256 ab6270f1e5e4546fbe6f5ea246d86ca3d196282eb863d46e6cdcc96f867449e0 gstreamer-vaapi-1.18.6.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk index 9810b12cf7..6af851602f 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_VAAPI_VERSION = 1.18.5 +GST1_VAAPI_VERSION = 1.18.6 GST1_VAAPI_SITE = https://gstreamer.freedesktop.org/src/gstreamer-vaapi GST1_VAAPI_SOURCE = gstreamer-vaapi-$(GST1_VAAPI_VERSION).tar.xz GST1_VAAPI_LICENSE = LGPL-2.1+ From peter at korsgaard.com Wed Feb 16 20:58:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:58:31 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gst1-libav: bump version to 1.18.6 Message-ID: <20220216205312.727A0836AF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=72673613aa0ee9ee678e1c654fdfe48fddaa1562 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit 8de78f3da0cdbc139b876bdeb34079302ce02934) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-libav/gst1-libav.hash | 4 ++-- package/gstreamer1/gst1-libav/gst1-libav.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-libav/gst1-libav.hash b/package/gstreamer1/gst1-libav/gst1-libav.hash index 040a6e33f3..5fb39a0b3e 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.hash +++ b/package/gstreamer1/gst1-libav/gst1-libav.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.18.5.tar.xz.sha256sum -sha256 822e008a910e9dd13aedbdd8dc63fedef4040c0ee2e927bab3112e9de693a548 gst-libav-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.18.6.tar.xz.sha256sum +sha256 e4e50dcd5a29441ae34de60d2221057e8064ed824bb6ca4dc0fd9ee88fbe9b81 gst-libav-1.18.6.tar.xz sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gst1-libav/gst1-libav.mk b/package/gstreamer1/gst1-libav/gst1-libav.mk index 01ec4d2c98..55c6e06e0e 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.mk +++ b/package/gstreamer1/gst1-libav/gst1-libav.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_LIBAV_VERSION = 1.18.5 +GST1_LIBAV_VERSION = 1.18.6 GST1_LIBAV_SOURCE = gst-libav-$(GST1_LIBAV_VERSION).tar.xz GST1_LIBAV_SITE = https://gstreamer.freedesktop.org/src/gst-libav GST1_LIBAV_LICENSE = LGPL-2.0+ From peter at korsgaard.com Wed Feb 16 20:58:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:58:31 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gst1-devtools: bump version to 1.18.6 Message-ID: <20220216205312.6A24A836A6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e293b10d1cf2260fc610e7b2f2179d6fd74a2f7e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit efd9eac4d7579808caa23ee52a0d9661c8f987be) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-devtools/gst1-devtools.hash | 4 ++-- package/gstreamer1/gst1-devtools/gst1-devtools.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.hash b/package/gstreamer1/gst1-devtools/gst1-devtools.hash index c19254c195..011385e757 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.hash +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.18.5.tar.xz.sha256sum -sha256 fecffc86447daf5c2a06843c757a991d745caa2069446a0d746e99b13f7cb079 gst-devtools-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.18.6.tar.xz.sha256sum +sha256 3725622c740a635452e54b79d065f963ab7706ca2403de6c43072ae7610a0de4 gst-devtools-1.18.6.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 validate/COPYING diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.mk b/package/gstreamer1/gst1-devtools/gst1-devtools.mk index 1c25823953..66b509ae2c 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.mk +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_DEVTOOLS_VERSION = 1.18.5 +GST1_DEVTOOLS_VERSION = 1.18.6 GST1_DEVTOOLS_SOURCE = gst-devtools-$(GST1_DEVTOOLS_VERSION).tar.xz GST1_DEVTOOLS_SITE = https://gstreamer.freedesktop.org/src/gst-devtools GST1_DEVTOOLS_LICENSE = LGPL-2.1+ From peter at korsgaard.com Wed Feb 16 20:58:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:58:35 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gst-omx: bump version to 1.18.6 Message-ID: <20220216205312.9529B836A7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0903ad64eb5e031e0b4b28df7b4af4a446f3e4a1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit ce4bc450007910aa673d0f8356e99c421d20af89) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst-omx/gst-omx.hash | 4 ++-- package/gstreamer1/gst-omx/gst-omx.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst-omx/gst-omx.hash b/package/gstreamer1/gst-omx/gst-omx.hash index 9040393506..47f7cb5893 100644 --- a/package/gstreamer1/gst-omx/gst-omx.hash +++ b/package/gstreamer1/gst-omx/gst-omx.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.18.5.tar.xz.sha256sum -sha256 2cd457c1e8deb1a9b39608048fb36a44f6c9a864a6b6115b1453a32e7be93b42 gst-omx-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.18.6.tar.xz.sha256sum +sha256 b5281c938e959fd2418e989cfb6065fdd9fe5f6f87ee86236c9427166e708163 gst-omx-1.18.6.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst-omx/gst-omx.mk b/package/gstreamer1/gst-omx/gst-omx.mk index f7be1d59ef..dc65509244 100644 --- a/package/gstreamer1/gst-omx/gst-omx.mk +++ b/package/gstreamer1/gst-omx/gst-omx.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST_OMX_VERSION = 1.18.5 +GST_OMX_VERSION = 1.18.6 GST_OMX_SOURCE = gst-omx-$(GST_OMX_VERSION).tar.xz GST_OMX_SITE = https://gstreamer.freedesktop.org/src/gst-omx From peter at korsgaard.com Wed Feb 16 20:58:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:58:34 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gstreamer1-editing-services: bump version to 1.18.6 Message-ID: <20220216205312.8CBCB836A6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=79c424facdecd47972afbd26310d1f76b58aaf50 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit aa87c2e1689b920052ee4a802e24ca342d8f9651) Signed-off-by: Peter Korsgaard --- .../gstreamer1-editing-services/gstreamer1-editing-services.hash | 4 ++-- .../gstreamer1-editing-services/gstreamer1-editing-services.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash index daaf729c70..e29dc112ce 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash @@ -1,5 +1,5 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.18.5.tar.xz.sha256sum -sha256 8af4a8394d051f3e18280686db49a6efaccc95c0c59a17f0f564e32000590df5 gst-editing-services-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.18.6.tar.xz.sha256sum +sha256 fe10d14ef896aa21038317f6f81e1158ccc6caaed9b0d5a29ae5bdd63074582c gst-editing-services-1.18.6.tar.xz # Hashes for license files: sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk index d3de79c5f6..a3722cbbca 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_EDITING_SERVICES_VERSION = 1.18.5 +GSTREAMER1_EDITING_SERVICES_VERSION = 1.18.6 GSTREAMER1_EDITING_SERVICES_SOURCE = gst-editing-services-$(GSTREAMER1_EDITING_SERVICES_VERSION).tar.xz GSTREAMER1_EDITING_SERVICES_SITE = https://gstreamer.freedesktop.org/src/gstreamer-editing-services GSTREAMER1_EDITING_SERVICES_LICENSE = LGPL-2.0+ From peter at korsgaard.com Wed Feb 16 20:58:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:58:35 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gst1-python: bump version to 1.18.6 Message-ID: <20220216205312.9EBF583607@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=257b355bba4750c84e8b4ccf4e590f1b18f0bbfb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit dc66c5901cbc912941f26275aac0f4b3fe6cf596) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-python/gst1-python.hash | 4 ++-- package/gstreamer1/gst1-python/gst1-python.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-python/gst1-python.hash b/package/gstreamer1/gst1-python/gst1-python.hash index 2035c81fea..a760e53e7d 100644 --- a/package/gstreamer1/gst1-python/gst1-python.hash +++ b/package/gstreamer1/gst1-python/gst1-python.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.18.5.tar.xz.sha256sum -sha256 533685871305959d6db89507f3b3aa6c765c2f2b0dacdc32c5a6543e72e5bc52 gst-python-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.18.6.tar.xz.sha256sum +sha256 bdc0ea22fbd7335ad9decc151561aacc53c51206a9735b81eac700ce5b0bbd4a gst-python-1.18.6.tar.xz sha256 ea3ad127610e5ded2210b3a86a46314f2b3b28e438eccffdae19a4d6fbcdb0c2 COPYING diff --git a/package/gstreamer1/gst1-python/gst1-python.mk b/package/gstreamer1/gst1-python/gst1-python.mk index 614cb22396..7faab752cd 100644 --- a/package/gstreamer1/gst1-python/gst1-python.mk +++ b/package/gstreamer1/gst1-python/gst1-python.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PYTHON_VERSION = 1.18.5 +GST1_PYTHON_VERSION = 1.18.6 GST1_PYTHON_SOURCE = gst-python-$(GST1_PYTHON_VERSION).tar.xz GST1_PYTHON_SITE = https://gstreamer.freedesktop.org/src/gst-python GST1_PYTHON_INSTALL_STAGING = YES From peter at korsgaard.com Wed Feb 16 20:58:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 21:58:33 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gst1-rtsp-server: bump version to 1.18.6 Message-ID: <20220216205312.844CE836A6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8af5c11205753ea37838eeec20c354a2952747e8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit 56c0d7b8867228bb44e76f4bf296e27202d10f13) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash | 4 ++-- package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash index 627a451d04..fadef41351 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash @@ -1,4 +1,4 @@ -# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.18.5.tar.xz.sha256sum -sha256 04d63bf48816c6f41c73f6de0f912a7cef0aab39c44162a7bcece1923dfc9d1f gst-rtsp-server-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.18.6.tar.xz.sha256sum +sha256 826f32afbcf94b823541efcac4a0dacdb62f6145ef58f363095749f440262be9 gst-rtsp-server-1.18.6.tar.xz sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING.LIB diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk index 37942423a5..55403754f3 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_RTSP_SERVER_VERSION = 1.18.5 +GST1_RTSP_SERVER_VERSION = 1.18.6 GST1_RTSP_SERVER_SOURCE = gst-rtsp-server-$(GST1_RTSP_SERVER_VERSION).tar.xz GST1_RTSP_SERVER_SITE = http://gstreamer.freedesktop.org/src/gst-rtsp-server GST1_RTSP_SERVER_LICENSE = LGPL-2.0+ From yann.morin.1998 at free.fr Wed Feb 16 21:02:17 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Feb 2022 22:02:17 +0100 Subject: [Buildroot] [git commit] package/python-pycli: fix build with python >= 3.10 Message-ID: <20220216205442.EC426836B5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b2e6e376a2d7551ccf146855ec4e99a65c35bd16 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 due to the new "Multiple Exception types without parentheses" exception (https://docs.python.org/3/whatsnew/3.10.html) error: File "/usr/lib/python3.10/site-packages/cli/app.py", line 242 except Exception, e: ^^^^^^^^^^^^ SyntaxError: multiple exception types must be parenthesized Fixes: - http://autobuild.buildroot.org/results/8d7b0c23472abffc9447e4a6de273bdd04486d39 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...-re-raise-exceptions-in-wrapped-functions.patch | 26 ++++++++++++++ ...-except-statement-changed-slightly-in-2-6.patch | 41 ++++++++++++++++++++++ 2 files changed, 67 insertions(+) diff --git a/package/python-pycli/0001-Fix-problem-with-re-raise-exceptions-in-wrapped-functions.patch b/package/python-pycli/0001-Fix-problem-with-re-raise-exceptions-in-wrapped-functions.patch new file mode 100644 index 0000000000..7ac9d7af9f --- /dev/null +++ b/package/python-pycli/0001-Fix-problem-with-re-raise-exceptions-in-wrapped-functions.patch @@ -0,0 +1,26 @@ +From 57c563f8b47a56feefc0a8bcbef05f4b54280549 Mon Sep 17 00:00:00 2001 +From: mmbutter +Date: Tue, 9 Jun 2020 11:50:41 -0500 +Subject: [PATCH] Fix problem with re-raise exceptions in wrapped functions. + +[Retrieved from: +https://github.com/whilp/cli/commit/57c563f8b47a56feefc0a8bcbef05f4b54280549] +Signed-off-by: Fabrice Fontaine +--- + lib/cli/app.py | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/lib/cli/app.py b/lib/cli/app.py +index 7b6db52..f487ab4 100644 +--- a/lib/cli/app.py ++++ b/lib/cli/app.py +@@ -240,6 +240,9 @@ def run(self): + try: + returned = self.main(*args) + except Exception, e: ++ elif isinstance(e, self.reraise): ++ # raising the last exception preserves traceback ++ raise + returned = e + + return self.post_run(returned) diff --git a/package/python-pycli/0002-except-statement-changed-slightly-in-2-6.patch b/package/python-pycli/0002-except-statement-changed-slightly-in-2-6.patch new file mode 100644 index 0000000000..75869d6d23 --- /dev/null +++ b/package/python-pycli/0002-except-statement-changed-slightly-in-2-6.patch @@ -0,0 +1,41 @@ +From 2af95cff5609142ec14efdf13b394f9b0121ab2e Mon Sep 17 00:00:00 2001 +From: mmbutter +Date: Thu, 11 Jun 2020 15:50:03 -0500 +Subject: [PATCH] except statement changed slightly in 2.6. This could cause + problems in newer versions. Updated to the new format. + +[Retrieved from: +https://github.com/whilp/cli/commit/2af95cff5609142ec14efdf13b394f9b0121ab2e] +Signed-off-by: Fabrice Fontaine +--- + lib/cli/app.py | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/lib/cli/app.py b/lib/cli/app.py +index f487ab4..45256b8 100644 +--- a/lib/cli/app.py ++++ b/lib/cli/app.py +@@ -239,10 +239,10 @@ def run(self): + args = () + try: + returned = self.main(*args) +- except Exception, e: +- elif isinstance(e, self.reraise): +- # raising the last exception preserves traceback +- raise ++ except self.reraise: ++ # raising the last exception preserves traceback ++ raise ++ except Exception as e: + returned = e + + return self.post_run(returned) +@@ -420,7 +420,7 @@ def pre_run(self): + """ + try: + ns = self.argparser.parse_args() +- except SystemExit, e: ++ except SystemExit as e: + if self.exit_after_main: + raise + else: From peter at korsgaard.com Wed Feb 16 21:02:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 22:02:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/tiff: fix CVE-2022-22844 In-Reply-To: <20220205141448.420553-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 5 Feb 2022 15:14:48 +0100") References: <20220205141448.420553-1-fontaine.fabrice@gmail.com> Message-ID: <878ruah6e9.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > LibTIFF 4.3.0 has an out-of-bounds read in _TIFFmemcpy in tif_unix.c in > certain situations involving a custom tag and 0x0200 as the second word > of the DE field. > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 16 21:02:11 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 22:02:11 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/tiff: fix CVE-2022-22844 Message-ID: <20220216205448.D2118836BA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=faa5ad2c438c63245f4e01830388b27e99c3bc0e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x LibTIFF 4.3.0 has an out-of-bounds read in _TIFFmemcpy in tif_unix.c in certain situations involving a custom tag and 0x0200 as the second word of the DE field. Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 7ec5f99b3a00a1ec4dd6677a0ee6418267ffba25) Signed-off-by: Peter Korsgaard --- ...fix-global-buffer-overflow-for-ASCII-tags.patch | 43 ++++++++++++++++++++++ package/tiff/tiff.mk | 4 ++ 2 files changed, 47 insertions(+) diff --git a/package/tiff/0001-tiffset-fix-global-buffer-overflow-for-ASCII-tags.patch b/package/tiff/0001-tiffset-fix-global-buffer-overflow-for-ASCII-tags.patch new file mode 100644 index 0000000000..ba1487782e --- /dev/null +++ b/package/tiff/0001-tiffset-fix-global-buffer-overflow-for-ASCII-tags.patch @@ -0,0 +1,43 @@ +From 03047a26952a82daaa0792957ce211e0aa51bc64 Mon Sep 17 00:00:00 2001 +From: 4ugustus +Date: Tue, 25 Jan 2022 16:25:28 +0000 +Subject: [PATCH] tiffset: fix global-buffer-overflow for ASCII tags where + count is required (fixes #355) + +[Retrieved from: +https://gitlab.com/libtiff/libtiff/-/commit/03047a26952a82daaa0792957ce211e0aa51bc64] +Signed-off-by: Fabrice Fontaine +--- + tools/tiffset.c | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) + +diff --git a/tools/tiffset.c b/tools/tiffset.c +index 8c9e23c5..e7a88c09 100644 +--- a/tools/tiffset.c ++++ b/tools/tiffset.c +@@ -146,9 +146,19 @@ main(int argc, char* argv[]) + + arg_index++; + if (TIFFFieldDataType(fip) == TIFF_ASCII) { +- if (TIFFSetField(tiff, TIFFFieldTag(fip), argv[arg_index]) != 1) +- fprintf( stderr, "Failed to set %s=%s\n", +- TIFFFieldName(fip), argv[arg_index] ); ++ if(TIFFFieldPassCount( fip )) { ++ size_t len; ++ len = strlen(argv[arg_index]) + 1; ++ if (len > UINT16_MAX || TIFFSetField(tiff, TIFFFieldTag(fip), ++ (uint16_t)len, argv[arg_index]) != 1) ++ fprintf( stderr, "Failed to set %s=%s\n", ++ TIFFFieldName(fip), argv[arg_index] ); ++ } else { ++ if (TIFFSetField(tiff, TIFFFieldTag(fip), ++ argv[arg_index]) != 1) ++ fprintf( stderr, "Failed to set %s=%s\n", ++ TIFFFieldName(fip), argv[arg_index] ); ++ } + } else if (TIFFFieldWriteCount(fip) > 0 + || TIFFFieldWriteCount(fip) == TIFF_VARIABLE) { + int ret = 1; +-- +GitLab + diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index f6c6de12c5..f80ab7ac55 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -11,6 +11,10 @@ TIFF_LICENSE_FILES = COPYRIGHT TIFF_CPE_ID_VENDOR = libtiff TIFF_CPE_ID_PRODUCT = libtiff TIFF_INSTALL_STAGING = YES + +# 0001-tiffset-fix-global-buffer-overflow-for-ASCII-tags.patch +TIFF_IGNORE_CVES += CVE-2022-22844 + TIFF_CONF_OPTS = \ --disable-cxx \ --without-x From peter at korsgaard.com Wed Feb 16 21:02:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 22:02:06 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/tiff: bump to version 4.3.0 Message-ID: <20220216205448.C645B836BD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=33169da5d5b81da72a4eccd23fa6b1a2b5955895 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Update indentation in hash file (two spaces) https://gitlab.com/libtiff/libtiff/-/blob/v4.3.0/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 29b5fe6895dcf38eea51bc68baf7310950c4d401) Signed-off-by: Peter Korsgaard --- package/tiff/tiff.hash | 4 ++-- package/tiff/tiff.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/tiff/tiff.hash b/package/tiff/tiff.hash index 472ec40e55..ea08a1fc92 100644 --- a/package/tiff/tiff.hash +++ b/package/tiff/tiff.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 eb0484e568ead8fa23b513e9b0041df7e327f4ee2d22db5a533929dfc19633cb tiff-4.2.0.tar.gz -sha256 fbd6fed7938541d2c809c0826225fc85e551fdbfa8732b10f0c87e0847acafd7 COPYRIGHT +sha256 0e46e5acb087ce7d1ac53cf4f56a09b221537fc86dfc5daaad1c2e89e1b37ac8 tiff-4.3.0.tar.gz +sha256 fbd6fed7938541d2c809c0826225fc85e551fdbfa8732b10f0c87e0847acafd7 COPYRIGHT diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index c3d8045144..f6c6de12c5 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIFF_VERSION = 4.2.0 +TIFF_VERSION = 4.3.0 TIFF_SITE = http://download.osgeo.org/libtiff TIFF_LICENSE = tiff license TIFF_LICENSE_FILES = COPYRIGHT From peter at korsgaard.com Wed Feb 16 21:01:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 22:01:24 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/tiff: fix CVE-2022-22844 Message-ID: <20220216205502.0CD22836CA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1e25ae6943e9d62819f690bee46ccba24081f8b8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x LibTIFF 4.3.0 has an out-of-bounds read in _TIFFmemcpy in tif_unix.c in certain situations involving a custom tag and 0x0200 as the second word of the DE field. Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 7ec5f99b3a00a1ec4dd6677a0ee6418267ffba25) Signed-off-by: Peter Korsgaard --- ...fix-global-buffer-overflow-for-ASCII-tags.patch | 43 ++++++++++++++++++++++ package/tiff/tiff.mk | 4 ++ 2 files changed, 47 insertions(+) diff --git a/package/tiff/0001-tiffset-fix-global-buffer-overflow-for-ASCII-tags.patch b/package/tiff/0001-tiffset-fix-global-buffer-overflow-for-ASCII-tags.patch new file mode 100644 index 0000000000..ba1487782e --- /dev/null +++ b/package/tiff/0001-tiffset-fix-global-buffer-overflow-for-ASCII-tags.patch @@ -0,0 +1,43 @@ +From 03047a26952a82daaa0792957ce211e0aa51bc64 Mon Sep 17 00:00:00 2001 +From: 4ugustus +Date: Tue, 25 Jan 2022 16:25:28 +0000 +Subject: [PATCH] tiffset: fix global-buffer-overflow for ASCII tags where + count is required (fixes #355) + +[Retrieved from: +https://gitlab.com/libtiff/libtiff/-/commit/03047a26952a82daaa0792957ce211e0aa51bc64] +Signed-off-by: Fabrice Fontaine +--- + tools/tiffset.c | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) + +diff --git a/tools/tiffset.c b/tools/tiffset.c +index 8c9e23c5..e7a88c09 100644 +--- a/tools/tiffset.c ++++ b/tools/tiffset.c +@@ -146,9 +146,19 @@ main(int argc, char* argv[]) + + arg_index++; + if (TIFFFieldDataType(fip) == TIFF_ASCII) { +- if (TIFFSetField(tiff, TIFFFieldTag(fip), argv[arg_index]) != 1) +- fprintf( stderr, "Failed to set %s=%s\n", +- TIFFFieldName(fip), argv[arg_index] ); ++ if(TIFFFieldPassCount( fip )) { ++ size_t len; ++ len = strlen(argv[arg_index]) + 1; ++ if (len > UINT16_MAX || TIFFSetField(tiff, TIFFFieldTag(fip), ++ (uint16_t)len, argv[arg_index]) != 1) ++ fprintf( stderr, "Failed to set %s=%s\n", ++ TIFFFieldName(fip), argv[arg_index] ); ++ } else { ++ if (TIFFSetField(tiff, TIFFFieldTag(fip), ++ argv[arg_index]) != 1) ++ fprintf( stderr, "Failed to set %s=%s\n", ++ TIFFFieldName(fip), argv[arg_index] ); ++ } + } else if (TIFFFieldWriteCount(fip) > 0 + || TIFFFieldWriteCount(fip) == TIFF_VARIABLE) { + int ret = 1; +-- +GitLab + diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index f6c6de12c5..f80ab7ac55 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -11,6 +11,10 @@ TIFF_LICENSE_FILES = COPYRIGHT TIFF_CPE_ID_VENDOR = libtiff TIFF_CPE_ID_PRODUCT = libtiff TIFF_INSTALL_STAGING = YES + +# 0001-tiffset-fix-global-buffer-overflow-for-ASCII-tags.patch +TIFF_IGNORE_CVES += CVE-2022-22844 + TIFF_CONF_OPTS = \ --disable-cxx \ --without-x From yann.morin.1998 at free.fr Wed Feb 16 21:02:51 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Feb 2022 22:02:51 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/python-pycli: fix build with python >= 3.10 In-Reply-To: <20220215132909.2360674-1-fontaine.fabrice@gmail.com> References: <20220215132909.2360674-1-fontaine.fabrice@gmail.com> Message-ID: <20220216210251.GB522310@scaer> Fabrice, All, On 2022-02-15 14:29 +0100, Fabrice Fontaine spake thusly: > Fix the following build failure raised since bump of python3 to version > 3.10.1 in commit 25b1fc2898d68ddf2674b14c738045875fc5a2dc due to the new > "Multiple Exception types without parentheses" exception > (https://docs.python.org/3/whatsnew/3.10.html) > > error: File "/usr/lib/python3.10/site-packages/cli/app.py", line 242 > except Exception, e: > ^^^^^^^^^^^^ > SyntaxError: multiple exception types must be parenthesized > > Fixes: > - http://autobuild.buildroot.org/results/8d7b0c23472abffc9447e4a6de273bdd04486d39 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > Changes v1 -> v2: > - Add upstream commits instead of dropping package (even if repository > has been archived) > > ...aise-exceptions-in-wrapped-functions.patch | 26 ++++++++++++ > ...pt-statement-changed-slightly-in-2-6.patch | 41 +++++++++++++++++++ > 2 files changed, 67 insertions(+) > create mode 100644 package/python-pycli/0001-Fix-problem-with-re-raise-exceptions-in-wrapped-functions.patch > create mode 100644 package/python-pycli/0002-except-statement-changed-slightly-in-2-6.patch > > diff --git a/package/python-pycli/0001-Fix-problem-with-re-raise-exceptions-in-wrapped-functions.patch b/package/python-pycli/0001-Fix-problem-with-re-raise-exceptions-in-wrapped-functions.patch > new file mode 100644 > index 0000000000..7ac9d7af9f > --- /dev/null > +++ b/package/python-pycli/0001-Fix-problem-with-re-raise-exceptions-in-wrapped-functions.patch > @@ -0,0 +1,26 @@ > +From 57c563f8b47a56feefc0a8bcbef05f4b54280549 Mon Sep 17 00:00:00 2001 > +From: mmbutter > +Date: Tue, 9 Jun 2020 11:50:41 -0500 > +Subject: [PATCH] Fix problem with re-raise exceptions in wrapped functions. > + > +[Retrieved from: > +https://github.com/whilp/cli/commit/57c563f8b47a56feefc0a8bcbef05f4b54280549] > +Signed-off-by: Fabrice Fontaine > +--- > + lib/cli/app.py | 3 +++ > + 1 file changed, 3 insertions(+) > + > +diff --git a/lib/cli/app.py b/lib/cli/app.py > +index 7b6db52..f487ab4 100644 > +--- a/lib/cli/app.py > ++++ b/lib/cli/app.py > +@@ -240,6 +240,9 @@ def run(self): > + try: > + returned = self.main(*args) > + except Exception, e: > ++ elif isinstance(e, self.reraise): > ++ # raising the last exception preserves traceback > ++ raise > + returned = e > + > + return self.post_run(returned) > diff --git a/package/python-pycli/0002-except-statement-changed-slightly-in-2-6.patch b/package/python-pycli/0002-except-statement-changed-slightly-in-2-6.patch > new file mode 100644 > index 0000000000..75869d6d23 > --- /dev/null > +++ b/package/python-pycli/0002-except-statement-changed-slightly-in-2-6.patch > @@ -0,0 +1,41 @@ > +From 2af95cff5609142ec14efdf13b394f9b0121ab2e Mon Sep 17 00:00:00 2001 > +From: mmbutter > +Date: Thu, 11 Jun 2020 15:50:03 -0500 > +Subject: [PATCH] except statement changed slightly in 2.6. This could cause > + problems in newer versions. Updated to the new format. > + > +[Retrieved from: > +https://github.com/whilp/cli/commit/2af95cff5609142ec14efdf13b394f9b0121ab2e] > +Signed-off-by: Fabrice Fontaine > +--- > + lib/cli/app.py | 10 +++++----- > + 1 file changed, 5 insertions(+), 5 deletions(-) > + > +diff --git a/lib/cli/app.py b/lib/cli/app.py > +index f487ab4..45256b8 100644 > +--- a/lib/cli/app.py > ++++ b/lib/cli/app.py > +@@ -239,10 +239,10 @@ def run(self): > + args = () > + try: > + returned = self.main(*args) > +- except Exception, e: > +- elif isinstance(e, self.reraise): > +- # raising the last exception preserves traceback > +- raise > ++ except self.reraise: > ++ # raising the last exception preserves traceback > ++ raise > ++ except Exception as e: > + returned = e > + > + return self.post_run(returned) > +@@ -420,7 +420,7 @@ def pre_run(self): > + """ > + try: > + ns = self.argparser.parse_args() > +- except SystemExit, e: > ++ except SystemExit as e: > + if self.exit_after_main: > + raise > + else: > -- > 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 Wed Feb 16 21:03:57 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 22:03:57 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/vim: security bump to version 8.2.4301 Message-ID: <20220216205622.5B1D7836D1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1db408a3512719b3cb6da649be539de9a047b462 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix CVE-2022-0393: Out-of-bounds Read in GitHub repository vim/vim prior to 8.2. Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 18a19c985f3363510d8ae317e66d53680475db26) 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 49056b31cd..fa3ca53cc8 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 8770c6308a6c0b0f8b93a4d7202451d195b4efad17787c0306f0be60947732c4 vim-8.2.4224.tar.gz +sha256 b40b4e341de6b65cdeacd4c816dea8fe5e3b385ee5e17af73fc69c00bd7c440b vim-8.2.4301.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index 74ab1ec584..98a5f153a8 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 8.2.4224 +VIM_VERSION = 8.2.4301 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src From peter at korsgaard.com Wed Feb 16 21:03:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 22:03:35 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/vim: security bump to version 8.2.4301 Message-ID: <20220216205626.B7ADB836D7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1c5f3083c71764bb1f6997deb5e98ebf298c8e2d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix CVE-2022-0393: Out-of-bounds Read in GitHub repository vim/vim prior to 8.2. Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 18a19c985f3363510d8ae317e66d53680475db26) 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 49056b31cd..fa3ca53cc8 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 8770c6308a6c0b0f8b93a4d7202451d195b4efad17787c0306f0be60947732c4 vim-8.2.4224.tar.gz +sha256 b40b4e341de6b65cdeacd4c816dea8fe5e3b385ee5e17af73fc69c00bd7c440b vim-8.2.4301.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index 74ab1ec584..98a5f153a8 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 8.2.4224 +VIM_VERSION = 8.2.4301 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src From peter at korsgaard.com Wed Feb 16 21:04:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 22:04:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/vim: security bump to version 8.2.4301 In-Reply-To: <20220205145716.459582-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 5 Feb 2022 15:57:16 +0100") References: <20220205145716.459582-1-fontaine.fabrice@gmail.com> Message-ID: <874k4yh6b2.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2022-0393: Out-of-bounds Read in GitHub repository vim/vim prior > to 8.2. > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 16 21:04:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 22:04:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/vim: security bump to version 8.2.4301 In-Reply-To: <874k4yh6b2.fsf@dell.be.48ers.dk> (Peter Korsgaard's message of "Wed, 16 Feb 2022 22:04:17 +0100") References: <20220205145716.459582-1-fontaine.fabrice@gmail.com> <874k4yh6b2.fsf@dell.be.48ers.dk> Message-ID: <87zgmqfrpz.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: >>>>> "Fabrice" == Fabrice Fontaine writes: >> Fix CVE-2022-0393: Out-of-bounds Read in GitHub repository vim/vim prior >> to 8.2. >> Signed-off-by: Fabrice Fontaine > Committed to 2021.02.x and 2021.11.x, thanks. (v2 that is). -- Bye, Peter Korsgaard From yann.morin.1998 at free.fr Wed Feb 16 21:05:54 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Feb 2022 22:05:54 +0100 Subject: [Buildroot] [git commit] package/qt5/qt5webkit: needs execinfo.h Message-ID: <20220216205835.D733E836E6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c7d3f5cd9f39caead1ae4aedda42a48343571b57 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master qt5webkit needs execinfo.h since bump to version 5.212.0-alpha4 in commit df0b0fe6919c0d0f3750f439a3cfa765232bd569: /tmp/instance-1/output-1/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp:54:10: fatal error: execinfo.h: No such file or directory 54 | #include | ^~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/351529f7d928e28fa2db22c6297dc70d21db562b Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/qt5/qt5webkit/Config.in | 1 + package/qt5/qt5webkit/qt5webkit.mk | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in index 68b679dfcd..ed87efca95 100644 --- a/package/qt5/qt5webkit/Config.in +++ b/package/qt5/qt5webkit/Config.in @@ -21,6 +21,7 @@ config BR2_PACKAGE_QT5WEBKIT select BR2_PACKAGE_QT5LOCATION select BR2_PACKAGE_QT5SENSORS select BR2_PACKAGE_QT5WEBCHANNEL + select BR2_PACKAGE_LIBEXECINFO if !BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_LIBXSLT select BR2_PACKAGE_SQLITE diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk index 565c57e813..2e96acc00f 100644 --- a/package/qt5/qt5webkit/qt5webkit.mk +++ b/package/qt5/qt5webkit/qt5webkit.mk @@ -38,6 +38,10 @@ ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5WEBKIT_DEPENDENCIES += qt5declarative endif +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +QT5WEBKIT_DEPENDENCIES += libexecinfo +endif + QT5WEBKIT_CONF_OPTS += \ -DENABLE_TOOLS=OFF \ -DPORT=Qt \ From yann.morin.1998 at free.fr Wed Feb 16 21:07:32 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Feb 2022 22:07:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5webkit: needs execinfo.h In-Reply-To: <20220214213226.4143188-1-fontaine.fabrice@gmail.com> References: <20220214213226.4143188-1-fontaine.fabrice@gmail.com> Message-ID: <20220216210732.GC522310@scaer> Fabrice, All, On 2022-02-14 22:32 +0100, Fabrice Fontaine spake thusly: > qt5webkit needs execinfo.h since bump to version 5.212.0-alpha4 in > commit df0b0fe6919c0d0f3750f439a3cfa765232bd569: > > /tmp/instance-1/output-1/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp:54:10: fatal error: execinfo.h: No such file or directory > 54 | #include > | ^~~~~~~~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/351529f7d928e28fa2db22c6297dc70d21db562b > > Signed-off-by: Fabrice Fontaine > --- > package/qt5/qt5webkit/Config.in | 1 + > package/qt5/qt5webkit/qt5webkit.mk | 3 ++- > 2 files changed, 3 insertions(+), 1 deletion(-) > > diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in > index 68b679dfcd..ed87efca95 100644 > --- a/package/qt5/qt5webkit/Config.in > +++ b/package/qt5/qt5webkit/Config.in > @@ -21,6 +21,7 @@ config BR2_PACKAGE_QT5WEBKIT > select BR2_PACKAGE_QT5LOCATION > select BR2_PACKAGE_QT5SENSORS > select BR2_PACKAGE_QT5WEBCHANNEL > + select BR2_PACKAGE_LIBEXECINFO if !BR2_TOOLCHAIN_USES_GLIBC > select BR2_PACKAGE_LIBXML2 > select BR2_PACKAGE_LIBXSLT > select BR2_PACKAGE_SQLITE > diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk > index 565c57e813..2084f3af52 100644 > --- a/package/qt5/qt5webkit/qt5webkit.mk > +++ b/package/qt5/qt5webkit/qt5webkit.mk > @@ -10,7 +10,8 @@ QT5WEBKIT_SOURCE = qtwebkit-$(QT5WEBKIT_VERSION).tar.xz > QT5WEBKIT_DEPENDENCIES = \ > 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 > + qt5sensors qt5webchannel sqlite webp woff2 \ > + $(if $(BR2_PACKAGE_LIBEXECINFO),libexecinfo) There already are optional dependencies that are handled as a conditional block, further down the file, so I changed this new dependency to match the existing style. Applied to master, thanks. Regards, Yann E. MORIN. > QT5WEBKIT_INSTALL_STAGING = YES > > QT5WEBKIT_LICENSE_FILES = Source/WebCore/LICENSE-LGPL-2 Source/WebCore/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 Feb 16 21:11:45 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Feb 2022 22:11:45 +0100 Subject: [Buildroot] [git commit] package/dnsmasq: fix build with ubus and without dnssec Message-ID: <20220216210442.6CE8C836ED@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6f0e2e567f7245705445a922b1529ea4f7b6b4a5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since bump to version 2.86 in commit 5b29096f8fcb0acd8890073a56ba9d620b1f911c: rfc1035.c: In function 'report_addresses': rfc1035.c:978:49: error: 'struct dnsmasq_daemon' has no member named 'workspacename' 978 | if (!extract_name(header, len, &p, daemon->workspacename, 1, 0)) | ^~ Fixes: - http://autobuild.buildroot.org/results/51242d4f532373544e3c7ea45036b8d41390b29b Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...S-but-not-DNSSEC-compile-options-selected.patch | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/package/dnsmasq/0003-Fix-FTBFS-when-CONNTRACK-and-UBUS-but-not-DNSSEC-compile-options-selected.patch b/package/dnsmasq/0003-Fix-FTBFS-when-CONNTRACK-and-UBUS-but-not-DNSSEC-compile-options-selected.patch new file mode 100644 index 0000000000..9c98af2be5 --- /dev/null +++ b/package/dnsmasq/0003-Fix-FTBFS-when-CONNTRACK-and-UBUS-but-not-DNSSEC-compile-options-selected.patch @@ -0,0 +1,34 @@ +From 2c60441239e1c10c4987cb586653b1ea08f703c0 Mon Sep 17 00:00:00 2001 +From: Simon Kelley +Date: Tue, 28 Sep 2021 23:42:15 +0100 +Subject: [PATCH] Fix FTBFS when CONNTRACK and UBUS but not DNSSEC compile + options selected. + +[Retrieved from: +https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=2c60441239e1c10c4987cb586653b1ea08f703c0] +Signed-off-by: Fabrice Fontaine +--- + src/dnsmasq.h | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/dnsmasq.h b/src/dnsmasq.h +index c8a918a..3fdc1b0 100644 +--- a/src/dnsmasq.h ++++ b/src/dnsmasq.h +@@ -1173,9 +1173,12 @@ extern struct daemon { + char *packet; /* packet buffer */ + int packet_buff_sz; /* size of above */ + char *namebuff; /* MAXDNAME size buffer */ ++#if (defined(HAVE_CONNTRACK) && defined(HAVE_UBUS)) || defined(HAVE_DNSSEC) ++ /* CONNTRACK UBUS code uses this buffer, as well as DNSSEC code. */ ++ char *workspacename; ++#endif + #ifdef HAVE_DNSSEC + char *keyname; /* MAXDNAME size buffer */ +- char *workspacename; /* ditto */ + unsigned long *rr_status; /* ceiling in TTL from DNSSEC or zero for insecure */ + int rr_status_sz; + int dnssec_no_time_check; +-- +2.20.1 + From yann.morin.1998 at free.fr Wed Feb 16 21:13:44 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Feb 2022 22:13:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/dnsmasq: fix build with ubus and without dnssec In-Reply-To: <20220214132944.2471362-1-fontaine.fabrice@gmail.com> References: <20220214132944.2471362-1-fontaine.fabrice@gmail.com> Message-ID: <20220216211344.GD522310@scaer> Fabrice, All, On 2022-02-14 14:29 +0100, Fabrice Fontaine spake thusly: > Fix the following build failure raised since bump to version 2.86 in > commit 5b29096f8fcb0acd8890073a56ba9d620b1f911c: > > rfc1035.c: In function 'report_addresses': > rfc1035.c:978:49: error: 'struct dnsmasq_daemon' has no member named 'workspacename' > 978 | if (!extract_name(header, len, &p, daemon->workspacename, 1, 0)) > | ^~ > > Fixes: > - http://autobuild.buildroot.org/results/51242d4f532373544e3c7ea45036b8d41390b29b > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...-not-DNSSEC-compile-options-selected.patch | 34 +++++++++++++++++++ > 1 file changed, 34 insertions(+) > create mode 100644 package/dnsmasq/0003-Fix-FTBFS-when-CONNTRACK-and-UBUS-but-not-DNSSEC-compile-options-selected.patch > > diff --git a/package/dnsmasq/0003-Fix-FTBFS-when-CONNTRACK-and-UBUS-but-not-DNSSEC-compile-options-selected.patch b/package/dnsmasq/0003-Fix-FTBFS-when-CONNTRACK-and-UBUS-but-not-DNSSEC-compile-options-selected.patch > new file mode 100644 > index 0000000000..9c98af2be5 > --- /dev/null > +++ b/package/dnsmasq/0003-Fix-FTBFS-when-CONNTRACK-and-UBUS-but-not-DNSSEC-compile-options-selected.patch > @@ -0,0 +1,34 @@ > +From 2c60441239e1c10c4987cb586653b1ea08f703c0 Mon Sep 17 00:00:00 2001 > +From: Simon Kelley > +Date: Tue, 28 Sep 2021 23:42:15 +0100 > +Subject: [PATCH] Fix FTBFS when CONNTRACK and UBUS but not DNSSEC compile > + options selected. > + > +[Retrieved from: > +https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=2c60441239e1c10c4987cb586653b1ea08f703c0] > +Signed-off-by: Fabrice Fontaine > +--- > + src/dnsmasq.h | 5 ++++- > + 1 file changed, 4 insertions(+), 1 deletion(-) > + > +diff --git a/src/dnsmasq.h b/src/dnsmasq.h > +index c8a918a..3fdc1b0 100644 > +--- a/src/dnsmasq.h > ++++ b/src/dnsmasq.h > +@@ -1173,9 +1173,12 @@ extern struct daemon { > + char *packet; /* packet buffer */ > + int packet_buff_sz; /* size of above */ > + char *namebuff; /* MAXDNAME size buffer */ > ++#if (defined(HAVE_CONNTRACK) && defined(HAVE_UBUS)) || defined(HAVE_DNSSEC) > ++ /* CONNTRACK UBUS code uses this buffer, as well as DNSSEC code. */ > ++ char *workspacename; > ++#endif > + #ifdef HAVE_DNSSEC > + char *keyname; /* MAXDNAME size buffer */ > +- char *workspacename; /* ditto */ > + unsigned long *rr_status; /* ceiling in TTL from DNSSEC or zero for insecure */ > + int rr_status_sz; > + int dnssec_no_time_check; > +-- > +2.20.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 arnout at mind.be Wed Feb 16 21:22:46 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 16 Feb 2022 22:22:46 +0100 Subject: [Buildroot] [PATCH v3 1/2] package/python-flit-core: new package/infrastructure In-Reply-To: <20220212113407.1213446-1-james.hilliard1@gmail.com> References: <20220212113407.1213446-1-james.hilliard1@gmail.com> Message-ID: <65664f13-83f9-a0d5-a67d-f27ed09af323@mind.be> Hi James, Both applied to next, but with modifications. On 12/02/2022 12:34, James Hilliard wrote: > 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. The installer script is not super nice. We could instead use host-python-pip, but this works as well, so OK. > We also need to add a patch fixing the version parser in flit-core. > > Signed-off-by: James Hilliard > --- > Changes v1 -> v2: > - rebase on master > --- > 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 bf0649fc9c..d574bfa2b0 100644 > --- a/package/pkg-python.mk > +++ b/package/pkg-python.mk > @@ -94,6 +94,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)" \ Indentation is with tab, not spaces. check-package doesn't warn about it because there are some remaining spaces for indenting conditions. > + PATH=$(BR_PATH) \ > + $(TARGET_CONFIGURE_OPTS) \ > + PYTHONPATH="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_PATH),$(PYTHON_PATH))" \ With the removal of python2, PYTHON_PATH should no longer be used. And this setup type is anyway python3 only. > + 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 > @@ -143,6 +184,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 = No need to define empty variables. > +$(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'") This should be extended with the new types. > endif > @@ -163,6 +217,12 @@ endif # ($(4),target) > # > ifeq ($$($(2)_SETUP_TYPE),setuptools) > $(2)_DEPENDENCIES += $$(if $$(filter host-python-setuptools,$(1)),,host-python-setuptools) > +else ifneq ($$(filter flit pep517,$$($(2)_SETUP_TYPE)),) > +$(2)_DEPENDENCIES += $$(if $$(filter host-python-pypa-build,$(1)),,host-python-pypa-build) No need for this filtering. It's there for setuptools because setuptools uses setup type setuptools itself, so it creates a circular dependency. pypa-build, installer and flit-core don't have that issue. > +$(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. > @@ -174,6 +234,15 @@ $(2)_PYTHON_INTERPRETER = $$(HOST_DIR)/bin/python > # 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)) Repeating the build commands completely defeats the purpose of those variables. Therefore, I've added an additional preparatory commit that moves the "-m build -n" part into the _BUILD_TGT variable. Check the git history to see how it's done. > +endef > +else > define $(2)_BUILD_CMDS > (cd $$($$(PKG)_BUILDDIR)/; \ > $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ > @@ -182,12 +251,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/* \ I haven't changed this, but shouldn't this be dist/*.whl just to be safe? > + $$($$(PKG)_BASE_INSTALL_OPTS) $$($$(PKG)_INSTALL_OPTS)) > +endef > +else > define $(2)_INSTALL_CMDS > (cd $$($$(PKG)_BUILDDIR)/; \ > $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ [snip] > 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 No longer exists. > +HOST_PYTHON_FLIT_CORE_DEPENDENCIES = host-python-pypa-build This is now added automatically by the infra. Regards, Arnout > + > +$(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", > + ) This is a bit more generic than what we need, which makes me think you copied it from somewhere. If that is the case, you should include a copyright notice at the beginning of the file, including (very important) and SPDX license header. If you created it completely yourself, it's OK. Regards, Arnout > + > + 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() From arnout at mind.be Wed Feb 16 21:22:34 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 16 Feb 2022 22:22:34 +0100 Subject: [Buildroot] [git commit branch/next] package/python-tinycss2: bump to version 1.1.1 Message-ID: <20220216211511.4B0E48372A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cc60c732a19548cfbd3543d3521324ef5faaa116 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This update drops distutils support and requires flit package infrastructure. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 a34717e002..4d6dcca663 100644 --- a/package/python-tinycss2/Config.in +++ b/package/python-tinycss2/Config.in @@ -3,3 +3,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 From arnout at mind.be Wed Feb 16 20:32:58 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 16 Feb 2022 21:32:58 +0100 Subject: [Buildroot] [git commit branch/next] package/pkg-python.mk: refactor build/install opts Message-ID: <20220216211511.38A8B83724@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c3810c131761922ae8c046840c78430c4125f16e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The python package infrastructure defines a number of helper variables that are used to construct the build and install commands. However, there are still a few parts (setup.py and its argument) that are set explicitly in _BUILD_CMDS and _INSTALL_CMDS. This creates problems if we want to add another setup type that does not use setup.py. Therefore, move the setup.py part into the helper variables as well. Since this means that the variable becomes a full command rather than just options, rename them to _BUILD_CMD and _INSTALL_CMD. While we're at it, also clean up the whitespace in the definition of these variables. They were aligned on = at some point, but that alignment was already broken. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/pkg-python.mk | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 02df061a19..61f0dd6ec2 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -130,27 +130,27 @@ endif # Distutils ifeq ($$($(2)_SETUP_TYPE),distutils) ifeq ($(4),target) -$(2)_BASE_ENV = $$(PKG_PYTHON_DISTUTILS_ENV) -$(2)_BASE_BUILD_TGT = build -$(2)_BASE_BUILD_OPTS = $$(PKG_PYTHON_DISTUTILS_BUILD_OPTS) -$(2)_BASE_INSTALL_TARGET_OPTS = $$(PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS) -$(2)_BASE_INSTALL_STAGING_OPTS = $$(PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS) +$(2)_BASE_ENV = $$(PKG_PYTHON_DISTUTILS_ENV) +$(2)_BASE_BUILD_CMD = setup.py build +$(2)_BASE_BUILD_OPTS = $$(PKG_PYTHON_DISTUTILS_BUILD_OPTS) +$(2)_BASE_INSTALL_TARGET_CMD = setup.py install --no-compile $$(PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS) +$(2)_BASE_INSTALL_STAGING_CMD = setup.py install $$(PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS) else $(2)_BASE_ENV = $$(HOST_PKG_PYTHON_DISTUTILS_ENV) -$(2)_BASE_BUILD_TGT = build -$(2)_BASE_INSTALL_OPTS = $$(HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS) +$(2)_BASE_BUILD_CMD = setup.py build +$(2)_BASE_INSTALL_CMD = setup.py install $$(HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS) endif # Setuptools else ifeq ($$($(2)_SETUP_TYPE),setuptools) ifeq ($(4),target) -$(2)_BASE_ENV = $$(PKG_PYTHON_SETUPTOOLS_ENV) -$(2)_BASE_BUILD_TGT = build -$(2)_BASE_INSTALL_TARGET_OPTS = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS) -$(2)_BASE_INSTALL_STAGING_OPTS = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS) +$(2)_BASE_ENV = $$(PKG_PYTHON_SETUPTOOLS_ENV) +$(2)_BASE_BUILD_CMD = setup.py build +$(2)_BASE_INSTALL_TARGET_CMD = setup.py install --no-compile $$(PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS) +$(2)_BASE_INSTALL_STAGING_CMD = setup.py install $$(PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS) else -$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_SETUPTOOLS_ENV) -$(2)_BASE_BUILD_TGT = build -$(2)_BASE_INSTALL_OPTS = $$(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) +$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_SETUPTOOLS_ENV) +$(2)_BASE_BUILD_CMD = setup.py build +$(2)_BASE_INSTALL_CMD = setup.py install $$(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) endif else $$(error "Invalid $(2)_SETUP_TYPE. Valid options are 'distutils' or 'setuptools'") @@ -186,8 +186,8 @@ ifndef $(2)_BUILD_CMDS define $(2)_BUILD_CMDS (cd $$($$(PKG)_BUILDDIR)/; \ $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ - $$($(2)_PYTHON_INTERPRETER) setup.py \ - $$($$(PKG)_BASE_BUILD_TGT) \ + $$($(2)_PYTHON_INTERPRETER) \ + $$($$(PKG)_BASE_BUILD_CMD) \ $$($$(PKG)_BASE_BUILD_OPTS) $$($$(PKG)_BUILD_OPTS)) endef endif @@ -200,8 +200,9 @@ ifndef $(2)_INSTALL_CMDS define $(2)_INSTALL_CMDS (cd $$($$(PKG)_BUILDDIR)/; \ $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ - $$($(2)_PYTHON_INTERPRETER) setup.py install \ - $$($$(PKG)_BASE_INSTALL_OPTS) $$($$(PKG)_INSTALL_OPTS)) + $$($(2)_PYTHON_INTERPRETER) \ + $$($$(PKG)_BASE_INSTALL_CMD) \ + $$($$(PKG)_INSTALL_OPTS)) endef endif @@ -213,8 +214,8 @@ ifndef $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS (cd $$($$(PKG)_BUILDDIR)/; \ $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ - $$($(2)_PYTHON_INTERPRETER) setup.py install --no-compile \ - $$($$(PKG)_BASE_INSTALL_TARGET_OPTS) \ + $$($(2)_PYTHON_INTERPRETER) \ + $$($$(PKG)_BASE_INSTALL_TARGET_CMD) \ $$($$(PKG)_INSTALL_TARGET_OPTS)) endef endif @@ -227,8 +228,8 @@ ifndef $(2)_INSTALL_STAGING_CMDS define $(2)_INSTALL_STAGING_CMDS (cd $$($$(PKG)_BUILDDIR)/; \ $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ - $$($(2)_PYTHON_INTERPRETER) setup.py install \ - $$($$(PKG)_BASE_INSTALL_STAGING_OPTS) \ + $$($(2)_PYTHON_INTERPRETER) \ + $$($$(PKG)_BASE_INSTALL_STAGING_CMD) \ $$($$(PKG)_INSTALL_STAGING_OPTS)) endef endif From arnout at mind.be Wed Feb 16 21:16:43 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 16 Feb 2022 22:16:43 +0100 Subject: [Buildroot] [git commit branch/next] package/python-flit-core: new package/infrastructure Message-ID: <20220216211511.417578359D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=29a12eb86aee706082f344a25d2e563984b9aa1a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next 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 [Arnout: - fix indentation in pkg-python.mk (tabs, not spaces); - use the new _CMD variables instead of duplicating the entire _CMDS definitions; - no need to filter dependencies (they're not self-referencing); - _NEEDS_HOST_PYTHON no longer exists; - host-python-pypa-build gets added to DEPENDENCIES automatically. ] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/pkg-python.mk | 59 +++++++++++++++- ...t-version-parser-for-multiple-assignments.patch | 80 ++++++++++++++++++++++ package/python-flit-core/python-flit-core.hash | 3 + package/python-flit-core/python-flit-core.mk | 13 ++++ support/scripts/pyinstaller.py | 69 +++++++++++++++++++ 5 files changed, 223 insertions(+), 1 deletion(-) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 61f0dd6ec2..0c5577362f 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -103,6 +103,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="$(PYTHON3_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 @@ -152,8 +193,19 @@ $(2)_BASE_ENV = $$(HOST_PKG_PYTHON_SETUPTOOLS_ENV) $(2)_BASE_BUILD_CMD = setup.py build $(2)_BASE_INSTALL_CMD = setup.py install $$(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_CMD = -m build -n -w +$(2)_BASE_INSTALL_TARGET_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS) +$(2)_BASE_INSTALL_STAGING_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS) +else +$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_PEP517_ENV) +$(2)_BASE_BUILD_CMD = -m build -n -w +$(2)_BASE_INSTALL_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(HOST_PKG_PYTHON_PEP517_INSTALL_OPTS) +endif else -$$(error "Invalid $(2)_SETUP_TYPE. Valid options are 'distutils' or 'setuptools'") +$$(error "Invalid $(2)_SETUP_TYPE. Valid options are 'distutils', 'setuptools', 'pep517' or 'flit'.") endif # Target packages need both the python interpreter on the target (for @@ -172,6 +224,11 @@ endif # ($(4),target) # ifeq ($$($(2)_SETUP_TYPE),setuptools) $(2)_DEPENDENCIES += $$(if $$(filter host-python-setuptools,$(1)),,host-python-setuptools) +else ifneq ($$(filter flit pep517,$$($(2)_SETUP_TYPE)),) +$(2)_DEPENDENCIES += host-python-pypa-build host-python-installer +ifeq ($$($(2)_SETUP_TYPE),flit) +$(2)_DEPENDENCIES += host-python-flit-core +endif endif # SETUP_TYPE # Python interpreter to use for building the package. 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..8971223d1f --- /dev/null +++ b/package/python-flit-core/python-flit-core.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# 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_LICENSE = BSD-3-Clause +PYTHON_FLIT_CORE_SETUP_TYPE = pep517 + +$(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() From arnout at mind.be Wed Feb 16 21:27:24 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 16 Feb 2022 22:27:24 +0100 Subject: [Buildroot] [git commit] utils/docker-run: improve user experience Message-ID: <20220216212132.72E8783731@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7f2020f9040fe2378c2797bfa256f77d118be372 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Currently, the docker-run script starts a container based on the reference image, in which the user has UID:GID set to 1000:1000, which may or may not be the same as local user uses, which may prevent the commands in the container from creating files, which foils the plan of using the container to run a build... Additionally, the paths in the container differ from the paths the user expects, as the current Buildroot tree is mounted over the in-container user home directory. This is a bit confusing... Finally, the container is left hanging around after the command finishes, and thus there are as many lingering containers as the user runs docker-run. This is not very nice... We fix all of that (yeah, should be different patches, but meh): - we use --mount instead of -v, which allows us to bind-mount the Buildroot tree at the same place in the container, as Docker will create the destination if it does not exist, while -v seems to expect it to exist [0]. - as a consequence, we can also set the working directory as the Buildroot top-directory; - use --user to force the same UID:GID in the container as the local user, so that files created in the container belong to the local user, and so that files from the local user are accessible from the container; - use --rm to remove the container once it terminates; starting a new container is very quick anyway, so it is as good as re-using a previous container. [0] the documentation is not clear about that. It clearly states that the host directory (i.e. the origin, the source) is created if missing, but it says nothing of the destination: https://docs.docker.com/engine/reference/commandline/run/#mount-volume--v---read-only Signed-off-by: Yann E. MORIN Cc: Luca Ceresoli Cc: Giulio Benetti Cc: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti Reviewed-by: Luca Ceresoli Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- utils/docker-run | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/utils/docker-run b/utils/docker-run index 2bca8d8e3a..bdbc979264 100755 --- a/utils/docker-run +++ b/utils/docker-run @@ -7,4 +7,8 @@ IMAGE=$(grep ^image: "${MAIN_DIR}/.gitlab-ci.yml" | \ sed -e 's,^image: ,,g' | sed -e 's,\$CI_REGISTRY,registry.gitlab.com,g') set -x -exec docker run -v "${MAIN_DIR}:/home/br-user" -it "${IMAGE}" "$@" +exec docker run -it --rm \ + --user $(id -u):$(id -g) \ + --mount "type=bind,src=${MAIN_DIR},dst=${MAIN_DIR}" \ + --workdir "${MAIN_DIR}" \ + "${IMAGE}" "${@}" From arnout at mind.be Wed Feb 16 21:33:40 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 16 Feb 2022 22:33:40 +0100 Subject: [Buildroot] [PATCH] utils/docker-run: improve user experience In-Reply-To: <20220214203909.251924-1-yann.morin.1998@free.fr> References: <20220214203909.251924-1-yann.morin.1998@free.fr> Message-ID: <560f93f2-ed19-309b-7d90-84213a3b75ed@mind.be> On 14/02/2022 21:39, Yann E. MORIN wrote: > Currently, the docker-run script starts a container based on the > reference image, in which the user has UID:GID set to 1000:1000, > which may or may not be the same as local user uses, which may > prevent the commands in the container from creating files, which > foils the plan of using the container to run a build... > > Additionally, the paths in the container differ from the paths > the user expects, as the current Buildroot tree is mounted over > the in-container user home directory. This is a bit confusing... > > Finally, the container is left hanging around after the command > finishes, and thus there are as many lingering containers as the > user runs docker-run. This is not very nice... > > We fix all of that (yeah, should be different patches, but meh): > > - we use --mount instead of -v, which allows us to bind-mount > the Buildroot tree at the same place in the container, as > Docker will create the destination if it does not exist, while > -v seems to expect it to exist [0]. > > - as a consequence, we can also set the working directory as the > Buildroot top-directory; > > - use --user to force the same UID:GID in the container as the > local user, so that files created in the container belong to > the local user, and so that files from the local user are > accessible from the container; > > - use --rm do remove the container once it terminates; starting > a new container is very quick anyway, so it is as good as > re-using a previous container. > > [0] the documentation is not clear about that. It clearly states > that the host directory (i.e. the origin, the source) is created > if missing, but it says nothing of the destination: > https://docs.docker.com/engine/reference/commandline/run/#mount-volume--v---read-only > > Signed-off-by: Yann E. MORIN > Cc: Luca Ceresoli > Cc: Giulio Benetti > Cc: Arnout Vandecappelle (Essensium/Mind) Applied to master with the typo fixed, thanks. Regards, Arnout > --- > utils/docker-run | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/utils/docker-run b/utils/docker-run > index 2bca8d8e3a..bdbc979264 100755 > --- a/utils/docker-run > +++ b/utils/docker-run > @@ -7,4 +7,8 @@ IMAGE=$(grep ^image: "${MAIN_DIR}/.gitlab-ci.yml" | \ > sed -e 's,^image: ,,g' | sed -e 's,\$CI_REGISTRY,registry.gitlab.com,g') > > set -x > -exec docker run -v "${MAIN_DIR}:/home/br-user" -it "${IMAGE}" "$@" > +exec docker run -it --rm \ > + --user $(id -u):$(id -g) \ > + --mount "type=bind,src=${MAIN_DIR},dst=${MAIN_DIR}" \ > + --workdir "${MAIN_DIR}" \ > + "${IMAGE}" "${@}" From arnout at mind.be Wed Feb 16 21:45:49 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 16 Feb 2022 22:45:49 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/kodi: fix build with python-3.10 In-Reply-To: <20220213114721.2738803-1-bernd.kuhls@t-online.de> References: <20220213114721.2738803-1-bernd.kuhls@t-online.de> Message-ID: <19383fee-9cb4-8a75-2d65-79b5796bc5a1@mind.be> On 13/02/2022 12:47, Bernd Kuhls wrote: > Fixes build error: > > CMake Error at /usr/share/cmake-3.18/Modules/FindPackageHandleStandardArgs.cmake:165 (message): > Could NOT find PythonLibs (missing: PYTHON_LIBRARIES) (found suitable > version "3.10.2", minimum required is "3.5") > > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Arnout > --- > v2: fixed typo in PYTHON_EXECUTABLE configure option (usr/bin/ -> bin/) > > package/kodi/0002-cmake-findpython.patch | 135 ++++++++++++++++++ > ...-cmake-search-for-python-interpreter.patch | 48 +++++++ > ...-allow-to-override-PYTHON_EXECUTABLE.patch | 39 +++++ > package/kodi/kodi.mk | 4 + > 4 files changed, 226 insertions(+) > create mode 100644 package/kodi/0002-cmake-findpython.patch > create mode 100644 package/kodi/0003-cmake-search-for-python-interpreter.patch > create mode 100644 package/kodi/0004-cmake-allow-to-override-PYTHON_EXECUTABLE.patch > > diff --git a/package/kodi/0002-cmake-findpython.patch b/package/kodi/0002-cmake-findpython.patch > new file mode 100644 > index 0000000000..60728aa465 > --- /dev/null > +++ b/package/kodi/0002-cmake-findpython.patch > @@ -0,0 +1,135 @@ > +From 52f44ec5c7b728a6afaca867e8d815fced2012ec Mon Sep 17 00:00:00 2001 > +From: fuzzard > +Date: Sat, 31 Jul 2021 19:22:08 +1000 > +Subject: [PATCH] [cmake] findpython > + > +use cmakes (3.12+) FindPython3 module. > +Provide cmake vars for user to overide specific version, and search path > + > +Backport of https://github.com/xbmc/xbmc/pull/20045 > + > +Patch sent upstream: https://github.com/xbmc/xbmc/pull/20989 > + > +Signed-off-by: Bernd Kuhls > +--- > + CMakeLists.txt | 4 +- > + cmake/modules/FindPython.cmake | 71 ++++++++++++++++++++++++++-------- > + 2 files changed, 56 insertions(+), 19 deletions(-) > + > +diff --git a/CMakeLists.txt b/CMakeLists.txt > +index 2d5369798d..9bed54ef40 100644 > +--- a/CMakeLists.txt > ++++ b/CMakeLists.txt > +@@ -1,4 +1,4 @@ > +-cmake_minimum_required(VERSION 3.4) > ++cmake_minimum_required(VERSION 3.12) > + if(WIN32) > + # Version 3.15 is required to use "PREPEND" for dependencies > + cmake_minimum_required(VERSION 3.15) > +@@ -187,8 +187,6 @@ core_require_dep(${required_deps}) > + find_package(TexturePacker REQUIRED) > + find_package(JsonSchemaBuilder REQUIRED) > + > +-SET(PYTHON_VERSION 3.8) > +- > + if(ENABLE_MARIADBCLIENT AND NOT ENABLE_MARIADBCLIENT STREQUAL AUTO AND ENABLE_MYSQLCLIENT AND NOT ENABLE_MYSQLCLIENT STREQUAL AUTO) > + MESSAGE(FATAL_ERROR "You can not use MySql and MariaDB at the same time. Disable one by adding -DENABLE_MYSQLCLIENT=OFF or -DENABLE_MARIADBCLIENT=OFF.") > + elseif(ENABLE_MYSQLCLIENT AND NOT ENABLE_MYSQLCLIENT STREQUAL AUTO) > +diff --git a/cmake/modules/FindPython.cmake b/cmake/modules/FindPython.cmake > +index c40e12d551..35220b5426 100644 > +--- a/cmake/modules/FindPython.cmake > ++++ b/cmake/modules/FindPython.cmake > +@@ -1,17 +1,56 @@ > +-# - Try to find python > +-# Once done this will define > ++# FindPython > ++# -------- > ++# Finds Python3 libraries > ++# > ++# This module will search for the required python libraries on the system > ++# If multiple versions are found, the highest version will be used. > ++# > ++# -------- > ++# > ++# the following variables influence behaviour: > ++# > ++# PYTHON_PATH - use external python not found in system paths > ++# usage: -DPYTHON_PATH=/path/to/python/lib > ++# PYTHON_VER - use exact python version, fail if not found > ++# usage: -DPYTHON_VER=3.8 > ++# > ++# -------- > ++# > ++# This module will define the following variables: > + # > + # PYTHON_FOUND - system has PYTHON > ++# PYTHON_VERSION - Python version number (Major.Minor) > + # PYTHON_INCLUDE_DIRS - the python include directory > + # PYTHON_LIBRARIES - The python libraries > ++# PYTHON_LDFLAGS - Python provided link options > ++# > ++# -------- > ++# > ++ > ++# for Depends builds, set search root dir to depends path > ++if(KODI_DEPENDSBUILD) > ++ set(Python3_USE_STATIC_LIBS TRUE) > ++ set(Python3_ROOT_DIR ${DEPENDS_PATH}/lib) > ++endif() > ++ > ++# Provide root dir to search for Python if provided > ++if(PYTHON_PATH) > ++ set(Python3_ROOT_DIR ${PYTHON_PATH}) > ++ > ++ # unset cache var so we can generate again with a different dir (or none) if desired > ++ unset(PYTHON_PATH CACHE) > ++endif() > ++ > ++# Set specific version of Python to find if provided > ++if(PYTHON_VER) > ++ set(VERSION ${PYTHON_VER}) > ++ set(EXACT_VER "EXACT") > + > +-if(PKG_CONFIG_FOUND) > +- pkg_check_modules(PC_PYTHON python3>=3.5 QUIET) > ++ # unset cache var so we can generate again with a different ver (or none) if desired > ++ unset(PYTHON_VER CACHE) > + endif() > + > +-find_program(PYTHON_EXECUTABLE python3 ONLY_CMAKE_FIND_ROOT_PATH) > +-find_library(PYTHON_LIBRARY NAMES python3.9 python3.8 python3.7 python3.6 python3.5 PATHS ${PC_PYTHON_LIBDIR}) > +-find_path(PYTHON_INCLUDE_DIR NAMES Python.h PATHS ${PC_PYTHON_INCLUDE_DIRS} PATH_SUFFIXES python3.9 python3.8 python3.7 python3.6 python3.5) > ++find_package(Python3 ${VERSION} ${EXACT_VER} COMPONENTS Development) > + > + if(KODI_DEPENDSBUILD) > + find_library(FFI_LIBRARY ffi REQUIRED) > +@@ -27,17 +66,17 @@ if(KODI_DEPENDSBUILD) > + endif() > + endif() > + > +- set(PYTHON_LIBRARIES ${PYTHON_LIBRARY} ${FFI_LIBRARY} ${EXPAT_LIBRARY} ${INTL_LIBRARY} ${GMP_LIBRARY} ${PYTHON_DEP_LIBRARIES}) > +-else() > +- find_package(PythonLibs 3.5 REQUIRED) > +- list(APPEND PYTHON_LIBRARIES ${PC_PYTHON_STATIC_LIBRARIES}) > ++ list(APPEND Python3_LIBRARIES ${FFI_LIBRARY} ${EXPAT_LIBRARY} ${INTL_LIBRARY} ${GMP_LIBRARY} ${PYTHON_DEP_LIBRARIES}) > + endif() > + > +-include(FindPackageHandleStandardArgs) > +-find_package_handle_standard_args(Python REQUIRED_VARS PYTHON_INCLUDE_DIR PYTHON_LIBRARY PYTHON_LIBRARIES) > +-if(PYTHON_FOUND) > +- set(PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_DIR}) > ++if(Python3_FOUND) > + list(APPEND PYTHON_DEFINITIONS -DHAS_PYTHON=1) > ++ # These are all set for easy integration with the rest of our build system > ++ set(PYTHON_FOUND ${Python3_FOUND}) > ++ set(PYTHON_INCLUDE_DIRS ${Python3_INCLUDE_DIRS}) > ++ set(PYTHON_LIBRARIES ${Python3_LIBRARIES}) > ++ set(PYTHON_VERSION "${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}" CACHE INTERNAL "" FORCE) > ++ set(PYTHON_LDFLAGS ${Python3_LINK_OPTIONS}) > + endif() > + > +-mark_as_advanced(PYTHON_EXECUTABLE PYTHON_INCLUDE_DIRS PYTHON_INCLUDE_DIR PYTHON_LIBRARY PYTHON_LIBRARIES PYTHON_LDFLAGS FFI_LIBRARY EXPAT_LIBRARY INTL_LIBRARY GMP_LIBRARY) > ++mark_as_advanced(PYTHON_EXECUTABLE PYTHON_VERSION PYTHON_INCLUDE_DIRS PYTHON_LDFLAGS FFI_LIBRARY EXPAT_LIBRARY INTL_LIBRARY GMP_LIBRARY) > +-- > +2.30.2 > + > diff --git a/package/kodi/0003-cmake-search-for-python-interpreter.patch b/package/kodi/0003-cmake-search-for-python-interpreter.patch > new file mode 100644 > index 0000000000..158345a212 > --- /dev/null > +++ b/package/kodi/0003-cmake-search-for-python-interpreter.patch > @@ -0,0 +1,48 @@ > +From 6bb112e585f2ffd10e5af70ca28159dd235d063b Mon Sep 17 00:00:00 2001 > +From: wsnipex > +Date: Thu, 19 Aug 2021 08:50:05 +0200 > +Subject: [PATCH] [cmake] search for python interpreter fixes installing > + eventclients on linux > + > +Backport of https://github.com/xbmc/xbmc/pull/20058 > + > +Patch sent upstream: https://github.com/xbmc/xbmc/pull/20989 > + > +Signed-off-by: Bernd Kuhls > +--- > + cmake/modules/FindPython.cmake | 5 +++++ > + 1 file changed, 5 insertions(+) > + > +diff --git a/cmake/modules/FindPython.cmake b/cmake/modules/FindPython.cmake > +index 35220b5426..c469ed9fb6 100644 > +--- a/cmake/modules/FindPython.cmake > ++++ b/cmake/modules/FindPython.cmake > +@@ -20,6 +20,7 @@ > + # > + # PYTHON_FOUND - system has PYTHON > + # PYTHON_VERSION - Python version number (Major.Minor) > ++# PYTHON_EXECUTABLE - Python interpreter binary > + # PYTHON_INCLUDE_DIRS - the python include directory > + # PYTHON_LIBRARIES - The python libraries > + # PYTHON_LDFLAGS - Python provided link options > +@@ -51,6 +52,9 @@ if(PYTHON_VER) > + endif() > + > + find_package(Python3 ${VERSION} ${EXACT_VER} COMPONENTS Development) > ++if(CORE_SYSTEM_NAME STREQUAL linux) > ++ find_package(Python3 ${VERSION} ${EXACT_VER} COMPONENTS Interpreter) > ++endif() > + > + if(KODI_DEPENDSBUILD) > + find_library(FFI_LIBRARY ffi REQUIRED) > +@@ -73,6 +77,7 @@ if(Python3_FOUND) > + list(APPEND PYTHON_DEFINITIONS -DHAS_PYTHON=1) > + # These are all set for easy integration with the rest of our build system > + set(PYTHON_FOUND ${Python3_FOUND}) > ++ set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE} CACHE FILEPATH "Python interpreter" FORCE) > + set(PYTHON_INCLUDE_DIRS ${Python3_INCLUDE_DIRS}) > + set(PYTHON_LIBRARIES ${Python3_LIBRARIES}) > + set(PYTHON_VERSION "${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}" CACHE INTERNAL "" FORCE) > +-- > +2.30.2 > + > diff --git a/package/kodi/0004-cmake-allow-to-override-PYTHON_EXECUTABLE.patch b/package/kodi/0004-cmake-allow-to-override-PYTHON_EXECUTABLE.patch > new file mode 100644 > index 0000000000..d1e9b3f25f > --- /dev/null > +++ b/package/kodi/0004-cmake-allow-to-override-PYTHON_EXECUTABLE.patch > @@ -0,0 +1,39 @@ > +From 25681d8adde4a90d5da02051e30f6a3a27322136 Mon Sep 17 00:00:00 2001 > +From: Jernej Skrabec > +Date: Sat, 25 Sep 2021 07:41:10 +0200 > +Subject: [PATCH] [cmake] allow to override PYTHON_EXECUTABLE > + > +If Kodi is being build for distro which has different python version > +than host, PYTHON_EXECUTABLE must be overriden and point to distro > +version. Otherwise, eventclients will be installed in wrong location and > +be thus unusable. > + > +Use case: Cross compiling Kodi for LibreELEC > + > +Backport of https://github.com/xbmc/xbmc/pull/20171 > + > +Patch sent upstream: https://github.com/xbmc/xbmc/pull/20989 > + > +Signed-off-by: Bernd Kuhls > +--- > + cmake/modules/FindPython.cmake | 4 +++- > + 1 file changed, 3 insertions(+), 1 deletion(-) > + > +diff --git a/cmake/modules/FindPython.cmake b/cmake/modules/FindPython.cmake > +index c469ed9fb6..87b8368705 100644 > +--- a/cmake/modules/FindPython.cmake > ++++ b/cmake/modules/FindPython.cmake > +@@ -77,7 +77,9 @@ if(Python3_FOUND) > + list(APPEND PYTHON_DEFINITIONS -DHAS_PYTHON=1) > + # These are all set for easy integration with the rest of our build system > + set(PYTHON_FOUND ${Python3_FOUND}) > +- set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE} CACHE FILEPATH "Python interpreter" FORCE) > ++ if(NOT PYTHON_EXECUTABLE) > ++ set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE} CACHE FILEPATH "Python interpreter" FORCE) > ++ endif() > + set(PYTHON_INCLUDE_DIRS ${Python3_INCLUDE_DIRS}) > + set(PYTHON_LIBRARIES ${Python3_LIBRARIES}) > + set(PYTHON_VERSION "${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}" CACHE INTERNAL "" FORCE) > +-- > +2.30.2 > + > diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk > index 646c6e0ab4..56e901fa17 100644 > --- a/package/kodi/kodi.mk > +++ b/package/kodi/kodi.mk > @@ -76,6 +76,10 @@ KODI_CONF_OPTS += \ > -DNATIVEPREFIX=$(HOST_DIR) \ > -DDEPENDS_PATH=$(STAGING_DIR)/usr \ > -DENABLE_TESTING=OFF \ > + -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python \ > + -DPYTHON_INCLUDE_DIRS=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ > + -DPYTHON_PATH=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR) \ > + -DPYTHON_VER=$(PYTHON3_VERSION_MAJOR) \ > -DWITH_JSONSCHEMABUILDER=$(HOST_DIR)/bin/JsonSchemaBuilder \ > -DWITH_TEXTUREPACKER=$(HOST_DIR)/bin/TexturePacker \ > -DLIBDVDCSS_URL=$(KODI_DL_DIR)/kodi-libdvdcss-$(KODI_LIBDVDCSS_VERSION).tar.gz \ From arnout at mind.be Wed Feb 16 21:46:09 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 16 Feb 2022 22:46:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/libbpf: add LIBBPF_CPE_ID_VENDOR In-Reply-To: <20220213114214.1057171-1-fontaine.fabrice@gmail.com> References: <20220213114214.1057171-1-fontaine.fabrice@gmail.com> Message-ID: <1f433a35-86f3-adad-564b-81660ecd6c06@mind.be> On 13/02/2022 12:42, Fabrice Fontaine wrote: > cpe:2.3:a:libbpf_project:libbpf is a valid CPE identifier for this > package: > > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Alibbpf_project%3Alibbpf > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/libbpf/libbpf.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/libbpf/libbpf.mk b/package/libbpf/libbpf.mk > index 6750b063c0..06f3f3475a 100644 > --- a/package/libbpf/libbpf.mk > +++ b/package/libbpf/libbpf.mk > @@ -8,6 +8,7 @@ LIBBPF_VERSION = 0.6.1 > LIBBPF_SITE = $(call github,libbpf,libbpf,v$(LIBBPF_VERSION)) > LIBBPF_LICENSE = GPL-2.0, LGPL-2.1, BSD-2-Clause > LIBBPF_LICENSE_FILES = LICENSE LICENSE.BSD-2-Clause LICENSE.LGPL-2.1 > +LIBBPF_CPE_ID_VENDOR = libbpf_project > LIBBPF_DEPENDENCIES = host-bison host-flex host-pkgconf elfutils zlib > LIBBPF_INSTALL_STAGING = YES > From arnout at mind.be Wed Feb 16 21:47:09 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 16 Feb 2022 22:47:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/strongswan: security bump to version 5.9.5 In-Reply-To: <20220213113332.1056370-1-fontaine.fabrice@gmail.com> References: <20220213113332.1056370-1-fontaine.fabrice@gmail.com> Message-ID: <97333186-45ec-e81f-8562-266da9fe3230@mind.be> On 13/02/2022 12:33, Fabrice Fontaine wrote: > Fixed a vulnerability in the EAP client implementation that was caused > by incorrectly handling early EAP-Success messages. It may allow to > bypass the client and in some scenarios even the server authentication, > or could lead to a denial-of-service attack. This vulnerability has been > registered as CVE-2021-45079: > https://www.strongswan.org/blog/2022/01/24/strongswan-vulnerability-(cve-2021-45079).html > > https://github.com/strongswan/strongswan/releases/tag/5.9.5 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/strongswan/strongswan.hash | 6 +++--- > package/strongswan/strongswan.mk | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/strongswan/strongswan.hash b/package/strongswan/strongswan.hash > index 69b3547f91..aca7ddf5cd 100644 > --- a/package/strongswan/strongswan.hash > +++ b/package/strongswan/strongswan.hash > @@ -1,7 +1,7 @@ > -# From http://download.strongswan.org/strongswan-5.9.4.tar.bz2.md5 > -md5 9c387eb77f0159fdefbcf7e81c905c35 strongswan-5.9.4.tar.bz2 > +# From http://download.strongswan.org/strongswan-5.9.5.tar.bz2.md5 > +md5 53005324e3cba8592f1fb958b1c2d0e5 strongswan-5.9.5.tar.bz2 > # Calculated based on the hash above > -sha256 45fdf1a4c2af086d8ff5b76fd7b21d3b6f0890f365f83bf4c9a75dda26887518 strongswan-5.9.4.tar.bz2 > +sha256 983e4ef4a4c6c9d69f5fe6707c7fe0b2b9a9291943bbf4e008faab6bf91c0bdd strongswan-5.9.5.tar.bz2 > # Locally calculated > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > sha256 2292e21797754548dccdef9eef6aee7584e552fbd890fa914e1de8d3577d23f0 LICENSE > diff --git a/package/strongswan/strongswan.mk b/package/strongswan/strongswan.mk > index 2891e5aa5e..95079aceb3 100644 > --- a/package/strongswan/strongswan.mk > +++ b/package/strongswan/strongswan.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -STRONGSWAN_VERSION = 5.9.4 > +STRONGSWAN_VERSION = 5.9.5 > STRONGSWAN_SOURCE = strongswan-$(STRONGSWAN_VERSION).tar.bz2 > STRONGSWAN_SITE = http://download.strongswan.org > STRONGSWAN_LICENSE = GPL-2.0+ From arnout at mind.be Wed Feb 16 21:47:22 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 16 Feb 2022 22:47:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/safeclib: fix build with gcc 4.8 In-Reply-To: <20220213112025.979418-1-fontaine.fabrice@gmail.com> References: <20220213112025.979418-1-fontaine.fabrice@gmail.com> Message-ID: <155125a2-2bad-5ebc-e080-276729f1a179@mind.be> On 13/02/2022 12:20, Fabrice Fontaine wrote: > Add -std=c99 to fix the following build failure with gcc 4.8 raised > since bump to version 3.7.1 in commit > cc27267ae41bf44276c63b1e86042c4fae4adf50: > > In file included from abort_handler_s.c:35:0: > safeclib_private.h:167:18: error: anonymous variadic macros were introduced in C99 [-Werror=variadic-macros] > #define slprintf(...) fprintf(stderr, __VA_ARGS__) > ^ > > Fixes: > - http://autobuild.buildroot.org/results/5c3468585942879b47331e05058d25d324c8cc23 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/safeclib/safeclib.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/safeclib/safeclib.mk b/package/safeclib/safeclib.mk > index 91b3e26c68..bc58c1a38c 100644 > --- a/package/safeclib/safeclib.mk > +++ b/package/safeclib/safeclib.mk > @@ -11,6 +11,7 @@ SAFECLIB_SOURCE = safeclib-$(SAFECLIB_VERSION).tar.xz > SAFECLIB_LICENSE = MIT > SAFECLIB_LICENSE_FILES = COPYING > SAFECLIB_INSTALL_STAGING = YES > +SAFECLIB_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=c99" > # -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 From arnout at mind.be Wed Feb 16 21:47:39 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 16 Feb 2022 22:47:39 +0100 Subject: [Buildroot] [PATCH] support/pkg-stats: fix regression after cleanup in show-info In-Reply-To: <20220212184155.4188927-1-yann.morin.1998@free.fr> References: <20220212184155.4188927-1-yann.morin.1998@free.fr> Message-ID: On 12/02/2022 19:41, Yann E. MORIN wrote: > Commit 471ecea5eeb0 (core/show-info: 'name' only applies to packages) > removed the 'name' field for rootfs (really, for non-package) entries, > thus breaking the pkg-stats processing. > > We fix that by excluding any entry that has no 'name', on the assumption > that if it has no name, it is not a package. > > Reported-by: Xogium on IRC > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni Applied to master, thanks. Regards, Arnout > --- > support/scripts/pkg-stats | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats > index abd36a3dd5..c235d99407 100755 > --- a/support/scripts/pkg-stats > +++ b/support/scripts/pkg-stats > @@ -371,7 +371,7 @@ def get_pkglist(npackages, package_list): > def get_config_packages(): > cmd = ["make", "--no-print-directory", "show-info"] > js = json.loads(subprocess.check_output(cmd)) > - return set([v["name"] for v in js.values()]) > + return set([v["name"] for v in js.values() if 'name' in v]) > > > def package_init_make_info(): From arnout at mind.be Wed Feb 16 21:48:07 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 16 Feb 2022 22:48:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/gstreamer1/gst1-plugins-base: fix build with gcc 4.8 In-Reply-To: <20220211211207.762485-1-fontaine.fabrice@gmail.com> References: <20220211211207.762485-1-fontaine.fabrice@gmail.com> Message-ID: <56cdb416-0228-67f6-0690-65800a6b230f@mind.be> On 11/02/2022 22:12, Fabrice Fontaine wrote: > Fix the following build failure with gcc 4.8 raised since bump to > version 1.20.0 in commit 801131157dcef2c97e947a1d3e8c9bfa7aa3d870: > > ../gst-libs/gst/video/video-converter.c: In function 'convert_I420_v210': > ../gst-libs/gst/video/video-converter.c:3771:7: error: 'for' loop initial declarations are only allowed in C99 mode > for (int j = width * 4 - 1; j >= 0; j--) { > ^ > > Fixes: > - http://autobuild.buildroot.org/results/c4b1449f35debcbabff7e42abe239695d4ad4d21 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk > index 68281738fa..08aac850cd 100644 > --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk > +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk > @@ -11,6 +11,8 @@ GST1_PLUGINS_BASE_INSTALL_STAGING = YES > GST1_PLUGINS_BASE_LICENSE_FILES = COPYING > GST1_PLUGINS_BASE_LICENSE = LGPL-2.1+ > > +GST1_PLUGINS_BASE_CFLAGS = $(TARGET_CFLAGS) -std=gnu99 > + > GST1_PLUGINS_BASE_CONF_OPTS = \ > -Dexamples=disabled \ > -Dtests=disabled \ From arnout at mind.be Wed Feb 16 21:48:38 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 16 Feb 2022 22:48:38 +0100 Subject: [Buildroot] [PATCH 1/3] package/sdl2_ttf: drop FREETYPE_CONFIG In-Reply-To: <20220209191329.201362-1-fontaine.fabrice@gmail.com> References: <20220209191329.201362-1-fontaine.fabrice@gmail.com> Message-ID: <1b5cf8df-9b0e-42ba-5048-65e37368e2a9@mind.be> On 09/02/2022 20:13, Fabrice Fontaine wrote: > FREETYPE_CONFIG is not used since version 2.0.15 and > https://github.com/libsdl-org/SDL_ttf/commit/50d72e55315e25d34f4209824275e3b1cbe6c6f8 > > Signed-off-by: Fabrice Fontaine All 3 applied to master, thanks. Regards, Arnout > --- > package/sdl2_ttf/sdl2_ttf.mk | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/package/sdl2_ttf/sdl2_ttf.mk b/package/sdl2_ttf/sdl2_ttf.mk > index 1fe7c0a075..3b2b35e157 100644 > --- a/package/sdl2_ttf/sdl2_ttf.mk > +++ b/package/sdl2_ttf/sdl2_ttf.mk > @@ -12,9 +12,6 @@ SDL2_TTF_LICENSE_FILES = COPYING.txt > SDL2_TTF_INSTALL_STAGING = YES > SDL2_TTF_DEPENDENCIES = sdl2 freetype host-pkgconf > > -SDL2_TTF_CONF_ENV = \ > - FREETYPE_CONFIG=$(STAGING_DIR)/usr/bin/freetype-config > - > # x-includes and x-libraries must be set for cross-compiling > # By default x_includes and x_libraries contains unsafe paths. > # (/usr/include and /usr/lib) From arnout at mind.be Wed Feb 16 21:48:54 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 16 Feb 2022 22:48:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/sudo: drop openssl workaround In-Reply-To: <20220208205232.16362-1-fontaine.fabrice@gmail.com> References: <20220208205232.16362-1-fontaine.fabrice@gmail.com> Message-ID: On 08/02/2022 21:52, Fabrice Fontaine wrote: > Drop workaround added by commit bf899e50d89439b1a1bdf22bc933075958ffc108 > because sudo natively supports pkg-config for searching openssl (which > is enabled by default) since version 1.9.2 and > https://github.com/sudo-project/sudo/commit/4cadd549513ef35d4d740e941576294f4491d13d > > As a side-effect, this will fix the following build failure when openssl > is not installed on host (as LIBS is set before AX_PROG_CC_FOR_BUILD): > > configure:8162: checking whether the C compiler works > configure:8184: /usr/bin/gcc -O2 -I/home/buildroot/autobuild/instance-2/output-1/host/include -I/home/buildroot/autobuild/instance-2/output-1/host/include -L/home/buildroot/autobuild/instance-2/output-1/host/lib -Wl,-rpath,/home/buildroot/autobuild/instance-2/output-1/host/lib conftest.c -L/home/buildroot/autobuild/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib -lssl -L/home/buildroot/autobuild/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib -pthread -latomic -lcrypto -pthread -latomic >&5 > /usr/bin/ld: skipping incompatible /home/buildroot/autobuild/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libssl.a when searching for -lssl > /usr/bin/ld: skipping incompatible /home/buildroot/autobuild/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libssl.a when searching for -lssl > /usr/bin/ld: cannot find -lssl > > Fixes: > - http://autobuild.buildroot.org/results/7a5d4dd22343be46a5ddd1c1a1a8e1799517d564 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/sudo/sudo.mk | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk > index f2c074e55f..a752217123 100644 > --- a/package/sudo/sudo.mk > +++ b/package/sudo/sudo.mk > @@ -45,17 +45,17 @@ endif > ifeq ($(BR2_PACKAGE_OPENLDAP),y) > SUDO_DEPENDENCIES += openldap > SUDO_CONF_OPTS += --with-ldap > -# If we are building sudo statically and openldap was linked with openssl, then > -# when we link sudo with openldap we need to specify the openssl libs, otherwise > -# it will fail with "undefined reference" errors. > -ifeq ($(BR2_STATIC_LIBS)$(BR2_PACKAGE_OPENSSL),yy) > -SUDO_DEPENDENCIES += host-pkgconf > -SUDO_CONF_ENV += LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs libssl libcrypto`" > -endif > else > SUDO_CONF_OPTS += --without-ldap > endif > > +ifeq ($(BR2_PACKAGE_OPENSSL),y) > +SUDO_DEPENDENCIES += host-pkgconf openssl > +SUDO_CONF_OPTS += --enable-openssl > +else > +SUDO_CONF_OPTS += --disable-openssl > +endif > + > # mksigname/mksiglist needs to run on build host to generate source files > define SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST > $(MAKE) $(HOST_CONFIGURE_OPTS) \ From arnout at mind.be Wed Feb 16 21:38:01 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 16 Feb 2022 22:38:01 +0100 Subject: [Buildroot] [git commit] package/sdl2_ttf: disable builtin freetype2 Message-ID: <20220216214135.3D37983778@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=81636b1ea14a423eac3145413dcf7200a8f1edd7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Disable builtin freetype2 which is enabled by default since bump to version 2.0.18 in commit f4da031a77f200515bcc5b2e0fe665a7b4f2a780 and https://github.com/libsdl-org/SDL_ttf/commit/834ec54127dc9c2a12928f5fe32cf110ec4c7a7f Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/sdl2_ttf/sdl2_ttf.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/sdl2_ttf/sdl2_ttf.mk b/package/sdl2_ttf/sdl2_ttf.mk index 3b2b35e157..e9397d8505 100644 --- a/package/sdl2_ttf/sdl2_ttf.mk +++ b/package/sdl2_ttf/sdl2_ttf.mk @@ -11,6 +11,7 @@ SDL2_TTF_LICENSE = Zlib SDL2_TTF_LICENSE_FILES = COPYING.txt SDL2_TTF_INSTALL_STAGING = YES SDL2_TTF_DEPENDENCIES = sdl2 freetype host-pkgconf +SDL2_TTF_CONF_OPTS = --disable-freetype-builtin # x-includes and x-libraries must be set for cross-compiling # By default x_includes and x_libraries contains unsafe paths. From arnout at mind.be Wed Feb 16 21:37:56 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 16 Feb 2022 22:37:56 +0100 Subject: [Buildroot] [git commit] package/sudo: drop openssl workaround Message-ID: <20220216214135.2BF0B83776@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=afe11e84576e4ac15589159d181e1ff5d78942b6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop workaround added by commit bf899e50d89439b1a1bdf22bc933075958ffc108 because sudo natively supports pkg-config for searching openssl (which is enabled by default) since version 1.9.2 and https://github.com/sudo-project/sudo/commit/4cadd549513ef35d4d740e941576294f4491d13d As a side-effect, this will fix the following build failure when openssl is not installed on host (as LIBS is set before AX_PROG_CC_FOR_BUILD): configure:8162: checking whether the C compiler works configure:8184: /usr/bin/gcc -O2 -I/home/buildroot/autobuild/instance-2/output-1/host/include -I/home/buildroot/autobuild/instance-2/output-1/host/include -L/home/buildroot/autobuild/instance-2/output-1/host/lib -Wl,-rpath,/home/buildroot/autobuild/instance-2/output-1/host/lib conftest.c -L/home/buildroot/autobuild/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib -lssl -L/home/buildroot/autobuild/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib -pthread -latomic -lcrypto -pthread -latomic >&5 /usr/bin/ld: skipping incompatible /home/buildroot/autobuild/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libssl.a when searching for -lssl /usr/bin/ld: skipping incompatible /home/buildroot/autobuild/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libssl.a when searching for -lssl /usr/bin/ld: cannot find -lssl Fixes: - http://autobuild.buildroot.org/results/7a5d4dd22343be46a5ddd1c1a1a8e1799517d564 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/sudo/sudo.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index f2c074e55f..a752217123 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -45,17 +45,17 @@ endif ifeq ($(BR2_PACKAGE_OPENLDAP),y) SUDO_DEPENDENCIES += openldap SUDO_CONF_OPTS += --with-ldap -# If we are building sudo statically and openldap was linked with openssl, then -# when we link sudo with openldap we need to specify the openssl libs, otherwise -# it will fail with "undefined reference" errors. -ifeq ($(BR2_STATIC_LIBS)$(BR2_PACKAGE_OPENSSL),yy) -SUDO_DEPENDENCIES += host-pkgconf -SUDO_CONF_ENV += LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs libssl libcrypto`" -endif else SUDO_CONF_OPTS += --without-ldap endif +ifeq ($(BR2_PACKAGE_OPENSSL),y) +SUDO_DEPENDENCIES += host-pkgconf openssl +SUDO_CONF_OPTS += --enable-openssl +else +SUDO_CONF_OPTS += --disable-openssl +endif + # mksigname/mksiglist needs to run on build host to generate source files define SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST $(MAKE) $(HOST_CONFIGURE_OPTS) \ From arnout at mind.be Wed Feb 16 21:38:12 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 16 Feb 2022 22:38:12 +0100 Subject: [Buildroot] [git commit] package/safeclib: fix build with gcc 4.8 Message-ID: <20220216214135.611D783778@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=63f40a109b8281283c66870f623382268130953a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add -std=c99 to fix the following build failure with gcc 4.8 raised since bump to version 3.7.1 in commit cc27267ae41bf44276c63b1e86042c4fae4adf50: In file included from abort_handler_s.c:35:0: safeclib_private.h:167:18: error: anonymous variadic macros were introduced in C99 [-Werror=variadic-macros] #define slprintf(...) fprintf(stderr, __VA_ARGS__) ^ Fixes: - http://autobuild.buildroot.org/results/5c3468585942879b47331e05058d25d324c8cc23 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/safeclib/safeclib.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/safeclib/safeclib.mk b/package/safeclib/safeclib.mk index 91b3e26c68..bc58c1a38c 100644 --- a/package/safeclib/safeclib.mk +++ b/package/safeclib/safeclib.mk @@ -11,6 +11,7 @@ SAFECLIB_SOURCE = safeclib-$(SAFECLIB_VERSION).tar.xz SAFECLIB_LICENSE = MIT SAFECLIB_LICENSE_FILES = COPYING SAFECLIB_INSTALL_STAGING = YES +SAFECLIB_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=c99" # -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 From arnout at mind.be Wed Feb 16 21:37:58 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 16 Feb 2022 22:37:58 +0100 Subject: [Buildroot] [git commit] package/sdl2_ttf: drop FREETYPE_CONFIG Message-ID: <20220216214135.3489C83777@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=997cd389eb3b0ab2e472f3b857dd6d0ac486388c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master FREETYPE_CONFIG is not used since version 2.0.15 and https://github.com/libsdl-org/SDL_ttf/commit/50d72e55315e25d34f4209824275e3b1cbe6c6f8 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/sdl2_ttf/sdl2_ttf.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/sdl2_ttf/sdl2_ttf.mk b/package/sdl2_ttf/sdl2_ttf.mk index 1fe7c0a075..3b2b35e157 100644 --- a/package/sdl2_ttf/sdl2_ttf.mk +++ b/package/sdl2_ttf/sdl2_ttf.mk @@ -12,9 +12,6 @@ SDL2_TTF_LICENSE_FILES = COPYING.txt SDL2_TTF_INSTALL_STAGING = YES SDL2_TTF_DEPENDENCIES = sdl2 freetype host-pkgconf -SDL2_TTF_CONF_ENV = \ - FREETYPE_CONFIG=$(STAGING_DIR)/usr/bin/freetype-config - # x-includes and x-libraries must be set for cross-compiling # By default x_includes and x_libraries contains unsafe paths. # (/usr/include and /usr/lib) From arnout at mind.be Wed Feb 16 21:38:17 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 16 Feb 2022 22:38:17 +0100 Subject: [Buildroot] [git commit] package/libbpf: add LIBBPF_CPE_ID_VENDOR Message-ID: <20220216214135.7218083776@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d08583faedb39aaf8245afc6730dc2056ad63bf7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:libbpf_project:libbpf is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Alibbpf_project%3Alibbpf Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libbpf/libbpf.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libbpf/libbpf.mk b/package/libbpf/libbpf.mk index 6750b063c0..06f3f3475a 100644 --- a/package/libbpf/libbpf.mk +++ b/package/libbpf/libbpf.mk @@ -8,6 +8,7 @@ LIBBPF_VERSION = 0.6.1 LIBBPF_SITE = $(call github,libbpf,libbpf,v$(LIBBPF_VERSION)) LIBBPF_LICENSE = GPL-2.0, LGPL-2.1, BSD-2-Clause LIBBPF_LICENSE_FILES = LICENSE LICENSE.BSD-2-Clause LICENSE.LGPL-2.1 +LIBBPF_CPE_ID_VENDOR = libbpf_project LIBBPF_DEPENDENCIES = host-bison host-flex host-pkgconf elfutils zlib LIBBPF_INSTALL_STAGING = YES From arnout at mind.be Wed Feb 16 21:38:09 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 16 Feb 2022 22:38:09 +0100 Subject: [Buildroot] [git commit] support/pkg-stats: fix regression after cleanup in show-info Message-ID: <20220216214135.5963183776@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0319170f50c043e86a79d151b23008f6d639b06d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 471ecea5eeb0 (core/show-info: 'name' only applies to packages) removed the 'name' field for rootfs (really, for non-package) entries, thus breaking the pkg-stats processing. We fix that by excluding any entry that has no 'name', on the assumption that if it has no name, it is not a package. Reported-by: Xogium on IRC Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- support/scripts/pkg-stats | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index abd36a3dd5..c235d99407 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -371,7 +371,7 @@ def get_pkglist(npackages, package_list): def get_config_packages(): cmd = ["make", "--no-print-directory", "show-info"] js = json.loads(subprocess.check_output(cmd)) - return set([v["name"] for v in js.values()]) + return set([v["name"] for v in js.values() if 'name' in v]) def package_init_make_info(): From arnout at mind.be Wed Feb 16 21:38:15 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 16 Feb 2022 22:38:15 +0100 Subject: [Buildroot] [git commit] package/strongswan: security bump to version 5.9.5 Message-ID: <20220216214135.69B4683777@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a8379379733ddeb02ec0b42ee68f8f5182bcb3e4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixed a vulnerability in the EAP client implementation that was caused by incorrectly handling early EAP-Success messages. It may allow to bypass the client and in some scenarios even the server authentication, or could lead to a denial-of-service attack. This vulnerability has been registered as CVE-2021-45079: https://www.strongswan.org/blog/2022/01/24/strongswan-vulnerability-(cve-2021-45079).html https://github.com/strongswan/strongswan/releases/tag/5.9.5 Signed-off-by: Fabrice Fontaine Reviewed-by: Quentin Schulz Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/strongswan/strongswan.hash | 6 +++--- package/strongswan/strongswan.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/strongswan/strongswan.hash b/package/strongswan/strongswan.hash index 69b3547f91..aca7ddf5cd 100644 --- a/package/strongswan/strongswan.hash +++ b/package/strongswan/strongswan.hash @@ -1,7 +1,7 @@ -# From http://download.strongswan.org/strongswan-5.9.4.tar.bz2.md5 -md5 9c387eb77f0159fdefbcf7e81c905c35 strongswan-5.9.4.tar.bz2 +# From http://download.strongswan.org/strongswan-5.9.5.tar.bz2.md5 +md5 53005324e3cba8592f1fb958b1c2d0e5 strongswan-5.9.5.tar.bz2 # Calculated based on the hash above -sha256 45fdf1a4c2af086d8ff5b76fd7b21d3b6f0890f365f83bf4c9a75dda26887518 strongswan-5.9.4.tar.bz2 +sha256 983e4ef4a4c6c9d69f5fe6707c7fe0b2b9a9291943bbf4e008faab6bf91c0bdd strongswan-5.9.5.tar.bz2 # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 2292e21797754548dccdef9eef6aee7584e552fbd890fa914e1de8d3577d23f0 LICENSE diff --git a/package/strongswan/strongswan.mk b/package/strongswan/strongswan.mk index 2891e5aa5e..95079aceb3 100644 --- a/package/strongswan/strongswan.mk +++ b/package/strongswan/strongswan.mk @@ -4,7 +4,7 @@ # ################################################################################ -STRONGSWAN_VERSION = 5.9.4 +STRONGSWAN_VERSION = 5.9.5 STRONGSWAN_SOURCE = strongswan-$(STRONGSWAN_VERSION).tar.bz2 STRONGSWAN_SITE = http://download.strongswan.org STRONGSWAN_LICENSE = GPL-2.0+ From arnout at mind.be Wed Feb 16 21:38:04 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 16 Feb 2022 22:38:04 +0100 Subject: [Buildroot] [git commit] package/sdl2_ttf: add harfbuzz optional dependency Message-ID: <20220216214135.4627583776@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e253e41ce2e50d3af689a40b4dd0f5c615985787 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master harfbuzz is an optional dependency (which is enabled by default) since version 2.0.18 and https://github.com/libsdl-org/SDL_ttf/commit/328bbed78db496ff36720e8a809661ffb236e673 If harfbuzz is not disabled and not found, builtin harfbuzz is enabled resulting in the following build failure without C++ since commit f4da031a77f200515bcc5b2e0fe665a7b4f2a780 and https://github.com/libsdl-org/SDL_ttf/commit/9a7ef3fb640a1f086d9b02954c3b4bbfb3578871: configure: error: *** A compiler with support for C++11 language features is required. Fixes: - http://autobuild.buildroot.org/results/3fecb96a8063b1a28703682e9373714c1c9cfa24 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/sdl2_ttf/sdl2_ttf.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/sdl2_ttf/sdl2_ttf.mk b/package/sdl2_ttf/sdl2_ttf.mk index e9397d8505..54e76815f1 100644 --- a/package/sdl2_ttf/sdl2_ttf.mk +++ b/package/sdl2_ttf/sdl2_ttf.mk @@ -13,6 +13,13 @@ SDL2_TTF_INSTALL_STAGING = YES SDL2_TTF_DEPENDENCIES = sdl2 freetype host-pkgconf SDL2_TTF_CONF_OPTS = --disable-freetype-builtin +ifeq ($(BR2_PACKAGE_HARFBUZZ),y) +SDL2_TTF_DEPENDENCIES += harfbuzz +SDL2_TTF_CONF_OPTS += --enable-harfbuzz +else +SDL2_TTF_CONF_OPTS += --disable-harfbuzz +endif + # x-includes and x-libraries must be set for cross-compiling # By default x_includes and x_libraries contains unsafe paths. # (/usr/include and /usr/lib) From arnout at mind.be Wed Feb 16 21:38:21 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 16 Feb 2022 22:38:21 +0100 Subject: [Buildroot] [git commit] package/kodi: fix build with python-3.10 Message-ID: <20220216214135.7EF5883777@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a14a68a57dee2d8636e616916f48a2f721bd51fe branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes build error: CMake Error at /usr/share/cmake-3.18/Modules/FindPackageHandleStandardArgs.cmake:165 (message): Could NOT find PythonLibs (missing: PYTHON_LIBRARIES) (found suitable version "3.10.2", minimum required is "3.5") Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/kodi/0002-cmake-findpython.patch | 135 +++++++++++++++++++++ .../0003-cmake-search-for-python-interpreter.patch | 48 ++++++++ ...cmake-allow-to-override-PYTHON_EXECUTABLE.patch | 39 ++++++ package/kodi/kodi.mk | 4 + 4 files changed, 226 insertions(+) diff --git a/package/kodi/0002-cmake-findpython.patch b/package/kodi/0002-cmake-findpython.patch new file mode 100644 index 0000000000..60728aa465 --- /dev/null +++ b/package/kodi/0002-cmake-findpython.patch @@ -0,0 +1,135 @@ +From 52f44ec5c7b728a6afaca867e8d815fced2012ec Mon Sep 17 00:00:00 2001 +From: fuzzard +Date: Sat, 31 Jul 2021 19:22:08 +1000 +Subject: [PATCH] [cmake] findpython + +use cmakes (3.12+) FindPython3 module. +Provide cmake vars for user to overide specific version, and search path + +Backport of https://github.com/xbmc/xbmc/pull/20045 + +Patch sent upstream: https://github.com/xbmc/xbmc/pull/20989 + +Signed-off-by: Bernd Kuhls +--- + CMakeLists.txt | 4 +- + cmake/modules/FindPython.cmake | 71 ++++++++++++++++++++++++++-------- + 2 files changed, 56 insertions(+), 19 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2d5369798d..9bed54ef40 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.4) ++cmake_minimum_required(VERSION 3.12) + if(WIN32) + # Version 3.15 is required to use "PREPEND" for dependencies + cmake_minimum_required(VERSION 3.15) +@@ -187,8 +187,6 @@ core_require_dep(${required_deps}) + find_package(TexturePacker REQUIRED) + find_package(JsonSchemaBuilder REQUIRED) + +-SET(PYTHON_VERSION 3.8) +- + if(ENABLE_MARIADBCLIENT AND NOT ENABLE_MARIADBCLIENT STREQUAL AUTO AND ENABLE_MYSQLCLIENT AND NOT ENABLE_MYSQLCLIENT STREQUAL AUTO) + MESSAGE(FATAL_ERROR "You can not use MySql and MariaDB at the same time. Disable one by adding -DENABLE_MYSQLCLIENT=OFF or -DENABLE_MARIADBCLIENT=OFF.") + elseif(ENABLE_MYSQLCLIENT AND NOT ENABLE_MYSQLCLIENT STREQUAL AUTO) +diff --git a/cmake/modules/FindPython.cmake b/cmake/modules/FindPython.cmake +index c40e12d551..35220b5426 100644 +--- a/cmake/modules/FindPython.cmake ++++ b/cmake/modules/FindPython.cmake +@@ -1,17 +1,56 @@ +-# - Try to find python +-# Once done this will define ++# FindPython ++# -------- ++# Finds Python3 libraries ++# ++# This module will search for the required python libraries on the system ++# If multiple versions are found, the highest version will be used. ++# ++# -------- ++# ++# the following variables influence behaviour: ++# ++# PYTHON_PATH - use external python not found in system paths ++# usage: -DPYTHON_PATH=/path/to/python/lib ++# PYTHON_VER - use exact python version, fail if not found ++# usage: -DPYTHON_VER=3.8 ++# ++# -------- ++# ++# This module will define the following variables: + # + # PYTHON_FOUND - system has PYTHON ++# PYTHON_VERSION - Python version number (Major.Minor) + # PYTHON_INCLUDE_DIRS - the python include directory + # PYTHON_LIBRARIES - The python libraries ++# PYTHON_LDFLAGS - Python provided link options ++# ++# -------- ++# ++ ++# for Depends builds, set search root dir to depends path ++if(KODI_DEPENDSBUILD) ++ set(Python3_USE_STATIC_LIBS TRUE) ++ set(Python3_ROOT_DIR ${DEPENDS_PATH}/lib) ++endif() ++ ++# Provide root dir to search for Python if provided ++if(PYTHON_PATH) ++ set(Python3_ROOT_DIR ${PYTHON_PATH}) ++ ++ # unset cache var so we can generate again with a different dir (or none) if desired ++ unset(PYTHON_PATH CACHE) ++endif() ++ ++# Set specific version of Python to find if provided ++if(PYTHON_VER) ++ set(VERSION ${PYTHON_VER}) ++ set(EXACT_VER "EXACT") + +-if(PKG_CONFIG_FOUND) +- pkg_check_modules(PC_PYTHON python3>=3.5 QUIET) ++ # unset cache var so we can generate again with a different ver (or none) if desired ++ unset(PYTHON_VER CACHE) + endif() + +-find_program(PYTHON_EXECUTABLE python3 ONLY_CMAKE_FIND_ROOT_PATH) +-find_library(PYTHON_LIBRARY NAMES python3.9 python3.8 python3.7 python3.6 python3.5 PATHS ${PC_PYTHON_LIBDIR}) +-find_path(PYTHON_INCLUDE_DIR NAMES Python.h PATHS ${PC_PYTHON_INCLUDE_DIRS} PATH_SUFFIXES python3.9 python3.8 python3.7 python3.6 python3.5) ++find_package(Python3 ${VERSION} ${EXACT_VER} COMPONENTS Development) + + if(KODI_DEPENDSBUILD) + find_library(FFI_LIBRARY ffi REQUIRED) +@@ -27,17 +66,17 @@ if(KODI_DEPENDSBUILD) + endif() + endif() + +- set(PYTHON_LIBRARIES ${PYTHON_LIBRARY} ${FFI_LIBRARY} ${EXPAT_LIBRARY} ${INTL_LIBRARY} ${GMP_LIBRARY} ${PYTHON_DEP_LIBRARIES}) +-else() +- find_package(PythonLibs 3.5 REQUIRED) +- list(APPEND PYTHON_LIBRARIES ${PC_PYTHON_STATIC_LIBRARIES}) ++ list(APPEND Python3_LIBRARIES ${FFI_LIBRARY} ${EXPAT_LIBRARY} ${INTL_LIBRARY} ${GMP_LIBRARY} ${PYTHON_DEP_LIBRARIES}) + endif() + +-include(FindPackageHandleStandardArgs) +-find_package_handle_standard_args(Python REQUIRED_VARS PYTHON_INCLUDE_DIR PYTHON_LIBRARY PYTHON_LIBRARIES) +-if(PYTHON_FOUND) +- set(PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_DIR}) ++if(Python3_FOUND) + list(APPEND PYTHON_DEFINITIONS -DHAS_PYTHON=1) ++ # These are all set for easy integration with the rest of our build system ++ set(PYTHON_FOUND ${Python3_FOUND}) ++ set(PYTHON_INCLUDE_DIRS ${Python3_INCLUDE_DIRS}) ++ set(PYTHON_LIBRARIES ${Python3_LIBRARIES}) ++ set(PYTHON_VERSION "${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}" CACHE INTERNAL "" FORCE) ++ set(PYTHON_LDFLAGS ${Python3_LINK_OPTIONS}) + endif() + +-mark_as_advanced(PYTHON_EXECUTABLE PYTHON_INCLUDE_DIRS PYTHON_INCLUDE_DIR PYTHON_LIBRARY PYTHON_LIBRARIES PYTHON_LDFLAGS FFI_LIBRARY EXPAT_LIBRARY INTL_LIBRARY GMP_LIBRARY) ++mark_as_advanced(PYTHON_EXECUTABLE PYTHON_VERSION PYTHON_INCLUDE_DIRS PYTHON_LDFLAGS FFI_LIBRARY EXPAT_LIBRARY INTL_LIBRARY GMP_LIBRARY) +-- +2.30.2 + diff --git a/package/kodi/0003-cmake-search-for-python-interpreter.patch b/package/kodi/0003-cmake-search-for-python-interpreter.patch new file mode 100644 index 0000000000..158345a212 --- /dev/null +++ b/package/kodi/0003-cmake-search-for-python-interpreter.patch @@ -0,0 +1,48 @@ +From 6bb112e585f2ffd10e5af70ca28159dd235d063b Mon Sep 17 00:00:00 2001 +From: wsnipex +Date: Thu, 19 Aug 2021 08:50:05 +0200 +Subject: [PATCH] [cmake] search for python interpreter fixes installing + eventclients on linux + +Backport of https://github.com/xbmc/xbmc/pull/20058 + +Patch sent upstream: https://github.com/xbmc/xbmc/pull/20989 + +Signed-off-by: Bernd Kuhls +--- + cmake/modules/FindPython.cmake | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/cmake/modules/FindPython.cmake b/cmake/modules/FindPython.cmake +index 35220b5426..c469ed9fb6 100644 +--- a/cmake/modules/FindPython.cmake ++++ b/cmake/modules/FindPython.cmake +@@ -20,6 +20,7 @@ + # + # PYTHON_FOUND - system has PYTHON + # PYTHON_VERSION - Python version number (Major.Minor) ++# PYTHON_EXECUTABLE - Python interpreter binary + # PYTHON_INCLUDE_DIRS - the python include directory + # PYTHON_LIBRARIES - The python libraries + # PYTHON_LDFLAGS - Python provided link options +@@ -51,6 +52,9 @@ if(PYTHON_VER) + endif() + + find_package(Python3 ${VERSION} ${EXACT_VER} COMPONENTS Development) ++if(CORE_SYSTEM_NAME STREQUAL linux) ++ find_package(Python3 ${VERSION} ${EXACT_VER} COMPONENTS Interpreter) ++endif() + + if(KODI_DEPENDSBUILD) + find_library(FFI_LIBRARY ffi REQUIRED) +@@ -73,6 +77,7 @@ if(Python3_FOUND) + list(APPEND PYTHON_DEFINITIONS -DHAS_PYTHON=1) + # These are all set for easy integration with the rest of our build system + set(PYTHON_FOUND ${Python3_FOUND}) ++ set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE} CACHE FILEPATH "Python interpreter" FORCE) + set(PYTHON_INCLUDE_DIRS ${Python3_INCLUDE_DIRS}) + set(PYTHON_LIBRARIES ${Python3_LIBRARIES}) + set(PYTHON_VERSION "${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}" CACHE INTERNAL "" FORCE) +-- +2.30.2 + diff --git a/package/kodi/0004-cmake-allow-to-override-PYTHON_EXECUTABLE.patch b/package/kodi/0004-cmake-allow-to-override-PYTHON_EXECUTABLE.patch new file mode 100644 index 0000000000..d1e9b3f25f --- /dev/null +++ b/package/kodi/0004-cmake-allow-to-override-PYTHON_EXECUTABLE.patch @@ -0,0 +1,39 @@ +From 25681d8adde4a90d5da02051e30f6a3a27322136 Mon Sep 17 00:00:00 2001 +From: Jernej Skrabec +Date: Sat, 25 Sep 2021 07:41:10 +0200 +Subject: [PATCH] [cmake] allow to override PYTHON_EXECUTABLE + +If Kodi is being build for distro which has different python version +than host, PYTHON_EXECUTABLE must be overriden and point to distro +version. Otherwise, eventclients will be installed in wrong location and +be thus unusable. + +Use case: Cross compiling Kodi for LibreELEC + +Backport of https://github.com/xbmc/xbmc/pull/20171 + +Patch sent upstream: https://github.com/xbmc/xbmc/pull/20989 + +Signed-off-by: Bernd Kuhls +--- + cmake/modules/FindPython.cmake | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/cmake/modules/FindPython.cmake b/cmake/modules/FindPython.cmake +index c469ed9fb6..87b8368705 100644 +--- a/cmake/modules/FindPython.cmake ++++ b/cmake/modules/FindPython.cmake +@@ -77,7 +77,9 @@ if(Python3_FOUND) + list(APPEND PYTHON_DEFINITIONS -DHAS_PYTHON=1) + # These are all set for easy integration with the rest of our build system + set(PYTHON_FOUND ${Python3_FOUND}) +- set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE} CACHE FILEPATH "Python interpreter" FORCE) ++ if(NOT PYTHON_EXECUTABLE) ++ set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE} CACHE FILEPATH "Python interpreter" FORCE) ++ endif() + set(PYTHON_INCLUDE_DIRS ${Python3_INCLUDE_DIRS}) + set(PYTHON_LIBRARIES ${Python3_LIBRARIES}) + set(PYTHON_VERSION "${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}" CACHE INTERNAL "" FORCE) +-- +2.30.2 + diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index a2c42b64c9..58ad115475 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -76,6 +76,10 @@ KODI_CONF_OPTS += \ -DNATIVEPREFIX=$(HOST_DIR) \ -DDEPENDS_PATH=$(STAGING_DIR)/usr \ -DENABLE_TESTING=OFF \ + -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python \ + -DPYTHON_INCLUDE_DIRS=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ + -DPYTHON_PATH=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR) \ + -DPYTHON_VER=$(PYTHON3_VERSION_MAJOR) \ -DWITH_JSONSCHEMABUILDER=$(HOST_DIR)/bin/JsonSchemaBuilder \ -DWITH_TEXTUREPACKER=$(HOST_DIR)/bin/TexturePacker \ -DLIBDVDCSS_URL=$(KODI_DL_DIR)/kodi-libdvdcss-$(KODI_LIBDVDCSS_VERSION).tar.gz \ From arnout at mind.be Wed Feb 16 21:38:07 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 16 Feb 2022 22:38:07 +0100 Subject: [Buildroot] [git commit] package/gstreamer1/gst1-plugins-base: fix build with gcc 4.8 Message-ID: <20220216214135.506F983777@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d7b999e947fae16ddbe8857640c7e87433a1d54b 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 1.20.0 in commit 801131157dcef2c97e947a1d3e8c9bfa7aa3d870: ../gst-libs/gst/video/video-converter.c: In function 'convert_I420_v210': ../gst-libs/gst/video/video-converter.c:3771:7: error: 'for' loop initial declarations are only allowed in C99 mode for (int j = width * 4 - 1; j >= 0; j--) { ^ Fixes: - http://autobuild.buildroot.org/results/c4b1449f35debcbabff7e42abe239695d4ad4d21 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk index 68281738fa..08aac850cd 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk @@ -11,6 +11,8 @@ GST1_PLUGINS_BASE_INSTALL_STAGING = YES GST1_PLUGINS_BASE_LICENSE_FILES = COPYING GST1_PLUGINS_BASE_LICENSE = LGPL-2.1+ +GST1_PLUGINS_BASE_CFLAGS = $(TARGET_CFLAGS) -std=gnu99 + GST1_PLUGINS_BASE_CONF_OPTS = \ -Dexamples=disabled \ -Dtests=disabled \ From arnout at mind.be Wed Feb 16 21:54:35 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 16 Feb 2022 22:54:35 +0100 Subject: [Buildroot] [git commit] package/libusb/0002-linux_usbfs-fix-maybe-uninitialized-error.patch: remove N/M Message-ID: <20220216214708.56C268377B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=892834535cdf27c6290a1d45fa8e03b3e1908f35 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Found by check-package: package/libusb/0002-linux_usbfs-fix-maybe-uninitialized-error.patch:4: generate your patches with 'git format-patch -N' Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libusb/0002-linux_usbfs-fix-maybe-uninitialized-error.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libusb/0002-linux_usbfs-fix-maybe-uninitialized-error.patch b/package/libusb/0002-linux_usbfs-fix-maybe-uninitialized-error.patch index e6020f466e..ea299081aa 100644 --- a/package/libusb/0002-linux_usbfs-fix-maybe-uninitialized-error.patch +++ b/package/libusb/0002-linux_usbfs-fix-maybe-uninitialized-error.patch @@ -1,7 +1,7 @@ From bea5891591402f14940a607eafbdcd169ff8827f Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Sun, 6 Feb 2022 07:12:14 +0100 -Subject: [PATCH 2/2] linux_usbfs: fix maybe-uninitialized error +Subject: [PATCH] linux_usbfs: fix maybe-uninitialized error MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From yann.morin.1998 at free.fr Wed Feb 16 21:55:15 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Feb 2022 22:55:15 +0100 Subject: [Buildroot] [git commit] utils/docker-run: hide docker run command Message-ID: <20220216214805.EB9378377F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cc9470c2d8134106792a5a0179fbd0c6ca4d37af branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Since this is a helper script there is not much reason to show the command that's been issued. Furthermore, the incantation has been slightly extended since the script was introduced. The only interesting reason to print the command is to know what image it is being spawned into. However, this is prominently displayed by docker the first time the script is run, as it can't find the image locally and has to fetch it first. Afterwards, users can still use 'docker image ls' to see what images they have locally. So let's remove 'set -x' before running docker. Signed-off-by: Giulio Benetti [yann.morin.1998 at free.fr: reword and expand commit log] Signed-off-by: Yann E. MORIN --- utils/docker-run | 1 - 1 file changed, 1 deletion(-) diff --git a/utils/docker-run b/utils/docker-run index bdbc979264..5653764254 100755 --- a/utils/docker-run +++ b/utils/docker-run @@ -6,7 +6,6 @@ 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 exec docker run -it --rm \ --user $(id -u):$(id -g) \ --mount "type=bind,src=${MAIN_DIR},dst=${MAIN_DIR}" \ From yann.morin.1998 at free.fr Wed Feb 16 21:56:52 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Feb 2022 22:56:52 +0100 Subject: [Buildroot] [PATCH] utils/docker-run: hide docker run command In-Reply-To: <20220214173855.4071040-1-giulio.benetti@benettiengineering.com> References: <20220214173855.4071040-1-giulio.benetti@benettiengineering.com> Message-ID: <20220216215652.GE522310@scaer> Giulio, All, On 2022-02-14 18:38 +0100, Giulio Benetti spake thusly: > Since this is a helper script I don't find the reason to show the command > we're issuing, so let's remove 'set -x' before running docker. > > Signed-off-by: Giulio Benetti Applied to master with a reworded and expanded commit log, thanks. Regards, Yann E. MORIN. > --- > utils/docker-run | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/utils/docker-run b/utils/docker-run > index 0614f1325d..55dafd22a3 100755 > --- a/utils/docker-run > +++ b/utils/docker-run > @@ -6,5 +6,4 @@ 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 > exec docker run -v "${MAIN_DIR}:/home/br-user" -t "${IMAGE}" "$@" > -- > 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 peter at korsgaard.com Wed Feb 16 22:18:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 23:18:44 +0100 Subject: [Buildroot] [PATCH 1/2] package/python-sqliteschema: drop python-six dependency In-Reply-To: <20220125213242.301404-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 25 Jan 2022 22:32:41 +0100") References: <20220125213242.301404-1-fontaine.fabrice@gmail.com> Message-ID: <87v8xefoaj.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > 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 Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 16 22:17:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 23:17:53 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/python-sqliteschema: drop python-six dependency Message-ID: <20220216221116.BA78C83785@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c060023e10786641e7d9d9994ddc65ac88e756a2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 66192c66b9421b95f6cc45a46264c0193a873c58) Signed-off-by: Peter Korsgaard --- 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 From peter at korsgaard.com Wed Feb 16 22:18:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 23:18:26 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/python-sqliteschema: bump to version 1.2.1 Message-ID: <20220216221116.C2EC683787@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8d79accf96a135bef77875949a3e33e8c92a8033 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x https://github.com/thombashi/sqliteschema/releases/tag/v1.2.1 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 5eff46a6c97203e7874edc931c4180f606f08275) Signed-off-by: Peter Korsgaard --- 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 From peter at korsgaard.com Wed Feb 16 22:19:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 23:19:07 +0100 Subject: [Buildroot] [PATCH 2/2] package/python-sqliteschema: bump to version 1.2.1 In-Reply-To: <20220125213242.301404-2-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 25 Jan 2022 22:32:42 +0100") References: <20220125213242.301404-1-fontaine.fabrice@gmail.com> <20220125213242.301404-2-fontaine.fabrice@gmail.com> Message-ID: <87r182fo9w.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://github.com/thombashi/sqliteschema/releases/tag/v1.2.1 > Signed-off-by: Fabrice Fontaine Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 16 22:23:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 23:23:05 +0100 Subject: [Buildroot] [PATCH] package/xen: security bump to version 4.14.4 In-Reply-To: <20220205135132.3007-1-peter@korsgaard.com> (Peter Korsgaard's message of "Sat, 5 Feb 2022 14:51:30 +0100") References: <20220205135132.3007-1-peter@korsgaard.com> Message-ID: <87mtiqfo3a.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Includes a number of bugfixes and the security fixes up to xsa-395: > https://xenproject.org/downloads/xen-project-archives/xen-project-4-14-series/xen-project-4-14-4/ > Drop the now upstream xsa38* patches. > Signed-off-by: Peter Korsgaard Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 16 22:22:48 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 23:22:48 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/xen: security bump to version 4.14.4 Message-ID: <20220216221530.45F8A8378B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=245a2838267334e2d6e2d62a749f6b386f82a1ba branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Includes a number of bugfixes and the security fixes up to xsa-395: https://xenproject.org/downloads/xen-project-archives/xen-project-4-14-series/xen-project-4-14-4/ Drop the now upstream xsa38* patches. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit 7d3845f10ccc0810243036439b955cd9f49d3da4) Signed-off-by: Peter Korsgaard --- package/xen/xen.hash | 11 +---------- package/xen/xen.mk | 19 +------------------ 2 files changed, 2 insertions(+), 28 deletions(-) diff --git a/package/xen/xen.hash b/package/xen/xen.hash index 10a778053a..a81d05e3f7 100644 --- a/package/xen/xen.hash +++ b/package/xen/xen.hash @@ -1,12 +1,3 @@ # Locally computed -sha256 a3dad76a772393a1875e8f44a6059a95fea4bde40f97b800966969ac6f3a498d xen-4.14.3.tar.gz +sha256 e76d56dfcdabf5d80aa06819f44472de49526a518dbb483eb08e7ff9aec2c669 xen-4.14.4.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 cfc166dc4c..03341d4275 100644 --- a/package/xen/xen.mk +++ b/package/xen/xen.mk @@ -4,30 +4,13 @@ # ################################################################################ -XEN_VERSION = 4.14.3 +XEN_VERSION = 4.14.4 XEN_SITE = https://downloads.xenproject.org/release/xen/$(XEN_VERSION) XEN_LICENSE = GPL-2.0 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 Wed Feb 16 22:22:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Feb 2022 23:22:30 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/xen: security bump to version 4.14.4 Message-ID: <20220216221536.64E0E83794@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1a9431d52d43461fb8b844fd2e7d426624cb85c8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Includes a number of bugfixes and the security fixes up to xsa-395: https://xenproject.org/downloads/xen-project-archives/xen-project-4-14-series/xen-project-4-14-4/ Drop the now upstream xsa38* patches. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit 7d3845f10ccc0810243036439b955cd9f49d3da4) Signed-off-by: Peter Korsgaard --- package/xen/xen.hash | 11 +---------- package/xen/xen.mk | 19 +------------------ 2 files changed, 2 insertions(+), 28 deletions(-) diff --git a/package/xen/xen.hash b/package/xen/xen.hash index 10a778053a..a81d05e3f7 100644 --- a/package/xen/xen.hash +++ b/package/xen/xen.hash @@ -1,12 +1,3 @@ # Locally computed -sha256 a3dad76a772393a1875e8f44a6059a95fea4bde40f97b800966969ac6f3a498d xen-4.14.3.tar.gz +sha256 e76d56dfcdabf5d80aa06819f44472de49526a518dbb483eb08e7ff9aec2c669 xen-4.14.4.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 cfc166dc4c..03341d4275 100644 --- a/package/xen/xen.mk +++ b/package/xen/xen.mk @@ -4,30 +4,13 @@ # ################################################################################ -XEN_VERSION = 4.14.3 +XEN_VERSION = 4.14.4 XEN_SITE = https://downloads.xenproject.org/release/xen/$(XEN_VERSION) XEN_LICENSE = GPL-2.0 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 fontaine.fabrice at gmail.com Wed Feb 16 22:33:49 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 16 Feb 2022 23:33:49 +0100 Subject: [Buildroot] [PATCH 1/1] package/luasyslog: fix build with Lua 5.4 Message-ID: <20220216223349.2531296-1-fontaine.fabrice@gmail.com> Fix the following build failure with Lua 5.4 raised since commit 4f9a5659023c66fc166de28fd39a6c97a9490667: In file included from lsyslog.c:11: compat-5.3.h:402:4: error: #error "unsupported Lua version (i.e. not Lua 5.1, 5.2, or 5.3)" 402 | # error "unsupported Lua version (i.e. not Lua 5.1, 5.2, or 5.3)" | ^~~~~ Fixes: - http://autobuild.buildroot.org/results/df2aabcf2ae07cad66b869ec4ac76702d2c32dc5 Signed-off-by: Fabrice Fontaine --- ...002-compat-5.3.h-add-Lua-5.4-support.patch | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 package/luasyslog/0002-compat-5.3.h-add-Lua-5.4-support.patch diff --git a/package/luasyslog/0002-compat-5.3.h-add-Lua-5.4-support.patch b/package/luasyslog/0002-compat-5.3.h-add-Lua-5.4-support.patch new file mode 100644 index 0000000000..72f337967c --- /dev/null +++ b/package/luasyslog/0002-compat-5.3.h-add-Lua-5.4-support.patch @@ -0,0 +1,43 @@ +From 0ec19dad98a18653ea58fbeae058288cf95d3e4a Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 16 Feb 2022 23:31:15 +0100 +Subject: [PATCH] compat-5.3.h: add Lua 5.4 support + +Fix the following build failure with Lua 5.4: + +In file included from lsyslog.c:11: +compat-5.3.h:402:4: error: #error "unsupported Lua version (i.e. not Lua 5.1, 5.2, or 5.3)" + 402 | # error "unsupported Lua version (i.e. not Lua 5.1, 5.2, or 5.3)" + | ^~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/df2aabcf2ae07cad66b869ec4ac76702d2c32dc5 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/ntd/luasyslog/pull/3] +--- + compat-5.3.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/compat-5.3.h b/compat-5.3.h +index 8e10893..4f8e58e 100644 +--- a/compat-5.3.h ++++ b/compat-5.3.h +@@ -397,11 +397,11 @@ COMPAT53_API void luaL_requiref (lua_State *L, const char *modname, + + + /* other Lua versions */ +-#if !defined(LUA_VERSION_NUM) || LUA_VERSION_NUM < 501 || LUA_VERSION_NUM > 503 ++#if !defined(LUA_VERSION_NUM) || LUA_VERSION_NUM < 501 || LUA_VERSION_NUM > 504 + +-# error "unsupported Lua version (i.e. not Lua 5.1, 5.2, or 5.3)" ++# error "unsupported Lua version (i.e. not Lua 5.1, 5.2, 5.3 or 5.4)" + +-#endif /* other Lua versions except 5.1, 5.2, and 5.3 */ ++#endif /* other Lua versions except 5.1, 5.2, 5.3 and 5.4 */ + + + +-- +2.34.1 + -- 2.34.1 From james.hilliard1 at gmail.com Thu Feb 17 00:53:44 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 16 Feb 2022 17:53:44 -0700 Subject: [Buildroot] [PATCH 1/1] package/bpftool: bump to version 6.7.0 Message-ID: <20220217005344.2357385-1-james.hilliard1@gmail.com> Fixes: http://autobuild.buildroot.net/results/8bf/8bfc2abe3ab7a0b53aa717c800a4c7a3c964f426 Signed-off-by: James Hilliard --- package/bpftool/bpftool.hash | 2 +- package/bpftool/bpftool.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/bpftool/bpftool.hash b/package/bpftool/bpftool.hash index c7d4ae250e..2e414b8eb8 100644 --- a/package/bpftool/bpftool.hash +++ b/package/bpftool/bpftool.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 c868cb85bf44195ec6cd20649c3db4f7aff64a38d950a1c2911d981fb2d7042c bpftool-a7f0e7f057283ae8af3de4578bcb8b7ee80b7144-br1.tar.gz +sha256 e4ce219d3b87dd70d8dbfb8f02bd356f70c010f739f17baca1c8912199a8a72b bpftool-v6.7.0-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 index 4276f91958..8742917253 100644 --- a/package/bpftool/bpftool.mk +++ b/package/bpftool/bpftool.mk @@ -4,7 +4,7 @@ # ################################################################################ -BPFTOOL_VERSION = a7f0e7f057283ae8af3de4578bcb8b7ee80b7144 +BPFTOOL_VERSION = v6.7.0 BPFTOOL_SITE = https://github.com/libbpf/bpftool BPFTOOL_SITE_METHOD = git BPFTOOL_GIT_SUBMODULES = YES -- 2.25.1 From thomas.petazzoni at bootlin.com Thu Feb 17 07:13:34 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 17 Feb 2022 07:13:34 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-02-16 Message-ID: <20220217071338.DD9E841632@smtp4.osuosl.org> Hello, Autobuild statistics for 2022-02-16 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 40 | 5 | 0 | 45 | 2021.11.x | 21 | 2 | 0 | 23 | master | 47 | 35 | 1 | 83 | Classification of failures by reason for master ----------------------------------------------- bpftool-a7f0e7f057283ae8af3... | 5 cryptsetup-2.4.3 | 5 host-libselinux-3.3 | 5 bluez5_utils-5.63 | 3 tovid-87c676f4aadb7303d2cd9... | 2 unknown | 2 wavemon-0.9.4 | 2 adwaita-icon-theme-3.37.2 | 1 bird-2.0.8 | 1 frr | 1 frr-8.1 | 1 luasyslog-2.2.0 | 1 mongodb-4.2.18 | 1 protozero-1.7.1 | 1 python-greenlet-1.1.2 | 1 qt5base-53a047c212af7fbded6... | 1 sdl2_ttf-2.0.18 | 1 target-finalize | 1 ulog-0389d243352255f6182326... | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- xtensa | adwaita-icon-theme-3.37.2 | NOK | http://autobuild.buildroot.net/results/5aadabaf26a92ab96332bb09f4343bbfd5341786 | mips64el | bird-2.0.8 | NOK | http://autobuild.buildroot.net/results/09f42973cfee21754e4f6d6782567cf897bd8dfd | mips64el | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/ac6792d046c6c1eae9f233621da1e01e4a4fbdd3 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/ea83e269e479f8bfa4e39f7376f111db6843e999 | mips64el | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/af177e9fa52b55149d7fb50759dc0d26b97c3732 | mipsel | bpftool-a7f0e7f057283ae8af3... | NOK | http://autobuild.buildroot.net/results/8bfc2abe3ab7a0b53aa717c800a4c7a3c964f426 | microblazeel | bpftool-a7f0e7f057283ae8af3... | NOK | http://autobuild.buildroot.net/results/90945e38d8cd15e73ab97b5796aa7dda0fb88e8b | i686 | bpftool-a7f0e7f057283ae8af3... | NOK | http://autobuild.buildroot.net/results/8ea69cd0942114218c0e68441d5100be02fd1eb0 | mips64el | bpftool-a7f0e7f057283ae8af3... | NOK | http://autobuild.buildroot.net/results/7955d2fe892611c4b2cf3af08aa7bf9eb9431017 | mips64el | bpftool-a7f0e7f057283ae8af3... | NOK | http://autobuild.buildroot.net/results/cb68a0a498f6c7d493e191b0e190ab7d3209d0e1 | arm | cryptsetup-2.4.3 | NOK | http://autobuild.buildroot.net/results/5b1ba16fad1ae337f894bcfb3d5070179f4c02d5 | aarch64 | cryptsetup-2.4.3 | NOK | http://autobuild.buildroot.net/results/4bb616907192f0a836eab716960ad2856dc2342c | powerpc | cryptsetup-2.4.3 | NOK | http://autobuild.buildroot.net/results/325c3d7e1085c6bef88fc4467139b181eac009e9 | arm | cryptsetup-2.4.3 | NOK | http://autobuild.buildroot.net/results/d520132c758080a455ee5f5a49eabfbd338964b7 | mips | cryptsetup-2.4.3 | NOK | http://autobuild.buildroot.net/results/9b741530fae2b42157d80d599cacd8af86c8ecd0 | arc | frr | TIM | http://autobuild.buildroot.net/results/1e7a8c284a09bbc8544ca28b563bb6051815cf76 | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/9cf63046779e2572fe96c2429c18e8970ef9dd1d | riscv64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/1d7857f7d084b70e539e3027019896bcfcd3c8fb | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/c9638aee4c00fb20a6d4949eeff91546e0148596 | mipsel | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/25f0f8eff63ffab9bb79554a1eb994b9b64519d7 | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/4f0b29d3e2d8a423112bfc8c9081b44cb3aaee80 | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/267af119a7014227d0b74c61bc7ff7feda85a459 | arm | luasyslog-2.2.0 | NOK | http://autobuild.buildroot.net/results/24495d12812c81cc603e6c369b77726ba3ddc81a | arm | mongodb-4.2.18 | NOK | http://autobuild.buildroot.net/results/2db2c77ec9c0cd2020c4f83883d5cad3be9a20fe | arc | protozero-1.7.1 | NOK | http://autobuild.buildroot.net/results/8cbddfcde6adc201300cbfc7413f6e87aee27bd7 | arm | python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/10ca98b0f48f824b95691705eb14124273ea1c9a | riscv32 | qt5base-53a047c212af7fbded6... | NOK | http://autobuild.buildroot.net/results/4325dd43fa1480925a10602d82b8dfaf35e8624c | arm | sdl2_ttf-2.0.18 | NOK | http://autobuild.buildroot.net/results/cba34c431f8d1315e9ca9159274421a8219a701e | s390x | target-finalize | NOK | http://autobuild.buildroot.net/results/b287fc499cca5b1b6a46b04a368ae2af77cbacb3 | powerpc | tovid-87c676f4aadb7303d2cd9... | NOK | http://autobuild.buildroot.net/results/e4a89213aeb6336c86f9b85c43ef266004ac97b1 | xtensa | tovid-87c676f4aadb7303d2cd9... | NOK | http://autobuild.buildroot.net/results/84b2dc4ad2baac6a3bff86fdccfa8e8fb62bc23a | arc | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/3acd0250db862e4c3ff241262d075fae386123ed | arc | unknown | NOK | http://autobuild.buildroot.net/results/4e4560e8cfc4b3968bdc15d2263c56c1e9f33f11 | powerpc | unknown | NOK | http://autobuild.buildroot.net/results/c3944c8bee21c685663e6c1785d37a39bd5ff7d4 | m68k | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/621bd326e9eaac3dbb1f53ead7722dd0e0f36a08 | mips64el | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/6daa27af2c5b93c5cd4df17fd8cf5db952c57491 | Classification of failures by reason for 2021.02.x -------------------------------------------------- monkey-f54856ce250c4e257354... | 2 apitrace-9.0 | 1 cutelyst-2.11.0 | 1 host-sentry-cli-1.57.0 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- m68k | apitrace-9.0 | NOK | http://autobuild.buildroot.net/results/55cc3859985548ee6a1b7c66341477a17dcc2aeb | mips64el | cutelyst-2.11.0 | NOK | http://autobuild.buildroot.net/results/7622eea4419d1cae298fc2133c549af59cde33ab | m68k | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/a316d6dd18291fe6f16e64780aa073cab2f57e8b | aarch64_be | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/38f1f3c23f829c6ee6498690bdcdc37a716f4291 | aarch64_be | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/69a5fe12c0a1a65822b5713227f0a437b01d99b8 | Classification of failures by reason for 2021.11.x -------------------------------------------------- mtd-2.1.3 | 1 unknown | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64el | mtd-2.1.3 | NOK | http://autobuild.buildroot.net/results/dcac657a96b8f7f77504eac5067de26fb16cda84 | s390x | unknown | NOK | http://autobuild.buildroot.net/results/c630552d7721ed1b6f5526682fa3ca74c9b8836a | Gitlab CI results for 2022-02-16 ================================ Detail of runtime-test failures for 2022.02-rc1 ----------------------------------------------- runtime-test | link to the job | orph? --------------------------+---------------------------------------------------------------+------ TestIPythonPy3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2087852418 | ORPH TestLuaLuasyslog | https://gitlab.com/buildroot.org/buildroot/-/jobs/2087852492 | ORPH TestLxc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2087852495 | ORPH TestPerlLWPProtocolhttps | https://gitlab.com/buildroot.org/buildroot/-/jobs/2087852520 | ORPH TestPythonPy3Cryptography | https://gitlab.com/buildroot.org/buildroot/-/jobs/2087852572 | ORPH TestPythonPy3Pyyaml | https://gitlab.com/buildroot.org/buildroot/-/jobs/2087852603 | ORPH TestRust | https://gitlab.com/buildroot.org/buildroot/-/jobs/2087852624 | ORPH TestRustBin | https://gitlab.com/buildroot.org/buildroot/-/jobs/2087852627 | ORPH -- http://autobuild.buildroot.net From moritz at h6t.eu Thu Feb 17 07:43:38 2022 From: moritz at h6t.eu (moritz at h6t.eu) Date: Thu, 17 Feb 2022 08:43:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/cryptsetup: fix build failure with libgcrypt Message-ID: <20220217074338.147889-1-moritz@h6t.eu> From: Moritz Bitsch The patch 0001-Add-check-program-for-symver-attribute.patch touches a autoconf relevant file which causes a configure --recheck in the make step without proper CONF_ENV. Running autoreconf prevents this. Signed-off-by: Moritz Bitsch --- package/cryptsetup/cryptsetup.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index 2e06047c56..8373f0ab74 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -19,6 +19,7 @@ CRYPTSETUP_CPE_ID_VENDOR = cryptsetup_project CRYPTSETUP_INSTALL_STAGING = YES CRYPTSETUP_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)" CRYPTSETUP_CONF_OPTS += --enable-blkid --enable-libargon2 +CRYPTSETUP_AUTORECONF = YES # cryptsetup uses libgcrypt by default, but can be configured to use OpenSSL # or kernel crypto modules instead -- 2.35.1 From buildroot at heine.tech Thu Feb 17 09:38:17 2022 From: buildroot at heine.tech (Michael Nosthoff) Date: Thu, 17 Feb 2022 10:38:17 +0100 Subject: [Buildroot] =?utf-8?b?d3BhX3N1cHBsaWNhbnQ/PT0/dXRmLTg/cT8gMi4x?= =?utf-8?q?0=3A_ignored_build_options?= Message-ID: <3f79-620e1780-1-7f8ee50@116634595> Hi Sergey, all, @Sergey: I put you on the list of recipients since you provided the version bump to buildroot. Since hostapd 2.10 the wpa_supplicant build ignores the two options CONFIG_BUILD_WPA_CLIENT_SO and CONFIG_NO_WPA_PASSPHRASE. This leads to the following build error in buildroot when BR2_PACKAGE_WPA_SUPPLICANT_WPA_CLIENT_SO is selected: /usr/bin/install: cannot stat '/buildroot/build/build/wpa_supplicant-2.10/wpa_supplicant/libwpa_client.so': No such file or directory The Bug was probably introduced with commit [0] which reworked the .config parsing. The two mentioned options are now evaluated before the .config file is parsed an thus ignored. I'm not familiar enough with the wpa_supplicant build to come up with a proper patch. But maybe someone is willing to take a look at this. Regards, Michael [0] https://w1.fi/cgit/hostap/commit/wpa_supplicant/Makefile?id=a41a29192e5d196444fc8859100762b04ff0d1c2 From fontaine.fabrice at gmail.com Thu Feb 17 09:40:48 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 17 Feb 2022 10:40:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/luasyslog: bump to version 2.2.1 Message-ID: <20220217094048.2756293-1-fontaine.fabrice@gmail.com> This bump contains a single commit which fixes the following build failure with Lua 5.4 raised since commit 4f9a5659023c66fc166de28fd39a6c97a9490667: In file included from lsyslog.c:11: compat-5.3.h:402:4: error: #error "unsupported Lua version (i.e. not Lua 5.1, 5.2, or 5.3)" 402 | # error "unsupported Lua version (i.e. not Lua 5.1, 5.2, or 5.3)" | ^~~~~ Also update indentation in hash file (two spaces) Fixes: - http://autobuild.buildroot.org/results/df2aabcf2ae07cad66b869ec4ac76702d2c32dc5 Signed-off-by: Fabrice Fontaine --- package/luasyslog/luasyslog.hash | 4 ++-- package/luasyslog/luasyslog.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/luasyslog/luasyslog.hash b/package/luasyslog/luasyslog.hash index bcb6a7e025..1e2a5ddec5 100644 --- a/package/luasyslog/luasyslog.hash +++ b/package/luasyslog/luasyslog.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7f7dad64117407f2484ff5b53e90804f923a99fcbde5872e54f6aba53f482da0 luasyslog-2.2.0.tar.gz -sha256 833457938f5155e65dabda12a5c9d4b6fd7fb92dd7ead584c1c30cfb0c84adf4 COPYING +sha256 b1b19ca142130f93c3f8f2e85303ff50cc6f4ed4aa52b8569176ae56e3dc3f43 luasyslog-2.2.1.tar.gz +sha256 833457938f5155e65dabda12a5c9d4b6fd7fb92dd7ead584c1c30cfb0c84adf4 COPYING diff --git a/package/luasyslog/luasyslog.mk b/package/luasyslog/luasyslog.mk index 049e068a13..972d4c5a7d 100644 --- a/package/luasyslog/luasyslog.mk +++ b/package/luasyslog/luasyslog.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUASYSLOG_VERSION = 2.2.0 +LUASYSLOG_VERSION = 2.2.1 LUASYSLOG_SITE = $(call github,ntd,luasyslog,$(LUASYSLOG_VERSION)) LUASYSLOG_DEPENDENCIES = host-luarocks luainterpreter LUASYSLOG_LICENSE = MIT -- 2.34.1 From dopsi at dopsi.ch Thu Feb 17 08:34:40 2022 From: dopsi at dopsi.ch (Simon Doppler) Date: Thu, 17 Feb 2022 09:34:40 +0100 Subject: [Buildroot] Dependency detection issue in external tree Message-ID: <18f64b226c55f9ff8c0bdc109793dc9a0e0657ce.camel@dopsi.ch> Hello, I am currently working on debugging early boot on a STM32MP1 based board and I would like to use stm32wrapper4dbg to wrap the FSBL. Since we use a fixed version of Buildroot, I have would like to keep the packages in an external tree (we will work on upstreaming them in the future). In the external.mk file, when adding an extra dependency with ARM_TRUSTED_FIRMWARE_DEPENDENCIES += host-stm32wrapper4dbg the dependency shows up in the dependency graph, in the `make arm- trusted-firmware-show-depends` output but not in `make arm-trusted- firmware-show-build-order` output. It does also not build the host-stm32wrapper4dbg package before the arm-trusted-firmware package. The hook that wraps the FSBL does however work when I build host- stm32wrapper4dbg before building the rest of the system. Is what I want to do actually supported (adding a dependency in an external.mk file)? Do you have any idea, when I should look to fix this dependency issue? I have set up a minimal example here: https://gitlab.com/dopsi/mve-br2-external-dep (look at the README.md for details). Best regards Simon Doppler From aperez at igalia.com Thu Feb 17 12:36:20 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Thu, 17 Feb 2022 13:36:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/wpewebkit: bump version to 2.34.2 In-Reply-To: <20220124161611.GB162969@momiji> References: <20211124205607.3021277-1-aperez@igalia.com> <87mtjlwlvo.fsf@dell.be.48ers.dk> <20220124161611.GB162969@momiji> Message-ID: <20220217133620.GB757559@momiji> Hello again, On Mon, 24 Jan 2022 16:16:11 +0200 Adrian Perez de Castro wrote: > 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 Here we go: https://bugs.webkit.org/show_bug.cgi?id=236770 ? turns out the build was broken in the development branch as well, and I plan to backport the patch to 2.34.x. > Also I just submitted some moments ago a small patch to update the WPE WebKit > package to 2.34.4 as well. I am releasing 2.34.6 this week, which will include the patch mentioned above, so I will submit directly an update to 2.34.6 once it has been published. 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 geomatsi at gmail.com Thu Feb 17 12:56:15 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Thu, 17 Feb 2022 15:56:15 +0300 Subject: [Buildroot] wpa_supplicant 2.10: ignored build options In-Reply-To: <3f79-620e1780-1-7f8ee50@116634595> References: <3f79-620e1780-1-7f8ee50@116634595> Message-ID: Hi Michael, > Hi Sergey, all, > > @Sergey: I put you on the list of recipients since you provided the version bump to buildroot. > > Since hostapd 2.10 the wpa_supplicant build ignores the two options CONFIG_BUILD_WPA_CLIENT_SO and CONFIG_NO_WPA_PASSPHRASE. > > This leads to the following build error in buildroot when BR2_PACKAGE_WPA_SUPPLICANT_WPA_CLIENT_SO is selected: > > /usr/bin/install: cannot stat '/buildroot/build/build/wpa_supplicant-2.10/wpa_supplicant/libwpa_client.so': No such file or directory > > The Bug was probably introduced with commit [0] which reworked the .config parsing. > The two mentioned options are now evaluated before the .config file is parsed an thus ignored. > > I'm not familiar enough with the wpa_supplicant build to come up with a proper patch. But maybe someone is willing to take a look at this. > > Regards, > Michael > > [0] https://w1.fi/cgit/hostap/commit/wpa_supplicant/Makefile?id=a41a29192e5d196444fc8859100762b04ff0d1c2 Thanks for heads-up ! Buildroot CI has already reported this problem: http://autobuild.buildroot.net/results/001981339f3b895ecd9208a747a0e47d07c9583a/ I plan take a look at hostapd/wpa_s failures over the weekend. Regards, Sergey From peter at korsgaard.com Thu Feb 17 13:12:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Feb 2022 14:12:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/wpewebkit: bump version to 2.34.2 In-Reply-To: <20220217133620.GB757559@momiji> (Adrian Perez de Castro's message of "Thu, 17 Feb 2022 13:36:20 +0100") References: <20211124205607.3021277-1-aperez@igalia.com> <87mtjlwlvo.fsf@dell.be.48ers.dk> <20220124161611.GB162969@momiji> <20220217133620.GB757559@momiji> Message-ID: <87a6epfxi3.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 > Here we go: https://bugs.webkit.org/show_bug.cgi?id=236770 ? turns out the > build was broken in the development branch as well, and I plan to backport > the patch to 2.34.x. >> Also I just submitted some moments ago a small patch to update the WPE WebKit >> package to 2.34.4 as well. > I am releasing 2.34.6 this week, which will include the patch mentioned > above, so I will submit directly an update to 2.34.6 once it has been > published. Ok. Even though we are post-rc1, I think it still makes sense to include this on master for 2022.02. -- Bye, Peter Korsgaard From giulio.benetti at benettiengineering.com Thu Feb 17 13:29:11 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 17 Feb 2022 14:29:11 +0100 Subject: [Buildroot] [PATCH 1/1] package/cryptsetup: fix build failure with libgcrypt In-Reply-To: <20220217074338.147889-1-moritz@h6t.eu> References: <20220217074338.147889-1-moritz@h6t.eu> Message-ID: <1544B961-F072-436D-9887-4EC3CFDC4CD3@benettiengineering.com> Hi Moritz, > Il giorno 17 feb 2022, alle ore 08:55, Moritz Bitsch via buildroot ha scritto: > > ?From: Moritz Bitsch > > The patch 0001-Add-check-program-for-symver-attribute.patch touches > a autoconf relevant file which causes a configure --recheck in the > make step without proper CONF_ENV. Running autoreconf prevents this. Thank you for the contribution, but Fabrice already sent a patch for that: https://patchwork.ozlabs.org/project/buildroot/patch/20220213210504.1416861-1-fontaine.fabrice at gmail.com/ I suggest you to always check patchwork before working on a patch. (Yes, it happened to me too some time :-)). Best regards Giulio > > Signed-off-by: Moritz Bitsch > --- > package/cryptsetup/cryptsetup.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk > index 2e06047c56..8373f0ab74 100644 > --- a/package/cryptsetup/cryptsetup.mk > +++ b/package/cryptsetup/cryptsetup.mk > @@ -19,6 +19,7 @@ CRYPTSETUP_CPE_ID_VENDOR = cryptsetup_project > CRYPTSETUP_INSTALL_STAGING = YES > CRYPTSETUP_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)" > CRYPTSETUP_CONF_OPTS += --enable-blkid --enable-libargon2 > +CRYPTSETUP_AUTORECONF = YES > > # cryptsetup uses libgcrypt by default, but can be configured to use OpenSSL > # or kernel crypto modules instead > -- > 2.35.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -------------- next part -------------- An HTML attachment was scrubbed... URL: From fontaine.fabrice at gmail.com Thu Feb 17 13:46:37 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 17 Feb 2022 14:46:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5base: put back riscv32 patch Message-ID: <20220217134637.3728619-1-fontaine.fabrice@gmail.com> Commit 5770a645a3a49a3f0f02972131a4ff5283b4c11e wrongly removed riscv32 patch resulting in the following build failure: In file included from thread/qmutex_linux.cpp:45, from thread/qmutex.cpp:806: 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 Fixes: - http://autobuild.buildroot.org/results/ff90bc7680acf1487ed58e5e25cf1a5f13dfaedb Signed-off-by: Fabrice Fontaine --- .../qt5base/0007-Fix-build-on-riscv32.patch | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 package/qt5/qt5base/0007-Fix-build-on-riscv32.patch diff --git a/package/qt5/qt5base/0007-Fix-build-on-riscv32.patch b/package/qt5/qt5base/0007-Fix-build-on-riscv32.patch new file mode 100644 index 0000000000..5561acb9ae --- /dev/null +++ b/package/qt5/qt5base/0007-Fix-build-on-riscv32.patch @@ -0,0 +1,46 @@ +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] +Signed-off-by: Fabrice Fontaine +--- + 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 + -- 2.34.1 From peter at korsgaard.com Thu Feb 17 13:48:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Feb 2022 14:48:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/cgilua: add CGILUA_CPE_ID_VENDOR In-Reply-To: <20220131220240.127249-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 31 Jan 2022 23:02:40 +0100") References: <20220131220240.127249-1-fontaine.fabrice@gmail.com> Message-ID: <874k4xfvtc.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > 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 Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 17 13:48:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Feb 2022 14:48:06 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/cgilua: add CGILUA_CPE_ID_VENDOR Message-ID: <20220217134157.6B4A983776@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5b46038f99d4a8d0492c2b25b72ed15e0e24c206 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x 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 Signed-off-by: Thomas Petazzoni (cherry picked from commit 755116460b8de88cb833ab4bf37649a7fb26728d) Signed-off-by: Peter Korsgaard --- package/cgilua/cgilua.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/cgilua/cgilua.mk b/package/cgilua/cgilua.mk index cd78841fdb..5994dfc838 100644 --- a/package/cgilua/cgilua.mk +++ b/package/cgilua/cgilua.mk @@ -7,5 +7,6 @@ CGILUA_VERSION = 5.2.1-1 CGILUA_LICENSE = MIT CGILUA_LICENSE_FILES = $(CGILUA_SUBDIR)/doc/us/license.html +CGILUA_CPE_ID_VENDOR = keplerproject $(eval $(luarocks-package)) From peter at korsgaard.com Thu Feb 17 13:53:48 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Feb 2022 14:53:48 +0100 Subject: [Buildroot] [PATCH v1] DEVELOPERS: Add packages guile and bdwgc to Pedro Aguilar In-Reply-To: <20220206092048.1901703-1-paguilar@paguilar.org> (Pedro Aguilar's message of "Sun, 6 Feb 2022 10:20:48 +0100") References: <20220206092048.1901703-1-paguilar@paguilar.org> Message-ID: <87zgmpeh03.fsf@dell.be.48ers.dk> >>>>> "Pedro" == Pedro Aguilar writes: > Signed-off-by: Pedro Aguilar Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 17 13:53:25 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Feb 2022 14:53:25 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] DEVELOPERS: add guile and bdwgc packages to Pedro Aguilar Message-ID: <20220217134615.DC23882792@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b96f2215394e378835188f7551ba3c05d47f6782 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Pedro Aguilar Signed-off-by: Thomas Petazzoni (cherry picked from commit 437543c7d907943a159870a4b04efa88e36cc460) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 7ec36e2185..bd8c99a229 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2000,6 +2000,8 @@ F: package/lightning/ F: package/umtprd/ N: Pedro Aguilar +F: package/bdwgc/ +F: package/guile/ F: package/libunistring/ N: Peter Korsgaard From fontaine.fabrice at gmail.com Thu Feb 17 13:55:39 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 17 Feb 2022 14:55:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/safeclib: disable tests Message-ID: <20220217135539.3784058-1-fontaine.fabrice@gmail.com> Disable tests to avoid the following build failure raised since bump to version 3.7.1 in commit cc27267ae41bf44276c63b1e86042c4fae4adf50 and https://github.com/rurban/safeclib/commit/b90c52b1691fe82ce0a0681a503e1d45584f0162: In file included from perf_memcpy32_s.c:7: perf_private.h: In function 'rdtsc': perf_private.h:72:3: error: 'asm' undeclared (first use in this function) 72 | asm volatile("mrc p15, 0, %0, c9, c14, 0" : "=r"(pmuseren)); | ^~~ Fixes: - http://autobuild.buildroot.org/results/ceb13c071b1461eb6d73f5940d6b010095127f41 Signed-off-by: Fabrice Fontaine --- .../0001-Add-an-option-to-disable-tests.patch | 66 +++++++++++++++++++ package/safeclib/safeclib.mk | 4 +- 2 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 package/safeclib/0001-Add-an-option-to-disable-tests.patch diff --git a/package/safeclib/0001-Add-an-option-to-disable-tests.patch b/package/safeclib/0001-Add-an-option-to-disable-tests.patch new file mode 100644 index 0000000000..420578fe2e --- /dev/null +++ b/package/safeclib/0001-Add-an-option-to-disable-tests.patch @@ -0,0 +1,66 @@ +From 55b861a098434843f5614adcaab469defed95321 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 17 Feb 2022 14:36:51 +0100 +Subject: [PATCH] Add an option to disable tests + +Add an option to disable tests which are not always needed (e.g. on +embedded systems) and can raise the following build failure on some +architectures such as ARM cortex-a9: + +In file included from perf_memcpy32_s.c:7: +perf_private.h: In function 'rdtsc': +perf_private.h:72:3: error: 'asm' undeclared (first use in this function) + 72 | asm volatile("mrc p15, 0, %0, c9, c14, 0" : "=r"(pmuseren)); + | ^~~ + +Fixes: + - http://autobuild.buildroot.org/results/ceb13c071b1461eb6d73f5940d6b010095127f41 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/rurban/safeclib/pull/115] +--- + Makefile.am | 6 +++++- + configure.ac | 10 ++++++++++ + 2 files changed, 15 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 429a84b2..7d14afb6 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -34,7 +34,11 @@ + ACLOCAL_AMFLAGS = -I m4 --install ${ACLOCAL_FLAGS} + + # Sub-directories to preform recursive make in +-SUBDIRS = src tests ++SUBDIRS = src ++ ++if ENABLE_TESTS ++SUBDIRS += tests ++endif + + # Library header files + pkginclude_HEADERS = \ +diff --git a/configure.ac b/configure.ac +index b7fd03e9..8c8fbee7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -360,6 +360,16 @@ AC_ARG_ENABLE(doc, + esac], [enable_doc=true]) + AM_CONDITIONAL(ENABLE_DOC, test "x$enable_doc" = "xtrue") + ++AC_ARG_ENABLE(tests, ++ AS_HELP_STRING([--disable-tests], ++ [disable tests @<:@default=no@:>@]), ++ [case "${enableval}" in ++ yes) enable_tests=true ;; ++ no) enable_tests=false ;; ++ *) AC_MSG_ERROR([bad value ${enableval} for --enable-tests]) ;; ++ esac], [enable_tests=true]) ++AM_CONDITIONAL(ENABLE_TESTS, test "x$enable_tests" = "xtrue") ++ + dnl for windows dllimport. checking pic_flag DLL_EXPORT would be better, + dnl but this is only enabled for the shared objs, and we need it in the config + dnl for our tests. +-- +2.34.1 + diff --git a/package/safeclib/safeclib.mk b/package/safeclib/safeclib.mk index bc58c1a38c..8f909f729b 100644 --- a/package/safeclib/safeclib.mk +++ b/package/safeclib/safeclib.mk @@ -11,9 +11,11 @@ SAFECLIB_SOURCE = safeclib-$(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_ENV = CFLAGS="$(TARGET_CFLAGS) -std=c99" # -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 +SAFECLIB_CONF_OPTS = --disable-hardening --disable-tests $(eval $(autotools-package)) -- 2.34.1 From peter at korsgaard.com Thu Feb 17 13:53:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Feb 2022 14:53:17 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] DEVELOPERS: add guile and bdwgc packages to Pedro Aguilar Message-ID: <20220217134828.B34E88377F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=59f0bb204f8b6b5873f758ca3f9d00cf029c8b08 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Pedro Aguilar Signed-off-by: Thomas Petazzoni (cherry picked from commit 437543c7d907943a159870a4b04efa88e36cc460) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 2f202e1f19..2cc5a12ef9 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2098,6 +2098,8 @@ F: package/lightning/ F: package/umtprd/ N: Pedro Aguilar +F: package/bdwgc/ +F: package/guile/ F: package/libunistring/ N: Peter Korsgaard From peter at korsgaard.com Thu Feb 17 13:48:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Feb 2022 14:48:00 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/cgilua: add CGILUA_CPE_ID_VENDOR Message-ID: <20220217134828.A5FBF8377B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f7d2453564c7aff2b9eefe91b7d188d888a8d03e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x 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 Signed-off-by: Thomas Petazzoni (cherry picked from commit 755116460b8de88cb833ab4bf37649a7fb26728d) Signed-off-by: Peter Korsgaard --- 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)) From marcus.hoffmann at othermo.de Thu Feb 17 14:21:19 2022 From: marcus.hoffmann at othermo.de (Marcus Hoffmann) Date: Thu, 17 Feb 2022 15:21:19 +0100 Subject: [Buildroot] [PATCH] package/rauc: add option to enable gpt support Message-ID: <20220217142120.576220-1-marcus.hoffmann@othermo.de> GPT support was disabled by default before. Signed-off-by: Marcus Hoffmann --- package/rauc/Config.in | 6 ++++++ package/rauc/rauc.mk | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/package/rauc/Config.in b/package/rauc/Config.in index b4f7b81948..2ea51f5bad 100644 --- a/package/rauc/Config.in +++ b/package/rauc/Config.in @@ -25,6 +25,12 @@ config BR2_PACKAGE_RAUC_DBUS This option enables support for controlling rauc through D-Bus. +config BR2_PACKAGE_RAUC_GPT + bool "GPT support" + select BR2_PACKAGE_UTIL_LINUX_LIBFDISK + help + This option enables support for GPT partition tables. + config BR2_PACKAGE_RAUC_NETWORK bool "network support" select BR2_PACKAGE_LIBCURL diff --git a/package/rauc/rauc.mk b/package/rauc/rauc.mk index 39f5255812..0a631c4092 100644 --- a/package/rauc/rauc.mk +++ b/package/rauc/rauc.mk @@ -19,6 +19,13 @@ else RAUC_CONF_OPTS += --disable-service endif +ifeq ($(BR2_PACKAGE_RAUC_GPT),y) +RAUC_CONF_OPTS += --enable-gpt +RAUC_DEPENDENCIES += util-linux-libs +else +RAUC_CONF_OPTS += --disable-gpt +endif + ifeq ($(BR2_PACKAGE_RAUC_NETWORK),y) RAUC_CONF_OPTS += --enable-network RAUC_DEPENDENCIES += libcurl -- 2.25.1 From aperez at igalia.com Thu Feb 17 15:09:35 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Thu, 17 Feb 2022 16:09:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/wpewebkit: bump version to 2.34.2 In-Reply-To: <87a6epfxi3.fsf@dell.be.48ers.dk> References: <20211124205607.3021277-1-aperez@igalia.com> <87mtjlwlvo.fsf@dell.be.48ers.dk> <20220124161611.GB162969@momiji> <20220217133620.GB757559@momiji> <87a6epfxi3.fsf@dell.be.48ers.dk> Message-ID: <20220217160935.GB804216@momiji> On Thu, 17 Feb 2022 14:12:04 +0100 Peter Korsgaard wrote: > >>>>> "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 > > > Here we go: https://bugs.webkit.org/show_bug.cgi?id=236770 ? turns out the > > build was broken in the development branch as well, and I plan to backport > > the patch to 2.34.x. > > >> Also I just submitted some moments ago a small patch to update the WPE WebKit > >> package to 2.34.4 as well. > > > I am releasing 2.34.6 this week, which will include the patch mentioned > > above, so I will submit directly an update to 2.34.6 once it has been > > published. > > Ok. Even though we are post-rc1, I think it still makes sense to include > this on master for 2022.02. Yay, good to know we can look into having the latest stable there. The releases are now done: https://wpewebkit.org/release/wpewebkit-2.34.6.html https://webkitgtk.org/2022/02/17/webkitgtk2.34.6-released.html We still don't have the corresponding advisory published (there is a security fix included which has a CVE number), but I am starting right now to prepare the patches to update the Buildroot packages =) 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 marcus.hoffmann at othermo.de Thu Feb 17 15:10:54 2022 From: marcus.hoffmann at othermo.de (Marcus Hoffmann) Date: Thu, 17 Feb 2022 16:10:54 +0100 Subject: [Buildroot] [PATCH 2/2] board/orangepi/orangepi-rk3399/genimage: fix partition types for gpt In-Reply-To: <20220217151054.865073-1-marcus.hoffmann@othermo.de> References: <20220217151054.865073-1-marcus.hoffmann@othermo.de> Message-ID: <20220217151054.865073-3-marcus.hoffmann@othermo.de> Fixes: ERROR: hdimage(sdcard.img): part boot: 'partition-type' is only valid for mbr and hybrid partition-table-type Signed-off-by: Marcus Hoffmann --- board/orangepi/orangepi-rk3399/genimage.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/board/orangepi/orangepi-rk3399/genimage.cfg b/board/orangepi/orangepi-rk3399/genimage.cfg index c94e0bc7cc..a02166172f 100644 --- a/board/orangepi/orangepi-rk3399/genimage.cfg +++ b/board/orangepi/orangepi-rk3399/genimage.cfg @@ -26,14 +26,13 @@ image sdcard.img { } partition boot { - partition-type = 0xC + partition-type-uuid = F bootable = "true" image = "boot.vfat" offset = 16M } partition rootfs { - partition-type = 0x83 image = "rootfs.ext4" } } -- 2.25.1 From marcus.hoffmann at othermo.de Thu Feb 17 15:10:52 2022 From: marcus.hoffmann at othermo.de (Marcus Hoffmann) Date: Thu, 17 Feb 2022 16:10:52 +0100 Subject: [Buildroot] [PATCH 0/2] defconfig fixes Message-ID: <20220217151054.865073-1-marcus.hoffmann@othermo.de> I was looking at some of the defconfigs and found these two easy to fix issues. I don't have those boards, so these are not tested besides being able to compile them again. Marcus Hoffmann (2): configs/friendlyarm_nanopi_r2s_defconfig: uboot needs openssl board/orangepi/orangepi-rk3399/genimage: fix partition types for gpt board/orangepi/orangepi-rk3399/genimage.cfg | 3 +-- configs/friendlyarm_nanopi_r2s_defconfig | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.25.1 From marcus.hoffmann at othermo.de Thu Feb 17 15:10:53 2022 From: marcus.hoffmann at othermo.de (Marcus Hoffmann) Date: Thu, 17 Feb 2022 16:10:53 +0100 Subject: [Buildroot] [PATCH 1/2] configs/friendlyarm_nanopi_r2s_defconfig: uboot needs openssl In-Reply-To: <20220217151054.865073-1-marcus.hoffmann@othermo.de> References: <20220217151054.865073-1-marcus.hoffmann@othermo.de> Message-ID: <20220217151054.865073-2-marcus.hoffmann@othermo.de> Fixes the following compile error: In file included from include/bootm.h:10, from tools/image-host.c:12: include/image.h:1178:12: fatal error: openssl/evp.h: No such file or directory 1178 | # include | ^~~~~~~~~~~~~~~ compilation terminated. Signed-off-by: Marcus Hoffmann --- configs/friendlyarm_nanopi_r2s_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/friendlyarm_nanopi_r2s_defconfig b/configs/friendlyarm_nanopi_r2s_defconfig index 818c847f4b..ce252a5d76 100644 --- a/configs/friendlyarm_nanopi_r2s_defconfig +++ b/configs/friendlyarm_nanopi_r2s_defconfig @@ -30,6 +30,7 @@ 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_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -- 2.25.1 From giulio.benetti at benettiengineering.com Thu Feb 17 15:20:59 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 17 Feb 2022 16:20:59 +0100 Subject: [Buildroot] [PATCH 1/2] configs/friendlyarm_nanopi_r2s_defconfig: uboot needs openssl In-Reply-To: <20220217151054.865073-2-marcus.hoffmann@othermo.de> References: <20220217151054.865073-2-marcus.hoffmann@othermo.de> Message-ID: <2B25121E-F5E4-4E61-BEA4-627E5689E813@benettiengineering.com> Hi Marcus, > Il giorno 17 feb 2022, alle ore 16:11, Marcus Hoffmann ha scritto: > > ?Fixes the following compile error: > > In file included from include/bootm.h:10, > from tools/image-host.c:12: > include/image.h:1178:12: fatal error: openssl/evp.h: No such file or directory > 1178 | # include > | ^~~~~~~~~~~~~~~ > compilation terminated. > > Signed-off-by: Marcus Hoffmann > --- > configs/friendlyarm_nanopi_r2s_defconfig | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/configs/friendlyarm_nanopi_r2s_defconfig b/configs/friendlyarm_nanopi_r2s_defconfig > index 818c847f4b..ce252a5d76 100644 > --- a/configs/friendlyarm_nanopi_r2s_defconfig > +++ b/configs/friendlyarm_nanopi_r2s_defconfig > @@ -30,6 +30,7 @@ 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_PYLIBFDT=y > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y > BR2_TARGET_UBOOT_FORMAT_CUSTOM=y Thank you for the patch, have you verified it?s enough by building it using utils/docker-run? Best regards Giulio > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From marcus.hoffmann at othermo.de Thu Feb 17 15:22:25 2022 From: marcus.hoffmann at othermo.de (Marcus Hoffmann) Date: Thu, 17 Feb 2022 16:22:25 +0100 Subject: [Buildroot] [PATCH 1/2] configs/friendlyarm_nanopi_r2s_defconfig: uboot needs openssl In-Reply-To: <2B25121E-F5E4-4E61-BEA4-627E5689E813@benettiengineering.com> References: <20220217151054.865073-2-marcus.hoffmann@othermo.de> <2B25121E-F5E4-4E61-BEA4-627E5689E813@benettiengineering.com> Message-ID: <6a7a1291-9bdd-74f6-e836-ff2426965762@othermo.de> Hi Gulio, On 17.02.22 16:20, Giulio Benetti wrote: > Hi Marcus, > >> Il giorno 17 feb 2022, alle ore 16:11, Marcus Hoffmann ha scritto: >> >> ?Fixes the following compile error: >> >> In file included from include/bootm.h:10, >> from tools/image-host.c:12: >> include/image.h:1178:12: fatal error: openssl/evp.h: No such file or directory >> 1178 | # include >> | ^~~~~~~~~~~~~~~ >> compilation terminated. >> >> Signed-off-by: Marcus Hoffmann >> --- >> configs/friendlyarm_nanopi_r2s_defconfig | 1 + >> 1 file changed, 1 insertion(+) >> >> diff --git a/configs/friendlyarm_nanopi_r2s_defconfig b/configs/friendlyarm_nanopi_r2s_defconfig >> index 818c847f4b..ce252a5d76 100644 >> --- a/configs/friendlyarm_nanopi_r2s_defconfig >> +++ b/configs/friendlyarm_nanopi_r2s_defconfig >> @@ -30,6 +30,7 @@ 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_PYLIBFDT=y >> +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y >> BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y >> BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y >> BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > > Thank you for the patch, have you verified it?s enough by building it using utils/docker-run? Yes, this fixes the build with docker-run. (same for the other defconfig) Marcus > > Best regards > Giulio > >> -- >> 2.25.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > From giulio.benetti at benettiengineering.com Thu Feb 17 15:27:12 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 17 Feb 2022 16:27:12 +0100 Subject: [Buildroot] [PATCH 2/2] board/orangepi/orangepi-rk3399/genimage: fix partition types for gpt In-Reply-To: <20220217151054.865073-3-marcus.hoffmann@othermo.de> References: <20220217151054.865073-3-marcus.hoffmann@othermo.de> Message-ID: <964BF830-917A-4CFE-A8BE-DD8DCA18A9F8@benettiengineering.com> Hi Marcus, > Il giorno 17 feb 2022, alle ore 16:11, Marcus Hoffmann ha scritto: > > ?Fixes: > ERROR: hdimage(sdcard.img): part boot: 'partition-type' is only valid > for mbr and hybrid partition-table-type Here you should add: Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2103784375 Thank you Best regards > Signed-off-by: Marcus Hoffmann > --- > board/orangepi/orangepi-rk3399/genimage.cfg | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/board/orangepi/orangepi-rk3399/genimage.cfg b/board/orangepi/orangepi-rk3399/genimage.cfg > index c94e0bc7cc..a02166172f 100644 > --- a/board/orangepi/orangepi-rk3399/genimage.cfg > +++ b/board/orangepi/orangepi-rk3399/genimage.cfg > @@ -26,14 +26,13 @@ image sdcard.img { > } > > partition boot { > - partition-type = 0xC > + partition-type-uuid = F > bootable = "true" > image = "boot.vfat" > offset = 16M > } > > partition rootfs { > - partition-type = 0x83 > image = "rootfs.ext4" > } > } > -- > 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 giulio.benetti at benettiengineering.com Thu Feb 17 15:32:43 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 17 Feb 2022 16:32:43 +0100 Subject: [Buildroot] [PATCH 1/2] configs/friendlyarm_nanopi_r2s_defconfig: uboot needs openssl In-Reply-To: <6a7a1291-9bdd-74f6-e836-ff2426965762@othermo.de> References: <20220217151054.865073-2-marcus.hoffmann@othermo.de> <2B25121E-F5E4-4E61-BEA4-627E5689E813@benettiengineering.com> <6a7a1291-9bdd-74f6-e836-ff2426965762@othermo.de> Message-ID: <71ed8019-6b60-7365-6405-b65286a98ad0@benettiengineering.com> On 17/02/22 16:22, Marcus Hoffmann wrote: > Hi Gulio, > > On 17.02.22 16:20, Giulio Benetti wrote: >> Hi Marcus, >> >>> Il giorno 17 feb 2022, alle ore 16:11, Marcus Hoffmann ha scritto: >>> >>> ?Fixes the following compile error: >>> >>> In file included from include/bootm.h:10, >>> from tools/image-host.c:12: >>> include/image.h:1178:12: fatal error: openssl/evp.h: No such file or directory >>> 1178 | # include >>> | ^~~~~~~~~~~~~~~ >>> compilation terminated. >>> >>> Signed-off-by: Marcus Hoffmann >>> --- >>> configs/friendlyarm_nanopi_r2s_defconfig | 1 + >>> 1 file changed, 1 insertion(+) >>> >>> diff --git a/configs/friendlyarm_nanopi_r2s_defconfig b/configs/friendlyarm_nanopi_r2s_defconfig >>> index 818c847f4b..ce252a5d76 100644 >>> --- a/configs/friendlyarm_nanopi_r2s_defconfig >>> +++ b/configs/friendlyarm_nanopi_r2s_defconfig >>> @@ -30,6 +30,7 @@ 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_PYLIBFDT=y >>> +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y >>> BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y >>> BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y >>> BR2_TARGET_UBOOT_FORMAT_CUSTOM=y >> >> Thank you for the patch, have you verified it?s enough by building it using utils/docker-run? > > Yes, this fixes the build with docker-run. (same for the other defconfig) Perfect, can you re-send both patches with: "Fixes:" in commit log? tag? Thank you! Best regards -- Giulio Benetti Benetti Engineering sas > Marcus > >> >> Best regards >> Giulio >> >>> -- >>> 2.25.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 giulio.benetti at benettiengineering.com Thu Feb 17 15:45:06 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 17 Feb 2022 16:45:06 +0100 Subject: [Buildroot] [PATCH v3 3/3] DEVELOPERS: add Yu-Chien Lin to board/andes In-Reply-To: <20220215053327.4046-3-peterlin@andestech.com> References: <20220215053327.4046-1-peterlin@andestech.com> <20220215053327.4046-3-peterlin@andestech.com> Message-ID: <40c0d4fa-1dd3-c41b-09a7-61a031e76880@benettiengineering.com> Hi Peter, On 15/02/22 06:33, Yu Chien Peter Lin wrote: > Nylon is no longer at Andes. > > Signed-off-by: Yu Chien Peter Lin > Signed-off-by: Alan Kao Reviewed-by: Giulio Benetti Best regards -- Giulio Benetti Benetti Engineering sas > --- > DEVELOPERS | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/DEVELOPERS b/DEVELOPERS > index ac702d8d0f..8848d6a9a7 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -2146,9 +2146,10 @@ 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_ae350_45_defconfig > F: configs/andes_ae3xx_defconfig > F: toolchain/toolchain-external/toolchain-external-andes-nds32/ > From giulio.benetti at benettiengineering.com Thu Feb 17 15:55:49 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 17 Feb 2022 16:55:49 +0100 Subject: [Buildroot] [PATCH v3 1/3] board/andes: rearrange nds32 folder structure In-Reply-To: <20220215053327.4046-1-peterlin@andestech.com> References: <20220215053327.4046-1-peterlin@andestech.com> Message-ID: Hi Peter, On 15/02/22 06:33, Yu Chien Peter Lin wrote: > Rearrange nds32 folder structure to add AE350 platform. > > Signed-off-by: Yu Chien Peter Lin > Signed-off-by: Alan Kao > --- > .../patches/linux/0001-nds32-Fix-boot-messages-garbled.patch | 0 > ...2-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch | 0 > board/andes/{ => ae3xx}/readme.txt | 0 > configs/andes_ae3xx_defconfig | 2 +- > 4 files changed, 1 insertion(+), 1 deletion(-) > rename board/andes/{ => ae3xx}/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch (100%) > rename board/andes/{ => ae3xx}/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch (100%) > rename board/andes/{ => ae3xx}/readme.txt (100%) Here we have both: board/andes/ae3xx and board/andes/ae350 ae3xx should be use for every ae3xx family(ae350 included), but for ae350 you use a specific folder. What I see digging into ae3xx is that it is for FPGA demonstration, so I would move ae3xx directory to be name as ae3xx-fpga. Otherwise I would expect ae350(and newer parts) to be part of ae3xx. Same goes for the defconfig, I would name it like: andes_ae3xx_fpga_defconfig This way we can divide the 2 typologies: - fpga demonostration for ae3xx - ae3xx SoC family Otherwise you should provide a single family folder(ae3xx) compatible for both fpgas and SoCs. Thank you Best regards -- Giulio Benetti Benetti Engineering sas > 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/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch b/board/andes/ae3xx/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch > similarity index 100% > rename from board/andes/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch > rename to board/andes/ae3xx/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.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 From marcus.hoffmann at othermo.de Thu Feb 17 15:55:47 2022 From: marcus.hoffmann at othermo.de (Marcus Hoffmann) Date: Thu, 17 Feb 2022 16:55:47 +0100 Subject: [Buildroot] [PATCH v2 0/2] defconfig fixes Message-ID: <20220217155549.1084829-1-marcus.hoffmann@othermo.de> I was looking at some of the defconfigs and found these two easy to fix issues. I don't have those boards, so these are not tested besides being able to compile them again. Changes v1 -> v2: - Add references to gitlab CI's defconfig run failures (Giulio Benetti) Marcus Hoffmann (2): configs/friendlyarm_nanopi_r2s_defconfig: uboot needs openssl board/orangepi/orangepi-rk3399/genimage: fix partition types for gpt board/orangepi/orangepi-rk3399/genimage.cfg | 3 +-- configs/friendlyarm_nanopi_r2s_defconfig | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.25.1 From marcus.hoffmann at othermo.de Thu Feb 17 15:55:49 2022 From: marcus.hoffmann at othermo.de (Marcus Hoffmann) Date: Thu, 17 Feb 2022 16:55:49 +0100 Subject: [Buildroot] [PATCH v2 2/2] board/orangepi/orangepi-rk3399/genimage: fix partition types for gpt In-Reply-To: <20220217155549.1084829-1-marcus.hoffmann@othermo.de> References: <20220217155549.1084829-1-marcus.hoffmann@othermo.de> Message-ID: <20220217155549.1084829-3-marcus.hoffmann@othermo.de> Fixes the following error during image generation: ERROR: hdimage(sdcard.img): part boot: 'partition-type' is only valid for mbr and hybrid partition-table-type Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2103784375 Signed-off-by: Marcus Hoffmann --- board/orangepi/orangepi-rk3399/genimage.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/board/orangepi/orangepi-rk3399/genimage.cfg b/board/orangepi/orangepi-rk3399/genimage.cfg index c94e0bc7cc..a02166172f 100644 --- a/board/orangepi/orangepi-rk3399/genimage.cfg +++ b/board/orangepi/orangepi-rk3399/genimage.cfg @@ -26,14 +26,13 @@ image sdcard.img { } partition boot { - partition-type = 0xC + partition-type-uuid = F bootable = "true" image = "boot.vfat" offset = 16M } partition rootfs { - partition-type = 0x83 image = "rootfs.ext4" } } -- 2.25.1 From marcus.hoffmann at othermo.de Thu Feb 17 15:55:48 2022 From: marcus.hoffmann at othermo.de (Marcus Hoffmann) Date: Thu, 17 Feb 2022 16:55:48 +0100 Subject: [Buildroot] [PATCH v2 1/2] configs/friendlyarm_nanopi_r2s_defconfig: uboot needs openssl In-Reply-To: <20220217155549.1084829-1-marcus.hoffmann@othermo.de> References: <20220217155549.1084829-1-marcus.hoffmann@othermo.de> Message-ID: <20220217155549.1084829-2-marcus.hoffmann@othermo.de> Fixes the following compile error: In file included from include/bootm.h:10, from tools/image-host.c:12: include/image.h:1178:12: fatal error: openssl/evp.h: No such file or directory 1178 | # include | ^~~~~~~~~~~~~~~ compilation terminated. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2103784200 Signed-off-by: Marcus Hoffmann --- configs/friendlyarm_nanopi_r2s_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/friendlyarm_nanopi_r2s_defconfig b/configs/friendlyarm_nanopi_r2s_defconfig index 818c847f4b..ce252a5d76 100644 --- a/configs/friendlyarm_nanopi_r2s_defconfig +++ b/configs/friendlyarm_nanopi_r2s_defconfig @@ -30,6 +30,7 @@ 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_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -- 2.25.1 From giulio.benetti at benettiengineering.com Thu Feb 17 15:58:28 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 17 Feb 2022 16:58:28 +0100 Subject: [Buildroot] [PATCH v2 1/2] configs/friendlyarm_nanopi_r2s_defconfig: uboot needs openssl In-Reply-To: <20220217155549.1084829-2-marcus.hoffmann@othermo.de> References: <20220217155549.1084829-1-marcus.hoffmann@othermo.de> <20220217155549.1084829-2-marcus.hoffmann@othermo.de> Message-ID: On 17/02/22 16:55, Marcus Hoffmann wrote: > Fixes the following compile error: > > In file included from include/bootm.h:10, > from tools/image-host.c:12: > include/image.h:1178:12: fatal error: openssl/evp.h: No such file or directory > 1178 | # include > | ^~~~~~~~~~~~~~~ > compilation terminated. > > Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2103784200 > > Signed-off-by: Marcus Hoffmann Reviewed-by: Giulio Benetti Best regards -- Giulio Benetti Benetti Engineering sas > --- > configs/friendlyarm_nanopi_r2s_defconfig | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/configs/friendlyarm_nanopi_r2s_defconfig b/configs/friendlyarm_nanopi_r2s_defconfig > index 818c847f4b..ce252a5d76 100644 > --- a/configs/friendlyarm_nanopi_r2s_defconfig > +++ b/configs/friendlyarm_nanopi_r2s_defconfig > @@ -30,6 +30,7 @@ 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_PYLIBFDT=y > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y > BR2_TARGET_UBOOT_FORMAT_CUSTOM=y From giulio.benetti at benettiengineering.com Thu Feb 17 15:58:47 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 17 Feb 2022 16:58:47 +0100 Subject: [Buildroot] [PATCH v2 2/2] board/orangepi/orangepi-rk3399/genimage: fix partition types for gpt In-Reply-To: <20220217155549.1084829-3-marcus.hoffmann@othermo.de> References: <20220217155549.1084829-1-marcus.hoffmann@othermo.de> <20220217155549.1084829-3-marcus.hoffmann@othermo.de> Message-ID: <918b0f89-7e30-bb9e-1d33-118001bb2846@benettiengineering.com> On 17/02/22 16:55, Marcus Hoffmann wrote: > Fixes the following error during image generation: > ERROR: hdimage(sdcard.img): part boot: 'partition-type' is only valid > for mbr and hybrid partition-table-type > > Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2103784375 > > Signed-off-by: Marcus Hoffmann Reviewed-by: Giulio Benetti Best regards -- Giulio Benetti Benetti Engineering sas > --- > board/orangepi/orangepi-rk3399/genimage.cfg | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/board/orangepi/orangepi-rk3399/genimage.cfg b/board/orangepi/orangepi-rk3399/genimage.cfg > index c94e0bc7cc..a02166172f 100644 > --- a/board/orangepi/orangepi-rk3399/genimage.cfg > +++ b/board/orangepi/orangepi-rk3399/genimage.cfg > @@ -26,14 +26,13 @@ image sdcard.img { > } > > partition boot { > - partition-type = 0xC > + partition-type-uuid = F > bootable = "true" > image = "boot.vfat" > offset = 16M > } > > partition rootfs { > - partition-type = 0x83 > image = "rootfs.ext4" > } > } From giulio.benetti at benettiengineering.com Thu Feb 17 16:01:26 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 17 Feb 2022 17:01:26 +0100 Subject: [Buildroot] [PATCH v3 2/3] board/andes/ae350: add support for Andes AE350 In-Reply-To: <20220215053327.4046-2-peterlin@andestech.com> References: <20220215053327.4046-1-peterlin@andestech.com> <20220215053327.4046-2-peterlin@andestech.com> Message-ID: <4710f7ce-7af1-f544-c038-cf7e6139f172@benettiengineering.com> Hi Peter, On 15/02/22 06:33, 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 > --- > Changes v1 -> v2: > - move linux source code and its patches to AndesTech Github repo > - rename ae350_andestar45_defconfig to andes_ae350_45_defconfig > - change C library to uClibc > - remove OpenSSL package > - remove rootfs.cpio and rootfs.tar > - update DEVELOPERS > Changes v2 -> v3: > - specifiy branch to download from AndesTech linux repo > - change boot.cmd to extlinux.conf > - add post-build.sh for extlinux.conf to retrieve Image and DTB > - fix format and update genimage_sdcard.cfg > - update readme.txt > - add packages (python3, pylibfdt and openssl) for u-boot binman > - reorder item in DEVELOPERS > --- > board/andes/ae350/ae350.dts | 274 ++++++++++++++++++ > board/andes/ae350/genimage_sdcard.cfg | 26 ++ > ...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/post-build.sh | 3 + > board/andes/ae350/readme.txt | 65 +++++ > .../boot/extlinux/extlinux.conf | 4 + > board/andes/ae350/uboot.config.fragment | 5 + > configs/andes_ae350_45_defconfig | 43 +++ > 13 files changed, 579 insertions(+) > create mode 100755 board/andes/ae350/ae350.dts > 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 100755 board/andes/ae350/post-build.sh > create mode 100644 board/andes/ae350/readme.txt > create mode 100644 board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf > 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/genimage_sdcard.cfg b/board/andes/ae350/genimage_sdcard.cfg > new file mode 100644 > index 0000000000..b8b9fe6a62 > --- /dev/null > +++ b/board/andes/ae350/genimage_sdcard.cfg > @@ -0,0 +1,26 @@ > +image boot.vfat { > + vfat { > + files = { > + "u-boot-spl.bin", > + "u-boot.itb", > + "ae350.dtb", > + } > + } > + size = 2M > +} > + > +image sdcard.img { > + hdimage { > + } > + > + partition boot { > + partition-type = 0xC > + image = "boot.vfat" > + } > + > + partition rootfs { > + partition-type = 0x83 > + bootable = true > + 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/post-build.sh b/board/andes/ae350/post-build.sh > new file mode 100755 > index 0000000000..0e6ce228f4 > --- /dev/null > +++ b/board/andes/ae350/post-build.sh > @@ -0,0 +1,3 @@ > +#!/bin/sh > +cp $BINARIES_DIR/Image $TARGET_DIR/boot > +cp $BINARIES_DIR/ae350.dtb $TARGET_DIR/boot > diff --git a/board/andes/ae350/readme.txt b/board/andes/ae350/readme.txt > new file mode 100644 > index 0000000000..6825468d50 > --- /dev/null > +++ b/board/andes/ae350/readme.txt > @@ -0,0 +1,65 @@ > +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/ > + |-- ae350.dtb > + |-- boot.vfat > + |-- fw_dynamic.bin > + |-- fw_dynamic.elf > + |-- fw_jump.bin > + |-- fw_jump.elf > + |-- Image > + |-- 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 > + $ sudo sync > + > +Your SD card partition should be: > + > + Disk /dev/sdb: 14.48 GiB, 15552479232 bytes, 30375936 sectors > + Disk model: Multi-Card > + Units: sectors of 1 * 512 = 512 bytes > + Sector size (logical/physical): 512 bytes / 512 bytes > + I/O size (minimum/optimal): 512 bytes / 512 bytes > + Disklabel type: dos > + Disk identifier: 0x00000000 > + > + Device Boot Start End Sectors Size Id Type > + /dev/sdb1 1 4096 4096 2M c W95 FAT32 (LBA) > + /dev/sdb2 * 4097 126976 122880 60M 83 Linux > + > +Insert SD card and reset the board, it should boot Linux from mmc. > diff --git a/board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf b/board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf > new file mode 100644 > index 0000000000..549eb93abc > --- /dev/null > +++ b/board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf > @@ -0,0 +1,4 @@ > +label linux > + kernel /boot/Image > + fdt /boot/ae350.dtb > + append earlycon=sbi root=/dev/mmcblk0p2 rootwait > 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..a35ddd06ba > --- /dev/null > +++ b/configs/andes_ae350_45_defconfig > @@ -0,0 +1,43 @@ > +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_OVERLAY="board/andes/ae350/rootfs_overlay" > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/andes/ae350/post-build.sh" > +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_GIT=y > +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/andestech/linux.git" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.10.84-ae350_45" > +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_PYTHON3=y > +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y > +# BR2_TARGET_UBOOT_FORMAT_BIN is not set > +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.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 This builds correctly in gitlab-CI container and looks good for me. Reviewed-by: Giulio Benetti Best regards -- Giulio Benetti Benetti Engineering sas From peter at korsgaard.com Thu Feb 17 16:34:12 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Feb 2022 17:34:12 +0100 Subject: [Buildroot] [PATCH] package/nfs-utils: nfsiostat used python3, not python2 In-Reply-To: <87tudcw0zg.fsf@dell.be.48ers.dk> (Peter Korsgaard's message of "Sun, 06 Feb 2022 14:58:27 +0100") References: <20220206131758.28001-1-peter@korsgaard.com> <87tudcw0zg.fsf@dell.be.48ers.dk> Message-ID: <87sfshe9kr.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: >>>>> "Peter" == Peter Korsgaard writes: > s/used/uses/ in the subject naturally. >> nfsiostat is a python3 script, so keep it if python3 is enabled and not >> python2: >> head -n 1 target/usr/sbin/nfsiostat >> #!/usr/bin/python3 >> Signed-off-by: Peter Korsgaard Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 17 16:35:18 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Feb 2022 17:35:18 +0100 Subject: [Buildroot] [PATCH 1/1] docs/manual: add section on start script recommendations In-Reply-To: (Arnout Vandecappelle's message of "Sun, 6 Feb 2022 16:37:09 +0100") References: <20211205102010.2834942-1-troglobit@gmail.com> Message-ID: <87o835e9ix.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle writes: > On 05/12/2021 11:20, Joachim Wiberg wrote: >> Signed-off-by: Joachim Wiberg >> --- >> docs/manual/adding-packages-directory.txt | 96 +++++++++++++++++++++++ >> docs/manual/configure.txt | 1 + >> 2 files changed, 97 insertions(+) >> >> diff --git a/docs/manual/adding-packages-directory.txt b/docs/manual/adding-packages-directory.txt >> index 4ceb3fd772..72e8dac5ff 100644 >> --- a/docs/manual/adding-packages-directory.txt >> +++ b/docs/manual/adding-packages-directory.txt >> @@ -554,3 +554,99 @@ over time. Such patches should not be downloaded, and instead be added >> locally to the package folder. >> If the +.hash+ file is missing, then no check is done at all. >> + >> +[[adding-packages-start-script]] >> +=== The +SNNfood+ start script >> + >> +Packages that provide a system daemon usually need to be started somehow >> +at boot. Buildroot comes with support for several init systems, some >> +are considered tier one (see xref:init-system[]), while others are also >> +available but do not have the same level of integration. The >> +recommended one in Buildroot is the BusyBox init. > I think the intention is that systemd is at the same level as busybox > init. And we generally don't distinguish between busybox init and SysV > init. > I made a few other small changes to the text and applied to master, thanks. Committed to 2021.02.x and 2021.11.x with the same changes, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 17 16:32:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Feb 2022 17:32:28 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/nfs-utils: nfsiostat uses python3, not python2 Message-ID: <20220217162844.B0A1A82210@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8e734ee44396fda79dc5c61e7d30e73b100730f9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x nfsiostat is a python3 script, so keep it if python3 is enabled and not python2: head -n 1 target/usr/sbin/nfsiostat #!/usr/bin/python3 Signed-off-by: Peter Korsgaard Reviewed-by: Petr Vorel Signed-off-by: Peter Korsgaard (cherry picked from commit cee035e4391417851fbbf41a1d4eb0c4d2ad60d4) Signed-off-by: Peter Korsgaard --- package/nfs-utils/nfs-utils.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk index 07b44b5a93..519d6cad3e 100644 --- a/package/nfs-utils/nfs-utils.mk +++ b/package/nfs-utils/nfs-utils.mk @@ -114,7 +114,7 @@ define NFS_UTILS_REMOVE_NFSIOSTAT endef # nfsiostat is interpreted python, so remove it unless it's in the target -NFS_UTILS_POST_INSTALL_TARGET_HOOKS += $(if $(BR2_PACKAGE_PYTHON),,NFS_UTILS_REMOVE_NFSIOSTAT) +NFS_UTILS_POST_INSTALL_TARGET_HOOKS += $(if $(BR2_PACKAGE_PYTHON3),,NFS_UTILS_REMOVE_NFSIOSTAT) define HOST_NFS_UTILS_BUILD_CMDS $(MAKE) -C $(@D)/tools/rpcgen From peter at korsgaard.com Thu Feb 17 16:23:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Feb 2022 17:23:21 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] toolchain: update gcc bug 99410 Message-ID: <20220217162844.A6DD6836E4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9d63e24e6a933e98670b486d623e0fa84f7d7fe5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Gcc bug 99410 reappeared in gcc 10.x while building belle-sip, but it's fixed on gcc 11.x, so let's update bug conditions. Fixes: http://autobuild.buildroot.net/results/846597f3573d3b0d52e80627a9577d14b9348547/ Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni (cherry picked from commit 88f79aead8fa750bc0e93ef8798751a4b463e9d9) Signed-off-by: Peter Korsgaard --- toolchain/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/toolchain/Config.in b/toolchain/Config.in index 140d07ca38..f63aec6735 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -191,11 +191,11 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_93847 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=99410 # Error: branch offset out of range on Nios II. This bug # no longer exists in gcc 8.x but reappeared on gcc 9.x and has been -# fixed on gcc 10.x. +# fixed on gcc 11.x. config BR2_TOOLCHAIN_HAS_GCC_BUG_99140 bool default y if !BR2_TOOLCHAIN_GCC_AT_LEAST_8 - default y if BR2_TOOLCHAIN_GCC_AT_LEAST_9 && !BR2_TOOLCHAIN_GCC_AT_LEAST_10 + default y if BR2_TOOLCHAIN_GCC_AT_LEAST_10 && !BR2_TOOLCHAIN_GCC_AT_LEAST_11 depends on BR2_nios2 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101737 From peter at korsgaard.com Thu Feb 17 16:34:52 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Feb 2022 17:34:52 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] docs/manual: add section on start script recommendations Message-ID: <20220217162844.BAEFC83797@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f4b18f72c93a4987bde541850fbef7ce1f2a06fc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Joachim Wiberg Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 4fe33a1b47ba9c1e90c2c794cefb13962ea89b99) Signed-off-by: Peter Korsgaard --- docs/manual/adding-packages-directory.txt | 96 +++++++++++++++++++++++++++++++ docs/manual/configure.txt | 1 + 2 files changed, 97 insertions(+) diff --git a/docs/manual/adding-packages-directory.txt b/docs/manual/adding-packages-directory.txt index 54d96451fe..23bd293a6c 100644 --- a/docs/manual/adding-packages-directory.txt +++ b/docs/manual/adding-packages-directory.txt @@ -554,3 +554,99 @@ over time. Such patches should not be downloaded, and instead be added locally to the package folder. If the +.hash+ file is missing, then no check is done at all. + +[[adding-packages-start-script]] +=== The +SNNfoo+ start script + +Packages that provide a system daemon usually need to be started somehow +at boot. Buildroot comes with support for several init systems, some +are considered tier one (see xref:init-system[]), while others are also +available but do not have the same level of integration. Ideally, all +packages providing a system daemon should provide a start script for +BusyBox/SysV init and a systemd unit file. + +For consistency, the start script must follow the style and composition +as shown in the reference: +package/busybox/S01syslogd+. An annotated +example of this style is shown below. There is no specific coding style +for systemd unit files, but if a package comes with its own unit file, +that is preferred over a buildroot specific one, if it is compatible +with buildroot. + +The name of the start script is composed of the +SNN+ and the daemon +name. The +NN+ is the start order number which needs to be carefully +chosen. For example, a program that requires networking to be up should +not start before +S40network+. The scripts are started in alphabetical +order, so +S01syslogd+ starts before +S01watchdogd+, and +S02sysctl+ +start thereafter. + +------------------------------ +01: #!/bin/sh +02: +03: DAEMON="syslogd" +04: PIDFILE="/var/run/$DAEMON.pid" +05: +06: SYSLOGD_ARGS="" +07: +08: # shellcheck source=/dev/null +09: [ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" +10: +11: # BusyBox' syslogd does not create a pidfile, so pass "-n" in the command line +12: # and use "-m" to instruct start-stop-daemon to create one. +13: start() { +14: printf 'Starting %s: ' "$DAEMON" +15: # shellcheck disable=SC2086 # we need the word splitting +16: start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/sbin/$DAEMON" \ +17: -- -n $SYSLOGD_ARGS +18: status=$? +19: if [ "$status" -eq 0 ]; then +20: echo "OK" +21: else +22: echo "FAIL" +23: fi +24: return "$status" +25: } +26: +27: stop() { +28: printf 'Stopping %s: ' "$DAEMON" +29: start-stop-daemon -K -q -p "$PIDFILE" +30: status=$? +31: if [ "$status" -eq 0 ]; then +32: rm -f "$PIDFILE" +33: echo "OK" +34: else +35: echo "FAIL" +36: fi +37: return "$status" +38: } +39: +40: restart() { +41: stop +42: sleep 1 +43: start +44: } +45: +46: case "$1" in +47: start|stop|restart) +48: "$1";; +49: reload) +50: # Restart, since there is no true "reload" feature. +51: restart;; +52: *) +53: echo "Usage: $0 {start|stop|restart|reload}" +54: exit 1 +55: esac +------------------------------ + +*Note:* programs that support reloading their configuration in some +fashion (+SIGHUP+) should provide a +reload()+ function similar to ++stop()+. The +start-stop-daemon+ supports +-K -s HUP+ for this. +It is recommended to always append +-x "/sbin/$DAEMON"+ to all the ++start-stop-daemon+ commands to ensure signals are set to a PID that +matches +$DAEMON+. + +Both start scripts and unit files can source command line arguments from ++/etc/default/foo+, in general, if such a file does not exist it should +not block the start of the daemon, unless there is some site specirfic +command line argument the daemon requires to start. For start scripts a ++FOO_ARGS="-s -o -m -e -args"+ can be defined to a default value in and +the user can override this from +/etc/default/foo+. diff --git a/docs/manual/configure.txt b/docs/manual/configure.txt index c9eef567f4..60860d2c71 100644 --- a/docs/manual/configure.txt +++ b/docs/manual/configure.txt @@ -377,6 +377,7 @@ good solution. Note that if +systemd+ is chosen as init system, /dev management will be performed by the +udev+ program provided by +systemd+. +[[init-system]] === init system The _init_ program is the first userspace program started by the From peter at korsgaard.com Thu Feb 17 16:33:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Feb 2022 17:33:51 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/nfs-utils: nfsiostat uses python3, not python2 Message-ID: <20220217162852.8C6F2836E4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c8d709529f0fff956032cadf5de68b517b3b38bd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x nfsiostat is a python3 script, so keep it if python3 is enabled and not python2: head -n 1 target/usr/sbin/nfsiostat #!/usr/bin/python3 Signed-off-by: Peter Korsgaard Reviewed-by: Petr Vorel Signed-off-by: Peter Korsgaard (cherry picked from commit cee035e4391417851fbbf41a1d4eb0c4d2ad60d4) Signed-off-by: Peter Korsgaard --- package/nfs-utils/nfs-utils.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk index ed0a23e151..f5d29ab535 100644 --- a/package/nfs-utils/nfs-utils.mk +++ b/package/nfs-utils/nfs-utils.mk @@ -93,7 +93,7 @@ define NFS_UTILS_REMOVE_NFSIOSTAT endef # nfsiostat is interpreted python, so remove it unless it's in the target -NFS_UTILS_POST_INSTALL_TARGET_HOOKS += $(if $(BR2_PACKAGE_PYTHON),,NFS_UTILS_REMOVE_NFSIOSTAT) +NFS_UTILS_POST_INSTALL_TARGET_HOOKS += $(if $(BR2_PACKAGE_PYTHON3),,NFS_UTILS_REMOVE_NFSIOSTAT) define HOST_NFS_UTILS_BUILD_CMDS $(MAKE) -C $(@D)/tools/rpcgen From peter at korsgaard.com Thu Feb 17 16:34:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Feb 2022 17:34:46 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] docs/manual: add section on start script recommendations Message-ID: <20220217162852.952A08378F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a0ccc8d268eafa07f654c27684eb3354c25c510c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Joachim Wiberg Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 4fe33a1b47ba9c1e90c2c794cefb13962ea89b99) Signed-off-by: Peter Korsgaard --- docs/manual/adding-packages-directory.txt | 96 +++++++++++++++++++++++++++++++ docs/manual/configure.txt | 1 + 2 files changed, 97 insertions(+) diff --git a/docs/manual/adding-packages-directory.txt b/docs/manual/adding-packages-directory.txt index 54d96451fe..23bd293a6c 100644 --- a/docs/manual/adding-packages-directory.txt +++ b/docs/manual/adding-packages-directory.txt @@ -554,3 +554,99 @@ over time. Such patches should not be downloaded, and instead be added locally to the package folder. If the +.hash+ file is missing, then no check is done at all. + +[[adding-packages-start-script]] +=== The +SNNfoo+ start script + +Packages that provide a system daemon usually need to be started somehow +at boot. Buildroot comes with support for several init systems, some +are considered tier one (see xref:init-system[]), while others are also +available but do not have the same level of integration. Ideally, all +packages providing a system daemon should provide a start script for +BusyBox/SysV init and a systemd unit file. + +For consistency, the start script must follow the style and composition +as shown in the reference: +package/busybox/S01syslogd+. An annotated +example of this style is shown below. There is no specific coding style +for systemd unit files, but if a package comes with its own unit file, +that is preferred over a buildroot specific one, if it is compatible +with buildroot. + +The name of the start script is composed of the +SNN+ and the daemon +name. The +NN+ is the start order number which needs to be carefully +chosen. For example, a program that requires networking to be up should +not start before +S40network+. The scripts are started in alphabetical +order, so +S01syslogd+ starts before +S01watchdogd+, and +S02sysctl+ +start thereafter. + +------------------------------ +01: #!/bin/sh +02: +03: DAEMON="syslogd" +04: PIDFILE="/var/run/$DAEMON.pid" +05: +06: SYSLOGD_ARGS="" +07: +08: # shellcheck source=/dev/null +09: [ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" +10: +11: # BusyBox' syslogd does not create a pidfile, so pass "-n" in the command line +12: # and use "-m" to instruct start-stop-daemon to create one. +13: start() { +14: printf 'Starting %s: ' "$DAEMON" +15: # shellcheck disable=SC2086 # we need the word splitting +16: start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/sbin/$DAEMON" \ +17: -- -n $SYSLOGD_ARGS +18: status=$? +19: if [ "$status" -eq 0 ]; then +20: echo "OK" +21: else +22: echo "FAIL" +23: fi +24: return "$status" +25: } +26: +27: stop() { +28: printf 'Stopping %s: ' "$DAEMON" +29: start-stop-daemon -K -q -p "$PIDFILE" +30: status=$? +31: if [ "$status" -eq 0 ]; then +32: rm -f "$PIDFILE" +33: echo "OK" +34: else +35: echo "FAIL" +36: fi +37: return "$status" +38: } +39: +40: restart() { +41: stop +42: sleep 1 +43: start +44: } +45: +46: case "$1" in +47: start|stop|restart) +48: "$1";; +49: reload) +50: # Restart, since there is no true "reload" feature. +51: restart;; +52: *) +53: echo "Usage: $0 {start|stop|restart|reload}" +54: exit 1 +55: esac +------------------------------ + +*Note:* programs that support reloading their configuration in some +fashion (+SIGHUP+) should provide a +reload()+ function similar to ++stop()+. The +start-stop-daemon+ supports +-K -s HUP+ for this. +It is recommended to always append +-x "/sbin/$DAEMON"+ to all the ++start-stop-daemon+ commands to ensure signals are set to a PID that +matches +$DAEMON+. + +Both start scripts and unit files can source command line arguments from ++/etc/default/foo+, in general, if such a file does not exist it should +not block the start of the daemon, unless there is some site specirfic +command line argument the daemon requires to start. For start scripts a ++FOO_ARGS="-s -o -m -e -args"+ can be defined to a default value in and +the user can override this from +/etc/default/foo+. diff --git a/docs/manual/configure.txt b/docs/manual/configure.txt index c9eef567f4..60860d2c71 100644 --- a/docs/manual/configure.txt +++ b/docs/manual/configure.txt @@ -377,6 +377,7 @@ good solution. Note that if +systemd+ is chosen as init system, /dev management will be performed by the +udev+ program provided by +systemd+. +[[init-system]] === init system The _init_ program is the first userspace program started by the From fontaine.fabrice at gmail.com Thu Feb 17 16:36:54 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 17 Feb 2022 17:36:54 +0100 Subject: [Buildroot] [PATCH 1/2] package/kf5/kf5-kcoreaddons: add python3 optional dependency Message-ID: <20220217163655.221545-1-fontaine.fabrice@gmail.com> python3 is an optional dependency since the addition of the package in commit bf48bf86295bc4628bcd14fd4ca415d6971c8ab8 Signed-off-by: Fabrice Fontaine --- package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk b/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk index 76be8876cc..9a034ba763 100644 --- a/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk +++ b/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk @@ -10,7 +10,10 @@ KF5_KCOREADDONS_SOURCE = kcoreaddons-$(KF5_KCOREADDONS_VERSION).tar.xz KF5_KCOREADDONS_LICENSE = LGPL-2.1 KF5_KCOREADDONS_LICENSE_FILES = COPYING.LIB -KF5_KCOREADDONS_DEPENDENCIES = kf5-extra-cmake-modules qt5tools +KF5_KCOREADDONS_DEPENDENCIES = \ + kf5-extra-cmake-modules \ + qt5tools \ + $(if $(BR2_PACKAGE_PYTHON3),python3) KF5_KCOREADDONS_INSTALL_STAGING = YES KF5_KCOREADDONS_CXXFLAGS = $(TARGET_CXXFLAGS) -- 2.34.1 From fontaine.fabrice at gmail.com Thu Feb 17 16:36:55 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 17 Feb 2022 17:36:55 +0100 Subject: [Buildroot] [PATCH 2/2] package/kf5: bump to version 5.91 In-Reply-To: <20220217163655.221545-1-fontaine.fabrice@gmail.com> References: <20220217163655.221545-1-fontaine.fabrice@gmail.com> Message-ID: <20220217163655.221545-2-fontaine.fabrice@gmail.com> This bump will fix the following build failure of kf5-kcoreaddons with python 3.10 raised since commit 25b1fc2898d68ddf2674b14c738045875fc5a2dc: CMake Error at /home/giuliobenetti/autobuild/run/instance-1/output-1/host/riscv32-buildroot-linux-gnu/sysroot/usr/share/ECM/find-modules/FindPythonModuleGeneration.cmake:149 (message): The max python version in PythonModuleGeneration must be updated. Call Stack (most recent call first): src/lib/CMakeLists.txt:208 (find_package) It will also fix the following build failure of kf5-kcoreaddons raised since commit 5770a645a3a49a3f0f02972131a4ff5283b4c11e: In file included from /home/peko/autobuild/instance-0/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/qt5/QtCore/qchar.h:43, from /home/peko/autobuild/instance-0/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/qt5/QtCore/qstring.h:49, from /home/peko/autobuild/instance-0/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/qt5/QtCore/QString:1, from /home/peko/autobuild/instance-0/output-1/build/kf5-kcoreaddons-5.47.0/src/lib/randomness/krandom.h:27, from /home/peko/autobuild/instance-0/output-1/build/kf5-kcoreaddons-5.47.0/src/lib/randomness/krandom.cpp:22: /home/peko/autobuild/instance-0/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/qt5/QtCore/qglobal.h:1274:80: note: declared here 1274 | Q_CORE_EXPORT QT_DEPRECATED_VERSION_X_5_15("use QRandomGenerator instead") int qrand(); | ^~~~~ /home/peko/autobuild/instance-0/output-1/build/kf5-kcoreaddons-5.47.0/src/lib/randomness/krandom.cpp: In function 'QString KRandom::randomString(int)': /home/peko/autobuild/instance-0/output-1/build/kf5-kcoreaddons-5.47.0/src/lib/randomness/krandom.cpp:76:27: error: use of deleted function 'QCharRef& QCharRef::operator=(char)' 76 | str[i++] = char(r); | ^ - Update indentation in hash file (two spaces) - Update licenses due to https://invent.kde.org/frameworks/kcoreaddons/-/commit/93480398b551aee572f9f1a0ee48ed45a8476580 https://invent.kde.org/frameworks/modemmanager-qt/-/commit/8ad494d957cab343a60a61a2163f1ca23e9e3511 https://invent.kde.org/frameworks/networkmanager-qt/-/commit/fa9ef0d84898ad5e1f28857307bd5fcb8eb38e20 Fixes: - http://autobuild.buildroot.org/results/0267ff54ee82d853476ff7d6b14edb4aba308aa2 - http://autobuild.buildroot.org/results/694a2322d9161b55f5db66d1ace57d836360ed84 Signed-off-by: Fabrice Fontaine --- .../kf5-extra-cmake-modules.hash | 4 ++-- .../kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash | 17 ++++++++++++++-- .../kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk | 20 +++++++++++++++++-- .../kf5-modemmanager-qt.hash | 11 ++++++++-- .../kf5-modemmanager-qt.mk | 13 ++++++++++-- .../kf5-networkmanager-qt.hash | 11 ++++++++-- .../kf5-networkmanager-qt.mk | 12 +++++++++-- package/kf5/kf5.mk | 2 +- 8 files changed, 75 insertions(+), 15 deletions(-) diff --git a/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.hash b/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.hash index 733e267fdb..70b776b5d7 100644 --- a/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.hash +++ b/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 976d8bd15a0b929376bfaef34602a0fb9614229851c46fac3c4b28938f682195 extra-cmake-modules-5.47.0.tar.xz -sha256 46cde7dc11e64c78d650b4851b88f6704b4665ff60f22a1caf68ceb15e217e5b COPYING-CMAKE-SCRIPTS +sha256 9717885e30aadf184fa71511930409cabbf08eb6627ea8b051de8804fbcec54c extra-cmake-modules-5.91.0.tar.xz +sha256 46cde7dc11e64c78d650b4851b88f6704b4665ff60f22a1caf68ceb15e217e5b COPYING-CMAKE-SCRIPTS diff --git a/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash b/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash index 0cd8dcfc15..e4ebf2bb39 100644 --- a/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash +++ b/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash @@ -1,3 +1,16 @@ # Locally calculated -sha256 40ff04757e4ac19bc8448940fe18886c894a2069865966cc865fc55ff67b0b46 kcoreaddons-5.47.0.tar.xz -sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB +sha256 dfe3da03260e0153f9f6ced1fc7464eaaf0ed1fb692fc6c2b2d968b629ad719b kcoreaddons-5.91.0.tar.xz + +# Hash for license files +sha256 d1cf0896da7045d841fe45b0991cf35540bac1a17b5d11f4afcf8fcb950246b5 LICENSES/GPL-2.0-only.txt +sha256 606aa26338f69ce178f1cbc648b7574aec4b5bbaeb20f4df36ff49010cb8fbbd LICENSES/GPL-2.0-or-later.txt +sha256 2ca9503d76d1ffab14f599b4741382eec11face60ad1f0d7a41897809003a286 LICENSES/GPL-3.0-only.txt +sha256 de588a8b1c41fe73ffe1201f9d12c718a988ed8e1302929625a6e7c2bced7461 LICENSES/LGPL-2.0-only.txt +sha256 de588a8b1c41fe73ffe1201f9d12c718a988ed8e1302929625a6e7c2bced7461 LICENSES/LGPL-2.0-or-later.txt +sha256 211f1b738d1b864bab2648bee9b55becd39fd2d6aa49c1196e7d87b41db4bc07 LICENSES/LGPL-2.1-only.txt +sha256 476b03829862ab7e3ed920f87fad3de3c995f7dd93c26476eb40f0117de43fdc LICENSES/LGPL-3.0-only.txt +sha256 ef839531eb65b0168f9aed14047c84be13e9ea38801a73bc18abe24dc93e6ac9 LICENSES/LicenseRef-KDE-Accepted-GPL.txt +sha256 d9f25707d20e804f15005be46527366b0604bd739754d144a83d3983d94a9a6a LICENSES/LicenseRef-KDE-Accepted-LGPL.txt +sha256 272bc0fa06a23d3c807375f95f8d6ccd98541321d2882732668ab139c16f9bf4 LICENSES/LicenseRef-Qt-Commercial.txt +sha256 a3b538a7d81c4935d185056479d12fd43042bb9f3a21c9cbb4a8500fab8e5880 LICENSES/MPL-1.1.txt +sha256 7dea3adab58690d8ee14775da755cd30a52649a47704ff78ae85197ae0d37c60 LICENSES/Qt-LGPL-exception-1.1.txt diff --git a/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk b/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk index 9a034ba763..e2f67f15b2 100644 --- a/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk +++ b/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk @@ -7,8 +7,24 @@ KF5_KCOREADDONS_VERSION = $(KF5_VERSION) KF5_KCOREADDONS_SITE = $(KF5_SITE) KF5_KCOREADDONS_SOURCE = kcoreaddons-$(KF5_KCOREADDONS_VERSION).tar.xz -KF5_KCOREADDONS_LICENSE = LGPL-2.1 -KF5_KCOREADDONS_LICENSE_FILES = COPYING.LIB +KF5_KCOREADDONS_LICENSE = \ + LGPL-2.0+, LGPL-2.1 or LGPL-3.0 or LicenseRef-KDE-Accepted-LGPL (library), \ + MPL.1.1 or GPL-2.0+ or LGPL-2.1+ (posix_fallocate_mac.h), \ + LGPL-2.1 with Qt-LGPL-exception-1.1 or LicenseRef-Qt-Commercial (kprocesslist), \ + GPL-2.0 or GPL-3.0 or LicenseRef-KDE-Accepted-GPL (autotests) +KF5_KCOREADDONS_LICENSE_FILES = \ + LICENSES/GPL-2.0-only.txt \ + LICENSES/GPL-2.0-or-later.txt \ + LICENSES/GPL-3.0-only.txt \ + LICENSES/LGPL-2.0-only.txt \ + LICENSES/LGPL-2.0-or-later.txt \ + LICENSES/LGPL-2.1-only.txt \ + LICENSES/LGPL-3.0-only.txt \ + LICENSES/LicenseRef-KDE-Accepted-GPL.txt \ + LICENSES/LicenseRef-KDE-Accepted-LGPL.txt \ + LICENSES/LicenseRef-Qt-Commercial.txt \ + LICENSES/MPL-1.1.txt \ + LICENSES/Qt-LGPL-exception-1.1.txt KF5_KCOREADDONS_DEPENDENCIES = \ kf5-extra-cmake-modules \ diff --git a/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.hash b/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.hash index 408eb0c0b0..4b6c03a3bb 100644 --- a/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.hash +++ b/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.hash @@ -1,3 +1,10 @@ # Locally calculated -sha256 8b6ab15ce82b7a30b26814178ac33380056ec4398707481aa5ce95cf09d39d03 modemmanager-qt-5.47.0.tar.xz -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB +sha256 a2673f18c7866d39c9cedca2f86540c56baf966a2491a86ca06a5a0427358496 modemmanager-qt-5.91.0.tar.xz + +# Hash for license files +sha256 d1cf0896da7045d841fe45b0991cf35540bac1a17b5d11f4afcf8fcb950246b5 LICENSES/GPL-2.0-only.txt +sha256 2ca9503d76d1ffab14f599b4741382eec11face60ad1f0d7a41897809003a286 LICENSES/GPL-3.0-only.txt +sha256 211f1b738d1b864bab2648bee9b55becd39fd2d6aa49c1196e7d87b41db4bc07 LICENSES/LGPL-2.1-only.txt +sha256 476b03829862ab7e3ed920f87fad3de3c995f7dd93c26476eb40f0117de43fdc LICENSES/LGPL-3.0-only.txt +sha256 ef839531eb65b0168f9aed14047c84be13e9ea38801a73bc18abe24dc93e6ac9 LICENSES/LicenseRef-KDE-Accepted-GPL.txt +sha256 d9f25707d20e804f15005be46527366b0604bd739754d144a83d3983d94a9a6a LICENSES/LicenseRef-KDE-Accepted-LGPL.txt diff --git a/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk b/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk index 81617492c0..38c80d3da8 100644 --- a/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk +++ b/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk @@ -7,8 +7,17 @@ KF5_MODEMMANAGER_QT_VERSION = $(KF5_VERSION) KF5_MODEMMANAGER_QT_SITE = $(KF5_SITE) KF5_MODEMMANAGER_QT_SOURCE = modemmanager-qt-$(KF5_MODEMMANAGER_QT_VERSION).tar.xz -KF5_MODEMMANAGER_QT_LICENSE = LGPL-2.1+ -KF5_MODEMMANAGER_QT_LICENSE_FILES = COPYING.LIB +KF5_MODEMMANAGER_QT_LICENSE = \ + LGPL-2.1 or LGPL-3.0 or LicenseRef-KDE-Accepted-LGPL (library), \ + GPL-2.0 or GPL-3.0 or LicenseRef-KDE-Accepted-GPL (autotests, examples) + +KF5_MODEMMANAGER_QT_LICENSE_FILES = \ + LICENSES/GPL-2.0-only.txt \ + LICENSES/GPL-3.0-only.txt \ + LICENSES/LGPL-2.1-only.txt \ + LICENSES/LGPL-3.0-only.txt \ + LICENSES/LicenseRef-KDE-Accepted-GPL.txt \ + LICENSES/LicenseRef-KDE-Accepted-LGPL.txt KF5_MODEMMANAGER_QT_DEPENDENCIES = kf5-extra-cmake-modules modem-manager qt5base KF5_MODEMMANAGER_QT_INSTALL_STAGING = YES diff --git a/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.hash b/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.hash index 8ccada455e..de4504064f 100644 --- a/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.hash +++ b/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.hash @@ -1,3 +1,10 @@ # Locally calculated -sha256 d0b377500ee4cf4f029f4d04d6844bcf3d2d6734982b511a5fffab5165688209 networkmanager-qt-5.47.0.tar.xz -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB +sha256 2e20ffd995ce64a90b1133b594bab2b2292be54e538f62633e78e8296cc44738 networkmanager-qt-5.91.0.tar.xz + +# Hash for license files +sha256 d1cf0896da7045d841fe45b0991cf35540bac1a17b5d11f4afcf8fcb950246b5 LICENSES/GPL-2.0-only.txt +sha256 2ca9503d76d1ffab14f599b4741382eec11face60ad1f0d7a41897809003a286 LICENSES/GPL-3.0-only.txt +sha256 211f1b738d1b864bab2648bee9b55becd39fd2d6aa49c1196e7d87b41db4bc07 LICENSES/LGPL-2.1-only.txt +sha256 476b03829862ab7e3ed920f87fad3de3c995f7dd93c26476eb40f0117de43fdc LICENSES/LGPL-3.0-only.txt +sha256 ef839531eb65b0168f9aed14047c84be13e9ea38801a73bc18abe24dc93e6ac9 LICENSES/LicenseRef-KDE-Accepted-GPL.txt +sha256 d9f25707d20e804f15005be46527366b0604bd739754d144a83d3983d94a9a6a LICENSES/LicenseRef-KDE-Accepted-LGPL.txt diff --git a/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.mk b/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.mk index c383f98e9b..7adff2deb7 100644 --- a/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.mk +++ b/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.mk @@ -7,8 +7,16 @@ KF5_NETWORKMANAGER_QT_VERSION = $(KF5_VERSION) KF5_NETWORKMANAGER_QT_SITE = $(KF5_SITE) KF5_NETWORKMANAGER_QT_SOURCE = networkmanager-qt-$(KF5_NETWORKMANAGER_QT_VERSION).tar.xz -KF5_NETWORKMANAGER_QT_LICENSE = LGPL-2.1+ -KF5_NETWORKMANAGER_QT_LICENSE_FILES = COPYING.LIB +KF5_NETWORKMANAGER_QT_LICENSE = \ + LGPL-2.1 or LGPL-3.0 or LicenseRef-KDE-Accepted-LGPL (library), \ + GPL-2.0 or GPL-3.0 or LicenseRef-KDE-Accepted-GPL (autotests, examples) +KF5_NETWORKMANAGER_QT_LICENSE_FILES = \ + LICENSES/GPL-2.0-only.txt \ + LICENSES/GPL-3.0-only.txt \ + LICENSES/LGPL-2.1-only.txt \ + LICENSES/LGPL-3.0-only.txt \ + LICENSES/LicenseRef-KDE-Accepted-GPL.txt \ + LICENSES/LicenseRef-KDE-Accepted-LGPL.txt KF5_NETWORKMANAGER_QT_DEPENDENCIES = kf5-extra-cmake-modules network-manager qt5base KF5_NETWORKMANAGER_QT_INSTALL_STAGING = YES diff --git a/package/kf5/kf5.mk b/package/kf5/kf5.mk index 8360fc9b63..64b08bae4f 100644 --- a/package/kf5/kf5.mk +++ b/package/kf5/kf5.mk @@ -4,7 +4,7 @@ # ################################################################################ -KF5_VERSION_MAJOR = 5.47 +KF5_VERSION_MAJOR = 5.91 KF5_VERSION = $(KF5_VERSION_MAJOR).0 KF5_SITE = https://download.kde.org/stable/frameworks/$(KF5_VERSION_MAJOR) -- 2.34.1 From fontaine.fabrice at gmail.com Thu Feb 17 17:19:06 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 17 Feb 2022 18:19:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/libglvnd: fix LIBGLVND_CONF_OPTS Message-ID: <20220217171906.552326-1-fontaine.fabrice@gmail.com> LIBGLVND_CONF_OPTS are wrongly overridden in conditionals since the addition of the package in commit 0378e2e5d9ce9d5676975dfbff501360094fdc1a Signed-off-by: Fabrice Fontaine --- package/libglvnd/libglvnd.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libglvnd/libglvnd.mk b/package/libglvnd/libglvnd.mk index 3df609f6eb..3bac4b31e2 100644 --- a/package/libglvnd/libglvnd.mk +++ b/package/libglvnd/libglvnd.mk @@ -37,17 +37,17 @@ LIBGLVND_CONF_OPTS += -Dglx=disabled endif ifeq ($(BR2_PACKAGE_LIBGLVND_DISPATCH_EGL),y) -LIBGLVND_CONF_OPTS = -Degl=true +LIBGLVND_CONF_OPTS += -Degl=true LIBGLVND_PROVIDES += libegl else -LIBGLVND_CONF_OPTS = -Degl=false +LIBGLVND_CONF_OPTS += -Degl=false endif ifeq ($(BR2_PACKAGE_LIBGLVND_DISPATCH_GLES),y) -LIBGLVND_CONF_OPTS = -Dgles1=true -Dgles2=true +LIBGLVND_CONF_OPTS += -Dgles1=true -Dgles2=true LIBGLVND_PROVIDES += libgles else -LIBGLVND_CONF_OPTS = -Dgles1=false -Dgles2=false +LIBGLVND_CONF_OPTS += -Dgles1=false -Dgles2=false endif $(eval $(meson-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Thu Feb 17 17:26:08 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 17 Feb 2022 18:26:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/psmisc: don't override PSMISC_CONF_OPTS Message-ID: <20220217172608.552983-1-fontaine.fabrice@gmail.com> PSMISC_CONF_OPTS is overridden in a conditional since commit 953b0f4de8ebcb5b42c8da760c025873ce82550d Signed-off-by: Fabrice Fontaine --- package/psmisc/psmisc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/psmisc/psmisc.mk b/package/psmisc/psmisc.mk index 3d0d2c5367..8b92be11e8 100644 --- a/package/psmisc/psmisc.mk +++ b/package/psmisc/psmisc.mk @@ -13,7 +13,7 @@ PSMISC_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) ifeq ($(BR2_TOOLCHAIN_HAS_SSP),) # Don't force -fstack-protector when SSP is not available in toolchain -PSMISC_CONF_OPTS = --disable-harden-flags +PSMISC_CONF_OPTS += --disable-harden-flags endif $(eval $(autotools-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Thu Feb 17 17:26:39 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 17 Feb 2022 18:26:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/libgsasl: don't override LIBGSASL_CONF_OPTS Message-ID: <20220217172639.553025-1-fontaine.fabrice@gmail.com> LIBGSASL_CONF_OPTS is wrongly overridden in a conditional since commit c4ff6bf2272df54e8d4594a19fb76fe33e980da2 Signed-off-by: Fabrice Fontaine --- package/libgsasl/libgsasl.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libgsasl/libgsasl.mk b/package/libgsasl/libgsasl.mk index e813a354a1..b1981dea3b 100644 --- a/package/libgsasl/libgsasl.mk +++ b/package/libgsasl/libgsasl.mk @@ -11,10 +11,10 @@ LIBGSASL_LICENSE_FILES = README COPYING.LIB COPYING LIBGSASL_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) -LIBGSASL_CONF_OPTS = --with-libgcrypt-prefix=$(STAGING_DIR)/usr +LIBGSASL_CONF_OPTS += --with-libgcrypt-prefix=$(STAGING_DIR)/usr LIBGSASL_DEPENDENCIES += libgcrypt else -LIBGSASL_CONF_OPTS = --without-libgcrypt +LIBGSASL_CONF_OPTS += --without-libgcrypt endif ifeq ($(BR2_PACKAGE_LIBIDN),y) -- 2.34.1 From fontaine.fabrice at gmail.com Thu Feb 17 17:33:37 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 17 Feb 2022 18:33:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/xz: don't override XZ_CONF_OPTS Message-ID: <20220217173337.553661-1-fontaine.fabrice@gmail.com> XZ_CONF_OPTS is wrongly overridden in a conditional since commit 0dbc17abcb5c254d60a8d59e1ae0d715c2db4324 Signed-off-by: Fabrice Fontaine --- package/xz/xz.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/xz/xz.mk b/package/xz/xz.mk index ffbae4c873..af611975a0 100644 --- a/package/xz/xz.mk +++ b/package/xz/xz.mk @@ -14,9 +14,9 @@ XZ_LICENSE_FILES = COPYING COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1 XZ_CPE_ID_VENDOR = tukaani ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -XZ_CONF_OPTS = --enable-threads +XZ_CONF_OPTS += --enable-threads else -XZ_CONF_OPTS = --disable-threads +XZ_CONF_OPTS += --disable-threads endif # we are built before ccache -- 2.34.1 From fontaine.fabrice at gmail.com Thu Feb 17 17:36:26 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 17 Feb 2022 18:36:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/urg: don't override URG_CONF_OPTS Message-ID: <20220217173626.553951-1-fontaine.fabrice@gmail.com> URG_CONF_OPTS is wrongly overridden in a conditional since commit d0433603e3c7de5a0d7d6a434b4cb45ef5e5b533 Signed-off-by: Fabrice Fontaine --- package/urg/urg.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/urg/urg.mk b/package/urg/urg.mk index 86b7ec2c17..476f36299f 100644 --- a/package/urg/urg.mk +++ b/package/urg/urg.mk @@ -18,7 +18,7 @@ URG_CONF_OPTS += \ --with-sdl-prefix=$(STAGING_DIR)/usr \ --with-sdl-exec-prefix=$(STAGING_DIR)/usr else -URG_CONF_OPTS = --without-sdl +URG_CONF_OPTS += --without-sdl URG_CONF_ENV += ac_cv_path_SDL_CONFIG="" endif -- 2.34.1 From fontaine.fabrice at gmail.com Thu Feb 17 17:38:54 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 17 Feb 2022 18:38:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/libiconv: don't override LIBICONV_CONF_OPTS Message-ID: <20220217173854.554177-1-fontaine.fabrice@gmail.com> LIBICONV_CONF_OPTS is wrongly overridden in a conditional since commit 0d711a64d4753c0efa4158519907cca7ec284573 Signed-off-by: Fabrice Fontaine --- package/libiconv/libiconv.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libiconv/libiconv.mk b/package/libiconv/libiconv.mk index ec79a5d735..40763a92f8 100644 --- a/package/libiconv/libiconv.mk +++ b/package/libiconv/libiconv.mk @@ -11,7 +11,7 @@ LIBICONV_LICENSE = GPL-3.0+ (iconv program), LGPL-2.0+ (library) LIBICONV_LICENSE_FILES = COPYING COPYING.LIB ifeq ($(BR2_PACKAGE_LIBICONV_EXTRA_ENCODINGS),y) -LIBICONV_CONF_OPTS = --enable-extra-encodings +LIBICONV_CONF_OPTS += --enable-extra-encodings endif # Don't build the preloadable library, as we don't need it (it's only -- 2.34.1 From peter at korsgaard.com Thu Feb 17 18:21:59 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Feb 2022 19:21:59 +0100 Subject: [Buildroot] [PATCH] package/pkg-python.mk: drop references to PYTHON_{PATH, DIR} Message-ID: <20220217182202.11640-1-peter@korsgaard.com> With python 2.x support dropped these variables no longer exist, so unconditionally use the python3 variant. 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 02df061a19..b8dc9cd9e5 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -38,10 +38,10 @@ PKG_PYTHON_DISTUTILS_ENV = \ PATH=$(BR_PATH) \ $(TARGET_CONFIGURE_OPTS) \ LDSHARED="$(TARGET_CROSS)gcc -shared" \ - PYTHONPATH="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_PATH),$(PYTHON_PATH))" \ + PYTHONPATH="$(PYTHON3_PATH)" \ PYTHONNOUSERSITE=1 \ _PYTHON_HOST_PLATFORM="$(PKG_PYTHON_HOST_PLATFORM)" \ - _PYTHON_PROJECT_BASE="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_DIR),$(PYTHON_DIR))" \ + _PYTHON_PROJECT_BASE="$(PYTHON3_DIR)" \ _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ _python_sysroot=$(STAGING_DIR) \ _python_prefix=/usr \ @@ -70,11 +70,11 @@ HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \ # Target setuptools-based packages PKG_PYTHON_SETUPTOOLS_ENV = \ _PYTHON_HOST_PLATFORM="$(PKG_PYTHON_HOST_PLATFORM)" \ - _PYTHON_PROJECT_BASE="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_DIR),$(PYTHON_DIR))" \ + _PYTHON_PROJECT_BASE="$(PYTHON3_DIR)" \ _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ PATH=$(BR_PATH) \ $(TARGET_CONFIGURE_OPTS) \ - PYTHONPATH="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_PATH),$(PYTHON_PATH))" \ + PYTHONPATH="$(PYTHON3_PATH)" \ PYTHONNOUSERSITE=1 \ _python_sysroot=$(STAGING_DIR) \ _python_prefix=/usr \ -- 2.20.1 From bernd.kuhls at t-online.de Thu Feb 17 18:35:53 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Thu, 17 Feb 2022 19:35:53 +0100 Subject: [Buildroot] [PATCH/next 2/2] package/intel-mediasdk: bump version to 22.2.1 In-Reply-To: <20220217183553.210835-1-bernd.kuhls@t-online.de> References: <20220217183553.210835-1-bernd.kuhls@t-online.de> Message-ID: <20220217183553.210835-2-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/intel-mediasdk/intel-mediasdk.hash | 2 +- package/intel-mediasdk/intel-mediasdk.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-mediasdk/intel-mediasdk.hash b/package/intel-mediasdk/intel-mediasdk.hash index 7cd61fe9b8..ee4f317242 100644 --- a/package/intel-mediasdk/intel-mediasdk.hash +++ b/package/intel-mediasdk/intel-mediasdk.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5ed1d22b5c5a05d3e848e43caa2b3966dbfb7f74281a646e6d0774a0621a9b8b intel-mediasdk-22.1.0.tar.gz +sha256 ae56d4fe69856ff4e184a2863f23d0e861a16add225fd3e159a5440774d5c80a intel-mediasdk-22.2.1.tar.gz sha256 dfd67773578903698f9ff4a61eb8f2d84810cbecd56f3f3cee8c649f813b6ea6 LICENSE diff --git a/package/intel-mediasdk/intel-mediasdk.mk b/package/intel-mediasdk/intel-mediasdk.mk index 7d57e0e928..7589ff9737 100644 --- a/package/intel-mediasdk/intel-mediasdk.mk +++ b/package/intel-mediasdk/intel-mediasdk.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_MEDIASDK_VERSION = 22.1.0 +INTEL_MEDIASDK_VERSION = 22.2.1 INTEL_MEDIASDK_SITE = https://github.com/Intel-Media-SDK/MediaSDK/archive INTEL_MEDIASDK_LICENSE = MIT INTEL_MEDIASDK_LICENSE_FILES = LICENSE -- 2.30.2 From bernd.kuhls at t-online.de Thu Feb 17 18:35:52 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Thu, 17 Feb 2022 19:35:52 +0100 Subject: [Buildroot] [PATCH/next 1/2] package/intel-mediadriver: bump version to 22.2.1 Message-ID: <20220217183553.210835-1-bernd.kuhls@t-online.de> Removed patch which was applied upstream: https://github.com/intel/media-driver/commit/8eab97af6e1c41fc7b9d72999ecb1c22d9e52db6 Signed-off-by: Bernd Kuhls --- ...001-Add-MEDIA-BUILD-HARDENING-option.patch | 106 ------------------ .../intel-mediadriver/intel-mediadriver.hash | 2 +- .../intel-mediadriver/intel-mediadriver.mk | 2 +- 3 files changed, 2 insertions(+), 108 deletions(-) delete mode 100644 package/intel-mediadriver/0001-Add-MEDIA-BUILD-HARDENING-option.patch diff --git a/package/intel-mediadriver/0001-Add-MEDIA-BUILD-HARDENING-option.patch b/package/intel-mediadriver/0001-Add-MEDIA-BUILD-HARDENING-option.patch deleted file mode 100644 index 968445759a..0000000000 --- a/package/intel-mediadriver/0001-Add-MEDIA-BUILD-HARDENING-option.patch +++ /dev/null @@ -1,106 +0,0 @@ -From 103c00c8d74a1cd87686850212bd93c0e4d59fc9 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 11 Aug 2021 21:34:59 +0200 -Subject: [PATCH] Add MEDIA_BUILD_HARDENING option - -Add MEDIA_BUILD_HARDENING option to allow the user to disable hardening -options such as stack-protector-all or FORTIFY SOURCE 2 which are not -always available (e.g. fortify source 2 is only available on glibc >= 6 -and not musl/uclibc-ng) - -Patch sent upstream: https://github.com/intel/media-driver/pull/1242 - -Signed-off-by: Fabrice Fontaine -Signed-off-by: Bernd Kuhls -[Bernd: rebased for version 21.4.1] ---- - cmrtlib/linux/CMakeLists.txt | 14 ++++++++++---- - .../cmake/linux/media_compile_flags_linux.cmake | 12 ++++++++++-- - media_driver/media_top_cmake.cmake | 8 +++++++- - 3 files changed, 27 insertions(+), 7 deletions(-) - -diff --git a/cmrtlib/linux/CMakeLists.txt b/cmrtlib/linux/CMakeLists.txt -index 65f71ceef..b066138d9 100644 ---- a/cmrtlib/linux/CMakeLists.txt -+++ b/cmrtlib/linux/CMakeLists.txt -@@ -32,12 +32,18 @@ else() - endif() - - # Set up compile options that will be used for the Linux build --set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive -fstack-protector-all") --set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-strict-aliasing -D_FORTIFY_SOURCE=2") -+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive") -+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-strict-aliasing") - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -D__DEBUG -O0") --set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive -fstack-protector-all") --set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-strict-aliasing -D_FORTIFY_SOURCE=2") -+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive") -+set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-strict-aliasing") - set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG -D__DEBUG -O0") -+if(MEDIA_BUILD_HARDENING) -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS} -fstack-protector-all") -+ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -D_FORTIFY_SOURCE=2") -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS} -fstack-protector-all") -+ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -D_FORTIFY_SOURCE=2") -+endif() - if(MEDIA_BUILD_FATAL_WARNINGS) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS} -Werror") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS} -Werror") -diff --git a/media_driver/cmake/linux/media_compile_flags_linux.cmake b/media_driver/cmake/linux/media_compile_flags_linux.cmake -index 7a2bd64b6..98896b131 100755 ---- a/media_driver/cmake/linux/media_compile_flags_linux.cmake -+++ b/media_driver/cmake/linux/media_compile_flags_linux.cmake -@@ -47,7 +47,6 @@ set(MEDIA_COMPILER_FLAGS_COMMON - # Other common flags - -fmessage-length=0 - -fvisibility=hidden -- -fstack-protector - -fdata-sections - -ffunction-sections - -Wl,--gc-sections -@@ -64,6 +63,11 @@ set(MEDIA_COMPILER_FLAGS_COMMON - -g - ) - -+if(MEDIA_BUILD_HARDENING) -+ set(MEDIA_COMPILER_FLAGS_COMMON -+ ${MEDIA_COMPILER_FLAGS_COMMON} -+ -fstack-protector) -+endif() - - if(${UFO_MARCH} STREQUAL "slm") - set(MEDIA_COMPILER_FLAGS_COMMON -@@ -119,9 +123,13 @@ if(${UFO_VARIANT} STREQUAL "default") - set(MEDIA_COMPILER_FLAGS_RELEASE - ${MEDIA_COMPILER_FLAGS_RELEASE} - -O2 -- -D_FORTIFY_SOURCE=2 - -fno-omit-frame-pointer - ) -+ if(MEDIA_BUILD_HARDENING) -+ set(MEDIA_COMPILER_FLAGS_RELEASE -+ ${MEDIA_COMPILER_FLAGS_RELEASE} -+ -D_FORTIFY_SOURCE=2) -+ endif() - endif() - - if(NOT ${PLATFORM} STREQUAL "android") -diff --git a/media_driver/media_top_cmake.cmake b/media_driver/media_top_cmake.cmake -index f089ea45f..b0b428914 100755 ---- a/media_driver/media_top_cmake.cmake -+++ b/media_driver/media_top_cmake.cmake -@@ -113,7 +113,13 @@ if(MEDIA_BUILD_FATAL_WARNINGS) - set_target_properties(${LIB_NAME_OBJ} PROPERTIES COMPILE_FLAGS "-Werror") - endif() - --set_target_properties(${LIB_NAME} PROPERTIES LINK_FLAGS "-Wl,--no-as-needed -Wl,--gc-sections -z relro -z now -fstack-protector -fPIC") -+set(MEDIA_LINK_FLAGS "-Wl,--no-as-needed -Wl,--gc-sections -z relro -z now -fPIC") -+option(MEDIA_BUILD_HARDENING "Enable hardening (stack-protector, fortify source)" ON) -+if(MEDIA_BUILD_HARDENING) -+ set(MEDIA_LINK_FLAGS "${MEDIA_LINK_FLAGS} -fstack-protector") -+endif() -+set_target_properties(${LIB_NAME} PROPERTIES LINK_FLAGS ${MEDIA_LINK_FLAGS}) -+ - set_target_properties(${LIB_NAME} PROPERTIES PREFIX "") - set_target_properties(${LIB_NAME_STATIC} PROPERTIES PREFIX "") - diff --git a/package/intel-mediadriver/intel-mediadriver.hash b/package/intel-mediadriver/intel-mediadriver.hash index ceafa20e80..7c615620ae 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6eaa4a9caf58faa8934b253adb4b0ece1c7d5de6f084167d5138b4e3ba423683 intel-media-22.1.1.tar.gz +sha256 1a0277306d7bb3a1e20c7693ff090fa4ae5c0b68981aa13452ed1c6df9062854 intel-media-22.2.1.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index d8820379e7..4895c1535d 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.1 +INTEL_MEDIADRIVER_VERSION = 22.2.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 kuzminov.sergey81 at gmail.com Thu Feb 17 18:42:09 2022 From: kuzminov.sergey81 at gmail.com (Sergey Kuzminov) Date: Thu, 17 Feb 2022 21:42:09 +0300 Subject: [Buildroot] [PATCH] configs/orangepi_pc_defconfig: switch to extlinux Message-ID: <20220217184209.16736-1-kuzminov.sergey81@gmail.com> Changes: * Switch to common scenarios for multiple boards to create an SD image: board/orangepi/common. * Exclude FAT partition, it is no longer needed for U-Boot. * Switch SD image from MBR to GPT for partition-uuid to work. * Switch to extlinux, this is convenient for debugging. Signed-off-by: Sergey Kuzminov --- board/orangepi/orangepi-pc/boot.cmd | 8 ------ board/orangepi/orangepi-pc/genimage.cfg | 37 ------------------------- configs/orangepi_pc_defconfig | 9 ++---- 3 files changed, 3 insertions(+), 51 deletions(-) delete mode 100644 board/orangepi/orangepi-pc/boot.cmd delete mode 100644 board/orangepi/orangepi-pc/genimage.cfg diff --git a/board/orangepi/orangepi-pc/boot.cmd b/board/orangepi/orangepi-pc/boot.cmd deleted file mode 100644 index 9da625c803..0000000000 --- a/board/orangepi/orangepi-pc/boot.cmd +++ /dev/null @@ -1,8 +0,0 @@ -setenv fdt_high ffffffff - -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun8i-h3-orangepi-pc.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/orangepi/orangepi-pc/genimage.cfg b/board/orangepi/orangepi-pc/genimage.cfg deleted file mode 100644 index 14e326cc56..0000000000 --- a/board/orangepi/orangepi-pc/genimage.cfg +++ /dev/null @@ -1,37 +0,0 @@ -# Minimal SD card image for the OrangePi PC -# -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h3-orangepi-pc.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_pc_defconfig b/configs/orangepi_pc_defconfig index 44ea9b95c4..fd0f64e0e6 100644 --- a/configs/orangepi_pc_defconfig +++ b/configs/orangepi_pc_defconfig @@ -5,8 +5,9 @@ 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" BR2_SYSTEM_DHCP="eth0" +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-pc/genimage.cfg" +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.10.9" @@ -14,6 +15,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-pc/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-pc" +BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set @@ -27,9 +29,4 @@ BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-pc/boot.cmd" -BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -- 2.34.1 From bernd.kuhls at t-online.de Thu Feb 17 18:48:36 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Thu, 17 Feb 2022 19:48:36 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/tvheadend: bump version Message-ID: <20220217184836.418858-1-bernd.kuhls@t-online.de> Removed patch which was applied upstream: https://github.com/tvheadend/tvheadend/commit/fb7b24114685a7e38d842168dce4c613360cd330 Signed-off-by: Bernd Kuhls --- .../0002-configure-add-execinfo-option.patch | 55 ------------------- package/tvheadend/tvheadend.hash | 2 +- package/tvheadend/tvheadend.mk | 2 +- 3 files changed, 2 insertions(+), 57 deletions(-) delete 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 deleted file mode 100644 index c55d127d58..0000000000 --- a/package/tvheadend/0002-configure-add-execinfo-option.patch +++ /dev/null @@ -1,55 +0,0 @@ -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.hash b/package/tvheadend/tvheadend.hash index db06af53b7..44ff745221 100644 --- a/package/tvheadend/tvheadend.hash +++ b/package/tvheadend/tvheadend.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 11eeca461e74fbe8306916933cab96d35a99fa89d81e26126e194875c41b6fad tvheadend-b8710206eb073c72b142bce95846b77a0ffa34a6.tar.gz +sha256 10b8e8387cf341a8c639b3ecbab17dd245dc109afd6c99ca6b7fc3f2b5efc50e tvheadend-1295dd2be863f5beb764290fce9317b24193dfc0.tar.gz sha256 54dc3cbc00bf126bcba43e2af7f3ad1dc00f335985da1409fa943c7b7256d942 LICENSE.md diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk index 58ebdcb054..d2547b8746 100644 --- a/package/tvheadend/tvheadend.mk +++ b/package/tvheadend/tvheadend.mk @@ -4,7 +4,7 @@ # ################################################################################ -TVHEADEND_VERSION = b8710206eb073c72b142bce95846b77a0ffa34a6 +TVHEADEND_VERSION = 1295dd2be863f5beb764290fce9317b24193dfc0 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION)) TVHEADEND_LICENSE = GPL-3.0+ TVHEADEND_LICENSE_FILES = LICENSE.md -- 2.30.2 From giulio.benetti at benettiengineering.com Thu Feb 17 19:41:52 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 17 Feb 2022 20:41:52 +0100 Subject: [Buildroot] [PATCH] configs/orangepi_pc_defconfig: switch to extlinux In-Reply-To: <20220217184209.16736-1-kuzminov.sergey81@gmail.com> References: <20220217184209.16736-1-kuzminov.sergey81@gmail.com> Message-ID: <8d64f47c-9040-ab00-975c-6d9d0af11ef9@benettiengineering.com> Hi Sergey, On 17/02/22 19:42, Sergey Kuzminov wrote: > Changes: > * Switch to common scenarios for multiple boards to create an SD image: board/orangepi/common. ^^^ * Switch to common orangepi scenario for multiple boards(board/orangepi/common) to create an SD image. > * Exclude FAT partition, it is no longer needed for U-Boot. > * Switch SD image from MBR to GPT for partition-uuid to work. > * Switch to extlinux, this is convenient for debugging. > > Signed-off-by: Sergey Kuzminov Except that reword: Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti [Giulio: built only] Best regards -- Giulio Benetti Benetti Engineering sas > --- > board/orangepi/orangepi-pc/boot.cmd | 8 ------ > board/orangepi/orangepi-pc/genimage.cfg | 37 ------------------------- > configs/orangepi_pc_defconfig | 9 ++---- > 3 files changed, 3 insertions(+), 51 deletions(-) > delete mode 100644 board/orangepi/orangepi-pc/boot.cmd > delete mode 100644 board/orangepi/orangepi-pc/genimage.cfg > > diff --git a/board/orangepi/orangepi-pc/boot.cmd b/board/orangepi/orangepi-pc/boot.cmd > deleted file mode 100644 > index 9da625c803..0000000000 > --- a/board/orangepi/orangepi-pc/boot.cmd > +++ /dev/null > @@ -1,8 +0,0 @@ > -setenv fdt_high ffffffff > - > -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait > - > -fatload mmc 0 $kernel_addr_r zImage > -fatload mmc 0 $fdt_addr_r sun8i-h3-orangepi-pc.dtb > - > -bootz $kernel_addr_r - $fdt_addr_r > diff --git a/board/orangepi/orangepi-pc/genimage.cfg b/board/orangepi/orangepi-pc/genimage.cfg > deleted file mode 100644 > index 14e326cc56..0000000000 > --- a/board/orangepi/orangepi-pc/genimage.cfg > +++ /dev/null > @@ -1,37 +0,0 @@ > -# Minimal SD card image for the OrangePi PC > -# > -image boot.vfat { > - vfat { > - files = { > - "zImage", > - "sun8i-h3-orangepi-pc.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_pc_defconfig b/configs/orangepi_pc_defconfig > index 44ea9b95c4..fd0f64e0e6 100644 > --- a/configs/orangepi_pc_defconfig > +++ b/configs/orangepi_pc_defconfig > @@ -5,8 +5,9 @@ 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" > BR2_SYSTEM_DHCP="eth0" > +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-pc/genimage.cfg" > +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.10.9" > @@ -14,6 +15,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="sunxi" > BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-pc/linux.fragment" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-pc" > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > # BR2_TARGET_ROOTFS_TAR is not set > @@ -27,9 +29,4 @@ BR2_TARGET_UBOOT_NEEDS_PYTHON3=y > BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" > -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-pc/boot.cmd" > -BR2_PACKAGE_HOST_DOSFSTOOLS=y > BR2_PACKAGE_HOST_GENIMAGE=y > -BR2_PACKAGE_HOST_MTOOLS=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS=y From ps.report at gmx.net Thu Feb 17 20:04:43 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 17 Feb 2022 21:04:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5base: put back riscv32 patch In-Reply-To: <20220217134637.3728619-1-fontaine.fabrice@gmail.com> References: <20220217134637.3728619-1-fontaine.fabrice@gmail.com> Message-ID: <20220217210443.6994b57c@gmx.net> Hello Fabrice, On Thu, 17 Feb 2022 14:46:37 +0100, Fabrice Fontaine wrote: > Commit 5770a645a3a49a3f0f02972131a4ff5283b4c11e wrongly removed riscv32 > patch resulting in the following build failure: > > In file included from thread/qmutex_linux.cpp:45, > from thread/qmutex.cpp:806: > 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 > > Fixes: > - http://autobuild.buildroot.org/results/ff90bc7680acf1487ed58e5e25cf1a5f13dfaedb > > Signed-off-by: Fabrice Fontaine Reviewed-by: Peter Seiderer Regards, Peter > --- > .../qt5base/0007-Fix-build-on-riscv32.patch | 46 +++++++++++++++++++ > 1 file changed, 46 insertions(+) > create mode 100644 package/qt5/qt5base/0007-Fix-build-on-riscv32.patch > > diff --git a/package/qt5/qt5base/0007-Fix-build-on-riscv32.patch b/package/qt5/qt5base/0007-Fix-build-on-riscv32.patch > new file mode 100644 > index 0000000000..5561acb9ae > --- /dev/null > +++ b/package/qt5/qt5base/0007-Fix-build-on-riscv32.patch > @@ -0,0 +1,46 @@ > +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] > +Signed-off-by: Fabrice Fontaine > +--- > + 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 > + From giulio.benetti at benettiengineering.com Thu Feb 17 20:10:01 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 17 Feb 2022 21:10:01 +0100 Subject: [Buildroot] [PATCH] configs/kontron_bl_imx8mm_defconfig: U-Boot requires OpenSSL Message-ID: <20220217201001.1859113-1-giulio.benetti@benettiengineering.com> Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2103784267 Signed-off-by: Giulio Benetti --- configs/kontron_bl_imx8mm_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/kontron_bl_imx8mm_defconfig b/configs/kontron_bl_imx8mm_defconfig index 57e7e9683d..2b7e121e25 100644 --- a/configs/kontron_bl_imx8mm_defconfig +++ b/configs/kontron_bl_imx8mm_defconfig @@ -45,6 +45,7 @@ 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_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN=y BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y -- 2.25.1 From yann.morin.1998 at free.fr Thu Feb 17 20:29:12 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 17 Feb 2022 21:29:12 +0100 Subject: [Buildroot] [git commit] package/psmisc: don't override PSMISC_CONF_OPTS Message-ID: <20220217202156.A30E88377E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=862db5f610eb847fa859e247755db9d7dcbc0d23 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master PSMISC_CONF_OPTS is overridden in a conditional since commit 953b0f4de8ebcb5b42c8da760c025873ce82550d Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/psmisc/psmisc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/psmisc/psmisc.mk b/package/psmisc/psmisc.mk index 3d0d2c5367..8b92be11e8 100644 --- a/package/psmisc/psmisc.mk +++ b/package/psmisc/psmisc.mk @@ -13,7 +13,7 @@ PSMISC_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) ifeq ($(BR2_TOOLCHAIN_HAS_SSP),) # Don't force -fstack-protector when SSP is not available in toolchain -PSMISC_CONF_OPTS = --disable-harden-flags +PSMISC_CONF_OPTS += --disable-harden-flags endif $(eval $(autotools-package)) From yann.morin.1998 at free.fr Thu Feb 17 20:29:10 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 17 Feb 2022 21:29:10 +0100 Subject: [Buildroot] [git commit] package/libglvnd: fix LIBGLVND_CONF_OPTS Message-ID: <20220217202156.9A04B83785@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=09a1511abd3ba0f3e20a1e93f36830d344dd1ce3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master LIBGLVND_CONF_OPTS are wrongly overridden in conditionals since the addition of the package in commit 0378e2e5d9ce9d5676975dfbff501360094fdc1a Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libglvnd/libglvnd.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libglvnd/libglvnd.mk b/package/libglvnd/libglvnd.mk index 3df609f6eb..3bac4b31e2 100644 --- a/package/libglvnd/libglvnd.mk +++ b/package/libglvnd/libglvnd.mk @@ -37,17 +37,17 @@ LIBGLVND_CONF_OPTS += -Dglx=disabled endif ifeq ($(BR2_PACKAGE_LIBGLVND_DISPATCH_EGL),y) -LIBGLVND_CONF_OPTS = -Degl=true +LIBGLVND_CONF_OPTS += -Degl=true LIBGLVND_PROVIDES += libegl else -LIBGLVND_CONF_OPTS = -Degl=false +LIBGLVND_CONF_OPTS += -Degl=false endif ifeq ($(BR2_PACKAGE_LIBGLVND_DISPATCH_GLES),y) -LIBGLVND_CONF_OPTS = -Dgles1=true -Dgles2=true +LIBGLVND_CONF_OPTS += -Dgles1=true -Dgles2=true LIBGLVND_PROVIDES += libgles else -LIBGLVND_CONF_OPTS = -Dgles1=false -Dgles2=false +LIBGLVND_CONF_OPTS += -Dgles1=false -Dgles2=false endif $(eval $(meson-package)) From yann.morin.1998 at free.fr Thu Feb 17 20:29:21 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 17 Feb 2022 21:29:21 +0100 Subject: [Buildroot] [git commit] package/libiconv: don't override LIBICONV_CONF_OPTS Message-ID: <20220217202156.C63588379E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3f5843cd07df37fbef2b421a5857b1f86d098eb6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master LIBICONV_CONF_OPTS is wrongly overridden in a conditional since commit 0d711a64d4753c0efa4158519907cca7ec284573 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libiconv/libiconv.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libiconv/libiconv.mk b/package/libiconv/libiconv.mk index ec79a5d735..40763a92f8 100644 --- a/package/libiconv/libiconv.mk +++ b/package/libiconv/libiconv.mk @@ -11,7 +11,7 @@ LIBICONV_LICENSE = GPL-3.0+ (iconv program), LGPL-2.0+ (library) LIBICONV_LICENSE_FILES = COPYING COPYING.LIB ifeq ($(BR2_PACKAGE_LIBICONV_EXTRA_ENCODINGS),y) -LIBICONV_CONF_OPTS = --enable-extra-encodings +LIBICONV_CONF_OPTS += --enable-extra-encodings endif # Don't build the preloadable library, as we don't need it (it's only From yann.morin.1998 at free.fr Thu Feb 17 20:29:15 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 17 Feb 2022 21:29:15 +0100 Subject: [Buildroot] [git commit] package/libgsasl: don't override LIBGSASL_CONF_OPTS Message-ID: <20220217202156.ABD588379E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=83f9f0b881fa401b67f2523faa4d68d20ca7cc17 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master LIBGSASL_CONF_OPTS is wrongly overridden in a conditional since commit c4ff6bf2272df54e8d4594a19fb76fe33e980da2 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libgsasl/libgsasl.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libgsasl/libgsasl.mk b/package/libgsasl/libgsasl.mk index e813a354a1..b1981dea3b 100644 --- a/package/libgsasl/libgsasl.mk +++ b/package/libgsasl/libgsasl.mk @@ -11,10 +11,10 @@ LIBGSASL_LICENSE_FILES = README COPYING.LIB COPYING LIBGSASL_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) -LIBGSASL_CONF_OPTS = --with-libgcrypt-prefix=$(STAGING_DIR)/usr +LIBGSASL_CONF_OPTS += --with-libgcrypt-prefix=$(STAGING_DIR)/usr LIBGSASL_DEPENDENCIES += libgcrypt else -LIBGSASL_CONF_OPTS = --without-libgcrypt +LIBGSASL_CONF_OPTS += --without-libgcrypt endif ifeq ($(BR2_PACKAGE_LIBIDN),y) From yann.morin.1998 at free.fr Thu Feb 17 20:29:17 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 17 Feb 2022 21:29:17 +0100 Subject: [Buildroot] [git commit] package/xz: don't override XZ_CONF_OPTS Message-ID: <20220217202156.B517B83785@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e389bf186f732729f9e5b3ec84aedd1f925b4fe9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master XZ_CONF_OPTS is wrongly overridden in a conditional since commit 0dbc17abcb5c254d60a8d59e1ae0d715c2db4324 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/xz/xz.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/xz/xz.mk b/package/xz/xz.mk index ffbae4c873..af611975a0 100644 --- a/package/xz/xz.mk +++ b/package/xz/xz.mk @@ -14,9 +14,9 @@ XZ_LICENSE_FILES = COPYING COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1 XZ_CPE_ID_VENDOR = tukaani ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -XZ_CONF_OPTS = --enable-threads +XZ_CONF_OPTS += --enable-threads else -XZ_CONF_OPTS = --disable-threads +XZ_CONF_OPTS += --disable-threads endif # we are built before ccache From yann.morin.1998 at free.fr Thu Feb 17 20:29:19 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 17 Feb 2022 21:29:19 +0100 Subject: [Buildroot] [git commit] package/urg: don't override URG_CONF_OPTS Message-ID: <20220217202156.BD9CE8379D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=293d8f727a0858b647479013be72be2da565667f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master URG_CONF_OPTS is wrongly overridden in a conditional since commit d0433603e3c7de5a0d7d6a434b4cb45ef5e5b533 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/urg/urg.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/urg/urg.mk b/package/urg/urg.mk index 86b7ec2c17..476f36299f 100644 --- a/package/urg/urg.mk +++ b/package/urg/urg.mk @@ -18,7 +18,7 @@ URG_CONF_OPTS += \ --with-sdl-prefix=$(STAGING_DIR)/usr \ --with-sdl-exec-prefix=$(STAGING_DIR)/usr else -URG_CONF_OPTS = --without-sdl +URG_CONF_OPTS += --without-sdl URG_CONF_ENV += ac_cv_path_SDL_CONFIG="" endif From yann.morin.1998 at free.fr Thu Feb 17 20:30:57 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 17 Feb 2022 21:30:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/libglvnd: fix LIBGLVND_CONF_OPTS In-Reply-To: <20220217171906.552326-1-fontaine.fabrice@gmail.com> References: <20220217171906.552326-1-fontaine.fabrice@gmail.com> Message-ID: <20220217203057.GF522310@scaer> Fabrice, All, On 2022-02-17 18:19 +0100, Fabrice Fontaine spake thusly: > LIBGLVND_CONF_OPTS are wrongly overridden in conditionals since the > addition of the package in commit > 0378e2e5d9ce9d5676975dfbff501360094fdc1a > > Signed-off-by: Fabrice Fontaine This, and the following 5 similar changes, applied to master, thanks. Regards, Yann E. MORIN. > --- > package/libglvnd/libglvnd.mk | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/libglvnd/libglvnd.mk b/package/libglvnd/libglvnd.mk > index 3df609f6eb..3bac4b31e2 100644 > --- a/package/libglvnd/libglvnd.mk > +++ b/package/libglvnd/libglvnd.mk > @@ -37,17 +37,17 @@ LIBGLVND_CONF_OPTS += -Dglx=disabled > endif > > ifeq ($(BR2_PACKAGE_LIBGLVND_DISPATCH_EGL),y) > -LIBGLVND_CONF_OPTS = -Degl=true > +LIBGLVND_CONF_OPTS += -Degl=true > LIBGLVND_PROVIDES += libegl > else > -LIBGLVND_CONF_OPTS = -Degl=false > +LIBGLVND_CONF_OPTS += -Degl=false > endif > > ifeq ($(BR2_PACKAGE_LIBGLVND_DISPATCH_GLES),y) > -LIBGLVND_CONF_OPTS = -Dgles1=true -Dgles2=true > +LIBGLVND_CONF_OPTS += -Dgles1=true -Dgles2=true > LIBGLVND_PROVIDES += libgles > else > -LIBGLVND_CONF_OPTS = -Dgles1=false -Dgles2=false > +LIBGLVND_CONF_OPTS += -Dgles1=false -Dgles2=false > endif > > $(eval $(meson-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 Thu Feb 17 20:32:42 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 17 Feb 2022 21:32:42 +0100 Subject: [Buildroot] [git commit] package/pkg-python.mk: drop references to PYTHON_{PATH, DIR} Message-ID: <20220217202558.7E84E83797@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=908e514de4919dfcde6891cb2395232e4f2846be branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master With python 2.x support dropped these variables no longer exist, so unconditionally use the python3 variant. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- 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 02df061a19..b8dc9cd9e5 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -38,10 +38,10 @@ PKG_PYTHON_DISTUTILS_ENV = \ PATH=$(BR_PATH) \ $(TARGET_CONFIGURE_OPTS) \ LDSHARED="$(TARGET_CROSS)gcc -shared" \ - PYTHONPATH="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_PATH),$(PYTHON_PATH))" \ + PYTHONPATH="$(PYTHON3_PATH)" \ PYTHONNOUSERSITE=1 \ _PYTHON_HOST_PLATFORM="$(PKG_PYTHON_HOST_PLATFORM)" \ - _PYTHON_PROJECT_BASE="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_DIR),$(PYTHON_DIR))" \ + _PYTHON_PROJECT_BASE="$(PYTHON3_DIR)" \ _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ _python_sysroot=$(STAGING_DIR) \ _python_prefix=/usr \ @@ -70,11 +70,11 @@ HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \ # Target setuptools-based packages PKG_PYTHON_SETUPTOOLS_ENV = \ _PYTHON_HOST_PLATFORM="$(PKG_PYTHON_HOST_PLATFORM)" \ - _PYTHON_PROJECT_BASE="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_DIR),$(PYTHON_DIR))" \ + _PYTHON_PROJECT_BASE="$(PYTHON3_DIR)" \ _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ PATH=$(BR_PATH) \ $(TARGET_CONFIGURE_OPTS) \ - PYTHONPATH="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_PATH),$(PYTHON_PATH))" \ + PYTHONPATH="$(PYTHON3_PATH)" \ PYTHONNOUSERSITE=1 \ _python_sysroot=$(STAGING_DIR) \ _python_prefix=/usr \ From yann.morin.1998 at free.fr Thu Feb 17 20:33:35 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 17 Feb 2022 21:33:35 +0100 Subject: [Buildroot] [PATCH] package/pkg-python.mk: drop references to PYTHON_{PATH, DIR} In-Reply-To: <20220217182202.11640-1-peter@korsgaard.com> References: <20220217182202.11640-1-peter@korsgaard.com> Message-ID: <20220217203335.GG522310@scaer> Peter, All, On 2022-02-17 19:21 +0100, Peter Korsgaard spake thusly: > With python 2.x support dropped these variables no longer exist, so > unconditionally use the python3 variant. > > Signed-off-by: Peter Korsgaard Applied to master, thanks. Regards, Yann E. MORIN. > --- > 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 02df061a19..b8dc9cd9e5 100644 > --- a/package/pkg-python.mk > +++ b/package/pkg-python.mk > @@ -38,10 +38,10 @@ PKG_PYTHON_DISTUTILS_ENV = \ > PATH=$(BR_PATH) \ > $(TARGET_CONFIGURE_OPTS) \ > LDSHARED="$(TARGET_CROSS)gcc -shared" \ > - PYTHONPATH="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_PATH),$(PYTHON_PATH))" \ > + PYTHONPATH="$(PYTHON3_PATH)" \ > PYTHONNOUSERSITE=1 \ > _PYTHON_HOST_PLATFORM="$(PKG_PYTHON_HOST_PLATFORM)" \ > - _PYTHON_PROJECT_BASE="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_DIR),$(PYTHON_DIR))" \ > + _PYTHON_PROJECT_BASE="$(PYTHON3_DIR)" \ > _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ > _python_sysroot=$(STAGING_DIR) \ > _python_prefix=/usr \ > @@ -70,11 +70,11 @@ HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \ > # Target setuptools-based packages > PKG_PYTHON_SETUPTOOLS_ENV = \ > _PYTHON_HOST_PLATFORM="$(PKG_PYTHON_HOST_PLATFORM)" \ > - _PYTHON_PROJECT_BASE="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_DIR),$(PYTHON_DIR))" \ > + _PYTHON_PROJECT_BASE="$(PYTHON3_DIR)" \ > _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ > PATH=$(BR_PATH) \ > $(TARGET_CONFIGURE_OPTS) \ > - PYTHONPATH="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_PATH),$(PYTHON_PATH))" \ > + PYTHONPATH="$(PYTHON3_PATH)" \ > PYTHONNOUSERSITE=1 \ > _python_sysroot=$(STAGING_DIR) \ > _python_prefix=/usr \ > -- > 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 Feb 17 20:39:05 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 17 Feb 2022 21:39:05 +0100 Subject: [Buildroot] [git commit] package/cryptsetup: fix build failure with libgcrypt Message-ID: <20220217203208.E1C76837A1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9badf18d97485724fc99421ab28eddd512a675c7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The patch 0001-Add-check-program-for-symver-attribute.patch, introduced in 683e8387d05c, touches a autoconf relevant file which causes a configure --recheck in the make step without proper CONF_ENV. Running autoreconf prevents this. Signed-off-by: Moritz Bitsch [yann.morin.1998 at free.fr: add comment, add commit reference] Signed-off-by: Yann E. MORIN --- package/cryptsetup/cryptsetup.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index 2e06047c56..bd8681d5ff 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -17,6 +17,10 @@ CRYPTSETUP_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (library) CRYPTSETUP_LICENSE_FILES = COPYING COPYING.LGPL CRYPTSETUP_CPE_ID_VENDOR = cryptsetup_project CRYPTSETUP_INSTALL_STAGING = YES + +# 0001-Add-check-program-for-symver-attribute.patch +CRYPTSETUP_AUTORECONF = YES + CRYPTSETUP_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)" CRYPTSETUP_CONF_OPTS += --enable-blkid --enable-libargon2 From yann.morin.1998 at free.fr Thu Feb 17 20:41:18 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 17 Feb 2022 21:41:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/cryptsetup: fix build failure with libgcrypt In-Reply-To: <20220217074338.147889-1-moritz@h6t.eu> References: <20220217074338.147889-1-moritz@h6t.eu> Message-ID: <20220217204118.GH522310@scaer> Moritz, All, On 2022-02-17 08:43 +0100, Moritz Bitsch via buildroot spake thusly: > From: Moritz Bitsch > > The patch 0001-Add-check-program-for-symver-attribute.patch touches > a autoconf relevant file which causes a configure --recheck in the > make step without proper CONF_ENV. Running autoreconf prevents this. I've added a reference to the commit sha1 that introduced the issue, as the patch by Fabrice did (as pointed out by Giulio). > Signed-off-by: Moritz Bitsch > --- > package/cryptsetup/cryptsetup.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk > index 2e06047c56..8373f0ab74 100644 > --- a/package/cryptsetup/cryptsetup.mk > +++ b/package/cryptsetup/cryptsetup.mk > @@ -19,6 +19,7 @@ CRYPTSETUP_CPE_ID_VENDOR = cryptsetup_project > CRYPTSETUP_INSTALL_STAGING = YES > CRYPTSETUP_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)" > CRYPTSETUP_CONF_OPTS += --enable-blkid --enable-libargon2 > +CRYPTSETUP_AUTORECONF = YES We also like to add a small comment to explain why autoreconf is needed, in this case just the name of the patch is suficient. Applied to master, thanks. Regards, Yann E. MORIN. > # cryptsetup uses libgcrypt by default, but can be configured to use OpenSSL > # or kernel crypto modules instead > -- > 2.35.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 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 Feb 17 20:43:39 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 17 Feb 2022 21:43:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/cryptsetup: fix build failure with libgcrypt In-Reply-To: <1544B961-F072-436D-9887-4EC3CFDC4CD3@benettiengineering.com> References: <20220217074338.147889-1-moritz@h6t.eu> <1544B961-F072-436D-9887-4EC3CFDC4CD3@benettiengineering.com> Message-ID: <20220217204339.GI522310@scaer> Giulio, All, On 2022-02-17 14:29 +0100, Giulio Benetti spake thusly: > > Il giorno 17 feb 2022, alle ore 08:55, Moritz Bitsch via buildroot ha scritto: > > The patch 0001-Add-check-program-for-symver-attribute.patch touches > > a autoconf relevant file which causes a configure --recheck in the > > make step without proper CONF_ENV. Running autoreconf prevents this. > Thank you for the contribution, but Fabrice already sent a patch for that: > https://patchwork.ozlabs.org/project/buildroot/patch/20220213210504.1416861-1-fontaine.fabrice at gmail.com/ Yep, but in this case, I applied Moritz' patch, because Fabrice has waaaayyyy too many commits in his name already! ;-] 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 Thu Feb 17 20:45:06 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 17 Feb 2022 21:45:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/cryptsetup: set CRYPTSETUP_AUTORECONF In-Reply-To: <20220213210504.1416861-1-fontaine.fabrice@gmail.com> References: <20220213210504.1416861-1-fontaine.fabrice@gmail.com> Message-ID: <20220217204506.GJ522310@scaer> Fabrice, All, On 2022-02-13 22:05 +0100, Fabrice Fontaine spake thusly: > Commit 683e8387d05cb506c30592ab43a3e7534d7cf56e forgot to set > CRYPTSETUP_AUTORECONF resulting in the following build failure: > > configure: error: You need the gcrypt library. > > Fixes: > - http://autobuild.buildroot.org/results/f6cead0cf1089bbbe52457d379764a0aa9add408 > > Signed-off-by: Fabrice Fontaine Sorry but I applied another patch (I cc-ed you on the reply). Thanks! :-) Regards, Yann E. MORIN. > --- > package/cryptsetup/cryptsetup.mk | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk > index 2e06047c56..55cc70576c 100644 > --- a/package/cryptsetup/cryptsetup.mk > +++ b/package/cryptsetup/cryptsetup.mk > @@ -17,6 +17,8 @@ CRYPTSETUP_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (library) > CRYPTSETUP_LICENSE_FILES = COPYING COPYING.LGPL > CRYPTSETUP_CPE_ID_VENDOR = cryptsetup_project > CRYPTSETUP_INSTALL_STAGING = YES > +# We're patching configure.ac > +CRYPTSETUP_AUTORECONF = YES > CRYPTSETUP_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)" > CRYPTSETUP_CONF_OPTS += --enable-blkid --enable-libargon2 > > -- > 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 Feb 17 20:49:30 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 17 Feb 2022 21:49:30 +0100 Subject: [Buildroot] [git commit branch/next] package/cryptsetup: openssl is the default crypto backend Message-ID: <20220217204203.8B00C83721@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0ce909afa98223bbd6bb1b2c65dec6cc8982ad31 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next openssl is the default crypto backend since version 2.1.0 and https://github.com/mbroz/cryptsetup/commit/bc3d0feb5cd33f9181102b418cc7bf44fe112e82 Signed-off-by: Fabrice Fontaine Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti Signed-off-by: Yann E. MORIN --- package/cryptsetup/cryptsetup.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index 2e06047c56..bad31cec8a 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -20,15 +20,15 @@ CRYPTSETUP_INSTALL_STAGING = YES CRYPTSETUP_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)" CRYPTSETUP_CONF_OPTS += --enable-blkid --enable-libargon2 -# cryptsetup uses libgcrypt by default, but can be configured to use OpenSSL +# cryptsetup uses OpenSSL by default, but can be configured to use libgcrypt # or kernel crypto modules instead -ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) +ifeq ($(BR2_PACKAGE_OPENSSL),y) +CRYPTSETUP_DEPENDENCIES += openssl +CRYPTSETUP_CONF_OPTS += --with-crypto_backend=openssl +else ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) CRYPTSETUP_DEPENDENCIES += libgcrypt CRYPTSETUP_CONF_ENV += LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config CRYPTSETUP_CONF_OPTS += --with-crypto_backend=gcrypt -else ifeq ($(BR2_PACKAGE_OPENSSL),y) -CRYPTSETUP_DEPENDENCIES += openssl -CRYPTSETUP_CONF_OPTS += --with-crypto_backend=openssl else CRYPTSETUP_CONF_OPTS += --with-crypto_backend=kernel endif From yann.morin.1998 at free.fr Thu Feb 17 20:50:04 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 17 Feb 2022 21:50:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/cryptsetup: openssl is the default crypto backend In-Reply-To: <20220213212909.1504992-1-fontaine.fabrice@gmail.com> References: <20220213212909.1504992-1-fontaine.fabrice@gmail.com> Message-ID: <20220217205004.GK522310@scaer> Fabrice, All, On 2022-02-13 22:29 +0100, Fabrice Fontaine spake thusly: > openssl is the default crypto backend since version 2.1.0 and > https://github.com/mbroz/cryptsetup/commit/bc3d0feb5cd33f9181102b418cc7bf44fe112e82 > > Signed-off-by: Fabrice Fontaine Applied to next, thanks. Regards, Yann E. MORIN. > --- > package/cryptsetup/cryptsetup.mk | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk > index 55cc70576c..b50ac698bb 100644 > --- a/package/cryptsetup/cryptsetup.mk > +++ b/package/cryptsetup/cryptsetup.mk > @@ -22,15 +22,15 @@ CRYPTSETUP_AUTORECONF = YES > CRYPTSETUP_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)" > CRYPTSETUP_CONF_OPTS += --enable-blkid --enable-libargon2 > > -# cryptsetup uses libgcrypt by default, but can be configured to use OpenSSL > +# cryptsetup uses OpenSSL by default, but can be configured to use libgcrypt > # or kernel crypto modules instead > -ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) > +ifeq ($(BR2_PACKAGE_OPENSSL),y) > +CRYPTSETUP_DEPENDENCIES += openssl > +CRYPTSETUP_CONF_OPTS += --with-crypto_backend=openssl > +else ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) > CRYPTSETUP_DEPENDENCIES += libgcrypt > CRYPTSETUP_CONF_ENV += LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config > CRYPTSETUP_CONF_OPTS += --with-crypto_backend=gcrypt > -else ifeq ($(BR2_PACKAGE_OPENSSL),y) > -CRYPTSETUP_DEPENDENCIES += openssl > -CRYPTSETUP_CONF_OPTS += --with-crypto_backend=openssl > else > CRYPTSETUP_CONF_OPTS += --with-crypto_backend=kernel > 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 giulio.benetti at benettiengineering.com Thu Feb 17 20:52:07 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 17 Feb 2022 21:52:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/cryptsetup: fix build failure with libgcrypt In-Reply-To: <20220217204339.GI522310@scaer> References: <20220217204339.GI522310@scaer> Message-ID: <72EB6D19-6401-4EF9-B07C-85CC767E3FA3@benettiengineering.com> Hi Yann, Moritz, > Il giorno 17 feb 2022, alle ore 21:44, Yann E. MORIN ha scritto: > > ?Giulio, All, > > On 2022-02-17 14:29 +0100, Giulio Benetti spake thusly: >>>> Il giorno 17 feb 2022, alle ore 08:55, Moritz Bitsch via buildroot ha scritto: >>> The patch 0001-Add-check-program-for-symver-attribute.patch touches >>> a autoconf relevant file which causes a configure --recheck in the >>> make step without proper CONF_ENV. Running autoreconf prevents this. >> Thank you for the contribution, but Fabrice already sent a patch for that: >> https://patchwork.ozlabs.org/project/buildroot/patch/20220213210504.1416861-1-fontaine.fabrice at gmail.com/ > > Yep, but in this case, I applied Moritz' patch, because Fabrice has > waaaayyyy too many commits in his name already! ;-] Yes, Moritz, feel free to send patches for other build failures you can find here in autobuilder: http://autobuild.buildroot.net/ They are more than welcome! Kind regards Giulio > > 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. | > '------------------------------^-------^------------------^--------------------' > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -------------- next part -------------- An HTML attachment was scrubbed... URL: From marcus.hoffmann at othermo.de Thu Feb 17 20:54:54 2022 From: marcus.hoffmann at othermo.de (Marcus Hoffmann) Date: Thu, 17 Feb 2022 21:54:54 +0100 Subject: [Buildroot] [PATCH] configs/kontron_bl_imx8mm_defconfig: U-Boot requires OpenSSL In-Reply-To: <20220217201001.1859113-1-giulio.benetti@benettiengineering.com> References: <20220217201001.1859113-1-giulio.benetti@benettiengineering.com> Message-ID: <09bdaefa-5364-c7cb-b001-47fa5af72a11@othermo.de> On 17.02.22 21:10, Giulio Benetti wrote: > Fixes: > https://gitlab.com/buildroot.org/buildroot/-/jobs/2103784267 > > Signed-off-by: Giulio Benetti Reviewed-by: Marcus Hoffmann > --- > configs/kontron_bl_imx8mm_defconfig | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/configs/kontron_bl_imx8mm_defconfig b/configs/kontron_bl_imx8mm_defconfig > index 57e7e9683d..2b7e121e25 100644 > --- a/configs/kontron_bl_imx8mm_defconfig > +++ b/configs/kontron_bl_imx8mm_defconfig > @@ -45,6 +45,7 @@ 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_OPENSSL=y > BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN=y > BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y From geomatsi at gmail.com Thu Feb 17 21:18:23 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Fri, 18 Feb 2022 00:18:23 +0300 Subject: [Buildroot] [PATCH v2 1/1] package/{hostapd, wpa_s}: modify config options handling Message-ID: <20220217211823.402414-1-geomatsi@gmail.com> Makefiles hostapd.mk and wpa_supplicant.mk define different macros for different defconfig options. Options that are not listed in defconfig, can be set using CONFIG_SET. Options that are listed in defconfig, can be enabled or disabled using CONFIG_ENABLE or CONFIG_DISABLE. Starting from hostapd v2.10, option CONFIG_DPP is explicitly listed in defconfig. So it would be time to switch to enable/disable macros for this option. On the other hand, this approach looks fragile: we have to track 'promoted' defconfig options for each hostapd/wpa_s update. This patch removes CONFIG_SET macros, keeping only CONFIG_ENABLED/CONFIG_DISABLED. CONFIG_SET is replaced by the additional pass over enabled options. All such options that are not listed in defconfig, will be appended to the configuration file. Fixes: - http://autobuild.buildroot.net/results/3f8058ee6f3913fda795578f206db895731ba1e6/ Signed-off-by: Sergey Matyukevich --- v1 -> v2: - drop patch for mesh fix - remove CONFIG_SET macro as per suggestion by Thomas package/hostapd/hostapd.mk | 20 +++++++++++++------- package/wpa_supplicant/wpa_supplicant.mk | 9 +++++++-- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk index 075cb2a8d0..99f0cdf1b8 100644 --- a/package/hostapd/hostapd.mk +++ b/package/hostapd/hostapd.mk @@ -15,7 +15,6 @@ HOSTAPD_LICENSE_FILES = README HOSTAPD_CPE_ID_VENDOR = w1.fi HOSTAPD_SELINUX_MODULES = hostapd -HOSTAPD_CONFIG_SET = HOSTAPD_CONFIG_ENABLE = \ CONFIG_INTERNAL_LIBTOMMATH \ @@ -83,13 +82,14 @@ HOSTAPD_CONFIG_ENABLE += CONFIG_WPS endif ifeq ($(BR2_PACKAGE_HOSTAPD_WPA3),y) -HOSTAPD_CONFIG_SET += \ - CONFIG_DPP \ - CONFIG_SAE HOSTAPD_CONFIG_ENABLE += \ + CONFIG_DPP \ + CONFIG_SAE \ CONFIG_OWE else HOSTAPD_CONFIG_DISABLE += \ + CONFIG_DPP \ + CONFIG_SAE \ CONFIG_OWE endif @@ -98,8 +98,9 @@ HOSTAPD_CONFIG_ENABLE += CONFIG_NO_VLAN endif ifeq ($(BR2_PACKAGE_HOSTAPD_VLAN_DYNAMIC),y) -HOSTAPD_CONFIG_ENABLE += CONFIG_FULL_DYNAMIC_VLAN -HOSTAPD_CONFIG_SET += NEED_LINUX_IOCTL +HOSTAPD_CONFIG_ENABLE += \ + CONFIG_FULL_DYNAMIC_VLAN \ + NEED_LINUX_IOCTL endif ifeq ($(BR2_PACKAGE_HOSTAPD_VLAN_NETLINK),y) @@ -123,9 +124,14 @@ define HOSTAPD_CONFIGURE_CMDS cp $(@D)/hostapd/defconfig $(HOSTAPD_CONFIG) sed -i $(patsubst %,-e 's/^#\(%\)/\1/',$(HOSTAPD_CONFIG_ENABLE)) \ $(patsubst %,-e 's/^\(%\)/#\1/',$(HOSTAPD_CONFIG_DISABLE)) \ - $(patsubst %,-e '1i%=y',$(HOSTAPD_CONFIG_SET)) \ $(patsubst %,-e %,$(HOSTAPD_CONFIG_EDITS)) \ $(HOSTAPD_CONFIG) + # set requested configuration options not listed in hostapd defconfig + for s in $(HOSTAPD_CONFIG_ENABLE) ; do \ + if ! grep -q "^$${s}" $(HOSTAPD_CONFIG); then \ + echo "$${s}=y" >> $(HOSTAPD_CONFIG) ; \ + fi \ + done endef define HOSTAPD_BUILD_CMDS diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk index b414144774..f0eb36e083 100644 --- a/package/wpa_supplicant/wpa_supplicant.mk +++ b/package/wpa_supplicant/wpa_supplicant.mk @@ -164,7 +164,7 @@ WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_READLINE endif ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_WPA_CLIENT_SO),y) -WPA_SUPPLICANT_CONFIG_SET += CONFIG_BUILD_WPA_CLIENT_SO +WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_BUILD_WPA_CLIENT_SO define WPA_SUPPLICANT_INSTALL_WPA_CLIENT_SO $(INSTALL) -m 0644 -D $(@D)/$(WPA_SUPPLICANT_SUBDIR)/libwpa_client.so \ $(TARGET_DIR)/usr/lib/libwpa_client.so @@ -183,9 +183,14 @@ define WPA_SUPPLICANT_CONFIGURE_CMDS cp $(@D)/wpa_supplicant/defconfig $(WPA_SUPPLICANT_CONFIG) sed -i $(patsubst %,-e 's/^#\(%\)/\1/',$(WPA_SUPPLICANT_CONFIG_ENABLE)) \ $(patsubst %,-e 's/^\(%\)/#\1/',$(WPA_SUPPLICANT_CONFIG_DISABLE)) \ - $(patsubst %,-e '1i%=y',$(WPA_SUPPLICANT_CONFIG_SET)) \ $(patsubst %,-e %,$(WPA_SUPPLICANT_CONFIG_EDITS)) \ $(WPA_SUPPLICANT_CONFIG) + # set requested configuration options not listed in wpa_s defconfig + for s in $(WPA_SUPPLICANT_CONFIG_ENABLE) ; do \ + if ! grep -q "^$${s}" $(WPA_SUPPLICANT_CONFIG); then \ + echo "$${s}=y" >> $(WPA_SUPPLICANT_CONFIG) ; \ + fi \ + done endef # LIBS for wpa_supplicant, LIBS_c for wpa_cli, LIBS_p for wpa_passphrase -- 2.35.0 From yann.morin.1998 at free.fr Thu Feb 17 21:40:20 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 17 Feb 2022 22:40:20 +0100 Subject: [Buildroot] [git commit] configs/kontron_bl_imx8mm_defconfig: U-Boot requires OpenSSL Message-ID: <20220217213507.AB5FC83796@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0711e9149820ba609edfcebfba2db95beb92ed32 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2103784267 Signed-off-by: Giulio Benetti Reviewed-by: Marcus Hoffmann Signed-off-by: Yann E. MORIN --- configs/kontron_bl_imx8mm_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/kontron_bl_imx8mm_defconfig b/configs/kontron_bl_imx8mm_defconfig index 57e7e9683d..2b7e121e25 100644 --- a/configs/kontron_bl_imx8mm_defconfig +++ b/configs/kontron_bl_imx8mm_defconfig @@ -45,6 +45,7 @@ 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_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN=y BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y From yann.morin.1998 at free.fr Thu Feb 17 21:40:27 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 17 Feb 2022 22:40:27 +0100 Subject: [Buildroot] [git commit] configs/friendlyarm_nanopi_r2s_defconfig: uboot needs openssl Message-ID: <20220217213507.B5767837B9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1f1e32f6d7e66e37e8ea79da08c91eff590078b3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes the following compile error: In file included from include/bootm.h:10, from tools/image-host.c:12: include/image.h:1178:12: fatal error: openssl/evp.h: No such file or directory 1178 | # include | ^~~~~~~~~~~~~~~ compilation terminated. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2103784200 Signed-off-by: Marcus Hoffmann Reviewed-by: Giulio Benetti Signed-off-by: Yann E. MORIN --- configs/friendlyarm_nanopi_r2s_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/friendlyarm_nanopi_r2s_defconfig b/configs/friendlyarm_nanopi_r2s_defconfig index 818c847f4b..ce252a5d76 100644 --- a/configs/friendlyarm_nanopi_r2s_defconfig +++ b/configs/friendlyarm_nanopi_r2s_defconfig @@ -30,6 +30,7 @@ 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_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y From yann.morin.1998 at free.fr Thu Feb 17 21:43:14 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 17 Feb 2022 22:43:14 +0100 Subject: [Buildroot] [PATCH v2 1/2] configs/friendlyarm_nanopi_r2s_defconfig: uboot needs openssl In-Reply-To: <20220217155549.1084829-2-marcus.hoffmann@othermo.de> References: <20220217155549.1084829-1-marcus.hoffmann@othermo.de> <20220217155549.1084829-2-marcus.hoffmann@othermo.de> Message-ID: <20220217214314.GL522310@scaer> Marcus, All On 2022-02-17 16:55 +0100, Marcus Hoffmann spake thusly: > Fixes the following compile error: > > In file included from include/bootm.h:10, > from tools/image-host.c:12: > include/image.h:1178:12: fatal error: openssl/evp.h: No such file or directory > 1178 | # include > | ^~~~~~~~~~~~~~~ > compilation terminated. > > Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2103784200 > > Signed-off-by: Marcus Hoffmann Applied to master, thanks. Regards, Yann E. MORIN. > --- > configs/friendlyarm_nanopi_r2s_defconfig | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/configs/friendlyarm_nanopi_r2s_defconfig b/configs/friendlyarm_nanopi_r2s_defconfig > index 818c847f4b..ce252a5d76 100644 > --- a/configs/friendlyarm_nanopi_r2s_defconfig > +++ b/configs/friendlyarm_nanopi_r2s_defconfig > @@ -30,6 +30,7 @@ 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_PYLIBFDT=y > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y > BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > -- > 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 Feb 17 21:43:31 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 17 Feb 2022 22:43:31 +0100 Subject: [Buildroot] [PATCH] configs/kontron_bl_imx8mm_defconfig: U-Boot requires OpenSSL In-Reply-To: <20220217201001.1859113-1-giulio.benetti@benettiengineering.com> References: <20220217201001.1859113-1-giulio.benetti@benettiengineering.com> Message-ID: <20220217214331.GM522310@scaer> Giulio, All, On 2022-02-17 21:10 +0100, Giulio Benetti spake thusly: > Fixes: > https://gitlab.com/buildroot.org/buildroot/-/jobs/2103784267 > > Signed-off-by: Giulio Benetti Applied to master, thanks. Regards, Yann E. MORIN. > --- > configs/kontron_bl_imx8mm_defconfig | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/configs/kontron_bl_imx8mm_defconfig b/configs/kontron_bl_imx8mm_defconfig > index 57e7e9683d..2b7e121e25 100644 > --- a/configs/kontron_bl_imx8mm_defconfig > +++ b/configs/kontron_bl_imx8mm_defconfig > @@ -45,6 +45,7 @@ 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_OPENSSL=y > BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN=y > BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=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 Thu Feb 17 21:44:43 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 17 Feb 2022 22:44:43 +0100 Subject: [Buildroot] [PATCH v2 2/2] board/orangepi/orangepi-rk3399/genimage: fix partition types for gpt In-Reply-To: <20220217155549.1084829-3-marcus.hoffmann@othermo.de> References: <20220217155549.1084829-1-marcus.hoffmann@othermo.de> <20220217155549.1084829-3-marcus.hoffmann@othermo.de> Message-ID: <20220217214443.GN522310@scaer> Marcus, All, On 2022-02-17 16:55 +0100, Marcus Hoffmann spake thusly: > Fixes the following error during image generation: > ERROR: hdimage(sdcard.img): part boot: 'partition-type' is only valid > for mbr and hybrid partition-table-type > > Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2103784375 > > Signed-off-by: Marcus Hoffmann > --- > board/orangepi/orangepi-rk3399/genimage.cfg | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/board/orangepi/orangepi-rk3399/genimage.cfg b/board/orangepi/orangepi-rk3399/genimage.cfg > index c94e0bc7cc..a02166172f 100644 > --- a/board/orangepi/orangepi-rk3399/genimage.cfg > +++ b/board/orangepi/orangepi-rk3399/genimage.cfg > @@ -26,14 +26,13 @@ image sdcard.img { > } > > partition boot { > - partition-type = 0xC > + partition-type-uuid = F > bootable = "true" > image = "boot.vfat" > offset = 16M > } > > partition rootfs { > - partition-type = 0x83 Why don't you also switch this one to partition-type-uuid? Regards, Yann E. MORIN. > image = "rootfs.ext4" > } > } > -- > 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 Thu Feb 17 21:44:59 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 17 Feb 2022 22:44:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/pcre: don't override PCRE_CONF_OPTS Message-ID: <20220217214459.555586-1-fontaine.fabrice@gmail.com> PCRE_CONF_OPTS is wrongly overridden in a conditional since commit 9b28d48012c33b37d33101991fa042f9fc9d76eb Signed-off-by: Fabrice Fontaine --- package/pcre/pcre.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pcre/pcre.mk b/package/pcre/pcre.mk index c85f6717db..59750c28e7 100644 --- a/package/pcre/pcre.mk +++ b/package/pcre/pcre.mk @@ -18,7 +18,7 @@ HOST_PCRE_CONF_OPTS = --enable-unicode-properties ifneq ($(BR2_INSTALL_LIBSTDCPP),y) # pcre will use the host g++ if a cross version isn't available -PCRE_CONF_OPTS = --disable-cpp +PCRE_CONF_OPTS += --disable-cpp endif PCRE_CONF_OPTS += --enable-pcre8 -- 2.34.1 From fontaine.fabrice at gmail.com Thu Feb 17 21:45:36 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 17 Feb 2022 22:45:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/arp-scan: don't override ARP_SCAN_CONF_OPTS Message-ID: <20220217214536.555637-1-fontaine.fabrice@gmail.com> ARP_SCAN_CONF_OPTS is wrongly overriden in a conditional since commit df578c86eddfb5d115195d3650d5ecba5431e8fc Signed-off-by: Fabrice Fontaine --- package/arp-scan/arp-scan.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/arp-scan/arp-scan.mk b/package/arp-scan/arp-scan.mk index cc1efe84a7..3fdbd463c2 100644 --- a/package/arp-scan/arp-scan.mk +++ b/package/arp-scan/arp-scan.mk @@ -12,7 +12,7 @@ ARP_SCAN_DEPENDENCIES = libpcap ARP_SCAN_AUTORECONF = YES ifeq ($(BR2_STATIC_LIBS),y) -ARP_SCAN_CONF_OPTS = LIBS="`$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs`" +ARP_SCAN_CONF_OPTS += LIBS="`$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs`" endif ARP_SCAN_CONF_ENV = pgac_cv_snprintf_long_long_int_format='%lld' -- 2.34.1 From fontaine.fabrice at gmail.com Thu Feb 17 21:46:12 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 17 Feb 2022 22:46:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/perl-netaddr-ip: don't override PERL_NETADDR_IP_CONF_OPTS Message-ID: <20220217214612.555680-1-fontaine.fabrice@gmail.com> PERL_NETADDR_IP_CONF_OPTS is wrongly overridden in a conditional since commit 86658b0b18719c93fca359be65904ff366be9985 Signed-off-by: Fabrice Fontaine --- package/perl-netaddr-ip/perl-netaddr-ip.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/perl-netaddr-ip/perl-netaddr-ip.mk b/package/perl-netaddr-ip/perl-netaddr-ip.mk index 4824b4e9ee..c4885715b4 100644 --- a/package/perl-netaddr-ip/perl-netaddr-ip.mk +++ b/package/perl-netaddr-ip/perl-netaddr-ip.mk @@ -12,7 +12,7 @@ PERL_NETADDR_IP_LICENSE_FILES = Artistic Copying PERL_NETADDR_IP_DISTNAME = NetAddr-IP ifeq ($(BR2_STATIC_LIBS),y) -PERL_NETADDR_IP_CONF_OPTS = -noxs +PERL_NETADDR_IP_CONF_OPTS += -noxs endif $(eval $(perl-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Thu Feb 17 21:46:45 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 17 Feb 2022 22:46:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/socketcand: don't override SOCKETCAND_CONF_OPTS Message-ID: <20220217214645.555727-1-fontaine.fabrice@gmail.com> SOCKETCAND_CONF_OPTS is wrongly overridden in a conditional since commit 53e498da2f2ebfc87c3de0fe18bc9132e94b4fcb Signed-off-by: Fabrice Fontaine --- package/socketcand/socketcand.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/socketcand/socketcand.mk b/package/socketcand/socketcand.mk index dbf859d3f9..1755d3ae56 100644 --- a/package/socketcand/socketcand.mk +++ b/package/socketcand/socketcand.mk @@ -13,7 +13,7 @@ SOCKETCAND_LICENSE_FILES = socketcand.c ifeq ($(BR2_PACKAGE_LIBCONFIG),y) SOCKETCAND_DEPENDENCIES += libconfig else -SOCKETCAND_CONF_OPTS = --without-config +SOCKETCAND_CONF_OPTS += --without-config endif $(eval $(autotools-package)) -- 2.34.1 From marcus.hoffmann at othermo.de Thu Feb 17 21:47:27 2022 From: marcus.hoffmann at othermo.de (Marcus Hoffmann) Date: Thu, 17 Feb 2022 22:47:27 +0100 Subject: [Buildroot] [PATCH v2 2/2] board/orangepi/orangepi-rk3399/genimage: fix partition types for gpt In-Reply-To: <20220217214443.GN522310@scaer> References: <20220217155549.1084829-1-marcus.hoffmann@othermo.de> <20220217155549.1084829-3-marcus.hoffmann@othermo.de> <20220217214443.GN522310@scaer> Message-ID: Hi Yann, On 17.02.22 22:44, Yann E. MORIN wrote: > Marcus, All, > > On 2022-02-17 16:55 +0100, Marcus Hoffmann spake thusly: >> Fixes the following error during image generation: >> ERROR: hdimage(sdcard.img): part boot: 'partition-type' is only valid >> for mbr and hybrid partition-table-type >> >> Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2103784375 >> >> Signed-off-by: Marcus Hoffmann >> --- >> board/orangepi/orangepi-rk3399/genimage.cfg | 3 +-- >> 1 file changed, 1 insertion(+), 2 deletions(-) >> >> diff --git a/board/orangepi/orangepi-rk3399/genimage.cfg b/board/orangepi/orangepi-rk3399/genimage.cfg >> index c94e0bc7cc..a02166172f 100644 >> --- a/board/orangepi/orangepi-rk3399/genimage.cfg >> +++ b/board/orangepi/orangepi-rk3399/genimage.cfg >> @@ -26,14 +26,13 @@ image sdcard.img { >> } >> >> partition boot { >> - partition-type = 0xC >> + partition-type-uuid = F >> bootable = "true" >> image = "boot.vfat" >> offset = 16M >> } >> >> partition rootfs { >> - partition-type = 0x83 > > Why don't you also switch this one to partition-type-uuid? The replacement for this would be "partition-type-uuid = L", which is the default. I believe I saw a patch recently that removed those default entries, which is why I didn't include it. Best, Marcus > > Regards, > Yann E. MORIN. > >> image = "rootfs.ext4" >> } >> } >> -- >> 2.25.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > From giulio.benetti at benettiengineering.com Thu Feb 17 21:50:32 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 17 Feb 2022 22:50:32 +0100 Subject: [Buildroot] [PATCH v2 2/2] board/orangepi/orangepi-rk3399/genimage: fix partition types for gpt In-Reply-To: <20220217214443.GN522310@scaer> References: <20220217155549.1084829-1-marcus.hoffmann@othermo.de> <20220217155549.1084829-3-marcus.hoffmann@othermo.de> <20220217214443.GN522310@scaer> Message-ID: Hi Yann, On 17/02/22 22:44, Yann E. MORIN wrote: > Marcus, All, > > On 2022-02-17 16:55 +0100, Marcus Hoffmann spake thusly: >> Fixes the following error during image generation: >> ERROR: hdimage(sdcard.img): part boot: 'partition-type' is only valid >> for mbr and hybrid partition-table-type >> >> Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2103784375 >> >> Signed-off-by: Marcus Hoffmann >> --- >> board/orangepi/orangepi-rk3399/genimage.cfg | 3 +-- >> 1 file changed, 1 insertion(+), 2 deletions(-) >> >> diff --git a/board/orangepi/orangepi-rk3399/genimage.cfg b/board/orangepi/orangepi-rk3399/genimage.cfg >> index c94e0bc7cc..a02166172f 100644 >> --- a/board/orangepi/orangepi-rk3399/genimage.cfg >> +++ b/board/orangepi/orangepi-rk3399/genimage.cfg >> @@ -26,14 +26,13 @@ image sdcard.img { >> } >> >> partition boot { >> - partition-type = 0xC >> + partition-type-uuid = F >> bootable = "true" >> image = "boot.vfat" >> offset = 16M >> } >> >> partition rootfs { >> - partition-type = 0x83 > > Why don't you also switch this one to partition-type-uuid? I've been asked by Arnout to drop L since it's the default: https://lists.buildroot.org/pipermail/buildroot/2022-February/636945.html I see both Thomas and Arnout seem to go for single letters intead of extended specific partition-type-uuid. That's why I didn't comment on this point that only removes partition-type. Best regards -- Giulio Benetti Benetti Engineering sas > > Regards, > Yann E. MORIN. > >> image = "rootfs.ext4" >> } >> } >> -- >> 2.25.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > From fontaine.fabrice at gmail.com Thu Feb 17 21:50:49 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 17 Feb 2022 22:50:49 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xdriver_xf86-video-mga: don't override XDRIVER_XF86_VIDEO_MGA_CONF_OPTS Message-ID: <20220217215049.556036-1-fontaine.fabrice@gmail.com> XDRIVER_XF86_VIDEO_MGA_CONF_OPTS is wrongly overridden in a conditional since commit 105c7c7573ee2c7771db49c3e0dc168bc0eee84b Signed-off-by: Fabrice Fontaine --- package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk index 2720848a17..3c668a5c98 100644 --- a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk +++ b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk @@ -13,7 +13,7 @@ XDRIVER_XF86_VIDEO_MGA_AUTORECONF = YES XDRIVER_XF86_VIDEO_MGA_DEPENDENCIES = xserver_xorg-server libdrm xorgproto ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) -XDRIVER_XF86_VIDEO_MGA_CONF_OPTS = --disable-dri +XDRIVER_XF86_VIDEO_MGA_CONF_OPTS += --disable-dri endif $(eval $(autotools-package)) -- 2.34.1 From yann.morin.1998 at free.fr Thu Feb 17 21:47:41 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 17 Feb 2022 22:47:41 +0100 Subject: [Buildroot] [git commit] package/pcre: don't override PCRE_CONF_OPTS Message-ID: <20220217214408.52D248379E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e3c1efd5d2e60435f4863b8c2b5a97dc21756810 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master PCRE_CONF_OPTS is wrongly overridden in a conditional since commit 9b28d48012c33b37d33101991fa042f9fc9d76eb Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/pcre/pcre.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pcre/pcre.mk b/package/pcre/pcre.mk index c85f6717db..59750c28e7 100644 --- a/package/pcre/pcre.mk +++ b/package/pcre/pcre.mk @@ -18,7 +18,7 @@ HOST_PCRE_CONF_OPTS = --enable-unicode-properties ifneq ($(BR2_INSTALL_LIBSTDCPP),y) # pcre will use the host g++ if a cross version isn't available -PCRE_CONF_OPTS = --disable-cpp +PCRE_CONF_OPTS += --disable-cpp endif PCRE_CONF_OPTS += --enable-pcre8 From yann.morin.1998 at free.fr Thu Feb 17 21:47:43 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 17 Feb 2022 22:47:43 +0100 Subject: [Buildroot] [git commit] package/arp-scan: don't override ARP_SCAN_CONF_OPTS Message-ID: <20220217214408.5D9497F8A8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=37ba37d516772ade08abf00badc5a6592222972c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master ARP_SCAN_CONF_OPTS is wrongly overriden in a conditional since commit df578c86eddfb5d115195d3650d5ecba5431e8fc Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/arp-scan/arp-scan.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/arp-scan/arp-scan.mk b/package/arp-scan/arp-scan.mk index cc1efe84a7..3fdbd463c2 100644 --- a/package/arp-scan/arp-scan.mk +++ b/package/arp-scan/arp-scan.mk @@ -12,7 +12,7 @@ ARP_SCAN_DEPENDENCIES = libpcap ARP_SCAN_AUTORECONF = YES ifeq ($(BR2_STATIC_LIBS),y) -ARP_SCAN_CONF_OPTS = LIBS="`$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs`" +ARP_SCAN_CONF_OPTS += LIBS="`$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs`" endif ARP_SCAN_CONF_ENV = pgac_cv_snprintf_long_long_int_format='%lld' From yann.morin.1998 at free.fr Thu Feb 17 21:47:45 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 17 Feb 2022 22:47:45 +0100 Subject: [Buildroot] [git commit] package/perl-netaddr-ip: don't override PERL_NETADDR_IP_CONF_OPTS Message-ID: <20220217214408.671BD837BA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9f96c4be57d1edb2c89d542e9d1d894c5a20b7c2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master PERL_NETADDR_IP_CONF_OPTS is wrongly overridden in a conditional since commit 86658b0b18719c93fca359be65904ff366be9985 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/perl-netaddr-ip/perl-netaddr-ip.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/perl-netaddr-ip/perl-netaddr-ip.mk b/package/perl-netaddr-ip/perl-netaddr-ip.mk index 4824b4e9ee..c4885715b4 100644 --- a/package/perl-netaddr-ip/perl-netaddr-ip.mk +++ b/package/perl-netaddr-ip/perl-netaddr-ip.mk @@ -12,7 +12,7 @@ PERL_NETADDR_IP_LICENSE_FILES = Artistic Copying PERL_NETADDR_IP_DISTNAME = NetAddr-IP ifeq ($(BR2_STATIC_LIBS),y) -PERL_NETADDR_IP_CONF_OPTS = -noxs +PERL_NETADDR_IP_CONF_OPTS += -noxs endif $(eval $(perl-package)) From yann.morin.1998 at free.fr Thu Feb 17 21:47:47 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 17 Feb 2022 22:47:47 +0100 Subject: [Buildroot] [git commit] package/socketcand: don't override SOCKETCAND_CONF_OPTS Message-ID: <20220217214408.709A3837B9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=becc4814601336f1df72e0e0306b11529bb91246 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master SOCKETCAND_CONF_OPTS is wrongly overridden in a conditional since commit 53e498da2f2ebfc87c3de0fe18bc9132e94b4fcb Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/socketcand/socketcand.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/socketcand/socketcand.mk b/package/socketcand/socketcand.mk index dbf859d3f9..1755d3ae56 100644 --- a/package/socketcand/socketcand.mk +++ b/package/socketcand/socketcand.mk @@ -13,7 +13,7 @@ SOCKETCAND_LICENSE_FILES = socketcand.c ifeq ($(BR2_PACKAGE_LIBCONFIG),y) SOCKETCAND_DEPENDENCIES += libconfig else -SOCKETCAND_CONF_OPTS = --without-config +SOCKETCAND_CONF_OPTS += --without-config endif $(eval $(autotools-package)) From yann.morin.1998 at free.fr Thu Feb 17 21:53:11 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 17 Feb 2022 22:53:11 +0100 Subject: [Buildroot] [git commit] package/x11r7/xdriver_xf86-video-mga: don't override XDRIVER_XF86_VIDEO_MGA_CONF_OPTS Message-ID: <20220217214544.8F57482578@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=43e2a5e11f07d6fabd15f530ba98f7bbee73dac2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master XDRIVER_XF86_VIDEO_MGA_CONF_OPTS is wrongly overridden in a conditional since commit 105c7c7573ee2c7771db49c3e0dc168bc0eee84b Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk index 2720848a17..3c668a5c98 100644 --- a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk +++ b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk @@ -13,7 +13,7 @@ XDRIVER_XF86_VIDEO_MGA_AUTORECONF = YES XDRIVER_XF86_VIDEO_MGA_DEPENDENCIES = xserver_xorg-server libdrm xorgproto ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) -XDRIVER_XF86_VIDEO_MGA_CONF_OPTS = --disable-dri +XDRIVER_XF86_VIDEO_MGA_CONF_OPTS += --disable-dri endif $(eval $(autotools-package)) From fontaine.fabrice at gmail.com Thu Feb 17 21:54:13 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 17 Feb 2022 22:54:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xdriver_xf86-video-ati: don't override XDRIVER_XF86_VIDEO_ATI_CONF_OPTS Message-ID: <20220217215413.556297-1-fontaine.fabrice@gmail.com> XDRIVER_XF86_VIDEO_ATI_CONF_OPTS is wrongly overridden in a conditional since commit daa433bff6d2d9934705feacd3619a7618d13ae5 Signed-off-by: Fabrice Fontaine --- .../x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk index f7aeba8ba6..edb8b11add 100644 --- a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk +++ b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk @@ -16,9 +16,9 @@ XDRIVER_XF86_VIDEO_ATI_DEPENDENCIES = \ xserver_xorg-server ifeq ($(BR2_PACKAGE_HAS_LIBEGL)$(BR2_PACKAGE_HAS_LIBGL)$(BR2_PACKAGE_LIBEPOXY),yyy) -XDRIVER_XF86_VIDEO_ATI_CONF_OPTS = --enable-glamor +XDRIVER_XF86_VIDEO_ATI_CONF_OPTS += --enable-glamor else -XDRIVER_XF86_VIDEO_ATI_CONF_OPTS = --disable-glamor +XDRIVER_XF86_VIDEO_ATI_CONF_OPTS += --disable-glamor endif # xdriver_xf86-video-ati requires O_CLOEXEC -- 2.34.1 From yann.morin.1998 at free.fr Thu Feb 17 22:07:14 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 17 Feb 2022 23:07:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/pcre: don't override PCRE_CONF_OPTS In-Reply-To: <20220217214459.555586-1-fontaine.fabrice@gmail.com> References: <20220217214459.555586-1-fontaine.fabrice@gmail.com> Message-ID: <20220217220714.GO522310@scaer> Fabrice, All, On 2022-02-17 22:44 +0100, Fabrice Fontaine spake thusly: > PCRE_CONF_OPTS is wrongly overridden in a conditional since commit > 9b28d48012c33b37d33101991fa042f9fc9d76eb > > Signed-off-by: Fabrice Fontaine Applied to master, alogn with your four following similar changes, thanks. Note that some of them are not really overrides, as the variables are not previously set, but for consistency sake, and for robustness agaisnt future evolutions in those files, this is still better (and correct!) to use the append assignment in conditional blocks. Thanks! Regards, Yann E. MORIN. > --- > package/pcre/pcre.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/pcre/pcre.mk b/package/pcre/pcre.mk > index c85f6717db..59750c28e7 100644 > --- a/package/pcre/pcre.mk > +++ b/package/pcre/pcre.mk > @@ -18,7 +18,7 @@ HOST_PCRE_CONF_OPTS = --enable-unicode-properties > > ifneq ($(BR2_INSTALL_LIBSTDCPP),y) > # pcre will use the host g++ if a cross version isn't available > -PCRE_CONF_OPTS = --disable-cpp > +PCRE_CONF_OPTS += --disable-cpp > endif > > PCRE_CONF_OPTS += --enable-pcre8 > -- > 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 moritz at h6t.eu Thu Feb 17 23:06:38 2022 From: moritz at h6t.eu (moritz at h6t.eu) Date: Fri, 18 Feb 2022 00:06:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/pkg-cargo.mk: fix building cargo packages on 32bit arm Message-ID: <20220217230638.98748-1-moritz@h6t.eu> From: Moritz Bitsch there are duplicated symbols between rustc and gcc. Specifying --allow-multiple-definition to the linker as workaround until rustc is fixed. rust-lang issue: https://github.com/rust-lang/compiler-builtins/issues/420 Fixes: http://autobuild.buildroot.net/results/53f/53f5598b8e520caaa135fb4923c09da382dab329 Signed-off-by: Moritz Bitsch --- package/pkg-cargo.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index e74a8358bc..71d695d926 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -46,6 +46,14 @@ PKG_CARGO_ENV = \ CARGO_BUILD_TARGET="$(RUSTC_TARGET_NAME)" \ CARGO_TARGET_$(call UPPERCASE,$(RUSTC_TARGET_NAME))_LINKER=$(notdir $(TARGET_CROSS))gcc +# +# This is a workaround for https://github.com/rust-lang/compiler-builtins/issues/420 +# and should be removed when fixed upstream +# +ifeq ($(NORMALIZED_ARCH),arm) + PKG_CARGO_ENV += RUSTFLAGS="-Clink-arg=-Wl,--allow-multiple-definition" +endif + HOST_PKG_CARGO_ENV = \ $(PKG_COMMON_CARGO_ENV) -- 2.35.1 From aperez at igalia.com Thu Feb 17 23:09:07 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Fri, 18 Feb 2022 01:09:07 +0200 Subject: [Buildroot] [PATCH 1/2] package/webkitgtk: security bump to 2.34.6 Message-ID: <20220217230908.1532564-1-aperez@igalia.com> Update to a new major release which brings in improvements, a number of new features, and security fixes. Release notes: https://webkitgtk.org/2021/09/22/webkitgtk2.34.0-released.html https://webkitgtk.org/2021/10/21/webkitgtk2.34.1-released.html https://webkitgtk.org/2021/11/24/webkitgtk2.34.2-released.html https://webkitgtk.org/2021/12/20/webkitgtk2.34.3-released.html https://webkitgtk.org/2022/01/21/webkitgtk2.34.4-released.html https://webkitgtk.org/2022/02/09/webkitgtk2.34.5-released.html https://webkitgtk.org/2022/02/17/webkitgtk2.34.6-released.html Security advisories: https://webkitgtk.org/security/WSA-2021-0007.html https://webkitgtk.org/security/WSA-2022-0001.html https://webkitgtk.org/security/WSA-2022-0002.html https://webkitgtk.org/security/WSA-2022-0003.html Some of the new features require additional dependencies: HTTP/2 requires libsoup3, which is not yet packaged in Buildroot, and disabled at the moment (with -DUSE_SOUP2=ON, to keep using libsoup2); and the color management support needs LCMS2 (which will be enabled in a follow-up patch.) Options SILENCE_CROSS_COMPILATION_NOTICES and ENABLE_GRAPHICS_CONTEXT_GL do not exist anymore, and their usage is dropped. Signed-off-by: Adrian Perez de Castro --- package/webkitgtk/webkitgtk.hash | 8 ++++---- package/webkitgtk/webkitgtk.mk | 14 +++++--------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index 7cb6c90b21..82c210c8f9 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,7 +1,7 @@ -# From https://webkitgtk.org/releases/webkitgtk-2.32.4.tar.xz.sums -md5 51a167e5d03bacf30c5c588e6aa23143 webkitgtk-2.32.4.tar.xz -sha1 f7255ffb488e727e9e250e0dae9f192266f50f01 webkitgtk-2.32.4.tar.xz -sha256 00ce2d3f798d7bc5e9039d9059f0c3c974d51de38c8b716f00e94452a177d3fd webkitgtk-2.32.4.tar.xz +# From https://webkitgtk.org/releases/webkitgtk-2.34.6.tar.xz.sums +md5 a5eeedd02f5b4bba8bd891b92dc743d4 webkitgtk-2.34.6.tar.xz +sha1 bb82517289baf9c858fa406d1d845274f81e25cb webkitgtk-2.34.6.tar.xz +sha256 6bc8fd034aad0432a2459ce4fc7ee25ad65a4924c618bf8d93b52b0c1a84c1f6 webkitgtk-2.34.6.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index 16b925fe71..f4fc1e7838 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.32.4 +WEBKITGTK_VERSION = 2.34.6 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES @@ -24,10 +24,11 @@ WEBKITGTK_CONF_OPTS = \ -DENABLE_MINIBROWSER=ON \ -DENABLE_SPELLCHECK=ON \ -DPORT=GTK \ - -DSILENCE_CROSS_COMPILATION_NOTICES=ON \ + -DUSE_LCMS=OFF \ -DUSE_LIBNOTIFY=OFF \ -DUSE_LIBHYPHEN=OFF \ -DUSE_OPENJPEG=ON \ + -DUSE_SOUP2=ON \ -DUSE_WOFF2=ON ifeq ($(BR2_PACKAGE_WEBKITGTK_SANDBOX),y) @@ -73,7 +74,6 @@ ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) WEBKITGTK_CONF_OPTS += \ -DENABLE_ACCELERATED_2D_CANVAS=ON \ -DENABLE_GLES2=OFF \ - -DENABLE_GRAPHICS_CONTEXT_GL=ON \ -DENABLE_X11_TARGET=ON WEBKITGTK_DEPENDENCIES += libgl \ xlib_libXcomposite xlib_libXdamage xlib_libXrender xlib_libXt @@ -89,15 +89,11 @@ else # !X11 WEBKITGTK_DEPENDENCIES += libegl # GLESv2 support is optional though ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) -WEBKITGTK_CONF_OPTS += \ - -DENABLE_GLES2=ON \ - -DENABLE_GRAPHICS_CONTEXT_GL=ON +WEBKITGTK_CONF_OPTS += -DENABLE_GLES2=ON WEBKITGTK_DEPENDENCIES += libgles else # Disable general OpenGL (shading) if there's no GLESv2 -WEBKITGTK_CONF_OPTS += \ - -DENABLE_GLES2=OFF \ - -DENABLE_GRAPHICS_CONTEXT_GL=OFF +WEBKITGTK_CONF_OPTS += -DENABLE_GLES2=OFF endif # We must explicitly state the wayland target ifeq ($(BR2_PACKAGE_LIBGTK3_WAYLAND),y) -- 2.35.1 From aperez at igalia.com Thu Feb 17 23:09:08 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Fri, 18 Feb 2022 01:09:08 +0200 Subject: [Buildroot] [PATCH 2/2] package/webkitgtk: use lcms2 if available In-Reply-To: <20220217230908.1532564-1-aperez@igalia.com> References: <20220217230908.1532564-1-aperez@igalia.com> Message-ID: <20220217230908.1532564-2-aperez@igalia.com> Make webkitgtk enable color management support if the lcms2 package has been selected. Signed-off-by: Adrian Perez de Castro --- package/webkitgtk/webkitgtk.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index f4fc1e7838..b3dc2b2fa5 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -24,7 +24,6 @@ WEBKITGTK_CONF_OPTS = \ -DENABLE_MINIBROWSER=ON \ -DENABLE_SPELLCHECK=ON \ -DPORT=GTK \ - -DUSE_LCMS=OFF \ -DUSE_LIBNOTIFY=OFF \ -DUSE_LIBHYPHEN=OFF \ -DUSE_OPENJPEG=ON \ @@ -58,6 +57,13 @@ else WEBKITGTK_CONF_OPTS += -DENABLE_WEBDRIVER=OFF endif +ifeq ($(BR2_PACKAGE_LCMS2),y) +WEBKITGTK_CONF_OPTS += -DUSE_LCMS=ON +WEBKITGTK_DEPENDENCIES += lcms2 +else +WEBKITGTK_CONF_OPTS += -DUSE_LCMS=OFF +endif + ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) WEBKITGTK_CONF_OPTS += -DENABLE_INTROSPECTION=ON WEBKITGTK_DEPENDENCIES += gobject-introspection -- 2.35.1 From aperez at igalia.com Thu Feb 17 23:21:13 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Fri, 18 Feb 2022 01:21:13 +0200 Subject: [Buildroot] [PATCH 1/1] package/wpewebkit: security bump to version 2.34.6 Message-ID: <20220217232113.1598433-1-aperez@igalia.com> This brings the package two minor releases forward, which provides fixes for CVE-2022-22589, CVE-2022-22590, CVE-2022-22592, and CVE-2022-22620. Release notes can be found at: https://wpewebkit.org/release/wpewebkit-2.34.5.html https://wpewebkit.org/release/wpewebkit-2.34.6.html The security advisories covering this update are available at: https://wpewebkit.org/security/WSA-2022-0002.html https://wpewebkit.org/security/WSA-2022-0003.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 b863a0d705..231bbc447d 100644 --- a/package/wpewebkit/wpewebkit.hash +++ b/package/wpewebkit/wpewebkit.hash @@ -1,7 +1,7 @@ -# 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 +# From https://wpewebkit.org/releases/wpewebkit-2.34.6.tar.xz.sums +md5 c9705270b342474cca28cf51632ccbbe wpewebkit-2.34.6.tar.xz +sha1 44ae95de1b5ebf0a2b0ea3630b3677153c597402 wpewebkit-2.34.6.tar.xz +sha256 301e895c8ed08ce7dccef3192b972f2ccfc2020463244c64069a636f2b05265f wpewebkit-2.34.6.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 8d564d8223..aa04e78623 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.34.4 +WPEWEBKIT_VERSION = 2.34.6 WPEWEBKIT_SITE = http://www.wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES -- 2.35.1 From kuzminov.sergey81 at gmail.com Fri Feb 18 03:51:41 2022 From: kuzminov.sergey81 at gmail.com (Sergey Kuzminov) Date: Fri, 18 Feb 2022 06:51:41 +0300 Subject: [Buildroot] [PATCH v2] configs/orangepi_pc_defconfig: switch to extlinux Message-ID: <20220218035141.6914-1-kuzminov.sergey81@gmail.com> Changes: * Switch to common orangepi scenario for multiple boards (board/orangepi/common) to create an SD image. * Exclude FAT partition, it is no longer needed for U-Boot. * Switch SD image from MBR to GPT for partition-uuid to work. * Switch to extlinux, this is convenient for debugging. Signed-off-by: Sergey Kuzminov --- V1->V2: * improved commit log --- board/orangepi/orangepi-pc/boot.cmd | 8 ------ board/orangepi/orangepi-pc/genimage.cfg | 37 ------------------------- configs/orangepi_pc_defconfig | 9 ++---- 3 files changed, 3 insertions(+), 51 deletions(-) delete mode 100644 board/orangepi/orangepi-pc/boot.cmd delete mode 100644 board/orangepi/orangepi-pc/genimage.cfg diff --git a/board/orangepi/orangepi-pc/boot.cmd b/board/orangepi/orangepi-pc/boot.cmd deleted file mode 100644 index 9da625c803..0000000000 --- a/board/orangepi/orangepi-pc/boot.cmd +++ /dev/null @@ -1,8 +0,0 @@ -setenv fdt_high ffffffff - -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun8i-h3-orangepi-pc.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/orangepi/orangepi-pc/genimage.cfg b/board/orangepi/orangepi-pc/genimage.cfg deleted file mode 100644 index 14e326cc56..0000000000 --- a/board/orangepi/orangepi-pc/genimage.cfg +++ /dev/null @@ -1,37 +0,0 @@ -# Minimal SD card image for the OrangePi PC -# -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h3-orangepi-pc.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_pc_defconfig b/configs/orangepi_pc_defconfig index 44ea9b95c4..fd0f64e0e6 100644 --- a/configs/orangepi_pc_defconfig +++ b/configs/orangepi_pc_defconfig @@ -5,8 +5,9 @@ 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" BR2_SYSTEM_DHCP="eth0" +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-pc/genimage.cfg" +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.10.9" @@ -14,6 +15,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-pc/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-pc" +BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set @@ -27,9 +29,4 @@ BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-pc/boot.cmd" -BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -- 2.34.1 From giulio.benetti at benettiengineering.com Fri Feb 18 06:55:50 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 18 Feb 2022 07:55:50 +0100 Subject: [Buildroot] [PATCH v2] configs/orangepi_pc_defconfig: switch to extlinux In-Reply-To: <20220218035141.6914-1-kuzminov.sergey81@gmail.com> References: <20220218035141.6914-1-kuzminov.sergey81@gmail.com> Message-ID: <0A7D37AA-66D8-4772-A9F7-3CF9CED514F3@benettiengineering.com> Hi Sergey, > Il giorno 18 feb 2022, alle ore 04:59, Sergey Kuzminov ha scritto: > > ?Changes: > * Switch to common orangepi scenario for multiple boards (board/orangepi/common) to create an SD image. > * Exclude FAT partition, it is no longer needed for U-Boot. > * Switch SD image from MBR to GPT for partition-uuid to work. > * Switch to extlinux, this is convenient for debugging. > > Signed-off-by: Sergey Kuzminov Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti [Giulio: built only] Best regards Giulio > --- > V1->V2: > * improved commit log > --- > board/orangepi/orangepi-pc/boot.cmd | 8 ------ > board/orangepi/orangepi-pc/genimage.cfg | 37 ------------------------- > configs/orangepi_pc_defconfig | 9 ++---- > 3 files changed, 3 insertions(+), 51 deletions(-) > delete mode 100644 board/orangepi/orangepi-pc/boot.cmd > delete mode 100644 board/orangepi/orangepi-pc/genimage.cfg > > diff --git a/board/orangepi/orangepi-pc/boot.cmd b/board/orangepi/orangepi-pc/boot.cmd > deleted file mode 100644 > index 9da625c803..0000000000 > --- a/board/orangepi/orangepi-pc/boot.cmd > +++ /dev/null > @@ -1,8 +0,0 @@ > -setenv fdt_high ffffffff > - > -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait > - > -fatload mmc 0 $kernel_addr_r zImage > -fatload mmc 0 $fdt_addr_r sun8i-h3-orangepi-pc.dtb > - > -bootz $kernel_addr_r - $fdt_addr_r > diff --git a/board/orangepi/orangepi-pc/genimage.cfg b/board/orangepi/orangepi-pc/genimage.cfg > deleted file mode 100644 > index 14e326cc56..0000000000 > --- a/board/orangepi/orangepi-pc/genimage.cfg > +++ /dev/null > @@ -1,37 +0,0 @@ > -# Minimal SD card image for the OrangePi PC > -# > -image boot.vfat { > - vfat { > - files = { > - "zImage", > - "sun8i-h3-orangepi-pc.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_pc_defconfig b/configs/orangepi_pc_defconfig > index 44ea9b95c4..fd0f64e0e6 100644 > --- a/configs/orangepi_pc_defconfig > +++ b/configs/orangepi_pc_defconfig > @@ -5,8 +5,9 @@ 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" > BR2_SYSTEM_DHCP="eth0" > +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-pc/genimage.cfg" > +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.10.9" > @@ -14,6 +15,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="sunxi" > BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-pc/linux.fragment" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-pc" > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > # BR2_TARGET_ROOTFS_TAR is not set > @@ -27,9 +29,4 @@ BR2_TARGET_UBOOT_NEEDS_PYTHON3=y > BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" > -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-pc/boot.cmd" > -BR2_PACKAGE_HOST_DOSFSTOOLS=y > BR2_PACKAGE_HOST_GENIMAGE=y > -BR2_PACKAGE_HOST_MTOOLS=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS=y > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From fontaine.fabrice at gmail.com Fri Feb 18 09:05:33 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 18 Feb 2022 10:05:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/pulseview: fix build with glibmm 2.68 Message-ID: <20220218090533.645612-1-fontaine.fabrice@gmail.com> Fixes: - http://autobuild.buildroot.org/results/ebb73892fd7471de4f0c109554dfdc65b93d3dcf Signed-off-by: Fabrice Fontaine --- .../pulseview/0003-Support-glibmm-2.68.patch | 89 +++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100644 package/pulseview/0003-Support-glibmm-2.68.patch diff --git a/package/pulseview/0003-Support-glibmm-2.68.patch b/package/pulseview/0003-Support-glibmm-2.68.patch new file mode 100644 index 0000000000..00e4e696d9 --- /dev/null +++ b/package/pulseview/0003-Support-glibmm-2.68.patch @@ -0,0 +1,89 @@ +From a97d5a060a534a3c658578e7f14ab43556db93ca Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 30 Dec 2021 16:19:46 +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 + +C++17 support is mandatory with glibmm 2.68 + +Signed-off-by: Fabrice Fontaine +[Upstream status: not sent yet] +--- + CMakeLists.txt | 23 +++++++++++++++++++---- + INSTALL | 2 +- + 2 files changed, 20 insertions(+), 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7791b1b1..58a9cf92 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -75,7 +75,14 @@ add_subdirectory(manual) + #------------------------------------------------------------------------------- + + list(APPEND PKGDEPS glib-2.0>=2.28.0) +-list(APPEND PKGDEPS glibmm-2.4>=2.28.0) ++ ++set(LIBSR_GLIBMM "glibmm-2.4>=2.28.0") ++find_package(PkgConfig) ++pkg_check_modules(LIBSRGLIBMM24 ${LIBSR_GLIBMM}) ++if(NOT LIBSRGLIBMM24_FOUND) ++ set(LIBSR_GLIBMM "glibmm-2.68>=2.68.0") ++endif() ++list(APPEND PKGDEPS ${LIBSR_GLIBMM}) + + if(ENABLE_FLOW) + list(APPEND PKGDEPS gstreamermm-1.0>=1.8.0) +@@ -93,7 +100,6 @@ if(ANDROID) + list(APPEND PKGDEPS libsigrokandroidutils>=0.1.0) + endif() + +-find_package(PkgConfig) + pkg_check_modules(LIBSRCXX ${LIBSR_CXX_BINDING}) + if(NOT LIBSRCXX_FOUND OR NOT LIBSRCXX_VERSION) + message(FATAL_ERROR "libsigrok C++ bindings missing, check libsigrok's 'configure' output (missing dependencies?)") +@@ -225,7 +231,11 @@ memaccess_check_unaligned_le(HAVE_UNALIGNED_LITTLE_ENDIAN_ACCESS) + set(PV_TITLE PulseView) + set(PV_VERSION_STRING "0.5.0") + +-set(PV_GLIBMM_VERSION ${PKGDEPS_glibmm-2.4_VERSION}) ++if(LIBSRGLIBMM24_FOUND) ++ set(PV_GLIBMM_VERSION ${PKGDEPS_glibmm-2.4_VERSION}) ++else() ++ set(PV_GLIBMM_VERSION ${PKGDEPS_glibmm-2.68_VERSION}) ++endif() + + include(GetGitRevisionDescription) + +@@ -486,7 +496,12 @@ qt5_add_resources(pulseview_RESOURCES_RCC ${CMAKE_BINARY_DIR}/translations.qrc) + add_definitions(-DQT_NO_KEYWORDS) + add_definitions(-D__STDC_LIMIT_MACROS) + add_definitions(-Wall -Wextra) +-add_definitions(-std=c++11) ++if(LIBSRGLIBMM24_FOUND) ++ add_definitions(-std=c++11) ++else() ++ # glibmm-2.68 reuires c++17 ++ add_definitions(-std=c++17) ++endif() + add_definitions(-DBOOST_MATH_DISABLE_FLOAT128=1) + if(WIN32) + add_definitions(-Wa,-mbig-obj -O3) +diff --git a/INSTALL b/INSTALL +index da89be8d..8003fcfb 100644 +--- a/INSTALL ++++ b/INSTALL +@@ -14,7 +14,7 @@ Requirements + - pkg-config >= 0.22 + - cmake >= 2.8.12 + - libglib >= 2.28.0 +- - glibmm-2.4 (>= 2.28.0) ++ - glibmm-2.4 (>= 2.28.0) or glibmm-2.68 (>= 2.68.0) + - Qt5 (>= 5.3), including the following components: + - Qt5Core, Qt5Gui, Qt5Widgets, Qt5Svg, Qt5LinguistTools + - Qt translation package (optional; needed at runtime, not build time) +-- +2.34.1 + -- 2.34.1 From fontaine.fabrice at gmail.com Fri Feb 18 10:07:09 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 18 Feb 2022 11:07:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/zfs: replace PYTHON_VERSION_MAJOR Message-ID: <20220218100709.677205-1-fontaine.fabrice@gmail.com> Replace PYTHON_VERSION_MAJOR by PYTHON3_VERSION_MAJOR now that python2 has been dropped. It should be noted that PYTHON_SITE_PKG was wrongly set since the addition of the package in commit 4470bc9914d730383db86f58bc86fb09739622dc Signed-off-by: Fabrice Fontaine --- package/zfs/zfs.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zfs/zfs.mk b/package/zfs/zfs.mk index 6b542f5c05..dbda8aceb4 100644 --- a/package/zfs/zfs.mk +++ b/package/zfs/zfs.mk @@ -44,7 +44,7 @@ ZFS_CONF_ENV += \ PYTHON_CPPFLAGS="`$(STAGING_DIR)/usr/bin/python3-config --includes`" \ PYTHON_LIBS="`$(STAGING_DIR)/usr/bin/python3-config --ldflags`" \ PYTHON_EXTRA_LIBS="`$(STAGING_DIR)/usr/bin/python3-config --libs --embed`" \ - PYTHON_SITE_PKG="/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages" + PYTHON_SITE_PKG="/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages" ZFS_CONF_OPTS += --enable-pyzfs else ZFS_CONF_OPTS += --disable-pyzfs --without-python -- 2.34.1 From fontaine.fabrice at gmail.com Fri Feb 18 10:08:53 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 18 Feb 2022 11:08:53 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pygame: replace PYTHON_VERSION_MAJOR Message-ID: <20220218100853.677373-1-fontaine.fabrice@gmail.com> Replace PYTHON_VERSION_MAJOR by PYTHON3_VERSION_MAJOR now that python2 has been dropped Signed-off-by: Fabrice Fontaine --- package/python-pygame/python-pygame.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-pygame/python-pygame.mk b/package/python-pygame/python-pygame.mk index 8deb42a90c..600dd9e743 100644 --- a/package/python-pygame/python-pygame.mk +++ b/package/python-pygame/python-pygame.mk @@ -103,7 +103,7 @@ PYTHON_PYGAME_POST_INSTALL_TARGET_HOOKS += PYTHON_PYGAME_REMOVE_TESTS ifneq ($(BR2_PACKAGE_PYTHON_PYGAME_EXAMPLES),y) define PYTHON_PYGAME_REMOVE_EXAMPLES - rm -rf $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages/pygame/examples + rm -rf $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/pygame/examples endef PYTHON_PYGAME_POST_INSTALL_TARGET_HOOKS += PYTHON_PYGAME_REMOVE_EXAMPLES endif -- 2.34.1 From fontaine.fabrice at gmail.com Fri Feb 18 10:27:19 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 18 Feb 2022 11:27:19 +0100 Subject: [Buildroot] [PATCH 1/1] package/pkg-python: fix headers install Message-ID: <20220218102719.693274-1-fontaine.fabrice@gmail.com> For an unknown reason, installation of headers is broken since commit 7c1bb5c2bfdc9d726c41a66b30b7aa8e759c6596 which sets _PYTHON_PROJECT_BASE As _PYTHON_PROJECT_BASE value seems correct and fix its own build failures, use --install-headers to set install path for headers and avoid the following build failure with python-greenlet or python-pygame: python-greenlet: installs files in /home/peko/autobuild/instance-0/output-1/target//home/peko/autobuild/instance-0/output-1 python-pygame: installs files in /home/peko/autobuild/instance-1/output-1/target//home/peko/autobuild/instance-1/output-1 Fixes: - http://autobuild.buildroot.org/results/f5b52dee7e72f0a1f72b9f87723bc585743c7b31 - http://autobuild.buildroot.org/results/9eb2685d32756864000e1b38f8a183b57f6ea528 Signed-off-by: Fabrice Fontaine --- package/pkg-python.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index b8dc9cd9e5..c4e590bd70 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -51,10 +51,12 @@ PKG_PYTHON_DISTUTILS_BUILD_OPTS = \ --executable=/usr/bin/python PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS = \ + --install-headers=/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --prefix=/usr \ --root=$(TARGET_DIR) PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS = \ + --install-headers=/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --prefix=/usr \ --root=$(STAGING_DIR) @@ -81,12 +83,14 @@ PKG_PYTHON_SETUPTOOLS_ENV = \ _python_exec_prefix=/usr PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS = \ + --install-headers=/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --prefix=/usr \ --executable=/usr/bin/python \ --single-version-externally-managed \ --root=$(TARGET_DIR) PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS = \ + --install-headers=/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --prefix=/usr \ --executable=/usr/bin/python \ --single-version-externally-managed \ -- 2.34.1 From fontaine.fabrice at gmail.com Fri Feb 18 10:55:57 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 18 Feb 2022 11:55:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-twisted: security bump to version 22.1.0 Message-ID: <20220218105557.705926-1-fontaine.fabrice@gmail.com> Fix CVE-2022-21712: twisted is an event-driven networking engine written in Python. In affected versions twisted exposes cookies and authorization headers when following cross-origin redirects. This issue is present in the `twited.web.RedirectAgent` and `twisted.web. BrowserLikeRedirectAgent` functions. Users are advised to upgrade. There are no known workarounds. Update hash of license file (author added and update in year: https://github.com/twisted/twisted/commit/13aa59746a73769b05a51c2198b28f5602dd382f https://github.com/twisted/twisted/commit/adfdf23477abfcd09a867347993fc1d207cfb4dd https://github.com/twisted/twisted/commit/7e65fbeed3d74a4eb1c40d7a6df5651782becbc8) https://github.com/twisted/twisted/security/advisories/GHSA-92x2-jw7w-xvvx https://github.com/twisted/twisted/releases/tag/twisted-22.1.0 Signed-off-by: Fabrice Fontaine --- package/python-twisted/python-twisted.hash | 6 +++--- package/python-twisted/python-twisted.mk | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-twisted/python-twisted.hash b/package/python-twisted/python-twisted.hash index c633112e9d..8f0935e4f0 100644 --- a/package/python-twisted/python-twisted.hash +++ b/package/python-twisted/python-twisted.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/twisted/json -md5 fc16d575730db7d0cddd09fc35af3eea Twisted-20.3.0.tar.bz2 -sha256 d72c55b5d56e176563b91d11952d13b01af8725c623e498db5507b6614fc1e10 Twisted-20.3.0.tar.bz2 +md5 c818cb1ab241dc249517442e5a0e0412 Twisted-22.1.0.tar.gz +sha256 b7971ec9805b0f80e1dcb1a3721d7bfad636d5f909de687430ce373979d67b61 Twisted-22.1.0.tar.gz # Locally computed sha256 -sha256 98426fd47315df70098e0d85efbb5d7dd8001c9c536386937354640d6d8d75b9 LICENSE +sha256 686f6426a775450eb3afd00bc3a5c2621f305ddb9c8478ee9bf28a368ef2dece LICENSE diff --git a/package/python-twisted/python-twisted.mk b/package/python-twisted/python-twisted.mk index 49d97af097..8e867cfb58 100644 --- a/package/python-twisted/python-twisted.mk +++ b/package/python-twisted/python-twisted.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TWISTED_VERSION = 20.3.0 -PYTHON_TWISTED_SOURCE = Twisted-$(PYTHON_TWISTED_VERSION).tar.bz2 -PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/4a/b4/4973c7ccb5be2ec0abc779b7d5f9d5f24b17b0349e23240cfc9dc3bd83cc +PYTHON_TWISTED_VERSION = 22.1.0 +PYTHON_TWISTED_SOURCE = Twisted-$(PYTHON_TWISTED_VERSION).tar.gz +PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/77/b8/8108806ebf2b33654989fd1511281dc94a49fa7e03326d84fe5498ecfae4 PYTHON_TWISTED_SETUP_TYPE = setuptools PYTHON_TWISTED_LICENSE = MIT PYTHON_TWISTED_LICENSE_FILES = LICENSE -- 2.34.1 From fontaine.fabrice at gmail.com Fri Feb 18 10:59:24 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 18 Feb 2022 11:59:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/lxc: bump to version 4.0.12 Message-ID: <20220218105924.738666-1-fontaine.fabrice@gmail.com> https://discuss.linuxcontainers.org/t/lxc-4-0-12-has-been-released 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 2b58df2f1d..d460bc6a01 100644 --- a/package/lxc/lxc.hash +++ b/package/lxc/lxc.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 afa481e17ca9a9cf9fd3d2d7a04e42a8f6bfe60b323909326c968e852cd9f02c lxc-4.0.11.tar.gz +sha256 db242f8366fc63e8c7588bb2017b354173cf3c4b20abc18780debdc48b14d3ef lxc-4.0.12.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk index 08f64bcec7..9311dc8775 100644 --- a/package/lxc/lxc.mk +++ b/package/lxc/lxc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LXC_VERSION = 4.0.11 +LXC_VERSION = 4.0.12 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.34.1 From giulio.benetti at benettiengineering.com Fri Feb 18 11:09:14 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 18 Feb 2022 12:09:14 +0100 Subject: [Buildroot] [PATCH] configs/microchip_sam9x60ek_mmc_dev_defconfig: fix build failure due to previous wrong commit Message-ID: <20220218110914.3098061-1-giulio.benetti@benettiengineering.com> Commit 616ba9c90b014637dc9925fa442a0af4a11f04b8 extended rootfs size, but the option was listed in the wrong place. Options must be set in the order they are specified by Config.in files. So let's move BR2_TARGET_ROOTFS_EXT2_SIZE="120M" right after BR2_TARGET_ROOTFS_EXT2_4=y as it should be. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2103784289 Signed-off-by: Giulio Benetti --- configs/microchip_sam9x60ek_mmc_dev_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/microchip_sam9x60ek_mmc_dev_defconfig b/configs/microchip_sam9x60ek_mmc_dev_defconfig index 00ccd784b5..06e03967c4 100644 --- a/configs/microchip_sam9x60ek_mmc_dev_defconfig +++ b/configs/microchip_sam9x60ek_mmc_dev_defconfig @@ -7,7 +7,6 @@ BR2_TARGET_GENERIC_HOSTNAME="sam9x60ek" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/microchip/sam9x60ek_mmc/genimage.cfg" -BR2_TARGET_ROOTFS_EXT2_SIZE=120M BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,linux4microchip-2021.10)/linux-linux4microchip-2021.10.tar.gz" @@ -67,6 +66,7 @@ BR2_PACKAGE_HTOP=y BR2_PACKAGE_VIM=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v4.0.1)/at91bootstrap-v4.0.1.tar.gz" -- 2.25.1 From peter at korsgaard.com Fri Feb 18 13:30:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 18 Feb 2022 14:30:55 +0100 Subject: [Buildroot] [PATCH] package/zsh: security bump to version 5.8.1 Message-ID: <20220218133057.2426-1-peter@korsgaard.com> Fixes the following security issue: - CVE-2021-45444: In zsh before 5.8.1, an attacker can achieve code execution if they control a command output inside the prompt, as demonstrated by a %F argument. This occurs because of recursive PROMPT_SUBST expansion. The 5.8.1 release is not listed in MD5SUM, so drop the md5 hash. Signed-off-by: Peter Korsgaard --- package/zsh/zsh.hash | 6 +----- package/zsh/zsh.mk | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/package/zsh/zsh.hash b/package/zsh/zsh.hash index 2df409c946..5c661ded25 100644 --- a/package/zsh/zsh.hash +++ b/package/zsh/zsh.hash @@ -1,7 +1,3 @@ -# From http://www.zsh.org/pub/MD5SUM -md5 e02a5428620b3dd268800c7843b3dd4d zsh-5.8.tar.xz -# Calculated based on the hash above and after checking signature -# http://www.zsh.org/pub/zsh-5.8.tar.xz.asc -sha256 dcc4b54cc5565670a65581760261c163d720991f0d06486da61f8d839b52de27 zsh-5.8.tar.xz # Locally calculated +sha256 b6973520bace600b4779200269b1e5d79e5f505ac4952058c11ad5bbf0dd9919 zsh-5.8.1.tar.xz sha256 d06fdf3ef9b1ec69d6b9e170b0a9516fbad3523261ff1668bde3bfea6e0ef5f5 LICENCE diff --git a/package/zsh/zsh.mk b/package/zsh/zsh.mk index 1a04833211..c5ab7c2fae 100644 --- a/package/zsh/zsh.mk +++ b/package/zsh/zsh.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZSH_VERSION = 5.8 +ZSH_VERSION = 5.8.1 ZSH_SITE = http://www.zsh.org/pub ZSH_SOURCE = zsh-$(ZSH_VERSION).tar.xz ZSH_DEPENDENCIES = ncurses -- 2.20.1 From giulio.benetti at benettiengineering.com Fri Feb 18 17:36:12 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 18 Feb 2022 18:36:12 +0100 Subject: [Buildroot] [PATCH] package/harfbuzz: bump to version 3.4.0 Message-ID: <20220218173613.315794-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 61f2865563..e4674afa87 100644 --- a/package/harfbuzz/harfbuzz.hash +++ b/package/harfbuzz/harfbuzz.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1c13bca136c4f66658059853e2c1253f34c88f4b5c5aba6050aba7b5e0ce2503 harfbuzz-3.3.2.tar.xz +sha256 7158a87c4db82521fc506711f0c8864115f0292d95f7136c8812c11811cdf952 harfbuzz-3.4.0.tar.xz sha256 4345e1735f8bc6d812fed5180cabb5a5e88a4109d332652f2a45c13cfa5ee692 COPYING diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk index 1f5dfa8822..331b35c530 100644 --- a/package/harfbuzz/harfbuzz.mk +++ b/package/harfbuzz/harfbuzz.mk @@ -4,7 +4,7 @@ # ################################################################################ -HARFBUZZ_VERSION = 3.3.2 +HARFBUZZ_VERSION = 3.4.0 HARFBUZZ_SITE = https://github.com/harfbuzz/harfbuzz/releases/download/$(HARFBUZZ_VERSION) HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.xz HARFBUZZ_LICENSE = MIT, ISC (ucdn library) -- 2.25.1 From giulio.benetti at benettiengineering.com Fri Feb 18 17:36:13 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 18 Feb 2022 18:36:13 +0100 Subject: [Buildroot] [PATCH] package/trace-cmd: bump to version 2.9.7 In-Reply-To: <20220218173613.315794-1-giulio.benetti@benettiengineering.com> References: <20220218173613.315794-1-giulio.benetti@benettiengineering.com> Message-ID: <20220218173613.315794-2-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- package/trace-cmd/trace-cmd.hash | 2 +- package/trace-cmd/trace-cmd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/trace-cmd/trace-cmd.hash b/package/trace-cmd/trace-cmd.hash index 00cecc7828..4d39e4d5ea 100644 --- a/package/trace-cmd/trace-cmd.hash +++ b/package/trace-cmd/trace-cmd.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 45924a763376a700221f64b4034f87263e4038ec88b120a0abfb5743d051d068 trace-cmd-v2.9.6.tar.gz +sha256 a74d9ade2633b88d0ad199360d51996427e23f4835594133e456cd6e3bd3a651 trace-cmd-v2.9.7.tar.gz sha256 b1d04b850c1c7471b0f0896f6c6f0fcfc9f07e2dd183a5f5826af269fe9e88fb COPYING sha256 70f297763149e72306919c924e164f83041d5e512868d4c8c1826c171b3e49f9 COPYING.LIB sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 LICENSES/GPL-2.0 diff --git a/package/trace-cmd/trace-cmd.mk b/package/trace-cmd/trace-cmd.mk index fe0cd71ec4..52bb99036c 100644 --- a/package/trace-cmd/trace-cmd.mk +++ b/package/trace-cmd/trace-cmd.mk @@ -4,7 +4,7 @@ # ################################################################################ -TRACE_CMD_VERSION = 2.9.6 +TRACE_CMD_VERSION = 2.9.7 TRACE_CMD_SOURCE = trace-cmd-v$(TRACE_CMD_VERSION).tar.gz TRACE_CMD_SITE = \ https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot -- 2.25.1 From bernd.kuhls at t-online.de Fri Feb 18 19:02:33 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Fri, 18 Feb 2022 20:02:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/php: security bump version to 8.0.16 Message-ID: <20220218190233.473109-1-bernd.kuhls@t-online.de> Changelog: https://www.php.net/ChangeLog-8.php#8.0.16 Fixes CVE-2021-21708. 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 e78385cbe7..2753f9a0eb 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 5f33544061d37d805a2a9ce791f081ef08a7155bd7ba2362e69bba2d06b0f8b2 php-8.0.15.tar.xz +sha256 f27a2f25259e8c51e42dfd74e24a546ee521438ad7d9f6c6e794aa91f38bab0a php-8.0.16.tar.xz # License file sha256 a188db807d711536f71e27b7d36879d63480f7994dc18adc08e624b3c5430fff LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index c9de8c2c76..5b29692d94 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.0.15 +PHP_VERSION = 8.0.16 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 Feb 18 19:04:03 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Fri, 18 Feb 2022 20:04:03 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/kodi-pvr-zattoo: bump version to 19.7.11-Matrix Message-ID: <20220218190403.475643-1-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash | 2 +- package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash index ac4960df92..0b88d5c747 100644 --- a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash +++ b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8cc02c4627b5108e39bb7b6a6f56f7ba5debbb1adf982c4f23395944aa7d2c8e kodi-pvr-zattoo-19.7.10-Matrix.tar.gz +sha256 07d96b1b0c3b464c0bf02279fa8cab9ccdf675344129f3a970b14bafce225fb4 kodi-pvr-zattoo-19.7.11-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk index 7a3b230e8b..95c5de0925 100644 --- a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk +++ b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_ZATTOO_VERSION = 19.7.10-Matrix +KODI_PVR_ZATTOO_VERSION = 19.7.11-Matrix KODI_PVR_ZATTOO_SITE = $(call github,rbuehlma,pvr.zattoo,$(KODI_PVR_ZATTOO_VERSION)) KODI_PVR_ZATTOO_LICENSE = GPL-2.0+ KODI_PVR_ZATTOO_LICENSE_FILES = LICENSE.md -- 2.30.2 From egorenar at linux.ibm.com Fri Feb 18 21:14:58 2022 From: egorenar at linux.ibm.com (Alexander Egorenkov) Date: Fri, 18 Feb 2022 22:14:58 +0100 Subject: [Buildroot] [PATCH 1/1] package/s390-tools: bump to version 2.20.0 Message-ID: <20220218211458.197332-1-egorenar@linux.ibm.com> Fixes: - https://release-monitoring.org/project/10714/ Signed-off-by: Alexander Egorenkov --- package/s390-tools/s390-tools.hash | 2 +- package/s390-tools/s390-tools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/s390-tools/s390-tools.hash b/package/s390-tools/s390-tools.hash index 13c68fbf52f4..6ea8f7ea2076 100644 --- a/package/s390-tools/s390-tools.hash +++ b/package/s390-tools/s390-tools.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 17dc163e6a1e940f895c64955c130058600e1df834e1ab134410be7266ef724a s390-tools-2.19.0.tar.gz +sha256 6fa6add92e896541c0ef74885a4084474fc0d77049e8ac7372872a70a46ddd74 s390-tools-2.20.0.tar.gz sha256 cca17a9a944ebec769adee4aebd805c912c357785ff2705a99ffe68563021f75 LICENSE diff --git a/package/s390-tools/s390-tools.mk b/package/s390-tools/s390-tools.mk index 328986bcb37c..3c386af6fd10 100644 --- a/package/s390-tools/s390-tools.mk +++ b/package/s390-tools/s390-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -S390_TOOLS_VERSION = 2.19.0 +S390_TOOLS_VERSION = 2.20.0 S390_TOOLS_SITE = $(call github,ibm-s390-linux,s390-tools,v$(S390_TOOLS_VERSION)) S390_TOOLS_LICENSE = MIT S390_TOOLS_LICENSE_FILES = LICENSE -- 2.34.1 From giulio.benetti at benettiengineering.com Fri Feb 18 21:41:23 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 18 Feb 2022 22:41:23 +0100 Subject: [Buildroot] Buildroot Failure 2022-02-16 02:25:21 In-Reply-To: References: Message-ID: Hi Peter, I add ML in Cc, > Il giorno 18 feb 2022, alle ore 20:03, Peter Thompson ha scritto: > > ? > Hi Giulio > > Whew - that was fast - I am back asking questions already :).... > > My bump of sdl2_ttf-2.0.15 to sdl2_ttf-2.0.18 caused an autobuilder failure 2022-02-16 02:25:21. The log indicates the problem is pthread.h missing when harfbuzz is specified. See log below... Here can you please provide me the link like below? http://autobuild.buildroot.net/results/cba/cba34c431f8d1315e9ca9159274421a8219a701e// > > Not sure why sdl2_ttf-2.0.15 worked before..... It seems like that between 2.0.15 to 2.0.18(maybe) sdl2_ttf only uses harfbuzz provided by sdl2_ttf itself. This means it?s skipping the one provided from Buildroot that is already patched for harfbuzz pthread.h issue. > Anyways, I planned to add > SDL2_TTF_DEPENDENCIES += pthread > right under > SDL2_TTF_DEPENDENCIES += harfbuzz I would instead try to make sdl2_ttf to choose external harfbuzz instead of using the internal one. And also, we?re not sure that phtread.h is not provided at all. Sometimes build systems fail to recognize headers and libs(the way they check if a library does exist or not). > > But I am having trouble testing. When I submit > ./autobuild 91f241b8e96 ( I assume SHA1 is the git id = commit id) > I get > 404 Error Cannot get configuration for build 91f/91f241b8 > Suggestions? Here you need to pass this sha1: cba34c431f8d1315e9ca9159274421a8219a701e that is the autobuilder sha1 and not the git sha1. Take care to download the right script: http://git.buildroot.net/buildroot-test/plain/utils/br-reproduce-build Then to: $ chmod a+x br-reproduce-build Open it and adjust Buildroot path. Then execute it with: $ ./br-reproduce-build cba34c431f8d1315e9ca9159274421a8219a701e Also remember that if it fails you can: $ cd cba34c431f8d1315e9ca9159274421a8219a701e/output $ make sdl2_ttf or to rebuild package only: $ make sdl2_ttf-dirclean sdl2_ttf > > --- ALTERNATE IDEA --- > > A better way to fix this issue might be to fix package/harfbuzz. It is that dependency which needs pthread and which is causing sdl2_ttf to fail AFAIK. If look closer the build failure you will see that it?s not Buildroot harfbuzz that fails but a harfbuzz embedded into sdl2_ttf. So what I should to is to try to make sdl2_ttf drop its internal harfbuzz and use the Buildroot one. > I see harfbuzz is maintained by you so you are an excellent person to ask. > > I checked harfbuzz and there is > 0001-meson.build-check-for-pthread.h.patch > from Nov 2020 by Fabrice Fontaine. Not sure if that patch was applied or if it fixes my issue. That is applied and actually fixes harfbuzz build failure. But as explained above you?re dealing with the one embedded into sdl2_ttf package. > > Should I have copied the mailing list with these questions? I am never sure. If you?re in doubt put it in Cc :-) > Anyway - thanks for being there and helping. It is appreciated. You?re welcome! Best regards Giulio > > Peter > > > In file included from external/harfbuzz-2.8.0/src/hb.hh:470, > from external/harfbuzz-2.8.0/src/hb-aat-layout.cc:28: > external/harfbuzz-2.8.0/src/hb-mutex.hh:53:10: fatal error: pthread.h: No such file or directory > 53 | #include > | ^~~~~~~~~~~ > compilation terminated. > -------------- next part -------------- An HTML attachment was scrubbed... URL: From mdurrant at arcturusnetworks.com Fri Feb 18 22:09:05 2022 From: mdurrant at arcturusnetworks.com (Michael Durrant) Date: Fri, 18 Feb 2022 17:09:05 -0500 Subject: [Buildroot] [PATCH v4] board/arcturus/aarch64-ucls1012a: bump u-boot and kernel version Message-ID: <20220218220905.87503-1-mdurrant@arcturusnetworks.com> - Bump Linux to version 5.4.137 - Bump U-Boot to add new targets, version remains the same - Drop BR2_ROOTFS_OVERLAY and remove S09modload script because it was only used by PFE and now PFE is loaded directly by the kernel - Use Image.gz instead of Image to have a compressed kernel - Rename ucls1012a.its to br2-ucls1012a.its since post-build.sh and post-image.sh use different name. This fixes the bug that didn't allow the creation of the part0-000000.itb file. Signed-off-by: Oleksandr Zhadan Signed-off-by: Michael Durrant --- V1->V2: - Bump the kernel to "Linux version 5.4.137" - Bootloader version is still "U-Boot 2019.10" but new targets added. - Remove the /etc/init.d/S09modload script to load the pfe firmware module because now the pfe firmware module is loaded by the kernel - New compressed Image.gz is used V2->V3: - Moved SoB to top of patch - The use of Image.gz replace Image to force use of compression. - Our scripts use br2-ucls1012a.its in error ucls1012a.its was used in original readme. - Removing extra newline - The NXP Packet Forward Engine (PFE) firmware loader was the only file used in the overlay. As the PFE is now loaded directly by the kernel the BR2_ROOTFS_OVERLAY script has been removed. V3->V4: - Improved commit log by listing all the changed as suggested by Giulio. - Updated header version comment in defconfig to reflect 5.4 series. --- board/arcturus/aarch64-ucls1012a/post-build.sh | 1 - board/arcturus/aarch64-ucls1012a/readme.txt | 4 ++-- .../rootfs_overlay/etc/init.d/S09modload | 14 -------------- configs/arcturus_ucls1012a_defconfig | 10 +++++----- 4 files changed, 7 insertions(+), 22 deletions(-) delete mode 100755 board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload diff --git a/board/arcturus/aarch64-ucls1012a/post-build.sh b/board/arcturus/aarch64-ucls1012a/post-build.sh index f8ba78095f..372df59c61 100755 --- a/board/arcturus/aarch64-ucls1012a/post-build.sh +++ b/board/arcturus/aarch64-ucls1012a/post-build.sh @@ -1,5 +1,4 @@ #!/bin/sh mkdir -p ${TARGET_DIR}/lib/firmware -cp -f ${BUILD_DIR}/linux-custom/firmware/ppfe/* ${TARGET_DIR}/lib/firmware/ cp -f ${BUILD_DIR}/linux-custom/br2-ucls1012a.its ${BINARIES_DIR}/ diff --git a/board/arcturus/aarch64-ucls1012a/readme.txt b/board/arcturus/aarch64-ucls1012a/readme.txt index 483d5e9aef..b486ecebc7 100644 --- a/board/arcturus/aarch64-ucls1012a/readme.txt +++ b/board/arcturus/aarch64-ucls1012a/readme.txt @@ -24,13 +24,13 @@ After building, you should obtain this tree: output/images/ +-- arc-ucls1012a.dtb - +-- Image + +-- Image.gz +-- part0-000000.itb +-- rootfs.cpio +-- rootfs.cpio.gz +-- rootfs.tar +-- u-boot.bin - +-- ucls1012a.its + +-- br2-ucls1012a.its Flashing -------- diff --git a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload b/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload deleted file mode 100755 index c87ffda14f..0000000000 --- a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -# -case "$1" in - start) - modprobe pfe - ;; - stop) - ;; - restart|reload) - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac diff --git a/configs/arcturus_ucls1012a_defconfig b/configs/arcturus_ucls1012a_defconfig index fd33ebf1f6..124cc3ff94 100644 --- a/configs/arcturus_ucls1012a_defconfig +++ b/configs/arcturus_ucls1012a_defconfig @@ -1,22 +1,22 @@ # Architecture BR2_aarch64=y -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # System settings BR2_TARGET_GENERIC_HOSTNAME="ucls1012a" BR2_TARGET_GENERIC_ISSUE="Welcome to uCLS1012A-SOM" BR2_SYSTEM_DHCP="eth0" -BR2_ROOTFS_OVERLAY="board/arcturus/aarch64-ucls1012a/rootfs_overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="board/arcturus/aarch64-ucls1012a/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/arcturus/aarch64-ucls1012a/post-image.sh" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-kernel,v.20.31)/linux-v.20.31.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-kernel,v.22.06)/linux-v.22.06.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="ucls1012a" +BR2_LINUX_KERNEL_IMAGEGZ=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="arcturus/arc-ucls1012a" @@ -28,7 +28,7 @@ BR2_TARGET_ROOTFS_CPIO_GZIP=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-uboot,v.20.31)/uboot-v.20.31.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-uboot,v.22.06)/uboot-v.22.06.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="UCLS1012A_QSPI128" # Tools -- 2.26.2 From yann.morin.1998 at free.fr Sat Feb 19 09:01:59 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 19 Feb 2022 10:01:59 +0100 Subject: [Buildroot] Buildroot Failure 2022-02-16 02:25:21 In-Reply-To: References: Message-ID: <20220219090159.GA822323@scaer> Giulio, Peter, All, On 2022-02-18 22:41 +0100, Giulio Benetti spake thusly: > > Il giorno 18 feb 2022, alle ore 20:03, Peter Thompson ha scritto: > > My bump of sdl2_ttf-2.0.15 to sdl2_ttf-2.0.18 caused an autobuilder failure 2022-02-16 02:25:21. The log indicates the problem is pthread.h missing when harfbuzz is specified. See log below... > > Not sure why sdl2_ttf-2.0.15 worked before..... > It seems like that between 2.0.15 to 2.0.18(maybe) > sdl2_ttf only uses harfbuzz provided by sdl2_ttf itself. > This means it?s skipping the one provided from Buildroot that is already patched for harfbuzz pthread.h issue. [--SNIP--] > If look closer the build failure you will see that it?s not Buildroot harfbuzz that fails but a harfbuzz embedded into sdl2_ttf. > So what I should to is to try to make sdl2_ttf drop its internal harfbuzz and use the Buildroot one. I think ths might have been fixed with commit e253e41ce2e5 (package/sdl2_ttf: add harfbuzz optional dependency) 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 Sat Feb 19 09:20:41 2022 From: romain.naour at gmail.com (Romain Naour) Date: Sat, 19 Feb 2022 10:20:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/lxc: bump to version 4.0.11 In-Reply-To: <114f25cd-b392-fbde-ce20-eef87447f1c0@gmail.com> References: <20220101225906.2341845-1-fontaine.fabrice@gmail.com> <87bl0t1a9o.fsf@gmail.com> <114f25cd-b392-fbde-ce20-eef87447f1c0@gmail.com> Message-ID: Hello, Le 30/01/2022 ? 17:36, Romain Naour a ?crit?: > 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? ping. Best regards, Romain > > 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 guillaume.bressaix at gmail.com Sat Feb 19 10:23:09 2022 From: guillaume.bressaix at gmail.com (Guillaume W. Bres) Date: Sat, 19 Feb 2022 11:23:09 +0100 Subject: [Buildroot] [PATCH] package/libxcrypt: bump to version 4.4.28 Message-ID: <20220219102309.15465-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 99ddf62be0..bdda6b47c0 100644 --- a/package/libxcrypt/libxcrypt.hash +++ b/package/libxcrypt/libxcrypt.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 e4ff47b7fa5370fa08e27258f8a0de5cb7e9b09c297ec7ab56a8a82e229a1c84 libxcrypt-4.4.27.tar.gz +sha256 db7e37901969cb1d1e8020cb73a991ef81e48e31ea5b76a101862c806426b457 libxcrypt-4.4.28.tar.gz sha256 f9b48b0bc67a92b752780710aa774cf08b62ec2ebaa3f4aebd00069fba6effd2 LICENSING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/libxcrypt/libxcrypt.mk b/package/libxcrypt/libxcrypt.mk index 65efa2bab9..f7a0fd4308 100644 --- a/package/libxcrypt/libxcrypt.mk +++ b/package/libxcrypt/libxcrypt.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBXCRYPT_VERSION = 4.4.27 +LIBXCRYPT_VERSION = 4.4.28 LIBXCRYPT_SITE = $(call github,besser82,libxcrypt,v$(LIBXCRYPT_VERSION)) LIBXCRYPT_LICENSE = LGPL-2.1+ LIBXCRYPT_LICENSE_FILES = LICENSING COPYING.LIB -- 2.20.1 From ps.report at gmx.net Sat Feb 19 10:24:51 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Sat, 19 Feb 2022 11:24:51 +0100 Subject: [Buildroot] [PATCH v1] package/wireless-regdb: bump version to 2022.02.18 Message-ID: <20220219102451.25602-1-ps.report@gmx.net> Changelog (since 2021.08.28, [1]): e061299 wireless-regdb: Raise DFS TX power limit to 250 mW (24 dBm) for the US 2ce78ed wireless-regdb: Update regulatory rules for Croatia (HR) on 6GHz 0d39f4c wireless-regdb: Update regulatory rules for South Korea (KR) acad231 wireless-regdb: Update regulatory rules for France (FR) on 6 and 60 GHz ea83a82 wireless-regdb: add support for US S1G channels 4408149 wireless-regdb: add 802.11ah bands to world regulatory domain 5f3cadc wireless-regdb: Update regulatory rules for Spain (ES) on 6GHz e0ac69b Revert "wireless-regdb: Update regulatory rules for South Korea (KR)" 40e5e80 wireless-regdb: Update regulatory rules for South Korea (KR) e427ff2 wireless-regdb: Update regulatory rules for China (CN) 0970116 wireless-regdb: Update regulatory rules for the Netherlands (NL) on 6GHz 4dac44b wireless-regdb: update regulatory database based on preceding changes [1] https://lore.kernel.org/linux-wireless/YhBCKWNw3IMfGs0L at ubuntu-x1/ Signed-off-by: Peter Seiderer --- package/wireless-regdb/wireless-regdb.hash | 2 +- package/wireless-regdb/wireless-regdb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/wireless-regdb/wireless-regdb.hash b/package/wireless-regdb/wireless-regdb.hash index abe8f6b000..91fcb320d2 100644 --- a/package/wireless-regdb/wireless-regdb.hash +++ b/package/wireless-regdb/wireless-regdb.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/software/network/wireless-regdb/sha256sums.asc -sha256 cff370c410d1e6d316ae0a7fa8ac6278fdf1efca5d3d664aca7cfd2aafa54446 wireless-regdb-2021.08.28.tar.xz +sha256 8828c25a4ee25020044004f57374bb9deac852809fad70f8d3d01770bf9ac97f wireless-regdb-2022.02.18.tar.xz # Locally computed sha256 678b0df753c86198fc496d1f1033429bbd57f101472132ee7eaaf9f5e0a7fae1 LICENSE diff --git a/package/wireless-regdb/wireless-regdb.mk b/package/wireless-regdb/wireless-regdb.mk index 9e01283c01..35a8c6686d 100644 --- a/package/wireless-regdb/wireless-regdb.mk +++ b/package/wireless-regdb/wireless-regdb.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRELESS_REGDB_VERSION = 2021.08.28 +WIRELESS_REGDB_VERSION = 2022.02.18 WIRELESS_REGDB_SOURCE = wireless-regdb-$(WIRELESS_REGDB_VERSION).tar.xz WIRELESS_REGDB_SITE = $(BR2_KERNEL_MIRROR)/software/network/wireless-regdb WIRELESS_REGDB_LICENSE = ISC -- 2.35.1 From guillaume.bressaix at gmail.com Sat Feb 19 10:35:07 2022 From: guillaume.bressaix at gmail.com (Guillaume W. Bres) Date: Sat, 19 Feb 2022 11:35:07 +0100 Subject: [Buildroot] [PATCH] package/libnids: bump version to 1.26 Message-ID: <20220219103507.29176-1-guillaume.bressaix@gmail.com> Change repo source to official github.com repository which is actively maintained. Previous sourceforge.net sources remained untouched since 2010. Signed-off-by: Guillaume W. Bres --- package/libnids/libnids.hash | 4 ++-- package/libnids/libnids.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libnids/libnids.hash b/package/libnids/libnids.hash index 4a2949c39d..e51dbf151c 100644 --- a/package/libnids/libnids.hash +++ b/package/libnids/libnids.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 314b4793e0902fbf1fdb7fb659af37a3c1306ed1aad5d1c84de6c931b351d359 libnids-1.24.tar.gz -sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING +sha256 3f3e9f99a83cd37bc74af83d415c5e3a7505f5b190dfaf456b0849e0054f6733 libnids-1.26.tar.gz +sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING diff --git a/package/libnids/libnids.mk b/package/libnids/libnids.mk index 3e36838c40..57e68654dc 100644 --- a/package/libnids/libnids.mk +++ b/package/libnids/libnids.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBNIDS_VERSION = 1.24 -LIBNIDS_SITE = https://sourceforge.net/projects/libnids/files/libnids/$(LIBNIDS_VERSION) +LIBNIDS_VERSION = 1.26 +LIBNIDS_SITE = $(call github,MITRECND,libnids,$(LIBNIDS_VERSION),$(LIBNIDS_VERSION).tar.gz) LIBNIDS_LICENSE = GPL-2.0 LIBNIDS_LICENSE_FILES = COPYING LIBNIDS_CPE_ID_VENDOR = libnids_project -- 2.20.1 From giulio.benetti at benettiengineering.com Sat Feb 19 11:53:27 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 19 Feb 2022 12:53:27 +0100 Subject: [Buildroot] Buildroot Failure 2022-02-16 02:25:21 In-Reply-To: <20220219090159.GA822323@scaer> References: <20220219090159.GA822323@scaer> Message-ID: Hi Yann, Peter, All, > Il giorno 19 feb 2022, alle ore 10:02, Yann E. MORIN ha scritto: > > ?Giulio, Peter, All, > > On 2022-02-18 22:41 +0100, Giulio Benetti spake thusly: >>>> Il giorno 18 feb 2022, alle ore 20:03, Peter Thompson ha scritto: >>> My bump of sdl2_ttf-2.0.15 to sdl2_ttf-2.0.18 caused an autobuilder failure 2022-02-16 02:25:21. The log indicates the problem is pthread.h missing when harfbuzz is specified. See log below... >>> Not sure why sdl2_ttf-2.0.15 worked before..... >> It seems like that between 2.0.15 to 2.0.18(maybe) >> sdl2_ttf only uses harfbuzz provided by sdl2_ttf itself. >> This means it?s skipping the one provided from Buildroot that is already patched for harfbuzz pthread.h issue. > [--SNIP--] >> If look closer the build failure you will see that it?s not Buildroot harfbuzz that fails but a harfbuzz embedded into sdl2_ttf. >> So what I should to is to try to make sdl2_ttf drop its internal harfbuzz and use the Buildroot one. > > I think ths might have been fixed with commit e253e41ce2e5 (package/sdl2_ttf: > add harfbuzz optional dependency) Peter this is why when you check for autobuilder failure you need to pull Buildroot to latest version :-). Also, before going to work on something, always check Buildroot patchwork if someone else has already done it. And last but not least, check the package git repository itself for a fix, like a commit or a pending PR/MR or an issue with a solution explained. Best regards Giulio > > 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. | > '------------------------------^-------^------------------^--------------------' > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From fontaine.fabrice at gmail.com Sat Feb 19 12:25:25 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 19 Feb 2022 13:25:25 +0100 Subject: [Buildroot] [PATCH 1/2] package/gdk-pixbuf: enable relocatable option Message-ID: <20220219122526.2954354-1-fontaine.fabrice@gmail.com> Enable relocatable option to fix the following PPD build failure of adwaita-icon-theme raised since commit b06294e9897e90862656416e8b67fdace15488d7 which now correctly updates loaders.cache: Can't load file: Unrecognized image file format Fixes: - http://autobuild.buildroot.org/results/0e00059b09b4445eaaec1030997883187c6a80d6 Signed-off-by: Fabrice Fontaine --- package/gdk-pixbuf/gdk-pixbuf.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk index cd30d450d5..7b9c9cdbda 100644 --- a/package/gdk-pixbuf/gdk-pixbuf.mk +++ b/package/gdk-pixbuf/gdk-pixbuf.mk @@ -20,12 +20,14 @@ HOST_GDK_PIXBUF_DEPENDENCIES = host-libpng host-pkgconf host-libglib2 GDK_PIXBUF_CONF_OPTS = \ -Dgio_sniffing=false \ -Dinstalled_tests=false \ + -Drelocatable=true \ -Dman=false HOST_GDK_PIXBUF_CONF_OPTS = \ -Dgio_sniffing=false \ -Dinstalled_tests=false \ -Dintrospection=disabled \ + -Drelocatable=true \ -Dman=false ifeq ($(BR2_STATIC_LIBS),y) -- 2.34.1 From fontaine.fabrice at gmail.com Sat Feb 19 12:25:26 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 19 Feb 2022 13:25:26 +0100 Subject: [Buildroot] [PATCH 2/2] package/librsvg: fix loaders.cache In-Reply-To: <20220219122526.2954354-1-fontaine.fabrice@gmail.com> References: <20220219122526.2954354-1-fontaine.fabrice@gmail.com> Message-ID: <20220219122526.2954354-2-fontaine.fabrice@gmail.com> Set GDK_PIXBUF_MODULEDIR to gdk_pixbuf_moduledir before calling gdk-pixbuf-query-loaders to build a correct loaders.cache and fix the following PPD build failure of adwaita-icon-theme raised since commit b06294e9897e90862656416e8b67fdace15488d7 which now correctly updates loaders.cache: Can't load file: Unrecognized image file format Fixes: - http://autobuild.buildroot.org/results/0e00059b09b4445eaaec1030997883187c6a80d6 Signed-off-by: Fabrice Fontaine --- ...r-Makefile.am-set-GDK_PIXBUF_MODULED.patch | 39 +++++++++++++++++++ package/librsvg/librsvg.mk | 2 + 2 files changed, 41 insertions(+) create mode 100644 package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch diff --git a/package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch b/package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch new file mode 100644 index 0000000000..94db8eb143 --- /dev/null +++ b/package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch @@ -0,0 +1,39 @@ +From 2c472bf55289ccbd7f305aa3e98d6fd70be4e3ab Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 19 Feb 2022 12:02:10 +0100 +Subject: [PATCH] gdk-pixbuf-loader/Makefile.am: set GDK_PIXBUF_MODULEDIR + +Set GDK_PIXBUF_MODULEDIR to gdk_pixbuf_moduledir before calling +gdk-pixbuf-query-loaders to build a correct gdk_pixbuf_cache_file and +gdk-pixbuf.loaders on 'exotic' systems + +Signed-off-by: Fabrice Fontaine +--- + gdk-pixbuf-loader/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gdk-pixbuf-loader/Makefile.am b/gdk-pixbuf-loader/Makefile.am +index c3493736..de1f9641 100644 +--- a/gdk-pixbuf-loader/Makefile.am ++++ b/gdk-pixbuf-loader/Makefile.am +@@ -49,7 +49,7 @@ rsvg_loader_LDADD = \ + EXTRA_rsvg_loader_DEPENDENCIES = libpixbufloader-svg.la gdk-pixbuf-loaders + + gdk-pixbuf-loaders: Makefile +- $(AM_V_GEN) ( $(GDK_PIXBUF_QUERYLOADERS) ./libpixbufloader-svg.la && $(GDK_PIXBUF_QUERYLOADERS)) > gdk-pixbuf.loaders 2>/dev/null ++ $(AM_V_GEN) ( $(GDK_PIXBUF_QUERYLOADERS) ./libpixbufloader-svg.la && GDK_PIXBUF_MODULEDIR=$(gdk_pixbuf_moduledir) $(GDK_PIXBUF_QUERYLOADERS)) > gdk-pixbuf.loaders 2>/dev/null + + if CROSS_COMPILING + RUN_QUERY_LOADER_TEST=false +@@ -68,7 +68,7 @@ endif + install-data-hook: + @if $(RUN_QUERY_LOADER_TEST) ; then \ + $(mkinstalldirs) $(DESTDIR)$(gdk_pixbuf_binarydir) ; \ +- $(GDK_PIXBUF_QUERYLOADERS) > $(DESTDIR)$(gdk_pixbuf_cache_file) ; \ ++ GDK_PIXBUF_MODULEDIR=$(gdk_pixbuf_moduledir) $(GDK_PIXBUF_QUERYLOADERS) > $(DESTDIR)$(gdk_pixbuf_cache_file) ; \ + else \ + echo "***" ; \ + echo "*** Warning: loaders.cache not built" ; \ +-- +2.34.1 + diff --git a/package/librsvg/librsvg.mk b/package/librsvg/librsvg.mk index e4b1942b79..07a14b4366 100644 --- a/package/librsvg/librsvg.mk +++ b/package/librsvg/librsvg.mk @@ -20,6 +20,8 @@ HOST_LIBRSVG_DEPENDENCIES = host-cairo host-gdk-pixbuf host-libglib2 host-libxml LIBRSVG_LICENSE = LGPL-2.1+ LIBRSVG_LICENSE_FILES = COPYING.LIB LIBRSVG_CPE_ID_VENDOR = gnome +# We're patching gdk-pixbuf-loader/Makefile.am +LIBRSVG_AUTORECONF = YES ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) LIBRSVG_CONF_OPTS += --enable-introspection -- 2.34.1 From fontaine.fabrice at gmail.com Sat Feb 19 12:28:30 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 19 Feb 2022 13:28:30 +0100 Subject: [Buildroot] [PATCH 1/2] package/expat: fix tarball sha256 Message-ID: <20220219122831.2961097-1-fontaine.fabrice@gmail.com> Commit ab71ac15ddd7ed6a8ca83cbc23ea0b0cbb343f0f forgot to update sha256 Signed-off-by: Fabrice Fontaine --- package/expat/expat.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index 3129801668..a6f43af291 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -3,5 +3,5 @@ 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 b1f9f1b1a5ebb0acaa88c9ff79bfa4e145823b78aa5185e5c5d85f060824778a expat-2.4.4.tar.xz sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec COPYING -- 2.34.1 From fontaine.fabrice at gmail.com Sat Feb 19 12:28:31 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 19 Feb 2022 13:28:31 +0100 Subject: [Buildroot] [PATCH 2/2] package/expat: security bump to version 2.4.5 In-Reply-To: <20220219122831.2961097-1-fontaine.fabrice@gmail.com> References: <20220219122831.2961097-1-fontaine.fabrice@gmail.com> Message-ID: <20220219122831.2961097-2-fontaine.fabrice@gmail.com> Security fixes: #562 CVE-2022-25235 -- Passing malformed 2- and 3-byte UTF-8 sequences (e.g. from start tag names) to the XML processing application on top of Expat can cause arbitrary damage (e.g. code execution) depending on how invalid UTF-8 is handled inside the XML processor; validation was not their job but Expat's. Exploits with code execution are known to exist. #561 CVE-2022-25236 -- Passing (one or more) namespace separator characters in "xmlns[:prefix]" attribute values made Expat send malformed tag names to the XML processor on top of Expat which can cause arbitrary damage (e.g. code execution) depending on such unexpectable cases are handled inside the XML processor; validation was not their job but Expat's. Exploits with code execution are known to exist. #558 CVE-2022-25313 -- Fix stack exhaustion in doctype parsing that could be triggered by e.g. a 2 megabytes file with a large number of opening braces. Expected impact is denial of service or potentially arbitrary code execution. #560 CVE-2022-25314 -- Fix integer overflow in function copyString; only affects the encoding name parameter at parser creation time which is often hardcoded (rather than user input), takes a value in the gigabytes to trigger, and a 64-bit machine. Expected impact is denial of service. #559 CVE-2022-25315 -- Fix integer overflow in function storeRawNames; needs input in the gigabytes and a 64-bit machine. Expected impact is denial of service or potentially arbitrary code execution. https://blog.hartwork.org/posts/expat-2-4-5-released/ https://github.com/libexpat/libexpat/blob/R_2_4_5/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 a6f43af291..cd2e8c7fb9 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.4/ -md5 a712d23b7afb32e7527cf0b3fd8f12ac expat-2.4.4.tar.xz -sha1 6028b04d3505fc519c4c7c6bd67e1ad1a08cd7b6 expat-2.4.4.tar.xz +# From https://sourceforge.net/projects/expat/files/expat/2.4.5/ +md5 9dc183e6c1eebc1b658c1e71be0885e1 expat-2.4.5.tar.xz +sha1 360a49b55c442e91cb7b328bc0335083909ddf4f expat-2.4.5.tar.xz # Locally calculated -sha256 b1f9f1b1a5ebb0acaa88c9ff79bfa4e145823b78aa5185e5c5d85f060824778a expat-2.4.4.tar.xz +sha256 f2af8fc7cdc63a87920da38cd6d12cb113c3c3a3f437495b1b6541e0cff32579 expat-2.4.5.tar.xz sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec COPYING diff --git a/package/expat/expat.mk b/package/expat/expat.mk index 250600c25e..7815d61027 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.4.4 +EXPAT_VERSION = 2.4.5 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 Sat Feb 19 13:41:04 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 19 Feb 2022 14:41:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/dovecot-pigeonhole: drop DOVECOT_PIGEONHOLE_FIXUP_DOVECOT_CONFIG Message-ID: <20220219134104.3403344-1-fontaine.fabrice@gmail.com> Drop DOVECOT_PIGEONHOLE_FIXUP_DOVECOT_CONFIG added by commit 0901355c11f051846744a12f9b2044a751faa47a which is not needed since the addition of PPD_FIXUP_PATHS in commit b06294e9897e90862656416e8b67fdace15488d Signed-off-by: Fabrice Fontaine --- package/dovecot-pigeonhole/dovecot-pigeonhole.mk | 8 -------- 1 file changed, 8 deletions(-) diff --git a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk index dd533977f4..62d9909cf5 100644 --- a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk +++ b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk @@ -15,12 +15,4 @@ DOVECOT_PIGEONHOLE_DEPENDENCIES = dovecot DOVECOT_PIGEONHOLE_CONF_OPTS = --with-dovecot=$(STAGING_DIR)/usr/lib -ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) -define DOVECOT_PIGEONHOLE_FIXUP_DOVECOT_CONFIG - $(SED) 's,$(PER_PACKAGE_DIR)/dovecot/,$(PER_PACKAGE_DIR)/dovecot-pigeonhole/,g' \ - $(STAGING_DIR)/usr/lib/dovecot-config -endef -DOVECOT_PIGEONHOLE_PRE_CONFIGURE_HOOKS = DOVECOT_PIGEONHOLE_FIXUP_DOVECOT_CONFIG -endif - $(eval $(autotools-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Sat Feb 19 14:19:22 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 19 Feb 2022 15:19:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/apparmor: drop APPARMOR_FIXUP_APXS Message-ID: <20220219141922.3753289-1-fontaine.fabrice@gmail.com> Drop APPARMOR_FIXUP_APXS which was added by commit 3c836e54203b16015c9c52cbe007adc92d293a0d but is not needed since the addition of PPD_FIXUP_PATHS in commit b06294e9897e90862656416e8b67fdace15488d7 Signed-off-by: Fabrice Fontaine --- package/apparmor/apparmor.mk | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/package/apparmor/apparmor.mk b/package/apparmor/apparmor.mk index 6f0e59224d..43bfa05308 100644 --- a/package/apparmor/apparmor.mk +++ b/package/apparmor/apparmor.mk @@ -54,16 +54,6 @@ ifeq ($(BR2_PACKAGE_APACHE),y) APPARMOR_DEPENDENCIES += apache APPARMOR_TOOLS += changehat/mod_apparmor APPARMOR_MAKE_OPTS += APXS=$(STAGING_DIR)/usr/bin/apxs - -ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) -define APPARMOR_FIXUP_APXS - $(SED) "s@$(PER_PACKAGE_DIR)/[^/]\+/@$(PER_PACKAGE_DIR)/apparmor/@g" \ - $(STAGING_DIR)/usr/bin/apxs \ - $(STAGING_DIR)/usr/build/config_vars.mk \ - $(STAGING_DIR)/usr/build-1/libtool -endef -APPARMOR_POST_CONFIGURE_HOOKS += APPARMOR_FIXUP_APXS -endif endif define APPARMOR_BUILD_CMDS -- 2.34.1 From fontaine.fabrice at gmail.com Sat Feb 19 14:20:27 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 19 Feb 2022 15:20:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/apache: drop APACHE_FIXUP_APR_LIBTOOL Message-ID: <20220219142027.3753330-1-fontaine.fabrice@gmail.com> Drop APACHE_FIXUP_APR_LIBTOOL which was added by commit b747c29c4e8eb89b7b99658dfd34f4a6b6b0744d but is not needed since the addition of PPD_FIXUP_PATHS in commit b06294e9897e90862656416e8b67fdace15488d7 Signed-off-by: Fabrice Fontaine --- package/apache/apache.mk | 8 -------- 1 file changed, 8 deletions(-) diff --git a/package/apache/apache.mk b/package/apache/apache.mk index 5fcb887fbc..b280d4dc3a 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -19,14 +19,6 @@ APACHE_INSTALL_STAGING = YES APACHE_AUTORECONF = YES APACHE_DEPENDENCIES = apr apr-util pcre -ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) -define APACHE_FIXUP_APR_LIBTOOL - $(SED) "s@$(PER_PACKAGE_DIR)/[^/]\+/@$(PER_PACKAGE_DIR)/apache/@g" \ - $(STAGING_DIR)/usr/build-1/libtool -endef -APACHE_POST_PREPARE_HOOKS += APACHE_FIXUP_APR_LIBTOOL -endif - APACHE_CONF_ENV= \ ap_cv_void_ptr_lt_long=no \ PCRE_CONFIG=$(STAGING_DIR)/usr/bin/pcre-config -- 2.34.1 From fontaine.fabrice at gmail.com Sat Feb 19 14:21:04 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 19 Feb 2022 15:21:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/apr-util: drop APR_UTIL_FIX_{LIBTOOL, RULES_MK} Message-ID: <20220219142104.3753374-1-fontaine.fabrice@gmail.com> Drop APR_UTIL_FIX_{LIBTOOL,RULES_MK} which were added by commit 84b4c19e551288911a230c2b73e96bc6e2ed12f9 but is not needed since the addition of PPD_FIXUP_PATHS in commit b06294e9897e90862656416e8b67fdace15488d7 Signed-off-by: Fabrice Fontaine --- package/apr-util/apr-util.mk | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/package/apr-util/apr-util.mk b/package/apr-util/apr-util.mk index f6ce7ac064..cf8407ced0 100644 --- a/package/apr-util/apr-util.mk +++ b/package/apr-util/apr-util.mk @@ -17,20 +17,6 @@ APR_UTIL_CONF_OPTS = \ --with-apr=$(STAGING_DIR)/usr/bin/apr-1-config APR_UTIL_CONFIG_SCRIPTS = apu-1-config -ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) -define APR_UTIL_FIX_LIBTOOL - $(SED) 's,$(PER_PACKAGE_DIR)/apr/,$(PER_PACKAGE_DIR)/apr-util/,g' \ - $(STAGING_DIR)/usr/build-1/libtool -endef -APR_UTIL_POST_PREPARE_HOOKS += APR_UTIL_FIX_LIBTOOL - -define APR_UTIL_FIX_RULES_MK - $(SED) 's,$(PER_PACKAGE_DIR)/apr/,$(PER_PACKAGE_DIR)/apr-util/,g' \ - $(@D)/build/rules.mk -endef -APR_UTIL_POST_CONFIGURE_HOOKS += APR_UTIL_FIX_RULES_MK -endif - # When iconv is available, then use it to provide charset conversion # features. APR_UTIL_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv) -- 2.34.1 From fontaine.fabrice at gmail.com Sat Feb 19 15:20:03 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 19 Feb 2022 16:20:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/lxc: bump to version 4.0.11 In-Reply-To: References: <20220101225906.2341845-1-fontaine.fabrice@gmail.com> <87bl0t1a9o.fsf@gmail.com> <114f25cd-b392-fbde-ce20-eef87447f1c0@gmail.com> Message-ID: Hello, Le sam. 19 f?vr. 2022 ? 10:20, Romain Naour a ?crit : > > Hello, > > Le 30/01/2022 ? 17:36, Romain Naour a ?crit : > > 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? > > ping. How can I reproduce the problem locally so I can open a bug on https://github.com/lxc/lxc/issues? I tried to launch run-tests from current master but it is "stuck" in "Building done": ./support/testing/run-tests -o test-output/ -d test-dl/ -k --timeout-multiplier 10 tests.package.test_lxc.TestLxc 15:36:35 TestLxc Starting 15:36:35 TestLxc Building 15:51:04 TestLxc Building done So I opened test-output/TestLxc-run.log and found out a kernel panic: Kernel panic - not syncing: No working init found. Try passing init= option to kernel. See Linux Documentation/admin-guide/init.rst for guidance I assume that qemu is not able to start the kernel. Do you have some advice on what could go wrong? > > Best regards, > Romain > > > > > 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 > >> > > > Best Regards, Fabrice From john at metanate.com Sat Feb 19 15:43:50 2022 From: john at metanate.com (John Keeping) Date: Sat, 19 Feb 2022 15:43:50 +0000 Subject: [Buildroot] [PATCH] package/gdb: fix when gmp is installed on the host machine Message-ID: <20220219154350.1552021-1-john@metanate.com> gdb's AC_LIB_HAVE_LINKFLAGS macro hardcodes a search starting with /usr/lib/ which can lead to libgmp from the wrong architecture with the result that the test fails. Even if a libgmp is found there it is now the one that should be used. This is the same macro used for expat and lzma for which there are already specific CONF_OPTS flags added here. Add the same flag for libgmp and move the handling down so that it is logically grouped with the other similar options. Note that there is no --with(out)-gmp flag to configure, as the dependency is mandatory, so only the --with-libgmp-prefix option is specified. Signed-off-by: John Keeping --- package/gdb/gdb.mk | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk index 05de3c14d1..9bde2beea1 100644 --- a/package/gdb/gdb.mk +++ b/package/gdb/gdb.mk @@ -77,14 +77,6 @@ ifeq ($(BR2_GDB_VERSION_11),y) HOST_GDB_DEPENDENCIES += host-gmp endif -# When BR2_GDB_VERSION_11=y (because it's enabled for the host) and -# we're building the full gdb for the target, we need gmp as a -# dependency. For now the default gdb version in Buildroot doesn't -# require gmp. -ifeq ($(BR2_GDB_VERSION_11)$(BR2_PACKAGE_GDB_DEBUGGER),yy) -GDB_DEPENDENCIES += gmp -endif - # When gdb sources are fetched from the binutils-gdb repository, they # also contain the binutils sources, but binutils shouldn't be built, # so we disable it (additionally the option --disable-install-libbfd @@ -169,6 +161,16 @@ GDB_CONF_OPTS += \ --without-curses endif +# When BR2_GDB_VERSION_11=y (because it's enabled for the host) and +# we're building the full gdb for the target, we need gmp as a +# dependency. For now the default gdb version in Buildroot doesn't +# require gmp. +ifeq ($(BR2_GDB_VERSION_11)$(BR2_PACKAGE_GDB_DEBUGGER),yy) +GDB_CONF_OPTS += \ + --with-libgmp-prefix=$(STAGING_DIR)/usr +GDB_DEPENDENCIES += gmp +endif + ifeq ($(BR2_PACKAGE_GDB_SERVER),y) GDB_CONF_OPTS += --enable-gdbserver GDB_DEPENDENCIES += $(TARGET_NLS_DEPENDENCIES) -- 2.35.1 From peter.macleod.thompson at gmail.com Sat Feb 19 15:45:44 2022 From: peter.macleod.thompson at gmail.com (Peter Thompson) Date: Sat, 19 Feb 2022 08:45:44 -0700 Subject: [Buildroot] Buildroot Failure 2022-02-16 02:25:21 In-Reply-To: <20220219090159.GA822323@scaer> References: <20220219090159.GA822323@scaer> Message-ID: > I think this might have been fixed with commit e253e41ce2e5 (package/sdl2_ttf: add harfbuzz optional dependency) Yes - I was just noticing that it was already fixed.... thanks Yann Peter On Sat, Feb 19, 2022 at 2:02 AM Yann E. MORIN wrote: > Giulio, Peter, All, > > On 2022-02-18 22:41 +0100, Giulio Benetti spake thusly: > > > Il giorno 18 feb 2022, alle ore 20:03, Peter Thompson < > peter.macleod.thompson at gmail.com> ha scritto: > > > My bump of sdl2_ttf-2.0.15 to sdl2_ttf-2.0.18 caused an autobuilder > failure 2022-02-16 02:25:21. The log indicates the problem is > pthread.h missing when harfbuzz is specified. See log below... > > > Not sure why sdl2_ttf-2.0.15 worked before..... > > It seems like that between 2.0.15 to 2.0.18(maybe) > > sdl2_ttf only uses harfbuzz provided by sdl2_ttf itself. > > This means it?s skipping the one provided from Buildroot that is already > patched for harfbuzz pthread.h issue. > [--SNIP--] > > If look closer the build failure you will see that it?s not Buildroot > harfbuzz that fails but a harfbuzz embedded into sdl2_ttf. > > So what I should to is to try to make sdl2_ttf drop its internal > harfbuzz and use the Buildroot one. > > I think ths might have been fixed with commit e253e41ce2e5 > (package/sdl2_ttf: > add harfbuzz optional dependency) > > 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. | > > '------------------------------^-------^------------------^--------------------' > -------------- next part -------------- An HTML attachment was scrubbed... URL: From romain.naour at gmail.com Sat Feb 19 16:43:48 2022 From: romain.naour at gmail.com (Romain Naour) Date: Sat, 19 Feb 2022 17:43:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/lxc: bump to version 4.0.11 In-Reply-To: References: <20220101225906.2341845-1-fontaine.fabrice@gmail.com> <87bl0t1a9o.fsf@gmail.com> <114f25cd-b392-fbde-ce20-eef87447f1c0@gmail.com> Message-ID: <4429b2e9-f78b-30e6-849a-c1567ea83e12@gmail.com> Hello Fabrice, Le 19/02/2022 ? 16:20, Fabrice Fontaine a ?crit?: > Hello, > > Le sam. 19 f?vr. 2022 ? 10:20, Romain Naour a ?crit : >> >> Hello, >> >> Le 30/01/2022 ? 17:36, Romain Naour a ?crit : >>> 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? >> >> ping. > How can I reproduce the problem locally so I can open a bug on > https://github.com/lxc/lxc/issues? > I tried to launch run-tests from current master but it is "stuck" in > "Building done": > > ./support/testing/run-tests -o test-output/ -d test-dl/ -k > --timeout-multiplier 10 tests.package.test_lxc.TestLxc > 15:36:35 TestLxc Starting > 15:36:35 TestLxc Building > 15:51:04 TestLxc Building done > > So I opened test-output/TestLxc-run.log and found out a kernel panic: > > Kernel panic - not syncing: No working init found. Try passing init= > option to kernel. See Linux Documentation/admin-guide/init.rst for > guidance > > I assume that qemu is not able to start the kernel. > Do you have some advice on what could go wrong? Weird, can you check your qemu version ? I'm using qemu 6.1.0 from Fedora 35 and also tested qemu 5.2.0 from Debian 11. If it still not working, you should be able to reproduce using the Docker image used in gitlab-ci. See utils/docker-run. Best regards, Romain >> >> Best regards, >> Romain >> >>> >>> 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 >>>> >>> >> > Best Regards, > > Fabrice From guillaume.bressaix at gmail.com Sat Feb 19 16:53:08 2022 From: guillaume.bressaix at gmail.com (Guillaume W. Bres) Date: Sat, 19 Feb 2022 17:53:08 +0100 Subject: [Buildroot] [PATCH v2] package/python-gast: new host-only package Message-ID: <20220219165311.9775-1-guillaume.bressaix@gmail.com> From: "Arnout Vandecappelle (Essensium/Mind)" Generated with scanpypi and converted to host. It is a dependency of python-beniget and python-pythran. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Guillaume W. Bres --- 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.20.1 From guillaume.bressaix at gmail.com Sat Feb 19 16:53:09 2022 From: guillaume.bressaix at gmail.com (Guillaume W. Bres) Date: Sat, 19 Feb 2022 17:53:09 +0100 Subject: [Buildroot] [PATCH v2] package/python-beniget: new host-only package In-Reply-To: <20220219165311.9775-1-guillaume.bressaix@gmail.com> References: <20220219165311.9775-1-guillaume.bressaix@gmail.com> Message-ID: <20220219165311.9775-2-guillaume.bressaix@gmail.com> From: "Arnout Vandecappelle (Essensium/Mind)" Generated with scanpypi and converted to host. It is a dependency of python-pythran. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Guillaume W. Bres --- 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.20.1 From guillaume.bressaix at gmail.com Sat Feb 19 16:53:10 2022 From: guillaume.bressaix at gmail.com (Guillaume W. Bres) Date: Sat, 19 Feb 2022 17:53:10 +0100 Subject: [Buildroot] [PATCH v2] package/python-pythran: new host-only package In-Reply-To: <20220219165311.9775-1-guillaume.bressaix@gmail.com> References: <20220219165311.9775-1-guillaume.bressaix@gmail.com> Message-ID: <20220219165311.9775-3-guillaume.bressaix@gmail.com> From: "Arnout Vandecappelle (Essensium/Mind)" Generated with scanpypi and converted to host. It is a dependency of python-scipy. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Guillaume W. Bres --- 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.20.1 From guillaume.bressaix at gmail.com Sat Feb 19 16:53:11 2022 From: guillaume.bressaix at gmail.com (Guillaume W. Bres) Date: Sat, 19 Feb 2022 17:53:11 +0100 Subject: [Buildroot] [PATCH v2] package/python-scipy: new package In-Reply-To: <20220219165311.9775-1-guillaume.bressaix@gmail.com> References: <20220219165311.9775-1-guillaume.bressaix@gmail.com> Message-ID: <20220219165311.9775-4-guillaume.bressaix@gmail.com> 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) [Guillaume: - -lnpymath: npymath.ini localization problem - -lnpyrandom resolution problem ] Signed-off-by: Guillaume W. Bres --- Hello Arnout, the current patch serie winds up in "numpy.distutils.npy_pkg_config.PkgNotFound: Could not find file(s) ['npymath.ini']" I managed to have setuptools locate npymath.ini by pointing to its parent folder like this. I noticed your python-numpy.mk rework puts a double "//" in npymath.ini path, but that does not seem to impact negatively. Then, build almost passes, but fails when -lnpyrandom gets used, producing errors like: arm-buildroot-linux-gnueabihf/bin/ld: output/host/lib/python3.10/site-packages/numpy/random/lib/libnpyrandom.a: error adding symbols: file format not recognized -lnpyrandom resolves to /host/lib instead of /staging/usr/lib, which I 'solve' by prepending the correct location to the LDPATH so it gets picked up first. Signed-off-by: Guillaume W. Bres --- 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 | 62 ++++++++++++++++++++++++++ 5 files changed, 104 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 ac702d8d0f..c8766c872e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1149,6 +1149,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 @@ -1280,6 +1281,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 10209d84d7..0edde1c919 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1209,6 +1209,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..2fbd4316f3 --- /dev/null +++ b/package/python-scipy/python-scipy.mk @@ -0,0 +1,62 @@ +################################################################################ +# +# 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 + +# -lnpymath npymath.ini localization +PYTHON_SCIPY_NPY_PKG_CONFIG_PATH = \ + $(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/numpy/core/lib/npy-pkg-config + +PYTHON_SCIPY_LDFLAGS = $(TARGET_LDFLAGS) -shared \ + -L$(PYTHON3_PATH)/site-packages/numpy/core/lib +# -lnpyrandom localization +PYTHON_SCIPY_LDFLAGS += \ + -L$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/numpy/random/lib + +PYTHON_SCIPY_ENV = \ + F90=$(TARGET_FC) \ + NPY_PKG_CONFIG_PATH=$(PYTHON_SCIPY_NPY_PKG_CONFIG_PATH) \ + LDFLAGS="$(PYTHON_SCIPY_LDFLAGS)" + +# 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.20.1 From guillaume.bressaix at gmail.com Sat Feb 19 17:02:07 2022 From: guillaume.bressaix at gmail.com (Guillaume W. Bres) Date: Sat, 19 Feb 2022 18:02:07 +0100 Subject: [Buildroot] [PATCH v2 1/4] package/python-gast: new host-only package Message-ID: <20220219170210.11691-1-guillaume.bressaix@gmail.com> From: "Arnout Vandecappelle (Essensium/Mind)" Generated with scanpypi and converted to host. It is a dependency of python-beniget and python-pythran. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Guillaume W. Bres --- 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.20.1 From guillaume.bressaix at gmail.com Sat Feb 19 17:02:08 2022 From: guillaume.bressaix at gmail.com (Guillaume W. Bres) Date: Sat, 19 Feb 2022 18:02:08 +0100 Subject: [Buildroot] [PATCH v2 2/4] package/python-beniget: new host-only package In-Reply-To: <20220219170210.11691-1-guillaume.bressaix@gmail.com> References: <20220219170210.11691-1-guillaume.bressaix@gmail.com> Message-ID: <20220219170210.11691-2-guillaume.bressaix@gmail.com> From: "Arnout Vandecappelle (Essensium/Mind)" Generated with scanpypi and converted to host. It is a dependency of python-pythran. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Guillaume W. Bres --- 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.20.1 From guillaume.bressaix at gmail.com Sat Feb 19 17:02:09 2022 From: guillaume.bressaix at gmail.com (Guillaume W. Bres) Date: Sat, 19 Feb 2022 18:02:09 +0100 Subject: [Buildroot] [PATCH v2 3/4] package/python-pythran: new host-only package In-Reply-To: <20220219170210.11691-1-guillaume.bressaix@gmail.com> References: <20220219170210.11691-1-guillaume.bressaix@gmail.com> Message-ID: <20220219170210.11691-3-guillaume.bressaix@gmail.com> From: "Arnout Vandecappelle (Essensium/Mind)" Generated with scanpypi and converted to host. It is a dependency of python-scipy. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Guillaume W. Bres --- 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.20.1 From guillaume.bressaix at gmail.com Sat Feb 19 17:02:10 2022 From: guillaume.bressaix at gmail.com (Guillaume W. Bres) Date: Sat, 19 Feb 2022 18:02:10 +0100 Subject: [Buildroot] [PATCH v2 4/4] package/python-scipy: new package In-Reply-To: <20220219170210.11691-1-guillaume.bressaix@gmail.com> References: <20220219170210.11691-1-guillaume.bressaix@gmail.com> Message-ID: <20220219170210.11691-4-guillaume.bressaix@gmail.com> 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) [Guillaume: - -lnpymath: npymath.ini localization problem - -lnpyrandom resolution problem ] Signed-off-by: Guillaume W. Bres --- Hello Arnout, the current patch serie winds up in "numpy.distutils.npy_pkg_config.PkgNotFound: Could not find file(s) ['npymath.ini']" I managed to have setuptools locate npymath.ini by pointing to its parent folder like this. I noticed your python-numpy.mk rework puts a double "//" in npymath.ini path, but that does not seem to impact negatively. Then, build almost passes, but fails when -lnpyrandom gets used, producing errors like: arm-buildroot-linux-gnueabihf/bin/ld: output/host/lib/python3.10/site-packages/numpy/random/lib/libnpyrandom.a: error adding symbols: file format not recognized it looks like -lnpyrandom points to /host/lib instead of /staging/usr/lib, which I 'solve' by prepending the correct location to the LDPATH so it gets picked up first. Signed-off-by: Guillaume W. Bres --- 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 | 62 ++++++++++++++++++++++++++ 5 files changed, 104 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 ac702d8d0f..c8766c872e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1149,6 +1149,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 @@ -1280,6 +1281,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 10209d84d7..0edde1c919 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1209,6 +1209,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..2fbd4316f3 --- /dev/null +++ b/package/python-scipy/python-scipy.mk @@ -0,0 +1,62 @@ +################################################################################ +# +# 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 + +# -lnpymath npymath.ini localization +PYTHON_SCIPY_NPY_PKG_CONFIG_PATH = \ + $(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/numpy/core/lib/npy-pkg-config + +PYTHON_SCIPY_LDFLAGS = $(TARGET_LDFLAGS) -shared \ + -L$(PYTHON3_PATH)/site-packages/numpy/core/lib +# -lnpyrandom localization +PYTHON_SCIPY_LDFLAGS += \ + -L$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/numpy/random/lib + +PYTHON_SCIPY_ENV = \ + F90=$(TARGET_FC) \ + NPY_PKG_CONFIG_PATH=$(PYTHON_SCIPY_NPY_PKG_CONFIG_PATH) \ + LDFLAGS="$(PYTHON_SCIPY_LDFLAGS)" + +# 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.20.1 From fontaine.fabrice at gmail.com Sat Feb 19 17:05:09 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 19 Feb 2022 18:05:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/lxc: bump to version 4.0.11 In-Reply-To: <4429b2e9-f78b-30e6-849a-c1567ea83e12@gmail.com> References: <20220101225906.2341845-1-fontaine.fabrice@gmail.com> <87bl0t1a9o.fsf@gmail.com> <114f25cd-b392-fbde-ce20-eef87447f1c0@gmail.com> <4429b2e9-f78b-30e6-849a-c1567ea83e12@gmail.com> Message-ID: Le sam. 19 f?vr. 2022 ? 17:43, Romain Naour a ?crit : > > Hello Fabrice, > > Le 19/02/2022 ? 16:20, Fabrice Fontaine a ?crit : > > Hello, > > > > Le sam. 19 f?vr. 2022 ? 10:20, Romain Naour a ?crit : > >> > >> Hello, > >> > >> Le 30/01/2022 ? 17:36, Romain Naour a ?crit : > >>> 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? > >> > >> ping. > > How can I reproduce the problem locally so I can open a bug on > > https://github.com/lxc/lxc/issues? > > I tried to launch run-tests from current master but it is "stuck" in > > "Building done": > > > > ./support/testing/run-tests -o test-output/ -d test-dl/ -k > > --timeout-multiplier 10 tests.package.test_lxc.TestLxc > > 15:36:35 TestLxc Starting > > 15:36:35 TestLxc Building > > 15:51:04 TestLxc Building done > > > > So I opened test-output/TestLxc-run.log and found out a kernel panic: > > > > Kernel panic - not syncing: No working init found. Try passing init= > > option to kernel. See Linux Documentation/admin-guide/init.rst for > > guidance > > > > I assume that qemu is not able to start the kernel. > > Do you have some advice on what could go wrong? > > Weird, can you check your qemu version ? I'm on qemu 6.2.0. > > I'm using qemu 6.1.0 from Fedora 35 and also tested qemu 5.2.0 from Debian 11. > > If it still not working, you should be able to reproduce using the Docker image > used in gitlab-ci. See utils/docker-run. OK, I'll try it. > > Best regards, > Romain > > > >> > >> Best regards, > >> Romain > >> > >>> > >>> 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 > >>>> > >>> > >> > > Best Regards, > > > > Fabrice > Best Regards, Fabrice From guillaume.bressaix at gmail.com Sat Feb 19 18:15:54 2022 From: guillaume.bressaix at gmail.com (Guillaume W. Bres) Date: Sat, 19 Feb 2022 19:15:54 +0100 Subject: [Buildroot] [PATCH] package/python-joblib: new host-only package Message-ID: <20220219181554.32204-1-guillaume.bressaix@gmail.com> Joblib is a set of tools to provide lightweight pipelining in Python Signed-off-by: Guillaume W. Bres --- host-python-joblib is a requirement of python-scikitlearn, which first requires the current python-scipy work to be merged. --- DEVELOPERS | 1 + package/python-joblib/python-joblib.hash | 3 +++ package/python-joblib/python-joblib.mk | 13 +++++++++++++ 3 files changed, 17 insertions(+) create mode 100644 package/python-joblib/python-joblib.hash create mode 100644 package/python-joblib/python-joblib.mk diff --git a/DEVELOPERS b/DEVELOPERS index ac702d8d0f..ca2e6e81e7 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1148,6 +1148,7 @@ F: package/libnids/ F: package/libxcrypt/ F: package/liquid-dsp/ F: package/pixiewps/ +F: package/python-joblib/ F: package/python-pybind/ F: package/reaver/ F: support/testing/tests/package/br2-external/python-pybind diff --git a/package/python-joblib/python-joblib.hash b/package/python-joblib/python-joblib.hash new file mode 100644 index 0000000000..5023ba872c --- /dev/null +++ b/package/python-joblib/python-joblib.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 4cda464ca712a4814849c9477d7551b696ce215dc05d79fc516460814ef48f4f python-joblib-1.1.0.tar.gz +sha256 42612911c1872c5e4b43f6ae0e8ee59467cd350332241cf72ce90640264fae6a LICENSE.txt diff --git a/package/python-joblib/python-joblib.mk b/package/python-joblib/python-joblib.mk new file mode 100644 index 0000000000..27289a0a2e --- /dev/null +++ b/package/python-joblib/python-joblib.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# python-joblib +# +################################################################################ + +PYTHON_JOBLIB_VERSION = 1.1.0 +PYTHON_JOBLIB_SITE = $(call github,joblib,joblib,$(PYTHON_JOBLIB_VERSION)) +PYTHON_JOBLIB_LICENSE = BSD-3-Clause +PYTHON_JOBLIB_LICENSE_FILES = LICENSE.txt +PYTHON_JOBLIB_SETUP_TYPE = setuptools + +$(eval $(host-python-package)) -- 2.20.1 From guillaume.bressaix at gmail.com Sat Feb 19 18:22:24 2022 From: guillaume.bressaix at gmail.com (Guillaume W. Bres) Date: Sat, 19 Feb 2022 19:22:24 +0100 Subject: [Buildroot] [PATCH] package/python-threadpoolctl: new host-only package Message-ID: <20220219182224.3397-1-guillaume.bressaix@gmail.com> Tool to limit the number of threads used in the threadpool-backed of common native libraries used for scientific computing (e.g. BLAS and OpenMP). Signed-off-by: Guillaume W. Bres --- host-python-threadpoolctl is a requirement for python-scikitlearn, which first requires the current python-scipy work to be merged Signed-off-by: Guillaume W. Bres --- DEVELOPERS | 1 + .../python-threadpoolctl.hash | 3 +++ .../python-threadpoolctl.mk | 22 +++++++++++++++++++ 3 files changed, 26 insertions(+) create mode 100644 package/python-threadpoolctl/python-threadpoolctl.hash create mode 100644 package/python-threadpoolctl/python-threadpoolctl.mk diff --git a/DEVELOPERS b/DEVELOPERS index ac702d8d0f..53ebdbe760 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1149,6 +1149,7 @@ F: package/libxcrypt/ F: package/liquid-dsp/ F: package/pixiewps/ F: package/python-pybind/ +F: package/python-threadpoolctl/ F: package/reaver/ F: support/testing/tests/package/br2-external/python-pybind F: support/testing/tests/package/sample_python_pybind.py diff --git a/package/python-threadpoolctl/python-threadpoolctl.hash b/package/python-threadpoolctl/python-threadpoolctl.hash new file mode 100644 index 0000000000..6b6fa72443 --- /dev/null +++ b/package/python-threadpoolctl/python-threadpoolctl.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 449b806f9147a3cf28ed7ec6389dbff9c450331d695873ab75dea79fe661f1e7 python-threadpoolctl-3.1.0.tar.gz +sha256 81ac619075248b06e53660b652d10e485f4675f5d0ae0f97ea22370da1f7e23b LICENSE diff --git a/package/python-threadpoolctl/python-threadpoolctl.mk b/package/python-threadpoolctl/python-threadpoolctl.mk new file mode 100644 index 0000000000..fc1305ad86 --- /dev/null +++ b/package/python-threadpoolctl/python-threadpoolctl.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# python-threadpoolctl +# +################################################################################ + +PYTHON_THREADPOOLCTL_VERSION = 3.1.0 +PYTHON_THREADPOOLCTL_SITE = $(call github,joblib,threadpoolctl,$(PYTHON_THREADPOOLCTL_VERSION),$(PYTHON_THREADPOOLCTL_VERSION).tar.gz) +PYTHON_THREADPOOLCTL_LICENSE = BSD-3-Clause +PYTHON_THREADPOOLCTL_LICENSE_FILES = LICENSE + +# threadpoolctl is originally built using 'flit' which +# simply symlinks $(@)/threadpoolctl.py to site-packages +define PYTHON_THREADPOOLCTL_BUILD_CMDS +endef + +define PYTHON_THREADPOOLCTL_INSTALL_CMDS + ln -sf $(@)/threadpoolctl.py \ + $(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/threadpoolctl.py +endef + +$(eval $(host-generic-package)) -- 2.20.1 From giulio.benetti at benettiengineering.com Sat Feb 19 21:01:51 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 19 Feb 2022 22:01:51 +0100 Subject: [Buildroot] Buildroot Failure 2022-02-16 02:25:21 In-Reply-To: References: Message-ID: Hi Peter, +Cc BR ML, On 19/02/22 17:01, Peter Thompson wrote: > Hi Giulio, > > When I compared the most recent buildroot via "git clone" and compared > it to the "build in cba34..." I noticed the difference in > package/sdl2_ttf/ sdl2_ttf.mk . ? But I could not > find the commit in https://patchwork.ozlabs.org/project/buildroot/ > where that was > changed. Pathchwork deals with patches, while you find commits in the git Repository: https://git.buildroot.net/buildroot/log/ > ? I looked for the title package/sdl2_ttf and did not see it? > > Is there an easy way to search patchwork without going through line by > line???? I do not have pwclient installed - should I? You can still use patchwork itself: 1) click on "Show patches with:" 2) use package name as "Search", so sdl2_ttf 3) set State as "any" 4) set Archived as Both That way you will see all the patches, the New, Accepted, Superseded and Reject. Another method would be by checking Buildroot Repository itself. You can: $ cd buildroot/ $ git log --grep=sdl2_ttf or since you already know the package: $ git log package/sdl2_ttf or also: $ gitk package/sdl2_ttf That will give you the idea of what is really applied. Or yes, you can use pwclient, but that and patchwork are really patch oriented. Here what you need is to check if the fix is already committed, so I(at least) would go for using git most of all. Best regards -- Giulio Benetti Benetti Engineering sas > Thanks so much for your patience and help. > > Peter > > > On Sat, Feb 19, 2022 at 4:54 AM Giulio Benetti > > wrote: > > Yes, but probably has been already fixed. > Anyway now you know the entire workflow! > > Giulio > > Inviato da iPhone > >> Il giorno 19 feb 2022, alle ore 03:14, Peter Thompson >> > > ha scritto: >> >> ? >> Lots for me to work on!!!!?? Thanks so much for your help!! >> I will let you know when I have success. >> Peter >> >> On Fri, Feb 18, 2022 at 2:41 PM Giulio Benetti >> > > wrote: >> >> Hi Peter, >> >> I add ML in Cc, >> >>> Il giorno 18 feb 2022, alle ore 20:03, Peter Thompson >>> >> > ha scritto: >>> >>> ? >>> Hi? Giulio >>> >>> Whew - that was fast - I am back asking questions already :).... >>> >>> My bump of sdl2_ttf-2.0.15 to sdl2_ttf-2.0.18? caused an >>> autobuilder failure? 2022-02-16 02:25:21.????? The log >>> indicates the problem is? pthread.h missing when harfbuzz is >>> specified.??? See log below... >> >> Here can you please provide me the link like below? >> http://autobuild.buildroot.net/results/cba/cba34c431f8d1315e9ca9159274421a8219a701e// >> >> >>> >>> Not sure why sdl2_ttf-2.0.15 worked before..... >> >> It seems like that between 2.0.15 to 2.0.18(maybe) >> sdl2_ttf only uses harfbuzz provided by sdl2_ttf itself. >> This means it?s skipping the one provided from Buildroot that >> is already patched for harfbuzz pthread.h issue. >> >>> Anyways, I planned to add >>> SDL2_TTF_DEPENDENCIES +=? pthread >>> right under >>> SDL2_TTF_DEPENDENCIES +=? harfbuzz >> >> I would instead try to make sdl2_ttf to choose external >> harfbuzz instead of using the internal one. And also, we?re >> not sure that phtread.h is not provided at all. >> Sometimes build systems fail to recognize headers and libs(the >> way they check if a library does exist or not). >> >>> >>> But I am having trouble testing. ? When I submit >>> ?./autobuild ? 91f241b8e96?? ( I assume SHA1 is the git id = >>> commit id) >>> I get >>> 404 Error Cannot get configuration for build 91f/91f241b8 >>> Suggestions? >> >> Here you need to pass this sha1: >> cba34c431f8d1315e9ca9159274421a8219a701e >> that is the autobuilder sha1 and not the git sha1. >> >> Take care to download the right script: >> http://git.buildroot.net/buildroot-test/plain/utils/br-reproduce-build >> >> >> Then to: >> $ chmod a+x br-reproduce-build >> Open it and adjust Buildroot path. >> Then execute it with: >> $ ./br-reproduce-build cba34c431f8d1315e9ca9159274421a8219a701e >> >> Also remember that if it fails you can: >> $ cd cba34c431f8d1315e9ca9159274421a8219a701e/output >> $ make sdl2_ttf >> or to rebuild package only: >> $ make sdl2_ttf-dirclean sdl2_ttf >> >>> >>> --- ALTERNATE IDEA --- >>> >>> A better way to fix this issue might be to fix >>> package/harfbuzz. ? It is that dependency which needs pthread >>> and which is causing sdl2_ttf to fail AFAIK. >> >> If look closer the build failure you will see that it?s not >> Buildroot harfbuzz that fails but a harfbuzz embedded into >> sdl2_ttf. >> So what I should to is to try to make sdl2_ttf drop its >> internal harfbuzz and use the Buildroot one. >> >>> I see harfbuzz is maintained by you so you are an excellent >>> person to ask. >>> >>> I checked harfbuzz and there is >>> 0001-meson.build-check-for-pthread.h.patch >>> from Nov 2020 by Fabrice Fontaine.?? Not sure if that patch >>> was applied or if it fixes my issue. >> >> That is applied and actually fixes harfbuzz build failure. But >> as explained above you?re dealing with the one embedded into >> sdl2_ttf package. >> >>> >>> Should I have copied the mailing list with these questions? >>> I am never sure. >> >> If you?re in doubt put it in Cc :-) >> >>> Anyway - thanks for being there and helping.??? It is >>> appreciated. >> >> You?re welcome! >> >> Best regards >> >> Giulio >> >>> >>> Peter >>> >>> >>> In file included from external/harfbuzz-2.8.0/src/hb.hh:470, >>> from external/harfbuzz-2.8.0/src/hb-aat-layout.cc:28: >>> external/harfbuzz-2.8.0/src/hb-mutex.hh:53:10: fatal error: pthread.h: No such file or directory >>> 53 | #include >>> | ^~~~~~~~~~~ >>> compilation terminated. >>> From giulio.benetti at benettiengineering.com Sat Feb 19 21:06:57 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 19 Feb 2022 22:06:57 +0100 Subject: [Buildroot] [PATCH v4] board/arcturus/aarch64-ucls1012a: bump u-boot and kernel version In-Reply-To: <20220218220905.87503-1-mdurrant@arcturusnetworks.com> References: <20220218220905.87503-1-mdurrant@arcturusnetworks.com> Message-ID: Hi Michael, On 18/02/22 23:09, Michael Durrant wrote: > - Bump Linux to version 5.4.137 > - Bump U-Boot to add new targets, version remains the same > - Drop BR2_ROOTFS_OVERLAY and remove S09modload script because it was only used by PFE and now PFE is loaded directly by the kernel > - Use Image.gz instead of Image to have a compressed kernel > - Rename ucls1012a.its to br2-ucls1012a.its since post-build.sh and post-image.sh use different name. This fixes the bug that didn't allow the creation of the part0-000000.itb file. Please wrap your commit log at 72th column. Give a try by auto-sending the patch to yourself and download it so you can verify commit log wraps at 72. > Signed-off-by: Oleksandr Zhadan > Signed-off-by: Michael Durrant I've built the defconfig successfully using the gitlab-CI docker and except commit log carriage return: Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti [Giulio: build tested] So please send a V5 with above correction including my tags ^^^ after your SoBs. Thank you! Best regards -- Giulio Benetti Benetti Engineering sas > --- > V1->V2: > - Bump the kernel to "Linux version 5.4.137" > - Bootloader version is still "U-Boot 2019.10" but new targets added. > - Remove the /etc/init.d/S09modload script to load the pfe firmware > module because now the pfe firmware module is loaded by the kernel > - New compressed Image.gz is used > V2->V3: > - Moved SoB to top of patch > - The use of Image.gz replace Image to force use of compression. > - Our scripts use br2-ucls1012a.its in error ucls1012a.its was used > in original readme. > - Removing extra newline > - The NXP Packet Forward Engine (PFE) firmware loader was the only > file used in the overlay. As the PFE is now loaded directly by > the kernel the BR2_ROOTFS_OVERLAY script has been removed. > V3->V4: > - Improved commit log by listing all the changed as suggested by Giulio. > - Updated header version comment in defconfig to reflect 5.4 series. > --- > board/arcturus/aarch64-ucls1012a/post-build.sh | 1 - > board/arcturus/aarch64-ucls1012a/readme.txt | 4 ++-- > .../rootfs_overlay/etc/init.d/S09modload | 14 -------------- > configs/arcturus_ucls1012a_defconfig | 10 +++++----- > 4 files changed, 7 insertions(+), 22 deletions(-) > delete mode 100755 board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload > > diff --git a/board/arcturus/aarch64-ucls1012a/post-build.sh b/board/arcturus/aarch64-ucls1012a/post-build.sh > index f8ba78095f..372df59c61 100755 > --- a/board/arcturus/aarch64-ucls1012a/post-build.sh > +++ b/board/arcturus/aarch64-ucls1012a/post-build.sh > @@ -1,5 +1,4 @@ > #!/bin/sh > > mkdir -p ${TARGET_DIR}/lib/firmware > -cp -f ${BUILD_DIR}/linux-custom/firmware/ppfe/* ${TARGET_DIR}/lib/firmware/ > cp -f ${BUILD_DIR}/linux-custom/br2-ucls1012a.its ${BINARIES_DIR}/ > diff --git a/board/arcturus/aarch64-ucls1012a/readme.txt b/board/arcturus/aarch64-ucls1012a/readme.txt > index 483d5e9aef..b486ecebc7 100644 > --- a/board/arcturus/aarch64-ucls1012a/readme.txt > +++ b/board/arcturus/aarch64-ucls1012a/readme.txt > @@ -24,13 +24,13 @@ After building, you should obtain this tree: > > output/images/ > +-- arc-ucls1012a.dtb > - +-- Image > + +-- Image.gz > +-- part0-000000.itb > +-- rootfs.cpio > +-- rootfs.cpio.gz > +-- rootfs.tar > +-- u-boot.bin > - +-- ucls1012a.its > + +-- br2-ucls1012a.its > > Flashing > -------- > diff --git a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload b/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload > deleted file mode 100755 > index c87ffda14f..0000000000 > --- a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload > +++ /dev/null > @@ -1,14 +0,0 @@ > -#!/bin/sh > -# > -case "$1" in > - start) > - modprobe pfe > - ;; > - stop) > - ;; > - restart|reload) > - ;; > - *) > - echo "Usage: $0 {start|stop|restart}" > - exit 1 > -esac > diff --git a/configs/arcturus_ucls1012a_defconfig b/configs/arcturus_ucls1012a_defconfig > index fd33ebf1f6..124cc3ff94 100644 > --- a/configs/arcturus_ucls1012a_defconfig > +++ b/configs/arcturus_ucls1012a_defconfig > @@ -1,22 +1,22 @@ > # Architecture > BR2_aarch64=y > > -# Linux headers same as kernel, a 4.14 series > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y > +# Linux headers same as kernel, a 5.4 series > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y > > # System settings > BR2_TARGET_GENERIC_HOSTNAME="ucls1012a" > BR2_TARGET_GENERIC_ISSUE="Welcome to uCLS1012A-SOM" > BR2_SYSTEM_DHCP="eth0" > -BR2_ROOTFS_OVERLAY="board/arcturus/aarch64-ucls1012a/rootfs_overlay" > BR2_ROOTFS_POST_BUILD_SCRIPT="board/arcturus/aarch64-ucls1012a/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/arcturus/aarch64-ucls1012a/post-image.sh" > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-kernel,v.20.31)/linux-v.20.31.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-kernel,v.22.06)/linux-v.22.06.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="ucls1012a" > +BR2_LINUX_KERNEL_IMAGEGZ=y > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="arcturus/arc-ucls1012a" > > @@ -28,7 +28,7 @@ BR2_TARGET_ROOTFS_CPIO_GZIP=y > BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > BR2_TARGET_UBOOT_CUSTOM_TARBALL=y > -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-uboot,v.20.31)/uboot-v.20.31.tar.gz" > +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-uboot,v.22.06)/uboot-v.22.06.tar.gz" > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="UCLS1012A_QSPI128" > > # Tools From giulio.benetti at benettiengineering.com Sat Feb 19 21:22:11 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 19 Feb 2022 22:22:11 +0100 Subject: [Buildroot] [PATCH v2] manual: board support: add instructions to test defconfig in the official docker Message-ID: <20220219212211.1304441-1-giulio.benetti@benettiengineering.com> Sometimes new boards have not been tested with official docker so let's add instructions to do it with utils/docker-run. Cc: Luca Ceresoli Signed-off-by: Giulio Benetti --- V1->V2: * use the available utils/docker-run * improve explanation as suggested by Luca Ceresoli --- docs/manual/adding-board-support.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/manual/adding-board-support.txt b/docs/manual/adding-board-support.txt index 33ed709535..074bab7a00 100644 --- a/docs/manual/adding-board-support.txt +++ b/docs/manual/adding-board-support.txt @@ -46,3 +46,11 @@ create a directory +board/+ and a subdirectory +board//+. You can then store your patches and configurations in these directories, and reference them from the main Buildroot configuration. Refer to xref:customize[] for more details. + +Before submitting patches for new boards it is recommended to test it by +building it using latest gitlab-CI docker container. To do this use +utils/docker-run script and inside it hint: +-------------------- + $ make +_defconfig+ + $ make +-------------------- -- 2.25.1 From Noreply at busybox.net Sun Feb 20 09:31:11 2022 From: Noreply at busybox.net (Noreply at busybox.net) Date: 20 Feb 2022 10:31:11 +0100 Subject: [Buildroot] ACCOUNT WARNING: Undelivered mails buildroot@busybox.net Kindly rectify Message-ID: <20220220103111.5E6E1013DC71A87C@busybox.net> An HTML attachment was scrubbed... URL: From yann.morin.1998 at free.fr Sun Feb 20 09:52:44 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 20 Feb 2022 10:52:44 +0100 Subject: [Buildroot] [git commit] package/expat: fix tarball sha256 Message-ID: <20220220094533.624C9812FE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=59a813d2a884c2eb247d9695089375b56751b6d5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit ab71ac15ddd7ed6a8ca83cbc23ea0b0cbb343f0f forgot to update sha256 Signed-off-by: Fabrice Fontaine [yann.morin.1998 at free.fr: update hash for real ;-)] Signed-off-by: Yann E. MORIN --- package/expat/expat.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index 3129801668..10e13206d0 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -3,5 +3,5 @@ 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 From yann.morin.1998 at free.fr Sun Feb 20 09:54:58 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 20 Feb 2022 10:54:58 +0100 Subject: [Buildroot] [PATCH 1/2] package/expat: fix tarball sha256 In-Reply-To: <20220219122831.2961097-1-fontaine.fabrice@gmail.com> References: <20220219122831.2961097-1-fontaine.fabrice@gmail.com> Message-ID: <20220220095458.GP522310@scaer> Fabrice, All, On 2022-02-19 13:28 +0100, Fabrice Fontaine spake thusly: > Commit ab71ac15ddd7ed6a8ca83cbc23ea0b0cbb343f0f forgot to update sha256 > > Signed-off-by: Fabrice Fontaine > --- > package/expat/expat.hash | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/expat/expat.hash b/package/expat/expat.hash > index 3129801668..a6f43af291 100644 > --- a/package/expat/expat.hash > +++ b/package/expat/expat.hash > @@ -3,5 +3,5 @@ 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 b1f9f1b1a5ebb0acaa88c9ff79bfa4e145823b78aa5185e5c5d85f060824778a expat-2.4.4.tar.xz ... and so it seems you akso forgot to update the hash. ;-) Applied to master with the hash fixed for real, thanks. Regards, Yann E. MORIN. > sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec 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 Sun Feb 20 09:54:38 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 20 Feb 2022 10:54:38 +0100 Subject: [Buildroot] [git commit] package/expat: security bump to version 2.4.5 Message-ID: <20220220094754.DBB0B82DFB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=21c07c0aaa7e43b8f676c564f173a510d345a77a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Security fixes: #562 CVE-2022-25235 -- Passing malformed 2- and 3-byte UTF-8 sequences (e.g. from start tag names) to the XML processing application on top of Expat can cause arbitrary damage (e.g. code execution) depending on how invalid UTF-8 is handled inside the XML processor; validation was not their job but Expat's. Exploits with code execution are known to exist. #561 CVE-2022-25236 -- Passing (one or more) namespace separator characters in "xmlns[:prefix]" attribute values made Expat send malformed tag names to the XML processor on top of Expat which can cause arbitrary damage (e.g. code execution) depending on such unexpectable cases are handled inside the XML processor; validation was not their job but Expat's. Exploits with code execution are known to exist. #558 CVE-2022-25313 -- Fix stack exhaustion in doctype parsing that could be triggered by e.g. a 2 megabytes file with a large number of opening braces. Expected impact is denial of service or potentially arbitrary code execution. #560 CVE-2022-25314 -- Fix integer overflow in function copyString; only affects the encoding name parameter at parser creation time which is often hardcoded (rather than user input), takes a value in the gigabytes to trigger, and a 64-bit machine. Expected impact is denial of service. #559 CVE-2022-25315 -- Fix integer overflow in function storeRawNames; needs input in the gigabytes and a 64-bit machine. Expected impact is denial of service or potentially arbitrary code execution. https://blog.hartwork.org/posts/expat-2-4-5-released/ https://github.com/libexpat/libexpat/blob/R_2_4_5/expat/Changes Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- 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 10e13206d0..cd2e8c7fb9 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.4/ -md5 a712d23b7afb32e7527cf0b3fd8f12ac expat-2.4.4.tar.xz -sha1 6028b04d3505fc519c4c7c6bd67e1ad1a08cd7b6 expat-2.4.4.tar.xz +# From https://sourceforge.net/projects/expat/files/expat/2.4.5/ +md5 9dc183e6c1eebc1b658c1e71be0885e1 expat-2.4.5.tar.xz +sha1 360a49b55c442e91cb7b328bc0335083909ddf4f expat-2.4.5.tar.xz # Locally calculated -sha256 b5d25d6e373351c2ed19b562b4732d01d2589ac8c8e9e7962d8df1207cc311b8 expat-2.4.4.tar.xz +sha256 f2af8fc7cdc63a87920da38cd6d12cb113c3c3a3f437495b1b6541e0cff32579 expat-2.4.5.tar.xz sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec COPYING diff --git a/package/expat/expat.mk b/package/expat/expat.mk index 250600c25e..7815d61027 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.4.4 +EXPAT_VERSION = 2.4.5 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz EXPAT_INSTALL_STAGING = YES From yann.morin.1998 at free.fr Sun Feb 20 09:55:54 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 20 Feb 2022 10:55:54 +0100 Subject: [Buildroot] [PATCH 2/2] package/expat: security bump to version 2.4.5 In-Reply-To: <20220219122831.2961097-2-fontaine.fabrice@gmail.com> References: <20220219122831.2961097-1-fontaine.fabrice@gmail.com> <20220219122831.2961097-2-fontaine.fabrice@gmail.com> Message-ID: <20220220095554.GQ522310@scaer> Fabrice, All, On 2022-02-19 13:28 +0100, Fabrice Fontaine spake thusly: > Security fixes: > #562 CVE-2022-25235 -- Passing malformed 2- and 3-byte UTF-8 > sequences (e.g. from start tag names) to the XML > processing application on top of Expat can cause > arbitrary damage (e.g. code execution) depending > on how invalid UTF-8 is handled inside the XML > processor; validation was not their job but Expat's. > Exploits with code execution are known to exist. > #561 CVE-2022-25236 -- Passing (one or more) namespace separator > characters in "xmlns[:prefix]" attribute values > made Expat send malformed tag names to the XML > processor on top of Expat which can cause > arbitrary damage (e.g. code execution) depending > on such unexpectable cases are handled inside the XML > processor; validation was not their job but Expat's. > Exploits with code execution are known to exist. > #558 CVE-2022-25313 -- Fix stack exhaustion in doctype parsing > that could be triggered by e.g. a 2 megabytes > file with a large number of opening braces. > Expected impact is denial of service or potentially > arbitrary code execution. > #560 CVE-2022-25314 -- Fix integer overflow in function copyString; > only affects the encoding name parameter at parser creation > time which is often hardcoded (rather than user input), > takes a value in the gigabytes to trigger, and a 64-bit > machine. Expected impact is denial of service. > #559 CVE-2022-25315 -- Fix integer overflow in function storeRawNames; > needs input in the gigabytes and a 64-bit machine. > Expected impact is denial of service or potentially > arbitrary code execution. > > https://blog.hartwork.org/posts/expat-2-4-5-released/ > https://github.com/libexpat/libexpat/blob/R_2_4_5/expat/Changes > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > 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 a6f43af291..cd2e8c7fb9 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.4/ > -md5 a712d23b7afb32e7527cf0b3fd8f12ac expat-2.4.4.tar.xz > -sha1 6028b04d3505fc519c4c7c6bd67e1ad1a08cd7b6 expat-2.4.4.tar.xz > +# From https://sourceforge.net/projects/expat/files/expat/2.4.5/ > +md5 9dc183e6c1eebc1b658c1e71be0885e1 expat-2.4.5.tar.xz > +sha1 360a49b55c442e91cb7b328bc0335083909ddf4f expat-2.4.5.tar.xz > > # Locally calculated > -sha256 b1f9f1b1a5ebb0acaa88c9ff79bfa4e145823b78aa5185e5c5d85f060824778a expat-2.4.4.tar.xz > +sha256 f2af8fc7cdc63a87920da38cd6d12cb113c3c3a3f437495b1b6541e0cff32579 expat-2.4.5.tar.xz > sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec COPYING > diff --git a/package/expat/expat.mk b/package/expat/expat.mk > index 250600c25e..7815d61027 100644 > --- a/package/expat/expat.mk > +++ b/package/expat/expat.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -EXPAT_VERSION = 2.4.4 > +EXPAT_VERSION = 2.4.5 > 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 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Feb 20 09:59:17 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 20 Feb 2022 10:59:17 +0100 Subject: [Buildroot] [git commit] package/dovecot-pigeonhole: drop DOVECOT_PIGEONHOLE_FIXUP_DOVECOT_CONFIG Message-ID: <20220220095315.3102781DD5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e0a0b8d233b86a7c1a197345936d37fce1ea22e8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop DOVECOT_PIGEONHOLE_FIXUP_DOVECOT_CONFIG added by commit 0901355c11f051846744a12f9b2044a751faa47a which is not needed since the addition of PPD_FIXUP_PATHS in commit b06294e9897e90862656416e8b67fdace15488d Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/dovecot-pigeonhole/dovecot-pigeonhole.mk | 8 -------- 1 file changed, 8 deletions(-) diff --git a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk index dd533977f4..62d9909cf5 100644 --- a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk +++ b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk @@ -15,12 +15,4 @@ DOVECOT_PIGEONHOLE_DEPENDENCIES = dovecot DOVECOT_PIGEONHOLE_CONF_OPTS = --with-dovecot=$(STAGING_DIR)/usr/lib -ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) -define DOVECOT_PIGEONHOLE_FIXUP_DOVECOT_CONFIG - $(SED) 's,$(PER_PACKAGE_DIR)/dovecot/,$(PER_PACKAGE_DIR)/dovecot-pigeonhole/,g' \ - $(STAGING_DIR)/usr/lib/dovecot-config -endef -DOVECOT_PIGEONHOLE_PRE_CONFIGURE_HOOKS = DOVECOT_PIGEONHOLE_FIXUP_DOVECOT_CONFIG -endif - $(eval $(autotools-package)) From yann.morin.1998 at free.fr Sun Feb 20 09:59:22 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 20 Feb 2022 10:59:22 +0100 Subject: [Buildroot] [git commit] package/apache: drop APACHE_FIXUP_APR_LIBTOOL Message-ID: <20220220095315.497F6833C9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0b7c22970d4fb4cf4db30e77a291ea841e2a235e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop APACHE_FIXUP_APR_LIBTOOL which was added by commit b747c29c4e8eb89b7b99658dfd34f4a6b6b0744d but is not needed since the addition of PPD_FIXUP_PATHS in commit b06294e9897e90862656416e8b67fdace15488d7 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/apache/apache.mk | 8 -------- 1 file changed, 8 deletions(-) diff --git a/package/apache/apache.mk b/package/apache/apache.mk index 5fcb887fbc..b280d4dc3a 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -19,14 +19,6 @@ APACHE_INSTALL_STAGING = YES APACHE_AUTORECONF = YES APACHE_DEPENDENCIES = apr apr-util pcre -ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) -define APACHE_FIXUP_APR_LIBTOOL - $(SED) "s@$(PER_PACKAGE_DIR)/[^/]\+/@$(PER_PACKAGE_DIR)/apache/@g" \ - $(STAGING_DIR)/usr/build-1/libtool -endef -APACHE_POST_PREPARE_HOOKS += APACHE_FIXUP_APR_LIBTOOL -endif - APACHE_CONF_ENV= \ ap_cv_void_ptr_lt_long=no \ PCRE_CONFIG=$(STAGING_DIR)/usr/bin/pcre-config From yann.morin.1998 at free.fr Sun Feb 20 09:59:20 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 20 Feb 2022 10:59:20 +0100 Subject: [Buildroot] [git commit] package/apparmor: drop APPARMOR_FIXUP_APXS Message-ID: <20220220095315.3DD3883241@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e0da90512c04f5cfcdcbe1c4a8f32e559828e0c9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop APPARMOR_FIXUP_APXS which was added by commit 3c836e54203b16015c9c52cbe007adc92d293a0d but is not needed since the addition of PPD_FIXUP_PATHS in commit b06294e9897e90862656416e8b67fdace15488d7 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/apparmor/apparmor.mk | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/package/apparmor/apparmor.mk b/package/apparmor/apparmor.mk index 6f0e59224d..43bfa05308 100644 --- a/package/apparmor/apparmor.mk +++ b/package/apparmor/apparmor.mk @@ -54,16 +54,6 @@ ifeq ($(BR2_PACKAGE_APACHE),y) APPARMOR_DEPENDENCIES += apache APPARMOR_TOOLS += changehat/mod_apparmor APPARMOR_MAKE_OPTS += APXS=$(STAGING_DIR)/usr/bin/apxs - -ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) -define APPARMOR_FIXUP_APXS - $(SED) "s@$(PER_PACKAGE_DIR)/[^/]\+/@$(PER_PACKAGE_DIR)/apparmor/@g" \ - $(STAGING_DIR)/usr/bin/apxs \ - $(STAGING_DIR)/usr/build/config_vars.mk \ - $(STAGING_DIR)/usr/build-1/libtool -endef -APPARMOR_POST_CONFIGURE_HOOKS += APPARMOR_FIXUP_APXS -endif endif define APPARMOR_BUILD_CMDS From yann.morin.1998 at free.fr Sun Feb 20 09:59:25 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 20 Feb 2022 10:59:25 +0100 Subject: [Buildroot] [git commit] package/apr-util: drop APR_UTIL_FIX_{LIBTOOL, RULES_MK} Message-ID: <20220220095315.56A2281DD5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a50c9f16edfe36c9ef4a210621b062493fdd09fd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop APR_UTIL_FIX_{LIBTOOL,RULES_MK} which were added by commit 84b4c19e551288911a230c2b73e96bc6e2ed12f9 but is not needed since the addition of PPD_FIXUP_PATHS in commit b06294e9897e90862656416e8b67fdace15488d7 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/apr-util/apr-util.mk | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/package/apr-util/apr-util.mk b/package/apr-util/apr-util.mk index f6ce7ac064..cf8407ced0 100644 --- a/package/apr-util/apr-util.mk +++ b/package/apr-util/apr-util.mk @@ -17,20 +17,6 @@ APR_UTIL_CONF_OPTS = \ --with-apr=$(STAGING_DIR)/usr/bin/apr-1-config APR_UTIL_CONFIG_SCRIPTS = apu-1-config -ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) -define APR_UTIL_FIX_LIBTOOL - $(SED) 's,$(PER_PACKAGE_DIR)/apr/,$(PER_PACKAGE_DIR)/apr-util/,g' \ - $(STAGING_DIR)/usr/build-1/libtool -endef -APR_UTIL_POST_PREPARE_HOOKS += APR_UTIL_FIX_LIBTOOL - -define APR_UTIL_FIX_RULES_MK - $(SED) 's,$(PER_PACKAGE_DIR)/apr/,$(PER_PACKAGE_DIR)/apr-util/,g' \ - $(@D)/build/rules.mk -endef -APR_UTIL_POST_CONFIGURE_HOOKS += APR_UTIL_FIX_RULES_MK -endif - # When iconv is available, then use it to provide charset conversion # features. APR_UTIL_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv) From yann.morin.1998 at free.fr Sun Feb 20 10:01:40 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 20 Feb 2022 11:01:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/dovecot-pigeonhole: drop DOVECOT_PIGEONHOLE_FIXUP_DOVECOT_CONFIG In-Reply-To: <20220219134104.3403344-1-fontaine.fabrice@gmail.com> References: <20220219134104.3403344-1-fontaine.fabrice@gmail.com> Message-ID: <20220220100140.GR522310@scaer> Fabrice, All, On 2022-02-19 14:41 +0100, Fabrice Fontaine spake thusly: > Drop DOVECOT_PIGEONHOLE_FIXUP_DOVECOT_CONFIG added by commit > 0901355c11f051846744a12f9b2044a751faa47a which is not needed since the > addition of PPD_FIXUP_PATHS in commit > b06294e9897e90862656416e8b67fdace15488d > > Signed-off-by: Fabrice Fontaine Thanks for this further cleanup! :-) Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/dovecot-pigeonhole/dovecot-pigeonhole.mk | 8 -------- > 1 file changed, 8 deletions(-) > > diff --git a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk > index dd533977f4..62d9909cf5 100644 > --- a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk > +++ b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk > @@ -15,12 +15,4 @@ DOVECOT_PIGEONHOLE_DEPENDENCIES = dovecot > > DOVECOT_PIGEONHOLE_CONF_OPTS = --with-dovecot=$(STAGING_DIR)/usr/lib > > -ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) > -define DOVECOT_PIGEONHOLE_FIXUP_DOVECOT_CONFIG > - $(SED) 's,$(PER_PACKAGE_DIR)/dovecot/,$(PER_PACKAGE_DIR)/dovecot-pigeonhole/,g' \ > - $(STAGING_DIR)/usr/lib/dovecot-config > -endef > -DOVECOT_PIGEONHOLE_PRE_CONFIGURE_HOOKS = DOVECOT_PIGEONHOLE_FIXUP_DOVECOT_CONFIG > -endif > - > $(eval $(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 Sun Feb 20 10:01:54 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 20 Feb 2022 11:01:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/apparmor: drop APPARMOR_FIXUP_APXS In-Reply-To: <20220219141922.3753289-1-fontaine.fabrice@gmail.com> References: <20220219141922.3753289-1-fontaine.fabrice@gmail.com> Message-ID: <20220220100154.GS522310@scaer> Fabrice, All, On 2022-02-19 15:19 +0100, Fabrice Fontaine spake thusly: > Drop APPARMOR_FIXUP_APXS which was added by commit > 3c836e54203b16015c9c52cbe007adc92d293a0d but is not needed since the > addition of PPD_FIXUP_PATHS in commit > b06294e9897e90862656416e8b67fdace15488d7 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/apparmor/apparmor.mk | 10 ---------- > 1 file changed, 10 deletions(-) > > diff --git a/package/apparmor/apparmor.mk b/package/apparmor/apparmor.mk > index 6f0e59224d..43bfa05308 100644 > --- a/package/apparmor/apparmor.mk > +++ b/package/apparmor/apparmor.mk > @@ -54,16 +54,6 @@ ifeq ($(BR2_PACKAGE_APACHE),y) > APPARMOR_DEPENDENCIES += apache > APPARMOR_TOOLS += changehat/mod_apparmor > APPARMOR_MAKE_OPTS += APXS=$(STAGING_DIR)/usr/bin/apxs > - > -ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) > -define APPARMOR_FIXUP_APXS > - $(SED) "s@$(PER_PACKAGE_DIR)/[^/]\+/@$(PER_PACKAGE_DIR)/apparmor/@g" \ > - $(STAGING_DIR)/usr/bin/apxs \ > - $(STAGING_DIR)/usr/build/config_vars.mk \ > - $(STAGING_DIR)/usr/build-1/libtool > -endef > -APPARMOR_POST_CONFIGURE_HOOKS += APPARMOR_FIXUP_APXS > -endif > endif > > define APPARMOR_BUILD_CMDS > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Feb 20 10:02:06 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 20 Feb 2022 11:02:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/apache: drop APACHE_FIXUP_APR_LIBTOOL In-Reply-To: <20220219142027.3753330-1-fontaine.fabrice@gmail.com> References: <20220219142027.3753330-1-fontaine.fabrice@gmail.com> Message-ID: <20220220100206.GT522310@scaer> Fabrice, All, On 2022-02-19 15:20 +0100, Fabrice Fontaine spake thusly: > Drop APACHE_FIXUP_APR_LIBTOOL which was added by commit > b747c29c4e8eb89b7b99658dfd34f4a6b6b0744d but is not needed since the > addition of PPD_FIXUP_PATHS in commit > b06294e9897e90862656416e8b67fdace15488d7 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/apache/apache.mk | 8 -------- > 1 file changed, 8 deletions(-) > > diff --git a/package/apache/apache.mk b/package/apache/apache.mk > index 5fcb887fbc..b280d4dc3a 100644 > --- a/package/apache/apache.mk > +++ b/package/apache/apache.mk > @@ -19,14 +19,6 @@ APACHE_INSTALL_STAGING = YES > APACHE_AUTORECONF = YES > APACHE_DEPENDENCIES = apr apr-util pcre > > -ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) > -define APACHE_FIXUP_APR_LIBTOOL > - $(SED) "s@$(PER_PACKAGE_DIR)/[^/]\+/@$(PER_PACKAGE_DIR)/apache/@g" \ > - $(STAGING_DIR)/usr/build-1/libtool > -endef > -APACHE_POST_PREPARE_HOOKS += APACHE_FIXUP_APR_LIBTOOL > -endif > - > APACHE_CONF_ENV= \ > ap_cv_void_ptr_lt_long=no \ > PCRE_CONFIG=$(STAGING_DIR)/usr/bin/pcre-config > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Feb 20 10:08:46 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 20 Feb 2022 11:08:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/apr-util: drop APR_UTIL_FIX_{LIBTOOL, RULES_MK} In-Reply-To: <20220219142104.3753374-1-fontaine.fabrice@gmail.com> References: <20220219142104.3753374-1-fontaine.fabrice@gmail.com> Message-ID: <20220220100846.GU522310@scaer> Fabrice, All, On 2022-02-19 15:21 +0100, Fabrice Fontaine spake thusly: > Drop APR_UTIL_FIX_{LIBTOOL,RULES_MK} which were added by commit > 84b4c19e551288911a230c2b73e96bc6e2ed12f9 but is not needed since the > addition of PPD_FIXUP_PATHS in commit > b06294e9897e90862656416e8b67fdace15488d7 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. There is still one occurence of a similar construct in qt5: 14 # The file "qt.conf" can be used to override the hard-coded paths that are 15 # compiled into the Qt library. We need it to make "qmake" relocatable and 16 # tweak the per-package install pathes 17 define QT5_INSTALL_QT_CONF 18 ? rm -f $(HOST_DIR)/bin/qt.conf 19 ? sed -e "s|@@HOST_DIR@@|$(HOST_DIR)|" -e "s|@@STAGING_DIR@@|$(STAGING_DIR)|" \ 20 ? ? $(QT5BASE_PKGDIR)/qt.conf.in > $(HOST_DIR)/bin/qt.conf 21 endef 22 23 ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) 24 define QT5_QT_CONF_FIXUP 25 ? $(QT5_INSTALL_QT_CONF) 26 endef 27 endif The generic fixup scans $(HOST_DIR), so it should hit this file too, no? QT5_QT_CONF_FIXUP is used in two locations: - pkg-qmake.mk -> as a post-preapare hook, which is exactly where the generic fixup runs too, so QT5_QT_CONF_FIXUP should be a no-op (well, it does run before the generic one). - python-pyqt5.mk -> as a pre-configure hook, which is incorrect becaused it will assign that file to that package, and anyway the generic fixup hook has already been run anyway, so this should be a no-op. Care tp have a look, please? Regards, Yann E. MORIN. > --- > package/apr-util/apr-util.mk | 14 -------------- > 1 file changed, 14 deletions(-) > > diff --git a/package/apr-util/apr-util.mk b/package/apr-util/apr-util.mk > index f6ce7ac064..cf8407ced0 100644 > --- a/package/apr-util/apr-util.mk > +++ b/package/apr-util/apr-util.mk > @@ -17,20 +17,6 @@ APR_UTIL_CONF_OPTS = \ > --with-apr=$(STAGING_DIR)/usr/bin/apr-1-config > APR_UTIL_CONFIG_SCRIPTS = apu-1-config > > -ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) > -define APR_UTIL_FIX_LIBTOOL > - $(SED) 's,$(PER_PACKAGE_DIR)/apr/,$(PER_PACKAGE_DIR)/apr-util/,g' \ > - $(STAGING_DIR)/usr/build-1/libtool > -endef > -APR_UTIL_POST_PREPARE_HOOKS += APR_UTIL_FIX_LIBTOOL > - > -define APR_UTIL_FIX_RULES_MK > - $(SED) 's,$(PER_PACKAGE_DIR)/apr/,$(PER_PACKAGE_DIR)/apr-util/,g' \ > - $(@D)/build/rules.mk > -endef > -APR_UTIL_POST_CONFIGURE_HOOKS += APR_UTIL_FIX_RULES_MK > -endif > - > # When iconv is available, then use it to provide charset conversion > # features. > APR_UTIL_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv) > -- > 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 mohd.faiz.rohani at gmail.com Sun Feb 20 10:57:20 2022 From: mohd.faiz.rohani at gmail.com (Mohd Faiz Rohani) Date: Sun, 20 Feb 2022 18:57:20 +0800 Subject: [Buildroot] Issue with login Message-ID: Hi guys, I managed to compile with success the Uboot(U-Boot 2019.04), Linux kernel(4.4.155)and root file system(systemd 249) using the Buildroot-2021.11.1. It was able to boot successfully until the login prompt. However, it seems like there is an error with the login prompt it does not want to enter, just looping around the login prompt after I have entered the login name (not showing the password prompt). Did anyone know about this? Thanks. -------------- next part -------------- An HTML attachment was scrubbed... URL: From yann.morin.1998 at free.fr Sun Feb 20 11:03:58 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 20 Feb 2022 12:03:58 +0100 Subject: [Buildroot] [PATCH 1/2] package/gdk-pixbuf: enable relocatable option In-Reply-To: <20220219122526.2954354-1-fontaine.fabrice@gmail.com> References: <20220219122526.2954354-1-fontaine.fabrice@gmail.com> Message-ID: <20220220110358.GV522310@scaer> Fabrice, All, On 2022-02-19 13:25 +0100, Fabrice Fontaine spake thusly: > Enable relocatable option to fix the following PPD build failure of > adwaita-icon-theme raised since commit > b06294e9897e90862656416e8b67fdace15488d7 which now correctly updates > loaders.cache: > > Can't load file: Unrecognized image file format You probably need to explain a bit more what is going here. > Fixes: > - http://autobuild.buildroot.org/results/0e00059b09b4445eaaec1030997883187c6a80d6 > > Signed-off-by: Fabrice Fontaine > --- > package/gdk-pixbuf/gdk-pixbuf.mk | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk > index cd30d450d5..7b9c9cdbda 100644 > --- a/package/gdk-pixbuf/gdk-pixbuf.mk > +++ b/package/gdk-pixbuf/gdk-pixbuf.mk > @@ -20,12 +20,14 @@ HOST_GDK_PIXBUF_DEPENDENCIES = host-libpng host-pkgconf host-libglib2 > GDK_PIXBUF_CONF_OPTS = \ > -Dgio_sniffing=false \ > -Dinstalled_tests=false \ > + -Drelocatable=true \ As far as I can understand, we do not care about the relocation for the target build, only for the host build, no? Regards, Yann E. MORIN. > -Dman=false > > HOST_GDK_PIXBUF_CONF_OPTS = \ > -Dgio_sniffing=false \ > -Dinstalled_tests=false \ > -Dintrospection=disabled \ > + -Drelocatable=true \ > -Dman=false > > ifeq ($(BR2_STATIC_LIBS),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 Feb 20 11:27:01 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 20 Feb 2022 12:27:01 +0100 Subject: [Buildroot] [PATCH 2/2] package/librsvg: fix loaders.cache In-Reply-To: <20220219122526.2954354-2-fontaine.fabrice@gmail.com> References: <20220219122526.2954354-1-fontaine.fabrice@gmail.com> <20220219122526.2954354-2-fontaine.fabrice@gmail.com> Message-ID: <20220220112701.GW522310@scaer> On 2022-02-19 13:25 +0100, Fabrice Fontaine spake thusly: > Set GDK_PIXBUF_MODULEDIR to gdk_pixbuf_moduledir before calling > gdk-pixbuf-query-loaders to build a correct loaders.cache and fix the > following PPD build failure of adwaita-icon-theme raised since commit > b06294e9897e90862656416e8b67fdace15488d7 which now correctly updates > loaders.cache: > > Can't load file: Unrecognized image file format I had a bit parsing the above... So, what you really are doing here is not "Set GDK_PIXBUF_MODULEDIR to gdk_pixbuf_moduledir", but really "Set GDK_PIXBUF_MODULEDIR to the path returned by the gdk_pixbuf_moduledir utility". And this does not explain why this is needed. Sorry for the rant to come... So, a commit log should not describe what is going on. WE can (most of the time) understand the code. Instead, a commit log should explain what the problem is, then explain why it happens, and finally explain how it is fixed. So, let's try to have a go at such a commit log (this is littered with wild guesses, adat appropriately)... package/librsvg: fix loaders.cache with per-package directories librsvg invokes the gdk-pixbuf-queryloaders, which generates a description of all the gdk-pixbuf modules; that includes paths to dlopen()ed shared libs. Those paths are absolute, so with PPD, they point to the location where the gdk-pixbuf package or where a module-provider, like librsvg, was installed. Later on, when a third-party package needs to call gdk-pibxbuf tools that need any of those modules, tose moduels won't be found because the description where they get installed will be wrong. We fix that by telling the gdk-pixbuf-queryloaders hwere to look for modules, both at configure and install time. At configure time, it tells the package to use modules from its own PPD rather tahn directly from where they were installed by gdk-pixbuf, and at install time, it [to be comp0leted, I have not been able to really understand why and what...] Could you please rework your patches with more details, especially when the fix is not obvious? Still, I'd like to thank you for this hard work; finding the issue and how to fix it was probably not very easy. So hat-off to you! ? Regards, Yann E. MORIN. > Fixes: > - http://autobuild.buildroot.org/results/0e00059b09b4445eaaec1030997883187c6a80d6 > > Signed-off-by: Fabrice Fontaine > --- > ...r-Makefile.am-set-GDK_PIXBUF_MODULED.patch | 39 +++++++++++++++++++ > package/librsvg/librsvg.mk | 2 + > 2 files changed, 41 insertions(+) > create mode 100644 package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch > > diff --git a/package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch b/package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch > new file mode 100644 > index 0000000000..94db8eb143 > --- /dev/null > +++ b/package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch > @@ -0,0 +1,39 @@ > +From 2c472bf55289ccbd7f305aa3e98d6fd70be4e3ab Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Sat, 19 Feb 2022 12:02:10 +0100 > +Subject: [PATCH] gdk-pixbuf-loader/Makefile.am: set GDK_PIXBUF_MODULEDIR > + > +Set GDK_PIXBUF_MODULEDIR to gdk_pixbuf_moduledir before calling > +gdk-pixbuf-query-loaders to build a correct gdk_pixbuf_cache_file and > +gdk-pixbuf.loaders on 'exotic' systems > + > +Signed-off-by: Fabrice Fontaine > +--- > + gdk-pixbuf-loader/Makefile.am | 4 ++-- > + 1 file changed, 2 insertions(+), 2 deletions(-) > + > +diff --git a/gdk-pixbuf-loader/Makefile.am b/gdk-pixbuf-loader/Makefile.am > +index c3493736..de1f9641 100644 > +--- a/gdk-pixbuf-loader/Makefile.am > ++++ b/gdk-pixbuf-loader/Makefile.am > +@@ -49,7 +49,7 @@ rsvg_loader_LDADD = \ > + EXTRA_rsvg_loader_DEPENDENCIES = libpixbufloader-svg.la gdk-pixbuf-loaders > + > + gdk-pixbuf-loaders: Makefile > +- $(AM_V_GEN) ( $(GDK_PIXBUF_QUERYLOADERS) ./libpixbufloader-svg.la && $(GDK_PIXBUF_QUERYLOADERS)) > gdk-pixbuf.loaders 2>/dev/null > ++ $(AM_V_GEN) ( $(GDK_PIXBUF_QUERYLOADERS) ./libpixbufloader-svg.la && GDK_PIXBUF_MODULEDIR=$(gdk_pixbuf_moduledir) $(GDK_PIXBUF_QUERYLOADERS)) > gdk-pixbuf.loaders 2>/dev/null > + > + if CROSS_COMPILING > + RUN_QUERY_LOADER_TEST=false > +@@ -68,7 +68,7 @@ endif > + install-data-hook: > + @if $(RUN_QUERY_LOADER_TEST) ; then \ > + $(mkinstalldirs) $(DESTDIR)$(gdk_pixbuf_binarydir) ; \ > +- $(GDK_PIXBUF_QUERYLOADERS) > $(DESTDIR)$(gdk_pixbuf_cache_file) ; \ > ++ GDK_PIXBUF_MODULEDIR=$(gdk_pixbuf_moduledir) $(GDK_PIXBUF_QUERYLOADERS) > $(DESTDIR)$(gdk_pixbuf_cache_file) ; \ > + else \ > + echo "***" ; \ > + echo "*** Warning: loaders.cache not built" ; \ > +-- > +2.34.1 > + > diff --git a/package/librsvg/librsvg.mk b/package/librsvg/librsvg.mk > index e4b1942b79..07a14b4366 100644 > --- a/package/librsvg/librsvg.mk > +++ b/package/librsvg/librsvg.mk > @@ -20,6 +20,8 @@ HOST_LIBRSVG_DEPENDENCIES = host-cairo host-gdk-pixbuf host-libglib2 host-libxml > LIBRSVG_LICENSE = LGPL-2.1+ > LIBRSVG_LICENSE_FILES = COPYING.LIB > LIBRSVG_CPE_ID_VENDOR = gnome > +# We're patching gdk-pixbuf-loader/Makefile.am > +LIBRSVG_AUTORECONF = YES > > ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) > LIBRSVG_CONF_OPTS += --enable-introspection > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From giulio.benetti at benettiengineering.com Sun Feb 20 11:43:31 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 20 Feb 2022 12:43:31 +0100 Subject: [Buildroot] Issue with login In-Reply-To: References: Message-ID: <893D1C4B-6F6D-4F58-A77C-C71AFED67270@benettiengineering.com> Hi Mohd, have you used root as user? Or did you provide a user table? Giulio Inviato da iPhone > Il giorno 20 feb 2022, alle ore 11:57, Mohd Faiz Rohani ha scritto: > > ? > Hi guys, > > I managed to compile with success the Uboot(U-Boot 2019.04), Linux kernel(4.4.155)and root file system(systemd 249) using the Buildroot-2021.11.1. It was able to boot successfully until the login prompt. However, it seems like there is an error with the login prompt it does not want to enter, just looping around the login prompt after I have entered the login name (not showing the password prompt). Did anyone know about this? > > Thanks. > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From fontaine.fabrice at gmail.com Sun Feb 20 12:16:36 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 20 Feb 2022 13:16:36 +0100 Subject: [Buildroot] [PATCH v2, 1/2] package/gdk-pixbuf: enable relocatable option Message-ID: <20220220121637.200393-1-fontaine.fabrice@gmail.com> Enable relocatable option to fix the following PPD build failure of adwaita-icon-theme: Can't load file: Unrecognized image file format This failure is raised because the SVG library is not found by gtk-encode-symbolic-svg. To find the SVG library, gtk-encode-symbolic-svg depends on libgtk_pixbuf library which reads the loaders.cache file using: - a hardcoded path (which points to host-gdk-pixbuf per-package directory) if relocatable is disabled. The loaders.cache in this directory doesn't declare SVG support because it has not yet been updated by host-librsvg - or a dynamic path corresponding to the binary location if relocatable is enabled. So obviously, we need to set relocatable to true. Fixes: - http://autobuild.buildroot.org/results/0e00059b09b4445eaaec1030997883187c6a80d6 Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2 (after review of Yann E. Morin): - Drop relocatable from target - Enhance commit message package/gdk-pixbuf/gdk-pixbuf.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk index cd30d450d5..b22e9568c9 100644 --- a/package/gdk-pixbuf/gdk-pixbuf.mk +++ b/package/gdk-pixbuf/gdk-pixbuf.mk @@ -26,6 +26,7 @@ HOST_GDK_PIXBUF_CONF_OPTS = \ -Dgio_sniffing=false \ -Dinstalled_tests=false \ -Dintrospection=disabled \ + -Drelocatable=true \ -Dman=false ifeq ($(BR2_STATIC_LIBS),y) -- 2.34.1 From fontaine.fabrice at gmail.com Sun Feb 20 12:16:37 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 20 Feb 2022 13:16:37 +0100 Subject: [Buildroot] [PATCH v2, 2/2] package/librsvg: fix loaders.cache with with per-package directories In-Reply-To: <20220220121637.200393-1-fontaine.fabrice@gmail.com> References: <20220220121637.200393-1-fontaine.fabrice@gmail.com> Message-ID: <20220220121637.200393-2-fontaine.fabrice@gmail.com> host-librsvg invokes the gdk-pixbuf-queryloaders to update loaders.cache (which is originally built by host-gdk-pixbuf). loaders.cache contains the list of all the gdk-pixbuf modules; that includes paths to dlopen()ed shared libs. host-librsvg must update this file to add the path to its SVG shared library. By default, gdk-pixbuf-queryloaders uses a hardcoded path to find the installed shared libs and this path will point to the location of the host-gdk-pixbuf per-package directory. Obviously, this is wrong, the SVG library installed by host-librsvg is installed in its own per-package directory. So set GDK_PIXBUF_MODULEDIR to gdk_pixbuf_moduledir before calling gdk-pixbuf-query-loaders to build a correct loaders.cache. gdk_pixbuf_moduledir is already retrieved from host-pkgconfig in configure.ac and so will point to the correct location (thanks to PPD_FIXUP_PATHS). After this update, the loaders.cache will be correctly updated in host-librsvg per-package directory and so the loaders.cache installed in adwaita-icon-theme per-package directory will also be correct (thanks to PPD_FIXUP_PATHS). This will fix the following PPD build failure of adwaita-icon-theme: Can't load file: Unrecognized image file format Fixes: - http://autobuild.buildroot.org/results/0e00059b09b4445eaaec1030997883187c6a80d6 Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2 (after review of Yann E. Morin): - Enhance commit message - Add patch upstream status ...r-Makefile.am-set-GDK_PIXBUF_MODULED.patch | 41 +++++++++++++++++++ package/librsvg/librsvg.mk | 2 + 2 files changed, 43 insertions(+) create mode 100644 package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch diff --git a/package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch b/package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch new file mode 100644 index 0000000000..761ff92605 --- /dev/null +++ b/package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch @@ -0,0 +1,41 @@ +From 2c472bf55289ccbd7f305aa3e98d6fd70be4e3ab Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 19 Feb 2022 12:02:10 +0100 +Subject: [PATCH] gdk-pixbuf-loader/Makefile.am: set GDK_PIXBUF_MODULEDIR + +Set GDK_PIXBUF_MODULEDIR to gdk_pixbuf_moduledir before calling +gdk-pixbuf-query-loaders to build a correct gdk_pixbuf_cache_file and +gdk-pixbuf.loaders on 'exotic' systems + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/668] +--- + gdk-pixbuf-loader/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gdk-pixbuf-loader/Makefile.am b/gdk-pixbuf-loader/Makefile.am +index c3493736..de1f9641 100644 +--- a/gdk-pixbuf-loader/Makefile.am ++++ b/gdk-pixbuf-loader/Makefile.am +@@ -49,7 +49,7 @@ rsvg_loader_LDADD = \ + EXTRA_rsvg_loader_DEPENDENCIES = libpixbufloader-svg.la gdk-pixbuf-loaders + + gdk-pixbuf-loaders: Makefile +- $(AM_V_GEN) ( $(GDK_PIXBUF_QUERYLOADERS) ./libpixbufloader-svg.la && $(GDK_PIXBUF_QUERYLOADERS)) > gdk-pixbuf.loaders 2>/dev/null ++ $(AM_V_GEN) ( $(GDK_PIXBUF_QUERYLOADERS) ./libpixbufloader-svg.la && GDK_PIXBUF_MODULEDIR=$(gdk_pixbuf_moduledir) $(GDK_PIXBUF_QUERYLOADERS)) > gdk-pixbuf.loaders 2>/dev/null + + if CROSS_COMPILING + RUN_QUERY_LOADER_TEST=false +@@ -68,7 +68,7 @@ endif + install-data-hook: + @if $(RUN_QUERY_LOADER_TEST) ; then \ + $(mkinstalldirs) $(DESTDIR)$(gdk_pixbuf_binarydir) ; \ +- $(GDK_PIXBUF_QUERYLOADERS) > $(DESTDIR)$(gdk_pixbuf_cache_file) ; \ ++ GDK_PIXBUF_MODULEDIR=$(gdk_pixbuf_moduledir) $(GDK_PIXBUF_QUERYLOADERS) > $(DESTDIR)$(gdk_pixbuf_cache_file) ; \ + else \ + echo "***" ; \ + echo "*** Warning: loaders.cache not built" ; \ +-- +2.34.1 + diff --git a/package/librsvg/librsvg.mk b/package/librsvg/librsvg.mk index e4b1942b79..07a14b4366 100644 --- a/package/librsvg/librsvg.mk +++ b/package/librsvg/librsvg.mk @@ -20,6 +20,8 @@ HOST_LIBRSVG_DEPENDENCIES = host-cairo host-gdk-pixbuf host-libglib2 host-libxml LIBRSVG_LICENSE = LGPL-2.1+ LIBRSVG_LICENSE_FILES = COPYING.LIB LIBRSVG_CPE_ID_VENDOR = gnome +# We're patching gdk-pixbuf-loader/Makefile.am +LIBRSVG_AUTORECONF = YES ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) LIBRSVG_CONF_OPTS += --enable-introspection -- 2.34.1 From mohd.faiz.rohani at gmail.com Sun Feb 20 12:45:34 2022 From: mohd.faiz.rohani at gmail.com (Mohd Faiz Rohani) Date: Sun, 20 Feb 2022 20:45:34 +0800 Subject: [Buildroot] Issue with login In-Reply-To: <893D1C4B-6F6D-4F58-A77C-C71AFED67270@benettiengineering.com> References: <893D1C4B-6F6D-4F58-A77C-C71AFED67270@benettiengineering.com> Message-ID: Hi Giulio, Yes I have used root as a user. unfortunately i didn't set the path to the users tables. Could this be a problem? If so, where to set them? I understand that the users list are kept in paswd file correct? Thanks On Sun, Feb 20, 2022 at 7:43 PM Giulio Benetti < giulio.benetti at benettiengineering.com> wrote: > Hi Mohd, > > have you used root as user? Or did you provide a user table? > > Giulio > > Inviato da iPhone > > > Il giorno 20 feb 2022, alle ore 11:57, Mohd Faiz Rohani < > mohd.faiz.rohani at gmail.com> ha scritto: > > > > ? > > Hi guys, > > > > I managed to compile with success the Uboot(U-Boot 2019.04), Linux > kernel(4.4.155)and root file system(systemd 249) using the > Buildroot-2021.11.1. It was able to boot successfully until the login > prompt. However, it seems like there is an error with the login prompt it > does not want to enter, just looping around the login prompt after I have > entered the login name (not showing the password prompt). Did anyone know > about this? > > > > Thanks. > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From giulio.benetti at benettiengineering.com Sun Feb 20 12:55:19 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 20 Feb 2022 13:55:19 +0100 Subject: [Buildroot] Issue with login In-Reply-To: References: Message-ID: Hi Mohd, > Il giorno 20 feb 2022, alle ore 13:46, Mohd Faiz Rohani ha scritto: > > ? > Hi Giulio, > > Yes I have used root as a user. unfortunately i didn't set the path to the users tables. Could this be a problem? If so, where to set them? I understand that the users list are kept in paswd file correct? Before getting to users table let?s check why root doesn?t work. Have you tried issuing: root And no password at all and press ?enter? key? It?s pretty strange it doesn?t work Giulio > > Thanks > >> On Sun, Feb 20, 2022 at 7:43 PM Giulio Benetti wrote: >> Hi Mohd, >> >> have you used root as user? Or did you provide a user table? >> >> Giulio >> >> Inviato da iPhone >> >> > Il giorno 20 feb 2022, alle ore 11:57, Mohd Faiz Rohani ha scritto: >> > >> > ? >> > Hi guys, >> > >> > I managed to compile with success the Uboot(U-Boot 2019.04), Linux kernel(4.4.155)and root file system(systemd 249) using the Buildroot-2021.11.1. It was able to boot successfully until the login prompt. However, it seems like there is an error with the login prompt it does not want to enter, just looping around the login prompt after I have entered the login name (not showing the password prompt). Did anyone know about this? >> > >> > Thanks. >> > _______________________________________________ >> > buildroot mailing list >> > buildroot at buildroot.org >> > https://lists.buildroot.org/mailman/listinfo/buildroot >> -------------- next part -------------- An HTML attachment was scrubbed... URL: From mohd.faiz.rohani at gmail.com Sun Feb 20 13:08:03 2022 From: mohd.faiz.rohani at gmail.com (Mohd Faiz Rohani) Date: Sun, 20 Feb 2022 21:08:03 +0800 Subject: [Buildroot] Issue with login In-Reply-To: References: Message-ID: Yes I have tried putting root as the login, but still not working. I have tried both conditions, with password set as well as no password set in the Buildroot menuconfig and recompile. But the results are the same. I even disabled the login prompt options, but when I running the board login prompt keep coming. Fyi i have used the gcc-linaro-7.5.0-2019 toolchain in ubuntu 20.04. On Sun, Feb 20, 2022, 8:55 PM Giulio Benetti < giulio.benetti at benettiengineering.com> wrote: > Hi Mohd, > > Il giorno 20 feb 2022, alle ore 13:46, Mohd Faiz Rohani < > mohd.faiz.rohani at gmail.com> ha scritto: > > ? > Hi Giulio, > > Yes I have used root as a user. unfortunately i didn't set the path to the > users tables. Could this be a problem? If so, where to set them? I > understand that the users list are kept in paswd file correct? > > > Before getting to users table let?s check why root doesn?t work. > > Have you tried issuing: > root > And no password at all and press ?enter? key? > > It?s pretty strange it doesn?t work > > Giulio > > > Thanks > > On Sun, Feb 20, 2022 at 7:43 PM Giulio Benetti < > giulio.benetti at benettiengineering.com> wrote: > >> Hi Mohd, >> >> have you used root as user? Or did you provide a user table? >> >> Giulio >> >> Inviato da iPhone >> >> > Il giorno 20 feb 2022, alle ore 11:57, Mohd Faiz Rohani < >> mohd.faiz.rohani at gmail.com> ha scritto: >> > >> > ? >> > Hi guys, >> > >> > I managed to compile with success the Uboot(U-Boot 2019.04), Linux >> kernel(4.4.155)and root file system(systemd 249) using the >> Buildroot-2021.11.1. It was able to boot successfully until the login >> prompt. However, it seems like there is an error with the login prompt it >> does not want to enter, just looping around the login prompt after I have >> entered the login name (not showing the password prompt). Did anyone know >> about this? >> > >> > Thanks. >> > _______________________________________________ >> > buildroot mailing list >> > buildroot at buildroot.org >> > https://lists.buildroot.org/mailman/listinfo/buildroot >> >> -------------- next part -------------- An HTML attachment was scrubbed... URL: From giulio.benetti at benettiengineering.com Sun Feb 20 13:25:34 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 20 Feb 2022 14:25:34 +0100 Subject: [Buildroot] Issue with login In-Reply-To: References: Message-ID: <186B6238-5452-4211-BD9D-29A3C921DE42@benettiengineering.com> > Il giorno 20 feb 2022, alle ore 14:08, Mohd Faiz Rohani ha scritto: > > ? > > Yes I have tried putting root as the login, but still not working. I have tried both conditions, with password set as well as no password set in the Buildroot menuconfig and recompile. But the results are the same. I even disabled the login prompt options, but when I running the board login prompt keep coming. Fyi i have used the gcc-linaro-7.5.0-2019 toolchain in ubuntu 20.04. Mmh, can you provide your defconfig? Please create it with: $ make savedefconfig you should find a defconfig in your Buildroot folder and pastebin it so we can reproduce it(maybe). By the way, why are you using such old toolchain? And AFAIK Buildroot 2021.11.1 shouldn?t provide it as external toolchain, so this means you have provided it and its specific options, so maybe there some mistake there. Have you instead tried building using the Buildroot toolchain? Linux 4.4.* should work ok with more recent toolchain versions. Best regards Giulio > > >> On Sun, Feb 20, 2022, 8:55 PM Giulio Benetti wrote: >> Hi Mohd, >> >>>> Il giorno 20 feb 2022, alle ore 13:46, Mohd Faiz Rohani ha scritto: >>>> >>> ? >>> Hi Giulio, >>> >>> Yes I have used root as a user. unfortunately i didn't set the path to the users tables. Could this be a problem? If so, where to set them? I understand that the users list are kept in paswd file correct? >> >> Before getting to users table let?s check why root doesn?t work. >> >> Have you tried issuing: >> root >> And no password at all and press ?enter? key? >> >> It?s pretty strange it doesn?t work >> >> Giulio >> >>> >>> Thanks >>> >>>> On Sun, Feb 20, 2022 at 7:43 PM Giulio Benetti wrote: >>>> Hi Mohd, >>>> >>>> have you used root as user? Or did you provide a user table? >>>> >>>> Giulio >>>> >>>> Inviato da iPhone >>>> >>>> > Il giorno 20 feb 2022, alle ore 11:57, Mohd Faiz Rohani ha scritto: >>>> > >>>> > ? >>>> > Hi guys, >>>> > >>>> > I managed to compile with success the Uboot(U-Boot 2019.04), Linux kernel(4.4.155)and root file system(systemd 249) using the Buildroot-2021.11.1. It was able to boot successfully until the login prompt. However, it seems like there is an error with the login prompt it does not want to enter, just looping around the login prompt after I have entered the login name (not showing the password prompt). Did anyone know about this? >>>> > >>>> > Thanks. >>>> > _______________________________________________ >>>> > buildroot mailing list >>>> > buildroot at buildroot.org >>>> > https://lists.buildroot.org/mailman/listinfo/buildroot >>>> -------------- next part -------------- An HTML attachment was scrubbed... URL: From mohd.faiz.rohani at gmail.com Sun Feb 20 14:01:35 2022 From: mohd.faiz.rohani at gmail.com (Mohd Faiz Rohani) Date: Sun, 20 Feb 2022 22:01:35 +0800 Subject: [Buildroot] Issue with login In-Reply-To: <186B6238-5452-4211-BD9D-29A3C921DE42@benettiengineering.com> References: <186B6238-5452-4211-BD9D-29A3C921DE42@benettiengineering.com> Message-ID: kindly please find the attached. I'm having a problem downloading the new version from the Linaro website so I just used the version that I have. Basically I'm new to Buildroot and learning it for the moment through Udemy. I will try the Buildroot toolchain now to see if the same problem arises. Thanks On Sun, Feb 20, 2022 at 9:25 PM Giulio Benetti < giulio.benetti at benettiengineering.com> wrote: > > Il giorno 20 feb 2022, alle ore 14:08, Mohd Faiz Rohani < > mohd.faiz.rohani at gmail.com> ha scritto: > > ? > > Yes I have tried putting root as the login, but still not working. I have > tried both conditions, with password set as well as no password set in the > Buildroot menuconfig and recompile. But the results are the same. I even > disabled the login prompt options, but when I running the board login > prompt keep coming. Fyi i have used the gcc-linaro-7.5.0-2019 toolchain in > ubuntu 20.04. > > > Mmh, can you provide your defconfig? > Please create it with: > $ make savedefconfig > you should find a defconfig in your Buildroot folder and pastebin it so we > can reproduce it(maybe). > > By the way, why are you using such old toolchain? > And AFAIK Buildroot 2021.11.1 shouldn?t provide it as external toolchain, > so this means you have provided it and its specific options, so maybe there > some mistake there. > Have you instead tried building using the Buildroot toolchain? > > Linux 4.4.* should work ok with more recent toolchain versions. > > Best regards > Giulio > > > > On Sun, Feb 20, 2022, 8:55 PM Giulio Benetti < > giulio.benetti at benettiengineering.com> wrote: > >> Hi Mohd, >> >> Il giorno 20 feb 2022, alle ore 13:46, Mohd Faiz Rohani < >> mohd.faiz.rohani at gmail.com> ha scritto: >> >> ? >> Hi Giulio, >> >> Yes I have used root as a user. unfortunately i didn't set the path to >> the users tables. Could this be a problem? If so, where to set them? I >> understand that the users list are kept in paswd file correct? >> >> >> Before getting to users table let?s check why root doesn?t work. >> >> Have you tried issuing: >> root >> And no password at all and press ?enter? key? >> >> It?s pretty strange it doesn?t work >> >> Giulio >> >> >> Thanks >> >> On Sun, Feb 20, 2022 at 7:43 PM Giulio Benetti < >> giulio.benetti at benettiengineering.com> wrote: >> >>> Hi Mohd, >>> >>> have you used root as user? Or did you provide a user table? >>> >>> Giulio >>> >>> Inviato da iPhone >>> >>> > Il giorno 20 feb 2022, alle ore 11:57, Mohd Faiz Rohani < >>> mohd.faiz.rohani at gmail.com> ha scritto: >>> > >>> > ? >>> > Hi guys, >>> > >>> > I managed to compile with success the Uboot(U-Boot 2019.04), Linux >>> kernel(4.4.155)and root file system(systemd 249) using the >>> Buildroot-2021.11.1. It was able to boot successfully until the login >>> prompt. However, it seems like there is an error with the login prompt it >>> does not want to enter, just looping around the login prompt after I have >>> entered the login name (not showing the password prompt). Did anyone know >>> about this? >>> > >>> > Thanks. >>> > _______________________________________________ >>> > buildroot mailing list >>> > buildroot at buildroot.org >>> > https://lists.buildroot.org/mailman/listinfo/buildroot >>> >>> -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: config Type: application/octet-stream Size: 109845 bytes Desc: not available URL: From havran.jan at email.cz Sun Feb 20 14:08:11 2022 From: havran.jan at email.cz (Jan Havran) Date: Sun, 20 Feb 2022 15:08:11 +0100 Subject: [Buildroot] [PATCH 1/1] package/rtklib: new package Message-ID: RTKLIB is an open source program package for standard and precise positioning with GNSS. Version used here is from rtkexplorer, which is better optimized and more frequently updated than original version by Tomoji Takasu. Signed-off-by: Jan Havran --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/rtklib/Config.in | 38 ++++++++++++++++++++++++++++++++++++++ package/rtklib/rtklib.hash | 3 +++ package/rtklib/rtklib.mk | 31 +++++++++++++++++++++++++++++++ 5 files changed, 76 insertions(+) create mode 100644 package/rtklib/Config.in create mode 100644 package/rtklib/rtklib.hash create mode 100644 package/rtklib/rtklib.mk diff --git a/DEVELOPERS b/DEVELOPERS index 91e9060ac5..8d7eb2c268 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1356,6 +1356,9 @@ F: package/pangomm/ F: package/rpm/ F: package/yad/ +N: Jan Havran +F: package/rtklib/ + N: Jan Heylen F: package/opentracing-cpp/ diff --git a/package/Config.in b/package/Config.in index 9a8196efe2..b38c33d543 100644 --- a/package/Config.in +++ b/package/Config.in @@ -561,6 +561,7 @@ endmenu source "package/rpi-userland/Config.in" source "package/rs485conf/Config.in" source "package/rtc-tools/Config.in" + source "package/rtklib/Config.in" source "package/rtl8188eu/Config.in" source "package/rtl8189es/Config.in" source "package/rtl8189fs/Config.in" diff --git a/package/rtklib/Config.in b/package/rtklib/Config.in new file mode 100644 index 0000000000..dc694d6b7d --- /dev/null +++ b/package/rtklib/Config.in @@ -0,0 +1,38 @@ +comment "rtklib needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS + +config BR2_PACKAGE_RTKLIB + bool "rtklib" + depends on BR2_TOOLCHAIN_HAS_THREADS + help + RTKLIB is an open source program package for standard and + precise positioning with GNSS (global navigation satellite + system). + + This is a version of RTKLIB optimized for single and dual + frequency low cost GPS receivers, especially u-blox receivers. + + https://rtkexplorer.com/ + +if BR2_PACKAGE_RTKLIB + +config BR2_PACKAGE_RTKLIB_CONVBIN + bool "convbin" + +config BR2_PACKAGE_RTKLIB_POS2KML + bool "pos2kml" + +comment "rnx2rtkp needs Fortran" + depends on !BR2_TOOLCHAIN_HAS_FORTRAN + +config BR2_PACKAGE_RTKLIB_RNX2RTKP + bool "rnx2rtkp" + depends on BR2_TOOLCHAIN_HAS_FORTRAN + +config BR2_PACKAGE_RTKLIB_RTKRCV + bool "rtkrcv" + +config BR2_PACKAGE_RTKLIB_STR2STR + bool "str2str" + +endif diff --git a/package/rtklib/rtklib.hash b/package/rtklib/rtklib.hash new file mode 100644 index 0000000000..faed92243b --- /dev/null +++ b/package/rtklib/rtklib.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 735d43939ae08b0da64d75afe5750bc983032144c5622e620eee987508946fc5 rtklib-b34e.tar.gz +sha256 219747832d49ee958457b2934080ab8d94bd9d8e45fcb1c36f89776fd2c5ed8a license.txt diff --git a/package/rtklib/rtklib.mk b/package/rtklib/rtklib.mk new file mode 100644 index 0000000000..421cdddfcd --- /dev/null +++ b/package/rtklib/rtklib.mk @@ -0,0 +1,31 @@ +################################################################################ +# +# rtklib +# +################################################################################ + +RTKLIB_VERSION = b34e +RTKLIB_SITE = $(call github,rtklibexplorer,RTKLIB,$(RTKLIB_VERSION)) +RTKLIB_LICENSE = BSD-2-Clause +RTKLIB_LICENSE_FILES = license.txt + +RTKLIB_APPS += $(if $(BR2_PACKAGE_RTKLIB_CONVBIN),convbin,) +RTKLIB_APPS += $(if $(BR2_PACKAGE_RTKLIB_POS2KML),pos2kml,) +RTKLIB_APPS += $(if $(BR2_PACKAGE_RTKLIB_RNX2RTKP),rnx2rtkp,) +RTKLIB_APPS += $(if $(BR2_PACKAGE_RTKLIB_RTKRCV),rtkrcv,) +RTKLIB_APPS += $(if $(BR2_PACKAGE_RTKLIB_STR2STR),str2str,) + +define RTKLIB_BUILD_CMDS + for APP in $(RTKLIB_APPS); do \ + cd $(@D)/app/consapp/$$APP/gcc ; \ + $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" CCFLAGS="$(TARGET_CFLAGS) $(TARGET_LDFLAGS)" ; \ + done +endef + +define RTKLIB_INSTALL_TARGET_CMDS + for APP in $(RTKLIB_APPS); do \ + $(INSTALL) -m 0755 $(@D)/app/consapp/$$APP/gcc/$$APP $(TARGET_DIR)/usr/bin/$$APP ; \ + done +endef + +$(eval $(generic-package)) -- 2.35.1 From fontaine.fabrice at gmail.com Sun Feb 20 14:38:45 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 20 Feb 2022 15:38:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/apr-util: drop APR_UTIL_FIX_{LIBTOOL, RULES_MK} In-Reply-To: <20220220100846.GU522310@scaer> References: <20220219142104.3753374-1-fontaine.fabrice@gmail.com> <20220220100846.GU522310@scaer> Message-ID: Hi Yann, Le dim. 20 f?vr. 2022 ? 11:08, Yann E. MORIN a ?crit : > > Fabrice, All, > > On 2022-02-19 15:21 +0100, Fabrice Fontaine spake thusly: > > Drop APR_UTIL_FIX_{LIBTOOL,RULES_MK} which were added by commit > > 84b4c19e551288911a230c2b73e96bc6e2ed12f9 but is not needed since the > > addition of PPD_FIXUP_PATHS in commit > > b06294e9897e90862656416e8b67fdace15488d7 > > > > Signed-off-by: Fabrice Fontaine > > Applied to master, thanks. > > There is still one occurence of a similar construct in qt5: > > 14 # The file "qt.conf" can be used to override the hard-coded paths that are > 15 # compiled into the Qt library. We need it to make "qmake" relocatable and > 16 # tweak the per-package install pathes > 17 define QT5_INSTALL_QT_CONF > 18 ? rm -f $(HOST_DIR)/bin/qt.conf > 19 ? sed -e "s|@@HOST_DIR@@|$(HOST_DIR)|" -e "s|@@STAGING_DIR@@|$(STAGING_DIR)|" \ > 20 ? ? $(QT5BASE_PKGDIR)/qt.conf.in > $(HOST_DIR)/bin/qt.conf > 21 endef > 22 > 23 ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) > 24 define QT5_QT_CONF_FIXUP > 25 ? $(QT5_INSTALL_QT_CONF) > 26 endef > 27 endif > > The generic fixup scans $(HOST_DIR), so it should hit this file too, no? > > QT5_QT_CONF_FIXUP is used in two locations: > > - pkg-qmake.mk -> as a post-preapare hook, which is exactly where the > generic fixup runs too, so QT5_QT_CONF_FIXUP should be a no-op > (well, it does run before the generic one). > > - python-pyqt5.mk -> as a pre-configure hook, which is incorrect > becaused it will assign that file to that package, and anyway the > generic fixup hook has already been run anyway, so this should be a > no-op. > > Care tp have a look, please? I don't really master Qt but if I understand well commit 60e3a09693703f0c923322d39ce1210baf154983, QT5_INSTALL_QT_CONF is also used to make qmake "relocatable" in qt5base.mk. So, reverting commit 60e3a09693703f0c923322d39ce1210baf154983 is probably ok. However I assume that we should keep a QT5BASE_INSTALL_QT_CONF that creates a qt.conf. Someone with better Qt knowledge could probably confirm this assumption. > > Regards, > Yann E. MORIN. > > > --- > > package/apr-util/apr-util.mk | 14 -------------- > > 1 file changed, 14 deletions(-) > > > > diff --git a/package/apr-util/apr-util.mk b/package/apr-util/apr-util.mk > > index f6ce7ac064..cf8407ced0 100644 > > --- a/package/apr-util/apr-util.mk > > +++ b/package/apr-util/apr-util.mk > > @@ -17,20 +17,6 @@ APR_UTIL_CONF_OPTS = \ > > --with-apr=$(STAGING_DIR)/usr/bin/apr-1-config > > APR_UTIL_CONFIG_SCRIPTS = apu-1-config > > > > -ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) > > -define APR_UTIL_FIX_LIBTOOL > > - $(SED) 's,$(PER_PACKAGE_DIR)/apr/,$(PER_PACKAGE_DIR)/apr-util/,g' \ > > - $(STAGING_DIR)/usr/build-1/libtool > > -endef > > -APR_UTIL_POST_PREPARE_HOOKS += APR_UTIL_FIX_LIBTOOL > > - > > -define APR_UTIL_FIX_RULES_MK > > - $(SED) 's,$(PER_PACKAGE_DIR)/apr/,$(PER_PACKAGE_DIR)/apr-util/,g' \ > > - $(@D)/build/rules.mk > > -endef > > -APR_UTIL_POST_CONFIGURE_HOOKS += APR_UTIL_FIX_RULES_MK > > -endif > > - > > # When iconv is available, then use it to provide charset conversion > > # features. > > APR_UTIL_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv) > > -- > > 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. | > '------------------------------^-------^------------------^--------------------' Best Regards, Fabrice From romain.naour at gmail.com Sun Feb 20 15:10:30 2022 From: romain.naour at gmail.com (Romain Naour) Date: Sun, 20 Feb 2022 16:10:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/luasyslog: bump to version 2.2.1 In-Reply-To: <20220217094048.2756293-1-fontaine.fabrice@gmail.com> References: <20220217094048.2756293-1-fontaine.fabrice@gmail.com> Message-ID: <9e895f60-6a7d-c40b-3106-56d8f4aa3946@gmail.com> Hello Fabrice, Le 17/02/2022 ? 10:40, Fabrice Fontaine a ?crit?: > This bump contains a single commit which fixes the following build > failure with Lua 5.4 raised since commit > 4f9a5659023c66fc166de28fd39a6c97a9490667: > > In file included from lsyslog.c:11: > compat-5.3.h:402:4: error: #error "unsupported Lua version (i.e. not Lua 5.1, 5.2, or 5.3)" > 402 | # error "unsupported Lua version (i.e. not Lua 5.1, 5.2, or 5.3)" > | ^~~~~ > > Also update indentation in hash file (two spaces) > > Fixes: > - http://autobuild.buildroot.org/results/df2aabcf2ae07cad66b869ec4ac76702d2c32dc5 It also fixes the luasyslog test: https://gitlab.com/buildroot.org/buildroot/-/jobs/2088683903 runtime tested with tests.package.test_luasyslog.TestLuaLuasyslog Reviewed-by: Romain Naour Tested-by: Romain Naour Best regards, Romain > > Signed-off-by: Fabrice Fontaine > --- > package/luasyslog/luasyslog.hash | 4 ++-- > package/luasyslog/luasyslog.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/luasyslog/luasyslog.hash b/package/luasyslog/luasyslog.hash > index bcb6a7e025..1e2a5ddec5 100644 > --- a/package/luasyslog/luasyslog.hash > +++ b/package/luasyslog/luasyslog.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 7f7dad64117407f2484ff5b53e90804f923a99fcbde5872e54f6aba53f482da0 luasyslog-2.2.0.tar.gz > -sha256 833457938f5155e65dabda12a5c9d4b6fd7fb92dd7ead584c1c30cfb0c84adf4 COPYING > +sha256 b1b19ca142130f93c3f8f2e85303ff50cc6f4ed4aa52b8569176ae56e3dc3f43 luasyslog-2.2.1.tar.gz > +sha256 833457938f5155e65dabda12a5c9d4b6fd7fb92dd7ead584c1c30cfb0c84adf4 COPYING > diff --git a/package/luasyslog/luasyslog.mk b/package/luasyslog/luasyslog.mk > index 049e068a13..972d4c5a7d 100644 > --- a/package/luasyslog/luasyslog.mk > +++ b/package/luasyslog/luasyslog.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LUASYSLOG_VERSION = 2.2.0 > +LUASYSLOG_VERSION = 2.2.1 > LUASYSLOG_SITE = $(call github,ntd,luasyslog,$(LUASYSLOG_VERSION)) > LUASYSLOG_DEPENDENCIES = host-luarocks luainterpreter > LUASYSLOG_LICENSE = MIT From fontaine.fabrice at gmail.com Sun Feb 20 15:19:44 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 20 Feb 2022 16:19:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/connman: fix build with libexecinfo Message-ID: <20220220151944.653455-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/peko/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-uclibc/10.3.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: src/backtrace.o: in function `print_backtrace': backtrace.c:(.text+0x37): undefined reference to `backtrace' Fixes: - http://autobuild.buildroot.org/results/74da4f4deab5f0ae9405d063ad52a5d4904a964d Signed-off-by: Fabrice Fontaine --- package/connman/connman.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/connman/connman.mk b/package/connman/connman.mk index 61851bd2dc..1b6fd611f5 100644 --- a/package/connman/connman.mk +++ b/package/connman/connman.mk @@ -109,4 +109,9 @@ else CONNMAN_CONF_OPTS += --disable-client endif +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +CONNMAN_DEPENDENCIES += libexecinfo +CONNMAN_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -lexecinfo" +endif + $(eval $(autotools-package)) -- 2.34.1 From peter at korsgaard.com Sun Feb 20 15:36:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 16:36:10 +0100 Subject: [Buildroot] [git commit] package/php: security bump version to 8.0.16 Message-ID: <20220220152828.6E6888345C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4c4d28922942deb0fc41d11d4057b7fedd25cab1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog: https://www.php.net/ChangeLog-8.php#8.0.16 Fixes CVE-2021-21708. Signed-off-by: Bernd Kuhls 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 e78385cbe7..2753f9a0eb 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 5f33544061d37d805a2a9ce791f081ef08a7155bd7ba2362e69bba2d06b0f8b2 php-8.0.15.tar.xz +sha256 f27a2f25259e8c51e42dfd74e24a546ee521438ad7d9f6c6e794aa91f38bab0a php-8.0.16.tar.xz # License file sha256 a188db807d711536f71e27b7d36879d63480f7994dc18adc08e624b3c5430fff LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index c9de8c2c76..5b29692d94 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.0.15 +PHP_VERSION = 8.0.16 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From peter at korsgaard.com Sun Feb 20 15:36:18 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 16:36:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/php: security bump version to 8.0.16 In-Reply-To: <20220218190233.473109-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Fri, 18 Feb 2022 20:02:33 +0100") References: <20220218190233.473109-1-bernd.kuhls@t-online.de> Message-ID: <87k0dpble5.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Changelog: https://www.php.net/ChangeLog-8.php#8.0.16 > Fixes CVE-2021-21708. > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 20 15:37:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 16:37:06 +0100 Subject: [Buildroot] [PATCH v1] package/wireless-regdb: bump version to 2022.02.18 In-Reply-To: <20220219102451.25602-1-ps.report@gmx.net> (Peter Seiderer's message of "Sat, 19 Feb 2022 11:24:51 +0100") References: <20220219102451.25602-1-ps.report@gmx.net> Message-ID: <87fsodblct.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > Changelog (since 2021.08.28, [1]): > e061299 wireless-regdb: Raise DFS TX power limit to 250 mW (24 dBm) for the US > 2ce78ed wireless-regdb: Update regulatory rules for Croatia (HR) on 6GHz > 0d39f4c wireless-regdb: Update regulatory rules for South Korea (KR) > acad231 wireless-regdb: Update regulatory rules for France (FR) on 6 and 60 GHz > ea83a82 wireless-regdb: add support for US S1G channels > 4408149 wireless-regdb: add 802.11ah bands to world regulatory domain > 5f3cadc wireless-regdb: Update regulatory rules for Spain (ES) on 6GHz > e0ac69b Revert "wireless-regdb: Update regulatory rules for South Korea (KR)" > 40e5e80 wireless-regdb: Update regulatory rules for South Korea (KR) > e427ff2 wireless-regdb: Update regulatory rules for China (CN) > 0970116 wireless-regdb: Update regulatory rules for the Netherlands (NL) on 6GHz > 4dac44b wireless-regdb: update regulatory database based on preceding changes > [1] https://lore.kernel.org/linux-wireless/YhBCKWNw3IMfGs0L at ubuntu-x1/ > Signed-off-by: Peter Seiderer Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 20 15:36:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 16:36:45 +0100 Subject: [Buildroot] [git commit] package/wireless-regdb: bump version to 2022.02.18 Message-ID: <20220220152923.5A26182A79@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=324f0552526d169c24cd75e9dadf67641f2beef0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog (since 2021.08.28, [1]): e061299 wireless-regdb: Raise DFS TX power limit to 250 mW (24 dBm) for the US 2ce78ed wireless-regdb: Update regulatory rules for Croatia (HR) on 6GHz 0d39f4c wireless-regdb: Update regulatory rules for South Korea (KR) acad231 wireless-regdb: Update regulatory rules for France (FR) on 6 and 60 GHz ea83a82 wireless-regdb: add support for US S1G channels 4408149 wireless-regdb: add 802.11ah bands to world regulatory domain 5f3cadc wireless-regdb: Update regulatory rules for Spain (ES) on 6GHz e0ac69b Revert "wireless-regdb: Update regulatory rules for South Korea (KR)" 40e5e80 wireless-regdb: Update regulatory rules for South Korea (KR) e427ff2 wireless-regdb: Update regulatory rules for China (CN) 0970116 wireless-regdb: Update regulatory rules for the Netherlands (NL) on 6GHz 4dac44b wireless-regdb: update regulatory database based on preceding changes [1] https://lore.kernel.org/linux-wireless/YhBCKWNw3IMfGs0L at ubuntu-x1/ Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/wireless-regdb/wireless-regdb.hash | 2 +- package/wireless-regdb/wireless-regdb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/wireless-regdb/wireless-regdb.hash b/package/wireless-regdb/wireless-regdb.hash index abe8f6b000..91fcb320d2 100644 --- a/package/wireless-regdb/wireless-regdb.hash +++ b/package/wireless-regdb/wireless-regdb.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/software/network/wireless-regdb/sha256sums.asc -sha256 cff370c410d1e6d316ae0a7fa8ac6278fdf1efca5d3d664aca7cfd2aafa54446 wireless-regdb-2021.08.28.tar.xz +sha256 8828c25a4ee25020044004f57374bb9deac852809fad70f8d3d01770bf9ac97f wireless-regdb-2022.02.18.tar.xz # Locally computed sha256 678b0df753c86198fc496d1f1033429bbd57f101472132ee7eaaf9f5e0a7fae1 LICENSE diff --git a/package/wireless-regdb/wireless-regdb.mk b/package/wireless-regdb/wireless-regdb.mk index 9e01283c01..35a8c6686d 100644 --- a/package/wireless-regdb/wireless-regdb.mk +++ b/package/wireless-regdb/wireless-regdb.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRELESS_REGDB_VERSION = 2021.08.28 +WIRELESS_REGDB_VERSION = 2022.02.18 WIRELESS_REGDB_SOURCE = wireless-regdb-$(WIRELESS_REGDB_VERSION).tar.xz WIRELESS_REGDB_SITE = $(BR2_KERNEL_MIRROR)/software/network/wireless-regdb WIRELESS_REGDB_LICENSE = ISC From luca at lucaceresoli.net Sun Feb 20 15:40:10 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Sun, 20 Feb 2022 16:40:10 +0100 Subject: [Buildroot] [PATCH v2] manual: board support: add instructions to test defconfig in the official docker In-Reply-To: <20220219212211.1304441-1-giulio.benetti@benettiengineering.com> References: <20220219212211.1304441-1-giulio.benetti@benettiengineering.com> Message-ID: <2003d2f6-6938-83b3-fd21-966fecf7e37b@lucaceresoli.net> Hi Giulio, On 19/02/22 22:22, Giulio Benetti wrote: > Sometimes new boards have not been tested with official docker so let's add > instructions to do it with utils/docker-run. > > Cc: Luca Ceresoli > Signed-off-by: Giulio Benetti > --- > V1->V2: > * use the available utils/docker-run > * improve explanation as suggested by Luca Ceresoli > --- > docs/manual/adding-board-support.txt | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/docs/manual/adding-board-support.txt b/docs/manual/adding-board-support.txt > index 33ed709535..074bab7a00 100644 > --- a/docs/manual/adding-board-support.txt > +++ b/docs/manual/adding-board-support.txt > @@ -46,3 +46,11 @@ create a directory +board/+ and a subdirectory > +board//+. You can then store your patches > and configurations in these directories, and reference them from the main > Buildroot configuration. Refer to xref:customize[] for more details. > + > +Before submitting patches for new boards it is recommended to test it by > +building it using latest gitlab-CI docker container. To do this use > +utils/docker-run script and inside it hint: Not sure the verb 'hint' is the correct one. I would expect "type" or "issue these commands" or similar. > +-------------------- > + $ make +_defconfig+ > + $ make > +-------------------- With that fixed: Reviewed-by: Luca Ceresoli -- Luca From thomas.petazzoni at bootlin.com Sun Feb 20 16:02:22 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Feb 2022 17:02:22 +0100 Subject: [Buildroot] Analysis of runtime test failures Message-ID: <20220220170222.06d88b45@windsurf> Hello, Six of our runtime tests are failing, so I went ahead and quickly look at the error messages. Here is my summary: === tests.package.test_ipython.TestIPythonPy3 === https://gitlab.com/buildroot.org/buildroot/-/jobs/2088684091 Error is: # ipython -c 'import math; math.floor(12.3)' -sh: ipython: not found === tests.package.test_python_pyyaml.TestPythonPy3Pyyaml === https://gitlab.com/buildroot.org/buildroot/-/jobs/2088684091 Error is: # python sample_python_pyyaml_dec.py Traceback (most recent call last): File "/root/sample_python_pyyaml_dec.py", line 5, in data = yaml.load(serialized) TypeError: load() missing 1 required positional argument: 'Loader' === tests.package.test_luasyslog.TestLuaLuasyslog === https://gitlab.com/buildroot.org/buildroot/-/jobs/2088683903 Error is: >>> luasyslog 2.2.0 Building PATH="/builds/buildroot.org/buildroot/test-output/TestLuaLuasyslog/host/bin:/builds/buildroot.org/buildroot/test-output/TestLuaLuasyslog/host/sbin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" /usr/bin/make -j33 -C /builds/buildroot.org/buildroot/test-output/TestLuaLuasyslog/build/luasyslog-2.2.0/ /usr/bin/make all-am CC lsyslog.lo CC compat-5.3.lo In file included from lsyslog.c:11: compat-5.3.h:402:4: error: #error "unsupported Lua version (i.e. not Lua 5.1, 5.2, or 5.3)" # error "unsupported Lua version (i.e. not Lua 5.1, 5.2, or 5.3)" ^~~~~ In file included from compat-5.3.c:7: compat-5.3.h:402:4: error: #error "unsupported Lua version (i.e. not Lua 5.1, 5.2, or 5.3)" # error "unsupported Lua version (i.e. not Lua 5.1, 5.2, or 5.3)" ^~~~~ make[3]: *** [Makefile:710: lsyslog.lo] Error 1 === tests.package.test_lxc.TestLxc === https://gitlab.com/buildroot.org/buildroot/-/jobs/2088683908 Error is: # lxc-start -l trace -n lxc_iperf3 -o /tmp/lxc.log -L /tmp/lxc.console.log lxc-start: lxc_iperf3: lxccontainer.c: wait_on_daemonized_start: 868 Received container state "ABORTING" instead of "RUNNING" lxc-start: lxc_iperf3: tools/lxc_start.c: main: 306 The container failed to start lxc-start: lxc_iperf3: tools/lxc_start.c: main: 309 To get more details, run the container in foreground mode lxc-start: lxc_iperf3: tools/lxc_start.c: main: 312 Additional information can be obtained by setting the --logfile and --logpriority options # echo $? === tests.package.test_rust.TestRustBin === https://gitlab.com/buildroot.org/buildroot/-/pipelines/470182758/failures Build issue while building the example Rust application: /usr/bin/ld: /tmp/tmpdggplkto-br2-testing-rust/hello-world/target/armv7-unknown-linux-gnueabihf/debug/deps/hello_world-e03f93fef10567c3.1ajq7aud2z9fxhe5.rcgu.o: error adding symbols: file in wrong format collect2: error: ld returned 1 exit status Could https://patchwork.ozlabs.org/project/buildroot/patch/20220217230638.98748-1-moritz at h6t.eu/ be related ? === tests.package.test_rust.TestRust === Same error as above. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From romain.naour at gmail.com Sun Feb 20 16:25:04 2022 From: romain.naour at gmail.com (Romain Naour) Date: Sun, 20 Feb 2022 17:25:04 +0100 Subject: [Buildroot] Analysis of runtime test failures In-Reply-To: <20220220170222.06d88b45@windsurf> References: <20220220170222.06d88b45@windsurf> Message-ID: <842a7d9b-e991-149e-c6a6-9a36b29e9ff3@gmail.com> Hello Thomas, Le 20/02/2022 ? 17:02, Thomas Petazzoni via buildroot a ?crit?: > Hello, > > Six of our runtime tests are failing, so I went ahead and quickly look > at the error messages. Here is my summary: > > === tests.package.test_ipython.TestIPythonPy3 === > > https://gitlab.com/buildroot.org/buildroot/-/jobs/2088684091 > > Error is: > > # ipython -c 'import math; math.floor(12.3)' > -sh: ipython: not found ipython use a wrong shebang on the target: # head -n 1 /usr/bin/ipython #!/home/kubu/buildroot/testsuite-master/TestIPythonPy3/host/bin/python The issue come from python3-setuptools 60.0.0 that changed SETUPTOOLS_USE_DISTUTILS [1]. This is actually a "breaking" change [2]. We have to override SETUPTOOLS_USE_DISTUTILS to the previous value "stdlib" to fixes the issue. [1] https://github.com/pypa/setuptools/commit/b6fcbbd00cb6d5607c9272dec452a50457bdb292 [2] https://github.com/pypa/setuptools/blob/v60.0.0/CHANGES.rst#breaking-changes > > === tests.package.test_python_pyyaml.TestPythonPy3Pyyaml === > > https://gitlab.com/buildroot.org/buildroot/-/jobs/2088684091 > > Error is: > > # python sample_python_pyyaml_dec.py > Traceback (most recent call last): > File "/root/sample_python_pyyaml_dec.py", line 5, in > data = yaml.load(serialized) > TypeError: load() missing 1 required positional argument: 'Loader' "PyYAML 6.0 load() function requires Loader argument" https://github.com/yaml/pyyaml/issues/576 "Warning: It is not safe to call yaml.load with any data received from an untrusted source! yaml.load is as powerful as pickle.load and so may call any Python function. Check the yaml.safe_load function though." https://pyyaml.org/wiki/PyYAMLDocumentation We can simply fixes the issue by using yaml.safe_load(serialized) > > === tests.package.test_luasyslog.TestLuaLuasyslog === > > https://gitlab.com/buildroot.org/buildroot/-/jobs/2088683903 > > Error is: > >>>> luasyslog 2.2.0 Building > PATH="/builds/buildroot.org/buildroot/test-output/TestLuaLuasyslog/host/bin:/builds/buildroot.org/buildroot/test-output/TestLuaLuasyslog/host/sbin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" /usr/bin/make -j33 -C /builds/buildroot.org/buildroot/test-output/TestLuaLuasyslog/build/luasyslog-2.2.0/ > /usr/bin/make all-am > CC lsyslog.lo > CC compat-5.3.lo > In file included from lsyslog.c:11: > compat-5.3.h:402:4: error: #error "unsupported Lua version (i.e. not Lua 5.1, 5.2, or 5.3)" > # error "unsupported Lua version (i.e. not Lua 5.1, 5.2, or 5.3)" > ^~~~~ > In file included from compat-5.3.c:7: > compat-5.3.h:402:4: error: #error "unsupported Lua version (i.e. not Lua 5.1, 5.2, or 5.3)" > # error "unsupported Lua version (i.e. not Lua 5.1, 5.2, or 5.3)" > ^~~~~ > make[3]: *** [Makefile:710: lsyslog.lo] Error 1 Fixed by: http://patchwork.ozlabs.org/project/buildroot/patch/20220217094048.2756293-1-fontaine.fabrice at gmail.com/ > > === tests.package.test_lxc.TestLxc === > > https://gitlab.com/buildroot.org/buildroot/-/jobs/2088683908 > > Error is: > > # lxc-start -l trace -n lxc_iperf3 -o /tmp/lxc.log -L /tmp/lxc.console.log > lxc-start: lxc_iperf3: lxccontainer.c: wait_on_daemonized_start: 868 Received container state "ABORTING" instead of "RUNNING" > lxc-start: lxc_iperf3: tools/lxc_start.c: main: 306 The container failed to start > lxc-start: lxc_iperf3: tools/lxc_start.c: main: 309 To get more details, run the container in foreground mode > lxc-start: lxc_iperf3: tools/lxc_start.c: main: 312 Additional information can be obtained by setting the --logfile and --logpriority options > # echo $? See: http://lists.busybox.net/pipermail/buildroot/2022-January/635251.html We can upgrade the kernel used by the test but upstream added a regression while adding features in the stable branch 4.0.x https://github.com/lxc/lxc/commit/be606e16fd0fa967219d890745a425625eafe251 > > === tests.package.test_rust.TestRustBin === > > https://gitlab.com/buildroot.org/buildroot/-/pipelines/470182758/failures > > Build issue while building the example Rust application: > > /usr/bin/ld: /tmp/tmpdggplkto-br2-testing-rust/hello-world/target/armv7-unknown-linux-gnueabihf/debug/deps/hello_world-e03f93fef10567c3.1ajq7aud2z9fxhe5.rcgu.o: error adding symbols: file in wrong format > collect2: error: ld returned 1 exit status > > Could > https://patchwork.ozlabs.org/project/buildroot/patch/20220217230638.98748-1-moritz at h6t.eu/ > be related ? I'm not sure, but the test doesn't use the cargo package infrastructure. I suggest to rework the test to use bat or ripgrep package. Best regards, Romain > > === tests.package.test_rust.TestRust === > > Same error as above. > > Best regards, > > Thomas From bonet at grenoble.cnrs.fr Sun Feb 20 16:18:58 2022 From: bonet at grenoble.cnrs.fr (Edgar Bonet) Date: Sun, 20 Feb 2022 17:18:58 +0100 Subject: [Buildroot] Issue with login In-Reply-To: References: <186B6238-5452-4211-BD9D-29A3C921DE42@benettiengineering.com> Message-ID: <469c0dbc-6101-be6c-7272-400ac4512b86@grenoble.cnrs.fr> Hi! In his config file, Mohd wrote: > BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_10=y > BR2_LINUX_KERNEL_VERSION="4.4.155" This may cause problems. C.f. docs/manual/configure.txt: If you use kernel headers that are more recent than the Linux kernel you run on your embedded system, then the C library might be using interfaces that are not provided by your Linux kernel. In the same config file, there is: > # BR2_PACKAGE_BUSYBOX is not set When disabling busybox, you should have seen the message: You may need to enable other packages to get a working system You better know what you're doing! And then: > # BR2_PACKAGE_SYSTEMD_LOGIND is not set > # BR2_PACKAGE_UTIL_LINUX_LOGIN is not set Looks like there is no `login' program to let you in. You are probably only seeing the "login" prompt from getty, but then getty cannot spawn login. Regards, Edgar Bonet. From michael at amarulasolutions.com Sun Feb 20 17:05:07 2022 From: michael at amarulasolutions.com (Michael Nazzareno Trimarchi) Date: Sun, 20 Feb 2022 18:05:07 +0100 Subject: [Buildroot] imx8 common script problem Message-ID: HI all I found that in order to generate a correct flash.bin image, the script at the moment are broken at least for imx8mn. It works only with this change ${HOST_DIR}/bin/mkimage_imx8 -fit -loader ${BINARIES_DIR}/u-boot-spl-ddr.bin 0x7E1000 -second_loader ${BIN ARIES_DIR}/u-boot.itb 0x40200000 0x60000 -out ${BINARIES_DIR}/imx8-boot-sd.bin elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN=y$" ${BR2_CONFIG}; then - cat ${BINARIES_DIR}/u-boot-spl.bin ${BINARIES_DIR}/ddr_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin + dd if=${BINARIES_DIR}/u-boot-spl.bin of=${BINARIES_DIR}/u-boot-spl-pad.bin bs=4 conv=sync + cat ${BINARIES_DIR}/u-boot-spl-pad.bin ${BINARIES_DIR}/ddr_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot-nodtb.bin ATF_LOAD_ADDR=0x00960000 ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its ${HOST_DIR}/bin/mkimage -E -p 0x3000 -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb - rm -f ${BINARIES_DIR}/u-boot.its + #rm -f ${BINARIES_DIR}/u-boot.its The padding seems correct even in the origina soc.mk of imx tools. Can anyone comment? Michael -- 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 Sun Feb 20 17:21:59 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 20 Feb 2022 18:21:59 +0100 Subject: [Buildroot] Issue with login In-Reply-To: References: <186B6238-5452-4211-BD9D-29A3C921DE42@benettiengineering.com> Message-ID: Hi Mohd, On 20/02/22 15:01, Mohd Faiz Rohani wrote: > kindly please find the attached. Next time please use https://pastebin.com/ > I'm having a problem downloading the > new version from the Linaro website so I just used the version that I > have. It's still available here: https://releases.linaro.org/components/toolchain/binaries/latest-7/arm-linux-gnueabihf/ > Basically I'm new to Buildroot and learning it for the moment > through Udemy. I don't know which course you're following, but as I can understand from your defconfig is that you're using a beaglebone board. /media/faiz/LinuxData/Documents/BBB1/buildroot-2021.11.1/configs/beaglebone_defconfig > I will try the Buildroot toolchain now to see if the same > problem arises. Yes, please. Below you've mentioned you're using systemd as Init System, but it's not true, you're using Busybox: BR2_INIT_BUSYBOX=y What I can suggest you is to begin from scratch by using the already present beaglebone_defconfig or beaglebone_qt5_defconfig, those are maintained and should work out of the shelf. And from there on I would try to tweak buildroot. I don't have a beaglebone board here, so I can't test it, but I've managed to build your defconfig successfully. But it's difficult to help for me :-/ The point is, do you really need to use that specific defconfig or can you go with the configs/beaglebone_defconfig? That way you could also help us to update those very old linux/uboot versions by sending patches for all beagleboard defconfigs. What about becoming a Buildroot contributor? :-) Best regards -- Giulio Benetti Benetti Engineering sas > Thanks > > On Sun, Feb 20, 2022 at 9:25 PM Giulio Benetti > > wrote: > > >> Il giorno 20 feb 2022, alle ore 14:08, Mohd Faiz Rohani >> > >> ha scritto: >> >> ? >> >> Yes I have tried putting root as the login, but still not >> working.? I have tried both conditions, with password set as well >> as no password set in the Buildroot menuconfig and recompile. But >> the results are the same. I even disabled the login prompt >> options, but when I running the board login prompt keep coming. >> Fyi? i have used the gcc-linaro-7.5.0-2019 toolchain in ubuntu 20.04. > > Mmh, can you provide your defconfig? > Please create it with: > $ make savedefconfig > you should find a defconfig in your Buildroot folder and pastebin it > so we can reproduce it(maybe). > > By the way, why are you using such old toolchain? > And AFAIK Buildroot 2021.11.1 shouldn?t provide it as external > toolchain, so this means you have provided it and its specific > options, so maybe there some mistake there. > Have you instead tried building using the Buildroot toolchain? > > Linux 4.4.* should work ok with more recent toolchain versions. > > Best regards > Giulio > >> >> >> On Sun, Feb 20, 2022, 8:55 PM Giulio Benetti >> > > wrote: >> >> Hi Mohd, >> >>> Il giorno 20 feb 2022, alle ore 13:46, Mohd Faiz Rohani >>> >> > ha scritto: >>> >>> ? >>> Hi?Giulio, >>> >>> Yes I have used root as a user. unfortunately i didn't?set >>> the path to the users tables. Could this be a problem? If so, >>> where to set them? I understand that the users list are kept >>> in paswd?file correct? >> >> Before getting to users table let?s check why root doesn?t work. >> >> Have you tried issuing: >> root >> And no password at all and press ?enter? key? >> >> It?s pretty strange it doesn?t work >> >> Giulio >> >>> >>> Thanks >>> >>> On Sun, Feb 20, 2022 at 7:43 PM Giulio Benetti >>> >> > wrote: >>> >>> Hi Mohd, >>> >>> have you used root as user? Or did you provide a user table? >>> >>> Giulio >>> >>> Inviato da iPhone >>> >>> > Il giorno 20 feb 2022, alle ore 11:57, Mohd Faiz Rohani >>> >> > ha scritto: >>> > >>> > ? >>> > Hi guys, >>> > >>> > I managed to compile with success the Uboot(U-Boot >>> 2019.04), Linux kernel(4.4.155)and root file >>> system(systemd 249) using the Buildroot-2021.11.1. It was >>> able to boot successfully until the login prompt. >>> However, it seems like there is an error with the login >>> prompt it does not want to enter, just looping around the >>> login prompt after I have entered the login name (not >>> showing the password prompt). Did anyone know about this? >>> > >>> > Thanks. >>> > _______________________________________________ >>> > buildroot mailing list >>> > buildroot at buildroot.org >>> > https://lists.buildroot.org/mailman/listinfo/buildroot >>> >>> From giulio.benetti at benettiengineering.com Sun Feb 20 17:36:48 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 20 Feb 2022 18:36:48 +0100 Subject: [Buildroot] imx8 common script problem In-Reply-To: References: Message-ID: <1d826e4c-b6ee-0caf-901a-97cd9755e188@benettiengineering.com> Hi Michael, Stephan, All, On 20/02/22 18:05, Michael Nazzareno Trimarchi wrote: > HI all > > I found that in order to generate a correct flash.bin image, the > script at the moment are broken at least for imx8mn. It works only > with this change > > ${HOST_DIR}/bin/mkimage_imx8 -fit -loader > ${BINARIES_DIR}/u-boot-spl-ddr.bin 0x7E1000 -second_loader ${BIN > ARIES_DIR}/u-boot.itb 0x40200000 0x60000 -out ${BINARIES_DIR}/imx8-boot-sd.bin > elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN=y$" > ${BR2_CONFIG}; then > - cat ${BINARIES_DIR}/u-boot-spl.bin > ${BINARIES_DIR}/ddr_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin > + dd if=${BINARIES_DIR}/u-boot-spl.bin > of=${BINARIES_DIR}/u-boot-spl-pad.bin bs=4 conv=sync > + cat ${BINARIES_DIR}/u-boot-spl-pad.bin > ${BINARIES_DIR}/ddr_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin > BL31=${BINARIES_DIR}/bl31.bin > BL33=${BINARIES_DIR}/u-boot-nodtb.bin ATF_LOAD_ADDR=0x00960000 > ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > > ${BINARIES_DIR}/u-boot.its > ${HOST_DIR}/bin/mkimage -E -p 0x3000 -f > ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb > - rm -f ${BINARIES_DIR}/u-boot.its > + #rm -f ${BINARIES_DIR}/u-boot.its > > > The padding seems correct even in the origina soc.mk of imx tools. Can > anyone comment? I think the correct person to ask is Stephan that added support for: board/freescale/imx8mnevk/ configs/freescale_imx8mnevk_defconfig and he maintains him as you can find in DEVELOPERS file. Michael, can you please send a patch --in-reply= to this e-mail with these changes putting in Cc all people I've listed here? So it's easier to review it. Especially for Stephan or who else owns a board with this SoC. Unfortunately I don't have such hardware :-/ Best regards -- Giulio Benetti Benetti Engineering sas From giulio.benetti at benettiengineering.com Sun Feb 20 17:56:24 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 20 Feb 2022 18:56:24 +0100 Subject: [Buildroot] Issue with login In-Reply-To: <469c0dbc-6101-be6c-7272-400ac4512b86@grenoble.cnrs.fr> References: <186B6238-5452-4211-BD9D-29A3C921DE42@benettiengineering.com> <469c0dbc-6101-be6c-7272-400ac4512b86@grenoble.cnrs.fr> Message-ID: <4d8f6289-f16f-9602-a458-2b5836a817e6@benettiengineering.com> Hi Edgar, please reply to all in Mailing List, I add Mohd in Cc, On 20/02/22 17:18, Edgar Bonet wrote: > Hi! > > In his config file, Mohd wrote: >> BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_10=y >> BR2_LINUX_KERNEL_VERSION="4.4.155" > > This may cause problems. C.f. docs/manual/configure.txt: > > If you use kernel headers that are more recent than the Linux > kernel you run on your embedded system, then the C library might > be using interfaces that are not provided by your Linux kernel. Good catch Edgar! So Mohd, what you need here is a toolchain with older libc. https://buildroot.org/downloads/manual/manual.html#_cross_compilation_toolchain But again, do you really need to use so such old versions instead of try to use buildroot's beaglebone_defconfig? > In the same config file, there is: >> # BR2_PACKAGE_BUSYBOX is not set > > When disabling busybox, you should have seen the message: > > You may need to enable other packages to get a working system > You better know what you're doing! Despite of what I've written on my previous e-mail(my test was wrong), he has BR2_INIT_SYSTEMD=y that works as Init System, so that's ok. > And then: >> # BR2_PACKAGE_SYSTEMD_LOGIND is not set Good catch again Edgar! This ^^^ should be the point. Because it's exactly the systemd login dameon. >> # BR2_PACKAGE_UTIL_LINUX_LOGIN is not set This ^^^ is not selected by systemd, so I expect BR2_PACKAGE_SYSTEMD_LOGIND to do the job(even if I'm not a systemd expoert at all). But as Edgar pointed linux headers don't match so you have 3 choices: 1) find a toolchain with linux-headers <= 4.4.* 2) update linux version 3) start from scratch using buildroot beaglebone_defconfig Best regards -- Giulio Benetti Benetti Engineering sas From mohd.faiz.rohani at gmail.com Sun Feb 20 18:33:45 2022 From: mohd.faiz.rohani at gmail.com (Mohd Faiz Rohani) Date: Mon, 21 Feb 2022 02:33:45 +0800 Subject: [Buildroot] Issue with login In-Reply-To: <4d8f6289-f16f-9602-a458-2b5836a817e6@benettiengineering.com> References: <186B6238-5452-4211-BD9D-29A3C921DE42@benettiengineering.com> <469c0dbc-6101-be6c-7272-400ac4512b86@grenoble.cnrs.fr> <4d8f6289-f16f-9602-a458-2b5836a817e6@benettiengineering.com> Message-ID: Thanks, I'll check them out. Will update the outcome once the installation is done. Thank you. On Mon, Feb 21, 2022, 1:56 AM Giulio Benetti < giulio.benetti at benettiengineering.com> wrote: > Hi Edgar, > > please reply to all in Mailing List, I add Mohd in Cc, > > On 20/02/22 17:18, Edgar Bonet wrote: > > Hi! > > > > In his config file, Mohd wrote: > >> BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_10=y > >> BR2_LINUX_KERNEL_VERSION="4.4.155" > > > > This may cause problems. C.f. docs/manual/configure.txt: > > > > If you use kernel headers that are more recent than the Linux > > kernel you run on your embedded system, then the C library might > > be using interfaces that are not provided by your Linux kernel. > > Good catch Edgar! > So Mohd, what you need here is a toolchain with older libc. > > https://buildroot.org/downloads/manual/manual.html#_cross_compilation_toolchain > > But again, do you really need to use so such old versions instead of try > to use buildroot's beaglebone_defconfig? > > > In the same config file, there is: > >> # BR2_PACKAGE_BUSYBOX is not set > > > > When disabling busybox, you should have seen the message: > > > > You may need to enable other packages to get a working system > > You better know what you're doing! > > Despite of what I've written on my previous e-mail(my test was wrong), > he has BR2_INIT_SYSTEMD=y that works as Init System, so that's ok. > > > And then: > >> # BR2_PACKAGE_SYSTEMD_LOGIND is not set > > Good catch again Edgar! This ^^^ should be the point. Because it's > exactly the systemd login dameon. > > >> # BR2_PACKAGE_UTIL_LINUX_LOGIN is not set > > This ^^^ is not selected by systemd, so I expect > BR2_PACKAGE_SYSTEMD_LOGIND to do the job(even if I'm not a systemd > expoert at all). > > But as Edgar pointed linux headers don't match so you have 3 choices: > 1) find a toolchain with linux-headers <= 4.4.* > 2) update linux version > 3) start from scratch using buildroot beaglebone_defconfig > > Best regards > -- > Giulio Benetti > Benetti Engineering sas > -------------- next part -------------- An HTML attachment was scrubbed... URL: From peter at korsgaard.com Sun Feb 20 19:17:57 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 20:17:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/connman: fix build with libexecinfo In-Reply-To: <20220220151944.653455-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 20 Feb 2022 16:19:44 +0100") References: <20220220151944.653455-1-fontaine.fabrice@gmail.com> Message-ID: <87a6elbb4q.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure raised on uclibc and musl since the > addition of libexecinfo package in commit > eea8ba446c10701a273432552108d80fb2224ef4: > /home/peko/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-uclibc/10.3.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: > src/backtrace.o: in function `print_backtrace': > backtrace.c:(.text+0x37): undefined reference to `backtrace' > Fixes: > - http://autobuild.buildroot.org/results/74da4f4deab5f0ae9405d063ad52a5d4904a964d > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 20 19:15:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 20:15:26 +0100 Subject: [Buildroot] [git commit] package/connman: fix build with libexecinfo Message-ID: <20220220191100.9BA59827FE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=20c5569f9c2415364a1d873bc5089dc0ff0f8a35 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/peko/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-uclibc/10.3.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: src/backtrace.o: in function `print_backtrace': backtrace.c:(.text+0x37): undefined reference to `backtrace' Fixes: - http://autobuild.buildroot.org/results/74da4f4deab5f0ae9405d063ad52a5d4904a964d Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/connman/connman.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/connman/connman.mk b/package/connman/connman.mk index 61851bd2dc..1b6fd611f5 100644 --- a/package/connman/connman.mk +++ b/package/connman/connman.mk @@ -109,4 +109,9 @@ else CONNMAN_CONF_OPTS += --disable-client endif +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +CONNMAN_DEPENDENCIES += libexecinfo +CONNMAN_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -lexecinfo" +endif + $(eval $(autotools-package)) From peter at korsgaard.com Sun Feb 20 19:22:29 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 20:22:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/luasyslog: bump to version 2.2.1 In-Reply-To: <20220217094048.2756293-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 17 Feb 2022 10:40:48 +0100") References: <20220217094048.2756293-1-fontaine.fabrice@gmail.com> Message-ID: <875yp9bax6.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > This bump contains a single commit which fixes the following build > failure with Lua 5.4 raised since commit > 4f9a5659023c66fc166de28fd39a6c97a9490667: > In file included from lsyslog.c:11: > compat-5.3.h:402:4: error: #error "unsupported Lua version (i.e. not Lua 5.1, 5.2, or 5.3)" > 402 | # error "unsupported Lua version (i.e. not Lua 5.1, 5.2, or 5.3)" > | ^~~~~ > Also update indentation in hash file (two spaces) > Fixes: > - http://autobuild.buildroot.org/results/df2aabcf2ae07cad66b869ec4ac76702d2c32dc5 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 20 19:22:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 20:22:53 +0100 Subject: [Buildroot] [PATCH] package/zsh: security bump to version 5.8.1 In-Reply-To: <20220218133057.2426-1-peter@korsgaard.com> (Peter Korsgaard's message of "Fri, 18 Feb 2022 14:30:55 +0100") References: <20220218133057.2426-1-peter@korsgaard.com> Message-ID: <871qzxbawi.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Fixes the following security issue: > - CVE-2021-45444: In zsh before 5.8.1, an attacker can achieve code > execution if they control a command output inside the prompt, as > demonstrated by a %F argument. This occurs because of recursive > PROMPT_SUBST expansion. > The 5.8.1 release is not listed in MD5SUM, so drop the md5 hash. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 20 19:22:11 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 20:22:11 +0100 Subject: [Buildroot] [git commit] package/luasyslog: bump to version 2.2.1 Message-ID: <20220220191524.37DE582BCF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=25fc617963b4ae28b20e9bc07863500f62c0862d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This bump contains a single commit which fixes the following build failure with Lua 5.4 raised since commit 4f9a5659023c66fc166de28fd39a6c97a9490667: In file included from lsyslog.c:11: compat-5.3.h:402:4: error: #error "unsupported Lua version (i.e. not Lua 5.1, 5.2, or 5.3)" 402 | # error "unsupported Lua version (i.e. not Lua 5.1, 5.2, or 5.3)" | ^~~~~ Also update indentation in hash file (two spaces) Fixes: - http://autobuild.buildroot.org/results/df2aabcf2ae07cad66b869ec4ac76702d2c32dc5 Signed-off-by: Fabrice Fontaine Reviewed-by: Romain Naour Tested-by: Romain Naour Signed-off-by: Peter Korsgaard --- package/luasyslog/luasyslog.hash | 4 ++-- package/luasyslog/luasyslog.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/luasyslog/luasyslog.hash b/package/luasyslog/luasyslog.hash index bcb6a7e025..1e2a5ddec5 100644 --- a/package/luasyslog/luasyslog.hash +++ b/package/luasyslog/luasyslog.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7f7dad64117407f2484ff5b53e90804f923a99fcbde5872e54f6aba53f482da0 luasyslog-2.2.0.tar.gz -sha256 833457938f5155e65dabda12a5c9d4b6fd7fb92dd7ead584c1c30cfb0c84adf4 COPYING +sha256 b1b19ca142130f93c3f8f2e85303ff50cc6f4ed4aa52b8569176ae56e3dc3f43 luasyslog-2.2.1.tar.gz +sha256 833457938f5155e65dabda12a5c9d4b6fd7fb92dd7ead584c1c30cfb0c84adf4 COPYING diff --git a/package/luasyslog/luasyslog.mk b/package/luasyslog/luasyslog.mk index 049e068a13..972d4c5a7d 100644 --- a/package/luasyslog/luasyslog.mk +++ b/package/luasyslog/luasyslog.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUASYSLOG_VERSION = 2.2.0 +LUASYSLOG_VERSION = 2.2.1 LUASYSLOG_SITE = $(call github,ntd,luasyslog,$(LUASYSLOG_VERSION)) LUASYSLOG_DEPENDENCIES = host-luarocks luainterpreter LUASYSLOG_LICENSE = MIT From peter at korsgaard.com Sun Feb 20 19:23:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 20:23:03 +0100 Subject: [Buildroot] [git commit] package/zsh: security bump to version 5.8.1 Message-ID: <20220220191524.402D07FF78@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ca6c2ee3da7be5e4af478e779b49248b89e6514d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes the following security issue: - CVE-2021-45444: In zsh before 5.8.1, an attacker can achieve code execution if they control a command output inside the prompt, as demonstrated by a %F argument. This occurs because of recursive PROMPT_SUBST expansion. The 5.8.1 release is not listed in MD5SUM, so drop the md5 hash. Signed-off-by: Peter Korsgaard --- package/zsh/zsh.hash | 6 +----- package/zsh/zsh.mk | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/package/zsh/zsh.hash b/package/zsh/zsh.hash index 2df409c946..5c661ded25 100644 --- a/package/zsh/zsh.hash +++ b/package/zsh/zsh.hash @@ -1,7 +1,3 @@ -# From http://www.zsh.org/pub/MD5SUM -md5 e02a5428620b3dd268800c7843b3dd4d zsh-5.8.tar.xz -# Calculated based on the hash above and after checking signature -# http://www.zsh.org/pub/zsh-5.8.tar.xz.asc -sha256 dcc4b54cc5565670a65581760261c163d720991f0d06486da61f8d839b52de27 zsh-5.8.tar.xz # Locally calculated +sha256 b6973520bace600b4779200269b1e5d79e5f505ac4952058c11ad5bbf0dd9919 zsh-5.8.1.tar.xz sha256 d06fdf3ef9b1ec69d6b9e170b0a9516fbad3523261ff1668bde3bfea6e0ef5f5 LICENCE diff --git a/package/zsh/zsh.mk b/package/zsh/zsh.mk index 1a04833211..c5ab7c2fae 100644 --- a/package/zsh/zsh.mk +++ b/package/zsh/zsh.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZSH_VERSION = 5.8 +ZSH_VERSION = 5.8.1 ZSH_SITE = http://www.zsh.org/pub ZSH_SOURCE = zsh-$(ZSH_VERSION).tar.xz ZSH_DEPENDENCIES = ncurses From peter at korsgaard.com Sun Feb 20 19:35:52 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 20:35:52 +0100 Subject: [Buildroot] Analysis of runtime test failures In-Reply-To: <842a7d9b-e991-149e-c6a6-9a36b29e9ff3@gmail.com> (Romain Naour's message of "Sun, 20 Feb 2022 17:25:04 +0100") References: <20220220170222.06d88b45@windsurf> <842a7d9b-e991-149e-c6a6-9a36b29e9ff3@gmail.com> Message-ID: <87wnhp9vqf.fsf@dell.be.48ers.dk> >>>>> "Romain" == Romain Naour writes: > Hello Thomas, > Le 20/02/2022 ? 17:02, Thomas Petazzoni via buildroot a ?crit?: >> Hello, >> >> Six of our runtime tests are failing, so I went ahead and quickly look >> at the error messages. Here is my summary: >> >> === tests.package.test_ipython.TestIPythonPy3 === >> >> https://gitlab.com/buildroot.org/buildroot/-/jobs/2088684091 >> >> Error is: >> >> # ipython -c 'import math; math.floor(12.3)' >> -sh: ipython: not found > ipython use a wrong shebang on the target: > # head -n 1 /usr/bin/ipython > #!/home/kubu/buildroot/testsuite-master/TestIPythonPy3/host/bin/python > The issue come from python3-setuptools 60.0.0 that changed > SETUPTOOLS_USE_DISTUTILS [1]. This is actually a "breaking" change [2]. > We have to override SETUPTOOLS_USE_DISTUTILS to the previous value "stdlib" to > fixes the issue. > [1] > https://github.com/pypa/setuptools/commit/b6fcbbd00cb6d5607c9272dec452a50457bdb292 > [2] https://github.com/pypa/setuptools/blob/v60.0.0/CHANGES.rst#breaking-changes This is then presumably something we want to do globally then? James, what do you say? -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 20 19:36:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 20:36:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/wpewebkit: security bump to version 2.34.6 In-Reply-To: <20220217232113.1598433-1-aperez@igalia.com> (Adrian Perez de Castro's message of "Fri, 18 Feb 2022 01:21:13 +0200") References: <20220217232113.1598433-1-aperez@igalia.com> Message-ID: <87sfsd9vpa.fsf@dell.be.48ers.dk> >>>>> "Adrian" == Adrian Perez de Castro writes: > This brings the package two minor releases forward, which provides fixes > for CVE-2022-22589, CVE-2022-22590, CVE-2022-22592, and CVE-2022-22620. > Release notes can be found at: > https://wpewebkit.org/release/wpewebkit-2.34.5.html > https://wpewebkit.org/release/wpewebkit-2.34.6.html > The security advisories covering this update are available at: > https://wpewebkit.org/security/WSA-2022-0002.html > https://wpewebkit.org/security/WSA-2022-0003.html > Signed-off-by: Adrian Perez de Castro Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 20 19:36:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 20:36:20 +0100 Subject: [Buildroot] [git commit] package/wpewebkit: security bump to version 2.34.6 Message-ID: <20220220192905.15E6F82A9D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ffeeb7f3d36df58121ec9876432950bb0ac3a5fb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This brings the package two minor releases forward, which provides fixes for CVE-2022-22589, CVE-2022-22590, CVE-2022-22592, and CVE-2022-22620. Release notes can be found at: https://wpewebkit.org/release/wpewebkit-2.34.5.html https://wpewebkit.org/release/wpewebkit-2.34.6.html The security advisories covering this update are available at: https://wpewebkit.org/security/WSA-2022-0002.html https://wpewebkit.org/security/WSA-2022-0003.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard --- 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 b863a0d705..231bbc447d 100644 --- a/package/wpewebkit/wpewebkit.hash +++ b/package/wpewebkit/wpewebkit.hash @@ -1,7 +1,7 @@ -# 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 +# From https://wpewebkit.org/releases/wpewebkit-2.34.6.tar.xz.sums +md5 c9705270b342474cca28cf51632ccbbe wpewebkit-2.34.6.tar.xz +sha1 44ae95de1b5ebf0a2b0ea3630b3677153c597402 wpewebkit-2.34.6.tar.xz +sha256 301e895c8ed08ce7dccef3192b972f2ccfc2020463244c64069a636f2b05265f wpewebkit-2.34.6.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 8d564d8223..aa04e78623 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.34.4 +WPEWEBKIT_VERSION = 2.34.6 WPEWEBKIT_SITE = http://www.wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES From yann.morin.1998 at free.fr Sun Feb 20 20:07:07 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 20 Feb 2022 21:07:07 +0100 Subject: [Buildroot] [git commit] package/gdk-pixbuf: fix run with per-package directory Message-ID: <20220220201459.ABBEE832DB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=75361a9aba042799040591fb84192802b137fc3a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master gdk-pixbuf is based on plugins (modules in gdk-pixbuf parlance) that are provided either by the gdk-pixbuf package itself, or be installed by third-party packages, like librsvg. At runtime, those plugins get loaded by helper function in the gdk-pixbuf library. The location where to find those modules is currently hard-coded at build time, to the location where gdb-pixbuf is installed.. This means that host-packages that install image-conversion utilities will try to look in the path where gdk-pixbuf was installed. With per-package directories, this fails to find any module that was installed bu a third-party package. For example, the module for loading an SVG provided by librsvg, so it is not present in the PPD of gdk-pixbuf, and thus loading an SVG (e.g. to convert it to another format, like adwaita-icon-theme does) will fail with: Can't load file: Unrecognized image file format However, gdk-pixbuf can be configured so as to look for the modules relative to where the program is run from, rather than hard-coding the location at build time. This is exactly what we need in the PPD case Additionally, even without PPD, this would fail in a similar manner in the SDK, as that can be relocated too. So we unconditionally enable the relocatable option, but only for the host variant (there is no reason to enable it for the target, as it is not going to be relocated). Fixes: - http://autobuild.buildroot.org/results/0e00059b09b4445eaaec1030997883187c6a80d6 Signed-off-by: Fabrice Fontaine [yann.morin.1998 at free.fr: reword the already-good commit log] Signed-off-by: Yann E. MORIN --- package/gdk-pixbuf/gdk-pixbuf.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk index cd30d450d5..b22e9568c9 100644 --- a/package/gdk-pixbuf/gdk-pixbuf.mk +++ b/package/gdk-pixbuf/gdk-pixbuf.mk @@ -26,6 +26,7 @@ HOST_GDK_PIXBUF_CONF_OPTS = \ -Dgio_sniffing=false \ -Dinstalled_tests=false \ -Dintrospection=disabled \ + -Drelocatable=true \ -Dman=false ifeq ($(BR2_STATIC_LIBS),y) From yann.morin.1998 at free.fr Sun Feb 20 20:24:35 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 20 Feb 2022 21:24:35 +0100 Subject: [Buildroot] [PATCH v2, 1/2] package/gdk-pixbuf: enable relocatable option In-Reply-To: <20220220121637.200393-1-fontaine.fabrice@gmail.com> References: <20220220121637.200393-1-fontaine.fabrice@gmail.com> Message-ID: <20220220202435.GZ522310@scaer> Fabrice, All, On 2022-02-20 13:16 +0100, Fabrice Fontaine spake thusly: > Enable relocatable option to fix the following PPD build failure of > adwaita-icon-theme: > > Can't load file: Unrecognized image file format > > This failure is raised because the SVG library is not found by > gtk-encode-symbolic-svg. To find the SVG library, > gtk-encode-symbolic-svg depends on libgtk_pixbuf library which reads the > loaders.cache file using: > - a hardcoded path (which points to host-gdk-pixbuf per-package > directory) if relocatable is disabled. The loaders.cache in this > directory doesn't declare SVG support because it has not yet been > updated by host-librsvg > - or a dynamic path corresponding to the binary location if relocatable > is enabled. > > So obviously, we need to set relocatable to true. > > Fixes: > - http://autobuild.buildroot.org/results/0e00059b09b4445eaaec1030997883187c6a80d6 Thanks for providing more details, this is much better indeed, thanks! :-) I've still felt the need to extend the commit log, because I found that it left out some information adn explanations that may b needed in the future. Applied to master, thanks! :-) Regards, Yann E. MORIN. > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2 (after review of Yann E. Morin): > - Drop relocatable from target > - Enhance commit message > > package/gdk-pixbuf/gdk-pixbuf.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk > index cd30d450d5..b22e9568c9 100644 > --- a/package/gdk-pixbuf/gdk-pixbuf.mk > +++ b/package/gdk-pixbuf/gdk-pixbuf.mk > @@ -26,6 +26,7 @@ HOST_GDK_PIXBUF_CONF_OPTS = \ > -Dgio_sniffing=false \ > -Dinstalled_tests=false \ > -Dintrospection=disabled \ > + -Drelocatable=true \ > -Dman=false > > ifeq ($(BR2_STATIC_LIBS),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 peter at korsgaard.com Sun Feb 20 20:32:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 21:32:24 +0100 Subject: [Buildroot] [PATCH 1/2] package/webkitgtk: security bump to 2.34.6 In-Reply-To: <20220217230908.1532564-1-aperez@igalia.com> (Adrian Perez de Castro's message of "Fri, 18 Feb 2022 01:09:07 +0200") References: <20220217230908.1532564-1-aperez@igalia.com> Message-ID: <87o8319t47.fsf@dell.be.48ers.dk> >>>>> "Adrian" == Adrian Perez de Castro writes: > Update to a new major release which brings in improvements, a number of > new features, and security fixes. Release notes: > https://webkitgtk.org/2021/09/22/webkitgtk2.34.0-released.html > https://webkitgtk.org/2021/10/21/webkitgtk2.34.1-released.html > https://webkitgtk.org/2021/11/24/webkitgtk2.34.2-released.html > https://webkitgtk.org/2021/12/20/webkitgtk2.34.3-released.html > https://webkitgtk.org/2022/01/21/webkitgtk2.34.4-released.html > https://webkitgtk.org/2022/02/09/webkitgtk2.34.5-released.html > https://webkitgtk.org/2022/02/17/webkitgtk2.34.6-released.html > Security advisories: > https://webkitgtk.org/security/WSA-2021-0007.html > https://webkitgtk.org/security/WSA-2022-0001.html > https://webkitgtk.org/security/WSA-2022-0002.html > https://webkitgtk.org/security/WSA-2022-0003.html > Some of the new features require additional dependencies: HTTP/2 > requires libsoup3, which is not yet packaged in Buildroot, and > disabled at the moment (with -DUSE_SOUP2=ON, to keep using libsoup2); > and the color management support needs LCMS2 (which will be enabled > in a follow-up patch.) > Options SILENCE_CROSS_COMPILATION_NOTICES and ENABLE_GRAPHICS_CONTEXT_GL > do not exist anymore, and their usage is dropped. > Signed-off-by: Adrian Perez de Castro > --- > package/webkitgtk/webkitgtk.hash | 8 ++++---- > package/webkitgtk/webkitgtk.mk | 14 +++++--------- > 2 files changed, 9 insertions(+), 13 deletions(-) > diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash > index 7cb6c90b21..82c210c8f9 100644 > --- a/package/webkitgtk/webkitgtk.hash > +++ b/package/webkitgtk/webkitgtk.hash > @@ -1,7 +1,7 @@ > -# From https://webkitgtk.org/releases/webkitgtk-2.32.4.tar.xz.sums > -md5 51a167e5d03bacf30c5c588e6aa23143 webkitgtk-2.32.4.tar.xz > -sha1 f7255ffb488e727e9e250e0dae9f192266f50f01 webkitgtk-2.32.4.tar.xz > -sha256 00ce2d3f798d7bc5e9039d9059f0c3c974d51de38c8b716f00e94452a177d3fd webkitgtk-2.32.4.tar.xz > +# From https://webkitgtk.org/releases/webkitgtk-2.34.6.tar.xz.sums > +md5 a5eeedd02f5b4bba8bd891b92dc743d4 webkitgtk-2.34.6.tar.xz > +sha1 bb82517289baf9c858fa406d1d845274f81e25cb webkitgtk-2.34.6.tar.xz > +sha256 6bc8fd034aad0432a2459ce4fc7ee25ad65a4924c618bf8d93b52b0c1a84c1f6 webkitgtk-2.34.6.tar.xz > # Hashes for license files: > sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE > diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk > index 16b925fe71..f4fc1e7838 100644 > --- a/package/webkitgtk/webkitgtk.mk > +++ b/package/webkitgtk/webkitgtk.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > -WEBKITGTK_VERSION = 2.32.4 > +WEBKITGTK_VERSION = 2.34.6 > WEBKITGTK_SITE = https://www.webkitgtk.org/releases > WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz > WEBKITGTK_INSTALL_STAGING = YES > @@ -24,10 +24,11 @@ WEBKITGTK_CONF_OPTS = \ > -DENABLE_MINIBROWSER=ON \ > -DENABLE_SPELLCHECK=ON \ > -DPORT=GTK \ > - -DSILENCE_CROSS_COMPILATION_NOTICES=ON \ > + -DUSE_LCMS=OFF \ > -DUSE_LIBNOTIFY=OFF \ > -DUSE_LIBHYPHEN=OFF \ > -DUSE_OPENJPEG=ON \ > + -DUSE_SOUP2=ON \ > -DUSE_WOFF2=ON This is apparently not against master, as master has -DUSE_WPE_RENDERER=OFF here since your commit 38b740ec6f44b4 (package/webkitgtk: bump to version 2.26.0)? Please send patches against current git. Committed to master after fixing that up, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 20 20:33:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 21:33:10 +0100 Subject: [Buildroot] [PATCH 2/2] package/webkitgtk: use lcms2 if available In-Reply-To: <20220217230908.1532564-2-aperez@igalia.com> (Adrian Perez de Castro's message of "Fri, 18 Feb 2022 01:09:08 +0200") References: <20220217230908.1532564-1-aperez@igalia.com> <20220217230908.1532564-2-aperez@igalia.com> Message-ID: <87k0dp9t2x.fsf@dell.be.48ers.dk> >>>>> "Adrian" == Adrian Perez de Castro writes: > Make webkitgtk enable color management support if the lcms2 package has > been selected. > Signed-off-by: Adrian Perez de Castro Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 20 20:35:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 21:35:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-twisted: security bump to version 22.1.0 In-Reply-To: <20220218105557.705926-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 18 Feb 2022 11:55:57 +0100") References: <20220218105557.705926-1-fontaine.fabrice@gmail.com> Message-ID: <87fsod9szu.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2022-21712: twisted is an event-driven networking engine written > in Python. In affected versions twisted exposes cookies and > authorization headers when following cross-origin redirects. This issue > is present in the `twited.web.RedirectAgent` and `twisted.web. > BrowserLikeRedirectAgent` functions. Users are advised to upgrade. There > are no known workarounds. > Update hash of license file (author added and update in year: > https://github.com/twisted/twisted/commit/13aa59746a73769b05a51c2198b28f5602dd382f > https://github.com/twisted/twisted/commit/adfdf23477abfcd09a867347993fc1d207cfb4dd > https://github.com/twisted/twisted/commit/7e65fbeed3d74a4eb1c40d7a6df5651782becbc8) > https://github.com/twisted/twisted/security/advisories/GHSA-92x2-jw7w-xvvx > https://github.com/twisted/twisted/releases/tag/twisted-22.1.0 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Sun Feb 20 20:47:22 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 20 Feb 2022 21:47:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/expat: bump to version 2.4.6 Message-ID: <20220220204722.1737731-1-fontaine.fabrice@gmail.com> This release fixes a regression introduced by one of the security fixes in 2.4.5. https://blog.hartwork.org/posts/expat-2-4-6-released https://github.com/libexpat/libexpat/blob/R_2_4_6/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 cd2e8c7fb9..0d9f60931f 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.5/ -md5 9dc183e6c1eebc1b658c1e71be0885e1 expat-2.4.5.tar.xz -sha1 360a49b55c442e91cb7b328bc0335083909ddf4f expat-2.4.5.tar.xz +# From https://sourceforge.net/projects/expat/files/expat/2.4.6/ +md5 22a30c888752fdda9f8dd1b7281c54b0 expat-2.4.6.tar.xz +sha1 26e223c4795c242814b0e3299a5027c22b9dc733 expat-2.4.6.tar.xz # Locally calculated -sha256 f2af8fc7cdc63a87920da38cd6d12cb113c3c3a3f437495b1b6541e0cff32579 expat-2.4.5.tar.xz +sha256 de55794b7a9bc214852fdc075beaaecd854efe1361597e6268ee87946951289b expat-2.4.6.tar.xz sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec COPYING diff --git a/package/expat/expat.mk b/package/expat/expat.mk index 7815d61027..c481b5c225 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.4.5 +EXPAT_VERSION = 2.4.6 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 peter at korsgaard.com Sun Feb 20 20:52:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 21:52:28 +0100 Subject: [Buildroot] [git commit] package/webkitgtk: use lcms2 if available Message-ID: <20220220204447.705B183489@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5663f3679dbeef791d3e0dcf8c8695b2312044db branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Make webkitgtk enable color management support if the lcms2 package has been selected. Signed-off-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard --- package/webkitgtk/webkitgtk.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index eaf98900ef..36e4b8943b 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -24,7 +24,6 @@ WEBKITGTK_CONF_OPTS = \ -DENABLE_MINIBROWSER=ON \ -DENABLE_SPELLCHECK=ON \ -DPORT=GTK \ - -DUSE_LCMS=OFF \ -DUSE_LIBNOTIFY=OFF \ -DUSE_LIBHYPHEN=OFF \ -DUSE_OPENJPEG=ON \ @@ -59,6 +58,13 @@ else WEBKITGTK_CONF_OPTS += -DENABLE_WEBDRIVER=OFF endif +ifeq ($(BR2_PACKAGE_LCMS2),y) +WEBKITGTK_CONF_OPTS += -DUSE_LCMS=ON +WEBKITGTK_DEPENDENCIES += lcms2 +else +WEBKITGTK_CONF_OPTS += -DUSE_LCMS=OFF +endif + ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) WEBKITGTK_CONF_OPTS += -DENABLE_INTROSPECTION=ON WEBKITGTK_DEPENDENCIES += gobject-introspection From peter at korsgaard.com Sun Feb 20 20:52:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 21:52:27 +0100 Subject: [Buildroot] [git commit] package/webkitgtk: security bump to 2.34.6 Message-ID: <20220220204447.67ABF83483@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=057e89c9c596cb876379757cb530fdb8a8d42bf3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update to a new major release which brings in improvements, a number of new features, and security fixes. Release notes: https://webkitgtk.org/2021/09/22/webkitgtk2.34.0-released.html https://webkitgtk.org/2021/10/21/webkitgtk2.34.1-released.html https://webkitgtk.org/2021/11/24/webkitgtk2.34.2-released.html https://webkitgtk.org/2021/12/20/webkitgtk2.34.3-released.html https://webkitgtk.org/2022/01/21/webkitgtk2.34.4-released.html https://webkitgtk.org/2022/02/09/webkitgtk2.34.5-released.html https://webkitgtk.org/2022/02/17/webkitgtk2.34.6-released.html Security advisories: https://webkitgtk.org/security/WSA-2021-0007.html https://webkitgtk.org/security/WSA-2022-0001.html https://webkitgtk.org/security/WSA-2022-0002.html https://webkitgtk.org/security/WSA-2022-0003.html Some of the new features require additional dependencies: HTTP/2 requires libsoup3, which is not yet packaged in Buildroot, and disabled at the moment (with -DUSE_SOUP2=ON, to keep using libsoup2); and the color management support needs LCMS2 (which will be enabled in a follow-up patch.) Options SILENCE_CROSS_COMPILATION_NOTICES and ENABLE_GRAPHICS_CONTEXT_GL do not exist anymore, and their usage is dropped. Signed-off-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard --- package/webkitgtk/webkitgtk.hash | 8 ++++---- package/webkitgtk/webkitgtk.mk | 14 +++++--------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index 7cb6c90b21..82c210c8f9 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,7 +1,7 @@ -# From https://webkitgtk.org/releases/webkitgtk-2.32.4.tar.xz.sums -md5 51a167e5d03bacf30c5c588e6aa23143 webkitgtk-2.32.4.tar.xz -sha1 f7255ffb488e727e9e250e0dae9f192266f50f01 webkitgtk-2.32.4.tar.xz -sha256 00ce2d3f798d7bc5e9039d9059f0c3c974d51de38c8b716f00e94452a177d3fd webkitgtk-2.32.4.tar.xz +# From https://webkitgtk.org/releases/webkitgtk-2.34.6.tar.xz.sums +md5 a5eeedd02f5b4bba8bd891b92dc743d4 webkitgtk-2.34.6.tar.xz +sha1 bb82517289baf9c858fa406d1d845274f81e25cb webkitgtk-2.34.6.tar.xz +sha256 6bc8fd034aad0432a2459ce4fc7ee25ad65a4924c618bf8d93b52b0c1a84c1f6 webkitgtk-2.34.6.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index 4d5d0b89e2..eaf98900ef 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.32.4 +WEBKITGTK_VERSION = 2.34.6 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES @@ -24,10 +24,11 @@ WEBKITGTK_CONF_OPTS = \ -DENABLE_MINIBROWSER=ON \ -DENABLE_SPELLCHECK=ON \ -DPORT=GTK \ - -DSILENCE_CROSS_COMPILATION_NOTICES=ON \ + -DUSE_LCMS=OFF \ -DUSE_LIBNOTIFY=OFF \ -DUSE_LIBHYPHEN=OFF \ -DUSE_OPENJPEG=ON \ + -DUSE_SOUP2=ON \ -DUSE_WOFF2=ON \ -DUSE_WPE_RENDERER=OFF @@ -74,7 +75,6 @@ ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) WEBKITGTK_CONF_OPTS += \ -DENABLE_ACCELERATED_2D_CANVAS=ON \ -DENABLE_GLES2=OFF \ - -DENABLE_GRAPHICS_CONTEXT_GL=ON \ -DENABLE_X11_TARGET=ON WEBKITGTK_DEPENDENCIES += libgl \ xlib_libXcomposite xlib_libXdamage xlib_libXrender xlib_libXt @@ -90,15 +90,11 @@ else # !X11 WEBKITGTK_DEPENDENCIES += libegl # GLESv2 support is optional though ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) -WEBKITGTK_CONF_OPTS += \ - -DENABLE_GLES2=ON \ - -DENABLE_GRAPHICS_CONTEXT_GL=ON +WEBKITGTK_CONF_OPTS += -DENABLE_GLES2=ON WEBKITGTK_DEPENDENCIES += libgles else # Disable general OpenGL (shading) if there's no GLESv2 -WEBKITGTK_CONF_OPTS += \ - -DENABLE_GLES2=OFF \ - -DENABLE_GRAPHICS_CONTEXT_GL=OFF +WEBKITGTK_CONF_OPTS += -DENABLE_GLES2=OFF endif # We must explicitly state the wayland target ifeq ($(BR2_PACKAGE_LIBGTK3_WAYLAND),y) From peter at korsgaard.com Sun Feb 20 20:52:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 21:52:28 +0100 Subject: [Buildroot] [git commit] package/python-twisted: security bump to version 22.1.0 Message-ID: <20220220204447.7A7A88348A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=af37e96f3d85a687503c85e7d2e37cfbd791dd18 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2022-21712: twisted is an event-driven networking engine written in Python. In affected versions twisted exposes cookies and authorization headers when following cross-origin redirects. This issue is present in the `twited.web.RedirectAgent` and `twisted.web. BrowserLikeRedirectAgent` functions. Users are advised to upgrade. There are no known workarounds. Update hash of license file (author added and update in year: https://github.com/twisted/twisted/commit/13aa59746a73769b05a51c2198b28f5602dd382f https://github.com/twisted/twisted/commit/adfdf23477abfcd09a867347993fc1d207cfb4dd https://github.com/twisted/twisted/commit/7e65fbeed3d74a4eb1c40d7a6df5651782becbc8) https://github.com/twisted/twisted/security/advisories/GHSA-92x2-jw7w-xvvx https://github.com/twisted/twisted/releases/tag/twisted-22.1.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/python-twisted/python-twisted.hash | 6 +++--- package/python-twisted/python-twisted.mk | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-twisted/python-twisted.hash b/package/python-twisted/python-twisted.hash index c633112e9d..8f0935e4f0 100644 --- a/package/python-twisted/python-twisted.hash +++ b/package/python-twisted/python-twisted.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/twisted/json -md5 fc16d575730db7d0cddd09fc35af3eea Twisted-20.3.0.tar.bz2 -sha256 d72c55b5d56e176563b91d11952d13b01af8725c623e498db5507b6614fc1e10 Twisted-20.3.0.tar.bz2 +md5 c818cb1ab241dc249517442e5a0e0412 Twisted-22.1.0.tar.gz +sha256 b7971ec9805b0f80e1dcb1a3721d7bfad636d5f909de687430ce373979d67b61 Twisted-22.1.0.tar.gz # Locally computed sha256 -sha256 98426fd47315df70098e0d85efbb5d7dd8001c9c536386937354640d6d8d75b9 LICENSE +sha256 686f6426a775450eb3afd00bc3a5c2621f305ddb9c8478ee9bf28a368ef2dece LICENSE diff --git a/package/python-twisted/python-twisted.mk b/package/python-twisted/python-twisted.mk index 49d97af097..8e867cfb58 100644 --- a/package/python-twisted/python-twisted.mk +++ b/package/python-twisted/python-twisted.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TWISTED_VERSION = 20.3.0 -PYTHON_TWISTED_SOURCE = Twisted-$(PYTHON_TWISTED_VERSION).tar.bz2 -PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/4a/b4/4973c7ccb5be2ec0abc779b7d5f9d5f24b17b0349e23240cfc9dc3bd83cc +PYTHON_TWISTED_VERSION = 22.1.0 +PYTHON_TWISTED_SOURCE = Twisted-$(PYTHON_TWISTED_VERSION).tar.gz +PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/77/b8/8108806ebf2b33654989fd1511281dc94a49fa7e03326d84fe5498ecfae4 PYTHON_TWISTED_SETUP_TYPE = setuptools PYTHON_TWISTED_LICENSE = MIT PYTHON_TWISTED_LICENSE_FILES = LICENSE From peter at korsgaard.com Sun Feb 20 21:10:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 22:10:54 +0100 Subject: [Buildroot] [PATCH] support/testing/../sample_python_pyyaml_dec.py: unbreak after move to pyaml 6.0 Message-ID: <20220220211055.1273368-1-peter@korsgaard.com> Fixes https://gitlab.com/buildroot.org/buildroot/-/jobs/2088684091 python sample_python_pyyaml_dec.py Traceback (most recent call last): File "/root/sample_python_pyyaml_dec.py", line 5, in data = yaml.load(serialized) TypeError: load() missing 1 required positional argument: 'Loader' yaml.load() requires a loader argument since the move to version 6.0: https://github.com/yaml/pyyaml/pull/561 The test does not need the extra functionality of load(), so instead move to the recommended safe_load(). Signed-off-by: Peter Korsgaard --- support/testing/tests/package/sample_python_pyyaml_dec.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/package/sample_python_pyyaml_dec.py b/support/testing/tests/package/sample_python_pyyaml_dec.py index 9ab8931197..bb90934f26 100644 --- a/support/testing/tests/package/sample_python_pyyaml_dec.py +++ b/support/testing/tests/package/sample_python_pyyaml_dec.py @@ -2,7 +2,7 @@ import yaml with open("/tmp/data.yml", "rb") as f: serialized = f.read() -data = yaml.load(serialized) +data = yaml.safe_load(serialized) print(data) assert(data["name"] == "python-pyyaml") assert(data["versions"] == ["1", "2"]) -- 2.30.2 From peter at korsgaard.com Sun Feb 20 21:26:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 22:26:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/expat: bump to version 2.4.6 In-Reply-To: <20220220204722.1737731-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 20 Feb 2022 21:47:22 +0100") References: <20220220204722.1737731-1-fontaine.fabrice@gmail.com> Message-ID: <87bkz19qly.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > This release fixes a regression introduced by one of the security fixes > in 2.4.5. > https://blog.hartwork.org/posts/expat-2-4-6-released > https://github.com/libexpat/libexpat/blob/R_2_4_6/expat/Changes > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 20 21:26:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 22:26:26 +0100 Subject: [Buildroot] [git commit] package/expat: bump to version 2.4.6 Message-ID: <20220220211853.AA05A821A5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=46390b3a7c47420b7523b8f18276f3ccd49940c7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This release fixes a regression introduced by one of the security fixes in 2.4.5. https://blog.hartwork.org/posts/expat-2-4-6-released https://github.com/libexpat/libexpat/blob/R_2_4_6/expat/Changes Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/expat/expat.hash | 8 ++++---- package/expat/expat.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index cd2e8c7fb9..0d9f60931f 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.5/ -md5 9dc183e6c1eebc1b658c1e71be0885e1 expat-2.4.5.tar.xz -sha1 360a49b55c442e91cb7b328bc0335083909ddf4f expat-2.4.5.tar.xz +# From https://sourceforge.net/projects/expat/files/expat/2.4.6/ +md5 22a30c888752fdda9f8dd1b7281c54b0 expat-2.4.6.tar.xz +sha1 26e223c4795c242814b0e3299a5027c22b9dc733 expat-2.4.6.tar.xz # Locally calculated -sha256 f2af8fc7cdc63a87920da38cd6d12cb113c3c3a3f437495b1b6541e0cff32579 expat-2.4.5.tar.xz +sha256 de55794b7a9bc214852fdc075beaaecd854efe1361597e6268ee87946951289b expat-2.4.6.tar.xz sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec COPYING diff --git a/package/expat/expat.mk b/package/expat/expat.mk index 7815d61027..c481b5c225 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.4.5 +EXPAT_VERSION = 2.4.6 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 Sun Feb 20 21:27:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 22:27:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/zfs: replace PYTHON_VERSION_MAJOR In-Reply-To: <20220218100709.677205-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 18 Feb 2022 11:07:09 +0100") References: <20220218100709.677205-1-fontaine.fabrice@gmail.com> Message-ID: <877d9p9qjw.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Replace PYTHON_VERSION_MAJOR by PYTHON3_VERSION_MAJOR now that python2 > has been dropped. It should be noted that PYTHON_SITE_PKG was wrongly > set since the addition of the package in commit > 4470bc9914d730383db86f58bc86fb09739622dc > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 20 21:27:52 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 22:27:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pygame: replace PYTHON_VERSION_MAJOR In-Reply-To: <20220218100853.677373-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 18 Feb 2022 11:08:53 +0100") References: <20220218100853.677373-1-fontaine.fabrice@gmail.com> Message-ID: <8735kd9qjr.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Replace PYTHON_VERSION_MAJOR by PYTHON3_VERSION_MAJOR now that python2 > has been dropped > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 20 21:29:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 22:29:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xdriver_xf86-video-ati: don't override XDRIVER_XF86_VIDEO_ATI_CONF_OPTS In-Reply-To: <20220217215413.556297-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 17 Feb 2022 22:54:13 +0100") References: <20220217215413.556297-1-fontaine.fabrice@gmail.com> Message-ID: <87y2258bxe.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > XDRIVER_XF86_VIDEO_ATI_CONF_OPTS is wrongly overridden in a conditional > since commit daa433bff6d2d9934705feacd3619a7618d13ae5 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 20 21:27:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 22:27:23 +0100 Subject: [Buildroot] [git commit] package/zfs: replace PYTHON_VERSION_MAJOR Message-ID: <20220220212127.3CA33821A5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3c10bb052d94cb9d96881344d149a29a6bfb73b5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Replace PYTHON_VERSION_MAJOR by PYTHON3_VERSION_MAJOR now that python2 has been dropped. It should be noted that PYTHON_SITE_PKG was wrongly set since the addition of the package in commit 4470bc9914d730383db86f58bc86fb09739622dc Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/zfs/zfs.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zfs/zfs.mk b/package/zfs/zfs.mk index 6b542f5c05..dbda8aceb4 100644 --- a/package/zfs/zfs.mk +++ b/package/zfs/zfs.mk @@ -44,7 +44,7 @@ ZFS_CONF_ENV += \ PYTHON_CPPFLAGS="`$(STAGING_DIR)/usr/bin/python3-config --includes`" \ PYTHON_LIBS="`$(STAGING_DIR)/usr/bin/python3-config --ldflags`" \ PYTHON_EXTRA_LIBS="`$(STAGING_DIR)/usr/bin/python3-config --libs --embed`" \ - PYTHON_SITE_PKG="/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages" + PYTHON_SITE_PKG="/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages" ZFS_CONF_OPTS += --enable-pyzfs else ZFS_CONF_OPTS += --disable-pyzfs --without-python From peter at korsgaard.com Sun Feb 20 21:27:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 22:27:40 +0100 Subject: [Buildroot] [git commit] package/python-pygame: replace PYTHON_VERSION_MAJOR Message-ID: <20220220212127.491E283483@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=70980a154b18c5fe6db940faf36f07ee20e27a70 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Replace PYTHON_VERSION_MAJOR by PYTHON3_VERSION_MAJOR now that python2 has been dropped Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/python-pygame/python-pygame.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-pygame/python-pygame.mk b/package/python-pygame/python-pygame.mk index 8deb42a90c..600dd9e743 100644 --- a/package/python-pygame/python-pygame.mk +++ b/package/python-pygame/python-pygame.mk @@ -103,7 +103,7 @@ PYTHON_PYGAME_POST_INSTALL_TARGET_HOOKS += PYTHON_PYGAME_REMOVE_TESTS ifneq ($(BR2_PACKAGE_PYTHON_PYGAME_EXAMPLES),y) define PYTHON_PYGAME_REMOVE_EXAMPLES - rm -rf $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages/pygame/examples + rm -rf $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/pygame/examples endef PYTHON_PYGAME_POST_INSTALL_TARGET_HOOKS += PYTHON_PYGAME_REMOVE_EXAMPLES endif From peter at korsgaard.com Sun Feb 20 21:28:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 22:28:54 +0100 Subject: [Buildroot] [git commit] package/x11r7/xdriver_xf86-video-ati: don't override XDRIVER_XF86_VIDEO_ATI_CONF_OPTS Message-ID: <20220220212127.567BA821A5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f6009ac821abf096ea8cb1010e3ed1e11f010b64 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master XDRIVER_XF86_VIDEO_ATI_CONF_OPTS is wrongly overridden in a conditional since commit daa433bff6d2d9934705feacd3619a7618d13ae5 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk index f7aeba8ba6..edb8b11add 100644 --- a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk +++ b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk @@ -16,9 +16,9 @@ XDRIVER_XF86_VIDEO_ATI_DEPENDENCIES = \ xserver_xorg-server ifeq ($(BR2_PACKAGE_HAS_LIBEGL)$(BR2_PACKAGE_HAS_LIBGL)$(BR2_PACKAGE_LIBEPOXY),yyy) -XDRIVER_XF86_VIDEO_ATI_CONF_OPTS = --enable-glamor +XDRIVER_XF86_VIDEO_ATI_CONF_OPTS += --enable-glamor else -XDRIVER_XF86_VIDEO_ATI_CONF_OPTS = --disable-glamor +XDRIVER_XF86_VIDEO_ATI_CONF_OPTS += --disable-glamor endif # xdriver_xf86-video-ati requires O_CLOEXEC From fontaine.fabrice at gmail.com Sun Feb 20 21:42:03 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 20 Feb 2022 22:42:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xdriver_xf86-video-mach64: don't override XDRIVER_XF86_VIDEO_MACH64_CONF_OPTS Message-ID: <20220220214203.1739006-1-fontaine.fabrice@gmail.com> XDRIVER_XF86_VIDEO_MACH64_CONF_OPTS is wrongly overridden in a conditional since commit cf26ae7dd14f35dd917811f5a23c54a19ea6ed07 Signed-off-by: Fabrice Fontaine --- .../xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk b/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk index e6f8d7471c..eee8fec2e8 100644 --- a/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk +++ b/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk @@ -13,7 +13,7 @@ XDRIVER_XF86_VIDEO_MACH64_AUTORECONF = YES XDRIVER_XF86_VIDEO_MACH64_DEPENDENCIES = xserver_xorg-server xorgproto ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) -XDRIVER_XF86_VIDEO_MACH64_CONF_OPTS = --disable-dri +XDRIVER_XF86_VIDEO_MACH64_CONF_OPTS += --disable-dri endif $(eval $(autotools-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Sun Feb 20 21:42:36 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 20 Feb 2022 22:42:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xdriver_xf86-video-r128: don't override XDRIVER_XF86_VIDEO_R128_CONF_OPTS Message-ID: <20220220214236.1739049-1-fontaine.fabrice@gmail.com> XDRIVER_XF86_VIDEO_R128_CONF_OPTS is wrongly overridden in a conditional since commit 082b65319c90ea5c9a89ff4ffed12af3a3e952b6 Signed-off-by: Fabrice Fontaine --- .../x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk b/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk index 455cfbad86..690041d4c6 100644 --- a/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk +++ b/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk @@ -12,7 +12,7 @@ XDRIVER_XF86_VIDEO_R128_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_R128_DEPENDENCIES = xserver_xorg-server xorgproto ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) -XDRIVER_XF86_VIDEO_R128_CONF_OPTS = --disable-dri +XDRIVER_XF86_VIDEO_R128_CONF_OPTS += --disable-dri endif $(eval $(autotools-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Sun Feb 20 21:43:02 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 20 Feb 2022 22:43:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xdriver_xf86-video-savage: don't override XDRIVER_XF86_VIDEO_SAVAGE_CONF_OPTS Message-ID: <20220220214302.1739087-1-fontaine.fabrice@gmail.com> XDRIVER_XF86_VIDEO_SAVAGE_CONF_OPTS is wrongly overridden in a conditional since commit c38103f2fe793ea5257d3f5b8413ece7a5c60538 Signed-off-by: Fabrice Fontaine --- .../xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk index d7311aa918..102aa2c48e 100644 --- a/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk +++ b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk @@ -13,7 +13,7 @@ XDRIVER_XF86_VIDEO_SAVAGE_AUTORECONF = YES XDRIVER_XF86_VIDEO_SAVAGE_DEPENDENCIES = xserver_xorg-server libdrm xorgproto ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) -XDRIVER_XF86_VIDEO_SAVAGE_CONF_OPTS = --disable-dri +XDRIVER_XF86_VIDEO_SAVAGE_CONF_OPTS += --disable-dri endif $(eval $(autotools-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Sun Feb 20 21:43:28 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 20 Feb 2022 22:43:28 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xdriver_xf86-video-tdfx: don't override XDRIVER_XF86_VIDEO_TDFX_CONF_OPTS Message-ID: <20220220214328.1739123-1-fontaine.fabrice@gmail.com> XDRIVER_XF86_VIDEO_TDFX_CONF_OPTS is wrongly overridden in a conditional since commit 7614ca037b2f82ac8e7cca1db3bf173d3655e0e2 Signed-off-by: Fabrice Fontaine --- .../x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk index 8975334f90..14c40e4d89 100644 --- a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk +++ b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk @@ -16,7 +16,7 @@ XDRIVER_XF86_VIDEO_TDFX_DEPENDENCIES = \ xserver_xorg-server ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) -XDRIVER_XF86_VIDEO_TDFX_CONF_OPTS = --disable-dri +XDRIVER_XF86_VIDEO_TDFX_CONF_OPTS += --disable-dri endif $(eval $(autotools-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Sun Feb 20 21:54:09 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 20 Feb 2022 22:54:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-ipython: security bump to version 7.31.1 Message-ID: <20220220215409.1740105-1-fontaine.fabrice@gmail.com> Fix CVE-2022-21699: IPython (Interactive Python) is a command shell for interactive computing in multiple programming languages, originally developed for the Python programming language. Affected versions are subject to an arbitrary code execution vulnerability achieved by not properly managing cross user temporary files. This vulnerability allows one user to run code as another on the same machine. All users are advised to upgrade. Also update indentation in hash file (two spaces) https://github.com/ipython/ipython/security/advisories/GHSA-pq7m-3gw7-gq5x Signed-off-by: Fabrice Fontaine --- package/python-ipython/python-ipython.hash | 8 ++++---- package/python-ipython/python-ipython.mk | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-ipython/python-ipython.hash b/package/python-ipython/python-ipython.hash index 5f591129a4..cd18c3d125 100644 --- a/package/python-ipython/python-ipython.hash +++ b/package/python-ipython/python-ipython.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/ipython/json -md5 f733048322cd34ce392ec5404813540b ipython-7.28.0.tar.gz -sha256 2097be5c814d1b974aea57673176a924c4c8c9583890e7a5f082f547b9975b11 ipython-7.28.0.tar.gz +md5 6907b67691ba697173a3befb2c35f7ac ipython-7.31.1.tar.gz +sha256 b5548ec5329a4bcf054a5deed5099b0f9622eb9ea51aaa7104d215fece201d8c ipython-7.31.1.tar.gz # Locally computed sha256 checksums -sha256 341afcbd729887b7046fe7b98fc4f4edff3aed8d38f06eefd9b30670f043df17 COPYING.rst -sha256 e0e390748ed440ab893ca1f135a88a920aaf5409dbb90a5b427c75c5e51268fb LICENSE +sha256 341afcbd729887b7046fe7b98fc4f4edff3aed8d38f06eefd9b30670f043df17 COPYING.rst +sha256 e0e390748ed440ab893ca1f135a88a920aaf5409dbb90a5b427c75c5e51268fb LICENSE diff --git a/package/python-ipython/python-ipython.mk b/package/python-ipython/python-ipython.mk index c669dd1b92..389ebfa897 100644 --- a/package/python-ipython/python-ipython.mk +++ b/package/python-ipython/python-ipython.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_IPYTHON_VERSION = 7.28.0 +PYTHON_IPYTHON_VERSION = 7.31.1 PYTHON_IPYTHON_SOURCE = ipython-$(PYTHON_IPYTHON_VERSION).tar.gz -PYTHON_IPYTHON_SITE = https://files.pythonhosted.org/packages/e2/c8/7046d0409a90e31263d5bbaa708347d522ac584a1140c01a951d9deb1792 +PYTHON_IPYTHON_SITE = https://files.pythonhosted.org/packages/fb/39/c1947dc1bb993a35469ca474535cb3214c91f5f9a7752a1fcbd9b6b37dde PYTHON_IPYTHON_LICENSE = BSD-3-Clause PYTHON_IPYTHON_LICENSE_FILES = COPYING.rst LICENSE PYTHON_IPYTHON_CPE_ID_VENDOR = ipython -- 2.34.1 From yann.morin.1998 at free.fr Sun Feb 20 21:36:35 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 20 Feb 2022 22:36:35 +0100 Subject: [Buildroot] [git commit] package/librsvg: fix loaders.cache with with per-package directories Message-ID: <20220220215908.0F6D3812C3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=63b780f5e96e2f9282fb48b2846bab1c0f4f9455 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master host-librsvg install a gdk-pixbuf module (aka plugin). As such, it needs to update [0] the modules cache (a kind of registry of which modules are installed and what the can handle). To that effect, it calls the utility gdk-pixbuf-queryloaders, which generates the cache of existing modules. gdk-pixbuf-queryloaders, from the gdk-pixbuf package, has been configured to be relocatable. However, it still embeds the path to where it was instaled, and thus where to look modules from. If it is run from its install location, then gdk-pixbuf-queryloaders looks modules in that location, and generates a modules cache with relative paths; otherwise, it still looks at that location, but generates a cache with absolute paths. In the later case, it will miss the modules that have not been installed by gdk-pixbuf itself. In the case of host-librsvg, that will miss the fact that librsvg just happened to have installed a module. Further down the road, packages that depend on host-librsvg, will get their PPD prepared, the path fixup hook run, so that the cache properly points to the current package's PPD, but the cache will not include the SVG module, which causes failures to load CVG images: Can't load file: Unrecognized image file format So, we need to tell gdk-pixbuf-queryloaders where the module path is, which restores the relativity of the paths it reports, by specifying the modules path pointing to the current package's PPD, passed in the environement variable GDK_PIXBUF_MODULEDIR. We need to do that at install time, so that the SVG module is properly listed in the cache, so that dependees can use it. A temporary cache is also generated at build time, but its usefullness is dubious; it seem to only be used by the test tool, which we do not run. However, for consistency-sake, we also fix that. Fixes: - http://autobuild.buildroot.org/results/0e00059b09b4445eaaec1030997883187c6a80d6 [0] This will trigger file-overwrite detection in the future... But we currently do not have infrastructure to properly handle such a cache. Signed-off-by: Fabrice Fontaine [yann.morin.1998 at free.fr: reword and extend an already-good commit log] Signed-off-by: Yann E. MORIN --- ...loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch | 41 ++++++++++++++++++++++ package/librsvg/librsvg.mk | 2 ++ 2 files changed, 43 insertions(+) diff --git a/package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch b/package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch new file mode 100644 index 0000000000..761ff92605 --- /dev/null +++ b/package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch @@ -0,0 +1,41 @@ +From 2c472bf55289ccbd7f305aa3e98d6fd70be4e3ab Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 19 Feb 2022 12:02:10 +0100 +Subject: [PATCH] gdk-pixbuf-loader/Makefile.am: set GDK_PIXBUF_MODULEDIR + +Set GDK_PIXBUF_MODULEDIR to gdk_pixbuf_moduledir before calling +gdk-pixbuf-query-loaders to build a correct gdk_pixbuf_cache_file and +gdk-pixbuf.loaders on 'exotic' systems + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/668] +--- + gdk-pixbuf-loader/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gdk-pixbuf-loader/Makefile.am b/gdk-pixbuf-loader/Makefile.am +index c3493736..de1f9641 100644 +--- a/gdk-pixbuf-loader/Makefile.am ++++ b/gdk-pixbuf-loader/Makefile.am +@@ -49,7 +49,7 @@ rsvg_loader_LDADD = \ + EXTRA_rsvg_loader_DEPENDENCIES = libpixbufloader-svg.la gdk-pixbuf-loaders + + gdk-pixbuf-loaders: Makefile +- $(AM_V_GEN) ( $(GDK_PIXBUF_QUERYLOADERS) ./libpixbufloader-svg.la && $(GDK_PIXBUF_QUERYLOADERS)) > gdk-pixbuf.loaders 2>/dev/null ++ $(AM_V_GEN) ( $(GDK_PIXBUF_QUERYLOADERS) ./libpixbufloader-svg.la && GDK_PIXBUF_MODULEDIR=$(gdk_pixbuf_moduledir) $(GDK_PIXBUF_QUERYLOADERS)) > gdk-pixbuf.loaders 2>/dev/null + + if CROSS_COMPILING + RUN_QUERY_LOADER_TEST=false +@@ -68,7 +68,7 @@ endif + install-data-hook: + @if $(RUN_QUERY_LOADER_TEST) ; then \ + $(mkinstalldirs) $(DESTDIR)$(gdk_pixbuf_binarydir) ; \ +- $(GDK_PIXBUF_QUERYLOADERS) > $(DESTDIR)$(gdk_pixbuf_cache_file) ; \ ++ GDK_PIXBUF_MODULEDIR=$(gdk_pixbuf_moduledir) $(GDK_PIXBUF_QUERYLOADERS) > $(DESTDIR)$(gdk_pixbuf_cache_file) ; \ + else \ + echo "***" ; \ + echo "*** Warning: loaders.cache not built" ; \ +-- +2.34.1 + diff --git a/package/librsvg/librsvg.mk b/package/librsvg/librsvg.mk index e4b1942b79..07a14b4366 100644 --- a/package/librsvg/librsvg.mk +++ b/package/librsvg/librsvg.mk @@ -20,6 +20,8 @@ HOST_LIBRSVG_DEPENDENCIES = host-cairo host-gdk-pixbuf host-libglib2 host-libxml LIBRSVG_LICENSE = LGPL-2.1+ LIBRSVG_LICENSE_FILES = COPYING.LIB LIBRSVG_CPE_ID_VENDOR = gnome +# We're patching gdk-pixbuf-loader/Makefile.am +LIBRSVG_AUTORECONF = YES ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) LIBRSVG_CONF_OPTS += --enable-introspection From yann.morin.1998 at free.fr Sun Feb 20 22:11:20 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 20 Feb 2022 23:11:20 +0100 Subject: [Buildroot] [PATCH v2, 2/2] package/librsvg: fix loaders.cache with with per-package directories In-Reply-To: <20220220121637.200393-2-fontaine.fabrice@gmail.com> References: <20220220121637.200393-1-fontaine.fabrice@gmail.com> <20220220121637.200393-2-fontaine.fabrice@gmail.com> Message-ID: <20220220221120.GA522310@scaer> Fabrice, All, On 2022-02-20 13:16 +0100, Fabrice Fontaine spake thusly: > host-librsvg invokes the gdk-pixbuf-queryloaders to update loaders.cache > (which is originally built by host-gdk-pixbuf). loaders.cache contains > the list of all the gdk-pixbuf modules; that includes paths to > dlopen()ed shared libs. host-librsvg must update this file to add the > path to its SVG shared library. > > By default, gdk-pixbuf-queryloaders uses a hardcoded path to find the > installed shared libs and this path will point to the location of the > host-gdk-pixbuf per-package directory. Obviously, this is wrong, the SVG > library installed by host-librsvg is installed in its own per-package > directory. > > So set GDK_PIXBUF_MODULEDIR to gdk_pixbuf_moduledir before calling > gdk-pixbuf-query-loaders to build a correct loaders.cache. > gdk_pixbuf_moduledir is already retrieved from host-pkgconfig in > configure.ac and so will point to the correct location (thanks to > PPD_FIXUP_PATHS). > > After this update, the loaders.cache will be correctly updated in > host-librsvg per-package directory and so the loaders.cache installed in > adwaita-icon-theme per-package directory will also be correct (thanks to > PPD_FIXUP_PATHS). > > This will fix the following PPD build failure of adwaita-icon-theme: > > Can't load file: Unrecognized image file format > > Fixes: > - http://autobuild.buildroot.org/results/0e00059b09b4445eaaec1030997883187c6a80d6 > > Signed-off-by: Fabrice Fontaine Thank you very much for expanding on your previous commit log. It indeed helps a lot to explain what is happening. Still, I felt I needed to understand a bit more about the issue: why did we have to fix it at build time for a file that is never isntalled? Also, since we now configure gdk-pixbuf in a relocatable way, why was the issue still happening? So I investigated a bit, and substancially rewrote the commit log with my findings. Still, I must say that your second commit log was already very good, and it really helped me understand the overall issue. Thanks for that! :-) Applied to master, thanks. Regards, Yann E. MORIN. > --- > Changes v1 -> v2 (after review of Yann E. Morin): > - Enhance commit message > - Add patch upstream status > > ...r-Makefile.am-set-GDK_PIXBUF_MODULED.patch | 41 +++++++++++++++++++ > package/librsvg/librsvg.mk | 2 + > 2 files changed, 43 insertions(+) > create mode 100644 package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch > > diff --git a/package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch b/package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch > new file mode 100644 > index 0000000000..761ff92605 > --- /dev/null > +++ b/package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch > @@ -0,0 +1,41 @@ > +From 2c472bf55289ccbd7f305aa3e98d6fd70be4e3ab Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Sat, 19 Feb 2022 12:02:10 +0100 > +Subject: [PATCH] gdk-pixbuf-loader/Makefile.am: set GDK_PIXBUF_MODULEDIR > + > +Set GDK_PIXBUF_MODULEDIR to gdk_pixbuf_moduledir before calling > +gdk-pixbuf-query-loaders to build a correct gdk_pixbuf_cache_file and > +gdk-pixbuf.loaders on 'exotic' systems > + > +Signed-off-by: Fabrice Fontaine > +[Upstream status: > +https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/668] > +--- > + gdk-pixbuf-loader/Makefile.am | 4 ++-- > + 1 file changed, 2 insertions(+), 2 deletions(-) > + > +diff --git a/gdk-pixbuf-loader/Makefile.am b/gdk-pixbuf-loader/Makefile.am > +index c3493736..de1f9641 100644 > +--- a/gdk-pixbuf-loader/Makefile.am > ++++ b/gdk-pixbuf-loader/Makefile.am > +@@ -49,7 +49,7 @@ rsvg_loader_LDADD = \ > + EXTRA_rsvg_loader_DEPENDENCIES = libpixbufloader-svg.la gdk-pixbuf-loaders > + > + gdk-pixbuf-loaders: Makefile > +- $(AM_V_GEN) ( $(GDK_PIXBUF_QUERYLOADERS) ./libpixbufloader-svg.la && $(GDK_PIXBUF_QUERYLOADERS)) > gdk-pixbuf.loaders 2>/dev/null > ++ $(AM_V_GEN) ( $(GDK_PIXBUF_QUERYLOADERS) ./libpixbufloader-svg.la && GDK_PIXBUF_MODULEDIR=$(gdk_pixbuf_moduledir) $(GDK_PIXBUF_QUERYLOADERS)) > gdk-pixbuf.loaders 2>/dev/null > + > + if CROSS_COMPILING > + RUN_QUERY_LOADER_TEST=false > +@@ -68,7 +68,7 @@ endif > + install-data-hook: > + @if $(RUN_QUERY_LOADER_TEST) ; then \ > + $(mkinstalldirs) $(DESTDIR)$(gdk_pixbuf_binarydir) ; \ > +- $(GDK_PIXBUF_QUERYLOADERS) > $(DESTDIR)$(gdk_pixbuf_cache_file) ; \ > ++ GDK_PIXBUF_MODULEDIR=$(gdk_pixbuf_moduledir) $(GDK_PIXBUF_QUERYLOADERS) > $(DESTDIR)$(gdk_pixbuf_cache_file) ; \ > + else \ > + echo "***" ; \ > + echo "*** Warning: loaders.cache not built" ; \ > +-- > +2.34.1 > + > diff --git a/package/librsvg/librsvg.mk b/package/librsvg/librsvg.mk > index e4b1942b79..07a14b4366 100644 > --- a/package/librsvg/librsvg.mk > +++ b/package/librsvg/librsvg.mk > @@ -20,6 +20,8 @@ HOST_LIBRSVG_DEPENDENCIES = host-cairo host-gdk-pixbuf host-libglib2 host-libxml > LIBRSVG_LICENSE = LGPL-2.1+ > LIBRSVG_LICENSE_FILES = COPYING.LIB > LIBRSVG_CPE_ID_VENDOR = gnome > +# We're patching gdk-pixbuf-loader/Makefile.am > +LIBRSVG_AUTORECONF = YES > > ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) > LIBRSVG_CONF_OPTS += --enable-introspection > -- > 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 Feb 20 22:18:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 23:18:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-ipython: security bump to version 7.31.1 In-Reply-To: <20220220215409.1740105-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 20 Feb 2022 22:54:09 +0100") References: <20220220215409.1740105-1-fontaine.fabrice@gmail.com> Message-ID: <87tuct89mu.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2022-21699: IPython (Interactive Python) is a command shell for > interactive computing in multiple programming languages, originally > developed for the Python programming language. Affected versions are > subject to an arbitrary code execution vulnerability achieved by not > properly managing cross user temporary files. This vulnerability allows > one user to run code as another on the same machine. All users are > advised to upgrade. > Also update indentation in hash file (two spaces) > https://github.com/ipython/ipython/security/advisories/GHSA-pq7m-3gw7-gq5x > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 20 22:18:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 23:18:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xdriver_xf86-video-mach64: don't override XDRIVER_XF86_VIDEO_MACH64_CONF_OPTS In-Reply-To: <20220220214203.1739006-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 20 Feb 2022 22:42:03 +0100") References: <20220220214203.1739006-1-fontaine.fabrice@gmail.com> Message-ID: <87pmnh89mc.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > XDRIVER_XF86_VIDEO_MACH64_CONF_OPTS is wrongly overridden in a > conditional since commit cf26ae7dd14f35dd917811f5a23c54a19ea6ed07 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 20 22:19:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 23:19:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xdriver_xf86-video-r128: don't override XDRIVER_XF86_VIDEO_R128_CONF_OPTS In-Reply-To: <20220220214236.1739049-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 20 Feb 2022 22:42:36 +0100") References: <20220220214236.1739049-1-fontaine.fabrice@gmail.com> Message-ID: <87ley589lv.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > XDRIVER_XF86_VIDEO_R128_CONF_OPTS is wrongly overridden in a conditional > since commit 082b65319c90ea5c9a89ff4ffed12af3a3e952b6 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 20 22:19:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 23:19:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xdriver_xf86-video-savage: don't override XDRIVER_XF86_VIDEO_SAVAGE_CONF_OPTS In-Reply-To: <20220220214302.1739087-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 20 Feb 2022 22:43:02 +0100") References: <20220220214302.1739087-1-fontaine.fabrice@gmail.com> Message-ID: <87h78t89l0.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > XDRIVER_XF86_VIDEO_SAVAGE_CONF_OPTS is wrongly overridden in a > conditional since commit c38103f2fe793ea5257d3f5b8413ece7a5c60538 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 20 22:19:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 23:19:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xdriver_xf86-video-tdfx: don't override XDRIVER_XF86_VIDEO_TDFX_CONF_OPTS In-Reply-To: <20220220214328.1739123-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 20 Feb 2022 22:43:28 +0100") References: <20220220214328.1739123-1-fontaine.fabrice@gmail.com> Message-ID: <87czjh89kv.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > XDRIVER_XF86_VIDEO_TDFX_CONF_OPTS is wrongly overridden in a conditional > since commit 7614ca037b2f82ac8e7cca1db3bf173d3655e0e2 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 20 22:18:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 23:18:45 +0100 Subject: [Buildroot] [git commit] package/x11r7/xdriver_xf86-video-mach64: don't override XDRIVER_XF86_VIDEO_MACH64_CONF_OPTS Message-ID: <20220220221236.738C78348D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3780409bfdb59dae2573f36293f53139132aa5e3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master XDRIVER_XF86_VIDEO_MACH64_CONF_OPTS is wrongly overridden in a conditional since commit cf26ae7dd14f35dd917811f5a23c54a19ea6ed07 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk b/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk index e6f8d7471c..eee8fec2e8 100644 --- a/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk +++ b/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk @@ -13,7 +13,7 @@ XDRIVER_XF86_VIDEO_MACH64_AUTORECONF = YES XDRIVER_XF86_VIDEO_MACH64_DEPENDENCIES = xserver_xorg-server xorgproto ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) -XDRIVER_XF86_VIDEO_MACH64_CONF_OPTS = --disable-dri +XDRIVER_XF86_VIDEO_MACH64_CONF_OPTS += --disable-dri endif $(eval $(autotools-package)) From peter at korsgaard.com Sun Feb 20 22:19:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 23:19:35 +0100 Subject: [Buildroot] [git commit] package/x11r7/xdriver_xf86-video-tdfx: don't override XDRIVER_XF86_VIDEO_TDFX_CONF_OPTS Message-ID: <20220220221236.90D798348D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=41feca427fdb91b50b442a5c540ba824755ea76b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master XDRIVER_XF86_VIDEO_TDFX_CONF_OPTS is wrongly overridden in a conditional since commit 7614ca037b2f82ac8e7cca1db3bf173d3655e0e2 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk index 8975334f90..14c40e4d89 100644 --- a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk +++ b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk @@ -16,7 +16,7 @@ XDRIVER_XF86_VIDEO_TDFX_DEPENDENCIES = \ xserver_xorg-server ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) -XDRIVER_XF86_VIDEO_TDFX_CONF_OPTS = --disable-dri +XDRIVER_XF86_VIDEO_TDFX_CONF_OPTS += --disable-dri endif $(eval $(autotools-package)) From peter at korsgaard.com Sun Feb 20 22:19:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 23:19:17 +0100 Subject: [Buildroot] [git commit] package/x11r7/xdriver_xf86-video-savage: don't override XDRIVER_XF86_VIDEO_SAVAGE_CONF_OPTS Message-ID: <20220220221236.877A98343E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e0a3e6a9219fe9969547244c85bdcf593e0a3941 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master XDRIVER_XF86_VIDEO_SAVAGE_CONF_OPTS is wrongly overridden in a conditional since commit c38103f2fe793ea5257d3f5b8413ece7a5c60538 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk index d7311aa918..102aa2c48e 100644 --- a/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk +++ b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk @@ -13,7 +13,7 @@ XDRIVER_XF86_VIDEO_SAVAGE_AUTORECONF = YES XDRIVER_XF86_VIDEO_SAVAGE_DEPENDENCIES = xserver_xorg-server libdrm xorgproto ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) -XDRIVER_XF86_VIDEO_SAVAGE_CONF_OPTS = --disable-dri +XDRIVER_XF86_VIDEO_SAVAGE_CONF_OPTS += --disable-dri endif $(eval $(autotools-package)) From peter at korsgaard.com Sun Feb 20 22:18:59 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 23:18:59 +0100 Subject: [Buildroot] [git commit] package/x11r7/xdriver_xf86-video-r128: don't override XDRIVER_XF86_VIDEO_R128_CONF_OPTS Message-ID: <20220220221236.7CD478348E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e08bfe2f9cb2d5e90ef1bc4af078fbd93e08ccf6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master XDRIVER_XF86_VIDEO_R128_CONF_OPTS is wrongly overridden in a conditional since commit 082b65319c90ea5c9a89ff4ffed12af3a3e952b6 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk b/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk index 455cfbad86..690041d4c6 100644 --- a/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk +++ b/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk @@ -12,7 +12,7 @@ XDRIVER_XF86_VIDEO_R128_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_R128_DEPENDENCIES = xserver_xorg-server xorgproto ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) -XDRIVER_XF86_VIDEO_R128_CONF_OPTS = --disable-dri +XDRIVER_XF86_VIDEO_R128_CONF_OPTS += --disable-dri endif $(eval $(autotools-package)) From peter at korsgaard.com Sun Feb 20 22:18:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 23:18:24 +0100 Subject: [Buildroot] [git commit] package/python-ipython: security bump to version 7.31.1 Message-ID: <20220220221236.690398343E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=aeb138911e773cf4011b81fc4fcec0037f366bb1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2022-21699: IPython (Interactive Python) is a command shell for interactive computing in multiple programming languages, originally developed for the Python programming language. Affected versions are subject to an arbitrary code execution vulnerability achieved by not properly managing cross user temporary files. This vulnerability allows one user to run code as another on the same machine. All users are advised to upgrade. Also update indentation in hash file (two spaces) https://github.com/ipython/ipython/security/advisories/GHSA-pq7m-3gw7-gq5x Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/python-ipython/python-ipython.hash | 8 ++++---- package/python-ipython/python-ipython.mk | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-ipython/python-ipython.hash b/package/python-ipython/python-ipython.hash index 5f591129a4..cd18c3d125 100644 --- a/package/python-ipython/python-ipython.hash +++ b/package/python-ipython/python-ipython.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/ipython/json -md5 f733048322cd34ce392ec5404813540b ipython-7.28.0.tar.gz -sha256 2097be5c814d1b974aea57673176a924c4c8c9583890e7a5f082f547b9975b11 ipython-7.28.0.tar.gz +md5 6907b67691ba697173a3befb2c35f7ac ipython-7.31.1.tar.gz +sha256 b5548ec5329a4bcf054a5deed5099b0f9622eb9ea51aaa7104d215fece201d8c ipython-7.31.1.tar.gz # Locally computed sha256 checksums -sha256 341afcbd729887b7046fe7b98fc4f4edff3aed8d38f06eefd9b30670f043df17 COPYING.rst -sha256 e0e390748ed440ab893ca1f135a88a920aaf5409dbb90a5b427c75c5e51268fb LICENSE +sha256 341afcbd729887b7046fe7b98fc4f4edff3aed8d38f06eefd9b30670f043df17 COPYING.rst +sha256 e0e390748ed440ab893ca1f135a88a920aaf5409dbb90a5b427c75c5e51268fb LICENSE diff --git a/package/python-ipython/python-ipython.mk b/package/python-ipython/python-ipython.mk index c669dd1b92..389ebfa897 100644 --- a/package/python-ipython/python-ipython.mk +++ b/package/python-ipython/python-ipython.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_IPYTHON_VERSION = 7.28.0 +PYTHON_IPYTHON_VERSION = 7.31.1 PYTHON_IPYTHON_SOURCE = ipython-$(PYTHON_IPYTHON_VERSION).tar.gz -PYTHON_IPYTHON_SITE = https://files.pythonhosted.org/packages/e2/c8/7046d0409a90e31263d5bbaa708347d522ac584a1140c01a951d9deb1792 +PYTHON_IPYTHON_SITE = https://files.pythonhosted.org/packages/fb/39/c1947dc1bb993a35469ca474535cb3214c91f5f9a7752a1fcbd9b6b37dde PYTHON_IPYTHON_LICENSE = BSD-3-Clause PYTHON_IPYTHON_LICENSE_FILES = COPYING.rst LICENSE PYTHON_IPYTHON_CPE_ID_VENDOR = ipython From peter at korsgaard.com Sun Feb 20 22:24:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 23:24:46 +0100 Subject: [Buildroot] [git commit] Update for 2022.02-rc2 Message-ID: <20220220221731.41DA082302@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f3d0d7e6ff1d1c723c3ab0c338d4ddf1ae415e69 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard --- CHANGES | 21 +++++++++++++++++++++ Makefile | 4 ++-- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 21 +++++++++++++++++++++ 4 files changed, 53 insertions(+), 11 deletions(-) diff --git a/CHANGES b/CHANGES index 4cc574d928..31315cad34 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,24 @@ +2022.02-rc2, released February 20th, 2022 + + Fixes all over the tree. + + Defconfigs: Friendlyarm Nanopi R2S: Fix U-Boot build, Kontron + BL i.MX8M Mini: Fix U-Boot build, PC Engines APU2: Fix Linux + build, ROC-RK3399-PC: Bump rootfs size to fix build + + Updated/fixed packages: apache, apparmor, apr-util, arp-scan, + binutils, bluez5_utils, connman, cryptsetup, dnsmasq, + dovecot-pigeonhole, expat, gdk-pixbuf, gst1-plugins-base, + guile, keepalived, kodi, libbpf, libglvnd, libgsasl, libiconv, + librsvg, libuhttpd, libusb, libv4l, luasyslog, mongrel2, neon, + pcre, perl-netaddr-ip, php, psmisc, python-ipython, + python-pycli, python-pygame, python-regex, python-twisted, + qt5location, qt5webkit, resiprocate, rygel, safeclib, + sdl2_ttf, socketcand, strongswan, sudo, systemd, toolchain, + urg, webkitgtk, wireless-regdb, wpewebkit, + xdriver_xf86-video-{ati,mach64,mga,r128,savage,tdfx}, xz, zfs, + zsh + 2022.02-rc1, released February 13th, 2022 Numerous package updates and many (80) new packages. diff --git a/Makefile b/Makefile index a4b7db69a7..d92438166f 100644 --- a/Makefile +++ b/Makefile @@ -92,9 +92,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2022.02-rc1 +export BR2_VERSION := 2022.02-rc2 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1644782000 +BR2_VERSION_EPOCH = 1645395000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/docs/website/download.html b/docs/website/download.html index 3d98fe48ee..7d9fad4d9f 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -76,37 +76,37 @@
          -

          Latest release candidate: 2022.02-rc1

          +

          Latest release candidate: 2022.02-rc2

          diff --git a/docs/website/news.html b/docs/website/news.html index 109dcb60f5..e571c86a2e 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,27 @@

          News

            +
          • +
            +
            +
            +

            2022.02-rc2 released

            +

            20 February 2022

            +
            +
            +

            2022.02-rc2 has been released with more cleanups and build fixes. See the + CHANGES + file for details.

            + +

            Head to the downloads page to pick up the + 2022.02-rc2 + release candidate, and report any problems found to the + mailing list or + bug tracker.

            +
            +
            +
          • +
          • From peter at korsgaard.com Sun Feb 20 22:30:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Feb 2022 23:30:47 +0100 Subject: [Buildroot] Buildroot 2022.02-rc2 released Message-ID: <878ru5892g.fsf@dell.be.48ers.dk> Hi, Buildroot 2022.02-rc2 is released - Go download it at: http://buildroot.net/downloads/buildroot-2022.02-rc2.tar.gz or http://buildroot.net/downloads/buildroot-2022.02-rc2.tar.xz Or get it from Git: git://git.buildroot.net/buildroot Another week, another release candidate. Please give it a spin and report any problems to the mailing list or bug tracker. Many thanks to the people contributing to this release: git shortlog -sn 2022.02-rc1.. 54 Fabrice Fontaine 6 Giulio Benetti 3 Adrian Perez de Castro 3 Peter Korsgaard 2 Bernd Kuhls 2 Luca Ceresoli 2 Peter Seiderer 2 Yann E. MORIN 1 Arnout Vandecappelle (Essensium/Mind) 1 James Hilliard 1 Marcus Hoffmann 1 Moritz Bitsch 1 Waldemar Brodkorb For more details, see the CHANGES file: http://git.buildroot.net/buildroot/plain/CHANGES?id=2022.02-rc2 -- Bye, Peter Korsgaard From peterlin at andestech.com Mon Feb 21 03:37:26 2022 From: peterlin at andestech.com (Yu Chien Peter Lin) Date: Mon, 21 Feb 2022 11:37:26 +0800 Subject: [Buildroot] [PATCH v3 1/3] board/andes: rearrange nds32 folder structure In-Reply-To: References: <20220215053327.4046-1-peterlin@andestech.com> Message-ID: Hi Giulio, On Thu, Feb 17, 2022 at 04:55:49PM +0100, Giulio Benetti wrote: > Hi Peter, > > On 15/02/22 06:33, Yu Chien Peter Lin wrote: > > Rearrange nds32 folder structure to add AE350 platform. > > > > Signed-off-by: Yu Chien Peter Lin > > Signed-off-by: Alan Kao > > --- > > .../patches/linux/0001-nds32-Fix-boot-messages-garbled.patch | 0 > > ...2-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch | 0 > > board/andes/{ => ae3xx}/readme.txt | 0 > > configs/andes_ae3xx_defconfig | 2 +- > > 4 files changed, 1 insertion(+), 1 deletion(-) > > rename board/andes/{ => ae3xx}/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch (100%) > > rename board/andes/{ => ae3xx}/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch (100%) > > rename board/andes/{ => ae3xx}/readme.txt (100%) > > Here we have both: > board/andes/ae3xx > and > board/andes/ae350 > > ae3xx should be use for every ae3xx family(ae350 included), but for ae350 > you use a specific folder. > What I see digging into ae3xx is that it is for FPGA demonstration, so I > would move ae3xx directory to be name as ae3xx-fpga. Otherwise I would > expect ae350(and newer parts) to be part of ae3xx. > > Same goes for the defconfig, I would name it like: > andes_ae3xx_fpga_defconfig > > This way we can divide the 2 typologies: > - fpga demonostration for ae3xx > - ae3xx SoC family > > Otherwise you should provide a single family folder(ae3xx) compatible for > both fpgas and SoCs. > > Thank you > > Best regards > -- > Giulio Benetti > Benetti Engineering sas For this naming issue, we decide to make ae3xx explicit to have these two platform residing in its own folder. So it would be: board/andes/ |- {ae3xx => ae300}/ `- ae350/ If this make sense to you, I will submit PATCH v4. Thanks, Yu Chien Peter Lin From mohd.faiz.rohani at gmail.com Mon Feb 21 05:16:45 2022 From: mohd.faiz.rohani at gmail.com (Mohd Faiz Rohani) Date: Mon, 21 Feb 2022 13:16:45 +0800 Subject: [Buildroot] Issue with login In-Reply-To: References: <186B6238-5452-4211-BD9D-29A3C921DE42@benettiengineering.com> <469c0dbc-6101-be6c-7272-400ac4512b86@grenoble.cnrs.fr> <4d8f6289-f16f-9602-a458-2b5836a817e6@benettiengineering.com> Message-ID: Hi guys, Thank you for your help.I have overlooked the required setting as normally I will leave the setting to the default, as I assume Buildroot has selected the required settings. Anyway I have managed to login successfully now. I have turned on BR2_PACKAGE_SYSTEMD_LOGIND and BR2_PACKAGE_UTIL_LINUX_LOGIN settings, while the rest does not change. Fyi, I have tried the newer versions of Linux Kernel (5.15) and Uboot (v2022.01) with the Linaro 7.5 toolchain, but got an error during the booting process where the RFS cannot be mounted. It may be my fault through the settings though, that is why I am trying the old version and it worked. I am planning to use Buildroot for my future development and keen to contribute wherever I can. Still lots to learn though. Thank you again guys. Regards. Faiz On Mon, Feb 21, 2022 at 2:33 AM Mohd Faiz Rohani wrote: > Thanks, I'll check them out. Will update the outcome once the installation > is done. > > Thank you. > > On Mon, Feb 21, 2022, 1:56 AM Giulio Benetti < > giulio.benetti at benettiengineering.com> wrote: > >> Hi Edgar, >> >> please reply to all in Mailing List, I add Mohd in Cc, >> >> On 20/02/22 17:18, Edgar Bonet wrote: >> > Hi! >> > >> > In his config file, Mohd wrote: >> >> BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_10=y >> >> BR2_LINUX_KERNEL_VERSION="4.4.155" >> > >> > This may cause problems. C.f. docs/manual/configure.txt: >> > >> > If you use kernel headers that are more recent than the Linux >> > kernel you run on your embedded system, then the C library might >> > be using interfaces that are not provided by your Linux kernel. >> >> Good catch Edgar! >> So Mohd, what you need here is a toolchain with older libc. >> >> https://buildroot.org/downloads/manual/manual.html#_cross_compilation_toolchain >> >> But again, do you really need to use so such old versions instead of try >> to use buildroot's beaglebone_defconfig? >> >> > In the same config file, there is: >> >> # BR2_PACKAGE_BUSYBOX is not set >> > >> > When disabling busybox, you should have seen the message: >> > >> > You may need to enable other packages to get a working system >> > You better know what you're doing! >> >> Despite of what I've written on my previous e-mail(my test was wrong), >> he has BR2_INIT_SYSTEMD=y that works as Init System, so that's ok. >> >> > And then: >> >> # BR2_PACKAGE_SYSTEMD_LOGIND is not set >> >> Good catch again Edgar! This ^^^ should be the point. Because it's >> exactly the systemd login dameon. >> >> >> # BR2_PACKAGE_UTIL_LINUX_LOGIN is not set >> >> This ^^^ is not selected by systemd, so I expect >> BR2_PACKAGE_SYSTEMD_LOGIND to do the job(even if I'm not a systemd >> expoert at all). >> >> But as Edgar pointed linux headers don't match so you have 3 choices: >> 1) find a toolchain with linux-headers <= 4.4.* >> 2) update linux version >> 3) start from scratch using buildroot beaglebone_defconfig >> >> Best regards >> -- >> Giulio Benetti >> Benetti Engineering sas >> > -------------- next part -------------- An HTML attachment was scrubbed... URL: From thomas.petazzoni at bootlin.com Mon Feb 21 07:05:34 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 21 Feb 2022 07:05:34 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-02-20 Message-ID: <20220221070541.E547A60BB1@smtp3.osuosl.org> Hello, Autobuild statistics for 2022-02-20 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 47 | 50 | 0 | 97 | 2021.11.x | 10 | 44 | 0 | 54 | master | 37 | 303 | 1 | 341 | Classification of failures by reason for master ----------------------------------------------- host-cmake-3.16.9 | 46 host-ncurses-6.1 | 46 host-gcc-initial-10.3.0 | 20 host-gettext-gnu-0.20.1 | 18 host-m4-1.4.19 | 15 host-python3-3.10.2 | 15 unknown | 15 host-libselinux-3.3 | 12 host-bison-3.8.2 | 7 host-flex-2.6.4 | 6 alsa-lib-1.2.6 | 5 host-binutils-2.36.1 | 5 acpica-20200717 | 4 bpftool-a7f0e7f057283ae8af3... | 4 host-gcc-initial-11.2.0 | 4 host-gcc-initial-arc-2020.0... | 4 agentpp-4.3.1 | 3 host-libtextstyle-0.20.1 | 3 host-mpfr-4.1.0 | 3 host-pkgconf-1.6.3 | 3 libopenssl-1.1.1m | 3 ncurses-6.1 | 3 berkeleydb-5.3.28 | 2 bluez5_utils-5.63 | 2 busybox-1.35.0 | 2 frr-8.1 | 2 host-attr-2.5.1 | 2 host-autoconf-2.71 | 2 host-libxml2-2.9.12 | 2 libzlib-1.2.11 | 2 acpid-2.0.33 | 1 acsccid-1.1.8 | 1 argp-standalone-1.3 | 1 atf-0.21 | 1 audit-3.0.7 | 1 axel-2.17.11 | 1 bird-2.0.8 | 1 civetweb-1.15 | 1 clamav-0.103.5 | 1 connman-1.41 | 1 dieharder-3.31.1 | 1 elfutils-0.186 | 1 gd-2.3.3 | 1 gstd-0.13.0 | 1 host-fakeroot-1.26 | 1 host-gettext-tiny-0.3.2 | 1 host-gmp-6.2.1 | 1 host-icu-70-1 | 1 host-libffi-3.4.2 | 1 host-libtool-2.4.6 | 1 host-mpc-1.2.1 | 1 host-pcre-8.45 | 1 host-swig-4.0.2 | 1 host-util-linux-2.37.3 | 1 host-xz-5.2.5 | 1 libiconv-1.15 | 1 libnl-3.5.0 | 1 librtlsdr-ed0317e6a58c09887... | 1 libsamplerate-0.1.9 | 1 libtirpc-1.3.2 | 1 libusb-1.0.25 | 1 libuwsc | 1 linux-pam-1.5.2 | 1 openjpeg-2.4.0 | 1 osm2pgsql-1.6.0 | 1 pcsc-lite-1.9.5 | 1 pulseview-0.4.2 | 1 python-greenlet-1.1.2 | 1 python-pygame-d61ea8eabd56 | 1 ruby-3.1.0 | 1 snmppp-3.4.2 | 1 sqlite-3.37.2 | 1 toolchain-external-codesour... | 1 wavemon-0.9.4 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- nios2 | acpica-20200717 | NOK | http://autobuild.buildroot.net/results/3530201460e591148e72d68a11109ab8350eeade | m68k | acpica-20200717 | NOK | http://autobuild.buildroot.net/results/08f8f216ca4b33eb0b10e255d45591419de9e822 | arm | acpica-20200717 | NOK | http://autobuild.buildroot.net/results/1671322f56e65086d99ac4f314b0af5c7f0e6c3c | sh4 | acpica-20200717 | NOK | http://autobuild.buildroot.net/results/666756f2a11b55822e5755ee73ba55dff6aa6bef | mips | acpid-2.0.33 | NOK | http://autobuild.buildroot.net/results/edfda442c3a36ce9646fc88f91c1fd022448f57a | ORPH x86_64 | acsccid-1.1.8 | NOK | http://autobuild.buildroot.net/results/f8dfbf86ba69fe19279765243509d4dc37c0562c | aarch64 | agentpp-4.3.1 | NOK | http://autobuild.buildroot.net/results/8f53b3767de4b716c5dc024b5745896483fa3cc0 | arc | agentpp-4.3.1 | NOK | http://autobuild.buildroot.net/results/2016a2b8d0a9352c7a91711daaebfcd17b11e60e | i586 | agentpp-4.3.1 | NOK | http://autobuild.buildroot.net/results/25368602e193dfa47ee7efa10f436227da2a7828 | mips64el | alsa-lib-1.2.6 | NOK | http://autobuild.buildroot.net/results/9a248dba32248a1b134539df8bdfea58708ac0fc | microblazeel | alsa-lib-1.2.6 | NOK | http://autobuild.buildroot.net/results/c4ce54e3e8a1c2647f770b02ca493fac29ea18ba | x86_64 | alsa-lib-1.2.6 | NOK | http://autobuild.buildroot.net/results/28c914e8c1a507860ced9d31d385e98430c5b1bf | sparc | alsa-lib-1.2.6 | NOK | http://autobuild.buildroot.net/results/c85ca51d1fbbe3470bafb16b8f0859af67a445ae | powerpc64le | alsa-lib-1.2.6 | NOK | http://autobuild.buildroot.net/results/8c6b41922a5d7f6a0f4f6925f5510ff0b1991e16 | i686 | argp-standalone-1.3 | NOK | http://autobuild.buildroot.net/results/2e071593928689257e9342c3a1acbf527a053063 | arm | atf-0.21 | NOK | http://autobuild.buildroot.net/results/a46e3b508e95bc15a5b1f07174281a5414aebe69 | ORPH arm | audit-3.0.7 | NOK | http://autobuild.buildroot.net/results/8b19480650c923644ee0abf455ec5c2e1a133700 | arm | axel-2.17.11 | NOK | http://autobuild.buildroot.net/results/d5ee8bcac65413b5396853e93083c7cf73ba2b32 | mipsel | berkeleydb-5.3.28 | NOK | http://autobuild.buildroot.net/results/8ba71c470bafe8b0b65cdfc5b3b06b06014477e2 | ORPH x86_64 | berkeleydb-5.3.28 | NOK | http://autobuild.buildroot.net/results/869ef5f0f87da0b16553e2175ec365627610412c | ORPH arm | bird-2.0.8 | NOK | http://autobuild.buildroot.net/results/cd18354044450426616761a120c842f8e8a6d25d | mips64el | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/408fe05c60cfd227c67588fb99d95e26546f1e62 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/20688b309f32d1025f6a54141d5ed6dcb27abd0f | or1k | bpftool-a7f0e7f057283ae8af3... | NOK | http://autobuild.buildroot.net/results/dea546184521b22b7ecf4c506b95b88adf4f4566 | m68k | bpftool-a7f0e7f057283ae8af3... | NOK | http://autobuild.buildroot.net/results/951fb47b67501b90a36b635351c60c5376313a12 | arm | bpftool-a7f0e7f057283ae8af3... | NOK | http://autobuild.buildroot.net/results/a62ee58c5cabaa0355b99471e54dec55984fe31c | or1k | bpftool-a7f0e7f057283ae8af3... | NOK | http://autobuild.buildroot.net/results/673a4b1b599335aa93582d2e51c03805bd8508b5 | x86_64 | busybox-1.35.0 | NOK | http://autobuild.buildroot.net/results/63da2d2e4b23a9345497b1349f50c1abbd58e9cb | ORPH mips64el | busybox-1.35.0 | NOK | http://autobuild.buildroot.net/results/26d13876229871ec0917ee5ece1431ef15e2fee7 | ORPH mips64el | civetweb-1.15 | NOK | http://autobuild.buildroot.net/results/93a848d2e44675ee977b90563b585dd111afe915 | ORPH i686 | clamav-0.103.5 | NOK | http://autobuild.buildroot.net/results/df925655dabd7e72e0cecaea353a1a6b45b9e9db | x86_64 | connman-1.41 | NOK | http://autobuild.buildroot.net/results/74da4f4deab5f0ae9405d063ad52a5d4904a964d | powerpc64le | dieharder-3.31.1 | NOK | http://autobuild.buildroot.net/results/90798958f1d8f01ea511d865fd39b2d237f79594 | sparc | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/1dc3245ef598237f58929a5d8de1b67e294002a1 | ORPH xtensa | frr-8.1 | NOK | http://autobuild.buildroot.net/results/0c66628bf6a9266f58f916923cb9f83aeb9012ab | xtensa | frr-8.1 | NOK | http://autobuild.buildroot.net/results/c382f75d78ad7f23c10a1c8049c8382205f8d90e | i686 | gd-2.3.3 | NOK | http://autobuild.buildroot.net/results/c4fc4ec0a9b77406a70ae069654169ffa7759b6b | ORPH mips64el | gstd-0.13.0 | NOK | http://autobuild.buildroot.net/results/69c5388e0e0e838de20ac694069129b5cc0f3f12 | ORPH arm | host-attr-2.5.1 | NOK | http://autobuild.buildroot.net/results/308a72134f32db06b84d3afabcd3ce8a50cca3f1 | powerpc | host-attr-2.5.1 | NOK | http://autobuild.buildroot.net/results/851f64d219cc9c65caf9617f59b71564b704b564 | arc | host-autoconf-2.71 | NOK | http://autobuild.buildroot.net/results/25f9f0eef3cff74595acbd4c927ac7e532bc91b4 | ORPH riscv64 | host-autoconf-2.71 | NOK | http://autobuild.buildroot.net/results/a68b364af47f5382bf45036106df6a98c1f45646 | ORPH arm | host-binutils-2.36.1 | NOK | http://autobuild.buildroot.net/results/8658c28049138196352dad5da62f4ca710481a27 | xtensa | host-binutils-2.36.1 | NOK | http://autobuild.buildroot.net/results/da70e5ebe34d2d74bd92c95540822ab9fe9e8488 | arm | host-binutils-2.36.1 | NOK | http://autobuild.buildroot.net/results/1752d86d85aba10168a7911eb4c9ed1d199cdf2d | s390x | host-binutils-2.36.1 | NOK | http://autobuild.buildroot.net/results/54a9bc94bb6fe159b631bd7acc17a96ac67adf08 | microblazeel | host-binutils-2.36.1 | NOK | http://autobuild.buildroot.net/results/cc5407e4cef852225e34e16eda5f912bd0b524f2 | powerpc | host-bison-3.8.2 | NOK | http://autobuild.buildroot.net/results/2a2e6b0eec7683d930b4e5a17689a68d5b94dc01 | ORPH arm | host-bison-3.8.2 | NOK | http://autobuild.buildroot.net/results/853366b37ea980d55f36650be606f830c0024e85 | ORPH powerpc | host-bison-3.8.2 | NOK | http://autobuild.buildroot.net/results/03d2cc88c92d60fb56ee61a08f0bb4028255e3c7 | ORPH nds32le | host-bison-3.8.2 | NOK | http://autobuild.buildroot.net/results/686c01548258315d275af7643156fd3679b1e3dc | ORPH microblazeel | host-bison-3.8.2 | NOK | http://autobuild.buildroot.net/results/532186e97e61c2095449aaaf01880badfc07ba02 | ORPH arm | host-bison-3.8.2 | NOK | http://autobuild.buildroot.net/results/f0df4a936554a8453e4d63fe68622a03369a4dac | ORPH sparc | host-bison-3.8.2 | NOK | http://autobuild.buildroot.net/results/d5d4b1a150567f57aaff71869785ad11f6b93c08 | ORPH arm | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/3ce0133f3eb7e112715bf32d86c2362e5a93f64d | m68k | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/9bdbfdd94f0f1bf5c4d9b53cbb8e5702b4f9a3c7 | arm | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/7775f6418f12a78f1050f2c5504069295eff9a90 | arm | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/57ef5a8f72710748b7b2c3645fbc2efed6eb6221 | riscv64 | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/7cd462669bbc9239bedf9f74ec090f85849ffd9e | arm | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/9dc290c02d771e39bb02e68a662cddf68184e58f | arm | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/708656c912a1079c55862603b49fc7ccd843822c | arm | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/0237a52b594003a5548a01934324d2fecf35d1af | x86_64 | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/ff3815907bf2d5ab1189bc8112fc6abefaf7d5ce | x86_64 | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/2639a567c20f0b27faa6a731656016833b5516fc | powerpc64 | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/bbd310e08a2a2b372832a334fa3cce5abdf8e139 | x86_64 | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/f9b5d752b18e6b75ff6c2b6641edf1d55881311f | riscv64 | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/93e5da8a0f049cc3ea6ca5fa8868cff962698367 | powerpc | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/022ddccd7a6be9ebe7487132bce2b2c48b603a6a | x86_64 | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/018dee9cd7ddf5d7722fff72ac198d1a6e4db2b7 | powerpc | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/09dacbbca0eda2ef4e4985a158c881b9fe47aee0 | microblazeel | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/f098e324116d156a77f73a1aa8437f8a54294855 | riscv32 | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/a006f43a4b48bb8e1a71b27e54c07b5c6daa6074 | arm | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/0f4ece5fa0b0441fe087e04a14485cf2fa38b654 | x86_64 | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/9352536ff40d9de24d0f984c3f14b4de3d3e046c | x86_64 | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/66caf505b5ce7aaaca8d0bc8cbab06cc72758342 | x86_64 | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/f53c017f4896aa421982d97c8b59b921f62d4d97 | arm | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/2df41004d2d96f1f701a10055c211172d895df98 | arm | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/12da101ba5431880cc409d4bfd4700c6e39f7ffa | riscv64 | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/4cdc0f1c1c1dba14be259266ee881f7b57e3188f | arm | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/8dd449889294bac649b628e9bad3919ca07cf6dd | sparc | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/53903c80b04d8eedecb91972b6c8e2b7db0c1861 | x86_64 | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/d05e8c284178c44bac5eff7294def1572c6dcf1e | nds32le | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/900ddd6e93bb964d512434c3654bff7b9a56cf63 | arm | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/5fe0dabcb0fd58b11a6eab3a198e24f1b7a95526 | m68k | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/26cb9fcc36b42efae9b42081a67518c7e8bd2a5b | microblazeel | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/4abfebf29884584a3836a9d29c0fa8e5e30029de | nds32le | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/46a4e18d4526e0fb1e9065f277381ab95fe1b00f | arm | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/e80a60b6bb60fd962a326c3f8041d625b4c08f03 | mips64el | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/3eb7d1e8349139d08ddc8001286ea54636c593c3 | mips64el | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/5e73023d69304ea072615eb50b38f5667a987fe9 | sh4 | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/51ec75473ccd78c76b371ae7d98e434a726f6b32 | mips64el | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/10a5271ebcf7a5ed739916c7b30b9c7b9cd3e681 | nios2 | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/ea100dc10189981ce013a6e808965567b2861dde | mips64el | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/2d954650b56d49eca72ede76f811410ae6310e8c | arm | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/c1aa9db62135726b52aec68eb81e40d073e0d557 | powerpc | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/12d2f441c07b639c5fbdf1041462c12d560ea402 | nios2 | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/db3651195838ddef846a5b3ee33e430929bd6727 | nios2 | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/d1a635558d7ded24acd0bfe0d6d88e2f58a35536 | xtensa | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/49e470356d98be2bb872dc227c8e6f5f93773013 | arm | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/f020f100b5c3e345d14fdab3091bb7e19a416975 | arm | host-fakeroot-1.26 | NOK | http://autobuild.buildroot.net/results/75085a7ca278df438f277153e99a997d0381f1f9 | ORPH arm | host-flex-2.6.4 | NOK | http://autobuild.buildroot.net/results/e2f78cc61c8f0e731ea63108558246bb2b2c39b5 | ORPH arm | host-flex-2.6.4 | NOK | http://autobuild.buildroot.net/results/ba9391abf6841fcd9f6f62f48573de3301e2de2b | ORPH arm | host-flex-2.6.4 | NOK | http://autobuild.buildroot.net/results/78240849717e7a6931f9c30580b7a496b920dd02 | ORPH mipsel | host-flex-2.6.4 | NOK | http://autobuild.buildroot.net/results/1d1b5c83e1f4b714afcafa12a476ad922e344241 | ORPH x86_64 | host-flex-2.6.4 | NOK | http://autobuild.buildroot.net/results/e313446a0b597968118f617a7c1a1ac13fd17ac5 | ORPH m68k | host-flex-2.6.4 | NOK | http://autobuild.buildroot.net/results/8f575694d0e46cb8346948585c8065144d84082d | ORPH s390x | host-gcc-initial-10.3.0 | NOK | http://autobuild.buildroot.net/results/f03039af210d65a333a14e028ade1fab48084736 | powerpc | host-gcc-initial-10.3.0 | NOK | http://autobuild.buildroot.net/results/a80bccc0ccde7a43c1722dd6660679057c9233ef | xtensa | host-gcc-initial-10.3.0 | NOK | http://autobuild.buildroot.net/results/f559bba0e87529f7ee42ea5c30c7a15665f32a46 | arm | host-gcc-initial-10.3.0 | NOK | http://autobuild.buildroot.net/results/d60b16617d53cf676244bbcb8fec3e996ef8720f | powerpc | host-gcc-initial-10.3.0 | NOK | http://autobuild.buildroot.net/results/1c184af067464020285ac5da18bd9c6d188064d0 | arm | host-gcc-initial-10.3.0 | NOK | http://autobuild.buildroot.net/results/55a8782bcc4bcbda6e1c5b6c91195b45966f4d89 | powerpc | host-gcc-initial-10.3.0 | NOK | http://autobuild.buildroot.net/results/c3d2f0069dd5c6de57d96519c128181dd6f0ea69 | powerpc | host-gcc-initial-10.3.0 | NOK | http://autobuild.buildroot.net/results/7d0e49b78cb47d9b1b9190cf3c759a33706011b2 | s390x | host-gcc-initial-10.3.0 | NOK | http://autobuild.buildroot.net/results/b9957d5ca0708bdf6b277136bbb10b9cee509b45 | microblazeel | host-gcc-initial-10.3.0 | NOK | http://autobuild.buildroot.net/results/dcbaabe423977126311a009c0c10ddd3bd0182e3 | riscv64 | host-gcc-initial-10.3.0 | NOK | http://autobuild.buildroot.net/results/a0940c528ff3bb52761e5e9c7114072dc52bae34 | s390x | host-gcc-initial-10.3.0 | NOK | http://autobuild.buildroot.net/results/d24a0f6468af9f6b219b2ea87eb995423d20955b | powerpc | host-gcc-initial-10.3.0 | NOK | http://autobuild.buildroot.net/results/d96a99c5fa00404b7d8aa92a127b46a9f68bcb48 | microblazeel | host-gcc-initial-10.3.0 | NOK | http://autobuild.buildroot.net/results/e7ed2dcb7cb42b05be15713aeb26818742941508 | riscv64 | host-gcc-initial-10.3.0 | NOK | http://autobuild.buildroot.net/results/694e7db77d388cbb191554e2e8106d2fd730b913 | arm | host-gcc-initial-10.3.0 | NOK | http://autobuild.buildroot.net/results/114aafc637d3d2b5570eb0a793974d0246a91579 | riscv64 | host-gcc-initial-10.3.0 | NOK | http://autobuild.buildroot.net/results/532fd659b51321742b2529b301426b5cae24a36b | microblazeel | host-gcc-initial-10.3.0 | NOK | http://autobuild.buildroot.net/results/e6b90734968eb443a1d1ae3d9ad075f73a20176b | riscv64 | host-gcc-initial-10.3.0 | NOK | http://autobuild.buildroot.net/results/c46213c5eef048637a2cdba3d595823490f6635a | arm | host-gcc-initial-10.3.0 | NOK | http://autobuild.buildroot.net/results/28751bc7ac4c2ecd25ad689e74a1cdec304af830 | arm | host-gcc-initial-11.2.0 | NOK | http://autobuild.buildroot.net/results/2152ec1ec6a8d1f0364256c12003bb32d2827275 | arm | host-gcc-initial-11.2.0 | NOK | http://autobuild.buildroot.net/results/5ae09dbf90637d62056ab11f8ea9580db99d66e8 | arm | host-gcc-initial-11.2.0 | NOK | http://autobuild.buildroot.net/results/4a2e2bcc6bc29d860658f974b82688536dac1de2 | arm | host-gcc-initial-11.2.0 | NOK | http://autobuild.buildroot.net/results/39688e1f711145176bde1919c687ebd1dca65d65 | arc | host-gcc-initial-arc-2020.0... | NOK | http://autobuild.buildroot.net/results/2cd5947c6248d425b78658fa2911b3ca103991a0 | arc | host-gcc-initial-arc-2020.0... | NOK | http://autobuild.buildroot.net/results/f9f0b45488226e55464d90330ea350f4c91739c5 | arc | host-gcc-initial-arc-2020.0... | NOK | http://autobuild.buildroot.net/results/127224d67cde1070d4a0fb98b060f789633bceff | arc | host-gcc-initial-arc-2020.0... | NOK | http://autobuild.buildroot.net/results/7d0dda8152d68fa3a23f9f3c651bad6c34e3f0e6 | m68k | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/870c711031349cbd608cea516ae4710a2a4e5034 | ORPH arm | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/11f67a38914289d52d85472994a64c73376d7de9 | ORPH riscv64 | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/aae1869566641dbeb74f011d0d8d4607d8fd2f0b | ORPH arm | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/a7b44d4d9b7ab83701f0cfc1df38bead07ab9f18 | ORPH sparc64 | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/f463868207adbd6e15f66c737d9da025055fc845 | ORPH nios2 | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/41f79cfef1564f4dc50b4d10b15ebe4da9f5f68c | ORPH x86_64 | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/2a58ac9efdef6093c3be56dc2fffe906a9bce586 | ORPH powerpc64le | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/115bdb135a03c2b04ea49df3568d89125917d02d | ORPH arm | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/0c46607f8faa54618dabc0f7e35a9716836b4ee7 | ORPH or1k | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/cf1de1c70df9995b89eb29dd194553b014e91acf | ORPH arc | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/6f213cd1fea751fe13845f1a57290c0846e976be | ORPH mips64el | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/db6a930295a519333eb197ac6051e9526baa5fd6 | ORPH mipsel | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/368c7b3be0c72ef6619b6ee1c61fbd85504bd691 | ORPH nios2 | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/d2520277c123ec9c83fc1aa016ad77bce50fc80b | ORPH riscv64 | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/4a30df93e278ff0d0373c05d81a71e091fce764d | ORPH mips64el | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/e0c0b4955539e416dc9d22e25b33d9e5f559a46c | ORPH xtensa | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/684ee467247154b0ca835ca9997e78c6bddaeac8 | ORPH arm | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/f3f0555e14c7c285bb14d56d613f7301fb55268e | ORPH mips64el | host-gettext-tiny-0.3.2 | NOK | http://autobuild.buildroot.net/results/80d6d56964d97bb40888cff574a768655625ee46 | arm | host-gmp-6.2.1 | NOK | http://autobuild.buildroot.net/results/72d2470dffcaf8091206e7d81368ea20ee57d314 | ORPH microblazeel | host-icu-70-1 | NOK | http://autobuild.buildroot.net/results/748667c39567469876f527ff036a89b6b66067e7 | ORPH aarch64 | host-libffi-3.4.2 | NOK | http://autobuild.buildroot.net/results/cee32154aa5be2804ddfdcc487a53a65e1d7aef8 | arc | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/a83a7550b892a54a64ea3e93e3ba47b8e1bb1e28 | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/f87e35538909da714d433c1f680b0c3976b76577 | sparc64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/f1803776147652c46abddb26b7851c7d8f8ef772 | sh4 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/286ab3c6bcb1766aa9dac3f75d1b9f673277c6b8 | i686 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/c4dbf7cf6d82d7b206efcd0bd821130a45817adb | arc | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/72d8181857460c7b9a177fd7334d8ce543751080 | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/9bd944e514735af80da0c20cfdd91c7e6211039c | mips64el | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/ff81f72c42aa5d4282d6c30f506348784688d82e | sparc | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/8a8aa929f27c3518dcf0871ad62c6ada218ce1a3 | mips64el | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/3992d8c99a2ebc333b038e6fca832e56e060278d | sh4 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/b4d16477833e7865b080bb431586cb678eb75e5c | microblazeel | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/c2f0ba52c1c0a0c5394107fb57bb473409aad60c | i686 | host-libtextstyle-0.20.1 | NOK | http://autobuild.buildroot.net/results/ea79ff2e65789874ea0e5cbd8ed9e6e930d27e2d | ORPH arm | host-libtextstyle-0.20.1 | NOK | http://autobuild.buildroot.net/results/7f492852b71a12aa87243f1024f39baead627f54 | ORPH powerpc64le | host-libtextstyle-0.20.1 | NOK | http://autobuild.buildroot.net/results/4a4790b46eea9a4c8a926f909f47280a1d31adfd | ORPH arm | host-libtool-2.4.6 | NOK | http://autobuild.buildroot.net/results/d5f25920ddf38ee12858dbb99976b54ccb3276ca | ORPH x86_64 | host-libxml2-2.9.12 | NOK | http://autobuild.buildroot.net/results/25a2bf49e972c76780c73a0b9c4f3d5be65d8152 | or1k | host-libxml2-2.9.12 | NOK | http://autobuild.buildroot.net/results/ee4e4ec1d546244b522ff7693cdeb16725f5e712 | sparc | host-m4-1.4.19 | NOK | http://autobuild.buildroot.net/results/620b1055e34139f4d747de01949d8e9ce49179fe | ORPH mipsel | host-m4-1.4.19 | NOK | http://autobuild.buildroot.net/results/bbf0af7ce3f4bce936a760c7d7605f830b10ae61 | ORPH x86_64 | host-m4-1.4.19 | NOK | http://autobuild.buildroot.net/results/7f89ac9e3925bea56272745332147fb1b331a326 | ORPH mips64el | host-m4-1.4.19 | NOK | http://autobuild.buildroot.net/results/53b36952c6d179d069570cea312d2b4054c933e0 | ORPH mipsel | host-m4-1.4.19 | NOK | http://autobuild.buildroot.net/results/30c80c7a5c0dcacba357272c1fcf73b7801c3afc | ORPH x86_64 | host-m4-1.4.19 | NOK | http://autobuild.buildroot.net/results/8ad62acbc96c02f943b0305560d0cec3b8449d76 | ORPH arm | host-m4-1.4.19 | NOK | http://autobuild.buildroot.net/results/3b1a102e3eb9b6e24c6abf6a7644e8c4f24504de | ORPH mips64el | host-m4-1.4.19 | NOK | http://autobuild.buildroot.net/results/c420b5da0a5c9dd143de4a42e15187c4b84e0809 | ORPH mips64el | host-m4-1.4.19 | NOK | http://autobuild.buildroot.net/results/d2e5c11b4b6fe262d36e66ac96916fea2569fefb | ORPH mips64el | host-m4-1.4.19 | NOK | http://autobuild.buildroot.net/results/33775b6bda4e5e7ff833b6e2c4dc54813ead8e82 | ORPH riscv64 | host-m4-1.4.19 | NOK | http://autobuild.buildroot.net/results/101c5e893d1750cbc61fc99650c1bfe2ccb90f78 | ORPH nds32le | host-m4-1.4.19 | NOK | http://autobuild.buildroot.net/results/b557a6910dda6282c5054692552263dd6d0aff9b | ORPH powerpc64le | host-m4-1.4.19 | NOK | http://autobuild.buildroot.net/results/7d39e7e2f669ca41b44ac4dbfef3843eb68b70c1 | ORPH arm | host-m4-1.4.19 | NOK | http://autobuild.buildroot.net/results/22d92b7c2bc076f327b3f02873d3a4ebeb3660ec | ORPH sparc | host-m4-1.4.19 | NOK | http://autobuild.buildroot.net/results/8573a1aa6de3c5b88c3ac045ad8f6f3558e3f841 | ORPH s390x | host-mpc-1.2.1 | NOK | http://autobuild.buildroot.net/results/a4f726bacc0a9866105f80fbb92cd436ffa36749 | ORPH arc | host-mpfr-4.1.0 | NOK | http://autobuild.buildroot.net/results/8d93e3429e6e48ddb14a53f91028aae96ae3cf63 | ORPH arc | host-mpfr-4.1.0 | NOK | http://autobuild.buildroot.net/results/d08709fef7acbc500a27bba50c9dcc78434e6b6e | ORPH riscv64 | host-mpfr-4.1.0 | NOK | http://autobuild.buildroot.net/results/690199ae1abd82af15b29c94f016ada124c74e49 | ORPH mipsel | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/a04f2c354fe48511ae7a15e8d935f2988e7b6038 | ORPH arc | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/dbc3474989c221555a5cf72cbe624cb58b473165 | ORPH x86_64 | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/aa0ea01295cd1e137de786d8656ef013b9e1e499 | ORPH riscv64 | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/8cc8fd9c711db6926468f8016016044afc6afb67 | ORPH mips | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/0d5eff0831a2cfb2d3f80a268971cb4e0c27c14a | ORPH m68k | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/ff3faab487ef49f2fada151f0a0c6dc5ec4e6d1f | ORPH microblazeel | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/53566f29c98238e843f507518202e5c47d560f57 | ORPH x86_64 | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/fca5f4054ccdb00e0fdfdc3cdb4e35306b862104 | ORPH xtensa | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/3fa2f66b82974976baef8dd7c44f3cdde1032bde | ORPH nios2 | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/196fc2932c6a9d831d84846a2a7edb931ed12fb0 | ORPH i686 | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/657c7e3c05c53e6fd0b40a4e8882d39039471347 | ORPH mips64el | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/ee5eb267d46a03f64a04047f398f76e7aa24291b | ORPH sh4 | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/2c180d8ebce140d2f4a851fb043884df9a31f76f | ORPH powerpc | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/7f3bdcbf4750cd7f2b63c1ebad471dab76ff5d9c | ORPH i586 | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/1c770956544f0030eac2a655bc86d8ccaa4f7e0a | ORPH mipsel | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/a67cebe85b39e936aca53107f48fe723c62f39a5 | ORPH arc | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/ed3c67d49eed7a16421bbc48ca9c506447da5532 | ORPH arm | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/753458ab9edc5d37d4ff89ade77dd22624ff3b2d | ORPH i586 | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/009c4ed6b390c12205a815185f7d3e9607add74c | ORPH arm | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/e617016acdd42f6785e947a7f1635faa4de20467 | ORPH mips64el | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/a6942b87fe7d27baacf13924df36fe6a8bd534c2 | ORPH sparc | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/f8ff6399b092ed76ed8e820ebe11ca071f5693f9 | ORPH mips | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/d451ca99d3d472fdd581f30ddd12332f4ccf35b4 | ORPH mips64el | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/7aae9826558894d4122cf25ffe159fa653a36a7f | ORPH arm | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/b388297f5ff86075926d9c19348d00ceecec669f | ORPH mipsel | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/e577e59e3405d24843d4b16d57c0a18ff57af546 | ORPH arm | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/e9f7d59e036844b5df2a0098fb9c0d77391c46c9 | ORPH arm | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/382585ec23743a330da057f094e764761a1cdfc2 | ORPH arm | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/cce84296ecb8a2aa06c417486c4ffa5d825a951d | ORPH x86_64 | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/5590a501d2bdcd73ceaf85d2ea79ae7ffe7b3ba2 | ORPH arm | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/da7d5bffbedcea4d8d33f8212cc2ab35556976ba | ORPH arm | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/867a3826dd86bcf89779f58a58ce313d5a8fc335 | ORPH i686 | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/f5d3113f6b1acbcb8230cc2992125415bc6bf549 | ORPH xtensa | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/a752b6368dadf00e6f0b11504c799eeda30313d1 | ORPH arm | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/b4a268fa72693e516494c223a762f38a0620cff6 | ORPH arm | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/0b606b53e55c87a44b288eb8ce58734b7f1cc70b | ORPH arm | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/af11e7c2c95ef8c911988443338a8cca56d03aab | ORPH mips64el | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/fb810c0694706997cf1d4fdbf818d54b7f03622e | ORPH arm | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/683aac9f140a20e6f7933fb04de68ead8d5a7520 | ORPH aarch64 | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/8fb79c0d6475908c207fab7bac7e33a73bba95a0 | ORPH riscv32 | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/66b9a81f1a9b960a96fcf6bb19331b72c693a310 | ORPH microblazeel | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/9a07fa6792545c48988fb8055b7d004a4dccfd67 | ORPH i686 | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/2793bfbeb4399ddbb8f2c35695476517995cfe11 | ORPH or1k | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/fe4a702f2fd5da58a40145a2f7a6acb9d6571a20 | ORPH or1k | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/586b4b31cdd7561c848728ceae022b15c05b107f | ORPH riscv32 | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/087e10d1022f298dac8b6b11052e6f18860b482c | ORPH xtensa | host-pcre-8.45 | NOK | http://autobuild.buildroot.net/results/db772a46ee0d0e2a19fc6bba3c0e4cd16e686ba3 | ORPH i586 | host-pkgconf-1.6.3 | NOK | http://autobuild.buildroot.net/results/10815078a3e060ac73be31c7611ce32f80c0dca7 | ORPH arm | host-pkgconf-1.6.3 | NOK | http://autobuild.buildroot.net/results/6f7de6528764f9536ac73ca7344268b7f4f82847 | ORPH mips64el | host-pkgconf-1.6.3 | NOK | http://autobuild.buildroot.net/results/534a1fa059b26a845eaaf93bfc7abdb6eb494bd0 | ORPH powerpc | host-python3-3.10.2 | NOK | http://autobuild.buildroot.net/results/4e977ae94e768f8f45e49989fc20d35fc7ba0367 | arm | host-python3-3.10.2 | NOK | http://autobuild.buildroot.net/results/ab88a869b2688430f6abe79878faea013362549a | riscv32 | host-python3-3.10.2 | NOK | http://autobuild.buildroot.net/results/71df7ed82d7e9fb3bfb89b5a4dedfba439c938a1 | mipsel | host-python3-3.10.2 | NOK | http://autobuild.buildroot.net/results/e6cf2dd1a289e98b89d6623b1d872c5b8f2544a9 | nios2 | host-python3-3.10.2 | NOK | http://autobuild.buildroot.net/results/6d273a836655b08a74b953a15523d43de0ed9e5c | mipsel | host-python3-3.10.2 | NOK | http://autobuild.buildroot.net/results/ff18371dd9c13af9c057b3bf06835eb8f16efb94 | riscv32 | host-python3-3.10.2 | NOK | http://autobuild.buildroot.net/results/5eccf195e624369957b09164bdabb56ea1f4f3fd | mips64el | host-python3-3.10.2 | NOK | http://autobuild.buildroot.net/results/ac88d0fba46fc9da3d49c182f01edbc9d20d94ab | nios2 | host-python3-3.10.2 | NOK | http://autobuild.buildroot.net/results/7db43790cb8cdc51533a1fd0fd3add6082fe1a69 | sparc64 | host-python3-3.10.2 | NOK | http://autobuild.buildroot.net/results/725a4e0e8b6f3f256ce3754ea4ba1a68e69d1654 | mipsel | host-python3-3.10.2 | NOK | http://autobuild.buildroot.net/results/052678b50a0c422c35e996dae8c8a757b3e6fd1f | m68k | host-python3-3.10.2 | NOK | http://autobuild.buildroot.net/results/fb8802683a18fc30a7a96cca4f054f17f2d98fcd | m68k | host-python3-3.10.2 | NOK | http://autobuild.buildroot.net/results/0ac0d153b602c12e21584894ae9a3f542255de89 | arm | host-python3-3.10.2 | NOK | http://autobuild.buildroot.net/results/d7cfa0eacf8894e9472e67741352c9840a7d3702 | x86_64 | host-python3-3.10.2 | NOK | http://autobuild.buildroot.net/results/649e07a9d51ae798152cf63b7f1ca2ddbc26d467 | m68k | host-swig-4.0.2 | NOK | http://autobuild.buildroot.net/results/1e25675fcc4dc770496614318e203b642ce9cb3c | nios2 | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/b3b57f88321c7f6710a5b93270296fd3895f0423 | ORPH arm | host-xz-5.2.5 | NOK | http://autobuild.buildroot.net/results/b0eabc30b4dc51ed29628d27f991732a1872085a | ORPH arm | libiconv-1.15 | NOK | http://autobuild.buildroot.net/results/cfa52189d9778e55386bd8470dc9c68360624d53 | ORPH sh4 | libnl-3.5.0 | NOK | http://autobuild.buildroot.net/results/3e776dc204d9a599041a52902eb2b25af68b2e14 | ORPH powerpc64le | libopenssl-1.1.1m | NOK | http://autobuild.buildroot.net/results/550fff194b12f7c1531c74177ab7fafe45c36932 | arm | libopenssl-1.1.1m | NOK | http://autobuild.buildroot.net/results/b8317fbcf5a97c7a95c2c205e5fefd3ceec7b1b8 | or1k | libopenssl-1.1.1m | NOK | http://autobuild.buildroot.net/results/534d5bce5c2a3ebf2b156f000da0eea3a3bdb250 | arc | librtlsdr-ed0317e6a58c09887... | NOK | http://autobuild.buildroot.net/results/fb34753d0b2191c73f0418f28c08ef1a9bc19ba7 | i586 | libsamplerate-0.1.9 | NOK | http://autobuild.buildroot.net/results/b74e4a5dcffa15ddf370db759e9803a1ccf27591 | ORPH powerpc | libtirpc-1.3.2 | NOK | http://autobuild.buildroot.net/results/e9e982e5439b6f4fbf425cfe233477eef393ac48 | powerpc64 | libusb-1.0.25 | NOK | http://autobuild.buildroot.net/results/94fcf202db66760ef448f148de01cfc3e406e653 | arm | libuwsc | TIM | http://autobuild.buildroot.net/results/0cdc8095062ad980da9c75ea23e93d3b672200df | arc | libzlib-1.2.11 | NOK | http://autobuild.buildroot.net/results/ef1b9f540ea8abe1a5fdf1820478c8e0e3e5e515 | ORPH mips | libzlib-1.2.11 | NOK | http://autobuild.buildroot.net/results/266b14b0446f96acd4623a0cb6cb6d1e476a7875 | ORPH mips64el | linux-pam-1.5.2 | NOK | http://autobuild.buildroot.net/results/4d5a5adc9a9148ade9a239a93db7e9880ca18923 | ORPH arm | ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/cfc11637305598516dbd8cabb0dc9710bbae506e | ORPH i686 | ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/83cab5f79ea923050484b2c10787344511f6fa91 | ORPH x86_64 | ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/c1ac13e97a0b8a4b74f2d35f571899309b81ae28 | ORPH x86_64 | openjpeg-2.4.0 | NOK | http://autobuild.buildroot.net/results/9130ebdbd227902d2836aeeb33de1b37ac47f4c4 | powerpc | osm2pgsql-1.6.0 | NOK | http://autobuild.buildroot.net/results/e9394aa3b785b09a491f27a1b69dc946a1523333 | riscv64 | pcsc-lite-1.9.5 | NOK | http://autobuild.buildroot.net/results/6c04e50a544ee7efea0ef80cada19acf6c6b1a85 | ORPH arm | pulseview-0.4.2 | NOK | http://autobuild.buildroot.net/results/032f69d67b2fc996349347ff86b02d794df882f4 | arm | python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/98c61da822599a4af6a4adda60e7eabe3616f928 | powerpc | python-pygame-d61ea8eabd56 | NOK | http://autobuild.buildroot.net/results/1b81851b0c7f039296bbe01ca19e831926f96945 | riscv64 | ruby-3.1.0 | NOK | http://autobuild.buildroot.net/results/877f26a006cebf531fcf71d06abdc931f570b5b7 | microblazeel | snmppp-3.4.2 | NOK | http://autobuild.buildroot.net/results/93bfa52af6f0d448f2f5697222b1dd6c53b5e74c | arm | sqlite-3.37.2 | NOK | http://autobuild.buildroot.net/results/995270afbd20931b43bc5b638ad0c137c0426d42 | arm | toolchain-external-codesour... | NOK | http://autobuild.buildroot.net/results/e64f613c617dda3828ca21dd3b7eda2b7f8800e2 | ORPH arm | unknown | NOK | http://autobuild.buildroot.net/results/2c3a3fe2c69fa1bb4c11eef8397c1cfc0cf83c87 | arm | unknown | NOK | http://autobuild.buildroot.net/results/bad306bab8de44c08f80779fb1b0fcbba6a29bea | arm | unknown | NOK | http://autobuild.buildroot.net/results/51494266d2d636fec7c8fb604690e39719272326 | riscv64 | unknown | NOK | http://autobuild.buildroot.net/results/9fc411081b02f0808ac0aa35542ab1cbe33a5d71 | i686 | unknown | NOK | http://autobuild.buildroot.net/results/830e8b954b78c43901c9e6228a6e14709686b04b | arm | unknown | NOK | http://autobuild.buildroot.net/results/e27eb187a037e800a5e06eb6780bed66330781bd | nds32le | unknown | NOK | http://autobuild.buildroot.net/results/f51596e45f41750c7e2d3501d54703837e8b84de | arm | unknown | NOK | http://autobuild.buildroot.net/results/0b67ac70254589cf8085dce4be531b743f242990 | arm | unknown | NOK | http://autobuild.buildroot.net/results/e0e395bdc31e5fa013a922faf7d4aeb2b572a3a7 | xtensa | unknown | NOK | http://autobuild.buildroot.net/results/1d392c260820faea3a469afdb5aa698deda2c233 | arc | unknown | NOK | http://autobuild.buildroot.net/results/74ab5cd320a415fe949d84bb3b0ce326697ed52c | arc | unknown | NOK | http://autobuild.buildroot.net/results/43c8034dc85983c7bb3f51d812984d9cba53da80 | riscv64 | unknown | NOK | http://autobuild.buildroot.net/results/c1ed54003841728bc2ed9c4572a758080f827cbe | nios2 | unknown | NOK | http://autobuild.buildroot.net/results/f58bbd2bbad6608be6df83601f0be4d5dc2e996a | mipsel | unknown | NOK | http://autobuild.buildroot.net/results/400c6cd7dccab27eae65a3663084c460895fe18c | arm | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/0eaf0b392463297ed3cde3f74d53aa337517b247 | Classification of failures by reason for 2021.02.x -------------------------------------------------- host-ncurses-6.1 | 12 host-cmake-3.15.5 | 8 host-gcc-initial-9.4.0 | 6 host-gettext-gnu-0.20.1 | 5 alsa-lib-1.2.4 | 4 host-bison-3.7.1 | 3 host-flex-2.6.4 | 2 acl-2.2.53 | 1 bluez5_utils-5.62 | 1 busybox-1.33.2 | 1 host-autoconf-2.69 | 1 host-gcc-initial-arc-2020.0... | 1 host-m4-1.4.18 | 1 host-python3-3.9.9 | 1 ncurses-6.1 | 1 rocksdb-6.13.3 | 1 unknown | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | acl-2.2.53 | NOK | http://autobuild.buildroot.net/results/57d89025010766ac8b774c2b054d6d1cc5604846 | arm | alsa-lib-1.2.4 | NOK | http://autobuild.buildroot.net/results/3e9db1da6d3b185f4a9adfa3673fe302129faa48 | aarch64 | alsa-lib-1.2.4 | NOK | http://autobuild.buildroot.net/results/fd6b7b90b904ef2b6066bbc3f57d6ba8a17f9572 | aarch64 | alsa-lib-1.2.4 | NOK | http://autobuild.buildroot.net/results/37e385276909657caba765fc686be73f6c5434dc | powerpc | alsa-lib-1.2.4 | NOK | http://autobuild.buildroot.net/results/c8c20ef74329e6da01e5372da9b474a445c8827d | nios2 | bluez5_utils-5.62 | NOK | http://autobuild.buildroot.net/results/c1103f421e14eb3810a00b1f05c71d85a72bdc13 | aarch64 | busybox-1.33.2 | NOK | http://autobuild.buildroot.net/results/41aed9996699ce944503af88ab247d10a37563a2 | ORPH arm | host-autoconf-2.69 | NOK | http://autobuild.buildroot.net/results/12b93650cc31769ae1c9b85f7dea0c9edb908512 | ORPH riscv64 | host-bison-3.7.1 | NOK | http://autobuild.buildroot.net/results/3db18f89666e4703e95d68605b986a1bfa7e7e42 | ORPH m68k | host-bison-3.7.1 | NOK | http://autobuild.buildroot.net/results/ded26d3cea53a2d6ea30bc5797cc4bca9afcd31a | ORPH powerpc | host-bison-3.7.1 | NOK | http://autobuild.buildroot.net/results/343ed7fe555824498ae443ffbd3c2b054d859713 | ORPH aarch64 | host-cmake-3.15.5 | NOK | http://autobuild.buildroot.net/results/87594a0bd50f85fff7aad7c63260a52ec44ab10b | mipsel | host-cmake-3.15.5 | NOK | http://autobuild.buildroot.net/results/74963d4b93d94720b0105df2c095e20bde4e16e3 | aarch64 | host-cmake-3.15.5 | NOK | http://autobuild.buildroot.net/results/a80f8016aee3306272de66bea7b590d1011a7fb4 | nios2 | host-cmake-3.15.5 | NOK | http://autobuild.buildroot.net/results/952cafc12bfae80a29fa09e62db4ff4923c834c1 | mips | host-cmake-3.15.5 | NOK | http://autobuild.buildroot.net/results/988ab1c20ec6afe594f9eedb020f63b32df9de78 | arm | host-cmake-3.15.5 | NOK | http://autobuild.buildroot.net/results/446bced66e6d41a17553f51008290acf16de278c | m68k | host-cmake-3.15.5 | NOK | http://autobuild.buildroot.net/results/85af99cc6a46055ccd6d0bf5b3213a7bab03bc7e | sparc | host-cmake-3.15.5 | NOK | http://autobuild.buildroot.net/results/5531459d268263ee848fa901f74f31c7bfa6f447 | riscv64 | host-flex-2.6.4 | NOK | http://autobuild.buildroot.net/results/5d03915d7127d106a3ef97fb72fb8e1fa8e9ff67 | ORPH riscv64 | host-flex-2.6.4 | NOK | http://autobuild.buildroot.net/results/6b8db27c5716107f36778214e57448dace48f2ea | ORPH xtensa | host-gcc-initial-9.4.0 | NOK | http://autobuild.buildroot.net/results/088e3eadd204a3beaedc9fdcbb0118441adc24ba | arm | host-gcc-initial-9.4.0 | NOK | http://autobuild.buildroot.net/results/5da0ae2824258713d9a0d7935bd390a7cebdc601 | arm | host-gcc-initial-9.4.0 | NOK | http://autobuild.buildroot.net/results/0d84bcc1a843e31eeafe76276df8852852f0ff44 | arm | host-gcc-initial-9.4.0 | NOK | http://autobuild.buildroot.net/results/b52f8ee6c37ed5b3e5df0a47bd3a7950be1d0d9c | riscv64 | host-gcc-initial-9.4.0 | NOK | http://autobuild.buildroot.net/results/e8a60c7c5ce0737f70e9d6a7e5f97ccdce44c009 | arm | host-gcc-initial-9.4.0 | NOK | http://autobuild.buildroot.net/results/f90dcda46f624bf528ceb3da9666a932ade8aa5c | arc | host-gcc-initial-arc-2020.0... | NOK | http://autobuild.buildroot.net/results/9ae55331c43bdf82a755fe8d3001369814afe509 | arm | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/1f9b9b37317e98269b81a511fc027ff9d5228cbd | ORPH arm | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/b9292e0a3f780b3fd980d7f1ad4cd7b54190ac54 | ORPH arm | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/0ae6d19b915c7166a660c51d94297c5fce38eee8 | ORPH i586 | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/9ee3795ccbdb8c33f6fd25a3a4740d030ee1192c | ORPH nds32le | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/530c15ef5553a5797c55594b89c068dc445e1cc8 | ORPH arm | host-m4-1.4.18 | NOK | http://autobuild.buildroot.net/results/a266d1c18d907e0259ee6929b2133239b4384637 | ORPH aarch64 | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/3ab5eb00373a92634fc4dc92a13a2064a67462f2 | ORPH m68k | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/3d1785032146b39054137edc31c979c91c8f64b6 | ORPH microblazeel | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/72d1128ece4ceaaafb926f07edaf2034a364cf1e | ORPH aarch64 | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/75706e47e808d5d9fd8ea4303aba3fd133ca4f9d | ORPH powerpc | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/e7d392f9a921e154461ac5560d7d04b0b712187b | ORPH x86_64 | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/84464b7592277f1ad6cfb0dd04979a2fa5f7764b | ORPH sparc64 | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/7d21f92fcb8e66e913343a4072dd07b735b7b62d | ORPH or1k | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/d67461a4e3726751e1eb9cfb1c6a2221c82da620 | ORPH arm | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/f14155349a473450572f6de4e55ec42af10fa199 | ORPH arm | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/facdc94d27e857d35e2cc2cf945a0bea01718ca4 | ORPH powerpc | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/fcdcf487aa6c4b1dbbacf00195532788e0f910b0 | ORPH m68k | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/2d5a5e03fffc70fe9cc143788aca7ca3a81289e8 | ORPH mips | host-python3-3.9.9 | NOK | http://autobuild.buildroot.net/results/4c1a4332193529fa2fe53a551de8910e01d2d79c | arm | ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/9099255c88836c7998326c8b2a435698f4dbbb0b | ORPH m68k | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/445d6869cffdc75da80351abeb1a5587f848386e | arc | unknown | NOK | http://autobuild.buildroot.net/results/469a8e4a78ef627fe64c60af3fe8d1c3128dda17 | Classification of failures by reason for 2021.11.x -------------------------------------------------- host-cmake-3.16.9 | 6 host-ncurses-6.1 | 6 host-gcc-initial-10.3.0 | 5 host-gettext-gnu-0.20.1 | 5 host-m4-1.4.19 | 3 host-binutils-2.36.1 | 2 host-python3-3.9.9 | 2 acl-2.3.1 | 1 busybox-1.34.1 | 1 flex-2.6.4 | 1 host-bison-3.8.2 | 1 host-gmp-6.2.1 | 1 host-libffi-3.4.2 | 1 host-mpfr-4.1.0 | 1 host-python-2.7.18 | 1 libgpiod-1.6.3 | 1 libiconv-1.15 | 1 libvorbis-1.3.7 | 1 mpfr-4.1.0 | 1 ncurses-6.1 | 1 openal-1.21.1 | 1 unknown | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64el | acl-2.3.1 | NOK | http://autobuild.buildroot.net/results/e04187f1d55d4e457cebab61beec4838d67d1391 | xtensa | busybox-1.34.1 | NOK | http://autobuild.buildroot.net/results/c4afb1b48f388b21a3ef65b4e5d90e17d8606887 | ORPH mips64el | flex-2.6.4 | NOK | http://autobuild.buildroot.net/results/6791b65bb4e30bde9098de7ffe299854703a2ec3 | ORPH powerpc | host-binutils-2.36.1 | NOK | http://autobuild.buildroot.net/results/7b63718702d23e054d8ca59fa93db98e5ad76311 | microblazeel | host-binutils-2.36.1 | NOK | http://autobuild.buildroot.net/results/690ca4d5b6897160589f57eb37c15869a4acd9c3 | s390x | host-bison-3.8.2 | NOK | http://autobuild.buildroot.net/results/371868f35d95503fd08e61c487ae92170aa71376 | ORPH arm | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/fa037470ca7bc6b817ea80dd327e2a03521ec546 | x86_64 | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/c9420a37ce29d3bbf2de3f2c24e6d7f3b8a6ec9d | arm | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/186f2eca9d9dade52070712e7075362a9b435ff2 | nds32le | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/e036723739a437c93e95d8c2034ef4dd3ae1531a | mipsel | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/08cf12e4abda470660ef1cf6ec1b866bc87bbbec | nios2 | host-cmake-3.16.9 | NOK | http://autobuild.buildroot.net/results/d700240e81c2a177646c48593aec654135aeaee7 | microblazeel | host-gcc-initial-10.3.0 | NOK | http://autobuild.buildroot.net/results/5b44c69db1244ef0a9903b030b3a6ec2a010a632 | powerpc | host-gcc-initial-10.3.0 | NOK | http://autobuild.buildroot.net/results/a484a2888c552ff01754657633098e45ab5fc718 | powerpc | host-gcc-initial-10.3.0 | NOK | http://autobuild.buildroot.net/results/c9c8b5ac15cb789196a3942351de802a346a44ce | arm | host-gcc-initial-10.3.0 | NOK | http://autobuild.buildroot.net/results/55dbd731ba0517387693e6417c425e29860ef0a9 | powerpc | host-gcc-initial-10.3.0 | NOK | http://autobuild.buildroot.net/results/e5a739805e087019facbe9164c3959831f7a770b | i586 | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/1700e4fe273f8b2c62ed8aaf0b9deb4121be2d7e | ORPH nios2 | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/750cda121e5cfb72c2cce55fbc6493f257dde799 | ORPH x86_64 | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/85f15d58e8588f37711656a94ccd19e7b2e9a16c | ORPH mipsel | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/96beeb980a07970fd128b38bb2d83e1b9ef17015 | ORPH x86_64 | host-gettext-gnu-0.20.1 | NOK | http://autobuild.buildroot.net/results/7b5a4c33d212712db29b27cab185e51c1ffeb381 | ORPH arm | host-gmp-6.2.1 | NOK | http://autobuild.buildroot.net/results/06636ae6085527259dbc7c1384400b46a545652d | ORPH powerpc | host-libffi-3.4.2 | NOK | http://autobuild.buildroot.net/results/8534661cac8ecb474dd789165a354fa9225d3cbc | nios2 | host-m4-1.4.19 | NOK | http://autobuild.buildroot.net/results/96fe66be74a3ac540fff3e745d4bd76744fcf5c3 | ORPH nios2 | host-m4-1.4.19 | NOK | http://autobuild.buildroot.net/results/f1de38389f75e5e7cacd55c5cd4040c621443e8e | ORPH x86_64 | host-m4-1.4.19 | NOK | http://autobuild.buildroot.net/results/482587a7a91855fec06c8de41950cd8f46157e9f | ORPH powerpc | host-mpfr-4.1.0 | NOK | http://autobuild.buildroot.net/results/a46d4867accbe2a7b5738afde0afe4fca045fecc | ORPH or1k | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/6d1a99e9c0ec95cea334639d8df7a2e461ec9440 | ORPH m68k | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/74f3e8ce4f41710c36c5ecb8f67a0bec671d0729 | ORPH powerpc64le | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/3f492d9c39f505bb5a04b9a07c049409a361647e | ORPH arm | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/f0640891ae75e5590b9a7c4f7dfb06afd14bbe71 | ORPH arm | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/1a729cfd9de579c7a692bb53e29ac1a4738638de | ORPH riscv32 | host-ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/a2c8074dd5f06137ff922821ec76ad1f25b967af | ORPH arm | host-python-2.7.18 | NOK | http://autobuild.buildroot.net/results/1ecebba8e9f0dfe247b3ce1426356b92cc89bc68 | m68k | host-python3-3.9.9 | NOK | http://autobuild.buildroot.net/results/ee5cf72ef37eb9e42d204d7b9ac767ae612ca7d7 | mips64el | host-python3-3.9.9 | NOK | http://autobuild.buildroot.net/results/ccdc58cb3f6e46189ca8b8bc371834c9c7e9b009 | powerpc | libgpiod-1.6.3 | NOK | http://autobuild.buildroot.net/results/bd75d187d9b92b11eeafed4fd62eae71fbf6df1c | powerpc | libiconv-1.15 | NOK | http://autobuild.buildroot.net/results/6377402a3264bd7a8604a6dc2f7785591c702bbc | ORPH nds32le | libvorbis-1.3.7 | NOK | http://autobuild.buildroot.net/results/b0047fc3292f06dd8e5229556c6b6e2f4d2c1d4b | nds32le | mpfr-4.1.0 | NOK | http://autobuild.buildroot.net/results/06a5a82d39393b736978bfeb0545b15b8d09c388 | ORPH arm | ncurses-6.1 | NOK | http://autobuild.buildroot.net/results/93c88483823dace7dce0f3a682e8e9c2affea917 | ORPH or1k | openal-1.21.1 | NOK | http://autobuild.buildroot.net/results/8d0a7b4206668d4f1c6ae17c201b51f9734f7077 | mips | unknown | NOK | http://autobuild.buildroot.net/results/b93b9409610fdcebf7e88b7048c4960a50da55ac | Gitlab CI results for 2022-02-20 ================================ Detail of runtime-test failures for master ------------------------------------------ runtime-test | link to the job | orph? --------------------------+---------------------------------------------------------------+------ TestIPythonPy3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2088683795 | ORPH TestLuaLuasyslog | https://gitlab.com/buildroot.org/buildroot/-/jobs/2088683903 | ORPH TestLxc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2088683908 | ORPH TestPythonPy3Pyyaml | https://gitlab.com/buildroot.org/buildroot/-/jobs/2088684091 | ORPH TestRust | https://gitlab.com/buildroot.org/buildroot/-/jobs/2088684137 | ORPH TestRustBin | https://gitlab.com/buildroot.org/buildroot/-/jobs/2088684141 | ORPH Packages having a newer version =============================== name | found by | link to release-monitoring.org | version | upstream | orph? -------------------------------+----------+----------------------------------------------+--------------+--------------+------- ace | DISTRO | https://release-monitoring.org/project/242395 | 7.0.1 | 7.0.6 | 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.3 | 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_r32 | apparmor | DISTRO | https://release-monitoring.org/project/94819 | 3.0.3 | 3.0.4 | armadillo | DISTRO | https://release-monitoring.org/project/07006 | 9.900.2 | 10.8.2 | assimp | DISTRO | https://release-monitoring.org/project/06988 | 5.1.6 | 5.2.1 | asterisk | DISTRO | https://release-monitoring.org/project/09838 | 16.21.1 | 19.2.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 | autoconf-archive | DISTRO | https://release-monitoring.org/project/00142 | 2021.02.19 | 2022.02.11 | 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 batctl | DISTRO | https://release-monitoring.org/project/14740 | 2021.0 | 2022.0 | batman-adv | DISTRO | https://release-monitoring.org/project/19529 | 2021.4 | 2022.0 | 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.1.2 | ORPH bdwgc | DISTRO | https://release-monitoring.org/project/17108 | 8.0.6 | 8.2.0 | belle-sip | DISTRO | https://release-monitoring.org/project/14378 | 4.4.8 | 5.1.2 | belr | DISTRO | https://release-monitoring.org/project/80042 | 4.4.8 | 5.1.2 | 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.18.0 | ORPH binutils | DISTRO | https://release-monitoring.org/project/07981 | 2.36.1 | 2.38 | bird | DISTRO | https://release-monitoring.org/project/00192 | 2.0.8 | 2.0.9 | 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.2 | 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.5.0 | ORPH chartjs | DISTRO | https://release-monitoring.org/project/85785 | 2.9.4 | 3.7.1 | 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.5 | 0.104.2 | clang | DISTRO | https://release-monitoring.org/project/11811 | 9.0.1 | 13.0.1 | cmake | DISTRO | https://release-monitoring.org/project/00306 | 3.16.9 | 3.22.2 | cog | DISTRO | https://release-monitoring.org/project/21333 | 0.12.0 | 0.13.3 | containerd | DISTRO | https://release-monitoring.org/project/16460 | 1.5.9 | 1.6.0 | cups | DISTRO | https://release-monitoring.org/project/00380 | 2.4.0 | 2.4.1 | cups-filters | DISTRO | https://release-monitoring.org/project/05541 | 1.28.10 | 1.28.12 | 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 | daq3 | DISTRO | https://release-monitoring.org/project/212345 | 3.0.5 | 3.0.6 | 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.2 | 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.7 | ORPH delve | DISTRO | https://release-monitoring.org/project/40149 | 1.8.0 | 1.8.1 | dialog | DISTRO | https://release-monitoring.org/project/00431 | 1.3-20200327 | 1.3-20220117 | ORPH docker-compose | DISTRO | https://release-monitoring.org/project/06185 | 1.24.1 | 2.2.3 | dovecot | DISTRO | https://release-monitoring.org/project/00456 | 2.3.17.1 | 2.3.18 | drbd-utils | DISTRO | https://release-monitoring.org/project/00462 | 9.19.0 | 9.20.2 | dt | DISTRO | https://release-monitoring.org/project/21844 | 18.32 | 21.27 | ORPH duktape | DISTRO | https://release-monitoring.org/project/21345 | 2.6.0 | 2.7.0 | ed | DISTRO | https://release-monitoring.org/project/00659 | 1.17 | 1.18 | 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.1 | 1.26.2 | 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.3 | ell | DISTRO | https://release-monitoring.org/project/17781 | 0.47 | 0.48 | enlightenment | DISTRO | https://release-monitoring.org/project/00698 | 0.25.1 | 0.25.3 | erlang | DISTRO | https://release-monitoring.org/project/00707 | 22.3.4.22 | 24.2.1 | 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 | exempi | DISTRO | https://release-monitoring.org/project/00767 | 2.5.2 | 2.6.1 | fakeroot | DISTRO | https://release-monitoring.org/project/12048 | 1.26 | 1.27 | ORPH 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.27 | 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.3 | flare-engine | DISTRO | https://release-monitoring.org/project/21433 | 1.12 | 1.13.04 | flare-game | DISTRO | https://release-monitoring.org/project/21434 | 1.12 | 1.13.04 | 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 | 6.0.0 | ORPH fontconfig | DISTRO | https://release-monitoring.org/project/00827 | 2.13.1 | 2.13.96 | ORPH fuse-overlayfs | DISTRO | https://release-monitoring.org/project/101220 | 1.5.0 | 1.8.2 | fwts | DISTRO | https://release-monitoring.org/project/17383 | 21.11.00 | 22.01.00 | gauche | DISTRO | https://release-monitoring.org/project/00873 | 0.9.9 | 0.9.11 | gcr | DISTRO | https://release-monitoring.org/project/11801 | 3.40.0 | 3.41.0 | ORPH gdbm | DISTRO | https://release-monitoring.org/project/00882 | 1.22 | 1.23 | 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.6 | gettext-gnu | DISTRO | https://release-monitoring.org/project/00898 | 0.20.1 | 0.21 | ORPH git | DISTRO | https://release-monitoring.org/project/05350 | 2.31.1 | 2.35.1 | glib-networking | DISTRO | https://release-monitoring.org/project/21353 | 2.70.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.1.1 | gnutls | DISTRO | https://release-monitoring.org/project/01221 | 3.7.2 | 3.7.3 | gobject-introspection | DISTRO | https://release-monitoring.org/project/01223 | 1.70.0 | 1.71.0 | ORPH gqrx | DISTRO | https://release-monitoring.org/project/09771 | 2.14.4 | 2.15.8 | granite | DISTRO | https://release-monitoring.org/project/05410 | 6.0.0 | 6.2.0 | ORPH grpc | DISTRO | https://release-monitoring.org/project/19117 | 1.43.0 | 1.44.0 | 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 gst1-imx | DISTRO | https://release-monitoring.org/project/21846 | 0.13.1 | 2.0.0 | 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.6.0 | gtksourceview | DISTRO | https://release-monitoring.org/project/07724 | 3.24.7 | 5.3.2 | guile | DISTRO | https://release-monitoring.org/project/01277 | 3.0.7 | 3.0.8 | 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.90 | 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.3 | harfbuzz | DISTRO | https://release-monitoring.org/project/01299 | 3.3.2 | 3.4.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.355 | 0.356 | ORPH i2pd | DISTRO | https://release-monitoring.org/project/21355 | 2.40.0 | 2.41.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.37 | ORPH imagemagick | DISTRO | https://release-monitoring.org/project/01372 | 7.1.0-19 | 7.1.0-25 | ORPH imlib2 | DISTRO | https://release-monitoring.org/project/21676 | 1.7.3 | 1.8.0 | inotify-tools | DISTRO | https://release-monitoring.org/project/08864 | 3.20.2.2 | 3.22.1.0 | ORPH intel-mediadriver | DISTRO | https://release-monitoring.org/project/20341 | 22.1.1 | 22.2.1 | intel-mediasdk | DISTRO | https://release-monitoring.org/project/21814 | 22.1.0 | 22.2.1 | intel-microcode | DISTRO | https://release-monitoring.org/project/20614 | 20210608 | 20220207 | ORPH iperf3 | DISTRO | https://release-monitoring.org/project/01389 | 3.10.1 | 3.11 | 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.21 | 1.24 | 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 | janet | DISTRO | https://release-monitoring.org/project/155612 | 1.19.2 | 1.20.0 | janus-gateway | DISTRO | https://release-monitoring.org/project/15715 | 0.11.6 | 0.11.8 | jasper | DISTRO | https://release-monitoring.org/project/01421 | 2.0.33 | 3.0.2 | jquery-datetimepicker | DISTRO | https://release-monitoring.org/project/13910 | 2.4.5 | 2.5.20 | jquery-keyboard | DISTRO | https://release-monitoring.org/project/21681 | 1.18.12 | 1.30.4 | ORPH jquery-mobile | DISTRO | https://release-monitoring.org/project/59395 | 1.4.3 | 1.4.5 | ORPH jquery-ui | DISTRO | https://release-monitoring.org/project/21815 | 1.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 | kf5-extra-cmake-modules | DISTRO | https://release-monitoring.org/project/08762 | 5.47.0 | 5.91.0 | kf5-kcoreaddons | DISTRO | https://release-monitoring.org/project/08762 | 5.47.0 | 5.91.0 | kf5-modemmanager-qt | DISTRO | https://release-monitoring.org/project/08762 | 5.47.0 | 5.91.0 | kf5-networkmanager-qt | DISTRO | https://release-monitoring.org/project/08762 | 5.47.0 | 5.91.0 | kismet | DISTRO | https://release-monitoring.org/project/06966 | 2021-08-R1 | 2022-02-R1 | 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.3-Ma... | 20.1.2-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.1-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.6-Ma... | 20.2.2-Nexus | kodi-pvr-iptvsimple | DISTRO | https://release-monitoring.org/project/21782 | 19.1.0-Ma... | 20.3.0-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.7-Ma... | 20.2.4-Nexus | kodi-pvr-nextpvr | DISTRO | https://release-monitoring.org/project/21779 | 19.0.3-Ma... | 20.2.2-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.2-Ma... | 20.2.1-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 | lcms2 | DISTRO | https://release-monitoring.org/project/09815 | 2.13 | 2.13.1 | 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 libapparmor | DISTRO | https://release-monitoring.org/project/94819 | 3.0.3 | 3.0.4 | libarchive | DISTRO | https://release-monitoring.org/project/01558 | 3.5.3 | 3.6.0 | libblockdev | DISTRO | https://release-monitoring.org/project/09397 | 2.26 | 2.26-1 | ORPH libbpf | DISTRO | https://release-monitoring.org/project/141355 | 0.6.1 | 0.7.0 | libbsd | DISTRO | https://release-monitoring.org/project/01567 | 0.11.3 | 0.11.5 | libcap | DISTRO | https://release-monitoring.org/project/01569 | 2.62 | 2.63 | 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 | libdrm | DISTRO | https://release-monitoring.org/project/01596 | 2.4.109 | 2.4.110 | libfreeglut | DISTRO | https://release-monitoring.org/project/00846 | 3.2.1 | 3.2.2 | libfuse | GUESS | https://release-monitoring.org/project/00861 | 2.9.9 | 3.10.5 | ORPH libgcrypt | DISTRO | https://release-monitoring.org/project/01623 | 1.9.4 | 1.10.0 | ORPH libgdiplus | DISTRO | https://release-monitoring.org/project/06440 | 6.0.5 | 6.1 | libgee | DISTRO | https://release-monitoring.org/project/01625 | 0.20.4 | 0.20.5 | libgit2 | DISTRO | https://release-monitoring.org/project/01627 | 1.3.0 | 1.4.1 | libglade | DISTRO | https://release-monitoring.org/project/01174 | 2.6.4 | 3.38.2 | ORPH libglib2 | DISTRO | https://release-monitoring.org/project/10024 | 2.70.0 | 2.70.4 | 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.44 | ORPH libgpgme | DISTRO | https://release-monitoring.org/project/01239 | 1.16.0 | 1.17.0 | 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.1 | libgudev | DISTRO | https://release-monitoring.org/project/07735 | 236 | 237 | libiberty | DISTRO | https://release-monitoring.org/project/07981 | 2.32 | 2.38 | libical | DISTRO | https://release-monitoring.org/project/01637 | 1.0.1 | 3.0.14 | 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 | libinput | DISTRO | https://release-monitoring.org/project/05781 | 1.19.3 | 1.20.0 | libkcapi | DISTRO | https://release-monitoring.org/project/16828 | 1.1.5 | 1.3.1 | ORPH libks | DISTRO | https://release-monitoring.org/project/241898 | 1.7.0 | 1.8.0 | 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 | libnetfilter_conntrack | DISTRO | https://release-monitoring.org/project/01675 | 1.0.8 | 1.0.9 | libnfs | DISTRO | https://release-monitoring.org/project/07325 | 4.0.0 | 5.0.1 | ORPH 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.3 | 2.18.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 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 | libqmi | DISTRO | https://release-monitoring.org/project/07307 | 1.30.2 | 1.30.4 | librsvg | DISTRO | https://release-monitoring.org/project/05420 | 2.50.7 | 2.52.6 | librtas | DISTRO | https://release-monitoring.org/project/10717 | 2.0.2 | 2.0.3 | ORPH libscrypt | DISTRO | https://release-monitoring.org/project/07380 | 1.21 | 1.22 | libsemanage | DISTRO | https://release-monitoring.org/project/01718 | 3.3 | 20200710 | libsepol | DISTRO | https://release-monitoring.org/project/01719 | 3.3 | 20200710 | libsigc | DISTRO | https://release-monitoring.org/project/07961 | 3.0.7 | 3.2.0 | ORPH 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 | 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 | libva-utils | DISTRO | https://release-monitoring.org/project/16334 | 2.13.0 | 2.14.0 | libvips | DISTRO | https://release-monitoring.org/project/05097 | 8.10.6 | 8.12.2 | 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 | libxcrypt | DISTRO | https://release-monitoring.org/project/16436 | 4.4.27 | 4.4.28 | libxkbcommon | DISTRO | https://release-monitoring.org/project/01780 | 1.3.1 | 1.4.0 | libxml2 | DISTRO | https://release-monitoring.org/project/01783 | 2.9.12 | 2.9.13 | libxmlrpc | DISTRO | https://release-monitoring.org/project/09024 | r3119 | 1.51.07 | linphone | DISTRO | https://release-monitoring.org/project/01823 | 4.4.8 | 5.1.2 | ORPH linux-firmware | DISTRO | https://release-monitoring.org/project/141464 | 20211216 | 20220209 | liquid-dsp | DISTRO | https://release-monitoring.org/project/14535 | 1.3.2 | 1.4.0 | live555 | DISTRO | https://release-monitoring.org/project/12414 | 2021.05.03 | 2022.02.07 | ORPH lld | DISTRO | https://release-monitoring.org/project/01830 | 9.0.1 | 13.0.1 | 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.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 | lttng-tools | DISTRO | https://release-monitoring.org/project/07136 | 2.13.2 | 2.13.4 | lua | DISTRO | https://release-monitoring.org/project/01847 | 5.1.5 | 5.4.4 | lua-resty-http | DISTRO | https://release-monitoring.org/project/13887 | 0.15-0 | 0.16.1 | luv | DISTRO | https://release-monitoring.org/project/21510 | 1.42.0-1 | 1.43.0-0 | luvi | DISTRO | https://release-monitoring.org/project/21512 | 2.12.0 | 2.13.0 | lvm2 | DISTRO | https://release-monitoring.org/project/05354 | 2.03.14 | 2.03.15 | ORPH lxc | DISTRO | https://release-monitoring.org/project/01860 | 4.0.11 | 4.0.12 | 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.8.2 | 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.1.2 | ORPH memcached | DISTRO | https://release-monitoring.org/project/01965 | 1.6.12 | 1.6.14 | 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 | mender | DISTRO | https://release-monitoring.org/project/20629 | 3.1.0 | 3.2.1 | mesa3d | DISTRO | https://release-monitoring.org/project/01970 | 21.3.5 | 21.3.6 | mesa3d-headers | DISTRO | https://release-monitoring.org/project/01970 | 21.3.5 | 21.3.6 | meson | DISTRO | https://release-monitoring.org/project/06472 | 0.61.1 | 0.61.2 | 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 | minetest | DISTRO | https://release-monitoring.org/project/01978 | 5.4.1 | 5.5.0 | minetest-game | DISTRO | https://release-monitoring.org/project/21522 | 5.4.1 | 5.5.0 | moarvm | DISTRO | https://release-monitoring.org/project/21100 | 2021.10 | 2022.02 | 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.6 | mongodb | DISTRO | https://release-monitoring.org/project/02008 | 4.2.18 | 5.2.1 | mongoose | DISTRO | https://release-monitoring.org/project/07603 | 7.2 | 7.6 | monit | DISTRO | https://release-monitoring.org/project/05483 | 5.26.0 | 5.31.0 | mono | DISTRO | https://release-monitoring.org/project/06360 | 6.12.0.90 | 6.12.0.173 | 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.1.0 | 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 | 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 | mutt | DISTRO | https://release-monitoring.org/project/02035 | 2.1.5 | 2.2.1 | nano | DISTRO | https://release-monitoring.org/project/02046 | 6.0 | 6.2 | ORPH nbd | DISTRO | https://release-monitoring.org/project/02052 | 3.21 | 3.23 | ncdu | DISTRO | https://release-monitoring.org/project/06045 | 1.16 | 2.1 | ncurses | DISTRO | https://release-monitoring.org/project/02057 | 6.1 | 6.3-20220219 | ORPH netdata | DISTRO | https://release-monitoring.org/project/11046 | 1.21.1 | 1.33.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.6 | nodejs | DISTRO | https://release-monitoring.org/project/08251 | 14.18.3 | 17.5.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.54 | 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 | ogre | DISTRO | https://release-monitoring.org/project/33334 | v1.12.12 | 13.3.1 | open62541 | DISTRO | https://release-monitoring.org/project/16896 | v1.2.2 | 1.2.4 | ORPH openblas | DISTRO | https://release-monitoring.org/project/02540 | 0.3.18 | 0.3.20 | 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+10 | 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 | optee-benchmark | DISTRO | https://release-monitoring.org/project/21555 | 3.15.0 | 3.16.0 | optee-client | DISTRO | https://release-monitoring.org/project/21556 | 3.15.0 | 3.16.0 | optee-examples | DISTRO | https://release-monitoring.org/project/21557 | 3.15.0 | 3.16.0 | optee-test | DISTRO | https://release-monitoring.org/project/21558 | 3.15.0 | 3.16.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.1.2 | ORPH pango | DISTRO | https://release-monitoring.org/project/11783 | 1.50.3 | 1.50.4 | 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 | 202201 | 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.15 | 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.76 | perl-http-daemon | DISTRO | https://release-monitoring.org/project/02975 | 6.12 | 6.13 | 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.16 | 8.1.3 | 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.3 | 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 pipewire | DISTRO | https://release-monitoring.org/project/57357 | 0.3.45 | 0.3.47 | 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 | poke | DISTRO | https://release-monitoring.org/project/179926 | 1.4 | 2.1 | ORPH policycoreutils | DISTRO | https://release-monitoring.org/project/03680 | 3.2 | 20200710 | poppler | DISTRO | https://release-monitoring.org/project/03686 | 21.12.0 | 22.02.0 | postgis | DISTRO | https://release-monitoring.org/project/03694 | 3.2.0 | 3.2.1 | 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.4 | proxychains-ng | DISTRO | https://release-monitoring.org/project/06499 | 4.14 | 4.16 | ORPH ptpd | GUESS | https://release-monitoring.org/project/03726 | 1.1.0 | 2.3.1 | ORPH pugixml | DISTRO | https://release-monitoring.org/project/03728 | 1.11.4 | 1.12.1 | 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-aioconsole | DISTRO | https://release-monitoring.org/project/21244 | 0.4.0 | 0.4.1 | 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.2 | python-asgiref | DISTRO | https://release-monitoring.org/project/18462 | 3.3.4 | 3.5.0 | 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.2 | python-boto3 | DISTRO | https://release-monitoring.org/project/08778 | 1.19.2 | 1.21.3 | python-botocore | DISTRO | https://release-monitoring.org/project/08748 | 1.22.2 | 1.24.3 | python-can | DISTRO | https://release-monitoring.org/project/17873 | 3.3.4 | 4.0.0 | python-canopen | DISTRO | https://release-monitoring.org/project/23230 | 1.0.0 | 2.0.0b1 | 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.11 | 2.0.12 | 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.4 | 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-crossbar | DISTRO | https://release-monitoring.org/project/21696 | 21.3.1 | 22.1.1 | python-cython | DISTRO | https://release-monitoring.org/project/12679 | 0.29.27 | 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-decorator | DISTRO | https://release-monitoring.org/project/03819 | 5.1.0 | 5.1.1 | python-dialog3 | DISTRO | https://release-monitoring.org/project/03823 | 3.5.1 | 3.5.3 | python-distro | DISTRO | https://release-monitoring.org/project/12202 | 1.6.0 | 1.7.0 | 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-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-entrypoints | DISTRO | https://release-monitoring.org/project/12081 | 0.3 | 0.4 | python-filelock | DISTRO | https://release-monitoring.org/project/11739 | 3.3.0 | 3.6.0 | python-flask | DISTRO | https://release-monitoring.org/project/03867 | 1.1.2 | 2.0.3 | 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-git | DISTRO | https://release-monitoring.org/project/06459 | 3.1.24 | 3.1.27 | 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.4 | python-humanize | DISTRO | https://release-monitoring.org/project/19799 | 3.11.0 | 4.0.0 | python-installer | DISTRO | https://release-monitoring.org/project/197662 | 0.4.0 | 0.5.0 | python-ipython | DISTRO | https://release-monitoring.org/project/01399 | 7.31.1 | 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 | 2.0.1 | 2.1.0 | python-iwlib | DISTRO | https://release-monitoring.org/project/51611 | 1.5 | 1.7.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-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-libusb1 | DISTRO | https://release-monitoring.org/project/12301 | 2.0.1 | 3.0.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-markupsafe | DISTRO | https://release-monitoring.org/project/03918 | 2.0.1 | 2.1.0 | 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-networkmanager | DISTRO | https://release-monitoring.org/project/12909 | 2.1 | 2.2 | python-numpy | DISTRO | https://release-monitoring.org/project/02509 | 1.21.2 | 1.22.2 | python-oauthlib | DISTRO | https://release-monitoring.org/project/05377 | 3.1.1 | 3.2.0 | 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-paramiko | DISTRO | https://release-monitoring.org/project/03954 | 2.7.2 | 2.9.2 | 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.1 | python-pillow | DISTRO | https://release-monitoring.org/project/07974 | 9.0.0 | 9.0.1 | python-pip | DISTRO | https://release-monitoring.org/project/06529 | 21.2.4 | 22.0.3 | 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.28 | python-protobuf | DISTRO | https://release-monitoring.org/project/03715 | 3.19.1 | 3.19.4 | 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-pybind | DISTRO | https://release-monitoring.org/project/13384 | 2.9.0 | 2.9.1 | python-pycairo | DISTRO | https://release-monitoring.org/project/13166 | 1.19.1 | 1.20.1 | python-pycryptodomex | DISTRO | https://release-monitoring.org/project/36851 | 3.14.0 | 3.14.1 | python-pydal | DISTRO | https://release-monitoring.org/project/21582 | 20210626.3 | 20220213.2 | python-pydantic | DISTRO | https://release-monitoring.org/project/29768 | 1.8.2 | 1.9.0 | python-pyelftools | DISTRO | https://release-monitoring.org/project/16219 | 0.27 | 0.28 | 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.1 | python-pylibftdi | DISTRO | https://release-monitoring.org/project/21583 | 0.18.1 | 0.20.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.5 | python-pyopenssl | DISTRO | https://release-monitoring.org/project/05535 | 21.0.0 | 22.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-pyroute2 | DISTRO | https://release-monitoring.org/project/20081 | 0.5.7 | 0.6.6 | 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 | DISTRO | https://release-monitoring.org/project/03765 | 6.2.5 | 7.0.1 | python-pytest-asyncio | DISTRO | https://release-monitoring.org/project/07273 | 0.15.1 | 0.18.1 | python-pyudev | DISTRO | https://release-monitoring.org/project/08485 | 0.22.0 | 0.23.2 | 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.4 | python-reentry | DISTRO | https://release-monitoring.org/project/21596 | 1.3.2 | 1.3.3 | python-regex | DISTRO | https://release-monitoring.org/project/05548 | 2021.4.4 | 2022.1.18 | python-requests-oauthlib | DISTRO | https://release-monitoring.org/project/11803 | 1.3.0 | 1.3.1 | python-rpi-gpio | DISTRO | https://release-monitoring.org/project/12026 | 0.7.0 | 0.7.1 | python-rpi-ws281x | DISTRO | https://release-monitoring.org/project/21898 | 4.3.0 | 4.3.2 | 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-s3transfer | DISTRO | https://release-monitoring.org/project/10428 | 0.5.0 | 0.5.1 | python-secretstorage | DISTRO | https://release-monitoring.org/project/04020 | 3.1.2 | 3.3.1 | python-semantic-version | DISTRO | https://release-monitoring.org/project/06514 | 2.8.5 | 2.9.0 | python-sentry-sdk | DISTRO | https://release-monitoring.org/project/21603 | 1.4.3 | 1.5.5 | 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 | 60.7.0 | 60.9.3 | 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-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.2 | 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.1 | 1.3.0 | 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.1 | 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-tomli | DISTRO | https://release-monitoring.org/project/207408 | 1.2.0 | 2.0.1 | 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 | 22.2.0 | python-typing-extensions | DISTRO | https://release-monitoring.org/project/19755 | 3.10.0.2 | 4.1.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-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.1 | python-web2py | DISTRO | https://release-monitoring.org/project/20617 | 2.21.1 | 2.22.3 | 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.3 | 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-yarl | DISTRO | https://release-monitoring.org/project/12895 | 1.7.2 | 1.8.0 | python-zeroconf | DISTRO | https://release-monitoring.org/project/12681 | 0.29.0 | 0.38.3 | qpdf | DISTRO | https://release-monitoring.org/project/05542 | 10.5.0 | 10.6.2 | qpid-proton | DISTRO | https://release-monitoring.org/project/15198 | 0.35.0 | 0.36.0 | qt5coap | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.3 | qt5knx | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.3 | qt5mqtt | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.3 | qt5opcua | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.3 | qt5webengine | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.3 | 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 rng-tools | DISTRO | https://release-monitoring.org/project/04202 | 6.14 | 6.15 | rocksdb | DISTRO | https://release-monitoring.org/project/15560 | 6.20.3 | 6.29.3 | rsyslog | DISTRO | https://release-monitoring.org/project/04218 | 8.2010.0 | 8.2202.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 | rygel | DISTRO | https://release-monitoring.org/project/04751 | 0.40.2 | 0.40.3 | s390-tools | DISTRO | https://release-monitoring.org/project/10714 | 2.19.0 | 2.20.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.2 | 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 | safeclib | DISTRO | https://release-monitoring.org/project/21385 | 3.7.1 | 01022022 | samba4 | DISTRO | https://release-monitoring.org/project/04758 | 4.15.4 | 4.15.5 | 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 | screen | DISTRO | https://release-monitoring.org/project/04772 | 4.8.0 | 4.9.0 | ORPH 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.2 | sentry-native | DISTRO | https://release-monitoring.org/project/135639 | 0.4.1 | 0.4.15 | 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 shim | DISTRO | https://release-monitoring.org/project/10719 | 15.4 | 15.5 | 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.9 | snort3 | DISTRO | https://release-monitoring.org/project/13263 | 3.1.18.0 | 3.1.23.0 | sofia-sip | DISTRO | https://release-monitoring.org/project/10509 | 1.13.6-41... | 1.13.7 | 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 | sphinxbase | DISTRO | https://release-monitoring.org/project/20548 | 5prealpha | 0.8 | spice-protocol | DISTRO | https://release-monitoring.org/project/14892 | 0.14.3 | 0.14.4 | squid | DISTRO | https://release-monitoring.org/project/04880 | 5.3 | 5.4.1 | 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.62 | sudo | DISTRO | https://release-monitoring.org/project/04906 | 1.9.8p2 | 1.9.9 | ORPH 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 | tcpreplay | DISTRO | https://release-monitoring.org/project/13716 | 4.3.4 | 4.4.1 | ORPH thrift | DISTRO | https://release-monitoring.org/project/05581 | 0.14.1 | 0.16.0 | ORPH timescaledb | DISTRO | https://release-monitoring.org/project/17545 | 2.5.1 | 2.5.2 | 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 tio | DISTRO | https://release-monitoring.org/project/20587 | 1.32 | 1.35 | 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 | tpm2-tss | DISTRO | https://release-monitoring.org/project/12683 | 3.1.0 | 3.2.0 | ORPH trace-cmd | DISTRO | https://release-monitoring.org/project/07873 | 2.9.6 | 2.9.7 | tree | DISTRO | https://release-monitoring.org/project/05006 | 1.8.0 | 2.0.2 | 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 | unbound | DISTRO | https://release-monitoring.org/project/05042 | 1.14.0 | 1.15.0 | 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 | 6.1.3 | 6.1.4 | ORPH upmpdcli | DISTRO | https://release-monitoring.org/project/15848 | 1.5.12 | 1.5.13 | upower | DISTRO | https://release-monitoring.org/project/05056 | 0.99.11 | 0.99.15 | util-linux | DISTRO | https://release-monitoring.org/project/08179 | 2.37.3 | 2.37.4 | ORPH util-linux-libs | DISTRO | https://release-monitoring.org/project/08179 | 2.37.3 | 2.37.4 | ORPH 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.3 | ORPH valijson | DISTRO | https://release-monitoring.org/project/18452 | 0.3 | 0.6 | vim | DISTRO | https://release-monitoring.org/project/05092 | 8.2.4301 | 8.2.4424 | ORPH vnstat | DISTRO | https://release-monitoring.org/project/07283 | 2.8 | 2.9 | 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.31 | vulkan-headers | DISTRO | https://release-monitoring.org/project/88835 | 1.2.203 | 1.3.206 | ORPH 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 | waylandpp | DISTRO | https://release-monitoring.org/project/16969 | 0.2.8 | 0.2.9 | 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 wilc1000-firmware | DISTRO | https://release-monitoring.org/project/65598 | 14.1 | 15.6 | wine | DISTRO | https://release-monitoring.org/project/05134 | 6.0 | 7.2 | 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.8 | ORPH wireshark | DISTRO | https://release-monitoring.org/project/05137 | 3.4.11 | 3.6.2 | ORPH wlroots | DISTRO | https://release-monitoring.org/project/18357 | 0.14.1 | 0.15.1 | 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.6 | 2.35.1 | xapp_luit | DISTRO | https://release-monitoring.org/project/15047 | 1.1.1 | 20220111 | xdg-dbus-proxy | DISTRO | https://release-monitoring.org/project/58434 | 0.1.2 | 0.1.3 | xdotool | DISTRO | https://release-monitoring.org/project/08648 | 3.20160805.1 | 3.20211022.1 | xdriver_xf86-input-libinput | DISTRO | https://release-monitoring.org/project/05782 | 1.2.0 | 1.2.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.4 | 4.16.0 | xinetd | DISTRO | https://release-monitoring.org/project/06382 | 2.3.15 | 2.3.15.4 | xkeyboard-config | DISTRO | https://release-monitoring.org/project/05191 | 2.34 | 2.35.1 | xmrig | DISTRO | https://release-monitoring.org/project/17499 | 6.16.3 | 6.16.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.19 | ORPH xterm | DISTRO | https://release-monitoring.org/project/05272 | 367 | 370 | ORPH yaml-cpp | DISTRO | https://release-monitoring.org/project/05284 | 0.6.3 | 0.7.0 | ORPH zabbix | DISTRO | https://release-monitoring.org/project/05492 | 5.4.9 | 6.0.0 | zfs | DISTRO | https://release-monitoring.org/project/11706 | 2.0.5 | 2.1.2 | 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 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 libbpf | CVE-2021-45940 | https://security-tracker.debian.org/tracker/CVE-2021-45940 libbpf | CVE-2021-45941 | https://security-tracker.debian.org/tracker/CVE-2021-45941 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 libpjsip | CVE-2021-37706 | https://security-tracker.debian.org/tracker/CVE-2021-37706 libpjsip | CVE-2021-41141 | https://security-tracker.debian.org/tracker/CVE-2021-41141 libpjsip | CVE-2021-43804 | https://security-tracker.debian.org/tracker/CVE-2021-43804 libpjsip | CVE-2021-43845 | https://security-tracker.debian.org/tracker/CVE-2021-43845 libpjsip | CVE-2022-21722 | https://security-tracker.debian.org/tracker/CVE-2022-21722 libpjsip | CVE-2022-21723 | https://security-tracker.debian.org/tracker/CVE-2022-21723 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 mariadb | CVE-2021-46658 | https://security-tracker.debian.org/tracker/CVE-2021-46658 mariadb | CVE-2021-46659 | https://security-tracker.debian.org/tracker/CVE-2021-46659 mariadb | CVE-2021-46661 | https://security-tracker.debian.org/tracker/CVE-2021-46661 mariadb | CVE-2021-46662 | https://security-tracker.debian.org/tracker/CVE-2021-46662 mariadb | CVE-2021-46663 | https://security-tracker.debian.org/tracker/CVE-2021-46663 mariadb | CVE-2021-46664 | https://security-tracker.debian.org/tracker/CVE-2021-46664 mariadb | CVE-2021-46665 | https://security-tracker.debian.org/tracker/CVE-2021-46665 mariadb | CVE-2021-46667 | https://security-tracker.debian.org/tracker/CVE-2021-46667 mariadb | CVE-2021-46668 | https://security-tracker.debian.org/tracker/CVE-2021-46668 mariadb | CVE-2021-46669 | https://security-tracker.debian.org/tracker/CVE-2021-46669 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 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 polkit | CVE-2021-4034 | https://security-tracker.debian.org/tracker/CVE-2021-4034 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-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-4145 | https://security-tracker.debian.org/tracker/CVE-2021-4145 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-0561 | https://security-tracker.debian.org/tracker/CVE-2022-0561 tiff | CVE-2022-0562 | https://security-tracker.debian.org/tracker/CVE-2022-0562 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 unzip | CVE-2022-0529 | https://security-tracker.debian.org/tracker/CVE-2022-0529 unzip | CVE-2022-0530 | https://security-tracker.debian.org/tracker/CVE-2022-0530 vim | CVE-2022-0554 | https://security-tracker.debian.org/tracker/CVE-2022-0554 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-28707 | https://security-tracker.debian.org/tracker/CVE-2021-28707 xen | CVE-2021-28708 | https://security-tracker.debian.org/tracker/CVE-2021-28708 xen | CVE-2021-28711 | https://security-tracker.debian.org/tracker/CVE-2021-28711 xen | CVE-2021-28712 | https://security-tracker.debian.org/tracker/CVE-2021-28712 xen | CVE-2021-28713 | https://security-tracker.debian.org/tracker/CVE-2021-28713 xen | CVE-2022-23033 | https://security-tracker.debian.org/tracker/CVE-2022-23033 xen | CVE-2022-23035 | https://security-tracker.debian.org/tracker/CVE-2022-23035 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 xterm | CVE-2022-24130 | https://security-tracker.debian.org/tracker/CVE-2022-24130 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 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 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 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-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 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 go | CVE-2022-23772 | https://security-tracker.debian.org/tracker/CVE-2022-23772 go | CVE-2022-23773 | https://security-tracker.debian.org/tracker/CVE-2022-23773 go | CVE-2022-23806 | https://security-tracker.debian.org/tracker/CVE-2022-23806 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 hostapd | CVE-2022-23303 | https://security-tracker.debian.org/tracker/CVE-2022-23303 hostapd | CVE-2022-23304 | https://security-tracker.debian.org/tracker/CVE-2022-23304 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 libldns | CVE-2020-19860 | https://security-tracker.debian.org/tracker/CVE-2020-19860 libldns | CVE-2020-19861 | https://security-tracker.debian.org/tracker/CVE-2020-19861 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 libpjsip | CVE-2021-37706 | https://security-tracker.debian.org/tracker/CVE-2021-37706 libpjsip | CVE-2021-41141 | https://security-tracker.debian.org/tracker/CVE-2021-41141 libpjsip | CVE-2021-43804 | https://security-tracker.debian.org/tracker/CVE-2021-43804 libpjsip | CVE-2021-43845 | https://security-tracker.debian.org/tracker/CVE-2021-43845 libpjsip | CVE-2022-21722 | https://security-tracker.debian.org/tracker/CVE-2022-21722 libpjsip | CVE-2022-21723 | https://security-tracker.debian.org/tracker/CVE-2022-21723 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 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 mariadb | CVE-2021-46658 | https://security-tracker.debian.org/tracker/CVE-2021-46658 mariadb | CVE-2021-46659 | https://security-tracker.debian.org/tracker/CVE-2021-46659 mariadb | CVE-2021-46661 | https://security-tracker.debian.org/tracker/CVE-2021-46661 mariadb | CVE-2021-46662 | https://security-tracker.debian.org/tracker/CVE-2021-46662 mariadb | CVE-2021-46663 | https://security-tracker.debian.org/tracker/CVE-2021-46663 mariadb | CVE-2021-46664 | https://security-tracker.debian.org/tracker/CVE-2021-46664 mariadb | CVE-2021-46665 | https://security-tracker.debian.org/tracker/CVE-2021-46665 mariadb | CVE-2021-46667 | https://security-tracker.debian.org/tracker/CVE-2021-46667 mariadb | CVE-2021-46668 | https://security-tracker.debian.org/tracker/CVE-2021-46668 mariadb | CVE-2021-46669 | https://security-tracker.debian.org/tracker/CVE-2021-46669 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 minetest | CVE-2022-24300 | https://security-tracker.debian.org/tracker/CVE-2022-24300 minetest | CVE-2022-24301 | https://security-tracker.debian.org/tracker/CVE-2022-24301 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 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 polkit | CVE-2021-4034 | https://security-tracker.debian.org/tracker/CVE-2021-4034 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 protobuf | CVE-2021-22570 | https://security-tracker.debian.org/tracker/CVE-2021-22570 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 | CVE-2022-0391 | https://security-tracker.debian.org/tracker/CVE-2022-0391 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-ipython | CVE-2022-21699 | https://security-tracker.debian.org/tracker/CVE-2022-21699 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 python-twisted | CVE-2022-21712 | https://security-tracker.debian.org/tracker/CVE-2022-21712 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 qemu | CVE-2021-4145 | https://security-tracker.debian.org/tracker/CVE-2021-4145 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 rust | CVE-2022-21658 | https://security-tracker.debian.org/tracker/CVE-2022-21658 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 strongswan | CVE-2021-45079 | https://security-tracker.debian.org/tracker/CVE-2021-45079 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 tiff | CVE-2022-0561 | https://security-tracker.debian.org/tracker/CVE-2022-0561 tiff | CVE-2022-0562 | https://security-tracker.debian.org/tracker/CVE-2022-0562 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 unzip | CVE-2022-0529 | https://security-tracker.debian.org/tracker/CVE-2022-0529 unzip | CVE-2022-0530 | https://security-tracker.debian.org/tracker/CVE-2022-0530 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-2022-0554 | https://security-tracker.debian.org/tracker/CVE-2022-0554 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 wpa_supplicant | CVE-2022-23303 | https://security-tracker.debian.org/tracker/CVE-2022-23303 wpa_supplicant | CVE-2022-23304 | https://security-tracker.debian.org/tracker/CVE-2022-23304 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-28707 | https://security-tracker.debian.org/tracker/CVE-2021-28707 xen | CVE-2021-28708 | https://security-tracker.debian.org/tracker/CVE-2021-28708 xen | CVE-2021-28711 | https://security-tracker.debian.org/tracker/CVE-2021-28711 xen | CVE-2021-28712 | https://security-tracker.debian.org/tracker/CVE-2021-28712 xen | CVE-2021-28713 | https://security-tracker.debian.org/tracker/CVE-2021-28713 xen | CVE-2022-23033 | https://security-tracker.debian.org/tracker/CVE-2022-23033 xen | CVE-2022-23035 | https://security-tracker.debian.org/tracker/CVE-2022-23035 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 xterm | CVE-2022-24130 | https://security-tracker.debian.org/tracker/CVE-2022-24130 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 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 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 go | CVE-2022-23772 | https://security-tracker.debian.org/tracker/CVE-2022-23772 go | CVE-2022-23773 | https://security-tracker.debian.org/tracker/CVE-2022-23773 go | CVE-2022-23806 | https://security-tracker.debian.org/tracker/CVE-2022-23806 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 hostapd | CVE-2022-23303 | https://security-tracker.debian.org/tracker/CVE-2022-23303 hostapd | CVE-2022-23304 | https://security-tracker.debian.org/tracker/CVE-2022-23304 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 libldns | CVE-2020-19860 | https://security-tracker.debian.org/tracker/CVE-2020-19860 libldns | CVE-2020-19861 | https://security-tracker.debian.org/tracker/CVE-2020-19861 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libpjsip | CVE-2021-37706 | https://security-tracker.debian.org/tracker/CVE-2021-37706 libpjsip | CVE-2021-41141 | https://security-tracker.debian.org/tracker/CVE-2021-41141 libpjsip | CVE-2021-43804 | https://security-tracker.debian.org/tracker/CVE-2021-43804 libpjsip | CVE-2021-43845 | https://security-tracker.debian.org/tracker/CVE-2021-43845 libpjsip | CVE-2022-21722 | https://security-tracker.debian.org/tracker/CVE-2022-21722 libpjsip | CVE-2022-21723 | https://security-tracker.debian.org/tracker/CVE-2022-21723 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 mariadb | CVE-2021-46658 | https://security-tracker.debian.org/tracker/CVE-2021-46658 mariadb | CVE-2021-46659 | https://security-tracker.debian.org/tracker/CVE-2021-46659 mariadb | CVE-2021-46661 | https://security-tracker.debian.org/tracker/CVE-2021-46661 mariadb | CVE-2021-46662 | https://security-tracker.debian.org/tracker/CVE-2021-46662 mariadb | CVE-2021-46663 | https://security-tracker.debian.org/tracker/CVE-2021-46663 mariadb | CVE-2021-46664 | https://security-tracker.debian.org/tracker/CVE-2021-46664 mariadb | CVE-2021-46665 | https://security-tracker.debian.org/tracker/CVE-2021-46665 mariadb | CVE-2021-46667 | https://security-tracker.debian.org/tracker/CVE-2021-46667 mariadb | CVE-2021-46668 | https://security-tracker.debian.org/tracker/CVE-2021-46668 mariadb | CVE-2021-46669 | https://security-tracker.debian.org/tracker/CVE-2021-46669 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 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 polkit | CVE-2021-4034 | https://security-tracker.debian.org/tracker/CVE-2021-4034 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 | CVE-2022-0391 | https://security-tracker.debian.org/tracker/CVE-2022-0391 python-ipython | CVE-2022-21699 | https://security-tracker.debian.org/tracker/CVE-2022-21699 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 python-twisted | CVE-2022-21712 | https://security-tracker.debian.org/tracker/CVE-2022-21712 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 qemu | CVE-2021-4145 | https://security-tracker.debian.org/tracker/CVE-2021-4145 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 rust | CVE-2022-21658 | https://security-tracker.debian.org/tracker/CVE-2022-21658 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 strongswan | CVE-2021-45079 | https://security-tracker.debian.org/tracker/CVE-2021-45079 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-0561 | https://security-tracker.debian.org/tracker/CVE-2022-0561 tiff | CVE-2022-0562 | https://security-tracker.debian.org/tracker/CVE-2022-0562 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 unzip | CVE-2022-0529 | https://security-tracker.debian.org/tracker/CVE-2022-0529 unzip | CVE-2022-0530 | https://security-tracker.debian.org/tracker/CVE-2022-0530 vim | CVE-2022-0554 | https://security-tracker.debian.org/tracker/CVE-2022-0554 webkitgtk | CVE-2021-42762 | https://security-tracker.debian.org/tracker/CVE-2021-42762 wpa_supplicant | CVE-2022-23303 | https://security-tracker.debian.org/tracker/CVE-2022-23303 wpa_supplicant | CVE-2022-23304 | https://security-tracker.debian.org/tracker/CVE-2022-23304 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-28707 | https://security-tracker.debian.org/tracker/CVE-2021-28707 xen | CVE-2021-28708 | https://security-tracker.debian.org/tracker/CVE-2021-28708 xen | CVE-2021-28711 | https://security-tracker.debian.org/tracker/CVE-2021-28711 xen | CVE-2021-28712 | https://security-tracker.debian.org/tracker/CVE-2021-28712 xen | CVE-2021-28713 | https://security-tracker.debian.org/tracker/CVE-2021-28713 xen | CVE-2022-23033 | https://security-tracker.debian.org/tracker/CVE-2022-23033 xen | CVE-2022-23035 | https://security-tracker.debian.org/tracker/CVE-2022-23035 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 xterm | CVE-2022-24130 | https://security-tracker.debian.org/tracker/CVE-2022-24130 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 -- http://autobuild.buildroot.net From buildroot at heine.tech Mon Feb 21 08:27:18 2022 From: buildroot at heine.tech (Michael Nosthoff) Date: Mon, 21 Feb 2022 09:27:18 +0100 Subject: [Buildroot] [PATCH/next] package/grpc: bump to version 1.44.0 Message-ID: <20220221082724.2744765-1-buildroot@heine.tech> Signed-off-by: Michael Nosthoff --- package/grpc/grpc.hash | 2 +- package/grpc/grpc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/grpc/grpc.hash b/package/grpc/grpc.hash index 3da1d9a323..6db2acd759 100644 --- a/package/grpc/grpc.hash +++ b/package/grpc/grpc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 9647220c699cea4dafa92ec0917c25c7812be51a18143af047e20f3fb05adddc grpc-1.43.0.tar.gz +sha256 8c05641b9f91cbc92f51cc4a5b3a226788d7a63f20af4ca7aaca50d92cc94a0d grpc-1.44.0.tar.gz sha256 277adcc1dcef8359b1efb48e628635f88b40be8fbd64e82fd0169930d135d7a5 LICENSE diff --git a/package/grpc/grpc.mk b/package/grpc/grpc.mk index 5d8201f12f..23b92f1750 100644 --- a/package/grpc/grpc.mk +++ b/package/grpc/grpc.mk @@ -4,7 +4,7 @@ # ################################################################################ -GRPC_VERSION = 1.43.0 +GRPC_VERSION = 1.44.0 GRPC_SITE = $(call github,grpc,grpc,v$(GRPC_VERSION)) GRPC_LICENSE = Apache-2.0, BSD-3-Clause (third_party code), MPL-2.0 (etc/roots.pem) GRPC_LICENSE_FILES = LICENSE -- 2.25.1 From giulio.benetti at benettiengineering.com Mon Feb 21 08:44:30 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 21 Feb 2022 09:44:30 +0100 Subject: [Buildroot] Issue with login In-Reply-To: References: <186B6238-5452-4211-BD9D-29A3C921DE42@benettiengineering.com> <469c0dbc-6101-be6c-7272-400ac4512b86@grenoble.cnrs.fr> <4d8f6289-f16f-9602-a458-2b5836a817e6@benettiengineering.com> Message-ID: <71b0c2b1-0b71-9aca-5209-33ea3a6cacf1@benettiengineering.com> Hi Mohd, On 21/02/22 06:16, Mohd Faiz Rohani wrote: > Hi guys, > > Thank you for your?help.I have overlooked the required setting as > normally I will leave the setting?to the default, as I assume Buildroot > has selected?the required settings. Anyway I have managed to login > successfully?now. > > I have turned on BR2_PACKAGE_SYSTEMD_LOGIND and > BR2_PACKAGE_UTIL_LINUX_LOGIN settings, while the rest does not change. Perfect, team working with Edgar worked :-) > Fyi, I have tried the newer versions of Linux Kernel (5.15) and Uboot > (v2022.01) with the Linaro 7.5 toolchain, but got an error during the > booting process where the RFS cannot be mounted. It may be my fault > through the settings though, that is why I am trying the old version and > it worked. I would avoid using gcc 7.5 on such new kernel/uboot. Maybe if you try to rebuild using an external prebuilt toolchain like the Bootlin one, or you build a Buildroot toolchain with latest versions, like gcc 10.x you could obtain different results. > I am planning to use Buildroot for my future development and keen to > contribute wherever?I can. Still lots to learn though. Well! > Thank you again guys. You're welcome Best regards -- Giulio Benetti Benetti Engineering sas > Regards. > Faiz > > > > > On Mon, Feb 21, 2022 at 2:33 AM Mohd Faiz Rohani > > wrote: > > Thanks, I'll check them out. Will update the outcome once the > installation is done. > > Thank?you. > > On Mon, Feb 21, 2022, 1:56 AM Giulio Benetti > > wrote: > > Hi Edgar, > > please reply to all in Mailing List, I add Mohd in Cc, > > On 20/02/22 17:18, Edgar Bonet wrote: > > Hi! > > > > In his config file, Mohd wrote: > >> BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_10=y > >> BR2_LINUX_KERNEL_VERSION="4.4.155" > > > > This may cause problems. C.f. docs/manual/configure.txt: > > > >? ? ? If you use kernel headers that are more recent than the > Linux > >? ? ? kernel you run on your embedded system, then the C > library might > >? ? ? be using interfaces that are not provided by your Linux > kernel. > > Good catch Edgar! > So Mohd, what you need here is a toolchain with older libc. > https://buildroot.org/downloads/manual/manual.html#_cross_compilation_toolchain > > > But again, do you really need to use so such old versions > instead of try > to use buildroot's beaglebone_defconfig? > > > In the same config file, there is: > >> # BR2_PACKAGE_BUSYBOX is not set > > > > When disabling busybox, you should have seen the message: > > > >? ? ? You may need to enable other packages to get a working > system > >? ? ? You better know what you're doing! > > Despite of what I've written on my previous e-mail(my test was > wrong), > he has BR2_INIT_SYSTEMD=y that works as Init System, so that's ok. > > > And then: > >> # BR2_PACKAGE_SYSTEMD_LOGIND is not set > > Good catch again Edgar! This ^^^ should be the point. Because it's > exactly the systemd login dameon. > > >> # BR2_PACKAGE_UTIL_LINUX_LOGIN is not set > > This ^^^ is not selected by systemd, so I expect > BR2_PACKAGE_SYSTEMD_LOGIND to do the job(even if I'm not a systemd > expoert at all). > > But as Edgar pointed linux headers don't match so you have 3 > choices: > 1) find a toolchain with linux-headers <= 4.4.* > 2) update linux version > 3) start from scratch using buildroot beaglebone_defconfig > > Best regards > -- > Giulio Benetti > Benetti Engineering sas > From giulio.benetti at benettiengineering.com Mon Feb 21 09:07:26 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 21 Feb 2022 10:07:26 +0100 Subject: [Buildroot] [PATCH v3 1/3] board/andes: rearrange nds32 folder structure In-Reply-To: References: <20220215053327.4046-1-peterlin@andestech.com> Message-ID: <1c7b8b85-7b50-0832-24e8-174100f5a6f5@benettiengineering.com> Hi Peter, Alan, On 21/02/22 04:37, Yu Chien Peter Lin wrote: > Hi Giulio, > > On Thu, Feb 17, 2022 at 04:55:49PM +0100, Giulio Benetti wrote: >> Hi Peter, >> >> On 15/02/22 06:33, Yu Chien Peter Lin wrote: >>> Rearrange nds32 folder structure to add AE350 platform. >>> >>> Signed-off-by: Yu Chien Peter Lin >>> Signed-off-by: Alan Kao >>> --- >>> .../patches/linux/0001-nds32-Fix-boot-messages-garbled.patch | 0 >>> ...2-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch | 0 >>> board/andes/{ => ae3xx}/readme.txt | 0 >>> configs/andes_ae3xx_defconfig | 2 +- >>> 4 files changed, 1 insertion(+), 1 deletion(-) >>> rename board/andes/{ => ae3xx}/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch (100%) >>> rename board/andes/{ => ae3xx}/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch (100%) >>> rename board/andes/{ => ae3xx}/readme.txt (100%) >> >> Here we have both: >> board/andes/ae3xx >> and >> board/andes/ae350 >> >> ae3xx should be use for every ae3xx family(ae350 included), but for ae350 >> you use a specific folder. >> What I see digging into ae3xx is that it is for FPGA demonstration, so I >> would move ae3xx directory to be name as ae3xx-fpga. Otherwise I would >> expect ae350(and newer parts) to be part of ae3xx. >> >> Same goes for the defconfig, I would name it like: >> andes_ae3xx_fpga_defconfig >> >> This way we can divide the 2 typologies: >> - fpga demonostration for ae3xx >> - ae3xx SoC family >> >> Otherwise you should provide a single family folder(ae3xx) compatible for >> both fpgas and SoCs. >> >> Thank you >> >> Best regards >> -- >> Giulio Benetti >> Benetti Engineering sas > > For this naming issue, we decide to make ae3xx > explicit to have these two platform residing > in its own folder. So it would be: > > board/andes/ > |- {ae3xx => ae300}/ > `- ae350/ > > If this make sense to you, I will submit PATCH v4. It works for me. I've checked your website and I see: http://www.andestech.com/en/products-solutions/andeshape-platforms/ where you have: AE300: http://www.andestech.com/en/products-solutions/andeshape-platforms/ae300/ and AE350: http://www.andestech.com/en/products-solutions/andeshape-platforms/ae350-axi-based-platform-pre-integrated-with-n25f-nx25f-a25-ax25/ so your solution fits perfectly since they are two very distinct platforms. So yes please send V4 with that change. Thank you! Best regards -- Giulio Benetti Benetti Engineering sas From mohd.faiz.rohani at gmail.com Mon Feb 21 09:33:01 2022 From: mohd.faiz.rohani at gmail.com (Mohd Faiz Rohani) Date: Mon, 21 Feb 2022 17:33:01 +0800 Subject: [Buildroot] Issue with login In-Reply-To: <71b0c2b1-0b71-9aca-5209-33ea3a6cacf1@benettiengineering.com> References: <186B6238-5452-4211-BD9D-29A3C921DE42@benettiengineering.com> <469c0dbc-6101-be6c-7272-400ac4512b86@grenoble.cnrs.fr> <4d8f6289-f16f-9602-a458-2b5836a817e6@benettiengineering.com> <71b0c2b1-0b71-9aca-5209-33ea3a6cacf1@benettiengineering.com> Message-ID: Btw, is the mailing list correct platform for Buildroot Q&A? Do you have any related forum for the purpose? Thanks On Mon, Feb 21, 2022, 4:44 PM Giulio Benetti < giulio.benetti at benettiengineering.com> wrote: > Hi Mohd, > > On 21/02/22 06:16, Mohd Faiz Rohani wrote: > > Hi guys, > > > > Thank you for your help.I have overlooked the required setting as > > normally I will leave the setting to the default, as I assume Buildroot > > has selected the required settings. Anyway I have managed to login > > successfully now. > > > > I have turned on BR2_PACKAGE_SYSTEMD_LOGIND and > > BR2_PACKAGE_UTIL_LINUX_LOGIN settings, while the rest does not change. > > Perfect, team working with Edgar worked :-) > > > Fyi, I have tried the newer versions of Linux Kernel (5.15) and Uboot > > (v2022.01) with the Linaro 7.5 toolchain, but got an error during the > > booting process where the RFS cannot be mounted. It may be my fault > > through the settings though, that is why I am trying the old version and > > it worked. > > I would avoid using gcc 7.5 on such new kernel/uboot. Maybe if you try > to rebuild using an external prebuilt toolchain like the Bootlin one, or > you build a Buildroot toolchain with latest versions, like gcc 10.x you > could obtain different results. > > > I am planning to use Buildroot for my future development and keen to > > contribute wherever I can. Still lots to learn though. > > Well! > > > Thank you again guys. > > You're welcome > > Best regards > -- > Giulio Benetti > Benetti Engineering sas > > > Regards. > > Faiz > > > > > > > > > > On Mon, Feb 21, 2022 at 2:33 AM Mohd Faiz Rohani > > > wrote: > > > > Thanks, I'll check them out. Will update the outcome once the > > installation is done. > > > > Thank you. > > > > On Mon, Feb 21, 2022, 1:56 AM Giulio Benetti > > > > wrote: > > > > Hi Edgar, > > > > please reply to all in Mailing List, I add Mohd in Cc, > > > > On 20/02/22 17:18, Edgar Bonet wrote: > > > Hi! > > > > > > In his config file, Mohd wrote: > > >> BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_10=y > > >> BR2_LINUX_KERNEL_VERSION="4.4.155" > > > > > > This may cause problems. C.f. docs/manual/configure.txt: > > > > > > If you use kernel headers that are more recent than the > > Linux > > > kernel you run on your embedded system, then the C > > library might > > > be using interfaces that are not provided by your Linux > > kernel. > > > > Good catch Edgar! > > So Mohd, what you need here is a toolchain with older libc. > > > https://buildroot.org/downloads/manual/manual.html#_cross_compilation_toolchain > > < > https://buildroot.org/downloads/manual/manual.html#_cross_compilation_toolchain > > > > > > But again, do you really need to use so such old versions > > instead of try > > to use buildroot's beaglebone_defconfig? > > > > > In the same config file, there is: > > >> # BR2_PACKAGE_BUSYBOX is not set > > > > > > When disabling busybox, you should have seen the message: > > > > > > You may need to enable other packages to get a working > > system > > > You better know what you're doing! > > > > Despite of what I've written on my previous e-mail(my test was > > wrong), > > he has BR2_INIT_SYSTEMD=y that works as Init System, so that's > ok. > > > > > And then: > > >> # BR2_PACKAGE_SYSTEMD_LOGIND is not set > > > > Good catch again Edgar! This ^^^ should be the point. Because > it's > > exactly the systemd login dameon. > > > > >> # BR2_PACKAGE_UTIL_LINUX_LOGIN is not set > > > > This ^^^ is not selected by systemd, so I expect > > BR2_PACKAGE_SYSTEMD_LOGIND to do the job(even if I'm not a > systemd > > expoert at all). > > > > But as Edgar pointed linux headers don't match so you have 3 > > choices: > > 1) find a toolchain with linux-headers <= 4.4.* > > 2) update linux version > > 3) start from scratch using buildroot beaglebone_defconfig > > > > Best regards > > -- > > Giulio Benetti > > Benetti Engineering sas > > > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From giulio.benetti at benettiengineering.com Mon Feb 21 09:43:46 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 21 Feb 2022 10:43:46 +0100 Subject: [Buildroot] Issue with login In-Reply-To: References: Message-ID: <843DF5BA-BFB7-4EEF-BF74-0CB8894652B7@benettiengineering.com> > Il giorno 21 feb 2022, alle ore 10:33, Mohd Faiz Rohani ha scritto: > > ? > Btw, is the mailing list correct platform for Buildroot Q&A? Do you have any related forum for the purpose? Thanks It?s one of its purpose, but I suggest you to also join IRC #buildroot channel. Best regards Giulio > >> On Mon, Feb 21, 2022, 4:44 PM Giulio Benetti wrote: >> Hi Mohd, >> >> On 21/02/22 06:16, Mohd Faiz Rohani wrote: >> > Hi guys, >> > >> > Thank you for your help.I have overlooked the required setting as >> > normally I will leave the setting to the default, as I assume Buildroot >> > has selected the required settings. Anyway I have managed to login >> > successfully now. >> > >> > I have turned on BR2_PACKAGE_SYSTEMD_LOGIND and >> > BR2_PACKAGE_UTIL_LINUX_LOGIN settings, while the rest does not change. >> >> Perfect, team working with Edgar worked :-) >> >> > Fyi, I have tried the newer versions of Linux Kernel (5.15) and Uboot >> > (v2022.01) with the Linaro 7.5 toolchain, but got an error during the >> > booting process where the RFS cannot be mounted. It may be my fault >> > through the settings though, that is why I am trying the old version and >> > it worked. >> >> I would avoid using gcc 7.5 on such new kernel/uboot. Maybe if you try >> to rebuild using an external prebuilt toolchain like the Bootlin one, or >> you build a Buildroot toolchain with latest versions, like gcc 10.x you >> could obtain different results. >> >> > I am planning to use Buildroot for my future development and keen to >> > contribute wherever I can. Still lots to learn though. >> >> Well! >> >> > Thank you again guys. >> >> You're welcome >> >> Best regards >> -- >> Giulio Benetti >> Benetti Engineering sas >> >> > Regards. >> > Faiz >> > >> > >> > >> > >> > On Mon, Feb 21, 2022 at 2:33 AM Mohd Faiz Rohani >> > > wrote: >> > >> > Thanks, I'll check them out. Will update the outcome once the >> > installation is done. >> > >> > Thank you. >> > >> > On Mon, Feb 21, 2022, 1:56 AM Giulio Benetti >> > > > > wrote: >> > >> > Hi Edgar, >> > >> > please reply to all in Mailing List, I add Mohd in Cc, >> > >> > On 20/02/22 17:18, Edgar Bonet wrote: >> > > Hi! >> > > >> > > In his config file, Mohd wrote: >> > >> BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_10=y >> > >> BR2_LINUX_KERNEL_VERSION="4.4.155" >> > > >> > > This may cause problems. C.f. docs/manual/configure.txt: >> > > >> > > If you use kernel headers that are more recent than the >> > Linux >> > > kernel you run on your embedded system, then the C >> > library might >> > > be using interfaces that are not provided by your Linux >> > kernel. >> > >> > Good catch Edgar! >> > So Mohd, what you need here is a toolchain with older libc. >> > https://buildroot.org/downloads/manual/manual.html#_cross_compilation_toolchain >> > >> > >> > But again, do you really need to use so such old versions >> > instead of try >> > to use buildroot's beaglebone_defconfig? >> > >> > > In the same config file, there is: >> > >> # BR2_PACKAGE_BUSYBOX is not set >> > > >> > > When disabling busybox, you should have seen the message: >> > > >> > > You may need to enable other packages to get a working >> > system >> > > You better know what you're doing! >> > >> > Despite of what I've written on my previous e-mail(my test was >> > wrong), >> > he has BR2_INIT_SYSTEMD=y that works as Init System, so that's ok. >> > >> > > And then: >> > >> # BR2_PACKAGE_SYSTEMD_LOGIND is not set >> > >> > Good catch again Edgar! This ^^^ should be the point. Because it's >> > exactly the systemd login dameon. >> > >> > >> # BR2_PACKAGE_UTIL_LINUX_LOGIN is not set >> > >> > This ^^^ is not selected by systemd, so I expect >> > BR2_PACKAGE_SYSTEMD_LOGIND to do the job(even if I'm not a systemd >> > expoert at all). >> > >> > But as Edgar pointed linux headers don't match so you have 3 >> > choices: >> > 1) find a toolchain with linux-headers <= 4.4.* >> > 2) update linux version >> > 3) start from scratch using buildroot beaglebone_defconfig >> > >> > Best regards >> > -- >> > Giulio Benetti >> > Benetti Engineering sas >> > >> > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -------------- next part -------------- An HTML attachment was scrubbed... URL: From mohd.faiz.rohani at gmail.com Mon Feb 21 09:46:40 2022 From: mohd.faiz.rohani at gmail.com (Mohd Faiz Rohani) Date: Mon, 21 Feb 2022 17:46:40 +0800 Subject: [Buildroot] Issue with login In-Reply-To: <843DF5BA-BFB7-4EEF-BF74-0CB8894652B7@benettiengineering.com> References: <843DF5BA-BFB7-4EEF-BF74-0CB8894652B7@benettiengineering.com> Message-ID: Yes I will, even though I'm not in IRC for quite some time now. :). Thanks a lot Giulio! On Mon, Feb 21, 2022 at 5:43 PM Giulio Benetti < giulio.benetti at benettiengineering.com> wrote: > > Il giorno 21 feb 2022, alle ore 10:33, Mohd Faiz Rohani < > mohd.faiz.rohani at gmail.com> ha scritto: > > ? > Btw, is the mailing list correct platform for Buildroot Q&A? Do you have > any related forum for the purpose? Thanks > > > It?s one of its purpose, but I suggest you to also join IRC #buildroot > channel. > > Best regards > Giulio > > > On Mon, Feb 21, 2022, 4:44 PM Giulio Benetti < > giulio.benetti at benettiengineering.com> wrote: > >> Hi Mohd, >> >> On 21/02/22 06:16, Mohd Faiz Rohani wrote: >> > Hi guys, >> > >> > Thank you for your help.I have overlooked the required setting as >> > normally I will leave the setting to the default, as I assume Buildroot >> > has selected the required settings. Anyway I have managed to login >> > successfully now. >> > >> > I have turned on BR2_PACKAGE_SYSTEMD_LOGIND and >> > BR2_PACKAGE_UTIL_LINUX_LOGIN settings, while the rest does not change. >> >> Perfect, team working with Edgar worked :-) >> >> > Fyi, I have tried the newer versions of Linux Kernel (5.15) and Uboot >> > (v2022.01) with the Linaro 7.5 toolchain, but got an error during the >> > booting process where the RFS cannot be mounted. It may be my fault >> > through the settings though, that is why I am trying the old version >> and >> > it worked. >> >> I would avoid using gcc 7.5 on such new kernel/uboot. Maybe if you try >> to rebuild using an external prebuilt toolchain like the Bootlin one, or >> you build a Buildroot toolchain with latest versions, like gcc 10.x you >> could obtain different results. >> >> > I am planning to use Buildroot for my future development and keen to >> > contribute wherever I can. Still lots to learn though. >> >> Well! >> >> > Thank you again guys. >> >> You're welcome >> >> Best regards >> -- >> Giulio Benetti >> Benetti Engineering sas >> >> > Regards. >> > Faiz >> > >> > >> > >> > >> > On Mon, Feb 21, 2022 at 2:33 AM Mohd Faiz Rohani >> > > wrote: >> > >> > Thanks, I'll check them out. Will update the outcome once the >> > installation is done. >> > >> > Thank you. >> > >> > On Mon, Feb 21, 2022, 1:56 AM Giulio Benetti >> > > > > wrote: >> > >> > Hi Edgar, >> > >> > please reply to all in Mailing List, I add Mohd in Cc, >> > >> > On 20/02/22 17:18, Edgar Bonet wrote: >> > > Hi! >> > > >> > > In his config file, Mohd wrote: >> > >> BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_10=y >> > >> BR2_LINUX_KERNEL_VERSION="4.4.155" >> > > >> > > This may cause problems. C.f. docs/manual/configure.txt: >> > > >> > > If you use kernel headers that are more recent than the >> > Linux >> > > kernel you run on your embedded system, then the C >> > library might >> > > be using interfaces that are not provided by your Linux >> > kernel. >> > >> > Good catch Edgar! >> > So Mohd, what you need here is a toolchain with older libc. >> > >> https://buildroot.org/downloads/manual/manual.html#_cross_compilation_toolchain >> > < >> https://buildroot.org/downloads/manual/manual.html#_cross_compilation_toolchain >> > >> > >> > But again, do you really need to use so such old versions >> > instead of try >> > to use buildroot's beaglebone_defconfig? >> > >> > > In the same config file, there is: >> > >> # BR2_PACKAGE_BUSYBOX is not set >> > > >> > > When disabling busybox, you should have seen the message: >> > > >> > > You may need to enable other packages to get a working >> > system >> > > You better know what you're doing! >> > >> > Despite of what I've written on my previous e-mail(my test was >> > wrong), >> > he has BR2_INIT_SYSTEMD=y that works as Init System, so that's >> ok. >> > >> > > And then: >> > >> # BR2_PACKAGE_SYSTEMD_LOGIND is not set >> > >> > Good catch again Edgar! This ^^^ should be the point. Because >> it's >> > exactly the systemd login dameon. >> > >> > >> # BR2_PACKAGE_UTIL_LINUX_LOGIN is not set >> > >> > This ^^^ is not selected by systemd, so I expect >> > BR2_PACKAGE_SYSTEMD_LOGIND to do the job(even if I'm not a >> systemd >> > expoert at all). >> > >> > But as Edgar pointed linux headers don't match so you have 3 >> > choices: >> > 1) find a toolchain with linux-headers <= 4.4.* >> > 2) update linux version >> > 3) start from scratch using buildroot beaglebone_defconfig >> > >> > Best regards >> > -- >> > Giulio Benetti >> > Benetti Engineering sas >> > >> >> _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From vahidrezaei1371 at gmail.com Mon Feb 21 10:48:55 2022 From: vahidrezaei1371 at gmail.com (Rezaei Vahid) Date: Mon, 21 Feb 2022 02:48:55 -0800 Subject: [Buildroot] building uclibc based toolchain with buildroot Message-ID: hi I want to compile a C++17 library for my board. the toolchain that comes with my board SDK does not support C++17. I want to build a uclibc based toolchain with buildroot. I am following this tutorial https://www.uclibc.org/toolchains.html the old toolchain configuration. arch arm mcpu cortex-a7 mfloat-abi softfp mfpu neon_vfpv4 no_aggrasive_loop_optimizations kernel 3.18.20 uclibc 0.9.33.2 gcc 4.9.2 ----(which I want to upgrade to a version that supports C++17 ) which I have Uclibc rootfs (uclibc 0.9.33.2), I have to build toolchain with uclibc 0.9.33 how can I specify the version of uclibc of the toolchain? best regards -------------- next part -------------- An HTML attachment was scrubbed... URL: From tianyuanhao3 at 163.com Mon Feb 21 12:06:57 2022 From: tianyuanhao3 at 163.com (TIAN Yuanhao) Date: Mon, 21 Feb 2022 04:06:57 -0800 Subject: [Buildroot] [PATCH 1/1] package/docker-engine: remove unused sqlite Message-ID: <20220221120657.4095013-1-tianyuanhao3@163.com> Dependency on sqlite has been removed since v17.04.0-ce. See: https://github.com/moby/moby/pull/30208 Signed-off-by: TIAN Yuanhao --- package/docker-engine/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in index 911cbfe428..1f0efb8fcc 100644 --- a/package/docker-engine/Config.in +++ b/package/docker-engine/Config.in @@ -9,7 +9,6 @@ config BR2_PACKAGE_DOCKER_ENGINE select BR2_PACKAGE_CONTAINERD # runtime dependency select BR2_PACKAGE_DOCKER_PROXY # runtime dependency select BR2_PACKAGE_IPTABLES # runtime dependency - select BR2_PACKAGE_SQLITE # runtime dependency help Docker is a platform to build, ship, and run applications as lightweight containers. -- 2.25.1 From christian at paral.in Mon Feb 21 12:14:16 2022 From: christian at paral.in (Christian Stewart) Date: Mon, 21 Feb 2022 04:14:16 -0800 Subject: [Buildroot] [PATCH 1/1] package/docker-engine: remove unused sqlite In-Reply-To: <20220221120657.4095013-1-tianyuanhao3@163.com> References: <20220221120657.4095013-1-tianyuanhao3@163.com> Message-ID: Hi all, On Mon, Feb 21, 2022 at 4:07 AM TIAN Yuanhao wrote: > > Dependency on sqlite has been removed since v17.04.0-ce. > > See: https://github.com/moby/moby/pull/30208 > > Signed-off-by: TIAN Yuanhao > --- > package/docker-engine/Config.in | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in > index 911cbfe428..1f0efb8fcc 100644 > --- a/package/docker-engine/Config.in > +++ b/package/docker-engine/Config.in > @@ -9,7 +9,6 @@ config BR2_PACKAGE_DOCKER_ENGINE > select BR2_PACKAGE_CONTAINERD # runtime dependency > select BR2_PACKAGE_DOCKER_PROXY # runtime dependency > select BR2_PACKAGE_IPTABLES # runtime dependency > - select BR2_PACKAGE_SQLITE # runtime dependency > help > Docker is a platform to build, ship, > and run applications as lightweight containers. Reviewed-by: Christian Stewart Thanks, Christian From Alexey.Brodkin at synopsys.com Mon Feb 21 14:06:28 2022 From: Alexey.Brodkin at synopsys.com (Alexey Brodkin) Date: Mon, 21 Feb 2022 17:06:28 +0300 Subject: [Buildroot] [PATCH] package/qt5: enable for ARC Message-ID: <20220221140628.2295-1-abrodkin@synopsys.com> Double-conversion got pulled-in Qt's sources from the upstream project quite some time ago [1], so now Qt5 is buildable for ARC perfectly fine. This reverts the last part of [2], commit e453fb9e3280 (qt5: disable qt-5.8.0 support for arc, nios2 and xtensa). [1] https://invent.kde.org/qt/qt/qtbase/-/commit/425df43d7fed19866fc7ceb3d26b6cc4190523f5 [2] https://git.buildroot.net/buildroot/commit/?id=e453fb9e3280a1a1ce6180e165aab9c4f1642555 Signed-off-by: Alexey Brodkin Cc: Thomas Petazzoni Cc: Peter Seiderer --- package/qt5/Config.in | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/qt5/Config.in b/package/qt5/Config.in index 8557fd1000..cbb2e06a21 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -13,7 +13,6 @@ config BR2_PACKAGE_QT5_JSCORE_AVAILABLE comment "Qt5 needs host g++ >= 5.0, and a toolchain w/ gcc >= 5.0, wchar, NPTL, C++, dynamic library" depends on !BR2_ARM_CPU_ARMV4 - depends on !BR2_arc depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS || \ !BR2_HOST_GCC_AT_LEAST_5 || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 @@ -26,8 +25,6 @@ menuconfig BR2_PACKAGE_QT5 depends on BR2_HOST_GCC_AT_LEAST_5 # Full C++11 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++11, GCC_BUG_57694 depends on !BR2_ARM_CPU_ARMV4 # needs ARMv5+ - # no built-in double-conversion support - depends on !BR2_arc depends on !BR2_STATIC_LIBS select BR2_PACKAGE_QT5BASE help -- 2.25.1 From mohd.faiz.rohani at gmail.com Mon Feb 21 14:15:34 2022 From: mohd.faiz.rohani at gmail.com (Mohd Faiz Rohani) Date: Mon, 21 Feb 2022 22:15:34 +0800 Subject: [Buildroot] Issue with login In-Reply-To: References: <843DF5BA-BFB7-4EEF-BF74-0CB8894652B7@benettiengineering.com> Message-ID: Hi Giulio, Update: I have tried the latest kernel (5.15) with buildroot toolchain. result is same, RFS mounting error (refer attached) On Mon, Feb 21, 2022 at 5:46 PM Mohd Faiz Rohani wrote: > Yes I will, even though I'm not in IRC for quite some time now. :). Thanks > a lot Giulio! > > On Mon, Feb 21, 2022 at 5:43 PM Giulio Benetti < > giulio.benetti at benettiengineering.com> wrote: > >> >> Il giorno 21 feb 2022, alle ore 10:33, Mohd Faiz Rohani < >> mohd.faiz.rohani at gmail.com> ha scritto: >> >> ? >> Btw, is the mailing list correct platform for Buildroot Q&A? Do you have >> any related forum for the purpose? Thanks >> >> >> It?s one of its purpose, but I suggest you to also join IRC #buildroot >> channel. >> >> Best regards >> Giulio >> >> >> On Mon, Feb 21, 2022, 4:44 PM Giulio Benetti < >> giulio.benetti at benettiengineering.com> wrote: >> >>> Hi Mohd, >>> >>> On 21/02/22 06:16, Mohd Faiz Rohani wrote: >>> > Hi guys, >>> > >>> > Thank you for your help.I have overlooked the required setting as >>> > normally I will leave the setting to the default, as I assume >>> Buildroot >>> > has selected the required settings. Anyway I have managed to login >>> > successfully now. >>> > >>> > I have turned on BR2_PACKAGE_SYSTEMD_LOGIND and >>> > BR2_PACKAGE_UTIL_LINUX_LOGIN settings, while the rest does not change. >>> >>> Perfect, team working with Edgar worked :-) >>> >>> > Fyi, I have tried the newer versions of Linux Kernel (5.15) and Uboot >>> > (v2022.01) with the Linaro 7.5 toolchain, but got an error during the >>> > booting process where the RFS cannot be mounted. It may be my fault >>> > through the settings though, that is why I am trying the old version >>> and >>> > it worked. >>> >>> I would avoid using gcc 7.5 on such new kernel/uboot. Maybe if you try >>> to rebuild using an external prebuilt toolchain like the Bootlin one, or >>> you build a Buildroot toolchain with latest versions, like gcc 10.x you >>> could obtain different results. >>> >>> > I am planning to use Buildroot for my future development and keen to >>> > contribute wherever I can. Still lots to learn though. >>> >>> Well! >>> >>> > Thank you again guys. >>> >>> You're welcome >>> >>> Best regards >>> -- >>> Giulio Benetti >>> Benetti Engineering sas >>> >>> > Regards. >>> > Faiz >>> > >>> > >>> > >>> > >>> > On Mon, Feb 21, 2022 at 2:33 AM Mohd Faiz Rohani >>> > > >>> wrote: >>> > >>> > Thanks, I'll check them out. Will update the outcome once the >>> > installation is done. >>> > >>> > Thank you. >>> > >>> > On Mon, Feb 21, 2022, 1:56 AM Giulio Benetti >>> > >> > > wrote: >>> > >>> > Hi Edgar, >>> > >>> > please reply to all in Mailing List, I add Mohd in Cc, >>> > >>> > On 20/02/22 17:18, Edgar Bonet wrote: >>> > > Hi! >>> > > >>> > > In his config file, Mohd wrote: >>> > >> BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_10=y >>> > >> BR2_LINUX_KERNEL_VERSION="4.4.155" >>> > > >>> > > This may cause problems. C.f. docs/manual/configure.txt: >>> > > >>> > > If you use kernel headers that are more recent than the >>> > Linux >>> > > kernel you run on your embedded system, then the C >>> > library might >>> > > be using interfaces that are not provided by your Linux >>> > kernel. >>> > >>> > Good catch Edgar! >>> > So Mohd, what you need here is a toolchain with older libc. >>> > >>> https://buildroot.org/downloads/manual/manual.html#_cross_compilation_toolchain >>> > < >>> https://buildroot.org/downloads/manual/manual.html#_cross_compilation_toolchain >>> > >>> > >>> > But again, do you really need to use so such old versions >>> > instead of try >>> > to use buildroot's beaglebone_defconfig? >>> > >>> > > In the same config file, there is: >>> > >> # BR2_PACKAGE_BUSYBOX is not set >>> > > >>> > > When disabling busybox, you should have seen the message: >>> > > >>> > > You may need to enable other packages to get a working >>> > system >>> > > You better know what you're doing! >>> > >>> > Despite of what I've written on my previous e-mail(my test was >>> > wrong), >>> > he has BR2_INIT_SYSTEMD=y that works as Init System, so that's >>> ok. >>> > >>> > > And then: >>> > >> # BR2_PACKAGE_SYSTEMD_LOGIND is not set >>> > >>> > Good catch again Edgar! This ^^^ should be the point. Because >>> it's >>> > exactly the systemd login dameon. >>> > >>> > >> # BR2_PACKAGE_UTIL_LINUX_LOGIN is not set >>> > >>> > This ^^^ is not selected by systemd, so I expect >>> > BR2_PACKAGE_SYSTEMD_LOGIND to do the job(even if I'm not a >>> systemd >>> > expoert at all). >>> > >>> > But as Edgar pointed linux headers don't match so you have 3 >>> > choices: >>> > 1) find a toolchain with linux-headers <= 4.4.* >>> > 2) update linux version >>> > 3) start from scratch using buildroot beaglebone_defconfig >>> > >>> > Best regards >>> > -- >>> > Giulio Benetti >>> > Benetti Engineering sas >>> > >>> >>> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot >> >> -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: 20220221_211831.jpg Type: image/jpeg Size: 150206 bytes Desc: not available URL: From aperez at igalia.com Mon Feb 21 15:16:48 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Mon, 21 Feb 2022 16:16:48 +0100 Subject: [Buildroot] [PATCH 1/2] package/webkitgtk: security bump to 2.34.6 In-Reply-To: <87o8319t47.fsf@dell.be.48ers.dk> References: <20220217230908.1532564-1-aperez@igalia.com> <87o8319t47.fsf@dell.be.48ers.dk> Message-ID: <20220221161648.GB1133490@momiji> Hi Peter, all, On Sun, 20 Feb 2022 21:32:24 +0100 Peter Korsgaard wrote: > >>>>> "Adrian" == Adrian Perez de Castro writes: > > > Update to a new major release which brings in improvements, a number of > > new features, and security fixes. Release notes: > > > https://webkitgtk.org/2021/09/22/webkitgtk2.34.0-released.html > > https://webkitgtk.org/2021/10/21/webkitgtk2.34.1-released.html > > https://webkitgtk.org/2021/11/24/webkitgtk2.34.2-released.html > > https://webkitgtk.org/2021/12/20/webkitgtk2.34.3-released.html > > https://webkitgtk.org/2022/01/21/webkitgtk2.34.4-released.html > > https://webkitgtk.org/2022/02/09/webkitgtk2.34.5-released.html > > https://webkitgtk.org/2022/02/17/webkitgtk2.34.6-released.html > > > Security advisories: > > > https://webkitgtk.org/security/WSA-2021-0007.html > > https://webkitgtk.org/security/WSA-2022-0001.html > > https://webkitgtk.org/security/WSA-2022-0002.html > > https://webkitgtk.org/security/WSA-2022-0003.html > > > Some of the new features require additional dependencies: HTTP/2 > > requires libsoup3, which is not yet packaged in Buildroot, and > > disabled at the moment (with -DUSE_SOUP2=ON, to keep using libsoup2); > > and the color management support needs LCMS2 (which will be enabled > > in a follow-up patch.) > > > Options SILENCE_CROSS_COMPILATION_NOTICES and ENABLE_GRAPHICS_CONTEXT_GL > > do not exist anymore, and their usage is dropped. > > > Signed-off-by: Adrian Perez de Castro > > --- > > package/webkitgtk/webkitgtk.hash | 8 ++++---- > > package/webkitgtk/webkitgtk.mk | 14 +++++--------- > > 2 files changed, 9 insertions(+), 13 deletions(-) > > > diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash > > index 7cb6c90b21..82c210c8f9 100644 > > --- a/package/webkitgtk/webkitgtk.hash > > +++ b/package/webkitgtk/webkitgtk.hash > > @@ -1,7 +1,7 @@ > > -# From https://webkitgtk.org/releases/webkitgtk-2.32.4.tar.xz.sums > > -md5 51a167e5d03bacf30c5c588e6aa23143 webkitgtk-2.32.4.tar.xz > > -sha1 f7255ffb488e727e9e250e0dae9f192266f50f01 webkitgtk-2.32.4.tar.xz > > -sha256 00ce2d3f798d7bc5e9039d9059f0c3c974d51de38c8b716f00e94452a177d3fd webkitgtk-2.32.4.tar.xz > > +# From https://webkitgtk.org/releases/webkitgtk-2.34.6.tar.xz.sums > > +md5 a5eeedd02f5b4bba8bd891b92dc743d4 webkitgtk-2.34.6.tar.xz > > +sha1 bb82517289baf9c858fa406d1d845274f81e25cb webkitgtk-2.34.6.tar.xz > > +sha256 6bc8fd034aad0432a2459ce4fc7ee25ad65a4924c618bf8d93b52b0c1a84c1f6 webkitgtk-2.34.6.tar.xz > > > # Hashes for license files: > > sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE > > diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk > > index 16b925fe71..f4fc1e7838 100644 > > --- a/package/webkitgtk/webkitgtk.mk > > +++ b/package/webkitgtk/webkitgtk.mk > > @@ -4,7 +4,7 @@ > > # > > ################################################################################ > > > -WEBKITGTK_VERSION = 2.32.4 > > +WEBKITGTK_VERSION = 2.34.6 > > WEBKITGTK_SITE = https://www.webkitgtk.org/releases > > WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz > > WEBKITGTK_INSTALL_STAGING = YES > > @@ -24,10 +24,11 @@ WEBKITGTK_CONF_OPTS = \ > > -DENABLE_MINIBROWSER=ON \ > > -DENABLE_SPELLCHECK=ON \ > > -DPORT=GTK \ > > - -DSILENCE_CROSS_COMPILATION_NOTICES=ON \ > > + -DUSE_LCMS=OFF \ > > -DUSE_LIBNOTIFY=OFF \ > > -DUSE_LIBHYPHEN=OFF \ > > -DUSE_OPENJPEG=ON \ > > + -DUSE_SOUP2=ON \ > > -DUSE_WOFF2=ON > > > This is apparently not against master, as master has > -DUSE_WPE_RENDERER=OFF here since your commit 38b740ec6f44b4 > (package/webkitgtk: bump to version 2.26.0)? > > Please send patches against current git. > > Committed to master after fixing that up, thanks. Ah, sorry about this, and thanks for fixing up my mistake -- I did have an additional commit in local work branch, which I planned to submit separately and I should have reordered my commits beforehand to make the two patches needed for the 2.34 update apply cleanly ? 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 angelo at amarulasolutions.com Mon Feb 21 15:31:51 2022 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Mon, 21 Feb 2022 16:31:51 +0100 Subject: [Buildroot] [PATCH] package/apparmor: bump to version 3.0.4 Message-ID: <20220221153151.1780107-1-angelo@amarulasolutions.com> Updating also the companion libapparmor library and removing upstreamed patch. Signed-off-by: Angelo Compagnucci --- package/apparmor/apparmor.hash | 2 +- package/apparmor/apparmor.mk | 2 +- ...deprecated-distutils-with-setuptools.patch | 244 ------------------ package/libapparmor/libapparmor.hash | 2 +- package/libapparmor/libapparmor.mk | 2 +- 5 files changed, 4 insertions(+), 248 deletions(-) delete mode 100644 package/libapparmor/0001-replace-deprecated-distutils-with-setuptools.patch diff --git a/package/apparmor/apparmor.hash b/package/apparmor/apparmor.hash index 88280cbfcf..497491b6c9 100644 --- a/package/apparmor/apparmor.hash +++ b/package/apparmor/apparmor.hash @@ -1,5 +1,5 @@ # From: https://gitlab.com/apparmor/apparmor/-/wikis/home#userspace -sha256 153db05d8f491e0596022663c19fb1166806cb473b3c6f0a7279feda2ec25a59 apparmor-3.0.3.tar.gz +sha256 09bf48d7a171f9790c39a1404bad105a788934cfe77b7490c7f5c63c2576b725 apparmor-3.0.4.tar.gz # locally computed sha256 a7e0cdcbea5c14927cedfc600d46526bdcbb1eb0a4d951e2ea53c2a6de159cb4 LICENSE diff --git a/package/apparmor/apparmor.mk b/package/apparmor/apparmor.mk index 43bfa05308..76c9f2cafe 100644 --- a/package/apparmor/apparmor.mk +++ b/package/apparmor/apparmor.mk @@ -6,7 +6,7 @@ # When updating the version here, please also update the libapparmor package APPARMOR_VERSION_MAJOR = 3.0 -APPARMOR_VERSION = $(APPARMOR_VERSION_MAJOR).3 +APPARMOR_VERSION = $(APPARMOR_VERSION_MAJOR).4 APPARMOR_SITE = https://launchpad.net/apparmor/$(APPARMOR_VERSION_MAJOR)/$(APPARMOR_VERSION)/+download APPARMOR_DL_SUBDIR = libapparmor APPARMOR_LICENSE = GPL-2.0 diff --git a/package/libapparmor/0001-replace-deprecated-distutils-with-setuptools.patch b/package/libapparmor/0001-replace-deprecated-distutils-with-setuptools.patch deleted file mode 100644 index 5aed31d0b5..0000000000 --- a/package/libapparmor/0001-replace-deprecated-distutils-with-setuptools.patch +++ /dev/null @@ -1,244 +0,0 @@ -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.hash b/package/libapparmor/libapparmor.hash index 6a19aef77a..9fbfe3b92e 100644 --- a/package/libapparmor/libapparmor.hash +++ b/package/libapparmor/libapparmor.hash @@ -1,5 +1,5 @@ # From: https://gitlab.com/apparmor/apparmor/-/wikis/home#userspace -sha256 153db05d8f491e0596022663c19fb1166806cb473b3c6f0a7279feda2ec25a59 apparmor-3.0.3.tar.gz +sha256 09bf48d7a171f9790c39a1404bad105a788934cfe77b7490c7f5c63c2576b725 apparmor-3.0.4.tar.gz # locally computed sha256 a7e0cdcbea5c14927cedfc600d46526bdcbb1eb0a4d951e2ea53c2a6de159cb4 LICENSE diff --git a/package/libapparmor/libapparmor.mk b/package/libapparmor/libapparmor.mk index 7bb849ab94..fcd3a4389b 100644 --- a/package/libapparmor/libapparmor.mk +++ b/package/libapparmor/libapparmor.mk @@ -6,7 +6,7 @@ # When updating the version here, please also update the apparmor package LIBAPPARMOR_VERSION_MAJOR = 3.0 -LIBAPPARMOR_VERSION = $(LIBAPPARMOR_VERSION_MAJOR).3 +LIBAPPARMOR_VERSION = $(LIBAPPARMOR_VERSION_MAJOR).4 LIBAPPARMOR_SOURCE = apparmor-$(LIBAPPARMOR_VERSION).tar.gz LIBAPPARMOR_SITE = https://launchpad.net/apparmor/$(LIBAPPARMOR_VERSION_MAJOR)/$(LIBAPPARMOR_VERSION)/+download LIBAPPARMOR_LICENSE = LGPL-2.1 -- 2.25.1 From andrei.gherghescu at protonmail.com Mon Feb 21 16:06:24 2022 From: andrei.gherghescu at protonmail.com (Andrei Gherghescu) Date: Mon, 21 Feb 2022 16:06:24 +0000 Subject: [Buildroot] [PATCH 1/1] package/dialog: bump to version 1.3-20220117 Message-ID: <20220221160549.20554-1-andrei.gherghescu@protonmail.com> Signed-off-by: Andrei Gherghescu --- package/dialog/dialog.hash | 2 +- package/dialog/dialog.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dialog/dialog.hash b/package/dialog/dialog.hash index 2286590b66..3136d18b2b 100644 --- a/package/dialog/dialog.hash +++ b/package/dialog/dialog.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 466163e8b97c2b7709d00389199add3156bd813f60ccb0335d0a30f2d4a17f99 dialog-1.3-20200327.tgz +sha256 754cb6bf7dc6a9ac5c1f80c13caa4d976e30a5a6e8b46f17b3bb9b080c31041f dialog-1.3-20220117.tgz # Locally computed sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/dialog/dialog.mk b/package/dialog/dialog.mk index 1c98d354e3..681f8ec9fe 100644 --- a/package/dialog/dialog.mk +++ b/package/dialog/dialog.mk @@ -4,7 +4,7 @@ # ################################################################################ -DIALOG_VERSION = 1.3-20200327 +DIALOG_VERSION = 1.3-20220117 DIALOG_SOURCE = dialog-$(DIALOG_VERSION).tgz DIALOG_SITE = https://invisible-mirror.net/archives/dialog DIALOG_CONF_OPTS = --with-ncurses --with-curses-dir=$(STAGING_DIR)/usr \ -- 2.35.1 From fontaine.fabrice at gmail.com Mon Feb 21 17:26:21 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 21 Feb 2022 18:26:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/flac: security bump to version 1.3.4 Message-ID: <20220221172621.1937610-1-fontaine.fabrice@gmail.com> This release mostly fixes (security related) bugs including: - Fix 12 decoder bugs found by oss-fuzz, including CVE-2020-0499 - Fix encoder bug CVE-2021-0561 Also: - Replace first patch which was reverted by https://github.com/xiph/flac/commit/4fbb6d4f2ecf2a96c17ea9880108409f852c08a9 - Disable stack protection (enabled by default since https://github.com/xiph/flac/commit/f706f2832270a0b7851cdffe62ad37acda9423fe) - Drop md5 which is not provided anymore - Update indentation in hash file (two spaces) https://github.com/xiph/flac/releases/tag/1.3.4 Signed-off-by: Fabrice Fontaine --- ...ck-for-sys-auxv.h-before-defining-FL.patch | 36 ------------------- package/flac/flac.hash | 12 +++---- package/flac/flac.mk | 5 +-- 3 files changed, 8 insertions(+), 45 deletions(-) delete mode 100644 package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch diff --git a/package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch b/package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch deleted file mode 100644 index d1398d4b3e..0000000000 --- a/package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 14a0713389fbfef59225d027ea466ebb478a8c6b Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 19 Sep 2019 21:18:04 +0200 -Subject: [PATCH] configure.ac: check for sys/auxv.h before defining FLAC__CPU_PPC - -Upstream: https://github.com/xiph/flac/pull/142 -Signed-off-by: Peter Seiderer ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 0228a12..64cb3f2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -144,7 +144,7 @@ case "$host_cpu" in - powerpc64|powerpc64le) - cpu_ppc64=true - cpu_ppc=true -- AC_DEFINE(FLAC__CPU_PPC) -+ AC_CHECK_HEADER(sys/auxv.h, AC_DEFINE(FLAC__CPU_PPC)) - AH_TEMPLATE(FLAC__CPU_PPC, [define if building for PowerPC]) - AC_DEFINE(FLAC__CPU_PPC64) - AH_TEMPLATE(FLAC__CPU_PPC64, [define if building for PowerPC64]) -@@ -152,7 +152,7 @@ case "$host_cpu" in - ;; - powerpc|powerpcle) - cpu_ppc=true -- AC_DEFINE(FLAC__CPU_PPC) -+ AC_CHECK_HEADER(sys/auxv.h, AC_DEFINE(FLAC__CPU_PPC)) - AH_TEMPLATE(FLAC__CPU_PPC, [define if building for PowerPC]) - asm_optimisation=$asm_opt - ;; --- -2.23.0 - diff --git a/package/flac/flac.hash b/package/flac/flac.hash index df7c2d1b95..2444535e0f 100644 --- a/package/flac/flac.hash +++ b/package/flac/flac.hash @@ -1,10 +1,8 @@ -# From https://ftp.osuosl.org/pub/xiph/releases/flac/MD5SUMS -md5 26703ed2858c1fc9ffc05136d13daa69 flac-1.3.3.tar.xz # From https://ftp.osuosl.org/pub/xiph/releases/flac/SHA1SUMS -sha1 6ac2e8f1dd18c9b0214c4d81bd70cdc1e943cffe flac-1.3.3.tar.xz +sha1 99c28482a8b2d81deaf740639e4cb55658427420 flac-1.3.4.tar.xz # From http://downloads.xiph.org/releases/flac/SHA256SUMS.txt -sha256 213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748 flac-1.3.3.tar.xz +sha256 8ff0607e75a322dd7cd6ec48f4f225471404ae2730d0ea945127b1355155e737 flac-1.3.4.tar.xz # Locally computed -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LGPL -sha256 fa27cb11f13f97b0c5f3ff363b1e2610c6efe87ed175779cb2a78e44eb19d34c COPYING.Xiph +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LGPL +sha256 fa27cb11f13f97b0c5f3ff363b1e2610c6efe87ed175779cb2a78e44eb19d34c COPYING.Xiph diff --git a/package/flac/flac.mk b/package/flac/flac.mk index 9aa00b7ffd..2ff048b6e6 100644 --- a/package/flac/flac.mk +++ b/package/flac/flac.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLAC_VERSION = 1.3.3 +FLAC_VERSION = 1.3.4 FLAC_SITE = http://downloads.xiph.org/releases/flac FLAC_SOURCE = flac-$(FLAC_VERSION).tar.xz FLAC_INSTALL_STAGING = YES @@ -19,7 +19,8 @@ FLAC_AUTORECONF = YES FLAC_CONF_OPTS = \ $(if $(BR2_INSTALL_LIBSTDCPP),--enable-cpplibs,--disable-cpplibs) \ --disable-xmms-plugin \ - --disable-altivec + --disable-altivec \ + --disable-stack-smash-protection ifeq ($(BR2_PACKAGE_LIBOGG),y) FLAC_CONF_OPTS += --with-ogg=$(STAGING_DIR)/usr -- 2.34.1 From fontaine.fabrice at gmail.com Mon Feb 21 17:29:00 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 21 Feb 2022 18:29:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/re2: fix build with gcc <= 5 Message-ID: <20220221172900.1937856-1-fontaine.fabrice@gmail.com> Fix the following build failure with gcc <= 5 raised since bump to version 2022-02-01 in commit d2cf91e0c6a082261cc7ebb06dfdbd7bc2c2956f and https://github.com/google/re2/commit/a022cc0c55b0519629d64d775e7a5195af34a477 ./re2/sparse_array.h:266:37: warning: defaulted and deleted functions only available with -std=c++11 or -std=gnu++11 SparseArray::SparseArray() = default; ^ ./re2/sparse_array.h: In copy constructor 're2::SparseArray::SparseArray(const re2::SparseArray&)': ./re2/sparse_array.h:273:3: error: 'copy_n' is not a member of 'std' std::copy_n(src.sparse_.data(), src.max_size(), sparse_.data()); ^ Fixes: - http://autobuild.buildroot.org/results/8ebbac67f32fe24416a1f72aad0afd42b567b403 Signed-off-by: Fabrice Fontaine --- package/re2/re2.mk | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/package/re2/re2.mk b/package/re2/re2.mk index 41392cb179..cc5fed71fa 100644 --- a/package/re2/re2.mk +++ b/package/re2/re2.mk @@ -10,20 +10,25 @@ RE2_LICENSE = BSD-3-Clause RE2_LICENSE_FILES = LICENSE RE2_INSTALL_STAGING = YES +RE2_MAKE_OPTS = \ + $(TARGET_CONFIGURE_OPTS) \ + CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" \ + prefix=/usr + define RE2_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_MAKE_ENV) $(MAKE) $(RE2_MAKE_OPTS) \ -C $(@D) $(if $(BR2_STATIC_LIBS),static) endef define RE2_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ - DESTDIR="$(STAGING_DIR)" prefix=/usr -C $(@D) \ + $(TARGET_MAKE_ENV) $(MAKE) $(RE2_MAKE_OPTS) \ + DESTDIR="$(STAGING_DIR)" -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) \ + $(TARGET_MAKE_ENV) $(MAKE) $(RE2_MAKE_OPTS) \ + DESTDIR="$(TARGET_DIR)" -C $(@D) \ $(if $(BR2_STATIC_LIBS),static-install,install) endef -- 2.34.1 From giulio.benetti at benettiengineering.com Mon Feb 21 19:09:52 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 21 Feb 2022 20:09:52 +0100 Subject: [Buildroot] [PATCH v3 1/3] board/andes: rearrange nds32 folder structure In-Reply-To: <1c7b8b85-7b50-0832-24e8-174100f5a6f5@benettiengineering.com> References: <20220215053327.4046-1-peterlin@andestech.com> <1c7b8b85-7b50-0832-24e8-174100f5a6f5@benettiengineering.com> Message-ID: Ah, forgotten to mention, On 21/02/22 10:07, Giulio Benetti wrote: > Hi Peter, Alan, > > On 21/02/22 04:37, Yu Chien Peter Lin wrote: >> Hi Giulio, >> >> On Thu, Feb 17, 2022 at 04:55:49PM +0100, Giulio Benetti wrote: >>> Hi Peter, >>> >>> On 15/02/22 06:33, Yu Chien Peter Lin wrote: >>>> Rearrange nds32 folder structure to add AE350 platform. Please explain here that AE300 and AE350 are 2 different platform by also pointing the URL I've pointed you below. Thank you -- Giulio Benetti Benetti Engineering sas >>>> Signed-off-by: Yu Chien Peter Lin >>>> Signed-off-by: Alan Kao >>>> --- >>>> .../patches/linux/0001-nds32-Fix-boot-messages-garbled.patch | 0 >>>> ...2-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch | 0 >>>> board/andes/{ => ae3xx}/readme.txt | 0 >>>> configs/andes_ae3xx_defconfig | 2 +- >>>> 4 files changed, 1 insertion(+), 1 deletion(-) >>>> rename board/andes/{ => ae3xx}/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch (100%) >>>> rename board/andes/{ => ae3xx}/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch (100%) >>>> rename board/andes/{ => ae3xx}/readme.txt (100%) >>> >>> Here we have both: >>> board/andes/ae3xx >>> and >>> board/andes/ae350 >>> >>> ae3xx should be use for every ae3xx family(ae350 included), but for ae350 >>> you use a specific folder. >>> What I see digging into ae3xx is that it is for FPGA demonstration, so I >>> would move ae3xx directory to be name as ae3xx-fpga. Otherwise I would >>> expect ae350(and newer parts) to be part of ae3xx. >>> >>> Same goes for the defconfig, I would name it like: >>> andes_ae3xx_fpga_defconfig >>> >>> This way we can divide the 2 typologies: >>> - fpga demonostration for ae3xx >>> - ae3xx SoC family >>> >>> Otherwise you should provide a single family folder(ae3xx) compatible for >>> both fpgas and SoCs. >>> >>> Thank you >>> >>> Best regards >>> -- >>> Giulio Benetti >>> Benetti Engineering sas >> >> For this naming issue, we decide to make ae3xx >> explicit to have these two platform residing >> in its own folder. So it would be: >> >> board/andes/ >> |- {ae3xx => ae300}/ >> `- ae350/ >> >> If this make sense to you, I will submit PATCH v4. > > It works for me. > I've checked your website and I see: > http://www.andestech.com/en/products-solutions/andeshape-platforms/ > > where you have: > AE300: > http://www.andestech.com/en/products-solutions/andeshape-platforms/ae300/ > > and AE350: > http://www.andestech.com/en/products-solutions/andeshape-platforms/ae350-axi-based-platform-pre-integrated-with-n25f-nx25f-a25-ax25/ > > so your solution fits perfectly since they are two very distinct platforms. > > So yes please send V4 with that change. > > Thank you! > > Best regards From giulio.benetti at benettiengineering.com Mon Feb 21 19:10:59 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 21 Feb 2022 20:10:59 +0100 Subject: [Buildroot] [PATCH 2/3] board/andes/ae350: add support for Andes AE350 In-Reply-To: <20220215023202.1188-2-peterlin@andestech.com> References: <20220215023202.1188-1-peterlin@andestech.com> <20220215023202.1188-2-peterlin@andestech.com> Message-ID: <174939a7-02dc-7fee-8ac5-0c9b18478a7d@benettiengineering.com> Hi Peter, Alan, On 15/02/22 03:32, Yu Chien Peter Lin wrote: > This patch provides defconfig and basic support for the Andes > 45 series RISC-V architecture. Please add the board or SoC URL website here. Thank you! Best regards -- Giulio Benetti Benetti Engineering sas > Signed-off-by: Yu Chien Peter Lin > Signed-off-by: Alan Kao > --- > Changes > V1->V2: > * move linux source code and its patches to AndesTech Github repo > * rename ae350_andestar45_defconfig to andes_ae350_45_defconfig > * change C library to uClibc > * remove OpenSSL package > * remove rootfs.cpio and rootfs.tar > * update DEVELOPERS > V2->V3: > * specifiy branch to download from AndesTech linux repo > * change boot.cmd to extlinux.conf > * add post-build.sh for extlinux.conf to retrieve Image and DTB > * fix format and update genimage_sdcard.cfg > * update readme.txt > * add packages (python3, pylibfdt and openssl) for u-boot binman > * reorder item in DEVELOPERS > > board/andes/ae350/ae350.dts | 274 ++++++++++++++++++ > board/andes/ae350/genimage_sdcard.cfg | 26 ++ > ...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/post-build.sh | 3 + > board/andes/ae350/readme.txt | 65 +++++ > .../boot/extlinux/extlinux.conf | 4 + > board/andes/ae350/uboot.config.fragment | 5 + > configs/andes_ae350_45_defconfig | 43 +++ > 13 files changed, 579 insertions(+) > create mode 100755 board/andes/ae350/ae350.dts > 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 100755 board/andes/ae350/post-build.sh > create mode 100644 board/andes/ae350/readme.txt > create mode 100644 board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf > 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/genimage_sdcard.cfg b/board/andes/ae350/genimage_sdcard.cfg > new file mode 100644 > index 0000000000..b8b9fe6a62 > --- /dev/null > +++ b/board/andes/ae350/genimage_sdcard.cfg > @@ -0,0 +1,26 @@ > +image boot.vfat { > + vfat { > + files = { > + "u-boot-spl.bin", > + "u-boot.itb", > + "ae350.dtb", > + } > + } > + size = 2M > +} > + > +image sdcard.img { > + hdimage { > + } > + > + partition boot { > + partition-type = 0xC > + image = "boot.vfat" > + } > + > + partition rootfs { > + partition-type = 0x83 > + bootable = true > + 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/post-build.sh b/board/andes/ae350/post-build.sh > new file mode 100755 > index 0000000000..0e6ce228f4 > --- /dev/null > +++ b/board/andes/ae350/post-build.sh > @@ -0,0 +1,3 @@ > +#!/bin/sh > +cp $BINARIES_DIR/Image $TARGET_DIR/boot > +cp $BINARIES_DIR/ae350.dtb $TARGET_DIR/boot > diff --git a/board/andes/ae350/readme.txt b/board/andes/ae350/readme.txt > new file mode 100644 > index 0000000000..6825468d50 > --- /dev/null > +++ b/board/andes/ae350/readme.txt > @@ -0,0 +1,65 @@ > +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/ > + |-- ae350.dtb > + |-- boot.vfat > + |-- fw_dynamic.bin > + |-- fw_dynamic.elf > + |-- fw_jump.bin > + |-- fw_jump.elf > + |-- Image > + |-- 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 > + $ sudo sync > + > +Your SD card partition should be: > + > + Disk /dev/sdb: 14.48 GiB, 15552479232 bytes, 30375936 sectors > + Disk model: Multi-Card > + Units: sectors of 1 * 512 = 512 bytes > + Sector size (logical/physical): 512 bytes / 512 bytes > + I/O size (minimum/optimal): 512 bytes / 512 bytes > + Disklabel type: dos > + Disk identifier: 0x00000000 > + > + Device Boot Start End Sectors Size Id Type > + /dev/sdb1 1 4096 4096 2M c W95 FAT32 (LBA) > + /dev/sdb2 * 4097 126976 122880 60M 83 Linux > + > +Insert SD card and reset the board, it should boot Linux from mmc. > diff --git a/board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf b/board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf > new file mode 100644 > index 0000000000..549eb93abc > --- /dev/null > +++ b/board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf > @@ -0,0 +1,4 @@ > +label linux > + kernel /boot/Image > + fdt /boot/ae350.dtb > + append earlycon=sbi root=/dev/mmcblk0p2 rootwait > 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..a35ddd06ba > --- /dev/null > +++ b/configs/andes_ae350_45_defconfig > @@ -0,0 +1,43 @@ > +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_OVERLAY="board/andes/ae350/rootfs_overlay" > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/andes/ae350/post-build.sh" > +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_GIT=y > +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/andestech/linux.git" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.10.84-ae350_45" > +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_PYTHON3=y > +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y > +# BR2_TARGET_UBOOT_FORMAT_BIN is not set > +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.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 From petr.vorel at gmail.com Mon Feb 21 19:21:26 2022 From: petr.vorel at gmail.com (Petr Vorel) Date: Mon, 21 Feb 2022 20:21:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/libqmi: bump version to 1.30.4 Message-ID: <20220221192126.30231-1-petr.vorel@gmail.com> Remove 0001-build-add-an-option-to-not-build-man-pages.patch as release contains very similar commit which does autodetection: 1a474db ("build: add an option to not build man pages") Signed-off-by: Petr Vorel --- 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 andes-nds32 [ 1/45]: FAILED (not related to this change) 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]: OK 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]: OK 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]: SKIPPED 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]: SKIPPED br-powerpc64-power7-glibc [36/45]: OK linaro-aarch64-be [37/45]: OK linaro-aarch64 [38/45]: OK linaro-arm [39/45]: OK sourcery-arm-armv4t [40/45]: 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]: OK ...add-an-option-to-not-build-man-pages.patch | 65 ------------------- package/libqmi/libqmi.hash | 2 +- package/libqmi/libqmi.mk | 2 +- 3 files changed, 2 insertions(+), 67 deletions(-) delete mode 100644 package/libqmi/0001-build-add-an-option-to-not-build-man-pages.patch 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 deleted file mode 100644 index d9053de537..0000000000 --- a/package/libqmi/0001-build-add-an-option-to-not-build-man-pages.patch +++ /dev/null @@ -1,65 +0,0 @@ -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.hash b/package/libqmi/libqmi.hash index 1f2da45ac0..ef2da77a2a 100644 --- a/package/libqmi/libqmi.hash +++ b/package/libqmi/libqmi.hash @@ -1,4 +1,4 @@ # Locally computed: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB -sha256 2eb7c7971b91a64ad830643b0170cff692a69bf0f093ca61d72d3f466a0272d4 libqmi-1.30.2.tar.gz +sha256 82ddd3f77c602b1e0c11d3e41d0563ede11f95036ebfcf929bc89157b13928e6 libqmi-1.30.4.tar.gz diff --git a/package/libqmi/libqmi.mk b/package/libqmi/libqmi.mk index a4839f1efb..b33e2fdc47 100644 --- a/package/libqmi/libqmi.mk +++ b/package/libqmi/libqmi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBQMI_VERSION = 1.30.2 +LIBQMI_VERSION = 1.30.4 LIBQMI_SITE = https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/archive/$(LIBQMI_VERSION) LIBQMI_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (programs) LIBQMI_LICENSE_FILES = COPYING COPYING.LIB -- 2.35.1 From petr.vorel at gmail.com Mon Feb 21 19:23:02 2022 From: petr.vorel at gmail.com (Petr Vorel) Date: Mon, 21 Feb 2022 20:23:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/modem-manager: bump version to 1.16.10 Message-ID: <20220221192302.20698-1-petr.vorel@gmail.com> Signed-off-by: Petr Vorel --- 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]: FAILED # not related to this change 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 package/modem-manager/modem-manager.hash | 2 +- package/modem-manager/modem-manager.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/modem-manager/modem-manager.hash b/package/modem-manager/modem-manager.hash index 14597215df..ea91f42fe0 100644 --- a/package/modem-manager/modem-manager.hash +++ b/package/modem-manager/modem-manager.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 2ccf1f716c2d121e8e6709bcf8af29ee86971a90adacca2e8d6288b30278862e ModemManager-1.16.10.tar.xz +sha256 d4f804b31cf504239c5f1d4973c62095c00cba1ee9abb503718dac6d146a470a ModemManager-1.18.6.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk index a881edc272..d7e2c55bf8 100644 --- a/package/modem-manager/modem-manager.mk +++ b/package/modem-manager/modem-manager.mk @@ -4,7 +4,7 @@ # ################################################################################ -MODEM_MANAGER_VERSION = 1.16.10 +MODEM_MANAGER_VERSION = 1.18.6 MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.xz MODEM_MANAGER_SITE = http://www.freedesktop.org/software/ModemManager MODEM_MANAGER_LICENSE = GPL-2.0+ (programs, plugins), LGPL-2.0+ (libmm-glib) -- 2.35.1 From giulio.benetti at benettiengineering.com Mon Feb 21 19:32:48 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 21 Feb 2022 20:32:48 +0100 Subject: [Buildroot] Issue with login In-Reply-To: References: Message-ID: <6EA7F8E4-B66D-419E-884D-9F7B69357C5D@benettiengineering.com> Hi Mohd, > Il giorno 21 feb 2022, alle ore 15:16, Mohd Faiz Rohani ha scritto: > > ? > Hi Giulio, > > Update: I have tried the latest kernel (5.15) with buildroot toolchain. result is same, RFS mounting error (refer attached) Please use https://pasteboard.co/ for images, but it would be definitely better to have a pastebin. As I see it fails to mount mmc0blk0p2. But are you trying to boot from sd-card or eMMC? If from sd-card make sure you have partition 2 with fdisk. Same goes for eMMC, you need to check the partitions. Maybe simply rootfs is on partition 1?!? And so you only need to pass a different rootfs argument to bootargs. What happens if instead you build Buildroot beaglebone_defconfig? Can you give a go with that and use its instructions found in board/beaglebone/readme.txt please? If that works at least we know the HE is alive. Thank you Giulio > > >> On Mon, Feb 21, 2022 at 5:46 PM Mohd Faiz Rohani wrote: >> Yes I will, even though I'm not in IRC for quite some time now. :). Thanks a lot Giulio! >> >>> On Mon, Feb 21, 2022 at 5:43 PM Giulio Benetti wrote: >>> >>>>> Il giorno 21 feb 2022, alle ore 10:33, Mohd Faiz Rohani ha scritto: >>>>> >>>> ? >>>> Btw, is the mailing list correct platform for Buildroot Q&A? Do you have any related forum for the purpose? Thanks >>> >>> It?s one of its purpose, but I suggest you to also join IRC #buildroot channel. >>> >>> Best regards >>> Giulio >>> >>>> >>>>> On Mon, Feb 21, 2022, 4:44 PM Giulio Benetti wrote: >>>>> Hi Mohd, >>>>> >>>>> On 21/02/22 06:16, Mohd Faiz Rohani wrote: >>>>> > Hi guys, >>>>> > >>>>> > Thank you for your help.I have overlooked the required setting as >>>>> > normally I will leave the setting to the default, as I assume Buildroot >>>>> > has selected the required settings. Anyway I have managed to login >>>>> > successfully now. >>>>> > >>>>> > I have turned on BR2_PACKAGE_SYSTEMD_LOGIND and >>>>> > BR2_PACKAGE_UTIL_LINUX_LOGIN settings, while the rest does not change. >>>>> >>>>> Perfect, team working with Edgar worked :-) >>>>> >>>>> > Fyi, I have tried the newer versions of Linux Kernel (5.15) and Uboot >>>>> > (v2022.01) with the Linaro 7.5 toolchain, but got an error during the >>>>> > booting process where the RFS cannot be mounted. It may be my fault >>>>> > through the settings though, that is why I am trying the old version and >>>>> > it worked. >>>>> >>>>> I would avoid using gcc 7.5 on such new kernel/uboot. Maybe if you try >>>>> to rebuild using an external prebuilt toolchain like the Bootlin one, or >>>>> you build a Buildroot toolchain with latest versions, like gcc 10.x you >>>>> could obtain different results. >>>>> >>>>> > I am planning to use Buildroot for my future development and keen to >>>>> > contribute wherever I can. Still lots to learn though. >>>>> >>>>> Well! >>>>> >>>>> > Thank you again guys. >>>>> >>>>> You're welcome >>>>> >>>>> Best regards >>>>> -- >>>>> Giulio Benetti >>>>> Benetti Engineering sas >>>>> >>>>> > Regards. >>>>> > Faiz >>>>> > >>>>> > >>>>> > >>>>> > >>>>> > On Mon, Feb 21, 2022 at 2:33 AM Mohd Faiz Rohani >>>>> > > wrote: >>>>> > >>>>> > Thanks, I'll check them out. Will update the outcome once the >>>>> > installation is done. >>>>> > >>>>> > Thank you. >>>>> > >>>>> > On Mon, Feb 21, 2022, 1:56 AM Giulio Benetti >>>>> > >>>> > > wrote: >>>>> > >>>>> > Hi Edgar, >>>>> > >>>>> > please reply to all in Mailing List, I add Mohd in Cc, >>>>> > >>>>> > On 20/02/22 17:18, Edgar Bonet wrote: >>>>> > > Hi! >>>>> > > >>>>> > > In his config file, Mohd wrote: >>>>> > >> BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_10=y >>>>> > >> BR2_LINUX_KERNEL_VERSION="4.4.155" >>>>> > > >>>>> > > This may cause problems. C.f. docs/manual/configure.txt: >>>>> > > >>>>> > > If you use kernel headers that are more recent than the >>>>> > Linux >>>>> > > kernel you run on your embedded system, then the C >>>>> > library might >>>>> > > be using interfaces that are not provided by your Linux >>>>> > kernel. >>>>> > >>>>> > Good catch Edgar! >>>>> > So Mohd, what you need here is a toolchain with older libc. >>>>> > https://buildroot.org/downloads/manual/manual.html#_cross_compilation_toolchain >>>>> > >>>>> > >>>>> > But again, do you really need to use so such old versions >>>>> > instead of try >>>>> > to use buildroot's beaglebone_defconfig? >>>>> > >>>>> > > In the same config file, there is: >>>>> > >> # BR2_PACKAGE_BUSYBOX is not set >>>>> > > >>>>> > > When disabling busybox, you should have seen the message: >>>>> > > >>>>> > > You may need to enable other packages to get a working >>>>> > system >>>>> > > You better know what you're doing! >>>>> > >>>>> > Despite of what I've written on my previous e-mail(my test was >>>>> > wrong), >>>>> > he has BR2_INIT_SYSTEMD=y that works as Init System, so that's ok. >>>>> > >>>>> > > And then: >>>>> > >> # BR2_PACKAGE_SYSTEMD_LOGIND is not set >>>>> > >>>>> > Good catch again Edgar! This ^^^ should be the point. Because it's >>>>> > exactly the systemd login dameon. >>>>> > >>>>> > >> # BR2_PACKAGE_UTIL_LINUX_LOGIN is not set >>>>> > >>>>> > This ^^^ is not selected by systemd, so I expect >>>>> > BR2_PACKAGE_SYSTEMD_LOGIND to do the job(even if I'm not a systemd >>>>> > expoert at all). >>>>> > >>>>> > But as Edgar pointed linux headers don't match so you have 3 >>>>> > choices: >>>>> > 1) find a toolchain with linux-headers <= 4.4.* >>>>> > 2) update linux version >>>>> > 3) start from scratch using buildroot beaglebone_defconfig >>>>> > >>>>> > Best regards >>>>> > -- >>>>> > Giulio Benetti >>>>> > Benetti Engineering sas >>>>> > >>>>> >>>> _______________________________________________ >>>> buildroot mailing list >>>> buildroot at buildroot.org >>>> https://lists.buildroot.org/mailman/listinfo/buildroot -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: 20220221_211831.jpg Type: image/jpeg Size: 150206 bytes Desc: not available URL: From yann.morin.1998 at free.fr Mon Feb 21 20:00:44 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 21 Feb 2022 21:00:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/re2: fix build with gcc <= 5 In-Reply-To: <20220221172900.1937856-1-fontaine.fabrice@gmail.com> References: <20220221172900.1937856-1-fontaine.fabrice@gmail.com> Message-ID: <20220221200044.GA2166282@scaer> Fabrice, All, On 2022-02-21 18:29 +0100, Fabrice Fontaine spake thusly: > Fix the following build failure with gcc <= 5 raised since bump to > version 2022-02-01 in commit d2cf91e0c6a082261cc7ebb06dfdbd7bc2c2956f > and > https://github.com/google/re2/commit/a022cc0c55b0519629d64d775e7a5195af34a477 > > ./re2/sparse_array.h:266:37: warning: defaulted and deleted functions only available with -std=c++11 or -std=gnu++11 > SparseArray::SparseArray() = default; > ^ > ./re2/sparse_array.h: In copy constructor 're2::SparseArray::SparseArray(const re2::SparseArray&)': > ./re2/sparse_array.h:273:3: error: 'copy_n' is not a member of 'std' > std::copy_n(src.sparse_.data(), src.max_size(), sparse_.data()); > ^ > > Fixes: > - http://autobuild.buildroot.org/results/8ebbac67f32fe24416a1f72aad0afd42b567b403 > > Signed-off-by: Fabrice Fontaine > --- > package/re2/re2.mk | 15 ++++++++++----- > 1 file changed, 10 insertions(+), 5 deletions(-) > > diff --git a/package/re2/re2.mk b/package/re2/re2.mk > index 41392cb179..cc5fed71fa 100644 > --- a/package/re2/re2.mk > +++ b/package/re2/re2.mk > @@ -10,20 +10,25 @@ RE2_LICENSE = BSD-3-Clause > RE2_LICENSE_FILES = LICENSE > RE2_INSTALL_STAGING = YES > > +RE2_MAKE_OPTS = \ > + $(TARGET_CONFIGURE_OPTS) \ > + CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" \ > + prefix=/usr Is there a reason to have 'prefix' be set during the build, instead of just the install steps? Regards, Yann E. MORIN. > define RE2_BUILD_CMDS > - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ > + $(TARGET_MAKE_ENV) $(MAKE) $(RE2_MAKE_OPTS) \ > -C $(@D) $(if $(BR2_STATIC_LIBS),static) > endef > > define RE2_INSTALL_STAGING_CMDS > - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ > - DESTDIR="$(STAGING_DIR)" prefix=/usr -C $(@D) \ > + $(TARGET_MAKE_ENV) $(MAKE) $(RE2_MAKE_OPTS) \ > + DESTDIR="$(STAGING_DIR)" -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) \ > + $(TARGET_MAKE_ENV) $(MAKE) $(RE2_MAKE_OPTS) \ > + DESTDIR="$(TARGET_DIR)" -C $(@D) \ > $(if $(BR2_STATIC_LIBS),static-install,install) > endef > > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From arnout at mind.be Mon Feb 21 20:02:30 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 21 Feb 2022 21:02:30 +0100 Subject: [Buildroot] building uclibc based toolchain with buildroot In-Reply-To: References: Message-ID: On 21/02/2022 11:48, Rezaei Vahid wrote: > hi > I want to compile a C++17 library for my board. > the toolchain that comes with my board SDK does not support C++17. > I want to build a uclibc based toolchain with buildroot. > I am following this tutorial > https://www.uclibc.org/toolchains.html > the old toolchain configuration. > arch? ? ? ? ? ?arm > mcpu? ? ? ? ? cortex-a7 > mfloat-abi? ?softfp > mfpu? ? ? ? ? ?neon_vfpv4 > no_aggrasive_loop_optimizations > > kernel? 3.18.20 > uclibc? 0.9.33.2 > > gcc 4.9.2 ----(which I want to upgrade to a version that supports C++17 ) > > which? I have Uclibc rootfs (uclibc 0.9.33.2), I have to build toolchain with > uclibc 0.9.33 how can I specify the version of uclibc of the toolchain? It is not possible with Buildroot to specify an old version of uClibc, the latest uClibc-NG release is always used. Since uClibc has no ABI stability guarantee, there's no way to compile a program against one version of uClibc and run it with a different uClibc. It may work, but it may also fail to work in weird and hard-to-debug ways. So your options are: - Build a complete rootfs with Buildroot. - Create an SDK that includes your library and build it for static linking only. - Put your library in a "container" image that includes uClibc and other libraries you want to link agains. It doesn't need to be an actual container, you just need to bind-mount /proc and /sys and chroot into it. Regards, Arnout From yegorslists at googlemail.com Mon Feb 21 20:11:59 2022 From: yegorslists at googlemail.com (Yegor Yefremov) Date: Mon, 21 Feb 2022 21:11:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/modem-manager: bump version to 1.16.10 In-Reply-To: <20220221192302.20698-1-petr.vorel@gmail.com> References: <20220221192302.20698-1-petr.vorel@gmail.com> Message-ID: Hi Petr, On Mon, Feb 21, 2022 at 8:23 PM Petr Vorel wrote: > > Signed-off-by: Petr Vorel > --- > 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]: FAILED # not related to this change > 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 > > package/modem-manager/modem-manager.hash | 2 +- > package/modem-manager/modem-manager.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/modem-manager/modem-manager.hash b/package/modem-manager/modem-manager.hash > index 14597215df..ea91f42fe0 100644 > --- a/package/modem-manager/modem-manager.hash > +++ b/package/modem-manager/modem-manager.hash > @@ -1,4 +1,4 @@ > # Locally computed > -sha256 2ccf1f716c2d121e8e6709bcf8af29ee86971a90adacca2e8d6288b30278862e ModemManager-1.16.10.tar.xz > +sha256 d4f804b31cf504239c5f1d4973c62095c00cba1ee9abb503718dac6d146a470a ModemManager-1.18.6.tar.xz > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB > diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk > index a881edc272..d7e2c55bf8 100644 > --- a/package/modem-manager/modem-manager.mk > +++ b/package/modem-manager/modem-manager.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -MODEM_MANAGER_VERSION = 1.16.10 > +MODEM_MANAGER_VERSION = 1.18.6 > MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.xz > MODEM_MANAGER_SITE = http://www.freedesktop.org/software/ModemManager > MODEM_MANAGER_LICENSE = GPL-2.0+ (programs, plugins), LGPL-2.0+ (libmm-glib) > -- > 2.35.1 The patch title should be about version 1.18.6 and not 1.16.10. Yegor From yann.morin.1998 at free.fr Mon Feb 21 20:42:35 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 21 Feb 2022 21:42:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/flac: security bump to version 1.3.4 In-Reply-To: <20220221172621.1937610-1-fontaine.fabrice@gmail.com> References: <20220221172621.1937610-1-fontaine.fabrice@gmail.com> Message-ID: <20220221204235.GB2166282@scaer> Fabrice, All, On 2022-02-21 18:26 +0100, Fabrice Fontaine spake thusly: > This release mostly fixes (security related) bugs including: > - Fix 12 decoder bugs found by oss-fuzz, including CVE-2020-0499 > - Fix encoder bug CVE-2021-0561 > > Also: > - Replace first patch which was reverted by > https://github.com/xiph/flac/commit/4fbb6d4f2ecf2a96c17ea9880108409f852c08a9 You removed that patch entirely, but forgot to drop FLAC_AUTORECONF=YES. I had a look at that upstream commit, and I was wondering how they got to fix that build issue if they reverted the patch. And indeed it is not fixed and still happens: cpu.c:58:10: fatal error: sys/auxv.h: No such file or directory #include ^~~~~~~~~~~~ compilation terminated. make[6]: *** [Makefile:739: cpu.lo] Error 1 make[5]: *** [Makefile:796: all-recursive] Error 1 make[4]: *** [Makefile:435: all-recursive] Error 1 make[3]: *** [Makefile:500: all-recursive] Error 1 make[2]: *** [Makefile:432: all] Error 2 So we need to adapt that patch instead of dropping it (and thus we need to keep AUTORECONF=YES, of course). Regards, Yann E. MORIN. > - Disable stack protection (enabled by default since > https://github.com/xiph/flac/commit/f706f2832270a0b7851cdffe62ad37acda9423fe) > - Drop md5 which is not provided anymore > - Update indentation in hash file (two spaces) > > https://github.com/xiph/flac/releases/tag/1.3.4 > > Signed-off-by: Fabrice Fontaine > --- > ...ck-for-sys-auxv.h-before-defining-FL.patch | 36 ------------------- > package/flac/flac.hash | 12 +++---- > package/flac/flac.mk | 5 +-- > 3 files changed, 8 insertions(+), 45 deletions(-) > delete mode 100644 package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch > > diff --git a/package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch b/package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch > deleted file mode 100644 > index d1398d4b3e..0000000000 > --- a/package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch > +++ /dev/null > @@ -1,36 +0,0 @@ > -From 14a0713389fbfef59225d027ea466ebb478a8c6b Mon Sep 17 00:00:00 2001 > -From: Peter Seiderer > -Date: Thu, 19 Sep 2019 21:18:04 +0200 > -Subject: [PATCH] configure.ac: check for sys/auxv.h before defining FLAC__CPU_PPC > - > -Upstream: https://github.com/xiph/flac/pull/142 > -Signed-off-by: Peter Seiderer > ---- > - configure.ac | 4 ++-- > - 1 file changed, 2 insertions(+), 2 deletions(-) > - > -diff --git a/configure.ac b/configure.ac > -index 0228a12..64cb3f2 100644 > ---- a/configure.ac > -+++ b/configure.ac > -@@ -144,7 +144,7 @@ case "$host_cpu" in > - powerpc64|powerpc64le) > - cpu_ppc64=true > - cpu_ppc=true > -- AC_DEFINE(FLAC__CPU_PPC) > -+ AC_CHECK_HEADER(sys/auxv.h, AC_DEFINE(FLAC__CPU_PPC)) > - AH_TEMPLATE(FLAC__CPU_PPC, [define if building for PowerPC]) > - AC_DEFINE(FLAC__CPU_PPC64) > - AH_TEMPLATE(FLAC__CPU_PPC64, [define if building for PowerPC64]) > -@@ -152,7 +152,7 @@ case "$host_cpu" in > - ;; > - powerpc|powerpcle) > - cpu_ppc=true > -- AC_DEFINE(FLAC__CPU_PPC) > -+ AC_CHECK_HEADER(sys/auxv.h, AC_DEFINE(FLAC__CPU_PPC)) > - AH_TEMPLATE(FLAC__CPU_PPC, [define if building for PowerPC]) > - asm_optimisation=$asm_opt > - ;; > --- > -2.23.0 > - > diff --git a/package/flac/flac.hash b/package/flac/flac.hash > index df7c2d1b95..2444535e0f 100644 > --- a/package/flac/flac.hash > +++ b/package/flac/flac.hash > @@ -1,10 +1,8 @@ > -# From https://ftp.osuosl.org/pub/xiph/releases/flac/MD5SUMS > -md5 26703ed2858c1fc9ffc05136d13daa69 flac-1.3.3.tar.xz > # From https://ftp.osuosl.org/pub/xiph/releases/flac/SHA1SUMS > -sha1 6ac2e8f1dd18c9b0214c4d81bd70cdc1e943cffe flac-1.3.3.tar.xz > +sha1 99c28482a8b2d81deaf740639e4cb55658427420 flac-1.3.4.tar.xz > # From http://downloads.xiph.org/releases/flac/SHA256SUMS.txt > -sha256 213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748 flac-1.3.3.tar.xz > +sha256 8ff0607e75a322dd7cd6ec48f4f225471404ae2730d0ea945127b1355155e737 flac-1.3.4.tar.xz > # Locally computed > -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL > -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LGPL > -sha256 fa27cb11f13f97b0c5f3ff363b1e2610c6efe87ed175779cb2a78e44eb19d34c COPYING.Xiph > +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL > +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LGPL > +sha256 fa27cb11f13f97b0c5f3ff363b1e2610c6efe87ed175779cb2a78e44eb19d34c COPYING.Xiph > diff --git a/package/flac/flac.mk b/package/flac/flac.mk > index 9aa00b7ffd..2ff048b6e6 100644 > --- a/package/flac/flac.mk > +++ b/package/flac/flac.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -FLAC_VERSION = 1.3.3 > +FLAC_VERSION = 1.3.4 > FLAC_SITE = http://downloads.xiph.org/releases/flac > FLAC_SOURCE = flac-$(FLAC_VERSION).tar.xz > FLAC_INSTALL_STAGING = YES > @@ -19,7 +19,8 @@ FLAC_AUTORECONF = YES > FLAC_CONF_OPTS = \ > $(if $(BR2_INSTALL_LIBSTDCPP),--enable-cpplibs,--disable-cpplibs) \ > --disable-xmms-plugin \ > - --disable-altivec > + --disable-altivec \ > + --disable-stack-smash-protection > > ifeq ($(BR2_PACKAGE_LIBOGG),y) > FLAC_CONF_OPTS += --with-ogg=$(STAGING_DIR)/usr > -- > 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 Mon Feb 21 20:49:41 2022 From: romain.naour at gmail.com (Romain Naour) Date: Mon, 21 Feb 2022 21:49:41 +0100 Subject: [Buildroot] [PATCH] support/testing/../sample_python_pyyaml_dec.py: unbreak after move to pyaml 6.0 In-Reply-To: <20220220211055.1273368-1-peter@korsgaard.com> References: <20220220211055.1273368-1-peter@korsgaard.com> Message-ID: <57f6d974-4c01-908a-3895-e64a64ef67f8@gmail.com> Hi Peter, Le 20/02/2022 ? 22:10, Peter Korsgaard a ?crit?: > Fixes https://gitlab.com/buildroot.org/buildroot/-/jobs/2088684091 > > python sample_python_pyyaml_dec.py > Traceback (most recent call last): > File "/root/sample_python_pyyaml_dec.py", line 5, in > data = yaml.load(serialized) > TypeError: load() missing 1 required positional argument: 'Loader' > > yaml.load() requires a loader argument since the move to version 6.0: > https://github.com/yaml/pyyaml/pull/561 > > The test does not need the extra functionality of load(), so instead move to > the recommended safe_load(). > > Signed-off-by: Peter Korsgaard I did the same change while investigating this issue before replying to: http://lists.busybox.net/pipermail/buildroot/2022-February/637414.html Tested-by: Romain Naour Best regards, Romain > --- > support/testing/tests/package/sample_python_pyyaml_dec.py | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/support/testing/tests/package/sample_python_pyyaml_dec.py b/support/testing/tests/package/sample_python_pyyaml_dec.py > index 9ab8931197..bb90934f26 100644 > --- a/support/testing/tests/package/sample_python_pyyaml_dec.py > +++ b/support/testing/tests/package/sample_python_pyyaml_dec.py > @@ -2,7 +2,7 @@ import yaml > > with open("/tmp/data.yml", "rb") as f: > serialized = f.read() > -data = yaml.load(serialized) > +data = yaml.safe_load(serialized) > print(data) > assert(data["name"] == "python-pyyaml") > assert(data["versions"] == ["1", "2"]) From peter at korsgaard.com Mon Feb 21 20:56:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Feb 2022 21:56:40 +0100 Subject: [Buildroot] [PATCH] support/testing/../sample_python_pyyaml_dec.py: unbreak after move to pyaml 6.0 In-Reply-To: <20220220211055.1273368-1-peter@korsgaard.com> (Peter Korsgaard's message of "Sun, 20 Feb 2022 22:10:54 +0100") References: <20220220211055.1273368-1-peter@korsgaard.com> Message-ID: <8735kc7xbr.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Fixes https://gitlab.com/buildroot.org/buildroot/-/jobs/2088684091 > python sample_python_pyyaml_dec.py > Traceback (most recent call last): > File "/root/sample_python_pyyaml_dec.py", line 5, in > data = yaml.load(serialized) > TypeError: load() missing 1 required positional argument: 'Loader' > yaml.load() requires a loader argument since the move to version 6.0: > https://github.com/yaml/pyyaml/pull/561 > The test does not need the extra functionality of load(), so instead move to > the recommended safe_load(). > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 21 20:56:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Feb 2022 21:56:34 +0100 Subject: [Buildroot] [git commit] support/testing/../sample_python_pyyaml_dec.py: unbreak after move to pyaml 6.0 Message-ID: <20220221204906.BB0BA8110D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a83177aac627764fb7ab5dc6bd87646586598934 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes https://gitlab.com/buildroot.org/buildroot/-/jobs/2088684091 python sample_python_pyyaml_dec.py Traceback (most recent call last): File "/root/sample_python_pyyaml_dec.py", line 5, in data = yaml.load(serialized) TypeError: load() missing 1 required positional argument: 'Loader' yaml.load() requires a loader argument since the move to version 6.0: https://github.com/yaml/pyyaml/pull/561 The test does not need the extra functionality of load(), so instead move to the recommended safe_load(). Signed-off-by: Peter Korsgaard Tested-by: Romain Naour Signed-off-by: Peter Korsgaard --- support/testing/tests/package/sample_python_pyyaml_dec.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/package/sample_python_pyyaml_dec.py b/support/testing/tests/package/sample_python_pyyaml_dec.py index 9ab8931197..bb90934f26 100644 --- a/support/testing/tests/package/sample_python_pyyaml_dec.py +++ b/support/testing/tests/package/sample_python_pyyaml_dec.py @@ -2,7 +2,7 @@ import yaml with open("/tmp/data.yml", "rb") as f: serialized = f.read() -data = yaml.load(serialized) +data = yaml.safe_load(serialized) print(data) assert(data["name"] == "python-pyyaml") assert(data["versions"] == ["1", "2"]) From ps.report at gmx.net Mon Feb 21 21:07:45 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Mon, 21 Feb 2022 22:07:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/flac: security bump to version 1.3.4 In-Reply-To: <20220221204235.GB2166282@scaer> References: <20220221172621.1937610-1-fontaine.fabrice@gmail.com> <20220221204235.GB2166282@scaer> Message-ID: <20220221220745.3fb583e5@gmx.net> Hello Fabice, Yann, On Mon, 21 Feb 2022 21:42:35 +0100, "Yann E. MORIN" wrote: > Fabrice, All, > > On 2022-02-21 18:26 +0100, Fabrice Fontaine spake thusly: > > This release mostly fixes (security related) bugs including: > > - Fix 12 decoder bugs found by oss-fuzz, including CVE-2020-0499 > > - Fix encoder bug CVE-2021-0561 > > > > Also: > > - Replace first patch which was reverted by > > https://github.com/xiph/flac/commit/4fbb6d4f2ecf2a96c17ea9880108409f852c08a9 > > You removed that patch entirely, but forgot to drop FLAC_AUTORECONF=YES. > > I had a look at that upstream commit, and I was wondering how they got > to fix that build issue if they reverted the patch. And indeed it is not > fixed and still happens: > > cpu.c:58:10: fatal error: sys/auxv.h: No such file or directory > #include > ^~~~~~~~~~~~ > compilation terminated. > make[6]: *** [Makefile:739: cpu.lo] Error 1 > make[5]: *** [Makefile:796: all-recursive] Error 1 > make[4]: *** [Makefile:435: all-recursive] Error 1 > make[3]: *** [Makefile:500: all-recursive] Error 1 > make[2]: *** [Makefile:432: all] Error 2 > > So we need to adapt that patch instead of dropping it (and thus we need > to keep AUTORECONF=YES, of course). Same conclusion/test from my side..., just keeping the patch (and autoreconf) works... Regards, Peter > > Regards, > Yann E. MORIN. > > > - Disable stack protection (enabled by default since > > https://github.com/xiph/flac/commit/f706f2832270a0b7851cdffe62ad37acda9423fe) > > - Drop md5 which is not provided anymore > > - Update indentation in hash file (two spaces) > > > > https://github.com/xiph/flac/releases/tag/1.3.4 > > > > Signed-off-by: Fabrice Fontaine > > --- > > ...ck-for-sys-auxv.h-before-defining-FL.patch | 36 ------------------- > > package/flac/flac.hash | 12 +++---- > > package/flac/flac.mk | 5 +-- > > 3 files changed, 8 insertions(+), 45 deletions(-) > > delete mode 100644 package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch > > > > diff --git a/package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch b/package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch > > deleted file mode 100644 > > index d1398d4b3e..0000000000 > > --- a/package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch > > +++ /dev/null > > @@ -1,36 +0,0 @@ > > -From 14a0713389fbfef59225d027ea466ebb478a8c6b Mon Sep 17 00:00:00 2001 > > -From: Peter Seiderer > > -Date: Thu, 19 Sep 2019 21:18:04 +0200 > > -Subject: [PATCH] configure.ac: check for sys/auxv.h before defining FLAC__CPU_PPC > > - > > -Upstream: https://github.com/xiph/flac/pull/142 > > -Signed-off-by: Peter Seiderer > > ---- > > - configure.ac | 4 ++-- > > - 1 file changed, 2 insertions(+), 2 deletions(-) > > - > > -diff --git a/configure.ac b/configure.ac > > -index 0228a12..64cb3f2 100644 > > ---- a/configure.ac > > -+++ b/configure.ac > > -@@ -144,7 +144,7 @@ case "$host_cpu" in > > - powerpc64|powerpc64le) > > - cpu_ppc64=true > > - cpu_ppc=true > > -- AC_DEFINE(FLAC__CPU_PPC) > > -+ AC_CHECK_HEADER(sys/auxv.h, AC_DEFINE(FLAC__CPU_PPC)) > > - AH_TEMPLATE(FLAC__CPU_PPC, [define if building for PowerPC]) > > - AC_DEFINE(FLAC__CPU_PPC64) > > - AH_TEMPLATE(FLAC__CPU_PPC64, [define if building for PowerPC64]) > > -@@ -152,7 +152,7 @@ case "$host_cpu" in > > - ;; > > - powerpc|powerpcle) > > - cpu_ppc=true > > -- AC_DEFINE(FLAC__CPU_PPC) > > -+ AC_CHECK_HEADER(sys/auxv.h, AC_DEFINE(FLAC__CPU_PPC)) > > - AH_TEMPLATE(FLAC__CPU_PPC, [define if building for PowerPC]) > > - asm_optimisation=$asm_opt > > - ;; > > --- > > -2.23.0 > > - > > diff --git a/package/flac/flac.hash b/package/flac/flac.hash > > index df7c2d1b95..2444535e0f 100644 > > --- a/package/flac/flac.hash > > +++ b/package/flac/flac.hash > > @@ -1,10 +1,8 @@ > > -# From https://ftp.osuosl.org/pub/xiph/releases/flac/MD5SUMS > > -md5 26703ed2858c1fc9ffc05136d13daa69 flac-1.3.3.tar.xz > > # From https://ftp.osuosl.org/pub/xiph/releases/flac/SHA1SUMS > > -sha1 6ac2e8f1dd18c9b0214c4d81bd70cdc1e943cffe flac-1.3.3.tar.xz > > +sha1 99c28482a8b2d81deaf740639e4cb55658427420 flac-1.3.4.tar.xz > > # From http://downloads.xiph.org/releases/flac/SHA256SUMS.txt > > -sha256 213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748 flac-1.3.3.tar.xz > > +sha256 8ff0607e75a322dd7cd6ec48f4f225471404ae2730d0ea945127b1355155e737 flac-1.3.4.tar.xz > > # Locally computed > > -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL > > -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LGPL > > -sha256 fa27cb11f13f97b0c5f3ff363b1e2610c6efe87ed175779cb2a78e44eb19d34c COPYING.Xiph > > +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL > > +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LGPL > > +sha256 fa27cb11f13f97b0c5f3ff363b1e2610c6efe87ed175779cb2a78e44eb19d34c COPYING.Xiph > > diff --git a/package/flac/flac.mk b/package/flac/flac.mk > > index 9aa00b7ffd..2ff048b6e6 100644 > > --- a/package/flac/flac.mk > > +++ b/package/flac/flac.mk > > @@ -4,7 +4,7 @@ > > # > > ################################################################################ > > > > -FLAC_VERSION = 1.3.3 > > +FLAC_VERSION = 1.3.4 > > FLAC_SITE = http://downloads.xiph.org/releases/flac > > FLAC_SOURCE = flac-$(FLAC_VERSION).tar.xz > > FLAC_INSTALL_STAGING = YES > > @@ -19,7 +19,8 @@ FLAC_AUTORECONF = YES > > FLAC_CONF_OPTS = \ > > $(if $(BR2_INSTALL_LIBSTDCPP),--enable-cpplibs,--disable-cpplibs) \ > > --disable-xmms-plugin \ > > - --disable-altivec > > + --disable-altivec \ > > + --disable-stack-smash-protection > > > > ifeq ($(BR2_PACKAGE_LIBOGG),y) > > FLAC_CONF_OPTS += --with-ogg=$(STAGING_DIR)/usr > > -- > > 2.34.1 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > From ps.report at gmx.net Mon Feb 21 21:39:33 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Mon, 21 Feb 2022 22:39:33 +0100 Subject: [Buildroot] [PATCH v1] package/libinput: bump version to 1.20.0 Message-ID: <20220221213933.457-1-ps.report@gmx.net> - change site URL to new gitlab.freedesktop.org location - change hash from upstream provided to locally computed (and drop sha512) For details see [1] and [2]. [1] https://lists.freedesktop.org/archives/wayland-devel/2022-February/042111.html [2] https://gitlab.freedesktop.org/libinput/libinput/-/releases/1.20.0 Signed-off-by: Peter Seiderer --- package/libinput/libinput.hash | 5 ++--- package/libinput/libinput.mk | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/libinput/libinput.hash b/package/libinput/libinput.hash index f18a727810..d1c7cfb104 100644 --- a/package/libinput/libinput.hash +++ b/package/libinput/libinput.hash @@ -1,6 +1,5 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2021-December/042068.html -sha256 3cae78ccde19d7d0f387e58bc734d4d17ab5f6426f54a9e8b728c90b17baa068 libinput-1.19.3.tar.xz -sha512 f4b776d0da78c687ba21b430a04941ac6b43f68970c82ec9f7360358fdea5ed6a873948ce66a25bcdd64d4b95fa4bf705cc24dbc25c7c0f5fd2d0efbd763f298 libinput-1.19.3.tar.xz +# Locally computed +sha256 6c1f97892a7d599f97349e5e7c1239901fe00edcd4f6289f410034d5dc06cc85 libinput-1.20.0.tar.bz2 # License files sha256 80de50b2022a840db044c56db804ca3565600a692c0714babface587acc6d1b0 COPYING diff --git a/package/libinput/libinput.mk b/package/libinput/libinput.mk index 2f9c639c22..b814e3416d 100644 --- a/package/libinput/libinput.mk +++ b/package/libinput/libinput.mk @@ -4,9 +4,9 @@ # ################################################################################ -LIBINPUT_VERSION = 1.19.3 -LIBINPUT_SOURCE = libinput-$(LIBINPUT_VERSION).tar.xz -LIBINPUT_SITE = http://www.freedesktop.org/software/libinput +LIBINPUT_VERSION = 1.20.0 +LIBINPUT_SOURCE = libinput-$(LIBINPUT_VERSION).tar.bz2 +LIBINPUT_SITE = https://gitlab.freedesktop.org/libinput/libinput/-/archive/$(LIBINPUT_VERSION) LIBINPUT_DEPENDENCIES = host-pkgconf libevdev mtdev udev LIBINPUT_INSTALL_STAGING = YES LIBINPUT_LICENSE = MIT -- 2.35.1 From romain.naour at gmail.com Mon Feb 21 21:57:02 2022 From: romain.naour at gmail.com (Romain Naour) Date: Mon, 21 Feb 2022 22:57:02 +0100 Subject: [Buildroot] [PATCH] package/python-twisted: add missing python typing extensions runtime dependency Message-ID: <20220221215702.8461-1-romain.naour@gmail.com> # python sample_python_txtorcon.py Traceback (most recent call last): File "/root/sample_python_txtorcon.py", line 1, in import txtorcon # noqa File "/usr/lib/python3.10/site-packages/txtorcon/__init__.py", line 11, in File "/usr/lib/python3.10/site-packages/txtorcon/router.py", line 10, in File "/usr/lib/python3.10/site-packages/txtorcon/util.py", line 17, in File "/usr/lib/python3.10/site-packages/twisted/internet/defer.py", line 42, in ModuleNotFoundError: No module named 'typing_extensions' python typing_extensions is required since python-twisted 22.1.0 [1] Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202537 [1] https://github.com/twisted/twisted/commit/6e768da0a10c8ab42a57a1c0fa505ebe2d8bfb30 Signed-off-by: Romain Naour --- package/python-twisted/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-twisted/Config.in b/package/python-twisted/Config.in index 49a21c4204..8596025e9c 100644 --- a/package/python-twisted/Config.in +++ b/package/python-twisted/Config.in @@ -7,6 +7,7 @@ config BR2_PACKAGE_PYTHON_TWISTED select BR2_PACKAGE_PYTHON_HYPERLINK # runtime select BR2_PACKAGE_PYTHON_PYHAMCREST # runtime select BR2_PACKAGE_PYTHON_ZOPE_INTERFACE # runtime + select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime help Twisted is an event-driven networking engine written in Python. -- 2.35.1 From fontaine.fabrice at gmail.com Mon Feb 21 21:58:20 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 21 Feb 2022 22:58:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/flac: security bump to version 1.3.4 In-Reply-To: <20220221220745.3fb583e5@gmx.net> References: <20220221172621.1937610-1-fontaine.fabrice@gmail.com> <20220221204235.GB2166282@scaer> <20220221220745.3fb583e5@gmx.net> Message-ID: Hello, Le lun. 21 f?vr. 2022 ? 22:07, Peter Seiderer a ?crit : > > Hello Fabice, Yann, > > On Mon, 21 Feb 2022 21:42:35 +0100, "Yann E. MORIN" wrote: > > > Fabrice, All, > > > > On 2022-02-21 18:26 +0100, Fabrice Fontaine spake thusly: > > > This release mostly fixes (security related) bugs including: > > > - Fix 12 decoder bugs found by oss-fuzz, including CVE-2020-0499 > > > - Fix encoder bug CVE-2021-0561 > > > > > > Also: > > > - Replace first patch which was reverted by > > > https://github.com/xiph/flac/commit/4fbb6d4f2ecf2a96c17ea9880108409f852c08a9 > > > > You removed that patch entirely, but forgot to drop FLAC_AUTORECONF=YES. > > > > I had a look at that upstream commit, and I was wondering how they got > > to fix that build issue if they reverted the patch. And indeed it is not > > fixed and still happens: > > > > cpu.c:58:10: fatal error: sys/auxv.h: No such file or directory > > #include > > ^~~~~~~~~~~~ > > compilation terminated. > > make[6]: *** [Makefile:739: cpu.lo] Error 1 > > make[5]: *** [Makefile:796: all-recursive] Error 1 > > make[4]: *** [Makefile:435: all-recursive] Error 1 > > make[3]: *** [Makefile:500: all-recursive] Error 1 > > make[2]: *** [Makefile:432: all] Error 2 > > > > So we need to adapt that patch instead of dropping it (and thus we need > > to keep AUTORECONF=YES, of course). > > Same conclusion/test from my side..., just keeping the patch (and autoreconf) works... I forgot to add my own patch. I'll send a v2. > > Regards, > Peter > > > > > > Regards, > > Yann E. MORIN. > > > > > - Disable stack protection (enabled by default since > > > https://github.com/xiph/flac/commit/f706f2832270a0b7851cdffe62ad37acda9423fe) > > > - Drop md5 which is not provided anymore > > > - Update indentation in hash file (two spaces) > > > > > > https://github.com/xiph/flac/releases/tag/1.3.4 > > > > > > Signed-off-by: Fabrice Fontaine > > > --- > > > ...ck-for-sys-auxv.h-before-defining-FL.patch | 36 ------------------- > > > package/flac/flac.hash | 12 +++---- > > > package/flac/flac.mk | 5 +-- > > > 3 files changed, 8 insertions(+), 45 deletions(-) > > > delete mode 100644 package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch > > > > > > diff --git a/package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch b/package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch > > > deleted file mode 100644 > > > index d1398d4b3e..0000000000 > > > --- a/package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch > > > +++ /dev/null > > > @@ -1,36 +0,0 @@ > > > -From 14a0713389fbfef59225d027ea466ebb478a8c6b Mon Sep 17 00:00:00 2001 > > > -From: Peter Seiderer > > > -Date: Thu, 19 Sep 2019 21:18:04 +0200 > > > -Subject: [PATCH] configure.ac: check for sys/auxv.h before defining FLAC__CPU_PPC > > > - > > > -Upstream: https://github.com/xiph/flac/pull/142 > > > -Signed-off-by: Peter Seiderer > > > ---- > > > - configure.ac | 4 ++-- > > > - 1 file changed, 2 insertions(+), 2 deletions(-) > > > - > > > -diff --git a/configure.ac b/configure.ac > > > -index 0228a12..64cb3f2 100644 > > > ---- a/configure.ac > > > -+++ b/configure.ac > > > -@@ -144,7 +144,7 @@ case "$host_cpu" in > > > - powerpc64|powerpc64le) > > > - cpu_ppc64=true > > > - cpu_ppc=true > > > -- AC_DEFINE(FLAC__CPU_PPC) > > > -+ AC_CHECK_HEADER(sys/auxv.h, AC_DEFINE(FLAC__CPU_PPC)) > > > - AH_TEMPLATE(FLAC__CPU_PPC, [define if building for PowerPC]) > > > - AC_DEFINE(FLAC__CPU_PPC64) > > > - AH_TEMPLATE(FLAC__CPU_PPC64, [define if building for PowerPC64]) > > > -@@ -152,7 +152,7 @@ case "$host_cpu" in > > > - ;; > > > - powerpc|powerpcle) > > > - cpu_ppc=true > > > -- AC_DEFINE(FLAC__CPU_PPC) > > > -+ AC_CHECK_HEADER(sys/auxv.h, AC_DEFINE(FLAC__CPU_PPC)) > > > - AH_TEMPLATE(FLAC__CPU_PPC, [define if building for PowerPC]) > > > - asm_optimisation=$asm_opt > > > - ;; > > > --- > > > -2.23.0 > > > - > > > diff --git a/package/flac/flac.hash b/package/flac/flac.hash > > > index df7c2d1b95..2444535e0f 100644 > > > --- a/package/flac/flac.hash > > > +++ b/package/flac/flac.hash > > > @@ -1,10 +1,8 @@ > > > -# From https://ftp.osuosl.org/pub/xiph/releases/flac/MD5SUMS > > > -md5 26703ed2858c1fc9ffc05136d13daa69 flac-1.3.3.tar.xz > > > # From https://ftp.osuosl.org/pub/xiph/releases/flac/SHA1SUMS > > > -sha1 6ac2e8f1dd18c9b0214c4d81bd70cdc1e943cffe flac-1.3.3.tar.xz > > > +sha1 99c28482a8b2d81deaf740639e4cb55658427420 flac-1.3.4.tar.xz > > > # From http://downloads.xiph.org/releases/flac/SHA256SUMS.txt > > > -sha256 213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748 flac-1.3.3.tar.xz > > > +sha256 8ff0607e75a322dd7cd6ec48f4f225471404ae2730d0ea945127b1355155e737 flac-1.3.4.tar.xz > > > # Locally computed > > > -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL > > > -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LGPL > > > -sha256 fa27cb11f13f97b0c5f3ff363b1e2610c6efe87ed175779cb2a78e44eb19d34c COPYING.Xiph > > > +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL > > > +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LGPL > > > +sha256 fa27cb11f13f97b0c5f3ff363b1e2610c6efe87ed175779cb2a78e44eb19d34c COPYING.Xiph > > > diff --git a/package/flac/flac.mk b/package/flac/flac.mk > > > index 9aa00b7ffd..2ff048b6e6 100644 > > > --- a/package/flac/flac.mk > > > +++ b/package/flac/flac.mk > > > @@ -4,7 +4,7 @@ > > > # > > > ################################################################################ > > > > > > -FLAC_VERSION = 1.3.3 > > > +FLAC_VERSION = 1.3.4 > > > FLAC_SITE = http://downloads.xiph.org/releases/flac > > > FLAC_SOURCE = flac-$(FLAC_VERSION).tar.xz > > > FLAC_INSTALL_STAGING = YES > > > @@ -19,7 +19,8 @@ FLAC_AUTORECONF = YES > > > FLAC_CONF_OPTS = \ > > > $(if $(BR2_INSTALL_LIBSTDCPP),--enable-cpplibs,--disable-cpplibs) \ > > > --disable-xmms-plugin \ > > > - --disable-altivec > > > + --disable-altivec \ > > > + --disable-stack-smash-protection > > > > > > ifeq ($(BR2_PACKAGE_LIBOGG),y) > > > FLAC_CONF_OPTS += --with-ogg=$(STAGING_DIR)/usr > > > -- > > > 2.34.1 > > > > > > _______________________________________________ > > > buildroot mailing list > > > buildroot at buildroot.org > > > https://lists.buildroot.org/mailman/listinfo/buildroot > > > Best Regards, Fabrice From fontaine.fabrice at gmail.com Mon Feb 21 22:00:25 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 21 Feb 2022 23:00:25 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/flac: security bump to version 1.3.4 Message-ID: <20220221220025.2198034-1-fontaine.fabrice@gmail.com> This release mostly fixes (security related) bugs including: - Fix 12 decoder bugs found by oss-fuzz, including CVE-2020-0499 - Fix encoder bug CVE-2021-0561 Also: - Replace first patch which was reverted by https://github.com/xiph/flac/commit/4fbb6d4f2ecf2a96c17ea9880108409f852c08a9 - Disable stack protection (enabled by default since https://github.com/xiph/flac/commit/f706f2832270a0b7851cdffe62ad37acda9423fe) - Drop md5 which is not provided anymore - Update indentation in hash file (two spaces) https://github.com/xiph/flac/releases/tag/1.3.4 Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2 (after review of Yann E. Morin and Peter Seiderer): - Add upstream patch package/flac/0001-Fix-uclibc-build.patch | 81 +++++++++++++++++++ ...ck-for-sys-auxv.h-before-defining-FL.patch | 36 --------- package/flac/flac.hash | 12 ++- package/flac/flac.mk | 5 +- 4 files changed, 89 insertions(+), 45 deletions(-) create mode 100644 package/flac/0001-Fix-uclibc-build.patch delete mode 100644 package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch diff --git a/package/flac/0001-Fix-uclibc-build.patch b/package/flac/0001-Fix-uclibc-build.patch new file mode 100644 index 0000000000..fcba670fae --- /dev/null +++ b/package/flac/0001-Fix-uclibc-build.patch @@ -0,0 +1,81 @@ +From 4c62082f64132bfcbcb6569aa914c5ec283303f9 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 21 Feb 2022 18:21:11 +0100 +Subject: [PATCH] Fix uclibc build + +Commit 4fbb6d4f2ecf2a96c17ea9880108409f852c08a9 reverted commit +44036c9a9b45d03373fe90e9c112852bfc054c51 and so broke again the build on +uclibc + +So put back the sys/auxv.h check as well as a getauxval check in a way +that doesn't break iOS + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/xiph/flac/pull/292] +--- + configure.ac | 5 ++++- + src/libFLAC/cpu.c | 9 ++++----- + 2 files changed, 8 insertions(+), 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 4d7dc2e4..6f32fa45 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -69,7 +69,7 @@ AC_C_INLINE + AC_C_VARARRAYS + AC_C_TYPEOF + +-AC_CHECK_HEADERS([stdint.h inttypes.h byteswap.h sys/param.h sys/ioctl.h termios.h x86intrin.h cpuid.h]) ++AC_CHECK_HEADERS([stdint.h inttypes.h byteswap.h sys/auxv.h sys/param.h sys/ioctl.h termios.h x86intrin.h cpuid.h]) + + XIPH_C_BSWAP32 + XIPH_C_BSWAP16 +@@ -101,6 +101,9 @@ fi + # For the XMMS plugin. + AC_CHECK_TYPES(socklen_t, [], []) + ++dnl check for getauxval in standard library ++AC_CHECK_FUNCS(getauxval) ++ + dnl check for getopt in standard library + dnl AC_CHECK_FUNCS(getopt_long , , [LIBOBJS="$LIBOBJS getopt.o getopt1.o"] ) + AC_CHECK_FUNCS(getopt_long, [], []) +diff --git a/src/libFLAC/cpu.c b/src/libFLAC/cpu.c +index 8b92f4c7..64c6acad 100644 +--- a/src/libFLAC/cpu.c ++++ b/src/libFLAC/cpu.c +@@ -53,11 +53,9 @@ + #define dfprintf(file, format, ...) + #endif + +-#if defined FLAC__CPU_PPC +-#if defined(__linux__) || (defined(__FreeBSD__) && (__FreeBSD__ >= 12)) ++#if defined(HAVE_SYS_AUXV_H) + #include + #endif +-#endif + + #if (defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64) && (defined FLAC__HAS_NASM || FLAC__HAS_X86INTRIN) && !defined FLAC__NO_ASM + +@@ -247,7 +245,7 @@ ppc_cpu_info (FLAC__CPUInfo *info) + #define PPC_FEATURE2_ARCH_2_07 0x80000000 + #endif + +-#ifdef __linux__ ++#if defined (__linux__) && defined(HAVE_GETAUXVAL) + if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_3_00) { + info->ppc.arch_3_00 = true; + } else if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07) { +@@ -267,7 +265,8 @@ ppc_cpu_info (FLAC__CPUInfo *info) + info->ppc.arch_2_07 = false; + info->ppc.arch_3_00 = false; + #else +-#error Unsupported platform! Please add support for reading ppc hwcaps. ++ info->ppc.arch_2_07 = false; ++ info->ppc.arch_3_00 = false; + #endif + + #else +-- +2.34.1 + diff --git a/package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch b/package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch deleted file mode 100644 index d1398d4b3e..0000000000 --- a/package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 14a0713389fbfef59225d027ea466ebb478a8c6b Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 19 Sep 2019 21:18:04 +0200 -Subject: [PATCH] configure.ac: check for sys/auxv.h before defining FLAC__CPU_PPC - -Upstream: https://github.com/xiph/flac/pull/142 -Signed-off-by: Peter Seiderer ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 0228a12..64cb3f2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -144,7 +144,7 @@ case "$host_cpu" in - powerpc64|powerpc64le) - cpu_ppc64=true - cpu_ppc=true -- AC_DEFINE(FLAC__CPU_PPC) -+ AC_CHECK_HEADER(sys/auxv.h, AC_DEFINE(FLAC__CPU_PPC)) - AH_TEMPLATE(FLAC__CPU_PPC, [define if building for PowerPC]) - AC_DEFINE(FLAC__CPU_PPC64) - AH_TEMPLATE(FLAC__CPU_PPC64, [define if building for PowerPC64]) -@@ -152,7 +152,7 @@ case "$host_cpu" in - ;; - powerpc|powerpcle) - cpu_ppc=true -- AC_DEFINE(FLAC__CPU_PPC) -+ AC_CHECK_HEADER(sys/auxv.h, AC_DEFINE(FLAC__CPU_PPC)) - AH_TEMPLATE(FLAC__CPU_PPC, [define if building for PowerPC]) - asm_optimisation=$asm_opt - ;; --- -2.23.0 - diff --git a/package/flac/flac.hash b/package/flac/flac.hash index df7c2d1b95..2444535e0f 100644 --- a/package/flac/flac.hash +++ b/package/flac/flac.hash @@ -1,10 +1,8 @@ -# From https://ftp.osuosl.org/pub/xiph/releases/flac/MD5SUMS -md5 26703ed2858c1fc9ffc05136d13daa69 flac-1.3.3.tar.xz # From https://ftp.osuosl.org/pub/xiph/releases/flac/SHA1SUMS -sha1 6ac2e8f1dd18c9b0214c4d81bd70cdc1e943cffe flac-1.3.3.tar.xz +sha1 99c28482a8b2d81deaf740639e4cb55658427420 flac-1.3.4.tar.xz # From http://downloads.xiph.org/releases/flac/SHA256SUMS.txt -sha256 213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748 flac-1.3.3.tar.xz +sha256 8ff0607e75a322dd7cd6ec48f4f225471404ae2730d0ea945127b1355155e737 flac-1.3.4.tar.xz # Locally computed -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LGPL -sha256 fa27cb11f13f97b0c5f3ff363b1e2610c6efe87ed175779cb2a78e44eb19d34c COPYING.Xiph +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LGPL +sha256 fa27cb11f13f97b0c5f3ff363b1e2610c6efe87ed175779cb2a78e44eb19d34c COPYING.Xiph diff --git a/package/flac/flac.mk b/package/flac/flac.mk index 9aa00b7ffd..2ff048b6e6 100644 --- a/package/flac/flac.mk +++ b/package/flac/flac.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLAC_VERSION = 1.3.3 +FLAC_VERSION = 1.3.4 FLAC_SITE = http://downloads.xiph.org/releases/flac FLAC_SOURCE = flac-$(FLAC_VERSION).tar.xz FLAC_INSTALL_STAGING = YES @@ -19,7 +19,8 @@ FLAC_AUTORECONF = YES FLAC_CONF_OPTS = \ $(if $(BR2_INSTALL_LIBSTDCPP),--enable-cpplibs,--disable-cpplibs) \ --disable-xmms-plugin \ - --disable-altivec + --disable-altivec \ + --disable-stack-smash-protection ifeq ($(BR2_PACKAGE_LIBOGG),y) FLAC_CONF_OPTS += --with-ogg=$(STAGING_DIR)/usr -- 2.34.1 From fontaine.fabrice at gmail.com Mon Feb 21 22:05:02 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 21 Feb 2022 23:05:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/re2: fix build with gcc <= 5 In-Reply-To: <20220221200044.GA2166282@scaer> References: <20220221172900.1937856-1-fontaine.fabrice@gmail.com> <20220221200044.GA2166282@scaer> Message-ID: Yann, Le lun. 21 f?vr. 2022 ? 21:00, Yann E. MORIN a ?crit : > > Fabrice, All, > > On 2022-02-21 18:29 +0100, Fabrice Fontaine spake thusly: > > Fix the following build failure with gcc <= 5 raised since bump to > > version 2022-02-01 in commit d2cf91e0c6a082261cc7ebb06dfdbd7bc2c2956f > > and > > https://github.com/google/re2/commit/a022cc0c55b0519629d64d775e7a5195af34a477 > > > > ./re2/sparse_array.h:266:37: warning: defaulted and deleted functions only available with -std=c++11 or -std=gnu++11 > > SparseArray::SparseArray() = default; > > ^ > > ./re2/sparse_array.h: In copy constructor 're2::SparseArray::SparseArray(const re2::SparseArray&)': > > ./re2/sparse_array.h:273:3: error: 'copy_n' is not a member of 'std' > > std::copy_n(src.sparse_.data(), src.max_size(), sparse_.data()); > > ^ > > > > Fixes: > > - http://autobuild.buildroot.org/results/8ebbac67f32fe24416a1f72aad0afd42b567b403 > > > > Signed-off-by: Fabrice Fontaine > > --- > > package/re2/re2.mk | 15 ++++++++++----- > > 1 file changed, 10 insertions(+), 5 deletions(-) > > > > diff --git a/package/re2/re2.mk b/package/re2/re2.mk > > index 41392cb179..cc5fed71fa 100644 > > --- a/package/re2/re2.mk > > +++ b/package/re2/re2.mk > > @@ -10,20 +10,25 @@ RE2_LICENSE = BSD-3-Clause > > RE2_LICENSE_FILES = LICENSE > > RE2_INSTALL_STAGING = YES > > > > +RE2_MAKE_OPTS = \ > > + $(TARGET_CONFIGURE_OPTS) \ > > + CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" \ > > + prefix=/usr > > Is there a reason to have 'prefix' be set during the build, instead of > just the install steps? I thought it was better to have it in a single place but I'll send a v2. > > Regards, > Yann E. MORIN. > > > define RE2_BUILD_CMDS > > - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ > > + $(TARGET_MAKE_ENV) $(MAKE) $(RE2_MAKE_OPTS) \ > > -C $(@D) $(if $(BR2_STATIC_LIBS),static) > > endef > > > > define RE2_INSTALL_STAGING_CMDS > > - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ > > - DESTDIR="$(STAGING_DIR)" prefix=/usr -C $(@D) \ > > + $(TARGET_MAKE_ENV) $(MAKE) $(RE2_MAKE_OPTS) \ > > + DESTDIR="$(STAGING_DIR)" -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) \ > > + $(TARGET_MAKE_ENV) $(MAKE) $(RE2_MAKE_OPTS) \ > > + DESTDIR="$(TARGET_DIR)" -C $(@D) \ > > $(if $(BR2_STATIC_LIBS),static-install,install) > > endef > > > > -- > > 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. | > '------------------------------^-------^------------------^--------------------' Best Regards, Fabrice From fontaine.fabrice at gmail.com Mon Feb 21 22:07:03 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 21 Feb 2022 23:07:03 +0100 Subject: [Buildroot] [PATCH v2,1/1] package/re2: fix build with gcc <= 5 Message-ID: <20220221220703.2198424-1-fontaine.fabrice@gmail.com> Fix the following build failure with gcc <= 5 raised since bump to version 2022-02-01 in commit d2cf91e0c6a082261cc7ebb06dfdbd7bc2c2956f and https://github.com/google/re2/commit/a022cc0c55b0519629d64d775e7a5195af34a477 ./re2/sparse_array.h:266:37: warning: defaulted and deleted functions only available with -std=c++11 or -std=gnu++11 SparseArray::SparseArray() = default; ^ ./re2/sparse_array.h: In copy constructor 're2::SparseArray::SparseArray(const re2::SparseArray&)': ./re2/sparse_array.h:273:3: error: 'copy_n' is not a member of 'std' std::copy_n(src.sparse_.data(), src.max_size(), sparse_.data()); ^ Fixes: - http://autobuild.buildroot.org/results/8ebbac67f32fe24416a1f72aad0afd42b567b403 Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2 (after review of Yann E. Morin): - Don't set prefix in build step package/re2/re2.mk | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/package/re2/re2.mk b/package/re2/re2.mk index 41392cb179..30791a68e5 100644 --- a/package/re2/re2.mk +++ b/package/re2/re2.mk @@ -10,19 +10,23 @@ RE2_LICENSE = BSD-3-Clause RE2_LICENSE_FILES = LICENSE RE2_INSTALL_STAGING = YES +RE2_MAKE_OPTS = \ + $(TARGET_CONFIGURE_OPTS) \ + CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" + define RE2_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_MAKE_ENV) $(MAKE) $(RE2_MAKE_OPTS) \ -C $(@D) $(if $(BR2_STATIC_LIBS),static) endef define RE2_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_MAKE_ENV) $(MAKE) $(RE2_MAKE_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) \ + $(TARGET_MAKE_ENV) $(MAKE) $(RE2_MAKE_OPTS) \ DESTDIR="$(TARGET_DIR)" prefix=/usr -C $(@D) \ $(if $(BR2_STATIC_LIBS),static-install,install) endef -- 2.34.1 From romain.naour at gmail.com Mon Feb 21 22:38:08 2022 From: romain.naour at gmail.com (Romain Naour) Date: Mon, 21 Feb 2022 23:38:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-twisted: security bump to version 22.1.0 In-Reply-To: <87fsod9szu.fsf@dell.be.48ers.dk> References: <20220218105557.705926-1-fontaine.fabrice@gmail.com> <87fsod9szu.fsf@dell.be.48ers.dk> Message-ID: <150ef1b3-4d5e-37b3-881c-9a15e95a456b@gmail.com> Le 20/02/2022 ? 21:35, Peter Korsgaard a ?crit?: >>>>>> "Fabrice" == Fabrice Fontaine writes: > > > Fix CVE-2022-21712: twisted is an event-driven networking engine written > > in Python. In affected versions twisted exposes cookies and > > authorization headers when following cross-origin redirects. This issue > > is present in the `twited.web.RedirectAgent` and `twisted.web. > > BrowserLikeRedirectAgent` functions. Users are advised to upgrade. There > > are no known workarounds. > > > Update hash of license file (author added and update in year: > > https://github.com/twisted/twisted/commit/13aa59746a73769b05a51c2198b28f5602dd382f > > https://github.com/twisted/twisted/commit/adfdf23477abfcd09a867347993fc1d207cfb4dd > > https://github.com/twisted/twisted/commit/7e65fbeed3d74a4eb1c40d7a6df5651782becbc8) > > > https://github.com/twisted/twisted/security/advisories/GHSA-92x2-jw7w-xvvx > > https://github.com/twisted/twisted/releases/tag/twisted-22.1.0 > > > Signed-off-by: Fabrice Fontaine > > Committed, thanks. > I'm not familiar with python-twisted but it seems that python-twisted and python-treq must use the same version because its the same project: https://github.com/twisted/twisted https://github.com/twisted/treq We have to update python-treq to version 22.2.0 [1] otherwise we have a runtime issue: # python sample_python_treq.py Traceback (most recent call last): File "/root/sample_python_treq.py", line 2, in import treq File "/usr/lib/python3.10/site-packages/treq/__init__.py", line 5, in File "/usr/lib/python3.10/site-packages/treq/api.py", line 5, in File "/usr/lib/python3.10/site-packages/treq/client.py", line 11, in ImportError: cannot import name '_PY3' from 'twisted.python.compat' (unknown location) https://github.com/twisted/treq/releases/tag/release-22.2.0 Best regards, Romain From fontaine.fabrice at gmail.com Mon Feb 21 22:38:42 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 21 Feb 2022 23:38:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/osm2pgsql: disable external fmt Message-ID: <20220221223842.2201966-1-fontaine.fabrice@gmail.com> osm2pgsql doesn't support fmt > 8.0 yet resulting in the following build failure since bump of fmt to version 8.1.1 in commit ec7fd50d08690a383fec40748ac9b78c3f764316: /home/buildroot/autobuild/instance-0/output-1/host/aarch64-buildroot-linux-gnu/sysroot/usr/include/fmt/core.h:1728:7: error: static assertion failed: Cannot format an argument. To make type T formattable provide a formatter specialization: https://fmt.dev/latest/api.html#udt 1728 | formattable, | ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/5af1a0ea176559a5dc787ba945a3a83823f5b1bb Signed-off-by: Fabrice Fontaine --- package/osm2pgsql/Config.in | 5 ++--- package/osm2pgsql/osm2pgsql.mk | 5 +++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/osm2pgsql/Config.in b/package/osm2pgsql/Config.in index 315f496d8e..e903e92c49 100644 --- a/package/osm2pgsql/Config.in +++ b/package/osm2pgsql/Config.in @@ -1,17 +1,16 @@ config BR2_PACKAGE_OSM2PGSQL bool "osm2pgsql" - depends on BR2_INSTALL_LIBSTDCPP # boost, fmt, libosmium, protozero + depends on BR2_INSTALL_LIBSTDCPP # boost, libosmium, protozero depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 depends on BR2_TOOLCHAIN_HAS_THREADS # boost, libosmium depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-filesystem - depends on BR2_USE_WCHAR # boost, fmt, libosmium + depends on BR2_USE_WCHAR # boost, libosmium depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::future select BR2_PACKAGE_BOOST select BR2_PACKAGE_BOOST_SYSTEM select BR2_PACKAGE_BOOST_FILESYSTEM select BR2_PACKAGE_BZIP2 select BR2_PACKAGE_EXPAT - select BR2_PACKAGE_FMT select BR2_PACKAGE_LIBOSMIUM select BR2_PACKAGE_PROTOZERO select BR2_PACKAGE_ZLIB diff --git a/package/osm2pgsql/osm2pgsql.mk b/package/osm2pgsql/osm2pgsql.mk index b00976d28b..d389fff590 100644 --- a/package/osm2pgsql/osm2pgsql.mk +++ b/package/osm2pgsql/osm2pgsql.mk @@ -10,12 +10,13 @@ OSM2PGSQL_LICENSE = GPL-2.0+ OSM2PGSQL_LICENSE_FILES = COPYING OSM2PGSQL_SUPPORTS_IN_SOURCE_BUILD = NO -OSM2PGSQL_DEPENDENCIES = boost bzip2 expat fmt libosmium postgresql protozero zlib +OSM2PGSQL_DEPENDENCIES = boost bzip2 expat libosmium postgresql protozero zlib +# fmt > 8.0 is not yet supported OSM2PGSQL_CONF_OPTS = \ -DBUILD_TESTS=OFF \ -DBUILD_COVERAGE=OFF \ - -DEXTERNAL_FMT=ON \ + -DEXTERNAL_FMT=OFF \ -DEXTERNAL_LIBOSMIUM=ON \ -DEXTERNAL_PROTOZERO=ON -- 2.34.1 From fontaine.fabrice at gmail.com Mon Feb 21 23:06:40 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 22 Feb 2022 00:06:40 +0100 Subject: [Buildroot] [PATCH 1/2] package/python-treq: fix dependencies Message-ID: <20220221230640.2203877-1-fontaine.fabrice@gmail.com> python-treq needs TLS support in twisted so select BR2_PACKAGE_PYTHON_TWISTED_TLS moreover it doesn't depend directly on service_identity and pyOpenSSL since version 17.3.0 and https://github.com/twisted/treq/commit/ef2ac7ea2b74774adb9fef7675facc6017bfda89 Finally, python-idna was never a direct dependency of python-treq Signed-off-by: Fabrice Fontaine --- package/python-treq/Config.in | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/package/python-treq/Config.in b/package/python-treq/Config.in index f781b37305..7c02a35638 100644 --- a/package/python-treq/Config.in +++ b/package/python-treq/Config.in @@ -1,16 +1,13 @@ config BR2_PACKAGE_PYTHON_TREQ bool "python-treq" - # python-pyopenssl -> python-cryptography + # twisted TLS -> python-{pyopenssl,service-identity} depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS - # python-idna, python-pyopenssl -> python-cryptography select BR2_PACKAGE_PYTHON_ATTRS # runtime - select BR2_PACKAGE_PYTHON_IDNA # runtime select BR2_PACKAGE_PYTHON_INCREMENTAL # runtime - select BR2_PACKAGE_PYTHON_PYOPENSSL # runtime select BR2_PACKAGE_PYTHON_REQUESTS # runtime - select BR2_PACKAGE_PYTHON_SERVICE_IDENTITY # runtime select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_TWISTED # runtime + select BR2_PACKAGE_PYTHON_TWISTED_TLS # runtime help treq is an HTTP library inspired by requests but written on top of Twisted's Agents. It provides a simple, higher level -- 2.34.1 From fontaine.fabrice at gmail.com Mon Feb 21 23:08:15 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 22 Feb 2022 00:08:15 +0100 Subject: [Buildroot] [PATCH 2/2] package/python-treq: bump to version 22.2.0 Message-ID: <20220221230815.2203955-1-fontaine.fabrice@gmail.com> - hyperlink is a dependency since version 20.4.0 and https://github.com/twisted/treq/commit/5475def96f3ec93075ff95709fec4acd154e6fed - six is not a dependency since version 21.5.0 and https://github.com/twisted/treq/commit/22bdb399a03b0eebaa93023b80d348f584f567d5 Signed-off-by: Fabrice Fontaine --- package/python-treq/Config.in | 2 +- package/python-treq/python-treq.hash | 4 ++-- package/python-treq/python-treq.mk | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-treq/Config.in b/package/python-treq/Config.in index 7c02a35638..5d76a5cdd6 100644 --- a/package/python-treq/Config.in +++ b/package/python-treq/Config.in @@ -3,9 +3,9 @@ config BR2_PACKAGE_PYTHON_TREQ # twisted TLS -> python-{pyopenssl,service-identity} depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS select BR2_PACKAGE_PYTHON_ATTRS # runtime + select BR2_PACKAGE_PYTHON_HYPERLINK # runtime select BR2_PACKAGE_PYTHON_INCREMENTAL # runtime select BR2_PACKAGE_PYTHON_REQUESTS # runtime - select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_TWISTED # runtime select BR2_PACKAGE_PYTHON_TWISTED_TLS # runtime help diff --git a/package/python-treq/python-treq.hash b/package/python-treq/python-treq.hash index 288279cbd8..aecf71aad8 100644 --- a/package/python-treq/python-treq.hash +++ b/package/python-treq/python-treq.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/treq/json -md5 b75f6c89fd481989a9cfdec8d61a6d84 treq-20.3.0.tar.gz -sha256 a72d7587d6f81c7a32620b00175825b4334bafbde73d37098d139ac7b11dca98 treq-20.3.0.tar.gz +md5 43892086d556e7596392134f1e10bdef treq-22.2.0.tar.gz +sha256 df757e3f141fc782ede076a604521194ffcb40fa2645cf48e5a37060307f52ec treq-22.2.0.tar.gz # Locally computed sha256 checksums sha256 7cc1b65e1937b1cc07052bb864ec96d8e5fd413400c0842e5b89a8201a600293 LICENSE diff --git a/package/python-treq/python-treq.mk b/package/python-treq/python-treq.mk index 320f57b6f2..57dc50ee74 100644 --- a/package/python-treq/python-treq.mk +++ b/package/python-treq/python-treq.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TREQ_VERSION = 20.3.0 +PYTHON_TREQ_VERSION = 22.2.0 PYTHON_TREQ_SOURCE = treq-$(PYTHON_TREQ_VERSION).tar.gz -PYTHON_TREQ_SITE = https://files.pythonhosted.org/packages/98/09/25064d7224efde9fd51e8865353d516c53306e476eab27ab21fb258cf7d4 +PYTHON_TREQ_SITE = https://files.pythonhosted.org/packages/cd/c8/b68ab17d994133baf6edbcb5551ba81e1494bdc6d5e21a9d4f3bc4315140 PYTHON_TREQ_LICENSE = MIT PYTHON_TREQ_LICENSE_FILES = LICENSE PYTHON_TREQ_SETUP_TYPE = setuptools -- 2.34.1 From fontaine.fabrice at gmail.com Mon Feb 21 23:09:23 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 22 Feb 2022 00:09:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-twisted: security bump to version 22.1.0 In-Reply-To: <150ef1b3-4d5e-37b3-881c-9a15e95a456b@gmail.com> References: <20220218105557.705926-1-fontaine.fabrice@gmail.com> <87fsod9szu.fsf@dell.be.48ers.dk> <150ef1b3-4d5e-37b3-881c-9a15e95a456b@gmail.com> Message-ID: Le lun. 21 f?vr. 2022 ? 23:38, Romain Naour a ?crit : > > Le 20/02/2022 ? 21:35, Peter Korsgaard a ?crit : > >>>>>> "Fabrice" == Fabrice Fontaine writes: > > > > > Fix CVE-2022-21712: twisted is an event-driven networking engine written > > > in Python. In affected versions twisted exposes cookies and > > > authorization headers when following cross-origin redirects. This issue > > > is present in the `twited.web.RedirectAgent` and `twisted.web. > > > BrowserLikeRedirectAgent` functions. Users are advised to upgrade. There > > > are no known workarounds. > > > > > Update hash of license file (author added and update in year: > > > https://github.com/twisted/twisted/commit/13aa59746a73769b05a51c2198b28f5602dd382f > > > https://github.com/twisted/twisted/commit/adfdf23477abfcd09a867347993fc1d207cfb4dd > > > https://github.com/twisted/twisted/commit/7e65fbeed3d74a4eb1c40d7a6df5651782becbc8) > > > > > https://github.com/twisted/twisted/security/advisories/GHSA-92x2-jw7w-xvvx > > > https://github.com/twisted/twisted/releases/tag/twisted-22.1.0 > > > > > Signed-off-by: Fabrice Fontaine > > > > Committed, thanks. > > > > I'm not familiar with python-twisted but it seems that python-twisted and > python-treq must use the same version because its the same project: > > https://github.com/twisted/twisted > https://github.com/twisted/treq > > We have to update python-treq to version 22.2.0 [1] otherwise we have a runtime > issue: > > # python sample_python_treq.py > Traceback (most recent call last): > File "/root/sample_python_treq.py", line 2, in > import treq > File "/usr/lib/python3.10/site-packages/treq/__init__.py", line 5, in > File "/usr/lib/python3.10/site-packages/treq/api.py", line 5, in > File "/usr/lib/python3.10/site-packages/treq/client.py", line 11, in > ImportError: cannot import name '_PY3' from 'twisted.python.compat' (unknown > location) > > https://github.com/twisted/treq/releases/tag/release-22.2.0 Thanks for spotting this issue, I sent a patch serie. > > Best regards, > Romain Best Regards, Fabrice From aperez at igalia.com Mon Feb 21 23:37:45 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Tue, 22 Feb 2022 01:37:45 +0200 Subject: [Buildroot] [PATCH 1/1] package/xdg-dbus-proxy: bump to version 0.1.3 Message-ID: <20220221233745.520318-1-aperez@igalia.com> This is a minor maintenance release. The release incorporates "0001-Fix-musl-compilation-by-adding-TEMP_FAILURE_RETRY.patch", which can now be removed. Release notes: https://github.com/flatpak/xdg-dbus-proxy/releases/tag/0.1.3 Signed-off-by: Adrian Perez de Castro --- ...ilation-by-adding-TEMP_FAILURE_RETRY.patch | 36 ------------------- package/xdg-dbus-proxy/xdg-dbus-proxy.hash | 4 +-- package/xdg-dbus-proxy/xdg-dbus-proxy.mk | 2 +- 3 files changed, 3 insertions(+), 39 deletions(-) delete mode 100644 package/xdg-dbus-proxy/0001-Fix-musl-compilation-by-adding-TEMP_FAILURE_RETRY.patch diff --git a/package/xdg-dbus-proxy/0001-Fix-musl-compilation-by-adding-TEMP_FAILURE_RETRY.patch b/package/xdg-dbus-proxy/0001-Fix-musl-compilation-by-adding-TEMP_FAILURE_RETRY.patch deleted file mode 100644 index e531f58923..0000000000 --- a/package/xdg-dbus-proxy/0001-Fix-musl-compilation-by-adding-TEMP_FAILURE_RETRY.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 645c45f0334bb1d6e31b5927cece5e446f129cbb Mon Sep 17 00:00:00 2001 -From: Danilo Spinella -Date: Sat, 7 Dec 2019 00:05:21 +0100 -Subject: [PATCH] Fix musl compilation by adding TEMP_FAILURE_RETRY - -Fetch from: https://github.com/flatpak/xdg-dbus-proxy/pull/13 -Upstream-Status: Accepted -Signed-off-by: Adrian Perez de Castro - ---- - dbus-proxy.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/dbus-proxy.c b/dbus-proxy.c -index 163df21..4b07931 100644 ---- a/dbus-proxy.c -+++ b/dbus-proxy.c -@@ -30,6 +30,15 @@ - #include - - #include "flatpak-proxy.h" -+// Taken from glibc unistd.h -+#ifndef TEMP_FAILURE_RETRY -+# define TEMP_FAILURE_RETRY(expression) \ -+ (__extension__ \ -+ ({ long int __result; \ -+ do __result = (long int) (expression); \ -+ while (__result == -1L && errno == EINTR); \ -+ __result; })) -+#endif - - static const char *argv0; - static GList *proxies; --- -2.24.1 - diff --git a/package/xdg-dbus-proxy/xdg-dbus-proxy.hash b/package/xdg-dbus-proxy/xdg-dbus-proxy.hash index 37bda78436..a2d46ca82f 100644 --- a/package/xdg-dbus-proxy/xdg-dbus-proxy.hash +++ b/package/xdg-dbus-proxy/xdg-dbus-proxy.hash @@ -1,5 +1,5 @@ -# From https://github.com/flatpak/xdg-dbus-proxy/releases/tag/0.1.2 -sha256 1749d6f9f46dcc9edc87725641cf56cf91dcad1b01707891ea0850c1000c520f xdg-dbus-proxy-0.1.2.tar.xz +# From https://github.com/flatpak/xdg-dbus-proxy/releases/tag/0.1.3 +sha256 03b5d28ca879253ddbbce31098909becca1495ea811a6377a492e28f16c09b9b xdg-dbus-proxy-0.1.3.tar.xz # Hash for license files: sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/xdg-dbus-proxy/xdg-dbus-proxy.mk b/package/xdg-dbus-proxy/xdg-dbus-proxy.mk index 1b056c36f0..9c4449c7bb 100644 --- a/package/xdg-dbus-proxy/xdg-dbus-proxy.mk +++ b/package/xdg-dbus-proxy/xdg-dbus-proxy.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDG_DBUS_PROXY_VERSION = 0.1.2 +XDG_DBUS_PROXY_VERSION = 0.1.3 XDG_DBUS_PROXY_SITE = https://github.com/flatpak/xdg-dbus-proxy/releases/download/$(XDG_DBUS_PROXY_VERSION) XDG_DBUS_PROXY_SOURCE = xdg-dbus-proxy-$(XDG_DBUS_PROXY_VERSION).tar.xz XDG_DBUS_PROXY_DEPENDENCIES = host-pkgconf libglib2 -- 2.35.1 From mohd.faiz.rohani at gmail.com Tue Feb 22 01:34:29 2022 From: mohd.faiz.rohani at gmail.com (Mohd Faiz Rohani) Date: Tue, 22 Feb 2022 09:34:29 +0800 Subject: [Buildroot] Issue with login In-Reply-To: <6EA7F8E4-B66D-419E-884D-9F7B69357C5D@benettiengineering.com> References: <6EA7F8E4-B66D-419E-884D-9F7B69357C5D@benettiengineering.com> Message-ID: Im booting through the sd card. If I am using the same partitions and uenv.txt configurations (with old kernel version such as 4.4.155) i have no problem booting up. However with the new 5.15 kernel i got this message. Could it be a setting issue (buildroot)? I have tried using the pastebin, but it seems its only allowed text correct? Thanks On Tue, Feb 22, 2022, 3:32 AM Giulio Benetti < giulio.benetti at benettiengineering.com> wrote: > Hi Mohd, > > Il giorno 21 feb 2022, alle ore 15:16, Mohd Faiz Rohani < > mohd.faiz.rohani at gmail.com> ha scritto: > > ? > Hi Giulio, > > Update: I have tried the latest kernel (5.15) with buildroot toolchain. > result is same, RFS mounting error (refer attached) > > > Please use https://pasteboard.co/ for images, but it would be definitely > better to have a pastebin. > > As I see it fails to mount mmc0blk0p2. But are you trying to boot from > sd-card or eMMC? > > If from sd-card make sure you have partition 2 with fdisk. > Same goes for eMMC, you need to check the partitions. > > Maybe simply rootfs is on partition 1?!? > And so you only need to pass a different rootfs argument to bootargs. > > What happens if instead you build Buildroot beaglebone_defconfig? > > Can you give a go with that and use its instructions found in > board/beaglebone/readme.txt please? > > If that works at least we know the HE is alive. > > Thank you > Giulio > > > > On Mon, Feb 21, 2022 at 5:46 PM Mohd Faiz Rohani < > mohd.faiz.rohani at gmail.com> wrote: > >> Yes I will, even though I'm not in IRC for quite some time now. :). >> Thanks a lot Giulio! >> >> On Mon, Feb 21, 2022 at 5:43 PM Giulio Benetti < >> giulio.benetti at benettiengineering.com> wrote: >> >>> >>> Il giorno 21 feb 2022, alle ore 10:33, Mohd Faiz Rohani < >>> mohd.faiz.rohani at gmail.com> ha scritto: >>> >>> ? >>> Btw, is the mailing list correct platform for Buildroot Q&A? Do you have >>> any related forum for the purpose? Thanks >>> >>> >>> It?s one of its purpose, but I suggest you to also join IRC #buildroot >>> channel. >>> >>> Best regards >>> Giulio >>> >>> >>> On Mon, Feb 21, 2022, 4:44 PM Giulio Benetti < >>> giulio.benetti at benettiengineering.com> wrote: >>> >>>> Hi Mohd, >>>> >>>> On 21/02/22 06:16, Mohd Faiz Rohani wrote: >>>> > Hi guys, >>>> > >>>> > Thank you for your help.I have overlooked the required setting as >>>> > normally I will leave the setting to the default, as I assume >>>> Buildroot >>>> > has selected the required settings. Anyway I have managed to login >>>> > successfully now. >>>> > >>>> > I have turned on BR2_PACKAGE_SYSTEMD_LOGIND and >>>> > BR2_PACKAGE_UTIL_LINUX_LOGIN settings, while the rest does not change. >>>> >>>> Perfect, team working with Edgar worked :-) >>>> >>>> > Fyi, I have tried the newer versions of Linux Kernel (5.15) and Uboot >>>> > (v2022.01) with the Linaro 7.5 toolchain, but got an error during the >>>> > booting process where the RFS cannot be mounted. It may be my fault >>>> > through the settings though, that is why I am trying the old version >>>> and >>>> > it worked. >>>> >>>> I would avoid using gcc 7.5 on such new kernel/uboot. Maybe if you try >>>> to rebuild using an external prebuilt toolchain like the Bootlin one, >>>> or >>>> you build a Buildroot toolchain with latest versions, like gcc 10.x you >>>> could obtain different results. >>>> >>>> > I am planning to use Buildroot for my future development and keen to >>>> > contribute wherever I can. Still lots to learn though. >>>> >>>> Well! >>>> >>>> > Thank you again guys. >>>> >>>> You're welcome >>>> >>>> Best regards >>>> -- >>>> Giulio Benetti >>>> Benetti Engineering sas >>>> >>>> > Regards. >>>> > Faiz >>>> > >>>> > >>>> > >>>> > >>>> > On Mon, Feb 21, 2022 at 2:33 AM Mohd Faiz Rohani >>>> > > >>>> wrote: >>>> > >>>> > Thanks, I'll check them out. Will update the outcome once the >>>> > installation is done. >>>> > >>>> > Thank you. >>>> > >>>> > On Mon, Feb 21, 2022, 1:56 AM Giulio Benetti >>>> > >>> > > wrote: >>>> > >>>> > Hi Edgar, >>>> > >>>> > please reply to all in Mailing List, I add Mohd in Cc, >>>> > >>>> > On 20/02/22 17:18, Edgar Bonet wrote: >>>> > > Hi! >>>> > > >>>> > > In his config file, Mohd wrote: >>>> > >> BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_10=y >>>> > >> BR2_LINUX_KERNEL_VERSION="4.4.155" >>>> > > >>>> > > This may cause problems. C.f. docs/manual/configure.txt: >>>> > > >>>> > > If you use kernel headers that are more recent than >>>> the >>>> > Linux >>>> > > kernel you run on your embedded system, then the C >>>> > library might >>>> > > be using interfaces that are not provided by your >>>> Linux >>>> > kernel. >>>> > >>>> > Good catch Edgar! >>>> > So Mohd, what you need here is a toolchain with older libc. >>>> > >>>> https://buildroot.org/downloads/manual/manual.html#_cross_compilation_toolchain >>>> > < >>>> https://buildroot.org/downloads/manual/manual.html#_cross_compilation_toolchain >>>> > >>>> > >>>> > But again, do you really need to use so such old versions >>>> > instead of try >>>> > to use buildroot's beaglebone_defconfig? >>>> > >>>> > > In the same config file, there is: >>>> > >> # BR2_PACKAGE_BUSYBOX is not set >>>> > > >>>> > > When disabling busybox, you should have seen the message: >>>> > > >>>> > > You may need to enable other packages to get a working >>>> > system >>>> > > You better know what you're doing! >>>> > >>>> > Despite of what I've written on my previous e-mail(my test was >>>> > wrong), >>>> > he has BR2_INIT_SYSTEMD=y that works as Init System, so >>>> that's ok. >>>> > >>>> > > And then: >>>> > >> # BR2_PACKAGE_SYSTEMD_LOGIND is not set >>>> > >>>> > Good catch again Edgar! This ^^^ should be the point. Because >>>> it's >>>> > exactly the systemd login dameon. >>>> > >>>> > >> # BR2_PACKAGE_UTIL_LINUX_LOGIN is not set >>>> > >>>> > This ^^^ is not selected by systemd, so I expect >>>> > BR2_PACKAGE_SYSTEMD_LOGIND to do the job(even if I'm not a >>>> systemd >>>> > expoert at all). >>>> > >>>> > But as Edgar pointed linux headers don't match so you have 3 >>>> > choices: >>>> > 1) find a toolchain with linux-headers <= 4.4.* >>>> > 2) update linux version >>>> > 3) start from scratch using buildroot beaglebone_defconfig >>>> > >>>> > Best regards >>>> > -- >>>> > Giulio Benetti >>>> > Benetti Engineering sas >>>> > >>>> >>>> _______________________________________________ >>> buildroot mailing list >>> buildroot at buildroot.org >>> https://lists.buildroot.org/mailman/listinfo/buildroot >>> >>> -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: 20220221_211831.jpg Type: image/jpeg Size: 150206 bytes Desc: not available URL: From giulio.benetti at benettiengineering.com Tue Feb 22 02:18:21 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 22 Feb 2022 03:18:21 +0100 Subject: [Buildroot] Issue with login In-Reply-To: References: Message-ID: <869ECE13-88E6-482B-96AB-F183EE271D98@benettiengineering.com> Hi Mohd, please don?t top-post but answer inline as I?ve done on the previous emails, > Il giorno 22 feb 2022, alle ore 02:35, Mohd Faiz Rohani ha scritto: > > ? > Im booting through the sd card. If I am using the same partitions and uenv.txt configurations (with old kernel version such as 4.4.155) i have no problem booting up. Ok, so the first problem you had not showing the login has gone. Right? > However with the new 5.15 kernel i got this message. Could it be a setting issue (buildroot)? It depends, you should read carefully the kernel log. What could fail is sd-card dts entry in Linux for example. You should check in kernel log if sd-card peripheral is detected correctly. I see some error in your picture of the log, so maybe sd-card is not recognized by Linux too. > > I have tried using the pastebin, but it seems its only allowed text correct? On pastebin yes, text only, but I?ve pointed you below pasteboard too and that can be used for images. Anyway the best thing you can do is to redirect console to serial, like ttyS0(or another node depending on which peripheral you?re using). That way you can connect with a usb to serial adapter and use minicom for example to have the serial terminal and copy and paste the kernel log. Anyway I still don?t understand if you?re using buildroot?s beaglebone defconfig or the one you?ve used in the beginning tweaked. Which one are using? Best regards Giulio > > Thanks > > >> On Tue, Feb 22, 2022, 3:32 AM Giulio Benetti wrote: >> Hi Mohd, >> >>>> Il giorno 21 feb 2022, alle ore 15:16, Mohd Faiz Rohani ha scritto: >>>> >>> ? >>> Hi Giulio, >>> >>> Update: I have tried the latest kernel (5.15) with buildroot toolchain. result is same, RFS mounting error (refer attached) >> >> Please use https://pasteboard.co/ for images, but it would be definitely better to have a pastebin. >> >> As I see it fails to mount mmc0blk0p2. But are you trying to boot from sd-card or eMMC? >> >> If from sd-card make sure you have partition 2 with fdisk. >> Same goes for eMMC, you need to check the partitions. >> >> Maybe simply rootfs is on partition 1?!? >> And so you only need to pass a different rootfs argument to bootargs. >> >> What happens if instead you build Buildroot beaglebone_defconfig? >> >> Can you give a go with that and use its instructions found in board/beaglebone/readme.txt please? >> >> If that works at least we know the HE is alive. >> >> Thank you >> Giulio >> >>> >>> >>>> On Mon, Feb 21, 2022 at 5:46 PM Mohd Faiz Rohani wrote: >>>> Yes I will, even though I'm not in IRC for quite some time now. :). Thanks a lot Giulio! >>>> >>>>> On Mon, Feb 21, 2022 at 5:43 PM Giulio Benetti wrote: >>>>> >>>>>>> Il giorno 21 feb 2022, alle ore 10:33, Mohd Faiz Rohani ha scritto: >>>>>>> >>>>>> ? >>>>>> Btw, is the mailing list correct platform for Buildroot Q&A? Do you have any related forum for the purpose? Thanks >>>>> >>>>> It?s one of its purpose, but I suggest you to also join IRC #buildroot channel. >>>>> >>>>> Best regards >>>>> Giulio >>>>> >>>>>> >>>>>>> On Mon, Feb 21, 2022, 4:44 PM Giulio Benetti wrote: >>>>>>> Hi Mohd, >>>>>>> >>>>>>> On 21/02/22 06:16, Mohd Faiz Rohani wrote: >>>>>>> > Hi guys, >>>>>>> > >>>>>>> > Thank you for your help.I have overlooked the required setting as >>>>>>> > normally I will leave the setting to the default, as I assume Buildroot >>>>>>> > has selected the required settings. Anyway I have managed to login >>>>>>> > successfully now. >>>>>>> > >>>>>>> > I have turned on BR2_PACKAGE_SYSTEMD_LOGIND and >>>>>>> > BR2_PACKAGE_UTIL_LINUX_LOGIN settings, while the rest does not change. >>>>>>> >>>>>>> Perfect, team working with Edgar worked :-) >>>>>>> >>>>>>> > Fyi, I have tried the newer versions of Linux Kernel (5.15) and Uboot >>>>>>> > (v2022.01) with the Linaro 7.5 toolchain, but got an error during the >>>>>>> > booting process where the RFS cannot be mounted. It may be my fault >>>>>>> > through the settings though, that is why I am trying the old version and >>>>>>> > it worked. >>>>>>> >>>>>>> I would avoid using gcc 7.5 on such new kernel/uboot. Maybe if you try >>>>>>> to rebuild using an external prebuilt toolchain like the Bootlin one, or >>>>>>> you build a Buildroot toolchain with latest versions, like gcc 10.x you >>>>>>> could obtain different results. >>>>>>> >>>>>>> > I am planning to use Buildroot for my future development and keen to >>>>>>> > contribute wherever I can. Still lots to learn though. >>>>>>> >>>>>>> Well! >>>>>>> >>>>>>> > Thank you again guys. >>>>>>> >>>>>>> You're welcome >>>>>>> >>>>>>> Best regards >>>>>>> -- >>>>>>> Giulio Benetti >>>>>>> Benetti Engineering sas >>>>>>> >>>>>>> > Regards. >>>>>>> > Faiz >>>>>>> > >>>>>>> > >>>>>>> > >>>>>>> > >>>>>>> > On Mon, Feb 21, 2022 at 2:33 AM Mohd Faiz Rohani >>>>>>> > > wrote: >>>>>>> > >>>>>>> > Thanks, I'll check them out. Will update the outcome once the >>>>>>> > installation is done. >>>>>>> > >>>>>>> > Thank you. >>>>>>> > >>>>>>> > On Mon, Feb 21, 2022, 1:56 AM Giulio Benetti >>>>>>> > >>>>>> > > wrote: >>>>>>> > >>>>>>> > Hi Edgar, >>>>>>> > >>>>>>> > please reply to all in Mailing List, I add Mohd in Cc, >>>>>>> > >>>>>>> > On 20/02/22 17:18, Edgar Bonet wrote: >>>>>>> > > Hi! >>>>>>> > > >>>>>>> > > In his config file, Mohd wrote: >>>>>>> > >> BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_10=y >>>>>>> > >> BR2_LINUX_KERNEL_VERSION="4.4.155" >>>>>>> > > >>>>>>> > > This may cause problems. C.f. docs/manual/configure.txt: >>>>>>> > > >>>>>>> > > If you use kernel headers that are more recent than the >>>>>>> > Linux >>>>>>> > > kernel you run on your embedded system, then the C >>>>>>> > library might >>>>>>> > > be using interfaces that are not provided by your Linux >>>>>>> > kernel. >>>>>>> > >>>>>>> > Good catch Edgar! >>>>>>> > So Mohd, what you need here is a toolchain with older libc. >>>>>>> > https://buildroot.org/downloads/manual/manual.html#_cross_compilation_toolchain >>>>>>> > >>>>>>> > >>>>>>> > But again, do you really need to use so such old versions >>>>>>> > instead of try >>>>>>> > to use buildroot's beaglebone_defconfig? >>>>>>> > >>>>>>> > > In the same config file, there is: >>>>>>> > >> # BR2_PACKAGE_BUSYBOX is not set >>>>>>> > > >>>>>>> > > When disabling busybox, you should have seen the message: >>>>>>> > > >>>>>>> > > You may need to enable other packages to get a working >>>>>>> > system >>>>>>> > > You better know what you're doing! >>>>>>> > >>>>>>> > Despite of what I've written on my previous e-mail(my test was >>>>>>> > wrong), >>>>>>> > he has BR2_INIT_SYSTEMD=y that works as Init System, so that's ok. >>>>>>> > >>>>>>> > > And then: >>>>>>> > >> # BR2_PACKAGE_SYSTEMD_LOGIND is not set >>>>>>> > >>>>>>> > Good catch again Edgar! This ^^^ should be the point. Because it's >>>>>>> > exactly the systemd login dameon. >>>>>>> > >>>>>>> > >> # BR2_PACKAGE_UTIL_LINUX_LOGIN is not set >>>>>>> > >>>>>>> > This ^^^ is not selected by systemd, so I expect >>>>>>> > BR2_PACKAGE_SYSTEMD_LOGIND to do the job(even if I'm not a systemd >>>>>>> > expoert at all). >>>>>>> > >>>>>>> > But as Edgar pointed linux headers don't match so you have 3 >>>>>>> > choices: >>>>>>> > 1) find a toolchain with linux-headers <= 4.4.* >>>>>>> > 2) update linux version >>>>>>> > 3) start from scratch using buildroot beaglebone_defconfig >>>>>>> > >>>>>>> > Best regards >>>>>>> > -- >>>>>>> > Giulio Benetti >>>>>>> > Benetti Engineering sas >>>>>>> > >>>>>>> >>>>>> _______________________________________________ >>>>>> buildroot mailing list >>>>>> buildroot at buildroot.org >>>>>> https://lists.buildroot.org/mailman/listinfo/buildroot -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: 20220221_211831.jpg Type: image/jpeg Size: 150206 bytes Desc: not available URL: From christian at paral.in Tue Feb 22 05:21:16 2022 From: christian at paral.in (Christian Stewart) Date: Mon, 21 Feb 2022 21:21:16 -0800 Subject: [Buildroot] package/expat: please backport to 2021.11.x Message-ID: Hi all, Expat v2.4.4 (vulnerable) download has been removed from sourceforge. So 2021.11.x build is broken with the older expat. Please backport the expat security fixes to 2021.11.x. Thanks & best, Christian Stewart -------------- next part -------------- An HTML attachment was scrubbed... URL: From fido_max at inbox.ru Tue Feb 22 05:36:29 2022 From: fido_max at inbox.ru (Maxim Kochetkov) Date: Tue, 22 Feb 2022 08:36:29 +0300 Subject: [Buildroot] [PATCH 1/1] package/osm2pgsql: disable external fmt In-Reply-To: <20220221223842.2201966-1-fontaine.fabrice@gmail.com> References: <20220221223842.2201966-1-fontaine.fabrice@gmail.com> Message-ID: On 22.02.2022 01:38, Fabrice Fontaine wrote: > osm2pgsql doesn't support fmt > 8.0 yet resulting in the following build > failure since bump of fmt to version 8.1.1 in commit > ec7fd50d08690a383fec40748ac9b78c3f764316: > > /home/buildroot/autobuild/instance-0/output-1/host/aarch64-buildroot-linux-gnu/sysroot/usr/include/fmt/core.h:1728:7: error: static assertion failed: Cannot format an argument. To make type T formattable provide a formatter specialization: https://fmt.dev/latest/api.html#udt > 1728 | formattable, > | ^~~~~~~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/5af1a0ea176559a5dc787ba945a3a83823f5b1bb > > Signed-off-by: Fabrice Fontaine Reviewed-by: Maxim Kochetkov From thomas.petazzoni at bootlin.com Tue Feb 22 07:12:34 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 22 Feb 2022 07:12:34 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-02-21 Message-ID: <20220222071242.498B14091E@smtp4.osuosl.org> Hello, Autobuild statistics for 2022-02-21 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 42 | 10 | 1 | 53 | 2021.11.x | 15 | 2 | 0 | 17 | master | 38 | 34 | 0 | 72 | Classification of failures by reason for master ----------------------------------------------- bluez5_utils-5.63 | 7 host-libselinux-3.3 | 7 bpftool-a7f0e7f057283ae8af3... | 2 host-go-1.17.7 | 2 python-greenlet-1.1.2 | 2 re2-2022-02-01 | 2 safeclib-3.7.1 | 2 tovid-87c676f4aadb7303d2cd9... | 2 frr-8.1 | 1 hostapd-2.10 | 1 kvm-unit-tests-kvm-unit-tes... | 1 linux-pam-1.5.2 | 1 mesa3d-21.3.5 | 1 osm2pgsql-1.6.0 | 1 python-pygame-d61ea8eabd56 | 1 sord-0.16.8 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/845feb257c8ba37bce2447b99b3fb4ab97ccc86c | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/8693754a0932c2316c8512bda896974b386005e8 | mips | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/05e9dafb55fb575db91e62611ceed71b9fe24b26 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/17d5f8ce421ac19c970aedb1ddf81db76161e022 | mips | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/a8e2290345be14a2c3d11a879cb6103adad4973c | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/b7fd96676f3d100166e1a0cad87f97ea00667d31 | mips64el | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/eb23b1f0ec9ec68ead4617124b380966df2b87c7 | mips64el | bpftool-a7f0e7f057283ae8af3... | NOK | http://autobuild.buildroot.net/results/9b71da40a873a9bec1759a333e7266e793d16d9b | mipsel | bpftool-a7f0e7f057283ae8af3... | NOK | http://autobuild.buildroot.net/results/b51a8ceb1745cabbeb2f92c0a035f5db84c41f86 | xtensa | frr-8.1 | NOK | http://autobuild.buildroot.net/results/f991d30674ca25f0e6374e000a34e1f07190ef69 | mips64el | host-go-1.17.7 | NOK | http://autobuild.buildroot.net/results/e2770d1b2a7f04f157bffb4cd817e705fb9f5ead | mips64el | host-go-1.17.7 | NOK | http://autobuild.buildroot.net/results/d59509d6402b2bae0e650d63995b886dd8d2abb1 | microblazeel | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/a84b0d6b43271ca81b1b4c7e8f696e013dbc83d5 | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/3158f442a9540f300b1ba70cb7d503a58f7e3dcd | s390x | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/8ed49c0fc904b011d919aaec5a6cc2a7c556b21e | riscv64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/3be1191b11c3807e3dd534396a921bc5b11ece83 | nios2 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/8667a2ed97d0740ccc41fbe8f012660614b1e032 | x86_64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/d07b4d8107f854e91f30478fad36b99ed83f35a5 | x86_64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/488b01124b60492ba6c28394aadc7fff48771643 | arc | hostapd-2.10 | NOK | http://autobuild.buildroot.net/results/00bb075a71ba8382f49f1383ab49f0b9b4fbbc66 | powerpc64le | kvm-unit-tests-kvm-unit-tes... | NOK | http://autobuild.buildroot.net/results/5ffced2811194591a74506f4fa783f84baba72c6 | arm | linux-pam-1.5.2 | NOK | http://autobuild.buildroot.net/results/4d99609a94c35029839c2a2030bc17ef9f68f4c2 | ORPH mips64el | mesa3d-21.3.5 | NOK | http://autobuild.buildroot.net/results/d24a17ffeea6cd76d8879163e4cec7993bae39a4 | aarch64 | osm2pgsql-1.6.0 | NOK | http://autobuild.buildroot.net/results/5af1a0ea176559a5dc787ba945a3a83823f5b1bb | x86_64 | python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/6595d90a1c26b2e74afea15fcc19bdceda1999a1 | arm | python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/a4b91d8c715910ea8c4743024437745832736cd7 | aarch64 | python-pygame-d61ea8eabd56 | NOK | http://autobuild.buildroot.net/results/99c71022328f023eb287ee7415a3252e9f8a8549 | mips64el | re2-2022-02-01 | NOK | http://autobuild.buildroot.net/results/8ebbac67f32fe24416a1f72aad0afd42b567b403 | arm | re2-2022-02-01 | NOK | http://autobuild.buildroot.net/results/4bccc24ff3121b804f0e6b3f7e5a28111f7bdf7f | sparc | safeclib-3.7.1 | NOK | http://autobuild.buildroot.net/results/40a42e6d9021401faf336818bdeada8b85e4f068 | sparc | safeclib-3.7.1 | NOK | http://autobuild.buildroot.net/results/651dd437ebcd892b1cc678e813e979edc92da590 | arm | sord-0.16.8 | NOK | http://autobuild.buildroot.net/results/170d0114987b39a2b9ea173df7a5e806bd270fd8 | riscv64 | tovid-87c676f4aadb7303d2cd9... | NOK | http://autobuild.buildroot.net/results/b205845c2bb2a965aabc095ba497f0a862ef6e1c | arm | tovid-87c676f4aadb7303d2cd9... | NOK | http://autobuild.buildroot.net/results/1836542d7a0574a12f1ab84d577fea374fe0c4d1 | Classification of failures by reason for 2021.02.x -------------------------------------------------- rocksdb-6.13.3 | 2 zeromq-4.3.4 | 2 gobject-introspection-1.64.1 | 1 host-nodejs-12.22.9 | 1 libkrb5-1.18.4 | 1 monkey-f54856ce250c4e257354... | 1 python-lxml | 1 python-pybind-2.6.1 | 1 unknown | 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/0bacddd9b9342933c8922d51297d23dd70dac1a4 | ORPH arm | host-nodejs-12.22.9 | NOK | http://autobuild.buildroot.net/results/a83fe8621f05dd788bf46a1df9f6fae1bf6bcfbc | riscv32 | libkrb5-1.18.4 | NOK | http://autobuild.buildroot.net/results/1ac6ad4ddac5fd82222d076530bf94cdbba7f491 | arm | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/9c57c468f46e448e7a865358692c3efa0f8d749d | m68k | python-lxml | TIM | http://autobuild.buildroot.net/results/0bc64a5d1933dd731f623e6ffa88cb256cf912b1 | nios2 | python-pybind-2.6.1 | NOK | http://autobuild.buildroot.net/results/268fafedf2525a22932f945e0681d397b790c8cd | m68k | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/c8d4a627057190a142d08b22a961cec6f4fbe476 | m68k | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/4c5925f0e707865201b9ef287db93025247d770b | powerpc | unknown | NOK | http://autobuild.buildroot.net/results/4cb56565aef679124928e1b8ad5ae30e0a871752 | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/da365eaee525bb36267f74e30424e13ff68fdb03 | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/a16c379c05f1e6e27ac27b9e97728bca5efc4b9f | Classification of failures by reason for 2021.11.x -------------------------------------------------- ruby-3.0.3 | 1 waffle-1.6.1 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- nios2 | ruby-3.0.3 | NOK | http://autobuild.buildroot.net/results/f8e79f3ab3d7e33e7d25dcd0ba506e53185ee6fd | arm | waffle-1.6.1 | NOK | http://autobuild.buildroot.net/results/332331d5806cbd40096d523d27d56e71d7703bc8 | Gitlab CI results for 2022-02-21 ================================ Detail of runtime-test failures for 2022.02-rc2 ----------------------------------------------- runtime-test | link to the job | orph? --------------------------+---------------------------------------------------------------+------ TestIPythonPy3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2115531405 | ORPH TestLxc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2115531472 | ORPH TestPythonPy3Crossbar | https://gitlab.com/buildroot.org/buildroot/-/jobs/2115531519 | ORPH TestPythonPy3Pyyaml | https://gitlab.com/buildroot.org/buildroot/-/jobs/2115531541 | ORPH TestPythonPy3Treq | https://gitlab.com/buildroot.org/buildroot/-/jobs/2115531547 | ORPH TestPythonPy3Twisted | https://gitlab.com/buildroot.org/buildroot/-/jobs/2115531548 | ORPH TestPythonPy3Txtorcon | https://gitlab.com/buildroot.org/buildroot/-/jobs/2115531550 | ORPH TestRust | https://gitlab.com/buildroot.org/buildroot/-/jobs/2115531556 | ORPH TestRustBin | https://gitlab.com/buildroot.org/buildroot/-/jobs/2115531557 | ORPH TestSudo | https://gitlab.com/buildroot.org/buildroot/-/jobs/2115531562 | ORPH Detail of runtime-test failures for master ------------------------------------------ runtime-test | link to the job | orph? --------------------------+---------------------------------------------------------------+------ TestIPythonPy3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202335 | ORPH TestLxc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202405 | ORPH TestPythonPy3Crossbar | https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202484 | ORPH TestPythonPy3Pyyaml | https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202526 | ORPH TestPythonPy3Treq | https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202533 | ORPH TestPythonPy3Twisted | https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202535 | ORPH TestPythonPy3Txtorcon | https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202537 | ORPH TestRust | https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202544 | ORPH TestRustBin | https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202545 | ORPH -- http://autobuild.buildroot.net From thomas.petazzoni at bootlin.com Tue Feb 22 08:32:46 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 22 Feb 2022 09:32:46 +0100 Subject: [Buildroot] package/expat: please backport to 2021.11.x In-Reply-To: References: Message-ID: <20220222093246.57ab1b0d@windsurf> On Mon, 21 Feb 2022 21:21:16 -0800 Christian Stewart wrote: > Expat v2.4.4 (vulnerable) download has been removed from sourceforge. > > So 2021.11.x build is broken with the older expat. This is strange: if the expat tarball is no longer available from sourceforge, Buildroot should fallback to sources.buildroot.net, which contains the expat-2.4.4.tar.xz tarball, at http://sources.buildroot.net/expat/. Of course, it is better to update since there is a security issue in 2.4.4, but I'm wondering why you're saying that the build is broken: it should not. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From christian at paral.in Tue Feb 22 08:48:26 2022 From: christian at paral.in (Christian Stewart) Date: Tue, 22 Feb 2022 00:48:26 -0800 Subject: [Buildroot] package/expat: please backport to 2021.11.x In-Reply-To: <20220222093246.57ab1b0d@windsurf> References: <20220222093246.57ab1b0d@windsurf> Message-ID: Hi Thomas, On Tue, Feb 22, 2022 at 12:33 AM Thomas Petazzoni wrote: > On Mon, 21 Feb 2022 21:21:16 -0800 > Christian Stewart wrote: > > > Expat v2.4.4 (vulnerable) download has been removed from sourceforge. > > > > So 2021.11.x build is broken with the older expat. > > This is strange: if the expat tarball is no longer available from > sourceforge, Buildroot should fallback to sources.buildroot.net, which > contains the expat-2.4.4.tar.xz tarball, at > http://sources.buildroot.net/expat/. It does, my mistake, I had an alternate mirror configured. > Of course, it is better to update since there is a security issue in > 2.4.4, Best regards, Christian From angelo at amarulasolutions.com Tue Feb 22 09:49:13 2022 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 22 Feb 2022 10:49:13 +0100 Subject: [Buildroot] [PATCH] package/cups: bump to version 2.4.1 Message-ID: <20220222094913.2217366-1-angelo@amarulasolutions.com> NOTICE hash is changed due to a copyright year update. Signed-off-by: Angelo Compagnucci --- package/cups/cups.hash | 4 ++-- package/cups/cups.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/cups/cups.hash b/package/cups/cups.hash index b0e3654b3d..8308b7b803 100644 --- a/package/cups/cups.hash +++ b/package/cups/cups.hash @@ -1,4 +1,4 @@ # Locally calculated: -sha256 9abecec128ca6847c5bb2d3e3d30c87b782c0697b9acf284d16fa38f80a3a6de cups-2.4.0-source.tar.gz +sha256 c7339f75f8d4f2dec50c673341a45fc06b6885bb6d4366d6bf59a4e6c10ae178 cups-2.4.1-source.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE -sha256 a2a46d024e4d78dd2475d89f2f3d905578edfeca7dcb041e1d0ba079d9a87b48 NOTICE +sha256 7a7bd639e3a8457ae40b0dcfb74ea3cc6a8132b06c726142e993625d33eb6de5 NOTICE diff --git a/package/cups/cups.mk b/package/cups/cups.mk index e406d3bc64..298a6ed879 100644 --- a/package/cups/cups.mk +++ b/package/cups/cups.mk @@ -4,7 +4,7 @@ # ################################################################################ -CUPS_VERSION = 2.4.0 +CUPS_VERSION = 2.4.1 CUPS_SOURCE = cups-$(CUPS_VERSION)-source.tar.gz CUPS_SITE = https://github.com/OpenPrinting/cups/releases/download/v$(CUPS_VERSION) CUPS_LICENSE = Apache-2.0 with GPL-2.0/LGPL-2.0 exception -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 22 09:49:23 2022 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 22 Feb 2022 10:49:23 +0100 Subject: [Buildroot] [PATCH] package/cups-filters: bump to version 1.28.12 Message-ID: <20220222094923.2220294-1-angelo@amarulasolutions.com> Signed-off-by: Angelo Compagnucci --- package/cups-filters/cups-filters.hash | 2 +- package/cups-filters/cups-filters.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cups-filters/cups-filters.hash b/package/cups-filters/cups-filters.hash index aefb67f651..5a95b998eb 100644 --- a/package/cups-filters/cups-filters.hash +++ b/package/cups-filters/cups-filters.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 8cb40355287d65ea03e90dfa7e2d34f0d46752957c8a6d4e96ab6fe6c581e5d2 cups-filters-1.28.10.tar.gz +sha256 3265017d2369e1130e732090165d6b4e3c0838d7ca9aa60978b087bee12247ff cups-filters-1.28.12.tar.gz sha256 38192ffdaca98b718f78b2d4abc38bb087f0bbcc9a16d212c98b903b985f900f COPYING diff --git a/package/cups-filters/cups-filters.mk b/package/cups-filters/cups-filters.mk index c8f2dd0aae..f8ff42f0f4 100644 --- a/package/cups-filters/cups-filters.mk +++ b/package/cups-filters/cups-filters.mk @@ -4,7 +4,7 @@ # ################################################################################ -CUPS_FILTERS_VERSION = 1.28.10 +CUPS_FILTERS_VERSION = 1.28.12 CUPS_FILTERS_SITE = http://openprinting.org/download/cups-filters CUPS_FILTERS_LICENSE = GPL-2.0, GPL-2.0+, GPL-3.0, GPL-3.0+, LGPL-2, LGPL-2.1+, MIT, BSD-4-Clause CUPS_FILTERS_LICENSE_FILES = COPYING -- 2.25.1 From bugzilla at busybox.net Tue Feb 22 09:52:01 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Tue, 22 Feb 2022 09:52:01 +0000 Subject: [Buildroot] [Bug 14596] package dialog is outdated and contains a bug In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14596 --- Comment #1 from Andrei Gherghescu --- I have submitted a patch with your attachment. -- You are receiving this mail because: You are on the CC list for the bug. From nicolas.cavallari at green-communications.fr Tue Feb 22 09:53:40 2022 From: nicolas.cavallari at green-communications.fr (Nicolas Cavallari) Date: Tue, 22 Feb 2022 10:53:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/libgit2: bump version to 1.4.1 Message-ID: <20220222095340.29327-1-nicolas.cavallari@green-communications.fr> Licence changes mostly concern vendored dependencies (that buildroot does not use) and a new bundled PRNG used to reimplement mkstemp() Some buildsystem options also changed: - THREADSAFE is now USE_THREADS - BUILD_CLAR is now BUILD_TESTS, which the cmake infra already give. Signed-off-by: Nicolas Cavallari --- package/libgit2/libgit2.hash | 4 ++-- package/libgit2/libgit2.mk | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/libgit2/libgit2.hash b/package/libgit2/libgit2.hash index 07b1a260a4..a6b5ecff1a 100644 --- a/package/libgit2/libgit2.hash +++ b/package/libgit2/libgit2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 192eeff84596ff09efb6b01835a066f2df7cd7985e0991c79595688e6b36444e libgit2-1.3.0.tar.gz -sha256 8b7e4f54f8bf210c8fe010a49571a1ee57463ef020cc43f051d4d3fbb74942af COPYING +sha256 fccd371a271133e29d002dd207490d22a0c9b06992b874b8edb8366532a94f54 libgit2-1.4.1.tar.gz +sha256 0092f24acc306ee3287dc05b5e85cb9e0e48cd3f11c60c4625b1a673a5912616 COPYING diff --git a/package/libgit2/libgit2.mk b/package/libgit2/libgit2.mk index 6cc0f1ea74..47cb0cbcd8 100644 --- a/package/libgit2/libgit2.mk +++ b/package/libgit2/libgit2.mk @@ -4,21 +4,20 @@ # ################################################################################ -LIBGIT2_VERSION = 1.3.0 +LIBGIT2_VERSION = 1.4.1 LIBGIT2_SITE = $(call github,libgit2,libgit2,v$(LIBGIT2_VERSION)) -LIBGIT2_LICENSE = GPL-2.0 with linking exception, MIT (sha1), wildmatch license (wildmatch) +LIBGIT2_LICENSE = GPL-2.0 with linking exception, MIT (sha1), wildmatch license (wildmatch), CC0-1.0 (xoroshiro256) LIBGIT2_LICENSE_FILES = COPYING LIBGIT2_CPE_ID_VENDOR = libgit2_project LIBGIT2_INSTALL_STAGING = YES LIBGIT2_CONF_OPTS = \ -DUSE_GSSAPI=OFF \ - -DBUILD_CLAR=OFF \ -DUSE_ICONV=ON \ -DREGEX_BACKEND=regcomp \ -DUSE_HTTP_PARSER=system \ -DUSE_NTLMCLIENT=OFF \ - -DTHREADSAFE=$(if $(BR2_TOOLCHAIN_HAS_THREADS),ON,OFF) + -DUSE_THREADS=$(if $(BR2_TOOLCHAIN_HAS_THREADS),ON,OFF) LIBGIT2_DEPENDENCIES = zlib libhttpparser -- 2.35.1 From peter at korsgaard.com Tue Feb 22 10:10:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Feb 2022 11:10:16 +0100 Subject: [Buildroot] [PATCH] package/python-twisted: add missing python typing extensions runtime dependency In-Reply-To: <20220221215702.8461-1-romain.naour@gmail.com> (Romain Naour's message of "Mon, 21 Feb 2022 22:57:02 +0100") References: <20220221215702.8461-1-romain.naour@gmail.com> Message-ID: <87y2236wl3.fsf@dell.be.48ers.dk> >>>>> "Romain" == Romain Naour writes: > # python sample_python_txtorcon.py > Traceback (most recent call last): > File "/root/sample_python_txtorcon.py", line 1, in > import txtorcon # noqa > File "/usr/lib/python3.10/site-packages/txtorcon/__init__.py", line 11, in > File "/usr/lib/python3.10/site-packages/txtorcon/router.py", line 10, in > File "/usr/lib/python3.10/site-packages/txtorcon/util.py", line 17, in > File "/usr/lib/python3.10/site-packages/twisted/internet/defer.py", line 42, in > ModuleNotFoundError: No module named 'typing_extensions' > python typing_extensions is required since python-twisted 22.1.0 [1] > Fixes: > https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202537 > [1] https://github.com/twisted/twisted/commit/6e768da0a10c8ab42a57a1c0fa505ebe2d8bfb30 > Signed-off-by: Romain Naour Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 22 10:12:13 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Feb 2022 11:12:13 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/flac: security bump to version 1.3.4 In-Reply-To: <20220221220025.2198034-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 21 Feb 2022 23:00:25 +0100") References: <20220221220025.2198034-1-fontaine.fabrice@gmail.com> Message-ID: <87tucr6whu.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > This release mostly fixes (security related) bugs including: > - Fix 12 decoder bugs found by oss-fuzz, including CVE-2020-0499 > - Fix encoder bug CVE-2021-0561 > Also: > - Replace first patch which was reverted by > https://github.com/xiph/flac/commit/4fbb6d4f2ecf2a96c17ea9880108409f852c08a9 > - Disable stack protection (enabled by default since > https://github.com/xiph/flac/commit/f706f2832270a0b7851cdffe62ad37acda9423fe) > - Drop md5 which is not provided anymore > - Update indentation in hash file (two spaces) > https://github.com/xiph/flac/releases/tag/1.3.4 > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2 (after review of Yann E. Morin and Peter Seiderer): > - Add upstream patch Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 22 10:10:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Feb 2022 11:10:03 +0100 Subject: [Buildroot] [git commit] package/python-twisted: add missing python typing extensions runtime dependency Message-ID: <20220222100500.7CC428379E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b43ba475cf3dbf2b3990144758d5b1d4b74862c0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master # python sample_python_txtorcon.py Traceback (most recent call last): File "/root/sample_python_txtorcon.py", line 1, in import txtorcon # noqa File "/usr/lib/python3.10/site-packages/txtorcon/__init__.py", line 11, in File "/usr/lib/python3.10/site-packages/txtorcon/router.py", line 10, in File "/usr/lib/python3.10/site-packages/txtorcon/util.py", line 17, in File "/usr/lib/python3.10/site-packages/twisted/internet/defer.py", line 42, in ModuleNotFoundError: No module named 'typing_extensions' python typing_extensions is required since python-twisted 22.1.0 [1] Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202537 [1] https://github.com/twisted/twisted/commit/6e768da0a10c8ab42a57a1c0fa505ebe2d8bfb30 Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- package/python-twisted/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-twisted/Config.in b/package/python-twisted/Config.in index 49a21c4204..8596025e9c 100644 --- a/package/python-twisted/Config.in +++ b/package/python-twisted/Config.in @@ -7,6 +7,7 @@ config BR2_PACKAGE_PYTHON_TWISTED select BR2_PACKAGE_PYTHON_HYPERLINK # runtime select BR2_PACKAGE_PYTHON_PYHAMCREST # runtime select BR2_PACKAGE_PYTHON_ZOPE_INTERFACE # runtime + select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime help Twisted is an event-driven networking engine written in Python. From peter at korsgaard.com Tue Feb 22 10:10:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Feb 2022 11:10:28 +0100 Subject: [Buildroot] [git commit] package/flac: security bump to version 1.3.4 Message-ID: <20220222100500.8555B802B2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4c7e250c699b23051a64bc0c2ef3e3f2bd020b3d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This release mostly fixes (security related) bugs including: - Fix 12 decoder bugs found by oss-fuzz, including CVE-2020-0499 - Fix encoder bug CVE-2021-0561 Also: - Replace first patch which was reverted by https://github.com/xiph/flac/commit/4fbb6d4f2ecf2a96c17ea9880108409f852c08a9 - Disable stack protection (enabled by default since https://github.com/xiph/flac/commit/f706f2832270a0b7851cdffe62ad37acda9423fe) - Drop md5 which is not provided anymore - Update indentation in hash file (two spaces) https://github.com/xiph/flac/releases/tag/1.3.4 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/flac/0001-Fix-uclibc-build.patch | 81 ++++++++++++++++++++++ ...c-check-for-sys-auxv.h-before-defining-FL.patch | 36 ---------- package/flac/flac.hash | 12 ++-- package/flac/flac.mk | 5 +- 4 files changed, 89 insertions(+), 45 deletions(-) diff --git a/package/flac/0001-Fix-uclibc-build.patch b/package/flac/0001-Fix-uclibc-build.patch new file mode 100644 index 0000000000..fcba670fae --- /dev/null +++ b/package/flac/0001-Fix-uclibc-build.patch @@ -0,0 +1,81 @@ +From 4c62082f64132bfcbcb6569aa914c5ec283303f9 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 21 Feb 2022 18:21:11 +0100 +Subject: [PATCH] Fix uclibc build + +Commit 4fbb6d4f2ecf2a96c17ea9880108409f852c08a9 reverted commit +44036c9a9b45d03373fe90e9c112852bfc054c51 and so broke again the build on +uclibc + +So put back the sys/auxv.h check as well as a getauxval check in a way +that doesn't break iOS + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/xiph/flac/pull/292] +--- + configure.ac | 5 ++++- + src/libFLAC/cpu.c | 9 ++++----- + 2 files changed, 8 insertions(+), 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 4d7dc2e4..6f32fa45 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -69,7 +69,7 @@ AC_C_INLINE + AC_C_VARARRAYS + AC_C_TYPEOF + +-AC_CHECK_HEADERS([stdint.h inttypes.h byteswap.h sys/param.h sys/ioctl.h termios.h x86intrin.h cpuid.h]) ++AC_CHECK_HEADERS([stdint.h inttypes.h byteswap.h sys/auxv.h sys/param.h sys/ioctl.h termios.h x86intrin.h cpuid.h]) + + XIPH_C_BSWAP32 + XIPH_C_BSWAP16 +@@ -101,6 +101,9 @@ fi + # For the XMMS plugin. + AC_CHECK_TYPES(socklen_t, [], []) + ++dnl check for getauxval in standard library ++AC_CHECK_FUNCS(getauxval) ++ + dnl check for getopt in standard library + dnl AC_CHECK_FUNCS(getopt_long , , [LIBOBJS="$LIBOBJS getopt.o getopt1.o"] ) + AC_CHECK_FUNCS(getopt_long, [], []) +diff --git a/src/libFLAC/cpu.c b/src/libFLAC/cpu.c +index 8b92f4c7..64c6acad 100644 +--- a/src/libFLAC/cpu.c ++++ b/src/libFLAC/cpu.c +@@ -53,11 +53,9 @@ + #define dfprintf(file, format, ...) + #endif + +-#if defined FLAC__CPU_PPC +-#if defined(__linux__) || (defined(__FreeBSD__) && (__FreeBSD__ >= 12)) ++#if defined(HAVE_SYS_AUXV_H) + #include + #endif +-#endif + + #if (defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64) && (defined FLAC__HAS_NASM || FLAC__HAS_X86INTRIN) && !defined FLAC__NO_ASM + +@@ -247,7 +245,7 @@ ppc_cpu_info (FLAC__CPUInfo *info) + #define PPC_FEATURE2_ARCH_2_07 0x80000000 + #endif + +-#ifdef __linux__ ++#if defined (__linux__) && defined(HAVE_GETAUXVAL) + if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_3_00) { + info->ppc.arch_3_00 = true; + } else if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07) { +@@ -267,7 +265,8 @@ ppc_cpu_info (FLAC__CPUInfo *info) + info->ppc.arch_2_07 = false; + info->ppc.arch_3_00 = false; + #else +-#error Unsupported platform! Please add support for reading ppc hwcaps. ++ info->ppc.arch_2_07 = false; ++ info->ppc.arch_3_00 = false; + #endif + + #else +-- +2.34.1 + diff --git a/package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch b/package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch deleted file mode 100644 index d1398d4b3e..0000000000 --- a/package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 14a0713389fbfef59225d027ea466ebb478a8c6b Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 19 Sep 2019 21:18:04 +0200 -Subject: [PATCH] configure.ac: check for sys/auxv.h before defining FLAC__CPU_PPC - -Upstream: https://github.com/xiph/flac/pull/142 -Signed-off-by: Peter Seiderer ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 0228a12..64cb3f2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -144,7 +144,7 @@ case "$host_cpu" in - powerpc64|powerpc64le) - cpu_ppc64=true - cpu_ppc=true -- AC_DEFINE(FLAC__CPU_PPC) -+ AC_CHECK_HEADER(sys/auxv.h, AC_DEFINE(FLAC__CPU_PPC)) - AH_TEMPLATE(FLAC__CPU_PPC, [define if building for PowerPC]) - AC_DEFINE(FLAC__CPU_PPC64) - AH_TEMPLATE(FLAC__CPU_PPC64, [define if building for PowerPC64]) -@@ -152,7 +152,7 @@ case "$host_cpu" in - ;; - powerpc|powerpcle) - cpu_ppc=true -- AC_DEFINE(FLAC__CPU_PPC) -+ AC_CHECK_HEADER(sys/auxv.h, AC_DEFINE(FLAC__CPU_PPC)) - AH_TEMPLATE(FLAC__CPU_PPC, [define if building for PowerPC]) - asm_optimisation=$asm_opt - ;; --- -2.23.0 - diff --git a/package/flac/flac.hash b/package/flac/flac.hash index df7c2d1b95..2444535e0f 100644 --- a/package/flac/flac.hash +++ b/package/flac/flac.hash @@ -1,10 +1,8 @@ -# From https://ftp.osuosl.org/pub/xiph/releases/flac/MD5SUMS -md5 26703ed2858c1fc9ffc05136d13daa69 flac-1.3.3.tar.xz # From https://ftp.osuosl.org/pub/xiph/releases/flac/SHA1SUMS -sha1 6ac2e8f1dd18c9b0214c4d81bd70cdc1e943cffe flac-1.3.3.tar.xz +sha1 99c28482a8b2d81deaf740639e4cb55658427420 flac-1.3.4.tar.xz # From http://downloads.xiph.org/releases/flac/SHA256SUMS.txt -sha256 213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748 flac-1.3.3.tar.xz +sha256 8ff0607e75a322dd7cd6ec48f4f225471404ae2730d0ea945127b1355155e737 flac-1.3.4.tar.xz # Locally computed -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LGPL -sha256 fa27cb11f13f97b0c5f3ff363b1e2610c6efe87ed175779cb2a78e44eb19d34c COPYING.Xiph +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LGPL +sha256 fa27cb11f13f97b0c5f3ff363b1e2610c6efe87ed175779cb2a78e44eb19d34c COPYING.Xiph diff --git a/package/flac/flac.mk b/package/flac/flac.mk index 9aa00b7ffd..2ff048b6e6 100644 --- a/package/flac/flac.mk +++ b/package/flac/flac.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLAC_VERSION = 1.3.3 +FLAC_VERSION = 1.3.4 FLAC_SITE = http://downloads.xiph.org/releases/flac FLAC_SOURCE = flac-$(FLAC_VERSION).tar.xz FLAC_INSTALL_STAGING = YES @@ -19,7 +19,8 @@ FLAC_AUTORECONF = YES FLAC_CONF_OPTS = \ $(if $(BR2_INSTALL_LIBSTDCPP),--enable-cpplibs,--disable-cpplibs) \ --disable-xmms-plugin \ - --disable-altivec + --disable-altivec \ + --disable-stack-smash-protection ifeq ($(BR2_PACKAGE_LIBOGG),y) FLAC_CONF_OPTS += --with-ogg=$(STAGING_DIR)/usr From nolange79 at gmail.com Tue Feb 22 10:22:03 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Tue, 22 Feb 2022 11:22:03 +0100 Subject: [Buildroot] Patch series Message-ID: <20220222102211.74573-1-nolange79@gmail.com> As is was suggested I pulled my patches in a series, this should combine most of my open work. It does *not* contain: - toolchain: support mismatched merged usr [1] recent enough - package/dbus-broker: new package [2] recent enough - package/openssh: improve integration for systemd [3] outdated, no time to fix it Patch 1 and 2 set the runstatedir for CMake and Autotools (new patches) Patch 3 and 4 are rebased and adopted to feedback. Patch 5 contains a better commit message Patch 6 and 7 are new [PATCH v3 1/7] package/pkg-cmake.mk: use /run as runtime path [PATCH v3 2/7] pkg-autotools: optimistically set runstatedir [PATCH v3 3/7] package/systemd: use current tool for generating HWDB [PATCH v3 4/7] package/systemd: remove hwdb-update service [PATCH v3 5/7] Makefile: remove /usr/lib/rpm directory on target [PATCH v3 6/7] package/zsh: Enable dynamic modules [PATCH v3 7/7] package/zsh: enable static regex module [1] - https://lists.buildroot.org/pipermail/buildroot/2022-February/637079.html [2] - https://patchwork.ozlabs.org/project/buildroot/patch/20220109221650.777610-1-nolange79 at gmail.com/ [3] - https://patchwork.ozlabs.org/project/buildroot/patch/20200611091407.12688-2-nolange79 at gmail.com/ From nolange79 at gmail.com Tue Feb 22 10:22:04 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Tue, 22 Feb 2022 11:22:04 +0100 Subject: [Buildroot] [PATCH v3 1/7] package/pkg-cmake.mk: use /run as runtime path In-Reply-To: <20220222102211.74573-1-nolange79@gmail.com> References: <20220222102211.74573-1-nolange79@gmail.com> Message-ID: <20220222102211.74573-2-nolange79@gmail.com> Buildroot prefers /run as runstate directory, make this the default. Signed-off-by: Norbert Lange --- package/pkg-cmake.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index 3b1db35fb6..081960b5bf 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -90,6 +90,7 @@ define $(2)_CONFIGURE_CMDS $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ -DCMAKE_TOOLCHAIN_FILE="$$(HOST_DIR)/share/buildroot/toolchainfile.cmake" \ -DCMAKE_INSTALL_PREFIX="/usr" \ + -DCMAKE_INSTALL_RUNSTATEDIR="/run" \ -DCMAKE_COLOR_MAKEFILE=OFF \ -DBUILD_DOC=OFF \ -DBUILD_DOCS=OFF \ -- 2.34.1 From nolange79 at gmail.com Tue Feb 22 10:22:05 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Tue, 22 Feb 2022 11:22:05 +0100 Subject: [Buildroot] [PATCH v3 2/7] pkg-autotools: optimistically set runstatedir In-Reply-To: <20220222102211.74573-1-nolange79@gmail.com> References: <20220222102211.74573-1-nolange79@gmail.com> Message-ID: <20220222102211.74573-3-nolange79@gmail.com> since Autotools 2.70 there is an option to set the runstatedir. To support configure scripts using older version, the variable is set directly instead of using the --runstatedir argument. Signed-off-by: Norbert Lange --- package/pkg-autotools.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk index 717ff81593..b6224b349d 100644 --- a/package/pkg-autotools.mk +++ b/package/pkg-autotools.mk @@ -187,6 +187,7 @@ define $(2)_CONFIGURE_CMDS --exec-prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ + runstatedir=/run \ --program-prefix="" \ --disable-gtk-doc \ --disable-gtk-doc-html \ -- 2.34.1 From nolange79 at gmail.com Tue Feb 22 10:22:06 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Tue, 22 Feb 2022 11:22:06 +0100 Subject: [Buildroot] [PATCH v3 3/7] package/systemd: use current tool for generating HWDB In-Reply-To: <20220222102211.74573-1-nolange79@gmail.com> References: <20220222102211.74573-1-nolange79@gmail.com> Message-ID: <20220222102211.74573-4-nolange79@gmail.com> udevadm has been deprecated for a while (for building the DB), systemd-hwdb should be used in its place. this tool further has a switch to generate the database in /usr which is a better place for a one-time created file than the default /etc/udev. The HWDB source files have drop-in directories, which means even if disabled in this package, other packages or users could drop in stuff. So always delete those Signed-off-by: Norbert Lange --- v1 -> v2 - fix removal of service v2 -> v3 - see https://lists.buildroot.org/pipermail/buildroot/2020-July/286310.html - use systemd-hwdb with --strict option - split removal of service in separate patch - improve commit message - always delete de HWDB source directories --- package/systemd/systemd.mk | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index b07fac27d4..d2c28b5b60 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -307,13 +307,9 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_HWDB),y) SYSTEMD_CONF_OPTS += -Dhwdb=true define SYSTEMD_BUILD_HWDB - $(HOST_DIR)/bin/udevadm hwdb --update --root $(TARGET_DIR) + $(HOST_DIR)/bin/systemd-hwdb update --root $(TARGET_DIR) --strict --usr endef SYSTEMD_TARGET_FINALIZE_HOOKS += SYSTEMD_BUILD_HWDB -define SYSTEMD_RM_HWDB_SRV - rm -rf $(TARGET_DIR)/$(HOST_EUDEV_SYSCONFDIR)/udev/hwdb.d/ -endef -SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_RM_HWDB_SRV else SYSTEMD_CONF_OPTS += -Dhwdb=false endif @@ -725,6 +721,11 @@ endef SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_UPDATE_CATALOGS endif +define SYSTEMD_RM_HWDB_DATA + rm -rf $(TARGET_DIR)/usr/lib/udev/hwdb.d/ $(TARGET_DIR)/etc/udev/hwdb.d/ +endef +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_RM_HWDB_DATA + 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 \ @@ -814,7 +815,7 @@ HOST_SYSTEMD_CONF_OPTS = \ -Dsysusers=false \ -Dtmpfiles=true \ -Dimportd=false \ - -Dhwdb=false \ + -Dhwdb=true \ -Drfkill=false \ -Dman=false \ -Dhtml=false \ -- 2.34.1 From nolange79 at gmail.com Tue Feb 22 10:22:07 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Tue, 22 Feb 2022 11:22:07 +0100 Subject: [Buildroot] [PATCH v3 4/7] package/systemd: remove hwdb-update service In-Reply-To: <20220222102211.74573-1-nolange79@gmail.com> References: <20220222102211.74573-1-nolange79@gmail.com> Message-ID: <20220222102211.74573-5-nolange79@gmail.com> since the source HWDB files are already removed from the target system, it makes little sense to keep the service around. If accidently triggered it could create an empty database. The service is installed in both staging and host directory, so a user could craft his own solutions if its necessary to update the database. Signed-off-by: Norbert Lange --- package/systemd/systemd.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index d2c28b5b60..44297875f6 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -310,6 +310,12 @@ define SYSTEMD_BUILD_HWDB $(HOST_DIR)/bin/systemd-hwdb update --root $(TARGET_DIR) --strict --usr endef SYSTEMD_TARGET_FINALIZE_HOOKS += SYSTEMD_BUILD_HWDB +define SYSTEMD_RM_HWBD_UPDATE_SERVICE + rm -rf $(TARGET_DIR)/usr/lib/systemd/system/systemd-hwdb-update.service \ + $(TARGET_DIR)/usr/lib/systemd/system/*/systemd-hwdb-update.service \ + $(TARGET_DIR)/usr/bin/systemd-hwdb +endef +SYSTEMD_POST_INSTALL_TARGET_HOOKS += SYSTEMD_RM_HWBD_UPDATE_SERVICE else SYSTEMD_CONF_OPTS += -Dhwdb=false endif -- 2.34.1 From nolange79 at gmail.com Tue Feb 22 10:22:08 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Tue, 22 Feb 2022 11:22:08 +0100 Subject: [Buildroot] [PATCH v3 5/7] Makefile: remove /usr/lib/rpm directory on target In-Reply-To: <20220222102211.74573-1-nolange79@gmail.com> References: <20220222102211.74573-1-nolange79@gmail.com> Message-ID: <20220222102211.74573-6-nolange79@gmail.com> this directory is used by the rpm package manager, and packages like systemd will install "macros" for this system. It should be deleted just like the similar /usr/share/aclocal directory from Autoconf. Signed-off-by: Norbert Lange --- v1 -> v2 - see https://lists.buildroot.org/pipermail/buildroot/2020-June/284213.html - improved commit message Signed-off-by: Norbert Lange --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d92438166f..4953b382ca 100644 --- a/Makefile +++ b/Makefile @@ -734,7 +734,7 @@ target-finalize: $(PACKAGES) $(TARGET_DIR) host-finalize rm -rf $(TARGET_DIR)/usr/include $(TARGET_DIR)/usr/share/aclocal \ $(TARGET_DIR)/usr/lib/pkgconfig $(TARGET_DIR)/usr/share/pkgconfig \ $(TARGET_DIR)/usr/lib/cmake $(TARGET_DIR)/usr/share/cmake \ - $(TARGET_DIR)/usr/doc + $(TARGET_DIR)/usr/lib/rpm $(TARGET_DIR)/usr/doc find $(TARGET_DIR)/usr/{lib,share}/ -name '*.cmake' -print0 | xargs -0 rm -f find $(TARGET_DIR)/lib/ $(TARGET_DIR)/usr/lib/ $(TARGET_DIR)/usr/libexec/ \ \( -name '*.a' -o -name '*.la' -o -name '*.prl' \) -print0 | xargs -0 rm -f -- 2.34.1 From nolange79 at gmail.com Tue Feb 22 10:22:09 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Tue, 22 Feb 2022 11:22:09 +0100 Subject: [Buildroot] [PATCH v3 6/7] package/zsh: Enable dynamic modules In-Reply-To: <20220222102211.74573-1-nolange79@gmail.com> References: <20220222102211.74573-1-nolange79@gmail.com> Message-ID: <20220222102211.74573-7-nolange79@gmail.com> The autoconf scripts seem to assume that no dynamic loader is available if crosscompiling. This results in only a small set of modules being enabled and linked statically. For comparison, debian patches the fallback to enable dynamic modules (unconditionally). This commit enables modules if shared libraries are enabled. Signed-off-by: Norbert Lange --- v1: - so far only tested with glibc --- package/zsh/zsh.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/zsh/zsh.mk b/package/zsh/zsh.mk index c5ab7c2fae..c26a00c430 100644 --- a/package/zsh/zsh.mk +++ b/package/zsh/zsh.mk @@ -36,6 +36,14 @@ else ZSH_CONF_OPTS += --disable-pcre endif +ifneq ($(BR2_STATIC_LIBS),y) +# zsh assumes shared libs to be not available when crosscompiling +ZSH_CONF_OPTS += zsh_cv_shared_environ=yes zsh_cv_shared_tgetent=yes \ + zsh_cv_shared_tigetstr=yes zsh_cv_sys_dynamic_clash_ok=yes \ + zsh_cv_sys_dynamic_rtld_global=yes zsh_cv_sys_dynamic_execsyms=yes \ + zsh_cv_sys_dynamic_strip_exe=yes zsh_cv_sys_dynamic_strip_lib=yes +endif + # Add /bin/zsh to /etc/shells otherwise some login tools like dropbear # can reject the user connection. See man shells. define ZSH_ADD_ZSH_TO_SHELLS -- 2.34.1 From nolange79 at gmail.com Tue Feb 22 10:22:10 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Tue, 22 Feb 2022 11:22:10 +0100 Subject: [Buildroot] [PATCH v3 7/7] package/zsh: enable static regex module In-Reply-To: <20220222102211.74573-1-nolange79@gmail.com> References: <20220222102211.74573-1-nolange79@gmail.com> Message-ID: <20220222102211.74573-8-nolange79@gmail.com> the builtin string =~ regexp operator needs to load the regex module. This operator is readily used in zsh scripts, so always enable it. Signed-off-by: Norbert Lange --- package/zsh/zsh.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/zsh/zsh.mk b/package/zsh/zsh.mk index c26a00c430..85c214372a 100644 --- a/package/zsh/zsh.mk +++ b/package/zsh/zsh.mk @@ -44,6 +44,12 @@ ZSH_CONF_OPTS += zsh_cv_shared_environ=yes zsh_cv_shared_tgetent=yes \ zsh_cv_sys_dynamic_strip_exe=yes zsh_cv_sys_dynamic_strip_lib=yes endif +# regex is commonly used by completion scripts, link it statically +define ZSH_USE_STATIC_REGEX_MODULE + $(SED) 's,echo dynamic,echo static,' $(@D)/Src/Modules/regex.mdd +endef +ZSH_POST_PATCH_HOOKS += ZSH_USE_STATIC_REGEX_MODULE + # Add /bin/zsh to /etc/shells otherwise some login tools like dropbear # can reject the user connection. See man shells. define ZSH_ADD_ZSH_TO_SHELLS -- 2.34.1 From peter at korsgaard.com Tue Feb 22 10:36:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Feb 2022 11:36:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/xdg-dbus-proxy: bump to version 0.1.3 In-Reply-To: <20220221233745.520318-1-aperez@igalia.com> (Adrian Perez de Castro's message of "Tue, 22 Feb 2022 01:37:45 +0200") References: <20220221233745.520318-1-aperez@igalia.com> Message-ID: <87pmnf6vdd.fsf@dell.be.48ers.dk> >>>>> "Adrian" == Adrian Perez de Castro writes: > This is a minor maintenance release. The release incorporates > "0001-Fix-musl-compilation-by-adding-TEMP_FAILURE_RETRY.patch", which > can now be removed. > Release notes: > https://github.com/flatpak/xdg-dbus-proxy/releases/tag/0.1.3 > Signed-off-by: Adrian Perez de Castro Committed to master given the small amount of changes, thanks. > +++ b/package/xdg-dbus-proxy/xdg-dbus-proxy.hash > @@ -1,5 +1,5 @@ > -# From https://github.com/flatpak/xdg-dbus-proxy/releases/tag/0.1.2 > -sha256 1749d6f9f46dcc9edc87725641cf56cf91dcad1b01707891ea0850c1000c520f xdg-dbus-proxy-0.1.2.tar.xz > +# From https://github.com/flatpak/xdg-dbus-proxy/releases/tag/0.1.3 > +sha256 03b5d28ca879253ddbbce31098909becca1495ea811a6377a492e28f16c09b9b xdg-dbus-proxy-0.1.3.tar.xz The "new" agreement is two spaces - And check-package complains about, so I've fixed that while applying. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 22 10:36:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Feb 2022 11:36:42 +0100 Subject: [Buildroot] [git commit] package/xdg-dbus-proxy: bump to version 0.1.3 Message-ID: <20220222102907.DDFDC837C4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1a0d90d8aba6862060ba6e839ebd75436f671acf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This is a minor maintenance release. The release incorporates "0001-Fix-musl-compilation-by-adding-TEMP_FAILURE_RETRY.patch", which can now be removed. Release notes: https://github.com/flatpak/xdg-dbus-proxy/releases/tag/0.1.3 Signed-off-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard --- ...-compilation-by-adding-TEMP_FAILURE_RETRY.patch | 36 ---------------------- package/xdg-dbus-proxy/xdg-dbus-proxy.hash | 6 ++-- package/xdg-dbus-proxy/xdg-dbus-proxy.mk | 2 +- 3 files changed, 4 insertions(+), 40 deletions(-) diff --git a/package/xdg-dbus-proxy/0001-Fix-musl-compilation-by-adding-TEMP_FAILURE_RETRY.patch b/package/xdg-dbus-proxy/0001-Fix-musl-compilation-by-adding-TEMP_FAILURE_RETRY.patch deleted file mode 100644 index e531f58923..0000000000 --- a/package/xdg-dbus-proxy/0001-Fix-musl-compilation-by-adding-TEMP_FAILURE_RETRY.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 645c45f0334bb1d6e31b5927cece5e446f129cbb Mon Sep 17 00:00:00 2001 -From: Danilo Spinella -Date: Sat, 7 Dec 2019 00:05:21 +0100 -Subject: [PATCH] Fix musl compilation by adding TEMP_FAILURE_RETRY - -Fetch from: https://github.com/flatpak/xdg-dbus-proxy/pull/13 -Upstream-Status: Accepted -Signed-off-by: Adrian Perez de Castro - ---- - dbus-proxy.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/dbus-proxy.c b/dbus-proxy.c -index 163df21..4b07931 100644 ---- a/dbus-proxy.c -+++ b/dbus-proxy.c -@@ -30,6 +30,15 @@ - #include - - #include "flatpak-proxy.h" -+// Taken from glibc unistd.h -+#ifndef TEMP_FAILURE_RETRY -+# define TEMP_FAILURE_RETRY(expression) \ -+ (__extension__ \ -+ ({ long int __result; \ -+ do __result = (long int) (expression); \ -+ while (__result == -1L && errno == EINTR); \ -+ __result; })) -+#endif - - static const char *argv0; - static GList *proxies; --- -2.24.1 - diff --git a/package/xdg-dbus-proxy/xdg-dbus-proxy.hash b/package/xdg-dbus-proxy/xdg-dbus-proxy.hash index 37bda78436..b7aa9ac701 100644 --- a/package/xdg-dbus-proxy/xdg-dbus-proxy.hash +++ b/package/xdg-dbus-proxy/xdg-dbus-proxy.hash @@ -1,5 +1,5 @@ -# From https://github.com/flatpak/xdg-dbus-proxy/releases/tag/0.1.2 -sha256 1749d6f9f46dcc9edc87725641cf56cf91dcad1b01707891ea0850c1000c520f xdg-dbus-proxy-0.1.2.tar.xz +# From https://github.com/flatpak/xdg-dbus-proxy/releases/tag/0.1.3 +sha256 03b5d28ca879253ddbbce31098909becca1495ea811a6377a492e28f16c09b9b xdg-dbus-proxy-0.1.3.tar.xz # Hash for license files: -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/xdg-dbus-proxy/xdg-dbus-proxy.mk b/package/xdg-dbus-proxy/xdg-dbus-proxy.mk index 1b056c36f0..9c4449c7bb 100644 --- a/package/xdg-dbus-proxy/xdg-dbus-proxy.mk +++ b/package/xdg-dbus-proxy/xdg-dbus-proxy.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDG_DBUS_PROXY_VERSION = 0.1.2 +XDG_DBUS_PROXY_VERSION = 0.1.3 XDG_DBUS_PROXY_SITE = https://github.com/flatpak/xdg-dbus-proxy/releases/download/$(XDG_DBUS_PROXY_VERSION) XDG_DBUS_PROXY_SOURCE = xdg-dbus-proxy-$(XDG_DBUS_PROXY_VERSION).tar.xz XDG_DBUS_PROXY_DEPENDENCIES = host-pkgconf libglib2 From romain.naour at gmail.com Tue Feb 22 10:41:41 2022 From: romain.naour at gmail.com (Romain Naour) Date: Tue, 22 Feb 2022 11:41:41 +0100 Subject: [Buildroot] [PATCH 1/2] package/python-treq: fix dependencies In-Reply-To: <20220221230640.2203877-1-fontaine.fabrice@gmail.com> References: <20220221230640.2203877-1-fontaine.fabrice@gmail.com> Message-ID: <8785e132-e840-c571-7258-943c9da77a7c@gmail.com> Hello Fabrice, Le 22/02/2022 ? 00:06, Fabrice Fontaine a ?crit?: > python-treq needs TLS support in twisted so select > BR2_PACKAGE_PYTHON_TWISTED_TLS moreover it doesn't depend directly on > service_identity and pyOpenSSL since version 17.3.0 and > https://github.com/twisted/treq/commit/ef2ac7ea2b74774adb9fef7675facc6017bfda89 > > Finally, python-idna was never a direct dependency of python-treq > > Signed-off-by: Fabrice Fontaine Reviewed-by: Romain Naour Best regards, Romain > --- > package/python-treq/Config.in | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > > diff --git a/package/python-treq/Config.in b/package/python-treq/Config.in > index f781b37305..7c02a35638 100644 > --- a/package/python-treq/Config.in > +++ b/package/python-treq/Config.in > @@ -1,16 +1,13 @@ > config BR2_PACKAGE_PYTHON_TREQ > bool "python-treq" > - # python-pyopenssl -> python-cryptography > + # twisted TLS -> python-{pyopenssl,service-identity} > depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS > - # python-idna, python-pyopenssl -> python-cryptography > select BR2_PACKAGE_PYTHON_ATTRS # runtime > - select BR2_PACKAGE_PYTHON_IDNA # runtime > select BR2_PACKAGE_PYTHON_INCREMENTAL # runtime > - select BR2_PACKAGE_PYTHON_PYOPENSSL # runtime > select BR2_PACKAGE_PYTHON_REQUESTS # runtime > - select BR2_PACKAGE_PYTHON_SERVICE_IDENTITY # runtime > select BR2_PACKAGE_PYTHON_SIX # runtime > select BR2_PACKAGE_PYTHON_TWISTED # runtime > + select BR2_PACKAGE_PYTHON_TWISTED_TLS # runtime > help > treq is an HTTP library inspired by requests but written on > top of Twisted's Agents. It provides a simple, higher level From romain.naour at gmail.com Tue Feb 22 10:46:55 2022 From: romain.naour at gmail.com (Romain Naour) Date: Tue, 22 Feb 2022 11:46:55 +0100 Subject: [Buildroot] [PATCH 2/2] package/python-treq: bump to version 22.2.0 In-Reply-To: <20220221230815.2203955-1-fontaine.fabrice@gmail.com> References: <20220221230815.2203955-1-fontaine.fabrice@gmail.com> Message-ID: Hello Fabrice, Le 22/02/2022 ? 00:08, Fabrice Fontaine a ?crit?: > - hyperlink is a dependency since version 20.4.0 and > https://github.com/twisted/treq/commit/5475def96f3ec93075ff95709fec4acd154e6fed > - six is not a dependency since version 21.5.0 and > https://github.com/twisted/treq/commit/22bdb399a03b0eebaa93023b80d348f584f567d5 > > Signed-off-by: Fabrice Fontaine Reviewed-by: Romain Naour Best regards, Romain > --- > package/python-treq/Config.in | 2 +- > package/python-treq/python-treq.hash | 4 ++-- > package/python-treq/python-treq.mk | 4 ++-- > 3 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/python-treq/Config.in b/package/python-treq/Config.in > index 7c02a35638..5d76a5cdd6 100644 > --- a/package/python-treq/Config.in > +++ b/package/python-treq/Config.in > @@ -3,9 +3,9 @@ config BR2_PACKAGE_PYTHON_TREQ > # twisted TLS -> python-{pyopenssl,service-identity} > depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS > select BR2_PACKAGE_PYTHON_ATTRS # runtime > + select BR2_PACKAGE_PYTHON_HYPERLINK # runtime > select BR2_PACKAGE_PYTHON_INCREMENTAL # runtime > select BR2_PACKAGE_PYTHON_REQUESTS # runtime > - select BR2_PACKAGE_PYTHON_SIX # runtime > select BR2_PACKAGE_PYTHON_TWISTED # runtime > select BR2_PACKAGE_PYTHON_TWISTED_TLS # runtime > help > diff --git a/package/python-treq/python-treq.hash b/package/python-treq/python-treq.hash > index 288279cbd8..aecf71aad8 100644 > --- a/package/python-treq/python-treq.hash > +++ b/package/python-treq/python-treq.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/treq/json > -md5 b75f6c89fd481989a9cfdec8d61a6d84 treq-20.3.0.tar.gz > -sha256 a72d7587d6f81c7a32620b00175825b4334bafbde73d37098d139ac7b11dca98 treq-20.3.0.tar.gz > +md5 43892086d556e7596392134f1e10bdef treq-22.2.0.tar.gz > +sha256 df757e3f141fc782ede076a604521194ffcb40fa2645cf48e5a37060307f52ec treq-22.2.0.tar.gz > # Locally computed sha256 checksums > sha256 7cc1b65e1937b1cc07052bb864ec96d8e5fd413400c0842e5b89a8201a600293 LICENSE > diff --git a/package/python-treq/python-treq.mk b/package/python-treq/python-treq.mk > index 320f57b6f2..57dc50ee74 100644 > --- a/package/python-treq/python-treq.mk > +++ b/package/python-treq/python-treq.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_TREQ_VERSION = 20.3.0 > +PYTHON_TREQ_VERSION = 22.2.0 I would suggest to add a comment about the requirement to keep the version in sync with python-twisted version. Add the same comment on python-twisted.mk Best regards, Romain > PYTHON_TREQ_SOURCE = treq-$(PYTHON_TREQ_VERSION).tar.gz > -PYTHON_TREQ_SITE = https://files.pythonhosted.org/packages/98/09/25064d7224efde9fd51e8865353d516c53306e476eab27ab21fb258cf7d4 > +PYTHON_TREQ_SITE = https://files.pythonhosted.org/packages/cd/c8/b68ab17d994133baf6edbcb5551ba81e1494bdc6d5e21a9d4f3bc4315140 > PYTHON_TREQ_LICENSE = MIT > PYTHON_TREQ_LICENSE_FILES = LICENSE > PYTHON_TREQ_SETUP_TYPE = setuptools From angelo at amarulasolutions.com Tue Feb 22 10:55:31 2022 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 22 Feb 2022 11:55:31 +0100 Subject: [Buildroot] [PATCH] package/mender: bump to version 3.2.1 Message-ID: <20220222105531.2498422-1-angelo@amarulasolutions.com> Main LICENSE file hash is changed due to a copyright year update. Signed-off-by: Angelo Compagnucci --- 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..3a7a675341 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 8dd04f963f1816350c5406312969f5b11d45c772274a8c32f7a9da8b2cc36561 3.2.1.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..33b4611a5f 100644 --- a/package/mender/mender.mk +++ b/package/mender/mender.mk @@ -4,7 +4,7 @@ # ################################################################################ -MENDER_VERSION = 3.1.0 +MENDER_VERSION = 3.2.1 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.25.1 From angelo at amarulasolutions.com Tue Feb 22 10:55:56 2022 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 22 Feb 2022 11:55:56 +0100 Subject: [Buildroot] [PATCH] package/mender-artifact: bump to version 3.7.0 Message-ID: <20220222105556.2498717-1-angelo@amarulasolutions.com> Signed-off-by: Angelo Compagnucci --- 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.25.1 From angelo at amarulasolutions.com Tue Feb 22 11:33:26 2022 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 22 Feb 2022 12:33:26 +0100 Subject: [Buildroot] [PATCH] package/python-can: bump to version 4.0.0 Message-ID: <20220222113326.2608582-1-angelo@amarulasolutions.com> Signed-off-by: Angelo Compagnucci --- package/python-can/python-can.hash | 2 +- package/python-can/python-can.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-can/python-can.hash b/package/python-can/python-can.hash index 5330e5899c..91b685cc17 100644 --- a/package/python-can/python-can.hash +++ b/package/python-can/python-can.hash @@ -1,4 +1,4 @@ # sha256 from https://pypi.org/pypi/python-can -sha256 2d3c223b7adc4dd46ce258d4a33b7e0dbb6c339e002faa40ee4a69d5fdce9449 python-can-3.3.4.tar.gz +sha256 59d92846ffb981e634e9e0f2d14a6b4967a875e3869bd2ba168c92c4db6b8b5d python-can-4.0.0.tar.gz # Locally computed sha256 checksums sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.txt diff --git a/package/python-can/python-can.mk b/package/python-can/python-can.mk index 1ab813e2c9..9284a9cf99 100644 --- a/package/python-can/python-can.mk +++ b/package/python-can/python-can.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_CAN_VERSION = 3.3.4 -PYTHON_CAN_SITE = https://files.pythonhosted.org/packages/97/dd/5e5ae96db41ba57dde127e0600c3d324239ed692e167296c5fdb992cbf41 +PYTHON_CAN_VERSION = 4.0.0 +PYTHON_CAN_SITE = https://files.pythonhosted.org/packages/1f/f7/a643cba269d59e108fe4c1854a8e71d5cdadadd4de1b9c8862b190171122 PYTHON_CAN_SETUP_TYPE = setuptools PYTHON_CAN_LICENSE = LGPL-3.0 PYTHON_CAN_LICENSE_FILES = LICENSE.txt -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 22 11:33:36 2022 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 22 Feb 2022 12:33:36 +0100 Subject: [Buildroot] [PATCH] package/python-pillow: bump to version 9.0.1 Message-ID: <20220222113336.2608916-1-angelo@amarulasolutions.com> Signed-off-by: Angelo Compagnucci --- package/python-pillow/python-pillow.hash | 4 ++-- package/python-pillow/python-pillow.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pillow/python-pillow.hash b/package/python-pillow/python-pillow.hash index f3ca8e6014..88a5d7cada 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 c5af6e413d2fe9247cf16ce25c816b14 Pillow-9.0.0.tar.gz -sha256 ee6e2963e92762923956fe5d3479b1fdc3b76c83f290aad131a2f98c3df0593e Pillow-9.0.0.tar.gz +md5 8deffccb4f402df154fd2fd504d8487c Pillow-9.0.1.tar.gz +sha256 6c8bc8238a7dfdaf7a75f5ec5a663f4173f8c367e5a39f87e720495e1eed75fa Pillow-9.0.1.tar.gz # Locally computed sha256 checksums sha256 a6554cb737ba6c9b47d3301f78de03b4ed0d3f08d6cf9400714f3d4c894f6943 LICENSE diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk index 2f2e817882..901876e0ee 100644 --- a/package/python-pillow/python-pillow.mk +++ b/package/python-pillow/python-pillow.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_PILLOW_VERSION = 9.0.0 -PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/b0/43/3e286c93b9fa20e233d53532cc419b5aad8a468d91065dbef4c846058834 +PYTHON_PILLOW_VERSION = 9.0.1 +PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/03/a3/f61a9a7ff7969cdef2a6e0383a346eb327495d20d25a2de5a088dbb543a6 PYTHON_PILLOW_SOURCE = Pillow-$(PYTHON_PILLOW_VERSION).tar.gz PYTHON_PILLOW_LICENSE = HPND PYTHON_PILLOW_LICENSE_FILES = LICENSE -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 22 11:33:54 2022 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 22 Feb 2022 12:33:54 +0100 Subject: [Buildroot] [PATCH] package/python-pydal: bump to version 20220213.2 Message-ID: <20220222113354.2609277-1-angelo@amarulasolutions.com> Signed-off-by: Angelo Compagnucci --- package/python-pydal/python-pydal.hash | 2 +- package/python-pydal/python-pydal.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/python-pydal/python-pydal.hash b/package/python-pydal/python-pydal.hash index eef00030bd..46271dfd91 100644 --- a/package/python-pydal/python-pydal.hash +++ b/package/python-pydal/python-pydal.hash @@ -1,3 +1,3 @@ # sha256 locally computed -sha256 9634f34a31d4411588b73825c8acc7f73ca69ba8a665bb00d0a9b5baff69498b python-pydal-20210626.3.tar.gz +sha256 40a2cafb5aa830d51ababfe34a8f8a0e3b630bc4f931f04db75ed84c3f55ea38 python-pydal-20220213.2.tar.gz sha256 1f711e93f1e0c2eec576e2e60597dc2ed6f0a661e4749c6b8a39f0d4a72be468 LICENSE.txt diff --git a/package/python-pydal/python-pydal.mk b/package/python-pydal/python-pydal.mk index 428999f5c1..c3be683dda 100644 --- a/package/python-pydal/python-pydal.mk +++ b/package/python-pydal/python-pydal.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_PYDAL_VERSION = 20210626.3 +PYTHON_PYDAL_VERSION = 20220213.2 PYTHON_PYDAL_SITE = $(call github,web2py,pydal,v$(PYTHON_PYDAL_VERSION)) PYTHON_PYDAL_LICENSE = BSD-3-Clause PYTHON_PYDAL_LICENSE_FILES = LICENSE.txt -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 22 11:34:04 2022 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 22 Feb 2022 12:34:04 +0100 Subject: [Buildroot] [PATCH] package/python-web2py: bump to version 2.22.3 Message-ID: <20220222113404.2609626-1-angelo@amarulasolutions.com> Signed-off-by: Angelo Compagnucci --- package/python-web2py/python-web2py.hash | 2 +- package/python-web2py/python-web2py.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/python-web2py/python-web2py.hash b/package/python-web2py/python-web2py.hash index 2ef52b0a5c..5830b71701 100644 --- a/package/python-web2py/python-web2py.hash +++ b/package/python-web2py/python-web2py.hash @@ -1,3 +1,3 @@ # sha256 locally computed -sha256 44556376468139de874e9c29c9ef56e60ecd5f7536c7bee46d74b1f9d4178825 python-web2py-2.21.1.tar.gz +sha256 a779adc5626999c854e9abc976296c2c1059bf6988a421c0bfba923f9b08d8cb python-web2py-2.22.3.tar.gz sha256 2aae96826184a492bc799add49aed7b29036e7aba2d2294fb65053bd30fe55fe LICENSE diff --git a/package/python-web2py/python-web2py.mk b/package/python-web2py/python-web2py.mk index 3e453282a9..b1897978af 100644 --- a/package/python-web2py/python-web2py.mk +++ b/package/python-web2py/python-web2py.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_WEB2PY_VERSION = 2.21.1 +PYTHON_WEB2PY_VERSION = 2.22.3 PYTHON_WEB2PY_SITE = $(call github,web2py,web2py,v$(PYTHON_WEB2PY_VERSION)) PYTHON_WEB2PY_LICENSE = LGPL-3.0 PYTHON_WEB2PY_LICENSE_FILES = LICENSE -- 2.25.1 From aperez at igalia.com Tue Feb 22 12:00:34 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Tue, 22 Feb 2022 14:00:34 +0200 Subject: [Buildroot] [PATCH 1/1] package/glib-networking: security bump to version 2.70.1 Message-ID: <20220222120034.1748652-1-aperez@igalia.com> This is a minor release which fixes a couple of crashes and an incorrect case of TLS certificate velidation when built with the OpenSSL backend. Release notes: https://gitlab.gnome.org/GNOME/glib-networking/-/blob/b0d45b17f745088256c9ad1ae9a7e2467dec6286/NEWS Signed-off-by: Adrian Perez de Castro --- package/glib-networking/glib-networking.hash | 4 ++-- package/glib-networking/glib-networking.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/glib-networking/glib-networking.hash b/package/glib-networking/glib-networking.hash index 6a53b436b0..347ef6777c 100644 --- a/package/glib-networking/glib-networking.hash +++ b/package/glib-networking/glib-networking.hash @@ -1,3 +1,3 @@ -# From http://ftp.gnome.org/pub/gnome/sources/glib-networking/2.70/glib-networking-2.70.0.sha256sum -sha256 66b408e7afa86c582fe38963db56133869ab4b57d34e48ec56aba621940d6f35 glib-networking-2.70.0.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/glib-networking/2.70/glib-networking-2.70.1.sha256sum +sha256 2a16bfc2d271ccd3266e3fb462bc8a4103c02e81bbb339aa92d6fb060592d7bc glib-networking-2.70.1.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/glib-networking/glib-networking.mk b/package/glib-networking/glib-networking.mk index 53280700bc..f74e520d31 100644 --- a/package/glib-networking/glib-networking.mk +++ b/package/glib-networking/glib-networking.mk @@ -5,7 +5,7 @@ ################################################################################ GLIB_NETWORKING_VERSION_MAJOR = 2.70 -GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_VERSION_MAJOR).0 +GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_VERSION_MAJOR).1 GLIB_NETWORKING_SITE = http://ftp.gnome.org/pub/gnome/sources/glib-networking/$(GLIB_NETWORKING_VERSION_MAJOR) GLIB_NETWORKING_SOURCE = glib-networking-$(GLIB_NETWORKING_VERSION).tar.xz GLIB_NETWORKING_INSTALL_STAGING = YES -- 2.35.1 From guillaume.bressaix at gmail.com Tue Feb 22 12:48:47 2022 From: guillaume.bressaix at gmail.com (Guillaume W. Bres) Date: Tue, 22 Feb 2022 13:48:47 +0100 Subject: [Buildroot] [PATCH v3 1/4] package/python-gast: new host-only package Message-ID: <20220222124850.6050-1-guillaume.bressaix@gmail.com> From: "Arnout Vandecappelle (Essensium/Mind)" Generated with scanpypi and converted to host. It is a dependency of python-beniget and python-pythran. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Guillaume W. Bres --- 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.20.1 From guillaume.bressaix at gmail.com Tue Feb 22 12:48:48 2022 From: guillaume.bressaix at gmail.com (Guillaume W. Bres) Date: Tue, 22 Feb 2022 13:48:48 +0100 Subject: [Buildroot] [PATCH v3 2/4] package/python-beniget: new host-only package In-Reply-To: <20220222124850.6050-1-guillaume.bressaix@gmail.com> References: <20220222124850.6050-1-guillaume.bressaix@gmail.com> Message-ID: <20220222124850.6050-2-guillaume.bressaix@gmail.com> From: "Arnout Vandecappelle (Essensium/Mind)" Generated with scanpypi and converted to host. It is a dependency of python-pythran. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Guillaume W. Bres --- 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.20.1 From guillaume.bressaix at gmail.com Tue Feb 22 12:48:49 2022 From: guillaume.bressaix at gmail.com (Guillaume W. Bres) Date: Tue, 22 Feb 2022 13:48:49 +0100 Subject: [Buildroot] [PATCH v3 3/4] package/python-pythran: new host-only package In-Reply-To: <20220222124850.6050-1-guillaume.bressaix@gmail.com> References: <20220222124850.6050-1-guillaume.bressaix@gmail.com> Message-ID: <20220222124850.6050-3-guillaume.bressaix@gmail.com> From: "Arnout Vandecappelle (Essensium/Mind)" Generated with scanpypi and converted to host. It is a dependency of python-scipy. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Guillaume W. Bres --- 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.20.1 From guillaume.bressaix at gmail.com Tue Feb 22 12:48:50 2022 From: guillaume.bressaix at gmail.com (Guillaume W. Bres) Date: Tue, 22 Feb 2022 13:48:50 +0100 Subject: [Buildroot] [PATCH v3 4/4] package/python-scipy: new package In-Reply-To: <20220222124850.6050-1-guillaume.bressaix@gmail.com> References: <20220222124850.6050-1-guillaume.bressaix@gmail.com> Message-ID: <20220222124850.6050-4-guillaume.bressaix@gmail.com> 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) [Guillaume: - -lnpymath: npymath.ini localization problem - -lnpyrandom resolution problem - fix legal-info for latest version LICENSE.txt - zlib is a scipy::io module runtime requirement ] --- v2: -lnpymath is not able to locate npymath.ini, I 'fix' it with an -L flag. -lnpyrandom seems to point to host/usr and not staging/usr I 'fix' it with an -L flag. v3: fix legal-info zlib is a scipy::io module runtime requirement run "python -c 'import scipy; scipy.test();'" to test this package Signed-off-by: Guillaume W. Bres --- 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 | 63 ++++++++++++++++++++++++++ 5 files changed, 105 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 ac702d8d0f..c8766c872e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1149,6 +1149,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 @@ -1280,6 +1281,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 10209d84d7..0edde1c919 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1209,6 +1209,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..6f9011516c --- /dev/null +++ b/package/python-scipy/python-scipy.hash @@ -0,0 +1,9 @@ +# Locally generated +sha256 4042211bed8e6c658b9e2a4ca829806f0b33437faa7878c8dc6d6f72845b1694 scipy-1.7.3.tar.xz +sha256 32b2f41fb8c1193a066c1686bb3237e79f918685bf545cb6dfcb68753ac35152 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..0491a73753 --- /dev/null +++ b/package/python-scipy/python-scipy.mk @@ -0,0 +1,63 @@ +################################################################################ +# +# 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 \ + zlib \ + lapack \ + openblas \ + python-numpy \ + python-pybind +PYTHON_SCIPY_INSTALL_STAGING = YES + +PYTHON_SCIPY_SETUP_TYPE = setuptools +PYTHON_SCIPY_BUILD_OPTS = config_fc --fcompiler=gnu95 + +# -lnpymath npymath.ini localization +PYTHON_SCIPY_NPY_PKG_CONFIG_PATH = \ + $(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/numpy/core/lib/npy-pkg-config + +PYTHON_SCIPY_LDFLAGS = $(TARGET_LDFLAGS) -shared \ + -L$(PYTHON3_PATH)/site-packages/numpy/core/lib +# -lnpyrandom localization +PYTHON_SCIPY_LDFLAGS += \ + -L$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/numpy/random/lib + +PYTHON_SCIPY_ENV = \ + F90=$(TARGET_FC) \ + NPY_PKG_CONFIG_PATH=$(PYTHON_SCIPY_NPY_PKG_CONFIG_PATH) \ + LDFLAGS="$(PYTHON_SCIPY_LDFLAGS)" + +# 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.20.1 From guillaume.bressaix at gmail.com Tue Feb 22 12:57:21 2022 From: guillaume.bressaix at gmail.com (Guillaume W. Bres) Date: Tue, 22 Feb 2022 13:57:21 +0100 Subject: [Buildroot] [PATCH v4 1/4] package/python-gast: new host-only package Message-ID: <20220222125724.11079-1-guillaume.bressaix@gmail.com> From: "Arnout Vandecappelle (Essensium/Mind)" Generated with scanpypi and converted to host. It is a dependency of python-beniget and python-pythran. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Guillaume W. Bres --- 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.20.1 From guillaume.bressaix at gmail.com Tue Feb 22 12:57:22 2022 From: guillaume.bressaix at gmail.com (Guillaume W. Bres) Date: Tue, 22 Feb 2022 13:57:22 +0100 Subject: [Buildroot] [PATCH v4 2/4] package/python-beniget: new host-only package In-Reply-To: <20220222125724.11079-1-guillaume.bressaix@gmail.com> References: <20220222125724.11079-1-guillaume.bressaix@gmail.com> Message-ID: <20220222125724.11079-2-guillaume.bressaix@gmail.com> From: "Arnout Vandecappelle (Essensium/Mind)" Generated with scanpypi and converted to host. It is a dependency of python-pythran. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Guillaume W. Bres --- 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.20.1 From guillaume.bressaix at gmail.com Tue Feb 22 12:57:23 2022 From: guillaume.bressaix at gmail.com (Guillaume W. Bres) Date: Tue, 22 Feb 2022 13:57:23 +0100 Subject: [Buildroot] [PATCH v4 3/4] package/python-pythran: new host-only package In-Reply-To: <20220222125724.11079-1-guillaume.bressaix@gmail.com> References: <20220222125724.11079-1-guillaume.bressaix@gmail.com> Message-ID: <20220222125724.11079-3-guillaume.bressaix@gmail.com> From: "Arnout Vandecappelle (Essensium/Mind)" Generated with scanpypi and converted to host. It is a dependency of python-scipy. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Guillaume W. Bres --- 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.20.1 From guillaume.bressaix at gmail.com Tue Feb 22 12:57:24 2022 From: guillaume.bressaix at gmail.com (Guillaume W. Bres) Date: Tue, 22 Feb 2022 13:57:24 +0100 Subject: [Buildroot] [PATCH v4 4/4] package/python-scipy: new package In-Reply-To: <20220222125724.11079-1-guillaume.bressaix@gmail.com> References: <20220222125724.11079-1-guillaume.bressaix@gmail.com> Message-ID: <20220222125724.11079-4-guillaume.bressaix@gmail.com> 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) [Guillaume: - -lnpymath: npymath.ini localization problem - -lnpyrandom resolution problem - fix legal-info for latest version LICENSE.txt - zlib is a scipy::io module runtime requirement ] Signed-off-by: Guillaume W. Bres --- v2: -lnpymath not able to localize npymath.ini -lnpyrandom points to /host/usr instead of /staging/usr v3: - fix legal-info (LICENSE.txt was outdated) - zlib is a scipy::io module runtime requirement v4: - zlib runtime selection missing in Config.in - fixed previous commit format Signed-off-by: Guillaume W. Bres --- DEVELOPERS | 3 ++ package/Config.in | 1 + package/python-scipy/Config.in | 30 ++++++++++++ package/python-scipy/python-scipy.hash | 9 ++++ package/python-scipy/python-scipy.mk | 63 ++++++++++++++++++++++++++ 5 files changed, 106 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 ac702d8d0f..c8766c872e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1149,6 +1149,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 @@ -1280,6 +1281,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 10209d84d7..0edde1c919 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1209,6 +1209,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..a016d411af --- /dev/null +++ b/package/python-scipy/Config.in @@ -0,0 +1,30 @@ +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_ZLIB # runtime scipy::io + 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..6f9011516c --- /dev/null +++ b/package/python-scipy/python-scipy.hash @@ -0,0 +1,9 @@ +# Locally generated +sha256 4042211bed8e6c658b9e2a4ca829806f0b33437faa7878c8dc6d6f72845b1694 scipy-1.7.3.tar.xz +sha256 32b2f41fb8c1193a066c1686bb3237e79f918685bf545cb6dfcb68753ac35152 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..0491a73753 --- /dev/null +++ b/package/python-scipy/python-scipy.mk @@ -0,0 +1,63 @@ +################################################################################ +# +# 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 \ + zlib \ + lapack \ + openblas \ + python-numpy \ + python-pybind +PYTHON_SCIPY_INSTALL_STAGING = YES + +PYTHON_SCIPY_SETUP_TYPE = setuptools +PYTHON_SCIPY_BUILD_OPTS = config_fc --fcompiler=gnu95 + +# -lnpymath npymath.ini localization +PYTHON_SCIPY_NPY_PKG_CONFIG_PATH = \ + $(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/numpy/core/lib/npy-pkg-config + +PYTHON_SCIPY_LDFLAGS = $(TARGET_LDFLAGS) -shared \ + -L$(PYTHON3_PATH)/site-packages/numpy/core/lib +# -lnpyrandom localization +PYTHON_SCIPY_LDFLAGS += \ + -L$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/numpy/random/lib + +PYTHON_SCIPY_ENV = \ + F90=$(TARGET_FC) \ + NPY_PKG_CONFIG_PATH=$(PYTHON_SCIPY_NPY_PKG_CONFIG_PATH) \ + LDFLAGS="$(PYTHON_SCIPY_LDFLAGS)" + +# 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.20.1 From bugzilla at busybox.net Tue Feb 22 13:25:17 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Tue, 22 Feb 2022 13:25:17 +0000 Subject: [Buildroot] [Bug 14596] package dialog is outdated and contains a bug In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14596 --- Comment #2 from Roman Geile --- (In reply to Andrei Gherghescu from comment #1) Thank you! -- You are receiving this mail because: You are on the CC list for the bug. From mdurrant at arcturusnetworks.com Tue Feb 22 15:37:41 2022 From: mdurrant at arcturusnetworks.com (Michael Durrant) Date: Tue, 22 Feb 2022 10:37:41 -0500 Subject: [Buildroot] [PATCH v5] board/arcturus/aarch64-ucls1012a: bump u-boot and kernel version Message-ID: <20220222153741.15815-1-mdurrant@arcturusnetworks.com> - Bump Linux to version 5.4.137 - Bump U-Boot to add new targets, version remains the same - Drop BR2_ROOTFS_OVERLAY and remove S09modload script because it was only used by PFE and now PFE is loaded directly by the kernel - Use Image.gz instead of Image to have a compressed kernel - Rename ucls1012a.its to br2-ucls1012a.its since post-build.sh and post-image.sh use different name. This fixes the bug that didn't allow the creation of the part0-000000.itb file. Signed-off-by: Oleksandr Zhadan Signed-off-by: Michael Durrant Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti --- V1->V2: - Bump the kernel to "Linux version 5.4.137" - Bootloader version is still "U-Boot 2019.10" but new targets added. - Remove the /etc/init.d/S09modload script to load the pfe firmware module because now the pfe firmware module is loaded by the kernel - New compressed Image.gz is used V2->V3: - Moved SoB to top of patch - The use of Image.gz replace Image to force use of compression. - Our scripts use br2-ucls1012a.its in error ucls1012a.its was used in original readme. - Removing extra newline - The NXP Packet Forward Engine (PFE) firmware loader was the only file used in the overlay. As the PFE is now loaded directly by the kernel the BR2_ROOTFS_OVERLAY script has been removed. V3->V4: - Improved commit log by listing all the changed as suggested by Giulio. - Updated header version comment in defconfig to reflect 5.4 series. V4->V5: - Adding Reviewed-by & Tested-by by Giulio. - Wrapping commit log. --- board/arcturus/aarch64-ucls1012a/post-build.sh | 1 - board/arcturus/aarch64-ucls1012a/readme.txt | 4 ++-- .../rootfs_overlay/etc/init.d/S09modload | 14 -------------- configs/arcturus_ucls1012a_defconfig | 10 +++++----- 4 files changed, 7 insertions(+), 22 deletions(-) delete mode 100755 board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload diff --git a/board/arcturus/aarch64-ucls1012a/post-build.sh b/board/arcturus/aarch64-ucls1012a/post-build.sh index f8ba78095f..372df59c61 100755 --- a/board/arcturus/aarch64-ucls1012a/post-build.sh +++ b/board/arcturus/aarch64-ucls1012a/post-build.sh @@ -1,5 +1,4 @@ #!/bin/sh mkdir -p ${TARGET_DIR}/lib/firmware -cp -f ${BUILD_DIR}/linux-custom/firmware/ppfe/* ${TARGET_DIR}/lib/firmware/ cp -f ${BUILD_DIR}/linux-custom/br2-ucls1012a.its ${BINARIES_DIR}/ diff --git a/board/arcturus/aarch64-ucls1012a/readme.txt b/board/arcturus/aarch64-ucls1012a/readme.txt index 483d5e9aef..b486ecebc7 100644 --- a/board/arcturus/aarch64-ucls1012a/readme.txt +++ b/board/arcturus/aarch64-ucls1012a/readme.txt @@ -24,13 +24,13 @@ After building, you should obtain this tree: output/images/ +-- arc-ucls1012a.dtb - +-- Image + +-- Image.gz +-- part0-000000.itb +-- rootfs.cpio +-- rootfs.cpio.gz +-- rootfs.tar +-- u-boot.bin - +-- ucls1012a.its + +-- br2-ucls1012a.its Flashing -------- diff --git a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload b/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload deleted file mode 100755 index c87ffda14f..0000000000 --- a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -# -case "$1" in - start) - modprobe pfe - ;; - stop) - ;; - restart|reload) - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac diff --git a/configs/arcturus_ucls1012a_defconfig b/configs/arcturus_ucls1012a_defconfig index fd33ebf1f6..124cc3ff94 100644 --- a/configs/arcturus_ucls1012a_defconfig +++ b/configs/arcturus_ucls1012a_defconfig @@ -1,22 +1,22 @@ # Architecture BR2_aarch64=y -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # System settings BR2_TARGET_GENERIC_HOSTNAME="ucls1012a" BR2_TARGET_GENERIC_ISSUE="Welcome to uCLS1012A-SOM" BR2_SYSTEM_DHCP="eth0" -BR2_ROOTFS_OVERLAY="board/arcturus/aarch64-ucls1012a/rootfs_overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="board/arcturus/aarch64-ucls1012a/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/arcturus/aarch64-ucls1012a/post-image.sh" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-kernel,v.20.31)/linux-v.20.31.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-kernel,v.22.06)/linux-v.22.06.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="ucls1012a" +BR2_LINUX_KERNEL_IMAGEGZ=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="arcturus/arc-ucls1012a" @@ -28,7 +28,7 @@ BR2_TARGET_ROOTFS_CPIO_GZIP=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-uboot,v.20.31)/uboot-v.20.31.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-uboot,v.22.06)/uboot-v.22.06.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="UCLS1012A_QSPI128" # Tools -- 2.26.2 From peter at korsgaard.com Tue Feb 22 16:41:25 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Feb 2022 17:41:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/lm-sensors: update LM_SENSORS_VERSION In-Reply-To: <20220206145108.1757971-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 6 Feb 2022 15:51:08 +0100") References: <20220206145108.1757971-1-fontaine.fabrice@gmail.com> Message-ID: <87ley27t1m.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Update LM_SENSORS_VERSION to make it match what is returned by > https://release-monitoring.org > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 22 16:42:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Feb 2022 17:42:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/jack1: drop celt comment In-Reply-To: <20220206143112.1752984-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 6 Feb 2022 15:31:12 +0100") References: <20220206143112.1752984-1-fontaine.fabrice@gmail.com> Message-ID: <87h78q7szg.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Drop celt comment which is not needed since removal of celt051 in commit > b32efbdb0354557db48852478b99080705ba315b > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 22 16:46:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Feb 2022 17:46:19 +0100 Subject: [Buildroot] [git commit] linux/linux.mk: correct LINUX_ARCH_PATH for sparc64 In-Reply-To: <20220208202150.3CF6A82B8F@busybox.osuosl.org> (Arnout Vandecappelle's message of "Tue, 8 Feb 2022 21:24:41 +0100") References: <20220208202150.3CF6A82B8F@busybox.osuosl.org> Message-ID: <87czje7stg.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) writes: > commit: https://git.buildroot.net/buildroot/commit/?id=0ecfdc093227c37ed1083e43404b748e8ee8a323 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > 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 > 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 Tue Feb 22 16:47:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Feb 2022 17:47:50 +0100 Subject: [Buildroot] [git commit] package/python-pyzmq: drop python2 dependency for comment In-Reply-To: <20220209202625.6067482B8F@busybox.osuosl.org> (Yann E. MORIN's message of "Wed, 9 Feb 2022 21:31:36 +0100") References: <20220209202625.6067482B8F@busybox.osuosl.org> Message-ID: <878ru27sqx.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > commit: https://git.buildroot.net/buildroot/commit/?id=6e9ecaa0c9d9aea41212566a58ffab5e25e52bda > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > The package was updated to support python3 in commit 4a8bedc51d9 > (python-pyzmq: enable PyZMQ for Python 3), but the comment dependency was > missed. > Signed-off-by: Peter Korsgaard > Signed-off-by: Yann E. MORIN Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 22 16:45:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Feb 2022 17:45:56 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] linux/linux.mk: correct LINUX_ARCH_PATH for sparc64 Message-ID: <20220222164020.94A5F8380B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=199aa46d67c069bdbc326fcd130401ee6d3c07ec branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 0ecfdc093227c37ed1083e43404b748e8ee8a323) Signed-off-by: Peter Korsgaard --- linux/linux.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/linux/linux.mk b/linux/linux.mk index 7114c8d20c..adde7a2c1d 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -237,6 +237,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 From peter at korsgaard.com Tue Feb 22 16:42:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Feb 2022 17:42:27 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/jack1: drop celt comment Message-ID: <20220222164020.8C3D57FCA2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5ea5466832baee7444e36f4defc2444cadf97af3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Drop celt comment which is not needed since removal of celt051 in commit b32efbdb0354557db48852478b99080705ba315b Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit c6e200383cdf738f58fe1c6e42d3d5a10f7c1a62) Signed-off-by: Peter Korsgaard --- package/jack1/jack1.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/jack1/jack1.mk b/package/jack1/jack1.mk index 2f97434ebe..311f7c9ba0 100644 --- a/package/jack1/jack1.mk +++ b/package/jack1/jack1.mk @@ -11,8 +11,6 @@ JACK1_LICENSE = GPL-2.0+ (jack server), LGPL-2.1+ (jack library) JACK1_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL JACK1_INSTALL_STAGING = YES -# Dependency to celt can't be met: jack1 requires celt >= 0.8.0 but we -# only have 0.5.1.3 and we cannot upgrade. JACK1_DEPENDENCIES = host-pkgconf alsa-lib berkeleydb libsamplerate libsndfile ifeq ($(BR2_PACKAGE_READLINE),y) From peter at korsgaard.com Tue Feb 22 16:47:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Feb 2022 17:47:39 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/python-pyzmq: drop python2 dependency for comment Message-ID: <20220222164020.9CB85837EA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=674f2f0d451192ceb497f2f92bdecc67100b52d9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x The package was updated to support python3 in commit 4a8bedc51d9 (python-pyzmq: enable PyZMQ for Python 3), but the comment dependency was missed. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 6e9ecaa0c9d9aea41212566a58ffab5e25e52bda) Signed-off-by: Peter Korsgaard --- package/python-pyzmq/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/python-pyzmq/Config.in b/package/python-pyzmq/Config.in index 8f33a635c8..f8ce52f844 100644 --- a/package/python-pyzmq/Config.in +++ b/package/python-pyzmq/Config.in @@ -9,5 +9,4 @@ config BR2_PACKAGE_PYTHON_PYZMQ http://zeromq.org/bindings:python comment "python-pyzmq needs a toolchain w/ C++, threads" - depends on BR2_PACKAGE_PYTHON depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS) From peter at korsgaard.com Tue Feb 22 16:39:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Feb 2022 17:39:17 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/lm-sensors: update LM_SENSORS_VERSION Message-ID: <20220222164020.84412837EA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=64f79776487a8573192e7477b96ff95655e1a097 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Update LM_SENSORS_VERSION to make it match what is returned by https://release-monitoring.org Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 521afeab9b7c0b07a849355e8b1c1fde0965c84f) Signed-off-by: Peter Korsgaard --- package/lm-sensors/lm-sensors.hash | 2 +- package/lm-sensors/lm-sensors.mk | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/lm-sensors/lm-sensors.hash b/package/lm-sensors/lm-sensors.hash index 0ca07b7e69..c941043343 100644 --- a/package/lm-sensors/lm-sensors.hash +++ b/package/lm-sensors/lm-sensors.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 0591f9fa0339f0d15e75326d0365871c2d4e2ed8aa1ff759b3a55d3734b7d197 lm-sensors-3-6-0.tar.gz +sha256 0591f9fa0339f0d15e75326d0365871c2d4e2ed8aa1ff759b3a55d3734b7d197 lm-sensors-3.6.0.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL diff --git a/package/lm-sensors/lm-sensors.mk b/package/lm-sensors/lm-sensors.mk index 8975efaffa..1bf27fc25a 100644 --- a/package/lm-sensors/lm-sensors.mk +++ b/package/lm-sensors/lm-sensors.mk @@ -4,8 +4,9 @@ # ################################################################################ -LM_SENSORS_VERSION = 3-6-0 -LM_SENSORS_SITE = $(call github,lm-sensors,lm-sensors,V$(LM_SENSORS_VERSION)) +LM_SENSORS_VERSION = 3.6.0 +LM_SENSORS_SITE = \ + $(call github,lm-sensors,lm-sensors,V$(subst .,-,$(LM_SENSORS_VERSION))) LM_SENSORS_INSTALL_STAGING = YES LM_SENSORS_DEPENDENCIES = host-bison host-flex LM_SENSORS_LICENSE = LGPL-2.1+ (libsensors), GPL-2.0+ (programs) From peter at korsgaard.com Tue Feb 22 16:42:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Feb 2022 17:42:22 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/jack1: drop celt comment Message-ID: <20220222164312.0F9F583827@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2e2990954a6d90115eedc34e892c269f0bd6e6c8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Drop celt comment which is not needed since removal of celt051 in commit b32efbdb0354557db48852478b99080705ba315b Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit c6e200383cdf738f58fe1c6e42d3d5a10f7c1a62) Signed-off-by: Peter Korsgaard --- package/jack1/jack1.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/jack1/jack1.mk b/package/jack1/jack1.mk index 2f97434ebe..311f7c9ba0 100644 --- a/package/jack1/jack1.mk +++ b/package/jack1/jack1.mk @@ -11,8 +11,6 @@ JACK1_LICENSE = GPL-2.0+ (jack server), LGPL-2.1+ (jack library) JACK1_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL JACK1_INSTALL_STAGING = YES -# Dependency to celt can't be met: jack1 requires celt >= 0.8.0 but we -# only have 0.5.1.3 and we cannot upgrade. JACK1_DEPENDENCIES = host-pkgconf alsa-lib berkeleydb libsamplerate libsndfile ifeq ($(BR2_PACKAGE_READLINE),y) From peter at korsgaard.com Tue Feb 22 16:40:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Feb 2022 17:40:49 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/lm-sensors: update LM_SENSORS_VERSION Message-ID: <20220222164312.052F883817@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f487a0e33d3d104197c3690d0c8324122f26db91 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Update LM_SENSORS_VERSION to make it match what is returned by https://release-monitoring.org Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 521afeab9b7c0b07a849355e8b1c1fde0965c84f) Signed-off-by: Peter Korsgaard --- package/lm-sensors/lm-sensors.hash | 2 +- package/lm-sensors/lm-sensors.mk | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/lm-sensors/lm-sensors.hash b/package/lm-sensors/lm-sensors.hash index 0ca07b7e69..c941043343 100644 --- a/package/lm-sensors/lm-sensors.hash +++ b/package/lm-sensors/lm-sensors.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 0591f9fa0339f0d15e75326d0365871c2d4e2ed8aa1ff759b3a55d3734b7d197 lm-sensors-3-6-0.tar.gz +sha256 0591f9fa0339f0d15e75326d0365871c2d4e2ed8aa1ff759b3a55d3734b7d197 lm-sensors-3.6.0.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL diff --git a/package/lm-sensors/lm-sensors.mk b/package/lm-sensors/lm-sensors.mk index 8975efaffa..1bf27fc25a 100644 --- a/package/lm-sensors/lm-sensors.mk +++ b/package/lm-sensors/lm-sensors.mk @@ -4,8 +4,9 @@ # ################################################################################ -LM_SENSORS_VERSION = 3-6-0 -LM_SENSORS_SITE = $(call github,lm-sensors,lm-sensors,V$(LM_SENSORS_VERSION)) +LM_SENSORS_VERSION = 3.6.0 +LM_SENSORS_SITE = \ + $(call github,lm-sensors,lm-sensors,V$(subst .,-,$(LM_SENSORS_VERSION))) LM_SENSORS_INSTALL_STAGING = YES LM_SENSORS_DEPENDENCIES = host-bison host-flex LM_SENSORS_LICENSE = LGPL-2.1+ (libsensors), GPL-2.0+ (programs) From peter at korsgaard.com Tue Feb 22 16:46:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Feb 2022 17:46:03 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] linux/linux.mk: correct LINUX_ARCH_PATH for sparc64 Message-ID: <20220222164312.1AFF883828@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d0b10e44733bae48dcb35c388ea324750c5df8a3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 0ecfdc093227c37ed1083e43404b748e8ee8a323) Signed-off-by: Peter Korsgaard --- linux/linux.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/linux/linux.mk b/linux/linux.mk index 61fdc0c76c..b047061c3d 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -231,6 +231,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 From peter at korsgaard.com Tue Feb 22 16:47:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Feb 2022 17:47:04 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/python-pyzmq: drop python2 dependency for comment Message-ID: <20220222164312.2593083486@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=16a75a76af63147a94c7df1c38e5568eb0ab8609 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x The package was updated to support python3 in commit 4a8bedc51d9 (python-pyzmq: enable PyZMQ for Python 3), but the comment dependency was missed. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 6e9ecaa0c9d9aea41212566a58ffab5e25e52bda) Signed-off-by: Peter Korsgaard --- package/python-pyzmq/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/python-pyzmq/Config.in b/package/python-pyzmq/Config.in index 8f33a635c8..f8ce52f844 100644 --- a/package/python-pyzmq/Config.in +++ b/package/python-pyzmq/Config.in @@ -9,5 +9,4 @@ config BR2_PACKAGE_PYTHON_PYZMQ http://zeromq.org/bindings:python comment "python-pyzmq needs a toolchain w/ C++, threads" - depends on BR2_PACKAGE_PYTHON depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS) From peter at korsgaard.com Tue Feb 22 16:53:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Feb 2022 17:53:20 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libarchive: security bump to version 3.5.3 Message-ID: <20220222164534.EC45B83829@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f3da0a3fce561e961c47a436838b1ffe9ac41b5e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Libarchive 3.5.3 is a security release Security Fixes: - extended fix for following symlinks when processing the fixup list (CVE-2021-31566) - fix invalid memory access and out of bounds read in RAR5 reader (CVE-2021-36976) https://github.com/libarchive/libarchive/releases/tag/v3.5.3 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 99d3d6afe7a5df12552d0d305743f64abdd155c4) Signed-off-by: Peter Korsgaard --- package/libarchive/libarchive.hash | 2 +- package/libarchive/libarchive.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libarchive/libarchive.hash b/package/libarchive/libarchive.hash index d31e9f55f4..5dd8e5c167 100644 --- a/package/libarchive/libarchive.hash +++ b/package/libarchive/libarchive.hash @@ -1,4 +1,4 @@ # From https://www.libarchive.de/downloads/sha256sums -sha256 f0b19ff39c3c9a5898a219497ababbadab99d8178acc980155c7e1271089b5a0 libarchive-3.5.2.tar.xz +sha256 5cac725dd4be31c4a10b65d30f29dc957ea29ef3d758df6e46e8ae90a996a19a libarchive-3.5.3.tar.xz # Locally computed: sha256 b2cdf763345de2de34cebf54394df3c61a105c3b71288603c251f2fa638200ba COPYING diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk index eec256ba75..cf16c27e67 100644 --- a/package/libarchive/libarchive.mk +++ b/package/libarchive/libarchive.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBARCHIVE_VERSION = 3.5.2 +LIBARCHIVE_VERSION = 3.5.3 LIBARCHIVE_SOURCE = libarchive-$(LIBARCHIVE_VERSION).tar.xz LIBARCHIVE_SITE = https://www.libarchive.de/downloads LIBARCHIVE_INSTALL_STAGING = YES From peter at korsgaard.com Tue Feb 22 16:54:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Feb 2022 17:54:04 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/libarchive: security bump to version 3.5.3 Message-ID: <20220222164613.BBFC38382E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c61c94a84e0afeb48a9b672153bece6b49a70a28 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Libarchive 3.5.3 is a security release Security Fixes: - extended fix for following symlinks when processing the fixup list (CVE-2021-31566) - fix invalid memory access and out of bounds read in RAR5 reader (CVE-2021-36976) https://github.com/libarchive/libarchive/releases/tag/v3.5.3 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 99d3d6afe7a5df12552d0d305743f64abdd155c4) Signed-off-by: Peter Korsgaard --- package/libarchive/libarchive.hash | 2 +- package/libarchive/libarchive.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libarchive/libarchive.hash b/package/libarchive/libarchive.hash index d31e9f55f4..5dd8e5c167 100644 --- a/package/libarchive/libarchive.hash +++ b/package/libarchive/libarchive.hash @@ -1,4 +1,4 @@ # From https://www.libarchive.de/downloads/sha256sums -sha256 f0b19ff39c3c9a5898a219497ababbadab99d8178acc980155c7e1271089b5a0 libarchive-3.5.2.tar.xz +sha256 5cac725dd4be31c4a10b65d30f29dc957ea29ef3d758df6e46e8ae90a996a19a libarchive-3.5.3.tar.xz # Locally computed: sha256 b2cdf763345de2de34cebf54394df3c61a105c3b71288603c251f2fa638200ba COPYING diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk index eec256ba75..cf16c27e67 100644 --- a/package/libarchive/libarchive.mk +++ b/package/libarchive/libarchive.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBARCHIVE_VERSION = 3.5.2 +LIBARCHIVE_VERSION = 3.5.3 LIBARCHIVE_SOURCE = libarchive-$(LIBARCHIVE_VERSION).tar.xz LIBARCHIVE_SITE = https://www.libarchive.de/downloads LIBARCHIVE_INSTALL_STAGING = YES From peter at korsgaard.com Tue Feb 22 16:54:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Feb 2022 17:54:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/libarchive: security bump to version 3.5.3 In-Reply-To: <20220209193614.330861-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 9 Feb 2022 20:36:14 +0100") References: <20220209193614.330861-1-fontaine.fabrice@gmail.com> Message-ID: <874k4q7sgd.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Libarchive 3.5.3 is a security release > Security Fixes: > - extended fix for following symlinks when processing the fixup list > (CVE-2021-31566) > - fix invalid memory access and out of bounds read in RAR5 reader > (CVE-2021-36976) > https://github.com/libarchive/libarchive/releases/tag/v3.5.3 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 22 16:55:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Feb 2022 17:55:08 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gauche: drop autoreconf Message-ID: <20220222164718.9944183831@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2521b5bbb9e0e07ef0ae906f710af5044ae13df6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Commit 11cb72be570409be77d4bb49c17b4a2feef31be7 forgot to drop autoreconf Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 5f703276e0713b746f2c937c4c4fc02ef6ad1d77) Signed-off-by: Peter Korsgaard --- package/gauche/gauche.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/gauche/gauche.mk b/package/gauche/gauche.mk index 2520379369..fe0a613a9d 100644 --- a/package/gauche/gauche.mk +++ b/package/gauche/gauche.mk @@ -10,8 +10,6 @@ GAUCHE_SITE = http://downloads.sourceforge.net/project/gauche/Gauche GAUCHE_LICENSE = BSD-3-Clause, Boehm-gc, SRFI (srfi-11.scm), reload (reload.scm) GAUCHE_LICENSE_FILES = COPYING GAUCHE_DEPENDENCIES = host-gauche -# We're patching configure.ac -GAUCHE_AUTORECONF = YES HOST_GAUCHE_CONF_OPTS = --without-zlib GAUCHE_CONF_OPTS = --without-libatomic-ops From peter at korsgaard.com Tue Feb 22 16:55:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Feb 2022 17:55:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/gauche: drop autoreconf In-Reply-To: <20220209201444.352250-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 9 Feb 2022 21:14:44 +0100") References: <20220209201444.352250-1-fontaine.fabrice@gmail.com> Message-ID: <87zgmi6dtv.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Commit 11cb72be570409be77d4bb49c17b4a2feef31be7 forgot to drop > autoreconf > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Tue Feb 22 17:49:57 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 22 Feb 2022 18:49:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pycli: drop package Message-ID: <20220222174957.3086493-1-fontaine.fabrice@gmail.com> Even with the two upstream patches added in commit b2e6e376a2d7551ccf146855ec4e99a65c35bd16, python-pycli still raises the following build failure since bump of python3 to version 3.10.1 in commit 25b1fc2898d68ddf2674b14c738045875fc5a2dc due to the new "Multiple Exception types without parentheses" exception (https://docs.python.org/3/whatsnew/3.10.html): error: File "/usr/lib/python3.10/site-packages/cli/test.py", line 142 except raises, e: ^^^^^^^^^ SyntaxError: multiple exception types must be parenthesized So drop the package as the last release was made 10 years ago. Fixes: - http://autobuild.buildroot.org/results/6112e1830ce608abcea4a26b659c10e5ff09a66a Signed-off-by: Fabrice Fontaine --- Config.in.legacy | 7 ++++ DEVELOPERS | 1 - package/Config.in | 1 - ...aise-exceptions-in-wrapped-functions.patch | 26 ------------ ...pt-statement-changed-slightly-in-2-6.patch | 41 ------------------- package/python-pycli/Config.in | 7 ---- package/python-pycli/python-pycli.hash | 5 --- package/python-pycli/python-pycli.mk | 14 ------- 8 files changed, 7 insertions(+), 95 deletions(-) delete mode 100644 package/python-pycli/0001-Fix-problem-with-re-raise-exceptions-in-wrapped-functions.patch delete mode 100644 package/python-pycli/0002-except-statement-changed-slightly-in-2-6.patch delete mode 100644 package/python-pycli/Config.in delete mode 100644 package/python-pycli/python-pycli.hash delete mode 100644 package/python-pycli/python-pycli.mk diff --git a/Config.in.legacy b/Config.in.legacy index aefb0ba6ea..99459c7ad3 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_PYCLI + bool "python-pycli removed" + select BR2_LEGACY + help + Package was removed because it is not compatible with python + 3.10 and is not maintained anymore (no release since 2012). + config BR2_PACKAGE_LINUX_TOOLS_BPFTOOL bool "bpftool was moved" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 3e7c753836..6208df974d 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1065,7 +1065,6 @@ N: Geoff Levand F: package/flannel/ N: Geoffrey Ragot -F: package/python-pycli/ F: package/python-pyyaml/ N: Gerome Burlats diff --git a/package/Config.in b/package/Config.in index 3213c4a9b4..ed7d9555b2 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1144,7 +1144,6 @@ menu "External python modules" source "package/python-pybind/Config.in" source "package/python-pycairo/Config.in" source "package/python-pycares/Config.in" - source "package/python-pycli/Config.in" source "package/python-pycparser/Config.in" source "package/python-pycryptodomex/Config.in" source "package/python-pycups/Config.in" diff --git a/package/python-pycli/0001-Fix-problem-with-re-raise-exceptions-in-wrapped-functions.patch b/package/python-pycli/0001-Fix-problem-with-re-raise-exceptions-in-wrapped-functions.patch deleted file mode 100644 index 7ac9d7af9f..0000000000 --- a/package/python-pycli/0001-Fix-problem-with-re-raise-exceptions-in-wrapped-functions.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 57c563f8b47a56feefc0a8bcbef05f4b54280549 Mon Sep 17 00:00:00 2001 -From: mmbutter -Date: Tue, 9 Jun 2020 11:50:41 -0500 -Subject: [PATCH] Fix problem with re-raise exceptions in wrapped functions. - -[Retrieved from: -https://github.com/whilp/cli/commit/57c563f8b47a56feefc0a8bcbef05f4b54280549] -Signed-off-by: Fabrice Fontaine ---- - lib/cli/app.py | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/lib/cli/app.py b/lib/cli/app.py -index 7b6db52..f487ab4 100644 ---- a/lib/cli/app.py -+++ b/lib/cli/app.py -@@ -240,6 +240,9 @@ def run(self): - try: - returned = self.main(*args) - except Exception, e: -+ elif isinstance(e, self.reraise): -+ # raising the last exception preserves traceback -+ raise - returned = e - - return self.post_run(returned) diff --git a/package/python-pycli/0002-except-statement-changed-slightly-in-2-6.patch b/package/python-pycli/0002-except-statement-changed-slightly-in-2-6.patch deleted file mode 100644 index 75869d6d23..0000000000 --- a/package/python-pycli/0002-except-statement-changed-slightly-in-2-6.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 2af95cff5609142ec14efdf13b394f9b0121ab2e Mon Sep 17 00:00:00 2001 -From: mmbutter -Date: Thu, 11 Jun 2020 15:50:03 -0500 -Subject: [PATCH] except statement changed slightly in 2.6. This could cause - problems in newer versions. Updated to the new format. - -[Retrieved from: -https://github.com/whilp/cli/commit/2af95cff5609142ec14efdf13b394f9b0121ab2e] -Signed-off-by: Fabrice Fontaine ---- - lib/cli/app.py | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/lib/cli/app.py b/lib/cli/app.py -index f487ab4..45256b8 100644 ---- a/lib/cli/app.py -+++ b/lib/cli/app.py -@@ -239,10 +239,10 @@ def run(self): - args = () - try: - returned = self.main(*args) -- except Exception, e: -- elif isinstance(e, self.reraise): -- # raising the last exception preserves traceback -- raise -+ except self.reraise: -+ # raising the last exception preserves traceback -+ raise -+ except Exception as e: - returned = e - - return self.post_run(returned) -@@ -420,7 +420,7 @@ def pre_run(self): - """ - try: - ns = self.argparser.parse_args() -- except SystemExit, e: -+ except SystemExit as e: - if self.exit_after_main: - raise - else: diff --git a/package/python-pycli/Config.in b/package/python-pycli/Config.in deleted file mode 100644 index e1ce3b99a6..0000000000 --- a/package/python-pycli/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYCLI - bool "python-pycli" - help - The cli package is a framework for making simple, correct - command line applications in Python. - - https://pythonhosted.org/pyCLI/ diff --git a/package/python-pycli/python-pycli.hash b/package/python-pycli/python-pycli.hash deleted file mode 100644 index f0890e83a9..0000000000 --- a/package/python-pycli/python-pycli.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5 from https://pypi.python.org/pypi/pycli/json -md5 89c487e7c8068ce05d63394d2ae7ebad pyCLI-2.0.3.tar.gz -# Locally computed -sha256 bc53e6c5db031ae1c05d131641f153d22a201c5e82cc8c9324a945752efbb622 pyCLI-2.0.3.tar.gz -sha256 591490b2ef462a4ad2be1aae5dd47738cb17e191c82d3ba38c3ae906d288e6ba lib/cli/__init__.py diff --git a/package/python-pycli/python-pycli.mk b/package/python-pycli/python-pycli.mk deleted file mode 100644 index 7aff1c6200..0000000000 --- a/package/python-pycli/python-pycli.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-pycli -# -################################################################################ - -PYTHON_PYCLI_VERSION = 2.0.3 -PYTHON_PYCLI_SOURCE = pyCLI-$(PYTHON_PYCLI_VERSION).tar.gz -PYTHON_PYCLI_SITE = https://pypi.python.org/packages/95/fc/b2d86a5fbdac4072bcf70b01674b612e1a13026f54962c878fe3eca36fd1 -PYTHON_PYCLI_LICENSE = ISC-like -PYTHON_PYCLI_LICENSE_FILES = lib/cli/__init__.py -PYTHON_PYCLI_SETUP_TYPE = setuptools - -$(eval $(python-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Tue Feb 22 17:52:26 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 22 Feb 2022 18:52:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/sconeserver: fix build with gcc 4.8 Message-ID: <20220222175226.3086883-1-fontaine.fabrice@gmail.com> Fix the following build failure with gcc 4.8 raised since the addition of -std=c++11 in commit b9eca021594470341bec2876edc0a27251f3f9b2: sconex.cpp: In function 'scx::Date& scx::build_time()': sconex.cpp:52:36: error: unable to find string literal operator 'operator"" __TIME__' static Date s_build_time(__DATE__" "__TIME__,true); ^ Fixes: - http://autobuild.buildroot.org/results/83ecf772965b4586eaea2682871a85732df7d62f Signed-off-by: Fabrice Fontaine --- package/sconeserver/0002-CMake-ify.patch | 173 +++++++++++++++++++++++ 1 file changed, 173 insertions(+) create mode 100644 package/sconeserver/0002-CMake-ify.patch diff --git a/package/sconeserver/0002-CMake-ify.patch b/package/sconeserver/0002-CMake-ify.patch new file mode 100644 index 0000000000..810c803469 --- /dev/null +++ b/package/sconeserver/0002-CMake-ify.patch @@ -0,0 +1,173 @@ +From 0cb655721d7f8aa5d6d14fc1dfce18c518ce2419 Mon Sep 17 00:00:00 2001 +From: Andrew Wedgbury +Date: Mon, 19 Aug 2019 21:12:59 +0000 +Subject: [PATCH] CMake-ify + +[Retrieve (and updated to only keep fix on sconex.cpp) from: +https://github.com/sconemad/sconeserver/commit/0cb655721d7f8aa5d6d14fc1dfce18c518ce2419] +Signed-off-by: Fabrice Fontaine +--- + .gitignore | 5 + + CMakeLists.txt | 52 ++++ + Makefile.am | 58 ---- + autogen.sh | 8 - + bluetooth/CMakeLists.txt | 16 + + bluetooth/Makefile.am | 22 -- + config.h.in | 335 +-------------------- + configure.in | 451 ---------------------------- + debian/rules | 10 +- + debian/sconeserver-base.install | 2 +- + debian/sconeserver-dev.install | 4 +- + examples/Makefile.am | 4 - + examples/rot13/CMakeLists.txt | 9 + + examples/rot13/Makefile.am | 24 -- + examples/tuesdayonly/CMakeLists.txt | 7 + + examples/tuesdayonly/Makefile.am | 18 -- + exec/CMakeLists.txt | 9 + + exec/Makefile.am | 24 -- + forward/CMakeLists.txt | 8 + + forward/Makefile.am | 19 -- + http/CMakeLists.txt | 51 ++++ + http/Makefile.am | 58 ---- + image/CMakeLists.txt | 12 + + image/Makefile.am | 20 -- + ip/CMakeLists.txt | 9 + + ip/Makefile.am | 21 -- + ip6/CMakeLists.txt | 9 + + ip6/Makefile.am | 21 -- + local/CMakeLists.txt | 9 + + local/Makefile.am | 21 -- + location/CMakeLists.txt | 11 + + location/Makefile.am | 18 -- + main.cpp | 4 +- + markdown/CMakeLists.txt | 20 ++ + markdown/Makefile.am | 21 -- + maths/CMakeLists.txt | 32 ++ + maths/Makefile.am | 33 -- + mime/CMakeLists.txt | 8 + + mime/Makefile.am | 19 -- + mysql/CMakeLists.txt | 16 + + mysql/Makefile.am | 25 -- + rss/CMakeLists.txt | 15 + + rss/Makefile.am | 23 -- + sconeserver.cmake | 31 ++ + sconesite/CMakeLists.txt | 42 +++ + sconesite/Makefile.am | 79 ----- + sconex/Base64.cpp | 2 +- + sconex/CMakeLists.txt | 97 ++++++ + sconex/Database.cpp | 2 +- + sconex/FileDir.h | 4 +- + sconex/Makefile.am | 156 ---------- + sconex/ModuleLoader.cpp | 2 +- + sconex/Process.cpp | 8 - + sconex/RegExp.cpp | 4 - + sconex/RegExp.h | 4 +- + sconex/ScriptContext.cpp | 7 +- + sconex/ScriptTypes.cpp | 2 +- + sconex/TermBuffer.cpp | 7 +- + sconex/sconex.cpp | 4 +- + sconex/sconex.h | 176 +++-------- + sconex/utils.cpp | 4 - + server/CMakeLists.txt | 19 ++ + server/Makefile.am | 26 -- + simple/CMakeLists.txt | 15 + + simple/Makefile.am | 21 -- + smtp/CMakeLists.txt | 15 + + smtp/Makefile.am | 21 -- + sqlite/CMakeLists.txt | 23 ++ + sqlite/Makefile.am | 25 -- + ssl/CMakeLists.txt | 23 ++ + ssl/Makefile.am | 30 -- + stat/CMakeLists.txt | 17 ++ + stat/Makefile.am | 23 -- + test/CMakeLists.txt | 13 + + test/Makefile.am | 53 ---- + testbuilder/CMakeLists.txt | 23 ++ + testbuilder/Makefile.am | 36 --- + tftp/CMakeLists.txt | 17 ++ + tftp/Makefile.am | 23 -- + upstart | 13 - + 80 files changed, 695 insertions(+), 1933 deletions(-) + create mode 100644 CMakeLists.txt + delete mode 100644 Makefile.am + delete mode 100755 autogen.sh + create mode 100644 bluetooth/CMakeLists.txt + delete mode 100644 bluetooth/Makefile.am + delete mode 100644 configure.in + delete mode 100644 examples/Makefile.am + create mode 100644 examples/rot13/CMakeLists.txt + delete mode 100644 examples/rot13/Makefile.am + create mode 100644 examples/tuesdayonly/CMakeLists.txt + delete mode 100644 examples/tuesdayonly/Makefile.am + create mode 100644 exec/CMakeLists.txt + delete mode 100644 exec/Makefile.am + create mode 100644 forward/CMakeLists.txt + delete mode 100644 forward/Makefile.am + create mode 100644 http/CMakeLists.txt + delete mode 100644 http/Makefile.am + create mode 100644 image/CMakeLists.txt + delete mode 100644 image/Makefile.am + create mode 100644 ip/CMakeLists.txt + delete mode 100644 ip/Makefile.am + create mode 100644 ip6/CMakeLists.txt + delete mode 100644 ip6/Makefile.am + create mode 100644 local/CMakeLists.txt + delete mode 100644 local/Makefile.am + create mode 100644 location/CMakeLists.txt + delete mode 100644 location/Makefile.am + create mode 100644 markdown/CMakeLists.txt + delete mode 100644 markdown/Makefile.am + create mode 100644 maths/CMakeLists.txt + delete mode 100644 maths/Makefile.am + create mode 100644 mime/CMakeLists.txt + delete mode 100644 mime/Makefile.am + create mode 100644 mysql/CMakeLists.txt + delete mode 100644 mysql/Makefile.am + create mode 100644 rss/CMakeLists.txt + delete mode 100644 rss/Makefile.am + create mode 100644 sconeserver.cmake + create mode 100644 sconesite/CMakeLists.txt + delete mode 100644 sconesite/Makefile.am + create mode 100644 sconex/CMakeLists.txt + delete mode 100644 sconex/Makefile.am + create mode 100644 server/CMakeLists.txt + delete mode 100644 server/Makefile.am + create mode 100644 simple/CMakeLists.txt + delete mode 100644 simple/Makefile.am + create mode 100644 smtp/CMakeLists.txt + delete mode 100644 smtp/Makefile.am + create mode 100644 sqlite/CMakeLists.txt + delete mode 100644 sqlite/Makefile.am + create mode 100644 ssl/CMakeLists.txt + delete mode 100644 ssl/Makefile.am + create mode 100644 stat/CMakeLists.txt + delete mode 100644 stat/Makefile.am + create mode 100644 test/CMakeLists.txt + delete mode 100644 test/Makefile.am + create mode 100644 testbuilder/CMakeLists.txt + delete mode 100644 testbuilder/Makefile.am + create mode 100644 tftp/CMakeLists.txt + delete mode 100644 tftp/Makefile.am + delete mode 100644 upstart + +diff --git a/sconex/sconex.cpp b/sconex/sconex.cpp +index 1b9fc97..a0ba8c1 100644 +--- a/sconex/sconex.cpp ++++ b/sconex/sconex.cpp +@@ -35,7 +35,7 @@ VersionTag& version() + const std::string& sconex_copyright() + { + static std::string s_copyright = +- "Copyright (c) 2000-2017 Andrew Wedgbury "; ++ "Copyright (c) 2000-2018 Andrew Wedgbury "; + return s_copyright; + } + +@@ -49,7 +49,7 @@ const std::string& build_type() + //========================================================================= + Date& build_time() + { +- static Date s_build_time(__DATE__" "__TIME__,true); ++ static Date s_build_time( __DATE__ " " __TIME__ ,true); + return s_build_time; + } -- 2.34.1 From fperrad at gmail.com Mon Feb 21 04:30:31 2022 From: fperrad at gmail.com (Francois Perrad) Date: Mon, 21 Feb 2022 05:30:31 +0100 Subject: [Buildroot] [PATCH 0/3] portable services: another use case of BR Message-ID: <20220221043034.2736010-1-francois.perrad@gadz.org> This series allows to build a rootfs suitable for portable services with systemd. A new value of "Init system" is introduced : BR2_INIT_PORTABLE. BR2_INIT_PORTABLE is like BR2_INIT_NONE, but with all FOO_INSTALL_INIT_SYSTEMD executed. A new type of skeleton is required : BR2_PACKAGE_SKELETON_INIT_PORTABLE. see https://systemd.io/PORTABLE_SERVICES/ Francois Perrad (3): package/skeleton-init-portable: new skeleton portable: new init system portable: tweak some default values DEVELOPERS | 1 + fs/squashfs/Config.in | 1 + package/Config.in | 1 + package/ifupdown-scripts/Config.in | 2 +- package/pkg-generic.mk | 2 ++ package/skeleton-init-portable/Config.in | 7 ++++++ .../skeleton-init-portable.mk | 23 +++++++++++++++++++ system/Config.in | 18 +++++++++++---- 8 files changed, 50 insertions(+), 5 deletions(-) create mode 100644 package/skeleton-init-portable/Config.in create mode 100644 package/skeleton-init-portable/skeleton-init-portable.mk -- 2.32.0 From fperrad at gmail.com Mon Feb 21 04:30:32 2022 From: fperrad at gmail.com (Francois Perrad) Date: Mon, 21 Feb 2022 05:30:32 +0100 Subject: [Buildroot] [PATCH 1/3] package/skeleton-init-portable: new skeleton In-Reply-To: <20220221043034.2736010-1-francois.perrad@gadz.org> References: <20220221043034.2736010-1-francois.perrad@gadz.org> Message-ID: <20220221043034.2736010-2-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- DEVELOPERS | 1 + package/Config.in | 1 + package/skeleton-init-portable/Config.in | 7 ++++++ .../skeleton-init-portable.mk | 23 +++++++++++++++++++ 4 files changed, 32 insertions(+) create mode 100644 package/skeleton-init-portable/Config.in create mode 100644 package/skeleton-init-portable/skeleton-init-portable.mk diff --git a/DEVELOPERS b/DEVELOPERS index ac702d8d0..7cafd6c95 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1010,6 +1010,7 @@ F: package/pkg-perl.mk F: package/pkg-luarocks.mk F: package/quickjs/ F: package/rings/ +F: package/skeleton-init-portable F: package/tekui/ F: package/wpebackend-fdo/ F: package/wpewebkit/ diff --git a/package/Config.in b/package/Config.in index 10209d84d..0b947f682 100644 --- a/package/Config.in +++ b/package/Config.in @@ -6,6 +6,7 @@ menu "Target packages" source "package/skeleton-init-common/Config.in" source "package/skeleton-init-none/Config.in" source "package/skeleton-init-openrc/Config.in" + source "package/skeleton-init-portable/Config.in" source "package/skeleton-init-systemd/Config.in" source "package/skeleton-init-sysv/Config.in" diff --git a/package/skeleton-init-portable/Config.in b/package/skeleton-init-portable/Config.in new file mode 100644 index 000000000..ca434451c --- /dev/null +++ b/package/skeleton-init-portable/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_SKELETON_INIT_PORTABLE + bool + select BR2_PACKAGE_HAS_SKELETON + select BR2_PACKAGE_SKELETON_INIT_COMMON + +config BR2_PACKAGE_PROVIDES_SKELETON + default "skeleton-init-portable" if BR2_PACKAGE_SKELETON_INIT_PORTABLE diff --git a/package/skeleton-init-portable/skeleton-init-portable.mk b/package/skeleton-init-portable/skeleton-init-portable.mk new file mode 100644 index 000000000..8174a5d82 --- /dev/null +++ b/package/skeleton-init-portable/skeleton-init-portable.mk @@ -0,0 +1,23 @@ +################################################################################ +# +# skeleton-init-portable +# +################################################################################ + +# The skeleton can't depend on the toolchain, since all packages depends on the +# skeleton and the toolchain is a target package, as is skeleton. +# Hence, skeleton would depends on the toolchain and the toolchain would depend +# on skeleton. +SKELETON_INIT_PORTABLE_ADD_TOOLCHAIN_DEPENDENCY = NO +SKELETON_INIT_PORTABLE_ADD_SKELETON_DEPENDENCY = NO + +SKELETON_INIT_PORTABLE_DEPENDENCIES = skeleton-init-common + +SKELETON_INIT_PORTABLE_PROVIDES = skeleton + +define SKELETON_INIT_PORTABLE_INSTALL_TARGET_CMDS + touch $(TARGET_DIR)/etc/machine-id + mkdir -p $(TARGET_DIR)/var/tmp +endef + +$(eval $(generic-package)) -- 2.32.0 From fperrad at gmail.com Mon Feb 21 04:30:33 2022 From: fperrad at gmail.com (Francois Perrad) Date: Mon, 21 Feb 2022 05:30:33 +0100 Subject: [Buildroot] [PATCH 2/3] portable: new init system In-Reply-To: <20220221043034.2736010-1-francois.perrad@gadz.org> References: <20220221043034.2736010-1-francois.perrad@gadz.org> Message-ID: <20220221043034.2736010-3-francois.perrad@gadz.org> see https://systemd.io/PORTABLE_SERVICES/ Signed-off-by: Francois Perrad --- package/pkg-generic.mk | 2 ++ system/Config.in | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index b3a7e1d60..e62e7aada 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -383,6 +383,8 @@ $(BUILD_DIR)/%/.stamp_target_installed: +$($(PKG)_INSTALL_TARGET_CMDS) $(if $(BR2_INIT_SYSTEMD),\ $($(PKG)_INSTALL_INIT_SYSTEMD)) + $(if $(BR2_INIT_PORTABLE),\ + $($(PKG)_INSTALL_INIT_SYSTEMD)) $(if $(BR2_INIT_SYSV)$(BR2_INIT_BUSYBOX),\ $($(PKG)_INSTALL_INIT_SYSV)) $(if $(BR2_INIT_OPENRC), \ diff --git a/system/Config.in b/system/Config.in index a4ffbfa18..e71e57915 100644 --- a/system/Config.in +++ b/system/Config.in @@ -141,6 +141,15 @@ comment "systemd needs a glibc toolchain w/ SSP, headers >= 3.10, host and targe !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \ !BR2_HOST_GCC_AT_LEAST_5 +config BR2_INIT_PORTABLE + bool "portable" + select BR2_ROOTFS_MERGED_USR + select BR2_PACKAGE_SKELETON_INIT_PORTABLE if BR2_ROOTFS_SKELETON_DEFAULT + help + portable services with systemd + + https://systemd.io/PORTABLE_SERVICES/ + config BR2_INIT_NONE bool "None" select BR2_PACKAGE_SKELETON_INIT_NONE if BR2_ROOTFS_SKELETON_DEFAULT -- 2.32.0 From fperrad at gmail.com Mon Feb 21 04:30:34 2022 From: fperrad at gmail.com (Francois Perrad) Date: Mon, 21 Feb 2022 05:30:34 +0100 Subject: [Buildroot] [PATCH 3/3] portable: tweak some default values In-Reply-To: <20220221043034.2736010-1-francois.perrad@gadz.org> References: <20220221043034.2736010-1-francois.perrad@gadz.org> Message-ID: <20220221043034.2736010-4-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- fs/squashfs/Config.in | 1 + package/ifupdown-scripts/Config.in | 2 +- system/Config.in | 9 +++++---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/fs/squashfs/Config.in b/fs/squashfs/Config.in index 70d4a20cf..ad27470aa 100644 --- a/fs/squashfs/Config.in +++ b/fs/squashfs/Config.in @@ -1,5 +1,6 @@ config BR2_TARGET_ROOTFS_SQUASHFS bool "squashfs root filesystem" + default y if BR2_INIT_PORTABLE help Build a squashfs root filesystem diff --git a/package/ifupdown-scripts/Config.in b/package/ifupdown-scripts/Config.in index 166094c51..1607fa696 100644 --- a/package/ifupdown-scripts/Config.in +++ b/package/ifupdown-scripts/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_IFUPDOWN_SCRIPTS bool "ifupdown scripts" - default y if BR2_ROOTFS_SKELETON_DEFAULT + default y if BR2_ROOTFS_SKELETON_DEFAULT && !BR2_PACKAGE_SKELETON_INIT_PORTABLE depends on !BR2_PACKAGE_SYSTEMD_NETWORKD && !BR2_PACKAGE_NETIFRC help Set of scripts used by ifupdown (either the standalone one, diff --git a/system/Config.in b/system/Config.in index e71e57915..3e90e94cd 100644 --- a/system/Config.in +++ b/system/Config.in @@ -238,7 +238,7 @@ if BR2_ROOTFS_SKELETON_DEFAULT config BR2_TARGET_ENABLE_ROOT_LOGIN bool "Enable root login with password" - default y + default y if !BR2_INIT_PORTABLE select BR2_PACKAGE_HOST_MKPASSWD if BR2_TARGET_GENERIC_ROOT_PASSWD != "" help Allow root to log in with a password. @@ -280,7 +280,8 @@ config BR2_TARGET_GENERIC_ROOT_PASSWD choice bool "/bin/sh" - default BR2_SYSTEM_BIN_SH_DASH if !BR2_PACKAGE_BUSYBOX + default BR2_SYSTEM_BIN_SH_DASH if !BR2_PACKAGE_BUSYBOX && !BR2_INIT_PORTABLE + default BR2_SYSTEM_BIN_SH_NONE if BR2_INIT_PORTABLE help Select which shell will provide /bin/sh. @@ -330,7 +331,7 @@ config BR2_SYSTEM_BIN_SH menuconfig BR2_TARGET_GENERIC_GETTY bool "Run a getty (login prompt) after boot" - default y + default y if !BR2_INIT_PORTABLE if BR2_TARGET_GENERIC_GETTY config BR2_TARGET_GENERIC_GETTY_PORT @@ -388,7 +389,7 @@ endif config BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW bool "remount root filesystem read-write during boot" - default y + default y if !BR2_INIT_PORTABLE help The root filesystem is typically mounted read-only at boot. By default, buildroot remounts it in read-write mode early -- 2.32.0 From ju.o at free.fr Tue Feb 22 18:52:06 2022 From: ju.o at free.fr (Julien Olivain) Date: Tue, 22 Feb 2022 19:52:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-distro: bump to version 1.7.0 Message-ID: <20220222185206.230318-1-ju.o@free.fr> For change log since 1.6.0, see: - https://github.com/python-distro/distro/releases/tag/v1.7.0 Signed-off-by: Julien Olivain --- Tested with: support/testing/run-tests \ -d dl -o output_folder -k \ tests.package.test_python_distro.TestPythonPy3Distro --- package/python-distro/python-distro.hash | 2 +- package/python-distro/python-distro.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-distro/python-distro.hash b/package/python-distro/python-distro.hash index e2b3c0a444..8f09197156 100644 --- a/package/python-distro/python-distro.hash +++ b/package/python-distro/python-distro.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 83f5e5a09f9c5f68f60173de572930effbcc0287bb84fdc4426cb4168c088424 distro-1.6.0.tar.gz +sha256 151aeccf60c216402932b52e40ee477a939f8d58898927378a02abbe852c1c39 distro-1.7.0.tar.gz sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE diff --git a/package/python-distro/python-distro.mk b/package/python-distro/python-distro.mk index 753e74d020..c69849b7ac 100644 --- a/package/python-distro/python-distro.mk +++ b/package/python-distro/python-distro.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_DISTRO_VERSION = 1.6.0 -PYTHON_DISTRO_SITE = https://files.pythonhosted.org/packages/a5/26/256fa167fe1bf8b97130b4609464be20331af8a3af190fb636a8a7efd7a2 +PYTHON_DISTRO_VERSION = 1.7.0 +PYTHON_DISTRO_SITE = https://files.pythonhosted.org/packages/b5/7e/ddfbd640ac9a82e60718558a3de7d5988a7d4648385cf00318f60a8b073a PYTHON_DISTRO_SOURCE = distro-$(PYTHON_DISTRO_VERSION).tar.gz PYTHON_DISTRO_LICENSE = Apache-2.0 PYTHON_DISTRO_LICENSE_FILES = LICENSE -- 2.35.1 From petr.vorel at gmail.com Tue Feb 22 19:29:05 2022 From: petr.vorel at gmail.com (Petr Vorel) Date: Tue, 22 Feb 2022 20:29:05 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/modem-manager: bump version to 1.18.6 Message-ID: <20220222192905.20456-1-petr.vorel@gmail.com> Signed-off-by: Petr Vorel --- Changes v1->v2: * fix version in commit message subject (Yegor Yefremov) package/modem-manager/modem-manager.hash | 2 +- package/modem-manager/modem-manager.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/modem-manager/modem-manager.hash b/package/modem-manager/modem-manager.hash index 14597215df..ea91f42fe0 100644 --- a/package/modem-manager/modem-manager.hash +++ b/package/modem-manager/modem-manager.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 2ccf1f716c2d121e8e6709bcf8af29ee86971a90adacca2e8d6288b30278862e ModemManager-1.16.10.tar.xz +sha256 d4f804b31cf504239c5f1d4973c62095c00cba1ee9abb503718dac6d146a470a ModemManager-1.18.6.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk index a881edc272..d7e2c55bf8 100644 --- a/package/modem-manager/modem-manager.mk +++ b/package/modem-manager/modem-manager.mk @@ -4,7 +4,7 @@ # ################################################################################ -MODEM_MANAGER_VERSION = 1.16.10 +MODEM_MANAGER_VERSION = 1.18.6 MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.xz MODEM_MANAGER_SITE = http://www.freedesktop.org/software/ModemManager MODEM_MANAGER_LICENSE = GPL-2.0+ (programs, plugins), LGPL-2.0+ (libmm-glib) -- 2.35.1 From Alexey.Brodkin at synopsys.com Tue Feb 22 19:58:54 2022 From: Alexey.Brodkin at synopsys.com (Alexey Brodkin) Date: Tue, 22 Feb 2022 22:58:54 +0300 Subject: [Buildroot] [PATCH] package/qt5/qt5webkit: needs OpenSSL Message-ID: <20220222195854.11842-1-abrodkin@synopsys.com> W/o OpenSSL QT5Webkit fails to build that way: -------------------------------->8----------------------------- .../build/qt5webkit-5.212.0-alpha4/Source/WebCore/platform/network/qt/ResourceRequestQt.cpp: In static member function ?static bool WebCore::ResourceRequest::alpnIsSupported()?: .../build/qt5webkit-5.212.0-alpha4/Source/WebCore/platform/network/qt/ResourceRequestQt.cpp:68:12: error: ?QSslSocket? has not been declared 68 | return QSslSocket::sslLibraryVersionNumber() > 0x10002000L && | ^~~~~~~~~~ .../build/qt5webkit-5.212.0-alpha4/Source/WebCore/platform/network/qt/ResourceRequestQt.cpp:69:9: error: ?QSslSocket? has not been declared 69 | QSslSocket::sslLibraryVersionString().startsWith(QLatin1String("OpenSSL")); | ^~~~~~~~~~ -------------------------------->8----------------------------- Signed-off-by: Alexey Brodkin Cc: Fabrice Fontaine Cc: James Hilliard Cc: Peter Seiderer Cc: Yann E. MORIN --- 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 ed87efca95..26c3897d1d 100644 --- a/package/qt5/qt5webkit/Config.in +++ b/package/qt5/qt5webkit/Config.in @@ -15,6 +15,7 @@ config BR2_PACKAGE_QT5WEBKIT select BR2_PACKAGE_JPEG select BR2_PACKAGE_LEVELDB select BR2_PACKAGE_LIBPNG + select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_QT5BASE_ICU select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_QT5BASE_WIDGETS -- 2.25.1 From fontaine.fabrice at gmail.com Tue Feb 22 20:14:18 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 22 Feb 2022 21:14:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5webkit: disable JIT with mips32r6 Message-ID: <20220222201418.3087618-1-fontaine.fabrice@gmail.com> Disable JIT with mips32r6 to avoid the following build failure raised since bump to version 5.212.0-alpha4 in commit df0b0fe6919c0d0f3750f439a3cfa765232bd569: /tmp/ccHw2rHQ.s:18: Error: opcode not supported on this processor: mips32r6 (mips32r6) `addi $a0,$sp,-8' Fixes: - http://autobuild.buildroot.org/results/5191600b463cda078203eeffae880ed989f8ac0f Signed-off-by: Fabrice Fontaine --- package/qt5/qt5webkit/qt5webkit.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk index 2e96acc00f..6f8714140a 100644 --- a/package/qt5/qt5webkit/qt5webkit.mk +++ b/package/qt5/qt5webkit/qt5webkit.mk @@ -20,6 +20,10 @@ QT5WEBKIT_LICENSE = LGPL-2.1+, BSD-3-Clause, BSD-2-Clause # in the archive. QT5WEBKIT_LICENSE_FILES += LICENSE.LGPLv21 +ifeq ($(BR2_MIPS_CPU_MIPS32R6),y) +QT5WEBKIT_CONF_OPTS += -DENABLE_JIT=OFF +endif + ifeq ($(BR2_PACKAGE_QT5BASE_OPENGL),y) QT5WEBKIT_CONF_OPTS += \ -DENABLE_OPENGL=ON \ -- 2.34.1 From fontaine.fabrice at gmail.com Tue Feb 22 20:37:46 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 22 Feb 2022 21:37:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/sord: fix build without threads Message-ID: <20220222203746.3139075-1-fontaine.fabrice@gmail.com> Fix the following build failure without threads raised since the addition of the package in commit 0d4c8ce8a2f26989e0e2d95b977d60e450c090a9: /home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: cannot find -lpthread Fixes: - http://autobuild.buildroot.org/results/170d0114987b39a2b9ea173df7a5e806bd270fd8 Signed-off-by: Fabrice Fontaine --- .../0001-wscript-add-no-threads-option.patch | 59 +++++++++++++++++++ package/sord/sord.mk | 4 ++ 2 files changed, 63 insertions(+) create mode 100644 package/sord/0001-wscript-add-no-threads-option.patch diff --git a/package/sord/0001-wscript-add-no-threads-option.patch b/package/sord/0001-wscript-add-no-threads-option.patch new file mode 100644 index 0000000000..750ea8f4ad --- /dev/null +++ b/package/sord/0001-wscript-add-no-threads-option.patch @@ -0,0 +1,59 @@ +From 82ab045a45c06187dca5e9d2a9a4003fcfbfa830 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 22 Feb 2022 21:22:31 +0100 +Subject: [PATCH] wscript: add -no-threads option + +Add -no-threads options to avoid the following build failure on embedded +toolchains without threads support: + +/home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: cannot find -lpthread + +Fixes: + - http://autobuild.buildroot.org/results/170d0114987b39a2b9ea173df7a5e806bd270fd8 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/drobilla/sord/pull/3] +--- + wscript | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/wscript b/wscript +index fd8578e..d71d78c 100644 +--- a/wscript ++++ b/wscript +@@ -35,6 +35,7 @@ def options(ctx): + {'no-utils': 'do not build command line utilities', + 'static': 'build static library', + 'no-shared': 'do not build shared library', ++ 'no-threads': 'disable threads', + 'static-progs': 'build programs as static binaries'}) + + opt.add_option('--dump', type='string', default='', dest='dump', +@@ -55,6 +56,7 @@ def configure(conf): + + conf.env.BUILD_UTILS = not Options.options.no_utils + conf.env.BUILD_SHARED = not Options.options.no_shared ++ conf.env.ENABLE_THREADS = not Options.options.no_threads + conf.env.STATIC_PROGS = Options.options.static_progs + conf.env.BUILD_STATIC = (Options.options.static or + Options.options.static_progs) +@@ -124,7 +126,7 @@ def configure(conf): + conf.check_pkg('serd-0 >= 0.30.0', uselib_store='SERD') + conf.check_pkg('libpcre', uselib_store='PCRE', mandatory=False) + +- if conf.env.HAVE_PCRE: ++ if conf.env.HAVE_PCRE and conf.env.ENABLE_THREADS: + if conf.check(cflags=['-pthread'], mandatory=False): + conf.env.PTHREAD_CFLAGS = ['-pthread'] + if conf.env.CC_NAME != 'clang': +@@ -160,6 +162,7 @@ def configure(conf): + conf, + {'Static library': bool(conf.env.BUILD_STATIC), + 'Shared library': bool(conf.env.BUILD_SHARED), ++ 'Threads': bool(conf.env.ENABLE_THREADS), + 'Utilities': bool(conf.env.BUILD_UTILS), + 'Unit tests': bool(conf.env.BUILD_TESTS), + 'Debug dumping': dump}) +-- +2.34.1 + diff --git a/package/sord/sord.mk b/package/sord/sord.mk index f805805e9d..c06ef9c55c 100644 --- a/package/sord/sord.mk +++ b/package/sord/sord.mk @@ -22,4 +22,8 @@ ifeq ($(BR2_STATIC_LIBS),y) SORD_CONF_OPTS += --static --no-shared --static-progs endif +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) +SORD_CONF_OPTS += --no-threads +endif + $(eval $(waf-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Tue Feb 22 20:40:34 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 22 Feb 2022 21:40:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/freerdp: security bump to version 2.6.0 Message-ID: <20220222204034.3139362-1-fontaine.fabrice@gmail.com> 2.6.0 is an maintenance and security release. https://github.com/FreeRDP/FreeRDP/releases/tag/2.6.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 e31b8d5b96..780061bdbb 100644 --- a/package/freerdp/freerdp.hash +++ b/package/freerdp/freerdp.hash @@ -1,5 +1,5 @@ -# From https://pub.freerdp.com/releases/freerdp-2.5.0.tar.gz.sha256 -sha256 0fd9396068cda8e6d884d063a4993001f140f46c36464ccae261b9475050cd2b freerdp-2.5.0.tar.gz +# From https://pub.freerdp.com/releases/freerdp-2.6.0.tar.gz.sha256 +sha256 a4ba0a75e30ed25fffc4cd4e89d0eb92e66894caeb6c78dc5e23b6b7c04f60fe freerdp-2.6.0.tar.gz # Locally calculated sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk index c536f6cb1c..edbfb6801a 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREERDP_VERSION = 2.5.0 +FREERDP_VERSION = 2.6.0 FREERDP_SITE = https://pub.freerdp.com/releases FREERDP_DEPENDENCIES = libglib2 openssl zlib FREERDP_LICENSE = Apache-2.0 -- 2.34.1 From fontaine.fabrice at gmail.com Tue Feb 22 20:46:01 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 22 Feb 2022 21:46:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/haproxy: bump to version 2.4.13 Message-ID: <20220222204601.3150365-1-fontaine.fabrice@gmail.com> https://www.mail-archive.com/haproxy at formilux.org/msg41834.html https://www.mail-archive.com/haproxy at formilux.org/msg41698.html https://www.mail-archive.com/haproxy at formilux.org/msg41685.html https://www.mail-archive.com/haproxy at formilux.org/msg41618.html https://www.mail-archive.com/haproxy at formilux.org/msg41512.html Signed-off-by: Fabrice Fontaine --- package/haproxy/haproxy.hash | 4 ++-- package/haproxy/haproxy.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/haproxy/haproxy.hash b/package/haproxy/haproxy.hash index c29857cd9c..e3120b521f 100644 --- a/package/haproxy/haproxy.hash +++ b/package/haproxy/haproxy.hash @@ -1,5 +1,5 @@ -# From: http://www.haproxy.org/download/2.4/src/haproxy-2.4.8.tar.gz.sha256 -sha256 e3e4c1ad293bc25e8d8790cc5e45133213dda008bfd0228bf3077259b32ebaa5 haproxy-2.4.8.tar.gz +# From: http://www.haproxy.org/download/2.4/src/haproxy-2.4.13.tar.gz.sha256 +sha256 4788fe975fe7e521746f826c25e80bc95cd15983e2bafa33e43bff23a3fe5ba1 haproxy-2.4.13.tar.gz # Locally computed: sha256 0717ca51fceaa25ac9e5ccc62e0c727dcf27796057201fb5fded56a25ff6ca28 LICENSE sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a doc/lgpl.txt diff --git a/package/haproxy/haproxy.mk b/package/haproxy/haproxy.mk index d79d6e9c9c..c162a4c3f4 100644 --- a/package/haproxy/haproxy.mk +++ b/package/haproxy/haproxy.mk @@ -5,7 +5,7 @@ ################################################################################ HAPROXY_VERSION_MAJOR = 2.4 -HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).8 +HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).13 HAPROXY_SITE = http://www.haproxy.org/download/$(HAPROXY_VERSION_MAJOR)/src HAPROXY_LICENSE = GPL-2.0+ and LGPL-2.1+ with exceptions HAPROXY_LICENSE_FILES = LICENSE doc/lgpl.txt doc/gpl.txt -- 2.34.1 From yann.morin.1998 at free.fr Tue Feb 22 20:51:56 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 22 Feb 2022 21:51:56 +0100 Subject: [Buildroot] [PATCH] package/qt5/qt5webkit: needs OpenSSL In-Reply-To: <20220222195854.11842-1-abrodkin@synopsys.com> References: <20220222195854.11842-1-abrodkin@synopsys.com> Message-ID: <20220222205156.GA50412@scaer> Alexey, All, On 2022-02-22 22:58 +0300, Alexey Brodkin spake thusly: > W/o OpenSSL QT5Webkit fails to build that way: > -------------------------------->8----------------------------- > .../build/qt5webkit-5.212.0-alpha4/Source/WebCore/platform/network/qt/ResourceRequestQt.cpp: In static member function ?static bool WebCore::ResourceRequest::alpnIsSupported()?: > .../build/qt5webkit-5.212.0-alpha4/Source/WebCore/platform/network/qt/ResourceRequestQt.cpp:68:12: error: ?QSslSocket? has not been declared > 68 | return QSslSocket::sslLibraryVersionNumber() > 0x10002000L && > | ^~~~~~~~~~ > .../build/qt5webkit-5.212.0-alpha4/Source/WebCore/platform/network/qt/ResourceRequestQt.cpp:69:9: error: ?QSslSocket? has not been declared > 69 | QSslSocket::sslLibraryVersionString().startsWith(QLatin1String("OpenSSL")); > | ^~~~~~~~~~ > -------------------------------->8----------------------------- > > Signed-off-by: Alexey Brodkin > Cc: Fabrice Fontaine > Cc: James Hilliard > Cc: Peter Seiderer > Cc: Yann E. MORIN > --- > 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 ed87efca95..26c3897d1d 100644 > --- a/package/qt5/qt5webkit/Config.in > +++ b/package/qt5/qt5webkit/Config.in > @@ -15,6 +15,7 @@ config BR2_PACKAGE_QT5WEBKIT > select BR2_PACKAGE_JPEG > select BR2_PACKAGE_LEVELDB > select BR2_PACKAGE_LIBPNG > + select BR2_PACKAGE_OPENSSL You forgot to add it to QT5WEBKIT_DEPENDENCIES... Regards, Yann E. MORIN. > select BR2_PACKAGE_QT5BASE_ICU > select BR2_PACKAGE_QT5BASE_GUI > select BR2_PACKAGE_QT5BASE_WIDGETS > -- > 2.25.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 Tue Feb 22 20:53:17 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 22 Feb 2022 21:53:17 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/libnetfilter_conntrack: bump to version 1.0.9 Message-ID: <20220222205317.3161653-1-fontaine.fabrice@gmail.com> Drop patch (already in version) Signed-off-by: Fabrice Fontaine --- ...ntrack.pc.in-add-LIBMNL_LIBS-to-Libs.patch | 38 ------------------- .../libnetfilter_conntrack.hash | 4 +- .../libnetfilter_conntrack.mk | 2 +- 3 files changed, 3 insertions(+), 41 deletions(-) delete mode 100644 package/libnetfilter_conntrack/0001-libnetfilter_conntrack.pc.in-add-LIBMNL_LIBS-to-Libs.patch diff --git a/package/libnetfilter_conntrack/0001-libnetfilter_conntrack.pc.in-add-LIBMNL_LIBS-to-Libs.patch b/package/libnetfilter_conntrack/0001-libnetfilter_conntrack.pc.in-add-LIBMNL_LIBS-to-Libs.patch deleted file mode 100644 index 0b373d9261..0000000000 --- a/package/libnetfilter_conntrack/0001-libnetfilter_conntrack.pc.in-add-LIBMNL_LIBS-to-Libs.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 93bbd7e56cefc8488a61892b3bf5df63a175d20d Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 12 Apr 2020 14:05:15 +0200 -Subject: [PATCH] libnetfilter_conntrack.pc.in: add LIBMNL_LIBS to Libs.Private - -Since version 1.0.8 and commit -c1c0f16c1fedb46547c2e104beeaaeac5933b214, libnetfilter_conntrack depends -on libmnl so add it to Libs.Private. - -Otherwise, applications such as dnsmasq will fail to link on: - -/home/buildroot/autobuild/instance-0/output-1/host/bin/arm-linux-gcc -Wl,-elf2flt -static -o dnsmasq cache.o rfc1035.o util.o option.o forward.o network.o dnsmasq.o dhcp.o lease.o rfc2131.o netlink.o dbus.o bpf.o helper.o tftp.o log.o conntrack.o dhcp6.o rfc3315.o dhcp-common.o outpacket.o radv.o slaac.o auth.o ipset.o domain.o dnssec.o blockdata.o tables.o loop.o inotify.o poll.o rrfilter.o edns0.o arp.o crypto.o dump.o ubus.o metrics.o -L/home/buildroot/autobuild/instance-0/output-1/host/bin/../arm-buildroot-uclinux-uclibcgnueabi/sysroot/usr/lib -lnetfilter_conntrack -L/home/buildroot/autobuild/instance-0/output-1/host/bin/../arm-buildroot-uclinux-uclibcgnueabi/sysroot/usr/lib -lnfnetlink -/home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/arm-buildroot-uclinux-uclibcgnueabi/bin/ld.real: /home/buildroot/autobuild/instance-0/output-1/host/bin/../arm-buildroot-uclinux-uclibcgnueabi/sysroot/usr/lib/libnetfilter_conntrack.a(api.o): in function `nfct_fill_hdr.constprop.4': -api.c:(.text+0x34): undefined reference to `mnl_nlmsg_put_header' - -Fixes: - - http://autobuild.buildroot.org/results/3fdc2cba20162eb86eaa5c49a056fb40fb18a392 - -Signed-off-by: Fabrice Fontaine -[Upstream status: commit e94172f09e4d] ---- - libnetfilter_conntrack.pc.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libnetfilter_conntrack.pc.in b/libnetfilter_conntrack.pc.in -index 857f993..fbd7132 100644 ---- a/libnetfilter_conntrack.pc.in -+++ b/libnetfilter_conntrack.pc.in -@@ -12,5 +12,5 @@ Version: @VERSION@ - Requires: libnfnetlink - Conflicts: - Libs: -L${libdir} -lnetfilter_conntrack --Libs.private: @LIBNFNETLINK_LIBS@ -+Libs.private: @LIBNFNETLINK_LIBS@ @LIBMNL_LIBS@ - Cflags: -I${includedir} --- -2.25.1 - diff --git a/package/libnetfilter_conntrack/libnetfilter_conntrack.hash b/package/libnetfilter_conntrack/libnetfilter_conntrack.hash index 19520aa3f0..205eecf1f3 100644 --- a/package/libnetfilter_conntrack/libnetfilter_conntrack.hash +++ b/package/libnetfilter_conntrack/libnetfilter_conntrack.hash @@ -1,5 +1,5 @@ -# From ftp://ftp.netfilter.org/pub/libnetfilter_conntrack/libnetfilter_conntrack-1.0.8.tar.bz2.sha256sum -sha256 0cd13be008923528687af6c6b860f35392d49251c04ee0648282d36b1faec1cf libnetfilter_conntrack-1.0.8.tar.bz2 +# From https://www.netfilter.org/pub/libnetfilter_conntrack/libnetfilter_conntrack-1.0.9.tar.bz2.sha256sum +sha256 67bd9df49fe34e8b82144f6dfb93b320f384a8ea59727e92ff8d18b5f4b579a8 libnetfilter_conntrack-1.0.9.tar.bz2 # Hash for license file: sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING diff --git a/package/libnetfilter_conntrack/libnetfilter_conntrack.mk b/package/libnetfilter_conntrack/libnetfilter_conntrack.mk index 0a5a94be8f..e10bdd02e9 100644 --- a/package/libnetfilter_conntrack/libnetfilter_conntrack.mk +++ b/package/libnetfilter_conntrack/libnetfilter_conntrack.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNETFILTER_CONNTRACK_VERSION = 1.0.8 +LIBNETFILTER_CONNTRACK_VERSION = 1.0.9 LIBNETFILTER_CONNTRACK_SOURCE = libnetfilter_conntrack-$(LIBNETFILTER_CONNTRACK_VERSION).tar.bz2 LIBNETFILTER_CONNTRACK_SITE = http://www.netfilter.org/projects/libnetfilter_conntrack/files LIBNETFILTER_CONNTRACK_INSTALL_STAGING = YES -- 2.34.1 From Alexey.Brodkin at synopsys.com Tue Feb 22 21:00:24 2022 From: Alexey.Brodkin at synopsys.com (Alexey Brodkin) Date: Wed, 23 Feb 2022 00:00:24 +0300 Subject: [Buildroot] [PATCH v2] package/qt5/qt5webkit: needs OpenSSL Message-ID: <20220222210024.6013-1-abrodkin@synopsys.com> W/o OpenSSL QT5Webkit fails to build that way: -------------------------------->8----------------------------- .../build/qt5webkit-5.212.0-alpha4/Source/WebCore/platform/network/qt/ResourceRequestQt.cpp: In static member function ?static bool WebCore::ResourceRequest::alpnIsSupported()?: .../build/qt5webkit-5.212.0-alpha4/Source/WebCore/platform/network/qt/ResourceRequestQt.cpp:68:12: error: ?QSslSocket? has not been declared 68 | return QSslSocket::sslLibraryVersionNumber() > 0x10002000L && | ^~~~~~~~~~ .../build/qt5webkit-5.212.0-alpha4/Source/WebCore/platform/network/qt/ResourceRequestQt.cpp:69:9: error: ?QSslSocket? has not been declared 69 | QSslSocket::sslLibraryVersionString().startsWith(QLatin1String("OpenSSL")); | ^~~~~~~~~~ -------------------------------->8----------------------------- Signed-off-by: Alexey Brodkin Cc: Fabrice Fontaine Cc: James Hilliard Cc: Peter Seiderer Cc: Yann E. MORIN --- Changes v1 -> v2: * Added "openssl" to QT5WEBKIT_DEPENDENCIES, thanks Yann for spotting this one. Note that I interntionally added "openssl" not following alphabetic order because: 1. Existing dependencies are already a bit shufffled 2. I wanted to keep this diff as small as possible, w/o re-shuffling multiple lines. If really needed we may do reordering in a separate patch. --- package/qt5/qt5webkit/Config.in | 1 + package/qt5/qt5webkit/qt5webkit.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in index ed87efca95..26c3897d1d 100644 --- a/package/qt5/qt5webkit/Config.in +++ b/package/qt5/qt5webkit/Config.in @@ -15,6 +15,7 @@ config BR2_PACKAGE_QT5WEBKIT select BR2_PACKAGE_JPEG select BR2_PACKAGE_LEVELDB select BR2_PACKAGE_LIBPNG + select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_QT5BASE_ICU select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_QT5BASE_WIDGETS diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk index 2e96acc00f..c9b354e725 100644 --- a/package/qt5/qt5webkit/qt5webkit.mk +++ b/package/qt5/qt5webkit/qt5webkit.mk @@ -10,7 +10,7 @@ QT5WEBKIT_SOURCE = qtwebkit-$(QT5WEBKIT_VERSION).tar.xz QT5WEBKIT_DEPENDENCIES = \ 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 + openssl qt5sensors qt5webchannel sqlite webp woff2 QT5WEBKIT_INSTALL_STAGING = YES QT5WEBKIT_LICENSE_FILES = Source/WebCore/LICENSE-LGPL-2 Source/WebCore/LICENSE-LGPL-2.1 -- 2.25.1 From ju.o at free.fr Tue Feb 22 21:32:02 2022 From: ju.o at free.fr (Julien Olivain) Date: Tue, 22 Feb 2022 22:32:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/mariadb: fix mysql.service failing to create log directory Message-ID: <20220222213202.642708-1-ju.o@free.fr> When enabling MariaDB (BR2_PACKAGE_MARIADB=y) and systemd (BR2_INIT_SYSTEMD=y) in buildroot, the mysqld.service fail to start with a permission error. See output of command: journalctl --unit=mysqld Which shows: systemd[1]: Starting MySQL database server... install[102]: install: can't create directory '/var/log/mysql': Permission denied systemd[1]: mysqld.service: Control process exited, code=exited, status=1/FAILURE Since the service file includes the "User=mysql" directive, the "ExecStartPre=" is executed as this user, which does not have permission to create a directory in "/var/log". This commit fixes this issue by adding the "!" prefix, which will execute the command with full privileges. See the systemd.service manual page entry for "ExecStart=", table "Special executable prefixes": https://www.freedesktop.org/software/systemd/man/systemd.service.html#ExecStart= or https://github.com/systemd/systemd/blob/v250/man/systemd.service.xml#L339 Moreover, the "mysql_install_db" invocation does not need this special prefix, as the "/var/lib/mysql" directory on target is already owned by the "mysql" user. The "chown" command is also useless and is removed in this commit. Reported-by: Gilles Talis Signed-off-by: Julien Olivain --- package/mariadb/mysqld.service | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mariadb/mysqld.service b/package/mariadb/mysqld.service index d9ea74ebc3..537430e9a2 100644 --- a/package/mariadb/mysqld.service +++ b/package/mariadb/mysqld.service @@ -2,8 +2,8 @@ Description=MySQL database server [Service] -ExecStartPre=/bin/sh -c 'test "`ls -1 /var/lib/mysql | wc -l`" != "0" || mysql_install_db --basedir=/usr --datadir=/var/lib/mysql && chown -R mysql:mysql /var/lib/mysql' -ExecStartPre=install -d -o mysql -g root -m 0755 /var/log/mysql +ExecStartPre=/bin/sh -c 'test "`ls -1 /var/lib/mysql | wc -l`" != "0" || mysql_install_db --basedir=/usr --datadir=/var/lib/mysql' +ExecStartPre=!install -d -o mysql -g root -m 0755 /var/log/mysql ExecStart=/usr/bin/mysqld_safe --log-error=/var/log/mysql/mysqld.log Restart=always User=mysql -- 2.35.1 From peter at korsgaard.com Tue Feb 22 16:55:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Feb 2022 17:55:03 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gauche: drop autoreconf Message-ID: <20220222212515.1DD3883837@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ec034ba9dee122c51cb59703c85df839dc973a54 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Commit 11cb72be570409be77d4bb49c17b4a2feef31be7 forgot to drop autoreconf Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 5f703276e0713b746f2c937c4c4fc02ef6ad1d77) Signed-off-by: Peter Korsgaard --- package/gauche/gauche.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/gauche/gauche.mk b/package/gauche/gauche.mk index 2520379369..fe0a613a9d 100644 --- a/package/gauche/gauche.mk +++ b/package/gauche/gauche.mk @@ -10,8 +10,6 @@ GAUCHE_SITE = http://downloads.sourceforge.net/project/gauche/Gauche GAUCHE_LICENSE = BSD-3-Clause, Boehm-gc, SRFI (srfi-11.scm), reload (reload.scm) GAUCHE_LICENSE_FILES = COPYING GAUCHE_DEPENDENCIES = host-gauche -# We're patching configure.ac -GAUCHE_AUTORECONF = YES HOST_GAUCHE_CONF_OPTS = --without-zlib GAUCHE_CONF_OPTS = --without-libatomic-ops From bernd.kuhls at t-online.de Tue Feb 22 21:41:14 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Tue, 22 Feb 2022 22:41:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/samba4: security bump version to 4.15.5 Message-ID: <20220222214114.374855-1-bernd.kuhls@t-online.de> Release notes: https://www.samba.org/samba/history/samba-4.15.5.html Fixes CVE-2021-44141, CVE-2021-44142 & CVE-2022-0336. 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 130b628e32..503ec2ce37 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.4.tar.asc -sha256 499065a589b7b9ffb8e3eb6efa8575985919a2999972afc469520a47322aec11 samba-4.15.4.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.15.5.tar.asc +sha256 69115e33831937ba5151be0247943147765aece658ba743f44741672ad68d17f samba-4.15.5.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 1d4b985437..0ad3c2f742 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.15.4 +SAMBA4_VERSION = 4.15.5 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES -- 2.30.2 From fontaine.fabrice at gmail.com Tue Feb 22 21:42:47 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 22 Feb 2022 22:42:47 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/duktape: bump to version 2.7.0 Message-ID: <20220222214247.3163690-1-fontaine.fabrice@gmail.com> Update hash of license file (update in year: https://github.com/svaarala/duktape/commit/03d4d728f8365021de6955c649e6dcd05dcca99f) Signed-off-by: Fabrice Fontaine --- package/duktape/duktape.hash | 4 ++-- package/duktape/duktape.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/duktape/duktape.hash b/package/duktape/duktape.hash index 4c55e39888..ef6f55aa9d 100644 --- a/package/duktape/duktape.hash +++ b/package/duktape/duktape.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 96f4a05a6c84590e53b18c59bb776aaba80a205afbbd92b82be609ba7fe75fa7 duktape-2.6.0.tar.xz -sha256 5b42d02dbd084fd6d7e61d93f52e02b596f25400e54e0f86d5780045e5b754c8 LICENSE.txt +sha256 90f8d2fa8b5567c6899830ddef2c03f3c27960b11aca222fa17aa7ac613c2890 duktape-2.7.0.tar.xz +sha256 c6b6659630ca6cb837afe982ecc79511bfca878b56296d628b02eb6f18789c29 LICENSE.txt diff --git a/package/duktape/duktape.mk b/package/duktape/duktape.mk index 89a6e451f5..674c5e9323 100644 --- a/package/duktape/duktape.mk +++ b/package/duktape/duktape.mk @@ -4,7 +4,7 @@ # ################################################################################ -DUKTAPE_VERSION = 2.6.0 +DUKTAPE_VERSION = 2.7.0 DUKTAPE_SOURCE = duktape-$(DUKTAPE_VERSION).tar.xz DUKTAPE_SITE = \ https://github.com/svaarala/duktape/releases/download/v$(DUKTAPE_VERSION) -- 2.34.1 From bernd.kuhls at t-online.de Tue Feb 22 21:49:31 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Tue, 22 Feb 2022 22:49:31 +0100 Subject: [Buildroot] [PATCH/next 1/1] Revert "heimdal: disable parallel make" Message-ID: <20220222214931.447344-1-bernd.kuhls@t-online.de> This reverts commit f6980126f26c63421d04a32b6710d9e3a380476a. Parallel make was disabled back in 2017: https://git.buildroot.net/buildroot/commit/?id=f6980126f26c63421d04a32b6710d9e3a380476a Build-test with -j99 was successful. Signed-off-by: Bernd Kuhls --- package/heimdal/heimdal.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/heimdal/heimdal.mk b/package/heimdal/heimdal.mk index ce509c7afa..a8d87531ec 100644 --- a/package/heimdal/heimdal.mk +++ b/package/heimdal/heimdal.mk @@ -8,7 +8,6 @@ HEIMDAL_VERSION = 7.7.0 HEIMDAL_SITE = https://github.com/heimdal/heimdal/releases/download/heimdal-$(HEIMDAL_VERSION) HOST_HEIMDAL_DEPENDENCIES = host-e2fsprogs host-ncurses host-pkgconf HEIMDAL_INSTALL_STAGING = YES -HEIMDAL_MAKE = $(MAKE1) # static because of -fPIC issues with e2fsprogs on x86_64 host HOST_HEIMDAL_CONF_OPTS = \ --disable-shared \ -- 2.30.2 From petr.vorel at gmail.com Tue Feb 22 22:02:55 2022 From: petr.vorel at gmail.com (Petr Vorel) Date: Tue, 22 Feb 2022 23:02:55 +0100 Subject: [Buildroot] [RFC][PATCH 1/1] package/bind: bump to version 9.16.26 Message-ID: <20220222220255.22327-1-petr.vorel@gmail.com> BIND 9.11 EOL in March, 2022. BIND 9.16 is current Stable/ESV version. Changes: * libuv (new dependency) * openssl is now mandatory * zlib must be detected with PKG_CONFIG_PATH (specifying zlib installation path is not supported) * bind9-config and isc-config.sh removed * updated COPYRIGHT hash Signed-off-by: Petr Vorel --- Hi, time to move on to 9.16. Tested only local build as I don't use bind. I'll also verify builds with utils/test-pkg. But it'd be great if anybody could also test running bind. Kind regards, Petr package/bind/Config.in | 12 +++++++++++- package/bind/bind.hash | 6 +++--- package/bind/bind.mk | 15 +++++++-------- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/package/bind/Config.in b/package/bind/Config.in index db10ceb304..9887403ed9 100644 --- a/package/bind/Config.in +++ b/package/bind/Config.in @@ -1,6 +1,11 @@ config BR2_PACKAGE_BIND bool "bind" - depends on BR2_USE_MMU # fork() + depends on BR2_USE_MMU # fork(), libuv + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv + depends on !BR2_STATIC_LIBS # libuv + select BR2_PACKAGE_LIBUV + select BR2_PACKAGE_OPENSSL help BIND (Berkeley Internet Name Domain) is an implementation of the Domain Name System (DNS) protocols @@ -24,6 +29,11 @@ config BR2_PACKAGE_BIND https://www.isc.org/bind/ +comment "bind needs a toolchain w/ NPTL, dynamic library" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS + if BR2_PACKAGE_BIND config BR2_PACKAGE_BIND_SERVER diff --git a/package/bind/bind.hash b/package/bind/bind.hash index 70299f1677..401e389e49 100644 --- a/package/bind/bind.hash +++ b/package/bind/bind.hash @@ -1,4 +1,4 @@ -# Verified from https://ftp.isc.org/isc/bind9/9.11.36/bind-9.11.36.tar.gz.asc +# Verified from https://ftp.isc.org/isc/bind9/9.16.26/bind-9.16.26.tar.xz.asc # with key AADBBA5074F1402F7B69D56BC5B4EE931A9F9DFD -sha256 c953fcb6703b395aaa53e65ff8b2869b69a5303dd60507cba2201305e1811681 bind-9.11.36.tar.gz -sha256 cad49daa42654bc241762cd998630168a2542c8fd6fad3881e2eac1510bb6fcd COPYRIGHT +sha256 70b39a5eb71650358ec9ba41da3050d32aeac0aeb4a466684b23f35affa7fb45 bind-9.16.26.tar.xz +sha256 daf6f1eddf5983ed664a2d125b619e56e2e93917c19d0d41c7586ea153ba2155 COPYRIGHT diff --git a/package/bind/bind.mk b/package/bind/bind.mk index e329c803a3..5b4c60b14c 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -4,12 +4,12 @@ # ################################################################################ -BIND_VERSION = 9.11.36 +BIND_VERSION = 9.16.26 +BIND_SOURCE= bind-$(BIND_VERSION).tar.xz BIND_SITE = https://ftp.isc.org/isc/bind9/$(BIND_VERSION) # bind does not support parallel builds. BIND_MAKE = $(MAKE1) BIND_INSTALL_STAGING = YES -BIND_CONFIG_SCRIPTS = bind9-config isc-config.sh BIND_LICENSE = MPL-2.0 BIND_LICENSE_FILES = COPYRIGHT BIND_CPE_ID_VENDOR = isc @@ -32,15 +32,18 @@ BIND_CONF_ENV = \ BIND_CONF_OPTS = \ $(if $(BR2_TOOLCHAIN_HAS_THREADS),--enable-threads,--disable-threads) \ --without-lmdb \ - --with-libjson=no \ + --with-json-c=no \ --with-randomdev=/dev/urandom \ --enable-epoll \ --enable-filter-aaaa \ --disable-backtrace +BIND_DEPENDENCIES = libuv + ifeq ($(BR2_PACKAGE_ZLIB),y) -BIND_CONF_OPTS += --with-zlib=$(STAGING_DIR)/usr +BIND_CONF_OPTS += --with-zlib BIND_DEPENDENCIES += zlib +BIND_DEPENDENCIES += host-pkgconf zlib else BIND_CONF_OPTS += --without-zlib endif @@ -66,7 +69,6 @@ else BIND_CONF_OPTS += --with-libxml2=no endif -ifeq ($(BR2_PACKAGE_OPENSSL),y) BIND_DEPENDENCIES += host-pkgconf openssl BIND_CONF_OPTS += \ --with-openssl=$(STAGING_DIR)/usr \ @@ -80,9 +82,6 @@ BIND_CONF_OPTS += --with-gost=yes else BIND_CONF_OPTS += --with-gost=no endif -else -BIND_CONF_OPTS += --with-openssl=no -endif # Used by dnssec-keymgr ifeq ($(BR2_PACKAGE_PYTHON_PLY),y) -- 2.35.1 From petr.vorel at gmail.com Tue Feb 22 22:06:50 2022 From: petr.vorel at gmail.com (Petr Vorel) Date: Tue, 22 Feb 2022 23:06:50 +0100 Subject: [Buildroot] [RFC PATCH 0/3] make: support: use `command -v' instead of `which' *second try* In-Reply-To: <20211011220025.7998-1-petr.vorel@gmail.com> References: <20211011220025.7998-1-petr.vorel@gmail.com> Message-ID: Hi all, could anybody test this patchset please? Kind regards, Petr > Hi all, > this is a second attempt to introduce command -v. > Changes v1->v2: > * reproduced original issue and fixed by not relying to > $(shell command -v ...) but shell with: > $(shell $(SHELL) -c "command -v ..."). > * quote variables > Tested only with make defconfig && make help >/dev/null > Petr Vorel (3): > make: support: use `command -v' instead of `which' > make: Drop `type -p ...' fallback > support/dependencies: don't check for `which' > Makefile | 22 +++++++++---------- > package/Makefile.in | 8 +++---- > support/dependencies/check-host-bison-flex.mk | 4 ++-- > support/dependencies/check-host-cmake.sh | 2 +- > support/dependencies/check-host-gzip.sh | 2 +- > support/dependencies/check-host-lzip.sh | 4 ++-- > support/dependencies/check-host-python3.sh | 2 +- > support/dependencies/check-host-tar.sh | 4 ++-- > support/dependencies/check-host-xzcat.sh | 4 ++-- > support/dependencies/dependencies.sh | 18 +++++++-------- > .../pkg-toolchain-external.mk | 2 +- > 11 files changed, 35 insertions(+), 37 deletions(-) From fontaine.fabrice at gmail.com Tue Feb 22 22:43:02 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 22 Feb 2022 23:43:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/vim: security bump to version 8.2.4450 Message-ID: <20220222224302.3185944-1-fontaine.fabrice@gmail.com> Fix CVE-2022-0554: Use of Out-of-range Pointer Offset in GitHub repository vim/vim prior to 8.2. 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 fa3ca53cc8..8b60b7461f 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 b40b4e341de6b65cdeacd4c816dea8fe5e3b385ee5e17af73fc69c00bd7c440b vim-8.2.4301.tar.gz +sha256 b0a5acbe83bbdd4b1412abd9dc2ae2e3593c6cff8ff11c551fda3e6e2a87ec81 vim-8.2.4450.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index 98a5f153a8..28fd33c8ef 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 8.2.4301 +VIM_VERSION = 8.2.4450 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src -- 2.34.1 From tambewilliam at gmail.com Tue Feb 22 23:41:45 2022 From: tambewilliam at gmail.com (William Tambe) Date: Tue, 22 Feb 2022 17:41:45 -0600 Subject: [Buildroot] STAGING_DIR does not contain executables found in TARGET_DIR Message-ID: Please help determining why STAGING_DIR does not contain executables found in TARGET_DIR ? I am expecting to find debug version of all executables in TARGET_DIR, but executables such as /bin/busybox are missing from STAGING_DIR . I am using 2021.08.3 Full config is as follow ``` BR2_pu32=y BR2_ENABLE_DEBUG=y BR2_DEBUG_3=y BR2_STATIC_LIBS=y BR2_FORTIFY_SOURCE_NONE=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_PATH="/opt/pu32-toolchain/" BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="$(ARCH)-elf" BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_5=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y # BR2_TOOLCHAIN_EXTERNAL_HAS_SSP is not set # BR2_TOOLCHAIN_EXTERNAL_INET_RPC is not set BR2_TOOLCHAIN_EXTERNAL_CXX=y BR2_TARGET_GENERIC_ISSUE="" BR2_ROOTFS_MERGED_USR=y BR2_TARGET_GENERIC_ROOT_PASSWD="root" BR2_SYSTEM_BIN_SH_BASH=y BR2_TARGET_GENERIC_GETTY_TERM="linux" BR2_TARGET_GENERIC_GETTY_OPTIONS="-n -l /bin/-bash" BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y BR2_PACKAGE_GDB=y BR2_PACKAGE_ZLIB=y BR2_PACKAGE_ZLIB_NG=y BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP_CLIENT=y BR2_PACKAGE_IPROUTE2=y BR2_PACKAGE_LRZSZ=y BR2_PACKAGE_SOCAT=y BR2_PACKAGE_HTOP=y BR2_PACKAGE_NANO=y # BR2_PACKAGE_NANO_TINY is not set BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="64M" # BR2_TARGET_ROOTFS_TAR is not set ``` From ckhardin at gmail.com Wed Feb 23 04:33:20 2022 From: ckhardin at gmail.com (Charles Hardin) Date: Tue, 22 Feb 2022 20:33:20 -0800 Subject: [Buildroot] [PATCH 1/1] package/alsa-plugins: bump to version 1.2.6 Message-ID: <20220223043320.25753-1-ckhardin@gmail.com> https://github.com/alsa-project/alsa-plugins/releases/tag/v1.2.6 Signed-off-by: Charles Hardin --- package/alsa-plugins/alsa-plugins.hash | 2 +- package/alsa-plugins/alsa-plugins.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/alsa-plugins/alsa-plugins.hash b/package/alsa-plugins/alsa-plugins.hash index 8ecbd19965..2582a0d639 100644 --- a/package/alsa-plugins/alsa-plugins.hash +++ b/package/alsa-plugins/alsa-plugins.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 42eef98433d2c8d11f1deeeb459643619215a75aa5a5bbdd06a794e4c413df20 alsa-plugins-1.2.5.tar.bz2 +sha256 068818a4b55d8c029daa00015d853d45113f56b224b7c64e1e117988c825b2a0 alsa-plugins-1.2.6.tar.bz2 sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING.GPL diff --git a/package/alsa-plugins/alsa-plugins.mk b/package/alsa-plugins/alsa-plugins.mk index 396f47adaf..b8819151ef 100644 --- a/package/alsa-plugins/alsa-plugins.mk +++ b/package/alsa-plugins/alsa-plugins.mk @@ -4,7 +4,7 @@ # ################################################################################ -ALSA_PLUGINS_VERSION = 1.2.5 +ALSA_PLUGINS_VERSION = 1.2.6 ALSA_PLUGINS_SOURCE = alsa-plugins-$(ALSA_PLUGINS_VERSION).tar.bz2 ALSA_PLUGINS_SITE = https://www.alsa-project.org/files/pub/plugins ALSA_PLUGINS_LICENSE = LGPL-2.1+ -- 2.24.3 (Apple Git-128) From thomas.petazzoni at bootlin.com Wed Feb 23 07:09:31 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 23 Feb 2022 07:09:31 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-02-22 Message-ID: <20220223070936.00DB281379@smtp1.osuosl.org> Hello, Autobuild statistics for 2022-02-22 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 51 | 5 | 0 | 56 | 2021.11.x | 21 | 1 | 0 | 22 | master | 48 | 38 | 0 | 86 | Classification of failures by reason for master ----------------------------------------------- host-libselinux-3.3 | 9 frr-8.1 | 6 bpftool-a7f0e7f057283ae8af3... | 3 python-greenlet-1.1.2 | 2 python-pygame-d61ea8eabd56 | 2 android-tools-4.2.2+git2013... | 1 bat-0.19.0 | 1 bluez5_utils-5.63 | 1 gocryptfs-2.2.1 | 1 google-breakpad-7515ab13768... | 1 gstd-0.13.0 | 1 hostapd-2.10 | 1 Makefile:733: target-finalize | 1 ndisc6-1.0.5 | 1 qt5webkit-5.212.0-alpha4 | 1 safeclib-3.7.1 | 1 sconeserver-6b932d7d8dbb700... | 1 target-finalize | 1 tovid-87c676f4aadb7303d2cd9... | 1 vlc-3.0.16 | 1 wpa_supplicant-2.10 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- powerpc64 | android-tools-4.2.2+git2013... | NOK | http://autobuild.buildroot.net/results/401cd7b23542ada9964967223e691497909acb8e | arm | bat-0.19.0 | NOK | http://autobuild.buildroot.net/results/6b2885d31972e3dbaab19a44261fb39dd0f74ae9 | mips | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/d323cbea5acdf95b2d1fab2f3e8c288fc240247d | mips64el | bpftool-a7f0e7f057283ae8af3... | NOK | http://autobuild.buildroot.net/results/c5ad46e33e59cb44c717591ead71228b9316dd7f | sparc64 | bpftool-a7f0e7f057283ae8af3... | NOK | http://autobuild.buildroot.net/results/9333c1adad2a092c5ebf2114f89d65c8d888b867 | powerpc64le | bpftool-a7f0e7f057283ae8af3... | NOK | http://autobuild.buildroot.net/results/70457d39dfcdc098c35b8371fb13ed6a015ba85f | microblazeel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/121ac2cd087dd09e12538e444556d35f77e5e5fc | xtensa | frr-8.1 | NOK | http://autobuild.buildroot.net/results/013afc7bdadef2b7a8e8a17fac30e5c930afe3ee | mips64el | frr-8.1 | NOK | http://autobuild.buildroot.net/results/6a02d29db5d53c52a529f6ee85872d40b5aaf6a8 | nios2 | frr-8.1 | NOK | http://autobuild.buildroot.net/results/4ea830db8c9c0c891db342c3e363afd98ee3808c | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/1da1bc313eb6df3fcb35f17673a3cf6db8e1b310 | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/2f998c586df820c0388e82d7462403108380ed1b | i586 | gocryptfs-2.2.1 | NOK | http://autobuild.buildroot.net/results/5a75b1613f4ae528d901acef723b184a46a5a963 | mipsel | google-breakpad-7515ab13768... | NOK | http://autobuild.buildroot.net/results/976266955282494bc032ec4de0cecaf953e2f0a1 | mips64el | gstd-0.13.0 | NOK | http://autobuild.buildroot.net/results/196b102d0b8bbd72bfd584ac201687ca44e78c3a | ORPH s390x | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/c7e702d27480c75100063690e74cbb7c1aa48e05 | arc | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/8f29d20c39431c4a957465396820653d5d363cee | sparc | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/f2a91b5751c2dc47169640f33fc1d41180b4b499 | arc | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/0a5f4ec1bb0d7f5f37d11ed10c1f12b41b817c82 | x86_64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/f98cb35628ebb0dbfc33d1e8c9b2683e326a0e56 | or1k | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/f01ade768a188bea472efbc93caf7fa6ec3f8971 | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/17d99d58e5ba33f3a3c4ab2fa329471532f8a041 | arc | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/61b7f18372e8a350a9fe2e48cce05b412930fbbb | microblazeel | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/677a90d49cd14af1032e2bab200ae949840ee714 | nds32le | hostapd-2.10 | NOK | http://autobuild.buildroot.net/results/b33dc422fe3d775ee88753af1fe9016c38aa71ea | arm | Makefile:733: target-finalize | NOK | http://autobuild.buildroot.net/results/6112e1830ce608abcea4a26b659c10e5ff09a66a | arm | ndisc6-1.0.5 | NOK | http://autobuild.buildroot.net/results/1bb5eda1985ce51da9dac5be008fc588b0f2efaa | ORPH aarch64 | python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/9856fb75e08fdda0a08e47f0326df97000a11547 | arm | python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/5b9b5f55e57d6f5de6bb88488dd229975c649c8d | arc | python-pygame-d61ea8eabd56 | NOK | http://autobuild.buildroot.net/results/7c50a40db75709af4e7ab8033e02ab1e7f831e71 | riscv64 | python-pygame-d61ea8eabd56 | NOK | http://autobuild.buildroot.net/results/fd4d8de9849df2baf47864b2dec7037ce286005c | mipsel | qt5webkit-5.212.0-alpha4 | NOK | http://autobuild.buildroot.net/results/5191600b463cda078203eeffae880ed989f8ac0f | sparc64 | safeclib-3.7.1 | NOK | http://autobuild.buildroot.net/results/af24e1541c01261343c5fe0c7369ce9020dde09b | arm | sconeserver-6b932d7d8dbb700... | NOK | http://autobuild.buildroot.net/results/83ecf772965b4586eaea2682871a85732df7d62f | i686 | target-finalize | NOK | http://autobuild.buildroot.net/results/fc82ccf1fdbdd9a3cd51ab9c06c57c01a88955a8 | xtensa | tovid-87c676f4aadb7303d2cd9... | NOK | http://autobuild.buildroot.net/results/67f3a0263870558ae1ff3f5c66db248d5c1bf3d7 | riscv64 | vlc-3.0.16 | NOK | http://autobuild.buildroot.net/results/0a757c5ffb8af9d6d2589c72956f7d65bc40693d | arm | wpa_supplicant-2.10 | NOK | http://autobuild.buildroot.net/results/318f9ecd4060d34cc8385891b56d0a0e6275f2c9 | Classification of failures by reason for 2021.02.x -------------------------------------------------- haproxy-2.2.17 | 1 rauc-1.5.1 | 1 rocksdb-6.13.3 | 1 unknown | 1 zeromq-4.3.4 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sh4 | haproxy-2.2.17 | NOK | http://autobuild.buildroot.net/results/47acc25a1f47ce4f3570b8b54730120420267286 | riscv32 | rauc-1.5.1 | NOK | http://autobuild.buildroot.net/results/04d5b7f8d86cbb7fe3946269a7d9145dcd1a6a5e | m68k | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/5e0b1bdecdf8009344eedec86bd382c65de9fb34 | arm | unknown | NOK | http://autobuild.buildroot.net/results/5260cd671d0ec0a8e1440b84959f1187321e2060 | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/f8f4a9d6d1de4f7b2f482a29c1f7e13feae76a57 | Classification of failures by reason for 2021.11.x -------------------------------------------------- zeromq-4.3.4 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/8a6e751bdde880037f53f312f7fdcff413810a92 | -- http://autobuild.buildroot.net From peterlin at andestech.com Wed Feb 23 07:10:47 2022 From: peterlin at andestech.com (Yu Chien Peter Lin) Date: Wed, 23 Feb 2022 15:10:47 +0800 Subject: [Buildroot] [PATCH v4 1/3] board/andes: rearrange andes folder structure Message-ID: <20220223071049.21153-1-peterlin@andestech.com> Rename ae3xx to ae300 for nds32 architecture and add ae350 platform. AE300 (NDS32): - http://www.andestech.com/en/products-solutions/andeshape-platforms/ae300/ AE350 (RISC-V): - http://www.andestech.com/en/products-solutions/andeshape-platforms/ae350-axi-based-platform-pre-integrated-with-n25f-nx25f-a25-ax25/ Signed-off-by: Yu Chien Peter Lin Signed-off-by: Alan Kao --- Changes v1 -> v2: - move linux source code and its patches to AndesTech Github repo - rename ae350_andestar45_defconfig to andes_ae350_45_defconfig - change C library to uClibc - remove OpenSSL package - remove rootfs.cpio and rootfs.tar - update DEVELOPERS Changes v2 -> v3: - specifiy branch to download from AndesTech linux repo - change boot.cmd to extlinux.conf - add post-build.sh for extlinux.conf to retrieve Image and DTB - fix format and update genimage_sdcard.cfg - update readme.txt - add packages (python3, pylibfdt and openssl) for u-boot binman - reorder item in DEVELOPERS Changes v3 -> v4: - rename ae3xx folder to ae300 - rename andes_ae3xx_defconfig to andes_ae300_defconfig - update readme.txt and item in DEVELOPERS --- .../{ae3xx/ae3xx.fragment => ae300/ae300.fragment} | 0 .../linux/0001-nds32-Fix-boot-messages-garbled.patch | 0 ...-dtc-Remove-redundant-YYLOC-global-declaratio.patch | 0 board/andes/{ => ae300}/readme.txt | 10 +++++----- .../{andes_ae3xx_defconfig => andes_ae300_defconfig} | 4 ++-- .../toolchain-external-andes-nds32/Config.in | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) rename board/andes/{ae3xx/ae3xx.fragment => ae300/ae300.fragment} (100%) rename board/andes/{ => ae300}/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch (100%) rename board/andes/{ => ae300}/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch (100%) rename board/andes/{ => ae300}/readme.txt (71%) rename configs/{andes_ae3xx_defconfig => andes_ae300_defconfig} (69%) diff --git a/board/andes/ae3xx/ae3xx.fragment b/board/andes/ae300/ae300.fragment similarity index 100% rename from board/andes/ae3xx/ae3xx.fragment rename to board/andes/ae300/ae300.fragment diff --git a/board/andes/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch b/board/andes/ae300/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/ae300/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch diff --git a/board/andes/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch b/board/andes/ae300/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch similarity index 100% rename from board/andes/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch rename to board/andes/ae300/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch diff --git a/board/andes/readme.txt b/board/andes/ae300/readme.txt similarity index 71% rename from board/andes/readme.txt rename to board/andes/ae300/readme.txt index 0f95c65549..51c05c9235 100644 --- a/board/andes/readme.txt +++ b/board/andes/ae300/readme.txt @@ -1,10 +1,10 @@ Intro ===== -Andestech(nds32) AE3XX Platform +Andestech(nds32) AE300 Platform -The AE3XX prototype demonstrates the AE3XX example platform on the FPGA. -It is composed of one Andestech(nds32) processor and AE3XX. +The AE300 prototype demonstrates the AE300 example platform on the FPGA. +It is composed of one Andestech(nds32) processor and AE300. How to build it =============== @@ -12,10 +12,10 @@ How to build it Configure Buildroot ------------------- -The andes_ae3xx_defconfig configuration is a sample configuration with +The andes_ae300_defconfig configuration is a sample configuration with all that is required to bring the FPGA Development Board: - $ make andes_ae3xx_defconfig + $ make andes_ae300_defconfig Build everything ---------------- diff --git a/configs/andes_ae3xx_defconfig b/configs/andes_ae300_defconfig similarity index 69% rename from configs/andes_ae3xx_defconfig rename to configs/andes_ae300_defconfig index 52634caa50..ffcb4d7d38 100644 --- a/configs/andes_ae3xx_defconfig +++ b/configs/andes_ae300_defconfig @@ -1,10 +1,10 @@ BR2_nds32=y -BR2_GLOBAL_PATCH_DIR="board/andes/patches/" +BR2_GLOBAL_PATCH_DIR="board/andes/ae300/patches" BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_ANDES_NDS32=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/andes/ae3xx/ae3xx.fragment" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/andes/ae300/ae300.fragment" BR2_TARGET_ROOTFS_INITRAMFS=y diff --git a/toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in b/toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in index 9c937b8c44..ecd50cc805 100644 --- a/toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in +++ b/toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in @@ -12,4 +12,4 @@ config BR2_TOOLCHAIN_EXTERNAL_ANDES_NDS32 help nds32 toolchain for the nds32 architecture. It uses GCC 8.2.1, GDB 8.1.1, glibc 2.28, Binutils 2.30. It generates - code that runs on ae3xx platform + code that runs on ae300 platform -- 2.17.1 From peterlin at andestech.com Wed Feb 23 07:10:48 2022 From: peterlin at andestech.com (Yu Chien Peter Lin) Date: Wed, 23 Feb 2022 15:10:48 +0800 Subject: [Buildroot] [PATCH v4 2/3] board/andes/ae350: add support for Andes AE350 In-Reply-To: <20220223071049.21153-1-peterlin@andestech.com> References: <20220223071049.21153-1-peterlin@andestech.com> Message-ID: <20220223071049.21153-2-peterlin@andestech.com> This patch provides defconfig and basic support for Andes 45 series RISC-V architecture on AE350 platform. http://www.andestech.com/en/products-solutions/andeshape-platforms/ae350-axi-based-platform-pre-integrated-with-n25f-nx25f-a25-ax25/ Signed-off-by: Yu Chien Peter Lin Signed-off-by: Alan Kao Reviewed-by: Giulio Benetti --- board/andes/ae350/ae350.dts | 274 ++++++++++++++++++ board/andes/ae350/genimage_sdcard.cfg | 26 ++ ...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/post-build.sh | 3 + board/andes/ae350/readme.txt | 65 +++++ .../boot/extlinux/extlinux.conf | 4 + board/andes/ae350/uboot.config.fragment | 5 + configs/andes_ae350_45_defconfig | 43 +++ 13 files changed, 579 insertions(+) create mode 100755 board/andes/ae350/ae350.dts 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 100755 board/andes/ae350/post-build.sh create mode 100644 board/andes/ae350/readme.txt create mode 100644 board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf 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/genimage_sdcard.cfg b/board/andes/ae350/genimage_sdcard.cfg new file mode 100644 index 0000000000..b8b9fe6a62 --- /dev/null +++ b/board/andes/ae350/genimage_sdcard.cfg @@ -0,0 +1,26 @@ +image boot.vfat { + vfat { + files = { + "u-boot-spl.bin", + "u-boot.itb", + "ae350.dtb", + } + } + size = 2M +} + +image sdcard.img { + hdimage { + } + + partition boot { + partition-type = 0xC + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + bootable = true + 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/post-build.sh b/board/andes/ae350/post-build.sh new file mode 100755 index 0000000000..0e6ce228f4 --- /dev/null +++ b/board/andes/ae350/post-build.sh @@ -0,0 +1,3 @@ +#!/bin/sh +cp $BINARIES_DIR/Image $TARGET_DIR/boot +cp $BINARIES_DIR/ae350.dtb $TARGET_DIR/boot diff --git a/board/andes/ae350/readme.txt b/board/andes/ae350/readme.txt new file mode 100644 index 0000000000..6825468d50 --- /dev/null +++ b/board/andes/ae350/readme.txt @@ -0,0 +1,65 @@ +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/ + |-- ae350.dtb + |-- boot.vfat + |-- fw_dynamic.bin + |-- fw_dynamic.elf + |-- fw_jump.bin + |-- fw_jump.elf + |-- Image + |-- 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 + $ sudo sync + +Your SD card partition should be: + + Disk /dev/sdb: 14.48 GiB, 15552479232 bytes, 30375936 sectors + Disk model: Multi-Card + Units: sectors of 1 * 512 = 512 bytes + Sector size (logical/physical): 512 bytes / 512 bytes + I/O size (minimum/optimal): 512 bytes / 512 bytes + Disklabel type: dos + Disk identifier: 0x00000000 + + Device Boot Start End Sectors Size Id Type + /dev/sdb1 1 4096 4096 2M c W95 FAT32 (LBA) + /dev/sdb2 * 4097 126976 122880 60M 83 Linux + +Insert SD card and reset the board, it should boot Linux from mmc. diff --git a/board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf b/board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf new file mode 100644 index 0000000000..549eb93abc --- /dev/null +++ b/board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +label linux + kernel /boot/Image + fdt /boot/ae350.dtb + append earlycon=sbi root=/dev/mmcblk0p2 rootwait 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..a35ddd06ba --- /dev/null +++ b/configs/andes_ae350_45_defconfig @@ -0,0 +1,43 @@ +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_OVERLAY="board/andes/ae350/rootfs_overlay" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/andes/ae350/post-build.sh" +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_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/andestech/linux.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.10.84-ae350_45" +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_PYTHON3=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y +# BR2_TARGET_UBOOT_FORMAT_BIN is not set +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.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 -- 2.17.1 From peterlin at andestech.com Wed Feb 23 07:10:49 2022 From: peterlin at andestech.com (Yu Chien Peter Lin) Date: Wed, 23 Feb 2022 15:10:49 +0800 Subject: [Buildroot] [PATCH v4 3/3] DEVELOPERS: add Yu-Chien Lin to board/andes In-Reply-To: <20220223071049.21153-1-peterlin@andestech.com> References: <20220223071049.21153-1-peterlin@andestech.com> Message-ID: <20220223071049.21153-3-peterlin@andestech.com> Nylon is no longer at Andes. Signed-off-by: Yu Chien Peter Lin Signed-off-by: Alan Kao Reviewed-by: Giulio Benetti --- DEVELOPERS | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index ac702d8d0f..cd64159867 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2146,10 +2146,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_ae300_defconfig +F: configs/andes_ae350_45_defconfig F: toolchain/toolchain-external/toolchain-external-andes-nds32/ N: Olaf Rempel -- 2.17.1 From angelo at amarulasolutions.com Wed Feb 23 07:53:22 2022 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Wed, 23 Feb 2022 08:53:22 +0100 Subject: [Buildroot] [PATCH] package/mono: bump to version 6.12.0.122 Message-ID: <20220223075322.3044754-1-angelo@amarulasolutions.com> Signed-off-by: Angelo Compagnucci --- package/mono/mono.hash | 2 +- package/mono/mono.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mono/mono.hash b/package/mono/mono.hash index 2477e9231c..ad070bf102 100644 --- a/package/mono/mono.hash +++ b/package/mono/mono.hash @@ -1,5 +1,5 @@ # sha256 locally computed -sha256 51de5c02ad511333f93ff585bca54c8784de35af4ff27b759d16b46c4402cdac mono-6.12.0.90.tar.xz +sha256 29c277660fc5e7513107aee1cbf8c5057c9370a4cdfeda2fc781be6986d89d23 mono-6.12.0.122.tar.xz sha256 923c7053ad0d430cd9b0b69a0ccf3abb7170a1ce50ecbf01915b565a35823d10 LICENSE sha256 fc488f3ec9f36856bea8cce5cdde1449176341ef93a3962b691970f8981799f4 mcs/COPYING sha256 2c3c3ef532828bcd42bb3127349625a25291ff5ae7e6f8d42e0fe9b5be836a99 external/Newtonsoft.Json/Tools/7-zip/copying.txt diff --git a/package/mono/mono.mk b/package/mono/mono.mk index 27f7886224..219effc5d3 100644 --- a/package/mono/mono.mk +++ b/package/mono/mono.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONO_VERSION = 6.12.0.90 +MONO_VERSION = 6.12.0.122 MONO_SITE = http://download.mono-project.com/sources/mono MONO_SOURCE = mono-$(MONO_VERSION).tar.xz MONO_LICENSE = GPL-2.0 or MIT (compiler, tools), MIT (libs) or commercial -- 2.25.1 From bugzilla at busybox.net Wed Feb 23 08:20:07 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 23 Feb 2022 08:20:07 +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 --- Comment #4 from Jens Maus --- I just checked the latest 2022.02-rc2 version and there the issue with not being able to compile nodejs v14+ on an ubuntu host still exists as outlined here. However, taking the workaround mentioned in https://gitlab.com/qemu-project/qemu/-/issues/857 I could workout a patch that seems to fix the issue: --- buildroot/package/nodejs/v8-qemu-wrapper.in.orig +++ buildroot/package/nodejs/v8-qemu-wrapper.in @@ -5,5 +5,6 @@ exec @QEMU_USER@ -r @TOOLCHAIN_HEADERS_VERSION@ \ @QEMU_USERMODE_ARGS@ \ -L "${STAGING_DIR}/" \ + -E LD_LIBRARY_PATH="/lib/" \ "$@" With this patch nodejs v14+ seems to compile fine on an ubuntu 20.04 LTS host. -- You are receiving this mail because: You are on the CC list for the bug. From David.Laight at ACULAB.COM Wed Feb 23 08:48:57 2022 From: David.Laight at ACULAB.COM (David Laight) Date: Wed, 23 Feb 2022 08:48:57 +0000 Subject: [Buildroot] [Bug 14366] Nodejs fails with "version `GLIBC_2.34' not found" on Ubuntu 20.04 In-Reply-To: References: Message-ID: > -----Original Message----- > From: buildroot On Behalf Of bugzilla at busybox.net > Sent: 23 February 2022 08:20 > To: buildroot at uclibc.org > Subject: [Buildroot] [Bug 14366] Nodejs fails with "version `GLIBC_2.34' not found" on Ubuntu 20.04 > > https://bugs.busybox.net/show_bug.cgi?id=14366 > > --- Comment #4 from Jens Maus --- > I just checked the latest 2022.02-rc2 version and there the issue with not > being able to compile nodejs v14+ on an ubuntu host still exists as outlined > here. > > However, taking the workaround mentioned in > https://gitlab.com/qemu-project/qemu/-/issues/857 I could workout a patch that > seems to fix the issue: > > --- buildroot/package/nodejs/v8-qemu-wrapper.in.orig > +++ buildroot/package/nodejs/v8-qemu-wrapper.in > @@ -5,5 +5,6 @@ > exec @QEMU_USER@ -r @TOOLCHAIN_HEADERS_VERSION@ \ > @QEMU_USERMODE_ARGS@ \ > -L "${STAGING_DIR}/" \ > + -E LD_LIBRARY_PATH="/lib/" \ > "$@" Except that isn't really what LD_LIBRARY_PATH path should be used for. David > > > With this patch nodejs v14+ seems to compile fine on an ubuntu 20.04 LTS host. > > -- > You are receiving this mail because: > You are on the CC list for the bug. > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot - Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales) From giulio.benetti at benettiengineering.com Wed Feb 23 09:19:08 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 23 Feb 2022 10:19:08 +0100 Subject: [Buildroot] [PATCH v4 1/3] board/andes: rearrange andes folder structure In-Reply-To: <20220223071049.21153-1-peterlin@andestech.com> References: <20220223071049.21153-1-peterlin@andestech.com> Message-ID: <84e159d2-0123-e5b1-c42e-99b70c99f43c@benettiengineering.com> Hi Peter, On 23/02/22 08:10, Yu Chien Peter Lin wrote: > Rename ae3xx to ae300 for nds32 architecture and add ae350 platform. > > AE300 (NDS32): > - http://www.andestech.com/en/products-solutions/andeshape-platforms/ae300/ > AE350 (RISC-V): > - http://www.andestech.com/en/products-solutions/andeshape-platforms/ae350-axi-based-platform-pre-integrated-with-n25f-nx25f-a25-ax25/ > > Signed-off-by: Yu Chien Peter Lin > Signed-off-by: Alan Kao > --- > Changes v1 -> v2: > - move linux source code and its patches to AndesTech Github repo > - rename ae350_andestar45_defconfig to andes_ae350_45_defconfig > - change C library to uClibc > - remove OpenSSL package > - remove rootfs.cpio and rootfs.tar > - update DEVELOPERS > Changes v2 -> v3: > - specifiy branch to download from AndesTech linux repo > - change boot.cmd to extlinux.conf > - add post-build.sh for extlinux.conf to retrieve Image and DTB > - fix format and update genimage_sdcard.cfg > - update readme.txt > - add packages (python3, pylibfdt and openssl) for u-boot binman > - reorder item in DEVELOPERS > Changes v3 -> v4: > - rename ae3xx folder to ae300 > - rename andes_ae3xx_defconfig to andes_ae300_defconfig > - update readme.txt and item in DEVELOPERS Some of these change ^^^ must have been moved to the single patch, like DEVELOPERS is updated in patch 3/3. I've also forgotten to point you to add a --cover-letter, so keep in mind both points for next time. I've built tested both defconfig successfully, so: Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti [Giulio: build tested only] And the other patches of this series is all reviewed, so to me it's ready to be committed, but this will happen after Buildroot 2022.02 is released, since between rc1 to the release Maintainers only accept fixes. Another possibility is that they will commit these patches to next branch. Please remember to tag V3. Thank you for your effort! Best regards -- Giulio Benetti Benetti Engineering sas > --- > .../{ae3xx/ae3xx.fragment => ae300/ae300.fragment} | 0 > .../linux/0001-nds32-Fix-boot-messages-garbled.patch | 0 > ...-dtc-Remove-redundant-YYLOC-global-declaratio.patch | 0 > board/andes/{ => ae300}/readme.txt | 10 +++++----- > .../{andes_ae3xx_defconfig => andes_ae300_defconfig} | 4 ++-- > .../toolchain-external-andes-nds32/Config.in | 2 +- > 6 files changed, 8 insertions(+), 8 deletions(-) > rename board/andes/{ae3xx/ae3xx.fragment => ae300/ae300.fragment} (100%) > rename board/andes/{ => ae300}/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch (100%) > rename board/andes/{ => ae300}/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch (100%) > rename board/andes/{ => ae300}/readme.txt (71%) > rename configs/{andes_ae3xx_defconfig => andes_ae300_defconfig} (69%) > > diff --git a/board/andes/ae3xx/ae3xx.fragment b/board/andes/ae300/ae300.fragment > similarity index 100% > rename from board/andes/ae3xx/ae3xx.fragment > rename to board/andes/ae300/ae300.fragment > diff --git a/board/andes/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch b/board/andes/ae300/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/ae300/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch > diff --git a/board/andes/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch b/board/andes/ae300/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch > similarity index 100% > rename from board/andes/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch > rename to board/andes/ae300/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch > diff --git a/board/andes/readme.txt b/board/andes/ae300/readme.txt > similarity index 71% > rename from board/andes/readme.txt > rename to board/andes/ae300/readme.txt > index 0f95c65549..51c05c9235 100644 > --- a/board/andes/readme.txt > +++ b/board/andes/ae300/readme.txt > @@ -1,10 +1,10 @@ > Intro > ===== > > -Andestech(nds32) AE3XX Platform > +Andestech(nds32) AE300 Platform > > -The AE3XX prototype demonstrates the AE3XX example platform on the FPGA. > -It is composed of one Andestech(nds32) processor and AE3XX. > +The AE300 prototype demonstrates the AE300 example platform on the FPGA. > +It is composed of one Andestech(nds32) processor and AE300. > > How to build it > =============== > @@ -12,10 +12,10 @@ How to build it > Configure Buildroot > ------------------- > > -The andes_ae3xx_defconfig configuration is a sample configuration with > +The andes_ae300_defconfig configuration is a sample configuration with > all that is required to bring the FPGA Development Board: > > - $ make andes_ae3xx_defconfig > + $ make andes_ae300_defconfig > > Build everything > ---------------- > diff --git a/configs/andes_ae3xx_defconfig b/configs/andes_ae300_defconfig > similarity index 69% > rename from configs/andes_ae3xx_defconfig > rename to configs/andes_ae300_defconfig > index 52634caa50..ffcb4d7d38 100644 > --- a/configs/andes_ae3xx_defconfig > +++ b/configs/andes_ae300_defconfig > @@ -1,10 +1,10 @@ > BR2_nds32=y > -BR2_GLOBAL_PATCH_DIR="board/andes/patches/" > +BR2_GLOBAL_PATCH_DIR="board/andes/ae300/patches" > BR2_TOOLCHAIN_EXTERNAL=y > BR2_TOOLCHAIN_EXTERNAL_ANDES_NDS32=y > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17" > BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/andes/ae3xx/ae3xx.fragment" > +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/andes/ae300/ae300.fragment" > BR2_TARGET_ROOTFS_INITRAMFS=y > diff --git a/toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in b/toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in > index 9c937b8c44..ecd50cc805 100644 > --- a/toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in > +++ b/toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in > @@ -12,4 +12,4 @@ config BR2_TOOLCHAIN_EXTERNAL_ANDES_NDS32 > help > nds32 toolchain for the nds32 architecture. It uses GCC > 8.2.1, GDB 8.1.1, glibc 2.28, Binutils 2.30. It generates > - code that runs on ae3xx platform > + code that runs on ae300 platform From peter at korsgaard.com Wed Feb 23 10:04:52 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Feb 2022 11:04:52 +0100 Subject: [Buildroot] [PATCH v6 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <87pmnsnquv.fsf@dell.be.48ers.dk> (Peter Korsgaard's message of "Sat, 12 Feb 2022 14:42:32 +0100") References: <20220211144402.1626443-1-neal.frager@xilinx.com> <87pmnsnquv.fsf@dell.be.48ers.dk> Message-ID: <87sfs96gqj.fsf@dell.be.48ers.dk> Hi, >>>>> "Neal" == Neal Frager writes: >> This patch: >> - bumps ATF to Xilinx v2.6: mainline v2.6 requires patch to build >> - bumps U-Boot to Xilinx 2022.01: important drivers not in mainline >> - bumps Linux to Xilinx 5.15: important drivers not in mainline >> - deletes board/zynqmp/patches directory: patches already in mainline >> - modifies board/zynqmp/genimage.cfg: U-Boot 2022.01 uses u-boot.itb format >> - adds extlinux.conf to vfat bootfs >> - modifies U-Boot to unified xilinx_zynqmp_virt_defconfig (supports all boards) >> - adds support for SPL pm_cfg_obj.c loading to PMU firmware >> - enables support for host machines without OpenSSL required by U-Boot and Linux >> Signed-off-by: Neal Frager >> Reviewed-by: Giulio Benetti >> Tested-by: Giulio Benetti >> [Giulio: only build tested] >> +++ b/configs/zynqmp_zcu106_defconfig >> @@ -1,34 +1,39 @@ >> BR2_aarch64=y >> -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/" >> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y >> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y >> +BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" >> BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" >> BR2_LINUX_KERNEL=y >> BR2_LINUX_KERNEL_CUSTOM_GIT=y >> BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" >> -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4" >> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="966124532656bc95d781abf57531e4cd4f962237" > The git hashes do not make it directly clear what version this is, so I > changed it to use the output of describe --abbrev=40 which adds > a prefix like v5.15-930-g in front, directly making it clear that this > is based on upstream 5.15 with 930 patches on top. > I've done it for ATF and U-Boot as well and committed, thanks. Hmm, did you test this on a zcu106 board? I just got access to a zcu106 rev 1.0 board and gave it a try here, and see nothing on either of the serial ports. Looking at the u-boot configuration I see that xilinx_zynqmp_virt_defconfig sets: CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu100-revC" Which seems to have a different uart and pinmuxing setup. Changing that to zynqmp-zcu106-revA it does boot (but complains here and there). This is the first time I use a zcu106, so maybe I am missing something, but I don't understand how it can work for you with the zcu100 DTB? Are the kernel BUG splashes expected? Boot log: U-Boot SPL 2022.01 (Feb 23 2022 - 10:35:14 +0100) PMUFW: v1.1 Loading new PMUFW cfg obj (2032 bytes) Silicon version: 3 EL Level: EL3 Chip ID: zu7e Multiboot: 0 Trying to boot from MMC2 spl: could not initialize mmc. error: -19 Trying to boot from MMC1 spl_load_image_fat_os: error reading image u-boot.bin, err - -2 NOTICE: BL31: v2.6(release):2022.02-rc2-4-g1a0d90d8ab NOTICE: BL31: Built : 10:05:33, Feb 23 2022 U-Boot 2022.01 (Feb 23 2022 - 10:06:21 +0100) CPU: ZynqMP Silicon: v3 Model: ZynqMP ZCU106 RevA Board: Xilinx ZynqMP DRAM: 4 GiB PMUFW: v1.1 Xilinx I2C Legacy format at nvmem0: Board name: zcu106 Board rev: 1.0 Board SN: 921730071832-88916 EL Level: EL2 Chip ID: zu7e NAND: 0 MiB MMC: mmc at ff170000: 0 Loading Environment from FAT... *** Error - No Valid Environment Area found *** Warning - bad env area, using default environment In: serial Out: serial Err: serial Bootmode: LVL_SHFT_SD_MODE1 Reset reason: EXTERNAL Net: ZYNQ GEM: ff0e0000, mdio bus ff0e0000, phyaddr 12, interface rgmii-id zynq_gem ethernet at ff0e0000: Failed to read eth PHY id, err: -2 Warning: ethernet at ff0e0000 (eth0) using random MAC address - 8a:9d:6d:13:b4:42 eth0: ethernet at ff0e0000 scanning bus for devices... SATA link 0 timeout. SATA link 1 timeout. AHCI 0001.0301 32 slots 2 ports 6 Gbps 0x3 impl SATA mode flags: 64bit ncq pm clo only pmp fbss pio slum part ccc apst starting USB... Bus usb at fe200000: Register 2000440 NbrPorts 2 Starting the controller USB XHCI 1.00 scanning bus usb at fe200000 for devices... 1 USB Device(s) found scanning usb for storage devices... 0 Storage Device(s) found Hit any key to stop autoboot: 0 switch to partitions #0, OK mmc0 is current device Scanning mmc 0:1... Found /extlinux/extlinux.conf Retrieving file: /extlinux/extlinux.conf 1: linux Retrieving file: /Image append: console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait Retrieving file: /system.dtb ## Flattened Device Tree blob at 40000000 Booting using the fdt blob at 0x40000000 Loading Device Tree to 000000007bdf4000, end 000000007be00998 ... OK Starting kernel ... [ 0.000000] Booting Linux on physical CPU 0x0000000000 [0x410fd034] [ 0.000000] Linux version 5.15.0 (peko at dell) (aarch64-buildroot-linux-uclibc-gcc.br_real (Buildroot 2022.02-rc2-4-g1a0d90d8ab) 10.3.0, GNU ld (GNU Binutils) 2.36.1) #1 SMP Wed Feb 23 10:07:13 CET 2022 [ 0.000000] Machine model: ZynqMP ZCU106 RevA [ 0.000000] efi: UEFI not found. [ 0.000000] Zone ranges: [ 0.000000] DMA32 [mem 0x0000000000000000-0x00000000ffffffff] [ 0.000000] Normal [mem 0x0000000100000000-0x000000087fffffff] [ 0.000000] Movable zone start for each node [ 0.000000] Early memory node ranges [ 0.000000] node 0: [mem 0x0000000000000000-0x000000007fffffff] [ 0.000000] node 0: [mem 0x0000000800000000-0x000000087fffffff] [ 0.000000] Initmem setup node 0 [mem 0x0000000000000000-0x000000087fffffff] [ 0.000000] cma: Reserved 256 MiB at 0x000000006bc00000 [ 0.000000] psci: probing for conduit method from DT. [ 0.000000] psci: PSCIv1.1 detected in firmware. [ 0.000000] psci: Using standard PSCI v0.2 function IDs [ 0.000000] psci: MIGRATE_INFO_TYPE not supported. [ 0.000000] psci: SMC Calling Convention v1.2 [ 0.000000] percpu: Embedded 18 pages/cpu s33048 r8192 d32488 u73728 [ 0.000000] Detected VIPT I-cache on CPU0 [ 0.000000] CPU features: detected: ARM erratum 845719 [ 0.000000] Built 1 zonelists, mobility grouping on. Total pages: 1034240 [ 0.000000] Kernel command line: console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait [ 0.000000] Dentry cache hash table entries: 524288 (order: 10, 4194304 bytes, linear) [ 0.000000] Inode-cache hash table entries: 262144 (order: 9, 2097152 bytes, linear) [ 0.000000] mem auto-init: stack:off, heap alloc:off, heap free:off [ 0.000000] software IO TLB: mapped [mem 0x000000007c000000-0x0000000080000000] (64MB) [ 0.000000] Memory: 3772724K/4194304K available (13632K kernel code, 908K rwdata, 3872K rodata, 1984K init, 307K bss, 159436K reserved, 262144K cma-reserved) [ 0.000000] rcu: Hierarchical RCU implementation. [ 0.000000] rcu: RCU event tracing is enabled. [ 0.000000] rcu: RCU calculated value of scheduler-enlistment delay is 25 jiffies. [ 0.000000] NR_IRQS: 64, nr_irqs: 64, preallocated irqs: 0 [ 0.000000] GIC: Adjusting CPU interface base to 0x00000000f902f000 [ 0.000000] Root IRQ handler: gic_handle_irq [ 0.000000] GIC: Using split EOI/Deactivate mode [ 0.000000] random: get_random_bytes called from start_kernel+0x470/0x6f8 with crng_init=0 [ 0.000000] arch_timer: cp15 timer(s) running at 100.00MHz (phys). [ 0.000000] clocksource: arch_sys_counter: mask: 0xffffffffffffff max_cycles: 0x171024e7e0, max_idle_ns: 440795205315 ns [ 0.000000] sched_clock: 56 bits at 100MHz, resolution 10ns, wraps every 4398046511100ns [ 0.000288] Console: colour dummy device 80x25 [ 0.000321] Calibrating delay loop (skipped), value calculated using timer frequency.. 200.00 BogoMIPS (lpj=400000) [ 0.000332] pid_max: default: 32768 minimum: 301 [ 0.000438] Mount-cache hash table entries: 8192 (order: 4, 65536 bytes, linear) [ 0.000457] Mountpoint-cache hash table entries: 8192 (order: 4, 65536 bytes, linear) [ 0.001273] rcu: Hierarchical SRCU implementation. [ 0.001528] EFI services will not be available. [ 0.001653] smp: Bringing up secondary CPUs ... [ 0.001990] Detected VIPT I-cache on CPU1 [ 0.002027] CPU1: Booted secondary processor 0x0000000001 [0x410fd034] [ 0.002403] Detected VIPT I-cache on CPU2 [ 0.002427] CPU2: Booted secondary processor 0x0000000002 [0x410fd034] [ 0.002769] Detected VIPT I-cache on CPU3 [ 0.002792] CPU3: Booted secondary processor 0x0000000003 [0x410fd034] [ 0.002835] smp: Brought up 1 node, 4 CPUs [ 0.002852] SMP: Total of 4 processors activated. [ 0.002857] CPU features: detected: 32-bit EL0 Support [ 0.002862] CPU features: detected: CRC32 instructions [ 0.002902] CPU: All CPU(s) started at EL2 [ 0.002918] alternatives: patching kernel code [ 0.003960] devtmpfs: initialized [ 0.009544] clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 7645041785100000 ns [ 0.009562] futex hash table entries: 1024 (order: 4, 65536 bytes, linear) [ 0.017810] pinctrl core: initialized pinctrl subsystem [ 0.018441] NET: Registered PF_NETLINK/PF_ROUTE protocol family [ 0.019418] DMA: preallocated 512 KiB GFP_KERNEL pool for atomic allocations [ 0.019518] DMA: preallocated 512 KiB GFP_KERNEL|GFP_DMA32 pool for atomic allocations [ 0.019556] audit: initializing netlink subsys (disabled) [ 0.019631] audit: type=2000 audit(0.016:1): state=initialized audit_enabled=0 res=1 [ 0.019926] hw-breakpoint: found 6 breakpoint and 4 watchpoint registers. [ 0.020003] ASID allocator initialised with 65536 entries [ 0.037264] HugeTLB registered 1.00 GiB page size, pre-allocated 0 pages [ 0.037277] HugeTLB registered 32.0 MiB page size, pre-allocated 0 pages [ 0.037284] HugeTLB registered 2.00 MiB page size, pre-allocated 0 pages [ 0.037290] HugeTLB registered 64.0 KiB page size, pre-allocated 0 pages [ 1.101889] DRBG: Continuing without Jitter RNG [ 1.204745] raid6: neonx8 gen() 2143 MB/s [ 1.272796] raid6: neonx8 xor() 1594 MB/s [ 1.340859] raid6: neonx4 gen() 2184 MB/s [ 1.408910] raid6: neonx4 xor() 1577 MB/s [ 1.476970] raid6: neonx2 gen() 2069 MB/s [ 1.545023] raid6: neonx2 xor() 1453 MB/s [ 1.613092] raid6: neonx1 gen() 1802 MB/s [ 1.681135] raid6: neonx1 xor() 1240 MB/s [ 1.749185] raid6: int64x8 gen() 1471 MB/s [ 1.817242] raid6: int64x8 xor() 785 MB/s [ 1.885301] raid6: int64x4 gen() 1582 MB/s [ 1.953353] raid6: int64x4 xor() 841 MB/s [ 2.021426] raid6: int64x2 gen() 1397 MB/s [ 2.089481] raid6: int64x2 xor() 750 MB/s [ 2.157554] raid6: int64x1 gen() 1187 MB/s [ 2.225592] raid6: int64x1 xor() 596 MB/s [ 2.225598] raid6: using algorithm neonx4 gen() 2184 MB/s [ 2.225603] raid6: .... xor() 1577 MB/s, rmw enabled [ 2.225608] raid6: using neon recovery algorithm [ 2.225975] iommu: Default domain type: Translated [ 2.225982] iommu: DMA domain TLB invalidation policy: strict mode [ 2.226202] SCSI subsystem initialized [ 2.226349] usbcore: registered new interface driver usbfs [ 2.226377] usbcore: registered new interface driver hub [ 2.226400] usbcore: registered new device driver usb [ 2.226454] mc: Linux media interface: v0.10 [ 2.226473] videodev: Linux video capture interface: v2.00 [ 2.226509] pps_core: LinuxPPS API ver. 1 registered [ 2.226514] pps_core: Software ver. 5.3.6 - Copyright 2005-2007 Rodolfo Giometti [ 2.226526] PTP clock support registered [ 2.226553] EDAC MC: Ver: 3.0.0 [ 2.226836] zynqmp-ipi-mbox mailbox at ff990400: Registered ZynqMP IPI mbox with TX/RX channels. [ 2.227024] FPGA manager framework [ 2.227145] Advanced Linux Sound Architecture Driver Initialized. [ 2.227429] Bluetooth: Core ver 2.22 [ 2.227453] NET: Registered PF_BLUETOOTH protocol family [ 2.227459] Bluetooth: HCI device and connection manager initialized [ 2.227467] Bluetooth: HCI socket layer initialized [ 2.227474] Bluetooth: L2CAP socket layer initialized [ 2.227485] Bluetooth: SCO socket layer initialized [ 2.227775] clocksource: Switched to clocksource arch_sys_counter [ 2.227873] VFS: Disk quotas dquot_6.6.0 [ 2.227912] VFS: Dquot-cache hash table entries: 512 (order 0, 4096 bytes) [ 2.231825] NET: Registered PF_INET protocol family [ 2.231947] IP idents hash table entries: 65536 (order: 7, 524288 bytes, linear) [ 2.233469] tcp_listen_portaddr_hash hash table entries: 2048 (order: 3, 32768 bytes, linear) [ 2.233516] TCP established hash table entries: 32768 (order: 6, 262144 bytes, linear) [ 2.233722] TCP bind hash table entries: 32768 (order: 7, 524288 bytes, linear) [ 2.234105] TCP: Hash tables configured (established 32768 bind 32768) [ 2.234173] UDP hash table entries: 2048 (order: 4, 65536 bytes, linear) [ 2.234250] UDP-Lite hash table entries: 2048 (order: 4, 65536 bytes, linear) [ 2.234400] NET: Registered PF_UNIX/PF_LOCAL protocol family [ 2.234694] RPC: Registered named UNIX socket transport module. [ 2.234702] RPC: Registered udp transport module. [ 2.234706] RPC: Registered tcp transport module. [ 2.234710] RPC: Registered tcp NFSv4.1 backchannel transport module. [ 2.235296] PCI: CLS 0 bytes, default 64 [ 2.235581] armv8-pmu pmu: hw perfevents: no interrupt-affinity property, guessing. [ 2.235746] hw perfevents: enabled with armv8_pmuv3 PMU driver, 7 counters available [ 2.236515] Initialise system trusted keyrings [ 2.236595] workingset: timestamp_bits=62 max_order=20 bucket_order=0 [ 2.237148] NFS: Registering the id_resolver key type [ 2.237162] Key type id_resolver registered [ 2.237167] Key type id_legacy registered [ 2.237184] nfs4filelayout_init: NFSv4 File Layout Driver Registering... [ 2.237190] nfs4flexfilelayout_init: NFSv4 Flexfile Layout Driver Registering... [ 2.237207] jffs2: version 2.2. (NAND) ? 2001-2006 Red Hat, Inc. [ 2.273154] NET: Registered PF_ALG protocol family [ 2.273167] xor: measuring software checksum speed [ 2.277216] 8regs : 2438 MB/sec [ 2.280739] 32regs : 2800 MB/sec [ 2.285008] arm64_neon : 2309 MB/sec [ 2.285014] xor: using function: 32regs (2800 MB/sec) [ 2.285021] Key type asymmetric registered [ 2.285026] Asymmetric key parser 'x509' registered [ 2.285062] Block layer SCSI generic (bsg) driver version 0.4 loaded (major 245) [ 2.285069] io scheduler mq-deadline registered [ 2.285075] io scheduler kyber registered [ 2.309548] Serial: 8250/16550 driver, 4 ports, IRQ sharing disabled [ 2.312677] cacheinfo: Unable to detect cache hierarchy for CPU 0 [ 2.316619] brd: module loaded [ 2.319780] loop: module loaded [ 2.320496] mtdoops: mtd device (mtddev=name/number) must be supplied [ 2.321724] libphy: Fixed MDIO Bus: probed [ 2.322824] tun: Universal TUN/TAP device driver, 1.6 [ 2.322904] CAN device driver interface [ 2.323561] usbcore: registered new interface driver asix [ 2.323600] usbcore: registered new interface driver ax88179_178a [ 2.323625] usbcore: registered new interface driver cdc_ether [ 2.323647] usbcore: registered new interface driver net1080 [ 2.323669] usbcore: registered new interface driver cdc_subset [ 2.323692] usbcore: registered new interface driver zaurus [ 2.323724] usbcore: registered new interface driver cdc_ncm [ 2.324408] usbcore: registered new interface driver uas [ 2.324440] usbcore: registered new interface driver usb-storage [ 2.325070] rtc_zynqmp ffa60000.rtc: registered as rtc0 [ 2.325087] rtc_zynqmp ffa60000.rtc: setting system clock to 2021-01-18T20:15:26 UTC (1611000926) [ 2.325153] i2c_dev: i2c /dev entries driver [ 2.326567] usbcore: registered new interface driver uvcvideo [ 2.327362] Bluetooth: HCI UART driver ver 2.3 [ 2.327370] Bluetooth: HCI UART protocol H4 registered [ 2.327376] Bluetooth: HCI UART protocol BCSP registered [ 2.327394] Bluetooth: HCI UART protocol LL registered [ 2.327400] Bluetooth: HCI UART protocol ATH3K registered [ 2.327416] Bluetooth: HCI UART protocol Three-wire (H5) registered [ 2.327453] Bluetooth: HCI UART protocol Intel registered [ 2.327470] Bluetooth: HCI UART protocol QCA registered [ 2.327499] usbcore: registered new interface driver bcm203x [ 2.327525] usbcore: registered new interface driver bpa10x [ 2.327550] usbcore: registered new interface driver bfusb [ 2.327576] usbcore: registered new interface driver btusb [ 2.327616] usbcore: registered new interface driver ath3k [ 2.327688] EDAC MC: ECC not enabled [ 2.327829] EDAC DEVICE0: Giving out device to module edac controller cache_err: DEV edac (POLLED) [ 2.327977] EDAC DEVICE1: Giving out device to module zynqmp-ocm-edac controller zynqmp_ocm: DEV ff960000.memory-controller (INTERRUPT) [ 2.328309] sdhci: Secure Digital Host Controller Interface driver [ 2.328315] sdhci: Copyright(c) Pierre Ossman [ 2.328319] sdhci-pltfm: SDHCI platform and OF driver helper [ 2.328645] ledtrig-cpu: registered to indicate activity on CPUs [ 2.328735] SMCCC: SOC_ID: ARCH_SOC_ID not implemented, skipping .... [ 2.328772] zynqmp_firmware_probe Platform Management API v1.1 [ 2.328780] zynqmp_firmware_probe Trustzone version v1.0 [ 2.358985] securefw securefw: securefw probed [ 2.359229] alg: No test for xilinx-zynqmp-aes (zynqmp-aes) [ 2.359249] zynqmp_aes firmware:zynqmp-firmware:zynqmp-aes: AES Successfully Registered [ 2.359423] alg: No test for xilinx-keccak-384 (zynqmp-keccak-384) [ 2.359595] alg: No test for xilinx-zynqmp-rsa (zynqmp-rsa) [ 2.359737] usbcore: registered new interface driver usbhid [ 2.359744] usbhid: USB HID core driver [ 2.361013] fpga_manager fpga0: Xilinx ZynqMP FPGA Manager registered [ 2.361338] usbcore: registered new interface driver snd-usb-audio [ 2.362114] pktgen: Packet Generator for packet performance testing. Version: 2.75 [ 2.362489] Initializing XFRM netlink socket [ 2.362565] NET: Registered PF_INET6 protocol family [ 2.363069] Segment Routing with IPv6 [ 2.363087] In-situ OAM (IOAM) with IPv6 [ 2.363138] sit: IPv6, IPv4 and MPLS over IPv4 tunneling driver [ 2.363447] NET: Registered PF_PACKET protocol family [ 2.363462] NET: Registered PF_KEY protocol family [ 2.363482] can: controller area network core [ 2.363508] NET: Registered PF_CAN protocol family [ 2.363514] can: raw protocol [ 2.363520] can: broadcast manager protocol [ 2.363527] can: netlink gateway - max_hops=1 [ 2.363619] Bluetooth: RFCOMM TTY layer initialized [ 2.363632] Bluetooth: RFCOMM socket layer initialized [ 2.363647] Bluetooth: RFCOMM ver 1.11 [ 2.363656] Bluetooth: BNEP (Ethernet Emulation) ver 1.3 [ 2.363662] Bluetooth: BNEP filters: protocol multicast [ 2.363669] Bluetooth: BNEP socket layer initialized [ 2.363674] Bluetooth: HIDP (Human Interface Emulation) ver 1.2 [ 2.363681] Bluetooth: HIDP socket layer initialized [ 2.363819] 9pnet: Installing 9P2000 support [ 2.363839] Key type dns_resolver registered [ 2.363942] registered taskstats version 1 [ 2.363948] Loading compiled-in X.509 certificates [ 2.364918] Btrfs loaded, crc32c=crc32c-generic, zoned=no, fsverity=no [ 2.373064] ff000000.serial: ttyPS0 at MMIO 0xff000000 (irq = 42, base_baud = 6249999) is a xuartps [ 3.672506] printk: console [ttyPS0] enabled [ 3.677493] ff010000.serial: ttyPS1 at MMIO 0xff010000 (irq = 43, base_baud = 6249999) is a xuartps [ 3.686810] of-fpga-region fpga-full: FPGA Region probed [ 3.693554] xilinx-zynqmp-dma fd500000.dma-controller: ZynqMP DMA driver Probe success [ 3.701632] xilinx-zynqmp-dma fd510000.dma-controller: ZynqMP DMA driver Probe success [ 3.709702] xilinx-zynqmp-dma fd520000.dma-controller: ZynqMP DMA driver Probe success [ 3.717776] xilinx-zynqmp-dma fd530000.dma-controller: ZynqMP DMA driver Probe success [ 3.725847] xilinx-zynqmp-dma fd540000.dma-controller: ZynqMP DMA driver Probe success [ 3.733921] xilinx-zynqmp-dma fd550000.dma-controller: ZynqMP DMA driver Probe success [ 3.741994] xilinx-zynqmp-dma fd560000.dma-controller: ZynqMP DMA driver Probe success [ 3.750063] xilinx-zynqmp-dma fd570000.dma-controller: ZynqMP DMA driver Probe success [ 3.758379] xilinx-zynqmp-dpdma fd4c0000.dma-controller: Xilinx DPDMA engine is probed [ 3.767022] spi-nor spi0.0: found mt25qu512a, expected m25p80 [ 3.773292] spi-nor spi0.0: mt25qu512a (131072 Kbytes) [ 3.778451] 4 fixed-partitions partitions found on MTD device spi0.0 [ 3.784796] Creating 4 MTD partitions on "spi0.0": [ 3.789581] 0x000000000000-0x000000100000 : "qspi-fsbl-uboot" [ 3.796118] 0x000000100000-0x000000600000 : "qspi-linux" [ 3.802113] 0x000000600000-0x000000620000 : "qspi-device-tree" [ 3.808615] 0x000000620000-0x000000c00000 : "qspi-rootfs" [ 3.817419] macb ff0e0000.ethernet: Not enabling partial store and forward [ 3.824936] libphy: MACB_mii_bus: probed [ 3.829496] macb ff0e0000.ethernet eth0: Cadence GEM rev 0x50070106 at 0xff0e0000 irq 30 (8a:9d:6d:13:b4:42) [ 3.839620] xilinx-axipmon ffa00000.perf-monitor: Probed Xilinx APM [ 3.846207] xilinx-axipmon fd0b0000.perf-monitor: Probed Xilinx APM [ 3.852698] xilinx-axipmon fd490000.perf-monitor: Probed Xilinx APM [ 3.859192] xilinx-axipmon ffa10000.perf-monitor: Probed Xilinx APM [ 3.866522] pca953x 0-0020: supply vcc not found, using dummy regulator [ 3.873218] pca953x 0-0020: using no AI [ 3.877724] pca953x 0-0021: supply vcc not found, using dummy regulator [ 3.884395] pca953x 0-0021: using no AI [ 3.897104] i2c i2c-0: Added multiplexed i2c bus 2 [ 3.908338] i2c i2c-0: Added multiplexed i2c bus 3 [ 3.924679] random: fast init done [ 3.966097] i2c i2c-0: Added multiplexed i2c bus 4 [ 3.970999] i2c i2c-0: Added multiplexed i2c bus 5 [ 3.975789] pca954x 0-0075: registered 4 multiplexed busses for I2C mux pca9544 [ 3.983147] cdns-i2c ff020000.i2c: 400 kHz mmio ff020000 irq 32 [ 3.990509] at24 6-0054: supply vcc not found, using dummy regulator [ 3.997388] at24 6-0054: 1024 byte 24c08 EEPROM, writable, 1 bytes/write [ 4.004128] i2c i2c-1: Added multiplexed i2c bus 6 [ 4.009450] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out [ 4.016760] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out [ 4.024061] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out [ 4.031362] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out [ 4.038661] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out [ 4.045961] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out [ 4.054383] si5341 7-0036: Chip: 5341 Grade: 1 Rev: 1 [ 4.093288] i2c i2c-1: Added multiplexed i2c bus 7 [ 4.100897] si570 8-005d: registered, current frequency 300000000 Hz [ 4.107281] i2c i2c-1: Added multiplexed i2c bus 8 [ 4.127003] si570 9-005d: registered, current frequency 148500000 Hz [ 4.133390] i2c i2c-1: Added multiplexed i2c bus 9 [ 4.138387] si5324 10-0069: si5328 probed [ 4.204331] si5324 10-0069: si5328 probe successful [ 4.209248] i2c i2c-1: Added multiplexed i2c bus 10 [ 4.215324] i2c i2c-1: Added multiplexed i2c bus 11 [ 4.220315] i2c i2c-1: Added multiplexed i2c bus 12 [ 4.225302] i2c i2c-1: Added multiplexed i2c bus 13 [ 4.230182] pca954x 1-0074: registered 8 multiplexed busses for I2C switch pca9548 [ 4.238109] i2c i2c-1: Added multiplexed i2c bus 14 [ 4.243110] i2c i2c-1: Added multiplexed i2c bus 15 [ 4.248106] i2c i2c-1: Added multiplexed i2c bus 16 [ 4.253107] i2c i2c-1: Added multiplexed i2c bus 17 [ 4.258115] i2c i2c-1: Added multiplexed i2c bus 18 [ 4.263114] i2c i2c-1: Added multiplexed i2c bus 19 [ 4.268112] i2c i2c-1: Added multiplexed i2c bus 20 [ 4.273124] i2c i2c-1: Added multiplexed i2c bus 21 [ 4.278000] pca954x 1-0075: registered 8 multiplexed busses for I2C switch pca9548 [ 4.285597] cdns-i2c ff030000.i2c: 400 kHz mmio ff030000 irq 33 [ 4.295393] cdns-wdt fd4d0000.watchdog: Xilinx Watchdog Timer with timeout 60s [ 4.304764] zynqmp-display fd4a0000.display: vtc bridge property not present [ 4.313211] ------------[ cut here ]------------ [ 4.317834] More than allowed devices are using the vpll_int, which is forbidden [ 4.325263] WARNING: CPU: 0 PID: 7 at drivers/clk/zynqmp/pll.c:200 zynqmp_pll_set_rate+0x198/0x200 [ 4.334227] Modules linked in: [ 4.337274] CPU: 0 PID: 7 Comm: kworker/u8:0 Not tainted 5.15.0 #1 [ 4.343444] Hardware name: ZynqMP ZCU106 RevA (DT) [ 4.348229] Workqueue: events_unbound deferred_probe_work_func [ 4.354061] pstate: 60000005 (nZCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 4.361012] pc : zynqmp_pll_set_rate+0x198/0x200 [ 4.365622] lr : zynqmp_pll_set_rate+0x198/0x200 [ 4.370231] sp : ffffffc0114f3660 [ 4.373538] x29: ffffffc0114f3660 x28: ffffff887f7f6458 x27: ffffff88003ec410 [ 4.380673] x26: 000000000000b61b x25: ffffff88014e4880 x24: 0000000000000060 [ 4.387808] x23: 0000000001fca055 x22: ffffff88014e4880 x21: ffffff88014e4900 [ 4.394943] x20: 000000000169cfa1 x19: 0000000059682ef1 x18: 0000000000000030 [ 4.402078] x17: 6962726f66207369 x16: 206863696877202c x15: 746e695f6c6c7076 [ 4.409212] x14: 2065687420676e69 x13: 6e6564646962726f x12: ffffffc01133b230 [ 4.416348] x11: 0000000000000136 x10: 6c6c707620656874 x9 : 00000000fffff7ff [ 4.423483] x8 : ffffffc011367230 x7 : 000000000000bfe8 x6 : 80000000fffff800 [ 4.430617] x5 : 0000000000000000 x4 : 0000000000000000 x3 : 0000000000000000 [ 4.437744] x2 : 0000000000000000 x1 : 0000000000000000 x0 : ffffff880009ad80 [ 4.444879] Call trace: [ 4.447319] zynqmp_pll_set_rate+0x198/0x200 [ 4.451580] clk_change_rate+0x148/0x2c0 [ 4.455495] clk_core_set_rate_nolock+0x154/0x240 [ 4.460190] clk_set_rate+0x38/0x150 [ 4.463758] xilinx_dp_codec_probe+0xac/0x1c0 [ 4.468107] platform_probe+0x68/0xe0 [ 4.471761] really_probe.part.0+0x9c/0x310 [ 4.475936] __driver_probe_device+0x98/0x150 [ 4.480285] driver_probe_device+0x44/0x120 [ 4.484460] __device_attach_driver+0xb4/0x120 [ 4.488895] bus_for_each_drv+0x78/0xd0 [ 4.492723] __device_attach+0xdc/0x190 [ 4.496551] device_initial_probe+0x14/0x20 [ 4.500726] bus_probe_device+0x9c/0xb0 [ 4.504554] device_add+0x36c/0x860 [ 4.508034] of_device_add+0x58/0x70 [ 4.511602] of_platform_device_create_pdata+0xc0/0x100 [ 4.516819] of_platform_bus_create+0x178/0x390 [ 4.521341] of_platform_populate+0x58/0xf0 [ 4.525516] zynqmp_dpsub_probe+0xe8/0x170 [ 4.529604] platform_probe+0x68/0xe0 [ 4.533259] really_probe.part.0+0x9c/0x310 [ 4.537434] __driver_probe_device+0x98/0x150 [ 4.541782] driver_probe_device+0x44/0x120 [ 4.545957] __device_attach_driver+0xb4/0x120 [ 4.550393] bus_for_each_drv+0x78/0xd0 [ 4.554221] __device_attach+0xdc/0x190 [ 4.558049] device_initial_probe+0x14/0x20 [ 4.562224] bus_probe_device+0x9c/0xb0 [ 4.566052] deferred_probe_work_func+0x88/0xc0 [ 4.570574] process_one_work+0x1d4/0x390 [ 4.574585] worker_thread+0x298/0x4e0 [ 4.578325] kthread+0x120/0x130 [ 4.581545] ret_from_fork+0x10/0x20 [ 4.585113] ---[ end trace 59c0d1ba4e758fd6 ]--- [ 4.591486] ------------[ cut here ]------------ [ 4.596107] More than allowed devices are using the vpll_int, which is forbidden [ 4.603220] mmc0: SDHCI controller on ff170000.mmc [ff170000.mmc] using ADMA 64-bit [ 4.603529] WARNING: CPU: 0 PID: 7 at drivers/clk/zynqmp/pll.c:200 zynqmp_pll_set_rate+0x198/0x200 [ 4.620067] Modules linked in: [ 4.623115] CPU: 0 PID: 7 Comm: kworker/u8:0 Tainted: G W 5.15.0 #1 [ 4.630674] Hardware name: ZynqMP ZCU106 RevA (DT) [ 4.635458] Workqueue: events_unbound deferred_probe_work_func [ 4.641282] pstate: 60000005 (nZCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 4.648234] pc : zynqmp_pll_set_rate+0x198/0x200 [ 4.652843] lr : zynqmp_pll_set_rate+0x198/0x200 [ 4.657452] sp : ffffffc0114f3660 [ 4.660759] x29: ffffffc0114f3660 x28: ffffff887f7f6458 x27: ffffff88003ec410 [ 4.667894] x26: 0000000000000fc2 x25: ffffff88014e4880 x24: 0000000000000060 [ 4.675029] x23: 0000000001fca055 x22: ffffff88014e4880 x21: ffffff88014e4900 [ 4.682164] x20: 00000000001f4ed6 x19: 000000005b64cf46 x18: 0000000000000030 [ 4.689299] x17: 6962726f66207369 x16: 206863696877202c x15: 746e695f6c6c7076 [ 4.696434] x14: 2065687420676e69 x13: 6e6564646962726f x12: 6620736920686369 [ 4.703569] x11: 6877202c746e695f x10: 6c6c707620656874 x9 : 7375206572612073 [ 4.710704] x8 : 6563697665642064 x7 : 205d373031363935 x6 : 352e34202020205b [ 4.717839] x5 : ffffffc01140b1a7 x4 : 0000000000000000 x3 : 0000000000000000 [ 4.724974] x2 : 0000000000000000 x1 : 0000000000000000 x0 : ffffff880009ad80 [ 4.732109] Call trace: [ 4.734548] zynqmp_pll_set_rate+0x198/0x200 [ 4.738810] clk_change_rate+0x148/0x2c0 [ 4.742724] clk_core_set_rate_nolock+0x154/0x240 [ 4.747421] clk_set_rate+0x38/0x150 [ 4.750988] xilinx_dp_codec_probe+0xac/0x1c0 [ 4.755337] platform_probe+0x68/0xe0 [ 4.758991] really_probe.part.0+0x9c/0x310 [ 4.763166] __driver_probe_device+0x98/0x150 [ 4.767515] driver_probe_device+0x44/0x120 [ 4.771690] __device_attach_driver+0xb4/0x120 [ 4.776125] bus_for_each_drv+0x78/0xd0 [ 4.779953] __device_attach+0xdc/0x190 [ 4.783781] device_initial_probe+0x14/0x20 [ 4.787956] bus_probe_device+0x9c/0xb0 [ 4.791784] device_add+0x36c/0x860 [ 4.795265] of_device_add+0x58/0x70 [ 4.798832] of_platform_device_create_pdata+0xc0/0x100 [ 4.804049] of_platform_bus_create+0x178/0x390 [ 4.808571] of_platform_populate+0x58/0xf0 [ 4.812746] zynqmp_dpsub_probe+0xe8/0x170 [ 4.816834] platform_probe+0x68/0xe0 [ 4.820488] really_probe.part.0+0x9c/0x310 [ 4.824664] __driver_probe_device+0x98/0x150 [ 4.829012] driver_probe_device+0x44/0x120 [ 4.833187] __device_attach_driver+0xb4/0x120 [ 4.837623] bus_for_each_drv+0x78/0xd0 [ 4.841451] __device_attach+0xdc/0x190 [ 4.845279] device_initial_probe+0x14/0x20 [ 4.849454] bus_probe_device+0x9c/0xb0 [ 4.853281] deferred_probe_work_func+0x88/0xc0 [ 4.857804] process_one_work+0x1d4/0x390 [ 4.861805] worker_thread+0x298/0x4e0 [ 4.865547] kthread+0x120/0x130 [ 4.868766] ret_from_fork+0x10/0x20 [ 4.872334] ---[ end trace 59c0d1ba4e758fd7 ]--- [ 4.877097] zynqmp_clk_divider_set_rate() set divider failed for dp_audio_ref_div1, ret = -22 [ 4.885950] xilinx-dp-snd-codec fd4a0000.display:zynqmp_dp_snd_codec0: Failed to get required clock freq [ 4.895486] xilinx-dp-snd-codec: probe of fd4a0000.display:zynqmp_dp_snd_codec0 failed with error -22 [ 4.904966] xilinx-dp-snd-pcm zynqmp_dp_snd_pcm0: Xilinx DisplayPort Sound PCM probed [ 4.913026] xilinx-dp-snd-pcm zynqmp_dp_snd_pcm1: Xilinx DisplayPort Sound PCM probed [ 4.921168] OF: graph: no port node found in /axi/display at fd4a0000 [ 4.927790] xlnx-drm xlnx-drm.0: bound fd4a0000.display (ops 0xffffffc010e27fa0) [ 4.935422] [drm] Initialized xlnx 1.0.0 20130509 for fd4a0000.display on minor 0 [ 4.942943] zynqmp-display fd4a0000.display: ZynqMP DisplayPort Subsystem driver probed [ 4.951187] ahci-ceva fd0c0000.ahci: supply ahci not found, using dummy regulator [ 4.958754] ahci-ceva fd0c0000.ahci: supply phy not found, using dummy regulator [ 4.966228] ahci-ceva fd0c0000.ahci: supply target not found, using dummy regulator [ 4.973784] mmc0: new high speed SDHC card at address aaaa [ 4.974229] ahci-ceva fd0c0000.ahci: AHCI 0001.0301 32 slots 2 ports 6 Gbps 0x3 impl platform mode [ 4.979720] mmcblk0: mmc0:aaaa SL16G 14.8 GiB [ 4.988316] ahci-ceva fd0c0000.ahci: flags: 64bit ncq sntf pm clo only pmp fbs pio slum part ccc sds apst [ 4.997985] mmcblk0: p1 p2 [ 5.006099] scsi host0: ahci-ceva [ 5.009746] scsi host1: ahci-ceva [ 5.013170] ata1: SATA max UDMA/133 mmio [mem 0xfd0c0000-0xfd0c1fff] port 0x100 irq 40 [ 5.021098] ata2: SATA max UDMA/133 mmio [mem 0xfd0c0000-0xfd0c1fff] port 0x180 irq 40 [ 5.052537] xhci-hcd xhci-hcd.1.auto: xHCI Host Controller [ 5.058041] xhci-hcd xhci-hcd.1.auto: new USB bus registered, assigned bus number 1 [ 5.065816] xhci-hcd xhci-hcd.1.auto: hcc params 0x0238f625 hci version 0x100 quirks 0x0000000002010810 [ 5.075249] xhci-hcd xhci-hcd.1.auto: irq 47, io mem 0xfe200000 [ 5.081274] xhci-hcd xhci-hcd.1.auto: xHCI Host Controller [ 5.086764] xhci-hcd xhci-hcd.1.auto: new USB bus registered, assigned bus number 2 [ 5.094430] xhci-hcd xhci-hcd.1.auto: Host supports USB 3.0 SuperSpeed [ 5.101065] usb usb1: New USB device found, idVendor=1d6b, idProduct=0002, bcdDevice= 5.15 [ 5.109340] usb usb1: New USB device strings: Mfr=3, Product=2, SerialNumber=1 [ 5.116570] usb usb1: Product: xHCI Host Controller [ 5.121456] usb usb1: Manufacturer: Linux 5.15.0 xhci-hcd [ 5.126864] usb usb1: SerialNumber: xhci-hcd.1.auto [ 5.132072] hub 1-0:1.0: USB hub found [ 5.135849] hub 1-0:1.0: 1 port detected [ 5.140065] usb usb2: New USB device found, idVendor=1d6b, idProduct=0003, bcdDevice= 5.15 [ 5.148336] usb usb2: New USB device strings: Mfr=3, Product=2, SerialNumber=1 [ 5.155565] usb usb2: Product: xHCI Host Controller [ 5.160445] usb usb2: Manufacturer: Linux 5.15.0 xhci-hcd [ 5.165848] usb usb2: SerialNumber: xhci-hcd.1.auto [ 5.170997] hub 2-0:1.0: USB hub found [ 5.174764] hub 2-0:1.0: 1 port detected [ 5.181995] input: gpio-keys as /devices/platform/gpio-keys/input/input0 [ 5.189088] of_cfs_init [ 5.191542] of_cfs_init: OK [ 5.194474] cfg80211: Loading compiled-in X.509 certificates for regulatory database [ 5.329319] cfg80211: Loaded X.509 cert 'sforshee: 00b28ddf47aef9cea7' [ 5.336076] zynqmp_pll_disable() clock disable failed for dpll_int, ret = -13 [ 5.344450] platform regulatory.0: Direct firmware load for regulatory.db failed with error -2 [ 5.346219] ata1: SATA link down (SStatus 0 SControl 330) [ 5.353079] cfg80211: failed to load regulatory.db [ 5.358514] ata2: SATA link down (SStatus 0 SControl 330) [ 5.360288] ALSA device list: [ 5.360292] No soundcards found. [ 5.401013] EXT4-fs (mmcblk0p2): mounted filesystem with ordered data mode. Opts: (null). Quota mode: none. [ 5.410785] VFS: Mounted root (ext4 filesystem) on device 179:2. [ 5.421140] devtmpfs: mounted [ 5.424643] Freeing unused kernel memory: 1984K [ 5.429281] Run /sbin/init as init process [ 5.501582] EXT4-fs (mmcblk0p2): re-mounted. Opts: (null). Quota mode: none. Starting syslogd: OK Starting klogd: OK Running sysctl: OK Initializing random number generator: OK Saving random seed: [ 5.564409] random: dd: uninitialized urandom read (512 bytes read) OK Starting network: OK Welcome to Buildroot buildroot login: -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 23 10:05:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Feb 2022 11:05:19 +0100 Subject: [Buildroot] [PATCH v6 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <87bkzcnqpx.fsf@dell.be.48ers.dk> (Peter Korsgaard's message of "Sat, 12 Feb 2022 14:45:30 +0100") References: <20220211144402.1626443-1-neal.frager@xilinx.com> <69189572-6eba-ed26-52dd-08a8b098f124@lucaceresoli.net> <87bkzcnqpx.fsf@dell.be.48ers.dk> Message-ID: <87o82x6gps.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: >>> +#endif >>> +{ >>> + /**********************************************************************/ >>> + /* HEADER */ >>> + 2, /* Number of remaining words in the header */ >>> + 8, /* Number of sections included in config object */ >>> + 1U, /* Type of config object as base */ >> Here's where you have manually replaced "PM_CONFIG_OBJECT_TYPE_BASE" -> >> "1U", right? Well, it should be well noted in the commit message. This >> file is supposed to be generated by Vitis and used untouched, any manual >> edits whould be documented. >> Or, even better, use the U-Boot patch I sent (see other e-mail I just >> wrote) and use an unmodified pm_cfg_obj.c > Ups, I applied the series before seeing this comment. Lets handle it as > a followup patch for zcu102/106. Neal, will you send a followup patch for this? -- Bye, Peter Korsgaard From peterlin at andestech.com Wed Feb 23 10:09:08 2022 From: peterlin at andestech.com (Yu Chien Peter Lin) Date: Wed, 23 Feb 2022 18:09:08 +0800 Subject: [Buildroot] [PATCH v4 1/3] board/andes: rearrange andes folder structure In-Reply-To: <84e159d2-0123-e5b1-c42e-99b70c99f43c@benettiengineering.com> References: <20220223071049.21153-1-peterlin@andestech.com> <84e159d2-0123-e5b1-c42e-99b70c99f43c@benettiengineering.com> Message-ID: Hi Giulio, > On Wed, Feb 23, 2022 at 10:19:08AM +0100, Giulio Benetti wrote: > > Hi Peter, > > > > On 23/02/22 08:10, Yu Chien Peter Lin wrote: > > > Rename ae3xx to ae300 for nds32 architecture and add ae350 platform. > > > > > > AE300 (NDS32): > > > - http://www.andestech.com/en/products-solutions/andeshape-platforms/ae300/ > > > AE350 (RISC-V): > > > - http://www.andestech.com/en/products-solutions/andeshape-platforms/ae350-axi-based-platform-pre-integrated-with-n25f-nx25f-a25-ax25/ > > > > > > Signed-off-by: Yu Chien Peter Lin > > > Signed-off-by: Alan Kao > > > --- > > > Changes v1 -> v2: > > > - move linux source code and its patches to AndesTech Github repo > > > - rename ae350_andestar45_defconfig to andes_ae350_45_defconfig > > > - change C library to uClibc > > > - remove OpenSSL package > > > - remove rootfs.cpio and rootfs.tar > > > - update DEVELOPERS > > > Changes v2 -> v3: > > > - specifiy branch to download from AndesTech linux repo > > > - change boot.cmd to extlinux.conf > > > - add post-build.sh for extlinux.conf to retrieve Image and DTB > > > - fix format and update genimage_sdcard.cfg > > > - update readme.txt > > > - add packages (python3, pylibfdt and openssl) for u-boot binman > > > - reorder item in DEVELOPERS > > > Changes v3 -> v4: > > > - rename ae3xx folder to ae300 > > > - rename andes_ae3xx_defconfig to andes_ae300_defconfig > > > - update readme.txt and item in DEVELOPERS > > > > Some of these change ^^^ must have been moved to the single patch, like > > DEVELOPERS is updated in patch 3/3. I've also forgotten to point you to add > > a --cover-letter, so keep in mind both points for next time. > > > > I've built tested both defconfig successfully, so: > > Reviewed-by: Giulio Benetti > > Tested-by: Giulio Benetti > > [Giulio: build tested only] > > > > And the other patches of this series is all reviewed, so to me it's ready to > > be committed, but this will happen after Buildroot 2022.02 is released, > > since between rc1 to the release Maintainers only accept fixes. Another > > possibility is that they will commit these patches to next branch. > > > > Please remember to tag V3. > > > > Thank you for your effort! > > > > Best regards > > -- > > Giulio Benetti > > Benetti Engineering sas Thanks for reviewing my patches and the guidance. I will make a new patch for the Config.in, The last question, is it tag V5 for the next submission? Regards, Yu Chien Peter Lin From giulio.benetti at benettiengineering.com Wed Feb 23 10:45:12 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 23 Feb 2022 11:45:12 +0100 Subject: [Buildroot] [PATCH v4 1/3] board/andes: rearrange andes folder structure In-Reply-To: References: <20220223071049.21153-1-peterlin@andestech.com> <84e159d2-0123-e5b1-c42e-99b70c99f43c@benettiengineering.com> Message-ID: Hi Peter, On 23/02/22 11:09, Yu Chien Peter Lin wrote: > Hi Giulio, > >> On Wed, Feb 23, 2022 at 10:19:08AM +0100, Giulio Benetti wrote: >>> Hi Peter, >>> >>> On 23/02/22 08:10, Yu Chien Peter Lin wrote: >>>> Rename ae3xx to ae300 for nds32 architecture and add ae350 platform. >>>> >>>> AE300 (NDS32): >>>> - http://www.andestech.com/en/products-solutions/andeshape-platforms/ae300/ >>>> AE350 (RISC-V): >>>> - http://www.andestech.com/en/products-solutions/andeshape-platforms/ae350-axi-based-platform-pre-integrated-with-n25f-nx25f-a25-ax25/ >>>> >>>> Signed-off-by: Yu Chien Peter Lin >>>> Signed-off-by: Alan Kao >>>> --- >>>> Changes v1 -> v2: >>>> - move linux source code and its patches to AndesTech Github repo >>>> - rename ae350_andestar45_defconfig to andes_ae350_45_defconfig >>>> - change C library to uClibc >>>> - remove OpenSSL package >>>> - remove rootfs.cpio and rootfs.tar >>>> - update DEVELOPERS >>>> Changes v2 -> v3: >>>> - specifiy branch to download from AndesTech linux repo >>>> - change boot.cmd to extlinux.conf >>>> - add post-build.sh for extlinux.conf to retrieve Image and DTB >>>> - fix format and update genimage_sdcard.cfg >>>> - update readme.txt >>>> - add packages (python3, pylibfdt and openssl) for u-boot binman >>>> - reorder item in DEVELOPERS >>>> Changes v3 -> v4: >>>> - rename ae3xx folder to ae300 >>>> - rename andes_ae3xx_defconfig to andes_ae300_defconfig >>>> - update readme.txt and item in DEVELOPERS >>> >>> Some of these change ^^^ must have been moved to the single patch, like >>> DEVELOPERS is updated in patch 3/3. I've also forgotten to point you to add >>> a --cover-letter, so keep in mind both points for next time. >>> >>> I've built tested both defconfig successfully, so: >>> Reviewed-by: Giulio Benetti >>> Tested-by: Giulio Benetti >>> [Giulio: build tested only] >>> >>> And the other patches of this series is all reviewed, so to me it's ready to >>> be committed, but this will happen after Buildroot 2022.02 is released, >>> since between rc1 to the release Maintainers only accept fixes. Another >>> possibility is that they will commit these patches to next branch. >>> >>> Please remember to tag V3. >>> >>> Thank you for your effort! >>> >>> Best regards >>> -- >>> Giulio Benetti >>> Benetti Engineering sas > > Thanks for reviewing my patches and the guidance. You're welcome. > I will make a new patch for the Config.in, Which one? I only see: toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in Do you mean you will add an entry in DEVELOPERS for it? > The last question, is it tag V5 for the next submission? It depends if you need to modify these patches. Or if you add a new patch that depends on these patches, then yes, please send a V5 with all changes moved to the different patches, including adding the patch if this is your goal. Best regards -- Giulio Benetti Benetti Engineering sas From nealf at xilinx.com Wed Feb 23 11:02:24 2022 From: nealf at xilinx.com (Neal Frager) Date: Wed, 23 Feb 2022 11:02:24 +0000 Subject: [Buildroot] [PATCH v6 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <87sfs96gqj.fsf@dell.be.48ers.dk> References: <20220211144402.1626443-1-neal.frager@xilinx.com> <87pmnsnquv.fsf@dell.be.48ers.dk> <87sfs96gqj.fsf@dell.be.48ers.dk> Message-ID: Hi Peter, > Hmm, did you test this on a zcu106 board? > I just got access to a zcu106 rev 1.0 board and gave it a try here, and see nothing on either of the serial ports. > Looking at the u-boot configuration I see that xilinx_zynqmp_virt_defconfig sets: > CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu100-revC" > Which seems to have a different uart and pinmuxing setup. Changing that to zynqmp-zcu106-revA it does boot (but complains here and there). > This is the first time I use a zcu106, so maybe I am missing something, but I don't understand how it can work for you with the zcu100 DTB? Thank you for catching this. I will take care of getting this corrected with a follow up patch. The way zynqmp_virt_defconfig works is described on our wiki page below: https://xilinx-wiki.atlassian.net/wiki/spaces/A/pages/18841973/Build+U-Boot The reason why this was working for me is because I had the DEVICE_TREE environment variable set when building. make distclean make xilinx_zynqmp_virt_defconfig export DEVICE_TREE="zynqmp-zcu106-revA" make What is the proper way for setting an environment variable with buildroot? Should I add this as a pre-build script in each defconfig? Best regards, Neal Frager Xilinx From nealf at xilinx.com Wed Feb 23 11:07:45 2022 From: nealf at xilinx.com (Neal Frager) Date: Wed, 23 Feb 2022 11:07:45 +0000 Subject: [Buildroot] [PATCH v6 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <87sfs96gqj.fsf@dell.be.48ers.dk> References: <20220211144402.1626443-1-neal.frager@xilinx.com> <87pmnsnquv.fsf@dell.be.48ers.dk> <87sfs96gqj.fsf@dell.be.48ers.dk> Message-ID: Hi Michal, Could you respond to Peter's concern about the error messages that are printed during the boot log? Is there something we can do to avoid seeing these error messages? Below is an example boot log for the zcu106: U-Boot SPL 2022.01 (Feb 23 2022 - 10:35:14 +0100) PMUFW: v1.1 Loading new PMUFW cfg obj (2032 bytes) Silicon version: 3 EL Level: EL3 Chip ID: zu7e Multiboot: 0 Trying to boot from MMC2 spl: could not initialize mmc. error: -19 Trying to boot from MMC1 spl_load_image_fat_os: error reading image u-boot.bin, err - -2 NOTICE: BL31: v2.6(release):2022.02-rc2-4-g1a0d90d8ab NOTICE: BL31: Built : 10:05:33, Feb 23 2022 U-Boot 2022.01 (Feb 23 2022 - 10:06:21 +0100) CPU: ZynqMP Silicon: v3 Model: ZynqMP ZCU106 RevA Board: Xilinx ZynqMP DRAM: 4 GiB PMUFW: v1.1 Xilinx I2C Legacy format at nvmem0: Board name: zcu106 Board rev: 1.0 Board SN: 921730071832-88916 EL Level: EL2 Chip ID: zu7e NAND: 0 MiB MMC: mmc at ff170000: 0 Loading Environment from FAT... *** Error - No Valid Environment Area found *** Warning - bad env area, using default environment In: serial Out: serial Err: serial Bootmode: LVL_SHFT_SD_MODE1 Reset reason: EXTERNAL Net: ZYNQ GEM: ff0e0000, mdio bus ff0e0000, phyaddr 12, interface rgmii-id zynq_gem ethernet at ff0e0000: Failed to read eth PHY id, err: -2 Warning: ethernet at ff0e0000 (eth0) using random MAC address - 8a:9d:6d:13:b4:42 eth0: ethernet at ff0e0000 scanning bus for devices... SATA link 0 timeout. SATA link 1 timeout. AHCI 0001.0301 32 slots 2 ports 6 Gbps 0x3 impl SATA mode flags: 64bit ncq pm clo only pmp fbss pio slum part ccc apst starting USB... Bus usb at fe200000: Register 2000440 NbrPorts 2 Starting the controller USB XHCI 1.00 scanning bus usb at fe200000 for devices... 1 USB Device(s) found scanning usb for storage devices... 0 Storage Device(s) found Hit any key to stop autoboot: 0 switch to partitions #0, OK mmc0 is current device Scanning mmc 0:1... Found /extlinux/extlinux.conf Retrieving file: /extlinux/extlinux.conf 1: linux Retrieving file: /Image append: console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait Retrieving file: /system.dtb ## Flattened Device Tree blob at 40000000 Booting using the fdt blob at 0x40000000 Loading Device Tree to 000000007bdf4000, end 000000007be00998 ... OK Starting kernel ... [ 0.000000] Booting Linux on physical CPU 0x0000000000 [0x410fd034] [ 0.000000] Linux version 5.15.0 (peko at dell) (aarch64-buildroot-linux-uclibc-gcc.br_real (Buildroot 2022.02-rc2-4-g1a0d90d8ab) 10.3.0, GNU ld (GNU Binutils) 2.36.1) #1 SMP Wed Feb 23 10:07:13 CET 2022 [ 0.000000] Machine model: ZynqMP ZCU106 RevA [ 0.000000] efi: UEFI not found. [ 0.000000] Zone ranges: [ 0.000000] DMA32 [mem 0x0000000000000000-0x00000000ffffffff] [ 0.000000] Normal [mem 0x0000000100000000-0x000000087fffffff] [ 0.000000] Movable zone start for each node [ 0.000000] Early memory node ranges [ 0.000000] node 0: [mem 0x0000000000000000-0x000000007fffffff] [ 0.000000] node 0: [mem 0x0000000800000000-0x000000087fffffff] [ 0.000000] Initmem setup node 0 [mem 0x0000000000000000-0x000000087fffffff] [ 0.000000] cma: Reserved 256 MiB at 0x000000006bc00000 [ 0.000000] psci: probing for conduit method from DT. [ 0.000000] psci: PSCIv1.1 detected in firmware. [ 0.000000] psci: Using standard PSCI v0.2 function IDs [ 0.000000] psci: MIGRATE_INFO_TYPE not supported. [ 0.000000] psci: SMC Calling Convention v1.2 [ 0.000000] percpu: Embedded 18 pages/cpu s33048 r8192 d32488 u73728 [ 0.000000] Detected VIPT I-cache on CPU0 [ 0.000000] CPU features: detected: ARM erratum 845719 [ 0.000000] Built 1 zonelists, mobility grouping on. Total pages: 1034240 [ 0.000000] Kernel command line: console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait [ 0.000000] Dentry cache hash table entries: 524288 (order: 10, 4194304 bytes, linear) [ 0.000000] Inode-cache hash table entries: 262144 (order: 9, 2097152 bytes, linear) [ 0.000000] mem auto-init: stack:off, heap alloc:off, heap free:off [ 0.000000] software IO TLB: mapped [mem 0x000000007c000000-0x0000000080000000] (64MB) [ 0.000000] Memory: 3772724K/4194304K available (13632K kernel code, 908K rwdata, 3872K rodata, 1984K init, 307K bss, 159436K reserved, 262144K cma-reserved) [ 0.000000] rcu: Hierarchical RCU implementation. [ 0.000000] rcu: RCU event tracing is enabled. [ 0.000000] rcu: RCU calculated value of scheduler-enlistment delay is 25 jiffies. [ 0.000000] NR_IRQS: 64, nr_irqs: 64, preallocated irqs: 0 [ 0.000000] GIC: Adjusting CPU interface base to 0x00000000f902f000 [ 0.000000] Root IRQ handler: gic_handle_irq [ 0.000000] GIC: Using split EOI/Deactivate mode [ 0.000000] random: get_random_bytes called from start_kernel+0x470/0x6f8 with crng_init=0 [ 0.000000] arch_timer: cp15 timer(s) running at 100.00MHz (phys). [ 0.000000] clocksource: arch_sys_counter: mask: 0xffffffffffffff max_cycles: 0x171024e7e0, max_idle_ns: 440795205315 ns [ 0.000000] sched_clock: 56 bits at 100MHz, resolution 10ns, wraps every 4398046511100ns [ 0.000288] Console: colour dummy device 80x25 [ 0.000321] Calibrating delay loop (skipped), value calculated using timer frequency.. 200.00 BogoMIPS (lpj=400000) [ 0.000332] pid_max: default: 32768 minimum: 301 [ 0.000438] Mount-cache hash table entries: 8192 (order: 4, 65536 bytes, linear) [ 0.000457] Mountpoint-cache hash table entries: 8192 (order: 4, 65536 bytes, linear) [ 0.001273] rcu: Hierarchical SRCU implementation. [ 0.001528] EFI services will not be available. [ 0.001653] smp: Bringing up secondary CPUs ... [ 0.001990] Detected VIPT I-cache on CPU1 [ 0.002027] CPU1: Booted secondary processor 0x0000000001 [0x410fd034] [ 0.002403] Detected VIPT I-cache on CPU2 [ 0.002427] CPU2: Booted secondary processor 0x0000000002 [0x410fd034] [ 0.002769] Detected VIPT I-cache on CPU3 [ 0.002792] CPU3: Booted secondary processor 0x0000000003 [0x410fd034] [ 0.002835] smp: Brought up 1 node, 4 CPUs [ 0.002852] SMP: Total of 4 processors activated. [ 0.002857] CPU features: detected: 32-bit EL0 Support [ 0.002862] CPU features: detected: CRC32 instructions [ 0.002902] CPU: All CPU(s) started at EL2 [ 0.002918] alternatives: patching kernel code [ 0.003960] devtmpfs: initialized [ 0.009544] clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 7645041785100000 ns [ 0.009562] futex hash table entries: 1024 (order: 4, 65536 bytes, linear) [ 0.017810] pinctrl core: initialized pinctrl subsystem [ 0.018441] NET: Registered PF_NETLINK/PF_ROUTE protocol family [ 0.019418] DMA: preallocated 512 KiB GFP_KERNEL pool for atomic allocations [ 0.019518] DMA: preallocated 512 KiB GFP_KERNEL|GFP_DMA32 pool for atomic allocations [ 0.019556] audit: initializing netlink subsys (disabled) [ 0.019631] audit: type=2000 audit(0.016:1): state=initialized audit_enabled=0 res=1 [ 0.019926] hw-breakpoint: found 6 breakpoint and 4 watchpoint registers. [ 0.020003] ASID allocator initialised with 65536 entries [ 0.037264] HugeTLB registered 1.00 GiB page size, pre-allocated 0 pages [ 0.037277] HugeTLB registered 32.0 MiB page size, pre-allocated 0 pages [ 0.037284] HugeTLB registered 2.00 MiB page size, pre-allocated 0 pages [ 0.037290] HugeTLB registered 64.0 KiB page size, pre-allocated 0 pages [ 1.101889] DRBG: Continuing without Jitter RNG [ 1.204745] raid6: neonx8 gen() 2143 MB/s [ 1.272796] raid6: neonx8 xor() 1594 MB/s [ 1.340859] raid6: neonx4 gen() 2184 MB/s [ 1.408910] raid6: neonx4 xor() 1577 MB/s [ 1.476970] raid6: neonx2 gen() 2069 MB/s [ 1.545023] raid6: neonx2 xor() 1453 MB/s [ 1.613092] raid6: neonx1 gen() 1802 MB/s [ 1.681135] raid6: neonx1 xor() 1240 MB/s [ 1.749185] raid6: int64x8 gen() 1471 MB/s [ 1.817242] raid6: int64x8 xor() 785 MB/s [ 1.885301] raid6: int64x4 gen() 1582 MB/s [ 1.953353] raid6: int64x4 xor() 841 MB/s [ 2.021426] raid6: int64x2 gen() 1397 MB/s [ 2.089481] raid6: int64x2 xor() 750 MB/s [ 2.157554] raid6: int64x1 gen() 1187 MB/s [ 2.225592] raid6: int64x1 xor() 596 MB/s [ 2.225598] raid6: using algorithm neonx4 gen() 2184 MB/s [ 2.225603] raid6: .... xor() 1577 MB/s, rmw enabled [ 2.225608] raid6: using neon recovery algorithm [ 2.225975] iommu: Default domain type: Translated [ 2.225982] iommu: DMA domain TLB invalidation policy: strict mode [ 2.226202] SCSI subsystem initialized [ 2.226349] usbcore: registered new interface driver usbfs [ 2.226377] usbcore: registered new interface driver hub [ 2.226400] usbcore: registered new device driver usb [ 2.226454] mc: Linux media interface: v0.10 [ 2.226473] videodev: Linux video capture interface: v2.00 [ 2.226509] pps_core: LinuxPPS API ver. 1 registered [ 2.226514] pps_core: Software ver. 5.3.6 - Copyright 2005-2007 Rodolfo Giometti [ 2.226526] PTP clock support registered [ 2.226553] EDAC MC: Ver: 3.0.0 [ 2.226836] zynqmp-ipi-mbox mailbox at ff990400: Registered ZynqMP IPI mbox with TX/RX channels. [ 2.227024] FPGA manager framework [ 2.227145] Advanced Linux Sound Architecture Driver Initialized. [ 2.227429] Bluetooth: Core ver 2.22 [ 2.227453] NET: Registered PF_BLUETOOTH protocol family [ 2.227459] Bluetooth: HCI device and connection manager initialized [ 2.227467] Bluetooth: HCI socket layer initialized [ 2.227474] Bluetooth: L2CAP socket layer initialized [ 2.227485] Bluetooth: SCO socket layer initialized [ 2.227775] clocksource: Switched to clocksource arch_sys_counter [ 2.227873] VFS: Disk quotas dquot_6.6.0 [ 2.227912] VFS: Dquot-cache hash table entries: 512 (order 0, 4096 bytes) [ 2.231825] NET: Registered PF_INET protocol family [ 2.231947] IP idents hash table entries: 65536 (order: 7, 524288 bytes, linear) [ 2.233469] tcp_listen_portaddr_hash hash table entries: 2048 (order: 3, 32768 bytes, linear) [ 2.233516] TCP established hash table entries: 32768 (order: 6, 262144 bytes, linear) [ 2.233722] TCP bind hash table entries: 32768 (order: 7, 524288 bytes, linear) [ 2.234105] TCP: Hash tables configured (established 32768 bind 32768) [ 2.234173] UDP hash table entries: 2048 (order: 4, 65536 bytes, linear) [ 2.234250] UDP-Lite hash table entries: 2048 (order: 4, 65536 bytes, linear) [ 2.234400] NET: Registered PF_UNIX/PF_LOCAL protocol family [ 2.234694] RPC: Registered named UNIX socket transport module. [ 2.234702] RPC: Registered udp transport module. [ 2.234706] RPC: Registered tcp transport module. [ 2.234710] RPC: Registered tcp NFSv4.1 backchannel transport module. [ 2.235296] PCI: CLS 0 bytes, default 64 [ 2.235581] armv8-pmu pmu: hw perfevents: no interrupt-affinity property, guessing. [ 2.235746] hw perfevents: enabled with armv8_pmuv3 PMU driver, 7 counters available [ 2.236515] Initialise system trusted keyrings [ 2.236595] workingset: timestamp_bits=62 max_order=20 bucket_order=0 [ 2.237148] NFS: Registering the id_resolver key type [ 2.237162] Key type id_resolver registered [ 2.237167] Key type id_legacy registered [ 2.237184] nfs4filelayout_init: NFSv4 File Layout Driver Registering... [ 2.237190] nfs4flexfilelayout_init: NFSv4 Flexfile Layout Driver Registering... [ 2.237207] jffs2: version 2.2. (NAND) ? 2001-2006 Red Hat, Inc. [ 2.273154] NET: Registered PF_ALG protocol family [ 2.273167] xor: measuring software checksum speed [ 2.277216] 8regs : 2438 MB/sec [ 2.280739] 32regs : 2800 MB/sec [ 2.285008] arm64_neon : 2309 MB/sec [ 2.285014] xor: using function: 32regs (2800 MB/sec) [ 2.285021] Key type asymmetric registered [ 2.285026] Asymmetric key parser 'x509' registered [ 2.285062] Block layer SCSI generic (bsg) driver version 0.4 loaded (major 245) [ 2.285069] io scheduler mq-deadline registered [ 2.285075] io scheduler kyber registered [ 2.309548] Serial: 8250/16550 driver, 4 ports, IRQ sharing disabled [ 2.312677] cacheinfo: Unable to detect cache hierarchy for CPU 0 [ 2.316619] brd: module loaded [ 2.319780] loop: module loaded [ 2.320496] mtdoops: mtd device (mtddev=name/number) must be supplied [ 2.321724] libphy: Fixed MDIO Bus: probed [ 2.322824] tun: Universal TUN/TAP device driver, 1.6 [ 2.322904] CAN device driver interface [ 2.323561] usbcore: registered new interface driver asix [ 2.323600] usbcore: registered new interface driver ax88179_178a [ 2.323625] usbcore: registered new interface driver cdc_ether [ 2.323647] usbcore: registered new interface driver net1080 [ 2.323669] usbcore: registered new interface driver cdc_subset [ 2.323692] usbcore: registered new interface driver zaurus [ 2.323724] usbcore: registered new interface driver cdc_ncm [ 2.324408] usbcore: registered new interface driver uas [ 2.324440] usbcore: registered new interface driver usb-storage [ 2.325070] rtc_zynqmp ffa60000.rtc: registered as rtc0 [ 2.325087] rtc_zynqmp ffa60000.rtc: setting system clock to 2021-01-18T20:15:26 UTC (1611000926) [ 2.325153] i2c_dev: i2c /dev entries driver [ 2.326567] usbcore: registered new interface driver uvcvideo [ 2.327362] Bluetooth: HCI UART driver ver 2.3 [ 2.327370] Bluetooth: HCI UART protocol H4 registered [ 2.327376] Bluetooth: HCI UART protocol BCSP registered [ 2.327394] Bluetooth: HCI UART protocol LL registered [ 2.327400] Bluetooth: HCI UART protocol ATH3K registered [ 2.327416] Bluetooth: HCI UART protocol Three-wire (H5) registered [ 2.327453] Bluetooth: HCI UART protocol Intel registered [ 2.327470] Bluetooth: HCI UART protocol QCA registered [ 2.327499] usbcore: registered new interface driver bcm203x [ 2.327525] usbcore: registered new interface driver bpa10x [ 2.327550] usbcore: registered new interface driver bfusb [ 2.327576] usbcore: registered new interface driver btusb [ 2.327616] usbcore: registered new interface driver ath3k [ 2.327688] EDAC MC: ECC not enabled [ 2.327829] EDAC DEVICE0: Giving out device to module edac controller cache_err: DEV edac (POLLED) [ 2.327977] EDAC DEVICE1: Giving out device to module zynqmp-ocm-edac controller zynqmp_ocm: DEV ff960000.memory-controller (INTERRUPT) [ 2.328309] sdhci: Secure Digital Host Controller Interface driver [ 2.328315] sdhci: Copyright(c) Pierre Ossman [ 2.328319] sdhci-pltfm: SDHCI platform and OF driver helper [ 2.328645] ledtrig-cpu: registered to indicate activity on CPUs [ 2.328735] SMCCC: SOC_ID: ARCH_SOC_ID not implemented, skipping .... [ 2.328772] zynqmp_firmware_probe Platform Management API v1.1 [ 2.328780] zynqmp_firmware_probe Trustzone version v1.0 [ 2.358985] securefw securefw: securefw probed [ 2.359229] alg: No test for xilinx-zynqmp-aes (zynqmp-aes) [ 2.359249] zynqmp_aes firmware:zynqmp-firmware:zynqmp-aes: AES Successfully Registered [ 2.359423] alg: No test for xilinx-keccak-384 (zynqmp-keccak-384) [ 2.359595] alg: No test for xilinx-zynqmp-rsa (zynqmp-rsa) [ 2.359737] usbcore: registered new interface driver usbhid [ 2.359744] usbhid: USB HID core driver [ 2.361013] fpga_manager fpga0: Xilinx ZynqMP FPGA Manager registered [ 2.361338] usbcore: registered new interface driver snd-usb-audio [ 2.362114] pktgen: Packet Generator for packet performance testing. Version: 2.75 [ 2.362489] Initializing XFRM netlink socket [ 2.362565] NET: Registered PF_INET6 protocol family [ 2.363069] Segment Routing with IPv6 [ 2.363087] In-situ OAM (IOAM) with IPv6 [ 2.363138] sit: IPv6, IPv4 and MPLS over IPv4 tunneling driver [ 2.363447] NET: Registered PF_PACKET protocol family [ 2.363462] NET: Registered PF_KEY protocol family [ 2.363482] can: controller area network core [ 2.363508] NET: Registered PF_CAN protocol family [ 2.363514] can: raw protocol [ 2.363520] can: broadcast manager protocol [ 2.363527] can: netlink gateway - max_hops=1 [ 2.363619] Bluetooth: RFCOMM TTY layer initialized [ 2.363632] Bluetooth: RFCOMM socket layer initialized [ 2.363647] Bluetooth: RFCOMM ver 1.11 [ 2.363656] Bluetooth: BNEP (Ethernet Emulation) ver 1.3 [ 2.363662] Bluetooth: BNEP filters: protocol multicast [ 2.363669] Bluetooth: BNEP socket layer initialized [ 2.363674] Bluetooth: HIDP (Human Interface Emulation) ver 1.2 [ 2.363681] Bluetooth: HIDP socket layer initialized [ 2.363819] 9pnet: Installing 9P2000 support [ 2.363839] Key type dns_resolver registered [ 2.363942] registered taskstats version 1 [ 2.363948] Loading compiled-in X.509 certificates [ 2.364918] Btrfs loaded, crc32c=crc32c-generic, zoned=no, fsverity=no [ 2.373064] ff000000.serial: ttyPS0 at MMIO 0xff000000 (irq = 42, base_baud = 6249999) is a xuartps [ 3.672506] printk: console [ttyPS0] enabled [ 3.677493] ff010000.serial: ttyPS1 at MMIO 0xff010000 (irq = 43, base_baud = 6249999) is a xuartps [ 3.686810] of-fpga-region fpga-full: FPGA Region probed [ 3.693554] xilinx-zynqmp-dma fd500000.dma-controller: ZynqMP DMA driver Probe success [ 3.701632] xilinx-zynqmp-dma fd510000.dma-controller: ZynqMP DMA driver Probe success [ 3.709702] xilinx-zynqmp-dma fd520000.dma-controller: ZynqMP DMA driver Probe success [ 3.717776] xilinx-zynqmp-dma fd530000.dma-controller: ZynqMP DMA driver Probe success [ 3.725847] xilinx-zynqmp-dma fd540000.dma-controller: ZynqMP DMA driver Probe success [ 3.733921] xilinx-zynqmp-dma fd550000.dma-controller: ZynqMP DMA driver Probe success [ 3.741994] xilinx-zynqmp-dma fd560000.dma-controller: ZynqMP DMA driver Probe success [ 3.750063] xilinx-zynqmp-dma fd570000.dma-controller: ZynqMP DMA driver Probe success [ 3.758379] xilinx-zynqmp-dpdma fd4c0000.dma-controller: Xilinx DPDMA engine is probed [ 3.767022] spi-nor spi0.0: found mt25qu512a, expected m25p80 [ 3.773292] spi-nor spi0.0: mt25qu512a (131072 Kbytes) [ 3.778451] 4 fixed-partitions partitions found on MTD device spi0.0 [ 3.784796] Creating 4 MTD partitions on "spi0.0": [ 3.789581] 0x000000000000-0x000000100000 : "qspi-fsbl-uboot" [ 3.796118] 0x000000100000-0x000000600000 : "qspi-linux" [ 3.802113] 0x000000600000-0x000000620000 : "qspi-device-tree" [ 3.808615] 0x000000620000-0x000000c00000 : "qspi-rootfs" [ 3.817419] macb ff0e0000.ethernet: Not enabling partial store and forward [ 3.824936] libphy: MACB_mii_bus: probed [ 3.829496] macb ff0e0000.ethernet eth0: Cadence GEM rev 0x50070106 at 0xff0e0000 irq 30 (8a:9d:6d:13:b4:42) [ 3.839620] xilinx-axipmon ffa00000.perf-monitor: Probed Xilinx APM [ 3.846207] xilinx-axipmon fd0b0000.perf-monitor: Probed Xilinx APM [ 3.852698] xilinx-axipmon fd490000.perf-monitor: Probed Xilinx APM [ 3.859192] xilinx-axipmon ffa10000.perf-monitor: Probed Xilinx APM [ 3.866522] pca953x 0-0020: supply vcc not found, using dummy regulator [ 3.873218] pca953x 0-0020: using no AI [ 3.877724] pca953x 0-0021: supply vcc not found, using dummy regulator [ 3.884395] pca953x 0-0021: using no AI [ 3.897104] i2c i2c-0: Added multiplexed i2c bus 2 [ 3.908338] i2c i2c-0: Added multiplexed i2c bus 3 [ 3.924679] random: fast init done [ 3.966097] i2c i2c-0: Added multiplexed i2c bus 4 [ 3.970999] i2c i2c-0: Added multiplexed i2c bus 5 [ 3.975789] pca954x 0-0075: registered 4 multiplexed busses for I2C mux pca9544 [ 3.983147] cdns-i2c ff020000.i2c: 400 kHz mmio ff020000 irq 32 [ 3.990509] at24 6-0054: supply vcc not found, using dummy regulator [ 3.997388] at24 6-0054: 1024 byte 24c08 EEPROM, writable, 1 bytes/write [ 4.004128] i2c i2c-1: Added multiplexed i2c bus 6 [ 4.009450] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out [ 4.016760] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out [ 4.024061] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out [ 4.031362] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out [ 4.038661] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out [ 4.045961] si5341 7-0036: no regulator set, defaulting vdd_sel to 2.5V for out [ 4.054383] si5341 7-0036: Chip: 5341 Grade: 1 Rev: 1 [ 4.093288] i2c i2c-1: Added multiplexed i2c bus 7 [ 4.100897] si570 8-005d: registered, current frequency 300000000 Hz [ 4.107281] i2c i2c-1: Added multiplexed i2c bus 8 [ 4.127003] si570 9-005d: registered, current frequency 148500000 Hz [ 4.133390] i2c i2c-1: Added multiplexed i2c bus 9 [ 4.138387] si5324 10-0069: si5328 probed [ 4.204331] si5324 10-0069: si5328 probe successful [ 4.209248] i2c i2c-1: Added multiplexed i2c bus 10 [ 4.215324] i2c i2c-1: Added multiplexed i2c bus 11 [ 4.220315] i2c i2c-1: Added multiplexed i2c bus 12 [ 4.225302] i2c i2c-1: Added multiplexed i2c bus 13 [ 4.230182] pca954x 1-0074: registered 8 multiplexed busses for I2C switch pca9548 [ 4.238109] i2c i2c-1: Added multiplexed i2c bus 14 [ 4.243110] i2c i2c-1: Added multiplexed i2c bus 15 [ 4.248106] i2c i2c-1: Added multiplexed i2c bus 16 [ 4.253107] i2c i2c-1: Added multiplexed i2c bus 17 [ 4.258115] i2c i2c-1: Added multiplexed i2c bus 18 [ 4.263114] i2c i2c-1: Added multiplexed i2c bus 19 [ 4.268112] i2c i2c-1: Added multiplexed i2c bus 20 [ 4.273124] i2c i2c-1: Added multiplexed i2c bus 21 [ 4.278000] pca954x 1-0075: registered 8 multiplexed busses for I2C switch pca9548 [ 4.285597] cdns-i2c ff030000.i2c: 400 kHz mmio ff030000 irq 33 [ 4.295393] cdns-wdt fd4d0000.watchdog: Xilinx Watchdog Timer with timeout 60s [ 4.304764] zynqmp-display fd4a0000.display: vtc bridge property not present [ 4.313211] ------------[ cut here ]------------ [ 4.317834] More than allowed devices are using the vpll_int, which is forbidden [ 4.325263] WARNING: CPU: 0 PID: 7 at drivers/clk/zynqmp/pll.c:200 zynqmp_pll_set_rate+0x198/0x200 [ 4.334227] Modules linked in: [ 4.337274] CPU: 0 PID: 7 Comm: kworker/u8:0 Not tainted 5.15.0 #1 [ 4.343444] Hardware name: ZynqMP ZCU106 RevA (DT) [ 4.348229] Workqueue: events_unbound deferred_probe_work_func [ 4.354061] pstate: 60000005 (nZCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 4.361012] pc : zynqmp_pll_set_rate+0x198/0x200 [ 4.365622] lr : zynqmp_pll_set_rate+0x198/0x200 [ 4.370231] sp : ffffffc0114f3660 [ 4.373538] x29: ffffffc0114f3660 x28: ffffff887f7f6458 x27: ffffff88003ec410 [ 4.380673] x26: 000000000000b61b x25: ffffff88014e4880 x24: 0000000000000060 [ 4.387808] x23: 0000000001fca055 x22: ffffff88014e4880 x21: ffffff88014e4900 [ 4.394943] x20: 000000000169cfa1 x19: 0000000059682ef1 x18: 0000000000000030 [ 4.402078] x17: 6962726f66207369 x16: 206863696877202c x15: 746e695f6c6c7076 [ 4.409212] x14: 2065687420676e69 x13: 6e6564646962726f x12: ffffffc01133b230 [ 4.416348] x11: 0000000000000136 x10: 6c6c707620656874 x9 : 00000000fffff7ff [ 4.423483] x8 : ffffffc011367230 x7 : 000000000000bfe8 x6 : 80000000fffff800 [ 4.430617] x5 : 0000000000000000 x4 : 0000000000000000 x3 : 0000000000000000 [ 4.437744] x2 : 0000000000000000 x1 : 0000000000000000 x0 : ffffff880009ad80 [ 4.444879] Call trace: [ 4.447319] zynqmp_pll_set_rate+0x198/0x200 [ 4.451580] clk_change_rate+0x148/0x2c0 [ 4.455495] clk_core_set_rate_nolock+0x154/0x240 [ 4.460190] clk_set_rate+0x38/0x150 [ 4.463758] xilinx_dp_codec_probe+0xac/0x1c0 [ 4.468107] platform_probe+0x68/0xe0 [ 4.471761] really_probe.part.0+0x9c/0x310 [ 4.475936] __driver_probe_device+0x98/0x150 [ 4.480285] driver_probe_device+0x44/0x120 [ 4.484460] __device_attach_driver+0xb4/0x120 [ 4.488895] bus_for_each_drv+0x78/0xd0 [ 4.492723] __device_attach+0xdc/0x190 [ 4.496551] device_initial_probe+0x14/0x20 [ 4.500726] bus_probe_device+0x9c/0xb0 [ 4.504554] device_add+0x36c/0x860 [ 4.508034] of_device_add+0x58/0x70 [ 4.511602] of_platform_device_create_pdata+0xc0/0x100 [ 4.516819] of_platform_bus_create+0x178/0x390 [ 4.521341] of_platform_populate+0x58/0xf0 [ 4.525516] zynqmp_dpsub_probe+0xe8/0x170 [ 4.529604] platform_probe+0x68/0xe0 [ 4.533259] really_probe.part.0+0x9c/0x310 [ 4.537434] __driver_probe_device+0x98/0x150 [ 4.541782] driver_probe_device+0x44/0x120 [ 4.545957] __device_attach_driver+0xb4/0x120 [ 4.550393] bus_for_each_drv+0x78/0xd0 [ 4.554221] __device_attach+0xdc/0x190 [ 4.558049] device_initial_probe+0x14/0x20 [ 4.562224] bus_probe_device+0x9c/0xb0 [ 4.566052] deferred_probe_work_func+0x88/0xc0 [ 4.570574] process_one_work+0x1d4/0x390 [ 4.574585] worker_thread+0x298/0x4e0 [ 4.578325] kthread+0x120/0x130 [ 4.581545] ret_from_fork+0x10/0x20 [ 4.585113] ---[ end trace 59c0d1ba4e758fd6 ]--- [ 4.591486] ------------[ cut here ]------------ [ 4.596107] More than allowed devices are using the vpll_int, which is forbidden [ 4.603220] mmc0: SDHCI controller on ff170000.mmc [ff170000.mmc] using ADMA 64-bit [ 4.603529] WARNING: CPU: 0 PID: 7 at drivers/clk/zynqmp/pll.c:200 zynqmp_pll_set_rate+0x198/0x200 [ 4.620067] Modules linked in: [ 4.623115] CPU: 0 PID: 7 Comm: kworker/u8:0 Tainted: G W 5.15.0 #1 [ 4.630674] Hardware name: ZynqMP ZCU106 RevA (DT) [ 4.635458] Workqueue: events_unbound deferred_probe_work_func [ 4.641282] pstate: 60000005 (nZCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 4.648234] pc : zynqmp_pll_set_rate+0x198/0x200 [ 4.652843] lr : zynqmp_pll_set_rate+0x198/0x200 [ 4.657452] sp : ffffffc0114f3660 [ 4.660759] x29: ffffffc0114f3660 x28: ffffff887f7f6458 x27: ffffff88003ec410 [ 4.667894] x26: 0000000000000fc2 x25: ffffff88014e4880 x24: 0000000000000060 [ 4.675029] x23: 0000000001fca055 x22: ffffff88014e4880 x21: ffffff88014e4900 [ 4.682164] x20: 00000000001f4ed6 x19: 000000005b64cf46 x18: 0000000000000030 [ 4.689299] x17: 6962726f66207369 x16: 206863696877202c x15: 746e695f6c6c7076 [ 4.696434] x14: 2065687420676e69 x13: 6e6564646962726f x12: 6620736920686369 [ 4.703569] x11: 6877202c746e695f x10: 6c6c707620656874 x9 : 7375206572612073 [ 4.710704] x8 : 6563697665642064 x7 : 205d373031363935 x6 : 352e34202020205b [ 4.717839] x5 : ffffffc01140b1a7 x4 : 0000000000000000 x3 : 0000000000000000 [ 4.724974] x2 : 0000000000000000 x1 : 0000000000000000 x0 : ffffff880009ad80 [ 4.732109] Call trace: [ 4.734548] zynqmp_pll_set_rate+0x198/0x200 [ 4.738810] clk_change_rate+0x148/0x2c0 [ 4.742724] clk_core_set_rate_nolock+0x154/0x240 [ 4.747421] clk_set_rate+0x38/0x150 [ 4.750988] xilinx_dp_codec_probe+0xac/0x1c0 [ 4.755337] platform_probe+0x68/0xe0 [ 4.758991] really_probe.part.0+0x9c/0x310 [ 4.763166] __driver_probe_device+0x98/0x150 [ 4.767515] driver_probe_device+0x44/0x120 [ 4.771690] __device_attach_driver+0xb4/0x120 [ 4.776125] bus_for_each_drv+0x78/0xd0 [ 4.779953] __device_attach+0xdc/0x190 [ 4.783781] device_initial_probe+0x14/0x20 [ 4.787956] bus_probe_device+0x9c/0xb0 [ 4.791784] device_add+0x36c/0x860 [ 4.795265] of_device_add+0x58/0x70 [ 4.798832] of_platform_device_create_pdata+0xc0/0x100 [ 4.804049] of_platform_bus_create+0x178/0x390 [ 4.808571] of_platform_populate+0x58/0xf0 [ 4.812746] zynqmp_dpsub_probe+0xe8/0x170 [ 4.816834] platform_probe+0x68/0xe0 [ 4.820488] really_probe.part.0+0x9c/0x310 [ 4.824664] __driver_probe_device+0x98/0x150 [ 4.829012] driver_probe_device+0x44/0x120 [ 4.833187] __device_attach_driver+0xb4/0x120 [ 4.837623] bus_for_each_drv+0x78/0xd0 [ 4.841451] __device_attach+0xdc/0x190 [ 4.845279] device_initial_probe+0x14/0x20 [ 4.849454] bus_probe_device+0x9c/0xb0 [ 4.853281] deferred_probe_work_func+0x88/0xc0 [ 4.857804] process_one_work+0x1d4/0x390 [ 4.861805] worker_thread+0x298/0x4e0 [ 4.865547] kthread+0x120/0x130 [ 4.868766] ret_from_fork+0x10/0x20 [ 4.872334] ---[ end trace 59c0d1ba4e758fd7 ]--- [ 4.877097] zynqmp_clk_divider_set_rate() set divider failed for dp_audio_ref_div1, ret = -22 [ 4.885950] xilinx-dp-snd-codec fd4a0000.display:zynqmp_dp_snd_codec0: Failed to get required clock freq [ 4.895486] xilinx-dp-snd-codec: probe of fd4a0000.display:zynqmp_dp_snd_codec0 failed with error -22 [ 4.904966] xilinx-dp-snd-pcm zynqmp_dp_snd_pcm0: Xilinx DisplayPort Sound PCM probed [ 4.913026] xilinx-dp-snd-pcm zynqmp_dp_snd_pcm1: Xilinx DisplayPort Sound PCM probed [ 4.921168] OF: graph: no port node found in /axi/display at fd4a0000 [ 4.927790] xlnx-drm xlnx-drm.0: bound fd4a0000.display (ops 0xffffffc010e27fa0) [ 4.935422] [drm] Initialized xlnx 1.0.0 20130509 for fd4a0000.display on minor 0 [ 4.942943] zynqmp-display fd4a0000.display: ZynqMP DisplayPort Subsystem driver probed [ 4.951187] ahci-ceva fd0c0000.ahci: supply ahci not found, using dummy regulator [ 4.958754] ahci-ceva fd0c0000.ahci: supply phy not found, using dummy regulator [ 4.966228] ahci-ceva fd0c0000.ahci: supply target not found, using dummy regulator [ 4.973784] mmc0: new high speed SDHC card at address aaaa [ 4.974229] ahci-ceva fd0c0000.ahci: AHCI 0001.0301 32 slots 2 ports 6 Gbps 0x3 impl platform mode [ 4.979720] mmcblk0: mmc0:aaaa SL16G 14.8 GiB [ 4.988316] ahci-ceva fd0c0000.ahci: flags: 64bit ncq sntf pm clo only pmp fbs pio slum part ccc sds apst [ 4.997985] mmcblk0: p1 p2 [ 5.006099] scsi host0: ahci-ceva [ 5.009746] scsi host1: ahci-ceva [ 5.013170] ata1: SATA max UDMA/133 mmio [mem 0xfd0c0000-0xfd0c1fff] port 0x100 irq 40 [ 5.021098] ata2: SATA max UDMA/133 mmio [mem 0xfd0c0000-0xfd0c1fff] port 0x180 irq 40 [ 5.052537] xhci-hcd xhci-hcd.1.auto: xHCI Host Controller [ 5.058041] xhci-hcd xhci-hcd.1.auto: new USB bus registered, assigned bus number 1 [ 5.065816] xhci-hcd xhci-hcd.1.auto: hcc params 0x0238f625 hci version 0x100 quirks 0x0000000002010810 [ 5.075249] xhci-hcd xhci-hcd.1.auto: irq 47, io mem 0xfe200000 [ 5.081274] xhci-hcd xhci-hcd.1.auto: xHCI Host Controller [ 5.086764] xhci-hcd xhci-hcd.1.auto: new USB bus registered, assigned bus number 2 [ 5.094430] xhci-hcd xhci-hcd.1.auto: Host supports USB 3.0 SuperSpeed [ 5.101065] usb usb1: New USB device found, idVendor=1d6b, idProduct=0002, bcdDevice= 5.15 [ 5.109340] usb usb1: New USB device strings: Mfr=3, Product=2, SerialNumber=1 [ 5.116570] usb usb1: Product: xHCI Host Controller [ 5.121456] usb usb1: Manufacturer: Linux 5.15.0 xhci-hcd [ 5.126864] usb usb1: SerialNumber: xhci-hcd.1.auto [ 5.132072] hub 1-0:1.0: USB hub found [ 5.135849] hub 1-0:1.0: 1 port detected [ 5.140065] usb usb2: New USB device found, idVendor=1d6b, idProduct=0003, bcdDevice= 5.15 [ 5.148336] usb usb2: New USB device strings: Mfr=3, Product=2, SerialNumber=1 [ 5.155565] usb usb2: Product: xHCI Host Controller [ 5.160445] usb usb2: Manufacturer: Linux 5.15.0 xhci-hcd [ 5.165848] usb usb2: SerialNumber: xhci-hcd.1.auto [ 5.170997] hub 2-0:1.0: USB hub found [ 5.174764] hub 2-0:1.0: 1 port detected [ 5.181995] input: gpio-keys as /devices/platform/gpio-keys/input/input0 [ 5.189088] of_cfs_init [ 5.191542] of_cfs_init: OK [ 5.194474] cfg80211: Loading compiled-in X.509 certificates for regulatory database [ 5.329319] cfg80211: Loaded X.509 cert 'sforshee: 00b28ddf47aef9cea7' [ 5.336076] zynqmp_pll_disable() clock disable failed for dpll_int, ret = -13 [ 5.344450] platform regulatory.0: Direct firmware load for regulatory.db failed with error -2 [ 5.346219] ata1: SATA link down (SStatus 0 SControl 330) [ 5.353079] cfg80211: failed to load regulatory.db [ 5.358514] ata2: SATA link down (SStatus 0 SControl 330) [ 5.360288] ALSA device list: [ 5.360292] No soundcards found. [ 5.401013] EXT4-fs (mmcblk0p2): mounted filesystem with ordered data mode. Opts: (null). Quota mode: none. [ 5.410785] VFS: Mounted root (ext4 filesystem) on device 179:2. [ 5.421140] devtmpfs: mounted [ 5.424643] Freeing unused kernel memory: 1984K [ 5.429281] Run /sbin/init as init process [ 5.501582] EXT4-fs (mmcblk0p2): re-mounted. Opts: (null). Quota mode: none. Starting syslogd: OK Starting klogd: OK Running sysctl: OK Initializing random number generator: OK Saving random seed: [ 5.564409] random: dd: uninitialized urandom read (512 bytes read) OK Starting network: OK Welcome to Buildroot buildroot login: Best regards, Neal Frager Xilinx From peter at korsgaard.com Wed Feb 23 11:18:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Feb 2022 12:18:17 +0100 Subject: [Buildroot] [PATCH v6 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: (Neal Frager's message of "Wed, 23 Feb 2022 11:02:24 +0000") References: <20220211144402.1626443-1-neal.frager@xilinx.com> <87pmnsnquv.fsf@dell.be.48ers.dk> <87sfs96gqj.fsf@dell.be.48ers.dk> Message-ID: <87fso96dc6.fsf@dell.be.48ers.dk> >>>>> "Neal" == Neal Frager writes: Hi, > The reason why this was working for me is because I had the DEVICE_TREE environment variable set when building. > make distclean > make xilinx_zynqmp_virt_defconfig > export DEVICE_TREE="zynqmp-zcu106-revA" I wasn't aware that U-Boot uses the value of this environment variable over what is speficied in the configuration file. I think we should clear this environment variable in Buildroot similar to how we do for E.G. CROSS_COMPILE in the top level Makefile. I'll send a patch for that. -- Bye, Peter Korsgaard From nealf at xilinx.com Wed Feb 23 11:27:29 2022 From: nealf at xilinx.com (Neal Frager) Date: Wed, 23 Feb 2022 11:27:29 +0000 Subject: [Buildroot] [PATCH v6 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <87fso96dc6.fsf@dell.be.48ers.dk> References: <20220211144402.1626443-1-neal.frager@xilinx.com> <87pmnsnquv.fsf@dell.be.48ers.dk> <87sfs96gqj.fsf@dell.be.48ers.dk> <87fso96dc6.fsf@dell.be.48ers.dk> Message-ID: Hi Peter, > I wasn't aware that U-Boot uses the value of this environment variable over what is speficied in the configuration file. I think we should clear this environment variable in Buildroot similar to how we do for E.G. CROSS_COMPILE in the top level ? Makefile. I'll send a patch for that. Great, thanks! Best regards, Neal Frager Xilinx From nealf at xilinx.com Wed Feb 23 11:29:30 2022 From: nealf at xilinx.com (Neal Frager) Date: Wed, 23 Feb 2022 11:29:30 +0000 Subject: [Buildroot] [PATCH v6 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <87k0dl6dn7.fsf@dell.be.48ers.dk> References: <20220211144402.1626443-1-neal.frager@xilinx.com> <87pmnsnquv.fsf@dell.be.48ers.dk> <87sfs96gqj.fsf@dell.be.48ers.dk> <87k0dl6dn7.fsf@dell.be.48ers.dk> Message-ID: Hi Peter, > Instead of working with an environment variable, I think it would be nicer to tweak the zynqmp_virt_defconfig file with a configuration fragment with the > CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu106-revA" > Line. > This can be done with the BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES option. Yes, this looks like a better solution. I will create a uboot-fragment.config file for each board in my follow up patch. Thanks for the idea! Best regards, Neal Frager Xilinx From br015 at umbiko.net Wed Feb 23 11:30:40 2022 From: br015 at umbiko.net (Andreas Ziegler) Date: Wed, 23 Feb 2022 11:30:40 +0000 Subject: [Buildroot] STAGING_DIR does not contain executables found in TARGET_DIR In-Reply-To: References: Message-ID: <256f0da3b8d983a84ea84de250c56bb0@umbiko.net> Hi William, On 2022-02-23 07:11, William Tambe wrote: > Please help determining why STAGING_DIR does not contain executables > found in TARGET_DIR ? > > I am expecting to find debug version of all executables in TARGET_DIR, > but executables such as /bin/busybox are missing from STAGING_DIR . If you look at your packages' definition (.mk) files, you will find a few with *_INSTALL_STAGING = YES. This is responsible for the (additional) installation in STAGING_DIR. The reason for this is that some packages need to provide information during the build process, that is not needed later for operation on the target. To save space on the target system, a two-stage approach is used. Example: your configuration includes zlib-ng: the library itself is present both in STAGING_DIR and in TARGET_DIR, header and ldconfig-related files will be found in STAGING_DIR only. On the other hand, Busybox is not referenced by other packages (it does not export any interfaces), so it does not have an installation in STAGING_DIR. Your target binaries will be stripped of symbols, unless you prevent this via BR2_STRIP_EXCLUDE_{FILE, DIRS} ... Remote debugging has less impact on your target installation. For this you would need BR2_PACKAGE_HOST_GDB and BR2_PACKAGE_GDB_SERVER [1]. Kind regards, Andreas > I am using 2021.08.3 > > Full config is as follow > ``` > BR2_pu32=y > BR2_ENABLE_DEBUG=y > BR2_DEBUG_3=y > BR2_STATIC_LIBS=y > BR2_FORTIFY_SOURCE_NONE=y > BR2_TOOLCHAIN_EXTERNAL=y > BR2_TOOLCHAIN_EXTERNAL_PATH="/opt/pu32-toolchain/" > BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="$(ARCH)-elf" > BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_5=y > BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y > # BR2_TOOLCHAIN_EXTERNAL_HAS_SSP is not set > # BR2_TOOLCHAIN_EXTERNAL_INET_RPC is not set > BR2_TOOLCHAIN_EXTERNAL_CXX=y > BR2_TARGET_GENERIC_ISSUE="" > BR2_ROOTFS_MERGED_USR=y > BR2_TARGET_GENERIC_ROOT_PASSWD="root" > BR2_SYSTEM_BIN_SH_BASH=y > BR2_TARGET_GENERIC_GETTY_TERM="linux" > BR2_TARGET_GENERIC_GETTY_OPTIONS="-n -l /bin/-bash" > BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y > BR2_PACKAGE_GDB=y > BR2_PACKAGE_ZLIB=y > BR2_PACKAGE_ZLIB_NG=y > BR2_PACKAGE_DHCP=y > BR2_PACKAGE_DHCP_CLIENT=y > BR2_PACKAGE_IPROUTE2=y > BR2_PACKAGE_LRZSZ=y > BR2_PACKAGE_SOCAT=y > BR2_PACKAGE_HTOP=y > BR2_PACKAGE_NANO=y > # BR2_PACKAGE_NANO_TINY is not set > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > BR2_TARGET_ROOTFS_EXT2_SIZE="64M" > # BR2_TARGET_ROOTFS_TAR is not set > ``` [1] https://sourceware.org/gdb/current/onlinedocs/gdb/Server.html#Server From peter at korsgaard.com Wed Feb 23 11:11:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Feb 2022 12:11:40 +0100 Subject: [Buildroot] [PATCH v6 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: (Neal Frager's message of "Wed, 23 Feb 2022 11:02:24 +0000") References: <20220211144402.1626443-1-neal.frager@xilinx.com> <87pmnsnquv.fsf@dell.be.48ers.dk> <87sfs96gqj.fsf@dell.be.48ers.dk> Message-ID: <87k0dl6dn7.fsf@dell.be.48ers.dk> >>>>> "Neal" == Neal Frager writes: > Hi Peter, >> Hmm, did you test this on a zcu106 board? >> I just got access to a zcu106 rev 1.0 board and gave it a try here, and see nothing on either of the serial ports. >> Looking at the u-boot configuration I see that xilinx_zynqmp_virt_defconfig sets: >> CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu100-revC" >> Which seems to have a different uart and pinmuxing setup. Changing >> that to zynqmp-zcu106-revA it does boot (but complains here and >> there). >> This is the first time I use a zcu106, so maybe I am missing >> something, but I don't understand how it can work for you with the >> zcu100 DTB? > Thank you for catching this. I will take care of getting this corrected with a follow up patch. > The way zynqmp_virt_defconfig works is described on our wiki page below: > https://xilinx-wiki.atlassian.net/wiki/spaces/A/pages/18841973/Build+U-Boot > The reason why this was working for me is because I had the DEVICE_TREE environment variable set when building. > make distclean > make xilinx_zynqmp_virt_defconfig > export DEVICE_TREE="zynqmp-zcu106-revA" > make > What is the proper way for setting an environment variable with > buildroot? Should I add this as a pre-build script in each defconfig? Instead of working with an environment variable, I think it would be nicer to tweak the zynqmp_virt_defconfig file with a configuration fragment with the CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu106-revA" Line. This can be done with the BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES option. -- Bye, Peter Korsgaard From john at metanate.com Wed Feb 23 11:55:06 2022 From: john at metanate.com (John Keeping) Date: Wed, 23 Feb 2022 11:55:06 +0000 Subject: [Buildroot] [RFC PATCH] package/libiberty: use the same version as binutils Message-ID: <20220223115506.1191031-1-john@metanate.com> libiberty is built from the binutils source but this package has languished on version 2.32 while the binutils package now uses 2.36.1 by default. Even between the 2.32 version and GDB 10.2 which is the default (and where host-libiberty is used instead of a version bundled in the GDB source) there are memory leak fixes and several improvements to demangling. Update the libiberty package to simply use the same version as binutils so that there is no need to remember to update this package in the future. Replace the .hash file with a symlink so that the binutils hashes are used automatically. Signed-off-by: John Keeping --- I'm not sure if this is this is the best way to improve the situation here - it's the smallest change to get something a bit more modern (in most circumstances), but I wonder if libiberty should use the GDB source instead as that's the one package we know both bundles libiberty source and will use host-libiberty in preference. package/libiberty/libiberty.hash | 6 +----- package/libiberty/libiberty.mk | 4 ++-- 2 files changed, 3 insertions(+), 7 deletions(-) mode change 100644 => 120000 package/libiberty/libiberty.hash diff --git a/package/libiberty/libiberty.hash b/package/libiberty/libiberty.hash deleted file mode 100644 index 0dafcea520..0000000000 --- a/package/libiberty/libiberty.hash +++ /dev/null @@ -1,5 +0,0 @@ -# From ftp://gcc.gnu.org/pub/binutils/releases/sha512.sum -sha512 d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724afa1e43bd0db45cfc9916b41519b67dfce03232aa4978704492a6994a binutils-2.32.tar.xz - -# Locally computed, same as binutils.hash -sha256 56bdea73b6145ef6ac5259b3da390b981d840c24cb03b8e1cbc678de7ecfa18d COPYING.LIB diff --git a/package/libiberty/libiberty.hash b/package/libiberty/libiberty.hash new file mode 120000 index 0000000000..e0655d3af3 --- /dev/null +++ b/package/libiberty/libiberty.hash @@ -0,0 +1 @@ +../binutils/binutils.hash \ No newline at end of file diff --git a/package/libiberty/libiberty.mk b/package/libiberty/libiberty.mk index 6235a8b956..d0847bf298 100644 --- a/package/libiberty/libiberty.mk +++ b/package/libiberty/libiberty.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBIBERTY_VERSION = 2.32 -LIBIBERTY_SOURCE = binutils-$(LIBIBERTY_VERSION).tar.xz +LIBIBERTY_VERSION = $(BINUTILS_VERSION) +LIBIBERTY_SOURCE = $(BINUTILS_SOURCE) LIBIBERTY_SITE = $(BR2_GNU_MIRROR)/binutils HOST_LIBIBERTY_DL_SUBDIR = binutils -- 2.35.1 From neal.frager at xilinx.com Wed Feb 23 12:51:18 2022 From: neal.frager at xilinx.com (Neal Frager) Date: Wed, 23 Feb 2022 05:51:18 -0700 Subject: [Buildroot] [PATCH v1 1/1] configs/zynqmp_zcu10x: fix U-Boot dts config Message-ID: <20220223125118.2325363-1-neal.frager@xilinx.com> This patch: - fixes U-Boot issue when DEVICE_TREE environment variable undefined - bumps U-Boot to Xilinx 2022.01-171 - bumps Linux to Xilinx 5.15-945 Signed-off-by: Neal Frager --- board/zynqmp/zcu102/uboot-fragment.config | 2 ++ board/zynqmp/zcu106/uboot-fragment.config | 2 ++ configs/zynqmp_zcu102_defconfig | 5 +++-- configs/zynqmp_zcu106_defconfig | 5 +++-- 4 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 board/zynqmp/zcu102/uboot-fragment.config create mode 100644 board/zynqmp/zcu106/uboot-fragment.config diff --git a/board/zynqmp/zcu102/uboot-fragment.config b/board/zynqmp/zcu102/uboot-fragment.config new file mode 100644 index 0000000000..51b4f3c96a --- /dev/null +++ b/board/zynqmp/zcu102/uboot-fragment.config @@ -0,0 +1,2 @@ +CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu102-rev1.0" + diff --git a/board/zynqmp/zcu106/uboot-fragment.config b/board/zynqmp/zcu106/uboot-fragment.config new file mode 100644 index 0000000000..bdb0fafea7 --- /dev/null +++ b/board/zynqmp/zcu106/uboot-fragment.config @@ -0,0 +1,2 @@ +CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu106-revA" + diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig index 298ce2388c..0c12b9c0e9 100644 --- a/configs/zynqmp_zcu102_defconfig +++ b/configs/zynqmp_zcu102_defconfig @@ -5,7 +5,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.15-930-g966124532656bc95d781abf57531e4cd4f962237" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.15-945-gbf3378b260738e3193470858df7996871cbb8389" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" @@ -23,8 +23,9 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2022.01-165-g667001319cbe511ce6353195fb4910ae5cb041ce" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2022.01-171-g61a294ab1b89e2078aa87ad78926d5f46a6af74c" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/zcu102/uboot-fragment.config" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index 3e51cbfaab..9bb75d1624 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -5,7 +5,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.15-930-g966124532656bc95d781abf57531e4cd4f962237" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.15-945-gbf3378b260738e3193470858df7996871cbb8389" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" @@ -23,8 +23,9 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2022.01-165-g667001319cbe511ce6353195fb4910ae5cb041ce" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2022.01-171-g61a294ab1b89e2078aa87ad78926d5f46a6af74c" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/zcu106/uboot-fragment.config" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y -- 2.17.1 From nealf at xilinx.com Wed Feb 23 12:55:25 2022 From: nealf at xilinx.com (Neal Frager) Date: Wed, 23 Feb 2022 12:55:25 +0000 Subject: [Buildroot] [PATCH v6 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022 In-Reply-To: <87o82x6gps.fsf@dell.be.48ers.dk> References: <20220211144402.1626443-1-neal.frager@xilinx.com> <69189572-6eba-ed26-52dd-08a8b098f124@lucaceresoli.net> <87bkzcnqpx.fsf@dell.be.48ers.dk> <87o82x6gps.fsf@dell.be.48ers.dk> Message-ID: Hi Peter, > Neal, will you send a followup patch for this? A follow up patch has been submitted. Best regards, Neal Frager Xilinx From peter at korsgaard.com Wed Feb 23 12:41:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Feb 2022 13:41:08 +0100 Subject: [Buildroot] [PATCH] Makefile: unexport 'DEVICE_TREE' environment variable Message-ID: <20220223124109.2370215-1-peter@korsgaard.com> U-Boot looks for the environment variable DEVICE_TREE and uses its value if set instead of the CONFIG_DEFAULT_DEVICE_TREE configuration option since v2021.01, more specifically commit c0f1ebe9c1b9745e (binman: Allow selecting default FIT configuration) - So unexport it like we do for other "troublesome" environment variables to ensure consistent behaviour. Reported-by: Neal Frager Signed-off-by: Peter Korsgaard --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index d92438166f..0ed93e600d 100644 --- a/Makefile +++ b/Makefile @@ -426,6 +426,7 @@ unexport O unexport GCC_COLORS unexport PLATFORM unexport OS +unexport DEVICE_TREE GNU_HOST_NAME := $(shell support/gnuconfig/config.guess) -- 2.30.2 From yann.morin.1998 at free.fr Wed Feb 23 14:03:18 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 23 Feb 2022 15:03:18 +0100 Subject: [Buildroot] [git commit] Makefile: unexport 'DEVICE_TREE' environment variable Message-ID: <20220223135658.66C7883845@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d3910057c6ae38e2cf72e8c86cd84756fffba2ac branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master U-Boot looks for the environment variable DEVICE_TREE and uses its value if set instead of the CONFIG_DEFAULT_DEVICE_TREE configuration option since v2021.01, more specifically commit c0f1ebe9c1b9745e (binman: Allow selecting default FIT configuration) - So unexport it like we do for other "troublesome" environment variables to ensure consistent behaviour. Reported-by: Neal Frager Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index d92438166f..0ed93e600d 100644 --- a/Makefile +++ b/Makefile @@ -426,6 +426,7 @@ unexport O unexport GCC_COLORS unexport PLATFORM unexport OS +unexport DEVICE_TREE GNU_HOST_NAME := $(shell support/gnuconfig/config.guess) From yann.morin.1998 at free.fr Wed Feb 23 14:05:45 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 23 Feb 2022 15:05:45 +0100 Subject: [Buildroot] [PATCH] Makefile: unexport 'DEVICE_TREE' environment variable In-Reply-To: <20220223124109.2370215-1-peter@korsgaard.com> References: <20220223124109.2370215-1-peter@korsgaard.com> Message-ID: <20220223140545.GA179822@scaer> Peter, All, On 2022-02-23 13:41 +0100, Peter Korsgaard spake thusly: > U-Boot looks for the environment variable DEVICE_TREE and uses its value if > set instead of the CONFIG_DEFAULT_DEVICE_TREE configuration option since > v2021.01, more specifically commit c0f1ebe9c1b9745e (binman: Allow selecting > default FIT configuration) - So unexport it like we do for other > "troublesome" environment variables to ensure consistent behaviour. > > Reported-by: Neal Frager > Signed-off-by: Peter Korsgaard Applied to master, thanks. Regards, Yann E. MORIN. > --- > Makefile | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/Makefile b/Makefile > index d92438166f..0ed93e600d 100644 > --- a/Makefile > +++ b/Makefile > @@ -426,6 +426,7 @@ unexport O > unexport GCC_COLORS > unexport PLATFORM > unexport OS > +unexport DEVICE_TREE > > GNU_HOST_NAME := $(shell support/gnuconfig/config.guess) > > -- > 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 bugzilla at busybox.net Wed Feb 23 14:23:23 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 23 Feb 2022 14:23:23 +0000 Subject: [Buildroot] [Bug 14601] New: Python build fails on 2022.02-rc2 Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14601 Bug ID: 14601 Summary: Python build fails on 2022.02-rc2 Product: buildroot Version: unspecified Hardware: All OS: Linux Status: NEW Severity: critical Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: info at hifiberry.com CC: buildroot at uclibc.org Target Milestone: --- Just trying the 2022.02 release. When building Python the install step fails: python3: installs files in /home/matuschd/buildroot-4/target//home/matuschd/buildroot-4 make[1]: *** [package/pkg-generic.mk:389: /home/matuschd/buildroot-4/build/python3-3.10.2/.stamp_target_installed] Error 1 It seems that the install path isn't handled correctly - probably when using the O= build option -- You are receiving this mail because: You are on the CC list for the bug. From yann.morin.1998 at free.fr Wed Feb 23 14:27:31 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 23 Feb 2022 15:27:31 +0100 Subject: [Buildroot] [RFC PATCH] package/libiberty: use the same version as binutils In-Reply-To: <20220223115506.1191031-1-john@metanate.com> References: <20220223115506.1191031-1-john@metanate.com> Message-ID: <20220223142731.GA189337@scaer> John, All, On 2022-02-23 11:55 +0000, John Keeping spake thusly: > libiberty is built from the binutils source but this package has > languished on version 2.32 while the binutils package now uses 2.36.1 by > default. > > Even between the 2.32 version and GDB 10.2 which is the default (and > where host-libiberty is used instead of a version bundled in the GDB > source) there are memory leak fixes and several improvements to > demangling. > > Update the libiberty package to simply use the same version as binutils > so that there is no need to remember to update this package in the > future. Replace the .hash file with a symlink so that the binutils > hashes are used automatically. > > Signed-off-by: John Keeping > --- > I'm not sure if this is this is the best way to improve the situation > here - it's the smallest change to get something a bit more modern (in > most circumstances), but I wonder if libiberty should use the GDB source > instead as that's the one package we know both bundles libiberty source > and will use host-libiberty in preference. > > package/libiberty/libiberty.hash | 6 +----- > package/libiberty/libiberty.mk | 4 ++-- > 2 files changed, 3 insertions(+), 7 deletions(-) > mode change 100644 => 120000 package/libiberty/libiberty.hash > > diff --git a/package/libiberty/libiberty.hash b/package/libiberty/libiberty.hash > deleted file mode 100644 > index 0dafcea520..0000000000 > --- a/package/libiberty/libiberty.hash > +++ /dev/null > @@ -1,5 +0,0 @@ > -# From ftp://gcc.gnu.org/pub/binutils/releases/sha512.sum > -sha512 d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724afa1e43bd0db45cfc9916b41519b67dfce03232aa4978704492a6994a binutils-2.32.tar.xz > - > -# Locally computed, same as binutils.hash > -sha256 56bdea73b6145ef6ac5259b3da390b981d840c24cb03b8e1cbc678de7ecfa18d COPYING.LIB > diff --git a/package/libiberty/libiberty.hash b/package/libiberty/libiberty.hash > new file mode 120000 > index 0000000000..e0655d3af3 > --- /dev/null > +++ b/package/libiberty/libiberty.hash > @@ -0,0 +1 @@ > +../binutils/binutils.hash > \ No newline at end of file > diff --git a/package/libiberty/libiberty.mk b/package/libiberty/libiberty.mk > index 6235a8b956..d0847bf298 100644 > --- a/package/libiberty/libiberty.mk > +++ b/package/libiberty/libiberty.mk > @@ -4,8 +4,8 @@ > # > ################################################################################ > > -LIBIBERTY_VERSION = 2.32 > -LIBIBERTY_SOURCE = binutils-$(LIBIBERTY_VERSION).tar.xz > +LIBIBERTY_VERSION = $(BINUTILS_VERSION) > +LIBIBERTY_SOURCE = $(BINUTILS_SOURCE) Although this works, this is by pure chance: binutils is included before libiberty, so BINUTILS_VERSION is defined. But we try and avoid such a situation, unless we explicitly guarantee the include ordering (eg. gcc, fftw, util-linux, or previously, qt5). Instead, in such a case, we prefer that the version strin is duplicated, and a comment added above to note that both shoujld be updated in sync. See for example bluez5_utils and bluez5_utils-headers, mesa3d and mesa3d-headers. Regards, Yann E. MORIN. > LIBIBERTY_SITE = $(BR2_GNU_MIRROR)/binutils > HOST_LIBIBERTY_DL_SUBDIR = binutils > > -- > 2.35.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 nealf at xilinx.com Wed Feb 23 14:30:58 2022 From: nealf at xilinx.com (Neal Frager) Date: Wed, 23 Feb 2022 14:30:58 +0000 Subject: [Buildroot] [PATCH v1 1/1] configs/zynqmp_zcu10x: fix U-Boot dts config In-Reply-To: <20220223125118.2325363-1-neal.frager@xilinx.com> References: <20220223125118.2325363-1-neal.frager@xilinx.com> Message-ID: Hi Peter, +++ b/board/zynqmp/zcu106/uboot-fragment.config @@ -0,0 +1,2 @@ +CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu106-revA" + I tried your method of creating a uboot fragment config that just modifies the CONFIG_DEFAULT_DEVICE_TREE. However, when I build, I get the following error: Device Tree Source (arch/arm/dts/unset.dtb) is not correctly specified. Please define 'CONFIG_DEFAULT_DEVICE_TREE' or build with 'DEVICE_TREE=' argument I can see that the U-Boot .config is correctly modified with CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu106-revA" But it does not build. How did you get this to build on your side? Best regards, Neal Frager Xilinx From nealf at xilinx.com Wed Feb 23 14:46:31 2022 From: nealf at xilinx.com (Neal Frager) Date: Wed, 23 Feb 2022 14:46:31 +0000 Subject: [Buildroot] [PATCH v1 1/1] configs/zynqmp_zcu10x: fix U-Boot dts config In-Reply-To: References: <20220223125118.2325363-1-neal.frager@xilinx.com> Message-ID: Hi Peter, > +++ b/board/zynqmp/zcu106/uboot-fragment.config > @@ -0,0 +1,2 @@ > +CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu106-revA" > + > I tried your method of creating a uboot fragment config that just modifies the CONFIG_DEFAULT_DEVICE_TREE. > However, when I build, I get the following error: > Device Tree Source (arch/arm/dts/unset.dtb) is not correctly specified. > Please define 'CONFIG_DEFAULT_DEVICE_TREE' > or build with 'DEVICE_TREE=' argument > I can see that the U-Boot .config is correctly modified with CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu106-revA" > But it does not build. How did you get this to build on your side? If I add DEVICE_TREE=zynqmp-zcu106-revA to my environment, then everything builds and runs without any other changes. But if I do not have DEVICE_TREE defined, I still get the following error, even if I have the following in my u-boot .config. CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu106-revA" Any ideas? Thank you for your help! Best regards, Neal Frager Xilinx From thomas.petazzoni at bootlin.com Wed Feb 23 14:51:41 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 23 Feb 2022 15:51:41 +0100 Subject: [Buildroot] [RFC PATCH] package/libiberty: use the same version as binutils In-Reply-To: <20220223142731.GA189337@scaer> References: <20220223115506.1191031-1-john@metanate.com> <20220223142731.GA189337@scaer> Message-ID: <20220223155141.0223462b@windsurf> On Wed, 23 Feb 2022 15:27:31 +0100 "Yann E. MORIN" wrote: > Although this works, this is by pure chance: binutils is included before > libiberty, so BINUTILS_VERSION is defined. But we try and avoid such a > situation, unless we explicitly guarantee the include ordering (eg. gcc, > fftw, util-linux, or previously, qt5). > > Instead, in such a case, we prefer that the version strin is duplicated, > and a comment added above to note that both shoujld be updated in sync. > See for example bluez5_utils and bluez5_utils-headers, mesa3d and > mesa3d-headers. libiberty/binutils is different than mesa3d or bluez5_utils, as the version is user-selectable, or even different depending on the selected CPU architecture. So we would have to replicate all the version selection logic (like we admittedly do for linux vs. linux-headers). Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From yann.morin.1998 at free.fr Wed Feb 23 15:17:32 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 23 Feb 2022 16:17:32 +0100 Subject: [Buildroot] [RFC PATCH] package/libiberty: use the same version as binutils In-Reply-To: <20220223155141.0223462b@windsurf> References: <20220223115506.1191031-1-john@metanate.com> <20220223142731.GA189337@scaer> <20220223155141.0223462b@windsurf> Message-ID: <20220223151732.GB189337@scaer> Thomas, All, On 2022-02-23 15:51 +0100, Thomas Petazzoni spake thusly: > On Wed, 23 Feb 2022 15:27:31 +0100 > "Yann E. MORIN" wrote: > > Although this works, this is by pure chance: binutils is included before > > libiberty, so BINUTILS_VERSION is defined. But we try and avoid such a > > situation, unless we explicitly guarantee the include ordering (eg. gcc, > > fftw, util-linux, or previously, qt5). > > Instead, in such a case, we prefer that the version strin is duplicated, > > and a comment added above to note that both shoujld be updated in sync. > > See for example bluez5_utils and bluez5_utils-headers, mesa3d and > > mesa3d-headers. > libiberty/binutils is different than mesa3d or bluez5_utils, as the > version is user-selectable, or even different depending on the selected > CPU architecture. Right, I forgot about that... But still, I don't like that we rely on the implied include order here, as we try and avoid that elsewhere... > So we would have to replicate all the version selection logic (like we > admittedly do for linux vs. linux-headers). That would not be very convenient and maintainable in the long run, as we update binutils to newer versions with various arch support changes: indeed, as we can see here, we'd eventually forget to update libibert in sync. Unless we move libiberty as a sub-directory in pacage/binutils/libiberty/ (like for util-linux-libs) to make it obvious that we need to share the version... That'd be my favourite option. 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 Wed Feb 23 15:20:39 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Wed, 23 Feb 2022 16:20:39 +0100 Subject: [Buildroot] [PATCH/next 1/2] package/libva: bump version to 2.14.0 Message-ID: <20220223152040.188210-1-bernd.kuhls@t-online.de> Release notes: https://github.com/intel/libva/releases/tag/2.14.0 Signed-off-by: Bernd Kuhls --- package/libva/libva.hash | 6 +++--- package/libva/libva.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libva/libva.hash b/package/libva/libva.hash index 7b66a7709d..4646a816bb 100644 --- a/package/libva/libva.hash +++ b/package/libva/libva.hash @@ -1,5 +1,5 @@ -# From https://github.com/intel/libva/releases/download/2.13.0/libva-2.13.0.tar.bz2.sha1sum -sha1 2adb2c023371dd68fe0d23e58afcf0b072b79828 libva-2.13.0.tar.bz2 +# From https://github.com/intel/libva/releases/download/2.14.0/libva-2.14.0.tar.bz2.sha1sum +sha1 36b482ec8c361a6c3a6198f4777409b136f2713c libva-2.14.0.tar.bz2 # Locally computed -sha256 fad383f39f36115814bd0eda1496a4cc01761643bd962635400df2d4470ad460 libva-2.13.0.tar.bz2 +sha256 511e9a74d1ccfb548bc192290603082c11074ac59b17aadfd5d56a3f93e58454 libva-2.14.0.tar.bz2 sha256 c86a782ee845b52472dae9b9d79fb915d333628ac0efe49cdce63644814931de COPYING diff --git a/package/libva/libva.mk b/package/libva/libva.mk index 6ac5386540..db1cfd29be 100644 --- a/package/libva/libva.mk +++ b/package/libva/libva.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVA_VERSION = 2.13.0 +LIBVA_VERSION = 2.14.0 LIBVA_SOURCE = libva-$(LIBVA_VERSION).tar.bz2 LIBVA_SITE = https://github.com/intel/libva/releases/download/$(LIBVA_VERSION) LIBVA_LICENSE = MIT -- 2.30.2 From bernd.kuhls at t-online.de Wed Feb 23 15:20:40 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Wed, 23 Feb 2022 16:20:40 +0100 Subject: [Buildroot] [PATCH/next 2/2] package/libva-utils: bump version to 2.14.0 In-Reply-To: <20220223152040.188210-1-bernd.kuhls@t-online.de> References: <20220223152040.188210-1-bernd.kuhls@t-online.de> Message-ID: <20220223152040.188210-2-bernd.kuhls@t-online.de> Release notes: https://github.com/intel/libva-utils/releases/tag/2.14.0 Upstream does not provide a tarball so switch to github helper. Switch build system to meson to avoid autoreconf. Signed-off-by: Bernd Kuhls --- package/libva-utils/libva-utils.hash | 4 +--- package/libva-utils/libva-utils.mk | 7 +++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/package/libva-utils/libva-utils.hash b/package/libva-utils/libva-utils.hash index 18a078dc1c..5f21af800e 100644 --- a/package/libva-utils/libva-utils.hash +++ b/package/libva-utils/libva-utils.hash @@ -1,5 +1,3 @@ -# From https://github.com/intel/libva-utils/releases/download/2.13.0/libva-utils-2.13.0.tar.bz2.sha1sum -sha1 7ab945cf232387f762891f9e4f7a6cb41e0766e8 libva-utils-2.13.0.tar.bz2 # Locally computed -sha256 db3ae0bd63c2a3f6ef498450c29ffc99c387ce611e1eb5db6a8da1f88845d612 libva-utils-2.13.0.tar.bz2 +sha256 0ad6410aaa27d7b15dadee0f4d775d54d6394b582bf315353a4657b49c78ac31 libva-utils-2.14.0.tar.gz sha256 c6220c9f87832c27abcb8a32eafdd2823e13ce146b3ea63d5deae2a76798ef50 COPYING diff --git a/package/libva-utils/libva-utils.mk b/package/libva-utils/libva-utils.mk index e6e31df8bd..4c527a748c 100644 --- a/package/libva-utils/libva-utils.mk +++ b/package/libva-utils/libva-utils.mk @@ -4,11 +4,10 @@ # ################################################################################ -LIBVA_UTILS_VERSION = 2.13.0 -LIBVA_UTILS_SOURCE = libva-utils-$(LIBVA_UTILS_VERSION).tar.bz2 -LIBVA_UTILS_SITE = https://github.com/intel/libva-utils/releases/download/$(LIBVA_UTILS_VERSION) +LIBVA_UTILS_VERSION = 2.14.0 +LIBVA_UTILS_SITE = $(call github,intel,libva-utils,$(LIBVA_UTILS_VERSION)) LIBVA_UTILS_LICENSE = MIT LIBVA_UTILS_LICENSE_FILES = COPYING LIBVA_UTILS_DEPENDENCIES = host-pkgconf libva -$(eval $(autotools-package)) +$(eval $(meson-package)) -- 2.30.2 From bernd.kuhls at t-online.de Wed Feb 23 15:51:28 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Wed, 23 Feb 2022 16:51:28 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xdriver_xf86-video-mach64: fix build error Message-ID: <20220223155128.818822-1-bernd.kuhls@t-online.de> Add upstream commit to fix build with xorg-server 21.1 which was bumped with commit d9185c6ba38430a017ed996c4180e141881ba570. Fixes: http://autobuild.buildroot.net/results/f0a/f0a0224a2b368c11236fcc7d14db5175c0a829d1/ Signed-off-by: Bernd Kuhls --- ...me-bool-to-boolean-for-OptionInfoRec.patch | 84 +++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 package/x11r7/xdriver_xf86-video-mach64/0002-Rename-bool-to-boolean-for-OptionInfoRec.patch diff --git a/package/x11r7/xdriver_xf86-video-mach64/0002-Rename-bool-to-boolean-for-OptionInfoRec.patch b/package/x11r7/xdriver_xf86-video-mach64/0002-Rename-bool-to-boolean-for-OptionInfoRec.patch new file mode 100644 index 0000000000..fe3e21f8c2 --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-mach64/0002-Rename-bool-to-boolean-for-OptionInfoRec.patch @@ -0,0 +1,84 @@ +From 3ab2c144ef34199ceaf95115538a67f932e76f7d Mon Sep 17 00:00:00 2001 +From: Josselin Poiret +Date: Thu, 18 Nov 2021 13:18:25 +0000 +Subject: [PATCH] Rename bool to boolean for OptionInfoRec. + +* src/aticonfig.c: Change uses of .value.bool to .value.boolean + +Downloaded from upstream commit +https://gitlab.freedesktop.org/xorg/driver/xf86-video-mach64/-/commit/3ab2c144ef34199ceaf95115538a67f932e76f7d + +Signed-off-by: Bernd Kuhls +--- + src/aticonfig.c | 38 +++++++++++++++++++------------------- + 1 file changed, 19 insertions(+), 19 deletions(-) + +diff --git a/src/aticonfig.c b/src/aticonfig.c +index bad6474..6995b9a 100644 +--- a/src/aticonfig.c ++++ b/src/aticonfig.c +@@ -311,42 +311,42 @@ ATIProcessOptions + + (void)memcpy(PublicOption, ATIPublicOptions, ATIPublicOptionSize); + +-# define ProbeSparse PublicOption[ATI_OPTION_PROBE_SPARSE].value.bool +-# define Accel PublicOption[ATI_OPTION_ACCEL].value.bool +-# define BIOSDisplay PrivateOption[ATI_OPTION_BIOS_DISPLAY].value.bool +-# define Blend PrivateOption[ATI_OPTION_BLEND].value.bool +-# define CRTDisplay PublicOption[ATI_OPTION_CRT_DISPLAY].value.bool +-# define CRTScreen PrivateOption[ATI_OPTION_CRT_SCREEN].value.bool +-# define CSync PublicOption[ATI_OPTION_CSYNC].value.bool +-# define Devel PrivateOption[ATI_OPTION_DEVEL].value.bool +-# define HWCursor PublicOption[ATI_OPTION_HWCURSOR].value.bool ++# define ProbeSparse PublicOption[ATI_OPTION_PROBE_SPARSE].value.boolean ++# define Accel PublicOption[ATI_OPTION_ACCEL].value.boolean ++# define BIOSDisplay PrivateOption[ATI_OPTION_BIOS_DISPLAY].value.boolean ++# define Blend PrivateOption[ATI_OPTION_BLEND].value.boolean ++# define CRTDisplay PublicOption[ATI_OPTION_CRT_DISPLAY].value.boolean ++# define CRTScreen PrivateOption[ATI_OPTION_CRT_SCREEN].value.boolean ++# define CSync PublicOption[ATI_OPTION_CSYNC].value.boolean ++# define Devel PrivateOption[ATI_OPTION_DEVEL].value.boolean ++# define HWCursor PublicOption[ATI_OPTION_HWCURSOR].value.boolean + + #ifdef XF86DRI_DEVEL + +-# define IsPCI PublicOption[ATI_OPTION_IS_PCI].value.bool ++# define IsPCI PublicOption[ATI_OPTION_IS_PCI].value.boolean + # define DMAMode PublicOption[ATI_OPTION_DMA_MODE].value.str + # define AGPMode PublicOption[ATI_OPTION_AGP_MODE].value.num + # define AGPSize PublicOption[ATI_OPTION_AGP_SIZE].value.num +-# define LocalTex PublicOption[ATI_OPTION_LOCAL_TEXTURES].value.bool ++# define LocalTex PublicOption[ATI_OPTION_LOCAL_TEXTURES].value.boolean + # define BufferSize PublicOption[ATI_OPTION_BUFFER_SIZE].value.num + + #endif /* XF86DRI_DEVEL */ + + #ifdef TV_OUT + +-# define TvOut PublicOption[ATI_OPTION_TV_OUT].value.bool ++# define TvOut PublicOption[ATI_OPTION_TV_OUT].value.boolean + # define TvStd PublicOption[ATI_OPTION_TV_STD].value.str + + #endif /* TV_OUT */ + +-# define CacheMMIO PublicOption[ATI_OPTION_MMIO_CACHE].value.bool +-# define TestCacheMMIO PublicOption[ATI_OPTION_TEST_MMIO_CACHE].value.bool +-# define PanelDisplay PublicOption[ATI_OPTION_PANEL_DISPLAY].value.bool +-# define ShadowFB PublicOption[ATI_OPTION_SHADOW_FB].value.bool +-# define SWCursor PublicOption[ATI_OPTION_SWCURSOR].value.bool ++# define CacheMMIO PublicOption[ATI_OPTION_MMIO_CACHE].value.boolean ++# define TestCacheMMIO PublicOption[ATI_OPTION_TEST_MMIO_CACHE].value.boolean ++# define PanelDisplay PublicOption[ATI_OPTION_PANEL_DISPLAY].value.boolean ++# define ShadowFB PublicOption[ATI_OPTION_SHADOW_FB].value.boolean ++# define SWCursor PublicOption[ATI_OPTION_SWCURSOR].value.boolean + # define AccelMethod PublicOption[ATI_OPTION_ACCELMETHOD].value.str +-# define RenderAccel PublicOption[ATI_OPTION_RENDER_ACCEL].value.bool +-# define LCDSync PrivateOption[ATI_OPTION_LCDSYNC].value.bool ++# define RenderAccel PublicOption[ATI_OPTION_RENDER_ACCEL].value.boolean ++# define LCDSync PrivateOption[ATI_OPTION_LCDSYNC].value.boolean + + # define ReferenceClock \ + PublicOption[ATI_OPTION_REFERENCE_CLOCK].value.freq.freq +-- +GitLab + -- 2.30.2 From bernd.kuhls at t-online.de Wed Feb 23 15:59:42 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Wed, 23 Feb 2022 16:59:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xdriver_xf86-video-nouveau: fix build error Message-ID: <20220223155942.831349-1-bernd.kuhls@t-online.de> Add upstream commit to fix build with xorg-server 21.1 which was bumped with commit d9185c6ba38430a017ed996c4180e141881ba570. No autobuild errors found yet. Signed-off-by: Bernd Kuhls --- ...au-fixup-driver-for-new-X-server-ABI.patch | 68 +++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 package/x11r7/xdriver_xf86-video-nouveau/0001-nouveau-fixup-driver-for-new-X-server-ABI.patch diff --git a/package/x11r7/xdriver_xf86-video-nouveau/0001-nouveau-fixup-driver-for-new-X-server-ABI.patch b/package/x11r7/xdriver_xf86-video-nouveau/0001-nouveau-fixup-driver-for-new-X-server-ABI.patch new file mode 100644 index 0000000000..96be4909e7 --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-nouveau/0001-nouveau-fixup-driver-for-new-X-server-ABI.patch @@ -0,0 +1,68 @@ +From e80e73ced69b15662103d0fd6837db4ce6c6eb5b Mon Sep 17 00:00:00 2001 +From: Dave Airlie +Date: Mon, 13 Jul 2020 09:20:15 +1000 +Subject: [PATCH] nouveau: fixup driver for new X server ABI + +Downloaded from upstream commit +https://gitlab.freedesktop.org/xorg/driver/xf86-video-nouveau/-/commit/e80e73ced69b15662103d0fd6837db4ce6c6eb5b + +Signed-off-by: Bernd Kuhls +--- + src/compat-api.h | 4 ++++ + src/nouveau_exa.c | 2 +- + src/nv_driver.c | 6 +++--- + 3 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/src/compat-api.h b/src/compat-api.h +index fde2f4b..8a1fcf9 100644 +--- a/src/compat-api.h ++++ b/src/compat-api.h +@@ -102,4 +102,8 @@ + + #endif + ++#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(25, 2) ++#define secondary_dst slave_dst ++#endif ++ + #endif +diff --git a/src/nouveau_exa.c b/src/nouveau_exa.c +index 55df6f8..db3b112 100644 +--- a/src/nouveau_exa.c ++++ b/src/nouveau_exa.c +@@ -157,7 +157,7 @@ nouveau_exa_destroy_pixmap(ScreenPtr pScreen, void *priv) + + #ifdef NOUVEAU_PIXMAP_SHARING + static Bool +-nouveau_exa_share_pixmap_backing(PixmapPtr ppix, ScreenPtr slave, void **handle_p) ++nouveau_exa_share_pixmap_backing(PixmapPtr ppix, ScreenPtr secondary, void **handle_p) + { + struct nouveau_bo *bo = nouveau_pixmap_bo(ppix); + struct nouveau_pixmap *nvpix = nouveau_pixmap(ppix); +diff --git a/src/nv_driver.c b/src/nv_driver.c +index e72a6b6..f9ab4af 100644 +--- a/src/nv_driver.c ++++ b/src/nv_driver.c +@@ -559,16 +559,16 @@ redisplay_dirty(ScreenPtr screen, PixmapDirtyUpdatePtr dirty) + { + RegionRec pixregion; + +- PixmapRegionInit(&pixregion, dirty->slave_dst); ++ PixmapRegionInit(&pixregion, dirty->secondary_dst); + +- DamageRegionAppend(&dirty->slave_dst->drawable, &pixregion); ++ DamageRegionAppend(&dirty->secondary_dst->drawable, &pixregion); + #ifdef HAS_DIRTYTRACKING_ROTATION + PixmapSyncDirtyHelper(dirty); + #else + PixmapSyncDirtyHelper(dirty, &pixregion); + #endif + +- DamageRegionProcessPending(&dirty->slave_dst->drawable); ++ DamageRegionProcessPending(&dirty->secondary_dst->drawable); + RegionUninit(&pixregion); + } + +-- +GitLab + -- 2.30.2 From bernd.kuhls at t-online.de Wed Feb 23 16:06:30 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Wed, 23 Feb 2022 17:06:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xdriver_xf86-video-qxl: fix build error Message-ID: <20220223160630.835866-1-bernd.kuhls@t-online.de> Add upstream commit to fix build with xorg-server 21.1 which was bumped with commit d9185c6ba38430a017ed996c4180e141881ba570. No autobuild errors found yet. Signed-off-by: Bernd Kuhls --- ...1-Fix-a-build-error-with-Xorg-master.patch | 106 ++++++++++++++++++ 1 file changed, 106 insertions(+) create mode 100644 package/x11r7/xdriver_xf86-video-qxl/0001-Fix-a-build-error-with-Xorg-master.patch diff --git a/package/x11r7/xdriver_xf86-video-qxl/0001-Fix-a-build-error-with-Xorg-master.patch b/package/x11r7/xdriver_xf86-video-qxl/0001-Fix-a-build-error-with-Xorg-master.patch new file mode 100644 index 0000000000..d3257fba20 --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-qxl/0001-Fix-a-build-error-with-Xorg-master.patch @@ -0,0 +1,106 @@ +From 4e1963a812f2c1777ba5d56ea9e939a3e40a0496 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zolt=C3=A1n=20B=C3=B6sz=C3=B6rm=C3=A9nyi?= + +Date: Sat, 28 Aug 2021 15:38:40 +0200 +Subject: [PATCH] Fix a build error with Xorg master +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Use xf86ReturnOptValBool() in get_bool_option() instead of +options[option_index].value.bool to fix a compiler error with +current Xorg xserver master branch. + +Also use xf86GetOptValInteger() in get_int_option() and +xf86GetOptValString() in get_str_option() for consistency. + +The change causes a slight performance drop during option parsing +because the passed-in index_value is no longer used as an index +into the options array. + +Instead, it's used as a token now for the standard option getter +functions which works since the index_value to the get_*_option() +functions are identical to the value of options[n].token in the +passed-in OptionInfoRec array. + +Also rename "int option_index" to "int token" for clarity in all +three functions. + +Signed-off-by: Zolt?n B?sz?rm?nyi + +Downloaded from upstream commit +https://gitlab.freedesktop.org/xorg/driver/xf86-video-qxl/-/commit/4e1963a812f2c1777ba5d56ea9e939a3e40a0496 + +Signed-off-by: Bernd Kuhls +--- + src/qxl_option_helpers.c | 13 +++++++------ + src/qxl_option_helpers.h | 6 +++--- + 2 files changed, 10 insertions(+), 9 deletions(-) + +diff --git a/src/qxl_option_helpers.c b/src/qxl_option_helpers.c +index 2aba677..7707b7c 100644 +--- a/src/qxl_option_helpers.c ++++ b/src/qxl_option_helpers.c +@@ -10,31 +10,32 @@ + + #include "qxl_option_helpers.h" + +-int get_int_option(OptionInfoPtr options, int option_index, ++int get_int_option(OptionInfoPtr options, int token, + const char *env_name) + { ++ int value; + if (env_name && getenv(env_name)) { + return atoi(getenv(env_name)); + } +- return options[option_index].value.num; ++ return xf86GetOptValInteger(options, token, &value) ? value : 0; + } + +-const char *get_str_option(OptionInfoPtr options, int option_index, ++const char *get_str_option(OptionInfoPtr options, int token, + const char *env_name) + { + if (getenv(env_name)) { + return getenv(env_name); + } +- return options[option_index].value.str; ++ return xf86GetOptValString(options, token); + } + +-int get_bool_option(OptionInfoPtr options, int option_index, ++int get_bool_option(OptionInfoPtr options, int token, + const char *env_name) + { + const char* value = getenv(env_name); + + if (!value) { +- return options[option_index].value.bool; ++ return xf86ReturnOptValBool(options, token, FALSE); + } + if (strcmp(value, "0") == 0 || + strcasecmp(value, "off") == 0 || +diff --git a/src/qxl_option_helpers.h b/src/qxl_option_helpers.h +index 7c54c72..66d0a17 100644 +--- a/src/qxl_option_helpers.h ++++ b/src/qxl_option_helpers.h +@@ -4,13 +4,13 @@ + #include + #include + +-int get_int_option(OptionInfoPtr options, int option_index, ++int get_int_option(OptionInfoPtr options, int token, + const char *env_name); + +-const char *get_str_option(OptionInfoPtr options, int option_index, ++const char *get_str_option(OptionInfoPtr options, int token, + const char *env_name); + +-int get_bool_option(OptionInfoPtr options, int option_index, ++int get_bool_option(OptionInfoPtr options, int token, + const char *env_name); + + #endif // OPTION_HELPERS_H +-- +GitLab + -- 2.30.2 From john at metanate.com Wed Feb 23 16:39:15 2022 From: john at metanate.com (John Keeping) Date: Wed, 23 Feb 2022 16:39:15 +0000 Subject: [Buildroot] [RFC PATCH] package/libiberty: use the same version as binutils In-Reply-To: <20220223151732.GB189337@scaer> References: <20220223115506.1191031-1-john@metanate.com> <20220223142731.GA189337@scaer> <20220223155141.0223462b@windsurf> <20220223151732.GB189337@scaer> Message-ID: On Wed, Feb 23, 2022 at 04:17:32PM +0100, Yann E. MORIN wrote: > Thomas, All, > > On 2022-02-23 15:51 +0100, Thomas Petazzoni spake thusly: > > On Wed, 23 Feb 2022 15:27:31 +0100 > > "Yann E. MORIN" wrote: > > > Although this works, this is by pure chance: binutils is included before > > > libiberty, so BINUTILS_VERSION is defined. But we try and avoid such a > > > situation, unless we explicitly guarantee the include ordering (eg. gcc, > > > fftw, util-linux, or previously, qt5). > > > Instead, in such a case, we prefer that the version strin is duplicated, > > > and a comment added above to note that both shoujld be updated in sync. > > > See for example bluez5_utils and bluez5_utils-headers, mesa3d and > > > mesa3d-headers. > > libiberty/binutils is different than mesa3d or bluez5_utils, as the > > version is user-selectable, or even different depending on the selected > > CPU architecture. > > Right, I forgot about that... But still, I don't like that we rely on > the implied include order here, as we try and avoid that elsewhere... > > > So we would have to replicate all the version selection logic (like we > > admittedly do for linux vs. linux-headers). > > That would not be very convenient and maintainable in the long run, as > we update binutils to newer versions with various arch support changes: > indeed, as we can see here, we'd eventually forget to update libibert in > sync. > > Unless we move libiberty as a sub-directory in pacage/binutils/libiberty/ > (like for util-linux-libs) to make it obvious that we need to share the > version... That'd be my favourite option. If we're doing that, should it be in gdb instead of binutils? The gdb and binutils source all comes from the same repository but gdb is the one package for which we actually use host-libiberty so tying this in to the gdb version seems more sensible than using the binutils version. For example, given the default versions of binutils and gdb gives: $ git log --left-right --oneline binutils-2_36_1...gdb-10.2-release -- libiberty/ > f42f69f6f38 libiberty: Support the new ("v0") mangling scheme in rust-demangle < d750c713c9a Update libiberty with latest sources from gcc mainline < f9a6a8f09dc PR27116, Spelling errors found by Debian style checker < 250d07de5cf Update year range in copyright notice of binutils files < d7b477c541b Sync libiberty and include with GCC for get_DW_UT_name. so the GDB branch has a new feature (not included in the binutils branch) whereas binutils has some updates not included for GDB. It's a bit of a mess, but given where we need libiberty (for prelink-cross) and what uses the package version (host-gdb) it looks like it would make more sense to move this to the gdb package source. What do you think? John From luca at lucaceresoli.net Wed Feb 23 16:54:56 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Wed, 23 Feb 2022 17:54:56 +0100 Subject: [Buildroot] [PATCH v1 1/1] configs/zynqmp_zcu10x: fix U-Boot dts config In-Reply-To: <20220223125118.2325363-1-neal.frager@xilinx.com> References: <20220223125118.2325363-1-neal.frager@xilinx.com> Message-ID: Hi Neal, On 23/02/22 13:51, Neal Frager wrote: > This patch: > - fixes U-Boot issue when DEVICE_TREE environment variable undefined This appears unrelated from the version bumps. Please send separate patches. > - bumps U-Boot to Xilinx 2022.01-171 > - bumps Linux to Xilinx 5.15-945 > > Signed-off-by: Neal Frager > --- > board/zynqmp/zcu102/uboot-fragment.config | 2 ++ > board/zynqmp/zcu106/uboot-fragment.config | 2 ++ > configs/zynqmp_zcu102_defconfig | 5 +++-- > configs/zynqmp_zcu106_defconfig | 5 +++-- > 4 files changed, 10 insertions(+), 4 deletions(-) > create mode 100644 board/zynqmp/zcu102/uboot-fragment.config > create mode 100644 board/zynqmp/zcu106/uboot-fragment.config > > diff --git a/board/zynqmp/zcu102/uboot-fragment.config b/board/zynqmp/zcu102/uboot-fragment.config > new file mode 100644 > index 0000000000..51b4f3c96a > --- /dev/null > +++ b/board/zynqmp/zcu102/uboot-fragment.config > @@ -0,0 +1,2 @@ > +CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu102-rev1.0" > + Avoid trailing empty lines. > diff --git a/board/zynqmp/zcu106/uboot-fragment.config b/board/zynqmp/zcu106/uboot-fragment.config > new file mode 100644 > index 0000000000..bdb0fafea7 > --- /dev/null > +++ b/board/zynqmp/zcu106/uboot-fragment.config > @@ -0,0 +1,2 @@ > +CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu106-revA" > + Here too. -- Luca From luca at lucaceresoli.net Wed Feb 23 17:03:42 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Wed, 23 Feb 2022 18:03:42 +0100 Subject: [Buildroot] [PATCH v1 1/1] configs/zynqmp_zcu10x: fix U-Boot dts config In-Reply-To: References: <20220223125118.2325363-1-neal.frager@xilinx.com> Message-ID: <3795ba01-3742-acce-9eeb-8c34a00bd941@lucaceresoli.net> Hi Neal, On 23/02/22 15:30, Neal Frager wrote: > Hi Peter, > > +++ b/board/zynqmp/zcu106/uboot-fragment.config > @@ -0,0 +1,2 @@ > +CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu106-revA" > + > > I tried your method of creating a uboot fragment config that just modifies the CONFIG_DEFAULT_DEVICE_TREE. > > However, when I build, I get the following error: > > Device Tree Source (arch/arm/dts/unset.dtb) is not correctly specified. > Please define 'CONFIG_DEFAULT_DEVICE_TREE' > or build with 'DEVICE_TREE=' argument Strange, I just run a build with current master + your patch and it succeeded. > I can see that the U-Boot .config is correctly modified with > CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu106-revA" Here too. Maybe try a completely clean build. What I usually do is git clean -xdf # similar to 'make clean' but faster make zynqmp_zcu106_defconfig make And why not, do it in docker. -- Luca From peter at korsgaard.com Wed Feb 23 17:05:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Feb 2022 18:05:22 +0100 Subject: [Buildroot] [PATCH v1 1/1] configs/zynqmp_zcu10x: fix U-Boot dts config In-Reply-To: (Neal Frager's message of "Wed, 23 Feb 2022 14:30:58 +0000") References: <20220223125118.2325363-1-neal.frager@xilinx.com> Message-ID: <878ru15x9p.fsf@dell.be.48ers.dk> >>>>> "Neal" == Neal Frager writes: > Hi Peter, > +++ b/board/zynqmp/zcu106/uboot-fragment.config > @@ -0,0 +1,2 @@ > +CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu106-revA" > + > I tried your method of creating a uboot fragment config that just modifies the CONFIG_DEFAULT_DEVICE_TREE. > However, when I build, I get the following error: > Device Tree Source (arch/arm/dts/unset.dtb) is not correctly specified. > Please define 'CONFIG_DEFAULT_DEVICE_TREE' > or build with 'DEVICE_TREE=' argument > I can see that the U-Boot .config is correctly modified with > CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu106-revA" > But it does not build. How did you get this to build on your side? Are you sure you are using a clean Buildroot tree? It works here with your patch applied. Easiest way to check is to just do something like: make O=output-test zynqmp_zcu106_defconfig make O=output-test uboot-menuconfig And then scroll down to 'Device Tree Control' and verify that you have: (zynqmp-zcu106-revA) Default Device Tree for DT control -- Bye, Peter Korsgaard From giulio.benetti at benettiengineering.com Wed Feb 23 17:17:04 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 23 Feb 2022 18:17:04 +0100 Subject: [Buildroot] [PATCH v1 1/1] configs/zynqmp_zcu10x: fix U-Boot dts config In-Reply-To: <3795ba01-3742-acce-9eeb-8c34a00bd941@lucaceresoli.net> References: <3795ba01-3742-acce-9eeb-8c34a00bd941@lucaceresoli.net> Message-ID: <60963250-0364-4F7B-9B0C-51265261991E@benettiengineering.com> Hi Neal, Luca, > Il giorno 23 feb 2022, alle ore 18:04, Luca Ceresoli ha scritto: > > ?Hi Neal, > >> On 23/02/22 15:30, Neal Frager wrote: >> Hi Peter, >> >> +++ b/board/zynqmp/zcu106/uboot-fragment.config >> @@ -0,0 +1,2 @@ >> +CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu106-revA" >> + >> >> I tried your method of creating a uboot fragment config that just modifies the CONFIG_DEFAULT_DEVICE_TREE. >> >> However, when I build, I get the following error: >> >> Device Tree Source (arch/arm/dts/unset.dtb) is not correctly specified. >> Please define 'CONFIG_DEFAULT_DEVICE_TREE' >> or build with 'DEVICE_TREE=' argument > > Strange, I just run a build with current master + your patch and it > succeeded. > >> I can see that the U-Boot .config is correctly modified with >> CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu106-revA" > > Here too. > > Maybe try a completely clean build. What I usually do is > > git clean -xdf # similar to 'make clean' but faster > make zynqmp_zcu106_defconfig > make > > And why not, do it in docker. You can also do: $ make O=../output-zynqmp-zcu106 $ cd ../output-zynqmp-zcu106 $ make This way you keep the build folder separated from the buildroot source code. I always do that way because it?s easier to search in buildroot folder then without the need to filter out the output directory. Maybe we should implement this in utils/docker-run by passing an argument, so we don?t pollute buildroot folder. What about that Luca and All? Best regards Giulio > > -- > Luca > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From nealf at xilinx.com Wed Feb 23 17:17:37 2022 From: nealf at xilinx.com (Neal Frager) Date: Wed, 23 Feb 2022 17:17:37 +0000 Subject: [Buildroot] [PATCH v1 1/1] configs/zynqmp_zcu10x: fix U-Boot dts config In-Reply-To: <878ru15x9p.fsf@dell.be.48ers.dk> References: <20220223125118.2325363-1-neal.frager@xilinx.com> <878ru15x9p.fsf@dell.be.48ers.dk> Message-ID: Hi Peter, Luca, > Are you sure you are using a clean Buildroot tree? It works here with your patch applied. > Easiest way to check is to just do something like: > make O=output-test zynqmp_zcu106_defconfig make O=output-test uboot-menuconfig > And then scroll down to 'Device Tree Control' and verify that you have: > (zynqmp-zcu106-revA) Default Device Tree for DT control That is good news that it works on your end. I have just started a fully clean build to verify. Once complete, I will submit a second version of the patch removing the version bumps and unnecessary blank lines. Best regards, Neal Frager Xilinx From fperrad at gmail.com Wed Feb 23 17:28:17 2022 From: fperrad at gmail.com (Francois Perrad) Date: Wed, 23 Feb 2022 18:28:17 +0100 Subject: [Buildroot] [PATCH] package/gnutls: security bump to version 3.7.3 Message-ID: <20220223172817.3002782-1-francois.perrad@gadz.org> see https://www.gnutls.org/security-new.html#GNUTLS-SA-2022-01-17 Signed-off-by: Francois Perrad --- package/gnutls/gnutls.hash | 4 ++-- package/gnutls/gnutls.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gnutls/gnutls.hash b/package/gnutls/gnutls.hash index 5d4fd1a0d..2ffc6c1b4 100644 --- a/package/gnutls/gnutls.hash +++ b/package/gnutls/gnutls.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/gnutls-3.7.2.tar.xz.sig -sha256 646e6c5a9a185faa4cea796d378a1ba8e1148dbb197ca6605f95986a25af2752 gnutls-3.7.2.tar.xz +# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/gnutls-3.7.3.tar.xz.sig +sha256 fc59c43bc31ab20a6977ff083029277a31935b8355ce387b634fa433f8f6c49a gnutls-3.7.3.tar.xz # Locally calculated sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b doc/COPYING sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 doc/COPYING.LESSER diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index dbf759385..7317a3bb1 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -5,7 +5,7 @@ ################################################################################ GNUTLS_VERSION_MAJOR = 3.7 -GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).2 +GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).3 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz GNUTLS_SITE = https://www.gnupg.org/ftp/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR) GNUTLS_LICENSE = LGPL-2.1+ (core library) -- 2.32.0 From neal.frager at xilinx.com Wed Feb 23 17:39:38 2022 From: neal.frager at xilinx.com (Neal Frager) Date: Wed, 23 Feb 2022 10:39:38 -0700 Subject: [Buildroot] [PATCH v2 1/1] configs/zynqmp_zcu10x: fix U-Boot dts config Message-ID: <20220223173938.3307529-1-neal.frager@xilinx.com> This patch: - fixes U-Boot issue when DEVICE_TREE environment variable is not defined Signed-off-by: Neal Frager Reviewed-by: Peter Korsgaard Reviewed-by: Luca Ceresoli Tested-by: Peter Korsgaard --- V1->V2: - removed version bumps from patch - removed unnecessary blank lines from uboot-fragment.config files --- --- board/zynqmp/zcu102/uboot-fragment.config | 1 + board/zynqmp/zcu106/uboot-fragment.config | 1 + configs/zynqmp_zcu102_defconfig | 1 + configs/zynqmp_zcu106_defconfig | 1 + 4 files changed, 4 insertions(+) create mode 100644 board/zynqmp/zcu102/uboot-fragment.config create mode 100644 board/zynqmp/zcu106/uboot-fragment.config diff --git a/board/zynqmp/zcu102/uboot-fragment.config b/board/zynqmp/zcu102/uboot-fragment.config new file mode 100644 index 0000000000..52d6d9dff8 --- /dev/null +++ b/board/zynqmp/zcu102/uboot-fragment.config @@ -0,0 +1 @@ +CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu102-rev1.0" diff --git a/board/zynqmp/zcu106/uboot-fragment.config b/board/zynqmp/zcu106/uboot-fragment.config new file mode 100644 index 0000000000..cd571171ac --- /dev/null +++ b/board/zynqmp/zcu106/uboot-fragment.config @@ -0,0 +1 @@ +CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu106-revA" diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig index 298ce2388c..88e84fe791 100644 --- a/configs/zynqmp_zcu102_defconfig +++ b/configs/zynqmp_zcu102_defconfig @@ -25,6 +25,7 @@ BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2022.01-165-g667001319cbe511ce6353195fb4910ae5cb041ce" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/zcu102/uboot-fragment.config" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index 3e51cbfaab..836e050df4 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -25,6 +25,7 @@ BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2022.01-165-g667001319cbe511ce6353195fb4910ae5cb041ce" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/zcu102/uboot-fragment.config" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y -- 2.17.1 From nealf at xilinx.com Wed Feb 23 17:43:48 2022 From: nealf at xilinx.com (Neal Frager) Date: Wed, 23 Feb 2022 17:43:48 +0000 Subject: [Buildroot] [PATCH v2 1/1] configs/zynqmp_zcu10x: fix U-Boot dts config In-Reply-To: <20220223173938.3307529-1-neal.frager@xilinx.com> References: <20220223173938.3307529-1-neal.frager@xilinx.com> Message-ID: I just noticed a typo on the zynqmp_zcu106_defconfig. I will fix this with v3. From guillaume.bressaix at gmail.com Wed Feb 23 17:51:59 2022 From: guillaume.bressaix at gmail.com (Guillaume Bres) Date: Wed, 23 Feb 2022 18:51:59 +0100 Subject: [Buildroot] [v3] package/ntpsec: new package Message-ID: Hello Peter, sorry for the delayed test, the usual "busy on too many things". Today I ran the current patch serie on "zedboard_defconfig": everything works fine but SYNC is never fully acquired. The estimated "offsets" from the pool is close to 2^32 (limit?), jitter is large, delay is realistic, but those values never get averaged out. What do you think is going on? I don't think it's related to our work but to the demon itself. v1_2_1 is fairly old, I hope they provide a new tag soon because a lot of a work has been accomplished in the meantime. At work we use our custom fork (for custom encryption), I rebased to master last week, I have never experienced such behavior. Guillaume W. Bres Software engineer -------------- next part -------------- An HTML attachment was scrubbed... URL: From neal.frager at xilinx.com Wed Feb 23 17:54:06 2022 From: neal.frager at xilinx.com (Neal Frager) Date: Wed, 23 Feb 2022 10:54:06 -0700 Subject: [Buildroot] [PATCH v3 1/1] configs/zynqmp_zcu10x: fix U-Boot dts config Message-ID: <20220223175406.3347267-1-neal.frager@xilinx.com> Signed-off-by: Neal Frager --- board/zynqmp/zcu102/uboot-fragment.config | 1 + board/zynqmp/zcu106/uboot-fragment.config | 1 + configs/zynqmp_zcu102_defconfig | 1 + configs/zynqmp_zcu106_defconfig | 1 + 4 files changed, 4 insertions(+) create mode 100644 board/zynqmp/zcu102/uboot-fragment.config create mode 100644 board/zynqmp/zcu106/uboot-fragment.config diff --git a/board/zynqmp/zcu102/uboot-fragment.config b/board/zynqmp/zcu102/uboot-fragment.config new file mode 100644 index 0000000000..52d6d9dff8 --- /dev/null +++ b/board/zynqmp/zcu102/uboot-fragment.config @@ -0,0 +1 @@ +CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu102-rev1.0" diff --git a/board/zynqmp/zcu106/uboot-fragment.config b/board/zynqmp/zcu106/uboot-fragment.config new file mode 100644 index 0000000000..cd571171ac --- /dev/null +++ b/board/zynqmp/zcu106/uboot-fragment.config @@ -0,0 +1 @@ +CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu106-revA" diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig index 298ce2388c..88e84fe791 100644 --- a/configs/zynqmp_zcu102_defconfig +++ b/configs/zynqmp_zcu102_defconfig @@ -25,6 +25,7 @@ BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2022.01-165-g667001319cbe511ce6353195fb4910ae5cb041ce" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/zcu102/uboot-fragment.config" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index 3e51cbfaab..81f625a73b 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -25,6 +25,7 @@ BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2022.01-165-g667001319cbe511ce6353195fb4910ae5cb041ce" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/zcu106/uboot-fragment.config" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y -- 2.17.1 From wbx at openadk.org Wed Feb 23 17:55:35 2022 From: wbx at openadk.org (Waldemar Brodkorb) Date: Wed, 23 Feb 2022 18:55:35 +0100 Subject: [Buildroot] [PATCHv3 1/3] package/binutils: add version 2.38 Message-ID: See: https://sourceware.org/pipermail/binutils/2022-February/119721.html i386-Allow-GOT32-relocations-against-ABS-symbols.patch is not required as it is in release. Signed-off-by: Waldemar Brodkorb --- v1->v2: add a comment about i386 patch v2->v3: add ppc patch from binutils-2.38 branch fixing kernel compile --- package/binutils/2.38/0001-sh-conf.patch | 48 +++ .../2.38/0002-poison-system-directories.patch | 306 ++++++++++++++++++ ...or1k-fix-building-with-gcc-version-5.patch | 50 +++ ...K_GOT16-signed-overflow-by-using-spe.patch | 75 +++++ ...binutils-2.38-vs.-ppc32-linux-kernel.patch | 55 ++++ package/binutils/Config.in.host | 7 + package/binutils/binutils.hash | 1 + 7 files changed, 542 insertions(+) create mode 100644 package/binutils/2.38/0001-sh-conf.patch create mode 100644 package/binutils/2.38/0002-poison-system-directories.patch create mode 100644 package/binutils/2.38/0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch create mode 100644 package/binutils/2.38/0004-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch create mode 100644 package/binutils/2.38/0005-binutils-2.38-vs.-ppc32-linux-kernel.patch diff --git a/package/binutils/2.38/0001-sh-conf.patch b/package/binutils/2.38/0001-sh-conf.patch new file mode 100644 index 0000000000..fcc597e4d9 --- /dev/null +++ b/package/binutils/2.38/0001-sh-conf.patch @@ -0,0 +1,48 @@ +From 33f3c1f804efc2e4f97849081589efb70cda31e5 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 25 Dec 2015 11:38:13 +0100 +Subject: [PATCH] sh-conf + +Likewise, binutils has no idea about any of these new targets either, so we +fix that up too.. now we're able to actually build a real toolchain for +sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more +inept targets than that one, really. Go look, I promise). + +[Romain: rebase on top of 2.32] +Signed-off-by: Romain Naour +[Thomas: rebase on top of 2.29, in which sh64 support was removed.] +Signed-off-by: Thomas Petazzoni +--- + configure | 2 +- + configure.ac | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 3dd206525a7..6881ce632f5 100755 +--- a/configure ++++ b/configure +@@ -3892,7 +3892,7 @@ case "${target}" in + nvptx*-*-*) + noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" + ;; +- sh-*-*) ++ sh*-*-*) + case "${target}" in + sh*-*-elf) + ;; +diff --git a/configure.ac b/configure.ac +index 797a624621e..1f9256bbf18 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1175,7 +1175,7 @@ case "${target}" in + nvptx*-*-*) + noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" + ;; +- sh-*-*) ++ sh*-*-*) + case "${target}" in + sh*-*-elf) + ;; +-- +2.31.1 + diff --git a/package/binutils/2.38/0002-poison-system-directories.patch b/package/binutils/2.38/0002-poison-system-directories.patch new file mode 100644 index 0000000000..1a5fe46575 --- /dev/null +++ b/package/binutils/2.38/0002-poison-system-directories.patch @@ -0,0 +1,306 @@ +From 4d8705ddb55897e8a74b617ab95736d520d9e1ea Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 25 Dec 2015 11:45:38 +0100 +Subject: [PATCH] poison-system-directories + +Patch adapted to binutils 2.23.2 and extended to use +BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni. + +[Romain: rebase on top of 2.33.1] +Signed-off-by: Romain Naour +[Gustavo: adapt to binutils 2.25] +Signed-off-by: Thomas Petazzoni +Signed-off-by: Gustavo Zacarias + +Upstream-Status: Inappropriate [distribution: codesourcery] + +Patch originally created by Mark Hatle, forward-ported to +binutils 2.21 by Scott Garman. + +purpose: warn for uses of system directories when cross linking + +Code Merged from Sourcery G++ binutils 2.19 - 4.4-277 + +2008-07-02 Joseph Myers + + ld/ + * ld.h (args_type): Add error_poison_system_directories. + * ld.texinfo (--error-poison-system-directories): Document. + * ldfile.c (ldfile_add_library_path): Check + command_line.error_poison_system_directories. + * ldmain.c (main): Initialize + command_line.error_poison_system_directories. + * lexsup.c (enum option_values): Add + OPTION_ERROR_POISON_SYSTEM_DIRECTORIES. + (ld_options): Add --error-poison-system-directories. + (parse_args): Handle new option. + +2007-06-13 Joseph Myers + + ld/ + * config.in: Regenerate. + * ld.h (args_type): Add poison_system_directories. + * ld.texinfo (--no-poison-system-directories): Document. + * ldfile.c (ldfile_add_library_path): Check + command_line.poison_system_directories. + * ldmain.c (main): Initialize + command_line.poison_system_directories. + * lexsup.c (enum option_values): Add + OPTION_NO_POISON_SYSTEM_DIRECTORIES. + (ld_options): Add --no-poison-system-directories. + (parse_args): Handle new option. + +2007-04-20 Joseph Myers + + Merge from Sourcery G++ binutils 2.17: + + 2007-03-20 Joseph Myers + Based on patch by Mark Hatle . + ld/ + * configure.ac (--enable-poison-system-directories): New option. + * configure, config.in: Regenerate. + * ldfile.c (ldfile_add_library_path): If + ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib, + /usr/lib, /usr/local/lib or /usr/X11R6/lib. + +Signed-off-by: Mark Hatle +Signed-off-by: Scott Garman +--- + ld/config.in | 3 +++ + ld/configure | 14 ++++++++++++++ + ld/configure.ac | 10 ++++++++++ + ld/ld.h | 8 ++++++++ + ld/ld.texi | 12 ++++++++++++ + ld/ldfile.c | 17 +++++++++++++++++ + ld/ldlex.h | 2 ++ + ld/ldmain.c | 2 ++ + ld/lexsup.c | 21 +++++++++++++++++++++ + 9 files changed, 89 insertions(+) + +diff --git a/ld/config.in b/ld/config.in +index 26d55a00d47..ffad464783c 100644 +--- a/ld/config.in ++++ b/ld/config.in +@@ -43,6 +43,9 @@ + language is requested. */ + #undef ENABLE_NLS + ++/* Define to warn for use of native system library directories */ ++#undef ENABLE_POISON_SYSTEM_DIRECTORIES ++ + /* Additional extension a shared object might have. */ + #undef EXTRA_SHLIB_EXTENSION + +diff --git a/ld/configure b/ld/configure +index c197aaef3cb..882263aa43f 100755 +--- a/ld/configure ++++ b/ld/configure +@@ -829,6 +829,7 @@ with_lib_path + enable_targets + enable_64_bit_bfd + with_sysroot ++enable_poison_system_directories + enable_gold + enable_got + enable_compressed_debug_sections +@@ -1498,6 +1499,8 @@ Optional Features: + --enable-checking enable run-time checks + --enable-targets alternative target configurations + --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) ++ --enable-poison-system-directories ++ warn for use of native system library directories + --enable-gold[=ARG] build gold [ARG={default,yes,no}] + --enable-got= GOT handling scheme (target, single, negative, + multigot) +@@ -15236,7 +15239,18 @@ else + fi + + ++# Check whether --enable-poison-system-directories was given. ++if test "${enable_poison_system_directories+set}" = set; then : ++ enableval=$enable_poison_system_directories; ++else ++ enable_poison_system_directories=no ++fi ++ ++if test "x${enable_poison_system_directories}" = "xyes"; then + ++$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h ++ ++fi + + # Check whether --enable-got was given. + if test "${enable_got+set}" = set; then : +diff --git a/ld/configure.ac b/ld/configure.ac +index 8ea97c43cd4..0f246db67d8 100644 +--- a/ld/configure.ac ++++ b/ld/configure.ac +@@ -106,6 +106,16 @@ AC_SUBST(use_sysroot) + AC_SUBST(TARGET_SYSTEM_ROOT) + AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) + ++AC_ARG_ENABLE([poison-system-directories], ++ AS_HELP_STRING([--enable-poison-system-directories], ++ [warn for use of native system library directories]),, ++ [enable_poison_system_directories=no]) ++if test "x${enable_poison_system_directories}" = "xyes"; then ++ AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES], ++ [1], ++ [Define to warn for use of native system library directories]) ++fi ++ + dnl Use --enable-gold to decide if this linker should be the default. + dnl "install_as_default" is set to false if gold is the default linker. + dnl "installed_linker" is the installed BFD linker name. +diff --git a/ld/ld.h b/ld/ld.h +index 35fafebfaed..74e66405de6 100644 +--- a/ld/ld.h ++++ b/ld/ld.h +@@ -162,6 +162,14 @@ typedef struct + in the linker script. */ + bool force_group_allocation; + ++ /* If TRUE (the default) warn for uses of system directories when ++ cross linking. */ ++ bool poison_system_directories; ++ ++ /* If TRUE (default FALSE) give an error for uses of system ++ directories when cross linking instead of a warning. */ ++ bool error_poison_system_directories; ++ + /* Big or little endian as set on command line. */ + enum endian_enum endian; + +diff --git a/ld/ld.texi b/ld/ld.texi +index dd8f571d4e4..3ab210b41b9 100644 +--- a/ld/ld.texi ++++ b/ld/ld.texi +@@ -2863,6 +2863,18 @@ string identifying the original linked file does not change. + + Passing @code{none} for @var{style} disables the setting from any + @code{--build-id} options earlier on the command line. ++ ++ at kindex --no-poison-system-directories ++ at item --no-poison-system-directories ++Do not warn for @option{-L} options using system directories such as ++ at file{/usr/lib} when cross linking. This option is intended for use ++in chroot environments when such directories contain the correct ++libraries for the target system rather than the host. ++ ++ at kindex --error-poison-system-directories ++ at item --error-poison-system-directories ++Give an error instead of a warning for @option{-L} options using ++system directories when cross linking. + @end table + + @c man end +diff --git a/ld/ldfile.c b/ld/ldfile.c +index 9d0af06f1f6..7cdd3b1c1b1 100644 +--- a/ld/ldfile.c ++++ b/ld/ldfile.c +@@ -117,6 +117,23 @@ ldfile_add_library_path (const char *name, bool cmdline) + new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); + else + new_dirs->name = xstrdup (name); ++ ++#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES ++ if (command_line.poison_system_directories ++ && ((!strncmp (name, "/lib", 4)) ++ || (!strncmp (name, "/usr/lib", 8)) ++ || (!strncmp (name, "/usr/local/lib", 14)) ++ || (!strncmp (name, "/usr/X11R6/lib", 14)))) ++ { ++ if (command_line.error_poison_system_directories) ++ einfo (_("%X%P: error: library search path \"%s\" is unsafe for " ++ "cross-compilation\n"), name); ++ else ++ einfo (_("%P: warning: library search path \"%s\" is unsafe for " ++ "cross-compilation\n"), name); ++ } ++#endif ++ + } + + /* Try to open a BFD for a lang_input_statement. */ +diff --git a/ld/ldlex.h b/ld/ldlex.h +index 9e8bf5fb835..2f0fadfe0a3 100644 +--- a/ld/ldlex.h ++++ b/ld/ldlex.h +@@ -163,6 +163,8 @@ enum option_values + OPTION_CTF_VARIABLES, + OPTION_NO_CTF_VARIABLES, + OPTION_CTF_SHARE_TYPES, ++ OPTION_NO_POISON_SYSTEM_DIRECTORIES, ++ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, + }; + + /* The initial parser states. */ +diff --git a/ld/ldmain.c b/ld/ldmain.c +index 42660eb9a3c..1aef9387f93 100644 +--- a/ld/ldmain.c ++++ b/ld/ldmain.c +@@ -321,6 +321,8 @@ main (int argc, char **argv) + command_line.warn_mismatch = true; + command_line.warn_search_mismatch = true; + command_line.check_section_addresses = -1; ++ command_line.poison_system_directories = true; ++ command_line.error_poison_system_directories = false; + + /* We initialize DEMANGLING based on the environment variable + COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the +diff --git a/ld/lexsup.c b/ld/lexsup.c +index 00274c500d0..4f23b3a2da2 100644 +--- a/ld/lexsup.c ++++ b/ld/lexsup.c +@@ -595,6 +595,14 @@ static const struct ld_option ld_options[] = + " is: share-unconflicted (default),\n" + " share-duplicated"), + TWO_DASHES }, ++ { {"no-poison-system-directories", no_argument, NULL, ++ OPTION_NO_POISON_SYSTEM_DIRECTORIES}, ++ '\0', NULL, N_("Do not warn for -L options using system directories"), ++ TWO_DASHES }, ++ { {"error-poison-system-directories", no_argument, NULL, ++ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES}, ++ '\0', NULL, N_("Give an error for -L options using system directories"), ++ TWO_DASHES }, + }; + + #define OPTION_COUNT ARRAY_SIZE (ld_options) +@@ -607,6 +615,7 @@ parse_args (unsigned argc, char **argv) + int ingroup = 0; + char *default_dirlist = NULL; + char *shortopts; ++ char *BR_paranoid_env; + struct option *longopts; + struct option *really_longopts; + int last_optind; +@@ -1643,6 +1652,14 @@ parse_args (unsigned argc, char **argv) + } + break; + ++ case OPTION_NO_POISON_SYSTEM_DIRECTORIES: ++ command_line.poison_system_directories = false; ++ break; ++ ++ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: ++ command_line.error_poison_system_directories = true; ++ break; ++ + case OPTION_PUSH_STATE: + input_flags.pushed = xmemdup (&input_flags, + sizeof (input_flags), +@@ -1788,6 +1805,10 @@ parse_args (unsigned argc, char **argv) + command_line.soname = NULL; + } + ++ BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH"); ++ if (BR_paranoid_env && strlen(BR_paranoid_env) > 0) ++ command_line.error_poison_system_directories = true; ++ + while (ingroup) + { + einfo (_("%P: missing --end-group; added as last command line option\n")); +-- +2.31.1 + diff --git a/package/binutils/2.38/0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch b/package/binutils/2.38/0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch new file mode 100644 index 0000000000..bfd531b818 --- /dev/null +++ b/package/binutils/2.38/0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch @@ -0,0 +1,50 @@ +From ef4ba1da823e8366ea4f126f50885a44ebf4dcf0 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Wed, 9 Jun 2021 17:28:27 +0200 +Subject: [PATCH] bfd/elf32-or1k: fix building with gcc version < 5 + +Gcc version >= 5 has standard C mode not set to -std=gnu11, so if we use +an old compiler(i.e. gcc 4.9) build fails on: +``` +elf32-or1k.c:2251:3: error: 'for' loop initial declarations are only allowed in +C99 or C11 mode + for (size_t i = 0; i < insn_count; i++) + ^ +``` + +So let's declare `size_t i` at the top of the function instead of inside +for loop. + +Signed-off-by: Giulio Benetti +--- + bfd/elf32-or1k.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c +index 4ae7f324d33..32063ab0289 100644 +--- a/bfd/elf32-or1k.c ++++ b/bfd/elf32-or1k.c +@@ -2244,9 +2244,10 @@ or1k_write_plt_entry (bfd *output_bfd, bfd_byte *contents, unsigned insnj, + { + unsigned nodelay = elf_elfheader (output_bfd)->e_flags & EF_OR1K_NODELAY; + unsigned output_insns[PLT_MAX_INSN_COUNT]; ++ size_t i; + + /* Copy instructions into the output buffer. */ +- for (size_t i = 0; i < insn_count; i++) ++ for (i = 0; i < insn_count; i++) + output_insns[i] = insns[i]; + + /* Honor the no-delay-slot setting. */ +@@ -2277,7 +2278,7 @@ or1k_write_plt_entry (bfd *output_bfd, bfd_byte *contents, unsigned insnj, + } + + /* Write out the output buffer. */ +- for (size_t i = 0; i < (insn_count+1); i++) ++ for (i = 0; i < (insn_count+1); i++) + bfd_put_32 (output_bfd, output_insns[i], contents + (i*4)); + } + +-- +2.31.1 + diff --git a/package/binutils/2.38/0004-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch b/package/binutils/2.38/0004-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch new file mode 100644 index 0000000000..8609db95b7 --- /dev/null +++ b/package/binutils/2.38/0004-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 + diff --git a/package/binutils/2.38/0005-binutils-2.38-vs.-ppc32-linux-kernel.patch b/package/binutils/2.38/0005-binutils-2.38-vs.-ppc32-linux-kernel.patch new file mode 100644 index 0000000000..c62652c95f --- /dev/null +++ b/package/binutils/2.38/0005-binutils-2.38-vs.-ppc32-linux-kernel.patch @@ -0,0 +1,55 @@ +From ed9b2e40ebffec835d63473367da8dd8f80d7d5b Mon Sep 17 00:00:00 2001 +From: Alan Modra +Date: Mon, 21 Feb 2022 10:58:57 +1030 +Subject: [PATCH] binutils 2.38 vs. ppc32 linux kernel + +Commit b25f942e18d6 made .machine more strict. Weaken it again. + + * config/tc-ppc.c (ppc_machine): Treat an early .machine specially, + keeping sticky options to work around gcc bugs. + +(cherry picked from commit cebc89b9328eab994f6b0314c263f94e7949a553) +Signed-off-by: Waldemar Brodkorb +--- + gas/config/tc-ppc.c | 25 ++++++++++++++++++++++++- + 1 file changed, 24 insertions(+), 1 deletion(-) + +diff --git a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c +index 054f9c72161..89bc7d3f9b9 100644 +--- a/gas/config/tc-ppc.c ++++ b/gas/config/tc-ppc.c +@@ -5965,7 +5965,30 @@ ppc_machine (int ignore ATTRIBUTE_UNUSED) + options do not count as a new machine, instead they add + to currently selected opcodes. */ + ppc_cpu_t machine_sticky = 0; +- new_cpu = ppc_parse_cpu (ppc_cpu, &machine_sticky, cpu_string); ++ /* Unfortunately, some versions of gcc emit a .machine ++ directive very near the start of the compiler's assembly ++ output file. This is bad because it overrides user -Wa ++ cpu selection. Worse, there are versions of gcc that ++ emit the *wrong* cpu, not even respecting the -mcpu given ++ to gcc. See gcc pr101393. And to compound the problem, ++ as of 20220222 gcc doesn't pass the correct cpu option to ++ gas on the command line. See gcc pr59828. Hack around ++ this by keeping sticky options for an early .machine. */ ++ asection *sec; ++ for (sec = stdoutput->sections; sec != NULL; sec = sec->next) ++ { ++ segment_info_type *info = seg_info (sec); ++ /* Are the frags for this section perturbed from their ++ initial state? Even .align will count here. */ ++ if (info != NULL ++ && (info->frchainP->frch_root != info->frchainP->frch_last ++ || info->frchainP->frch_root->fr_type != rs_fill ++ || info->frchainP->frch_root->fr_fix != 0)) ++ break; ++ } ++ new_cpu = ppc_parse_cpu (ppc_cpu, ++ sec == NULL ? &sticky : &machine_sticky, ++ cpu_string); + if (new_cpu != 0) + ppc_cpu = new_cpu; + else +-- +2.30.2 + diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index ea1f020989..17de6e4e41 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -36,6 +36,12 @@ config BR2_BINUTILS_VERSION_2_37_X # https://github.com/uclinux-dev/elf2flt/issues/12 depends on !BR2_BINFMT_FLAT +config BR2_BINUTILS_VERSION_2_38_X + bool "binutils 2.38" + # https://github.com/uclinux-dev/elf2flt/pull/16 + # https://github.com/uclinux-dev/elf2flt/issues/12 + depends on !BR2_BINFMT_FLAT + config BR2_BINUTILS_VERSION_ARC bool "binutils arc (2.34.50)" depends on BR2_arc @@ -49,6 +55,7 @@ config BR2_BINUTILS_VERSION default "2.35.2" if BR2_BINUTILS_VERSION_2_35_X default "2.36.1" if BR2_BINUTILS_VERSION_2_36_X default "2.37" if BR2_BINUTILS_VERSION_2_37_X + default "2.38" if BR2_BINUTILS_VERSION_2_38_X config BR2_BINUTILS_ENABLE_LTO bool diff --git a/package/binutils/binutils.hash b/package/binutils/binutils.hash index d1be6cbce8..fe31b34d40 100644 --- a/package/binutils/binutils.hash +++ b/package/binutils/binutils.hash @@ -3,6 +3,7 @@ sha512 d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724a sha512 9974ede5978d32e0d68fef23da48fa00bd06b0bff7ec45b00ca075c126d6bbe0cf2defc03ecc3f17bc6cc85b64271a13009c4049d7ba17de26e84e3a6e2c0348 binutils-2.35.2.tar.xz sha512 cc24590bcead10b90763386b6f96bb027d7594c659c2d95174a6352e8b98465a50ec3e4088d0da038428abe059bbc4ae5f37b269f31a40fc048072c8a234f4e9 binutils-2.36.1.tar.xz sha512 5c11aeef6935860a6819ed3a3c93371f052e52b4bdc5033da36037c1544d013b7f12cb8d561ec954fe7469a68f1b66f1a3cd53d5a3af7293635a90d69edd15e7 binutils-2.37.tar.xz +sha512 8bf0b0d193c9c010e0518ee2b2e5a830898af206510992483b427477ed178396cd210235e85fd7bd99a96fc6d5eedbeccbd48317a10f752b7336ada8b2bb826d binutils-2.38.tar.xz # Locally calculated (fetched from Github) sha512 76a8227a19218435319c660e4983ea17985194b7f496f163e97543e7f6fd3e9249241fdc05a16ba512fba96a1d846c1f7b080983404d821d6215f10e7f11e238 binutils-gdb-arc-2020.09-release.tar.gz -- 2.30.2 From wbx at openadk.org Wed Feb 23 17:58:17 2022 From: wbx at openadk.org (Waldemar Brodkorb) Date: Wed, 23 Feb 2022 18:58:17 +0100 Subject: [Buildroot] [PATCHv3 2/3] package/binutils: remove 2.35.2 Message-ID: Signed-off-by: Waldemar Brodkorb --- v1->v2: remove the patch folder, recognized by Thomas P. v2->v3: no change --- package/binutils/2.35.2/0001-sh-conf.patch | 48 -- .../0002-poison-system-directories.patch | 306 ----------- ...ith-plt-link-failure-for-local-calls.patch | 59 --- ...elocation-R_OR1K_GOT_AHI16-for-gotha.patch | 256 --------- ...K_GOT16-overflow-failures-in-presenc.patch | 61 --- ...ge-plt_relocs-when-generating-plt-en.patch | 500 ------------------ ...or1k-fix-building-with-gcc-version-5.patch | 50 -- ...tive-relocation-against-dynamic-on-P.patch | 59 --- ...K_GOT16-signed-overflow-by-using-spe.patch | 75 --- ...OT32-relocations-against-ABS-symbols.patch | 46 -- package/binutils/Config.in.host | 8 - package/binutils/binutils.hash | 1 - 12 files changed, 1469 deletions(-) delete mode 100644 package/binutils/2.35.2/0001-sh-conf.patch delete mode 100644 package/binutils/2.35.2/0002-poison-system-directories.patch delete mode 100644 package/binutils/2.35.2/0003-or1k-Fix-issue-with-plt-link-failure-for-local-calls.patch delete mode 100644 package/binutils/2.35.2/0004-or1k-Implement-relocation-R_OR1K_GOT_AHI16-for-gotha.patch delete mode 100644 package/binutils/2.35.2/0005-or1k-Avoid-R_OR1K_GOT16-overflow-failures-in-presenc.patch delete mode 100644 package/binutils/2.35.2/0006-or1k-Support-large-plt_relocs-when-generating-plt-en.patch delete mode 100644 package/binutils/2.35.2/0007-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch delete mode 100644 package/binutils/2.35.2/0008-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch delete mode 100644 package/binutils/2.35.2/0009-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch delete mode 100644 package/binutils/2.35.2/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch diff --git a/package/binutils/2.35.2/0001-sh-conf.patch b/package/binutils/2.35.2/0001-sh-conf.patch deleted file mode 100644 index 44d5f4e89a..0000000000 --- a/package/binutils/2.35.2/0001-sh-conf.patch +++ /dev/null @@ -1,48 +0,0 @@ -From ae50e875f4292c99b859cded1d036e401b6ddaec Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:38:13 +0100 -Subject: [PATCH] sh-conf - -Likewise, binutils has no idea about any of these new targets either, so we -fix that up too.. now we're able to actually build a real toolchain for -sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more -inept targets than that one, really. Go look, I promise). - -[Romain: rebase on top of 2.32] -Signed-off-by: Romain Naour -[Thomas: rebase on top of 2.29, in which sh64 support was removed.] -Signed-off-by: Thomas Petazzoni ---- - configure | 2 +- - configure.ac | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure b/configure -index 54d0339ab9e..c2f51ffcebb 100755 ---- a/configure -+++ b/configure -@@ -3937,7 +3937,7 @@ case "${target}" in - nvptx*-*-*) - noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" - ;; -- sh-*-*) -+ sh*-*-*) - case "${target}" in - sh*-*-elf) - ;; -diff --git a/configure.ac b/configure.ac -index a910c4fd6ba..a93d93c81c3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1178,7 +1178,7 @@ case "${target}" in - nvptx*-*-*) - noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" - ;; -- sh-*-*) -+ sh*-*-*) - case "${target}" in - sh*-*-elf) - ;; --- -2.25.4 - diff --git a/package/binutils/2.35.2/0002-poison-system-directories.patch b/package/binutils/2.35.2/0002-poison-system-directories.patch deleted file mode 100644 index b77a5e1a66..0000000000 --- a/package/binutils/2.35.2/0002-poison-system-directories.patch +++ /dev/null @@ -1,306 +0,0 @@ -From db405d1bc5607892ddb25433354b46d78e23b343 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:45:38 +0100 -Subject: [PATCH] poison-system-directories - -Patch adapted to binutils 2.23.2 and extended to use -BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni. - -[Romain: rebase on top of 2.33.1] -Signed-off-by: Romain Naour -[Gustavo: adapt to binutils 2.25] -Signed-off-by: Thomas Petazzoni -Signed-off-by: Gustavo Zacarias - -Upstream-Status: Inappropriate [distribution: codesourcery] - -Patch originally created by Mark Hatle, forward-ported to -binutils 2.21 by Scott Garman. - -purpose: warn for uses of system directories when cross linking - -Code Merged from Sourcery G++ binutils 2.19 - 4.4-277 - -2008-07-02 Joseph Myers - - ld/ - * ld.h (args_type): Add error_poison_system_directories. - * ld.texinfo (--error-poison-system-directories): Document. - * ldfile.c (ldfile_add_library_path): Check - command_line.error_poison_system_directories. - * ldmain.c (main): Initialize - command_line.error_poison_system_directories. - * lexsup.c (enum option_values): Add - OPTION_ERROR_POISON_SYSTEM_DIRECTORIES. - (ld_options): Add --error-poison-system-directories. - (parse_args): Handle new option. - -2007-06-13 Joseph Myers - - ld/ - * config.in: Regenerate. - * ld.h (args_type): Add poison_system_directories. - * ld.texinfo (--no-poison-system-directories): Document. - * ldfile.c (ldfile_add_library_path): Check - command_line.poison_system_directories. - * ldmain.c (main): Initialize - command_line.poison_system_directories. - * lexsup.c (enum option_values): Add - OPTION_NO_POISON_SYSTEM_DIRECTORIES. - (ld_options): Add --no-poison-system-directories. - (parse_args): Handle new option. - -2007-04-20 Joseph Myers - - Merge from Sourcery G++ binutils 2.17: - - 2007-03-20 Joseph Myers - Based on patch by Mark Hatle . - ld/ - * configure.ac (--enable-poison-system-directories): New option. - * configure, config.in: Regenerate. - * ldfile.c (ldfile_add_library_path): If - ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib, - /usr/lib, /usr/local/lib or /usr/X11R6/lib. - -Signed-off-by: Mark Hatle -Signed-off-by: Scott Garman ---- - ld/config.in | 3 +++ - ld/configure | 14 ++++++++++++++ - ld/configure.ac | 10 ++++++++++ - ld/ld.h | 8 ++++++++ - ld/ld.texi | 12 ++++++++++++ - ld/ldfile.c | 17 +++++++++++++++++ - ld/ldlex.h | 2 ++ - ld/ldmain.c | 2 ++ - ld/lexsup.c | 21 +++++++++++++++++++++ - 9 files changed, 89 insertions(+) - -diff --git a/ld/config.in b/ld/config.in -index 2f4e5ea33e3..8fbb29682b2 100644 ---- a/ld/config.in -+++ b/ld/config.in -@@ -40,6 +40,9 @@ - language is requested. */ - #undef ENABLE_NLS - -+/* Define to warn for use of native system library directories */ -+#undef ENABLE_POISON_SYSTEM_DIRECTORIES -+ - /* Additional extension a shared object might have. */ - #undef EXTRA_SHLIB_EXTENSION - -diff --git a/ld/configure b/ld/configure -index 6be5280621f..d62e7b12382 100755 ---- a/ld/configure -+++ b/ld/configure -@@ -826,6 +826,7 @@ with_lib_path - enable_targets - enable_64_bit_bfd - with_sysroot -+enable_poison_system_directories - enable_gold - enable_got - enable_compressed_debug_sections -@@ -1493,6 +1494,8 @@ Optional Features: - --disable-largefile omit support for large files - --enable-targets alternative target configurations - --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) -+ --enable-poison-system-directories -+ warn for use of native system library directories - --enable-gold[=ARG] build gold [ARG={default,yes,no}] - --enable-got= GOT handling scheme (target, single, negative, - multigot) -@@ -15814,7 +15817,18 @@ else - fi - - -+# Check whether --enable-poison-system-directories was given. -+if test "${enable_poison_system_directories+set}" = set; then : -+ enableval=$enable_poison_system_directories; -+else -+ enable_poison_system_directories=no -+fi -+ -+if test "x${enable_poison_system_directories}" = "xyes"; then - -+$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h -+ -+fi - - # Check whether --enable-got was given. - if test "${enable_got+set}" = set; then : -diff --git a/ld/configure.ac b/ld/configure.ac -index 172398ff847..b77f8510ca6 100644 ---- a/ld/configure.ac -+++ b/ld/configure.ac -@@ -94,6 +94,16 @@ AC_SUBST(use_sysroot) - AC_SUBST(TARGET_SYSTEM_ROOT) - AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) - -+AC_ARG_ENABLE([poison-system-directories], -+ AS_HELP_STRING([--enable-poison-system-directories], -+ [warn for use of native system library directories]),, -+ [enable_poison_system_directories=no]) -+if test "x${enable_poison_system_directories}" = "xyes"; then -+ AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES], -+ [1], -+ [Define to warn for use of native system library directories]) -+fi -+ - dnl Use --enable-gold to decide if this linker should be the default. - dnl "install_as_default" is set to false if gold is the default linker. - dnl "installed_linker" is the installed BFD linker name. -diff --git a/ld/ld.h b/ld/ld.h -index 1790dc81a66..73f832eb169 100644 ---- a/ld/ld.h -+++ b/ld/ld.h -@@ -166,6 +166,14 @@ typedef struct - in the linker script. */ - bfd_boolean force_group_allocation; - -+ /* If TRUE (the default) warn for uses of system directories when -+ cross linking. */ -+ bfd_boolean poison_system_directories; -+ -+ /* If TRUE (default FALSE) give an error for uses of system -+ directories when cross linking instead of a warning. */ -+ bfd_boolean error_poison_system_directories; -+ - /* Big or little endian as set on command line. */ - enum endian_enum endian; - -diff --git a/ld/ld.texi b/ld/ld.texi -index 2a93e9456ac..3eeb70607fd 100644 ---- a/ld/ld.texi -+++ b/ld/ld.texi -@@ -2655,6 +2655,18 @@ string identifying the original linked file does not change. - - Passing @code{none} for @var{style} disables the setting from any - @code{--build-id} options earlier on the command line. -+ -+ at kindex --no-poison-system-directories -+ at item --no-poison-system-directories -+Do not warn for @option{-L} options using system directories such as -+ at file{/usr/lib} when cross linking. This option is intended for use -+in chroot environments when such directories contain the correct -+libraries for the target system rather than the host. -+ -+ at kindex --error-poison-system-directories -+ at item --error-poison-system-directories -+Give an error instead of a warning for @option{-L} options using -+system directories when cross linking. - @end table - - @c man end -diff --git a/ld/ldfile.c b/ld/ldfile.c -index e39170b5d94..fadc248a140 100644 ---- a/ld/ldfile.c -+++ b/ld/ldfile.c -@@ -117,6 +117,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline) - new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); - else - new_dirs->name = xstrdup (name); -+ -+#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES -+ if (command_line.poison_system_directories -+ && ((!strncmp (name, "/lib", 4)) -+ || (!strncmp (name, "/usr/lib", 8)) -+ || (!strncmp (name, "/usr/local/lib", 14)) -+ || (!strncmp (name, "/usr/X11R6/lib", 14)))) -+ { -+ if (command_line.error_poison_system_directories) -+ einfo (_("%X%P: error: library search path \"%s\" is unsafe for " -+ "cross-compilation\n"), name); -+ else -+ einfo (_("%P: warning: library search path \"%s\" is unsafe for " -+ "cross-compilation\n"), name); -+ } -+#endif -+ - } - - /* Try to open a BFD for a lang_input_statement. */ -diff --git a/ld/ldlex.h b/ld/ldlex.h -index 5ea083ebeb3..417f9b858ce 100644 ---- a/ld/ldlex.h -+++ b/ld/ldlex.h -@@ -155,6 +155,8 @@ enum option_values - OPTION_NON_CONTIGUOUS_REGIONS, - OPTION_NON_CONTIGUOUS_REGIONS_WARNINGS, - OPTION_DEPENDENCY_FILE, -+ OPTION_NO_POISON_SYSTEM_DIRECTORIES, -+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, - }; - - /* The initial parser states. */ -diff --git a/ld/ldmain.c b/ld/ldmain.c -index 08be9030cb5..92dc16399eb 100644 ---- a/ld/ldmain.c -+++ b/ld/ldmain.c -@@ -321,6 +321,8 @@ main (int argc, char **argv) - command_line.warn_mismatch = TRUE; - command_line.warn_search_mismatch = TRUE; - command_line.check_section_addresses = -1; -+ command_line.poison_system_directories = TRUE; -+ command_line.error_poison_system_directories = FALSE; - - /* We initialize DEMANGLING based on the environment variable - COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the -diff --git a/ld/lexsup.c b/ld/lexsup.c -index 6cab41cf5df..c497f36b148 100644 ---- a/ld/lexsup.c -+++ b/ld/lexsup.c -@@ -572,6 +572,14 @@ static const struct ld_option ld_options[] = - { {"no-print-map-discarded", no_argument, NULL, OPTION_NO_PRINT_MAP_DISCARDED}, - '\0', NULL, N_("Do not show discarded sections in map file output"), - TWO_DASHES }, -+ { {"no-poison-system-directories", no_argument, NULL, -+ OPTION_NO_POISON_SYSTEM_DIRECTORIES}, -+ '\0', NULL, N_("Do not warn for -L options using system directories"), -+ TWO_DASHES }, -+ { {"error-poison-system-directories", no_argument, NULL, -+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES}, -+ '\0', NULL, N_("Give an error for -L options using system directories"), -+ TWO_DASHES }, - }; - - #define OPTION_COUNT ARRAY_SIZE (ld_options) -@@ -584,6 +592,7 @@ parse_args (unsigned argc, char **argv) - int ingroup = 0; - char *default_dirlist = NULL; - char *shortopts; -+ char *BR_paranoid_env; - struct option *longopts; - struct option *really_longopts; - int last_optind; -@@ -1591,6 +1600,14 @@ parse_args (unsigned argc, char **argv) - } - break; - -+ case OPTION_NO_POISON_SYSTEM_DIRECTORIES: -+ command_line.poison_system_directories = FALSE; -+ break; -+ -+ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: -+ command_line.error_poison_system_directories = TRUE; -+ break; -+ - case OPTION_PUSH_STATE: - input_flags.pushed = xmemdup (&input_flags, - sizeof (input_flags), -@@ -1681,6 +1698,10 @@ parse_args (unsigned argc, char **argv) - command_line.soname = NULL; - } - -+ BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH"); -+ if (BR_paranoid_env && strlen(BR_paranoid_env) > 0) -+ command_line.error_poison_system_directories = TRUE; -+ - while (ingroup) - { - einfo (_("%P: missing --end-group; added as last command line option\n")); --- -2.25.4 - diff --git a/package/binutils/2.35.2/0003-or1k-Fix-issue-with-plt-link-failure-for-local-calls.patch b/package/binutils/2.35.2/0003-or1k-Fix-issue-with-plt-link-failure-for-local-calls.patch deleted file mode 100644 index 81fb6b8518..0000000000 --- a/package/binutils/2.35.2/0003-or1k-Fix-issue-with-plt-link-failure-for-local-calls.patch +++ /dev/null @@ -1,59 +0,0 @@ -From baf313f84b106a5a29f01796afd857e69abf8b08 Mon Sep 17 00:00:00 2001 -From: Stafford Horne -Date: Sun, 2 May 2021 06:02:14 +0900 -Subject: [PATCH] or1k: Fix issue with plt link failure for local calls - -When building protobuf we were seeing the assert failure: - - /home/giuliobenetti/git/upstream/or1k-binutils-2.36.1/host/lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: - BFD (GNU Binutils) 2.36.1 assertion fail elf32-or1k.c:2377 - /home/giuliobenetti/git/upstream/or1k-binutils-2.36.1/host/lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: - BFD (GNU Binutils) 2.36.1 assertion fail elf32-or1k.c:2377 - /home/giuliobenetti/git/upstream/or1k-binutils-2.36.1/host/lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: - BFD (GNU Binutils) 2.36.1 assertion fail elf32-or1k.c:2377 - collect2: error: ld returned 1 exit status - -This failure happens while writing out PLT entries, there is a check -"BFD_ASSERT (h->dynindx != -1)" to confirm all plt entries have dynamic -symbol attributes. This was failing for symbols that were -"forced_local" in previous linking code. - -The fix adds logic to or1k_elf_adjust_dynamic_symbol to identify -"forced_local" symbols and exclude them from the the PLT. - -bfd/ChangeLog: - - PR 27624 - * elf32-or1k.c (or1k_elf_adjust_dynamic_symbol): Change - condition used to cleanup plt entries to cleanup forced local - entries. - -Cc: Giulio Benetti -Signed-off-by: Giulio Benetti ---- - bfd/elf32-or1k.c | 9 ++++----- - 1 file changed, 4 insertions(+), 5 deletions(-) - -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index 7c02d004cc7..bbfa2bfe614 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -2568,11 +2568,10 @@ or1k_elf_adjust_dynamic_symbol (struct bfd_link_info *info, - if (h->type == STT_FUNC - || h->needs_plt) - { -- if (! bfd_link_pic (info) -- && !h->def_dynamic -- && !h->ref_dynamic -- && h->root.type != bfd_link_hash_undefweak -- && h->root.type != bfd_link_hash_undefined) -+ if (h->plt.refcount <= 0 -+ || (SYMBOL_CALLS_LOCAL (info, h) -+ || (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT -+ && h->root.type == bfd_link_hash_undefweak))) - { - /* This case can occur if we saw a PLT reloc in an input - file, but the symbol was never referred to by a dynamic --- -2.25.1 - diff --git a/package/binutils/2.35.2/0004-or1k-Implement-relocation-R_OR1K_GOT_AHI16-for-gotha.patch b/package/binutils/2.35.2/0004-or1k-Implement-relocation-R_OR1K_GOT_AHI16-for-gotha.patch deleted file mode 100644 index a4af57d546..0000000000 --- a/package/binutils/2.35.2/0004-or1k-Implement-relocation-R_OR1K_GOT_AHI16-for-gotha.patch +++ /dev/null @@ -1,256 +0,0 @@ -From c67656e248d6dadaa2729975a17c8dd03afe48d0 Mon Sep 17 00:00:00 2001 -From: Stafford Horne -Date: Sun, 2 May 2021 06:02:15 +0900 -Subject: [PATCH] or1k: Implement relocation R_OR1K_GOT_AHI16 for gotha() - -The gotha() relocation mnemonic will be outputted by OpenRISC GCC when -using the -mcmodel=large option. This relocation is used along with -got() to generate 32-bit GOT offsets. This increases the previous GOT -offset limit from the previous 16-bit (64K) limit. - -This is needed on large binaries where the GOT grows larger than 64k. - -bfd/ChangeLog: - - PR 21464 - * bfd-in2.h: Add BFD_RELOC_OR1K_GOT_AHI16 relocation. - * elf32-or1k.c (or1k_elf_howto_table, or1k_reloc_map): Likewise. - (or1k_final_link_relocate, or1k_elf_relocate_section, - or1k_elf_check_relocs): Likewise. - * libbfd.h (bfd_reloc_code_real_names): Likewise. - * reloc.c: Likewise. - -cpu/ChangeLog: - - PR 21464 - * or1k.opc (or1k_imm16_relocs, parse_reloc): Define parse logic - for gotha() relocation. - -include/ChangeLog: - - PR 21464 - * elf/or1k.h (elf_or1k_reloc_type): Define R_OR1K_GOT_AHI16 number. - -opcodes/ChangeLog: - - PR 21464 - * or1k-asm.c: Regenerate. - -gas/ChangeLog: - - PR 21464 - * testsuite/gas/or1k/reloc-1.s: Add test for new relocation. - * testsuite/gas/or1k/reloc-1.d: Add test result for new - relocation. - -Cc: Giulio Benetti - -fixup reloc, add tests - -Signed-off-by: Giulio Benetti ---- - bfd/bfd-in2.h | 1 + - bfd/elf32-or1k.c | 21 ++++++++++++++++++++- - bfd/libbfd.h | 1 + - bfd/reloc.c | 2 ++ - cpu/or1k.opc | 7 ++++++- - gas/testsuite/gas/or1k/reloc-1.d | 4 +++- - gas/testsuite/gas/or1k/reloc-1.s | 4 ++++ - include/elf/or1k.h | 1 + - opcodes/or1k-asm.c | 7 ++++++- - 9 files changed, 44 insertions(+), 4 deletions(-) - -diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h -index df6f9f45673..ab861395e93 100644 ---- a/bfd/bfd-in2.h -+++ b/bfd/bfd-in2.h -@@ -5041,6 +5041,7 @@ then it may be truncated to 8 bits. */ - BFD_RELOC_OR1K_TLS_TPOFF, - BFD_RELOC_OR1K_TLS_DTPOFF, - BFD_RELOC_OR1K_TLS_DTPMOD, -+ BFD_RELOC_OR1K_GOT_AHI16, - - /* H8 elf Relocations. */ - BFD_RELOC_H8_DIR16A8, -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index bbfa2bfe614..8e395827123 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -808,6 +808,20 @@ static reloc_howto_type or1k_elf_howto_table[] = - 0, /* Source Mask. */ - 0x03ffffff, /* Dest Mask. */ - TRUE), /* PC relative offset? */ -+ -+ HOWTO (R_OR1K_GOT_AHI16, /* type */ -+ 16, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_signed, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_OR1K_GOT_AHI16", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ - }; - - /* Map BFD reloc types to Or1k ELF reloc types. */ -@@ -871,6 +885,7 @@ static const struct or1k_reloc_map or1k_reloc_map[] = - { BFD_RELOC_OR1K_TLS_IE_LO13, R_OR1K_TLS_IE_LO13 }, - { BFD_RELOC_OR1K_SLO13, R_OR1K_SLO13 }, - { BFD_RELOC_OR1K_PLTA26, R_OR1K_PLTA26 }, -+ { BFD_RELOC_OR1K_GOT_AHI16, R_OR1K_GOT_AHI16 }, - }; - - /* tls_type is a mask used to track how each symbol is accessed, -@@ -1113,6 +1128,7 @@ or1k_final_link_relocate (reloc_howto_type *howto, bfd *input_bfd, - switch (howto->type) - { - case R_OR1K_AHI16: -+ case R_OR1K_GOT_AHI16: - case R_OR1K_GOTOFF_AHI16: - case R_OR1K_TLS_IE_AHI16: - case R_OR1K_TLS_LE_AHI16: -@@ -1375,6 +1391,7 @@ or1k_elf_relocate_section (bfd *output_bfd, - } - break; - -+ case R_OR1K_GOT_AHI16: - case R_OR1K_GOT16: - case R_OR1K_GOT_PG21: - case R_OR1K_GOT_LO13: -@@ -1466,7 +1483,8 @@ or1k_elf_relocate_section (bfd *output_bfd, - /* The GOT_PG21 and GOT_LO13 relocs are pc-relative, - while the GOT16 reloc is GOT relative. */ - relocation = got_base + off; -- if (r_type == R_OR1K_GOT16) -+ if (r_type == R_OR1K_GOT16 -+ || r_type == R_OR1K_GOT_AHI16) - relocation -= got_sym_value; - - /* Addend should be zero. */ -@@ -1992,6 +2010,7 @@ or1k_elf_check_relocs (bfd *abfd, - } - break; - -+ case R_OR1K_GOT_AHI16: - case R_OR1K_GOT16: - case R_OR1K_GOT_PG21: - case R_OR1K_GOT_LO13: -diff --git a/bfd/libbfd.h b/bfd/libbfd.h -index b97534fc9fe..795c9b9d27f 100644 ---- a/bfd/libbfd.h -+++ b/bfd/libbfd.h -@@ -2755,6 +2755,7 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@", - "BFD_RELOC_OR1K_TLS_TPOFF", - "BFD_RELOC_OR1K_TLS_DTPOFF", - "BFD_RELOC_OR1K_TLS_DTPMOD", -+ "BFD_RELOC_OR1K_GOT_AHI16", - "BFD_RELOC_H8_DIR16A8", - "BFD_RELOC_H8_DIR16R8", - "BFD_RELOC_H8_DIR24A8", -diff --git a/bfd/reloc.c b/bfd/reloc.c -index 9aba84ca81e..1e021febef2 100644 ---- a/bfd/reloc.c -+++ b/bfd/reloc.c -@@ -6175,6 +6175,8 @@ ENUMX - BFD_RELOC_OR1K_GOTPC_HI16 - ENUMX - BFD_RELOC_OR1K_GOTPC_LO16 -+ENUMX -+ BFD_RELOC_OR1K_GOT_AHI16 - ENUMX - BFD_RELOC_OR1K_GOT16 - ENUMX -diff --git a/cpu/or1k.opc b/cpu/or1k.opc -index f0adcbb00a5..5d20a1f33a7 100644 ---- a/cpu/or1k.opc -+++ b/cpu/or1k.opc -@@ -193,7 +193,7 @@ static const bfd_reloc_code_real_type or1k_imm16_relocs[][6] = { - BFD_RELOC_OR1K_GOT_LO13, - BFD_RELOC_UNUSED, - BFD_RELOC_UNUSED, -- BFD_RELOC_UNUSED }, -+ BFD_RELOC_OR1K_GOT_AHI16 }, - { BFD_RELOC_OR1K_GOTPC_LO16, - BFD_RELOC_UNUSED, - BFD_RELOC_UNUSED, -@@ -296,6 +296,11 @@ parse_reloc (const char **strp) - str += 5; - cls = RCLASS_TPOFF; - } -+ else if (strncasecmp (str, "got", 3) == 0) -+ { -+ str += 3; -+ cls = RCLASS_GOT; -+ } - - if (strncasecmp (str, "hi(", 3) == 0) - { -diff --git a/gas/testsuite/gas/or1k/reloc-1.d b/gas/testsuite/gas/or1k/reloc-1.d -index d1bcf5608bb..3a001c4ed99 100644 ---- a/gas/testsuite/gas/or1k/reloc-1.d -+++ b/gas/testsuite/gas/or1k/reloc-1.d -@@ -68,5 +68,7 @@ OFFSET TYPE VALUE - 000000ec R_OR1K_LO13 x - 000000f0 R_OR1K_GOT_LO13 x - 000000f4 R_OR1K_SLO13 x -- -+000000f8 R_OR1K_GOT_AHI16 x -+000000fc R_OR1K_GOT_AHI16 x -+00000100 R_OR1K_GOT_AHI16 x - -diff --git a/gas/testsuite/gas/or1k/reloc-1.s b/gas/testsuite/gas/or1k/reloc-1.s -index e76abef6532..562609aa869 100644 ---- a/gas/testsuite/gas/or1k/reloc-1.s -+++ b/gas/testsuite/gas/or1k/reloc-1.s -@@ -74,3 +74,7 @@ - l.lbz r5,po(x)(r3) - l.lbz r5,gotpo(x)(r3) - l.sb po(x)(r3),r6 -+ -+ l.movhi r4,gotha(x) -+ l.ori r3,r4,gotha(x) -+ l.addi r3,r4,gotha(x) -diff --git a/include/elf/or1k.h b/include/elf/or1k.h -index a215ef5c17e..dff37d875f2 100644 ---- a/include/elf/or1k.h -+++ b/include/elf/or1k.h -@@ -77,6 +77,7 @@ START_RELOC_NUMBERS (elf_or1k_reloc_type) - RELOC_NUMBER (R_OR1K_TLS_IE_LO13, 51) - RELOC_NUMBER (R_OR1K_SLO13, 52) - RELOC_NUMBER (R_OR1K_PLTA26, 53) -+ RELOC_NUMBER (R_OR1K_GOT_AHI16, 54) - END_RELOC_NUMBERS (R_OR1K_max) - - #define EF_OR1K_NODELAY (1UL << 0) -diff --git a/opcodes/or1k-asm.c b/opcodes/or1k-asm.c -index 5f3c6c74b12..e0c49b3b8cd 100644 ---- a/opcodes/or1k-asm.c -+++ b/opcodes/or1k-asm.c -@@ -177,7 +177,7 @@ static const bfd_reloc_code_real_type or1k_imm16_relocs[][6] = { - BFD_RELOC_OR1K_GOT_LO13, - BFD_RELOC_UNUSED, - BFD_RELOC_UNUSED, -- BFD_RELOC_UNUSED }, -+ BFD_RELOC_OR1K_GOT_AHI16 }, - { BFD_RELOC_OR1K_GOTPC_LO16, - BFD_RELOC_UNUSED, - BFD_RELOC_UNUSED, -@@ -280,6 +280,11 @@ parse_reloc (const char **strp) - str += 5; - cls = RCLASS_TPOFF; - } -+ else if (strncasecmp (str, "got", 3) == 0) -+ { -+ str += 3; -+ cls = RCLASS_GOT; -+ } - - if (strncasecmp (str, "hi(", 3) == 0) - { --- -2.25.1 - diff --git a/package/binutils/2.35.2/0005-or1k-Avoid-R_OR1K_GOT16-overflow-failures-in-presenc.patch b/package/binutils/2.35.2/0005-or1k-Avoid-R_OR1K_GOT16-overflow-failures-in-presenc.patch deleted file mode 100644 index 82198dd373..0000000000 --- a/package/binutils/2.35.2/0005-or1k-Avoid-R_OR1K_GOT16-overflow-failures-in-presenc.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 097b83a1c9c694a14e6081cee034bf24f16875c1 Mon Sep 17 00:00:00 2001 -From: Stafford Horne -Date: Sun, 2 May 2021 06:02:16 +0900 -Subject: [PATCH] or1k: Avoid R_OR1K_GOT16 overflow failures in presence of - R_OR1K_GOT_AHI16 - -Now that we support R_OR1K_GOT_AHI16 we can relax the R_OR1K_GOT16 -overflow validation check if the section has R_OR1K_GOT_AHI16. - -We cannot simple disable R_OR1K_GOT16 overflow validation as there will -still be binaries that will have only R_OR1K_GOT16. The -R_OR1K_GOT_AHI16 relocation will only be added by GCC when building with -the option -mcmodel=large. - -This assumes that R_OR1K_GOT_AHI16 will come before R_OR1K_GOT16, which -is the code pattern that will be emitted by GCC. - -bfd/ChangeLog: - - PR 21464 - * elf32-or1k.c (or1k_elf_relocate_section): Relax R_OR1K_GOT16 - overflow check if we have R_OR1K_GOT_AHI16 followed by - R_OR1K_GOT16. - -Signed-off-by: Giulio Benetti ---- - bfd/elf32-or1k.c | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index 8e395827123..9f315bfda99 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -1280,6 +1280,7 @@ or1k_elf_relocate_section (bfd *output_bfd, - asection *sgot, *splt; - bfd_vma plt_base, got_base, got_sym_value; - bfd_boolean ret_val = TRUE; -+ bfd_boolean saw_gotha = FALSE; - - if (htab == NULL) - return FALSE; -@@ -1487,6 +1488,16 @@ or1k_elf_relocate_section (bfd *output_bfd, - || r_type == R_OR1K_GOT_AHI16) - relocation -= got_sym_value; - -+ if (r_type == R_OR1K_GOT_AHI16) -+ saw_gotha = TRUE; -+ -+ /* If we have a R_OR1K_GOT16 followed by 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. */ -+ if (r_type == R_OR1K_GOT16 && saw_gotha) -+ relocation &= 0xffff; -+ - /* Addend should be zero. */ - if (rel->r_addend != 0) - { --- -2.25.1 - diff --git a/package/binutils/2.35.2/0006-or1k-Support-large-plt_relocs-when-generating-plt-en.patch b/package/binutils/2.35.2/0006-or1k-Support-large-plt_relocs-when-generating-plt-en.patch deleted file mode 100644 index c884ab874d..0000000000 --- a/package/binutils/2.35.2/0006-or1k-Support-large-plt_relocs-when-generating-plt-en.patch +++ /dev/null @@ -1,500 +0,0 @@ -From c87692eb894b4b86eced7b7ba205f9bf27c2c213 Mon Sep 17 00:00:00 2001 -From: Stafford Horne -Date: Sun, 2 May 2021 06:02:17 +0900 -Subject: [PATCH] or1k: Support large plt_relocs when generating plt - entries - -The current PLT generation code will generate invalid code when the PLT -relocation offset exceeds 64k. This fixes the issue by detecting large -plt_reloc offsets and generare code sequences to create larger plt -relocations. - -The "large" plt code needs 2 extra instructions to create 32-bit offsets. - -bfd/ChangeLog: - - PR 27746 - * elf32-or1k.c (PLT_ENTRY_SIZE_LARGE, PLT_MAX_INSN_COUNT, - OR1K_ADD, OR1K_ORI): New macros to help with plt creation. - (elf_or1k_link_hash_table): New field plt_count. - (elf_or1k_link_hash_entry): New field plt_index. - (elf_or1k_plt_entry_size): New function. - (or1k_write_plt_entry): Update to support variable size PLTs. - (or1k_elf_finish_dynamic_sections): Use new or1k_write_plt_entry - API. - (or1k_elf_finish_dynamic_symbol): Update to write large PLTs - when needed. - (allocate_dynrelocs): Use elf_or1k_plt_entry_size to account for - PLT size. - -ld/ChangeLog: - - PR 27746 - testsuite/ld-or1k/or1k.exp (or1kplttests): Add tests for linking - along with gotha() relocations. - testsuite/ld-or1k/gotha1.dd: New file. - testsuite/ld-or1k/gotha1.s: New file. - testsuite/ld-or1k/gotha2.dd: New file. - testsuite/ld-or1k/gotha2.s: New file - testsuite/ld-or1k/pltlib.s (x): Define size to avoid link - failure. - -Signed-off-by: Giulio Benetti ---- - bfd/elf32-or1k.c | 149 ++++++++++++++++++++++++--------- - ld/testsuite/ld-or1k/gotha1.dd | 34 ++++++++ - ld/testsuite/ld-or1k/gotha1.s | 24 ++++++ - ld/testsuite/ld-or1k/gotha2.dd | 21 +++++ - ld/testsuite/ld-or1k/gotha2.s | 22 +++++ - ld/testsuite/ld-or1k/or1k.exp | 8 ++ - ld/testsuite/ld-or1k/pltlib.s | 1 + - 7 files changed, 220 insertions(+), 39 deletions(-) - create mode 100644 ld/testsuite/ld-or1k/gotha1.dd - create mode 100644 ld/testsuite/ld-or1k/gotha1.s - create mode 100644 ld/testsuite/ld-or1k/gotha2.dd - create mode 100644 ld/testsuite/ld-or1k/gotha2.s - -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index 9f315bfda99..7a14eaa3a46 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -30,10 +30,14 @@ - #define N_ONES(X) (((bfd_vma)2 << (X)) - 1) - - #define PLT_ENTRY_SIZE 16 -+#define PLT_ENTRY_SIZE_LARGE (6*4) -+#define PLT_MAX_INSN_COUNT 6 - - #define OR1K_MOVHI(D) (0x18000000 | (D << 21)) - #define OR1K_ADRP(D) (0x08000000 | (D << 21)) - #define OR1K_LWZ(D,A) (0x84000000 | (D << 21) | (A << 16)) -+#define OR1K_ADD(D,A,B) (0xE0000000 | (D << 21) | (A << 16) | (B << 11)) -+#define OR1K_ORI(D,A) (0xA8000000 | (D << 21) | (A << 16)) - #define OR1K_ORI0(D) (0xA8000000 | (D << 21)) - #define OR1K_JR(B) (0x44000000 | (B << 11)) - #define OR1K_NOP 0x15000000 -@@ -907,6 +911,8 @@ struct elf_or1k_link_hash_entry - { - struct elf_link_hash_entry root; - -+ /* For calculating PLT size. */ -+ bfd_vma plt_index; - /* Track type of TLS access. */ - unsigned char tls_type; - }; -@@ -934,9 +940,20 @@ struct elf_or1k_link_hash_table - /* Small local sym to section mapping cache. */ - struct sym_cache sym_sec; - -+ bfd_vma plt_count; - bfd_boolean saw_plta; - }; - -+static size_t -+elf_or1k_plt_entry_size (bfd_vma plt_index) -+{ -+ bfd_vma plt_reloc; -+ -+ plt_reloc = plt_index * sizeof (Elf32_External_Rela); -+ -+ return (plt_reloc > 0xffff) ? PLT_ENTRY_SIZE_LARGE : PLT_ENTRY_SIZE; -+} -+ - /* Get the ELF linker hash table from a link_info structure. */ - #define or1k_elf_hash_table(p) \ - (elf_hash_table_id ((struct elf_link_hash_table *) ((p)->hash)) \ -@@ -2224,33 +2241,46 @@ or1k_elf_check_relocs (bfd *abfd, - } - - static void --or1k_write_plt_entry (bfd *output_bfd, bfd_byte *contents, unsigned insn1, -- unsigned insn2, unsigned insn3, unsigned insnj) -+or1k_write_plt_entry (bfd *output_bfd, bfd_byte *contents, unsigned insnj, -+ unsigned insns[], size_t insn_count) - { - unsigned nodelay = elf_elfheader (output_bfd)->e_flags & EF_OR1K_NODELAY; -- unsigned insn4; -+ unsigned output_insns[PLT_MAX_INSN_COUNT]; -+ -+ /* Copy instructions into the output buffer. */ -+ for (size_t i = 0; i < insn_count; i++) -+ output_insns[i] = insns[i]; - - /* Honor the no-delay-slot setting. */ -- if (insn3 == OR1K_NOP) -+ if (insns[insn_count-1] == OR1K_NOP) - { -- insn4 = insn3; -+ unsigned slot1, slot2; -+ - if (nodelay) -- insn3 = insnj; -+ slot1 = insns[insn_count-2], slot2 = insnj; - else -- insn3 = insn2, insn2 = insnj; -+ slot1 = insnj, slot2 = insns[insn_count-2]; -+ -+ output_insns[insn_count-2] = slot1; -+ output_insns[insn_count-1] = slot2; -+ output_insns[insn_count] = OR1K_NOP; - } - else - { -+ unsigned slot1, slot2; -+ - if (nodelay) -- insn4 = insnj; -+ slot1 = insns[insn_count-1], slot2 = insnj; - else -- insn4 = insn3, insn3 = insnj; -+ slot1 = insnj, slot2 = insns[insn_count-1]; -+ -+ output_insns[insn_count-1] = slot1; -+ output_insns[insn_count] = slot2; - } - -- bfd_put_32 (output_bfd, insn1, contents); -- bfd_put_32 (output_bfd, insn2, contents + 4); -- bfd_put_32 (output_bfd, insn3, contents + 8); -- bfd_put_32 (output_bfd, insn4, contents + 12); -+ /* Write out the output buffer. */ -+ for (size_t i = 0; i < (insn_count+1); i++) -+ bfd_put_32 (output_bfd, output_insns[i], contents + (i*4)); - } - - /* Finish up the dynamic sections. */ -@@ -2317,7 +2347,8 @@ or1k_elf_finish_dynamic_sections (bfd *output_bfd, - splt = htab->root.splt; - if (splt && splt->size > 0) - { -- unsigned plt0, plt1, plt2; -+ unsigned plt[PLT_MAX_INSN_COUNT]; -+ size_t plt_insn_count = 3; - bfd_vma got_addr = sgot->output_section->vma + sgot->output_offset; - - /* Note we force 16 byte alignment on the .got, so that -@@ -2328,27 +2359,27 @@ or1k_elf_finish_dynamic_sections (bfd *output_bfd, - bfd_vma pc = splt->output_section->vma + splt->output_offset; - unsigned pa = ((got_addr >> 13) - (pc >> 13)) & 0x1fffff; - unsigned po = got_addr & 0x1fff; -- plt0 = OR1K_ADRP(12) | pa; -- plt1 = OR1K_LWZ(15,12) | (po + 8); -- plt2 = OR1K_LWZ(12,12) | (po + 4); -+ plt[0] = OR1K_ADRP(12) | pa; -+ plt[1] = OR1K_LWZ(15,12) | (po + 8); -+ plt[2] = OR1K_LWZ(12,12) | (po + 4); - } - else if (bfd_link_pic (info)) - { -- plt0 = OR1K_LWZ(15, 16) | 8; /* .got+8 */ -- plt1 = OR1K_LWZ(12, 16) | 4; /* .got+4 */ -- plt2 = OR1K_NOP; -+ plt[0] = OR1K_LWZ(15, 16) | 8; /* .got+8 */ -+ plt[1] = OR1K_LWZ(12, 16) | 4; /* .got+4 */ -+ plt[2] = OR1K_NOP; - } - else - { - unsigned ha = ((got_addr + 0x8000) >> 16) & 0xffff; - unsigned lo = got_addr & 0xffff; -- plt0 = OR1K_MOVHI(12) | ha; -- plt1 = OR1K_LWZ(15,12) | (lo + 8); -- plt2 = OR1K_LWZ(12,12) | (lo + 4); -+ plt[0] = OR1K_MOVHI(12) | ha; -+ plt[1] = OR1K_LWZ(15,12) | (lo + 8); -+ plt[2] = OR1K_LWZ(12,12) | (lo + 4); - } - -- or1k_write_plt_entry (output_bfd, splt->contents, -- plt0, plt1, plt2, OR1K_JR(15)); -+ or1k_write_plt_entry (output_bfd, splt->contents, OR1K_JR(15), -+ plt, plt_insn_count); - - elf_section_data (splt->output_section)->this_hdr.sh_entsize = 4; - } -@@ -2391,7 +2422,8 @@ or1k_elf_finish_dynamic_symbol (bfd *output_bfd, - - if (h->plt.offset != (bfd_vma) -1) - { -- unsigned int plt0, plt1, plt2; -+ unsigned int plt[PLT_MAX_INSN_COUNT]; -+ size_t plt_insn_count = 3; - asection *splt; - asection *sgot; - asection *srela; -@@ -2403,6 +2435,7 @@ or1k_elf_finish_dynamic_symbol (bfd *output_bfd, - bfd_vma got_offset; - bfd_vma got_addr; - Elf_Internal_Rela rela; -+ bfd_boolean large_plt_entry; - - /* This symbol has an entry in the procedure linkage table. Set - it up. */ -@@ -2420,10 +2453,13 @@ or1k_elf_finish_dynamic_symbol (bfd *output_bfd, - corresponds to this symbol. This is the index of this symbol - in all the symbols for which we are making plt entries. The - first entry in the procedure linkage table is reserved. */ -- plt_index = h->plt.offset / PLT_ENTRY_SIZE - 1; -+ plt_index = ((struct elf_or1k_link_hash_entry *) h)->plt_index; - plt_addr = plt_base_addr + h->plt.offset; - plt_reloc = plt_index * sizeof (Elf32_External_Rela); - -+ large_plt_entry = (elf_or1k_plt_entry_size (plt_index) -+ == PLT_ENTRY_SIZE_LARGE); -+ - /* Get the offset into the .got table of the entry that - corresponds to this function. Each .got entry is 4 bytes. - The first three are reserved. */ -@@ -2435,27 +2471,57 @@ or1k_elf_finish_dynamic_symbol (bfd *output_bfd, - { - unsigned pa = ((got_addr >> 13) - (plt_addr >> 13)) & 0x1fffff; - unsigned po = (got_addr & 0x1fff); -- plt0 = OR1K_ADRP(12) | pa; -- plt1 = OR1K_LWZ(12,12) | po; -- plt2 = OR1K_ORI0(11) | plt_reloc; -+ plt[0] = OR1K_ADRP(12) | pa; -+ plt[1] = OR1K_LWZ(12,12) | po; -+ plt[2] = OR1K_ORI0(11) | plt_reloc; - } - else if (bfd_link_pic (info)) - { -- plt0 = OR1K_LWZ(12,16) | got_offset; -- plt1 = OR1K_ORI0(11) | plt_reloc; -- plt2 = OR1K_NOP; -+ if (large_plt_entry) -+ { -+ unsigned gotha = ((got_offset + 0x8000) >> 16) & 0xffff; -+ unsigned got = got_offset & 0xffff; -+ unsigned pltrelhi = (plt_reloc >> 16) & 0xffff; -+ unsigned pltrello = plt_reloc & 0xffff; -+ -+ plt[0] = OR1K_MOVHI(12) | gotha; -+ plt[1] = OR1K_ADD(12,12,16); -+ plt[2] = OR1K_LWZ(12,12) | got; -+ plt[3] = OR1K_MOVHI(11) | pltrelhi; -+ plt[4] = OR1K_ORI(11,11) | pltrello; -+ plt_insn_count = 5; -+ } -+ else -+ { -+ plt[0] = OR1K_LWZ(12,16) | got_offset; -+ plt[1] = OR1K_ORI0(11) | plt_reloc; -+ plt[2] = OR1K_NOP; -+ } - } - else - { - unsigned ha = ((got_addr + 0x8000) >> 16) & 0xffff; - unsigned lo = got_addr & 0xffff; -- plt0 = OR1K_MOVHI(12) | ha; -- plt1 = OR1K_LWZ(12,12) | lo; -- plt2 = OR1K_ORI0(11) | plt_reloc; -+ plt[0] = OR1K_MOVHI(12) | ha; -+ plt[1] = OR1K_LWZ(12,12) | lo; -+ plt[2] = OR1K_ORI0(11) | plt_reloc; -+ } -+ -+ /* For large code model we fixup the non-PIC PLT relocation instructions -+ here. */ -+ if (large_plt_entry && !bfd_link_pic (info)) -+ { -+ unsigned pltrelhi = (plt_reloc >> 16) & 0xffff; -+ unsigned pltrello = plt_reloc & 0xffff; -+ -+ plt[2] = OR1K_MOVHI(11) | pltrelhi; -+ plt[3] = OR1K_ORI(11,11) | pltrello; -+ plt[4] = OR1K_NOP; -+ plt_insn_count = 5; - } - - or1k_write_plt_entry (output_bfd, splt->contents + h->plt.offset, -- plt0, plt1, plt2, OR1K_JR(12)); -+ OR1K_JR(12), plt, plt_insn_count); - - /* Fill in the entry in the global offset table. We initialize it to - point to the top of the plt. This is done to lazy lookup the actual -@@ -2779,11 +2845,16 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf) - if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, bfd_link_pic (info), h)) - { - asection *splt = htab->root.splt; -+ bfd_vma plt_index; -+ -+ /* Track the index of our plt entry for use in calculating size. */ -+ plt_index = htab->plt_count++; -+ ((struct elf_or1k_link_hash_entry *) h)->plt_index = plt_index; - - /* If this is the first .plt entry, make room for the special - first entry. */ - if (splt->size == 0) -- splt->size = PLT_ENTRY_SIZE; -+ splt->size = elf_or1k_plt_entry_size (plt_index); - - h->plt.offset = splt->size; - -@@ -2800,7 +2871,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf) - } - - /* Make room for this entry. */ -- splt->size += PLT_ENTRY_SIZE; -+ splt->size += elf_or1k_plt_entry_size (plt_index); - - /* We also need to make an entry in the .got.plt section, which - will be placed in the .got section by the linker script. */ -diff --git a/ld/testsuite/ld-or1k/gotha1.dd b/ld/testsuite/ld-or1k/gotha1.dd -new file mode 100644 -index 00000000000..0ad1f8f5399 ---- /dev/null -+++ b/ld/testsuite/ld-or1k/gotha1.dd -@@ -0,0 +1,34 @@ -+ -+.*\.x: file format elf32-or1k -+ -+ -+Disassembly of section \.plt: -+ -+[0-9a-f]+ <\.plt>: -+ +[0-9a-f]+: 19 80 00 00 l\.movhi r12,0x0 -+ +[0-9a-f]+: 85 ec [0-9a-f]+ [0-9a-f]+ l\.lwz r15,[0-9]+\(r12\) -+ +[0-9a-f]+: 44 00 78 00 l\.jr r15 -+ +[0-9a-f]+: 85 8c [0-9a-f]+ [0-9a-f]+ l\.lwz r12,[0-9]+\(r12\) -+ +[0-9a-f]+: 19 80 00 00 l\.movhi r12,0x0 -+ +[0-9a-f]+: 85 8c [0-9a-f]+ [0-9a-f]+ l\.lwz r12,[0-9]+\(r12\) -+ +[0-9a-f]+: 44 00 60 00 l\.jr r12 -+ +[0-9a-f]+: a9 60 00 00 l\.ori r11,r0,0x0 -+ -+Disassembly of section \.text: -+ -+[0-9a-f]+ <_start>: -+ +[0-9a-f]+: 9c 21 ff fc l\.addi r1,r1,-4 -+ +[0-9a-f]+: d4 01 48 00 l\.sw 0\(r1\),r9 -+ +[0-9a-f]+: 04 00 00 02 l\.jal [0-9a-f]+ <_start\+0x10> -+ +[0-9a-f]+: 1a 60 00 00 l\.movhi r19,0x0 -+ +[0-9a-f]+: aa 73 [0-9a-f]+ [0-9a-f]+ l\.ori r19,r19,0x[0-9a-f]+ -+ +[0-9a-f]+: e2 73 48 00 l\.add r19,r19,r9 -+ +[0-9a-f]+: 1a 20 00 00 l\.movhi r17,0x0 -+ +[0-9a-f]+: e2 31 98 00 l\.add r17,r17,r19 -+ +[0-9a-f]+: 86 31 00 10 l\.lwz r17,16\(r17\) -+ +[0-9a-f]+: 84 71 00 00 l\.lwz r3,0\(r17\) -+ +[0-9a-f]+: 07 ff ff f2 l\.jal [0-9a-f]+ <\.plt\+0x10> -+ +[0-9a-f]+: 15 00 00 00 l\.nop 0x0 -+ +[0-9a-f]+: 85 21 00 00 l\.lwz r9,0\(r1\) -+ +[0-9a-f]+: 44 00 48 00 l\.jr r9 -+ +[0-9a-f]+: 9c 21 00 04 l\.addi r1,r1,4 -diff --git a/ld/testsuite/ld-or1k/gotha1.s b/ld/testsuite/ld-or1k/gotha1.s -new file mode 100644 -index 00000000000..42b16db425c ---- /dev/null -+++ b/ld/testsuite/ld-or1k/gotha1.s -@@ -0,0 +1,24 @@ -+ .data -+ .p2align 16 -+ -+ .text -+ .globl _start -+_start: -+ l.addi r1, r1, -4 -+ l.sw 0(r1), r9 -+ -+ l.jal 8 -+ l.movhi r19, gotpchi(_GLOBAL_OFFSET_TABLE_-4) -+ l.ori r19, r19, gotpclo(_GLOBAL_OFFSET_TABLE_+0) -+ l.add r19, r19, r9 -+ -+ l.movhi r17, gotha(x) -+ l.add r17, r17, r19 -+ l.lwz r17, got(x)(r17) -+ l.lwz r3, 0(r17) -+ -+ l.jal plt(func) -+ l.nop -+ l.lwz r9, 0(r1) -+ l.jr r9 -+ l.addi r1, r1, 4 -diff --git a/ld/testsuite/ld-or1k/gotha2.dd b/ld/testsuite/ld-or1k/gotha2.dd -new file mode 100644 -index 00000000000..fe09da5466b ---- /dev/null -+++ b/ld/testsuite/ld-or1k/gotha2.dd -@@ -0,0 +1,21 @@ -+ -+.*\.x: file format elf32-or1k -+ -+ -+Disassembly of section \.text: -+ -+[0-9a-f]+ : -+ +[0-9a-f]+: 9c 21 ff f8 l\.addi r1,r1,-8 -+ +[0-9a-f]+: d4 01 80 00 l\.sw 0\(r1\),r16 -+ +[0-9a-f]+: d4 01 48 04 l\.sw 4\(r1\),r9 -+ +[0-9a-f]+: 04 00 [0-9a-f]+ [0-9a-f]+ l\.jal [0-9a-f]+ -+ +[0-9a-f]+: 1a 00 00 00 l\.movhi r16,0x0 -+ +[0-9a-f]+: aa 10 [0-9a-f]+ [0-9a-f]+ l\.ori r16,r16,0x[0-9a-f]+ -+ +[0-9a-f]+: e2 10 48 00 l\.add r16,r16,r9 -+ +[0-9a-f]+: 1a 20 00 00 l\.movhi r17,0x0 -+ +[0-9a-f]+: e2 31 80 00 l\.add r17,r17,r16 -+ +[0-9a-f]+: 86 31 00 0c l\.lwz r17,12\(r17\) -+ +[0-9a-f]+: 85 21 00 04 l\.lwz r9,4\(r1\) -+ +[0-9a-f]+: 86 01 00 00 l\.lwz r16,0\(r1\) -+ +[0-9a-f]+: 44 00 48 00 l\.jr r9 -+ +[0-9a-f]+: 9c 21 00 08 l\.addi r1,r1,8 -diff --git a/ld/testsuite/ld-or1k/gotha2.s b/ld/testsuite/ld-or1k/gotha2.s -new file mode 100644 -index 00000000000..164b282f2dd ---- /dev/null -+++ b/ld/testsuite/ld-or1k/gotha2.s -@@ -0,0 +1,22 @@ -+ .section .text -+ .align 4 -+ .global test -+ .type test, @function -+test: -+ l.addi r1, r1, -8 -+ l.sw 0(r1), r16 -+ l.sw 4(r1), r9 -+ -+ l.jal 8 -+ l.movhi r16, gotpchi(_GLOBAL_OFFSET_TABLE_-4) -+ l.ori r16, r16, gotpclo(_GLOBAL_OFFSET_TABLE_+0) -+ l.add r16, r16, r9 -+ -+ l.movhi r17, gotha(i) -+ l.add r17, r17, r16 -+ l.lwz r17, got(i)(r17) -+ -+ l.lwz r9, 4(r1) -+ l.lwz r16, 0(r1) -+ l.jr r9 -+ l.addi r1, r1, 8 -diff --git a/ld/testsuite/ld-or1k/or1k.exp b/ld/testsuite/ld-or1k/or1k.exp -index 7592e8307c1..8e19ec6c31a 100644 ---- a/ld/testsuite/ld-or1k/or1k.exp -+++ b/ld/testsuite/ld-or1k/or1k.exp -@@ -53,6 +53,14 @@ set or1kplttests { - "" {plt1.s} - {{objdump -dr plt1.x.dd}} - "plt1.x"} -+ {"gotha exec plt" "tmpdir/libpltlib.so" "" -+ "" {gotha1.s} -+ {{objdump -dr gotha1.dd}} -+ "gotha1.x"} -+ {"gotha -fpic -shared" "-fpic -shared" "" -+ "" {gotha2.s} -+ {{objdump -dr gotha2.dd}} -+ "gotha2.x"} - } - - # Not implemented yet -diff --git a/ld/testsuite/ld-or1k/pltlib.s b/ld/testsuite/ld-or1k/pltlib.s -index baf76ca1af7..8b4d7ba48fd 100644 ---- a/ld/testsuite/ld-or1k/pltlib.s -+++ b/ld/testsuite/ld-or1k/pltlib.s -@@ -1,5 +1,6 @@ - .section .data - .globl x, y -+ .size x, 4 - x: .long 33 - y: .long 44 - --- -2.25.1 - diff --git a/package/binutils/2.35.2/0007-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch b/package/binutils/2.35.2/0007-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch deleted file mode 100644 index c3978e22fa..0000000000 --- a/package/binutils/2.35.2/0007-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch +++ /dev/null @@ -1,50 +0,0 @@ -From c3003947e4bad18faea4337fd2073feeb30ee078 Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Wed, 9 Jun 2021 17:28:27 +0200 -Subject: [PATCH] bfd/elf32-or1k: fix building with gcc version < 5 - -Gcc version >= 5 has standard C mode not set to -std=gnu11, so if we use -an old compiler(i.e. gcc 4.9) build fails on: -``` -elf32-or1k.c:2251:3: error: 'for' loop initial declarations are only allowed in -C99 or C11 mode - for (size_t i = 0; i < insn_count; i++) - ^ -``` - -So let's declare `size_t i` at the top of the function instead of inside -for loop. - -Signed-off-by: Giulio Benetti ---- - bfd/elf32-or1k.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index 4ae7f324d33..32063ab0289 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -2244,9 +2244,10 @@ or1k_write_plt_entry (bfd *output_bfd, bfd_byte *contents, unsigned insnj, - { - unsigned nodelay = elf_elfheader (output_bfd)->e_flags & EF_OR1K_NODELAY; - unsigned output_insns[PLT_MAX_INSN_COUNT]; -+ size_t i; - - /* Copy instructions into the output buffer. */ -- for (size_t i = 0; i < insn_count; i++) -+ for (i = 0; i < insn_count; i++) - output_insns[i] = insns[i]; - - /* Honor the no-delay-slot setting. */ -@@ -2277,7 +2278,7 @@ or1k_write_plt_entry (bfd *output_bfd, bfd_byte *contents, unsigned insnj, - } - - /* Write out the output buffer. */ -- for (size_t i = 0; i < (insn_count+1); i++) -+ for (i = 0; i < (insn_count+1); i++) - bfd_put_32 (output_bfd, output_insns[i], contents + (i*4)); - } - --- -2.25.1 - diff --git a/package/binutils/2.35.2/0008-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch b/package/binutils/2.35.2/0008-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch deleted file mode 100644 index 585b97b2af..0000000000 --- a/package/binutils/2.35.2/0008-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 9af93e143a7fbdb75aa1ed37277f9250eb111628 Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Sat, 10 Jul 2021 17:57:34 +0200 -Subject: [PATCH] or1k: fix pc-relative relocation against dynamic on PC - relative 26 bit relocation - -When building openal we were seeing the assert failure: - -/home/buildroot/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: CMakeFiles/OpenAL.dir/al/source.cpp.o: -pc-relative relocation against dynamic symbol alSourcePausev -/home/buildroot/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: CMakeFiles/OpenAL.dir/al/source.cpp.o: -pc-relative relocation against dynamic symbol alSourceStopv -/home/buildroot/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: CMakeFiles/OpenAL.dir/al/source.cpp.o: -pc-relative relocation against dynamic symbol alSourceRewindv -/home/buildroot/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: CMakeFiles/OpenAL.dir/al/source.cpp.o: -pc-relative relocation against dynamic symbol alSourcePlayv -collect2: error: ld returned 1 exit status - -This happens because in R_OR1K_INSN_REL_26 case we can't reference local -symbol as previously done but we need to make sure that calls to actual -symbol always call the version of current object. - -bfd/Changelog: - - * elf32-or1k.c (or1k_elf_relocate_section): use a separate entry - in switch case R_OR1K_INSN_REL_26 where we need to check for - !SYMBOL_CALLS_LOCAL() instead of !SYMBOL_REFERENCES_LOCAL(). - -Signed-off-by: Giulio Benetti ---- - bfd/elf32-or1k.c | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index 4ae7f324d33..4f9092539f5 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -1543,6 +1543,18 @@ or1k_elf_relocate_section (bfd *output_bfd, - break; - - case R_OR1K_INSN_REL_26: -+ /* For a non-shared link, these will reference plt or call the -+ version of actual object. */ -+ if (bfd_link_pic (info) && !SYMBOL_CALLS_LOCAL (info, h)) -+ { -+ _bfd_error_handler -+ (_("%pB: pc-relative relocation against dynamic symbol %s"), -+ input_bfd, name); -+ ret_val = FALSE; -+ bfd_set_error (bfd_error_bad_value); -+ } -+ break; -+ - case R_OR1K_PCREL_PG21: - case R_OR1K_LO13: - case R_OR1K_SLO13: --- -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 deleted file mode 100644 index e96d49122a..0000000000 --- a/package/binutils/2.35.2/0009-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch +++ /dev/null @@ -1,75 +0,0 @@ -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.35.2/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch b/package/binutils/2.35.2/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch deleted file mode 100644 index e95eb1e7c5..0000000000 --- a/package/binutils/2.35.2/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 30a954525f4e53a9cd50a1a8a6f201c7cf6595c7 Mon Sep 17 00:00:00 2001 -From: "H.J. Lu" -Date: Mon, 7 Feb 2022 15:22:19 -0800 -Subject: [PATCH] i386: Allow GOT32 relocations against ABS symbols - -GOT32 relocations are allowed since absolute value + addend is stored in -the GOT slot. - -Tested on glibc 2.35 build with GCC 11.2 and -Os. - -bfd/ - - PR ld/28870 - * elfxx-x86.c (_bfd_elf_x86_valid_reloc_p): Also allow GOT32 - relocations. - -Signed-off-by: Waldemar Brodkorb - -diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c -index 7ac2411fc80..d00dc45677b 100644 ---- a/bfd/elfxx-x86.c -+++ b/bfd/elfxx-x86.c -@@ -1942,9 +1942,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section, - irel = *rel; - - /* Only allow relocations against absolute symbol, which can be -- resolved as absolute value + addend. GOTPCREL relocations -- are allowed since absolute value + addend is stored in the -- GOT slot. */ -+ resolved as absolute value + addend. GOTPCREL and GOT32 -+ relocations are allowed since absolute value + addend is -+ stored in the GOT slot. */ - if (bed->target_id == X86_64_ELF_DATA) - { - r_type &= ~R_X86_64_converted_reloc_bit; -@@ -1965,7 +1965,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section, - else - valid_p = (r_type == R_386_32 - || r_type == R_386_16 -- || r_type == R_386_8); -+ || r_type == R_386_8 -+ || r_type == R_386_GOT32 -+ || r_type == R_386_GOT32X); - - if (valid_p) - *no_dynreloc_p = true; diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index 17de6e4e41..21b15b5c36 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -16,13 +16,6 @@ config BR2_BINUTILS_VERSION_2_32_X bool "binutils 2.32" depends on !BR2_csky -config BR2_BINUTILS_VERSION_2_35_X - bool "binutils 2.35.2" - depends on !BR2_csky - # https://github.com/uclinux-dev/elf2flt/pull/16 - # https://github.com/uclinux-dev/elf2flt/issues/12 - depends on !BR2_BINFMT_FLAT - config BR2_BINUTILS_VERSION_2_36_X bool "binutils 2.36.1" depends on !BR2_csky @@ -52,7 +45,6 @@ config BR2_BINUTILS_VERSION string default "arc-2020.09-release" if BR2_BINUTILS_VERSION_ARC default "2.32" if BR2_BINUTILS_VERSION_2_32_X - default "2.35.2" if BR2_BINUTILS_VERSION_2_35_X default "2.36.1" if BR2_BINUTILS_VERSION_2_36_X default "2.37" if BR2_BINUTILS_VERSION_2_37_X default "2.38" if BR2_BINUTILS_VERSION_2_38_X diff --git a/package/binutils/binutils.hash b/package/binutils/binutils.hash index fe31b34d40..4141e0c5f2 100644 --- a/package/binutils/binutils.hash +++ b/package/binutils/binutils.hash @@ -1,6 +1,5 @@ # From ftp://gcc.gnu.org/pub/binutils/releases/sha512.sum sha512 d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724afa1e43bd0db45cfc9916b41519b67dfce03232aa4978704492a6994a binutils-2.32.tar.xz -sha512 9974ede5978d32e0d68fef23da48fa00bd06b0bff7ec45b00ca075c126d6bbe0cf2defc03ecc3f17bc6cc85b64271a13009c4049d7ba17de26e84e3a6e2c0348 binutils-2.35.2.tar.xz sha512 cc24590bcead10b90763386b6f96bb027d7594c659c2d95174a6352e8b98465a50ec3e4088d0da038428abe059bbc4ae5f37b269f31a40fc048072c8a234f4e9 binutils-2.36.1.tar.xz sha512 5c11aeef6935860a6819ed3a3c93371f052e52b4bdc5033da36037c1544d013b7f12cb8d561ec954fe7469a68f1b66f1a3cd53d5a3af7293635a90d69edd15e7 binutils-2.37.tar.xz sha512 8bf0b0d193c9c010e0518ee2b2e5a830898af206510992483b427477ed178396cd210235e85fd7bd99a96fc6d5eedbeccbd48317a10f752b7336ada8b2bb826d binutils-2.38.tar.xz -- 2.30.2 From wbx at openadk.org Wed Feb 23 17:59:36 2022 From: wbx at openadk.org (Waldemar Brodkorb) Date: Wed, 23 Feb 2022 18:59:36 +0100 Subject: [Buildroot] [PATCHv3 3/3] package/binutils: make 2.37 the default Message-ID: Signed-off-by: Waldemar Brodkorb --- v1->v2: no changes v2->v3: no changes --- package/binutils/Config.in.host | 2 +- package/binutils/binutils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index 21b15b5c36..e639c67149 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -7,7 +7,7 @@ config BR2_PACKAGE_HOST_BINUTILS_SUPPORTS_CFI choice prompt "Binutils Version" - default BR2_BINUTILS_VERSION_2_36_X if !BR2_arc && !BR2_csky + default BR2_BINUTILS_VERSION_2_37_X if !BR2_arc && !BR2_csky default BR2_BINUTILS_VERSION_ARC if BR2_arc help Select the version of binutils you wish to use. diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index 8c4a1371ca..c94ebe0995 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -11,7 +11,7 @@ ifeq ($(BINUTILS_VERSION),) ifeq ($(BR2_arc),y) BINUTILS_VERSION = arc-2020.09-release else -BINUTILS_VERSION = 2.36.1 +BINUTILS_VERSION = 2.37 endif endif # BINUTILS_VERSION -- 2.30.2 From neal.frager at xilinx.com Wed Feb 23 18:03:36 2022 From: neal.frager at xilinx.com (Neal Frager) Date: Wed, 23 Feb 2022 11:03:36 -0700 Subject: [Buildroot] [PATCH v4 1/1] configs/zynqmp_zcu10x: fix U-Boot dts config Message-ID: <20220223180336.3372352-1-neal.frager@xilinx.com> This patch: - fixes U-Boot issue when DEVICE_TREE environment variable is not defined Signed-off-by: Neal Frager Reviewed-by: Peter Korsgaard Reviewed-by: Luca Ceresoli Tested-by: Peter Korsgaard --- V1->V2: - removed version bumps from patch - removed unnecessary blank lines from uboot-fragment.config files V2->V3: - fixed typo in zynqmp_zcu106_defconfig V3->V4: - re-added patch notes --- board/zynqmp/zcu102/uboot-fragment.config | 1 + board/zynqmp/zcu106/uboot-fragment.config | 1 + configs/zynqmp_zcu102_defconfig | 1 + configs/zynqmp_zcu106_defconfig | 1 + 4 files changed, 4 insertions(+) create mode 100644 board/zynqmp/zcu102/uboot-fragment.config create mode 100644 board/zynqmp/zcu106/uboot-fragment.config diff --git a/board/zynqmp/zcu102/uboot-fragment.config b/board/zynqmp/zcu102/uboot-fragment.config new file mode 100644 index 0000000000..52d6d9dff8 --- /dev/null +++ b/board/zynqmp/zcu102/uboot-fragment.config @@ -0,0 +1 @@ +CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu102-rev1.0" diff --git a/board/zynqmp/zcu106/uboot-fragment.config b/board/zynqmp/zcu106/uboot-fragment.config new file mode 100644 index 0000000000..cd571171ac --- /dev/null +++ b/board/zynqmp/zcu106/uboot-fragment.config @@ -0,0 +1 @@ +CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu106-revA" diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig index 298ce2388c..88e84fe791 100644 --- a/configs/zynqmp_zcu102_defconfig +++ b/configs/zynqmp_zcu102_defconfig @@ -25,6 +25,7 @@ BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2022.01-165-g667001319cbe511ce6353195fb4910ae5cb041ce" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/zcu102/uboot-fragment.config" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index 3e51cbfaab..81f625a73b 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -25,6 +25,7 @@ BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2022.01-165-g667001319cbe511ce6353195fb4910ae5cb041ce" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/zcu106/uboot-fragment.config" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y -- 2.17.1 From luca at lucaceresoli.net Wed Feb 23 18:25:44 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Wed, 23 Feb 2022 19:25:44 +0100 Subject: [Buildroot] [PATCH v4 1/1] configs/zynqmp_zcu10x: fix U-Boot dts config In-Reply-To: <20220223180336.3372352-1-neal.frager@xilinx.com> References: <20220223180336.3372352-1-neal.frager@xilinx.com> Message-ID: <67b712f3-91f0-d726-d7e3-3b6363f6fe94@lucaceresoli.net> Hi Neal, On 23/02/22 19:03, Neal Frager wrote: > This patch: > - fixes U-Boot issue when DEVICE_TREE environment variable is not defined > > Signed-off-by: Neal Frager > Reviewed-by: Peter Korsgaard > Reviewed-by: Luca Ceresoli > Tested-by: Peter Korsgaard These are probably copy-paste errors, we did not write these tags. :) > > --- > V1->V2: > - removed version bumps from patch > - removed unnecessary blank lines from uboot-fragment.config files > V2->V3: > - fixed typo in zynqmp_zcu106_defconfig > V3->V4: > - re-added patch notes In case it helps, here's how I manage these changelogs and the review tags in patches minimizing the above kind of problems. In my local commits I do keep them in the commit message: $ git show commit bb20b3e1faded47201f4d6a7758b5826eb3139e8 Author: Luca Ceresoli Date: Mon Oct 4 16:24:00 2021 +0200 title line.... more info... even more info... Signed-off-by: Luca Ceresoli Reviewed-by: Some Body <...email...> Acked-by: Somebody Else <...email...> --- Changes in v2: - improved this - added comments When reworking the patch I add to the changelog and the tag list using 'git commit --amend' or 'git rebase --interactive' to reword the message. When sending a patch with 'git format-patch' / 'git send-email' they appear in the e-mail and the changelog will be removed when applying the patch because it is after the '---' line. Of course it is how I do manage patches, you might do in whatever way suits you. I just started a build, let's see whether it works. -- Luca From tambewilliam at gmail.com Wed Feb 23 18:29:44 2022 From: tambewilliam at gmail.com (William Tambe) Date: Wed, 23 Feb 2022 12:29:44 -0600 Subject: [Buildroot] STAGING_DIR does not contain executables found in TARGET_DIR In-Reply-To: <256f0da3b8d983a84ea84de250c56bb0@umbiko.net> References: <256f0da3b8d983a84ea84de250c56bb0@umbiko.net> Message-ID: On Wed, Feb 23, 2022 at 5:30 AM Andreas Ziegler wrote: > > Hi William, > > On 2022-02-23 07:11, William Tambe wrote: > > > Please help determining why STAGING_DIR does not contain executables > > found in TARGET_DIR ? > > > > I am expecting to find debug version of all executables in TARGET_DIR, > > but executables such as /bin/busybox are missing from STAGING_DIR . > > If you look at your packages' definition (.mk) files, you will find a > few with *_INSTALL_STAGING = YES. This is responsible for the > (additional) installation in STAGING_DIR. The reason for this is that > some packages need to provide information during the build process, that > is not needed later for operation on the target. To save space on the > target system, a two-stage approach is used. > > Example: your configuration includes zlib-ng: the library itself is > present both in STAGING_DIR and in TARGET_DIR, header and > ldconfig-related files will be found in STAGING_DIR only. On the other > hand, Busybox is not referenced by other packages (it does not export > any interfaces), so it does not have an installation in STAGING_DIR. > Is there a temporary hack I could use to have a `bin/busybox` in STAGING_DIR ? > Your target binaries will be stripped of symbols, unless you prevent > this via BR2_STRIP_EXCLUDE_{FILE, DIRS} ... > > Remote debugging has less impact on your target installation. For this > you would need BR2_PACKAGE_HOST_GDB and BR2_PACKAGE_GDB_SERVER [1]. > > Kind regards, > Andreas > > > I am using 2021.08.3 > > > > Full config is as follow > > ``` > > BR2_pu32=y > > BR2_ENABLE_DEBUG=y > > BR2_DEBUG_3=y > > BR2_STATIC_LIBS=y > > BR2_FORTIFY_SOURCE_NONE=y > > BR2_TOOLCHAIN_EXTERNAL=y > > BR2_TOOLCHAIN_EXTERNAL_PATH="/opt/pu32-toolchain/" > > BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="$(ARCH)-elf" > > BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_5=y > > BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y > > # BR2_TOOLCHAIN_EXTERNAL_HAS_SSP is not set > > # BR2_TOOLCHAIN_EXTERNAL_INET_RPC is not set > > BR2_TOOLCHAIN_EXTERNAL_CXX=y > > BR2_TARGET_GENERIC_ISSUE="" > > BR2_ROOTFS_MERGED_USR=y > > BR2_TARGET_GENERIC_ROOT_PASSWD="root" > > BR2_SYSTEM_BIN_SH_BASH=y > > BR2_TARGET_GENERIC_GETTY_TERM="linux" > > BR2_TARGET_GENERIC_GETTY_OPTIONS="-n -l /bin/-bash" > > BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y > > BR2_PACKAGE_GDB=y > > BR2_PACKAGE_ZLIB=y > > BR2_PACKAGE_ZLIB_NG=y > > BR2_PACKAGE_DHCP=y > > BR2_PACKAGE_DHCP_CLIENT=y > > BR2_PACKAGE_IPROUTE2=y > > BR2_PACKAGE_LRZSZ=y > > BR2_PACKAGE_SOCAT=y > > BR2_PACKAGE_HTOP=y > > BR2_PACKAGE_NANO=y > > # BR2_PACKAGE_NANO_TINY is not set > > BR2_TARGET_ROOTFS_EXT2=y > > BR2_TARGET_ROOTFS_EXT2_4=y > > BR2_TARGET_ROOTFS_EXT2_SIZE="64M" > > # BR2_TARGET_ROOTFS_TAR is not set > > ``` > > [1] https://sourceware.org/gdb/current/onlinedocs/gdb/Server.html#Server From arnout at mind.be Wed Feb 23 18:51:20 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 23 Feb 2022 19:51:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/re2: fix build with gcc <= 5 In-Reply-To: References: <20220221172900.1937856-1-fontaine.fabrice@gmail.com> <20220221200044.GA2166282@scaer> Message-ID: On 21/02/2022 23:05, Fabrice Fontaine wrote: > Yann, > > Le lun. 21 f?vr. 2022 ? 21:00, Yann E. MORIN a ?crit : >> >> Fabrice, All, >> >> On 2022-02-21 18:29 +0100, Fabrice Fontaine spake thusly: >>> Fix the following build failure with gcc <= 5 raised since bump to >>> version 2022-02-01 in commit d2cf91e0c6a082261cc7ebb06dfdbd7bc2c2956f >>> and >>> https://github.com/google/re2/commit/a022cc0c55b0519629d64d775e7a5195af34a477 >>> >>> ./re2/sparse_array.h:266:37: warning: defaulted and deleted functions only available with -std=c++11 or -std=gnu++11 >>> SparseArray::SparseArray() = default; >>> ^ >>> ./re2/sparse_array.h: In copy constructor 're2::SparseArray::SparseArray(const re2::SparseArray&)': >>> ./re2/sparse_array.h:273:3: error: 'copy_n' is not a member of 'std' >>> std::copy_n(src.sparse_.data(), src.max_size(), sparse_.data()); >>> ^ >>> >>> Fixes: >>> - http://autobuild.buildroot.org/results/8ebbac67f32fe24416a1f72aad0afd42b567b403 >>> >>> Signed-off-by: Fabrice Fontaine >>> --- >>> package/re2/re2.mk | 15 ++++++++++----- >>> 1 file changed, 10 insertions(+), 5 deletions(-) >>> >>> diff --git a/package/re2/re2.mk b/package/re2/re2.mk >>> index 41392cb179..cc5fed71fa 100644 >>> --- a/package/re2/re2.mk >>> +++ b/package/re2/re2.mk >>> @@ -10,20 +10,25 @@ RE2_LICENSE = BSD-3-Clause >>> RE2_LICENSE_FILES = LICENSE >>> RE2_INSTALL_STAGING = YES >>> >>> +RE2_MAKE_OPTS = \ >>> + $(TARGET_CONFIGURE_OPTS) \ >>> + CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" \ >>> + prefix=/usr >> >> Is there a reason to have 'prefix' be set during the build, instead of >> just the install steps? > I thought it was better to have it in a single place but I'll send a v2. Actually, in general it is possible that the prefix is used during the build to hardcode some paths. Not in this case I think, but it's good practice to keep these options identical during the build and install steps. The only one that should not be there in build is DESTDIR. Regards, Arnout >> >> Regards, >> Yann E. MORIN. >> >>> define RE2_BUILD_CMDS >>> - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ >>> + $(TARGET_MAKE_ENV) $(MAKE) $(RE2_MAKE_OPTS) \ >>> -C $(@D) $(if $(BR2_STATIC_LIBS),static) >>> endef >>> >>> define RE2_INSTALL_STAGING_CMDS >>> - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ >>> - DESTDIR="$(STAGING_DIR)" prefix=/usr -C $(@D) \ >>> + $(TARGET_MAKE_ENV) $(MAKE) $(RE2_MAKE_OPTS) \ >>> + DESTDIR="$(STAGING_DIR)" -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) \ >>> + $(TARGET_MAKE_ENV) $(MAKE) $(RE2_MAKE_OPTS) \ >>> + DESTDIR="$(TARGET_DIR)" -C $(@D) \ >>> $(if $(BR2_STATIC_LIBS),static-install,install) >>> endef >>> >>> -- >>> 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. | >> '------------------------------^-------^------------------^--------------------' > Best Regards, > > Fabrice > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From br015 at umbiko.net Wed Feb 23 19:02:46 2022 From: br015 at umbiko.net (Andreas Ziegler) Date: Wed, 23 Feb 2022 19:02:46 +0000 Subject: [Buildroot] STAGING_DIR does not contain executables found in TARGET_DIR In-Reply-To: References: <256f0da3b8d983a84ea84de250c56bb0@umbiko.net> Message-ID: <5ecd33a2418e1a181df7444064c8050b@umbiko.net> On 2022-02-23 18:29, William Tambe wrote: > On Wed, Feb 23, 2022 at 5:30 AM Andreas Ziegler > wrote: >> >> Hi William, >> >> On 2022-02-23 07:11, William Tambe wrote: >> >> > Please help determining why STAGING_DIR does not contain executables >> > found in TARGET_DIR ? >> > >> > I am expecting to find debug version of all executables in TARGET_DIR, >> > but executables such as /bin/busybox are missing from STAGING_DIR . >> >> If you look at your packages' definition (.mk) files, you will find a >> few with *_INSTALL_STAGING = YES. This is responsible for the >> (additional) installation in STAGING_DIR. The reason for this is that >> some packages need to provide information during the build process, >> that >> is not needed later for operation on the target. To save space on the >> target system, a two-stage approach is used. >> >> Example: your configuration includes zlib-ng: the library itself is >> present both in STAGING_DIR and in TARGET_DIR, header and >> ldconfig-related files will be found in STAGING_DIR only. On the >> other >> hand, Busybox is not referenced by other packages (it does not export >> any interfaces), so it does not have an installation in STAGING_DIR. >> > > Is there a temporary hack I could use to have a `bin/busybox` in > STAGING_DIR ? You might try to just enable BUSYBOX_INSTALL_STAGING = YES, but it will probably also need definition of BUSYBOX_INSTALL_STAGING_CMDS. Another option would be a post-install hook: define BUSYBOX_INSTALL_STAGING $(INSTALL) -m 0755 &(@D)/busybox_unstripped $(STAGING_DIR)/bin/busybox endef BUSYBOX_POST_INSTALL_TARGET_HOOKS += BUSYBOX_INSTALL_STAGING >> Your target binaries will be stripped of symbols, unless you prevent >> this via BR2_STRIP_EXCLUDE_{FILE, DIRS} ... >> >> Remote debugging has less impact on your target installation. For this >> you would need BR2_PACKAGE_HOST_GDB and BR2_PACKAGE_GDB_SERVER [1]. >> >> Kind regards, >> Andreas >> >> > I am using 2021.08.3 >> > >> > Full config is as follow >> > ``` >> > BR2_pu32=y >> > BR2_ENABLE_DEBUG=y >> > BR2_DEBUG_3=y >> > BR2_STATIC_LIBS=y >> > BR2_FORTIFY_SOURCE_NONE=y >> > BR2_TOOLCHAIN_EXTERNAL=y >> > BR2_TOOLCHAIN_EXTERNAL_PATH="/opt/pu32-toolchain/" >> > BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="$(ARCH)-elf" >> > BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_5=y >> > BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y >> > # BR2_TOOLCHAIN_EXTERNAL_HAS_SSP is not set >> > # BR2_TOOLCHAIN_EXTERNAL_INET_RPC is not set >> > BR2_TOOLCHAIN_EXTERNAL_CXX=y >> > BR2_TARGET_GENERIC_ISSUE="" >> > BR2_ROOTFS_MERGED_USR=y >> > BR2_TARGET_GENERIC_ROOT_PASSWD="root" >> > BR2_SYSTEM_BIN_SH_BASH=y >> > BR2_TARGET_GENERIC_GETTY_TERM="linux" >> > BR2_TARGET_GENERIC_GETTY_OPTIONS="-n -l /bin/-bash" >> > BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y >> > BR2_PACKAGE_GDB=y >> > BR2_PACKAGE_ZLIB=y >> > BR2_PACKAGE_ZLIB_NG=y >> > BR2_PACKAGE_DHCP=y >> > BR2_PACKAGE_DHCP_CLIENT=y >> > BR2_PACKAGE_IPROUTE2=y >> > BR2_PACKAGE_LRZSZ=y >> > BR2_PACKAGE_SOCAT=y >> > BR2_PACKAGE_HTOP=y >> > BR2_PACKAGE_NANO=y >> > # BR2_PACKAGE_NANO_TINY is not set >> > BR2_TARGET_ROOTFS_EXT2=y >> > BR2_TARGET_ROOTFS_EXT2_4=y >> > BR2_TARGET_ROOTFS_EXT2_SIZE="64M" >> > # BR2_TARGET_ROOTFS_TAR is not set >> > ``` >> >> [1] >> https://sourceware.org/gdb/current/onlinedocs/gdb/Server.html#Server From geomatsi at gmail.com Wed Feb 23 19:14:32 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Wed, 23 Feb 2022 22:14:32 +0300 Subject: [Buildroot] [PATCH 0/4] orangepi: convert more boards to extlinux Message-ID: <20220223191436.3045255-1-geomatsi@gmail.com> Hi all, Recently extlinux infrastructure has been added for orangepi boards by Sergey Kuzminov: see commit c0312f71cc89 ("configs/orangepi_zero_defconfig: switch to extlinux"). This patch series converts to extlinux some of the boards that I have at my disposal: - orangepi-zero-plus2 - orangepi-pc-plus - orangepi-one All these changes have been build- and boot- tested. Also I added orangepi-zero-plus2 to my list in DEVELOPERS file to keep an eye on its build failures. Regards, Sergey Sergey Matyukevich (4): board/orangepi/orangepi-zero-plus2: switch to extlinux board/orangepi/orangepi-pc-plus: switch to extlinux board/orangepi/orangepi-one: switch to extlinux DEVELOPERS: add myself for orangepi-zero-plus2 DEVELOPERS | 2 + board/orangepi/orangepi-one/boot.cmd | 8 ---- board/orangepi/orangepi-one/genimage.cfg | 37 ---------------- board/orangepi/orangepi-pc-plus/boot.cmd | 8 ---- board/orangepi/orangepi-pc-plus/genimage.cfg | 43 ------------------- board/orangepi/orangepi-zero-plus2/boot.cmd | 6 --- .../orangepi/orangepi-zero-plus2/genimage.cfg | 41 ------------------ configs/orangepi_one_defconfig | 9 ++-- configs/orangepi_pc_plus_defconfig | 9 ++-- configs/orangepi_zero_plus2_defconfig | 14 +++--- 10 files changed, 16 insertions(+), 161 deletions(-) delete mode 100644 board/orangepi/orangepi-one/boot.cmd delete mode 100644 board/orangepi/orangepi-one/genimage.cfg delete mode 100644 board/orangepi/orangepi-pc-plus/boot.cmd delete mode 100644 board/orangepi/orangepi-pc-plus/genimage.cfg delete mode 100644 board/orangepi/orangepi-zero-plus2/boot.cmd delete mode 100644 board/orangepi/orangepi-zero-plus2/genimage.cfg -- 2.35.1 From geomatsi at gmail.com Wed Feb 23 19:14:33 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Wed, 23 Feb 2022 22:14:33 +0300 Subject: [Buildroot] [PATCH 1/4] board/orangepi/orangepi-zero-plus2: switch to extlinux In-Reply-To: <20220223191436.3045255-1-geomatsi@gmail.com> References: <20220223191436.3045255-1-geomatsi@gmail.com> Message-ID: <20220223191436.3045255-2-geomatsi@gmail.com> Switch to extlinux instead of U-Boot boot script. Drop custom boot script and genimage config. Instead use common orangepi files from board/orangepi/common. Signed-off-by: Sergey Matyukevich --- board/orangepi/orangepi-zero-plus2/boot.cmd | 6 --- .../orangepi/orangepi-zero-plus2/genimage.cfg | 41 ------------------- configs/orangepi_zero_plus2_defconfig | 14 ++++--- 3 files changed, 8 insertions(+), 53 deletions(-) delete mode 100644 board/orangepi/orangepi-zero-plus2/boot.cmd delete mode 100644 board/orangepi/orangepi-zero-plus2/genimage.cfg diff --git a/board/orangepi/orangepi-zero-plus2/boot.cmd b/board/orangepi/orangepi-zero-plus2/boot.cmd deleted file mode 100644 index aa5162004b..0000000000 --- a/board/orangepi/orangepi-zero-plus2/boot.cmd +++ /dev/null @@ -1,6 +0,0 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=PARTLABEL=rootfs rootwait - -fatload mmc 0 $kernel_addr_r Image -fatload mmc 0 $fdt_addr_r sun50i-h5-orangepi-zero-plus2.dtb - -booti $kernel_addr_r - $fdt_addr_r diff --git a/board/orangepi/orangepi-zero-plus2/genimage.cfg b/board/orangepi/orangepi-zero-plus2/genimage.cfg deleted file mode 100644 index 5a7ee7707a..0000000000 --- a/board/orangepi/orangepi-zero-plus2/genimage.cfg +++ /dev/null @@ -1,41 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "sun50i-h5-orangepi-zero-plus2.dtb", - "boot.scr" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - # for root=PARTLABEL support - partition-table-type = "gpt" - # default GPT location conflicts with bootloaders, move it after - gpt-location = 1M - } - - partition spl { - in-partition-table = "no" - image = "u-boot-sunxi-with-spl.bin" - offset = 8K - size = 1016K # 1MB - 8KB - } - - partition boot { - partition-type-uuid = "F" - bootable = "true" - image = "boot.vfat" - } - - # 'rootfs' will be used as the partition label, used - # with root=PARTLABEL=rootfs kernel command line - partition rootfs { - partition-type-uuid = "L" - image = "rootfs.ext4" - size = 256M - } -} diff --git a/configs/orangepi_zero_plus2_defconfig b/configs/orangepi_zero_plus2_defconfig index 9d88b37ac9..ef171c3ad3 100644 --- a/configs/orangepi_zero_plus2_defconfig +++ b/configs/orangepi_zero_plus2_defconfig @@ -27,9 +27,6 @@ BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null" -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-plus2/boot.cmd" # Kernel BR2_LINUX_KERNEL=y @@ -40,6 +37,8 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-zero-plus2" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero-plus2/linux-extras.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y # wireless firmware BR2_PACKAGE_LINUX_FIRMWARE=y @@ -58,8 +57,11 @@ 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 + +# host tools BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y + +# image scripts +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-plus2/genimage.cfg" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" -- 2.35.1 From geomatsi at gmail.com Wed Feb 23 19:14:34 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Wed, 23 Feb 2022 22:14:34 +0300 Subject: [Buildroot] [PATCH 2/4] board/orangepi/orangepi-pc-plus: switch to extlinux In-Reply-To: <20220223191436.3045255-1-geomatsi@gmail.com> References: <20220223191436.3045255-1-geomatsi@gmail.com> Message-ID: <20220223191436.3045255-3-geomatsi@gmail.com> Switch to extlinux instead of U-Boot boot script. Drop custom boot script and genimage config. Instead use common orangepi files from board/orangepi/common. Signed-off-by: Sergey Matyukevich --- board/orangepi/orangepi-pc-plus/boot.cmd | 8 ---- board/orangepi/orangepi-pc-plus/genimage.cfg | 43 -------------------- configs/orangepi_pc_plus_defconfig | 9 ++-- 3 files changed, 3 insertions(+), 57 deletions(-) delete mode 100644 board/orangepi/orangepi-pc-plus/boot.cmd delete mode 100644 board/orangepi/orangepi-pc-plus/genimage.cfg diff --git a/board/orangepi/orangepi-pc-plus/boot.cmd b/board/orangepi/orangepi-pc-plus/boot.cmd deleted file mode 100644 index c91f77942f..0000000000 --- a/board/orangepi/orangepi-pc-plus/boot.cmd +++ /dev/null @@ -1,8 +0,0 @@ -setenv fdt_high ffffffff - -setenv bootargs console=ttyS0,115200 earlyprintk root=PARTLABEL=rootfs rootwait - -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun8i-h3-orangepi-pc-plus.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/orangepi/orangepi-pc-plus/genimage.cfg b/board/orangepi/orangepi-pc-plus/genimage.cfg deleted file mode 100644 index 3812d785d5..0000000000 --- a/board/orangepi/orangepi-pc-plus/genimage.cfg +++ /dev/null @@ -1,43 +0,0 @@ -# Minimal SD card image for the OrangePi PC Plus -# -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h3-orangepi-pc-plus.dtb", - "boot.scr" - } - } - - size = 10M -} - -image sdcard.img { - hdimage { - # for root=PARTLABEL support - partition-table-type = "gpt" - # default GPT location conflicts with bootloaders, move it after - gpt-location = 1M - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot-sunxi-with-spl.bin" - offset = 8K - size = 1016K # 1MB - 8KB - } - - partition boot { - partition-type-uuid = "F" - bootable = "true" - image = "boot.vfat" - } - - # 'rootfs' will be used as the partition label, used - # with root=PARTLABEL=rootfs kernel command line - partition rootfs { - partition-type-uuid = "L" - image = "rootfs.ext4" - size = 512M - } -} diff --git a/configs/orangepi_pc_plus_defconfig b/configs/orangepi_pc_plus_defconfig index c3ff8bc417..ba946e5285 100644 --- a/configs/orangepi_pc_plus_defconfig +++ b/configs/orangepi_pc_plus_defconfig @@ -14,6 +14,7 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-pc-plus" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-pc-plus/linux-extras.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set @@ -27,14 +28,10 @@ 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_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-pc-plus/boot.cmd" -BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y +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-pc-plus/genimage.cfg" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" # wireless driver and firmware BR2_PACKAGE_RTL8189FS=y -- 2.35.1 From geomatsi at gmail.com Wed Feb 23 19:14:35 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Wed, 23 Feb 2022 22:14:35 +0300 Subject: [Buildroot] [PATCH 3/4] board/orangepi/orangepi-one: switch to extlinux In-Reply-To: <20220223191436.3045255-1-geomatsi@gmail.com> References: <20220223191436.3045255-1-geomatsi@gmail.com> Message-ID: <20220223191436.3045255-4-geomatsi@gmail.com> Switch to extlinux instead of U-Boot boot script. Drop custom boot script and genimage config. Instead use common orangepi files from board/orangepi/common. Signed-off-by: Sergey Matyukevich --- board/orangepi/orangepi-one/boot.cmd | 8 ----- board/orangepi/orangepi-one/genimage.cfg | 37 ------------------------ configs/orangepi_one_defconfig | 9 ++---- 3 files changed, 3 insertions(+), 51 deletions(-) delete mode 100644 board/orangepi/orangepi-one/boot.cmd delete mode 100644 board/orangepi/orangepi-one/genimage.cfg diff --git a/board/orangepi/orangepi-one/boot.cmd b/board/orangepi/orangepi-one/boot.cmd deleted file mode 100644 index ab616e6ac9..0000000000 --- a/board/orangepi/orangepi-one/boot.cmd +++ /dev/null @@ -1,8 +0,0 @@ -setenv fdt_high ffffffff - -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun8i-h3-orangepi-one.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/orangepi/orangepi-one/genimage.cfg b/board/orangepi/orangepi-one/genimage.cfg deleted file mode 100644 index 2a14dcdec2..0000000000 --- a/board/orangepi/orangepi-one/genimage.cfg +++ /dev/null @@ -1,37 +0,0 @@ -# Minimal SD card image for the OrangePi PC -# -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h3-orangepi-one.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_one_defconfig b/configs/orangepi_one_defconfig index 1a2772a307..ba128424a0 100644 --- a/configs/orangepi_one_defconfig +++ b/configs/orangepi_one_defconfig @@ -12,6 +12,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-one" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set @@ -25,11 +26,7 @@ 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-one/boot.cmd" -BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y +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-one/genimage.cfg" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" -- 2.35.1 From geomatsi at gmail.com Wed Feb 23 19:14:36 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Wed, 23 Feb 2022 22:14:36 +0300 Subject: [Buildroot] [PATCH 4/4] DEVELOPERS: add myself for orangepi-zero-plus2 In-Reply-To: <20220223191436.3045255-1-geomatsi@gmail.com> References: <20220223191436.3045255-1-geomatsi@gmail.com> Message-ID: <20220223191436.3045255-5-geomatsi@gmail.com> Signed-off-by: Sergey Matyukevich --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index ac702d8d0f..f29e889c52 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2545,10 +2545,12 @@ F: board/linksprite/pcduino F: board/orangepi/orangepi-zero F: board/orangepi/orangepi-one F: board/orangepi/orangepi-pc-plus/ +F: board/orangepi/orangepi-zero-plus2/ F: configs/linksprite_pcduino_defconfig F: configs/orangepi_one_defconfig F: configs/orangepi_pc_plus_defconfig F: configs/orangepi_zero_defconfig +F: configs/orangepi_zero_plus2_defconfig F: package/armbian-firmware/ F: package/hostapd/ F: package/rtl8189fs/ -- 2.35.1 From bugzilla at busybox.net Wed Feb 23 19:23:10 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 23 Feb 2022 19:23:10 +0000 Subject: [Buildroot] [Bug 14601] Python build fails on 2022.02-rc2 In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14601 --- Comment #1 from Arnout Vandecappelle --- I used this defconfig: BR2_aarch64=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_PACKAGE_PYTHON3=y and make O=/var/tmp/python finishes without error. This is with current master, but there are no relevant changes since 2022.02-rc2. -- You are receiving this mail because: You are on the CC list for the bug. From giulio.benetti at benettiengineering.com Wed Feb 23 19:40:41 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 23 Feb 2022 20:40:41 +0100 Subject: [Buildroot] [PATCH 4/4] DEVELOPERS: add myself for orangepi-zero-plus2 In-Reply-To: <20220223191436.3045255-5-geomatsi@gmail.com> References: <20220223191436.3045255-1-geomatsi@gmail.com> <20220223191436.3045255-5-geomatsi@gmail.com> Message-ID: Hi Sergey, please change the subject into: 'DEVELOPERS: add Sergey Matyukevich for orangepi-zero-plus2' because if you issue: $ git log --oneline you can't know who has been added. So please send a V2. Thank you! -- Giulio Benetti Benetti Engineering sas On 23/02/22 20:14, Sergey Matyukevich wrote: > Signed-off-by: Sergey Matyukevich > --- > DEVELOPERS | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/DEVELOPERS b/DEVELOPERS > index ac702d8d0f..f29e889c52 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -2545,10 +2545,12 @@ F: board/linksprite/pcduino > F: board/orangepi/orangepi-zero > F: board/orangepi/orangepi-one > F: board/orangepi/orangepi-pc-plus/ > +F: board/orangepi/orangepi-zero-plus2/ > F: configs/linksprite_pcduino_defconfig > F: configs/orangepi_one_defconfig > F: configs/orangepi_pc_plus_defconfig > F: configs/orangepi_zero_defconfig > +F: configs/orangepi_zero_plus2_defconfig > F: package/armbian-firmware/ > F: package/hostapd/ > F: package/rtl8189fs/ From giulio.benetti at benettiengineering.com Wed Feb 23 19:48:10 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 23 Feb 2022 20:48:10 +0100 Subject: [Buildroot] [PATCH 1/4] board/orangepi/orangepi-zero-plus2: switch to extlinux In-Reply-To: <20220223191436.3045255-2-geomatsi@gmail.com> References: <20220223191436.3045255-1-geomatsi@gmail.com> <20220223191436.3045255-2-geomatsi@gmail.com> Message-ID: <02e3f0e4-8ca3-a8f4-f281-0c419e4db62b@benettiengineering.com> Hi Sergey, On 23/02/22 20:14, Sergey Matyukevich wrote: > Switch to extlinux instead of U-Boot boot script. Drop custom > boot script and genimage config. Instead use common orangepi > files from board/orangepi/common. Commit log in this patch must be improved since you do more things than in patches 2-3/4, check below > Signed-off-by: Sergey Matyukevich > --- > board/orangepi/orangepi-zero-plus2/boot.cmd | 6 --- > .../orangepi/orangepi-zero-plus2/genimage.cfg | 41 ------------------- > configs/orangepi_zero_plus2_defconfig | 14 ++++--- > 3 files changed, 8 insertions(+), 53 deletions(-) > delete mode 100644 board/orangepi/orangepi-zero-plus2/boot.cmd > delete mode 100644 board/orangepi/orangepi-zero-plus2/genimage.cfg > > diff --git a/board/orangepi/orangepi-zero-plus2/boot.cmd b/board/orangepi/orangepi-zero-plus2/boot.cmd > deleted file mode 100644 > index aa5162004b..0000000000 > --- a/board/orangepi/orangepi-zero-plus2/boot.cmd > +++ /dev/null > @@ -1,6 +0,0 @@ > -setenv bootargs console=ttyS0,115200 earlyprintk root=PARTLABEL=rootfs rootwait > - > -fatload mmc 0 $kernel_addr_r Image > -fatload mmc 0 $fdt_addr_r sun50i-h5-orangepi-zero-plus2.dtb > - > -booti $kernel_addr_r - $fdt_addr_r > diff --git a/board/orangepi/orangepi-zero-plus2/genimage.cfg b/board/orangepi/orangepi-zero-plus2/genimage.cfg > deleted file mode 100644 > index 5a7ee7707a..0000000000 > --- a/board/orangepi/orangepi-zero-plus2/genimage.cfg > +++ /dev/null > @@ -1,41 +0,0 @@ > -image boot.vfat { > - vfat { > - files = { > - "Image", > - "sun50i-h5-orangepi-zero-plus2.dtb", > - "boot.scr" > - } > - } > - > - size = 64M > -} > - > -image sdcard.img { > - hdimage { > - # for root=PARTLABEL support > - partition-table-type = "gpt" > - # default GPT location conflicts with bootloaders, move it after > - gpt-location = 1M > - } > - > - partition spl { > - in-partition-table = "no" > - image = "u-boot-sunxi-with-spl.bin" > - offset = 8K > - size = 1016K # 1MB - 8KB > - } > - > - partition boot { > - partition-type-uuid = "F" > - bootable = "true" > - image = "boot.vfat" > - } > - > - # 'rootfs' will be used as the partition label, used > - # with root=PARTLABEL=rootfs kernel command line > - partition rootfs { > - partition-type-uuid = "L" > - image = "rootfs.ext4" > - size = 256M > - } > -} > diff --git a/configs/orangepi_zero_plus2_defconfig b/configs/orangepi_zero_plus2_defconfig > index 9d88b37ac9..ef171c3ad3 100644 > --- a/configs/orangepi_zero_plus2_defconfig > +++ b/configs/orangepi_zero_plus2_defconfig > @@ -27,9 +27,6 @@ BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > BR2_TARGET_UBOOT_SPL=y > BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" > BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null" > -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-plus2/boot.cmd" > > # Kernel > BR2_LINUX_KERNEL=y > @@ -40,6 +37,8 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-zero-plus2" > BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero-plus2/linux-extras.config" > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y Is this ^^^ needed only for this board? Because on the others there is not > # wireless firmware > BR2_PACKAGE_LINUX_FIRMWARE=y > @@ -58,8 +57,11 @@ 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 > + > +# host tools Here you beautify > BR2_PACKAGE_HOST_GENIMAGE=y > -BR2_PACKAGE_HOST_MTOOLS=y > + > +# image scripts Ditto, so worth mention it in commit log > +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-plus2/genimage.cfg" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" Best regards -- Giulio Benetti Benetti Engineering sas From peter at korsgaard.com Wed Feb 23 19:54:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Feb 2022 20:54:00 +0100 Subject: [Buildroot] [PATCH v1 1/1] configs/zynqmp_zcu10x: fix U-Boot dts config In-Reply-To: (Luca Ceresoli's message of "Wed, 23 Feb 2022 17:54:56 +0100") References: <20220223125118.2325363-1-neal.frager@xilinx.com> Message-ID: <871qzt5pgn.fsf@dell.be.48ers.dk> >>>>> "Luca" == Luca Ceresoli writes: > Hi Neal, > On 23/02/22 13:51, Neal Frager wrote: >> This patch: >> - fixes U-Boot issue when DEVICE_TREE environment variable undefined > This appears unrelated from the version bumps. Please send separate patches. >> - bumps U-Boot to Xilinx 2022.01-171 >> - bumps Linux to Xilinx 5.15-945 I don't have the zcu106 here anymore, but this new kernel didn't boot here (no output after 'Starting Linux'). Does it boot for you? -- Bye, Peter Korsgaard From arnout at mind.be Wed Feb 23 20:03:02 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 23 Feb 2022 21:03:02 +0100 Subject: [Buildroot] [PATCH 2/2] package/weston: drop fbdev In-Reply-To: <20220214193940.3615904-2-fontaine.fabrice@gmail.com> References: <20220214193940.3615904-1-fontaine.fabrice@gmail.com> <20220214193940.3615904-2-fontaine.fabrice@gmail.com> Message-ID: <8040cc3b-bb83-1a50-335e-3bdc4c1b32ef@mind.be> On 14/02/2022 20:39, Fabrice Fontaine wrote: > fbdev raises the following build failure since bump to version 10.0.0 in > commit f67a6e9b7a7be9adbc405b3126000056120a01af and > https://gitlab.freedesktop.org/wayland/weston/-/commit/6338dbd5816689b2f08f48b359a972e16ff038d8: > > ../output-1/build/weston-10.0.0/meson.build:133:7: ERROR: Tried to access unknown option 'backend-fbdev'. > > Drop fbdev to avoid this build failure as upstream is reluctant to > properly fix this issue by renaming the fbdev option in stable release: > https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/791 Reading that, it seems that only the option BR2_PACKAGE_WESTON_DEFAULT_FBDEV is broken and we could keep BR2_PACKAGE_WESTON_FBDEV. However, it makes sense to remove this deprecated option anyway, so applied both to master, thanks. Regards, Arnout > > Fixes: > - http://autobuild.buildroot.org/results/e669a6237c19783c627169c819d7372e20daaf54 > > Signed-off-by: Fabrice Fontaine > --- > Config.in.legacy | 12 ++++++++++++ > package/weston/Config.in | 8 -------- > package/weston/weston.mk | 6 ------ > 3 files changed, 12 insertions(+), 14 deletions(-) > > diff --git a/Config.in.legacy b/Config.in.legacy > index aefb0ba6ea..b90b9dbcbc 100644 > --- a/Config.in.legacy > +++ b/Config.in.legacy > @@ -146,6 +146,18 @@ endif > > comment "Legacy options removed in 2022.02" > > +config BR2_PACKAGE_WESTON_DEFAULT_FBDEV > + bool "weston fbdev removed" > + select BR2_LEGACY > + help > + fbdev was deprecated in weston 10.0.0. > + > +config BR2_PACKAGE_WESTON_FBDEV > + bool "weston fbdev compositor removed" > + select BR2_LEGACY > + help > + fbdev compositor was deprecated in weston 10.0.0. > + > config BR2_PACKAGE_LINUX_TOOLS_BPFTOOL > bool "bpftool was moved" > select BR2_LEGACY > diff --git a/package/weston/Config.in b/package/weston/Config.in > index 073a3ae567..6ad8241caa 100644 > --- a/package/weston/Config.in > +++ b/package/weston/Config.in > @@ -34,10 +34,6 @@ if BR2_PACKAGE_WESTON > choice > prompt "default compositor" > > -config BR2_PACKAGE_WESTON_DEFAULT_FBDEV > - bool "fbdev (deprecated)" > - select BR2_PACKAGE_WESTON_FBDEV > - > config BR2_PACKAGE_WESTON_DEFAULT_DRM > bool "drm" > select BR2_PACKAGE_WESTON_DRM > @@ -62,7 +58,6 @@ endchoice > > config BR2_PACKAGE_WESTON_DEFAULT_COMPOSITOR > string > - default "fbdev" if BR2_PACKAGE_WESTON_DEFAULT_FBDEV > default "drm" if BR2_PACKAGE_WESTON_DEFAULT_DRM > default "headless" if BR2_PACKAGE_WESTON_DEFAULT_HEADLESS > default "wayland" if BR2_PACKAGE_WESTON_DEFAULT_WAYLAND > @@ -71,9 +66,6 @@ config BR2_PACKAGE_WESTON_DEFAULT_COMPOSITOR > config BR2_PACKAGE_WESTON_DRM > bool "DRM compositor" > > -config BR2_PACKAGE_WESTON_FBDEV > - bool "fbdev compositor (deprecated)" > - > # FreeRDP needs threads and !static, already the case for weston > config BR2_PACKAGE_WESTON_RDP > bool "RDP compositor" > diff --git a/package/weston/weston.mk b/package/weston/weston.mk > index a0a18d9358..90cf160688 100644 > --- a/package/weston/weston.mk > +++ b/package/weston/weston.mk > @@ -85,12 +85,6 @@ else > WESTON_CONF_OPTS += -Dbackend-rdp=false > endif > > -ifeq ($(BR2_PACKAGE_WESTON_FBDEV),y) > -WESTON_CONF_OPTS += -Ddeprecated-backend-fbdev=true > -else > -WESTON_CONF_OPTS += -Ddeprecated-backend-fbdev=false > -endif > - > ifeq ($(BR2_PACKAGE_WESTON_DRM),y) > WESTON_CONF_OPTS += -Dbackend-drm=true > else From arnout at mind.be Wed Feb 23 19:59:05 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 23 Feb 2022 20:59:05 +0100 Subject: [Buildroot] [git commit] package/weston: drop GBM dependency from DRM option Message-ID: <20220223195526.449A383878@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=833f79fdeff1433396b7fa680fb6cbd6f1c65f36 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master upstream advocated that DRM backend can be built without GBM: https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/791 so drop dependencies on BR2_PACKAGE_MESA3D_OPENGL_EGL || BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL to allow DRM to be the default backend when fbdev will be removed in the follow-up patch Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/weston/Config.in | 9 --------- 1 file changed, 9 deletions(-) diff --git a/package/weston/Config.in b/package/weston/Config.in index d45e50baaa..073a3ae567 100644 --- a/package/weston/Config.in +++ b/package/weston/Config.in @@ -40,12 +40,8 @@ config BR2_PACKAGE_WESTON_DEFAULT_FBDEV config BR2_PACKAGE_WESTON_DEFAULT_DRM bool "drm" - depends on BR2_PACKAGE_MESA3D_OPENGL_EGL || BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL select BR2_PACKAGE_WESTON_DRM -comment "drm backend needs mesa3d w/ EGL driver" - depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL && !BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL - config BR2_PACKAGE_WESTON_DEFAULT_HEADLESS bool "headless" select BR2_PACKAGE_WESTON_HEADLESS @@ -74,11 +70,6 @@ config BR2_PACKAGE_WESTON_DEFAULT_COMPOSITOR config BR2_PACKAGE_WESTON_DRM bool "DRM compositor" - depends on BR2_PACKAGE_MESA3D_OPENGL_EGL || BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL - -# Uses libgbm from mesa3d -comment "DRM compositor needs an OpenGL EGL backend provided by mesa3d" - depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL && !BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL config BR2_PACKAGE_WESTON_FBDEV bool "fbdev compositor (deprecated)" From arnout at mind.be Wed Feb 23 19:59:59 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 23 Feb 2022 20:59:59 +0100 Subject: [Buildroot] [git commit] package/weston: drop fbdev Message-ID: <20220223195526.5059C83879@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=72021742574acd4d43ee1977cd2af3133245787a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master fbdev raises the following build failure since bump to version 10.0.0 in commit f67a6e9b7a7be9adbc405b3126000056120a01af and https://gitlab.freedesktop.org/wayland/weston/-/commit/6338dbd5816689b2f08f48b359a972e16ff038d8: ../output-1/build/weston-10.0.0/meson.build:133:7: ERROR: Tried to access unknown option 'backend-fbdev'. Drop fbdev to avoid this build failure as upstream is reluctant to properly fix this issue by renaming the fbdev option in stable release: https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/791 Fixes: - http://autobuild.buildroot.org/results/e669a6237c19783c627169c819d7372e20daaf54 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- Config.in.legacy | 12 ++++++++++++ package/weston/Config.in | 8 -------- package/weston/weston.mk | 6 ------ 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index aefb0ba6ea..b90b9dbcbc 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,18 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_WESTON_DEFAULT_FBDEV + bool "weston fbdev removed" + select BR2_LEGACY + help + fbdev was deprecated in weston 10.0.0. + +config BR2_PACKAGE_WESTON_FBDEV + bool "weston fbdev compositor removed" + select BR2_LEGACY + help + fbdev compositor was deprecated in weston 10.0.0. + config BR2_PACKAGE_LINUX_TOOLS_BPFTOOL bool "bpftool was moved" select BR2_LEGACY diff --git a/package/weston/Config.in b/package/weston/Config.in index 073a3ae567..6ad8241caa 100644 --- a/package/weston/Config.in +++ b/package/weston/Config.in @@ -34,10 +34,6 @@ if BR2_PACKAGE_WESTON choice prompt "default compositor" -config BR2_PACKAGE_WESTON_DEFAULT_FBDEV - bool "fbdev (deprecated)" - select BR2_PACKAGE_WESTON_FBDEV - config BR2_PACKAGE_WESTON_DEFAULT_DRM bool "drm" select BR2_PACKAGE_WESTON_DRM @@ -62,7 +58,6 @@ endchoice config BR2_PACKAGE_WESTON_DEFAULT_COMPOSITOR string - default "fbdev" if BR2_PACKAGE_WESTON_DEFAULT_FBDEV default "drm" if BR2_PACKAGE_WESTON_DEFAULT_DRM default "headless" if BR2_PACKAGE_WESTON_DEFAULT_HEADLESS default "wayland" if BR2_PACKAGE_WESTON_DEFAULT_WAYLAND @@ -71,9 +66,6 @@ config BR2_PACKAGE_WESTON_DEFAULT_COMPOSITOR config BR2_PACKAGE_WESTON_DRM bool "DRM compositor" -config BR2_PACKAGE_WESTON_FBDEV - bool "fbdev compositor (deprecated)" - # FreeRDP needs threads and !static, already the case for weston config BR2_PACKAGE_WESTON_RDP bool "RDP compositor" diff --git a/package/weston/weston.mk b/package/weston/weston.mk index a0a18d9358..90cf160688 100644 --- a/package/weston/weston.mk +++ b/package/weston/weston.mk @@ -85,12 +85,6 @@ else WESTON_CONF_OPTS += -Dbackend-rdp=false endif -ifeq ($(BR2_PACKAGE_WESTON_FBDEV),y) -WESTON_CONF_OPTS += -Ddeprecated-backend-fbdev=true -else -WESTON_CONF_OPTS += -Ddeprecated-backend-fbdev=false -endif - ifeq ($(BR2_PACKAGE_WESTON_DRM),y) WESTON_CONF_OPTS += -Dbackend-drm=true else From arnout at mind.be Wed Feb 23 20:05:42 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 23 Feb 2022 21:05:42 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/ghostscript: disable tesseract In-Reply-To: <20220214212301.4142823-1-fontaine.fabrice@gmail.com> References: <20220214212301.4142823-1-fontaine.fabrice@gmail.com> Message-ID: On 14/02/2022 22:23, Fabrice Fontaine wrote: > ghostscript embeds a local copy of tesseract-ocr which is enabled by > default since version 9.53.0 and > https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=7322ef87546c55b29056c1d96d8bdbb7f3ba53ef > > Since version 9.55.0 and > https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=5459f7aca1ded3b7cf96c339a2419f418aa406c7, > ghostscript expects that tesseract is disabled if threads are not > available resulting in the following build failure since commit > 7a4944569ce83b0b7b0cabd6e8aa184b8cb72a22: > > configure: error: Threading disabled or not available. Tesseract OCR relies on threading. Rerun configure with "--without-tesseract" to exclude OCR from the build > > So disable tesseract as there is no way to tell ghostscript to use a > system provided tesseract-ocr package I understand that v1 of this patch was not OK for that reason. However, we can't we keep on using the bundled tesseract in a build with threads? Regards, Arnout > > Fixes: > - http://autobuild.buildroot.org/results/fd35a47b2a77cf57c243ec1c88802b53ddca8f52 > > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2: > - Unconditionally disable tesseract > > package/ghostscript/ghostscript.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/ghostscript/ghostscript.mk b/package/ghostscript/ghostscript.mk > index 24a0c489a8..b2e5fe16bb 100644 > --- a/package/ghostscript/ghostscript.mk > +++ b/package/ghostscript/ghostscript.mk > @@ -44,6 +44,7 @@ GHOSTSCRIPT_CONF_OPTS = \ > --disable-gtk \ > --without-libpaper \ > --without-pdf \ > + --without-tesseract \ > --with-system-libtiff > > ifeq ($(BR2_PACKAGE_JBIG2DEC),y) From peter at korsgaard.com Wed Feb 23 20:06:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Feb 2022 21:06:39 +0100 Subject: [Buildroot] [PATCH v4 1/1] configs/zynqmp_zcu10x: fix U-Boot dts config In-Reply-To: <20220223180336.3372352-1-neal.frager@xilinx.com> (Neal Frager's message of "Wed, 23 Feb 2022 11:03:36 -0700") References: <20220223180336.3372352-1-neal.frager@xilinx.com> Message-ID: <87wnhl4ab4.fsf@dell.be.48ers.dk> >>>>> "Neal" == Neal Frager writes: > This patch: > - fixes U-Boot issue when DEVICE_TREE environment variable is not defined > Signed-off-by: Neal Frager > Reviewed-by: Peter Korsgaard > Reviewed-by: Luca Ceresoli > Tested-by: Peter Korsgaard > --- V1-> V2: > - removed version bumps from patch > - removed unnecessary blank lines from uboot-fragment.config files V2-> V3: > - fixed typo in zynqmp_zcu106_defconfig V3-> V4: > - re-added patch notes > --- > board/zynqmp/zcu102/uboot-fragment.config | 1 + > board/zynqmp/zcu106/uboot-fragment.config | 1 + Most (but not all) fragment files are using the .fragment suffix, so I renamed these to uboot.fragment. I dropped the reviewed-by and reworded the commit text a bit and committed - Thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 23 20:07:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Feb 2022 21:07:20 +0100 Subject: [Buildroot] [git commit] configs/zynqmp_zcu10x: fix U-Boot dts config Message-ID: <20220223200101.63F7383888@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=14b9a100eff6ee58d57b9b7b4c0da9a648a7e1bf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add a U-Boot config fragment to set the correct control device tree file for each board, rather than using the default (zcu100). Signed-off-by: Neal Frager Tested-by: Peter Korsgaard [Peter: reword commit message, rename fragment files] Signed-off-by: Peter Korsgaard --- board/zynqmp/zcu102/uboot.fragment | 1 + board/zynqmp/zcu106/uboot.fragment | 1 + configs/zynqmp_zcu102_defconfig | 1 + configs/zynqmp_zcu106_defconfig | 1 + 4 files changed, 4 insertions(+) diff --git a/board/zynqmp/zcu102/uboot.fragment b/board/zynqmp/zcu102/uboot.fragment new file mode 100644 index 0000000000..52d6d9dff8 --- /dev/null +++ b/board/zynqmp/zcu102/uboot.fragment @@ -0,0 +1 @@ +CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu102-rev1.0" diff --git a/board/zynqmp/zcu106/uboot.fragment b/board/zynqmp/zcu106/uboot.fragment new file mode 100644 index 0000000000..cd571171ac --- /dev/null +++ b/board/zynqmp/zcu106/uboot.fragment @@ -0,0 +1 @@ +CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu106-revA" diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig index 298ce2388c..4e96489179 100644 --- a/configs/zynqmp_zcu102_defconfig +++ b/configs/zynqmp_zcu102_defconfig @@ -25,6 +25,7 @@ BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2022.01-165-g667001319cbe511ce6353195fb4910ae5cb041ce" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/zcu102/uboot.fragment" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index 3e51cbfaab..0a97975aa0 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -25,6 +25,7 @@ BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2022.01-165-g667001319cbe511ce6353195fb4910ae5cb041ce" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/zcu106/uboot.fragment" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y From arnout at mind.be Wed Feb 23 20:09:27 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 23 Feb 2022 21:09:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5webkit: disable sampling profiler on musl In-Reply-To: <20220215134110.2365539-1-fontaine.fabrice@gmail.com> References: <20220215134110.2365539-1-fontaine.fabrice@gmail.com> Message-ID: <0517cc72-6918-18ec-f046-bfc2ec85da38@mind.be> On 15/02/2022 14:41, Fabrice Fontaine wrote: > Disable sampling profiler on musl to avoid the following build falure > raised since bump to version 5.212.0-alpha4 in commit > df0b0fe6919c0d0f3750f439a3cfa765232bd569: > > /home/buildroot/autobuild/instance-0/output-1/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/heap/MachineStackMarker.cpp:686:2: error: #error Need a way to get the frame pointer for another thread on this platform > 686 | #error Need a way to get the frame pointer for another thread on this platform > | ^~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/87f52db7f8ebefa4c1ae3dd70d4a7a460f9aca35 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/qt5/qt5webkit/qt5webkit.mk | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk > index 2084f3af52..024184e267 100644 > --- a/package/qt5/qt5webkit/qt5webkit.mk > +++ b/package/qt5/qt5webkit/qt5webkit.mk > @@ -39,6 +39,10 @@ ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) > QT5WEBKIT_DEPENDENCIES += qt5declarative > endif > > +ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) > +QT5WEBKIT_CONF_OPTS += -DENABLE_SAMPLING_PROFILER=OFF > +endif > + > QT5WEBKIT_CONF_OPTS += \ > -DENABLE_TOOLS=OFF \ > -DPORT=Qt \ From fontaine.fabrice at gmail.com Wed Feb 23 20:10:04 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 23 Feb 2022 21:10:04 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/ghostscript: disable tesseract In-Reply-To: References: <20220214212301.4142823-1-fontaine.fabrice@gmail.com> Message-ID: Le mer. 23 f?vr. 2022 ? 21:05, Arnout Vandecappelle a ?crit : > > > > On 14/02/2022 22:23, Fabrice Fontaine wrote: > > ghostscript embeds a local copy of tesseract-ocr which is enabled by > > default since version 9.53.0 and > > https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=7322ef87546c55b29056c1d96d8bdbb7f3ba53ef > > > > Since version 9.55.0 and > > https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=5459f7aca1ded3b7cf96c339a2419f418aa406c7, > > ghostscript expects that tesseract is disabled if threads are not > > available resulting in the following build failure since commit > > 7a4944569ce83b0b7b0cabd6e8aa184b8cb72a22: > > > > configure: error: Threading disabled or not available. Tesseract OCR relies on threading. Rerun configure with "--without-tesseract" to exclude OCR from the build > > > > So disable tesseract as there is no way to tell ghostscript to use a > > system provided tesseract-ocr package > > I understand that v1 of this patch was not OK for that reason. However, we > can't we keep on using the bundled tesseract in a build with threads? Why not, I'll send a v3. > > Regards, > Arnout > > > > > Fixes: > > - http://autobuild.buildroot.org/results/fd35a47b2a77cf57c243ec1c88802b53ddca8f52 > > > > Signed-off-by: Fabrice Fontaine > > --- > > Changes v1 -> v2: > > - Unconditionally disable tesseract > > > > package/ghostscript/ghostscript.mk | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/package/ghostscript/ghostscript.mk b/package/ghostscript/ghostscript.mk > > index 24a0c489a8..b2e5fe16bb 100644 > > --- a/package/ghostscript/ghostscript.mk > > +++ b/package/ghostscript/ghostscript.mk > > @@ -44,6 +44,7 @@ GHOSTSCRIPT_CONF_OPTS = \ > > --disable-gtk \ > > --without-libpaper \ > > --without-pdf \ > > + --without-tesseract \ > > --with-system-libtiff > > > > ifeq ($(BR2_PACKAGE_JBIG2DEC),y) Best Regards, Fabrice From arnout at mind.be Wed Feb 23 20:09:59 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 23 Feb 2022 21:09:59 +0100 Subject: [Buildroot] [git commit] package/qt5/qt5webkit: disable sampling profiler on musl Message-ID: <20220223200227.48F9183893@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1636f604bd61aa9ddd804ce174a51ee41db7e9d6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Disable sampling profiler on musl to avoid the following build falure raised since bump to version 5.212.0-alpha4 in commit df0b0fe6919c0d0f3750f439a3cfa765232bd569: /home/buildroot/autobuild/instance-0/output-1/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/heap/MachineStackMarker.cpp:686:2: error: #error Need a way to get the frame pointer for another thread on this platform 686 | #error Need a way to get the frame pointer for another thread on this platform | ^~~~~ Fixes: - http://autobuild.buildroot.org/results/87f52db7f8ebefa4c1ae3dd70d4a7a460f9aca35 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/qt5/qt5webkit/qt5webkit.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk index 2e96acc00f..6401c39d3d 100644 --- a/package/qt5/qt5webkit/qt5webkit.mk +++ b/package/qt5/qt5webkit/qt5webkit.mk @@ -42,6 +42,10 @@ ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) QT5WEBKIT_DEPENDENCIES += libexecinfo endif +ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) +QT5WEBKIT_CONF_OPTS += -DENABLE_SAMPLING_PROFILER=OFF +endif + QT5WEBKIT_CONF_OPTS += \ -DENABLE_TOOLS=OFF \ -DPORT=Qt \ From arnout at mind.be Wed Feb 23 20:13:46 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 23 Feb 2022 21:13:46 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/bluez5_utils: fix build with glibc < 2.25 In-Reply-To: <20220215224039.3567741-1-fontaine.fabrice@gmail.com> References: <20220215224039.3567741-1-fontaine.fabrice@gmail.com> Message-ID: On 15/02/2022 23:40, Fabrice Fontaine wrote: > Fix the following build failure with glibc < 2.25 raised since bump to > version 5.63 in commit d4c6cf4b1fc0f34e72ff047e76de53d3634f5184: > > plugins/autopair.c:20:24: fatal error: sys/random.h: No such file or directory > #include > ^ > > Fixes: > - http://autobuild.buildroot.org/results/6b8870d12e0804d6154230a7322c49416c1dc0e2 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. I've also updated the comment about AUTORECONF to say that both Makefile.am and configure.ac are patched. Regards, Arnout > --- > Changes v1 -> v2: > - Use upstream patch > > ...005-build-Fix-errors-with-glibc-2-25.patch | 312 ++++++++++++++++++ > 1 file changed, 312 insertions(+) > create mode 100644 package/bluez5_utils/0005-build-Fix-errors-with-glibc-2-25.patch > > diff --git a/package/bluez5_utils/0005-build-Fix-errors-with-glibc-2-25.patch b/package/bluez5_utils/0005-build-Fix-errors-with-glibc-2-25.patch > new file mode 100644 > index 0000000000..13033da7b2 > --- /dev/null > +++ b/package/bluez5_utils/0005-build-Fix-errors-with-glibc-2-25.patch > @@ -0,0 +1,312 @@ > +From fb57ad9b9d107856e5f1c8135da04ffa2f7a11ac Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Mon, 14 Feb 2022 21:17:39 +0100 > +Subject: build: Fix errors with glibc < 2.25 > + > +getrandom and sys/random.h are only available since glibc 2.25: > +https://www.gnu.org/software/gnulib/manual/html_node/sys_002frandom_002eh.html > +resulting in the following build failures since version 5.63 and > +https://git.kernel.org/pub/scm/bluetooth/bluez.git/log/?qt=grep&q=getrandom: > + > +plugins/autopair.c:20:24: fatal error: sys/random.h: No such file or directory > + #include > + ^ > + > +To fix this build failure, add util_getrandom and a fallback (borrowed > +from pipewire and licensed under MIT): > +https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/master/src/pipewire/utils.c > + > +Fixes: > + - http://autobuild.buildroot.org/results/6b8870d12e0804d6154230a7322c49416c1dc0e2 > + > +[Retrieved from: > +https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=fb57ad9b9d107856e5f1c8135da04ffa2f7a11ac] > +Signed-off-by: Fabrice Fontaine > +--- > + configure.ac | 4 +++- > + emulator/le.c | 3 +-- > + emulator/phy.c | 3 +-- > + peripheral/main.c | 4 ++-- > + plugins/autopair.c | 4 ++-- > + profiles/health/hdp.c | 4 ++-- > + profiles/health/mcap.c | 6 +++--- > + src/shared/util.c | 25 +++++++++++++++++++++++++ > + src/shared/util.h | 2 ++ > + tools/btgatt-server.c | 3 +-- > + 10 files changed, 42 insertions(+), 16 deletions(-) > + > +diff --git a/configure.ac b/configure.ac > +index 07d068a4d..441bd5f29 100644 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -54,6 +54,8 @@ AC_ARG_ENABLE(threads, AS_HELP_STRING([--enable-threads], > + > + AC_CHECK_FUNCS(explicit_bzero) > + > ++AC_CHECK_FUNCS(getrandom) > ++ > + AC_CHECK_FUNCS(rawmemchr) > + > + AC_CHECK_FUNC(signalfd, dummy=yes, > +@@ -68,7 +70,7 @@ AC_CHECK_LIB(pthread, pthread_create, dummy=yes, > + AC_CHECK_LIB(dl, dlopen, dummy=yes, > + AC_MSG_ERROR(dynamic linking loader is required)) > + > +-AC_CHECK_HEADERS(linux/types.h linux/if_alg.h linux/uinput.h linux/uhid.h) > ++AC_CHECK_HEADERS(linux/types.h linux/if_alg.h linux/uinput.h linux/uhid.h sys/random.h) > + > + PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.28, dummy=yes, > + AC_MSG_ERROR(GLib >= 2.28 is required)) > +diff --git a/emulator/le.c b/emulator/le.c > +index f8f313f2c..7656a657c 100644 > +--- a/emulator/le.c > ++++ b/emulator/le.c > +@@ -20,7 +20,6 @@ > + #include > + #include > + #include > +-#include > + #include > + > + #include "lib/bluetooth.h" > +@@ -509,7 +508,7 @@ static unsigned int get_adv_delay(void) > + /* The advertising delay is a pseudo-random value with a range > + * of 0 ms to 10 ms generated for each advertising event. > + */ > +- if (getrandom(&val, sizeof(val), 0) < 0) { > ++ if (util_getrandom(&val, sizeof(val), 0) < 0) { > + /* If it fails to get the random number, use a static value */ > + val = 5; > + } > +diff --git a/emulator/phy.c b/emulator/phy.c > +index 44cace438..7de85fb05 100644 > +--- a/emulator/phy.c > ++++ b/emulator/phy.c > +@@ -19,7 +19,6 @@ > + #include > + #include > + #include > +-#include > + #include > + #include > + #include > +@@ -174,7 +173,7 @@ struct bt_phy *bt_phy_new(void) > + mainloop_add_fd(phy->rx_fd, EPOLLIN, phy_rx_callback, phy, NULL); > + > + if (!get_random_bytes(&phy->id, sizeof(phy->id))) { > +- if (getrandom(&phy->id, sizeof(phy->id), 0) < 0) { > ++ if (util_getrandom(&phy->id, sizeof(phy->id), 0) < 0) { > + mainloop_remove_fd(phy->rx_fd); > + close(phy->tx_fd); > + close(phy->rx_fd); > +diff --git a/peripheral/main.c b/peripheral/main.c > +index 91adb45fc..b82d7caf6 100644 > +--- a/peripheral/main.c > ++++ b/peripheral/main.c > +@@ -25,13 +25,13 @@ > + #include > + #include > + #include > +-#include > + > + #ifndef WAIT_ANY > + #define WAIT_ANY (-1) > + #endif > + > + #include "src/shared/mainloop.h" > ++#include "src/shared/util.h" > + #include "peripheral/efivars.h" > + #include "peripheral/attach.h" > + #include "peripheral/gap.h" > +@@ -192,7 +192,7 @@ int main(int argc, char *argv[]) > + addr, 6) < 0) { > + printf("Generating new persistent static address\n"); > + > +- if (getrandom(addr, sizeof(addr), 0) < 0) { > ++ if (util_getrandom(addr, sizeof(addr), 0) < 0) { > + perror("Failed to get random static address"); > + return EXIT_FAILURE; > + } > +diff --git a/plugins/autopair.c b/plugins/autopair.c > +index a75ecebe4..0b09e893f 100644 > +--- a/plugins/autopair.c > ++++ b/plugins/autopair.c > +@@ -17,7 +17,6 @@ > + #include > + #include > + #include > +-#include > + > + #include > + > +@@ -29,6 +28,7 @@ > + #include "src/device.h" > + #include "src/log.h" > + #include "src/storage.h" > ++#include "src/shared/util.h" > + > + /* > + * Plugin to handle automatic pairing of devices with reduced user > +@@ -131,7 +131,7 @@ static ssize_t autopair_pincb(struct btd_adapter *adapter, > + if (attempt >= 4) > + return 0; > + > +- if (getrandom(&val, sizeof(val), 0) < 0) { > ++ if (util_getrandom(&val, sizeof(val), 0) < 0) { > + error("Failed to get a random pincode"); > + return 0; > + } > +diff --git a/profiles/health/hdp.c b/profiles/health/hdp.c > +index 9d9d1e824..b6590cd3a 100644 > +--- a/profiles/health/hdp.c > ++++ b/profiles/health/hdp.c > +@@ -16,7 +16,6 @@ > + #include > + #include > + #include > +-#include > + > + #include > + > +@@ -33,6 +32,7 @@ > + #include "src/device.h" > + #include "src/sdpd.h" > + #include "src/shared/timeout.h" > ++#include "src/shared/util.h" > + #include "btio/btio.h" > + > + #include "hdp_types.h" > +@@ -1490,7 +1490,7 @@ static void *generate_echo_packet(void) > + if (!buf) > + return NULL; > + > +- if (getrandom(buf, HDP_ECHO_LEN, 0) < 0) { > ++ if (util_getrandom(buf, HDP_ECHO_LEN, 0) < 0) { > + g_free(buf); > + return NULL; > + } > +diff --git a/profiles/health/mcap.c b/profiles/health/mcap.c > +index aad0a08a3..5d2bac3d9 100644 > +--- a/profiles/health/mcap.c > ++++ b/profiles/health/mcap.c > +@@ -19,7 +19,6 @@ > + #include > + #include > + #include > +-#include > + > + #include > + > +@@ -28,6 +27,7 @@ > + #include "btio/btio.h" > + #include "src/log.h" > + #include "src/shared/timeout.h" > ++#include "src/shared/util.h" > + > + #include "mcap.h" > + > +@@ -1905,7 +1905,7 @@ gboolean mcap_create_mcl(struct mcap_instance *mi, > + mcl->state = MCL_IDLE; > + bacpy(&mcl->addr, addr); > + set_default_cb(mcl); > +- if (getrandom(&val, sizeof(val), 0) < 0) { > ++ if (util_getrandom(&val, sizeof(val), 0) < 0) { > + mcap_instance_unref(mcl->mi); > + g_free(mcl); > + return FALSE; > +@@ -2049,7 +2049,7 @@ static void connect_mcl_event_cb(GIOChannel *chan, GError *gerr, > + mcl->mi = mcap_instance_ref(mi); > + bacpy(&mcl->addr, &dst); > + set_default_cb(mcl); > +- if (getrandom(&val, sizeof(val), 0) < 0) { > ++ if (util_getrandom(&val, sizeof(val), 0) < 0) { > + mcap_instance_unref(mcl->mi); > + g_free(mcl); > + goto drop; > +diff --git a/src/shared/util.c b/src/shared/util.c > +index 6e1c83057..33196bf8b 100644 > +--- a/src/shared/util.c > ++++ b/src/shared/util.c > +@@ -13,6 +13,7 @@ > + #endif > + > + #define _GNU_SOURCE > ++#include > + #include > + #include > + #include > +@@ -23,6 +24,10 @@ > + #include > + #include > + > ++#ifdef HAVE_SYS_RANDOM_H > ++#include > ++#endif > ++ > + #include "src/shared/util.h" > + > + void *util_malloc(size_t size) > +@@ -138,6 +143,26 @@ unsigned char util_get_dt(const char *parent, const char *name) > + return DT_UNKNOWN; > + } > + > ++/* Helper for getting a random in case getrandom unavailable (glibc < 2.25) */ > ++ssize_t util_getrandom(void *buf, size_t buflen, unsigned int flags) > ++{ > ++#ifdef HAVE_GETRANDOM > ++ return getrandom(buf, buflen, flags); > ++#else > ++ int fd; > ++ ssize_t bytes; > ++ > ++ fd = open("/dev/urandom", O_CLOEXEC); > ++ if (fd < 0) > ++ return -1; > ++ > ++ bytes = read(fd, buf, buflen); > ++ close(fd); > ++ > ++ return bytes; > ++#endif > ++} > ++ > + /* Helpers for bitfield operations */ > + > + /* Find unique id in range from 1 to max but no bigger than 64. */ > +diff --git a/src/shared/util.h b/src/shared/util.h > +index 8ef6132c4..c01eccf8a 100644 > +--- a/src/shared/util.h > ++++ b/src/shared/util.h > +@@ -103,6 +103,8 @@ void util_hexdump(const char dir, const unsigned char *buf, size_t len, > + > + unsigned char util_get_dt(const char *parent, const char *name); > + > ++ssize_t util_getrandom(void *buf, size_t buflen, unsigned int flags); > ++ > + uint8_t util_get_uid(uint64_t *bitmap, uint8_t max); > + void util_clear_uid(uint64_t *bitmap, uint8_t id); > + > +diff --git a/tools/btgatt-server.c b/tools/btgatt-server.c > +index 15d49a464..4a5d2b720 100644 > +--- a/tools/btgatt-server.c > ++++ b/tools/btgatt-server.c > +@@ -20,7 +20,6 @@ > + #include > + #include > + #include > +-#include > + > + #include "lib/bluetooth.h" > + #include "lib/hci.h" > +@@ -287,7 +286,7 @@ static bool hr_msrmt_cb(void *user_data) > + uint32_t cur_ee; > + uint32_t val; > + > +- if (getrandom(&val, sizeof(val), 0) < 0) > ++ if (util_getrandom(&val, sizeof(val), 0) < 0) > + return false; > + > + pdu[0] = 0x06; > +-- > +cgit > + From arnout at mind.be Wed Feb 23 20:12:40 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 23 Feb 2022 21:12:40 +0100 Subject: [Buildroot] [git commit] package/bluez5_utils: fix build with glibc < 2.25 Message-ID: <20220223200600.3BB998389E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6fc5c8e92c1d7997e48b207187d2d3c7ad42819c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with glibc < 2.25 raised since bump to version 5.63 in commit d4c6cf4b1fc0f34e72ff047e76de53d3634f5184: plugins/autopair.c:20:24: fatal error: sys/random.h: No such file or directory #include ^ Fixes: - http://autobuild.buildroot.org/results/6b8870d12e0804d6154230a7322c49416c1dc0e2 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../0005-build-Fix-errors-with-glibc-2-25.patch | 312 +++++++++++++++++++++ package/bluez5_utils/bluez5_utils.mk | 2 +- 2 files changed, 313 insertions(+), 1 deletion(-) diff --git a/package/bluez5_utils/0005-build-Fix-errors-with-glibc-2-25.patch b/package/bluez5_utils/0005-build-Fix-errors-with-glibc-2-25.patch new file mode 100644 index 0000000000..13033da7b2 --- /dev/null +++ b/package/bluez5_utils/0005-build-Fix-errors-with-glibc-2-25.patch @@ -0,0 +1,312 @@ +From fb57ad9b9d107856e5f1c8135da04ffa2f7a11ac Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 14 Feb 2022 21:17:39 +0100 +Subject: build: Fix errors with glibc < 2.25 + +getrandom and sys/random.h are only available since glibc 2.25: +https://www.gnu.org/software/gnulib/manual/html_node/sys_002frandom_002eh.html +resulting in the following build failures since version 5.63 and +https://git.kernel.org/pub/scm/bluetooth/bluez.git/log/?qt=grep&q=getrandom: + +plugins/autopair.c:20:24: fatal error: sys/random.h: No such file or directory + #include + ^ + +To fix this build failure, add util_getrandom and a fallback (borrowed +from pipewire and licensed under MIT): +https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/master/src/pipewire/utils.c + +Fixes: + - http://autobuild.buildroot.org/results/6b8870d12e0804d6154230a7322c49416c1dc0e2 + +[Retrieved from: +https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=fb57ad9b9d107856e5f1c8135da04ffa2f7a11ac] +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 4 +++- + emulator/le.c | 3 +-- + emulator/phy.c | 3 +-- + peripheral/main.c | 4 ++-- + plugins/autopair.c | 4 ++-- + profiles/health/hdp.c | 4 ++-- + profiles/health/mcap.c | 6 +++--- + src/shared/util.c | 25 +++++++++++++++++++++++++ + src/shared/util.h | 2 ++ + tools/btgatt-server.c | 3 +-- + 10 files changed, 42 insertions(+), 16 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 07d068a4d..441bd5f29 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -54,6 +54,8 @@ AC_ARG_ENABLE(threads, AS_HELP_STRING([--enable-threads], + + AC_CHECK_FUNCS(explicit_bzero) + ++AC_CHECK_FUNCS(getrandom) ++ + AC_CHECK_FUNCS(rawmemchr) + + AC_CHECK_FUNC(signalfd, dummy=yes, +@@ -68,7 +70,7 @@ AC_CHECK_LIB(pthread, pthread_create, dummy=yes, + AC_CHECK_LIB(dl, dlopen, dummy=yes, + AC_MSG_ERROR(dynamic linking loader is required)) + +-AC_CHECK_HEADERS(linux/types.h linux/if_alg.h linux/uinput.h linux/uhid.h) ++AC_CHECK_HEADERS(linux/types.h linux/if_alg.h linux/uinput.h linux/uhid.h sys/random.h) + + PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.28, dummy=yes, + AC_MSG_ERROR(GLib >= 2.28 is required)) +diff --git a/emulator/le.c b/emulator/le.c +index f8f313f2c..7656a657c 100644 +--- a/emulator/le.c ++++ b/emulator/le.c +@@ -20,7 +20,6 @@ + #include + #include + #include +-#include + #include + + #include "lib/bluetooth.h" +@@ -509,7 +508,7 @@ static unsigned int get_adv_delay(void) + /* The advertising delay is a pseudo-random value with a range + * of 0 ms to 10 ms generated for each advertising event. + */ +- if (getrandom(&val, sizeof(val), 0) < 0) { ++ if (util_getrandom(&val, sizeof(val), 0) < 0) { + /* If it fails to get the random number, use a static value */ + val = 5; + } +diff --git a/emulator/phy.c b/emulator/phy.c +index 44cace438..7de85fb05 100644 +--- a/emulator/phy.c ++++ b/emulator/phy.c +@@ -19,7 +19,6 @@ + #include + #include + #include +-#include + #include + #include + #include +@@ -174,7 +173,7 @@ struct bt_phy *bt_phy_new(void) + mainloop_add_fd(phy->rx_fd, EPOLLIN, phy_rx_callback, phy, NULL); + + if (!get_random_bytes(&phy->id, sizeof(phy->id))) { +- if (getrandom(&phy->id, sizeof(phy->id), 0) < 0) { ++ if (util_getrandom(&phy->id, sizeof(phy->id), 0) < 0) { + mainloop_remove_fd(phy->rx_fd); + close(phy->tx_fd); + close(phy->rx_fd); +diff --git a/peripheral/main.c b/peripheral/main.c +index 91adb45fc..b82d7caf6 100644 +--- a/peripheral/main.c ++++ b/peripheral/main.c +@@ -25,13 +25,13 @@ + #include + #include + #include +-#include + + #ifndef WAIT_ANY + #define WAIT_ANY (-1) + #endif + + #include "src/shared/mainloop.h" ++#include "src/shared/util.h" + #include "peripheral/efivars.h" + #include "peripheral/attach.h" + #include "peripheral/gap.h" +@@ -192,7 +192,7 @@ int main(int argc, char *argv[]) + addr, 6) < 0) { + printf("Generating new persistent static address\n"); + +- if (getrandom(addr, sizeof(addr), 0) < 0) { ++ if (util_getrandom(addr, sizeof(addr), 0) < 0) { + perror("Failed to get random static address"); + return EXIT_FAILURE; + } +diff --git a/plugins/autopair.c b/plugins/autopair.c +index a75ecebe4..0b09e893f 100644 +--- a/plugins/autopair.c ++++ b/plugins/autopair.c +@@ -17,7 +17,6 @@ + #include + #include + #include +-#include + + #include + +@@ -29,6 +28,7 @@ + #include "src/device.h" + #include "src/log.h" + #include "src/storage.h" ++#include "src/shared/util.h" + + /* + * Plugin to handle automatic pairing of devices with reduced user +@@ -131,7 +131,7 @@ static ssize_t autopair_pincb(struct btd_adapter *adapter, + if (attempt >= 4) + return 0; + +- if (getrandom(&val, sizeof(val), 0) < 0) { ++ if (util_getrandom(&val, sizeof(val), 0) < 0) { + error("Failed to get a random pincode"); + return 0; + } +diff --git a/profiles/health/hdp.c b/profiles/health/hdp.c +index 9d9d1e824..b6590cd3a 100644 +--- a/profiles/health/hdp.c ++++ b/profiles/health/hdp.c +@@ -16,7 +16,6 @@ + #include + #include + #include +-#include + + #include + +@@ -33,6 +32,7 @@ + #include "src/device.h" + #include "src/sdpd.h" + #include "src/shared/timeout.h" ++#include "src/shared/util.h" + #include "btio/btio.h" + + #include "hdp_types.h" +@@ -1490,7 +1490,7 @@ static void *generate_echo_packet(void) + if (!buf) + return NULL; + +- if (getrandom(buf, HDP_ECHO_LEN, 0) < 0) { ++ if (util_getrandom(buf, HDP_ECHO_LEN, 0) < 0) { + g_free(buf); + return NULL; + } +diff --git a/profiles/health/mcap.c b/profiles/health/mcap.c +index aad0a08a3..5d2bac3d9 100644 +--- a/profiles/health/mcap.c ++++ b/profiles/health/mcap.c +@@ -19,7 +19,6 @@ + #include + #include + #include +-#include + + #include + +@@ -28,6 +27,7 @@ + #include "btio/btio.h" + #include "src/log.h" + #include "src/shared/timeout.h" ++#include "src/shared/util.h" + + #include "mcap.h" + +@@ -1905,7 +1905,7 @@ gboolean mcap_create_mcl(struct mcap_instance *mi, + mcl->state = MCL_IDLE; + bacpy(&mcl->addr, addr); + set_default_cb(mcl); +- if (getrandom(&val, sizeof(val), 0) < 0) { ++ if (util_getrandom(&val, sizeof(val), 0) < 0) { + mcap_instance_unref(mcl->mi); + g_free(mcl); + return FALSE; +@@ -2049,7 +2049,7 @@ static void connect_mcl_event_cb(GIOChannel *chan, GError *gerr, + mcl->mi = mcap_instance_ref(mi); + bacpy(&mcl->addr, &dst); + set_default_cb(mcl); +- if (getrandom(&val, sizeof(val), 0) < 0) { ++ if (util_getrandom(&val, sizeof(val), 0) < 0) { + mcap_instance_unref(mcl->mi); + g_free(mcl); + goto drop; +diff --git a/src/shared/util.c b/src/shared/util.c +index 6e1c83057..33196bf8b 100644 +--- a/src/shared/util.c ++++ b/src/shared/util.c +@@ -13,6 +13,7 @@ + #endif + + #define _GNU_SOURCE ++#include + #include + #include + #include +@@ -23,6 +24,10 @@ + #include + #include + ++#ifdef HAVE_SYS_RANDOM_H ++#include ++#endif ++ + #include "src/shared/util.h" + + void *util_malloc(size_t size) +@@ -138,6 +143,26 @@ unsigned char util_get_dt(const char *parent, const char *name) + return DT_UNKNOWN; + } + ++/* Helper for getting a random in case getrandom unavailable (glibc < 2.25) */ ++ssize_t util_getrandom(void *buf, size_t buflen, unsigned int flags) ++{ ++#ifdef HAVE_GETRANDOM ++ return getrandom(buf, buflen, flags); ++#else ++ int fd; ++ ssize_t bytes; ++ ++ fd = open("/dev/urandom", O_CLOEXEC); ++ if (fd < 0) ++ return -1; ++ ++ bytes = read(fd, buf, buflen); ++ close(fd); ++ ++ return bytes; ++#endif ++} ++ + /* Helpers for bitfield operations */ + + /* Find unique id in range from 1 to max but no bigger than 64. */ +diff --git a/src/shared/util.h b/src/shared/util.h +index 8ef6132c4..c01eccf8a 100644 +--- a/src/shared/util.h ++++ b/src/shared/util.h +@@ -103,6 +103,8 @@ void util_hexdump(const char dir, const unsigned char *buf, size_t len, + + unsigned char util_get_dt(const char *parent, const char *name); + ++ssize_t util_getrandom(void *buf, size_t buflen, unsigned int flags); ++ + uint8_t util_get_uid(uint64_t *bitmap, uint8_t max); + void util_clear_uid(uint64_t *bitmap, uint8_t id); + +diff --git a/tools/btgatt-server.c b/tools/btgatt-server.c +index 15d49a464..4a5d2b720 100644 +--- a/tools/btgatt-server.c ++++ b/tools/btgatt-server.c +@@ -20,7 +20,6 @@ + #include + #include + #include +-#include + + #include "lib/bluetooth.h" + #include "lib/hci.h" +@@ -287,7 +286,7 @@ static bool hr_msrmt_cb(void *user_data) + uint32_t cur_ee; + uint32_t val; + +- if (getrandom(&val, sizeof(val), 0) < 0) ++ if (util_getrandom(&val, sizeof(val), 0) < 0) + return false; + + pdu[0] = 0x06; +-- +cgit + diff --git a/package/bluez5_utils/bluez5_utils.mk b/package/bluez5_utils/bluez5_utils.mk index 7c2561b864..3d76cfb7dc 100644 --- a/package/bluez5_utils/bluez5_utils.mk +++ b/package/bluez5_utils/bluez5_utils.mk @@ -13,7 +13,7 @@ BLUEZ5_UTILS_LICENSE = GPL-2.0+, LGPL-2.1+ BLUEZ5_UTILS_LICENSE_FILES = COPYING COPYING.LIB BLUEZ5_UTILS_CPE_ID_VENDOR = bluez BLUEZ5_UTILS_CPE_ID_PRODUCT = bluez -# We're patching Makefile.am +# We're patching Makefile.am and configure.ac BLUEZ5_UTILS_AUTORECONF = YES BLUEZ5_UTILS_DEPENDENCIES = \ From arnout at mind.be Wed Feb 23 20:20:29 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 23 Feb 2022 21:20:29 +0100 Subject: [Buildroot] [git commit] package/frr: set FRR_XREF_NO_NOTE Message-ID: <20220223201530.265CB838A7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a7062df3272be4a012e0b8288f17bb7e0220bbdb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Set FRR_XREF_NO_NOTE to avoid the following build failures with microblazeel, nds32 and xtensa raised since bump to version 8.1 in commit ca2753fd47d47e5ad0eec16ea62f7b7f096331b6: _clippy.ELFAccessError: virtual address (538157256) not found in program headers [...] /tmp/ccFGv94v.s:13: Error: can't resolve `__start_xref_array' {*UND* section} - `L0' {.note.FRR section} /tmp/ccFGv94v.s:14: Error: can't resolve `__stop_xref_array' {*UND* section} - `L0' {.note.FRR section} Here is an extract of https://github.com/FRRouting/frr/blob/7347a4859d4b984cea0aef769a16622d3f02e44f/lib/xref.h: "the following blurb emits an ELF note indicating start and end of the xref array in the binary. This is technically the "correct" entry point for external tools reading xrefs out of an ELF shared library or executable. ... FRR itself does not need this note to operate correctly, so if you have some build issue with it just add -DFRR_XREF_NO_NOTE to your build flags to disable it." In other words, this is only *possibly* needed for another package that wants to extracts the xrefs. We currently don't have anything that depends on frr in-tree, and it's not even installed in staging, so it's hard to check, but it seems pretty unlikely that this is really needed. Fixes: - http://autobuild.buildroot.org/results/3cdb50f5e5a1b3f37a6edcd4276fcbf015e28828 - http://autobuild.buildroot.org/results/a3cc0b5090a1faa2bca9c8dfe0fec9b6a918ba4d - http://autobuild.buildroot.org/results/694cc65478a82ec93d2074252892036855cdc49d Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/frr/frr.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/frr/frr.mk b/package/frr/frr.mk index cc83016f9f..0e6ab7a815 100644 --- a/package/frr/frr.mk +++ b/package/frr/frr.mk @@ -17,7 +17,9 @@ FRR_DEPENDENCIES = host-frr readline json-c libyang libnl \ HOST_FRR_DEPENDENCIES = host-flex host-bison host-elfutils host-python3 -FRR_CONF_ENV = ac_cv_lib_cunit_CU_initialize_registry=no +FRR_CONF_ENV = \ + ac_cv_lib_cunit_CU_initialize_registry=no \ + CFLAGS="$(TARGET_CFLAGS) -DFRR_XREF_NO_NOTE" FRR_CONF_OPTS = --with-clippy=$(HOST_DIR)/bin/clippy \ --sysconfdir=/etc/frr \ From arnout at mind.be Wed Feb 23 20:24:54 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 23 Feb 2022 21:24:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/frr: set FRR_XREF_NO_NOTE In-Reply-To: <20220216142213.1472039-1-fontaine.fabrice@gmail.com> References: <20220216142213.1472039-1-fontaine.fabrice@gmail.com> Message-ID: <4ed0a044-0d93-8dca-8a13-312c85a5be79@mind.be> On 16/02/2022 15:22, Fabrice Fontaine wrote: > Set FRR_XREF_NO_NOTE to avoid the following build failures with > microblazeel, nds32 and xtensa raised since bump to version 8.1 in > commit ca2753fd47d47e5ad0eec16ea62f7b7f096331b6: > > _clippy.ELFAccessError: virtual address (538157256) not found in program headers > > [...] > > /tmp/ccFGv94v.s:13: Error: can't resolve `__start_xref_array' {*UND* section} - `L0' {.note.FRR section} > /tmp/ccFGv94v.s:14: Error: can't resolve `__stop_xref_array' {*UND* section} - `L0' {.note.FRR section} > > Here is an extract of > https://github.com/FRRouting/frr/blob/7347a4859d4b984cea0aef769a16622d3f02e44f/lib/xref.h: > "FRR itself does not need this note to operate correctly, so if you have > some build issue with it just add -DFRR_XREF_NO_NOTE to your build flags > to disable it." There's some more text a bit higher up that says that it actually *is* needed for "external tools reading xrefs out of an ELF shared library or executable". But it seems pretty unlikely that this is going to be an issue in Buildroot context. So I just extended the commit message with that and applied to master, thanks. Regards, Arnout > > Fixes: > - http://autobuild.buildroot.org/results/3cdb50f5e5a1b3f37a6edcd4276fcbf015e28828 > - http://autobuild.buildroot.org/results/a3cc0b5090a1faa2bca9c8dfe0fec9b6a918ba4d > - http://autobuild.buildroot.org/results/694cc65478a82ec93d2074252892036855cdc49d > > Signed-off-by: Fabrice Fontaine > --- > package/frr/frr.mk | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/package/frr/frr.mk b/package/frr/frr.mk > index cc83016f9f..0e6ab7a815 100644 > --- a/package/frr/frr.mk > +++ b/package/frr/frr.mk > @@ -17,7 +17,9 @@ FRR_DEPENDENCIES = host-frr readline json-c libyang libnl \ > > HOST_FRR_DEPENDENCIES = host-flex host-bison host-elfutils host-python3 > > -FRR_CONF_ENV = ac_cv_lib_cunit_CU_initialize_registry=no > +FRR_CONF_ENV = \ > + ac_cv_lib_cunit_CU_initialize_registry=no \ > + CFLAGS="$(TARGET_CFLAGS) -DFRR_XREF_NO_NOTE" > > FRR_CONF_OPTS = --with-clippy=$(HOST_DIR)/bin/clippy \ > --sysconfdir=/etc/frr \ From fontaine.fabrice at gmail.com Wed Feb 23 20:26:48 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 23 Feb 2022 21:26:48 +0100 Subject: [Buildroot] [PATCH v3, 1/1] package/ghostscript: disable tesseract without threads Message-ID: <20220223202648.3398307-1-fontaine.fabrice@gmail.com> ghostscript embeds a local copy of tesseract-ocr which is enabled by default since version 9.53.0 and https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=7322ef87546c55b29056c1d96d8bdbb7f3ba53ef Since version 9.55.0 and https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=5459f7aca1ded3b7cf96c339a2419f418aa406c7, ghostscript expects that tesseract is disabled if threads are not available resulting in the following build failure since commit 7a4944569ce83b0b7b0cabd6e8aa184b8cb72a22: configure: error: Threading disabled or not available. Tesseract OCR relies on threading. Rerun configure with "--without-tesseract" to exclude OCR from the build So disable tesseract if threads are not available. It should be noted that there is no way to tell ghostscript to use a system provided tesseract-ocr package. Fixes: - http://autobuild.buildroot.org/results/fd35a47b2a77cf57c243ec1c88802b53ddca8f52 Signed-off-by: Fabrice Fontaine --- Changes v2 -> v3 (after review of Arnout Vandecappelle): - Only disable tesseract without threads Changes v1 -> v2: - Unconditionally disable tesseract package/ghostscript/ghostscript.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/ghostscript/ghostscript.mk b/package/ghostscript/ghostscript.mk index 24a0c489a8..02cb35fcfc 100644 --- a/package/ghostscript/ghostscript.mk +++ b/package/ghostscript/ghostscript.mk @@ -83,4 +83,8 @@ else GHOSTSCRIPT_CONF_OPTS += --without-x endif +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) +GHOSTSCRIPT_CONF_OPTS += --without-tesseract +endif + $(eval $(autotools-package)) -- 2.34.1 From arnout at mind.be Wed Feb 23 20:27:57 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 23 Feb 2022 21:27:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/dialog: bump to version 1.3-20220117 In-Reply-To: <20220216204538.2450673-1-fontaine.fabrice@gmail.com> References: <20220216204538.2450673-1-fontaine.fabrice@gmail.com> Message-ID: On 16/02/2022 21:45, Fabrice Fontaine wrote: > https://invisible-mirror.net/dialog/CHANGES.html#index-t20220117 > > Fixes: > - https://bugs.buildroot.org/show_bug.cgi?id=14596 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/dialog/dialog.hash | 2 +- > package/dialog/dialog.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/dialog/dialog.hash b/package/dialog/dialog.hash > index 2286590b66..3136d18b2b 100644 > --- a/package/dialog/dialog.hash > +++ b/package/dialog/dialog.hash > @@ -1,4 +1,4 @@ > # Locally calculated after checking pgp signature > -sha256 466163e8b97c2b7709d00389199add3156bd813f60ccb0335d0a30f2d4a17f99 dialog-1.3-20200327.tgz > +sha256 754cb6bf7dc6a9ac5c1f80c13caa4d976e30a5a6e8b46f17b3bb9b080c31041f dialog-1.3-20220117.tgz > # Locally computed > sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING > diff --git a/package/dialog/dialog.mk b/package/dialog/dialog.mk > index 1c98d354e3..681f8ec9fe 100644 > --- a/package/dialog/dialog.mk > +++ b/package/dialog/dialog.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -DIALOG_VERSION = 1.3-20200327 > +DIALOG_VERSION = 1.3-20220117 > DIALOG_SOURCE = dialog-$(DIALOG_VERSION).tgz > DIALOG_SITE = https://invisible-mirror.net/archives/dialog > DIALOG_CONF_OPTS = --with-ncurses --with-curses-dir=$(STAGING_DIR)/usr \ From arnout at mind.be Wed Feb 23 20:27:25 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 23 Feb 2022 21:27:25 +0100 Subject: [Buildroot] [git commit branch/next] package/dialog: bump to version 1.3-20220117 Message-ID: <20220223202010.4AFB1838B0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1868f372c02760e324f91ebcf5685323855351f1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://invisible-mirror.net/dialog/CHANGES.html#index-t20220117 Fixes: - https://bugs.buildroot.org/show_bug.cgi?id=14596 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/dialog/dialog.hash | 2 +- package/dialog/dialog.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dialog/dialog.hash b/package/dialog/dialog.hash index 2286590b66..3136d18b2b 100644 --- a/package/dialog/dialog.hash +++ b/package/dialog/dialog.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 466163e8b97c2b7709d00389199add3156bd813f60ccb0335d0a30f2d4a17f99 dialog-1.3-20200327.tgz +sha256 754cb6bf7dc6a9ac5c1f80c13caa4d976e30a5a6e8b46f17b3bb9b080c31041f dialog-1.3-20220117.tgz # Locally computed sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/dialog/dialog.mk b/package/dialog/dialog.mk index 1c98d354e3..681f8ec9fe 100644 --- a/package/dialog/dialog.mk +++ b/package/dialog/dialog.mk @@ -4,7 +4,7 @@ # ################################################################################ -DIALOG_VERSION = 1.3-20200327 +DIALOG_VERSION = 1.3-20220117 DIALOG_SOURCE = dialog-$(DIALOG_VERSION).tgz DIALOG_SITE = https://invisible-mirror.net/archives/dialog DIALOG_CONF_OPTS = --with-ncurses --with-curses-dir=$(STAGING_DIR)/usr \ From arnout at mind.be Wed Feb 23 20:28:31 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 23 Feb 2022 21:28:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/dialog: bump to version 1.3-20220117 In-Reply-To: <20220221160549.20554-1-andrei.gherghescu@protonmail.com> References: <20220221160549.20554-1-andrei.gherghescu@protonmail.com> Message-ID: <9ecde339-7f79-adb9-bac1-dfbdd5bb4e24@mind.be> On 21/02/2022 17:06, Andrei Gherghescu via buildroot wrote: > Signed-off-by: Andrei Gherghescu Fabrice already submitted an identical patch the week before, so I applied that one instead. Regards, Arnout > --- > package/dialog/dialog.hash | 2 +- > package/dialog/dialog.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/dialog/dialog.hash b/package/dialog/dialog.hash > index 2286590b66..3136d18b2b 100644 > --- a/package/dialog/dialog.hash > +++ b/package/dialog/dialog.hash > @@ -1,4 +1,4 @@ > # Locally calculated after checking pgp signature > -sha256 466163e8b97c2b7709d00389199add3156bd813f60ccb0335d0a30f2d4a17f99 dialog-1.3-20200327.tgz > +sha256 754cb6bf7dc6a9ac5c1f80c13caa4d976e30a5a6e8b46f17b3bb9b080c31041f dialog-1.3-20220117.tgz > # Locally computed > sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING > diff --git a/package/dialog/dialog.mk b/package/dialog/dialog.mk > index 1c98d354e3..681f8ec9fe 100644 > --- a/package/dialog/dialog.mk > +++ b/package/dialog/dialog.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -DIALOG_VERSION = 1.3-20200327 > +DIALOG_VERSION = 1.3-20220117 > DIALOG_SOURCE = dialog-$(DIALOG_VERSION).tgz > DIALOG_SITE = https://invisible-mirror.net/archives/dialog > DIALOG_CONF_OPTS = --with-ncurses --with-curses-dir=$(STAGING_DIR)/usr \ > -- > 2.35.1 > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From arnout at mind.be Wed Feb 23 20:28:48 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 23 Feb 2022 21:28:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/dialog: bump to version 1.3-20220117 In-Reply-To: References: <20220216204538.2450673-1-fontaine.fabrice@gmail.com> Message-ID: On 23/02/2022 21:27, Arnout Vandecappelle wrote: > > > On 16/02/2022 21:45, Fabrice Fontaine wrote: >> https://invisible-mirror.net/dialog/CHANGES.html#index-t20220117 >> >> Fixes: >> ? - https://bugs.buildroot.org/show_bug.cgi?id=14596 >> >> Signed-off-by: Fabrice Fontaine > > ?Applied to master, thanks. ?I mean next! ?Regards, ?Arnout > > ?Regards, > ?Arnout > >> --- >> ? package/dialog/dialog.hash | 2 +- >> ? package/dialog/dialog.mk?? | 2 +- >> ? 2 files changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/package/dialog/dialog.hash b/package/dialog/dialog.hash >> index 2286590b66..3136d18b2b 100644 >> --- a/package/dialog/dialog.hash >> +++ b/package/dialog/dialog.hash >> @@ -1,4 +1,4 @@ >> ? # Locally calculated after checking pgp signature >> -sha256 466163e8b97c2b7709d00389199add3156bd813f60ccb0335d0a30f2d4a17f99 >> dialog-1.3-20200327.tgz >> +sha256 754cb6bf7dc6a9ac5c1f80c13caa4d976e30a5a6e8b46f17b3bb9b080c31041f >> dialog-1.3-20220117.tgz >> ? # Locally computed >> ? sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 >> COPYING >> diff --git a/package/dialog/dialog.mk b/package/dialog/dialog.mk >> index 1c98d354e3..681f8ec9fe 100644 >> --- a/package/dialog/dialog.mk >> +++ b/package/dialog/dialog.mk >> @@ -4,7 +4,7 @@ >> ? # >> ################################################################################ >> ? -DIALOG_VERSION = 1.3-20200327 >> +DIALOG_VERSION = 1.3-20220117 >> ? DIALOG_SOURCE = dialog-$(DIALOG_VERSION).tgz >> ? DIALOG_SITE = https://invisible-mirror.net/archives/dialog >> ? DIALOG_CONF_OPTS = --with-ncurses --with-curses-dir=$(STAGING_DIR)/usr \ From bugzilla at busybox.net Wed Feb 23 20:30:15 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 23 Feb 2022 20:30:15 +0000 Subject: [Buildroot] [Bug 14596] package dialog is outdated and contains a bug In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14596 Arnout Vandecappelle changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #3 from Arnout Vandecappelle --- Dialog is updated in the 'next' branch. The changes are a bit to much to still apply it in the master branch, since we're in the stabilisation period for 2022.02. -- You are receiving this mail because: You are on the CC list for the bug. From arnout at mind.be Wed Feb 23 20:32:38 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 23 Feb 2022 21:32:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/bpftool: bump to version 6.7.0 In-Reply-To: <20220217005344.2357385-1-james.hilliard1@gmail.com> References: <20220217005344.2357385-1-james.hilliard1@gmail.com> Message-ID: <716c6a20-b60f-fda6-3e0e-06f97aab4b68@mind.be> On 17/02/2022 01:53, James Hilliard wrote: > Fixes: > http://autobuild.buildroot.net/results/8bf/8bfc2abe3ab7a0b53aa717c800a4c7a3c964f426 > > Signed-off-by: James Hilliard We normally wouldn't be taking a version bump in master any more, but this is anyway a new package, and it goes from a random commit to a tagged one, so applied to master, thanks. Regards, Arnout > --- > package/bpftool/bpftool.hash | 2 +- > package/bpftool/bpftool.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/bpftool/bpftool.hash b/package/bpftool/bpftool.hash > index c7d4ae250e..2e414b8eb8 100644 > --- a/package/bpftool/bpftool.hash > +++ b/package/bpftool/bpftool.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 c868cb85bf44195ec6cd20649c3db4f7aff64a38d950a1c2911d981fb2d7042c bpftool-a7f0e7f057283ae8af3de4578bcb8b7ee80b7144-br1.tar.gz > +sha256 e4ce219d3b87dd70d8dbfb8f02bd356f70c010f739f17baca1c8912199a8a72b bpftool-v6.7.0-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 > index 4276f91958..8742917253 100644 > --- a/package/bpftool/bpftool.mk > +++ b/package/bpftool/bpftool.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -BPFTOOL_VERSION = a7f0e7f057283ae8af3de4578bcb8b7ee80b7144 > +BPFTOOL_VERSION = v6.7.0 > BPFTOOL_SITE = https://github.com/libbpf/bpftool > BPFTOOL_SITE_METHOD = git > BPFTOOL_GIT_SUBMODULES = YES From arnout at mind.be Wed Feb 23 20:31:33 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 23 Feb 2022 21:31:33 +0100 Subject: [Buildroot] [git commit] package/bpftool: bump to version 6.7.0 Message-ID: <20220223202449.45521838B8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a14268d1385831038b5972430a28fee08c6ae33f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: http://autobuild.buildroot.net/results/8bf/8bfc2abe3ab7a0b53aa717c800a4c7a3c964f426 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/bpftool/bpftool.hash | 2 +- package/bpftool/bpftool.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/bpftool/bpftool.hash b/package/bpftool/bpftool.hash index c7d4ae250e..2e414b8eb8 100644 --- a/package/bpftool/bpftool.hash +++ b/package/bpftool/bpftool.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 c868cb85bf44195ec6cd20649c3db4f7aff64a38d950a1c2911d981fb2d7042c bpftool-a7f0e7f057283ae8af3de4578bcb8b7ee80b7144-br1.tar.gz +sha256 e4ce219d3b87dd70d8dbfb8f02bd356f70c010f739f17baca1c8912199a8a72b bpftool-v6.7.0-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 index 4276f91958..8742917253 100644 --- a/package/bpftool/bpftool.mk +++ b/package/bpftool/bpftool.mk @@ -4,7 +4,7 @@ # ################################################################################ -BPFTOOL_VERSION = a7f0e7f057283ae8af3de4578bcb8b7ee80b7144 +BPFTOOL_VERSION = v6.7.0 BPFTOOL_SITE = https://github.com/libbpf/bpftool BPFTOOL_SITE_METHOD = git BPFTOOL_GIT_SUBMODULES = YES From fontaine.fabrice at gmail.com Wed Feb 23 20:36:31 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 23 Feb 2022 21:36:31 +0100 Subject: [Buildroot] [PATCH 1/1] utils/checkpackagelib/lib_mk.py: check CONF_OPTS Message-ID: <20220223203631.3398950-1-fontaine.fabrice@gmail.com> As already done for {FOO}_DEPENDENCIES in commit 4910a175b3f1f4b55ff257a75945d8ffb14a4ceb, check that {FOO}_CONF_OPTS are never overridden in a conditional Signed-off-by: Fabrice Fontaine --- utils/checkpackagelib/lib_mk.py | 1 + 1 file changed, 1 insertion(+) diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py index 153754b6f1..b50a19ac62 100644 --- a/utils/checkpackagelib/lib_mk.py +++ b/utils/checkpackagelib/lib_mk.py @@ -90,6 +90,7 @@ class OverriddenVariable(_CheckFunction): r"_SOURCE\s*=\s*", r"_VERSION\s*=\s*"]))) FORBIDDEN_OVERRIDDEN = re.compile(r"^[A-Z0-9_]+({})".format("|".join([ + r"_CONF_OPTS\s*=\s*", r"_DEPENDENCIES\s*=\s*"]))) def before(self): -- 2.34.1 From fabien.marteau at armadeus.com Wed Feb 23 14:59:57 2022 From: fabien.marteau at armadeus.com (Fabien Marteau) Date: Wed, 23 Feb 2022 15:59:57 +0100 Subject: [Buildroot] zynq_zc706_defconfig target works on zc702 board Message-ID: <872b9dab-c446-adca-905c-1d5481c00a3b@armadeus.com> Hello, I just tryied to compile buildroot for ZC702?board using target zynq_zc706_defconfig (ZC706). With last buildroot git : make zynq_zc706_defconfig sudo dd if=output/images/sdcard.img of=/dev/mmcblk0 Booting the board with SDCard freshly formatted : Debug uart enabled U-Boot SPL 2018.01 (Feb 23 2022 - 11:43:15) mmc boot Trying to boot from MMC1 spl_load_image_fat: error reading image fpga.bin, err - -2 spl: error reading image fpga.bin, err - 1 spl_load_image_fat_os: error reading image system.dtb, err - -2 reading u-boot.img reading u-boot.img U-Boot 2018.01 (Feb 23 2022 - 11:43:15 +0100) Xilinx Zynq ZC706 Model: Zynq ZC706 Development Board Board: Xilinx Zynq Silicon: v0.0 I2C: ready DRAM: ECC disabled 1 GiB MMC: sdhci at e0100000: 0 (SD) SF: Detected n25q128a with page size 512 Bytes, erase size 128 KiB, total 32 MiB *** Warning - bad CRC, using default environment In: serial at e0001000 Out: serial at e0001000 Err: serial at e0001000 Net: ZYNQ GEM: e000b000, phyaddr 7, interface rgmii-id eth0: ethernet at e000b000 Hit any key to stop autoboot: 0 Zynq> Then booting Linux : Zynq> boot Device: sdhci at e0100000 Manufacturer ID: 27 OEM: 5048 Name: SD16G Tran Speed: 50000000 Rd Block Len: 512 SD version 3.0 High Capacity: Yes Capacity: 14.4 GiB Bus Width: 4-bit Erase Group Size: 512 Bytes ** Unable to read file uEnv.txt ** Copying Linux from SD to RAM... reading uImage 3732256 bytes read in 212 ms (16.8 MiB/s) reading devicetree.dtb 13667 bytes read in 14 ms (953.1 KiB/s) reading uramdisk.image.gz 951488 bytes read in 65 ms (14 MiB/s) ## Booting kernel from Legacy Image at 02080000 ... Image Name: Linux-4.9.0-xilinx Image Type: ARM Linux Kernel Image (uncompressed) Data Size: 3732192 Bytes = 3.6 MiB Load Address: 00008000 Entry Point: 00008000 Verifying Checksum ... OK ## Loading init Ramdisk from Legacy Image at 04000000 ... Image Name: Image Type: ARM Linux RAMDisk Image (uncompressed) Data Size: 951424 Bytes = 929.1 KiB Load Address: 00000000 Entry Point: 00000000 Verifying Checksum ... OK ## Flattened Device Tree blob at 02000000 Booting using the fdt blob at 0x2000000 Loading Kernel Image ... OK Loading Ramdisk to 1ff17000, end 1ffff480 ... OK Loading Device Tree to 1ff10000, end 1ff16562 ... OK Starting kernel ... Booting Linux on physical CPU 0x0 [...] Starting network: OK Welcome to Buildroot buildroot login: It works as is \o/ Do I have to make a patch to add the target? Best regards, Fabien Marteau Armadeus System From fontaine.fabrice at gmail.com Wed Feb 23 21:12:02 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 23 Feb 2022 22:12:02 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/kismet: bump to version 2022-02-R1 Message-ID: <20220223211202.3412693-1-fontaine.fabrice@gmail.com> Linking with -latomic is handled by configure.ac since version 2022-01-R3 and https://github.com/kismetwireless/kismet/commit/bbdfd21e2b41bf69513ded5ae5ab5a89f22a9912 https://www.kismetwireless.net/release/kismet-2022-02-R1 https://www.kismetwireless.net/release/kismet-2022-01-R3 https://www.kismetwireless.net/release/kismet-2022-01-R2 https://www.kismetwireless.net/release/kismet-2022-01-R1 Signed-off-by: Fabrice Fontaine --- package/kismet/kismet.hash | 2 +- package/kismet/kismet.mk | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/package/kismet/kismet.hash b/package/kismet/kismet.hash index 9a9d2260b9..fc5f854b7e 100644 --- a/package/kismet/kismet.hash +++ b/package/kismet/kismet.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1c8e31b1babdb0fc93ac38fd0772a24d4b40f865fbc292fa8ec7f4a18ced0135 kismet-2021-08-R1.tar.xz +sha256 aaae4747f14734a73f601af013c0eee26e13680f5e3675dfce09b7de2e68b8a8 kismet-2022-02-R1.tar.xz sha256 93c7f0d7e356b0abfb6f494ff3ea37f96abc84e9a5619b25d4e43f7553a55739 LICENSE diff --git a/package/kismet/kismet.mk b/package/kismet/kismet.mk index 819ed510d7..3992a392f8 100644 --- a/package/kismet/kismet.mk +++ b/package/kismet/kismet.mk @@ -4,7 +4,7 @@ # ################################################################################ -KISMET_VERSION = 2021-08-R1 +KISMET_VERSION = 2022-02-R1 KISMET_SOURCE = kismet-$(KISMET_VERSION).tar.xz KISMET_SITE = http://www.kismetwireless.net/code KISMET_DEPENDENCIES = \ @@ -29,10 +29,6 @@ endif KISMET_CONF_ENV += CXXFLAGS="$(KISMET_CXXFLAGS)" -ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -KISMET_CONF_ENV += LIBS=-latomic -endif - ifeq ($(BR2_PACKAGE_LIBCAP),y) KISMET_DEPENDENCIES += libcap KISMET_CONF_OPTS += --enable-libcap -- 2.34.1 From giulio.benetti at benettiengineering.com Wed Feb 23 21:22:23 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 23 Feb 2022 22:22:23 +0100 Subject: [Buildroot] zynq_zc706_defconfig target works on zc702 board In-Reply-To: <872b9dab-c446-adca-905c-1d5481c00a3b@armadeus.com> References: <872b9dab-c446-adca-905c-1d5481c00a3b@armadeus.com> Message-ID: <9C91AA22-A5B2-433B-AD37-7000F7D5EB20@benettiengineering.com> Hi Fabien, > Il giorno 23 feb 2022, alle ore 21:59, Fabien Marteau ha scritto: > > ?Hello, > > I just tryied to compile buildroot for ZC702 board using target zynq_zc706_defconfig (ZC706). > > With last buildroot git : > > make zynq_zc706_defconfig > sudo dd if=output/images/sdcard.img of=/dev/mmcblk0 > > Booting the board with SDCard freshly formatted : > > Debug uart enabled > > U-Boot SPL 2018.01 (Feb 23 2022 - 11:43:15) > mmc boot > Trying to boot from MMC1 > spl_load_image_fat: error reading image fpga.bin, err - -2 > spl: error reading image fpga.bin, err - 1 > spl_load_image_fat_os: error reading image system.dtb, err - -2 > reading u-boot.img > reading u-boot.img > > > U-Boot 2018.01 (Feb 23 2022 - 11:43:15 +0100) Xilinx Zynq ZC706 > > Model: Zynq ZC706 Development Board > Board: Xilinx Zynq > Silicon: v0.0 > I2C: ready > DRAM: ECC disabled 1 GiB > MMC: sdhci at e0100000: 0 (SD) > SF: Detected n25q128a with page size 512 Bytes, erase size 128 KiB, total 32 MiB > *** Warning - bad CRC, using default environment > > In: serial at e0001000 > Out: serial at e0001000 > Err: serial at e0001000 > Net: ZYNQ GEM: e000b000, phyaddr 7, interface rgmii-id > eth0: ethernet at e000b000 > Hit any key to stop autoboot: 0 > Zynq> > > Then booting Linux : > > Zynq> boot > Device: sdhci at e0100000 > Manufacturer ID: 27 > OEM: 5048 > Name: SD16G > Tran Speed: 50000000 > Rd Block Len: 512 > SD version 3.0 > High Capacity: Yes > Capacity: 14.4 GiB > Bus Width: 4-bit > Erase Group Size: 512 Bytes > ** Unable to read file uEnv.txt ** > Copying Linux from SD to RAM... > reading uImage > 3732256 bytes read in 212 ms (16.8 MiB/s) > reading devicetree.dtb > 13667 bytes read in 14 ms (953.1 KiB/s) > reading uramdisk.image.gz > 951488 bytes read in 65 ms (14 MiB/s) > ## Booting kernel from Legacy Image at 02080000 ... > Image Name: Linux-4.9.0-xilinx > Image Type: ARM Linux Kernel Image (uncompressed) > Data Size: 3732192 Bytes = 3.6 MiB > Load Address: 00008000 > Entry Point: 00008000 > Verifying Checksum ... OK > ## Loading init Ramdisk from Legacy Image at 04000000 ... > Image Name: > Image Type: ARM Linux RAMDisk Image (uncompressed) > Data Size: 951424 Bytes = 929.1 KiB > Load Address: 00000000 > Entry Point: 00000000 > Verifying Checksum ... OK > ## Flattened Device Tree blob at 02000000 > Booting using the fdt blob at 0x2000000 > Loading Kernel Image ... OK > Loading Ramdisk to 1ff17000, end 1ffff480 ... OK > Loading Device Tree to 1ff10000, end 1ff16562 ... OK > > Starting kernel ... > > Booting Linux on physical CPU 0x0 > > [...] > > Starting network: OK > > Welcome to Buildroot > buildroot login: > > > It works as is \o/ > > Do I have to make a patch to add the target? Sure, you can do that and add an entry in DEVELOPERS with you to maintain it. But here I think we need specific tag names, dts files etc for zc702. And possibly bump all the versions for uboot and Linux. Can you do that? Best regards Giulio > > Best regards, > Fabien Marteau > Armadeus System > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From petr.vorel at gmail.com Wed Feb 23 21:27:17 2022 From: petr.vorel at gmail.com (Petr Vorel) Date: Wed, 23 Feb 2022 22:27:17 +0100 Subject: [Buildroot] [RFC][PATCH 1/1] package/bind: bump to version 9.16.26 In-Reply-To: <20220222220255.22327-1-petr.vorel@gmail.com> References: <20220222220255.22327-1-petr.vorel@gmail.com> Message-ID: Hi, Build 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]: SKIPPED sourcery-arm [6/6]: OK 6 builds, 2 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]: OK 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]: SKIPPED 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]: OK 45 builds, 5 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed Kind regards, Petr From fontaine.fabrice at gmail.com Wed Feb 23 22:13:58 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 23 Feb 2022 23:13:58 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/screen: bump to version 4.9.0 Message-ID: <20220223221358.4097881-1-fontaine.fabrice@gmail.com> - Drop latest patch (already in version) - Update indentation in hash file (two spaces) https://lists.gnu.org/archive/html/screen-users/2022-02/msg00000.html Signed-off-by: Fabrice Fontaine --- package/screen/0008-CVE-2021-26937.patch | 68 ------------------------ package/screen/screen.hash | 6 +-- package/screen/screen.mk | 5 +- 3 files changed, 4 insertions(+), 75 deletions(-) delete mode 100644 package/screen/0008-CVE-2021-26937.patch diff --git a/package/screen/0008-CVE-2021-26937.patch b/package/screen/0008-CVE-2021-26937.patch deleted file mode 100644 index df7efa0294..0000000000 --- a/package/screen/0008-CVE-2021-26937.patch +++ /dev/null @@ -1,68 +0,0 @@ -Description: [CVE-2021-26937] Fix out of bounds array access -Author: Michael Schr?der -Bug-Debian: https://bugs.debian.org/982435 -Bug: https://savannah.gnu.org/bugs/?60030 -Bug: https://lists.gnu.org/archive/html/screen-devel/2021-02/msg00000.html -Bug-OSS-Security: https://www.openwall.com/lists/oss-security/2021/02/09/3 -Origin: https://lists.gnu.org/archive/html/screen-devel/2021-02/msg00010.html - -Downloaded from Debian: -https://sources.debian.org/data/main/s/screen/4.8.0-5/debian/patches/99_CVE-2021-26937.patch - -Signed-off-by: Peter Korsgaard ---- a/encoding.c -+++ b/encoding.c -@@ -43,7 +43,7 @@ - # ifdef UTF8 - static int recode_char __P((int, int, int)); - static int recode_char_to_encoding __P((int, int)); --static void comb_tofront __P((int, int)); -+static void comb_tofront __P((int)); - # ifdef DW_CHARS - static int recode_char_dw __P((int, int *, int, int)); - static int recode_char_dw_to_encoding __P((int, int *, int)); -@@ -1263,6 +1263,8 @@ - {0x30000, 0x3FFFD}, - }; - -+ if (c >= 0xdf00 && c <= 0xdfff) -+ return 1; /* dw combining sequence */ - return ((bisearch(c, wide, sizeof(wide) / sizeof(struct interval) - 1)) || - (cjkwidth && - bisearch(c, ambiguous, -@@ -1330,11 +1332,12 @@ - } - - static void --comb_tofront(root, i) --int root, i; -+comb_tofront(i) -+int i; - { - for (;;) - { -+ int root = i >= 0x700 ? 0x801 : 0x800; - debug1("bring to front: %x\n", i); - combchars[combchars[i]->prev]->next = combchars[i]->next; - combchars[combchars[i]->next]->prev = combchars[i]->prev; -@@ -1396,9 +1399,9 @@ - { - /* full, recycle old entry */ - if (c1 >= 0xd800 && c1 < 0xe000) -- comb_tofront(root, c1 - 0xd800); -+ comb_tofront(c1 - 0xd800); - i = combchars[root]->prev; -- if (c1 == i + 0xd800) -+ if (i == 0x800 || i == 0x801 || c1 == i + 0xd800) - { - /* completely full, can't recycle */ - debug("utf8_handle_comp: completely full!\n"); -@@ -1422,7 +1425,7 @@ - mc->font = (i >> 8) + 0xd8; - mc->fontx = 0; - debug3("combinig char %x %x -> %x\n", c1, c, i + 0xd800); -- comb_tofront(root, i); -+ comb_tofront(i); - } - - #else /* !UTF8 */ diff --git a/package/screen/screen.hash b/package/screen/screen.hash index ca74ba8913..a261d3100d 100644 --- a/package/screen/screen.hash +++ b/package/screen/screen.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/screen/screen-4.8.0.tar.gz.sig -sha256 6e11b13d8489925fde25dfb0935bf6ed71f9eb47eff233a181e078fde5655aa1 screen-4.8.0.tar.gz +# https://ftp.gnu.org/gnu/screen/screen-4.9.0.tar.gz.sig +sha256 f9335281bb4d1538ed078df78a20c2f39d3af9a4e91c57d084271e0289c730f4 screen-4.9.0.tar.gz # Locally calculated -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/screen/screen.mk b/package/screen/screen.mk index 843c71fc2a..3239a1c1f3 100644 --- a/package/screen/screen.mk +++ b/package/screen/screen.mk @@ -4,7 +4,7 @@ # ################################################################################ -SCREEN_VERSION = 4.8.0 +SCREEN_VERSION = 4.9.0 SCREEN_SITE = $(BR2_GNU_MIRROR)/screen SCREEN_LICENSE = GPL-3.0+ SCREEN_LICENSE_FILES = COPYING @@ -16,9 +16,6 @@ SCREEN_CONF_ENV = CFLAGS="$(TARGET_CFLAGS)" SCREEN_CONF_OPTS = --enable-colors256 SCREEN_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) SCREEN=screen install_bin -# 0008_CVE-2021-26937.patch -SCREEN_IGNORE_CVES += CVE-2021-26937 - ifeq ($(BR2_PACKAGE_LINUX_PAM),y) SCREEN_DEPENDENCIES += linux-pam SCREEN_CONF_OPTS += --enable-pam -- 2.34.1 From luca at lucaceresoli.net Wed Feb 23 22:29:50 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Wed, 23 Feb 2022 23:29:50 +0100 Subject: [Buildroot] [PATCH v1 1/1] configs/zynqmp_zcu10x: fix U-Boot dts config In-Reply-To: <871qzt5pgn.fsf@dell.be.48ers.dk> References: <20220223125118.2325363-1-neal.frager@xilinx.com> <871qzt5pgn.fsf@dell.be.48ers.dk> Message-ID: <4f6c5422-e10a-f99b-4f3a-1118e026b8d8@lucaceresoli.net> Hi Peter, On 23/02/22 20:54, Peter Korsgaard wrote: >>>>>> "Luca" == Luca Ceresoli writes: > > > Hi Neal, > > On 23/02/22 13:51, Neal Frager wrote: > >> This patch: > >> - fixes U-Boot issue when DEVICE_TREE environment variable undefined > > > This appears unrelated from the version bumps. Please send separate patches. > > >> - bumps U-Boot to Xilinx 2022.01-171 > >> - bumps Linux to Xilinx 5.15-945 > > I don't have the zcu106 here anymore, but this new kernel didn't boot > here (no output after 'Starting Linux'). Does it boot for you? I'll try to test tomorrow. Anyway IIRC I have an Engineering Sample silicon, not sure whether this can prevent booting. -- Luca From romain.naour at gmail.com Thu Feb 24 00:14:55 2022 From: romain.naour at gmail.com (Romain Naour) Date: Thu, 24 Feb 2022 01:14:55 +0100 Subject: [Buildroot] [PATCH] support/testing: TestRust{Bin} use ripgrep package for testing Message-ID: <20220224001455.206249-1-romain.naour@gmail.com> TestRust and TestRustBin has been introduced at the time when there was no cargo package infrastructure or any package using rust compiler (Buildroot 2018.02). Since then the ripgrep package has been introduced, initially using the generic package infrastructure and converted later to the cargo package infrastructure. Due a recent change in rust/cargo removing the cargo config file [1] the test TestRust and TestRustBin now fail to compile since they build an hello-world crate outside of the cargo package infrastructure without the correct environment for cross-compiling. Replace the 'hello-world' crate by ripgrep package and check if it can run properly in Qemu. Fixes tests.package.test_rust.TestRustBin: https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202545 But doesn't fixes tests.package.test_rust.TestRust due another bug: https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202544 [1] b6378631c2609742382984f6f7b93c1d9d2cdb78 Signed-off-by: Romain Naour --- Using ripgrep or bat package trigger an issue while using rustc: error[E0514]: found crate `core` compiled by an incompatible version of rustc | = help: please recompile that crate using this compiler (rustc 1.58.1) (consider running `cargo clean` first) = note: the following crate versions were found: crate `core` compiled by rustc 1.58.1 (db9d1b20b 2022-01-20): TestRust/host/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcore-6cfcec236d576603.rlib error[E0514]: found crate `std` compiled by an incompatible version of rustc The problem is not really a cross-compilation issue (we are building for an armv7 on x86_64 host) but a problem with rustc libraries (rlib). We can notice that "rustc 1.58.1 (db9d1b20b 2022-01-20)" is the same version as the prebuilt rustc: TestRust/host/bin/rustc --version rustc 1.58.1 TestRustBin/host/bin/rustc --version rustc 1.58.1 (db9d1b20b 2022-01-20) Indeed we are using host-rust-bin to bootstrap the host-rust compiler package built by Buildroot. The problem is that the libcore-6cfcec236d576603.rlib file come from host-rust-bin and is not removed before installing host-rust built by Buildroot. We notice that host-rust can't override libcore-6cfcec236d576603.rlib because it use another hash libcore-79e5699dd357edbd.rlib To fixes the ripgrep build we have to copy manually (for now) all rlib files from TestRust/build/tmp/tarball/rust-std/x86_64-unknown-linux-gnu/image/lib/rustlib/x86_64-unknown-linux-gnu/lib to TestRust/host/lib/rustlib/x86_64-unknown-linux-gnu/lib (Indeed we spent a lot of time to build host-rust and some important libraries are not installed to HOST_DIR) When Buildroot build its rust compiler we probably need to avoid installing in HOST_DIR the rust compiler used to bootstrap. --- support/testing/tests/package/test_rust.py | 48 ++-------------------- 1 file changed, 4 insertions(+), 44 deletions(-) diff --git a/support/testing/tests/package/test_rust.py b/support/testing/tests/package/test_rust.py index 884b40a4a3..a1abd20c09 100644 --- a/support/testing/tests/package/test_rust.py +++ b/support/testing/tests/package/test_rust.py @@ -8,9 +8,6 @@ import infra.basetest class TestRustBase(infra.basetest.BRTest): - target = 'armv7-unknown-linux-gnueabihf' - crate = 'hello-world' - def login(self): img = os.path.join(self.builddir, "images", "rootfs.cpio") self.emulator.boot(arch="armv7", @@ -18,43 +15,6 @@ class TestRustBase(infra.basetest.BRTest): options=["-initrd", img]) self.emulator.login() - def build_test_prog(self): - hostdir = os.path.join(self.builddir, 'host') - env = os.environ.copy() - env["USER"] = "br-user" - env["PATH"] = "{}:".format(os.path.join(hostdir, 'bin')) + env["PATH"] - env["CARGO_HOME"] = os.path.join(hostdir, 'usr', 'share', 'cargo') - env["RUST_TARGET_PATH"] = os.path.join(hostdir, 'etc', 'rustc') - cargo = os.path.join(hostdir, 'bin', 'cargo') - workdir = os.path.join(tempfile.mkdtemp(suffix='-br2-testing-rust'), - self.crate) - manifest = os.path.join(workdir, 'Cargo.toml') - prog = os.path.join(workdir, 'target', self.target, 'debug', self.crate) - - cmd = [cargo, 'init', '--bin', '--vcs', 'none', '-vv', workdir] - ret = subprocess.call(cmd, - stdout=self.b.logfile, - stderr=self.b.logfile, - env=env) - if ret != 0: - raise SystemError("Cargo init failed") - - cmd = [ - cargo, 'build', '-vv', '--target', self.target, - '--manifest-path', manifest - ] - ret = subprocess.call(cmd, - stdout=self.b.logfile, - stderr=self.b.logfile, - env=env) - if ret != 0: - raise SystemError("Cargo build failed") - - shutil.copy(prog, os.path.join(self.builddir, 'target', 'usr', 'bin')) - self.b.build() - shutil.rmtree(workdir) - - class TestRustBin(TestRustBase): config = \ """ @@ -68,12 +28,12 @@ class TestRustBin(TestRustBase): BR2_TARGET_ROOTFS_CPIO=y # BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_RUSTC=y + BR2_PACKAGE_RIPGREP=y """ def test_run(self): - self.build_test_prog() self.login() - self.assertRunOk(self.crate) + self.assertRunOk("rg Buildroot /etc/issue") class TestRust(TestRustBase): @@ -90,9 +50,9 @@ class TestRust(TestRustBase): # BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_RUSTC=y BR2_PACKAGE_HOST_RUST=y + BR2_PACKAGE_RIPGREP=y """ def test_run(self): - self.build_test_prog() self.login() - self.assertRunOk(self.crate) + self.assertRunOk("rg Buildroot /etc/issue") -- 2.35.1 From bugzilla at busybox.net Thu Feb 24 01:44:58 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Thu, 24 Feb 2022 01:44:58 +0000 Subject: [Buildroot] [Bug 14606] New: Updated qt5webkit issue in 2022.02-rc2 Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14606 Bug ID: 14606 Summary: Updated qt5webkit issue in 2022.02-rc2 Product: buildroot Version: unspecified Hardware: All OS: Linux Status: NEW Severity: normal Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: brock at cottonwoodcomputer.com CC: buildroot at uclibc.org Target Milestone: --- Testing my build against 2022.02-rc2 and qmake fails to build our Qt project: Project ERROR: Unknown module(s) in QT: webkit Digging into it a bit, the updated qt5webkit package appears to be installing the mkspecs into the target instead of the host. Also the mkspecs have hardcoded library and include paths instead of using $$QT_MODULE_INCLUDE_BASE etc like the other Qt packages -- You are receiving this mail because: You are on the CC list for the bug. From peterlin at andestech.com Thu Feb 24 02:41:37 2022 From: peterlin at andestech.com (Yu Chien Peter Lin) Date: Thu, 24 Feb 2022 10:41:37 +0800 Subject: [Buildroot] [PATCH v4 1/3] board/andes: rearrange andes folder structure In-Reply-To: References: <20220223071049.21153-1-peterlin@andestech.com> <84e159d2-0123-e5b1-c42e-99b70c99f43c@benettiengineering.com> Message-ID: Hi Giulio, > > > > > > Changes v3 -> v4: > > > > > > - rename ae3xx folder to ae300 > > > > > > - rename andes_ae3xx_defconfig to andes_ae300_defconfig > > > > > > - update readme.txt and item in DEVELOPERS > > > > > > > > > > Some of these change ^^^ must have been moved to the single patch, like > > > > > DEVELOPERS is updated in patch 3/3. I've also forgotten to point you to add > > > > > a --cover-letter, so keep in mind both points for next time. > > > > > > > > > > I've built tested both defconfig successfully, so: > > > > > Reviewed-by: Giulio Benetti > > > > > Tested-by: Giulio Benetti > > > > > [Giulio: build tested only] > > > > > > > > > > And the other patches of this series is all reviewed, so to me it's ready to > > > > > be committed, but this will happen after Buildroot 2022.02 is released, > > > > > since between rc1 to the release Maintainers only accept fixes. Another > > > > > possibility is that they will commit these patches to next branch. > > > > > > > > > > Please remember to tag V3. Oh, I thought you were refering to format-patch with v3, sorry. I will mark the patch on patchwork to rejected state except the latest patch version. > > > > > Thank you for your effort! > > > > > > > > > > Best regards > > > > > -- > > > > > Giulio Benetti > > > > > Benetti Engineering sas > > > > > > Thanks for reviewing my patches and the guidance. > > > > You're welcome. > > > > > I will make a new patch for the Config.in, > > > > Which one? I only see: > > toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in > > > > Do you mean you will add an entry in DEVELOPERS for it? I found the modifications on these files in Git history, usually have its own patch. So in PATCH v5, I will split [PATCH 1/3] to [PATCH 1/4] and [PATCH 2/4] for toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in other patches remain the same, and attach [PATCH 0/4] cover letter. > > > The last question, is it tag V5 for the next submission? > > > > It depends if you need to modify these patches. Or if you add a new patch > > that depends on these patches, then yes, please send a V5 with all changes > > moved to the different patches, including adding the patch if this is your > > goal. > > > > Best regards > > -- > > Giulio Benetti > > Benetti Engineering sas Is there any the new comment? Again, thanks for your help. :) Best regards, Yu Chien Peter Lin From bugzilla at busybox.net Thu Feb 24 06:35:11 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Thu, 24 Feb 2022 06:35:11 +0000 Subject: [Buildroot] [Bug 14601] Python build fails on 2022.02-rc2 In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14601 --- Comment #2 from HiFiBerry (Daniel) --- Might not have to do with the -O option (that was just a guess), but the install path is clearly incorrect. My config here is quite complex and uses lots of additional stuff. However, it was working fine up to 2021.11 Any recommendation how to go on debugging this? -- You are receiving this mail because: You are on the CC list for the bug. From nealf at xilinx.com Thu Feb 24 06:54:35 2022 From: nealf at xilinx.com (Neal Frager) Date: Thu, 24 Feb 2022 06:54:35 +0000 Subject: [Buildroot] [PATCH v4 1/1] configs/zynqmp_zcu10x: fix U-Boot dts config In-Reply-To: <87wnhl4ab4.fsf@dell.be.48ers.dk> References: <20220223180336.3372352-1-neal.frager@xilinx.com> <87wnhl4ab4.fsf@dell.be.48ers.dk> Message-ID: Hi Peter, > Most (but not all) fragment files are using the .fragment suffix, so I renamed these to uboot.fragment. I dropped the reviewed-by and reworded the commit text a bit and committed - Thanks. Thank you for this update and commit. I have tested the clean build with this patch this morning, and I confirm that it works as expected. I am not sure why I had a build issue yesterday. Starting from a new clean build worked correctly. Also, I confirm that I ran my test with the environment variable DEVICE_TREE undefined. With this new patch, there are no requirements for environment definitions. Have you tested this patch on your ZCU106 yet? Best regards, Neal Frager Xilinx From peter at korsgaard.com Thu Feb 24 07:35:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 24 Feb 2022 08:35:42 +0100 Subject: [Buildroot] [PATCH v4 1/1] configs/zynqmp_zcu10x: fix U-Boot dts config In-Reply-To: (Neal Frager's message of "Thu, 24 Feb 2022 06:54:35 +0000") References: <20220223180336.3372352-1-neal.frager@xilinx.com> <87wnhl4ab4.fsf@dell.be.48ers.dk> Message-ID: <87sfs84sz5.fsf@dell.be.48ers.dk> >>>>> "Neal" == Neal Frager writes: > Hi Peter, >> Most (but not all) fragment files are using the .fragment suffix, so > I renamed these to uboot.fragment. I dropped the reviewed-by and > reworded the commit text a bit and committed - Thanks. > Thank you for this update and commit. I have tested the clean build > with this patch this morning, and I confirm that it works as expected. > I am not sure why I had a build issue yesterday. Starting from a new clean build worked correctly. > Also, I confirm that I ran my test with the environment variable > DEVICE_TREE undefined. With this new patch, there are no requirements > for environment definitions. > Have you tested this patch on your ZCU106 yet? Yes, I was successfully able to build and boot it (without the kernel bump) here. -- Bye, Peter Korsgaard From luca at lucaceresoli.net Thu Feb 24 08:02:52 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Thu, 24 Feb 2022 09:02:52 +0100 Subject: [Buildroot] [PATCH v4 1/1] configs/zynqmp_zcu10x: fix U-Boot dts config In-Reply-To: <87sfs84sz5.fsf@dell.be.48ers.dk> References: <20220223180336.3372352-1-neal.frager@xilinx.com> <87wnhl4ab4.fsf@dell.be.48ers.dk> <87sfs84sz5.fsf@dell.be.48ers.dk> Message-ID: <158816b4-5b1e-1fe6-0e7b-6b289dd42c15@lucaceresoli.net> Hi, On 24/02/22 08:35, Peter Korsgaard wrote: >>>>>> "Neal" == Neal Frager writes: > > > Hi Peter, > >> Most (but not all) fragment files are using the .fragment suffix, so > > I renamed these to uboot.fragment. I dropped the reviewed-by and > > reworded the commit text a bit and committed - Thanks. > > > Thank you for this update and commit. I have tested the clean build > > with this patch this morning, and I confirm that it works as expected. > > > I am not sure why I had a build issue yesterday. Starting from a new clean build worked correctly. > > > Also, I confirm that I ran my test with the environment variable > > DEVICE_TREE undefined. With this new patch, there are no requirements > > for environment definitions. > > > Have you tested this patch on your ZCU106 yet? > > Yes, I was successfully able to build and boot it (without the kernel > bump) here. ...and here too. Thank you both! -- Luca From nealf at xilinx.com Thu Feb 24 08:55:31 2022 From: nealf at xilinx.com (Neal Frager) Date: Thu, 24 Feb 2022 08:55:31 +0000 Subject: [Buildroot] [PATCH v4 1/1] configs/zynqmp_zcu10x: fix U-Boot dts config In-Reply-To: <87sfs84sz5.fsf@dell.be.48ers.dk> References: <20220223180336.3372352-1-neal.frager@xilinx.com> <87wnhl4ab4.fsf@dell.be.48ers.dk> <87sfs84sz5.fsf@dell.be.48ers.dk> Message-ID: Hi Peter, > Yes, I was successfully able to build and boot it (without the kernel > bump) here. I will hold off on my next version bump patch until Xilinx releases version 2022.1 in April. The next bump will move from sha repos to the 2022.1 tag repos for U-Boot, ATF and Linux. Thanks for confirming that we at least have a working version in buildroot now! Best regards, Neal Frager Xilinx From nealf at xilinx.com Thu Feb 24 08:56:40 2022 From: nealf at xilinx.com (Neal Frager) Date: Thu, 24 Feb 2022 08:56:40 +0000 Subject: [Buildroot] [PATCH v4 1/1] configs/zynqmp_zcu10x: fix U-Boot dts config In-Reply-To: <158816b4-5b1e-1fe6-0e7b-6b289dd42c15@lucaceresoli.net> References: <20220223180336.3372352-1-neal.frager@xilinx.com> <87wnhl4ab4.fsf@dell.be.48ers.dk> <87sfs84sz5.fsf@dell.be.48ers.dk> <158816b4-5b1e-1fe6-0e7b-6b289dd42c15@lucaceresoli.net> Message-ID: Hi Luca, > ...and here too. > Thank you both! I am glad to hear that your pre-production ZCU106 board works with the latest software. Best regards, Neal Frager Xilinx From bugzilla at busybox.net Thu Feb 24 09:28:52 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Thu, 24 Feb 2022 09:28:52 +0000 Subject: [Buildroot] [Bug 14611] New: 2022.02-rc2: Build of BR2_x86_64 with BR2_LINUX_KERNEL_LATEST_VERSION=y broken Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14611 Bug ID: 14611 Summary: 2022.02-rc2: Build of BR2_x86_64 with BR2_LINUX_KERNEL_LATEST_VERSION=y broken Product: buildroot Version: unspecified Hardware: PC OS: Linux Status: NEW Severity: blocker Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: f.rogall at gmx.de CC: buildroot at uclibc.org Target Milestone: --- The building of BR2_x86_64 with BR2_LINUX_KERNEL_LATEST_VERSION=y on Buildroot 2022.02-rc2 does not work. >>> linux-headers 5.15.13 Building >>> linux-headers 5.15.13 Installing to staging directory (cd /home/fr/work/egate/x/egate/build/linux-headers-5.15.13; PATH="/home/fr/work/egate/x/egate/host/bin:/home/fr/work/egate/x/egate/host/sbin:/home/fr/bin:/home/fr/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin" /usr/bin/make -j9 ARCH=x86_64 HOSTCC="/usr/bin/gcc" HOSTCFLAGS="" HOSTCXX="/usr/bin/g++" INSTALL_HDR_PATH=/home/fr/work/egate/x/egate/host/x86_64-buildroot-linux-gnu/sysroot/usr headers_install) INSTALL /home/fr/work/egate/x/egate/host/x86_64-buildroot-linux-gnu/sysroot/usr/include if ! support/scripts/check-kernel-headers.sh /home/fr/work/egate/x/egate/build /home/fr/work/egate/x/egate/host/x86_64-buildroot-linux-gnu/sysroot 5.16 loose; then exit 1; fi Incorrect selection of kernel headers: expected 5.16.x, got 5.15.x make[1]: *** [package/pkg-generic.mk:332: /home/fr/work/egate/x/egate/build/linux-headers-5.15.13/.stamp_staging_installed] Error 1 make: *** [Makefile:84: _all] Error 2 -- You are receiving this mail because: You are on the CC list for the bug. From thomas.petazzoni at bootlin.com Thu Feb 24 09:55:21 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 24 Feb 2022 09:55:21 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-02-23 Message-ID: <20220224095527.35780825D3@smtp1.osuosl.org> Hello, Autobuild statistics for 2022-02-23 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 50 | 8 | 0 | 58 | 2021.11.x | 11 | 0 | 0 | 11 | master | 64 | 38 | 0 | 102 | Classification of failures by reason for master ----------------------------------------------- host-libselinux-3.3 | 13 python-greenlet-1.1.2 | 3 target-finalize | 3 unknown | 3 bpftool-a7f0e7f057283ae8af3... | 2 frr-8.1 | 2 suricata-6.0.4 | 2 bat-0.19.0 | 1 bluez5_utils-5.63 | 1 efl-1.26.1 | 1 ffmpeg-4.4.1 | 1 ghostscript-9.55.0 | 1 google-breakpad-7515ab13768... | 1 opencv4-4.5.5 | 1 qt5webkit-5.212.0-alpha4 | 1 safeclib-3.7.1 | 1 weston-10.0.0 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | bat-0.19.0 | NOK | http://autobuild.buildroot.net/results/c7367643f2ca3ebf2aeed453ee210434b0f6a1d7 | mips64el | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/76beed20c7b218b1bca7bbe0274add6dd701b8ee | sparc64 | bpftool-a7f0e7f057283ae8af3... | NOK | http://autobuild.buildroot.net/results/b8a63bba0d75fd3cfed53ebede47a5c4464c6145 | arm | bpftool-a7f0e7f057283ae8af3... | NOK | http://autobuild.buildroot.net/results/62244f13564e745d702a217b0a67cd0768fe840a | x86_64 | efl-1.26.1 | NOK | http://autobuild.buildroot.net/results/ee8e650e28a1dcebee36c8e1fdbbe3926b56a92d | arm | ffmpeg-4.4.1 | NOK | http://autobuild.buildroot.net/results/476ee51a6e8a819cfdb61965e7827e6e053301dc | microblazeel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/4e1f1ef763567ec1cd415055916d25284a18e6c2 | microblazeel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/7bde2f954214cf286d4561b01b45a07301b8260a | arm | ghostscript-9.55.0 | NOK | http://autobuild.buildroot.net/results/74044a08ace770ea63b9a86f897c6ec2626aca40 | mipsel | google-breakpad-7515ab13768... | NOK | http://autobuild.buildroot.net/results/ebb8b3bc0e656fafdfaf2ef34fa32c8c3f7143b9 | powerpc | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/0cfafc65f4dde41c709e8e3e25845dbbc8d458d7 | xtensa | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/e3e4712d835ea744d58949760e6b562b88d40711 | riscv64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/1e52d191e18cb1d2015bf63f5eeb7995b14727cf | sh4 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/abebcadcab55a0b73b9462e20fd04c18cdcc2e39 | riscv32 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/ce93d336d2b011c4697c90a5f0e1eb6c076b26b5 | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/84758d4ca7d846e3c7a9601c2d487415eca34918 | mips64el | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/fd01a3405888b72da1d7aa11292269e12f9c30cf | riscv64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/60a8a107c4d3b4e2b6568ef0036d8c5cdfa2dc41 | x86_64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/6a328a22b07cff68472ce997e7de7371e60276c0 | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/2aeca17751a7cdeb5dfbc5909187464ba1a227ee | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/254d84c4e9fa35dff6436612d2d41c9bf97d62ac | powerpc64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/2f4001271125341adfde293a83a74020dff31314 | nios2 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/c75e3209f9ccaef3ab86c4d7da40fda830157374 | xtensa | opencv4-4.5.5 | NOK | http://autobuild.buildroot.net/results/c94a18a0810e449fe92c9b5c30ecc6c10b864ef3 | powerpc | python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/04449db582f8c258244f29897ed27bf334199f46 | mips64el | python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/7d7b70b77588bd1a212edce05c19e1869692d693 | x86_64 | python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/7c9e6dd6217b735f465acf0c5a365756feea06e8 | arm | qt5webkit-5.212.0-alpha4 | NOK | http://autobuild.buildroot.net/results/0364a1e2cbd0f47914d287716f846e770ccf4dfb | arm | safeclib-3.7.1 | NOK | http://autobuild.buildroot.net/results/e66e0669129eede2f10d81994249f2d2d6453875 | arm | suricata-6.0.4 | NOK | http://autobuild.buildroot.net/results/82df49727cb359905359524520fb7b64e50fdf34 | arm | suricata-6.0.4 | NOK | http://autobuild.buildroot.net/results/d21d2f887f845b2605bf642184b47c35707c29b0 | s390x | target-finalize | NOK | http://autobuild.buildroot.net/results/9bf6dcbc67ff75977b55ba9d5ecb0c39e3044d92 | arm | target-finalize | NOK | http://autobuild.buildroot.net/results/78ee9b31978bf199321651312e6cc4e1684f3e0f | nios2 | target-finalize | NOK | http://autobuild.buildroot.net/results/bd8d32bcb01a1a5419eb018e76f9ef3d2b0c238b | arm | unknown | NOK | http://autobuild.buildroot.net/results/0b22ae831003fad27d31768e25b3f0b1c1e7f19d | arm | unknown | NOK | http://autobuild.buildroot.net/results/a2a979382652fcee7847e41360a310c2edcd2825 | arm | unknown | NOK | http://autobuild.buildroot.net/results/e5067885b0072a4327737270cbf192e6ddd4821e | sparc | weston-10.0.0 | NOK | http://autobuild.buildroot.net/results/3095e15e129c15b2bccb56e8841b6b2d285cc572 | Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 3 gdb-9.2 | 1 mesa3d-20.3.5 | 1 monkey-f54856ce250c4e257354... | 1 rocksdb-6.13.3 | 1 zeromq-4.3.4 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- aarch64 | gdb-9.2 | NOK | http://autobuild.buildroot.net/results/72407799606c5a34894938ae8418e3c9a8442aa7 | ORPH arm | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/d4c8d95ae421cc600e703f2b9ec9d78565b31131 | xtensa | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/d8ba9306b0a7484d74c4ee7357ff850cd1be86b0 | arm | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/85d6fbe1757dde8470cb1f374d5a25b02b045673 | mips64el | mesa3d-20.3.5 | NOK | http://autobuild.buildroot.net/results/a8eb04e4a155fe43e05fa9fc50584bc2283b5fb7 | mips64el | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/c69edb7d4cb1af59ff289630fbc604307d1972a7 | powerpc | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/fabbd8f745c6b863277f4a72a487d7263dd5725f | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/557a844678bea226d39204bd4daf7e9644de3dd8 | -- http://autobuild.buildroot.net From angelo at amarulasolutions.com Thu Feb 24 11:37:34 2022 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Thu, 24 Feb 2022 12:37:34 +0100 Subject: [Buildroot] [PATCH 1/2] linux: bump CIP kernel to version 5.10.100-cip2 Message-ID: <20220224113735.4088631-1-angelo@amarulasolutions.com> Signed-off-by: Angelo Compagnucci --- linux/Config.in | 4 ++-- linux/linux.hash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 13d99bd09d..c454a89fba 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -31,7 +31,7 @@ config BR2_LINUX_KERNEL_LATEST_VERSION bool "Latest version (5.15)" config BR2_LINUX_KERNEL_LATEST_CIP_VERSION - bool "Latest CIP SLTS version (5.10.83-cip1)" + bool "Latest CIP SLTS version (5.10.100-cip2)" help CIP launched in the spring of 2016 to address the needs of organizations in industries such as power generation and @@ -126,7 +126,7 @@ endif config BR2_LINUX_KERNEL_VERSION string 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.100-cip2" 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 \ if BR2_LINUX_KERNEL_CUSTOM_VERSION diff --git a/linux/linux.hash b/linux/linux.hash index d0813e5db4..8b689f122b 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -9,7 +9,7 @@ sha256 fd4bdbc8be3472d6324fa0f5f57a17f5c3f509d5f5b4fa4f1a9797d982d0bca8 linux- 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 e90e8100bf44cdd6714bca3b9b1f78694c99bfa9bdff761de06b192dfb230831 linux-cip-5.10.100-cip2.tar.gz sha256 2395443c5f960e5c6343f70480209d2530da27aa6f0299412e0f4b7128fccb7c linux-cip-5.10.83-cip1-rt1.tar.gz # Licenses hashes -- 2.25.1 From angelo at amarulasolutions.com Thu Feb 24 11:37:35 2022 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Thu, 24 Feb 2022 12:37:35 +0100 Subject: [Buildroot] [PATCH 2/2] linux: bump CIP RT kernel to version 5.10.100-cip2-rt2 In-Reply-To: <20220224113735.4088631-1-angelo@amarulasolutions.com> References: <20220224113735.4088631-1-angelo@amarulasolutions.com> Message-ID: <20220224113735.4088631-2-angelo@amarulasolutions.com> Signed-off-by: Angelo Compagnucci --- linux/Config.in | 4 ++-- linux/linux.hash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index c454a89fba..eb602eb505 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -50,7 +50,7 @@ config BR2_LINUX_KERNEL_LATEST_CIP_VERSION https://www.cip-project.org config BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION - bool "Latest CIP RT SLTS version (5.10.83-cip1-rt1)" + bool "Latest CIP RT SLTS version (5.10.100-cip2-rt2)" help Same as the CIP version, but this is the PREEMPT_RT realtime variant. @@ -127,7 +127,7 @@ config BR2_LINUX_KERNEL_VERSION string default "5.15.13" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.100-cip2" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION - default "5.10.83-cip1-rt1" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION + default "5.10.100-cip2-rt2" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL diff --git a/linux/linux.hash b/linux/linux.hash index 8b689f122b..a47ec9ca6f 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -10,7 +10,7 @@ sha256 bffaaa4c93ab4ed1de61f804c26c92b82dd80f92793e20194b62497d7b8b4723 linux- sha256 01ccfc3413c3bb305653ceb0aa528aba0caa61b326e43709bf1f8b624f211031 linux-4.19.224.tar.xz # Locally computed sha256 e90e8100bf44cdd6714bca3b9b1f78694c99bfa9bdff761de06b192dfb230831 linux-cip-5.10.100-cip2.tar.gz -sha256 2395443c5f960e5c6343f70480209d2530da27aa6f0299412e0f4b7128fccb7c linux-cip-5.10.83-cip1-rt1.tar.gz +sha256 945b63f280c5bd9aad66016ef6fbed57612864192bc0f54f6800562f56cfd518 linux-cip-5.10.100-cip2-rt2.tar.gz # Licenses hashes sha256 fb5a425bd3b3cd6071a3a9aff9909a859e7c1158d54d32e07658398cd67eb6a0 COPYING -- 2.25.1 From marcus.hoffmann at othermo.de Thu Feb 24 14:07:59 2022 From: marcus.hoffmann at othermo.de (Marcus Hoffmann) Date: Thu, 24 Feb 2022 15:07:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/docker-engine: remove unused sqlite In-Reply-To: <20220221120657.4095013-1-tianyuanhao3@163.com> References: <20220221120657.4095013-1-tianyuanhao3@163.com> Message-ID: <9f038ee9-b8c4-3c56-36eb-971690a40b8c@othermo.de> On 21.02.22 13:06, TIAN Yuanhao wrote: > Dependency on sqlite has been removed since v17.04.0-ce. > > See: https://github.com/moby/moby/pull/30208 > > Signed-off-by: TIAN Yuanhao Tested to work on arm64, various docker functionality still works fine. Tested-by: Marcus Hoffmann > --- > package/docker-engine/Config.in | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in > index 911cbfe428..1f0efb8fcc 100644 > --- a/package/docker-engine/Config.in > +++ b/package/docker-engine/Config.in > @@ -9,7 +9,6 @@ config BR2_PACKAGE_DOCKER_ENGINE > select BR2_PACKAGE_CONTAINERD # runtime dependency > select BR2_PACKAGE_DOCKER_PROXY # runtime dependency > select BR2_PACKAGE_IPTABLES # runtime dependency > - select BR2_PACKAGE_SQLITE # runtime dependency > help > Docker is a platform to build, ship, > and run applications as lightweight containers. From giulio.benetti at benettiengineering.com Thu Feb 24 15:12:10 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 24 Feb 2022 16:12:10 +0100 Subject: [Buildroot] [PATCH v4 1/3] board/andes: rearrange andes folder structure In-Reply-To: References: <20220223071049.21153-1-peterlin@andestech.com> <84e159d2-0123-e5b1-c42e-99b70c99f43c@benettiengineering.com> Message-ID: <111a4578-2489-09db-909c-774017800746@benettiengineering.com> Hi Peter, On 24/02/22 03:41, Yu Chien Peter Lin wrote: > Hi Giulio, > >>>>>>> Changes v3 -> v4: >>>>>>> - rename ae3xx folder to ae300 >>>>>>> - rename andes_ae3xx_defconfig to andes_ae300_defconfig >>>>>>> - update readme.txt and item in DEVELOPERS >>>>>> >>>>>> Some of these change ^^^ must have been moved to the single patch, like >>>>>> DEVELOPERS is updated in patch 3/3. I've also forgotten to point you to add >>>>>> a --cover-letter, so keep in mind both points for next time. >>>>>> >>>>>> I've built tested both defconfig successfully, so: >>>>>> Reviewed-by: Giulio Benetti >>>>>> Tested-by: Giulio Benetti >>>>>> [Giulio: build tested only] >>>>>> >>>>>> And the other patches of this series is all reviewed, so to me it's ready to >>>>>> be committed, but this will happen after Buildroot 2022.02 is released, >>>>>> since between rc1 to the release Maintainers only accept fixes. Another >>>>>> possibility is that they will commit these patches to next branch. >>>>>> >>>>>> Please remember to tag V3. > > Oh, I thought you were refering to format-patch with v3, sorry. > I will mark the patch on patchwork to rejected state except the latest > patch version. Ok, V3 it's still tagged as new in patchwork for the moment. >>>>>> Thank you for your effort! >>>>>> >>>>>> Best regards >>>>>> -- >>>>>> Giulio Benetti >>>>>> Benetti Engineering sas >>>> >>>> Thanks for reviewing my patches and the guidance. >>> >>> You're welcome. >>> >>>> I will make a new patch for the Config.in, >>> >>> Which one? I only see: >>> toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in >>> >>> Do you mean you will add an entry in DEVELOPERS for it? > > I found the modifications on these files in Git history, usually have > its own patch. No, maybe you mean there is a cover-letter that summarize the changes of all patches in patchset and then in every patch you list the changes of on that patch. > So in PATCH v5, I will split [PATCH 1/3] to [PATCH 1/4] > and [PATCH 2/4] for > toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in > other patches remain the same, No, wait. I've meant you only need to split: --- Changes v1->v2: * * [..] --- for every patch. So, don't summarize all the changes on patch [1/3], because those changes are related to different patches. For example in V1->V2 you state: - update DEVELOPERS but you do it in patch [3/3], so you only have to move the changes into the right patch, that's all. > and attach [PATCH 0/4] cover letter. And yes please, add a cover letter that briefly explain what patchset does and that's it. >>>> The last question, is it tag V5 for the next submission? >>> >>> It depends if you need to modify these patches. Or if you add a new patch >>> that depends on these patches, then yes, please send a V5 with all changes >>> moved to the different patches, including adding the patch if this is your >>> goal. >>> >>> Best regards >>> -- >>> Giulio Benetti >>> Benetti Engineering sas > > Is there any the new comment? > Again, thanks for your help. :) For the moment I don't see anything wrong except the changelog. Thank you! Best regards -- Giulio Benetti Benetti Engineering sas From giulio.benetti at benettiengineering.com Thu Feb 24 15:23:39 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 24 Feb 2022 16:23:39 +0100 Subject: [Buildroot] [PATCH] package/erlang-jiffy: bump version to 1.1.1 Message-ID: <20220224152339.442421-1-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- package/erlang-jiffy/erlang-jiffy.hash | 2 +- package/erlang-jiffy/erlang-jiffy.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/erlang-jiffy/erlang-jiffy.hash b/package/erlang-jiffy/erlang-jiffy.hash index 93c5e1f8c8..f172d1476e 100644 --- a/package/erlang-jiffy/erlang-jiffy.hash +++ b/package/erlang-jiffy/erlang-jiffy.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 45c224afe0ea2d3ece39e227f01f5585ad53b8b91d2d6924f9f50548874ae879 erlang-jiffy-1.0.9.tar.gz +sha256 a999351d956d3ed10c33a6dd7e9435e674e519b5b82a46d60361afdb83062fd8 erlang-jiffy-1.1.1.tar.gz sha256 0fa8afad2f02c08850a16e36fe55376ee19732b3a116a0207f2a73c857777a49 LICENSE diff --git a/package/erlang-jiffy/erlang-jiffy.mk b/package/erlang-jiffy/erlang-jiffy.mk index cd94632962..de2e4749fb 100644 --- a/package/erlang-jiffy/erlang-jiffy.mk +++ b/package/erlang-jiffy/erlang-jiffy.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_JIFFY_VERSION = 1.0.9 +ERLANG_JIFFY_VERSION = 1.1.1 ERLANG_JIFFY_SITE = $(call github,davisp,jiffy,$(ERLANG_JIFFY_VERSION)) ERLANG_JIFFY_LICENSE = MIT (core), \ BSD-3-Clause (Google double conversion library), \ -- 2.25.1 From romain.naour at gmail.com Thu Feb 24 15:41:18 2022 From: romain.naour at gmail.com (Romain Naour) Date: Thu, 24 Feb 2022 16:41:18 +0100 Subject: [Buildroot] [PATCH] package/pkg-python: use SETUPTOOLS_USE_DISTUTILS=stdlib Message-ID: <20220224154118.220408-1-romain.naour@gmail.com> -sh: ipython: not found ipython use a wrong shebang on the target: # head -n 1 /usr/bin/ipython #!/home/kubu/buildroot/testsuite-master/TestIPythonPy3/host/bin/python The issue come from python3-setuptools 60.0.0 that changed SETUPTOOLS_USE_DISTUTILS default value from stdlib to local [1] to use its local copy of distutils. This is actually a "breaking" change [2]. We have to override SETUPTOOLS_USE_DISTUTILS to the previous value "stdlib" to fixes the issue. While at it, use distutils from stdlib for the host. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2088684091 [1] https://github.com/pypa/setuptools/commit/b6fcbbd00cb6d5607c9272dec452a50457bdb292 [2] https://github.com/pypa/setuptools/blob/v60.0.0/CHANGES.rst#breaking-changes Signed-off-by: Romain Naour Cc: James Hilliard --- package/pkg-python.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index b8dc9cd9e5..e81a1a3102 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -40,6 +40,7 @@ PKG_PYTHON_DISTUTILS_ENV = \ LDSHARED="$(TARGET_CROSS)gcc -shared" \ PYTHONPATH="$(PYTHON3_PATH)" \ PYTHONNOUSERSITE=1 \ + SETUPTOOLS_USE_DISTUTILS=stdlib \ _PYTHON_HOST_PLATFORM="$(PKG_PYTHON_HOST_PLATFORM)" \ _PYTHON_PROJECT_BASE="$(PYTHON3_DIR)" \ _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ @@ -62,6 +63,7 @@ PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS = \ HOST_PKG_PYTHON_DISTUTILS_ENV = \ PATH=$(BR_PATH) \ PYTHONNOUSERSITE=1 \ + SETUPTOOLS_USE_DISTUTILS=stdlib \ $(HOST_CONFIGURE_OPTS) HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \ @@ -76,6 +78,7 @@ PKG_PYTHON_SETUPTOOLS_ENV = \ $(TARGET_CONFIGURE_OPTS) \ PYTHONPATH="$(PYTHON3_PATH)" \ PYTHONNOUSERSITE=1 \ + SETUPTOOLS_USE_DISTUTILS=stdlib \ _python_sysroot=$(STAGING_DIR) \ _python_prefix=/usr \ _python_exec_prefix=/usr @@ -96,6 +99,7 @@ PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS = \ HOST_PKG_PYTHON_SETUPTOOLS_ENV = \ PATH=$(BR_PATH) \ PYTHONNOUSERSITE=1 \ + SETUPTOOLS_USE_DISTUTILS=stdlib \ $(HOST_CONFIGURE_OPTS) HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ -- 2.35.1 From romain.naour at gmail.com Thu Feb 24 15:45:12 2022 From: romain.naour at gmail.com (Romain Naour) Date: Thu, 24 Feb 2022 16:45:12 +0100 Subject: [Buildroot] [PATCHv2 1/2] support/testing: TestRust{Bin} use ripgrep package for testing Message-ID: <20220224154513.220976-1-romain.naour@gmail.com> TestRust and TestRustBin has been introduced at the time when there was no cargo package infrastructure or any package using rust compiler (Buildroot 2018.02). Since then the ripgrep package has been introduced, initially using the generic package infrastructure and converted later to the cargo package infrastructure. Due a recent change in rust/cargo removing the cargo config file [1] the test TestRust and TestRustBin now fail to compile since they build an hello-world crate outside of the cargo package infrastructure without the correct environment for cross-compiling. Replace the 'hello-world' crate by ripgrep package and check if it can run properly in Qemu. Fixes tests.package.test_rust.TestRustBin: https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202545 But doesn't fixes tests.package.test_rust.TestRust due another bug: https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202544 [1] b6378631c2609742382984f6f7b93c1d9d2cdb78 Signed-off-by: Romain Naour Cc: Eric Le Bihan --- v2: no changes --- support/testing/tests/package/test_rust.py | 48 ++-------------------- 1 file changed, 4 insertions(+), 44 deletions(-) diff --git a/support/testing/tests/package/test_rust.py b/support/testing/tests/package/test_rust.py index 884b40a4a3..a1abd20c09 100644 --- a/support/testing/tests/package/test_rust.py +++ b/support/testing/tests/package/test_rust.py @@ -8,9 +8,6 @@ import infra.basetest class TestRustBase(infra.basetest.BRTest): - target = 'armv7-unknown-linux-gnueabihf' - crate = 'hello-world' - def login(self): img = os.path.join(self.builddir, "images", "rootfs.cpio") self.emulator.boot(arch="armv7", @@ -18,43 +15,6 @@ class TestRustBase(infra.basetest.BRTest): options=["-initrd", img]) self.emulator.login() - def build_test_prog(self): - hostdir = os.path.join(self.builddir, 'host') - env = os.environ.copy() - env["USER"] = "br-user" - env["PATH"] = "{}:".format(os.path.join(hostdir, 'bin')) + env["PATH"] - env["CARGO_HOME"] = os.path.join(hostdir, 'usr', 'share', 'cargo') - env["RUST_TARGET_PATH"] = os.path.join(hostdir, 'etc', 'rustc') - cargo = os.path.join(hostdir, 'bin', 'cargo') - workdir = os.path.join(tempfile.mkdtemp(suffix='-br2-testing-rust'), - self.crate) - manifest = os.path.join(workdir, 'Cargo.toml') - prog = os.path.join(workdir, 'target', self.target, 'debug', self.crate) - - cmd = [cargo, 'init', '--bin', '--vcs', 'none', '-vv', workdir] - ret = subprocess.call(cmd, - stdout=self.b.logfile, - stderr=self.b.logfile, - env=env) - if ret != 0: - raise SystemError("Cargo init failed") - - cmd = [ - cargo, 'build', '-vv', '--target', self.target, - '--manifest-path', manifest - ] - ret = subprocess.call(cmd, - stdout=self.b.logfile, - stderr=self.b.logfile, - env=env) - if ret != 0: - raise SystemError("Cargo build failed") - - shutil.copy(prog, os.path.join(self.builddir, 'target', 'usr', 'bin')) - self.b.build() - shutil.rmtree(workdir) - - class TestRustBin(TestRustBase): config = \ """ @@ -68,12 +28,12 @@ class TestRustBin(TestRustBase): BR2_TARGET_ROOTFS_CPIO=y # BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_RUSTC=y + BR2_PACKAGE_RIPGREP=y """ def test_run(self): - self.build_test_prog() self.login() - self.assertRunOk(self.crate) + self.assertRunOk("rg Buildroot /etc/issue") class TestRust(TestRustBase): @@ -90,9 +50,9 @@ class TestRust(TestRustBase): # BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_RUSTC=y BR2_PACKAGE_HOST_RUST=y + BR2_PACKAGE_RIPGREP=y """ def test_run(self): - self.build_test_prog() self.login() - self.assertRunOk(self.crate) + self.assertRunOk("rg Buildroot /etc/issue") -- 2.35.1 From romain.naour at gmail.com Thu Feb 24 15:45:13 2022 From: romain.naour at gmail.com (Romain Naour) Date: Thu, 24 Feb 2022 16:45:13 +0100 Subject: [Buildroot] [PATCHv2 2/2] package/rust: install rustc and rust-std built by Buildroot In-Reply-To: <20220224154513.220976-1-romain.naour@gmail.com> References: <20220224154513.220976-1-romain.naour@gmail.com> Message-ID: <20220224154513.220976-2-romain.naour@gmail.com> The test TestRust is currently broken with ripgrep package with the following error: error[E0514]: found crate `core` compiled by an incompatible version of rustc | = help: please recompile that crate using this compiler (rustc 1.58.1) (consider running `cargo clean` first) = note: the following crate versions were found: crate `core` compiled by rustc 1.58.1 (db9d1b20b 2022-01-20): TestRust/host/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcore-6cfcec236d576603.rlib error[E0514]: found crate `std` compiled by an incompatible version of rustc The problem is not really a cross-compilation issue (we are building for an armv7 target on x86_64 host) but a problem with rust-std libraries (rlib). We can notice that "rustc 1.58.1 (db9d1b20b 2022-01-20)" is the same version as the prebuilt rustc used to bootstrap the build: TestRust/host/bin/rustc --version rustc 1.58.1 TestRustBin/host/bin/rustc --version rustc 1.58.1 (db9d1b20b 2022-01-20) Indeed we are using host-rust-bin to bootstrap the host-rust compiler package built by Buildroot. The problem is that the libcore-6cfcec236d576603.rlib file come from host-rust-bin (rust-std) and is not removed before installing host-rust built by Buildroot. We actually spent a lot of time to build host-rust with rust-std and forget to install this important library HOST_DIR. Looking at the host-rust build directory we can notice two installer script "install.sh" (the same scripts used to install host-rust-bin): TestRust/build/host-rust-1.58.1/build/tmp/tarball/rust/x86_64-unknown-linux-gnu/rust-1.58.1-x86_64-unknown-linux-gnu/install.sh TestRust/build/host-rust-1.58.1/build/tmp/tarball/rust-std/armv7-unknown-linux-gnueabihf/rust-std-1.58.1-armv7-unknown-linux-gnueabihf/install.sh The "tarball" directory is generated by the "python x.py dist" during the install step, we have to keep it. Replace "python x.py install" by theses two install scripts. Installing rust-std with the install.sh script replace the rust-std libraries installed by host-rust-bin. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202544 Signed-off-by: Romain Naour Cc: Eric Le Bihan --- package/rust/rust.mk | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/package/rust/rust.mk b/package/rust/rust.mk index 46487fe4b7..4a6b04dc8c 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -67,9 +67,30 @@ define HOST_RUST_BUILD_CMDS cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py build endef +HOST_RUST_INSTALL_COMMON_OPTS = \ + --prefix=$(HOST_DIR) \ + --disable-ldconfig + +HOST_RUST_INSTALL_OPTS = \ + $(HOST_RUST_INSTALL_COMMON_OPTS) \ + --components=rustc,cargo,rust-std-$(RUSTC_HOST_NAME) + +define HOST_RUST_INSTALL_RUSTC + (cd $(@D)/build/tmp/tarball/rust/$(RUSTC_HOST_NAME)/rust-$(RUST_VERSION)-$(RUSTC_HOST_NAME); \ + ./install.sh $(HOST_RUST_INSTALL_OPTS)) +endef + +ifeq ($(BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS),y) +define HOST_RUST_INSTALL_LIBSTD_TARGET + (cd $(@D)/build/tmp/tarball/rust-std/$(RUSTC_TARGET_NAME)/rust-std-$(RUST_VERSION)-$(RUSTC_TARGET_NAME); \ + ./install.sh $(HOST_RUST_INSTALL_COMMON_OPTS)) +endef +endif + define HOST_RUST_INSTALL_CMDS cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py dist - cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py install + $(HOST_RUST_INSTALL_RUSTC) + $(HOST_RUST_INSTALL_LIBSTD_TARGET) endef $(eval $(host-generic-package)) -- 2.35.1 From romain.naour at gmail.com Thu Feb 24 16:25:16 2022 From: romain.naour at gmail.com (Romain Naour) Date: Thu, 24 Feb 2022 17:25:16 +0100 Subject: [Buildroot] [PATCHv2 1/2] package/efl: rework eeze handling in Kconfig Message-ID: <20220224162517.222437-1-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. [1] e026c3bdb8f493b3fc21de7c45e3edbc47e03128 Signed-off-by: Romain Naour --- v2: simplify the commit log Remove the "eeze" between parenthesis --- package/efl/Config.in | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/package/efl/Config.in b/package/efl/Config.in index eb9c7aebd9..4c78bef7c8 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 # efl-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. @@ -125,8 +126,8 @@ config BR2_PACKAGE_EFL_UTIL_LINUX_LIBMOUNT devices etc... and disabling this will hurt support for Enlightenment and its filemanager. -comment "efl's libmount support needs udev /dev management (eeze)" - depends on !BR2_PACKAGE_EFL_EEZE +comment "efl's libmount support needs udev /dev management " + depends on !BR2_PACKAGE_HAS_UDEV config BR2_PACKAGE_EFL_HAS_RECOMMENDED_CONFIG bool @@ -173,16 +174,16 @@ 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, efl-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 select BR2_PACKAGE_WAYLAND_PROTOCOLS -comment "Wayland support needs udev /dev management (eeze), OpenGL ES w/ EGL, threads, locales" +comment "Wayland support needs udev /dev management, 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 # efl-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 @@ -230,9 +232,9 @@ config BR2_PACKAGE_EFL_DRM etc) to handle interfacing with libinput without having to duplicate the code in each subsystem. -comment "Evas DRM Engine needs udev /dev management (eeze), mesa3d w/ EGL support, threads" +comment "Evas DRM Engine needs udev /dev management, 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.35.1 From romain.naour at gmail.com Thu Feb 24 16:25:17 2022 From: romain.naour at gmail.com (Romain Naour) Date: Thu, 24 Feb 2022 17:25:17 +0100 Subject: [Buildroot] [PATCHv2 2/2] package/efl: handle input option In-Reply-To: <20220224162517.222437-1-romain.naour@gmail.com> References: <20220224162517.222437-1-romain.naour@gmail.com> Message-ID: <20220224162517.222437-2-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: Rename BR2_PACKAGE_EFL_LIBINPUT to BR2_PACKAGE_EFL_ELPUT to match the upstream name. use BR2_PACKAGE_EFL_ELPUT for BR2_PACKAGE_EFL_DRM remove duplicate libxkbcommon in EFL_DEPENDENCIES] Signed-off-by: Romain Naour --- v2: rework BR2_PACKAGE_EFL_DRM --- package/efl/Config.in | 19 +++++++++++++++---- package/efl/efl.mk | 9 +++++++-- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/package/efl/Config.in b/package/efl/Config.in index 4c78bef7c8..c4f82b92e3 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_ELPUT + bool "Enable elput support (recommended)" + default y + depends on BR2_PACKAGE_HAS_UDEV # libinput, efl-eeze + select BR2_PACKAGE_EFL_EEZE + select BR2_PACKAGE_LIBINPUT + select BR2_PACKAGE_LIBXKBCOMMON + help + Eplut is used to support gesture recognition. + +comment "elput needs udev /dev management" + 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 # efl-eeze + depends on BR2_PACKAGE_HAS_UDEV # efl-elput, efl-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_ELPUT 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..bb0bd3f76d 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_ELPUT),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 @@ -204,8 +211,6 @@ else EFL_CONF_OPTS += -Dwl=false endif -EFL_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBXKBCOMMON),libxkbcommon) - # json evas loader is disabled by default by upstream. # Disable libspectre (ps). # Keep all other evas loader enabled or handled below. -- 2.35.1 From fontaine.fabrice at gmail.com Thu Feb 24 17:36:15 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 24 Feb 2022 18:36:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/bluez5_utils: fix musl build Message-ID: <20220224173615.486414-1-fontaine.fabrice@gmail.com> Fix the following musl build failure raised since commit 6fc5c8e92c1d7997e48b207187d2d3c7ad42819: In file included from src/shared/queue.c:15: ./src/shared/util.h:106:1: error: unknown type name 'ssize_t'; did you mean 'size_t'? 106 | ssize_t util_getrandom(void *buf, size_t buflen, unsigned int flags); | ^~~~~~~ | size_t Fixes: - http://autobuild.buildroot.org/results/83eaeb3863040645409f5787fdbdde79385c5257 Signed-off-by: Fabrice Fontaine --- ...rc-shared-util.h-include-sys-types.h.patch | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 package/bluez5_utils/0006-src-shared-util.h-include-sys-types.h.patch diff --git a/package/bluez5_utils/0006-src-shared-util.h-include-sys-types.h.patch b/package/bluez5_utils/0006-src-shared-util.h-include-sys-types.h.patch new file mode 100644 index 0000000000..8a5bd64d43 --- /dev/null +++ b/package/bluez5_utils/0006-src-shared-util.h-include-sys-types.h.patch @@ -0,0 +1,39 @@ +From 1d21878d84f16e28e16c61b36799a62e22732d97 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 24 Feb 2022 18:19:33 +0100 +Subject: [PATCH] src/shared/util.h: include sys/types.h + +Include sys/types.h to avoid the following build failure on musl raised +since commit fb57ad9b9d107856e5f1c8135da04ffa2f7a11ac: + +In file included from src/shared/queue.c:15: +./src/shared/util.h:106:1: error: unknown type name 'ssize_t'; did you mean 'size_t'? + 106 | ssize_t util_getrandom(void *buf, size_t buflen, unsigned int flags); + | ^~~~~~~ + | size_t + +Fixes: + - http://autobuild.buildroot.org/results/83eaeb3863040645409f5787fdbdde79385c5257 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://patchwork.kernel.org/project/bluetooth/patch/20220224173104.479809-1-fontaine.fabrice at gmail.com] +--- + src/shared/util.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/shared/util.h b/src/shared/util.h +index c01eccf8a..554481e1e 100644 +--- a/src/shared/util.h ++++ b/src/shared/util.h +@@ -14,6 +14,7 @@ + #include + #include + #include ++#include + + #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) + #define BIT(n) (1 << (n)) +-- +2.34.1 + -- 2.34.1 From fontaine.fabrice at gmail.com Thu Feb 24 17:51:19 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 24 Feb 2022 18:51:19 +0100 Subject: [Buildroot] [PATCH 1/1] package/bpftool: add BR2_PACKAGE_BPFTOOL_ARCH_SUPPORTS Message-ID: <20220224175119.487040-1-fontaine.fabrice@gmail.com> bpftool uses its own local copy of libbpf so add BR2_PACKAGE_BPFTOOL_ARCH_SUPPORTS to avoid the following build failure on ARM: btf.c: In function 'btf_type_by_id': btf.c:461:14: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] if (type_id < btf->start_id) ^ bpf.c:62:4: error: #error __NR_bpf not defined. libbpf does not support your arch. # error __NR_bpf not defined. libbpf does not support your arch. ^ Fixes: - http://autobuild.buildroot.org/results/aae772f1cfb16516a57f310c4f022e80a2a8d65e Signed-off-by: Fabrice Fontaine --- package/bpftool/Config.in | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/package/bpftool/Config.in b/package/bpftool/Config.in index e81d874343..a1ef3843e6 100644 --- a/package/bpftool/Config.in +++ b/package/bpftool/Config.in @@ -1,5 +1,15 @@ +config BR2_PACKAGE_BPFTOOL_ARCH_SUPPORTS + bool + # see libbpf/src/bpf.c + default y if BR2_arc + default y if BR2_aarch64 || BR2_aarch64_be + default y if BR2_i386 || BR2_x86_64 + default y if BR2_sparc || BR2_sparc64 + default y if BR2_s390x + config BR2_PACKAGE_BPFTOOL bool "bpftool" + depends on BR2_PACKAGE_BPFTOOL_ARCH_SUPPORTS depends on !BR2_nios2 # binutils depends on BR2_USE_WCHAR # binutils, elfutils depends on !BR2_STATIC_LIBS # elfutils @@ -13,6 +23,7 @@ config BR2_PACKAGE_BPFTOOL of eBPF programs and maps. comment "bpftool needs a uClibc or glibc toolchain w/ wchar, dynamic library, threads, headers >= 4.12" + depends on BR2_PACKAGE_BPFTOOL_ARCH_SUPPORTS depends on !BR2_nios2 depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \ || !BR2_TOOLCHAIN_HAS_THREADS \ -- 2.34.1 From bugzilla at busybox.net Thu Feb 24 21:20:54 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Thu, 24 Feb 2022 21:20:54 +0000 Subject: [Buildroot] [Bug 14601] Python build fails on 2022.02-rc2 In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14601 --- Comment #3 from Peter Seiderer --- (In reply to HiFiBerry (Daniel) from comment #2) Identify the files installed under '/home/matuschd/buildroot-4/target//home/matuschd/buildroot-4'... Provide a config or defconfig (best a minimal one) reproducing the failure against a plain buildroot version (or git master)... Does it happen only in case of an complete build or does $ make clean; make python3 show the same failure? Anything special about your build host? -- You are receiving this mail because: You are on the CC list for the bug. From andrei.gherghescu at protonmail.com Thu Feb 24 21:28:13 2022 From: andrei.gherghescu at protonmail.com (Andrei Gherghescu) Date: Thu, 24 Feb 2022 21:28:13 +0000 Subject: [Buildroot] [PATCH 1/1] directfb: change upstream site Message-ID: <20220224212755.4856-1-andrei.gherghescu@protonmail.com> The http://www.directfb.org/ has been down since 2015. Use the Buildroot backup download site. Fixes: - https://bugs.busybox.net/show_bug.cgi?id=13731 Signed-off-by: Andrei Gherghescu --- package/directfb-examples/Config.in | 6 ++++-- package/directfb-examples/directfb-examples.mk | 2 +- package/directfb/directfb.mk | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/directfb-examples/Config.in b/package/directfb-examples/Config.in index 216e036577..4d5de03068 100644 --- a/package/directfb-examples/Config.in +++ b/package/directfb-examples/Config.in @@ -4,6 +4,8 @@ config BR2_PACKAGE_DIRECTFB_EXAMPLES help The DirectFB-examples package contains a set of simple DirectFB applications that can be used to test and demonstrate - various DirectFB features. + various DirectFB features. As of 4 October 2015, DirectFB's + website http://www.directfb.org/ is down. See alternative site + listed below. - http://directfb.org/downloads/Extras/README.DirectFB-examples + http://elinux.org/DirectFB diff --git a/package/directfb-examples/directfb-examples.mk b/package/directfb-examples/directfb-examples.mk index 46263da733..c8d09b3e33 100644 --- a/package/directfb-examples/directfb-examples.mk +++ b/package/directfb-examples/directfb-examples.mk @@ -5,7 +5,7 @@ ################################################################################ DIRECTFB_EXAMPLES_VERSION = 1.7.0 -DIRECTFB_EXAMPLES_SITE = http://www.directfb.org/downloads/Extras +DIRECTFB_EXAMPLES_SITE = http://sources.buildroot.net/directfb-examples DIRECTFB_EXAMPLES_SOURCE = DirectFB-examples-$(DIRECTFB_EXAMPLES_VERSION).tar.gz DIRECTFB_EXAMPLES_LICENSE = MIT DIRECTFB_EXAMPLES_LICENSE_FILES = COPYING diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk index 0b32162d8f..56a396ab99 100644 --- a/package/directfb/directfb.mk +++ b/package/directfb/directfb.mk @@ -6,7 +6,7 @@ DIRECTFB_VERSION_MAJOR = 1.7 DIRECTFB_VERSION = $(DIRECTFB_VERSION_MAJOR).7 -DIRECTFB_SITE = http://www.directfb.org/downloads/Core/DirectFB-$(DIRECTFB_VERSION_MAJOR) +DIRECTFB_SITE = http://sources.buildroot.net/directfb DIRECTFB_SOURCE = DirectFB-$(DIRECTFB_VERSION).tar.gz DIRECTFB_LICENSE = LGPL-2.1+ DIRECTFB_LICENSE_FILES = COPYING -- 2.35.1 From andrei.gherghescu at protonmail.com Thu Feb 24 21:36:33 2022 From: andrei.gherghescu at protonmail.com (Andrei Gherghescu) Date: Thu, 24 Feb 2022 21:36:33 +0000 Subject: [Buildroot] [PATCH 1/1] package/directfb: change upstream site Message-ID: <20220224213620.5899-1-andrei.gherghescu@protonmail.com> The http://www.directfb.org/ has been down since 2015. Use the Buildroot backup download site. Fixes: - https://bugs.busybox.net/show_bug.cgi?id=13731 Signed-off-by: Andrei Gherghescu --- package/directfb-examples/Config.in | 6 ++++-- package/directfb-examples/directfb-examples.mk | 2 +- package/directfb/directfb.mk | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/directfb-examples/Config.in b/package/directfb-examples/Config.in index 216e036577..4d5de03068 100644 --- a/package/directfb-examples/Config.in +++ b/package/directfb-examples/Config.in @@ -4,6 +4,8 @@ config BR2_PACKAGE_DIRECTFB_EXAMPLES help The DirectFB-examples package contains a set of simple DirectFB applications that can be used to test and demonstrate - various DirectFB features. + various DirectFB features. As of 4 October 2015, DirectFB's + website http://www.directfb.org/ is down. See alternative site + listed below. - http://directfb.org/downloads/Extras/README.DirectFB-examples + http://elinux.org/DirectFB diff --git a/package/directfb-examples/directfb-examples.mk b/package/directfb-examples/directfb-examples.mk index 46263da733..c8d09b3e33 100644 --- a/package/directfb-examples/directfb-examples.mk +++ b/package/directfb-examples/directfb-examples.mk @@ -5,7 +5,7 @@ ################################################################################ DIRECTFB_EXAMPLES_VERSION = 1.7.0 -DIRECTFB_EXAMPLES_SITE = http://www.directfb.org/downloads/Extras +DIRECTFB_EXAMPLES_SITE = http://sources.buildroot.net/directfb-examples DIRECTFB_EXAMPLES_SOURCE = DirectFB-examples-$(DIRECTFB_EXAMPLES_VERSION).tar.gz DIRECTFB_EXAMPLES_LICENSE = MIT DIRECTFB_EXAMPLES_LICENSE_FILES = COPYING diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk index 0b32162d8f..56a396ab99 100644 --- a/package/directfb/directfb.mk +++ b/package/directfb/directfb.mk @@ -6,7 +6,7 @@ DIRECTFB_VERSION_MAJOR = 1.7 DIRECTFB_VERSION = $(DIRECTFB_VERSION_MAJOR).7 -DIRECTFB_SITE = http://www.directfb.org/downloads/Core/DirectFB-$(DIRECTFB_VERSION_MAJOR) +DIRECTFB_SITE = http://sources.buildroot.net/directfb DIRECTFB_SOURCE = DirectFB-$(DIRECTFB_VERSION).tar.gz DIRECTFB_LICENSE = LGPL-2.1+ DIRECTFB_LICENSE_FILES = COPYING -- 2.35.1 From ps.report at gmx.net Thu Feb 24 22:07:44 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 24 Feb 2022 23:07:44 +0100 Subject: [Buildroot] [v3] package/ntpsec: new package In-Reply-To: References: Message-ID: <20220224230744.1306f790@gmx.net> Hello Guillaume, On Wed, 23 Feb 2022 18:51:59 +0100, Guillaume Bres wrote: > Hello Peter, > > sorry for the delayed test, the usual "busy on too many things". > > Today I ran the current patch serie on "zedboard_defconfig": everything > works fine but SYNC is never fully acquired. The estimated "offsets" from > the pool is close to 2^32 (limit?), jitter is large, delay is realistic, > but those values never get averaged out. Do you mean 'zynq_zed_defconfig' or do you work on an legacy buildroot version? Can spot nothing special in the defconfig despite an ancient linux kernel/headers version (4.16, or 3.18 in legacy zedboard_defconfig)... Anything special in the config file? > What do you think is going on? I don't think it's related to our work but > to the demon itself. Maybe better ask at ntpsec mailing list/bugtracker ([1])? > v1_2_1 is fairly old, I hope they provide a new tag soon because a lot of a > work has been accomplished in the meantime. New release seems to be scheduled for end of this month [2]... > > At work we use our custom fork (for custom encryption), I rebased to master > last week, I have never experienced such behavior. Did only test/run on raspberry pi 3/4 (both 32 and 64 bit, glibc, uclibc)... Regards, Peter [1] https://www.ntpsec.org/channels.html [2] https://lists.ntpsec.org/pipermail/devel/2022-February/009961.html > > Guillaume W. Bres > Software engineer > From aperez at igalia.com Thu Feb 24 23:16:09 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Fri, 25 Feb 2022 01:16:09 +0200 Subject: [Buildroot] [PATCH/next 2/2] package/bubblewrap: switch to the meson build system In-Reply-To: <20220224231609.1097793-1-aperez@igalia.com> References: <20220224231609.1097793-1-aperez@igalia.com> Message-ID: <20220224231609.1097793-2-aperez@igalia.com> Version 0.6.0 introduced a Meson build system, and upstream seems to have the intention to abandon the previous autotools based one. Switch to Meson for future proofing. Signed-off-by: Adrian Perez de Castro --- package/bubblewrap/bubblewrap.mk | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/package/bubblewrap/bubblewrap.mk b/package/bubblewrap/bubblewrap.mk index 4d6593576e..6b00dfe7f9 100644 --- a/package/bubblewrap/bubblewrap.mk +++ b/package/bubblewrap/bubblewrap.mk @@ -14,22 +14,24 @@ BUBBLEWRAP_LICENSE_FILES = COPYING BUBBLEWRAP_CPE_ID_VENDOR = projectatomic BUBBLEWRAP_CONF_OPTS = \ - --enable-require-userns=no \ - --disable-man \ - --disable-sudo \ - --with-priv-mode=none + -Dzsh_completion=disabled \ + -Dman=disabled \ + -Dpython=$(HOST_DIR)/bin/python \ + -Drequire_userns=false ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y) -BUBBLEWRAP_CONF_OPTS += --with-bash-completion-dir=/usr/share/bash-completion/completions +BUBBLEWRAP_CONF_OPTS += \ + -Dbash_completion=enabled \ + -Dbash_completion_dir=/usr/share/bash-completion/completions else -BUBBLEWRAP_CONF_OPTS += --without-bash-completion-dir +BUBBLEWRAP_CONF_OPTS += -Dbash_completion=disabled endif ifeq ($(BR2_PACKAGE_LIBSELINUX),y) -BUBBLEWRAP_CONF_OPTS += --enable-selinux +BUBBLEWRAP_CONF_OPTS += -Dselinux=enabled BUBBLEWRAP_DEPENDENCIES += libselinux else -BUBBLEWRAP_CONF_OPTS += --disable-selinux +BUBBLEWRAP_CONF_OPTS += -Dselinux=disabled endif # We need to mark bwrap as setuid, in case the kernel @@ -38,4 +40,4 @@ define BUBBLEWRAP_PERMISSIONS /usr/bin/bwrap f 1755 0 0 - - - - - endef -$(eval $(autotools-package)) +$(eval $(meson-package)) -- 2.35.1 From aperez at igalia.com Thu Feb 24 23:16:08 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Fri, 25 Feb 2022 01:16:08 +0200 Subject: [Buildroot] [PATCH/next 1/2] package/bubblewrap: bump to version 0.6.0 Message-ID: <20220224231609.1097793-1-aperez@igalia.com> This version includes a new feature which allows specifying multiple seccomp filters. There is now a Meson-based build system as well, but for the moment the build recipe keeps using the autotools based one. Release notes can be found at: https://github.com/containers/bubblewrap/releases/tag/v0.6.0 Signed-off-by: Adrian Perez de Castro --- package/bubblewrap/bubblewrap.hash | 4 ++-- package/bubblewrap/bubblewrap.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/bubblewrap/bubblewrap.hash b/package/bubblewrap/bubblewrap.hash index 88aba150cd..b756271ecf 100644 --- a/package/bubblewrap/bubblewrap.hash +++ b/package/bubblewrap/bubblewrap.hash @@ -1,5 +1,5 @@ -# From https://github.com/containers/bubblewrap/releases/tag/v0.5.0 -sha256 16fdaf33799d63104e347e0133f909196fe90d0c50515d010bcb422eb5a00818 bubblewrap-0.5.0.tar.xz +# From https://github.com/containers/bubblewrap/releases/tag/v0.6.0 +sha256 11393cf2058f22e6a6c6e9cca3c85ff4c4239806cb28fee657c62a544df35693 bubblewrap-0.6.0.tar.xz # Hash for license files: sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/bubblewrap/bubblewrap.mk b/package/bubblewrap/bubblewrap.mk index 5f3d95e826..4d6593576e 100644 --- a/package/bubblewrap/bubblewrap.mk +++ b/package/bubblewrap/bubblewrap.mk @@ -4,7 +4,7 @@ # ################################################################################ -BUBBLEWRAP_VERSION = 0.5.0 +BUBBLEWRAP_VERSION = 0.6.0 BUBBLEWRAP_SITE = https://github.com/containers/bubblewrap/releases/download/v$(BUBBLEWRAP_VERSION) BUBBLEWRAP_SOURCE = bubblewrap-$(BUBBLEWRAP_VERSION).tar.xz BUBBLEWRAP_DEPENDENCIES = host-pkgconf libcap -- 2.35.1 From aperez at igalia.com Thu Feb 24 23:21:59 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Fri, 25 Feb 2022 01:21:59 +0200 Subject: [Buildroot] [PATCH 1/1] package/cog: bump to version 0.12.1 Message-ID: <20220224232159.1103756-1-aperez@igalia.com> This is a minor release which fixes an installation path and a crash with certain Wayland compositors. Release notes can be found at: https://wpewebkit.org/release/cog-0.12.1.html Signed-off-by: Adrian Perez de Castro --- package/cog/cog.hash | 8 ++++---- package/cog/cog.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/cog/cog.hash b/package/cog/cog.hash index 6a9af1845d..839b12e619 100644 --- a/package/cog/cog.hash +++ b/package/cog/cog.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/cog-0.12.0.tar.xz.sums -md5 30d6f68914af0ba5c32ac14df504215a cog-0.12.0.tar.xz -sha1 de367b33fb45a1bca9e443ca5c1d6cae3833d759 cog-0.12.0.tar.xz -sha256 aad413a8aaf15d400d70f9c909a28b92b138f7b0c0d825978de8788d0d75208a cog-0.12.0.tar.xz +# From https://wpewebkit.org/releases/cog-0.12.1.tar.xz.sums +md5 25a80a5a8a52b8873933a128151b8928 cog-0.12.1.tar.xz +sha1 3b9f67bc23cd9e3db2221366d6cde4ca0b06b811 cog-0.12.1.tar.xz +sha256 23caaafa2ef5c2f6a97d467fcce908ea71087ad03b72deb9280225c0dd561c91 cog-0.12.1.tar.xz # Hashes for license files: sha256 e6c42d93c68b292bcccf6d2ec3e13da85df90b718ba27c2c2a01053a9d009252 COPYING diff --git a/package/cog/cog.mk b/package/cog/cog.mk index 606374d9c3..2f6ef402fb 100644 --- a/package/cog/cog.mk +++ b/package/cog/cog.mk @@ -4,7 +4,7 @@ # ################################################################################ -COG_VERSION = 0.12.0 +COG_VERSION = 0.12.1 COG_SITE = https://wpewebkit.org/releases COG_SOURCE = cog-$(COG_VERSION).tar.xz COG_INSTALL_STAGING = YES -- 2.35.1 From aperez at igalia.com Thu Feb 24 23:26:44 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Fri, 25 Feb 2022 00:26:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/cog: bump to version 0.12.1 In-Reply-To: <20220224232159.1103756-1-aperez@igalia.com> References: <20220224232159.1103756-1-aperez@igalia.com> Message-ID: <20220225002644.GB1672112@momiji> Hi, On Fri, 25 Feb 2022 01:21:59 +0200 Adrian Perez de Castro wrote: > This is a minor release which fixes an installation path and a crash > with certain Wayland compositors. Release notes can be found at: > > https://wpewebkit.org/release/cog-0.12.1.html > > Signed-off-by: Adrian Perez de Castro > --- > package/cog/cog.hash | 8 ++++---- > package/cog/cog.mk | 2 +- > 2 files changed, 5 insertions(+), 5 deletions(-) JFTR, this release has only a couple of fixes and that's the reason I didn't set the subject prefix to "PATCH/next": I think it's worth including in the next stable version even if we might be a bit late in the development cycle (I am well aware there are already release candidates!) If others think it's better to merge this in "next", that'll be okay, but then at least we would want to include a workaround for the plug-in installation path (should be a one-line patch, if we go end up going this way). 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 geomatsi at gmail.com Fri Feb 25 07:26:16 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Fri, 25 Feb 2022 10:26:16 +0300 Subject: [Buildroot] [PATCH v2 0/6] orangepi/linksprite: convert more allwinner boards to extlinux Message-ID: <20220225072622.3584480-1-geomatsi@gmail.com> Hi all, Recently extlinux infrastructure has been added for orangepi boards by Sergey Kuzminov: see commit c0312f71cc89 ("configs/orangepi_zero_defconfig: switch to extlinux"). This patch series converts to extlinux some of the boards that I have at my disposal: - orangepi-zero-plus2 - orangepi-pc-plus - orangepi-one - linksprite-pcduino All these changes have been build- and boot- tested. Also I added orangepi-zero-plus2 to my list in DEVELOPERS file to keep an eye on its build failures. Regards, Sergey v1 -> v2 - add linksprite-pcduino changes - update commit messages according to Giulio Benetti comments Sergey Matyukevich (6): board/orangepi/orangepi-zero-plus2: switch to extlinux board/orangepi/orangepi-pc-plus: switch to extlinux board/orangepi/orangepi-one: switch to extlinux board/linksprite/pcduino: switch to extlinux configs/linksprite_pcduino_defconfig: update Linux/U-Boot versions DEVELOPERS: add Sergey Matyukevich for orangepi-zero-plus2 DEVELOPERS | 2 + board/linksprite/pcduino/boot.cmd | 8 ---- board/linksprite/pcduino/genimage.cfg | 43 ------------------- board/linksprite/pcduino/post-build.sh | 11 ----- board/linksprite/pcduino/post-image.sh | 16 ------- board/orangepi/orangepi-one/boot.cmd | 8 ---- board/orangepi/orangepi-one/genimage.cfg | 37 ---------------- board/orangepi/orangepi-pc-plus/boot.cmd | 8 ---- board/orangepi/orangepi-pc-plus/genimage.cfg | 43 ------------------- board/orangepi/orangepi-zero-plus2/boot.cmd | 6 --- .../orangepi/orangepi-zero-plus2/genimage.cfg | 41 ------------------ configs/linksprite_pcduino_defconfig | 18 ++++---- configs/orangepi_one_defconfig | 9 ++-- configs/orangepi_pc_plus_defconfig | 9 ++-- configs/orangepi_zero_plus2_defconfig | 14 +++--- 15 files changed, 24 insertions(+), 249 deletions(-) delete mode 100644 board/linksprite/pcduino/boot.cmd delete mode 100644 board/linksprite/pcduino/genimage.cfg delete mode 100755 board/linksprite/pcduino/post-build.sh delete mode 100755 board/linksprite/pcduino/post-image.sh delete mode 100644 board/orangepi/orangepi-one/boot.cmd delete mode 100644 board/orangepi/orangepi-one/genimage.cfg delete mode 100644 board/orangepi/orangepi-pc-plus/boot.cmd delete mode 100644 board/orangepi/orangepi-pc-plus/genimage.cfg delete mode 100644 board/orangepi/orangepi-zero-plus2/boot.cmd delete mode 100644 board/orangepi/orangepi-zero-plus2/genimage.cfg -- 2.35.1 From geomatsi at gmail.com Fri Feb 25 07:26:17 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Fri, 25 Feb 2022 10:26:17 +0300 Subject: [Buildroot] [PATCH v2 1/6] board/orangepi/orangepi-zero-plus2: switch to extlinux In-Reply-To: <20220225072622.3584480-1-geomatsi@gmail.com> References: <20220225072622.3584480-1-geomatsi@gmail.com> Message-ID: <20220225072622.3584480-2-geomatsi@gmail.com> Switch to extlinux instead of U-Boot boot script. Drop custom boot script and genimage config. Instead use common orangepi files from board/orangepi/common. To help extlinux to find DTB without U-Boot environment changes, do not strip arm64 board specific directory from DTB name when installing it in /boot directory. For this purpose use BR2_KERNEL_DTB_KEEP_DIRNAME config option. Finally, tidy up configuration file adding section names. Signed-off-by: Sergey Matyukevich --- board/orangepi/orangepi-zero-plus2/boot.cmd | 6 --- .../orangepi/orangepi-zero-plus2/genimage.cfg | 41 ------------------- configs/orangepi_zero_plus2_defconfig | 14 ++++--- 3 files changed, 8 insertions(+), 53 deletions(-) delete mode 100644 board/orangepi/orangepi-zero-plus2/boot.cmd delete mode 100644 board/orangepi/orangepi-zero-plus2/genimage.cfg diff --git a/board/orangepi/orangepi-zero-plus2/boot.cmd b/board/orangepi/orangepi-zero-plus2/boot.cmd deleted file mode 100644 index aa5162004b..0000000000 --- a/board/orangepi/orangepi-zero-plus2/boot.cmd +++ /dev/null @@ -1,6 +0,0 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=PARTLABEL=rootfs rootwait - -fatload mmc 0 $kernel_addr_r Image -fatload mmc 0 $fdt_addr_r sun50i-h5-orangepi-zero-plus2.dtb - -booti $kernel_addr_r - $fdt_addr_r diff --git a/board/orangepi/orangepi-zero-plus2/genimage.cfg b/board/orangepi/orangepi-zero-plus2/genimage.cfg deleted file mode 100644 index 5a7ee7707a..0000000000 --- a/board/orangepi/orangepi-zero-plus2/genimage.cfg +++ /dev/null @@ -1,41 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "sun50i-h5-orangepi-zero-plus2.dtb", - "boot.scr" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - # for root=PARTLABEL support - partition-table-type = "gpt" - # default GPT location conflicts with bootloaders, move it after - gpt-location = 1M - } - - partition spl { - in-partition-table = "no" - image = "u-boot-sunxi-with-spl.bin" - offset = 8K - size = 1016K # 1MB - 8KB - } - - partition boot { - partition-type-uuid = "F" - bootable = "true" - image = "boot.vfat" - } - - # 'rootfs' will be used as the partition label, used - # with root=PARTLABEL=rootfs kernel command line - partition rootfs { - partition-type-uuid = "L" - image = "rootfs.ext4" - size = 256M - } -} diff --git a/configs/orangepi_zero_plus2_defconfig b/configs/orangepi_zero_plus2_defconfig index 9d88b37ac9..ef171c3ad3 100644 --- a/configs/orangepi_zero_plus2_defconfig +++ b/configs/orangepi_zero_plus2_defconfig @@ -27,9 +27,6 @@ BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null" -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-plus2/boot.cmd" # Kernel BR2_LINUX_KERNEL=y @@ -40,6 +37,8 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-zero-plus2" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero-plus2/linux-extras.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y # wireless firmware BR2_PACKAGE_LINUX_FIRMWARE=y @@ -58,8 +57,11 @@ 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 + +# host tools BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y + +# image scripts +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-plus2/genimage.cfg" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" -- 2.35.1 From geomatsi at gmail.com Fri Feb 25 07:26:18 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Fri, 25 Feb 2022 10:26:18 +0300 Subject: [Buildroot] [PATCH v2 2/6] board/orangepi/orangepi-pc-plus: switch to extlinux In-Reply-To: <20220225072622.3584480-1-geomatsi@gmail.com> References: <20220225072622.3584480-1-geomatsi@gmail.com> Message-ID: <20220225072622.3584480-3-geomatsi@gmail.com> Switch to extlinux instead of U-Boot boot script. Drop custom boot script and genimage config. Instead use common orangepi files from board/orangepi/common. Signed-off-by: Sergey Matyukevich --- board/orangepi/orangepi-pc-plus/boot.cmd | 8 ---- board/orangepi/orangepi-pc-plus/genimage.cfg | 43 -------------------- configs/orangepi_pc_plus_defconfig | 9 ++-- 3 files changed, 3 insertions(+), 57 deletions(-) delete mode 100644 board/orangepi/orangepi-pc-plus/boot.cmd delete mode 100644 board/orangepi/orangepi-pc-plus/genimage.cfg diff --git a/board/orangepi/orangepi-pc-plus/boot.cmd b/board/orangepi/orangepi-pc-plus/boot.cmd deleted file mode 100644 index c91f77942f..0000000000 --- a/board/orangepi/orangepi-pc-plus/boot.cmd +++ /dev/null @@ -1,8 +0,0 @@ -setenv fdt_high ffffffff - -setenv bootargs console=ttyS0,115200 earlyprintk root=PARTLABEL=rootfs rootwait - -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun8i-h3-orangepi-pc-plus.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/orangepi/orangepi-pc-plus/genimage.cfg b/board/orangepi/orangepi-pc-plus/genimage.cfg deleted file mode 100644 index 3812d785d5..0000000000 --- a/board/orangepi/orangepi-pc-plus/genimage.cfg +++ /dev/null @@ -1,43 +0,0 @@ -# Minimal SD card image for the OrangePi PC Plus -# -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h3-orangepi-pc-plus.dtb", - "boot.scr" - } - } - - size = 10M -} - -image sdcard.img { - hdimage { - # for root=PARTLABEL support - partition-table-type = "gpt" - # default GPT location conflicts with bootloaders, move it after - gpt-location = 1M - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot-sunxi-with-spl.bin" - offset = 8K - size = 1016K # 1MB - 8KB - } - - partition boot { - partition-type-uuid = "F" - bootable = "true" - image = "boot.vfat" - } - - # 'rootfs' will be used as the partition label, used - # with root=PARTLABEL=rootfs kernel command line - partition rootfs { - partition-type-uuid = "L" - image = "rootfs.ext4" - size = 512M - } -} diff --git a/configs/orangepi_pc_plus_defconfig b/configs/orangepi_pc_plus_defconfig index c3ff8bc417..ba946e5285 100644 --- a/configs/orangepi_pc_plus_defconfig +++ b/configs/orangepi_pc_plus_defconfig @@ -14,6 +14,7 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-pc-plus" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-pc-plus/linux-extras.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set @@ -27,14 +28,10 @@ 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_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-pc-plus/boot.cmd" -BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y +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-pc-plus/genimage.cfg" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" # wireless driver and firmware BR2_PACKAGE_RTL8189FS=y -- 2.35.1 From geomatsi at gmail.com Fri Feb 25 07:26:19 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Fri, 25 Feb 2022 10:26:19 +0300 Subject: [Buildroot] [PATCH v2 3/6] board/orangepi/orangepi-one: switch to extlinux In-Reply-To: <20220225072622.3584480-1-geomatsi@gmail.com> References: <20220225072622.3584480-1-geomatsi@gmail.com> Message-ID: <20220225072622.3584480-4-geomatsi@gmail.com> Switch to extlinux instead of U-Boot boot script. Drop custom boot script and genimage config. Instead use common orangepi files from board/orangepi/common. Signed-off-by: Sergey Matyukevich --- board/orangepi/orangepi-one/boot.cmd | 8 ----- board/orangepi/orangepi-one/genimage.cfg | 37 ------------------------ configs/orangepi_one_defconfig | 9 ++---- 3 files changed, 3 insertions(+), 51 deletions(-) delete mode 100644 board/orangepi/orangepi-one/boot.cmd delete mode 100644 board/orangepi/orangepi-one/genimage.cfg diff --git a/board/orangepi/orangepi-one/boot.cmd b/board/orangepi/orangepi-one/boot.cmd deleted file mode 100644 index ab616e6ac9..0000000000 --- a/board/orangepi/orangepi-one/boot.cmd +++ /dev/null @@ -1,8 +0,0 @@ -setenv fdt_high ffffffff - -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun8i-h3-orangepi-one.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/orangepi/orangepi-one/genimage.cfg b/board/orangepi/orangepi-one/genimage.cfg deleted file mode 100644 index 2a14dcdec2..0000000000 --- a/board/orangepi/orangepi-one/genimage.cfg +++ /dev/null @@ -1,37 +0,0 @@ -# Minimal SD card image for the OrangePi PC -# -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h3-orangepi-one.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_one_defconfig b/configs/orangepi_one_defconfig index 1a2772a307..ba128424a0 100644 --- a/configs/orangepi_one_defconfig +++ b/configs/orangepi_one_defconfig @@ -12,6 +12,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-one" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set @@ -25,11 +26,7 @@ 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-one/boot.cmd" -BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y +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-one/genimage.cfg" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" -- 2.35.1 From geomatsi at gmail.com Fri Feb 25 07:26:20 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Fri, 25 Feb 2022 10:26:20 +0300 Subject: [Buildroot] [PATCH v2 4/6] board/linksprite/pcduino: switch to extlinux In-Reply-To: <20220225072622.3584480-1-geomatsi@gmail.com> References: <20220225072622.3584480-1-geomatsi@gmail.com> Message-ID: <20220225072622.3584480-5-geomatsi@gmail.com> Switch to extlinux instead of U-Boot boot script. Drop custom boot script and genimage config. Instead use common orangepi files from board/orangepi/common. Signed-off-by: Sergey Matyukevich --- board/linksprite/pcduino/boot.cmd | 8 ----- board/linksprite/pcduino/genimage.cfg | 43 -------------------------- board/linksprite/pcduino/post-build.sh | 11 ------- board/linksprite/pcduino/post-image.sh | 16 ---------- configs/linksprite_pcduino_defconfig | 9 +++--- 5 files changed, 4 insertions(+), 83 deletions(-) delete mode 100644 board/linksprite/pcduino/boot.cmd delete mode 100644 board/linksprite/pcduino/genimage.cfg delete mode 100755 board/linksprite/pcduino/post-build.sh delete mode 100755 board/linksprite/pcduino/post-image.sh diff --git a/board/linksprite/pcduino/boot.cmd b/board/linksprite/pcduino/boot.cmd deleted file mode 100644 index 0db8363599..0000000000 --- a/board/linksprite/pcduino/boot.cmd +++ /dev/null @@ -1,8 +0,0 @@ -setenv fdt_high ffffffff - -setenv bootargs console=ttyS0,115200 console=tty1 earlyprintk root=/dev/mmcblk0p2 rootwait panic=10 ${extra} - -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun4i-a10-pcduino.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/linksprite/pcduino/genimage.cfg b/board/linksprite/pcduino/genimage.cfg deleted file mode 100644 index db33322118..0000000000 --- a/board/linksprite/pcduino/genimage.cfg +++ /dev/null @@ -1,43 +0,0 @@ -# -# Minimal SD card image for the pcDuino -# - -image boot.vfat { - vfat { - files = { - "zImage", - "sun4i-a10-pcduino.dtb", - "boot.scr" - } - } - - size = 16M -} - -# -# Note: u-boot environment is stored between u-boot and boot partitions -# - -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" - offset = 1M - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/board/linksprite/pcduino/post-build.sh b/board/linksprite/pcduino/post-build.sh deleted file mode 100755 index e1e1877671..0000000000 --- a/board/linksprite/pcduino/post-build.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -# post-build.sh for pcDuino taken from OrangePi post-build.sh -# 2013, Carlo Caione - -BOARD_DIR="$(dirname $0)" -MKIMAGE=$HOST_DIR/bin/mkimage -BOOT_CMD=$BOARD_DIR/boot.cmd -BOOT_CMD_H=$BINARIES_DIR/boot.scr - -# U-Boot script -$MKIMAGE -C none -A arm -T script -d $BOOT_CMD $BOOT_CMD_H diff --git a/board/linksprite/pcduino/post-image.sh b/board/linksprite/pcduino/post-image.sh deleted file mode 100755 index c82b189f9c..0000000000 --- a/board/linksprite/pcduino/post-image.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -BOARD_DIR="$(dirname $0)" -GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" -GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" - -rm -rf "${GENIMAGE_TMP}" - -genimage \ - --rootpath "${TARGET_DIR}" \ - --tmppath "${GENIMAGE_TMP}" \ - --inputpath "${BINARIES_DIR}" \ - --outputpath "${BINARIES_DIR}" \ - --config "${GENIMAGE_CFG}" - -exit $? diff --git a/configs/linksprite_pcduino_defconfig b/configs/linksprite_pcduino_defconfig index b58f970493..05b25aede4 100644 --- a/configs/linksprite_pcduino_defconfig +++ b/configs/linksprite_pcduino_defconfig @@ -11,8 +11,9 @@ BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" # SD image scripts -BR2_ROOTFS_POST_BUILD_SCRIPT="board/linksprite/pcduino/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/linksprite/pcduino/post-image.sh" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" # For kernel modules autoloading BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y @@ -29,6 +30,7 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun4i-a10-pcduino" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/linksprite/pcduino/linux-extras.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y # Filesystem BR2_TARGET_ROOTFS_EXT2=y @@ -49,10 +51,7 @@ BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" # Host packages -BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y # Target packages: wireless support for pcduino-lite-wifi BR2_PACKAGE_IW=y -- 2.35.1 From geomatsi at gmail.com Fri Feb 25 07:26:21 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Fri, 25 Feb 2022 10:26:21 +0300 Subject: [Buildroot] [PATCH v2 5/6] configs/linksprite_pcduino_defconfig: update Linux/U-Boot versions In-Reply-To: <20220225072622.3584480-1-geomatsi@gmail.com> References: <20220225072622.3584480-1-geomatsi@gmail.com> Message-ID: <20220225072622.3584480-6-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. Drop redundant U-Boot options. Signed-off-by: Sergey Matyukevich --- configs/linksprite_pcduino_defconfig | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/configs/linksprite_pcduino_defconfig b/configs/linksprite_pcduino_defconfig index 05b25aede4..806c4f0697 100644 --- a/configs/linksprite_pcduino_defconfig +++ b/configs/linksprite_pcduino_defconfig @@ -19,12 +19,12 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y # Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.10" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16.1" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun4i-a10-pcduino" @@ -40,13 +40,12 @@ 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="2020.10" -BR2_TARGET_UBOOT_USE_DEFCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Linksprite_pcDuino" 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_FORMAT_BIN=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" -- 2.35.1 From geomatsi at gmail.com Fri Feb 25 07:26:22 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Fri, 25 Feb 2022 10:26:22 +0300 Subject: [Buildroot] [PATCH v2 6/6] DEVELOPERS: add Sergey Matyukevich for orangepi-zero-plus2 In-Reply-To: <20220225072622.3584480-1-geomatsi@gmail.com> References: <20220225072622.3584480-1-geomatsi@gmail.com> Message-ID: <20220225072622.3584480-7-geomatsi@gmail.com> Signed-off-by: Sergey Matyukevich --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index ac702d8d0f..f29e889c52 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2545,10 +2545,12 @@ F: board/linksprite/pcduino F: board/orangepi/orangepi-zero F: board/orangepi/orangepi-one F: board/orangepi/orangepi-pc-plus/ +F: board/orangepi/orangepi-zero-plus2/ F: configs/linksprite_pcduino_defconfig F: configs/orangepi_one_defconfig F: configs/orangepi_pc_plus_defconfig F: configs/orangepi_zero_defconfig +F: configs/orangepi_zero_plus2_defconfig F: package/armbian-firmware/ F: package/hostapd/ F: package/rtl8189fs/ -- 2.35.1 From peterlin at andestech.com Fri Feb 25 08:05:10 2022 From: peterlin at andestech.com (Yu Chien Peter Lin) Date: Fri, 25 Feb 2022 16:05:10 +0800 Subject: [Buildroot] [PATCH v4 1/3] board/andes: rearrange andes folder structure In-Reply-To: <111a4578-2489-09db-909c-774017800746@benettiengineering.com> References: <20220223071049.21153-1-peterlin@andestech.com> <84e159d2-0123-e5b1-c42e-99b70c99f43c@benettiengineering.com> <111a4578-2489-09db-909c-774017800746@benettiengineering.com> Message-ID: Hi Giulio, On Thu, Feb 24, 2022 at 04:12:10PM +0100, Giulio Benetti wrote: > Hi Peter, > > On 24/02/22 03:41, Yu Chien Peter Lin wrote: > > Hi Giulio, > > > > > > > > > > Changes v3 -> v4: > > > > > > > > - rename ae3xx folder to ae300 > > > > > > > > - rename andes_ae3xx_defconfig to andes_ae300_defconfig > > > > > > > > - update readme.txt and item in DEVELOPERS > > > > > > > > > > > > > > Some of these change ^^^ must have been moved to the single patch, like > > > > > > > DEVELOPERS is updated in patch 3/3. I've also forgotten to point you to add > > > > > > > a --cover-letter, so keep in mind both points for next time. > > > > > > > > > > > > > > I've built tested both defconfig successfully, so: > > > > > > > Reviewed-by: Giulio Benetti > > > > > > > Tested-by: Giulio Benetti > > > > > > > [Giulio: build tested only] > > > > > > > > > > > > > > And the other patches of this series is all reviewed, so to me it's ready to > > > > > > > be committed, but this will happen after Buildroot 2022.02 is released, > > > > > > > since between rc1 to the release Maintainers only accept fixes. Another > > > > > > > possibility is that they will commit these patches to next branch. > > > > > > > > > > > > > > Please remember to tag V3. > > > > Oh, I thought you were refering to format-patch with v3, sorry. > > I will mark the patch on patchwork to rejected state except the latest > > patch version. > > Ok, V3 it's still tagged as new in patchwork for the moment. Updated to rejected state. > > > > > > > Thank you for your effort! > > > > > > > > > > > > > > Best regards > > > > > > > -- > > > > > > > Giulio Benetti > > > > > > > Benetti Engineering sas > > > > > > > > > > Thanks for reviewing my patches and the guidance. > > > > > > > > You're welcome. > > > > > > > > > I will make a new patch for the Config.in, > > > > > > > > Which one? I only see: > > > > toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in > > > > > > > > Do you mean you will add an entry in DEVELOPERS for it? > > > > I found the modifications on these files in Git history, usually have > > its own patch. > > No, maybe you mean there is a cover-letter that summarize the changes of all > patches in patchset and then in every patch you list the changes of on that > patch. > > > So in PATCH v5, I will split [PATCH 1/3] to [PATCH 1/4] > > and [PATCH 2/4] for > > toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in > > other patches remain the same, > > No, wait. I've meant you only need to split: > --- > Changes v1->v2: > * > * > [..] > --- > for every patch. So, don't summarize all the changes on patch [1/3], because > those changes are related to different patches. For example in V1->V2 you > state: > - update DEVELOPERS > but you do it in patch [3/3], so you only have to move the changes into the > right patch, that's all. > > > and attach [PATCH 0/4] cover letter. > > And yes please, add a cover letter that briefly explain what patchset does > and that's it. > > > > > > The last question, is it tag V5 for the next submission? > > > > > > > > It depends if you need to modify these patches. Or if you add a new patch > > > > that depends on these patches, then yes, please send a V5 with all changes > > > > moved to the different patches, including adding the patch if this is your > > > > goal. > > > > > > > > Best regards > > > > -- > > > > Giulio Benetti > > > > Benetti Engineering sas > > > > Is there any the new comment? > > Again, thanks for your help. :) > > For the moment I don't see anything wrong except the changelog. > > Thank you! > > Best regards > -- > Giulio Benetti > Benetti Engineering sas Thanks for clarification. Best regards, Yu Chien Peter Lin From romain.naour at gmail.com Fri Feb 25 08:30:37 2022 From: romain.naour at gmail.com (Romain Naour) Date: Fri, 25 Feb 2022 09:30:37 +0100 Subject: [Buildroot] [PATCH] package/rust: set musl-root for musl toolchains Message-ID: <20220225083037.229109-1-romain.naour@gmail.com> Without musl-root in config.toml the build stop with the following error: thread 'main' panicked at 'couldn't find libc.a in musl libdir: output/host/arm-buildroot-linux-musleabihf/sysroot/lib/lib', src/bootstrap/sanity.rs:192:25 musl-root is needed to provide the path to libc.a and libunwind.a because rust link them statically into the standard library and liblibc [1]. For other libc, musl-root is not used and ignored [2]. [1] https://github.com/rust-lang/rust/commit/cd980b3bee5bd48e8a6cd4c0d7c8e0fb0fdb64dd [2] https://github.com/rust-lang/rust/blob/1.58.1/src/bootstrap/sanity.rs#L181 Signed-off-by: Romain Naour --- Runtime tested with TestRust with ripgrep and bat packages. --- package/rust/rust.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/rust/rust.mk b/package/rust/rust.mk index 4a6b04dc8c..c2e0a361dd 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -56,6 +56,7 @@ define HOST_RUST_CONFIGURE_CMDS echo 'sysconfdir = "$(HOST_DIR)/etc"'; \ echo '[rust]'; \ echo 'channel = "stable"'; \ + echo 'musl-root = "$(STAGING_DIR)"' ; \ echo '[target.$(RUSTC_TARGET_NAME)]'; \ echo 'cc = "$(TARGET_CROSS)gcc"'; \ echo '[llvm]'; \ -- 2.35.1 From peterlin at andestech.com Fri Feb 25 09:25:06 2022 From: peterlin at andestech.com (Yu Chien Peter Lin) Date: Fri, 25 Feb 2022 17:25:06 +0800 Subject: [Buildroot] [PATCH v5 0/3] Add andes ae350 support Message-ID: <20220225092509.16478-1-peterlin@andestech.com> This patchset - renames andes/ae3xx and its defconfig to ae300 for nds32 architecture. - adds ae350 platform support and andes_ae350_45_defconfig. Yu Chien Peter Lin (3): board/andes: rearrange andes folder structure board/andes/ae350: add support for Andes AE350 DEVELOPERS: add Yu-Chien Lin to board/andes DEVELOPERS | 5 +- .../ae3xx.fragment => ae300/ae300.fragment} | 0 ...0001-nds32-Fix-boot-messages-garbled.patch | 0 ...ve-redundant-YYLOC-global-declaratio.patch | 0 board/andes/{ => ae300}/readme.txt | 10 +- board/andes/ae350/ae350.dts | 274 ++++++++++++++++++ board/andes/ae350/genimage_sdcard.cfg | 26 ++ ...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/post-build.sh | 3 + board/andes/ae350/readme.txt | 65 +++++ .../boot/extlinux/extlinux.conf | 4 + board/andes/ae350/uboot.config.fragment | 5 + ..._ae3xx_defconfig => andes_ae300_defconfig} | 4 +- configs/andes_ae350_45_defconfig | 43 +++ .../toolchain-external-andes-nds32/Config.in | 2 +- 20 files changed, 590 insertions(+), 10 deletions(-) rename board/andes/{ae3xx/ae3xx.fragment => ae300/ae300.fragment} (100%) rename board/andes/{ => ae300}/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch (100%) rename board/andes/{ => ae300}/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch (100%) rename board/andes/{ => ae300}/readme.txt (71%) create mode 100755 board/andes/ae350/ae350.dts 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 100755 board/andes/ae350/post-build.sh create mode 100644 board/andes/ae350/readme.txt create mode 100644 board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf create mode 100644 board/andes/ae350/uboot.config.fragment rename configs/{andes_ae3xx_defconfig => andes_ae300_defconfig} (69%) create mode 100644 configs/andes_ae350_45_defconfig -- 2.17.1 From peterlin at andestech.com Fri Feb 25 09:25:07 2022 From: peterlin at andestech.com (Yu Chien Peter Lin) Date: Fri, 25 Feb 2022 17:25:07 +0800 Subject: [Buildroot] [PATCH v5 1/3] board/andes: rearrange andes folder structure In-Reply-To: <20220225092509.16478-1-peterlin@andestech.com> References: <20220225092509.16478-1-peterlin@andestech.com> Message-ID: <20220225092509.16478-2-peterlin@andestech.com> In order to add ae350 RISC-V platform, rename ae3xx to ae300 for NDS32 architecture. AE300 (NDS32): - http://www.andestech.com/en/products-solutions/andeshape-platforms/ae300/ AE350 (RISC-V): - http://www.andestech.com/en/products-solutions/andeshape-platforms/ae350-axi-based-platform-pre-integrated-with-n25f-nx25f-a25-ax25/ Signed-off-by: Yu Chien Peter Lin Signed-off-by: Alan Kao Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti --- Changes v3 -> v4: - rename ae3xx folder to ae300 - rename andes_ae3xx_defconfig to andes_ae300_defconfig - update readme.txt - update help message in toolchain-external-andes-nds32/Config.in --- .../{ae3xx/ae3xx.fragment => ae300/ae300.fragment} | 0 .../linux/0001-nds32-Fix-boot-messages-garbled.patch | 0 ...-dtc-Remove-redundant-YYLOC-global-declaratio.patch | 0 board/andes/{ => ae300}/readme.txt | 10 +++++----- .../{andes_ae3xx_defconfig => andes_ae300_defconfig} | 4 ++-- .../toolchain-external-andes-nds32/Config.in | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) rename board/andes/{ae3xx/ae3xx.fragment => ae300/ae300.fragment} (100%) rename board/andes/{ => ae300}/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch (100%) rename board/andes/{ => ae300}/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch (100%) rename board/andes/{ => ae300}/readme.txt (71%) rename configs/{andes_ae3xx_defconfig => andes_ae300_defconfig} (69%) diff --git a/board/andes/ae3xx/ae3xx.fragment b/board/andes/ae300/ae300.fragment similarity index 100% rename from board/andes/ae3xx/ae3xx.fragment rename to board/andes/ae300/ae300.fragment diff --git a/board/andes/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch b/board/andes/ae300/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/ae300/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch diff --git a/board/andes/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch b/board/andes/ae300/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch similarity index 100% rename from board/andes/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch rename to board/andes/ae300/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch diff --git a/board/andes/readme.txt b/board/andes/ae300/readme.txt similarity index 71% rename from board/andes/readme.txt rename to board/andes/ae300/readme.txt index 0f95c65549..51c05c9235 100644 --- a/board/andes/readme.txt +++ b/board/andes/ae300/readme.txt @@ -1,10 +1,10 @@ Intro ===== -Andestech(nds32) AE3XX Platform +Andestech(nds32) AE300 Platform -The AE3XX prototype demonstrates the AE3XX example platform on the FPGA. -It is composed of one Andestech(nds32) processor and AE3XX. +The AE300 prototype demonstrates the AE300 example platform on the FPGA. +It is composed of one Andestech(nds32) processor and AE300. How to build it =============== @@ -12,10 +12,10 @@ How to build it Configure Buildroot ------------------- -The andes_ae3xx_defconfig configuration is a sample configuration with +The andes_ae300_defconfig configuration is a sample configuration with all that is required to bring the FPGA Development Board: - $ make andes_ae3xx_defconfig + $ make andes_ae300_defconfig Build everything ---------------- diff --git a/configs/andes_ae3xx_defconfig b/configs/andes_ae300_defconfig similarity index 69% rename from configs/andes_ae3xx_defconfig rename to configs/andes_ae300_defconfig index 52634caa50..ffcb4d7d38 100644 --- a/configs/andes_ae3xx_defconfig +++ b/configs/andes_ae300_defconfig @@ -1,10 +1,10 @@ BR2_nds32=y -BR2_GLOBAL_PATCH_DIR="board/andes/patches/" +BR2_GLOBAL_PATCH_DIR="board/andes/ae300/patches" BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_ANDES_NDS32=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/andes/ae3xx/ae3xx.fragment" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/andes/ae300/ae300.fragment" BR2_TARGET_ROOTFS_INITRAMFS=y diff --git a/toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in b/toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in index 9c937b8c44..ecd50cc805 100644 --- a/toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in +++ b/toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in @@ -12,4 +12,4 @@ config BR2_TOOLCHAIN_EXTERNAL_ANDES_NDS32 help nds32 toolchain for the nds32 architecture. It uses GCC 8.2.1, GDB 8.1.1, glibc 2.28, Binutils 2.30. It generates - code that runs on ae3xx platform + code that runs on ae300 platform -- 2.17.1 From peterlin at andestech.com Fri Feb 25 09:25:08 2022 From: peterlin at andestech.com (Yu Chien Peter Lin) Date: Fri, 25 Feb 2022 17:25:08 +0800 Subject: [Buildroot] [PATCH v5 2/3] board/andes/ae350: add support for Andes AE350 In-Reply-To: <20220225092509.16478-1-peterlin@andestech.com> References: <20220225092509.16478-1-peterlin@andestech.com> Message-ID: <20220225092509.16478-3-peterlin@andestech.com> This patch provides defconfig and basic support for Andes 45 series RISC-V architecture on AE350 platform. http://www.andestech.com/en/products-solutions/andeshape-platforms/ae350-axi-based-platform-pre-integrated-with-n25f-nx25f-a25-ax25/ Signed-off-by: Yu Chien Peter Lin Signed-off-by: Alan Kao Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti --- Changes v1 -> v2: - move linux source code and its patches to AndesTech Github repo - rename ae350_andestar45_defconfig to andes_ae350_45_defconfig - change C library to uClibc - remove OpenSSL package - remove rootfs.cpio and rootfs.tar Changes v2 -> v3: - specifiy branch to download from AndesTech linux repo - change boot.cmd to extlinux.conf - add post-build.sh for extlinux.conf to retrieve Image and DTB - fix format and update genimage_sdcard.cfg - update ae350/readme.txt - add packages (python3, pylibfdt and openssl) for u-boot binman --- board/andes/ae350/ae350.dts | 274 ++++++++++++++++++ board/andes/ae350/genimage_sdcard.cfg | 26 ++ ...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/post-build.sh | 3 + board/andes/ae350/readme.txt | 65 +++++ .../boot/extlinux/extlinux.conf | 4 + board/andes/ae350/uboot.config.fragment | 5 + configs/andes_ae350_45_defconfig | 43 +++ 13 files changed, 579 insertions(+) create mode 100755 board/andes/ae350/ae350.dts 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 100755 board/andes/ae350/post-build.sh create mode 100644 board/andes/ae350/readme.txt create mode 100644 board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf 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/genimage_sdcard.cfg b/board/andes/ae350/genimage_sdcard.cfg new file mode 100644 index 0000000000..b8b9fe6a62 --- /dev/null +++ b/board/andes/ae350/genimage_sdcard.cfg @@ -0,0 +1,26 @@ +image boot.vfat { + vfat { + files = { + "u-boot-spl.bin", + "u-boot.itb", + "ae350.dtb", + } + } + size = 2M +} + +image sdcard.img { + hdimage { + } + + partition boot { + partition-type = 0xC + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + bootable = true + 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/post-build.sh b/board/andes/ae350/post-build.sh new file mode 100755 index 0000000000..0e6ce228f4 --- /dev/null +++ b/board/andes/ae350/post-build.sh @@ -0,0 +1,3 @@ +#!/bin/sh +cp $BINARIES_DIR/Image $TARGET_DIR/boot +cp $BINARIES_DIR/ae350.dtb $TARGET_DIR/boot diff --git a/board/andes/ae350/readme.txt b/board/andes/ae350/readme.txt new file mode 100644 index 0000000000..6825468d50 --- /dev/null +++ b/board/andes/ae350/readme.txt @@ -0,0 +1,65 @@ +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/ + |-- ae350.dtb + |-- boot.vfat + |-- fw_dynamic.bin + |-- fw_dynamic.elf + |-- fw_jump.bin + |-- fw_jump.elf + |-- Image + |-- 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 + $ sudo sync + +Your SD card partition should be: + + Disk /dev/sdb: 14.48 GiB, 15552479232 bytes, 30375936 sectors + Disk model: Multi-Card + Units: sectors of 1 * 512 = 512 bytes + Sector size (logical/physical): 512 bytes / 512 bytes + I/O size (minimum/optimal): 512 bytes / 512 bytes + Disklabel type: dos + Disk identifier: 0x00000000 + + Device Boot Start End Sectors Size Id Type + /dev/sdb1 1 4096 4096 2M c W95 FAT32 (LBA) + /dev/sdb2 * 4097 126976 122880 60M 83 Linux + +Insert SD card and reset the board, it should boot Linux from mmc. diff --git a/board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf b/board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf new file mode 100644 index 0000000000..549eb93abc --- /dev/null +++ b/board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +label linux + kernel /boot/Image + fdt /boot/ae350.dtb + append earlycon=sbi root=/dev/mmcblk0p2 rootwait 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..a35ddd06ba --- /dev/null +++ b/configs/andes_ae350_45_defconfig @@ -0,0 +1,43 @@ +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_OVERLAY="board/andes/ae350/rootfs_overlay" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/andes/ae350/post-build.sh" +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_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/andestech/linux.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.10.84-ae350_45" +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_PYTHON3=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y +# BR2_TARGET_UBOOT_FORMAT_BIN is not set +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.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 -- 2.17.1 From peterlin at andestech.com Fri Feb 25 09:25:09 2022 From: peterlin at andestech.com (Yu Chien Peter Lin) Date: Fri, 25 Feb 2022 17:25:09 +0800 Subject: [Buildroot] [PATCH v5 3/3] DEVELOPERS: add Yu-Chien Lin to board/andes In-Reply-To: <20220225092509.16478-1-peterlin@andestech.com> References: <20220225092509.16478-1-peterlin@andestech.com> Message-ID: <20220225092509.16478-4-peterlin@andestech.com> Nylon is no longer at Andes. Signed-off-by: Yu Chien Peter Lin Signed-off-by: Alan Kao Reviewed-by: Giulio Benetti --- Changes v1 -> v2: - update owner to Yu-Chien Lin Changes v2 -> v3: - reorder andes entries Changes v3 -> v4: - reorder andes entries --- DEVELOPERS | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index ac702d8d0f..cd64159867 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2146,10 +2146,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_ae300_defconfig +F: configs/andes_ae350_45_defconfig F: toolchain/toolchain-external/toolchain-external-andes-nds32/ N: Olaf Rempel -- 2.17.1 From thomas.petazzoni at bootlin.com Fri Feb 25 09:29:29 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 25 Feb 2022 09:29:29 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-02-24 Message-ID: <20220225092934.348C660B57@smtp3.osuosl.org> Hello, Autobuild statistics for 2022-02-24 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 44 | 2 | 1 | 47 | 2021.11.x | 11 | 1 | 0 | 12 | master | 40 | 29 | 1 | 70 | Classification of failures by reason for master ----------------------------------------------- host-libselinux-3.3 | 10 frr-8.1 | 4 bluez5_utils-5.63 | 2 bpftool-v6.7.0 | 2 unknown | 2 bat-0.19.0 | 1 frr | 1 gocryptfs-2.2.1 | 1 pulseview-0.4.2 | 1 python-greenlet-1.1.2 | 1 safeclib-3.7.1 | 1 sconeserver-6b932d7d8dbb700... | 1 sg3_utils-1.47 | 1 tovid-87c676f4aadb7303d2cd9... | 1 wpa_supplicant-2.10 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | bat-0.19.0 | NOK | http://autobuild.buildroot.net/results/89a5355369b2dbcecca5542e3bea7f22d6844d35 | i586 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/8075d14919639b89337d04ee5a324b4c69d2e079 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/83eaeb3863040645409f5787fdbdde79385c5257 | arm | bpftool-v6.7.0 | NOK | http://autobuild.buildroot.net/results/aae772f1cfb16516a57f310c4f022e80a2a8d65e | arm | bpftool-v6.7.0 | NOK | http://autobuild.buildroot.net/results/4ce51ced26783c52766a002ac75b42262eace45e | arc | frr | TIM | http://autobuild.buildroot.net/results/6fb124cad6c753170b6e8a3d495158f1ce864e6e | nios2 | frr-8.1 | NOK | http://autobuild.buildroot.net/results/6c0ff16d28db81384efdd6cde90346fe5511bdb9 | riscv64 | frr-8.1 | NOK | http://autobuild.buildroot.net/results/42856dfc5119f00e04872eb8893a96431c300ced | powerpc64 | frr-8.1 | NOK | http://autobuild.buildroot.net/results/8c5ef3b81e313dcfa82750ae9e9d6eae8e8755aa | nds32le | frr-8.1 | NOK | http://autobuild.buildroot.net/results/daf373b337b64e72c2b94d3f4a5059d07ac7a5ac | i586 | gocryptfs-2.2.1 | NOK | http://autobuild.buildroot.net/results/310216a1b034138796c488565ca754247f04465f | mipsel | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/0d18af8c87dd6f1b38cdaa4e9df934d72c257b15 | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/6c06ffef722b526cc80fdda4b5e3ef360d4fe063 | m68k | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/79e12d8bacfcae8e371b966d33bd86549566f82c | xtensa | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/be35833e5be937803b52c3114c7ffa30651b99ba | arc | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/641837bfd850c703f560adb30db6dd29cb55667f | riscv64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/5ce41a0aded979623b15ecdde86a5326464039a3 | microblazeel | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/dc6362d21593a01baca3d3a0cead41bb260bb28e | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/0162060ee082f7a17c98db61b0cbc7d870151bf0 | riscv32 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/974a739b1cd40e867d9d2598d8037d43127f7fe1 | powerpc | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/8a196826b35913d1fb005dfc5191a83c38cac286 | x86_64 | pulseview-0.4.2 | NOK | http://autobuild.buildroot.net/results/a439a56a1e78cd6eef3f18ac277e4125ebd0ce05 | x86_64 | python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/151e338b009b3b560a259449f962b00df075e003 | sparc | safeclib-3.7.1 | NOK | http://autobuild.buildroot.net/results/6c2685460fdc311f5a65476d7e4e5e57a9044c0c | arm | sconeserver-6b932d7d8dbb700... | NOK | http://autobuild.buildroot.net/results/e4f0cfac09027dd59adf133d61d9952ebe266373 | m68k | sg3_utils-1.47 | NOK | http://autobuild.buildroot.net/results/4d5a001e6eaf099c55e3926c62bc790c6af9c419 | mips64el | tovid-87c676f4aadb7303d2cd9... | NOK | http://autobuild.buildroot.net/results/c5e4a7e2e290ad0d3dd9153398c30f3298fcbcc5 | xtensa | unknown | NOK | http://autobuild.buildroot.net/results/96d4d9c9047c36ada6b335848e931143c5939c6b | mips64el | unknown | NOK | http://autobuild.buildroot.net/results/938519241d02227df4989a159fd467fb0e3794b6 | arm | wpa_supplicant-2.10 | NOK | http://autobuild.buildroot.net/results/12b757e64fea5bfb0859fcbb35110a6225364c78 | Classification of failures by reason for 2021.02.x -------------------------------------------------- gobject-introspection-1.64.1 | 1 host-sentry-cli-1.57.0 | 1 python-lxml | 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/ee65c707ad9e0f5a4c77f364491ddab3ad81ce91 | ORPH aarch64 | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/ed2482fb399f37066781d97306650fee894ec5f6 | m68k | python-lxml | TIM | http://autobuild.buildroot.net/results/f3790e8b9d37bb913df5d3dbf1b1d268541096bd | 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? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- powerpc64 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/b852b28a56209dd81a0385e83af1ac5500a8cd6d | -- http://autobuild.buildroot.net From kamel.bouhara at bootlin.com Fri Feb 25 11:33:56 2022 From: kamel.bouhara at bootlin.com (Kamel Bouhara) Date: Fri, 25 Feb 2022 12:33:56 +0100 Subject: [Buildroot] [PATCH 0/4] Add odb host variant and fix gcc-11 build Message-ID: <20220225113400.802049-1-kamel.bouhara@bootlin.com> Hello, Here is a short patch series that fix odb build issue with gcc-11 and add a host variant of the libodb package required by the host-odb compiler. The host-libodb-boost variant is only required when boost package is enabled. Kamel Bouhara (1): package/libodb-boost: add host variant Thomas Petazzoni (3): package/odb: backport more upstream commits to fix build with gcc 11.x package/odb: add dependency on host-libodb package/libodb: add host variant package/libodb-boost/libodb-boost.mk | 5 +- package/libodb/libodb.mk | 2 + .../0012-Adjust-to-changes-in-GCC-11.patch | 50 ++++++++++++++ ...kup-ambiguity-causing-error-with-GCC.patch | 68 +++++++++++++++++++ package/odb/odb.mk | 8 ++- 5 files changed, 131 insertions(+), 2 deletions(-) create mode 100644 package/odb/0012-Adjust-to-changes-in-GCC-11.patch create mode 100644 package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch -- 2.25.1 From kamel.bouhara at bootlin.com Fri Feb 25 11:33:57 2022 From: kamel.bouhara at bootlin.com (Kamel Bouhara) Date: Fri, 25 Feb 2022 12:33:57 +0100 Subject: [Buildroot] [PATCH 1/4] package/odb: backport more upstream commits to fix build with gcc 11.x In-Reply-To: <20220225113400.802049-1-kamel.bouhara@bootlin.com> References: <20220225113400.802049-1-kamel.bouhara@bootlin.com> Message-ID: <20220225113400.802049-2-kamel.bouhara@bootlin.com> From: Thomas Petazzoni Commit ac9855e761443dee4f9d461b83e12443d37e8678 ("package/odb: fix build with gcc 11") already fixed some gcc 11.x issues, but not all of them. This commit backports two upstream patches fixing the remaining issues, ensuring host-odb can be built on a gcc 11.x machine. Fixes: http://autobuild.buildroot.net/results/d37c4271e66d923f7af6a4e3dbad603fcd1c8119/ Signed-off-by: Thomas Petazzoni --- Note: the above autobuilder issue has stopped appearing after September 29, 2021, which initially sounded odd. However, on October 3, we started rejecting build results from Xogium's autobuilder (for other reasons), and all those issues were coming from Xogium's autobuilder. And this is pretty logical: Xogium's autobuilder was known to be running a very recent Arch Linux, and therefore was the only autobuild machine running gcc 11.x as the host compiler. --- .../0012-Adjust-to-changes-in-GCC-11.patch | 50 ++++++++++++++ ...kup-ambiguity-causing-error-with-GCC.patch | 68 +++++++++++++++++++ 2 files changed, 118 insertions(+) create mode 100644 package/odb/0012-Adjust-to-changes-in-GCC-11.patch create mode 100644 package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch diff --git a/package/odb/0012-Adjust-to-changes-in-GCC-11.patch b/package/odb/0012-Adjust-to-changes-in-GCC-11.patch new file mode 100644 index 0000000000..2959a71dea --- /dev/null +++ b/package/odb/0012-Adjust-to-changes-in-GCC-11.patch @@ -0,0 +1,50 @@ +From 5a5656920c6b49902ae0da6a0da84efe6e5a66f0 Mon Sep 17 00:00:00 2001 +From: Boris Kolpackov +Date: Wed, 31 Mar 2021 10:45:21 +0200 +Subject: [PATCH] Adjust to changes in GCC 11 + +[Upstream: 61d80f051293a7449a09081f60f48b8377bfbbad] +Signed-off-by: Thomas Petazzoni +--- + odb/gcc.hxx | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +diff --git a/odb/gcc.hxx b/odb/gcc.hxx +index fb6a1bf..d8ad590 100644 +--- a/odb/gcc.hxx ++++ b/odb/gcc.hxx +@@ -164,6 +164,7 @@ gcc_tree_code_name (gcc_tree_code_type tc) {return tree_code_name[tc];} + // In GCC 9: + // + // INCLUDED_FROM Became linemap_included_from_linemap(). ++// + // LAST_SOURCE_LINE Was removed apparently as no longer used. Studying + // the line-map.h diff from 8.3 suggests that the old + // implementation should still work. +@@ -193,4 +194,23 @@ LAST_SOURCE_LINE (const line_map_ordinary* map) + + #endif + ++// In GCC 11: ++// ++// lookup_qualified_name() has a new interface. ++// ++// DECL_IS_BUILTIN became DECL_IS_UNDECLARED_BUILTIN. ++// ++#if BUILDING_GCC_MAJOR >= 11 ++ ++inline tree ++lookup_qualified_name (tree scope, tree name, bool type, bool complain) ++{ ++ return lookup_qualified_name ( ++ scope, name, (type ? LOOK_want::TYPE : LOOK_want::NORMAL), complain); ++} ++ ++#define DECL_IS_BUILTIN(decl) DECL_IS_UNDECLARED_BUILTIN(decl) ++ ++#endif ++ + #endif // ODB_GCC_HXX +-- +2.34.1 + diff --git a/package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch b/package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch new file mode 100644 index 0000000000..79c3d982fa --- /dev/null +++ b/package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch @@ -0,0 +1,68 @@ +From 60460df2a6d7b43a860a8f8b614c049ec0127ea8 Mon Sep 17 00:00:00 2001 +From: Boris Kolpackov +Date: Wed, 7 Jul 2021 09:26:57 +0200 +Subject: [PATCH] Resolve name lookup ambiguity causing error with GCC 11 + +[Upstream: 47035c0f72efd99a2210cd45db6e42423fb74533] +Signed-off-by: Thomas Petazzoni +--- + odb/relational/header.hxx | 2 ++ + odb/relational/source.hxx | 8 ++++++++ + 2 files changed, 10 insertions(+) + +diff --git a/odb/relational/header.hxx b/odb/relational/header.hxx +index 63dea09..d7f78fa 100644 +--- a/odb/relational/header.hxx ++++ b/odb/relational/header.hxx +@@ -50,6 +50,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual bool + pre (member_info& mi) + { +diff --git a/odb/relational/source.hxx b/odb/relational/source.hxx +index 716aa10..7da25fc 100644 +--- a/odb/relational/source.hxx ++++ b/odb/relational/source.hxx +@@ -1360,6 +1360,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual bool + pre (member_info& mi) + { +@@ -1744,6 +1746,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual bool + pre (member_info& mi) + { +@@ -2007,6 +2011,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual void + set_null (member_info&) = 0; + +@@ -2458,6 +2464,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual void + get_null (string const& var) const = 0; + +-- +2.34.1 + -- 2.25.1 From kamel.bouhara at bootlin.com Fri Feb 25 11:33:59 2022 From: kamel.bouhara at bootlin.com (Kamel Bouhara) Date: Fri, 25 Feb 2022 12:33:59 +0100 Subject: [Buildroot] [PATCH 3/4] package/libodb: add host variant In-Reply-To: <20220225113400.802049-1-kamel.bouhara@bootlin.com> References: <20220225113400.802049-1-kamel.bouhara@bootlin.com> Message-ID: <20220225113400.802049-4-kamel.bouhara@bootlin.com> From: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- package/libodb/libodb.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libodb/libodb.mk b/package/libodb/libodb.mk index 11ca9de866..b25e8ac501 100644 --- a/package/libodb/libodb.mk +++ b/package/libodb/libodb.mk @@ -12,5 +12,7 @@ LIBODB_INSTALL_STAGING = YES LIBODB_LICENSE = GPL-2.0 LIBODB_LICENSE_FILES = LICENSE LIBODB_CONF_ENV = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" +HOST_LIBODB_CONF_ENV = CXXFLAGS="$(HOST_CXXFLAGS) -std=c++11" $(eval $(autotools-package)) +$(eval $(host-autotools-package)) -- 2.25.1 From kamel.bouhara at bootlin.com Fri Feb 25 11:34:00 2022 From: kamel.bouhara at bootlin.com (Kamel Bouhara) Date: Fri, 25 Feb 2022 12:34:00 +0100 Subject: [Buildroot] [PATCH 4/4] package/libodb-boost: add host variant In-Reply-To: <20220225113400.802049-1-kamel.bouhara@bootlin.com> References: <20220225113400.802049-1-kamel.bouhara@bootlin.com> Message-ID: <20220225113400.802049-5-kamel.bouhara@bootlin.com> Add host variant of libodb-boost required by host-odb package. Signed-off-by: Kamel Bouhara --- package/libodb-boost/libodb-boost.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/libodb-boost/libodb-boost.mk b/package/libodb-boost/libodb-boost.mk index bac5f1e78f..7f2ad1fe72 100644 --- a/package/libodb-boost/libodb-boost.mk +++ b/package/libodb-boost/libodb-boost.mk @@ -11,7 +11,10 @@ LIBODB_BOOST_SITE = https://www.codesynthesis.com/download/odb/$(LIBODB_BOOST_VE LIBODB_BOOST_INSTALL_STAGING = YES LIBODB_BOOST_LICENSE = GPL-2.0 LIBODB_BOOST_LICENSE_FILES = LICENSE -LIBODB_BOOST_DEPENDENCIES = boost libodb +LIBODB_BOOST_DEPENDENCIES = boost libodb \ + host-boost \ + host-libodb LIBODB_BOOST_CONF_ENV = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" $(eval $(autotools-package)) +$(eval $(host-autotools-package)) -- 2.25.1 From kamel.bouhara at bootlin.com Fri Feb 25 11:33:58 2022 From: kamel.bouhara at bootlin.com (Kamel Bouhara) Date: Fri, 25 Feb 2022 12:33:58 +0100 Subject: [Buildroot] [PATCH 2/4] package/odb: add dependency on host-libodb In-Reply-To: <20220225113400.802049-1-kamel.bouhara@bootlin.com> References: <20220225113400.802049-1-kamel.bouhara@bootlin.com> Message-ID: <20220225113400.802049-3-kamel.bouhara@bootlin.com> From: Thomas Petazzoni host-odb installs the ODB compiler, which when executed at runtime, needs access to the libodb headers. In order to have them installed, add a dependency on host-libodb. Signed-off-by: Thomas Petazzoni [Kamel: Add optional host-libodb-boost dependency] --- package/odb/odb.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/odb/odb.mk b/package/odb/odb.mk index 85c7ccb8bb..e7ba1fd48b 100644 --- a/package/odb/odb.mk +++ b/package/odb/odb.mk @@ -10,7 +10,13 @@ ODB_SOURCE = odb-$(ODB_VERSION).tar.bz2 ODB_SITE = https://www.codesynthesis.com/download/odb/$(ODB_VERSION_MAJOR) ODB_LICENSE = GPL-3.0 ODB_LICENSE_FILES = LICENSE -HOST_ODB_DEPENDENCIES = host-libcutl +# host-libodb is not needed to build host-odb, but it is needed to use +# the ODB compiler, as it install header files that are needed at +# runtime by the odb compiler. +HOST_ODB_DEPENDENCIES = host-libcutl host-libodb +ifeq ($(BR2_PACKAGE_BOOST),y) +HOST_ODB_DEPENDENCIES += host-boost host-libodb-boost +endif HOST_ODB_CONF_ENV = CXXFLAGS="$(HOST_CXXFLAGS) -std=c++11" # Prevent odb from trying to install the gcc plugin into the hosts -- 2.25.1 From romain.naour at gmail.com Fri Feb 25 17:11:48 2022 From: romain.naour at gmail.com (Romain Naour) Date: Fri, 25 Feb 2022 18:11:48 +0100 Subject: [Buildroot] [PATCH] package/Makefile.in: year2038 makes time_t 64-bit for glibc toolchains Message-ID: <20220225171148.701977-1-romain.naour@gmail.com> To use time_t 64-bit for glibc >= 2.34 toolchains we have to set both _FILE_OFFSET_BITS=64 and _TIME_BITS=64 for glibc toolchains. Buildroot already define _FILE_OFFSET_BITS=64 since 2008 [1] before the first release tag 2009.02. _TIME_BITS is not needed for musl libc since it already year2038 ready [2]. The uclibc-ng libc only support time_t 32-bit (long int) so it will be affected by the year2038 issue [3]. Fixes (in French, chapter Buildroot 2022 and GlibC): https://www.blaess.fr/christophe/2038 Runtime tested with qemu_arm_vexpress_defconfig and the Bootlin glibc bleeding-edge 2021.11-1 toolchain. Before: # date Tue Jan 19 03:14:07 UTC 2038 # date Thu Jan 1 00:00:00 UTC 1970 After: # date Tue Jan 19 03:14:07 UTC 2038 # date Tue Jan 19 03:14:08 UTC 2038 # date Tue Jan 19 03:14:09 UTC 2038 [1] 60b5eee76edfa153ef118d2788c74ac8da1497a0 [2] https://git.musl-libc.org/cgit/musl/tree/include/alltypes.h.in?h=v1.2.2#n3 [3] https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/tree/include/time.h?h=v1.0.40#n75 https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/tree/libc/sysdeps/linux/common/bits/types.h?h=v1.0.40#n106 Signed-off-by: Romain Naour Cc: Christophe Blaess --- package/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/Makefile.in b/package/Makefile.in index 508ea7c366..cde050ca82 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -167,7 +167,7 @@ else ifeq ($(BR2_FORTIFY_SOURCE_2),y) TARGET_HARDENED += -D_FORTIFY_SOURCE=2 endif -TARGET_CPPFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 +TARGET_CPPFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 TARGET_CFLAGS = $(TARGET_CPPFLAGS) $(TARGET_ABI) $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) $(TARGET_HARDENED) TARGET_CXXFLAGS = $(TARGET_CFLAGS) TARGET_FCFLAGS = $(TARGET_ABI) $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) -- 2.35.1 From fontaine.fabrice at gmail.com Fri Feb 25 18:52:04 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 25 Feb 2022 19:52:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/rpi-userland: fix build with libexecinfo Message-ID: <20220225185204.1043277-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/peko/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: ../../build/lib/libvcos.so: undefined reference to `backtrace_symbols' Fixes: - http://autobuild.buildroot.org/results/93d3b8cc2ac5dfa9d4b44946c0b4d8171e8f52a1 Signed-off-by: Fabrice Fontaine --- ...on-t-override-CMAKE_EXE_LINKER_FLAGS.patch | 58 +++++++++++++++++++ package/rpi-userland/rpi-userland.mk | 5 ++ 2 files changed, 63 insertions(+) create mode 100644 package/rpi-userland/0006-don-t-override-CMAKE_EXE_LINKER_FLAGS.patch diff --git a/package/rpi-userland/0006-don-t-override-CMAKE_EXE_LINKER_FLAGS.patch b/package/rpi-userland/0006-don-t-override-CMAKE_EXE_LINKER_FLAGS.patch new file mode 100644 index 0000000000..bf2a9eb6ea --- /dev/null +++ b/package/rpi-userland/0006-don-t-override-CMAKE_EXE_LINKER_FLAGS.patch @@ -0,0 +1,58 @@ +From 87febf8b7b1c0a6d0ea1d26770d3665008d66fd2 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 25 Feb 2022 19:21:06 +0100 +Subject: [PATCH] don't override CMAKE_EXE_LINKER_FLAGS + +Don't override CMAKE_EXE_LINKER_FLAGS as it could be used by the user to +pass additional flags such as -lexecinfo on musl and uclibc-ng + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/raspberrypi/userland/pull/719] +--- + host_applications/android/apps/vidtex/CMakeLists.txt | 2 +- + host_applications/linux/apps/raspicam/CMakeLists.txt | 2 +- + makefiles/cmake/arm-linux.cmake | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/host_applications/android/apps/vidtex/CMakeLists.txt b/host_applications/android/apps/vidtex/CMakeLists.txt +index e7206cc..16c64db 100644 +--- a/host_applications/android/apps/vidtex/CMakeLists.txt ++++ b/host_applications/android/apps/vidtex/CMakeLists.txt +@@ -5,7 +5,7 @@ SET(COMPILE_DEFINITIONS -Werror -Wall) + # Set --no-as-needed to stop the linker discarding mmal_vc_client + # as it can't see that the constructor registers a load of functionality + # with the MMAL core. +-SET( CMAKE_EXE_LINKER_FLAGS "-Wl,--no-as-needed" ) ++SET( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-as-needed" ) + + include_directories(${PROJECT_SOURCE_DIR}/host_applications/linux/libs/bcm_host/include) + +diff --git a/host_applications/linux/apps/raspicam/CMakeLists.txt b/host_applications/linux/apps/raspicam/CMakeLists.txt +index e6bd373..2f72eb2 100644 +--- a/host_applications/linux/apps/raspicam/CMakeLists.txt ++++ b/host_applications/linux/apps/raspicam/CMakeLists.txt +@@ -6,7 +6,7 @@ SET(COMPILE_DEFINITIONS -Werror) + # Set --no-as-needed to stop the linker discarding mmal_vc_client + # as it can't see that the constructor registers a load of functionality + # with the MMAL core. +-SET( CMAKE_EXE_LINKER_FLAGS "-Wl,--no-as-needed" ) ++SET( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-as-needed" ) + + include_directories(${PROJECT_SOURCE_DIR}/host_applications/linux/libs/bcm_host/include) + include_directories(${PROJECT_SOURCE_DIR}/host_applications/linux/apps/raspicam/) +diff --git a/makefiles/cmake/arm-linux.cmake b/makefiles/cmake/arm-linux.cmake +index 957846a..e172282 100644 +--- a/makefiles/cmake/arm-linux.cmake ++++ b/makefiles/cmake/arm-linux.cmake +@@ -93,7 +93,7 @@ if(ANDROID) + set(CMAKE_SHARED_LINKER_FLAGS "-nostdlib ${ANDROID_CRTBEGIN} -Wl,-Bdynamic -Wl,-T${ANDROID_LDSCRIPTS}/armelf.x") + + link_directories(${ANDROID_LIBS}) +- set(CMAKE_EXE_LINKER_FLAGS "-nostdlib ${ANDROID_CRTBEGIN} -nostdlib -Wl,-z,noexecstack") ++ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -nostdlib ${ANDROID_CRTBEGIN} -nostdlib -Wl,-z,noexecstack") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-dynamic-linker,/system/bin/linker -Wl,-rpath,${CMAKE_INSTALL_PREFIX}/lib") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-T${ANDROID_LDSCRIPTS}/armelf.x -Wl,--gc-sections") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,nocopyreloc -Wl,-z,noexecstack -Wl,--fix-cortex-a8 -Wl,--no-undefined") +-- +2.34.1 + diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk index 84050b6df3..3564ec0703 100644 --- a/package/rpi-userland/rpi-userland.mk +++ b/package/rpi-userland/rpi-userland.mk @@ -13,6 +13,11 @@ RPI_USERLAND_CONF_OPTS = -DVMCS_INSTALL_PREFIX=/usr RPI_USERLAND_PROVIDES = libegl libgles libopenmax libopenvg +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +RPI_USERLAND_DEPENDENCIES += libexecinfo +RPI_USERLAND_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-lexecinfo +endif + ifeq ($(BR2_PACKAGE_RPI_USERLAND_HELLO),y) RPI_USERLAND_CONF_OPTS += -DALL_APPS=ON -- 2.34.1 From romain.naour at gmail.com Fri Feb 25 21:52:45 2022 From: romain.naour at gmail.com (Romain Naour) Date: Fri, 25 Feb 2022 22:52:45 +0100 Subject: [Buildroot] [PATCH] package/pkg-python: use SETUPTOOLS_USE_DISTUTILS=stdlib In-Reply-To: <20220224154118.220408-1-romain.naour@gmail.com> References: <20220224154118.220408-1-romain.naour@gmail.com> Message-ID: Le 24/02/2022 ? 16:41, Romain Naour a ?crit?: > -sh: ipython: not found > > ipython use a wrong shebang on the target: > > # head -n 1 /usr/bin/ipython > #!/home/kubu/buildroot/testsuite-master/TestIPythonPy3/host/bin/python > > The issue come from python3-setuptools 60.0.0 that changed > SETUPTOOLS_USE_DISTUTILS default value from stdlib to local [1] to use > its local copy of distutils. This is actually a "breaking" change [2]. > > We have to override SETUPTOOLS_USE_DISTUTILS to the previous value > "stdlib" to fixes the issue. > > While at it, use distutils from stdlib for the host. > > Fixes: > https://gitlab.com/buildroot.org/buildroot/-/jobs/2088684091 > > [1] https://github.com/pypa/setuptools/commit/b6fcbbd00cb6d5607c9272dec452a50457bdb292 > [2] https://github.com/pypa/setuptools/blob/v60.0.0/CHANGES.rst#breaking-changes I noticed that Qemu included a workaround for setuptools >= 60: https://git.qemu.org/?p=qemu.git;a=commitdiff;h=762c280d5f3c17a239204a73855d8778f6dc2113 Best regards, Romain > > Signed-off-by: Romain Naour > Cc: James Hilliard > --- > package/pkg-python.mk | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/package/pkg-python.mk b/package/pkg-python.mk > index b8dc9cd9e5..e81a1a3102 100644 > --- a/package/pkg-python.mk > +++ b/package/pkg-python.mk > @@ -40,6 +40,7 @@ PKG_PYTHON_DISTUTILS_ENV = \ > LDSHARED="$(TARGET_CROSS)gcc -shared" \ > PYTHONPATH="$(PYTHON3_PATH)" \ > PYTHONNOUSERSITE=1 \ > + SETUPTOOLS_USE_DISTUTILS=stdlib \ > _PYTHON_HOST_PLATFORM="$(PKG_PYTHON_HOST_PLATFORM)" \ > _PYTHON_PROJECT_BASE="$(PYTHON3_DIR)" \ > _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ > @@ -62,6 +63,7 @@ PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS = \ > HOST_PKG_PYTHON_DISTUTILS_ENV = \ > PATH=$(BR_PATH) \ > PYTHONNOUSERSITE=1 \ > + SETUPTOOLS_USE_DISTUTILS=stdlib \ > $(HOST_CONFIGURE_OPTS) > > HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \ > @@ -76,6 +78,7 @@ PKG_PYTHON_SETUPTOOLS_ENV = \ > $(TARGET_CONFIGURE_OPTS) \ > PYTHONPATH="$(PYTHON3_PATH)" \ > PYTHONNOUSERSITE=1 \ > + SETUPTOOLS_USE_DISTUTILS=stdlib \ > _python_sysroot=$(STAGING_DIR) \ > _python_prefix=/usr \ > _python_exec_prefix=/usr > @@ -96,6 +99,7 @@ PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS = \ > HOST_PKG_PYTHON_SETUPTOOLS_ENV = \ > PATH=$(BR_PATH) \ > PYTHONNOUSERSITE=1 \ > + SETUPTOOLS_USE_DISTUTILS=stdlib \ > $(HOST_CONFIGURE_OPTS) > > HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ From fontaine.fabrice at gmail.com Fri Feb 25 23:05:18 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 26 Feb 2022 00:05:18 +0100 Subject: [Buildroot] [PATCH 1/2] package/zabbix: fix shared netsnmp build Message-ID: <20220225230519.1584174-1-fontaine.fabrice@gmail.com> Fix the following shared build failure with netsnmp raised since the addition of the package in commit 42382a171277ead59e365f5920e757f01c04ac77: configure: error: "libnetsnmp.a static library was not found in /home/buildroot/autobuild/instance-0/output-1/host/powerpc64le-buildroot-linux-gnu/sysroot/usr/bin/../../usr/lib" Fixes: - http://autobuild.buildroot.org/results/0f541e45d1fa27b3302968683bf64949131ec1c9 Signed-off-by: Fabrice Fontaine --- ...-netsnmp.m4-fix-shared-netsnmp-build.patch | 44 +++++++++++++++++++ package/zabbix/zabbix.mk | 2 + 2 files changed, 46 insertions(+) create mode 100644 package/zabbix/0001-m4-netsnmp.m4-fix-shared-netsnmp-build.patch diff --git a/package/zabbix/0001-m4-netsnmp.m4-fix-shared-netsnmp-build.patch b/package/zabbix/0001-m4-netsnmp.m4-fix-shared-netsnmp-build.patch new file mode 100644 index 0000000000..ffb1f54ba2 --- /dev/null +++ b/package/zabbix/0001-m4-netsnmp.m4-fix-shared-netsnmp-build.patch @@ -0,0 +1,44 @@ +From 3e810c0804ec40ad6e111a9791cdb2033ecdad71 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 25 Feb 2022 23:30:19 +0100 +Subject: [PATCH] m4/netsnmp.m4: fix shared netsnmp build + +Since commit fe391e8689c523d3c7ea6b173d25aa5dba3a6902, the build fails +with the following error if the user provides the path of +net-snmp-config through the --with-net-snmp option: + +configure: error: "libnetsnmp.a static library was not found in /home/buildroot/autobuild/instance-0/output-1/host/powerpc64le-buildroot-linux-gnu/sysroot/usr/bin/../../usr/lib" + +However, the assumption that a static library will be provided by the +system is just plain wrong so replace AC_MSG_ERROR by AC_MSG_WARN + +Fixes: + - http://autobuild.buildroot.org/results/0f541e45d1fa27b3302968683bf64949131ec1c9 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/zabbix/zabbix/pull/61] +--- + m4/netsnmp.m4 | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/m4/netsnmp.m4 b/m4/netsnmp.m4 +index 5e84d84303..87e21a67e6 100644 +--- a/m4/netsnmp.m4 ++++ b/m4/netsnmp.m4 +@@ -140,8 +140,11 @@ AC_HELP_STRING([--with-net-snmp@<:@=ARG@:>@], + test [ "x$static_linking_support" = "xno" -o -z "$static_linking_support" ] -a -z "$_libsnmp_dir_lib" && AC_MSG_ERROR(["Compiler not support statically linked libs from default folders"]) + + if test "x$static_linking_support" = "xno" -o -z "$static_linking_support"; then +- test -f $_libsnmp_dir_lib/libnetsnmp.a || AC_MSG_ERROR(["libnetsnmp.a static library was not found in $_libsnmp_dir_lib"]) +- SNMP_LIBS=`echo "$SNMP_LIBS"|sed "s|-lnetsnmp|$_libsnmp_dir_lib/libnetsnmp.a|g"` ++ if test -f $_libsnmp_dir_lib/libnetsnmp.a; then ++ SNMP_LIBS=`echo "$SNMP_LIBS"|sed "s|-lnetsnmp|$_libsnmp_dir_lib/libnetsnmp.a|g"` ++ else ++ AC_MSG_WARN(["libnetsnmp.a static library was not found in $_libsnmp_dir_lib"]) ++ fi + else + SNMP_LIBS=`echo "$SNMP_LIBS"|sed "s/-lnetsnmp/${static_linking_support}static -lnetsnmp ${static_linking_support}dynamic/g"` + fi +-- +2.34.1 + diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk index e6564e68fd..a8ecbb42db 100644 --- a/package/zabbix/zabbix.mk +++ b/package/zabbix/zabbix.mk @@ -10,6 +10,8 @@ ZABBIX_SITE = https://cdn.zabbix.com/zabbix/sources/stable/$(ZABBIX_VERSION_MAJO ZABBIX_LICENSE = GPL-2.0+ ZABBIX_LICENSE_FILES = README COPYING ZABBIX_CPE_ID_VENDOR = zabbix +# We're patching m4/netsnmp.m4 +ZABBIX_AUTORECONF = YES ZABBIX_DEPENDENCIES = pcre ZABBIX_CONF_OPTS = \ -- 2.34.1 From fontaine.fabrice at gmail.com Fri Feb 25 23:05:19 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 26 Feb 2022 00:05:19 +0100 Subject: [Buildroot] [PATCH 2/2] package/zabbix: netsnmp needs mib In-Reply-To: <20220225230519.1584174-1-fontaine.fabrice@gmail.com> References: <20220225230519.1584174-1-fontaine.fabrice@gmail.com> Message-ID: <20220225230519.1584174-2-fontaine.fabrice@gmail.com> netsnmp support needs mib to avoid the following build failure raised since the addition of the package in commit 42382a171277ead59e365f5920e757f01c04ac77: checks_snmp.c: In function ?zbx_snmp_get_octet_string?: checks_snmp.c:694:35: error: invalid use of undefined type ?struct tree? 694 | hint = (NULL != subtree ? subtree->hint : NULL); | ^~ Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine --- package/zabbix/zabbix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk index a8ecbb42db..adc54028ad 100644 --- a/package/zabbix/zabbix.mk +++ b/package/zabbix/zabbix.mk @@ -55,7 +55,7 @@ else ZABBIX_CONF_OPTS += --without-libxml2 endif -ifeq ($(BR2_PACKAGE_NETSNMP),y) +ifeq ($(BR2_PACKAGE_NETSNMP_ENABLE_MIBS),y) ZABBIX_CONF_OPTS += --with-net-snmp=$(STAGING_DIR)/usr/bin/net-snmp-config ZABBIX_DEPENDENCIES += netsnmp else -- 2.34.1 From fontaine.fabrice at gmail.com Fri Feb 25 23:18:16 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 26 Feb 2022 00:18:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/openssh: security bump to version 8.9p1 Message-ID: <20220225231816.1648877-1-fontaine.fabrice@gmail.com> Security Near Miss ================== * sshd(8): fix an integer overflow in the user authentication path that, in conjunction with other logic errors, could have yielded unauthenticated access under difficult to exploit conditions. This situation is not exploitable because of independent checks in the privilege separation monitor. Privilege separation has been enabled by default in since openssh-3.2.2 (released in 2002) and has been mandatory since openssh-7.5 (released in 2017). Moreover, portable OpenSSH has used toolchain features available in most modern compilers to abort on signed integer overflow since openssh-6.5 (released in 2014). Update license (md5crypt removed, bcrypt relicensed to BSD-3-Clause: https://github.com/openssh/openssh-portable/commit/a5ab4882348d26addc9830a44e053238dfa2cb58 https://github.com/openssh/openssh-portable/commit/158bf854e2a22cf09064305f4a4e442670562685 https://github.com/openssh/openssh-portable/commit/c0459588b8d00b73e506c6095958ecfe62a4a7ba) https://www.openssh.com/txt/release-8.9 Signed-off-by: Fabrice Fontaine --- package/openssh/openssh.hash | 6 +++--- package/openssh/openssh.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/openssh/openssh.hash b/package/openssh/openssh.hash index aab3dba09c..dd123c1bb6 100644 --- a/package/openssh/openssh.hash +++ b/package/openssh/openssh.hash @@ -1,4 +1,4 @@ -# From https://www.openssh.com/txt/release-8.8 (base64 encoded) -sha256 4590890ea9bb9ace4f71ae331785a3a5823232435161960ed5fc86588f331fe9 openssh-8.8p1.tar.gz +# From https://www.openssh.com/txt/release-8.9 (base64 encoded) +sha256 fd497654b7ab1686dac672fb83dfb4ba4096e8b5ffcdaccd262380ae58bec5e7 openssh-8.9p1.tar.gz # Locally calculated -sha256 432abf7480fb31473a6706627212913fc70032e3fb71b90fecb28ae26a2d741d LICENCE +sha256 d6807e99f3d159145c659060f57c3fa74e109faa39326dbfc38674cb550fd104 LICENCE diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index 4145bfd8dc..0e0d59e6ab 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -4,13 +4,13 @@ # ################################################################################ -OPENSSH_VERSION_MAJOR = 8.8 +OPENSSH_VERSION_MAJOR = 8.9 OPENSSH_VERSION_MINOR = p1 OPENSSH_VERSION = $(OPENSSH_VERSION_MAJOR)$(OPENSSH_VERSION_MINOR) OPENSSH_CPE_ID_VERSION = $(OPENSSH_VERSION_MAJOR) OPENSSH_CPE_ID_UPDATE = $(OPENSSH_VERSION_MINOR) OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable -OPENSSH_LICENSE = BSD-4-Clause, BSD-3-Clause, BSD-2-Clause, Public Domain +OPENSSH_LICENSE = BSD-3-Clause, BSD-2-Clause, Public Domain OPENSSH_LICENSE_FILES = LICENCE OPENSSH_CONF_ENV = \ LD="$(TARGET_CC)" \ -- 2.34.1 From thomas.petazzoni at bootlin.com Sat Feb 26 07:10:09 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 26 Feb 2022 07:10:09 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-02-25 Message-ID: <20220226071014.9D09E400D7@smtp2.osuosl.org> Hello, Autobuild statistics for 2022-02-25 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 38 | 9 | 0 | 47 | 2021.11.x | 8 | 1 | 0 | 9 | master | 46 | 20 | 0 | 66 | Classification of failures by reason for master ----------------------------------------------- host-libselinux-3.3 | 8 bluez5_utils-5.63 | 2 frr-8.1 | 2 bpftool-v6.7.0 | 1 host-go-1.17.7 | 1 mongodb-4.2.18 | 1 python-greenlet-1.1.2 | 1 rpi-userland-14b90ff9d9f031... | 1 safeclib-3.7.1 | 1 unknown | 1 zabbix-5.4.9 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- riscv64 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/15ba9902c04c4c84dbaee60dcc4414a696c7ece5 | riscv64 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/f8b503b6883c720d09090cb2008e16db0084b5e9 | mips64el | bpftool-v6.7.0 | NOK | http://autobuild.buildroot.net/results/a7922ec37a9e05786ede3017510b44113654f927 | powerpc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/b4bb0da9b401a705830b77826c6850725cb62d02 | microblazeel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/479ba2dcc6dfc314b4622ffbb4063289e22f42b1 | mips64el | host-go-1.17.7 | NOK | http://autobuild.buildroot.net/results/49f804b3b35ba8df0ed5c23653c5e9e086fbde74 | riscv32 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/fe12e7e97d8815da1c9129b95f017037a92788da | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/9833b73141508eef27db00409248115cadde9ce6 | riscv64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/6923ad7079e021c92abbcc7ca5e22dc4b01d303d | arc | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/e5ce889b16b9471f7c7572fd87c55fc75e955745 | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/0c941e5b1adecba3e5e7cef21d9dffe7d9179793 | powerpc | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/0b030f3c672b42ad4a7cdaaf4dd9c5cc106a0c94 | arc | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/0619e77bc8e9e19e0263243ec0e3468795987f88 | sparc | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/6060631050e50bf5d28605c1709d167d3b52c7d7 | x86_64 | mongodb-4.2.18 | NOK | http://autobuild.buildroot.net/results/1030178eb64f57b89d891b6e6327e2b718a91083 | arm | python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/554aae1ba9019d81226c29d3d6f46ecfc4772fdb | arm | rpi-userland-14b90ff9d9f031... | NOK | http://autobuild.buildroot.net/results/93d3b8cc2ac5dfa9d4b44946c0b4d8171e8f52a1 | aarch64 | safeclib-3.7.1 | NOK | http://autobuild.buildroot.net/results/30d0085edf0bfa1c1047ba0f4b4edc6804c00ff4 | aarch64 | unknown | NOK | http://autobuild.buildroot.net/results/9d2a8c58eaad3250ab6ea1f277fe92518800f9fc | powerpc64le | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/0f541e45d1fa27b3302968683bf64949131ec1c9 | Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 2 gstreamer1-mm-1.10.0 | 1 mesa3d-20.3.5 | 1 monkey-f54856ce250c4e257354... | 1 netatalk-3.1.12 | 1 rocksdb-6.13.3 | 1 sphinxbase-5prealpha | 1 unknown | 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/1f19aa2777151b6cb8c8022bc51d1d5ad682f5c7 | ORPH m68k | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/3ab387ede80634241997603574a399b1074d9089 | arm | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/e20145ef18ea9240916098f8329ece97e79d8f74 | mips | mesa3d-20.3.5 | NOK | http://autobuild.buildroot.net/results/819a47bea8c86105dba6e1cc78a7730eb3939a87 | x86_64 | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/aa83829885e5fb0b53d2d5c31c97f1a09ee00baf | riscv32 | netatalk-3.1.12 | NOK | http://autobuild.buildroot.net/results/e26284c60787d7693de5dd85e940769ca604d823 | ORPH m68k | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/23872a71a7c6b8e5ef325ba08ac86d9745458964 | nds32le | sphinxbase-5prealpha | NOK | http://autobuild.buildroot.net/results/697d71740041abefe40064646c65f452f1ffd22f | arm | unknown | NOK | http://autobuild.buildroot.net/results/9b691643113bd4c557c276509eb9d4f7895c111c | Classification of failures by reason for 2021.11.x -------------------------------------------------- unknown | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arc | unknown | NOK | http://autobuild.buildroot.net/results/8038a02d37fd769b47159e3341781b0195888a10 | Gitlab CI results for 2022-02-25 ================================ Detail of defconfig failures for master --------------------------------------- defconfig | link to the job | orph? ----------------------------------+---------------------------------------------------------------+------ amarula_a64_relic | https://gitlab.com/buildroot.org/buildroot/-/jobs/2131158364 | bananapi_m1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2131158422 | bananapi_m1_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/2131158424 | bananapi_m2_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/2131158425 | bananapro | https://gitlab.com/buildroot.org/buildroot/-/jobs/2131158430 | csky_gx6605s | https://gitlab.com/buildroot.org/buildroot/-/jobs/2131158442 | freescale_imx8mqevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/2131158478 | friendlyarm_nanopi_m1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2131158488 | ORPH friendlyarm_nanopi_m1_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/2131158489 | ORPH friendlyarm_nanopi_neo | https://gitlab.com/buildroot.org/buildroot/-/jobs/2131158493 | friendlyarm_nanopi_neo_plus2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2131158494 | friendlyarm_nanopi_r1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2131158495 | galileo | https://gitlab.com/buildroot.org/buildroot/-/jobs/2131158497 | imx8mmpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/2131158513 | imx8mpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/2131158514 | licheepi_zero | https://gitlab.com/buildroot.org/buildroot/-/jobs/2131158522 | microchip_sam9x60ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2131158528 | orangepi_one_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/2131158573 | orangepi_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/2131158577 | ORPH orangepi_rk3399 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2131158581 | orangepi_win | https://gitlab.com/buildroot.org/buildroot/-/jobs/2131158584 | raspberrypi3_qt5we | https://gitlab.com/buildroot.org/buildroot/-/jobs/2131158669 | -- http://autobuild.buildroot.net From giulio.benetti at benettiengineering.com Sat Feb 26 10:19:59 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 26 Feb 2022 11:19:59 +0100 Subject: [Buildroot] [PATCH] board/intel/galileo: fix build failure with host gcc 10 In-Reply-To: <42058D10-AAA9-41FE-91E3-1D5153134FCA@benettiengineering.com> References: <42058D10-AAA9-41FE-91E3-1D5153134FCA@benettiengineering.com> Message-ID: <3D49BD64-4189-4E96-BE05-B39A4D75C04B@benettiengineering.com> Hi All, Nicholas will take care about bumping uboot and Linux in a couple of weeks. He?s written me privately. Best regards Giulio > Il giorno 13 feb 2022, alle ore 13:56, Giulio Benetti ha scritto: > > ?Hi Nicolas, > > sorry for html but I?m mobile. > > My patch for fixing the build failure for Galileo has been upstream, but Linux version is very old, > I?ve added a local patch from 2014 as pointed Arnout below. > I don?t have a Galileo board and you are the maintainer, can you please update uboot and Linux versions and send a patch for that after testing please? > > Thank you! > ?- > Giulio Benetti > Benetti Engineering sas > >> Il giorno 13 feb 2022, alle ore 12:46, Arnout Vandecappelle ha scritto: >> >> ? >> >>>> On 02/02/2022 22:43, Giulio Benetti wrote: >>> Building galileo_defconfig throws error: >>> ``` >>> /usr/bin/ld: arch/x86/tools/relocs_64.o:(.bss+0x0): multiple definition of `per_cpu_load_addr'; arch/x86/tools/relocs_32.o:(.bss+0x0): first defined here >>> ``` >>> To fix this let's add an upstreamed patch[1] and add BR2_GLOBAL_PATCH_DIR >>> to galileo_defconfig to point to where patch is. >>> [1]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=eeeda4cd06e828b331b15741a204ff9f5874d28d.patch >>> Fixes: >>> https://gitlab.com/ymorin/buildroot/-/jobs/2035821039 >>> Signed-off-by: Giulio Benetti >> >> You can't imagine how much joy it gives me to see a patch from 2014 applied here... >> >> >> Applied to master, thanks. >> >> Regards, >> Arnout >> >>> --- >>> ...relocs-Make-per_cpu_load_addr-static.patch | 39 +++++++++++++++++++ >>> configs/galileo_defconfig | 1 + >>> 2 files changed, 40 insertions(+) >>> create mode 100644 board/intel/galileo/patches/linux/0001-x86-relocs-Make-per_cpu_load_addr-static.patch >>> diff --git a/board/intel/galileo/patches/linux/0001-x86-relocs-Make-per_cpu_load_addr-static.patch b/board/intel/galileo/patches/linux/0001-x86-relocs-Make-per_cpu_load_addr-static.patch >>> new file mode 100644 >>> index 0000000000..1d206cc6d1 >>> --- /dev/null >>> +++ b/board/intel/galileo/patches/linux/0001-x86-relocs-Make-per_cpu_load_addr-static.patch >>> @@ -0,0 +1,39 @@ >>> +From eeeda4cd06e828b331b15741a204ff9f5874d28d Mon Sep 17 00:00:00 2001 >>> +From: Ben Hutchings >>> +Date: Wed, 24 Sep 2014 13:30:12 +0100 >>> +Subject: [PATCH] x86/relocs: Make per_cpu_load_addr static >>> + >>> +per_cpu_load_addr is only used for 64-bit relocations, but is >>> +declared in both configurations of relocs.c - with different >>> +types. This has undefined behaviour in general. GNU ld is >>> +documented to use the larger size in this case, but other tools >>> +may differ and some warn about this. >>> + >>> +References: https://bugs.debian.org/748577 >>> +Reported-by: Michael Tautschnig >>> +Signed-off-by: Ben Hutchings >>> +Cc: 748577 at bugs.debian.org >>> +Cc: Linus Torvalds >>> +Link: http://lkml.kernel.org/r/1411561812.3659.23.camel at decadent.org.uk >>> +Signed-off-by: Ingo Molnar >>> +Signed-off-by: Giulio Benetti >>> +--- >>> + arch/x86/tools/relocs.c | 2 +- >>> + 1 file changed, 1 insertion(+), 1 deletion(-) >>> + >>> +diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c >>> +index bbb1d2259ecf..a5efb21d5228 100644 >>> +--- a/arch/x86/tools/relocs.c >>> ++++ b/arch/x86/tools/relocs.c >>> +@@ -695,7 +695,7 @@ static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel, >>> + * >>> + */ >>> + static int per_cpu_shndx = -1; >>> +-Elf_Addr per_cpu_load_addr; >>> ++static Elf_Addr per_cpu_load_addr; >>> + >>> + static void percpu_init(void) >>> + { >>> +-- >>> +2.25.1 >>> + >>> diff --git a/configs/galileo_defconfig b/configs/galileo_defconfig >>> index 03ca23f414..a8fd0a6dcc 100644 >>> --- a/configs/galileo_defconfig >>> +++ b/configs/galileo_defconfig >>> @@ -1,4 +1,5 @@ >>> BR2_x86_x1000=y >>> +BR2_GLOBAL_PATCH_DIR=board/intel/galileo/patches >>> # Needed for TARGET_GRUB2 >>> BR2_TOOLCHAIN_BUILDROOT_WCHAR=y >>> # Linux headers same as kernel, a 3.14 series >> _______________________________________________ >> 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 thomas.petazzoni at bootlin.com Sat Feb 26 10:32:18 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 26 Feb 2022 11:32:18 +0100 Subject: [Buildroot] [PATCH 2/4] package/odb: add dependency on host-libodb In-Reply-To: <20220225113400.802049-3-kamel.bouhara@bootlin.com> References: <20220225113400.802049-1-kamel.bouhara@bootlin.com> <20220225113400.802049-3-kamel.bouhara@bootlin.com> Message-ID: <20220226113218.23e288ed@windsurf> Hello Kamel, On Fri, 25 Feb 2022 12:33:58 +0100 Kamel Bouhara via buildroot wrote: > +# host-libodb is not needed to build host-odb, but it is needed to use > +# the ODB compiler, as it install header files that are needed at > +# runtime by the odb compiler. > +HOST_ODB_DEPENDENCIES = host-libcutl host-libodb You're in PATCH 2/4, and you're using host-libodb, which is only added in PATCH 3/4. There is a patch ordering issue in your series. > +ifeq ($(BR2_PACKAGE_BOOST),y) > +HOST_ODB_DEPENDENCIES += host-boost host-libodb-boost You're in PATCH 2/4, and you're using host-libodb-boost, which is only added in PATCH 4/4, so there's another ordering issue in your series. Also, the host-boost dependency here seems useless to me, as it's implied by the host-libodb-boost dependency. Also, why do you use ifeq ($(BR2_PACKAGE_BOOST),y) ? I think it would be much more logical to use ifeq ($(BR2_PACKAGE_LIBODB_BOOST),y), no ? 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 Feb 26 10:32:59 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 26 Feb 2022 11:32:59 +0100 Subject: [Buildroot] [PATCH 3/4] package/libodb: add host variant In-Reply-To: <20220225113400.802049-4-kamel.bouhara@bootlin.com> References: <20220225113400.802049-1-kamel.bouhara@bootlin.com> <20220225113400.802049-4-kamel.bouhara@bootlin.com> Message-ID: <20220226113259.6e11ec54@windsurf> On Fri, 25 Feb 2022 12:33:59 +0100 Kamel Bouhara via buildroot wrote: > From: Thomas Petazzoni > > Signed-off-by: Thomas Petazzoni I know this commit is originally from me in a local tree, but it needs a commit description. And your Signed-off-by. 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 Feb 26 10:33:44 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 26 Feb 2022 11:33:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/libtorrent: fix build with libexecinfo Message-ID: <20220226103344.1850433-1-fontaine.fabrice@gmail.com> Fix the folllowing build failure on rtorrent raised on uclibc and musl since the addition of libexecinfo package in commit eea8ba446c10701a273432552108d80fb2224ef4: /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/libtorrent.so: undefined reference to `backtrace_symbols' Fixes: - http://autobuild.buildroot.org/results/6cb4ba56fc0a3a8bd02b246ab9bc82edaa552ad9 Signed-off-by: Fabrice Fontaine --- package/libtorrent/libtorrent.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/libtorrent/libtorrent.mk b/package/libtorrent/libtorrent.mk index c8310cab65..b966a72788 100644 --- a/package/libtorrent/libtorrent.mk +++ b/package/libtorrent/libtorrent.mk @@ -14,6 +14,11 @@ LIBTORRENT_INSTALL_STAGING = YES LIBTORRENT_LICENSE = GPL-2.0 LIBTORRENT_LICENSE_FILES = COPYING +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +LIBTORRENT_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -lexecinfo" +LIBTORRENT_DEPENDENCIES += libexecinfo +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) LIBTORRENT_CONF_OPTS += --enable-openssl LIBTORRENT_DEPENDENCIES += openssl -- 2.34.1 From thomas.petazzoni at bootlin.com Sat Feb 26 10:35:38 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 26 Feb 2022 11:35:38 +0100 Subject: [Buildroot] [PATCH 4/4] package/libodb-boost: add host variant In-Reply-To: <20220225113400.802049-5-kamel.bouhara@bootlin.com> References: <20220225113400.802049-1-kamel.bouhara@bootlin.com> <20220225113400.802049-5-kamel.bouhara@bootlin.com> Message-ID: <20220226113538.6def80d0@windsurf> On Fri, 25 Feb 2022 12:34:00 +0100 Kamel Bouhara via buildroot wrote: > Add host variant of libodb-boost required by host-odb package. This is a bit short, and I think just like PATCH 3/4, it needs a more extensive explanation that the ODB compiler needs the libodb-boost headers at compile time, and therefore installed in $(HOST_DIR). > diff --git a/package/libodb-boost/libodb-boost.mk b/package/libodb-boost/libodb-boost.mk > index bac5f1e78f..7f2ad1fe72 100644 > --- a/package/libodb-boost/libodb-boost.mk > +++ b/package/libodb-boost/libodb-boost.mk > @@ -11,7 +11,10 @@ LIBODB_BOOST_SITE = https://www.codesynthesis.com/download/odb/$(LIBODB_BOOST_VE > LIBODB_BOOST_INSTALL_STAGING = YES > LIBODB_BOOST_LICENSE = GPL-2.0 > LIBODB_BOOST_LICENSE_FILES = LICENSE > -LIBODB_BOOST_DEPENDENCIES = boost libodb > +LIBODB_BOOST_DEPENDENCIES = boost libodb \ > + host-boost \ > + host-libodb This seems wrong. Why is libodb-boost depending on host-libodb-boost. At least, this makes the dependencies added in your PATCH 2/4 a bit irrelevant. I guess what you need to do instead is: HOST_LIBODB_BOOST_DEPENDENCIES = hoost-boost host-libodb And rely on the logic in odb.mk to pull in host-libodb-boost when BR2_PACKAGE_LIBODB_BOOST=y. Could you fix your patch series, and send a new iteration? Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From tianyuanhao3 at 163.com Sat Feb 26 10:24:18 2022 From: tianyuanhao3 at 163.com (TIAN Yuanhao) Date: Sat, 26 Feb 2022 02:24:18 -0800 Subject: [Buildroot] [PATCH/next 1/1] package/balena-engine: bump to version 20.10.12 Message-ID: <20220226102418.943851-1-tianyuanhao3@163.com> Also: - drop unused dependencies - drop invalid tags - drop the autogen step - simplify kconfigs just to run hello-world https://github.com/balena-os/balena-engine/blob/v20.10.12/CHANGELOG.md Signed-off-by: TIAN Yuanhao --- package/balena-engine/Config.in | 1 - package/balena-engine/balena-engine.hash | 2 +- package/balena-engine/balena-engine.mk | 42 +++++------------------- 3 files changed, 9 insertions(+), 36 deletions(-) diff --git a/package/balena-engine/Config.in b/package/balena-engine/Config.in index f48f361dc2..02f694515e 100644 --- a/package/balena-engine/Config.in +++ b/package/balena-engine/Config.in @@ -6,7 +6,6 @@ config BR2_PACKAGE_BALENA_ENGINE depends on BR2_USE_MMU # util-linux select BR2_PACKAGE_CGROUPFS_MOUNT if !BR2_PACKAGE_SYSTEMD # runtime select BR2_PACKAGE_IPTABLES # runtime - select BR2_PACKAGE_SQLITE # runtime select BR2_PACKAGE_UTIL_LINUX # runtime select BR2_PACKAGE_UTIL_LINUX_BINARIES # runtime select BR2_PACKAGE_UTIL_LINUX_MOUNT # runtime diff --git a/package/balena-engine/balena-engine.hash b/package/balena-engine/balena-engine.hash index 3f632ef381..ef590881f5 100644 --- a/package/balena-engine/balena-engine.hash +++ b/package/balena-engine/balena-engine.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 389282706562118608b6ac580e7beacd6a43f0bb3481c69fb1856bed9ac49b85 balena-engine-19.03.14.tar.gz +sha256 43f4c985b855a4f731a5cdac214f1adf6c4cc2021cbad3f93856009df246d61c balena-engine-20.10.12.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/balena-engine/balena-engine.mk b/package/balena-engine/balena-engine.mk index b3eb2ca75b..0afcea3d7e 100644 --- a/package/balena-engine/balena-engine.mk +++ b/package/balena-engine/balena-engine.mk @@ -4,34 +4,33 @@ # ################################################################################ -BALENA_ENGINE_VERSION = 19.03.14 +BALENA_ENGINE_VERSION = 20.10.12 BALENA_ENGINE_SITE = $(call github,balena-os,balena-engine,v$(BALENA_ENGINE_VERSION)) BALENA_ENGINE_LICENSE = Apache-2.0 BALENA_ENGINE_LICENSE_FILES = LICENSE -BALENA_ENGINE_DEPENDENCIES = host-pkgconf BALENA_ENGINE_GOMOD = github.com/docker/docker BALENA_ENGINE_LDFLAGS = \ - -X github.com/docker/cli/cli/version.Version=N/A \ - -X github.com/docker/cli/cli/version.GitCommit= \ - -X github.com/docker/cli/cli/version.BuildTime= \ + -X $(BALENA_ENGINE_GOMOD)/dockerversion.GitCommit= \ + -X $(BALENA_ENGINE_GOMOD)/dockerversion.Version=$(BALENA_ENGINE_VERSION) \ -X github.com/containerd/containerd/version.Version=N/A \ + -X github.com/docker/cli/cli/version.BuildTime= \ + -X github.com/docker/cli/cli/version.GitCommit= \ + -X github.com/docker/cli/cli/version.Version=N/A \ -X github.com/opencontainers/runc.version=N/A BALENA_ENGINE_TAGS = \ cgo \ - exclude_graphdriver_zfs \ - autogen \ - no_buildkit \ no_btrfs \ no_cri \ no_devmapper \ no_zfs \ exclude_disk_quota \ exclude_graphdriver_btrfs \ - exclude_graphdriver_devicemapper + exclude_graphdriver_devicemapper \ + exclude_graphdriver_zfs BALENA_ENGINE_BUILD_TARGETS = cmd/balena-engine @@ -40,16 +39,6 @@ BALENA_ENGINE_DEPENDENCIES += systemd BALENA_ENGINE_TAGS += journald endif -define BALENA_ENGINE_RUN_AUTOGEN - cd $(@D) && \ - VERSION=$(BALENA_ENGINE_VERSION) \ - PKG_CONFIG=$(PKG_CONFIG_HOST_BINARY) \ - $(TARGET_MAKE_ENV) \ - $(SHELL) hack/make/.go-autogen -endef - -BALENA_ENGINE_POST_CONFIGURE_HOOKS += BALENA_ENGINE_RUN_AUTOGEN - define BALENA_ENGINE_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 $(@D)/contrib/init/systemd/balena-engine.service \ $(TARGET_DIR)/usr/lib/systemd/system/balena-engine.service @@ -64,35 +53,20 @@ endef define BALENA_ENGINE_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_POSIX_MQUEUE) $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUPS) - $(call KCONFIG_ENABLE_OPT,CONFIG_MEMCG) - $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_SCHED) - $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_FREEZER) - $(call KCONFIG_ENABLE_OPT,CONFIG_CPUSETS) - $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_DEVICE) - $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_CPUACCT) $(call KCONFIG_ENABLE_OPT,CONFIG_NAMESPACES) $(call KCONFIG_ENABLE_OPT,CONFIG_UTS_NS) $(call KCONFIG_ENABLE_OPT,CONFIG_IPC_NS) $(call KCONFIG_ENABLE_OPT,CONFIG_PID_NS) $(call KCONFIG_ENABLE_OPT,CONFIG_NET_NS) $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER) - $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_ADVANCED) - $(call KCONFIG_ENABLE_OPT,CONFIG_BRIDGE_NETFILTER) $(call KCONFIG_ENABLE_OPT,CONFIG_NF_CONNTRACK) $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_ADDRTYPE) $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_CONNTRACK) - $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_IPVS) $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_IPTABLES) $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_FILTER) $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_NAT) - $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_TARGET_MASQUERADE) $(call KCONFIG_ENABLE_OPT,CONFIG_BRIDGE) - $(call KCONFIG_ENABLE_OPT,CONFIG_DUMMY) - $(call KCONFIG_ENABLE_OPT,CONFIG_MACVLAN) - $(call KCONFIG_ENABLE_OPT,CONFIG_VXLAN) $(call KCONFIG_ENABLE_OPT,CONFIG_VETH) - $(call KCONFIG_ENABLE_OPT,CONFIG_OVERLAY_FS) - $(call KCONFIG_ENABLE_OPT,CONFIG_KEYS) endef define BALENA_ENGINE_INSTALL_SYMLINK -- 2.25.1 From giulio.benetti at benettiengineering.com Sat Feb 26 10:52:26 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 26 Feb 2022 11:52:26 +0100 Subject: [Buildroot] [PATCH v2 1/6] board/orangepi/orangepi-zero-plus2: switch to extlinux In-Reply-To: <20220225072622.3584480-2-geomatsi@gmail.com> References: <20220225072622.3584480-1-geomatsi@gmail.com> <20220225072622.3584480-2-geomatsi@gmail.com> Message-ID: Hi Sergey, On 25/02/22 08:26, Sergey Matyukevich wrote: > Switch to extlinux instead of U-Boot boot script. Drop custom boot > script and genimage config. Instead use common orangepi files from > board/orangepi/common. To help extlinux to find DTB without U-Boot > environment changes, do not strip arm64 board specific directory > from DTB name when installing it in /boot directory. For this > purpose use BR2_KERNEL_DTB_KEEP_DIRNAME config option. Finally, > tidy up configuration file adding section names. > > Signed-off-by: Sergey Matyukevich Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti [Giulio: build tested only] Best regards -- Giulio Benetti Benetti Engineering sas > --- > board/orangepi/orangepi-zero-plus2/boot.cmd | 6 --- > .../orangepi/orangepi-zero-plus2/genimage.cfg | 41 ------------------- > configs/orangepi_zero_plus2_defconfig | 14 ++++--- > 3 files changed, 8 insertions(+), 53 deletions(-) > delete mode 100644 board/orangepi/orangepi-zero-plus2/boot.cmd > delete mode 100644 board/orangepi/orangepi-zero-plus2/genimage.cfg > > diff --git a/board/orangepi/orangepi-zero-plus2/boot.cmd b/board/orangepi/orangepi-zero-plus2/boot.cmd > deleted file mode 100644 > index aa5162004b..0000000000 > --- a/board/orangepi/orangepi-zero-plus2/boot.cmd > +++ /dev/null > @@ -1,6 +0,0 @@ > -setenv bootargs console=ttyS0,115200 earlyprintk root=PARTLABEL=rootfs rootwait > - > -fatload mmc 0 $kernel_addr_r Image > -fatload mmc 0 $fdt_addr_r sun50i-h5-orangepi-zero-plus2.dtb > - > -booti $kernel_addr_r - $fdt_addr_r > diff --git a/board/orangepi/orangepi-zero-plus2/genimage.cfg b/board/orangepi/orangepi-zero-plus2/genimage.cfg > deleted file mode 100644 > index 5a7ee7707a..0000000000 > --- a/board/orangepi/orangepi-zero-plus2/genimage.cfg > +++ /dev/null > @@ -1,41 +0,0 @@ > -image boot.vfat { > - vfat { > - files = { > - "Image", > - "sun50i-h5-orangepi-zero-plus2.dtb", > - "boot.scr" > - } > - } > - > - size = 64M > -} > - > -image sdcard.img { > - hdimage { > - # for root=PARTLABEL support > - partition-table-type = "gpt" > - # default GPT location conflicts with bootloaders, move it after > - gpt-location = 1M > - } > - > - partition spl { > - in-partition-table = "no" > - image = "u-boot-sunxi-with-spl.bin" > - offset = 8K > - size = 1016K # 1MB - 8KB > - } > - > - partition boot { > - partition-type-uuid = "F" > - bootable = "true" > - image = "boot.vfat" > - } > - > - # 'rootfs' will be used as the partition label, used > - # with root=PARTLABEL=rootfs kernel command line > - partition rootfs { > - partition-type-uuid = "L" > - image = "rootfs.ext4" > - size = 256M > - } > -} > diff --git a/configs/orangepi_zero_plus2_defconfig b/configs/orangepi_zero_plus2_defconfig > index 9d88b37ac9..ef171c3ad3 100644 > --- a/configs/orangepi_zero_plus2_defconfig > +++ b/configs/orangepi_zero_plus2_defconfig > @@ -27,9 +27,6 @@ BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > BR2_TARGET_UBOOT_SPL=y > BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" > BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null" > -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-plus2/boot.cmd" > > # Kernel > BR2_LINUX_KERNEL=y > @@ -40,6 +37,8 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-zero-plus2" > BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero-plus2/linux-extras.config" > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y > > # wireless firmware > BR2_PACKAGE_LINUX_FIRMWARE=y > @@ -58,8 +57,11 @@ 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 > + > +# host tools > BR2_PACKAGE_HOST_GENIMAGE=y > -BR2_PACKAGE_HOST_MTOOLS=y > + > +# image scripts > +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-plus2/genimage.cfg" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" From giulio.benetti at benettiengineering.com Sat Feb 26 10:52:48 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 26 Feb 2022 11:52:48 +0100 Subject: [Buildroot] [PATCH v2 2/6] board/orangepi/orangepi-pc-plus: switch to extlinux In-Reply-To: <20220225072622.3584480-3-geomatsi@gmail.com> References: <20220225072622.3584480-1-geomatsi@gmail.com> <20220225072622.3584480-3-geomatsi@gmail.com> Message-ID: Hi Sergey, On 25/02/22 08:26, Sergey Matyukevich wrote: > Switch to extlinux instead of U-Boot boot script. Drop custom > boot script and genimage config. Instead use common orangepi > files from board/orangepi/common. > > Signed-off-by: Sergey Matyukevich Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti [Giulio: build tested only] Best regards -- Giulio Benetti Benetti Engineering sas > --- > board/orangepi/orangepi-pc-plus/boot.cmd | 8 ---- > board/orangepi/orangepi-pc-plus/genimage.cfg | 43 -------------------- > configs/orangepi_pc_plus_defconfig | 9 ++-- > 3 files changed, 3 insertions(+), 57 deletions(-) > delete mode 100644 board/orangepi/orangepi-pc-plus/boot.cmd > delete mode 100644 board/orangepi/orangepi-pc-plus/genimage.cfg > > diff --git a/board/orangepi/orangepi-pc-plus/boot.cmd b/board/orangepi/orangepi-pc-plus/boot.cmd > deleted file mode 100644 > index c91f77942f..0000000000 > --- a/board/orangepi/orangepi-pc-plus/boot.cmd > +++ /dev/null > @@ -1,8 +0,0 @@ > -setenv fdt_high ffffffff > - > -setenv bootargs console=ttyS0,115200 earlyprintk root=PARTLABEL=rootfs rootwait > - > -fatload mmc 0 $kernel_addr_r zImage > -fatload mmc 0 $fdt_addr_r sun8i-h3-orangepi-pc-plus.dtb > - > -bootz $kernel_addr_r - $fdt_addr_r > diff --git a/board/orangepi/orangepi-pc-plus/genimage.cfg b/board/orangepi/orangepi-pc-plus/genimage.cfg > deleted file mode 100644 > index 3812d785d5..0000000000 > --- a/board/orangepi/orangepi-pc-plus/genimage.cfg > +++ /dev/null > @@ -1,43 +0,0 @@ > -# Minimal SD card image for the OrangePi PC Plus > -# > -image boot.vfat { > - vfat { > - files = { > - "zImage", > - "sun8i-h3-orangepi-pc-plus.dtb", > - "boot.scr" > - } > - } > - > - size = 10M > -} > - > -image sdcard.img { > - hdimage { > - # for root=PARTLABEL support > - partition-table-type = "gpt" > - # default GPT location conflicts with bootloaders, move it after > - gpt-location = 1M > - } > - > - partition u-boot { > - in-partition-table = "no" > - image = "u-boot-sunxi-with-spl.bin" > - offset = 8K > - size = 1016K # 1MB - 8KB > - } > - > - partition boot { > - partition-type-uuid = "F" > - bootable = "true" > - image = "boot.vfat" > - } > - > - # 'rootfs' will be used as the partition label, used > - # with root=PARTLABEL=rootfs kernel command line > - partition rootfs { > - partition-type-uuid = "L" > - image = "rootfs.ext4" > - size = 512M > - } > -} > diff --git a/configs/orangepi_pc_plus_defconfig b/configs/orangepi_pc_plus_defconfig > index c3ff8bc417..ba946e5285 100644 > --- a/configs/orangepi_pc_plus_defconfig > +++ b/configs/orangepi_pc_plus_defconfig > @@ -14,6 +14,7 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-pc-plus" > BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-pc-plus/linux-extras.config" > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > # BR2_TARGET_ROOTFS_TAR is not set > @@ -27,14 +28,10 @@ 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_BOOT_SCRIPT=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-pc-plus/boot.cmd" > -BR2_PACKAGE_HOST_DOSFSTOOLS=y > BR2_PACKAGE_HOST_GENIMAGE=y > -BR2_PACKAGE_HOST_MTOOLS=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS=y > +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-pc-plus/genimage.cfg" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" > > # wireless driver and firmware > BR2_PACKAGE_RTL8189FS=y From giulio.benetti at benettiengineering.com Sat Feb 26 10:53:01 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 26 Feb 2022 11:53:01 +0100 Subject: [Buildroot] [PATCH v2 3/6] board/orangepi/orangepi-one: switch to extlinux In-Reply-To: <20220225072622.3584480-4-geomatsi@gmail.com> References: <20220225072622.3584480-1-geomatsi@gmail.com> <20220225072622.3584480-4-geomatsi@gmail.com> Message-ID: Hi Sergey, On 25/02/22 08:26, Sergey Matyukevich wrote: > Switch to extlinux instead of U-Boot boot script. Drop custom > boot script and genimage config. Instead use common orangepi > files from board/orangepi/common. > > Signed-off-by: Sergey Matyukevich Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti [Giulio: build tested only] Best regards -- Giulio Benetti Benetti Engineering sas > --- > board/orangepi/orangepi-one/boot.cmd | 8 ----- > board/orangepi/orangepi-one/genimage.cfg | 37 ------------------------ > configs/orangepi_one_defconfig | 9 ++---- > 3 files changed, 3 insertions(+), 51 deletions(-) > delete mode 100644 board/orangepi/orangepi-one/boot.cmd > delete mode 100644 board/orangepi/orangepi-one/genimage.cfg > > diff --git a/board/orangepi/orangepi-one/boot.cmd b/board/orangepi/orangepi-one/boot.cmd > deleted file mode 100644 > index ab616e6ac9..0000000000 > --- a/board/orangepi/orangepi-one/boot.cmd > +++ /dev/null > @@ -1,8 +0,0 @@ > -setenv fdt_high ffffffff > - > -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait > - > -fatload mmc 0 $kernel_addr_r zImage > -fatload mmc 0 $fdt_addr_r sun8i-h3-orangepi-one.dtb > - > -bootz $kernel_addr_r - $fdt_addr_r > diff --git a/board/orangepi/orangepi-one/genimage.cfg b/board/orangepi/orangepi-one/genimage.cfg > deleted file mode 100644 > index 2a14dcdec2..0000000000 > --- a/board/orangepi/orangepi-one/genimage.cfg > +++ /dev/null > @@ -1,37 +0,0 @@ > -# Minimal SD card image for the OrangePi PC > -# > -image boot.vfat { > - vfat { > - files = { > - "zImage", > - "sun8i-h3-orangepi-one.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_one_defconfig b/configs/orangepi_one_defconfig > index 1a2772a307..ba128424a0 100644 > --- a/configs/orangepi_one_defconfig > +++ b/configs/orangepi_one_defconfig > @@ -12,6 +12,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="sunxi" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-one" > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > # BR2_TARGET_ROOTFS_TAR is not set > @@ -25,11 +26,7 @@ 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-one/boot.cmd" > -BR2_PACKAGE_HOST_DOSFSTOOLS=y > BR2_PACKAGE_HOST_GENIMAGE=y > -BR2_PACKAGE_HOST_MTOOLS=y > +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-one/genimage.cfg" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" From giulio.benetti at benettiengineering.com Sat Feb 26 10:53:12 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 26 Feb 2022 11:53:12 +0100 Subject: [Buildroot] [PATCH v2 4/6] board/linksprite/pcduino: switch to extlinux In-Reply-To: <20220225072622.3584480-5-geomatsi@gmail.com> References: <20220225072622.3584480-1-geomatsi@gmail.com> <20220225072622.3584480-5-geomatsi@gmail.com> Message-ID: <740a0d74-bbfd-d8a6-bd60-b92cc5005c6d@benettiengineering.com> Hi Sergey, On 25/02/22 08:26, Sergey Matyukevich wrote: > Switch to extlinux instead of U-Boot boot script. Drop custom > boot script and genimage config. Instead use common orangepi > files from board/orangepi/common. > > Signed-off-by: Sergey Matyukevich Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti [Giulio: build tested only] Best regards -- Giulio Benetti Benetti Engineering sas > --- > board/linksprite/pcduino/boot.cmd | 8 ----- > board/linksprite/pcduino/genimage.cfg | 43 -------------------------- > board/linksprite/pcduino/post-build.sh | 11 ------- > board/linksprite/pcduino/post-image.sh | 16 ---------- > configs/linksprite_pcduino_defconfig | 9 +++--- > 5 files changed, 4 insertions(+), 83 deletions(-) > delete mode 100644 board/linksprite/pcduino/boot.cmd > delete mode 100644 board/linksprite/pcduino/genimage.cfg > delete mode 100755 board/linksprite/pcduino/post-build.sh > delete mode 100755 board/linksprite/pcduino/post-image.sh > > diff --git a/board/linksprite/pcduino/boot.cmd b/board/linksprite/pcduino/boot.cmd > deleted file mode 100644 > index 0db8363599..0000000000 > --- a/board/linksprite/pcduino/boot.cmd > +++ /dev/null > @@ -1,8 +0,0 @@ > -setenv fdt_high ffffffff > - > -setenv bootargs console=ttyS0,115200 console=tty1 earlyprintk root=/dev/mmcblk0p2 rootwait panic=10 ${extra} > - > -fatload mmc 0 $kernel_addr_r zImage > -fatload mmc 0 $fdt_addr_r sun4i-a10-pcduino.dtb > - > -bootz $kernel_addr_r - $fdt_addr_r > diff --git a/board/linksprite/pcduino/genimage.cfg b/board/linksprite/pcduino/genimage.cfg > deleted file mode 100644 > index db33322118..0000000000 > --- a/board/linksprite/pcduino/genimage.cfg > +++ /dev/null > @@ -1,43 +0,0 @@ > -# > -# Minimal SD card image for the pcDuino > -# > - > -image boot.vfat { > - vfat { > - files = { > - "zImage", > - "sun4i-a10-pcduino.dtb", > - "boot.scr" > - } > - } > - > - size = 16M > -} > - > -# > -# Note: u-boot environment is stored between u-boot and boot partitions > -# > - > -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" > - offset = 1M > - } > - > - partition rootfs { > - partition-type = 0x83 > - image = "rootfs.ext4" > - } > -} > diff --git a/board/linksprite/pcduino/post-build.sh b/board/linksprite/pcduino/post-build.sh > deleted file mode 100755 > index e1e1877671..0000000000 > --- a/board/linksprite/pcduino/post-build.sh > +++ /dev/null > @@ -1,11 +0,0 @@ > -#!/bin/sh > -# post-build.sh for pcDuino taken from OrangePi post-build.sh > -# 2013, Carlo Caione > - > -BOARD_DIR="$(dirname $0)" > -MKIMAGE=$HOST_DIR/bin/mkimage > -BOOT_CMD=$BOARD_DIR/boot.cmd > -BOOT_CMD_H=$BINARIES_DIR/boot.scr > - > -# U-Boot script > -$MKIMAGE -C none -A arm -T script -d $BOOT_CMD $BOOT_CMD_H > diff --git a/board/linksprite/pcduino/post-image.sh b/board/linksprite/pcduino/post-image.sh > deleted file mode 100755 > index c82b189f9c..0000000000 > --- a/board/linksprite/pcduino/post-image.sh > +++ /dev/null > @@ -1,16 +0,0 @@ > -#!/bin/sh > - > -BOARD_DIR="$(dirname $0)" > -GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" > -GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" > - > -rm -rf "${GENIMAGE_TMP}" > - > -genimage \ > - --rootpath "${TARGET_DIR}" \ > - --tmppath "${GENIMAGE_TMP}" \ > - --inputpath "${BINARIES_DIR}" \ > - --outputpath "${BINARIES_DIR}" \ > - --config "${GENIMAGE_CFG}" > - > -exit $? > diff --git a/configs/linksprite_pcduino_defconfig b/configs/linksprite_pcduino_defconfig > index b58f970493..05b25aede4 100644 > --- a/configs/linksprite_pcduino_defconfig > +++ b/configs/linksprite_pcduino_defconfig > @@ -11,8 +11,9 @@ BR2_TARGET_GENERIC_GETTY=y > BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" > > # SD image scripts > -BR2_ROOTFS_POST_BUILD_SCRIPT="board/linksprite/pcduino/post-build.sh" > -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/linksprite/pcduino/post-image.sh" > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" > > # For kernel modules autoloading > BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y > @@ -29,6 +30,7 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun4i-a10-pcduino" > BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/linksprite/pcduino/linux-extras.config" > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > > # Filesystem > BR2_TARGET_ROOTFS_EXT2=y > @@ -49,10 +51,7 @@ BR2_TARGET_UBOOT_SPL=y > BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" > > # Host packages > -BR2_PACKAGE_HOST_DOSFSTOOLS=y > BR2_PACKAGE_HOST_GENIMAGE=y > -BR2_PACKAGE_HOST_MTOOLS=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS=y > > # Target packages: wireless support for pcduino-lite-wifi > BR2_PACKAGE_IW=y From giulio.benetti at benettiengineering.com Sat Feb 26 10:53:28 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 26 Feb 2022 11:53:28 +0100 Subject: [Buildroot] [PATCH v2 5/6] configs/linksprite_pcduino_defconfig: update Linux/U-Boot versions In-Reply-To: <20220225072622.3584480-6-geomatsi@gmail.com> References: <20220225072622.3584480-1-geomatsi@gmail.com> <20220225072622.3584480-6-geomatsi@gmail.com> Message-ID: <9e70bc4b-875c-a01a-1931-a5de940b18df@benettiengineering.com> Hi Sergey, On 25/02/22 08:26, Sergey Matyukevich wrote: > 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. > Drop redundant U-Boot options. > > Signed-off-by: Sergey Matyukevich Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti [Giulio: build tested only] Best regards -- Giulio Benetti Benetti Engineering sas > --- > configs/linksprite_pcduino_defconfig | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/configs/linksprite_pcduino_defconfig b/configs/linksprite_pcduino_defconfig > index 05b25aede4..806c4f0697 100644 > --- a/configs/linksprite_pcduino_defconfig > +++ b/configs/linksprite_pcduino_defconfig > @@ -19,12 +19,12 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" > BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y > > # Linux headers same as kernel, a 5.10 series > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.10" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16.1" > BR2_LINUX_KERNEL_DEFCONFIG="sunxi" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun4i-a10-pcduino" > @@ -40,13 +40,12 @@ 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="2020.10" > -BR2_TARGET_UBOOT_USE_DEFCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Linksprite_pcDuino" > 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_FORMAT_BIN=y > BR2_TARGET_UBOOT_SPL=y > BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" > From gilles.talis at gmail.com Sat Feb 26 14:04:52 2022 From: gilles.talis at gmail.com (Gilles Talis) Date: Sat, 26 Feb 2022 15:04:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/mariadb: fix mysql.service failing to create log directory In-Reply-To: <20220222213202.642708-1-ju.o@free.fr> References: <20220222213202.642708-1-ju.o@free.fr> Message-ID: Hi Julien, all, Le mar. 22 f?vr. 2022 ? 22:32, Julien Olivain a ?crit : > > When enabling MariaDB (BR2_PACKAGE_MARIADB=y) and systemd > (BR2_INIT_SYSTEMD=y) in buildroot, the mysqld.service fail to start > with a permission error. See output of command: > > journalctl --unit=mysqld > > Which shows: > > systemd[1]: Starting MySQL database server... > install[102]: install: can't create directory '/var/log/mysql': Permission denied > systemd[1]: mysqld.service: Control process exited, code=exited, status=1/FAILURE > > Since the service file includes the "User=mysql" directive, the > "ExecStartPre=" is executed as this user, which does not have > permission to create a directory in "/var/log". > > This commit fixes this issue by adding the "!" prefix, which will > execute the command with full privileges. See the systemd.service manual > page entry for "ExecStart=", table "Special executable prefixes": > https://www.freedesktop.org/software/systemd/man/systemd.service.html#ExecStart= > or https://github.com/systemd/systemd/blob/v250/man/systemd.service.xml#L339 > > Moreover, the "mysql_install_db" invocation does not need this special > prefix, as the "/var/lib/mysql" directory on target is already owned > by the "mysql" user. The "chown" command is also useless and is > removed in this commit. > > Reported-by: Gilles Talis > Signed-off-by: Julien Olivain > --- > package/mariadb/mysqld.service | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/mariadb/mysqld.service b/package/mariadb/mysqld.service > index d9ea74ebc3..537430e9a2 100644 > --- a/package/mariadb/mysqld.service > +++ b/package/mariadb/mysqld.service > @@ -2,8 +2,8 @@ > Description=MySQL database server > > [Service] > -ExecStartPre=/bin/sh -c 'test "`ls -1 /var/lib/mysql | wc -l`" != "0" || mysql_install_db --basedir=/usr --datadir=/var/lib/mysql && chown -R mysql:mysql /var/lib/mysql' > -ExecStartPre=install -d -o mysql -g root -m 0755 /var/log/mysql > +ExecStartPre=/bin/sh -c 'test "`ls -1 /var/lib/mysql | wc -l`" != "0" || mysql_install_db --basedir=/usr --datadir=/var/lib/mysql' > +ExecStartPre=!install -d -o mysql -g root -m 0755 /var/log/mysql > ExecStart=/usr/bin/mysqld_safe --log-error=/var/log/mysql/mysqld.log > Restart=always > User=mysql > -- > 2.35.1 > Thanks for the patch. Successfully tested on an aarch64 system. So, Tested-By: Gilles Talis thanks Gilles. From fontaine.fabrice at gmail.com Sat Feb 26 15:52:33 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 26 Feb 2022 16:52:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/frr: fix elf_py TLS section handling Message-ID: <20220226155233.2605318-1-fontaine.fabrice@gmail.com> Fix the following build failure raised on mipsel, or1k, powerpc raised since bump to version 8.1 in commit ca2753fd47d47e5ad0eec16ea62f7b7f096331b6: struct.error: unpack requires a buffer of 20 bytes Fixes: - http://autobuild.buildroot.org/results/74f39c6f14e3f60babdcabceb5e42656f69cdaa7 Signed-off-by: Fabrice Fontaine --- ...-lib-fix-elf_py-TLS-section-handling.patch | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 package/frr/0002-lib-fix-elf_py-TLS-section-handling.patch diff --git a/package/frr/0002-lib-fix-elf_py-TLS-section-handling.patch b/package/frr/0002-lib-fix-elf_py-TLS-section-handling.patch new file mode 100644 index 0000000000..d491cb1a7d --- /dev/null +++ b/package/frr/0002-lib-fix-elf_py-TLS-section-handling.patch @@ -0,0 +1,31 @@ +From 3942ee1f7bc754dd0dd9ae79f89d0f2635be334f Mon Sep 17 00:00:00 2001 +From: David Lamparter +Date: Wed, 10 Nov 2021 15:30:07 +0100 +Subject: [PATCH] lib: fix elf_py TLS section handling + +... need to ignore TLS sections, their address is effectively +meaningless but can overlap other sections we actually need to access. + +Signed-off-by: David Lamparter + +[Retrieved from: +https://github.com/FRRouting/frr/commit/3942ee1f7bc754dd0dd9ae79f89d0f2635be334f] +Signed-off-by: Fabrice Fontaine +--- + lib/elf_py.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/lib/elf_py.c b/lib/elf_py.c +index 1c306893ad8..f230add6957 100644 +--- a/lib/elf_py.c ++++ b/lib/elf_py.c +@@ -636,6 +636,9 @@ static Elf_Scn *elf_find_addr(struct elffile *ef, uint64_t addr, size_t *idx) + Elf_Scn *scn = elf_getscn(ef->elf, i); + GElf_Shdr _shdr, *shdr = gelf_getshdr(scn, &_shdr); + ++ /* virtual address is kinda meaningless for TLS sections */ ++ if (shdr->sh_flags & SHF_TLS) ++ continue; + if (addr < shdr->sh_addr || + addr >= shdr->sh_addr + shdr->sh_size) + continue; -- 2.34.1 From fontaine.fabrice at gmail.com Sat Feb 26 16:05:03 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 26 Feb 2022 17:05:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/libpjsip: security bump to version 2.12 Message-ID: <20220226160503.2703879-1-fontaine.fabrice@gmail.com> Fix the following security issues (i.e. CVE-2021-37706, CVE-2021-41141, CVE-2021-43804, CVE-2021-43845, CVE-2022-21722 and CVE-2022-21723): - Potential integer underflow upon receiving STUN message (GHSA-2qpg-f6wf-w984) - Use after free of dialog set (GHSA-ffff-m5fm-qm62) - Missing unreleased of locks in failure cases (GHSA-8fmx-hqw7-6gmc) - Potential out-of-bounds read when parsing RTCP BYE message (GHSA-3qx3-cg72-wrh9) - Prevent OOB read for RTCP XR block (GHSA-r374-qrwv-86hh) - Potential buffer overflow in pjsua_player_create(), pjsua_recorder_create(), pjmedia_wav_player_create(), and pjsua_call_dump() (GHSA-qcvw-h34v-c7r9) - Potential out-of-bound read during RTP/RTCP parsing (GHSA-m66q-q64c-hv36) - Prevent OOB read in multipart parsing (GHSA-7fw8-54cv-r7pm) - Use after free of dialog set (GHSA-ffff-m5fm-qm62) https://github.com/pjsip/pjproject/releases/tag/2.12 Signed-off-by: Fabrice Fontaine --- package/libpjsip/libpjsip.hash | 2 +- package/libpjsip/libpjsip.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libpjsip/libpjsip.hash b/package/libpjsip/libpjsip.hash index f39ebf4060..74331ab6fb 100644 --- a/package/libpjsip/libpjsip.hash +++ b/package/libpjsip/libpjsip.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 45f6604372df3f49293749cd7c0b42cb21c4fb666c66f8ed9765de004d1eae38 pjproject-2.11.1.tar.gz +sha256 b3b94d9be4aba8f6d2d1cb164603e81b0a6ee17352f9e2ba5b58e325e610ca5a pjproject-2.12.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk index b05cc31a83..32cfa8c53c 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -4,10 +4,10 @@ # ################################################################################ -LIBPJSIP_VERSION = 2.11.1 +LIBPJSIP_VERSION = 2.12 LIBPJSIP_SOURCE = pjproject-$(LIBPJSIP_VERSION).tar.gz LIBPJSIP_SITE = $(call github,pjsip,pjproject,$(LIBPJSIP_VERSION)) -# https://github.com/pjsip/pjproject/archive/2.11.1.tar.gz +# https://github.com/pjsip/pjproject/archive/2.12.tar.gz LIBPJSIP_DEPENDENCIES = libsrtp LIBPJSIP_LICENSE = GPL-2.0+ -- 2.34.1 From aperez at igalia.com Sat Feb 26 16:14:43 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Sat, 26 Feb 2022 18:14:43 +0200 Subject: [Buildroot] [PATCH/next v2 1/2] package/bubblewrap: bump to version 0.6.1 In-Reply-To: <20220224231609.1097793-1-aperez@igalia.com> References: <20220224231609.1097793-1-aperez@igalia.com> Message-ID: <20220226161444.2221042-1-aperez@igalia.com> This version includes a new feature which allows specifying multiple seccomp filters. There is now a Meson-based build system as well, but for the moment the build recipe keeps using the autotools based one. Release notes can be found at: https://github.com/containers/bubblewrap/releases/tag/v0.6.0 https://github.com/containers/bubblewrap/releases/tag/v0.6.1 Signed-off-by: Adrian Perez de Castro --- package/bubblewrap/bubblewrap.hash | 4 ++-- package/bubblewrap/bubblewrap.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/bubblewrap/bubblewrap.hash b/package/bubblewrap/bubblewrap.hash index 88aba150cd..c3bf4d8212 100644 --- a/package/bubblewrap/bubblewrap.hash +++ b/package/bubblewrap/bubblewrap.hash @@ -1,5 +1,5 @@ -# From https://github.com/containers/bubblewrap/releases/tag/v0.5.0 -sha256 16fdaf33799d63104e347e0133f909196fe90d0c50515d010bcb422eb5a00818 bubblewrap-0.5.0.tar.xz +# From https://github.com/containers/bubblewrap/releases/tag/v0.6.1 +sha256 9609c7dc162bc68abc29abfab566934fdca37520a15ed01b675adcf3a4303282 bubblewrap-0.6.1.tar.xz # Hash for license files: sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/bubblewrap/bubblewrap.mk b/package/bubblewrap/bubblewrap.mk index 5f3d95e826..1ca2029700 100644 --- a/package/bubblewrap/bubblewrap.mk +++ b/package/bubblewrap/bubblewrap.mk @@ -4,7 +4,7 @@ # ################################################################################ -BUBBLEWRAP_VERSION = 0.5.0 +BUBBLEWRAP_VERSION = 0.6.1 BUBBLEWRAP_SITE = https://github.com/containers/bubblewrap/releases/download/v$(BUBBLEWRAP_VERSION) BUBBLEWRAP_SOURCE = bubblewrap-$(BUBBLEWRAP_VERSION).tar.xz BUBBLEWRAP_DEPENDENCIES = host-pkgconf libcap -- 2.35.1 From aperez at igalia.com Sat Feb 26 16:14:44 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Sat, 26 Feb 2022 18:14:44 +0200 Subject: [Buildroot] [PATCH/next v2 2/2] package/bubblewrap: switch to the meson build system In-Reply-To: <20220224231609.1097793-1-aperez@igalia.com> References: <20220224231609.1097793-1-aperez@igalia.com> Message-ID: <20220226161444.2221042-2-aperez@igalia.com> Version 0.6.0 introduced a Meson build system, and upstream seems to have the intention to abandon the previous autotools based one. Switch to Meson for future proofing. Signed-off-by: Adrian Perez de Castro --- package/bubblewrap/bubblewrap.mk | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/package/bubblewrap/bubblewrap.mk b/package/bubblewrap/bubblewrap.mk index 1ca2029700..5875b0d6e2 100644 --- a/package/bubblewrap/bubblewrap.mk +++ b/package/bubblewrap/bubblewrap.mk @@ -14,22 +14,24 @@ BUBBLEWRAP_LICENSE_FILES = COPYING BUBBLEWRAP_CPE_ID_VENDOR = projectatomic BUBBLEWRAP_CONF_OPTS = \ - --enable-require-userns=no \ - --disable-man \ - --disable-sudo \ - --with-priv-mode=none + -Dzsh_completion=disabled \ + -Dman=disabled \ + -Dpython=$(HOST_DIR)/bin/python \ + -Drequire_userns=false ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y) -BUBBLEWRAP_CONF_OPTS += --with-bash-completion-dir=/usr/share/bash-completion/completions +BUBBLEWRAP_CONF_OPTS += \ + -Dbash_completion=enabled \ + -Dbash_completion_dir=/usr/share/bash-completion/completions else -BUBBLEWRAP_CONF_OPTS += --without-bash-completion-dir +BUBBLEWRAP_CONF_OPTS += -Dbash_completion=disabled endif ifeq ($(BR2_PACKAGE_LIBSELINUX),y) -BUBBLEWRAP_CONF_OPTS += --enable-selinux +BUBBLEWRAP_CONF_OPTS += -Dselinux=enabled BUBBLEWRAP_DEPENDENCIES += libselinux else -BUBBLEWRAP_CONF_OPTS += --disable-selinux +BUBBLEWRAP_CONF_OPTS += -Dselinux=disabled endif # We need to mark bwrap as setuid, in case the kernel @@ -38,4 +40,4 @@ define BUBBLEWRAP_PERMISSIONS /usr/bin/bwrap f 1755 0 0 - - - - - endef -$(eval $(autotools-package)) +$(eval $(meson-package)) -- 2.35.1 From fontaine.fabrice at gmail.com Sat Feb 26 18:10:45 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 26 Feb 2022 19:10:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/wireshark: security bump to version 3.4.12 Message-ID: <20220226181045.2922875-1-fontaine.fabrice@gmail.com> Fix CVE-2021-4190, CVE-2022-0581, CVE-2022-0582, CVE-2022-0583, CVE-2022-0585 and CVE-2022-0586 https://www.wireshark.org/security/wnpa-sec-2021-22.html https://www.wireshark.org/security/wnpa-sec-2022-01.html https://www.wireshark.org/security/wnpa-sec-2022-02.html https://www.wireshark.org/security/wnpa-sec-2022-03.html https://www.wireshark.org/security/wnpa-sec-2022-04.html https://www.wireshark.org/security/wnpa-sec-2022-05.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 7b67e316ed..db1f71e9ef 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.11.txt -sha1 b656d8709b8b0b3d2a94665af6bec88495ad994c wireshark-3.4.11.tar.xz -sha256 a0e227bce2cc3a51ef3301891a0243231990b52a39b68a84a6e32f69c4e75279 wireshark-3.4.11.tar.xz +# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.4.12.txt +sha1 91ca69b0029e58b9c824266237ab392a62f0a248 wireshark-3.4.12.tar.xz +sha256 881a13303e263b7dc7fe337534c8a541d4914552287879bed30bbe76c5bf68ca wireshark-3.4.12.tar.xz # Locally calculated sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf COPYING diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index 0361d0bb64..a5ca4b1f73 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 3.4.11 +WIRESHARK_VERSION = 3.4.12 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 fontaine.fabrice at gmail.com Sat Feb 26 18:15:08 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 26 Feb 2022 19:15:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/xterm: security bump to version 371 Message-ID: <20220226181508.3011361-1-fontaine.fabrice@gmail.com> Fix CVE-2022-24130: xterm through Patch 370, when Sixel support is enabled, allows attackers to trigger a buffer overflow in set_sixel in graphics_sixel.c via crafted text. Update hash of COPYING (update in year) https://invisible-island.net/xterm/xterm.log.html#xterm_371 Signed-off-by: Fabrice Fontaine --- package/xterm/xterm.hash | 4 ++-- package/xterm/xterm.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/xterm/xterm.hash b/package/xterm/xterm.hash index d6d80ad977..3f6ec765ce 100644 --- a/package/xterm/xterm.hash +++ b/package/xterm/xterm.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 27f1a8b1c756e269fd5684e60802b545f0be9b36b8b5d6bdbc840c6b000dc51f xterm-367.tgz +sha256 32f888277b19e28ebc0a3112bff000607c07bed0679caa0beebb36f9cad484f5 xterm-371.tgz # Locally calculated -sha256 dfb668cc977e24649500f3cc54de3e2b793928d210715a445ab1227930b07ba6 COPYING +sha256 9521ef761474cd31ea406f56a751646a7b42a9287cdc6f2f8e52ed4c4d2a73e7 COPYING diff --git a/package/xterm/xterm.mk b/package/xterm/xterm.mk index e09d350a7d..95984f1cf9 100644 --- a/package/xterm/xterm.mk +++ b/package/xterm/xterm.mk @@ -4,7 +4,7 @@ # ################################################################################ -XTERM_VERSION = 367 +XTERM_VERSION = 371 XTERM_SOURCE = xterm-$(XTERM_VERSION).tgz XTERM_SITE = http://invisible-mirror.net/archives/xterm XTERM_DEPENDENCIES = ncurses xlib_libXaw host-pkgconf -- 2.34.1 From fontaine.fabrice at gmail.com Sat Feb 26 18:17:47 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 26 Feb 2022 19:17:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/dbus: bump to version 1.12.22 Message-ID: <20220226181747.3033483-1-fontaine.fabrice@gmail.com> https://gitlab.freedesktop.org/dbus/dbus/-/blob/dbus-1.12.22/NEWS Signed-off-by: Fabrice Fontaine --- package/dbus/dbus.hash | 4 ++-- package/dbus/dbus.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/dbus/dbus.hash b/package/dbus/dbus.hash index 06512e5656..176396fe2f 100644 --- a/package/dbus/dbus.hash +++ b/package/dbus/dbus.hash @@ -1,7 +1,7 @@ # Locally calculated after checking pgp signature -# https://dbus.freedesktop.org/releases/dbus/dbus-1.12.20.tar.gz.asc +# https://dbus.freedesktop.org/releases/dbus/dbus-1.12.22.tar.gz.asc # using key 36EC5A6448A4F5EF79BEFE98E05AE1478F814C4F -sha256 f77620140ecb4cdc67f37fb444f8a6bea70b5b6461f12f1cbe2cec60fa7de5fe dbus-1.12.20.tar.gz +sha256 8d25785c798ec4f892e6f9d177fb0ceeb8b29867b119798f9d5228561d3ad474 dbus-1.12.22.tar.gz # Locally calculated sha256 0e46f54efb12d04ab5c33713bacd0e140c9a35b57ae29e03c853203266e8f3a1 COPYING diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index d78e102427..de447d8680 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -4,7 +4,7 @@ # ################################################################################ -DBUS_VERSION = 1.12.20 +DBUS_VERSION = 1.12.22 DBUS_SITE = https://dbus.freedesktop.org/releases/dbus DBUS_LICENSE = AFL-2.1 or GPL-2.0+ (library, tools), GPL-2.0+ (tools) DBUS_LICENSE_FILES = COPYING -- 2.34.1 From fontaine.fabrice at gmail.com Sat Feb 26 18:23:56 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 26 Feb 2022 19:23:56 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/cukinia: bump to version 0.6.0 Message-ID: <20220226182356.3035297-1-fontaine.fabrice@gmail.com> https://github.com/savoirfairelinux/cukinia/compare/v0.5.1...v0.6.0 Signed-off-by: Fabrice Fontaine --- package/cukinia/cukinia.hash | 2 +- package/cukinia/cukinia.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cukinia/cukinia.hash b/package/cukinia/cukinia.hash index e6ae602011..6e76a6ab88 100644 --- a/package/cukinia/cukinia.hash +++ b/package/cukinia/cukinia.hash @@ -1,4 +1,4 @@ # locally computed -sha256 b867ec63e448e7fa0a9276f6844a8b3a8f92d99e63e8518fe24e9debd32679b5 cukinia-0.5.1.tar.gz +sha256 79dc77c7b9f2784e7d22d961dd2c4ad9c78deebbc6e8f39df4fa214118682b40 cukinia-0.6.0.tar.gz sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPLv3 diff --git a/package/cukinia/cukinia.mk b/package/cukinia/cukinia.mk index 84d4e60ea8..798c199b67 100644 --- a/package/cukinia/cukinia.mk +++ b/package/cukinia/cukinia.mk @@ -4,7 +4,7 @@ # ################################################################################ -CUKINIA_VERSION = 0.5.1 +CUKINIA_VERSION = 0.6.0 CUKINIA_SITE = $(call github,savoirfairelinux,cukinia,v$(CUKINIA_VERSION)) CUKINIA_LICENSE = Apache-2.0 or GPL-3.0 CUKINIA_LICENSE_FILES = LICENSE LICENSE.GPLv3 -- 2.34.1 From fontaine.fabrice at gmail.com Sat Feb 26 18:34:23 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 26 Feb 2022 19:34:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/exempi: security bump to version 2.6.1 Message-ID: <20220226183423.3086505-1-fontaine.fabrice@gmail.com> Extract from NEWS: - Changes in v2021.08 - Security Fixes - Changes in v2021.07 - Security Fixes https://gitlab.freedesktop.org/libopenraw/exempi/-/blob/2.6.1/NEWS Signed-off-by: Fabrice Fontaine --- package/exempi/exempi.hash | 2 +- package/exempi/exempi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/exempi/exempi.hash b/package/exempi/exempi.hash index 5ea9683053..5df610de17 100644 --- a/package/exempi/exempi.hash +++ b/package/exempi/exempi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 52f54314aefd45945d47a6ecf4bd21f362e6467fa5d0538b0d45a06bc6eaaed5 exempi-2.5.2.tar.bz2 +sha256 072451ac1e0dc97ed69a2e5bfc235fd94fe093d837f65584d0e3581af5db18cd exempi-2.6.1.tar.bz2 sha256 3d3c3593c15e0d35bdae0df7c642106250f6be3adc61477419413900f23ae607 COPYING diff --git a/package/exempi/exempi.mk b/package/exempi/exempi.mk index f481469d2c..56fbe20379 100644 --- a/package/exempi/exempi.mk +++ b/package/exempi/exempi.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXEMPI_VERSION = 2.5.2 +EXEMPI_VERSION = 2.6.1 EXEMPI_SOURCE = exempi-$(EXEMPI_VERSION).tar.bz2 EXEMPI_SITE = https://libopenraw.freedesktop.org/download EXEMPI_INSTALL_STAGING = YES -- 2.34.1 From fontaine.fabrice at gmail.com Sat Feb 26 18:50:33 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 26 Feb 2022 19:50:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/wolfssl: security bump to version 5.2.0 Message-ID: <20220226185033.3097401-1-fontaine.fabrice@gmail.com> Fix CVE-2021-44718, CVE-2022-23408, CVE-2022-25638 and CVE-2022-25640 https://www.wolfssl.com/docs/security-vulnerabilities https://github.com/wolfSSL/wolfssl/blob/v5.2.0-stable/ChangeLog.md Signed-off-by: Fabrice Fontaine --- package/wolfssl/wolfssl.hash | 2 +- package/wolfssl/wolfssl.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/wolfssl/wolfssl.hash b/package/wolfssl/wolfssl.hash index 9896713ca7..63eebf93bb 100644 --- a/package/wolfssl/wolfssl.hash +++ b/package/wolfssl/wolfssl.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 50db45f348f47e00c93dd244c24108220120cb3cc9d01434789229c32937c444 wolfssl-4.8.1-stable.tar.gz +sha256 409b4646c5f54f642de0e9f3544c3b83de7238134f5b1ff93fb44527bf119d05 wolfssl-5.2.0.tar.gz # Hash for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/wolfssl/wolfssl.mk b/package/wolfssl/wolfssl.mk index d3dce0a401..bfb54445e4 100644 --- a/package/wolfssl/wolfssl.mk +++ b/package/wolfssl/wolfssl.mk @@ -4,8 +4,8 @@ # ################################################################################ -WOLFSSL_VERSION = 4.8.1-stable -WOLFSSL_SITE = $(call github,wolfSSL,wolfssl,v$(WOLFSSL_VERSION)) +WOLFSSL_VERSION = 5.2.0 +WOLFSSL_SITE = $(call github,wolfSSL,wolfssl,v$(WOLFSSL_VERSION)-stable) WOLFSSL_INSTALL_STAGING = YES WOLFSSL_LICENSE = GPL-2.0+ -- 2.34.1 From christian at paral.in Sat Feb 26 21:24:43 2022 From: christian at paral.in (Christian Stewart) Date: Sat, 26 Feb 2022 13:24:43 -0800 Subject: [Buildroot] [PATCH/next 1/1] package/balena-engine: bump to version 20.10.12 In-Reply-To: <20220226102418.943851-1-tianyuanhao3@163.com> References: <20220226102418.943851-1-tianyuanhao3@163.com> Message-ID: All, On Sat, Feb 26, 2022 at 2:26 AM TIAN Yuanhao wrote: > > Also: > - drop unused dependencies > - drop invalid tags > - drop the autogen step > - simplify kconfigs just to run hello-world > > https://github.com/balena-os/balena-engine/blob/v20.10.12/CHANGELOG.md > > Signed-off-by: TIAN Yuanhao > --- > package/balena-engine/Config.in | 1 - > package/balena-engine/balena-engine.hash | 2 +- > package/balena-engine/balena-engine.mk | 42 +++++------------------- > 3 files changed, 9 insertions(+), 36 deletions(-) > > diff --git a/package/balena-engine/Config.in b/package/balena-engine/Config.in > index f48f361dc2..02f694515e 100644 > --- a/package/balena-engine/Config.in > +++ b/package/balena-engine/Config.in > @@ -6,7 +6,6 @@ config BR2_PACKAGE_BALENA_ENGINE > depends on BR2_USE_MMU # util-linux > select BR2_PACKAGE_CGROUPFS_MOUNT if !BR2_PACKAGE_SYSTEMD # runtime > select BR2_PACKAGE_IPTABLES # runtime > - select BR2_PACKAGE_SQLITE # runtime > select BR2_PACKAGE_UTIL_LINUX # runtime > select BR2_PACKAGE_UTIL_LINUX_BINARIES # runtime > select BR2_PACKAGE_UTIL_LINUX_MOUNT # runtime > diff --git a/package/balena-engine/balena-engine.hash b/package/balena-engine/balena-engine.hash > index 3f632ef381..ef590881f5 100644 > --- a/package/balena-engine/balena-engine.hash > +++ b/package/balena-engine/balena-engine.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 389282706562118608b6ac580e7beacd6a43f0bb3481c69fb1856bed9ac49b85 balena-engine-19.03.14.tar.gz > +sha256 43f4c985b855a4f731a5cdac214f1adf6c4cc2021cbad3f93856009df246d61c balena-engine-20.10.12.tar.gz \ > $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_ADDRTYPE) > $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_CONNTRACK) > - $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_IPVS) > $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_IPTABLES) > $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_FILTER) > $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_NAT) > - $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_TARGET_MASQUERADE) > $(call KCONFIG_ENABLE_OPT,CONFIG_BRIDGE) > - $(call KCONFIG_ENABLE_OPT,CONFIG_DUMMY) > - $(call KCONFIG_ENABLE_OPT,CONFIG_MACVLAN) > - $(call KCONFIG_ENABLE_OPT,CONFIG_VXLAN) > $(call KCONFIG_ENABLE_OPT,CONFIG_VETH) > - $(call KCONFIG_ENABLE_OPT,CONFIG_OVERLAY_FS) > - $(call KCONFIG_ENABLE_OPT,CONFIG_KEYS) > endef > > define BALENA_ENGINE_INSTALL_SYMLINK > -- > 2.25.1 Reviewed-by: Christian Stewart Thanks! From fontaine.fabrice at gmail.com Sun Feb 27 09:11:40 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 27 Feb 2022 10:11:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/freerdp: fix build with libexecinfo Message-ID: <20220227091140.3643535-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-0/output-1/host/lib/gcc/riscv64-buildroot-linux-uclibc/10.3.0/../../../../riscv64-buildroot-linux-uclibc/bin/ld: ../../libwinpr/libwinpr2.so.2.5.0: undefined reference to `backtrace_symbols_fd' Fixes: - http://autobuild.buildroot.org/results/095c33098a6e59ff664080e03baf1a3c92b4265f Signed-off-by: Fabrice Fontaine --- package/freerdp/freerdp.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk index c536f6cb1c..5f6ae56d1d 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -43,6 +43,11 @@ else FREERDP_CONF_OPTS += -DWITH_ALSA=OFF endif +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +FREERDP_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-lexecinfo +FREERDP_DEPENDENCIES += libexecinfo +endif + ifeq ($(BR2_PACKAGE_LIBUSB),y) FREERDP_CONF_OPTS += -DCHANNEL_URBDRC=ON FREERDP_DEPENDENCIES += libusb -- 2.34.1 From fontaine.fabrice at gmail.com Sun Feb 27 09:15:33 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 27 Feb 2022 10:15:33 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/botan: bump to version 2.19.1 Message-ID: <20220227091533.3645027-1-fontaine.fabrice@gmail.com> - Drop patch (not needed since https://github.com/randombit/botan/commit/97483f93bdcfcb2cc86bcb103802be55c24ad633) - Update hash of license file (update in year: https://github.com/randombit/botan/commit/ff62a51ac2ed2e265edaf51b532d32eed5864d4b) https://github.com/randombit/botan/blob/2.19.1/news.rst Signed-off-by: Fabrice Fontaine --- ...d-a-miscompilation-issue-in-clang-12.patch | 144 ------------------ package/botan/botan.hash | 4 +- package/botan/botan.mk | 2 +- 3 files changed, 3 insertions(+), 147 deletions(-) delete mode 100644 package/botan/0001-Revert-workaround-a-miscompilation-issue-in-clang-12.patch diff --git a/package/botan/0001-Revert-workaround-a-miscompilation-issue-in-clang-12.patch b/package/botan/0001-Revert-workaround-a-miscompilation-issue-in-clang-12.patch deleted file mode 100644 index b43aeafe13..0000000000 --- a/package/botan/0001-Revert-workaround-a-miscompilation-issue-in-clang-12.patch +++ /dev/null @@ -1,144 +0,0 @@ -From 372bdf0348fb86d671e73baab19daa34bd0cf73d Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 9 Nov 2021 19:01:20 +0100 -Subject: [PATCH] Revert "workaround a miscompilation issue in clang 12 - (XCode 13)" - -This reverts commit 219329f8e777af54d785ae7259f8be32a714b751. - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/randombit/botan/issues/2845] ---- - src/lib/hash/sha3/sha3.cpp | 46 ++++++----------------- - src/lib/hash/sha3/sha3_bmi2/sha3_bmi2.cpp | 46 ++++++----------------- - 2 files changed, 22 insertions(+), 70 deletions(-) - -diff --git a/src/lib/hash/sha3/sha3.cpp b/src/lib/hash/sha3/sha3.cpp -index 289e451ff..690c2b264 100644 ---- a/src/lib/hash/sha3/sha3.cpp -+++ b/src/lib/hash/sha3/sha3.cpp -@@ -11,47 +11,23 @@ - #include - #include - --#include -- - namespace Botan { - - namespace { - --// This is a workaround for a suspected bug in clang 12 (and XCode 13) --// that caused a miscompile of the SHA3 implementation for optimization --// level -O2 and higher. --// --// For details, see: https://github.com/randombit/botan/issues/2802 --#if defined(__clang__) && \ -- (( defined(__apple_build_version__) && __clang_major__ == 13) || \ -- (!defined(__apple_build_version__) && __clang_major__ == 12)) --#define BOTAN_WORKAROUND_MAYBE_INLINE __attribute__((noinline)) --#else --#define BOTAN_WORKAROUND_MAYBE_INLINE inline --#endif -- --BOTAN_WORKAROUND_MAYBE_INLINE std::tuple -- xor_CNs(const uint64_t A[25]) -- { -- return { -- A[0] ^ A[5] ^ A[10] ^ A[15] ^ A[20], -- A[1] ^ A[6] ^ A[11] ^ A[16] ^ A[21], -- A[2] ^ A[7] ^ A[12] ^ A[17] ^ A[22], -- A[3] ^ A[8] ^ A[13] ^ A[18] ^ A[23], -- A[4] ^ A[9] ^ A[14] ^ A[19] ^ A[24]}; -- } -- --#undef BOTAN_WORKAROUND_MAYBE_INLINE -- - inline void SHA3_round(uint64_t T[25], const uint64_t A[25], uint64_t RC) - { -- const auto Cs = xor_CNs(A); -- -- const uint64_t D0 = rotl<1>(std::get<0>(Cs)) ^ std::get<3>(Cs); -- const uint64_t D1 = rotl<1>(std::get<1>(Cs)) ^ std::get<4>(Cs); -- const uint64_t D2 = rotl<1>(std::get<2>(Cs)) ^ std::get<0>(Cs); -- const uint64_t D3 = rotl<1>(std::get<3>(Cs)) ^ std::get<1>(Cs); -- const uint64_t D4 = rotl<1>(std::get<4>(Cs)) ^ std::get<2>(Cs); -+ const uint64_t C0 = A[0] ^ A[5] ^ A[10] ^ A[15] ^ A[20]; -+ const uint64_t C1 = A[1] ^ A[6] ^ A[11] ^ A[16] ^ A[21]; -+ const uint64_t C2 = A[2] ^ A[7] ^ A[12] ^ A[17] ^ A[22]; -+ const uint64_t C3 = A[3] ^ A[8] ^ A[13] ^ A[18] ^ A[23]; -+ const uint64_t C4 = A[4] ^ A[9] ^ A[14] ^ A[19] ^ A[24]; -+ -+ const uint64_t D0 = rotl<1>(C0) ^ C3; -+ const uint64_t D1 = rotl<1>(C1) ^ C4; -+ const uint64_t D2 = rotl<1>(C2) ^ C0; -+ const uint64_t D3 = rotl<1>(C3) ^ C1; -+ const uint64_t D4 = rotl<1>(C4) ^ C2; - - const uint64_t B00 = A[ 0] ^ D1; - const uint64_t B01 = rotl<44>(A[ 6] ^ D2); -diff --git a/src/lib/hash/sha3/sha3_bmi2/sha3_bmi2.cpp b/src/lib/hash/sha3/sha3_bmi2/sha3_bmi2.cpp -index c7f1914a3..a9650ad9d 100644 ---- a/src/lib/hash/sha3/sha3_bmi2/sha3_bmi2.cpp -+++ b/src/lib/hash/sha3/sha3_bmi2/sha3_bmi2.cpp -@@ -8,47 +8,23 @@ - #include - #include - --#include -- - namespace Botan { - - namespace { - --// This is a workaround for a suspected bug in clang 12 (and XCode 13) --// that caused a miscompile of the SHA3 implementation for optimization --// level -O2 and higher. --// --// For details, see: https://github.com/randombit/botan/issues/2802 --#if defined(__clang__) && \ -- (( defined(__apple_build_version__) && __clang_major__ == 13) || \ -- (!defined(__apple_build_version__) && __clang_major__ == 12)) --#define BOTAN_WORKAROUND_MAYBE_INLINE __attribute__((noinline)) --#else --#define BOTAN_WORKAROUND_MAYBE_INLINE inline --#endif -- --BOTAN_WORKAROUND_MAYBE_INLINE std::tuple -- xor_CNs(const uint64_t A[25]) -- { -- return { -- A[0] ^ A[5] ^ A[10] ^ A[15] ^ A[20], -- A[1] ^ A[6] ^ A[11] ^ A[16] ^ A[21], -- A[2] ^ A[7] ^ A[12] ^ A[17] ^ A[22], -- A[3] ^ A[8] ^ A[13] ^ A[18] ^ A[23], -- A[4] ^ A[9] ^ A[14] ^ A[19] ^ A[24]}; -- } -- --#undef BOTAN_WORKAROUND_MAYBE_INLINE -- - inline void SHA3_BMI2_round(uint64_t T[25], const uint64_t A[25], uint64_t RC) - { -- const auto Cs = xor_CNs(A); -- -- const uint64_t D0 = rotl<1>(std::get<0>(Cs)) ^ std::get<3>(Cs); -- const uint64_t D1 = rotl<1>(std::get<1>(Cs)) ^ std::get<4>(Cs); -- const uint64_t D2 = rotl<1>(std::get<2>(Cs)) ^ std::get<0>(Cs); -- const uint64_t D3 = rotl<1>(std::get<3>(Cs)) ^ std::get<1>(Cs); -- const uint64_t D4 = rotl<1>(std::get<4>(Cs)) ^ std::get<2>(Cs); -+ const uint64_t C0 = A[0] ^ A[5] ^ A[10] ^ A[15] ^ A[20]; -+ const uint64_t C1 = A[1] ^ A[6] ^ A[11] ^ A[16] ^ A[21]; -+ const uint64_t C2 = A[2] ^ A[7] ^ A[12] ^ A[17] ^ A[22]; -+ const uint64_t C3 = A[3] ^ A[8] ^ A[13] ^ A[18] ^ A[23]; -+ const uint64_t C4 = A[4] ^ A[9] ^ A[14] ^ A[19] ^ A[24]; -+ -+ const uint64_t D0 = rotl<1>(C0) ^ C3; -+ const uint64_t D1 = rotl<1>(C1) ^ C4; -+ const uint64_t D2 = rotl<1>(C2) ^ C0; -+ const uint64_t D3 = rotl<1>(C3) ^ C1; -+ const uint64_t D4 = rotl<1>(C4) ^ C2; - - const uint64_t B00 = A[ 0] ^ D1; - const uint64_t B01 = rotl<44>(A[ 6] ^ D2); --- -2.33.0 - diff --git a/package/botan/botan.hash b/package/botan/botan.hash index 91e1bf741a..2729cb493f 100644 --- a/package/botan/botan.hash +++ b/package/botan/botan.hash @@ -1,4 +1,4 @@ # From https://botan.randombit.net/releases/sha256sums.txt -sha256 541a3b13f1b9d30f977c6c1ae4c7bfdfda763cda6e44de807369dce79f42307e Botan-2.18.2.tar.xz +sha256 e26e00cfefda64082afdd540d3c537924f645d6a674afed2cd171005deff5560 Botan-2.19.1.tar.xz # Locally computed -sha256 fb7f0322d36fba55ca17d77bc203a9f09a40daa8a249b75cf8887aba36cec9d0 license.txt +sha256 472faf6d2231130382779f96de506be19296473750356449fc426ddc9cb03b50 license.txt diff --git a/package/botan/botan.mk b/package/botan/botan.mk index ebff1343b1..f9ebcf8d0a 100644 --- a/package/botan/botan.mk +++ b/package/botan/botan.mk @@ -4,7 +4,7 @@ # ################################################################################ -BOTAN_VERSION = 2.18.2 +BOTAN_VERSION = 2.19.1 BOTAN_SOURCE = Botan-$(BOTAN_VERSION).tar.xz BOTAN_SITE = http://botan.randombit.net/releases BOTAN_LICENSE = BSD-2-Clause -- 2.34.1 From fontaine.fabrice at gmail.com Sun Feb 27 10:01:04 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 27 Feb 2022 11:01:04 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/libsecret: bump to version 0.20.5 Message-ID: <20220227100104.3694504-1-fontaine.fabrice@gmail.com> - Switch to meson-package - Add bash-completion and tpm2-tss optional dependencies https://gitlab.gnome.org/GNOME/libsecret/-/tags/0.20.5 Signed-off-by: Fabrice Fontaine --- package/libsecret/libsecret.hash | 4 ++-- package/libsecret/libsecret.mk | 36 +++++++++++++++++++++----------- 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/package/libsecret/libsecret.hash b/package/libsecret/libsecret.hash index 792ec838e3..4eb3d9b95c 100644 --- a/package/libsecret/libsecret.hash +++ b/package/libsecret/libsecret.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/libsecret/0.20/libsecret-0.20.4.sha256sum -sha256 325a4c54db320c406711bf2b55e5cb5b6c29823426aa82596a907595abb39d28 libsecret-0.20.4.tar.xz +# From https://download.gnome.org/sources/libsecret/0.20/libsecret-0.20.5.sha256sum +sha256 3fb3ce340fcd7db54d87c893e69bfc2b1f6e4d4b279065ffe66dac9f0fd12b4d libsecret-0.20.5.tar.xz # Hash for license file: sha256 a1a33180d02960ab1c5de36cf20b1a2f0fe9888d83826ad263da5db52f1b183b COPYING diff --git a/package/libsecret/libsecret.mk b/package/libsecret/libsecret.mk index 4d14c231d7..82fe38ac1a 100644 --- a/package/libsecret/libsecret.mk +++ b/package/libsecret/libsecret.mk @@ -5,33 +5,45 @@ ################################################################################ LIBSECRET_VERSION_MAJOR = 0.20 -LIBSECRET_VERSION = $(LIBSECRET_VERSION_MAJOR).4 +LIBSECRET_VERSION = $(LIBSECRET_VERSION_MAJOR).5 LIBSECRET_SITE = http://ftp.gnome.org/pub/GNOME/sources/libsecret/$(LIBSECRET_VERSION_MAJOR) LIBSECRET_SOURCE = libsecret-$(LIBSECRET_VERSION).tar.xz LIBSECRET_INSTALL_STAGING = YES LIBSECRET_DEPENDENCIES = libglib2 $(TARGET_NLS_DEPENDENCIES) -LIBSECRET_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) +LIBSECRET_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) LIBSECRET_CONF_OPTS = \ - --disable-manpages \ - --disable-strict \ - --disable-coverage \ - --enable-vala=no + -Dgtk_doc=false \ + -Dmanpage=false \ + -Dvapi=false LIBSECRET_LICENSE = LGPL-2.1+ LIBSECRET_LICENSE_FILES = COPYING +ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y) +LIBSECRET_CONF_OPTS += -Dbash_completion=enabled +LIBSECRET_DEPENDENCIES += bash-completion +else +LIBSECRET_CONF_OPTS += -Dbash_completion=disabled +endif + ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) -LIBSECRET_CONF_OPTS += --enable-introspection=yes +LIBSECRET_CONF_OPTS += -Dintrospection=true LIBSECRET_DEPENDENCIES += gobject-introspection else -LIBSECRET_CONF_OPTS += --enable-introspection=no +LIBSECRET_CONF_OPTS += -Dintrospection=false endif ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) LIBSECRET_DEPENDENCIES += libgcrypt -LIBSECRET_CONF_OPTS += --enable-gcrypt \ - --with-libgcrypt-prefix=$(STAGING_DIR)/usr +LIBSECRET_CONF_OPTS += -Dgcrypt=true +else +LIBSECRET_CONF_OPTS += -Dgcrypt=false +endif + +ifeq ($(BR2_PACKAGE_TPM2_TSS),y) +LIBSECRET_CONF_OPTS += -Dtpm2=true +LIBSECRET_DEPENDENCIES += tpm2-tss else -LIBSECRET_CONF_OPTS += --disable-gcrypt +LIBSECRET_CONF_OPTS += -Dtpm2=false endif -$(eval $(autotools-package)) +$(eval $(meson-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Sun Feb 27 10:10:03 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 27 Feb 2022 11:10:03 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/ocrad: bump to version 0.28 Message-ID: <20220227101003.3702134-1-fontaine.fabrice@gmail.com> - Add libpng mandatory dependency - Update indentation in hash file (two spaces) Signed-off-by: Fabrice Fontaine --- package/ocrad/Config.in | 1 + package/ocrad/ocrad.hash | 4 ++-- package/ocrad/ocrad.mk | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/ocrad/Config.in b/package/ocrad/Config.in index 38d37c612a..b6c4300f86 100644 --- a/package/ocrad/Config.in +++ b/package/ocrad/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_OCRAD bool "ocrad" depends on BR2_INSTALL_LIBSTDCPP + select BR2_PACKAGE_LIBPNG help GNU Ocrad is an OCR (Optical Character Recognition) program based on a feature extraction method. diff --git a/package/ocrad/ocrad.hash b/package/ocrad/ocrad.hash index 7ae38c30e8..cd5b0039ea 100644 --- a/package/ocrad/ocrad.hash +++ b/package/ocrad/ocrad.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 a9bfe67e9a040907aff5640dca56392476b6a89e48e37dc94ba846c5b6733b36 ocrad-0.27.tar.lz -sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef COPYING +sha256 34ccea576dbdadaa5979e6202344c3ff68737d829ca7b66f71c8497d36bbbf2e ocrad-0.28.tar.lz +sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef COPYING diff --git a/package/ocrad/ocrad.mk b/package/ocrad/ocrad.mk index e037a08195..982bb002c9 100644 --- a/package/ocrad/ocrad.mk +++ b/package/ocrad/ocrad.mk @@ -4,12 +4,13 @@ # ################################################################################ -OCRAD_VERSION = 0.27 +OCRAD_VERSION = 0.28 OCRAD_SOURCE = ocrad-$(OCRAD_VERSION).tar.lz OCRAD_SITE = $(BR2_GNU_MIRROR)/ocrad OCRAD_LICENSE = GPL-3.0+ OCRAD_LICENSE_FILES = COPYING OCRAD_INSTALL_STAGING = YES +OCRAD_DEPENDENCIES = libpng # This is not a true autotools package. define OCRAD_CONFIGURE_CMDS -- 2.34.1 From fontaine.fabrice at gmail.com Sun Feb 27 10:35:27 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 27 Feb 2022 11:35:27 +0100 Subject: [Buildroot] [PATCH/next 1/2] package/valijson: drop boost dependency Message-ID: <20220227103528.3888282-1-fontaine.fabrice@gmail.com> boost is not mandatory since the deactivation of tests when bumping to version 0.2.0 in commit d8e2876104be3f9f01613b17d3e60120883be1a1 and https://github.com/tristanpenman/valijson/commit/1844241d2a2379bca79a0d654f4b007209b10883 Signed-off-by: Fabrice Fontaine --- package/valijson/Config.in | 8 ++------ package/valijson/valijson.mk | 1 - 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/package/valijson/Config.in b/package/valijson/Config.in index 10721b3703..07706cd963 100644 --- a/package/valijson/Config.in +++ b/package/valijson/Config.in @@ -1,10 +1,6 @@ config BR2_PACKAGE_VALIJSON bool "valijson" - depends on BR2_USE_WCHAR depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_BOOST - select BR2_PACKAGE_BOOST_REGEX help Valijson is a header-only JSON Schema Validation library for C++. Valijson provides a simple validation API that allows @@ -14,5 +10,5 @@ config BR2_PACKAGE_VALIJSON https://github.com/tristanpenman/valijson -comment "valijson needs a toolchain w/ C++, threads, wchar support" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR +comment "valijson needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/valijson/valijson.mk b/package/valijson/valijson.mk index e425757d26..71c5b05f2b 100644 --- a/package/valijson/valijson.mk +++ b/package/valijson/valijson.mk @@ -11,7 +11,6 @@ VALIJSON_LICENSE_FILES = LICENSE VALIJSON_CPE_ID_VENDOR = valijson_project VALIJSON_INSTALL_STAGING = YES VALIJSON_INSTALL_TARGET = NO -VALIJSON_DEPENDENCIES = boost VALIJSON_CONF_OPTS = -Dvalijson_INSTALL_HEADERS=TRUE -Dvalijson_BUILD_TESTS=FALSE $(eval $(cmake-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Sun Feb 27 10:35:28 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 27 Feb 2022 11:35:28 +0100 Subject: [Buildroot] [PATCH/next 2/2] package/valijson: bump to version 0.6 In-Reply-To: <20220227103528.3888282-1-fontaine.fabrice@gmail.com> References: <20220227103528.3888282-1-fontaine.fabrice@gmail.com> Message-ID: <20220227103528.3888282-2-fontaine.fabrice@gmail.com> https://github.com/tristanpenman/valijson/releases/tag/v0.6 https://github.com/tristanpenman/valijson/releases/tag/v0.5 https://github.com/tristanpenman/valijson/releases/tag/v0.4 Signed-off-by: Fabrice Fontaine --- package/valijson/valijson.hash | 2 +- package/valijson/valijson.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/valijson/valijson.hash b/package/valijson/valijson.hash index e184ccb7c0..0aab93dd2a 100644 --- a/package/valijson/valijson.hash +++ b/package/valijson/valijson.hash @@ -1,3 +1,3 @@ # Locally Computed: -sha256 2ac881a36f90810b41b66511502dea1e7886137ad31bcfb4e917d929c5028c35 valijson-0.3.tar.gz +sha256 e06bf78fc1d26d4956fabc182408ebbbc47e3a6699778cda4aa439c2a6110b09 valijson-0.6.tar.gz sha256 1a0f99926a2dbec30eba3db820236d9953fbe3048976923ac24980e655fbe991 LICENSE diff --git a/package/valijson/valijson.mk b/package/valijson/valijson.mk index 71c5b05f2b..4b1f722f77 100644 --- a/package/valijson/valijson.mk +++ b/package/valijson/valijson.mk @@ -4,7 +4,7 @@ # ################################################################################ -VALIJSON_VERSION = 0.3 +VALIJSON_VERSION = 0.6 VALIJSON_SITE = $(call github,tristanpenman,valijson,v$(VALIJSON_VERSION)) VALIJSON_LICENSE = BSD-2-Clause VALIJSON_LICENSE_FILES = LICENSE -- 2.34.1 From peter at korsgaard.com Sun Feb 27 17:28:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 18:28:42 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/go: security bump to 1.17.7 Message-ID: <20220227172057.3F81382DF0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=beb91a11f70421218930c31cffb801d25a9a266a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x go1.17.7 includes security fixes to the crypto/elliptic, math/big packages and to the go command, as well as bug fixes to the compiler, linker, runtime, the go command, and the debug/macho, debug/pe, and net/http/httptest packages. https://github.com/golang/go/issues?q=milestone%3AGo1.17.7+label%3ACherryPickApproved Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard (cherry picked from commit 362b2822eea66b0775d9eba94d22c85939d2c8c9) 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 9111c8c9aa..fdf342e602 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://golang.org/dl/ -sha256 4dc1bbf3ff61f0c1ff2b19355e6d88151a70126268a47c761477686ef94748c8 go1.17.6.src.tar.gz +sha256 c108cd33b73b1911a02b697741df3dea43e01a5c4e08e409e8b3a0e3745d2b4d go1.17.7.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 062bec378c..56a21dfe55 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.17.6 +GO_VERSION = 1.17.7 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From peter at korsgaard.com Sun Feb 27 17:33:18 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 18:33:18 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/go: security bump to 1.16.14 Message-ID: <20220227172612.C6A4B82E00@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b7ed73bcda079346fb1858d4f8e8e5c193b5d517 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x go1.16.14 includes security fixes to the crypto/elliptic, math/big packages and to the go command, as well as bug fixes to the compiler, linker, runtime, the go command, and the debug/macho, debug/pe, net/http/httptest, and testing packages. 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 7071fcd99d..b4d4e05e3c 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://golang.org/dl/ -sha256 b0926654eaeb01ef43816638f42d7b1681f2d3f41b9559f07735522b7afad41a go1.16.13.src.tar.gz +sha256 467898cd3a216de54dcb9014f541efe77e9b79a7154dbc1fd2dd778b0c63fb56 go1.16.14.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index cac83c65ff..cc57d0d86d 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.16.13 +GO_VERSION = 1.16.14 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From peter at korsgaard.com Sun Feb 27 17:35:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 18:35:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/go: security bump to 1.17.7 In-Reply-To: <877da1sr8x.fsf@dell.be.48ers.dk> (Peter Korsgaard's message of "Fri, 11 Feb 2022 10:10:38 +0100") References: <20220210235906.23355-1-christian@paral.in> <877da1sr8x.fsf@dell.be.48ers.dk> Message-ID: <87czj843i1.fsf@dell.be.48ers.dk> >>>>> "Christian" == Christian Stewart writes: >> go1.17.7 includes security fixes to the crypto/elliptic, math/big packages and >> to the go command, as well as bug fixes to the compiler, linker, runtime, the go >> command, and the debug/macho, debug/pe, and net/http/httptest packages. >> https://github.com/golang/go/issues?q=milestone%3AGo1.17.7+label%3ACherryPickApproved >> Signed-off-by: Christian Stewart Committed to 2021.11.x, thanks. For 2021.02.x I will instead bump to 1.16.14. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 27 17:37:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 18:37:49 +0100 Subject: [Buildroot] [PATCH] docs/manual/adding-packages-generic: remove useless carriage return In-Reply-To: <20220211052629.2289507-1-giulio.benetti@benettiengineering.com> (Giulio Benetti's message of "Fri, 11 Feb 2022 06:26:29 +0100") References: <20220211052629.2289507-1-giulio.benetti@benettiengineering.com> Message-ID: <878rtw43de.fsf@dell.be.48ers.dk> >>>>> "Giulio" == Giulio Benetti writes: > Signed-off-by: Giulio Benetti Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 27 17:41:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 18:41:10 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/casync: fix zstd dependency to correct package name Message-ID: <20220227173324.80EBE813A8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1b949740731be09fba6c1c5a90a07ecf68ede60e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Nuno Goncalves Signed-off-by: Peter Korsgaard (cherry picked from commit 807bf505f42997f98f8acb7c7046ca5f97df08bb) Signed-off-by: Peter Korsgaard --- package/casync/casync.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/casync/casync.mk b/package/casync/casync.mk index d74cb1bfe8..bb9bd8ccac 100644 --- a/package/casync/casync.mk +++ b/package/casync/casync.mk @@ -40,8 +40,8 @@ else CASYNC_CONF_OPTS += -Dudev=false endif -ifeq ($(BR2_PACKAGE_LIBZSTD),y) -CASYNC_DEPENDENCIES += libzstd +ifeq ($(BR2_PACKAGE_ZSTD),y) +CASYNC_DEPENDENCIES += zstd CASYNC_CONF_OPTS += -Dlibzstd=enabled else CASYNC_CONF_OPTS += -Dlibzstd=disabled From peter at korsgaard.com Sun Feb 27 17:37:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 18:37:19 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] docs/manual/adding-packages-generic: remove useless carriage return Message-ID: <20220227173324.78B7C83235@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b52ed0eaf493393d1646756f5b1ace27c18f9df6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard (cherry picked from commit a3529b8020a8c8b61d9eadc455f38ce892a7c6f3) Signed-off-by: Peter Korsgaard --- docs/manual/adding-packages-generic.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt index 2201d4385e..0ae401de98 100644 --- a/docs/manual/adding-packages-generic.txt +++ b/docs/manual/adding-packages-generic.txt @@ -314,8 +314,7 @@ not and can not work as people would expect it should: 13:45+01" see "man cvs" for further details). ** +git+ for retrieving source code from a Git repository. Used by default when +LIBFOO_SITE+ begins with +git://+. The downloaded - source code is cached as with the +svn+ - method. + source code is cached as with the +svn+ method. ** +hg+ for retrieving source code from a Mercurial repository. One 'must' specify +LIBFOO_SITE_METHOD=hg+ when +LIBFOO_SITE+ contains a Mercurial repository URL. The downloaded source code From peter at korsgaard.com Sun Feb 27 17:41:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 18:41:24 +0100 Subject: [Buildroot] [PATCH] package/casync: fix zstd dependency to correct package name In-Reply-To: ("Nuno =?utf-8?Q?Gon=C3=A7alves=22's?= message of "Fri, 11 Feb 2022 18:22:03 +0000") References: Message-ID: <874k4k437f.fsf@dell.be.48ers.dk> >>>>> "Nuno" == Nuno Gon?alves writes: > Signed-off-by: Nuno Goncalves Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 27 17:40:59 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 18:40:59 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/casync: fix zstd dependency to correct package name Message-ID: <20220227173329.39530832D1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=953e0595f8f1e6a1c94d612dcde0027f89014692 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Nuno Goncalves Signed-off-by: Peter Korsgaard (cherry picked from commit 807bf505f42997f98f8acb7c7046ca5f97df08bb) Signed-off-by: Peter Korsgaard --- package/casync/casync.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/casync/casync.mk b/package/casync/casync.mk index d74cb1bfe8..bb9bd8ccac 100644 --- a/package/casync/casync.mk +++ b/package/casync/casync.mk @@ -40,8 +40,8 @@ else CASYNC_CONF_OPTS += -Dudev=false endif -ifeq ($(BR2_PACKAGE_LIBZSTD),y) -CASYNC_DEPENDENCIES += libzstd +ifeq ($(BR2_PACKAGE_ZSTD),y) +CASYNC_DEPENDENCIES += zstd CASYNC_CONF_OPTS += -Dlibzstd=enabled else CASYNC_CONF_OPTS += -Dlibzstd=disabled From peter at korsgaard.com Sun Feb 27 17:37:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 18:37:26 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] docs/manual/adding-packages-generic: remove useless carriage return Message-ID: <20220227173329.2D6D583235@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=49d3d2eea1238c369574e7f15d84698e7328f4fe branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard (cherry picked from commit a3529b8020a8c8b61d9eadc455f38ce892a7c6f3) Signed-off-by: Peter Korsgaard --- docs/manual/adding-packages-generic.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt index 2d8a1a71ce..1416aaa75b 100644 --- a/docs/manual/adding-packages-generic.txt +++ b/docs/manual/adding-packages-generic.txt @@ -314,8 +314,7 @@ not and can not work as people would expect it should: 13:45+01" see "man cvs" for further details). ** +git+ for retrieving source code from a Git repository. Used by default when +LIBFOO_SITE+ begins with +git://+. The downloaded - source code is cached as with the +svn+ - method. + source code is cached as with the +svn+ method. ** +hg+ for retrieving source code from a Mercurial repository. One 'must' specify +LIBFOO_SITE_METHOD=hg+ when +LIBFOO_SITE+ contains a Mercurial repository URL. The downloaded source code From peter at korsgaard.com Sun Feb 27 17:51:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 18:51:34 +0100 Subject: [Buildroot] [PATCH 1/2] package/thermald: update URL in the docs In-Reply-To: <20220131024451.2580165-1-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 30 Jan 2022 23:44:50 -0300") References: <20220131024451.2580165-1-ricardo.martincoski@gmail.com> Message-ID: <87zgmc2o61.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Old project homepage was removed, so switch to github, already in use to > download the sources. > Signed-off-by: Ricardo Martincoski > --- > This commit can be backported to maintenance branches Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 27 17:51:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 18:51:07 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/thermald: update URL in the docs Message-ID: <20220227174413.EC86382DFE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1a3eb64243d45ab457d3a1a44ed30517125f260c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Old project homepage was removed, so switch to github, already in use to download the sources. Signed-off-by: Ricardo Martincoski Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 1ddced072abefa001a10df56b9820e96db1b2b6f) Signed-off-by: Peter Korsgaard --- package/thermald/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/thermald/Config.in b/package/thermald/Config.in index f32a4b274e..8950e939b3 100644 --- a/package/thermald/Config.in +++ b/package/thermald/Config.in @@ -14,7 +14,7 @@ config BR2_PACKAGE_THERMALD reaches a certain threshold, the Linux daemon activates various cooling methods to try to cool the system. - https://01.org/linux-thermal-daemon + https://github.com/intel/thermal_daemon comment "thermald needs a toolchain w/ C++, wchar, threads" depends on BR2_i386 || BR2_x86_64 From peter at korsgaard.com Sun Feb 27 17:50:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 18:50:56 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/thermald: update URL in the docs Message-ID: <20220227174419.A74D182DFE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d5658ab951023d3f2a9a8bdd34de19a41e087bd1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Old project homepage was removed, so switch to github, already in use to download the sources. Signed-off-by: Ricardo Martincoski Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 1ddced072abefa001a10df56b9820e96db1b2b6f) Signed-off-by: Peter Korsgaard --- package/thermald/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/thermald/Config.in b/package/thermald/Config.in index f32a4b274e..8950e939b3 100644 --- a/package/thermald/Config.in +++ b/package/thermald/Config.in @@ -14,7 +14,7 @@ config BR2_PACKAGE_THERMALD reaches a certain threshold, the Linux daemon activates various cooling methods to try to cool the system. - https://01.org/linux-thermal-daemon + https://github.com/intel/thermal_daemon comment "thermald needs a toolchain w/ C++, wchar, threads" depends on BR2_i386 || BR2_x86_64 From peter at korsgaard.com Sun Feb 27 19:16:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:16:51 +0100 Subject: [Buildroot] [PATCH 1/1] linux: build after wireless-regdb if enabled for early loading support In-Reply-To: <20220131202151.937124-1-joerg.krause@embedded.rocks> (=?utf-8?Q?=22J=C3=B6rg?= Krause"'s message of "Mon, 31 Jan 2022 20:21:51 +0000") References: <20220131202151.937124-1-joerg.krause@embedded.rocks> Message-ID: <87v8x02k7w.fsf@dell.be.48ers.dk> >>>>> "J?rg" == J?rg Krause writes: > 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 Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 27 19:24:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:24:33 +0100 Subject: [Buildroot] [PATCH 1/2 v2] boot/uboot: fix build with host-gcc 10+ In-Reply-To: <79dd83642a7b1964ed69d74c4b0f93eada940a4e.1643665029.git.yann.morin.1998@free.fr> (Yann E. MORIN's message of "Mon, 31 Jan 2022 22:38:08 +0100") References: <79dd83642a7b1964ed69d74c4b0f93eada940a4e.1643665029.git.yann.morin.1998@free.fr> Message-ID: <87r17o2jv2.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > 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) Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 27 19:24:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:24:39 +0100 Subject: [Buildroot] [PATCH 2/2 v2] linux: fix build with host-gcc 10+ In-Reply-To: (Yann E. MORIN's message of "Mon, 31 Jan 2022 22:38:09 +0100") References: Message-ID: <87mtic2juw.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > 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) Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 27 19:19:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:19:38 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] linux: build after wireless-regdb if enabled for early loading support Message-ID: <20220227191953.DAA8B82E00@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=56ad2d9976da18da554eef71580417a08a62615f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x 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. The dependency is harmless if CONFIG_EXTRA_FIRMWARE isn't actually set. Signed-off-by: J??rg Krause Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit de0f5ba17a15a87bc16a6d6aa318104510c38f9d) Signed-off-by: Peter Korsgaard --- linux/linux.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/linux/linux.mk b/linux/linux.mk index adde7a2c1d..db0c311adf 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -78,7 +78,8 @@ LINUX_MAKE_ENV = \ LINUX_INSTALL_IMAGES = YES LINUX_DEPENDENCIES = host-kmod \ - $(if $(BR2_PACKAGE_INTEL_MICROCODE),intel-microcode) + $(if $(BR2_PACKAGE_INTEL_MICROCODE),intel-microcode) \ + $(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 From peter at korsgaard.com Sun Feb 27 19:22:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:22:26 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] linux: fix build with host-gcc 10+ Message-ID: <20220227191953.EA8E5835F9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2b3e41c8e3163f3ce5c6589283c19a5e3aea28ec branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x 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 Linux 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) Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 9b41b54be07711c10ad13ce157be272ed1cf402e) Signed-off-by: Peter Korsgaard --- linux/linux.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/linux/linux.mk b/linux/linux.mk index db0c311adf..490f87ee66 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -266,6 +266,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 peter at korsgaard.com Sun Feb 27 19:22:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:22:22 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] boot/uboot: fix build with host-gcc 10+ Message-ID: <20220227191953.E1F9181D49@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6db9ca0c34bdfcd33b5921c363b57cec0f465893 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x 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) Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 3b3859cc7df8edce10e5b4dad9005bd05342c8c3) Signed-off-by: Peter Korsgaard --- boot/uboot/uboot.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index ec2114c584..9f409583ab 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -209,6 +209,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) From peter at korsgaard.com Sun Feb 27 19:16:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:16:39 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] linux: build after wireless-regdb if enabled for early loading support Message-ID: <20220227192002.6D9888212C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e91440b904a6bae850a503f0938f833a5691d951 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x 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. The dependency is harmless if CONFIG_EXTRA_FIRMWARE isn't actually set. Signed-off-by: J??rg Krause Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit de0f5ba17a15a87bc16a6d6aa318104510c38f9d) Signed-off-by: Peter Korsgaard --- linux/linux.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/linux/linux.mk b/linux/linux.mk index b047061c3d..960a4ebd63 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 From peter at korsgaard.com Sun Feb 27 19:22:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:22:15 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] linux: fix build with host-gcc 10+ Message-ID: <20220227192002.7D577835F9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9ca49fba1a45ca1f7d9aa22ec005f6056d1d9af5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x 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 Linux 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) Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 9b41b54be07711c10ad13ce157be272ed1cf402e) Signed-off-by: Peter Korsgaard --- linux/linux.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/linux/linux.mk b/linux/linux.mk index 960a4ebd63..7eacb22998 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -260,6 +260,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 peter at korsgaard.com Sun Feb 27 19:22:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:22:05 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] boot/uboot: fix build with host-gcc 10+ Message-ID: <20220227192002.755708349D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=701ce0ad69580854076df85eaa1b8db3da51e20f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x 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) Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 3b3859cc7df8edce10e5b4dad9005bd05342c8c3) Signed-off-by: Peter Korsgaard --- boot/uboot/uboot.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 9661f901ea..0765e66c4a 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -238,6 +238,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) From peter at korsgaard.com Sun Feb 27 19:45:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:45:20 +0100 Subject: [Buildroot] [git commit] package/util-linux: improve host build failure fix In-Reply-To: <20220212215455.A6588825B3@busybox.osuosl.org> (Arnout Vandecappelle's message of "Sat, 12 Feb 2022 23:01:45 +0100") References: <20220212215455.A6588825B3@busybox.osuosl.org> Message-ID: <87ilt02iwf.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) writes: > commit: https://git.buildroot.net/buildroot/commit/?id=498117df1261c582ca70851c8a4f58db95632f2c > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > As suggested by Peter Seiderer package util-linux doesn't need raw support > when built for host, so let's remove: > HOST_UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE > in favor of: > HOST_UTIL_LINUX_CONF_OPTS += --disable-raw > This is a better approach than my commit: > https://git.buildroot.net/buildroot/commit/?id=d895bd973b35fde10d3dd7db530d9e4782926497 > Suggested-by: Peter Seiderer > Tested-by: Peter Seiderer > Reviewed-by: Peter Seiderer > Signed-off-by: Giulio Benetti > 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 Sun Feb 27 19:34:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:34:38 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/util-linux/util-linux-libs: add a missing patch Message-ID: <20220227193728.3DABF83611@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b7179080ca9b0d9c7f8933050325bb4a5d13123b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.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 Sun Feb 27 19:34:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:34:00 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/util-linux: fix build with headers < 3.14 Message-ID: <20220227193728.2B4E1836B3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=67d948e4a21126e0321bad8b2713e0db255b330d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix the following build failure raised since bump to version 2.37.2 in commit 27a46793b1a0c6c13c00b07d07bd5743e2c9c7b6 and the addition of uclampset in https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/commit/?id=9dd95bea42a3b467c1f773fd2e781cc9f0d88847: checking for syscall sched_setattr... no configure: WARNING: Unable to detect syscall sched_setattr. checking for syscall sched_setattr... (cached) no configure: WARNING: Unable to detect syscall sched_setattr. configure: error: uclampset selected but sched_setattr syscall not found Fix this build failure by adding a dependency on headers >= 3.14 for scheduling utilities: https://github.com/torvalds/linux/commit/e6cfc0295c7d51b008999a8b13a44fb43f8685ea Fixes: - http://autobuild.buildroot.org/results/9fe26ab98c93b67f937293f28625843da7ccb77f Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 2033992ac079c38ed3c2d38eb693d345fb0d5c89) Signed-off-by: Peter Korsgaard --- package/linux-tools/Config.in | 6 ++++-- package/util-linux/Config.in | 6 +++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/package/linux-tools/Config.in b/package/linux-tools/Config.in index ceb58c668a..f459b41762 100644 --- a/package/linux-tools/Config.in +++ b/package/linux-tools/Config.in @@ -83,6 +83,7 @@ config BR2_PACKAGE_LINUX_TOOLS_SELFTESTS depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # bash depends on BR2_USE_MMU # bash depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 # util-linux schedutils select BR2_PACKAGE_LINUX_TOOLS select BR2_PACKAGE_BASH # runtime select BR2_PACKAGE_NCURSES @@ -104,9 +105,10 @@ config BR2_PACKAGE_LINUX_TOOLS_SELFTESTS This is very much a use at your risk option and may not work for every setup or every architecture. -comment "selftests needs BR2_PACKAGE_BUSYBOX_SHOW_OTHERS and a toolchain w/ dynamic library" +comment "selftests needs BR2_PACKAGE_BUSYBOX_SHOW_OTHERS and a toolchain w/ dynamic library and headers >= 3.14" depends on BR2_USE_MMU - depends on !BR2_PACKAGE_BUSYBOX_SHOW_OTHERS || BR2_STATIC_LIBS + depends on !BR2_PACKAGE_BUSYBOX_SHOW_OTHERS || \ + BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 config BR2_PACKAGE_LINUX_TOOLS_TMON bool "tmon" diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in index 1f33eb5514..1dc00d21d9 100644 --- a/package/util-linux/Config.in +++ b/package/util-linux/Config.in @@ -326,8 +326,12 @@ comment "runuser needs a uClibc or glibc toolchain w/ wchar, locale, dynamic lib config BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS bool "scheduling utilities" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 help - Scheduling utilities (chrt, ionice, taskset) + Scheduling utilities (chrt, ionice, taskset, uclampset) + +comment "scheduling utilities need a toolchain w/ headers >= 3.14" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 config BR2_PACKAGE_UTIL_LINUX_SETPRIV bool "setpriv" From peter at korsgaard.com Sun Feb 27 19:34:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:34:50 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/util-linux: bump version to 2.37.3 (fixes CVE-2021-3996, CVE-2021-3995) Message-ID: <20220227193728.45A23836B3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=307f91968d2b7e7c6f005326e23664939e1600df branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x - add 'touch' workaround for missing disk-utils/raw.8 file ([1], [2]) in util-linux-2.37.3 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 [Arnout: put fix in POST_PATCH instead of PRE_COMPILE hook] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit b292f1d41a8734b6cdcbcf2ae726b51f9e1338a9) Signed-off-by: Peter Korsgaard --- 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..e59ef7dadc 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) @@ -35,6 +35,13 @@ UTIL_LINUX_CONF_OPTS += \ UTIL_LINUX_LINK_LIBS = $(TARGET_NLS_LIBS) +# workaround missing disk-utils/raw.8 file in util-linux-2.37.3 +# release download package +define UTIL_LINUX_FIX_DISK_UTILS_COMPILE + touch $(@D)/disk-utils/raw.8 +endef +UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE + HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf # We also don't want the host-python dependency From peter at korsgaard.com Sun Feb 27 19:33:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:33:22 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/util-linux: fix libuuid build Message-ID: <20220227193728.21FFE83611@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=757a02e0498f349f9bb5bd1be274c9599418c402 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix the following build failure raised since bump to version 2.37.2 in commit 27a46793b1a0c6c13c00b07d07bd5743e2c9c7b6 and https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/commit/?id=33b09aebf505acfbbb2137319093fbb9ed7eea7d libuuid/src/unparse.c:42:73: error: expected ';', ',' or ')' before 'fmt' static void uuid_fmt(const uuid_t uuid, char *buf, char const *restrict fmt) ^ Fixes: - http://autobuild.buildroot.org/results/b931a34a47e5faf8ae48fce079747dea0db2563a Signed-off-by: Fabrice Fontaine [yann.morin.1998 at free.fr: use symlink for util-linux-libs patch] Signed-off-by: Yann E. MORIN (cherry picked from commit 1b4fc24d656e157b03bd9ef844320ea99494bafe) Signed-off-by: Peter Korsgaard --- ...uid-include-c-h-to-cover-restrict-keyword.patch | 30 ++++++++++++++++++++++ ...uid-include-c-h-to-cover-restrict-keyword.patch | 1 + 2 files changed, 31 insertions(+) diff --git a/package/util-linux/0001-libuuid-include-c-h-to-cover-restrict-keyword.patch b/package/util-linux/0001-libuuid-include-c-h-to-cover-restrict-keyword.patch new file mode 100644 index 0000000000..3b4f510920 --- /dev/null +++ b/package/util-linux/0001-libuuid-include-c-h-to-cover-restrict-keyword.patch @@ -0,0 +1,30 @@ +From 5f9b88f43ba7f98f81bde3538d5f4e5cd1a6c01c Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Thu, 5 Aug 2021 09:46:21 +0200 +Subject: libuuid: include c.h to cover restrict keyword + +References: https://github.com/karelzak/util-linux/issues/1405 +Signed-off-by: Karel Zak + +[Retrieved from: +https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/commit/?id=5f9b88f43ba7f98f81bde3538d5f4e5cd1a6c01c] +Signed-off-by: Fabrice Fontaine +--- + libuuid/src/unparse.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libuuid/src/unparse.c b/libuuid/src/unparse.c +index f9a5e4315..ffeed2ed6 100644 +--- a/libuuid/src/unparse.c ++++ b/libuuid/src/unparse.c +@@ -33,6 +33,7 @@ + */ + + #include ++#include "c.h" + + #include "uuidP.h" + +-- +cgit 1.2.3-1.el7 + diff --git a/package/util-linux/util-linux-libs/0001-libuuid-include-c-h-to-cover-restrict-keyword.patch b/package/util-linux/util-linux-libs/0001-libuuid-include-c-h-to-cover-restrict-keyword.patch new file mode 120000 index 0000000000..beecc3a48f --- /dev/null +++ b/package/util-linux/util-linux-libs/0001-libuuid-include-c-h-to-cover-restrict-keyword.patch @@ -0,0 +1 @@ +../0001-libuuid-include-c-h-to-cover-restrict-keyword.patch \ No newline at end of file From peter at korsgaard.com Sun Feb 27 19:31:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:31:56 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/util-linux: bump to version 2.37.2 Message-ID: <20220227193728.18A84827CC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b5db0f1921c6bd722e8ad0e66b050bedab7167c9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fixes CVE-2021-37600 (although the CVE is disputed). Signed-off-by: Adam Duskett [yann.morin.1998 at free.fr: add reference to the CVE] Signed-off-by: Yann E. MORIN (cherry picked from commit 27a46793b1a0c6c13c00b07d07bd5743e2c9c7b6) Signed-off-by: Peter Korsgaard --- package/util-linux/util-linux.hash | 4 ++-- package/util-linux/util-linux.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/util-linux/util-linux.hash b/package/util-linux/util-linux.hash index 3f9fe39818..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.36/sha256sums.asc -sha256 f7516ba9d8689343594356f0e5e1a5f0da34adfbc89023437735872bb5024c5f util-linux-2.36.2.tar.xz +# From https://www.kernel.org/pub/linux/utils/util-linux/v2.37/sha256sums.asc +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 4bc7a11294..cf0fee409b 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -7,7 +7,7 @@ # When making changes to this file, please check if # util-linux-libs/util-linux-libs.mk needs to be updated accordingly as well. -UTIL_LINUX_VERSION_MAJOR = 2.36 +UTIL_LINUX_VERSION_MAJOR = 2.37 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 peter at korsgaard.com Sun Feb 27 19:35:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:35:00 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/util-linux: fix host build failure Message-ID: <20220227193728.4E7F3827CC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=af705b14a91b2c025d36e77f2f876abc3602835d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x The UTIL_LINUX_FIX_DISK_UTILS_COMPILE workaround is needed for host building too. So let's add it to HOST_UTIL_LINUX_POST_PATCH_HOOKS. host-util-linux is used a lot, so this patch fixes a lot of future builds. Fixes: http://autobuild.buildroot.net/results/b8c/b8cb40efc036a01802c914544cd4fc29dfd67af6// Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit d895bd973b35fde10d3dd7db530d9e4782926497) Signed-off-by: Peter Korsgaard --- package/util-linux/util-linux.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index e59ef7dadc..5a4ff64d01 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -41,6 +41,7 @@ define UTIL_LINUX_FIX_DISK_UTILS_COMPILE touch $(@D)/disk-utils/raw.8 endef UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE +HOST_UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf From peter at korsgaard.com Sun Feb 27 19:35:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:35:08 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/util-linux: improve host build failure fix Message-ID: <20220227193728.56241827CC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=baf475e84743d2f97b657e220f9bff10f3ee4c70 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x As suggested by Peter Seiderer package util-linux doesn't need raw support when built for host, so let's remove: HOST_UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE in favor of: HOST_UTIL_LINUX_CONF_OPTS += --disable-raw This is a better approach than my commit: https://git.buildroot.net/buildroot/commit/?id=d895bd973b35fde10d3dd7db530d9e4782926497 Suggested-by: Peter Seiderer Tested-by: Peter Seiderer Reviewed-by: Peter Seiderer Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 498117df1261c582ca70851c8a4f58db95632f2c) Signed-off-by: Peter Korsgaard --- package/util-linux/util-linux.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 5a4ff64d01..40fd518a58 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -41,7 +41,6 @@ define UTIL_LINUX_FIX_DISK_UTILS_COMPILE touch $(@D)/disk-utils/raw.8 endef UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE -HOST_UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf @@ -202,6 +201,11 @@ HOST_UTIL_LINUX_CONF_OPTS += \ --without-ncursesw \ --without-tinfo +# Disable raw command since starting from version 2.37 needs a +# work-around to build but in the end we don't need at all. +HOST_UTIL_LINUX_CONF_OPTS += \ + --disable-raw + ifeq ($(BR2_PACKAGE_HOST_UTIL_LINUX),y) HOST_UTIL_LINUX_CONF_OPTS += --disable-makeinstall-chown # disable commands that have ncurses dependency, as well as From peter at korsgaard.com Sun Feb 27 19:34:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:34:24 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/util-linux: fix mount -a Message-ID: <20220227193728.34582827CC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=477fa607517c892e21e5d667457276a250d12819 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fixes: - https://bugs.buildroot.org/show_bug.cgi?id=14351 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 2f5068640161f7b267099e28b69d4c2280b4ded3) Signed-off-by: Peter Korsgaard --- ...mark-cache-as-probed-if-sys-not-available.patch | 141 +++++++++++++++++++++ 1 file changed, 141 insertions(+) diff --git a/package/util-linux/0002-libblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch b/package/util-linux/0002-libblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch new file mode 100644 index 0000000000..bfc8f60834 --- /dev/null +++ b/package/util-linux/0002-libblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch @@ -0,0 +1,141 @@ +From 84d38ae3eca523ef990cb848563cc63de25266e6 Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Fri, 19 Nov 2021 14:19:03 +0100 +Subject: [PATCH] libblkid: don't mark cache as "probed" if /sys not available + +For "mount --all" we need to read the cache more than once in a short +time. The library checks the delay between probes, and if the delay is +too short, it does not read devices. This is a problem on boot when there +are no /sys, and the cache is empty. In this case, we need to check +for /sys until it's available constantly. + +https://github.com/util-linux/util-linux/issues/1492 +Signed-off-by: Karel Zak + +[Retrieved from: +https://github.com/util-linux/util-linux/commit/84d38ae3eca523ef990cb848563cc63de25266e6] +Signed-off-by: Fabrice Fontaine +--- + libblkid/src/devname.c | 26 +++++++++++++++++--------- + libblkid/src/resolve.c | 2 +- + libblkid/src/tag.c | 8 +++++--- + 3 files changed, 23 insertions(+), 13 deletions(-) + +diff --git a/libblkid/src/devname.c b/libblkid/src/devname.c +index 90a8245fc9..9a173e3489 100644 +--- a/libblkid/src/devname.c ++++ b/libblkid/src/devname.c +@@ -429,6 +429,8 @@ sysfs_probe_all(blkid_cache cache, int only_if_new, int only_removable) + if (!sysfs) + return -BLKID_ERR_SYSFS; + ++ DBG(DEVNAME, ul_debug(" probe /sys/block")); ++ + /* scan /sys/block */ + while ((dev = xreaddir(sysfs))) { + DIR *dir = NULL; +@@ -533,14 +535,18 @@ sysfs_probe_all(blkid_cache cache, int only_if_new, int only_removable) + /* + * Read the device data for all available block devices in the system. + */ +-static int probe_all(blkid_cache cache, int only_if_new) ++static int probe_all(blkid_cache cache, int only_if_new, int update_interval) + { ++ int rc; ++ + if (!cache) + return -BLKID_ERR_PARAM; + + if (cache->bic_flags & BLKID_BIC_FL_PROBED && +- time(NULL) - cache->bic_time < BLKID_PROBE_INTERVAL) ++ time(NULL) - cache->bic_time < BLKID_PROBE_INTERVAL) { ++ DBG(PROBE, ul_debug("don't re-probe [delay < %d]", BLKID_PROBE_INTERVAL)); + return 0; ++ } + + blkid_read_cache(cache); + #ifdef VG_DIR +@@ -548,7 +554,13 @@ static int probe_all(blkid_cache cache, int only_if_new) + #endif + ubi_probe_all(cache, only_if_new); + +- sysfs_probe_all(cache, only_if_new, 0); ++ rc = sysfs_probe_all(cache, only_if_new, 0); ++ ++ /* Don't mark the change as "probed" if /sys not avalable */ ++ if (update_interval && rc == 0) { ++ cache->bic_time = time(NULL); ++ cache->bic_flags |= BLKID_BIC_FL_PROBED; ++ } + + blkid_flush_cache(cache); + return 0; +@@ -567,11 +579,7 @@ int blkid_probe_all(blkid_cache cache) + int ret; + + DBG(PROBE, ul_debug("Begin blkid_probe_all()")); +- ret = probe_all(cache, 0); +- if (ret == 0) { +- cache->bic_time = time(NULL); +- cache->bic_flags |= BLKID_BIC_FL_PROBED; +- } ++ ret = probe_all(cache, 0, 1); + DBG(PROBE, ul_debug("End blkid_probe_all() [rc=%d]", ret)); + return ret; + } +@@ -589,7 +597,7 @@ int blkid_probe_all_new(blkid_cache cache) + int ret; + + DBG(PROBE, ul_debug("Begin blkid_probe_all_new()")); +- ret = probe_all(cache, 1); ++ ret = probe_all(cache, 1, 0); + DBG(PROBE, ul_debug("End blkid_probe_all_new() [rc=%d]", ret)); + return ret; + } +diff --git a/libblkid/src/resolve.c b/libblkid/src/resolve.c +index 641b022860..16653fa8e1 100644 +--- a/libblkid/src/resolve.c ++++ b/libblkid/src/resolve.c +@@ -32,7 +32,7 @@ char *blkid_get_tag_value(blkid_cache cache, const char *tagname, + blkid_cache c = cache; + char *ret = NULL; + +- DBG(TAG, ul_debug("looking for %s on %s", tagname, devname)); ++ DBG(TAG, ul_debug("looking for tag %s on %s device", tagname, devname)); + + if (!devname) + return NULL; +diff --git a/libblkid/src/tag.c b/libblkid/src/tag.c +index 390a648648..178336505f 100644 +--- a/libblkid/src/tag.c ++++ b/libblkid/src/tag.c +@@ -326,14 +326,14 @@ blkid_dev blkid_find_dev_with_tag(blkid_cache cache, + blkid_dev dev; + int pri; + struct list_head *p; +- int probe_new = 0; ++ int probe_new = 0, probe_all = 0; + + if (!cache || !type || !value) + return NULL; + + blkid_read_cache(cache); + +- DBG(TAG, ul_debug("looking for %s=%s in cache", type, value)); ++ DBG(TAG, ul_debug("looking for tag %s=%s in cache", type, value)); + + try_again: + pri = -1; +@@ -366,9 +366,11 @@ blkid_dev blkid_find_dev_with_tag(blkid_cache cache, + goto try_again; + } + +- if (!dev && !(cache->bic_flags & BLKID_BIC_FL_PROBED)) { ++ if (!dev && !probe_all ++ && !(cache->bic_flags & BLKID_BIC_FL_PROBED)) { + if (blkid_probe_all(cache) < 0) + return NULL; ++ probe_all++; + goto try_again; + } + return dev; From peter at korsgaard.com Sun Feb 27 19:29:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:29:58 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/util-linux: fix host build failure Message-ID: <20220227193733.4787283611@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f34fcc03cf5e401f8f8ccd7a433e87e0e875880a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x The UTIL_LINUX_FIX_DISK_UTILS_COMPILE workaround is needed for host building too. So let's add it to HOST_UTIL_LINUX_POST_PATCH_HOOKS. host-util-linux is used a lot, so this patch fixes a lot of future builds. Fixes: http://autobuild.buildroot.net/results/b8c/b8cb40efc036a01802c914544cd4fc29dfd67af6// Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit d895bd973b35fde10d3dd7db530d9e4782926497) Signed-off-by: Peter Korsgaard --- package/util-linux/util-linux.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index e59ef7dadc..5a4ff64d01 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -41,6 +41,7 @@ define UTIL_LINUX_FIX_DISK_UTILS_COMPILE touch $(@D)/disk-utils/raw.8 endef UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE +HOST_UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf From peter at korsgaard.com Sun Feb 27 19:29:48 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:29:48 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/util-linux: bump version to 2.37.3 (fixes CVE-2021-3996, CVE-2021-3995) Message-ID: <20220227193733.3F9B5827CC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8c97451ab93a90313ca97b87183632d22b00ffae branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x - add 'touch' workaround for missing disk-utils/raw.8 file ([1], [2]) in util-linux-2.37.3 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 [Arnout: put fix in POST_PATCH instead of PRE_COMPILE hook] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit b292f1d41a8734b6cdcbcf2ae726b51f9e1338a9) Signed-off-by: Peter Korsgaard --- 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..e59ef7dadc 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) @@ -35,6 +35,13 @@ UTIL_LINUX_CONF_OPTS += \ UTIL_LINUX_LINK_LIBS = $(TARGET_NLS_LIBS) +# workaround missing disk-utils/raw.8 file in util-linux-2.37.3 +# release download package +define UTIL_LINUX_FIX_DISK_UTILS_COMPILE + touch $(@D)/disk-utils/raw.8 +endef +UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE + HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf # We also don't want the host-python dependency From peter at korsgaard.com Sun Feb 27 19:30:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:30:07 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/util-linux: improve host build failure fix Message-ID: <20220227193733.4F566836B3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3e7238e9d132cc8e048dea3e31744a044836f128 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x As suggested by Peter Seiderer package util-linux doesn't need raw support when built for host, so let's remove: HOST_UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE in favor of: HOST_UTIL_LINUX_CONF_OPTS += --disable-raw This is a better approach than my commit: https://git.buildroot.net/buildroot/commit/?id=d895bd973b35fde10d3dd7db530d9e4782926497 Suggested-by: Peter Seiderer Tested-by: Peter Seiderer Reviewed-by: Peter Seiderer Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 498117df1261c582ca70851c8a4f58db95632f2c) Signed-off-by: Peter Korsgaard --- package/util-linux/util-linux.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 5a4ff64d01..40fd518a58 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -41,7 +41,6 @@ define UTIL_LINUX_FIX_DISK_UTILS_COMPILE touch $(@D)/disk-utils/raw.8 endef UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE -HOST_UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf @@ -202,6 +201,11 @@ HOST_UTIL_LINUX_CONF_OPTS += \ --without-ncursesw \ --without-tinfo +# Disable raw command since starting from version 2.37 needs a +# work-around to build but in the end we don't need at all. +HOST_UTIL_LINUX_CONF_OPTS += \ + --disable-raw + ifeq ($(BR2_PACKAGE_HOST_UTIL_LINUX),y) HOST_UTIL_LINUX_CONF_OPTS += --disable-makeinstall-chown # disable commands that have ncurses dependency, as well as From peter at korsgaard.com Sun Feb 27 19:52:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:52:36 +0100 Subject: [Buildroot] [PATCH 2/2] DEVELOPERS: add Giulio Benetti to cryptsetup package In-Reply-To: <20220201173352.160244-2-giulio.benetti@benettiengineering.com> (Giulio Benetti's message of "Tue, 1 Feb 2022 18:33:52 +0100") References: <20220201173352.160244-1-giulio.benetti@benettiengineering.com> <20220201173352.160244-2-giulio.benetti@benettiengineering.com> Message-ID: <87ee3o2ikb.fsf@dell.be.48ers.dk> >>>>> "Giulio" == Giulio Benetti writes: > Signed-off-by: Giulio Benetti Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 27 19:53:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:53:24 +0100 Subject: [Buildroot] [PATCH] DEVELOPERS: remove Martin Hicks from file In-Reply-To: <20220201174202.286878-1-giulio.benetti@benettiengineering.com> (Giulio Benetti's message of "Tue, 1 Feb 2022 18:42:02 +0100") References: <20220201174202.286878-1-giulio.benetti@benettiengineering.com> Message-ID: <87a6ec2iiz.fsf@dell.be.48ers.dk> >>>>> "Giulio" == Giulio Benetti writes: > Martin Hicks asked to not maintain cryptsetup anymore: > https://lists.buildroot.org/pipermail/buildroot/2022-February/635413.html > Also he doesn't mantain any other package, so let's remove him from this > file. > Signed-off-by: Giulio Benetti Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From nunojpg at gmail.com Sun Feb 27 19:54:14 2022 From: nunojpg at gmail.com (=?UTF-8?Q?Nuno_Gon=C3=A7alves?=) Date: Sun, 27 Feb 2022 19:54:14 +0000 Subject: [Buildroot] [PATCH] package/rauc: only install systemd service if built with dbus/service support Message-ID: The systemd service will try to call rauc in service mode, so it is useless and will fail if rauc does not have such support Signed-off-by: Nuno Gon?alves --- package/rauc/rauc.mk | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/package/rauc/rauc.mk b/package/rauc/rauc.mk index 39f5255812..d29ef66046 100644 --- a/package/rauc/rauc.mk +++ b/package/rauc/rauc.mk @@ -15,6 +15,15 @@ RAUC_DEPENDENCIES = host-pkgconf openssl libglib2 ifeq ($(BR2_PACKAGE_RAUC_DBUS),y) RAUC_CONF_OPTS += --enable-service RAUC_DEPENDENCIES += dbus +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +# configure uses pkg-config --variable=systemdsystemunitdir systemd +RAUC_DEPENDENCIES += systemd +define RAUC_INSTALL_INIT_SYSTEMD + mkdir -p $(TARGET_DIR)/usr/lib/systemd/system/rauc.service.d + printf '[Install]\nWantedBy=multi-user.target\n' \ + >$(TARGET_DIR)/usr/lib/systemd/system/rauc.service.d/buildroot-enable.conf +endef +endif else RAUC_CONF_OPTS += --disable-service endif @@ -33,17 +42,6 @@ else RAUC_CONF_OPTS += --disable-json endif -ifeq ($(BR2_PACKAGE_SYSTEMD),y) -# configure uses pkg-config --variable=systemdsystemunitdir systemd -RAUC_DEPENDENCIES += systemd -endif - -define RAUC_INSTALL_INIT_SYSTEMD - mkdir -p $(TARGET_DIR)/usr/lib/systemd/system/rauc.service.d - printf '[Install]\nWantedBy=multi-user.target\n' \ - >$(TARGET_DIR)/usr/lib/systemd/system/rauc.service.d/buildroot-enable.conf -endef - HOST_RAUC_DEPENDENCIES = \ host-pkgconf \ host-openssl \ -- 2.32.0 From peter at korsgaard.com Sun Feb 27 19:58:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:58:24 +0100 Subject: [Buildroot] [PATCH] board/intel/galileo: fix build failure with host gcc 10 In-Reply-To: <20220202214357.2640301-1-giulio.benetti@benettiengineering.com> (Giulio Benetti's message of "Wed, 2 Feb 2022 22:43:57 +0100") References: <20220202214357.2640301-1-giulio.benetti@benettiengineering.com> Message-ID: <875yp02ian.fsf@dell.be.48ers.dk> >>>>> "Giulio" == Giulio Benetti writes: > Building galileo_defconfig throws error: > ``` > /usr/bin/ld: arch/x86/tools/relocs_64.o:(.bss+0x0): multiple > definition of `per_cpu_load_addr'; > arch/x86/tools/relocs_32.o:(.bss+0x0): first defined here > ``` > To fix this let's add an upstreamed patch[1] and add BR2_GLOBAL_PATCH_DIR > to galileo_defconfig to point to where patch is. > [1]: > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=eeeda4cd06e828b331b15741a204ff9f5874d28d.patch > Fixes: > https://gitlab.com/ymorin/buildroot/-/jobs/2035821039 > Signed-off-by: Giulio Benetti Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 27 20:02:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 21:02:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/mpd: ignore CVE-2020-746[56] intended for FreeBSD PPP daemon In-Reply-To: <20220203094746.22715-1-br015@umbiko.net> (Andreas Ziegler's message of "Thu, 3 Feb 2022 10:47:46 +0100") References: <20220203094746.22715-1-br015@umbiko.net> Message-ID: <871qzo2i3z.fsf@dell.be.48ers.dk> >>>>> "Andreas" == Andreas Ziegler writes: > cpe:2.3:a:mpd_project:mpd:*:*:*:*:*:*:*:* is not a valid CPE > identifier for mpd (musicpd.org); this string refers to > MPD /FreeBSD PPP daemon (sourceforge.net/projects/mpd) > Since mpd does not have entries in the CVE database, put these > two CVE identifiers on the mpd ignore list: > https://nvd.nist.gov/vuln/detail/CVE-2020-7465 > https://nvd.nist.gov/vuln/detail/CVE-2020-7466 > Signed-off-by: Andreas Ziegler Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 27 19:53:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:53:03 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] DEVELOPERS: remove Martin Hicks from file Message-ID: <20220227195637.1849B83611@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=af251fb0e9c7d67c196bcd121814fcd275190f1f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Martin Hicks asked to not maintain cryptsetup anymore: https://lists.buildroot.org/pipermail/buildroot/2022-February/635413.html Also he doesn't mantain any other package, so let's remove him from this file. Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit d06bf4a9d73e7a05e651e737e26abac86080878e) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 3 --- 1 file changed, 3 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 0a7845a155..1370495a84 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1691,9 +1691,6 @@ F: package/rpi-wifi-firmware/ F: package/tzdata/ F: package/zic/ -N: Martin Hicks -F: package/cryptsetup/ - N: Martin Kepplinger F: package/tslib/ F: package/x11r7/xdriver_xf86-input-tslib/ From peter at korsgaard.com Sun Feb 27 19:52:29 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:52:29 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] DEVELOPERS: add Giulio Benetti to cryptsetup package Message-ID: <20220227195637.0F4DB82B3F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2a9bd16cbf946b71aaca3ca99ba811ec97d117f7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit a5e72ca9e7e490c2f94c574b29f34d17cc79d816) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index bd8c99a229..0a7845a155 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1024,6 +1024,7 @@ F: configs/asus_tinker_rk3288_defconfig F: configs/olimex_a* F: package/at/ F: package/binutils/ +F: package/cryptsetup/ F: package/erlang-jiffy/ F: package/gcc/ F: package/harfbuzz/ From peter at korsgaard.com Sun Feb 27 19:58:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:58:10 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] board/intel/galileo: fix build failure with host gcc 10 Message-ID: <20220227195637.2027B836B3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=358b9a9a0b5900ee2e76dbecb2937cd5b04eea12 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Building galileo_defconfig throws error: ``` /usr/bin/ld: arch/x86/tools/relocs_64.o:(.bss+0x0): multiple definition of `per_cpu_load_addr'; arch/x86/tools/relocs_32.o:(.bss+0x0): first defined here ``` To fix this let's add an upstreamed patch[1] and add BR2_GLOBAL_PATCH_DIR to galileo_defconfig to point to where patch is. [1]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=eeeda4cd06e828b331b15741a204ff9f5874d28d.patch Fixes: https://gitlab.com/ymorin/buildroot/-/jobs/2035821039 Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 9dd5382d791c3d5197b9ef401a0d103ad1457d5d) Signed-off-by: Peter Korsgaard --- ...-x86-relocs-Make-per_cpu_load_addr-static.patch | 39 ++++++++++++++++++++++ configs/galileo_defconfig | 1 + 2 files changed, 40 insertions(+) diff --git a/board/intel/galileo/patches/linux/0001-x86-relocs-Make-per_cpu_load_addr-static.patch b/board/intel/galileo/patches/linux/0001-x86-relocs-Make-per_cpu_load_addr-static.patch new file mode 100644 index 0000000000..1d206cc6d1 --- /dev/null +++ b/board/intel/galileo/patches/linux/0001-x86-relocs-Make-per_cpu_load_addr-static.patch @@ -0,0 +1,39 @@ +From eeeda4cd06e828b331b15741a204ff9f5874d28d Mon Sep 17 00:00:00 2001 +From: Ben Hutchings +Date: Wed, 24 Sep 2014 13:30:12 +0100 +Subject: [PATCH] x86/relocs: Make per_cpu_load_addr static + +per_cpu_load_addr is only used for 64-bit relocations, but is +declared in both configurations of relocs.c - with different +types. This has undefined behaviour in general. GNU ld is +documented to use the larger size in this case, but other tools +may differ and some warn about this. + +References: https://bugs.debian.org/748577 +Reported-by: Michael Tautschnig +Signed-off-by: Ben Hutchings +Cc: 748577 at bugs.debian.org +Cc: Linus Torvalds +Link: http://lkml.kernel.org/r/1411561812.3659.23.camel at decadent.org.uk +Signed-off-by: Ingo Molnar +Signed-off-by: Giulio Benetti +--- + arch/x86/tools/relocs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c +index bbb1d2259ecf..a5efb21d5228 100644 +--- a/arch/x86/tools/relocs.c ++++ b/arch/x86/tools/relocs.c +@@ -695,7 +695,7 @@ static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel, + * + */ + static int per_cpu_shndx = -1; +-Elf_Addr per_cpu_load_addr; ++static Elf_Addr per_cpu_load_addr; + + static void percpu_init(void) + { +-- +2.25.1 + diff --git a/configs/galileo_defconfig b/configs/galileo_defconfig index 03ca23f414..a8fd0a6dcc 100644 --- a/configs/galileo_defconfig +++ b/configs/galileo_defconfig @@ -1,4 +1,5 @@ BR2_x86_x1000=y +BR2_GLOBAL_PATCH_DIR=board/intel/galileo/patches # Needed for TARGET_GRUB2 BR2_TOOLCHAIN_BUILDROOT_WCHAR=y # Linux headers same as kernel, a 3.14 series From peter at korsgaard.com Sun Feb 27 20:02:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 21:02:09 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/mpd: ignore CVE-2020-746[56] intended for FreeBSD PPP daemon Message-ID: <20220227195637.2A36982B3F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1eb88d25b1ee3ca890da9965fa15ec4e473144cf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x cpe:2.3:a:mpd_project:mpd:*:*:*:*:*:*:*:* is not a valid CPE identifier for mpd (musicpd.org); this string refers to MPD /FreeBSD PPP daemon (sourceforge.net/projects/mpd) Since mpd does not have entries in the CVE database, put these two CVE identifiers on the mpd ignore list: https://nvd.nist.gov/vuln/detail/CVE-2020-7465 https://nvd.nist.gov/vuln/detail/CVE-2020-7466 Signed-off-by: Andreas Ziegler Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 210e6bd55991497c45eb3a6baf9ed0c20a88067c) Signed-off-by: Peter Korsgaard --- package/mpd/mpd.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index 06dc7e15d7..05aa7153b5 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -11,6 +11,8 @@ MPD_SITE = http://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR) MPD_DEPENDENCIES = host-pkgconf boost MPD_LICENSE = GPL-2.0+ MPD_LICENSE_FILES = COPYING +# these refer to the FreeBSD PPP daemon +MPD_IGNORE_CVES = CVE-2020-7465 CVE-2020-7466 MPD_CONF_OPTS = \ -Daudiofile=disabled \ -Ddocumentation=disabled From peter at korsgaard.com Sun Feb 27 19:52:25 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:52:25 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] DEVELOPERS: add Giulio Benetti to cryptsetup package Message-ID: <20220227195643.9569D82B3F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9d48687bb245c5c120b5f9df82ea471b80a62997 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit a5e72ca9e7e490c2f94c574b29f34d17cc79d816) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 2cc5a12ef9..5b34f93d22 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1056,6 +1056,7 @@ F: configs/asus_tinker_rk3288_defconfig F: configs/olimex_a* F: package/at/ F: package/binutils/ +F: package/cryptsetup/ F: package/erlang-jiffy/ F: package/gcc/ F: package/harfbuzz/ From peter at korsgaard.com Sun Feb 27 20:01:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 21:01:28 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/mpd: ignore CVE-2020-746[56] intended for FreeBSD PPP daemon Message-ID: <20220227195643.B49B7811CF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8ab26921c23da19f38a7f1e40a7e758546b5e58b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x cpe:2.3:a:mpd_project:mpd:*:*:*:*:*:*:*:* is not a valid CPE identifier for mpd (musicpd.org); this string refers to MPD /FreeBSD PPP daemon (sourceforge.net/projects/mpd) Since mpd does not have entries in the CVE database, put these two CVE identifiers on the mpd ignore list: https://nvd.nist.gov/vuln/detail/CVE-2020-7465 https://nvd.nist.gov/vuln/detail/CVE-2020-7466 Signed-off-by: Andreas Ziegler Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 210e6bd55991497c45eb3a6baf9ed0c20a88067c) Signed-off-by: Peter Korsgaard --- package/mpd/mpd.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index e105352b80..0902c02809 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -11,6 +11,8 @@ MPD_SITE = http://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR) MPD_DEPENDENCIES = host-pkgconf boost MPD_LICENSE = GPL-2.0+ MPD_LICENSE_FILES = COPYING +# these refer to the FreeBSD PPP daemon +MPD_IGNORE_CVES = CVE-2020-7465 CVE-2020-7466 MPD_SELINUX_MODULES = mpd MPD_CONF_OPTS = \ -Daudiofile=disabled \ From peter at korsgaard.com Sun Feb 27 19:53:12 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:53:12 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] DEVELOPERS: remove Martin Hicks from file Message-ID: <20220227195643.9F5D683611@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3a1d44dfa0580ae203aa0ce19c613f7a8a610160 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Martin Hicks asked to not maintain cryptsetup anymore: https://lists.buildroot.org/pipermail/buildroot/2022-February/635413.html Also he doesn't mantain any other package, so let's remove him from this file. Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit d06bf4a9d73e7a05e651e737e26abac86080878e) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 3 --- 1 file changed, 3 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 5b34f93d22..8422fad579 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1757,9 +1757,6 @@ F: package/rpi-wifi-firmware/ F: package/tzdata/ F: package/zic/ -N: Martin Hicks -F: package/cryptsetup/ - N: Martin Kepplinger F: package/tslib/ F: package/x11r7/xdriver_xf86-input-tslib/ From peter at korsgaard.com Sun Feb 27 19:58:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 20:58:15 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] board/intel/galileo: fix build failure with host gcc 10 Message-ID: <20220227195643.A883F82B3F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0cc9eed5d452fe1f083203447d7869ecf8d9f927 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Building galileo_defconfig throws error: ``` /usr/bin/ld: arch/x86/tools/relocs_64.o:(.bss+0x0): multiple definition of `per_cpu_load_addr'; arch/x86/tools/relocs_32.o:(.bss+0x0): first defined here ``` To fix this let's add an upstreamed patch[1] and add BR2_GLOBAL_PATCH_DIR to galileo_defconfig to point to where patch is. [1]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=eeeda4cd06e828b331b15741a204ff9f5874d28d.patch Fixes: https://gitlab.com/ymorin/buildroot/-/jobs/2035821039 Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 9dd5382d791c3d5197b9ef401a0d103ad1457d5d) Signed-off-by: Peter Korsgaard --- ...-x86-relocs-Make-per_cpu_load_addr-static.patch | 39 ++++++++++++++++++++++ configs/galileo_defconfig | 1 + 2 files changed, 40 insertions(+) diff --git a/board/intel/galileo/patches/linux/0001-x86-relocs-Make-per_cpu_load_addr-static.patch b/board/intel/galileo/patches/linux/0001-x86-relocs-Make-per_cpu_load_addr-static.patch new file mode 100644 index 0000000000..1d206cc6d1 --- /dev/null +++ b/board/intel/galileo/patches/linux/0001-x86-relocs-Make-per_cpu_load_addr-static.patch @@ -0,0 +1,39 @@ +From eeeda4cd06e828b331b15741a204ff9f5874d28d Mon Sep 17 00:00:00 2001 +From: Ben Hutchings +Date: Wed, 24 Sep 2014 13:30:12 +0100 +Subject: [PATCH] x86/relocs: Make per_cpu_load_addr static + +per_cpu_load_addr is only used for 64-bit relocations, but is +declared in both configurations of relocs.c - with different +types. This has undefined behaviour in general. GNU ld is +documented to use the larger size in this case, but other tools +may differ and some warn about this. + +References: https://bugs.debian.org/748577 +Reported-by: Michael Tautschnig +Signed-off-by: Ben Hutchings +Cc: 748577 at bugs.debian.org +Cc: Linus Torvalds +Link: http://lkml.kernel.org/r/1411561812.3659.23.camel at decadent.org.uk +Signed-off-by: Ingo Molnar +Signed-off-by: Giulio Benetti +--- + arch/x86/tools/relocs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c +index bbb1d2259ecf..a5efb21d5228 100644 +--- a/arch/x86/tools/relocs.c ++++ b/arch/x86/tools/relocs.c +@@ -695,7 +695,7 @@ static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel, + * + */ + static int per_cpu_shndx = -1; +-Elf_Addr per_cpu_load_addr; ++static Elf_Addr per_cpu_load_addr; + + static void percpu_init(void) + { +-- +2.25.1 + diff --git a/configs/galileo_defconfig b/configs/galileo_defconfig index 03ca23f414..a8fd0a6dcc 100644 --- a/configs/galileo_defconfig +++ b/configs/galileo_defconfig @@ -1,4 +1,5 @@ BR2_x86_x1000=y +BR2_GLOBAL_PATCH_DIR=board/intel/galileo/patches # Needed for TARGET_GRUB2 BR2_TOOLCHAIN_BUILDROOT_WCHAR=y # Linux headers same as kernel, a 3.14 series From peter at korsgaard.com Sun Feb 27 20:13:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 21:13:54 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] docs/manual: fix "+size = +" latex formatting Message-ID: <20220227201037.C2C958275A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e3fdd722744ba0403e2faafbd34038ba0a6eb7b9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 46beca0656505e9a9d4d5d17d22f40550ac487c6) Signed-off-by: Peter Korsgaard --- docs/manual/writing-rules.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/manual/writing-rules.txt b/docs/manual/writing-rules.txt index 28cb0fe4f1..7e2b5f909c 100644 --- a/docs/manual/writing-rules.txt +++ b/docs/manual/writing-rules.txt @@ -184,7 +184,7 @@ image sdimage.img { * Every node(+section+, +partition+, +file+, +subnode+) must have an open curly bracket on the same line of the node's name, while the closing one must be on a newline and after it a newline must be added except for the - last one node. Same goes for its option, for example option +size = +. + last one node. Same goes for its option, for example option +size+ +=+. * Every +option+(i.e. +image+, +offset+, +size+) must have the +=+ assignment one space from it and one space from the value specified. From peter at korsgaard.com Sun Feb 27 20:24:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 21:24:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/resiprocate: fix build of rend with gcc 11 In-Reply-To: <20220208182929.3976984-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 8 Feb 2022 19:29:29 +0100") References: <20220208182929.3976984-1-fontaine.fabrice@gmail.com> Message-ID: <87wnhg12jc.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure of rend with gcc 11: > /home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/riscv32-buildroot-linux-gnu/include/c++/11.2.0/bits/stl_tree.h:770:15: error: static assertion failed: comparison object must be invocable as const > 770 | is_invocable_v, > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > Fixes: > - http://autobuild.buildroot.org/results/ad9d89fefe1a667daa123397a072bf130bfa03a7 > Signed-off-by: Fabrice Fontaine Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 27 20:26:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 21:26:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-regex: fix license In-Reply-To: <20220206220814.2580975-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 6 Feb 2022 23:08:14 +0100") References: <20220206220814.2580975-1-fontaine.fabrice@gmail.com> Message-ID: <87sfs412fs.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > License is Apache-2.0 since bump to version 2021.4.4 in commit > d973fac7ca2e7c0c4864e8045e5205764e84c45b and > https://github.com/mrabarnett/mrab-regex/commit/b693a1fba731a9aa0dc6ae37b441267d4b7b0419 > Signed-off-by: Fabrice Fontaine Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 27 20:25:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 21:25:46 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/python-regex: fix license Message-ID: <20220227201849.CD6D0836B3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=57fb6f520180cbe458fbf2c2b95efe2b7bec7d04 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x License is Apache-2.0 since bump to version 2021.4.4 in commit d973fac7ca2e7c0c4864e8045e5205764e84c45b and https://github.com/mrabarnett/mrab-regex/commit/b693a1fba731a9aa0dc6ae37b441267d4b7b0419 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 261bb9a17a21439e9688b07de1b8edf89f8eae31) Signed-off-by: Peter Korsgaard --- package/python-regex/python-regex.hash | 2 ++ package/python-regex/python-regex.mk | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/package/python-regex/python-regex.hash b/package/python-regex/python-regex.hash index 4749cd6167..b0f5bb05da 100644 --- a/package/python-regex/python-regex.hash +++ b/package/python-regex/python-regex.hash @@ -1,3 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/regex/json md5 cd206281327b4c087bb20bf93cee4ab9 regex-2021.4.4.tar.gz sha256 52ba3d3f9b942c49d7e4bc105bb28551c44065f139a65062ab7912bef10c9afb regex-2021.4.4.tar.gz +# Locally computed sha256 checksums +sha256 bff55ef4cdcc8c14ce259f8e8ab60e264418440d6335f4dc138273fbd506144d LICENSE.txt diff --git a/package/python-regex/python-regex.mk b/package/python-regex/python-regex.mk index c46c4d1614..4019bcdd3e 100644 --- a/package/python-regex/python-regex.mk +++ b/package/python-regex/python-regex.mk @@ -9,6 +9,7 @@ PYTHON_REGEX_VERSION = 2021.4.4 PYTHON_REGEX_SOURCE = regex-$(PYTHON_REGEX_VERSION).tar.gz PYTHON_REGEX_SITE = https://files.pythonhosted.org/packages/38/3f/4c42a98c9ad7d08c16e7d23b2194a0e4f3b2914662da8bc88986e4e6de1f PYTHON_REGEX_SETUP_TYPE = setuptools -PYTHON_REGEX_LICENSE = CNRI-Python +PYTHON_REGEX_LICENSE = Apache-2.0 +PYTHON_REGEX_LICENSE_FILES = LICENSE.txt $(eval $(python-package)) From peter at korsgaard.com Sun Feb 27 20:20:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 21:20:49 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/kodi: add bluetooth dependency comment Message-ID: <20220227201849.BC4AE826D4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eb84d088075262610b321cbcbee9498f6d46cf98 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Commit 43122d64e05a2831a96dabcbf149ba199726767f forgot to add bluetooth dependency comment Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 38b5f2069bbe029c62594095a02f915552dc28c2) Signed-off-by: Peter Korsgaard --- package/kodi/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/kodi/Config.in b/package/kodi/Config.in index af7604428e..c81868cd85 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -134,6 +134,10 @@ config BR2_PACKAGE_KODI_BLUEZ help Enable bluetooth support +comment "bluetooth support needs a toolchain w/ headers >= 3.4" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 + config BR2_PACKAGE_KODI_DBUS bool "dbus" select BR2_PACKAGE_DBUS From peter at korsgaard.com Sun Feb 27 20:23:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 21:23:55 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/resiprocate: fix build of rend with gcc 11 Message-ID: <20220227201849.C53C083611@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b8caff2cf25d7c92785e7d50348eb9577cf63d20 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix the following build failure of rend with gcc 11: /home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/riscv32-buildroot-linux-gnu/include/c++/11.2.0/bits/stl_tree.h:770:15: error: static assertion failed: comparison object must be invocable as const 770 | is_invocable_v, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/ad9d89fefe1a667daa123397a072bf130bfa03a7 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit a715593d944ac4f64e56a6d5778374e7388af23d) Signed-off-by: Peter Korsgaard --- ...x-some-issue-compiling-with-Visual-Studio.patch | 95 ++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/package/resiprocate/0001-Fix-some-issue-compiling-with-Visual-Studio.patch b/package/resiprocate/0001-Fix-some-issue-compiling-with-Visual-Studio.patch new file mode 100644 index 0000000000..0efe0d9cfb --- /dev/null +++ b/package/resiprocate/0001-Fix-some-issue-compiling-with-Visual-Studio.patch @@ -0,0 +1,95 @@ +From be76b10a50749e2e11dce8dcc38b414a7f9d8747 Mon Sep 17 00:00:00 2001 +From: Ben Walden +Date: Sat, 22 Aug 2020 23:14:11 +0100 +Subject: [PATCH] Fix some issue compiling with Visual Studio 16.7.0 and tidy + up Visual Studio 16 project files + +[Retrieved (and updated to keep only RendKa.cxx update) from: +https://github.com/resiprocate/resiprocate/commit/be76b10a50749e2e11dce8dcc38b414a7f9d8747] +Signed-off-by: Fabrice Fontaine +--- + VisualStudioReadme.htm | 65 + + contrib/GeoIP/GeoIP_12_0.vcxproj | 550 ------- + contrib/GeoIP/GeoIP_16_0.vcxproj | 93 +- + .../db/build_windows/db_static_12_0.vcxproj | 1260 ----------------- + .../db/build_windows/db_static_16_0.vcxproj | 696 +-------- + contrib/db/dbinc/atomic.h | 4 +- + contrib/db/mp/mp_fget.c | 4 +- + contrib/db/mp/mp_mvcc.c | 4 +- + contrib/db/mp/mp_region.c | 4 +- + contrib/db/mutex/mut_method.c | 2 +- + contrib/pcre/pcre_12_0.vcxproj | 466 ------ + contrib/pcre/pcre_16_0.vcxproj | 159 +-- + contrib/popt/popt_12_0.vcxproj | 394 ------ + contrib/popt/popt_16_0.vcxproj | 120 +- + reSIProcate_16_0.sln | 58 +- + .../queuetostream_12_0.vcxproj | 582 -------- + .../queuetostream_16_0.vcxproj | 207 ++- + repro/repro_12_0.vcxproj | 825 ----------- + repro/repro_12_0.vcxproj.filters | 47 - + repro/repro_16_0.vcxproj | 159 ++- + repro/reprocmd/reprocmd_12_0.vcxproj | 597 -------- + repro/reprocmd/reprocmd_16_0.vcxproj | 139 +- + repro/reprolib_12_0.vcxproj | 596 -------- + repro/reprolib_12_0.vcxproj.filters | 136 -- + repro/reprolib_16_0.vcxproj | 132 +- + resip/dum/dum_12_0.vcxproj | 615 -------- + resip/dum/dum_16_0.vcxproj | 124 +- + resip/dum/test/basicCall_12_0.vcxproj | 621 -------- + resip/dum/test/basicCall_16_0.vcxproj | 145 +- + resip/dum/test/basicClient_12_0.vcxproj | 653 --------- + resip/dum/test/basicClient_16_0.vcxproj | 158 +-- + resip/dum/test/basicMessage_12_0.vcxproj | 615 -------- + resip/dum/test/basicMessage_16_0.vcxproj | 141 +- + resip/dum/test/basicRegister_12_0.vcxproj | 615 -------- + resip/dum/test/basicRegister_16_0.vcxproj | 137 +- + resip/rend/RendKa.cxx | 2 +- + resip/rend/rend_12_0.vcxproj | 352 ----- + resip/rend/rend_16_0.vcxproj | 89 +- + resip/stack/resiprocate_12_0.vcxproj | 873 ------------ + resip/stack/resiprocate_12_0.vcxproj.filters | 351 ----- + resip/stack/resiprocate_16_0.vcxproj | 165 ++- + resip/stack/test/test_12_0.vcxproj | 627 -------- + resip/stack/test/test_16_0.vcxproj | 171 ++- + rutil/dns/ares/ares_12_0.vcxproj | 488 ------- + rutil/dns/ares/ares_12_0.vcxproj.filters | 34 - + rutil/dns/ares/ares_16_0.vcxproj | 159 +-- + rutil/rutil_12_0.vcxproj | 604 -------- + rutil/rutil_16_0.vcxproj | 153 +- + 48 files changed, 1409 insertions(+), 13782 deletions(-) + delete mode 100644 contrib/GeoIP/GeoIP_12_0.vcxproj + delete mode 100644 contrib/db/build_windows/db_static_12_0.vcxproj + delete mode 100644 contrib/pcre/pcre_12_0.vcxproj + delete mode 100644 contrib/popt/popt_12_0.vcxproj + delete mode 100644 repro/accountingconsumers/queuetostream_12_0.vcxproj + delete mode 100644 repro/repro_12_0.vcxproj + delete mode 100644 repro/repro_12_0.vcxproj.filters + delete mode 100644 repro/reprocmd/reprocmd_12_0.vcxproj + delete mode 100644 repro/reprolib_12_0.vcxproj + delete mode 100644 repro/reprolib_12_0.vcxproj.filters + delete mode 100644 resip/dum/dum_12_0.vcxproj + delete mode 100644 resip/dum/test/basicCall_12_0.vcxproj + delete mode 100644 resip/dum/test/basicClient_12_0.vcxproj + delete mode 100644 resip/dum/test/basicMessage_12_0.vcxproj + delete mode 100644 resip/dum/test/basicRegister_12_0.vcxproj + delete mode 100644 resip/rend/rend_12_0.vcxproj + delete mode 100644 resip/stack/resiprocate_12_0.vcxproj + delete mode 100644 resip/stack/resiprocate_12_0.vcxproj.filters + delete mode 100644 resip/stack/test/test_12_0.vcxproj + delete mode 100644 rutil/dns/ares/ares_12_0.vcxproj + delete mode 100644 rutil/dns/ares/ares_12_0.vcxproj.filters + delete mode 100644 rutil/rutil_12_0.vcxproj + +diff --git a/resip/rend/RendKa.cxx b/resip/rend/RendKa.cxx +index 8645f17636..8321ada1ee 100644 +--- a/resip/rend/RendKa.cxx ++++ b/resip/rend/RendKa.cxx +@@ -66,7 +66,7 @@ bool operator<(const RendKaAssoc& a, const RendKaAssoc& b) + + struct RendKaConn + { +- bool operator() (const RendKaAssocPtr& a, const RendKaAssocPtr& b) ++ bool operator()(const RendKaAssocPtr& a, const RendKaAssocPtr& b) const + { + return *a < *b; + } From peter at korsgaard.com Sun Feb 27 20:21:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 21:21:03 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/kodi: add bluetooth dependency comment Message-ID: <20220227201858.29601826D4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=73c19ff97adcd7166bf8658928608104503dff5c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Commit 43122d64e05a2831a96dabcbf149ba199726767f forgot to add bluetooth dependency comment Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 38b5f2069bbe029c62594095a02f915552dc28c2) Signed-off-by: Peter Korsgaard --- package/kodi/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/kodi/Config.in b/package/kodi/Config.in index 72cdbabf89..b7fd85ab33 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -140,6 +140,10 @@ config BR2_PACKAGE_KODI_BLUEZ help Enable bluetooth support +comment "bluetooth support needs a toolchain w/ headers >= 3.4" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 + config BR2_PACKAGE_KODI_DBUS bool "dbus" select BR2_PACKAGE_DBUS From peter at korsgaard.com Sun Feb 27 20:33:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 21:33:27 +0100 Subject: [Buildroot] [PATCH] toolchain: fix gcc bug 99140 condition In-Reply-To: <20220206142403.1644118-1-giulio.benetti@benettiengineering.com> (Giulio Benetti's message of "Sun, 6 Feb 2022 15:24:03 +0100") References: <2fec6210-3811-197d-45a7-1ece869f49e0@benettiengineering.com> <20220206142403.1644118-1-giulio.benetti@benettiengineering.com> Message-ID: <87o82s123s.fsf@dell.be.48ers.dk> >>>>> "Giulio" == Giulio Benetti writes: > Gcc bug 99140 exhibits with gcc versions: > - up to 7.x > - 9.x > - 10.x > and doesn't show up with gcc versions: > - 8.x > - 11.x > then moving BR2_TOOLCHAIN_GCC_AT_LEAST_9 to BR2_TOOLCHAIN_GCC_AT_LEAST_10 > makes gcc version 9 set as working but it's not. So let's back substitute > BR2_TOOLCHAIN_GCC_AT_LEAST_10 with BR2_TOOLCHAIN_GCC_AT_LEAST_9. > Signed-off-by: Giulio Benetti Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 27 20:32:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 21:32:51 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] toolchain: fix gcc bug 99140 condition Message-ID: <20220227202625.3DEE6831CB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bec884cf3b507753a88c55dc1417da7693fd8e06 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Gcc bug 99140 exhibits with gcc versions: - up to 7.x - 9.x - 10.x and doesn't show up with gcc versions: - 8.x - 11.x then moving BR2_TOOLCHAIN_GCC_AT_LEAST_9 to BR2_TOOLCHAIN_GCC_AT_LEAST_10 makes gcc version 9 set as working but it's not. So let's back substitute BR2_TOOLCHAIN_GCC_AT_LEAST_10 with BR2_TOOLCHAIN_GCC_AT_LEAST_9. Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 33ea4d7887b15ccb3e11d1390c697eee531af565) Signed-off-by: Peter Korsgaard --- toolchain/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchain/Config.in b/toolchain/Config.in index f63aec6735..1792070720 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -195,7 +195,7 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_93847 config BR2_TOOLCHAIN_HAS_GCC_BUG_99140 bool default y if !BR2_TOOLCHAIN_GCC_AT_LEAST_8 - default y if BR2_TOOLCHAIN_GCC_AT_LEAST_10 && !BR2_TOOLCHAIN_GCC_AT_LEAST_11 + default y if BR2_TOOLCHAIN_GCC_AT_LEAST_9 && !BR2_TOOLCHAIN_GCC_AT_LEAST_11 depends on BR2_nios2 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101737 From peter at korsgaard.com Sun Feb 27 20:38:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 21:38:40 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] configs/roc_pc_rk3399_defconfig: expand rootfs size to 120M Message-ID: <20220227203936.3E26F822E8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a7b963628662d275fec86fe240071c204c377044 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Default 60M for rootfs are not enough and generate a build failure, so let's expand rootfs size to 120M. Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 5194113331b04c5fee1a773e1751b40bff6fdd18) Signed-off-by: Peter Korsgaard --- configs/roc_pc_rk3399_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/roc_pc_rk3399_defconfig b/configs/roc_pc_rk3399_defconfig index dfbc5e4f47..ae7cf19a80 100644 --- a/configs/roc_pc_rk3399_defconfig +++ b/configs/roc_pc_rk3399_defconfig @@ -45,7 +45,7 @@ BR2_TARGET_GENERIC_HOSTNAME="roc-rk3399-pc" BR2_TARGET_GENERIC_ISSUE="Welcome to ROC-RK3399-PC!" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="64M" +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y From peter at korsgaard.com Sun Feb 27 20:38:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Feb 2022 21:38:50 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] configs/roc_pc_rk3399_defconfig: expand rootfs size to 120M Message-ID: <20220227203951.82E53822E8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=48cea1d9be4d9193eb4571aa2143c68a7012bb29 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Default 60M for rootfs are not enough and generate a build failure, so let's expand rootfs size to 120M. Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 5194113331b04c5fee1a773e1751b40bff6fdd18) Signed-off-by: Peter Korsgaard --- configs/roc_pc_rk3399_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/roc_pc_rk3399_defconfig b/configs/roc_pc_rk3399_defconfig index dfbc5e4f47..ae7cf19a80 100644 --- a/configs/roc_pc_rk3399_defconfig +++ b/configs/roc_pc_rk3399_defconfig @@ -45,7 +45,7 @@ BR2_TARGET_GENERIC_HOSTNAME="roc-rk3399-pc" BR2_TARGET_GENERIC_ISSUE="Welcome to ROC-RK3399-PC!" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="64M" +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y From t123yh.xyz at gmail.com Mon Feb 28 02:28:40 2022 From: t123yh.xyz at gmail.com (Yunhao Tian) Date: Mon, 28 Feb 2022 10:28:40 +0800 Subject: [Buildroot] [PATCH] package/shairport-sync: install dbus policy file to target Message-ID: <20220228022840.2140908-1-t123yh.xyz@gmail.com> This adds two extra commands to install dbus policy config to target if dbus option is enabled. Signed-off-by: Yunhao Tian --- package/shairport-sync/shairport-sync.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package/shairport-sync/shairport-sync.mk b/package/shairport-sync/shairport-sync.mk index 487e0c05e5..ab67da3964 100644 --- a/package/shairport-sync/shairport-sync.mk +++ b/package/shairport-sync/shairport-sync.mk @@ -59,6 +59,14 @@ endif ifeq ($(BR2_PACKAGE_SHAIRPORT_SYNC_DBUS),y) SHAIRPORT_SYNC_DEPENDENCIES += libglib2 SHAIRPORT_SYNC_CONF_OPTS += --with-dbus-interface --with-mpris-interface +define SHAIRPORT_SYNC_INSTALL_DBUS + $(INSTALL) -m 0644 -D \ + $(@D)/scripts/shairport-sync-dbus-policy.conf \ + $(TARGET_DIR)/etc/dbus-1/system.d/shairport-sync-dbus.conf + $(INSTALL) -m 0644 -D \ + $(@D)/scripts/shairport-sync-mpris-policy.conf \ + $(TARGET_DIR)/etc/dbus-1/system.d/shairport-sync-mpris.conf +endef else SHAIRPORT_SYNC_CONF_OPTS += --without-dbus-interface --without-mpris-interface endif @@ -77,11 +85,13 @@ else SHAIRPORT_SYNC_CONF_OPTS += --without-mqtt-client endif + define SHAIRPORT_SYNC_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0755 $(@D)/shairport-sync \ $(TARGET_DIR)/usr/bin/shairport-sync $(INSTALL) -D -m 0644 $(@D)/scripts/shairport-sync.conf \ $(TARGET_DIR)/etc/shairport-sync.conf + $(SHAIRPORT_SYNC_INSTALL_DBUS) endef define SHAIRPORT_SYNC_INSTALL_INIT_SYSV -- 2.25.1 From thomas.petazzoni at bootlin.com Mon Feb 28 07:18:40 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 28 Feb 2022 07:18:40 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-02-27 Message-ID: <20220228071848.C6A53605AE@smtp3.osuosl.org> Hello, Autobuild statistics for 2022-02-27 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 46 | 2 | 0 | 48 | 2021.11.x | 19 | 0 | 0 | 19 | master | 47 | 35 | 0 | 82 | Classification of failures by reason for master ----------------------------------------------- host-libselinux-3.3 | 7 frr-8.1 | 5 python-greenlet-1.1.2 | 4 bpftool-v6.7.0 | 3 tovid-87c676f4aadb7303d2cd9... | 3 bluez5_utils-5.63 | 2 wavemon-0.9.4 | 2 boinc-7.18.1 | 1 linux-pam-1.5.2 | 1 mongodb-4.2.18 | 1 ndisc6-1.0.5 | 1 safeclib-3.7.1 | 1 sconeserver-6b932d7d8dbb700... | 1 target-finalize | 1 unknown | 1 wpa_supplicant-2.10 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/2be1b97d0497c626bf6b51495eb1c64747a18390 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/127860f924fcd63e5bb989fa883856e5e15711df | arm | boinc-7.18.1 | NOK | http://autobuild.buildroot.net/results/232dae62570ed7927a10864d83dccaf9b6214500 | i686 | bpftool-v6.7.0 | NOK | http://autobuild.buildroot.net/results/d4335bbed4379591e34fc8f901267ad84f69bc02 | arm | bpftool-v6.7.0 | NOK | http://autobuild.buildroot.net/results/226ff089d3c4f67f4d18f1f8984c4b44ae624ee6 | sparc | bpftool-v6.7.0 | NOK | http://autobuild.buildroot.net/results/f5ac0401e96c16ab3ad26a4854130fd79d2b9e03 | microblazeel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/b620485e70f87fca5ced87bba7ae07bcf361ebd4 | aarch64 | frr-8.1 | NOK | http://autobuild.buildroot.net/results/c0754fea1a77fce6e560f368b57763c32f1cebad | xtensa | frr-8.1 | NOK | http://autobuild.buildroot.net/results/f05d377869240d0c0a7d71ca59c3401afdec2a0b | mips64el | frr-8.1 | NOK | http://autobuild.buildroot.net/results/107c26957b01d27cc6565dd4dee6f6e6b2d409eb | aarch64 | frr-8.1 | NOK | http://autobuild.buildroot.net/results/9db98bf667ff7cab59b3d82cc95c340e2ee2d7e5 | nios2 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/a0fdbc1ad057281a172b4729c6725bc766c9d92e | m68k | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/3ae7258b21884a18250754151db8cb6b50020ae6 | i686 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/4b5eb069216145f3940fc2286075e94ca8acb64f | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/89a7b6e159d3b0767b3cb8d29224d2f0e6563ac1 | aarch64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/8badb1e985cef3821f1aac13f3af1294bd26b1ed | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/5ed207ae64eeefc5c2d88359a60482fe2671be61 | mips64el | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/02e7a50ce24cd0d1294811aa6714f4dbf8f730dd | m68k | linux-pam-1.5.2 | NOK | http://autobuild.buildroot.net/results/0cc90c6d1f7632b4afac8092738430ed2d565b57 | ORPH arm | mongodb-4.2.18 | NOK | http://autobuild.buildroot.net/results/93423e820dd892d28f73746b28f9d0e575a22a69 | arm | ndisc6-1.0.5 | NOK | http://autobuild.buildroot.net/results/eb5caa42e102a2587e233d0bc91cb740cfe713be | ORPH riscv64 | python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/15b5a000617aa08c3609d6db937f55ffe3d2a86d | mipsel | python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/ebdcecd37f42ff594f3d1729b54fa5b3cfeee26e | arm | python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/3cd2d7195fd8a9590de1c9a81f3d99632d609388 | mipsel | python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/8ca663b8a2ba2325056660f660ab3e0c330c79b5 | sparc64 | safeclib-3.7.1 | NOK | http://autobuild.buildroot.net/results/375db9453cc89e7fa1ffdd1021569b5979ea691c | arm | sconeserver-6b932d7d8dbb700... | NOK | http://autobuild.buildroot.net/results/aee07c870b03733bf6a7ff4090bf7761f709af92 | arm | target-finalize | NOK | http://autobuild.buildroot.net/results/ded1e60c54976e59364ca63c4410c12b187d2931 | sparc64 | tovid-87c676f4aadb7303d2cd9... | NOK | http://autobuild.buildroot.net/results/8ca015ffbdf8b74391456c21d0b838b37bfd7ce9 | arm | tovid-87c676f4aadb7303d2cd9... | NOK | http://autobuild.buildroot.net/results/7cfc8c90aea8b9268c1812456a5af4cba3263f28 | riscv32 | tovid-87c676f4aadb7303d2cd9... | NOK | http://autobuild.buildroot.net/results/1c163cc5a90a966d8e8493df7cf911add6cd235d | arm | unknown | NOK | http://autobuild.buildroot.net/results/2617b2b889cf646dda1e181645ae45a26cb76485 | mips64el | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/bf794755b49a948d5aacb13c623619aeeb3d2ce9 | arm | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/19a171641a7992ae7be9de5621b0456144344ea2 | arm | wpa_supplicant-2.10 | NOK | http://autobuild.buildroot.net/results/22e179165804cb64644a53fc22e7d17f9fadf433 | Classification of failures by reason for 2021.02.x -------------------------------------------------- httping-2.5 | 1 rocksdb-6.13.3 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- xtensa | httping-2.5 | NOK | http://autobuild.buildroot.net/results/18682858ca3eb3623e9198341574933833f32040 | powerpc | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/7a880f087656ca7a93d215236641dc31805f496b | Packages having a newer version =============================== name | found by | link to release-monitoring.org | version | upstream | orph? -------------------------------+----------+----------------------------------------------+--------------+--------------+------- ace | DISTRO | https://release-monitoring.org/project/242395 | 7.0.1 | 7.0.6 | 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.3 | 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_r32 | apparmor | DISTRO | https://release-monitoring.org/project/94819 | 3.0.3 | 3.0.4 | armadillo | DISTRO | https://release-monitoring.org/project/07006 | 9.900.2 | 10.8.2 | assimp | DISTRO | https://release-monitoring.org/project/06988 | 5.1.6 | 5.2.2 | asterisk | DISTRO | https://release-monitoring.org/project/09838 | 16.21.1 | 19.2.0 | at | DISTRO | https://release-monitoring.org/project/00127 | 3.2.4 | 3.2.5 | 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 | autoconf-archive | DISTRO | https://release-monitoring.org/project/00142 | 2021.02.19 | 2022.02.11 | 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.12 | ORPH bat | DISTRO | https://release-monitoring.org/project/241901 | 0.19.0 | 0.20.0 | batctl | DISTRO | https://release-monitoring.org/project/14740 | 2021.0 | 2022.0 | batman-adv | DISTRO | https://release-monitoring.org/project/19529 | 2021.4 | 2022.0 | bats-core | DISTRO | https://release-monitoring.org/project/10587 | 1.4.1 | 1.6.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.1.3 | ORPH bdwgc | DISTRO | https://release-monitoring.org/project/17108 | 8.0.6 | 8.2.0 | belle-sip | DISTRO | https://release-monitoring.org/project/14378 | 4.4.8 | 5.1.3 | belr | DISTRO | https://release-monitoring.org/project/80042 | 4.4.8 | 5.1.3 | 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.18.0 | ORPH binutils | DISTRO | https://release-monitoring.org/project/07981 | 2.36.1 | 2.38 | bird | DISTRO | https://release-monitoring.org/project/00192 | 2.0.8 | 2.0.9 | 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.2 | ORPH bubblewrap | DISTRO | https://release-monitoring.org/project/10937 | 0.5.0 | 0.6.1 | 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.5.0 | ORPH chartjs | DISTRO | https://release-monitoring.org/project/85785 | 2.9.4 | 3.7.1 | 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.5 | 0.104.2 | clang | DISTRO | https://release-monitoring.org/project/11811 | 9.0.1 | 13.0.1 | cmake | DISTRO | https://release-monitoring.org/project/00306 | 3.16.9 | 3.22.2 | cog | DISTRO | https://release-monitoring.org/project/21333 | 0.12.0 | 0.13.3 | containerd | DISTRO | https://release-monitoring.org/project/16460 | 1.5.9 | 1.6.0 | cukinia | DISTRO | https://release-monitoring.org/project/138119 | 0.5.1 | 0.6.0 | cups | DISTRO | https://release-monitoring.org/project/00380 | 2.4.0 | 2.4.1 | cups-filters | DISTRO | https://release-monitoring.org/project/05541 | 1.28.10 | 1.28.12 | 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 | daq3 | DISTRO | https://release-monitoring.org/project/212345 | 3.0.5 | 3.0.6 | 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.2 | datatables-responsive | DISTRO | https://release-monitoring.org/project/141591 | 2.2.3 | 2.2.9 | dbus | DISTRO | https://release-monitoring.org/project/05356 | 1.12.20 | 1.12.22 | ORPH 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.7 | ORPH delve | DISTRO | https://release-monitoring.org/project/40149 | 1.8.0 | 1.8.1 | dialog | DISTRO | https://release-monitoring.org/project/00431 | 1.3-20200327 | 1.3-20220117 | ORPH docker-compose | DISTRO | https://release-monitoring.org/project/06185 | 1.24.1 | 2.2.3 | dovecot | DISTRO | https://release-monitoring.org/project/00456 | 2.3.17.1 | 2.3.18 | drbd-utils | DISTRO | https://release-monitoring.org/project/00462 | 9.19.0 | 9.20.2 | dt | DISTRO | https://release-monitoring.org/project/21844 | 18.32 | 21.27 | ORPH duktape | DISTRO | https://release-monitoring.org/project/21345 | 2.6.0 | 2.7.0 | ed | DISTRO | https://release-monitoring.org/project/00659 | 1.17 | 1.18 | ORPH edk2 | DISTRO | https://release-monitoring.org/project/125953 | edk2-stab... | 202202 | efivar | DISTRO | https://release-monitoring.org/project/00664 | 37 | 38 | efl | DISTRO | https://release-monitoring.org/project/06128 | 1.26.1 | 1.26.2 | 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.3 | ell | DISTRO | https://release-monitoring.org/project/17781 | 0.47 | 0.49 | enlightenment | DISTRO | https://release-monitoring.org/project/00698 | 0.25.1 | 0.25.3 | erlang | DISTRO | https://release-monitoring.org/project/00707 | 22.3.4.22 | 24.2.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-jiffy | DISTRO | https://release-monitoring.org/project/09323 | 1.0.9 | 1.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.18 | 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 | exempi | DISTRO | https://release-monitoring.org/project/00767 | 2.5.2 | 2.6.1 | fakeroot | DISTRO | https://release-monitoring.org/project/12048 | 1.26 | 1.27 | ORPH 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.27 | 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.3 | flare-engine | DISTRO | https://release-monitoring.org/project/21433 | 1.12 | 1.13.04 | flare-game | DISTRO | https://release-monitoring.org/project/21434 | 1.12 | 1.13.04 | 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 | 6.0.0 | ORPH fontconfig | DISTRO | https://release-monitoring.org/project/00827 | 2.13.1 | 2.13.96 | ORPH freerdp | DISTRO | https://release-monitoring.org/project/10442 | 2.5.0 | 2.6.0 | fuse-overlayfs | DISTRO | https://release-monitoring.org/project/101220 | 1.5.0 | 1.8.2 | fwts | DISTRO | https://release-monitoring.org/project/17383 | 21.11.00 | 22.01.00 | gauche | DISTRO | https://release-monitoring.org/project/00873 | 0.9.9 | 0.9.11 | gcr | DISTRO | https://release-monitoring.org/project/11801 | 3.40.0 | 3.41.0 | ORPH gdbm | DISTRO | https://release-monitoring.org/project/00882 | 1.22 | 1.23 | 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.6 | gerbera | DISTRO | https://release-monitoring.org/project/18420 | 1.9.2 | 1.10.0 | gettext-gnu | DISTRO | https://release-monitoring.org/project/00898 | 0.20.1 | 0.21 | ORPH git | DISTRO | https://release-monitoring.org/project/05350 | 2.31.1 | 2.35.1 | glib-networking | DISTRO | https://release-monitoring.org/project/21353 | 2.70.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.1.1 | gnutls | DISTRO | https://release-monitoring.org/project/01221 | 3.7.2 | 3.7.3 | gobject-introspection | DISTRO | https://release-monitoring.org/project/01223 | 1.70.0 | 1.71.0 | ORPH gqrx | DISTRO | https://release-monitoring.org/project/09771 | 2.14.4 | 2.15.8 | granite | DISTRO | https://release-monitoring.org/project/05410 | 6.0.0 | 6.2.0 | ORPH grpc | DISTRO | https://release-monitoring.org/project/19117 | 1.43.0 | 1.44.0 | 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 gst1-imx | DISTRO | https://release-monitoring.org/project/21846 | 0.13.1 | 2.0.0 | gst1-shark | DISTRO | https://release-monitoring.org/project/21854 | v0.7.3 | 0.7.5 | 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.6.0 | gtksourceview | DISTRO | https://release-monitoring.org/project/07724 | 3.24.7 | 5.3.2 | guile | DISTRO | https://release-monitoring.org/project/01277 | 3.0.7 | 3.0.8 | 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.90 | 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.4 | harfbuzz | DISTRO | https://release-monitoring.org/project/01299 | 3.3.2 | 3.4.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.355 | 0.356 | ORPH i2pd | DISTRO | https://release-monitoring.org/project/21355 | 2.40.0 | 2.41.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.37 | ORPH imagemagick | DISTRO | https://release-monitoring.org/project/01372 | 7.1.0-19 | 7.1.0-26 | ORPH imlib2 | DISTRO | https://release-monitoring.org/project/21676 | 1.7.3 | 1.8.0 | inotify-tools | DISTRO | https://release-monitoring.org/project/08864 | 3.20.2.2 | 3.22.1.0 | ORPH intel-mediadriver | DISTRO | https://release-monitoring.org/project/20341 | 22.1.1 | 22.2.1 | intel-mediasdk | DISTRO | https://release-monitoring.org/project/21814 | 22.1.0 | 22.2.1 | intel-microcode | DISTRO | https://release-monitoring.org/project/20614 | 20210608 | 20220207 | ORPH iperf3 | DISTRO | https://release-monitoring.org/project/01389 | 3.10.1 | 3.11 | 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.21 | 1.25 | 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 | janet | DISTRO | https://release-monitoring.org/project/155612 | 1.19.2 | 1.20.0 | janus-gateway | DISTRO | https://release-monitoring.org/project/15715 | 0.11.6 | 0.11.8 | jasper | DISTRO | https://release-monitoring.org/project/01421 | 2.0.33 | 3.0.2 | jpeg-turbo | DISTRO | https://release-monitoring.org/project/01648 | 2.1.2 | 2.1.3 | jquery-datetimepicker | DISTRO | https://release-monitoring.org/project/13910 | 2.4.5 | 2.5.20 | jquery-keyboard | DISTRO | https://release-monitoring.org/project/21681 | 1.18.12 | 1.30.4 | ORPH jquery-mobile | DISTRO | https://release-monitoring.org/project/59395 | 1.4.3 | 1.4.5 | ORPH jquery-ui | DISTRO | https://release-monitoring.org/project/21815 | 1.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 | kf5-extra-cmake-modules | DISTRO | https://release-monitoring.org/project/08762 | 5.47.0 | 5.91.0 | kf5-kcoreaddons | DISTRO | https://release-monitoring.org/project/08762 | 5.47.0 | 5.91.0 | kf5-modemmanager-qt | DISTRO | https://release-monitoring.org/project/08762 | 5.47.0 | 5.91.0 | kf5-networkmanager-qt | DISTRO | https://release-monitoring.org/project/08762 | 5.47.0 | 5.91.0 | kismet | DISTRO | https://release-monitoring.org/project/06966 | 2021-08-R1 | 2022-02-R1 | 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.3-Ma... | 20.1.2-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.1-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.6-Ma... | 20.2.2-Nexus | kodi-pvr-iptvsimple | DISTRO | https://release-monitoring.org/project/21782 | 19.1.0-Ma... | 20.3.0-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.7-Ma... | 20.2.4-Nexus | kodi-pvr-nextpvr | DISTRO | https://release-monitoring.org/project/21779 | 19.0.3-Ma... | 20.2.2-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.2-Ma... | 20.2.1-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 | lcms2 | DISTRO | https://release-monitoring.org/project/09815 | 2.13 | 2.13.1 | lensfun | DISTRO | https://release-monitoring.org/project/01548 | 0.3.2 | 0.3.95 | libaacs | DISTRO | https://release-monitoring.org/project/05562 | 0.11.0 | 0.11.1 | libao | DISTRO | https://release-monitoring.org/project/07629 | 1.2.0 | 1.2.2 | ORPH libapparmor | DISTRO | https://release-monitoring.org/project/94819 | 3.0.3 | 3.0.4 | libarchive | DISTRO | https://release-monitoring.org/project/01558 | 3.5.3 | 3.6.0 | libblockdev | DISTRO | https://release-monitoring.org/project/09397 | 2.26 | 2.26-1 | ORPH libbpf | DISTRO | https://release-monitoring.org/project/141355 | 0.6.1 | 0.7.0 | libbsd | DISTRO | https://release-monitoring.org/project/01567 | 0.11.3 | 0.11.5 | libcap | DISTRO | https://release-monitoring.org/project/01569 | 2.62 | 2.63 | 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 | libdrm | DISTRO | https://release-monitoring.org/project/01596 | 2.4.109 | 2.4.110 | libfreeglut | DISTRO | https://release-monitoring.org/project/00846 | 3.2.1 | 3.2.2 | libfuse | GUESS | https://release-monitoring.org/project/00861 | 2.9.9 | 3.10.5 | ORPH libgcrypt | DISTRO | https://release-monitoring.org/project/01623 | 1.9.4 | 1.10.0 | ORPH libgdiplus | DISTRO | https://release-monitoring.org/project/06440 | 6.0.5 | 6.1 | libgee | DISTRO | https://release-monitoring.org/project/01625 | 0.20.4 | 0.20.5 | libgit2 | DISTRO | https://release-monitoring.org/project/01627 | 1.3.0 | 1.4.2 | libglade | DISTRO | https://release-monitoring.org/project/01174 | 2.6.4 | 3.38.2 | ORPH libglib2 | DISTRO | https://release-monitoring.org/project/10024 | 2.70.0 | 2.70.4 | 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.44 | ORPH libgpgme | DISTRO | https://release-monitoring.org/project/01239 | 1.16.0 | 1.17.0 | 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.1 | libgudev | DISTRO | https://release-monitoring.org/project/07735 | 236 | 237 | libiberty | DISTRO | https://release-monitoring.org/project/07981 | 2.32 | 2.38 | libical | DISTRO | https://release-monitoring.org/project/01637 | 1.0.1 | 3.0.14 | 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 | libinput | DISTRO | https://release-monitoring.org/project/05781 | 1.19.3 | 1.20.0 | libkcapi | DISTRO | https://release-monitoring.org/project/16828 | 1.1.5 | 1.4.0 | ORPH libks | DISTRO | https://release-monitoring.org/project/241898 | 1.7.0 | 1.8.0 | libmdbx | DISTRO | https://release-monitoring.org/project/141559 | 0.11.4 | 0.11.5 | 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 | libnetfilter_conntrack | DISTRO | https://release-monitoring.org/project/01675 | 1.0.8 | 1.0.9 | libnfs | DISTRO | https://release-monitoring.org/project/07325 | 4.0.0 | 5.0.1 | ORPH 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.3 | 2.18.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.11.1 | 2.12 | 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 | libqmi | DISTRO | https://release-monitoring.org/project/07307 | 1.30.2 | 1.30.4 | libressl | DISTRO | https://release-monitoring.org/project/12102 | 3.4.2 | 3.5.0 | ORPH librsvg | DISTRO | https://release-monitoring.org/project/05420 | 2.50.7 | 2.52.6 | librtas | DISTRO | https://release-monitoring.org/project/10717 | 2.0.2 | 2.0.3 | ORPH libscrypt | DISTRO | https://release-monitoring.org/project/07380 | 1.21 | 1.22 | libsecret | DISTRO | https://release-monitoring.org/project/13150 | 0.20.4 | 0.20.5 | ORPH libsemanage | DISTRO | https://release-monitoring.org/project/01718 | 3.3 | 20200710 | libsepol | DISTRO | https://release-monitoring.org/project/01719 | 3.3 | 20200710 | libsigc | DISTRO | https://release-monitoring.org/project/07961 | 3.0.7 | 3.2.0 | ORPH 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 | 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 | libva | DISTRO | https://release-monitoring.org/project/01752 | 2.13.0 | 2.14.0 | libva-utils | DISTRO | https://release-monitoring.org/project/16334 | 2.13.0 | 2.14.0 | libvips | DISTRO | https://release-monitoring.org/project/05097 | 8.10.6 | 8.12.2 | 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 | libxcrypt | DISTRO | https://release-monitoring.org/project/16436 | 4.4.27 | 4.4.28 | libxkbcommon | DISTRO | https://release-monitoring.org/project/01780 | 1.3.1 | 1.4.0 | libxml2 | DISTRO | https://release-monitoring.org/project/01783 | 2.9.12 | 2.9.13 | libxmlrpc | DISTRO | https://release-monitoring.org/project/09024 | r3119 | 1.51.07 | linphone | DISTRO | https://release-monitoring.org/project/01823 | 4.4.8 | 5.1.3 | ORPH linux-firmware | DISTRO | https://release-monitoring.org/project/141464 | 20211216 | 20220209 | liquid-dsp | DISTRO | https://release-monitoring.org/project/14535 | 1.3.2 | 1.4.0 | live555 | DISTRO | https://release-monitoring.org/project/12414 | 2021.05.03 | 2022.02.07 | ORPH lld | DISTRO | https://release-monitoring.org/project/01830 | 9.0.1 | 13.0.1 | 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.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 | lrzip | DISTRO | https://release-monitoring.org/project/01842 | 0.641 | 0.650 | 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-tools | DISTRO | https://release-monitoring.org/project/07136 | 2.13.2 | 2.13.4 | lua | DISTRO | https://release-monitoring.org/project/01847 | 5.1.5 | 5.4.4 | lua-resty-http | DISTRO | https://release-monitoring.org/project/13887 | 0.15-0 | 0.16.1 | luv | DISTRO | https://release-monitoring.org/project/21510 | 1.42.0-1 | 1.43.0-0 | luvi | DISTRO | https://release-monitoring.org/project/21512 | 2.12.0 | 2.13.0 | lvm2 | DISTRO | https://release-monitoring.org/project/05354 | 2.03.14 | 2.03.15 | ORPH lxc | DISTRO | https://release-monitoring.org/project/01860 | 4.0.11 | 4.0.12 | 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.8.2 | 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.1.3 | ORPH memcached | DISTRO | https://release-monitoring.org/project/01965 | 1.6.12 | 1.6.14 | 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 | mender | DISTRO | https://release-monitoring.org/project/20629 | 3.1.0 | 3.2.1 | mesa3d | DISTRO | https://release-monitoring.org/project/01970 | 21.3.5 | 21.3.7 | mesa3d-headers | DISTRO | https://release-monitoring.org/project/01970 | 21.3.5 | 21.3.7 | meson | DISTRO | https://release-monitoring.org/project/06472 | 0.61.1 | 0.61.2 | 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 | minetest | DISTRO | https://release-monitoring.org/project/01978 | 5.4.1 | 5.5.0 | minetest-game | DISTRO | https://release-monitoring.org/project/21522 | 5.4.1 | 5.5.0 | moarvm | DISTRO | https://release-monitoring.org/project/21100 | 2021.10 | 2022.02 | 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.6 | mongodb | DISTRO | https://release-monitoring.org/project/02008 | 4.2.18 | 5.2.1 | mongoose | DISTRO | https://release-monitoring.org/project/07603 | 7.2 | 7.6 | monit | DISTRO | https://release-monitoring.org/project/05483 | 5.26.0 | 5.31.0 | mono | DISTRO | https://release-monitoring.org/project/06360 | 6.12.0.90 | 6.12.0.173 | 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.1.0 | 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 | mtr | DISTRO | https://release-monitoring.org/project/02029 | 0.94 | 0.95 | ORPH multipath-tools | DISTRO | https://release-monitoring.org/project/00424 | 0.8.8 | 0.8.9 | mupdf | DISTRO | https://release-monitoring.org/project/02034 | 1.18.0 | 1.19.0 | mutt | DISTRO | https://release-monitoring.org/project/02035 | 2.1.5 | 2.2.1 | nano | DISTRO | https://release-monitoring.org/project/02046 | 6.0 | 6.2 | ORPH nbd | DISTRO | https://release-monitoring.org/project/02052 | 3.21 | 3.23 | ncdu | DISTRO | https://release-monitoring.org/project/06045 | 1.16 | 2.1 | ncurses | DISTRO | https://release-monitoring.org/project/02057 | 6.1 | 6.3-20220226 | ORPH netdata | DISTRO | https://release-monitoring.org/project/11046 | 1.21.1 | 1.33.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.34.0 | 1.36.0 | 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.1 | 1.0.2 | nghttp2 | DISTRO | https://release-monitoring.org/project/08651 | 1.41.0 | 1.47.0 | nginx | DISTRO | https://release-monitoring.org/project/05413 | 1.20.1 | 1.21.6 | nodejs | DISTRO | https://release-monitoring.org/project/08251 | 14.18.3 | 17.6.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.54 | 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 | ogre | DISTRO | https://release-monitoring.org/project/33334 | v1.12.12 | 13.3.1 | open62541 | DISTRO | https://release-monitoring.org/project/16896 | v1.2.2 | 1.2.4 | ORPH openblas | DISTRO | https://release-monitoring.org/project/02540 | 0.3.18 | 0.3.20 | 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+11 | openlayers | DISTRO | https://release-monitoring.org/project/06847 | 6.12.0 | 6.13.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 | openssh | DISTRO | https://release-monitoring.org/project/02565 | 8.8p1 | 8.9p1 | ORPH 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 | optee-benchmark | DISTRO | https://release-monitoring.org/project/21555 | 3.15.0 | 3.16.0 | optee-client | DISTRO | https://release-monitoring.org/project/21556 | 3.15.0 | 3.16.0 | optee-examples | DISTRO | https://release-monitoring.org/project/21557 | 3.15.0 | 3.16.0 | optee-test | DISTRO | https://release-monitoring.org/project/21558 | 3.15.0 | 3.16.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.1.3 | ORPH pango | DISTRO | https://release-monitoring.org/project/11783 | 1.50.3 | 1.50.4 | 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.5 | 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 | 202201 | 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.15 | 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.76 | perl-http-daemon | DISTRO | https://release-monitoring.org/project/02975 | 6.12 | 6.13 | 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-package-stash | DISTRO | https://release-monitoring.org/project/11885 | 0.39 | 0.40 | 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.16 | 8.1.3 | 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.3 | 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 pipewire | DISTRO | https://release-monitoring.org/project/57357 | 0.3.45 | 0.3.47 | 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 | poke | DISTRO | https://release-monitoring.org/project/179926 | 1.4 | 2.1 | ORPH policycoreutils | DISTRO | https://release-monitoring.org/project/03680 | 3.2 | 20200710 | poppler | DISTRO | https://release-monitoring.org/project/03686 | 21.12.0 | 22.02.0 | postgis | DISTRO | https://release-monitoring.org/project/03694 | 3.2.0 | 3.2.1 | 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.4 | proxychains-ng | DISTRO | https://release-monitoring.org/project/06499 | 4.14 | 4.16 | ORPH ptpd | GUESS | https://release-monitoring.org/project/03726 | 1.1.0 | 2.3.1 | ORPH pugixml | DISTRO | https://release-monitoring.org/project/03728 | 1.11.4 | 1.12.1 | 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-aioconsole | DISTRO | https://release-monitoring.org/project/21244 | 0.4.0 | 0.4.1 | 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.2 | python-asgiref | DISTRO | https://release-monitoring.org/project/18462 | 3.3.4 | 3.5.0 | python-autobahn | DISTRO | https://release-monitoring.org/project/07015 | 22.1.1 | 22.2.2 | 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.2 | python-boto3 | DISTRO | https://release-monitoring.org/project/08778 | 1.19.2 | 1.21.8 | python-botocore | DISTRO | https://release-monitoring.org/project/08748 | 1.22.2 | 1.24.8 | python-can | DISTRO | https://release-monitoring.org/project/17873 | 3.3.4 | 4.0.0 | python-canopen | DISTRO | https://release-monitoring.org/project/23230 | 1.0.0 | 2.0.0b1 | 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.11 | 2.0.12 | 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.4 | 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-crossbar | DISTRO | https://release-monitoring.org/project/21696 | 21.3.1 | 22.2.1 | python-cssselect2 | DISTRO | https://release-monitoring.org/project/86109 | 0.4.1 | 0.5.0 | python-cssutils | DISTRO | https://release-monitoring.org/project/13259 | 2.3.0 | 2.4.0 | python-cython | DISTRO | https://release-monitoring.org/project/12679 | 0.29.27 | 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-decorator | DISTRO | https://release-monitoring.org/project/03819 | 5.1.0 | 5.1.1 | python-dialog3 | DISTRO | https://release-monitoring.org/project/03823 | 3.5.1 | 3.5.3 | python-distro | DISTRO | https://release-monitoring.org/project/12202 | 1.6.0 | 1.7.0 | 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-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-entrypoints | DISTRO | https://release-monitoring.org/project/12081 | 0.3 | 0.4 | python-filelock | DISTRO | https://release-monitoring.org/project/11739 | 3.3.0 | 3.6.0 | python-flask | DISTRO | https://release-monitoring.org/project/03867 | 1.1.2 | 2.0.3 | 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-git | DISTRO | https://release-monitoring.org/project/06459 | 3.1.24 | 3.1.27 | 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.4 | python-humanize | DISTRO | https://release-monitoring.org/project/19799 | 3.11.0 | 4.0.0 | python-installer | DISTRO | https://release-monitoring.org/project/197662 | 0.4.0 | 0.5.0 | python-ipython | DISTRO | https://release-monitoring.org/project/01399 | 7.31.1 | 8.1.0 | python-iso8601 | DISTRO | https://release-monitoring.org/project/17228 | 0.1.14 | 1.0.2 | python-itsdangerous | DISTRO | https://release-monitoring.org/project/03892 | 2.0.1 | 2.1.0 | python-iwlib | DISTRO | https://release-monitoring.org/project/51611 | 1.5 | 1.7.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-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-libusb1 | DISTRO | https://release-monitoring.org/project/12301 | 2.0.1 | 3.0.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-markupsafe | DISTRO | https://release-monitoring.org/project/03918 | 2.0.1 | 2.1.0 | 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-networkmanager | DISTRO | https://release-monitoring.org/project/12909 | 2.1 | 2.2 | python-numpy | DISTRO | https://release-monitoring.org/project/02509 | 1.21.2 | 1.22.2 | python-oauthlib | DISTRO | https://release-monitoring.org/project/05377 | 3.1.1 | 3.2.0 | 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-paramiko | DISTRO | https://release-monitoring.org/project/03954 | 2.7.2 | 2.9.2 | 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.1 | python-pillow | DISTRO | https://release-monitoring.org/project/07974 | 9.0.0 | 9.0.1 | python-pip | DISTRO | https://release-monitoring.org/project/06529 | 21.2.4 | 22.0.3 | 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.28 | python-protobuf | DISTRO | https://release-monitoring.org/project/03715 | 3.19.1 | 3.19.4 | 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-pybind | DISTRO | https://release-monitoring.org/project/13384 | 2.9.0 | 2.9.1 | python-pycairo | DISTRO | https://release-monitoring.org/project/13166 | 1.19.1 | 1.20.1 | python-pycryptodomex | DISTRO | https://release-monitoring.org/project/36851 | 3.14.0 | 3.14.1 | python-pydal | DISTRO | https://release-monitoring.org/project/21582 | 20210626.3 | 20220213.2 | python-pydantic | DISTRO | https://release-monitoring.org/project/29768 | 1.8.2 | 1.9.0 | python-pyelftools | DISTRO | https://release-monitoring.org/project/16219 | 0.27 | 0.28 | 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.1 | python-pylibftdi | DISTRO | https://release-monitoring.org/project/21583 | 0.18.1 | 0.20.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.5 | python-pyopenssl | DISTRO | https://release-monitoring.org/project/05535 | 21.0.0 | 22.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-pyroute2 | DISTRO | https://release-monitoring.org/project/20081 | 0.5.7 | 0.6.7 | python-pytablereader | DISTRO | https://release-monitoring.org/project/21592 | 0.26.1 | 0.31.3 | python-pytablewriter | DISTRO | https://release-monitoring.org/project/21593 | 0.46.1 | 0.64.1 | python-pytest | DISTRO | https://release-monitoring.org/project/03765 | 6.2.5 | 7.0.1 | python-pytest-asyncio | DISTRO | https://release-monitoring.org/project/07273 | 0.15.1 | 0.18.1 | python-pyudev | DISTRO | https://release-monitoring.org/project/08485 | 0.22.0 | 0.23.2 | 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.4 | python-reentry | DISTRO | https://release-monitoring.org/project/21596 | 1.3.2 | 1.3.3 | python-regex | DISTRO | https://release-monitoring.org/project/05548 | 2021.4.4 | 2022.1.18 | python-requests-oauthlib | DISTRO | https://release-monitoring.org/project/11803 | 1.3.0 | 1.3.1 | python-rpi-gpio | DISTRO | https://release-monitoring.org/project/12026 | 0.7.0 | 0.7.1 | python-rpi-ws281x | DISTRO | https://release-monitoring.org/project/21898 | 4.3.0 | 4.3.2 | 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-s3transfer | DISTRO | https://release-monitoring.org/project/10428 | 0.5.0 | 0.5.2 | python-secretstorage | DISTRO | https://release-monitoring.org/project/04020 | 3.1.2 | 3.3.1 | python-semantic-version | DISTRO | https://release-monitoring.org/project/06514 | 2.8.5 | 2.9.0 | python-sentry-sdk | DISTRO | https://release-monitoring.org/project/21603 | 1.4.3 | 1.5.6 | 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 | 60.7.0 | 60.9.3 | 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-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.1 | python-socketio | DISTRO | https://release-monitoring.org/project/21611 | 5.4.0 | 5.5.2 | 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.1 | 1.3.0 | 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.1 | 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-tomli | DISTRO | https://release-monitoring.org/project/207408 | 1.2.0 | 2.0.1 | 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 | 22.2.0 | python-txaio | DISTRO | https://release-monitoring.org/project/07202 | 21.2.1 | 22.2.1 | python-typing-extensions | DISTRO | https://release-monitoring.org/project/19755 | 3.10.0.2 | 4.1.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-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.2 | python-web2py | DISTRO | https://release-monitoring.org/project/20617 | 2.21.1 | 2.22.3 | 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.3.1 | python-websockets | DISTRO | https://release-monitoring.org/project/08100 | 10.0 | 10.2 | python-werkzeug | DISTRO | https://release-monitoring.org/project/04092 | 1.0.1 | 2.0.3 | 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.3 | python-yarl | DISTRO | https://release-monitoring.org/project/12895 | 1.7.2 | 1.8.0 | python-zeroconf | DISTRO | https://release-monitoring.org/project/12681 | 0.29.0 | 0.38.3 | qpdf | DISTRO | https://release-monitoring.org/project/05542 | 10.5.0 | 10.6.2 | qpid-proton | DISTRO | https://release-monitoring.org/project/15198 | 0.35.0 | 0.36.0 | qt5coap | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.3 | qt5knx | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.3 | qt5mqtt | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.3 | qt5opcua | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.3 | qt5webengine | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.3 | 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 rng-tools | DISTRO | https://release-monitoring.org/project/04202 | 6.14 | 6.15 | rocksdb | DISTRO | https://release-monitoring.org/project/15560 | 6.20.3 | 6.29.3 | rsyslog | DISTRO | https://release-monitoring.org/project/04218 | 8.2010.0 | 8.2202.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.58.1 | 1.59.0 | rust-bin | DISTRO | https://release-monitoring.org/project/07635 | 1.58.1 | 1.59.0 | rygel | DISTRO | https://release-monitoring.org/project/04751 | 0.40.2 | 0.40.3 | s390-tools | DISTRO | https://release-monitoring.org/project/10714 | 2.19.0 | 2.20.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.2 | 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 | safeclib | DISTRO | https://release-monitoring.org/project/21385 | 3.7.1 | 01022022 | samba4 | DISTRO | https://release-monitoring.org/project/04758 | 4.15.4 | 4.15.5 | 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 | screen | DISTRO | https://release-monitoring.org/project/04772 | 4.8.0 | 4.9.0 | ORPH 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 | seatd | DISTRO | https://release-monitoring.org/project/234932 | 0.6.3 | 0.6.4 | ORPH 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.73.0 | sentry-native | DISTRO | https://release-monitoring.org/project/135639 | 0.4.1 | 0.4.15 | 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 shim | DISTRO | https://release-monitoring.org/project/10719 | 15.4 | 15.5 | 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.9 | snort3 | DISTRO | https://release-monitoring.org/project/13263 | 3.1.18.0 | 3.1.24.0 | sofia-sip | DISTRO | https://release-monitoring.org/project/10509 | 1.13.6-41... | 1.13.7 | 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 | sphinxbase | DISTRO | https://release-monitoring.org/project/20548 | 5prealpha | 0.8 | spice-protocol | DISTRO | https://release-monitoring.org/project/14892 | 0.14.3 | 0.14.4 | sqlite | DISTRO | https://release-monitoring.org/project/04877 | 3.37.2 | 3.38.0 | squid | DISTRO | https://release-monitoring.org/project/04880 | 5.3 | 5.4.1 | 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.62 | sudo | DISTRO | https://release-monitoring.org/project/04906 | 1.9.8p2 | 1.9.9 | ORPH 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 system-config-printer | DISTRO | https://release-monitoring.org/project/08855 | 1.5.15 | 1.5.16 | 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 | tcpreplay | DISTRO | https://release-monitoring.org/project/13716 | 4.3.4 | 4.4.1 | ORPH thrift | DISTRO | https://release-monitoring.org/project/05581 | 0.14.1 | 0.16.0 | ORPH timescaledb | DISTRO | https://release-monitoring.org/project/17545 | 2.5.1 | 2.6.0 | tinyssh | DISTRO | https://release-monitoring.org/project/14678 | 20210601 | 20220222 | tinyxml | DISTRO | https://release-monitoring.org/project/10162 | 2.6.2_2 | 2.6.2 | ORPH tio | DISTRO | https://release-monitoring.org/project/20587 | 1.32 | 1.35 | 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 | tpm2-tss | DISTRO | https://release-monitoring.org/project/12683 | 3.1.0 | 3.2.0 | ORPH trace-cmd | DISTRO | https://release-monitoring.org/project/07873 | 2.9.6 | 2.9.7 | tree | DISTRO | https://release-monitoring.org/project/05006 | 1.8.0 | 2.0.2 | 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 | unbound | DISTRO | https://release-monitoring.org/project/05042 | 1.14.0 | 1.15.0 | 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 | 6.1.3 | 6.1.5 | ORPH upmpdcli | DISTRO | https://release-monitoring.org/project/15848 | 1.5.12 | 1.5.13 | upower | DISTRO | https://release-monitoring.org/project/05056 | 0.99.11 | 0.99.16 | usbguard | DISTRO | https://release-monitoring.org/project/11151 | 1.0.0 | 1.1.0 | util-linux | DISTRO | https://release-monitoring.org/project/08179 | 2.37.3 | 2.37.4 | ORPH util-linux-libs | DISTRO | https://release-monitoring.org/project/08179 | 2.37.3 | 2.37.4 | ORPH 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.90 | ORPH valijson | DISTRO | https://release-monitoring.org/project/18452 | 0.3 | 0.6 | vim | DISTRO | https://release-monitoring.org/project/05092 | 8.2.4301 | 8.2.4478 | ORPH vlc | DISTRO | https://release-monitoring.org/project/06504 | 3.0.16 | 3.0.17-1 | vnstat | DISTRO | https://release-monitoring.org/project/07283 | 2.8 | 2.9 | 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.31 | vulkan-headers | DISTRO | https://release-monitoring.org/project/88835 | 1.2.203 | 1.3.206 | ORPH 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 | waylandpp | DISTRO | https://release-monitoring.org/project/16969 | 0.2.8 | 0.2.9 | 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 wget | DISTRO | https://release-monitoring.org/project/05124 | 1.21.2 | 1.21.3 | ORPH wilc1000-firmware | DISTRO | https://release-monitoring.org/project/65598 | 14.1 | 15.6 | wine | DISTRO | https://release-monitoring.org/project/05134 | 6.0 | 7.3 | 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.8 | ORPH wireshark | DISTRO | https://release-monitoring.org/project/05137 | 3.4.11 | 3.6.2 | ORPH wlroots | DISTRO | https://release-monitoring.org/project/18357 | 0.14.1 | 0.15.1 | wolfssl | DISTRO | https://release-monitoring.org/project/21631 | 4.8.1-stable | 5.2.0 | wpewebkit | DISTRO | https://release-monitoring.org/project/17557 | 2.34.6 | 2.35.90 | 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-input-libinput | DISTRO | https://release-monitoring.org/project/05782 | 1.2.0 | 1.2.1 | xdriver_xf86-video-amdgpu | DISTRO | https://release-monitoring.org/project/15900 | 19.1.0 | 22.0.0 | xen | DISTRO | https://release-monitoring.org/project/05181 | 4.14.4 | 4.16.0 | xinetd | DISTRO | https://release-monitoring.org/project/06382 | 2.3.15 | 2.3.15.4 | xkeyboard-config | DISTRO | https://release-monitoring.org/project/05191 | 2.34 | 2.35.1 | xmrig | DISTRO | https://release-monitoring.org/project/17499 | 6.16.3 | 6.16.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.19 | ORPH xterm | DISTRO | https://release-monitoring.org/project/05272 | 367 | 371 | ORPH yaml-cpp | DISTRO | https://release-monitoring.org/project/05284 | 0.6.3 | 0.7.0 | ORPH zabbix | DISTRO | https://release-monitoring.org/project/05492 | 5.4.9 | 6.0.0 | zchunk | DISTRO | https://release-monitoring.org/project/178035 | 1.1.16 | 1.2.0 | zfs | DISTRO | https://release-monitoring.org/project/11706 | 2.0.5 | 2.1.2 | 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 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 git | CVE-2022-24975 | https://security-tracker.debian.org/tracker/CVE-2022-24975 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 libbpf | CVE-2021-45940 | https://security-tracker.debian.org/tracker/CVE-2021-45940 libbpf | CVE-2021-45941 | https://security-tracker.debian.org/tracker/CVE-2021-45941 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 libpjsip | CVE-2021-37706 | https://security-tracker.debian.org/tracker/CVE-2021-37706 libpjsip | CVE-2021-41141 | https://security-tracker.debian.org/tracker/CVE-2021-41141 libpjsip | CVE-2021-43299 | https://security-tracker.debian.org/tracker/CVE-2021-43299 libpjsip | CVE-2021-43300 | https://security-tracker.debian.org/tracker/CVE-2021-43300 libpjsip | CVE-2021-43301 | https://security-tracker.debian.org/tracker/CVE-2021-43301 libpjsip | CVE-2021-43302 | https://security-tracker.debian.org/tracker/CVE-2021-43302 libpjsip | CVE-2021-43303 | https://security-tracker.debian.org/tracker/CVE-2021-43303 libpjsip | CVE-2021-43804 | https://security-tracker.debian.org/tracker/CVE-2021-43804 libpjsip | CVE-2021-43845 | https://security-tracker.debian.org/tracker/CVE-2021-43845 libpjsip | CVE-2022-21722 | https://security-tracker.debian.org/tracker/CVE-2022-21722 libpjsip | CVE-2022-21723 | https://security-tracker.debian.org/tracker/CVE-2022-21723 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 mariadb | CVE-2021-46658 | https://security-tracker.debian.org/tracker/CVE-2021-46658 mariadb | CVE-2021-46659 | https://security-tracker.debian.org/tracker/CVE-2021-46659 mariadb | CVE-2021-46661 | https://security-tracker.debian.org/tracker/CVE-2021-46661 mariadb | CVE-2021-46662 | https://security-tracker.debian.org/tracker/CVE-2021-46662 mariadb | CVE-2021-46663 | https://security-tracker.debian.org/tracker/CVE-2021-46663 mariadb | CVE-2021-46664 | https://security-tracker.debian.org/tracker/CVE-2021-46664 mariadb | CVE-2021-46665 | https://security-tracker.debian.org/tracker/CVE-2021-46665 mariadb | CVE-2021-46667 | https://security-tracker.debian.org/tracker/CVE-2021-46667 mariadb | CVE-2021-46668 | https://security-tracker.debian.org/tracker/CVE-2021-46668 mariadb | CVE-2021-46669 | https://security-tracker.debian.org/tracker/CVE-2021-46669 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 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 polkit | CVE-2021-4034 | https://security-tracker.debian.org/tracker/CVE-2021-4034 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-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-4145 | https://security-tracker.debian.org/tracker/CVE-2021-4145 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 samba4 | CVE-2021-44141 | https://security-tracker.debian.org/tracker/CVE-2021-44141 samba4 | CVE-2021-44142 | https://security-tracker.debian.org/tracker/CVE-2021-44142 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-0561 | https://security-tracker.debian.org/tracker/CVE-2022-0561 tiff | CVE-2022-0562 | https://security-tracker.debian.org/tracker/CVE-2022-0562 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 unzip | CVE-2022-0529 | https://security-tracker.debian.org/tracker/CVE-2022-0529 unzip | CVE-2022-0530 | https://security-tracker.debian.org/tracker/CVE-2022-0530 vim | CVE-2022-0554 | https://security-tracker.debian.org/tracker/CVE-2022-0554 vim | CVE-2022-0572 | https://security-tracker.debian.org/tracker/CVE-2022-0572 vim | CVE-2022-0629 | https://security-tracker.debian.org/tracker/CVE-2022-0629 wireshark | CVE-2022-0581 | https://security-tracker.debian.org/tracker/CVE-2022-0581 wireshark | CVE-2022-0582 | https://security-tracker.debian.org/tracker/CVE-2022-0582 wireshark | CVE-2022-0583 | https://security-tracker.debian.org/tracker/CVE-2022-0583 wireshark | CVE-2022-0585 | https://security-tracker.debian.org/tracker/CVE-2022-0585 wireshark | CVE-2022-0586 | https://security-tracker.debian.org/tracker/CVE-2022-0586 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-28707 | https://security-tracker.debian.org/tracker/CVE-2021-28707 xen | CVE-2021-28708 | https://security-tracker.debian.org/tracker/CVE-2021-28708 xen | CVE-2021-28711 | https://security-tracker.debian.org/tracker/CVE-2021-28711 xen | CVE-2021-28712 | https://security-tracker.debian.org/tracker/CVE-2021-28712 xen | CVE-2021-28713 | https://security-tracker.debian.org/tracker/CVE-2021-28713 xen | CVE-2022-23033 | https://security-tracker.debian.org/tracker/CVE-2022-23033 xen | CVE-2022-23035 | https://security-tracker.debian.org/tracker/CVE-2022-23035 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 xterm | CVE-2022-24130 | https://security-tracker.debian.org/tracker/CVE-2022-24130 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 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-2022-25235 | https://security-tracker.debian.org/tracker/CVE-2022-25235 expat | CVE-2022-25236 | https://security-tracker.debian.org/tracker/CVE-2022-25236 expat | CVE-2022-25313 | https://security-tracker.debian.org/tracker/CVE-2022-25313 expat | CVE-2022-25314 | https://security-tracker.debian.org/tracker/CVE-2022-25314 expat | CVE-2022-25315 | https://security-tracker.debian.org/tracker/CVE-2022-25315 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 git | CVE-2022-24975 | https://security-tracker.debian.org/tracker/CVE-2022-24975 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-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 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 hostapd | CVE-2022-23303 | https://security-tracker.debian.org/tracker/CVE-2022-23303 hostapd | CVE-2022-23304 | https://security-tracker.debian.org/tracker/CVE-2022-23304 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 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 libldns | CVE-2020-19860 | https://security-tracker.debian.org/tracker/CVE-2020-19860 libldns | CVE-2020-19861 | https://security-tracker.debian.org/tracker/CVE-2020-19861 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 libpjsip | CVE-2021-37706 | https://security-tracker.debian.org/tracker/CVE-2021-37706 libpjsip | CVE-2021-41141 | https://security-tracker.debian.org/tracker/CVE-2021-41141 libpjsip | CVE-2021-43299 | https://security-tracker.debian.org/tracker/CVE-2021-43299 libpjsip | CVE-2021-43300 | https://security-tracker.debian.org/tracker/CVE-2021-43300 libpjsip | CVE-2021-43301 | https://security-tracker.debian.org/tracker/CVE-2021-43301 libpjsip | CVE-2021-43302 | https://security-tracker.debian.org/tracker/CVE-2021-43302 libpjsip | CVE-2021-43303 | https://security-tracker.debian.org/tracker/CVE-2021-43303 libpjsip | CVE-2021-43804 | https://security-tracker.debian.org/tracker/CVE-2021-43804 libpjsip | CVE-2021-43845 | https://security-tracker.debian.org/tracker/CVE-2021-43845 libpjsip | CVE-2022-21722 | https://security-tracker.debian.org/tracker/CVE-2022-21722 libpjsip | CVE-2022-21723 | https://security-tracker.debian.org/tracker/CVE-2022-21723 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 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 mariadb | CVE-2021-46658 | https://security-tracker.debian.org/tracker/CVE-2021-46658 mariadb | CVE-2021-46659 | https://security-tracker.debian.org/tracker/CVE-2021-46659 mariadb | CVE-2021-46661 | https://security-tracker.debian.org/tracker/CVE-2021-46661 mariadb | CVE-2021-46662 | https://security-tracker.debian.org/tracker/CVE-2021-46662 mariadb | CVE-2021-46663 | https://security-tracker.debian.org/tracker/CVE-2021-46663 mariadb | CVE-2021-46664 | https://security-tracker.debian.org/tracker/CVE-2021-46664 mariadb | CVE-2021-46665 | https://security-tracker.debian.org/tracker/CVE-2021-46665 mariadb | CVE-2021-46667 | https://security-tracker.debian.org/tracker/CVE-2021-46667 mariadb | CVE-2021-46668 | https://security-tracker.debian.org/tracker/CVE-2021-46668 mariadb | CVE-2021-46669 | https://security-tracker.debian.org/tracker/CVE-2021-46669 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 minetest | CVE-2022-24300 | https://security-tracker.debian.org/tracker/CVE-2022-24300 minetest | CVE-2022-24301 | https://security-tracker.debian.org/tracker/CVE-2022-24301 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 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 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 polkit | CVE-2021-4034 | https://security-tracker.debian.org/tracker/CVE-2021-4034 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 protobuf | CVE-2021-22570 | https://security-tracker.debian.org/tracker/CVE-2021-22570 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 | CVE-2022-0391 | https://security-tracker.debian.org/tracker/CVE-2022-0391 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-ipython | CVE-2022-21699 | https://security-tracker.debian.org/tracker/CVE-2022-21699 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 python-twisted | CVE-2022-21712 | https://security-tracker.debian.org/tracker/CVE-2022-21712 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 qemu | CVE-2021-4145 | https://security-tracker.debian.org/tracker/CVE-2021-4145 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 rust | CVE-2022-21658 | https://security-tracker.debian.org/tracker/CVE-2022-21658 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 samba4 | CVE-2021-44141 | https://security-tracker.debian.org/tracker/CVE-2021-44141 samba4 | CVE-2021-44142 | https://security-tracker.debian.org/tracker/CVE-2021-44142 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 strongswan | CVE-2021-45079 | https://security-tracker.debian.org/tracker/CVE-2021-45079 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 tiff | CVE-2022-0561 | https://security-tracker.debian.org/tracker/CVE-2022-0561 tiff | CVE-2022-0562 | https://security-tracker.debian.org/tracker/CVE-2022-0562 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 unzip | CVE-2022-0529 | https://security-tracker.debian.org/tracker/CVE-2022-0529 unzip | CVE-2022-0530 | https://security-tracker.debian.org/tracker/CVE-2022-0530 vim | CVE-2022-0554 | https://security-tracker.debian.org/tracker/CVE-2022-0554 vim | CVE-2022-0572 | https://security-tracker.debian.org/tracker/CVE-2022-0572 vim | CVE-2022-0629 | https://security-tracker.debian.org/tracker/CVE-2022-0629 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-2022-0581 | https://security-tracker.debian.org/tracker/CVE-2022-0581 wireshark | CVE-2022-0582 | https://security-tracker.debian.org/tracker/CVE-2022-0582 wireshark | CVE-2022-0583 | https://security-tracker.debian.org/tracker/CVE-2022-0583 wireshark | CVE-2022-0585 | https://security-tracker.debian.org/tracker/CVE-2022-0585 wireshark | CVE-2022-0586 | https://security-tracker.debian.org/tracker/CVE-2022-0586 wpa_supplicant | CVE-2022-23303 | https://security-tracker.debian.org/tracker/CVE-2022-23303 wpa_supplicant | CVE-2022-23304 | https://security-tracker.debian.org/tracker/CVE-2022-23304 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-28707 | https://security-tracker.debian.org/tracker/CVE-2021-28707 xen | CVE-2021-28708 | https://security-tracker.debian.org/tracker/CVE-2021-28708 xen | CVE-2021-28711 | https://security-tracker.debian.org/tracker/CVE-2021-28711 xen | CVE-2021-28712 | https://security-tracker.debian.org/tracker/CVE-2021-28712 xen | CVE-2021-28713 | https://security-tracker.debian.org/tracker/CVE-2021-28713 xen | CVE-2022-23033 | https://security-tracker.debian.org/tracker/CVE-2022-23033 xen | CVE-2022-23035 | https://security-tracker.debian.org/tracker/CVE-2022-23035 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 xterm | CVE-2022-24130 | https://security-tracker.debian.org/tracker/CVE-2022-24130 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 zsh | CVE-2021-45444 | https://security-tracker.debian.org/tracker/CVE-2021-45444 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 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-2022-25235 | https://security-tracker.debian.org/tracker/CVE-2022-25235 expat | CVE-2022-25236 | https://security-tracker.debian.org/tracker/CVE-2022-25236 expat | CVE-2022-25313 | https://security-tracker.debian.org/tracker/CVE-2022-25313 expat | CVE-2022-25314 | https://security-tracker.debian.org/tracker/CVE-2022-25314 expat | CVE-2022-25315 | https://security-tracker.debian.org/tracker/CVE-2022-25315 ffmpeg | CVE-2021-38291 | https://security-tracker.debian.org/tracker/CVE-2021-38291 git | CVE-2022-24975 | https://security-tracker.debian.org/tracker/CVE-2022-24975 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 hostapd | CVE-2022-23303 | https://security-tracker.debian.org/tracker/CVE-2022-23303 hostapd | CVE-2022-23304 | https://security-tracker.debian.org/tracker/CVE-2022-23304 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 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 libldns | CVE-2020-19860 | https://security-tracker.debian.org/tracker/CVE-2020-19860 libldns | CVE-2020-19861 | https://security-tracker.debian.org/tracker/CVE-2020-19861 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libpjsip | CVE-2021-37706 | https://security-tracker.debian.org/tracker/CVE-2021-37706 libpjsip | CVE-2021-41141 | https://security-tracker.debian.org/tracker/CVE-2021-41141 libpjsip | CVE-2021-43299 | https://security-tracker.debian.org/tracker/CVE-2021-43299 libpjsip | CVE-2021-43300 | https://security-tracker.debian.org/tracker/CVE-2021-43300 libpjsip | CVE-2021-43301 | https://security-tracker.debian.org/tracker/CVE-2021-43301 libpjsip | CVE-2021-43302 | https://security-tracker.debian.org/tracker/CVE-2021-43302 libpjsip | CVE-2021-43303 | https://security-tracker.debian.org/tracker/CVE-2021-43303 libpjsip | CVE-2021-43804 | https://security-tracker.debian.org/tracker/CVE-2021-43804 libpjsip | CVE-2021-43845 | https://security-tracker.debian.org/tracker/CVE-2021-43845 libpjsip | CVE-2022-21722 | https://security-tracker.debian.org/tracker/CVE-2022-21722 libpjsip | CVE-2022-21723 | https://security-tracker.debian.org/tracker/CVE-2022-21723 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 mariadb | CVE-2021-46658 | https://security-tracker.debian.org/tracker/CVE-2021-46658 mariadb | CVE-2021-46659 | https://security-tracker.debian.org/tracker/CVE-2021-46659 mariadb | CVE-2021-46661 | https://security-tracker.debian.org/tracker/CVE-2021-46661 mariadb | CVE-2021-46662 | https://security-tracker.debian.org/tracker/CVE-2021-46662 mariadb | CVE-2021-46663 | https://security-tracker.debian.org/tracker/CVE-2021-46663 mariadb | CVE-2021-46664 | https://security-tracker.debian.org/tracker/CVE-2021-46664 mariadb | CVE-2021-46665 | https://security-tracker.debian.org/tracker/CVE-2021-46665 mariadb | CVE-2021-46667 | https://security-tracker.debian.org/tracker/CVE-2021-46667 mariadb | CVE-2021-46668 | https://security-tracker.debian.org/tracker/CVE-2021-46668 mariadb | CVE-2021-46669 | https://security-tracker.debian.org/tracker/CVE-2021-46669 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 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 polkit | CVE-2021-4034 | https://security-tracker.debian.org/tracker/CVE-2021-4034 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 | CVE-2022-0391 | https://security-tracker.debian.org/tracker/CVE-2022-0391 python-ipython | CVE-2022-21699 | https://security-tracker.debian.org/tracker/CVE-2022-21699 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 python-twisted | CVE-2022-21712 | https://security-tracker.debian.org/tracker/CVE-2022-21712 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 qemu | CVE-2021-4145 | https://security-tracker.debian.org/tracker/CVE-2021-4145 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 rust | CVE-2022-21658 | https://security-tracker.debian.org/tracker/CVE-2022-21658 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 samba4 | CVE-2021-44141 | https://security-tracker.debian.org/tracker/CVE-2021-44141 samba4 | CVE-2021-44142 | https://security-tracker.debian.org/tracker/CVE-2021-44142 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 strongswan | CVE-2021-45079 | https://security-tracker.debian.org/tracker/CVE-2021-45079 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-0561 | https://security-tracker.debian.org/tracker/CVE-2022-0561 tiff | CVE-2022-0562 | https://security-tracker.debian.org/tracker/CVE-2022-0562 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 unzip | CVE-2022-0529 | https://security-tracker.debian.org/tracker/CVE-2022-0529 unzip | CVE-2022-0530 | https://security-tracker.debian.org/tracker/CVE-2022-0530 vim | CVE-2022-0554 | https://security-tracker.debian.org/tracker/CVE-2022-0554 vim | CVE-2022-0572 | https://security-tracker.debian.org/tracker/CVE-2022-0572 vim | CVE-2022-0629 | https://security-tracker.debian.org/tracker/CVE-2022-0629 webkitgtk | CVE-2021-42762 | https://security-tracker.debian.org/tracker/CVE-2021-42762 wireshark | CVE-2022-0581 | https://security-tracker.debian.org/tracker/CVE-2022-0581 wireshark | CVE-2022-0582 | https://security-tracker.debian.org/tracker/CVE-2022-0582 wireshark | CVE-2022-0583 | https://security-tracker.debian.org/tracker/CVE-2022-0583 wireshark | CVE-2022-0585 | https://security-tracker.debian.org/tracker/CVE-2022-0585 wireshark | CVE-2022-0586 | https://security-tracker.debian.org/tracker/CVE-2022-0586 wpa_supplicant | CVE-2022-23303 | https://security-tracker.debian.org/tracker/CVE-2022-23303 wpa_supplicant | CVE-2022-23304 | https://security-tracker.debian.org/tracker/CVE-2022-23304 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-28707 | https://security-tracker.debian.org/tracker/CVE-2021-28707 xen | CVE-2021-28708 | https://security-tracker.debian.org/tracker/CVE-2021-28708 xen | CVE-2021-28711 | https://security-tracker.debian.org/tracker/CVE-2021-28711 xen | CVE-2021-28712 | https://security-tracker.debian.org/tracker/CVE-2021-28712 xen | CVE-2021-28713 | https://security-tracker.debian.org/tracker/CVE-2021-28713 xen | CVE-2022-23033 | https://security-tracker.debian.org/tracker/CVE-2022-23033 xen | CVE-2022-23035 | https://security-tracker.debian.org/tracker/CVE-2022-23035 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 xterm | CVE-2022-24130 | https://security-tracker.debian.org/tracker/CVE-2022-24130 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 zsh | CVE-2021-45444 | https://security-tracker.debian.org/tracker/CVE-2021-45444 -- http://autobuild.buildroot.net From nicolas.cavallari at green-communications.fr Mon Feb 28 08:57:00 2022 From: nicolas.cavallari at green-communications.fr (Nicolas Cavallari) Date: Mon, 28 Feb 2022 09:57:00 +0100 Subject: [Buildroot] [PATCH next v2 1/1] package/libgit2: bump version to 1.4.2 In-Reply-To: <20220222095340.29327-1-nicolas.cavallari@green-communications.fr> References: <20220222095340.29327-1-nicolas.cavallari@green-communications.fr> Message-ID: <20220228085659.17489-1-nicolas.cavallari@green-communications.fr> Licence changes mostly concern vendored dependencies (that buildroot does not use) and a new bundled PRNG used to reimplement mkstemp() Some buildsystem options also changed: - THREADSAFE is now USE_THREADS - BUILD_CLAR is now BUILD_TESTS, which the cmake infra already give. Signed-off-by: Nicolas Cavallari --- package/libgit2/libgit2.hash | 4 ++-- package/libgit2/libgit2.mk | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) v2: bump to 1.4.2 instead of 1.4.1 diff --git a/package/libgit2/libgit2.hash b/package/libgit2/libgit2.hash index 07b1a260a4..ada411ea22 100644 --- a/package/libgit2/libgit2.hash +++ b/package/libgit2/libgit2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 192eeff84596ff09efb6b01835a066f2df7cd7985e0991c79595688e6b36444e libgit2-1.3.0.tar.gz -sha256 8b7e4f54f8bf210c8fe010a49571a1ee57463ef020cc43f051d4d3fbb74942af COPYING +sha256 901c2b4492976b86477569502a41c31b274b69adc177149c02099ea88404ef19 libgit2-1.4.2.tar.gz +sha256 0092f24acc306ee3287dc05b5e85cb9e0e48cd3f11c60c4625b1a673a5912616 COPYING diff --git a/package/libgit2/libgit2.mk b/package/libgit2/libgit2.mk index 6cc0f1ea74..e94dd9c370 100644 --- a/package/libgit2/libgit2.mk +++ b/package/libgit2/libgit2.mk @@ -4,21 +4,20 @@ # ################################################################################ -LIBGIT2_VERSION = 1.3.0 +LIBGIT2_VERSION = 1.4.2 LIBGIT2_SITE = $(call github,libgit2,libgit2,v$(LIBGIT2_VERSION)) -LIBGIT2_LICENSE = GPL-2.0 with linking exception, MIT (sha1), wildmatch license (wildmatch) +LIBGIT2_LICENSE = GPL-2.0 with linking exception, MIT (sha1), wildmatch license (wildmatch), CC0-1.0 (xoroshiro256) LIBGIT2_LICENSE_FILES = COPYING LIBGIT2_CPE_ID_VENDOR = libgit2_project LIBGIT2_INSTALL_STAGING = YES LIBGIT2_CONF_OPTS = \ -DUSE_GSSAPI=OFF \ - -DBUILD_CLAR=OFF \ -DUSE_ICONV=ON \ -DREGEX_BACKEND=regcomp \ -DUSE_HTTP_PARSER=system \ -DUSE_NTLMCLIENT=OFF \ - -DTHREADSAFE=$(if $(BR2_TOOLCHAIN_HAS_THREADS),ON,OFF) + -DUSE_THREADS=$(if $(BR2_TOOLCHAIN_HAS_THREADS),ON,OFF) LIBGIT2_DEPENDENCIES = zlib libhttpparser -- 2.35.1 From jose.pekkarinen at unikie.com Mon Feb 28 10:18:40 2022 From: jose.pekkarinen at unikie.com (=?UTF-8?Q?Jos=C3=A9_Pekkarinen?=) Date: Mon, 28 Feb 2022 12:18:40 +0200 Subject: [Buildroot] [PATCH v4] package/opensc: new package In-Reply-To: <20220114070852.481719-1-jose.pekkarinen@unikie.com> References: <20220114070852.481719-1-jose.pekkarinen@unikie.com> Message-ID: Hi, Any comments to this patch? Thanks! Jos?. On Fri, Jan 14, 2022 at 9:08 AM Jos? Pekkarinen wrote: > > 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 > -- Jos?. From giulio.benetti at benettiengineering.com Mon Feb 28 12:02:43 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 28 Feb 2022 13:02:43 +0100 Subject: [Buildroot] [PATCH] package/at: bump version to 3.2.5 Message-ID: <20220228120243.3361127-1-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- package/at/at.hash | 2 +- package/at/at.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/at/at.hash b/package/at/at.hash index d4ad9aa436..be3e82f9f0 100644 --- a/package/at/at.hash +++ b/package/at/at.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 76990cbb6f4b9bfedb926637904fdcc0d4fa20b6596b9c932117a49a0624c684 at_3.2.4.orig.tar.gz +sha256 bb066b389d7c9bb9d84a35738032b85c30cba7d949f758192adc72c9477fd3b8 at_3.2.5.orig.tar.gz sha256 01dccc0975aa9ba1a9f83e7c5e04f16077353d3c72a0a759b8846ee7a5b2b616 Copyright sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 COPYING diff --git a/package/at/at.mk b/package/at/at.mk index 26c44f5287..ed38def337 100644 --- a/package/at/at.mk +++ b/package/at/at.mk @@ -4,7 +4,7 @@ # ################################################################################ -AT_VERSION = 3.2.4 +AT_VERSION = 3.2.5 AT_SOURCE = at_$(AT_VERSION).orig.tar.gz AT_SITE = http://software.calhariz.com/at AT_DEPENDENCIES = $(if $(BR2_PACKAGE_FLEX),flex) host-bison host-flex -- 2.25.1 From buildroot at uclibc.org Mon Feb 28 12:21:03 2022 From: buildroot at uclibc.org (buildroot) Date: Mon, 28 Feb 2022 20:21:03 +0800 Subject: [Buildroot] =?utf-8?q?wholesale_old_mobile_phones_at_cheap_price?= =?utf-8?q?s?= Message-ID: <20220228122106.868AC40275@smtp2.osuosl.org> An HTML attachment was scrubbed... URL: From buildroot at busybox.net Mon Feb 28 12:31:54 2022 From: buildroot at busybox.net (buildroot) Date: Mon, 28 Feb 2022 20:31:54 +0800 Subject: [Buildroot] =?utf-8?q?wholesale_old_mobile_phones_at_cheap_price?= =?utf-8?q?s?= Message-ID: <20220228123156.A9AFF81A92@smtp1.osuosl.org> An HTML attachment was scrubbed... URL: From buildroot at uclibc.org Mon Feb 28 12:31:54 2022 From: buildroot at uclibc.org (buildroot) Date: Mon, 28 Feb 2022 20:31:54 +0800 Subject: [Buildroot] =?utf-8?q?wholesale_old_mobile_phones_at_cheap_price?= =?utf-8?q?s?= Message-ID: <20220228123157.05AA54014B@smtp2.osuosl.org> An HTML attachment was scrubbed... URL: From buildroot at uclibc.org Mon Feb 28 12:35:26 2022 From: buildroot at uclibc.org (buildroot) Date: Mon, 28 Feb 2022 20:35:26 +0800 Subject: [Buildroot] =?utf-8?q?wholesale_old_mobile_phones_at_cheap_price?= =?utf-8?q?s?= Message-ID: <20220228123532.AC6AA60B3A@smtp3.osuosl.org> An HTML attachment was scrubbed... URL: From buildroot at uclibc.org Mon Feb 28 14:06:10 2022 From: buildroot at uclibc.org (buildroot) Date: Mon, 28 Feb 2022 22:06:10 +0800 Subject: [Buildroot] =?utf-8?q?wholesale_old_mobile_phones_at_cheap_price?= =?utf-8?q?s?= Message-ID: <20220228140613.E6B0C60BA4@smtp3.osuosl.org> An HTML attachment was scrubbed... URL: From buildroot at busybox.net Mon Feb 28 14:06:34 2022 From: buildroot at busybox.net (buildroot) Date: Mon, 28 Feb 2022 22:06:34 +0800 Subject: [Buildroot] =?utf-8?q?wholesale_old_mobile_phones_at_cheap_price?= =?utf-8?q?s?= Message-ID: <20220228140636.EEF8D81ADE@smtp1.osuosl.org> An HTML attachment was scrubbed... URL: From theo.lebrun at bootlin.com Mon Feb 28 16:13:45 2022 From: theo.lebrun at bootlin.com (=?UTF-8?q?Th=C3=A9o=20Lebrun?=) Date: Mon, 28 Feb 2022 17:13:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/wireplumber: bump version to 0.4.8 Message-ID: <20220228161345.378966-1-theo.lebrun@bootlin.com> Changelog: https://gitlab.freedesktop.org/pipewire/wireplumber/-/blob/e14bb72dcc85e2130d0ea96768e5ae3b375a041e/NEWS.rst Signed-off-by: Th?o Lebrun --- package/wireplumber/wireplumber.hash | 2 +- package/wireplumber/wireplumber.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/wireplumber/wireplumber.hash b/package/wireplumber/wireplumber.hash index 561fcc2e5e..206d7d15af 100644 --- a/package/wireplumber/wireplumber.hash +++ b/package/wireplumber/wireplumber.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 41f174eaae5a630e195001fdd580918fa5143a71edceb050b320f85a8e65e53b wireplumber-0.4.2.tar.bz2 +sha256 6429e8a95e355ce21b4c4f1a5ebc769f037e8dbeec51905ad909ce609a38d0ce wireplumber-0.4.8.tar.bz2 sha256 ff2eb9af5b05d92ac3a38cffcad27582ef555a31ff1781e1c1d4e087f77c9c81 LICENSE diff --git a/package/wireplumber/wireplumber.mk b/package/wireplumber/wireplumber.mk index 2dab6042ea..3bf7cece45 100644 --- a/package/wireplumber/wireplumber.mk +++ b/package/wireplumber/wireplumber.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIREPLUMBER_VERSION = 0.4.2 +WIREPLUMBER_VERSION = 0.4.8 WIREPLUMBER_SOURCE = wireplumber-$(WIREPLUMBER_VERSION).tar.bz2 WIREPLUMBER_SITE = https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/$(WIREPLUMBER_VERSION) WIREPLUMBER_LICENSE = MIT -- 2.35.1 From remi.duraffort at linaro.org Mon Feb 28 16:26:32 2022 From: remi.duraffort at linaro.org (=?UTF-8?q?R=C3=A9mi=20Duraffort?=) Date: Mon, 28 Feb 2022 17:26:32 +0100 Subject: [Buildroot] [PATCH 1/1] linux: fix kernel image format for aarch64 BE Message-ID: <20220228162632.2777188-1-remi.duraffort@linaro.org> Signed-off-by: R?mi Duraffort --- linux/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 13d99bd09d..1f2a8db545 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -261,11 +261,11 @@ config BR2_LINUX_KERNEL_SIMPLEIMAGE config BR2_LINUX_KERNEL_IMAGE bool "Image" - depends on BR2_aarch64 || BR2_riscv + depends on BR2_aarch64 || BR2_riscv || BR2_aarch64_be config BR2_LINUX_KERNEL_IMAGEGZ bool "Image.gz" - depends on BR2_aarch64 || BR2_riscv + depends on BR2_aarch64 || BR2_riscv || BR2_aarch64_be config BR2_LINUX_KERNEL_LINUX_BIN bool "linux.bin" -- 2.34.1 From theo.lebrun at bootlin.com Mon Feb 28 16:32:38 2022 From: theo.lebrun at bootlin.com (=?UTF-8?q?Th=C3=A9o=20Lebrun?=) Date: Mon, 28 Feb 2022 17:32:38 +0100 Subject: [Buildroot] [PATCH 2/2] docs: fix links to AsciiDoc Message-ID: <20220228163238.405627-1-theo.lebrun@bootlin.com> Links were aimed at the methods.co.nz domain, which is now returning 404s. The current situation of AsciiDoc is unclear to me: the Fedora package points to this website, they own asciidoc.org, Wikipedia points to this project as well but their Git repo's README includes the following paragraph: > AsciiDoc.py is a legacy processor for this syntax, handling an older > rendition of AsciiDoc. As such, this will not properly handle the > current AsciiDoc specification. It is suggested that unless you > specifically require the AsciiDoc.py toolchain, you should find a > processor that handles the modern AsciiDoc syntax. --- https://github.com/asciidoc-py/asciidoc-py/blob/10.1.3/README.md "AsciiDoc specification" pointing towards: https://projects.eclipse.org/projects/asciidoc.asciidoc-lang Signed-off-by: Th?o Lebrun --- docs/conf/asciidoc-text.conf | 2 +- docs/manual/writing-rules.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/conf/asciidoc-text.conf b/docs/conf/asciidoc-text.conf index 470bdecfc2..bb614b9d85 100644 --- a/docs/conf/asciidoc-text.conf +++ b/docs/conf/asciidoc-text.conf @@ -1,5 +1,5 @@ # Refer to following asciidoc documentation: -# http://www.methods.co.nz/asciidoc/userguide.html +# https://asciidoc-py.github.io/userguide.html # In particular sections "Macros" and "Attribute References" # # For hyperlinks, show 'link text [URL]' (if link text provided) or 'URL' diff --git a/docs/manual/writing-rules.txt b/docs/manual/writing-rules.txt index 57ba61bdb1..84d8f76431 100644 --- a/docs/manual/writing-rules.txt +++ b/docs/manual/writing-rules.txt @@ -207,10 +207,10 @@ https://github.com/pengutronix/genimage/blob/master/README.rst[]. === The documentation The documentation uses the -http://www.methods.co.nz/asciidoc/[asciidoc] format. +https://asciidoc-py.github.io/[asciidoc] format. For further details about the asciidoc syntax, refer to -http://www.methods.co.nz/asciidoc/userguide.html[]. +https://asciidoc-py.github.io/userguide.html[]. === Support scripts -- 2.35.1 From fontaine.fabrice at gmail.com Mon Feb 28 17:52:45 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 28 Feb 2022 18:52:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/libxml2: security bump to version 2.9.13 Message-ID: <20220228175245.1585-1-fontaine.fabrice@gmail.com> Fix the following security issues: - [CVE-2022-23308] Use-after-free of ID and IDREF attributes - Use-after-free in xmlXIncludeCopyRange - Fix Null-deref-in-xmlSchemaGetComponentTargetNs - Fix memory leak in xmlXPathCompNodeTest - Fix null pointer deref in xmlStringGetNodeList - Fix several memory leaks found by Coverity https://gitlab.gnome.org/GNOME/libxml2/-/tags/v2.9.13 Signed-off-by: Fabrice Fontaine --- package/libxml2/libxml2.hash | 4 ++-- package/libxml2/libxml2.mk | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/package/libxml2/libxml2.hash b/package/libxml2/libxml2.hash index ce6c3c4825..81ac3e3f31 100644 --- a/package/libxml2/libxml2.hash +++ b/package/libxml2/libxml2.hash @@ -1,4 +1,4 @@ -# Locally calculated after checking pgp signature -sha256 c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92 libxml2-2.9.12.tar.gz +# From http://ftp.acc.umu.se/pub/gnome/sources/libxml2/2.9/libxml2-2.9.13.sha256sum +sha256 276130602d12fe484ecc03447ee5e759d0465558fbc9d6bd144e3745306ebf0e libxml2-2.9.13.tar.xz # License files, locally calculated sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd COPYING diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk index 023a461472..5382f28ec4 100644 --- a/package/libxml2/libxml2.mk +++ b/package/libxml2/libxml2.mk @@ -4,8 +4,11 @@ # ################################################################################ -LIBXML2_VERSION = 2.9.12 -LIBXML2_SITE = http://xmlsoft.org/sources +LIBXML2_VERSION_MAJOR = 2.9 +LIBXML2_VERSION = $(LIBXML2_VERSION_MAJOR).13 +LIBXML2_SOURCE = libxml2-$(LIBXML2_VERSION).tar.xz +LIBXML2_SITE = \ + http://ftp.gnome.org/pub/gnome/sources/libxml2/$(LIBXML2_VERSION_MAJOR) LIBXML2_INSTALL_STAGING = YES LIBXML2_LICENSE = MIT LIBXML2_LICENSE_FILES = COPYING -- 2.34.1 From peter at korsgaard.com Mon Feb 28 18:37:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 19:37:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/wireshark: security bump to version 3.4.12 In-Reply-To: <20220226181045.2922875-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 26 Feb 2022 19:10:45 +0100") References: <20220226181045.2922875-1-fontaine.fabrice@gmail.com> Message-ID: <87ilsy25y6.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2021-4190, CVE-2022-0581, CVE-2022-0582, CVE-2022-0583, > CVE-2022-0585 and CVE-2022-0586 > https://www.wireshark.org/security/wnpa-sec-2021-22.html > https://www.wireshark.org/security/wnpa-sec-2022-01.html > https://www.wireshark.org/security/wnpa-sec-2022-02.html > https://www.wireshark.org/security/wnpa-sec-2022-03.html > https://www.wireshark.org/security/wnpa-sec-2022-04.html > https://www.wireshark.org/security/wnpa-sec-2022-05.html > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 28 18:37:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 19:37:28 +0100 Subject: [Buildroot] [PATCH 1/1] package/xterm: security bump to version 371 In-Reply-To: <20220226181508.3011361-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 26 Feb 2022 19:15:08 +0100") References: <20220226181508.3011361-1-fontaine.fabrice@gmail.com> Message-ID: <87ee3m25xz.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2022-24130: xterm through Patch 370, when Sixel support is > enabled, allows attackers to trigger a buffer overflow in set_sixel in > graphics_sixel.c via crafted text. > Update hash of COPYING (update in year) > https://invisible-island.net/xterm/xterm.log.html#xterm_371 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 28 18:42:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 19:42:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/wolfssl: security bump to version 5.2.0 In-Reply-To: <20220226185033.3097401-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 26 Feb 2022 19:50:33 +0100") References: <20220226185033.3097401-1-fontaine.fabrice@gmail.com> Message-ID: <875yoy25pc.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2021-44718, CVE-2022-23408, CVE-2022-25638 and CVE-2022-25640 > https://www.wolfssl.com/docs/security-vulnerabilities > https://github.com/wolfSSL/wolfssl/blob/v5.2.0-stable/ChangeLog.md > Signed-off-by: Fabrice Fontaine A bit annoying that this is only available together with new features, but OK. Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 28 18:43:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 19:43:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/freerdp: fix build with libexecinfo In-Reply-To: <20220227091140.3643535-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 27 Feb 2022 10:11:40 +0100") References: <20220227091140.3643535-1-fontaine.fabrice@gmail.com> Message-ID: <871qzm25o5.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure raised on uclibc and musl since the > addition of libexecinfo package in commit > eea8ba446c10701a273432552108d80fb2224ef4: > /home/buildroot/autobuild/instance-0/output-1/host/lib/gcc/riscv64-buildroot-linux-uclibc/10.3.0/../../../../riscv64-buildroot-linux-uclibc/bin/ld: > ../../libwinpr/libwinpr2.so.2.5.0: undefined reference to > `backtrace_symbols_fd' > Fixes: > - http://autobuild.buildroot.org/results/095c33098a6e59ff664080e03baf1a3c92b4265f > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 28 18:44:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 19:44:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/libxml2: security bump to version 2.9.13 In-Reply-To: <20220228175245.1585-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 28 Feb 2022 18:52:45 +0100") References: <20220228175245.1585-1-fontaine.fabrice@gmail.com> Message-ID: <87wnhezv93.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following security issues: > - [CVE-2022-23308] Use-after-free of ID and IDREF attributes > - Use-after-free in xmlXIncludeCopyRange > - Fix Null-deref-in-xmlSchemaGetComponentTargetNs > - Fix memory leak in xmlXPathCompNodeTest > - Fix null pointer deref in xmlStringGetNodeList > - Fix several memory leaks found by Coverity > https://gitlab.gnome.org/GNOME/libxml2/-/tags/v2.9.13 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 28 18:39:12 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 19:39:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/exempi: security bump to version 2.6.1 In-Reply-To: <20220226183423.3086505-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 26 Feb 2022 19:34:23 +0100") References: <20220226183423.3086505-1-fontaine.fabrice@gmail.com> Message-ID: <87a6ea25v3.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Extract from NEWS: > - Changes in v2021.08 > - Security Fixes > - Changes in v2021.07 > - Security Fixes > https://gitlab.freedesktop.org/libopenraw/exempi/-/blob/2.6.1/NEWS > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 28 18:46:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 19:46:19 +0100 Subject: [Buildroot] [PATCH 1/1] package/libpjsip: security bump to version 2.12 In-Reply-To: <20220226160503.2703879-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 26 Feb 2022 17:05:03 +0100") References: <20220226160503.2703879-1-fontaine.fabrice@gmail.com> Message-ID: <87sfs2zv5w.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following security issues (i.e. CVE-2021-37706, CVE-2021-41141, > CVE-2021-43804, CVE-2021-43845, CVE-2022-21722 and CVE-2022-21723): > - Potential integer underflow upon receiving STUN message > (GHSA-2qpg-f6wf-w984) > - Use after free of dialog set (GHSA-ffff-m5fm-qm62) > - Missing unreleased of locks in failure cases (GHSA-8fmx-hqw7-6gmc) > - Potential out-of-bounds read when parsing RTCP BYE message > (GHSA-3qx3-cg72-wrh9) > - Prevent OOB read for RTCP XR block (GHSA-r374-qrwv-86hh) > - Potential buffer overflow in pjsua_player_create(), > pjsua_recorder_create(), pjmedia_wav_player_create(), and > pjsua_call_dump() (GHSA-qcvw-h34v-c7r9) > - Potential out-of-bound read during RTP/RTCP parsing > (GHSA-m66q-q64c-hv36) > - Prevent OOB read in multipart parsing (GHSA-7fw8-54cv-r7pm) > - Use after free of dialog set (GHSA-ffff-m5fm-qm62) > https://github.com/pjsip/pjproject/releases/tag/2.12 > Signed-off-by: Fabrice Fontaine > --- > package/libpjsip/libpjsip.hash | 2 +- > package/libpjsip/libpjsip.mk | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > diff --git a/package/libpjsip/libpjsip.hash b/package/libpjsip/libpjsip.hash > index f39ebf4060..74331ab6fb 100644 > --- a/package/libpjsip/libpjsip.hash > +++ b/package/libpjsip/libpjsip.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 45f6604372df3f49293749cd7c0b42cb21c4fb666c66f8ed9765de004d1eae38 pjproject-2.11.1.tar.gz > +sha256 b3b94d9be4aba8f6d2d1cb164603e81b0a6ee17352f9e2ba5b58e325e610ca5a pjproject-2.12.tar.gz > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk > index b05cc31a83..32cfa8c53c 100644 > --- a/package/libpjsip/libpjsip.mk > +++ b/package/libpjsip/libpjsip.mk > @@ -4,10 +4,10 @@ > # > ################################################################################ > -LIBPJSIP_VERSION = 2.11.1 > +LIBPJSIP_VERSION = 2.12 > LIBPJSIP_SOURCE = pjproject-$(LIBPJSIP_VERSION).tar.gz > LIBPJSIP_SITE = $(call github,pjsip,pjproject,$(LIBPJSIP_VERSION)) > -# https://github.com/pjsip/pjproject/archive/2.11.1.tar.gz > +# https://github.com/pjsip/pjproject/archive/2.12.tar.gz That comment doesn't look very useful. Oh well - Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 28 18:36:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 19:36:37 +0100 Subject: [Buildroot] [git commit] package/wireshark: security bump to version 3.4.12 Message-ID: <20220228184000.8BC6D83611@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=db0f8006c1c8685dc98446b5b9e768e52d2f2591 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2021-4190, CVE-2022-0581, CVE-2022-0582, CVE-2022-0583, CVE-2022-0585 and CVE-2022-0586 https://www.wireshark.org/security/wnpa-sec-2021-22.html https://www.wireshark.org/security/wnpa-sec-2022-01.html https://www.wireshark.org/security/wnpa-sec-2022-02.html https://www.wireshark.org/security/wnpa-sec-2022-03.html https://www.wireshark.org/security/wnpa-sec-2022-04.html https://www.wireshark.org/security/wnpa-sec-2022-05.html Signed-off-by: Fabrice Fontaine 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 7b67e316ed..db1f71e9ef 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.11.txt -sha1 b656d8709b8b0b3d2a94665af6bec88495ad994c wireshark-3.4.11.tar.xz -sha256 a0e227bce2cc3a51ef3301891a0243231990b52a39b68a84a6e32f69c4e75279 wireshark-3.4.11.tar.xz +# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.4.12.txt +sha1 91ca69b0029e58b9c824266237ab392a62f0a248 wireshark-3.4.12.tar.xz +sha256 881a13303e263b7dc7fe337534c8a541d4914552287879bed30bbe76c5bf68ca wireshark-3.4.12.tar.xz # Locally calculated sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf COPYING diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index 0361d0bb64..a5ca4b1f73 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 3.4.11 +WIRESHARK_VERSION = 3.4.12 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 Mon Feb 28 18:39:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 19:39:01 +0100 Subject: [Buildroot] [git commit] package/exempi: security bump to version 2.6.1 Message-ID: <20220228184000.9DF65837AA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=55f1d0a3592253df2a356c195e5131a970eade9b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Extract from NEWS: - Changes in v2021.08 - Security Fixes - Changes in v2021.07 - Security Fixes https://gitlab.freedesktop.org/libopenraw/exempi/-/blob/2.6.1/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/exempi/exempi.hash | 2 +- package/exempi/exempi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/exempi/exempi.hash b/package/exempi/exempi.hash index 5ea9683053..5df610de17 100644 --- a/package/exempi/exempi.hash +++ b/package/exempi/exempi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 52f54314aefd45945d47a6ecf4bd21f362e6467fa5d0538b0d45a06bc6eaaed5 exempi-2.5.2.tar.bz2 +sha256 072451ac1e0dc97ed69a2e5bfc235fd94fe093d837f65584d0e3581af5db18cd exempi-2.6.1.tar.bz2 sha256 3d3c3593c15e0d35bdae0df7c642106250f6be3adc61477419413900f23ae607 COPYING diff --git a/package/exempi/exempi.mk b/package/exempi/exempi.mk index f481469d2c..56fbe20379 100644 --- a/package/exempi/exempi.mk +++ b/package/exempi/exempi.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXEMPI_VERSION = 2.5.2 +EXEMPI_VERSION = 2.6.1 EXEMPI_SOURCE = exempi-$(EXEMPI_VERSION).tar.bz2 EXEMPI_SITE = https://libopenraw.freedesktop.org/download EXEMPI_INSTALL_STAGING = YES From peter at korsgaard.com Mon Feb 28 18:36:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 19:36:50 +0100 Subject: [Buildroot] [git commit] package/xterm: security bump to version 371 Message-ID: <20220228184000.94BFF823A2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2de5cd85423083662eb0625978ef6da7577d76c6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2022-24130: xterm through Patch 370, when Sixel support is enabled, allows attackers to trigger a buffer overflow in set_sixel in graphics_sixel.c via crafted text. Update hash of COPYING (update in year) https://invisible-island.net/xterm/xterm.log.html#xterm_371 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/xterm/xterm.hash | 4 ++-- package/xterm/xterm.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/xterm/xterm.hash b/package/xterm/xterm.hash index d6d80ad977..3f6ec765ce 100644 --- a/package/xterm/xterm.hash +++ b/package/xterm/xterm.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 27f1a8b1c756e269fd5684e60802b545f0be9b36b8b5d6bdbc840c6b000dc51f xterm-367.tgz +sha256 32f888277b19e28ebc0a3112bff000607c07bed0679caa0beebb36f9cad484f5 xterm-371.tgz # Locally calculated -sha256 dfb668cc977e24649500f3cc54de3e2b793928d210715a445ab1227930b07ba6 COPYING +sha256 9521ef761474cd31ea406f56a751646a7b42a9287cdc6f2f8e52ed4c4d2a73e7 COPYING diff --git a/package/xterm/xterm.mk b/package/xterm/xterm.mk index e09d350a7d..95984f1cf9 100644 --- a/package/xterm/xterm.mk +++ b/package/xterm/xterm.mk @@ -4,7 +4,7 @@ # ################################################################################ -XTERM_VERSION = 367 +XTERM_VERSION = 371 XTERM_SOURCE = xterm-$(XTERM_VERSION).tgz XTERM_SITE = http://invisible-mirror.net/archives/xterm XTERM_DEPENDENCIES = ncurses xlib_libXaw host-pkgconf From peter at korsgaard.com Mon Feb 28 18:45:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 19:45:24 +0100 Subject: [Buildroot] [git commit] package/libpjsip: security bump to version 2.12 Message-ID: <20220228184000.C460583611@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5ed26bb378c02f2ce7f7377481853b12ad55d808 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following security issues (i.e. CVE-2021-37706, CVE-2021-41141, CVE-2021-43804, CVE-2021-43845, CVE-2022-21722 and CVE-2022-21723): - Potential integer underflow upon receiving STUN message (GHSA-2qpg-f6wf-w984) - Use after free of dialog set (GHSA-ffff-m5fm-qm62) - Missing unreleased of locks in failure cases (GHSA-8fmx-hqw7-6gmc) - Potential out-of-bounds read when parsing RTCP BYE message (GHSA-3qx3-cg72-wrh9) - Prevent OOB read for RTCP XR block (GHSA-r374-qrwv-86hh) - Potential buffer overflow in pjsua_player_create(), pjsua_recorder_create(), pjmedia_wav_player_create(), and pjsua_call_dump() (GHSA-qcvw-h34v-c7r9) - Potential out-of-bound read during RTP/RTCP parsing (GHSA-m66q-q64c-hv36) - Prevent OOB read in multipart parsing (GHSA-7fw8-54cv-r7pm) - Use after free of dialog set (GHSA-ffff-m5fm-qm62) https://github.com/pjsip/pjproject/releases/tag/2.12 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libpjsip/libpjsip.hash | 2 +- package/libpjsip/libpjsip.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libpjsip/libpjsip.hash b/package/libpjsip/libpjsip.hash index f39ebf4060..74331ab6fb 100644 --- a/package/libpjsip/libpjsip.hash +++ b/package/libpjsip/libpjsip.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 45f6604372df3f49293749cd7c0b42cb21c4fb666c66f8ed9765de004d1eae38 pjproject-2.11.1.tar.gz +sha256 b3b94d9be4aba8f6d2d1cb164603e81b0a6ee17352f9e2ba5b58e325e610ca5a pjproject-2.12.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk index b05cc31a83..32cfa8c53c 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -4,10 +4,10 @@ # ################################################################################ -LIBPJSIP_VERSION = 2.11.1 +LIBPJSIP_VERSION = 2.12 LIBPJSIP_SOURCE = pjproject-$(LIBPJSIP_VERSION).tar.gz LIBPJSIP_SITE = $(call github,pjsip,pjproject,$(LIBPJSIP_VERSION)) -# https://github.com/pjsip/pjproject/archive/2.11.1.tar.gz +# https://github.com/pjsip/pjproject/archive/2.12.tar.gz LIBPJSIP_DEPENDENCIES = libsrtp LIBPJSIP_LICENSE = GPL-2.0+ From peter at korsgaard.com Mon Feb 28 18:41:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 19:41:42 +0100 Subject: [Buildroot] [git commit] package/wolfssl: security bump to version 5.2.0 Message-ID: <20220228184000.A7BEF83611@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=14e0c4de719a0d63192cc5de66a608f75297f37d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2021-44718, CVE-2022-23408, CVE-2022-25638 and CVE-2022-25640 https://www.wolfssl.com/docs/security-vulnerabilities https://github.com/wolfSSL/wolfssl/blob/v5.2.0-stable/ChangeLog.md Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/wolfssl/wolfssl.hash | 2 +- package/wolfssl/wolfssl.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/wolfssl/wolfssl.hash b/package/wolfssl/wolfssl.hash index 9896713ca7..63eebf93bb 100644 --- a/package/wolfssl/wolfssl.hash +++ b/package/wolfssl/wolfssl.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 50db45f348f47e00c93dd244c24108220120cb3cc9d01434789229c32937c444 wolfssl-4.8.1-stable.tar.gz +sha256 409b4646c5f54f642de0e9f3544c3b83de7238134f5b1ff93fb44527bf119d05 wolfssl-5.2.0.tar.gz # Hash for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/wolfssl/wolfssl.mk b/package/wolfssl/wolfssl.mk index d3dce0a401..bfb54445e4 100644 --- a/package/wolfssl/wolfssl.mk +++ b/package/wolfssl/wolfssl.mk @@ -4,8 +4,8 @@ # ################################################################################ -WOLFSSL_VERSION = 4.8.1-stable -WOLFSSL_SITE = $(call github,wolfSSL,wolfssl,v$(WOLFSSL_VERSION)) +WOLFSSL_VERSION = 5.2.0 +WOLFSSL_SITE = $(call github,wolfSSL,wolfssl,v$(WOLFSSL_VERSION)-stable) WOLFSSL_INSTALL_STAGING = YES WOLFSSL_LICENSE = GPL-2.0+ From peter at korsgaard.com Mon Feb 28 18:43:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 19:43:53 +0100 Subject: [Buildroot] [git commit] package/libxml2: security bump to version 2.9.13 Message-ID: <20220228184000.BA97E837AA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4b6703847376838d0b091acd9b0e0193b6439657 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following security issues: - [CVE-2022-23308] Use-after-free of ID and IDREF attributes - Use-after-free in xmlXIncludeCopyRange - Fix Null-deref-in-xmlSchemaGetComponentTargetNs - Fix memory leak in xmlXPathCompNodeTest - Fix null pointer deref in xmlStringGetNodeList - Fix several memory leaks found by Coverity https://gitlab.gnome.org/GNOME/libxml2/-/tags/v2.9.13 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libxml2/libxml2.hash | 4 ++-- package/libxml2/libxml2.mk | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/package/libxml2/libxml2.hash b/package/libxml2/libxml2.hash index ce6c3c4825..81ac3e3f31 100644 --- a/package/libxml2/libxml2.hash +++ b/package/libxml2/libxml2.hash @@ -1,4 +1,4 @@ -# Locally calculated after checking pgp signature -sha256 c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92 libxml2-2.9.12.tar.gz +# From http://ftp.acc.umu.se/pub/gnome/sources/libxml2/2.9/libxml2-2.9.13.sha256sum +sha256 276130602d12fe484ecc03447ee5e759d0465558fbc9d6bd144e3745306ebf0e libxml2-2.9.13.tar.xz # License files, locally calculated sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd COPYING diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk index 023a461472..5382f28ec4 100644 --- a/package/libxml2/libxml2.mk +++ b/package/libxml2/libxml2.mk @@ -4,8 +4,11 @@ # ################################################################################ -LIBXML2_VERSION = 2.9.12 -LIBXML2_SITE = http://xmlsoft.org/sources +LIBXML2_VERSION_MAJOR = 2.9 +LIBXML2_VERSION = $(LIBXML2_VERSION_MAJOR).13 +LIBXML2_SOURCE = libxml2-$(LIBXML2_VERSION).tar.xz +LIBXML2_SITE = \ + http://ftp.gnome.org/pub/gnome/sources/libxml2/$(LIBXML2_VERSION_MAJOR) LIBXML2_INSTALL_STAGING = YES LIBXML2_LICENSE = MIT LIBXML2_LICENSE_FILES = COPYING From peter at korsgaard.com Mon Feb 28 18:43:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 19:43:17 +0100 Subject: [Buildroot] [git commit] package/freerdp: fix build with libexecinfo Message-ID: <20220228184000.B1B5B836D7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=96cb2d5c0c55b7f68810e1e1b5a3344521df4db7 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-0/output-1/host/lib/gcc/riscv64-buildroot-linux-uclibc/10.3.0/../../../../riscv64-buildroot-linux-uclibc/bin/ld: ../../libwinpr/libwinpr2.so.2.5.0: undefined reference to `backtrace_symbols_fd' Fixes: - http://autobuild.buildroot.org/results/095c33098a6e59ff664080e03baf1a3c92b4265f Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/freerdp/freerdp.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk index c536f6cb1c..5f6ae56d1d 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -43,6 +43,11 @@ else FREERDP_CONF_OPTS += -DWITH_ALSA=OFF endif +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +FREERDP_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-lexecinfo +FREERDP_DEPENDENCIES += libexecinfo +endif + ifeq ($(BR2_PACKAGE_LIBUSB),y) FREERDP_CONF_OPTS += -DCHANNEL_URBDRC=ON FREERDP_DEPENDENCIES += libusb From peter at korsgaard.com Mon Feb 28 18:51:25 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 19:51:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/mariadb: security bump to version 10.3.34 In-Reply-To: <20220213202407.1205912-1-fontaine.fabrice@gmail.com> References: <20220213202407.1205912-1-fontaine.fabrice@gmail.com> Message-ID: Hi, On 13/02/2022 21.24, Fabrice Fontaine wrote: > Fix CVE-2021-46665, CVE-2021-46664, CVE-2021-46661, CVE-2021-46668, > CVE-2021-46663, CVE-2022-24052, CVE-2022-24051, CVE-2022-24050, > CVE-2022-24048, CVE-2021-46659, CVE-2021-35604, CVE-2021-46667, > CVE-2021-46662, CVE-2021-2372, CVE-2021-2389 and CVE-2021-46658 > > Update hash of README.md (changes not related to license: > https://github.com/MariaDB/server/commit/773a07b65517327add6348c045cee14bdf489fe0) > > https://mariadb.com/kb/en/mariadb-10334-release-notes/ > https://mariadb.com/kb/en/mariadb-10333-release-notes/ > https://mariadb.com/kb/en/mariadb-10332-release-notes/ > https://mariadb.com/kb/en/mariadb-10331-release-notes/ > > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 28 18:48:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 19:48:32 +0100 Subject: [Buildroot] [git commit] package/mariadb: security bump to version 10.3.34 Message-ID: <20220228184330.D9105821E8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e7a9a1bce4b081a721799ff62ee5fff8456203ce branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2021-46665, CVE-2021-46664, CVE-2021-46661, CVE-2021-46668, CVE-2021-46663, CVE-2022-24052, CVE-2022-24051, CVE-2022-24050, CVE-2022-24048, CVE-2021-46659, CVE-2021-35604, CVE-2021-46667, CVE-2021-46662, CVE-2021-2372, CVE-2021-2389 and CVE-2021-46658 Update hash of README.md (changes not related to license: https://github.com/MariaDB/server/commit/773a07b65517327add6348c045cee14bdf489fe0) https://mariadb.com/kb/en/mariadb-10334-release-notes/ https://mariadb.com/kb/en/mariadb-10333-release-notes/ https://mariadb.com/kb/en/mariadb-10332-release-notes/ https://mariadb.com/kb/en/mariadb-10331-release-notes/ Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/mariadb/mariadb.hash | 7 +++---- package/mariadb/mariadb.mk | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/mariadb/mariadb.hash b/package/mariadb/mariadb.hash index 4025be317f..4da26bdf94 100644 --- a/package/mariadb/mariadb.hash +++ b/package/mariadb/mariadb.hash @@ -1,7 +1,6 @@ -# From https://downloads.mariadb.org/mariadb/10.3.30 -sha256 bd8735c65bdb7ebcd5d779fb9d3de3f2fcd319ad6482278d73dfe7301ad4ae1b mariadb-10.3.30.tar.gz -sha512 742c30b3ebc0b6d36b98d4e7a7fb511098142e72d8f42cbfa73a0bdea2059be17e790fbda4732329bbd99e4b50b13cf18e8122964a473e0b62170ab869eca8fc mariadb-10.3.30.tar.gz +# From https://dlm.mariadb.com/2117287/MariaDB/mariadb-10.3.34/source/sha512sums.txt +sha512 46d4575ec1afb68510652a4bb31ca5ce83a2f5f61048a6e9c1487b0ba58f079465a8b72518d44043cd42c631b19ff50b5498584676ac6473705b138fe3300741 mariadb-10.3.34.tar.gz # Hash for license files -sha256 a4665c1189fe31e0bbc27e9b55439df7dad6e99805407fe58d78da7aabe678f8 README.md +sha256 084aa0007efac6dda6aafffb3f3ef8b66b105862dad7ee23f6a4b52813f84464 README.md sha256 240a15a1d0f34d3abca462cdb7e5fb89470967563f16b0e71169e51c1e74cf2b COPYING diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk index db967ca3ed..4eb9c71827 100644 --- a/package/mariadb/mariadb.mk +++ b/package/mariadb/mariadb.mk @@ -4,8 +4,8 @@ # ################################################################################ -MARIADB_VERSION = 10.3.30 -MARIADB_SITE = https://downloads.mariadb.org/interstitial/mariadb-$(MARIADB_VERSION)/source +MARIADB_VERSION = 10.3.34 +MARIADB_SITE = https://dlm.mariadb.com/2117285/MariaDB/mariadb-$(MARIADB_VERSION)/source MARIADB_LICENSE = GPL-2.0 (server), GPL-2.0 with FLOSS exception (GPL client library), LGPL-2.0 (LGPL client library) # Tarball no longer contains LGPL license text # https://jira.mariadb.org/browse/MDEV-12297 From peter at korsgaard.com Mon Feb 28 18:52:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 19:52:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/samba4: security bump version to 4.15.5 In-Reply-To: <20220222214114.374855-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Tue, 22 Feb 2022 22:41:14 +0100") References: <20220222214114.374855-1-bernd.kuhls@t-online.de> Message-ID: <87o82qzuw8.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Release notes: https://www.samba.org/samba/history/samba-4.15.5.html > Fixes CVE-2021-44141, CVE-2021-44142 & CVE-2022-0336. > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 28 18:52:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 19:52:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/vim: security bump to version 8.2.4450 In-Reply-To: <20220222224302.3185944-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 22 Feb 2022 23:43:02 +0100") References: <20220222224302.3185944-1-fontaine.fabrice@gmail.com> Message-ID: <87k0dezuvp.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2022-0554: Use of Out-of-range Pointer Offset in GitHub > repository vim/vim prior to 8.2. > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 28 18:53:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 19:53:31 +0100 Subject: [Buildroot] [PATCH] package/gnutls: security bump to version 3.7.3 In-Reply-To: <20220223172817.3002782-1-francois.perrad@gadz.org> (Francois Perrad's message of "Wed, 23 Feb 2022 18:28:17 +0100") References: <20220223172817.3002782-1-francois.perrad@gadz.org> Message-ID: <87fso2zutw.fsf@dell.be.48ers.dk> >>>>> "Francois" == Francois Perrad writes: > see https://www.gnutls.org/security-new.html#GNUTLS-SA-2022-01-17 > Signed-off-by: Francois Perrad Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 28 18:51:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 19:51:53 +0100 Subject: [Buildroot] [git commit] package/samba4: security bump version to 4.15.5 Message-ID: <20220228184539.BEE5F836D7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=266318937ae72cefd17f38b76de9d400bd4d9f47 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://www.samba.org/samba/history/samba-4.15.5.html Fixes CVE-2021-44141, CVE-2021-44142 & CVE-2022-0336. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/samba4/samba4.hash | 4 ++-- package/samba4/samba4.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 130b628e32..503ec2ce37 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.4.tar.asc -sha256 499065a589b7b9ffb8e3eb6efa8575985919a2999972afc469520a47322aec11 samba-4.15.4.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.15.5.tar.asc +sha256 69115e33831937ba5151be0247943147765aece658ba743f44741672ad68d17f samba-4.15.5.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 1d4b985437..0ad3c2f742 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.15.4 +SAMBA4_VERSION = 4.15.5 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES From peter at korsgaard.com Mon Feb 28 18:52:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 19:52:49 +0100 Subject: [Buildroot] [git commit] package/gnutls: security bump to version 3.7.3 Message-ID: <20220228184539.D768E837B6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=212b020bb43f13121d6cde464f871d5d1cf6cfbe branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master see https://www.gnutls.org/security-new.html#GNUTLS-SA-2022-01-17 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/gnutls/gnutls.hash | 4 ++-- package/gnutls/gnutls.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gnutls/gnutls.hash b/package/gnutls/gnutls.hash index 5d4fd1a0dc..2ffc6c1b4e 100644 --- a/package/gnutls/gnutls.hash +++ b/package/gnutls/gnutls.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/gnutls-3.7.2.tar.xz.sig -sha256 646e6c5a9a185faa4cea796d378a1ba8e1148dbb197ca6605f95986a25af2752 gnutls-3.7.2.tar.xz +# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/gnutls-3.7.3.tar.xz.sig +sha256 fc59c43bc31ab20a6977ff083029277a31935b8355ce387b634fa433f8f6c49a gnutls-3.7.3.tar.xz # Locally calculated sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b doc/COPYING sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 doc/COPYING.LESSER diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index dbf7593854..7317a3bb1e 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -5,7 +5,7 @@ ################################################################################ GNUTLS_VERSION_MAJOR = 3.7 -GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).2 +GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).3 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz GNUTLS_SITE = https://www.gnupg.org/ftp/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR) GNUTLS_LICENSE = LGPL-2.1+ (core library) From peter at korsgaard.com Mon Feb 28 18:52:18 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 19:52:18 +0100 Subject: [Buildroot] [git commit] package/vim: security bump to version 8.2.4450 Message-ID: <20220228184539.CADD1837AA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=28c9cb5ff34aa98bf2d0db63f593745db006c910 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2022-0554: Use of Out-of-range Pointer Offset in GitHub repository vim/vim prior to 8.2. Signed-off-by: Fabrice Fontaine 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 fa3ca53cc8..8b60b7461f 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 b40b4e341de6b65cdeacd4c816dea8fe5e3b385ee5e17af73fc69c00bd7c440b vim-8.2.4301.tar.gz +sha256 b0a5acbe83bbdd4b1412abd9dc2ae2e3593c6cff8ff11c551fda3e6e2a87ec81 vim-8.2.4450.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index 98a5f153a8..28fd33c8ef 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 8.2.4301 +VIM_VERSION = 8.2.4450 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src From peter at korsgaard.com Mon Feb 28 18:55:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 19:55:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/openssh: security bump to version 8.9p1 In-Reply-To: <20220225231816.1648877-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 26 Feb 2022 00:18:16 +0100") References: <20220225231816.1648877-1-fontaine.fabrice@gmail.com> Message-ID: <87bkyqzuqg.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Security Near Miss > ================== > * sshd(8): fix an integer overflow in the user authentication path > that, in conjunction with other logic errors, could have yielded > unauthenticated access under difficult to exploit conditions. > This situation is not exploitable because of independent checks in > the privilege separation monitor. Privilege separation has been > enabled by default in since openssh-3.2.2 (released in 2002) and > has been mandatory since openssh-7.5 (released in 2017). Moreover, > portable OpenSSH has used toolchain features available in most > modern compilers to abort on signed integer overflow since > openssh-6.5 (released in 2014). > Update license (md5crypt removed, bcrypt relicensed to BSD-3-Clause: > https://github.com/openssh/openssh-portable/commit/a5ab4882348d26addc9830a44e053238dfa2cb58 > https://github.com/openssh/openssh-portable/commit/158bf854e2a22cf09064305f4a4e442670562685 > https://github.com/openssh/openssh-portable/commit/c0459588b8d00b73e506c6095958ecfe62a4a7ba) > https://www.openssh.com/txt/release-8.9 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 28 18:55:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 19:55:20 +0100 Subject: [Buildroot] [git commit] package/openssh: security bump to version 8.9p1 Message-ID: <20220228184738.27E4283488@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9597d5ec8e9a021f674ccd97828c843977934e51 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Security Near Miss ================== * sshd(8): fix an integer overflow in the user authentication path that, in conjunction with other logic errors, could have yielded unauthenticated access under difficult to exploit conditions. This situation is not exploitable because of independent checks in the privilege separation monitor. Privilege separation has been enabled by default in since openssh-3.2.2 (released in 2002) and has been mandatory since openssh-7.5 (released in 2017). Moreover, portable OpenSSH has used toolchain features available in most modern compilers to abort on signed integer overflow since openssh-6.5 (released in 2014). Update license (md5crypt removed, bcrypt relicensed to BSD-3-Clause: https://github.com/openssh/openssh-portable/commit/a5ab4882348d26addc9830a44e053238dfa2cb58 https://github.com/openssh/openssh-portable/commit/158bf854e2a22cf09064305f4a4e442670562685 https://github.com/openssh/openssh-portable/commit/c0459588b8d00b73e506c6095958ecfe62a4a7ba) https://www.openssh.com/txt/release-8.9 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/openssh/openssh.hash | 6 +++--- package/openssh/openssh.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/openssh/openssh.hash b/package/openssh/openssh.hash index aab3dba09c..dd123c1bb6 100644 --- a/package/openssh/openssh.hash +++ b/package/openssh/openssh.hash @@ -1,4 +1,4 @@ -# From https://www.openssh.com/txt/release-8.8 (base64 encoded) -sha256 4590890ea9bb9ace4f71ae331785a3a5823232435161960ed5fc86588f331fe9 openssh-8.8p1.tar.gz +# From https://www.openssh.com/txt/release-8.9 (base64 encoded) +sha256 fd497654b7ab1686dac672fb83dfb4ba4096e8b5ffcdaccd262380ae58bec5e7 openssh-8.9p1.tar.gz # Locally calculated -sha256 432abf7480fb31473a6706627212913fc70032e3fb71b90fecb28ae26a2d741d LICENCE +sha256 d6807e99f3d159145c659060f57c3fa74e109faa39326dbfc38674cb550fd104 LICENCE diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index 4145bfd8dc..0e0d59e6ab 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -4,13 +4,13 @@ # ################################################################################ -OPENSSH_VERSION_MAJOR = 8.8 +OPENSSH_VERSION_MAJOR = 8.9 OPENSSH_VERSION_MINOR = p1 OPENSSH_VERSION = $(OPENSSH_VERSION_MAJOR)$(OPENSSH_VERSION_MINOR) OPENSSH_CPE_ID_VERSION = $(OPENSSH_VERSION_MAJOR) OPENSSH_CPE_ID_UPDATE = $(OPENSSH_VERSION_MINOR) OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable -OPENSSH_LICENSE = BSD-4-Clause, BSD-3-Clause, BSD-2-Clause, Public Domain +OPENSSH_LICENSE = BSD-3-Clause, BSD-2-Clause, Public Domain OPENSSH_LICENSE_FILES = LICENCE OPENSSH_CONF_ENV = \ LD="$(TARGET_CC)" \ From peter at korsgaard.com Mon Feb 28 19:55:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 20:55:34 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/expat: fix tarball sha256 Message-ID: <20220228194735.65B1582DFE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6515cc2894663e345b543eab240180b06de2acfb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Commit ab71ac15ddd7ed6a8ca83cbc23ea0b0cbb343f0f forgot to update sha256 Signed-off-by: Fabrice Fontaine [yann.morin.1998 at free.fr: update hash for real ;-)] Signed-off-by: Yann E. MORIN (cherry picked from commit 59a813d2a884c2eb247d9695089375b56751b6d5) Signed-off-by: Peter Korsgaard --- package/expat/expat.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index 3129801668..10e13206d0 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -3,5 +3,5 @@ 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 From peter at korsgaard.com Mon Feb 28 19:55:13 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 20:55:13 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/expat: fix tarball sha256 Message-ID: <20220228194746.EB95A82DFE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=49b1a3ef2e4a90bdcb24d08cb542ac9b5958a799 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Commit ab71ac15ddd7ed6a8ca83cbc23ea0b0cbb343f0f forgot to update sha256 Signed-off-by: Fabrice Fontaine [yann.morin.1998 at free.fr: update hash for real ;-)] Signed-off-by: Yann E. MORIN (cherry picked from commit 59a813d2a884c2eb247d9695089375b56751b6d5) Signed-off-by: Peter Korsgaard --- package/expat/expat.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index 3129801668..10e13206d0 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -3,5 +3,5 @@ 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 From jacques.samoun33 at gmail.com Mon Feb 28 20:05:22 2022 From: jacques.samoun33 at gmail.com (Jacques Samoun) Date: Mon, 28 Feb 2022 21:05:22 +0100 Subject: [Buildroot] device table Message-ID: Hello, despite all my tries, i just cannot make the "device_table" feature work as described in the manual. Basically, i am trying to set 666 rights to /dev/tty + add a dialout group, so i created the following file (device_table.txt" /dev/tty c 666 root dialout 5 0 - - - and have set the correct variable in menuconfig. I know for sure that the build has handled this file ... but looking at the /dev/tty, it is clear that nothing has happened, the permissions are still 600 and the dialout group has not been set. Am I missing something ? Thanks, Jacques -------------- next part -------------- An HTML attachment was scrubbed... URL: From peter at korsgaard.com Mon Feb 28 20:18:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 21:18:28 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] Update for 2021.11.2 Message-ID: <20220228201141.9138E8287C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eeb8c004daf3e09eecdc62af993c74a118e5e5f9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Peter Korsgaard --- CHANGES | 23 +++++++++++++++++++++++ Makefile | 4 ++-- support/misc/Vagrantfile | 2 +- 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 1e1c060107..29b7f2159a 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,26 @@ +2021.11.2, released February 28th, 2022 + + Important / security related fixes. + + Defconfigs: Andes ae3xx, Intel galileo: Fix build with host + gcc >= 10, ROC-RK3399-PC: Bump rootfs size to fix build issue. + + Add conditional patching logic to fix build issues for older + U-Boot / Linux kernel versions when built with a host gcc >= + 10. + + Updated/fixed packages: apitrace, binutils, casync, cgilua, + connman, expat, gauche, gdb, gensio, glibc, go, gst-omx, + gst1-devtools, gst1-libav, gst1-plugins-bad, + gst1-plugins-base, gst1-plugins-good, gst1-plugins-ugly, + gst1-python, gst1-rtsp-server, gst1-vaapi, gstreamer1, + gstreamer1-editing-services, kf5-extra-cmake-modules, kodi, + libarchive, linux, lm-sensors, localedef, log4cxx, mpd, + nfs-utils, php, pistache, pkcs11-helper, prosody, + python-django, python-pyzmq, python-regex, + python-sqliteschema, resiprocate, rtl8723bu, thermald, tiff, + tor, util-linux, vim, xen + 2021.11.1, released January 29th, 2022 Important / security related fixes. diff --git a/Makefile b/Makefile index 45fd44dd62..49551aacc7 100644 --- a/Makefile +++ b/Makefile @@ -92,9 +92,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2021.11.1 +export BR2_VERSION := 2021.11.2 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1643497000 +BR2_VERSION_EPOCH = 1646080000 # 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 eb312081fe..37981d7932 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2021.11.1' +RELEASE='2021.11.2' ### Change here for more memory/cores ### VM_MEMORY=2048 From peter at korsgaard.com Mon Feb 28 20:45:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 21:45:06 +0100 Subject: [Buildroot] Buildroot 2021.11.2 released Message-ID: <877d9ezpnx.fsf@dell.be.48ers.dk> Hi, Buildroot is a simple tool for creating complete embedded Linux systems (http://buildroot.org). Buildroot 2021.11.2 is released - Go download it at: http://buildroot.org/downloads/buildroot-2021.11.2.tar.gz or http://buildroot.org/downloads/buildroot-2021.11.2.tar.xz Or get it from Git: git://git.buildroot.org/buildroot Buildroot 2021.11.2 is a bugfix release, fixing a number of important / security related issues discovered since the 2021.11.1 release. - Defconfigs: Andes ae3xx, Intel galileo: Fix build with host gcc >= 10, ROC-RK3399-PC: Bump rootfs size to fix build issue. - Add conditional patching logic to fix build issues for older U-Boot / Linux kernel versions when built with a host gcc >= 10. - Security fixes for connman, expat, glibc, go, libarchive, localedef, prosody, python-django, tiff, util-linux, vim, xen - Fixes for download/compilation/runtime/license issues in apitrace, binutils, casync, cgilua, gauche, gdb, gensio, gst-omx, gst1-devtools, gst1-libav, gst1-plugins-bad, gst1-plugins-base, gst1-plugins-good, gst1-plugins-ugly, gst1-python, gst1-rtsp-server, gst1-vaapi, gstreamer1, gstreamer1-editing-services, kf5-extra-cmake-modules, kodi, linux, log4cxx, mpd, nfs-utils, php, pistache, pkcs11-helper, python-regex, python-sqliteschema, resiprocate, rtl8723bu, tor For more details, see the CHANGES file: https://git.buildroot.net/buildroot/plain/CHANGES?id=2021.11.2 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.1.. 17 Peter Seiderer 15 Fabrice Fontaine 13 Giulio Benetti 6 Peter Korsgaard 2 Bernd Kuhls 2 Doug Brown 2 Francois Perrad 2 Joachim Wiberg 2 Yann E. MORIN 2 Yegor Yefremov 1 Adrian Perez de Castro 1 Andreas Ziegler 1 Christian Stewart 1 James Hilliard 1 J?rg Krause 1 Michael Opdenacker 1 Nuno Gon?alves 1 Pedro Aguilar 1 Ricardo Martincoski 1 Romain Naour 1 Thomas De Schampheleire -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 28 20:54:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 21:54:15 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] Update for 2021.02.10 Message-ID: <20220228204634.989B283611@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f1d3b87d3d49a377b6fccc48ddd8531c4d293168 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Peter Korsgaard --- CHANGES | 20 ++++++++++++++++++++ Makefile | 4 ++-- support/misc/Vagrantfile | 2 +- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index f7d14f636d..ee01f12a3c 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,23 @@ +2021.02.10, released February 28th, 2022 + + Important / security related fixes. + + Defconfigs: Andes ae3xx, Intel galileo: Fix build with host + gcc >= 10, ROC-RK3399-PC: Bump rootfs size to fix build issue. + + Add conditional patching logic to fix build issues for older + U-Boot / Linux kernel versions when built with a host gcc >= + 10. + + Updated/fixed packages: casync, cgilua, connman, expat, + gauche, gensio, go, gst-omx, gst1-devtools, gst1-libav, + gst1-plugins-bad, gst1-plugins-base, gst1-plugins-good, + gst1-plugins-ugly, gst1-python, gst1-rtsp-server, gst1-vaapi, + gstreamer1, gstreamer1-editing-services, + kf5-extra-cmake-modules, kodi, libarchive, linux, lm-sensors, + log4cxx, mpd, nfs-utils, pistache, prosody, python-django, + python-pyzmq, rtl8723bu, thermald, tiff, util-linux, vim, xen + 2021.02.9, released January 29th, 2022 Important / security related fixes. diff --git a/Makefile b/Makefile index d1a5d4d71e..a3dfc52f51 100644 --- a/Makefile +++ b/Makefile @@ -92,9 +92,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2021.02.9 +export BR2_VERSION := 2021.02.10 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1643480000 +BR2_VERSION_EPOCH = 1646081600 # 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 ff793ccba8..85aa167efc 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2021.02.9' +RELEASE='2021.02.10' ### Change here for more memory/cores ### VM_MEMORY=2048 From peter at korsgaard.com Mon Feb 28 21:05:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 22:05:58 +0100 Subject: [Buildroot] Buildroot 2021.02.10 released Message-ID: <8735k2zop5.fsf@dell.be.48ers.dk> Hi, Buildroot is a simple tool for creating complete embedded Linux systems (http://buildroot.org). Buildroot 2021.02.10 is released - Go download it at: http://buildroot.org/downloads/buildroot-2021.02.10.tar.gz or http://buildroot.org/downloads/buildroot-2021.02.10.tar.bz2 Or get it from Git: git://git.buildroot.org/buildroot Buildroot 2021.02.10 is a bugfix release on the current long term release, fixing a number of important / security related issues discovered since the 2021.02.9 release. - Defconfigs: Andes ae3xx, Intel galileo: Fix build with host gcc >= 10, ROC-RK3399-PC: Bump rootfs size to fix build issue. - Add conditional patching logic to fix build issues for older U-Boot / Linux kernel versions when built with a host gcc >= 10. - Security fixes for connman, expat, go, libarchive, prosody, python-django, tiff, util-linux, vim, xen - Fixes for download/compilation/runtime/license issues in casync, cgilua, gauche, gensio, gst-omx, gst1-devtools, gst1-libav, gst1-plugins-bad, gst1-plugins-base, gst1-plugins-good, gst1-plugins-ugly, gst1-python, gst1-rtsp-server, gst1-vaapi, gstreamer1, gstreamer1-editing-services, kf5-extra-cmake-modules, kodi, linux, log4cxx, mpd, nfs-utils, pistache, rtl8723bu, For more details, see the CHANGES file: https://git.buildroot.net/buildroot/plain/CHANGES?id=2021.02.10 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.9.. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 28 21:11:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 22:11:17 +0100 Subject: [Buildroot] [git commit] Update for 2021.11.2 Message-ID: <20220228210416.7E61C83611@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=67b160c3e39861ee01726763e2a7f65871abdbb5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard (cherry picked from commit eeb8c004daf3e09eecdc62af993c74a118e5e5f9) Signed-off-by: Peter Korsgaard --- CHANGES | 23 +++++++++++++++++++++++ support/misc/Vagrantfile | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 31315cad34..0a76fec045 100644 --- a/CHANGES +++ b/CHANGES @@ -87,6 +87,29 @@ #14501: lttng-modules v2.11 package fails to build #14531: Package EFL - build error +2021.11.2, released February 28th, 2022 + + Important / security related fixes. + + Defconfigs: Andes ae3xx, Intel galileo: Fix build with host + gcc >= 10, ROC-RK3399-PC: Bump rootfs size to fix build issue. + + Add conditional patching logic to fix build issues for older + U-Boot / Linux kernel versions when built with a host gcc >= + 10. + + Updated/fixed packages: apitrace, binutils, casync, cgilua, + connman, expat, gauche, gdb, gensio, glibc, go, gst-omx, + gst1-devtools, gst1-libav, gst1-plugins-bad, + gst1-plugins-base, gst1-plugins-good, gst1-plugins-ugly, + gst1-python, gst1-rtsp-server, gst1-vaapi, gstreamer1, + gstreamer1-editing-services, kf5-extra-cmake-modules, kodi, + libarchive, linux, lm-sensors, localedef, log4cxx, mpd, + nfs-utils, php, pistache, pkcs11-helper, prosody, + python-django, python-pyzmq, python-regex, + python-sqliteschema, resiprocate, rtl8723bu, thermald, tiff, + tor, util-linux, vim, xen + 2021.11.1, released January 29th, 2022 Important / security related fixes. diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index eb312081fe..37981d7932 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2021.11.1' +RELEASE='2021.11.2' ### Change here for more memory/cores ### VM_MEMORY=2048 From peter at korsgaard.com Mon Feb 28 21:11:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 22:11:49 +0100 Subject: [Buildroot] [git commit] docs/website: update for 2021.11.2 Message-ID: <20220228210416.890BF811FD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=746d00ef9ff3772236b61e6477597a7af84e3e1e 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 7d9fad4d9f..b4f7ecc3ce 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -42,37 +42,37 @@
            -

            Latest stable release: 2021.11.1

            +

            Latest stable release: 2021.11.2

            diff --git a/docs/website/news.html b/docs/website/news.html index e571c86a2e..ed37d0a898 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,25 @@

            News

              +
            • +
              +
              +
              +

              2021.11.2 released

              +

              28 February 2022

              +
              +
              +

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

              +
              +
              +
            • +
            • From peter at korsgaard.com Mon Feb 28 21:14:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 22:14:00 +0100 Subject: [Buildroot] [git commit] Update for 2021.02.10 Message-ID: <20220228210935.0E71583850@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=526da6145f81e3ac0753d550ec8f3afee66a6c2a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard (cherry picked from commit f1d3b87d3d49a377b6fccc48ddd8531c4d293168) [Peter: drop Makefile/Vagrantfile change] Signed-off-by: Peter Korsgaard --- CHANGES | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/CHANGES b/CHANGES index 0a76fec045..7c1f014e13 100644 --- a/CHANGES +++ b/CHANGES @@ -736,6 +736,26 @@ #13751: libopenssl (static): huge drop in performance in newer .. #13771: package htop has undeclared dependency on host python +2021.02.10, released February 28th, 2022 + + Important / security related fixes. + + Defconfigs: Andes ae3xx, Intel galileo: Fix build with host + gcc >= 10, ROC-RK3399-PC: Bump rootfs size to fix build issue. + + Add conditional patching logic to fix build issues for older + U-Boot / Linux kernel versions when built with a host gcc >= + 10. + + Updated/fixed packages: casync, cgilua, connman, expat, + gauche, gensio, go, gst-omx, gst1-devtools, gst1-libav, + gst1-plugins-bad, gst1-plugins-base, gst1-plugins-good, + gst1-plugins-ugly, gst1-python, gst1-rtsp-server, gst1-vaapi, + gstreamer1, gstreamer1-editing-services, + kf5-extra-cmake-modules, kodi, libarchive, linux, lm-sensors, + log4cxx, mpd, nfs-utils, pistache, prosody, python-django, + python-pyzmq, rtl8723bu, thermald, tiff, util-linux, vim, xen + 2021.02.9, released January 29th, 2022 Important / security related fixes. From peter at korsgaard.com Mon Feb 28 21:17:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 22:17:20 +0100 Subject: [Buildroot] [git commit] docs/website: update for 2021.02.10 Message-ID: <20220228210935.1BBB88386C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0c4d496bf10675bacfdc1c0901c755e79f157699 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 b4f7ecc3ce..a1b2bc9632 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -8,37 +8,37 @@
              Download
              -

              Latest long term support release: 2021.02.9

              +

              Latest long term support release: 2021.02.10

              diff --git a/docs/website/news.html b/docs/website/news.html index ed37d0a898..3d979877e0 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,25 @@

              News

                +
              • +
                +
                +
                +

                2021.02.10 released

                +

                28 February 2022

                +
                +
                +

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

                +
                +
                +
              • +
              • From peter at korsgaard.com Mon Feb 28 21:19:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 22:19:55 +0100 Subject: [Buildroot] [PATCH] package/at: bump version to 3.2.5 In-Reply-To: <20220228120243.3361127-1-giulio.benetti@benettiengineering.com> (Giulio Benetti's message of "Mon, 28 Feb 2022 13:02:43 +0100") References: <20220228120243.3361127-1-giulio.benetti@benettiengineering.com> Message-ID: <87y21uy9hg.fsf@dell.be.48ers.dk> >>>>> "Giulio" == Giulio Benetti writes: > Signed-off-by: Giulio Benetti Any specific reason this should go to master and not next? -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 28 21:20:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 22:20:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/dbus: bump to version 1.12.22 In-Reply-To: <20220226181747.3033483-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 26 Feb 2022 19:17:47 +0100") References: <20220226181747.3033483-1-fontaine.fabrice@gmail.com> Message-ID: <87tuciy9gl.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://gitlab.freedesktop.org/dbus/dbus/-/blob/dbus-1.12.22/NEWS > Signed-off-by: Fabrice Fontaine Committed to master given the fixes, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 28 21:18:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 22:18:33 +0100 Subject: [Buildroot] [git commit] package/dbus: bump to version 1.12.22 Message-ID: <20220228211234.18F1682655@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7af7acabe051c1b394f53fd02084be7b97d8a8d8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://gitlab.freedesktop.org/dbus/dbus/-/blob/dbus-1.12.22/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/dbus/dbus.hash | 4 ++-- package/dbus/dbus.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/dbus/dbus.hash b/package/dbus/dbus.hash index 06512e5656..176396fe2f 100644 --- a/package/dbus/dbus.hash +++ b/package/dbus/dbus.hash @@ -1,7 +1,7 @@ # Locally calculated after checking pgp signature -# https://dbus.freedesktop.org/releases/dbus/dbus-1.12.20.tar.gz.asc +# https://dbus.freedesktop.org/releases/dbus/dbus-1.12.22.tar.gz.asc # using key 36EC5A6448A4F5EF79BEFE98E05AE1478F814C4F -sha256 f77620140ecb4cdc67f37fb444f8a6bea70b5b6461f12f1cbe2cec60fa7de5fe dbus-1.12.20.tar.gz +sha256 8d25785c798ec4f892e6f9d177fb0ceeb8b29867b119798f9d5228561d3ad474 dbus-1.12.22.tar.gz # Locally calculated sha256 0e46f54efb12d04ab5c33713bacd0e140c9a35b57ae29e03c853203266e8f3a1 COPYING diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index d78e102427..de447d8680 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -4,7 +4,7 @@ # ################################################################################ -DBUS_VERSION = 1.12.20 +DBUS_VERSION = 1.12.22 DBUS_SITE = https://dbus.freedesktop.org/releases/dbus DBUS_LICENSE = AFL-2.1 or GPL-2.0+ (library, tools), GPL-2.0+ (tools) DBUS_LICENSE_FILES = COPYING From giulio.benetti at benettiengineering.com Mon Feb 28 21:29:26 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 28 Feb 2022 22:29:26 +0100 Subject: [Buildroot] [PATCH] package/at: bump version to 3.2.5 In-Reply-To: <87y21uy9hg.fsf@dell.be.48ers.dk> References: <87y21uy9hg.fsf@dell.be.48ers.dk> Message-ID: <3C088CA7-EE28-4D60-8DDD-68492CE9D73D@benettiengineering.com> Hi Peter, > Il giorno 28 feb 2022, alle ore 22:20, Peter Korsgaard ha scritto: > > ? >> >>>>>> "Giulio" == Giulio Benetti writes: > >> Signed-off-by: Giulio Benetti > > Any specific reason this should go to master and not next? Sorry, I?ve forgotten to add ?next?, this is for next branch. Best regards ?- Giulio Benetti Benetti Engineering sas > > -- > Bye, Peter Korsgaard > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From aperez at igalia.com Mon Feb 28 21:34:32 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Mon, 28 Feb 2022 23:34:32 +0200 Subject: [Buildroot] [PATCH 1/1] package/seatd: security bump to version 0.6.4 Message-ID: <20220228213432.3289480-1-aperez@igalia.com> This release contains a security fix in seatd-launch which prevents removal of files that the calling user did not have privileges to remove. Release notes: https://git.sr.ht/~kennylevinsen/seatd/refs/0.6.4 Signed-off-by: Adrian Perez de Castro --- package/seatd/seatd.hash | 2 +- package/seatd/seatd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/seatd/seatd.hash b/package/seatd/seatd.hash index 18f65d3aeb..88793b6dd5 100644 --- a/package/seatd/seatd.hash +++ b/package/seatd/seatd.hash @@ -1,5 +1,5 @@ # Calculated locally -sha256 5226850c163b485aebe71da0d3f4941761637e146a5c9393cb40c52617ad84a8 0.6.3.tar.gz +sha256 3d4ac288114219ba7721239cafee7bfbeb7cf8e1e7fd653602a369e4ad050bd8 0.6.4.tar.gz # License files sha256 282a494803d666616bd726e0279636b5f6a31387ae19a707459074050f2600d3 LICENSE diff --git a/package/seatd/seatd.mk b/package/seatd/seatd.mk index 27d3155b2b..5382cad39b 100644 --- a/package/seatd/seatd.mk +++ b/package/seatd/seatd.mk @@ -4,7 +4,7 @@ # ################################################################################ -SEATD_VERSION = 0.6.3 +SEATD_VERSION = 0.6.4 SEATD_SOURCE = $(SEATD_VERSION).tar.gz SEATD_SITE = https://git.sr.ht/~kennylevinsen/seatd/archive SEATD_LICENSE = MIT -- 2.35.1 From peter at korsgaard.com Mon Feb 28 21:38:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 22:38:26 +0100 Subject: [Buildroot] [git commit] Update for 2022.02-rc3 Message-ID: <20220228213103.2B29A837B6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5b6e2ee8b7924419e13625c20ae34f656be3f7b4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard --- CHANGES | 11 +++++++++++ Makefile | 4 ++-- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 21 +++++++++++++++++++++ 4 files changed, 43 insertions(+), 11 deletions(-) diff --git a/CHANGES b/CHANGES index 7c1f014e13..8e8ecd1a72 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,14 @@ +2022.02-rc3, released February 28th, 2022 + + Fixes all over the tree. + + Defconfigs: Xilinx zynqmp zcu102/zcu106: Fix U-Boot DTS config + + Updated/fixed packages: bluez5_utils, bpftool, dbus, exempi, + flac, freerdp, frr, gnutls, libpjsip, libxml2, mariadb, + openssh, python-twisted, qt5webkit, samba4, vim, weston, + wireshark, wolfssl, xdg-dbus-proxy, xterm, + 2022.02-rc2, released February 20th, 2022 Fixes all over the tree. diff --git a/Makefile b/Makefile index 0ed93e600d..4f693d40a9 100644 --- a/Makefile +++ b/Makefile @@ -92,9 +92,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2022.02-rc2 +export BR2_VERSION := 2022.02-rc3 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1645395000 +BR2_VERSION_EPOCH = 1646083800 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/docs/website/download.html b/docs/website/download.html index a1b2bc9632..891221e155 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -76,37 +76,37 @@
              -

              Latest release candidate: 2022.02-rc2

              +

              Latest release candidate: 2022.02-rc3

              diff --git a/docs/website/news.html b/docs/website/news.html index 3d979877e0..88885a058f 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,27 @@

              News

                +
              • +
                +
                +
                +

                2022.02-rc3 released

                +

                28 February 2022

                +
                +
                +

                2022.02-rc3 has been released with more cleanups and build fixes. See the + CHANGES + file for details.

                + +

                Head to the downloads page to pick up the + 2022.02-rc3 + release candidate, and report any problems found to the + mailing list or + bug tracker.

                +
                +
                +
              • +
              • From peter at korsgaard.com Mon Feb 28 21:41:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Feb 2022 22:41:16 +0100 Subject: [Buildroot] Buildroot 2022.02-rc3 released Message-ID: <87pmn6y8hv.fsf@dell.be.48ers.dk> Hi, Buildroot 2022.02-rc3 is released - Go download it at: http://buildroot.net/downloads/buildroot-2022.02-rc3.tar.gz or http://buildroot.net/downloads/buildroot-2022.02-rc3.tar.xz Or get it from Git: git://git.buildroot.net/buildroot Another week, another release candidate. Please give it a spin and report any problems to the mailing list or bug tracker. Many thanks to the people contributing to this release: git shortlog -sn 2022.02-rc2.. 17 Fabrice Fontaine 7 Peter Korsgaard 1 Adrian Perez de Castro 1 Bernd Kuhls 1 Francois Perrad 1 James Hilliard 1 Neal Frager 1 Romain Naour For more details, see the CHANGES file: http://git.buildroot.net/buildroot/plain/CHANGES?id=2022.02-rc3 -- Bye, Peter Korsgaard From arnout at mind.be Wed Feb 23 20:27:25 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 23 Feb 2022 21:27:25 +0100 Subject: [Buildroot] [git commit] package/dialog: bump to version 1.3-20220117 Message-ID: <20220309132156.CB55D83915@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1868f372c02760e324f91ebcf5685323855351f1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://invisible-mirror.net/dialog/CHANGES.html#index-t20220117 Fixes: - https://bugs.buildroot.org/show_bug.cgi?id=14596 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/dialog/dialog.hash | 2 +- package/dialog/dialog.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dialog/dialog.hash b/package/dialog/dialog.hash index 2286590b66..3136d18b2b 100644 --- a/package/dialog/dialog.hash +++ b/package/dialog/dialog.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 466163e8b97c2b7709d00389199add3156bd813f60ccb0335d0a30f2d4a17f99 dialog-1.3-20200327.tgz +sha256 754cb6bf7dc6a9ac5c1f80c13caa4d976e30a5a6e8b46f17b3bb9b080c31041f dialog-1.3-20220117.tgz # Locally computed sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/dialog/dialog.mk b/package/dialog/dialog.mk index 1c98d354e3..681f8ec9fe 100644 --- a/package/dialog/dialog.mk +++ b/package/dialog/dialog.mk @@ -4,7 +4,7 @@ # ################################################################################ -DIALOG_VERSION = 1.3-20200327 +DIALOG_VERSION = 1.3-20220117 DIALOG_SOURCE = dialog-$(DIALOG_VERSION).tgz DIALOG_SITE = https://invisible-mirror.net/archives/dialog DIALOG_CONF_OPTS = --with-ncurses --with-curses-dir=$(STAGING_DIR)/usr \